From vtiger-tickets at vtiger.fosslabs.com  Thu Jun  1 02:37:29 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 01 Jun 2006 09:37:29 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231252=3A?=
 =?utf-8?q?_Ticket_-_Activity_-_Relation?=
Message-ID: <076.f54f7a210a2bc06ab7c96747af544498@vtiger.fosslabs.com>

#1252: Ticket - Activity - Relation
-----------------------+----------------------------------------------------
 Reporter:  eberled    |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  critical   |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 Tasks created under a ticket don't store this relation. If a user now gets
 a task he doesn't know that there is corresponding ticket.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1252>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun  1 03:23:11 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 01 Jun 2006 10:23:11 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231253=3A?=
 =?utf-8?q?_Campaigns_Cannot_Assign_To_Existing_Contacts=2C_Leads_or_Accou?=
 =?utf-8?q?nts?=
Message-ID: <076.329f0bfa1e61cd49791cee91bbc8d6ba@vtiger.fosslabs.com>

#1253: Campaigns Cannot Assign To Existing Contacts, Leads or Accounts
-----------------------------------+----------------------------------------
 Reporter:  robbie-w at boston.ac.uk  |       Owner:  developer
     Type:  task                   |      Status:  new      
 Priority:  major                  |   Milestone:           
Component:  vtigercrm              |     Version:  5.0.0    
 Keywords:                         |  
-----------------------------------+----------------------------------------
 Campaigns Cannot be assigned To Existing Contacts, Leads or Accounts. This
 is a required functionality if this module is to be of use. Also would
 need to check whether the contact accepts that particular form of
 marketing i.e. email opt out

 Thanks

 Robbie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1253>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun  1 04:00:39 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 01 Jun 2006 11:00:39 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231254=3A?=
 =?utf-8?q?_Currency_on_products_showing_wrongly_converted_US_value?=
Message-ID: <076.db8e221cdb38da7dd6320851fe5c35f3@vtiger.fosslabs.com>

#1254: Currency on products showing wrongly converted US value
------------------------+---------------------------------------------------
 Reporter:  arosewarne  |       Owner:  developer
     Type:  defect      |      Status:  new      
 Priority:  major       |   Milestone:  5.0.0    
Component:  vtigercrm   |     Version:  5.0.0    
 Keywords:  currency    |  
------------------------+---------------------------------------------------
 My preferred currency is british pounds. The conversion is 1.8 to the US
 dollar.
 I enter 20 pounds on the product screen. The amount displayed on the
 product in the view and edit screens is ?36.
 On the product overview page it correctly displays ?20.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1254>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun  1 04:07:00 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 01 Jun 2006 11:07:00 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231254=3A?=
 =?utf-8?q?_Currency_on_products_showing_wrongly_converted_US_value?=
In-Reply-To: <076.db8e221cdb38da7dd6320851fe5c35f3@vtiger.fosslabs.com>
References: <076.db8e221cdb38da7dd6320851fe5c35f3@vtiger.fosslabs.com>
Message-ID: <085.bd526e3ae09cce4f978cbf48c6620329@vtiger.fosslabs.com>

#1254: Currency on products showing wrongly converted US value
-------------------------+--------------------------------------------------
  Reporter:  arosewarne  |       Owner:  developer
      Type:  defect      |      Status:  closed   
  Priority:  major       |   Milestone:  5.0.0    
 Component:  vtigercrm   |     Version:  5.0.0    
Resolution:  duplicate   |    Keywords:  currency 
-------------------------+--------------------------------------------------
Changes (by andrew at intracode.co.uk):

  * resolution:  => duplicate
  * status:  new => closed

Comment:

 See ticket #1142
 Apologies for not checking before posting.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1254>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun  1 05:21:01 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 01 Jun 2006 12:21:01 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231255=3A?=
 =?utf-8?q?_Adding_products_to_leads=2C_contacts_or_potentials_-_should_se?=
 =?utf-8?q?lect_from_a_list_of_existing?=
Message-ID: <076.deb11edc283ea7cd73ede48a39d03e8e@vtiger.fosslabs.com>

#1255: Adding products to leads, contacts or potentials - should select from a
list of existing
------------------------+---------------------------------------------------
 Reporter:  arosewarne  |       Owner:  developer
     Type:  defect      |      Status:  new      
 Priority:  major       |   Milestone:           
Component:  vtigercrm   |     Version:  5.0.0    
 Keywords:              |  
------------------------+---------------------------------------------------
 When I select 'Add a Product' to leads, contacts or potentials I don't
 want to create a new product, as I would with a note or email etc. I
 really want to be able to select from a list of products I have already
 defined, like in quote.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1255>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun  1 07:56:44 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 01 Jun 2006 14:56:44 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231256=3A?=
 =?utf-8?q?_Login_as_user_causes_segfault=2E?=
Message-ID: <076.d314963a958ad693ce77530081747090@vtiger.fosslabs.com>

#1256: Login as user causes segfault.
------------------------------------------+---------------------------------
 Reporter:  client.services.ny at gmail.com  |       Owner:  developer
     Type:  defect                        |      Status:  new      
 Priority:  blocker                       |   Milestone:           
Component:  vtigercrm                     |     Version:           
 Keywords:  SVN segfault                  |  
------------------------------------------+---------------------------------
 Pulled SVN last night (31-May), and installed, logged-in, etc.

 Attempted to login as created user on 6/1, causes segfault.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1256>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun  1 11:15:30 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 01 Jun 2006 18:15:30 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6885 -
	/vtigercrm/tags/vtigercrm-4.2.4/
Message-ID: <20060601181530.26730717C22@vtiger.fosslabs.com>

Author: allanbush
Date: Thu Jun  1 12:15:21 2006
New Revision: 6885

Log:
Tag 4.2.4 for release

Added:
    vtigercrm/tags/vtigercrm-4.2.4/
      - copied from r6884, vtigercrm/branches/4.2.4/



From vtiger-tickets at vtiger.fosslabs.com  Thu Jun  1 18:37:54 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 02 Jun 2006 01:37:54 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231257=3A?=
 =?utf-8?q?_calender-_time_display_should_start_earlier_instead_of_10=2E00?=
 =?utf-8?q?_am?=
Message-ID: <076.d27bacbd23f52c8c928d56ba5872fc60@vtiger.fosslabs.com>

#1257: calender- time display should start earlier instead of 10.00 am
-------------------------+--------------------------------------------------
 Reporter:  ftc          |       Owner:  developer
     Type:  enhancement  |      Status:  new      
 Priority:  major        |   Milestone:           
Component:  vtigercrm    |     Version:  5.0.0    
 Keywords:               |  
-------------------------+--------------------------------------------------
 Should it be more useful if the time starts earlier instead of 10.00 a.m.
 People might want to have meeting early in the morning 8.00 a.m?? I don't
 think they  have much office activity during late at night like 23.00??

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1257>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun  2 04:24:45 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 02 Jun 2006 11:24:45 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231258=3A?=
 =?utf-8?q?_Can=27t_create_custom_fields?=
Message-ID: <076.e2de34810640366206140549ecde537d@vtiger.fosslabs.com>

#1258: Can't create custom fields
-----------------------+----------------------------------------------------
 Reporter:  nik        |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  major      |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 I'm getting an error "Field type is not selected" when trying to create a
 custom field. The type is selected.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1258>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun  2 06:30:15 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 02 Jun 2006 13:30:15 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6886 -
	/vtigercrm/trunk/modules/Users/EditHomeOrder.php
Message-ID: <20060602133015.50AFE5F606D@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun  2 07:30:11 2006
New Revision: 6886

Log:
Added a Back Button in Home Page Order - Ahmed

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

Modified: vtigercrm/trunk/modules/Users/EditHomeOrder.php
==============================================================================
--- vtigercrm/trunk/modules/Users/EditHomeOrder.php (original)
+++ vtigercrm/trunk/modules/Users/EditHomeOrder.php Fri Jun  2 07:30:11 2006
@@ -253,6 +253,7 @@
 <form align="center" action="" method="post">
          <input type="hidden" name="order" id="order" value="">
         <div align="center">
+		<input type="button" onclick="window.history.back()" value="Back">
                 <input type="button" onclick="showValue()" value="Update System">
         </div>
         <br>



From vtiger-tickets at vtiger.fosslabs.com  Fri Jun  2 08:13:15 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 02 Jun 2006 15:13:15 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231259=3A?=
	=?utf-8?q?_i18n_issues_with_Beta?=
Message-ID: <076.f7b53125520cc2d8322c4161c2676a8c@vtiger.fosslabs.com>

#1259: i18n issues with Beta
-----------------------+----------------------------------------------------
 Reporter:  anonymous  |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  minor      |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 Ther are still some hardcoded i18n issue (More.., more..)highly visible
 not covered with the lang files

 \Modules\Rss\Rss.php
 8.498   <a target=\"_BLANK\" href=\"$this->rss_link\">More...</a>
 9.777   <a target=\"_BLANK\" href=\"$this->rss_link\">More...</a>

 \Smarty\templates\Homepage.tpl
 11.072  <tr><td colspan="2" align="right" valign="bottom"><a
 href="index.php?module={$modulename}&action=index">more..</a></td></tr>

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1259>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun  2 08:32:31 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 02 Jun 2006 15:32:31 -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.a8d588cab36569472c304759af6e1a5f@vtiger.fosslabs.com>

#727: Tab order is wrong
-------------------------+--------------------------------------------------
  Reporter:  OnwealdTim  |       Owner:  philip      
      Type:  defect      |      Status:  new         
  Priority:  critical    |   Milestone:  5.0.0       
 Component:  vtigercrm   |     Version:  5.0.0       
Resolution:              |    Keywords:  ui tab order
-------------------------+--------------------------------------------------
Comment (by anonymous):

 this is an important issue. I hear my partners compaining at least once a
 day :-(

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/727>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun  2 08:44:24 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 02 Jun 2006 15:44:24 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231259=3A?=
	=?utf-8?q?_i18n_issues_with_Beta?=
In-Reply-To: <076.f7b53125520cc2d8322c4161c2676a8c@vtiger.fosslabs.com>
References: <076.f7b53125520cc2d8322c4161c2676a8c@vtiger.fosslabs.com>
Message-ID: <085.f9c1987141d5d376d6e1f566c0509c1c@vtiger.fosslabs.com>

#1259: i18n issues with Beta
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  developer
      Type:  defect     |      Status:  new      
  Priority:  minor      |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:             |    Keywords:           
------------------------+---------------------------------------------------
Comment (by anonymous):

 see also

 \Smarty\templates\Clock.tpl

 840     <td style="text-align:left;padding-left:5px;border-bottom:1px
 solid #666666;" id="Handle">World Clock</td>

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1259>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun  2 08:47:14 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 02 Jun 2006 15:47:14 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231259=3A?=
	=?utf-8?q?_i18n_issues_with_Beta?=
In-Reply-To: <076.f7b53125520cc2d8322c4161c2676a8c@vtiger.fosslabs.com>
References: <076.f7b53125520cc2d8322c4161c2676a8c@vtiger.fosslabs.com>
Message-ID: <085.4a20ccbc8fd193a5fd707239c7886528@vtiger.fosslabs.com>

#1259: i18n issues with Beta
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  developer
      Type:  defect     |      Status:  new      
  Priority:  minor      |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:             |    Keywords:           
------------------------+---------------------------------------------------
Comment (by anonymous):

 and here:

 \Smarty\templates\Calculator.tpl

 820     <td style="text-align:left;padding-left:5px;border-bottom:1px
 solid #666666;" id="calc_Handle">Calculator</td>

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1259>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun  2 09:01:55 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 02 Jun 2006 16:01:55 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231259=3A?=
	=?utf-8?q?_i18n_issues_with_Beta?=
In-Reply-To: <076.f7b53125520cc2d8322c4161c2676a8c@vtiger.fosslabs.com>
References: <076.f7b53125520cc2d8322c4161c2676a8c@vtiger.fosslabs.com>
Message-ID: <085.a81218ef99fa98c978e478fb9ad2940e@vtiger.fosslabs.com>

#1259: i18n issues with Beta
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  developer
      Type:  defect     |      Status:  new      
  Priority:  minor      |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:             |    Keywords:           
------------------------+---------------------------------------------------
Comment (by anonymous):

 and here:

 \Modules\Calendar\calendarLayout.php

 48.791  $list_view .="<td colspan='".$header_rows."'><i>None
 Scheduled</i></td>";
 52.452  $list_view .="<td colspan='".$header_rows."'><i>None
 Scheduled</i></td>";

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1259>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun  2 09:15:38 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 02 Jun 2006 16:15:38 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231259=3A?=
	=?utf-8?q?_i18n_issues_with_Beta?=
In-Reply-To: <076.f7b53125520cc2d8322c4161c2676a8c@vtiger.fosslabs.com>
References: <076.f7b53125520cc2d8322c4161c2676a8c@vtiger.fosslabs.com>
Message-ID: <085.e90054241571ef66959a50f67c5c0411@vtiger.fosslabs.com>

#1259: i18n issues with Beta
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  developer
      Type:  defect     |      Status:  new      
  Priority:  minor      |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:             |    Keywords:           
------------------------+---------------------------------------------------
Comment (by anonymous):

 and here:

 \Modules\Calendar\calendarLayout.php

 9.471   <td align='right' width='25%'><b>View : </b>";

 and here (this eems to be a major issue and also includes "today", "this
 week" and "this month")

 \Modules\Activities\OpenListView.php
 2.676   else if($activity_view == 'This Year')
 12.949  else if($activity_view == 'This Year')
 13.708  $ACTIVITY_VIEW_SELECT_OPTION .= '<option value="This Year"
 '.$selected4.'>';
 13.771  $ACTIVITY_VIEW_SELECT_OPTION .= 'This Year';

 and here: (it also includes "today", "Last Week")

 \Modules\Leads\ListViewTop.php
 2.339   else if($lead_view == 'Last 2 Days')
 5.239   else if($lead_view == 'Last 2 Days')
 5.665   $LEAD_VIEW_SELECT_OPTION .= '<option value="Last 2 Days"
 '.$selected2.'>';
 5.727   $LEAD_VIEW_SELECT_OPTION .= 'Last 2 Days';

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1259>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun  2 09:27:53 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 02 Jun 2006 16:27:53 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231259=3A?=
	=?utf-8?q?_i18n_issues_with_Beta?=
In-Reply-To: <076.f7b53125520cc2d8322c4161c2676a8c@vtiger.fosslabs.com>
References: <076.f7b53125520cc2d8322c4161c2676a8c@vtiger.fosslabs.com>
Message-ID: <085.2f26948130b439562c26361e98729cf0@vtiger.fosslabs.com>

#1259: i18n issues with Beta
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  developer
      Type:  defect     |      Status:  new      
  Priority:  minor      |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:             |    Keywords:           
------------------------+---------------------------------------------------
Comment (by anonymous):

 there seems to be no translation for the standard report names possible.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1259>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun  2 09:42:49 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 02 Jun 2006 16:42:49 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231259=3A?=
	=?utf-8?q?_i18n_issues_with_Beta?=
In-Reply-To: <076.f7b53125520cc2d8322c4161c2676a8c@vtiger.fosslabs.com>
References: <076.f7b53125520cc2d8322c4161c2676a8c@vtiger.fosslabs.com>
Message-ID: <085.d4a62b7712e602b42d2ba4cbce6d4b04@vtiger.fosslabs.com>

#1259: i18n issues with Beta
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  developer
      Type:  defect     |      Status:  new      
  Priority:  minor      |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:             |    Keywords:           
------------------------+---------------------------------------------------
Comment (by anonymous):

 see here, the entire popup window does not get translated

 Modules\Portal\Popup.php

 1.182   <td class="genHeaderSmall" align="left" width="30%">Add
 Bookmark</td>

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1259>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun  2 10:09:01 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 02 Jun 2006 17:09:01 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231260=3A?=
	=?utf-8?q?_i18n_issue_at_activities?=
Message-ID: <076.bf2281a02d95e6f032d828d0839694a6@vtiger.fosslabs.com>

#1260: i18n issue at activities
-----------------------+----------------------------------------------------
 Reporter:  anonymous  |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  major      |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 at the menu that allows to schedule a new activity the following entry
 field (drop down lists) can not get translated:

 Status: there are activity fields for the status at the studio but these
 fields do not apply to the activity menu

 Acivitytype: No changes possible at the studio

 Visibility: No changes possible at the studio

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1260>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun  2 10:10:50 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 02 Jun 2006 17:10:50 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231260=3A?=
 =?utf-8?q?_i18n_issue_at_activities?=
In-Reply-To: <076.bf2281a02d95e6f032d828d0839694a6@vtiger.fosslabs.com>
References: <076.bf2281a02d95e6f032d828d0839694a6@vtiger.fosslabs.com>
Message-ID: <085.fdcb871d9fef1fa3809282da221022a5@vtiger.fosslabs.com>

#1260: i18n issue at activities
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  developer
      Type:  defect     |      Status:  new      
  Priority:  major      |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:             |    Keywords:           
------------------------+---------------------------------------------------
Comment (by anonymous):

 There are lables at the activiy lang file:
 'LBL_MINUTES'=>'Minuten',
 'LBL_HOURS'=>'Stunden',
 'LBL_BEFORE_EVENT'=>'vor Ereignis',

 They do not apply for the new activity menu.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1260>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun  2 10:13:54 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 02 Jun 2006 17:13:54 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231260=3A?=
 =?utf-8?q?_i18n_issue_at_activities?=
In-Reply-To: <076.bf2281a02d95e6f032d828d0839694a6@vtiger.fosslabs.com>
References: <076.bf2281a02d95e6f032d828d0839694a6@vtiger.fosslabs.com>
Message-ID: <085.9e7ab8187d4a33e07d2d47eaeba8c6b2@vtiger.fosslabs.com>

#1260: i18n issue at activities
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  developer
      Type:  defect     |      Status:  new      
  Priority:  major      |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:             |    Keywords:           
------------------------+---------------------------------------------------
Comment (by anonymous):

 "Recurring Events" can also not get translated

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1260>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun  2 10:58:38 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 02 Jun 2006 17:58:38 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231259=3A?=
	=?utf-8?q?_i18n_issues_with_Beta?=
In-Reply-To: <076.f7b53125520cc2d8322c4161c2676a8c@vtiger.fosslabs.com>
References: <076.f7b53125520cc2d8322c4161c2676a8c@vtiger.fosslabs.com>
Message-ID: <085.734380847fdaca000d592ee839aec795@vtiger.fosslabs.com>

#1259: i18n issues with Beta
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  developer
      Type:  defect     |      Status:  new      
  Priority:  minor      |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:             |    Keywords:           
------------------------+---------------------------------------------------
Comment (by anonymous):

 here is a bug (for minutes) in \Include\Utils\EditViewUtils.php

 35.364  $fieldvalue[] =
 array(array(0,32,'remdays','days',$rem_days),array(0,24,'remhrs','hours',$rem_hrs),array(1,60,'remmin','minutes
 before event',$rem_min));

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1259>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun  2 11:21:53 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 02 Jun 2006 18:21:53 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231259=3A?=
	=?utf-8?q?_i18n_issues_with_Beta?=
In-Reply-To: <076.f7b53125520cc2d8322c4161c2676a8c@vtiger.fosslabs.com>
References: <076.f7b53125520cc2d8322c4161c2676a8c@vtiger.fosslabs.com>
Message-ID: <085.6eb41505678cca6b9fe0bbcdcf273458@vtiger.fosslabs.com>

#1259: i18n issues with Beta
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  developer
      Type:  defect     |      Status:  new      
  Priority:  minor      |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:             |    Keywords:           
------------------------+---------------------------------------------------
Comment (by anonymous):

 Standard email snet by the CRM are hardcoded.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1259>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun  2 13:25:42 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 02 Jun 2006 20:25:42 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231261=3A?=
 =?utf-8?q?_vtigercrm-5=2E0-beta_tag_incorrect_for_release_process=2C_tag_?=
 =?utf-8?q?vtigercrm-5=2E0=2E0beta1_correctly?=
Message-ID: <076.cf0e2bb1cc2f75858999fd249d815604@vtiger.fosslabs.com>

#1261: vtigercrm-5.0-beta tag incorrect for release process, tag
vtigercrm-5.0.0beta1 correctly
------------------------------------------+---------------------------------
 Reporter:  jeffk                         |       Owner:  jeffk
     Type:  defect                        |      Status:  new  
 Priority:  major                         |   Milestone:  5.0.0
Component:  vtigercrm                     |     Version:  5.0.0
 Keywords:  packaging versioning release  |  
------------------------------------------+---------------------------------
 The recent release of 'vtigercrm-5.0-beta' was tagged, but in a way that
 does not adhere to release processes developed in the vtigercrm-4.2
 series.

 I will point out the problems, and re-tag the release correctly to fix the
 issue.

  - The release can't be named vtigercrm-5.0-beta, unless you expect to
 have only one beta

  - The release version shouldn't be 5.0, it should be 5.0.0. This is a
 style and process issue, but we're trying to make things as easy as
 possible for packagers (to attract their assistance) by using our three
 ordinal scheme everywhere. Major, Minor, Maintenance, suffix. This
 consistency will cover every type of release we need to make.

  - The directory for vtigercrm release tags is source:vtigercrm/tags, not
 source:tags. This is partially my fault, I haven't pushed to remove the
 obsolete directories left over by the cvs2svn conversion we did when
 leaving sourceforge. source:branches and source:tags are obsolete
 directories, we'll remove them soon.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1261>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun  2 13:31:09 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 02 Jun 2006 20:31:09 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231261=3A?=
 =?utf-8?q?_vtigercrm-5=2E0-beta_tag_incorrect_for_release_process=2C_tag_?=
 =?utf-8?q?vtigercrm-5=2E0=2E0beta1_correctly?=
In-Reply-To: <076.cf0e2bb1cc2f75858999fd249d815604@vtiger.fosslabs.com>
References: <076.cf0e2bb1cc2f75858999fd249d815604@vtiger.fosslabs.com>
Message-ID: <085.cf709c2a13257ed59bf3e4f4458be3ee@vtiger.fosslabs.com>

#1261: vtigercrm-5.0-beta tag incorrect for release process, tag
vtigercrm-5.0.0beta1 correctly
------------------------+---------------------------------------------------
  Reporter:  jeffk      |       Owner:  jeffk                       
      Type:  defect     |      Status:  new                         
  Priority:  major      |   Milestone:  5.0.0                       
 Component:  vtigercrm  |     Version:  5.0.0                       
Resolution:             |    Keywords:  packaging versioning release
------------------------+---------------------------------------------------
Comment (by jeffk):

 (In [6887]) refs #1261. retag vtigercrm-5.0.0beta1

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1261>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun  2 13:31:09 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 02 Jun 2006 20:31:09 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6887 -
	/vtigercrm/tags/vtigercrm-5.0.0beta1/
Message-ID: <20060602203109.C854B6205D5@vtiger.fosslabs.com>

Author: jeffk
Date: Fri Jun  2 14:31:07 2006
New Revision: 6887

Log:
refs #1261. retag vtigercrm-5.0.0beta1

Added:
    vtigercrm/tags/vtigercrm-5.0.0beta1/
      - copied from r6881, vtigercrm/trunk/



From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun  2 13:33:05 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 02 Jun 2006 20:33:05 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6888 -
	/tags/vtigercrm-5.0.0-beta/
Message-ID: <20060602203305.4CD255F7B09@vtiger.fosslabs.com>

Author: jeffk
Date: Fri Jun  2 14:33:03 2006
New Revision: 6888

Log:
fixes

Removed:
    tags/vtigercrm-5.0.0-beta/



From vtiger-tickets at vtiger.fosslabs.com  Fri Jun  2 13:41:18 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 02 Jun 2006 20:41:18 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231261=3A?=
 =?utf-8?q?_vtigercrm-5=2E0-beta_tag_incorrect_for_release_process=2C_tag_?=
 =?utf-8?q?vtigercrm-5=2E0=2E0beta1_correctly?=
In-Reply-To: <076.cf0e2bb1cc2f75858999fd249d815604@vtiger.fosslabs.com>
References: <076.cf0e2bb1cc2f75858999fd249d815604@vtiger.fosslabs.com>
Message-ID: <085.3a0b2770f3d97750ee800fc69d18a9e3@vtiger.fosslabs.com>

#1261: vtigercrm-5.0-beta tag incorrect for release process, tag
vtigercrm-5.0.0beta1 correctly
------------------------+---------------------------------------------------
  Reporter:  jeffk      |       Owner:  jeffk                       
      Type:  defect     |      Status:  closed                      
  Priority:  major      |   Milestone:  5.0.0                       
 Component:  vtigercrm  |     Version:  5.0.0                       
Resolution:  fixed      |    Keywords:  packaging versioning release
------------------------+---------------------------------------------------
Changes (by jeffk):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 Closing per r6888. I made a mistake in commit message (missing opening
 qoute),

 Can't use propset on this repository:
 {{{
 $ svn propset --revprop -r 6888 svn:log 'fixes #1261. remove improper tag
 vtigercrm-5.0-beta in obsolete root tags directory'
 svn: DAV request failed; it's possible that the repository's pre-revprop-
 change hook either failed or is non-existent
 svn: At least one property change failed; repository is unchanged
 }}}

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1261>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun  2 15:48:13 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 02 Jun 2006 22:48:13 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=2348=3A_S?=
 =?utf-8?q?ales_Orders_Created_from_Quote_are_not_saved_and_do_not_retain_?=
 =?utf-8?q?associations?=
In-Reply-To: <076.6d585e55b32136b76a36642c5be35e19@vtiger.fosslabs.com>
References: <076.6d585e55b32136b76a36642c5be35e19@vtiger.fosslabs.com>
Message-ID: <085.4b8c0cfa8dad7c2cbefba8a482f89bdf@vtiger.fosslabs.com>

#48: Sales Orders Created from Quote are not saved and do not retain
associations
-----------------------------------------------+----------------------------
  Reporter:  onwealdandy <arodes at onweald.com>  |       Owner:  developer
      Type:  defect                            |      Status:  reopened 
  Priority:  major                             |   Milestone:  4.2.4    
 Component:  vtigercrm                         |     Version:  4.2.3    
Resolution:                                    |    Keywords:  order    
-----------------------------------------------+----------------------------
Changes (by anonymous):

  * resolution:  fixed =>
  * status:  closed => reopened

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/48>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun  2 15:50:30 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 02 Jun 2006 22:50:30 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=2348=3A_S?=
 =?utf-8?q?ales_Orders_Created_from_Quote_are_not_saved_and_do_not_retain_?=
 =?utf-8?q?associations?=
In-Reply-To: <076.6d585e55b32136b76a36642c5be35e19@vtiger.fosslabs.com>
References: <076.6d585e55b32136b76a36642c5be35e19@vtiger.fosslabs.com>
Message-ID: <085.e46d55f9e3d361ee7e0b26f6b92c5716@vtiger.fosslabs.com>

#48: Sales Orders Created from Quote are not saved and do not retain
associations
-----------------------------------------------+----------------------------
  Reporter:  onwealdandy <arodes at onweald.com>  |       Owner:  developer
      Type:  defect                            |      Status:  reopened 
  Priority:  major                             |   Milestone:  4.2.4    
 Component:  vtigercrm                         |     Version:  4.2.3    
Resolution:                                    |    Keywords:  order    
-----------------------------------------------+----------------------------
Comment (by sebastian_sw at hotmail.com):

 i have this problem with invoice, quotes and orders.

 Any solution? maybe someone can attached the codes for this modules

 Thanks

 Seb

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/48>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun  2 17:07:02 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 03 Jun 2006 00:07:02 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6889 -
	/vtigercrm/tags/vtigercrm-4.2.4rc1/
Message-ID: <20060603000702.CBA4F64F5F5@vtiger.fosslabs.com>

Author: jeffk
Date: Fri Jun  2 18:07:01 2006
New Revision: 6889

Log:
remove unsupported prerelease tags after testing period ends. leave final release tags in place indefinitely, even after announced deprecation of support.

Removed:
    vtigercrm/tags/vtigercrm-4.2.4rc1/



From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun  2 17:07:16 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 03 Jun 2006 00:07:16 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6890 -
	/vtigercrm/tags/vtigercrm-4.2.4rc2/
Message-ID: <20060603000716.4BECD64F5F5@vtiger.fosslabs.com>

Author: jeffk
Date: Fri Jun  2 18:07:14 2006
New Revision: 6890

Log:
remove unsupported prerelease tags after testing period ends. leave final release tags in place indefinitely, even after announced deprecation of support.

Removed:
    vtigercrm/tags/vtigercrm-4.2.4rc2/



From vtiger-tickets at vtiger.fosslabs.com  Sat Jun  3 08:40:03 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sat, 03 Jun 2006 15:40:03 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231262=3A?=
 =?utf-8?q?_Products_not_being_listed_against_Accounts_when_Sales_Order/In?=
 =?utf-8?q?voice_created?=
Message-ID: <076.fd68f0c276cf51384c7c588eeaea61be@vtiger.fosslabs.com>

#1262: Products not being listed against Accounts when Sales Order/Invoice created
---------------------------------+------------------------------------------
 Reporter:  thealbs at yahoo.co.uk  |       Owner:  developer
     Type:  defect               |      Status:  new      
 Priority:  major                |   Milestone:           
Component:  vtigercrm            |     Version:  5.0.0    
 Keywords:  products             |  
---------------------------------+------------------------------------------
 Hi there

 the product looks great! I have one question regarding the link between
 Accounts and Products. Once the Account has completed a sales-
 order/invoice which has a number of Products listed on it, shouldn't those
 Products be listed against the Account?

 For example, ACME.COM ask for a quote for 5 new widgets.
 When the invoice is generated for the new widgets, then the five new
 widgets should be listed against the ACME.COM account record?

 For service providers this would make the product so much more usable!

 Thanks

 Brian

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1262>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Sat Jun  3 18:26:56 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sun, 04 Jun 2006 01:26:56 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231263=3A?=
 =?utf-8?q?_Miscellaneous_Formatting_Issues_on_Home_Page?=
Message-ID: <076.5f75ce96bab4ec540e83025d032a7109@vtiger.fosslabs.com>

#1263: Miscellaneous Formatting Issues on Home Page
-----------------------+----------------------------------------------------
 Reporter:  briand     |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  minor      |   Milestone:  4.2.5    
Component:  vtigercrm  |     Version:  4.2.4rc3 
 Keywords:             |  
-----------------------+----------------------------------------------------
 The following formatting issues are addressed in the patch.
 Incorrect class on table for Top Accounts.
 Missing black line on bottom of Top Accounts (not noticable in default
 theme).
 Too much space between Activities and Allocation when Accounts and
 Potentials do not exist.
 "None Scheduled" message relating to Potentials does not make sense for
 potentials and is not consistent with other Home sections.
 Spacing issues between Accounts and Potentials sections.
 Other miscellaneous HTML fixes.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1263>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun  5 04:18:55 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 05 Jun 2006 11:18:55 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6891 -
	/vtigercrm/trunk/install/3confirmConfig.php
Message-ID: <20060605111855.8F44A64F604@vtiger.fosslabs.com>

Author: don
Date: Mon Jun  5 05:18:50 2006
New Revision: 6891

Log:
check for mysql version made only for versions less than 4.1

Modified:
    vtigercrm/trunk/install/3confirmConfig.php

Modified: vtigercrm/trunk/install/3confirmConfig.php
==============================================================================
--- vtigercrm/trunk/install/3confirmConfig.php (original)
+++ vtigercrm/trunk/install/3confirmConfig.php Mon Jun  5 05:18:50 2006
@@ -102,7 +102,7 @@
 			-  specified database user, password, hostname, database type, or port is invalid.<BR>
 			-  specified database user does not have access to connect to the database server from the host';
 }
-elseif($db_type == 'mysql' && ($mysql_server_version < '4.1' || $mysql_server_version > '5.0.19'))
+elseif($db_type == 'mysql' && $mysql_server_version < '4.1')
 {
 	$error_msg = 'MySQL version '.$mysql_server_version.' is not supported, kindly connect to MySQL 4.1.x or above';
 }



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun  5 04:49:33 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 05 Jun 2006 11:49:33 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6892 - in
 /vtigercrm/trunk/modules/Rss: Rss.php language/en_us.lang.php
Message-ID: <20060605114933.E4AF364FD2B@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun  5 05:49:24 2006
New Revision: 6892

Log:
i18n updated for RSS Module - ahmed

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

Modified: vtigercrm/trunk/modules/Rss/Rss.php
==============================================================================
--- vtigercrm/trunk/modules/Rss/Rss.php (original)
+++ vtigercrm/trunk/modules/Rss/Rss.php Mon Jun  5 05:49:24 2006
@@ -259,7 +259,7 @@
 	function getStarredRssHTML()
 	{
 		global $adb;
-		global $image_path;
+		global $image_path,$mod_strings;
 
 		$sSQL = "select * from rss where starred=1";
 		$result = $adb->query($sSQL);
@@ -275,7 +275,7 @@
 				if(count($this->rss_object) > 10)
 				{
 					$shtml .= "<tr><td colspan='3' align=\"right\">
-						<a target=\"_BLANK\" href=\"$this->rss_link\">More...</a>
+						<a target=\"_BLANK\" href=\"$this->rss_link\">".$mod_strings['LBL_MORE']."</a>
 						</td></tr>";
 				}
 			}
@@ -292,8 +292,8 @@
 		}
 		$starredhtml  = "<table class='rssTable' cellspacing='0' cellpadding='0'>
 						<tr>
-       	                <th width='75%'>Subject</th>
-           	            <th width='25%'>Sender</th>
+       	                <th width='75%'>".$mod_strings['LBL_SUBJECT']."</th>
+           	            <th width='25%'>".$mod_strings['LBL_SENDER']."</th>
                    	    </tr>".$starredhtml."</table>";
 
 		return $starredhtml;
@@ -306,7 +306,7 @@
 	function getSelectedRssHTML($rssid)
 	{
 		global $adb;
-		global $image_path;
+		global $image_path, $mod_strings;
 
 		$sSQL = "select * from rss where rssid=".$rssid;
 		$result = $adb->query($sSQL);
@@ -322,7 +322,7 @@
 				if(count($this->rss_object) > 10)
 				{
 					$shtml .= "<tr><td colspan='3' align=\"right\">
-							<a target=\"_BLANK\" href=\"$this->rss_link\">More...</a>
+							<a target=\"_BLANK\" href=\"$this->rss_link\">".$mod_strings['LBL_MORE']."</a>
 							</td></tr>";
 				}
 			}
@@ -339,8 +339,8 @@
 		}
 		$starredhtml  = "<table class='rssTable' cellspacing='0' cellpadding='0'>
 						<tr>
-       	                <th width='75%'>Subject</th>
-           	            <th width='25%'>Sender</th>
+       	                <th width='75%'>".$mod_strings['LBL_SUBJECT']."</th>
+           	            <th width='25%'>".$mod_strings['LBL_SENDER']."</th>
                    	    </tr>".$starredhtml."</table>";
 
 		return $starredhtml;

Modified: vtigercrm/trunk/modules/Rss/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Rss/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Rss/language/en_us.lang.php Mon Jun  5 05:49:24 2006
@@ -32,6 +32,9 @@
 'LBL_POP_CRM_RSS'=>'Popular CRM Related Feeds',
 'LBL_ALL_RSS_FEEDS'=>'All RSS Feeds',
 
+'LBL_MORE'=>'More...',
+'LBL_SUBJECT'=>'Suject',
+'LBL_SENDER'=>'Sender',
 'LBL_CATEGORY'=>'Category :',
 'LBL_FEED'=>'Feed :',
 'LBL_ADD_RSS_FEED'=>'Add Rss Feed',



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun  5 05:04:34 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 05 Jun 2006 12:04:34 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6893 -
	/vtigercrm/trunk/Smarty/templates/HomePage.tpl
Message-ID: <20060605120434.A03E564FD35@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun  5 06:04:31 2006
New Revision: 6893

Log:
i18n updated for Homepage - ahmed

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 Mon Jun  5 06:04:31 2006
@@ -167,7 +167,7 @@
 		{/if}
            </tr>
 {/foreach}
-	<tr><td colspan="2" align="right" valign="bottom"><a href="index.php?module={$modulename}&action=index">more..</a></td></tr>
+	<tr><td colspan="2" align="right" valign="bottom"><a href="index.php?module={$modulename}&action=index">{$APP.LBL_MORE}..</a></td></tr>
 	</table>
 				
 			</div>



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun  5 05:24:48 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 05 Jun 2006 12:24:48 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6894 - in
 /vtigercrm/trunk/modules/Portal: Popup.php language/en_us.lang.php
Message-ID: <20060605122448.3E7D664FD3D@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun  5 06:24:43 2006
New Revision: 6894

Log:
i18n for MySites module updated - ahmed

Modified:
    vtigercrm/trunk/modules/Portal/Popup.php
    vtigercrm/trunk/modules/Portal/language/en_us.lang.php

Modified: vtigercrm/trunk/modules/Portal/Popup.php
==============================================================================
--- vtigercrm/trunk/modules/Portal/Popup.php (original)
+++ vtigercrm/trunk/modules/Portal/Popup.php Mon Jun  5 06:24:43 2006
@@ -26,25 +26,25 @@
 $portal_inputs.='<div style="display:block;position:relative;" id="orgLay">
 		<table border="0" cellpadding="5" cellspacing="0" width="100%">
 		<tbody><tr>
-			<td class="genHeaderSmall" align="left" width="30%">Add Bookmark</td>
+			<td class="genHeaderSmall" align="left" width="30%">' .$mod_strings['LBL_ADD'] .' '.$mod_strings['LBL_BOOKMARK'].'</td>
 			<td align="right" width="80%"><a href="javascript:fninvsh(\'orgLay\');"><img src="../themes/blue/images/close.gif" align="absmiddle" border="0"></a></td>
 		</tr>
 		<tr><td colspan="2"><hr></td></tr>
 		<tr>
 
-			<td align="right"><b>Bookmark URL :</b></td>
+			<td align="right"><b>'.$mod_strings['LBL_BOOKMARK'].' ' .$mod_strings['LBL_URL'] .' </b></td>
 			<td align="left"><input name="portalurl" id="portalurl" class="txtBox" value="'.$portalurl.'" type="text"></td>
 		</tr>
 		<tr>
-			<td align="right"><b>Bookmark Name : </b></td>
+			<td align="right"><b>'.$mod_strings['LBL_BOOKMARK'].' ' .$mod_strings['LBL_NAME'] .' </b></td>
 			<td align="left"><input name="portalname" id="portalname" value="'.$portalname.'" class="txtBox" type="text"></td>
 		</tr>
 		<tr><td style="border-bottom: 1px dashed rgb(204, 204, 204);" colspan="2">&nbsp;</td></tr>
 
 		<tr>
 			<td colspan="2" align="center">
-					<input name="save" value=" &nbsp;Save&nbsp; " class="classBtn" onClick="SaveSite(\''.$portalid.'\')" type="button">&nbsp;&nbsp;
-					<input name="cancel" value=" Cancel " class="classBtn" onclick="fninvsh(\'orgLay\');" type="button">
+					<input name="save" value=" &nbsp;{$APP.LBL_SAVE_BUTTON_LABEL}&nbsp; " class="classBtn" onClick="SaveSite(\''.$portalid.'\')" type="button">&nbsp;&nbsp;
+					<input name="cancel" value=" {$APP.LBL_CANCEL_BUTTON_LABEL}  " class="classBtn" onclick="fninvsh(\'orgLay\');" type="button">
 			</td>
 		</tr>
 		<tr><td colspan="2" style="border-top: 1px dashed rgb(204, 204, 204);">&nbsp;</td></tr>

Modified: vtigercrm/trunk/modules/Portal/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Portal/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Portal/language/en_us.lang.php Mon Jun  5 06:24:43 2006
@@ -17,6 +17,10 @@
 'LBL_BOOKMARK_LIST'=>'Bookmark List',
 'LBL_MY_BOOKMARKS'=>'My Bookmarks',
 'LBL_NEW_BOOKMARK'=>'New Bookmark',
+'LBL_BOOKMARK'=>'Bookmark',
+'LBL_NAME'=>'Name :',
+'LBL_URL'=>'URL :',
+'LBL_ADD'=>'Add',
 'LBL_SNO'=>'#',
 'LBL_BOOKMARK_NAME_URL'=>'Bookmark Name &amp; URL',
 'LBL_TOOLS'=>'Tools',



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun  5 05:44:43 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 05 Jun 2006 12:44:43 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6895 - in /vtigercrm/trunk:
 Smarty/templates/Calculator.tpl Smarty/templates/Clock.tpl
 modules/Utilities/Calculator.php
Message-ID: <20060605124443.A214364FD2D@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun  5 06:44:36 2006
New Revision: 6895

Log:
updated i18n for Clock & Calculator - ahmed

Modified:
    vtigercrm/trunk/Smarty/templates/Calculator.tpl
    vtigercrm/trunk/Smarty/templates/Clock.tpl
    vtigercrm/trunk/modules/Utilities/Calculator.php

Modified: vtigercrm/trunk/Smarty/templates/Calculator.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Calculator.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Calculator.tpl Mon Jun  5 06:44:36 2006
@@ -13,7 +13,7 @@
 <div id="calc" style="z-index:10000002">
 	<table class="leftFormBorder1" border="0" cellpadding="0" cellspacing="0" width="100%">
 		<tr class="lvtCol" style="cursor:move;" >
-			<td style="text-align:left;padding-left:5px;border-bottom:1px solid #666666;" id="calc_Handle">Calculator</td>
+			<td style="text-align:left;padding-left:5px;border-bottom:1px solid #666666;" id="calc_Handle">{$APP.LBL_CALCULATOR}</td>
 			<td align="right" style="padding:5px;border-bottom:1px solid #666666;">
 			<a href="javascript:;">
 			<img src="{$IMAGEPATH}close.gif" border="0"  onClick="fninvsh('calc')" hspace="5" align="absmiddle">

Modified: vtigercrm/trunk/Smarty/templates/Clock.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Clock.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Clock.tpl Mon Jun  5 06:44:36 2006
@@ -14,7 +14,7 @@
 	<table class="leftFormBorder1" align="center" border="0" cellpadding="2" cellspacing="0" width="100%">
 	<tbody>
 	<tr class="lvtCol" style="cursor:move;" >
-		<td style="text-align:left;padding-left:5px;border-bottom:1px solid #666666;" id="Handle">World Clock</td>
+		<td style="text-align:left;padding-left:5px;border-bottom:1px solid #666666;" id="Handle">{$APP.LBL_WORLD_CLOCK}</td>
 		<td align="right" style="padding:5px;border-bottom:1px solid #666666;">
 			<a href="javascript:;">
 				<img src="{$IMAGEPATH}close.gif" border="0"  onClick="fninvsh('wclock')" hspace="5" align="absmiddle">

Modified: vtigercrm/trunk/modules/Utilities/Calculator.php
==============================================================================
--- vtigercrm/trunk/modules/Utilities/Calculator.php (original)
+++ vtigercrm/trunk/modules/Utilities/Calculator.php Mon Jun  5 06:44:36 2006
@@ -16,13 +16,13 @@
 
 require_once('Smarty_setup.php');
 require_once("include/calculator/Calc.php");
-global $theme;
+global $theme,$app_strings;
 $theme_path="themes/".$theme."/";
 $image_path=$theme_path."images/";
 
 $smarty = new vtigerCRM_Smarty;
 
-
+$smarty->assign("APP", $app_strings);
 $smarty->assign("IMAGEPATH",$image_path);
 $smarty->assign("CALC",get_calc($image_path));
 $smarty->display("Calculator.tpl");



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun  5 06:37:01 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 05 Jun 2006 13:37:01 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6896 -
	/vtigercrm/trunk/modules/Calendar/addEventUI.php
Message-ID: <20060605133701.19E0764FCE7@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun  5 07:36:58 2006
New Revision: 6896

Log:
API docs updated

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

Modified: vtigercrm/trunk/modules/Calendar/addEventUI.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/addEventUI.php (original)
+++ vtigercrm/trunk/modules/Calendar/addEventUI.php Mon Jun  5 07:36:58 2006
@@ -72,6 +72,14 @@
 $calendar_arr['calendar'] = new Calendar($mysel,$date_data);
 $calendar_arr['view'] = $mysel;
 $calendar_arr['calendar']->hour_format = $current_user->hour_format;
+
+/**
+  *To construct time select combo box
+  *@param $format -- the format :: Type string
+  *@param $bimode -- The mode :: Type string
+  *constructs html select combo box for time selection 
+  *and returns it in string format.
+ */
 
  function getTimeCombo($format,$bimode)
  {



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun  5 06:38:43 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 05 Jun 2006 13:38:43 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6897 -
	/vtigercrm/trunk/modules/Calendar/Appointment.php
Message-ID: <20060605133844.117DE64FCE7@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun  5 07:38:40 2006
New Revision: 6897

Log:
API docs updated

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

Modified: vtigercrm/trunk/modules/Calendar/Appointment.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/Appointment.php (original)
+++ vtigercrm/trunk/modules/Calendar/Appointment.php Mon Jun  5 07:38:40 2006
@@ -41,7 +41,16 @@
 		$this->participant = Array();
 		$this->participant_state = Array();
 		$this->description = "";
-	}	
+	}
+	
+	/** To get the events of the specified user and shared events
+	  * @param $userid -- The user Id:: Type integer
+          * @param $from_datetime -- The start date Obj :: Type Array
+          * @param $to_datetime -- The end date Obj :: Type Array
+          * @param $view -- The calendar view :: Type String
+	  * @returns $list :: Type Array
+	 */
+	
 	function readAppointment($userid, &$from_datetime, &$to_datetime, $view)
 	{
 		global $current_user,$adb;
@@ -109,6 +118,11 @@
 		return $list;
 	}
 
+
+	/** To read and set the events value in Appointment Obj
+          * @param $act_array -- The activity array :: Type Array
+          * @param $view -- The calendar view :: Type String
+         */
 	function readResult($act_array, $view)
 	{
 		global $adb;
@@ -226,6 +240,11 @@
 	
 }
 
+/** To two array values
+  * @param $a -- The activity array :: Type Array
+  * @param $b -- The activity array :: Type Array
+  * @returns value 0 or 1 or -1 depends on comparision result
+ */
 function compare($a,$b)
 {
 	if ($a->start_time->ts == $b->start_time->ts)



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun  5 06:47:27 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 05 Jun 2006 13:47:27 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6898 -
	/vtigercrm/trunk/modules/Calendar/CalendarCommon.php
Message-ID: <20060605134728.13EDC64FCC2@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun  5 07:47:24 2006
New Revision: 6898

Log:
API docs updated

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

Modified: vtigercrm/trunk/modules/Calendar/CalendarCommon.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/CalendarCommon.php (original)
+++ vtigercrm/trunk/modules/Calendar/CalendarCommon.php Mon Jun  5 07:47:24 2006
@@ -17,10 +17,9 @@
 $image_path=$theme_path."images/";
 
 /**
- * Function to get the lists of sharedids 
- * This function accepts the user id as argument and
- * returns the shared ids related with the user id
- * as an array
+ * To get the lists of sharedids 
+ * @param $id -- The user id :: Type integer
+ * @returns $sharedids -- The shared users id :: Type Array
  */
 function getSharedUserId($id)
 {
@@ -37,10 +36,9 @@
 }
 
 /**
- * Function to get the lists of user ids who shared their calendar with an user
- * This function accepts the shared id as arguments and
- * returns the user ids related with the shared id
- * as a comma seperated string
+ * To get the lists of users id who shared their calendar with specified user
+ * @param $sharedid -- The shared user id :: Type integer
+ * @returns $shared_ids -- a comma seperated users id  :: Type string
  */
 function getSharedCalendarId($sharedid)
 {
@@ -57,39 +55,10 @@
 }
 
 /**
- * Function to get the label for user lists
- * Returns the label as an array
- */
-function getSharedUserListViewHeader()
-{
-	global $mod_strings;
-		$header_label=array($mod_strings['LBL_LIST_NAME'],
-			            $mod_strings['LBL_LIST_USER_NAME'],
-				   );
-	return $header_label;
-}
-
-/**
- * Function to get the entries for user lists
- * This function accepts the shared id as arguments and
- * returns the user entries related with the shared id
- * as an array
- */
-function getSharedUserListViewEntries($sharedid)
-{
-	global $adb;
-	$query = "SELECT * from users where id=".$sharedid;
-	$result =$adb->query($query);
-	$entries[]=$adb->query_result($result,0,'first_name').' '.$adb->query_result($result,0,'last_name');
-	$entries[]='<a href="index.php?action=DetailView&module=Users&parenttab=Settings&record='.$sharedid.'">'.$adb->query_result($result,0,'user_name').'</a>';
-	return $entries;
-
-}
-
-/**
- * Function to get userid and username of all users except the current user
- * @returns $userArray -- User Array in the following format:
- * $userArray=Array($userid1=>$username, $userid2=>$username,............,$useridn=>$username);
+ * To get userid and username of all users except the current user
+ * @param $id -- The user id :: Type integer
+ * @returns $user_details -- Array in the following format:
+ * $user_details=Array($userid1=>$username, $userid2=>$username,............,$useridn=>$username);
  */
 function getOtherUserName($id)
 {
@@ -107,6 +76,13 @@
 	return $user_details;
 }
 
+/**
+ * To get hour,minute and format
+ * @param $starttime -- The date&time :: Type string
+ * @param $endtime -- The date&time :: Type string
+ * @param $format -- The format :: Type string
+ * @returns $timearr :: Type Array
+*/
 function getaddEventPopupTime($starttime,$endtime,$format)
 {
 	$timearr = Array();



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun  5 06:49:15 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 05 Jun 2006 13:49:15 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6899 -
	/vtigercrm/trunk/modules/Calendar/calendarLayout.php
Message-ID: <20060605134915.092BE64FCC2@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun  5 07:49:11 2006
New Revision: 6899

Log:
API docs updated

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

Modified: vtigercrm/trunk/modules/Calendar/calendarLayout.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/calendarLayout.php (original)
+++ vtigercrm/trunk/modules/Calendar/calendarLayout.php Mon Jun  5 07:49:11 2006
@@ -13,8 +13,9 @@
 require_once('include/utils/CommonUtils.php');
 require_once('modules/Calendar/CalendarCommon.php');
 
-/** To construct calendar subtabs
-  * @param $param_arr -- The calendar object:: Type class Calendar
+/**
+  * To construct calendar subtabs
+  * @param $param_arr -- The calendar array :: Type Array
  */
 function calendar_layout(& $param_arr)
 {
@@ -69,8 +70,9 @@
 	
 }
 
-/** To construct small calendar 
-  * @param $cal -- The calendar object:: Type class Calendar
+/**
+  * To construct small(mini) calendar 
+  * @param $cal -- The calendar array:: Type Array
  */
 function get_mini_calendar(& $cal)
 {
@@ -139,9 +141,10 @@
 	
 }
 
-/*To construct calendar headertabs
- * @param $header -- The calendar object:: Type class Calendar
-*/
+/**
+  * To construct calendar headertabs
+  * @param $header -- The calendar array :: Type Array
+  */
 function get_cal_header_tab(& $header)
 {
 	global $mod_strings;
@@ -192,9 +195,10 @@
 	echo $tabhtml;
 }
 
-/*To display events/todos detail in calendar header
- *@param $cal_arr -- The calendar array:: Type Array 
-*/
+/**
+  * To display events/todos detail in calendar header
+  * @param $cal_arr -- The calendar array:: Type Array 
+  */
 function get_cal_header_data(& $cal_arr)
 {
 	global $mod_strings;
@@ -225,9 +229,10 @@
 		</table>";
 	echo $headerdata;	
 }
-/*To get View Combo box
- *@param $cal -- The calendar array:: Type Array
-*/
+/**
+  * To get View Combo box
+  * @param $cal -- The calendar array:: Type Array
+  */
 function getEventViewOption(& $cal)
 {
 	global $mod_strings;
@@ -238,9 +243,10 @@
 	return $view;
 }
 
-/*link to previous day/week/month/year view
- *@param $cal -- The calendar array:: Type Array
-*/
+/**
+  * link to previous day/week/month/year view
+  * @param $cal -- The calendar array:: Type Array
+  */
 function get_previous_cal(& $cal)
 {
         global $mod_strings;
@@ -248,9 +254,10 @@
 	return $link;
 }
 
-/*link to next day/week/month view
- *@param $cal -- The calendar array:: Type Array
-*/
+/**
+  * link to next day/week/month view
+  * @param $cal -- The calendar array:: Type Array
+  */
 function get_next_cal(& $cal)
 {
         global $mod_strings;
@@ -259,9 +266,10 @@
 
 }
 
-/*To display date info in calendar header
- *@param $cal -- The calendar array:: Type Array
-*/
+/**
+  * To display date info in calendar header
+  * @param $cal -- The calendar array:: Type Array
+  */
 function display_date($view,$date_time)
 {
 	if ($view == 'day')
@@ -298,9 +306,10 @@
         }
 
 }
-/*To get css class name for date
- *@param $slice_date -- The calendar date:: Type string
- *return css class name :: Type string 
+/**
+  * To get css class name for date
+  * @param $slice_date -- The calendar date:: Type string
+  * @returns css class name :: Type string 
 */
 function dateCheck($slice_date)
 {
@@ -315,10 +324,11 @@
 	}
 }
 
-/*To get day/week/month events Hourview
- @param $view -- The calendar array :: Type Array
- @param $type -- The type(to differntiate hourview and listview) :: Type string
-*/
+/**
+  * To get day/week/month events Hourview
+  * @param $view -- The calendar array :: Type Array
+  * @param $type -- The type(to differntiate hourview and listview) :: Type string
+  */
 function getHourView(& $view,$type = 'default' )
 {
 	if($view['view'] == 'day')
@@ -343,10 +353,11 @@
 	}
 }
 
-/*To get day/week/month events listview
- @param $cal -- The calendar array :: Type Array
- @param $mode -- The mode(to differntiate hourview and listview) :: Type string
-*/
+/**
+  * To get day/week/month events listview
+  * @param $cal -- The calendar array :: Type Array
+  * @param $mode -- The mode(to differntiate hourview and listview) :: Type string
+  */
 function getEventListView(& $cal,$mode='')
 {
 	if($cal['calendar']->view == 'day')
@@ -399,11 +410,12 @@
 	
 }
 
-/*To get day/week/month todos listview
- *@param $cal -- The calendar array :: Type Array
- *@param $check -- The check :: Type string
- *return todolist string or todo listview html depends on $check value
-*/
+/**
+  * To get day/week/month todos listview
+  * @param $cal -- The calendar array :: Type Array
+  * @param $check -- The check :: Type string
+  * @returns todolist string or todo listview html depends on $check value
+  */
 function getTodosListView($cal, $check='')
 {
 	if($cal['calendar']->view == 'day')
@@ -455,10 +467,11 @@
         }
 }
 
-/*To get calendar layout for dayview
- *@param $cal -- The calendar array :: Type Array
- *@param $type -- The type :: Type string
-*/
+/**
+  * To get calendar layout for dayview
+  * @param $cal -- The calendar array :: Type Array
+  * @param $type -- The type :: Type string
+  */
 function getDayViewLayout(& $cal,$type)
 {
 	global $current_user,$app_strings;
@@ -533,10 +546,11 @@
 	echo $dayview_layout;		
 }
 
-/*To get calendar layout for week view
- *@param $cal -- The calendar array :: Type Array
- *@param $type  -- The type :: Type string
-*/
+/**
+  * To get calendar layout for week view
+  * @param $cal -- The calendar array :: Type Array
+  * @param $type  -- The type :: Type string
+  */
 function getWeekViewLayout(& $cal,$type)
 {
 	global $current_user,$app_strings;
@@ -635,10 +649,11 @@
 		
 }
 	
-/*To get calendar layout for month view
- *@param $cal -- The calendar array :: Type Array
- *@param $type  -- The type :: Type string
-*/
+/**
+  * To get calendar layout for month view
+  * @param $cal -- The calendar array :: Type Array
+  * @param $type  -- The type :: Type string
+  */
 function getMonthViewLayout(& $cal,$type)
 {
 	global $current_user,$app_strings;
@@ -709,10 +724,11 @@
 		
 }
 
-/*To get calendar layout for year view
- *@param $cal -- The calendar array :: Type Array
- *@param $type  -- The type :: Type string
-*/
+/** 
+  * To get calendar layout for year view
+  * @param $cal -- The calendar array :: Type Array
+  * @param $type  -- The type :: Type string
+  */
 function getYearViewLayout(& $cal,$type)
 {
 	global $mod_strings;
@@ -817,11 +833,12 @@
 	
 }
 
-/*To display events in day view
- *@param $cal -- The calendar array :: Type Array
- *@param $slice  -- The slice(date and time) :: Type string
- *returns event in html div format
-*/
+/**
+  * To display events in day view
+  * @param $cal -- The calendar array :: Type Array
+  * @param $slice  -- The slice(date and time) :: Type string
+  * @returns $eventlayer(html div) -- Type string
+  */
 function getdayEventLayer(& $cal,$slice)
 {
 	global $mod_strings;
@@ -870,10 +887,11 @@
 	}
 }
 
-/*To display events in week view
- *@param $cal -- The calendar array :: Type Array
- *@param $slice  -- The slice(date) :: Type string
- *returns event in html div format
+/**
+  * To display events in week view
+  * @param $cal -- The calendar array :: Type Array
+  * @param $slice  -- The slice(date) :: Type string
+  * @returns $eventlayer(html div) -- Type string
 */
 function getweekEventLayer(& $cal,$slice)
 {
@@ -907,11 +925,12 @@
 			
 }
 
-/*To display events in month view
- *@param $cal -- The calendar array :: Type Array
- *@param $slice  -- The slice(date) :: Type string
- *returns event in html div format
-*/
+/**
+  * To display events in month view
+  * @param $cal -- The calendar array :: Type Array
+  * @param $slice  -- The slice(date) :: Type string
+  * @returns $eventlayer(html div) -- Type string
+  */
 function getmonthEventLayer(& $cal,$slice)
 {
 	global $mod_strings;
@@ -963,13 +982,14 @@
 
 }
 
-/*To get events list scheduled between specified dates
- *@param $calendar -- The calendar array :: Type Array
- *@param $start_date -- the start date :: Type string
- *@param $end_date -- the end date :: Type string
- *@param $info -- the info :: Type string
- *returns $Entries :: Type Array
-*/
+/**
+  * To get events list scheduled between specified dates
+  * @param $calendar -- The calendar array :: Type Array
+  * @param $start_date -- the start date :: Type string
+  * @param $end_date -- the end date :: Type string
+  * @param $info -- the info :: Type string
+  * @returns $Entries :: Type Array
+  */
 function getEventList(& $calendar,$start_date,$end_date,$info='')
 {
 	$Entries = Array();
@@ -1048,13 +1068,14 @@
 }
 
 
-/*To get todos list scheduled between specified dates
- *@param $calendar -- The calendar array :: Type Array
- *@param $start_date -- the start date :: Type string
- *@param $end_date -- the end date :: Type string
- *@param $info -- the info :: Type string
- *returns $Entries :: Type Array
-*/
+/**
+  * To get todos list scheduled between specified dates
+  * @param $calendar -- The calendar array :: Type Array
+  * @param $start_date -- the start date :: Type string
+  * @param $end_date -- the end date :: Type string
+  * @param $info -- the info :: Type string
+  * returns $Entries :: Type Array
+  */
 function getTodoList(& $calendar,$start_date,$end_date,$info='')
 {
         $Entries = Array();
@@ -1110,11 +1131,12 @@
 	return $Entries;
 }
 
-/*To get number of events and todos
- *@param $cal -- The calendar array :: Type Array
- *@param $mode  -- The mode :: Type string
- *return number of events and todos in Array format
-*/
+/**
+  * To get number of events and todos
+  * @param $cal -- The calendar array :: Type Array
+  * @param $mode  -- The mode :: Type string
+  * @returns $event_todo_info(number of events and todos) -- Type Array 
+  */
 function getEventTodoInfo(& $cal, $mode)
 {
 	global $mod_strings;
@@ -1133,10 +1155,11 @@
 	return $event_todo_info;
 }
 
-/*To construct event listview
- *@param $entry_list -- The event entries array :: Type Array
- *constructs event listview in HTML format
-*/
+/**
+  * To construct event listview
+  * @param $entry_list -- The event entries array :: Type Array
+  * constructs event listview in HTML format
+  */
 function constructEventListView($entry_list)
 {
 	global $mod_strings;
@@ -1188,11 +1211,12 @@
 	echo $list_view;
 }
 
-/*To construct todo listview
- *@param $todo_list -- The todo entries array :: Type Array
- *@param $cal -- The calendar array :: Type Array
- *constructs todo listview in HTML format
-*/
+/**
+  * To construct todo listview
+  * @param $todo_list -- The todo entries array :: Type Array
+  * @param $cal -- The calendar array :: Type Array
+  * constructs todo listview in HTML format
+  */
 function constructTodoListView($todo_list,$cal)
 {
 	global $mod_strings;



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun  5 07:37:24 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 05 Jun 2006 14:37:24 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6900 -
	/vtigercrm/trunk/modules/Contacts/vtchat.php
Message-ID: <20060605143724.8723464FD86@vtiger.fosslabs.com>

Author: don
Date: Mon Jun  5 08:37:20 2006
New Revision: 6900

Log:
issue in chat has been fixed

Modified:
    vtigercrm/trunk/modules/Contacts/vtchat.php

Modified: vtigercrm/trunk/modules/Contacts/vtchat.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/vtchat.php (original)
+++ vtigercrm/trunk/modules/Contacts/vtchat.php Mon Jun  5 08:37:20 2006
@@ -12,7 +12,7 @@
 <title>Ajax Css-Popup chat</title>
 
 <!-- NEEDED SCRIPTS  -->
-<script type="text/javascript" src="modules/Contacts/js/ajax.js"></script>
+<script type="text/javascript" src="include/js/ajax.js"></script>
 <script type="text/javascript" src="modules/Contacts/js/dom-drag_p.js"></script>
 <script type="text/javascript" src="modules/Contacts/js/css-window_p.js"></script>
 <script type="text/javascript" src="modules/Contacts/js/chat.js"></script>



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun  5 07:37:57 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 05 Jun 2006 14:37:57 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6901 -
	/vtigercrm/trunk/modules/Contacts/js/ajax.js
Message-ID: <20060605143758.0B16B64FD86@vtiger.fosslabs.com>

Author: don
Date: Mon Jun  5 08:37:54 2006
New Revision: 6901

Log:
duplicate file has been removed

Removed:
    vtigercrm/trunk/modules/Contacts/js/ajax.js



From vtiger-tickets at vtiger.fosslabs.com  Mon Jun  5 09:24:31 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 05 Jun 2006 16:24:31 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231264=3A?=
	=?utf-8?q?_MsSql_and_IIS_--_Please?=
Message-ID: <076.38e4ee7739ea23c2b97e6055bc35f7d1@vtiger.fosslabs.com>

#1264: MsSql and IIS -- Please
------------------------------------------+---------------------------------
 Reporter:  joe.green at heartlandfarms.com  |       Owner:  developer
     Type:  defect                        |      Status:  new      
 Priority:  major                         |   Milestone:           
Component:  vtigercrm                     |     Version:  5.0.0    
 Keywords:                                |  
------------------------------------------+---------------------------------
 You have a fantastic product, but most of my clients will insist on MsSql
 and IIS.

 Can you? / Would You?

 Please

 Thanks, Joe.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1264>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun  5 20:11:49 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 06 Jun 2006 03:11:49 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6902 -
	/vtigercrm/trunk/modules/Contacts/chat.php
Message-ID: <20060606031149.139FF7B36F1@vtiger.fosslabs.com>

Author: allanbush
Date: Mon Jun  5 21:11:45 2006
New Revision: 6902

Log:
SQL cleanup for postgres support.  Ref #752.

Modified:
    vtigercrm/trunk/modules/Contacts/chat.php

Modified: vtigercrm/trunk/modules/Contacts/chat.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/chat.php (original)
+++ vtigercrm/trunk/modules/Contacts/chat.php Mon Jun  5 21:11:45 2006
@@ -68,12 +68,12 @@
     // las message id received by user
     if(!isset($_SESSION["mlid"]))
       {
-	$res = $adb->query("show table status like 'chat_msg'");
+	$res = $adb->query("SELECT max(id) AS id FROM chat_msg");
 	$line = $adb->fetch_array($res);
-	if(intval($line['Auto_increment']) == 0)
+	if(intval($line['id']) == 0)
 	  $_SESSION["mlid"] = 0;
 	else
-	  $_SESSION["mlid"] = intval($line['Auto_increment']) - 1;
+	  $_SESSION["mlid"] = intval($line['id']) - 1;
       }
     
     // when the las user list was sended.
@@ -89,7 +89,7 @@
       }
     else
       {
-	$res = $adb->query("update chat_users set ping=now() where session='".session_id()."'");
+	      $res = $adb->query("UPDATE chat_users SET ping = ".$adb->database->sysTimeStamp." WHERE session = '".session_id()."'");
 	if($adb->getAffectedRowCount($res) == 0)
 	  {
 	    $this->setUserNick();
@@ -164,7 +164,7 @@
   {
 	global $current_user;	
 	global $adb;
-    $res = $adb->query("select id from chat_users where session='".session_id()."'");
+    $res = $adb->query("SELECT id FROM chat_users WHERE session = '".session_id()."'");
     if($adb->num_rows($res) > 0)
       {
 	$line = $adb->fetch_array($res);
@@ -172,14 +172,14 @@
 	return;
       }
     
-    $res = $adb->query("show table status like 'chat_users'");
-    $line = $adb->fetch_array($res);
-    if(intval($line['Auto_increment']) == 0)
-      $line['Auto_increment'] = 1;
-    
-    $_SESSION['chat_user'] = $line['Auto_increment'];
-    
-    $res = $adb->query("insert into chat_users set nick='".$current_user->user_name."',session='".session_id()."',ping=now(),ip='".$_SERVER['REMOTE_ADDR']."'");
+    $_SESSION['chat_user'] = $adb->getUniqueID('chat_users');
+    
+    $res = $adb->query("INSERT INTO chat_users (id, nick, session, ping, ip)
+   			 VALUES ('".$_SESSION['chat_user']."',
+			 	'".$current_user->user_name."',
+				 '".session_id()."',
+				 ".$adb->database->sysTimeStamp.",
+				 '".$_SERVER['REMOTE_ADDR']."')");
     //$res = $adb->query("select LAST_INSERT_ID()");
     //$line = $adb->fetch_array($res);
     //$_SESSION['chat_user'] = $line[0];
@@ -193,8 +193,10 @@
 	global $adb;
     global $chat_conf;
     $tmp = '';
-    $res = $adb->query("delete from chat_users where ((unix_timestamp(now())-unix_timestamp(ping))>'".$chat_conf['alive_time']."')");
-    $res = $adb->query("select id,nick from chat_users");
+    $delete_from = time() - $chat_conf['alive_time'];
+    $res = $adb->query("DELETE FROM chat_users
+    			WHERE ping > ".$adb->formatDate($delete_from));
+    $res = $adb->query("SELECT id, nick FROM chat_users");
     if($adb->num_rows($res)==0)
       {
 	$this->json = '';
@@ -227,7 +229,21 @@
 	global $adb;
     global $chat_conf;
     $format = '{"mlid":%s,"chat":%s,"from":"%s","msg":"%s"},';
-    $res = $adb->query("select ms.id mid,ms.chat_from mfrom,ms.chat_to mto,pv.id id,us.nick `from`,ms.msg msg from chat_users us,chat_pvchat pv,chat_msg ms where pv.msg=ms.id and us.id=ms.chat_from and ms.id>'".($_SESSION['mlid'])."' and ((ms.chat_from='".$_SESSION['chat_user']."' and ms.chat_to>0) or (ms.chat_to='".$_SESSION['chat_user']."' and ms.chat_from>0)) order by ms.born limit 0,".$chat_conf['msg_limit']);
+    $res = $adb->limitQuery("SELECT ms.id AS mid, ms.chat_from AS mfrom,
+   				 ms.chat_to AS mto,pv.id AS id,
+				 us.nick AS nfrom, ms.msg AS msg
+			FROM chat_users us
+			INNER JOIN chat_msg ms
+				ON us.id = ms.chat_from
+			INNER JOIN chat_pvchat pv
+				ON pv.msg = ms.id
+			WHERE ms.id > '".($_SESSION['mlid'])."'
+			AND (ms.chat_from = '".$_SESSION['chat_user']."'
+				AND ms.chat_to > 0)
+			OR (ms.chat_to = '".$_SESSION['chat_user']."'
+				AND ms.chat_from>0)
+			ORDER BY ms.born",
+			0, $chat_conf['msg_limit']);
     if($adb->num_rows($res)==0)
       {
 	$this->json = '';
@@ -242,7 +258,7 @@
 	else
 	  $cid = $line['mfrom'];
 
-	$tmp .= sprintf($format,$line['mid'],$cid,$line['from'],addslashes($line['msg']));
+	$tmp .= sprintf($format,$line['mid'],$cid,$line['nfrom'],addslashes($line['msg']));
       }
     $tmp = trim($tmp,',');
     $this->json = sprintf($this->json,$tmp);
@@ -258,7 +274,18 @@
 	global $adb;
     global $chat_conf;
     $format = '{"mlid":%s,"from":"%s","msg":"%s"},';
-    $res = $adb->query("select ms.id mid,ms.chat_from mfrom,ms.chat_to mto,p.id id,us.nick `from`,ms.msg msg from chat_users us,chat_pchat p,chat_msg ms where p.msg=ms.id and us.id=ms.chat_from and ms.id>'".($_SESSION['mlid'])."' and ms.chat_to=0 order by ms.born limit 0,".$chat_conf['msg_limit']);
+    $res = $adb->limitQuery("SELECT ms.id AS mid, ms.chat_from AS mfrom,
+    				ms.chat_to AS mto, p.id AS id,
+				us.nick AS nfrom, ms.msg AS msg
+			FROM chat_users us
+			INNER JOIN chat_msg ms
+				ON us.id = ms.chat_from
+			INNER JOIN chat_pchat p
+				ON p.msg = ms.id
+			WHERE ms.id > '".($_SESSION['mlid'])."'
+			AND ms.chat_to = 0
+			ORDER BY ms.born",
+			0, $chat_conf['msg_limit']);
     if($adb->num_rows($res)==0)
       {
 	$this->json = '';
@@ -268,7 +295,7 @@
     $tmp = '';
     while($line = $adb->fetch_array($res))
       {
-	$tmp .= sprintf($format,$line['mid'],$line['from'],addslashes($line['msg']));
+	$tmp .= sprintf($format,$line['mid'],$line['nfrom'],addslashes($line['msg']));
       }
     $tmp = trim($tmp,',');
     $this->json = sprintf($this->json,$tmp);
@@ -291,9 +318,13 @@
 	  case '\nick':
 	    if(isset($words[1]) && strlen($words[1]) > 3)
 	      {
-		$res = $adb->query("select nick from chat_users where id='".$_SESSION['chat_user']."'");
+		$res = $adb->query("SELECT nick
+				FROM chat_users
+				WHERE id= '".$_SESSION['chat_user']."'");
 		$line = $adb->fetch_array($res);
-		$res = $adb->query("update chat_users set nick='".addslashes($words[1])."' where id='".$_SESSION['chat_user']."'");
+		$res = $adb->query("UPDATE chat_users
+				SET nick = ".$adb->quote($words[1])."
+				WHERE id = '".$_SESSION['chat_user']."'");
 		$msg = '\sys <span class="sysb">'.$line['nick'].'</span> changed nick to <span class="sysb">'.$words[1].'</span>';
 	      }
 	    break;
@@ -315,13 +346,15 @@
     $msg = $this->msgParse($msg);
     if(strlen($msg) == 0) return;
     
-    $res = $adb->query("insert into chat_msg set `chat_from`='".$_SESSION['chat_user']."',`chat_to`='".$to."',born=now(),msg='".$msg."'");
+    $id = $adb->getUniqueID('chat_msg');
+    $res = $adb->query("INSERT INTO chat_msg (id, chat_from, chat_to, born, msg)
+    			VALUES (".$id.", '".$_SESSION['chat_user']."', '".$to."', ".$adb->database->sysTimeStamp.", '".$msg."')");
     
     $chat = "p";
     if($to != 0)
       $chat .= "v";
     
-    $res = $adb->query("insert into chat_".$chat."chat set msg=LAST_INSERT_ID()");
+      $res = $adb->query("INSERT INTO chat_".$chat."chat (msg) VALUES (".$id.")");
   }
 
   /**
@@ -330,7 +363,11 @@
   function pvClose($to)
   {
 	global $adb;
-    $res = $adb->query("delete from chat_msg where (`chat_from`='".$to."' and `chat_to`='".$_SESSION['chat_user']."') or (`chat_from`='".$_SESSION['chat_user']."' and `chat_to`='".$to."')");
+    $res = $adb->query("DELETE FROM chat_msg
+   			 WHERE (chat_from = '".$to."'
+				 AND chat_to = '".$_SESSION['chat_user']."')
+			 OR (chat_from = '".$_SESSION['chat_user']."'
+				 AND chat_to = '".$to."')");
   }
 }
 



From vtiger-tickets at vtiger.fosslabs.com  Tue Jun  6 00:29:15 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 06 Jun 2006 07:29:15 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231265=3A?=
 =?utf-8?q?_Global_Search_Function_throws_error?=
Message-ID: <076.76671c46776deb9518824e095947cbde@vtiger.fosslabs.com>

#1265: Global Search Function throws error
-----------------------+----------------------------------------------------
 Reporter:  anonymous  |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  major      |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 Searched for "?sterlich" with the global search function at Beta- Demo

 Warning: strstr(): Empty delimiter. in
 /home/site/html/products/crm/demo_5beta/modules/Home/UnifiedSearch.php on
 line 187

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1265>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun  6 00:33:13 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 06 Jun 2006 07:33:13 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231234=3A?=
 =?utf-8?q?_usability_issue_in_calendar?=
In-Reply-To: <076.8d042b2e895f5b682f940fd414e0a397@vtiger.fosslabs.com>
References: <076.8d042b2e895f5b682f940fd414e0a397@vtiger.fosslabs.com>
Message-ID: <085.852df4a3f37e1fb4069d7a2727f7cfd9@vtiger.fosslabs.com>

#1234: usability issue in calendar
---------------------------+------------------------------------------------
  Reporter:  jerrydgeorge  |       Owner:  mangai
      Type:  defect        |      Status:  new   
  Priority:  major         |   Milestone:        
 Component:  vtigercrm     |     Version:  5.0.0 
Resolution:                |    Keywords:        
---------------------------+------------------------------------------------
Comment (by anonymous):

 you may add, created by .. on .. and modified by ... on ...

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1234>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun  6 02:39:18 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 06 Jun 2006 09:39:18 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6903 - in /vtigercrm/trunk:
 Smarty/templates/Rss.tpl include/magpierss/extlib/Snoopy.class.inc
 modules/Rss/ListView.php modules/Rss/Popup.php modules/Rss/Rss.php
 schema/DatabaseSchema.xml
Message-ID: <20060606093918.000FE7B06E4@vtiger.fosslabs.com>

Author: don
Date: Tue Jun  6 03:39:08 2006
New Revision: 6903

Log:
rsscategory has been removed

Modified:
    vtigercrm/trunk/Smarty/templates/Rss.tpl
    vtigercrm/trunk/include/magpierss/extlib/Snoopy.class.inc
    vtigercrm/trunk/modules/Rss/ListView.php
    vtigercrm/trunk/modules/Rss/Popup.php
    vtigercrm/trunk/modules/Rss/Rss.php
    vtigercrm/trunk/schema/DatabaseSchema.xml

Modified: vtigercrm/trunk/Smarty/templates/Rss.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Rss.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Rss.tpl Tue Jun  6 03:39:08 2006
@@ -54,8 +54,7 @@
 	var ajaxObj = new VtigerAjax(ajaxRssSaveResponse);
 	rssurl = document.getElementById('rssurl').value;
 	rssurl = rssurl.replace(/&/gi,"##amp##");
-	var category = document.getElementById('rsscategory')[document.getElementById('rsscategory').selectedIndex].value;
-	var urlstring = 'module=Rss&action=RssAjax&vtigerfile=Popup&directmode=ajax&rsscategory='+category+'&rssurl='+rssurl;
+	var urlstring = 'module=Rss&action=RssAjax&vtigerfile=Popup&directmode=ajax&rssurl='+rssurl;
 	ajaxObj.process("index.php?",urlstring);
 }
 function ajaxRssSaveResponse(response)
@@ -168,10 +167,6 @@
 	<td align="left" width="70%"><input type="text" id="rssurl" class="txtBox" /></td>
 	</tr>
 	
-	<tr>
-	<td align="right"><b>{$MOD.LBL_CATEGORY}</b></td>
-	<td align="left"><select id="rsscategory" class="importBox" style="width:100%">{$RSSCATEG}</select></td>
-	</tr>
 	<tr><td colspan="2" style="border-bottom:1px dashed #CCCCCC;">&nbsp;</td></tr>
 	<tr>
 	<td	colspan="2" align="center">

Modified: vtigercrm/trunk/include/magpierss/extlib/Snoopy.class.inc
==============================================================================
--- vtigercrm/trunk/include/magpierss/extlib/Snoopy.class.inc (original)
+++ vtigercrm/trunk/include/magpierss/extlib/Snoopy.class.inc Tue Jun  6 03:39:08 2006
@@ -43,8 +43,8 @@
 
 	var $host			=	"www.php.net";		// host name we are connecting to
 	var $port			=	80;					// port we are connecting to
-	var $proxy_host		=	"";					// proxy host to use
-	var $proxy_port		=	"";					// proxy port to use
+	var $proxy_host		=	"192.168.4.158";					// proxy host to use
+	var $proxy_port		=	"80";					// proxy port to use
 	var $agent			=	"Snoopy v1.0";		// agent we masquerade as
 	var	$referer		=	"";					// referer info to pass
 	var $cookies		=	array();			// array of cookies to pass
@@ -63,8 +63,8 @@
 												// NOTE: this currently does not respect
 												// dates, domains or paths.
 	
-	var	$user			=	"";					// user for http authentication
-	var	$pass			=	"";					// password for http authentication
+	var	$user			=	"jerijohn";					// user for http authentication
+	var	$pass			=	"jerijohn";					// password for http authentication
 	
 	// http accept types
 	var $accept			=	"image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*";
@@ -427,10 +427,11 @@
 			   $headers .= "Accept-encoding: gzip\r\n";
 			}
 			else {
-			   trigger_error(
+				//commented to supress the warning
+			   /*trigger_error(
 			   	"use_gzip is on, but PHP was built without zlib support.".
 				"  Requesting file(s) without gzip encoding.", 
-				E_USER_NOTICE);
+				E_USER_NOTICE);*/
 			}
 		}
 		

Modified: vtigercrm/trunk/modules/Rss/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Rss/ListView.php (original)
+++ vtigercrm/trunk/modules/Rss/ListView.php Tue Jun  6 03:39:08 2006
@@ -81,7 +81,6 @@
 	require_once("modules/".$currentModule."/Forms.php");
 	if (function_exists('get_rssfeeds_form'))
 	{
-		$rss_form->assign("RSSCATEG", $oRss->getRsscategory_html());
 		$rss_form->assign("RSSFEEDS", get_rssfeeds_form());
 	}
 }

Modified: vtigercrm/trunk/modules/Rss/Popup.php
==============================================================================
--- vtigercrm/trunk/modules/Rss/Popup.php (original)
+++ vtigercrm/trunk/modules/Rss/Popup.php Tue Jun  6 03:39:08 2006
@@ -28,12 +28,11 @@
 elseif(isset($_REQUEST["rssurl"]))
 {
 	$newRssUrl = str_replace('##amp##','&',$_REQUEST["rssurl"]);
-	$rsscategory = $_REQUEST["rsscategory"];
 	$setstarred = 0;
 	$oRss = new vtigerRSS();
 	if($oRss->setRSSUrl($newRssUrl))
 	{
-			$result = $oRss->saveRSSUrl($newRssUrl,$setstarred,$rsscategory);
+			$result = $oRss->saveRSSUrl($newRssUrl,$setstarred);
         	if($result == false)
         	{
 				echo "Unable to save the RSS Feed URL" ;

Modified: vtigercrm/trunk/modules/Rss/Rss.php
==============================================================================
--- vtigercrm/trunk/modules/Rss/Rss.php (original)
+++ vtigercrm/trunk/modules/Rss/Rss.php Tue Jun  6 03:39:08 2006
@@ -96,15 +96,13 @@
 	}
 
 	/** Function to save the Rss Feeds  
-	  * This Function accepts the RssURl,RssCategory,Starred Status as arguments and 
+	  * This Function accepts the RssURl,Starred Status as arguments and 
 	  * returns true on sucess 
 	  * returns false if fails
 	 */
-	function saveRSSUrl($url,$makestarred=0,$rsscategory='')
-	{
-		global $adb;
-		if($rsscategory == '')
-			$rsscategory = 'vtiger Discussions';	
+	function saveRSSUrl($url,$makestarred=0)
+	{
+		global $adb;
 
 		if ($url != "")
 		{
@@ -114,8 +112,8 @@
 				$rsstitle = $url;
 			}
 			$genRssId = $adb->getUniqueID("rss");
-			$sSQL = "insert into rss (RSSID,RSSURL,RSSTITLE,RSSTYPE,STARRED,RSSCATEGORY) values (".$genRssId.",'".addslashes($url);
-			$sSQL .= "','".addslashes($rsstitle)."',0,".$makestarred.",'".addslashes($rsscategory)."')";
+			$sSQL = "insert into rss (RSSID,RSSURL,RSSTITLE,RSSTYPE,STARRED) values (".$genRssId.",'".addslashes($url);
+			$sSQL .= "','".addslashes($rsstitle)."',0,".$makestarred.")";
 			$result = $adb->query($sSQL);
 			if($result)
 			{
@@ -355,27 +353,11 @@
 	{
 		global $adb;
 		global $image_path;
-		$sSQL = "select * from rsscategory where presence = 1 order by sortorderid";
-		$result = $adb->query($sSQL);
-
-		while($categoryrow = $adb->fetch_array($result))
-		{
 			$shtml .= "<tr>
-						<td width=\"15\">
-						<div align=\"center\"><a href=\"javascript:;\" onClick=\"toggleRSSFolder('".$categoryrow["sortorderid"]."')\"><img id=\"".$categoryrow["sortorderid"]."_toggle\" src=\"".$image_path."plus.gif\" border=\"0\"></a></div>
-						</td>
-						<td width=\"20\">
-						<div align=\"center\"><img id=\"".$categoryrow["sortorderid"]."_folder\" src=\"".$image_path."rss_folder_cls.gif\"></div>
-						</td>
-						<td nowrap><a href=\"javascript:;\" onClick=\"toggleRSSFolder('".$categoryrow["sortorderid"]."')\" class=\"rssFolder\">".$categoryrow["rsscategory"]."</a>
-						</td>
-					  </tr>
-					  <tr>
 						<td colspan=\"3\">
-						<div id=\"".$categoryrow["sortorderid"]."_feeds\" style=\"display:none\"><table width=\"100%\" border=\"0\" cellspacing=\"2\" cellpadding=\"2\" style=\"margin:5 0 0 35\">".$this->getRssFeedsbyCategory($categoryrow["rsscategory"])."</table></div>
+						<table width=\"100%\" border=\"0\" cellspacing=\"2\" cellpadding=\"2\" style=\"margin:5 0 0 35\">".$this->getRssFeedsbyCategory()."</table>
 						</td>
 					  </tr>";
-		}
 
 		return $shtml;
 	}
@@ -384,13 +366,13 @@
 	  * This Function accepts the RssCategory as argument 
 	  * and returns the html string for the Rss feeds lists
 	 */
-	function getRssFeedsbyCategory($rsscategory)
-	{
-
-		global $adb;
-		global $image_path;
-
-		$sSQL = "select * from rss where rsscategory='".$rsscategory."'";
+	function getRssFeedsbyCategory()
+	{
+
+		global $adb;
+		global $image_path;
+
+		$sSQL = "select * from rss";
 		$result = $adb->query($sSQL);
 		while($allrssrow = $adb->fetch_array($result))
 		{

Modified: vtigercrm/trunk/schema/DatabaseSchema.xml
==============================================================================
--- vtigercrm/trunk/schema/DatabaseSchema.xml (original)
+++ vtigercrm/trunk/schema/DatabaseSchema.xml Tue Jun  6 03:39:08 2006
@@ -3181,33 +3181,6 @@
 		<field name="starred" type="I" size="1">
 			<default value="0" />
 		</field>
-		<field name="rsscategory" type="C" size="100">
-			<default value="" />
-		</field>
-	</table>
-
-	<table name="rsscategory">
-		<field name="rsscategoryid" type="I" size="19">
-			<key />
-			<autoincrement />
-		</field>
-		<field name="rsscategory" type="C" size="200">
-			<notnull />
-		</field>
-		<field name="sortorderid" type="I" size="19">
-			<notnull />
-			<default value="0" />
-		</field>
-		<field name="presence" type="I" size="1">
-			<notnull />
-			<default value="1" />
-		</field>
-
-		<index name="rsscategory_rsscategory">
-			<col>rsscategory</col>
-			<unique />
-		</index>
-		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
 	<table name="vendorcf">



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun  6 02:43:16 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 06 Jun 2006 09:43:16 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6904 -
	/vtigercrm/trunk/modules/Rss/Rss.php
Message-ID: <20060606094316.6D6CF7E84E3@vtiger.fosslabs.com>

Author: don
Date: Tue Jun  6 03:43:12 2006
New Revision: 6904

Log:
delete link has been removed

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

Modified: vtigercrm/trunk/modules/Rss/Rss.php
==============================================================================
--- vtigercrm/trunk/modules/Rss/Rss.php (original)
+++ vtigercrm/trunk/modules/Rss/Rss.php Tue Jun  6 03:43:12 2006
@@ -145,7 +145,7 @@
 			}
 			$shtml .= "<td class=\"rssTitle\"><a href=\"index.php?module=Rss&action=ListView&record=$allrssrow[rssid]
 				\" class=\"rssTitle\">".$allrssrow[rsstitle]."</a></td>";
-			$shtml .= "<td><a href=\"index.php?module=Rss&action=Delete&return_module=Rss&return_action=index&record=$allrssrow[rssid]\"><img src=\"".$image_path."del.gif\" border=\"0\" align=\"absmiddle\"></a></td></tr>";
+			$shtml .= "<td>&nbsp;</td></tr>";
 
 		}
 		return $shtml;
@@ -171,7 +171,7 @@
 				$shtml .= "<td width=\"15\">
 					<img src=\"".$image_path."offstar.gif\" align=\"absmiddle\" onMouseOver=\"this.style.cursor='pointer'\" id=\"star-$allrssrow[rssid]\"></td>";
 			}
-			$shtml .= "<td class=\"rssTitle\"><a href=\"index.php?module=Rss&action=ListView&record=$allrssrow[rssid]\" class=\"rssTitle\">".$allrssrow[rsstitle]."</a></td><td><a href=\"index.php?module=Rss&action=Delete&return_module=Rss&return_action=index&record=$allrssrow[rssid]\"><img src=\"".$image_path."del.gif\" border=\"0\" align=\"absmiddle\"></a></td>";
+			$shtml .= "<td class=\"rssTitle\"><a href=\"index.php?module=Rss&action=ListView&record=$allrssrow[rssid]\" class=\"rssTitle\">".$allrssrow[rsstitle]."</a></td><td>&nbsp;</td>";
 			$shtml .= "</tr>";
 
 		}
@@ -386,7 +386,7 @@
 				 	   $shtml .= "<img src=\"".$image_path."offstar.gif\" align=\"absmiddle\" onMouseOver=\"this.style.cursor='pointer'\" id=\"star-$allrssrow[rssid]\">";
 			}
 					   $shtml .= "</td>";
-			$shtml .= "<td class=\"rssTitle\" width=\"10%\" nowrap><a href=\"javascript:GetRssFeedList('$allrssrow[rssid]')\" class=\"rssTitle\">".$allrssrow[rsstitle]."</a></td><td><a href=\"javascript:DeleteRssFeeds('$allrssrow[rssid]');\"><img src=\"".$image_path."del.gif\"  border=\"0\" align=\"absmiddle\"></a></td>";
+			$shtml .= "<td class=\"rssTitle\" width=\"10%\" nowrap><a href=\"javascript:GetRssFeedList('$allrssrow[rssid]')\" class=\"rssTitle\">".$allrssrow[rsstitle]."</a></td><td>&nbsp;</td>";
 			$shtml .= "</tr>";
 		}
 		return $shtml;



From vtiger-tickets at vtiger.fosslabs.com  Tue Jun  6 02:48:13 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 06 Jun 2006 09:48:13 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231266=3A?=
 =?utf-8?q?_Email_Opt-out_missing_in_Leads?=
Message-ID: <076.98612190c9a98af18e148b6e53d138fc@vtiger.fosslabs.com>

#1266: Email Opt-out missing in Leads
-------------------------+--------------------------------------------------
 Reporter:  gopal        |       Owner:  developer
     Type:  enhancement  |      Status:  new      
 Priority:  major        |   Milestone:           
Component:  vtigercrm    |     Version:  5.0.0    
 Keywords:               |  
-------------------------+--------------------------------------------------
 Email Opt-out function is missing in Lead page where it is available in
 Contact page. It is better to have Opt-out option in Leads also as people
 can send mass emails based on lead data.
 Gopal

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1266>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun  6 02:52:48 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 06 Jun 2006 09:52:48 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231267=3A?=
	=?utf-8?q?_Reports_for_Management?=
Message-ID: <076.7d4de1023a5c8c54e4e4d481bd7635f2@vtiger.fosslabs.com>

#1267: Reports for Management
-------------------------+--------------------------------------------------
 Reporter:  anonymous    |       Owner:  developer
     Type:  enhancement  |      Status:  new      
 Priority:  major        |   Milestone:           
Component:  vtigercrm    |     Version:  5.0.0    
 Keywords:               |  
-------------------------+--------------------------------------------------
 It is paramount for managers to know how much the CRM is used by the
 staff. Therefore, a report is required that presents the users activities
 (created, modified CRM entries) ba a users report only visible to the
 management.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1267>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun  6 07:33:01 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 06 Jun 2006 14:33:01 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231268=3A?=
 =?utf-8?q?_Error_in_Email_language_file?=
Message-ID: <076.e552d828a7b238f9e865edf84f9ad995@vtiger.fosslabs.com>

#1268: Error in Email language file
-----------------------+----------------------------------------------------
 Reporter:  anonymous  |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  critical   |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 If you change the entry of 'LBL_EMAIL_INFORMATION'=>'Email Information',
 at the language file let say to 'LBL_EMAIL_INFORMATION'=>'E-Mail
 Information',
 you will be unable to create a new email.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1268>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun  6 07:44:48 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 06 Jun 2006 14:44:48 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6905 - in /vtigercrm/trunk:
 Smarty/templates/DetailView.tpl Smarty/templates/DetailViewUI.tpl
 include/js/dtlviewajax.js
Message-ID: <20060606144448.595167E8500@vtiger.fosslabs.com>

Author: don
Date: Tue Jun  6 08:44:42 2006
New Revision: 6905

Log:
inplace edit has been reverted back

Modified:
    vtigercrm/trunk/Smarty/templates/DetailView.tpl
    vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl
    vtigercrm/trunk/include/js/dtlviewajax.js

Modified: vtigercrm/trunk/Smarty/templates/DetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DetailView.tpl Tue Jun  6 08:44:42 2006
@@ -15,6 +15,10 @@
 
 
 <script language="JavaScript" type="text/javascript" src="include/js/dtlviewajax.js"></script>
+<span id="crmspanid" style="display:none;position:absolute;"  onmouseover="show('crmspanid');">
+   <a class="link"  align="right" href="javascript:;">Edit</a>
+</span>
+
 {if $MODULE eq 'Leads' or $MODULE eq 'Contacts' or $MODULE eq 'Accounts'}
 <div id="sendmail_cont" style="z-index:100001;position:absolute;"></div>
 {/if}

Modified: vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl Tue Jun  6 08:44:42 2006
@@ -13,57 +13,137 @@
 -->*}
 
 <!-- This file is used to display the fields based on the ui type in detailview -->
-{if $keyid eq '1' || $keyid eq 2 || $keyid eq '11' || $keyid eq '7' || $keyid eq '9' || $keyid eq '55' || $keyid eq '71' || $keyid eq '72'} <!--TextBox-->
-	<td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" >
-		{if $keyid eq '55'}<!--SalutationSymbol-->
-			{$keysalut}
-		{/if}
-
-		<div id="dtlview_{$label}" onClick="hndMouseOver({$keyid},'{$label}');">{$keyval}&nbsp;</div>
-		<div id="editarea_{$label}" style="display:none;">
-			<input class="detailedViewTextBox" onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" type="text" id="txtbox_{$label}" name="{$keyfldname}" maxlength='100' value="{$keyval}"></input>
-			<br>
-			<input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');"/> or
-			<a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
-		</div>
-	</td>
-{elseif $keyid eq '13'} <!--Email-->
-                     <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}"><div id="dtlview_{$label}"  onClick="hndMouseOver({$keyid},'{$label}');">
-			{if $INT_MAILER eq 'true'}
-				<a href="javascript:InternalMailer('{$keyval}','email_addy');">&nbsp;{$keyval}</a></div>
-			{else}
-				<a href="mailto:{$keyval}" target="_blank">&nbsp;{$keyval}</a></div>
-			{/if}
-                	 <div id="editarea_{$label}" style="display:none;">
-    	                 <input class="detailedViewTextBox" onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" type="text" id="txtbox_{$label}" name="{$keyfldname}" maxlength='100' value="{$keyval}"></input>
-	                      <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');"/> or
-                    	  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
-                     </div>
-                     </td>
-                     {elseif $keyid eq '15' || $keyid eq '16'} <!--ComboBox-->
-       				 <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}"><div id="dtlview_{$label}"  onClick="hndMouseOver({$keyid},'{$label}');">&nbsp;{$keyval}</div>
-                     <div id="editarea_{$label}" style="display:none;">
-                     <select id="txtbox_{$label}" name="{$keyfldname}">
-                     {foreach item=arr from=$keyoptions}
-                     	{foreach key=sel_value item=value from=$arr}
-                        	<option value="{$sel_value}" {$value}>{$sel_value}</option>
-                        {/foreach}
-                     {/foreach}
-                     </select>
-                     <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');"/> or
-                     <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
-                   	</div>
-                   	</td>
-                    {elseif $keyid eq '53'} <!--Assigned To-->
-                    <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}">
-                    <div id="dtlview_{$label}" onClick="hndMouseOver({$keyid},'{$label}');">
+		{if $keyid eq '1' || $keyid eq 2 || $keyid eq '11' || $keyid eq '7' || $keyid eq '9' || $keyid eq '55' || $keyid eq '71' || $keyid eq '72'} <!--TextBox-->
+                                         		<td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">
+                                         		      {if $keyid eq '55'}<!--SalutationSymbol-->
+                                         		            {$keysalut}
+                                         		      {elseif $keyid eq '71' || $keyid eq '72'}  <!--CurrencySymbol-->
+                                         		            {$keycursymb}
+                                                        {/if}
+                                                       <span id="dtlview_{$label}">{$keyval}</span>
+                                              		<div id="editarea_{$label}" style="display:none;">
+                                              		  <input class="detailedViewTextBox" onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" type="text" id="txtbox_{$label}" name="textbox_{$label}" maxlength='100' value="{$keyval}"></input>
+                                              		  <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
+                                                       </div>
+                                                  </td>
+                                             {elseif $keyid eq '13'} <!--Email-->
+                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}"><a href="mailto:{$keyval}" target="_blank">{$keyval}</a></span>
+                                              		<div id="editarea_{$label}" style="display:none;">
+                                              		  <input class="detailedViewTextBox" onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" type="text" id="txtbox_{$label}" name="textbox_{$label}" maxlength='100' value="{$keyval}"></input>
+                                              		  <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
+                                                       </div>
+                                                  </td>
+                                             {elseif $keyid eq '15' || $keyid eq '16'} <!--ComboBox-->
+               							<td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}">{$keyval}</span>
+                                              		<div id="editarea_{$label}" style="display:none;">
+                    							   <select id="txtbox_{$label}" name="{$keyfldname}">
+                    								{foreach item=arr from=$keyoptions}
+                    									{foreach key=sel_value item=value from=$arr}
+                    										<option value="{$sel_value}" {$value}>{$sel_value}</option>
+                    									{/foreach}
+                    								{/foreach}
+                    							   </select>
+                    							   <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                              		   <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
+                    							</div>
+               							</td>
+                                             {elseif $keyid eq '17'} <!--WebSite-->
+                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}"><a href="http://{$keyval}" target="_blank">{$keyval}</a></span>
+                                              		<div id="editarea_{$label}" style="display:none;">
+                                              		  <input class="detailedViewTextBox" onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" type="text" id="txtbox_{$label}" name="textbox_{$label}" maxlength='100' value="{$keyval}"></input>
+                                              		  <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
+                                                       </div>
+                                                  </td>
+                                             {elseif $keyid eq '19' || $keyid eq '20'} <!--TextArea/Description-->
+                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}">{$keyval}</span>
+                                              		<div id="editarea_{$label}" style="display:none;">
+                                              		  <textarea id="txtbox_{$label}" name="txtbox_{$label}"  class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'"onBlur="this.className='detailedViewTextBox'" cols="90" rows="8">{$keyval}</textarea>                                            		  
+                                              		  <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
+                                                       </div>
+                                                  </td>
+                                             {elseif $keyid eq '21' || $keyid eq '24' || $keyid eq '22'} <!--TextArea/Street-->
+                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}">{$keyval}</span>
+                                              		<div id="editarea_{$label}" style="display:none;">
+                                              		  <textarea id="txtbox_{$label}" name="txtbox_{$label}"  class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'"onBlur="this.className='detailedViewTextBox'" rows=2>{$keyval}</textarea>                                            		  
+                                              		  <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
+                                                       </div>
+                                                  </td>
+                                             {elseif $keyid eq '50' || $keyid eq '73' || $keyid eq '51'} <!--AccountPopup-->
+                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}"><a href="{$keyseclink}">{$keyval}</a></span>
+                                              		<div id="editarea_{$label}" style="display:none;">                                              		  
+                                                         <input readonly id="popuptxt_{$label}" name="account_name" type="text" value="{$keyval}"><input id="txtbox_{$label}" name="{$keyfldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Accounts&action=Popup&popuptype=specific&form=TasksEditView&form_submit=false","test","width=600,height=400,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'>
+                                                         <!--AccountPopup/WithClear-->{if $keyid eq '51'} &nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.account_id.value=''; this.form.account_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>{/if} 
+                                              		  <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
+                                                       </div>
+                                                  </td>
+                                             {elseif $keyid eq '57'} <!--ContactPopup-->
+                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}"><a href="{$keyseclink}">{$keyval}</a></span>
+                                              		<div id="editarea_{$label}" style="display:none;">                                              		  
+                                                         <input id="popuptxt_{$label}" name="contact_name" readonly type="text" style="border:1px solid #bababa;" value="{$keyval}"><input id="txtbox_{$label}" name="{$keyfldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Contacts&action=Popup&html=Popup_picker&popuptype=specific&form=EditView","test","width=600,height=400,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.contact_id.value=''; this.form.contact_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
+                                                         <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
+                                                       </div>
+                                                  </td>                                                  
+                                             {elseif $keyid eq '59'} <!--ProductPopup-->
+                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}"><a href="{$keyseclink}">{$keyval}</a></span>
+                                              		<div id="editarea_{$label}" style="display:none;">                                              		  
+                                                         <input id="popuptxt_{$label}" name="product_name" readonly type="text" value="{$keyval}"><input id="txtbox_{$label}" name="{$keyfldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Products&action=Popup&html=Popup_picker&form=HelpDeskEditView&popuptype=specific","test","width=600,height=400,resizable=1,scrollbars=1,top=150,left=200");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.product_id.value=''; this.form.product_name.value=''; return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
+                                                         <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
+                                                       </div>
+                                                  </td>
+                                             {elseif $keyid eq '75' || $keyid eq '81'} <!--VendorPopup-->
+                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}"><a href="{$keyseclink}">{$keyval}</a></span>
+                                              		<div id="editarea_{$label}" style="display:none;">
+                                                         <input id="popuptxt_{$label}" name="vendor_name" readonly type="text" style="border:1px solid #bababa;" value="{$keyval}"><input id="txtbox_{$label}" name="{$fldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Vendors&action=Popup&html=Popup_picker&popuptype=specific&form=EditView","test","width=600,height=400,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'>
+                                                         {if $uitype eq 75}&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.vendor_id.value='';this.form.vendor_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>{/if}                                              		  
+                                                         <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
+                                                       </div>
+                                                  </td>
+                                             {elseif $keyid eq 76} <!--PotentialPopup-->
+                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}"><a href="{$keyseclink}">{$keyval}</a></span>
+                                              		<div id="editarea_{$label}" style="display:none;">                                              		  
+                                                         <input id="popuptxt_{$label}" name="potential_name" readonly type="text" style="border:1px solid #bababa;" value="{$keyval}"><input id="txtbox_{$label}" name="{$keyfldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Potentials&action=Popup&html=Popup_picker&popuptype=specific_potential_account_address&form=EditView","test","width=600,height=400,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.potential_id.value=''; this.form.potential_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
+                                                         <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
+                                                       </div>
+                                                  </td>
+                                             {elseif $keyid eq 78} <!--QuotePopup-->
+                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}"><a href="{$keyseclink}">{$keyval}</a></span>
+                                              		<div id="editarea_{$label}" style="display:none;">                                              		  
+                                                         <input id="popuptxt_{$label}" name="quote_name" readonly type="text" style="border:1px solid #bababa;" value="{$keyval}"><input id="txtbox_{$label}" name="{$keyfldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Quotes&action=Popup&html=Popup_picker&popuptype=specific&form=EditView","test","width=600,height=400,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.quote_id.value=''; this.form.quote_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
+                                                         <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
+                                                       </div>
+                                                  </td>
+                                             {elseif $keyid eq 82} <!--Email Body-->
+                                                  <td colspan="3" width=100% class="dvtCellInfo" align="left"><div id="dtlview_{$label}" style="width:100%;height:200px;overflow:hidden;border:1px solid gray" class="detailedViewTextBox" onmouseover="this.className='detailedViewTextBoxOn'" onmouseout="this.className='detailedViewTextBox'">{$keyval}</div>
+                                                  </td>
+                                             {elseif $keyid eq 80} <!--SalesOrderPopup-->
+                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}"><a href="{$keyseclink}">{$keyval}</a></span>
+                                              		<div id="editarea_{$label}" style="display:none;">                                              		  
+                                                         <input id="popuptxt_{$label}" name="salesorder_name" readonly type="text" style="border:1px solid #bababa;" value="{$keyval}"><input id="txtbox_{$label}" name="{$keyfldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=SalesOrder&action=Popup&html=Popup_picker&popuptype=specific&form=EditView","test","width=600,height=400,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.salesorder_id.value=''; this.form.salesorder_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
+                                                         <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
+                                                       </div>
+                                                  </td>
+					{elseif $keyid eq '53'} <!--Assigned To-->
+                    <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">
+                    <span id="dtlview_{$label}">
                     {if $keyseclink eq ''}
                         {$keyval}
                     {else}
                         <a href="{$keyseclink}">{$keyval}</a>         
                     {/if}
 					&nbsp;
-                    </div>
+                    </span>
                     <div id="editarea_{$label}" style="display:none;">
                    	<input type="hidden" id="hdtxt_{$label}" value="{$keyval}"></input>
                    	<select id="txtbox_{$label}" onchange="setSelectValue('{$label}')" name="{$keyfldname}">
@@ -78,45 +158,8 @@
                     <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
                     </div>
                     </td>
-                    {elseif $keyid eq '17'} <!--WebSite-->
-                    <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}"><div id="dtlview_{$label}"  onClick="hndMouseOver({$keyid},'{$label}');"><a href="http://{$keyval}" target="_blank">&nbsp;{$keyval}</a></div>
-                    <div id="editarea_{$label}" style="display:none;">
-                      <input class="detailedViewTextBox" onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" type="text" id="txtbox_{$label}" name="{$keyfldname}" maxlength='100' value="{$keyval}"></input>
-                      <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');"/> or
-                      <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
-                    </div>
-                    </td>
-                    {elseif $keyid eq '19' || $keyid eq '20'} <!--TextArea/Description-->
-			<!-- In Add Comment are we should not display anything -->
-			{if $label eq 'Add Comment'}
-				{assign var=keyval value=""}
-			{/if}
-                    <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}"><div id="dtlview_{$label}"  onClick="hndMouseOver({$keyid},'{$label}');">&nbsp;{$keyval}</div>
-                   	<div id="editarea_{$label}" style="display:none;">
-                    <textarea id="txtbox_{$label}" name="txtbox_{$label}"  class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'"onBlur="this.className='detailedViewTextBox'" cols="90" rows="8">{$keyval}</textarea>                                            		  
-                    <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');"/> or
-                    <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
-                    </div>
-                    </td>
-                    {elseif $keyid eq '21' || $keyid eq '24' || $keyid eq '22'} <!--TextArea/Street-->
-                    <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}"><div id="dtlview_{$label}"  onClick="hndMouseOver({$keyid},'{$label}');">&nbsp;{$keyval}</div>
-                    <div id="editarea_{$label}" style="display:none;">
-                      <textarea id="txtbox_{$label}" name="txtbox_{$label}"  class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'"onBlur="this.className='detailedViewTextBox'" rows=2>{$keyval}</textarea>                                            		  
-                      <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');"/> or
-                      <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
-                     </div>
-                     </td>
-                     {elseif $keyid eq '50' || $keyid eq '73' || $keyid eq '51'} <!--AccountPopup-->
-                     <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}"><div id="dtlview_{$label}"  onClick="hndMouseOver({$keyid},'{$label}');"><a href="{$keyseclink}">&nbsp;{$keyval}</a></div>
-                    	<div id="editarea_{$label}" style="display:none;">                                              		  
-                        <input readonly id="popuptxt_{$label}" name="account_name" type="text" value="{$keyval}"><input id="txtbox_{$label}" name="{$keyfldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Accounts&action=Popup&popuptype=specific&form=TasksEditView&form_submit=false","test","width=600,height=400,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'>
-                       <!--AccountPopup/WithClear-->{if $keyid eq '51'} &nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.account_id.value=''; this.form.account_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>{/if} 
-                       <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');"/> or
-                       <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
-                       </div>
-                    </td>
-                    {elseif $keyid eq '56'} <!--CheckBox--> 
-                      <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}"><div id="dtlview_{$label}" onClick="hndMouseOver({$keyid},'{$label}');">{$keyval}&nbsp;</div>
+					    {elseif $keyid eq '56'} <!--CheckBox--> 
+                      <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onMouseOver="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}">{$keyval}&nbsp;</span>
                     	<div id="editarea_{$label}" style="display:none;">
                         {if $keyval eq 'yes'}                                              		  
                             <input id="txtbox_{$label}" type="checkbox" style="border:1px solid #bababa;" checked value="1">
@@ -127,58 +170,6 @@
                           <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
                         </div>
                         </td>     
-                        {elseif $keyid eq '57'} <!--ContactPopup-->
-                             <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}"><div id="dtlview_{$label}" onClick="hndMouseOver({$keyid},'{$label}');"><a href="{$keyseclink}">&nbsp;{$keyval}</a></div>
-                        		<div id="editarea_{$label}" style="display:none;">                                              		  
-                               <input id="popuptxt_{$label}" name="contact_name" readonly type="text" style="border:1px solid #bababa;" value="{$keyval}"><input id="txtbox_{$label}" name="{$keyfldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Contacts&action=Popup&html=Popup_picker&popuptype=specific&form=EditView","test","width=600,height=400,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.contact_id.value=''; this.form.contact_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
-                                 <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');"/> or
-                        		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
-                         </div>
-                          </td>                                                  
-                          {elseif $keyid eq '59'} <!--ProductPopup-->
-                             <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}"><div id="dtlview_{$label}"  onClick="hndMouseOver({$keyid},'{$label}');"><a href="{$keyseclink}">&nbsp;{$keyval}</a></div>
-                       		<div id="editarea_{$label}" style="display:none;">                                              		  
-                            <input id="popuptxt_{$label}" name="product_name" readonly type="text" value="{$keyval}"><input id="txtbox_{$label}" name="{$keyfldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Products&action=Popup&html=Popup_picker&form=HelpDeskEditView&popuptype=specific","test","width=600,height=400,resizable=1,scrollbars=1,top=150,left=200");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.product_id.value=''; this.form.product_name.value=''; return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
-                             <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');"/> or
-                       		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
-                         </div>
-                         </td>
-                      {elseif $keyid eq '75' || $keyid eq '81'} <!--VendorPopup-->
-                        <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}"><div id="dtlview_{$label}"  onClick="hndMouseOver({$keyid},'{$label}');"><a href="{$keyseclink}">&nbsp;{$keyval}</a></div>
-                      	<div id="editarea_{$label}" style="display:none;">
-                        <input id="popuptxt_{$label}" name="vendor_name" readonly type="text" style="border:1px solid #bababa;" value="{$keyval}"><input id="txtbox_{$label}" name="{$fldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Vendors&action=Popup&html=Popup_picker&popuptype=specific&form=EditView","test","width=600,height=400,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'>
-                    {if $uitype eq 75}&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.vendor_id.value='';this.form.vendor_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>{/if}                                              		  
-                     <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');"/> or
-                     <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
-                     </div>
-                     </td>
-                     {elseif $keyid eq 76} <!--PotentialPopup-->
-                           <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}"><div id="dtlview_{$label}"  onClick="hndMouseOver({$keyid},'{$label}');"><a href="{$keyseclink}">&nbsp;{$keyval}</a></div>
-                      		<div id="editarea_{$label}" style="display:none;">                                              		  
-                            <input id="popuptxt_{$label}" name="potential_name" readonly type="text" style="border:1px solid #bababa;" value="{$keyval}"><input id="txtbox_{$label}" name="{$keyfldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Potentials&action=Popup&html=Popup_picker&popuptype=specific_potential_account_address&form=EditView","test","width=600,height=400,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.potential_id.value=''; this.form.potential_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
-                            <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');"/> or
-                     	  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
-                       </div>
-                       </td>
-                       {elseif $keyid eq 78} <!--QuotePopup-->
-                        <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}"><div id="dtlview_{$label}"  onClick="hndMouseOver({$keyid},'{$label}');"><a href="{$keyseclink}">&nbsp;{$keyval}</a></div>
-                       	<div id="editarea_{$label}" style="display:none;">                                              		  
-                        <input id="popuptxt_{$label}" name="quote_name" readonly type="text" style="border:1px solid #bababa;" value="{$keyval}"><input id="txtbox_{$label}" name="{$keyfldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Quotes&action=Popup&html=Popup_picker&popuptype=specific&form=EditView","test","width=600,height=400,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.quote_id.value=''; this.form.quote_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
-                        <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');"/> or
-                        <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
-                        </div>
-                        </td>
-                        {elseif $keyid eq 82} <!--Email Body-->
-                              <td colspan="3" width=100% class="dvtCellInfo" align="left"><div id="dtlview_{$label}" style="width:100%;height:200px;overflow:hidden;border:1px solid gray" class="detailedViewTextBox" onmouseover="this.className='detailedViewTextBoxOn'" onmouseout="this.className='detailedViewTextBox'">&nbsp;{$keyval}</div>
-                        	 </td>
-                        {elseif $keyid eq 80} <!--SalesOrderPopup-->
-                              <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}"><div id="dtlview_{$label}"  onClick="hndMouseOver({$keyid},'{$label}');"><a href="{$keyseclink}">&nbsp;{$keyval}</a></div>
-                          		<div id="editarea_{$label}" style="display:none;">                                              		  
-                                <input id="popuptxt_{$label}" name="salesorder_name" readonly type="text" style="border:1px solid #bababa;" value="{$keyval}"><input id="txtbox_{$label}" name="{$keyfldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=SalesOrder&action=Popup&html=Popup_picker&popuptype=specific&form=DetailView","test","width=600,height=400,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.salesorder_id.value=''; this.form.salesorder_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
-                                 <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');"/> or
-                           		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
-                                  </div>
-                             </td>
 						{elseif $keyid eq 83}<!-- Handle the Tax in Inventory -->
 							<td align="right" class="dvtCellLabel">
 							{$APP.LBL_VAT} {$APP.COVERED_PERCENTAGE}
@@ -206,6 +197,7 @@
 								{$SERVICE_TAX}
 							</td>
 	
+
 				{else}
                                                   	<td class="dvtCellInfo" align="left" width=25%">{$keyval}</td>
 				{/if}

Modified: vtigercrm/trunk/include/js/dtlviewajax.js
==============================================================================
--- vtigercrm/trunk/include/js/dtlviewajax.js (original)
+++ vtigercrm/trunk/include/js/dtlviewajax.js Tue Jun  6 08:44:42 2006
@@ -10,16 +10,20 @@
 var globaldtlviewspanid = "";
 var globaleditareaspanid = ""; 
 var globaltxtboxid = "";
+var itsonview=false;
 
 function showHide(showId, hideId)
 {
-	showBlock(showId);
-	hide(hideId);
+	show(showId);
+	fnhide(hideId);
 }
 
 function hndCancel(valuespanid,textareapanid,fieldlabel)
 {
+
   showHide(valuespanid,textareapanid);
+  itsonview=false;
+  return false;
 }
 
 function hndMouseOver(uitype,fieldLabel)
@@ -27,17 +31,37 @@
       var mouseArea="";
       mouseArea="mouseArea_"+ fieldLabel;
       
+      if(itsonview)
+      {
+            return;
+      }
+      
+      show("crmspanid");
       globaldtlviewspanid= "dtlview_"+ fieldLabel;//valuespanid;
       globaleditareaspanid="editarea_"+ fieldLabel;//textareapanid;
       globaltxtboxid="txtbox_"+ fieldLabel;//textboxpanid;
-	handleEdit();
+      divObj = getObj('crmspanid'); 
+      crmy = findPosY(getObj(mouseArea));
+      crmx = findPosX(getObj(mouseArea));
+      if(document.all)
+      {
+          divObj.onclick=handleEdit;
+      }
+      else
+      {
+          divObj.setAttribute('onclick','handleEdit();');
+      }
+      divObj.style.left=(crmx+getObj(mouseArea).offsetWidth -divObj.offsetWidth)+"px";
+      divObj.style.top=crmy+"px";
 }
 
 function handleEdit()
 {
-     showBlock(globaleditareaspanid) ;
-     hide(globaldtlviewspanid);
+     show(globaleditareaspanid) ;
+     fnhide(globaldtlviewspanid);
      getObj(globaltxtboxid).focus();
+     fnhide('crmspanid');
+     itsonview=true;
      return false;
 }
 
@@ -50,7 +74,7 @@
      }
      else if(item.indexOf(":#:SUCCESS")>-1)
      {
-          hide("vtbusy_info");
+          fnhide("vtbusy_info");
      }
 }
 
@@ -64,111 +88,136 @@
 
 function dtlViewAjaxSave(fieldLabel,module,uitype,tableName,fieldName,crmId)
 {
-     var dtlView = "dtlview_"+ fieldLabel;
-     var editArea = "editarea_"+ fieldLabel;
-     var txtBox= "txtbox_"+ fieldLabel;
-     var popupTxt= "popuptxt_"+ fieldLabel;      
-	   var hdTxt = "hdtxt_"+ fieldLabel;
-	   
-     if(formValidate() == false)
-     {
-        return false;
-     }
-     
-     
-     var isAdmin = document.getElementById("hdtxt_IsAdmin").value; 
-     var tagValue = trim(document.getElementById(txtBox).value);
-     
-     //overriden the tagValue based on UI Type for checkbox 
-     if(uitype == '56')
-     {
-        if(document.getElementById(txtBox).checked == true)
-        {
-          tagValue = "1";
-        }else
-        {
-          tagValue = "0";
-        }
-     }
-     
-     var data = "module=" + module + "&action=" + module + "Ajax&file=DetailViewAjax&recordid=" + crmId ;
-     data = data + "&fldName=" + fieldName + "&fieldValue=" + escape(tagValue) + "&ajxaction=DETAILVIEW";
-     show("vtbusy_info");
-     
-     var ajaxObj = new VtigerAjax(dtlViewAjaxResponse);
-     ajaxObj.process("index.php?",data);
-     if(uitype == '13')
-     {
-          getObj(dtlView).innerHTML = "<a href=\"mailto:"+ tagValue+"\" target=\"_blank\">"+tagValue+"&nbsp;</a>";
-     }
-     else if(uitype == '17')
-     {
-          getObj(dtlView).innerHTML = "<a href=\"http://"+ tagValue+"\" target=\"_blank\">"+tagValue+"&nbsp;</a>";
-     }
-     else if(getObj(popupTxt))
-     {
-      	var popObj = getObj(popupTxt);
-      	if(uitype == '50' || uitype == '73' || uitype == '51')
-      	{
-      		getObj(dtlView).innerHTML = "<a href=\"index.php?module=Accounts&action=DetailView&record="+tagValue+"\">"+popObj.value+"&nbsp;</a>";
-      	}
-      	else if(uitype == '57')
-      	{
-      		getObj(dtlView).innerHTML = "<a href=\"index.php?module=Contacts&action=DetailView&record="+tagValue+"\">"+popObj.value+"&nbsp;</a>";
-      	}
-      	else if(uitype == '59')
-      	{
-      		getObj(dtlView).innerHTML = "<a href=\"index.php?module=Products&action=DetailView&record="+tagValue+"\">"+popObj.value+"&nbsp;</a>";
-      	}
-      	else if(uitype == '75' || uitype == '81' )
-      	{
-      		getObj(dtlView).innerHTML = "<a href=\"index.php?module=Vendors&action=DetailView&record="+tagValue+"\">"+popObj.value+"&nbsp;</a>";
-      
-      	}
-      	else if(uitype == '76')
-      	{
-      		getObj(dtlView).innerHTML = "<a href=\"index.php?module=Potentials&action=DetailView&record="+tagValue+"\">"+popObj.value+"&nbsp;</a>";
-      	}
-      	else if(uitype == '78')
-      	{
-      		getObj(dtlView).innerHTML = "<a href=\"index.php?module=Quotes&action=DetailView&record="+tagValue+"\">"+popObj.value+"&nbsp;</a>";
-      	}
-      	else if(uitype == '80')
-      	{
-      		getObj(dtlView).innerHTML = "<a href=\"index.php?module=SalesOrder&action=DetailView&record="+tagValue+"\">"+popObj.value+"&nbsp;</a>";
-      	}
-      	else
-      	{
-      		getObj(dtlView).innerHTML = popObj.value;
-      	}
-     }
-     else if(uitype == '53')
-     {
-      		var hdObj = getObj(hdTxt);
-      		if(isAdmin == "0")
-      		{
-              getObj(dtlView).innerHTML = hdObj.value;
-          }else if(isAdmin == "1")
-          {
-              getObj(dtlView).innerHTML = "<a href=\"index.php?module=Users&action=DetailView&record="+tagValue+"\">"+hdObj.value+"&nbsp;</a>";;
-          }
-     }
-     else if(uitype == '56')
-     {
-        if(tagValue == '1')
-        {
-            getObj(dtlView).innerHTML = "yes";
-        }else
-        {
-            getObj(dtlView).innerHTML = "";
-        }
-        
-     }
-     else
-     {
-          getObj(dtlView).innerHTML = tagValue;
-     }
-     showHide(dtlView,editArea);  //show,hide
+	var dtlView = "dtlview_"+ fieldLabel;
+	var editArea = "editarea_"+ fieldLabel;
+	var txtBox= "txtbox_"+ fieldLabel;
+	var popupTxt= "popuptxt_"+ fieldLabel;      
+	var hdTxt = "hdtxt_"+ fieldLabel;
+
+	if(formValidate() == false)
+	{
+		return false;
+	}
+
+
+	var isAdmin = document.getElementById("hdtxt_IsAdmin").value; 
+
+	var tagValue = trim(document.getElementById(txtBox).value);
+
+	//overriden the tagValue based on UI Type for checkbox 
+	if(uitype == '56')
+	{
+		if(document.getElementById(txtBox).checked == true)
+		{
+			tagValue = "1";
+		}else
+		{
+			tagValue = "0";
+		}
+	}
+
+	var data = "file=DetailViewAjax&module=" + module + "&action=" + module + "Ajax&recordid=" + crmId ;
+	data = data + "&fldName=" + fieldName + "&fieldValue=" + escape(tagValue) + "&ajxaction=DETAILVIEW";
+	show("vtbusy_info");
+
+	var ajaxObj = new VtigerAjax(dtlViewAjaxResponse);
+	ajaxObj.process("index.php?",data);
+	if(uitype == '13')
+	{
+		getObj(dtlView).innerHTML = "<a href=\"mailto:"+ tagValue+"\" target=\"_blank\">"+tagValue+"&nbsp;</a>";
+	}
+	else if(uitype == '17')
+	{
+		getObj(dtlView).innerHTML = "<a href=\"http://"+ tagValue+"\" target=\"_blank\">"+tagValue+"&nbsp;</a>";
+	}
+	else if(uitype == '53')
+	{
+		var hdObj = getObj(hdTxt);
+			if(isAdmin == "0")
+			{
+				getObj(dtlView).innerHTML = hdObj.value;
+			}else if(isAdmin == "1")
+			{
+				getObj(dtlView).innerHTML = "<a href=\"index.php?module=Users&action=DetailView&record="+tagValue+"\">"+hdObj.value+"&nbsp;</a>";;
+			}
+	}
+	else if(uitype == '56')
+	{
+		if(tagValue == '1')
+		{
+			getObj(dtlView).innerHTML = "yes";
+		}else
+		{
+			getObj(dtlView).innerHTML = "";
+		}
+
+	}
+
+	else if(getObj(popupTxt))
+	{
+		var popObj = getObj(popupTxt);
+		if(uitype == '50' || uitype == '73' || uitype == '51')
+		{
+			getObj(dtlView).innerHTML = "<a href=\"index.php?module=Accounts&action=DetailView&record="+tagValue+"\">"+popObj.value+"&nbsp;</a>";
+		}
+		else if(uitype == '57')
+		{
+			getObj(dtlView).innerHTML = "<a href=\"index.php?module=Contacts&action=DetailView&record="+tagValue+"\">"+popObj.value+"&nbsp;</a>";
+		}
+		else if(uitype == '59')
+		{
+			getObj(dtlView).innerHTML = "<a href=\"index.php?module=Products&action=DetailView&record="+tagValue+"\">"+popObj.value+"&nbsp;</a>";
+		}
+		else if(uitype == '75' || uitype == '81' )
+		{
+			getObj(dtlView).innerHTML = "<a href=\"index.php?module=Vendors&action=DetailView&record="+tagValue+"\">"+popObj.value+"&nbsp;</a>";
+
+		}
+		else if(uitype == '76')
+		{
+			getObj(dtlView).innerHTML = "<a href=\"index.php?module=Potentials&action=DetailView&record="+tagValue+"\">"+popObj.value+"&nbsp;</a>";
+		}
+		else if(uitype == '78')
+		{
+			getObj(dtlView).innerHTML = "<a href=\"index.php?module=Quotes&action=DetailView&record="+tagValue+"\">"+popObj.value+"&nbsp;</a>";
+		}
+		else if(uitype == '80')
+		{
+			getObj(dtlView).innerHTML = "<a href=\"index.php?module=SalesOrder&action=DetailView&record="+tagValue+"\">"+popObj.value+"&nbsp;</a>";
+		}
+		else if(uitype == '53')
+		{
+			var hdObj = getObj(hdTxt);
+			if(isAdmin == "0")
+			{
+				getObj(dtlView).innerHTML = hdObj.value;
+			}else if(isAdmin == "1")
+			{
+				getObj(dtlView).innerHTML = "<a href=\"index.php?module=Users&action=DetailView&record="+tagValue+"\">"+hdObj.value+"&nbsp;</a>";;
+			}
+		}
+		else if(uitype == '56')
+		{
+			if(tagValue == '1')
+			{
+				getObj(dtlView).innerHTML = "yes";
+			}else
+			{
+				getObj(dtlView).innerHTML = "";
+			}
+
+		}
+		else
+		{
+			getObj(dtlView).innerHTML = popObj.value;
+		}
+	}
+	else
+	{
+		getObj(dtlView).innerHTML = tagValue;
+	}
+	showHide(dtlView,editArea);  //show,hide
+	itsonview=false;
 }
 
 
@@ -176,26 +225,26 @@
 {
      var item = response.responseText;
 	 getObj('tagfields').innerHTML = item;
-     hide("vtbusy_info");
+     fnhide("vtbusy_info");
 }
 
 function SaveTag(txtBox,crmId,module)
 {
 	var tagValue = document.getElementById(txtBox).value;
 	document.getElementById(txtBox).value ='';
-    var data = "module=" + module + "&action=" + module + "Ajax&file=TagCloud&recordid=" + crmId + "&file=TagCloud&ajxaction=SAVETAG&tagfields=" +tagValue;
+    var data = "file=TagCloud&module=" + module + "&action=" + module + "Ajax&recordid=" + crmId + "&ajxaction=SAVETAG&tagfields=" +tagValue;
     
 	var ajaxObj = new VtigerAjax(dtlViewAjaxTagResponse);
     ajaxObj.process("index.php?",data);
    	show("vtbusy_info");
 }
-
 function setSelectValue(fieldLabel)
 {
-  var hdTxtBox = 'hdtxt_'+fieldLabel; 
-  var selCombo= 'txtbox_'+fieldLabel;
-  var oHdTxtBox = document.getElementById(hdTxtBox);
-  var oSelCombo = document.getElementById(selCombo);
-  
-  oHdTxtBox.value = oSelCombo.options[oSelCombo.selectedIndex].text;
-}
+	var hdTxtBox = 'hdtxt_'+fieldLabel;
+	var selCombo= 'txtbox_'+fieldLabel;
+	var oHdTxtBox = document.getElementById(hdTxtBox);
+	var oSelCombo = document.getElementById(selCombo);
+
+	oHdTxtBox.value = oSelCombo.options[oSelCombo.selectedIndex].text;
+}
+



From vtiger-tickets at vtiger.fosslabs.com  Tue Jun  6 08:18:59 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 06 Jun 2006 15:18:59 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231269=3A?=
 =?utf-8?q?_Picklist_editing_impossible_when_customfield_created?=
Message-ID: <076.0ac8352198014e97e1e06ac4c87ba236@vtiger.fosslabs.com>

#1269: Picklist editing impossible when customfield created
-----------------------+----------------------------------------------------
 Reporter:  abos       |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  major      |   Milestone:  5.0.0    
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 When i create a custom field (tested with picklist), i can't edit the
 default picklist in Picklist Editor, nothing appear.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1269>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun  6 08:21:10 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 06 Jun 2006 15:21:10 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231270=3A?=
 =?utf-8?q?_Picklist_editor_not_exist_for_invoices?=
Message-ID: <076.9bd0e7d72add51e29114ababf0f13b67@vtiger.fosslabs.com>

#1270: Picklist editor not exist for invoices
--------------------------------+-------------------------------------------
 Reporter:  abos                |       Owner:  developer
     Type:  defect              |      Status:  new      
 Priority:  major               |   Milestone:  5.0.0    
Component:  vtigercrm           |     Version:  5.0.0    
 Keywords:  invoices, picklist  |  
--------------------------------+-------------------------------------------
 Impossible to change the picklist for invoices module

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1270>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun  6 10:15:47 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 06 Jun 2006 17:15:47 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231271=3A?=
 =?utf-8?q?_Organisation_wont_save_when_containt_=27?=
Message-ID: <076.62b916cddc422a4f2f6a8828de68207a@vtiger.fosslabs.com>

#1271: Organisation wont save when containt '
-----------------------+----------------------------------------------------
 Reporter:  abos       |       Owner:  abos 
     Type:  defect     |      Status:  new  
 Priority:  major      |   Milestone:       
Component:  vtigercrm  |     Version:  5.0.0
 Keywords:             |  
-----------------------+----------------------------------------------------
 In the company info, when i have a ' i can't save anything.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1271>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun  6 10:16:45 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 06 Jun 2006 17:16:45 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231271=3A?=
 =?utf-8?q?_Organisation_wont_save_when_containt_=27?=
In-Reply-To: <076.62b916cddc422a4f2f6a8828de68207a@vtiger.fosslabs.com>
References: <076.62b916cddc422a4f2f6a8828de68207a@vtiger.fosslabs.com>
Message-ID: <085.862e44c08aed2e864615857963a9eee3@vtiger.fosslabs.com>

#1271: Organisation wont save when containt '
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  abos 
      Type:  defect     |      Status:  new  
  Priority:  major      |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Comment (by abos):

 Solution :
 Change the file /module/Settings/add2db.php from Line 86 :

        $organization_name=addslashes($_REQUEST['organization_name']);
        $org_name=addslashes($_REQUEST['org_name']);
 $organization_address=addslashes($_REQUEST['organization_address']);
        $organization_city=addslashes($_REQUEST['organization_city']);
        $organization_state=addslashes($_REQUEST['organization_state']);
        $organization_code=$_REQUEST['organization_code'];
 $organization_country=addslashes($_REQUEST['organization_country']);
        $organization_phone=$_REQUEST['organization_phone'];
        $organization_fax=$_REQUEST['organization_fax'];
        $organization_website=$_REQUEST['organization_website'];
        $organization_logo=$_REQUEST['organization_logo'];

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1271>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun  6 10:34:11 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 06 Jun 2006 17:34:11 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231271=3A?=
 =?utf-8?q?_Organisation_wont_save_when_containt_=27?=
In-Reply-To: <076.62b916cddc422a4f2f6a8828de68207a@vtiger.fosslabs.com>
References: <076.62b916cddc422a4f2f6a8828de68207a@vtiger.fosslabs.com>
Message-ID: <085.fe6e08def218d795d9c2ccbbfa5dcb67@vtiger.fosslabs.com>

#1271: Organisation wont save when containt '
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  allanbush
      Type:  defect     |      Status:  new      
  Priority:  major      |   Milestone:  5.0.0    
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:             |    Keywords:           
------------------------+---------------------------------------------------
Changes (by allanbush):

  * milestone:  => 5.0.0
  * owner:  abos => allanbush

Comment:

 The preferred method is to use $adb->quote("string") to escape data for
 sql execution.

 This also effects the 4.2 branch.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1271>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun  6 10:35:48 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 06 Jun 2006 17:35:48 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231271=3A?=
 =?utf-8?q?_Organisation_wont_save_when_containt_=27?=
In-Reply-To: <076.62b916cddc422a4f2f6a8828de68207a@vtiger.fosslabs.com>
References: <076.62b916cddc422a4f2f6a8828de68207a@vtiger.fosslabs.com>
Message-ID: <085.1a70c8978061a5f09f78dbc3024c637e@vtiger.fosslabs.com>

#1271: Organisation wont save when containt '
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  allanbush
      Type:  defect     |      Status:  new      
  Priority:  major      |   Milestone:  5.0.0    
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:             |    Keywords:           
------------------------+---------------------------------------------------
Comment (by allanbush):

 (In [6906]) Proper escaping of sql data.  Refs #1271.

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1271>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun  6 10:35:49 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 06 Jun 2006 17:35:49 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6906 -
	/vtigercrm/trunk/modules/Settings/add2db.php
Message-ID: <20060606173549.65F787E852F@vtiger.fosslabs.com>

Author: allanbush
Date: Tue Jun  6 11:35:47 2006
New Revision: 6906

Log:
Proper escaping of sql data.  Refs #1271.

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 Tue Jun  6 11:35:47 2006
@@ -99,7 +99,7 @@
 		if(!isset($organization_logoname))
 			$organization_logoname="";
 
-		$sql="select * from organizationdetails where organizationame = '".$org_name."'";
+		$sql="SELECT * FROM organizationdetails WHERE organizationame = ".$adb->quote($org_name);
 		$result = $adb->query($sql);
 		$org_name = $adb->query_result($result,0,'organizationame');
 		$org_logo = $adb->query_result($result,0,'logoname'); 
@@ -107,7 +107,19 @@
 
 		if($org_name=='')
 		{
-			$sql="insert into organizationdetails(organizationame,address,city,state,code,country,phone,fax,website,logoname) values( '".$organization_name ."','".$organization_address."','". $organization_city."','".$organization_state."','".$organization_code."','".$organization_country."','".$organization_phone."','".$organization_fax."','".$organization_website."','".$organization_logoname."')";
+			$sql="INSERT INTO organizationdetails
+				(organizationame, address, city, state, code, country, phone, fax, website, logoname)
+				VALUES (".$adb->quote($organization_name).
+					",".$adb->quote($organization_address).
+					",".$adb->quote($organization_city).
+					",".$adb->quote($organization_state).
+					",".$adb->quote($organization_code).
+					",".$adb->quote($organization_country).
+					",".$adb->quote($organization_phone).
+					",".$adb->quote($organization_fax).
+					",".$adb->quote($organization_website).
+					",".$adb->quote($organization_logoname).
+				")";
 		}
 		else
 		{
@@ -130,7 +142,18 @@
 				$organization_logoname=$org_logo;
 			}
 
-			$sql="update organizationdetails set organizationame = '".$organization_name."', address = '".$organization_address."', city = '".$organization_city."', state = '".$organization_state."',  code = '".$organization_code."', country = '".$organization_country."' ,  phone = '".$organization_phone."' ,  fax = '".$organization_fax."',  website = '".$organization_website."', logoname = '". $organization_logoname ."' where organizationame = '".$org_name."'";
+			$sql = "UPDATE organizationdetails
+				SET organizationame = ".$adb->quote($organization_name).",
+					address = ".$adb->quote($organization_address).",
+					city = ".$adb->quote($organization_city).",
+					state = ".$adb->quote($organization_state).",
+					code = ".$adb->quote($organization_code).",
+					country = ".$adb->quote($organization_country)." ,
+					phone = ".$adb->quote($organization_phone)." ,
+					fax = ".$adb->quote($organization_fax).",
+					website = ".$adb->quote($organization_website).",
+					logoname = ".$adb->quote($organization_logoname)."
+				WHERE organizationame = ".$adb->quote($org_name);
 		}
 		$adb->query($sql);
 



From vtiger-tickets at vtiger.fosslabs.com  Tue Jun  6 10:39:20 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 06 Jun 2006 17:39:20 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231272=3A?=
 =?utf-8?q?_Tag_Cloud_error_with_new_Leads?=
Message-ID: <076.a19a3b814ba528da3bce99823fdc8f36@vtiger.fosslabs.com>

#1272: Tag Cloud error with new Leads
-----------------------+----------------------------------------------------
 Reporter:  anonymous  |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  critical   |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 If you create a new lead the tag cloud is already filled but should be
 empty.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1272>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun  6 10:41:48 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 06 Jun 2006 17:41:48 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231271=3A?=
 =?utf-8?q?_Organisation_wont_save_when_containt_=27?=
In-Reply-To: <076.62b916cddc422a4f2f6a8828de68207a@vtiger.fosslabs.com>
References: <076.62b916cddc422a4f2f6a8828de68207a@vtiger.fosslabs.com>
Message-ID: <085.28e2cc870b7448b22fbfa4edcec1cd2d@vtiger.fosslabs.com>

#1271: Organisation wont save when containt '
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  allanbush
      Type:  defect     |      Status:  closed   
  Priority:  major      |   Milestone:  5.0.0    
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:  fixed      |    Keywords:           
------------------------+---------------------------------------------------
Changes (by allanbush):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 (In [6907]) Proper escaping of sql data.  Closes #1271.

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1271>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun  6 10:41:48 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 06 Jun 2006 17:41:48 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6907 -
	/vtigercrm/branches/4.2/modules/Settings/add2db.php
Message-ID: <20060606174148.9519F7E8526@vtiger.fosslabs.com>

Author: allanbush
Date: Tue Jun  6 11:41:46 2006
New Revision: 6907

Log:
Proper escaping of sql data.  Closes #1271.

Modified:
    vtigercrm/branches/4.2/modules/Settings/add2db.php

Modified: vtigercrm/branches/4.2/modules/Settings/add2db.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Settings/add2db.php (original)
+++ vtigercrm/branches/4.2/modules/Settings/add2db.php Tue Jun  6 11:41:46 2006
@@ -110,7 +110,7 @@
 	if(!isset($organization_logoname))
 		$organization_logoname="";
 
-	$sql="select * from organizationdetails where organizationame = '".$org_name."'";
+	$sql="SELECT * FROM organizationdetails WHERE organizationame = ".$adb->quote($org_name);
 	$result = $adb->query($sql);
 	$org_name = $adb->query_result($result,0,'organizationame');
 	$org_logo = $adb->query_result($result,0,'logoname'); 
@@ -118,7 +118,20 @@
 
 	if($org_name=='')
 	{
-		$sql="insert into organizationdetails(organizationame,address,city,state,code,country,phone,fax,website,logoname) values( '".$organization_name ."','".$organization_address."','". $organization_city."','".$organization_state."','".$organization_code."','".$organization_country."','".$organization_phone."','".$organization_fax."','".$organization_website."','".$organization_logoname."')";
+		$sql="INSERT INTO organizationdetails
+			(organizationame, address, city, state, code, country, phone, fax, website, logoname)
+			VALUES (".$adb->quote($organization_name).
+				",".$adb->quote($organization_address).
+				",".$adb->quote($organization_city).
+				",".$adb->quote($organization_state).
+				",".$adb->quote($organization_code).
+				",".$adb->quote($organization_country).
+				",".$adb->quote($organization_phone).
+				",".$adb->quote($organization_fax).
+				",".$adb->quote($organization_website).
+				",".$adb->quote($organization_logoname).
+			")";
+
 	}
 	else
 	{
@@ -132,7 +145,18 @@
 			$organization_logoname=$org_logo;
 		}
 
-		$sql="update organizationdetails set organizationame = '".$organization_name."', address = '".$organization_address."', city = '".$organization_city."', state = '".$organization_state."',  code = '".$organization_code."', country = '".$organization_country."' ,  phone = '".$organization_phone."' ,  fax = '".$organization_fax."',  website = '".$organization_website."', logoname = '". $organization_logoname ."' where organizationame = '".$org_name."'";
+		$sql = "UPDATE organizationdetails
+			SET organizationame = ".$adb->quote($organization_name).",
+				address = ".$adb->quote($organization_address).",
+				city = ".$adb->quote($organization_city).",
+				state = ".$adb->quote($organization_state).",
+				code = ".$adb->quote($organization_code).",
+				country = ".$adb->quote($organization_country)." ,
+				phone = ".$adb->quote($organization_phone)." ,
+				fax = ".$adb->quote($organization_fax).",
+				website = ".$adb->quote($organization_website).",
+				logoname = ".$adb->quote($organization_logoname)."
+			WHERE organizationame = ".$adb->quote($org_name);
 	}
 	$adb->query($sql);
 



From vtiger-tickets at vtiger.fosslabs.com  Tue Jun  6 13:35:44 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 06 Jun 2006 20:35:44 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231173=3A?=
	=?utf-8?q?_unable_to_veiw_pdf?=
In-Reply-To: <076.2f691fd08704f9500476c37cc5e5685c@vtiger.fosslabs.com>
References: <076.2f691fd08704f9500476c37cc5e5685c@vtiger.fosslabs.com>
Message-ID: <085.743870073bb98bee5e47b0dc7c696cbd@vtiger.fosslabs.com>

#1173: unable to veiw pdf
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  developer
      Type:  defect     |      Status:  new      
  Priority:  major      |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:             |    Keywords:           
------------------------+---------------------------------------------------
Comment (by anonymous):

 same for me

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1173>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun  6 21:44:08 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 07 Jun 2006 04:44:08 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231273=3A?=
 =?utf-8?q?_can_make_Activity_Type__more_fexible=3F?=
Message-ID: <076.b803679c18dae4da6b07a17780be31dc@vtiger.fosslabs.com>

#1273: can make Activity Type  more fexible?
-------------------------+--------------------------------------------------
 Reporter:  ftc          |       Owner:  developer
     Type:  enhancement  |      Status:  new      
 Priority:  major        |   Milestone:           
Component:  vtigercrm    |     Version:  5.0.0    
 Keywords:               |  
-------------------------+--------------------------------------------------
 Any consideration to make activity type as an add on picklist in setting?.
 It will be more useful if people can choose their activites instead of
 only call, meeting and task.  There are all sorts of activity types
 depending on the industry....Sometimes they can have "products party" like
 tupperware party or girl's lingerie session,  product training,  even
 so.... door to door sales?, street harnessment?.. Well they are all
 marketing  and selling process?

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1273>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun  6 23:00:39 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 06:00:39 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6908 -
	/vtigercrm/trunk/Smarty/templates/CreateProfile.tpl
Message-ID: <20060607060039.E69BC7E8574@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 00:00:35 2006
New Revision: 6908

Log:
ajax functionality has been modified

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

Modified: vtigercrm/trunk/Smarty/templates/CreateProfile.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/CreateProfile.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/CreateProfile.tpl Wed Jun  7 00:00:35 2006
@@ -93,16 +93,18 @@
 
 function dup_validation(profilename)
 {ldelim}
-        var ajaxObj = new VtigerAjax(ajaxSaveResponse);
-        var urlstring ="module=Users&action=UsersAjax&file=CreateProfile1&ajax=true&dup_check=true&profile_name="+profilename;
-
-        ajaxObj.process("index.php?",urlstring);
-{rdelim}
-function ajaxSaveResponse(response)
-{ldelim}
-        if(response.responseText == 'SUCESS')
-                document.profileform.submit();
-        else
-                alert(response.responseText);
+	new Ajax.Request(
+		'index.php',
+		{ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+			method: 'post',
+			postBody: 'module=Users&action=UsersAjax&file=CreateProfile1&ajax=true&dup_check=true&profile_name='+profilename,
+			onComplete: function(response) {ldelim}
+					if(response.responseText == 'SUCESS')
+						document.profileform.submit();
+					else
+						alert(response.responseText);
+				{rdelim}
+		{rdelim}
+	);
 {rdelim}
 </script>



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun  6 23:01:40 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 06:01:40 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6909 -
 /vtigercrm/trunk/Smarty/templates/CurrencyListView.tpl
Message-ID: <20060607060140.B747E7E8574@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 00:01:37 2006
New Revision: 6909

Log:
ajax functionality 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 Jun  7 00:01:37 2006
@@ -15,36 +15,37 @@
 <script>
 	function deleteCurrency(currid)
 	{
-        	show("status");
-	        var ajaxObj = new VtigerAjax(ajaxCurrencyDeleteResponse);
-        	var urlstring = "action=SettingsAjax&file=CurrencyDeleteStep1&return_action=CurrencyListView&return_module=Settings&module=Settings&parenttab=Settings&id="+currid;
-	        ajaxObj.process("index.php?",urlstring);
+		$("status").style.display="inline";
+		new Ajax.Request(
+			'index.php',
+			{queue: {position: 'end', scope: 'command'},
+				method: 'post',
+				postBody: 'action=SettingsAjax&file=CurrencyDeleteStep1&return_action=CurrencyListView&return_module=Settings&module=Settings&parenttab=Settings&id='+currid,
+				onComplete: function(response) {
+					$("status").style.display="none";
+                                        $("currencydiv").innerHTML= response.responseText;
+                                }
+                        }
+		);
 	}
 
-	function ajaxCurrencyDeleteResponse(response)
-	{
-        	hide("status");
-	        document.getElementById("currencydiv").innerHTML= response.responseText;
-	}
-	
 	function transferCurrency(del_currencyid)
 	{
-                show("status");
-                hide("CurrencyDeleteLay");
-                var ajaxObj = new VtigerAjax(ajaxCurrencySaveResponse);
-                var trans_currencyid=document.getElementById('transfer_currency_id').options[document.getElementById('transfer_currency_id').options.selectedIndex].value;
-                var urlstring ="module=Settings&action=SettingsAjax&file=CurrencyDelete&ajax=true&delete_currency_id="+del_currencyid+"&transfer_currency_id="+trans_currencyid;
-                ajaxObj.process("index.php?",urlstring);
-
+		$("status").style.display="inline";
+		$("CurrencyDeleteLay").style.display = "none";
+		var trans_currencyid=$("transfer_currency_id").options[$("transfer_currency_id").options.selectedIndex].value;
+		new Ajax.Request(
+			'index.php',
+			{queue: {position: 'end', scope: 'command'},
+				method: 'post',
+				postBody: 'module=Settings&action=SettingsAjax&file=CurrencyDelete&ajax=true&delete_currency_id='+del_currencyid+'&transfer_currency_id='+trans_currencyid,
+				onComplete: function(response) {
+					$("status").style.display="none";
+					$("CurrencyListViewContents").innerHTML= response.responseText;
+				}
+			}
+		);
 	}
-
-	function ajaxCurrencySaveResponse(response)
-	{
-        	hide("status");
-	        document.getElementById("CurrencyListViewContents").innerHTML= response.responseText;
-	}
-
-
 </script>
 
 {/literal}



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun  6 23:03:34 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 06:03:34 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6910 -
 /vtigercrm/trunk/Smarty/templates/CustomFieldList.tpl
Message-ID: <20060607060334.0B9C87E8579@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 00:03:31 2006
New Revision: 6910

Log:
ajax functionality has been modified

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

Modified: vtigercrm/trunk/Smarty/templates/CustomFieldList.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/CustomFieldList.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/CustomFieldList.tpl Wed Jun  7 00:03:31 2006
@@ -10,45 +10,54 @@
  ********************************************************************************/ *}
 <script language="JavaScript" type="text/javascript" src="include/js/customview.js"></script>
 <script language="javascript">
-function ajaxSaveResponse(response)
-{ldelim}
-        document.getElementById("cfList").innerHTML=response.responseText;
-{rdelim}
+{literal}
+
 function getCustomFieldList(customField)
-{ldelim}
-	var ajaxObj = new VtigerAjax(ajaxSaveResponse);
+{
 	var modulename = customField.options[customField.options.selectedIndex].value;
-	var urlstring ="module=Settings&action=SettingsAjax&file=CustomFieldList&fld_module="+modulename+"&parenttab=Settings&ajax=true";
-	ajaxObj.process("index.php?",urlstring);
-{rdelim}
+	new Ajax.Request(
+		'index.php',
+		{queue: {position: 'end', scope: 'command'},
+			method: 'post',
+			postBody: 'module=Settings&action=SettingsAjax&file=CustomFieldList&fld_module='+modulename+'&parenttab=Settings&ajax=true',
+			onComplete: function(response) {
+				$("cfList").innerHTML=response.responseText;
+			}
+		}
+	);	
+}
 
 function deleteCustomField(id, fld_module, colName, uitype)
-{ldelim}
+{
         if(confirm("Are you sure?"))
-        {ldelim}
+        {
                 document.form.action="index.php?module=Settings&action=DeleteCustomField&fld_module="+fld_module+"&fld_id="+id+"&colName="+colName+"&uitype="+uitype
                 document.form.submit()
-        {rdelim}
-{rdelim}
+        }
+}
 
-function ajaxCFSaveResponse(response)
-{ldelim}
-        document.getElementById("createcf").innerHTML=response.responseText;
-{rdelim}
 function getCreateCustomFieldForm(customField,id,tabid,ui)
-{ldelim}
-        var ajaxObj = new VtigerAjax(ajaxCFSaveResponse);
+{
         var modulename = customField;
-        var urlstring ="module=Settings&action=SettingsAjax&file=CreateCustomField&fld_module="+modulename+"&parenttab=Settings&ajax=true&fieldid="+id+"&tabid="+tabid+"&uitype="+ui;
-        ajaxObj.process("index.php?",urlstring);
-{rdelim}
+	new Ajax.Request(
+		'index.php',
+		{queue: {position: 'end', scope: 'command'},
+			method: 'post',
+			postBody: 'module=Settings&action=SettingsAjax&file=CreateCustomField&fld_module='+customField+'&parenttab=Settings&ajax=true&fieldid='+id+'&tabid='+tabid+'&uitype='+ui,
+			onComplete: function(response) {
+				$("createcf").innerHTML=response.responseText;
+			}
+		}
+	);
+
+}
 
 function CustomFieldMapping()
-{ldelim}
+{
         document.form.action="index.php?module=Settings&action=LeadCustomFieldMapping";
         document.form.submit();
-{rdelim}
-
+}
+{/literal}
 </script>
 <div id="createcf" style="display:block;position:absolute;top:175px;left:275px;"></div>
 <table width="100%" border="0" cellpadding="0" cellspacing="0">



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun  6 23:04:27 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 06:04:27 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6911 -
	/vtigercrm/trunk/Smarty/templates/Emails.tpl
Message-ID: <20060607060427.86D427E8579@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 00:04:23 2006
New Revision: 6911

Log:
ajax functionality has been modified

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 Jun  7 00:04:23 2006
@@ -11,24 +11,15 @@
 -->*}
 <!--  USER  SETTINGS PAGE STARTS HERE -->
 <script language="javascript">
-function ajaxSaveResponse(response)
-{ldelim}
-	hide("status");
-	document.getElementById("email_con").innerHTML=response.responseText;
-	execJS(document.getElementById('email_con'));
-{rdelim}
-function ajaxgetResponse(response)
-{ldelim}
-	hide("status");
-	document.getElementById("EmailDetails").innerHTML=response.responseText;
-{rdelim}
+
 function setSubject(subject)
 {ldelim}
-document.getElementById("subjectsetter").innerHTML=subject
-{rdelim}
+	document.getElementById("subjectsetter").innerHTML=subject
+{rdelim}
+
 function getEmailContents(id)
 {ldelim}
-	show("status");
+	$("status").style.display="inline";
 	var rowid = 'row_'+id;
 	getObj(rowid).className = 'prvPrfHoverOn';
 	if(gselectedrowid != 0 && gselectedrowid != id)
@@ -37,34 +28,22 @@
 		getObj(prev_selected_rowid).className = 'prvPrfHoverOff';
 	{rdelim}
 	gselectedrowid = id;
-	var ajaxObj = new VtigerAjax(ajaxgetResponse);
-	var urlstring ="module=Emails&action=EmailsAjax&file=DetailView&mode=ajax&record="+id;
-	ajaxObj.process("index.php?",urlstring);
-{rdelim}
-{literal}
-
-function ajaxDelResponse(response)
-{
-	hide("status");
-	document.getElementById('EmailDetails').innerHTML = '<table valign="top" border="0" cellpadding="0" cellspacing="0" width="100%"><tbody><tr><td class="forwardBg"><table border="0" cellpadding="0" cellspacing="0" width="100%"><tbody><tr><td colspan="2">&nbsp;</td></tr></tbody></table></td></tr><tr><td style="padding-top: 10px;" bgcolor="#ffffff" height="300" valign="top"></td></tr></tbody></table>';
-	document.getElementById("subjectsetter").innerHTML='';
-	document.getElementById("email_con").innerHTML=response.responseText;
-	execJS(document.getElementById('email_con'));
-}
-
-{/literal}
+	new Ajax.Request(
+		'index.php',
+		{ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+			method: 'post',
+			postBody: 'module=Emails&action=EmailsAjax&file=DetailView&mode=ajax&record='+id,
+			onComplete: function(response) {ldelim}
+						$("status").style.display="none";
+						$("EmailDetails").innerHTML = response.responseText;
+					{rdelim}
+			{rdelim}
+		);
+{rdelim}
+
 function ShowFolders(folderid)
 {ldelim}
-	show("status");
-	if(gFolderid != folderid)
-	{ldelim}	
-    	var ajaxObj = new VtigerAjax(ajaxSaveResponse);
-		gselectedrowid = 0;
-	{rdelim}
-	else
-	{ldelim}
-		var ajaxObj = new VtigerAjax(ajaxDelResponse);
-	{rdelim}
+	$("status").style.display="inline";
 	gFolderid = folderid;
 	getObj('search_text').value = '';
 	switch(folderid)
@@ -87,8 +66,31 @@
 		case 6:
 			getObj('mail_fldrname').innerHTML = '{$MOD.LBL_QUAL_CONTACT}';
 	{rdelim}
-    var urlstring ="module=Emails&ajax=true&action=EmailsAjax&file=ListView&folderid="+folderid;
-   	ajaxObj.process("index.php?",urlstring);
+	
+	new Ajax.Request(
+                'index.php',
+                {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+                method: 'post',
+                postBody: 'module=Emails&ajax=true&action=EmailsAjax&file=ListView&folderid='+folderid,
+                onComplete: function(response) {ldelim}
+                                        $("status").style.display="none";
+                                        if(gFolderid != folderid)
+                                        {ldelim}
+                                                gselectedrowid = 0;
+                                                $("email_con").innerHTML=response.responseText;
+                                                execJS($('email_con'));
+                                        {rdelim}
+                                        else
+                                        {ldelim}
+                                                $('EmailDetails').innerHTML = '<table valign="top" border="0" cellpadding="0" cellspacing="0" width="100%"><tbody><tr><td class="forwardBg"><table border="0" cellpadding="0" cellspacing="0" width="100%"><tbody><tr><td colspan="2">&nbsp;</td></tr></tbody></table></td></tr><tr><td style="padding-top:10px;" bgcolor="#ffffff" height="300" valign="top"></td></tr></tbody></table>';
+                                                $("subjectsetter").innerHTML='';
+                                                $("email_con").innerHTML=response.responseText;
+                                                execJS($('email_con'));
+                                        {rdelim}
+                                {rdelim}
+                        {rdelim}
+	);
+
 {rdelim}
 function getListViewEntries_js(module,url)
 {ldelim}



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun  6 23:06:37 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 06:06:37 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6913 -
	/vtigercrm/trunk/Smarty/templates/Header.tpl
Message-ID: <20060607060637.3AEE77E8583@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 00:06:33 2006
New Revision: 6913

Log:
ajax functionality has been modified

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 Jun  7 00:06:33 2006
@@ -142,46 +142,57 @@
 	{include file="Clock.tpl"}
 
 
-<div id="qcform" style="position:absolute;width:500px;top:60px;left:450px;z-index:5000;`"></div>
+<div id="qcform" style="position:absolute;width:500px;top:60px;left:450px;z-index:5000;"></div>
 
 <script>
 function fetch_clock()
 {ldelim}
-	var ajaxObj = new VtigerAjax(ajaxClockResponse);
-	var urlstring = "module=Utilities&action=UtilitiesAjax&file=Clock";
-	ajaxObj.process("index.php?",urlstring);
+	new Ajax.Request(
+		'index.php',
+		{ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+			method: 'post',
+			postBody: 'module=Utilities&action=UtilitiesAjax&file=Clock',
+			onComplete: function(response)
+				    {ldelim}
+					$("clock_cont").innerHTML=response.responseText;
+					execJS($('clock_cont'));
+				    {rdelim}
+		{rdelim}
+	);
 
 {rdelim}
-function ajaxClockResponse(response)
-{ldelim}
-	document.getElementById("clock_cont").innerHTML=response.responseText;
-	execJS(document.getElementById('clock_cont'));
-{rdelim}
+
 function fetch_calc()
 {ldelim}
-	var ajaxObj = new VtigerAjax(ajaxCalcResponse);
-	var urlstring = "module=Utilities&action=UtilitiesAjax&file=Calculator";
-	ajaxObj.process("index.php?",urlstring);
-
+	new Ajax.Request(
+		'index.php',
+		{ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+			method: 'post',
+			postBody: 'module=Utilities&action=UtilitiesAjax&file=Calculator',
+			onComplete: function(response)
+					{ldelim}
+						$("calculator_cont").innerHTML=response.responseText;
+						execJS($('calculator_cont'));
+					{rdelim}
+		{rdelim}
+	);
 {rdelim}
-function ajaxCalcResponse(response)
-{ldelim}
-	document.getElementById("calculator_cont").innerHTML=response.responseText;
-	execJS(document.getElementById('calculator_cont'));
-{rdelim}
-
 
 function Announcement_rss()
 {ldelim}
-	var ajaxObj = new VtigerAjax(ajaxRssResponse);
-	var urlstring = "module=Users&action=UsersAjax&announce_rss=yes";
-		ajaxObj.process("index.php?",urlstring);
-
-{rdelim}
-function ajaxRssResponse(response)
-{ldelim}
-	if(document.getElementById("rss").innerHTML != response.responseText)
-		document.getElementById("rss").innerHTML=response.responseText;
+	new Ajax.Request(
+                'index.php',
+                {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+                        method: 'post',
+                        postBody: 'module=Users&action=UsersAjax&announce_rss=yes',
+                        onComplete: function(response)
+                                        {ldelim}
+						if($("rss").innerHTML != response.responseText)
+							$("rss").innerHTML=response.responseText;
+                                        {rdelim}
+                {rdelim}
+        );
+
 {rdelim}
 setInterval("Announcement_rss()",300000)
 </script>
@@ -190,23 +201,32 @@
 
 function QCreate(qcoptions)
 {ldelim}
-        show("status");
-        var ajaxObj = new VtigerAjax(ajaxQCreateResponse);
-        var module = qcoptions.options[qcoptions.options.selectedIndex].value;
+	$("status").style.display="inline";
+	var module = qcoptions.options[qcoptions.options.selectedIndex].value;
 	if(module == 'Events')
-                var urlstring = "module=Activities&action=ActivitiesAjax&file=QuickCreate&activity_mode=Events";
-        else
-	        var urlstring = "module="+module+"&action="+module+"Ajax&file=QuickCreate";
-          ajaxObj.process("index.php?",urlstring);
+	{ldelim}
+		module = 'Activities';
+		action = 'Activities';
+		var urlstr = '&activity_mode=Events';
+	{rdelim}
+	else
+		var urlstr = '';
+	new Ajax.Request(
+                'index.php',
+                {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+                        method: 'post',
+                        postBody: 'module='+module+'&action='+module+'Ajax&file=QuickCreate'+urlstr,
+                        onComplete: function(response)
+                                        {ldelim}
+						$("status").style.display="none";
+						$("qcform").style.display="inline";
+					        $("qcform").innerHTML = response.responseText;
+						eval($("qcform"));
+                                        {rdelim}
+                {rdelim}
+        );
 {rdelim}
 
-function ajaxQCreateResponse(response)
-{ldelim}
-        hide("status");
-        show("qcform");
-        document.getElementById('qcform').innerHTML = response.responseText;
-        eval(document.getElementById('qcform'));
-{rdelim}
 </script>
 
 {literal}
@@ -377,8 +397,6 @@
                chktime.setDate(dd)
                chktime.setHours(hourval)
                chktime.setMinutes(minval)
-               //chkdate.setHours(hourval)
-               //chkdate.setMinutes(minval)
                 if (!compareDates(chkdate,datelabel,currdate,"Current date & time for Activities with status as Planned","GE")) {
                         getObj(datefield).focus()
                         return false



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun  6 23:07:19 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 06:07:19 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6914 -
	/vtigercrm/trunk/Smarty/templates/ImportStep2.tpl
Message-ID: <20060607060719.1DA377E8583@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 00:07:15 2006
New Revision: 6914

Log:
ajax functionality has been modified

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

Modified: vtigercrm/trunk/Smarty/templates/ImportStep2.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ImportStep2.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ImportStep2.tpl Wed Jun  7 00:07:15 2006
@@ -17,19 +17,17 @@
 
 function getImportSavedMap(impoptions)
 {ldelim}
-	//show('status');
-	var ajaxObj = new VtigerAjax(ajaxImportSavedMapResponse);
 	var mapping = impoptions.options[impoptions.options.selectedIndex].value;
-	var urlstring = "module=Import&mapping="+mapping+"&action=ImportAjax";
-	ajaxObj.process("index.php",urlstring);
-
-{rdelim}
-
-function ajaxImportSavedMapResponse(response)
-{ldelim}
-	//hide('status');
-	document.getElementById('importmapform').innerHTML = response.responseText;
-
+	new Ajax.Request(
+		'index.php',
+		{ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+			method: 'post',
+			postBody: 'module=Import&mapping='+mapping+'&action=ImportAjax',
+			onComplete: function(response) {ldelim}
+					$("importmapform").innerHTML = response.responseText;
+				{rdelim}
+			{rdelim}
+		);
 {rdelim}
 
 </script>



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun  6 23:08:45 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 06:08:45 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6915 -
	/vtigercrm/trunk/Smarty/templates/ListView.tpl
Message-ID: <20060607060845.A9B667E8583@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 00:08:41 2006
New Revision: 6915

Log:
ajax functionality has been modified

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 Jun  7 00:08:41 2006
@@ -21,20 +21,11 @@
 {/if}
 <script language="JavaScript" type="text/javascript" src="modules/{$MODULE}/{$SINGLE_MOD}.js"></script>
 <script language="javascript">
-function ajaxSaveResponse(response)
-{ldelim}
-	hide("status");
-	result = response.responseText.split('&#&#&#'); 
-	document.getElementById("ListViewContents").innerHTML= result[2];
-	if(result[1] != '')
-		alert(result[1]);	
-{rdelim}
 
 function callSearch(searchtype)
 {ldelim}
 	search_fld_val= document.basicSearch.search_field[document.basicSearch.search_field.selectedIndex].value;
         search_txt_val=document.basicSearch.search_text.value;
-        var ajaxObj = new VtigerAjax(ajaxSaveResponse);
         var urlstring = '';
         if(searchtype == 'Basic')
         {ldelim}
@@ -59,8 +50,20 @@
                 urlstring += 'search_cnt='+no_rows+'&';
                 urlstring += 'searchtype=advance&'
         {rdelim}
-        urlstring = urlstring +'query=true&file=index&module={$MODULE}&action={$MODULE}Ajax&ajax=true';
-        ajaxObj.process("index.php?",urlstring);
+	new Ajax.Request(
+		'index.php',
+		{ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+			method: 'post',
+			postBody:urlstring +'query=true&file=index&module={$MODULE}&action={$MODULE}Ajax&ajax=true',
+			onComplete: function(response) {ldelim}
+				$("status").style.display="none";
+                                result = response.responseText.split('&#&#&#');
+                                $("ListViewContents").innerHTML= result[2];
+                                if(result[1] != '')
+                                        alert(result[1]);
+			{rdelim}
+	       {rdelim}
+        );
 
 {rdelim}
 function alphabetic(module,url,dataid)
@@ -72,11 +75,21 @@
 
         {rdelim}
         getObj(dataid).className = 'searchAlphselected';
-        show("status");
-        var ajaxObj = new VtigerAjax(ajaxSaveResponse);
-        var urlstring ="module="+module+"&action="+module+"Ajax&file=index&ajax=true&"+url;
-        ajaxObj.process("index.php?",urlstring);
-
+	$("status").style.display="inline";
+	new Ajax.Request(
+		'index.php',
+		{ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+			method: 'post',
+			postBody: 'module='+module+'&action='+module+'Ajax&file=index&ajax=true&'+url,
+			onComplete: function(response) {ldelim}
+				$("status").style.display="none";
+				result = response.responseText.split('&#&#&#');
+				$("ListViewContents").innerHTML= result[2];
+				if(result[1] != '')
+			                alert(result[1]);
+			{rdelim}
+		{rdelim}
+	);
 {rdelim}
 
 </script>
@@ -399,8 +412,7 @@
 
 function ajaxChangeStatus(statusname)
 {
-	show("status");
-	var ajaxObj = new VtigerAjax(ajaxSaveResponse);
+	$("status").style.display="inline";
 	var viewid = document.massdelete.viewname.value;
 	var idstring = document.massdelete.idlist.value;
 	if(statusname == 'status')
@@ -419,8 +431,21 @@
 {literal}
 
 	}
+	new Ajax.Request(
+                'index.php',
+                {queue: {position: 'end', scope: 'command'},
+                        method: 'post',
+                        postBody: urlstring,
+                        onComplete: function(response) {
+                                $("status").style.display="none";
+                                result = response.responseText.split('&#&#&#');
+                                $("ListViewContents").innerHTML= result[2];
+                                if(result[1] != '')
+                                        alert(result[1]);
+                        }
+                }
+        );
 	
-	ajaxObj.process("index.php?",urlstring);
 }
 </script>
 {/literal}



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun  6 23:10:11 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 06:10:11 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6916 -
 /vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl
Message-ID: <20060607061011.2E5C67E857F@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 00:10:07 2006
New Revision: 6916

Log:
ajax functionality has been modified

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

Modified: vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl Wed Jun  7 00:10:07 2006
@@ -222,18 +222,21 @@
 </table>
 <div id="tempdiv" style="display:block;position:absolute;left:225px;top:150px;"></div>
 <script>
-function ajaxSaveResponse(response)
-{ldelim}
-	hide("status");
-	document.getElementById("tempdiv").innerHTML=response.responseText;
-{rdelim}
 
 function callEditDiv(modulename,mode,id)
 {ldelim}
-	show("status");
-	var ajaxObj = new VtigerAjax(ajaxSaveResponse);
-	var urlstring = "module=Users&action=UsersAjax&orgajax=true&mode="+mode+"&sharing_module="+modulename+"&shareid="+id;
-	ajaxObj.process("index.php?",urlstring);
+	$("status").style.display="inline";
+	new Ajax.Request(
+		'index.php',
+		{ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+			method: 'post',
+			postBody: 'module=Users&action=UsersAjax&orgajax=true&mode='+mode+'&sharing_module='+modulename+'&shareid='+id,
+			onComplete: function(response) {ldelim}
+				$("status").style.display="none";
+				$("tempdiv").innerHTML=response.responseText;
+			{rdelim}
+		{rdelim}
+	);
 {rdelim}
 
 function fnwriteRules(module,related)



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun  6 23:05:42 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 06:05:42 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6912 -
	/vtigercrm/trunk/Smarty/templates/GroupEditView.tpl
Message-ID: <20060607060542.018907E8579@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 00:05:38 2006
New Revision: 6912

Log:
ajax functionality has been modified

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

Modified: vtigercrm/trunk/Smarty/templates/GroupEditView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/GroupEditView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/GroupEditView.tpl Wed Jun  7 00:05:38 2006
@@ -15,23 +15,26 @@
 
 function dup_validation()
 {ldelim}
-        //show("status");
-        var ajaxObj = new VtigerAjax(ajaxSaveResponse);
-        var groupname = document.getElementById('groupName').value;
-        var mode = getObj('mode').value;
-        var groupid = getObj('groupId').value;
-        if(mode == 'edit')
-                var urlstring ="module=Users&action=UsersAjax&file=SaveGroup&ajax=true&dup_check=true&mode="+mode+"&groupName="+groupname+"&groupid="+groupid;
-        else
-                var urlstring ="module=Users&action=UsersAjax&file=SaveGroup&ajax=true&dup_check=true&groupName="+groupname;
-        ajaxObj.process("index.php?",urlstring);
-{rdelim}
-function ajaxSaveResponse(response)
-{ldelim}
-        if(response.responseText == 'SUCESS')
-                document.newGroupForm.submit();
-        else
-                alert(response.responseText);
+	var mode = getObj('mode').value;
+	var groupname = $('groupName').value;
+	var groupid = getObj('groupId').value;
+	if(mode == 'edit')
+		var reminstr = '&mode='+mode+'&groupName='+groupname+'&groupid='+groupid;
+	else
+		var reminstr = '&groupName='+groupname;
+	new Ajax.Request(
+		'index.php',
+		{ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+			method: 'post',
+			postBody: 'module=Users&action=UsersAjax&file=SaveGroup&ajax=true&dup_check=true'+reminstr,
+			onComplete: function(response) {ldelim}
+				if(response.responseText == 'SUCESS')
+					document.newGroupForm.submit();
+				else
+					alert(response.responseText);
+			{rdelim}
+		{rdelim}
+	);
 {rdelim}
 
 var constructedOptionValue;



From vtiger-tickets at vtiger.fosslabs.com  Wed Jun  7 00:25:14 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 07 Jun 2006 07:25:14 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231274=3A?=
 =?utf-8?q?_customer_portal_5=2E0_missing?=
Message-ID: <076.709d4c1791ce9aaefba03d131eecd0c0@vtiger.fosslabs.com>

#1274: customer portal 5.0 missing
-----------------------+----------------------------------------------------
 Reporter:  anonymous  |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  blocker    |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 at Beta there are no customer portal functions working

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1274>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun  7 00:25:25 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 07 Jun 2006 07:25:25 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231274=3A?=
 =?utf-8?q?_customer_portal_5=2E0_missing?=
In-Reply-To: <076.709d4c1791ce9aaefba03d131eecd0c0@vtiger.fosslabs.com>
References: <076.709d4c1791ce9aaefba03d131eecd0c0@vtiger.fosslabs.com>
Message-ID: <085.8d6e101ace10db13d2b96ffe13df2502@vtiger.fosslabs.com>

#1274: customer portal 5.0 missing
-----------------------------+----------------------------------------------
  Reporter:  anonymous       |       Owner:  developer
      Type:  defect          |      Status:  new      
  Priority:  blocker         |   Milestone:           
 Component:  customerportal  |     Version:  5.0.0    
Resolution:                  |    Keywords:           
-----------------------------+----------------------------------------------
Changes (by anonymous):

  * component:  vtigercrm => customerportal

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1274>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 01:04:41 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 08:04:41 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6917 -
	/vtigercrm/trunk/Smarty/templates/RelatedLists.tpl
Message-ID: <20060607080441.6E12A7E8590@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 02:04:37 2006
New Revision: 6917

Log:
i18n updated for related lists across all modules -ahmed

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

Modified: vtigercrm/trunk/Smarty/templates/RelatedLists.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/RelatedLists.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/RelatedLists.tpl Wed Jun  7 02:04:37 2006
@@ -24,7 +24,7 @@
 		<div class="small" style="padding:20px">
 		
 		
-		 <span class="lvtHeaderText"><font color="purple">[ {$ID} ] </font>{$NAME} -  {$SINGLE_MOD} More Information</span> <br>
+		 <span class="lvtHeaderText"><font color="purple">[ {$ID} ] </font>{$NAME} -  {$SINGLE_MOD} {$APP.LBL_MORE} {$APP.LBL_INFORMATION}</span> <br>
 		 {$UPDATEINFO}
 		 <hr noshade size=1>
 		 <br> 
@@ -37,12 +37,12 @@
 				<tr>
 					<td class="dvtTabCache" style="width:10px" nowrap>&nbsp;</td>
 					{if $MODULE eq 'Activities'}
-                                                <td class="dvtUnSelectedCell" align=center nowrap><a href="index.php?action=DetailView&module={$MODULE}&record={$ID}&activity_mode={$ACTIVITY_MODE}&parenttab={$CATEGORY}">{$SINGLE_MOD} Information</a></td>
+                                                <td class="dvtUnSelectedCell" align=center nowrap><a href="index.php?action=DetailView&module={$MODULE}&record={$ID}&activity_mode={$ACTIVITY_MODE}&parenttab={$CATEGORY}">{$SINGLE_MOD} {$APP.LBL_INFORMATION}</a></td>
                                         {else}
-                                        <td class="dvtUnSelectedCell" align=center nowrap><a href="index.php?action=DetailView&module={$MODULE}&record={$ID}&parenttab={$CATEGORY}">{$SINGLE_MOD} Information</a></td>
+                                        <td class="dvtUnSelectedCell" align=center nowrap><a href="index.php?action=DetailView&module={$MODULE}&record={$ID}&parenttab={$CATEGORY}">{$SINGLE_MOD} {$APP.LBL_INFORMATION}</a></td>
                                         {/if}
 					<td class="dvtTabCache" style="width:10px">&nbsp;</td>
-					<td class="dvtSelectedCell" align=center nowrap>More Information</td>
+					<td class="dvtSelectedCell" align=center nowrap>{$APP.LBL_MORE} {$APP.LBL_INFORMATION}</td>
 					<td class="dvtTabCache" style="width:100%">&nbsp;</td>
 				</tr>
 				</table>
@@ -75,76 +75,76 @@
 							<td align=right>
 							{if $header eq 'Potentials'}
 						
-							<input title="New Potential" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='Potentials'" type="submit" name="button" value="Add new Potential"></td>
+							<input title="{$APP.LBL_ADD_NEW} {$APP.Potential}" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='Potentials'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Potential}"></td>
 							{elseif $header eq 'PriceBooks'}
 							{if $MODULE eq 'Products'}
-							<input title="Add to PriceBook" accessKey="" class="small" value="Add to PriceBook" LANGUAGE=javascript onclick="this.form.action.value='AddProductToPriceBooks';this.form.module.value='Products'"  type="submit" name="button">
+							<input title="{$APP.LBL_ADD_TO} {$APP.PriceBook}" accessKey="" class="small" value="{$APP.LBL_ADD_TO} {$APP.PriceBook}" LANGUAGE=javascript onclick="this.form.action.value='AddProductToPriceBooks';this.form.module.value='Products'"  type="submit" name="button">
 							{/if}
 							
 							{elseif $header eq 'Products'}
 							{if $MODULE eq 'PriceBooks'}
-							<input title="Select Product" accessKey="" class="small" value="Select Product" LANGUAGE=javascript onclick="this.form.action.value='AddProductsToPriceBook';this.form.module.value='Products';this.form.return_module.value='Products';this.form.return_action.value='PriceBookDetailView'"  type="submit" name="button"></td>
-
-							{else}
-							<input title="New Product" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='Products';this.form.return_module.value='{$MODULE}';this.form.return_action.value='CallRelatedList'" type="submit" name="button" value="Add new Product"></td>				
+							<input title="{$APP.LBL_SELECT_PRODUCT_BUTTON_LABEL}" accessKey="" class="small" value="{$APP.LBL_SELECT_PRODUCT_BUTTON_LABEL}" LANGUAGE=javascript onclick="this.form.action.value='AddProductsToPriceBook';this.form.module.value='Products';this.form.return_module.value='Products';this.form.return_action.value='PriceBookDetailView'"  type="submit" name="button"></td>
+
+							{else}
+							<input title="{$APP.LBL_ADD_NEW} {$APP.Product}" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='Products';this.form.return_module.value='{$MODULE}';this.form.return_action.value='CallRelatedList'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Product}"></td>				
 							{/if}	
 							{elseif $header eq 'Leads'}
-                                                        <input title="New Lead" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='Leads'" type="submit" name="button" value="Add new Lead"></td>
+                                                        <input title="{$APP.LBL_ADD_NEW} {$APP.Lead}" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='Leads'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Lead}"></td>
 							{elseif $header eq 'Contacts' }
 							{if $MODULE eq 'Activities' || $MODULE eq 'Potentials' || $MODULE eq 'Vendors'}
-                                                        <input title="Change" accessKey="" class="small" value="Select Contact" LANGUAGE=javascript onclick='return window.open("index.php?module=Contacts&return_module={$MODULE}&action=Popup&popuptype=detailview&select=enable&form=EditView&form_submit=false&recordid={$ID}","test","width=640,height=570,resizable=0,scrollbars=0");' type="button"  name="button"></td>
+                                                        <input title="Change" accessKey="" class="small" value="{$APP.LBL_SELECT_BUTTON_LABEL} {$APP.Contact}" LANGUAGE=javascript onclick='return window.open("index.php?module=Contacts&return_module={$MODULE}&action=Popup&popuptype=detailview&select=enable&form=EditView&form_submit=false&recordid={$ID}","test","width=640,height=570,resizable=0,scrollbars=0");' type="button"  name="button"></td>
 							{elseif $MODULE eq 'Emails'}
-							<input title="Bulk Mail" accessykey="F" class="small" onclick="this.form.action.value='sendmail';this.form.return_action.value='DetailView';this.form.module.value='Emails';this.form.return_module.value='Emails';" name="button" value="Bulk Mails" type="submit">&nbsp;
-                                                        <input title="Change" accessKey="" class="small" value="Select Contact" LANGUAGE=javascript onclick='return window.open("index.php?module=Contacts&return_module=Emails&action=Popup&popuptype=detailview&form=EditView&form_submit=false&recordid={$ID}","test","width=640,height=570,resizable=0,scrollbars=0");' type="button"  name="button"></td>
-							{else}
-                                                        <input title="New Contact" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='Contacts'" type="submit" name="button" value="Add new Contact"></td>
+							<input title="{$APP.LBL_BULK_MAILS}" accessykey="F" class="small" onclick="this.form.action.value='sendmail';this.form.return_action.value='DetailView';this.form.module.value='Emails';this.form.return_module.value='Emails';" name="button" value="{$APP.LBL_BULK_MAILS}" type="submit">&nbsp;
+                                                        <input title="Change" accessKey="" class="small" value="{$APP.LBL_SELECT_BUTTON_LABEL} {$APP.Contact}" LANGUAGE=javascript onclick='return window.open("index.php?module=Contacts&return_module=Emails&action=Popup&popuptype=detailview&form=EditView&form_submit=false&recordid={$ID}","test","width=640,height=570,resizable=0,scrollbars=0");' type="button"  name="button"></td>
+							{else}
+                                                        <input title="{$APP.LBL_ADD_NEW} {$APP.Contact}" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='Contacts'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Contact}"></td>
                                                         {/if}
 
 							{elseif $header eq 'Activities'}
 							{if $MODULE eq 'PurchaseOrder' || $MODULE eq 'Invoice' || $MODULE eq 'SalesOrder' || $MODULE eq 'Quotes'}	
 							<input type="hidden" name="activity_mode">
-							<input title="New Task" accessyKey="F" class="small" onclick="this.form.action.value='EditView'; this.form.return_action.value='CallRelatedList'; this.form.module.value='Activities'; this.form.return_module.value='{$MODULE}'; this.form.activity_mode.value='Task'" type="submit" name="button" value="Add new Task"></td>
+							<input title="{$APP.LBL_ADD_NEW} {$APP.Task}" accessyKey="F" class="small" onclick="this.form.action.value='EditView'; this.form.return_action.value='CallRelatedList'; this.form.module.value='Activities'; this.form.return_module.value='{$MODULE}'; this.form.activity_mode.value='Task'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Task}"></td>
 							{else}
 							<input type="hidden" name="activity_mode">
-							<input title="New Task" accessyKey="F" class="small" onclick="this.form.action.value='EditView'; this.form.return_action.value='CallRelatedList'; this.form.module.value='Activities'; this.form.return_module.value='{$MODULE}'; this.form.activity_mode.value='Task'" type="submit" name="button" value="Add new Task">&nbsp;
-							<input title="New Event" accessyKey="F" class="small" onclick="this.form.action.value='EditView'; this.form.return_action.value='CallRelatedList'; this.form.module.value='Activities'; this.form.return_module.value='{$MODULE}'; this.form.activity_mode.value='Events'" type="submit" name="button" value="Add new Event"></td>
+							<input title="{$APP.LBL_ADD_NEW} {$APP.Task}" accessyKey="F" class="small" onclick="this.form.action.value='EditView'; this.form.return_action.value='CallRelatedList'; this.form.module.value='Activities'; this.form.return_module.value='{$MODULE}'; this.form.activity_mode.value='Task'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Task}">&nbsp;
+							<input title="{$APP.LBL_ADD_NEW} {$APP.Event}" accessyKey="F" class="small" onclick="this.form.action.value='EditView'; this.form.return_action.value='CallRelatedList'; this.form.module.value='Activities'; this.form.return_module.value='{$MODULE}'; this.form.activity_mode.value='Events'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Event}"></td>
 							{/if}
 							{elseif $header eq 'HelpDesk'}
-							<input title="New Ticket" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='HelpDesk'" type="submit" name="button" value="Add new Ticket"></td>
+							<input title="{$APP.LBL_ADD_NEW} {$APP.Ticket}" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='HelpDesk'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Ticket}"></td>
 							{elseif $header eq 'Attachments'}
-							<input title="New Notes" accessyKey="F" class="small" onclick="this.form.action.value='EditView'; this.form.return_action.value='CallRelatedList'; this.form.module.value='Notes'" type="submit" name="button" value="Add new Note">&nbsp;
+							<input title="{$APP.LBL_ADD_NEW} {$APP.Note}" accessyKey="F" class="small" onclick="this.form.action.value='EditView'; this.form.return_action.value='CallRelatedList'; this.form.module.value='Notes'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Note}">&nbsp;
 							<input type="hidden" name="fileid">
-							<input title="New Attachment" accessyKey="F" class="small" onclick="OpenWindow('index.php?module=uploads&action=uploadsAjax&file=upload&return_action=CallRelatedList&return_module={$MODULE}&return_id={$id}');" type="button" name="button" value="Add new Attachment"></td>
+							<input title="{$APP.LBL_ADD_NEW} {$APP.LBL_ATTACHMENT}" accessyKey="F" class="small" onclick="OpenWindow('index.php?module=uploads&action=uploadsAjax&file=upload&return_action=CallRelatedList&return_module={$MODULE}&return_id={$id}');" type="button" name="button" value="{$APP.LBL_ADD_NEW} {$APP.LBL_ATTACHMENT}"></td>
 							{elseif $header eq 'Quotes'}
-							<input title="New Quote" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='Quotes'" type="submit" name="button" value="Add new Quote"></td>
+							<input title="{$APP.LBL_ADD_NEW} {$APP.Quote}" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='Quotes'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Quote}"></td>
 							
 							{elseif $header eq 'Invoice'}
 							{if $MODULE eq 'SalesOrder'}
 							<input type="hidden">
 							{else}
-							<input title="New Invoice" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='Invoice'" type="submit" name="button" value="Add new Invoice"></td>
+							<input title="{$APP.LBL_ADD_NEW} {$APP.Invoice}" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='Invoice'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Invoice}"></td>
 							{/if}
 
 							{elseif $header eq 'Sales Order'}
 							{if $MODULE eq 'Quotes'}
 							<input type="hidden">
 							{else}
-							<input title="New SalesOrder" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='SalesOrder'" type="submit" name="button" value="Add new Sales Order"></td>
+							<input title="{$APP.LBL_ADD_NEW} {$APP.SalesOrder}" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='SalesOrder'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.SalesOrder}"></td>
 							{/if}
 
 							{elseif $header eq 'Purchase Order'}
-							<input title="New Purchase Order" accessyKey="O" class="small" onclick="this.form.action.value='EditView'; this.form.module.value='PurchaseOrder'; this.form.return_module.value='{$MODULE}'; this.form.return_action.value='CallRelatedList'" type="submit" name="button" value="Add new Purchase Order"></td>
+							<input title="{$APP.LBL_ADD_NEW} {$APP.PurchaseOrder}" accessyKey="O" class="small" onclick="this.form.action.value='EditView'; this.form.module.value='PurchaseOrder'; this.form.return_module.value='{$MODULE}'; this.form.return_action.value='CallRelatedList'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.PurchaseOrder}"></td>
 							
 							{elseif $header eq 'Emails'}
 							<input type="hidden" name="email_directing_module">
 							<input type="hidden" name="record">
-							<input title="New Email" accessyKey="F" class="small" onclick="fnvshobj(this,'sendmail_cont');sendmail('{$MODULE}',{$id});" type="button" name="button" value="Add new Email"></td>
+							<input title="{$APP.LBL_ADD_NEW} {$APP.Email}" accessyKey="F" class="small" onclick="fnvshobj(this,'sendmail_cont');sendmail('{$MODULE}',{$id});" type="button" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Email}"></td>
 							{elseif $header eq 'Users'}
                                                                 {if $MODULE eq 'Activities'}
-                                                                <input title="Change" accessKey="" tabindex="2" type="button" class="small" value="Select User" name="button" LANGUAGE=javascript onclick='return window.open("index.php?module=Users&return_module=Activities&return_action=CallRelatedList&activity_mode=Events&action=Popup&popuptype=detailview&form=EditView&form_submit=true&return_id={$id}&recordid={$ID}","test","width=640,height=525,resizable=0,scrollbars=0")';>
+                                                                <input title="Change" accessKey="" tabindex="2" type="button" class="small" value="{$APP.LBL_SELECT_USER_BUTTON_LABEL}" name="button" LANGUAGE=javascript onclick='return window.open("index.php?module=Users&return_module=Activities&return_action=CallRelatedList&activity_mode=Events&action=Popup&popuptype=detailview&form=EditView&form_submit=true&return_id={$id}&recordid={$ID}","test","width=640,height=525,resizable=0,scrollbars=0")';>
 								{elseif $MODULE	eq 'Emails'}
-								<input title="Bulk Mail" accessykey="F" class="small" onclick="this.form.action.value='sendmail';this.form.return_action.value='DetailView';this.form.module.value='Emails';this.form.return_module.value='Emails';" name="button" value="Bulk Mails" type="submit">&nbsp;
-								<input title="Change" accesskey="" tabindex="2" class="small" value="Select User" name="Button" language="javascript" onclick='return window.open("index.php?module=Users&return_module=Emails&action=Popup&popuptype=detailview&form=EditView&form_submit=true&return_id={$id}&recordid={$ID}","test","width=640,height=520,resizable=0,scrollbars=0");' type="button">&nbsp;</td>
+								<input title="{$APP.LBL_BULK_MAILS}" accessykey="F" class="small" onclick="this.form.action.value='sendmail';this.form.return_action.value='DetailView';this.form.module.value='Emails';this.form.return_module.value='Emails';" name="button" value="{$APP.LBL_BULK_MAILS}" type="submit">&nbsp;
+								<input title="Change" accesskey="" tabindex="2" class="small" value="{$APP.LBL_SELECT_USER_BUTTON_LABEL}" name="Button" language="javascript" onclick='return window.open("index.php?module=Users&return_module=Emails&action=Popup&popuptype=detailview&form=EditView&form_submit=true&return_id={$id}&recordid={$ID}","test","width=640,height=520,resizable=0,scrollbars=0");' type="button">&nbsp;</td>
                                                                 {/if}
 							{elseif $header eq 'Activity History'}
                                                         &nbsp;</td>
@@ -178,7 +178,7 @@
 							<table style="background-color:#eaeaea;color:eeeeee" border="0" cellpadding="3" cellspacing="1" width="100%" class="small">
 							<tbody>
 								<tr style="height: 25px;" bgcolor="white">
-									<td><i>None included</i></td>
+									<td><i>{$APP.LBL_NONE_INCLUDED}</i></td>
 								</tr>
 							</tbody>
 						



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 01:07:16 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 08:07:16 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6918 -
	/vtigercrm/trunk/include/language/en_us.lang.php
Message-ID: <20060607080716.D35C17E8590@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 02:07:11 2006
New Revision: 6918

Log:
Lang file updated

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

Modified: vtigercrm/trunk/include/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/include/language/en_us.lang.php (original)
+++ vtigercrm/trunk/include/language/en_us.lang.php Wed Jun  7 02:07:11 2006
@@ -287,7 +287,6 @@
 'LNK_NEW_PRICEBOOK'=>'New PriceBook',
 
 
-
 'NTC_REQUIRED'=>'Indicates required field',
 
 'LBL_REQUIRED_SYMBOL'=>'*',
@@ -422,6 +421,8 @@
 //added by raju
 
 'LBL_ADD_ITEM'=>'Add',
+
+'LBL_ADD_NEW'=>'Add new',
 
 //Added for version 5
 
@@ -460,9 +461,13 @@
 
 'LBL_OPEN_ACTIVITIES'=>'Open Activities',
 
-'LBL_HISTORY'=>'Activity History',
+'LBL_HISTORY'=>'History',
+
+'LBL_ACTIVITY_HISTORY'=>'Activity History',
 
 'LBL_ATTACHMENTS'=>'Attachments',
+
+'LBL_ATTACHMENT'=>'Attachment',
 
 'LBL_TYPE'=>'Type',
 
@@ -713,8 +718,8 @@
 'Events'=>'Events',
 'Quotes'=>'Quotes',
 'PriceBook'=>'Price Books',
-'PurchaseOrder'=>'Purchase Orders',
-'SalesOrder'=> 'Sales Orders',
+'PurchaseOrder'=>'Purchase Order',
+'SalesOrder'=> 'Sales Order',
 'Invoice'=>'Invoice',
 'Calendar'=>'Calendar',
 'Home'=>'Home',
@@ -757,6 +762,7 @@
 'Email'=>'Email',
 'Activity'=>'Activity',
 'Event'=>'Event',
+'Task'=>'Task',
 'Quote'=>'Quote',
 'PriceBook'=>'PriceBook',
 'PurchaseOrder'=>'Purchase Order',
@@ -769,6 +775,8 @@
 'Vendor'=>'Vendor',
 'Webmail'=>'Webmail',
 
+'LBL_NONE_INCLUDED'=>'None Included',
+'LBL_ADD_TO'=>'Add to',
 
 'LBL_SELECT_TEMPLATE_TO_MAIL_MERGE'=>'Select template to Mail Merge:',
 'LBL_TITLE_OR_DESCRIPTION'=>'Title / Description',
@@ -805,8 +813,8 @@
 'Start Date'=>'Start Date',
 'Related to'=>'Related To',
 'Recurring Type'=> 'Recurring Type',
-'SalesOrder'=> 'Sales Orders',
-'PurchaseOrder'=> 'Purchase Orders',
+'SalesOrder'=> 'Sales Order',
+'PurchaseOrder'=> 'Purchase Order',
 'LBL_QUOTE_NAME'=>'Quote Name',
  //Added Orders in activity parent type selection / Related list
 'LBL_NEW_QUOTE_BUTTON_TITLE'=>'New Quote [Alt+Q]',



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 01:55:45 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 08:55:45 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6919 -
	/vtigercrm/branches/4.2.4/README.txt
Message-ID: <20060607085546.198307E8593@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 02:55:41 2006
New Revision: 6919

Log:
changes made for 4.2.4 release

Modified:
    vtigercrm/branches/4.2.4/README.txt

Modified: vtigercrm/branches/4.2.4/README.txt
==============================================================================
--- vtigercrm/branches/4.2.4/README.txt (original)
+++ vtigercrm/branches/4.2.4/README.txt Wed Jun  7 02:55:41 2006
@@ -1,35 +1,1432 @@
-vtigerCRM Readme
+####################################################
+vtiger CRM 4.2.4
+June 06, 2005
+####################################################
+
+After much delay vtigercrm 4.2.4 has been released.
+
+This is the first community driven release, so a big thanks goes out to all the people involved in making this happen.
+
+This is mostly a bug fix release, but it does mark the first release using the new SVN/Trac system which helps us harness the power of the community contributions and track issues and their fixes so everyone can help out.  The Trac system can be seen here: http://vtiger.fosslabs.com
+
+A list of fixed bugs can be seen using the trac ticket system here:
+http://vtiger.fosslabs.com/cgi-bin/trac.cgi/query?status=closed&milestone=4.2.4&order=priority
+
+A full changelog can be seen trough the trac svn log here:
+http://vtiger.fosslabs.com/cgi-bin/trac.cgi/log/vtigercrm/tags/vtigercrm-4.2.4?action=stop_on_copy&rev=6885&stop_rev=&mode=follow_copy&verbose=on
+
+vtigercrm 4.2.4 can be downloaded here:
+<download links>
+
+INSTALLATION PROCEDURE:
+
+For a new installation simply extract the files into a directory accessible through your apache setup then point your web browser to that directory on your website and follow the installation instructions.  Software you'll require is apache (1.3.x or 2.x) with php (4.3+, no 5.x support yet) and mysql (4.x).
+
+You can post any issues or suggestions at http://vtiger.fosslabs.com/cgi-bin/trac.cgi/newticket 
+
+
+UPGRADING:
+
+If you are upgrading from a previous version of vtigercrm first backup all data then follow the instructions for the appropriate version below:
+
+4.2.3:
+	- No database changes are need if you are using a successfull installation.
+		- If tables were only partially created for you using an earlier version please wipe your database and try with 4.2.4, your problems should be solved.
+	- To save your current configuration copy the config.php file from your old installation to config.inc.php in the new installation.  You'll also have to edit the config file as follows:
+		- change the following variable names in config.php
+
+		from:
+			$dbconfig['db_host_name'] =
+			$dbconfig['db_user_name'] =
+
+		to:
+			$dbconfig['db_hostname'] =
+			$dbconfig['db_username'] =
+
+	- If your 4.2.3 installation has previously been upgraded from an earlier release there is one database modification missed in pervious upgrades you will want to make manually:
+		alter table wordtemplates drop primary key;
+		alter table wordtemplates change filename filename varchar(100) not null;
+		alter table wordtemplates add column templateid integer(19) primary key;
+
+
+4.2.2 (aka 4.2 patch2):
+	- Apply the 4.2.3 patch as per: http://forums.vtiger.com/viewtopic.php?t=4166
+	- Then follow the instructions for a 4.2.3 upgrade.
+
+
+4.2.1 or 4.2:
+	- Apply the 4.2.2 patch as per: http://forums.vtiger.com/viewtopic.php?t=2903
+	- Then follow the instructions for a 4.2.2 upgrade.
+
+####################################################
+vtiger CRM 4.2.3
+Dec 23, 2005
+####################################################
+We are pleased to announce the vtigerCRM 4.2.3 release. This release is a consolidated with earlier patches (1 & 2 - refer below section for the list of fixes) and Multiple vulnerablity fixes. 
+
+Note: First Time vtiger CRM users can directly install the source in their
+vtiger suported version of LAMP / WAMP. 
+
+**************************************************************************************************************
+*   IMPORTANT NOTICE                                                                                         *
+**************************************************************************************************************
+* The vtigerCRM 4.2.3 is ONLY for the first time vtiger users and not for                                    *
+* the existing users. The existing v4.2 users are recomended to upgrade their system by applying v4.2 patch  *
+* 2 and vulnerability fixes patch. You can download the patches from the                                     *
+* following urls.                                                                                            *
+* http://forums.vtiger.com/viewtopic.php?t=2903								     *
+* http://forums.vtiger.com/viewtopic.php?t=4166                                                              *
+**************************************************************************************************************
+
+Software requirements : PHP 4.3.x, MySQL 4.0.x (4.0.20 prefered), Apache 1.3.x
+or 2.0.x 
+
+For more details refer to http://www.vtiger.com/wiki/index.php/Vtiger_CRM_4.2.3_-_Installation_Guide
+
+
+***********************
+I. Vulnerability fixes
+***********************
+
+Posted by D.Fabian / SEC-CONSULT/ ww.sec-consult.com
+
+a) Multiple SQL Injection Vulnerabilities
+b) Cross Site Scripting
+c) Path Traversal/File Disclosure
+d) Arbitrary File Upload
+e) Remote Code Execution
+
+Posted by Christopher Kunz / www.hardened-php.net
+
+a) Arbitrary File Upload
+b) Authentication ByPass
+c) Unsafe File Inclusion
+d) Arbitrary code execution
+
+
+####################################################
+vtiger CRM 4.2 Patch 2
+Sep 15, 2005
+####################################################
+
+We are pleased to announce the consolidated patch for vtiger CRM 4.2. This release includes many code contributions from vtiger community and bug fixes!
+
+******************************************
+I. Code Contributions by vtiger Community
+******************************************
+
+Thanks to Bela, Fredy, JLee, MikeCrowe, and Sholmi for their valuable contributions to the vtiger CRM development. 
+
+Following contributions were made at vtiger Discussions under "vtiger CRM - Code Contributions" forum:
+
+1. T2025  - 2 bugs - JLee (Same as P8180 in vtiger Discussions " Little typo in function get_lead_feild_options")
+
+2. T2324  - Modification to the Aqua theme - Bela (Note: We have included the fix for all the themes except blue theme)  
+
+3. T2406  - Description spanned over all columns - Fredy
+
+4. T2431  - Search by TicketId field in HelpDesk - Fredy
+
+5. T2524  - Scrollable related lists - Fredy
+
+6. P9578  - Import/Export Products - JLee
+
+7. T2196  - Fix for World Clock Bug - JLee
+
+8. T2139  - Bug in: EditView.html - Shlomi
+ 
+9. T2000  - Add "Assigned To" as a choice when Importing - MikeCrowe
+
+10. T1585 - Improved Calendar - Fredy
+  
+****************
+II. New Features
+****************
+
+1. Import/Export Products
+
+2. Scrollable List View for related Lists
+
+***************
+III. Bug Fixes
+***************
+
+--------------------------
+A. http://bugs.vtiger.com
+--------------------------
+
+-------------------------------------
+S.No ID    Subject
+-------------------------------------
+1.   67  - Inventory Mgmt Related List
+
+2.   70  - Activities - Quick Create
+
+3.   81  - Price Book - Select Product list price
+
+4.   82  - Inventory Mgmt Related List Issue
+
+5.   96  - Alignment is not proper for Total and sub total
+
+6.  108  - Without entering any value in global search if we click on search then the n an empty page is displayed
+
+7.  113  - Security UI not good enough
+
+8.  114  - Better icons for the inv mgmt modules
+
+9.  428 - User Signature Issue
+
+10. 125  - UI for New Product creation not proper
+
+11. 129  - Advanced search requires some fields (SF.Net ID: 
+
+12. 131  - Sorting Name in Leads
+
+13. 143  - Product related list in Activity can be removed
+
+14. 149  - New Ticket Creation - Group empty
+
+15. 160  - Modified time and created time are 0 in Add Business Card
+
+16.  406 - Clock is dislocated after delete a record
+
+17.  407 - HelpDesk quick create- title not saved
+
+18.  408 - Activities CustomView contact not displayed
+
+19. 409 - After mass delete FAQ control goes to HelpDesk
+
+20. 410 - Footer alignment changed
+
+21. 411 - New Event Creation
+
+22. 405 - FAQ quick create
+
+23. 412 - Security - Activity delete
+
+24. 413 - Security - Default Organization for Activities
+
+25. 414 - Field positioning Sales/Support Start dates
+
+26. 415 - Inventory Related List
+
+27. 416 - Inventory RL
+
+28. 417 - Inventory RL - Activity History missing
+
+29. 418 - Ticket - Create
+
+30. 419 - Email - Edit View
+
+31. 420 - Availability of user
+
+32. 421 - Adding Products to Price book Validations
+
+33. 422 - New Activity Creation - Group empty
+
+34. 424 - History in Potential, PO, SO and Invoice
+
+35. 425 - After delete tickets it displays empty list
+
+36. 426 - Invoice Display in Home Page
+
+37.  86 - File Size validation for the product image
+
+38.  78 - Adding pricebook to products
+
+39.  81 - IE 6 Pricebook Validations
+ 
+-----------------------------------
+B. vtiger Discussions - Bug Tracker
+-----------------------------------
+
+-------------------------------------
+S.No ID        Subject
+-------------------------------------
+
+40.  T1707   - Customer Portal language bug
+
+41.  T2080   - Email doesn't work
+
+42.  P8047   - Change Status Not Updating Modify Date
+
+43.  P8004   - BUG modules/HelpDesk/Save.php
+
+44.  P8301   - Additional Info to Helpdesk-Issue
+
+45.  P8449   - Calendar icon missing at HelpDesk
+
+46.  P8306   - Missing values in Cumulative Statistics
+
+47.  T1802   - Still not possible to delete a contact - account relation
+
+48.  T1398   - Issues in Contacts 
+
+49.  T1694   - Email Editor Add Link doesn't work
+
+50.  T1742   - Bug when assigning product from 2nd page to potential
+
+51.  T2025   - 2 bugs
+
+52.  T2313   - New Task Bug
+
+53.  P8170   - Quotes popup trouble
+
+54.  P8098   - Vendor pick list not working in Purchase order
+
+55.  T1862   - Customize Quote Template
+
+56.  P8159   - New Calendar Bug
+
+57.  T2038   - Please fix these Bugs in 4.2
+
+58.  T1696   - Accounts Website url fix
+
+59.  T2003   - Pricebook bug 
+
+60.  P8293   - Double entries in 'Default Organization Sharing Access'
+
+61.  T2512   - Home upcoming activities
+
+62.  P8030   - Meetings not held must not be shown in upcoming activities
+
+
+####################################################
+
+vtiger CRM 4.2 Patch 1
+Aug 10, 2005
+
+####################################################
+
+New Feature:
+
+Reports can be exported in Excel Format.
+
+Bug Fixes:
+
+1. Forum Post ID 6550: Can not add new product
+
+2. SF ID1159916: settings-Company details 
+
+3. SF ID1160084: Task - End Date 
+
+4. SF ID1161317: date accept 0 value 
+
+5. SF ID1161326: Lead Conversion 
+
+6. Forum Topic ID 2038: Please fix these Bugs in 4.2
+
+7. Internal: Make QuickActivityRegister have enddate(duedate)
+
+8. Forum Topic ID 1696: Calendar bug fix for non-admin user
+
+9. Forum Topic ID 1648: Converting a lead 
+
+10. SF ID 1161344: probability is not validate if we give greater value 
+
+11. Forum Topic ID 2223: Editing Company information
+
+12. Interna: Calendar in Quick create in events
+
+13. Forum Topic ID 1803: chips impossible to add more activity (task/event)
+
+14. Forum Post ID 6733: Missing required field in New Event shortcut
+
+15. Internal: Lead Conversion form validation
+
+16. Forum Topic ID 2038:Please fix these Bugs in 4.2
+
+17. SF ID 1161223: Export to PDF
+
+18. Forum Topic ID 1693:Bad PDF output
+
+19. Forum Topic ID 2012:Report Customization iNot working in IE
+
+20. Forum Topic ID 1823: Translation Issue 2
+
+21. Forum Topic ID 2038: Please fix these Bugs in 4.2
+
+22. Internal: Invoice Qty & inventory issues in 4.2 GA
+
+23. Forum Topic ID 1717: bug report in new sales order and PDF invoice on
+online demo
+
+24. Internal: Inventory Mgmt
+
+25. Internal: Detail View Ui for Products Relateion in inventory is imporper 
+
+26. Internal: SO - Popup Account - table issue 
+
+27. Internal: Notes - Cancel/ back 
+
+28. Internal: No of Employees Field not validated 
+
+29. Internal: Filling with Todays date 
+
+30. Internal: Security - Default Organization for Activities 
+
+31. Internal: Security - Activity delete 
+
+32. Internal: Inventory Mgmt Logging 
+
+33. Internal: URL and URL name 
+
+34. Internal: Feild level access for task
+
+35. Forum Topic ID 1823: Custom Date field not working?
+
+36. Internal: Support for Text Area Custom Field
+
+37. Forum Topic ID 1643: Any user can change onw role for admin role? 
+
+38. Internal: Class not set in inventory product UI
+
+39. Forum Topic ID 2258: Nasty security bug in latest 4.2!
+
+40. Code Contribution: Indexing code by Microwe integrated
+
+41. Internal: Title doesn't show up
+
+42. Forum Topic ID 1997: Fixing bugs.
+
+43. Forum Topic ID 822:Translation-Issue
+
+44. Forum Topic ID 1768: Contact address pulled from Acccount
+
+45. Forum Topic ID 1753: VtigerCRM 4.0 Character causing troubles
+
+46. 1161351: Inventory Mgmt Related List 
+
+47. 1161347: Inventory Related List 
+
+48. 1161415:Contacts - Related Lists - Deleting Products
+
+49. 1161406: Assigned ToUser in Leads can be Assigned to User
+
+50. Forum Topic ID 2092: Product Popup in New Quotes
+
+51. Forum Topic ID 1980: Account Pop Http 404 when pickup a account in New
+Sales Order
+
+52. Forum Topic ID 2003: Pricebook bug
+
+53. 1161337: Price Book Product Select
+
+54. Forum Topic ID 2088: Address Information Won't Export
+
+55. Forum Topic ID 1582: Importing Checkbox Values when importing leads
+
+56. 1161356:Email - quick create date and time sent date not validated
+
+57. 1160290: Potentials incorrectly pulls up deleted notes in related
+
+58. Internal: Form Validation for Add Business Card
+
+59. Internal: Single, double quotes problem in ticket comments and FAQ
+comments
+
+60. Forum Topic ID 1612: Misbehaviour on validation of number fields
+
+
+#######################
+
+vtiger CRM 4.2 GA
+July 18, 2005
+
+#######################
+
+We are pleased to announce the latest version of vtiger CRM. This release includes many new features and few bug fixes!
+
+*****************
+A. New Features
+*****************
+
+  * Activity Management
+
+  * Manage recurring events (daily/weekly/monthly/yearly)
+
+  * Group/Shared calendar to plan meetings with vtiger CRM users without time conflicts
+
+  * UI enhancements related to overdue tasks in Activities list view 
+
+2. Lead Management
+
+ * Capture leads directly from your Web site to vtiger CRM
+
+ * Customize Online Lead Form as per your Web site requirements
+
+ * Create mailing lists and execute E-mail marketing campaigns
+
+ * Add multiple products to the leads
+
+ * Customize list of the leads as per users' requirements
+
+ * Create fully customizable lead reports
+
+ * Lead conversion mapping for all the custom fields
+
+3. Account & Contact Management
+
+ * Generate quotes, sales orders, and invoices directly from the accounts and contacts 
+
+ * Track history of all the products purchased by customers
+
+4. Products Management
+
+ * Create Price Books and associate products with Price Books
+
+ * Procure products from the selected Vendors list
+
+ * Associate Trouble Tickets and Knowledge Base articles with products
+
+ * Ability to upload product images for easy identification
+
+5. Sales Quotes
+
+ * Track outstanding quotes from the quotes list view
+
+ * Add Line Items to the quotes and update sub-total, taxes, adjustments, and grand total amounts
+
+ * Select different prices for the same product as per customer segment
+
+ * Create printer-friendly Sales Quotes and deliver to the prospect customers through in-built E-mail service
+
+ * Create Sales Order or Invoice with a single click from the Sales Quote
+
+ * Avoid duplicate work by dynamically displaying the Billing and Shipping addresses of the prospect
+
+ * Display quotes related to accounts under the related list
+
+ * Customize Sales Quote fields as per your organization requirements
+
+ * Set up your company information to display your company address while creating PDF documents
+
+6. Order Management
+
+ * Streamline organization-wide procurement and fulfillment processes by integrated Order Management with CRM
+
+ * Track outstanding orders from the Orders List View
+
+ *  Procure products from the available Vendors/Manufacturers/Resellers list in vtiger CRM
+
+ * Manage up-to-date stock position by seamless integration between order fulfillment and available stock in your warehouse
+
+ * Customize Purchase Order (PO) and Sales Order (SO) fields as per your organization requirements
+
+ * Avoid duplicate work by dynamically displaying the Billing and Shipping addresses of the prospect while creating orders
+
+ * Add Line Items to the Orders and update sub-total, taxes, adjustments, and grand total amounts automatically
+
+ * Create printer-friendly Order (PO/SO) and deliver to the Vendors/Customers through in-built E-mail service
+
+ * Once the Sales Order is confirmed create Invoice from Sales Order with a single click
+
+ * Periodically notify the stock position to the concerned parties in your organization so that stock is always available to fulfill the outstanding orders
+
+7. Invoices
+
+ * Track outstanding invoices from the Invoices list view
+
+ * Create printer-friendly Invoices and deliver to the customers through in-built E-mail service
+
+ * Customize Invoice fields as per your organization requirements
+
+ * Add Line Items to the Invoice and update sub-total, taxes, adjustments, and grand total amounts automatically
+
+ * Customize Invoice fields as per your organization requirements
+
+ * Avoid duplicate work by dynamically displaying the Billing and Shipping addresses of the customer while creating invoices
+
+ * Associate invoices with the General Ledger account for hassle free book keeping 
+
+
+8. Help Desk
+
+ * Manage product-wise Knowledge Base articles/FAQ
+
+ * Associate Articles with trouble tickets and products
+
+ * Provide public access to the Knowledge Base only after approval
+
+ * Update Articles/FAQ in vtiger CRM as based customer suggestions & comments
+
+9. E-mail Integration
+
+ * Configure incoming E-mail servers on per user basis. Each user can retrieve his own E-mails 
+
+ * Fetch E-mail messages through POP and IMAP services
+
+ * Setup multiple incoming E-mail servers 
+
+ * Seamless integration between incoming E-mail messages and the corresponding contacts in vtiger CRM with a single click
+
+ * Fetch incoming E-mail messages as RSS feed in RSS module
+
+ * Send E-mail notification to the users when records are assigned to them or there is a deadline coming up
+
+ * Ready-to use E-mail templates
+
+ * Populate vtiger CRM user related fields in E-mail templates
+
+ * Export E-mail messages into CSV file
+
+ * Fetch inbound E-mails and associate to the contacts or create E-mails directly into vtiger CRM
+
+ * Send mass E-mails to the contacts and other users
+
+10. Other Features
+
+ * Lead conversion feature within module access scope
+
+ * Generate quotes and sales orders, from the potentials
+
+*****************
+B. Bug Fixes
+*****************
+
+1. FORUM:1545 - Quotes, orders - working or not ? 
+
+2. FORUM:1560 - Can not change user password & problem with ordering system
+
+3. FORUM:5512 - In custom fields calendar, when a calendar field in created, the calendar drop down does not appear
+
+4. FORUM:5553 - Contact with apostrophe ' in name cannot own a ticket
+
+5. FORUM:5795 - If you change the name of admin passwords are lost !!!
+
+6. FORUM:5810 - In contacts module Brithdate shown as 0000-00-00
+
+7. FORUM:4501 - Error message while associating user to a group
+
+8. FORUM:4550 - Issue related to custom drop-down list order
+
+9. FORUM:4039- Issue with duplicating a contact
+
+10. FORUM:4073 - Normal user with no access to the settings is anyway able to change the profile of a role.
+
+11. FORUM:1409 - Report Export to PDF
+
+12. FORUM:1818 - Outlook Sync applies makes Calendar appointments 2020
+
+13. FORUM:606 File Missing: testemailtemplateusage.php 
+
+14. FORUM:1294 - Problem with e-mail templates
+
+15. FORUM:1050 - Subject of emails not imported - Need confirmation
+
+16. FORUM:1276 - Converting Leads and assigning to user
+
+17. FORUM:1270 - Bug in e-mail module
+
+18. ORUM:1742 - Bug when assigning product from 2nd page to potential
+
+19. FORUM:1772 - Bug: wrong date format when converting leads
+
+20. FORUM:1559 - Tasks not working in Leads
+
+21. FORUM: 5247 - Account search doesn't work
+
+22. FORUM:5096 - Phone search
+
+23. FORUM:5715 - Currency Support
+
+24. FORUM:5795 - Roles and Passwords
+
+
+25. SF1102842 - CSV import, problem with ?,?,?
+
+26. SF1097215 - Mass Delete in Accounts, Contacts and Opportunities
+
+27. SF1025603 - Phone in Task
+
+28. SF1093989 - picklists - I18N
+
+29. SF1090963 - wrong header caption in activities, history
+
+30. SF1090711 - Duplicate entries in language translation
+
+31. SF1095038 - Import Leads - No Mapping Fields
+
+32. SF1093132 - Lead Import Fails - v3.2
+
+33. SF1094944 - The leads dropdown list does not update
+
+34. SF1090715 - Error on importing contacts from cvs file
+
+35. SF1073179 - Importing .xls files but missing one of the column header
+
+36. SF1073159 - Importing Problem
+
+37. SF1087482 - user not deleted
+
+38. SF1094950 - New E-mail - Error Message
+
+39. SF1090721 - Meeting Contact - Unable to remove
+
+40. SF 1090717 - New Note: Field Name missing
+
+41. SF 1230595 - Custom Calendar in Tickets not working
+
+42. SF 1221170 - Sort Notes 
+
+43. SF 1221036 - Orders 
+
+44. SF 1214401 - Contact birthday translation 
+
+45. SF 1214396 - Task start date and Calendar date scrambled 
+
+46. SF 1218633 - Phone Search not working 
+
+47. SF 1231325 - Error with open tickets link on home page
+
+48. Create users without associating to any of the groups
+
+49. Non-editable user name
+
+50. Mandatory fields checks while configuring currency fields
+
+51. Mandatory fields checks while configuring database backup server
+
+52. The currency symbol which is set in Currency configuration, it is not reflected in dashboard graphs.
+
+53. Field accessibility support not provided for Potential fields
+
+
+*****************
+C. Known Issues
+*****************
+
+1. FORUM:1816 - Outlook Plugin error in Outlook
+
+2. FORUM:1818 - Outlook Sync applies makes Calendar appointments 2020
+
+3. FORUM:1293 - Leads have disappeared - We turned off Leads for all users in the Sales profile. Now we have turned them back on in Settings and they still don't appear. When have restarted the server to completely restart all services just in case but that didn't fix it. Any ideas?
+
+4. FORUM:1752 - Bug: Decimals lost in custom currency fields in products
+
+5. FORUM:1831- Import Error CSV Leads (File size more than 2MB cannot be imported)
+
+6. PDF report overlaps if the number of columns are more than the paper size and last few columns are hidden
+
+7. While creating a new event from Ticket related list, ticket name is not displayed under Activity page
+
+8. In Products related Price Book if edit link will point to Price Book edit view instead of Edit product list price
+
+9. If an event is assigned to Group then in the users list the group members name is displayed
+
+10. If an event is assigned to a team, if the team name is empty then also the event is being saved
+
+11. In Lead Conversion, the type of custom field is not taken into consideration
+
+12. If any of the events associated with recurring event is closed, all the related recurring events are also closed 
+
+13. In Reports, The Date fields in "Filter Options" will not be retained after clicking the 'Apply Filter' button
+
+14. When a New Sales Order, Purchase Order, Invoice and Quotes are created from a Product Detail View, Account Name and Potential Name will not be populated.
+
+15. In a Product Detail View if 'Add to Price Book' hyperlink is clicked and if no Price Book is present in the list, and if 'Add to Product' is selected, vtiger Home page will be displayed. 
+
+16. While generating reports the fields selected in 'Columns to Total' will not be displayed.
+
+***************
+D. Limitations
+***************
+
+1. Security is not implemented for Reports and Dashboards.
+
+2. GIF images are not supported while generating PDF documents such as Quotes,Orders and Invoice.
+
+
+NOTE: For more details about vtiger CRM 4.2 Release Notes, Please refer to the following URL:
+
+http://www.vtiger.com/wiki/index.php/Vtiger_CRM_4_2_Release_Notes
+ 
+#######################
+
+vtiger CRM 4.2 Alpha
+May 31, 2005
+
+#######################
+
+We are pleased to announce the latest version of vtiger CRM. This release includes many new features and few bug fixes!
+
+******************************************************************************************
+Note: vtiger CRM 4.2 Alpha is only for testing and can not be used for production purpose.
+
+Please post Bugs at the following URL:
+
+vtiger Discussions: http://www.vtiger.com/discussions/viewforum.php?f=12
+
+******************************************************************************************
+
+New Features
+
+1. Quotes module
+2. Order Management module (Purchase Orders & Sales Orders)
+3. Invoices module
+4. Price Books 
+5. Vendor/Suppliers Management
+6. Customizable Reports
+7. Customizable List Views
+8. Customer Self-service Portal
+9. RSS module
+10. Event Reminders
+11. Configurable Email Notifications
+12. Incoming Email Support
+
+--------------------
+vtiger CRM 4.0.1
+April 29, 2005
+
+We are pleased to announce the latest version of vtiger CRM. This release
+includes some of the new features and numerous bug fixes!
+
+-------------
+New Features
+-------------
+
+1) Default Organisation Fields - Fields that are not needed can be made hidden across the organisation. 
+2) Multiple Date format support.
+3) Currency Support.
+4) Customer Portal Beta Release - as an add on.
+
+----------
+Bug Fixes
+----------
+
+1) When time like '1:00' is given as input in new event, instead of '01:00',
+an expection will be thrown in the calendar
+2) Php warning fixes - contributed by joduba.
+3) 'Sales Stage' column empty in Potentials table for Contacts and Accounts
+Detail view.
+4) Calendar icons not working in homepage in my pipline chart.
+5) Delete confirmation for notes and attachments in all modules Related list.
+6) Select Contact from Popup after navigation throws exception.
+7) Duplicate entry in Notes listview, when created from Ticket Module.
+8 Added 'Contact' in HelpDesk List View.
+9) Issue in Description Update across modules when saved during edition.
+10) Problem in Notes Update, when no attachment is given.
+11) When a Custom field contains space, export query fails.
+12) Intialising 'log_sql' variable in config.php - php warning fix
+13) Show tickets in Detailview / Related listof contacts.
+14) In Help Desk search 'Status' & 'Priority' given as combo.
+15) Note Title should not be unique.
+16) Problem in importing more than 1000 records.
+17) In Email template big text is not supported
+18 Paragraph support in email template
+19) Amount size entry should be increased in Potentials (increase the digits)
+20) Duplicate Email template entry when editing a template.
+21) Notes and Attachment title/description display in related list
+22) When selected a username in the popup window after search from
+Activity/Email Detail View an exception is thrown.
+23) After email export, the body field in document is empty.
+24) Problem in HelpDesk Search based on Created Date.
+25) When assigned, Contact Salutation type in email template, and used in
+select email template, salutation type is empty.
+26) Sorted by 'Contact' in Ticket List View.
+27) Title field not validated when creating a new ticket
+28) My Account' link in login page throws exception
+29) Usename/creator will shown in all events in Calendar
+30) In Account Advance Search 'State' field empty after giving a value to
+search.
+31) In Home Page my groups all the group entities are displayed
+32) In Home Page My Activities, the Activity Link is not working.
+33) The Group Name link is the User Detail View not working.
+34) Email fiele length in accounts table modified from 30 to 100
+35) Check Box custom field Search not working
+36) Product search fields are interchaged between Basic and Advanced.
+commision rate & Qty/Unit -- Moved from Basic to Advanced. Manufacturer &
+category -- Moved from Advanced to Basic
+37) Improper Link issue in Popup after search.
+38) In Home Page My Tickets - Related to Contacts link are not working.
+39) Unwanted includes in Calendar Removed
+40) Sorting of Potentials in Home Page(Amount in Descending order)
+41) Login History - improper login/logout time
+42) Email Form Validation
+43) Pipleline total not getting updated.
+44) In Email List View displaying of Contact Issue.
+45) Enabling Status for Call and Meetings.
+46) Removing Notes, Products from Default Organisation Sharing.
+47) Populating modified time during entity creation.
+48) Edit and Duplicate of Attachments not working.
+49) Displaying of Closed Ticket in Home Page.
+50) Deleted entities are getting listed in Tracker.
+51) Enabling History tabs in Leads, Contacts, Accounts and Potentials for
+Activity History.
+
+
+--------------------
+vtiger CRM 4
+March 29, 2005
+
+We are pleased to announce the latest version of vtiger CRM. This release includes several new features and numerous bug fixes!
+
+-------------
+New Features
+-------------
+
+A. General
+
+1. Database layer is redesigned for a better data integrity
+
+2. Multiple database support for MySQL, Oracle, MSSQL, and Postgres through ADOdb (We have tested in MySQL and Oracle only)   
+3. Microsoft Office Plug-in to create mail merge templates in Microsoft Word and create on-the-fly documents with customer specific data in vtiger CRM
+
+4. Mozilla Thunderbird Plug-in to add E-mail messages and addresses from Thunderbird to vtiger CRM
+
+5. E-mail notifications to vtiger CRM users as well as customers instantly as well as periodically
+
+6. Search enabled for all the fields (including custom fields) in various modules
+
+7. Database migration from version 3.2 to version 4
+
+8. Accessories, such as World Clock and Calculator
+
+B. Lead Management
+
+1. Filter leads list in Leads home page based on lead status
+
+2. Change leads owner in bulk
+
+3. Export Leads into Spreadsheet programs
+
+C. Account Management
+
+1. Filter accounts list in Accounts home page based on type of the account
+
+2. Delete accounts in bulk
+
+3. Change accounts owner in bulk
+
+D. Contact Management
+
+1. Delete contacts in bulk
+
+2. Change contacts owner in bulk
+
+3. Create mail merge documents for contacts   
+
+E. Opportunity Management
+
+1. Notification of Big deals to the specific users/non users
+
+2. Filter opportunities list in Opportunities home page based on the sales stage
+
+3. Delete opportunities in bulk
+
+F. Help desk
+
+1. Automatically generate ticket ID while creating trouble tickets
+
+2. Filter trouble tickets list in Help desk home page based on the priority of the ticket
+
+3. Add/Modify custom fields in Help desk
+
+G. Products
+
+1. Enhanced the standard fields based on users feedback
+
+2. Add/Modify custom fields in Products
+
+H. Activity Management
+
+1. All the activities (Tasks, Calls, and Meetings) can be managed in a Activities module 
+
+2. Calendar user interface is enhanced, with a small calendar in Home page
+
+3. Synchronize calendar records with Microsoft Outlook  
+
+I. Studio:
+
+1. Add custom fields in Helpdesk and Products modules
+
+2. Modify the custom pick list values in all the modules
+
+3. Custom objects for URL and boolean types
+
+4. Enhanced user interface for product customization 
+	
+J. Communication Templates:
+
+1. Mail Merge Templates to create on-the-fly Microsoft Word documents based on customer data
+
+2. Canned E-mail Notifications through Linux Cron Job/Window Scheduler:
+
+K. Security Management
+
+1. Manage Profiles and associate to the roles
+
+2. Module level access control list for profiles
+
+3. Field level access control list for profiles
+
+4. Organization level record sharing model
+
+5. User management from Settings module
+
+L. System Administration
+
+1. Outgoing Email server configuration
+
+2. Database backup server configuration
+
+We have also provided the following features requested in Sourceforge.net and vtiger Discussions:
+
+SourceForge
+
+1. 1157343: Custom fields for tickets
+
+2. 1108850:  Mozilla Thunderbird (Non-MS Outlook) Plugin
+
+3. 1069886: PostgreSQL Support
+
+4. 1050500: HelpDesk or Trouble ticketing
+
+
+vtiger Discussions
+
+1. RC1 - Leads : Sorting Lead List - by eberled
+
+2. Database management (database backup) - by eberled and ITPM
+
+3. Enable/Disable Import/Export features according to the user's profile - by bwoo and fredy
+
+4. Small Calendar in Home page
+
+5. Department instead of Account in Contact list - by joduba
+
+6. Delete contacts in bulk - by david and Bez
+
+7. Delete users - by Jim
+
+8. ACL on data - Stefano
+
+9. Groups and user level security - by Jay McDonald
+
 ----------------
-
-After several months of working on our CRM solution, based on Apache, MySQL
-and other open source components, we came across a SourceForge open source
-project initiated by SugarCRM, having the same vision, and doing something
-very similar to what we were doing. They started out with the same promise
-we did, namely that CRM software is needlessly expensive, and hosted offerings
-only pretend to be affordable. While we were getting ready with our offering,
-the open source project had already launched it; the underlying infrastructure
-of Apache and MySQL was similar to what we were doing, and most importantly,
-the SugarCRM Public License allowed us to create distributions based on this
-code (SPL - a copy of Version 1.1.2 is found here, and the URL is at
-http://www.sugarcrm.com/home/content/view/35/86/) we decided it would be even
-faster to adopt that as our core and add value on top, an example of open
-source based collaboration.
-
-We gratefully acknowledge the contribution made by SugarCRM, and we intend to
-actively participate and lead in bringing this vision of affordable enterprise
-applications, but we make it clear that vtiger is not affiliated with nor is
-endorsed by SugarCRM.
-
-Please feel free to send your valuable comments to contact at vtiger.com so that
-we can have a better CRM product at free of cost. Check out our website at
-http://www.vtiger.com for support forums, detailed product information,
-our future plan and much more.
-
-software requirements
+Important Notes
+----------------
+
+* We have tested vtiger CRM 4 in MySQL and Oracle database software. Though we didn't tested in other database software, we feel it should work.
+
+* Cases Module is phased out (Help desk module take care of all the customer support related features)
+
+* Opportunities module is renamed as Potentials
+
+* Tasks, Calls and, Meetings modules are phased out (Activities module take care of all the tasks and events related features)
+----------
+Bug Fixes
+----------
+
+We have fixed the following issues reported in Sourceforge.net and vtiger Discussions:
+
+SourceForge.net
+----------------
+
+1. 1087474: suggestion
+
+2. 1169597: Tab Order in data entry is inconvenient
+
+3. 1158945: Cancel button behavior 2
+
+4. 1158943: Cancel button behavior
+
+5. 1161346: RC1 - Custom field Date not working
+
+6. 1157577: Account View -- Contact Name
+
+7. 1158932: RC1- Need "Select Product" on Potentials
+
+8. 1158934: RC1 - Need select multiple products on Activities
+
+9. 1158934:  RC1 - Need select multiple products on Activities - Richie Please check it is promised in sf.net
+
+10. 1160628: Deleted tickets are still visible in the account overview
+
+11. 1160522: minor issues in RC 1
+
+12. 1157581: BusinessCard.php
+
+13. 1158473: double $contact_id definition in modules/Calendar/UserCalend
+
+14. 1157587: website character needs to be longer
+
+15. 1157583: redirection limit for url exceeded
+16. 1156560: Single quotation mark not handled when creating new note
+
+17. 1069310: Time out during contact import
+
+18. 1156463: Outlook Plug-in Error: wrong encryption string
+
+19. 1111432: Meetings get duplicated views after editing
+
+20. 1152457: V3.2 Log-In Recognition
+
+21. 1151958: Leads "Change Status" button doesn't work
+
+22. 1151793: Editing lead errors
+
+23. 1145907: exporting xls to leads -
+
+24. 1087484: user deleted problem
+
+25. 1122448: export of opportunities
+
+26. 1122446: upload file size hardwired
+
+27. 1119621: PHP Error when cancelling editing of a ticket
+
+28. 1116923: Custom contacts import fails if no last name specified
+
+29. 1116919: CVS Import bombs when data contain single quote
+
+30. 1032651: New Attachment - Error message
+
+
+vtiger Discussions
+------------------
+ 
+1. Displaying the corresponding lead in Meeting/Call/Task modules
+
+2. Activity - missing confirmation on deleting activities - by fredy
+
+3. RC1 - Potentials "Only my items" not working - by eberled
+
+4. RC1 - Potentials sorting tables returns an error - by eberled
+
+5. RC1 Helpdesk - 'Assigned to' vs. 'Group' - by eberled
+
+6. RC1 - Helpdesk: Changing a ticket doesn't work - by eberled
+
+7. RC1- Homepage / Helpdesk : all tickets are listed - by eberled
+
+8. RC1 - Helpdesk : Account and Contact Name - by eberled
+
+9. RC1- Settings: Communication Templates - by eberled
+
+10. Unable to tab - by 829
+
+11. Email to Contacts and Mass Mail - by Jay
+
+12. blank.gif doesnt display - by timb
+
+13. RC1 - Product commission rate needs decimal field -by dchaffee
+
+14. RC1 - Potentials sorting tables returns an error - by eberled 
+
+15. Bugs in table insert statements during a new installation - by pab63
+
+16. RC1 - Selecting a contact shows only name and no firstname - by eberled
+
+17. Problem installing on subdomain - by cyberox
+
+18. help desk trouble ticket - by 829
+
+19. RC1 - Admin-Page: Empty Link in top right corner - by eberled
+
+20. RC1 - Admin Page: Wrong mail server password shown - by eberled
+
+21. RC1 - Admin : Creating User ( input field tab order) -by eberled 
+ 
+22. Accentuated characters - by bigtime
+
+23. Can't create new leads, contacts, accounts - by Peter - 
+
+24. RC1 - Admin : Show users related to a group not working - by eberled
+
+25. RC1 - Account : Description Information - by eberled
+
+26. RC1- Accounts : Searching for - by eberled
+
+27. RC1 - Leads : Input field tab order - by eberled
+
+28. RC1 - Leads : Input field for postalcode to large - by eberled
+
+29. vtiger DIscussions: RC1 - Accounts : Please show first name under contacts - by eberled
+
+30. RC1 - Contacts: Notes not created using 'Add buisness Card' - by eberled
+
+31. RC1 - Contacts : Advanced search - by eberled
+
+32. RC1 - Potentials: Expected Close Date - by eberled
+
+33. RC1 - Helpdesk : Searching - by eberled
+
+34. RC1 - Helpdesk : Searching II - by eberled
+
+35. RC1 - Accounts Detailview : empty 'Last modified date' - by eberled
+
+36. Problems with Thunderbird plugin - by mike
+
+37. vTiger CRM 4 (RC1) - Save Record Failure -
+
+38. User withread-only access to the contacts. However this user can easily 'mass delete' all contacts.
+  
+39. Unable to install Outlook plugin 4 RC 1 - by Christian
+
+40. RC1 Thunderbird plugin doesn\'t work
+
+41. Calculator bug - by 829
+
+42. Outlook Plugin Issues (outlook 2003) - by adrian
+
+43. vtiger Outlook Plugin 4.0.1 beta Release - by adrian
+
+44. CRM 4 RC1 problem or not? - 
+
+45. Problem installing RC1 - by stelaix
+
+46. Install Errors in step 5 - by pab
+
+47. Some Contact fields not synching - by Tareef
+
+48. vtiger v4 - How do you add a manufacturer? - 
+
+49. Contacts in vtiger Outlook related - Maarten
+
+50. RC1 - Product search to include Category, Manufacturer - by dchaffee
+
+51. RC1 - Products - No way to update product category field - by dchaffee
+
+52. Product commission rate needs decimal field - by dchaffee
+
+53. RC1 - New Notes for Tickets - by nuguid
+
+54. RC1 - Settings: Picklist - by eberled
+
+55. RC1- Settings : Helpdesk Picklist doesn't work - by eberled
+
+56. RC1 - Setting : Picklist values for Sales Stages - by eberled
+
+57. RC1 - Home : My Group Allocation - by eberled
+
+58. RC1 - Page Admin - by eberled
+
+
+
+Known Issues
+
+1. 1111896: Outlook raises a security alert when adding email with vtiger Outlook Plug-in
+
+2. In Windowos OS, System Inoformantion is not displayed
+
+3. While importing leads, accounts, contacts, and potentials the XLS file format can be browsed even though the allowed file format is CSV.
+ 
+----------------------------
+vtiger CRM 4 Beta
+January 10, 2005
+
+We are pleased to announce the latest version of vtiger CRM.
+
+New Features:
+
+1. Help Desk module to handle trouble tickets, Frequently Asked Questions and Support Statistics
+
+2. Products module to add company wide products related information at a centralized location
+
+3. Mail merge Templates
+
+4. Sending Mass E-mails to contacts
+
+5. Delete attachments
+
+6. Add/Sync Email attachments using vtiger Outlook Plug-in from Microsoft(R) Outlook(R) to vtiger CRM
+
+7. Add/Sync tasks using vtiger Outlook Plug-in from Microsoft(R) Outlook(R) to vtiger CRM
+
+8. Creating Groups and assigning users to groups
+
+9. Assigning leads/tickets to groups/individuals
+
+10. New theme 'Blue' has been added
+
+
+Issues Fixed:
+
+We have fixed the following issues reported in Sourceforge.net:
+
+1. 1093648 - Attachment contains extra footer
+
+2. 1097245 - Email Field in Leads - 25 chars
+
+3. 1093120 - User name doesn't appear in meetings
+
+4. 1090718 - Meeting User - Unable to remove
+
+5. 1092763 - Meeting attendee list does not list user's Name
+
+6. 1094922 - New Attachment - Error Message
+
+7. 1089207 - problem in emails
+
+8. 1089136 - need attachment
+
+9. 1037521 - Attachment/Import - Error message
+
+10. 1032707 - Unable to view/Save the Attachments
+
+11. 1019074 - handle mysql data
+
+12. 1028989 - Print Problem
+
+13. 1085617 - Wrong focus after deleting cases/contacts/opportunities
+
+14. 1089627 - Problem with vtiger. 25 Character email limit
+
+15. 1090721 - Meeting Contact - Unable to remove
+
+16. 1090279 - Export Custom Fields - Not working
+
+17. 1098475: Contacts: Field TITLE is too short
+
+18. 1093669 - Delete attachments
+
+19. Support for Latest versions of Apache and MySQL in installation wizard (Both Linux and Windows).
+
+----------------------------
+
+vtiger CRM 3.2.1
+December 21, 2004
+
+We are pleased to announce the latest version of vtiger CRM.
+
+New Features:
+
+1. Basic Calendar support
+2. German and Dutch Languages Support
+
+Issues Fixed:
+
+a) Duration minutes in calls not getting saved when a new call is created is fixed. 
+ 
+b) On deleting any entity, the Leads List View page getting displayed is fixed. 
+ 
+c) Internationalisation support for Custom Fields provided. 
+ 
+d) Internationalistaion support for Pick List Value Customization provided. 
+ 
+e) Quick create form is getting displayed now. 
+ 
+f) Empty Line Space appearing between the heading and List view table in module Lead and MessageBoard is fixed 
+ 
+g) Proper Message display is done when a user with no delete privileges tries to delete the entity.
+
+h) vtiger Outlook Plug-in in server side fixes related to performance improvement.
+
+
+---------------------------
+vtiger CRM 3.2
+December 13, 2004
+
+We are pleased to announce the latest version of vtiger CRM.
+
+New Features:
+
+a) Custom Field Support 
+
+b) Security Support 
+
+c) Migration from 3.0 to 3.2 
+
+----------------------------
+
+vtiger CRM 3
+November 8, 2004
+
+We are pleased to announce the latest version of vtiger CRM.
+
+New features:
+
+a) Support for accessing vtiger CRM server from Microsoft Outlook behind Proxy settings
+
+b) Synchronize customer specific tasks in between Microsft Outlook and vtiger CRM.
+
+c) Integrated Message Boards with vtiger CRM, which can be used to share customer knowledge among CRM service users.
+
 ---------------------
-PHP 4.x, MySQL 4.x, Apache 1.x or 2.x
-
-For more details please refer:
-http://www.vtiger.com/wiki/index.php/Vtiger_CRM_4.2.3_-_Installation_Guide
+
+vtiger CRM 3.0 Beta
+October 7, 2004
+
+We are pleased to announce the latest version of vtiger CRM.
+
+The new features are:
+
+a) Released vtiger Outlook Plug-in, business productivity enhancement utility for Microsoft Outlook users. It is an open source project covered under vtiger Public License 1.0 based on Mozilla Public License 1.1. 
+
+---------------------
+vtiger CRM 2.0
+September 6, 2004
+
+We are pleased to announce the latest version of vtiger CRM.
+
+The new features are:
+
+a) DRAG and DROP of the tabs!!
+This was achieved after working for quite a long time in the labs, not to
+mention many sleepless nights!.
+By using this feature, you can customize the tabs that you want to work with.
+Do let us know what you feel about it.
+
+b) Lead Management
+
+Sales reps can create leads and initiate the CRM cycle.
+We have tried to incorporate all the required features during this short period.
+Do let us know if you would like to see some more features.
+
+c) Import Leads from External Sources
+
+Sales reps can import leads to vtiger CRM from external sources, such as Microsoft Outlook, 
+ACT, GoldMine, and others in *.XLS file format. This feature eliminates the manual
+data entry and enhances the Sales rep's productivity.
+
+d) Attach Files
+
+Sales reps can attach sales-related materials, such as marketing collaterals, presentations,
+price quotes, and others, so that they can instantly access the related documents while 
 dealing with leads/opportunities, accounts, and contacts.
 
+Send your feedback, which is vital for our understanding your needs.
+
+-------------------------------------------------------------------------------------------------------------
+vtiger CRM 1.0
+August 26, 2004
+
+-=Overview=-
+
+After several months of working on our CRM solution, based on Apache, MySQL and other open source components, we came across a SourceForge open source project initiated by SugarCRM, having the same vision, and doing something very similar to what we were doing. They started out with the same premise we did, namely that CRM software is needlessly expensive, and hosted offerings only pretend to be affordable. While we were getting ready with our offering, the open source project had already launched it; the underlying infrastructure of Apache and MySQL was similar to what we were doing, and most importantly, the SugarCRM Public License allowed us to create distributions based on this code (SPL - a copy of Version 1.1.2 is found here, and the URL is at http://www.sugarcrm.com/home/content/view/35/86/) we decided it would be even faster to adopt that as our core and add value on top, an example of open source based collaboration.
+
+We gratefully acknowledge the contribution made by SugarCRM, and we intend to actively participate and lead in bringing this vision of affordable enterprise applications, but we make it clear that vtiger is not affiliated with nor is endorsed by SugarCRM.
+
+The team at vtiger CRM is pleased to announce the v1.0 the first release of vtiger CRM Open Source project.
+
+This first release of vtiger.Sales is best suited for small sales forces.  If
+you're looking to manage the basics of sales deals where every user can see
+all of the data in the system, then vtiger.Sales v1.0 is right for you.  Over the next few months, we will be building out vtiger.Sales to meet the needs of larger, multi-national sales forces that need features like forecasting, data access permissions and internationalization.
+
+Please feel free to send your valuable comments to contact at vtiger.com so that we can have a better CRM product at free of cost. Check out our website at http://www.vtiger.com for support forums, detailed product information, our future plan and much more.  
+
+-=Features=-
+We have incorporated the following features in this release based on SugarCRM. 
+
+Opportunities
+vtiger.Sales provides a complete, yet easy-to-use Opportunities module.  From deal size to each contact?s role, from listing the competitors to tracking the lead source, sales reps can easily manage each sales opportunity to completion.  
+
+Accounts & Contacts
+With the Accounts & Contacts module, you can easily enter and update key account and contact information. Tracking and staying in touch with your customers is simply a click away. 
+
+Activity & Task Management
+Managing your customer interactions is at the heart of a sales automation application. vtiger.Sales provides a simple and clean set of tools for quickly tracking tasks, phone calls, emails and meetings. 
+
+Notes & Attachments
+Easily keep notes on every contact, opportunity or account. 
+
+Home Screen 
+Focus on the right activities with a quick view of your top opportunities, pipeline, today's appointments and task list.
+
+Dashboard 
+A picture is always worth a thousand words.  With the dashboard module, you can graphically view how your opportunities  breakdown by sales stage or industry.
+
+Administration 
+Easily manage all the users in the system, their passwords, user interface themes and more. 
+



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 02:18:10 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 09:18:10 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6920 -
	/vtigercrm/trunk/Smarty/templates/UserProfile.tpl
Message-ID: <20060607091811.1C5197E8599@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 03:18:07 2006
New Revision: 6920

Log:
ajax functionality has been modified

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 Wed Jun  7 03:18:07 2006
@@ -76,18 +76,20 @@
 </table>
 <div id="tempdiv" style="display:block;position:absolute;left:350px;top:200px;"></div>
 <script>
-function ajaxSaveResponse(response)
-{ldelim}
-	hide("status");
-	document.getElementById("tempdiv").innerHTML=response.responseText;
-{rdelim}
-
 function DeleteProfile(profileid)
 {ldelim}
-	show("status");
-	var ajaxObj = new VtigerAjax(ajaxSaveResponse);
-	var urlstring = "module=Users&action=UsersAjax&file=ProfileDeleteStep1&profileid="+profileid;
-	ajaxObj.process("index.php?",urlstring);
+	$("status").style.display="inline";
+        new Ajax.Request(
+                'index.php',
+                {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+                        method: 'post',
+                        postBody:'module=Users&action=UsersAjax&file=ProfileDeleteStep1&profileid='+profileid,
+                        onComplete: function(response) {ldelim}
+                                $("status").style.display="none";
+				$("tempdiv").innerHTML=response.responseText;
+                        {rdelim}
+                {rdelim}
+        );
 {rdelim}
 </script>
 {include file='SettingsSubMenu.tpl'}



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 02:19:02 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 09:19:02 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6921 -
	/vtigercrm/trunk/Smarty/templates/UserListView.tpl
Message-ID: <20060607091902.9A5DF7E8599@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 03:18:59 2006
New Revision: 6921

Log:
ajax functionality has been modified

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 Wed Jun  7 03:18:59 2006
@@ -65,41 +65,52 @@
 <script>
 function getListViewEntries_js(module,url)
 {
-		show("status");
-		var ajaxObj = new VtigerAjax(ajaxSaveResponse);
-		var urlstring ="module=Users&action=UsersAjax&file=ListView&ajax=true&"+url;
-	    ajaxObj.process("index.php?",urlstring);
-
-}
-function ajaxSaveResponse(response)
-{
-	hide("status");
-	document.getElementById("ListViewContents").innerHTML= response.responseText;
+	$("status").style.display="inline";
+        new Ajax.Request(
+		'index.php',
+                {queue: {position: 'end', scope: 'command'},
+                        method: 'post',
+                        postBody: 'module=Users&action=UsersAjax&file=ListView&ajax=true&'+url,
+                        onComplete: function(response) {
+                                $("status").style.display="none";
+				$("ListViewContents").innerHTML= response.responseText;
+                        }
+                }
+        );
 }
 
 function deleteUser(userid)
 {
-	show("status");
-	var ajaxObj = new VtigerAjax(ajaxDeleteResponse);
-	var urlstring = "action=UsersAjax&file=UserDeleteStep1&return_action=ListView&return_module=Users&module=Users&parenttab=Settings&record="+userid;
-	ajaxObj.process("index.php?",urlstring);
-
-}
-
-function ajaxDeleteResponse(response)
-{
-	hide("status");
-	document.getElementById("tempdiv").innerHTML= response.responseText;
+	$("status").style.display="inline";
+        new Ajax.Request(
+                'index.php',
+                {queue: {position: 'end', scope: 'command'},
+                        method: 'post',
+                        postBody: 'action=UsersAjax&file=UserDeleteStep1&return_action=ListView&return_module=Users&module=Users&parenttab=Settings&record='+userid,
+                        onComplete: function(response) {
+                                $("status").style.display="none";
+				$("tempdiv").innerHTML= response.responseText;
+                        }
+                }
+        );
 }
 
 function transferUser(del_userid)
 {
-		show("status");
-		hide("DeleteLay");
-		var ajaxObj = new VtigerAjax(ajaxSaveResponse);
-		var trans_userid=document.getElementById('transfer_user_id').options[document.getElementById('transfer_user_id').options.selectedIndex].value;
-		var urlstring ="module=Users&action=UsersAjax&file=DeleteUser&ajax=true&delete_user_id="+del_userid+"&transfer_user_id="+trans_userid;
-	    	ajaxObj.process("index.php?",urlstring);
+	$("status").style.display="inline";
+	$("DeleteLay").style.display="none";
+	var trans_userid=$('transfer_user_id').options[$('transfer_user_id').options.selectedIndex].value;
+        new Ajax.Request(
+                'index.php',
+                {queue: {position: 'end', scope: 'command'},
+                        method: 'post',
+                        postBody: 'module=Users&action=UsersAjax&file=DeleteUser&ajax=true&delete_user_id='+del_userid+'&transfer_user_id='+trans_userid,
+                        onComplete: function(response) {
+                                $("status").style.display="none";
+                                $("ListViewContents").innerHTML= response.responseText;
+                        }
+                }
+        );
 
 }
 </script>



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 02:21:27 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 09:21:27 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6922 -
	/vtigercrm/trunk/Smarty/templates/UserEditView.tpl
Message-ID: <20060607092127.CFCFB7E8599@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 03:21:24 2006
New Revision: 6922

Log:
ajax functionality has been modified

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

Modified: vtigercrm/trunk/Smarty/templates/UserEditView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/UserEditView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/UserEditView.tpl Wed Jun  7 03:21:24 2006
@@ -31,22 +31,23 @@
 <script language="javascript">
 function check_duplicate()
 {ldelim}
-
-        var ajaxObj = new VtigerAjax(ajaxSaveUserResponse);
-        var user_name = document.getElementById('user_name').value;
-
-        var urlstring ="module=Users&action=UsersAjax&file=Save&ajax=true&dup_check=true&userName="+user_name;
-        ajaxObj.process("index.php?",urlstring);
+	var user_name = $('user_name').value;
+	new Ajax.Request(
+                'index.php',
+                {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+                        method: 'post',
+                        postBody: 'module=Users&action=UsersAjax&file=Save&ajax=true&dup_check=true&userName='+user_name,
+                        onComplete: function(response) {ldelim}
+				if(response.responseText == 'SUCCESS')
+			                document.EditView.submit();
+       				else
+			                alert(response.responseText);
+                        {rdelim}
+                {rdelim}
+        );
 
 {rdelim}
 
-function ajaxSaveUserResponse(response)
-{ldelim}
-        if(response.responseText == 'SUCCESS')
-                document.EditView.submit();
-        else
-                alert(response.responseText);
-{rdelim}
 </script>
 
 



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 02:23:02 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 09:23:02 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6923 -
	/vtigercrm/trunk/Smarty/templates/Rss.tpl
Message-ID: <20060607092302.66E087E8599@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 03:22:58 2006
New Revision: 6923

Log:
ajax functionality has been modified

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

Modified: vtigercrm/trunk/Smarty/templates/Rss.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Rss.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Rss.tpl Wed Jun  7 03:22:58 2006
@@ -12,27 +12,25 @@
 <script language="JavaScript" type="text/javascript" src="modules/Rss/Rss.js"></script>
 <script src="include/scriptaculous/prototype.js" type="text/javascript"></script>
 <script src="include/scriptaculous/scriptaculous.js" type="text/javascript"></script>
-<script language="JavaScript" type="text/javascript" src="include/js/ajax.js"></script>
 <script>
 {literal}
 
-function ajaxSetDefault(response)
-{
-	hide('status');
-	getrssfolders();
-}
 function GetRssFeedList(id)
 {
-	show('status');	
-	var ajaxObj = new VtigerAjax(ajaxRssFeedResponse);
-	var urlstring = 'module=Rss&action=RssAjax&vtigerfile=ListView&directmode=ajax&record='+id;
-	ajaxObj.process("index.php?",urlstring);
+	$("status").style.display="inline";
+        new Ajax.Request(
+                'index.php',
+                {queue: {position: 'end', scope: 'command'},
+                        method: 'post',
+                        postBody: 'module=Rss&action=RssAjax&vtigerfile=ListView&directmode=ajax&record='+id,
+                        onComplete: function(response) {
+                                $("status").style.display="none";
+				$("rssfeedscont").innerHTML=response.responseText;
+                        }
+                }
+        );
 }
-function ajaxRssFeedResponse(response)
-{
-	hide('status');	
-	document.getElementById("rssfeedscont").innerHTML=response.responseText;
-}
+
 function DeleteRssFeeds(id)
 {
    if(id != '')	
@@ -41,38 +39,50 @@
 	{	
 		show('status');	
 		var feed = 'feed_'+id;
-		document.getElementById(feed).parentNode.removeChild(document.getElementById(feed));
-		var ajaxObj = new VtigerAjax(ajaxRssFeedResponse);
-		var urlstring = 'module=Rss&return_module=Rss&action=RssAjax&vtigerfile=Delete&directmode=ajax&record='+id;
-		ajaxObj.process("index.php?",urlstring);
+		$(feed).parentNode.removeChild($(feed));
+		new Ajax.Request(
+                	'index.php',
+        	        {queue: {position: 'end', scope: 'command'},
+                        	method: 'post',
+	                        postBody: 'module=Rss&return_module=Rss&action=RssAjax&vtigerfile=Delete&directmode=ajax&record='+id,
+        	                onComplete: function(response) {
+	        	                $("status").style.display="none";
+                                	$("rssfeedscont").innerHTML=response.responseText;
+                        	}
+                	}
+        	);
 	}
    }
 }
 function SaveRssFeeds()
 {
-	show('status');	
-	var ajaxObj = new VtigerAjax(ajaxRssSaveResponse);
-	rssurl = document.getElementById('rssurl').value;
+	$("status").style.display="inline";
+	rssurl = $('rssurl').value;
 	rssurl = rssurl.replace(/&/gi,"##amp##");
-	var urlstring = 'module=Rss&action=RssAjax&vtigerfile=Popup&directmode=ajax&rssurl='+rssurl;
-	ajaxObj.process("index.php?",urlstring);
-}
-function ajaxRssSaveResponse(response)
-{
-	hide('status')	
-	if(isNaN(parseInt(response.responseText)))	
-	{
-		alert(response.responseText);
-		document.getElementById('rssurl').value = '';
-	}
-	else
-	{
-		GetRssFeedList(response.responseText);
-		getrssfolders();
-		document.getElementById('rssurl').value = '';
-		Effect.Puff('PopupLay');
-	}
-		
+	var category = $('rsscategory')[$('rsscategory').selectedIndex].value;
+	new Ajax.Request(
+		'index.php',
+		{queue: {position: 'end', scope: 'command'},
+			method: 'post',
+			postBody:'module=Rss&action=RssAjax&vtigerfile=Popup&directmode=ajax&rsscategory='+category+'&rssurl='+rssurl, 
+			onComplete: function(response) {
+	
+                                        $("status").style.display="none";
+					if(isNaN(parseInt(response.responseText)))
+        				{
+				                alert(response.responseText);
+				                $('rssurl').value = '';
+					}
+					else
+        				{
+				                GetRssFeedList(response.responseText);
+				                getrssfolders();
+				                $('rssurl').value = '';
+				                Effect.Puff('PopupLay');
+        				}
+                                }
+                        }
+                );
 }
 {/literal}
 </script>
@@ -167,6 +177,10 @@
 	<td align="left" width="70%"><input type="text" id="rssurl" class="txtBox" /></td>
 	</tr>
 	
+	<tr>
+	<td align="right"><b>{$MOD.LBL_CATEGORY}</b></td>
+	<td align="left"><select id="rsscategory" class="importBox" style="width:100%">{$RSSCATEG}</select></td>
+	</tr>
 	<tr><td colspan="2" style="border-bottom:1px dashed #CCCCCC;">&nbsp;</td></tr>
 	<tr>
 	<td	colspan="2" align="center">
@@ -194,21 +208,32 @@
 {ldelim}
 	if(id != '')
 	{ldelim}
-		show('status');	
-		var ajaxObj = new VtigerAjax(ajaxSetDefault);
-		var urlstring = 'module=Rss&action=RssAjax&vtigerfile=Popup&directmode=ajax&record='+id;
-		ajaxObj.process("index.php?",urlstring);
+		$("status").style.display="inline";
+		new Ajax.Request(
+                	'index.php',
+	                {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+        	                method: 'post',
+                	        postBody:'module=Rss&action=RssAjax&vtigerfile=Popup&directmode=ajax&record='+id, 
+                        	onComplete: function(response) {ldelim}
+                                	$("status").style.display="none";
+        				getrssfolders();
+        	               {rdelim}
+                	{rdelim}
+        	);
 	{rdelim}
 {rdelim}
 function getrssfolders()
 {ldelim}
-	var ajaxObj = new VtigerAjax(ajaxrssfolders);
-	var urlstring = 'module=Rss&action=RssAjax&vtigerfile=ListView&folders=true';
-	ajaxObj.process("index.php?",urlstring);
-{rdelim}
-function ajaxrssfolders(response)
-{ldelim}
-	hide('status')
-	document.getElementById("rssfolders").innerHTML=response.responseText;
+	new Ajax.Request(
+        	'index.php',
+                {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+                	method: 'post',
+                        postBody:'module=Rss&action=RssAjax&vtigerfile=ListView&folders=true',
+			onComplete: function(response) {ldelim}
+                        		$("status").style.display="none";
+					$("rssfolders").innerHTML=response.responseText;
+                               {rdelim}
+                        {rdelim}
+                );
 {rdelim}
 </script>



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 02:23:52 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 09:23:52 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6924 -
	/vtigercrm/trunk/Smarty/templates/RoleEditView.tpl
Message-ID: <20060607092352.C309B7E8599@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 03:23:49 2006
New Revision: 6924

Log:
ajax functionality has been modified

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 Wed Jun  7 03:23:49 2006
@@ -13,24 +13,27 @@
 <script language="javascript">
 function dup_validation()
 {ldelim}
-	//show("status");
-	var ajaxObj = new VtigerAjax(ajaxSaveResponse);
-	var rolename = document.getElementById('rolename').value;
+	var rolename = $('rolename').value;
 	var mode = getObj('mode').value;
 	var roleid = getObj('roleid').value;
 	if(mode == 'edit')
-		var urlstring ="module=Users&action=UsersAjax&file=SaveRole&ajax=true&dup_check=true&mode="+mode+"&roleName="+rolename+"&roleid="+roleid;
+		var urlstring ="&mode="+mode+"&roleName="+rolename+"&roleid="+roleid;
 	else
-		var urlstring ="module=Users&action=UsersAjax&file=SaveRole&ajax=true&dup_check=true&roleName="+rolename;
-
-	ajaxObj.process("index.php?",urlstring);
-{rdelim}
-function ajaxSaveResponse(response)
-{ldelim}
-	if(response.responseText == 'SUCESS')
-		document.newRoleForm.submit();
-	else
-		alert(response.responseText);
+		var urlstring ="&roleName="+rolename;
+	new Ajax.Request(
+                'index.php',
+                {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+                                method: 'post',
+                                postBody: 'module=Users&action=UsersAjax&file=SaveRole&ajax=true&dup_check=true'+urlstring,
+                                onComplete: function(response) {ldelim}
+					if(response.responseText == 'SUCESS')
+						document.newRoleForm.submit();
+					else
+						alert(response.responseText);
+                                {rdelim}
+                        {rdelim}
+                );
+
 {rdelim}
 function validate()
 {ldelim}



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 02:25:11 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 09:25:11 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6925 -
	/vtigercrm/trunk/Smarty/templates/Reports.tpl
Message-ID: <20060607092511.2FE7B7E8572@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 03:25:07 2006
New Revision: 6925

Log:
ajax functionality has been modified

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

Modified: vtigercrm/trunk/Smarty/templates/Reports.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Reports.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Reports.tpl Wed Jun  7 03:25:07 2006
@@ -109,27 +109,31 @@
 {*<!-- Contents -->*}
 {literal}
 <script>
-function ajaxDelFolderResp(response)
-{
-	var item = response.responseText;
-	getObj('customizedrep').innerHTML = item;
-	
-}
+
 function DeleteFolder(id)
 {
 	var title = 'folder'+id;
 	var fldr_name = getObj(title).innerHTML;
 	if(confirm("Are you sure you want to delete the folder  "+fldr_name +" ?"))
 	{
-		var ajaxObj = new VtigerAjax(ajaxDelFolderResp);
-		url ='action=ReportsAjax&mode=ajax&file=DeleteReportFolder&module=Reports&record='+id;
-		ajaxObj.process("index.php?",url);
+		new Ajax.Request(
+			'index.php',
+	                {queue: {position: 'end', scope: 'command'},
+        	                method: 'post',
+                	        postBody: 'action=ReportsAjax&mode=ajax&file=DeleteReportFolder&module=Reports&record='+id,
+                        	onComplete: function(response) {
+					var item = response.responseText;
+				        getObj('customizedrep').innerHTML = item;
+                        	}
+                	}
+        	);
 	}
 	else
 	{
 		return false;
 	}
 }
+
 function AddFolder()
 {
 	if(getObj('folder_name').value.replace(/^\s+/g, '').replace(/\s+$/g, '').length==0)
@@ -140,7 +144,6 @@
 	else
 	{
 		fninvsh('orgLay');
-		var ajaxObj = new VtigerAjax(ajaxDelFolderResp);
 		var foldername = getObj('folder_name').value;
 		var folderdesc = getObj('folder_desc').value;
 		getObj('folder_name').value = '';
@@ -150,15 +153,25 @@
 			var mode = getObj('fldrsave_mode').value;
 		if(mode == 'save')
 		{
-			url ='action=ReportsAjax&mode=ajax&file=SaveReportFolder&module=Reports&savemode=Save&foldername='+foldername+'&folderdesc='+folderdesc;
+			url ='&savemode=Save&foldername='+foldername+'&folderdesc='+folderdesc;
 		}
 		else
 		{
 			var folderid = getObj('folder_id').value;
-			url ='action=ReportsAjax&mode=ajax&file=SaveReportFolder&module=Reports&savemode=Edit&foldername='+foldername+'&folderdesc='+folderdesc+'&record='+folderid;
+			url ='&savemode=Edit&foldername='+foldername+'&folderdesc='+folderdesc+'&record='+folderid;
 		}
 		getObj('fldrsave_mode').value = 'save';
-		ajaxObj.process("index.php?",url);
+		new Ajax.Request(
+                        'index.php',
+                        {queue: {position: 'end', scope: 'command'},
+                                method: 'post',
+                                postBody: 'action=ReportsAjax&mode=ajax&file=SaveReportFolder&module=Reports'+url,
+                                onComplete: function(response) {
+                                        var item = response.responseText;
+                                        getObj('customizedrep').innerHTML = item;
+                                }
+                        }
+                );
 	}
 }
 function EditFolder(id,name,desc)
@@ -206,10 +219,18 @@
 	if(idstring != '')
 	{
 		if(confirm("Are you sure you want to delete the selected "+count+" reports ?"))
-        {
-			var ajaxObj = new VtigerAjax(ajaxDelFolderResp);
-			url ='action=ReportsAjax&mode=ajax&file=Delete&module=Reports&idlist='+idstring;
-			ajaxObj.process("index.php?",url);
+       		{
+			new Ajax.Request(
+                        'index.php',
+                        {queue: {position: 'end', scope: 'command'},
+                                method: 'post',
+                                postBody: 'action=ReportsAjax&mode=ajax&file=Delete&module=Reports&idlist='+idstring,
+                                onComplete: function(response) {
+                                        var item = response.responseText;
+                                        getObj('customizedrep').innerHTML = item;
+                                }
+                        }
+                );
 		}else
 		{
 			return false;
@@ -225,17 +246,20 @@
 {
 	if(confirm("Are you sure you want to delete this report ?"))
 	{
-		var ajaxObj = new VtigerAjax(ajaxDelReportResp);
-		url ='action=ReportsAjax&file=Delete&module=Reports&record='+id;
-		ajaxObj.process("index.php?",url);
+		new Ajax.Request(
+                        'index.php',
+                        {queue: {position: 'end', scope: 'command'},
+                                method: 'post',
+                                postBody: 'action=ReportsAjax&file=Delete&module=Reports&record='+id,
+                                onComplete: function(response) {
+					getObj('reportContents').innerHTML = response.responseText;
+                                }
+                        }
+                );
 	}else
 	{
 		return false;
 	}
-}
-function ajaxDelReportResp(response)
-{
-	getObj('reportContents').innerHTML = response.responseText;
 }
 function MoveReport(id,foldername)
 {
@@ -276,10 +300,17 @@
 	if(idstring != '')
 	{
 		if(confirm("Are you sure you want to move this report to "+foldername+" folder ?"))
-        {
-			var ajaxObj = new VtigerAjax(ajaxDelReportResp);
-			url ='action=ReportsAjax&file=ChangeFolder&module=Reports&folderid='+id+'&idlist='+idstring;
-			ajaxObj.process("index.php?",url);
+        	{
+			new Ajax.Request(
+                        'index.php',
+                        {queue: {position: 'end', scope: 'command'},
+                                method: 'post',
+                                postBody: 'action=ReportsAjax&file=ChangeFolder&module=Reports&folderid='+id+'&idlist='+idstring,
+                                onComplete: function(response) {
+                                	        getObj('reportContents').innerHTML = response.responseText;
+                	                }
+                        	}
+	                );
 		}else
 		{
 			return false;



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 02:25:46 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 09:25:46 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6926 -
	/vtigercrm/trunk/Smarty/templates/ReportRun.tpl
Message-ID: <20060607092546.B2B9B7E8599@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 03:25:43 2006
New Revision: 6926

Log:
ajax functionality has been modified

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 Wed Jun  7 03:25:43 2006
@@ -127,18 +127,21 @@
     Calendar.setup ({inputField : "jscal_field_date_end", ifFormat : "%Y-%m-%d", showsTime : false, button : "jscal_trigger_date_end", singleClick : true, step : 1});
 function generateReport(id)
 {
-	var ajaxObj = new VtigerAjax(ajaxgenReportResp);
 	var stdDateFilterFieldvalue = document.NewReport.stdDateFilterField.options  [document.NewReport.stdDateFilterField.selectedIndex].value;
 	var stdDateFiltervalue = document.NewReport.stdDateFilter.options[document.NewReport.stdDateFilter.selectedIndex].value;
 	var startdatevalue = document.NewReport.startdate.value;
 	var enddatevalue = document.NewReport.enddate.value;
-	url ='action=ReportsAjax&file=SaveAndRun&mode=ajax&module=Reports&record='+id+'&stdDateFilterField='+stdDateFilterFieldvalue+'&stdDateFilter='+stdDateFiltervalue+'&startdate='+startdatevalue+'&enddate='+enddatevalue;
-	ajaxObj.process("index.php?",url);
-}
-function ajaxgenReportResp(response)
-{
-	getObj('Generate').innerHTML = response.responseText;
-	setTimeout("ReportInfor()",1);
+	new Ajax.Request(
+                'index.php',
+                {queue: {position: 'end', scope: 'command'},
+                        method: 'post',
+                        postBody: 'action=ReportsAjax&file=SaveAndRun&mode=ajax&module=Reports&record='+id+'&stdDateFilterField='+stdDateFilterFieldvalue+'&stdDateFilter='+stdDateFiltervalue+'&startdate='+startdatevalue+'&enddate='+enddatevalue,
+                        onComplete: function(response) {
+				getObj('Generate').innerHTML = response.responseText;
+				setTimeout("ReportInfor()",1);
+                        }
+                }
+        );
 }
 function selectReport()
 {



From vtiger-tickets at vtiger.fosslabs.com  Wed Jun  7 02:40:58 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 07 Jun 2006 09:40:58 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231275=3A?=
	=?utf-8?q?_Move_Tickets_to_FAQ?=
Message-ID: <076.3172336494b1ae9199990df7c684d75e@vtiger.fosslabs.com>

#1275: Move Tickets to FAQ
-------------------------+--------------------------------------------------
 Reporter:  anonymous    |       Owner:  developer
     Type:  enhancement  |      Status:  new      
 Priority:  major        |   Milestone:           
Component:  vtigercrm    |     Version:  5.0.0    
 Keywords:               |  
-------------------------+--------------------------------------------------
 tickets might include attachments. When you move a ticket to FAQ these
 attachements get lost, since FAQ do not have attachments --> therefor
 attachements for FAQ are needed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1275>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 02:57:26 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 09:57:26 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6927 - in
 /vtigercrm/trunk/modules: Accounts/DetailView.php Activities/DetailView.php
 Campaigns/DetailView.php Contacts/DetailView.php Emails/DetailView.php
Message-ID: <20060607095726.ED6AA7E85AC@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 03:57:11 2006
New Revision: 6927

Log:
i18n updated - ahmed

Modified:
    vtigercrm/trunk/modules/Accounts/DetailView.php
    vtigercrm/trunk/modules/Activities/DetailView.php
    vtigercrm/trunk/modules/Campaigns/DetailView.php
    vtigercrm/trunk/modules/Contacts/DetailView.php
    vtigercrm/trunk/modules/Emails/DetailView.php

Modified: vtigercrm/trunk/modules/Accounts/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Accounts/DetailView.php (original)
+++ vtigercrm/trunk/modules/Accounts/DetailView.php Wed Jun  7 03:57:11 2006
@@ -29,7 +29,7 @@
 global $mod_strings;
 global $app_strings;
 global $app_list_strings;
-global $log;
+global $log, $currentModule;
 
 $focus = new Account();
 if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) {
@@ -108,6 +108,6 @@
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
 
-$smarty->assign("MODULE","Accounts");
+$smarty->assign("MODULE",$currentModule);
 $smarty->display("DetailView.tpl");
 ?>

Modified: vtigercrm/trunk/modules/Activities/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Activities/DetailView.php (original)
+++ vtigercrm/trunk/modules/Activities/DetailView.php Wed Jun  7 03:57:11 2006
@@ -28,7 +28,7 @@
 require_once('include/database/PearDatabase.php');
 require_once('include/utils/utils.php');
 require_once('include/utils/utils.php');
-global $mod_strings;
+global $mod_strings, $currentModule;
 if( $_SESSION['mail_send_error']!="")
 {
 	echo '<b><font color=red>'. $mod_strings{"LBL_NOTIFICATION_ERROR"}.'</font></b><br>';
@@ -148,7 +148,7 @@
  $smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']);
  $smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']);
 
-$smarty->assign("MODULE",$app_strings['Activities']);
+$smarty->assign("MODULE",$currentModule);
 $smarty->display("DetailView.tpl");
 
 ?>

Modified: vtigercrm/trunk/modules/Campaigns/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Campaigns/DetailView.php (original)
+++ vtigercrm/trunk/modules/Campaigns/DetailView.php Wed Jun  7 03:57:11 2006
@@ -68,7 +68,7 @@
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
 
-$smarty->assign("MODULE",$app_strings['Campaigns']);
+$smarty->assign("MODULE",$currentModule);
 $smarty->display("DetailView.tpl");
 $focus->id = $_REQUEST['record'];
 

Modified: vtigercrm/trunk/modules/Contacts/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/DetailView.php (original)
+++ vtigercrm/trunk/modules/Contacts/DetailView.php Wed Jun  7 03:57:11 2006
@@ -121,7 +121,7 @@
 $smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']);
 $smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']);
 
-$smarty->assign("MODULE",$app_strings['Contacts']);
+$smarty->assign("MODULE",$currentModule);
 $smarty->display("DetailView.tpl");
 ?>
 

Modified: vtigercrm/trunk/modules/Emails/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/DetailView.php (original)
+++ vtigercrm/trunk/modules/Emails/DetailView.php Wed Jun  7 03:57:11 2006
@@ -156,7 +156,7 @@
 $smarty->assign("CHECK", $check_button);
 	
 //Constructing the Related Lists from here
-$smarty->assign("MODULE",$app_strings['Emails']);
+$smarty->assign("MODULE",$currentModule);
 $smarty->assign("SENDER",$email_id);
 if($_REQUEST['mode'] != 'ajax')
 	$smarty->display("DetailView.tpl");



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 03:06:04 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 10:06:04 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6928 -
	/vtigercrm/trunk/modules/Leads/DetailView.php
Message-ID: <20060607100604.42FB97E85AE@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 04:06:00 2006
New Revision: 6928

Log:
i18n updated - ahmed

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 Jun  7 04:06:00 2006
@@ -122,7 +122,7 @@
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
 
-$smarty->assign("MODULE", $module);
+$smarty->assign("MODULE", $currentModule);
 $smarty->display("DetailView.tpl");
 
 ?>



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 03:20:30 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 10:20:30 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6929 -
	/vtigercrm/trunk/modules/Campaigns/ListView.php
Message-ID: <20060607102031.11D787E85AA@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 04:20:27 2006
New Revision: 6929

Log:
update listview

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 Jun  7 04:20:27 2006
@@ -108,7 +108,7 @@
 $smarty->assign("MOD", $mod_strings);
 $smarty->assign("APP", $app_strings);
 $smarty->assign("IMAGE_PATH",$image_path);
-$smarty->assign("MODULE",'Campaigns');
+$smarty->assign("MODULE",$currentModule);
 $smarty->assign("BUTTONS",$other_text);
 $smarty->assign("CATEGORY",$category);
 $smarty->assign("SINGLE_MOD",'Campaign');



From vtiger-tickets at vtiger.fosslabs.com  Wed Jun  7 03:50:46 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 07 Jun 2006 10:50:46 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231276=3A?=
 =?utf-8?q?_Language_file_issue_/include/language?=
Message-ID: <076.705db0ccf0fb3c7495be9bad38dc724d@vtiger.fosslabs.com>

#1276: Language file issue /include/language
-----------------------+----------------------------------------------------
 Reporter:  anonymous  |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  critical   |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 if you translate the terms 'Accounts' or 'Contacts' the "More Information"
 tab at the detail view at the contacs menu does not work anymore and
 reponses with Hacking attemd!

 //Added fields to display the related lists titles and None Scheduled
 'LBL_NONE_SCHEDULED'=>'None Scheduled',

 'Leads'=>'Leads',
 'Accounts'=>'Accounts',
 'Contacts'=>'Contacts',
 'Accounts & Contacts'=>'Organisationen & Personen',
 'Potentials'=>'Verkaufspotentiale',

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1276>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 04:24:16 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 11:24:16 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6930 -
	/vtigercrm/tags/vtigercrm-4.2.4/README.txt
Message-ID: <20060607112416.DCB4F7E85BA@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 05:24:11 2006
New Revision: 6930

Log:
Changes made for 4.2.4 release

Modified:
    vtigercrm/tags/vtigercrm-4.2.4/README.txt

Modified: vtigercrm/tags/vtigercrm-4.2.4/README.txt
==============================================================================
--- vtigercrm/tags/vtigercrm-4.2.4/README.txt (original)
+++ vtigercrm/tags/vtigercrm-4.2.4/README.txt Wed Jun  7 05:24:11 2006
@@ -1,35 +1,1432 @@
-vtigerCRM Readme
+####################################################
+vtiger CRM 4.2.4
+June 06, 2005
+####################################################
+
+After much delay vtigercrm 4.2.4 has been released.
+
+This is the first community driven release, so a big thanks goes out to all the people involved in making this happen.
+
+This is mostly a bug fix release, but it does mark the first release using the new SVN/Trac system which helps us harness the power of the community contributions and track issues and their fixes so everyone can help out.  The Trac system can be seen here: http://vtiger.fosslabs.com
+
+A list of fixed bugs can be seen using the trac ticket system here:
+http://vtiger.fosslabs.com/cgi-bin/trac.cgi/query?status=closed&milestone=4.2.4&order=priority
+
+A full changelog can be seen trough the trac svn log here:
+http://vtiger.fosslabs.com/cgi-bin/trac.cgi/log/vtigercrm/tags/vtigercrm-4.2.4?action=stop_on_copy&rev=6885&stop_rev=&mode=follow_copy&verbose=on
+
+vtigercrm 4.2.4 can be downloaded here:
+<download links>
+
+INSTALLATION PROCEDURE:
+
+For a new installation simply extract the files into a directory accessible through your apache setup then point your web browser to that directory on your website and follow the installation instructions.  Software you'll require is apache (1.3.x or 2.x) with php (4.3+, no 5.x support yet) and mysql (4.x).
+
+You can post any issues or suggestions at http://vtiger.fosslabs.com/cgi-bin/trac.cgi/newticket 
+
+
+UPGRADING:
+
+If you are upgrading from a previous version of vtigercrm first backup all data then follow the instructions for the appropriate version below:
+
+4.2.3:
+	- No database changes are need if you are using a successfull installation.
+		- If tables were only partially created for you using an earlier version please wipe your database and try with 4.2.4, your problems should be solved.
+	- To save your current configuration copy the config.php file from your old installation to config.inc.php in the new installation.  You'll also have to edit the config file as follows:
+		- change the following variable names in config.php
+
+		from:
+			$dbconfig['db_host_name'] =
+			$dbconfig['db_user_name'] =
+
+		to:
+			$dbconfig['db_hostname'] =
+			$dbconfig['db_username'] =
+
+	- If your 4.2.3 installation has previously been upgraded from an earlier release there is one database modification missed in pervious upgrades you will want to make manually:
+		alter table wordtemplates drop primary key;
+		alter table wordtemplates change filename filename varchar(100) not null;
+		alter table wordtemplates add column templateid integer(19) primary key;
+
+
+4.2.2 (aka 4.2 patch2):
+	- Apply the 4.2.3 patch as per: http://forums.vtiger.com/viewtopic.php?t=4166
+	- Then follow the instructions for a 4.2.3 upgrade.
+
+
+4.2.1 or 4.2:
+	- Apply the 4.2.2 patch as per: http://forums.vtiger.com/viewtopic.php?t=2903
+	- Then follow the instructions for a 4.2.2 upgrade.
+
+####################################################
+vtiger CRM 4.2.3
+Dec 23, 2005
+####################################################
+We are pleased to announce the vtigerCRM 4.2.3 release. This release is a consolidated with earlier patches (1 & 2 - refer below section for the list of fixes) and Multiple vulnerablity fixes. 
+
+Note: First Time vtiger CRM users can directly install the source in their
+vtiger suported version of LAMP / WAMP. 
+
+**************************************************************************************************************
+*   IMPORTANT NOTICE                                                                                         *
+**************************************************************************************************************
+* The vtigerCRM 4.2.3 is ONLY for the first time vtiger users and not for                                    *
+* the existing users. The existing v4.2 users are recomended to upgrade their system by applying v4.2 patch  *
+* 2 and vulnerability fixes patch. You can download the patches from the                                     *
+* following urls.                                                                                            *
+* http://forums.vtiger.com/viewtopic.php?t=2903								     *
+* http://forums.vtiger.com/viewtopic.php?t=4166                                                              *
+**************************************************************************************************************
+
+Software requirements : PHP 4.3.x, MySQL 4.0.x (4.0.20 prefered), Apache 1.3.x
+or 2.0.x 
+
+For more details refer to http://www.vtiger.com/wiki/index.php/Vtiger_CRM_4.2.3_-_Installation_Guide
+
+
+***********************
+I. Vulnerability fixes
+***********************
+
+Posted by D.Fabian / SEC-CONSULT/ ww.sec-consult.com
+
+a) Multiple SQL Injection Vulnerabilities
+b) Cross Site Scripting
+c) Path Traversal/File Disclosure
+d) Arbitrary File Upload
+e) Remote Code Execution
+
+Posted by Christopher Kunz / www.hardened-php.net
+
+a) Arbitrary File Upload
+b) Authentication ByPass
+c) Unsafe File Inclusion
+d) Arbitrary code execution
+
+
+####################################################
+vtiger CRM 4.2 Patch 2
+Sep 15, 2005
+####################################################
+
+We are pleased to announce the consolidated patch for vtiger CRM 4.2. This release includes many code contributions from vtiger community and bug fixes!
+
+******************************************
+I. Code Contributions by vtiger Community
+******************************************
+
+Thanks to Bela, Fredy, JLee, MikeCrowe, and Sholmi for their valuable contributions to the vtiger CRM development. 
+
+Following contributions were made at vtiger Discussions under "vtiger CRM - Code Contributions" forum:
+
+1. T2025  - 2 bugs - JLee (Same as P8180 in vtiger Discussions " Little typo in function get_lead_feild_options")
+
+2. T2324  - Modification to the Aqua theme - Bela (Note: We have included the fix for all the themes except blue theme)  
+
+3. T2406  - Description spanned over all columns - Fredy
+
+4. T2431  - Search by TicketId field in HelpDesk - Fredy
+
+5. T2524  - Scrollable related lists - Fredy
+
+6. P9578  - Import/Export Products - JLee
+
+7. T2196  - Fix for World Clock Bug - JLee
+
+8. T2139  - Bug in: EditView.html - Shlomi
+ 
+9. T2000  - Add "Assigned To" as a choice when Importing - MikeCrowe
+
+10. T1585 - Improved Calendar - Fredy
+  
+****************
+II. New Features
+****************
+
+1. Import/Export Products
+
+2. Scrollable List View for related Lists
+
+***************
+III. Bug Fixes
+***************
+
+--------------------------
+A. http://bugs.vtiger.com
+--------------------------
+
+-------------------------------------
+S.No ID    Subject
+-------------------------------------
+1.   67  - Inventory Mgmt Related List
+
+2.   70  - Activities - Quick Create
+
+3.   81  - Price Book - Select Product list price
+
+4.   82  - Inventory Mgmt Related List Issue
+
+5.   96  - Alignment is not proper for Total and sub total
+
+6.  108  - Without entering any value in global search if we click on search then the n an empty page is displayed
+
+7.  113  - Security UI not good enough
+
+8.  114  - Better icons for the inv mgmt modules
+
+9.  428 - User Signature Issue
+
+10. 125  - UI for New Product creation not proper
+
+11. 129  - Advanced search requires some fields (SF.Net ID: 
+
+12. 131  - Sorting Name in Leads
+
+13. 143  - Product related list in Activity can be removed
+
+14. 149  - New Ticket Creation - Group empty
+
+15. 160  - Modified time and created time are 0 in Add Business Card
+
+16.  406 - Clock is dislocated after delete a record
+
+17.  407 - HelpDesk quick create- title not saved
+
+18.  408 - Activities CustomView contact not displayed
+
+19. 409 - After mass delete FAQ control goes to HelpDesk
+
+20. 410 - Footer alignment changed
+
+21. 411 - New Event Creation
+
+22. 405 - FAQ quick create
+
+23. 412 - Security - Activity delete
+
+24. 413 - Security - Default Organization for Activities
+
+25. 414 - Field positioning Sales/Support Start dates
+
+26. 415 - Inventory Related List
+
+27. 416 - Inventory RL
+
+28. 417 - Inventory RL - Activity History missing
+
+29. 418 - Ticket - Create
+
+30. 419 - Email - Edit View
+
+31. 420 - Availability of user
+
+32. 421 - Adding Products to Price book Validations
+
+33. 422 - New Activity Creation - Group empty
+
+34. 424 - History in Potential, PO, SO and Invoice
+
+35. 425 - After delete tickets it displays empty list
+
+36. 426 - Invoice Display in Home Page
+
+37.  86 - File Size validation for the product image
+
+38.  78 - Adding pricebook to products
+
+39.  81 - IE 6 Pricebook Validations
+ 
+-----------------------------------
+B. vtiger Discussions - Bug Tracker
+-----------------------------------
+
+-------------------------------------
+S.No ID        Subject
+-------------------------------------
+
+40.  T1707   - Customer Portal language bug
+
+41.  T2080   - Email doesn't work
+
+42.  P8047   - Change Status Not Updating Modify Date
+
+43.  P8004   - BUG modules/HelpDesk/Save.php
+
+44.  P8301   - Additional Info to Helpdesk-Issue
+
+45.  P8449   - Calendar icon missing at HelpDesk
+
+46.  P8306   - Missing values in Cumulative Statistics
+
+47.  T1802   - Still not possible to delete a contact - account relation
+
+48.  T1398   - Issues in Contacts 
+
+49.  T1694   - Email Editor Add Link doesn't work
+
+50.  T1742   - Bug when assigning product from 2nd page to potential
+
+51.  T2025   - 2 bugs
+
+52.  T2313   - New Task Bug
+
+53.  P8170   - Quotes popup trouble
+
+54.  P8098   - Vendor pick list not working in Purchase order
+
+55.  T1862   - Customize Quote Template
+
+56.  P8159   - New Calendar Bug
+
+57.  T2038   - Please fix these Bugs in 4.2
+
+58.  T1696   - Accounts Website url fix
+
+59.  T2003   - Pricebook bug 
+
+60.  P8293   - Double entries in 'Default Organization Sharing Access'
+
+61.  T2512   - Home upcoming activities
+
+62.  P8030   - Meetings not held must not be shown in upcoming activities
+
+
+####################################################
+
+vtiger CRM 4.2 Patch 1
+Aug 10, 2005
+
+####################################################
+
+New Feature:
+
+Reports can be exported in Excel Format.
+
+Bug Fixes:
+
+1. Forum Post ID 6550: Can not add new product
+
+2. SF ID1159916: settings-Company details 
+
+3. SF ID1160084: Task - End Date 
+
+4. SF ID1161317: date accept 0 value 
+
+5. SF ID1161326: Lead Conversion 
+
+6. Forum Topic ID 2038: Please fix these Bugs in 4.2
+
+7. Internal: Make QuickActivityRegister have enddate(duedate)
+
+8. Forum Topic ID 1696: Calendar bug fix for non-admin user
+
+9. Forum Topic ID 1648: Converting a lead 
+
+10. SF ID 1161344: probability is not validate if we give greater value 
+
+11. Forum Topic ID 2223: Editing Company information
+
+12. Interna: Calendar in Quick create in events
+
+13. Forum Topic ID 1803: chips impossible to add more activity (task/event)
+
+14. Forum Post ID 6733: Missing required field in New Event shortcut
+
+15. Internal: Lead Conversion form validation
+
+16. Forum Topic ID 2038:Please fix these Bugs in 4.2
+
+17. SF ID 1161223: Export to PDF
+
+18. Forum Topic ID 1693:Bad PDF output
+
+19. Forum Topic ID 2012:Report Customization iNot working in IE
+
+20. Forum Topic ID 1823: Translation Issue 2
+
+21. Forum Topic ID 2038: Please fix these Bugs in 4.2
+
+22. Internal: Invoice Qty & inventory issues in 4.2 GA
+
+23. Forum Topic ID 1717: bug report in new sales order and PDF invoice on
+online demo
+
+24. Internal: Inventory Mgmt
+
+25. Internal: Detail View Ui for Products Relateion in inventory is imporper 
+
+26. Internal: SO - Popup Account - table issue 
+
+27. Internal: Notes - Cancel/ back 
+
+28. Internal: No of Employees Field not validated 
+
+29. Internal: Filling with Todays date 
+
+30. Internal: Security - Default Organization for Activities 
+
+31. Internal: Security - Activity delete 
+
+32. Internal: Inventory Mgmt Logging 
+
+33. Internal: URL and URL name 
+
+34. Internal: Feild level access for task
+
+35. Forum Topic ID 1823: Custom Date field not working?
+
+36. Internal: Support for Text Area Custom Field
+
+37. Forum Topic ID 1643: Any user can change onw role for admin role? 
+
+38. Internal: Class not set in inventory product UI
+
+39. Forum Topic ID 2258: Nasty security bug in latest 4.2!
+
+40. Code Contribution: Indexing code by Microwe integrated
+
+41. Internal: Title doesn't show up
+
+42. Forum Topic ID 1997: Fixing bugs.
+
+43. Forum Topic ID 822:Translation-Issue
+
+44. Forum Topic ID 1768: Contact address pulled from Acccount
+
+45. Forum Topic ID 1753: VtigerCRM 4.0 Character causing troubles
+
+46. 1161351: Inventory Mgmt Related List 
+
+47. 1161347: Inventory Related List 
+
+48. 1161415:Contacts - Related Lists - Deleting Products
+
+49. 1161406: Assigned ToUser in Leads can be Assigned to User
+
+50. Forum Topic ID 2092: Product Popup in New Quotes
+
+51. Forum Topic ID 1980: Account Pop Http 404 when pickup a account in New
+Sales Order
+
+52. Forum Topic ID 2003: Pricebook bug
+
+53. 1161337: Price Book Product Select
+
+54. Forum Topic ID 2088: Address Information Won't Export
+
+55. Forum Topic ID 1582: Importing Checkbox Values when importing leads
+
+56. 1161356:Email - quick create date and time sent date not validated
+
+57. 1160290: Potentials incorrectly pulls up deleted notes in related
+
+58. Internal: Form Validation for Add Business Card
+
+59. Internal: Single, double quotes problem in ticket comments and FAQ
+comments
+
+60. Forum Topic ID 1612: Misbehaviour on validation of number fields
+
+
+#######################
+
+vtiger CRM 4.2 GA
+July 18, 2005
+
+#######################
+
+We are pleased to announce the latest version of vtiger CRM. This release includes many new features and few bug fixes!
+
+*****************
+A. New Features
+*****************
+
+  * Activity Management
+
+  * Manage recurring events (daily/weekly/monthly/yearly)
+
+  * Group/Shared calendar to plan meetings with vtiger CRM users without time conflicts
+
+  * UI enhancements related to overdue tasks in Activities list view 
+
+2. Lead Management
+
+ * Capture leads directly from your Web site to vtiger CRM
+
+ * Customize Online Lead Form as per your Web site requirements
+
+ * Create mailing lists and execute E-mail marketing campaigns
+
+ * Add multiple products to the leads
+
+ * Customize list of the leads as per users' requirements
+
+ * Create fully customizable lead reports
+
+ * Lead conversion mapping for all the custom fields
+
+3. Account & Contact Management
+
+ * Generate quotes, sales orders, and invoices directly from the accounts and contacts 
+
+ * Track history of all the products purchased by customers
+
+4. Products Management
+
+ * Create Price Books and associate products with Price Books
+
+ * Procure products from the selected Vendors list
+
+ * Associate Trouble Tickets and Knowledge Base articles with products
+
+ * Ability to upload product images for easy identification
+
+5. Sales Quotes
+
+ * Track outstanding quotes from the quotes list view
+
+ * Add Line Items to the quotes and update sub-total, taxes, adjustments, and grand total amounts
+
+ * Select different prices for the same product as per customer segment
+
+ * Create printer-friendly Sales Quotes and deliver to the prospect customers through in-built E-mail service
+
+ * Create Sales Order or Invoice with a single click from the Sales Quote
+
+ * Avoid duplicate work by dynamically displaying the Billing and Shipping addresses of the prospect
+
+ * Display quotes related to accounts under the related list
+
+ * Customize Sales Quote fields as per your organization requirements
+
+ * Set up your company information to display your company address while creating PDF documents
+
+6. Order Management
+
+ * Streamline organization-wide procurement and fulfillment processes by integrated Order Management with CRM
+
+ * Track outstanding orders from the Orders List View
+
+ *  Procure products from the available Vendors/Manufacturers/Resellers list in vtiger CRM
+
+ * Manage up-to-date stock position by seamless integration between order fulfillment and available stock in your warehouse
+
+ * Customize Purchase Order (PO) and Sales Order (SO) fields as per your organization requirements
+
+ * Avoid duplicate work by dynamically displaying the Billing and Shipping addresses of the prospect while creating orders
+
+ * Add Line Items to the Orders and update sub-total, taxes, adjustments, and grand total amounts automatically
+
+ * Create printer-friendly Order (PO/SO) and deliver to the Vendors/Customers through in-built E-mail service
+
+ * Once the Sales Order is confirmed create Invoice from Sales Order with a single click
+
+ * Periodically notify the stock position to the concerned parties in your organization so that stock is always available to fulfill the outstanding orders
+
+7. Invoices
+
+ * Track outstanding invoices from the Invoices list view
+
+ * Create printer-friendly Invoices and deliver to the customers through in-built E-mail service
+
+ * Customize Invoice fields as per your organization requirements
+
+ * Add Line Items to the Invoice and update sub-total, taxes, adjustments, and grand total amounts automatically
+
+ * Customize Invoice fields as per your organization requirements
+
+ * Avoid duplicate work by dynamically displaying the Billing and Shipping addresses of the customer while creating invoices
+
+ * Associate invoices with the General Ledger account for hassle free book keeping 
+
+
+8. Help Desk
+
+ * Manage product-wise Knowledge Base articles/FAQ
+
+ * Associate Articles with trouble tickets and products
+
+ * Provide public access to the Knowledge Base only after approval
+
+ * Update Articles/FAQ in vtiger CRM as based customer suggestions & comments
+
+9. E-mail Integration
+
+ * Configure incoming E-mail servers on per user basis. Each user can retrieve his own E-mails 
+
+ * Fetch E-mail messages through POP and IMAP services
+
+ * Setup multiple incoming E-mail servers 
+
+ * Seamless integration between incoming E-mail messages and the corresponding contacts in vtiger CRM with a single click
+
+ * Fetch incoming E-mail messages as RSS feed in RSS module
+
+ * Send E-mail notification to the users when records are assigned to them or there is a deadline coming up
+
+ * Ready-to use E-mail templates
+
+ * Populate vtiger CRM user related fields in E-mail templates
+
+ * Export E-mail messages into CSV file
+
+ * Fetch inbound E-mails and associate to the contacts or create E-mails directly into vtiger CRM
+
+ * Send mass E-mails to the contacts and other users
+
+10. Other Features
+
+ * Lead conversion feature within module access scope
+
+ * Generate quotes and sales orders, from the potentials
+
+*****************
+B. Bug Fixes
+*****************
+
+1. FORUM:1545 - Quotes, orders - working or not ? 
+
+2. FORUM:1560 - Can not change user password & problem with ordering system
+
+3. FORUM:5512 - In custom fields calendar, when a calendar field in created, the calendar drop down does not appear
+
+4. FORUM:5553 - Contact with apostrophe ' in name cannot own a ticket
+
+5. FORUM:5795 - If you change the name of admin passwords are lost !!!
+
+6. FORUM:5810 - In contacts module Brithdate shown as 0000-00-00
+
+7. FORUM:4501 - Error message while associating user to a group
+
+8. FORUM:4550 - Issue related to custom drop-down list order
+
+9. FORUM:4039- Issue with duplicating a contact
+
+10. FORUM:4073 - Normal user with no access to the settings is anyway able to change the profile of a role.
+
+11. FORUM:1409 - Report Export to PDF
+
+12. FORUM:1818 - Outlook Sync applies makes Calendar appointments 2020
+
+13. FORUM:606 File Missing: testemailtemplateusage.php 
+
+14. FORUM:1294 - Problem with e-mail templates
+
+15. FORUM:1050 - Subject of emails not imported - Need confirmation
+
+16. FORUM:1276 - Converting Leads and assigning to user
+
+17. FORUM:1270 - Bug in e-mail module
+
+18. ORUM:1742 - Bug when assigning product from 2nd page to potential
+
+19. FORUM:1772 - Bug: wrong date format when converting leads
+
+20. FORUM:1559 - Tasks not working in Leads
+
+21. FORUM: 5247 - Account search doesn't work
+
+22. FORUM:5096 - Phone search
+
+23. FORUM:5715 - Currency Support
+
+24. FORUM:5795 - Roles and Passwords
+
+
+25. SF1102842 - CSV import, problem with ?,?,?
+
+26. SF1097215 - Mass Delete in Accounts, Contacts and Opportunities
+
+27. SF1025603 - Phone in Task
+
+28. SF1093989 - picklists - I18N
+
+29. SF1090963 - wrong header caption in activities, history
+
+30. SF1090711 - Duplicate entries in language translation
+
+31. SF1095038 - Import Leads - No Mapping Fields
+
+32. SF1093132 - Lead Import Fails - v3.2
+
+33. SF1094944 - The leads dropdown list does not update
+
+34. SF1090715 - Error on importing contacts from cvs file
+
+35. SF1073179 - Importing .xls files but missing one of the column header
+
+36. SF1073159 - Importing Problem
+
+37. SF1087482 - user not deleted
+
+38. SF1094950 - New E-mail - Error Message
+
+39. SF1090721 - Meeting Contact - Unable to remove
+
+40. SF 1090717 - New Note: Field Name missing
+
+41. SF 1230595 - Custom Calendar in Tickets not working
+
+42. SF 1221170 - Sort Notes 
+
+43. SF 1221036 - Orders 
+
+44. SF 1214401 - Contact birthday translation 
+
+45. SF 1214396 - Task start date and Calendar date scrambled 
+
+46. SF 1218633 - Phone Search not working 
+
+47. SF 1231325 - Error with open tickets link on home page
+
+48. Create users without associating to any of the groups
+
+49. Non-editable user name
+
+50. Mandatory fields checks while configuring currency fields
+
+51. Mandatory fields checks while configuring database backup server
+
+52. The currency symbol which is set in Currency configuration, it is not reflected in dashboard graphs.
+
+53. Field accessibility support not provided for Potential fields
+
+
+*****************
+C. Known Issues
+*****************
+
+1. FORUM:1816 - Outlook Plugin error in Outlook
+
+2. FORUM:1818 - Outlook Sync applies makes Calendar appointments 2020
+
+3. FORUM:1293 - Leads have disappeared - We turned off Leads for all users in the Sales profile. Now we have turned them back on in Settings and they still don't appear. When have restarted the server to completely restart all services just in case but that didn't fix it. Any ideas?
+
+4. FORUM:1752 - Bug: Decimals lost in custom currency fields in products
+
+5. FORUM:1831- Import Error CSV Leads (File size more than 2MB cannot be imported)
+
+6. PDF report overlaps if the number of columns are more than the paper size and last few columns are hidden
+
+7. While creating a new event from Ticket related list, ticket name is not displayed under Activity page
+
+8. In Products related Price Book if edit link will point to Price Book edit view instead of Edit product list price
+
+9. If an event is assigned to Group then in the users list the group members name is displayed
+
+10. If an event is assigned to a team, if the team name is empty then also the event is being saved
+
+11. In Lead Conversion, the type of custom field is not taken into consideration
+
+12. If any of the events associated with recurring event is closed, all the related recurring events are also closed 
+
+13. In Reports, The Date fields in "Filter Options" will not be retained after clicking the 'Apply Filter' button
+
+14. When a New Sales Order, Purchase Order, Invoice and Quotes are created from a Product Detail View, Account Name and Potential Name will not be populated.
+
+15. In a Product Detail View if 'Add to Price Book' hyperlink is clicked and if no Price Book is present in the list, and if 'Add to Product' is selected, vtiger Home page will be displayed. 
+
+16. While generating reports the fields selected in 'Columns to Total' will not be displayed.
+
+***************
+D. Limitations
+***************
+
+1. Security is not implemented for Reports and Dashboards.
+
+2. GIF images are not supported while generating PDF documents such as Quotes,Orders and Invoice.
+
+
+NOTE: For more details about vtiger CRM 4.2 Release Notes, Please refer to the following URL:
+
+http://www.vtiger.com/wiki/index.php/Vtiger_CRM_4_2_Release_Notes
+ 
+#######################
+
+vtiger CRM 4.2 Alpha
+May 31, 2005
+
+#######################
+
+We are pleased to announce the latest version of vtiger CRM. This release includes many new features and few bug fixes!
+
+******************************************************************************************
+Note: vtiger CRM 4.2 Alpha is only for testing and can not be used for production purpose.
+
+Please post Bugs at the following URL:
+
+vtiger Discussions: http://www.vtiger.com/discussions/viewforum.php?f=12
+
+******************************************************************************************
+
+New Features
+
+1. Quotes module
+2. Order Management module (Purchase Orders & Sales Orders)
+3. Invoices module
+4. Price Books 
+5. Vendor/Suppliers Management
+6. Customizable Reports
+7. Customizable List Views
+8. Customer Self-service Portal
+9. RSS module
+10. Event Reminders
+11. Configurable Email Notifications
+12. Incoming Email Support
+
+--------------------
+vtiger CRM 4.0.1
+April 29, 2005
+
+We are pleased to announce the latest version of vtiger CRM. This release
+includes some of the new features and numerous bug fixes!
+
+-------------
+New Features
+-------------
+
+1) Default Organisation Fields - Fields that are not needed can be made hidden across the organisation. 
+2) Multiple Date format support.
+3) Currency Support.
+4) Customer Portal Beta Release - as an add on.
+
+----------
+Bug Fixes
+----------
+
+1) When time like '1:00' is given as input in new event, instead of '01:00',
+an expection will be thrown in the calendar
+2) Php warning fixes - contributed by joduba.
+3) 'Sales Stage' column empty in Potentials table for Contacts and Accounts
+Detail view.
+4) Calendar icons not working in homepage in my pipline chart.
+5) Delete confirmation for notes and attachments in all modules Related list.
+6) Select Contact from Popup after navigation throws exception.
+7) Duplicate entry in Notes listview, when created from Ticket Module.
+8 Added 'Contact' in HelpDesk List View.
+9) Issue in Description Update across modules when saved during edition.
+10) Problem in Notes Update, when no attachment is given.
+11) When a Custom field contains space, export query fails.
+12) Intialising 'log_sql' variable in config.php - php warning fix
+13) Show tickets in Detailview / Related listof contacts.
+14) In Help Desk search 'Status' & 'Priority' given as combo.
+15) Note Title should not be unique.
+16) Problem in importing more than 1000 records.
+17) In Email template big text is not supported
+18 Paragraph support in email template
+19) Amount size entry should be increased in Potentials (increase the digits)
+20) Duplicate Email template entry when editing a template.
+21) Notes and Attachment title/description display in related list
+22) When selected a username in the popup window after search from
+Activity/Email Detail View an exception is thrown.
+23) After email export, the body field in document is empty.
+24) Problem in HelpDesk Search based on Created Date.
+25) When assigned, Contact Salutation type in email template, and used in
+select email template, salutation type is empty.
+26) Sorted by 'Contact' in Ticket List View.
+27) Title field not validated when creating a new ticket
+28) My Account' link in login page throws exception
+29) Usename/creator will shown in all events in Calendar
+30) In Account Advance Search 'State' field empty after giving a value to
+search.
+31) In Home Page my groups all the group entities are displayed
+32) In Home Page My Activities, the Activity Link is not working.
+33) The Group Name link is the User Detail View not working.
+34) Email fiele length in accounts table modified from 30 to 100
+35) Check Box custom field Search not working
+36) Product search fields are interchaged between Basic and Advanced.
+commision rate & Qty/Unit -- Moved from Basic to Advanced. Manufacturer &
+category -- Moved from Advanced to Basic
+37) Improper Link issue in Popup after search.
+38) In Home Page My Tickets - Related to Contacts link are not working.
+39) Unwanted includes in Calendar Removed
+40) Sorting of Potentials in Home Page(Amount in Descending order)
+41) Login History - improper login/logout time
+42) Email Form Validation
+43) Pipleline total not getting updated.
+44) In Email List View displaying of Contact Issue.
+45) Enabling Status for Call and Meetings.
+46) Removing Notes, Products from Default Organisation Sharing.
+47) Populating modified time during entity creation.
+48) Edit and Duplicate of Attachments not working.
+49) Displaying of Closed Ticket in Home Page.
+50) Deleted entities are getting listed in Tracker.
+51) Enabling History tabs in Leads, Contacts, Accounts and Potentials for
+Activity History.
+
+
+--------------------
+vtiger CRM 4
+March 29, 2005
+
+We are pleased to announce the latest version of vtiger CRM. This release includes several new features and numerous bug fixes!
+
+-------------
+New Features
+-------------
+
+A. General
+
+1. Database layer is redesigned for a better data integrity
+
+2. Multiple database support for MySQL, Oracle, MSSQL, and Postgres through ADOdb (We have tested in MySQL and Oracle only)   
+3. Microsoft Office Plug-in to create mail merge templates in Microsoft Word and create on-the-fly documents with customer specific data in vtiger CRM
+
+4. Mozilla Thunderbird Plug-in to add E-mail messages and addresses from Thunderbird to vtiger CRM
+
+5. E-mail notifications to vtiger CRM users as well as customers instantly as well as periodically
+
+6. Search enabled for all the fields (including custom fields) in various modules
+
+7. Database migration from version 3.2 to version 4
+
+8. Accessories, such as World Clock and Calculator
+
+B. Lead Management
+
+1. Filter leads list in Leads home page based on lead status
+
+2. Change leads owner in bulk
+
+3. Export Leads into Spreadsheet programs
+
+C. Account Management
+
+1. Filter accounts list in Accounts home page based on type of the account
+
+2. Delete accounts in bulk
+
+3. Change accounts owner in bulk
+
+D. Contact Management
+
+1. Delete contacts in bulk
+
+2. Change contacts owner in bulk
+
+3. Create mail merge documents for contacts   
+
+E. Opportunity Management
+
+1. Notification of Big deals to the specific users/non users
+
+2. Filter opportunities list in Opportunities home page based on the sales stage
+
+3. Delete opportunities in bulk
+
+F. Help desk
+
+1. Automatically generate ticket ID while creating trouble tickets
+
+2. Filter trouble tickets list in Help desk home page based on the priority of the ticket
+
+3. Add/Modify custom fields in Help desk
+
+G. Products
+
+1. Enhanced the standard fields based on users feedback
+
+2. Add/Modify custom fields in Products
+
+H. Activity Management
+
+1. All the activities (Tasks, Calls, and Meetings) can be managed in a Activities module 
+
+2. Calendar user interface is enhanced, with a small calendar in Home page
+
+3. Synchronize calendar records with Microsoft Outlook  
+
+I. Studio:
+
+1. Add custom fields in Helpdesk and Products modules
+
+2. Modify the custom pick list values in all the modules
+
+3. Custom objects for URL and boolean types
+
+4. Enhanced user interface for product customization 
+	
+J. Communication Templates:
+
+1. Mail Merge Templates to create on-the-fly Microsoft Word documents based on customer data
+
+2. Canned E-mail Notifications through Linux Cron Job/Window Scheduler:
+
+K. Security Management
+
+1. Manage Profiles and associate to the roles
+
+2. Module level access control list for profiles
+
+3. Field level access control list for profiles
+
+4. Organization level record sharing model
+
+5. User management from Settings module
+
+L. System Administration
+
+1. Outgoing Email server configuration
+
+2. Database backup server configuration
+
+We have also provided the following features requested in Sourceforge.net and vtiger Discussions:
+
+SourceForge
+
+1. 1157343: Custom fields for tickets
+
+2. 1108850:  Mozilla Thunderbird (Non-MS Outlook) Plugin
+
+3. 1069886: PostgreSQL Support
+
+4. 1050500: HelpDesk or Trouble ticketing
+
+
+vtiger Discussions
+
+1. RC1 - Leads : Sorting Lead List - by eberled
+
+2. Database management (database backup) - by eberled and ITPM
+
+3. Enable/Disable Import/Export features according to the user's profile - by bwoo and fredy
+
+4. Small Calendar in Home page
+
+5. Department instead of Account in Contact list - by joduba
+
+6. Delete contacts in bulk - by david and Bez
+
+7. Delete users - by Jim
+
+8. ACL on data - Stefano
+
+9. Groups and user level security - by Jay McDonald
+
 ----------------
-
-After several months of working on our CRM solution, based on Apache, MySQL
-and other open source components, we came across a SourceForge open source
-project initiated by SugarCRM, having the same vision, and doing something
-very similar to what we were doing. They started out with the same promise
-we did, namely that CRM software is needlessly expensive, and hosted offerings
-only pretend to be affordable. While we were getting ready with our offering,
-the open source project had already launched it; the underlying infrastructure
-of Apache and MySQL was similar to what we were doing, and most importantly,
-the SugarCRM Public License allowed us to create distributions based on this
-code (SPL - a copy of Version 1.1.2 is found here, and the URL is at
-http://www.sugarcrm.com/home/content/view/35/86/) we decided it would be even
-faster to adopt that as our core and add value on top, an example of open
-source based collaboration.
-
-We gratefully acknowledge the contribution made by SugarCRM, and we intend to
-actively participate and lead in bringing this vision of affordable enterprise
-applications, but we make it clear that vtiger is not affiliated with nor is
-endorsed by SugarCRM.
-
-Please feel free to send your valuable comments to contact at vtiger.com so that
-we can have a better CRM product at free of cost. Check out our website at
-http://www.vtiger.com for support forums, detailed product information,
-our future plan and much more.
-
-software requirements
+Important Notes
+----------------
+
+* We have tested vtiger CRM 4 in MySQL and Oracle database software. Though we didn't tested in other database software, we feel it should work.
+
+* Cases Module is phased out (Help desk module take care of all the customer support related features)
+
+* Opportunities module is renamed as Potentials
+
+* Tasks, Calls and, Meetings modules are phased out (Activities module take care of all the tasks and events related features)
+----------
+Bug Fixes
+----------
+
+We have fixed the following issues reported in Sourceforge.net and vtiger Discussions:
+
+SourceForge.net
+----------------
+
+1. 1087474: suggestion
+
+2. 1169597: Tab Order in data entry is inconvenient
+
+3. 1158945: Cancel button behavior 2
+
+4. 1158943: Cancel button behavior
+
+5. 1161346: RC1 - Custom field Date not working
+
+6. 1157577: Account View -- Contact Name
+
+7. 1158932: RC1- Need "Select Product" on Potentials
+
+8. 1158934: RC1 - Need select multiple products on Activities
+
+9. 1158934:  RC1 - Need select multiple products on Activities - Richie Please check it is promised in sf.net
+
+10. 1160628: Deleted tickets are still visible in the account overview
+
+11. 1160522: minor issues in RC 1
+
+12. 1157581: BusinessCard.php
+
+13. 1158473: double $contact_id definition in modules/Calendar/UserCalend
+
+14. 1157587: website character needs to be longer
+
+15. 1157583: redirection limit for url exceeded
+16. 1156560: Single quotation mark not handled when creating new note
+
+17. 1069310: Time out during contact import
+
+18. 1156463: Outlook Plug-in Error: wrong encryption string
+
+19. 1111432: Meetings get duplicated views after editing
+
+20. 1152457: V3.2 Log-In Recognition
+
+21. 1151958: Leads "Change Status" button doesn't work
+
+22. 1151793: Editing lead errors
+
+23. 1145907: exporting xls to leads -
+
+24. 1087484: user deleted problem
+
+25. 1122448: export of opportunities
+
+26. 1122446: upload file size hardwired
+
+27. 1119621: PHP Error when cancelling editing of a ticket
+
+28. 1116923: Custom contacts import fails if no last name specified
+
+29. 1116919: CVS Import bombs when data contain single quote
+
+30. 1032651: New Attachment - Error message
+
+
+vtiger Discussions
+------------------
+ 
+1. Displaying the corresponding lead in Meeting/Call/Task modules
+
+2. Activity - missing confirmation on deleting activities - by fredy
+
+3. RC1 - Potentials "Only my items" not working - by eberled
+
+4. RC1 - Potentials sorting tables returns an error - by eberled
+
+5. RC1 Helpdesk - 'Assigned to' vs. 'Group' - by eberled
+
+6. RC1 - Helpdesk: Changing a ticket doesn't work - by eberled
+
+7. RC1- Homepage / Helpdesk : all tickets are listed - by eberled
+
+8. RC1 - Helpdesk : Account and Contact Name - by eberled
+
+9. RC1- Settings: Communication Templates - by eberled
+
+10. Unable to tab - by 829
+
+11. Email to Contacts and Mass Mail - by Jay
+
+12. blank.gif doesnt display - by timb
+
+13. RC1 - Product commission rate needs decimal field -by dchaffee
+
+14. RC1 - Potentials sorting tables returns an error - by eberled 
+
+15. Bugs in table insert statements during a new installation - by pab63
+
+16. RC1 - Selecting a contact shows only name and no firstname - by eberled
+
+17. Problem installing on subdomain - by cyberox
+
+18. help desk trouble ticket - by 829
+
+19. RC1 - Admin-Page: Empty Link in top right corner - by eberled
+
+20. RC1 - Admin Page: Wrong mail server password shown - by eberled
+
+21. RC1 - Admin : Creating User ( input field tab order) -by eberled 
+ 
+22. Accentuated characters - by bigtime
+
+23. Can't create new leads, contacts, accounts - by Peter - 
+
+24. RC1 - Admin : Show users related to a group not working - by eberled
+
+25. RC1 - Account : Description Information - by eberled
+
+26. RC1- Accounts : Searching for - by eberled
+
+27. RC1 - Leads : Input field tab order - by eberled
+
+28. RC1 - Leads : Input field for postalcode to large - by eberled
+
+29. vtiger DIscussions: RC1 - Accounts : Please show first name under contacts - by eberled
+
+30. RC1 - Contacts: Notes not created using 'Add buisness Card' - by eberled
+
+31. RC1 - Contacts : Advanced search - by eberled
+
+32. RC1 - Potentials: Expected Close Date - by eberled
+
+33. RC1 - Helpdesk : Searching - by eberled
+
+34. RC1 - Helpdesk : Searching II - by eberled
+
+35. RC1 - Accounts Detailview : empty 'Last modified date' - by eberled
+
+36. Problems with Thunderbird plugin - by mike
+
+37. vTiger CRM 4 (RC1) - Save Record Failure -
+
+38. User withread-only access to the contacts. However this user can easily 'mass delete' all contacts.
+  
+39. Unable to install Outlook plugin 4 RC 1 - by Christian
+
+40. RC1 Thunderbird plugin doesn\'t work
+
+41. Calculator bug - by 829
+
+42. Outlook Plugin Issues (outlook 2003) - by adrian
+
+43. vtiger Outlook Plugin 4.0.1 beta Release - by adrian
+
+44. CRM 4 RC1 problem or not? - 
+
+45. Problem installing RC1 - by stelaix
+
+46. Install Errors in step 5 - by pab
+
+47. Some Contact fields not synching - by Tareef
+
+48. vtiger v4 - How do you add a manufacturer? - 
+
+49. Contacts in vtiger Outlook related - Maarten
+
+50. RC1 - Product search to include Category, Manufacturer - by dchaffee
+
+51. RC1 - Products - No way to update product category field - by dchaffee
+
+52. Product commission rate needs decimal field - by dchaffee
+
+53. RC1 - New Notes for Tickets - by nuguid
+
+54. RC1 - Settings: Picklist - by eberled
+
+55. RC1- Settings : Helpdesk Picklist doesn't work - by eberled
+
+56. RC1 - Setting : Picklist values for Sales Stages - by eberled
+
+57. RC1 - Home : My Group Allocation - by eberled
+
+58. RC1 - Page Admin - by eberled
+
+
+
+Known Issues
+
+1. 1111896: Outlook raises a security alert when adding email with vtiger Outlook Plug-in
+
+2. In Windowos OS, System Inoformantion is not displayed
+
+3. While importing leads, accounts, contacts, and potentials the XLS file format can be browsed even though the allowed file format is CSV.
+ 
+----------------------------
+vtiger CRM 4 Beta
+January 10, 2005
+
+We are pleased to announce the latest version of vtiger CRM.
+
+New Features:
+
+1. Help Desk module to handle trouble tickets, Frequently Asked Questions and Support Statistics
+
+2. Products module to add company wide products related information at a centralized location
+
+3. Mail merge Templates
+
+4. Sending Mass E-mails to contacts
+
+5. Delete attachments
+
+6. Add/Sync Email attachments using vtiger Outlook Plug-in from Microsoft(R) Outlook(R) to vtiger CRM
+
+7. Add/Sync tasks using vtiger Outlook Plug-in from Microsoft(R) Outlook(R) to vtiger CRM
+
+8. Creating Groups and assigning users to groups
+
+9. Assigning leads/tickets to groups/individuals
+
+10. New theme 'Blue' has been added
+
+
+Issues Fixed:
+
+We have fixed the following issues reported in Sourceforge.net:
+
+1. 1093648 - Attachment contains extra footer
+
+2. 1097245 - Email Field in Leads - 25 chars
+
+3. 1093120 - User name doesn't appear in meetings
+
+4. 1090718 - Meeting User - Unable to remove
+
+5. 1092763 - Meeting attendee list does not list user's Name
+
+6. 1094922 - New Attachment - Error Message
+
+7. 1089207 - problem in emails
+
+8. 1089136 - need attachment
+
+9. 1037521 - Attachment/Import - Error message
+
+10. 1032707 - Unable to view/Save the Attachments
+
+11. 1019074 - handle mysql data
+
+12. 1028989 - Print Problem
+
+13. 1085617 - Wrong focus after deleting cases/contacts/opportunities
+
+14. 1089627 - Problem with vtiger. 25 Character email limit
+
+15. 1090721 - Meeting Contact - Unable to remove
+
+16. 1090279 - Export Custom Fields - Not working
+
+17. 1098475: Contacts: Field TITLE is too short
+
+18. 1093669 - Delete attachments
+
+19. Support for Latest versions of Apache and MySQL in installation wizard (Both Linux and Windows).
+
+----------------------------
+
+vtiger CRM 3.2.1
+December 21, 2004
+
+We are pleased to announce the latest version of vtiger CRM.
+
+New Features:
+
+1. Basic Calendar support
+2. German and Dutch Languages Support
+
+Issues Fixed:
+
+a) Duration minutes in calls not getting saved when a new call is created is fixed. 
+ 
+b) On deleting any entity, the Leads List View page getting displayed is fixed. 
+ 
+c) Internationalisation support for Custom Fields provided. 
+ 
+d) Internationalistaion support for Pick List Value Customization provided. 
+ 
+e) Quick create form is getting displayed now. 
+ 
+f) Empty Line Space appearing between the heading and List view table in module Lead and MessageBoard is fixed 
+ 
+g) Proper Message display is done when a user with no delete privileges tries to delete the entity.
+
+h) vtiger Outlook Plug-in in server side fixes related to performance improvement.
+
+
+---------------------------
+vtiger CRM 3.2
+December 13, 2004
+
+We are pleased to announce the latest version of vtiger CRM.
+
+New Features:
+
+a) Custom Field Support 
+
+b) Security Support 
+
+c) Migration from 3.0 to 3.2 
+
+----------------------------
+
+vtiger CRM 3
+November 8, 2004
+
+We are pleased to announce the latest version of vtiger CRM.
+
+New features:
+
+a) Support for accessing vtiger CRM server from Microsoft Outlook behind Proxy settings
+
+b) Synchronize customer specific tasks in between Microsft Outlook and vtiger CRM.
+
+c) Integrated Message Boards with vtiger CRM, which can be used to share customer knowledge among CRM service users.
+
 ---------------------
-PHP 4.x, MySQL 4.x, Apache 1.x or 2.x
-
-For more details please refer:
-http://www.vtiger.com/wiki/index.php/Vtiger_CRM_4.2.3_-_Installation_Guide
+
+vtiger CRM 3.0 Beta
+October 7, 2004
+
+We are pleased to announce the latest version of vtiger CRM.
+
+The new features are:
+
+a) Released vtiger Outlook Plug-in, business productivity enhancement utility for Microsoft Outlook users. It is an open source project covered under vtiger Public License 1.0 based on Mozilla Public License 1.1. 
+
+---------------------
+vtiger CRM 2.0
+September 6, 2004
+
+We are pleased to announce the latest version of vtiger CRM.
+
+The new features are:
+
+a) DRAG and DROP of the tabs!!
+This was achieved after working for quite a long time in the labs, not to
+mention many sleepless nights!.
+By using this feature, you can customize the tabs that you want to work with.
+Do let us know what you feel about it.
+
+b) Lead Management
+
+Sales reps can create leads and initiate the CRM cycle.
+We have tried to incorporate all the required features during this short period.
+Do let us know if you would like to see some more features.
+
+c) Import Leads from External Sources
+
+Sales reps can import leads to vtiger CRM from external sources, such as Microsoft Outlook, 
+ACT, GoldMine, and others in *.XLS file format. This feature eliminates the manual
+data entry and enhances the Sales rep's productivity.
+
+d) Attach Files
+
+Sales reps can attach sales-related materials, such as marketing collaterals, presentations,
+price quotes, and others, so that they can instantly access the related documents while 
 dealing with leads/opportunities, accounts, and contacts.
 
+Send your feedback, which is vital for our understanding your needs.
+
+-------------------------------------------------------------------------------------------------------------
+vtiger CRM 1.0
+August 26, 2004
+
+-=Overview=-
+
+After several months of working on our CRM solution, based on Apache, MySQL and other open source components, we came across a SourceForge open source project initiated by SugarCRM, having the same vision, and doing something very similar to what we were doing. They started out with the same premise we did, namely that CRM software is needlessly expensive, and hosted offerings only pretend to be affordable. While we were getting ready with our offering, the open source project had already launched it; the underlying infrastructure of Apache and MySQL was similar to what we were doing, and most importantly, the SugarCRM Public License allowed us to create distributions based on this code (SPL - a copy of Version 1.1.2 is found here, and the URL is at http://www.sugarcrm.com/home/content/view/35/86/) we decided it would be even faster to adopt that as our core and add value on top, an example of open source based collaboration.
+
+We gratefully acknowledge the contribution made by SugarCRM, and we intend to actively participate and lead in bringing this vision of affordable enterprise applications, but we make it clear that vtiger is not affiliated with nor is endorsed by SugarCRM.
+
+The team at vtiger CRM is pleased to announce the v1.0 the first release of vtiger CRM Open Source project.
+
+This first release of vtiger.Sales is best suited for small sales forces.  If
+you're looking to manage the basics of sales deals where every user can see
+all of the data in the system, then vtiger.Sales v1.0 is right for you.  Over the next few months, we will be building out vtiger.Sales to meet the needs of larger, multi-national sales forces that need features like forecasting, data access permissions and internationalization.
+
+Please feel free to send your valuable comments to contact at vtiger.com so that we can have a better CRM product at free of cost. Check out our website at http://www.vtiger.com for support forums, detailed product information, our future plan and much more.  
+
+-=Features=-
+We have incorporated the following features in this release based on SugarCRM. 
+
+Opportunities
+vtiger.Sales provides a complete, yet easy-to-use Opportunities module.  From deal size to each contact?s role, from listing the competitors to tracking the lead source, sales reps can easily manage each sales opportunity to completion.  
+
+Accounts & Contacts
+With the Accounts & Contacts module, you can easily enter and update key account and contact information. Tracking and staying in touch with your customers is simply a click away. 
+
+Activity & Task Management
+Managing your customer interactions is at the heart of a sales automation application. vtiger.Sales provides a simple and clean set of tools for quickly tracking tasks, phone calls, emails and meetings. 
+
+Notes & Attachments
+Easily keep notes on every contact, opportunity or account. 
+
+Home Screen 
+Focus on the right activities with a quick view of your top opportunities, pipeline, today's appointments and task list.
+
+Dashboard 
+A picture is always worth a thousand words.  With the dashboard module, you can graphically view how your opportunities  breakdown by sales stage or industry.
+
+Administration 
+Easily manage all the users in the system, their passwords, user interface themes and more. 
+



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 04:40:21 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 11:40:21 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6931 -
 /vtigercrm/trunk/modules/Dashboard/display_charts.php
Message-ID: <20060607114021.3E24D7E85B7@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 05:40:17 2006
New Revision: 6931

Log:
i18n updated for dashboard module - ahmed

Modified:
    vtigercrm/trunk/modules/Dashboard/display_charts.php

Modified: vtigercrm/trunk/modules/Dashboard/display_charts.php
==============================================================================
--- vtigercrm/trunk/modules/Dashboard/display_charts.php (original)
+++ vtigercrm/trunk/modules/Dashboard/display_charts.php Wed Jun  7 05:40:17 2006
@@ -17,7 +17,7 @@
         include("modules/Dashboard/pie_graph.php");
 	
 global $tmp_dir;
-
+global $mod_strings,$app_strings;
 
 $period=($_REQUEST['period'])?$_REQUEST['period']:"tmon"; // Period >> lmon- Last Month, tmon- This Month, lweek-LastWeek, tweek-ThisWeek; lday- Last Day 
 $type=($_REQUEST['type'])?$_REQUEST['type']:"leadsource";
@@ -71,22 +71,22 @@
         * Contributor(s): ______________________________________..
  */
 $graph_array = Array(
-          "leadsource" => "Leads By Source",
-          "leadstatus" => "Leads By Status",
-          "leadindustry" => "Leads By Industry",
-          "salesbyleadsource" => "Sales by LeadSource",
-          "salesbyaccount" => "Sales by Accounts",
-          "accountindustry" => "Account By Industry",
-          "productcategory" => "Products by Category",
-          "sobyaccounts" => "Sales Order by Accounts",
-          "sobystatus" => "Sales Order by Status",
-          "pobystatus" => "Purchase Order by Status",
-          "quotesbyaccounts" => "Quotes by Accounts",
-          "quotesbystage" => "Quotes by Stage",
-          "invoicebyacnts" => "Invoices by Accounts",
-          "invoicebystatus" => "Invoices by status",
-          "ticketsbystatus" => "Tickets by status",
-          "ticketsbypriority" => "Tickets by Priority",
+	  "leadsource" => $mod_strings['leadsource'],
+          "leadstatus" => $mod_strings['leadstatus'],
+          "leadindustry" => $mod_strings['leadindustry'],
+          "salesbyleadsource" => $mod_strings['salesbyleadsource'],
+          "salesbyaccount" => $mod_strings['salesbyaccount'],
+          "accountindustry" => $mod_strings['accountindustry'],
+          "productcategory" => $mod_strings['productcategory'],
+          "sobyaccounts" => $mod_strings['sobyaccounts'],
+          "sobystatus" => $mod_strings['sobystatus'],
+          "pobystatus" => $mod_strings['pobystatus'],
+          "quotesbyaccounts" => $mod_strings['quotesbyaccounts'],
+          "quotesbystage" => $mod_strings['quotesbystage'],
+          "invoicebyacnts" => $mod_strings['invoicebyacnts'],
+          "invoicebystatus" => $mod_strings['invoicebystatus'],
+          "ticketsbystatus" => $mod_strings['ticketsbystatus'],
+          "ticketsbypriority" => $mod_strings['ticketsbypriority'],
           );
 function get_graph_by_type($graph_by,$graph_title,$module,$where,$query)
 {
@@ -139,7 +139,7 @@
 {
 
 	global $tmp_dir;
-     global $graph_title;
+     global $graph_title, $mod_strings;
 	$val=explode(":",$title); 		
 	$display_title=$val[0];	
 			
@@ -151,7 +151,7 @@
  		   <td nowrap><span class=genHeaderSmall>".$graph_title."</span></td>
  		 </tr>
    		 <tr>
-		   <td><span class=big>Horizontal Bar Chart</span> </td>
+		   <td nowrap><span class=big>".$mod_strings['LBL_HORZ_BAR_CHART']."</span> </td>
 		 </tr>
 		</table>
   	   </td>
@@ -197,7 +197,7 @@
  		   <td nowrap><span class=genHeaderSmall>".$graph_title."</span></td>
  		 </tr>
    		 <tr>
-		   <td><span class=big>Pie Chart</span> </td>
+		   <td><span class=big>".$mod_strings['LBL_PIE_CHART']."</span> </td>
 		 </tr>
 		</table>
   	   </td>
@@ -342,7 +342,7 @@
     <td width="20%" nowrap valign="top">
 		<table width="100%"  border="0" cellspacing="0" cellpadding="0" bgcolor="#DFDFDF">
           	<tr><td class="dashMnuUnSel">
-                    <a href="index.php?module=Dashboard&action=index&type=dashboardhome">Dashboard Home</a>
+                    <a href="index.php?module=Dashboard&action=index&type=dashboardhome"><? echo $mod_strings['LBL_DASHBRD_HOME'];?></a>
                </td></tr>              
                <?php 
                  $mnuHTML = "";
@@ -375,7 +375,7 @@
                     if(($type == "leadsource") && (getFieldVisibilityPermission('Leads',$user_id,'leadsource') == "0"))
                     {
                     	$graph_by="leadsource";
-                    	$graph_title="Leads By Source";
+                    	$graph_title= $mod_strings['leadsource'];
                     	$module="Leads";
                     	$where="";
                     	$query=$leads_query;                   
@@ -386,7 +386,7 @@
                     elseif (($type == "leadstatus")&& (getFieldVisibilityPermission('Leads',$user_id,'leadstatus') == "0"))
                     {
                     	$graph_by="leadstatus";
-                    	$graph_title="Leads By Status";
+                    	$graph_title= $mod_strings['leadstatus'];
                     	$module="Leads";
                     	$where="";
                     	$query=$leads_query;
@@ -396,7 +396,7 @@
                     elseif (($type == "leadindustry") && (getFieldVisibilityPermission('Leads',$user_id,'industry') == "0"))
                     {
                     	$graph_by="industry";
-                            $graph_title="Leads By Industry";
+                            $graph_title=$mod_strings['leadindustry'];
                             $module="Leads";
                             $where="";
                             $query=$leads_query;
@@ -406,7 +406,7 @@
                     elseif (($type == "salesbyleadsource")&& (getFieldVisibilityPermission('Potentials',$user_id,'leadsource') == "0"))
                     {
                             $graph_by="leadsource";
-                            $graph_title="Sales by LeadSource";
+                            $graph_title=$mod_strings['salesbyleadsource'];
                             $module="Potentials";
                             $where=" and potential.sales_stage like '%Closed Won%' ";
                             $query=$potential_query;
@@ -416,7 +416,7 @@
                     elseif (($type == "salesbyaccount") && (getFieldVisibilityPermission('Potentials',$user_id,'account_id') == "0"))
                     {
                     	$graph_by="accountid";
-                         $graph_title="Sales by Accounts";
+                         $graph_title=$mod_strings['salesbyaccount'];
                          $module="Potentials";
                          $where=" and potential.sales_stage like '%Closed Won%' ";
                          $query=$potential_query;
@@ -426,7 +426,7 @@
                     elseif (($type == "accountindustry") && (getFieldVisibilityPermission('Accounts',$user_id,'industry') == "0"))
                     {
                     	$graph_by="industry";
-                            $graph_title="Account By Industry";
+                            $graph_title=$mod_strings['accountindustry'];
                             $module="Accounts";
                             $where="";
                             $query=$account_query;
@@ -436,7 +436,7 @@
                     elseif (($type == "productcategory") && (getFieldVisibilityPermission('Products',$user_id,'productcategory') == "0"))
                     {
                     	$graph_by="productcategory";
-                            $graph_title="Products by Category";
+                            $graph_title=$mod_strings['productcategory'];
                             $module="Products";
                             $where="";
                             $query=$products_query;
@@ -446,7 +446,7 @@
                     elseif (($type == "sobyaccounts") && (getFieldVisibilityPermission('SalesOrder',$user_id,'account_id') == "0"))
                     {
                     	$graph_by="accountid";
-                            $graph_title="Sales Order by Accounts";
+                            $graph_title=$mod_strings['sobyaccounts'];
                             $module="SalesOrder";
                             $where="";
                             $query=$so_query;
@@ -456,7 +456,7 @@
                     elseif (($type == "sobystatus") && (getFieldVisibilityPermission('SalesOrder',$user_id,'sostatus') == "0"))
                     {
                             $graph_by="sostatus";
-                            $graph_title="Sales Order by Status";
+                            $graph_title=$mod_strings['sobystatus'];
                             $module="SalesOrder";
                             $where="";
                             $query=$so_query;
@@ -466,7 +466,7 @@
                     elseif (($type == "pobystatus") && (getFieldVisibilityPermission('PurchaseOrder',$user_id,'postatus') == "0"))
                     {
                             $graph_by="postatus";
-                            $graph_title="Purchase Order by Status";
+                            $graph_title=$mod_strings['pobystatus'];
                             $module="PurchaseOrder";
                             $where="";
                             $query=$po_query;
@@ -476,7 +476,7 @@
                     elseif (($type == "quotesbyaccounts") && (getFieldVisibilityPermission('Quotes',$user_id,'account_id') == "0"))
                     {
                             $graph_by="accountid";
-                            $graph_title="Quotes by Accounts";
+                            $graph_title= $mod_strings['quotesbyaccounts'];
                             $module="Quotes";
                             $where="";
                             $query=$quotes_query;
@@ -486,7 +486,7 @@
                     elseif (($type == "quotesbystage") && (getFieldVisibilityPermission('Quotes',$user_id,'quotestage') == "0"))
                     {
                             $graph_by="quotestage";
-                            $graph_title="Quotes by Stage";
+                            $graph_title=$mod_strings['quotesbystage'];
                             $module="Quotes";
                             $where="";
                             $query=$quotes_query;
@@ -496,7 +496,7 @@
                     elseif (($type == "invoicebyacnts") && (getFieldVisibilityPermission('Invoice',$user_id,'account_id') == "0"))
                     {
                             $graph_by="accountid";
-                            $graph_title="Invoices by Accounts";
+                            $graph_title=$mod_strings['invoicebyacnts'];
                             $module="Invoice";
                             $where="";
                             $query=$invoice_query;
@@ -506,7 +506,7 @@
                     elseif (($type == "invoicebystatus") && (getFieldVisibilityPermission('Invoice',$user_id,'invoicestatus') == "0"))
                     {
                             $graph_by="invoicestatus";
-                            $graph_title="Invoices by status";
+                            $graph_title=$mod_strings['invoicebystatus'];
                             $module="Invoice";
                             $where="";
                             $query=$invoice_query;
@@ -516,7 +516,7 @@
                     elseif (($type == "ticketsbystatus") && (getFieldVisibilityPermission('HelpDesk',$user_id,'ticketstatus') == "0"))
                     {
                             $graph_by="ticketstatus";
-                            $graph_title="Tickets by status";
+                            $graph_title=$mod_strings['ticketsbystatus'];
                             $module="HelpDesk";
                             $where="";
                             $query=$helpdesk_query;
@@ -526,7 +526,7 @@
                     elseif (($type == "ticketsbypriority") && (getFieldVisibilityPermission('HelpDesk',$user_id,'ticketpriorities') == "0"))
                     {
                             $graph_by="priority";
-                            $graph_title="Tickets by Priority";
+                            $graph_title=$mod_strings['ticketsbypriority'];
                             $module="HelpDesk";
                             $where="";
                             $query=$helpdesk_query;



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 04:41:54 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 11:41:54 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6932 -
 /vtigercrm/trunk/Smarty/templates/Settings/Announcements.tpl
Message-ID: <20060607114154.016067E85B7@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 05:41:51 2006
New Revision: 6932

Log:
ajax functionality has been modified

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 Jun  7 05:41:51 2006
@@ -12,19 +12,21 @@
 <script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
 {literal}
 <script>
-function ajaxSaveResponse(response)
-{
-	document.getElementById("announcement").innerHTML=response.responseText;
-	hide("an_busy");
-}
 function Announcement()
 {
-	show("an_busy");
-	var ajaxObj = new VtigerAjax(ajaxSaveResponse);
-	var announcement=document.getElementById("announcement").value;
-	//var title=document.getElementById("title_announce").value;
-	var urlstring = "module=Users&action=UsersAjax&announcement="+announcement+"&announce_save=yes";
-	ajaxObj.process("index.php?",urlstring);
+	$("an_busy").style.display="inline";
+	var announcement=$("announcement").value;
+	new Ajax.Request(
+	'index.php',
+        {queue: {position: 'end', scope: 'command'},
+       		method: 'post',
+	        postBody: 'module=Users&action=UsersAjax&announcement='+announcement+'&announce_save=yes',
+	        onComplete: function(response) {
+					$("announcement").innerHTML=response.responseText;
+					$("an_busy").style.display="none";
+                        	}
+	        }
+	);
 }
 </script>
 {/literal}



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 04:42:54 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 11:42:54 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6933 -
 /vtigercrm/trunk/Smarty/templates/Settings/EmailNotification.tpl
Message-ID: <20060607114254.645F47E85B7@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 05:42:50 2006
New Revision: 6933

Log:
ajax functionality has been modified

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 Wed Jun  7 05:42:50 2006
@@ -46,33 +46,39 @@
 <script>
 function fetchSaveNotify(id)
 {
-	hide('editdiv');
-	show('status');
-	var ajaxObj = new VtigerAjax(ajaxsavenotifyresponse);
-	var active = document.getElementById("notify_status").options[document.getElementById("notify_status").options.selectedIndex].value;
-	var subject = document.getElementById("notifysubject").value;
-	var body = document.getElementById("notifybody").value;
-	urlstring ='action=UsersAjax&module=Users&file=SaveNotification&active='+active+'&notifysubject='+subject+'&notifybody='+body+'&record='+id;
-	ajaxObj.process("index.php?",urlstring);
-}
-function ajaxsavenotifyresponse(response)
-{
-	hide("status");
-	document.getElementById("notifycontents").innerHTML=response.responseText;	
+	$("editdiv").style.display="none";
+	$("status").style.display="inline";
+	var active = $("notify_status").options[$("notify_status").options.selectedIndex].value;
+	var subject = $("notifysubject").value;
+        var body = $("notifybody").value;
+	new Ajax.Request(
+                'index.php',
+                {queue: {position: 'end', scope: 'command'},
+                        method: 'post',
+                        postBody: 'action=UsersAjax&module=Users&file=SaveNotification&active='+active+'&notifysubject='+subject+'&notifybody='+body+'&record='+id,
+                        onComplete: function(response) {
+                                $("status").style.display="none";
+				$("notifycontents").innerHTML=response.responseText;
+                        }
+                }
+        );
 }
 
 function fetchEditNotify(id)
 {
-	show('status');
-	var ajaxObj = new VtigerAjax(ajaxnotifyresponse);
-	urlstring ='action=UsersAjax&module=Users&file=EditNotification&record='+id;
-	ajaxObj.process("index.php?",urlstring);
-}
-function ajaxnotifyresponse(response)
-{
-	hide("status");
-	document.getElementById("editdiv").innerHTML=response.responseText;	
-	show("editdiv");
+	$("status").style.display="inline";
+	new Ajax.Request(
+                'index.php',
+                {queue: {position: 'end', scope: 'command'},
+                        method: 'post',
+                        postBody:'action=UsersAjax&module=Users&file=EditNotification&record='+id,
+                        onComplete: function(response) {
+                                $("status").style.display="none";
+                                $("editdiv").innerHTML=response.responseText;
+				$("editdiv").style.display="inline";
+                        }
+                }
+        );
 }
 </script>
 {/literal}



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 04:43:32 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 11:43:32 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6934 -
 /vtigercrm/trunk/Smarty/templates/Settings/InventoryNotify.tpl
Message-ID: <20060607114332.2972E7E85B7@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 05:43:28 2006
New Revision: 6934

Log:
ajax functionality has been modified

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

Modified: vtigercrm/trunk/Smarty/templates/Settings/InventoryNotify.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Settings/InventoryNotify.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Settings/InventoryNotify.tpl Wed Jun  7 05:43:28 2006
@@ -46,32 +46,37 @@
 <script>
 function fetchSaveNotify(id)
 {
-	hide('editdiv');
-	show('status');
-	var ajaxObj = new VtigerAjax(ajaxsavenotifyresponse);
-	var subject = document.getElementById("notifysubject").value;
-	var body = document.getElementById("notifybody").value;
-	urlstring ='action=UsersAjax&module=Users&file=SaveInventoryNotification&notifysubject='+subject+'&notifybody='+body+'&record='+id;
-	ajaxObj.process("index.php?",urlstring);
-}
-function ajaxsavenotifyresponse(response)
-{
-	hide("status");
-	//document.getElementById("notifycontents").innerHTML=response.responseText;	
+	$("editdiv").style.display="none";
+	$("status").style.display="inline";
+	var subject = $("notifysubject").value;
+        var body = $("notifybody").value;
+        new Ajax.Request(
+                'index.php',
+                {queue: {position: 'end', scope: 'command'},
+                        method: 'post',
+                        postBody: 'action=UsersAjax&module=Users&file=SaveInventoryNotification&notifysubject='+subject+'&notifybody='+body+'&record='+id,
+                        onComplete: function(response) {
+                                $("status").style.display="none";
+                        }
+                }
+        );
 }
 
 function fetchEditNotify(id)
 {
-	show('status');
-	var ajaxObj = new VtigerAjax(ajaxnotifyresponse);
-	urlstring ='action=UsersAjax&module=Users&file=EditInventoryNotification&record='+id;
-	ajaxObj.process("index.php?",urlstring);
-}
-function ajaxnotifyresponse(response)
-{
-	hide("status");
-	document.getElementById("editdiv").innerHTML=response.responseText;	
-	show("editdiv");
+	$("status").style.display="inline";
+	new Ajax.Request(
+                'index.php',
+                {queue: {position: 'end', scope: 'command'},
+                        method: 'post',
+                        postBody: 'action=UsersAjax&module=Users&file=EditInventoryNotification&record='+id,
+                        onComplete: function(response) {
+                                $("status").style.display="none";
+				$("editdiv").innerHTML=response.responseText;
+				$("editdiv").style.display="inline";
+                        }
+                }
+        );
 }
 </script>
 {/literal}



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 04:44:43 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 11:44:43 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6935 -
 /vtigercrm/trunk/Smarty/templates/Settings/ModuleOwners.tpl
Message-ID: <20060607114443.1DFE17E85B7@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 05:44:39 2006
New Revision: 6935

Log:
ajax functionality has been modified

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

Modified: vtigercrm/trunk/Smarty/templates/Settings/ModuleOwners.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Settings/ModuleOwners.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Settings/ModuleOwners.tpl Wed Jun  7 05:44:39 2006
@@ -11,13 +11,6 @@
 -->*}
 <script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
 <script language="JavaScript" type="text/javascript" src="include/js/ajax.js"></script>
-<script language="javascript">
-function ajaxmoduleresponse(response)
-{ldelim}
-	hide("status");
-	document.getElementById("module_list_owner").innerHTML=response.responseText;
-{rdelim}
-</script>
 <style type="text/css">@import url(themes/blue/style.css);</style>
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
 <tr>
@@ -52,17 +45,24 @@
 <script>
 function assignmodulefn(mode)
 {
-	show('status');
-	var ajaxObj = new VtigerAjax(ajaxmoduleresponse);
+	$("status").style.display="inline";
 	var urlstring ='';
 	for(i = 0;i < document.support_owners.elements.length;i++)
 	{
 		if(document.support_owners.elements[i].name != 'button')
 		urlstring +='&'+document.support_owners.elements[i].name+'='+document.support_owners.elements[i].value;
 	}
-	
-	urlstring +='&list_module_mode='+mode+'&file_mode=ajax';
-	ajaxObj.process("index.php?",urlstring);
+	new Ajax.Request(
+                'index.php',
+                {queue: {position: 'end', scope: 'command'},
+                        method: 'post',
+                        postBody: urlstring+'&list_module_mode='+mode+'&file_mode=ajax',
+                        onComplete: function(response) {
+                                $("status").style.display="none";
+				$("module_list_owner").innerHTML=response.responseText;
+                        }
+                }
+        );
 }
 </script>
 {/literal}



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 04:45:53 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 11:45:53 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6936 -
 /vtigercrm/trunk/Smarty/templates/Settings/PickList.tpl
Message-ID: <20060607114554.0E5EC7E85B7@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 05:45:50 2006
New Revision: 6936

Log:
ajax functionality has been modified

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 Wed Jun  7 05:45:50 2006
@@ -83,11 +83,6 @@
 	}
 }
 
-function ajachangeresponse(response)
-{
-	hide("status");
-	document.getElementById("picklist_datas").innerHTML=response.responseText;	
-}
 {/literal}
 </script>
 <style type="text/css">@import url(themes/blue/style.css);</style>
@@ -167,33 +162,52 @@
 <script>
 function SavePickList(fieldname,module)
 {
-	show('status');
-	Effect.Puff(document.getElementById('editdiv'),{duration:2});
-	var ajaxObj = new VtigerAjax(ajachangeresponse);
-	var body = document.getElementById("picklist_values").value;
-	urlstring ='action=SettingsAjax&module=Settings&directmode=ajax&file=UpdateComboValues&table_name='+fieldname+'&fld_module='+module+'&listarea='+body;
-	ajaxObj.process("index.php?",urlstring);
+	$("status").style.display="inline";
+	Effect.Puff($('editdiv'),{duration:2});
+	var body = $("picklist_values").value;
+	new Ajax.Request(
+        	'index.php',
+	        {queue: {position: 'end', scope: 'command'},
+        		method: 'post',
+		        postBody: 'action=SettingsAjax&module=Settings&directmode=ajax&file=UpdateComboValues&table_name='+fieldname+'&fld_module='+module+'&listarea='+body,
+		        onComplete: function(response) {
+					$("status").style.display="none";
+        				$("picklist_datas").innerHTML=response.responseText;
+	                        }
+        	}
+	);
 }
 function changeModule(pickmodule)
 {
-	show('status');
-	var ajaxObj = new VtigerAjax(ajachangeresponse);
+	$("status").style.display="inline";
 	var module=pickmodule.options[pickmodule.options.selectedIndex].value;
-	urlstring ='action=SettingsAjax&module=Settings&directmode=ajax&file=PickList&fld_module='+module;
-	ajaxObj.process("index.php?",urlstring);
+	new Ajax.Request(
+                'index.php',
+                {queue: {position: 'end', scope: 'command'},
+                        method: 'post',
+                        postBody: 'action=SettingsAjax&module=Settings&directmode=ajax&file=PickList&fld_module='+module,
+                        onComplete: function(response) {
+                                        $("status").style.display="none";
+                                        $("picklist_datas").innerHTML=response.responseText;
+                                }
+                }
+        );
 }
 function fetchEditPickList(module,fieldname)
 {
-	show('status');
-	var ajaxObj = new VtigerAjax(ajaxnotifyresponse);
-	urlstring ='action=SettingsAjax&module=Settings&mode=edit&file=EditComboField&fld_module='+module+'&fieldname='+fieldname;
-	ajaxObj.process("index.php?",urlstring);
-}
-function ajaxnotifyresponse(response)
-{
-	hide("status");
-	document.getElementById("editdiv").innerHTML=response.responseText;	
-	Effect.Grow('editdiv');
+	$("status").style.display="inline";
+	new Ajax.Request(
+                'index.php',
+                {queue: {position: 'end', scope: 'command'},
+                        method: 'post',
+                        postBody: 'action=SettingsAjax&module=Settings&mode=edit&file=EditComboField&fld_module='+module+'&fieldname='+fieldname,
+			onComplete: function(response) {
+                                        $("status").style.display="none";
+                                        $("editdiv").innerHTML=response.responseText;
+					Effect.Grow('editdiv');
+                	}
+                }
+        );
 }
 </script>
 {/literal}



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 04:47:34 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 11:47:34 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6937 -
	/vtigercrm/trunk/Smarty/templates/ListRoles.tpl
Message-ID: <20060607114734.32EC67E85B7@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 05:47:30 2006
New Revision: 6937

Log:
ajax functionality has been modified

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

Modified: vtigercrm/trunk/Smarty/templates/ListRoles.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ListRoles.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ListRoles.tpl Wed Jun  7 05:47:30 2006
@@ -160,8 +160,8 @@
 	
 	function put_child_ID(currObj)
 	{ldelim}
-			var move_Element = document.getElementById('Drag_content');
-	 		parentName  = document.getElementById(currObj).innerHTML;
+			var move_Element = $('Drag_content');
+	 		parentName  = $(currObj).innerHTML;
 			parentId = currObj;
 			move_Element.style.display = 'none';
 			hideAll = false;	
@@ -175,29 +175,28 @@
 			{ldelim}
 				childId = childId.replace(/user_/gi,'');
 				parentId = parentId.replace(/user_/gi,'');
-        			var ajaxObj = new VtigerAjax(ajaxSaveResponse);
-				
-                		var urlstring ="module=Users&action=UsersAjax&file=RoleDragDrop&ajax=true&parentId="+parentId+"&childId="+childId;
-        			ajaxObj.process("index.php?",urlstring);
+				new Ajax.Request(
+  					'index.php',
+				        {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+					        method: 'post',
+					        postBody: 'module=Users&action=UsersAjax&file=RoleDragDrop&ajax=true&parentId='+parentId+'&childId='+childId,
+						onComplete: function(response) {ldelim}
+							if(response.responseText != 'You cannot move a Parent Node under a Child Node')
+							{ldelim}
+						                $('RoleTreeFull').innerHTML=response.responseText;
+						                hideAll = false;
+							        parentId = "";
+						                parentName = "";
+						                childId ="NULL";
+								childName = "NULL";
+						        {rdelim}
+						        else
+						                alert(response.responseText);
+			                        {rdelim}
+				        {rdelim}
+				);
 			{rdelim}
 	{rdelim}
-
-
-	function ajaxSaveResponse(response)
-	{ldelim}
-        if(response.responseText != 'You cannot move a Parent Node under a Child Node')
-	{ldelim}
-                document.getElementById('RoleTreeFull').innerHTML=response.responseText;
-		hideAll = false;
-		parentId = "";
-		parentName = "";
-		childId ="NULL";
-		childName = "NULL";
-	{rdelim}
-        else
-                alert(response.responseText);
-	{rdelim}
-
 
 	function fnVisible(Obj)
 	{ldelim}



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 04:53:36 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 11:53:36 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6938 - in
 /vtigercrm/trunk/Smarty/templates/Inventory: InventoryCreateView.tpl
 InventoryDetailView.tpl InventoryEditView.tpl
Message-ID: <20060607115336.88E337E85CD@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 05:53:30 2006
New Revision: 6938

Log:
ajax functionality has been modified

Modified:
    vtigercrm/trunk/Smarty/templates/Inventory/InventoryCreateView.tpl
    vtigercrm/trunk/Smarty/templates/Inventory/InventoryDetailView.tpl
    vtigercrm/trunk/Smarty/templates/Inventory/InventoryEditView.tpl

Modified: vtigercrm/trunk/Smarty/templates/Inventory/InventoryCreateView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Inventory/InventoryCreateView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Inventory/InventoryCreateView.tpl Wed Jun  7 05:53:30 2006
@@ -23,23 +23,24 @@
 
 <script type="text/javascript">
 
-function ajaxResponse(response)
-{ldelim}
-        document.getElementById('autocom').innerHTML = response.responseText;
-        document.getElementById('autocom').style.display="block";
-        hide('vtbusy_info');
-{rdelim}
-
 function sensex_info()
 {ldelim}
-        var Ticker = document.getElementById('tickersymbol').value;
+        var Ticker = $('tickersymbol').value;
         if(Ticker!='')
         {ldelim}
-                show('vtbusy_info');
-                var ajaxObj = new VtigerAjax(ajaxResponse);
-                //var Ticker = document.getElementById('tickersymbol').value;
-                var urlstring = "module={$MODULE}&action=Tickerdetail&tickersymbol="+Ticker;
-                ajaxObj.process("index.php?",urlstring);
+		$("vtbusy_info").style.display="inline";
+		new Ajax.Request(
+          	      'index.php',
+                      {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+                      		method: 'post',
+                        	postBody: 'module={$MODULE}&action=Tickerdetail&tickersymbol='+Ticker,
+	                        onComplete: function(response) {ldelim}
+					$('autocom').innerHTML = response.responseText;
+				        $('autocom').style.display="block";
+        	                        $("vtbusy_info").style.display="none";
+                	        {rdelim}
+                	{rdelim}
+        	);
         {rdelim}
 {rdelim}
 

Modified: vtigercrm/trunk/Smarty/templates/Inventory/InventoryDetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Inventory/InventoryDetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Inventory/InventoryDetailView.tpl Wed Jun  7 05:53:30 2006
@@ -235,16 +235,17 @@
 {/if}
 
 <script>
-	var data = "module={$MODULE}&action={$MODULE}Ajax&ajxaction=GETTAGCLOUD&file=TagCloud";
-	var ajaxObj = new VtigerAjax(ajaxTagCloudResp);
-	ajaxObj.process("index.php?",data);
-	function ajaxTagCloudResp(response)
-	{ldelim}
-		var item = response.responseText;
-		getObj('tagfields').innerHTML = item;
-		document.getElementById('txtbox_tagfields').value ='';	
-
-	{rdelim}
+	new Ajax.Request(
+  	      'index.php',
+        	{ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+	        method: 'post',
+        	postBody: 'module={$MODULE}&action={$MODULE}Ajax&file=TagCloud&ajxaction=GETTAGCLOUD',
+	        onComplete: function(response) {ldelim}
+        	                        $("tagfields").innerHTML=response.responseText;
+                	                $("txtbox_tagfields").value ='';
+                        	{rdelim}
+		{rdelim}
+	);
 </script>
 
 	</td>

Modified: vtigercrm/trunk/Smarty/templates/Inventory/InventoryEditView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Inventory/InventoryEditView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Inventory/InventoryEditView.tpl Wed Jun  7 05:53:30 2006
@@ -22,25 +22,27 @@
 <script type="text/javascript" src="include/js/Inventory.js"></script>
 <script type="text/javascript">
 
-function ajaxResponse(response)
+function sensex_info()
 {ldelim}
-        document.getElementById('autocom').innerHTML = response.responseText;
-        document.getElementById('autocom').style.display="block";
-        hide('vtbusy_info');
+        var Ticker = $('tickersymbol').value;
+        if(Ticker!='')
+        {ldelim}
+                $("vtbusy_info").style.display="inline";
+                new Ajax.Request(
+                      'index.php',
+                      {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+                                method: 'post',
+                                postBody: 'module={$MODULE}&action=Tickerdetail&tickersymbol='+Ticker,
+                                onComplete: function(response) {ldelim}
+                                        $('autocom').innerHTML = response.responseText;
+                                        $('autocom').style.display="block";
+                                        $("vtbusy_info").style.display="none";
+                                {rdelim}
+                        {rdelim}
+                );
+        {rdelim}
 {rdelim}
 
-function sensex_info()
-{ldelim}
-        var Ticker = document.getElementById('tickersymbol').value;
-        if(Ticker!='')
-        {ldelim}
-                show('vtbusy_info');
-                var ajaxObj = new VtigerAjax(ajaxResponse);
-                //var Ticker = document.getElementById('tickersymbol').value;
-                var urlstring = "module={$MODULE}&action=Tickerdetail&tickersymbol="+Ticker;
-                ajaxObj.process("index.php?",urlstring);
-        {rdelim}
-{rdelim}
 </script>
 
 		{include file='Buttons_List1.tpl'}	



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 05:01:05 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 12:01:05 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6939 -
	/vtigercrm/trunk/Smarty/templates/DetailView.tpl
Message-ID: <20060607120106.E63947E85D1@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 06:00:56 2006
New Revision: 6939

Log:
ajax functionality has been modified

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 Wed Jun  7 06:00:56 2006
@@ -25,17 +25,23 @@
 
 <div id="convertleaddiv" style="display:block;position:absolute;left:225px;top:150px;"></div>
 <script>
-function ajaxSaveResponse(response)
-{ldelim}
-        document.getElementById("convertleaddiv").innerHTML=response.responseText;
-{rdelim}
+{literal}
 
 function callConvertLeadDiv(id)
-{ldelim}
-        var ajaxObj = new VtigerAjax(ajaxSaveResponse);
-        var urlstring = "module=Leads&action=LeadsAjax&file=ConvertLead&record="+id;
-        ajaxObj.process("index.php?",urlstring);
-{rdelim}
+{
+        new Ajax.Request(
+                'index.php',
+                {queue: {position: 'end', scope: 'command'},
+                        method: 'post',
+                        postBody: 'module=Leads&action=LeadsAjax&file=ConvertLead&record='+id,
+                        onComplete: function(response) {
+                                $("convertleaddiv").innerHTML=response.responseText;
+                        }
+                }
+        );
+}
+{/literal}
+
 function tagvalidate()
 {ldelim}
 	if(document.getElementById('txtbox_tagfields').value != '')
@@ -316,15 +322,17 @@
 {/if}
 
 <script>
-var data = "module={$MODULE}&action={$MODULE}Ajax&file=TagCloud&ajxaction=GETTAGCLOUD";
-var ajaxObj = new VtigerAjax(ajaxTagCloudResp);
-ajaxObj.process("index.php?",data);
-function ajaxTagCloudResp(response)
-{ldelim}
-	var item = response.responseText;
-	getObj('tagfields').innerHTML = item;
-	document.getElementById('txtbox_tagfields').value ='';	
-{rdelim}
+new Ajax.Request(
+        'index.php',
+        {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+        method: 'post',
+        postBody: 'module={$MODULE}&action={$MODULE}Ajax&file=TagCloud&ajxaction=GETTAGCLOUD',
+        onComplete: function(response) {ldelim}
+                                $("tagfields").innerHTML=response.responseText;
+                                $("txtbox_tagfields").value ='';
+                        {rdelim}
+        {rdelim}
+);
 </script>
 <!-- added for validation -->
 <script language="javascript">



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 05:04:48 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 12:04:48 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6940 - in
 /vtigercrm/trunk/Smarty/templates: CreateView.tpl salesEditView.tpl
Message-ID: <20060607120448.B4A807E85D2@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 06:04:44 2006
New Revision: 6940

Log:
ajax functionality has been modified

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 Wed Jun  7 06:04:44 2006
@@ -21,27 +21,26 @@
 <script type="text/javascript" src="modules/{$MODULE}/{$SINGLE_MOD}.js"></script>
 
 <script type="text/javascript">
-
-function ajaxResponse(response)
-{ldelim}
-        document.getElementById('autocom').innerHTML = response.responseText;
-        document.getElementById('autocom').style.display="block";
-        hide('vtbusy_info');
-{rdelim}
-
 function sensex_info()
 {ldelim}
-        var Ticker = document.getElementById('tickersymbol').value;
+        var Ticker = $('tickersymbol').value;
         if(Ticker!='')
         {ldelim}
-                show('vtbusy_info');
-                var ajaxObj = new VtigerAjax(ajaxResponse);
-                //var Ticker = document.getElementById('tickersymbol').value;
-                var urlstring = "module={$MODULE}&action=Tickerdetail&tickersymbol="+Ticker;
-                ajaxObj.process("index.php?",urlstring);
+                $("vtbusy_info").style.display="inline";
+                new Ajax.Request(
+                      'index.php',
+                      {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+                                method: 'post',
+                                postBody: 'module={$MODULE}&action=Tickerdetail&tickersymbol='+Ticker,
+                                onComplete: function(response) {ldelim}
+                                        $('autocom').innerHTML = response.responseText;
+                                        $('autocom').style.display="block";
+                                        $("vtbusy_info").style.display="none";
+                                {rdelim}
+                        {rdelim}
+                );
         {rdelim}
 {rdelim}
-
 </script>
 
 		{include file='Buttons_List1.tpl'}

Modified: vtigercrm/trunk/Smarty/templates/salesEditView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/salesEditView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/salesEditView.tpl Wed Jun  7 06:04:44 2006
@@ -20,24 +20,24 @@
 <script type="text/javascript" src="jscalendar/calendar-setup.js"></script>
 <script type="text/javascript" src="modules/{$MODULE}/{$SINGLE_MOD}.js"></script>
 <script type="text/javascript">
-
-function ajaxResponse(response)
-{ldelim}
-        document.getElementById('autocom').innerHTML = response.responseText;
-        document.getElementById('autocom').style.display="block";
-        hide('vtbusy_info');
-{rdelim}
-
 function sensex_info()
 {ldelim}
-        var Ticker = document.getElementById('tickersymbol').value;
+        var Ticker = $('tickersymbol').value;
         if(Ticker!='')
         {ldelim}
-                show('vtbusy_info');
-                var ajaxObj = new VtigerAjax(ajaxResponse);
-                //var Ticker = document.getElementById('tickersymbol').value;
-                var urlstring = "module={$MODULE}&action=Tickerdetail&tickersymbol="+Ticker;
-                ajaxObj.process("index.php?",urlstring);
+                $("vtbusy_info").style.display="inline";
+                new Ajax.Request(
+                      'index.php',
+                      {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+                                method: 'post',
+                                postBody: 'module={$MODULE}&action=Tickerdetail&tickersymbol='+Ticker,
+                                onComplete: function(response) {ldelim}
+                                        $('autocom').innerHTML = response.responseText;
+                                        $('autocom').style.display="block";
+                                        $("vtbusy_info").style.display="none";
+                                {rdelim}
+                        {rdelim}
+                );
         {rdelim}
 {rdelim}
 </script>



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 05:25:39 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 12:25:39 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6941 -
	/vtigercrm/trunk/Smarty/templates/Popup.tpl
Message-ID: <20060607122539.066667E85EF@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 06:25:34 2006
New Revision: 6941

Log:
ajax functionality has been modified

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

Modified: vtigercrm/trunk/Smarty/templates/Popup.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Popup.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Popup.tpl Wed Jun  7 06:25:34 2006
@@ -15,7 +15,7 @@
 <link rel="stylesheet" type="text/css" href="{$THEME_PATH}style.css">
 <script language="JavaScript" type="text/javascript" src="include/js/general.js"></script>
 <script language="JavaScript" type="text/javascript" src="modules/{$MODULE}/{$SINGLE_MOD}.js"></script>
-<script language="JavaScript" type="text/javascript" src="include/js/ajax.js"></script>
+<script language="javascript" type="text/javascript" src="include/scriptaculous/prototype.js"></script>
 <script type="text/javascript">
 function add_data_to_relatedlist(entity_id,recordid) {ldelim}
 
@@ -85,17 +85,25 @@
     {rdelim}
 	search_fld_val= document.basicSearch.search_field[document.basicSearch.search_field.selectedIndex].value;
     search_txt_val=document.basicSearch.search_text.value;
-    var ajaxObj = new VtigerAjax(ajaxSaveResponse);
     var urlstring = '';
     if(searchtype == 'Basic')
     {ldelim}
-       urlstring = 'search_field='+search_fld_val+'&searchtype=BasicSearch&search_text='+search_txt_val;
-	{rdelim}
-	popuptype = document.getElementById('popup_type').value;
+	urlstring = 'search_field='+search_fld_val+'&searchtype=BasicSearch&search_text='+search_txt_val;
+    {rdelim}
+	popuptype = $('popup_type').value;
 	urlstring += '&popuptype='+popuptype;
 	urlstring = urlstring +'&query=true&file=Popup&module={$MODULE}&action={$MODULE}Ajax&ajax=true';
 	urlstring +=gethiddenelements();
-	ajaxObj.process("index.php?",urlstring);
+	new Ajax.Request(
+		'index.php',
+		{ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+				method: 'post',
+				postBody: urlstring,
+				onComplete: function(response) {ldelim}
+					$("ListViewContents").innerHTML= response.responseText;
+				{rdelim}
+			{rdelim}
+		);
 {rdelim}	
 function alphabetic(module,url,dataid)
 {ldelim}
@@ -105,10 +113,18 @@
 	getObj(data_td_id).className = 'searchAlph';
     {rdelim}
     getObj(dataid).className = 'searchAlphselected';
-    var ajaxObj = new VtigerAjax(ajaxSaveResponse);
     var urlstring ="module="+module+"&action="+module+"Ajax&file=Popup&ajax=true&"+url;
     urlstring +=gethiddenelements();
-    ajaxObj.process("index.php?",urlstring);
+    new Ajax.Request(
+                'index.php',
+                {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+                                method: 'post',
+                                postBody: urlstring,
+                                onComplete: function(response) {ldelim}
+                                        $("ListViewContents").innerHTML= response.responseText;
+				{rdelim}
+			{rdelim}
+		);
 {rdelim}
 function gethiddenelements()
 {ldelim}
@@ -124,16 +140,20 @@
 	return urlstring;
 {rdelim}
 																									
-function ajaxSaveResponse(response)
-{ldelim}
-	document.getElementById("ListViewContents").innerHTML= response.responseText;
-{rdelim}
 function getListViewEntries_js(module,url)
 {ldelim}
-        var ajaxObj = new VtigerAjax(ajaxSaveResponse);
 	popuptype = document.getElementById('popup_type').value;
         var urlstring ="module="+module+"&action="+module+"Ajax&popuptype="+popuptype+"&file=Popup&ajax=true&"+url;
     	urlstring +=gethiddenelements();
-        ajaxObj.process("index.php?",urlstring);
+	new Ajax.Request(
+                'index.php',
+                {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+                                method: 'post',
+                                postBody: urlstring,
+                                onComplete: function(response) {ldelim}
+                                        $("ListViewContents").innerHTML= response.responseText;
+				{rdelim}
+			{rdelim}
+		);
 {rdelim}
 </script>



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 05:30:46 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 12:30:46 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6942 - in
 /vtigercrm/trunk/Smarty/templates: HomePage.tpl MySites.tpl
Message-ID: <20060607123046.DDB447E8601@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 06:30:42 2006
New Revision: 6942

Log:
ajax.js has been removed

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

Modified: vtigercrm/trunk/Smarty/templates/HomePage.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/HomePage.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/HomePage.tpl Wed Jun  7 06:30:42 2006
@@ -10,7 +10,6 @@
  ********************************************************************************/
 -->*}
 <script language="javascript" type="text/javascript" src="include/scriptaculous/prototype.js"></script>
-<script language="JavaScript" type="text/javascript" src="include/js/ajax.js"></script>
 <script language="javascript" type="text/javascript" src="include/scriptaculous/scriptaculous.js"></script>
 <script language="javascript" type="text/javascript" src="include/scriptaculous/effects.js"></script>
 <script language="javascript" type="text/javascript" src="include/scriptaculous/builder.js"></script>

Modified: vtigercrm/trunk/Smarty/templates/MySites.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/MySites.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/MySites.tpl Wed Jun  7 06:30:42 2006
@@ -14,7 +14,6 @@
 
 <script src="include/scriptaculous/prototype.js" type="text/javascript"></script>
 <script src="include/scriptaculous/scriptaculous.js" type="text/javascript"></script>
-<script language="JavaScript" type="text/javascript" src="include/js/ajax.js"></script>
 <script language="JavaScript" type="text/javascript" src="modules/Portal/Portal.js"></script>
 
 {include file="Buttons_List1.tpl"}



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 05:40:35 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 12:40:35 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6943 -
 /vtigercrm/trunk/Smarty/templates/Inventory/InventoryActions.tpl
Message-ID: <20060607124035.C65977E85D2@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 06:40:30 2006
New Revision: 6943

Log:
i18n Updated for Inventory Modules - ahmed

Modified:
    vtigercrm/trunk/Smarty/templates/Inventory/InventoryActions.tpl

Modified: vtigercrm/trunk/Smarty/templates/Inventory/InventoryActions.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Inventory/InventoryActions.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Inventory/InventoryActions.tpl Wed Jun  7 06:40:30 2006
@@ -37,25 +37,25 @@
 	   <tr>
 		<td align="left" style="padding-left:10px;">
 			<img src="{$IMAGE_PATH}pointer.gif" hspace="5" align="absmiddle"/>
-			<a href="javascript: document.DetailView.module.value='Quotes'; document.DetailView.action.value='EditView'; document.DetailView.return_module.value='Products'; document.DetailView.return_action.value='DetailView'; document.DetailView.return_id.value='{$ID}'; document.DetailView.parent_id.value='{$ID}'; document.DetailView.product_id.value='{$ID}'; document.DetailView.record.value=''; document.DetailView.submit();" class="webMnu">Create Quote</a> 
-		</td>
-	   </tr>
-	   <tr>
-		<td align="left" style="padding-left:10px;">
-			<img src="{$IMAGE_PATH}pointer.gif" hspace="5" align="absmiddle"/>
-			<a href="javascript: document.DetailView.module.value='Invoice'; document.DetailView.action.value='EditView'; document.DetailView.return_module.value='Products'; document.DetailView.return_action.value='DetailView'; document.DetailView.return_id.value='{$ID}'; document.DetailView.parent_id.value='{$ID}'; document.DetailView.product_id.value='{$ID}'; document.DetailView.record.value=''; document.DetailView.submit();" class="webMnu">Create Invoice</a> 
-		</td>
-	   </tr>
-	   <tr>
-		<td align="left" style="padding-left:10px;">
-			<img src="{$IMAGE_PATH}pointer.gif" hspace="5" align="absmiddle"/>
-			<a href="javascript: document.DetailView.module.value='SalesOrder'; document.DetailView.action.value='EditView'; document.DetailView.return_module.value='Products'; document.DetailView.return_action.value='DetailView'; document.DetailView.return_id.value='{$ID}'; document.DetailView.parent_id.value='{$ID}'; document.DetailView.product_id.value='{$ID}'; document.DetailView.record.value=''; document.DetailView.submit();" class="webMnu">Create SalesOrder</a> 
-		</td>
-	   </tr>
-	   <tr>
-		<td align="left" style="padding-left:10px;">
-			<img src="{$IMAGE_PATH}pointer.gif" hspace="5" align="absmiddle"/>
-			<a href="javascript: document.DetailView.module.value='PurchaseOrder'; document.DetailView.action.value='EditView'; document.DetailView.return_module.value='Products'; document.DetailView.return_action.value='DetailView'; document.DetailView.return_id.value='{$ID}'; document.DetailView.parent_id.value='{$ID}'; document.DetailView.product_id.value='{$ID}'; document.DetailView.record.value=''; document.DetailView.submit();" class="webMnu">Create PurchaseOrder</a> 
+			<a href="javascript: document.DetailView.module.value='Quotes'; document.DetailView.action.value='EditView'; document.DetailView.return_module.value='Products'; document.DetailView.return_action.value='DetailView'; document.DetailView.return_id.value='{$ID}'; document.DetailView.parent_id.value='{$ID}'; document.DetailView.product_id.value='{$ID}'; document.DetailView.record.value=''; document.DetailView.submit();" class="webMnu">{$APP.LBL_CREATE_BUTTON_LABEL} {$APP.Quote}</a> 
+		</td>
+	   </tr>
+	   <tr>
+		<td align="left" style="padding-left:10px;">
+			<img src="{$IMAGE_PATH}pointer.gif" hspace="5" align="absmiddle"/>
+			<a href="javascript: document.DetailView.module.value='Invoice'; document.DetailView.action.value='EditView'; document.DetailView.return_module.value='Products'; document.DetailView.return_action.value='DetailView'; document.DetailView.return_id.value='{$ID}'; document.DetailView.parent_id.value='{$ID}'; document.DetailView.product_id.value='{$ID}'; document.DetailView.record.value=''; document.DetailView.submit();" class="webMnu">{$APP.LBL_CREATE_BUTTON_LABEL} {$APP.Invoice}</a> 
+		</td>
+	   </tr>
+	   <tr>
+		<td align="left" style="padding-left:10px;">
+			<img src="{$IMAGE_PATH}pointer.gif" hspace="5" align="absmiddle"/>
+			<a href="javascript: document.DetailView.module.value='SalesOrder'; document.DetailView.action.value='EditView'; document.DetailView.return_module.value='Products'; document.DetailView.return_action.value='DetailView'; document.DetailView.return_id.value='{$ID}'; document.DetailView.parent_id.value='{$ID}'; document.DetailView.product_id.value='{$ID}'; document.DetailView.record.value=''; document.DetailView.submit();" class="webMnu">{$APP.LBL_CREATE_BUTTON_LABEL} {$APP.SalesOrder}</a> 
+		</td>
+	   </tr>
+	   <tr>
+		<td align="left" style="padding-left:10px;">
+			<img src="{$IMAGE_PATH}pointer.gif" hspace="5" align="absmiddle"/>
+			<a href="javascript: document.DetailView.module.value='PurchaseOrder'; document.DetailView.action.value='EditView'; document.DetailView.return_module.value='Products'; document.DetailView.return_action.value='DetailView'; document.DetailView.return_id.value='{$ID}'; document.DetailView.parent_id.value='{$ID}'; document.DetailView.product_id.value='{$ID}'; document.DetailView.record.value=''; document.DetailView.submit();" class="webMnu">{$APP.LBL_CREATE_BUTTON_LABEL} {$APP.PurchaseOrder}</a> 
 		</td>
 	   </tr>
 	   <!--
@@ -91,7 +91,7 @@
 	   <tr>
 		<td align="left" style="padding-left:10px;">
 			<img src="{$IMAGE_PATH}pointer.gif" hspace="5" align="absmiddle"/>
-			<a href="javascript: document.DetailView.module.value='PurchaseOrder'; document.DetailView.action.value='EditView'; document.DetailView.return_module.value='Vendors'; document.DetailView.return_action.value='DetailView'; document.DetailView.return_id.value='{$ID}'; document.DetailView.parent_id.value='{$ID}'; document.DetailView.vendor_id.value='{$ID}'; document.DetailView.record.value=''; document.DetailView.submit();" class="webMnu">Create PurchaseOrder</a> 
+			<a href="javascript: document.DetailView.module.value='PurchaseOrder'; document.DetailView.action.value='EditView'; document.DetailView.return_module.value='Vendors'; document.DetailView.return_action.value='DetailView'; document.DetailView.return_id.value='{$ID}'; document.DetailView.parent_id.value='{$ID}'; document.DetailView.vendor_id.value='{$ID}'; document.DetailView.record.value=''; document.DetailView.submit();" class="webMnu">{$APP.LBL_CREATE_BUTTON_LABEL} {$APP.PurchaseOrder}</a> 
 		</td>
 	   </tr>
 	   <!--
@@ -121,7 +121,7 @@
 	   <tr>
 		<td align="left" style="padding-left:10px;">
 			<img src="{$IMAGE_PATH}pointer.gif" hspace="5" align="absmiddle"/>
-			<a href="javascript: document.DetailView.module.value='Invoice'; document.DetailView.action.value='EditView'; document.DetailView.return_module.value='SalesOrder'; document.DetailView.return_action.value='DetailView'; document.DetailView.return_id.value='{$ID}'; document.DetailView.record.value='{$ID}'; document.DetailView.convertmode.value='sotoinvoice'; document.DetailView.submit();" class="webMnu">Create Invoice</a> 
+			<a href="javascript: document.DetailView.module.value='Invoice'; document.DetailView.action.value='EditView'; document.DetailView.return_module.value='SalesOrder'; document.DetailView.return_action.value='DetailView'; document.DetailView.return_id.value='{$ID}'; document.DetailView.record.value='{$ID}'; document.DetailView.convertmode.value='sotoinvoice'; document.DetailView.submit();" class="webMnu">{$APP.LBL_CREATE_BUTTON_LABEL} {$APP.Invoice}</a> 
 		</td>
 	   </tr>
 	   <!--
@@ -145,13 +145,13 @@
 	   <tr>
 		<td align="left" style="padding-left:10px;">
 			<img src="{$IMAGE_PATH}pointer.gif" hspace="5" align="absmiddle"/> 
-			<a href="javascript: document.DetailView.return_module.value='{$MODULE}'; document.DetailView.return_action.value='DetailView'; document.DetailView.convertmode.value='{$CONVERTMODE}'; document.DetailView.module.value='Invoice'; document.DetailView.action.value='EditView'; document.DetailView.return_id.value='{$ID}'; document.DetailView.submit();" class="webMnu">Generate Invoice</a> 
+			<a href="javascript: document.DetailView.return_module.value='{$MODULE}'; document.DetailView.return_action.value='DetailView'; document.DetailView.convertmode.value='{$CONVERTMODE}'; document.DetailView.module.value='Invoice'; document.DetailView.action.value='EditView'; document.DetailView.return_id.value='{$ID}'; document.DetailView.submit();" class="webMnu">{$APP.LBL_GENERATE} {$APP.Invoice}</a> 
 		</td>
 	   </tr>
 	   <tr>
 		<td align="left" style="padding-left:10px;border-bottom:1px dotted #CCCCCC;">
 			<img src="{$IMAGE_PATH}pointer.gif" hspace="5" align="absmiddle"/>
-			<a href="javascript: document.DetailView.return_module.value='SalesOrder'; document.DetailView.return_action.value='DetailView'; document.DetailView.convertmode.value='quotetoso'; document.DetailView.module.value='SalesOrder'; document.DetailView.action.value='EditView'; document.DetailView.submit();" class="webMnu">Generate Sales Order</a> 
+			<a href="javascript: document.DetailView.return_module.value='SalesOrder'; document.DetailView.return_action.value='DetailView'; document.DetailView.convertmode.value='quotetoso'; document.DetailView.module.value='SalesOrder'; document.DetailView.action.value='EditView'; document.DetailView.submit();" class="webMnu">{$APP.LBL_GENERATE} {$APP.SalesOrder}</a> 
 		</td>
 	   </tr>
 	   <!-- Vendors Actions ends -->
@@ -180,7 +180,7 @@
 
    <tr>
 	<td align="left">
-		<span class="genHeaderSmall">Tools</span><br /> 
+		<span class="genHeaderSmall">{$APP.Tools}</span><br /> 
 	</td>
    </tr>
 
@@ -199,7 +199,7 @@
    <tr>
 	<td align="left" style="padding-left:10px;">
 		<img src="{$IMAGE_PATH}pointer.gif" hspace="5" align="absmiddle"/>
-		<a href="javascript: document.DetailView.return_module.value='{$MODULE}'; document.DetailView.return_action.value='DetailView'; document.DetailView.module.value='{$MODULE}'; document.DetailView.action.value='{$export_pdf_action}'; document.DetailView.record.value='{$ID}'; document.DetailView.return_id.value='{$ID}'; document.DetailView.submit();" class="webMnu">Export To PDF</a> 
+		<a href="javascript: document.DetailView.return_module.value='{$MODULE}'; document.DetailView.return_action.value='DetailView'; document.DetailView.module.value='{$MODULE}'; document.DetailView.action.value='{$export_pdf_action}'; document.DetailView.record.value='{$ID}'; document.DetailView.return_id.value='{$ID}'; document.DetailView.submit();" class="webMnu">{$APP.LBL_EXPORT_TO_PDF}</a> 
 	</td>
    </tr>
 



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 05:42:44 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 12:42:44 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6944 -
	/vtigercrm/trunk/modules/Calendar/script.js
Message-ID: <20060607124244.088757E85D2@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 06:42:41 2006
New Revision: 6944

Log:
ajax functionality has been modified

Modified:
    vtigercrm/trunk/modules/Calendar/script.js

Modified: vtigercrm/trunk/modules/Calendar/script.js
==============================================================================
--- vtigercrm/trunk/modules/Calendar/script.js (original)
+++ vtigercrm/trunk/modules/Calendar/script.js Wed Jun  7 06:42:41 2006
@@ -391,23 +391,20 @@
 	usr_id.value = selectedColStr;
 }
 
-function ajaxCalSaveResponse(response)
-{
-	document.getElementById("hrView_default").style.display = "none";
-        document.getElementById("toggleDiv").innerHTML=response.responseText;
-}
-
-function fnRedirect(view,hour,day,month,year){
-	var ajaxObj = new VtigerAjax(ajaxCalSaveResponse);
-	var tagName =  document.getElementById('viewBox');
-	var OptionData = tagName.options[tagName.selectedIndex].value;
-	if(OptionData == 'hourview'){
-		var urlstring ="module=Calendar&action=CalendarAjax&view="+view+"&hour="+hour+"&day="+day+"&month="+month+"&year="+year+"&type="+OptionData+"&parenttab=My Home Page&ajax=true";
-	}
-	else if(OptionData == 'listview'){
-		var urlstring ="module=Calendar&action=CalendarAjax&view="+view+"&hour="+hour+"&day="+day+"&month="+month+"&year="+year+"&type="+OptionData+"&parenttab=My Home Page&ajax=true";
-	}
-	ajaxObj.process("index.php?",urlstring);
+function fnRedirect(view,hour,day,month,year) {
+        var OptionData = $('viewBox').options[$('viewBox').selectedIndex].value;
+        new Ajax.Request(
+                'index.php',
+                {queue: {position: 'end', scope: 'command'},
+                        method: 'post',
+                        postBody: 'module=Calendar&action=CalendarAjax&view='+view+'&hour='+hour+'&day='+day+'&month='+month+'&year='+year+'&type='+OptionData+'&parenttab=My Home Page&ajax=true',
+                        onComplete: function(response) {
+                                $("hrView_default").style.display = "none";
+                                $("toggleDiv").innerHTML=response.responseText;
+                        }
+                }
+
+          );
 }
 
 function fnAddEvent(obj,CurrObj,start_date,end_date,start_hr,start_min,start_fmt,end_hr,end_min,end_fmt){
@@ -431,29 +428,32 @@
 		var tagName = document.getElementById('addEventDropDown').style.display= 'block';
 }
 
-function ajaxMiniCalSaveResponse(response)
-{
-        document.getElementById("miniCal").innerHTML=response.responseText;
-}
-
-function getMiniCal()
-{
-	var ajaxObj = new VtigerAjax(ajaxMiniCalSaveResponse);
-	var urlstring ="module=Calendar&action=CalendarAjax&type=minical&parenttab=My Home Page&ajax=true";
-	ajaxObj.process("index.php?",urlstring);
-	
-}
-
-function getCalSettings()
-{
-	 var ajaxObj = new VtigerAjax(ajaxCalSettingsSaveResponse);
-	 var urlstring ="module=Calendar&action=CalendarAjax&type=settings&parenttab=My Home Page&ajax=true";
-	 ajaxObj.process("index.php?",urlstring);
-}
-
-function ajaxCalSettingsSaveResponse(response)
-{
-        document.getElementById("calSettings").innerHTML=response.responseText;
+function getMiniCal(){
+        new Ajax.Request(
+                'index.php',
+                {queue: {position: 'end', scope: 'command'},
+                        method: 'post',
+                        postBody: 'module=Calendar&action=CalendarAjax&type=minical&parenttab=My Home Page&ajax=true',
+                        onComplete: function(response) {
+                                $("miniCal").innerHTML=response.responseText;
+                        }
+                }
+
+          );
+}
+
+function getCalSettings(){
+        new Ajax.Request(
+                'index.php',
+                {queue: {position: 'end', scope: 'command'},
+                        method: 'post',
+                        postBody: 'module=Calendar&action=CalendarAjax&type=settings&parenttab=My Home Page&ajax=true',
+                        onComplete: function(response) {
+                                $("calSettings").innerHTML=response.responseText;
+                        }
+                }
+
+          );
 }
 
 function getcalAction(obj,Lay,id,view,hour,day,month,year,type){



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 05:43:34 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 12:43:34 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6945 -
	/vtigercrm/trunk/include/language/en_us.lang.php
Message-ID: <20060607124334.CA86C7E85D2@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 06:43:31 2006
New Revision: 6945

Log:
lang file updated

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

Modified: vtigercrm/trunk/include/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/include/language/en_us.lang.php (original)
+++ vtigercrm/trunk/include/language/en_us.lang.php Wed Jun  7 06:43:31 2006
@@ -137,6 +137,8 @@
 'LBL_SELECT_BUTTON_TITLE'=>'Select [Alt+T]',
 
 'LBL_CREATE_BUTTON_LABEL' =>'Create',
+
+'LBL_GENERATE'=>'Generate',
 
 'LBL_SAVE_BUTTON_KEY'=>'S',
 



From vtiger-tickets at vtiger.fosslabs.com  Wed Jun  7 06:03:54 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 07 Jun 2006 13:03:54 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231277=3A?=
 =?utf-8?q?_Can=27t_translate_term_close_without_problem?=
Message-ID: <076.d518c5251779ede24caf171d8d809788@vtiger.fosslabs.com>

#1277: Can't translate term close without problem
-----------------------+----------------------------------------------------
 Reporter:  abos       |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  major      |   Milestone:  5.0.0    
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 If english term close is translated in lang file, we have problem.
 See screenshot.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1277>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 06:05:40 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 13:05:40 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6946 -
	/vtigercrm/trunk/include/js/ListView.js
Message-ID: <20060607130540.9977E7E8611@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 07:05:36 2006
New Revision: 6946

Log:
ajax functionality has been modified

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

Modified: vtigercrm/trunk/include/js/ListView.js
==============================================================================
--- vtigercrm/trunk/include/js/ListView.js (original)
+++ vtigercrm/trunk/include/js/ListView.js Wed Jun  7 07:05:36 2006
@@ -92,10 +92,22 @@
         }
 		if(confirm("Are you sure you want to delete the selected "+xx+" records ?"))
 		{
-			show("status");
-			var ajaxObj = new VtigerAjax(ajaxSaveResponse);
-			var urlstring ="module=Users&action=massdelete&return_module="+module+"&viewname="+viewid+"&idlist="+idstring;
-	    	ajaxObj.process("index.php?",urlstring);
+			
+			$("status").style.display="inline";
+			new Ajax.Request(
+          	  	      'index.php',
+			      	{queue: {position: 'end', scope: 'command'},
+		                        method: 'post',
+                		        postBody:"module=Users&action=massdelete&return_module="+module+"&viewname="+viewid+"&idlist="+idstring,
+		                        onComplete: function(response) {
+        	        	                $("status").style.display="none";
+                	        	        result = response.responseText.split('&#&#&#');
+                        	        	$("ListViewContents").innerHTML= result[2];
+	                        	        if(result[1] != '')
+                                        		alert(result[1]);
+		                        }
+              			 }
+       			);
 		}
 		else
 		{
@@ -106,23 +118,45 @@
 
 function showDefaultCustomView(selectView,module)
 {
-
-		show("status");
-		var ajaxObj = new VtigerAjax(ajaxSaveResponse);
-		var viewName = selectView.options[selectView.options.selectedIndex].value;
-		var urlstring ="module="+module+"&action="+module+"Ajax&file=ListView&ajax=true&start=1&viewname="+viewName;
-	    ajaxObj.process("index.php?",urlstring);
+	$("status").style.display="inline";
+	var viewName = selectView.options[selectView.options.selectedIndex].value;
+	new Ajax.Request(
+               	'index.php',
+                {queue: {position: 'end', scope: 'command'},
+                       	method: 'post',
+                        postBody:"module="+module+"&action="+module+"Ajax&file=ListView&ajax=true&start=1&viewname="+viewName,
+                        onComplete: function(response) {
+                        $("status").style.display="none";
+                        result = response.responseText.split('&#&#&#');
+                        $("ListViewContents").innerHTML= result[2];
+                        if(result[1] != '')
+                               	alert(result[1]);
+                        }
+                }
+	);
 }
 
 
 function getListViewEntries_js(module,url)
 {
-        show("status");
-        var ajaxObj = new VtigerAjax(ajaxSaveResponse);
-        var urlstring ="module="+module+"&action="+module+"Ajax&file=index&ajax=true&"+url;
-	if(document.getElementById('search_url').value!='')
-        	urlstring = urlstring+document.getElementById('search_url').value;
-        ajaxObj.process("index.php?",urlstring);
-
+	$("status").style.display="inline";
+	if($('search_url').value!='')
+                urlstring = $('search_url').value;
+	else
+		urlstring = '';
+        new Ajax.Request(
+        	'index.php',
+                {queue: {position: 'end', scope: 'command'},
+                	method: 'post',
+                        postBody:"module="+module+"&action="+module+"Ajax&file=index&ajax=true&"+url+urlstring,
+			onComplete: function(response) {
+                        	$("status").style.display="none";
+                                result = response.responseText.split('&#&#&#');
+                                $("ListViewContents").innerHTML= result[2];
+                                if(result[1] != '')
+                                        alert(result[1]);
+                  	}
+                }
+        );
 }
 



From vtiger-tickets at vtiger.fosslabs.com  Wed Jun  7 06:07:08 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 07 Jun 2006 13:07:08 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231278=3A?=
 =?utf-8?q?_Translations_for_module_name_in_related_list=2E?=
Message-ID: <076.8117b3de443679e88c0c49ef370ecdbe@vtiger.fosslabs.com>

#1278: Translations for module name in related list.
-----------------------+----------------------------------------------------
 Reporter:  abos       |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  major      |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 Please change the file :
 /Smart/Templates/relatedList.tpl
 ~line 70
 <td  valign=bottom><b>{$APP.$header}</b></td>

 Thanks

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1278>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 06:20:57 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 13:20:57 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6947 -
	/vtigercrm/trunk/modules/Portal/Portal.js
Message-ID: <20060607132057.808515CE14E@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 07:20:53 2006
New Revision: 6947

Log:
ajax functionality has been modified

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

Modified: vtigercrm/trunk/modules/Portal/Portal.js
==============================================================================
--- vtigercrm/trunk/modules/Portal/Portal.js (original)
+++ vtigercrm/trunk/modules/Portal/Portal.js Wed Jun  7 07:20:53 2006
@@ -11,20 +11,23 @@
 
 function fetchAddSite(id)
 {
-	show('status');
-	var ajaxObj = new VtigerAjax(ajaxeditSiteResp);
-	url ='module=Portal&action=PortalAjax&file=Popup&record='+id;
-	ajaxObj.process("index.php?",url);
+	$("status").style.display="inline";
+	new Ajax.Request(
+		'index.php',
+		{queue: {position: 'end', scope: 'command'},
+			method: 'post',
+			postBody:'module=Portal&action=PortalAjax&file=Popup&record='+id,
+			onComplete: function(response) {
+				$("status").style.display="none";
+				$('editportal_cont').innerHTML = response.responseText;
+			}
+		}
+	);
 }
-function ajaxeditSiteResp(response)
-{
-	hide('status');
-	document.getElementById('editportal_cont').innerHTML = response.responseText;
 
-}
 function fetchContents(mode)
 {
-	show('status');
+	$("status").style.display="inline";
 	if(mode == 'data')
 	{
 		getObj('datatab').className = 'SiteSel';
@@ -35,42 +38,61 @@
 		getObj('datatab').className = 'SiteUnSel';
 		getObj('managetab').className = 'SiteSel';
 	}
-	var ajaxObj = new VtigerAjax(ajaxfetchContentsResp);
-	url ='action=PortalAjax&mode=ajax&module=Portal&file=ListView&datamode='+mode;
-	ajaxObj.process("index.php?",url);
-}
-function ajaxfetchContentsResp(response)
-{
-	hide('status');
-	document.getElementById('portalcont').innerHTML = response.responseText;
+	new Ajax.Request(
+                'index.php',
+                {queue: {position: 'end', scope: 'command'},
+                        method: 'post',
+                        postBody:'action=PortalAjax&mode=ajax&module=Portal&file=ListView&datamode='+mode,
+                        onComplete: function(response) {
+                                $("status").style.display="none";
+                                $('portalcont').innerHTML = response.responseText;
+                        }
+                }
+        );
 }
 function DeleteSite(id)
 {
 	if(confirm("Are you sure you want to delete ?"))
 	{
-		show('status');
-		var ajaxObj = new VtigerAjax(ajaxfetchContentsResp);
-		url ='action=PortalAjax&mode=ajax&file=Delete&module=Portal&record='+id;
-		ajaxObj.process("index.php?",url);
+		$("status").style.display="inline";
+		new Ajax.Request(
+          	      'index.php',
+                	{queue: {position: 'end', scope: 'command'},
+                        	method: 'post',
+	                        postBody:'action=PortalAjax&mode=ajax&file=Delete&module=Portal&record='+id,
+        	                onComplete: function(response) {
+                	                $("status").style.display="none";
+                        	        $('portalcont').innerHTML = response.responseText;
+                        	}
+                	}
+        	);
 	}
 }
 function SaveSite(id)
 {
-	var ajaxObj = new VtigerAjax(ajaxfetchContentsResp);
-	if (document.getElementById('portalurl').value.replace(/^\s+/g, '').replace(/\s+$/g, '').length==0) {
+	if ($('portalurl').value.replace(/^\s+/g, '').replace(/\s+$/g, '').length==0) {
 		alert('Site Url cannot be empty')
 		return false;
 	}
-	if (document.getElementById('portalname').value.replace(/^\s+/g, '').replace(/\s+$/g, '').length==0) {
+	if ($('portalname').value.replace(/^\s+/g, '').replace(/\s+$/g, '').length==0) {
 		alert('Site Name cannot be empty')
 		return false;
 	}
 	Effect.Puff('orgLay');	
-	show('status');
+	$("status").style.display="inline";
 	var portalurl = document.getElementById('portalurl').value;
 	var portalname = document.getElementById('portalname').value;
-	url ='action=PortalAjax&mode=ajax&file=Save&module=Portal&portalname='+portalname+'&portalurl='+portalurl+'&record='+id;
-	ajaxObj.process("index.php?",url);
+        new Ajax.Request(
+        	'index.php',
+                {queue: {position: 'end', scope: 'command'},
+                	method: 'post',
+                        postBody:'action=PortalAjax&mode=ajax&file=Save&module=Portal&portalname='+portalname+'&portalurl='+portalurl+'&record='+id,
+                        onComplete: function(response) {
+                        		$("status").style.display="none";
+                                        $('portalcont').innerHTML = response.responseText;
+                        }
+                }
+	);
 }
 function setSite(oUrllist)
 {



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 06:22:57 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 13:22:57 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6948 -
 /vtigercrm/trunk/Smarty/templates/Settings/InventoryNotifyContents.tpl
Message-ID: <20060607132257.809BB64F6F0@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 07:22:53 2006
New Revision: 6948

Log:
i18n updated for inventory notifications - ahmed

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 Jun  7 07:22:53 2006
@@ -16,7 +16,7 @@
 	<td class="lvtCol" width="5%">#</td>
 	<td class="lvtCol" width="40%">{$CMOD.LBL_NOTIFICATION}</td>
 	<td class="lvtCol" width="50%">{$CMOD.LBL_DESCRIPTION}</td>
-	<td class="lvtCol" width="5%">Tool</td>
+	<td class="lvtCol" width="5%">{$CMOD.Tools}</td>
 	</tr>
 	{foreach name=notifyfor item=elements from=$NOTIFICATION}
 	<tr class="lvtColData" onmouseover="this.className='lvtColDataHover'" onmouseout="this.className='lvtColData'" bgcolor="white">



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 06:50:26 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 13:50:26 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6950 -
 /vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl
Message-ID: <20060607135026.D31A77E85E8@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 07:50:23 2006
New Revision: 6950

Log:
i18n done for Add Priv button - ahmed

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

Modified: vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl Wed Jun  7 07:50:23 2006
@@ -179,7 +179,7 @@
 					  	<img src="{$IMAGE_PATH}arrow.jpg" align="absmiddle">&nbsp;
 						<b>{$APP.$modulename}</b>&nbsp;&nbsp; 
 						</td>
-					 	<td align="right"><input title="New" class="small" type="button" name="Create" value="Add Privileges" onClick="callEditDiv('{$modulename}','create','')"></td>
+					 	<td align="right"><input title="New" class="small" type="button" name="Create" value="{$APP.LBL_ADD_ITEM} {$CMOD.LBL_PRIVILEGES}" onClick="callEditDiv('{$modulename}','create','')"></td>
 				  	</tr>
 				  	<tr>
 				  		<td colspan="2" style="padding: 20px;" bgcolor="#ffffff" align="center">



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 06:51:41 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 13:51:41 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6951 -
	/vtigercrm/trunk/Smarty/templates/Emails.tpl
Message-ID: <20060607135141.28E857E85E8@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 07:51:37 2006
New Revision: 6951

Log:
ajax functionality has been modified

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 Jun  7 07:51:37 2006
@@ -94,10 +94,19 @@
 {rdelim}
 function getListViewEntries_js(module,url)
 {ldelim}
-		show("status");
-        var ajaxObj = new VtigerAjax(ajaxSaveResponse);
-        var urlstring ="module="+module+"&action="+module+"Ajax&file=ListView&ajax=true&"+url;
-        ajaxObj.process("index.php?",urlstring);
+	$("status").style.display="inline";
+	new Ajax.Request(
+		'index.php',
+		{ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+                	method: 'post',
+			postBody: "module="+module+"&action="+module+"Ajax&file=ListView&ajax=true&"+url,
+			onComplete: function(response) {ldelim}
+				$("status").style.display="none";
+				$("email_con").innerHTML=response.responseText;
+				execJS(document.getElementById('email_con'));
+			{rdelim}
+		{rdelim}
+	);
 
 {rdelim}
 </script>



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 07:03:39 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 14:03:39 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6952 -
	/vtigercrm/trunk/modules/Emails/Email.js
Message-ID: <20060607140339.1F0737E8617@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 08:03:35 2006
New Revision: 6952

Log:
ajax functionality has been modified

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

Modified: vtigercrm/trunk/modules/Emails/Email.js
==============================================================================
--- vtigercrm/trunk/modules/Emails/Email.js (original)
+++ vtigercrm/trunk/modules/Emails/Email.js Wed Jun  7 08:03:35 2006
@@ -10,82 +10,27 @@
 
 var gFolderid = 1;
 var gselectedrowid = 0;
-function massDelete()
-{
-		var delete_selected_row = false;
-        x = document.massdelete.selected_id.length;
-        idstring = "";
-        if ( x == undefined)
-        {
-
-                if (document.massdelete.selected_id.checked)
-                {
-					if(document.massdelete.selected_id.value == gselectedrowid)
-					{
-						gselectedrowid = 0;
-						delete_selected_row = true;						
-					}
-                        idstring = document.massdelete.selected_id.value;
-						xx = 1;
-                }
-                else
-                {
-                        alert("Please select atleast one entity");
-                        return false;
-                }
-        }
-        else
-        {
-                xx = 0;
-                for(i = 0; i < x ; i++)
-                {
-                        if(document.massdelete.selected_id[i].checked)
-						{
-							if(document.massdelete.selected_id[i].value == gselectedrowid)
-							{
-								gselectedrowid = 0;
-								delete_selected_row = true;						
-							}
-							idstring = document.massdelete.selected_id[i].value +";"+idstring
-							xx++
-						}
-                }
-                if (xx != 0)
-                {
-                        document.massdelete.idlist.value=idstring;
-                }
-                else
-                {
-                        alert("Please select atleast one entity");
-                        return false;
-                }
-        }
-		if(confirm("Are you sure you want to delete the selected "+xx+" records ?"))
-		{	
-			getObj('search_text').value = '';
-			show("status");
-			if(!delete_selected_row)
-				var ajaxObj = new VtigerAjax(ajaxSaveResponse);
-			else	
-				var ajaxObj = new VtigerAjax(ajaxDelResponse);
-			var urlstring ="module=Users&action=massdelete&folderid="+gFolderid+"&return_module=Emails&idlist="+idstring;
-		    ajaxObj.process("index.php?",urlstring);
-		}
-		else
-		{
-			return false;
-		}
-}
 function DeleteEmail(id)
 {
 	if(confirm("Are you sure you want to delete ?"))
 	{	
 		getObj('search_text').value = '';
 		gselectedrowid = 0;
-		show("status");
-		var ajaxObj = new VtigerAjax(ajaxDelResponse);
-		var urlstring ="module=Users&action=massdelete&return_module=Emails&folderid="+gFolderid+"&idlist="+id;
-	   	ajaxObj.process("index.php?",urlstring);
+		$("status").style.display="inline";
+                new Ajax.Request(
+                        'index.php',
+                        {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+                                method: 'post',
+                                postBody: "module=Users&action=massdelete&return_module=Emails&folderid="+gFolderid+"&idlist="+id,
+                                onComplete: function(response) {ldelim}
+                                                $("status").style.display="none";
+                                                $('EmailDetails').innerHTML = '<table valign="top" border="0" cellpadding="0" cellspacing="0" width="100%"><tbody><tr><td class="forwardBg"><table border="0" cellpadding="0" cellspacing="0" width="100%"><tbody><tr><td colspan="2">&nbsp;</td></tr></tbody></table></td></tr><tr><td style="padding-top: 10px;" bgcolor="#ffffff" height="300" valign="top"></td></tr></tbody></table>';
+                                                $("subjectsetter").innerHTML='';
+                                                $("email_con").innerHTML=response.responseText;
+                                                execJS($('email_con'));
+                                {rdelim}
+                        {rdelim}
+                );
 	}
 	else
 	{
@@ -98,8 +43,19 @@
 	var osearch_field = document.getElementById('search_field');
 	var search_field = osearch_field.options[osearch_field.options.selectedIndex].value;
 	var search_text = document.getElementById('search_text').value;
-	var ajaxObj = new VtigerAjax(ajaxDelResponse);
-	var urlstring ="module=Emails&action=EmailsAjax&ajax=true&file=ListView&folderid="+gFolderid+"&search=true&search_field="+search_field+"&search_text="+search_text;
-    ajaxObj.process("index.php?",urlstring);
+	new Ajax.Request(
+                'index.php',
+                {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+                        method: 'post',
+                        postBody: "module=Emails&action=EmailsAjax&ajax=true&file=ListView&folderid="+gFolderid+"&search=true&search_field="+search_field+"&search_text="+search_text,
+                        onComplete: function(response) {ldelim}
+                                        $("status").style.display="none";
+                                        $('EmailDetails').innerHTML = '<table valign="top" border="0" cellpadding="0" cellspacing="0" width="100%"><tbody><tr><td class="forwardBg"><table border="0" cellpadding="0" cellspacing="0" width="100%"><tbody><tr><td colspan="2">&nbsp;</td></tr></tbody></table></td></tr><tr><td style="padding-top: 10px;" bgcolor="#ffffff" height="300" valign="top"></td></tr></tbody></table>';
+                                        $("subjectsetter").innerHTML='';
+                                        $("email_con").innerHTML=response.responseText;
+                                        execJS($('email_con'));
+                        {rdelim}
+                {rdelim}
+        );
 }
 



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 07:08:06 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 14:08:06 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6953 -
	/vtigercrm/trunk/modules/Faq/Faq.js
Message-ID: <20060607140806.2B87D7E8617@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 08:08:02 2006
New Revision: 6953

Log:
unwanted js functions have been removed

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

Modified: vtigercrm/trunk/modules/Faq/Faq.js
==============================================================================
--- vtigercrm/trunk/modules/Faq/Faq.js (original)
+++ vtigercrm/trunk/modules/Faq/Faq.js Wed Jun  7 08:08:02 2006
@@ -7,60 +7,6 @@
  * All Rights Reserved.
  *
  ********************************************************************************/
-
-
-function massDelete()
-{
-	x = document.massdelete.selected_id.length;
-	idstring = "";
-
-	if ( x == undefined)
-	{
-	
-		if (document.massdelete.selected_id.checked)
-		{
-			document.massdelete.idlist.value=document.massdelete.selected_id.value;
-		}
-		else 
-		{
-			alert("Please select atleast one entity");
-			return false;
-		}
-	}
-	else
-	{
-		xx = 0;
-		for(i = 0; i < x ; i++)
-		{
-			if(document.massdelete.selected_id[i].checked)
-			{
-				idstring = document.massdelete.selected_id[i].value +";"+idstring
-			xx++	
-			}
-		}
-		if (xx != 0)
-		{
-			document.massdelete.idlist.value=idstring;
-		}
-		else
-		{
-			alert("Please select atleast one entity");
-			return false;
-		}
-	}
-	if(confirm("Are you sure you want to delete the selected "+xx+" records ?"))
-    {
-		show("status");
-		var ajaxObj = new VtigerAjax(ajaxSaveResponse);
-		var urlstring ="module=Users&action=massdelete&return_module=Faq&idlist="+idstring;
-	    ajaxObj.process("index.php?",urlstring);
-	}
-	else
-	{
-		return false;
-	}
-}
-
 
 function clear_form(form) 
 {



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 07:21:58 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 14:21:58 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6954 -
	/vtigercrm/trunk/include/js/dtlviewajax.js
Message-ID: <20060607142158.866F77E8614@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 08:21:54 2006
New Revision: 6954

Log:
ajax functionality has been modified

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

Modified: vtigercrm/trunk/include/js/dtlviewajax.js
==============================================================================
--- vtigercrm/trunk/include/js/dtlviewajax.js (original)
+++ vtigercrm/trunk/include/js/dtlviewajax.js Wed Jun  7 08:21:54 2006
@@ -65,19 +65,6 @@
      return false;
 }
 
-function dtlViewAjaxResponse(response)
-{
-     var item = response.responseText;
-     if(item.indexOf(":#:FAILURE")>-1)
-     {
-          alert("Error while Editing");
-     }
-     else if(item.indexOf(":#:SUCCESS")>-1)
-     {
-          fnhide("vtbusy_info");
-     }
-}
-
 function trim(str)
 {
 	return(str.replace(/\s+$/,''));
@@ -118,10 +105,24 @@
 
 	var data = "file=DetailViewAjax&module=" + module + "&action=" + module + "Ajax&recordid=" + crmId ;
 	data = data + "&fldName=" + fieldName + "&fieldValue=" + escape(tagValue) + "&ajxaction=DETAILVIEW";
-	show("vtbusy_info");
-
-	var ajaxObj = new VtigerAjax(dtlViewAjaxResponse);
-	ajaxObj.process("index.php?",data);
+	$("vtbusy_info").style.display="inline";
+	new Ajax.Request(
+		'index.php',
+                {queue: {position: 'end', scope: 'command'},
+                        method: 'post',
+                        postBody: data,
+                        onComplete: function(response) {
+				if(response.responseText.indexOf(":#:FAILURE")>-1)
+				{
+					alert("Error while Editing");
+				}
+				else if(item.indexOf(":#:SUCCESS")>-1)
+     				{
+					$("vtbusy_info").style.display="none";
+     				}
+                       	}
+                }
+        );
 	if(uitype == '13')
 	{
 		getObj(dtlView).innerHTML = "<a href=\"mailto:"+ tagValue+"\" target=\"_blank\">"+tagValue+"&nbsp;</a>";
@@ -220,23 +221,23 @@
 	itsonview=false;
 }
 
-
-function dtlViewAjaxTagResponse(response)
-{
-     var item = response.responseText;
-	 getObj('tagfields').innerHTML = item;
-     fnhide("vtbusy_info");
-}
-
 function SaveTag(txtBox,crmId,module)
 {
 	var tagValue = document.getElementById(txtBox).value;
 	document.getElementById(txtBox).value ='';
-    var data = "file=TagCloud&module=" + module + "&action=" + module + "Ajax&recordid=" + crmId + "&ajxaction=SAVETAG&tagfields=" +tagValue;
+	$("vtbusy_info").style.display="inline";
+	new Ajax.Request(
+		'index.php',
+                {queue: {position: 'end', scope: 'command'},
+                        method: 'post',
+                        postBody: "file=TagCloud&module=" + module + "&action=" + module + "Ajax&recordid=" + crmId + "&ajxaction=SAVETAG&tagfields=" +tagValue,
+                        onComplete: function(response) {
+				        getObj('tagfields').innerHTML = response.responseText;
+					$("vtbusy_info").style.display="none";
+                        }
+                }
+        );
     
-	var ajaxObj = new VtigerAjax(dtlViewAjaxTagResponse);
-    ajaxObj.process("index.php?",data);
-   	show("vtbusy_info");
 }
 function setSelectValue(fieldLabel)
 {



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 07:22:38 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 14:22:38 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6955 -
	/vtigercrm/trunk/include/js/ajax.js
Message-ID: <20060607142238.83CCB7E8614@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 08:22:35 2006
New Revision: 6955

Log:
file deleted

Removed:
    vtigercrm/trunk/include/js/ajax.js



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 08:23:58 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 15:23:58 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6956 - in
 /vtigercrm/trunk/Smarty/templates: EditProfile.tpl ProfileDetailView.tpl
Message-ID: <20060607152358.832C47E8621@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 09:23:54 2006
New Revision: 6956

Log:
i18n updated for profiles - ahmed

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

Modified: vtigercrm/trunk/Smarty/templates/EditProfile.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/EditProfile.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/EditProfile.tpl Wed Jun  7 09:23:54 2006
@@ -140,7 +140,7 @@
 </tr>
 <tr>
 <td valign="top"></td>
-<td > {$CMOD.LBL_ALLOW} "{$PROFILE_NAME}" {$CMOD.LBL_MESG_VIEW}</td>
+<td > {$CMOD.LBL_ALLOW} "{$PROFILE_NAME}" {$CMOD.LBL_MESG_EDIT}</td>
 </tr>
 </table>
 </td>
@@ -192,18 +192,18 @@
 <td width=97% valign=top onMouseOver="this.className='prvPrfHoverOn'" onMouseOut="this.className='prvPrfHoverOff'" >
 <table border=0 cellspacing=0 cellpadding=5 width=100% class=small>
 
-<tr>
-<td>{$CMOD.LBL_ENTITY}</td>
-<td>{$CMOD.LBL_CREATE_EDIT}</td>
-<td>{$CMOD.LBL_DELETE}</td>
-<td>{$CMOD.LBL_VIEW}</td>
-</tr>
-
+	<tr>
+	<td><b>{$CMOD.LBL_ENTITY}</b></td>
+	<td><b>{$CMOD.LBL_CREATE_EDIT}</b></td>
+	<td><b>{$CMOD.LBL_DELETE}</b></td>
+	<td><b>{$CMOD.LBL_VIEW}</b></td>
+	</tr>
 {foreach item=value from=$STANDARD_PRIV}
 <tr>
-{foreach item=element from=$value}
-<td>{$element}</td>
-{/foreach}
+<td>{$APP[$value.0]}</td>
+<td>{$value.1}</td>
+<td>{$value.2}</td>
+<td>{$value.3}</td>
 </tr>
 {/foreach}
 
@@ -263,7 +263,7 @@
 {foreach item=value from=$TAB_PRIV}
 <tr>
 {foreach item=element from=$value}
-<td width=35%>{$element.0}</td>
+<td width=35%>{$APP[$element.0]}</td>
 <td width=15%>{$element.1}</td>
 {/foreach}
 </tr>
@@ -322,7 +322,7 @@
 
 {foreach key=module item=value from=$UTILITIES_PRIV}
 <tr>
-<td colspan="4" style="border-bottom:1px solid #efefef"><b>{$module}</b></td>
+<td colspan="4" style="border-bottom:1px solid #efefef"><b>{$APP.$module}</b></td>
 </tr>
 <tr>
 <td class="prvPrfTexture" style="width:20px">&nbsp;</td>
@@ -330,9 +330,9 @@
 <table border="0" cellspacing="0" cellpadding="5" width="100%" class="small">
 {foreach item=element from=$value}
 <tr>
-<td width=25%>{$element.0.0}</td>
+<td width=25%>{$APP[$element.0.0]}</td>
 <td width=25%>{$element.0.1}</td>
-<td width=25%>{$element.1.0}</td>
+<td width=25%>{$APP[$element.1.0]}</td>
 <td width=25%>{$element.1.1}</td>
 {/foreach}
 </tr>
@@ -387,7 +387,7 @@
 <td>
 <select id="module_list" name="module_list" onchange="showmoduleperm(this)">
 {foreach key=module item=label from=$PRI_FIELD_LIST}
-<option value="{$label}">{$label}</option>
+<option value="{$label}">{$APP.$label}</option>
 {/foreach}
 </td>
 <td width=50%>&nbsp;</td>

Modified: vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl Wed Jun  7 09:23:54 2006
@@ -171,17 +171,18 @@
 		<table border=0 cellspacing=0 cellpadding=5 width=100% class=small>
 		
 		<tr>
-		<td>{$CMOD.LBL_ENTITY}</td>
-		<td>{$CMOD.LBL_CREATE_EDIT}</td>
-		<td>{$CMOD.LBL_DELETE}</td>
-		<td>{$CMOD.LBL_VIEW}</td>
+		<td><b>{$CMOD.LBL_ENTITY}</b></td>
+		<td><b>{$CMOD.LBL_CREATE_EDIT}</b></td>
+		<td><b>{$CMOD.LBL_DELETE}</b></td>
+		<td><b>{$CMOD.LBL_VIEW}</b></td>
 		</tr>
 		
 		{foreach item=value from=$STANDARD_PRIV}
 		<tr>
-		{foreach item=element from=$value}
-		<td>{$element}</td>
-		{/foreach}
+		<td>{$APP[$value.0]}</td>
+		<td>{$value.1}</td>
+		<td>{$value.2}</td>
+		<td>{$value.3}</td>
 		</tr>
 		{/foreach}
 		
@@ -242,7 +243,7 @@
 		{foreach item=value from=$TAB_PRIV}
 		<tr>
 		{foreach item=element from=$value}
-		<td width=35%>{$element.0}</td>
+		<td width=35%>{$APP[$element.0]}</td>
 		<td width=15%>{$element.1}</td>
 		{/foreach}
 		</tr>
@@ -308,9 +309,9 @@
 		<table border="0" cellspacing="0" cellpadding="5" width="100%" class="small">
 		{foreach item=element from=$value}
 		<tr>
-		<td width=25%>{$element.0.0}</td>
+		<td width=25%>{$APP[$element.0.0]}</td>
 		<td width=25%>{$element.0.1}</td>
-		<td width=25%>{$element.1.0}</td>
+		<td width=25%>{$APP[$element.1.0]}</td>
 		<td width=25%>{$element.1.1}</td>
 		{/foreach}
 		</tr>
@@ -364,7 +365,7 @@
 		<td>
 		<select id="module_list" name="module_list" onchange="showmoduleperm(this)">
 		{foreach key=module item=label from=$PRI_FIELD_LIST}
-			<option value="{$label}">{$label}</option>
+			<option value="{$label}">{$APP.$label}</option>
 		{/foreach}
 		</td>
 		<td width=50%>&nbsp;</td>



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 08:26:06 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 15:26:06 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6957 -
 /vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl
Message-ID: <20060607152606.DA4797E8562@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 09:26:02 2006
New Revision: 6957

Log:
profile tpl updated

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 Wed Jun  7 09:26:02 2006
@@ -301,7 +301,7 @@
 		
 		{foreach key=module item=value from=$UTILITIES_PRIV}
 		<tr>
-		<td colspan="4" style="border-bottom:1px solid #efefef"><b>{$module}</b></td>
+		<td colspan="4" style="border-bottom:1px solid #efefef"><b>{$APP.$module}</b></td>
 		</tr>
 		<tr>
 		<td class="prvPrfTexture" style="width:20px">&nbsp;</td>



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 08:28:14 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 15:28:14 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6958 -
	/vtigercrm/trunk/include/language/en_us.lang.php
Message-ID: <20060607152814.B8CDE7E8621@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 09:28:11 2006
New Revision: 6958

Log:
lang file updated

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

Modified: vtigercrm/trunk/include/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/include/language/en_us.lang.php (original)
+++ vtigercrm/trunk/include/language/en_us.lang.php Wed Jun  7 09:28:11 2006
@@ -352,6 +352,11 @@
 'LBL_EXPORT'=>'Export',
 
 'LBL_EXPORT_ALL'=>'Export All',
+
+'Export'=>'Export',
+'Import'=>'Import',
+'Merge'=>'Merge',
+'ConvertLead'=>'ConvertLead',
 
 //3.2 release
 



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 08:31:01 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 15:31:01 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6959 - in /vtigercrm/trunk:
 Smarty/templates/ modules/Migration/ modules/Migration/ModifyDatabase/
 modules/Migration/language/
Message-ID: <20060607153101.DFC357E8562@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 09:30:51 2006
New Revision: 6959

Log:
* Modified to handle the MySQL Path not found problem in windows, added one more option to alter the 4.2.3 database setup directly and some queries

Modified:
    vtigercrm/trunk/Smarty/templates/MigrationStep1.tpl
    vtigercrm/trunk/modules/Migration/Migration.php
    vtigercrm/trunk/modules/Migration/MigrationCheck.php
    vtigercrm/trunk/modules/Migration/MigrationStep1.php
    vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php
    vtigercrm/trunk/modules/Migration/language/en_us.lang.php

Modified: vtigercrm/trunk/Smarty/templates/MigrationStep1.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/MigrationStep1.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/MigrationStep1.tpl Wed Jun  7 09:30:51 2006
@@ -1,240 +1,394 @@
-{*<!--
-/*********************************************************************************
-  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
-   * ("License"); You may not use this file except in compliance with the License
-   * The Original Code is:  vtiger CRM Open Source
-   * The Initial Developer of the Original Code is vtiger.
-   * Portions created by vtiger are Copyright (C) vtiger.
-   * All Rights Reserved.
-  *
- ********************************************************************************/
--->*}
-
-
-<script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
-<script language="JavaScript" type="text/javascript" src="include/js/general.js"></script>
-<style type="text/css">@import url(themes/blue/style.css);</style>
-
-<form name="Migration" method="POST" action="index.php" enctype="multipart/form-data">
-<input type="hidden" name="module" value="Migration">
-<input type="hidden" name="action" value="MigrationCheck">
-<input type="hidden" name="migration_option" value="">
-<input type="hidden" name="parenttab" value="Settings">
-
-<table width="100%" border="0" cellpadding="0" cellspacing="0" height="100%">
-   <tr>
-	<td class="showPanelBg" valign="top" width="95%"  style="padding-left:20px; "><br />
-		<span class="lvtHeaderText"> Settings &gt; Migrate from Previous Version </span>
-		<hr noshade="noshade" size="1" />
-	</td>
-	<td width="5%" class="showPanelBg">&nbsp;</td>
-   </tr>
-   <tr>
-	<td width="98%" style="padding-left:20px;" valign="top">
-		<!-- module Select Table -->
-		<table width="95%"  border="0" cellspacing="0" cellpadding="0" align="center">
-		   <tr>
-			<td width="7" height="6" style="font-size:1px;font-family:Arial, Helvetica, sans-serif;"><img src="{$IMAGE_PATH}top_left.jpg" align="top"  /></td>
-			<td bgcolor="#EBEBEB" style="font-size:1px;font-family:Arial, Helvetica, sans-serif;height:6px;"></td>
-			<td width="8" height="6" style="font-size:1px;font-family:Arial, Helvetica, sans-serif;"><img src="{$IMAGE_PATH}top_right.jpg" width="8" height="6" align="top" /></td>
-		   </tr>
-		   <tr>
-			<td bgcolor="#EBEBEB" width="7"></td>
-			<td bgcolor="#ECECEC" style="padding-left:10px;padding-top:10px;vertical-align:top;">
-				<table width="100%"  border="0" cellpadding="5" cellspacing="0">
-				   <tr>
-					<td width="10%"><img src="{$IMAGE_PATH}migrate.gif" align="absmiddle"/></td>
-					<td width="90%">
-						<span class="genHeaderBig">Migrate From Previous Version</span><br />
-						Update your new vtiger CRM 5 database with the data from previous installation<br />
-						To Start, follow the instructions below
-					</td>
-				   </tr>
-				   <tr bgcolor="#FFFFFF">
-					<td colspan="2">
-						<span class="genHeaderGray">Step 1 : </span>
-				  		<span class="genHeaderSmall">Select Source</span><br />
-						To Start Migration, you must specify the format in which the old data is Available<br /><br />
-					</td>
-				   </tr>
-				   <tr bgcolor="#FFFFFF">
-					<td align="right" valign="top"><input type="radio" name="radio" id="db_details" value="db_details" onclick="fnChangeMigrate()" "{$DB_DETAILS_CHECKED}" /></td>
-					<td><b>I Have the Data Base Format</b> ( Live Data )<br />
-						This option requires you to have the host machine's ( where the DB is stored ) address and DB access  details.
-						Both local and remote systems are supported in this method. Refer documentation for Help.
-					</td>
-				   </tr>
-				   <tr><td colspan="2" bgcolor="#FFFFFF" height="10"></td></tr>
-				   <tr bgcolor="#FFFFFF">
-					<td align="right" valign="top"><input type="radio" name="radio" id="dump_details" value="dump_details" onclick="fnChangeMigrate()" "{$DUMP_DETAILS_CHECKED}"/></td>
-					<td><b>I Have a Data Base as a Database Dump</b> ( Usually archived )<br />
-						This option requires you to have the dump file, in this local system.
-						You cannot specify a remote machine. Refer documentation for Help.
-					</td>
-				   </tr>
-				   <tr bgcolor="#FFFFFF">
-					<td align="right" valign="top"><b>Note: </b></td>
-					<td>{$MOD.LBL_NOTES_DUMP_PROCESS}</td>
-				   </tr>
-				   <tr><td colspan="2" height="10"></td></tr>
-				   <tr bgcolor="#FFFFFF">
-					<td colspan="2">
-						<!-- OPTION 1 -->
-						<div id="mnuTab" style="display:{$SHOW_DB_DETAILS}">
-							<table width="100%" border="0" cellpadding="5" cellspacing="0">
-							   <tr bgcolor="#FFFFFF">
-								<td colspan="2">
-									<span class="genHeaderGray">Step 2 : </span>
-									<span class="genHeaderSmall">Host Database Access Details</span><br /><br />
-								</td>
-							   </tr>
-							   <tr>
-								<td width="30%" align="right">Source MySQL Host Name or IP Address : </td>
-								<td width="70%"><input type="text" name="old_host_name" class="importBox" value="{$OLD_HOST_NAME}" /></td>
-							   </tr>
-							   <tr>
-								<td align="right">Source MySQL Port Number : </td>
-								<td><input type="text" name="old_port_no" class="importBox" value="{$OLD_PORT_NO}" /></td>
-							   </tr>
-							   <tr>
-								<td align="right">Source MySql User Name : </td>
-								<td><input type="text" name="old_mysql_username" class="importBox" value="{$OLD_MYSQL_USERNAME}" /></td>
-							   </tr>
-							   <tr>
-								<td align="right">Source MySql Password : </td>
-								<td><input type="text" name="old_mysql_password" class="importBox" value="{$OLD_MYSQL_PASSWORD}" /></td>
-							   </tr>
-							   <tr>
-								<td align="right">Source Database Name : </td>
-								<td><input type="text" name="old_dbname" class="importBox" value="{$OLD_DBNAME}" /></td>
-							   </tr>
-							</table>
-						</div>
-
-						<!-- OPTION 2 -->
-						<div id="mnuTab2" style="display:{$SHOW_DUMP_DETAILS}">
-							<table width="100%" border="0" cellpadding="5" cellspacing="0">
-							   <tr bgcolor="#FFFFFF">
-								<td colspan="2">
-									<span class="genHeaderGray">Step 2 : </span>
-									<span class="genHeaderSmall">Locate Database Dump File</span><br /><br />
-								</td>
-							   </tr>
-							   <tr>
-								<td width="10%">&nbsp;</td>
-								<td width="90%">
-									Dump File Location : 
-									<input type="file" name="old_dump_filename" class="txtBox" />
-								</td>
-							   </tr>
-							</table>
-						</div>
-
-					</td>
-				   </tr>
-				   <tr>
-					<td colspan="2" style="padding:10px;" align="center">
-						<input type="submit" name="migrate" value="  Migrate  "  class="classBtn" onclick="return validate_migration(Migration);"/>
-						&nbsp;<input type="submit" name="cancel" value=" &nbsp;Cancel&nbsp; "  class="classBtn" onclick="this.form.module.value='Settings';this.form.action.value='index';"/>
- 					</td>
-				   </tr>
-				</table>
-			</td>
-			<td bgcolor="#EBEBEB" width="8"></td>
-		   </tr>
-		   <tr>
-			<td width="7" height="8" style="font-size:1px;font-family:Arial, Helvetica, sans-serif;"><img src="{$IMAGE_PATH}bottom_left.jpg" align="bottom"  /></td>
-			<td bgcolor="#ECECEC" height="8" style="font-size:1px;" ></td>
-			<td width="8" height="8" style="font-size:1px;font-family:Arial, Helvetica, sans-serif;"><img src="{$IMAGE_PATH}bottom_right.jpg" align="bottom" /></td>
-		   </tr>
-		</table>
-		<br />
-	</td>
-	<td>&nbsp;</td>
-   </tr>
-</table>
-<!-- END -->
-</form>
-
-<script language="javascript" type="text/javascript">
-	//function to show and hide the db_details or dump_details details based on the radio option selected
-	function fnChangeMigrate()
-	{ldelim}
-		var opt_one = document.getElementById('db_details').checked;
-		var opt_two = document.getElementById('dump_details').checked;
-		if(opt_one)
-		{ldelim}
-			document.getElementById('mnuTab').style.display = 'block';
-			document.getElementById('mnuTab2').style.display = 'none';
-		{rdelim}
-		else
-		{ldelim}
-			document.getElementById('mnuTab').style.display = 'none';
-			document.getElementById('mnuTab2').style.display = 'block';
-		{rdelim}
-	{rdelim}
-
-	//function to validate the input values based on the radio option selected
-	function validate_migration(formname)
-	{ldelim}
-
-		var error = false;
-		var mig_option = '';
-
-		if(document.getElementById("db_details").checked == true)
-		{ldelim}
-			formname.migration_option.value = 'db_details';
-			//check whether the user entered the valid Source MySQL database details when db details selected
-			if(trim(formname.old_host_name.value) == '')
-			{ldelim}
-				error_msg = "Please enter the Source Host Name";
-				error = true;
-			{rdelim}
-			else if(trim(formname.old_port_no.value) == '')
-			{ldelim}
-				error_msg = "Please enter the Source MySql Port Number";
-				error = true;
-			{rdelim}
-			else if(trim(formname.old_mysql_username.value) == '')
-			{ldelim}
-				error_msg = "Please enter the Source MySql User Name";
-				error = true;
-			{rdelim}
-			else if(trim(formname.old_dbname.value) == '')
-			{ldelim}
-				error_msg = "Please enter the Source Database Name";
-				error = true;
-			{rdelim}
-		{rdelim}
-		else if(document.getElementById("dump_details").checked == true)
-		{ldelim}
-			formname.migration_option.value = 'dump_details';
-			//check whether the user entered the MySQL File when dump file details selected
-			if(trim(formname.old_dump_filename.value) == '')
-			{ldelim}
-				error_msg = "Please enter the Valid MySQL Dump File";
-				error = true;
-			{rdelim}
-		{rdelim}
-		else
-		{ldelim}
-			formname.migration_option.value = '';
-			error_msg = "Please select any one option";
-			error = true;
-		{rdelim}
-
-		//if there is any error then alert the user and return false;
-		if(error == true)
-		{ldelim}
-			alert(error_msg);
-			return false;
-		{rdelim}
-		else
-		{ldelim}
-			return true;
-		{rdelim}
-
-		return false;
-	{rdelim}
-</script>
-
+{*<!--
+/*********************************************************************************
+  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
+   * ("License"); You may not use this file except in compliance with the License
+   * The Original Code is:  vtiger CRM Open Source
+   * The Initial Developer of the Original Code is vtiger.
+   * Portions created by vtiger are Copyright (C) vtiger.
+   * All Rights Reserved.
+  *
+ ********************************************************************************/
+-->*}
+
+
+<script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
+<script language="JavaScript" type="text/javascript" src="include/js/general.js"></script>
+<style type="text/css">@import url(themes/blue/style.css);</style>
+
+<form name="Migration" method="POST" action="index.php" enctype="multipart/form-data">
+<input type="hidden" name="module" value="Migration">
+<input type="hidden" name="action" value="MigrationCheck">
+<input type="hidden" name="migration_option" value="">
+<input type="hidden" name="parenttab" value="Settings">
+<input type="hidden" id="getmysqlpath" name="getmysqlpath" value="{$GET_MYSQL_PATH}">
+
+<table width="100%" border="0" cellpadding="0" cellspacing="0" height="100%" class="small">
+   <tr>
+	<td class="showPanelBg" valign="top" width="95%"  style="padding-left:20px; "><br />
+		<span class="lvtHeaderText"> Settings &gt; Migrate from Previous Version </span>
+		<hr noshade="noshade" size="1" />
+	</td>
+	<td width="5%" class="showPanelBg">&nbsp;</td>
+   </tr>
+   <tr>
+	<td width="98%" style="padding-left:20px;" valign="top">
+		<!-- module Select Table -->
+		<table width="95%"  border="0" cellspacing="0" cellpadding="0" align="center" class="small">
+		   <tr>
+			<td width="7" height="6" style="font-size:1px;font-family:Arial, Helvetica, sans-serif;"><img src="{$IMAGE_PATH}top_left.jpg" align="top"  /></td>
+			<td bgcolor="#EBEBEB" style="font-size:1px;font-family:Arial, Helvetica, sans-serif;height:6px;"></td>
+			<td width="8" height="6" style="font-size:1px;font-family:Arial, Helvetica, sans-serif;"><img src="{$IMAGE_PATH}top_right.jpg" width="8" height="6" align="top" /></td>
+		   </tr>
+		   <tr>
+			<td bgcolor="#EBEBEB" width="7"></td>
+			<td bgcolor="#ECECEC" style="padding-left:10px;padding-top:10px;vertical-align:top;">
+				<table width="100%"  border="0" cellpadding="5" cellspacing="0" class="small">
+				   <tr>
+					<td width="10%"><img src="{$IMAGE_PATH}migrate.gif" align="absmiddle"/></td>
+					<td width="90%">
+						<span class="genHeaderBig">Migrate From Previous Version</span><br />
+						Update your new vtiger CRM 5 database with the data from previous installation<br />
+						To Start, follow the instructions below
+					</td>
+				   </tr>
+				   <tr bgcolor="#FFFFFF">
+					<td colspan="2">
+						<span class="genHeaderGray">Step 1 : </span>
+				  		<span class="genHeaderSmall">Select Source</span><br />
+						To Start Migration, you must specify the format in which the old data is Available<br /><br />
+					</td>
+				   </tr>
+				   <tr bgcolor="#FFFFFF">
+					<td align="right" valign="top">
+						<input type="radio" name="radio" id="db_details" value="db_details" onclick="fnChangeMigrate()" "{$DB_DETAILS_CHECKED}" />
+					</td>
+					<td>
+						<b>I Have the Data Base Format</b> ( Live Data )<br />
+						This option requires you to have the host machine's ( where the DB is stored ) address and DB access  details.
+						Both local and remote systems are supported in this method. Refer documentation for Help.
+					</td>
+				   </tr>
+				   <tr><td colspan="2" bgcolor="#FFFFFF" height="10"></td></tr>
+				   <tr bgcolor="#FFFFFF">
+					<td align="right" valign="top">
+						<input type="radio" name="radio" id="dump_details" value="dump_details" onclick="fnChangeMigrate()" "{$DUMP_DETAILS_CHECKED}"/>
+					</td>
+					<td>
+						<b>I Have a Data Base as a Database Dump</b> ( Usually archived )<br />
+						This option requires you to have the dump file, in this local system

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 08:34:41 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 15:34:41 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6960 -
 /vtigercrm/trunk/modules/Users/language/en_us.lang.php
Message-ID: <20060607153441.495F77E8627@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 09:34:37 2006
New Revision: 6960

Log:
lang file updated

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

Modified: vtigercrm/trunk/modules/Users/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Users/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Users/language/en_us.lang.php Wed Jun  7 09:34:37 2006
@@ -479,7 +479,7 @@
 'LBL_GLOBAL_ACCESS_PRIVILEGES'=>'Global Access Privileges',
 'LBL_CUSTOM_ACCESS_PRIVILEGES'=>'Custom Access Privileges',
 'LBL_BOTH'=>'Both',
-'LBL_VIEW'=>'view',
+'LBL_VIEW'=>'View',
 'LBL_RECALCULATE_BUTTON'=>'Recalculate',
 'LBL_ADD_PRIVILEGES_BUTTON'=>'Add Privileges',
 'LBL_CUSTOM_ACCESS_MESG'=>'No Custom Access Rules defined .',



From vtiger-tickets at vtiger.fosslabs.com  Wed Jun  7 08:41:31 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 07 Jun 2006 15:41:31 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231277=3A?=
 =?utf-8?q?_Can=27t_translate_term_close_without_problem?=
In-Reply-To: <076.d518c5251779ede24caf171d8d809788@vtiger.fosslabs.com>
References: <076.d518c5251779ede24caf171d8d809788@vtiger.fosslabs.com>
Message-ID: <085.669ad77fa6846e7ecae6596a4f500d93@vtiger.fosslabs.com>

#1277: Can't translate term close without problem
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  developer
      Type:  defect     |      Status:  new      
  Priority:  major      |   Milestone:  5.0.0    
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:             |    Keywords:           
------------------------+---------------------------------------------------
Comment (by juao):

 This was already solved for milestone 4.2.4 (ticket #27) with changeset
 [3879]
 Do the same for 5.0.0 and i think the problem will be solved.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1277>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 08:47:49 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 15:47:49 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6961 -
 /vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php
Message-ID: <20060607154749.9C31C7E8627@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 09:47:45 2006
New Revision: 6961

Log:
* Added 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 Wed Jun  7 09:47:45 2006
@@ -2882,78 +2882,77 @@
 
 
 //Security profile and tab table handling by DON starts
-	$sql_sec="select profileid from  profile";
-	$result_sec=$conn->query($sql_sec);
-	$num_rows=$conn->num_rows($result_sec);
-	for($i=0;$i<$num_row;$i++)
-	{
-		$prof_id=$conn->query_result($result_sec,$i,'profileid');
-		$sql1_sec="insert into profile2utility values(".$prof_id.",13,8,0)";
-		Execute($sql1_sec);
-		
-		$sql2_sec="insert into profile2utility values(".$prof_id.",7,9,0)";
-		Execute($sql2_sec);
-
-		$sql3_sec="insert into profile2tab values(".$prof_id.",26,0)";
-                Execute($sql3_sec);
-
-		$sql4_sec="insert into profile2tab values(".$prof_id.",27,0)";
-                Execute($sql4_sec);
-
-		$sql7_sec="insert into profile2standardpermissions values(".$prof_id.",26,0,0)";
-                Execute($sql7_sec);
-
-		$sql8_sec="insert into profile2standardpermissions values(".$prof_id.",26,1,0)";
-                Execute($sql8_sec);
-
-		$sql9_sec="insert into profile2standardpermissions values(".$prof_id.",26,2,0)";
-                Execute($sql9_sec);
-
-		$sql10_sec="insert into profile2standardpermissions values(".$prof_id.",26,3,0)";
-                Execute($sql10_sec);
-
-		$sql11_sec="insert into profile2standardpermissions values(".$prof_id.",26,4,0)";
-                Execute($sql11_sec);	
-		
-	}
-
-	//Inserting into tab tables
-	$sec2="INSERT INTO tab VALUES (27,'Portal',0,24,'Portal',null,null,1)";
-	$sec3="INSERT INTO tab VALUES (28,'Webmails',0,25,'Webmails',null,null,1)";
-
-	//Insert into def_org_share tables
-	$sec4="insert into def_org_share values (".$conn->getUniqueID('def_org_share').",26,2,0)";	
-
-	Execute($sec2);
-	Execute($sec3);
-	Execute($sec4);
-
-	//Inserting into datashare related modules table
-
-	Execute("insert into datashare_relatedmodules_seq values(1)");
+$sql_sec="select profileid from  profile";
+$result_sec=$conn->query($sql_sec);
+$num_rows=$conn->num_rows($result_sec);
+for($i=0;$i<$num_row;$i++)
+{
+	$prof_id=$conn->query_result($result_sec,$i,'profileid');
+	$sql1_sec="insert into profile2utility values(".$prof_id.",13,8,0)";
+	Execute($sql1_sec);
+
+	$sql2_sec="insert into profile2utility values(".$prof_id.",7,9,0)";
+	Execute($sql2_sec);
+
+	$sql3_sec="insert into profile2tab values(".$prof_id.",26,0)";
+	Execute($sql3_sec);
+
+	$sql4_sec="insert into profile2tab values(".$prof_id.",27,0)";
+	Execute($sql4_sec);
+
+	$sql7_sec="insert into profile2standardpermissions values(".$prof_id.",26,0,0)";
+	Execute($sql7_sec);
+
+	$sql8_sec="insert into profile2standardpermissions values(".$prof_id.",26,1,0)";
+	Execute($sql8_sec);
+
+	$sql9_sec="insert into profile2standardpermissions values(".$prof_id.",26,2,0)";
+	Execute($sql9_sec);
+
+	$sql10_sec="insert into profile2standardpermissions values(".$prof_id.",26,3,0)";
+	Execute($sql10_sec);
+
+	$sql11_sec="insert into profile2standardpermissions values(".$prof_id.",26,4,0)";
+	Execute($sql11_sec);	
+
+}
+
+//Inserting into tab tables
+$sec2="INSERT INTO tab VALUES (27,'Portal',0,24,'Portal',null,null,1)";
+$sec3="INSERT INTO tab VALUES (28,'Webmails',0,25,'Webmails',null,null,1)";
+
+//Insert into def_org_share tables
+$sec4="insert into def_org_share values (".$conn->getUniqueID('def_org_share').",26,2,0)";	
+
+Execute($sec2);
+Execute($sec3);
+Execute($sec4);
+
+//Inserting into datashare related modules table
+
+Execute("insert into datashare_relatedmodules_seq values(1)");
 	
-	//Lead Related Module
-                Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",7,10)");
-
-                //Account Related Module
-                Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",6,2)");
-                Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",6,13)");
-                Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",6,20)");
-                Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",6,22)");
-                Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",6,23)");
-                Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",6,10)");
-
-
-	
-		//Potential Related Module
-                Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",2,20)");
-                Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",2,22)");
-
-                //Quote Related Module
-                Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",20,22)");
-
-                //SO Related Module
-                Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",22,23)");
+//Lead Related Module
+Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",7,10)");
+
+//Account Related Module
+Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",6,2)");
+Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",6,13)");
+Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",6,20)");
+Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",6,22)");
+Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",6,23)");
+Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",6,10)");
+
+
+//Potential Related Module
+Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",2,20)");
+Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",2,22)");
+
+//Quote Related Module
+Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",20,22)");
+
+//SO Related Module
+Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",22,23)");
 	
 
 //By Don Ends
@@ -2962,10 +2961,30 @@
 $alter_query18 = "alter table mail_accounts add column int_mailer int(1) default '0'";
 Execute($alter_query18);
 
-
-
-
-
+$update_query_array5 = Array(
+	"update field set info_type='BAS' where tabid=6 and fieldname in ('tickersymbol','account_id')",
+	"update relatedlists set label = 'Activity History' where tabid in (4,6,7,20,21,22,23) and label = 'History'",
+	"update relatedlists set label = 'Products' where tabid=2 and name='get_products' and label='History'",
+	"update relatedlists set label = 'Activity History' where tabid=2 and name='get_history' and label='History'"
+			    );
+foreach($update_query_array5 as $query)
+{
+	Execute($query);
+}
+
+$insert_query_array27 = Array(
+	"insert into relatedlists values(".$conn->getUniqueID('relatedlists').",13,0,'get_ticket_history',3,'Ticket History',0)",
+	"insert into parenttabrel values (2,10,4)",
+	"insert into parenttabrel values (4,10,7)"
+			     );
+foreach($insert_query_array27 as $query)
+{
+	Execute($query);
+}
+
+
+
+			     
 
 //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 Jun  7 11:06:41 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 07 Jun 2006 18:06:41 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=2348=3A_S?=
 =?utf-8?q?ales_Orders_Created_from_Quote_are_not_saved_and_do_not_retain_?=
 =?utf-8?q?associations?=
In-Reply-To: <076.6d585e55b32136b76a36642c5be35e19@vtiger.fosslabs.com>
References: <076.6d585e55b32136b76a36642c5be35e19@vtiger.fosslabs.com>
Message-ID: <085.eddaf7a5aee20b81c69248a1085e0ac1@vtiger.fosslabs.com>

#48: Sales Orders Created from Quote are not saved and do not retain
associations
-----------------------------------------------+----------------------------
  Reporter:  onwealdandy <arodes at onweald.com>  |       Owner:  developer
      Type:  defect                            |      Status:  reopened 
  Priority:  major                             |   Milestone:  4.2.5    
 Component:  vtigercrm                         |     Version:  4.2.3    
Resolution:                                    |    Keywords:  order    
-----------------------------------------------+----------------------------
Changes (by anonymous):

  * milestone:  4.2.4 => 4.2.5

Comment:

 source:vtigercrm/tags/vtigercrm-4.2.4 recently released. Moving milestone
 target to next point release of vtigercrm-4.2 series, vtigercrm-4.2.5.
 Please confirm problem still exists on that branch.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/48>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 11:23:22 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 18:23:22 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6962 - in
 /vtigercrm/branches/4.2: ./ install/ log4php/appenders/ modules/Users/
 themes/Aqua/ themes/blue/ themes/nature/ themes/orange/
Message-ID: <20060607182322.B21DE7E864C@vtiger.fosslabs.com>

Author: jeffk
Date: Wed Jun  7 12:23:13 2006
New Revision: 6962

Log:
merge source:vtigercrm/branches/4.2.4 r6803:6819 to source:vtigercrm/branches/4.2 in preparation for removal of source:vtigercrm/branches/4.2.4, which has been tagged source:vtigercrm/tags/vtigercrm-4.2.4

Modified:
    vtigercrm/branches/4.2/changelog.txt
    vtigercrm/branches/4.2/config.inc.php
    vtigercrm/branches/4.2/config.template.php
    vtigercrm/branches/4.2/install/2setConfig.php
    vtigercrm/branches/4.2/log4php/appenders/LoggerAppenderFile.php
    vtigercrm/branches/4.2/modules/Users/about_us.php
    vtigercrm/branches/4.2/themes/Aqua/header.html
    vtigercrm/branches/4.2/themes/blue/header.html
    vtigercrm/branches/4.2/themes/nature/header.html
    vtigercrm/branches/4.2/themes/orange/header.html
    vtigercrm/branches/4.2/vtigerversion.php

Modified: vtigercrm/branches/4.2/changelog.txt
==============================================================================
--- vtigercrm/branches/4.2/changelog.txt (original)
+++ vtigercrm/branches/4.2/changelog.txt Wed Jun  7 12:23:13 2006
@@ -1,7 +1,92 @@
+vtigerCRM v4.2.4 (Jun 1, 2006)
+-------------------------------
+
+NOTE: first time vtigerCRM users can directly install the source in their vtiger supported version of LAMP / WAMP. 
+
+bug fixes
+---------
+
+r3606: Issue in Pop-up New link which caused elements to disappear when hovering over ">>"
+r3607: Display currency symbol in listview header
+r3608: Added dash after Potential Name when converting from Lead
+r3609: Start/End date options in Custom View
+r3614: utils.php call time pass reference error
+r3615: fix for totals in reports not showing up
+r3616: PearDatabase.php call time pass reference
+r3617: Signatures are double-spaced in e-mails
+r3618: vendor search has a field "company" .but vendor form does not have company field
+r3619: "Email" mapping added for new search field
+r3773: Search leads by Fax in advanced search
+r3775: Order pending activities by date and time
+r3776: Allow more lead columns to be sorted
+r3777: Import CSV files with CR as line ending
+r3779: Set memory limit higher than 8mb
+r3783: removing schtasks.exe from source cron directory
+r3784: move DatabaseSchema.xml out of adodb/ into new schema/ directory
+r3787: Emails that contain HTML characters cause bad display in the Reply, Reply to All buttons area
+r3789: My Group Allocation on the Home page does not have a border on the right edge
+r3790: When switching from Email to Webmails and back to Emails, the tabs are drawn incorrectly
+r3792: Products listed in the Help Desk custom views display the record ID instead of the Product Name
+r3794: Missing border on Home module with more than 5 tickets open
+r3795: Remove readonly attribs from installer db form fields
+r3796: when we display fieldlabels, the label will not be displayed if there is a special character(like &)
+r3803: copyright / license cleanup
+r3809: install cleanup
+r3811: unified naming scheme to vtigerCRM files
+r3824: split README with Changelog
+r3831: fix extraneous colon character appearing in installer stage 3 next to database name
+r3833: add template for config file and 4.2.3 sql file
+r3834: add config file for FHS system
+r3868: update to jpgraph-1.20.3
+r3869: rename db_host_name and db_user_name to db_hostname and db_username
+r3871: move columns for sunday and week number to the right
+r3872: Fix Home Ticket List is Colored Opposite of Other Sections
+r3873: Fix html emails sent with tags viewable
+r3874: fixed time shift occuring if the calendar view spans a time change (daylight saving switch) 
+r3875: removed magic quotes check on input sanitization as magic quotes are removed on all input in the index.php file
+r3876: Apostrophe in description of Lead means that the lead is lost upon converting
+r3877: Don't die 'Couldn't get the group listing'
+r3878: fix direct calls to mysql functions
+r3879: Fix activities relatedlist won't display well if translated
+r3891: Fix missing "break" in OpenListView.php CASE statement
+r3892: Show rendered html instead of tags in notes editor
+r3911: update to adodb-4.72
+r3912: Fix Quotes/Invoices/Orders Do Not Support Negative Adjustments
+r3914: add file to extract adodb XML schema from database
+r3915: remove unused code in extractSchema
+r3931: port constraints & table type hack for AXMLS from 4.55 to 4.72
+r3932: Add indexes & fix FK name collisions in DB XML Schema
+r3933: Remove foreign keys that point to missing fields
+r3934: remove duplicate indexes in database
+r3935: turn on adodb and AXMLS debugging during install
+r3937: installer use template file
+r3938: Put vtiger version and release date only in vtigerversion.php
+r3940: config.inc.php is configuration file included by config.php
+r3941: added missing parameters in template file
+r3942: create install/5createTables.inc.php and modify install.php to use it when called from the command line
+r3943: output one less line to compensate for create_default_users().  see #40
+r3945: fix scope issue in getUserFldArray()
+r3966: remove old unused modules and files
+r4051: Remove hard coded upload limits
+r4057: changes made to support multiple packaging
+r4058: reduce memory usage in lead attachment upload code
+r4059: reduce adodb memory usage to enable larger BLOB uploads
+r4392: clean up uninitialized var notice while importing leads ref #70
+r4394: disable installer after successful install for security reasons.  closes #25
+r4397: Patch forUnicode-readyAlphabeticalSearch(), by justoff.
+r4399: Jpgraph fixes for Traditional Chinese, by kiange. closes #37
+r4400: Fix quotes are not created correctly form Potentials or from Quote screen, by onwealdandy. closes #51
+r4401: Translate of hard code by Summing columns in reports, by kleo. closes #54
+r4402: urlencode the downloading filename to deal with special characters, by mcrowe. closes #64
+r4443: expand lead street field to match street maxlen in contacts
+r5079: Detect if the key metric is for a sub module and set the partent module and appropriate sub module code when needed. Closes #93.
+r5113: Added inital condition check before looping through the parts list.  Closes #96.
+r6804: $host_name doesn't appear to be used anywhere, removing from configureation.  Closes #68.
+
+
+
 vtigerCRM v4.2.3 (Dec 23, 2005)
 -------------------------------
-
-NOTE: first time vtigerCRM users can directly install the source in their vtiger supported version of LAMP / WAMP. 
 
 vulnerability fixes
 -------------------
@@ -20,6 +105,7 @@
 b) Authentication ByPass
 c) Unsafe File Inclusion
 d) Arbitrary code execution
+
 
 vtigerCRM v4.2 Patch 2 (Sep 15, 2005)
 -------------------------------------
@@ -125,6 +211,7 @@
 61.  T2512   - Home upcoming activities
 62.  P8030   - Meetings not held must not be shown in upcoming activities
 
+
 vtigerCRM v4.2 Patch 1 (Aug 10, 2005)
 -------------------------------------
 
@@ -197,6 +284,7 @@
 59. Internal: Single, double quotes problem in ticket comments and FAQ comments
 60. Forum Topic ID 1612: Misbehaviour on validation of number fields
 
+
 vtigerCRM v4.2 GA (July 18, 2005)
 ---------------------------------
 
@@ -379,6 +467,7 @@
 NOTE: For more details about vtigerCRM v4.2 Release Notes, Please refer to the following URL:
 http://www.vtiger.com/wiki/index.php/Vtiger_CRM_4_2_Release_Notes
  
+ 
 vtigerCRM v4.2 Alpha (May 31, 2005)
 -----------------------------------
 
@@ -397,6 +486,7 @@
 10. Event Reminders
 11. Configurable Email Notifications
 12. Incoming Email Support
+
 
 vtigerCRM v4.0.1 (April 29, 2005)
 ---------------------------------
@@ -465,6 +555,7 @@
 49) Displaying of Closed Ticket in Home Page.
 50) Deleted entities are getting listed in Tracker.
 51) Enabling History tabs in Leads, Contacts, Accounts and Potentials for Activity History.
+
 
 vtigerCRM v4.0 (March 29, 2005)
 --------------------------------
@@ -682,6 +773,7 @@
 2. In Windowos OS, System Inoformantion is not displayed
 3. While importing leads, accounts, contacts, and potentials the XLS file format can be browsed even though the allowed file format is CSV.
  
+ 
 vtigerCRM v4.0 Beta (January 10, 2005)
 -------------------------------------
 
@@ -724,6 +816,7 @@
 18. 1093669 - Delete attachments
 19. Support for Latest versions of Apache and MySQL in installation wizard (Both Linux and Windows).
 
+
 vtigerCRM v3.2.1 (December 21, 2004)
 ------------------------------------
 
@@ -745,6 +838,7 @@
 g) Proper Message display is done when a user with no delete privileges tries to delete the entity.
 h) vtiger Outlook Plug-in in server side fixes related to performance improvement.
 
+
 vtigerCRM v3.2 (December 13, 2004)
 ----------------------------------
 
@@ -775,6 +869,7 @@
 
 Released vtiger Outlook Plug-in, business productivity enhancement utility for Microsoft Outlook users.
 It is an open source project covered under vtiger Public License 1.0 based on Mozilla Public License 1.1.
+
 
 vtigerCRM v2.0 (September 6, 2004)
 ----------------------------------
@@ -808,6 +903,7 @@
 
 Send your feedback, which is vital for our understanding your needs.
 
+
 vtigerCRM v1.0 (August 26, 2004)
 --------------------------------
 

Modified: vtigercrm/branches/4.2/config.inc.php
==============================================================================
--- vtigercrm/branches/4.2/config.inc.php (original)
+++ vtigercrm/branches/4.2/config.inc.php Wed Jun  7 12:23:13 2006
@@ -48,6 +48,9 @@
 $dbconfig['db_name'] = 'vtigercrm';
 $dbconfig['db_type'] = 'pgsql';
 $dbconfig['db_status'] = 'true';
+
+//$site_URL = '';
+//$root_directory = '';
 
 // TODO: test if port is empty
 // TODO: set db_hostname dependending on db_type
@@ -178,4 +181,12 @@
 // translation_string_prefix default value = false
 $translation_string_prefix = false;
 
+// access level for vtiger log files
+// set to 1, the vtiger.log will be readable by the owner (chmod: 0600)
+// set to 0, the vtiger.log will not be readable remotely (chmod: 0200)
+
+// 0 is recommended for security.
+// You may need to set it to 1 to read it for certain hosted accounts.
+$log_readable = 0;
+
 ?>

Modified: vtigercrm/branches/4.2/config.template.php
==============================================================================
--- vtigercrm/branches/4.2/config.template.php (original)
+++ vtigercrm/branches/4.2/config.template.php Wed Jun  7 12:23:13 2006
@@ -73,8 +73,6 @@
 
 // ssl default value = false
 $dbconfigoption['ssl'] = false;
-
-$host_name = $dbconfig['db_hostname'];
 
 $site_URL = '_SITE_URL_';
 
@@ -178,4 +176,12 @@
 // translation_string_prefix default value = false
 $translation_string_prefix = false;
 
+// access level for vtiger log files
+// set to 1, the vtiger.log will be readable by the owner (chmod: 0600)
+// set to 0, the vtiger.log will not be readable remotely (chmod: 0200)
+
+// 0 is recommended for security.
+// You may need to set it to 1 to read it for certain hosted accounts.
+$log_readable = 0;
+
 ?>

Modified: vtigercrm/branches/4.2/install/2setConfig.php
==============================================================================
--- vtigercrm/branches/4.2/install/2setConfig.php (original)
+++ vtigercrm/branches/4.2/install/2setConfig.php Wed Jun  7 12:23:13 2006
@@ -112,9 +112,6 @@
 
   !isset($_REQUEST['db_drop_tables']) ? $db_drop_tables = "0" : $db_drop_tables = $_REQUEST['db_drop_tables'];
 
-  if (isset($_REQUEST['host_name'])) $host_name = $_REQUEST['host_name'];
-    else $host_name = $hostname;
-
   if (isset($_REQUEST['site_URL'])) $site_URL = $_REQUEST['site_URL'];
     else $site_URL = $web_root;
 
@@ -150,7 +147,6 @@
   */
   !isset($_REQUEST['db_name']) ? $db_name = "vtigercrm4_2_4" : $db_name = $_REQUEST['db_name'];
   !isset($_REQUEST['db_drop_tables']) ? $db_drop_tables = "0" : $db_drop_tables = $_REQUEST['db_drop_tables'];
-  !isset($_REQUEST['host_name']) ? $host_name= $hostname : $host_name= $_REQUEST['host_name'];
   !isset($_REQUEST['site_URL']) ? $site_URL = $web_root : $site_URL = $_REQUEST['site_URL'];
   !isset($_REQUEST['root_directory']) ? $root_directory = $current_dir : $root_directory = stripslashes($_REQUEST['root_directory']);
   !isset($_REQUEST['cache_dir']) ? $cache_dir = $cache_dir : $cache_dir = stripslashes($_REQUEST['cache_dir']);

Modified: vtigercrm/branches/4.2/log4php/appenders/LoggerAppenderFile.php
==============================================================================
--- vtigercrm/branches/4.2/log4php/appenders/LoggerAppenderFile.php (original)
+++ vtigercrm/branches/4.2/log4php/appenders/LoggerAppenderFile.php Wed Jun  7 12:23:13 2006
@@ -26,6 +26,12 @@
 require_once(LOG4PHP_DIR . '/helpers/LoggerOptionConverter.php');
 require_once(LOG4PHP_DIR . '/LoggerLog.php');
 
+if (!defined('ROOT_DIR')) define('ROOT_DIR', LOG4PHP_DIR . '/..');
+if (!defined('LOG_READ'))
+{
+	include(ROOT_DIR . '/config.php');
+	define('LOG_READ', $log_readable);
+}
 /**
  * FileAppender appends log events to a file.
  *
@@ -77,7 +83,8 @@
         $this->fp = @fopen($fileName, ($this->getAppend()? 'a':'w'));
 
 	// Denying read option for log file. Added for Vulnerability fix
-        if (is_readable($fileName)) chmod ($fileName,0200);
+        if (is_readable($fileName) and (LOG_READ == 0)) chmod ($fileName,0200);
+        if (!is_readable($fileName) and (LOG_READ == 1)) chmod ($fileName,0600);
 
         if ($this->fp) {
             if ($this->getAppend())

Modified: vtigercrm/branches/4.2/modules/Users/about_us.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Users/about_us.php (original)
+++ vtigercrm/branches/4.2/modules/Users/about_us.php Wed Jun  7 12:23:13 2006
@@ -37,28 +37,33 @@
 </tr>
 
 <tr>
-<td class="dataLabel" height="30 px"><font face="Helvetica, sans-serif"><b>4.2.3 Release Date:&nbsp;</b></td>
-<td class="dataField" height="30 px">&nbsp;<?php echo $release_date; ?><span class="gensmall"> (Current version)</span></td>
+<td class="dataLabel" height="30 px"><font face="Helvetica, sans-serif"><b>4.2.4 Release Date:&nbsp;</b></td>
+<td class="dataField" height="30 px">&nbsp;<?php echo $release_date; ?><span class="gensmall"> (Current version)</span></font></td>
 </tr>
 
 <tr>
-<td class="dataLabel" height="30 px"><font face="Helvetica, sans-serif"><b>4.2 Release Date:&nbsp;</b></td>
-<td class="dataField" height="30 px">&nbsp;18-7-2005</font></td>
+<td class="dataLabel" height="30 px"><font face="Helvetica, sans-serif"><b>4.2.3 Release Date:&nbsp;</b></td>
+<td class="dataField" height="30 px">&nbsp;23 December 2005</font></td>
+</tr>
+
+<tr>
+<td class="dataLabel" height="30 px"><font face="Helvetica, sans-serif"><b>4.2.0 Release Date:&nbsp;</b></td>
+<td class="dataField" height="30 px">&nbsp;18 July 2005</font></td>
 </tr>
 
 <tr>
 <td class="dataLabel" height="30 px"><font face="Helvetica, sans-serif"><b>4.0.1 Release Date:&nbsp;</b></td>
-<td class="dataField" height="30 px">&nbsp;04-29-2005</font></td>
+<td class="dataField" height="30 px">&nbsp;29 April 2005</font></td>
                 </tr>
 		
 	
 <tr>
-<td class="dataLabel" height="30 px"><font face="Helvetica, sans-serif"><b>4.0 Release Date:&nbsp;</b></td>
-<td class="dataField" height="30 px">&nbsp;03-29-2005</font></td>
+<td class="dataLabel" height="30 px"><font face="Helvetica, sans-serif"><b>4.0.0 Release Date:&nbsp;</b></td>
+<td class="dataField" height="30 px">&nbsp;29 March 2005</font></td>
 	        </tr>
 		<tr>
-		<td class="dataLabel" height="30 px"><font face="Helvetica, sans-serif"><b>3.2 Release Date:&nbsp;</b></td>
-		<td class="dataField" height="30 px">&nbsp;12-13-2004</font></td>
+		<td class="dataLabel" height="30 px"><font face="Helvetica, sans-serif"><b>3.2.0 Release Date:&nbsp;</b></td>
+		<td class="dataField" height="30 px">&nbsp;13 December 2004</font></td>
 			        </tr>
 
 <tr>
@@ -76,4 +81,3 @@
 </td>
 </tr>
 </table>
-

Modified: vtigercrm/branches/4.2/themes/Aqua/header.html
==============================================================================
--- vtigercrm/branches/4.2/themes/Aqua/header.html (original)
+++ vtigercrm/branches/4.2/themes/Aqua/header.html Wed Jun  7 12:23:13 2006
@@ -46,7 +46,7 @@
 <script>
 function openwin()
 {
-        window.open("index.php?module=Users&action=about_us","aboutwin","height=300,width=400,top=200,left=300")
+        window.open("index.php?module=Users&action=about_us","aboutwin","height=520,width=400,top=200,left=300")
 }
 </script>
 

Modified: vtigercrm/branches/4.2/themes/blue/header.html
==============================================================================
--- vtigercrm/branches/4.2/themes/blue/header.html (original)
+++ vtigercrm/branches/4.2/themes/blue/header.html Wed Jun  7 12:23:13 2006
@@ -49,7 +49,7 @@
 <script>
 function openwin()
 {
-        window.open("index.php?module=Users&action=about_us","aboutwin","height=300,width=400,top=200,left=300")
+        window.open("index.php?module=Users&action=about_us","aboutwin","height=520,width=400,top=200,left=300")
 }
 </script>
 

Modified: vtigercrm/branches/4.2/themes/nature/header.html
==============================================================================
--- vtigercrm/branches/4.2/themes/nature/header.html (original)
+++ vtigercrm/branches/4.2/themes/nature/header.html Wed Jun  7 12:23:13 2006
@@ -45,7 +45,7 @@
 <script>
 function openwin()
 {
-        window.open("index.php?module=Users&action=about_us","aboutwin","height=300,width=400,top=200,left=300")
+        window.open("index.php?module=Users&action=about_us","aboutwin","height=520,width=400,top=200,left=300")
 }
 </script>
 

Modified: vtigercrm/branches/4.2/themes/orange/header.html
==============================================================================
Binary files - no diff available.

Modified: vtigercrm/branches/4.2/vtigerversion.php
==============================================================================
--- vtigercrm/branches/4.2/vtigerversion.php (original)
+++ vtigercrm/branches/4.2/vtigerversion.php Wed Jun  7 12:23:13 2006
@@ -11,6 +11,6 @@
 
 $patch_version = '';
 $modified_database = '';
-$vtiger_version = '4.2.3';
-$release_date = '23 December 2005';
+$vtiger_version = '4.2.4';
+$release_date = '1 June 2006';
 ?>



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 11:26:11 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 18:26:11 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6963 -
	/vtigercrm/branches/4.2.4/
Message-ID: <20060607182611.3B2897E86A7@vtiger.fosslabs.com>

Author: jeffk
Date: Wed Jun  7 12:26:09 2006
New Revision: 6963

Log:
source:vtigercrm/tags/vtigercrm-4.2.4 tagged, ok to remove source:vtigercrm/branches/4.2.4, prerelease changesets r6803:6819 merged to source:vtigercrm/branches/4.2, continue development at that URL

Removed:
    vtigercrm/branches/4.2.4/



From vtiger-tickets at vtiger.fosslabs.com  Wed Jun  7 13:28:45 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 07 Jun 2006 20:28:45 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231279=3A?=
 =?utf-8?q?_database_creation_error_problems_afterword?=
Message-ID: <076.fb2022c8962a6bd349bf1145132bfaa6@vtiger.fosslabs.com>

#1279: database creation error problems afterword
-----------------------+----------------------------------------------------
 Reporter:  anonymous  |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  major      |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 I encountered two issues while installing you beta.

 1) when I go through the setup wizard, if I select create database and
 provide it with the root credentials it gives an error.

 2) once it's is going to create the tables that i required it gets an
 error and nothing happens in the datase, however if I check the populate
 tables with data, it does it successfully.

 3) once I login and I'm browing there are sections that I click on and
 only the top menu shows up but nothing else.

 I'm running on apache 2.2.2, php 5.1.4 and mysql 4.0.19

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1279>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun  7 15:10:28 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 07 Jun 2006 22:10:28 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231280=3A?=
 =?utf-8?q?_Translation_issue_for_detailviews?=
Message-ID: <076.9b3cc9b6c6bc8054331835baebdc32df@vtiger.fosslabs.com>

#1280: Translation issue for detailviews
-----------------------+----------------------------------------------------
 Reporter:  abos       |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  major      |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 File smarty/templates/detailview.tpl

 ~line 19
 change for
    <a class="link"  align="right"
 href="javascript:;">{$APP.LBL_EDIT_BUTTON}</a>


 File smarty/templates/DetailviewUI.tpl
 Change all : class="small" value="Save"
 For : class="small" value="{$APP.LBL_SAVE_LABEL}"

 And all : class="link">Cancel</a>
 For : class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>

 And all : /> or
 for a new app string.


 ~line 77
  <tr height=20><td>{$UPDATEINFO}</td><td align="right" width="400"
 nowrap><div id="addtagdiv"><a href="javascript:;"
 onClick="show('tagdiv'),fnhide('addtagdiv'),document.getElementById('txtbox_tagfields').focus()">+addtag</a></div><div
 id="tagdiv" style="display:none;"><input class="textbox"  type="text"
 id="txtbox_tagfields" name="textbox_First Name"
 value=""></input>&nbsp;&nbsp;<input name="button_tagfileds" type="button"
 class="small" value="Tag it" onclick="return tagvalidate()"/><input
 name="close" type="button" class="small" value="Close"
 onClick="fnhide('tagdiv'),show('addtagdiv')"></div></td></tr>

 Tag it & close must be translated. Close need to be a new string, do not
 use Close. (not same usage in france)

 ~line 301
     Change for
     <input value="  {$APP.Merge}  "
 onclick="this.form.action.value='Merge';" type="submit"></input>

 Cheer

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1280>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun  7 17:12:17 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 08 Jun 2006 00:12:17 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231281=3A?=
 =?utf-8?q?_issues_with_Vtigercrm_4=2E2=2E4?=
Message-ID: <076.8b6d308ffb189659226c108a73a27dea@vtiger.fosslabs.com>

#1281: issues with Vtigercrm 4.2.4
--------------------------------------+-------------------------------------
 Reporter:  sebastian_sw at hotmail.com  |       Owner:  developer
     Type:  defect                    |      Status:  new      
 Priority:  major                     |   Milestone:           
Component:  vtigercrm                 |     Version:  4.2.4rc3 
 Keywords:                            |  
--------------------------------------+-------------------------------------
 Istalation goes fine.
 Creating Accounts, products and Quotes ok.

 After creating, Quotes are not displayed in any of the places where should
 be.-

 Orders are displayed in the Orders Module, but arent linked with the
 specific account.

 Running Mysql 4.1.16 - Apache 2.0.54

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1281>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 18:10:20 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 08 Jun 2006 01:10:20 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6964 -
	/vtigercrm/branches/4.2/include/utils.php
Message-ID: <20060608011020.B58147E863E@vtiger.fosslabs.com>

Author: allanbush
Date: Wed Jun  7 19:10:16 2006
New Revision: 6964

Log:
Fixes problems displaying quotes without associated potentials caused by query error.  Ref #1281.

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 Wed Jun  7 19:10:16 2006
@@ -2310,6 +2310,7 @@
 {
 global $vtlog;
 $vtlog->logthis("in getPotentialName ".$potential_id,'info');  
+	if(!$potential_id) return '';
 	global $adb;
 	$sql = "select potentialname from potential where potentialid=".$potential_id;
         $result = $adb->query($sql);



From vtiger-tickets at vtiger.fosslabs.com  Wed Jun  7 18:12:16 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 08 Jun 2006 01:12:16 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231281=3A?=
 =?utf-8?q?_issues_with_Vtigercrm_4=2E2=2E4?=
In-Reply-To: <076.8b6d308ffb189659226c108a73a27dea@vtiger.fosslabs.com>
References: <076.8b6d308ffb189659226c108a73a27dea@vtiger.fosslabs.com>
Message-ID: <085.11d06893700d6d8edf25fb5855c81558@vtiger.fosslabs.com>

#1281: issues with Vtigercrm 4.2.4
---------------------------------------+------------------------------------
  Reporter:  sebastian_sw at hotmail.com  |       Owner:  developer
      Type:  defect                    |      Status:  new      
  Priority:  major                     |   Milestone:           
 Component:  vtigercrm                 |     Version:  4.2.4rc3 
Resolution:                            |    Keywords:           
---------------------------------------+------------------------------------
Comment (by allanbush):

 [6964] Fixes problems displaying quotes without associated potentials
 caused by query error.  Ref #1281.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1281>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun  7 18:18:04 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 08 Jun 2006 01:18:04 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231281=3A?=
 =?utf-8?q?_Quotes_without_an_associated_potential_do_not_display_in_list_?=
 =?utf-8?q?views=2E?=
In-Reply-To: <076.8b6d308ffb189659226c108a73a27dea@vtiger.fosslabs.com>
References: <076.8b6d308ffb189659226c108a73a27dea@vtiger.fosslabs.com>
Message-ID: <085.bec79f5aab060ffc8f72c1ace62c9341@vtiger.fosslabs.com>

#1281: Quotes without an associated potential do not display in list views.
---------------------------------------+------------------------------------
  Reporter:  sebastian_sw at hotmail.com  |       Owner:  allanbush
      Type:  defect                    |      Status:  assigned 
  Priority:  critical                  |   Milestone:           
 Component:  vtigercrm                 |     Version:  4.2.4rc3 
Resolution:                            |    Keywords:           
---------------------------------------+------------------------------------
Changes (by allanbush):

  * priority:  major => critical
  * summary:  issues with Vtigercrm 4.2.4 => Quotes without an associated
              potential do not display in list views.
  * status:  new => assigned
  * owner:  developer => allanbush

Comment:

 This is pretty major (although present in 4.2.3 as well so it's not a
 regression error).  Any thoughts on a 4.2.4.1 release to fix this problem
 (and any others that come up in the next few days).  I don't see 4.2.5
 being released in the near future, the scope is too large and we don't
 currently have the resources to work on it.

 PS we still need the Milestones and Versions updated.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1281>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 22:04:59 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 08 Jun 2006 05:04:59 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6965 -
	/vtigercrm/trunk/modules/Emails/Email.js
Message-ID: <20060608050459.DA4797E87BD@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 23:04:53 2006
New Revision: 6965

Log:
ajax functionality has been modified

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

Modified: vtigercrm/trunk/modules/Emails/Email.js
==============================================================================
--- vtigercrm/trunk/modules/Emails/Email.js (original)
+++ vtigercrm/trunk/modules/Emails/Email.js Wed Jun  7 23:04:53 2006
@@ -19,17 +19,17 @@
 		$("status").style.display="inline";
                 new Ajax.Request(
                         'index.php',
-                        {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+                        {queue: {position: 'end', scope: 'command'},
                                 method: 'post',
                                 postBody: "module=Users&action=massdelete&return_module=Emails&folderid="+gFolderid+"&idlist="+id,
-                                onComplete: function(response) {ldelim}
+                                onComplete: function(response) {
                                                 $("status").style.display="none";
                                                 $('EmailDetails').innerHTML = '<table valign="top" border="0" cellpadding="0" cellspacing="0" width="100%"><tbody><tr><td class="forwardBg"><table border="0" cellpadding="0" cellspacing="0" width="100%"><tbody><tr><td colspan="2">&nbsp;</td></tr></tbody></table></td></tr><tr><td style="padding-top: 10px;" bgcolor="#ffffff" height="300" valign="top"></td></tr></tbody></table>';
                                                 $("subjectsetter").innerHTML='';
                                                 $("email_con").innerHTML=response.responseText;
                                                 execJS($('email_con'));
-                                {rdelim}
-                        {rdelim}
+                                }
+                        }
                 );
 	}
 	else
@@ -45,17 +45,17 @@
 	var search_text = document.getElementById('search_text').value;
 	new Ajax.Request(
                 'index.php',
-                {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+                {queue: {position: 'end', scope: 'command'},
                         method: 'post',
                         postBody: "module=Emails&action=EmailsAjax&ajax=true&file=ListView&folderid="+gFolderid+"&search=true&search_field="+search_field+"&search_text="+search_text,
-                        onComplete: function(response) {ldelim}
+                        onComplete: function(response) {
                                         $("status").style.display="none";
                                         $('EmailDetails').innerHTML = '<table valign="top" border="0" cellpadding="0" cellspacing="0" width="100%"><tbody><tr><td class="forwardBg"><table border="0" cellpadding="0" cellspacing="0" width="100%"><tbody><tr><td colspan="2">&nbsp;</td></tr></tbody></table></td></tr><tr><td style="padding-top: 10px;" bgcolor="#ffffff" height="300" valign="top"></td></tr></tbody></table>';
                                         $("subjectsetter").innerHTML='';
                                         $("email_con").innerHTML=response.responseText;
                                         execJS($('email_con'));
-                        {rdelim}
-                {rdelim}
+                        }
+                }
         );
 }
 



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 22:08:40 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 08 Jun 2006 05:08:40 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6966 - in /vtigercrm/trunk:
 Smarty/templates/RelatedLists.tpl include/language/en_us.lang.php
Message-ID: <20060608050840.671BB7E87D5@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 23:08:32 2006
New Revision: 6966

Log:
Lang file Updated

Modified:
    vtigercrm/trunk/Smarty/templates/RelatedLists.tpl
    vtigercrm/trunk/include/language/en_us.lang.php

Modified: vtigercrm/trunk/Smarty/templates/RelatedLists.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/RelatedLists.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/RelatedLists.tpl Wed Jun  7 23:08:32 2006
@@ -67,7 +67,7 @@
 					  {foreach key=header item=detail from=$RELATEDLISTS}
 						<table border=0 cellspacing=0 cellpadding=0 width=100% class="small" style="border-bottom:1px solid #999999;padding:5px;">
 							<tr>
-							<td  valign=bottom><b>{$header}</b></td>
+							<td  valign=bottom><b>{$APP.$header}</b></td>
 							{if $detail ne ''}
 							<td align=center>{$detail.navigation.0}</td>
 							{$detail.navigation.1}

Modified: vtigercrm/trunk/include/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/include/language/en_us.lang.php (original)
+++ vtigercrm/trunk/include/language/en_us.lang.php Wed Jun  7 23:08:32 2006
@@ -740,6 +740,14 @@
 'Rss'=>'RSS',
 'Portal'=>'My Sites',
 'Webmails'=>'Webmails',
+'Attachments'=>'Attachments',
+'Activity History'=>'Activity History',
+'Ticket History'=>'Ticket History',
+'Purchase Order'=>'Purchase Order',
+'Sales Stage History'=>'Sales Stage History',
+'Users'=>'Users',
+
+
 
 //Added language for Parent Tab
 



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 22:12:12 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 08 Jun 2006 05:12:12 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6967 -
	/vtigercrm/trunk/include/js/Mail.js
Message-ID: <20060608051212.5C1147E87CD@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 23:12:08 2006
New Revision: 6967

Log:
ajax functionality has been modified

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

Modified: vtigercrm/trunk/include/js/Mail.js
==============================================================================
--- vtigercrm/trunk/include/js/Mail.js (original)
+++ vtigercrm/trunk/include/js/Mail.js Wed Jun  7 23:12:08 2006
@@ -146,12 +146,16 @@
 }
 function sendmail(module,idstrings)
 {
-	var ajaxObj = new VtigerAjax(ajaxSendmailResponse);
-	var urlstring ="module=Emails&return_module="+module+"&action=EmailsAjax&file=mailSelect&idlist="+idstrings;
-	ajaxObj.process("index.php?",urlstring);
+        new Ajax.Request(
+                'index.php',
+                {queue: {position: 'end', scope: 'command'},
+                        method: 'post',
+                        postBody: "module=Emails&return_module="+module+"&action=EmailsAjax&file=mailSelect&idlist="+idstrings,
+                        onComplete: function(response) {
+                                        getObj('sendmail_cont').innerHTML=response.responseText;
+                        }
+                }
+        );
 }
-function ajaxSendmailResponse(response)
-{
-	getObj('sendmail_cont').innerHTML=response.responseText;
-}
+
 	



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 22:14:42 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 08 Jun 2006 05:14:42 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6968 -
	/vtigercrm/trunk/modules/Users/listroles.html
Message-ID: <20060608051442.826F97E87CD@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 23:14:38 2006
New Revision: 6968

Log:
ajax functionality has been modified

Modified:
    vtigercrm/trunk/modules/Users/listroles.html

Modified: vtigercrm/trunk/modules/Users/listroles.html
==============================================================================
--- vtigercrm/trunk/modules/Users/listroles.html (original)
+++ vtigercrm/trunk/modules/Users/listroles.html Wed Jun  7 23:14:38 2006
@@ -115,18 +115,18 @@
 	x.display="none";
 }
 
-function ajaxSaveResponse(response)
-{
-   document.getElementById("tempdiv").innerHTML=response.responseText;
-}
-
 function DeleteRole(roleid)
 {
-    //show("an_busy");
-    var ajaxObj = new VtigerAjax(ajaxSaveResponse);
-    var urlstring = "module=Users&action=UsersAjax&file=RoleDeleteStep1&roleid="+roleid;
-    ajaxObj.process("index.php?",urlstring);
+	new Ajax.Request(
+		'index.php',
+		{queue: {position: 'end', scope: 'command'},
+			method: 'post',
+			postBody: "module=Users&action=UsersAjax&file=RoleDeleteStep1&roleid="+roleid,
+			onComplete: function(response) {
+					$("tempdiv").innerHTML=response.responseText;
+			}
+		}
+	);
 }
-
 </script>
 <!-- END: main -->



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 22:40:35 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 08 Jun 2006 05:40:35 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6969 - in
 /vtigercrm/trunk/Smarty/templates: Header.tpl
 Settings/EmailNotification.tpl Settings/InventoryNotify.tpl
 Settings/ModuleOwners.tpl Settings/PickList.tpl
Message-ID: <20060608054035.42D3D7E879D@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 23:40:28 2006
New Revision: 6969

Log:
ajax.js has been removed

Modified:
    vtigercrm/trunk/Smarty/templates/Header.tpl
    vtigercrm/trunk/Smarty/templates/Settings/EmailNotification.tpl
    vtigercrm/trunk/Smarty/templates/Settings/InventoryNotify.tpl
    vtigercrm/trunk/Smarty/templates/Settings/ModuleOwners.tpl
    vtigercrm/trunk/Smarty/templates/Settings/PickList.tpl

Modified: vtigercrm/trunk/Smarty/templates/Header.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Header.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Header.tpl Wed Jun  7 23:40:28 2006
@@ -23,7 +23,6 @@
 	<!-- header-vtiger crm name & RSS -->
 	<script language="JavaScript" type="text/javascript" src="include/js/general.js"></script>
 	<script language="javascript" type="text/javascript" src="include/scriptaculous/prototype.js"></script>
-	<script language="JavaScript" type="text/javascript" src="include/js/ajax.js"></script>
 	<script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
 	<script language="JavaScript" type="text/javascript" src="include/calculator/calc.js"></script>
 	<script language="JavaScript" type="text/javascript" src="modules/Calendar/script.js"></script>

Modified: vtigercrm/trunk/Smarty/templates/Settings/EmailNotification.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Settings/EmailNotification.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Settings/EmailNotification.tpl Wed Jun  7 23:40:28 2006
@@ -10,7 +10,6 @@
  ********************************************************************************/
 -->*}
 <script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
-<script language="JavaScript" type="text/javascript" src="include/js/ajax.js"></script>
 <style type="text/css">@import url(themes/blue/style.css);</style>
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
 <tr>

Modified: vtigercrm/trunk/Smarty/templates/Settings/InventoryNotify.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Settings/InventoryNotify.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Settings/InventoryNotify.tpl Wed Jun  7 23:40:28 2006
@@ -10,7 +10,6 @@
  ********************************************************************************/
 -->*}
 <script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
-<script language="JavaScript" type="text/javascript" src="include/js/ajax.js"></script>
 <style type="text/css">@import url(themes/blue/style.css);</style>
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
 <tr>

Modified: vtigercrm/trunk/Smarty/templates/Settings/ModuleOwners.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Settings/ModuleOwners.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Settings/ModuleOwners.tpl Wed Jun  7 23:40:28 2006
@@ -10,7 +10,6 @@
  ********************************************************************************/
 -->*}
 <script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
-<script language="JavaScript" type="text/javascript" src="include/js/ajax.js"></script>
 <style type="text/css">@import url(themes/blue/style.css);</style>
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
 <tr>

Modified: vtigercrm/trunk/Smarty/templates/Settings/PickList.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Settings/PickList.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Settings/PickList.tpl Wed Jun  7 23:40:28 2006
@@ -12,7 +12,6 @@
 <script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
 <script src="include/scriptaculous/prototype.js" type="text/javascript"></script>
 <script src="include/scriptaculous/scriptaculous.js" type="text/javascript"></script>
-<script language="JavaScript" type="text/javascript" src="include/js/ajax.js"></script>
 <script>
 {literal}
 function splitvalues() {



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun  8 01:13:26 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 08 Jun 2006 08:13:26 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6970 - in
 /vtigercrm/trunk/Smarty/templates: DetailView.tpl DetailViewUI.tpl
Message-ID: <20060608081326.E58DE7E883D@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun  8 02:13:22 2006
New Revision: 6970

Log:
i18n updated

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

Modified: vtigercrm/trunk/Smarty/templates/DetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DetailView.tpl Thu Jun  8 02:13:22 2006
@@ -16,7 +16,7 @@
 
 <script language="JavaScript" type="text/javascript" src="include/js/dtlviewajax.js"></script>
 <span id="crmspanid" style="display:none;position:absolute;"  onmouseover="show('crmspanid');">
-   <a class="link"  align="right" href="javascript:;">Edit</a>
+   <a class="link"  align="right" href="javascript:;">{$APP.LBL_EDIT_BUTTON}</a>
 </span>
 
 {if $MODULE eq 'Leads' or $MODULE eq 'Contacts' or $MODULE eq 'Accounts'}
@@ -74,7 +74,7 @@
 		
 		<table align="center" border="0" cellpadding="0" cellspacing="0" width="95%"><tr><td>		
 		 <span class="lvtHeaderText"><font color="purple">[ {$ID} ] </font>{$NAME} -  {$APP[$SINGLE_MOD]} {$APP.LBL_INFORMATION}</span>&nbsp;&nbsp;<span id="vtbusy_info" style="display:none;" valign="bottom"><img src="{$IMAGE_PATH}vtbusy.gif" border="0"></span><span id="vtbusy_info" style="visibility:hidden;" valign="bottom"><img src="{$IMAGE_PATH}vtbusy.gif" border="0"></span></td><td>&nbsp;</td></tr>
-		 <tr height=20><td>{$UPDATEINFO}</td><td align="right" width="400" nowrap><div id="addtagdiv"><a href="javascript:;" onClick="show('tagdiv'),fnhide('addtagdiv'),document.getElementById('txtbox_tagfields').focus()">+addtag</a></div><div id="tagdiv" style="display:none;"><input class="textbox"  type="text" id="txtbox_tagfields" name="textbox_First Name" value=""></input>&nbsp;&nbsp;<input name="button_tagfileds" type="button" class="small" value="Tag it" onclick="return tagvalidate()"/><input name="close" type="button" class="small" value="Close" onClick="fnhide('tagdiv'),show('addtagdiv')"></div></td></tr>
+		 <tr height=20><td>{$UPDATEINFO}</td><td align="right" width="400" nowrap><div id="addtagdiv"><a href="javascript:;" onClick="show('tagdiv'),fnhide('addtagdiv'),document.getElementById('txtbox_tagfields').focus()">{$APP.LBL_ADD_TAG}</a></div><div id="tagdiv" style="display:none;"><input class="textbox"  type="text" id="txtbox_tagfields" name="textbox_First Name" value=""></input>&nbsp;&nbsp;<input name="button_tagfileds" type="button" class="small" value="{$APP.LBL_TAG_IT}" onclick="return tagvalidate()"/><input name="close" type="button" class="small" value="{$APP.LBL_CLOSE}" onClick="fnhide('tagdiv'),show('addtagdiv')"></div></td></tr>
 		 </table>			 
 		 <hr noshade size=1>
 		
@@ -171,7 +171,7 @@
                                                         <td align=right>
 							{if $header eq 'Address Information' && ($MODULE eq 'Accounts' || $MODULE eq 'Contacts' || $MODULE eq 'Leads') }
                                                         {if $MODULE eq 'Leads'}
-                                                        <input id="locateMap" name="locateMap" value="Locate Map" class="small" type="button" onClick="searchMapLocation( 'Main' )" title="Locate Map">
+                                                        <input id="locateMap" name="locateMap" value="{$APP.LBL_LOCATE_MAP}" class="small" type="button" onClick="searchMapLocation( 'Main' )" title="{$APP.LBL_LOCATE_MAP}">
                                                         {else}
                                                                 {if $MODULE eq 'Accounts'}
                                                                        {assign var=address1 value='Billing'}
@@ -181,14 +181,14 @@
                                                                        {assign var=address1 value='Mailing'}
                                                                        {assign var=address2 value='Other'}
                                                                 {/if}
-                                                                <input id="locateMap" name="locateMap" value="Locate Map" class="small" type="button" onClick="javascript:showLocateMapMenu()" title="Locate Map">
+                                                                <input id="locateMap" name="locateMap" value="{$APP.LBL_LOCATE_MAP}" class="small" type="button" onClick="javascript:showLocateMapMenu()" title="{$APP.LBL_LOCATE_MAP}">
                                                         <div id="dropDownMenu" style="position:absolute;display:none;z-index:60">
 							<table border="0" cellspacing="0" cellpadding="4">
                                                 <tr bgcolor=white class="lvtColData" onMouseOver="this.className='lvtColDataHover'" style="cursor:pointer;" onMouseOut="this.className='lvtColData'" onClick="searchMapLocation( 'Main' )">
-                                                <td>{$address1} Address</td>
+                                                <td>{$address1} {$APP.LBL_ADDRESS}</td>
                                                 </tr>
                                                 <tr bgcolor=white class="lvtColData" onMouseOver="this.className='lvtColDataHover'" style="cursor:pointer;" onMouseOut="this.className='lvtColData'"  onClick="searchMapLocation( 'Other' )">
-                                                <td>{$address2} Address</td>
+                                                <td>{$address2} {$APP.LBL_ADDRESS}</td>
                                                 </tr>
                                                 </table>
                                                 </div>
@@ -298,7 +298,7 @@
       				<tr style="height:25px">
       						<td class="rightMailMergeContent">
           						<select name="mergefile">{foreach key=templid item=tempflname from=$TOPTIONS}<option value="{$templid}">{$tempflname}</option>{/foreach}</select>
-          						<input value="Merge" onclick="this.form.action.value='Merge';" type="submit"></input>
+          						<input value="{$APP.LBL_MERGE_BUTTON_LABEL}" onclick="this.form.action.value='Merge';" type="submit"></input>
       					  </td>
       				</tr>
   				</table>

Modified: vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl Thu Jun  8 02:13:22 2006
@@ -23,16 +23,16 @@
                                                        <span id="dtlview_{$label}">{$keyval}</span>
                                               		<div id="editarea_{$label}" style="display:none;">
                                               		  <input class="detailedViewTextBox" onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" type="text" id="txtbox_{$label}" name="textbox_{$label}" maxlength='100' value="{$keyval}"></input>
-                                              		  <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
-                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
+                                              		  <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                                                        </div>
                                                   </td>
                                              {elseif $keyid eq '13'} <!--Email-->
                                                   <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}"><a href="mailto:{$keyval}" target="_blank">{$keyval}</a></span>
                                               		<div id="editarea_{$label}" style="display:none;">
                                               		  <input class="detailedViewTextBox" onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" type="text" id="txtbox_{$label}" name="textbox_{$label}" maxlength='100' value="{$keyval}"></input>
-                                              		  <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
-                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
+                                              		  <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                                                        </div>
                                                   </td>
                                              {elseif $keyid eq '15' || $keyid eq '16'} <!--ComboBox-->
@@ -45,32 +45,32 @@
                     									{/foreach}
                     								{/foreach}
                     							   </select>
-                    							   <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
-                                              		   <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
+                    							   <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                              		   <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                     							</div>
                							</td>
                                              {elseif $keyid eq '17'} <!--WebSite-->
                                                   <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}"><a href="http://{$keyval}" target="_blank">{$keyval}</a></span>
                                               		<div id="editarea_{$label}" style="display:none;">
                                               		  <input class="detailedViewTextBox" onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" type="text" id="txtbox_{$label}" name="textbox_{$label}" maxlength='100' value="{$keyval}"></input>
-                                              		  <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
-                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
+                                              		  <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                                                        </div>
                                                   </td>
                                              {elseif $keyid eq '19' || $keyid eq '20'} <!--TextArea/Description-->
                                                   <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}">{$keyval}</span>
                                               		<div id="editarea_{$label}" style="display:none;">
                                               		  <textarea id="txtbox_{$label}" name="txtbox_{$label}"  class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'"onBlur="this.className='detailedViewTextBox'" cols="90" rows="8">{$keyval}</textarea>                                            		  
-                                              		  <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
-                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
+                                              		  <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                                                        </div>
                                                   </td>
                                              {elseif $keyid eq '21' || $keyid eq '24' || $keyid eq '22'} <!--TextArea/Street-->
                                                   <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}">{$keyval}</span>
                                               		<div id="editarea_{$label}" style="display:none;">
                                               		  <textarea id="txtbox_{$label}" name="txtbox_{$label}"  class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'"onBlur="this.className='detailedViewTextBox'" rows=2>{$keyval}</textarea>                                            		  
-                                              		  <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
-                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
+                                              		  <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                                                        </div>
                                                   </td>
                                              {elseif $keyid eq '50' || $keyid eq '73' || $keyid eq '51'} <!--AccountPopup-->
@@ -78,24 +78,24 @@
                                               		<div id="editarea_{$label}" style="display:none;">                                              		  
                                                          <input readonly id="popuptxt_{$label}" name="account_name" type="text" value="{$keyval}"><input id="txtbox_{$label}" name="{$keyfldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Accounts&action=Popup&popuptype=specific&form=TasksEditView&form_submit=false","test","width=600,height=400,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'>
                                                          <!--AccountPopup/WithClear-->{if $keyid eq '51'} &nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.account_id.value=''; this.form.account_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>{/if} 
-                                              		  <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
-                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
+                                              		  <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                                                        </div>
                                                   </td>
                                              {elseif $keyid eq '57'} <!--ContactPopup-->
                                                   <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}"><a href="{$keyseclink}">{$keyval}</a></span>
                                               		<div id="editarea_{$label}" style="display:none;">                                              		  
                                                          <input id="popuptxt_{$label}" name="contact_name" readonly type="text" style="border:1px solid #bababa;" value="{$keyval}"><input id="txtbox_{$label}" name="{$keyfldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Contacts&action=Popup&html=Popup_picker&popuptype=specific&form=EditView","test","width=600,height=400,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.contact_id.value=''; this.form.contact_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
-                                                         <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
-                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
+                                                         <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                                                        </div>
                                                   </td>                                                  
                                              {elseif $keyid eq '59'} <!--ProductPopup-->
                                                   <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}"><a href="{$keyseclink}">{$keyval}</a></span>
                                               		<div id="editarea_{$label}" style="display:none;">                                              		  
                                                          <input id="popuptxt_{$label}" name="product_name" readonly type="text" value="{$keyval}"><input id="txtbox_{$label}" name="{$keyfldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Products&action=Popup&html=Popup_picker&form=HelpDeskEditView&popuptype=specific","test","width=600,height=400,resizable=1,scrollbars=1,top=150,left=200");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.product_id.value=''; this.form.product_name.value=''; return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
-                                                         <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
-                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
+                                                         <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                                                        </div>
                                                   </td>
                                              {elseif $keyid eq '75' || $keyid eq '81'} <!--VendorPopup-->
@@ -103,24 +103,24 @@
                                               		<div id="editarea_{$label}" style="display:none;">
                                                          <input id="popuptxt_{$label}" name="vendor_name" readonly type="text" style="border:1px solid #bababa;" value="{$keyval}"><input id="txtbox_{$label}" name="{$fldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Vendors&action=Popup&html=Popup_picker&popuptype=specific&form=EditView","test","width=600,height=400,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'>
                                                          {if $uitype eq 75}&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.vendor_id.value='';this.form.vendor_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>{/if}                                              		  
-                                                         <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
-                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
+                                                         <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                                                        </div>
                                                   </td>
                                              {elseif $keyid eq 76} <!--PotentialPopup-->
                                                   <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}"><a href="{$keyseclink}">{$keyval}</a></span>
                                               		<div id="editarea_{$label}" style="display:none;">                                              		  
                                                          <input id="popuptxt_{$label}" name="potential_name" readonly type="text" style="border:1px solid #bababa;" value="{$keyval}"><input id="txtbox_{$label}" name="{$keyfldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Potentials&action=Popup&html=Popup_picker&popuptype=specific_potential_account_address&form=EditView","test","width=600,height=400,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.potential_id.value=''; this.form.potential_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
-                                                         <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
-                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
+                                                         <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                                                        </div>
                                                   </td>
                                              {elseif $keyid eq 78} <!--QuotePopup-->
                                                   <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}"><a href="{$keyseclink}">{$keyval}</a></span>
                                               		<div id="editarea_{$label}" style="display:none;">                                              		  
                                                          <input id="popuptxt_{$label}" name="quote_name" readonly type="text" style="border:1px solid #bababa;" value="{$keyval}"><input id="txtbox_{$label}" name="{$keyfldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Quotes&action=Popup&html=Popup_picker&popuptype=specific&form=EditView","test","width=600,height=400,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.quote_id.value=''; this.form.quote_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
-                                                         <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
-                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
+                                                         <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                                                        </div>
                                                   </td>
                                              {elseif $keyid eq 82} <!--Email Body-->
@@ -130,8 +130,8 @@
                                                   <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}"><a href="{$keyseclink}">{$keyval}</a></span>
                                               		<div id="editarea_{$label}" style="display:none;">                                              		  
                                                          <input id="popuptxt_{$label}" name="salesorder_name" readonly type="text" style="border:1px solid #bababa;" value="{$keyval}"><input id="txtbox_{$label}" name="{$keyfldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=SalesOrder&action=Popup&html=Popup_picker&popuptype=specific&form=EditView","test","width=600,height=400,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.salesorder_id.value=''; this.form.salesorder_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
-                                                         <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
-                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
+                                                         <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                                                        </div>
                                                   </td>
 					{elseif $keyid eq '53'} <!--Assigned To-->
@@ -154,8 +154,8 @@
                     {/foreach}
                     </select>
                     <br>
-                    <input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');"/> or
-                    <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
+                    <input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');"/> or
+                    <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                     </div>
                     </td>
 					    {elseif $keyid eq '56'} <!--CheckBox--> 
@@ -166,8 +166,8 @@
                         {else}
                           <input id="txtbox_{$label}" type="checkbox" style="border:1px solid #bababa;" value="0">
                        	{/if}
-                         <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');"/> or
-                          <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
+                         <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');"/> or
+                          <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                         </div>
                         </td>     
 						{elseif $keyid eq 83}<!-- Handle the Tax in Inventory -->



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun  8 01:15:56 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 08 Jun 2006 08:15:56 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6971 -
	/vtigercrm/trunk/include/language/en_us.lang.php
Message-ID: <20060608081556.D2EF57E88E9@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun  8 02:15:52 2006
New Revision: 6971

Log:
lang file updated

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

Modified: vtigercrm/trunk/include/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/include/language/en_us.lang.php (original)
+++ vtigercrm/trunk/include/language/en_us.lang.php Thu Jun  8 02:15:52 2006
@@ -228,7 +228,15 @@
 
 'LNK_IMPORT_LEADS'=>'Import Leads',
 
-
+'LBL_LOCATE_MAP'=>'Locate Map',
+
+'LBL_ADDRESS'=>'Address',
+
+'LBL_ADD_TAG'=>'+addtag',
+
+'LBL_TAG_IT'=>'Tag it',
+
+'LBL_CLOSE'=>'Close',
 
 'LNK_ADVANCED_SEARCH'=>'Advanced Search',
 



From vtiger-tickets at vtiger.fosslabs.com  Thu Jun  8 04:14:47 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 08 Jun 2006 11:14:47 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231274=3A?=
 =?utf-8?q?_customer_portal_5=2E0_missing?=
In-Reply-To: <076.709d4c1791ce9aaefba03d131eecd0c0@vtiger.fosslabs.com>
References: <076.709d4c1791ce9aaefba03d131eecd0c0@vtiger.fosslabs.com>
Message-ID: <085.266d9dfe137dc926f5bf48ece4b64d21@vtiger.fosslabs.com>

#1274: customer portal 5.0 missing
-----------------------------+----------------------------------------------
  Reporter:  anonymous       |       Owner:  mickie
      Type:  defect          |      Status:  new   
  Priority:  blocker         |   Milestone:        
 Component:  customerportal  |     Version:  5.0.0 
Resolution:                  |    Keywords:        
-----------------------------+----------------------------------------------
Changes (by richie):

  * owner:  developer => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1274>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun  8 04:16:39 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 08 Jun 2006 11:16:39 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6972 -
	/vtigercrm/trunk/data/SugarBean.php
Message-ID: <20060608111639.6816E7E88FD@vtiger.fosslabs.com>

Author: richie
Date: Thu Jun  8 05:16:34 2006
New Revision: 6972

Log:
removed unwanted methods

Modified:
    vtigercrm/trunk/data/SugarBean.php

Modified: vtigercrm/trunk/data/SugarBean.php
==============================================================================
--- vtigercrm/trunk/data/SugarBean.php (original)
+++ vtigercrm/trunk/data/SugarBean.php Thu Jun  8 05:16:34 2006
@@ -199,16 +199,6 @@
 		return $this;
 	}
 
-	/**
-	 * This function returns a paged list of the current object type.  It is intended to allow for
-	 * hopping back and forth through pages of data.  It only retrieves what is on the current page.
-	 * This method must be called on a new instance.  It trashes the values of all the fields in the current one.
-	 */
-	function get_lead_list($order_by = "", $where = "", $row_offset = 0) {
-		$query = $this->create_lead_list_query($order_by, $where);
-		return $this->process_list_query($query, $row_offset);
-	}
-		
 	function get_list($order_by = "", $where = "", $row_offset = 0, $limit=-1, $max=-1) {
 		$this->log->debug("get_list:  order_by = '$order_by' and where = '$where' and limit = '$limit'");
 		
@@ -342,14 +332,6 @@
 	 * All Rights Reserved..
 	 * Contributor(s): ______________________________________..
 	 */
-/*	function track_view($user_id, $current_module)
-	{
-		$this->log->debug("About to call tracker (user_id, module_name, item_id)($user_id, $current_module, $this->id)");
-
-		$tracker = new Tracker();
-		$tracker->track_view($user_id, $current_module, $this->id, $this->get_summary_text());
-	}
-	*/
 	function track_view($user_id, $current_module,$id='')
 	{
 		$this->log->debug("About to call tracker (user_id, module_name, item_id)($user_id, $current_module, $this->id)");
@@ -358,30 +340,6 @@
 		$tracker->track_view($user_id, $current_module, $id, '');
 	}
 
-
-	/**
-	 * This is designed to be overridden and add specific fields to each record.  This allows the generic query to fill in
-	 * the major fields, and then targetted queries to get related fields and add them to the record.  The contact's account for instance.
-	 * This method is only used for populating extra fields in lists
-	 * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc..
-	 * All Rights Reserved..
-	 * Contributor(s): ______________________________________..
-	 */
-	function fill_in_additional_list_fields()
-	{
-	}
-
-	/**
-	 * This is designed to be overridden and add specific fields to each record.  This allows the generic query to fill in
-	 * the major fields, and then targetted queries to get related fields and add them to the record.  The contact's account for instance.
-	 * This method is only used for populating extra fields in the detail form
-	 * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc..
-	 * All Rights Reserved..
-	 * Contributor(s): ______________________________________..
-	 */
-	function fill_in_additional_detail_fields()
-	{
-	}
 
 	/** This function should be overridden in each module.  It marks an item as deleted.
 	* If it is not overridden, then marking this type of item is not allowed
@@ -403,11 +361,11 @@
 	}
 
 
-	/* This is to allow subclasses to fill in row specific columns of a list view form */
+	/* This is to allow subclasses to fill in row specific columns of a list view form 
 	function list_view_parse_additional_sections(&$list_form)
 	{
 	}
-
+	*/
 	/* This function assigns all of the values into the template for the list view */
 	function get_list_view_array(){
 		$return_array = Array();
@@ -489,31 +447,6 @@
 			} 
 		} 
 	}
-	/**
-		builds a generic search based on the query string using or
-		do not include any $this-> because this is called on without having the class instantiated
-	*/
-	function build_generic_where_clause($value){
-			$where_clause = "WHERE "; 
-		$first = 1; 
-		foreach ($fields_array as $name=>$value) 
-		{ 
-			if ($first) 
-			{ 
-				$first = 0;
-			} 
-			else 
-			{ 
-				$where_clause .= " or";
-			} 
-
-			$where_clause .= "$name = ".$adb->quote($value)."";
-		} 
-
-		$where_clause .= " AND deleted=0";
-		return $where_clause;
-	}
-
 }
 
 



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun  8 04:46:30 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 08 Jun 2006 11:46:30 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6973 -
	/vtigercrm/trunk/include/ListView/ListView.php
Message-ID: <20060608114630.A8AF97E8829@vtiger.fosslabs.com>

Author: richie
Date: Thu Jun  8 05:46:26 2006
New Revision: 6973

Log:
removed unwanted methods

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 Jun  8 05:46:26 2006
@@ -40,17 +40,6 @@
 	var $querey_where_has_changed = false;
 	var $display_header_and_footer = true;
 
-/**sets whether or not to display the xtemplate header and footer
- * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
- * All Rights Reserved.
- * 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
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
@@ -79,17 +68,6 @@
 		$log->debug("Exiting ListView method ...");
 	}	
 }
-/**sets how many records should be displayed per page in the list view
- * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
- * All Rights Reserved.
- * 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;
@@ -108,35 +86,6 @@
 	$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.
- * All Rights Reserved.
- * 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
- * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
- * All Rights Reserved.
- * 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);
-	$log->debug("Exiting initNewXTemplate method ...");	
-}
-
-
 /**sets the parameters dealing with the db
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
  * All Rights Reserved.
@@ -203,13 +152,6 @@
 	
 }
 
-function displayArrow(){
-	global $log;
-	$log->debug("Entering displayArrow() method ...");
-	 $log->debug("Exiting displayArrow method ...");
-	
-}
-
 /**sets the theme used only use if it is different from the global
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
  * All Rights Reserved.
@@ -283,101 +225,6 @@
 
 }
 
-/**INTERNAL FUNCTION creates an XTemplate DO NOT CALL THIS THIS IS AN INTERNAL FUNCTION
- * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
- * All Rights Reserved.
- * 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);
-			$this->xTemplate->assign("APP", $this->local_app_strings);
-			if(isset($this->local_mod_strings))$this->xTemplate->assign("MOD", $this->local_mod_strings);
-			$this->xTemplate->assign("THEME", $this->local_theme);
-			$this->xTemplate->assign("IMAGE_PATH", $this->local_image_path);
-			$this->xTemplate->assign("MODULE_NAME", $this->local_current_module);
-		}else{
-			$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
- * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
- * All Rights Reserved.
- * Contributor(s): ______________________________________.
-*/
- function setXTemplate(&$newXTemplate){
-	global $log;
-	$log->debug("Entering setXTemplate(".$newXTemplate.") method ...");
-	$this->xTemplate = $newXTemplate;
-	$log->debug("Exiting setXTemplate method ...");
-}
-
-/**returns the XTemplate
- * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
- * All Rights Reserved.
- * Contributor(s): ______________________________________.
-*/
- function getXTemplate(){	
-	global $log;
-	$log->debug("Entering getXTemplate() method ...");
-	$log->debug("Exiting getXTemplate method ...");
-	return $this->xTemplate;	
-}
-
-/**assigns a name value pair to the XTemplate
- * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
- * All Rights Reserved.
- * 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 ...");
-		
-}
-
-/**INTERNAL FUNCTION returns the offset first checking the querey then checking the session if the where clause has changed from the last time it returns 0
- * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
- * All Rights Reserved.
- * 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;	
-}
-
-/**INTERNAL FUNCTION sets the offset in the session
- * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
- * All Rights Reserved.
- * 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
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
@@ -439,234 +286,6 @@
 	return $this->local_current_module."_".$localVarName."_".$varName;
 }
 
-/**
-
- * @return void
- * @param unknown $seed
- * @param unknown $xTemplateSection
- * @param unknown $html_varName
- * @desc INTERNAL FUNCTION Handles List Views using seeds that extend SugarBean
-	$XTemplateSection is the section in the XTemplate file that should be parsed usually main
-	$html_VarName is the variable name used in the XTemplateFile e.g. TASK
-	$seed is a seed that extends SugarBean
-	 * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc..
-	 * All Rights Reserved..
-	 * 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'];
-	$row_count = $response['row_count'];
-	$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;
-}
-
-/**
-
- * @return void
- * @param unknown $data
- * @param unknown $xTemplateSection
- * @param unknown $html_varName
- * @desc INTERNAL FUNCTION process the List Navigation
- * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
- * All Rights Reserved.
- * 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;
-	global $theme;
-    $theme_path="themes/".$theme."/";
-    $image_path=$theme_path."images/";
-
-	$start_record = $current_offset + 1;
-	if($row_count == 0)
-		$start_record = 0;
-	$end_record = $start_record + $this->records_per_page;
-	// back up the the last page.
-	if($end_record > $row_count+1)
-	{
-		$end_record = $row_count+1;
-	}
-	// Deterime the start location of the last page
-	if($row_count == 0)
-		$number_pages = 0;
-	else
-		$number_pages = floor(($row_count - 1) / $this->records_per_page);
-	$last_offset = $number_pages * $this->records_per_page;
-	if(empty($this->query_limit) || $this->query_limit > $this->records_per_page){
-		$base_URL = $_SERVER['PHP_SELF'];
-		if(isset($_SERVER['QUERY_STRING'])){
-			$base_URL = ereg_replace("\&".$this->getSessionVariableName($html_varName,"ORDER_BY")."=[0-9a-zA-Z\_]*","",$base_URL .'?'.$_SERVER['QUERY_STRING']);
-			$base_URL = ereg_replace("\&".$this->getSessionVariableName($html_varName,"offset")."=[0-9]*","",$base_URL);
-		}
-		if($_SERVER['REQUEST_METHOD'] == 'POST'){
-			$base_URL .= '?';
-			if(isset($_REQUEST['action'])) $base_URL .= '&action='.$_REQUEST['action'];
-			if(isset($_REQUEST['record'])) $base_URL .= '&record='.$_REQUEST['record'];
-			if(isset($_REQUEST['module'])) $base_URL .= '&module='.$_REQUEST['module'];
-		}	
-		$base_URL .= "&".$this->getSessionVariableName($html_varName,"offset")."=";
-		$current_URL = $base_URL.$current_offset;
-		$start_URL = $base_URL."0";
-		$previous_URL  = $base_URL.$previous_offset;
-		$next_URL  = $base_URL.$next_offset;
-		$end_URL  = $base_URL.$last_offset;
-		$sort_URL_base = $base_URL. "&".$this->getSessionVariableName($html_varName,"ORDER_BY")."=";
-
-		$this->log->debug("Offsets: (start, previous, next, last)(0, $previous_offset, $next_offset, $last_offset)");
-
-		if(0 == $current_offset){
-			$start_link = '<img src="'.$image_path.'start_disabled.gif" border="0" align="absmiddle">&nbsp;';
-			$previous_link = '<img src="'.$image_path.'previous_disabled.gif" border="0" align="absmiddle">&nbsp;';
-		}else{
-			$start_link = "<a href=\"$start_URL\"><img src='".$image_path."start.gif' border='0' align='absmiddle'></a>";
-			$previous_link = "<a href=\"$previous_URL\"><img src='".$image_path."previous.gif' border='0' align='absmiddle'></a>";
-		}
-
-		if($last_offset <= $current_offset){
-			$next_link = '<img src="'.$image_path.'next_disabled.gif" border="0" align="absmiddle">&nbsp;';
-			$end_link = '<img src="'.$image_path.'end_disabled.gif" border="0" align="absmiddle">&nbsp;';
-		}
-		else{
-			$end_link = "<a href=\"$end_URL\"><img src='".$image_path."end.gif' border='0' align='absmiddle'>&nbsp;</a>";
-			$next_link = "<a href=\"$next_URL\"><img src='".$image_path."next.gif' border='0' align='absmiddle'></a>";
-		}
-		global $current_module;
-		$this->log->info("Offset (next, current, prev)($next_offset, $current_offset, $previous_offset)");
-		$this->log->info("Start/end records ($start_record, $end_record)");
-		if($sort_URL_base !== "") $this->xTemplate->assign("ORDER_BY", $sort_URL_base);
-		$this->xTemplate->assign("START_RECORD", $start_record);
-		$this->xTemplate->assign("END_RECORD", $end_record-1);
-		$this->xTemplate->assign("ROW_COUNT", $row_count);
-		if ($start_link !== "") $this->xTemplate->assign("START_LINK", $start_link);
-		if ($end_link !== "")$this->xTemplate->assign("END_LINK", $end_link);
-		if ($next_link !== "") $this->xTemplate->assign("NEXT_LINK", $next_link);
-		if ($previous_link !== "") $this->xTemplate->assign("PREVIOUS_LINK", $previous_link);
-
-		$_SESSION['export_where'] = $this->query_where;
-
-		$export_link = "<a target=\"_blank\" href=\"include\export.php?module=".$this->local_current_module."\" class=\"listFormHeaderLinks\">".$this->local_app_strings['LBL_EXPORT']."</a>";
-
-		if ($_REQUEST['module']== 'Home' || 
-			$this->local_current_module == 'Import' ||
-			($allow_exports=='none' || ( $allow_exports=='admin' && ! is_admin($current_user) ) ) )
-		{
-			$this->xTemplate->assign("EXPORT_LINK", "");
-		}
-		else
-		{
-			$this->xTemplate->assign("EXPORT_LINK", "&nbsp;[ ".$export_link." ]");
-		}
-		$this->xTemplate->parse($xtemplateSection.".list_nav_row");
-		$log->debug("Exiting processListNavigation method ...");	
-	}	
-}
-/**
-
- * @return void
- * @param unknown $data
- * @param unknown $xTemplateSection
- * @param unknown $html_varName
- * @desc INTERNAL FUNCTION handles the rows
- * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
- * All Rights Reserved.
- * 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)
-	{
-		$fields = $aItem->get_list_view_data();
-		$this->xTemplate->assign($html_varName, $fields);
-
-		if($oddRow)
-		{
-			$this->xTemplate->assign("ROW_COLOR", 'oddListRow');
-		}
-		else
-		{
-			$this->xTemplate->assign("ROW_COLOR", 'evenListRow');
-		}
-		$oddRow = !$oddRow;
-
-		$aItem->list_view_parse_additional_sections($this->xTemplate, $xtemplateSection);
-		$this->xTemplate->parse($xtemplateSection.".row");
-	}
-	$this->xTemplate->parse($xtemplateSection);	
-	$log->debug("Exiting processListRows method ...");
-}
-/**
-
- * @return void
- * @param unknown $seed
- * @param unknown $xTemplateSection
- * @param unknown $html_varName
- * @desc PUBLIC FUNCTION Handles List Views using seeds that extend SugarBean
-	$XTemplateSection is the section in the XTemplate file that should be parsed usually main
-	$html_VarName is the variable name used in the XTemplateFile e.g. TASK
-	$seed is a seed there are two types of seeds one is a subclass of SugarBean, the other is a list usually created from a sugar bean using get_list
-	if no XTemplate is set it will create  a new XTemplate
-	 * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc..
-	 * All Rights Reserved..
-	 * 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");
-	$list = null;
-	if($isSugarBean){
-		$list =	$this->processSugarBean($xTemplateSection, $html_varName, $seed);
-	}else{
-		$list = &$seed;
-	}
-	
-	$this->processSortArrows($html_varName);
-	$this->processListRows($list,$xTemplateSection, $html_varName);
-	if($this->display_header_and_footer)
-		echo get_form_header( $this->header_title, $this->header_text, false);
-	$this->xTemplate->out($xTemplateSection);
-	if($this->display_header_and_footer)
-		echo get_form_footer();
-	if($isSugarBean )
-		echo "</td></tr>\n</table>\n";
-	$log->debug("Exiting processListView method ...");
-		
-	//if(isset($_SESSION['validation'])){
-	//	print base64_decode('PGEgaHJlZj0naHR0cDovL3d3dy5zdWdhcmNybS5jb20nPlBPV0VSRUQmbmJzcDtCWSZuYnNwO1NVR0FSQ1JNPC9hPg==');
-//}
-		
-}
-
-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 = "&nbsp;<img border='0' src='".$this->local_image_path."/arrow_down.gif' >";
-	if($desc){
-		$imgArrow = "&nbsp;<img border='0' src='".$this->local_image_path."/arrow_up.gif' >";
-	}	
-	if($orderBy == 'amount*1')	
-		$this->xTemplateAssign('amount_arrow', $imgArrow);		
-	else{
-		$this->xTemplateAssign($orderBy.'_arrow', $imgArrow);
-	}
-	$log->debug("Exiting processSortArrows method ...");	
-}
 
 }
 



From vtiger-tickets at vtiger.fosslabs.com  Thu Jun  8 04:59:34 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 08 Jun 2006 11:59:34 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231282=3A?=
 =?utf-8?q?_Problems_with_graphs_-_Sales_Orders_by_Account?=
Message-ID: <076.9cc8264925ac84b43a6a0aafbcf08aae@vtiger.fosslabs.com>

#1282: Problems with graphs - Sales Orders by Account
-----------------------------+----------------------------------------------
 Reporter:  arosewarne       |       Owner:  developer
     Type:  defect           |      Status:  new      
 Priority:  major            |   Milestone:           
Component:  vtigercrm        |     Version:  5.0.0    
 Keywords:  analytics graph  |  
-----------------------------+----------------------------------------------
 - If there is a comma in any account name the graph bars and acale become
 misaligned and unreadable
  - When you click on a bar it does not return the refined search. This is
 because it passes through 'accountid' when it should pass 'account_id'

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1282>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun  8 05:00:41 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 08 Jun 2006 12:00:41 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231124=3A?=
	=?utf-8?q?_issue_in_attachments?=
In-Reply-To: <076.eece6f4dd358282fca02037b81e9226c@vtiger.fosslabs.com>
References: <076.eece6f4dd358282fca02037b81e9226c@vtiger.fosslabs.com>
Message-ID: <085.b67f19aadc1d46cdfbca47a84bb67053@vtiger.fosslabs.com>

#1124: issue in attachments
------------------------+---------------------------------------------------
  Reporter:  mangai     |       Owner:  mickie
      Type:  defect     |      Status:  closed
  Priority:  critical   |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  invalid    |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mickie):

  * resolution:  => invalid
  * status:  new => closed

Comment:

 Now from relatedlists we can attach files one by one. we cannot attach
 multiple files at a time. so that this problem will not occur.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1124>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun  8 05:13:04 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 08 Jun 2006 12:13:04 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6974 -
	/vtigercrm/trunk/modules/Potentials/Opportunity.php
Message-ID: <20060608121304.9E48D7E8911@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun  8 06:13:00 2006
New Revision: 6974

Log:
* Modified the query to get the assigned to user name for quote relatedlist 

Modified:
    vtigercrm/trunk/modules/Potentials/Opportunity.php

Modified: vtigercrm/trunk/modules/Potentials/Opportunity.php
==============================================================================
--- vtigercrm/trunk/modules/Potentials/Opportunity.php (original)
+++ vtigercrm/trunk/modules/Potentials/Opportunity.php Thu Jun  8 06:13:00 2006
@@ -471,7 +471,7 @@
 		$returnset = '&return_module=Potentials&return_action=DetailView&return_id='.$id;
 
 
-		$query = "select crmentity.*, quotes.*,potential.potentialname from quotes inner join crmentity on crmentity.crmid=quotes.quoteid 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 potential.potentialid=".$id;
+		$query = "select crmentity.*, quotes.*, potential.potentialname, users.user_name from quotes inner join crmentity on crmentity.crmid=quotes.quoteid 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 left join users on users.id=crmentity.smownerid where crmentity.deleted=0 and potential.potentialid=".$id;
 		$log->debug("Exiting get_quotes method ...");
 		return  GetRelatedList('Potentials','Quotes',$focus,$query,$button,$returnset);
 	}



From vtiger-tickets at vtiger.fosslabs.com  Thu Jun  8 05:13:46 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 08 Jun 2006 12:13:46 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23984=3A_?=
 =?utf-8?q?Assigned_to_Field_is_blank_when_adding_Quote_from_Potential_Rel?=
 =?utf-8?q?ated_List?=
In-Reply-To: <076.965de5c278750b9b10a94849f6dde98c@vtiger.fosslabs.com>
References: <076.965de5c278750b9b10a94849f6dde98c@vtiger.fosslabs.com>
Message-ID: <085.ee72920062448473e2279e653ee54579@vtiger.fosslabs.com>

#984: Assigned to Field is blank when adding Quote from Potential Related List
------------------------+---------------------------------------------------
  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:  new => closed

Comment:

 This issue has been fixed and the file has been checkedin in svn.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/984>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun  8 05:23:07 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 08 Jun 2006 12:23:07 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231274=3A?=
 =?utf-8?q?_customer_portal_5=2E0_missing?=
In-Reply-To: <076.709d4c1791ce9aaefba03d131eecd0c0@vtiger.fosslabs.com>
References: <076.709d4c1791ce9aaefba03d131eecd0c0@vtiger.fosslabs.com>
Message-ID: <085.00e08e4230c4cf783055dbfa2963827d@vtiger.fosslabs.com>

#1274: customer portal 5.0 missing
-----------------------------+----------------------------------------------
  Reporter:  anonymous       |       Owner:  mickie
      Type:  defect          |      Status:  new   
  Priority:  blocker         |   Milestone:        
 Component:  customerportal  |     Version:  5.0.0 
Resolution:                  |    Keywords:        
-----------------------------+----------------------------------------------
Comment (by mickie):

 Here the customerportal is working.
 can you please let us know the following details
 1. URL of your vtiger server
 2. URL to access the customerportal
 3. values given for the variables $Server_Path and $Authenticate_Path in
 customerportal/PortalConfig.php file.
 This will help us to debug the problem further.if you do not want to post
 the details here then please send a PM or you can send to mickie at
 vtiger.com

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1274>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun  8 05:36:37 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 08 Jun 2006 12:36:37 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231018=3A?=
 =?utf-8?q?_HelpDesk_-_Cancel_button_in_FileUpload_page=2E?=
In-Reply-To: <076.55eb71bdbfc0dc234d8a5f6c145f3221@vtiger.fosslabs.com>
References: <076.55eb71bdbfc0dc234d8a5f6c145f3221@vtiger.fosslabs.com>
Message-ID: <085.739d08d330c98503221f8e55d7999e19@vtiger.fosslabs.com>

#1018: HelpDesk - Cancel button in FileUpload page.
------------------------+---------------------------------------------------
  Reporter:  saraj      |       Owner:  mickie             
      Type:  defect     |      Status:  closed             
  Priority:  major      |   Milestone:                     
 Component:  vtigercrm  |     Version:  5.0.0              
Resolution:  fixed      |    Keywords:  helpdesk fileupload
------------------------+---------------------------------------------------
Changes (by mickie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 In previous releases, when we click on new attachment from relatedlist the
 control goes to a new page to browse the file. But now the attachment
 option has been given as Popup window where as in popup window we have
 cancel button.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1018>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun  8 06:01:04 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 08 Jun 2006 13:01:04 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231283=3A?=
 =?utf-8?q?_Issue_in_Related_List_Sorting?=
Message-ID: <076.eb979459170c63c66e73d114d83eb936@vtiger.fosslabs.com>

#1283: Issue in Related List Sorting
----------------------------------+-----------------------------------------
 Reporter:  saraj                 |       Owner:  saraj
     Type:  defect                |      Status:  new  
 Priority:  major                 |   Milestone:       
Component:  vtigercrm             |     Version:  5.0.0
 Keywords:  sorting related list  |  
----------------------------------+-----------------------------------------
 In Related List, if sorted the entries or the records gets disappeared.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1283>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun  8 07:14:12 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 08 Jun 2006 14:14:12 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23117=3A_?=
 =?utf-8?q?issue_in_Page_navigation?=
In-Reply-To: <076.6c2b56e976313ee3444368c0830c47ae@vtiger.fosslabs.com>
References: <076.6c2b56e976313ee3444368c0830c47ae@vtiger.fosslabs.com>
Message-ID: <085.d9f16e479dc2b0afcc842b629edb4b6f@vtiger.fosslabs.com>

#117: issue in Page navigation
------------------------+---------------------------------------------------
  Reporter:  jeri       |       Owner:  philip    
      Type:  defect     |      Status:  closed    
  Priority:  major      |   Milestone:  5.0.0     
 Component:  vtigercrm  |     Version:  5.0.0     
Resolution:  fixed      |    Keywords:  pagination
------------------------+---------------------------------------------------
Changes (by saraj):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/117>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun  8 07:28:49 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 08 Jun 2006 14:28:49 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6975 -
	/vtigercrm/trunk/include/formbase.php
Message-ID: <20060608142849.7E8817E8944@vtiger.fosslabs.com>

Author: richie
Date: Thu Jun  8 08:28:44 2006
New Revision: 6975

Log:
file not needed

Removed:
    vtigercrm/trunk/include/formbase.php



From vtiger-tickets at vtiger.fosslabs.com  Thu Jun  8 08:01:20 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 08 Jun 2006 15:01:20 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231284=3A?=
 =?utf-8?q?_Removal_of_commented-out_code_is_helpful?=
Message-ID: <076.1f009815df5e22f62e7a2c599acd3ebf@vtiger.fosslabs.com>

#1284: Removal of commented-out code is helpful
-----------------------+----------------------------------------------------
 Reporter:  jeffk      |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  minor      |   Milestone:  5.0.0    
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 Just a generalized meta-item following up richie's good work removing
 unused methods as seen in r6972, r6973.

 In addition to removal of unused code, I think we should also remove
 commented-out code from the codebase when encountering it:

  - Code removed is code that can't have bugs.
  - Commented lines suffer bit-rot from lack of  API updates, etc.
  - PHP comment blocks are easy to accidentally uncomment, another source
 of bugs.

 Subversion's support for merging changesets encourages removal of unwanted
 code, because you'll always be able to bring it back in-place.

 The only thing you need to do is make a clearly worded note of it in the
 commit message, and optionally document code removal via a trac ticket.

 Commit messages and trac tickets are searchable resources, and properly
 documented, removal of commented code won't prevent us from finding the
 old code if we need it.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1284>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun  8 08:03:24 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 08 Jun 2006 15:03:24 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231284=3A?=
 =?utf-8?q?_Removal_of_commented-out_code_is_helpful?=
In-Reply-To: <076.1f009815df5e22f62e7a2c599acd3ebf@vtiger.fosslabs.com>
References: <076.1f009815df5e22f62e7a2c599acd3ebf@vtiger.fosslabs.com>
Message-ID: <085.38be6ab811231ec70d02afa2b7309edd@vtiger.fosslabs.com>

#1284: Removal of commented-out code is helpful
------------------------+---------------------------------------------------
  Reporter:  jeffk      |       Owner:  developer
      Type:  defect     |      Status:  new      
  Priority:  minor      |   Milestone:  5.0.0    
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:             |    Keywords:           
------------------------+---------------------------------------------------
Comment (by jeffk):

 My inspiration for this ticket:

 http://www.nedbatchelder.com/text/deleting-code.html

 and fixing my typo'd list:

  * Code removed is code that can't have bugs.
  * Commented lines suffer bit-rot from lack of API updates, etc.
  * PHP comment blocks are easy to accidentally uncomment, another source
 of bugs.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1284>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun  8 08:39:15 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 08 Jun 2006 15:39:15 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231281=3A?=
 =?utf-8?q?_Quotes_without_an_associated_potential_do_not_display_in_list_?=
 =?utf-8?q?views=2E?=
In-Reply-To: <076.8b6d308ffb189659226c108a73a27dea@vtiger.fosslabs.com>
References: <076.8b6d308ffb189659226c108a73a27dea@vtiger.fosslabs.com>
Message-ID: <085.3de01c3fa539b219505e323d87349525@vtiger.fosslabs.com>

#1281: Quotes without an associated potential do not display in list views.
---------------------------------------+------------------------------------
  Reporter:  sebastian_sw at hotmail.com  |       Owner:  allanbush
      Type:  defect                    |      Status:  assigned 
  Priority:  critical                  |   Milestone:           
 Component:  vtigercrm                 |     Version:  4.2.4rc3 
Resolution:                            |    Keywords:           
---------------------------------------+------------------------------------
Comment (by allanbush):

 Just want to add a note that I think the second part of this bug about
 sales orders not appearing in the account related lists is side effect of
 the first bug.  Because the page craps out when it encounters the bad
 query the rest of the page (including the sales order list) isn't
 rendered.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1281>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun  8 08:45:49 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 08 Jun 2006 15:45:49 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231285=3A?=
	=?utf-8?q?_picklist_-_custom_field?=
Message-ID: <076.d54873cd2f44419ccf2fc08db8faed61@vtiger.fosslabs.com>

#1285: picklist - custom field
-----------------------+----------------------------------------------------
 Reporter:  anonymous  |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  blocker    |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 If you create custom field as picklist, you may access and modify it by
 Settings > Picklist. When you delete this custom field, the entire
 picklist menu at Studio is not availabel anymore. The picklist menu still
 points to a DB entry what is not available anymore.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1285>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun  8 10:46:35 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 08 Jun 2006 17:46:35 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6976 - in
 /vtigercrm/trunk/modules: Accounts/Account.php Contacts/Contact.php
 Leads/Lead.php Potentials/Opportunity.php
Message-ID: <20060608174635.B4CE57E8954@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun  8 11:46:27 2006
New Revision: 6976

Log:
Removed the variables names corresponding to each module in field table - ahmed

Modified:
    vtigercrm/trunk/modules/Accounts/Account.php
    vtigercrm/trunk/modules/Contacts/Contact.php
    vtigercrm/trunk/modules/Leads/Lead.php
    vtigercrm/trunk/modules/Potentials/Opportunity.php

Modified: vtigercrm/trunk/modules/Accounts/Account.php
==============================================================================
--- vtigercrm/trunk/modules/Accounts/Account.php (original)
+++ vtigercrm/trunk/modules/Accounts/Account.php Thu Jun  8 11:46:27 2006
@@ -38,24 +38,9 @@
 	var $log;
 	var $db;
 
-
-	// Stored fields
-	var $id;
-	var $mode;
-
-	// These are for related fields
-	var $opportunity_id;
-	var $contact_id;
-	var $note_id;
-	var $email_id;
-	var $member_id;
-	var $parent_name;
-	var $assigned_user_name;
-
 	var $table_name = "account";
 	var $tab_name = Array('crmentity','account','accountbillads','accountshipads','accountscf');
 	var $tab_name_index = Array('crmentity'=>'crmid','account'=>'accountid','accountbillads'=>'accountaddressid','accountshipads'=>'accountaddressid','accountscf'=>'accountid');
-
 
 	var $entity_table = "crmentity";
 
@@ -92,10 +77,6 @@
 			'Assigned To'=>'assigned_user_id'
 			);
 	var $list_link_field= 'accountname';
-
-	var $record_id;
-	var $list_mode;
-	var $popup_type;
 
 	var $search_fields = Array(
 			'Account Name'=>Array('account'=>'accountname'),

Modified: vtigercrm/trunk/modules/Contacts/Contact.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/Contact.php (original)
+++ vtigercrm/trunk/modules/Contacts/Contact.php Thu Jun  8 11:46:27 2006
@@ -37,28 +37,9 @@
 	var $log;
 	var $db;
 
-	// Stored fields
-	var $id;
-	var $mode;
-
-	var $contactid;
-	
-
-	// These are for related fields
-	var $accountname;
-	var $accountid;
-	var $campaignid;
-	var $reports_to_name;
-	var $opportunity_id;
-	var $note_id;
-	var $email_id;
-	var $assigned_user_name;
-		
 	var $table_name = "contactdetails";
 	var $tab_name = Array('crmentity','contactdetails','contactaddress','contactsubdetails','contactscf','customerdetails','attachments');
 	var $tab_name_index = Array('crmentity'=>'crmid','contactdetails'=>'contactid','contactaddress'=>'contactaddressid','contactsubdetails'=>'contactsubscriptionid','contactscf'=>'contactid','customerdetails'=>'customerid','attachments'=>'attachmentsid');
-
-
 
 	var $module_id = "contactid";
 	var $object_name = "Contact";
@@ -124,10 +105,6 @@
 	'Phone' => 'phone',
 	'Assigned To' => 'assigned_user_id'
 	);
-
-	var $record_id;
-	var $list_mode;
-        var $popup_type;
 
 	var $search_fields = Array(
 	'Name' => Array('contactdetails'=>'lastname'),

Modified: vtigercrm/trunk/modules/Leads/Lead.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/Lead.php (original)
+++ vtigercrm/trunk/modules/Leads/Lead.php Thu Jun  8 11:46:27 2006
@@ -27,54 +27,6 @@
 class Lead extends CRMEntity {
 	var $log;
 	var $db;
-
-	// Stored fields
-	var $leadid;
-	var $email;
-	var $firstname;
-	var $salutation;
-	var $lastname;
-	var $company;
-	var $annualrevenue;
-
-	var $industry;
-	var $campaign;
-	var $rating;
-	var $status;
-	var $leadsource;
-	var $designation;
-	var $licencekey;
-	var $region;
-	var $space;
-	var $comments;
-	var $priority;
-	var $partnercontact;
-	var $maildate;
-	var $nextstepdate;
-	var $fundingsituation;
-	var $deleted;
-
-	var $description;
-	// These are for related fields
-	var $city;
-	var $code;
-	var $state;
-	var $country;
-	var $phone;
-	var $mobile;
-	var $fax;
-	var $lane;
-	var $leadaddresstype;
-	var $currency;
-	var $website;
-	var $callornot;
-	var $readornot;
-	var $empct;
-
-	var $accountid;
-	var $contactid;
-	var $campaignid;
-	var $potentialid;
 
 	var $module_id = "leadid";
 
@@ -124,10 +76,6 @@
 		'Assigned To'=>'assigned_user_id'
 	);
 	var $list_link_field= 'lastname';
-
-	var $record_id;
-	var $list_mode;
-	var $popup_type;
 
 	var $search_fields = Array(
 		'Name'=>Array('leaddetails'=>'lastname'),

Modified: vtigercrm/trunk/modules/Potentials/Opportunity.php
==============================================================================
--- vtigercrm/trunk/modules/Potentials/Opportunity.php (original)
+++ vtigercrm/trunk/modules/Potentials/Opportunity.php Thu Jun  8 11:46:27 2006
@@ -35,14 +35,6 @@
 class Potential extends CRMEntity {
 	var $log;
 	var $db;
-	// Stored fields
-	var $id;
-	var $potentialid;
-	var $private;
-
-	var $stage;
-
-	var $deleted;
 
 	var $module_name="Potentials";
 	var $table_name = "potential";
@@ -79,10 +71,6 @@
 
 	var $list_link_field= 'potentialname';
 
-	var $record_id;
-	var $list_mode;
-	var $popup_type;
-
 	var $search_fields = Array(
 			'Potential'=>Array('potential'=>'potentialname'),
 			'Account Name'=>Array('potential'=>'accountid'),
@@ -114,8 +102,6 @@
 	}
 
 	var $new_schema = true;
-
-
 
 	function create_list_query($order_by, $where)
 	{



From vtiger-tickets at vtiger.fosslabs.com  Thu Jun  8 20:13:06 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 09 Jun 2006 03:13:06 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231286=3A?=
 =?utf-8?q?_Getting_a_warning_message_in_the_week_view_of_the_calendar?=
Message-ID: <076.09b3d19c2818c145cad7974f71d66816@vtiger.fosslabs.com>

#1286: Getting a warning message in the week view of the calendar
-----------------------+----------------------------------------------------
 Reporter:  Jaguar     |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  minor      |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 Getting the following error in the week view of the calendar:-

 Warning: array_push(): First argument should be an array in
 /home/site/html/products/crm/demo_5beta/modules/Calendar/Calendar.php on
 line 187

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1286>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun  8 22:22:20 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 09 Jun 2006 05:22:20 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231287=3A?=
	=?utf-8?q?_Support_PHP_5?=
Message-ID: <076.34213a5e5121e9857e7ff28b81783537@vtiger.fosslabs.com>

#1287: Support PHP 5
-----------------------+----------------------------------------------------
 Reporter:  allanbush  |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  major      |   Milestone:  4.2.5    
Component:  vtigercrm  |     Version:  4.2.4rc3 
 Keywords:  php5       |  
-----------------------+----------------------------------------------------
 Version 4.2.5 should support php versions > 4.3, including php 5.x.

 Does anyone know of a way to set mod_php4 and mod_php5 up side by side for
 easier testing?

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1287>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun  8 22:29:19 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 09 Jun 2006 05:29:19 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231287=3A?=
	=?utf-8?q?_Support_PHP_5?=
In-Reply-To: <076.34213a5e5121e9857e7ff28b81783537@vtiger.fosslabs.com>
References: <076.34213a5e5121e9857e7ff28b81783537@vtiger.fosslabs.com>
Message-ID: <085.303b64f26e9855d81f73923dcc03b167@vtiger.fosslabs.com>

#1287: Support PHP 5
------------------------+---------------------------------------------------
  Reporter:  allanbush  |       Owner:  developer
      Type:  defect     |      Status:  new      
  Priority:  major      |   Milestone:  4.2.5    
 Component:  vtigercrm  |     Version:  4.2.4rc3 
Resolution:             |    Keywords:  php5     
------------------------+---------------------------------------------------
Comment (by allanbush):

 (In [6977]) Inital steps for php5 support from
 http://forums.vtiger.com/viewtopic.php?t=6777 .  Refs #1287.  Jpgraph has
 not been replaced as the new version is not compatible with php4.

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1287>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun  8 22:29:20 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 09 Jun 2006 05:29:20 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6977 - in
 /vtigercrm/branches/4.2: data/CRMEntity.php export.php index.php
 install.php phprint.php soap.php
Message-ID: <20060609052921.8E6267E8985@vtiger.fosslabs.com>

Author: allanbush
Date: Thu Jun  8 23:29:16 2006
New Revision: 6977

Log:
Inital steps for php5 support from http://forums.vtiger.com/viewtopic.php?t=6777 .  Refs #1287.  Jpgraph has not been replaced as the new version is not compatible with php4.

Modified:
    vtigercrm/branches/4.2/data/CRMEntity.php
    vtigercrm/branches/4.2/export.php
    vtigercrm/branches/4.2/index.php
    vtigercrm/branches/4.2/install.php
    vtigercrm/branches/4.2/phprint.php
    vtigercrm/branches/4.2/soap.php

Modified: vtigercrm/branches/4.2/data/CRMEntity.php
==============================================================================
--- vtigercrm/branches/4.2/data/CRMEntity.php (original)
+++ vtigercrm/branches/4.2/data/CRMEntity.php Thu Jun  8 23:29:16 2006
@@ -1025,10 +1025,7 @@
 				}
 
 
-				//$this->db->println("here is the bug");
-			
-
-				$list[] = $this;
+				$list[] = clone($this);
 			}
 		}
 
@@ -1060,10 +1057,7 @@
 				else
 					$this->db->println("rowid not set unable to retrieve");
 				 
-				 
-				
-
-				$list[] = $this;
+				$list[] = clone($this);
 			}
 		}
 

Modified: vtigercrm/branches/4.2/export.php
==============================================================================
--- vtigercrm/branches/4.2/export.php (original)
+++ vtigercrm/branches/4.2/export.php Thu Jun  8 23:29:16 2006
@@ -12,10 +12,6 @@
  * All Rights Reserved.
  * Contributor(s): ______________________________________.
  ********************************************************************************/
-
-if (substr(phpversion(), 0, 1) == "5") {
-        ini_set("zend.ze1_compatibility_mode", "1");
-}
 
 require_once('config.php');
 require_once('include/logging.php');

Modified: vtigercrm/branches/4.2/index.php
==============================================================================
--- vtigercrm/branches/4.2/index.php (original)
+++ vtigercrm/branches/4.2/index.php Thu Jun  8 23:29:16 2006
@@ -22,11 +22,11 @@
 global $entityDel;
 global $display;
 
+if (version_compare(phpversion(), '5.0') < 0) {
+	eval('function clone($object) { return $object; } ');
+}
+
 require_once('include/utils.php');
-//$phpbb_root_path='./modules/MessageBoard/';
-if (substr(phpversion(), 0, 1) == "5") {
-        ini_set("zend.ze1_compatibility_mode", "1");
-}
 
 function fetchPermissionDataForTabList()
 {

Modified: vtigercrm/branches/4.2/install.php
==============================================================================
--- vtigercrm/branches/4.2/install.php (original)
+++ vtigercrm/branches/4.2/install.php Thu Jun  8 23:29:16 2006
@@ -23,10 +23,6 @@
     	header("Location: index.php");
     	exit();
     }
-}
-
-if (substr(phpversion(), 0, 1) == "5") {
-  ini_set("zend.ze1_compatibility_mode", "1");
 }
 
 function stripslashes_checkstrings($value) {

Modified: vtigercrm/branches/4.2/phprint.php
==============================================================================
--- vtigercrm/branches/4.2/phprint.php (original)
+++ vtigercrm/branches/4.2/phprint.php Thu Jun  8 23:29:16 2006
@@ -18,10 +18,6 @@
  * theme header and footer files defined for the user as well as the module as
  * defined by the input parameters.
  ********************************************************************************/
-
-if (substr(phpversion(), 0, 1) == "5") {
-	ini_set("zend.ze1_compatibility_mode", "1");
-}
 
 if (ini_get("allow_url_fopen") != 1) {
         die("You must have the allow_url_fopen directive in your php.ini file enabled");

Modified: vtigercrm/branches/4.2/soap.php
==============================================================================
--- vtigercrm/branches/4.2/soap.php (original)
+++ vtigercrm/branches/4.2/soap.php Thu Jun  8 23:29:16 2006
@@ -12,10 +12,6 @@
  * All Rights Reserved.
  * Contributor(s): ______________________________________.
  ********************************************************************************/
-
-if (substr(phpversion(), 0, 1) == "5") {
-	ini_set("zend.ze1_compatibility_mode", "1");
-}
 
 require_once('include/logging.php');
 require_once("config.php");



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun  8 22:55:02 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 09 Jun 2006 05:55:02 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6978 -
	/vtigercrm/branches/4.2/modules/Contacts/
Message-ID: <20060609055502.E7CDA7E896F@vtiger.fosslabs.com>

Author: allanbush
Date: Thu Jun  8 23:54:58 2006
New Revision: 6978

Log:
Removed unused files.

Removed:
    vtigercrm/branches/4.2/modules/Contacts/BusinessCard.html
    vtigercrm/branches/4.2/modules/Contacts/BusinessCard.php
    vtigercrm/branches/4.2/modules/Contacts/ContactFormBase.php
    vtigercrm/branches/4.2/modules/Contacts/ContactOpportunityRelationship.php
    vtigercrm/branches/4.2/modules/Contacts/ContactOpportunityRelationshipEdit.html
    vtigercrm/branches/4.2/modules/Contacts/ContactOpportunityRelationshipEdit.php
    vtigercrm/branches/4.2/modules/Contacts/CustomAction.php
    vtigercrm/branches/4.2/modules/Contacts/DeleteContactCaseRelationship.php
    vtigercrm/branches/4.2/modules/Contacts/DeleteContactOpportunityRelationship.php
    vtigercrm/branches/4.2/modules/Contacts/DeleteDirectReportRelationship.php
    vtigercrm/branches/4.2/modules/Contacts/SaveBusinessCard.php
    vtigercrm/branches/4.2/modules/Contacts/SaveContactOpportunityRelationship.php
    vtigercrm/branches/4.2/modules/Contacts/SubPanelView.html
    vtigercrm/branches/4.2/modules/Contacts/SubPanelView.php
    vtigercrm/branches/4.2/modules/Contacts/SubPanelViewAccounts.html
    vtigercrm/branches/4.2/modules/Contacts/SubPanelViewCase.html
    vtigercrm/branches/4.2/modules/Contacts/SubPanelViewCase.php
    vtigercrm/branches/4.2/modules/Contacts/SubPanelViewContact.html
    vtigercrm/branches/4.2/modules/Contacts/SubPanelViewContactsAndUsers.php
    vtigercrm/branches/4.2/modules/Contacts/SubPanelViewDirectReport.html
    vtigercrm/branches/4.2/modules/Contacts/SubPanelViewOpportunity.html
    vtigercrm/branches/4.2/modules/Contacts/SubPanelViewOpportunity.php
Modified:
    vtigercrm/branches/4.2/modules/Contacts/Popup.php

Modified: vtigercrm/branches/4.2/modules/Contacts/Popup.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Contacts/Popup.php (original)
+++ vtigercrm/branches/4.2/modules/Contacts/Popup.php Thu Jun  8 23:54:58 2006
@@ -115,7 +115,7 @@
 		}
 		$where .= "crmentity.smownerid IN(";
 		foreach ($assigned_user_id as $key => $val) {
-			$where .= "".PearDatabase::quote($val)."";
+			$where .= "".$adb->quote($val)."";
 			$where .= ($key == count($assigned_user_id) - 1) ? ")" : ", ";
 		}
 	}



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun  8 22:57:49 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 09 Jun 2006 05:57:49 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6979 -
	/vtigercrm/trunk/Smarty/templates/MigrationStep1.tpl
Message-ID: <20060609055749.5D5417E8974@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun  8 23:57:45 2006
New Revision: 6979

Log:
* Midified the file name

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

Modified: vtigercrm/trunk/Smarty/templates/MigrationStep1.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/MigrationStep1.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/MigrationStep1.tpl Thu Jun  8 23:57:45 2006
@@ -199,7 +199,7 @@
 <br>2. Create new database (Better is to create a database in the server where your vtiger 5.0 Database is running.)
 <br>3. Apply this 4.2.3 dump to this new database.
 <br>Now give this new database access details. This migration will modify this Database to fit with the 5.0 Schema.
-Then you can give this Database name in config.php file to use this Database ie., $dbconfig['db_name'] = 'new db name';
+Then you can give this Database name in config.inc.php file to use this Database ie., $dbconfig['db_name'] = 'new db name';
 
 								</td>
 							   </tr>



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun  8 23:39:51 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 09 Jun 2006 06:39:51 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6980 - in
 /vtigercrm/branches/4.2/modules: Accounts/ Activities/ Calendar/tmp/
 CustomView/ Emails/ Help/ Home/ Leads/ Meetings/ Notes/ Potentials/
 Reports/ Settings/ Utilities/ Yahoo/ imports/
Message-ID: <20060609063951.635ED7E898E@vtiger.fosslabs.com>

Author: allanbush
Date: Fri Jun  9 00:39:43 2006
New Revision: 6980

Log:
Removed unused files.

Removed:
    vtigercrm/branches/4.2/modules/Accounts/AccountFormBase.php
    vtigercrm/branches/4.2/modules/Accounts/CustomAction.php
    vtigercrm/branches/4.2/modules/Accounts/DeleteMemberAccountRelationship.php
    vtigercrm/branches/4.2/modules/Accounts/SubPanelView.php
    vtigercrm/branches/4.2/modules/Accounts/SubPanelViewMemberAccount.html
    vtigercrm/branches/4.2/modules/Activities/GroupAllocationView.html
    vtigercrm/branches/4.2/modules/Activities/GroupAllocationView.php
    vtigercrm/branches/4.2/modules/Activities/SubPanelView.html
    vtigercrm/branches/4.2/modules/Activities/SubPanelView.php
    vtigercrm/branches/4.2/modules/Activities/SubPanelViewContacts.html
    vtigercrm/branches/4.2/modules/Calendar/tmp/
    vtigercrm/branches/4.2/modules/CustomView/CustomAction.html
    vtigercrm/branches/4.2/modules/CustomView/CustomAction.php
    vtigercrm/branches/4.2/modules/CustomView/SendMailAction.php
    vtigercrm/branches/4.2/modules/Emails/DeleteEmailContactRelationship.php
    vtigercrm/branches/4.2/modules/Emails/DeleteEmailUserRelationship.php
    vtigercrm/branches/4.2/modules/Emails/SubPanelViewRecipients.html
    vtigercrm/branches/4.2/modules/Emails/SubPanelViewRecipients.php
    vtigercrm/branches/4.2/modules/Help/
    vtigercrm/branches/4.2/modules/Home/LastViewed.php
    vtigercrm/branches/4.2/modules/Leads/CustomAction.php
    vtigercrm/branches/4.2/modules/Leads/Headers.php
    vtigercrm/branches/4.2/modules/Leads/fetchfile.php
    vtigercrm/branches/4.2/modules/Leads/result.php
    vtigercrm/branches/4.2/modules/Meetings/
    vtigercrm/branches/4.2/modules/Notes/NoteFormBase.php
    vtigercrm/branches/4.2/modules/Potentials/SubPanelView.html
    vtigercrm/branches/4.2/modules/Potentials/SubPanelView.php
    vtigercrm/branches/4.2/modules/Reports/countries.txt
    vtigercrm/branches/4.2/modules/Settings/test.php
    vtigercrm/branches/4.2/modules/Utilities/
    vtigercrm/branches/4.2/modules/Yahoo/
    vtigercrm/branches/4.2/modules/imports/



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun  8 23:59:32 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 09 Jun 2006 06:59:32 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6981 - in
 /vtigercrm/branches/4.2: database/ include/ include/database/
 modules/Accounts/ modules/Calendar/ modules/Faq/ modules/HelpDesk/
 modules/Import/ modules/Invoice/ modules/Orders/ modules/Quotes/
 modules/Settings/ modules/Users/
Message-ID: <20060609065932.948297E8993@vtiger.fosslabs.com>

Author: allanbush
Date: Fri Jun  9 00:59:25 2006
New Revision: 6981

Log:
Removed unused files.

Removed:
    vtigercrm/branches/4.2/database/
    vtigercrm/branches/4.2/include/PopulatePhpBBtables.php
    vtigercrm/branches/4.2/include/listview.php
    vtigercrm/branches/4.2/modules/Users/Listhistory.php
    vtigercrm/branches/4.2/modules/Users/MassDeleteUsers.php
Modified:
    vtigercrm/branches/4.2/include/database/PearDatabase.php
    vtigercrm/branches/4.2/modules/Accounts/Merge.php
    vtigercrm/branches/4.2/modules/Accounts/Save.php
    vtigercrm/branches/4.2/modules/Calendar/Save.php
    vtigercrm/branches/4.2/modules/Faq/Save.php
    vtigercrm/branches/4.2/modules/HelpDesk/EditTicket.php
    vtigercrm/branches/4.2/modules/Import/ImportContact.php
    vtigercrm/branches/4.2/modules/Invoice/Save.php
    vtigercrm/branches/4.2/modules/Orders/Save.php
    vtigercrm/branches/4.2/modules/Orders/SaveSalesOrder.php
    vtigercrm/branches/4.2/modules/Quotes/Save.php
    vtigercrm/branches/4.2/modules/Settings/ComboFieldList.php
    vtigercrm/branches/4.2/modules/Users/Logout.php
    vtigercrm/branches/4.2/modules/Users/createemailtemplate.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 Fri Jun  9 00:59:25 2006
@@ -15,7 +15,8 @@
 
 require_once('include/logging.php');
 include('adodb/adodb.inc.php');
-require_once("adodb/adodb-xmlschema.inc.php");
+require_once("adodb/adodb-xmlschema03.inc.php");
+require_once("include/utils.php");
 
 require_once('vtigerlogger.php');
 global $vtlog;
@@ -664,7 +665,7 @@
 		}
 		
 		$this->database = ADONewConnection($this->dbType);
-		//$this->database->debug = true;
+		$this->database->debug = true;
 		
 		$this->database->Connect($this->dbHostName, $this->userName, $this->userPassword, $this->dbName);
 		$this->database->LogSQL($this->enableSQLlog);

Modified: vtigercrm/branches/4.2/modules/Accounts/Merge.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Accounts/Merge.php (original)
+++ vtigercrm/branches/4.2/modules/Accounts/Merge.php Fri Jun  9 00:59:25 2006
@@ -28,7 +28,6 @@
 }
 </script>
 <?php
-//require_once('database/DatabaseConnection.php');
 require_once('include/database/PearDatabase.php');
 require_once('config.php');
 //echo 'id is ....... ' .$_REQUEST['record'];

Modified: vtigercrm/branches/4.2/modules/Accounts/Save.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Accounts/Save.php (original)
+++ vtigercrm/branches/4.2/modules/Accounts/Save.php Fri Jun  9 00:59:25 2006
@@ -23,7 +23,6 @@
 
 require_once('modules/Accounts/Account.php');
 require_once('include/logging.php');
-//require_once('database/DatabaseConnection.php');
 require_once('include/database/PearDatabase.php');
 
 $local_log =& LoggerManager::getLogger('index');

Modified: vtigercrm/branches/4.2/modules/Calendar/Save.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Calendar/Save.php (original)
+++ vtigercrm/branches/4.2/modules/Calendar/Save.php Fri Jun  9 00:59:25 2006
@@ -26,7 +26,6 @@
 require_once('include/database/PearDatabase.php');
 require_once('modules/Calendar/webelements.p3');
 require_once('modules/Calendar/Date.pinc');
-#require_once('database/DatabaseConnection.php');
 
 //Added for Appointment Validation
  global $callink,$mod_strings;

Modified: vtigercrm/branches/4.2/modules/Faq/Save.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Faq/Save.php (original)
+++ vtigercrm/branches/4.2/modules/Faq/Save.php Fri Jun  9 00:59:25 2006
@@ -23,7 +23,6 @@
 
 require_once('modules/Faq/Faq.php');
 require_once('include/logging.php');
-//require_once('database/DatabaseConnection.php');
 require_once('include/database/PearDatabase.php');
 
 $local_log =& LoggerManager::getLogger('index');

Modified: vtigercrm/branches/4.2/modules/HelpDesk/EditTicket.php
==============================================================================
--- vtigercrm/branches/4.2/modules/HelpDesk/EditTicket.php (original)
+++ vtigercrm/branches/4.2/modules/HelpDesk/EditTicket.php Fri Jun  9 00:59:25 2006
@@ -9,7 +9,6 @@
 *
  ********************************************************************************/
 require_once('include/database/PearDatabase.php');
-//require_once('database/DatabaseConnection.php');
 require_once('HelpDeskUtil.php');
 require_once('XTemplate/xtpl.php');
 require_once('include/utils.php');

Modified: vtigercrm/branches/4.2/modules/Import/ImportContact.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Import/ImportContact.php (original)
+++ vtigercrm/branches/4.2/modules/Import/ImportContact.php Fri Jun  9 00:59:25 2006
@@ -18,19 +18,6 @@
  ********************************************************************************/
 include_once('config.php');
 require_once('include/logging.php');
-/*
-require_once('database/DatabaseConnection.php');
-require_once('data/SugarBean.php');
-require_once('include/utils.php');
-require_once('modules/Potentials/Opportunity.php');
-require_once('modules/Cases/Case.php');
-require_once('modules/Tasks/Task.php');
-require_once('modules/Notes/Note.php');
-require_once('modules/Meetings/Meeting.php');
-require_once('modules/Calls/Call.php');
-require_once('modules/Emails/Email.php');
-require_once('modules/Accounts/Account.php');
-*/
 require_once('modules/Contacts/Contact.php');
 require_once('modules/Import/UsersLastImport.php');
 require_once('include/database/PearDatabase.php');

Modified: vtigercrm/branches/4.2/modules/Invoice/Save.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Invoice/Save.php (original)
+++ vtigercrm/branches/4.2/modules/Invoice/Save.php Fri Jun  9 00:59:25 2006
@@ -23,7 +23,6 @@
 
 require_once('modules/Invoice/Invoice.php');
 require_once('include/logging.php');
-//require_once('database/DatabaseConnection.php');
 require_once('include/database/PearDatabase.php');
 
 $local_log =& LoggerManager::getLogger('index');

Modified: vtigercrm/branches/4.2/modules/Orders/Save.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Orders/Save.php (original)
+++ vtigercrm/branches/4.2/modules/Orders/Save.php Fri Jun  9 00:59:25 2006
@@ -23,7 +23,6 @@
 
 require_once('modules/Orders/Order.php');
 require_once('include/logging.php');
-//require_once('database/DatabaseConnection.php');
 require_once('include/database/PearDatabase.php');
 
 $local_log =& LoggerManager::getLogger('index');

Modified: vtigercrm/branches/4.2/modules/Orders/SaveSalesOrder.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Orders/SaveSalesOrder.php (original)
+++ vtigercrm/branches/4.2/modules/Orders/SaveSalesOrder.php Fri Jun  9 00:59:25 2006
@@ -23,7 +23,6 @@
 
 require_once('modules/Orders/SalesOrder.php');
 require_once('include/logging.php');
-//require_once('database/DatabaseConnection.php');
 require_once('include/database/PearDatabase.php');
 
 $local_log =& LoggerManager::getLogger('index');

Modified: vtigercrm/branches/4.2/modules/Quotes/Save.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Quotes/Save.php (original)
+++ vtigercrm/branches/4.2/modules/Quotes/Save.php Fri Jun  9 00:59:25 2006
@@ -23,7 +23,6 @@
 
 require_once('modules/Quotes/Quote.php');
 require_once('include/logging.php');
-//require_once('database/DatabaseConnection.php');
 require_once('include/database/PearDatabase.php');
 
 $local_log =& LoggerManager::getLogger('index');

Modified: vtigercrm/branches/4.2/modules/Settings/ComboFieldList.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Settings/ComboFieldList.php (original)
+++ vtigercrm/branches/4.2/modules/Settings/ComboFieldList.php Fri Jun  9 00:59:25 2006
@@ -11,7 +11,6 @@
  ********************************************************************************/
 
 require_once('include/database/PearDatabase.php');
-require_once('database/DatabaseConnection.php');
 require_once('XTemplate/xtpl.php');
 require_once('themes/'.$theme.'/layout_utils.php');
 global $mod_strings;

Modified: vtigercrm/branches/4.2/modules/Users/Logout.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Users/Logout.php (original)
+++ vtigercrm/branches/4.2/modules/Users/Logout.php Fri Jun  9 00:59:25 2006
@@ -18,7 +18,6 @@
  ********************************************************************************/
 
 require_once('include/logging.php');
-require_once('database/DatabaseConnection.php');
 require_once('modules/Users/LoginHistory.php');
 require_once('modules/Users/User.php');
 require_once('config.php');

Modified: vtigercrm/branches/4.2/modules/Users/createemailtemplate.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Users/createemailtemplate.php (original)
+++ vtigercrm/branches/4.2/modules/Users/createemailtemplate.php Fri Jun  9 00:59:25 2006
@@ -8,7 +8,6 @@
  * All Rights Reserved.
 *
  ********************************************************************************/
-require_once('database/DatabaseConnection.php');
 require_once('XTemplate/xtpl.php');
 require_once('include/utils.php');
 



From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun  9 04:56:32 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 09 Jun 2006 11:56:32 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6982 - in /vtigercrm/trunk:
 include/SearchBlock.html include/SearchBlock.php
 modules/Reports/NewReportFolder.php modules/Settings/ComboFieldList.html
 modules/Settings/ComboFieldList.php modules/Users/listroles.html
Message-ID: <20060609115633.5209B7E89A0@vtiger.fosslabs.com>

Author: richie
Date: Fri Jun  9 05:56:24 2006
New Revision: 6982

Log:
file not needed

Removed:
    vtigercrm/trunk/include/SearchBlock.html
    vtigercrm/trunk/include/SearchBlock.php
    vtigercrm/trunk/modules/Reports/NewReportFolder.php
    vtigercrm/trunk/modules/Settings/ComboFieldList.html
    vtigercrm/trunk/modules/Settings/ComboFieldList.php
    vtigercrm/trunk/modules/Users/listroles.html



From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun  9 05:10:46 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 09 Jun 2006 12:10:46 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6983 - in /vtigercrm/trunk:
 include/utils/SearchUtils.php modules/Potentials/Charts.php
Message-ID: <20060609121046.B647D7E899B@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun  9 06:10:40 2006
New Revision: 6983

Log:
Changes made to show proper records in listview, when clicked on graph image in dashboard home page

Modified:
    vtigercrm/trunk/include/utils/SearchUtils.php
    vtigercrm/trunk/modules/Potentials/Charts.php

Modified: vtigercrm/trunk/include/utils/SearchUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/SearchUtils.php (original)
+++ vtigercrm/trunk/include/utils/SearchUtils.php Fri Jun  9 06:10:40 2006
@@ -18,8 +18,16 @@
 $column_array=array('accountid','contact_id');
 $table_col_array=array('account.accountname','contactdetails.firstname,contactdetails.lastname');
 
-
-
+/**This function is used to get the list view header values in a list view during search
+*Param $focus - module object
+*Param $module - module name
+*Param $sort_qry - sort by value
+*Param $sorder - sorting order (asc/desc)
+*Param $order_by - order by
+*Param $relatedlist - flag to check whether the header is for listvie or related list
+*Param $oCv - Custom view object
+*Returns the listview header values in an array
+*/
 
 function getSearchListHeaderValues($focus, $module,$sort_qry='',$sorder='',$order_by='',$relatedlist='',$oCv='')
 {
@@ -178,6 +186,10 @@
 
 }
 
+/**This function is used to get the where condition for search listview query along with url_string
+*Param $module - module name
+*Returns the where conditions and url_string values in string format
+*/
 
 function Search($module)
 {
@@ -215,6 +227,13 @@
 
 }
 
+/**This function is used to get user_id's for a given user_name during search
+*Param $table_name - tablename
+*Param $column_name - columnname
+*Param $search_string - searchstring value (username)
+*Returns the where conditions for list query in string format
+*/
+
 function get_usersid($table_name,$column_name,$search_string)
 {
 
@@ -247,6 +266,13 @@
 	$log->debug("Exiting get_usersid method ...");
 	return $where;	
 }
+
+/**This function is used to get where conditions for a given accountid or contactid during search for their respective names
+*Param $column_name - columnname
+*Param $search_string - searchstring value (username)
+*Returns the where conditions for list query in string format
+*/
+
 
 function getValuesforColumns($column_name,$search_string)
 {
@@ -284,6 +310,13 @@
 	return $where;
 }
 
+/**This function is used to get where conditions in Basic Search
+*Param $module - module name
+*Param $search_field - columnname/field name in which the string has be searched
+*Param $search_string - searchstring value (username)
+*Returns the where conditions for list query in string format
+*/
+
 function BasicSearch($module,$search_field,$search_string)
 {
 	 global $log;
@@ -328,6 +361,11 @@
 	return $where;
 }
 
+/**This function is used to get where conditions in Advance Search
+*Param $module - module name
+*Returns the where conditions for list query in string format
+*/
+
 function getAdvSearchfields($module)
 {
 	global $log;
@@ -401,6 +439,11 @@
 	return $OPTION_SET;
 }
 
+/**This function is returns the search criteria options for Advance Search
+*takes no parameter
+*Returns the criteria option in html format
+*/
+
 function getcriteria_options()
 {
 	global $log;
@@ -409,6 +452,14 @@
 	$log->debug("Exiting getcriteria_options method ...");
 	return $CRIT_OPT;
 }
+
+/**This function is returns the where conditions for each search criteria option in Advance Search
+*Param $criteria - search criteria option
+*Param $searchstring - search string
+*Param $searchfield - fieldname to be search for 
+*Returns the search criteria option (where condition) to be added in list query
+*/
+
 function getSearch_criteria($criteria,$searchstring,$searchfield)
 {
 	global $log;
@@ -460,7 +511,13 @@
 	}
 	$log->debug("Exiting getSearch_criteria method ...");
 	return $where_string;
-}								
+}
+
+/**This function is returns the where conditions for search
+*Param $currentModule - module name
+*Returns the where condition to be added in list query in string format
+*/
+
 function getWhereCondition($currentModule)
 {
 	global $log;
@@ -518,6 +575,10 @@
 		}
 		$where="(".$adv_string.")#@@#".$url_string."&searchtype=advance&search_cnt=".$tot_no_criteria."&matchtype=".$_REQUEST['matchtype'];
 	}
+	elseif($_REQUEST['type']=='dbrd')
+	{
+		$where = getdashboardcondition();
+	}
 	else
 	{
  		$where=Search($currentModule);
@@ -526,4 +587,54 @@
 	return $where;
 
 }
+
+/**This function is returns the where conditions for dashboard and shows the records when clicked on dashboard graph
+*Takes no parameter, process the values got from the html request object
+*Returns the search criteria option (where condition) to be added in list query
+*/
+
+function getdashboardcondition()
+{
+	global $adb;
+	$where_clauses = Array();
+	$url_string = "";
+
+	if (isset($_REQUEST['leadsource'])) $lead_source = $_REQUEST['leadsource'];
+	if (isset($_REQUEST['date_closed'])) $date_closed = $_REQUEST['date_closed'];
+	if (isset($_REQUEST['sales_stage'])) $sales_stage = $_REQUEST['sales_stage'];
+	if (isset($_REQUEST['closingdate_start'])) $date_closed_start = $_REQUEST['closingdate_start'];
+	if (isset($_REQUEST['closingdate_end'])) $date_closed_end = $_REQUEST['closingdate_end'];
+	
+
+	if(isset($date_closed_start) && $date_closed_start != "" && isset($date_closed_end) && $date_closed_end != "")
+	{
+		array_push($where_clauses, "potential.closingdate >= ".$adb->quote($date_closed_start)." and potential.closingdate <= ".$adb->quote($date_closed_end));
+		$url_string .= "&closingdate_start=".$date_closed_start."&closingdate_end=".$date_closed_end;
+	}
+	
+	if(isset($sales_stage) && $sales_stage!=''){
+		if($sales_stage=='Other')
+		array_push($where_clauses, "(potential.sales_stage <> 'Closed Won' and potential.sales_stage <> 'Closed Lost')");
+		else
+		array_push($where_clauses, "potential.sales_stage = ".$adb->quote($sales_stage));
+		$url_string .= "&sales_stage=".$sales_stage;
+	}
+	if(isset($lead_source) && $lead_source != "") {
+		array_push($where_clauses, "potential.leadsource = ".$adb->quote($lead_source));
+		$url_string .= "&leadsource=".$lead_source;
+	}
+	
+	if(isset($date_closed) && $date_closed != "") {
+		array_push($where_clauses, $adb->getDBDateString("potential.closingdate")." like ".$adb->quote($date_closed.'%')."");
+		$url_string .= "&date_closed=".$date_closed;
+	}
+	$where = "";
+	foreach($where_clauses as $clause)
+	{
+		if($where != "")
+		$where .= " and ";
+		$where .= $clause;
+	}
+	return $where."#@@#".$url_string;
+}
 ?>

Modified: vtigercrm/trunk/modules/Potentials/Charts.php
==============================================================================
--- vtigercrm/trunk/modules/Potentials/Charts.php (original)
+++ vtigercrm/trunk/modules/Potentials/Charts.php Fri Jun  9 06:10:40 2006
@@ -177,7 +177,7 @@
 					array_push($datax[$stage], 0);
 					array_push($aAlts[$stage], "");
 				}
-				array_push($aTargets[$stage], "index.php?module=Potentials&action=ListView&date_closed=$month&sales_stage=".urlencode($stage)."&query=true");
+				array_push($aTargets[$stage], "index.php?module=Potentials&action=ListView&date_closed=$month&sales_stage=".urlencode($stage)."&query=true&type=dbrd");
 			  }
 		  	  array_push($legend,$month);
 			}
@@ -522,7 +522,7 @@
 					array_push($datax[$stage], 0);
 					array_push($aAlts[$stage], "");
 				}
-				array_push($aTargets[$stage], "index.php?module=Potentials&action=ListView&leadsource=".urlencode($lead)."&sales_stage=".urlencode($stage)."&query=true");
+				array_push($aTargets[$stage], "index.php?module=Potentials&action=ListView&leadsource=".urlencode($lead)."&sales_stage=".urlencode($stage)."&query=true&type=dbrd");
 			  }
 			  array_push($legend,$translation);
 			}
@@ -842,7 +842,7 @@
 					array_push($datay[$the_id], 0);
 					array_push($aAlts[$the_id], "");
 				}
-				array_push($aTargets[$the_id], "index.php?module=Potentials&action=ListView&assigned_user_id[]=$the_id&sales_stage=".urlencode($stage_key)."&closingdate_start=".urlencode($date_start)."&closingdate_end=".urlencode($date_end)."&query=true");
+				array_push($aTargets[$the_id], "index.php?module=Potentials&action=ListView&assigned_user_id[]=$the_id&sales_stage=".urlencode($stage_key)."&closingdate_start=".urlencode($date_start)."&closingdate_end=".urlencode($date_end)."&query=true&type=dbrd");
 			  }
 			  array_push($legend,$stage_translation);
 			}
@@ -1106,7 +1106,7 @@
 						// put none in if the field is blank.
 						array_push($visible_legends, $current_module_strings['NTC_NO_LEGENDS']);
 					}
-					array_push($aTargets, "index.php?module=Potentials&action=ListView&leadsource=".urlencode($lead_source_key)."&query=true");
+					array_push($aTargets, "index.php?module=Potentials&action=ListView&leadsource=".urlencode($lead_source_key)."&query=true&type=dbrd");
 					array_push($aAlts, $count[$lead_source_key]." ".$current_module_strings['LBL_OPPS_IN_LEAD_SOURCE']." $lead_source_translation	");
 				}
 			}



From vtiger-tickets at vtiger.fosslabs.com  Fri Jun  9 05:14:05 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 09 Jun 2006 12:14:05 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231288=3A?=
	=?utf-8?q?_Calendar_Creating_new_task?=
Message-ID: <076.273e3446e6cf906546860e7682d35c38@vtiger.fosslabs.com>

#1288: Calendar Creating new task
-----------------------+----------------------------------------------------
 Reporter:  anonymous  |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  critical   |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 When creating a task at the activity list there is possibility to add a
 lot ot different information types. These are missing when you create a
 task from the calendar.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1288>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun  9 05:20:13 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 09 Jun 2006 12:20:13 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6984 - in
 /vtigercrm/trunk/modules/Import: ImportSave.php ImportStep1.php
 ImportStep2.php ImportStep3.php ImportSteplast.php
Message-ID: <20060609122013.CDE5A7E89AB@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun  9 06:20:06 2006
New Revision: 6984

Log:
* Modified the steps where as in previous the php files start with step2 and ends with step4 but now it has been starts with step1 and ends with step3 properly

Modified:
    vtigercrm/trunk/modules/Import/ImportSave.php
    vtigercrm/trunk/modules/Import/ImportStep1.php
    vtigercrm/trunk/modules/Import/ImportStep2.php
    vtigercrm/trunk/modules/Import/ImportStep3.php
    vtigercrm/trunk/modules/Import/ImportSteplast.php

Modified: vtigercrm/trunk/modules/Import/ImportSave.php
==============================================================================
--- vtigercrm/trunk/modules/Import/ImportSave.php (original)
+++ vtigercrm/trunk/modules/Import/ImportSave.php Fri Jun  9 06:20:06 2006
@@ -205,7 +205,7 @@
 else
 {
 	$module = 'Import';
-	$action = 'ImportStep4';
+	$action = 'ImportStep3';
 }
 ?>
 

Modified: vtigercrm/trunk/modules/Import/ImportStep1.php
==============================================================================
--- vtigercrm/trunk/modules/Import/ImportStep1.php (original)
+++ vtigercrm/trunk/modules/Import/ImportStep1.php Fri Jun  9 06:20:06 2006
@@ -1,211 +1,90 @@
 <?php
 /*********************************************************************************
- * The contents of this file are subject to the SugarCRM Public License Version 1.1.2
- * ("License"); You may not use this file except in compliance with the 
- * License. You may obtain a copy of the License at http://www.sugarcrm.com/SPL
- * Software distributed under the License is distributed on an  "AS IS"  basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
- * the specific language governing rights and limitations under the License.
- * The Original Code is:  SugarCRM Open Source
- * The Initial Developer of the Original Code is SugarCRM, Inc.
- * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.;
+** The contents of this file are subject to the vtiger CRM Public License Version 1.0
+ * ("License"); You may not use this file except in compliance with the License
+ * The Original Code is:  vtiger CRM Open Source
+ * The Initial Developer of the Original Code is vtiger.
+ * Portions created by vtiger are Copyright (C) vtiger.
  * All Rights Reserved.
- *Contributor(s): ______________________________________.
+ *
  ********************************************************************************/
-/*********************************************************************************
- * $Header$
- * Description:  TODO: To be written.
- * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
- * All Rights Reserved.
- * Contributor(s): ______________________________________..
- ********************************************************************************/
-require_once('XTemplate/xtpl.php');
-require_once('data/Tracker.php');
+
+require_once('Smarty_setup.php');
+require_once('modules/Import/ImportLead.php');
+require_once('modules/Import/ImportAccount.php');
 require_once('modules/Import/ImportContact.php');
-require_once('modules/Import/ImportAccount.php');
 require_once('modules/Import/ImportOpportunity.php');
-require_once('modules/Import/ImportLead.php');
-require_once('modules/Import/Forms.php');
+require_once('modules/Import/ImportProduct.php');
 require_once('modules/Import/ImportMap.php');
-require_once('modules/Import/ImportProduct.php');
+require_once('include/utils/CommonUtils.php');
 
 global $mod_strings;
+global $app_strings;
 global $app_list_strings;
-global $app_strings;
 global $current_user;
 
+global $import_mod_strings;
 
 $focus = 0;
 
 global $theme;
-$error_msg = '';
 $theme_path="themes/".$theme."/";
 $image_path=$theme_path."images/";
 require_once($theme_path.'layout_utils.php');
 
 $log->info($mod_strings['LBL_MODULE_NAME'] . " Upload Step 1");
 
-global $import_dir;
+$smarty = new vtigerCRM_Smarty;
 
-$tmp_file_name = $import_dir. "IMPORT_".$current_user->id;
+$smarty->assign("MOD", $mod_strings);
+$smarty->assign("APP", $app_strings);
+$smarty->assign("IMP", $import_mod_strings);
 
-if (file_exists($tmp_file_name))
+$category = getParenttab();
+$smarty->assign("CATEGORY", $category);
+
+$import_object_array = Array(
+				"Leads"=>"ImportLead",
+				"Accounts"=>"ImportAccount",
+				"Contacts"=>"ImportContact",
+				"Potentials"=>"ImportOpportunity",
+				"Products"=>"ImportProduct"
+			    );
+
+if(isset($_REQUEST['module']) && $_REQUEST['module'] != '')
 {
-	unlink($tmp_file_name);
-}
-
-
-
-if (isset($_REQUEST['delete_map_id']))
-{
-	$import_map = new ImportMap();
-	$import_map->mark_deleted($_REQUEST['delete_map_id']);
-}
-
-if (isset($_REQUEST['publish']) )
-{
-	$import_map = new ImportMap();
-	$result = 0;
-
-	$import_map = $import_map->retrieve($_REQUEST['import_map_id'], false);
-
-	if ($_REQUEST['publish'] == 'yes')
-	{
-		$result = $import_map->mark_published($current_user->id,"yes");
-		if ($result == -1)
-		{
-			$error_msg = "Unable to publish. There is another published Import Map by the same name.";
-		}
-	}
-	else if ( $_REQUEST['publish'] == 'no')
-	{
-	 	// if you don't own this importmap, you do now!
-		// unless you have a map by the same name
-		$result = $import_map->mark_published($current_user->id,"no");
-		if ($result == -1)
-		{
-			$error_msg = "Unable to un-publish a map owned by another user. You own an Import Map by the same name.";
-		}
-	}
-}
-
-$xtpl=new XTemplate ('modules/Import/ImportStep1.html');
-$xtpl->assign("MOD", $mod_strings);
-$xtpl->assign("APP", $app_strings);
-
-if ($error_msg != '')
-{
-	$xtpl->assign("ERROR", $error_msg);
-	$xtpl->parse("main.error");
-}
-
-if ( $_REQUEST['module'] == 'Contacts')
-{
-	$focus = new ImportContact();
-}
-else if ( $_REQUEST['module'] == 'Accounts')
-{
-	$focus = new ImportAccount();
-} 
-else if ( $_REQUEST['module'] == 'Potentials')
-{
-	$focus = new ImportOpportunity();
-} 
-else if ( $_REQUEST['module'] == 'Leads')
-{
-	$focus = new ImportLead();
-}
-else if ( $_REQUEST['module'] == 'Products')
-{
-	$focus = new ImportProduct();
+	$object_name = $import_object_array[$_REQUEST['module']];
+	$focus = new $object_name();
 }
 else
 {
- echo "Imports aren't set up for this module type\n";
- exit;
+	echo "Sorry! Import Option is not provided for this module.";
+	exit;
 }
 
-if (isset($_REQUEST['return_module'])) $xtpl->assign("RETURN_MODULE", $_REQUEST['return_module']);
+if(isset($_REQUEST['return_module'])) $smarty->assign("RETURN_MODULE", $_REQUEST['return_module']);
+if(isset($_REQUEST['return_action'])) $smarty->assign("RETURN_ACTION", $_REQUEST['return_action']);
 
-if (isset($_REQUEST['return_action'])) $xtpl->assign("RETURN_ACTION", $_REQUEST['return_action']);
+$smarty->assign("THEME", $theme);
+$smarty->assign("IMAGE_PATH", $image_path);
+$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']);
 
-$xtpl->assign("THEME", $theme);
+$smarty->assign("HEADER", $app_strings['LBL_IMPORT']." ". $mod_strings['LBL_MODULE_NAME']);
+$smarty->assign("HAS_HEADER_CHECKED"," CHECKED");
 
-$xtpl->assign("IMAGE_PATH", $image_path);$xtpl->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']);
+$smarty->assign("MODULE", $_REQUEST['module']);
+$smarty->assign("SOURCE", $_REQUEST['source']);
 
-$xtpl->assign("HEADER", $app_strings['LBL_IMPORT']." ". $mod_strings['LBL_MODULE_NAME']);
+//we have set this as default. upto 4.2.3 we have Outlook, Act, SF formats. but now CUSTOM is enough to import
+$lang_key = "CUSTOM";
+$smarty->assign("INSTRUCTIONS_TITLE",$mod_strings["LBL_IMPORT_{$lang_key}_TITLE"]);
 
-$xtpl->assign("MODULE", $_REQUEST['module']);
-
-$xtpl->assign("JAVASCRIPT", get_validate_upload_js());
-
-if ( $_REQUEST['module'] == 'Contacts')
+for($i = 1; isset($mod_strings["LBL_{$lang_key}_NUM_$i"]);$i++)
 {
-$xtpl->parse("main.show_salesforce");
-$xtpl->parse("main.show_outlook");
-$xtpl->parse("main.show_act");
-}
-else if ( $_REQUEST['module'] == 'Accounts')
-{
-$xtpl->parse("main.show_salesforce");
-$xtpl->parse("main.show_act");
-} 
-else if ( $_REQUEST['module'] == 'Potentials')
-{
-$xtpl->parse("main.show_salesforce");
-} 
-
-if ( is_admin($current_user)) 
-{
-//	$xtpl->parse("main.create_global_map");
+	$smarty->assign("STEP_NUM",$mod_strings["LBL_NUM_$i"]);
+	$smarty->assign("INSTRUCTION_STEP",$mod_strings["LBL_{$lang_key}_NUM_$i"]);
 }
 
-$query_arr = array('assigned_user_id'=>$current_user->id,'is_published'=>'no','module'=>$_REQUEST['module']);
-
-$import_map_seed = new ImportMap();
-
-$custom_imports_arr = $import_map_seed->retrieve_all_by_string_fields($query_arr);
-
-if ( count($custom_imports_arr) )
-{
-	foreach ( $custom_imports_arr as $import)
-	{
-		$xtpl->assign("IMPORT_NAME", $import->name);
-		$xtpl->assign("IMPORT_ID", $import->id);
-		if ( is_admin($current_user)) 
-		{
-			$xtpl->parse("main.saved.saved_elem.is_admin");
-		}
-		$xtpl->parse("main.saved.saved_elem");
-	}
-
-	$xtpl->parse("main.saved");
-}
-
-
-$query_arr = array('is_published'=>'yes','module'=>$_REQUEST['module']);
-
-$published_imports_arr = $import_map_seed->retrieve_all_by_string_fields($query_arr);
-
-if ( count($published_imports_arr) )
-{
-	foreach ( $published_imports_arr as $import)
-	{
-		$xtpl->assign("IMPORT_NAME", $import->name);
-		$xtpl->assign("IMPORT_ID", $import->id);
-		if ( is_admin($current_user))
-		{	
-			$xtpl->parse("main.published.published_elem.is_admin");
-		}
-		$xtpl->parse("main.published.published_elem");
-	}
-
-	$xtpl->parse("main.published");
-}
-
-
-$xtpl->parse("main");
-
-$xtpl->out("main");
+$smarty->display("ImportStep1.tpl");
 
 ?>

Modified: vtigercrm/trunk/modules/Import/ImportStep2.php
==============================================================================
--- vtigercrm/trunk/modules/Import/ImportStep2.php (original)
+++ vtigercrm/trunk/modules/Import/ImportStep2.php Fri Jun  9 06:20:06 2006
@@ -10,7 +10,7 @@
  * The Initial Developer of the Original Code is SugarCRM, Inc.
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.;
  * All Rights Reserved.
- *Contributor(s): ______________________________________.
+ * Contributor(s): ______________________________________.
  ********************************************************************************/
 /*********************************************************************************
  * $Header$
@@ -21,150 +21,397 @@
  ********************************************************************************/
 
 require_once('Smarty_setup.php');
-require_once('data/Tracker.php');
+require_once('modules/Import/ImportLead.php');
+require_once('modules/Import/ImportAccount.php');
 require_once('modules/Import/ImportContact.php');
-require_once('modules/Import/ImportAccount.php');
 require_once('modules/Import/ImportOpportunity.php');
-require_once('modules/Import/ImportLead.php');
+require_once('modules/Import/ImportProduct.php');
 require_once('modules/Import/Forms.php');
+require_once('modules/Import/parse_utils.php');
 require_once('modules/Import/ImportMap.php');
-require_once('modules/Import/ImportProduct.php');
+require_once('include/database/PearDatabase.php');
+require_once('include/CustomFieldUtil.php');
 require_once('include/utils/CommonUtils.php');
 
+ at session_unregister('column_position_to_field');
+ at session_unregister('totalrows');
+ at session_unregister('recordcount');
+ at session_unregister('startval');
+ at session_unregister('return_field_count');
+$_SESSION['totalrows'] = '';
+$_SESSION['recordcount'] = 500;
+$_SESSION['startval'] = 0;
+
 global $mod_strings;
+global $mod_list_strings;
+global $app_strings;
 global $app_list_strings;
-global $app_strings;
 global $current_user;
-
-global $import_mod_strings;
-
-
+global $import_file_name;
+global $upload_maxsize;
+
+global $import_dir;
 $focus = 0;
+$delimiter = ',';
+$max_lines = 3;
+
+$has_header = 0;
+
+if ( isset($_REQUEST['has_header']))
+{
+	$has_header = 1;
+}
 
 global $theme;
 $theme_path="themes/".$theme."/";
 $image_path=$theme_path."images/";
 require_once($theme_path.'layout_utils.php');
 
-$log->info($mod_strings['LBL_MODULE_NAME'] . " Upload Step 1");
-
-$smarty = new vtigerCRM_Smarty;
+if (!is_uploaded_file($_FILES['userfile']['tmp_name']) )
+{
+	show_error_import($mod_strings['LBL_IMPORT_MODULE_ERROR_NO_UPLOAD']);
+	exit;
+}
+else if ($_FILES['userfile']['size'] > $upload_maxsize)
+{
+	show_error_import( $mod_strings['LBL_IMPORT_MODULE_ERROR_LARGE_FILE'] . " ". $upload_maxsize. " ". $mod_strings['LBL_IMPORT_MODULE_ERROR_LARGE_FILE_END']);
+	exit;
+}
+if( !is_writable( $import_dir ))
+{
+	show_error_import($mod_strings['LBL_IMPORT_MODULE_NO_DIRECTORY'].$import_dir.$mod_strings['LBL_IMPORT_MODULE_NO_DIRECTORY_END']);
+	exit;
+}
+
+$tmp_file_name = $import_dir. "IMPORT_".$current_user->id;
+
+move_uploaded_file($_FILES['userfile']['tmp_name'], $tmp_file_name);
+
+
+// Now parse the file and look for errors
+$ret_value = 0;
+
+if ($_REQUEST['source'] == 'act')
+{
+	$ret_value = parse_import_act($tmp_file_name,$delimiter,$max_lines,$has_header);
+} 
+else
+{
+	$ret_value = parse_import($tmp_file_name,$delimiter,$max_lines,$has_header);
+}
+
+if ($ret_value == -1)
+{
+	show_error_import( $mod_strings['LBL_CANNOT_OPEN'] );
+	exit;
+} 
+else if ($ret_value == -2)
+{
+	show_error_import( $mod_strings['LBL_NOT_SAME_NUMBER'] );
+	exit;
+}
+else if ( $ret_value == -3 )
+{
+	show_error_import( $mod_strings['LBL_NO_LINES'] );
+	exit;
+}
+
+
+$rows = $ret_value['rows'];
+$ret_field_count = $ret_value['field_count'];
+
+$smarty =  new vtigerCRM_Smarty;
+
+$smarty->assign("TMP_FILE", $tmp_file_name );
+$smarty->assign("SOURCE", $_REQUEST['source'] );
 
 $smarty->assign("MOD", $mod_strings);
 $smarty->assign("APP", $app_strings);
-$smarty->assign("IMP", $import_mod_strings);
-
-$category = getParenttab();
-$smarty->assign("CATEGORY", $category);
-
-if ( $_REQUEST['module'] == 'Contacts')
-{
-	$focus = new ImportContact();
-}
-else if ( $_REQUEST['module'] == 'Accounts')
-{
-	$focus = new ImportAccount();
-} 
-else if ( $_REQUEST['module'] == 'Potentials')
-{
-	$focus = new ImportOpportunity();
-}
-else if ( $_REQUEST['module'] == 'Leads')
-{
-	$focus = new ImportLead();
-}
-else if ( $_REQUEST['module'] == 'Products')
-{
-	$focus = new ImportProduct();
-}
-
-else
-{
- echo "Imports aren't set up for this module type\n";
- exit;
-}
-
-if (isset($_REQUEST['return_module'])) $smarty->assign("RETURN_MODULE", $_REQUEST['return_module']);
-
-if (isset($_REQUEST['return_action'])) $smarty->assign("RETURN_ACTION", $_REQUEST['return_action']);
+
+if(isset($_REQUEST['return_module'])) $smarty->assign("RETURN_MODULE", $_REQUEST['return_module']);
+if(isset($_REQUEST['return_action'])) $smarty->assign("RETURN_ACTION", $_REQUEST['return_action']);
 
 $smarty->assign("THEME", $theme);
-
 $smarty->assign("IMAGE_PATH", $image_path);
 $smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']);
 
 $smarty->assign("HEADER", $app_strings['LBL_IMPORT']." ". $mod_strings['LBL_MODULE_NAME']);
+$smarty->assign("HASHEADER", $has_header);
+
+$import_object_array = Array(
+				"Leads"=>"ImportLead",
+				"Accounts"=>"ImportAccount",
+				"Contacts"=>"ImportContact",
+				"Potentials"=>"ImportOpportunity",
+				"Products"=>"ImportProduct"
+			    );
+
+if(isset($_REQUEST['module']) && $_REQUEST['module'] != '')
+{
+	$object_name = $import_object_array[$_REQUEST['module']];
+	$focus = new $object_name();
+}
+else
+{
+	$focus = new ImportContact();
+}
+
+
+$total_num_rows=sizeof($rows);	
+$firstrow = $rows[0];
+if($total_num_rows >1 )
+{
+	$secondrow = $rows[1];
+}		
+if($total_num_rows >2)
+{
+	$thirdrow = $rows[2];
+}
+
+	
+$field_map = $outlook_contacts_field_map;
+
+$mapping_file = new ImportMap();
+$saved_map_lists = $mapping_file->getSavedMappingsList($_REQUEST['return_module']);
+$map_list_combo = '<select name="source" id="saved_source" disabled onchange="getImportSavedMap(this)">';
+$map_list_combo .= '<OPTION value="-1" selected>--Select--</OPTION>';
+if(is_array($saved_map_lists))
+{
+	foreach($saved_map_lists as $mapid => $mapname)
+	{
+		$map_list_combo .= '<OPTION value='.$mapid.'>'.$mapname.'</OPTION>';
+	}
+}
+$map_list_combo .= '</select>';
+$smarty->assign("SAVED_MAP_LISTS",$map_list_combo);
+
+
+if ( count($mapping_arr) > 0)
+{
+	$field_map = &$mapping_arr;
+}
+else if ($_REQUEST['source'] == 'other')
+{
+	if ($_REQUEST['module'] == 'Contacts')
+	{
+		$field_map = $outlook_contacts_field_map;
+	} 
+	else if ($_REQUEST['module'] == 'Accounts')
+	{
+		$field_map = $outlook_accounts_field_map;
+	}
+	else if ($_REQUEST['module'] == 'Potentials')
+	{
+		$field_map = $salesforce_opportunities_field_map;
+	}
+} 
+
+
+$add_one = 1;
+$start_at = 0;
+
+if($has_header)
+{
+	$add_one = 0;
+	$start_at = 1;
+} 
+
+for($row_count = $start_at; $row_count < count($rows); $row_count++ )
+{
+	$smarty->assign("ROWCOUNT", $row_count + $add_one);
+}
+
+$list_string_key = strtolower($_REQUEST['module']);
+$list_string_key .= "_import_fields";
+
+$translated_column_fields = $mod_list_strings[$list_string_key];
+
+// adding custom fields translations
+getCustomFieldTrans($_REQUEST['module'],&$translated_column_fields);
+
+$cnt=1;
+for($field_count = 0; $field_count < $ret_field_count; $field_count++)
+{
+
+	$smarty->assign("COLCOUNT", $field_count + 1);
+	$suggest = "";
+
+	/*
+	if ($has_header && isset( $field_map[$firstrow[$field_count]] ) )
+	{
+		$suggest = $field_map[$firstrow[$field_count]];	
+	}
+	else if (isset($field_map[$field_count]))
+	{
+		$suggest = $field_map[$field_count];	
+	}
+	*/
+
+	if($_REQUEST['module']=='Accounts')
+	{
+		$tablename='account';
+		$focus1=new Account();
+	}
+	if($_REQUEST['module']=='Contacts')
+	{
+		$tablename='contactdetails';
+		$focus1=new Contact();
+ 	}
+	if($_REQUEST['module']=='Leads')
+ 	{
+		$tablename='leaddetails';
+		$focus1=new Lead();
+	}
+	if($_REQUEST['module']=='Potentials')
+ 	{
+		$tablename='potential';
+		$focus1=new Potential();
+	}
+	if($_REQUEST['module']=='Products')
+ 	{
+ 		$tablename='products';
+ 		$focus1=new Product();
+ 	}
+
+	
+	$smarty->assign("FIRSTROW",$firstrow);
+	$smarty->assign("SECONDROW",$secondrow);
+	$smarty->assign("THIRDROW",$thirdrow);
+	$smarty_array[$field_count + 1] = getFieldSelect(	$focus->importable_fields,
+							$field_count,
+							$focus1->required_fields,
+							$suggest,
+							$translated_column_fields,
+							$tablename
+						   );
+
+	$pos = 0;
+
+	foreach ( $rows as $row ) 
+	{
+		
+		if( isset($row[$field_count]) && $row[$field_count] != '')
+		{
+			$smarty->assign("CELL",htmlspecialchars($row[$field_count]));
+//			$smarty->parse("main.table.row.cell");
+		} 
+		else
+		{
+//			$smarty->parse("main.table.row.cellempty");
+		}
+
+		$cnt++;
+	}
+}
+ at session_unregister('import_has_header');
+ at session_unregister('import_firstrow');
+ at session_unregister('import_field_map');
+ at session_unregister('import_module_object_column_fields');
+ at session_unregister('import_module_field_count');
+ at session_unregister('import_module_object_required_fields');
+ at session_unregister('import_module_translated_column_fields');
+$_SESSION['import_has_header'] = $has_header;
+$_SESSION['import_firstrow'] = $firstrow;
+$_SESSION['import_field_map'] = $field_map;
+$_SESSION['import_module_object_column_fields'] = $focus->importable_fields;
+$_SESSION['import_module_field_count'] = $field_count;
+$_SESSION['import_module_object_required_fields'] = $focus1->required_fields;
+$_SESSION['import_module_translated_column_fields'] = $translated_column_fields;
+
+
+//echo '<pre>Default array ==> '; print_r($smarty_array); echo '</pre>';
+
+$smarty->assign("SELECTFIELD",$smarty_array);
+$smarty->assign("ROW", $row);
+
+$module_key = "LBL_".strtoupper($_REQUEST['module'])."_NOTE_";
+
+for ($i = 1;isset($mod_strings[$module_key.$i]);$i++)
+{
+	$smarty->assign("NOTETEXT", $mod_strings[$module_key.$i]);
+}
+
+if($has_header)
+{
+	$smarty->assign("HAS_HEADER", 'on');
+} 
+else
+{
+	$smarty->assign("HAS_HEADER", 'off');
+}
 
 $smarty->assign("MODULE", $_REQUEST['module']);
 
-// see if the source starts with 'custom' 
-// if so, pull off the id, load that map, and get the name
-if ($_REQUEST['source'] == "outlook")
-{
-	$smarty->assign("SOURCE", $_REQUEST['source']);
-	$smarty->assign("SOURCE_NAME","Outlook ");
-	$smarty->assign("HAS_HEADER_CHECKED"," CHECKED");
-} 
-else if ($_REQUEST['source'] == "act")
-{
-	$smarty->assign("SOURCE", $_REQUEST['source']);
-	$smarty->assign("SOURCE_NAME","ACT! ");
-	$smarty->assign("HAS_HEADER_CHECKED"," CHECKED");
-}
-else if ( strncasecmp("custom:",$_REQUEST['source'],7) == 0)
-{
-	$id = substr($_REQUEST['source'],7);
-	$import_map_seed = new ImportMap();
-
-	$import_map_seed->retrieve($id, false);
-
-	$adb->println($import_map_seed->toString());
-
-	$smarty->assign("SOURCE_ID", $import_map_seed->id);
-	$smarty->assign("SOURCE_NAME", $import_map_seed->name);
-	$smarty->assign("SOURCE", "custom");
-
-	if ($import_map_seed->has_header)
-	{
-		$smarty->assign("HAS_HEADER_CHECKED"," CHECKED");
-	}
-}
-else
-{
-	$smarty->assign("HAS_HEADER_CHECKED"," CHECKED");
-	$smarty->assign("SOURCE", $_REQUEST['source']);
-}
-
-$smarty->assign("JAVASCRIPT", get_validate_upload_js());
-
-$lang_key = '';
-
-if ($_REQUEST['source'] == "outlook")
-{
-	$lang_key = "OUTLOOK";
-}
-else if ($_REQUEST['source'] == "act")
-{
-	$lang_key = "ACT";
-}
-else if ($_REQUEST['source'] == "salesforce")
-{
-	$lang_key = "SF";
-}
-else 
-{
-	$lang_key = "CUSTOM";
-}
-
-$smarty->assign("INSTRUCTIONS_TITLE",$mod_strings["LBL_IMPORT_{$lang_key}_TITLE"]);
-
-for ($i = 1; isset($mod_strings["LBL_{$lang_key}_NUM_$i"]);$i++)
-{
-$smarty->assign("STEP_NUM",$mod_strings["LBL_NUM_$i"]);
-$smarty->assign("INSTRUCTION_STEP",$mod_strings["LBL_{$lang_key}_NUM_$i"]);
-
-}
-
-$smarty->display("ImportStep1.tpl");
+$category = getParenttab();
+$smarty->assign('CATEGORY' , $category);
+
+$smarty->assign("JAVASCRIPT2", get_readonly_js() );
+
+$smarty->display('ImportStep2.tpl');
 
 ?>
+<script language="javascript" type="text/javascript">
+function validate_import_map()
+{
+	var tagName;
+	var count = 0;
+	var field_count = "<?php echo $field_count; ?>";
+	var required_fields = new Array();
+	var required_fields_name = new Array();
+	var seq_string = '';
+
+	<?php 
+		foreach($focus->required_fields as $name => $index)
+		{
+			?>
+			required_fields[count] = "<?php echo $name; ?>";
+			required_fields_name[count] = "<?php echo $translated_column_fields[$name]; ?>";
+			count = count + 1;
+			<?php 
+		} 
+	?>		
+	for(loop_count = 0; loop_count<field_count;loop_count++)
+	{
+		tagName = document.getElementById('colnum'+loop_count);
+		optionData = tagName.options[tagName.selectedIndex].value;
+
+		if(optionData != -1)
+		{
+			tmp = seq_string.indexOf(optionData);
+			if(tmp == -1)
+			{
+				seq_string = seq_string + optionData;
+			}
+			else
+			{
+				//if a field mapped more than once, alert the user and return
+				alert("'"+tagName.options[tagName.selectedIndex].text+"' is mapped more than once. Please check the mapping.");
+				return false;
+			}
+		}
+
+	}
+
+	//check whether the mandatory fields have been mapped.
+	for(inner_loop = 0; inner_loop<required_fields.length;inner_loop++)
+	{
+		if(seq_string.indexOf(required_fields[inner_loop]) == -1)
+		{
+			alert('Please map the mandatory field "'+required_fields_name[inner_loop]+'"');
+			return false;
+		}
+	}
+
+	//This is to check whether the save map name has been given or not when save map check box is checked
+	if(document.getElementById("save_map").checked == true)
+	{
+		if(trim(document.getElementById("save_map_as").value) == '')
+		{
+			alert("Please Enter Save Map Name");
+			return false;
+		}
+	}
+
+	return true;
+}
+</script>

Modified: vtigercrm/trunk/modules/Import/ImportStep3.php
==============================================================================
--- vtigercrm/trunk/modules/Import/ImportStep3.php (original)
+++ vtigercrm/trunk/modules/Import/ImportStep3.php Fri Jun  9 06:20:06 2006
@@ -21,487 +21,338 @@
  ********************************************************************************/
 
 require_once('Smarty_setup.php');
-require_once('data/Tracker.php');
+require_once('modules/Import/ImportLead.php');
+require_once('modules/Import/ImportAccount.php');
 require_once('modules/Import/ImportContact.php');
-require_once('modules/Import/ImportAccount.php');
 require_once('modules/Import/ImportOpportunity.php');
-require_once('modules/Import/ImportLead.php');
-require_once('modules/Import/Forms.php');
+require_once('modules/Import/ImportProduct.php');
+require_once('modules/Import/ImportMap.php');
+require_once('modules/Import/UsersLastImport.php');
 require_once('modules/Import/parse_utils.php');
-require_once('modules/Import/ImportMap.php');
+require_once('include/ListView/ListView.php');
 require_once('include/database/PearDatabase.php');
-require_once('include/CustomFieldUtil.php');
-require_once('modules/Import/ImportProduct.php');
-require_once('include/utils/CommonUtils.php');
-
- at session_unregister('column_position_to_field');
- at session_unregister('totalrows');
- at session_unregister('recordcount');
- at session_unregister('startval');
- at session_unregister('return_field_count');
-$_SESSION['totalrows'] = '';
-$_SESSION['recordcount'] = 500;
-$_SESSION['startval'] = 0;
+require_once('modules/Import/ImportSave.php');
+
+set_time_limit(0);
+ini_set("display_errors",'0');
+
+
+function p($str)
+{
+	global $adb;
+	$adb->println("IMP :".$str);
+}
+
+function implode_assoc($inner_delim, $outer_delim, $array) 
+{
+	$output = array();
+
+	foreach( $array as $key => $item )
+	{
+               $output[] = $key . $inner_delim . $item;
+	}
+
+       return implode($outer_delim, $output);
+}
 
 global $mod_strings;
-global $mod_list_strings;
 global $app_list_strings;
 global $app_strings;
 global $current_user;
 global $import_file_name;
+global $theme;
 global $upload_maxsize;
-
-global $theme;
-global $outlook_contacts_field_map;
-global $act_contacts_field_map;
-global $salesforce_contacts_field_map;
-global $outlook_accounts_field_map;
-global $act_accounts_field_map;
-global $salesforce_accounts_field_map;
-global $salesforce_opportunities_field_map;
-global $import_dir;
-$focus = 0;
-$delimiter = ',';
-$max_lines = 3;
-
-$has_header = 0;
-
-if ( isset($_REQUEST['has_header']))
-{
-	$has_header = 1;
-}
+global $site_URL;
 
 $theme_path="themes/".$theme."/";
 $image_path=$theme_path."images/";
 require_once($theme_path.'layout_utils.php');
 
-if (!is_uploaded_file($_FILES['userfile']['tmp_name']) )
-{
-	show_error_import($mod_strings['LBL_IMPORT_MODULE_ERROR_NO_UPLOAD']);
-	exit;
-}
-else if ($_FILES['userfile']['size'] > $upload_maxsize)
-{
-	show_error_import( $mod_strings['LBL_IMPORT_MODULE_ERROR_LARGE_FILE'] . " ". $upload_maxsize. " ". $mod_strings['LBL_IMPORT_MODULE_ERROR_LARGE_FILE_END']);
-	exit;
-}
-if( !is_writable( $import_dir ))
-{
-	show_error_import($mod_strings['LBL_IMPORT_MODULE_NO_DIRECTORY'].$import_dir.$mod_strings['LBL_IMPORT_MODULE_NO_DIRECTORY_END']);
-	exit;
-}
-
-$tmp_file_name = $import_dir. "IMPORT_".$current_user->id;
-
-move_uploaded_file($_FILES['userfile']['tmp_name'], $tmp_file_name);
-
+$log->info("Upload Step 3");
+
+
+$delimiter = ',';
+// file handle
+$count = 0;
+$error = "";
+$col_pos_to_field = array();
+$header_to_field = array();
+$field_to_pos = array();
+$focus = 0;
+$current_bean_type = "";
+$id_exists_count = 0;
+$broken_ids = 0;
+
+$has_header = 0;
+
+if ( isset( $_REQUEST['has_header']) && $_REQUEST['has_header'] == 'on')
+{
+	$has_header = 1;
+}
+if($_REQUEST['modulename'] != '')
+	$_REQUEST['module'] = $_REQUEST['modulename'];
+
+
+$import_object_array = Array(
+				"Leads"=>"ImportLead",
+				"Accounts"=>"ImportAccount",
+				"Contacts"=>"ImportContact",
+				"Potentials"=>"ImportOpportunity",
+				"Products"=>"ImportProduct"
+			    );
+
+if(isset($_REQUEST['module']) && $_REQUEST['module'] != '')
+{
+	$current_bean_type = $import_object_array[$_REQUEST['module']];
+}
+else
+{
+	$current_bean_type = "ImportContact";
+}
+
+$focus = new $current_bean_type();
+
+//Constructing the custom field Array
+require_once('include/CustomFieldUtil.php');
+$custFldArray = getCustomFieldArray($_REQUEST['module']);
+p("IMP 3: custFldArray");
+p($custFldArray);
+
+//Initializing  an empty Array to store the custom field Column Name and Value
+$resCustFldArray = Array();
+
+p("Getting from request");
+// loop through all request variables
+foreach ($_REQUEST as $name=>$value)
+{
+	p("name=".$name." value=".$value);
+	// only look for var names that start with "colnum"
+	if ( strncasecmp( $name, "colnum", 6) != 0 )
+	{	
+		continue;
+	}
+	if ($value == "-1")
+	{
+		
+		continue;
+	}
+
+	// this value is a user defined field name
+	$user_field = $value;
+
+	// pull out the column position for this field name
+	$pos = substr($name,6);
+
+	// make sure we haven't seen this field defined yet
+	if ( isset( $field_to_pos[$user_field]) )
+	{
+		show_error_import($mod_strings['LBL_ERROR_MULTIPLE']);
+	        exit;
+
+	}
+
+	p("user_field=".$user_field." if=".$focus->importable_fields[$user_field]);
+	
+	// match up the "official" field to the user 
+	// defined one, and map to columm position: 
+	if ( isset( $focus->importable_fields[$user_field] ) || isset( $custFldArray[$user_field] ))
+	{
+		p("user_field SET=".$user_field);
+		// now mark that we've seen this field
+		$field_to_pos[$user_field] = $pos;
+		$col_pos_to_field[$pos] = $user_field;
+	}
+}
+
+p("field_to_pos");
+$adb->println($field_to_pos);
+p("col_pos_to_field");
+$adb->println($col_pos_to_field);
 
 // Now parse the file and look for errors
+$max_lines = -1;
+
 $ret_value = 0;
 
 if ($_REQUEST['source'] == 'act')
 {
-	$ret_value = parse_import_act($tmp_file_name,$delimiter,$max_lines,$has_header);
-} 
-else
-{
-	$ret_value = parse_import($tmp_file_name,$delimiter,$max_lines,$has_header);
-}
-
-if ($ret_value == -1)
-{
-	show_error_import( $mod_strings['LBL_CANNOT_OPEN'] );
-	exit;
-} 
-else if ($ret_value == -2)
-{
-	show_error_import( $mod_strings['LBL_NOT_SAME_NUMBER'] );
-	exit;
-}
-else if ( $ret_value == -3 )
-{
-	show_error_import( $mod_strings['LBL_NO_LINES'] );
-	exit;
-}
-
-
-$rows = $ret_value['rows'];
+        $ret_value = parse_import_act($_REQUEST['tmp_file'],$delimiter,$max_lines,$has_header);
+}
+else
+{
+	$ret_value = parse_import($_REQUEST['tmp_file'],$delimiter,$max_lines,$has_header);
+}
+
+if (file_exists($_REQUEST['tmp_file']))
+{
+	unlink($_REQUEST['tmp_file']);
+}
+
+$datarows = $ret_value['rows'];
+
 $ret_field_count = $ret_value['field_count'];
 
-$smarty =  new vtigerCRM_Smarty;
-
-$smarty->assign("TMP_FILE", $tmp_file_name );
-
-$smarty->assign("SOURCE", $_REQUEST['source'] );
-
-$source_to_name = array( 
-			'outlook'=>$mod_strings['LBL_MICROSOFT_OUTLOOK'],
-			'act'=>$mod_strings['LBL_ACT'],
-			'salesforce'=>$mod_strings['LBL_SALESFORCE'],
-			'custom'=>$mod_strings['LBL_CUSTOM'],
-			'other'=>$mod_strings['LBL_CUSTOM'],
-		      );
-
-$smarty->assign("SOURCE_NAME", $source_to_name[$_REQUEST['source']] );
-$smarty->assign("MOD", $mod_strings);
-$smarty->assign("APP", $app_strings);
-
-if (isset($_REQUEST['return_module'])) $smarty->assign("RETURN_MODULE", $_REQUEST['return_module']);
-if (isset($_REQUEST['return_action'])) $smarty->assign("RETURN_ACTION", $_REQUEST['return_action']);
-
-$smarty->assign("THEME", $theme);
-$smarty->assign("IMAGE_PATH", $image_path);
-$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']);
-
-$smarty->assign("HEADER", $app_strings['LBL_IMPORT']." ". $mod_strings['LBL_MODULE_NAME']);
-$smarty->assign("HASHEADER", $has_header);
-
-
-if (! isset( $_REQUEST['module'] ) || $_REQUEST['module'] == 'Contacts')
-{
-	$focus = new ImportContact();
-}
-else if ( $_REQUEST['module'] == 'Accounts')
-{
-	$focus = new ImportAccount();
-}
-else if ( $_REQUEST['module'] == 'Potentials')
-{
-	$focus = new ImportOpportunity();
-}
-else if ( $_REQUEST['module'] == 'Leads')
-{
-	$focus = new ImportLead();
-}
-else if ( $_REQUEST['module'] == 'Products')
-{
-	$focus = new ImportProduct();
-}
-
-
-
-$total_num_rows=sizeof($rows);	
-$firstrow = $rows[0];
-if($total_num_rows >1 )
-{
-	$secondrow = $rows[1];
-}		
-if($total_num_rows >2)
-{
-	$thirdrow = $rows[2];
-}
-
-	
-$field_map = $outlook_contacts_field_map;
-
-/*if ( isset( $_REQUEST['source_id']))
-{
-	$mapping_file = new ImportMap();
-
-	//$mapping_file->retrieve_entity_info( $_REQUEST['source_id'],$_REQUEST['return_module']);
-	$mapping_file->retrieve( $_REQUEST['source_id'],false);
-	$adb->println("richie : ".$mapping_file->toString());
-
-	$mapping_content = $mapping_file->content;
-
-	$mapping_arr = array();
-
-	if ( isset($mapping_content) && $mapping_content != "")
-	{
-		$pairs = split("&",$mapping_content);
-	
-		foreach ($pairs as $pair)
+$saved_ids = array();
+
+$firstrow = 0;
+
+if (! isset($datarows))
+{
+	$error = $mod_strings['LBL_FILE_ALREADY_BEEN_OR'];
+	$datarows = array();
+}
+
+if ($has_header == 1)
+{
+	$firstrow = array_shift($datarows);
+}
+
+//Mark the last imported records as deleted which are imported by the current user in users_last_import table
+if(!isset($_REQUEST['startval']))
+{
+	$seedUsersLastImport = new UsersLastImport();
+	$seedUsersLastImport->mark_deleted_by_user_id($current_user->id);
+}
+$skip_required_count = 0;
+
+p("processing started ret_field_count=".$ret_field_count);
+$adb->println($datarows);
+
+$error = '';
+$focus = new $current_bean_type();
+
+
+// SAVE MAPPING IF REQUESTED
+if(isset($_REQUEST['save_map']) && $_REQUEST['save_map'] == 'on' && isset($_REQUEST['save_map_as']) && $_REQUEST['save_map_as'] != '')
+{
+	p("save map");
+	$serialized_mapping = '';
+
+	if( $has_header)
+	{
+		foreach($col_pos_to_field as $pos=>$field_name)
 		{
-			list($name,$value) = split("=",$pair);
-			$mapping_arr["$name"] = $value;
-		}
-	}
-}
-*/
-	$mapping_file = new ImportMap();
-	$saved_map_lists = $mapping_file->getSavedMappingsList($_REQUEST['return_module']);
-	$map_list_combo = '<select name="source" id="saved_source" disabled onchange="getImportSavedMap(this)">';
-	$map_list_combo .= '<OPTION value="-1" selected>--Select--</OPTION>';
-	if(is_array($saved_map_lists))
-	{
-		foreach($saved_map_lists as $mapid => $mapname)
-		{
-			$map_list_combo .= '<OPTION value='.$mapid.'>'.$mapname.'</OPTION>';
-		}
-	}
-	$map_list_combo .= '</select>';
-	$smarty->assign("SAVED_MAP_LISTS",$map_list_combo);
-
-
-
-if ( count($mapping_arr) > 0)
-{
-	$field_map = &$mapping_arr;
-}
-else if ($_REQUEST['source'] == 'other')
-{
-	if ($_REQUEST['module'] == 'Contacts')
-	{
-		$field_map = $outlook_contacts_field_map;
-	} 
-	else if ($_REQUEST['module'] == 'Accounts')
-	{
-		$field_map = $outlook_accounts_field_map;
-	}
-	else if ($_REQUEST['module'] == 'Potentials')
-	{
-		$field_map = $salesforce_opportunities_field_map;
-	}
-} 
-else if ($_REQUEST['source'] == 'act')
-{
-	if ($_REQUEST['module'] == 'Contacts')
-	{
-		$field_map = $act_contacts_field_map;
-	} 
-	else if ($_REQUEST['module'] == 'Accounts')
-	{
-		$field_map = $act_accounts_field_map;
-	}
-}
-else if ($_REQUEST['source'] == 'salesforce')
-{
-	if ($_REQUEST['module'] == 'Contacts')
-	{
-		$field_map = $salesforce_contacts_field_map;
-	} 
-	else if ($_REQUEST['module'] == 'Accounts')
-	{
-		$field_map = $salesforce_accounts_field_map;
-	}
-	else if ($_REQUEST['module'] == 'Potentials')
-	{
-		$field_map = $salesforce_opportunities_field_map;
-	}
-}
-else if ($_REQUEST['source'] == 'outlook')
-{
-	$smarty->assign("IMPORT_FIRST_CHECKED", " CHECKED");
-	if ($_REQUEST['module'] == 'Contacts')
-	{
-		$field_map = $outlook_contacts_field_map;
-	} 
-	else if ($_REQUEST['module'] == 'Accounts')
-	{
-		$field_map = $outlook_accounts_field_map;
-	}
-
-}
-
-$add_one = 1;
-$start_at = 0;
-
-if ( $has_header)
-{
-	$add_one = 0;
-	$start_at = 1;
-} 
-
-for($row_count = $start_at; $row_count < count($rows); $row_count++ )
-{
-	$smarty->assign("ROWCOUNT", $row_count + $add_one);
-}
-
-$list_string_key = strtolower($_REQUEST['module']);
-$list_string_key .= "_import_fields";
-
-$translated_column_fields = $mod_list_strings[$list_string_key];
-
-// adding custom fields translations
-getCustomFieldTrans($_REQUEST['module'],&$translated_column_fields);
-
-$cnt=1;
-for($field_count = 0; $field_count < $ret_field_count; $field_count++)
-{
-
-	$smarty->assign("COLCOUNT", $field_count + 1);
-	$suggest = "";
-
-	/*
-	if ($has_header && isset( $field_map[$firstrow[$field_count]] ) )
-	{
-		$suggest = $field_map[$firstrow[$field_count]];	
-	}
-	else if (isset($field_map[$field_count]))
-	{
-		$suggest = $field_map[$field_count];	
-	}
-	*/
-
-	if($_REQUEST['module']=='Accounts')
-	{
-		$tablename='account';
-		$focus1=new Account();
-	}
-	if($_REQUEST['module']=='Contacts')
-	{
-		$tablename='contactdetails';
-		$focus1=new Contact();
- 	}
-	if($_REQUEST['module']=='Leads')
- 	{
-		$tablename='leaddetails';
-		$focus1=new Lead();
-	}
-	if($_REQUEST['module']=='Potentials')
- 	{
-		$tablename='potential';
-		$focus1=new Potential();
-	}
-	if($_REQUEST['module']=='Products')
- 	{
- 		$tablename='products';
- 		$focus1=new Product();
- 	}
-
-	
-	$smarty->assign("FIRSTROW",$firstrow);
-	$smarty->assign("SECONDROW",$secondrow);
-	$smarty->assign("THIRDROW",$thirdrow);
-	$smarty_array[$field_count + 1] = getFieldSelect(	$focus->importable_fields,
-							$field_count,
-							$focus1->required_fields,
-							$suggest,
-							$translated_column_fields,
-							$tablename
-						   );
-
-	$pos = 0;
-
-	foreach ( $rows as $row ) 
-	{
-		
-		if( isset($row[$field_count]) && $row[$field_count] != '')
-		{
-			$smarty->assign("CELL",htmlspecialchars($row[$field_count]));
-//			$smarty->parse("main.table.row.cell");
-		} 
-		else
-		{
-//			$smarty->parse("main.table.row.cellempty");
-		}
-
-		$cnt++;
-	}
-}
- at session_unregister('import_has_header');
- at session_unregister('import_firstrow');
- at session_unregister('import_field_map');
- at session_unregister('import_module_object_column_fields');
- at session_unregister('import_module_field_count');
- at session_unregister('import_module_object_required_fields');
- at session_unregister('import_module_translated_column_fields');
-$_SESSION['import_has_header'] = $has_header;
-$_SESSION['import_firstrow'] = $firstrow;
-$_SESSION['import_field_map'] = $field_map;
-$_SESSION['import_module_object_column_fields'] = $focus->importable_fields;
-$_SESSION['import_module_field_count'] = $field_count;
-$_SESSION['import_module_object_required_fields'] = $focus1->required_fields;
-$_SESSION['import_module_translated_column_fields'] = $translated_column_fields;
-
-
-//echo '<pre>Default array ==> '; print_r($smarty_array); echo '</pre>';
-
-$smarty->assign("SELECTFIELD",$smarty_array);
-$smarty->assign("ROW", $row);
-//$xtpl->parse("main.table");
-
-$module_key = "LBL_".strtoupper($_REQUEST['module'])."_NOTE_";
-
-for ($i = 1;isset($mod_strings[$module_key.$i]);$i++)
-{
-	$smarty->assign("NOTETEXT", $mod_strings[$module_key.$i]);
-	//$xtpl->parse("main.note");
-}
-
-
-if($has_header)
-{
-	$smarty->assign("HAS_HEADER", 'on');
-} 
-else
-{
-	$smarty->assign("HAS_HEADER", 'off');
-}
-
-
-$smarty->assign("MODULE", $_REQUEST['module']);
-
-$category = getParenttab();
-$smarty->assign('CATEGORY' , $category);
-
-$smarty->assign("JAVASCRIPT2", get_readonly_js() );
-
-$smarty->display('ImportStep2.tpl');
-
-?>
-<script language="javascript" type="text/javascript">
-function validate_import_map()
-{
-	var tagName;
-	var count = 0;
-	var field_count = "<?php echo $field_count; ?>";
-	var required_fields = new Array();
-	var required_fields_name = new Array();
-	var seq_string = '';
-
-	<?php 
-		foreach($focus->required_fields as $name => $index)
-		{
-			?>
-			required_fields[count] = "<?php echo $name; ?>";
-			required_fields_name[count] = "<?php echo $translated_column_fields[$name]; ?>";
-			count = count + 1;
-			<?php 
-		} 
-	?>		
-	for(loop_count = 0; loop_count<field_count;loop_count++)
-	{
-		tagName = document.getElementById('colnum'+loop_count);
-		optionData = tagName.options[tagName.selectedIndex].value;
-
-		if(optionData != -1)
-		{
-			tmp = seq_string.indexOf(optionData);
-			if(tmp == -1)
+			if ( isset($firstrow[$pos]) &&  isset( $field_name))
 			{
-				seq_string = seq_string + optionData;
-			}
-			else
-			{
-				//if a field mapped more than once, alert the user and return
-				alert("'"+tagName.options[tagName.selectedIndex].text+"' is mapped more than once. Please check the mapping.");
-				return false;
+				$header_to_field[ $firstrow[$pos] ] = $field_name;
 			}
 		}
 
-	}
-
-	//check whether the mandatory fields have been mapped.
-	for(inner_loop = 0; inner_loop<required_fields.length;inner_loop++)
-	{
-		if(seq_string.indexOf(required_fields[inner_loop]) == -1)
-		{
-			alert('Please map the mandatory field "'+required_fields_name[inner_loop]+'"');
-			return false;
-		}
-	}
-
-	//This is to check whether the save map name has been given or not when save map check box is checked
-	if(document.getElementById("save_map").checked == true)
-	{
-		if(trim(document.getElementById("save_map_as").value) == '')
-		{
-			alert("Please Enter Save Map Name");
-			return false;
-		}
-	}
-
-	return true;
-}
-</script>
+		$serialized_mapping = implode_assoc("=","&",$header_to_field);
+	}
+	else
+	{
+		$serialized_mapping = implode_assoc("=","&",$col_pos_to_field);
+	}
+
+	$mapping_file_name = $_REQUEST['save_map_as'];
+
+	$mapping_file = new ImportMap();
+
+	//$query_arr = array('assigned_user_id'=>$current_user->id,'name'=>$mapping_file_name);
+	//$mapping_file->retrieve_by_string_fields($query_arr, false);
+
+	$result = $mapping_file->save_map( $current_user->id,
+					$mapping_file_name,
+					$_REQUEST['module'],
+					$has_header,
+					$serialized_mapping );
+
+	$adb->println("Save map done");
+	$adb->println($result);
+}
+//save map - ends
+
+
+
+
+if(isset($_SESSION['totalrows']) && $_SESSION['totalrows'] != '')
+{
+	$xrows = $_SESSION['totalrows'];
+}
+else
+{
+	$xrows = $datarows;
+}
+if(isset($_SESSION['return_field_count']))
+{
+	$ret_field_count = $_SESSION['return_field_count'];
+}
+if(isset($_SESSION['column_position_to_field']))
+{
+	$col_pos_to_field = $_SESSION['column_position_to_field'];
+}
+if($xrows != '')
+{
+	$datarows = $xrows;
+}
+if($_REQUEST['skipped_record_count'] != '')
+	$skipped_record_count = $_REQUEST['skipped_record_count'];
+else
+	$_REQUEST['skipped_record_count'] = 0;
+
+if($_REQUEST['noofrows'] != '')
+	$totalnoofrows = $_REQUEST['noofrows'];
+else
+	$totalnoofrows = count($datarows);
+
+$loopcount = ($totalnoofrows/$RECORDCOUNT)+1;
+
+if($_REQUEST['startval'] != '')
+	$START = $_REQUEST['startval'];
+else
+	$START = $_SESSION['startval'];
+if($_REQUEST['recordcount'] != '')
+	$RECORDCOUNT = $_REQUEST['recordcount'];
+else
+	$RECORDCOUNT = $_SESSION['recordcount'];
+
+if(($START+$RECORDCOUNT) > $totalnoofrows)
+{
+	$RECORDCOUNT = $totalnoofrows - $START;
+}
+
+if($totalnoofrows > $RECORDCOUNT && $START < $totalnoofrows)
+{
+	$rows1 = Array();
+	for($j=$START;$j<$START+$RECORDCOUNT;$j++)
+	{
+		$rows1[] = $datarows[$j];
+	}
+
+	$res = InsertImportRecords($datarows,$rows1,$focus,$ret_field_count,$col_pos_to_field,$START,$RECORDCOUNT,$_REQUEST['module'],$totalnoofrows,$skipped_record_count);
+
+	if($START != 0)
+		echo '<b>'.$res.'</b>';
+
+	$count = $_REQUEST['count'];
+}
+else
+{
+	if($START == 0)
+	{
+		$res = InsertImportRecords($datarows,$datarows,$focus,$ret_field_count,$col_pos_to_field,$START,$totalnoofrows,$_REQUEST['module'],$totalnoofrows,$skipped_record_count);
+	}
+//	exit;
+}
+
+
+
+
+
+
+if ($error != "")
+{
+	show_error_import( $mod_strings['LBL_ERROR']." ". $error);
+	exit;
+}
+else 
+{
+	$message= urlencode($mod_strings['LBL_SUCCESS']."<BR>$count ". $mod_strings['LBL_MODULE_NAME']." ".$mod_strings['LBL_SUCCESSFULLY']."<br>".($broken_ids+$id_exists_count) ." ". $mod_strings['LBL_IDS_EXISTED_OR_LONGER']. "<br>$skip_required_count " .  $mod_strings['LBL_RECORDS_SKIPPED'] );
+
+	header("Location: index.php?module={$_REQUEST['module']}&action=Import&step=last&return_module={$_REQUEST['return_module']}&return_action={$_REQUEST['return_action']}&message=$message");
+exit;
+}
+
+
+?>

Modified: vtigercrm/trunk/modules/Import/ImportSteplast.php
==============================================================================
--- vtigercrm/trunk/modules/Import/ImportSteplast.php (original)
+++ vtigercrm/trunk/modules/Import/ImportSteplast.php Fri Jun  9 06:20:06 2006
@@ -57,7 +57,7 @@
 $image_path=$theme_path."images/";
 require_once($theme_path.'layout_utils.php');
 
-$log->info("Upload Step 2");
+$log->info("Import Step last");
 
 if ( isset($_REQUEST['message']))
 {
@@ -83,7 +83,7 @@
 				   <form enctype="multipart/form-data" name="Import" method="POST" action="index.php">
 					<input type="hidden" name="module" value="<?php echo $_REQUEST['modulename']; ?>">
 					<input type="hidden" name="action" value="Import">
-					<input type="hidden" name="step" value="2">
+					<input type="hidden" name="step" value="1">
 					<input type="hidden" name="return_id" value="<?php echo $_REQUEST['return_id']; ?>">
 					<input type="hidden" name="return_module" value="<?php echo $_REQUEST['return_module']; ?>">
 					<input type="hidden" name="return_action" value="<?php echo (($_REQUEST['return_action'] != '')?$_REQUEST['return_action']:'index'); ?>">
@@ -131,10 +131,10 @@
 $implict_account = false;
 
 $import_modules_array = Array(
+				"Leads"=>"Lead",
+				"Accounts"=>"Account",
 				"Contacts"=>"Contact",
 				"Potentials"=>"Potential",
-				"Leads"=>"Lead",
-				"Accounts"=>"Account",
 				"Products"=>"Product" 
 			     );
 
@@ -153,7 +153,7 @@
 	//Retreiving the no of rows
 	$noofrows = $adb->num_rows($list_result);
 
-	if($noofrows>1) 
+	if($noofrows>=1) 
 	{
 		if($module_name != 'Accounts')
 		{



From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun  9 05:21:30 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 09 Jun 2006 12:21:30 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6985 -
	/vtigercrm/trunk/modules/Import/ImportStepundo.php
Message-ID: <20060609122130.E6C927E89AB@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun  9 06:21:27 2006
New Revision: 6985

Log:
* Modified the steps where as in previous the php files start with step2 and ends with step4 but now it has been starts with step1 and ends with step3 properly

Modified:
    vtigercrm/trunk/modules/Import/ImportStepundo.php

Modified: vtigercrm/trunk/modules/Import/ImportStepundo.php
==============================================================================
--- vtigercrm/trunk/modules/Import/ImportStepundo.php (original)
+++ vtigercrm/trunk/modules/Import/ImportStepundo.php Fri Jun  9 06:21:27 2006
@@ -102,7 +102,7 @@
 <form name="Import" method="POST" action="index.php">
 <input type="hidden" name="module" value="<?php echo $_REQUEST['module']; ?>">
 <input type="hidden" name="action" value="Import">
-<input type="hidden" name="step" value="2">
+<input type="hidden" name="step" value="1">
 <input type="hidden" name="return_module" value="<?php echo $_REQUEST['RETURN_MODULE'] ?>">
 <input type="hidden" name="return_id" value="<?php echo $_REQUEST['RETURN_ID'] ?>">
 <input type="hidden" name="return_action" value="<?php echo $_REQUEST['RETURN_ACTION'] ?>">



From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun  9 05:22:45 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 09 Jun 2006 12:22:45 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6986 -
	/vtigercrm/trunk/modules/Import/ImportStep4.php
Message-ID: <20060609122245.AE5167E89AB@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun  9 06:22:42 2006
New Revision: 6986

Log:
* Removed this file as these code is moved to step3

Removed:
    vtigercrm/trunk/modules/Import/ImportStep4.php



From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun  9 05:36:43 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 09 Jun 2006 12:36:43 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6987 - in
 /vtigercrm/trunk/Smarty/templates: Buttons_List.tpl ImportStep1.tpl
 ImportStep2.tpl Importerror.tpl
Message-ID: <20060609123643.02CA664FC48@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun  9 06:36:37 2006
New Revision: 6987

Log:
* Modified the steps where as in previous the php files start with step2 and ends with step4 but now it has been starts with step1 and ends with step3 properly

Modified:
    vtigercrm/trunk/Smarty/templates/Buttons_List.tpl
    vtigercrm/trunk/Smarty/templates/ImportStep1.tpl
    vtigercrm/trunk/Smarty/templates/ImportStep2.tpl
    vtigercrm/trunk/Smarty/templates/Importerror.tpl

Modified: vtigercrm/trunk/Smarty/templates/Buttons_List.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Buttons_List.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Buttons_List.tpl Fri Jun  9 06:36:37 2006
@@ -85,7 +85,7 @@
 			<tr>
 			{if $MODULE eq 'Contacts' || $MODULE eq 'Leads' || $MODULE eq 'Accounts' || $MODULE eq 'Potentials' || $MODULE eq 'Products' }
 		   		{if $CHECK.Import eq 'yes'}	
-					<td style="padding-right:0px;padding-left:10px;"><a href="index.php?module={$MODULE}&action=Import&step=2&return_module={$MODULE}&return_action=index&parenttab={$CATEGORY}"><img src="{$IMAGE_PATH}tbarImport.gif" alt="{$APP.LBL_IMPORT} {$APP.$MODULE}" title="{$APP.LBL_IMPORT} {$APP.$MODULE}" border="0"></a></td>	
+					<td style="padding-right:0px;padding-left:10px;"><a href="index.php?module={$MODULE}&action=Import&step=1&return_module={$MODULE}&return_action=index&parenttab={$CATEGORY}"><img src="{$IMAGE_PATH}tbarImport.gif" alt="{$APP.LBL_IMPORT} {$APP.$MODULE}" title="{$APP.LBL_IMPORT} {$APP.$MODULE}" border="0"></a></td>	
 				{else}	
 					<td style="padding-right:0px;padding-left:10px;"><img src="{$IMAGE_PATH}tbarImport-Faded.gif" alt="{$APP.LBL_IMPORT} {$APP.$MODULE}" title="{$APP.LBL_IMPORT} {$APP.$MODULE}" border="0"></td>	
 				{/if}	

Modified: vtigercrm/trunk/Smarty/templates/ImportStep1.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ImportStep1.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ImportStep1.tpl Fri Jun  9 06:36:37 2006
@@ -37,7 +37,7 @@
 			<td width="75%" valign=top>
 				<form enctype="multipart/form-data" name="Import" method="POST" action="index.php">
 				<input type="hidden" name="module" value="{$MODULE}">
-				<input type="hidden" name="step" value="2">
+				<input type="hidden" name="step" value="1">
 				<input type="hidden" name="source" value="{$SOURCE}">
 				<input type="hidden" name="source_id" value="{$SOURCE_ID}">
 				<input type="hidden" name="action" value="Import">
@@ -100,7 +100,7 @@
 				   <tr bgcolor="#ECECEC"><td colspan="2"><hr /></td></tr>
 				   <tr bgcolor="#ECECEC">
 					<td colspan="2" align="right" style="padding-right:40px;">
-						<input title="{$MOD.LBL_NEXT}" accessKey="" class="classBtn" type="submit" name="button" value="  {$MOD.LBL_NEXT} &rsaquo; "  onclick="this.form.action.value='Import';this.form.step.value='3'; return verify_data(this.form);">
+						<input title="{$MOD.LBL_NEXT}" accessKey="" class="classBtn" type="submit" name="button" value="  {$MOD.LBL_NEXT} &rsaquo; "  onclick="this.form.action.value='Import';this.form.step.value='2'; return verify_data(this.form);">
 					</td>
 				   </tr>
 				   <tr bgcolor="#ECECEC">

Modified: vtigercrm/trunk/Smarty/templates/ImportStep2.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ImportStep2.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ImportStep2.tpl Fri Jun  9 06:36:37 2006
@@ -55,7 +55,7 @@
 				<form enctype="multipart/form-data" name="Import" method="POST" action="index.php">
 				<input type="hidden" name="module" value="{$MODULE}">
 				<input type="hidden" name="action" value="Import">
-				<input type="hidden" name="step" value="4">
+				<input type="hidden" name="step" value="3">
 				<input type="hidden" name="has_header" value="{$HAS_HEADER}">
 				<input type="hidden" name="source" value="{$SOURCE}">
 				<input type="hidden" name="delimiter" value="{$DELIMITER}">
@@ -153,9 +153,9 @@
 				   <tr bgcolor="#ECECEC"><td><hr /></td></tr>
 				   <tr bgcolor="#ECECEC">
 					<td align="right" style="padding-right:40px;" >
-						<input type="submit" name="button"  value=" &nbsp;&lsaquo; {$MOD.LBL_BACK} &nbsp; " class="classBtn" onclick="this.form.action.value='Import';this.form.step.value='2'; return true;" />
+						<input type="submit" name="button"  value=" &nbsp;&lsaquo; {$MOD.LBL_BACK} &nbsp; " class="classBtn" onclick="this.form.action.value='Import';this.form.step.value='1'; return true;" />
 						&nbsp;&nbsp;
-						<input type="submit" name="button"  value=" &nbsp; {$MOD.LBL_IMPORT_NOW} &rsaquo; &nbsp; " class="classBtn" onclick="this.form.action.value='Import';this.form.step.value='4'; return validate_import_map();" />
+						<input type="submit" name="button"  value=" &nbsp; {$MOD.LBL_IMPORT_NOW} &rsaquo; &nbsp; " class="classBtn" onclick="this.form.action.value='Import';this.form.step.value='3'; return validate_import_map();" />
 					</td>
 				   </tr>
 				   <tr bgcolor="#ECECEC"><td align="right" >&nbsp;</td></tr>

Modified: vtigercrm/trunk/Smarty/templates/Importerror.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Importerror.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Importerror.tpl Fri Jun  9 06:36:37 2006
@@ -16,7 +16,7 @@
 		<input type="hidden" name="module" value="{$MODULE}">
  		<input type="hidden" name="return_module" value="{$MODULE}">
 		<input type="hidden" name="return_action" value="index">
-		<input type="hidden" name="step" value="2">
+		<input type="hidden" name="step" value="1">
 		<input type="hidden" name="action" value="Import">
 
 		<!-- IMPORT ERROR STARTS HERE  -->



From vtiger-tickets at vtiger.fosslabs.com  Fri Jun  9 05:57:52 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 09 Jun 2006 12:57:52 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231289=3A?=
 =?utf-8?q?_Edit/Del_links_are_must_in_relatedlists?=
Message-ID: <076.c2484dcccdec49e5b30c79bee458fec5@vtiger.fosslabs.com>

#1289: Edit/Del links are must in relatedlists
-----------------------+----------------------------------------------------
 Reporter:  mickie     |       Owner:  don  
     Type:  task       |      Status:  new  
 Priority:  critical   |   Milestone:       
Component:  vtigercrm  |     Version:  5.0.0
 Keywords:             |  
-----------------------+----------------------------------------------------
 In our previous releases we have edit and del links in the relatedlist.
 These links are must.
 For example, i have added a pricebook in the product related list. now i
 want to change that list price where as i can't.
 Also, i am in account relatedlist, i have contacts for this account.
 previouly by click on del link the account - contact relationship can be
 deleted. but now if i want to delete that account-contact relationship i
 want to go to contact detailview -> edit -> clear that parent account
 value.

 Please provide these links in all relatedlist. Also it will be useful to
 provide these links in listview.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1289>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun  9 06:26:38 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 09 Jun 2006 13:26:38 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6988 -
	/vtigercrm/trunk/include/file.php
Message-ID: <20060609132638.5385A7E89DA@vtiger.fosslabs.com>

Author: richie
Date: Fri Jun  9 07:26:34 2006
New Revision: 6988

Log:
file not needed

Removed:
    vtigercrm/trunk/include/file.php



From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun  9 06:59:52 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 09 Jun 2006 13:59:52 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6989 -
	/vtigercrm/trunk/modules/Dashboard/Entity_charts.php
Message-ID: <20060609135952.286F07E89ED@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun  9 07:59:47 2006
New Revision: 6989

Log:
Quotes by Accounts, on clicking dashboard image issue fixedChanged blah and foo to do this or that. Fixes #309

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 Fri Jun  9 07:59:47 2006
@@ -211,7 +211,11 @@
 						$graph_for="ticketpriorities";
 					}
 
+					if($graph_for == "accountid") $graph_for = "account_id";
+					
 					$link_val="index.php?module=".$module."&action=index&search_text=".$name."&search_field=".$graph_for."&searchtype=BasicSearch&query=true";
+
+					if($graph_for == "account_id") $graph_for = "accountid";
 
 					//Adding the links to the graph	
 					if($i==0)



From vtiger-tickets at vtiger.fosslabs.com  Fri Jun  9 06:59:51 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 09 Jun 2006 13:59:51 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23309=3A_?=
 =?utf-8?q?Quotes_by_Accounts_on_drill_down_shows_List_View?=
In-Reply-To: <076.e0e33881a887e78b8da9880872f2699e@vtiger.fosslabs.com>
References: <076.e0e33881a887e78b8da9880872f2699e@vtiger.fosslabs.com>
Message-ID: <085.b5b876e9b02680474d9e247a8d5d549c@vtiger.fosslabs.com>

#309: Quotes by Accounts on drill down shows List View
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  philip   
      Type:  defect     |      Status:  closed   
  Priority:  critical   |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:  fixed      |    Keywords:  Dashboard
------------------------+---------------------------------------------------
Changes (by saraj):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 (In [6989]) Quotes by Accounts, on clicking dashboard image issue
 fixedChanged blah and foo to do this or that. Fixes #309

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/309>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun  9 07:50:16 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 09 Jun 2006 14:50:16 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231290=3A?=
	=?utf-8?q?_Company_Information?=
Message-ID: <076.d72bc388560618f95d42b1de2961a633@vtiger.fosslabs.com>

#1290: Company Information
---------------------------------+------------------------------------------
 Reporter:  daneswood            |       Owner:  developer
     Type:  defect               |      Status:  new      
 Priority:  minor                |   Milestone:           
Component:  vtigercrm            |     Version:  5.0.0    
 Keywords:  company information  |  
---------------------------------+------------------------------------------
 When you set up a logo in the company information configuration, it does
 not appear to be possible to change it once you have uploaded it.
 Attempts to overwrite it just repeats the original image details.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1290>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun  9 13:12:23 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 09 Jun 2006 20:12:23 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6990 -
	/vtigercrm/trunk/themes/blue/style.css
Message-ID: <20060609201224.141067E89FC@vtiger.fosslabs.com>

Author: don
Date: Fri Jun  9 14:12:19 2006
New Revision: 6990

Log:
style.css updated for new settings ui - 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 Fri Jun  9 14:12:19 2006
@@ -1,15 +1,45 @@
 .small {
 	font-family: Arial, Helvetica, sans-serif;
 	font-size: 11px;
+	line-height: 14px;
 	color: #000000;
 }
 .big {
 	font-family: Arial, Helvetica, sans-serif;
 	font-size: 12px;
 	line-height: 18px;
-	color: #aaaaaa;
-	font-weight:bold;
-}
+	color: #000000;
+	font-weight:bold;
+}
+
+.ybToday {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	line-height: 14px;
+	color: #119911;
+}
+.ybUnfinished {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	line-height: 14px;
+	color: #993311;
+}
+.ybTime {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	line-height: 14px;
+	color: #777777;
+	font-weight:bold;
+}
+.yellowBox {
+	background-color:#ffffE1;
+	border:1px solid #999999;
+}
+.ybSeperator{
+	height:0px;
+	border-top:2px dotted #adadad;
+}
+
 .genHeaderBig{
 	font-family: Arial, Helvetica, sans-serif;
 	font-size: 16px;
@@ -90,8 +120,8 @@
     font-size: 11px;
     padding-left:20px;
     padding-right:20px;
-    padding-top:3px;
-    padding-bottom:3px;
+    padding-top:5px;
+    padding-bottom:5px;
     font-weight:bold;
     color:white;
 }
@@ -99,8 +129,6 @@
 .level2text a{
 	text-decoration:none;
 	color:white;
-	padding-left:10px;
-	padding-right:10px;
 }
 
 .level2text a:hover {
@@ -148,21 +176,15 @@
 
 .showPanelBg {
 	background:url(images/showPanelTopBg.gif) repeat-x;
-	background-position:top;
 }
 
 a {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	text-decoration:none;
-	color:#333366;
+	text-decoration:none;
+	color:#003399;
 }
 
 a:hover {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 11px;
 	text-decoration:underline;
-	color:#333333;
 }
 
 .hdrLink {
@@ -272,7 +294,6 @@
 .dvtCellLabel {
 	background-color:#f6f6f6;
 	padding-right:10px;
-	padding-left:10px;
 	border-bottom:1px solid #eaeaea;
 	color:#737373;
 	white-space:nowrap;
@@ -280,7 +301,6 @@
 
 .dvtCellInfo {
 	padding-left:10px;
-	padding-right:10px;
 	border-bottom:1px solid #eaeaea;
 	white-space:nowrap;
 }
@@ -292,8 +312,6 @@
 .rightMailMergeHeader {
 	border-bottom:1px solid #dddddd;
 	padding:5px;
-	font-size: 11px;
-        line-height: 14px;
 	background-color:#eaeaea;
 
 }
@@ -2471,8 +2489,8 @@
 
    
 .tagCloudTopBg {
-    background: url(images/tagCloudBg.gif) repeat-x;
-    background-color:#e5e5e5;
+    background: url(images/tagCloudBg.gif);
+    background-repeat:repeat-x;
    
 }
 
@@ -2483,6 +2501,322 @@
     font-size: 11px;
     line-height: 14px;
     color: #000000;
-    height:100px;
-
-}
+
+}
+.adProgressBar {
+	border-style:solid;
+	border-width:2px;
+	border-color:blue;
+
+}
+
+.h2 {
+
+	font-size:18px;
+	line-height:20px;
+
+}
+
+.gray {
+
+	color:gray;
+}
+
+.hdeskComments {
+
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	line-height: 14px;
+	color: #999999;
+	border:0px;
+	background-color:#ffffef;
+	width:100%;
+
+}
+
+
+
+
+ul {
+	list-style:none;
+	line-height:20px;
+	padding-left:20px;
+	margin-left:0px;
+	font-weight:normal;
+	border-top:1px dotted #dadada;
+
+}
+	
+.branch {
+	list-style-image: url("secAdd.gif");
+}	
+
+
+
+.tagCloudTopBg {
+	background-image:url(images/topCloudBg.gif) repeat-x;
+}
+
+.tagCloudDisplay {
+	background-color:#e5e5e5;
+	padding:5px;
+}
+	
+	
+	
+.heading1 {
+	font-family:  Arial, Helvetica, sans-serif;
+	font-size: 19px;
+	line-height: 14px;
+	color: #000000;
+}
+
+.heading2 {
+	font-family:  Arial, Helvetica, sans-serif;
+	font-size: 16px;
+	line-height: 16px;
+	font-weight:bold;
+	color: #000000;
+}
+
+.heading3 {
+	font-family:  Arial, Helvetica, sans-serif;
+	font-size: 14px;
+	line-height: 14px;
+	color: #999999;
+}
+
+.heading4 {
+	font-family:  Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	line-height: 14px;
+	color: #999999;
+}
+
+.settingsUI {
+
+	background-color:#efefef;
+	border:2px solid #777777;
+
+}
+
+
+.settingsTabHeader {
+	font-family:  Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	line-height:25px;
+	font-weight:bold;
+	color:#ffffff;
+	background-image: url(images/settingsMTBg.gif);
+	background-repeat: repeat-x;
+	padding-left:10px;
+	padding-right:10px;
+	
+
+}
+
+.settingsTabList {
+	font-family:  Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	line-height:20px;
+	font-weight:normal;
+	color:#000000;
+	background-color:#e3e3e3;
+	padding-left:30px;
+	border-top:1px solid #eaeaea;
+	border-bottom:1px solid #d3d3d3;
+}
+.settingsTabSelected {
+	font-family:  Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	line-height:20px;
+	font-weight:bold;
+	color:#000000;
+	background-color:#ffffff;
+	padding-left:30px;
+}
+.settingsSelectedUI {
+	padding:10px;
+	background:url(images/settingsSelUIBg.gif) repeat-x;
+	background-color:#ffffff;
+}
+.settingsIconDisplay {
+	font-family:  Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	line-height:14px;
+	padding:10px;
+
+	color:#000000;
+	background-color:#ffffff;
+	padding-left:10px;
+}
+.settingsSelUITopLine{
+	border-bottom:2px dotted #999999;
+
+}
+
+.tableHeading{
+	background-color:#ffffff;
+	border-bottom:2px solid #aaaaaa;
+}
+.ColHeader{
+	background-color:#dadada;
+	border-left:1px solid #eaeaea;
+	border-top:1px solid #eaeaea;
+	border-right:1px solid #aaaaaa;
+	border-bottom:1px solid #aaaaaa;
+	font-weight:bold;
+
+}
+.cellLabel {
+	background-color:#eaeaea;
+	border-top:1px solid #efefef;
+	border-bottom:1px solid #dadada;
+	color:#555555;
+
+}
+.cellText {
+	color:#333333;
+	border-bottom:1px solid #dadada;
+}
+
+.listTable{
+	border-left:1px solid #cccccc;
+	border-right:1px solid #cccccc;
+	border-bottom:1px solid #cccccc;
+
+}
+
+.listTableRow{
+	border-bottom:1px solid #eaeaea;
+	border-right	:1px solid #eaeaea;
+	border-bottom:1px solid #eaeaea;
+	border-bottom:1px solid #eaeaea;
+}
+
+.listTableTopButtons{
+	background-color:#eeeeee;
+	
+}
+
+.crmButton{
+	
+	border-left:1px solid #ffffff;
+	border-top:1px solid #ffffff;
+	border-right:1px solid #555555;
+	border-bottom:1px solid #555555;
+	padding-left:20px;
+	padding-right:20px;
+}
+
+.create{
+	background-color:#33cc11;
+	color:#333333;
+	font-weight:bold;
+}
+.delete {
+	background-color:#dd9900;
+	color:#ffffff;
+	font-weight:bold;
+}
+.edit {
+	background-color:#a5a5ee;
+	color:#ffffff;
+	font-weight:bold;
+}
+.save{
+	background-color:#33cc11;
+	color:#ffffff;
+	font-weight:bold;
+}
+.cancel {
+	background-color:#dd9900;
+	color:#ffffff;
+	font-weight:bold;
+}
+
+.inactive{
+color:#999999;
+}
+
+.active{
+color:#229922;
+
+}
+textarea {
+	width:95%;
+	height:70px;
+	border:1px solid #dadada;
+}
+.treeTable1{
+	padding:0px;
+}
+
+.prvPrfBigText {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 14px;
+}
+
+.prvPrfTopBg {
+	background-color:#ebebeb;
+}
+
+.prvPrfBottomBg {
+	background-color:#ebebeb;
+}
+
+.prvPrfOutline {
+	border:1px solid #ebebeb;
+}
+
+.prvPrfSelectedTab {
+	background:url(../images/prvPrfSelectedTab.gif) repeat-x;
+
+}
+
+.prvPrfUnSelectedTab {
+	background:url(../images/prvPrfUnSelectedTab.gif) repeat-x;
+
+}
+
+.prvPrfTexture {
+	background:url(../images/prvPrfTexture1.gif);
+
+}
+.prvPrfBgOn{
+	background-color:#33ee33;
+}
+.prvPrfBgOff{
+	background-color:#cccccc;
+}
+
+.prvPrfHoverOn {
+	background-color:#ffffef;
+	
+}
+.prvPrfHoverOut {
+	background-color:#ffffff;
+}
+
+.prvPrfBgImgGlobal {
+	background:url(../images/prvPrfBgImgGlobal.jpg) top right no-repeat;
+}
+.prvPrfBgImgTab {
+	background:url(../images/prvPrfBgImgTab.jpg) top right no-repeat;
+}
+.prvPrfBgImgStandard {
+	background:url(../images/prvPrfBgImgStandard.jpg) top right no-repeat;
+}
+.prvPrfBgImgUtils {
+	background:url(../images/prvPrfBgImgUtils.jpg) top right no-repeat;
+}
+.prvPrfBgImgField {
+	background:url(../images/prvPrfBgImgField.jpg) top right no-repeat;
+}
+
+.prvPrfTabSample {
+	border-top:1px solid #ababab;
+	border-left:1px solid #ababab;
+	border-right:1px solid #a1a1a1;
+}
+



From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun  9 13:14:30 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 09 Jun 2006 20:14:30 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6991 -
	/vtigercrm/trunk/Smarty/templates/Settings.tpl
Message-ID: <20060609201431.144367E89FC@vtiger.fosslabs.com>

Author: don
Date: Fri Jun  9 14:14:27 2006
New Revision: 6991

Log:
New Settings tpl for new ui - ahmed

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 Jun  9 14:14:27 2006
@@ -1,175 +1,519 @@
-{*<!--
-/*********************************************************************************
-  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
-   * ("License"); You may not use this file except in compliance with the License
-   * The Original Code is:  vtiger CRM Open Source
-   * The Initial Developer of the Original Code is vtiger.
-   * Portions created by vtiger are Copyright (C) vtiger.
-   * All Rights Reserved.
-  *
- ********************************************************************************/
--->*}
-<style type="text/css">@import url(themes/blue/style.css);</style>
-<table width="100%" border="0" cellpadding="0" cellspacing="0" class="small">
-<tr>
-		{include file='SettingsMenu.tpl'}
-<td width="75%" valign="top">
-<table width="100%"  border="0" cellspacing="0" cellpadding="0" class="small">
-<tr>
-
-<td class="detailedViewHeader" align="left"><b>{$MOD.LBL_USER_MANAGEMENT}</b></td>
-</tr>
-
-<tr>
-<td class="padTab">
-
-<table class="controlTab" cellspacing="0" cellpadding="0">
-<tr>
-
-<td width="25%"><a href="index.php?module=Administration&action=index&parenttab=Settings"><img src="{$IMAGE_PATH}user.gif" border="0" alt="{$MOD.LBL_CREATE_AND_MANAGE_USERS}" title="{$MOD.LBL_CREATE_AND_MANAGE_USERS}"/></a><br>
-<a href="index.php?module=Administration&action=index&parenttab=Settings" alt="{$MOD.LBL_CREATE_AND_MANAGE_USERS}" title="{$MOD.LBL_CREATE_AND_MANAGE_USERS}">{$MOD.LBL_USERS}</a></td>
-
-<td width="25%"><a href="index.php?module=Users&action=listroles&parenttab=Settings"><img src="{$IMAGE_PATH}roles.gif" alt="{$MOD.LBL_CREATE_AND_MANAGE_USER_ROLES}" title="{$MOD.LBL_CREATE_AND_MANAGE_USER_ROLES}" border="0"/></a><br>
-<a href="index.php?module=Users&action=listroles&parenttab=Settings" alt="{$MOD.LBL_CREATE_AND_MANAGE_USER_ROLES}" title="{$MOD.LBL_CREATE_AND_MANAGE_USER_ROLES}">{$MOD.LBL_ROLES}</a>
-</td>
-
-<td width="25%"><a href="index.php?module=Users&action=ListProfiles&parenttab=Settings"><img src="{$IMAGE_PATH}profile.gif" alt="{$MOD.LBL_CREATE_AND_MANAGE_USER_PROFILES}" title="{$MOD.LBL_CREATE_AND_MANAGE_USER_PROFILES}"  border="0" /></a><br>
-<a href="index.php?module=Users&action=ListProfiles&parenttab=Settings" alt="{$MOD.LBL_CREATE_AND_MANAGE_USER_PROFILES}" title="{$MOD.LBL_CREATE_AND_MANAGE_USER_PROFILES}">{$MOD.LBL_PROFILES}</a>
-</td>
-
-<td width="25%"><a href="index.php?module=Users&action=listgroups&parenttab=Settings"><img src="{$IMAGE_PATH}groups.gif" alt="{$MOD.LBL_CREATE_AND_MANAGE_USER_GROUPS}" title="{$MOD.LBL_CREATE_AND_MANAGE_USER_GROUPS}" border="0" /></a><br>
-<a href="index.php?module=Users&action=listgroups&parenttab=Settings" alt="{$MOD.LBL_CREATE_AND_MANAGE_USER_GROUPS}" title="{$MOD.LBL_CREATE_AND_MANAGE_USER_GROUPS}">{$MOD.USERGROUPLIST}</a></td>
-
-</tr>
-
-<tr><td colspan="4" height="30px;">&nbsp;</td></tr>
-
-<tr>
-
-<td><a href="index.php?module=Users&action=OrgSharingDetailView&parenttab=Settings"><img src="{$IMAGE_PATH}shareaccess.gif" alt="{$MOD.LBL_SETTING_DEFAULT_SHARING_ACCESS}" title="{$MOD.LBL_SETTING_DEFAULT_SHARING_ACCESS}" border="0"/></a><br>
-<a href="index.php?module=Users&action=OrgSharingDetailView&parenttab=Settings" alt="{$MOD.LBL_SETTING_DEFAULT_SHARING_ACCESS}" title="{$MOD.LBL_SETTING_DEFAULT_SHARING_ACCESS}">{$MOD.LBL_DEFAULT_ORGANIZATION_SHARING_ACCESS}</a>
-</td>
-
-<td><a href="index.php?module=Users&action=DefaultFieldPermissions&parenttab=Settings"><img src="{$IMAGE_PATH}orgshar.gif" alt="{$MOD.LBL_SETTING_DEFAULT_ORGANIZATION_FIELDS}" title="{$MOD.LBL_SETTING_DEFAULT_ORGANIZATION_FIELDS}" border="0"/></a><br>						
-<a href="index.php?module=Users&action=DefaultFieldPermissions&parenttab=Settings" alt="{$MOD.LBL_SETTING_DEFAULT_ORGANIZATION_FIELDS}" title="{$MOD.LBL_SETTING_DEFAULT_ORGANIZATION_FIELDS}">{$MOD.LBL_DEFAULT_ORGANIZATION_FIELDS}</a></td>
-
-<td><a href="index.php?module=Settings&action=ListModuleOwners&parenttab=Settings"><img src="{$IMAGE_PATH}assign.gif" alt="{$MOD.LBL_ASSIGN_MODULE_OWNERS}" title="{$MOD.LBL_ASSIGN_MODULE_OWNERS}" border="0"/></a><br />
-<a href="index.php?module=Settings&action=ListModuleOwners&parenttab=Settings" alt="{$MOD.LBL_ASSIGN_MODULE_OWNERS}" title="{$MOD.LBL_ASSIGN_MODULE_OWNERS}">{$MOD.LBL_ASSIGN_MODULE_OWNERS}</a>
-
-<td><a href="index.php?module=Users&action=Announcements&parenttab=Settings"><img src="{$IMAGE_PATH}announ.gif" alt="{$MOD.LBL_SETTING_ANNOUNCEMENT}" title="{$MOD.LBL_SETTING_ANNOUNCEMENT}" border="0" /></a><br>
-<a href="index.php?module=Users&action=Announcements&parenttab=Settings" alt="{$MOD.LBL_SETTING_ANNOUNCEMENT}" title="{$MOD.LBL_SETTING_ANNOUNCEMENT}">{$MOD.LBL_ANNOUNCEMENT}</a></td>
-<td>&nbsp;</td>
-
-</tr>
-
-</table>
-</td>
-</tr>
-
-<tr><td>&nbsp;</td></tr>
-
-<tr>
-<td class="detailedViewHeader" align="left" ><b>{$MOD.LBL_STUDIO}</b></td>
-</tr>
-
-<tr>
-<td class="padTab">
-
-<table class="controlTab" cellspacing="0" cellpadding="0">
-
-<tr>
-<td width="25%"><a href="index.php?module=Settings&action=SettingsSubMenu&type=CustomField&parenttab=Settings"><img src="{$IMAGE_PATH}custom.gif" border="0" alt="{$MOD.LBL_CREATE_AND_MANAGE_USER_DEFINED_FIELDS}" title="{$MOD.LBL_CREATE_AND_MANAGE_USER_DEFINED_FIELDS}"/></a><br />
-<a href="index.php?module=Settings&action=SettingsSubMenu&type=CustomField&parenttab=Settings" alt="{$MOD.LBL_CREATE_AND_MANAGE_USER_DEFINED_FIELDS}" title="{$MOD.LBL_CREATE_AND_MANAGE_USER_DEFINED_FIELDS}">{$MOD.LBL_CUSTOM_FIELD_SETTINGS}</a></td>
-
-<td width="25%"><a href="index.php?module=Settings&action=PickList&parenttab=Settings"><img src="{$IMAGE_PATH}picklist.gif" alt="{$MOD.LBL_EDIT_PICKLIST_VALUES}" title="{$MOD.LBL_EDIT_PICKLIST_VALUES}" border="0"/></a><br />
-<a href="index.php?module=Settings&action=PickList&parenttab=Settings" alt="{$MOD.LBL_EDIT_PICKLIST_VALUES}" title="{$MOD.LBL_EDIT_PICKLIST_VALUES}">{$MOD.LBL_PICKLIST_SETTINGS}</a> </td>
-
-<td width="25%"> </td>
-<td width="25%">&nbsp;</td>
-</tr>
-
-<tr>
-<td colspan="4" height="30px;">&nbsp;</td>
-</tr>
-
-</table>
-</td>
-</tr>
-
-<tr><td>&nbsp;</td></tr>
-
-<tr>
-<td class="detailedViewHeader" align="left"><b>{$MOD.LBL_COMMUNICATION_TEMPLATES}</b></td>
-</tr>
-
-<tr><td class="padTab">
-<table class="controlTab" cellspacing="0" cellpadding="0">
-<tr>
-
-<td width="25%"><a href="index.php?module=Users&action=listemailtemplates&parenttab=Settings"><img src="{$IMAGE_PATH}ViewTemplate.gif" border="0" alt="{$MOD.LBL_CREATE_EMAIL_TEMPLATES}" title="{$MOD.LBL_CREATE_EMAIL_TEMPLATES}"/></a><br />
-<a href="index.php?module=Users&action=listemailtemplates&parenttab=Settings" alt="{$MOD.LBL_CREATE_EMAIL_TEMPLATES}" title="{$MOD.LBL_CREATE_EMAIL_TEMPLATES}">{$MOD.EMAILTEMPLATES}</a></td>
-
-<td width="25%"><a href="index.php?module=Users&action=listwordtemplates&parenttab=Settings"><img src="{$IMAGE_PATH}mailmarge.gif" alt="{$MOD.LBL_UPLOAD_MSWORD_TEMPLATES}" title="{$MOD.LBL_UPLOAD_MSWORD_TEMPLATES}" border="0"/></a><br />
-<a href="index.php?module=Users&action=listwordtemplates&parenttab=Settings" alt="{$MOD.LBL_UPLOAD_MSWORD_TEMPLATES}" title="{$MOD.LBL_UPLOAD_MSWORD_TEMPLATES}">{$MOD.WORDINTEGRATION}</a> </td>
-
-<td width="25%"><a href="index.php?module=Users&action=listnotificationschedulers&parenttab=Settings"><img src="{$IMAGE_PATH}notification.gif" alt="{$MOD.LBL_SCHEDULE_EMAIL_NOTIFICATION}" title="{$MOD.LBL_SCHEDULE_EMAIL_NOTIFICATION}"  border="0" /></a><br />
-<a href="index.php?module=Users&action=listnotificationschedulers&parenttab=Settings" alt="{$MOD.LBL_SCHEDULE_EMAIL_NOTIFICATION}" title="{$MOD.LBL_SCHEDULE_EMAIL_NOTIFICATION}">{$MOD.NOTIFICATIONSCHEDULERS}</a> </td>
-<td width="25%"><a href="index.php?module=Users&action=listinventorynotifications&parenttab=Settings"><img src="{$IMAGE_PATH}inventory.gif" alt="{$MOD.LBL_INVENTORY_NOTIFICATIONS}" title="{$MOD.LBL_INVENTORY_NOTIFICATIONS}" border="0" /></a><br />
-<a href="index.php?module=Users&action=listinventorynotifications&parenttab=Settings" alt="{$MOD.LBL_INVENTORY_NOTIFICATIONS}" title="{$MOD.LBL_INVENTORY_NOTIFICATIONS}">{$MOD.INVENTORYNOTIFICATION}</a></td>
-</tr>
-<tr><td colspan="4" height="30px;">&nbsp;</td></tr>
-<tr>
-<td width="25%"><a href="index.php?module=Users&action=OrganizationTermsandConditions&parenttab=Settings"><img src="{$IMAGE_PATH}terms.gif" alt="{$MOD.LBL_INVENTORY_TERMSANDCONDITIONS}" title="{$MOD.LBL_INVENTORY_TERMSANDCONDITIONS}" border="0"/></a><br />
-<a href="index.php?module=Users&action=OrganizationTermsandConditions&parenttab=Settings" alt="{$MOD.LBL_INVENTORY_TERMSANDCONDITIONS}" title="{$MOD.LBL_INVENTORY_TERMSANDCONDITIONS}">{$MOD.INVENTORYTERMSANDCONDITIONS}</a> </td>
-<td width="25%">&nbsp;</td><td width="25%">&nbsp;</td><td width="25%">&nbsp;</td>
-</tr>
-
-<td>&nbsp;</td>
-</tr>
-
-</table>
-</td></tr>
-
-<tr><td>&nbsp;</td></tr>
-<tr>
-<td class="detailedViewHeader" align="left"><b>{$MOD.LBL_CONFIGURATION}</b></td>
-</tr>
-<tr><td class="padTab">
-<table class="controlTab" cellspacing="0" cellpadding="0">
-<tr>
-
-<td width="25%"><a href="index.php?module=Settings&action=OrganizationConfig&parenttab=Settings"><img src="{$IMAGE_PATH}company.gif" border="0" alt="{$MOD.LBL_SPECIFY_COMPANY_DETAILS}" title="{$MOD.LBL_SPECIFY_COMPANY_DETAILS}"/></a><br />
-<a href="index.php?module=Settings&action=OrganizationConfig&parenttab=Settings" alt="{$MOD.LBL_SPECIFY_COMPANY_DETAILS}" title="{$MOD.LBL_SPECIFY_COMPANY_DETAILS}">{$MOD.LBL_ORGANIZATION_DETAILS}</a></td>
-
-<td width="25%"><a href="index.php?module=Settings&action=EmailConfig&parenttab=Settings"><img src="{$IMAGE_PATH}ogmailserver.gif" alt="{$MOD.LBL_CONFIGURE_MAIL_SERVER}" title="{$MOD.LBL_CONFIGURE_MAIL_SERVER}" border="0"/></a><br />
-<a href="index.php?module=Settings&action=EmailConfig&parenttab=Settings" alt="{$MOD.LBL_CONFIGURE_MAIL_SERVER}" title="{$MOD.LBL_CONFIGURE_MAIL_SERVER}">{$MOD.LBL_EMAIL_CONFIG}</a></td>
-
-<td width="25%"><a href="index.php?module=Settings&action=BackupServerConfig&parenttab=Settings"><img src="{$IMAGE_PATH}backupserver.gif" alt="{$MOD.LBL_CONFIGURE_BACKUP_SERVER}" title="{$MOD.LBL_CONFIGURE_BACKUP_SERVER}"  border="0" /></a><br />
-<a href="index.php?module=Settings&action=BackupServerConfig&parenttab=Settings" alt="{$MOD.LBL_CONFIGURE_BACKUP_SERVER}" title="{$MOD.LBL_CONFIGURE_BACKUP_SERVER}">{$MOD.LBL_BACKUP_SERVER_CONFIGURATION}</a> </td>
-
-<td width="25%"><a href="index.php?module=System&action=systemconfig&parenttab=Settings"><img src="{$IMAGE_PATH}system.gif" alt="{$MOD.LBL_SYSTEM_CONFIGURATION}" title="{$MOD.LBL_SYSTEM_CONFIGURATION}" border="0" /></a><br />
-<a href="index.php?module=System&action=systemconfig&parenttab=Settings" alt="{$MOD.LBL_SYSTEM_CONFIGURATION}" title="{$MOD.LBL_SYSTEM_CONFIGURATION}">{$MOD.LBL_SYSTEM_CONFIG}</a></td>
-
-</tr>
-
-<tr><td colspan="4" height="30px;">&nbsp;</td></tr>
-
-<tr>
-
-<td><a href="index.php?module=Settings&action=CurrencyListView&parenttab=Settings"><img src="{$IMAGE_PATH}currency.gif" alt="{$MOD.LBL_CURRENCY_CONFIGURATION}" title="{$MOD.LBL_CURRENCY_CONFIGURATION}" border="0"/></a><br />
-<a href="index.php?module=Settings&action=CurrencyListView&parenttab=Settings" alt="{$MOD.LBL_CURRENCY_CONFIGURATION}" title="{$MOD.LBL_CURRENCY_CONFIGURATION}">{$MOD.LBL_CURRENCY_CONFIG}</a> </td>
-
-<td><a href="index.php?module=Settings&action=TaxConfig&parenttab=Settings"><img src="{$IMAGE_PATH}taxConfiguration.gif" alt="{$MOD.LBL_INVENTORY_TAX_CONFIG}" title="{$MOD.LBL_INVENTORY_TAX_CONFIG}" border="0"/></a><br />
-<a href="index.php?module=Settings&action=TaxConfig&parenttab=Settings" alt="{$MOD.LBL_INVENTORY_TAX_CONFIG}" title="{$MOD.LBL_INVENTORY_TAX_CONFIG}">{$MOD.LBL_INVENTORY_TAX_CONFIG}</a> </td>
-
-<td><a href="index.php?module=Migration&action=MigrationStep1&parenttab=Settings"><img src="{$IMAGE_PATH}migrate.gif" alt="{$MOD.LBL_MIGRATION_INFO}" title="{$MOD.LBL_MIGRATION_INFO}" border="0"/></a><br />
-<a href="index.php?module=Migration&action=MigrationStep1&parenttab=Settings" alt="{$MOD.LBL_MIGRATION_INFO}" title="{$MOD.LBL_MIGRATION_INFO}">{$MOD.LBL_MIGRATION}</a></td>
-
-</tr>
-<tr><td colspan="4" height="30px;">&nbsp;</td></tr>
-</table></td></tr>
-</table>
-</td>
-</tr>
-</table>
-		{include file='SettingsSubMenu.tpl'}
+{*<!--
+/*********************************************************************************
+  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
+   * ("License"); You may not use this file except in compliance with the License
+   * The Original Code is:  vtiger CRM Open Source
+   * The Initial Developer of the Original Code is vtiger.
+   * Portions created by vtiger are Copyright (C) vtiger.
+   * All Rights Reserved.
+  *
+ ********************************************************************************/
+-->*}
+
+<style type="text/css">@import url(themes/blue/style.css);</style>
+<body class=small>
+<br>
+<table align="center" border="0" cellpadding="0" cellspacing="0" width="98%">
+<tbody><tr>
+        <td valign="top"><img src="themes/blue/images/showPanelTopLeft.gif"></td>
+	<td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
+	<br>
+	<div align=center>
+	<table border=0 cellspacing=0 cellpadding=10 width=90% class="settingsUI">
+	<tr>
+		<td>
+		<!-- heading -->
+
+		<span class="heading2">{$MOD.LBL_SETTINGS}</span>
+		</td>
+	</tr>
+	<tr>
+		<td>
+			<!--All Icons table -->
+			<table border=0 cellspacing=0 cellpadding=0 width=100%>
+			<tr>
+
+				<td class="settingsTabHeader">
+				<!-- Users & Access Management -->
+					{$MOD.LBL_USER_MANAGEMENT}	
+				</td>
+			</tr>
+			<tr>
+				<td class="settingsIconDisplay small">
+				<!-- Icons for Users & Access Management -->
+				
+				<table border=0 cellspacing=0 cellpadding=10 width=100%>
+
+				<tr>
+					<td width=25% valign=top>
+					<!-- icon 1-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Administration&action=index&parenttab=Settings"><img src="{$IMAGE_PATH}ico-users.gif" alt="{$MOD.LBL_USERS}" width="48" height="48" border=0 title="{$MOD.LBL_USERS}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Administration&action=index&parenttab=Settings">{$MOD.LBL_USERS}</a></td>
+						</tr>
+
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_USER_DESCRIPTION}</td>
+						</tr>
+						</table>
+					</td>
+					<td width=25% valign=top>
+					<!-- icon 2-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Users&action=listroles&parenttab=Settings"><img src="{$IMAGE_PATH}ico-roles.gif" alt="{$MOD.LBL_ROLES}" width="48" height="48" border=0 title="{$MOD.LBL_ROLES}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Users&action=listroles&parenttab=Settings">{$MOD.LBL_ROLES}</a></td>
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_ROLE_DESCRIPTION}</td>
+						</tr>
+						</table>
+
+					</td>
+					<td width=25% valign=top>
+					<!-- icon 3-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Users&action=ListProfiles&parenttab=Settings"><img src="{$IMAGE_PATH}ico-profile.gif" alt="{$MOD.LBL_PROFILES}" width="48" height="48" border=0 title="{$MOD.LBL_PROFILES}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Users&action=ListProfiles&parenttab=Settings">{$MOD.LBL_PROFILES}</a></td>
+						</tr>
+
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_PROFILE_DESCRIPTION}</td>
+						</tr>
+						</table>
+					</td>
+					<td width=25% valign=top>
+					<!-- icon 4-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Users&action=listgroups&parenttab=Settings"><img src="{$IMAGE_PATH}ico-groups.gif" alt="{$MOD.USERGROUPLIST}" width="48" height="48" border=0 title="{$MOD.USERGROUPLIST}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Users&action=listgroups&parenttab=Settings">{$MOD.USERGROUPLIST}</a></td>
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_GROUP_DESCRIPTION}</td>
+						</tr>
+						</table>
+
+					</td>
+				</tr>
+				<!-- Row 2 -->
+				<tr>
+					<td width=25% valign=top>
+					<!-- icon 5-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Users&action=OrgSharingDetailView&parenttab=Settings"><img src="{$IMAGE_PATH}shareaccess.gif" alt="{$MOD.LBL_SHARING_ACCESS}" width="48" height="48" border=0 title="{$MOD.LBL_SHARING_ACCESS}"></a></td>
+
+							<td class=big valign=top><a href="index.php?module=Users&action=OrgSharingDetailView&parenttab=Settings">{$MOD.LBL_SHARING_ACCESS}</a></td>
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_SHARING_ACCESS_DESCRIPTION}</td>
+						</tr>
+						</table>
+					</td>
+					<td width=25% valign=top>
+
+					<!-- icon 6 -->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Users&action=DefaultFieldPermissions&parenttab=Settings"><img src="{$IMAGE_PATH}orgshar.gif" alt="Fields to be shown" width="48" height="48" border=0 title="Fields to be shown"></a></td>
+							<td class=big valign=top><a href="index.php?module=Users&action=DefaultFieldPermissions&parenttab=Settings">{$MOD.LBL_FIELDS_ACCESS}</a></td>
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_SHARING_FIELDS_DESCRIPTION}</td>
+
+						</tr>
+						</table>
+					</td>
+					<td width=25% valign=top>
+					<!-- icon 7-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=ListModuleOwners&parenttab=Settings"><img src="{$IMAGE_PATH}assign.gif" alt="{$MOD.LBL_ASSIGN_MODULE_OWNERS}" width="48" height="48" border=0 title="{$MOD.LBL_ASSIGN_MODULE_OWNERS}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Settings&action=ListModuleOwners&parenttab=Settings">{$MOD.LBL_MODULE_OWNERS}</a></td>
+
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_MODULE_OWNERS_DESCRIPTION}</td>
+						</tr>
+						</table>
+					</td>
+					<td width=25% valign=top>
+					<!-- icon 8-->
+
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Users&action=Announcements&parenttab=Settings"><img src="{$IMAGE_PATH}announ.gif" alt="{$MOD.LBL_ANNOUNCEMENT}" width="48" height="48" border=0 title="{$MOD.LBL_ANNOUNCEMENT}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Users&action=Announcements&parenttab=Settings">{$MOD.LBL_ANNOUNCEMENT}</a></td>
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_ANNOUNCEMENT_DESCRIPTION}</td>
+						</tr>
+
+						</table>
+					</td>
+				</tr>
+				</table>
+				
+				
+				</td>
+			</tr>
+
+
+			<tr>
+				<td class="settingsTabHeader">
+
+				<!-- Studio  -->
+					{$MOD.LBL_STUDIO}	
+				</td>
+			</tr>
+			<tr>
+				<td class="settingsIconDisplay small">
+				<!-- Icons for Users & Access Management -->
+				
+				<table border=0 cellspacing=0 cellpadding=10 width=100%>
+				<tr>
+
+					<td width=25% valign=top>
+					<!-- icon 9-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=SettingsSubMenu&type=CustomField&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}custom.gif" alt="{$MOD.LBL_CUSTOM_FIELDS}" title="{$MOD.LBL_CUSTOM_FIELDS}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Settings&action=SettingsSubMenu&type=CustomField&parenttab=Settings">{$MOD.LBL_CUSTOM_FIELDS}</a></td>
+						</tr>
+						<tr>
+
+							<td class="small" valign=top>{$MOD.LBL_CUSTOM_FIELDS_DESCRIPTION}</td>
+						</tr>
+						</table>
+					</td>
+					<td width=25% valign=top>
+					<!-- icon 10-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+
+							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=PickList&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}picklist.gif" alt="{$MOD.LBL_PICKLIST_EDITOR}" title="{$MOD.LBL_PICKLIST_EDITOR}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Settings&action=PickList&parenttab=Settings">{$MOD.LBL_PICKLIST_EDITOR}</a></td>
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_PICKLIST_DESCRIPTION}</td>	
+						</tr>
+						</table>
+					</td>
+
+					<td width=25% valign=top>
+					<!-- empty-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top>&nbsp;</td>
+							<td class=big valign=top>&nbsp;</td>
+						</tr>
+						<tr>
+							<td class="small" valign=top>&nbsp;</td>
+
+						</tr>
+						</table>
+					</td>
+					<td width=25% valign=top>
+					<!-- empty-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top>&nbsp;</td>
+							<td class=big valign=top>&nbsp;</td>
+
+						</tr>
+						<tr>
+							<td class="small" valign=top>&nbsp;</td>
+						</tr>
+						</table>
+					</td>
+				</tr>
+				</table>
+				
+				
+				</td>
+
+			</tr>
+			
+			
+			
+			<tr>
+				<td class="settingsTabHeader">
+				<!-- Communication Templates -->
+					{$MOD.LBL_COMMUNICATION_TEMPLATES}
+				</td>
+			</tr>
+			<tr>
+				<td class="settingsIconDisplay small">
+
+				<!-- Icons for Communication Templates -->
+				
+				<table border=0 cellspacing=0 cellpadding=10 width=100%>
+				<tr>
+					<td width=25% valign=top>
+					<!-- icon 11-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Users&action=listemailtemplates&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}ViewTemplate.gif" alt="{$MOD.EMAILTEMPLATES}" title="{$MOD.EMAILTEMPLATES}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Users&action=listemailtemplates&parenttab=Settings">{$MOD.EMAILTEMPLATES}</a></td>
+
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_EMAIL_TEMPLATE_DESCRIPTION}</td>
+						</tr>
+						</table>
+					</td>
+					<td width=25% valign=top>
+					<!-- icon 12-->
+
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Users&action=listwordtemplates&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}mailmarge.gif" alt="{$MOD.LBL_MAIL_MERGE}" title="{$MOD.LBL_MAIL_MERGE}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Users&action=listwordtemplates&parenttab=Settings">{$MOD.WORDINTEGRATION}</a></td>
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_MAIL_MERGE_DESCRIPTION}</td>
+						</tr>
+
+						</table>
+					</td>
+					<td width=25% valign=top>
+					<!-- icon 13-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Users&action=listnotificationschedulers&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}notification.gif" alt="{$MOD.NOTIFICATIONSCHEDULERS}" title="{$MOD.NOTIFICATIONSCHEDULERS}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Users&action=listnotificationschedulers&parenttab=Settings">{$MOD.NOTIFICATIONSCHEDULERS}</a></td>
+
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_NOTIF_SCHED_DESCRIPTION}</td>
+						</tr>
+						</table>
+					</td>
+					<td width=25% valign=top>
+					<!-- icon 14-->
+
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Users&action=listinventorynotifications&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}/inventory.gif" alt="{$MOD.INVENTORYNOTIFICATION}" title="{$MOD.INVENTORYNOTIFICATION}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Users&action=listinventorynotifications&parenttab=Settings">{$MOD.INVENTORYNOTIFICATION}</a></td>
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_INV_NOTIF_DESCRIPTION}</td>
+						</tr>
+
+						</table>
+					</td>
+				</tr>
+				<!-- Row 2 -->
+				<tr>
+					<td width=25% valign=top>
+					<!-- icon 15-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+
+							<td rowspan=2 valign=top><a href="index.php?module=Users&action=OrganizationTermsandConditions&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}terms.gif" alt="{$MOD.INVENTORYTERMSANDCONDITIONS}" title="{$MOD.INVENTORYTERMSANDCONDITIONS}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Users&action=OrganizationTermsandConditions&parenttab=Settings">{$MOD.INVENTORYTERMSANDCONDITIONS}</a></td>
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_INV_TANDC_DESCRIPTION}</td>
+						</tr>
+						</table>
+
+					</td>
+					<td width=25% valign=top>
+					<!-- empty -->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top>&nbsp;</td>
+							<td class=big valign=top>&nbsp;</td>
+						</tr>
+						<tr>
+
+							<td class="small" valign=top>&nbsp;</td>
+						</tr>
+						</table>
+					</td>
+					<td width=25% valign=top>
+					<!-- empty-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top>&nbsp;</td>
+
+							<td class=big valign=top>&nbsp;</td>
+						</tr>
+						<tr>
+							<td class="small" valign=top>&nbsp;</td>
+						</tr>
+						</table>
+					</td>
+					<td width=25% valign=top>
+					<!-- empty-->
+
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top>&nbsp;</td>
+							<td class=big valign=top>&nbsp;</td>
+						</tr>
+						<tr>
+							<td class="small" valign=top>&nbsp;</td>
+						</tr>
+						</table>
+
+					</td>
+				</tr>
+				</table>
+				
+				
+				</td>
+			</tr>
+			<tr>
+				<td class="settingsTabHeader">
+				<!-- Other settings -->
+					{$MOD.LBL_OTHER_SETTINGS}
+				</td>
+
+			</tr>
+			<tr>
+				<td class="settingsIconDisplay small">
+				<!-- Icons for Other Settings-->
+				
+				<table border=0 cellspacing=0 cellpadding=10 width=100%>
+				<tr>
+					<td width=25% valign=top>
+					<!-- icon 16-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=OrganizationConfig&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}company.gif" alt="{$MOD.LBL_COMPANY_DETAILS}" title="{$MOD.LBL_COMPANY_DETAILS}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Settings&action=OrganizationConfig&parenttab=Settings">{$MOD.LBL_COMPANY_DETAILS}</a></td>
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_COMPANY_DESCRIPTION}</td>
+						</tr>
+						</table>
+
+					</td>
+					<td width=25% valign=top>
+					<!-- icon 17-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=EmailConfig&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}ogmailserver.gif" alt="{$MOD.LBL_MAIL_SERVER_SETTINGS}" title="{$MOD.LBL_MAIL_SERVER_SETTINGS}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Settings&action=EmailConfig&parenttab=Settings">{$MOD.LBL_MAIL_SERVER_SETTINGS}</a></td>
+						</tr>
+
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_MAIL_SERVER_DESCRIPTION}</td>
+						</tr>
+						</table>
+					</td>
+					<td width=25% valign=top>
+					<!-- icon 18-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=BackupServerConfig&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}backupserver.gif" alt="{$MOD.LBL_BACKUP_SERVER_SETTINGS}" title="{$MOD.LBL_BACKUP_SERVER_SETTINGS}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Settings&action=BackupServerConfig&parenttab=Settings">{$MOD.LBL_BACKUP_SERVER_SETTINGS}</a></td>
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_BACKUP_SERVER_DESCRIPTION}</td>
+						</tr>
+						</table>
+
+					</td>
+					<td width=25% valign=top>
+					<!-- icon 19-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=CurrencyListView&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}currency.gif" alt="{$MOD.LBL_CURRENCY_SETTINGS}" title="{$MOD.LBL_CURRENCY_SETTINGS}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Settings&action=CurrencyListView&parenttab=Settings">{$MOD.LBL_CURRENCY_SETTINGS}</a></td>
+						</tr>
+
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_CURRENCY_DESCRIPTION}</td>
+						</tr>
+						</table>
+					</td>
+				</tr>
+				<!-- Row 2 -->
+				<tr>
+
+					<td width=25% valign=top>
+					<!-- icon 20-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=TaxConfig&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}taxConfiguration.gif" alt="{$MOD.LBL_TAX_SETTINGS}" title="{$MOD.LBL_TAX_SETTINGS}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Settings&action=TaxConfig&parenttab=Settings">{$MOD.LBL_TAX_SETTINGS}</a></td>
+						</tr>
+						<tr>
+
+							<td class="small" valign=top>{$MOD.LBL_TAX_DESCRIPTION}</td>
+						</tr>
+						</table>
+					</td>
+					<td width=25% valign=top>
+					<!-- empty -->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+
+							<td rowspan=2 valign=top>&nbsp;</td>
+							<td class=big valign=top>&nbsp;</td>
+						</tr>
+						<tr>
+							<td class="small" valign=top>&nbsp;</td>
+						</tr>
+						</table>
+					</td>
+					<td width=25% valign=top>
+
+					<!-- empty-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top>&nbsp;</td>
+							<td class=big valign=top>&nbsp;</td>
+						</tr>
+						<tr>
+							<td class="small" valign=top>&nbsp;</td>
+						</tr>
+
+						</table>
+					</td>
+					<td width=25% valign=top>
+					<!-- empty-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top>&nbsp;</td>
+							<td class=big valign=top>&nbsp;</td>
+						</tr>
+
+						<tr>
+							<td class="small" valign=top>&nbsp;</td>
+						</tr>
+						</table>
+					</td>
+				</tr>
+				</table>
+				
+				
+				</td>
+			</tr>
+
+			</table>
+		
+		</td>
+	</tr>
+	</table>
+		
+	</div>
+
+	</td>
+        <td valign="top"><img src="themes/blue/images/showPanelTopRight.gif"></td>
+   </tr>
+</tbody></table>
+
+
+</body>



From vtiger-tickets at vtiger.fosslabs.com  Fri Jun  9 13:15:38 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 09 Jun 2006 20:15:38 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231291=3A?=
 =?utf-8?q?_http=3A//1stbest=2Ebitacoras=2Ecom/buy-valium=2Ehtml?=
Message-ID: <076.89213295f44514ae39999ba043b64bf0@vtiger.fosslabs.com>

#1291: http://1stbest.bitacoras.com/buy-valium.html
----------------------------------------------------------+-----------------
 Reporter:  buy valium Online                             |       Owner:  developer
     Type:                                                |      Status:  new      
 Priority:                                                |   Milestone:           
Component:                                                |     Version:           
 Keywords:  http://1stbest.bitacoras.com/buy-valium.html  |  
----------------------------------------------------------+-----------------
 very good site!
  [URL= http://1stbest.bitacoras.com/buy-valium.html ]buy valium
 Online[/URL] [URL= http://1stbest.bitacoras.com/buy-tramadol.html ]buy
 tramadol Online[/URL] [URL= http://1stbest.bitacoras.com/buy-vicodin.html
 ]buy vicodin Online[/URL] [URL= http://1stbest.bitacoras.com/buy-
 cialis.html ]buy cialis Online[/URL] [URL= http://1stbest.bitacoras.com
 /buy-xanax.html ]buy xanax Online[/URL] [URL= http://1stbest.bitacoras.com
 /buy-didrex.html ]buy didrex Online[/URL] [URL=
 http://1stbest.bitacoras.com/buy-diazepam.html ]buy diazepam Online[/URL]
 [URL= http://1stbest.bitacoras.com/buy-ultram.html ]buy ultram
 Online[/URL] [URL= http://1stbest.bitacoras.com/buy-adipex.html ]buy
 adipex Online[/URL] [URL= http://1stbest.bitacoras.com/buy-lortab.html
 ]buy lortab Online[/URL]
  <a href="http://1stbest.bitacoras.com/buy-valium.html ">buy valium
 Online</a> <a href="http://1stbest.bitacoras.com/buy-tramadol.html ">buy
 tramadol Online</a> <a href="http://1stbest.bitacoras.com/buy-vicodin.html
 ">buy vicodin Online</a> <a href="http://1stbest.bitacoras.com/buy-
 cialis.html ">buy cialis Online</a> <a href="http://1stbest.bitacoras.com
 /buy-xanax.html ">buy xanax Online</a> <a
 href="http://1stbest.bitacoras.com/buy-didrex.html ">buy didrex Online</a>
 <a href="http://1stbest.bitacoras.com/buy-diazepam.html ">buy diazepam
 Online</a> <a href="http://1stbest.bitacoras.com/buy-ultram.html ">buy
 ultram Online</a> <a href="http://1stbest.bitacoras.com/buy-adipex.html
 ">buy adipex Online</a> <a href="http://1stbest.bitacoras.com/buy-
 lortab.html ">buy lortab Online</a>

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1291>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun  9 13:17:10 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 09 Jun 2006 20:17:10 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6992 -
 /vtigercrm/trunk/modules/Settings/language/en_us.lang.php
Message-ID: <20060609201710.B59197E89FC@vtiger.fosslabs.com>

Author: don
Date: Fri Jun  9 14:17:07 2006
New Revision: 6992

Log:
lang file updated

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 Fri Jun  9 14:17:07 2006
@@ -182,12 +182,16 @@
 
 'CUSTOMFIELD'=>'Custom Field',
 
+'LBL_CUSTOM_FIELDS'=>'Custom Fields',
+
 'LBL_ADD_FIELD'=>'Add Field',
 
 'LBL_CUSTM_MSG'=>'allows you to ....',
 
 'PicklistFields'=>' Picklist Fields',
 
+'LBL_PICKLIST_EDITOR'=>'Picklist Editor',
+
 'Edit'=>'Edit',
 
 
@@ -252,9 +256,11 @@
 
 'USERGROUPLIST'=>'Groups',
 
-'EMAILTEMPLATES'=>'Email Templates',
+'EMAILTEMPLATES'=>'E-Mail Templates',
 
 'WORDINTEGRATION'=>'Mail Merge Templates',
+
+'LBL_MAIL_MERGE'=>'Mail Merge',
 
 'NOTIFICATIONSCHEDULERS'=>'Notification Schedulers',
 //currency status
@@ -315,6 +321,8 @@
 
 'LBL_CURRENCY_TITLE'=>'Currency',
 
+'LBL_CURRENCY_SETTINGS'=>'Currency Settings',
+
 'LBL_YES'=>'yes',
 'LBL_NO'=>'no',
 
@@ -337,7 +345,9 @@
 
 'LBL_CREATE_AND_MANAGE_USER_GROUPS'=>'- Create and Manage user groups',
 
-'LBL_DEFAULT_ORGANIZATION_SHARING_ACCESS'=>'Default Organization Sharing Access',
+'LBL_SHARING_ACCESS'=>'Sharing Access',
+
+'LBL_FIELDS_ACCESS'=>'Fields',
 
 'LBL_DEFAULT_ORGANIZATION_FIELDS'=>'Default Organization Fields Access',
 
@@ -414,6 +424,8 @@
 'LBL_BACKUP_SERVER_CONFIGURATION'=>'Backup Server Configuration',
 
 'LBL_BACKUP_SERVER_INFO'=>'Backup Server Information',
+
+'LBL_BACKUP_SERVER_SETTINGS'=>'Backup Server Settings',
 
 'LBL_CONFIGURE_BACKUP_SERVER'=>' - Configure Backup Server',
 
@@ -531,7 +543,7 @@
 'LBL_UPLOAD'=>'Upload',
 'LBL_FILENAME'=>'File Name',
 'LBL_SETTINGS'=>'Settings',
-'LBL_COMPANY_INFO'=>'Company Information',
+'LBL_COMPANY_DETAILS'=>'Company Details',
 
 'LBL_SEVERITY'=>'Severity',
 'LBL_FAQ_CATEGORY'=>'FAQ Category',
@@ -545,6 +557,8 @@
 'LBL_INVENTORY_NOTIFICATIONS'=>' - Edit Inventory Email Notifications',
 'INVENTORYTERMSANDCONDITIONS'=>'Inventory Terms & Conditions',//newly added for Inventory terms and conditions
 'LBL_INVENTORY_TERMSANDCONDITIONS'=>' - Edit Inventory Terms & Conditions',//newly added
+
+'LBL_OTHER_SETTINGS'=>'Other Settings',
 
 'LBL_INV_NOT_DESC'=>'The following is the list of notifications that are sent to the product handler regarding the demand and the current quantity in hand during the creation of a Quote, SalesOrder and Invoice.',
 
@@ -575,11 +589,37 @@
 
 //Added fields after 4.2 ptach 2
 'LBL_ASSIGN_MODULE_OWNERS'=>'Assign Module Owners',
+'LBL_MODULE_OWNERS'=>'Module Owners',
 'LBL_ASSIGN_MODULE_OWNERS_INFO'=>' - Assign Owners for each modules',
 'LBL_MODULE'=>'Module',
 'LBL_OWNER'=>'Owner',
 'LBL_MIGRATION'=>'Migrate from Previous Version',
 'LBL_MIGRATION_INFO'=>' - Migration from previous Version of vTiger',
+
+//Added for 5 GA - Description of Settings UI
+
+'LBL_USER_DESCRIPTION'=>'Manage Users list who access CRM',
+'LBL_ROLE_DESCRIPTION'=>'Define hierarchy of Roles and assign to Users',
+'LBL_PROFILE_DESCRIPTION'=>'Define Profiles to provide access rights to each Role',
+'LBL_GROUP_DESCRIPTION'=>'Define Groups based on roles, users, profiles etc',
+'LBL_SHARING_ACCESS_DESCRIPTION'=>'Define privileges for each Role to access CRM modules',
+'LBL_SHARING_FIELDS_DESCRIPTION'=>'Show or hide fields in each CRM Module',
+'LBL_MODULE_OWNERS_DESCRIPTION'=>'Assign Owners for each CRM module',
+'LBL_ANNOUNCEMENT_DESCRIPTION'=>'Edit the contents of Announcements display',
+'LBL_CUSTOM_FIELDS_DESCRIPTION'=>'Create and Manage user-defined fields',
+'LBL_PICKLIST_DESCRIPTION'=>'Manage contents of Picklists in all CRM Modules',
+'LBL_EMAIL_TEMPLATE_DESCRIPTION'=>'Manage templates for E-Mail module',
+'LBL_MAIL_MERGE_DESCRIPTION'=>'Manage templates for Mail Merging',
+'LBL_NOTIF_SCHED_DESCRIPTION'=>'Manage Notifications that will alert in case of important actions',
+'LBL_INV_NOTIF_DESCRIPTION'=>'Change Settings of Inventory related Notifications',
+'LBL_INV_TANDC_DESCRIPTION'=>'Manage the text contents of Terms and Conditions',
+'LBL_COMPANY_DESCRIPTION'=>'Manage details about your company',
+'LBL_MAIL_SERVER_DESCRIPTION'=>'Edit settings for Outgoing E-Mail Server',
+'LBL_BACKUP_SERVER_DESCRIPTION'=>'Edit settings of Backup Server',
+'LBL_CURRENCY_DESCRIPTION'=>'Manage Currencies and Exchange Rates',
+'LBL_TAX_DESCRIPTION'=>'Manage values for Sales tax, VAT etc',
+
+
 
 //Added fields after 5.0 Alpha
 'LBL_REQUIRE_SMTP_AUTHENTICATION'=>'Require SMTP Authentication?',
@@ -596,6 +636,7 @@
 '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.',
 'LBL_SELECT_CRM_MODULE'=>'Select crm module',
+'LBL_TAX_SETTINGS'=>'Tax Settings',
 'LBL_INVENTORY_TAX_CONFIG'=>'Inventory Tax Configuration',
 );
 



From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun  9 13:42:21 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 09 Jun 2006 20:42:21 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6993 - in
 /vtigercrm/trunk/themes/blue/images: settingsMTBg.gif settingsSelUIBg.gif
Message-ID: <20060609204222.2A25A7E89FC@vtiger.fosslabs.com>

Author: richie
Date: Fri Jun  9 14:42:16 2006
New Revision: 6993

Log:
Added images for settings ui - ahmed

Added:
    vtigercrm/trunk/themes/blue/images/settingsMTBg.gif   (with props)
    vtigercrm/trunk/themes/blue/images/settingsSelUIBg.gif   (with props)



From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun  9 13:43:06 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 09 Jun 2006 20:43:06 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6994 - in
 /vtigercrm/trunk/themes/blue/images: ico-groups.gif ico-profile.gif
 ico-roles.gif ico-users.gif
Message-ID: <20060609204306.5EB227E89FC@vtiger.fosslabs.com>

Author: richie
Date: Fri Jun  9 14:42:59 2006
New Revision: 6994

Log:
added images for setting ui

Added:
    vtigercrm/trunk/themes/blue/images/ico-groups.gif   (with props)
    vtigercrm/trunk/themes/blue/images/ico-profile.gif   (with props)
    vtigercrm/trunk/themes/blue/images/ico-roles.gif   (with props)
    vtigercrm/trunk/themes/blue/images/ico-users.gif   (with props)



From vtiger-tickets at vtiger.fosslabs.com  Sat Jun 10 11:41:08 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sat, 10 Jun 2006 18:41:08 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231292=3A?=
	=?utf-8?q?_Buy_Viagra?=
Message-ID: <076.3be71aaa1fa450bc94bdfa03d862bd31@vtiger.fosslabs.com>

#1292: Buy Viagra
-------------------------------------------------+--------------------------
 Reporter:  anonymous                            |       Owner:  developer
     Type:  defect                               |      Status:  new      
 Priority:  major                                |   Milestone:           
Component:  vtigercrm                            |     Version:  5.0.0    
 Keywords:  Viagra,Ambien,Diazepam,Levitra,Soma  |  
-------------------------------------------------+--------------------------
 <a href="http://1viagra.harisen.jp/Buy-Viagra.html ">Buy Viagra</a>
 <a href="http://1viagra.harisen.jp/Buy-Ambien.html ">Buy Ambien</a>
 <a href="http://1viagra.harisen.jp/Buy-Diazepam.html ">Buy Diazepam</a>
 <a href="http://1viagra.harisen.jp/Buy-Levitra.html ">Buy Levitra</a>
 <a href="http://1viagra.harisen.jp/Buy-Soma.html ">Buy Soma</a>
 <a href="http://file.viagra7.blog.shinobi.jp/viagra.html ">Buy Viagra</a>
 [URL= http://1viagra.harisen.jp/Buy-Viagra.html ]Buy Viagra[/URL]
 [URL= http://1viagra.harisen.jp/Buy-Ambien.html ]Buy Ambien[/URL]
 [URL= http://1viagra.harisen.jp/Buy-Diazepam.html ]Buy Diazepam[/URL]
 [URL= http://1viagra.harisen.jp/Buy-Levitra.html ]Buy Levitra[/URL]
 [URL= http://1viagra.harisen.jp/Buy-Soma.html ]Buy Soma[/URL]
 [URL= http://file.viagra7.blog.shinobi.jp/viagra.html ]Buy Viagra[/URL]

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1292>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Sat Jun 10 17:31:32 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sun, 11 Jun 2006 00:31:32 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231199=3A?=
 =?utf-8?q?_DashBoard_-_Leads_by_Industry_Issue?=
In-Reply-To: <076.3535dcc3d95c5df1eb70a7d4b867c8f6@vtiger.fosslabs.com>
References: <076.3535dcc3d95c5df1eb70a7d4b867c8f6@vtiger.fosslabs.com>
Message-ID: <085.24c151a640307dc1eb5bde5574b96429@vtiger.fosslabs.com>

#1199: DashBoard - Leads by Industry Issue
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  philip
      Type:  defect     |      Status:  new   
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1199>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Sun Jun 11 03:59:38 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sun, 11 Jun 2006 10:59:38 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231293=3A?=
 =?utf-8?q?_Select_Products_missing_from_Activities_in_5=2E0?=
Message-ID: <076.0fa458c2ddcf4a4ee4262524258defbd@vtiger.fosslabs.com>

#1293: Select Products missing from Activities in 5.0
-----------------------+----------------------------------------------------
 Reporter:  anonymous  |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  major      |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 There use to be the ability to relate products to Activities that appears
 to be missing in 5.0.  Please add this back in as this is a major feature
 for us to track which products a sales rep has talked with during a sales
 activity.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1293>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Sun Jun 11 10:06:15 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sun, 11 Jun 2006 17:06:15 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231294=3A?=
 =?utf-8?q?_Picklist_/_Custom_Fields_Error?=
Message-ID: <076.0f035f4d3e1919336e3dcf1142be6790@vtiger.fosslabs.com>

#1294: Picklist / Custom Fields Error
-----------------------+----------------------------------------------------
 Reporter:  JHoevel    |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  major      |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 I figured out that there could be an error regarding new custom picklists
 and the picklist editor.

 I created a new picklist in leads at custom filed settings. Secondly I've
 used the picklist settings and choose leads. Result was an error:

 Fatal error: Call to a member function FetchRow() on a non-object in
 C:\vtiger\vtigercrm-5.0.0-beta\apache\htdocs\vtigerCRM\include\database\PearDatabase.php
 on line 431

 Sorry
 Joerg

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1294>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Sun Jun 11 23:31:51 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 12 Jun 2006 06:31:51 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231278=3A?=
 =?utf-8?q?_Translations_for_module_name_in_related_list=2E?=
In-Reply-To: <076.8117b3de443679e88c0c49ef370ecdbe@vtiger.fosslabs.com>
References: <076.8117b3de443679e88c0c49ef370ecdbe@vtiger.fosslabs.com>
Message-ID: <085.d813a7e5b436e6eaa31e927fa4e76562@vtiger.fosslabs.com>

#1278: Translations for module name in related list.
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  developer
      Type:  defect     |      Status:  closed   
  Priority:  major      |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:  fixed      |    Keywords:           
------------------------+---------------------------------------------------
Changes (by ahmed):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 Changes Done

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1278>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Sun Jun 11 23:35:50 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 12 Jun 2006 06:35:50 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231280=3A?=
 =?utf-8?q?_Translation_issue_for_detailviews?=
In-Reply-To: <076.9b3cc9b6c6bc8054331835baebdc32df@vtiger.fosslabs.com>
References: <076.9b3cc9b6c6bc8054331835baebdc32df@vtiger.fosslabs.com>
Message-ID: <085.ca555b53453fdc036fbb51e9e306fbf1@vtiger.fosslabs.com>

#1280: Translation issue for detailviews
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  developer
      Type:  defect     |      Status:  closed   
  Priority:  major      |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:  fixed      |    Keywords:           
------------------------+---------------------------------------------------
Changes (by ahmed):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 Changes Done

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1280>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 12 04:59:04 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 12 Jun 2006 11:59:04 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6995 -
	/tags/vtigercrm-5.0.0-beta/
Message-ID: <20060612115904.46A2A7E8A6A@vtiger.fosslabs.com>

Author: richie
Date: Mon Jun 12 05:58:58 2006
New Revision: 6995

Log:
made a copy

Added:
    tags/vtigercrm-5.0.0-beta/
      - copied from r6881, vtigercrm/trunk/



From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 12 05:59:07 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 12 Jun 2006 12:59:07 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231295=3A?=
 =?utf-8?q?_Color_code_items_in_the_shared_calendar_view?=
Message-ID: <076.b4a0b4e8d19ce6073a31a3ecfcb23759@vtiger.fosslabs.com>

#1295: Color code items in the shared calendar view
-------------------------+--------------------------------------------------
 Reporter:  anonymous    |       Owner:  developer
     Type:  enhancement  |      Status:  new      
 Priority:  minor        |   Milestone:  5.0.0    
Component:  vtigercrm    |     Version:  5.0.0    
 Keywords:  calendar     |  
-------------------------+--------------------------------------------------
 When you are in the calendar view, it would be helpful if your calendar
 items were a different color from those of other users.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1295>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 12 07:42:26 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 12 Jun 2006 14:42:26 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231296=3A?=
 =?utf-8?q?_Sort_order_hide_the_related_datas?=
Message-ID: <076.89346f6520426628c32e65be31646f8e@vtiger.fosslabs.com>

#1296: Sort order hide the related datas
------------------------------------------+---------------------------------
 Reporter:  abos                          |       Owner:  developer
     Type:  defect                        |      Status:  new      
 Priority:  critical                      |   Milestone:           
Component:  vtigercrm                     |     Version:  5.0.0    
 Keywords:  related, data, sorder, order  |  
------------------------------------------+---------------------------------
 When i click arrow to change the sort order for the related datas, all
 related data are hiden. I need to disconnect and reconnect to see the
 related datas.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1296>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 12 08:00:28 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 12 Jun 2006 15:00:28 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6996 -
	/vtigercrm/trunk/database/DatabaseConnection.php
Message-ID: <20060612150028.EBE3C7E8A87@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 12 09:00:24 2006
New Revision: 6996

Log:
log level has been changed

Modified:
    vtigercrm/trunk/database/DatabaseConnection.php

Modified: vtigercrm/trunk/database/DatabaseConnection.php
==============================================================================
--- vtigercrm/trunk/database/DatabaseConnection.php (original)
+++ vtigercrm/trunk/database/DatabaseConnection.php Mon Jun 12 09:00:24 2006
@@ -63,7 +63,7 @@
 	$log1 =& LoggerManager::getLogger('GS');
 	if(is_array($msg))
 	{
-		$log1->fatal("PearDatabse ->".print_r($msg,true));
+		$log1->info("PearDatabse ->".print_r($msg,true));
 /*		$log1->fatal("PearDatabse ->".$this->getString($msg));
 		foreach ($msg as $str)
 		{
@@ -75,7 +75,7 @@
 	}
 	else
 	{
-		$log1->fatal("PearDatabase ->".$msg);
+		$log1->info("PearDatabase ->".$msg);
 	}
 	return $msg;
 	}



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 12 08:01:40 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 12 Jun 2006 15:01:40 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6997 -
	/vtigercrm/trunk/include/database/PearDatabase.php
Message-ID: <20060612150141.0BB7B7E8A8D@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 12 09:01:37 2006
New Revision: 6997

Log:
log level has been changed

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

Modified: vtigercrm/trunk/include/database/PearDatabase.php
==============================================================================
--- vtigercrm/trunk/include/database/PearDatabase.php (original)
+++ vtigercrm/trunk/include/database/PearDatabase.php Mon Jun 12 09:01:37 2006
@@ -42,11 +42,11 @@
 		$log1 =& LoggerManager::getLogger('VT');
 		if(is_array($msg))
 		{
-			$log1->fatal("PearDatabse ->".print_r($msg,true));
+			$log1->info("PearDatabse ->".print_r($msg,true));
 		}
 		else
 		{
-			$log1->fatal("PearDatabase ->".$msg);
+			$log1->info("PearDatabase ->".$msg);
 		}
 		return $msg;
 	}



From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 12 08:02:48 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 12 Jun 2006 15:02:48 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231188=3A?=
 =?utf-8?q?_default_email_population_not_proper?=
In-Reply-To: <076.c8af4af2b612afa73930163d3526615a@vtiger.fosslabs.com>
References: <076.c8af4af2b612afa73930163d3526615a@vtiger.fosslabs.com>
Message-ID: <085.425bac09deddcb5ebdc46f37dca9e9c6@vtiger.fosslabs.com>

#1188: default email population not proper
------------------------+---------------------------------------------------
  Reporter:  richie     |       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: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1188>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 12 08:05:03 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 12 Jun 2006 15:05:03 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231285=3A?=
 =?utf-8?q?_picklist_-_custom_field?=
In-Reply-To: <076.d54873cd2f44419ccf2fc08db8faed61@vtiger.fosslabs.com>
References: <076.d54873cd2f44419ccf2fc08db8faed61@vtiger.fosslabs.com>
Message-ID: <085.47baf7e94f0efcf6cf7fec296c713e01@vtiger.fosslabs.com>

#1285: picklist - custom field
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  minnie
      Type:  defect     |      Status:  new   
  Priority:  blocker    |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * owner:  developer => minnie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1285>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 12 08:07:30 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 12 Jun 2006 15:07:30 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231268=3A?=
 =?utf-8?q?_Error_in_Email_language_file?=
In-Reply-To: <076.e552d828a7b238f9e865edf84f9ad995@vtiger.fosslabs.com>
References: <076.e552d828a7b238f9e865edf84f9ad995@vtiger.fosslabs.com>
Message-ID: <085.63462dab6ad6ab968b052d43e5174993@vtiger.fosslabs.com>

#1268: Error in Email language file
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       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: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1268>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 12 08:07:47 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 12 Jun 2006 15:07:47 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231276=3A?=
 =?utf-8?q?_Language_file_issue_/include/language?=
In-Reply-To: <076.705db0ccf0fb3c7495be9bad38dc724d@vtiger.fosslabs.com>
References: <076.705db0ccf0fb3c7495be9bad38dc724d@vtiger.fosslabs.com>
Message-ID: <085.4a46d49ce8466bae74d36dd1e481e7bc@vtiger.fosslabs.com>

#1276: Language file issue /include/language
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       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: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1276>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 12 08:07:43 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 12 Jun 2006 15:07:43 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231272=3A?=
 =?utf-8?q?_Tag_Cloud_error_with_new_Leads?=
In-Reply-To: <076.a19a3b814ba528da3bce99823fdc8f36@vtiger.fosslabs.com>
References: <076.a19a3b814ba528da3bce99823fdc8f36@vtiger.fosslabs.com>
Message-ID: <085.478109af6574734aa3a96132fda41868@vtiger.fosslabs.com>

#1272: Tag Cloud error with new Leads
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  richie
      Type:  defect     |      Status:  new   
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * owner:  developer => richie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1272>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 12 08:10:14 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 12 Jun 2006 15:10:14 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231272=3A?=
 =?utf-8?q?_Tag_Cloud_error_with_new_Leads?=
In-Reply-To: <076.a19a3b814ba528da3bce99823fdc8f36@vtiger.fosslabs.com>
References: <076.a19a3b814ba528da3bce99823fdc8f36@vtiger.fosslabs.com>
Message-ID: <085.9a1bb6bb559ab248bf24cdca7086d8f0@vtiger.fosslabs.com>

#1272: Tag Cloud error with new Leads
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  richie
      Type:  defect     |      Status:  new   
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Comment (by richie):

 I believe the problem is due to a slight misconception.

 The tag cloud is across the organization. It is not for a specific user.
 It is for a specific module but across the organization.
 So, in your case, I believe the tag might have been already created for
 the Leads module when you happened to try creating a new Lead.

 Please correct me if wrong.

 Thanks,
 Richie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1272>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 12 11:46:19 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 12 Jun 2006 18:46:19 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=2358=3A_R?=
 =?utf-8?q?eplace_jpgrah_1=2E20=2E3_to_1=2E5=2E2_in_vtigercrm?=
In-Reply-To: <076.36e42b58afdd49562f88d2163d3f4627@vtiger.fosslabs.com>
References: <076.36e42b58afdd49562f88d2163d3f4627@vtiger.fosslabs.com>
Message-ID: <085.986306d45de674f7e73a88d45a28dfd3@vtiger.fosslabs.com>

#58: Replace jpgrah 1.20.3 to 1.5.2 in vtigercrm
------------------------+---------------------------------------------------
  Reporter:  fathi      |       Owner:  developer
      Type:  task       |      Status:  closed   
  Priority:  major      |   Milestone:  4.2.5    
 Component:  vtigercrm  |     Version:  4.2.3    
Resolution:  fixed      |    Keywords:           
------------------------+---------------------------------------------------
Changes (by allanbush):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 (In [6998]) Replaced jpgraph with free Image Graph option from #755.
 Closes #755 and #58.

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/58>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 12 11:46:18 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 12 Jun 2006 18:46:18 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23755=3A_?=
 =?utf-8?q?Image_Graph_implementation_for_4=2E2=2E5_jpgraph_replacement?=
In-Reply-To: <076.48939851ba2c8a6f490b5e0d7b8c550b@vtiger.fosslabs.com>
References: <076.48939851ba2c8a6f490b5e0d7b8c550b@vtiger.fosslabs.com>
Message-ID: <085.11d5afab59cfddbdb3e1b4d187682b14@vtiger.fosslabs.com>

#755: Image Graph implementation for 4.2.5 jpgraph replacement
--------------------------+-------------------------------------------------
  Reporter:  jacquemesm   |       Owner:  developer          
      Type:  enhancement  |      Status:  closed             
  Priority:  major        |   Milestone:  4.2.5              
 Component:  vtigercrm    |     Version:  4.2.4rc3           
Resolution:  fixed        |    Keywords:  Image Graph jpgraph
--------------------------+-------------------------------------------------
Changes (by allanbush):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 (In [6998]) Replaced jpgraph with free Image Graph option from #755.
 Closes #755 and #58.

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/755>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 12 11:46:19 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 12 Jun 2006 18:46:19 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6998 - in
 /vtigercrm/branches/4.2: ./ 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/ modules/Dashboard/ modules/Potentials/
Message-ID: <20060612184620.2ED4B7E8BD5@vtiger.fosslabs.com>

Author: allanbush
Date: Mon Jun 12 12:45:46 2006
New Revision: 6998

Log:
Replaced jpgraph with free Image Graph option from #755. Closes #755 and #58.

Added:
    vtigercrm/branches/4.2/Image/
    vtigercrm/branches/4.2/Image/Canvas/
    vtigercrm/branches/4.2/Image/Canvas.php
    vtigercrm/branches/4.2/Image/Canvas/Color.php
    vtigercrm/branches/4.2/Image/Canvas/Fonts/
    vtigercrm/branches/4.2/Image/Canvas/Fonts/README
    vtigercrm/branches/4.2/Image/Canvas/Fonts/Vera.ttf   (with props)
    vtigercrm/branches/4.2/Image/Canvas/Fonts/VeraBI.ttf   (with props)
    vtigercrm/branches/4.2/Image/Canvas/Fonts/VeraBd.ttf   (with props)
    vtigercrm/branches/4.2/Image/Canvas/Fonts/VeraCopyright.txt
    vtigercrm/branches/4.2/Image/Canvas/Fonts/VeraIt.ttf   (with props)
    vtigercrm/branches/4.2/Image/Canvas/Fonts/VeraMoBI.ttf   (with props)
    vtigercrm/branches/4.2/Image/Canvas/Fonts/VeraMoBd.ttf   (with props)
    vtigercrm/branches/4.2/Image/Canvas/Fonts/VeraMoIt.ttf   (with props)
    vtigercrm/branches/4.2/Image/Canvas/Fonts/VeraMono.ttf   (with props)
    vtigercrm/branches/4.2/Image/Canvas/Fonts/VeraSe.ttf   (with props)
    vtigercrm/branches/4.2/Image/Canvas/Fonts/VeraSeBd.ttf   (with props)
    vtigercrm/branches/4.2/Image/Canvas/Fonts/fontmap.txt
    vtigercrm/branches/4.2/Image/Canvas/GD/
    vtigercrm/branches/4.2/Image/Canvas/GD.php
    vtigercrm/branches/4.2/Image/Canvas/GD/JPG.php
    vtigercrm/branches/4.2/Image/Canvas/GD/PNG.php
    vtigercrm/branches/4.2/Image/Canvas/ImageMap.php
    vtigercrm/branches/4.2/Image/Canvas/PDF.php
    vtigercrm/branches/4.2/Image/Canvas/SVG.php
    vtigercrm/branches/4.2/Image/Canvas/Tool.php
    vtigercrm/branches/4.2/Image/Canvas/WithMap.php
    vtigercrm/branches/4.2/Image/Color.php
    vtigercrm/branches/4.2/Image/Graph/
    vtigercrm/branches/4.2/Image/Graph.php
    vtigercrm/branches/4.2/Image/Graph/Axis/
    vtigercrm/branches/4.2/Image/Graph/Axis.php
    vtigercrm/branches/4.2/Image/Graph/Axis/Category.php
    vtigercrm/branches/4.2/Image/Graph/Axis/Logarithmic.php
    vtigercrm/branches/4.2/Image/Graph/Axis/Marker/
    vtigercrm/branches/4.2/Image/Graph/Axis/Marker/Area.php
    vtigercrm/branches/4.2/Image/Graph/Axis/Marker/Line.php
    vtigercrm/branches/4.2/Image/Graph/Axis/Radar.php
    vtigercrm/branches/4.2/Image/Graph/Common.php
    vtigercrm/branches/4.2/Image/Graph/Config.php
    vtigercrm/branches/4.2/Image/Graph/Constants.php
    vtigercrm/branches/4.2/Image/Graph/DataPreprocessor/
    vtigercrm/branches/4.2/Image/Graph/DataPreprocessor.php
    vtigercrm/branches/4.2/Image/Graph/DataPreprocessor/Array.php
    vtigercrm/branches/4.2/Image/Graph/DataPreprocessor/Currency.php
    vtigercrm/branches/4.2/Image/Graph/DataPreprocessor/Date.php
    vtigercrm/branches/4.2/Image/Graph/DataPreprocessor/Formatted.php
    vtigercrm/branches/4.2/Image/Graph/DataPreprocessor/Function.php
    vtigercrm/branches/4.2/Image/Graph/DataPreprocessor/NumberText.php
    vtigercrm/branches/4.2/Image/Graph/DataPreprocessor/RomanNumerals.php
    vtigercrm/branches/4.2/Image/Graph/DataPreprocessor/Sequential.php
    vtigercrm/branches/4.2/Image/Graph/DataSelector/
    vtigercrm/branches/4.2/Image/Graph/DataSelector.php
    vtigercrm/branches/4.2/Image/Graph/DataSelector/EveryNthPoint.php
    vtigercrm/branches/4.2/Image/Graph/DataSelector/NoZeros.php
    vtigercrm/branches/4.2/Image/Graph/DataSelector/Values.php
    vtigercrm/branches/4.2/Image/Graph/Dataset/
    vtigercrm/branches/4.2/Image/Graph/Dataset.php
    vtigercrm/branches/4.2/Image/Graph/Dataset/Function.php
    vtigercrm/branches/4.2/Image/Graph/Dataset/Random.php
    vtigercrm/branches/4.2/Image/Graph/Dataset/Sequential.php
    vtigercrm/branches/4.2/Image/Graph/Dataset/Trivial.php
    vtigercrm/branches/4.2/Image/Graph/Dataset/VectorFunction.php
    vtigercrm/branches/4.2/Image/Graph/Element.php
    vtigercrm/branches/4.2/Image/Graph/Figure/
    vtigercrm/branches/4.2/Image/Graph/Figure/Circle.php
    vtigercrm/branches/4.2/Image/Graph/Figure/Ellipse.php
    vtigercrm/branches/4.2/Image/Graph/Figure/Polygon.php
    vtigercrm/branches/4.2/Image/Graph/Figure/Rectangle.php
    vtigercrm/branches/4.2/Image/Graph/Fill/
    vtigercrm/branches/4.2/Image/Graph/Fill.php
    vtigercrm/branches/4.2/Image/Graph/Fill/Array.php
    vtigercrm/branches/4.2/Image/Graph/Fill/Gradient.php
    vtigercrm/branches/4.2/Image/Graph/Fill/Image.php
    vtigercrm/branches/4.2/Image/Graph/Font.php
    vtigercrm/branches/4.2/Image/Graph/Grid/
    vtigercrm/branches/4.2/Image/Graph/Grid.php
    vtigercrm/branches/4.2/Image/Graph/Grid/Bars.php
    vtigercrm/branches/4.2/Image/Graph/Grid/Lines.php
    vtigercrm/branches/4.2/Image/Graph/Grid/Polar.php
    vtigercrm/branches/4.2/Image/Graph/Images/
    vtigercrm/branches/4.2/Image/Graph/Images/Icons/
    vtigercrm/branches/4.2/Image/Graph/Images/Icons/pinpoint.png   (with props)
    vtigercrm/branches/4.2/Image/Graph/Images/Icons/pinpointr.png   (with props)
    vtigercrm/branches/4.2/Image/Graph/Images/Maps/
    vtigercrm/branches/4.2/Image/Graph/Images/Maps/README
    vtigercrm/branches/4.2/Image/Graph/Layout/
    vtigercrm/branches/4.2/Image/Graph/Layout.php
    vtigercrm/branches/4.2/Image/Graph/Layout/Horizontal.php
    vtigercrm/branches/4.2/Image/Graph/Layout/Matrix.php
    vtigercrm/branches/4.2/Image/Graph/Layout/Vertical.php
    vtigercrm/branches/4.2/Image/Graph/Legend.php
    vtigercrm/branches/4.2/Image/Graph/Line/
    vtigercrm/branches/4.2/Image/Graph/Line/Array.php
    vtigercrm/branches/4.2/Image/Graph/Line/Dashed.php
    vtigercrm/branches/4.2/Image/Graph/Line/Dotted.php
    vtigercrm/branches/4.2/Image/Graph/Line/Formatted.php
    vtigercrm/branches/4.2/Image/Graph/Line/Solid.php
    vtigercrm/branches/4.2/Image/Graph/Logo.php
    vtigercrm/branches/4.2/Image/Graph/Marker/
    vtigercrm/branches/4.2/Image/Graph/Marker.php
    vtigercrm/branches/4.2/Image/Graph/Marker/Array.php
    vtigercrm/branches/4.2/Image/Graph/Marker/Asterisk.php
    vtigercrm/branches/4.2/Image/Graph/Marker/Average.php
    vtigercrm/branches/4.2/Image/Graph/Marker/Box.php
    vtigercrm/branches/4.2/Image/Graph/Marker/Bubble.php
    vtigercrm/branches/4.2/Image/Graph/Marker/Circle.php
    vtigercrm/branches/4.2/Image/Graph/Marker/Cross.php
    vtigercrm/branches/4.2/Image/Graph/Marker/Diamond.php
    vtigercrm/branches/4.2/Image/Graph/Marker/Icon.php
    vtigercrm/branches/4.2/Image/Graph/Marker/Pinpoint.php
    vtigercrm/branches/4.2/Image/Graph/Marker/Plus.php
    vtigercrm/branches/4.2/Image/Graph/Marker/Pointing/
    vtigercrm/branches/4.2/Image/Graph/Marker/Pointing.php
    vtigercrm/branches/4.2/Image/Graph/Marker/Pointing/Angular.php
    vtigercrm/branches/4.2/Image/Graph/Marker/Pointing/Radial.php
    vtigercrm/branches/4.2/Image/Graph/Marker/ReversePinpoint.php
    vtigercrm/branches/4.2/Image/Graph/Marker/Star.php
    vtigercrm/branches/4.2/Image/Graph/Marker/Triangle.php
    vtigercrm/branches/4.2/Image/Graph/Marker/Value.php
    vtigercrm/branches/4.2/Image/Graph/Plot/
    vtigercrm/branches/4.2/Image/Graph/Plot.php
    vtigercrm/branches/4.2/Image/Graph/Plot/Area.php
    vtigercrm/branches/4.2/Image/Graph/Plot/Band.php
    vtigercrm/branches/4.2/Image/Graph/Plot/Bar.php
    vtigercrm/branches/4.2/Image/Graph/Plot/BoxWhisker.php
    vtigercrm/branches/4.2/Image/Graph/Plot/CandleStick.php
    vtigercrm/branches/4.2/Image/Graph/Plot/Dot.php
    vtigercrm/branches/4.2/Image/Graph/Plot/Fit/
    vtigercrm/branches/4.2/Image/Graph/Plot/Fit/Line.php
    vtigercrm/branches/4.2/Image/Graph/Plot/Impulse.php
    vtigercrm/branches/4.2/Image/Graph/Plot/Line.php
    vtigercrm/branches/4.2/Image/Graph/Plot/Odo.php
    vtigercrm/branches/4.2/Image/Graph/Plot/Pie.php
    vtigercrm/branches/4.2/Image/Graph/Plot/Radar.php
    vtigercrm/branches/4.2/Image/Graph/Plot/Smoothed/
    vtigercrm/branches/4.2/Image/Graph/Plot/Smoothed/Area.php
    vtigercrm/branches/4.2/Image/Graph/Plot/Smoothed/Bezier.php
    vtigercrm/branches/4.2/Image/Graph/Plot/Smoothed/Line.php
    vtigercrm/branches/4.2/Image/Graph/Plot/Smoothed/Radar.php
    vtigercrm/branches/4.2/Image/Graph/Plot/Step.php
    vtigercrm/branches/4.2/Image/Graph/Plotarea/
    vtigercrm/branches/4.2/Image/Graph/Plotarea.php
    vtigercrm/branches/4.2/Image/Graph/Plotarea/Element.php
    vtigercrm/branches/4.2/Image/Graph/Plotarea/Map.php
    vtigercrm/branches/4.2/Image/Graph/Plotarea/Radar.php
    vtigercrm/branches/4.2/Image/Graph/Simple.php
    vtigercrm/branches/4.2/Image/Graph/Title.php
    vtigercrm/branches/4.2/Image/Graph/Tool.php
    vtigercrm/branches/4.2/PEAR.php
    vtigercrm/branches/4.2/include/GraphUtils.php
Modified:
    vtigercrm/branches/4.2/modules/Dashboard/Chart_lead_source_by_outcome.php
    vtigercrm/branches/4.2/modules/Dashboard/Chart_my_pipeline_by_sales_stage.php
    vtigercrm/branches/4.2/modules/Dashboard/Chart_outcome_by_month.php
    vtigercrm/branches/4.2/modules/Dashboard/Chart_pipeline_by_lead_source.php
    vtigercrm/branches/4.2/modules/Dashboard/Chart_pipeline_by_sales_stage.php
    vtigercrm/branches/4.2/modules/Potentials/Charts.php

Modified: vtigercrm/branches/4.2/modules/Dashboard/Chart_lead_source_by_outcome.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Dashboard/Chart_lead_source_by_outcome.php (original)
+++ vtigercrm/branches/4.2/modules/Dashboard/Chart_lead_source_by_outcome.php Mon Jun 12 12:45:46 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 "<em>Charts not supported in PHP 5.</em>";
-}
-else {
 $draw_this = new jpgraph();
 echo $draw_this->lead_source_by_outcome($datax, $ids, $tmp_dir.$cache_file_name, $refresh);
 echo "<P><font size='1'><em>".$current_module_strings['LBL_LEAD_SOURCE_BY_OUTCOME_DESC']."</em></font></P>";
@@ -140,4 +136,4 @@
 [<a href="index.php?module=<?php echo $currentModule;?>&action=<?php echo $action;?>&lsbo_edit=true"><?php echo $current_module_strings['LBL_EDIT'];?></a>]
 </FONT></div>
 <?php } 
-}?>
+?>

Modified: vtigercrm/branches/4.2/modules/Dashboard/Chart_my_pipeline_by_sales_stage.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Dashboard/Chart_my_pipeline_by_sales_stage.php (original)
+++ vtigercrm/branches/4.2/modules/Dashboard/Chart_my_pipeline_by_sales_stage.php Mon Jun 12 12:45:46 2006
@@ -118,10 +118,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 "<em>Charts not supported in PHP 5.</em>";
-}
-else {
 $draw_this = new jpgraph();
 echo $draw_this->pipeline_by_sales_stage($datax, $date_start, $date_end, $ids, $tmp_dir.$cache_file_name, $refresh);
 echo "<P><font size='1'><em>".$current_module_strings['LBL_PIPELINE_FORM_TITLE_DESC']."</em></font></P>";
@@ -181,5 +177,4 @@
 </FONT></div>
 <?php } 
 echo get_validate_chart_js();
-} 
 ?>

Modified: vtigercrm/branches/4.2/modules/Dashboard/Chart_outcome_by_month.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Dashboard/Chart_outcome_by_month.php (original)
+++ vtigercrm/branches/4.2/modules/Dashboard/Chart_outcome_by_month.php Mon Jun 12 12:45:46 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 "<em>Charts not supported in PHP 5.</em>";
-}
-else {
 $draw_this = new jpgraph();
 echo $draw_this->outcome_by_month($date_start, $date_end, $ids, $tmp_dir.$cache_file_name, $refresh);
 echo "<P><font size='1'><em>".$current_module_strings['LBL_MONTH_BY_OUTCOME_DESC']."</em></font></P>";
@@ -163,4 +159,4 @@
 </FONT></div>
 <?php } 
 echo get_validate_chart_js();
-}?>
+?>

Modified: vtigercrm/branches/4.2/modules/Dashboard/Chart_pipeline_by_lead_source.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Dashboard/Chart_pipeline_by_lead_source.php (original)
+++ vtigercrm/branches/4.2/modules/Dashboard/Chart_pipeline_by_lead_source.php Mon Jun 12 12:45:46 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 "<em>Charts not supported in PHP 5.</em>";
-}
-else {
 $draw_this = new jpgraph();
 echo $draw_this->pipeline_by_lead_source($datax, $ids, $tmp_dir.$cache_file_name, $refresh);
 echo "<P><font size='1'><em>".$current_module_strings['LBL_LEAD_SOURCE_FORM_DESC']."</em></font></P>";
@@ -140,4 +136,4 @@
 [<a href="index.php?module=<?php echo $currentModule;?>&action=<?php echo $action;?>&pbls_edit=true"><?php echo $current_module_strings['LBL_EDIT'];?></a>]
 </FONT></div>
 <?php } 
-}?>
+?>

Modified: vtigercrm/branches/4.2/modules/Dashboard/Chart_pipeline_by_sales_stage.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Dashboard/Chart_pipeline_by_sales_stage.php (original)
+++ vtigercrm/branches/4.2/modules/Dashboard/Chart_pipeline_by_sales_stage.php Mon Jun 12 12:45:46 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 "<em>Charts not supported in PHP 5.</em>";
-}
-else {
 $draw_this = new jpgraph();
 echo $draw_this->pipeline_by_sales_stage($datax, $date_start, $date_end, $ids, $tmp_dir.$cache_file_name, $refresh);
 echo "<P><font size='1'><em>".$current_module_strings['LBL_SALES_STAGE_FORM_DESC']."</em></font></P>";
@@ -203,4 +199,4 @@
 </FONT></div>
 <?php } 
 //echo get_validate_chart_js();
-}?>
+?>

Modified: vtigercrm/branches/4.2/modules/Potentials/Charts.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Potentials/Charts.php (original)
+++ vtigercrm/branches/4.2/modules/Potentials/Charts.php Mon Jun 12 12:45:46 2006
@@ -20,52 +20,12 @@
 require_once('config.php');
 require_once('include/logging.php');
 require_once('modules/Potentials/Opportunity.php');
-require_once("jpgraph/jpgraph.php");
+require_once('Image/Graph.php');
 require_once('include/utils.php');
+require_once('include/GraphUtils.php');
+
 require_once('include/logging.php');
 
-
-
-
-// TTF Font families
-DEFINE("FF_COURIER",10);
-DEFINE("FF_VERDANA",11);
-DEFINE("FF_TIMES",12);
-DEFINE("FF_COMIC",14);
-DEFINE("FF_ARIAL",15);
-DEFINE("FF_GEORGIA",16);
-DEFINE("FF_TREBUCHE",17);
-
-// Chinese font
-DEFINE("FF_SIMSUN",30);
-DEFINE("FF_CHINESE",31);
-DEFINE("FF_BIG5",31);
-DEFINE("FF_TCHINESE_UTF8",32);
-
-
-function calculate_font_family($locale)
-
-{
-
-	switch($locale)
-	{
-		case 'cn_zh':
-			return FF_SIMSUN;
-		case 'zh-tw':
-		    return FF_TCHINESE_UTF8;
-		case 'tw_zh':
-			if(!function_exists('iconv')){
-				echo " Unable to display traditional Chinese on the graphs.<BR>The function iconv does not exists please read more about <a href='http://us4.php.net/iconv'>iconv here</a><BR>";
-				return FF_FONT1;
-
-			}
-			else return FF_CHINESE;
-		default:
-			return FF_FONT1;
-	}
-
-	return FF_FONT1;
-}
 
 
 class jpgraph {
@@ -79,7 +39,8 @@
 	function outcome_by_month($date_start='1971-10-15', $date_end='2071-10-15', $user_id=array('1'), $cache_file_name='a_file', $refresh=false) {
 		global $app_strings,$lang_crm, $app_list_strings, $current_module_strings, $log, $charset, $tmp_dir;
 		global $theme;
-		include_once ("jpgraph/jpgraph_bar.php");
+		include_once ('Image/Graph.php');
+		include_once ('Image/Canvas.php');
 
 		// Size of graph
 		$width=600;
@@ -87,13 +48,39 @@
 
 		$log =& LoggerManager::getLogger('outcome_by_month chart');
 		// Set the basic parameters of the graph
-		$graph = new Graph($width,$height,$cache_file_name);
+		$canvas =& Image_Canvas::factory('png', array('width' => $width, 'height' => $height, 'usemap' => true));
+		$imagemap = $canvas->getImageMap();
+		$graph =& Image_Graph::factory('graph', $canvas);
 		$log->debug("graph object created");
 
-		$graph->SetScale("textlin");
+		// add a TrueType font
+		$font =& $graph->addNew('font', calculate_font_name($lang_crm));
+		// set the font size to 11 pixels
+		$font->setSize(8);
+		
+		$graph->setFont($font);
+		// create the plotarea layout
+        $title =& Image_Graph::factory('title', array('Title',10));
+    	$plotarea =& Image_Graph::factory('plotarea',array(
+                    'axis',
+                    'axis'
+                ));
+        $footer =& Image_Graph::factory('title', array('Footer',8));
+		$graph->add(
+		    Image_Graph::vertical($title,
+	        Image_Graph::vertical(
+				$plotarea,
+        	    $footer,
+            	90
+		        ),
+        	5
+	    	)
+		);   
+
+		//$graph->SetScale("textlin");
 
 		if (!file_exists($cache_file_name) || !file_exists($cache_file_name.'.map') || $refresh == true) {
-			$font = calculate_font_family($lang_crm);
+			//$font = calculate_font_family($lang_crm);
 
 			$log->debug("date_start is: $date_start");
 			$log->debug("date_end is: $date_end");
@@ -206,32 +193,45 @@
 			$log->debug($count);
 
 			//now build the bar plots for each user across the sales stages
-			$bplot = array();
-			$color = array('Closed Lost'=>'FF9900','Closed Won'=>'009933', $other=>'0066CC');
+			$color = array('Closed Lost'=>'#FF9900','Closed Won'=>'#009933', $other=>'#0066CC');
 			$index = 0;
+			$datasets = array();
+			$xlabels = array();
+			$fills =& Image_Graph::factory('Image_Graph_Fill_Array');
 			foreach($stages as $stage) {
-				// Now create a bar pot
-				$bplot[$index] = new BarPlot($datax[$stage]);
-
-				//You can change the width of the bars if you like
-				$bplot[$index]->SetWidth(5);
+				// Now create a bar plot
+				$datasets[$index] = & Image_Graph::factory('dataset');
+				foreach($datax[$stage] as $i => $y) {
+				  	$x = 1+2*$i;
+				    $datasets[$index]->addPoint(
+				        $x,
+				        $y,
+				        array(
+				            'url' => $aTargets[$stage][$i],
+				            'alt' => $aAlts[$stage][$i]
+				        )
+				    );
+				}
 
 				// Set fill colors for bars
-				$bplot[$index]->SetFillColor("#".$color[$stage]);
-
-				// We want to display the value of each bar at the top
-				$bplot[$index]->value->Show();
-				$bplot[$index]->value->SetFont($font,FS_NORMAL,8);
-				//$bplot->value->SetAlign('left','center');
-				$bplot[$index]->value->SetColor("white");
-				$bplot[$index]->value->SetFormat(getCurrencySymbol().'%d');
-				$bplot[$index]->SetValuePos('center');
-
-				//set client side image map URL's
-				$bplot[$index]->SetCSIMTargets($aTargets[$stage],$aAlts[$stage]);
-				$log->debug("bplot[$index] is: ");
-				$log->debug($bplot[$index]);
+				$fills->addColor($color[$stage]);
+
 				$index++;
+			}
+			for($i=0;$i<count($months); $i++)
+			{
+			  $x = 1+2*$i;
+			  $xlabels[$x] = $months[$i];
+			  $xlabels[$x+1] = '';
+			}
+			
+			// compute maximum value because of grace jpGraph parameter not supported
+			$maximum = 0;
+			foreach($months as $num=>$m) {
+			  	$monthSum = 0;
+			  	foreach($stages as $stage) $monthSum += $datax[$stage][$num];
+				if($monthSum > $maximum) $maximum = $monthSum;
+				$log->debug('maximum = '.$maximum.' month = '.$m.' sum = '.$monthSum);
 			}
 
 			if($theme == "blue")
@@ -242,85 +242,103 @@
 			{
 				$font_color = "#000000";
 			}
+			$font->setColor($font_color);
 
 			// Create the grouped bar plot
-			$gbplot = new AccBarPlot($bplot);
-
-			// Add the bar to the graph
-			$graph->Add($gbplot);
-
-			// No frame around the image
-			$graph->SetFrame(true,"white");
-
-			// Rotate graph 90 degrees and set margin
-			$top = 20;
-			$bottom = 50;
-			$left = 20;
-			$right = 50;
-			$graph->SetMargin($left,$right,$top,$bottom);
+			$gbplot = & $plotarea->addNew('bar', array($datasets, 'stacked'));
+			$gbplot->setFillStyle($fills);
+
+			//You can change the width of the bars if you like
+			$gbplot->setBarWidth(60/count($months),"%");
+
+			// set margin
+			$plotarea->setPadding(array('top'=>0,'bottom'=>0,'left'=>10,'right'=>20));
 
 			// Set white margin color
-			$graph->SetMarginColor('#F5F5F5');
+			$graph->setBackgroundColor('#F5F5F5');
 
 			// Use a box around the plot area
-			$graph->SetBox();
+			$gbplot->setBorderColor('black');
 
 			// Use a gradient to fill the plot area
-			$graph->SetBackgroundGradient('#E5E5E5','white',GRAD_HOR,BGRAD_PLOT);
+			$gbplot->setBackground(Image_Graph::factory('gradient', array(IMAGE_GRAPH_GRAD_VERTICAL, 'white', '#E5E5E5')));
 
 			// Setup title
-			$title = $current_module_strings['LBL_TOTAL_PIPELINE'].getCurrencySymbol().$total.$app_strings['LBL_THOUSANDS_SYMBOL'];
-			$graph->title->Set($title);
-			$graph->title->SetColor($font_color);
-			$graph->title->SetFont($font,FS_BOLD,11);
+			$curr_symbol = getCurrencySymbol();
+			$titlestr = $current_module_strings['LBL_TOTAL_PIPELINE'].$curr_symbol.$total.$app_strings['LBL_THOUSANDS_SYMBOL'];
+			$title->setText($titleStr);
+
+			// Create the xaxis labels
+			$array_data =& Image_Graph::factory('Image_Graph_DataPreprocessor_Array', 
+			    array($xlabels) 
+			); 
 
 			// Setup X-axis
-			$graph->xaxis->SetColor($font_color);
-			$graph->xaxis->SetTickLabels($legend);
-			$graph->xaxis->SetFont($font,FS_NORMAL,8);
-
-			// Some extra margin looks nicer
-			$graph->xaxis->SetLabelMargin(10);
-
-			// Label align for X-axis
-			$graph->xaxis->SetLabelAlign('center','center');
-			$graph->yaxis->SetColor($font_color);
-			$graph->yaxis->SetLabelSide(SIDE_LEFT);
-
-			// The fix the tick marks
-			$graph->yaxis->SetTickSide(SIDE_RIGHT);
+			$xaxis =& $plotarea->getAxis(IMAGE_GRAPH_AXIS_X);
+			$xaxis->setDataPreprocessor($array_data);
+			$xaxis->forceMinimum(0);
+			$xaxis->forceMaximum(2*count($months));
+			$xaxis->setLabelInterval(1);
+			$xaxis->setTickOptions(0,0);
+			$xaxis->setLabelInterval(2,2);
+			$xaxis->setTickOptions(5,0,2);
+
+			// set grid
+			$gridY =& $plotarea->addNew('line_grid', IMAGE_GRAPH_AXIS_Y);
+			$gridY->setLineColor('#E5E5E5 at 0.5');
+
 
 			// 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(10);
+			$yaxis =& $plotarea->getAxis(IMAGE_GRAPH_AXIS_Y);
+			$yaxis->forceMaximum($maximum * 1.1);
+			$ticks = get_tickspacing($maximum);
 
 			// 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');
-
-			// First make the labels look right
-			$graph->yaxis->SetLabelAlign('left','top');
-			$graph->yaxis->SetLabelFormat(getCurrencySymbol().'%d');
-			$graph->yaxis->SetLabelSide(SIDE_RIGHT);
-
-			// The fix the tick marks
-			$graph->yaxis->SetTickSide(SIDE_LEFT);
+			$yaxis->setAxisIntersection('max');
+
+			// Then fix the tick marks
+			$valueproc =& Image_Graph::factory('Image_Graph_DataPreprocessor_Formatted', $curr_symbol."%d");
+			$yaxis->setFontSize(8);
+			$yaxis->setDataPreprocessor($valueproc);
+			// Arrange Y-Axis tick marks inside
+			$yaxis->setLabelInterval($ticks[0]);
+			$yaxis->setTickOptions(-5,0);
+			$yaxis->setLabelInterval($ticks[1],2);
+			$yaxis->setTickOptions(-2,0,2);
+			$yaxis->setLabelOption('position','inside');
 
 			// Finally setup the title
-			$graph->yaxis->SetTitleSide(SIDE_RIGHT);
-			$graph->yaxis->SetTitleMargin(35);
-
-			$subtitle .= $current_module_strings['LBL_OPP_SIZE'].getCurrencySymbol().$current_module_strings['LBL_OPP_SIZE_VALUE'];
-			$graph->footer->right->SetColor($font_color);
-			$graph->footer->right->Set($subtitle);
-			$graph->footer->right->SetFont($font,FS_NORMAL,8);
-
-			$graph->yaxis->SetFont($font,FS_NORMAL, 8);
+			$yaxis->setLabelOption('position','inside');
+			
+			// eliminate zero values
+			$gbplot->setDataSelector(Image_Graph::factory('Image_Graph_DataSelector_NoZeros'));
+			
+			// set markers
+			$marker =& $graph->addNew('value_marker', IMAGE_GRAPH_VALUE_Y);
+			$marker->setDataPreprocessor($valueproc);
+			$marker->setFillColor('000000 at 0.0');
+			$marker->setBorderColor('000000 at 0.0');
+			$marker->setFontColor('white');
+			$marker->setFontSize(8);
+			$gbplot->setMarker($marker);
+
+			$subtitle .= $current_module_strings['LBL_OPP_SIZE'].$curr_symbol.$current_module_strings['LBL_OPP_SIZE_VALUE'];
+			$footer->setText($subtitle);
+			$footer->setAlignment(IMAGE_GRAPH_ALIGN_TOP_RIGHT);
 
 			// .. and stroke the graph
-			$graph->Stroke($cache_file_name);
-			$imgMap = $graph->GetHTMLImageMap('outcome_by_month');
+			$imgMap = $graph->done(
+								    array(
+									        'tohtml' => true,
+									        'border' => 0,
+									        'filename' => $cache_file_name,
+									        'filepath' => './',
+									        'urlpath' => ''
+									    ));
+			//$imgMap = htmlspecialchars($output);
 			save_image_map($cache_file_name.'.map', $imgMap);
 		}
 		else {
@@ -329,9 +347,7 @@
 			fclose($imgMap_fp);
 		}
 		$fileModTime = filemtime($cache_file_name.'.map');
-		$return = "\n$imgMap\n";
-		$return .= "<img src='$cache_file_name?modTime=$fileModTime'\n";
-		$return .= "ismap usemap='#outcome_by_month' border='0'>\n";
+		$return = "\n$imgMap";
 		return $return;
 	}
 
@@ -351,7 +367,8 @@
 		global $app_strings,$lang_crm, $current_module_strings, $log, $charset, $tmp_dir;
 		global $theme;
 
-		include_once ("jpgraph/jpgraph_bar.php");
+		include_once ('Image/Graph.php');
+		include_once ('Image/Canvas.php');
 
 		// Size of graph
 		$width=300;
@@ -359,13 +376,36 @@
 
 		$log =& LoggerManager::getLogger('lead_source_by_outcome chart');
 		// Set the basic parameters of the graph
-		$graph = new Graph($width,$height,$cache_file_name);
+		$canvas =& Image_Canvas::factory('png', array('width' => $width, 'height' => $height, 'usemap' => true));
+		$imagemap = $canvas->getImageMap();
+		$graph =& Image_Graph::factory('graph', $canvas);
 		$log->debug("graph object created");
-
-		$graph->SetScale("textlin");
+		// add a TrueType font
+		$font =& $graph->addNew('font', calculate_font_name($lang_crm));
+		// set the font size to 11 pixels
+		$font->setSize(8);
+		
+		$graph->setFont($font);
+		// create the plotarea layout
+        $title =& Image_Graph::factory('title', array('Test',10));
+    	$plotarea =& Image_Graph::factory('plotarea',array(
+                    'axis',
+                    'axis',
+                    'horizontal'
+                ));
+        $footer =& Image_Graph::factory('title', array('Footer',8));
+		$graph->add(
+		    Image_Graph::vertical($title,
+	        Image_Graph::vertical(
+				$plotarea,
+        	    $footer,
+            	90
+		        ),
+        	5
+	    	)
+		);   
 
 		if (!file_exists($cache_file_name) || !file_exists($cache_file_name.'.map') || $refresh == true) {
-			$font = calculate_font_family($lang_crm);
 
 			$log->debug("datay is:");
 			$log->debug($datay);
@@ -494,35 +534,49 @@
 			$log->debug($count);
 
 			//now build the bar plots for each user across the sales stages
-			$bplot = array();
 			$color = array('Closed Lost'=>'FF9900','Closed Won'=>'009933', $other=>'0066CC');
 			$index = 0;
+			$xlabels = array();
+			$datasets = array();
+			$fills =& Image_Graph::factory('Image_Graph_Fill_Array');
 			foreach($stages as $stage) {
 				// Now create a bar pot
-				$bplot[$index] = new BarPlot($datax[$stage]);
-
-				//You can change the width of the bars if you like
-				$bplot[$index]->SetWidth(5);
+				$datasets[$index] = & Image_Graph::factory('dataset');
+				foreach($datax[$stage] as $i => $y) {
+				  	$x = 1+2*$i;
+				    $datasets[$index]->addPoint(
+				        //$datay[$legend[$x]],
+				        $x,
+				        $y,
+				        array(
+				            'url' => $aTargets[$stage][$i],
+				            'alt' => $aAlts[$stage][$i],
+				            'target' => '_blank'
+				        )
+				    );
+				}
+			for($i=0;$i<count($legend); $i++)
+			{
+			  $x = 1+2*$i;
+			  $xlabels[$x] = $legend[$i];
+			  $xlabels[$x+1] = '';
+			}
 
 				// Set fill colors for bars
-				$bplot[$index]->SetFillColor("#".$color[$stage]);
-
-				// We want to display the value of each bar at the top
-				$bplot[$index]->value->Show();
-				$bplot[$index]->value->SetFont($font,FS_NORMAL,7);
-				//$bplot->value->SetAlign('left','center');
-				$bplot[$index]->value->SetColor("white");
-				$bplot[$index]->value->SetFormat(getCurrencySymbol().'%d');
-				$bplot[$index]->SetValuePos('center');
-
-				//set client side image map URL's
-				$bplot[$index]->SetCSIMTargets($aTargets[$stage],$aAlts[$stage]);
-				$log->debug("bplot[$index] is: ");
-				$log->debug($bplot[$index]);
+				$fills->addColor("#".$color[$stage]);
+
 				$log->debug("datax[$stage] is: ");
 				$log->debug($datax[$stage]);
 				$index++;
 			}
+			
+			// compute maximum value because of grace jpGraph parameter not supported
+			$maximum = 0;
+			foreach($legend as $legendidx=>$legend_text) {
+			  	$dataxSum = 0;
+				foreach($stages as $stage) $dataxSum += $datax[$stage][$legendidx];
+				if($dataxSum > $maximum) $maximum = $dataxSum;
+			}
 
 			if($theme == "blue")
 			{
@@ -532,84 +586,92 @@
 			{
 				$font_color = "#000000";
 			}
+			$font->setColor($font_color);
 
 			// Create the grouped bar plot
-			$gbplot = new AccBarPlot($bplot);
-
-			// Add the bar to the graph
-			$graph->Add($gbplot);
-
-			// No frame around the image
-			$graph->SetFrame(true,"white");
-
-			// Rotate graph 90 degrees and set margin
-			$top = 20;
-			$bottom = 50;
-			$left = 130;
-			$right = 40;
-			$graph->Set90AndMargin($left,$right,$top,$bottom);
+			$gbplot = & $plotarea->addNew('bar', array($datasets, 'stacked'));
+			$gbplot->setFillStyle($fills);
+
+			//You can change the width of the bars if you like
+			$gbplot->setBarWidth(120/count($legend),"%");
 
 			// Set white margin color
-			$graph->SetMarginColor('#F5F5F5');
+			$graph->setBackgroundColor('#F5F5F5');
 
 			// Use a box around the plot area
-			$graph->SetBox();
+			$gbplot->setBorderColor('black');
 
 			// Use a gradient to fill the plot area
-			$graph->SetBackgroundGradient('#E5E5E5','white',GRAD_HOR,BGRAD_PLOT);
+			$gbplot->setBackground(Image_Graph::factory('gradient', array(IMAGE_GRAPH_GRAD_HORIZONTAL, 'white', '#E5E5E5')));
 
 			// Setup title
-			$title = $current_module_strings['LBL_ALL_OPPORTUNITIES'].getCurrencySymbol().$total.$app_strings['LBL_THOUSANDS_SYMBOL'];
-			$graph->title->Set($title);
-			$graph->title->SetColor($font_color);
-			$graph->title->SetFont($font,FS_BOLD,11);
+			$curr_symbol = getCurrencySymbol();
+			$titlestr = $current_module_strings['LBL_ALL_OPPORTUNITIES'].$curr_symbol.$total.$app_strings['LBL_THOUSANDS_SYMBOL'];
+			$title->setText($titlestr);
+
+			// Create the xaxis labels
+			$array_data =& Image_Graph::factory('Image_Graph_DataPreprocessor_Array', 
+			    array($xlabels) 
+			); 
 
 			// Setup X-axis
-			$graph->xaxis->SetTickLabels($legend);
-			$graph->xaxis->SetColor($font_color);
-			$graph->xaxis->SetFont($font,FS_NORMAL,8);
-
-			// Some extra margin looks nicer
-			$graph->xaxis->SetLabelMargin(10);
-
-			// Label align for X-axis
-			$graph->xaxis->SetLabelAlign('right','center');
-			$graph->yaxis->SetLabelSide(SIDE_LEFT);
-			$graph->yaxis->SetColor($font_color);
-			// The fix the tick marks
-			$graph->yaxis->SetTickSide(SIDE_RIGHT);
+			$xaxis =& $plotarea->getAxis(IMAGE_GRAPH_AXIS_X);
+			$xaxis->setDataPreprocessor($array_data);
+			$xaxis->forceMinimum(0);
+			$xaxis->forceMaximum(2*count($legend));
+			$xaxis->setLabelInterval(1);
+			$xaxis->setTickOptions(0,0);
+			$xaxis->setLabelInterval(2,2);
+			$xaxis->setTickOptions(5,0,2);
+			$xaxis->setInverted(true);
+			
+			// set grid
+			$gridY =& $plotarea->addNew('line_grid', IMAGE_GRAPH_AXIS_Y);
+			$gridY->setLineColor('#E5E5E5 at 0.5');
 
 			// 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(10);
-
-			// 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');
-
-			// First make the labels look right
-			$graph->yaxis->SetLabelAlign('left','top');
-			$graph->yaxis->SetLabelFormat(getCurrencySymbol().'%d');
-			$graph->yaxis->SetLabelSide(SIDE_RIGHT);
-
-			// The fix the tick marks
-			$graph->yaxis->SetTickSide(SIDE_LEFT);
+			$yaxis =& $plotarea->getAxis(IMAGE_GRAPH_AXIS_Y);
+			$yaxis->forceMaximum($maximum * 1.1);
+			$ticks = get_tickspacing($maximum);
+
+			// Then fix the tick marks
+			$yaxis->setFontSize(8);
+			$yaxis->setAxisIntersection('max');
+			$valueproc =& Image_Graph::factory('Image_Graph_DataPreprocessor_Formatted', $curr_symbol."%d");
+			$yaxis->setDataPreprocessor($valueproc);
+			$yaxis->setLabelInterval($ticks[0]);
+			$yaxis->setTickOptions(-5,0);
+			$yaxis->setLabelInterval($ticks[1],2);
+			$yaxis->setTickOptions(-2,0,2);
+			
+			// eliminate zero values
+			$gbplot->setDataSelector(Image_Graph::factory('Image_Graph_DataSelector_NoZeros'));
+			
+			// set markers
+			$marker =& $graph->addNew('value_marker', IMAGE_GRAPH_VALUE_Y);
+			$marker->setDataPreprocessor($valueproc);
+			$marker->setFillColor('#000000 at 0.0');
+			$marker->setBorderColor('#000000 at 0.0');
+			$marker->setFontColor('white');
+			$marker->setFontSize(8);
+			$gbplot->setMarker($marker);
 
 			// Finally setup the title
-			$graph->yaxis->SetTitleSide(SIDE_RIGHT);
-			$graph->yaxis->SetTitleMargin(35);
-
-			$subtitle = $current_module_strings['LBL_OPP_SIZE'].getCurrencySymbol().$current_module_strings['LBL_OPP_SIZE_VALUE']; 
-			$graph->footer->right->SetColor($font_color);
-			$graph->footer->right->Set($subtitle);
-			$graph->footer->right->SetFont($font,FS_NORMAL,8);
-
-			$graph->yaxis->SetFont($font,FS_NORMAL, 8);
+			$subtitle = $current_module_strings['LBL_OPP_SIZE'].$curr_symbol.$current_module_strings['LBL_OPP_SIZE_VALUE']; 
+			$footer->setText($subtitle);
+			$footer->setAlignment(IMAGE_GRAPH_ALIGN_TOP_RIGHT);
 
 			// .. and stroke the graph
-			$graph->Stroke($cache_file_name);
-			$imgMap = $graph->GetHTMLImageMap('lead_source_by_outcome');
+			$imgMap = $graph->done(
+								    array(
+									        'tohtml' => true,
+									        'border' => 0,
+									        'filename' => $cache_file_name,
+									        'filepath' => './',
+									        'urlpath' => ''
+									    ));
+			//$imgMap = htmlspecialchars($output);
 			save_image_map($cache_file_name.'.map', $imgMap);
 		}
 		else {
@@ -618,9 +680,7 @@
 			fclose($imgMap_fp);
 		}
 		$fileModTime = filemtime($cache_file_name.'.map');
-		$return = "\n$imgMap\n";
-		$return .= "<img src='$cache_file_name?modTime=$fileModTime'\n";
-		$return .= "ismap usemap='#lead_source_by_outcome' border='0'>\n";
+		$return = "\n$imgMap";
 		return $return;
 	}
 
@@ -634,7 +694,8 @@
 	function pipeline_by_sales_stage($datax=array('foo','bar'), $date_start='2071-10-15', $date_end='2071-10-15', $user_id=array('1'), $cache_file_name='a_file', $refresh=false) {
 		global $app_strings,$lang_crm, $current_module_strings, $log, $charset, $tmp_dir;
 		global $theme;
-		include_once ("jpgraph/jpgraph_bar.php");
+		include_once ('Image/Graph.php');
+		include_once ('Image/Canvas.php');
 
 		// Size of graph
 		$width=300;
@@ -642,13 +703,40 @@
 
 		$log =& LoggerManager::getLogger('opportunity charts');
 		// Set the basic parameters of the graph
-		$graph = new Graph($width,$height,$cache_file_name);
+
+		
+		$canvas =& Image_Canvas::factory('png', array('width' => $width, 'height' => $height, 'usemap' => true));
+		$imagemap = $canvas->getImageMap();
+		$graph =& Image_Graph::factory('graph', $canvas);
+		//$log->debug("graph object created");
+		// add a TrueType font
+		//$font =& $graph->addNew('font', calculate_font_name($lang_crm));
+		$font =& $graph->addNew('font', calculate_font_name($lang_crm));
+		// set the font size to 11 pixels
+		$font->setSize(8);
+		
+		$graph->setFont($font);
+        $title =& Image_Graph::factory('title', array('Test',10));
+    	$plotarea =& Image_Graph::factory('plotarea',array(
+                    'axis',
+                    'axis',
+                    'horizontal'
+                ));
+        $footer =& Image_Graph::factory('title', array('Footer',8));
+		$graph->add(
+		    Image_Graph::vertical($title,
+	        Image_Graph::vertical(
+				$plotarea,
+        	    $footer,
+            	90
+		        ),
+        	5
+	    	)
+		);   
 		$log->debug("graph object created");
-
-		$graph->SetScale("textlin");
+		
 
 		if (!file_exists($cache_file_name) || !file_exists($cache_file_name.'.map') || $refresh == true) {
-			$font = calculate_font_family($lang_crm);
 
 			$log->debug("starting pipeline chart");
 			$log->debug("datax is:");
@@ -764,63 +852,61 @@
 			$log->debug($count);
 
 			//now build the bar plots for each user across the sales stages
-			$bplot = array();
-			$color = 'D50100';
+			$colors = color_generator(count($user_id),'#D50100','#002222');
 			$index = 0;
+			$datasets = array();
+			$xlabels = array();
+			$fills =& Image_Graph::factory('Image_Graph_Fill_Array');
 			foreach($user_id as $the_id) {
 				// Now create a bar pot
-				$bplot[$index] = new BarPlot($datay[$the_id]);
-				//color="black",$hsize=3,$vsize=3,$show=true
-				$bplot[$index]->SetShadow();
-				//You can change the width of the bars if you like
-				$bplot[$index]->SetWidth(0.5);
+				$datasets[$index] = & Image_Graph::factory('dataset');
+				foreach($datay[$the_id] as $i => $y) {
+				    $x = 1+2*$i;
+				    $datasets[$index]->addPoint(
+				        $x,
+				        $y,
+				        array(
+				            'url' => $aTargets[$the_id][$i],
+				            'alt' => $aAlts[$the_id][$i]
+				        )
+				    );
+				}
 
 				// Set fill colors for bars
-				//$bplot[$index]->SetFillGradient('red','#7D7D7D',GRAD_HOR);//SetFillColor("#$color");
-				$bplot[$index]->SetFillColor("#$color");
-				$color = $color + 220022;
-
-				// We want to display the value of each bar at the top
-				$bplot[$index]->value->Show();
-				$bplot[$index]->value->SetFont($font,FS_NORMAL,8);
-				//$bplot->value->SetAlign('left','center');
-				$bplot[$index]->value->SetColor("white");
-				$bplot[$index]->value->SetFormat(getCurrencySymbol().'%d');
-				$bplot[$index]->SetValuePos('center');
-
-				//set client side image map URL's
-				$bplot[$index]->SetCSIMTargets($aTargets[$the_id],$aAlts[$the_id]);
-				$log->debug("bplot[$index] is: ");
-				$log->debug($bplot[$index]);
-				$log->debug("datay[$the_id] is: ");
-				$log->debug($datay[$the_id]);
+				$fills->addColor($colors[$index]);
+
 				$index++;
 			}
-
+			for($i=0;$i<count($legend); $i++)
+			{
+			  $x = 1+2*$i;
+			  $xlabels[$x] = $legend[$i];
+			  $xlabels[$x+1] = '';
+			}
+			
+			// compute maximum value because of grace jpGraph parameter not supported
+			$maximum = 0;
+			foreach($legend as $legendidx=>$legend_text) {
+			  	$legendsum = 0;
+				foreach($user_id as $the_id) $legendsum += $datay[$the_id][$legendidx];
+				if($legendsum > $maximum) $maximum = $legendsum;
+			}
 			// Create the grouped bar plot
-			$gbplot = new AccBarPlot($bplot);
-
-			// Add the bar to the graph
-			$graph->Add($gbplot);
-
-			// No frame around the image
-			$graph->SetFrame(true,"white");
-
-			// Rotate graph 90 degrees and set margin
-			$top = 20;
-			$bottom = 70;
-			$left = 130;
-			$right = 40;
-			$graph->Set90AndMargin($left,$right,$top,$bottom);
+			$gbplot = & $plotarea->addNew('bar', array($datasets, 'stacked'));
+			$gbplot->setFillStyle($fills);
+
+			//You can change the width of the bars if you like
+			$gbplot->setBarWidth(120/count($legend),"%");
+
 
 			// Set white margin color
-			$graph->SetMarginColor('#F5F5F5');
+			$graph->setBackgroundColor('#F5F5F5');
 
 			// Use a box around the plot area
-			$graph->SetBox();
+			$gbplot->setBorderColor('black');
 
 			// Use a gradient to fill the plot area
-			$graph->SetBackgroundGradient('#E5E5E5','white',GRAD_HOR,BGRAD_PLOT);
+			$gbplot->setBackground(Image_Graph::factory('gradient', array(IMAGE_GRAPH_GRAD_HORIZONTAL, 'white', '#E5E5E5')));
 
 			if($theme == "blue")
 			{
@@ -830,57 +916,81 @@
 			{
 				$font_color = "#000000";
 			}
-
+			$font->setColor($font_color);
 
 			// Setup title
-			$title = $current_module_strings['LBL_TOTAL_PIPELINE'].getCurrencySymbol().$total.$app_strings['LBL_THOUSANDS_SYMBOL'];
-			$graph->title->Set($title);
-			$graph->title->SetColor($font_color);
-			$graph->title->SetFont($font,FS_BOLD,11);
-
+			$curr_symbol = getCurrencySymbol();
+			$titlestr = $current_module_strings['LBL_TOTAL_PIPELINE'].$curr_symbol.$total.$app_strings['LBL_THOUSANDS_SYMBOL'];
+			$title->setText($titlestr);
+
+			// Create the xaxis labels
+			$array_data =& Image_Graph::factory('Image_Graph_DataPreprocessor_Array', 
+			    array($xlabels) 
+			); 
+
+		
 			// Setup X-axis
-			$graph->xaxis->SetTickLabels($legend);
-			$graph->xaxis->SetColor($font_color);
-			$graph->xaxis->SetFont($font,FS_NORMAL,8);
-
-			// Some extra margin looks nicer
-			$graph->xaxis->SetLabelMargin(10);
-
-			// Label align for X-axis
-			$graph->xaxis->SetLabelAlign('right','center');
+			$xaxis =& $plotarea->getAxis(IMAGE_GRAPH_AXIS_X);
+			$xaxis->setDataPreprocessor($array_data);
+			$xaxis->forceMinimum(0);
+			$xaxis->forceMaximum(2*count($legend));
+			$xaxis->setLabelInterval(1);
+			$xaxis->setTickOptions(0,0);
+			$xaxis->setLabelInterval(2,2);
+			$xaxis->setTickOptions(5,0,2);
+			$xaxis->setInverted(true);
+
+			// Setup Y-axis
+			$yaxis =& $plotarea->getAxis(IMAGE_GRAPH_AXIS_Y);
+			$yaxis->setFontSize(8);
+			$yaxis->setAxisIntersection('max');
 
 			// 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(10);
-
-			// 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($maximum * 1.1);
+			$ticks = get_tickspacing($maximum);
+			
+			// set grid
+			$gridY =& $plotarea->addNew('line_grid', IMAGE_GRAPH_AXIS_Y);
+			$gridY->setLineColor('#E5E5E5 at 0.5');
 
 			// First make the labels look right
-			$graph->yaxis->SetColor($font_color);
-			$graph->yaxis->SetLabelAlign('center','top');
-			$graph->yaxis->SetLabelFormat(getCurrencySymbol().'%d');
-			$graph->yaxis->SetLabelSide(SIDE_RIGHT);
-
-			// The fix the tick marks
-			$graph->yaxis->SetTickSide(SIDE_LEFT);
+			$valueproc =& Image_Graph::factory('Image_Graph_DataPreprocessor_Formatted', $curr_symbol."%d");
+			$yaxis->setDataPreprocessor($valueproc);
+			$yaxis->setLabelInterval($ticks[0]);
+			$yaxis->setTickOptions(-5,0);
+			$yaxis->setLabelInterval($ticks[1],2);
+			$yaxis->setTickOptions(-2,0,2);
+			
+			// eliminate zero values
+			$gbplot->setDataSelector(Image_Graph::factory('Image_Graph_DataSelector_NoZeros'));
+			
+			// set markers
+			$marker =& $graph->addNew('value_marker', IMAGE_GRAPH_VALUE_Y);
+			$marker->setDataPreprocessor($valueproc);
+			$marker->setFillColor('000000 at 0.0');
+			$marker->setBorderColor('000000 at 0.0');
+			$marker->setFontColor('white');
+			$marker->setFontSize(8);
+			$gbplot->setMarker($marker);
 
 			// Finally setup the title
-			$graph->yaxis->SetTitleSide(SIDE_RIGHT);
-			$graph->yaxis->SetTitleMargin(35);
-
-			$subtitle .= $current_module_strings['LBL_OPP_SIZE'].getCurrencySymbol().$current_module_strings['LBL_OPP_SIZE_VALUE']; 
-			$graph->footer->right->Set($subtitle);
-			$graph->footer->right->SetColor($font_color);
-			$graph->footer->right->SetFont($font,FS_NORMAL,8);
-
-			$graph->yaxis->SetFont($font,FS_NORMAL, 8);
+
+			$curr_symbol = getCurrencySymbol();
+			$subtitle .= $current_module_strings['LBL_OPP_SIZE'].$curr_symbol.$current_module_strings['LBL_OPP_SIZE_VALUE']; 
+			$footer->setText($subtitle);
+			$footer->setAlignment(IMAGE_GRAPH_ALIGN_TOP_RIGHT);
 
 			// .. and stroke the graph
-			$graph->Stroke($cache_file_name);
-			$imgMap = $graph->GetHTMLImageMap('pipeline');
+			$imgMap = $graph->done(
+								    array(
+									        'tohtml' => true,
+									        'border' => 0,
+									        'filename' => $cache_file_name,
+									        'filepath' => './',
+									        'urlpath' => ''
+									    ));
+			//$imgMap = $graph->GetHTMLImageMap('pipeline');
 			save_image_map($cache_file_name.'.map', $imgMap);
 		}
 		else {
@@ -889,9 +999,7 @@
 			fclose($imgMap_fp);
 		}
 		$fileModTime = filemtime($cache_file_name.'.map');
-		$return = "\n$imgMap\n";
-		$return .= "<img src='$cache_file_name?modTime=$fileModTime'\n";
-		$return .= "ismap usemap='#pipeline' border='0'>\n";
+		$return = "\n$imgMap";
 		return $return;
 	}
 
@@ -908,10 +1016,10 @@
 		global $app_strings,$lang_crm, $current_module_strings, $log, $charset, $tmp_dir;
 		global $theme;
 
-		include_once ("jpgraph/jpgraph_pie.php");
-		include_once ("jpgraph/jpgraph_pie3d.php");
-
-		$font = calculate_font_family($lang_crm);
+		include_once ('Image/Graph.php');
+		include_once ('Image/Canvas.php');
+
+		$font = calculate_font_name($lang_crm);
 
 		if (!file_exists($cache_file_name) || !file_exists($cache_file_name.'.map') || $refresh == true) {
 			$log =& LoggerManager::getLogger('opportunity charts');
@@ -1013,47 +1121,99 @@
 			}
 
 			// Create the Pie Graph.
-			$graph = new PieGraph(490,260,$cache_file_name);
-
-			$graph->SetShadow();
+			$width = 600;
+			$height = 400;
+	
+			$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('Test',10));
+	    	$plotarea =& Image_Graph::factory('plotarea',array(
+                    'category',
+                    'axis'
+                ));
+	        $footer =& Image_Graph::factory('title', array('Footer',8));
+			$graph->add(
+			    Image_Graph::vertical($title,
+		        Image_Graph::vertical(
+					$plotarea,
+	        	    $footer,
+	            	90
+			        ),
+	        	5
+		    	)
+			);   
+
+			// Generate colours
+			$colors = color_generator(count($visible_legends),'#33CCFF','#3322FF');
+			$index = 0;
+			$dataset = & Image_Graph::factory('dataset');
+			$fills =& Image_Graph::factory('Image_Graph_Fill_Array');
+			foreach($visible_legends as $legend) {
+			    $dataset->addPoint(
+			        $legend,
+			        $data[$index],
+			        array(
+			            'url' => $aTargets[$index],
+			            'alt' => $aAlts[$index]
+			        )
+			    );
+				$fills->addColor($colors[$index]);
+			    $log->debug('point ='.$legend.','.$data[$index]);
+
+				$index++;
+			}
+
+			// create the pie chart and associate the filling colours			
+			$gbplot = & $plotarea->addNew('pie', $dataset);
+			$plotarea->hideAxis();
+			$gbplot->setFillStyle($fills);
 
 			// Setup title
-			$title = $current_module_strings['LBL_TOTAL_PIPELINE'].getCurrencySymbol().$total.$app_strings['LBL_THOUSANDS_SYMBOL'];
-			$graph->title->Set($title);
-			$graph->title->SetColor($font_color);
-			$graph->title->SetFont($font,FS_BOLD,11);
-
-			// No frame around the image
-			$graph->SetFrame(false);
-			//$graph->SetMarginColor('#F5F5F5');
-
-			$graph->legend->Pos(0.01,0.10);
-			$graph->legend->SetColor($font_color);
-			$graph->legend->SetFont($font,FS_NORMAL,12);
-
-			$subtitle = $current_module_strings['LBL_OPP_SIZE'].getCurrencySymbol().$current_module_strings['LBL_OPP_SIZE_VALUE'];
-			$graph->footer->left->Set($subtitle);
-			$graph->footer->left->SetColor($font_color);
-			$graph->footer->left->SetFont($font,FS_NORMAL,8);
-
-			// Create pie plot
-			$p1 = new PiePlot3d($data);
-			$p1->SetSize(0.30);
-			$p1->SetTheme("water");
-			$p1->SetCenter(0.33,0.35);
-			$p1->SetAngle(30);
-			$p1->value->SetFont($font,FS_NORMAL,12);
-			$p1->SetLegends($visible_legends);
-			$p1->SetLabelType(PIE_VALUE_ABS);
-			$p1->value->SetFormat(getCurrencySymbol().'%d');
-
-			//set client side image map URL's
-			$p1->SetCSIMTargets($aTargets,$aAlts);
-
-			$graph->Add($p1);
-
-			$graph->Stroke($cache_file_name);
-			$imgMap = $graph->GetHTMLImageMap('pipeline_by_lead_source');
+			$curr_symbol = getCurrencySymbol();
+			$titlestr = $current_module_strings['LBL_TOTAL_PIPELINE'].$curr_symbol.$total.$app_strings['LBL_THOUSANDS_SYMBOL'];
+			$title->setText($titlestr);
+
+			// format the data values
+			$valueproc =& Image_Graph::factory('Image_Graph_DataPreprocessor_Formatted', $curr_symbol."%d");
+
+			// set markers
+			$marker =& $graph->addNew('value_marker', IMAGE_GRAPH_VALUE_Y);
+			$marker->setDataPreprocessor($valueproc);
+			$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();
+
+			$subtitle = $current_module_strings['LBL_OPP_SIZE'].$curr_symbol.$current_module_strings['LBL_OPP_SIZE_VALUE'];
+			$footer->setText($subtitle);
+			$footer->setAlignment(IMAGE_GRAPH_ALIGN_TOP_LEFT);
+
+			$imgMap = $graph->done(
+								    array(
+									        'tohtml' => true,
+									        'border' => 0,
+									        'filename' => $cache_file_name,
+									        'filepath' => './',
+									        'urlpath' => ''
+									    ));
+			//$imgMap = htmlspecialchars($output);
 			save_image_map($cache_file_name.'.map', $imgMap);
 		}
 		else {
@@ -1062,9 +1222,7 @@
 			fclose($imgMap_fp);
 		}
 		$fileModTime = filemtime($cache_file_name.'.map');
-		$return = "\n$imgMap\n";
-		$return .= "<img src='$cache_file_name?modTime=$fileModTime'\n";
-		$return .= "ismap usemap='#pipeline_by_lead_source' border='0'>\n";
+		$return = "\n$imgMap";
 		return $return;
 
 	}



From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 12 11:50:24 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 12 Jun 2006 18:50:24 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23755=3A_?=
 =?utf-8?q?Image_Graph_implementation_for_4=2E2=2E5_jpgraph_replacement?=
In-Reply-To: <076.48939851ba2c8a6f490b5e0d7b8c550b@vtiger.fosslabs.com>
References: <076.48939851ba2c8a6f490b5e0d7b8c550b@vtiger.fosslabs.com>
Message-ID: <085.6086d4db379e6e4c66a4762a657df280@vtiger.fosslabs.com>

#755: Image Graph implementation for 4.2.5 jpgraph replacement
--------------------------+-------------------------------------------------
  Reporter:  jacquemesm   |       Owner:  developer          
      Type:  enhancement  |      Status:  closed             
  Priority:  major        |   Milestone:  4.2.5              
 Component:  vtigercrm    |     Version:  4.2.4rc3           
Resolution:  fixed        |    Keywords:  Image Graph jpgraph
--------------------------+-------------------------------------------------
Comment (by allanbush):

 (In [6999]) Removed old grpahing program.  Refs #755 and #58.

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/755>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 12 11:50:25 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 12 Jun 2006 18:50:25 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=2358=3A_R?=
 =?utf-8?q?eplace_jpgrah_1=2E20=2E3_to_1=2E5=2E2_in_vtigercrm?=
In-Reply-To: <076.36e42b58afdd49562f88d2163d3f4627@vtiger.fosslabs.com>
References: <076.36e42b58afdd49562f88d2163d3f4627@vtiger.fosslabs.com>
Message-ID: <085.8225a2cd83475c2d68e1620db7ab5dea@vtiger.fosslabs.com>

#58: Replace jpgrah 1.20.3 to 1.5.2 in vtigercrm
------------------------+---------------------------------------------------
  Reporter:  fathi      |       Owner:  developer
      Type:  task       |      Status:  closed   
  Priority:  major      |   Milestone:  4.2.5    
 Component:  vtigercrm  |     Version:  4.2.3    
Resolution:  fixed      |    Keywords:           
------------------------+---------------------------------------------------
Comment (by allanbush):

 (In [6999]) Removed old grpahing program.  Refs #755 and #58.

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/58>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 12 11:50:25 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 12 Jun 2006 18:50:25 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6999 -
	/vtigercrm/branches/4.2/jpgraph/
Message-ID: <20060612185025.BD4B17E8BEE@vtiger.fosslabs.com>

Author: allanbush
Date: Mon Jun 12 12:50:22 2006
New Revision: 6999

Log:
Removed old grpahing program.  Refs #755 and #58.

Removed:
    vtigercrm/branches/4.2/jpgraph/



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 12 11:53:06 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 12 Jun 2006 18:53:06 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7000 -
	/vtigercrm/branches/4.2/cache/images/
Message-ID: <20060612185306.B62457E8BED@vtiger.fosslabs.com>

Author: allanbush
Date: Mon Jun 12 12:53:04 2006
New Revision: 7000

Log:
Set ignore property to leave generated graphs alone.

Modified:
    vtigercrm/branches/4.2/cache/images/   (props changed)



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 12 12:00:29 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 12 Jun 2006 19:00:29 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7001 - in
 /vtigercrm/branches/4.2/Image/Canvas/Fonts: VeraCopyright.txt fontmap.txt
Message-ID: <20060612190029.5D06C7E8BED@vtiger.fosslabs.com>

Author: allanbush
Date: Mon Jun 12 13:00:27 2006
New Revision: 7001

Log:
Applied changeset:5124 to the 4.2 branch to improve the font appearence.

Modified:
    vtigercrm/branches/4.2/Image/Canvas/Fonts/VeraCopyright.txt
    vtigercrm/branches/4.2/Image/Canvas/Fonts/fontmap.txt

Modified: vtigercrm/branches/4.2/Image/Canvas/Fonts/VeraCopyright.txt
==============================================================================
--- vtigercrm/branches/4.2/Image/Canvas/Fonts/VeraCopyright.txt (original)
+++ vtigercrm/branches/4.2/Image/Canvas/Fonts/VeraCopyright.txt Mon Jun 12 13:00:27 2006
@@ -1,3 +1,4 @@
+Bitstream Vera Fonts Copyright
 Bitstream Vera Fonts Copyright
 
 The fonts have a generous copyright, allowing derivative works (as
@@ -122,3 +123,126 @@
       "sans", "serif" and "monospace".  Other software (e.g., the XFree86
       core server) has other mechanisms for font substitution.
 
+
+The fonts have a generous copyright, allowing derivative works (as
+long as "Bitstream" or "Vera" are not in the names), and full
+redistribution (so long as they are not *sold* by themselves). They
+can be be bundled, redistributed and sold with any software.
+
+The fonts are distributed under the following copyright:
+
+Copyright
+=========
+
+Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream
+Vera is a trademark of Bitstream, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the fonts accompanying this license ("Fonts") and associated
+documentation files (the "Font Software"), to reproduce and distribute
+the Font Software, including without limitation the rights to use,
+copy, merge, publish, distribute, and/or sell copies of the Font
+Software, and to permit persons to whom the Font Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright and trademark notices and this permission notice
+shall be included in all copies of one or more of the Font Software
+typefaces.
+
+The Font Software may be modified, altered, or added to, and in
+particular the designs of glyphs or characters in the Fonts may be
+modified and additional glyphs or characters may be added to the
+Fonts, only if the fonts are renamed to names not containing either
+the words "Bitstream" or the word "Vera".
+
+This License becomes null and void to the extent applicable to Fonts
+or Font Software that has been modified and is distributed under the
+"Bitstream Vera" names.
+
+The Font Software may be sold as part of a larger software package but
+no copy of one or more of the Font Software typefaces may be sold by
+itself.
+
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL
+BITSTREAM OR THE GNOME FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL,
+OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT
+SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.
+
+Except as contained in this notice, the names of Gnome, the Gnome
+Foundation, and Bitstream Inc., shall not be used in advertising or
+otherwise to promote the sale, use or other dealings in this Font
+Software without prior written authorization from the Gnome Foundation
+or Bitstream Inc., respectively. For further information, contact:
+fonts at gnome dot org.
+
+Copyright FAQ
+=============
+
+   1. I don't understand the resale restriction... What gives?
+
+      Bitstream is giving away these fonts, but wishes to ensure its
+      competitors can't just drop the fonts as is into a font sale system
+      and sell them as is. It seems fair that if Bitstream can't make money
+      from the Bitstream Vera fonts, their competitors should not be able to
+      do so either. You can sell the fonts as part of any software package,
+      however.
+
+   2. I want to package these fonts separately for distribution and
+      sale as part of a larger software package or system.  Can I do so?
+
+      Yes. A RPM or Debian package is a "larger software package" to begin 
+      with, and you aren't selling them independently by themselves. 
+      See 1. above.
+
+   3. Are derivative works allowed?
+      Yes!
+
+   4. Can I change or add to the font(s)?
+      Yes, but you must change the name(s) of the font(s).
+
+   5. Under what terms are derivative works allowed?
+
+      You must change the name(s) of the fonts. This is to ensure the
+      quality of the fonts, both to protect Bitstream and Gnome. We want to
+      ensure that if an application has opened a font specifically of these
+      names, it gets what it expects (though of course, using fontconfig,
+      substitutions could still could have occurred during font
+      opening). You must include the Bitstream copyright. Additional
+      copyrights can be added, as per copyright law. Happy Font Hacking!
+
+   6. If I have improvements for Bitstream Vera, is it possible they might get 
+       adopted in future versions?
+
+      Yes. The contract between the Gnome Foundation and Bitstream has
+      provisions for working with Bitstream to ensure quality additions to
+      the Bitstream Vera font family. Please contact us if you have such
+      additions. Note, that in general, we will want such additions for the
+      entire family, not just a single font, and that you'll have to keep
+      both Gnome and Jim Lyles, Vera's designer, happy! To make sense to add
+      glyphs to the font, they must be stylistically in keeping with Vera's
+      design. Vera cannot become a "ransom note" font. Jim Lyles will be
+      providing a document describing the design elements used in Vera, as a
+      guide and aid for people interested in contributing to Vera.
+
+   7. I want to sell a software package that uses these fonts: Can I do so?
+
+      Sure. Bundle the fonts with your software and sell your software
+      with the fonts. That is the intent of the copyright.
+
+   8. If applications have built the names "Bitstream Vera" into them, 
+      can I override this somehow to use fonts of my choosing?
+
+      This depends on exact details of the software. Most open source
+      systems and software (e.g., Gnome, KDE, etc.) are now converting to
+      use fontconfig (see www.fontconfig.org) to handle font configuration,
+      selection and substitution; it has provisions for overriding font
+      names and subsituting alternatives. An example is provided by the
+      supplied local.conf file, which chooses the family Bitstream Vera for
+      "sans", "serif" and "monospace".  Other software (e.g., the XFree86
+      core server) has other mechanisms for font substitution.
+

Modified: vtigercrm/branches/4.2/Image/Canvas/Fonts/fontmap.txt
==============================================================================
--- vtigercrm/branches/4.2/Image/Canvas/Fonts/fontmap.txt (original)
+++ vtigercrm/branches/4.2/Image/Canvas/Fonts/fontmap.txt Mon Jun 12 13:00:27 2006
@@ -19,6 +19,16 @@
 Times New Roman Bold,timesbd.ttf
 Times New Roman Bold Italic,timesbi.ttf
 Times New Roman Italic,timesi.ttf
+Vera,Vera.ttf
+Vera Bold,VeraBd.ttf
+Vera Italic,VeraIt.ttf
+Vera Bold Italic,VeraBI.ttf
+Vera Mono,VeraMono.ttf
+Vera Bold,VeraMoBd.ttf
+Vera Italic,VeraMoIt.ttf
+Vera Bold Italic,VeraMoBI.ttf
+Vera Serif,VeraSe.ttf
+Vera Serif Bold,VeraSeBd.ttf
 Vera,Vera.ttf
 Vera Bold,VeraBd.ttf
 Vera Italic,VeraIt.ttf



From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 12 13:04:46 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 12 Jun 2006 20:04:46 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231287=3A?=
	=?utf-8?q?_Support_PHP_5?=
In-Reply-To: <076.34213a5e5121e9857e7ff28b81783537@vtiger.fosslabs.com>
References: <076.34213a5e5121e9857e7ff28b81783537@vtiger.fosslabs.com>
Message-ID: <085.c33afe80b056d7434c2946cac2f8d92f@vtiger.fosslabs.com>

#1287: Support PHP 5
------------------------+---------------------------------------------------
  Reporter:  allanbush  |       Owner:  developer
      Type:  defect     |      Status:  new      
  Priority:  major      |   Milestone:  4.2.5    
 Component:  vtigercrm  |     Version:  4.2.4rc3 
Resolution:             |    Keywords:  php5     
------------------------+---------------------------------------------------
Comment (by allanbush):

 (In [7002]) Replaced all instances PearDatabase::quote with $adb->quote as
 part of php 5 support.  Refs #1287 and Closes #65.

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1287>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 12 13:04:46 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 12 Jun 2006 20:04:46 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=2365=3A_S?=
 =?utf-8?q?cope_resolution_operator_=22=3A=3A=22_in_PHP_5?=
In-Reply-To: <076.a8ab3a0deda9c63944e1e856e717ec9f@vtiger.fosslabs.com>
References: <076.a8ab3a0deda9c63944e1e856e717ec9f@vtiger.fosslabs.com>
Message-ID: <085.482b71822dadcd85c5bb242217d0ad02@vtiger.fosslabs.com>

#65: Scope resolution operator "::" in PHP 5
----------------------------------+-----------------------------------------
  Reporter:  m.jacquemes at neuf.fr  |       Owner:  developer            
      Type:  defect               |      Status:  closed               
  Priority:  major                |   Milestone:  4.2.5                
 Component:  vtigercrm            |     Version:  4.2.4rc2             
Resolution:  fixed                |    Keywords:  scope operator search
----------------------------------+-----------------------------------------
Changes (by allanbush):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 (In [7002]) Replaced all instances PearDatabase::quote with $adb->quote as
 part of php 5 support.  Refs #1287 and Closes #65.

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/65>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 12 13:04:47 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 12 Jun 2006 20:04:47 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7002 - in
 /vtigercrm/branches/4.2: data/ modules/Accounts/ modules/Activities/
 modules/Contacts/ modules/CustomView/ modules/Emails/ modules/HelpDesk/
 modules/Invoice/ modules/Notes/ modules/Orders/ modules/Potentials/
 modules/Products/ modules/Quotes/ modules/Reports/ modules/Users/
Message-ID: <20060612200449.0D44A7E8C02@vtiger.fosslabs.com>

Author: allanbush
Date: Mon Jun 12 14:04:34 2006
New Revision: 7002

Log:
Replaced all instances PearDatabase::quote with $adb->quote as part of php 5 support.  Refs #1287 and Closes #65.

Modified:
    vtigercrm/branches/4.2/data/CRMEntity.php
    vtigercrm/branches/4.2/data/SugarBean.php
    vtigercrm/branches/4.2/modules/Accounts/ListView.php
    vtigercrm/branches/4.2/modules/Accounts/Popup.php
    vtigercrm/branches/4.2/modules/Activities/ListView.php
    vtigercrm/branches/4.2/modules/Contacts/ListView.php
    vtigercrm/branches/4.2/modules/Contacts/Popup.php
    vtigercrm/branches/4.2/modules/CustomView/CustomView.php
    vtigercrm/branches/4.2/modules/Emails/ListView.php
    vtigercrm/branches/4.2/modules/HelpDesk/ListView.php
    vtigercrm/branches/4.2/modules/Invoice/ListView.php
    vtigercrm/branches/4.2/modules/Notes/ListView.php
    vtigercrm/branches/4.2/modules/Orders/ListView.php
    vtigercrm/branches/4.2/modules/Orders/PopupSalesOrder.php
    vtigercrm/branches/4.2/modules/Orders/SalesOrderListView.php
    vtigercrm/branches/4.2/modules/Potentials/ListView.php
    vtigercrm/branches/4.2/modules/Potentials/Popup.php
    vtigercrm/branches/4.2/modules/Products/AddProductsToPriceBook.php
    vtigercrm/branches/4.2/modules/Products/ListView.php
    vtigercrm/branches/4.2/modules/Products/PriceBookListView.php
    vtigercrm/branches/4.2/modules/Products/PriceBookPopup.php
    vtigercrm/branches/4.2/modules/Products/VendorListView.php
    vtigercrm/branches/4.2/modules/Products/VendorPopup.php
    vtigercrm/branches/4.2/modules/Quotes/ListView.php
    vtigercrm/branches/4.2/modules/Quotes/Popup.php
    vtigercrm/branches/4.2/modules/Reports/ReportRun.php
    vtigercrm/branches/4.2/modules/Users/ListView.php

Modified: vtigercrm/branches/4.2/data/CRMEntity.php
==============================================================================
--- vtigercrm/branches/4.2/data/CRMEntity.php (original)
+++ vtigercrm/branches/4.2/data/CRMEntity.php Mon Jun 12 14:04:34 2006
@@ -1216,6 +1216,7 @@
 
 	function get_where(&$fields_array)
 	{ 
+		global $adb;
 		$where_clause = "WHERE "; 
 		$first = 1; 
 		foreach ($fields_array as $name=>$value) 
@@ -1229,7 +1230,7 @@
 				$where_clause .= " AND ";
 			} 
 
-			$where_clause .= "$name = ".PearDatabase::quote($value)."";
+			$where_clause .= "$name = ".$adb->quote($value)."";
 		} 
 
 		$where_clause .= " AND deleted=0";
@@ -1284,6 +1285,7 @@
 	*/
 	function build_generic_where_clause($value){
 			$where_clause = "WHERE "; 
+		global $adb;
 		$first = 1; 
 		foreach ($fields_array as $name=>$value) 
 		{ 
@@ -1296,7 +1298,7 @@
 				$where_clause .= " or";
 			} 
 
-			$where_clause .= "$name = ".PearDatabase::quote($value)."";
+			$where_clause .= "$name = ".$adb->quote($value)."";
 		} 
 
 		$where_clause .= " AND deleted=0";

Modified: vtigercrm/branches/4.2/data/SugarBean.php
==============================================================================
--- vtigercrm/branches/4.2/data/SugarBean.php (original)
+++ vtigercrm/branches/4.2/data/SugarBean.php Mon Jun 12 14:04:34 2006
@@ -116,11 +116,6 @@
 						$insValues = $insValues.", ";
 					}
 				}
-				/*else
-					$query = $query.", ";
-	
-				$query = $query.$field."='".PearDatabase::quote(from_html($this->$field,$isUpdate))."'";
-				*/
 				if($isUpdate)
 				{
 					$updKeyValues = $updKeyValues.$field."=".$this->db->formatString($this->table_name,$field,from_html($this->$field,$isUpdate));
@@ -553,6 +548,7 @@
 
 	function get_where(&$fields_array)
 	{ 
+		global $adb;
 		$where_clause = "WHERE "; 
 		$first = 1; 
 		foreach ($fields_array as $name=>$value) 
@@ -566,7 +562,7 @@
 				$where_clause .= " AND ";
 			} 
 
-			$where_clause .= "$name = ".PearDatabase::quote($value)."";
+			$where_clause .= "$name = ".$adb->quote($value)."";
 		} 
 
 		$where_clause .= " AND deleted=0";
@@ -621,6 +617,7 @@
 	*/
 	function build_generic_where_clause($value){
 			$where_clause = "WHERE "; 
+		global $adb;
 		$first = 1; 
 		foreach ($fields_array as $name=>$value) 
 		{ 
@@ -633,7 +630,7 @@
 				$where_clause .= " or";
 			} 
 
-			$where_clause .= "$name = ".PearDatabase::quote($value)."";
+			$where_clause .= "$name = ".$adb->quote($value)."";
 		} 
 
 		$where_clause .= " AND deleted=0";

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 Mon Jun 12 14:04:34 2006
@@ -99,83 +99,83 @@
 
 	if(isset($name) && $name != "")
 	{
-		array_push($where_clauses, "account.accountname ".$adb->getLike()." ".PearDatabase::quote($name."%"));
+		array_push($where_clauses, "account.accountname ".$adb->getLike()." ".$adb->quote($name."%"));
 		$url_string .= "&accountname=".$name;
 	}
 	if(isset($website) && $website != "")
 	{
-		array_push($where_clauses, "account.website ".$adb->getLike()." ".PearDatabase::quote("%".$website."%"));
+		array_push($where_clauses, "account.website ".$adb->getLike()." ".$adb->quote("%".$website."%"));
 		$url_string .= "&website=".$website;
 	}
 	if(isset($phone) && $phone != "")
 	{
-		array_push($where_clauses, "(account.phone ".$adb->getLike()." ".PearDatabase::quote("%".$phone."%")." OR account.otherphone ".$adb->getLike()." ".PearDatabase::quote("%".$phone."%")." OR account.fax ".$adb->getLike()." ".PearDatabase::quote("%".$phone."%").")");
+		array_push($where_clauses, "(account.phone ".$adb->getLike()." ".$adb->quote("%".$phone."%")." OR account.otherphone ".$adb->getLike()." ".$adb->quote("%".$phone."%")." OR account.fax ".$adb->getLike()." ".$adb->quote("%".$phone."%").")");
 		$url_string .= "&phone=".$phone;
 	}
 	if(isset($annual_revenue) && $annual_revenue != "")
 	{
-		array_push($where_clauses, "account.annualrevenue ".$adb->getLike()." ".PearDatabase::quote($annual_revenue."%"));
+		array_push($where_clauses, "account.annualrevenue ".$adb->getLike()." ".$adb->quote($annual_revenue."%"));
 		$url_string .= "&annual_revenue=".$annual_revenue;
 	}
 	if(isset($employees) && $employees != "")
 	{
-		array_push($where_clauses, "account.employees ".$adb->getLike()." ".PearDatabase::quote($employees."%"));
+		array_push($where_clauses, "account.employees ".$adb->getLike()." ".$adb->quote($employees."%"));
 		$url_string .= "&employees=".$employees;
 	}
 	if(isset($address_street) && $address_street != "")
 	{
-		array_push($where_clauses, "(accountbillads.street ".$adb->getLike()." ".PearDatabase::quote($address_street."%")." OR accountshipads.street ".$adb->getLike()." ".PearDatabase::quote($address_street."%").")");
+		array_push($where_clauses, "(accountbillads.street ".$adb->getLike()." ".$adb->quote($address_street."%")." OR accountshipads.street ".$adb->getLike()." ".$adb->quote($address_street."%").")");
 		$url_string .= "&address_street=".$address_street;
 	}
 	if(isset($address_city) && $address_city != "")
 	{
-		array_push($where_clauses, "(accountbillads.city ".$adb->getLike()." ".PearDatabase::quote($address_city."%")." OR accountshipads.city ".$adb->getLike()." ".PearDatabase::quote($address_city."%").")");
+		array_push($where_clauses, "(accountbillads.city ".$adb->getLike()." ".$adb->quote($address_city."%")." OR accountshipads.city ".$adb->getLike()." ".$adb->quote($address_city."%").")");
 		$url_string .= "&bill_city=".$address_city;
 	}
 	if(isset($address_state) && $address_state != "")
 	{
-		array_push($where_clauses, "(accountbillads.state ".$adb->getLike()." ".PearDatabase::quote($address_state."%")." OR accountshipads.state ".$adb->getLike()." ".PearDatabase::quote($address_state."%").")");
+		array_push($where_clauses, "(accountbillads.state ".$adb->getLike()." ".$adb->quote($address_state."%")." OR accountshipads.state ".$adb->getLike()." ".$adb->quote($address_state."%").")");
 		$url_string .= "&bill_state=".$address_state;
 	}
 	if(isset($address_postalcode) && $address_postalcode != "")
 	{
-		array_push($where_clauses, "(accountbillads.code ".$adb->getLike()." ".PearDatabase::quote($address_postalcode."%")." OR accountshipads.code ".$adb->getLike()." ".PearDatabase::quote($address_postalcode."%").")");
+		array_push($where_clauses, "(accountbillads.code ".$adb->getLike()." ".$adb->quote($address_postalcode."%")." OR accountshipads.code ".$adb->getLike()." ".$adb->quote($address_postalcode."%").")");
 		$url_string .= "&bill_code=".$address_postalcode;
 	}
 	if(isset($address_country) && $address_country != "")
 	{
-		array_push($where_clauses, "(accountbillads.country ".$adb->getLike()." ".PearDatabase::quote($address_country."%")." OR accountshipads.country ".$adb->getLike()." ".PearDatabase::quote($address_country."%").")");
+		array_push($where_clauses, "(accountbillads.country ".$adb->getLike()." ".$adb->quote($address_country."%")." OR accountshipads.country ".$adb->getLike()." ".$adb->quote($address_country."%").")");
 		$url_string .= "&bill_country=".$address_country;
 	}
 	if(isset($email) && $email != "")
 	{
-		array_push($where_clauses, "(account.email1 ".$adb->getLike()." ".PearDatabase::quote($email."%")." OR account.email2 ".$adb->getLike()." ".PearDatabase::quote($email."%").")");
+		array_push($where_clauses, "(account.email1 ".$adb->getLike()." ".$adb->quote($email."%")." OR account.email2 ".$adb->getLike()." ".$adb->quote($email."%").")");
 		$url_string .= "&email=".$email;
 	}
 	if(isset($industry) && $industry != "")
 	{
-		array_push($where_clauses, "account.industry = ".PearDatabase::quote($industry));
+		array_push($where_clauses, "account.industry = ".$adb->quote($industry));
 		$url_string .= "&industry=".$industry;
 	}
 	if(isset($ownership) && $ownership != "")
 	{
-	 	array_push($where_clauses, "account.ownership ".$adb->getLike()." ".PearDatabase::quote($ownership."%"));
+	 	array_push($where_clauses, "account.ownership ".$adb->getLike()." ".$adb->quote($ownership."%"));
 		$url_string .= "&ownership=".$ownership;
 	}
-	if(isset($rating) && $rating != "") array_push($where_clauses, "account.rating ".$adb->getLike()." ".PearDatabase::quote($rating."%"));
+	if(isset($rating) && $rating != "") array_push($where_clauses, "account.rating ".$adb->getLike()." ".$adb->quote($rating."%"));
 	if(isset($sic_code) && $sic_code != "")
 	{
-		array_push($where_clauses, "account.siccode ".$adb->getLike()." ".PearDatabase::quote($sic_code."%"));
+		array_push($where_clauses, "account.siccode ".$adb->getLike()." ".$adb->quote($sic_code."%"));
 		$url_string .= "&siccode=".$sic_code;
 	}
 	if(isset($ticker_symbol) && $ticker_symbol != "")
 	{
-		array_push($where_clauses, "account.tickersymbol ".$adb->getLike()." ".PearDatabase::quote($ticker_symbol."%"));
+		array_push($where_clauses, "account.tickersymbol ".$adb->getLike()." ".$adb->quote($ticker_symbol."%"));
 		$url_string .= "&tickersymbol=".$ticker_symbol;
 	}
 	if(isset($account_type) && $account_type != "")
 	{
-		array_push($where_clauses, "account.account_type = ".PearDatabase::quote($account_type));
+		array_push($where_clauses, "account.account_type = ".$adb->quote($account_type));
 		$url_string .= "&accounttype=".$account_type;
 	}
 	if(isset($current_user_only) && $current_user_only != "")
@@ -197,7 +197,7 @@
 		}
 		$where .= "crmentity.smownerid IN(";
 		foreach ($assigned_user_id as $key => $val) {
-			$where .= PearDatabase::quote($val);
+			$where .= $adb->quote($val);
 			$where .= ($key == count($assigned_user_id) - 1) ? ")" : ", ";
 			   // ACIPIA - to allow prev/next button to use criterias
 			  $url_string .= '&' . urlencode( 'assigned_user_id[]' ) . '=' . $val ;

Modified: vtigercrm/branches/4.2/modules/Accounts/Popup.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Accounts/Popup.php (original)
+++ vtigercrm/branches/4.2/modules/Accounts/Popup.php Mon Jun 12 14:04:34 2006
@@ -89,16 +89,16 @@
 //upto this added for Custom Field
 */	
 	if(isset($name) && $name != ""){
-		array_push($where_clauses, "account.accountname ".$adb->getLike()." ".PearDatabase::quote($name."%"));
+		array_push($where_clauses, "account.accountname ".$adb->getLike()." ".$adb->quote($name."%"));
 		$url_string .= "&name=".$name;
 	}
-	if(isset($website) && $website != "") array_push($where_clauses, "account.website ".$adb->getLike()." ".PearDatabase::quote("%".$website."%"));
-	if(isset($phone) && $phone != "") array_push($where_clauses, "(account.phone ".$adb->getLike()." ".PearDatabase::quote("%".$phone."%")." OR account.otherphone ".$adb->getLike()." ".PearDatabase::quote("%".$phone."%")." OR account.fax ".$adb->getLike()." ".PearDatabase::quote("%".$phone."%").")");
+	if(isset($website) && $website != "") array_push($where_clauses, "account.website ".$adb->getLike()." ".$adb->quote("%".$website."%"));
+	if(isset($phone) && $phone != "") array_push($where_clauses, "(account.phone ".$adb->getLike()." ".$adb->quote("%".$phone."%")." OR account.otherphone ".$adb->getLike()." ".$adb->quote("%".$phone."%")." OR account.fax ".$adb->getLike()." ".$adb->quote("%".$phone."%").")");
 	if(isset($address_city) && $address_city != ""){
-		array_push($where_clauses, "(accountbillads.city ".$adb->getLike()." ".PearDatabase::quote("%".$address_city."%")." OR accountshipads.city ".$adb->getLike()." ".PearDatabase::quote($address_city."%").")");
+		array_push($where_clauses, "(accountbillads.city ".$adb->getLike()." ".$adb->quote("%".$address_city."%")." OR accountshipads.city ".$adb->getLike()." ".$adb->quote($address_city."%").")");
 		$url_string .= "&address_city=".$address_city;
 	}
-	if(isset($ownership) && $ownership != "") array_push($where_clauses, "account.ownership ".$adb->getLike()." ".PearDatabase::quote($ownership."%"));
+	if(isset($ownership) && $ownership != "") array_push($where_clauses, "account.ownership ".$adb->getLike()." ".$adb->quote($ownership."%"));
 	if(isset($current_user_only) && $current_user_only != ""){
 		array_push($where_clauses, "crmentity.smownerid='$current_user->id'");
 		$url_string .= "&current_user_only=".$current_user_only;
@@ -118,7 +118,7 @@
 		}
 		$where .= "crmentity.smownerid IN(";
 		foreach ($assigned_user_id as $key => $val) {
-			$where .= PearDatabase::quote($val);
+			$where .= $adb->quote($val);
 			$where .= ($key == count($assigned_user_id) - 1) ? ")" : ", ";
 		}
 	}

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 Mon Jun 12 14:04:34 2006
@@ -119,20 +119,20 @@
 	}
 	if(isset($name) && $name != '')
 	{
-		array_push($where_clauses, "activity.subject ".$adb->getLike()." ".PearDatabase::quote($name.'%')."");
+		array_push($where_clauses, "activity.subject ".$adb->getLike()." ".$adb->quote($name.'%')."");
 		$url_string .= "&name=".$name;
 	}
 	if(isset($contactname) && $contactname != '')
 	{
 		//$contactnames = explode(" ", $contactname);
 		//foreach ($contactnames as $name) {
-		array_push($where_clauses, "(contactdetails.firstname ".$adb->getLike()." ".PearDatabase::quote($contactname.'%')." OR contactdetails.lastname ".$adb->getLike()." ".PearDatabase::quote($contactname.'%').")");
+		array_push($where_clauses, "(contactdetails.firstname ".$adb->getLike()." ".$adb->quote($contactname.'%')." OR contactdetails.lastname ".$adb->getLike()." ".$adb->quote($contactname.'%').")");
 		$url_string .= "&contactname=".$contactname;
 		//}
 	}
 	if(isset($duedate) && $duedate != '')
 	{
-		array_push($where_clauses, "activity.duedate ".$adb->getLike()." ".PearDatabase::quote($datedue.'%')."");
+		array_push($where_clauses, "activity.duedate ".$adb->getLike()." ".$adb->quote($datedue.'%')."");
 	}
 	if(isset($status) && $status != '')
 	{
@@ -141,7 +141,7 @@
 		$the_where_clause = "(";
 		$val = reset($each_status);
 		do {
-			$the_where_clause .= "activity.status = ".PearDatabase::quote($val);
+			$the_where_clause .= "activity.status = ".$adb->quote($val);
 			$val = next($each_status);
 			if ($val) $the_where_clause .= " OR ";
 		} while($val);

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 Mon Jun 12 14:04:34 2006
@@ -101,59 +101,59 @@
 
 
 	if(isset($lastname) && $lastname != "") {
-			array_push($where_clauses, "contactdetails.lastname ".$adb->getLike()." ".PearDatabase::quote($lastname.'%')."");
+			array_push($where_clauses, "contactdetails.lastname ".$adb->getLike()." ".$adb->quote($lastname.'%')."");
 			$url_string .= "&lastname=".$lastname;
 	}
 	if(isset($firstname) && $firstname != "") {
-			array_push($where_clauses, "contactdetails.firstname ".$adb->getLike()." ".PearDatabase::quote($firstname.'%')."");
+			array_push($where_clauses, "contactdetails.firstname ".$adb->getLike()." ".$adb->quote($firstname.'%')."");
 			$url_string .= "&firstname=".$firstname;
 	}
 	if(isset($accountname) && $accountname != "")	{
-			array_push($where_clauses, "account.accountname ".$adb->getLike()." ".PearDatabase::quote($accountname.'%')."");
+			array_push($where_clauses, "account.accountname ".$adb->getLike()." ".$adb->quote($accountname.'%')."");
 			$url_string .= "&accountname=".$accountname;
 	}
 	if(isset($leadsource) && $leadsource != "") {
-			array_push($where_clauses, "contactsubdetails.leadsource = ".PearDatabase::quote($leadsource)."");
+			array_push($where_clauses, "contactsubdetails.leadsource = ".$adb->quote($leadsource)."");
 			$url_string .= "&leadsource=".$leadsource;
 	}
 	if(isset($donotcall) && $donotcall != "") {
-			array_push($where_clauses, "contactdetails.donotcall = ".PearDatabase::quote($donotcall)."");
+			array_push($where_clauses, "contactdetails.donotcall = ".$adb->quote($donotcall)."");
 			$url_string .= "&donotcall=".$donotcall;
 	}
 	if(isset($phone) && $phone != "") {
-			array_push($where_clauses, "(contactdetails.phone ".$adb->getLike()." ".PearDatabase::quote('%'.$phone.'%')." OR contactdetails.mobile ".$adb->getLike()." ".PearDatabase::quote('%'.$phone.'%')." OR contactdetails.fax ".$adb->getLike()." ".PearDatabase::quote('%'.$phone.'%').")");
+			array_push($where_clauses, "(contactdetails.phone ".$adb->getLike()." ".$adb->quote('%'.$phone.'%')." OR contactdetails.mobile ".$adb->getLike()." ".$adb->quote('%'.$phone.'%')." OR contactdetails.fax ".$adb->getLike()." ".$adb->quote('%'.$phone.'%').")");
 			$url_string .= "&phone=".$phone;
 	}
 	if(isset($email) && $email != "") {
-			array_push($where_clauses, "(contactdetails.email ".$adb->getLike()." ".PearDatabase::quote($email.'%').")");
+			array_push($where_clauses, "(contactdetails.email ".$adb->getLike()." ".$adb->quote($email.'%').")");
 			$url_string .= "&email=".$email;
 	}
 	if(isset($yahooid) && $yahooid != "") {
-			array_push($where_clauses, "contactdetails.yahooid ".$adb->getLike()." ".PearDatabase::quote($yahooid.'%')."");
+			array_push($where_clauses, "contactdetails.yahooid ".$adb->getLike()." ".$adb->quote($yahooid.'%')."");
 			$url_string .= "&yahooid=".$yahooid;
 	}
 	if(isset($assistant) && $assistant != "") {
-			array_push($where_clauses, "contactsubdetails.assistant ".$adb->getLike()." ".PearDatabase::quote($assistant.'%')."");
+			array_push($where_clauses, "contactsubdetails.assistant ".$adb->getLike()." ".$adb->quote($assistant.'%')."");
 			$url_string .= "&yahooid=".$yahooid;
 	}
 	if(isset($mailingstreet) && $mailingstreet != "") {
-			array_push($where_clauses, "(contactaddress.mailingstreet ".$adb->getLike()." ".PearDatabase::quote($mailingstreet.'%')." OR contactaddress.otherstreet ".$adb->getLike()." ".PearDatabase::quote($mailingstreet.'%').")");
+			array_push($where_clauses, "(contactaddress.mailingstreet ".$adb->getLike()." ".$adb->quote($mailingstreet.'%')." OR contactaddress.otherstreet ".$adb->getLike()." ".$adb->quote($mailingstreet.'%').")");
 			$url_string .= "&mailingstreet=".$mailingstreet;
 	}
 	if(isset($mailingcity) && $mailingcity != "") {
-			array_push($where_clauses, "(contactaddress.mailingcity ".$adb->getLike()." ".PearDatabase::quote($mailingcity.'%')." OR contactaddress.othercity ".$adb->getLike()." ".PearDatabase::quote($mailingcity.'%').")");
+			array_push($where_clauses, "(contactaddress.mailingcity ".$adb->getLike()." ".$adb->quote($mailingcity.'%')." OR contactaddress.othercity ".$adb->getLike()." ".$adb->quote($mailingcity.'%').")");
 			$url_string .= "&mailingcity=".$mailingcity;
 	}
 	if(isset($mailingstate) && $mailingstate != "") {
-			array_push($where_clauses, "(contactaddress.mailingstate ".$adb->getLike()." ".PearDatabase::quote($mailingstate.'%')." OR contactaddress.otherstate ".$adb->getLike()." ".PearDatabase::quote($mailingstate.'%').")");
+			array_push($where_clauses, "(contactaddress.mailingstate ".$adb->getLike()." ".$adb->quote($mailingstate.'%')." OR contactaddress.otherstate ".$adb->getLike()." ".$adb->quote($mailingstate.'%').")");
 			$url_string .= "&mailingstate=".$mailingstate;
 	}
 	if(isset($mailingzip) && $mailingzip != "") {
-			array_push($where_clauses, "(contactaddress.mailingzip ".$adb->getLike()." ".PearDatabase::quote($mailingzip.'%')." OR contactaddress.otherzip ".$adb->getLike()." ".PearDatabase::quote($mailingzip.'%').")");
+			array_push($where_clauses, "(contactaddress.mailingzip ".$adb->getLike()." ".$adb->quote($mailingzip.'%')." OR contactaddress.otherzip ".$adb->getLike()." ".$adb->quote($mailingzip.'%').")");
 			$url_string .= "&mailingzip=".$mailingzip;
 	}
 	if(isset($mailingcountry) && $mailingcountry != "") {
-			array_push($where_clauses, "(contactaddress.mailingcountry ".$adb->getLike()." ".PearDatabase::quote($mailingcountry.'%')." OR contactaddress.othercountry ".$adb->getLike()." ".PearDatabase::quote($mailingcountry.'%').")");
+			array_push($where_clauses, "(contactaddress.mailingcountry ".$adb->getLike()." ".$adb->quote($mailingcountry.'%')." OR contactaddress.othercountry ".$adb->getLike()." ".$adb->quote($mailingcountry.'%').")");
 			$url_string .= "&mailingcountry=".$mailingcountry;
 	}
 	if(isset($current_user_only) && $current_user_only != "") {
@@ -183,7 +183,7 @@
 		}
 		$where .= "crmentity.smownerid IN(";
 		foreach ($assigned_user_id as $key => $val) {
-			$where .= "".PearDatabase::quote($val)."";
+			$where .= "".$adb->quote($val)."";
 			$where .= ($key == count($assigned_user_id) - 1) ? ")" : ", ";
 			// ACIPIA - to allow prev/next button to use criterias
 		        $url_string .= '&' . urlencode( 'assigned_user_id[]' ) . '=' . $val ;

Modified: vtigercrm/branches/4.2/modules/Contacts/Popup.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Contacts/Popup.php (original)
+++ vtigercrm/branches/4.2/modules/Contacts/Popup.php Mon Jun 12 14:04:34 2006
@@ -86,15 +86,15 @@
 	$where_clauses = Array();
 
 	if(isset($lastname) && $lastname != "") {
-			array_push($where_clauses, "contactdetails.lastname ".$adb->getLike()." ".PearDatabase::quote($lastname.'%')."");
+			array_push($where_clauses, "contactdetails.lastname ".$adb->getLike()." ".$adb->quote($lastname.'%')."");
 			$url_string .= "&lastname=".$lastname;
 	}
 	if(isset($firstname) && $firstname != "") {
-			array_push($where_clauses, "contactdetails.firstname ".$adb->getLike()." ".PearDatabase::quote($firstname.'%')."");
+			array_push($where_clauses, "contactdetails.firstname ".$adb->getLike()." ".$adb->quote($firstname.'%')."");
 			$url_string .= "&firstname=".$firstname;
 	}
 	if(isset($title) && $title != "")	{
-			array_push($where_clauses, "contactdetails.title ".$adb->getLike()." ".PearDatabase::quote("%".$title.'%')."");
+			array_push($where_clauses, "contactdetails.title ".$adb->getLike()." ".$adb->quote("%".$title.'%')."");
 			$url_string .= "&title=".$title;
 	}
 	if(isset($current_user_only) && $current_user_only != "") {

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 Mon Jun 12 14:04:34 2006
@@ -821,7 +821,7 @@
 		{
 			if(trim($value) != "")
                         {
-                                $rtvalue = " = ".PearDatabase::quote($value);
+                                $rtvalue = " = ".$adb->quote($value);
                         }else
                         {
                                 $rtvalue = " is NULL";
@@ -831,7 +831,7 @@
 		{
 			if(trim($value) != "")
                         {
-                                $rtvalue = " <> ".PearDatabase::quote($value);
+                                $rtvalue = " <> ".$adb->quote($value);
                         }else
                         {
                                 $rtvalue = "is NOT NULL";
@@ -839,31 +839,31 @@
 		}
 		if($comparator == "s")
 		{
-			$rtvalue = " ".$adb->getLike()." ".PearDatabase::quote($value."%");
+			$rtvalue = " ".$adb->getLike()." ".$adb->quote($value."%");
 		}
 		if($comparator == "c")
 		{
-			$rtvalue = " ".$adb->getLike()." ".PearDatabase::quote("%".$value."%");
+			$rtvalue = " ".$adb->getLike()." ".$adb->quote("%".$value."%");
 		}
 		if($comparator == "k")
 		{
-			$rtvalue = " not ".$adb->getLike()." ".PearDatabase::quote("%".$value."%");
+			$rtvalue = " not ".$adb->getLike()." ".$adb->quote("%".$value."%");
 		}
 		if($comparator == "l")
 		{
-			$rtvalue = " < ".PearDatabase::quote($value);
+			$rtvalue = " < ".$adb->quote($value);
 		}
 		if($comparator == "g")
 		{
-			$rtvalue = " > ".PearDatabase::quote($value);
+			$rtvalue = " > ".$adb->quote($value);
 		}
 		if($comparator == "m")
 		{
-			$rtvalue = " <= ".PearDatabase::quote($value);
+			$rtvalue = " <= ".$adb->quote($value);
 		}
 		if($comparator == "h")
 		{
-			$rtvalue = " >= ".PearDatabase::quote($value);
+			$rtvalue = " >= ".$adb->quote($value);
 		}
 		
 		return $rtvalue;

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 Mon Jun 12 14:04:34 2006
@@ -219,19 +219,19 @@
 	}
 	if(isset($name) && $name != '')
 	{
-		array_push($where_clauses, "activity.subject ".$adb->getLike()." ".PearDatabase::quote($name.'%')."");
+		array_push($where_clauses, "activity.subject ".$adb->getLike()." ".$adb->quote($name.'%')."");
 		$url_string .= "&subject=".$name;
 
 	}
 	if(isset($contactname) && $contactname != '')
 	{
-		array_push($where_clauses, "(contactdetails.firstname ".$adb->getLike()." ".PearDatabase::quote($contactname.'%')." OR contactdetails.lastname ".$adb->getLike()." ".PearDatabase::quote($contactname.'%').")");
+		array_push($where_clauses, "(contactdetails.firstname ".$adb->getLike()." ".$adb->quote($contactname.'%')." OR contactdetails.lastname ".$adb->getLike()." ".$adb->quote($contactname.'%').")");
 		$url_string .= "&contactname=".$contactname;
 
 	}
 	if(isset($date_start) && $date_start != '')
 	{
-		array_push($where_clauses, "events.eventdatestart ".$adb->getLike()." ".PearDatabase::quote($date_start.'%')."");
+		array_push($where_clauses, "events.eventdatestart ".$adb->getLike()." ".$adb->quote($date_start.'%')."");
 	}
 	if(isset($location) && $location != '')
 	{
@@ -241,7 +241,7 @@
 		$val = reset($each_location);
 		do
 		{
-			$the_where_clause .= "location = ".PearDatabase::quote($val)."";
+			$the_where_clause .= "location = ".$adb->quote($val)."";
 			$val = next($each_location);
 			if ($val) $the_where_clause .= " OR ";
 		} while($val);

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 Mon Jun 12 14:04:34 2006
@@ -95,7 +95,7 @@
 	}
 	if(isset($contact_name) && $contact_name != "")
 	{
-		array_push($where_clauses, "(contactdetails.firstname ".$adb->getLike()."".PearDatabase::quote($contact_name.'%')." OR contactdetails.lastname ".$adb->getLike()." ".PearDatabase::quote($contact_name.'%').")");
+		array_push($where_clauses, "(contactdetails.firstname ".$adb->getLike()."".$adb->quote($contact_name.'%')." OR contactdetails.lastname ".$adb->getLike()." ".$adb->quote($contact_name.'%').")");
 		$url_string .= "&contact_name=".$contact_name;
 
 	}

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 Mon Jun 12 14:04:34 2006
@@ -82,12 +82,12 @@
 	
 	if(isset($subject) && $subject != "") 
 	{
-		array_push($where_clauses, "invoice.subject ".$adb->getLike()." ".PearDatabase::quote($subject."%"));
+		array_push($where_clauses, "invoice.subject ".$adb->getLike()." ".$adb->quote($subject."%"));
 		$url_string .= "&subject=".$subject;
 	}
 	if(isset($salesorder) && $salesorder != "")
 	{
-		array_push($where_clauses, "salesorder.subject ".$adb->getLike()." ".PearDatabase::quote("%".$salesorder."%"));
+		array_push($where_clauses, "salesorder.subject ".$adb->getLike()." ".$adb->quote("%".$salesorder."%"));
 		$url_string .= "&salesorder=".$salesorder;
 	}
 	
@@ -105,7 +105,7 @@
 		}
 		$where .= "crmentity.smownerid IN(";
 		foreach ($assigned_user_id as $key => $val) {
-			$where .= PearDatabase::quote($val);
+			$where .= $adb->quote($val);
 			$where .= ($key == count($assigned_user_id) - 1) ? ")" : ", ";
 		}
 	}

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 Mon Jun 12 14:04:34 2006
@@ -106,14 +106,14 @@
 
 	if(isset($name) && $name != '')
 	{
-		array_push($where_clauses, "notes.title ".$adb->getLike()." ".PearDatabase::quote($name.'%')."");
+		array_push($where_clauses, "notes.title ".$adb->getLike()." ".$adb->quote($name.'%')."");
 		$url_string .= "&title=".$name;
 	}
 	if(isset($contact_name) && $contact_name != '')
 	{
 		$contact_names = explode(" ", $contact_name);
 		foreach ($contact_names as $name) {
-			array_push($where_clauses, "(contactdetails.firstname ".$adb->getLike()." ".PearDatabase::quote($name.'%')." OR contactdetails.lastname ".$adb->getLike()." ".PearDatabase::quote($name.'%').")");
+			array_push($where_clauses, "(contactdetails.firstname ".$adb->getLike()." ".$adb->quote($name.'%')." OR contactdetails.lastname ".$adb->getLike()." ".$adb->quote($name.'%').")");
 		}
 		$url_string .= "&contact_name=".$contact_name;
 	}

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 Mon Jun 12 14:04:34 2006
@@ -83,17 +83,17 @@
 	
 	if(isset($subject) && $subject != "") 
 	{
-		array_push($where_clauses, "purchaseorder.subject ".$adb->getLike()." ".PearDatabase::quote($subject."%"));
+		array_push($where_clauses, "purchaseorder.subject ".$adb->getLike()." ".$adb->quote($subject."%"));
 		$url_string .= "&subject=".$subject;
 	}
 	if(isset($vendorname) && $vendorname != "")
 	{
-		array_push($where_clauses, "vendor.vendorname ".$adb->getLike()." ".PearDatabase::quote("%".$vendorname."%"));
+		array_push($where_clauses, "vendor.vendorname ".$adb->getLike()." ".$adb->quote("%".$vendorname."%"));
 		$url_string .= "&vendorname=".$vendorname;
 	}
 	if(isset($trackingno) && $trackingno != "")
 	{
-		array_push($where_clauses, "purchaseorder.tracking_no ".$adb->getLike()." ".PearDatabase::quote("%".$trackingno."%"));
+		array_push($where_clauses, "purchaseorder.tracking_no ".$adb->getLike()." ".$adb->quote("%".$trackingno."%"));
 		$url_string .= "&trackingno=".$trackingno;
 	}
 	
@@ -111,7 +111,7 @@
 		}
 		$where .= "crmentity.smownerid IN(";
 		foreach ($assigned_user_id as $key => $val) {
-			$where .= PearDatabase::quote($val);
+			$where .= $adb->quote($val);
 			$where .= ($key == count($assigned_user_id) - 1) ? ")" : ", ";
 		}
 	}

Modified: vtigercrm/branches/4.2/modules/Orders/PopupSalesOrder.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Orders/PopupSalesOrder.php (original)
+++ vtigercrm/branches/4.2/modules/Orders/PopupSalesOrder.php Mon Jun 12 14:04:34 2006
@@ -61,21 +61,21 @@
 
 	if (isset($subject) && $subject !='')
 	{
-		array_push($where_clauses, "salesorder.subject ".$adb->getLike()." ".PearDatabase::quote($subject.'%'));
+		array_push($where_clauses, "salesorder.subject ".$adb->getLike()." ".$adb->quote($subject.'%'));
 		//$search_query .= " and productname ".$adb->getLike()." '".$productname."%'";
 		$url_string .= "&subject=".$subject;
 	}
 	
 	if (isset($accountname) && $accountname !='')
 	{
-		array_push($where_clauses, "account.accountname ".$adb->getLike()." ".PearDatabase::quote($accountname.'%'));
+		array_push($where_clauses, "account.accountname ".$adb->getLike()." ".$adb->quote($accountname.'%'));
 		//$search_query .= " and productcode ".$adb->getLike()." '".$productcode."%'";
 		$url_string .= "&accountname=".$accountname;
 	}
 
 	if (isset($quotename) && $quotename !='')
 	{
-		array_push($where_clauses, "quotes.subject ".$adb->getLike()." ".PearDatabase::quote($quotename.'%'));
+		array_push($where_clauses, "quotes.subject ".$adb->getLike()." ".$adb->quote($quotename.'%'));
 		 //$search_query .= " and commissionrate ".$adb->getLike()." '".$commissionrate."%'";
 		 $url_string .= "&quotename=".$quotename;
 	}

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 Mon Jun 12 14:04:34 2006
@@ -83,21 +83,21 @@
 
 	if (isset($subject) && $subject !='')
 	{
-		array_push($where_clauses, "salesorder.subject ".$adb->getLike()." ".PearDatabase::quote($subject.'%'));
+		array_push($where_clauses, "salesorder.subject ".$adb->getLike()." ".$adb->quote($subject.'%'));
 		//$search_query .= " and productname ".$adb->getLike()." '".$productname."%'";
 		$url_string .= "&subject=".$subject;
 	}
 	
 	if (isset($accountname) && $accountname !='')
 	{
-		array_push($where_clauses, "account.accountname ".$adb->getLike()." ".PearDatabase::quote($accountname.'%'));
+		array_push($where_clauses, "account.accountname ".$adb->getLike()." ".$adb->quote($accountname.'%'));
 		//$search_query .= " and productcode ".$adb->getLike()." '".$productcode."%'";
 		$url_string .= "&accountname=".$accountname;
 	}
 
 	if (isset($quotename) && $quotename !='')
 	{
-		array_push($where_clauses, "quotes.subject ".$adb->getLike()." ".PearDatabase::quote($quotename.'%'));
+		array_push($where_clauses, "quotes.subject ".$adb->getLike()." ".$adb->quote($quotename.'%'));
 		 //$search_query .= " and commissionrate ".$adb->getLike()." '".$commissionrate."%'";
 		 $url_string .= "&quotename=".$quotename;
 	}

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 Mon Jun 12 14:04:34 2006
@@ -93,46 +93,46 @@
 //upto this added for Custom Field
 
 	if(isset($name) && $name != "") {
-			array_push($where_clauses, "potential.potentialname ".$adb->getLike()." ".PearDatabase::quote($name.'%')."");
+		array_push($where_clauses, "potential.potentialname ".$adb->getLike()." ".$adb->quote($name.'%')."");
 			$url_string .= "&potentialname=".$name;
 	}
 	if(isset($accountname) && $accountname != "") {
-			array_push($where_clauses, "account.accountname ".$adb->getLike()." ".PearDatabase::quote($accountname.'%')."");
-			$url_string .= "&accountname=".$accountname;
+		array_push($where_clauses, "account.accountname ".$adb->getLike()." ".$adb->quote($accountname.'%')."");
+		$url_string .= "&accountname=".$accountname;
 
 
 	}
 	if(isset($lead_source) && $lead_source == "None") {
-			array_push($where_clauses, "potential.leadsource = ".PearDatabase::quote($lead_source)."");
-			$url_string .= "&leadsource=".$lead_source;
+		array_push($where_clauses, "potential.leadsource = ".$adb->quote($lead_source)."");
+		$url_string .= "&leadsource=".$lead_source;
 	}
 	// added to handle request from dashboard GS
 	if(isset($lead_source) && $lead_source != "") {
-			array_push($where_clauses, "potential.leadsource = ".PearDatabase::quote($lead_source)."");
-			$url_string .= "&leadsource=".$lead_source;
+		array_push($where_clauses, "potential.leadsource = ".$adb->quote($lead_source)."");
+		$url_string .= "&leadsource=".$lead_source;
 	}
 	if(isset($opportunity_type) && $opportunity_type != "") {
-			array_push($where_clauses, "potential.potentialtype = ".PearDatabase::quote($opportunity_type)."");
-			$url_string .= "&opportunity_type=".$opportunity_type;
+		array_push($where_clauses, "potential.potentialtype = ".$adb->quote($opportunity_type)."");
+		$url_string .= "&opportunity_type=".$opportunity_type;
 	}
 	if(isset($amount) && $amount != "") {
-			array_push($where_clauses, "potential.amount ".$adb->getLike()." ".PearDatabase::quote($amount.'%')."");
-			$url_string .= "&amount=".$amount;
+		array_push($where_clauses, "potential.amount ".$adb->getLike()." ".$adb->quote($amount.'%')."");
+		$url_string .= "&amount=".$amount;
 	}
 	if(isset($nextstep) && $nextstep != "") {
-			array_push($where_clauses, "potential.nextstep ".$adb->getLike()." ".PearDatabase::quote($nextstep.'%')."");
-			$url_string .= "&nextstep=".$nextstep;
+		array_push($where_clauses, "potential.nextstep ".$adb->getLike()." ".$adb->quote($nextstep.'%')."");
+		$url_string .= "&nextstep=".$nextstep;
 	}
 	if(isset($sales_stage) && $sales_stage != "") {
 			if($sales_stage=='Other')
 				array_push($where_clauses, "(potential.sales_stage <> 'Closed Won' and potential.sales_stage <> 'Closed Lost')");
 			else
-				array_push($where_clauses, "potential.sales_stage = ".PearDatabase::quote($sales_stage));
+				array_push($where_clauses, "potential.sales_stage = ".$adb->quote($sales_stage));
 			$url_string .= "&sales_stage=".$sales_stage;
 	}
 	if(isset($probability) && $probability != "") {
-			array_push($where_clauses, "potential.probability ".$adb->getLike()." ".PearDatabase::quote($probability.'%')."");
-			$url_string .= "&probability=".$probability;
+		array_push($where_clauses, "potential.probability ".$adb->getLike()." ".$adb->quote($probability.'%')."");
+		$url_string .= "&probability=".$probability;
 
 	}
 	if(isset($current_user_only) && $current_user_only != "") {
@@ -140,13 +140,13 @@
 			$url_string .= "&current_user_only=".$current_user_only;
 	}
 	if(isset($date_closed) && $date_closed != "") {
-			array_push($where_clauses, $adb->getDBDateString("potential.closingdate")." ".$adb->getLike()." ".PearDatabase::quote($date_closed.'%')."");
-			$url_string .= "&closingdate=".$date_closed;
+		array_push($where_clauses, $adb->getDBDateString("potential.closingdate")." ".$adb->getLike()." ".$adb->quote($date_closed.'%')."");
+		$url_string .= "&closingdate=".$date_closed;
 	}
 	if(isset($date_closed_start) && $date_closed_start != "" && isset($date_closed_end) && $date_closed_end != "")
 	{
-			array_push($where_clauses, "potential.closingdate >= ".PearDatabase::quote($date_closed_start)." and potential.closingdate <= ".PearDatabase::quote($date_closed_end));
-			$url_string .= "&closingdate_start=".$date_closed_start;
+		array_push($where_clauses, "potential.closingdate >= ".$adb->quote($date_closed_start)." and potential.closingdate <= ".$adb->quote($date_closed_end));
+		$url_string .= "&closingdate_start=".$date_closed_start;
 	}
 
 	$where = "";
@@ -163,7 +163,7 @@
 		}
 		$where .= "crmentity.smownerid IN(";
 		foreach ($assigned_user_id as $key => $val) {
-			$where .= "".PearDatabase::quote($val)."";
+			$where .= "".$adb->quote($val)."";
 			$where .= ($key == count($assigned_user_id) - 1) ? ")" : ", ";
 			// ACIPIA - to allow prev/next button to use criterias
 			$url_string .= '&' . urlencode( 'assigned_user_id[]' ) . '=' . $val ;

Modified: vtigercrm/branches/4.2/modules/Potentials/Popup.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Potentials/Popup.php (original)
+++ vtigercrm/branches/4.2/modules/Potentials/Popup.php Mon Jun 12 14:04:34 2006
@@ -73,12 +73,12 @@
 	$where_clauses = array();
 
 	if(isset($name) && $name != "") {
-			array_push($where_clauses, "potential.potentialname ".$adb->getLike()." ".PearDatabase::quote($name.'%')."");
-			$url_string .= "&name=".$name;		
+		array_push($where_clauses, "potential.potentialname ".$adb->getLike()." ".$adb->quote($name.'%')."");
+		$url_string .= "&name=".$name;		
 	}
 	if(isset($accountname) && $accountname != "") {
-			array_push($where_clauses, "account.accountname ".$adb->getLike()." ".PearDatabase::quote('%'.$accountname.'%')."");
-			$url_string .= "&account_name=".$accountname;		
+		array_push($where_clauses, "account.accountname ".$adb->getLike()." ".$adb->quote('%'.$accountname.'%')."");
+		$url_string .= "&account_name=".$accountname;		
 	}
 	if(isset($current_user_only) && $current_user_only != "") {
 			array_push($where_clauses, "crmentity.smcreator='$current_user->id'");
@@ -101,7 +101,7 @@
 		}
 		$where .= "crmentity.smcreatorid IN(";
 		foreach ($assigned_user_id as $key => $val) {
-			$where .= "".PearDatabase::quote($val)."";
+			$where .= "".$adb->quote($val)."";
 			$where .= ($key == count($assigned_user_id) - 1) ? ")" : ", ";
 		}
 	}

Modified: vtigercrm/branches/4.2/modules/Products/AddProductsToPriceBook.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Products/AddProductsToPriceBook.php (original)
+++ vtigercrm/branches/4.2/modules/Products/AddProductsToPriceBook.php Mon Jun 12 14:04:34 2006
@@ -96,65 +96,65 @@
 
 	if (isset($productname) && $productname !='')
 	{
-		array_push($where_clauses, "productname ".$adb->getLike()." ".PearDatabase::quote($productname.'%'));
+		array_push($where_clauses, "productname ".$adb->getLike()." ".$adb->quote($productname.'%'));
 		//$search_query .= " and productname ".$adb->getLike()." '".$productname."%'";
 		$url_string .= "&productname=".$productname;
 	}
 	
 	if (isset($productcode) && $productcode !='')
 	{
-		array_push($where_clauses, "productcode ".$adb->getLike()." ".PearDatabase::quote($productcode.'%'));
+		array_push($where_clauses, "productcode ".$adb->getLike()." ".$adb->quote($productcode.'%'));
 		//$search_query .= " and productcode ".$adb->getLike()." '".$productcode."%'";
 		$url_string .= "&productcode=".$productcode;
 	}
 
 	if (isset($commissionrate) && $commissionrate !='')
 	{
-		array_push($where_clauses, "commissionrate ".$adb->getLike()." ".PearDatabase::quote($commissionrate.'%'));
+		array_push($where_clauses, "commissionrate ".$adb->getLike()." ".$adb->quote($commissionrate.'%'));
 		 //$search_query .= " and commissionrate ".$adb->getLike()." '".$commissionrate."%'";
 		 $url_string .= "&commissionrate=".$commissionrate;
 	}
 	
 	if (isset($qtyperunit) && $qtyperunit !='')
 	{
-		array_push($where_clauses, "qty_per_unit ".$adb->getLike()." ".PearDatabase::quote($qtyperunit.'%'));
+		array_push($where_clauses, "qty_per_unit ".$adb->getLike()." ".$adb->quote($qtyperunit.'%'));
 	 	//$search_query .= " and qty_per_unit ".$adb->getLike()." '".$qtyperunit."%'";
 		$url_string .= "&qtyperunit=".$qtyperunit;
 	}
 	
 	if (isset($unitprice) && $unitprice !='')
 	{
-		array_push($where_clauses, "unit_price ".$adb->getLike()." ".PearDatabase::quote($unitprice.'%'));
+		array_push($where_clauses, "unit_price ".$adb->getLike()." ".$adb->quote($unitprice.'%'));
 	 //	$search_query .= " and unit_price ".$adb->getLike()." '".$unitprice."%'";
 		$url_string .= "&unitprice=".$unitprice;
 	}
 	if (isset($manufacturer) && $manufacturer !='' && $manufacturer !='--None--')
         {
-		array_push($where_clauses, "manufacturer ".$adb->getLike()." ".PearDatabase::quote($manufacturer.'%'));
+		array_push($where_clauses, "manufacturer ".$adb->getLike()." ".$adb->quote($manufacturer.'%'));
         	//$search_query .= " and manufacturer ".$adb->getLike()." '".$manufacturer."%'";
                 $url_string .= "&manufacturer=".$manufacturer;
 	}
 	if (isset($productcategory) && $productcategory !='' && $productcategory !='--None--')
         {
-		array_push($where_clauses, "productcategory ".$adb->getLike()." ".PearDatabase::quote($productcategory.'%'));
+		array_push($where_clauses, "productcategory ".$adb->getLike()." ".$adb->quote($productcategory.'%'));
         	//$search_query .= " and productcategory ".$adb->getLike()." '".$productcategory."%'";
                 $url_string .= "&productcategory=".$productcategory;
 	}
 	if (isset($start_date) && $start_date !='')
         {
-		array_push($where_clauses, "start_date ".$adb->getLike()." ".PearDatabase::quote($start_date.'%'));
+		array_push($where_clauses, "start_date ".$adb->getLike()." ".$adb->quote($start_date.'%'));
                 //$search_query .= " and start_date = '".$start_date."%'";
                 $url_string .= "&start_date=".$start_date;
         } 
 	if (isset($expiry_date) && $expiry_date !='')
         {
-		array_push($where_clauses, "expiry_date ".$adb->getLike()." ".PearDatabase::quote($expiry_date.'%'));
+		array_push($where_clauses, "expiry_date ".$adb->getLike()." ".$adb->quote($expiry_date.'%'));
                 //$search_query .= " and expiry_date = '".$expiry_date."%'";
                 $url_string .= "&expiry_date=".$expiry_date;
         } 
 	if (isset($purchase_date) && $purchase_date !='')
         {
-		array_push($where_clauses, "purchase_date ".$adb->getLike()." ".PearDatabase::quote($purchase_date.'%'));
+		array_push($where_clauses, "purchase_date ".$adb->getLike()." ".$adb->quote($purchase_date.'%'));
                 //$search_query .= " and purchase_date = '".$purchase_date."%'";
                 $url_string .= "&purchase_date=".$purchase_date;
         }

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 Mon Jun 12 14:04:34 2006
@@ -90,65 +90,65 @@
 
 	if (isset($productname) && $productname !='')
 	{
-		array_push($where_clauses, "productname ".$adb->getLike()." ".PearDatabase::quote($productname.'%'));
+		array_push($where_clauses, "productname ".$adb->getLike()." ".$adb->quote($productname.'%'));
 		//$search_query .= " and productname ".$adb->getLike()." '".$productname."%'";
 		$url_string .= "&productname=".$productname;
 	}
 	
 	if (isset($productcode) && $productcode !='')
 	{
-		array_push($where_clauses, "productcode ".$adb->getLike()." ".PearDatabase::quote($productcode.'%'));
+		array_push($where_clauses, "productcode ".$adb->getLike()." ".$adb->quote($productcode.'%'));
 		//$search_query .= " and productcode ".$adb->getLike()." '".$productcode."%'";
 		$url_string .= "&productcode=".$productcode;
 	}
 
 	if (isset($commissionrate) && $commissionrate !='')
 	{
-		array_push($where_clauses, "commissionrate ".$adb->getLike()." ".PearDatabase::quote($commissionrate.'%'));
+		array_push($where_clauses, "commissionrate ".$adb->getLike()." ".$adb->quote($commissionrate.'%'));
 		 //$search_query .= " and commissionrate ".$adb->getLike()." '".$commissionrate."%'";
 		 $url_string .= "&commissionrate=".$commissionrate;
 	}
 	
 	if (isset($qtyperunit) && $qtyperunit !='')
 	{
-		array_push($where_clauses, "qty_per_unit ".$adb->getLike()." ".PearDatabase::quote($qtyperunit.'%'));
+		array_push($where_clauses, "qty_per_unit ".$adb->getLike()." ".$adb->quote($qtyperunit.'%'));
 	 	//$search_query .= " and qty_per_unit ".$adb->getLike()." '".$qtyperunit."%'";
 		$url_string .= "&qtyperunit=".$qtyperunit;
 	}
 	
 	if (isset($unitprice) && $unitprice !='')
 	{
-		array_push($where_clauses, "unit_price ".$adb->getLike()." ".PearDatabase::quote($unitprice.'%'));
+		array_push($where_clauses, "unit_price ".$adb->getLike()." ".$adb->quote($unitprice.'%'));
 	 //	$search_query .= " and unit_price ".$adb->getLike()." '".$unitprice."%'";
 		$url_string .= "&unitprice=".$unitprice;
 	}
 	if (isset($manufacturer) && $manufacturer !='' && $manufacturer !='--None--')
         {
-		array_push($where_clauses, "manufacturer ".$adb->getLike()." ".PearDatabase::quote($manufacturer.'%'));
+		array_push($where_clauses, "manufacturer ".$adb->getLike()." ".$adb->quote($manufacturer.'%'));
         	//$search_query .= " and manufacturer ".$adb->getLike()." '".$manufacturer."%'";
                 $url_string .= "&manufacturer=".$manufacturer;
 	}
 	if (isset($productcategory) && $productcategory !='' && $productcategory !='--None--')
         {
-		array_push($where_clauses, "productcategory ".$adb->getLike()." ".PearDatabase::quote($productcategory.'%'));
+		array_push($where_clauses, "productcategory ".$adb->getLike()." ".$adb->quote($productcategory.'%'));
         	//$search_query .= " and productcategory ".$adb->getLike()." '".$productcategory."%'";
                 $url_string .= "&productcategory=".$productcategory;
 	}
 	if (isset($start_date) && $start_date !='')
         {
-		array_push($where_clauses, "start_date ".$adb->getLike()." ".PearDatabase::quote($start_date.'%'));
+		array_push($where_clauses, "start_date ".$adb->getLike()." ".$adb->quote($start_date.'%'));
                 //$search_query .= " and start_date = '".$start_date."%'";
                 $url_string .= "&start_date=".$start_date;
         } 
 	if (isset($expiry_date) && $expiry_date !='')
         {
-		array_push($where_clauses, "expiry_date ".$adb->getLike()." ".PearDatabase::quote($expiry_date.'%'));
+		array_push($where_clauses, "expiry_date ".$adb->getLike()." ".$adb->quote($expiry_date.'%'));
                 //$search_query .= " and expiry_date = '".$expiry_date."%'";
                 $url_string .= "&expiry_date=".$expiry_date;
         } 
 	if (isset($purchase_date) && $purchase_date !='')
         {
-		array_push($where_clauses, "purchase_date ".$adb->getLike()." ".PearDatabase::quote($purchase_date.'%'));
+		array_push($where_clauses, "purchase_date ".$adb->getLike()." ".$adb->quote($purchase_date.'%'));
                 //$search_query .= " and purchase_date = '".$purchase_date."%'";
                 $url_string .= "&purchase_date=".$purchase_date;
         }

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 Mon Jun 12 14:04:34 2006
@@ -84,7 +84,7 @@
 
 	if (isset($bookname) && $bookname !='')
 	{
-		array_push($where_clauses, "bookname ".$adb->getLike()." ".PearDatabase::quote($bookname.'%'));
+		array_push($where_clauses, "bookname ".$adb->getLike()." ".$adb->quote($bookname.'%'));
 		//$search_query .= " and productname ".$adb->getLike()." '".$productname."%'";
 		$url_string .= "&bookname=".$bookname;
 	}

Modified: vtigercrm/branches/4.2/modules/Products/PriceBookPopup.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Products/PriceBookPopup.php (original)
+++ vtigercrm/branches/4.2/modules/Products/PriceBookPopup.php Mon Jun 12 14:04:34 2006
@@ -54,202 +54,6 @@
 $sorder = 'ASC';  // Default sort order
 if(isset($_REQUEST['sorder']) && $_REQUEST['sorder'] != '')
 $sorder = $_REQUEST['sorder'];
-/*
-if(isset($_REQUEST['query']) && $_REQUEST['query'] != '' && $_REQUEST['query'] == 'true')
-{
-	$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'];
-
-	$where_clauses = Array();
-	//$search_query='';
-
-	//Added for Custom Field Search
-	$sql="select * from field where tablename='productcf' order by fieldlabel";
-	$result=$adb->query($sql);
-	for($i=0;$i<$adb->num_rows($result);$i++)
-	{
-	        $column[$i]=$adb->query_result($result,$i,'columnname');
-	        $fieldlabel[$i]=$adb->query_result($result,$i,'fieldlabel');
-		$uitype[$i]=$adb->query_result($result,$i,'uitype');
-
-	        if (isset($_REQUEST[$column[$i]])) $customfield[$i] = $_REQUEST[$column[$i]];
-	
-	        if(isset($customfield[$i]) && $customfield[$i] != '')
-	        {
-			if($uitype[$i] == 56)
-                                $str=" productcf.".$column[$i]." = 1";
-                        else
-			        $str=" productcf.".$column[$i]." like '$customfield[$i]%'";
-		        array_push($where_clauses, $str);
-	       	//	  $search_query .= ' and '.$str;
-			$url_string .="&".$column[$i]."=".$customfield[$i];
-	        }
-	}
-	//upto this added for Custom Field
-
-	if (isset($productname) && $productname !='')
-	{
-		array_push($where_clauses, "productname like ".PearDatabase::quote($productname.'%'));
-		//$search_query .= " and productname like '".$productname."%'";
-		$url_string .= "&productname=".$productname;
-	}
-	
-	if (isset($productcode) && $productcode !='')
-	{
-		array_push($where_clauses, "productcode like ".PearDatabase::quote($productcode.'%'));
-		//$search_query .= " and productcode like '".$productcode."%'";
-		$url_string .= "&productcode=".$productcode;
-	}
-
-	if (isset($commissionrate) && $commissionrate !='')
-	{
-		array_push($where_clauses, "commissionrate like ".PearDatabase::quote($commissionrate.'%'));
-		 //$search_query .= " and commissionrate like '".$commissionrate."%'";
-		 $url_string .= "&commissionrate=".$commissionrate;
-	}
-	
-	if (isset($qtyperunit) && $qtyperunit !='')
-	{
-		array_push($where_clauses, "qty_per_unit like ".PearDatabase::quote($qtyperunit.'%'));
-	 	//$search_query .= " and qty_per_unit like '".$qtyperunit."%'";
-		$url_string .= "&qtyperunit=".$qtyperunit;
-	}
-	
-	if (isset($unitprice) && $unitprice !='')
-	{
-		array_push($where_clauses, "unit_price like ".PearDatabase::quote($unitprice.'%'));
-	 //	$search_query .= " and unit_price like '".$unitprice."%'";
-		$url_string .= "&unitprice=".$unitprice;
-	}
-	if (isset($manufacturer) && $manufacturer !='' && $manufacturer !='--None--')
-        {
-		array_push($where_clauses, "manufacturer like ".PearDatabase::quote($manufacturer.'%'));
-        	//$search_query .= " and manufacturer like '".$manufacturer."%'";
-                $url_string .= "&manufacturer=".$manufacturer;
-	}
-	if (isset($productcategory) && $productcategory !='' && $productcategory !='--None--')
-        {
-		array_push($where_clauses, "productcategory like ".PearDatabase::quote($productcategory.'%'));
-        	//$search_query .= " and productcategory like '".$productcategory."%'";
-                $url_string .= "&productcategory=".$productcategory;
-	}
-	if (isset($start_date) && $start_date !='')
-        {
-		array_push($where_clauses, "start_date like ".PearDatabase::quote($start_date.'%'));
-                //$search_query .= " and start_date = '".$start_date."%'";
-                $url_string .= "&start_date=".$start_date;
-        } 
-	if (isset($expiry_date) && $expiry_date !='')
-        {
-		array_push($where_clauses, "expiry_date like ".PearDatabase::quote($expiry_date.'%'));
-                //$search_query .= " and expiry_date = '".$expiry_date."%'";
-                $url_string .= "&expiry_date=".$expiry_date;
-        } 
-	if (isset($purchase_date) && $purchase_date !='')
-        {
-		array_push($where_clauses, "purchase_date like ".PearDatabase::quote($purchase_date.'%'));
-                //$search_query .= " and purchase_date = '".$purchase_date."%'";
-                $url_string .= "&purchase_date=".$purchase_date;
-        }
-	$where = "";
-	foreach($where_clauses as $clause)
-	{
-		if($where != "")
-		$where .= " and ";
-		$where .= $clause;
-	}
-
-	$log->info("Here is the where clause for the list view: $where");
- 
-
-}
-
-//Constructing the Search Form
-if (!isset($_REQUEST['search_form']) || $_REQUEST['search_form'] != 'false') {
-        // Stick the form header out there.
-	echo get_form_header($current_module_strings['LBL_SEARCH_FORM_TITLE'],'', false);
-        $search_form=new XTemplate ('modules/Products/PopupSearchForm.html');
-        $search_form->assign("MOD", $mod_strings);
-        $search_form->assign("APP", $app_strings);
-	$clearsearch = 'true';
-	
-	if ($order_by !='') $search_form->assign("ORDER_BY", $order_by);
-	if ($sorder !='') $search_form->assign("SORDER", $sorder);
-	$search_form->assign("JAVASCRIPT", get_clear_form_js());
-	if($order_by != '') {
-		$ordby = "&order_by=".$order_by;
-	}
-	else
-	{
-		$ordby ='';
-	}
-	$search_form->assign("BASIC_LINK", "index.php?module=Products".$ordby."&action=index".$url_string."&sorder=".$sorder);
-	$search_form->assign("ADVANCE_LINK", "index.php?module=Products&action=index".$ordby."&advanced=true".$url_string."&sorder=".$sorder);
-
-	if ($productname !='') $search_form->assign("PRODUCT_NAME", $productname);
-	if ($commissionrate !='') $search_form->assign("COMMISSION_RATE", $commissionrate);
-	if ($productcode !='') $search_form->assign("PRODUCT_CODE", $productcode);
-	if ($qtyperunit !='') $search_form->assign("QTYPERUNIT", $qtyperunit);
-	if ($unitprice !='') $search_form->assign("UNITPRICE", $unitprice);
-	if (isset($_REQUEST['manufacturer'])) $manufacturer = $_REQUEST['manufacturer'];	
-	if (isset($_REQUEST['productcategory'])) $productcategoty = $_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'];	
-
-//Combo Fields for Manufacturer and Category are moved from advanced to Basic Search
-/*        if (isset($manufacturer)) $search_form->assign("MANUFACTURER", get_select_options($comboFieldArray['manufacturer_dom'], $manufacturer, $clearsearch));
-        else $search_form->assign("MANUFACTURER", get_select_options($comboFieldArray['manufacturer_dom'], '', $clearsearch));
-        if (isset($productcategory)) $search_form->assign("PRODUCTCATEGORY", get_select_options($comboFieldArray['productcategory_dom'], $productcategoty, $clearsearch));
-        else $search_form->assign("PRODUCTCATEGORY", get_select_options($comboFieldArray['productcategory_dom'], '', $clearsearch));
-*/
- /*       if (isset($_REQUEST['advanced']) && $_REQUEST['advanced'] == 'true') 
-	{
-		$url_string .="&advanced=true";
-		$search_form->assign("ALPHABETICAL",AlphabeticalSearch('Products','index','productname','true','advanced'));
-
-		$search_form->assign("SUPPORT_START_DATE",$_REQUEST['start_date']);
-		$search_form->assign("SUPPORT_EXPIRY_DATE",$_REQUEST['expiry_date']);
-		$search_form->assign("PURCHASE_DATE",$_REQUEST['purchase_date']);
-		$search_form->assign("DATE_FORMAT", $current_user->date_format);
-
-		//Added for Custom Field Search
-		$sql="select * from field where tablename='productcf' order by fieldlabel";
-		$result=$adb->query($sql);
-		for($i=0;$i<$adb->num_rows($result);$i++)
-		{
-		        $column[$i]=$adb->query_result($result,$i,'columnname');
-		        $fieldlabel[$i]=$adb->query_result($result,$i,'fieldlabel');
-		        if (isset($_REQUEST[$column[$i]])) $customfield[$i] = $_REQUEST[$column[$i]];
-		}
-		require_once('include/CustomFieldUtil.php');
-		$custfld = CustomFieldSearch($customfield, "productcf", "productcf", "productid", $app_strings,$theme,$column,$fieldlabel);
-		$search_form->assign("CUSTOMFIELD", $custfld);
-		//upto this added for Custom Field
-
-                $search_form->parse("advanced");
-                $search_form->out("advanced");
-	}
-	else
-	{        
-		$search_form->assign("ALPHABETICAL",AlphabeticalSearch('Products','index','productname','true','basic'));
-		$search_form->parse("main");
-	        $search_form->out("main");
-	}
-echo get_form_footer();
-//echo '<br><br>';
-
-}
-*/
 //Retreive the list from Database
 
 //$list_query = getListQuery("PriceBook");

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 Mon Jun 12 14:04:34 2006
@@ -85,76 +85,25 @@
 
 	if (isset($vendorname) && $vendorname !='')
 	{
-		array_push($where_clauses, "vendorname ".$adb->getLike()." ".PearDatabase::quote($vendorname.'%'));
+		array_push($where_clauses, "vendorname ".$adb->getLike()." ".$adb->quote($vendorname.'%'));
 		//$search_query .= " and productname ".$adb->getLike()." '".$productname."%'";
 		$url_string .= "&vendorname=".$vendorname;
 	}
 
 	if (isset($email) && $email !='')
 	{
-		array_push($where_clauses, "email =".PearDatabase::quote($email));
+		array_push($where_clauses, "email =".$adb->quote($email));
 		//$search_query .= " and productcode ".$adb->getLike()." '".$productcode."%'";
 		$url_string .= "&email=".$email;
 	}
 	
 	if (isset($category) && $category !='')
 	{
-		array_push($where_clauses, "category ".$adb->getLike()." ".PearDatabase::quote($category.'%'));
+		array_push($where_clauses, "category ".$adb->getLike()." ".$adb->quote($category.'%'));
 		//$search_query .= " and productcode ".$adb->getLike()." '".$productcode."%'";
 		$url_string .= "&category=".$category;
 	}
 
-/*	if (isset($commissionrate) && $commissionrate !='')
-	{
-		array_push($where_clauses, "commissionrate ".$adb->getLike()." ".PearDatabase::quote($commissionrate.'%'));
-		 //$search_query .= " and commissionrate ".$adb->getLike()." '".$commissionrate."%'";
-		 $url_string .= "&commissionrate=".$commissionrate;
-	}
-
-	if (isset($qtyperunit) && $qtyperunit !='')
-	{
-		array_push($where_clauses, "qty_per_unit ".$adb->getLike()." ".PearDatabase::quote($qtyperunit.'%'));
-	 	//$search_query .= " and qty_per_unit ".$adb->getLike()." '".$qtyperunit."%'";
-		$url_string .= "&qtyperunit=".$qtyperunit;
-	}
-
-	if (isset($unitprice) && $unitprice !='')
-	{
-		array_push($where_clauses, "unit_price ".$adb->getLike()." ".PearDatabase::quote($unitprice.'%'));
-	 //	$search_query .= " and unit_price ".$adb->getLike()." '".$unitprice."%'";
-		$url_string .= "&unitprice=".$unitprice;
-	}
-	if (isset($manufacturer) && $manufacturer !='' && $manufacturer !='--None--')
-        {
-		array_push($where_clauses, "manufacturer ".$adb->getLike()." ".PearDatabase::quote($manufacturer.'%'));
-        	//$search_query .= " and manufacturer ".$adb->getLike()." '".$manufacturer."%'";
-                $url_string .= "&manufacturer=".$manufacturer;
-	}
-	if (isset($productcategory) && $productcategory !='' && $productcategory !='--None--')
-        {
-		array_push($where_clauses, "productcategory ".$adb->getLike()." ".PearDatabase::quote($productcategory.'%'));
-        	//$search_query .= " and productcategory ".$adb->getLike()." '".$productcategory."%'";
-                $url_string .= "&productcategory=".$productcategory;
-	}
-	if (isset($start_date) && $start_date !='')
-        {
-		array_push($where_clauses, "start_date ".$adb->getLike()." ".PearDatabase::quote($start_date.'%'));
-                //$search_query .= " and start_date = '".$start_date."%'";
-                $url_string .= "&start_date=".$start_date;
-        }
-	if (isset($expiry_date) && $expiry_date !='')
-        {
-		array_push($where_clauses, "expiry_date ".$adb->getLike()." ".PearDatabase::quote($expiry_date.'%'));
-                //$search_query .= " and expiry_date = '".$expiry_date."%'";
-                $url_string .= "&expiry_date=".$expiry_date;
-        }
-	if (isset($purchase_date) && $purchase_date !='')
-        {
-		array_push($where_clauses, "purchase_date ".$adb->getLike()." ".PearDatabase::quote($purchase_date.'%'));
-                //$search_query .= " and purchase_date = '".$purchase_date."%'";
-                $url_string .= "&purchase_date=".$purchase_date;
-        }
-*/
 	$where = "";
 	foreach($where_clauses as $clause)
 	{

Modified: vtigercrm/branches/4.2/modules/Products/VendorPopup.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Products/VendorPopup.php (original)
+++ vtigercrm/branches/4.2/modules/Products/VendorPopup.php Mon Jun 12 14:04:34 2006
@@ -91,21 +91,21 @@
 
 	if (isset($vendorname) && $vendorname !='')
 	{
-		array_push($where_clauses, "vendorname ".$adb->getLike()." ".PearDatabase::quote($vendorname.'%'));
+		array_push($where_clauses, "vendorname ".$adb->getLike()." ".$adb->quote($vendorname.'%'));
 		//$search_query .= " and productname ".$adb->getLike()." '".$productname."%'";
 		$url_string .= "&vendorname=".$vendorname;
 	}
 
 	if (isset($companyname) && $companyname !='')
 	{
-		array_push($where_clauses, "company_name ".$adb->getLike()." ".PearDatabase::quote($companyname.'%'));
+		array_push($where_clauses, "company_name ".$adb->getLike()." ".$adb->quote($companyname.'%'));
 		//$search_query .= " and productcode ".$adb->getLike()." '".$productcode."%'";
 		$url_string .= "&companyname=".$companyname;
 	}
 	
 	if (isset($category) && $category !='')
 	{
-		array_push($where_clauses, "category ".$adb->getLike()." ".PearDatabase::quote($category.'%'));
+		array_push($where_clauses, "category ".$adb->getLike()." ".$adb->quote($category.'%'));
 		//$search_query .= " and productcode ".$adb->getLike()." '".$productcode."%'";
 		$url_string .= "&category=".$category;
 	}

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 Mon Jun 12 14:04:34 2006
@@ -83,23 +83,23 @@
 	
 	if(isset($subject) && $subject != "") 
 	{
-		array_push($where_clauses, "quotes.subject ".$adb->getLike()." ".PearDatabase::quote($subject."%"));
+		array_push($where_clauses, "quotes.subject ".$adb->getLike()." ".$adb->quote($subject."%"));
 		$url_string .= "&subject=".$subject;
 	}
 	if(isset($potentialname) && $potentialname != "")
 	{
-		array_push($where_clauses, "potential.potentialname ".$adb->getLike()." ".PearDatabase::quote("%".$potentialname."%"));
+		array_push($where_clauses, "potential.potentialname ".$adb->getLike()." ".$adb->quote("%".$potentialname."%"));
 		$url_string .= "&potentialname=".$potentialname;
 	}
 	if(isset($accountname) && $accountname != "")
 	{
-		array_push($where_clauses, "account.accountname ".$adb->getLike()." ".PearDatabase::quote("%".$accountname."%"));
+		array_push($where_clauses, "account.accountname ".$adb->getLike()." ".$adb->quote("%".$accountname."%"));
 		$url_string .= "&accountname=".$accountname;
 	}
 
 	if(isset($quotestage) && $quotestage != "")
 	{
-		array_push($where_clauses, "quotes.quotestage ".$adb->getLike()." ".PearDatabase::quote("%".$quotestage."%"));
+		array_push($where_clauses, "quotes.quotestage ".$adb->getLike()." ".$adb->quote("%".$quotestage."%"));
 		$url_string .= "&quotestage=".$quotestage;
 	}
 	
@@ -117,7 +117,7 @@
 		}
 		$where .= "crmentity.smownerid IN(";
 		foreach ($assigned_user_id as $key => $val) {
-			$where .= PearDatabase::quote($val);
+			$where .= $adb->quote($val);
 			$where .= ($key == count($assigned_user_id) - 1) ? ")" : ", ";
 		}
 	}

Modified: vtigercrm/branches/4.2/modules/Quotes/Popup.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Quotes/Popup.php (original)
+++ vtigercrm/branches/4.2/modules/Quotes/Popup.php Mon Jun 12 14:04:34 2006
@@ -97,18 +97,18 @@
 	
 	if(isset($subject) && $subject != "") 
 	{
-		array_push($where_clauses, "quotes.subject ".$adb->getLike()." ".PearDatabase::quote($subject."%"));
+		array_push($where_clauses, "quotes.subject ".$adb->getLike()." ".$adb->quote($subject."%"));
 		$url_string .= "&subject=".$subject;
 	}
 	if(isset($accountname) && $accountname != "")
 	{
-		array_push($where_clauses, "account.accountname ".$adb->getLike()." ".PearDatabase::quote("%".$accountname."%"));
+		array_push($where_clauses, "account.accountname ".$adb->getLike()." ".$adb->quote("%".$accountname."%"));
 		$url_string .= "&accountname=".$accountname;
 	}
 
 	if(isset($quotestage) && $quotestage != "")
 	{
-		array_push($where_clauses, "quotes.quotestage ".$adb->getLike()." ".PearDatabase::quote("%".$quotestage."%"));
+		array_push($where_clauses, "quotes.quotestage ".$adb->getLike()." ".$adb->quote("%".$quotestage."%"));
 		$url_string .= "&quotestage=".$quotestage;
 	}
 	
@@ -126,7 +126,7 @@
 		}
 		$where .= "crmentity.smownerid IN(";
 		foreach ($assigned_user_id as $key => $val) {
-			$where .= PearDatabase::quote($val);
+			$where .= $adb->quote($val);
 			$where .= ($key == count($assigned_user_id) - 1) ? ")" : ", ";
 		}
 	}

Modified: vtigercrm/branches/4.2/modules/Reports/ReportRun.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Reports/ReportRun.php (original)
+++ vtigercrm/branches/4.2/modules/Reports/ReportRun.php Mon Jun 12 14:04:34 2006
@@ -181,7 +181,7 @@
                 {
                         if(trim($value) != "")
 			{
-				$rtvalue = " = ".PearDatabase::quote($value);
+				$rtvalue = " = ".$adb->quote($value);
 			}else
 			{
 				$rtvalue = " is NULL";
@@ -191,7 +191,7 @@
                 {
                         if(trim($value) != "")
 			{
-				$rtvalue = " <> ".PearDatabase::quote($value);
+				$rtvalue = " <> ".$adb->quote($value);
 			}else
 			{
 				$rtvalue = " is NOT NULL";
@@ -199,31 +199,31 @@
                 }
                 if($comparator == "s")
                 {
-                        $rtvalue = " ".$adb->getLike()." ".PearDatabase::quote($value."%");
+                        $rtvalue = " ".$adb->getLike()." ".$adb->quote($value."%");
                 }
                 if($comparator == "c")
                 {
-                        $rtvalue = " ".$adb->getLike()." ".PearDatabase::quote("%".$value."%");
+                        $rtvalue = " ".$adb->getLike()." ".$adb->quote("%".$value."%");
                 }
                 if($comparator == "k")
                 {
-                        $rtvalue = " not ".$adb->getLike()." ".PearDatabase::quote("%".$value."%");
+                        $rtvalue = " not ".$adb->getLike()." ".$adb->quote("%".$value."%");
                 }
                 if($comparator == "l")
                 {
-                        $rtvalue = " < ".PearDatabase::quote($value);
+                        $rtvalue = " < ".$adb->quote($value);
                 }
                 if($comparator == "g")
 								{
-                        $rtvalue = " > ".PearDatabase::quote($value);
+                        $rtvalue = " > ".$adb->quote($value);
                 }
                 if($comparator == "m")
                 {
-                        $rtvalue = " <= ".PearDatabase::quote($value);
+                        $rtvalue = " <= ".$adb->quote($value);
                 }
                 if($comparator == "h")
                 {
-                        $rtvalue = " >= ".PearDatabase::quote($value);
+                        $rtvalue = " >= ".$adb->quote($value);
                 }
 
                 $vtlog->logthis("ReportRun :: Successfully returned getAdvComparator","info");

Modified: vtigercrm/branches/4.2/modules/Users/ListView.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Users/ListView.php (original)
+++ vtigercrm/branches/4.2/modules/Users/ListView.php Mon Jun 12 14:04:34 2006
@@ -67,21 +67,21 @@
 	$where_clauses = Array();
 	
 	$adb->checkConnection();
-	if(isset($last_name) && $last_name != "") array_push($where_clauses, "last_name ".$adb->getLike()." ".PearDatabase::quote($last_name.'%')."");
-	if(isset($first_name) && $first_name != "") array_push($where_clauses, "first_name ".$adb->getLike()." ".PearDatabase::quote($first_name.'%')."");
-	if(isset($user_name) && $user_name != "") array_push($where_clauses, "user_name ".$adb->getLike()." ".PearDatabase::quote($user_name.'%')."");
-	if(isset($status) && $status != "") array_push($where_clauses, "status = ".PearDatabase::quote($status)."");
-	if(isset($is_admin) && $is_admin != "") array_push($where_clauses, "is_admin = ".PearDatabase::quote($is_admin)."");
-	if(isset($phone) && $phone != "") array_push($where_clauses, "(phone_home ".$adb->getLike()." ".PearDatabase::quote('%'.$phone.'%')." OR phone_mobile ".$adb->getLike()." ".PearDatabase::quote('%'.$phone.'%')." OR phone_work ".$adb->getLike()." ".PearDatabase::quote('%'.$phone.'%')." OR phone_other ".$adb->getLike()." ".PearDatabase::quote('%'.$phone.'%')." OR phone_fax ".$adb->getLike()." ".PearDatabase::quote('%'.$phone.'%').")");
-	if(isset($email) && $email != "") array_push($where_clauses, "(users.email1 ".$adb->getLike()." ".PearDatabase::quote($email.'%')." OR users.email2 ".$adb->getLike()." ".PearDatabase::quote($email.'%').")");
-	if(isset($yahoo_id) && $yahoo_id != "") array_push($where_clauses, "yahoo_id ".$adb->getLike()." ".PearDatabase::quote($yahoo_id.'%')."");
-	if(isset($department) && $department != "") array_push($where_clauses, "department ".$adb->getLike()." ".PearDatabase::quote($department.'%')."");
-	if(isset($title) && $title != "") array_push($where_clauses, "title ".$adb->getLike()." ".PearDatabase::quote($title.'%')."");
-	if(isset($address_street) && $address_street != "") array_push($where_clauses, "address_street ".$adb->getLike()." ".PearDatabase::quote($address_street.'%')."");
-	if(isset($address_city) && $address_city != "") array_push($where_clauses, "address_city ".$adb->getLike()." ".PearDatabase::quote($address_city.'%')."");
-	if(isset($address_state) && $address_state != "") array_push($where_clauses, "address_state ".$adb->getLike()." ".PearDatabase::quote($address_state.'%')."");
-	if(isset($address_postalcode) && $address_postalcode != "") array_push($where_clauses, "address_postalcode ".$adb->getLike()." ".PearDatabase::quote($address_postalcode.'%')."");
-	if(isset($address_country) && $address_country != "") array_push($where_clauses, "address_country ".$adb->getLike()." ".PearDatabase::quote($address_country.'%')."");
+	if(isset($last_name) && $last_name != "") array_push($where_clauses, "last_name ".$adb->getLike()." ".$adb->quote($last_name.'%')."");
+	if(isset($first_name) && $first_name != "") array_push($where_clauses, "first_name ".$adb->getLike()." ".$adb->quote($first_name.'%')."");
+	if(isset($user_name) && $user_name != "") array_push($where_clauses, "user_name ".$adb->getLike()." ".$adb->quote($user_name.'%')."");
+	if(isset($status) && $status != "") array_push($where_clauses, "status = ".$adb->quote($status)."");
+	if(isset($is_admin) && $is_admin != "") array_push($where_clauses, "is_admin = ".$adb->quote($is_admin)."");
+	if(isset($phone) && $phone != "") array_push($where_clauses, "(phone_home ".$adb->getLike()." ".$adb->quote('%'.$phone.'%')." OR phone_mobile ".$adb->getLike()." ".$adb->quote('%'.$phone.'%')." OR phone_work ".$adb->getLike()." ".$adb->quote('%'.$phone.'%')." OR phone_other ".$adb->getLike()." ".$adb->quote('%'.$phone.'%')." OR phone_fax ".$adb->getLike()." ".$adb->quote('%'.$phone.'%').")");
+	if(isset($email) && $email != "") array_push($where_clauses, "(users.email1 ".$adb->getLike()." ".$adb->quote($email.'%')." OR users.email2 ".$adb->getLike()." ".$adb->quote($email.'%').")");
+	if(isset($yahoo_id) && $yahoo_id != "") array_push($where_clauses, "yahoo_id ".$adb->getLike()." ".$adb->quote($yahoo_id.'%')."");
+	if(isset($department) && $department != "") array_push($where_clauses, "department ".$adb->getLike()." ".$adb->quote($department.'%')."");
+	if(isset($title) && $title != "") array_push($where_clauses, "title ".$adb->getLike()." ".$adb->quote($title.'%')."");
+	if(isset($address_street) && $address_street != "") array_push($where_clauses, "address_street ".$adb->getLike()." ".$adb->quote($address_street.'%')."");
+	if(isset($address_city) && $address_city != "") array_push($where_clauses, "address_city ".$adb->getLike()." ".$adb->quote($address_city.'%')."");
+	if(isset($address_state) && $address_state != "") array_push($where_clauses, "address_state ".$adb->getLike()." ".$adb->quote($address_state.'%')."");
+	if(isset($address_postalcode) && $address_postalcode != "") array_push($where_clauses, "address_postalcode ".$adb->getLike()." ".$adb->quote($address_postalcode.'%')."");
+	if(isset($address_country) && $address_country != "") array_push($where_clauses, "address_country ".$adb->getLike()." ".$adb->quote($address_country.'%')."");
 
 
 	$where = "";



From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 12 13:08:32 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 12 Jun 2006 20:08:32 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231287=3A?=
	=?utf-8?q?_Support_PHP_5?=
In-Reply-To: <076.34213a5e5121e9857e7ff28b81783537@vtiger.fosslabs.com>
References: <076.34213a5e5121e9857e7ff28b81783537@vtiger.fosslabs.com>
Message-ID: <085.3ca231f8ba3a9bc90ba2693d2133a24f@vtiger.fosslabs.com>

#1287: Support PHP 5
------------------------+---------------------------------------------------
  Reporter:  allanbush  |       Owner:  developer
      Type:  defect     |      Status:  new      
  Priority:  major      |   Milestone:  4.2.5    
 Component:  vtigercrm  |     Version:  4.2.4rc3 
Resolution:             |    Keywords:  php5     
------------------------+---------------------------------------------------
Comment (by allanbush):

 [6998] replaced the jpgraph dependency with ImageGraph which should work
 properly using both php4 and php5.


 No known php5 issues left.  Leaving this bug open until proper testing can
 be performed.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1287>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 12 13:30:35 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 12 Jun 2006 20:30:35 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7003 - in /vtigercrm/trunk:
 ./ cron/ data/ include/ include/Ajax/ include/ListView/ include/freetag/
 include/utils/ install/ modules/Accounts/ modules/Accounts/language/
 modules/Activities/ modules/Activities/language/ modules/Calendar/
 modules/Calendar/language/ modules/Campaigns/ modules/Contacts/
 modules/Contacts/language/ modules/CustomView/ modules/CustomView/language/
 modules/Dashboard/ modules/Dashboard/language/ modules/Emails/
 modules/Emails/language/ modules/Faq/ modules/Faq/language/
 modules/HelpDesk/ modules/HelpDesk/language/ modules/Home/ modules/Import/
 modules/Import/language/ modules/Invoice/ modules/Invoice/language/
 modules/Invoice/pdf_templates/ modules/Leads/ modules/Leads/language/
 modules/Migration/ modules/Migration/ModifyDatabase/ modules/Notes/
 modules/Notes/language/ modules/Portal/ modules/Potentials/
 modules/Potentials/language/ modules/PriceBooks/ modules/Products/
 modules/Products/language/ modules/PurchaseOrder/
 modules/PurchaseOrder/language/ modules/PurchaseOrder/pdf_templates/
 modules/Quotes/ modules/Quotes/language/ modules/Quotes/pdf_templates/
 modules/Reports/ modules/Reports/language/ modules/Rss/ modules/SalesOrder/
 modules/SalesOrder/language/ modules/SalesOrder/pdf_templates/
 modules/Settings/ modules/Settings/language/ modules/Users/
 modules/Users/language/ modules/Utilities/ modules/Vendors/
 modules/Webmails/ modules/Webmails/images/ modules/Webmails/language/ soap/
Message-ID: <20060612203044.567177E8BE5@vtiger.fosslabs.com>

Author: don
Date: Mon Jun 12 14:26:25 2006
New Revision: 7003

Log:
added the prefix vtiger_ in all table names

Modified:
    vtigercrm/trunk/cron/intimateTaskStatus.php
    vtigercrm/trunk/data/CRMEntity.php
    vtigercrm/trunk/data/SugarBean.php
    vtigercrm/trunk/data/Tracker.php
    vtigercrm/trunk/include/Ajax/TagCloud.php
    vtigercrm/trunk/include/ComboUtil.php
    vtigercrm/trunk/include/CustomFieldUtil.php
    vtigercrm/trunk/include/FormValidationUtil.php
    vtigercrm/trunk/include/ListView/ListView.php
    vtigercrm/trunk/include/PopulateComboValues.php
    vtigercrm/trunk/include/RelatedListView.php
    vtigercrm/trunk/include/freetag/freetag.class.php
    vtigercrm/trunk/include/utils/CommonUtils.php
    vtigercrm/trunk/include/utils/DeleteUtils.php
    vtigercrm/trunk/include/utils/DetailViewUtils.php
    vtigercrm/trunk/include/utils/EditViewUtils.php
    vtigercrm/trunk/include/utils/GetGroupUsers.php
    vtigercrm/trunk/include/utils/GetParentGroups.php
    vtigercrm/trunk/include/utils/GetUserGroups.php
    vtigercrm/trunk/include/utils/InventoryUtils.php
    vtigercrm/trunk/include/utils/ListViewUtils.php
    vtigercrm/trunk/include/utils/SearchUtils.php
    vtigercrm/trunk/include/utils/UserInfoUtil.php
    vtigercrm/trunk/include/utils/export.php
    vtigercrm/trunk/include/utils/utils.php
    vtigercrm/trunk/index.php
    vtigercrm/trunk/install/0welcome.php
    vtigercrm/trunk/install/1checkSystem.php
    vtigercrm/trunk/install/2setConfig.php
    vtigercrm/trunk/install/3confirmConfig.php
    vtigercrm/trunk/install/4createConfigFile.php
    vtigercrm/trunk/install/5createTables.inc.php
    vtigercrm/trunk/install/5createTables.php
    vtigercrm/trunk/install/populateSeedData.php
    vtigercrm/trunk/modules/Accounts/Account.php
    vtigercrm/trunk/modules/Accounts/Forms.php
    vtigercrm/trunk/modules/Accounts/ListViewTop.php
    vtigercrm/trunk/modules/Accounts/Merge.php
    vtigercrm/trunk/modules/Accounts/Popup_picker.php
    vtigercrm/trunk/modules/Accounts/Save.php
    vtigercrm/trunk/modules/Accounts/language/en_us.lang.php
    vtigercrm/trunk/modules/Activities/Activity.php
    vtigercrm/trunk/modules/Activities/EditView.php
    vtigercrm/trunk/modules/Activities/Event.php
    vtigercrm/trunk/modules/Activities/Forms.php
    vtigercrm/trunk/modules/Activities/GroupAllocationView.php
    vtigercrm/trunk/modules/Activities/ListView.php
    vtigercrm/trunk/modules/Activities/OpenListView.php
    vtigercrm/trunk/modules/Activities/RenderRelatedListUI.php
    vtigercrm/trunk/modules/Activities/Save.php
    vtigercrm/trunk/modules/Activities/language/en_us.lang.php
    vtigercrm/trunk/modules/Activities/updateRelations.php
    vtigercrm/trunk/modules/Calendar/Appointment.php
    vtigercrm/trunk/modules/Calendar/CalendarCommon.php
    vtigercrm/trunk/modules/Calendar/addEventUI.php
    vtigercrm/trunk/modules/Calendar/calendarLayout.php
    vtigercrm/trunk/modules/Calendar/disable_sharing.php
    vtigercrm/trunk/modules/Calendar/language/en_us.lang.php
    vtigercrm/trunk/modules/Calendar/updateCalendarSharing.php
    vtigercrm/trunk/modules/Campaigns/Campaign.php
    vtigercrm/trunk/modules/Campaigns/ListView.php
    vtigercrm/trunk/modules/Contacts/CallRelatedList.php
    vtigercrm/trunk/modules/Contacts/Contact.php
    vtigercrm/trunk/modules/Contacts/EditView.php
    vtigercrm/trunk/modules/Contacts/Forms.php
    vtigercrm/trunk/modules/Contacts/ListView.php
    vtigercrm/trunk/modules/Contacts/Merge.php
    vtigercrm/trunk/modules/Contacts/Save.php
    vtigercrm/trunk/modules/Contacts/chat.php
    vtigercrm/trunk/modules/Contacts/language/en_us.lang.php
    vtigercrm/trunk/modules/CustomView/CustomView.php
    vtigercrm/trunk/modules/CustomView/Delete.php
    vtigercrm/trunk/modules/CustomView/Forms.php
    vtigercrm/trunk/modules/CustomView/ListViewTop.php
    vtigercrm/trunk/modules/CustomView/PopulateCustomView.php
    vtigercrm/trunk/modules/CustomView/Save.php
    vtigercrm/trunk/modules/CustomView/SaveAction.php
    vtigercrm/trunk/modules/CustomView/SendMailAction.php
    vtigercrm/trunk/modules/CustomView/language/en_us.lang.php
    vtigercrm/trunk/modules/Dashboard/Chart_lead_source_by_outcome.php
    vtigercrm/trunk/modules/Dashboard/Chart_my_pipeline_by_sales_stage.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/Entity_charts.php
    vtigercrm/trunk/modules/Dashboard/Forms.php
    vtigercrm/trunk/modules/Dashboard/ReportsCharts.php
    vtigercrm/trunk/modules/Dashboard/display_charts.php
    vtigercrm/trunk/modules/Dashboard/language/en_us.lang.php
    vtigercrm/trunk/modules/Emails/Choose.php
    vtigercrm/trunk/modules/Emails/ChooseEmail.php
    vtigercrm/trunk/modules/Emails/DetailView.php
    vtigercrm/trunk/modules/Emails/EditView.php
    vtigercrm/trunk/modules/Emails/Email.php
    vtigercrm/trunk/modules/Emails/Forms.php
    vtigercrm/trunk/modules/Emails/ListView.php
    vtigercrm/trunk/modules/Emails/Save.php
    vtigercrm/trunk/modules/Emails/class.phpmailer.php
    vtigercrm/trunk/modules/Emails/class.smtp.php
    vtigercrm/trunk/modules/Emails/language/en_us.lang.php
    vtigercrm/trunk/modules/Emails/mail.php
    vtigercrm/trunk/modules/Emails/mailSelect.php
    vtigercrm/trunk/modules/Emails/mailbox.php
    vtigercrm/trunk/modules/Emails/mailsend.php
    vtigercrm/trunk/modules/Emails/sendmail.php
    vtigercrm/trunk/modules/Emails/updateRelations.php
    vtigercrm/trunk/modules/Emails/webmailsend.php
    vtigercrm/trunk/modules/Faq/Faq.php
    vtigercrm/trunk/modules/Faq/language/en_us.lang.php
    vtigercrm/trunk/modules/HelpDesk/Convert.php
    vtigercrm/trunk/modules/HelpDesk/ConvertAsFAQ.php
    vtigercrm/trunk/modules/HelpDesk/ConvertToEntities.php
    vtigercrm/trunk/modules/HelpDesk/Forms.php
    vtigercrm/trunk/modules/HelpDesk/HelpDesk.php
    vtigercrm/trunk/modules/HelpDesk/ListTickets.php
    vtigercrm/trunk/modules/HelpDesk/ListView.php
    vtigercrm/trunk/modules/HelpDesk/Merge.php
    vtigercrm/trunk/modules/HelpDesk/Save.php
    vtigercrm/trunk/modules/HelpDesk/TicketStatisticsUtil.php
    vtigercrm/trunk/modules/HelpDesk/language/en_us.lang.php
    vtigercrm/trunk/modules/Home/Forms.php
    vtigercrm/trunk/modules/Home/LastViewed.php
    vtigercrm/trunk/modules/Home/UnifiedSearch.php
    vtigercrm/trunk/modules/Home/home_rss.php
    vtigercrm/trunk/modules/Home/index.php
    vtigercrm/trunk/modules/Import/Forms.php
    vtigercrm/trunk/modules/Import/ImportAccount.php
    vtigercrm/trunk/modules/Import/ImportContact.php
    vtigercrm/trunk/modules/Import/ImportLead.php
    vtigercrm/trunk/modules/Import/ImportMap.php
    vtigercrm/trunk/modules/Import/ImportOpportunity.php
    vtigercrm/trunk/modules/Import/ImportProduct.php
    vtigercrm/trunk/modules/Import/ImportSave.php
    vtigercrm/trunk/modules/Import/ImportStep2.php
    vtigercrm/trunk/modules/Import/ImportStep3.php
    vtigercrm/trunk/modules/Import/UsersLastImport.php
    vtigercrm/trunk/modules/Import/index.php
    vtigercrm/trunk/modules/Import/language/en_us.lang.php
    vtigercrm/trunk/modules/Import/parse_utils.php
    vtigercrm/trunk/modules/Invoice/CreatePDF.php
    vtigercrm/trunk/modules/Invoice/EditView.php
    vtigercrm/trunk/modules/Invoice/Invoice.php
    vtigercrm/trunk/modules/Invoice/ListTopInvoice.php
    vtigercrm/trunk/modules/Invoice/Save.php
    vtigercrm/trunk/modules/Invoice/language/en_us.lang.php
    vtigercrm/trunk/modules/Invoice/pdf_templates/header.php
    vtigercrm/trunk/modules/Leads/CallRelatedList.php
    vtigercrm/trunk/modules/Leads/ConvertLead.php
    vtigercrm/trunk/modules/Leads/Forms.php
    vtigercrm/trunk/modules/Leads/Lead.php
    vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php
    vtigercrm/trunk/modules/Leads/ListViewTop.php
    vtigercrm/trunk/modules/Leads/Merge.php
    vtigercrm/trunk/modules/Leads/Save.php
    vtigercrm/trunk/modules/Leads/language/en_us.lang.php
    vtigercrm/trunk/modules/Migration/Migration.php
    vtigercrm/trunk/modules/Migration/MigrationCheck.php
    vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php
    vtigercrm/trunk/modules/Migration/ModifyDatabase/MigrationInfo.php
    vtigercrm/trunk/modules/Migration/updateCurrency.php
    vtigercrm/trunk/modules/Notes/EditView.php
    vtigercrm/trunk/modules/Notes/Forms.php
    vtigercrm/trunk/modules/Notes/Note.php
    vtigercrm/trunk/modules/Notes/Save.php
    vtigercrm/trunk/modules/Notes/language/en_us.lang.php
    vtigercrm/trunk/modules/Portal/ListView.php
    vtigercrm/trunk/modules/Portal/Popup.php
    vtigercrm/trunk/modules/Portal/Portal.php
    vtigercrm/trunk/modules/Potentials/Charts.php
    vtigercrm/trunk/modules/Potentials/EditView.php
    vtigercrm/trunk/modules/Potentials/Forms.php
    vtigercrm/trunk/modules/Potentials/ListView.php
    vtigercrm/trunk/modules/Potentials/ListViewTop.php
    vtigercrm/trunk/modules/Potentials/Opportunity.php
    vtigercrm/trunk/modules/Potentials/Save.php
    vtigercrm/trunk/modules/Potentials/language/en_us.lang.php
    vtigercrm/trunk/modules/Potentials/updateRelations.php
    vtigercrm/trunk/modules/PriceBooks/PriceBook.php
    vtigercrm/trunk/modules/Products/AddProductToPriceBooks.php
    vtigercrm/trunk/modules/Products/AddProductsToPriceBook.php
    vtigercrm/trunk/modules/Products/DeletePriceBookProductRel.php
    vtigercrm/trunk/modules/Products/EditView.php
    vtigercrm/trunk/modules/Products/Forms.php
    vtigercrm/trunk/modules/Products/Product.php
    vtigercrm/trunk/modules/Products/Save.php
    vtigercrm/trunk/modules/Products/UpdateListPrice.php
    vtigercrm/trunk/modules/Products/addPbProductRelToDB.php
    vtigercrm/trunk/modules/Products/language/en_us.lang.php
    vtigercrm/trunk/modules/Products/updateRelations.php
    vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php
    vtigercrm/trunk/modules/PurchaseOrder/EditView.php
    vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php
    vtigercrm/trunk/modules/PurchaseOrder/Save.php
    vtigercrm/trunk/modules/PurchaseOrder/language/en_us.lang.php
    vtigercrm/trunk/modules/PurchaseOrder/pdf_templates/header.php
    vtigercrm/trunk/modules/Quotes/CreatePDF.php
    vtigercrm/trunk/modules/Quotes/EditView.php
    vtigercrm/trunk/modules/Quotes/ListTopQuotes.php
    vtigercrm/trunk/modules/Quotes/Quote.php
    vtigercrm/trunk/modules/Quotes/Save.php
    vtigercrm/trunk/modules/Quotes/language/en_us.lang.php
    vtigercrm/trunk/modules/Quotes/pdf_templates/header.php
    vtigercrm/trunk/modules/Reports/ChangeFolder.php
    vtigercrm/trunk/modules/Reports/Delete.php
    vtigercrm/trunk/modules/Reports/DeleteReportFolder.php
    vtigercrm/trunk/modules/Reports/PopulateReports.php
    vtigercrm/trunk/modules/Reports/ReportColumns.php
    vtigercrm/trunk/modules/Reports/ReportRun.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/language/en_us.lang.php
    vtigercrm/trunk/modules/Rss/ListView.php
    vtigercrm/trunk/modules/Rss/Popup.php
    vtigercrm/trunk/modules/Rss/Rss.php
    vtigercrm/trunk/modules/Rss/Star.php
    vtigercrm/trunk/modules/SalesOrder/CreateSOPDF.php
    vtigercrm/trunk/modules/SalesOrder/EditView.php
    vtigercrm/trunk/modules/SalesOrder/ListTopSalesOrder.php
    vtigercrm/trunk/modules/SalesOrder/SalesOrder.php
    vtigercrm/trunk/modules/SalesOrder/Save.php
    vtigercrm/trunk/modules/SalesOrder/language/en_us.lang.php
    vtigercrm/trunk/modules/SalesOrder/pdf_templates/header.php
    vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php
    vtigercrm/trunk/modules/Settings/AddMailAccount.php
    vtigercrm/trunk/modules/Settings/BackupServerConfig.php
    vtigercrm/trunk/modules/Settings/CurrencyDelete.php
    vtigercrm/trunk/modules/Settings/CurrencyDeleteStep1.php
    vtigercrm/trunk/modules/Settings/CurrencyEditView.php
    vtigercrm/trunk/modules/Settings/CurrencyListView.php
    vtigercrm/trunk/modules/Settings/DeleteCustomField.php
    vtigercrm/trunk/modules/Settings/DeleteLeadCustomFieldMapping.php
    vtigercrm/trunk/modules/Settings/DeleteMailAccount.php
    vtigercrm/trunk/modules/Settings/EditCompanyDetails.php
    vtigercrm/trunk/modules/Settings/EditFieldBlock.php
    vtigercrm/trunk/modules/Settings/EmailConfig.php
    vtigercrm/trunk/modules/Settings/Forms.php
    vtigercrm/trunk/modules/Settings/LeadCustomFieldMapping.php
    vtigercrm/trunk/modules/Settings/ListLeadCustomFieldMapping.php
    vtigercrm/trunk/modules/Settings/ListModuleOwners.php
    vtigercrm/trunk/modules/Settings/OrganizationConfig.php
    vtigercrm/trunk/modules/Settings/PickList.php
    vtigercrm/trunk/modules/Settings/Save.php
    vtigercrm/trunk/modules/Settings/SaveCompany.php
    vtigercrm/trunk/modules/Settings/SaveConvertLead.php
    vtigercrm/trunk/modules/Settings/SaveCurrencyInfo.php
    vtigercrm/trunk/modules/Settings/SaveMailAccount.php
    vtigercrm/trunk/modules/Settings/SettingsSubMenu.php
    vtigercrm/trunk/modules/Settings/TaxConfig.php
    vtigercrm/trunk/modules/Settings/add2db.php
    vtigercrm/trunk/modules/Settings/downloadfile.php
    vtigercrm/trunk/modules/Settings/language/en_us.lang.php
    vtigercrm/trunk/modules/Users/Announcements.php
    vtigercrm/trunk/modules/Users/Authenticate.php
    vtigercrm/trunk/modules/Users/ChangePassword.php
    vtigercrm/trunk/modules/Users/CreateProfile.php
    vtigercrm/trunk/modules/Users/CreateProfile1.php
    vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php
    vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
    vtigercrm/trunk/modules/Users/Delete.php
    vtigercrm/trunk/modules/Users/DeleteGroup.php
    vtigercrm/trunk/modules/Users/DeleteUser.php
    vtigercrm/trunk/modules/Users/DetailView.php
    vtigercrm/trunk/modules/Users/EditHomeOrder.php
    vtigercrm/trunk/modules/Users/EditInventoryNotification.php
    vtigercrm/trunk/modules/Users/EditNotification.php
    vtigercrm/trunk/modules/Users/EditView.php
    vtigercrm/trunk/modules/Users/Forms.php
    vtigercrm/trunk/modules/Users/ListProfiles.php
    vtigercrm/trunk/modules/Users/Listhistory.php
    vtigercrm/trunk/modules/Users/Login.php
    vtigercrm/trunk/modules/Users/LoginHistory.php
    vtigercrm/trunk/modules/Users/Logout.php
    vtigercrm/trunk/modules/Users/OrgSharingDetailView.php
    vtigercrm/trunk/modules/Users/OrganizationTermsandConditions.php
    vtigercrm/trunk/modules/Users/ProfileDeleteStep1.php
    vtigercrm/trunk/modules/Users/RoleDetailView.php
    vtigercrm/trunk/modules/Users/RoleDragDrop.php
    vtigercrm/trunk/modules/Users/RolePopup.php
    vtigercrm/trunk/modules/Users/Save.php
    vtigercrm/trunk/modules/Users/SaveGroup.php
    vtigercrm/trunk/modules/Users/SaveInventoryNotification.php
    vtigercrm/trunk/modules/Users/SaveNotification.php
    vtigercrm/trunk/modules/Users/SaveOrgSharing.php
    vtigercrm/trunk/modules/Users/SaveProfile.php
    vtigercrm/trunk/modules/Users/SaveRole.php
    vtigercrm/trunk/modules/Users/TabCustomise.php
    vtigercrm/trunk/modules/Users/UpdateDefaultFieldLevelAccess.php
    vtigercrm/trunk/modules/Users/UpdateProfileChanges.php
    vtigercrm/trunk/modules/Users/UpdateTab.php
    vtigercrm/trunk/modules/Users/User.php
    vtigercrm/trunk/modules/Users/UserDeleteStep1.php
    vtigercrm/trunk/modules/Users/UsersAjax.php
    vtigercrm/trunk/modules/Users/add2db.php
    vtigercrm/trunk/modules/Users/binaryfilelist.php
    vtigercrm/trunk/modules/Users/createrole.php
    vtigercrm/trunk/modules/Users/deleteemailtemplate.php
    vtigercrm/trunk/modules/Users/deletewordtemplate.php
    vtigercrm/trunk/modules/Users/detailviewemailtemplate.php
    vtigercrm/trunk/modules/Users/downloadfile.php
    vtigercrm/trunk/modules/Users/editemailtemplate.php
    vtigercrm/trunk/modules/Users/language/en_us.lang.php
    vtigercrm/trunk/modules/Users/listemailtemplates.php
    vtigercrm/trunk/modules/Users/listinventorynotifications.php
    vtigercrm/trunk/modules/Users/listnotificationschedulers.php
    vtigercrm/trunk/modules/Users/listroles.php
    vtigercrm/trunk/modules/Users/listwordtemplates.php
    vtigercrm/trunk/modules/Users/lookupemailtemplates.php
    vtigercrm/trunk/modules/Users/massChangeStatus.php
    vtigercrm/trunk/modules/Users/massdelete.php
    vtigercrm/trunk/modules/Users/populatetemplate.php
    vtigercrm/trunk/modules/Users/profilePrivileges.php
    vtigercrm/trunk/modules/Users/saveemailtemplate.php
    vtigercrm/trunk/modules/Users/savetermsandconditions.php
    vtigercrm/trunk/modules/Users/updateLeadDBStatus.php
    vtigercrm/trunk/modules/Users/updateNotificationSchedulers.php
    vtigercrm/trunk/modules/Utilities/Merge.php
    vtigercrm/trunk/modules/Vendors/Vendor.php
    vtigercrm/trunk/modules/Vendors/updateRelations.php
    vtigercrm/trunk/modules/Webmails/CallRelatedList.php
    vtigercrm/trunk/modules/Webmails/ListView.php
    vtigercrm/trunk/modules/Webmails/Save.php
    vtigercrm/trunk/modules/Webmails/Webmail.php
    vtigercrm/trunk/modules/Webmails/dlAttachments.php
    vtigercrm/trunk/modules/Webmails/images/index.php
    vtigercrm/trunk/modules/Webmails/language/en_us.lang.php
    vtigercrm/trunk/soap/contactserialize.php
    vtigercrm/trunk/soap/customerportal.php
    vtigercrm/trunk/soap/vtigerolservice.php
    vtigercrm/trunk/soap/webforms.php

Modified: vtigercrm/trunk/cron/intimateTaskStatus.php
==============================================================================
--- vtigercrm/trunk/cron/intimateTaskStatus.php (original)
+++ vtigercrm/trunk/cron/intimateTaskStatus.php Mon Jun 12 14:26:25 2006
@@ -16,20 +16,20 @@
 $selecteddb = $dbconfig['db_name'];
 mysql_select_db($selecteddb,$db);
 
-$emailresult = mysql_query("SELECT email1 from users",$db);
+$emailresult = mysql_query("SELECT email1 from vtiger_users",$db);
 $emailid = mysql_fetch_row($emailresult);
 $emailaddress = $emailid[0];
-$mailserveresult = mysql_query("SELECT server,server_username,server_password FROM systems",$db);
+$mailserveresult = mysql_query("SELECT server,server_username,server_password FROM vtiger_systems",$db);
 $mailrow = mysql_fetch_row($mailserveresult);
 $mailserver = $mailrow[0];
 
 $mailuname = $mailrow[1];
 $mailpwd = $mailrow[1];
 
-//query the notificationscheduler table and get data for those notifications which are active
+//query the vtiger_notificationscheduler vtiger_table and get data for those notifications which are active
 
 
-$sql = "select active from notificationscheduler where schedulednotificationid=1";
+$sql = "select active from vtiger_notificationscheduler where schedulednotificationid=1";
 $result = mysql_query($sql);
 
 $activevalue = mysql_fetch_row($result);
@@ -39,7 +39,7 @@
 
 //get all those activities where the status is not completed even after the passing of 24 hours
 $today = date("Ymd"); 
-$result = mysql_query("select (activity.date_start +1) from activity where activity.status !='Completed' and ".$today." > (activity.date_start+1)",$db);
+$result = mysql_query("select (vtiger_activity.date_start +1) from vtiger_activity where vtiger_activity.status !='Completed' and ".$today." > (vtiger_activity.date_start+1)",$db);
 while ($myrow = mysql_fetch_row($result))
 {
   $status=$myrow[0];
@@ -51,13 +51,13 @@
 }
 
 //Big Deal Alert
-$sql = "select active from notificationscheduler where schedulednotificationid=2";
+$sql = "select active from vtiger_notificationscheduler where schedulednotificationid=2";
 $result = mysql_query($sql);
 
 $activevalue = mysql_fetch_row($result);
 if($activevalue[0] == 1)
 {
-$result = mysql_query("SELECT sales_stage,amount FROM potential",$db);
+$result = mysql_query("SELECT sales_stage,amount FROM vtiger_potential",$db);
 while ($myrow = mysql_fetch_row($result))
 {
   $amount=$myrow[1];
@@ -72,13 +72,13 @@
 }
 
 //Pending tickets
-$sql = "select active from notificationscheduler where schedulednotificationid=3";
+$sql = "select active from vtiger_notificationscheduler where schedulednotificationid=3";
 $result = mysql_query($sql);
 
 $activevalue = mysql_fetch_row($result);
 if($activevalue[0] == 1)
 {
-$result = mysql_query("SELECT status,ticketid FROM troubletickets",$db);
+$result = mysql_query("SELECT status,ticketid FROM vtiger_troubletickets",$db);
 while ($myrow = mysql_fetch_row($result))
 {
   $status=$myrow[0];
@@ -94,15 +94,15 @@
 
 }
 
-//Too many tickets related to a particular account/company causing concern
-$sql = "select active from notificationscheduler where schedulednotificationid=4";
+//Too many tickets related to a particular vtiger_account/company causing concern
+$sql = "select active from vtiger_notificationscheduler where schedulednotificationid=4";
 $result = mysql_query($sql);
 
 $activevalue = mysql_fetch_row($result);
 if($activevalue[0] == 1)
 {
 
-$result = mysql_query("SELECT status,troubletickets.ticketid FROM troubletickets where status!='Completed'",$db);
+$result = mysql_query("SELECT status,vtiger_troubletickets.ticketid FROM vtiger_troubletickets where status!='Completed'",$db);
 while ($myrow = mysql_fetch_row($result))
 {
   $status=$myrow[0];
@@ -114,13 +114,13 @@
 }
 
 //Support Starting
-$sql = "select active from notificationscheduler where schedulednotificationid=5";
+$sql = "select active from vtiger_notificationscheduler where schedulednotificationid=5";
 $result = mysql_query($sql);
 
 $activevalue = mysql_fetch_row($result);
 if($activevalue[0] == 1)
 {
-$result = mysql_query("SELECT start_date FROM products",$db);
+$result = mysql_query("SELECT start_date FROM vtiger_products",$db);
 while ($myrow = mysql_fetch_row($result))
 {
   $status=$myrow[0];
@@ -130,14 +130,14 @@
 }
 
 //Support ending
-$sql = "select active from notificationscheduler where schedulednotificationid=6";
+$sql = "select active from vtiger_notificationscheduler where schedulednotificationid=6";
 $result = mysql_query($sql);
 
 $activevalue = mysql_fetch_row($result);
 if($activevalue[0] == 1)
 {
 
-$result = mysql_query("SELECT expiry_date from products",$db);
+$result = mysql_query("SELECT expiry_date from vtiger_products",$db);
 while ($myrow = mysql_fetch_row($result))
 {
   $status=$myrow[0];

Modified: vtigercrm/trunk/data/CRMEntity.php
==============================================================================
--- vtigercrm/trunk/data/CRMEntity.php (original)
+++ vtigercrm/trunk/data/CRMEntity.php Mon Jun 12 14:26:25 2006
@@ -31,9 +31,9 @@
   /**
    * This method implements a generic insert and update logic for any SugarBean
    * This method only works for subclasses that implement the same variable names.
-   * This method uses the presence of an id field that is not null to signify and update.
-   * The id field should not be set otherwise.
-   * todo - Add support for field type validation and encoding of parameters.
+   * This method uses the presence of an id vtiger_field that is not null to signify and update.
+   * The id vtiger_field should not be set otherwise.
+   * todo - Add support for vtiger_field type validation and encoding of parameters.
    * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
    * All Rights Reserved.
    * Contributor(s): ______________________________________..
@@ -68,19 +68,19 @@
 
 	foreach($this->tab_name as $table_name)
 	{
-		if($table_name == "crmentity")
+		if($table_name == "vtiger_crmentity")
 		{
 			$this->insertIntoCrmEntity($module);
 		}
-		elseif($table_name == "salesmanactivityrel")
+		elseif($table_name == "vtiger_salesmanactivityrel")
 		{
 			$this->insertIntoSmActivityRel($module);
 		}
 		//added by raju
-		elseif($table_name=="seactivityrel" )
+		elseif($table_name=="vtiger_seactivityrel" )
 		{
 			if($module=="Emails" && $_REQUEST['smodule']!='webmails')
-			//modified by Richie as raju's implementation broke the feature for addition of webmail to crmentity.need to be more careful in future while integrating code
+			//modified by Richie as raju's implementation broke the feature for addition of webmail to vtiger_crmentity.need to be more careful in future while integrating code
 			//if($_REQUEST['smodule']!='webmails' && $_REQUEST['smodule'] != '')
 			{
 				if($_REQUEST['currentid']!='')
@@ -95,9 +95,9 @@
 				if($_REQUEST['module'] != 'Emails' && $_REQUEST['module'] != 'Webmails')
 				{
 					if(!$parentid) {
-						$parentid = $adb->getUniqueID('seactivityrel');
+						$parentid = $adb->getUniqueID('vtiger_seactivityrel');
 					}
-					$mysql='insert into seactivityrel values('.$parentid.','.$actid.')';
+					$mysql='insert into vtiger_seactivityrel values('.$parentid.','.$actid.')';
 					$adb->query($mysql);
 				}
 				else
@@ -107,11 +107,11 @@
 					{
 						$realid=explode("@",$myids[$i]);
 						$mycrmid=$realid[0];
-						//added to handle the relationship of emails with users
+						//added to handle the relationship of emails with vtiger_users
 						if($realid[1] == -1)
-							$mysql='insert into salesmanactivityrel values('.$mycrmid.','.$actid.')';
+							$mysql='insert into vtiger_salesmanactivityrel values('.$mycrmid.','.$actid.')';
 						else	
-							$mysql='insert into seactivityrel values('.$mycrmid.','.$actid.')';
+							$mysql='insert into vtiger_seactivityrel values('.$mycrmid.','.$actid.')';
 						$adb->query($mysql);
 					}
 				}
@@ -128,7 +128,7 @@
 				}
 			}			
 		}
-		elseif($table_name == "seticketsrel" || $table_name ==  "seproductsrel" || $table_name ==  "senotesrel")
+		elseif($table_name == "vtiger_seticketsrel" || $table_name ==  "vtiger_seproductsrel" || $table_name ==  "vtiger_senotesrel")
 		{
 			if(isset($this->column_fields['parent_id']) && $this->column_fields['parent_id'] != '')//raju - mass mailing ends
 			{
@@ -139,7 +139,7 @@
 				$this->deleteRelation($table_name);
 			}
 		}
-		elseif($table_name ==  "cntactivityrel")
+		elseif($table_name ==  "vtiger_cntactivityrel")
 		{
 			if(isset($this->column_fields['contact_id']) && $this->column_fields['contact_id'] != '')
 			{
@@ -151,22 +151,22 @@
 			}
 
 		}
-		elseif($table_name ==  "ticketcomments")
+		elseif($table_name ==  "vtiger_ticketcomments")
 		{
                 	$this->insertIntoTicketCommentTable($table_name, $module);
 		}
-		elseif($table_name ==  "faqcomments")
+		elseif($table_name ==  "vtiger_faqcomments")
 		{
                 	$this->insertIntoFAQCommentTable($table_name, $module);
 		}
-		elseif($table_name == "activity_reminder")
+		elseif($table_name == "vtiger_activity_reminder")
 		{
 			if($recur_type == "--None--")
 			{
 				$this->insertIntoReminderTable($table_name,$module,"");
 			}
 		}
-		elseif($table_name == "recurringevents") // Code included by Jaguar -  starts
+		elseif($table_name == "vtiger_recurringevents") // Code included by Jaguar -  starts
 		{
 			$recur_type = trim($_REQUEST['recurringtype']);
 			if($recur_type != "--None--"  && $recur_type != '')
@@ -175,7 +175,7 @@
 			}		
 		}// Code included by Jaguar - Ends
 		// Code included by Minnie  -  starts	
-		elseif($table_name == "invitees") 
+		elseif($table_name == "vtiger_invitees") 
 		{
 			if($invitees_array != '')
 			{
@@ -183,11 +183,11 @@
 			}
 		}
 		// Code included by Minnie  -  Ends
-		elseif($table_name == 'producttaxrel')
+		elseif($table_name == 'vtiger_producttaxrel')
 		{
 			$this->insertTaxInformation($table_name, $module);
 		}
-		elseif($table_name == 'attachments')
+		elseif($table_name == 'vtiger_attachments')
 		{
 			$this->insertIntoAttachment($this->id,$module);
 		}
@@ -226,7 +226,7 @@
 			$data = base64_encode(fread(fopen($filedata, "r"), $filesize));
 		}
 		
-		$current_id = $adb->getUniqueID("crmentity");
+		$current_id = $adb->getUniqueID("vtiger_crmentity");
 
 		if($module=='Emails') 
 		{ 
@@ -241,22 +241,22 @@
 		$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 vtiger_crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime,modifiedtime) values(".$current_id.",".$current_user->id.",".$ownerid.",'".$module." Attachment','"."',".$adb->formatString("vtiger_crmentity","createdtime",$date_var).",".$adb->formatString("vtiger_crmentity","modifiedtime",$date_var).")";
 		$adb->query($sql1);
 
-		$sql2="insert into attachments(attachmentsid, name, description, type) values(".$current_id.",'".$filename."','"."','".$filetype."')";
+		$sql2="insert into vtiger_attachments(attachmentsid, name, description, type) values(".$current_id.",'".$filename."','"."','".$filetype."')";
 		$result=$adb->query($sql2);
 
 		//TODO -- instead of put contents in db now we should store the file in harddisk
 
-		$sql3='insert into seattachmentsrel values('.$id.','.$current_id.')';
+		$sql3='insert into vtiger_seattachmentsrel values('.$id.','.$current_id.')';
 		$adb->query($sql3);
 	}
 
 
 	/**
-	 *      This function is used to add the attachments. This will call the function uploadAndSaveFile which will upload the attachment into the server and save that attachment information in the database.
-	 *      @param int $id  - entity id to which the files to be uploaded
+	 *      This function is used to add the vtiger_attachments. This will call the function uploadAndSaveFile which will upload the attachment into the server and save that attachment information in the database.
+	 *      @param int $id  - entity id to which the vtiger_files to be uploaded
 	 *      @param string $module  - the current module name
 	*/
 	function insertIntoAttachment($id,$module)
@@ -272,17 +272,17 @@
 			}
 		}
 
-		//Remove the deleted attachments from db - Products
+		//Remove the deleted vtiger_attachments from db - Products
 		if($module == 'Products' && $_REQUEST['del_file_list'] != '')
 		{
 			$del_file_list = explode("###",trim($_REQUEST['del_file_list'],"###"));
 			foreach($del_file_list as $del_file_name)
 			{
-				$attach_res = $adb->query("select attachments.attachmentsid from attachments inner join seattachmentsrel on attachments.attachmentsid=seattachmentsrel.attachmentsid where crmid=$id and name=\"$del_file_name\"");
+				$attach_res = $adb->query("select vtiger_attachments.attachmentsid from vtiger_attachments inner join vtiger_seattachmentsrel on vtiger_attachments.attachmentsid=vtiger_seattachmentsrel.attachmentsid where crmid=$id and name=\"$del_file_name\"");
 				$attachments_id = $adb->query_result($attach_res,0,'attachmentsid');
 				
-				$del_res1 = $adb->query("delete from attachments where attachmentsid=$attachments_id");
-				$del_res2 = $adb->query("delete from seattachmentsrel where attachmentsid=$attachments_id");
+				$del_res1 = $adb->query("delete from vtiger_attachments where attachmentsid=$attachments_id");
+				$del_res2 = $adb->query("delete from vtiger_seattachmentsrel where attachmentsid=$attachments_id");
 			}
 		}
 
@@ -344,35 +344,35 @@
 
 		if($save_file == 'true')
 		{
-			$current_id = $adb->getUniqueID("crmentity");
-
-			//This is only to update the attached filename in the notes table for the Notes module
+			$current_id = $adb->getUniqueID("vtiger_crmentity");
+
+			//This is only to update the attached filename in the vtiger_notes vtiger_table for the Notes module
 			if($module=='Notes')
 			{
-				$sql="update notes set filename='".$filename."' where notesid = ".$id;
+				$sql="update vtiger_notes set filename='".$filename."' where notesid = ".$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 vtiger_crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime,modifiedtime) values(".$current_id.",".$current_user->id.",".$ownerid.",'".$module." Attachment','".$this->column_fields['description']."',".$adb->formatString("vtiger_crmentity","createdtime",$date_var).",".$adb->formatString("vtiger_crmentity","modifiedtime",$date_var).")";
 			$adb->query($sql1);
 
-			$sql2="insert into attachments(attachmentsid, name, description, type, path) values(".$current_id.",'".$filename."','".$this->column_fields['description']."','".$filetype."','".$upload_file_path."')";
+			$sql2="insert into vtiger_attachments(attachmentsid, name, description, type, path) values(".$current_id.",'".$filename."','".$this->column_fields['description']."','".$filetype."','".$upload_file_path."')";
 			$result=$adb->query($sql2);
 
 			if($_REQUEST['mode'] == 'edit')
 			{
 				if($id != '' && $_REQUEST['fileid'] != '')
 				{
-					$delquery = 'delete from seattachmentsrel where crmid = '.$id.' and attachmentsid = '.$_REQUEST['fileid'];
+					$delquery = 'delete from vtiger_seattachmentsrel where crmid = '.$id.' and attachmentsid = '.$_REQUEST['fileid'];
 					$adb->query($delquery);
 				}
 			}
 			if($module == 'Notes')
 			{
-				$query = "delete from seattachmentsrel where crmid = ".$id;
+				$query = "delete from vtiger_seattachmentsrel where crmid = ".$id;
 				$adb->query($query);
 			}
-			$sql3='insert into seattachmentsrel values('.$id.','.$current_id.')';
+			$sql3='insert into vtiger_seattachmentsrel values('.$id.','.$current_id.')';
 			$adb->query($sql3);
 		}
 		else
@@ -413,31 +413,31 @@
 	}
 	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;
+		$description_val = from_html($adb->formatString("vtiger_crmentity","description",$this->column_fields['description']),($insertion_mode == 'edit')?true:false);
+		$sql = "update vtiger_crmentity set smownerid=".$ownerid.",modifiedby=".$current_user->id.",description=".$description_val.", modifiedtime=".$adb->formatString("vtiger_crmentity","modifiedtime",$date_var)." where crmid=".$this->id;
 
 		$adb->query($sql);
-		$sql1 ="delete from ownernotify where crmid=".$this->id;
+		$sql1 ="delete from vtiger_ownernotify where crmid=".$this->id;
 		$adb->query($sql1);
 		if($ownerid != $current_user->id)
 		{
-			$sql1 = "insert into ownernotify values(".$this->id.",".$ownerid.",null)";
+			$sql1 = "insert into vtiger_ownernotify values(".$this->id.",".$ownerid.",null)";
 			$adb->query($sql1);
 		}
 	}
 	else
 	{
 		//if this is the create mode and the group allocation is chosen, then do the following
-		$current_id = $adb->getUniqueID("crmentity");
+		$current_id = $adb->getUniqueID("vtiger_crmentity");
 		$_REQUEST['currentid']=$current_id;
 
-		$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.",".$adb->formatDate($date_var).",".$adb->formatDate($date_var).")";
+		$description_val = from_html($adb->formatString("vtiger_crmentity","description",$this->column_fields['description']),($insertion_mode == 'edit')?true:false);
+		$sql = "insert into vtiger_crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime,modifiedtime) values('".$current_id."','".$current_user->id."','".$ownerid."','".$module."',".$description_val.",".$adb->formatDate($date_var).",".$adb->formatDate($date_var).")";
 		$adb->query($sql);
 		$this->id = $current_id;
 	}
 
-	//$sql = "insert into crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime,modifiedtime) values(".$current_id.",".$current_user->id.",".$ownerid.",'".$module."','".$this->column_fields['description']."',".$adb->formatString("crmentity","createdtime",$date_var).",".$adb->formatString("crmentity","modifiedtime",$date_var).")";
+	//$sql = "insert into vtiger_crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime,modifiedtime) values(".$current_id.",".$current_user->id.",".$ownerid.",'".$module."','".$this->column_fields['description']."',".$adb->formatString("crmentity","createdtime",$date_var).",".$adb->formatString("crmentity","modifiedtime",$date_var).")";
 	//$adb->query($sql);
 	//echo $sql;
 	//$this->id = $current_id;
@@ -452,11 +452,11 @@
     if($this->mode == 'edit')
     {
 
-      $sql = "delete from salesmanactivityrel where activityid=".$this->id." and smid = ".$this->column_fields['assigned_user_id']."";
+      $sql = "delete from vtiger_salesmanactivityrel where activityid=".$this->id." and smid = ".$this->column_fields['assigned_user_id']."";
       $adb->query($sql);
 
     }
-	$sql_qry = "insert into salesmanactivityrel (smid,activityid) values(".$this->column_fields['assigned_user_id'].",".$this->id.")";
+	$sql_qry = "insert into vtiger_salesmanactivityrel (smid,activityid) values(".$this->column_fields['assigned_user_id'].",".$this->id.")";
     $adb->query($sql_qry);
 
   }
@@ -467,8 +467,8 @@
     global $current_user;
     $ticketid = $id;
     //Updating History
-    $tktresult = $adb->query("select * from troubletickets where ticketid='".$ticketid."'");
-    $crmresult = $adb->query("select * from crmentity where crmid='".$ticketid."'");
+    $tktresult = $adb->query("select * from vtiger_troubletickets where ticketid='".$ticketid."'");
+    $crmresult = $adb->query("select * from vtiger_crmentity where crmid='".$ticketid."'");
     $updatelog = $adb->query_result($tktresult,0,"update_log");
     $old_user_id = $adb->query_result($crmresult,0,"smownerid");
     $old_status = $adb->query_result($tktresult,0,"status");
@@ -518,11 +518,11 @@
   function insertIntoEntityTable($table_name, $module)
   {
 	  global $log;	
-	   $log->info("function insertIntoCrmEntity ".$module.' table name ' .$table_name);
+	   $log->info("function insertIntoCrmEntity ".$module.' vtiger_table name ' .$table_name);
 	  global $adb;
 	  $insertion_mode = $this->mode;
 
-	  //Checkin whether an entry is already is present in the table to update
+	  //Checkin whether an entry is already is present in the vtiger_table to update
 	  if($insertion_mode == 'edit')
 	  {
 		  $check_query = "select * from ".$table_name." where ".$this->tab_name_index[$table_name]."=".$this->id;
@@ -547,7 +547,7 @@
 	  }
 
 	  $tabid= getTabid($module);	
-	  $sql = "select * from field where tabid=".$tabid." and tablename='".$table_name."' and displaytype in (1,3)"; 
+	  $sql = "select * from vtiger_field where tabid=".$tabid." and tablename='".$table_name."' and displaytype in (1,3)"; 
 	  $result = $adb->query($sql);
 	  $noofrows = $adb->num_rows($result);
 	  for($i=0; $i<$noofrows; $i++)
@@ -616,18 +616,18 @@
 		  if($insertion_mode == 'edit')
 		  {
 			  //code by richie starts
-			  if(($table_name == "troubletickets") && ($columname == "update_log"))
+			  if(($table_name == "vtiger_troubletickets") && ($columname == "update_log"))
 			  {
 				  $fldvalue = $this->constructUpdateLog($this->id);
 				  $fldvalue = from_html($adb->formatString($table_name,$columname,$fldvalue),($insertion_mode == 'edit')?true:false);
 			  }
 			  //code by richie ends
 
-			  if($table_name == 'notes' && $columname == 'filename' && $_FILES['filename']['name'] == '')
+			  if($table_name == 'vtiger_notes' && $columname == 'filename' && $_FILES['filename']['name'] == '')
 			  {
 				  $fldvalue = $this->getOldFileName($this->id);
 			  }
-			  if($table_name == 'products' && $columname == 'imagename')
+			  if($table_name == 'vtiger_products' && $columname == 'imagename')
 			  {
 			/*	  //Product Image Handling done
 				  if($_FILES['imagename']['name'] != '')
@@ -653,7 +653,7 @@
 		      */		  
 
 			  }
-			  if($table_name != 'ticketcomments')
+			  if($table_name != 'vtiger_ticketcomments')
 			  {
 				  if($i == 0)
 				  {
@@ -668,7 +668,7 @@
 		  else
 		  {
 			  //code by richie starts
-			  if(($table_name == "troubletickets") && ($columname == "update_log"))
+			  if(($table_name == "vtiger_troubletickets") && ($columname == "update_log"))
 			  {
 				  global $current_user;
 				  $fldvalue = date("l dS F Y h:i:s A").' by '.$current_user->user_name;
@@ -692,7 +692,7 @@
 				  $fldvalue = from_html($adb->formatString($table_name,$columname,$fldvalue),($insertion_mode == 'edit')?true:false);
 				  //echo ' updatevalue is ............. ' .$fldvalue;
 			  }
-			  elseif($table_name == 'products' && $columname == 'imagename')
+			  elseif($table_name == 'vtiger_products' && $columname == 'imagename')
 			  {
 				  //Product Image Handling done
 			/*	  if($_FILES['imagename']['name'] != '')
@@ -733,15 +733,15 @@
 	  {
 		  if($_REQUEST['module'] == 'Potentials')
 		  {
-			  $dbquery = 'select sales_stage from potential where potentialid = '.$this->id;
+			  $dbquery = 'select vtiger_sales_stage from vtiger_potential where potentialid = '.$this->id;
 			  $sales_stage = $adb->query_result($adb->query($dbquery),0,'sales_stage');
 			  if($sales_stage != $_REQUEST['sales_stage'])
 			  {
 				  $date_var = 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 vtiger_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).")";
 				  //Changed to insert the close date based on user date format - after 4.2 patch2
 				  $closingdate = getDBInsertDateValue($_REQUEST['closingdate']);
-				  $sql = "insert into potstagehistory values('',".$this->id.",'".$_REQUEST['amount']."','".$sales_stage."','".$_REQUEST['probability']."',0,".$adb->formatString("potstagehistory","closedate",$closingdate).",".$adb->formatString("potstagehistory","lastmodified",$date_var).")";
+				  $sql = "insert into vtiger_potstagehistory values('',".$this->id.",'".$_REQUEST['amount']."','".$sales_stage."','".$_REQUEST['probability']."',0,".$adb->formatString("vtiger_potstagehistory","closedate",$closingdate).",".$adb->formatString("vtiger_potstagehistory","lastmodified",$date_var).")";
 				  $adb->query($sql);
 			  }
 		  }
@@ -758,49 +758,49 @@
 		  {
 			  $groupname = $_REQUEST['assigned_group_name'];
 			  //echo 'about to update lead group relation';
-			  if($module == 'Leads' && $table_name == 'leaddetails')
+			  if($module == 'Leads' && $table_name == 'vtiger_leaddetails')
 			  {
 				  updateLeadGroupRelation($this->id,$groupname);
 			  }
-                          elseif($module == 'Accounts' && $table_name == 'account')
+                          elseif($module == 'Accounts' && $table_name == 'vtiger_account')
 			  {
 				  updateAccountGroupRelation($this->id,$groupname);
 			  }
-			  elseif($module == 'Contacts' && $table_name == 'contactdetails')
+			  elseif($module == 'Contacts' && $table_name == 'vtiger_contactdetails')
 			  {
 				  updateContactGroupRelation($this->id,$groupname);
 			  }
-			  elseif($module == 'Potentials' && $table_name == 'potential')
+			  elseif($module == 'Potentials' && $table_name == 'vtiger_potential')
 			  {
 				  updatePotentialGroupRelation($this->id,$groupname);
 			  }
-			  elseif($module == 'Quotes' && $table_name == 'quotes')
+			  elseif($module == 'Quotes' && $table_name == 'vtiger_quotes')
 			  {
 				  updateQuoteGroupRelation($this->id,$groupname);
 			  }
-			  elseif($module == 'SalesOrder' && $table_name == 'salesorder')
+			  elseif($module == 'SalesOrder' && $table_name == 'vtiger_salesorder')
 			  {
 				  updateSoGroupRelation($this->id,$groupname);
 			  }
-			  elseif($module == 'Invoice' && $table_name == 'invoice')
+			  elseif($module == 'Invoice' && $table_name == 'vtiger_invoice')
 			  {
 				  updateInvoiceGroupRelation($this->id,$groupname);
 			  }
-			  elseif($module == 'PurchaseOrder' && $table_name == 'purchaseorder')
+			  elseif($module == 'PurchaseOrder' && $table_name == 'vtiger_purchaseorder')
 			  {
 				  updatePoGroupRelation($this->id,$groupname);
 			  }
-			  elseif($module == 'HelpDesk' && $table_name == 'troubletickets')
+			  elseif($module == 'HelpDesk' && $table_name == 'vtiger_troubletickets')
 			  {
 				  updateTicketGroupRelation($this->id,$groupname);
 			  }
-			  elseif($module == 'Campaigns' && $table_name == 'campaign')
+			  elseif($module == 'Campaigns' && $table_name == 'vtiger_campaign')
 			  {
 				  updateCampaignGroupRelation($this->id,$groupname);
 			  }
 			  elseif($module =='Activities' || $module =='Events' || $module == 'Emails')
 			  {
-				 if($table_name == 'activity')
+				 if($table_name == 'vtiger_activity')
 				 {
 				   updateActivityGroupRelation($this->id,$groupname);
 				 }
@@ -811,49 +811,49 @@
 		  else
 		  {
 			  //echo 'about to update lead group relation again!';
-			  if($module == 'Leads' && $table_name == 'leaddetails')
+			  if($module == 'Leads' && $table_name == 'vtiger_leaddetails')
 			  {
 				  updateLeadGroupRelation($this->id,'');
 			  }
-			  elseif($module == 'Accounts' && $table_name == 'account')
+			  elseif($module == 'Accounts' && $table_name == 'vtiger_account')
 			  {
 				  updateAccountGroupRelation($this->id,'');
 			  }
-			  elseif($module == 'Contacts' && $table_name == 'contactdetails')
+			  elseif($module == 'Contacts' && $table_name == 'vtiger_contactdetails')
 			  {
 				  updateContactGroupRelation($this->id,'');
 			  }
-			  elseif($module == 'Potentials' && $table_name == 'potential')
+			  elseif($module == 'Potentials' && $table_name == 'vtiger_potential')
 			  {
 				  updatePotentialGroupRelation($this->id,'');
 			  }
-			  elseif($module == 'Quotes' && $table_name == 'quotes')
+			  elseif($module == 'Quotes' && $table_name == 'vtiger_quotes')
 			  {
 				  updateQuoteGroupRelation($this->id,'');
 			  }
-			  elseif($module == 'SalesOrder' && $table_name == 'salesorder')
+			  elseif($module == 'SalesOrder' && $table_name == 'vtiger_salesorder')
 			  {
 				  updateSoGroupRelation($this->id,'');
 			  }
-			  elseif($module == 'Invoice' && $table_name == 'invoice')
+			  elseif($module == 'Invoice' && $table_name == 'vtiger_invoice')
 			  {
 				  updateInvoiceGroupRelation($this->id,'');
 			  }
-			  elseif($module == 'PurchaseOrder' && $table_name == 'purchaseorder')
+			  elseif($module == 'PurchaseOrder' && $table_name == 'vtiger_purchaseorder')
 			  {
 				  updatePoGroupRelation($this->id,'');
 			  }
-			  elseif($module == 'HelpDesk' && $table_name == 'troubletickets')
+			  elseif($module == 'HelpDesk' && $table_name == 'vtiger_troubletickets')
 			  {
 				  updateTicketGroupRelation($this->id,'');
 			  }
-			  elseif($module == 'Campaigns' && $table_name == 'campaign')
+			  elseif($module == 'Campaigns' && $table_name == 'vtiger_campaign')
 			  {
 				  updateCampaignGroupRelation($this->id,$groupname);
 			  }
 			  elseif($module =='Activities' || $module =='Events' || $module == 'Emails')
 			  {
-				  if($table_name == 'activity')
+				  if($table_name == 'vtiger_activity')
                                   {
 			             updateActivityGroupRelation($this->id,$groupname);
 				  }
@@ -868,47 +868,47 @@
 		  $sql1 = "insert into ".$table_name." (".$column.") values(".$value.")";
 		  $adb->query($sql1); 
 		  $groupname = $_REQUEST['assigned_group_name'];
-		  if($_REQUEST['assigntype'] == 'T' && $table_name == 'leaddetails')
+		  if($_REQUEST['assigntype'] == 'T' && $table_name == 'vitger_leaddetails')
 		  {
 			  insert2LeadGroupRelation($this->id,$groupname);
 		  }
-		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'account')
+		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'vitger_account')
 		  {
 			  insert2AccountGroupRelation($this->id,$groupname);
 		  }
-		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'contactdetails')
+		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'vitger_contactdetails')
 		  {
 			  insert2ContactGroupRelation($this->id,$groupname);
 		  }
-		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'potential')
+		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'vitger_potential')
 		  {
 			  insert2PotentialGroupRelation($this->id,$groupname);
 		  }
-		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'quotes')
+		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'vitger_quotes')
 		  {
 			  insert2QuoteGroupRelation($this->id,$groupname);
 		  }
-		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'salesorder')
+		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'vitger_salesorder')
 		  {
 			  insert2SoGroupRelation($this->id,$groupname);
 		  }
-		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'invoice')
+		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'vitger_invoice')
 		  {
 			  insert2InvoiceGroupRelation($this->id,$groupname);
 		  }
-		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'purchaseorder')
+		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'vitger_purchaseorder')
 		  {
 			  insert2PoGroupRelation($this->id,$groupname);
 		  }
-		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'activity') 
+		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'vitger_activity') 
 		  {
 			  insert2ActivityGroupRelation($this->id,$groupname);
 		  }
-		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'troubletickets') 
+		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'vitger_troubletickets') 
 		  {
 			  insert2TicketGroupRelation($this->id,$groupname);
 		  }
-		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'campaign')
+		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'vitger_campaign')
 		  {
 			  insert2CampaignGroupRelation($this->id,$groupname);
 		  }
@@ -935,14 +935,14 @@
 	   global $log;
 $log->info("in getOldFileName  ".$notesid);
 	global $adb;
-	$query1 = "select * from seattachmentsrel where crmid=".$notesid;
+	$query1 = "select * from vtiger_seattachmentsrel where crmid=".$notesid;
 	$result = $adb->query($query1);
 	$noofrows = $adb->num_rows($result);
 	if($noofrows != 0)
 		$attachmentid = $adb->query_result($result,0,'attachmentsid');
 	if($attachmentid != '')
 	{
-		$query2 = "select * from attachments where attachmentsid=".$attachmentid;
+		$query2 = "select * from vtiger_attachments where attachmentsid=".$attachmentid;
 		$filename = $adb->query_result($adb->query($query2),0,'name');
 	}
 	return "'".$filename."'";
@@ -963,7 +963,7 @@
 	if($_REQUEST['comments'] != '')
 	{
 		$comment = addslashes($_REQUEST['comments']);
-		$sql = "insert into ticketcomments values('',".$this->id.",'".$comment."','".$current_user->id."','".$ownertype."','".$current_time."')";
+		$sql = "insert into vtiger_ticketcomments values('',".$this->id.",'".$comment."','".$current_user->id."','".$ownertype."','".$current_time."')";
 	        $adb->query($sql);
 	}
 }
@@ -978,7 +978,7 @@
 	if($_REQUEST['comments'] != '')
 	{
 		$comment = addslashes($_REQUEST['comments']);
-		$sql = "insert into faqcomments values('',".$this->id.",'".$comment."','".$current_time."')";
+		$sql = "insert into vtiger_faqcomments values('',".$this->id.",'".$comment."','".$current_time."')";
 		$adb->query($sql);
 	}
 }
@@ -1028,7 +1028,7 @@
 	{
 		if($inviteeid != '')
 		{
-			$query="insert into invitees values(".$this->id.",".$inviteeid.")";
+			$query="insert into vtiger_invitees values(".$this->id.",".$inviteeid.")";
 			$adb->query($query);
 		}
 	}
@@ -1059,7 +1059,7 @@
 	{
 		$activity_id=$this->id;
 
-		$sql='select min(recurringdate) AS min_date,max(recurringdate) AS max_date, recurringtype, activityid from recurringevents where activityid='. $activity_id.' group by activityid, recurringtype';
+		$sql='select min(recurringdate) AS min_date,max(recurringdate) AS max_date, recurringtype, activityid from vtiger_recurringevents where activityid='. $activity_id.' group by activityid, recurringtype';
 		
 		$result = $adb->query($sql);
 		$noofrows = $adb->num_rows($result);
@@ -1073,15 +1073,15 @@
 		{
 			if($_REQUEST['set_reminder'] == 'Yes')
 			{
-				$sql = 'delete from activity_reminder where activity_id='.$activity_id;
+				$sql = 'delete from vtiger_activity_reminder where activity_id='.$activity_id;
 				$adb->query($sql);
-				$sql = 'delete  from recurringevents where activityid='.$activity_id;
+				$sql = 'delete  from vtiger_recurringevents where activityid='.$activity_id;
 				$adb->query($sql);
 				$flag="true";
 			}
 			elseif($_REQUEST['set_reminder'] == 'No')
 			{
-				$sql = 'delete  from activity_reminder where activity_id='.$activity_id;
+				$sql = 'delete  from vtiger_activity_reminder where activity_id='.$activity_id;
 				$adb->query($sql);
 				$flag="false";
 			}
@@ -1090,9 +1090,9 @@
 		}
 		else
 		{
-			$sql = 'delete from activity_reminder where activity_id='.$activity_id;
+			$sql = 'delete from vtiger_activity_reminder where activity_id='.$activity_id;
 			$adb->query($sql);
-			$sql = 'delete  from recurringevents where activityid='.$activity_id;
+			$sql = 'delete  from vtiger_recurringevents where activityid='.$activity_id;
 			$adb->query($sql);
 		}
 	}
@@ -1128,7 +1128,7 @@
 				$tdate=$date_array[$k];
 				if($tdate <= $end_date)
 				{
-					$max_recurid_qry = 'select max(recurringid) AS recurid from recurringevents;';
+					$max_recurid_qry = 'select max(recurringid) AS recurid from vtiger_recurringevents;';
 					$result = $adb->query($max_recurid_qry);
 					$noofrows = $adb->num_rows($result);
 					for($i=0; $i<$noofrows; $i++)
@@ -1136,7 +1136,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 vtiger_recurringevents values ('".$current_id."','".$this->id."','".$tdate."','".$type."')";
 					$adb->query($recurring_insert);
 					if($_REQUEST['set_reminder'] == 'Yes')
 					{
@@ -1184,7 +1184,7 @@
     $detailview_query .= " where ".$table_list[0].".".$table_index[0]." = ".$record;
     $result = $adb->query($detailview_query);*/
     $tabid = getTabid($module);
-    $sql1 =  "select * from field where tabid=".$tabid;
+    $sql1 =  "select * from vtiger_field where tabid=".$tabid;
     $result1 = $adb->query($sql1);
     $noofrows = $adb->num_rows($result1);
     for($i=0; $i<$noofrows; $i++)
@@ -1316,7 +1316,7 @@
 	*/
 	function mark_deleted($id)
 	{
-		$query = "UPDATE crmentity set deleted=1 where crmid='$id'";
+		$query = "UPDATE vtiger_crmentity set deleted=1 where crmid='$id'";
 		$this->db->query($query, true,"Error marking record deleted: ");
 
 
@@ -1349,9 +1349,9 @@
 
 	// this method is called during an import before inserting a bean
 	// define an associative array called $special_fields
-	// the keys are user defined, and don't directly map to the bean's fields
+	// the keys are user defined, and don't directly map to the bean's vtiger_fields
 	// the value is the method name within that bean that will do extra
-	// processing for that field. example: 'full_name'=>'get_names_from_full_name'
+	// processing for that vtiger_field. example: 'full_name'=>'get_names_from_full_name'
 
 	function process_special_fields() 
 	{ 
@@ -1365,7 +1365,7 @@
 	}
 
 	/**
-         * Function to check if the custom field table exists
+         * Function to check if the custom vtiger_field vtiger_table exists
          * return true or false
          */
         function checkIfCustomTableExists($tablename)
@@ -1385,14 +1385,14 @@
         }
 
 	/**
-	 * function to construct the query to fetch the custom fields
-	 * return the query to fetch the custom fields
+	 * function to construct the query to fetch the custom vtiger_fields
+	 * return the query to fetch the custom vtiger_fields
          */
         function constructCustomQueryAddendum($tablename,$module)
         {
                 global $adb;
 		$tabid=getTabid($module);		
-                $sql1 = "select columnname,fieldlabel from field where generatedtype=2 and tabid=".$tabid;
+                $sql1 = "select columnname,fieldlabel from vtiger_field where generatedtype=2 and tabid=".$tabid;
                 $result = $adb->query($sql1);
                 $numRows = $adb->num_rows($result);
                 $sql3 = "select ";
@@ -1420,8 +1420,8 @@
         }
 
 
-	/**	function to save the product tax information in producttarel table
-	 *	@param string $tablename - tablename to save the product tax relationship (producttaxrel)
+	/**	function to save the product tax information in producttarel vtiger_table
+	 *	@param string $tablename - vtiger_tablename to save the product tax relationship (producttaxrel)
 	 *	@param string $module	 - current module name
 	 *	$return void
 	*/
@@ -1439,7 +1439,7 @@
 			foreach($tax_array as $tax_type)
 			{
 				$taxid = getTaxId($tax_type);
-				$sql = "delete from producttaxrel where productid=$this->id and taxid=$taxid";
+				$sql = "delete from vtiger_producttaxrel where productid=$this->id and taxid=$taxid";
 				$adb->query($sql);
 			}
 		}
@@ -1452,7 +1452,7 @@
 
 			$log->debug("Going to save the Product - VAT tax relationship");
 
-			$sql = "insert into producttaxrel values($this->id,$taxid,$tax_per)";
+			$sql = "insert into vtiger_producttaxrel values($this->id,$taxid,$tax_per)";
 			$adb->query($sql);
 		}
 		//Save the Product - Sales tax relationship if Sales tax check box is enabled
@@ -1465,7 +1465,7 @@
 
 			$log->debug("Going to save the Product - Sales tax relationship");
 
-			$sql = "insert into producttaxrel values($this->id,$taxid,$tax_per)";
+			$sql = "insert into vtiger_producttaxrel values($this->id,$taxid,$tax_per)";
 			$adb->query($sql);
 		}
 		//Save the Product - Service tax relationship if Service tax check box is enabled
@@ -1478,7 +1478,7 @@
 
 			$log->debug("Going to save the Product - Service tax relationship");
 
-			$sql = "insert into producttaxrel values($this->id,$taxid,$tax_per)";
+			$sql = "insert into vtiger_producttaxrel values($this->id,$taxid,$tax_per)";
 			$adb->query($sql);
 		}
 

Modified: vtigercrm/trunk/data/SugarBean.php
==============================================================================
--- vtigercrm/trunk/data/SugarBean.php (original)
+++ vtigercrm/trunk/data/SugarBean.php Mon Jun 12 14:26:25 2006
@@ -32,9 +32,9 @@
     /**
      * This method implements a generic insert and update logic for any SugarBean
      * This method only works for subclasses that implement the same variable names.
-     * This method uses the presence of an id field that is not null to signify and update.
-     * The id field should not be set otherwise.
-     * todo - Add support for field type validation and encoding of parameters.
+     * This method uses the presence of an id vtiger_field that is not null to signify and update.
+     * The id vtiger_field should not be set otherwise.
+     * todo - Add support for vtiger_field type validation and encoding of parameters.
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
  * All Rights Reserved.
  * Contributor(s): ______________________________________..
@@ -89,7 +89,7 @@
 		$updKeyValues='';
 		foreach($this->column_fields as $field)
 		{
-			// Do not write out the id field on the update statement.
+			// Do not write out the id vtiger_field on the update statement.
 			// We are not allowed to change ids.
 			if($isUpdate && ('id' == $field))
 				continue;
@@ -158,7 +158,7 @@
     
     /**
      * This function retrieves a record of the appropriate type from the DB.
-     * It fills in all of the fields from the DB into the object it was called on.
+     * It fills in all of the vtiger_fields from the DB into the object it was called on.
      * param $id - If ID is specified, it overrides the current value of $this->id.  If not specified the current value of $this->id will be used.
      * returns this - The object that it was called apon or null if exactly 1 record was not found.
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
@@ -172,7 +172,7 @@
 		if($id == '') {
 			return null;
 		}
-// GS porting crmentity
+// GS porting vtiger_crmentity
 $query = "SELECT * FROM $this->table_name WHERE $this->module_id = '$id'";
 //		$query = "SELECT * FROM $this->table_name WHERE ID = '$id'";
 		$this->log->debug("Retrieve $this->object_name: ".$query);
@@ -334,7 +334,7 @@
 	 */
 	function track_view($user_id, $current_module,$id='')
 	{
-		$this->log->debug("About to call tracker (user_id, module_name, item_id)($user_id, $current_module, $this->id)");
+		$this->log->debug("About to call vtiger_tracker (user_id, module_name, item_id)($user_id, $current_module, $this->id)");
 
 		$tracker = new Tracker();
 		$tracker->track_view($user_id, $current_module, $id, '');
@@ -433,9 +433,9 @@
 
 	// this method is called during an import before inserting a bean
 	// define an associative array called $special_fields
-	// the keys are user defined, and don't directly map to the bean's fields
+	// the keys are user defined, and don't directly map to the bean's vtiger_fields
 	// the value is the method name within that bean that will do extra
-	// processing for that field. example: 'full_name'=>'get_names_from_full_name'
+	// processing for that vtiger_field. example: 'full_name'=>'get_names_from_full_name'
 
 	function process_special_fields() 
 	{ 

Modified: vtigercrm/trunk/data/Tracker.php
==============================================================================
--- vtigercrm/trunk/data/Tracker.php (original)
+++ vtigercrm/trunk/data/Tracker.php Mon Jun 12 14:26:25 2006
@@ -34,9 +34,9 @@
 class Tracker {
     var $log;
     var $db;
-    var $table_name = "tracker";
-
-    // Tracker table
+    var $table_name = "vtiger_tracker";
+
+    // Tracker vtiger_table
     var $column_fields = Array(
         "id",
         "user_id",
@@ -54,7 +54,7 @@
     }
 
     /**
-     * Add this new item to the tracker table.  If there are too many items (global config for now)
+     * Add this new item to the vtiger_tracker vtiger_table.  If there are too many items (global config for now)
      * then remove the oldest item.  If there is more than one extra item, log an error.
      * If the new item is the same as the most recent item then do not change the list
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
@@ -75,7 +75,7 @@
          //get the first name and last name from the respective modules
           if($current_module =='Leads')
           {
-            $query = 'select firstname,lastname from leaddetails where leadid=' .$item_id;
+            $query = 'select firstname,lastname from vtiger_leaddetails where leadid=' .$item_id;
             $result = $this->db->query($query);
             $firstname = $adb->query_result($result,0,'firstname');
             $lastname =  $adb->query_result($result,0,'lastname');
@@ -83,7 +83,7 @@
           }
           elseif ($current_module =='Accounts')
           {
-            $query = 'select accountname from account where accountid=' .$item_id;
+            $query = 'select accountname from vtiger_account where accountid=' .$item_id;
             $result = $this->db->query($query);
             $accountname = $adb->query_result($result,0,'accountname');
             $item_summary = $accountname;
@@ -91,7 +91,7 @@
           }
           elseif($current_module =='Contacts')
           {
-            $query = 'select firstname,lastname from contactdetails where contactid=' .$item_id;
+            $query = 'select firstname,lastname from vtiger_contactdetails where contactid=' .$item_id;
             $result = $this->db->query($query);
             $firstname = $adb->query_result($result,0,'firstname');
             $lastname =  $adb->query_result($result,0,'lastname');
@@ -100,14 +100,14 @@
           }
           elseif($current_module =='Potentials')
           {
-            $query = 'select potentialname from potential where potentialid=' .$item_id;
+            $query = 'select potentialname from vtiger_potential where potentialid=' .$item_id;
             $result = $this->db->query($query);
             $potentialname =  $adb->query_result($result,0,'potentialname');
             $item_summary = $potentialname;
           }
           elseif($current_module =='Notes')
           {
-            $query = 'select title from notes where notesid=' .$item_id;
+            $query = 'select title from vtiger_notes where notesid=' .$item_id;
             $result = $this->db->query($query);
             $title = $adb->query_result($result,0,'title');
             $item_summary = $title;
@@ -115,7 +115,7 @@
           }
           elseif($current_module =='HelpDesk')
           {
-            $query = 'select title from troubletickets where ticketid=' .$item_id;
+            $query = 'select title from vtiger_troubletickets where ticketid=' .$item_id;
             $result = $this->db->query($query);
             $title = $adb->query_result($result,0,'title');
             $item_summary = $title;
@@ -123,7 +123,7 @@
           elseif($current_module =='Activities')
           {
             //$query = 'select name from calls where callid=' .$item_id;
-	    $query = 'select subject from activity where activityid=' .$item_id;
+	    $query = 'select subject from vtiger_activity where activityid=' .$item_id;
             $result = $this->db->query($query);
             $name = $adb->query_result($result,0,'subject');
             $item_summary = $name;
@@ -131,21 +131,21 @@
           elseif($current_module =='Emails')
           {
             //$query = 'select name from emails where emailid=' .$item_id;
-	    $query = 'select subject from activity where activityid=' .$item_id;
+	    $query = 'select subject from vtiger_activity where activityid=' .$item_id;
             $result = $this->db->query($query);
             $name = $adb->query_result($result,0,'subject');
             $item_summary = $name;
           }
           elseif($current_module =='Products')
           {
-            $query = 'select productname from products where productid=' .$item_id;
+            $query = 'select productname from vtiger_products where productid=' .$item_id;
             $result = $this->db->query($query);
             $productname = $adb->query_result($result,0,'productname');
             $item_summary = $productname;
           }
           elseif($current_module =='Users')
           {
-            $query = 'select first_name,last_name from users where id=' .$item_id;
+            $query = 'select first_name,last_name from vtiger_users where id=' .$item_id;
             $result = $this->db->query($query);
             $firstname = $adb->query_result($result,0,'first_name');
             $lastname = $adb->query_result($result,0,'last_name');
@@ -153,49 +153,49 @@
           }
 	  elseif($current_module =='Invoice')
           {
-            $query = 'select subject from invoice where invoiceid=' .$item_id;
+            $query = 'select subject from vtiger_invoice where invoiceid=' .$item_id;
             $result = $this->db->query($query);
             $invoice = $adb->query_result($result,0,'subject');
             $item_summary = $invoice;
           }
           elseif($current_module =='Quotes')
           {
-            $query = 'select subject from quotes where quoteid=' .$item_id;
+            $query = 'select subject from vtiger_quotes where quoteid=' .$item_id;
             $result = $this->db->query($query);
             $quote = $adb->query_result($result,0,'subject');
             $item_summary = $quote;
           }
 	  elseif($current_module =='PurchaseOrder')
           {
-            $query = 'select subject from purchaseorder where purchaseorderid=' .$item_id;
+            $query = 'select subject from vtiger_purchaseorder where purchaseorderid=' .$item_id;
             $result = $this->db->query($query);
             $po = $adb->query_result($result,0,'subject');
             $item_summary = $po;
           }
 	  elseif($current_module =='SalesOrder')
           {
-            $query = 'select subject from salesorder where salesorderid=' .$item_id;
+            $query = 'select subject from vtiger_salesorder where salesorderid=' .$item_id;
             $result = $this->db->query($query);
             $so = $adb->query_result($result,0,'subject');
             $item_summary = $so;
           }
 	  elseif($current_module =='Vendor')
           {
-            $query = 'select vendorname from vendor where vendorid=' .$item_id;
+            $query = 'select vtiger_vendorname from vtiger_vendor where vendorid=' .$item_id;
             $result = $this->db->query($query);
             $vendor = $adb->query_result($result,0,'vendorname');
             $item_summary = $vendor;
           }
 	  elseif($current_module =='PriceBook')
           {
-            $query = 'select bookname from pricebook where pricebookid=' .$item_id;
+            $query = 'select bookname from vtiger_pricebook where pricebookid=' .$item_id;
             $result = $this->db->query($query);
             $pb = $adb->query_result($result,0,'bookname');
             $item_summary = $pb;
           }	
 
 	 
-	 #if condition added to skip faq in last viewed history
+	 #if condition added to skip vtiger_faq in last viewed history
 	  if ($current_module != 'Faq')
 	  {		
           $query = "INSERT into $this->table_name (user_id, module_name, item_id, item_summary) values ('$user_id', '$current_module', '$esc_item_id', ".$this->db->formatString($this->table_name,'item_summary',$item_summary).")";
@@ -212,7 +212,7 @@
     /**
      * param $user_id - The id of the user to retrive the history for
      * param $module_name - Filter the history to only return records from the specified module.  If not specified all records are returned
-     * return - return the array of result set rows from the query.  All of the table fields are included
+     * return - return the array of result set rows from the query.  All of the vtiger_table vtiger_fields are included
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
  * All Rights Reserved.
  * Contributor(s): ______________________________________..
@@ -224,7 +224,7 @@
     	}
 
 //        $query = "SELECT * from $this->table_name WHERE user_id='$user_id' ORDER BY id DESC";
-	$query = "SELECT * from $this->table_name inner join crmentity on crmentity.crmid=tracker.item_id WHERE user_id='$user_id' and crmentity.deleted=0 ORDER BY id DESC";
+	$query = "SELECT * from $this->table_name inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_tracker.item_id WHERE user_id='$user_id' and vtiger_crmentity.deleted=0 ORDER BY id DESC";
         $this->log->debug("About to retrieve list: $query");
         $result = $this->db->query($query, true);
         $list = Array();

Modified: vtigercrm/trunk/include/Ajax/TagCloud.php
==============================================================================
--- vtigercrm/trunk/include/Ajax/TagCloud.php (original)
+++ vtigercrm/trunk/include/Ajax/TagCloud.php Mon Jun 12 14:26:25 2006
@@ -34,7 +34,7 @@
 	$module = $_REQUEST["module"];
 	$useid = $current_user->id;
 	global $adb;
-	$query="select * from freetagged_objects where module = '".$module ."'";
+	$query="select * from vtiger_freetagged_objects where module = '".$module ."'";
 	$result=$adb->query($query);
 	if($adb->num_rows($result) > 0)
 	{

Modified: vtigercrm/trunk/include/ComboUtil.php
==============================================================================
--- vtigercrm/trunk/include/ComboUtil.php (original)
+++ vtigercrm/trunk/include/ComboUtil.php Mon Jun 12 14:26:25 2006
@@ -20,7 +20,7 @@
 	{
 		$fldArrName= $arrayName;
 		$arrayName = Array();
-		$result = $adb->query("select * from ".$tableName." where presence=1 order by sortorderid");
+		$result = $adb->query("select * from vtiger_".$tableName." where presence=1 order by sortorderid");
 		while($row = $adb->fetch_array($result))
 		{
 			$val = $row[$tableName];

Modified: vtigercrm/trunk/include/CustomFieldUtil.php
==============================================================================
--- vtigercrm/trunk/include/CustomFieldUtil.php (original)
+++ vtigercrm/trunk/include/CustomFieldUtil.php Mon Jun 12 14:26:25 2006
@@ -13,9 +13,9 @@
 require_once('include/utils/utils.php');
 
 /**
- * Function to get field typename
+ * Function to get vtiger_field typename
  * @param $uitype :: uitype -- Type integer
- * returns the field type name -- Type string
+ * returns the vtiger_field type name -- Type string
  */
 function getCustomFieldTypeName($uitype)
 {
@@ -82,8 +82,8 @@
 }
 
 /**
- * Function to get custom fields
- * @param $module :: table name -- Type string
+ * Function to get custom vtiger_fields
+ * @param $module :: vtiger_table name -- Type string
  * returns customfields in key-value pair array format
  */
 function getCustomFieldArray($module)
@@ -91,7 +91,7 @@
 	global $log;
 	$log->debug("Entering getCustomFieldArray(".$module.") method ...");
 	global $adb;
-	$custquery = "select * from field where tablename='".$module."'";
+	$custquery = "select * from vtiger_field where vtiger_tablename='".$module."'";
 	$custresult = $adb->query($custquery);
 	$custFldArray = Array();
 	$noofrows = $adb->num_rows($custresult);
@@ -106,9 +106,9 @@
 }
 
 /**
- * Function to get columnname and fieldlabel from field table
+ * Function to get columnname and vtiger_fieldlabel from vtiger_field vtiger_table
  * @param $module :: module name -- Type string
- * @param $trans_array :: translated column fields -- Type array
+ * @param $trans_array :: translated column vtiger_fields -- Type array
  * returns trans_array in key-value pair array format
  */
 function getCustomFieldTrans($module, $trans_array)
@@ -117,7 +117,7 @@
 	$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;
+	$custquery = "select columnname,fieldlabel from vtiger_field where generatedtype=2 and vtiger_tabid=".$tab_id;
 	$custresult = $adb->query($custquery);
 	$custFldArray = Array();
 	$noofrows = $adb->num_rows($custresult);
@@ -132,10 +132,10 @@
 
 
 /**
- * Function to get customfield record from field table
+ * Function to get customfield record from vtiger_field vtiger_table
  * @param $tab :: Tab ID -- Type integer
- * @param $datatype :: field name -- Type string
- * @param $id :: field Id -- Type integer
+ * @param $datatype :: vtiger_field name -- Type string
+ * @param $id :: vtiger_field Id -- Type integer
  * returns the data result in string format
  */
 function getCustomFieldData($tab,$id,$datatype)
@@ -143,7 +143,7 @@
 	global $log;
 	$log->debug("Entering getCustomFieldData(".$tab.",".$id.",".$datatype.") method ...");
 	global $adb;
-	$query = "select * from field where tabid=".$tab." and fieldid=".$id;
+	$query = "select * from vtiger_field where vtiger_tabid=".$tab." and vtiger_fieldid=".$id;
 	$result = $adb->query($query);
 	$return_data=$adb->fetch_array($result);
 	$log->debug("Exiting getCustomFieldData method ...");
@@ -153,9 +153,9 @@
 
 /**
  * Function to get customfield type,length value,decimal value and picklist value
- * @param $label :: field typename -- Type string
+ * @param $label :: vtiger_field typename -- Type string
  * @param $typeofdata :: datatype -- Type string
- * returns the field type,length,decimal
+ * returns the vtiger_field type,length,decimal
  * and picklist value in ';' separated array format
  */
 function getFldTypeandLengthValue($label,$typeofdata)

Modified: vtigercrm/trunk/include/FormValidationUtil.php
==============================================================================
--- vtigercrm/trunk/include/FormValidationUtil.php (original)
+++ vtigercrm/trunk/include/FormValidationUtil.php Mon Jun 12 14:26:25 2006
@@ -32,22 +32,22 @@
   	{
 		if($numValues > 1 && $i != $numValues-1)
     		{
-			$sql .= "select fieldlabel,fieldname,typeofdata from field where tablename='".$tablearray[$i] ."'and tabid=10 and displaytype <> 2 union ";
+			$sql .= "select fieldlabel,fieldname,typeofdata from vtiger_field where tablename='".$tablearray[$i] ."'and tabid=10 and displaytype <> 2 union ";
      		}
    		else
     		{
-   			$sql  .= "select fieldlabel,fieldname,typeofdata from field where tablename='".$tablearray[$i] ."' and tabid=10 and displaytype <> 2 ";
+   			$sql  .= "select fieldlabel,fieldname,typeofdata from vtiger_field where tablename='".$tablearray[$i] ."' and tabid=10 and displaytype <> 2 ";
     		}
   	}
   	else
   	{
     		if($numValues > 1 && $i != $numValues-1)
     		{
-      			$sql .= "select fieldlabel,fieldname,typeofdata from field where tablename='".$tablearray[$i] ."'".$tab_con." and displaytype in (1,3) union ";
+      			$sql .= "select fieldlabel,fieldname,typeofdata from vtiger_field where tablename='".$tablearray[$i] ."'".$tab_con." and displaytype in (1,3) union ";
     		}
     		else
     		{
-      			$sql  .= "select fieldlabel,fieldname,typeofdata from field where tablename='".$tablearray[$i] ."'".$tab_con." and displaytype in (1,3)";
+      			$sql  .= "select fieldlabel,fieldname,typeofdata from vtiger_field where tablename='".$tablearray[$i] ."'".$tab_con." and displaytype in (1,3)";
     		}
   	}
   }

Modified: vtigercrm/trunk/include/ListView/ListView.php
==============================================================================
--- vtigercrm/trunk/include/ListView/ListView.php (original)
+++ vtigercrm/trunk/include/ListView/ListView.php Mon Jun 12 14:26:25 2006
@@ -75,7 +75,7 @@
 	$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
+/**sets the header text this is text thats appended to the header vtiger_table and is usually used for the creation of buttons
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
  * All Rights Reserved.
  * Contributor(s): ______________________________________.

Modified: vtigercrm/trunk/include/PopulateComboValues.php
==============================================================================
--- vtigercrm/trunk/include/PopulateComboValues.php (original)
+++ vtigercrm/trunk/include/PopulateComboValues.php Mon Jun 12 14:26:25 2006
@@ -24,7 +24,7 @@
 
 
 	/** 
-	 * To populate the default combo values for the combo tables
+	 * To populate the default combo values for the combo vtiger_tables
 	 */
 	function insertComboValues($values, $tableName)
 	{
@@ -37,11 +37,11 @@
 			$id = $adb->getUniqueID($tableName);
 			if($val != '')
 			{
-				$adb->query("insert into ".$tableName. " values(".$id.",'".$val."',".$i.",1)");
+				$adb->query("insert into vtiger_".$tableName. " values(".$id.",'".$val."',".$i.",1)");
 			}
 			else
 			{
-				$adb->query("insert into ".$tableName. " values(".$id.",'--None--',".$i.",1)");
+				$adb->query("insert into vtiger_".$tableName. " values(".$id.",'--None--',".$i.",1)");
 			}
 			$i++;
 		}
@@ -50,7 +50,7 @@
 
 
 	/** 
-	 * To populate the combo tables at startup time
+	 * To populate the combo vtiger_tables at startup time
 	 */
 
 	function create_tables () 

Modified: vtigercrm/trunk/include/RelatedListView.php
==============================================================================
--- vtigercrm/trunk/include/RelatedListView.php (original)
+++ vtigercrm/trunk/include/RelatedListView.php Mon Jun 12 14:26:25 2006
@@ -379,7 +379,7 @@
 
 // begin: Armando L?scher 14.07.2005 -> ?scrollableTables
 // Desc: 'X'
-//			 Insert new table with 1 cell where all entries are in a new table.
+//			 Insert new vtiger_table with 1 cell where all entries are in a new vtiger_table.
 //			 This cell will be scrollable when too many entries exist
 		$list .= ($noofrows>15) ? '<tr><td colspan="'.$colspan.'"><div style="overflow:auto;height:315px;width:100%;"><table cellspacing="0" cellpadding="0" border="0" width="100%">':'';
 // end: Armando L?scher 14.07.2005 -> ?scrollableTables
@@ -512,7 +512,7 @@
 		}
 
 // begin: Armando L?scher 14.07.2005 -> ?scrollableTables
-// Desc: Close table from 
+// Desc: Close vtiger_table from 
 		$list .= ($noofrows>15) ? '</table></div></td></tr>':'';
 // end: Armando L?scher 14.07.2005 -> ?scrollableTables
 
@@ -590,7 +590,7 @@
 
 // begin: Armando L?scher 14.07.2005 -> ?scrollableTables
 // Desc: 'X'
-//			 Insert new table with 1 cell where all entries are in a new table.
+//			 Insert new vtiger_table with 1 cell where all entries are in a new vtiger_table.
 //			 This cell will be scrollable when too many entries exist
 		$list_body .= ($num_rows>15) ? '<tr><td colspan="12"><div style="overflow:auto;height:315px;width:100%;"><table cellspacing="0" cellpadding="0" border="0" width="100%">':'';
 // end: Armando L?scher 14.07.2005 -> ?scrollableTablEs

Modified: vtigercrm/trunk/include/freetag/freetag.class.php
==============================================================================
--- vtigercrm/trunk/include/freetag/freetag.class.php (original)
+++ vtigercrm/trunk/include/freetag/freetag.class.php Mon Jun 12 14:26:25 2006
@@ -50,9 +50,9 @@
 	var $_debug = FALSE;
 	/**
 	 * @access private
-	 * @param string The prefix of freetag database tables.
-	 */
-	var $_table_prefix = '';
+	 * @param string The prefix of freetag database vtiger_tables.
+	 */
+	var $_table_prefix = 'vtiger_';
 	/**
 	 * @access private
 	 * @param string The regex-style set of characters that are valid for normalized tags.
@@ -65,7 +65,7 @@
 	var $_normalize_tags = 1;
 	/**
 	 * @access private
-	 * @param string Whether to prevent multiple users from tagging the same object. By default, set to block (ala Upcoming.org)
+	 * @param string Whether to prevent multiple vtiger_users from tagging the same object. By default, set to block (ala Upcoming.org)
 	 */
 	var $_block_multiuser_tag_on_object =0;
 	/**
@@ -97,10 +97,10 @@
 	 * - db_pass: Database password
 	 * - db_host: Database hostname [default: localhost]
 	 * - db_name: Database name
-	 * - table_prefix: If you wish to create multiple Freetag databases on the same database, you can put a prefix in front of the table names and pass separate prefixes to the constructor. [default: '']
+	 * - vtiger_table_prefix: If you wish to create multiple Freetag databases on the same database, you can put a prefix in front of the vtiger_table names and pass separate prefixes to the constructor. [default: '']
 	 * - normalize_tags: Whether to normalize (lowercase and filter for valid characters) on tags at all. [default: 1]
 	 * - normalized_valid_chars: Pass a regex-style set of valid characters that you want your tags normalized against. [default: 'a-zA-Z0-9' for alphanumeric]
-	 * - block_multiuser_tag_on_object: Set to 0 in order to allow individual users to all tag the same object with the same tag. Default is 1 to only allow one occurence of a tag per object. [default: 1]
+	 * - block_multiuser_tag_on_object: Set to 0 in order to allow individual vtiger_users to all tag the same object with the same tag. Default is 1 to only allow one occurence of a tag per object. [default: 1]
 	 * - MAX_TAG_LENGTH: maximum length of normalized tags in chars. [default: 30]
 	 * - ADODB_DIR: directory in which adodb is installed. Change if you don't want to use the bundled version. [default: adodb/]
 	 * - PCONNECT: Whether to use ADODB persistent connections. [default: FALSE]
@@ -240,7 +240,7 @@
 	 * get_objects_with_tag_combo
 	 *
 	 * Returns an array of object ID's that have all the tags passed in the
-	 * tagArray parameter. Use this to provide tag combo services to your users.
+	 * tagArray parameter. Use this to provide tag combo services to your vtiger_users.
 	 *
 	 * @param array - Pass an array of normalized form tags along to the function.
 	 * @param int (Optional) - The numerical offset to begin display at. Defaults to 0.
@@ -347,7 +347,7 @@
 	 * You can use this function to show the tags on an object. Since it supports both user-specific
 	 * and general modes with the $tagger_id parameter, you can use it twice on a page to make it work
 	 * similar to upcoming.org and flickr, where the page displays your own tags differently than
-	 * other users' tags.
+	 * other vtiger_users' tags.
 	 *
 	 * @param int The unique ID of the object in question.
 	 * @param int The offset of tags to return.
@@ -428,7 +428,7 @@
 		$prefix = $this->_table_prefix;
 
 		// First, check for duplicate of the normalized form of the tag on this object.
-		// Dynamically switch between allowing duplication between users on the constructor param 'block_multiuser_tag_on_object'.
+		// Dynamically switch between allowing duplication between vtiger_users on the constructor param 'block_multiuser_tag_on_object'.
 		// If it's set not to block multiuser tags, then modify the existence
 		// check to look for a tag by this particular user. Otherwise, the following
 		// query will reveal whether that tag exists on that object for ANY user.
@@ -514,7 +514,7 @@
 	 *
 	 * @param int The unique ID of the person who tagged the object with this tag.
 	 * @param int The ID of the object in question.
-	 * @param string The raw string form of the tag to delete. See above for notes.
+	 * @param string The raw string form of the tag to delete. See above for vtiger_notes.
 	 *
 	 * @return string Returns the tag in normalized form.
 	 */ 
@@ -682,7 +682,7 @@
 	 *
 	 * @param int The unique ID of the person who tagged the object with this tag.
 	 * @param int The ID of the object in question.
-	 * @param string The raw string form of the tag to delete. See above for notes.
+	 * @param string The raw string form of the tag to delete. See above for vtiger_notes.
 	 * @param int Whether to skip the update portion for objects that haven't been tagged. (Default: 1)
 	 *
 	 * @return string Returns the tag in normalized form.
@@ -1015,7 +1015,7 @@
 	 *
 	 * Finds tags that are "similar" or related to the given tag.
 	 * It does this by looking at the other tags on objects tagged with the tag specified.
-	 * Confusing? Think of it like e-commerce's "Other users who bought this also bought," 
+	 * Confusing? Think of it like e-commerce's "Other vtiger_users who bought this also bought," 
 	 * as that's exactly how this works.
 	 *
 	 * Returns an empty array if no tag is passed, or if no related tags are found.

Modified: vtigercrm/trunk/include/utils/CommonUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/CommonUtils.php (original)
+++ vtigercrm/trunk/include/utils/CommonUtils.php Mon Jun 12 14:26:25 2006
@@ -119,7 +119,7 @@
 	foreach ($key_list as $option_key=>$option_value) {
 		$selected_string = '';
 		// the system is evaluating $selected_key == 0 || '' to true.  Be very careful when changing this.  Test all cases.
-		// The reported bug was only happening with one of the users in the drop down.  It was being replaced by none.
+		// The vtiger_reported bug was only happening with one of the vtiger_users in the drop down.  It was being replaced by none.
 		if (($option_key != '' && $selected_key == $option_key) || ($selected_key == '' && $option_key == '') || (in_array($option_key, $selected_key)))
 		{
 			$selected_string = 'selected ';
@@ -221,22 +221,22 @@
 
 /** To get the Currency of the specified user
   * @param $id -- The user Id:: Type integer
-  * @returns  currencyid :: Type integer
+  * @returns  vtiger_currencyid :: Type integer
  */
 function fetchCurrency($id)
 {
 	global $log;
 	$log->debug("Entering fetchCurrency(".$id.") method ...");
         global $adb;
-        $sql = "select currency_id from users where id=" .$id;
+        $sql = "select currency_id from vtiger_users where id=" .$id;
         $result = $adb->query($sql);
         $currencyid=  $adb->query_result($result,0,"currency_id");
 	$log->debug("Exiting fetchCurrency method ...");
         return $currencyid;
 }
 
-/** Function to get the Currency name from the currency_info
-  * @param $currencyid -- currencyid:: Type integer
+/** Function to get the Currency name from the vtiger_currency_info
+  * @param $currencyid -- vtiger_currencyid:: Type integer
   * @returns $currencyname -- Currency Name:: Type varchar
   *
  */
@@ -255,7 +255,7 @@
 
 
 /**
- * Function to fetch the list of groups from group table 
+ * Function to fetch the list of vtiger_groups from group vtiger_table 
  * Takes no value as input 
  * returns the query result set object
  */
@@ -265,7 +265,7 @@
 	global $log;
 	$log->debug("Entering get_group_options() method ...");
 	global $adb,$noof_group_rows;;
-	$sql = "select groupname from groups";
+	$sql = "select groupname from vtiger_groups";
 	$result = $adb->query($sql);
 	$noof_group_rows=$adb->num_rows($result);
 	$log->debug("Exiting get_group_options method ...");
@@ -293,7 +293,7 @@
 
         $log->info("module  is ".$module);
         global $adb;
-	$sql = "select tabid from tab where name='".$module."'";
+	$sql = "select tabid from vtiger_tab where name='".$module."'";
 	$result = $adb->query($sql);
 	$tabid=  $adb->query_result($result,0,"tabid");
 	}
@@ -314,7 +314,7 @@
 	$log->debug("Entering getSalesEntityType(".$crmid.") method ...");
 	$log->info("in getSalesEntityType ".$crmid);
 	global $adb;
-	$sql = "select * from crmentity where crmid=".$crmid;
+	$sql = "select * from vtiger_crmentity where crmid=".$crmid;
         $result = $adb->query($sql);
 	$parent_module = $adb->query_result($result,0,"setype");
 	$log->debug("Exiting getSalesEntityType method ...");
@@ -322,9 +322,9 @@
 }
 
 /**
- * Function to get the AccountName when a account id is given 
- * Takes the input as $acount_id - account id
- * returns the account name in string format.
+ * Function to get the AccountName when a vtiger_account id is given 
+ * Takes the input as $acount_id - vtiger_account id
+ * returns the vtiger_account name in string format.
  */
 
 function getAccountName($account_id)
@@ -336,7 +336,7 @@
 	global $adb;
 	if($account_id != '')
 	{
-		$sql = "select accountname from account where accountid=".$account_id;
+		$sql = "select accountname from vtiger_account where accountid=".$account_id;
         	$result = $adb->query($sql);
 		$accountname = $adb->query_result($result,0,"accountname");
 	}
@@ -358,7 +358,7 @@
 	$log->info("in getproductname ".$product_id);
 
 	global $adb;
-	$sql = "select productname from products where productid=".$product_id;
+	$sql = "select productname from vtiger_products where productid=".$product_id;
         $result = $adb->query($sql);
 	$productname = $adb->query_result($result,0,"productname");
 	$log->debug("Exiting getProductName method ...");
@@ -366,9 +366,9 @@
 }
 
 /**
- * Function to get the Potentail Name when a potential id is given 
- * Takes the input as $potential_id - potential id
- * returns the potential name in string format.
+ * Function to get the Potentail Name when a vtiger_potential id is given 
+ * Takes the input as $potential_id - vtiger_potential id
+ * returns the vtiger_potential name in string format.
  */
 
 function getPotentialName($potential_id)
@@ -381,7 +381,7 @@
 	$potentialname = '';
 	if($potential_id != '')
 	{
-		$sql = "select potentialname from potential where potentialid=".$potential_id;
+		$sql = "select potentialname from vtiger_potential where potentialid=".$potential_id;
         	$result = $adb->query($sql);
 		$potentialname = $adb->query_result($result,0,"potentialname");
 	}
@@ -402,7 +402,7 @@
 	$log->info("in getContactName ".$contact_id);
 
         global $adb;
-        $sql = "select * from contactdetails where contactid=".$contact_id;
+        $sql = "select * from vtiger_contactdetails where contactid=".$contact_id;
         $result = $adb->query($sql);
         $firstname = $adb->query_result($result,0,"firstname");
         $lastname = $adb->query_result($result,0,"lastname");
@@ -412,8 +412,8 @@
 }
 
 /**
- * Function to get the Vendor Name when a vendor id is given 
- * Takes the input as $vendor_id - vendor id
+ * Function to get the Vendor Name when a vtiger_vendor id is given 
+ * Takes the input as $vendor_id - vtiger_vendor id
  * returns the Vendor Name in string format.
  */
 
@@ -423,7 +423,7 @@
 	$log->debug("Entering getVendorName(".$vendor_id.") method ...");
 	$log->info("in getVendorName ".$vendor_id);
         global $adb;
-        $sql = "select * from vendor where vendorid=".$vendor_id;
+        $sql = "select * from vtiger_vendor where vendorid=".$vendor_id;
         $result = $adb->query($sql);
         $vendor_name = $adb->query_result($result,0,"vendorname");
 	$log->debug("Exiting getVendorName method ...");
@@ -431,7 +431,7 @@
 }
 
 /**
- * Function to get the Quote Name when a vendor id is given 
+ * Function to get the Quote Name when a vtiger_vendor id is given 
  * Takes the input as $quote_id - quote id
  * returns the Quote Name in string format.
  */
@@ -442,7 +442,7 @@
 	$log->debug("Entering getQuoteName(".$quote_id.") method ...");
 	$log->info("in getQuoteName ".$quote_id);
         global $adb;
-        $sql = "select * from quotes where quoteid=".$quote_id;
+        $sql = "select * from vtiger_quotes where quoteid=".$quote_id;
         $result = $adb->query($sql);
         $quote_name = $adb->query_result($result,0,"subject");
 	$log->debug("Exiting getQuoteName method ...");
@@ -450,8 +450,8 @@
 }
 
 /**
- * Function to get the PriceBook Name when a pricebook id is given 
- * Takes the input as $pricebook_id - pricebook id
+ * Function to get the PriceBook Name when a vtiger_pricebook id is given 
+ * Takes the input as $pricebook_id - vtiger_pricebook id
  * returns the PriceBook Name in string format.
  */
 
@@ -461,7 +461,7 @@
 	$log->debug("Entering getPriceBookName(".$pricebookid.") method ...");
 	$log->info("in getPriceBookName ".$pricebookid);
         global $adb;
-        $sql = "select * from pricebook where pricebookid=".$pricebookid;
+        $sql = "select * from vtiger_pricebook where pricebookid=".$pricebookid;
         $result = $adb->query($sql);
         $pricebook_name = $adb->query_result($result,0,"bookname");
 	$log->debug("Exiting getPriceBookName method ...");
@@ -478,15 +478,15 @@
 	$log->debug("Entering getPoName(".$po_id.") method ...");
         $log->info("in getPoName ".$po_id);
         global $adb;
-        $sql = "select * from purchaseorder where purchaseorderid=".$po_id;
+        $sql = "select * from vtiger_purchaseorder where purchaseorderid=".$po_id;
         $result = $adb->query($sql);
         $po_name = $adb->query_result($result,0,"subject");
 	$log->debug("Exiting getPoName method ...");
         return $po_name;
 }
 /**
- * Function to get the Sales Order Name when a salesorder id is given 
- * Takes the input as $salesorder_id - salesorder id
+ * Function to get the Sales Order Name when a vtiger_salesorder id is given 
+ * Takes the input as $salesorder_id - vtiger_salesorder id
  * returns the Salesorder Name in string format.
  */
 
@@ -496,7 +496,7 @@
 	$log->debug("Entering getSoName(".$so_id.") method ...");
 	$log->info("in getSoName ".$so_id);
 	global $adb;
-        $sql = "select * from salesorder where salesorderid=".$so_id;
+        $sql = "select * from vtiger_salesorder where salesorderid=".$so_id;
         $result = $adb->query($sql);
         $so_name = $adb->query_result($result,0,"subject");
 	$log->debug("Exiting getSoName method ...");
@@ -518,47 +518,47 @@
         global $adb;
         if($module == 'Leads')
         {
-               $sql = "select leadgrouprelation.groupname,groups.groupid from leadgrouprelation inner join groups on groups.groupname=leadgrouprelation.groupname where leadgrouprelation.leadid=".$id;
+               $sql = "select vtiger_leadgrouprelation.groupname,vtiger_groups.groupid from vtiger_leadgrouprelation inner join vtiger_groups on vtiger_groups.groupname=vtiger_leadgrouprelation.groupname where vtiger_leadgrouprelation.leadid=".$id;
         }
         elseif($module == 'Accounts')
         {
-               $sql = "select accountgrouprelation.groupname,groups.groupid from accountgrouprelation inner join groups on groups.groupname=accountgrouprelation.groupname where accountgrouprelation.accountid=".$id;
+               $sql = "select vtiger_accountgrouprelation.groupname,vtiger_groups.groupid from vtiger_accountgrouprelation inner join vtiger_groups on vtiger_groups.groupname=vtiger_accountgrouprelation.groupname where vtiger_accountgrouprelation.accountid=".$id;
         }
         elseif($module == 'Contacts')
         {
-               $sql = "select contactgrouprelation.groupname,groups.groupid from contactgrouprelation inner join groups on groups.groupname=contactgrouprelation.groupname where contactgrouprelation.contactid=".$id;
+               $sql = "select vtiger_contactgrouprelation.groupname,vtiger_groups.groupid from vtiger_contactgrouprelation inner join vtiger_groups on vtiger_groups.groupname=vtiger_contactgrouprelation.groupname where vtiger_contactgrouprelation.contactid=".$id;
         }
 	elseif($module == 'Potentials')
         {
-               $sql = "select potentialgrouprelation.groupname,groups.groupid from potentialgrouprelation inner join groups on groups.groupname=potentialgrouprelation.groupname where potentialgrouprelation.potentialid=".$id;
+               $sql = "select vtiger_potentialgrouprelation.groupname,vtiger_groups.groupid from vtiger_potentialgrouprelation inner join vtiger_groups on vtiger_groups.groupname=vtiger_potentialgrouprelation.groupname where vtiger_potentialgrouprelation.potentialid=".$id;
         }
 	elseif($module == 'Quotes')
         {
-               $sql = "select quotegrouprelation.groupname,groups.groupid from quotegrouprelation inner join groups on groups.groupname=quotegrouprelation.groupname where quotegrouprelation.quoteid=".$id;
+               $sql = "select vtiger_quotegrouprelation.groupname,vtiger_groups.groupid from vtiger_quotegrouprelation inner join vtiger_groups on vtiger_groups.groupname=vtiger_quotegrouprelation.groupname where vtiger_quotegrouprelation.quoteid=".$id;
         }
 	elseif($module == 'SalesOrder')
         {
-               $sql = "select sogrouprelation.groupname,groups.groupid from sogrouprelation inner join groups on groups.groupname=sogrouprelation.groupname where sogrouprelation.salesorderid=".$id;
+               $sql = "select vtiger_sogrouprelation.groupname,vtiger_groups.groupid from vtiger_sogrouprelation inner join vtiger_groups on vtiger_groups.groupname=vtiger_sogrouprelation.groupname where vtiger_sogrouprelation.salesorderid=".$id;
         }
 	elseif($module == 'Invoice')
         {
-               $sql = "select invoicegrouprelation.groupname,groups.groupid from invoicegrouprelation inner join groups on groups.groupname=invoicegrouprelation.groupname where invoicegrouprelation.invoiceid=".$id;
+               $sql = "select vtiger_invoicegrouprelation.groupname,vtiger_groups.groupid from vtiger_invoicegrouprelation inner join vtiger_groups on vtiger_groups.groupname=vtiger_invoicegrouprelation.groupname where vtiger_invoicegrouprelation.invoiceid=".$id;
         }
 	elseif($module == 'PurchaseOrder')
         {
-               $sql = "select pogrouprelation.groupname,groups.groupid from pogrouprelation inner join groups on groups.groupname=pogrouprelation.groupname where pogrouprelation.purchaseorderid=".$id;
+               $sql = "select vtiger_pogrouprelation.groupname,vtiger_groups.groupid from vtiger_pogrouprelation inner join vtiger_groups on vtiger_groups.groupname=vtiger_pogrouprelation.groupname where vtiger_pogrouprelation.purchaseorderid=".$id;
         }
         elseif($module == 'HelpDesk')
         {
-               $sql = "select ticketgrouprelation.groupname,groups.groupid from ticketgrouprelation inner join groups on groups.groupname=ticketgrouprelation.groupname where ticketgrouprelation.ticketid=".$id;
+               $sql = "select vtiger_ticketgrouprelation.groupname,vtiger_groups.groupid from vtiger_ticketgrouprelation inner join vtiger_groups on vtiger_groups.groupname=vtiger_ticketgrouprelation.groupname where vtiger_ticketgrouprelation.ticketid=".$id;
         }
 	elseif($module == 'Campaigns')
 	{
-	       $sql = "select campaigngrouprelation.groupname,groups.groupid from campaigngrouprelation inner join groups on groups.groupname=campaigngrouprelation.groupname where campaigngrouprelation.campaignid=".$id;
+	       $sql = "select vtiger_campaigngrouprelation.groupname,vtiger_groups.groupid from vtiger_campaigngrouprelation inner join vtiger_groups on vtiger_groups.groupname=vtiger_campaigngrouprelation.groupname where vtiger_campaigngrouprelation.campaignid=".$id;
         }
         elseif($module == 'Activities' || $module == 'Emails' || $module == 'Events')
         {
-               $sql = "select activitygrouprelation.groupname,groups.groupid from activitygrouprelation inner join groups on groups.groupname=activitygrouprelation.groupname where activitygrouprelation.activityid=".$id;
+               $sql = "select vtiger_activitygrouprelation.groupname,vtiger_groups.groupid from vtiger_activitygrouprelation inner join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_activitygrouprelation.activityid=".$id;
 	}
 	$result = $adb->query($sql);
         $group_info[] = $adb->query_result($result,0,"groupname");
@@ -584,7 +584,7 @@
 	global $adb;
 	if($userid != '')
 	{
-		$sql = "select user_name from users where id=".$userid;
+		$sql = "select user_name from vtiger_users where id=".$userid;
 		$result = $adb->query($sql);
 		$user_name = $adb->query_result($result,0,"user_name");
 	}
@@ -594,7 +594,7 @@
 
 /**
  * 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
+ * param $focus - the module object contains the column vtiger_fields
  */
    
 function getURLstring($focus)
@@ -708,7 +708,7 @@
 	return $display_date;
 }
 
-/** This function returns the default currency information.
+/** This function returns the default vtiger_currency information.
   * Takes no param, return type array.
     */
     
@@ -718,7 +718,7 @@
 	global $adb;
 	$log->debug("Entering getDisplayCurrency() method ...");
         $curr_array = Array();
-        $sql1 = "select * from currency_info where currency_status='Active'";
+        $sql1 = "select * from vtiger_currency_info where currency_status='Active'";
         $result = $adb->query($sql1);
         $num_rows=$adb->num_rows($result);
         for($i=0; $i<$num_rows;$i++)
@@ -755,9 +755,9 @@
         return $amount * $crate;
 }
 
-/** This function returns the conversion rate and currency symbol
+/** This function returns the conversion rate and vtiger_currency symbol
   * in array format for a given id.
-  * param $id - currency id.
+  * param $id - vtiger_currency id.
   */
       
 function getCurrencySymbolandCRate($id)
@@ -765,7 +765,7 @@
 	global $log;
 	$log->debug("Entering getCurrencySymbolandCRate(".$id.") method ...");
         global $adb;
-        $sql1 = "select conversion_rate,currency_symbol from currency_info where id=".$id;
+        $sql1 = "select conversion_rate,currency_symbol from vtiger_currency_info where id=".$id;
         $result = $adb->query($sql1);
 	$rate_symbol['rate'] = $adb->query_result($result,0,"conversion_rate");
 	$rate_symbol['symbol'] = $adb->query_result($result,0,"currency_symbol");
@@ -782,7 +782,7 @@
 	global $log;
 	$log->debug("Entering getTermsandConditions() method ...");
         global $adb;
-        $sql1 = "select * from inventory_tandc";
+        $sql1 = "select * from vtiger_inventory_tandc";
         $result = $adb->query($sql1);
         $tandc = $adb->query_result($result,0,"tandc");
 	$log->debug("Exiting getTermsandConditions method ...");
@@ -791,10 +791,10 @@
 
 /**
  * Create select options in a dropdown list.  To be used inside
-  *  a reminder select statement in a activity form. 
+  *  a reminder select statement in a vtiger_activity form. 
    * param $start - start value
    * param $end - end value
-   * param $fldname - field name 
+   * param $fldname - vtiger_field name 
    * param $selvalue - selected value 
    */
     
@@ -821,7 +821,7 @@
 
 /** This function returns the List price of a given product in a given price book.
   * param $productid - product id.
-  * param $pbid - pricebook id.
+  * param $pbid - vtiger_pricebook id.
   */
   
 function getListPrice($productid,$pbid)
@@ -831,7 +831,7 @@
         $log->info("in getListPrice productid ".$productid);
 
 	global $adb;
-	$query = "select listprice from pricebookproductrel where pricebookid=".$pbid." and productid=".$productid;
+	$query = "select listprice from vtiger_pricebookproductrel where pricebookid=".$pbid." and productid=".$productid;
 	$result = $adb->query($query);
 	$lp = $adb->query_result($result,0,'listprice');
 	$log->debug("Exiting getListPrice method ...");
@@ -889,8 +889,8 @@
    return($ret);
 }
 /**
- * This function returns the blocks and its related information for given module.
- * Input Parameter are $module - module name, $disp_view = display view (edit,detail or create),$mode - edit, $col_fields - * column fields/
+ * This function returns the vtiger_blocks and its related information for given module.
+ * Input Parameter are $module - module name, $disp_view = display view (edit,detail or create),$mode - edit, $col_fields - * column vtiger_fields/
  * This function returns an array
  */
 
@@ -903,7 +903,7 @@
         $tabid = getTabid($module);
         $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";
+        $query="select blockid,blocklabel,show_title from vtiger_blocks where tabid=$tabid and $disp_view=0 and visible = 0 order by sequence";
 
         $result = $adb->query($query);
         $noofrows = $adb->num_rows($result);
@@ -918,18 +918,18 @@
 		$block_label[$blockid] = $adb->query_result($result,$i,"blocklabel");
 	}
 	$blockid_list .= ')';
-	//retreive the profileList from database
+	//retreive the vtiger_profileList from database
 	require('user_privileges/user_privileges_'.$current_user->id.'.php');
 	if($disp_view == "detail_view")
 	{
 		if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0)
 		{
-			$sql = "select field.* from field where field.tabid=".$tabid." and field.block in $blockid_list and field.displaytype in (1,2) order by block,sequence";
+			$sql = "select vtiger_field.* from vtiger_field where vtiger_field.tabid=".$tabid." and vtiger_field.block in $blockid_list and vtiger_field.displaytype in (1,2) order by block,sequence";
 		}
 		else
 		{
 			$profileList = getCurrentUserProfileList();
-			$sql = "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 field.block in ".$blockid_list." and field.displaytype in (1,2) and profile2field.visible=0 and def_org_field.visible=0 and profile2field.profileid in ".$profileList." group by field.fieldid order by block,sequence";
+			$sql = "select vtiger_field.* from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.tabid=".$tabid." and vtiger_field.block in ".$blockid_list." and vtiger_field.displaytype in (1,2) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList." group by vtiger_field.fieldid order by block,sequence";
 		}
 		$result = $adb->query($sql);
 		$getBlockInfo=getDetailBlockInformation($module,$result,$col_fields,$tabid,$block_label);
@@ -940,24 +940,24 @@
 		{
 			if($is_admin==true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2]== 0)
 			{
-				$sql = "select field.* from field where field.tabid=".$tabid." and field.block in ".$blockid_list ." and field.displaytype=1 and info_type = '".$info_type."' order by block,sequence";
+				$sql = "select vtiger_field.* from vtiger_field where vtiger_field.tabid=".$tabid." and vtiger_field.block in ".$blockid_list ." and vtiger_field.displaytype=1 and info_type = '".$info_type."' order by block,sequence";
 			}
 			else
 			{
 				$profileList = getCurrentUserProfileList();
-				$sql = "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 field.block in ".$blockid_list." and field.displaytype=1 and info_type = '".$info_type."' and profile2field.visible=0 and def_org_field.visible=0 and profile2field.profileid in ".$profileList.=" group by field.fieldid order by block,sequence";
+				$sql = "select vtiger_field.* from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid  where vtiger_field.tabid=".$tabid." and vtiger_field.block in ".$blockid_list." and vtiger_field.displaytype=1 and info_type = '".$info_type."' and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList.=" group by vtiger_field.fieldid order by block,sequence";
 			}
 		}
 		else
 		{
 			if($is_admin==true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0)
 			{
-				$sql = "select field.* from field where field.tabid=".$tabid." and field.block in ".$blockid_list." and field.displaytype=1 order by block,sequence";
+				$sql = "select vtiger_field.* from vtiger_field where vtiger_field.tabid=".$tabid." and vtiger_field.block in ".$blockid_list." and vtiger_field.displaytype=1 order by block,sequence";
 			}
 			else
 			{
 				$profileList = getCurrentUserProfileList();
-				$sql = "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 field.block in ".$blockid_list." and field.displaytype=1 and profile2field.visible=0 and def_org_field.visible=0 and profile2field.profileid in ".$profileList.=" group by field.fieldid order by block,sequence";
+				$sql = "select vtiger_field.* from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid  where vtiger_field.tabid=".$tabid." and vtiger_field.block in ".$blockid_list." and vtiger_field.displaytype=1 and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList.=" group by vtiger_field.fieldid order by block,sequence";
 			}
 		}
 		$result = $adb->query($sql);
@@ -995,7 +995,7 @@
 	$log->debug("Entering getBlockId(".$tabid.",".$label.") method ...");
         global $adb;
         $blockid = '';
-        $query = "select blockid from blocks where tabid=$tabid and blocklabel = '$label'";
+        $query = "select blockid from vtiger_blocks where tabid=$tabid and blocklabel = '$label'";
         $result = $adb->query($query);
         $noofrows = $adb->num_rows($result);
         if($noofrows == 1)
@@ -1007,8 +1007,8 @@
 }
 
 /**
- * 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 function is used to get the Parent and Child vtiger_tab relation array.
+ * Takes no parameter and get the data from parent_tabdata.php and vtiger_tabdata.php
  * This returns array type value
  */
 
@@ -1059,8 +1059,8 @@
 }
 
 /**
- * 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 function is used to get the Parent Tab name for a given parent vtiger_tab id.
+ * Takes the input parameter as $parenttabid - Parent vtiger_tab id
  * This returns value string type 
  */
 
@@ -1076,7 +1076,7 @@
 	}
 	else
 	{
-		$sql = "select parenttab_label from parenttab where parenttabid=".$parenttabid;
+		$sql = "select parenttab_label from vtiger_parenttab where parenttabid=".$parenttabid;
 		$result = $adb->query($sql);
 		$parent_tabname=  $adb->query_result($result,0,"parenttab_label");
 	}
@@ -1113,7 +1113,7 @@
 	}
 	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."'";
+		$sql = "select vtiger_parenttab.* from vtiger_parenttab inner join vtiger_parenttabrel on vtiger_parenttabrel.parenttabid=vtiger_parenttab.parenttabid inner join vtiger_tab on vtiger_tab.tabid=vtiger_parenttabrel.tabid where vtiger_tab.name='".$module."'";
 		$result = $adb->query($sql);
 		$tab =  $adb->query_result($result,0,"parenttab_label");
 		$log->debug("Exiting getParentTabFromModule method ...");
@@ -1123,7 +1123,7 @@
 
 /**
  * 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
+ * Takes no parameter but gets the vtiger_parenttab value from form request
  * This returns value string type 
  */
 
@@ -1146,7 +1146,7 @@
 /**
  * This function is used to get the days in between the current time and the modified time of an entity .
  * Takes the input parameter as $id - crmid  it will calculate the number of days in between the
- * the current time and the modified time from the crmentity table and return the result as a string.
+ * the current time and the modified time from the vtiger_crmentity vtiger_table and return the result as a string.
  * The return format is updated <No of Days> day ago <(date when updated)>
  */
 
@@ -1157,7 +1157,7 @@
 
     global $adb;
     global $app_strings;
-    $query='select modifiedtime from crmentity where crmid ='.$id ;
+    $query='select modifiedtime from vtiger_crmentity where crmid ='.$id ;
     $result = $adb->query($query);
     $modifiedtime = $adb->query_result($result,0,'modifiedtime');
     $values=explode(' ',$modifiedtime);
@@ -1194,7 +1194,7 @@
 	$script_images=array();
 	$script = '<script>var ProductImages = new Array(';
    	$i=0;
-	$query='select imagename from products where productid='.$id;
+	$query='select imagename from vtiger_products where productid='.$id;
 	$result = $adb->query($query);
 	$imagename=$adb->query_result($result,0,'imagename');
 	$image_lists=explode('###',$imagename);
@@ -1381,7 +1381,7 @@
 
 /**
  * This function is used get the User Count.
- * It returns the array which has the total users ,admin users,and the non admin users 
+ * It returns the array which has the total vtiger_users ,admin vtiger_users,and the non admin vtiger_users 
  */
 
 function UserCount()
@@ -1389,9 +1389,9 @@
 	global $log;
 	$log->debug("Entering UserCount() method ...");
 	global $adb;
-	$result=$adb->query("select * from users where deleted =0;");
+	$result=$adb->query("select * from vtiger_users where deleted =0;");
 	$user_count=$adb->num_rows($result);
-	$result=$adb->query("select * from users where deleted =0 AND is_admin != 'on';");
+	$result=$adb->query("select * from vtiger_users where deleted =0 AND is_admin != 'on';");
 	$nonadmin_count = $adb->num_rows($result);
 	$admin_count = $user_count-$nonadmin_count;
 	$count=array('user'=>$user_count,'admin'=>$admin_count,'nonadmin'=>$nonadmin_count);
@@ -1435,7 +1435,7 @@
 		$log->debug("Entering DefHomeView() method ...");
 		global $adb;
 		global $current_user;
-		$query="select defhomeview from users where id = ".$current_user->id;
+		$query="select defhomeview from vtiger_users where id = ".$current_user->id;
 		$result=$adb->query($query);
 		$defaultview=$adb->query_result($result,0,'defhomeview');
 		$log->debug("Exiting DefHomeView method ...");
@@ -1472,7 +1472,7 @@
 }
 
  /**
- * Function to write the tabid and name to a flat file tabdata.txt so that the data
+ * Function to write the tabid and name to a flat file vtiger_tabdata.txt so that the data
  * is obtained from the file instead of repeated queries
  * returns null
  */
@@ -1481,9 +1481,9 @@
 {
 	global $log;
 	$log->debug("Entering create_tab_data_file() method ...");
-        $log->info("creating tabdata file");
+        $log->info("creating vtiger_tabdata file");
         global $adb;
-        $sql = "select * from tab";
+        $sql = "select * from vtiger_tab";
         $result = $adb->query($sql);
         $num_rows=$adb->num_rows($result);
         $result_array=Array();
@@ -1540,7 +1540,7 @@
 
 
  /**
- * Function to write the parenttabid and name to a flat file parent_tabdata.txt so that the data
+ * Function to write the vtiger_parenttabid and name to a flat file parent_tabdata.txt so that the data
  * is obtained from the file instead of repeated queries
  * returns null
  */
@@ -1551,7 +1551,7 @@
 	$log->debug("Entering create_parenttab_data_file() method ...");
 	$log->info("creating parent_tabdata file");
 	global $adb;
-	$sql = "select parenttabid,parenttab_label from parenttab order by sequence";
+	$sql = "select parenttabid,parenttab_label from vtiger_parenttab order by sequence";
 	$result = $adb->query($sql);
 	$num_rows=$adb->num_rows($result);
 	$result_array=Array();
@@ -1591,7 +1591,7 @@
 			foreach($result_array as $parid=>$parvalue)
 			{
 				$childArray=Array();
-				$sql = "select * from parenttabrel where parenttabid=".$parid." order by sequence";
+				$sql = "select * from vtiger_parenttabrel where parenttabid=".$parid." order by sequence";
 				$result = $adb->query($sql);
 				$num_rows=$adb->num_rows($result);
 				$result_array=Array();
@@ -1654,7 +1654,7 @@
 			 'Contacts'=>'LNK_NEW_CONTACT',
 			 'Vendors'=>'LNK_NEW_VENDOR'); 	
 
-$qc_query = "select distinct tab.tablabel,tab.name from field inner join tab on tab.tabid = field.tabid where quickcreate=0 order by tab.tablabel";
+$qc_query = "select distinct vtiger_tab.tablabel,vtiger_tab.name from vtiger_field inner join vtiger_tab on vtiger_tab.tabid = vtiger_field.tabid where quickcreate=0 order by vtiger_tab.tablabel";
 $result = $adb->query($qc_query);
 $noofrows = $adb->num_rows($result);
 $return_qcmodule = Array();
@@ -1680,7 +1680,7 @@
 }
 																					   
 /**
- * This function is used to get the Quick create form field parameters for a given module.
+ * This function is used to get the Quick create form vtiger_field parameters for a given module.
  * Param $module - module name 
  * returns the value in array format
  */
@@ -1700,12 +1700,12 @@
 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";
+                 $quickcreate_query = "select * from vtiger_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";
+                 $quickcreate_query = "select vtiger_field.* from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.tabid=".$tabid." and quickcreate=0 and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0  and vtiger_profile2field.profileid in ".$profileList." order by quickcreatesequence";
            }
 																					     
 $category = getParentTab();
@@ -1830,7 +1830,7 @@
 	global $log;
 	$log->debug("Entering getUserslist() method ...");
 	global $adb;
-	$result=$adb->query("select * from users");
+	$result=$adb->query("select * from vtiger_users");
 	for($i=0;$i<$adb->num_rows($result);$i++)
 	{
 	       $useridlist[$i]=$adb->query_result($result,$i,'id');
@@ -1883,7 +1883,7 @@
 		
 	switch ($module)
 	{
-		case "Accounts" : $query = "select accountname from account where accountid in (".$list.")";
+		case "Accounts" : $query = "select accountname from vtiger_account where accountid in (".$list.")";
 				  $result = $adb->query($query);
 				  $numrows = $adb->num_rows($result);
 				  $account_name = array();	
@@ -1895,7 +1895,7 @@
 					return $account_name;
 					break;
 
-		  case "Leads" :  $query = "select concat(firstname,' ',lastname) as leadname from leaddetails where leadid in (".$list.")";
+		  case "Leads" :  $query = "select concat(firstname,' ',lastname) as leadname from vtiger_leaddetails where leadid in (".$list.")";
 				  $result = $adb->query($query);
 				  $numrows = $adb->num_rows($result);
 				  $lead_name = array();
@@ -1908,7 +1908,7 @@
 					return $lead_name;
 					break;
 		
-	       case "Contacts" : $query = "select concat(firstname,' ',lastname) as contactname from contactdetails where contactid in (".$list.")"; 
+	       case "Contacts" : $query = "select concat(firstname,' ',lastname) as contactname from vtiger_contactdetails where contactid in (".$list.")"; 
 				 $result = $adb->query($query);
 				 $numrows = $adb->num_rows($result);
 				 $contact_name = array();
@@ -1921,7 +1921,7 @@
 					return $contact_name;
 					break;
 
-	    case "Potentials"  : $query = "select potentialname from potential where potentialid in (".$list.")";
+	    case "Potentials"  : $query = "select potentialname from vtiger_potential where potentialid in (".$list.")";
 				 $result = $adb->query($query);
 				 $numrows = $adb->num_rows($result);
 				 $potential_name = array();
@@ -1934,7 +1934,7 @@
 					return $potential_name;
 					break;
 
-	        case "Quotes"  : $query = "select subject from quotes where quoteid in (".$list.")";
+	        case "Quotes"  : $query = "select subject from vtiger_quotes where quoteid in (".$list.")";
 				 $result = $adb->query($query);
 				 $numrows = $adb->num_rows($result);
 				 $quote_subject = array();		    	
@@ -1947,7 +1947,7 @@
 					return $quote_subject;
 					break;	
 
-	    case "SalesOrder"  : $query = "select subject from salesorder where salesorderid in (".$list.")";
+	    case "SalesOrder"  : $query = "select subject from vtiger_salesorder where salesorderid in (".$list.")";
 				 $result = $adb->query($query);
 				 $numrows = $adb->num_rows($result);
 				 $so_subject = array();		    	
@@ -1960,7 +1960,7 @@
 					return $so_subject;
 					break;
 	
-	       case "Invoice"  : $query = "select subject from invoice where invoiceid in (".$list.")";
+	       case "Invoice"  : $query = "select subject from vtiger_invoice where invoiceid in (".$list.")";
 				 $result = $adb->query($query);
 				 $numrows = $adb->num_rows($result);
 				 $inv_subject = array();		    	
@@ -1973,7 +1973,7 @@
 					return $inv_subject;
 					break;
 		
-	      case "Products"  : $query = "select productname from products where productid in (".$list.")";
+	      case "Products"  : $query = "select productname from vtiger_products where productid in (".$list.")";
 				 $result = $adb->query($query);
 				 $numrows = $adb->num_rows($result);
 				 $product_name = array();		    	
@@ -1986,7 +1986,7 @@
 					return $product_name;
 					break;
 
-	   case "PriceBooks"  :  $query = "select bookname from pricebook where pricebookid in (".$list.")";
+	   case "PriceBooks"  :  $query = "select bookname from vtiger_pricebook where pricebookid in (".$list.")";
 				 $result = $adb->query($query);
 				 $numrows = $adb->num_rows($result);
 				 $pbook_name = array();		    	
@@ -1999,7 +1999,7 @@
 					return $pbook_name;
 					break;
 
-	        case "Notes"  :  $query = "select title from notes where notesid in (".$list.")";
+	        case "Notes"  :  $query = "select title from vtiger_notes where notesid in (".$list.")";
 				 $result = $adb->query($query);
 				 $numrows = $adb->num_rows($result);
 				 $notes_title = array();		    	
@@ -2012,7 +2012,7 @@
 					return $notes_title;
 					break;
 		
-	  case "Activities"  :  $query = "select subject from activity where activityid in (".$list.")";
+	  case "Activities"  :  $query = "select subject from vtiger_activity where activityid in (".$list.")";
 				 $result = $adb->query($query);
 				 $numrows = $adb->num_rows($result);
 				 $activity_subject = array();		    	
@@ -2025,7 +2025,7 @@
 					return $activity_subject;
 					break;
 
-	    case "Campaigns"  :  $query = "select campaignname from campaign where campaignid in (".$list.")";
+	    case "Campaigns"  :  $query = "select campaignname from vtiger_campaign where campaignid in (".$list.")";
 				 $result = $adb->query($query);
 				 $numrows = $adb->num_rows($result);
 				 $campaign_name = array();		    	
@@ -2038,7 +2038,7 @@
 					return $campaign_name;
 					break;
 
-	          case "Faq"  :  $query = "select question from faq where id in (".$list.")";
+	          case "Faq"  :  $query = "select question from vtiger_faq where id in (".$list.")";
 				 $result = $adb->query($query);
 				 $numrows = $adb->num_rows($result);
 				 $faq_name = array();		    	
@@ -2051,7 +2051,7 @@
 					return $faq_name;
 					break;
 		
-	      case "Vendors"  :  $query = "select vendorname from vendor where vendorid in (".$list.")";
+	      case "Vendors"  :  $query = "select vendorname from vtiger_vendor where vendorid in (".$list.")";
 				 $result = $adb->query($query);
 				 $numrows = $adb->num_rows($result);
 				 $vendor_name = array();		    	
@@ -2064,7 +2064,7 @@
 					return $vendor_name;
 					break;
 
-	case "PurchaseOrder"  :  $query = "select subject from purchaseorder where purchaseorderid in (".$list.")";
+	case "PurchaseOrder"  :  $query = "select subject from vtiger_purchaseorder where purchaseorderid in (".$list.")";
 				 $result = $adb->query($query);
 				 $numrows = $adb->num_rows($result);
 				 $po_name = array();		    	
@@ -2077,7 +2077,7 @@
 					return $po_name;
 					break;
 
-	     case "HelpDesk"  :  $query = "select title from troubletickets where ticketid in (".$list.")";
+	     case "HelpDesk"  :  $query = "select title from vtiger_troubletickets where ticketid in (".$list.")";
 				 $result = $adb->query($query);
 				 $numrows = $adb->num_rows($result);
 				 $ticket_name = array();		    	
@@ -2099,7 +2099,7 @@
         global $adb;
 	global $current_user;
         $resultant_array = Array();
-        $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';
+        $query = 'select name,tablabel,parenttab_label,vtiger_tab.tabid from vtiger_parenttabrel inner join vtiger_tab on vtiger_parenttabrel.tabid = vtiger_tab.tabid inner join vtiger_parenttab on vtiger_parenttabrel.parenttabid = vtiger_parenttab.parenttabid order by vtiger_parenttab.sequence';
         $result = $adb->query($query);
 	require('user_privileges/user_privileges_'.$current_user->id.'.php');
         for($i=0;$i<$adb->num_rows($result);$i++)
@@ -2179,7 +2179,7 @@
 }
 
 /**
- * 	This function is used to get the Path in where we store the files based on the module.
+ * 	This function is used to get the Path in where we store the vtiger_files based on the module.
  *	@param string $module   - module name
  * 	return string $storage_path - path inwhere the file will be uploaded (also where it was stored) will be return based on the module
 */
@@ -2205,7 +2205,7 @@
 
 /**
  * 	This function is used to check whether the attached file is a image file or not
- *	@param string $file_details  - files array which contains all the uploaded file details
+ *	@param string $file_details  - vtiger_files array which contains all the uploaded file details
  * 	return string $save_image - true or false. if the image can be uploaded then true will return otherwise false.
 */
 function validateImageFile($file_details)
@@ -2243,7 +2243,7 @@
         global $adb,$log;
         $log->debug("Entering into getTemplateDetails($templateid) method ...");
         $returndata =  Array();
-        $result = $adb->query("select * from emailtemplates where templateid=$templateid");
+        $result = $adb->query("select * from vtiger_emailtemplates where templateid=$templateid");
         $returndata[] = $templateid;
         $returndata[] = $adb->query_result($result,0,'body');
         $returndata[] = $adb->query_result($result,0,'subject');
@@ -2278,7 +2278,7 @@
 			if(is_array($fields["accounts"]))
 			{
 				$columnfields = implode(',',$fields["accounts"]);
-				$query = 'select '.$columnfields.' from account where accountid ='.$id;
+				$query = 'select '.$columnfields.' from vtiger_account where accountid ='.$id;
 				$result = $adb->query($query);
 				foreach($fields["accounts"] as $columnname)			
 				{

Modified: vtigercrm/trunk/include/utils/DeleteUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/DeleteUtils.php (original)
+++ vtigercrm/trunk/include/utils/DeleteUtils.php Mon Jun 12 14:26:25 2006
@@ -24,73 +24,73 @@
 	case Accounts:
 		if($return_id!='')
 		{
-			$sql ='delete from seactivityrel where crmid = '.$record.' and activityid = '.$return_id;
+			$sql ='delete from vtiger_seactivityrel where crmid = '.$record.' and activityid = '.$return_id;
 			$adb->query($sql);
 		}
 	break;
 	case Activities:
 		if($return_module == 'Contacts')
 		{
-			$sql = 'delete from cntactivityrel where contactid = '.$return_id.' and activityid = '.$record;
+			$sql = 'delete from vtiger_cntactivityrel where contactid = '.$return_id.' and activityid = '.$record;
 			$adb->query($sql);
 		}
 		else
 		{
-			$sql= 'delete from seactivityrel where activityid='.$record;
+			$sql= 'delete from vtiger_seactivityrel where activityid='.$record;
 			$adb->query($sql);
 		}
 
 		if($return_module == 'HelpDesk')
 		{
-			$sql = 'delete from seticketsrel where ticketid = '.$return_id.' and crmid = '.$record;
-			$adb->query($sql);
-		}
-		$sql = 'delete from activity_reminder where activity_id='.$record;
+			$sql = 'delete from vtiger_seticketsrel where ticketid = '.$return_id.' and crmid = '.$record;
+			$adb->query($sql);
+		}
+		$sql = 'delete from vtiger_activity_reminder where activity_id='.$record;
  		$adb->query($sql);
 
- 		$sql = 'delete  from recurringevents where activityid='.$record;
+ 		$sql = 'delete  from vtiger_recurringevents where activityid='.$record;
  		$adb->query($sql);
 	break;
 	case Contacts:
 		if($return_module == 'Accounts')
 		{
-			$sql = 'update crmentity set deleted = 1 where crmid = '.$record;
+			$sql = 'update vtiger_crmentity set deleted = 1 where crmid = '.$record;
 			$adb->query($sql);
 		}
 		if($return_module == 'Potentials' && $record != '' && $return_id != '')
 		{
-			$sql = 'delete from contpotentialrel where contactid='.$record.' and potentialid='.$return_id;
+			$sql = 'delete from vtiger_contpotentialrel where contactid='.$record.' and potentialid='.$return_id;
 			$adb->query($sql);
 		}
 		if($record != '' && $return_id != '')
 		{
-			$sql = 'delete from seactivityrel where crmid = '.$record.' and activityid = '.$return_id;
-			$adb->query($sql);
-			$sql_recentviewed ='delete from tracker where user_id = '.$current_user->id.' and item_id = '.$record;
+			$sql = 'delete from vtiger_seactivityrel where crmid = '.$record.' and activityid = '.$return_id;
+			$adb->query($sql);
+			$sql_recentviewed ='delete from vtiger_tracker where user_id = '.$current_user->id.' and item_id = '.$record;
 			$adb->query($sql_recentviewed);
 		}
 		if($return_module == 'Products')
 		{
-			$sql = 'delete from vendorcontactrel where contactid='.$record.' and vendorid='.$return_id;
+			$sql = 'delete from vtiger_vendorcontactrel where contactid='.$record.' and vendorid='.$return_id;
 			$adb->query($sql);
 		}
 	break;
 	case Emails:
-		$sql='delete from seactivityrel where activityid='.$adb->quote($record);
+		$sql='delete from vtiger_seactivityrel where activityid='.$adb->quote($record);
 		$adb->query($sql);
 	break;
 	case HelpDesk:
 		if($return_module == 'Contacts' || $return_module == 'Accounts')
 		{
-			$sql = "update troubletickets set parent_id='' where ticketid=".$record;
-			$adb->query($sql);
-			$se_sql= 'delete from seticketsrel where ticketid='.$record;
+			$sql = "update vtiger_troubletickets set parent_id='' where ticketid=".$record;
+			$adb->query($sql);
+			$se_sql= 'delete from vtiger_seticketsrel where ticketid='.$record;
 			$adb->query($se_sql);
 
 		}
 		if($return_module == 'Products')
 		{
-			$sql = "update troubletickets set product_id='' where ticketid=".$record;
+			$sql = "update vtiger_troubletickets set product_id='' where ticketid=".$record;
 			$adb->query($sql);
 		}
 	break;
@@ -101,13 +101,13 @@
 		}
 		elseif($return_module=="SalesOrder")
 		{
-			$relation_query = "UPDATE invoice set salesorderid='' where invoiceid=".$record;
+			$relation_query = "UPDATE vtiger_invoice set salesorderid='' where invoiceid=".$record;
 			$adb->query($relation_query);
 		}
 		elseif($return_module=="Products")
 		{
-			//Removing the relation from the quotes product rel
-			$inv_query = "select * from invoiceproductrel where productid=".$return_id;
+			//Removing the relation from the vtiger_quotes product rel
+			$inv_query = "select * from vtiger_invoiceproductrel where productid=".$return_id;
 			$result = $adb->query($inv_query);
 			$num_rows = $adb->num_rows($result);
 			for($i=0; $i< $num_rows; $i++)
@@ -120,48 +120,48 @@
 				//Get the current sub total from Quotes and update it with the new subtotal
 				updateSubTotal("Invoices","invoice","subtotal","total","invoiceid",$invoice_id,$prod_total);
 			}
-			//delete the relation from quotes product rel
-			$del_query = "delete from invoiceproductrel where productid=".$return_id." and invoiceid=".$record;
+			//delete the relation from vtiger_quotes product rel
+			$del_query = "delete from vtiger_invoiceproductrel where productid=".$return_id." and invoiceid=".$record;
 			$adb->query($del_query);
 		}
 	break;
 	case Leads:
-		$sql = 'delete from seactivityrel where crmid = '.$record.' and activityid = '.$return_id;
+		$sql = 'delete from vtiger_seactivityrel where crmid = '.$record.' and activityid = '.$return_id;
 		$adb->query($sql);
 	break;
 	case Notes:
 		if($return_module== 'Contacts')
 		{
-			$sql = 'update notes set contact_id = 0 where notesid = '.$record;
-			$adb->query($sql);
-		}
-		$sql = 'delete from senotesrel where notesid = '.$record. ' and crmid = '.$return_id;
+			$sql = 'update vtiger_notes set contact_id = 0 where notesid = '.$record;
+			$adb->query($sql);
+		}
+		$sql = 'delete from vtiger_senotesrel where notesid = '.$record. ' and crmid = '.$return_id;
 		$adb->query($sql);
 
 	break;
 	case Potentials:
 		if($return_module == 'Accounts')
 		{
-			$sql = 'update crmentity set deleted = 1 where crmid = '.$record;
-			$adb->query($sql);
-		}
-		$sql ='delete from seactivityrel where crmid = '.$record.' and activityid = '.$return_id;
+			$sql = 'update vtiger_crmentity set deleted = 1 where crmid = '.$record;
+			$adb->query($sql);
+		}
+		$sql ='delete from vtiger_seactivityrel where crmid = '.$record.' and activityid = '.$return_id;
 		$adb->query($sql);
 	break;
 	case Products:
 		if($record != '' && $return_id != '')
 		{
 			if($return_module == 'Activities')
-				$sql = 'delete from seactivityrel where crmid = '.$record.' and activityid = '.$return_id;
+				$sql = 'delete from vtiger_seactivityrel where crmid = '.$record.' and activityid = '.$return_id;
 
 			if($return_module == 'Potentials' || $return_module == 'Accounts' || $return_module == 'Leads')
-				$sql = 'delete from seproductsrel where crmid = '.$return_id.' and productid = '.$record;
+				$sql = 'delete from vtiger_seproductsrel where crmid = '.$return_id.' and productid = '.$record;
 
 			$adb->query($sql);
 		}
 		if($return_module == "Contacts")
 		{
-			$sql = "UPDATE products set contactid = '' where productid = ".$record;
+			$sql = "UPDATE vtiger_products set contactid = '' where productid = ".$record;
 			$adb->query($sql);
 		}
 	break;
@@ -173,13 +173,13 @@
 		}
 		elseif($return_module == "Vendors")
 		{
-			$sql_req ='DELETE from purchaseorder where purchaseorderid= '.$record;
+			$sql_req ='DELETE from vtiger_purchaseorder where purchaseorderid= '.$record;
 			$adb->query($sql_req);
 		}
 		elseif($return_module == "Products")
 		{
 			//Removing the relation from the po product rel
-			$po_query = "select * from poproductrel where productid=".$return_id;
+			$po_query = "select * from vtiger_poproductrel where productid=".$return_id;
 			$result = $adb->query($po_query);
 			$num_rows = $adb->num_rows($result);
 			for($i=0; $i< $num_rows; $i++)
@@ -192,13 +192,13 @@
 				updateSubTotal("PurchaseOrder","purchaseorder","subtotal","total","purchaseorderid",$po_id,$prod_total);
 			}
 			//delete the relation from po product rel
-			$del_query = "delete from poproductrel where productid=".$return_id." and purchaseorderid=".$record;
+			$del_query = "delete from vtiger_poproductrel where productid=".$return_id." and purchaseorderid=".$record;
 			$adb->query($del_query);
 
 		}
 		elseif($return_module == "Contacts")
 		{
-			$sql_req ='UPDATE purchaseorder set contactid="" where purchaseorderid = '.$record;
+			$sql_req ='UPDATE vtiger_purchaseorder set contactid="" where purchaseorderid = '.$record;
 			$adb->query($sql_req);
 		}
 	break;
@@ -209,18 +209,18 @@
 		}
 		elseif($return_module == "Potentials")
 		{
-			$relation_query = "UPDATE quotes set potentialid='' where quoteid=".$record;
+			$relation_query = "UPDATE vtiger_quotes set potentialid='' where quoteid=".$record;
 			$adb->query($relation_query);
 		}
 		elseif($return_module == "Contacts")
 		{
-			$relation_query = "UPDATE quotes set contactid='' where quoteid=".$record;
+			$relation_query = "UPDATE vtiger_quotes set contactid='' where quoteid=".$record;
 			$adb->query($relation_query);
 		}
 		elseif($return_module == "Products")
 		{
-			//Removing the relation from the quotes product rel
-			$qt_query = "select * from quotesproductrel where productid=".$return_id;
+			//Removing the relation from the vtiger_quotes product rel
+			$qt_query = "select * from vtiger_quotesproductrel where productid=".$return_id;
 			$result = $adb->query($qt_query);
 			$num_rows = $adb->num_rows($result);
 			for($i=0; $i< $num_rows; $i++)
@@ -233,8 +233,8 @@
 				//Get the current sub total from Quotes and update it with the new subtotal
 				updateSubTotal("Quotes","quotes","subtotal","total","quoteid",$quote_id,$prod_total);
 			}
-			//delete the relation from quotes product rel
-			$del_query = "delete from quotesproductrel where productid=".$return_id." and quoteid=".$record;
+			//delete the relation from vtiger_quotes product rel
+			$del_query = "delete from vtiger_quotesproductrel where productid=".$return_id." and quoteid=".$record;
 			$adb->query($del_query);
 
 		}
@@ -245,23 +245,23 @@
 		}
 		elseif($return_module == "Quotes")
 		{
-			$relation_query = "UPDATE salesorder set quoteid='' where salesorderid=".$record;
+			$relation_query = "UPDATE vtiger_salesorder set quoteid='' where salesorderid=".$record;
 			$adb->query($relation_query);
 		}
 		elseif($return_module == "Potentials")
 		{
-			$relation_query = "UPDATE salesorder set potentialid='' where salesorderid=".$record;
+			$relation_query = "UPDATE vtiger_salesorder set potentialid='' where salesorderid=".$record;
 			$adb->query($relation_query);
 		}
 		elseif($return_module == "Contacts")
 		{
-			$relation_query = "UPDATE salesorder set contactid='' where salesorderid=".$record;
+			$relation_query = "UPDATE vtiger_salesorder set contactid='' where salesorderid=".$record;
 			$adb->query($relation_query);
 		}
 		elseif($return_module == "Products")
 		{
 			//Removing the relation from the so product rel
-			$so_query = "select * from soproductrel where productid=".$return_id;
+			$so_query = "select * from vtiger_soproductrel where productid=".$return_id;
 			$result = $adb->query($so_query);
 			$num_rows = $adb->num_rows($result);
 			for($i=0; $i< $num_rows; $i++)
@@ -275,17 +275,17 @@
 				updateSubTotal("SalesOrder","salesorder","subtotal","total","salesorderid",$so_id,$prod_total);
 			}
 			//delete the relation from so product rel
-			$del_query = "delete from soproductrel where productid=".$return_id." and salesorderid=".$record;
+			$del_query = "delete from vtiger_soproductrel where productid=".$return_id." and salesorderid=".$record;
 			$adb->query($del_query);
 
 		}
 	break;
 		case Rss:
-			$del_query = "delete from rss where rssid=".$record;
+			$del_query = "delete from vtiger_rss where rssid=".$record;
 			$adb->query($del_query);
 	break;
 		case Portal:
-			$del_query = "delete from portal where portalid=".$record;
+			$del_query = "delete from vtiger_portal where portalid=".$record;
 			$adb->query($del_query);
 	break;
 	endswitch;
@@ -300,7 +300,7 @@
 	}
 	if($module != 'Faq')
 	{	
-		$sql_recentviewed ='delete from tracker where user_id = '.$current_user->id.' and item_id = '.$record;
+		$sql_recentviewed ='delete from vtiger_tracker where user_id = '.$current_user->id.' and item_id = '.$record;
         	$adb->query($sql_recentviewed);
 	}
 	$log->debug("Entering DeleteEntity method ...");

Modified: vtigercrm/trunk/include/utils/DetailViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/DetailViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/DetailViewUtils.php Mon Jun 12 14:26:25 2006
@@ -25,13 +25,13 @@
 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
+/** This function returns the detail view form vtiger_field and and its properties in array format.
+  * Param $uitype - UI type of the vtiger_field
+  * Param $fieldname - Form vtiger_field name
+  * Param $fieldlabel - Form vtiger_field label name
+  * Param $col_fields - array contains the vtiger_fieldname and values
   * Param $generatedtype - Field generated type (default is 1)
-  * Param $tabid - tab id to which the Field belongs to (default is "")
+  * Param $tabid - vtiger_tab id to which the Field belongs to (default is "")
   * Return type is an array
   */
 
@@ -67,7 +67,7 @@
 	     $label_fld[] = $mod_strings[$fieldlabel];
 	     $label_fld[] = $col_fields[$fieldname];
 	     
-		$pick_query="select * from ".$fieldname;
+		$pick_query="select * from vtiger_".$fieldname;
 		$pickListResult = $adb->query($pick_query);
 		$noofpickrows = $adb->num_rows($pickListResult);
 
@@ -260,7 +260,7 @@
         {
 		if($tabid == 4)
            {
-                   $query="select contactdetails.imagename from contactdetails where contactid=".$col_fields['record_id'];
+                   $query="select vtiger_contactdetails.imagename from vtiger_contactdetails where contactid=".$col_fields['record_id'];
                    $result = $adb->query($query);
                    $imagename=$adb->query_result($result,0,'imagename');
                    if($imagename != '')
@@ -333,10 +333,10 @@
         {
                 global $adb;
 
-                $attachmentid=$adb->query_result($adb->query("select * from seattachmentsrel where crmid = ".$col_fields['record_id']),0,'attachmentsid');
+                $attachmentid=$adb->query_result($adb->query("select * from vtiger_seattachmentsrel where crmid = ".$col_fields['record_id']),0,'attachmentsid');
 		if($col_fields[$fieldname] == '' && $attachmentid != '')
 		{
-				$attachquery = "select * from attachments where attachmentsid=".$attachmentid;
+				$attachquery = "select * from vtiger_attachments where attachmentsid=".$attachmentid;
         		        $col_fields[$fieldname] = $adb->query_result($adb->query($attachquery),0,'name');
 		}
 
@@ -356,7 +356,7 @@
 		if($tabid==14)
 		{
 			$images=array();
-			$query = 'select productname,attachments.path,attachments.name from products left join seattachmentsrel on seattachmentsrel.crmid=products.productid inner join attachments on attachments.attachmentsid=seattachmentsrel.attachmentsid where productid='.$col_fields['record_id'];
+			$query = 'select productname,vtiger_attachments.path,vtiger_attachments.name from vtiger_products left join vtiger_seattachmentsrel on vtiger_seattachmentsrel.crmid=vtiger_products.productid inner join vtiger_attachments on vtiger_attachments.attachmentsid=vtiger_seattachmentsrel.attachmentsid where productid='.$col_fields['record_id'];
 			$result_image = $adb->query($query);
 			for($image_iter=0;$image_iter < $adb->num_rows($result_image);$image_iter++)	
 			{
@@ -405,7 +405,7 @@
 			if($parent_module == "Leads")
 			{
 				$label_fld[] =$app_strings['LBL_LEAD_NAME'];
-				$sql = "select * from leaddetails where leadid=".$value;
+				$sql = "select * from vtiger_leaddetails where leadid=".$value;
 				$result = $adb->query($sql);
 				$first_name = $adb->query_result($result,0,"firstname");
 				$last_name = $adb->query_result($result,0,"lastname");
@@ -415,7 +415,7 @@
 			elseif($parent_module == "Accounts")
 			{
 				$label_fld[] = $app_strings['LBL_ACCOUNT_NAME'];
-				$sql = "select * from  account where accountid=".$value;
+				$sql = "select * from  vtiger_account where accountid=".$value;
 				$result = $adb->query($sql);
 				$account_name = $adb->query_result($result,0,"accountname");
 
@@ -424,7 +424,7 @@
 			elseif($parent_module == "Potentials")
 			{
 				$label_fld[] =$app_strings['LBL_POTENTIAL_NAME'];
-				$sql = "select * from  potential where potentialid=".$value;
+				$sql = "select * from  vtiger_potential where potentialid=".$value;
 				$result = $adb->query($sql);
 				$potentialname = $adb->query_result($result,0,"potentialname");
 
@@ -433,7 +433,7 @@
 			elseif($parent_module == "Products")
 			{
 				$label_fld[] =$app_strings['LBL_PRODUCT_NAME'];
-				$sql = "select * from  products where productid=".$value;
+				$sql = "select * from  vtiger_products where productid=".$value;
 				$result = $adb->query($sql);
 				$productname= $adb->query_result($result,0,"productname");
 
@@ -442,7 +442,7 @@
 			elseif($parent_module == "PurchaseOrder")
 			{
 				$label_fld[] =$app_strings['LBL_PORDER_NAME'];
-				$sql = "select * from  purchaseorder where purchaseorderid=".$value;
+				$sql = "select * from  vtiger_purchaseorder where purchaseorderid=".$value;
 				$result = $adb->query($sql);
 				$pordername= $adb->query_result($result,0,"subject");
 
@@ -451,7 +451,7 @@
 			elseif($parent_module == "SalesOrder")
 			{
 				$label_fld[] = $app_strings['LBL_SORDER_NAME'];
-				$sql = "select * from  salesorder where salesorderid=".$value;
+				$sql = "select * from  vtiger_salesorder where salesorderid=".$value;
 				$result = $adb->query($sql);
 				$sordername= $adb->query_result($result,0,"subject");
 
@@ -460,7 +460,7 @@
 			elseif($parent_module == "Invoice")
 			{
 				$label_fld[] = $app_strings['LBL_INVOICE_NAME'];
-				$sql = "select * from  invoice where invoiceid=".$value;
+				$sql = "select * from  vtiger_invoice where invoiceid=".$value;
 				$result = $adb->query($sql);
 				$invoicename= $adb->query_result($result,0,"subject");
 
@@ -484,7 +484,7 @@
 			if($parent_module == "Leads")
 			{
 				$label_fld[] =$app_strings['LBL_LEAD_NAME'];
-				$sql = "select * from leaddetails where leadid=".$value;
+				$sql = "select * from vtiger_leaddetails where leadid=".$value;
 				$result = $adb->query($sql);
 				$first_name = $adb->query_result($result,0,"firstname");
 				$last_name = $adb->query_result($result,0,"lastname");
@@ -494,7 +494,7 @@
 			elseif($parent_module == "Accounts")
 			{
 				$label_fld[] = $app_strings['LBL_ACCOUNT_NAME'];
-				$sql = "select * from  account where accountid=".$value;
+				$sql = "select * from  vtiger_account where accountid=".$value;
 				$result = $adb->query($sql);
 				$account_name = $adb->query_result($result,0,"accountname");
 
@@ -503,7 +503,7 @@
 			elseif($parent_module == "Potentials")
 			{
 				$label_fld[] =$app_strings['LBL_POTENTIAL_NAME'];
-				$sql = "select * from  potential where potentialid=".$value;
+				$sql = "select * from  vtiger_potential where potentialid=".$value;
 				$result = $adb->query($sql);
 				$potentialname = $adb->query_result($result,0,"potentialname");
 
@@ -512,7 +512,7 @@
 			elseif($parent_module == "Quotes")
                         {
 				$label_fld[] =$app_strings['LBL_QUOTE_NAME'];
-                                $sql = "select * from  quotes where quoteid=".$value;
+                                $sql = "select * from  vtiger_quotes where quoteid=".$value;
                                 $result = $adb->query($sql);
                                 $quotename = $adb->query_result($result,0,"subject");
 
@@ -521,7 +521,7 @@
 			elseif($parent_module == "PurchaseOrder")
                         {
 				$label_fld[] = $app_strings['LBL_PORDER_NAME'];
-                                $sql = "select * from  purchaseorder where purchaseorderid=".$value;
+                                $sql = "select * from  vtiger_purchaseorder where purchaseorderid=".$value;
                                 $result = $adb->query($sql);
                                 $pordername = $adb->query_result($result,0,"subject");
 
@@ -530,7 +530,7 @@
                         elseif($parent_module == "SalesOrder")
                         {
 				$label_fld[] = $app_strings['LBL_SORDER_NAME'];
-                                $sql = "select * from  salesorder where salesorderid=".$value;
+                                $sql = "select * from  vtiger_salesorder where salesorderid=".$value;
                                 $result = $adb->query($sql);
                                 $sordername = $adb->query_result($result,0,"subject");
 
@@ -539,7 +539,7 @@
 			elseif($parent_module == "Invoice")
                         {
 				$label_fld[] = $app_strings['LBL_INVOICE_NAME'];
-                                $sql = "select * from  invoice where invoiceid=".$value;
+                                $sql = "select * from  vtiger_invoice where invoiceid=".$value;
                                 $result = $adb->query($sql);
                                 $invoicename = $adb->query_result($result,0,"subject");
 
@@ -562,7 +562,7 @@
 			if($parent_module == "Leads")
 			{
 				$label_fld[] = $app_strings['LBL_LEAD_NAME'];
-				$sql = "select * from leaddetails where leadid=".$value;
+				$sql = "select * from vtiger_leaddetails where leadid=".$value;
 				$result = $adb->query($sql);
 				$first_name = $adb->query_result($result,0,"firstname");
 				$last_name = $adb->query_result($result,0,"lastname");
@@ -572,7 +572,7 @@
 			elseif($parent_module == "Contacts")
 			{
 				$label_fld[] = $app_strings['LBL_CONTACT_NAME'];
-				$sql = "select * from  contactdetails where contactid=".$value;
+				$sql = "select * from  vtiger_contactdetails where contactid=".$value;
 				$result = $adb->query($sql);
 				$first_name = $adb->query_result($result,0,"firstname");
                                 $last_name = $adb->query_result($result,0,"lastname");
@@ -596,7 +596,7 @@
 			$parent_name='';
 			$parent_id='';
 			$myemailid= $_REQUEST['record'];
-			$mysql = "select crmid from seactivityrel where activityid=".$myemailid;
+			$mysql = "select crmid from vtiger_seactivityrel where activityid=".$myemailid;
 			$myresult = $adb->query($mysql);
 			$mycount=$adb->num_rows($myresult);
 			if ($mycount>1){
@@ -609,7 +609,7 @@
 				if($parent_module == "Leads")
 				{
 					$label_fld[] = $app_strings['LBL_LEAD_NAME'];
-					$sql = "select * from leaddetails where leadid=".$value;
+					$sql = "select * from vtiger_leaddetails where leadid=".$value;
 					$result = $adb->query($sql);
 					$first_name = $adb->query_result($result,0,"firstname");
 					$last_name = $adb->query_result($result,0,"lastname");
@@ -618,7 +618,7 @@
 				elseif($parent_module == "Contacts")
 				{
 					$label_fld[] = $app_strings['LBL_CONTACT_NAME'];
-					$sql = "select * from  contactdetails where contactid=".$value;
+					$sql = "select * from  vtiger_contactdetails where contactid=".$value;
 					$result = $adb->query($sql);
 					$first_name = $adb->query_result($result,0,"firstname");
 					$last_name = $adb->query_result($result,0,"lastname");
@@ -627,7 +627,7 @@
 				elseif($parent_module == "Accounts")
 				{
 					$label_fld[] = $app_strings['LBL_ACCOUNT_NAME'];
-					$sql = "select * from  account where accountid=".$value;
+					$sql = "select * from  vtiger_account where accountid=".$value;
 					$result = $adb->query($sql);
 					$accountname = $adb->query_result($result,0,"accountname");
 					$label_fld[] = '<a href="index.php?module='.$parent_module.'&action=DetailView&record='.$value.'">'.$accountname.'</a>';
@@ -651,7 +651,7 @@
 			if($parent_module == "Contacts")
 			{
 				$label_fld[] = $app_strings['LBL_CONTACT_NAME'];
-				$sql = "select * from  contactdetails where contactid=".$value;
+				$sql = "select * from  vtiger_contactdetails where contactid=".$value;
 				$result = $adb->query($sql);
 				$first_name = $adb->query_result($result,0,"firstname");
                                 $last_name = $adb->query_result($result,0,"lastname");
@@ -661,7 +661,7 @@
 			elseif($parent_module == "Accounts")
 			{
 				$label_fld[] = $app_strings['LBL_ACCOUNT_NAME'];
-				$sql = "select * from account where accountid=".$value;
+				$sql = "select * from vtiger_account where accountid=".$value;
 				$result = $adb->query($sql);
 				$account_name = $adb->query_result($result,0,"accountname");
 
@@ -833,7 +833,7 @@
 	return $label_fld;
 }
 
-/** This function returns a HTML output of associated products for a given entity (Quotes,Invoice,Sales order or Purchase order)
+/** This function returns a HTML output of associated vtiger_products for a given entity (Quotes,Invoice,Sales order or Purchase order)
   * Param $module - module name
   * Param $focus - module object
   * Return type string
@@ -870,19 +870,19 @@
 
 	if($module == 'Quotes')
 	{
-		$query="select products.productname,products.unit_price,products.qtyinstock,quotesproductrel.* from quotesproductrel inner join products on products.productid=quotesproductrel.productid where quoteid=".$focus->id;
+		$query="select vtiger_products.productname,vtiger_products.unit_price,vtiger_products.qtyinstock,vtiger_quotesproductrel.* from vtiger_quotesproductrel inner join vtiger_products on vtiger_products.productid=vtiger_quotesproductrel.productid where quoteid=".$focus->id;
 	}
 	elseif($module == 'PurchaseOrder')
 	{
-		$query="select products.productname,products.unit_price,products.qtyinstock,poproductrel.* from poproductrel inner join products on products.productid=poproductrel.productid where purchaseorderid=".$focus->id;
+		$query="select vtiger_products.productname,vtiger_products.unit_price,vtiger_products.qtyinstock,vtiger_poproductrel.* from vtiger_poproductrel inner join vtiger_products on vtiger_products.productid=vtiger_poproductrel.productid where purchaseorderid=".$focus->id;
 	}
 	elseif($module == 'SalesOrder')
 	{
-		$query="select products.productname,products.unit_price,products.qtyinstock,soproductrel.* from soproductrel inner join products on products.productid=soproductrel.productid where salesorderid=".$focus->id;
+		$query="select vtiger_products.productname,vtiger_products.unit_price,vtiger_products.qtyinstock,vtiger_soproductrel.* from vtiger_soproductrel inner join vtiger_products on vtiger_products.productid=vtiger_soproductrel.productid where salesorderid=".$focus->id;
 	}
 	elseif($module == 'Invoice')
 	{
-		$query="select products.productname,products.unit_price,products.qtyinstock,invoiceproductrel.* from invoiceproductrel inner join products on products.productid=invoiceproductrel.productid where invoiceid=".$focus->id;
+		$query="select vtiger_products.productname,vtiger_products.unit_price,vtiger_products.qtyinstock,vtiger_invoiceproductrel.* from vtiger_invoiceproductrel inner join vtiger_products on vtiger_products.productid=vtiger_invoiceproductrel.productid where invoiceid=".$focus->id;
 	}
 	$result = $adb->query($query);
 	$num_rows=$adb->num_rows($result);
@@ -954,7 +954,7 @@
 
 }
 
-/** This function returns the related tab details for a given entity or a module.
+/** This function returns the related vtiger_tab details for a given entity or a module.
 * Param $module - module name
 * Param $focus - module object
 * Return type is an array
@@ -970,7 +970,7 @@
 	
 	$cur_tab_id = getTabid($module);
 
-	$sql1 = "select * from relatedlists where tabid=".$cur_tab_id;
+	$sql1 = "select * from vtiger_relatedlists where tabid=".$cur_tab_id;
 	$result = $adb->query($sql1);
 	$num_row = $adb->num_rows($result);
 	for($i=0; $i<$num_row; $i++)
@@ -1001,8 +1001,8 @@
 /** 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
+* Param $col_fields - column vtiger_fields array for the module 
+* Param $tabid - vtiger_tab id
 * Return type is an array
 */
 

Modified: vtigercrm/trunk/include/utils/EditViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/EditViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/EditViewUtils.php Mon Jun 12 14:26:25 2006
@@ -24,12 +24,12 @@
 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
+/** This function returns the vtiger_field details for a given vtiger_fieldname.
+  * Param $uitype - UI type of the vtiger_field
+  * Param $fieldname - Form vtiger_field name
+  * Param $fieldlabel - Form vtiger_field label name
+  * Param $maxlength - maximum length of the vtiger_field
+  * Param $col_fields - array contains the vtiger_fieldname and values
   * Param $generatedtype - Field generated type (default is 1)
   * Param $module_name - module name
   * Return type is an array
@@ -110,7 +110,7 @@
 	elseif($uitype == 15 || $uitype == 16)
 	{
 		$editview_label[]=$mod_strings[$fieldlabel];
-		$pick_query="select * from ".$fieldname;
+		$pick_query="select * from vtiger_".$fieldname;
 		$pickListResult = $adb->query($pick_query);
 		$noofpickrows = $adb->num_rows($pickListResult);
 
@@ -340,7 +340,7 @@
 	{
 		$options =Array();
 		$editview_label[]=$mod_strings[$fieldlabel];
-		$pick_query="select * from groups";
+		$pick_query="select * from vtiger_groups";
 		$pickListResult = $adb->query($pick_query);
 		$noofpickrows = $adb->num_rows($pickListResult);
 		for($j = 0; $j < $noofpickrows; $j++)
@@ -364,7 +364,7 @@
 	{
 		$editview_label[]=$mod_strings[$fieldlabel];
 		$options = Array();
-		$pick_query="select * from salutationtype order by sortorderid";
+		$pick_query="select * from vtiger_salutationtype order by sortorderid";
 		$pickListResult = $adb->query($pick_query);
 		$noofpickrows = $adb->num_rows($pickListResult);
 		$salt_value = $col_fields["salutationtype"];
@@ -409,7 +409,7 @@
 		if($value=='')
 			$value=1;
 		$options = Array();
-		$pick_query="select * from duration_minutes order by sortorderid";
+		$pick_query="select * from vtiger_duration_minutes order by sortorderid";
 		$pickListResult = $adb->query($pick_query);
 		$noofpickrows = $adb->num_rows($pickListResult);
 		$salt_value = $col_fields["duration_minutes"];
@@ -481,10 +481,10 @@
 		}
 		if($col_fields['record_id'] != '')
 		{
-			$attachmentid=$adb->query_result($adb->query("select * from seattachmentsrel where crmid = ".$col_fields['record_id']),0,'attachmentsid');
+			$attachmentid=$adb->query_result($adb->query("select * from vtiger_seattachmentsrel where crmid = ".$col_fields['record_id']),0,'attachmentsid');
 			if($col_fields[$fieldname] == '' && $attachmentid != '')
 			{
-				$attachquery = "select * from attachments where attachmentsid=".$attachmentid;
+				$attachquery = "select * from vtiger_attachments where attachmentsid=".$attachmentid;
 				$value = $adb->query_result($adb->query($attachquery),0,'name');
 			}
 		}
@@ -500,11 +500,11 @@
 		//This query is for Products only
 		if($module_name == 'Products')
 		{
-			$query = 'select attachments.path,attachments.name from products left join seattachmentsrel on seattachmentsrel.crmid=products.productid inner join attachments on attachments.attachmentsid=seattachmentsrel.attachmentsid where productid='.$col_fields['record_id'];
+			$query = 'select vtiger_attachments.path,vtiger_attachments.name from vtiger_products left join vtiger_seattachmentsrel on vtiger_seattachmentsrel.crmid=vtiger_products.productid inner join vtiger_attachments on vtiger_attachments.attachmentsid=vtiger_seattachmentsrel.attachmentsid where productid='.$col_fields['record_id'];
 		}
 		else
 		{
-			$query = "select attachments.path, attachments.name from contactdetails left join seattachmentsrel on seattachmentsrel.crmid=contactdetails.contactid inner join attachments on attachments.attachmentsid=seattachmentsrel.attachmentsid where contactdetails.imagename=attachments.name and contactid=".$col_fields['record_id'];
+			$query = "select vtiger_attachments.path, vtiger_attachments.name from vtiger_contactdetails left join vtiger_seattachmentsrel on vtiger_seattachmentsrel.crmid=vtiger_contactdetails.contactid inner join vtiger_attachments on vtiger_attachments.attachmentsid=vtiger_seattachmentsrel.attachmentsid where vtiger_contactdetails.imagename=vtiger_attachments.name and contactid=".$col_fields['record_id'];
 		}
 		$result_image = $adb->query($query);
 		for($image_iter=0;$image_iter < $adb->num_rows($result_image);$image_iter++)	
@@ -530,7 +530,7 @@
 			$parent_module = getSalesEntityType($value);
 			if($parent_module == "Leads")
 			{
-				$sql = "select * from leaddetails where leadid=".$value;
+				$sql = "select * from vtiger_leaddetails where leadid=".$value;
 				$result = $adb->query($sql);
 				$first_name = $adb->query_result($result,0,"firstname");
 				$last_name = $adb->query_result($result,0,"lastname");
@@ -540,7 +540,7 @@
 			}
 			elseif($parent_module == "Accounts")
 			{
-				$sql = "select * from  account where accountid=".$value;
+				$sql = "select * from  vtiger_account where accountid=".$value;
 				$result = $adb->query($sql);
 				$parent_name = $adb->query_result($result,0,"accountname");
 				$account_selected = "selected";
@@ -548,7 +548,7 @@
 			}
 			elseif($parent_module == "Potentials")
 			{
-				$sql = "select * from  potential where potentialid=".$value;
+				$sql = "select * from  vtiger_potential where potentialid=".$value;
 				$result = $adb->query($sql);
 				$parent_name = $adb->query_result($result,0,"potentialname");
 				$potential_selected = "selected";
@@ -556,7 +556,7 @@
 			}
 			elseif($parent_module == "Products")
 			{
-				$sql = "select * from  products where productid=".$value;
+				$sql = "select * from  vtiger_products where productid=".$value;
 				$result = $adb->query($sql);
 				$parent_name= $adb->query_result($result,0,"productname");
 				$product_selected = "selected";
@@ -564,7 +564,7 @@
 			}
 			elseif($parent_module == "PurchaseOrder")
 			{
-				$sql = "select * from  purchaseorder where purchaseorderid=".$value;
+				$sql = "select * from  vtiger_purchaseorder where purchaseorderid=".$value;
 				$result = $adb->query($sql);
 				$parent_name= $adb->query_result($result,0,"subject");
 				$porder_selected = "selected";
@@ -572,7 +572,7 @@
 			}
 			elseif($parent_module == "SalesOrder")
 			{
-				$sql = "select * from  salesorder where salesorderid=".$value;
+				$sql = "select * from  vtiger_salesorder where salesorderid=".$value;
 				$result = $adb->query($sql);
 				$parent_name= $adb->query_result($result,0,"subject");
 				$sorder_selected = "selected";
@@ -580,7 +580,7 @@
 			}
 			elseif($parent_module == "Invoice")
 			{
-				$sql = "select * from  invoice where invoiceid=".$value;
+				$sql = "select * from  vtiger_invoice where invoiceid=".$value;
 				$result = $adb->query($sql);
 				$parent_name= $adb->query_result($result,0,"subject");
 				$invoice_selected = "selected";
@@ -614,7 +614,7 @@
 	{
 		if(isset($_REQUEST['parent_id']) && $_REQUEST['parent_id'] != '')
 			$value = $_REQUEST['parent_id'];
-		// Check for activity type if task orders to be added in select option
+		// Check for vtiger_activity type if task orders to be added in select option
 		$act_mode = $_REQUEST['activity_mode'];
 
 		if($value != '')
@@ -622,7 +622,7 @@
 			$parent_module = getSalesEntityType($value);
 			if($parent_module == "Leads")
 			{
-				$sql = "select * from leaddetails where leadid=".$value;
+				$sql = "select * from vtiger_leaddetails where leadid=".$value;
 				$result = $adb->query($sql);
 				$first_name = $adb->query_result($result,0,"firstname");
 				$last_name = $adb->query_result($result,0,"lastname");
@@ -632,7 +632,7 @@
 			}
 			elseif($parent_module == "Accounts")
 			{
-				$sql = "select * from  account where accountid=".$value;
+				$sql = "select * from  vtiger_account where accountid=".$value;
 				$result = $adb->query($sql);
 				$parent_name = $adb->query_result($result,0,"accountname");
 				$account_selected = "selected";
@@ -640,7 +640,7 @@
 			}
 			elseif($parent_module == "Potentials")
 			{
-				$sql = "select * from  potential where potentialid=".$value;
+				$sql = "select * from  vtiger_potential where potentialid=".$value;
 				$result = $adb->query($sql);
 				$parent_name = $adb->query_result($result,0,"potentialname");
 				$potential_selected = "selected";
@@ -648,7 +648,7 @@
 			}
 			elseif($parent_module == "Quotes")
 			{
-				$sql = "select * from  quotes where quoteid=".$value;
+				$sql = "select * from  vtiger_quotes where quoteid=".$value;
 				$result = $adb->query($sql);
 				$parent_name = $adb->query_result($result,0,"subject");
 				$quote_selected = "selected";
@@ -658,21 +658,21 @@
 			{
 				if($parent_module == "PurchaseOrder")
 				{
-					$sql = "select * from purchaseorder where purchaseorderid=".$value;
+					$sql = "select * from vtiger_purchaseorder where purchaseorderid=".$value;
 					$result = $adb->query($sql);
 					$parent_name = $adb->query_result($result,0,"subject");
 					$purchase_selected = "selected";
 				}
 				if($parent_module == "SalesOrder")
 				{
-					$sql = "select * from salesorder where salesorderid=".$value;
+					$sql = "select * from vtiger_salesorder where salesorderid=".$value;
 					$result = $adb->query($sql);
 					$parent_name = $adb->query_result($result,0,"subject");
 					$sales_selected = "selected";
 				}
 				if($parent_module == "Invoice")
 				{
-					$sql = "select * from invoice where invoiceid=".$value;
+					$sql = "select * from vtiger_invoice where invoiceid=".$value;
 					$result = $adb->query($sql);
 					$parent_name = $adb->query_result($result,0,"subject");
 					$invoice_selected = "selected";
@@ -762,7 +762,7 @@
 					$lead_selected = 'selected';
 				}
 				for ($j=1;$j<$nemail;$j++){
-					$querystr='select columnname from field where fieldid='.$realid[$j].';';
+					$querystr='select columnname from vtiger_field where fieldid='.$realid[$j].';';
 					$result=$adb->query($querystr);
 					$temp=$adb->query_result($result,0,'columnname');
 					$temp1=br2nl($myfocus->column_fields[$temp]);
@@ -793,7 +793,7 @@
 			$parent_name='';
 			$parent_id='';
 			$myemailid= $_REQUEST['record'];
-			$mysql = "select crmid from seactivityrel where activityid=".$myemailid;
+			$mysql = "select crmid from vtiger_seactivityrel where activityid=".$myemailid;
 			$myresult = $adb->query($mysql);
 			$mycount=$adb->num_rows($myresult);
 			if($mycount >0)
@@ -804,7 +804,7 @@
 					$parent_module = getSalesEntityType($mycrmid);
 					if($parent_module == "Leads")
 					{
-						$sql = "select firstname,lastname,email from leaddetails where leadid=".$mycrmid;
+						$sql = "select firstname,lastname,email from vtiger_leaddetails where leadid=".$mycrmid;
 						$result = $adb->query($sql);
 						$first_name = $adb->query_result($result,0,"firstname");
 						$last_name = $adb->query_result($result,0,"lastname");
@@ -815,7 +815,7 @@
 					}
 					elseif($parent_module == "Contacts")
 					{
-						$sql = "select * from  contactdetails where contactid=".$mycrmid;
+						$sql = "select * from  vtiger_contactdetails where contactid=".$mycrmid;
 						$result = $adb->query($sql);
 						$first_name = $adb->query_result($result,0,"firstname");
 						$last_name = $adb->query_result($result,0,"lastname");
@@ -826,7 +826,7 @@
 					}
 					elseif($parent_module == "Accounts")
 					{
-						$sql = "select * from  account where accountid=".$mycrmid;
+						$sql = "select * from  vtiger_account where accountid=".$mycrmid;
 						$result = $adb->query($sql);
 						$account_name = $adb->query_result($result,0,"accountname");
 						$myemail=$adb->query_result($result,0,"email1");
@@ -835,7 +835,7 @@
 						$account_selected = 'selected';
 					}elseif($parent_module == "Users")
 					{
-						$sql = "select user_name,email1 from users where id=".$mycrmid;
+						$sql = "select user_name,email1 from vtiger_users where id=".$mycrmid;
 						$result = $adb->query($sql);
 						$account_name = $adb->query_result($result,0,"user_name");
 						$myemail=$adb->query_result($result,0,"email1");
@@ -872,7 +872,7 @@
 			$parent_module = getSalesEntityType($value);
 			if($parent_module == "Contacts")
 			{
-				$sql = "select * from  contactdetails where contactid=".$value;
+				$sql = "select * from  vtiger_contactdetails where contactid=".$value;
 				$result = $adb->query($sql);
 				$first_name = $adb->query_result($result,0,"firstname");
 				$last_name = $adb->query_result($result,0,"lastname");
@@ -882,7 +882,7 @@
 			}
 			elseif($parent_module == "Accounts")
 			{
-				$sql = "select * from  account where accountid=".$value;
+				$sql = "select * from  vtiger_account where accountid=".$value;
 				$result = $adb->query($sql);
 				$parent_name = $adb->query_result($result,0,"accountname");
 				$account_selected = "selected";
@@ -1039,7 +1039,7 @@
 	return $final_arr;
 }
 
-/** This function returns the invoice object populated with the details from sales order object.
+/** This function returns the vtiger_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
@@ -1081,7 +1081,7 @@
 
 }
 
-/** This function returns the invoice object populated with the details from quote object.
+/** This function returns the vtiger_invoice object populated with the details from quote object.
 * Param $focus - Invoice object
 * Param $quote_focus - Quote order focus
 * Param $quoteid - quote id
@@ -1156,7 +1156,7 @@
 
 }
 
-/** This function returns the detailed list of products associated to a given entity or a record.
+/** This function returns the detailed list of vtiger_products associated to a given entity or a record.
 * Param $module - module name
 * Param $focus - module object
 * Param $seid - sales entity id
@@ -1176,27 +1176,27 @@
 	$product_Detail = Array();
 	if($module == 'Quotes')
 	{
-		$query="select products.productname,products.unit_price,products.qtyinstock,quotesproductrel.* from quotesproductrel inner join products on products.productid=quotesproductrel.productid where quoteid=".$focus->id;
+		$query="select vtiger_products.productname,vtiger_products.unit_price,vtiger_products.qtyinstock,vtiger_quotesproductrel.* from vtiger_quotesproductrel inner join vtiger_products on vtiger_products.productid=vtiger_quotesproductrel.productid where quoteid=".$focus->id;
 	}
 	elseif($module == 'PurchaseOrder')
 	{
-		$query="select products.productname,products.unit_price,products.qtyinstock,poproductrel.* from poproductrel inner join products on products.productid=poproductrel.productid where purchaseorderid=".$focus->id;
+		$query="select vtiger_products.productname,vtiger_products.unit_price,vtiger_products.qtyinstock,vtiger_poproductrel.* from vtiger_poproductrel inner join vtiger_products on vtiger_products.productid=vtiger_poproductrel.productid where purchaseorderid=".$focus->id;
 	}
 	elseif($module == 'SalesOrder')
 	{
-		$query="select products.productname,products.unit_price,products.qtyinstock,soproductrel.* from soproductrel inner join products on products.productid=soproductrel.productid where salesorderid=".$focus->id;
+		$query="select vtiger_products.productname,vtiger_products.unit_price,vtiger_products.qtyinstock,vtiger_soproductrel.* from vtiger_soproductrel inner join vtiger_products on vtiger_products.productid=vtiger_soproductrel.productid where salesorderid=".$focus->id;
 	}
 	elseif($module == 'Invoice')
 	{
-		$query="select products.productname,products.unit_price,products.qtyinstock,invoiceproductrel.* from invoiceproductrel inner join products on products.productid=invoiceproductrel.productid where invoiceid=".$focus->id;
+		$query="select vtiger_products.productname,vtiger_products.unit_price,vtiger_products.qtyinstock,vtiger_invoiceproductrel.* from vtiger_invoiceproductrel inner join vtiger_products on vtiger_products.productid=vtiger_invoiceproductrel.productid where invoiceid=".$focus->id;
 	}
 	elseif($module == 'Potentials')
 	{
-		$query="select products.productname,products.unit_price,products.qtyinstock,seproductsrel.* from products inner join seproductsrel on seproductsrel.productid=products.productid where crmid=".$seid;
+		$query="select vtiger_products.productname,vtiger_products.unit_price,vtiger_products.qtyinstock,vtiger_seproductsrel.* from vtiger_products inner join vtiger_seproductsrel on vtiger_seproductsrel.productid=vtiger_products.productid where crmid=".$seid;
 	}
 	elseif($module == 'Products')
 	{
-		$query="select products.productid,products.productname,products.unit_price,products.qtyinstock,crmentity.* from products inner join crmentity on crmentity.crmid=products.productid where crmentity.deleted=0 and productid=".$seid;
+		$query="select vtiger_products.productid,vtiger_products.productname,vtiger_products.unit_price,vtiger_products.qtyinstock,vtiger_crmentity.* from vtiger_products inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_products.productid where vtiger_crmentity.deleted=0 and productid=".$seid;
 	}
 
 	$result = $adb->query($query);
@@ -1260,7 +1260,7 @@
 
 }
 
-/** This function returns the no of products associated to the given entity or a record.
+/** This function returns the no of vtiger_products associated to the given entity or a record.
 * Param $module - module name
 * Param $focus - module object
 * Param $seid - sales entity id
@@ -1275,27 +1275,27 @@
 	$output = '';
 	if($module == 'Quotes')
 	{
-		$query="select products.productname,products.unit_price,quotesproductrel.* from quotesproductrel inner join products on products.productid=quotesproductrel.productid where quoteid=".$focus->id;
+		$query="select vtiger_products.productname,vtiger_products.unit_price,vtiger_quotesproductrel.* from vtiger_quotesproductrel inner join vtiger_products on vtiger_products.productid=vtiger_quotesproductrel.productid where quoteid=".$focus->id;
 	}
 	elseif($module == 'PurchaseOrder')
 	{
-		$query="select products.productname,products.unit_price,poproductrel.* from poproductrel inner join products on products.productid=poproductrel.productid where purchaseorderid=".$focus->id;
+		$query="select vtiger_products.productname,vtiger_products.unit_price,vtiger_poproductrel.* from vtiger_poproductrel inner join vtiger_products on vtiger_products.productid=vtiger_poproductrel.productid where purchaseorderid=".$focus->id;
 	}
 	elseif($module == 'SalesOrder')
 	{
-		$query="select products.productname,products.unit_price,soproductrel.* from soproductrel inner join products on products.productid=soproductrel.productid where salesorderid=".$focus->id;
+		$query="select vtiger_products.productname,vtiger_products.unit_price,vtiger_soproductrel.* from vtiger_soproductrel inner join vtiger_products on vtiger_products.productid=vtiger_soproductrel.productid where salesorderid=".$focus->id;
 	}
 	elseif($module == 'Invoice')
 	{
-		$query="select products.productname,products.unit_price,invoiceproductrel.* from invoiceproductrel inner join products on products.productid=invoiceproductrel.productid where invoiceid=".$focus->id;
+		$query="select vtiger_products.productname,vtiger_products.unit_price,vtiger_invoiceproductrel.* from vtiger_invoiceproductrel inner join vtiger_products on vtiger_products.productid=vtiger_invoiceproductrel.productid where invoiceid=".$focus->id;
 	}
 	elseif($module == 'Potentials')
 	{
-		$query="select products.productname,products.unit_price,seproductsrel.* from products inner join seproductsrel on seproductsrel.productid=products.productid where crmid=".$seid;
+		$query="select vtiger_products.productname,vtiger_products.unit_price,vtiger_seproductsrel.* from vtiger_products inner join vtiger_seproductsrel on vtiger_seproductsrel.productid=vtiger_products.productid where crmid=".$seid;
 	}	
 	elseif($module == 'Products')
 	{
-		$query="select products.productname,products.unit_price, crmentity.* from products inner join crmentity on crmentity.crmid=products.productid where crmentity.deleted=0 and productid=".$seid;
+		$query="select vtiger_products.productname,vtiger_products.unit_price, vtiger_crmentity.* from vtiger_products inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_products.productid where vtiger_crmentity.deleted=0 and productid=".$seid;
 	}
 
 
@@ -1309,8 +1309,8 @@
 * 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 $col_fields - vtiger_fields array
+* Param $tabid - vtiger_tab id
 * Param $info_type - information type (basic/advance) default ""
 * Return type is an object array
 */
@@ -1402,8 +1402,8 @@
 	
 }
 
-/** 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
+/** This function returns the data type of the vtiger_fields, with vtiger_field label, which is used for javascript validation.
+* Param $validationData - array of vtiger_fieldnames with datatype
 * Return type array 
 */
 

Modified: vtigercrm/trunk/include/utils/GetGroupUsers.php
==============================================================================
--- vtigercrm/trunk/include/utils/GetGroupUsers.php (original)
+++ vtigercrm/trunk/include/utils/GetGroupUsers.php Mon Jun 12 14:26:25 2006
@@ -10,7 +10,7 @@
  ********************************************************************************/
 
 
-/** Class to retreive all the users present in a group 
+/** Class to retreive all the vtiger_users present in a group 
  *
  */
 require_once('include/utils/UserInfoUtil.php');
@@ -21,17 +21,17 @@
 	var $group_users=array();
 	var $group_subgroups=array();
 
-	/** to get all the users and groups of the specified group
+	/** to get all the vtiger_users and vtiger_groups of the specified group
 	 * @params $groupId --> Group Id :: Type Integer
-         * @returns the users present in the group in the variable $parent_groups of the class
-         * @returns the sub groups present in the group in the variable $group_subgroups of the class
+         * @returns the vtiger_users present in the group in the variable $parent_groups of the class
+         * @returns the sub vtiger_groups present in the group in the variable $group_subgroups of the class
          */
 	function getAllUsersInGroup($groupid)
 	{
 		global $adb,$log;
 		$log->debug("Entering getAllUsersInGroup(".$groupid.") method...");
 		//Retreiving from the user2grouptable
-		$query="select * from users2group where groupid=".$groupid;
+		$query="select * from vtiger_users2group where groupid=".$groupid;
 		$result = $adb->query($query);
 		$num_rows=$adb->num_rows($result);
 		for($i=0;$i<$num_rows;$i++)
@@ -45,8 +45,8 @@
 		}
 		
 
-		//Retreiving from the group2role
-		$query="select * from group2role where groupid=".$groupid;
+		//Retreiving from the vtiger_group2role
+		$query="select * from vtiger_group2role where groupid=".$groupid;
                 $result = $adb->query($query);
                 $num_rows=$adb->num_rows($result);
                 for($i=0;$i<$num_rows;$i++)
@@ -66,8 +66,8 @@
 			
                 }
 
-		//Retreiving from the group2rs
-		$query="select * from group2rs where groupid=".$groupid;
+		//Retreiving from the vtiger_group2rs
+		$query="select * from vtiger_group2rs where groupid=".$groupid;
                 $result = $adb->query($query);
                 $num_rows=$adb->num_rows($result);
                 for($i=0;$i<$num_rows;$i++)
@@ -86,7 +86,7 @@
  
                 }
 		//Retreving from group2group
-		$query="select * from group2grouprel where groupid=".$groupid;
+		$query="select * from vtiger_group2grouprel where groupid=".$groupid;
                 $result = $adb->query($query);
                 $num_rows=$adb->num_rows($result);
                 for($i=0;$i<$num_rows;$i++)

Modified: vtigercrm/trunk/include/utils/GetParentGroups.php
==============================================================================
--- vtigercrm/trunk/include/utils/GetParentGroups.php (original)
+++ vtigercrm/trunk/include/utils/GetParentGroups.php Mon Jun 12 14:26:25 2006
@@ -16,7 +16,7 @@
 
 	var $parent_groups=Array();
 
-	/** to get all the parent groups of the specified group
+	/** to get all the parent vtiger_groups of the specified group
 	 * @params $groupId --> Group Id :: Type Integer
          * @returns updates the parent group in the varibale $parent_groups of the class
          */
@@ -24,7 +24,7 @@
 	{
 		global $adb,$log;
 		$log->debug("Entering getAllParentGroups(".$groupid.") method...");
-		$query="select groupid from group2grouprel where containsgroupid=".$groupId;
+		$query="select groupid from vtiger_group2grouprel where containsgroupid=".$groupId;
 		$adb->query($query);
 		$result=$adb->query($query);
 		$num_rows=$adb->num_rows($result);

Modified: vtigercrm/trunk/include/utils/GetUserGroups.php
==============================================================================
--- vtigercrm/trunk/include/utils/GetUserGroups.php (original)
+++ vtigercrm/trunk/include/utils/GetUserGroups.php Mon Jun 12 14:26:25 2006
@@ -20,7 +20,7 @@
 	var $user_groups=Array();
 	//var $userRole='';
 
-	/** to get all the parent groups of the specified group
+	/** to get all the parent vtiger_groups of the specified group
 	 * @params $groupId --> Group Id :: Type Integer
          * @returns updates the parent group in the varibale $parent_groups of the class
          */
@@ -29,7 +29,7 @@
 		global $adb,$log;
 		$log->debug("Entering getAllUserGroups(".$userid.") method...");
 		//Retreiving from the user2grouptable
-		$query="select * from users2group where userid=".$userid;
+		$query="select * from vtiger_users2group where userid=".$userid;
 		$result = $adb->query($query);
 		$num_rows=$adb->num_rows($result);
 		for($i=0;$i<$num_rows;$i++)
@@ -44,8 +44,8 @@
 
 		//Setting the User Role
 		$userRole = fetchUserRole($userid);
-		//Retreiving from the user2role
-		$query="select * from group2role where roleid='".$userRole."'";
+		//Retreiving from the vtiger_user2role
+		$query="select * from vtiger_group2role where roleid='".$userRole."'";
                 $result = $adb->query($query);
                 $num_rows=$adb->num_rows($result);
                 for($i=0;$i<$num_rows;$i++)
@@ -66,7 +66,7 @@
 			$parentRolelist .= "'".$par_rol_id."',";		
 		}
 		$parentRolelist .= "'".$userRole."')";
-		$query="select * from group2rs where roleandsubid in".$parentRolelist;
+		$query="select * from vtiger_group2rs where roleandsubid in".$parentRolelist;
                 $result = $adb->query($query);
                 $num_rows=$adb->num_rows($result);
                 for($i=0;$i<$num_rows;$i++)

Modified: vtigercrm/trunk/include/utils/InventoryUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/InventoryUtils.php (original)
+++ vtigercrm/trunk/include/utils/InventoryUtils.php Mon Jun 12 14:26:25 2006
@@ -11,8 +11,8 @@
 
 /**
  * This function returns the Product detail block values in array format.
- * Input Parameter are $module - module name, $focus - module object, $num_of_products - no.of products associated with it  * $associated_prod = associated product details
- * column fields/
+ * Input Parameter are $module - module name, $focus - module object, $num_of_products - no.of vtiger_products associated with it  * $associated_prod = associated product details
+ * column vtiger_fields/
  */
 
 function getProductDetailsBlockInfo($mode,$module,$focus='',$num_of_products='',$associated_prod='')
@@ -58,7 +58,7 @@
  * Param $productid - product id
  * Param $qty - product quantity in no's
  * Param $mode - mode type
- * Param $ext_prod_arr - existing products 
+ * Param $ext_prod_arr - existing vtiger_products 
  * Param $module - module name
  * return type void
  */
@@ -175,7 +175,7 @@
 		{
 			$notificationname = 'InvoiceNotification';
 		}
-		$query = "select * from inventorynotification where notificationname='".$notification_table."'";
+		$query = "select * from vtiger_inventorynotification where notificationname='".$notification_table."'";
 		$result = $adb->query($query);
 
 		$subject = $adb->query_result($result,0,'notificationsubject');
@@ -210,7 +210,7 @@
 	global $log;
 	$log->debug("Entering getPrdQtyInStck(".$product_id.") method ...");
 	global $adb;
-	$query1 = "SELECT qtyinstock FROM products WHERE productid = ".$product_id;
+	$query1 = "SELECT qtyinstock FROM vtiger_products WHERE productid = ".$product_id;
 	$result=$adb->query($query1);
 	$qtyinstck= $adb->query_result($result,0,"qtyinstock");
 	$log->debug("Exiting getPrdQtyInStck method ...");
@@ -227,7 +227,7 @@
 	global $log;
 	$log->debug("Entering getPrdReOrderLevel(".$product_id.") method ...");
 	global $adb;
-	$query1 = "SELECT reorderlevel FROM products WHERE productid = ".$product_id;
+	$query1 = "SELECT reorderlevel FROM vtiger_products WHERE productid = ".$product_id;
 	$result=$adb->query($query1);
 	$reorderlevel= $adb->query_result($result,0,"reorderlevel");
 	$log->debug("Exiting getPrdReOrderLevel method ...");
@@ -244,7 +244,7 @@
 	global $log;
 	$log->debug("Entering getPrdHandler(".$product_id.") method ...");
 	global $adb;
-	$query1 = "SELECT handler FROM products WHERE productid = ".$product_id;
+	$query1 = "SELECT handler FROM vtiger_products WHERE productid = ".$product_id;
 	$result=$adb->query($query1);
 	$handler= $adb->query_result($result,0,"handler");
 	$log->debug("Exiting getPrdHandler method ...");
@@ -253,14 +253,14 @@
 
 /**	function to get the taxid
  *	@param string $type - tax type (VAT or Sales or Service)
- *	return int   $taxid - taxid corresponding to the Tax type from inventorytaxinfo table
+ *	return int   $taxid - taxid corresponding to the Tax type from vtiger_inventorytaxinfo vtiger_table
  */
 function getTaxId($type)
 {
 	global $adb, $log;
 	$log->debug("Entering into getTaxId($type) function.");
 
-	$res = $adb->query("SELECT taxid FROM inventorytaxinfo WHERE taxname='$type'");
+	$res = $adb->query("SELECT taxid FROM vtiger_inventorytaxinfo WHERE taxname='$type'");
 	$taxid = $adb->query_result($res,0,'taxid');
 
 	$log->debug("Exiting from getTaxId($type) function. return value=$taxid");
@@ -269,7 +269,7 @@
 
 /**	function to get the taxpercentage
  *	@param string $type       - tax type (VAT or Sales or Service)
- *	return int $taxpercentage - taxpercentage corresponding to the Tax type from inventorytaxinfo table
+ *	return int $taxpercentage - taxpercentage corresponding to the Tax type from vtiger_inventorytaxinfo vtiger_table
  */
 function getTaxPercentage($type)
 {
@@ -278,7 +278,7 @@
 
 	$taxpercentage = '';
 
-	$res = $adb->query("SELECT percentage FROM inventorytaxinfo WHERE taxname = '$type'");
+	$res = $adb->query("SELECT percentage FROM vtiger_inventorytaxinfo WHERE taxname = '$type'");
 	$taxpercentage = $adb->query_result($res,0,'percentage');
 
 	$log->debug("Exiting from getTaxPercentage($type) function. return value=$taxpercentage");
@@ -289,7 +289,7 @@
  *	@param string $type       - tax type (VAT or Sales or Service)
  *	@param id  $productid     - productid to which we want the tax percentage
  *	@param id  $default       - if 'default' then first look for product's tax percentage and product's tax is empty then it will return the default configured tax percentage, else it will return the product's tax (not look for default value)
- *	return int $taxpercentage - taxpercentage corresponding to the Tax type from inventorytaxinfo table
+ *	return int $taxpercentage - taxpercentage corresponding to the Tax type from vtiger_inventorytaxinfo vtiger_table
  */
 function getProductTaxPercentage($type,$productid,$default='')
 {
@@ -299,11 +299,11 @@
 	$taxpercentage = '';
 
 	$res = $adb->query("SELECT taxpercentage
-			FROM inventorytaxinfo
-			INNER JOIN producttaxrel
-				ON inventorytaxinfo.taxid = producttaxrel.taxid
-			WHERE producttaxrel.productid = $productid
-			AND inventorytaxinfo.taxname = '$type'");
+			FROM vtiger_inventorytaxinfo
+			INNER JOIN vtiger_producttaxrel
+				ON vtiger_inventorytaxinfo.taxid = vtiger_producttaxrel.taxid
+			WHERE vtiger_producttaxrel.productid = $productid
+			AND vtiger_inventorytaxinfo.taxname = '$type'");
 	$taxpercentage = $adb->query_result($res,0,'taxpercentage');
 
 	//This is to retrive the default configured value if the taxpercentage related to product is empty

Modified: vtigercrm/trunk/include/utils/ListViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/ListViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/ListViewUtils.php Mon Jun 12 14:26:25 2006
@@ -49,10 +49,10 @@
 	$image_path=$theme_path."images/";
 	$list_header = Array();
 
-	//Get the tabid of the module
+	//Get the vtiger_tabid of the module
 	$tabid = getTabid($module);
 	global $current_user;
-	//added for customview 27/5
+	//added for vtiger_customview 27/5
 	if($oCv)
 	{
 		if(isset($oCv->list_fields))
@@ -86,17 +86,17 @@
 	if($is_admin==false)
 	{
 		$profileList = getCurrentUserProfileList();
-		$query  = "SELECT DISTINCT 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;
+		$query  = "SELECT DISTINCT vtiger_field.fieldname
+			FROM vtiger_field
+			INNER JOIN vtiger_profile2field
+				ON vtiger_profile2field.fieldid = vtiger_field.fieldid
+			INNER JOIN vtiger_def_org_field
+				ON vtiger_def_org_field.fieldid = vtiger_field.fieldid
+			WHERE vtiger_field.tabid = ".$tabid."
+			AND vtiger_profile2field.visible = 0
+			AND vtiger_def_org_field.visible = 0
+			AND vtiger_profile2field.profileid IN ".$profileList."
+			AND vtiger_field.fieldname IN ".$field_list;
 		$result = $adb->query($query);
 		$field=Array();
 		for($k=0;$k < $adb->num_rows($result);$k++)
@@ -106,10 +106,10 @@
 	}
 	//end
 
-	//modified for customview 27/5 - $app_strings change to $mod_strings
+	//modified for vtiger_customview 27/5 - $app_strings change to $mod_strings
 	foreach($focus->list_fields as $name=>$tableinfo)
 	{
-		//added for customview 27/5
+		//added for vtiger_customview 27/5
 		if($oCv)
 		{
 			if(isset($oCv->list_fields_name))
@@ -128,7 +128,7 @@
 		{
 			if(isset($focus->sortby_fields) && $focus->sortby_fields !='')
 			{
-				//Added on 14-12-2005 to avoid if and else check for every list field for arrow image and change order
+				//Added on 14-12-2005 to avoid if and else check for every list vtiger_field for arrow image and change order
 				$change_sorder = array('ASC'=>'DESC','DESC'=>'ASC');
 				$arrow_gif = array('ASC'=>'arrow_down.gif','DESC'=>'arrow_up.gif');
 
@@ -166,7 +166,7 @@
 							{
 								$lbl_name = $mod_strings[$name];
 							}
-							//added to display currency symbol in listview header
+							//added to display vtiger_currency symbol in listview header
 							if($lbl_name =='Amount')
 							{
 								$currencyid=fetchCurrency($current_user->id);
@@ -194,7 +194,7 @@
 
 				}
 			}
-																	//added to display currency symbol in related listview header
+																	//added to display vtiger_currency symbol in related listview header
 																	if($name =='Amount' && $relatedlist !='' )
 		{
 			$currencyid=fetchCurrency($current_user->id);
@@ -256,17 +256,17 @@
 	if($is_admin==false)
 	{
 		$profileList = getCurrentUserProfileList();
-		$query  = "SELECT DISTINCT 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;
+		$query  = "SELECT DISTINCT vtiger_field.fieldname
+			FROM vtiger_field
+			INNER JOIN vtiger_profile2field
+				ON vtiger_profile2field.fieldid = vtiger_field.fieldid
+			INNER JOIN vtiger_def_org_field
+				ON vtiger_def_org_field.fieldid = vtiger_field.fieldid
+			WHERE vtiger_field.tabid = ".$tabid."
+			AND vtiger_profile2field.visible=0
+			AND vtiger_def_org_field.visible=0
+			AND vtiger_profile2field.profileid IN ".$profileList."
+			AND vtiger_field.fieldname IN ".$field_list;
 		$result = $adb->query($query);
 		$field=Array();
 		for($k=0;$k < $adb->num_rows($result);$k++)
@@ -287,17 +287,17 @@
 		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."'";
+                	$query = "SELECT vtiger_profile2field.*
+				FROM vtiger_field
+				INNER JOIN vtiger_profile2field
+					ON vtiger_profile2field.fieldid = vtiger_field.fieldid
+				INNER JOIN vtiger_def_org_field
+					ON vtiger_def_org_field.fieldid = vtiger_field.fieldid
+				WHERE vtiger_field.tabid = ".$tabid."
+				AND vtiger_profile2field.visible = 0
+				AND vtiger_def_org_field.visible = 0
+				AND vtiger_profile2field.profileid IN ".$profileList."
+				AND vtiger_field.fieldname = '".$fieldname."'";
 
                 	$result = $adb->query($query);
                 }
@@ -431,11 +431,11 @@
 *Param $returnset - list query parameters in url string
 *Param $edit_action - Edit action value
 *Param $del_action - delete action value
-*Param $oCv - customview object
+*Param $oCv - vtiger_customview object
 *Returns an array type
 */
 
-//parameter added for customview $oCv 27/5
+//parameter added for vtiger_customview $oCv 27/5
 function getListViewEntries($focus, $module,$list_result,$navigation_array,$relatedlist='',$returnset='',$edit_action='EditView',$del_action='Delete',$oCv='')
 {
 	global $log;
@@ -449,10 +449,10 @@
 	$evt_status;
 	$theme_path="themes/".$theme."/";
 	$image_path=$theme_path."images/";
-	//getting the fieldtable entries from database
+	//getting the vtiger_fieldtable entries from database
 	$tabid = getTabid($module);
 
-	//added for customview 27/5
+	//added for vtiger_customview 27/5
 	if($oCv)
 	{
 		if(isset($oCv->list_fields))
@@ -485,17 +485,17 @@
 	if($is_admin==false)
 	{
 		$profileList = getCurrentUserProfileList();
-		$query  = "SELECT DISTINCT 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;
+		$query  = "SELECT DISTINCT vtiger_field.fieldname
+			FROM vtiger_field
+			INNER JOIN vtiger_profile2field
+				ON vtiger_profile2field.fieldid = vtiger_field.fieldid
+			INNER JOIN vtiger_def_org_field
+				ON vtiger_def_org_field.fieldid = vtiger_field.fieldid
+			WHERE vtiger_field.tabid = ".$tabid."
+			AND vtiger_profile2field.visible = 0
+			AND vtiger_def_org_field.visible = 0
+			AND vtiger_profile2field.profileid IN ".$profileList."
+			AND vtiger_field.fieldname IN ".$field_list;
 		$result = $adb->query($query);
 		$field=Array();
 		for($k=0;$k < $adb->num_rows($result);$k++)
@@ -507,7 +507,7 @@
 	$ui_col_array=Array();
 
 	$query = "SELECT uitype, columnname, fieldname
-		FROM field
+		FROM vtiger_field
 		WHERE tabid = ".$tabid."
 		AND fieldname IN".$field_list;
 	$result = $adb->query($query);
@@ -555,7 +555,7 @@
 		{
 			$fieldname = $focus->list_fields_name[$name];
 
-			//added for customview 27/5
+			//added for vtiger_customview 27/5
 			if($oCv)
 			{
 				if(isset($oCv->list_fields_name))
@@ -655,7 +655,7 @@
 					}
 					elseif($name=='Account Name')
 					{
-						//modified for customview 27/5
+						//modified for vtiger_customview 27/5
 						if($module == 'Accounts')
 						{
 							$account_id = $adb->query_result($list_result,$i-1,"crmid");
@@ -754,7 +754,7 @@
 *Param $returnset - list query parameters in url string
 *Param $edit_action - Edit action value
 *Param $del_action - delete action value
-*Param $oCv - customview object
+*Param $oCv - vtiger_customview object
 *Returns an array type
 */
 
@@ -770,7 +770,7 @@
 	$image_path=$theme_path."images/";
 	$list_block = Array();
 
-	//getting the fieldtable entries from database
+	//getting the vtiger_fieldtable entries from database
 	$tabid = getTabid($module);
 	require('user_privileges/user_privileges_'.$current_user->id.'.php');
 	
@@ -791,17 +791,17 @@
 	if($is_admin==false)
 	{
 		$profileList = getCurrentUserProfileList();
-		$query  = "SELECT DISTINCT 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;
+		$query  = "SELECT DISTINCT vtiger_field.fieldname
+			FROM vtiger_field
+			INNER JOIN vtiger_profile2field
+				ON vtiger_profile2field.fieldid = vtiger_field.fieldid
+			INNER JOIN vtiger_def_org_field
+				ON vtiger_def_org_field.fieldid = vtiger_field.fieldid
+			WHERE vtiger_field.tabid = ".$tabid."
+			AND vtiger_profile2field.visible = 0
+			AND vtiger_def_org_field.visible = 0
+			AND vtiger_profile2field.profileid IN ".$profileList."
+			AND vtiger_field.fieldname IN ".$field_list;
 		$result = $adb->query($query);
 		$field=Array();
 		for($k=0;$k < $adb->num_rows($result);$k++)
@@ -813,7 +813,7 @@
 	$ui_col_array=Array();
 
 	$query = "SELECT uitype, columnname, fieldname
-		FROM field
+		FROM vtiger_field
 		WHERE tabid=".$tabid."
 		AND fieldname IN ".$field_list;
 	$result = $adb->query($query);
@@ -844,17 +844,17 @@
 				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."'";
+					$query = "SELECT vtiger_profile2field.*
+						FROM vtiger_field
+						INNER JOIN vtiger_profile2field
+						ON vtiger_profile2field.fieldid = vtiger_field.fieldid
+						INNER JOIN vtiger_def_org_field
+						ON vtiger_def_org_field.fieldid = vtiger_field.fieldid
+						WHERE vtiger_field.tabid = ".$tabid."
+						AND vtiger_profile2field.visible = 0
+						AND vtiger_def_org_field.visible = 0
+						AND vtiger_profile2field.profileid IN ".$profileList."
+						AND vtiger_field.fieldname = '".$fieldname."'";
 
 					$result = $adb->query($query);
 				}
@@ -927,10 +927,10 @@
 }
 
 
-/**This function generates the value for a given field namee 
-*Param $field_result - field result in array
+/**This function generates the value for a given vtiger_field namee 
+*Param $field_result - vtiger_field result in array
 *Param $list_result - resultset of a listview query
-*Param $fieldname - field name
+*Param $fieldname - vtiger_field name
 *Param $focus - module object
 *Param $module - module name
 *Param $entity_id - entity id
@@ -993,7 +993,7 @@
 	elseif($uitype == 71 || $uitype == 72)
 	{
 		if($temp_val != '' && $temp_val != 0)
-		{       //changes made to remove currency symbol infront of each potential amount
+		{       //changes made to remove vtiger_currency symbol infront of each vtiger_potential amount
                         $value = $temp_val;
 		}
 		else
@@ -1029,7 +1029,7 @@
 		global $adb;
 		if($temp_val != '')
                 {
-			$sql="SELECT * FROM contactdetails WHERE contactid=".$temp_val;		
+			$sql="SELECT * FROM vtiger_contactdetails WHERE contactid=".$temp_val;		
 			$result=$adb->query($sql);
 			$firstname=$adb->query_result($result,0,"firstname");
 			$lastname=$adb->query_result($result,0,"lastname");
@@ -1057,7 +1057,7 @@
 	{
 			global $adb;
 
-	$attachmentid=$adb->query_result($adb->query("SELECT * FROM seattachmentsrel WHERE crmid = ".$entity_id),0,'attachmentsid');
+	$attachmentid=$adb->query_result($adb->query("SELECT * FROM vtiger_seattachmentsrel WHERE crmid = ".$entity_id),0,'attachmentsid');
 	$value = '<a href = "index.php?module=uploads&action=downloadfile&return_module='.$module.'&fileid='.$attachmentid.'&filename='.$temp_val.'">'.$temp_val.'</a>';
 
 	}
@@ -1349,9 +1349,9 @@
 						if($emailaddress == '')
 							$emailaddress=$adb->query_result($list_result,$list_result_count,"email2");
 
-						$querystr="SELECT fieldid,fieldlabel,columnname FROM field WHERE tabid=".getTabid($module)." and uitype=13;";
+						$querystr="SELECT fieldid,fieldlabel,columnname FROM vtiger_field WHERE tabid=".getTabid($module)." and uitype=13;";
 						$queryres = $adb->query($querystr);
-						//Change this index 0 - to get the fieldid based on email1 or email2
+						//Change this index 0 - to get the vtiger_fieldid based on email1 or email2
 						$fieldid = $adb->query_result($queryres,0,'fieldid');
 
 						$value = '<a href="a" LANGUAGE=javascript onclick=\'return set_return_emails('.$entity_id.','.$fieldid.',"'.$name.'","'.$emailaddress.'"); \'>'.$name.'</a>';
@@ -1365,9 +1365,9 @@
 						if($emailaddress == '')
 							$emailaddress=$adb->query_result($list_result,$list_result_count,"yahooid");
 
-						$querystr="SELECT fieldid,fieldlabel,columnname FROM field WHERE tabid=".getTabid($module)." and uitype=13;";
+						$querystr="SELECT fieldid,fieldlabel,columnname FROM vtiger_field WHERE tabid=".getTabid($module)." and uitype=13;";
 						$queryres = $adb->query($querystr);
-						//Change this index 0 - to get the fieldid based on email or yahooid
+						//Change this index 0 - to get the vtiger_fieldid based on email or yahooid
 						$fieldid = $adb->query_result($queryres,0,'fieldid');
 
 						//$value = '<a href="javascript: submitform('.$entity_id.');">'.$name.'</a>';
@@ -1403,7 +1403,7 @@
 				{
 					if($module == "Contacts")
                                         {
-                                                 $query="SELECT contactdetails.imagename FROM contactdetails WHERE lastname='".$temp_val."'";
+                                                 $query="SELECT vtiger_contactdetails.imagename FROM vtiger_contactdetails WHERE lastname='".$temp_val."'";
                                                 //echo $query;
                                                  $result = $adb->query($query);
                                                  $imagename=$adb->query_result($result,0,'imagename');
@@ -1462,7 +1462,7 @@
 		}
 	}
 	
-	// Mike Crowe Mod --------------------------------------------------------Make right justified and currency value
+	// Mike Crowe Mod --------------------------------------------------------Make right justified and vtiger_currency value
 	if ( in_array($uitype,array(71,72,7,9,90)) )
 	{
 		$value = '<span align="right">'.$value.'</div>';
@@ -1484,29 +1484,29 @@
 	$tab_id = getTabid($module);	
 	if($module == "HelpDesk")
 	{
-		$query = "SELECT crmentity.crmid, crmentity.smownerid,
-				troubletickets.title, troubletickets.status,
-				troubletickets.priority, troubletickets.parent_id,
-				contactdetails.contactid, 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 ticketgrouprelation
-				ON troubletickets.ticketid = ticketgrouprelation.ticketid
-			LEFT JOIN groups
-				ON groups.groupname = ticketgrouprelation.groupname
-			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 vtiger_crmentity.crmid, vtiger_crmentity.smownerid,
+			vtiger_troubletickets.title, vtiger_troubletickets.status,
+			vtiger_troubletickets.priority, vtiger_troubletickets.parent_id,
+			vtiger_contactdetails.contactid, vtiger_contactdetails.firstname,
+			vtiger_contactdetails.lastname, vtiger_account.accountid,
+			vtiger_account.accountname, vtiger_ticketcf.*
+			FROM vtiger_troubletickets
+			INNER JOIN vtiger_ticketcf
+				ON vtiger_ticketcf.ticketid = vtiger_troubletickets.ticketid
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_troubletickets.ticketid
+			LEFT JOIN vtiger_ticketgrouprelation
+				ON vtiger_troubletickets.ticketid = vtiger_ticketgrouprelation.ticketid
+			LEFT JOIN vtiger_groups
+				ON vtiger_groups.groupname = vtiger_ticketgrouprelation.groupname
+			LEFT JOIN vtiger_contactdetails
+				ON vtiger_troubletickets.parent_id = vtiger_contactdetails.contactid
+			LEFT JOIN vtiger_account
+				ON vtiger_account.accountid = vtiger_troubletickets.parent_id
+			LEFT JOIN vtiger_users
+				ON vtiger_crmentity.smownerid = vtiger_users.id
+				AND vtiger_troubletickets.ticketid = vtiger_ticketcf.ticketid
+			WHERE vtiger_crmentity.deleted = 0 ";
 		if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[$tab_id] == 3)
 		{
 				$sec_parameter=getListViewSecurityParameter($module);
@@ -1518,60 +1518,60 @@
 	if($module == "Accounts")
 	{
 		//Query modified to sort by assigned to
-		$query = "SELECT crmentity.crmid, crmentity.smownerid,
-				account.accountname, account.email1,
-				account.email2, account.website, account.phone,
-				accountbillads.city,
-				accountscf.*
-			FROM account
-			INNER JOIN crmentity
-				ON crmentity.crmid = account.accountid
-			INNER JOIN accountbillads
-				ON account.accountid = accountbillads.accountaddressid
-			INNER JOIN accountshipads
-				ON account.accountid = accountshipads.accountaddressid
-			INNER JOIN accountscf
-				ON account.accountid = accountscf.accountid
-			LEFT JOIN accountgrouprelation
-				ON accountscf.accountid = accountgrouprelation.accountid
-			LEFT JOIN groups
-				ON groups.groupname = accountgrouprelation.groupname
-			LEFT JOIN users
-				ON users.id = crmentity.smownerid
-			WHERE crmentity.deleted = 0 ";
+		$query = "SELECT vtiger_crmentity.crmid, vtiger_crmentity.smownerid,
+			vtiger_account.accountname, vtiger_account.email1,
+			vtiger_account.email2, vtiger_account.website, vtiger_account.phone,
+			vtiger_accountbillads.city,
+			vtiger_accountscf.*
+			FROM vtiger_account
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_account.accountid
+			INNER JOIN vtiger_accountbillads
+				ON vtiger_account.accountid = vtiger_accountbillads.accountaddressid
+			INNER JOIN vtiger_accountshipads
+				ON vtiger_account.accountid = vtiger_accountshipads.accountaddressid
+			INNER JOIN vtiger_accountscf
+				ON vtiger_account.accountid = vtiger_accountscf.accountid
+			LEFT JOIN vtiger_accountgrouprelation
+				ON vtiger_accountscf.accountid = vtiger_accountgrouprelation.accountid
+			LEFT JOIN vtiger_groups
+				ON vtiger_groups.groupname = vtiger_accountgrouprelation.groupname
+			LEFT JOIN vtiger_users
+				ON vtiger_users.id = vtiger_crmentity.smownerid
+			WHERE vtiger_crmentity.deleted = 0 ";
 
 	if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[$tab_id] == 3)
                 {
-                    $query .= "AND (crmentity.smownerid IN (".$current_user->id.")
-		   		 OR crmentity.smownerid IN (
-					 SELECT user2role.userid
-					 FROM user2role
-					 INNER JOIN users
-						 ON users.id = user2role.userid
-					 INNER JOIN role
-						 ON role.roleid = user2role.roleid
-					 WHERE role.parentrole LIKE '".$current_user_parent_role_seq."::%')
-					 OR crmentity.smownerid IN (
+                    $query .= "AND (vtiger_crmentity.smownerid IN (".$current_user->id.")
+		   		 OR vtiger_crmentity.smownerid IN (
+					 SELECT vtiger_user2role.userid
+					 FROM vtiger_user2role
+					 INNER JOIN vtiger_users
+						 ON vtiger_users.id = vtiger_user2role.userid
+					 INNER JOIN vtiger_role
+						 ON vtiger_role.roleid = vtiger_user2role.roleid
+					 WHERE vtiger_role.parentrole LIKE '".$current_user_parent_role_seq."::%')
+					 OR vtiger_crmentity.smownerid IN (
 						 SELECT shareduserid
-						 FROM tmp_read_user_sharing_per
+						 FROM vtiger_tmp_read_user_sharing_per
 						 WHERE userid=".$current_user->id."
 						 AND tabid=".$tab_id.")
-					 OR (crmentity.smownerid in (0)
+					 OR (vtiger_crmentity.smownerid in (0)
 					 AND (";
 
                         if(sizeof($current_user_groups) > 0)
                         {
                               $query .= "accountgrouprelation.groupname IN (
 				      		SELECT groupname
-						FROM groups
+						FROM vtiger_groups
 						WHERE groupid IN ".getCurrentUserGroupList().")
 					OR ";
                         }
                          $query .= "accountgrouprelation.groupname IN (
-				 	SELECT groups.groupname
-					FROM tmp_read_group_sharing_per
-					INNER JOIN groups
-						ON groups.groupid = tmp_read_group_sharing_per.sharedgroupid
+				 	SELECT vtiger_groups.groupname
+					FROM vtiger_tmp_read_group_sharing_per
+					INNER JOIN vtiger_groups
+						ON vtiger_groups.groupid = vtiger_tmp_read_group_sharing_per.sharedgroupid
 					WHERE userid=".$current_user->id."
 					AND tabid=".$tab_id.")))) ";
                 }
@@ -1580,27 +1580,27 @@
 	if ($module == "Potentials")
 	{
 		//Query modified to sort by assigned to
-		$query = "SELECT crmentity.crmid, crmentity.smownerid,
-				account.accountname,
-				potential.accountid, potential.potentialname,
-				potential.sales_stage, potential.amount,
-				potential.currency, potential.closingdate,
-				potential.typeofrevenue,
-				potentialscf.*
-			FROM potential
-			INNER JOIN crmentity
-				ON crmentity.crmid = potential.potentialid
-			INNER JOIN account
-				ON potential.accountid = account.accountid
-			INNER JOIN potentialscf
-				ON potentialscf.potentialid = 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 crmentity.deleted = 0 ".$where; 
+		$query = "SELECT vtiger_crmentity.crmid, vtiger_crmentity.smownerid,
+			vtiger_account.accountname,
+			vtiger_potential.accountid, vtiger_potential.potentialname,
+			vtiger_potential.sales_stage, vtiger_potential.amount,
+			vtiger_potential.currency, vtiger_potential.closingdate,
+			vtiger_potential.typeofrevenue,
+			vtiger_potentialscf.*
+			FROM vtiger_potential
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_potential.potentialid
+			INNER JOIN vtiger_account
+				ON vtiger_potential.accountid = vtiger_account.accountid
+			INNER JOIN vtiger_potentialscf
+				ON vtiger_potentialscf.potentialid = vtiger_potential.potentialid
+			LEFT JOIN vtiger_potentialgrouprelation
+				ON vtiger_potential.potentialid = vtiger_potentialgrouprelation.potentialid
+			LEFT JOIN vtiger_groups
+				ON vtiger_groups.groupname = vtiger_potentialgrouprelation.groupname
+			LEFT JOIN vtiger_users
+				ON vtiger_users.id = vtiger_crmentity.smownerid
+			WHERE vtiger_crmentity.deleted = 0 ".$where; 
 
 		if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[$tab_id] == 3)
 		{
@@ -1612,28 +1612,28 @@
 	}
 	if($module == "Leads")
 	{
-		$query = "SELECT crmentity.crmid, crmentity.smownerid,
-				leaddetails.firstname, leaddetails.lastname,
-				leaddetails.company, leadaddress.phone,
-				leadsubdetails.website, leaddetails.email,
-				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 ";
+		$query = "SELECT vtiger_crmentity.crmid, vtiger_crmentity.smownerid,
+			vtiger_leaddetails.firstname, vtiger_leaddetails.lastname,
+			vtiger_leaddetails.company, vtiger_leadaddress.phone,
+			vtiger_leadsubdetails.website, vtiger_leaddetails.email,
+			vtiger_leadscf.*
+			FROM vtiger_leaddetails
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_leaddetails.leadid
+			INNER JOIN vtiger_leadsubdetails
+				ON vtiger_leadsubdetails.leadsubscriptionid = vtiger_leaddetails.leadid
+			INNER JOIN vtiger_leadaddress
+				ON vtiger_leadaddress.leadaddressid = vtiger_leadsubdetails.leadsubscriptionid
+			INNER JOIN vtiger_leadscf
+				ON vtiger_leaddetails.leadid = vtiger_leadscf.leadid
+			LEFT JOIN vtiger_leadgrouprelation
+				ON vtiger_leadscf.leadid = vtiger_leadgrouprelation.leadid
+			LEFT JOIN vtiger_groups
+				ON vtiger_groups.groupname = vtiger_leadgrouprelation.groupname
+			LEFT JOIN vtiger_users
+				ON vtiger_users.id = vtiger_crmentity.smownerid
+			WHERE vtiger_crmentity.deleted = 0
+			AND vtiger_leaddetails.converted = 0 ";
                if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[$tab_id] == 3)
                 {
 			$sec_parameter=getListViewSecurityParameter($module);
@@ -1642,75 +1642,75 @@
 	}
 	if($module == "Products")
 	{
-		$query = "SELECT crmentity.crmid, products.*, productcf.*
-			FROM products
-			INNER JOIN crmentity
-				ON crmentity.crmid = products.productid
-			LEFT JOIN productcf
-				ON products.productid = productcf.productid
-			LEFT JOIN seproductsrel
-				ON seproductsrel.productid = products.productid
-			WHERE crmentity.deleted = 0
-			AND ((seproductsrel.crmid IS NULL
-					AND (products.contactid = 0
-						OR products.contactid IS NULL))
-				OR seproductsrel.crmid IN (".getReadEntityIds('Leads').")
-				OR seproductsrel.crmid IN (".getReadEntityIds('Accounts').")
-				OR seproductsrel.crmid IN (".getReadEntityIds('Potentials').")
-				OR products.contactid IN (".getReadEntityIds('Contacts').")) ";
+		$query = "SELECT vtiger_crmentity.crmid, vtiger_products.*, vtiger_productcf.*
+			FROM vtiger_products
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_products.productid
+			LEFT JOIN vtiger_productcf
+				ON vtiger_products.productid = vtiger_productcf.productid
+			LEFT JOIN vtiger_seproductsrel
+				ON vtiger_seproductsrel.productid = vtiger_products.productid
+			WHERE vtiger_crmentity.deleted = 0
+			AND ((vtiger_seproductsrel.crmid IS NULL
+					AND (vtiger_products.contactid = 0
+						OR vtiger_products.contactid IS NULL))
+				OR vtiger_seproductsrel.crmid IN (".getReadEntityIds('Leads').")
+				OR vtiger_seproductsrel.crmid IN (".getReadEntityIds('Accounts').")
+				OR vtiger_seproductsrel.crmid IN (".getReadEntityIds('Potentials').")
+				OR vtiger_products.contactid IN (".getReadEntityIds('Contacts').")) ";
 	}
         if($module == "Notes")
         {
-		$query = "SELECT crmentity.crmid, crmentity.modifiedtime,
-				notes.title, notes.contact_id, notes.filename,
-				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
-			AND ((senotesrel.crmid IS NULL
-					AND (notes.contact_id = 0
-						OR notes.contact_id IS NULL))
-				OR senotesrel.crmid IN (".getReadEntityIds('Leads').")
-				OR senotesrel.crmid IN (".getReadEntityIds('Accounts').")
-				OR senotesrel.crmid IN (".getReadEntityIds('Potentials').")
-				OR senotesrel.crmid IN (".getReadEntityIds('Products').")
-				OR senotesrel.crmid IN (".getReadEntityIds('Invoice').")
-				OR senotesrel.crmid IN (".getReadEntityIds('PurchaseOrder').")
-				OR senotesrel.crmid IN (".getReadEntityIds('SalesOrder').")
-				OR notes.contact_id IN (".getReadEntityIds('Contacts').")) ";
+		$query = "SELECT vtiger_crmentity.crmid, vtiger_crmentity.modifiedtime,
+			vtiger_notes.title, vtiger_notes.contact_id, vtiger_notes.filename,
+			vtiger_senotesrel.crmid AS relatedto,
+			vtiger_contactdetails.firstname, vtiger_contactdetails.lastname,
+			vtiger_notes.*
+			FROM vtiger_notes
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_notes.notesid
+			LEFT JOIN vtiger_senotesrel
+				ON vtiger_senotesrel.notesid = vtiger_notes.notesid
+			LEFT JOIN vtiger_contactdetails
+				ON vtiger_contactdetails.contactid = vtiger_notes.contact_id
+			WHERE vtiger_crmentity.deleted = 0
+			AND ((vtiger_senotesrel.crmid IS NULL
+					AND (vtiger_notes.contact_id = 0
+						OR vtiger_notes.contact_id IS NULL))
+				OR vtiger_senotesrel.crmid IN (".getReadEntityIds('Leads').")
+				OR vtiger_senotesrel.crmid IN (".getReadEntityIds('Accounts').")
+				OR vtiger_senotesrel.crmid IN (".getReadEntityIds('Potentials').")
+				OR vtiger_senotesrel.crmid IN (".getReadEntityIds('Products').")
+				OR vtiger_senotesrel.crmid IN (".getReadEntityIds('Invoice').")
+				OR vtiger_senotesrel.crmid IN (".getReadEntityIds('PurchaseOrder').")
+				OR vtiger_senotesrel.crmid IN (".getReadEntityIds('SalesOrder').")
+				OR vtiger_notes.contact_id IN (".getReadEntityIds('Contacts').")) ";
         }
 	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
-			LEFT JOIN users
-				ON users.id = crmentity.smownerid
-			WHERE crmentity.deleted = 0 ".$where;
+		$query = "SELECT vtiger_contactdetails.firstname, vtiger_contactdetails.lastname,
+			vtiger_contactdetails.title, vtiger_contactdetails.accountid,
+			vtiger_contactdetails.email, vtiger_contactdetails.phone,
+			vtiger_crmentity.smownerid, vtiger_crmentity.crmid
+			FROM vtiger_contactdetails
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_contactdetails.contactid
+			INNER JOIN vtiger_contactaddress
+				ON vtiger_contactdetails.contactid = vtiger_contactaddress.contactaddressid
+			INNER JOIN vtiger_contactsubdetails
+				ON vtiger_contactaddress.contactaddressid = vtiger_contactsubdetails.contactsubscriptionid
+			INNER JOIN vtiger_contactscf
+				ON vtiger_contactdetails.contactid = vtiger_contactscf.contactid
+			LEFT JOIN vtiger_account
+				ON vtiger_account.accountid = vtiger_contactdetails.accountid
+			LEFT JOIN vtiger_contactgrouprelation
+				ON vtiger_contactscf.contactid = vtiger_contactgrouprelation.contactid
+			LEFT JOIN vtiger_groups
+				ON vtiger_groups.groupname = vtiger_contactgrouprelation.groupname
+			LEFT JOIN vtiger_users
+				ON vtiger_users.id = vtiger_crmentity.smownerid
+			WHERE vtiger_crmentity.deleted = 0 ".$where;
 
 		if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[$tab_id] == 3)
 		{
@@ -1720,73 +1720,73 @@
         }
 	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 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;
+		$query = "SELECT vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.setype,
+			vtiger_activity.*,
+			vtiger_contactdetails.lastname, vtiger_contactdetails.firstname,
+			vtiger_contactdetails.contactid,
+			vtiger_account.accountid, vtiger_account.accountname,
+			vtiger_recurringevents.recurringtype
+			FROM vtiger_activity
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_activity.activityid
+			LEFT JOIN vtiger_cntactivityrel
+				ON vtiger_cntactivityrel.activityid = vtiger_activity.activityid
+			LEFT JOIN vtiger_contactdetails
+				ON vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid
+			LEFT JOIN vtiger_seactivityrel
+				ON vtiger_seactivityrel.activityid = vtiger_activity.activityid
+			LEFT JOIN vtiger_activitygrouprelation
+				ON vtiger_activitygrouprelation.activityid = vtiger_crmentity.crmid
+			LEFT JOIN vtiger_groups
+				ON vtiger_groups.groupname = vtiger_activitygrouprelation.groupname
+			LEFT JOIN vtiger_users
+				ON vtiger_users.id = vtiger_crmentity.smownerid
+			LEFT OUTER JOIN vtiger_account
+				ON vtiger_account.accountid = vtiger_contactdetails.accountid
+			LEFT OUTER JOIN vtiger_recurringevents
+				ON vtiger_recurringevents.activityid = vtiger_activity.activityid
+			WHERE vtiger_crmentity.deleted = 0
+			AND (vtiger_activity.activitytype = 'Meeting'
+				OR vtiger_activity.activitytype = 'Call'
+				OR vtiger_activity.activitytype = 'Task') ".$where;
 		if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[$tab_id] == 3)
 		{
 			$sec_parameter=getListViewSecurityParameter($module);
 			$query .= $sec_parameter;		
 
 		}
-		//$query .=" group by activity.activityid ";
+		//$query .=" group by vtiger_activity.activityid ";
 		//included by Jaguar
         }
 	if($module == "Emails")
         {
-		$query = "SELECT DISTINCT crmentity.crmid, crmentity.smownerid,
-				activity.activityid, activity.subject,
-				activity.date_start,
-				contactdetails.lastname, contactdetails.firstname,
-				contactdetails.contactid
-			FROM activity
-			INNER JOIN crmentity
-				ON crmentity.crmid = activity.activityid
-			LEFT JOIN users
-				ON users.id = crmentity.smownerid
-			LEFT JOIN seactivityrel
-				ON seactivityrel.activityid = activity.activityid
-			LEFT JOIN contactdetails
-				ON contactdetails.contactid = seactivityrel.crmid
-			LEFT JOIN cntactivityrel
-				ON cntactivityrel.activityid = activity.activityid
-				AND cntactivityrel.contactid = cntactivityrel.contactid
-			LEFT JOIN activitygrouprelation
-				ON activitygrouprelation.activityid = crmentity.crmid
-			LEFT JOIN groups
-				ON groups.groupname = activitygrouprelation.groupname
-			LEFT JOIN salesmanactivityrel
-				ON salesmanactivityrel.activityid = activity.activityid
-			LEFT JOIN emaildetails
-				ON emaildetails.emailid = activity.activityid
-			WHERE activity.activitytype = 'Emails'
-			AND crmentity.deleted = 0 ";
+		$query = "SELECT DISTINCT vtiger_crmentity.crmid, vtiger_crmentity.smownerid,
+			vtiger_activity.activityid, vtiger_activity.subject,
+			vtiger_activity.date_start,
+			vtiger_contactdetails.lastname, vtiger_contactdetails.firstname,
+			vtiger_contactdetails.contactid
+			FROM vtiger_activity
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_activity.activityid
+			LEFT JOIN vtiger_users
+				ON vtiger_users.id = vtiger_crmentity.smownerid
+			LEFT JOIN vtiger_seactivityrel
+				ON vtiger_seactivityrel.activityid = vtiger_activity.activityid
+			LEFT JOIN vtiger_contactdetails
+				ON vtiger_contactdetails.contactid = vtiger_seactivityrel.crmid
+			LEFT JOIN vtiger_cntactivityrel
+				ON vtiger_cntactivityrel.activityid = vtiger_activity.activityid
+				AND vtiger_cntactivityrel.contactid = vtiger_cntactivityrel.contactid
+			LEFT JOIN vtiger_activitygrouprelation
+				ON vtiger_activitygrouprelation.activityid = vtiger_crmentity.crmid
+			LEFT JOIN vtiger_groups
+				ON vtiger_groups.groupname = vtiger_activitygrouprelation.groupname
+			LEFT JOIN vtiger_salesmanactivityrel
+				ON vtiger_salesmanactivityrel.activityid = vtiger_activity.activityid
+			LEFT JOIN vtiger_emaildetails
+				ON vtiger_emaildetails.emailid = vtiger_activity.activityid
+			WHERE vtiger_activity.activitytype = 'Emails'
+			AND vtiger_crmentity.deleted = 0 ";
 		if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[$tab_id] == 3)
 		{
 			$sec_parameter=getListViewSecurityParameter($module);
@@ -1796,61 +1796,61 @@
 
 	if($module == "Faq")
 	{
-		$query = "SELECT crmentity.crmid, crmentity.createdtime, crmentity.modifiedtime,
-				faq.*
-			FROM faq
-			INNER JOIN crmentity
-				ON crmentity.crmid = faq.id
-			LEFT JOIN products
-				ON faq.product_id = products.productid
-			WHERE crmentity.deleted = 0";
+		$query = "SELECT vtiger_crmentity.crmid, vtiger_crmentity.createdtime, vtiger_crmentity.modifiedtime,
+			vtiger_faq.*
+			FROM vtiger_faq
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_faq.id
+			LEFT JOIN vtiger_products
+				ON vtiger_faq.product_id = vtiger_products.productid
+			WHERE vtiger_crmentity.deleted = 0";
 	}
 	
 	if($module == "Vendors")
 	{
-		$query = "SELECT crmentity.crmid, vendor.*
-			FROM vendor
-			INNER JOIN crmentity
-				ON crmentity.crmid = vendor.vendorid
-			WHERE crmentity.deleted = 0";
+		$query = "SELECT vtiger_crmentity.crmid, vtiger_vendor.*
+			FROM vtiger_vendor
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_vendor.vendorid
+			WHERE vtiger_crmentity.deleted = 0";
 	}
 	if($module == "PriceBooks")
 	{
-		$query = "SELECT crmentity.crmid, pricebook.*
-			FROM pricebook
-			INNER JOIN crmentity
-				ON crmentity.crmid = pricebook.pricebookid
-			WHERE crmentity.deleted = 0";
+		$query = "SELECT vtiger_crmentity.crmid, vtiger_pricebook.*
+			FROM vtiger_pricebook
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_pricebook.pricebookid
+			WHERE vtiger_crmentity.deleted = 0";
 	}
 	if($module == "Quotes")
 	{
 		//Query modified to sort by assigned to
-		$query = "SELECT crmentity.*,
-				quotes.*,
-				quotesbillads.*,
-				quotesshipads.*,
-				potential.potentialname,
-				account.accountname
-			FROM quotes
-			INNER JOIN crmentity
-				ON crmentity.crmid = quotes.quoteid
-			INNER JOIN quotesbillads
-				ON quotes.quoteid = quotesbillads.quotebilladdressid
-			INNER JOIN quotesshipads
-				ON quotes.quoteid = quotesshipads.quoteshipaddressid
-			LEFT JOIN quotescf
-				ON quotes.quoteid = quotescf.quoteid
-			LEFT OUTER JOIN account
-				ON account.accountid = quotes.accountid
-			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
-			LEFT JOIN users
-				ON users.id = crmentity.smownerid
-			WHERE crmentity.deleted = 0 ".$where;
+		$query = "SELECT vtiger_crmentity.*,
+			vtiger_quotes.*,
+			vtiger_quotesbillads.*,
+			vtiger_quotesshipads.*,
+			vtiger_potential.potentialname,
+			vtiger_account.accountname
+			FROM vtiger_quotes
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_quotes.quoteid
+			INNER JOIN vtiger_quotesbillads
+				ON vtiger_quotes.quoteid = vtiger_quotesbillads.quotebilladdressid
+			INNER JOIN vtiger_quotesshipads
+				ON vtiger_quotes.quoteid = vtiger_quotesshipads.quoteshipaddressid
+			LEFT JOIN vtiger_quotescf
+				ON vtiger_quotes.quoteid = vtiger_quotescf.quoteid
+			LEFT OUTER JOIN vtiger_account
+				ON vtiger_account.accountid = vtiger_quotes.accountid
+			LEFT OUTER JOIN vtiger_potential
+				ON vtiger_potential.potentialid = vtiger_quotes.potentialid
+			LEFT JOIN vtiger_quotegrouprelation
+				ON vtiger_quotes.quoteid = vtiger_quotegrouprelation.quoteid
+			LEFT JOIN vtiger_groups
+				ON vtiger_groups.groupname = vtiger_quotegrouprelation.groupname
+			LEFT JOIN vtiger_users
+				ON vtiger_users.id = vtiger_crmentity.smownerid
+			WHERE vtiger_crmentity.deleted = 0 ".$where;
 		if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[$tab_id] == 3)
 		{
 			$sec_parameter=getListViewSecurityParameter($module);
@@ -1860,29 +1860,29 @@
 	if($module == "PurchaseOrder")
         {
 		//Query modified to sort by assigned to
-                $query = "SELECT crmentity.*,
-				purchaseorder.*,
-				pobillads.*,
-				poshipads.*,
-				vendor.vendorname
-			FROM purchaseorder
-			INNER JOIN crmentity
-				ON crmentity.crmid = purchaseorder.purchaseorderid
-			LEFT OUTER JOIN vendor
-				ON purchaseorder.vendorid = vendor.vendorid
-			INNER JOIN pobillads
-				ON purchaseorder.purchaseorderid = pobillads.pobilladdressid
-			INNER JOIN poshipads
-				ON purchaseorder.purchaseorderid = poshipads.poshipaddressid
-			LEFT JOIN purchaseordercf
-				ON purchaseordercf.purchaseorderid = purchaseorder.purchaseorderid
-			LEFT JOIN pogrouprelation
-				ON purchaseorder.purchaseorderid = pogrouprelation.purchaseorderid
-			LEFT JOIN groups
-				ON groups.groupname = pogrouprelation.groupname
-			LEFT JOIN users
-				ON users.id = crmentity.smownerid
-			WHERE crmentity.deleted = 0 ";
+                $query = "SELECT vtiger_crmentity.*,
+			vtiger_purchaseorder.*,
+			vtiger_pobillads.*,
+			vtiger_poshipads.*,
+			vtiger_vendor.vendorname
+			FROM vtiger_purchaseorder
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_purchaseorder.purchaseorderid
+			LEFT OUTER JOIN vtiger_vendor
+				ON vtiger_purchaseorder.vendorid = vtiger_vendor.vendorid
+			INNER JOIN vtiger_pobillads
+				ON vtiger_purchaseorder.purchaseorderid = vtiger_pobillads.pobilladdressid
+			INNER JOIN vtiger_poshipads
+				ON vtiger_purchaseorder.purchaseorderid = vtiger_poshipads.poshipaddressid
+			LEFT JOIN vtiger_purchaseordercf
+				ON vtiger_purchaseordercf.purchaseorderid = vtiger_purchaseorder.purchaseorderid
+			LEFT JOIN vtiger_pogrouprelation
+				ON vtiger_purchaseorder.purchaseorderid = vtiger_pogrouprelation.purchaseorderid
+			LEFT JOIN vtiger_groups
+				ON vtiger_groups.groupname = vtiger_pogrouprelation.groupname
+			LEFT JOIN vtiger_users
+				ON vtiger_users.id = vtiger_crmentity.smownerid
+			WHERE vtiger_crmentity.deleted = 0 ";
 		if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[$tab_id] == 3)
 		{
 			$sec_parameter=getListViewSecurityParameter($module);
@@ -1892,32 +1892,32 @@
         if($module == "SalesOrder")
         {
 		//Query modified to sort by assigned to
-                $query = "SELECT crmentity.*,
-				salesorder.*,
-				sobillads.*,
-				soshipads.*,
-				quotes.subject AS quotename,
-				account.accountname
-			FROM salesorder
-			INNER JOIN crmentity
-				ON crmentity.crmid = salesorder.salesorderid
-			INNER JOIN sobillads
-				ON salesorder.salesorderid = sobillads.sobilladdressid
-			INNER JOIN soshipads
-				ON salesorder.salesorderid = soshipads.soshipaddressid
-			LEFT JOIN salesordercf
-				ON salesordercf.salesorderid = 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
-			LEFT JOIN users
-				ON users.id = crmentity.smownerid
-			WHERE crmentity.deleted = 0 ".$where;
+                $query = "SELECT vtiger_crmentity.*,
+			vtiger_salesorder.*,
+			vtiger_sobillads.*,
+			vtiger_soshipads.*,
+			vtiger_quotes.subject AS quotename,
+			vtiger_account.accountname
+			FROM vtiger_salesorder
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_salesorder.salesorderid
+			INNER JOIN vtiger_sobillads
+				ON vtiger_salesorder.salesorderid = vtiger_sobillads.sobilladdressid
+			INNER JOIN vtiger_soshipads
+				ON vtiger_salesorder.salesorderid = vtiger_soshipads.soshipaddressid
+			LEFT JOIN vtiger_salesordercf
+				ON vtiger_salesordercf.salesorderid = vtiger_salesorder.salesorderid
+			LEFT OUTER JOIN vtiger_quotes
+				ON vtiger_quotes.quoteid = vtiger_salesorder.quoteid
+			LEFT OUTER JOIN vtiger_account
+				ON vtiger_account.accountid = vtiger_salesorder.accountid
+			LEFT JOIN vtiger_sogrouprelation
+				ON vtiger_salesorder.salesorderid = vtiger_sogrouprelation.salesorderid
+			LEFT JOIN vtiger_groups
+				ON vtiger_groups.groupname = vtiger_sogrouprelation.groupname
+			LEFT JOIN vtiger_users
+				ON vtiger_users.id = vtiger_crmentity.smownerid
+			WHERE vtiger_crmentity.deleted = 0 ".$where;
 		if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[$tab_id] == 3)
 		{
 			$sec_parameter=getListViewSecurityParameter($module);
@@ -1928,29 +1928,29 @@
 	{
 		//Query modified to sort by assigned to
 		//query modified -Code contribute by Geoff(http://forums.vtiger.com/viewtopic.php?t=3376)
-		$query = "SELECT crmentity.*,
-				invoice.*,
-				invoicebillads.*,
-				invoiceshipads.*,
-				salesorder.subject AS salessubject
-			FROM invoice
-			INNER JOIN crmentity
-				ON crmentity.crmid = invoice.invoiceid
-			INNER JOIN invoicebillads
-				ON invoice.invoiceid = invoicebillads.invoicebilladdressid
-			INNER JOIN invoiceshipads
-				ON invoice.invoiceid = invoiceshipads.invoiceshipaddressid
-			LEFT OUTER JOIN salesorder
-				ON salesorder.salesorderid = invoice.salesorderid
-			INNER JOIN invoicecf
-				ON invoice.invoiceid = invoicecf.invoiceid
-			LEFT JOIN invoicegrouprelation
-				ON invoice.invoiceid = invoicegrouprelation.invoiceid
-			LEFT JOIN groups
-				ON groups.groupname = invoicegrouprelation.groupname
-			LEFT JOIN users
-				ON users.id = crmentity.smownerid
-			WHERE crmentity.deleted = 0 ".$where;
+		$query = "SELECT vtiger_crmentity.*,
+			vtiger_invoice.*,
+			vtiger_invoicebillads.*,
+			vtiger_invoiceshipads.*,
+			vtiger_salesorder.subject AS salessubject
+			FROM vtiger_invoice
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_invoice.invoiceid
+			INNER JOIN vtiger_invoicebillads
+				ON vtiger_invoice.invoiceid = vtiger_invoicebillads.invoicebilladdressid
+			INNER JOIN vtiger_invoiceshipads
+				ON vtiger_invoice.invoiceid = vtiger_invoiceshipads.invoiceshipaddressid
+			LEFT OUTER JOIN vtiger_salesorder
+				ON vtiger_salesorder.salesorderid = vtiger_invoice.salesorderid
+			INNER JOIN vtiger_invoicecf
+				ON vtiger_invoice.invoiceid = vtiger_invoicecf.invoiceid
+			LEFT JOIN vtiger_invoicegrouprelation
+				ON vtiger_invoice.invoiceid = vtiger_invoicegrouprelation.invoiceid
+			LEFT JOIN vtiger_groups
+				ON vtiger_groups.groupname = vtiger_invoicegrouprelation.groupname
+			LEFT JOIN vtiger_users
+				ON vtiger_users.id = vtiger_crmentity.smownerid
+			WHERE vtiger_crmentity.deleted = 0 ".$where;
 		if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[$tab_id] == 3)
 		{
 			$sec_parameter=getListViewSecurityParameter($module);
@@ -1961,18 +1961,18 @@
 	{
 		//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
-			LEFT JOIN campaigngrouprelation
-				ON campaign.campaignid = campaigngrouprelation.campaignid
-			LEFT JOIN groups
-				ON groups.groupname = campaigngrouprelation.groupname
-			LEFT JOIN users
-				ON users.id = crmentity.smownerid
-			WHERE crmentity.deleted = 0 ".$where;
+		$query = "SELECT vtiger_crmentity.*,
+			vtiger_campaign.*
+			FROM vtiger_campaign
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_campaign.campaignid
+			LEFT JOIN vtiger_campaigngrouprelation
+				ON vtiger_campaign.campaignid = vtiger_campaigngrouprelation.campaignid
+			LEFT JOIN vtiger_groups
+				ON vtiger_groups.groupname = vtiger_campaigngrouprelation.groupname
+			LEFT JOIN vtiger_users
+				ON vtiger_users.id = vtiger_crmentity.smownerid
+			WHERE vtiger_crmentity.deleted = 0 ".$where;
 		if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[$tab_id] == 3)
 		{
 			$sec_parameter=getListViewSecurityParameter($module);
@@ -1997,16 +1997,16 @@
 
 	if($module == "Leads")
 	{
-		$query = "SELECT crmentity.crmid
-			FROM leaddetails
-			INNER JOIN crmentity
-				ON crmentity.crmid = leaddetails.leadid
-			LEFT JOIN leadgrouprelation
-				ON leaddetails.leadid = leadgrouprelation.leadid
-			LEFT JOIN groups
-                                ON groups.groupname = leadgrouprelation.groupname
-			WHERE crmentity.deleted = 0
-			AND leaddetails.converted = 0 ";
+		$query = "SELECT vtiger_crmentity.crmid
+			FROM vtiger_leaddetails
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_leaddetails.leadid
+			LEFT JOIN vtiger_leadgrouprelation
+				ON vtiger_leaddetails.leadid = vtiger_leadgrouprelation.leadid
+			LEFT JOIN vtiger_groups
+                                ON vtiger_groups.groupname = vtiger_leadgrouprelation.groupname
+			WHERE vtiger_crmentity.deleted = 0
+			AND vtiger_leaddetails.converted = 0 ";
                if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[$tab_id] == 3)
                 {
 			$sec_parameter=getListViewSecurityParameter($module);
@@ -2019,15 +2019,15 @@
 	if($module == "Accounts")
 	{
 		//Query modified to sort by assigned to
-		$query = "SELECT crmentity.crmid
-			FROM account
-			INNER JOIN crmentity
-				ON crmentity.crmid = account.accountid
-			LEFT JOIN accountgrouprelation
-				ON account.accountid = accountgrouprelation.accountid
-			LEFT JOIN groups
-                                ON groups.groupname = accountgrouprelation.groupname
-			WHERE crmentity.deleted = 0 ";
+		$query = "SELECT vtiger_crmentity.crmid
+			FROM vtiger_account
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_account.accountid
+			LEFT JOIN vtiger_accountgrouprelation
+				ON vtiger_account.accountid = vtiger_accountgrouprelation.accountid
+			LEFT JOIN vtiger_groups
+                                ON vtiger_groups.groupname = vtiger_accountgrouprelation.groupname
+			WHERE vtiger_crmentity.deleted = 0 ";
 
 	if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[$tab_id] == 3)
                 {
@@ -2041,15 +2041,15 @@
 	if ($module == "Potentials")
 	{
 		//Query modified to sort by assigned to
-		$query = "SELECT crmentity.crmid
-			FROM potential
-			INNER JOIN crmentity
-				ON crmentity.crmid = potential.potentialid
-			LEFT JOIN potentialgrouprelation
-				ON potential.potentialid = potentialgrouprelation.potentialid
-			LEFT JOIN groups
-                                ON groups.groupname = potentialgrouprelation.groupname
-			WHERE crmentity.deleted = 0 "; 
+		$query = "SELECT vtiger_crmentity.crmid
+			FROM vtiger_potential
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_potential.potentialid
+			LEFT JOIN vtiger_potentialgrouprelation
+				ON vtiger_potential.potentialid = vtiger_potentialgrouprelation.potentialid
+			LEFT JOIN vtiger_groups
+                                ON vtiger_groups.groupname = vtiger_potentialgrouprelation.groupname
+			WHERE vtiger_crmentity.deleted = 0 "; 
 
 		if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[$tab_id] == 3)
 		{
@@ -2065,15 +2065,15 @@
 		//Query modified to sort by assigned to
 
 		
-		$query = "SELECT crmentity.crmid
-			FROM contactdetails
-			INNER JOIN crmentity
-				ON crmentity.crmid = contactdetails.contactid
-			LEFT JOIN contactgrouprelation
-				ON contactdetails.contactid = contactgrouprelation.contactid
-			LEFT JOIN groups
-                                ON groups.groupname = contactgrouprelation.groupname
-			WHERE crmentity.deleted = 0 ";
+		$query = "SELECT vtiger_crmentity.crmid
+			FROM vtiger_contactdetails
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_contactdetails.contactid
+			LEFT JOIN vtiger_contactgrouprelation
+				ON vtiger_contactdetails.contactid = vtiger_contactgrouprelation.contactid
+			LEFT JOIN vtiger_groups
+                                ON vtiger_groups.groupname = vtiger_contactgrouprelation.groupname
+			WHERE vtiger_crmentity.deleted = 0 ";
 
 		if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[$tab_id] == 3)
 		{
@@ -2083,34 +2083,34 @@
         }
 	if($module == "Products")
 	{
-		$query = "SELECT DISTINCT crmentity.crmid
-			FROM products
-			INNER JOIN crmentity
-				ON crmentity.crmid = products.productid
-			LEFT JOIN seproductsrel
-				ON seproductsrel.productid = products.productid
-			WHERE crmentity.deleted = 0
-			AND ((seproductsrel.crmid IS NULL
-					OR products.contactid = 0
-					OR products.contactid IS NULL)
-				OR seproductsrel.crmid IN (".getReadEntityIds('Leads').")
-				OR seproductsrel.crmid IN (".getReadEntityIds('Accounts').")
-				OR seproductsrel.crmid IN (".getReadEntityIds('Potentials').")
-				OR products.contactid IN (".getReadEntityIds('Contacts').")) ";
+		$query = "SELECT DISTINCT vtiger_crmentity.crmid
+			FROM vtiger_products
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_products.productid
+			LEFT JOIN vtiger_seproductsrel
+				ON vtiger_seproductsrel.productid = vtiger_products.productid
+			WHERE vtiger_crmentity.deleted = 0
+			AND ((vtiger_seproductsrel.crmid IS NULL
+					OR vtiger_products.contactid = 0
+					OR vtiger_products.contactid IS NULL)
+				OR vtiger_seproductsrel.crmid IN (".getReadEntityIds('Leads').")
+				OR vtiger_seproductsrel.crmid IN (".getReadEntityIds('Accounts').")
+				OR vtiger_seproductsrel.crmid IN (".getReadEntityIds('Potentials').")
+				OR vtiger_products.contactid IN (".getReadEntityIds('Contacts').")) ";
 	}
 
 	if($module == "PurchaseOrder")
         {
 		//Query modified to sort by assigned to
-                $query = "SELECT crmentity.crmid
-			FROM purchaseorder
-			INNER JOIN crmentity
-				ON crmentity.crmid = purchaseorder.purchaseorderid
-			LEFT JOIN pogrouprelation
-				ON purchaseorder.purchaseorderid = pogrouprelation.purchaseorderid
-			LEFT JOIN groups
-                                ON groups.groupname = pogrouprelation.groupname
-			WHERE crmentity.deleted = 0 ";
+                $query = "SELECT vtiger_crmentity.crmid
+			FROM vtiger_purchaseorder
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_purchaseorder.purchaseorderid
+			LEFT JOIN vtiger_pogrouprelation
+				ON vtiger_purchaseorder.purchaseorderid = vtiger_pogrouprelation.purchaseorderid
+			LEFT JOIN vtiger_groups
+                                ON vtiger_groups.groupname = vtiger_pogrouprelation.groupname
+			WHERE vtiger_crmentity.deleted = 0 ";
 		if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[$tab_id] == 3)
 		{
 			$sec_parameter=getListViewSecurityParameter($module);
@@ -2120,15 +2120,15 @@
         if($module == "SalesOrder")
         {
 		//Query modified to sort by assigned to
-                $query = "SELECT crmentity.crmid
-			FROM salesorder
-			INNER JOIN crmentity
-				ON crmentity.crmid = salesorder.salesorderid
-			LEFT JOIN sogrouprelation
-				ON salesorder.salesorderid = sogrouprelation.salesorderid
-			LEFT JOIN groups
-                                ON groups.groupname = sogrouprelation.groupname
-			WHERE crmentity.deleted = 0 ".$where;
+                $query = "SELECT vtiger_crmentity.crmid
+			FROM vtiger_salesorder
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_salesorder.salesorderid
+			LEFT JOIN vtiger_sogrouprelation
+				ON vtiger_salesorder.salesorderid = vtiger_sogrouprelation.salesorderid
+			LEFT JOIN vtiger_groups
+                                ON vtiger_groups.groupname = vtiger_sogrouprelation.groupname
+			WHERE vtiger_crmentity.deleted = 0 ".$where;
 		if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[$tab_id] == 3)
 		{
 			$sec_parameter=getListViewSecurityParameter($module);
@@ -2137,15 +2137,15 @@
         }
 	if($module == "Invoice")
 	{
-		$query = "SELECT crmentity.crmid
-			FROM invoice
-			INNER JOIN crmentity
-				ON crmentity.crmid = invoice.invoiceid
-			LEFT JOIN invoicegrouprelation
-				ON invoice.invoiceid = invoicegrouprelation.invoiceid
-			LEFT JOIN groups
-				ON groups.groupname = invoicegrouprelation.groupname
-			WHERE crmentity.deleted = 0 ".$where;
+		$query = "SELECT vtiger_crmentity.crmid
+			FROM vtiger_invoice
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_invoice.invoiceid
+			LEFT JOIN vtiger_invoicegrouprelation
+				ON vtiger_invoice.invoiceid = vtiger_invoicegrouprelation.invoiceid
+			LEFT JOIN vtiger_groups
+				ON vtiger_groups.groupname = vtiger_invoicegrouprelation.groupname
+			WHERE vtiger_crmentity.deleted = 0 ".$where;
 		if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[$tab_id] == 3)
 		{
 			$sec_parameter=getListViewSecurityParameter($module);
@@ -2159,7 +2159,7 @@
 }
 
 
-//parameter $viewid added for customview 27/5
+//parameter $viewid added for vtiger_customview 27/5
 function AlphabeticalSearch($module,$action,$fieldname,$query,$type,$popuptype='',$recordid='',$return_module='',$append_url='',$viewid='',$groupid='')
 {
 	global $log;
@@ -2208,43 +2208,43 @@
 		$parent_name=$app_strings['LBL_MULTIPLE'];
         }
         //Raju -- Ends
-			$parent_query = "SELECT accountname FROM account WHERE accountid=".$seid;
+			$parent_query = "SELECT accountname FROM vtiger_account WHERE accountid=".$seid;
 			$parent_result = $adb->query($parent_query);
 			$parent_name = $adb->query_result($parent_result,0,"accountname");
 		}
 		if($parent_module == 'Leads')
 		{
-			$parent_query = "SELECT firstname,lastname FROM leaddetails WHERE leadid=".$seid;
+			$parent_query = "SELECT firstname,lastname FROM vtiger_leaddetails WHERE leadid=".$seid;
 			$parent_result = $adb->query($parent_query);
 			$parent_name = $adb->query_result($parent_result,0,"lastname")." ".$adb->query_result($parent_result,0,"firstname");
 		}
 		if($parent_module == 'Potentials')
 		{
-			$parent_query = "SELECT potentialname FROM potential WHERE potentialid=".$seid;
+			$parent_query = "SELECT potentialname FROM vtiger_potential WHERE potentialid=".$seid;
 			$parent_result = $adb->query($parent_query);
 			$parent_name = $adb->query_result($parent_result,0,"potentialname");
 		}
 		if($parent_module == 'Products')
 		{
-			$parent_query = "SELECT productname FROM products WHERE productid=".$seid;
+			$parent_query = "SELECT productname FROM vtiger_products WHERE productid=".$seid;
 			$parent_result = $adb->query($parent_query);
 			$parent_name = $adb->query_result($parent_result,0,"productname");
 		}
 		if($parent_module == 'PurchaseOrder')
 		{
-			$parent_query = "SELECT subject FROM purchaseorder WHERE purchaseorderid=".$seid;
+			$parent_query = "SELECT subject FROM vtiger_purchaseorder WHERE purchaseorderid=".$seid;
 			$parent_result = $adb->query($parent_query);
 			$parent_name = $adb->query_result($parent_result,0,"subject");
 		}
 		if($parent_module == 'SalesOrder')
 		{
-			$parent_query = "SELECT subject FROM salesorder WHERE salesorderid=".$seid;
+			$parent_query = "SELECT subject FROM vtiger_salesorder WHERE salesorderid=".$seid;
 			$parent_result = $adb->query($parent_query);
 			$parent_name = $adb->query_result($parent_result,0,"subject");
 		}
 		if($parent_module == 'Invoice')
 		{
-			$parent_query = "SELECT subject FROM invoice WHERE invoiceid=".$seid;
+			$parent_query = "SELECT subject FROM vtiger_invoice WHERE invoiceid=".$seid;
 			$parent_result = $adb->query($parent_query);
 			$parent_name = $adb->query_result($parent_result,0,"subject");
 		}
@@ -2261,7 +2261,7 @@
 }
 
 
-//used in home page listTop files
+//used in home page listTop vtiger_files
 function getRelatedTo($module,$list_result,$rset)
 {
 	global $log;
@@ -2273,36 +2273,36 @@
         {
                 $notesid = $adb->query_result($list_result,$rset,"notesid");
                 $action = "DetailView";
-                $evt_query="SELECT senotesrel.crmid, crmentity.setype
-			FROM senotesrel
-			INNER JOIN crmentity
-				ON  senotesrel.crmid = crmentity.crmid
-			WHERE senotesrel.notesid ='".$notesid."'";
+                $evt_query="SELECT vtiger_senotesrel.crmid, vtiger_crmentity.setype
+			FROM vtiger_senotesrel
+			INNER JOIN vtiger_crmentity
+				ON  vtiger_senotesrel.crmid = vtiger_crmentity.crmid
+			WHERE vtiger_senotesrel.notesid ='".$notesid."'";
 	}else if($module == "Products")
 	{
 		$productid = $adb->query_result($list_result,$rset,"productid");
                 $action = "DetailView";
-                $evt_query="SELECT seproductsrel.crmid, crmentity.setype
-			FROM seproductsrel
-			INNER JOIN crmentity
-				ON seproductsrel.crmid = crmentity.crmid
-			WHERE seproductsrel.productid ='".$productid."'";
+                $evt_query="SELECT vtiger_seproductsrel.crmid, vtiger_crmentity.setype
+			FROM vtiger_seproductsrel
+			INNER JOIN vtiger_crmentity
+				ON vtiger_seproductsrel.crmid = vtiger_crmentity.crmid
+			WHERE vtiger_seproductsrel.productid ='".$productid."'";
 
 	}else
 	{
 		$activity_id = $adb->query_result($list_result,$rset,"activityid");
 		$action = "DetailView";
-		$evt_query="SELECT seactivityrel.crmid, crmentity.setype
-			FROM seactivityrel
-			INNER JOIN crmentity
-				ON  seactivityrel.crmid = crmentity.crmid
-			WHERE seactivityrel.activityid='".$activity_id."'";
+		$evt_query="SELECT vtiger_seactivityrel.crmid, vtiger_crmentity.setype
+			FROM vtiger_seactivityrel
+			INNER JOIN vtiger_crmentity
+				ON  vtiger_seactivityrel.crmid = vtiger_crmentity.crmid
+			WHERE vtiger_seactivityrel.activityid='".$activity_id."'";
 
 		if($module == 'HelpDesk')
 		{
 			$activity_id = $adb->query_result($list_result,$rset,"parent_id");
 			if($activity_id != '')
-				$evt_query = "SELECT * FROM crmentity WHERE crmid=".$activity_id;
+				$evt_query = "SELECT * FROM vtiger_crmentity WHERE crmid=".$activity_id;
 		}
 	}
 	//added by raju to change the related to in emails inot multiple if email is for more than one contact
@@ -2326,55 +2326,55 @@
 	$action = "DetailView";
         if($parent_module == 'Accounts')
         {
-                $parent_query = "SELECT accountname FROM account WHERE accountid=".$parent_id;
+                $parent_query = "SELECT accountname FROM vtiger_account WHERE accountid=".$parent_id;
                 $parent_result = $adb->query($parent_query);
                 $parent_name = $adb->query_result($parent_result,0,"accountname");
         }
         if($parent_module == 'Leads')
         {
-                $parent_query = "SELECT firstname,lastname FROM leaddetails WHERE leadid=".$parent_id;
+                $parent_query = "SELECT firstname,lastname FROM vtiger_leaddetails WHERE leadid=".$parent_id;
                 $parent_result = $adb->query($parent_query);
                 $parent_name = $adb->query_result($parent_result,0,"lastname")." ".$adb->query_result($parent_result,0,"firstname");
         }
         if($parent_module == 'Potentials')
         {
-                $parent_query = "SELECT potentialname FROM potential WHERE potentialid=".$parent_id;
+                $parent_query = "SELECT potentialname FROM vtiger_potential WHERE potentialid=".$parent_id;
                 $parent_result = $adb->query($parent_query);
                 $parent_name = $adb->query_result($parent_result,0,"potentialname");
         }
         if($parent_module == 'Products')
         {
-                $parent_query = "SELECT productname FROM products WHERE productid=".$parent_id;
+                $parent_query = "SELECT productname FROM vtiger_products WHERE productid=".$parent_id;
                 $parent_result = $adb->query($parent_query);
                 $parent_name = $adb->query_result($parent_result,0,"productname");
         }
 	if($parent_module == 'Quotes')
         {
-                $parent_query = "SELECT subject FROM quotes WHERE quoteid=".$parent_id;
+                $parent_query = "SELECT subject FROM vtiger_quotes WHERE quoteid=".$parent_id;
                 $parent_result = $adb->query($parent_query);
                 $parent_name = $adb->query_result($parent_result,0,"subject");
         }
 	if($parent_module == 'PurchaseOrder')
         {
-                $parent_query = "SELECT subject FROM purchaseorder WHERE purchaseorderid=".$parent_id;
+                $parent_query = "SELECT subject FROM vtiger_purchaseorder WHERE purchaseorderid=".$parent_id;
                 $parent_result = $adb->query($parent_query);
                 $parent_name = $adb->query_result($parent_result,0,"subject");
         }
 	if($parent_module == 'Invoice')
         {
-                $parent_query = "SELECT subject FROM invoice WHERE invoiceid=".$parent_id;
+                $parent_query = "SELECT subject FROM vtiger_invoice WHERE invoiceid=".$parent_id;
                 $parent_result = $adb->query($parent_query);
                 $parent_name = $adb->query_result($parent_result,0,"subject");
         }
         if($parent_module == 'SalesOrder')
         {
-                $parent_query = "SELECT subject FROM salesorder WHERE salesorderid=".$parent_id;
+                $parent_query = "SELECT subject FROM vtiger_salesorder WHERE salesorderid=".$parent_id;
                 $parent_result = $adb->query($parent_query);
                 $parent_name = $adb->query_result($parent_result,0,"subject");
         }
 	if($parent_module == 'Contacts' && ($module == 'Emails' || $module == 'HelpDesk'))
         {
-                $parent_query = "SELECT firstname,lastname FROM contactdetails WHERE contactid=".$parent_id;
+                $parent_query = "SELECT firstname,lastname FROM vtiger_contactdetails WHERE contactid=".$parent_id;
                 $parent_result = $adb->query($parent_query);
                 $parent_name = $adb->query_result($parent_result,0,"lastname")." ".$adb->query_result($parent_result,0,"firstname");
         }
@@ -2460,11 +2460,11 @@
 
 	if($currentmodule=="Contacts" && $returnmodule == "Potentials")
 	{
-		$query = "SELECT contactid FROM contpotentialrel WHERE potentialid = ".$recordid;
+		$query = "SELECT contactid FROM vtiger_contpotentialrel WHERE potentialid = ".$recordid;
 	}
 	elseif($currentmodule=="Contacts" && $returnmodule == "Vendors")
 	{
-		$query = "SELECT contactid FROM vendorcontactrel WHERE vendorid = ".$recordid;
+		$query = "SELECT contactid FROM vtiger_vendorcontactrel WHERE vendorid = ".$recordid;
 	}
 
 	if($query !='')
@@ -2477,7 +2477,7 @@
 				$skip_id[]=$adb->query_result($result,$k,"contactid");
 			}
 			$skipids = constructList($skip_id,'INTEGER');
-			$where_relquery = "and contactdetails.contactid not in ".$skipids;
+			$where_relquery = "and vtiger_contactdetails.contactid not in ".$skipids;
 		}
 	}
 	$log->debug("Exiting getRelCheckquery method ...");

Modified: vtigercrm/trunk/include/utils/SearchUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/SearchUtils.php (original)
+++ vtigercrm/trunk/include/utils/SearchUtils.php Mon Jun 12 14:26:25 2006
@@ -16,7 +16,7 @@
 require_once('include/utils/CommonUtils.php'); //new
 	
 $column_array=array('accountid','contact_id');
-$table_col_array=array('account.accountname','contactdetails.firstname,contactdetails.lastname');
+$table_col_array=array('vtiger_account.accountname','vtiger_contactdetails.firstname,vtiger_contactdetails.lastname');
 
 /**This function is used to get the list view header values in a list view during search
 *Param $focus - module object
@@ -44,10 +44,10 @@
         $image_path=$theme_path."images/";
         $search_header = Array();
 
-        //Get the tabid of the module
+        //Get the vtiger_tabid of the module
         //require_once('include/utils/UserInfoUtil.php')
         $tabid = getTabid($module);
-        //added for customview 27/5
+        //added for vtiger_customview 27/5
         if($oCv)
         {
                 if(isset($oCv->list_fields))
@@ -55,7 +55,7 @@
                         $focus->list_fields = $oCv->list_fields;
                 }
         }
-	//Added to reduce the no. of queries logging for non-admin users -- by Minnie-start
+	//Added to reduce the no. of queries logging for non-admin vtiger_users -- by Minnie-start
 	$field_list ='(';
 	$j=0;
 	require('user_privileges/user_privileges_'.$current_user->id.'.php');
@@ -77,12 +77,12 @@
 		$j++;
 	}
 	$field_list .=')';
-	//Getting the Entries from Profile2 field table
+	//Getting the Entries from Profile2 vtiger_field vtiger_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";
+		//changed to get vtiger_field.fieldname
+		$query  = "select vtiger_profile2field.*,vtiger_field.fieldname from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.tabid=".$tabid." and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0  and vtiger_profile2field.profileid in ".$profileList." and vtiger_field.fieldname in ".$field_list." group by vtiger_field.fieldid";
 		$result = $adb->query($query);
 		$field=Array();
 		for($k=0;$k < $adb->num_rows($result);$k++)
@@ -91,11 +91,11 @@
 		}
 	}
 
-        //modified for customview 27/5 - $app_strings change to $mod_strings
+        //modified for vtiger_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
+                //$fieldname = $focus->list_fields_name[$name];  //commented for vtiger_customview 27/5
+                //added for vtiger_customview 27/5
                 if($oCv)
                 {
                         if(isset($oCv->list_fields_name))
@@ -122,7 +122,7 @@
 		{
                         if(isset($focus->sortby_fields) && $focus->sortby_fields !='')
                         {
-                                //Added on 14-12-2005 to avoid if and else check for every list field for arrow image and change order
+                                //Added on 14-12-2005 to avoid if and else check for every list vtiger_field for arrow image and change order
 
                                 foreach($focus->list_fields[$name] as $tab=>$col)
                                 {
@@ -228,7 +228,7 @@
 }
 
 /**This function is used to get user_id's for a given user_name during search
-*Param $table_name - tablename
+*Param $table_name - vtiger_tablename
 *Param $column_name - columnname
 *Param $search_string - searchstring value (username)
 *Returns the where conditions for list query in string format
@@ -240,7 +240,7 @@
 	global $log;
         $log->debug("Entering get_usersid(".$table_name.",".$column_name.",".$search_string.") method ...");
 	global $adb;
-	$user_qry="select distinct(users.id)from users inner join crmentity on crmentity.smownerid=users.id where users.user_name like '%".$search_string."%' ";
+	$user_qry="select distinct(vtiger_users.id)from vtiger_users inner join vtiger_crmentity on vtiger_crmentity.smownerid=vtiger_users.id where vtiger_users.user_name like '%".$search_string."%' ";
 	$user_result=$adb->query($user_qry);
 	$noofuser_rows=$adb->num_rows($user_result);
 	$x=$noofuser_rows-1;
@@ -256,7 +256,7 @@
 				$where .= " or ";
 			}
 		}
-		$where.=" or groups.groupname like '%".$search_string."%')";
+		$where.=" or vtiger_groups.groupname like '%".$search_string."%')";
 	}
 	else
 	{
@@ -267,7 +267,7 @@
 	return $where;	
 }
 
-/**This function is used to get where conditions for a given accountid or contactid during search for their respective names
+/**This function is used to get where conditions for a given vtiger_accountid or contactid during search for their respective names
 *Param $column_name - columnname
 *Param $search_string - searchstring value (username)
 *Returns the where conditions for list query in string format
@@ -331,7 +331,7 @@
 		$where="$table_name.$column_name like '%".$search_string."%'";	
 	}else
 	{	
-		$qry="select field.columnname,tablename from tab inner join field on field.tabid=tab.tabid where name='".$module."' and fieldname='".$search_field."'";
+		$qry="select vtiger_field.columnname,tablename from vtiger_tab inner join vtiger_field on vtiger_field.tabid=vtiger_tab.tabid where name='".$module."' and fieldname='".$search_field."'";
 		$result = $adb->query($qry);
 		$noofrows = $adb->num_rows($result);
 		if($noofrows!=0)
@@ -345,7 +345,7 @@
 			}
 			elseif($table_name == "activity" && $column_name == "status")
 			{
-				$where="$table_name.$column_name like '%".$search_string."%' or activity.eventstatus like '%".$search_string."%'";
+				$where="$table_name.$column_name like '%".$search_string."%' or vtiger_activity.eventstatus like '%".$search_string."%'";
 			}
 			else if(in_array($column_name,$column_array))
 			{
@@ -378,18 +378,18 @@
 
 	if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0)
 	{
-		$sql = "select * from field ";
-		$sql.= " where field.tabid=".$tabid." and";
-		$sql.= " field.displaytype in (1,2)";
+		$sql = "select * from vtiger_field ";
+		$sql.= " where vtiger_field.tabid=".$tabid." and";
+		$sql.= " vtiger_field.displaytype in (1,2)";
 		$sql.= " order by block,sequence";
 	}
 	else
 	{
 		$profileList = getCurrentUserProfileList();
-		$sql = "select * from field inner join profile2field on profile2field.fieldid=field.fieldid inner join def_org_field on def_org_field.fieldid=field.fieldid ";
-		$sql.= " where field.tabid=".$tabid." and";
-		$sql.= " field.displaytype in (1,2) and profile2field.visible=0";
-		$sql.= " and def_org_field.visible=0  and profile2field.profileid in ".$profileList." order by block,sequence";
+		$sql = "select * from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid ";
+		$sql.= " where vtiger_field.tabid=".$tabid." and";
+		$sql.= " vtiger_field.displaytype in (1,2) and vtiger_profile2field.visible=0";
+		$sql.= " and vtiger_def_org_field.visible=0  and vtiger_profile2field.profileid in ".$profileList." order by block,sequence";
 	}
 
 
@@ -410,10 +410,10 @@
 		{
 			$module_columnlist['crmentity:crmid::HelpDesk_Ticket ID:I'] = 'Ticket ID';
 		}
-		//Added to include activity type in activity customview list
+		//Added to include vtiger_activity type in vtiger_activity vtiger_customview list
 		if($module == 'Activities' && $block == 19)
 		{
-			$module_columnlist['activity:activitytype:activitytype:Activities_Activity Type:C'] = 'Activity Type';
+			$module_columnlist['vtiger_activity:activitytype:activitytype:Activities_Activity Type:C'] = 'Activity Type';
 		}
 		if($fieldlabel == "Related To")
 		{
@@ -423,7 +423,7 @@
 		{
 			$fieldlabel = "Start Date";
 			if($module == 'Activities' && $block == 19)
-				$module_columnlist['activity:time_start::Activities_Start Time:I'] = 'Start Time';
+				$module_columnlist['vtiger_activity:time_start::Activities_Start Time:I'] = 'Start Time';
 
 		}
 		$fieldlabel1 = str_replace(" ","_",$fieldlabel);
@@ -456,7 +456,7 @@
 /**This function is returns the where conditions for each search criteria option in Advance Search
 *Param $criteria - search criteria option
 *Param $searchstring - search string
-*Param $searchfield - fieldname to be search for 
+*Param $searchfield - vtiger_fieldname to be search for 
 *Returns the search criteria option (where condition) to be added in list query
 */
 
@@ -608,13 +608,13 @@
 
 	if(isset($date_closed_start) && $date_closed_start != "" && isset($date_closed_end) && $date_closed_end != "")
 	{
-		array_push($where_clauses, "potential.closingdate >= ".$adb->quote($date_closed_start)." and potential.closingdate <= ".$adb->quote($date_closed_end));
+		array_push($where_clauses, "potential.closingdate >= ".$adb->quote($date_closed_start)." and vtiger_potential.closingdate <= ".$adb->quote($date_closed_end));
 		$url_string .= "&closingdate_start=".$date_closed_start."&closingdate_end=".$date_closed_end;
 	}
 	
 	if(isset($sales_stage) && $sales_stage!=''){
 		if($sales_stage=='Other')
-		array_push($where_clauses, "(potential.sales_stage <> 'Closed Won' and potential.sales_stage <> 'Closed Lost')");
+		array_push($where_clauses, "(vtiger_potential.sales_stage <> 'Closed Won' and vtiger_potential.sales_stage <> 'Closed Lost')");
 		else
 		array_push($where_clauses, "potential.sales_stage = ".$adb->quote($sales_stage));
 		$url_string .= "&sales_stage=".$sales_stage;

Modified: vtigercrm/trunk/include/utils/UserInfoUtil.php
==============================================================================
--- vtigercrm/trunk/include/utils/UserInfoUtil.php (original)
+++ vtigercrm/trunk/include/utils/UserInfoUtil.php Mon Jun 12 14:26:25 2006
@@ -26,8 +26,8 @@
 	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;
+	//$sql= "select vtiger_rolename from vtiger_user2role where userid='" .$userid ."'";
+   $sql = "select * from vtiger_mail_accounts where status=1 and user_id=".$user->id;
         $result = $adb->query($sql);
 	$log->debug("Exiting getMailServerInfo method ...");
 	return $result;
@@ -35,15 +35,15 @@
 
 /** To get the Role of the specified user
   * @param $userid -- The user Id:: Type integer
-  * @returns  roleid :: Type String
+  * @returns  vtiger_roleid :: Type String
  */
 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 ."'";
+	//$sql= "select vtiger_rolename from vtiger_user2role where userid='" .$userid ."'";
+	$sql = "select roleid from vtiger_user2role where userid='" .$userid ."'";
         $result = $adb->query($sql);
 	$roleid=  $adb->query_result($result,0,"roleid");
 	$log->debug("Exiting fetchUserRole method ...");
@@ -59,12 +59,12 @@
 	global $log;
 	$log->debug("Entering fetchUserProfileId(".$userid.") method ...");
 	global $adb;
-	$sql = "select roleid from user2role where userid=" .$userid;
+	$sql = "select roleid from vtiger_user2role where userid=" .$userid;
         $result = $adb->query($sql);
 	$roleid=  $adb->query_result($result,0,"roleid");
 
 
-	$sql1 = "select profileid from role2profile where roleid='" .$roleid."'";
+	$sql1 = "select profileid from vtiger_role2profile where roleid='" .$roleid."'";
         $result1 = $adb->query($sql1);
 	$profileid=  $adb->query_result($result1,0,"profileid");
 	$log->debug("Exiting fetchUserProfileId method ...");
@@ -101,7 +101,7 @@
 
         $persistPermArray = Array();
         $profiles = Array();
-        $sql = "select distinct profileid from profile2tab";
+        $sql = "select distinct profileid from vtiger_profile2tab";
         $result = $adb->query($sql);
         $num_rows = $adb->num_rows($result);
         for ( $i=0; $i < $num_rows; $i++ )
@@ -110,7 +110,7 @@
         $persistPermArray = Array();
         foreach ( $profiles as $profileid )
         {
-                $sql = "select * from profile2tab where profileid=" .$profileid ;
+                $sql = "select * from vtiger_profile2tab where profileid=" .$profileid ;
                 $result = $adb->query($sql);
                 if($MAX_TAB_PER !='')
                 {
@@ -127,7 +127,7 @@
 	$log->debug("Exiting loadAllPerms method ...");
 }
 
-/** Function to get all the tab permission for the specified profile
+/** Function to get all the vtiger_tab permission for the specified vtiger_profile
   * @param $profileid -- Profile Id:: Type integer
   * @returns  TabPermission Array in the following format:
   * $tabPermission = Array($tabid1=>permission,
@@ -152,7 +152,7 @@
         }
         else
         {
-                $sql = "select * from profile2tab where profileid=" .$profileid ;
+                $sql = "select * from vtiger_profile2tab where profileid=" .$profileid ;
                 $result = $adb->query($sql);
                 $tab_perr_array = Array();
                 if($MAX_TAB_PER !='')
@@ -173,7 +173,7 @@
 
 }
 
-/** Function to get all the tab permission for the specified profile other than tabid 15
+/** Function to get all the vtiger_tab permission for the specified vtiger_profile other than tabid 15
   * @param $profileid -- Profile Id:: Type integer
   * @returns  TabPermission Array in the following format:
   * $tabPermission = Array($tabid1=>permission,
@@ -201,7 +201,7 @@
         }
         else
         {
-                $sql = "select * from profile2tab where profileid=" .$profileid;
+                $sql = "select * from vtiger_profile2tab where profileid=" .$profileid;
                 $result = $adb->query($sql);
                 $tab_perr_array = Array();
                 $num_rows = $adb->num_rows($result);
@@ -220,7 +220,7 @@
 
 }
 
-/** Function to get all the tab standard action permission for the specified profile
+/** Function to get all the vtiger_tab standard action permission for the specified vtiger_profile
   * @param $profileid -- Profile Id:: Type integer
   * @returns  Tab Action Permission Array in the following format:
   * $tabPermission = Array($tabid1=>Array(actionid1=>permission, actionid2=>permission,...,actionidn=>permission), 
@@ -236,7 +236,7 @@
 	global $adb;
 	$check = Array();
 	$temp_tabid = Array();	
-	$sql1 = "select * from profile2standardpermissions where profileid=".$profileid." and tabid not in(16) order by(tabid)";
+	$sql1 = "select * from vtiger_profile2standardpermissions where profileid=".$profileid." and tabid not in(16) order by(tabid)";
 	//echo $sql1.'<BR>';
 	$result1 = $adb->query($sql1);
         $num_rows1 = $adb->num_rows($result1);
@@ -258,7 +258,7 @@
 	return $check;
 }
 
-/** Function to get all the tab utility action permission for the specified profile
+/** Function to get all the vtiger_tab utility action permission for the specified vtiger_profile
   * @param $profileid -- Profile Id:: Type integer
   * @returns  Tab Utility Action Permission Array in the following format:
   * $tabPermission = Array($tabid1=>Array(actionid1=>permission, actionid2=>permission,...,actionidn=>permission), 
@@ -276,7 +276,7 @@
 	global $adb;
 	$check = Array();
 	$temp_tabid = Array();	
-	$sql1 = "select * from profile2utility where profileid=".$profileid." order by(tabid)";
+	$sql1 = "select * from vtiger_profile2utility where profileid=".$profileid." order by(tabid)";
 	//echo $sql1.'<BR>';
 	$result1 = $adb->query($sql1);
         $num_rows1 = $adb->num_rows($result1);
@@ -317,7 +317,7 @@
 	$log->debug("Entering getDefaultSharingEditAction() method ...");
 	global $adb;
 	//retreiving the standard permissions	
-	$sql= "select * from def_org_share where editstatus=0";
+	$sql= "select * from vtiger_def_org_share where editstatus=0";
 	$result = $adb->query($sql);
 	$permissionRow=$adb->fetch_array($result);
 	do
@@ -348,7 +348,7 @@
 	$log->debug("Entering getDefaultSharingAction() method ...");
 	global $adb;
 	//retreivin the standard permissions	
-	$sql= "select * from def_org_share where editstatus in(0,1)";
+	$sql= "select * from vtiger_def_org_share where editstatus in(0,1)";
 	$result = $adb->query($sql);
 	$permissionRow=$adb->fetch_array($result);
 	do
@@ -381,7 +381,7 @@
 	global $adb;
 	$copy=Array();
 	//retreiving the standard permissions	
-	$sql= "select * from def_org_share";
+	$sql= "select * from vtiger_def_org_share";
 	$result = $adb->query($sql);
 	$num_rows=$adb->num_rows($result);
 
@@ -407,7 +407,7 @@
   global $log;
   $log->debug("Entering setPermittedTabs2Session(".$profileid.") method ...");
   global $adb;
-  $sql = "select tabid from profile2tab where profileid=" .$profileid ." and permissions =0" ;
+  $sql = "select tabid from vtiger_profile2tab where profileid=" .$profileid ." and permissions =0" ;
   $result = $adb->query($sql);
   
   $tabPermission=$adb->fetch_array($result);
@@ -436,7 +436,7 @@
   $log->debug("Entering setPermittedActions2Session(".$profileid.") method ...");
   global $adb;
   $check = Array(); 	
-  $sql1 = "select tabid from profile2tab where profileid=" .$profileid ." and permissions =0" ;
+  $sql1 = "select tabid from vtiger_profile2tab where profileid=" .$profileid ." and permissions =0" ;
   $result1 = $adb->query($sql1);
   $num_rows1 = $adb->num_rows($result1);
   for($i=0; $i<$num_rows1; $i++)
@@ -448,7 +448,7 @@
 	//echo '<BR>';
 
 	//Inserting the Standard Actions into the Array	
-	$sql= "select * from profile2standardpermissions where profileid =".$profileid." and tabid=".$tab_id;
+	$sql= "select * from vtiger_profile2standardpermissions where profileid =".$profileid." and tabid=".$tab_id;
 	$result = $adb->query($sql);
 	$num_rows = $adb->num_rows($result);
 	for($j=0; $j<$num_rows; $j++)
@@ -463,7 +463,7 @@
 	}
 	
 	//Inserting the utility Actions into the Array
-	$sql2= "select * from profile2utility where profileid =".$profileid." and tabid=".$tab_id;
+	$sql2= "select * from vtiger_profile2utility where profileid =".$profileid." and tabid=".$tab_id;
 	$result2 = $adb->query($sql2);
 	$num_rows2 = $adb->num_rows($result2);
 	for($k=0; $k<$num_rows2; $k++)
@@ -496,8 +496,8 @@
 	$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;
-	$sql = "select * from def_org_share";
+	//$sql= "select default_org_sharingrule.* from default_org_sharingrule inner join vtiger_profile2tab on vtiger_profile2tab.tabid = default_org_sharingrule.tabid where vtiger_profile2tab.permissions =0 and vtiger_profile2tab.profileid=".$profileid;
+	$sql = "select * from vtiger_def_org_share";
 	$result = $adb->query($sql);
 	$permissionRow=$adb->fetch_array($result);
 	do
@@ -514,10 +514,10 @@
 }
 
 
-/** Function to create the role
+/** Function to create the vtiger_role
   * @param $roleName -- Role Name:: Type varchar
   * @param $parentRoleId -- Parent Role Id:: Type varchar
-  * @param $roleProfileArray -- Profile to be associated with this role:: Type Array
+  * @param $roleProfileArray -- Profile to be associated with this vtiger_role:: Type Array
   * @returns  the Rold Id :: Type varchar
   *
  */
@@ -536,11 +536,11 @@
         $nowParentRoleHr=$parentRoleHr.'::'.$roleId;
         $nowRoleDepth=$parentRoleDepth + 1;
 
-	//Inserting role into db
-	$query="insert into role values('".$roleId."','".$roleName."','".$nowParentRoleHr."',".$nowRoleDepth.")";
+	//Inserting vtiger_role into db
+	$query="insert into vtiger_role values('".$roleId."','".$roleName."','".$nowParentRoleHr."',".$nowRoleDepth.")";
 	$adb->query($query);
 
-	//Inserting into role2profile table
+	//Inserting into vtiger_role2profile vtiger_table
 	foreach($roleProfileArray as $profileId)
         {
                 if($profileId != '')
@@ -554,10 +554,10 @@
 
 }
 
-/** Function to update the role
+/** Function to update the vtiger_role
   * @param $roleName -- Role Name:: Type varchar
   * @param $roleId -- Role Id:: Type varchar
-  * @param $roleProfileArray -- Profile to be associated with this role:: Type Array
+  * @param $roleProfileArray -- Profile to be associated with this vtiger_role:: Type Array
   *
  */
 function updateRole($roleId,$roleName,$roleProfileArray)
@@ -565,10 +565,10 @@
 	global $log;
 	$log->debug("Entering updateRole(".$roleId.",".$roleName.",".$roleProfileArray.") method ...");
 	global $adb;
-	$sql1 = "update role set rolename='".$roleName."' where roleid='".$roleId."'";
+	$sql1 = "update vtiger_role set rolename='".$roleName."' where roleid='".$roleId."'";
         $adb->query($sql1);
 	//Updating the Role2Profile relation
-	$sql2 = "delete from role2profile where roleId='".$roleId."'";
+	$sql2 = "delete from vtiger_role2profile where roleId='".$roleId."'";
 	$adb->query($sql2);
 
 	foreach($roleProfileArray as $profileId)
@@ -582,7 +582,7 @@
 	
 }
 
-/** Function to add the role to profile relation
+/** Function to add the vtiger_role to vtiger_profile relation
   * @param $profileId -- Profile Id:: Type integer
   * @param $roleId -- Role Id:: Type varchar
   *
@@ -592,7 +592,7 @@
 	global $log;
 	$log->debug("Entering insertRole2ProfileRelation(".$roleId.",".$profileId.") method ...");
 	global $adb;
-	$query="insert into role2profile values('".$roleId."',".$profileId.")";
+	$query="insert into vtiger_role2profile values('".$roleId."',".$profileId.")";
 	$adb->query($query);	
 	$log->debug("Exiting insertRole2ProfileRelation method ...");
 	
@@ -609,7 +609,7 @@
 	global $log;
 	$log->debug("Entering createNewGroup(".$groupName.",".$groupDescription.") method ...");
 	global $adb;
-	$sql = "insert into groups(name,description) values('" .$groupName ."','". $groupDescription ."')";
+	$sql = "insert into vtiger_groups(name,description) values('" .$groupName ."','". $groupDescription ."')";
 	$result = $adb->query($sql); 
 	$log->debug("Exiting createNewGroup method ...");
 	header("Location: index.php?module=Users&action=listgroups");
@@ -627,7 +627,7 @@
 	global $log;
 	$log->debug("Entering fetchTabId(".$moduleName.") method ...");
 	global $adb;
-	$sql = "select id from tabu where name ='" .$moduleName ."'";
+	$sql = "select id from vtiger_tab where name ='" .$moduleName ."'";
 	$result = $adb->query($sql); 
 	$tabid =  $adb->query_result($result,0,"id");
 	$log->debug("Exiting fetchTabId method ...");
@@ -645,12 +645,12 @@
 	global $log;
 	$log->debug("Entering populatePermissions4NewRole(".$parentroleName.",".$roleName.") method ...");
   global $adb;
-  //fetch the permissions for the parent role
+  //fetch the permissions for the parent vtiger_role
   $referenceValues = fetchTabReferenceEntityValues($parentroleName);
 
   while($permissionRow = $adb->fetch_array($referenceValues))
   {
-    $sql_insert="insert into role2tab(rolename,tabid,module_permission,description) values('" .$roleName ."'," .$permissionRow['tabid'] ."," .$permissionRow['module_permission'] .", '')";
+    $sql_insert="insert into vtiger_role2tab(rolename,tabid,module_permission,description) values('" .$roleName ."'," .$permissionRow['tabid'] ."," .$permissionRow['module_permission'] .", '')";
 
     //echo $sql_insert;
     $adb->query($sql_insert);
@@ -659,7 +659,7 @@
   $actionreferenceValues = fetchActionReferenceEntityValues($parentroleName);
   while($permissionRow = $adb->fetch_array($actionreferenceValues))
   {
-    $sql_insert="insert into role2action(rolename,tabid,actionname,action_permission,description) values('" .$roleName ."'," .$permissionRow['tabid'] .",'" .$permissionRow['actionname'] ."'," .$permissionRow['action_permission'] .", '')";
+    $sql_insert="insert into vtiger_role2action(rolename,tabid,actionname,action_permission,description) values('" .$roleName ."'," .$permissionRow['tabid'] .",'" .$permissionRow['actionname'] ."'," .$permissionRow['action_permission'] .", '')";
     //echo $sql_insert;
     $adb->query($sql_insert);
   }
@@ -677,7 +677,7 @@
 	global $log;
 	$log->debug("Entering fetchTabReferenceEntityValues(".$parentrolename.") method ...");
   global $adb;
-  $sql = "select tabid,module_permission,description from role2tab where rolename='" .$parentrolename ."'"; 
+  $sql = "select tabid,module_permission,description from vtiger_role2tab where rolename='" .$parentrolename ."'"; 
   //echo $sql;
   $result=$adb->query($sql);
 $log->debug("Exiting fetchTabReferenceEntityValues method ...");
@@ -696,13 +696,13 @@
 	global $log;
 $log->debug("Entering fetchActionReferenceEntityValues(".$parentrolename.") method ...");
   global $adb;
-  $sql = "select tabid,actionname,action_permission,description from role2action where rolename='" .$parentrolename ."'"; 
+  $sql = "select tabid,actionname,action_permission,description from vtiger_role2action where rolename='" .$parentrolename ."'"; 
     $result=$adb->query($sql);
 $log->debug("Exiting fetchActionReferenceEntityValues method ...");
   return $result;
 }
 
-/** Function to get the roleid from rolename
+/** Function to get the vtiger_roleid from vtiger_rolename
   * @param $rolename -- Role Name:: Type varchar
   * @returns Role Id:: Type varchar
   *
@@ -713,14 +713,14 @@
 $log->debug("Entering fetchRoleId(".$rolename.") method ...");
 
   global $adb;
-  $sqlfetchroleid = "select roleid from role where rolename='".$rolename ."'";
+  $sqlfetchroleid = "select roleid from vtiger_role where rolename='".$rolename ."'";
   $resultroleid = $adb->query($sqlfetchroleid);
   $role_id = $adb->query_result($resultroleid,0,"roleid");
 $log->debug("Exiting fetchRoleId method ...");
   return $role_id;
 }
 
-/** Function to update user to role mapping based on the userid
+/** Function to update user to vtiger_role mapping based on the userid
   * @param $roleid -- Role Id:: Type varchar
   * @param $userid User Id:: Type integer
   *
@@ -731,14 +731,14 @@
 $log->debug("Entering updateUser2RoleMapping(".$roleid.",".$userid.") method ...");
   global $adb;
   //Check if row already exists
-  $sqlcheck = "select * from user2role where userid=".$userid;
+  $sqlcheck = "select * from vtiger_user2role where userid=".$userid;
   $resultcheck = $adb->query($sqlcheck);
   if($adb->num_rows($resultcheck) == 1)
   {
-  	$sqldelete = "delete from user2role where userid=".$userid;
+  	$sqldelete = "delete from vtiger_user2role where userid=".$userid;
   	$result_delete = $adb->query($sqldelete);
   }	
-  $sql = "insert into user2role(userid,roleid) values(" .$userid .",'" .$roleid ."')";
+  $sql = "insert into vtiger_user2role(userid,roleid) values(" .$userid .",'" .$roleid ."')";
   $result = $adb->query($sql);
 	$log->debug("Exiting updateUser2RoleMapping method ...");
 
@@ -755,14 +755,14 @@
 global $log;
 $log->debug("Entering updateUsers2GroupMapping(".$groupname.",".$userid.") method ...");
   global $adb;
-  $sqldelete = "delete from users2group where userid = '" .$userid ."'";
+  $sqldelete = "delete from vtiger_users2group where userid = '" .$userid ."'";
   $result_delete = $adb->query($sqldelete);
-  $sql = "insert into users2group(groupname,userid) values('" .$groupname ."','" .$userid ."')";
+  $sql = "insert into vtiger_users2group(groupname,userid) values('" .$groupname ."','" .$userid ."')";
   $result = $adb->query($sql);
   $log->debug("Exiting updateUsers2GroupMapping method ...");
 }
 
-/** Function to add user to role mapping 
+/** Function to add user to vtiger_role mapping 
   * @param $roleid -- Role Id:: Type varchar
   * @param $userid User Id:: Type integer
   *
@@ -773,7 +773,7 @@
 $log->debug("Entering insertUser2RoleMapping(".$roleid.",".$userid.") method ...");
 
   global $adb;	
-  $sql = "insert into user2role(userid,roleid) values('" .$userid ."','" .$roleid ."')";
+  $sql = "insert into vtiger_user2role(userid,roleid) values('" .$userid ."','" .$roleid ."')";
  $adb->query($sql); 
 $log->debug("Exiting insertUser2RoleMapping method ...");
 
@@ -789,7 +789,7 @@
 global $log;
 $log->debug("Entering insertUsers2GroupMapping(".$groupname.",".$userid.") method ...");
   global $adb;
-  $sql = "insert into users2group(groupname,userid) values('" .$groupname ."','" .$userid ."')";
+  $sql = "insert into vtiger_users2group(groupname,userid) values('" .$groupname ."','" .$userid ."')";
   $adb->query($sql);
 $log->debug("Exiting insertUsers2GroupMapping method ...");
 }
@@ -804,7 +804,7 @@
 global $log;
 $log->debug("Entering fetchWordTemplateList(".$module.") method ...");
   global $adb;
-  $sql_word = "select templateid, filename from wordtemplates where module ='".$module."'" ; 
+  $sql_word = "select templateid, filename from vtiger_wordtemplates where module ='".$module."'" ; 
   $result=$adb->query($sql_word);
 $log->debug("Exiting fetchWordTemplateList method ...");
   return $result;
@@ -822,7 +822,7 @@
 global $log;
 $log->debug("Entering fetchEmailTemplateInfo(".$templateName.") method ...");
 	global $adb;
-        $sql= "select * from emailtemplates where templatename='" .$templateName ."'";
+        $sql= "select * from vtiger_emailtemplates where templatename='" .$templateName ."'";
         $result = $adb->query($sql);
 $log->debug("Exiting fetchEmailTemplateInfo method ...");
         return $result;
@@ -888,7 +888,7 @@
 	global $log;
 	$log->debug("Entering insert2LeadGroupRelation(".$leadid.",".$groupname.") method ...");
 global $adb;
-  $sql = "insert into leadgrouprelation values (" .$leadid .",'".$groupname."')";
+  $sql = "insert into vtiger_leadgrouprelation values (" .$leadid .",'".$groupname."')";
   $adb->query($sql);
 	$log->debug("Exiting insert2LeadGroupRelation method ...");
 
@@ -904,9 +904,9 @@
 global $log;
 $log->debug("Entering updateLeadGroupRelation(".$leadid.",".$groupname.") method ...");
  global $adb;
-  $sqldelete = "delete from leadgrouprelation where leadid=".$leadid;
+  $sqldelete = "delete from vtiger_leadgrouprelation where leadid=".$leadid;
   $adb->query($sqldelete);
-  $sql = "insert into leadgrouprelation values (".$leadid .",'" .$groupname ."')";  
+  $sql = "insert into vtiger_leadgrouprelation values (".$leadid .",'" .$groupname ."')";  
   $adb->query($sql);
   $log->debug("Exiting updateLeadGroupRelation method ...");
 
@@ -922,7 +922,7 @@
 global $log;
 $log->debug("Entering insert2AccountGroupRelation(".$accountid.",".$groupname.") method ...");
 global $adb;
-  $sql = "insert into accountgrouprelation values (" .$accountid .",'".$groupname."')";
+  $sql = "insert into vtiger_accountgrouprelation values (" .$accountid .",'".$groupname."')";
   $adb->query($sql);
 $log->debug("Exiting insert2AccountGroupRelation method ...");
 
@@ -939,9 +939,9 @@
 global $log;
 $log->debug("Entering updateAccountGroupRelation(".$accountid.",".$groupname.") method ...");
  global $adb;
-  $sqldelete = "delete from accountgrouprelation where accountid=".$accountid;
+  $sqldelete = "delete from vtiger_accountgrouprelation where accountid=".$accountid;
   $adb->query($sqldelete);
-  $sql = "insert into accountgrouprelation values (".$accountid .",'" .$groupname ."')";
+  $sql = "insert into vtiger_accountgrouprelation values (".$accountid .",'" .$groupname ."')";
   $adb->query($sql);
 $log->debug("Exiting updateAccountGroupRelation method ...");
 
@@ -957,7 +957,7 @@
 global $log;
 $log->debug("Entering insert2ContactGroupRelation(".$contactid.",".$groupname.") method ...");
 global $adb;
-  $sql = "insert into contactgrouprelation values (" .$contactid .",'".$groupname."')";
+  $sql = "insert into vtiger_contactgrouprelation values (" .$contactid .",'".$groupname."')";
   $adb->query($sql);
 $log->debug("Exiting insert2ContactGroupRelation method ...");
 
@@ -974,9 +974,9 @@
 global $log;
 $log->debug("Entering updateContactGroupRelation(".$contactid.",".$groupname.") method ...");
  global $adb;
-  $sqldelete = "delete from contactgrouprelation where contactid=".$contactid;
+  $sqldelete = "delete from vtiger_contactgrouprelation where contactid=".$contactid;
   $adb->query($sqldelete);
-  $sql = "insert into contactgrouprelation values (".$contactid .",'" .$groupname ."')";
+  $sql = "insert into vtiger_contactgrouprelation values (".$contactid .",'" .$groupname ."')";
   $adb->query($sql);
 $log->debug("Exiting updateContactGroupRelation method ...");
 
@@ -991,7 +991,7 @@
 global $log;
 $log->debug("Entering insert2PotentialGroupRelation(".$potentialid.",".$groupname.") method ...");
 global $adb;
-  $sql = "insert into potentialgrouprelation values (" .$potentialid .",'".$groupname."')";
+  $sql = "insert into vtiger_potentialgrouprelation values (" .$potentialid .",'".$groupname."')";
   $adb->query($sql);
   $log->debug("Exiting insert2PotentialGroupRelation method ...");
 
@@ -1008,9 +1008,9 @@
 global $log;
 $log->debug("Entering updatePotentialGroupRelation(".$potentialid.",".$groupname.") method ...");
  global $adb;
-  $sqldelete = "delete from potentialgrouprelation where potentialid=".$potentialid;
+  $sqldelete = "delete from vtiger_potentialgrouprelation where potentialid=".$potentialid;
   $adb->query($sqldelete);
-  $sql = "insert into potentialgrouprelation values (".$potentialid .",'" .$groupname ."')";
+  $sql = "insert into vtiger_potentialgrouprelation values (".$potentialid .",'" .$groupname ."')";
   $adb->query($sql);
   $log->debug("Exiting updatePotentialGroupRelation method ...");
 
@@ -1026,7 +1026,7 @@
 global $log;
 $log->debug("Entering insert2QuoteGroupRelation(".$quoteid.",".$groupname.") method ...");
 global $adb;
-  $sql = "insert into quotegrouprelation values (" .$quoteid .",'".$groupname."')";
+  $sql = "insert into vtiger_quotegrouprelation values (" .$quoteid .",'".$groupname."')";
   $adb->query($sql);
 $log->debug("Exiting insert2QuoteGroupRelation method ...");
 
@@ -1043,9 +1043,9 @@
 global $log;
 $log->debug("Entering updateQuoteGroupRelation(".$quoteid.",".$groupname.") method ...");
  global $adb;
-  $sqldelete = "delete from quotegrouprelation where quoteid=".$quoteid;
+  $sqldelete = "delete from vtiger_quotegrouprelation where quoteid=".$quoteid;
   $adb->query($sqldelete);
-  $sql = "insert into quotegrouprelation values (".$quoteid .",'" .$groupname ."')";
+  $sql = "insert into vtiger_quotegrouprelation values (".$quoteid .",'" .$groupname ."')";
   $adb->query($sql);
 $log->debug("Exiting updateQuoteGroupRelation method ...");
 
@@ -1060,7 +1060,7 @@
 global $log;
 $log->debug("Entering insert2SoGroupRelation(".$salesorderid.",".$groupname.") method ...");
 global $adb;
-  $sql = "insert into sogrouprelation values (" .$salesorderid .",'".$groupname."')";
+  $sql = "insert into vtiger_sogrouprelation values (" .$salesorderid .",'".$groupname."')";
   $adb->query($sql);
 $log->debug("Exiting insert2SoGroupRelation method ...");
 
@@ -1077,9 +1077,9 @@
 global $log;
 $log->debug("Entering updateSoGroupRelation(".$salesorderid.",".$groupname.") method ...");
  global $adb;
-  $sqldelete = "delete from sogrouprelation where salesorderid=".$salesorderid;
+  $sqldelete = "delete from vtiger_sogrouprelation where salesorderid=".$salesorderid;
   $adb->query($sqldelete);
-  $sql = "insert into sogrouprelation values (".$salesorderid .",'" .$groupname ."')";
+  $sql = "insert into vtiger_sogrouprelation values (".$salesorderid .",'" .$groupname ."')";
   $adb->query($sql);
 $log->debug("Exiting updateSoGroupRelation method ...");
 
@@ -1095,7 +1095,7 @@
 global $log;
 $log->debug("Entering insert2InvoiceGroupRelation(".$invoiceid.",".$groupname.") method ...");
 global $adb;
-  $sql = "insert into invoicegrouprelation values (" .$invoiceid .",'".$groupname."')";
+  $sql = "insert into vtiger_invoicegrouprelation values (" .$invoiceid .",'".$groupname."')";
   $adb->query($sql);
 $log->debug("Exiting insert2InvoiceGroupRelation method ...");
 
@@ -1112,9 +1112,9 @@
 global $log;
 $log->debug("Entering updateInvoiceGroupRelation(".$invoiceid.",".$groupname.") method ...");
  global $adb;
-  $sqldelete = "delete from invoicegrouprelation where invoiceid=".$invoiceid;
+  $sqldelete = "delete from vtiger_invoicegrouprelation where invoiceid=".$invoiceid;
   $adb->query($sqldelete);
-  $sql = "insert into invoicegrouprelation values (".$invoiceid .",'" .$groupname ."')";
+  $sql = "insert into vtiger_invoicegrouprelation values (".$invoiceid .",'" .$groupname ."')";
   $adb->query($sql);
 $log->debug("Exiting updateInvoiceGroupRelation method ...");
 
@@ -1130,7 +1130,7 @@
 global $log;
 $log->debug("Entering insert2PoGroupRelation(".$poid.",".$groupname.") method ...");
 global $adb;
-  $sql = "insert into pogrouprelation values (" .$poid .",'".$groupname."')";
+  $sql = "insert into vtiger_pogrouprelation values (" .$poid .",'".$groupname."')";
   $adb->query($sql);
 $log->debug("Exiting insert2PoGroupRelation method ...");
 
@@ -1147,9 +1147,9 @@
 global $log;
 $log->debug("Entering updatePoGroupRelation(".$poid.",".$groupname.") method ...");
  global $adb;
-  $sqldelete = "delete from pogrouprelation where purchaseorderid=".$poid;
+  $sqldelete = "delete from vtiger_pogrouprelation where purchaseorderid=".$poid;
   $adb->query($sqldelete);
-  $sql = "insert into pogrouprelation values (".$poid .",'" .$groupname ."')";
+  $sql = "insert into vtiger_pogrouprelation values (".$poid .",'" .$groupname ."')";
   $adb->query($sql);
 $log->debug("Exiting updatePoGroupRelation method ...");
 
@@ -1166,16 +1166,16 @@
 global $log;
 $log->debug("Entering updateTicketGroupRelation(".$ticketid.",".$groupname.") method ...");
  global $adb;
-  $sqldelete = "delete from ticketgrouprelation where ticketid=".$ticketid;
+  $sqldelete = "delete from vtiger_ticketgrouprelation where ticketid=".$ticketid;
   $adb->query($sqldelete);
-  $sql = "insert into ticketgrouprelation values (".$ticketid .",'" .$groupname ."')";  
+  $sql = "insert into vtiger_ticketgrouprelation values (".$ticketid .",'" .$groupname ."')";  
   $adb->query($sql);
 $log->debug("Exiting updateTicketGroupRelation method ...");
 
 }
 
 
-/** Function to insert activity group relation 
+/** Function to insert vtiger_activity group relation 
   * @param $activityid -- Activity Id:: Type integer
   * @param $groupname -- Group Name:: Type varchar
   *
@@ -1185,7 +1185,7 @@
 global $log;
 $log->debug("Entering insert2ActivityGroupRelation(".$activityid.",".$groupname.") method ...");
 global $adb;
-  $sql = "insert into activitygrouprelation values (" .$activityid .",'".$groupname."')";
+  $sql = "insert into vtiger_activitygrouprelation values (" .$activityid .",'".$groupname."')";
   $adb->query($sql);
 $log->debug("Exiting insert2ActivityGroupRelation method ...");
 
@@ -1202,13 +1202,13 @@
 global $log;
 $log->debug("Entering insert2TicketGroupRelation(".$ticketid.",".$groupname.") method ...");
 global $adb;
-  $sql = "insert into ticketgrouprelation values (" .$ticketid .",'".$groupname."')";
+  $sql = "insert into vtiger_ticketgrouprelation values (" .$ticketid .",'".$groupname."')";
   $adb->query($sql);
 $log->debug("Exiting insert2TicketGroupRelation method ...");
 
 }
 
-/** Function to update activity group relation 
+/** Function to update vtiger_activity group relation 
   * @param $activityid -- Activity Id:: Type integer
   * @param $groupname -- Group Name:: Type varchar
   *
@@ -1218,10 +1218,10 @@
 global $log;
 $log->debug("Entering updateActivityGroupRelation(".$activityid.",".$groupname.") method ...");
 	global $adb;
-  $sqldelete = "delete from activitygrouprelation where activityid=".$activityid;
+  $sqldelete = "delete from vtiger_activitygrouprelation where activityid=".$activityid;
   if($groupname != '' && $groupname != 'null') {
 	  $adb->query($sqldelete);
-	  $sql = "insert into activitygrouprelation values (".$activityid .",'" .$groupname ."')";  
+	  $sql = "insert into vtiger_activitygrouprelation values (".$activityid .",'" .$groupname ."')";  
 	  $adb->query($sql);
   }
   $log->debug("Exiting updateActivityGroupRelation method ...");
@@ -1244,7 +1244,7 @@
         {
                 $tabid = 5;
         }
-        $query = "select * from profile2field where profileid =".$profileid." and tabid=".$tabid;
+        $query = "select * from vtiger_profile2field where profileid =".$profileid." and tabid=".$tabid;
         //echo $query;
         $result = $adb->query($query);
 	$log->debug("Exiting getFieldList method ...");
@@ -1266,7 +1266,7 @@
         {
                 $tabid = 5;
         }
-        $query = "select * from profile2field where profileid =".$profileid." and tabid=".$tabid;
+        $query = "select * from vtiger_profile2field where profileid =".$profileid." and tabid=".$tabid;
         //echo $query;
         $result = $adb->query($query);
 	$fldVisbArray = Array();
@@ -1296,7 +1296,7 @@
         {
                 $tabid = 5;
         }
-        $query = "select * from profile2field where profileid =".$profileid." and tabid=".$tabid;
+        $query = "select * from vtiger_profile2field where profileid =".$profileid." and tabid=".$tabid;
         //echo $query;
         $result = $adb->query($query);
 	$fldReadOnlyArray = Array();
@@ -1312,7 +1312,7 @@
 }
 
 
-/** Function to get the role name from the roleid 
+/** Function to get the vtiger_role name from the vtiger_roleid 
   * @param $roleid -- Role Id:: Type varchar
   * @returns $rolename -- Role Name:: Type varchar
   *
@@ -1322,14 +1322,14 @@
 	global $log;
 	$log->debug("Entering getRoleName(".$roleid.") method ...");
 	global $adb;
-	$sql1 = "select * from role where roleid='".$roleid."'";
+	$sql1 = "select * from vtiger_role where roleid='".$roleid."'";
 	$result = $adb->query($sql1);
 	$rolename = $adb->query_result($result,0,"rolename");
 	$log->debug("Exiting getRoleName method ...");
 	return $rolename;	
 }
 
-/** Function to get the profile name from the profileid 
+/** Function to get the vtiger_profile name from the vtiger_profileid 
   * @param $profileid -- Profile Id:: Type integer
   * @returns $rolename -- Role Name:: Type varchar
   *
@@ -1339,7 +1339,7 @@
 	global $log;
 	$log->debug("Entering getProfileName(".$profileid.") method ...");
 	global $adb;
-	$sql1 = "select * from profile where profileid=".$profileid;
+	$sql1 = "select * from vtiger_profile where profileid=".$profileid;
 	$result = $adb->query($sql1);
 	$profilename = $adb->query_result($result,0,"profilename");
 	$log->debug("Exiting getProfileName method ...");
@@ -1398,7 +1398,7 @@
 	//Retreiving the Tabid and Action Id	
 	$tabid = getTabid($module);
 	$actionid=getActionid($actionname);
-	//If no actionid, then allow action is tab permission is available	
+	//If no actionid, then allow action is vtiger_tab permission is available	
 	if($actionid == '')
 	{
 		if($profileTabsPermission[$tabid] ==0)
@@ -1437,7 +1437,7 @@
 
 		}
 	}
-	//Checking for tab permission
+	//Checking for vtiger_tab permission
 	if($profileTabsPermission[$tabid] !=0)
 	{
 		$permission = "no";
@@ -1906,7 +1906,7 @@
 		$defSharingPermissionData = getDefaultSharingAction();
 		$others_permission_id = $defSharingPermissionData[$tabid];
 
-		//Checking whether this tab is allowed
+		//Checking whether this vtiger_tab is allowed
 		if($tab_per_Data[$tabid] == 0)
 		{
 			$permission = 'yes';
@@ -1996,7 +1996,7 @@
 	global $log;
 	$log->debug("Entering setGlobalProfilePermission2Session(".$profileid.") method ...");
   global $adb;
-  $sql = "select * from profile2globalpermissions where profileid=".$profileid ;
+  $sql = "select * from vtiger_profile2globalpermissions where profileid=".$profileid ;
   $result = $adb->query($sql);
   $num_rows = $adb->num_rows($result);
 
@@ -2014,7 +2014,7 @@
 
 
 
-/** Function to get the Profile Global Information for the specified profileid  
+/** Function to get the Profile Global Information for the specified vtiger_profileid  
   * @param $profileid -- Profile Id:: Type integer
   * @returns Profile Gloabal Permission Array in the following format:
   * $profileGloblaPermisson=Array($viewall_actionid=>permission, $editall_actionid=>permission)
@@ -2024,7 +2024,7 @@
 global $log;
 $log->debug("Entering getProfileGlobalPermission(".$profileid.") method ...");
   global $adb;
-  $sql = "select * from profile2globalpermissions where profileid=".$profileid ;
+  $sql = "select * from vtiger_profile2globalpermissions where profileid=".$profileid ;
   $result = $adb->query($sql);
   $num_rows = $adb->num_rows($result);
 
@@ -2040,7 +2040,7 @@
   
 }
 
-/** Function to get the Profile Tab Permissions for the specified profileid  
+/** Function to get the Profile Tab Permissions for the specified vtiger_profileid  
   * @param $profileid -- Profile Id:: Type integer
   * @returns Profile Tabs Permission Array in the following format:
   * $profileTabPermisson=Array($tabid1=>permission, $tabid2=>permission,........., $tabidn=>permission)
@@ -2050,7 +2050,7 @@
 global $log;
 $log->debug("Entering getProfileTabsPermission(".$profileid.") method ...");
   global $adb;
-  $sql = "select * from profile2tab where profileid=".$profileid ;
+  $sql = "select * from vtiger_profile2tab where profileid=".$profileid ;
   $result = $adb->query($sql);
   $num_rows = $adb->num_rows($result);
 
@@ -2067,7 +2067,7 @@
 }
 
 
-/** Function to get the Profile Action Permissions for the specified profileid  
+/** Function to get the Profile Action Permissions for the specified vtiger_profileid  
   * @param $profileid -- Profile Id:: Type integer
   * @returns Profile Tabs Action Permission Array in the following format:
   *    $tabActionPermission = Array($tabid1=>Array(actionid1=>permission, actionid2=>permission,...,actionidn=>permission),
@@ -2082,7 +2082,7 @@
 	global $adb;
 	$check = Array();
 	$temp_tabid = Array();	
-	$sql1 = "select * from profile2standardpermissions where profileid=".$profileid;
+	$sql1 = "select * from vtiger_profile2standardpermissions where profileid=".$profileid;
 	//echo $sql1.'<BR>';
 	$result1 = $adb->query($sql1);
         $num_rows1 = $adb->num_rows($result1);
@@ -2110,7 +2110,7 @@
 
 
 
-/** Function to get the Standard and Utility Profile Action Permissions for the specified profileid  
+/** Function to get the Standard and Utility Profile Action Permissions for the specified vtiger_profileid  
   * @param $profileid -- Profile Id:: Type integer
   * @returns Profile Tabs Action Permission Array in the following format:
   *    $tabActionPermission = Array($tabid1=>Array(actionid1=>permission, actionid2=>permission,...,actionidn=>permission),
@@ -2139,7 +2139,7 @@
 }
 
 
-/** Function to create profile 
+/** Function to create vtiger_profile 
   * @param $profilename -- Profile Name:: Type varchar
   * @param $parentProfileId -- Profile Id:: Type integer
  */
@@ -2149,40 +2149,40 @@
 $log->debug("Entering createProfile(".$profilename.",".$parentProfileId.",".$description.") method ...");
 	global $adb;
 	//Inserting values into Profile Table
-	$sql1 = "insert into profile values('','".$profilename."','".$description."')";
+	$sql1 = "insert into vtiger_profile values('','".$profilename."','".$description."')";
 	$adb->query($sql1);
 
-	//Retreiving the profileid
-	$sql2 = "select max(profileid) as current_id from profile";
+	//Retreiving the vtiger_profileid
+	$sql2 = "select max(profileid) as current_id from vtiger_profile";
 	$result2 = $adb->query($sql2);
 	$current_profile_id = $adb->query_result($result2,0,'current_id');
 
-	//Inserting values into profile2globalpermissions
-	$sql3 = "select * from profile2globalpermissions where profileid=".$parentProfileId;
+	//Inserting values into vtiger_profile2globalpermissions
+	$sql3 = "select * from vtiger_profile2globalpermissions where profileid=".$parentProfileId;
 	$result3= $adb->query($sql3);
 	$p2tab_rows = $adb->num_rows($result3);
 	for($i=0; $i<$p2tab_rows; $i++)
 	{
 		$act_id=$adb->query_result($result3,$i,'globalactionid');
 		$permissions=$adb->query_result($result3,$i,'globalactionpermission');
-		$sql4="insert into profile2globalpermissions values(".$current_profile_id.", ".$act_id.", ".$permissions.")";
+		$sql4="insert into vtiger_profile2globalpermissions values(".$current_profile_id.", ".$act_id.", ".$permissions.")";
 		$adb->query($sql4);	
 	}
 
-	//Inserting values into Profile2tab table
-	$sql3 = "select * from profile2tab where profileid=".$parentProfileId;
+	//Inserting values into Profile2tab vtiger_table
+	$sql3 = "select * from vtiger_profile2tab where profileid=".$parentProfileId;
 	$result3= $adb->query($sql3);
 	$p2tab_rows = $adb->num_rows($result3);
 	for($i=0; $i<$p2tab_rows; $i++)
 	{
 		$tab_id=$adb->query_result($result3,$i,'tabid');
 		$permissions=$adb->query_result($result3,$i,'permissions');
-		$sql4="insert into profile2tab values(".$current_profile_id.", ".$tab_id.", ".$permissions.")";
+		$sql4="insert into vtiger_profile2tab values(".$current_profile_id.", ".$tab_id.", ".$permissions.")";
 		$adb->query($sql4);	
 	}
 
-	//Inserting values into Profile2standard table
-	$sql6 = "select * from profile2standardpermissions where profileid=".$parentProfileId;
+	//Inserting values into Profile2standard vtiger_table
+	$sql6 = "select * from vtiger_profile2standardpermissions where profileid=".$parentProfileId;
 	$result6= $adb->query($sql6);
 	$p2per_rows = $adb->num_rows($result6);
 	for($i=0; $i<$p2per_rows; $i++)
@@ -2190,12 +2190,12 @@
 		$tab_id=$adb->query_result($result6,$i,'tabid');
 		$action_id=$adb->query_result($result6,$i,'operation');	
 		$permissions=$adb->query_result($result6,$i,'permissions');
-		$sql7="insert into profile2standardpermissions values(".$current_profile_id.", ".$tab_id.", ".$action_id.", ".$permissions.")";
+		$sql7="insert into vtiger_profile2standardpermissions values(".$current_profile_id.", ".$tab_id.", ".$action_id.", ".$permissions.")";
 		$adb->query($sql7);	
 	}
 
-	//Inserting values into Profile2Utility table
-	$sql8 = "select * from profile2utility where profileid=".$parentProfileId;
+	//Inserting values into Profile2Utility vtiger_table
+	$sql8 = "select * from vtiger_profile2utility where profileid=".$parentProfileId;
 	$result8= $adb->query($sql8);
 	$p2util_rows = $adb->num_rows($result8);
 	for($i=0; $i<$p2util_rows; $i++)
@@ -2203,12 +2203,12 @@
 		$tab_id=$adb->query_result($result8,$i,'tabid');
 		$action_id=$adb->query_result($result8,$i,'activityid');	
 		$permissions=$adb->query_result($result8,$i,'permission');
-		$sql9="insert into profile2utility values(".$current_profile_id.", ".$tab_id.", ".$action_id.", ".$permissions.")";
+		$sql9="insert into vtiger_profile2utility values(".$current_profile_id.", ".$tab_id.", ".$action_id.", ".$permissions.")";
 		$adb->query($sql9);	
 	}
 
-	//Inserting values into Profile2field table
-	$sql10 = "select * from profile2field where profileid=".$parentProfileId;
+	//Inserting values into Profile2field vtiger_table
+	$sql10 = "select * from vtiger_profile2field where profileid=".$parentProfileId;
 	$result10= $adb->query($sql10);
 	$p2field_rows = $adb->num_rows($result10);
 	for($i=0; $i<$p2field_rows; $i++)
@@ -2217,14 +2217,14 @@
 		$fieldid=$adb->query_result($result10,$i,'fieldid');	
 		$permissions=$adb->query_result($result10,$i,'visible');
 		$readonly=$adb->query_result($result10,$i,'readonly');
-		$sql11="insert into profile2field values(".$current_profile_id.", ".$tab_id.", ".$fieldid.", ".$permissions." ,".$readonly.")";
+		$sql11="insert into vtiger_profile2field values(".$current_profile_id.", ".$tab_id.", ".$fieldid.", ".$permissions." ,".$readonly.")";
 		$adb->query($sql11);	
 	}
 	$log->debug("Exiting createProfile method ...");
 }
 
-/** Function to delete profile 
-  * @param $transfer_profileid -- Profile Id to which the existing role2profile relationships are to be transferred :: Type varchar
+/** Function to delete vtiger_profile 
+  * @param $transfer_profileid -- Profile Id to which the existing vtiger_role2profile relationships are to be transferred :: Type varchar
   * @param $prof_id -- Profile Id to be deleted:: Type integer
  */
 function deleteProfile($prof_id,$transfer_profileid='')
@@ -2232,48 +2232,48 @@
 	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;
+	//delete from vtiger_profile2global permissions
+	$sql4 = "delete from vtiger_profile2globalpermissions where profileid=".$prof_id;
 	$adb->query($sql4);
 
-	//deleting from profile 2 tab;
-	$sql4 = "delete from profile2tab where profileid=".$prof_id;
+	//deleting from vtiger_profile 2 vtiger_tab;
+	$sql4 = "delete from vtiger_profile2tab where profileid=".$prof_id;
 	$adb->query($sql4);
 
-	//deleting from profile2standardpermissions table
-	$sql5 = "delete from profile2standardpermissions where profileid=".$prof_id;
+	//deleting from vtiger_profile2standardpermissions vtiger_table
+	$sql5 = "delete from vtiger_profile2standardpermissions where profileid=".$prof_id;
 	$adb->query($sql5);
 
-	//deleting from profile2field
-	$sql6 ="delete from profile2field where profileid=".$prof_id;
+	//deleting from vtiger_profile2field
+	$sql6 ="delete from vtiger_profile2field where profileid=".$prof_id;
 	$adb->query($sql6);
 
-	//deleting from profile2utility
-	$sql7 ="delete from profile2utility where profileid=".$prof_id;
+	//deleting from vtiger_profile2utility
+	$sql7 ="delete from vtiger_profile2utility where profileid=".$prof_id;
 	$adb->query($sql7);
 
-	//updating role2profile
+	//updating vtiger_role2profile
         if(isset($transfer_profileid) && $transfer_profileid != '')
         {
 
-                $sql8 = "select roleid from role2profile where profileid=".$prof_id;
+                $sql8 = "select roleid from vtiger_role2profile where profileid=".$prof_id;
                 $result=$adb->query($sql8);
                 $num_rows=$adb->num_rows($result);
 
                 for($i=0;$i<$num_rows;$i++)
                 {
                         $roleid=$adb->query_result($result,$i,'roleid');
-                        $sql = "select profileid from role2profile where roleid='".$roleid."'";
+                        $sql = "select profileid from vtiger_role2profile where roleid='".$roleid."'";
                         $profresult=$adb->query($sql);
                         $num=$adb->num_rows($profresult);
                         if($num>1)
                         {
-                                $sql10="delete from role2profile where roleid='".$roleid."' and profileid=".$prof_id;
+                                $sql10="delete from vtiger_role2profile where roleid='".$roleid."' and profileid=".$prof_id;
                                 $adb->query($sql10);
                         }
                         else
                         {
-                                $sql8 = "update role2profile set profileid=".$transfer_profileid." where profileid=".$prof_id." and roleid='".$roleid."'";
+                                $sql8 = "update vtiger_role2profile set profileid=".$transfer_profileid." where profileid=".$prof_id." and roleid='".$roleid."'";
                                 $adb->query($sql8);
                         }
 
@@ -2281,15 +2281,15 @@
                 }
         }
 
-	//delete from profile table;
-	$sql9 = "delete from profile where profileid=".$prof_id;
+	//delete from vtiger_profile vtiger_table;
+	$sql9 = "delete from vtiger_profile where profileid=".$prof_id;
 	$adb->query($sql9);
 	$log->debug("Exiting deleteProfile method ...");	
 
 }
 
-/** Function to get all  the role information 
-  * @returns $allRoleDetailArray-- Array will contain the details of all the roles. RoleId will be the key:: Type array
+/** Function to get all  the vtiger_role information 
+  * @returns $allRoleDetailArray-- Array will contain the details of all the vtiger_roles. RoleId will be the key:: Type array
  */
 function getAllRoleDetails()
 {
@@ -2297,7 +2297,7 @@
 $log->debug("Entering getAllRoleDetails() method ...");
 	global $adb;
 	$role_det = Array();
-	$query = "select * from role";
+	$query = "select * from vtiger_role";
 	$result = $adb->query($query);
 	$num_rows=$adb->num_rows($result);
 	for($i=0; $i<$num_rows;$i++)
@@ -2311,7 +2311,7 @@
 		$sub_role='';
 		
 		//getting the immediate subordinates
-		$query1="select * from role where parentrole like '".$parentrole."::%' and depth=".$sub_roledepth;
+		$query1="select * from vtiger_role where parentrole like '".$parentrole."::%' and depth=".$sub_roledepth;
 		$res1 = $adb->query($query1);
 		$num_roles = $adb->num_rows($res1);
 		if($num_roles > 0)
@@ -2341,15 +2341,15 @@
 }
 
 
-/** Function to get all  the profile information 
-  * @returns $allProfileInfoArray-- Array will contain the details of all the profiles. Profile ID will be the key:: Type array
+/** Function to get all  the vtiger_profile information 
+  * @returns $allProfileInfoArray-- Array will contain the details of all the vtiger_profiles. Profile ID will be the key:: Type array
  */
 function getAllProfileInfo()
 {
 	global $log;
 	$log->debug("Entering getAllProfileInfo() method ...");
 	global $adb;
-	$query="select * from profile";
+	$query="select * from vtiger_profile";
 	$result = $adb->query($query);
 	$num_rows=$adb->num_rows($result);
 	$prof_details=Array();
@@ -2364,7 +2364,7 @@
 	return $prof_details;	
 }
 
-/** Function to get the role information of the specified role
+/** Function to get the vtiger_role information of the specified vtiger_role
   * @param $roleid -- RoleId :: Type varchar 
   * @returns $roleInfoArray-- RoleInfoArray in the following format:
   *       $roleInfo=Array($roleId=>Array($rolename,$parentrole,$roledepth,$immediateParent));
@@ -2374,7 +2374,7 @@
 	global $log;
 	$log->debug("Entering getRoleInformation(".$roleid.") method ...");
 	global $adb;
-	$query = "select * from role where roleid='".$roleid."'";
+	$query = "select * from vtiger_role where roleid='".$roleid."'";
 	$result = $adb->query($query);
 	$rolename=$adb->query_result($result,0,'rolename');
 	$parentrole=$adb->query_result($result,0,'parentrole');
@@ -2393,7 +2393,7 @@
 }
 
 
-/** Function to get the role related profiles
+/** Function to get the vtiger_role related vtiger_profiles
   * @param $roleid -- RoleId :: Type varchar 
   * @returns $roleProfiles-- Role Related Profile Array in the following format:
   *       $roleProfiles=Array($profileId1=>$profileName,$profileId2=>$profileName,........,$profileIdn=>$profileName));
@@ -2403,7 +2403,7 @@
 	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."'";
+	$query = "select vtiger_role2profile.*,vtiger_profile.profilename from vtiger_role2profile inner join vtiger_profile on vtiger_profile.profileid=vtiger_role2profile.profileid where roleid='".$roleId."'";
 	$result = $adb->query($query);
 	$num_rows=$adb->num_rows($result);
 	$roleRelatedProfiles=Array();
@@ -2416,7 +2416,7 @@
 }
 
 
-/** Function to get the role related users
+/** Function to get the vtiger_role related vtiger_users
   * @param $roleid -- RoleId :: Type varchar 
   * @returns $roleUsers-- Role Related User Array in the following format:
   *       $roleUsers=Array($userId1=>$userName,$userId2=>$userName,........,$userIdn=>$userName));
@@ -2426,7 +2426,7 @@
 	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."'";
+	$query = "select vtiger_user2role.*,vtiger_users.user_name from vtiger_user2role inner join vtiger_users on vtiger_users.id=vtiger_user2role.userid where roleid='".$roleId."'";
 	$result = $adb->query($query);
 	$num_rows=$adb->num_rows($result);
 	$roleRelatedUsers=Array();
@@ -2441,7 +2441,7 @@
 }
 
 
-/** Function to get the role related user ids
+/** Function to get the vtiger_role related user ids
   * @param $roleid -- RoleId :: Type varchar 
   * @returns $roleUserIds-- Role Related User Array in the following format:
   *       $roleUserIds=Array($userId1,$userId2,........,$userIdn);
@@ -2452,7 +2452,7 @@
 	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."'";
+	$query = "select vtiger_user2role.*,vtiger_users.user_name from vtiger_user2role inner join vtiger_users on vtiger_users.id=vtiger_user2role.userid where roleid='".$roleId."'";
 	$result = $adb->query($query);
 	$num_rows=$adb->num_rows($result);
 	$roleRelatedUsers=Array();
@@ -2466,7 +2466,7 @@
 
 }
 
-/** Function to get the role and subordinate users
+/** Function to get the vtiger_role and subordinate vtiger_users
   * @param $roleid -- RoleId :: Type varchar 
   * @returns $roleSubUsers-- Role and Subordinates Related Users Array in the following format:
   *       $roleSubUsers=Array($userId1=>$userName,$userId2=>$userName,........,$userIdn=>$userName));
@@ -2478,7 +2478,7 @@
 	global $adb;
 	$roleInfoArr=getRoleInformation($roleId);
 	$parentRole=$roleInfoArr[$roleId][1];
-	$query = "select user2role.*,users.user_name from user2role inner join users on users.id=user2role.userid inner join role on role.roleid=user2role.roleid where role.parentrole like '".$parentRole."%'";
+	$query = "select vtiger_user2role.*,vtiger_users.user_name from vtiger_user2role inner join vtiger_users on vtiger_users.id=vtiger_user2role.userid inner join vtiger_role on vtiger_role.roleid=vtiger_user2role.roleid where vtiger_role.parentrole like '".$parentRole."%'";
 	$result = $adb->query($query);
 	$num_rows=$adb->num_rows($result);
 	$roleRelatedUsers=Array();
@@ -2493,7 +2493,7 @@
 }
 
 
-/** Function to get the role and subordinate user ids
+/** Function to get the vtiger_role and subordinate user ids
   * @param $roleid -- RoleId :: Type varchar 
   * @returns $roleSubUserIds-- Role and Subordinates Related Users Array in the following format:
   *       $roleSubUserIds=Array($userId1,$userId2,........,$userIdn);
@@ -2505,7 +2505,7 @@
 	global $adb;
 	$roleInfoArr=getRoleInformation($roleId);
 	$parentRole=$roleInfoArr[$roleId][1];
-	$query = "select user2role.*,users.user_name from user2role inner join users on users.id=user2role.userid inner join role on role.roleid=user2role.roleid where role.parentrole like '".$parentRole."%'";
+	$query = "select vtiger_user2role.*,vtiger_users.user_name from vtiger_user2role inner join vtiger_users on vtiger_users.id=vtiger_user2role.userid inner join vtiger_role on vtiger_role.roleid=vtiger_user2role.roleid where vtiger_role.parentrole like '".$parentRole."%'";
 	$result = $adb->query($query);
 	$num_rows=$adb->num_rows($result);
 	$roleRelatedUsers=Array();
@@ -2519,7 +2519,7 @@
 
 }
 
-/** Function to get the role and subordinate Information for the specified roleId
+/** Function to get the vtiger_role and subordinate Information for the specified vtiger_roleId
   * @param $roleid -- RoleId :: Type varchar 
   * @returns $roleSubInfo-- Role and Subordinates Information array in the following format:
   *       $roleSubInfo=Array($roleId1=>Array($rolename,$parentrole,$roledepth,$immediateParent), $roleId2=>Array($rolename,$parentrole,$roledepth,$immediateParent),.....);
@@ -2533,7 +2533,7 @@
 	$roleInfo=$roleDetails[$roleId];
 	$roleParentSeq=$roleInfo[1];
 	
-	$query="select * from role where parentrole like '".$roleParentSeq."%' order by parentrole asc";
+	$query="select * from vtiger_role where parentrole like '".$roleParentSeq."%' order by parentrole asc";
 	$result=$adb->query($query);
 	$num_rows=$adb->num_rows($result);
 	$roleInfo=Array();
@@ -2556,7 +2556,7 @@
 }
 
 
-/** Function to get the role and subordinate role ids
+/** Function to get the vtiger_role and subordinate vtiger_role ids
   * @param $roleid -- RoleId :: Type varchar 
   * @returns $roleSubRoleIds-- Role and Subordinates RoleIds in an Array in the following format:
   *       $roleSubRoleIds=Array($roleId1,$roleId2,........,$roleIdn);
@@ -2570,7 +2570,7 @@
 	$roleInfo=$roleDetails[$roleId];
 	$roleParentSeq=$roleInfo[1];
 	
-	$query="select * from role where parentrole like '".$roleParentSeq."%' order by parentrole asc";
+	$query="select * from vtiger_role where parentrole like '".$roleParentSeq."%' order by parentrole asc";
 	$result=$adb->query($query);
 	$num_rows=$adb->num_rows($result);
 	$roleInfo=Array();
@@ -2585,9 +2585,9 @@
 
 }
 
-/** Function to get delete the spcified role 
+/** Function to get delete the spcified vtiger_role 
   * @param $roleid -- RoleId :: Type varchar 
-  * @param $transferRoleId -- RoleId to which users of the role that is being deleted are transferred:: Type varchar 
+  * @param $transferRoleId -- RoleId to which vtiger_users of the vtiger_role that is being deleted are transferred:: Type varchar 
  */
 function deleteRole($roleId,$transferRoleId)
 {
@@ -2598,26 +2598,26 @@
         foreach($roleInfo as $roleid=>$roleDetArr)
         {
 
-                $sql1 = "update user2role set roleid='".$transferRoleId."' where roleid='".$roleid."'";
+                $sql1 = "update vtiger_user2role set roleid='".$transferRoleId."' where roleid='".$roleid."'";
                 $adb->query($sql1);
 
-                //Deleteing from role2profile table
-                $sql2 = "delete from role2profile where roleid='".$roleid."'";
+                //Deleteing from vtiger_role2profile vtiger_table
+                $sql2 = "delete from vtiger_role2profile where roleid='".$roleid."'";
                 $adb->query($sql2);
 
-                //delete handling for groups
-                $sql10 = "delete from group2role where roleid='".$roleid."'";
+                //delete handling for vtiger_groups
+                $sql10 = "delete from vtiger_group2role where roleid='".$roleid."'";
                 $adb->query($sql10);
 
-                $sql11 = "delete from group2rs where roleandsubid='".$roleid."'";
+                $sql11 = "delete from vtiger_group2rs where roleandsubid='".$roleid."'";
                 $adb->query($sql11);
 
 
                 //delete handling for sharing rules
                 deleteRoleRelatedSharingRules($roleid);
 
-                //delete from role table;
-                $sql9 = "delete from role where roleid='".$roleid."'";
+                //delete from vtiger_role vtiger_table;
+                $sql9 = "delete from vtiger_role where roleid='".$roleid."'";
                 $adb->query($sql9);
                 //echo $sql1.'            '.$sql2.'           '.$sql9;
 
@@ -2628,7 +2628,7 @@
 
 }
 
-/** Function to delete the role related sharing rules
+/** Function to delete the vtiger_role related sharing rules
   * @param $roleid -- RoleId :: Type varchar
  */
 function deleteRoleRelatedSharingRules($roleId)
@@ -2636,14 +2636,14 @@
 	global $log;
 	$log->debug("Entering deleteRoleRelatedSharingRules(".$roleId.") method ...");
         global $adb;
-        $dataShareTableColArr=Array('datashare_grp2role'=>'to_roleid',
-                                    'datashare_grp2rs'=>'to_roleandsubid',
-                                    'datashare_role2group'=>'share_roleid',
-                                    'datashare_role2role'=>'share_roleid::to_roleid',
-                                    'datashare_role2rs'=>'share_roleid::to_roleandsubid',
-                                    'datashare_rs2grp'=>'share_roleandsubid',
-                                    'datashare_rs2role'=>'share_roleandsubid::to_roleid',
-                                    'datashare_rs2rs'=>'share_roleandsubid::to_roleandsubid');
+        $dataShareTableColArr=Array('vtiger_datashare_grp2role'=>'to_roleid',
+                                    'vtiger_datashare_grp2rs'=>'to_roleandsubid',
+                                    'vtiger_datashare_role2group'=>'share_roleid',
+                                    'vtiger_datashare_role2role'=>'share_roleid::to_roleid',
+                                    'vtiger_datashare_role2rs'=>'share_roleid::to_roleandsubid',
+                                    'vtiger_datashare_rs2grp'=>'share_roleandsubid',
+                                    'vtiger_datashare_rs2role'=>'share_roleandsubid::to_roleid',
+                                    'vtiger_datashare_rs2rs'=>'share_roleandsubid::to_roleandsubid');
 
         foreach($dataShareTableColArr as $tablename=>$colname)
         {
@@ -2676,11 +2676,11 @@
 	$log->debug("Entering deleteGroupRelatedSharingRules(".$grpId.") method ...");
 
         global $adb;
-        $dataShareTableColArr=Array('datashare_grp2grp'=>'share_groupid::to_groupid',
-                                    'datashare_grp2role'=>'share_groupid',
-                                    'datashare_grp2rs'=>'share_groupid',
-                                    'datashare_role2group'=>'to_groupid',
-                                    'datashare_rs2grp'=>'to_groupid');
+        $dataShareTableColArr=Array('vtiger_datashare_grp2grp'=>'share_groupid::to_groupid',
+                                    'vtiger_datashare_grp2role'=>'share_groupid',
+                                    'vtiger_datashare_grp2rs'=>'share_groupid',
+                                    'vtiger_datashare_role2group'=>'to_groupid',
+                                    'vtiger_datashare_rs2grp'=>'to_groupid');
 
 
         foreach($dataShareTableColArr as $tablename=>$colname)
@@ -2706,7 +2706,7 @@
 }
 
 
-/** Function to get userid and username of all users 
+/** Function to get userid and username of all vtiger_users 
   * @returns $userArray -- User Array in the following format:
   * $userArray=Array($userid1=>$username, $userid2=>$username,............,$useridn=>$username); 
  */
@@ -2715,7 +2715,7 @@
 	global $log;
 	$log->debug("Entering getAllUserName() method ...");
 	global $adb;
-	$query="select * from users where deleted=0";
+	$query="select * from vtiger_users where deleted=0";
 	$result = $adb->query($query);
 	$num_rows=$adb->num_rows($result);
 	$user_details=Array();
@@ -2732,7 +2732,7 @@
 }
 
 
-/** Function to get groupid and groupname of all groups 
+/** Function to get groupid and groupname of all vtiger_groups 
   * @returns $grpArray -- Group Array in the following format:
   * $grpArray=Array($grpid1=>$grpname, $grpid2=>$grpname,............,$grpidn=>$grpname); 
  */
@@ -2741,7 +2741,7 @@
 	global $log;
 	$log->debug("Entering getAllGroupName() method ...");
 	global $adb;
-	$query="select * from groups";
+	$query="select * from vtiger_groups";
 	$result = $adb->query($query);
 	$num_rows=$adb->num_rows($result);
 	$group_details=Array();
@@ -2757,7 +2757,7 @@
 
 }
 
-/** Function to get group information of all groups 
+/** Function to get group information of all vtiger_groups 
   * @returns $grpInfoArray -- Group Informaton array in the following format: 
   * $grpInfoArray=Array($grpid1=>Array($grpname,description) $grpid2=>Array($grpname,description),............,$grpidn=>Array($grpname,description)); 
  */
@@ -2766,7 +2766,7 @@
 	global $log;
 	$log->debug("Entering getAllGroupInfo() method ...");
 	global $adb;
-	$query="select * from groups";
+	$query="select * from vtiger_groups";
 	$result = $adb->query($query);
 	$num_rows=$adb->num_rows($result);
 	$group_details=Array();
@@ -2798,8 +2798,8 @@
 	$log->debug("Entering createGroup(".$groupName.",".$groupMemberArray.",".$description.") method ...");
 	global $adb;
 	$groupId=$adb->getUniqueId("groups");
-	//Insert into group table
-	$query = "insert into groups values(".$groupId.",'".$groupName."','".$description."')";
+	//Insert into group vtiger_table
+	$query = "insert into vtiger_groups values(".$groupId.",'".$groupName."','".$description."')";
 	$adb->query($query);
 
 	//Insert Group to Group Relation
@@ -2844,13 +2844,13 @@
 	global $log;
 	$log->debug("Entering insertGroupToGroupRelation(".$groupId.",".$containsGroupId.") method ...");
 	global $adb;
-	$query="insert into group2grouprel values(".$groupId.",".$containsGroupId.")";
+	$query="insert into vtiger_group2grouprel values(".$groupId.",".$containsGroupId.")";
 	$adb->query($query);
 	$log->debug("Exiting insertGroupToGroupRelation method ...");
 }
 
 
-/** Function to insert group to role relation 
+/** Function to insert group to vtiger_role relation 
   * @param $groupId -- Group Id :: Type integer 
   * @param $roleId -- Role Id :: Type varchar 
  */
@@ -2859,13 +2859,13 @@
 	 global $log;
 	$log->debug("Entering insertGroupToRoleRelation(".$groupId.",".$roleId.") method ...");
 	global $adb;
-	$query="insert into group2role values(".$groupId.",'".$roleId."')";
+	$query="insert into vtiger_group2role values(".$groupId.",'".$roleId."')";
 	$adb->query($query);
 	$log->debug("Exiting insertGroupToRoleRelation method ...");
 }
 
 
-/** Function to insert group to role&subordinate relation 
+/** Function to insert group to vtiger_role&subordinate relation 
   * @param $groupId -- Group Id :: Type integer 
   * @param $rsId -- Role Sub Id :: Type varchar 
  */
@@ -2874,7 +2874,7 @@
 	global $log;
 	$log->debug("Entering insertGroupToRsRelation(".$groupId.",".$rsId.") method ...");
 	global $adb;
-	$query="insert into group2rs values(".$groupId.",'".$rsId."')";
+	$query="insert into vtiger_group2rs values(".$groupId.",'".$rsId."')";
 	$adb->query($query);
 	$log->debug("Exiting insertGroupToRsRelation method ...");
 }
@@ -2888,7 +2888,7 @@
 	global $log;
 	$log->debug("Entering insertGroupToUserRelation(".$groupId.",".$userId.") method ...");
 	global $adb;
-	$query="insert into users2group values(".$groupId.",".$userId.")";
+	$query="insert into vtiger_users2group values(".$groupId.",".$userId.")";
 	$adb->query($query);
 	$log->debug("Exiting insertGroupToUserRelation method ...");
 }
@@ -2907,7 +2907,7 @@
 	$groupDetailArr=Array();
 	$groupMemberArr=Array();
 	//Retreving the group Info
-	$query="select * from groups where groupid=".$groupId;
+	$query="select * from vtiger_groups where groupid=".$groupId;
 	$result = $adb->query($query);
 	$groupName=$adb->query_result($result,0,'groupname');
 	$description=$adb->query_result($result,0,'description');
@@ -2936,7 +2936,7 @@
 
 	global $adb;
 	//Retreving the group Info
-	$query="select * from groups where groupid=".$groupId;
+	$query="select * from vtiger_groups where groupid=".$groupId;
 	$result = $adb->query($query);
 	$groupName=$adb->query_result($result,0,'groupname');
 	$log->debug("Exiting fetchGroupName method ...");
@@ -2971,7 +2971,7 @@
 	return($groupMemberArr);
 }
 
-/** Function to get the group related roles of the specified group 
+/** Function to get the group related vtiger_roles of the specified group 
   * @param $groupId -- Group Id :: Type integer 
   * @returns Group Related Role Array in the follwing format:
   *  $groupRoles=Array(roleid1,roleid2,roleid3,.....,roleidn);
@@ -2982,7 +2982,7 @@
 	$log->debug("Entering getGroupRelatedRoles(".$groupId.") method ...");
 	global $adb;
 	$roleGroupArr=Array();
-	$query="select * from group2role where groupid=".$groupId;
+	$query="select * from vtiger_group2role where groupid=".$groupId;
 	$result = $adb->query($query);
 	$num_rows=$adb->num_rows($result);
 	for($i=0;$i<$num_rows;$i++)
@@ -2996,7 +2996,7 @@
 }
 
 
-/** Function to get the group related roles and subordinates of the specified group 
+/** Function to get the group related vtiger_roles and subordinates of the specified group 
   * @param $groupId -- Group Id :: Type integer 
   * @returns Group Related Roles & Subordinate Array in the follwing format:
   *  $groupRoleSubordinates=Array(roleid1,roleid2,roleid3,.....,roleidn);
@@ -3007,7 +3007,7 @@
 	$log->debug("Entering getGroupRelatedRoleSubordinates(".$groupId.") method ...");
 	global $adb;
 	$rsGroupArr=Array();
-	$query="select * from group2rs where groupid=".$groupId;
+	$query="select * from vtiger_group2rs where groupid=".$groupId;
 	$result = $adb->query($query);
 	$num_rows=$adb->num_rows($result);
 	for($i=0;$i<$num_rows;$i++)
@@ -3020,7 +3020,7 @@
 }
 
 
-/** Function to get the group related groups  
+/** Function to get the group related vtiger_groups  
   * @param $groupId -- Group Id :: Type integer 
   * @returns Group Related Groups Array in the follwing format:
   *  $groupGroups=Array(grpid1,grpid2,grpid3,.....,grpidn);
@@ -3031,7 +3031,7 @@
 	$log->debug("Entering getGroupRelatedGroups(".$groupId.") method ...");
 	global $adb;
 	$groupGroupArr=Array();
-	$query="select * from group2grouprel where groupid=".$groupId;
+	$query="select * from vtiger_group2grouprel where groupid=".$groupId;
 	$result = $adb->query($query);
 	$num_rows=$adb->num_rows($result);
 	for($i=0;$i<$num_rows;$i++)
@@ -3044,7 +3044,7 @@
 			
 }
 
-/** Function to get the group related users  
+/** Function to get the group related vtiger_users  
   * @param $userId -- User Id :: Type integer 
   * @returns Group Related Users Array in the follwing format:
   *  $groupUsers=Array(userid1,userid2,userid3,.....,useridn);
@@ -3055,7 +3055,7 @@
 	$log->debug("Entering getGroupRelatedUsers(".$groupId.") method ...");
 	global $adb;
 	$userGroupArr=Array();
-	$query="select * from users2group where groupid=".$groupId;
+	$query="select * from vtiger_users2group where groupid=".$groupId;
 	$result = $adb->query($query);
 	$num_rows=$adb->num_rows($result);
 	for($i=0;$i<$num_rows;$i++)
@@ -3079,7 +3079,7 @@
 	global $log;
 	$log->debug("Entering updateGroup(".$groupId.",".$groupName.",".$groupMemberArray.",".$description.") method ...");
 	global $adb;
-	$query="update groups set groupname='".$groupName."',description='".$description."' where groupid=".$groupId;
+	$query="update vtiger_groups set groupname='".$groupName."',description='".$description."' where groupid=".$groupId;
 	$adb->query($query);
 
 	//Deleting the Group Member Relation
@@ -3129,7 +3129,7 @@
 	$log->debug("Entering deleteGroup(".$groupId.") method ...");	
 	global $adb;
 	deleteGroupRelatedSharingRules($groupId);		
-	$query="delete from groups where groupid=".$groupId;
+	$query="delete from vtiger_groups where groupid=".$groupId;
 	$adb->query($query);
 
 	deleteGroupRelatedGroups($groupId);
@@ -3148,13 +3148,13 @@
 	global $log;
 	$log->debug("Entering deleteGroupRelatedGroups(".$groupId.") method ...");
 	global $adb;
-	$query="delete from group2grouprel where groupid=".$groupId;
+	$query="delete from vtiger_group2grouprel where groupid=".$groupId;
 	$adb->query($query);
 	$log->debug("Exiting deleteGroupRelatedGroups method ...");
 }
 
 
-/** Function to delete group to role relation of the  specified group  
+/** Function to delete group to vtiger_role relation of the  specified group  
   * @param $groupId -- Group Id :: Type integer 
  */
 function deleteGroupRelatedRoles($groupId)
@@ -3162,13 +3162,13 @@
 	global $log;
 	$log->debug("Entering deleteGroupRelatedRoles(".$groupId.") method ...");
 	global $adb;
-	$query="delete from group2role where groupid=".$groupId;
+	$query="delete from vtiger_group2role where groupid=".$groupId;
 	$adb->query($query);
 	$log->debug("Exiting deleteGroupRelatedRoles method ...");
 }
 
 
-/** Function to delete group to role and subordinates relation of the  specified group  
+/** Function to delete group to vtiger_role and subordinates relation of the  specified group  
   * @param $groupId -- Group Id :: Type integer 
  */
 function deleteGroupRelatedRolesAndSubordinates($groupId)
@@ -3176,7 +3176,7 @@
 	global $log;
 	$log->debug("Entering deleteGroupRelatedRolesAndSubordinates(".$groupId.") method ...");
 	global $adb;
-	$query="delete from group2rs where groupid=".$groupId;
+	$query="delete from vtiger_group2rs where groupid=".$groupId;
 	$adb->query($query);
 	$log->debug("Exiting deleteGroupRelatedRolesAndSubordinates method ...");
 }
@@ -3190,7 +3190,7 @@
 	global $log;
 	$log->debug("Entering deleteGroupRelatedUsers(".$groupId.") method ...");
 	global $adb;
-	$query="delete from users2group where groupid=".$groupId;
+	$query="delete from vtiger_users2group where groupid=".$groupId;
 	$adb->query($query);
 	$log->debug("Exiting deleteGroupRelatedUsers method ...");
 }
@@ -3204,7 +3204,7 @@
 	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;
+	$query="select * from vtiger_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 ...");
@@ -3228,7 +3228,7 @@
 	$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;
+	$query = "select vtiger_org_share_action_mapping.share_action_name,vtiger_org_share_action2tab.share_action_id from vtiger_org_share_action2tab inner join vtiger_org_share_action_mapping on vtiger_org_share_action2tab.share_action_id=vtiger_org_share_action_mapping.share_action_id where vtiger_org_share_action2tab.tabid=".$tabid;
 	$result=$adb->query($query);
 	$num_rows=$adb->num_rows($result);
 	for($i=0; $i<$num_rows; $i++)
@@ -3245,8 +3245,8 @@
 /** This function adds a organisation level sharing rule for the specified Module
   * It takes the following input parameters:
   * 	$tabid -- Module tabid - Datatype::Integer
-  * 	$shareEntityType -- The Entity Type may be groups,roles,rs and users - Datatype::String
-  * 	$toEntityType -- The Entity Type may be groups,roles,rs and users - Datatype::String
+  * 	$shareEntityType -- The Entity Type may be vtiger_groups,roles,rs and vtiger_users - Datatype::String
+  * 	$toEntityType -- The Entity Type may be vtiger_groups,roles,rs and vtiger_users - Datatype::String
   * 	$shareEntityId -- The id of the group,role,rs,user to be shared 
   * 	$toEntityId -- The id of the group,role,rs,user to which the specified entity is to be shared
   * 	$sharePermisson -- This can have the following values:
@@ -3266,57 +3266,57 @@
 	if($shareEntityType == 'groups' && $toEntityType == 'groups')
 	{
 		$type_string='GRP::GRP';
-		$query = "insert into datashare_grp2grp values(".$shareid.", ".$shareEntityId.", ".$toEntityId.", ".$sharePermission.")";
+		$query = "insert into vtiger_datashare_grp2grp values(".$shareid.", ".$shareEntityId.", ".$toEntityId.", ".$sharePermission.")";
 	}
 	elseif($shareEntityType == 'groups' && $toEntityType == 'roles')
 	{
 		
 		$type_string='GRP::ROLE';
-		$query = "insert into datashare_grp2role values(".$shareid.", ".$shareEntityId.", '".$toEntityId."', ".$sharePermission.")";
+		$query = "insert into vtiger_datashare_grp2role values(".$shareid.", ".$shareEntityId.", '".$toEntityId."', ".$sharePermission.")";
 	}
 	elseif($shareEntityType == 'groups' && $toEntityType == 'rs')
 	{
 		
 		$type_string='GRP::RS';
-		$query = "insert into datashare_grp2rs values(".$shareid.", ".$shareEntityId.", '".$toEntityId."', ".$sharePermission.")";
+		$query = "insert into vtiger_datashare_grp2rs values(".$shareid.", ".$shareEntityId.", '".$toEntityId."', ".$sharePermission.")";
 	}
 	elseif($shareEntityType == 'roles' && $toEntityType == 'groups')
 	{
 		
 		$type_string='ROLE::GRP';
-		$query = "insert into datashare_role2group values(".$shareid.", '".$shareEntityId."', ".$toEntityId.", ".$sharePermission.")";
+		$query = "insert into vtiger_datashare_role2group values(".$shareid.", '".$shareEntityId."', ".$toEntityId.", ".$sharePermission.")";
 	}
 	elseif($shareEntityType == 'roles' && $toEntityType == 'roles')
 	{
 		
 		$type_string='ROLE::ROLE';
-		$query = "insert into datashare_role2role values(".$shareid.", '".$shareEntityId."', '".$toEntityId."', ".$sharePermission.")";
+		$query = "insert into vtiger_datashare_role2role values(".$shareid.", '".$shareEntityId."', '".$toEntityId."', ".$sharePermission.")";
 	}
 	elseif($shareEntityType == 'roles' && $toEntityType == 'rs')
 	{
 		
 		$type_string='ROLE::RS';
-		$query = "insert into datashare_role2rs values(".$shareid.", '".$shareEntityId."', '".$toEntityId."', ".$sharePermission.")";
+		$query = "insert into vtiger_datashare_role2rs values(".$shareid.", '".$shareEntityId."', '".$toEntityId."', ".$sharePermission.")";
 	}
 	elseif($shareEntityType == 'rs' && $toEntityType == 'groups')
 	{
 		
 		$type_string='RS::GRP';
-		$query = "insert into datashare_rs2grp values(".$shareid.", '".$shareEntityId."', ".$toEntityId.", ".$sharePermission.")";
+		$query = "insert into vtiger_datashare_rs2grp values(".$shareid.", '".$shareEntityId."', ".$toEntityId.", ".$sharePermission.")";
 	}
 	elseif($shareEntityType == 'rs' && $toEntityType == 'roles')
 	{
 		
 		$type_string='RS::ROLE';
-		$query = "insert into datashare_rs2role values(".$shareid.", '".$shareEntityId."', '".$toEntityId."', ".$sharePermission.")";
+		$query = "insert into vtiger_datashare_rs2role values(".$shareid.", '".$shareEntityId."', '".$toEntityId."', ".$sharePermission.")";
 	}
 	elseif($shareEntityType == 'rs' && $toEntityType == 'rs')
 	{
 		
 		$type_string='RS::RS';
-		$query = "insert into datashare_rs2rs values(".$shareid.", '".$shareEntityId."', '".$toEntityId."', ".$sharePermission.")";
-	}
-	$query1 = "insert into datashare_module_rel values(".$shareid.",".$tabid.",'".$type_string."')";
+		$query = "insert into vtiger_datashare_rs2rs values(".$shareid.", '".$shareEntityId."', '".$toEntityId."', ".$sharePermission.")";
+	}
+	$query1 = "insert into vtiger_datashare_module_rel values(".$shareid.",".$tabid.",'".$type_string."')";
 	$adb->query($query1);		
 	$adb->query($query);	
 	$log->debug("Exiting addSharingRule method ...");
@@ -3329,8 +3329,8 @@
   * It takes the following input parameters:
   *     $shareid -- Id of the Sharing Rule to be updated
   * 	$tabid -- Module tabid - Datatype::Integer
-  * 	$shareEntityType -- The Entity Type may be groups,roles,rs and users - Datatype::String
-  * 	$toEntityType -- The Entity Type may be groups,roles,rs and users - Datatype::String
+  * 	$shareEntityType -- The Entity Type may be vtiger_groups,roles,rs and vtiger_users - Datatype::String
+  * 	$toEntityType -- The Entity Type may be vtiger_groups,roles,rs and vtiger_users - Datatype::String
   * 	$shareEntityId -- The id of the group,role,rs,user to be shared 
   * 	$toEntityId -- The id of the group,role,rs,user to which the specified entity is to be shared
   * 	$sharePermisson -- This can have the following values:
@@ -3344,7 +3344,7 @@
 	$log->debug("Entering updateSharingRule(".$shareid.",".$tabid.",".$shareEntityType.",".$toEntityType.",".$shareEntityId.",".$toEntityId.",".$sharePermission.") method ...");
 	
 	global $adb;
-	$query2="select * from datashare_module_rel where shareid=".$shareid;
+	$query2="select * from vtiger_datashare_module_rel where shareid=".$shareid;
 	$res=$adb->query($query2);
 	$typestr=$adb->query_result($res,0,'relationtype');
 	$tabname=getDSTableNameForType($typestr);
@@ -3355,58 +3355,58 @@
 	if($shareEntityType == 'groups' && $toEntityType == 'groups')
 	{
 		$type_string='GRP::GRP';
-		$query = "insert into datashare_grp2grp values(".$shareid.", ".$shareEntityId.", ".$toEntityId.", ".$sharePermission.")";
+		$query = "insert into vtiger_datashare_grp2grp values(".$shareid.", ".$shareEntityId.", ".$toEntityId.", ".$sharePermission.")";
 	}
 	elseif($shareEntityType == 'groups' && $toEntityType == 'roles')
 	{
 		
 		$type_string='GRP::ROLE';
-		$query = "insert into datashare_grp2role values(".$shareid.", ".$shareEntityId.", '".$toEntityId."', ".$sharePermission.")";
+		$query = "insert into vtiger_datashare_grp2role values(".$shareid.", ".$shareEntityId.", '".$toEntityId."', ".$sharePermission.")";
 	}
 	elseif($shareEntityType == 'groups' && $toEntityType == 'rs')
 	{
 		
 		$type_string='GRP::RS';
-		$query = "insert into datashare_grp2rs values(".$shareid.", ".$shareEntityId.", '".$toEntityId."', ".$sharePermission.")";
+		$query = "insert into vtiger_datashare_grp2rs values(".$shareid.", ".$shareEntityId.", '".$toEntityId."', ".$sharePermission.")";
 	}
 	elseif($shareEntityType == 'roles' && $toEntityType == 'groups')
 	{
 		
 		$type_string='ROLE::GRP';
-		$query = "insert into datashare_role2group values(".$shareid.", '".$shareEntityId."', ".$toEntityId.", ".$sharePermission.")";
+		$query = "insert into vtiger_datashare_role2group values(".$shareid.", '".$shareEntityId."', ".$toEntityId.", ".$sharePermission.")";
 	}
 	elseif($shareEntityType == 'roles' && $toEntityType == 'roles')
 	{
 		
 		$type_string='ROLE::ROLE';
-		$query = "insert into datashare_role2role values(".$shareid.", '".$shareEntityId."', '".$toEntityId."', ".$sharePermission.")";
+		$query = "insert into vtiger_datashare_role2role values(".$shareid.", '".$shareEntityId."', '".$toEntityId."', ".$sharePermission.")";
 	}
 	elseif($shareEntityType == 'roles' && $toEntityType == 'rs')
 	{
 		
 		$type_string='ROLE::RS';
-		$query = "insert into datashare_role2rs values(".$shareid.", '".$shareEntityId."', '".$toEntityId."', ".$sharePermission.")";
+		$query = "insert into vtiger_datashare_role2rs values(".$shareid.", '".$shareEntityId."', '".$toEntityId."', ".$sharePermission.")";
 	}
 	elseif($shareEntityType == 'rs' && $toEntityType == 'groups')
 	{
 		
 		$type_string='RS::GRP';
-		$query = "insert into datashare_rs2grp values(".$shareid.", '".$shareEntityId."', ".$toEntityId.", ".$sharePermission.")";
+		$query = "insert into vtiger_datashare_rs2grp values(".$shareid.", '".$shareEntityId."', ".$toEntityId.", ".$sharePermission.")";
 	}
 	elseif($shareEntityType == 'rs' && $toEntityType == 'roles')
 	{
 		
 		$type_string='RS::ROLE';
-		$query = "insert into datashare_rs2role values(".$shareid.", '".$shareEntityId."', '".$toEntityId."', ".$sharePermission.")";
+		$query = "insert into vtiger_datashare_rs2role values(".$shareid.", '".$shareEntityId."', '".$toEntityId."', ".$sharePermission.")";
 	}
 	elseif($shareEntityType == 'rs' && $toEntityType == 'rs')
 	{
 		
 		$type_string='RS::RS';
-		$query = "insert into datashare_rs2rs values(".$shareid.", '".$shareEntityId."', '".$toEntityId."', ".$sharePermission.")";
-	}
-	
-	$query1 = "update datashare_module_rel set relationtype='".$type_string."' where shareid=".$shareid;
+		$query = "insert into vtiger_datashare_rs2rs values(".$shareid.", '".$shareEntityId."', '".$toEntityId."', ".$sharePermission.")";
+	}
+	
+	$query1 = "update vtiger_datashare_module_rel set relationtype='".$type_string."' where shareid=".$shareid;
 	$adb->query($query1);		
 	$adb->query($query);	
 	$log->debug("Exiting updateSharingRule method ...");
@@ -3424,17 +3424,17 @@
 	global $log;
 	$log->debug("Entering deleteSharingRule(".$shareid.") method ...");
 	global $adb;
-	$query2="select * from datashare_module_rel where shareid=".$shareid;
+	$query2="select * from vtiger_datashare_module_rel where shareid=".$shareid;
 	$res=$adb->query($query2);
 	$typestr=$adb->query_result($res,0,'relationtype');
 	$tabname=getDSTableNameForType($typestr);
 	$query3="delete from ".$tabname." where shareid=".$shareid;
 	$adb->query($query3);
-	$query4="delete from datashare_module_rel where shareid=".$shareid;
+	$query4="delete from vtiger_datashare_module_rel where shareid=".$shareid;
 	$adb->query($query4);
 
 	//deleting the releated module sharing permission
-	$query5="delete from datashare_relatedmodule_permission where shareid=".$shareid;
+	$query5="delete from vtiger_datashare_relatedmodule_permission where shareid=".$shareid;
 	$adb->query($query5);
 	$log->debug("Exiting deleteSharingRule method ...");
 	
@@ -3456,15 +3456,15 @@
 {
 	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',
-				    'datashare_role2group'=>'share_roleid::to_groupid',
-				    'datashare_role2role'=>'share_roleid::to_roleid',
-				    'datashare_role2rs'=>'share_roleid::to_roleandsubid',
-				    'datashare_rs2grp'=>'share_roleandsubid::to_groupid',
-				    'datashare_rs2role'=>'share_roleandsubid::to_roleid',
-				    'datashare_rs2rs'=>'share_roleandsubid::to_roleandsubid');
+	$dataShareTableColArr=Array('vtiger_datashare_grp2grp'=>'share_groupid::to_groupid',
+				    'vtiger_datashare_grp2role'=>'share_groupid::to_roleid',
+				    'vtiger_datashare_grp2rs'=>'share_groupid::to_roleandsubid',
+				    'vtiger_datashare_role2group'=>'share_roleid::to_groupid',
+				    'vtiger_datashare_role2role'=>'share_roleid::to_roleid',
+				    'vtiger_datashare_role2rs'=>'share_roleid::to_roleandsubid',
+				    'vtiger_datashare_rs2grp'=>'share_roleandsubid::to_groupid',
+				    'vtiger_datashare_rs2role'=>'share_roleandsubid::to_roleid',
+				    'vtiger_datashare_rs2rs'=>'share_roleandsubid::to_roleandsubid');
 	$log->debug("Exiting getDataShareTableandColumnArray method ...");
 	return $dataShareTableColArr;	
 					
@@ -3507,15 +3507,15 @@
 {
 	global $log;
 	$log->debug("Entering getDataShareTableName() method ...");
-	$dataShareTableColArr=Array('GRP::GRP'=>'datashare_grp2grp',
-				    'GRP::ROLE'=>'datashare_grp2role',
-				    'GRP::RS'=>'datashare_grp2rs',
-				    'ROLE::GRP'=>'datashare_role2group',
-				    'ROLE::ROLE'=>'datashare_role2role',
-				    'ROLE::RS'=>'datashare_role2rs',
-				    'RS::GRP'=>'datashare_rs2grp',
-				    'RS::ROLE'=>'datashare_rs2role',
-				    'RS::RS'=>'datashare_rs2rs');
+	$dataShareTableColArr=Array('GRP::GRP'=>'vtiger_datashare_grp2grp',
+				    'GRP::ROLE'=>'vtiger_datashare_grp2role',
+				    'GRP::RS'=>'vtiger_datashare_grp2rs',
+				    'ROLE::GRP'=>'vtiger_datashare_role2group',
+				    'ROLE::ROLE'=>'vtiger_datashare_role2role',
+				    'ROLE::RS'=>'vtiger_datashare_role2rs',
+				    'RS::GRP'=>'vtiger_datashare_rs2grp',
+				    'RS::ROLE'=>'vtiger_datashare_rs2role',
+				    'RS::RS'=>'vtiger_datashare_rs2rs');
 	$log->debug("Exiting getDataShareTableName method ...");
 	return $dataShareTableColArr;	
 					
@@ -3539,7 +3539,7 @@
 
 /** Function to get the Entity type from the specified DataShare Table Column Name
  *  @param $colname -- Datashare Table Column Name :: Type Varchar
- *  @returns The entity type. The entity type may be groups or roles or rs -- Type Varchar
+ *  @returns The entity type. The entity type may be vtiger_groups or vtiger_roles or rs -- Type Varchar
  */
 function getEntityTypeFromCol($colName)
 {
@@ -3566,7 +3566,7 @@
 
 /** Function to get the Entity Display Link
  *  @param $entityid -- Entity Id 
- *  @params $entityType --  The entity type may be groups or roles or rs -- Type Varchar
+ *  @params $entityType --  The entity type may be vtiger_groups or vtiger_roles or rs -- Type Varchar
  *  @returns the Entity Display link  
  */
 function getEntityDisplayLink($entityType,$entityid)
@@ -3605,7 +3605,7 @@
 	$log->debug("Entering getSharingRuleInfo(".$shareId.") method ...");
 	global $adb;
 	$shareRuleInfoArr=Array();
-	$query="select * from datashare_module_rel where shareid=".$shareId;
+	$query="select * from vtiger_datashare_module_rel where shareid=".$shareId;
 	$result=$adb->query($query);
 	//Retreving the Sharing Tabid
 	$tabid=$adb->query_result($result,0,'tabid');
@@ -3658,7 +3658,7 @@
 	$log->debug("Entering getRelatedSharingModules(".$tabid.") method ...");
 	global $adb;
 	$relatedSharingModuleArray=Array();
-	$query="select * from datashare_relatedmodules where tabid=".$tabid;
+	$query="select * from vtiger_datashare_relatedmodules where tabid=".$tabid;
 	$result=$adb->query($query);
 	$num_rows=$adb->num_rows($result);
 	for($i=0;$i<$num_rows;$i++)
@@ -3690,7 +3690,7 @@
 	$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.")" ;
+	$query="insert into vtiger_datashare_relatedmodule_permission values(".$shareid.", ".$relatedModuleSharingId.", ".$sharePermission.")" ;
 	$result=$adb->query($query);
 	$log->debug("Exiting addRelatedModuleSharingPermission method ...");
 }
@@ -3711,7 +3711,7 @@
 	$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;		
+	$query="update vtiger_datashare_relatedmodule_permission set permission=".$sharePermission." where shareid=".$shareid." and datashare_relatedmodule_id=".$relatedModuleSharingId;		
 	$result=$adb->query($query);
 	$log->debug("Exiting updateRelatedModuleSharingPermission method ...");
 }
@@ -3728,7 +3728,7 @@
 	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 ;
+	$query="select datashare_relatedmodule_id from vtiger_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 ...");
@@ -3752,7 +3752,7 @@
 	$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;
+	$query="select vtiger_datashare_relatedmodules.*,vtiger_datashare_relatedmodule_permission.permission from vtiger_datashare_relatedmodules inner join vtiger_datashare_relatedmodule_permission on vtiger_datashare_relatedmodule_permission.datashare_relatedmodule_id=vtiger_datashare_relatedmodules.datashare_relatedmodule_id where vtiger_datashare_relatedmodule_permission.shareid=".$shareid;
 	$result=$adb->query($query);
 	$num_rows=$adb->num_rows($result);
 	for($i=0;$i<$num_rows;$i++)
@@ -3769,10 +3769,10 @@
 }
 
 
-/** This function is to retreive the profiles associated with the  the specified user 
+/** This function is to retreive the vtiger_profiles associated with the  the specified user 
   * It takes the following input parameters:
   *     $userid -- The User Id:: Type Integer
-  *This function will return the profiles associated to the specified users in an Array in the following format:
+  *This function will return the vtiger_profiles associated to the specified vtiger_users in an Array in the following format:
   *     $userProfileArray=(profileid1,profileid2,profileid3,...,profileidn);
   */
 function getUserProfile($userId)
@@ -3782,7 +3782,7 @@
 	global $adb;
 	$roleId=fetchUserRole($userId);
 	$profArr=Array();	
-	$sql1 = "select profileid from role2profile where roleid='" .$roleId."'";
+	$sql1 = "select profileid from vtiger_role2profile where roleid='" .$roleId."'";
         $result1 = $adb->query($sql1);
 	$num_rows=$adb->num_rows($result1);
 	for($i=0;$i<$num_rows;$i++)
@@ -3796,7 +3796,7 @@
 	
 }
 
-/** To retreive the global permission of the specifed user from the various profiles associated with the user  
+/** To retreive the global permission of the specifed user from the various vtiger_profiles associated with the user  
   * @param $userid -- The User Id:: Type Integer
   * @returns  user global permission  array in the following format:
   *     $gloabalPerrArray=(view all action id=>permission,
@@ -3842,7 +3842,7 @@
 
 }
 
-/** To retreive the tab permissions of the specifed user from the various profiles associated with the user  
+/** To retreive the vtiger_tab permissions of the specifed user from the various vtiger_profiles associated with the user  
   * @param $userid -- The User Id:: Type Integer
   * @returns  user global permission  array in the following format:
   *     $tabPerrArray=(tabid1=>permission,
@@ -3887,7 +3887,7 @@
 
 }
 
-/** To retreive the tab acion permissions of the specifed user from the various profiles associated with the user  
+/** To retreive the vtiger_tab acion permissions of the specifed user from the various vtiger_profiles associated with the user  
   * @param $userid -- The User Id:: Type Integer
   * @returns  user global permission  array in the following format:
   *     $actionPerrArray=(tabid1=>permission,
@@ -3935,9 +3935,9 @@
 
 }
 
-/** To retreive the parent role of the specified role 
+/** To retreive the parent vtiger_role of the specified vtiger_role 
   * @param $roleid -- The Role Id:: Type varchar
-  * @returns  parent role array in the following format:
+  * @returns  parent vtiger_role array in the following format:
   *     $parentRoleArray=(roleid1,roleid2,.......,roleidn);
  */
 function getParentRole($roleId)
@@ -3960,9 +3960,9 @@
 	
 }
 
-/** To retreive the subordinate roles of the specified parent role  
+/** To retreive the subordinate vtiger_roles of the specified parent vtiger_role  
   * @param $roleid -- The Role Id:: Type varchar
-  * @returns  subordinate role array in the following format:
+  * @returns  subordinate vtiger_role array in the following format:
   *     $subordinateRoleArray=(roleid1,roleid2,.......,roleidn);
  */
 function getRoleSubordinates($roleId)
@@ -3974,7 +3974,7 @@
 	$roleInfo=$roleDetails[$roleId];
 	$roleParentSeq=$roleInfo[1];
 	
-	$query="select * from role where parentrole like '".$roleParentSeq."::%' order by parentrole asc";
+	$query="select * from vtiger_role where parentrole like '".$roleParentSeq."::%' order by parentrole asc";
 	$result=$adb->query($query);
 	$num_rows=$adb->num_rows($result);
 	$roleSubordinates=Array();
@@ -3990,14 +3990,14 @@
 
 }
 
-/** To retreive the subordinate roles and users of the specified parent role  
+/** To retreive the subordinate vtiger_roles and vtiger_users of the specified parent vtiger_role  
   * @param $roleid -- The Role Id:: Type varchar
-  * @returns  subordinate role array in the following format:
+  * @returns  subordinate vtiger_role array in the following format:
   *     $subordinateRoleUserArray=(roleid1=>Array(userid1,userid2,userid3),
-                               roleid2=>Array(userid1,userid2,userid3)
+                               vtiger_roleid2=>Array(userid1,userid2,userid3)
 				                |
 						|
-			       roleidn=>Array(userid1,userid2,userid3));
+			       vtiger_roleidn=>Array(userid1,userid2,userid3));
  */
 function getSubordinateRoleAndUsers($roleId)
 {
@@ -4102,7 +4102,7 @@
 	global $current_user;
 	$user_array=Array();
 	$tabid=getTabid($module);
-	$query = "select shareduserid from tmp_read_user_sharing_per where userid=".$current_user->id." and tabid=".$tabid;
+	$query = "select shareduserid from vtiger_tmp_read_user_sharing_per where userid=".$current_user->id." and tabid=".$tabid;
 	$result=$adb->query($query);
 	$num_rows=$adb->num_rows($result);
 	for($i=0;$i<$num_rows;$i++)
@@ -4123,7 +4123,7 @@
 	global $current_user;
 	$grp_array=Array();
 	$tabid=getTabid($module);
-	$query = "select sharedgroupid from tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid;
+	$query = "select sharedgroupid from vtiger_tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid;
 	$result=$adb->query($query);
 	$num_rows=$adb->num_rows($result);
 	for($i=0;$i<$num_rows;$i++)
@@ -4144,7 +4144,7 @@
 	global $current_user;
 	$grp_array=Array();
 	$tabid=getTabid($module);
-	$query = "select sharedgroupid from tmp_write_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid;
+	$query = "select sharedgroupid from vtiger_tmp_write_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid;
 	$result=$adb->query($query);
 	$num_rows=$adb->num_rows($result);
 	for($i=0;$i<$num_rows;$i++)
@@ -4205,172 +4205,172 @@
 
 	if($module == 'Leads')
 	{
-		$sec_query .= "and (crmentity.smownerid in($current_user->id) or crmentity.smownerid in(select user2role.userid from user2role inner join users on users.id=user2role.userid inner join role on role.roleid=user2role.roleid where role.parentrole like '".$current_user_parent_role_seq."::%') or crmentity.smownerid in(select shareduserid from tmp_read_user_sharing_per where userid=".$current_user->id." and tabid=".$tabid.") or (crmentity.smownerid in (0) and (";
+		$sec_query .= "and (vtiger_crmentity.smownerid in($current_user->id) or vtiger_crmentity.smownerid in(select vtiger_user2role.userid from vtiger_user2role inner join vtiger_users on vtiger_users.id=vtiger_user2role.userid inner join vtiger_role on vtiger_role.roleid=vtiger_user2role.roleid where vtiger_role.parentrole like '".$current_user_parent_role_seq."::%') or vtiger_crmentity.smownerid in(select shareduserid from vtiger_tmp_read_user_sharing_per where userid=".$current_user->id." and tabid=".$tabid.") or (vtiger_crmentity.smownerid in (0) and (";
 
                         if(sizeof($current_user_groups) > 0)
                         {
                               $sec_query .= "groups.groupid in".getCurrentUserGroupList()." or ";
                         }
-                         $sec_query .= "groups.groupid in(select tmp_read_group_sharing_per.sharedgroupid from tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";	
+                         $sec_query .= "groups.groupid in(select vtiger_tmp_read_group_sharing_per.sharedgroupid from vtiger_tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";	
 	}
 	elseif($module == 'Accounts')
 	{
-		$sec_query .= "and (crmentity.smownerid in($current_user->id) or crmentity.smownerid in(select user2role.userid from user2role inner join users on users.id=user2role.userid inner join role on role.roleid=user2role.roleid where role.parentrole like '".$current_user_parent_role_seq."::%') or crmentity.smownerid in(select shareduserid from tmp_read_user_sharing_per where userid=".$current_user->id." and tabid=".$tabid.") or (crmentity.smownerid in (0) and (";
+		$sec_query .= "and (vtiger_crmentity.smownerid in($current_user->id) or vtiger_crmentity.smownerid in(select vtiger_user2role.userid from vtiger_user2role inner join vtiger_users on vtiger_users.id=vtiger_user2role.userid inner join vtiger_role on vtiger_role.roleid=vtiger_user2role.roleid where vtiger_role.parentrole like '".$current_user_parent_role_seq."::%') or vtiger_crmentity.smownerid in(select shareduserid from vtiger_tmp_read_user_sharing_per where userid=".$current_user->id." and tabid=".$tabid.") or (vtiger_crmentity.smownerid in (0) and (";
 
                 if(sizeof($current_user_groups) > 0)
                 {
                 	$sec_query .= "groups.groupid in".getCurrentUserGroupList()." or ";
                 }
-		$sec_query .= "groups.groupid in(select tmp_read_group_sharing_per.sharedgroupid from tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";			
+		$sec_query .= "groups.groupid in(select vtiger_tmp_read_group_sharing_per.sharedgroupid from vtiger_tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";			
 	
 	}
 	elseif($module == 'Contacts')
 	{
-		$sec_query .= "and (crmentity.smownerid in($current_user->id) or crmentity.smownerid in(select user2role.userid from user2role inner join users on users.id=user2role.userid inner join role on role.roleid=user2role.roleid where role.parentrole like '".$current_user_parent_role_seq."::%') or crmentity.smownerid in(select shareduserid from tmp_read_user_sharing_per where userid=".$current_user->id." and tabid=".$tabid.") or (crmentity.smownerid in (0) and (";
+		$sec_query .= "and (vtiger_crmentity.smownerid in($current_user->id) or vtiger_crmentity.smownerid in(select vtiger_user2role.userid from vtiger_user2role inner join vtiger_users on vtiger_users.id=vtiger_user2role.userid inner join vtiger_role on vtiger_role.roleid=vtiger_user2role.roleid where vtiger_role.parentrole like '".$current_user_parent_role_seq."::%') or vtiger_crmentity.smownerid in(select shareduserid from vtiger_tmp_read_user_sharing_per where userid=".$current_user->id." and tabid=".$tabid.") or (vtiger_crmentity.smownerid in (0) and (";
 
                 if(sizeof($current_user_groups) > 0)
                 {
                 	$sec_query .= "groups.groupid in".getCurrentUserGroupList()." or ";
                 }
-		$sec_query .= "groups.groupid in(select tmp_read_group_sharing_per.sharedgroupid from tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";			
+		$sec_query .= "groups.groupid in(select vtiger_tmp_read_group_sharing_per.sharedgroupid from vtiger_tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";			
 	
 	}
 	elseif($module == 'Potentials')
 	{
-		$sec_query .= "and (crmentity.smownerid in($current_user->id) or crmentity.smownerid in(select user2role.userid from user2role inner join users on users.id=user2role.userid inner join role on role.roleid=user2role.roleid where role.parentrole like '".$current_user_parent_role_seq."::%') or crmentity.smownerid in(select shareduserid from tmp_read_user_sharing_per where userid=".$current_user->id." and tabid=".$tabid.") or potential.accountid in (select crmid from crmentity where setype='accounts' and crmentity.smownerid in(select shareduserid from tmp_read_user_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Accounts')." and relatedtabid=".$tabid.")) or potential.accountid in (select crmid from crmentity left join accountgrouprelation on accountgrouprelation.accountid=crmentity.crmid inner join groups on groups.groupname=accountgrouprelation.groupname where setype='Accounts' and crmentity.smownerid=0 and groups.groupid in(select tmp_read_group_rel_sharing_per.sharedgroupid from tmp_read_group_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Accounts')." and relatedtabid=".$tabid.")) or (crmentity.smownerid in (0) and (";
+		$sec_query .= "and (vtiger_crmentity.smownerid in($current_user->id) or vtiger_crmentity.smownerid in(select vtiger_user2role.userid from vtiger_user2role inner join vtiger_users on vtiger_users.id=vtiger_user2role.userid inner join vtiger_role on vtiger_role.roleid=vtiger_user2role.roleid where vtiger_role.parentrole like '".$current_user_parent_role_seq."::%') or vtiger_crmentity.smownerid in(select shareduserid from vtiger_tmp_read_user_sharing_per where userid=".$current_user->id." and tabid=".$tabid.") or vtiger_potential.accountid in (select crmid from vtiger_crmentity where setype='accounts' and vtiger_crmentity.smownerid in(select shareduserid from vtiger_tmp_read_user_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Accounts')." and relatedtabid=".$tabid.")) or vtiger_potential.accountid in (select crmid from vtiger_crmentity left join vtiger_accountgrouprelation on vtiger_accountgrouprelation.accountid=vtiger_crmentity.crmid inner join vtiger_groups on vtiger_groups.groupname=vtiger_accountgrouprelation.groupname where setype='Accounts' and vtiger_crmentity.smownerid=0 and vtiger_groups.groupid in(select vtiger_tmp_read_group_rel_sharing_per.sharedgroupid from vtiger_tmp_read_group_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Accounts')." and relatedtabid=".$tabid.")) or (vtiger_crmentity.smownerid in (0) and (";
 
                 if(sizeof($current_user_groups) > 0)
                 {
                 	$sec_query .= "groups.groupid in".getCurrentUserGroupList()." or ";
                 }
-		$sec_query .= "groups.groupid in(select tmp_read_group_sharing_per.sharedgroupid from tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";			
+		$sec_query .= "groups.groupid in(select vtiger_tmp_read_group_sharing_per.sharedgroupid from vtiger_tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";			
 	
 	}
 	elseif($module == 'HelpDesk')
 	{
-		$sec_query .= "and (crmentity.smownerid in($current_user->id) or crmentity.smownerid in(select user2role.userid from user2role inner join users on users.id=user2role.userid inner join role on role.roleid=user2role.roleid where role.parentrole like '".$current_user_parent_role_seq."::%') or crmentity.smownerid in(select shareduserid from tmp_read_user_sharing_per where userid=".$current_user->id." and tabid=".$tabid.") or troubletickets.parent_id in (select crmid from crmentity where setype='Accounts' and crmentity.smownerid in(select shareduserid from tmp_read_user_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Accounts')." and relatedtabid=".$tabid.")) or troubletickets.parent_id in (select crmid from crmentity left join accountgrouprelation on accountgrouprelation.accountid=crmentity.crmid inner join groups on groups.groupname=accountgrouprelation.groupname where setype='Accounts' and crmentity.smownerid=0 and groups.groupid in(select tmp_read_group_rel_sharing_per.sharedgroupid from tmp_read_group_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Accounts')." and relatedtabid=".$tabid.")) or (crmentity.smownerid in (0) and (";
+		$sec_query .= "and (vtiger_crmentity.smownerid in($current_user->id) or vtiger_crmentity.smownerid in(select vtiger_user2role.userid from vtiger_user2role inner join vtiger_users on vtiger_users.id=vtiger_user2role.userid inner join vtiger_role on vtiger_role.roleid=vtiger_user2role.roleid where vtiger_role.parentrole like '".$current_user_parent_role_seq."::%') or vtiger_crmentity.smownerid in(select shareduserid from vtiger_tmp_read_user_sharing_per where userid=".$current_user->id." and tabid=".$tabid.") or vtiger_troubletickets.parent_id in (select crmid from vtiger_crmentity where setype='Accounts' and vtiger_crmentity.smownerid in(select shareduserid from vtiger_tmp_read_user_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Accounts')." and relatedtabid=".$tabid.")) or vtiger_troubletickets.parent_id in (select crmid from vtiger_crmentity left join vtiger_accountgrouprelation on vtiger_accountgrouprelation.accountid=vtiger_crmentity.crmid inner join vtiger_groups on vtiger_groups.groupname=vtiger_accountgrouprelation.groupname where setype='Accounts' and vtiger_crmentity.smownerid=0 and vtiger_groups.groupid in(select vtiger_tmp_read_group_rel_sharing_per.sharedgroupid from vtiger_tmp_read_group_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Accounts')." and relatedtabid=".$tabid.")) or (vtiger_crmentity.smownerid in (0) and (";
 
                 if(sizeof($current_user_groups) > 0)
                 {
                 	$sec_query .= "groups.groupid in".getCurrentUserGroupList()." or ";
                 }
-		$sec_query .= "groups.groupid in(select tmp_read_group_sharing_per.sharedgroupid from tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";			
+		$sec_query .= "groups.groupid in(select vtiger_tmp_read_group_sharing_per.sharedgroupid from vtiger_tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";			
 	
 	}
 	elseif($module == 'Emails')
 	{
 		echo '<BR>now<BR>'; 
-		$sec_query .= "and (crmentity.smownerid in($current_user->id) or crmentity.smownerid in(select user2role.userid from user2role inner join users on users.id=user2role.userid inner join role on role.roleid=user2role.roleid where role.parentrole like '".$current_user_parent_role_seq."::%') or crmentity.smownerid in(select shareduserid from tmp_read_user_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")";
-
-		//Adding crterial for account related emails sharing
-		 $sec_query .= "or seactivityrel.crmid in (select crmid from crmentity where setype='Accounts' and crmentity.smownerid in(select shareduserid from tmp_read_user_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Accounts')." and relatedtabid=".$tabid.")) or seactivityrel.crmid in (select crmid from crmentity left join accountgrouprelation on accountgrouprelation.accountid=crmentity.crmid inner join groups on groups.groupname=accountgrouprelation.groupname where setype='Accounts' and crmentity.smownerid=0 and groups.groupid in(select tmp_read_group_rel_sharing_per.sharedgroupid from tmp_read_group_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Accounts')." and relatedtabid=".$tabid."))";
+		$sec_query .= "and (vtiger_crmentity.smownerid in($current_user->id) or vtiger_crmentity.smownerid in(select vtiger_user2role.userid from vtiger_user2role inner join vtiger_users on vtiger_users.id=vtiger_user2role.userid inner join vtiger_role on vtiger_role.roleid=vtiger_user2role.roleid where vtiger_role.parentrole like '".$current_user_parent_role_seq."::%') or vtiger_crmentity.smownerid in(select shareduserid from vtiger_tmp_read_user_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")";
+
+		//Adding crterial for vtiger_account related emails sharing
+		 $sec_query .= "or vtiger_seactivityrel.crmid in (select crmid from vtiger_crmentity where setype='Accounts' and vtiger_crmentity.smownerid in(select shareduserid from vtiger_tmp_read_user_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Accounts')." and relatedtabid=".$tabid.")) or vtiger_seactivityrel.crmid in (select crmid from vtiger_crmentity left join vtiger_accountgrouprelation on vtiger_accountgrouprelation.accountid=vtiger_crmentity.crmid inner join vtiger_groups on vtiger_groups.groupname=vtiger_accountgrouprelation.groupname where setype='Accounts' and vtiger_crmentity.smownerid=0 and vtiger_groups.groupid in(select vtiger_tmp_read_group_rel_sharing_per.sharedgroupid from vtiger_tmp_read_group_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Accounts')." and relatedtabid=".$tabid."))";
 		//Adding crterial for lead related emails sharing
-		 $sec_query .= " or seactivityrel.crmid in (select crmid from crmentity where setype='Leads' and crmentity.smownerid in(select shareduserid from tmp_read_user_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Leads')." and relatedtabid=".$tabid.")) or seactivityrel.crmid in (select crmid from crmentity left join leadgrouprelation on leadgrouprelation.leadid=crmentity.crmid inner join groups on groups.groupname=leadgrouprelation.groupname where setype='Leads' and crmentity.smownerid=0 and groups.groupid in(select tmp_read_group_rel_sharing_per.sharedgroupid from tmp_read_group_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Leads')." and relatedtabid=".$tabid."))";
+		 $sec_query .= " or vtiger_seactivityrel.crmid in (select crmid from vtiger_crmentity where setype='Leads' and vtiger_crmentity.smownerid in(select shareduserid from vtiger_tmp_read_user_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Leads')." and relatedtabid=".$tabid.")) or vtiger_seactivityrel.crmid in (select crmid from vtiger_crmentity left join vtiger_leadgrouprelation on vtiger_leadgrouprelation.leadid=vtiger_crmentity.crmid inner join vtiger_groups on vtiger_groups.groupname=vtiger_leadgrouprelation.groupname where setype='Leads' and vtiger_crmentity.smownerid=0 and vtiger_groups.groupid in(select vtiger_tmp_read_group_rel_sharing_per.sharedgroupid from vtiger_tmp_read_group_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Leads')." and relatedtabid=".$tabid."))";
 	
 
 		//Adding crteria for group sharing
-		 $sec_query .= " or (crmentity.smownerid in (0) and (";
+		 $sec_query .= " or (vtiger_crmentity.smownerid in (0) and (";
 
                 if(sizeof($current_user_groups) > 0)
                 {
                 	$sec_query .= "groups.groupid in".getCurrentUserGroupList()." or ";
                 }
-		$sec_query .= "groups.groupid in(select tmp_read_group_sharing_per.sharedgroupid from tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";
+		$sec_query .= "groups.groupid in(select vtiger_tmp_read_group_sharing_per.sharedgroupid from vtiger_tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";
 	
 	}
 	elseif($module == 'Activities')
 	{
-		$sec_query .= "and (crmentity.smownerid in($current_user->id) or crmentity.smownerid in(select user2role.userid from user2role inner join users on users.id=user2role.userid inner join role on role.roleid=user2role.roleid where role.parentrole like '".$current_user_parent_role_seq."::%')";
+		$sec_query .= "and (vtiger_crmentity.smownerid in($current_user->id) or vtiger_crmentity.smownerid in(select vtiger_user2role.userid from vtiger_user2role inner join vtiger_users on vtiger_users.id=vtiger_user2role.userid inner join vtiger_role on vtiger_role.roleid=vtiger_user2role.roleid where vtiger_role.parentrole like '".$current_user_parent_role_seq."::%')";
 
 		if(sizeof($current_user_groups) > 0)
 		{
-			$sec_query .= " or (crmentity.smownerid in (0) and (groups.groupid in".getCurrentUserGroupList()."))";
+			$sec_query .= " or (vtiger_crmentity.smownerid in (0) and (vtiger_groups.groupid in".getCurrentUserGroupList()."))";
 		}
 		$sec_query .= ")";	
 	}
 	elseif($module == 'Quotes')
 	{
-		$sec_query .= "and (crmentity.smownerid in($current_user->id) or crmentity.smownerid in(select user2role.userid from user2role inner join users on users.id=user2role.userid inner join role on role.roleid=user2role.roleid where role.parentrole like '".$current_user_parent_role_seq."::%') or crmentity.smownerid in(select shareduserid from tmp_read_user_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")";
-
-		//Adding crterial for account related quotes sharing
-		 $sec_query .= "or quotes.accountid in (select crmid from crmentity where setype='Accounts' and crmentity.smownerid in(select shareduserid from tmp_read_user_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Accounts')." and relatedtabid=".$tabid.")) or quotes.accountid in (select crmid from crmentity left join accountgrouprelation on accountgrouprelation.accountid=crmentity.crmid inner join groups on groups.groupname=accountgrouprelation.groupname where setype='Accounts' and crmentity.smownerid=0 and groups.groupid in(select tmp_read_group_rel_sharing_per.sharedgroupid from tmp_read_group_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Accounts')." and relatedtabid=".$tabid."))";
-		//Adding crterial for potential related quotes sharing
-		 $sec_query .= " or quotes.potentialid in (select crmid from crmentity where setype='Potentials' and crmentity.smownerid in(select shareduserid from tmp_read_user_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Potentials')." and relatedtabid=".$tabid.")) or quotes.potentialid in (select crmid from crmentity left join potentialgrouprelation on potentialgrouprelation.potentialid=crmentity.crmid inner join groups on groups.groupname=potentialgrouprelation.groupname where setype='Potentials' and crmentity.smownerid=0 and groups.groupid in(select tmp_read_group_rel_sharing_per.sharedgroupid from tmp_read_group_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Potentials')." and relatedtabid=".$tabid."))";
+		$sec_query .= "and (vtiger_crmentity.smownerid in($current_user->id) or vtiger_crmentity.smownerid in(select vtiger_user2role.userid from vtiger_user2role inner join vtiger_users on vtiger_users.id=vtiger_user2role.userid inner join vtiger_role on vtiger_role.roleid=vtiger_user2role.roleid where vtiger_role.parentrole like '".$current_user_parent_role_seq."::%') or vtiger_crmentity.smownerid in(select shareduserid from vtiger_tmp_read_user_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")";
+
+		//Adding crterial for vtiger_account related vtiger_quotes sharing
+		 $sec_query .= "or vtiger_quotes.accountid in (select crmid from vtiger_crmentity where setype='Accounts' and vtiger_crmentity.smownerid in(select shareduserid from vtiger_tmp_read_user_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Accounts')." and relatedtabid=".$tabid.")) or vtiger_quotes.accountid in (select crmid from vtiger_crmentity left join vtiger_accountgrouprelation on vtiger_accountgrouprelation.accountid=vtiger_crmentity.crmid inner join vtiger_groups on vtiger_groups.groupname=vtiger_accountgrouprelation.groupname where setype='Accounts' and vtiger_crmentity.smownerid=0 and vtiger_groups.groupid in(select vtiger_tmp_read_group_rel_sharing_per.sharedgroupid from vtiger_tmp_read_group_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Accounts')." and relatedtabid=".$tabid."))";
+		//Adding crterial for vtiger_potential related vtiger_quotes sharing
+		 $sec_query .= " or vtiger_quotes.potentialid in (select crmid from vtiger_crmentity where setype='Potentials' and vtiger_crmentity.smownerid in(select shareduserid from vtiger_tmp_read_user_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Potentials')." and relatedtabid=".$tabid.")) or vtiger_quotes.potentialid in (select crmid from vtiger_crmentity left join vtiger_potentialgrouprelation on vtiger_potentialgrouprelation.potentialid=vtiger_crmentity.crmid inner join vtiger_groups on vtiger_groups.groupname=vtiger_potentialgrouprelation.groupname where setype='Potentials' and vtiger_crmentity.smownerid=0 and vtiger_groups.groupid in(select vtiger_tmp_read_group_rel_sharing_per.sharedgroupid from vtiger_tmp_read_group_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Potentials')." and relatedtabid=".$tabid."))";
 	
 
 		//Adding crteria for group sharing
-		 $sec_query .= " or (crmentity.smownerid in (0) and (";
+		 $sec_query .= " or (vtiger_crmentity.smownerid in (0) and (";
 
                 if(sizeof($current_user_groups) > 0)
                 {
                 	$sec_query .= "groups.groupid in".getCurrentUserGroupList()." or ";
                 }
-		$sec_query .= "groups.groupid in(select tmp_read_group_sharing_per.sharedgroupid from tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";			
+		$sec_query .= "groups.groupid in(select vtiger_tmp_read_group_sharing_per.sharedgroupid from vtiger_tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";			
 	
 	}	
 	elseif($module == 'PurchaseOrder')
 	{
-		$sec_query .= "and (crmentity.smownerid in($current_user->id) or crmentity.smownerid in(select user2role.userid from user2role inner join users on users.id=user2role.userid inner join role on role.roleid=user2role.roleid where role.parentrole like '".$current_user_parent_role_seq."::%') or crmentity.smownerid in(select shareduserid from tmp_read_user_sharing_per where userid=".$current_user->id." and tabid=".$tabid.") or (crmentity.smownerid in (0) and (";
+		$sec_query .= "and (vtiger_crmentity.smownerid in($current_user->id) or vtiger_crmentity.smownerid in(select vtiger_user2role.userid from vtiger_user2role inner join vtiger_users on vtiger_users.id=vtiger_user2role.userid inner join vtiger_role on vtiger_role.roleid=vtiger_user2role.roleid where vtiger_role.parentrole like '".$current_user_parent_role_seq."::%') or vtiger_crmentity.smownerid in(select shareduserid from vtiger_tmp_read_user_sharing_per where userid=".$current_user->id." and tabid=".$tabid.") or (vtiger_crmentity.smownerid in (0) and (";
 
                 if(sizeof($current_user_groups) > 0)
                 {
                 	$sec_query .= "groups.groupid in".getCurrentUserGroupList()." or ";
                 }
-		$sec_query .= "groups.groupid in(select tmp_read_group_sharing_per.sharedgroupid from tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";			
+		$sec_query .= "groups.groupid in(select vtiger_tmp_read_group_sharing_per.sharedgroupid from vtiger_tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";			
 	
 	}
 	elseif($module == 'SalesOrder')
 	{
-		$sec_query .= "and (crmentity.smownerid in($current_user->id) or crmentity.smownerid in(select user2role.userid from user2role inner join users on users.id=user2role.userid inner join role on role.roleid=user2role.roleid where role.parentrole like '".$current_user_parent_role_seq."::%') or crmentity.smownerid in(select shareduserid from tmp_read_user_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")";
-
-		//Adding crterial for account related so sharing
-		 $sec_query .= "or salesorder.accountid in (select crmid from crmentity where setype='Accounts' and crmentity.smownerid in(select shareduserid from tmp_read_user_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Accounts')." and relatedtabid=".$tabid.")) or salesorder.accountid in (select crmid from crmentity left join accountgrouprelation on accountgrouprelation.accountid=crmentity.crmid inner join groups on groups.groupname=accountgrouprelation.groupname where setype='Accounts' and crmentity.smownerid=0 and groups.groupid in(select tmp_read_group_rel_sharing_per.sharedgroupid from tmp_read_group_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Accounts')." and relatedtabid=".$tabid."))";
-		//Adding crterial for potential related so sharing
-		 $sec_query .= " or salesorder.potentialid in (select crmid from crmentity where setype='Potentials' and crmentity.smownerid in(select shareduserid from tmp_read_user_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Potentials')." and relatedtabid=".$tabid.")) or salesorder.potentialid in (select crmid from crmentity left join potentialgrouprelation on potentialgrouprelation.potentialid=crmentity.crmid inner join groups on groups.groupname=potentialgrouprelation.groupname where setype='Potentials' and crmentity.smownerid=0 and groups.groupid in(select tmp_read_group_rel_sharing_per.sharedgroupid from tmp_read_group_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Potentials')." and relatedtabid=".$tabid."))";
-		//Adding crterial for quotes related so sharing
-		 $sec_query .= " or salesorder.quoteid in (select crmid from crmentity where setype='Quotes' and crmentity.smownerid in(select shareduserid from tmp_read_user_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Quotes')." and relatedtabid=".$tabid.")) or salesorder.quoteid in (select crmid from crmentity left join quotegrouprelation on quotegrouprelation.quoteid=crmentity.crmid inner join groups on groups.groupname=quotegrouprelation.groupname where setype='Quotes' and crmentity.smownerid=0 and groups.groupid in(select tmp_read_group_rel_sharing_per.sharedgroupid from tmp_read_group_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Quotes')." and relatedtabid=".$tabid."))";
+		$sec_query .= "and (vtiger_crmentity.smownerid in($current_user->id) or vtiger_crmentity.smownerid in(select vtiger_user2role.userid from vtiger_user2role inner join vtiger_users on vtiger_users.id=vtiger_user2role.userid inner join vtiger_role on vtiger_role.roleid=vtiger_user2role.roleid where vtiger_role.parentrole like '".$current_user_parent_role_seq."::%') or vtiger_crmentity.smownerid in(select shareduserid from vtiger_tmp_read_user_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")";
+
+		//Adding crterial for vtiger_account related so sharing
+		 $sec_query .= "or vtiger_salesorder.accountid in (select crmid from vtiger_crmentity where setype='Accounts' and vtiger_crmentity.smownerid in(select shareduserid from vtiger_tmp_read_user_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Accounts')." and relatedtabid=".$tabid.")) or vtiger_salesorder.accountid in (select crmid from vtiger_crmentity left join vtiger_accountgrouprelation on vtiger_accountgrouprelation.accountid=vtiger_crmentity.crmid inner join vtiger_groups on vtiger_groups.groupname=vtiger_accountgrouprelation.groupname where setype='Accounts' and vtiger_crmentity.smownerid=0 and vtiger_groups.groupid in(select vtiger_tmp_read_group_rel_sharing_per.sharedgroupid from vtiger_tmp_read_group_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Accounts')." and relatedtabid=".$tabid."))";
+		//Adding crterial for vtiger_potential related so sharing
+		 $sec_query .= " or vtiger_salesorder.potentialid in (select crmid from vtiger_crmentity where setype='Potentials' and vtiger_crmentity.smownerid in(select shareduserid from vtiger_tmp_read_user_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Potentials')." and relatedtabid=".$tabid.")) or vtiger_salesorder.potentialid in (select crmid from vtiger_crmentity left join vtiger_potentialgrouprelation on vtiger_potentialgrouprelation.potentialid=vtiger_crmentity.crmid inner join vtiger_groups on vtiger_groups.groupname=vtiger_potentialgrouprelation.groupname where setype='Potentials' and vtiger_crmentity.smownerid=0 and vtiger_groups.groupid in(select vtiger_tmp_read_group_rel_sharing_per.sharedgroupid from vtiger_tmp_read_group_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Potentials')." and relatedtabid=".$tabid."))";
+		//Adding crterial for vtiger_quotes related so sharing
+		 $sec_query .= " or vtiger_salesorder.quoteid in (select crmid from vtiger_crmentity where setype='Quotes' and vtiger_crmentity.smownerid in(select shareduserid from vtiger_tmp_read_user_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Quotes')." and relatedtabid=".$tabid.")) or vtiger_salesorder.quoteid in (select crmid from vtiger_crmentity left join vtiger_quotegrouprelation on vtiger_quotegrouprelation.quoteid=vtiger_crmentity.crmid inner join vtiger_groups on vtiger_groups.groupname=vtiger_quotegrouprelation.groupname where setype='Quotes' and vtiger_crmentity.smownerid=0 and vtiger_groups.groupid in(select vtiger_tmp_read_group_rel_sharing_per.sharedgroupid from vtiger_tmp_read_group_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Quotes')." and relatedtabid=".$tabid."))";
 	
 
 		//Adding crteria for group sharing
-		 $sec_query .= " or (crmentity.smownerid in (0) and (";
+		 $sec_query .= " or (vtiger_crmentity.smownerid in (0) and (";
 
                 if(sizeof($current_user_groups) > 0)
                 {
                 	$sec_query .= "groups.groupid in".getCurrentUserGroupList()." or ";
                 }
-		$sec_query .= "groups.groupid in(select tmp_read_group_sharing_per.sharedgroupid from tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";			
+		$sec_query .= "groups.groupid in(select vtiger_tmp_read_group_sharing_per.sharedgroupid from vtiger_tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";			
 	
 	}
 	elseif($module == 'Invoice')
 	{
-		$sec_query .= "and (crmentity.smownerid in($current_user->id) or crmentity.smownerid in(select user2role.userid from user2role inner join users on users.id=user2role.userid inner join role on role.roleid=user2role.roleid where role.parentrole like '".$current_user_parent_role_seq."::%') or crmentity.smownerid in(select shareduserid from tmp_read_user_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")";
-
-		//Adding crterial for account related invoice sharing
-		 $sec_query .= "or invoice.accountid in (select crmid from crmentity where setype='Accounts' and crmentity.smownerid in(select shareduserid from tmp_read_user_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Accounts')." and relatedtabid=".$tabid.")) or invoice.accountid in (select crmid from crmentity left join accountgrouprelation on accountgrouprelation.accountid=crmentity.crmid inner join groups on groups.groupname=accountgrouprelation.groupname where setype='Accounts' and crmentity.smownerid=0 and groups.groupid in(select tmp_read_group_rel_sharing_per.sharedgroupid from tmp_read_group_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Accounts')." and relatedtabid=".$tabid."))";
-		//Adding crterial for salesorder related invoice sharing
-		 $sec_query .= " or invoice.salesorderid in (select crmid from crmentity where setype='SalesOrder' and crmentity.smownerid in(select shareduserid from tmp_read_user_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('SalesOrder')." and relatedtabid=".$tabid.")) or invoice.salesorderid in(select crmid from crmentity left join sogrouprelation on sogrouprelation.salesorderid=crmentity.crmid inner join groups on groups.groupname=sogrouprelation.groupname where setype='SalesOrder' and crmentity.smownerid=0 and groups.groupid in(select tmp_read_group_rel_sharing_per.sharedgroupid from tmp_read_group_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('SalesOrder')." and relatedtabid=".$tabid."))";
+		$sec_query .= "and (vtiger_crmentity.smownerid in($current_user->id) or vtiger_crmentity.smownerid in(select vtiger_user2role.userid from vtiger_user2role inner join vtiger_users on vtiger_users.id=vtiger_user2role.userid inner join vtiger_role on vtiger_role.roleid=vtiger_user2role.roleid where vtiger_role.parentrole like '".$current_user_parent_role_seq."::%') or vtiger_crmentity.smownerid in(select shareduserid from vtiger_tmp_read_user_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")";
+
+		//Adding crterial for vtiger_account related vtiger_invoice sharing
+		 $sec_query .= "or vtiger_invoice.accountid in (select crmid from vtiger_crmentity where setype='Accounts' and vtiger_crmentity.smownerid in(select shareduserid from vtiger_tmp_read_user_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Accounts')." and relatedtabid=".$tabid.")) or vtiger_invoice.accountid in (select crmid from vtiger_crmentity left join vtiger_accountgrouprelation on vtiger_accountgrouprelation.accountid=vtiger_crmentity.crmid inner join vtiger_groups on vtiger_groups.groupname=vtiger_accountgrouprelation.groupname where setype='Accounts' and vtiger_crmentity.smownerid=0 and vtiger_groups.groupid in(select vtiger_tmp_read_group_rel_sharing_per.sharedgroupid from vtiger_tmp_read_group_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Accounts')." and relatedtabid=".$tabid."))";
+		//Adding crterial for vtiger_salesorder related vtiger_invoice sharing
+		 $sec_query .= " or vtiger_invoice.salesorderid in (select crmid from vtiger_crmentity where setype='SalesOrder' and vtiger_crmentity.smownerid in(select shareduserid from vtiger_tmp_read_user_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('SalesOrder')." and relatedtabid=".$tabid.")) or vtiger_invoice.salesorderid in(select crmid from vtiger_crmentity left join vtiger_sogrouprelation on vtiger_sogrouprelation.salesorderid=vtiger_crmentity.crmid inner join vtiger_groups on vtiger_groups.groupname=vtiger_sogrouprelation.groupname where setype='SalesOrder' and vtiger_crmentity.smownerid=0 and vtiger_groups.groupid in(select vtiger_tmp_read_group_rel_sharing_per.sharedgroupid from vtiger_tmp_read_group_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('SalesOrder')." and relatedtabid=".$tabid."))";
 	
 
 		//Adding crteria for group sharing
-		 $sec_query .= " or (crmentity.smownerid in (0) and (";
+		 $sec_query .= " or (vtiger_crmentity.smownerid in (0) and (";
 
                 if(sizeof($current_user_groups) > 0)
                 {
                 	$sec_query .= "groups.groupid in".getCurrentUserGroupList()." or ";
                 }
-		$sec_query .= "groups.groupid in(select tmp_read_group_sharing_per.sharedgroupid from tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";			
+		$sec_query .= "groups.groupid in(select vtiger_tmp_read_group_sharing_per.sharedgroupid from vtiger_tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";			
 	
 	}
 	elseif($module == 'Campaigns')
 	{
 
-		$sec_query .= " and (crmentity.smownerid in($current_user->id) or crmentity.smownerid in(select user2role.userid from user2role inner join users on users.id=user2role.userid inner join role on role.roleid=user2role.roleid where role.parentrole like '".$current_user_parent_role_seq."::%') or crmentity.smownerid in(select shareduserid from tmp_read_user_sharing_per where userid=".$current_user->id." and tabid=".$tabid.") or (crmentity.smownerid in (0) and (";
+		$sec_query .= " and (vtiger_crmentity.smownerid in($current_user->id) or vtiger_crmentity.smownerid in(select vtiger_user2role.userid from vtiger_user2role inner join vtiger_users on vtiger_users.id=vtiger_user2role.userid inner join vtiger_role on vtiger_role.roleid=vtiger_user2role.roleid where vtiger_role.parentrole like '".$current_user_parent_role_seq."::%') or vtiger_crmentity.smownerid in(select shareduserid from vtiger_tmp_read_user_sharing_per where userid=".$current_user->id." and tabid=".$tabid.") or (vtiger_crmentity.smownerid in (0) and (";
 
 		if(sizeof($current_user_groups) > 0)
 		{
 			$sec_query .= "groups.groupid in".getCurrentUserGroupList()." or ";
 		}
-		$sec_query .= "groups.groupid in(select tmp_read_group_sharing_per.sharedgroupid from tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";
+		$sec_query .= "groups.groupid in(select vtiger_tmp_read_group_sharing_per.sharedgroupid from vtiger_tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";
 
 			
 	}	
@@ -4378,20 +4378,20 @@
 	{
 
 		//Current User	
-		$sec_query = " and (crmentity.smownerid=".$current_user->id;
+		$sec_query = " and (vtiger_crmentity.smownerid=".$current_user->id;
 
 		//Subordinate User
 		$subUsersList=getSubordinateUsersList();
 		if($subUsersList != '')
 		{
-			$sec_query .= " or crmentity.smownerid in".$subUsersList;
+			$sec_query .= " or vtiger_crmentity.smownerid in".$subUsersList;
 		}
 
 		//Shared User
 		$sharedUsersList=getReadSharingUsersList($module);
 		if($sharedUsersList != '')
 		{
-			$sec_query .= " or crmentity.smownerid in".$sharedUsersList;
+			$sec_query .= " or vtiger_crmentity.smownerid in".$sharedUsersList;
 		}
 
 
@@ -4401,14 +4401,14 @@
 			$userGroupsList=getCurrentUserGroupList();
 			if($userGroupsList != '')
 			{
-				$sec_query .= " or (crmentity.smownerid in(0) and groups.groupid in".$userGroupsList.")";
+				$sec_query .= " or (vtiger_crmentity.smownerid in(0) and vtiger_groups.groupid in".$userGroupsList.")";
 			}
 
 			//Shared User Groups
 			$sharedGroupsList=getReadSharingGroupsList($module);
 			if($sharedGroupsList != '')
 			{
-				$sec_query .= " or (crmentity.smownerid in(0) and groups.groupid in".$sharedGroupsList.")";
+				$sec_query .= " or (vtiger_crmentity.smownerid in(0) and vtiger_groups.groupid in".$sharedGroupsList.")";
 			}	
 
 
@@ -4427,7 +4427,7 @@
 	global $adb,$noof_group_rows;
 	$current_user_group_list=getCurrentUserGroupList();
 	$sharing_write_group_list=getWriteSharingGroupsList($module);
-	$query ="select groupname from groups";
+	$query ="select groupname from vtiger_groups";
 	if($current_user_group_list != '' && $sharing_write_group_list != '')
 	{
 		$query .= " where (groupid in".$current_user_group_list." or groupid in".$sharing_write_group_list.")";
@@ -4456,13 +4456,13 @@
 	$log->debug("Entering getGrpId(".$groupname.") method ...");
 	global $adb;
 	
-	$result = $adb->query("select groupid from groups where groupname='".$groupname."'");
+	$result = $adb->query("select groupid from vtiger_groups where groupname='".$groupname."'");
 	$groupid = $adb->query_result($result,0,'groupid');
 	$log->debug("Exiting getGrpId method ...");
 	return $groupid;
 }
 
-/** Function to check permission to access a field for a given user
+/** Function to check permission to access a vtiger_field for a given user
   * @param $fld_module -- Module :: Type String
   * @param $userid -- User Id :: Type integer
   * @param $fieldname -- Field Name :: Type varchar
@@ -4487,13 +4487,13 @@
 	}
 	else
 	{
-		//get profile list using userid
+		//get vtiger_profile list using userid
 		$profilelist = getCurrentUserProfileList();
 
 		//get tabid
 		$tabid = getTabid($fld_module);
 
-		$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";
+		$query="select vtiger_profile2field.* from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.tabid=".$tabid." and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0  and vtiger_profile2field.profileid in".$profilelist." and vtiger_field.fieldname='".$fieldname."' group by vtiger_field.fieldid";
 		$result = $adb->query($query);
 
 		$log->debug("Exiting getFieldVisibilityPermission method ...");
@@ -4501,8 +4501,8 @@
 	}
 }
 
-/** Function to get the field access module array 
-  * @returns The field Access module Array :: Type Array
+/** Function to get the vtiger_field access module array 
+  * @returns The vtiger_field Access module Array :: Type Array
   *
  */
 function getFieldModuleAccessArray()
@@ -4576,8 +4576,8 @@
 
 
 
-/** Function to recalculate the Sharing Rules for all the users 
-  * This function will recalculate all the sharing rules for all the users in the Organization and will write them in flat files 
+/** Function to recalculate the Sharing Rules for all the vtiger_users 
+  * This function will recalculate all the sharing rules for all the vtiger_users in the Organization and will write them in flat vtiger_files 
   *
  */
 function RecalculateSharingRules()
@@ -4586,7 +4586,7 @@
 	$log->debug("Entering RecalculateSharingRules() method ...");
 	global $adb;
 	require_once('modules/Users/CreateUserPrivilegeFile.php');
-	$query="select id from users where deleted=0";
+	$query="select id from vtiger_users where deleted=0";
 	$result=$adb->query($query);
 	$num_rows=$adb->num_rows($result);
 	for($i=0;$i<$num_rows;$i++)
@@ -4599,9 +4599,9 @@
 				
 }
 
-//Code added by Minnie for campaigngroup relation -- start
-
-/** Function to add campaign group relation
+//Code added by Minnie for vtiger_campaigngroup relation -- start
+
+/** Function to add vtiger_campaign group relation
   * @param $campaignid -- Campaign Id:: Type integer
   * @param $groupname -- Group Name:: Type varchar
   *
@@ -4611,13 +4611,13 @@
 	global $log;
 	$log->debug("Entering insert2CampaignGroupRelation(".$campaignid.",".$groupname.") method ...");
 	global $adb;
-	$sql = "insert into campaigngrouprelation values (" .$campaignid .",'".$groupname."')";
+	$sql = "insert into vtiger_campaigngrouprelation values (" .$campaignid .",'".$groupname."')";
 	$adb->query($sql);
 	$log->debug("Exiting insert2CampaignGroupRelation method ...");
 
 }
 
-/** Function to update campaign group relation
+/** Function to update vtiger_campaign group relation
   * @param $campaignid -- Campaign Id:: Type integer
   * @param $groupname -- Group Name:: Type varchar
   *
@@ -4627,10 +4627,10 @@
 	global $log;
 	$log->debug("Entering updateCampaignGroupRelation(".$campaignid.",".$groupname.") method ...");
 	global $adb;
-	$sqldelete = "delete from campaigngrouprelation where campaignid=".$campaignid;
+	$sqldelete = "delete from vtiger_campaigngrouprelation where campaignid=".$campaignid;
 	$adb->query($sqldelete);
 	if($groupname) {
-		$sql = "insert into campaigngrouprelation values (".$campaignid .",'" .$groupname ."')";
+		$sql = "insert into vtiger_campaigngrouprelation values (".$campaignid .",'" .$groupname ."')";
 		$adb->query($sql);
 	}
 	$log->debug("Exiting updateCampaignGroupRelation method ...");

Modified: vtigercrm/trunk/include/utils/export.php
==============================================================================
--- vtigercrm/trunk/include/utils/export.php (original)
+++ vtigercrm/trunk/include/utils/export.php Mon Jun 12 14:26:25 2006
@@ -100,7 +100,7 @@
 	else if ($type == "Accounts")
 	{
 		$focus = new Account;
-		$exp_query="SELECT columnname, fieldlabel FROM field where tabid=6";
+		$exp_query="SELECT columnname, fieldlabel FROM vtiger_field where tabid=6";
 		$account_result=$adb->query($exp_query);
 		if($adb->num_rows($account_result)!=0)
 		{

Modified: vtigercrm/trunk/include/utils/utils.php
==============================================================================
--- vtigercrm/trunk/include/utils/utils.php (original)
+++ vtigercrm/trunk/include/utils/utils.php Mon Jun 12 14:26:25 2006
@@ -133,21 +133,21 @@
 		require_once('include/database/PearDatabase.php');
 		$db = new PearDatabase();
 		$temp_result = Array();
-		// Including deleted users for now.
+		// Including deleted vtiger_users for now.
 		if (empty($status)) {
-				$query = "SELECT id, user_name from users";
+				$query = "SELECT id, user_name from vtiger_users";
 		}
 		else {
 				if($private == 'private')
 				{
 					$log->debug("Sharing is Private. Only the current user should be listed");
-					$query = "select id as id,user_name as user_name from users where id=".$current_user->id." and status='Active' union select user2role.userid as id,users.user_name as user_name from user2role inner join users on users.id=user2role.userid inner join role on role.roleid=user2role.roleid where role.parentrole like '".$current_user_parent_role_seq."::%' and status='Active' union select shareduserid as id,users.user_name as user_name from tmp_read_user_sharing_per inner join users on users.id=tmp_read_user_sharing_per.shareduserid where status='Active' and tmp_read_user_sharing_per.userid=".$current_user->id." and tmp_read_user_sharing_per.tabid=".getTabid($module);	
+					$query = "select id as id,user_name as user_name from vtiger_users where id=".$current_user->id." and status='Active' union select vtiger_user2role.userid as id,vtiger_users.user_name as user_name from vtiger_user2role inner join vtiger_users on vtiger_users.id=vtiger_user2role.userid inner join vtiger_role on vtiger_role.roleid=vtiger_user2role.roleid where vtiger_role.parentrole like '".$current_user_parent_role_seq."::%' and status='Active' union select shareduserid as id,vtiger_users.user_name as user_name from vtiger_tmp_read_user_sharing_per inner join vtiger_users on vtiger_users.id=vtiger_tmp_read_user_sharing_per.shareduserid where status='Active' and vtiger_tmp_read_user_sharing_per.userid=".$current_user->id." and vtiger_tmp_read_user_sharing_per.tabid=".getTabid($module);	
 						
 				}
 				else
 				{
-					$log->debug("Sharing is Public. All users should be listed");
-					$query = "SELECT id, user_name from users WHERE status='$status'";
+					$log->debug("Sharing is Public. All vtiger_users should be listed");
+					$query = "SELECT id, user_name from vtiger_users WHERE status='$status'";
 				}
 		}
 		if (!empty($assigned_user)) {
@@ -675,8 +675,8 @@
 }
 
 /**
- * Create javascript to set the cursor focus to specific field in a form
- * when the screen is rendered.  The field name is currently hardcoded into the
+ * Create javascript to set the cursor focus to specific vtiger_field in a form
+ * when the screen is rendered.  The vtiger_field name is currently hardcoded into the
  * the function.
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
  * All Rights Reserved.
@@ -685,7 +685,7 @@
 function get_set_focus_js () {
 global $log;
 $log->debug("Entering set_focus() method ...");
-//TODO Clint 5/20 - Make this function more generic so that it can take in the target form and field names as variables
+//TODO Clint 5/20 - Make this function more generic so that it can take in the target form and vtiger_field names as variables
 $the_script = <<<EOQ
 <script type="text/javascript" language="JavaScript">
 <!-- Begin
@@ -693,12 +693,12 @@
 	if (document.forms.length > 0) {
 		for (i = 0; i < document.forms.length; i++) {
 			for (j = 0; j < document.forms[i].elements.length; j++) {
-				var field = document.forms[i].elements[j];
-				if ((field.type == "text" || field.type == "textarea" || field.type == "password") &&
-						!field.disabled && (field.name == "first_name" || field.name == "name")) {
-					field.focus();
-                    if (field.type == "text") {
-                        field.select();
+				var vtiger_field = document.forms[i].elements[j];
+				if ((vtiger_field.type == "text" || vtiger_field.type == "textarea" || vtiger_field.type == "password") &&
+						!field.disabled && (vtiger_field.name == "first_name" || vtiger_field.name == "name")) {
+				vtiger_field.focus();
+                    if (vtiger_field.type == "text") {
+                        vtiger_field.select();
                     }
 					break;
 	    		}
@@ -800,16 +800,16 @@
   if($module == 'Leads')
   {
 
-   $sql="select (case when (user_name is null) then  (leadgrouprelation.groupname) else (user_name) end) as name from leads left join users on users.id= assigned_user_id left join leadgrouprelation on leadgrouprelation.leadid=leads.id where leads.deleted=0 and leads.id='". $id ."'";
+   $sql="select (case when (user_name is null) then  (vtiger_leadgrouprelation.groupname) else (user_name) end) as name from leads left join vtiger_users on vtiger_users.id= assigned_user_id left join vtiger_leadgrouprelation on vtiger_leadgrouprelation.leadid=leads.id where leads.deleted=0 and leads.id='". $id ."'";
    
   }
   else if($module == 'Tasks')
   {
-       $sql="select (case when (user_name is null) then  (taskgrouprelation.groupname) else (user_name) end) as name from tasks left join users on users.id= assigned_user_id left join taskgrouprelation on taskgrouprelation.taskid=tasks.id where tasks.deleted=0 and tasks.id='". $id ."'";
+       $sql="select (case when (user_name is null) then  (taskgrouprelation.groupname) else (user_name) end) as name from tasks left join vtiger_users on vtiger_users.id= assigned_user_id left join taskgrouprelation on taskgrouprelation.taskid=tasks.id where tasks.deleted=0 and tasks.id='". $id ."'";
   }
   else if($module == 'Calls')
   {
-       $sql="select (case when (user_name is null) then  (callgrouprelation.groupname) else (user_name) end) as name from calls left join users on users.id= assigned_user_id left join callgrouprelation on callgrouprelation.callid=calls.id where calls.deleted=0 and calls.id='". $id ."'";
+       $sql="select (case when (user_name is null) then  (callgrouprelation.groupname) else (user_name) end) as name from calls left join vtiger_users on vtiger_users.id= assigned_user_id left join callgrouprelation on callgrouprelation.callid=calls.id where calls.deleted=0 and calls.id='". $id ."'";
   }
 
 	$result = $adb->query($sql);
@@ -824,7 +824,7 @@
 	$log->debug("Entering getTabname(".$tabid.") method ...");
         $log->info("tab id is ".$tabid);
         global $adb;
-	$sql = "select tablabel from tab where tabid='".$tabid."'";
+	$sql = "select tablabel from vtiger_tab where tabid='".$tabid."'";
 	$result = $adb->query($sql);
 	$tabname=  $adb->query_result($result,0,"tablabel");
 	$log->debug("Exiting getTabname method ...");
@@ -846,7 +846,7 @@
 	global $log;
         $log->info("tab id is ".$tabid);
         global $adb;
-        $sql = "select name from tab where tabid='".$tabid."'";
+        $sql = "select name from vtiger_tab where tabid='".$tabid."'";
         $result = $adb->query($sql);
         $tabname=  $adb->query_result($result,0,"name");
 	}
@@ -863,7 +863,7 @@
 	global $adb;
 	$column_fld = Array();
         $tabid = getTabid($module);
-	$sql = "select * from field where tabid=".$tabid;
+	$sql = "select * from vtiger_field where tabid=".$tabid;
         $result = $adb->query($sql);
         $noofrows = $adb->num_rows($result);
 	for($i=0; $i<$noofrows; $i++)
@@ -884,7 +884,7 @@
         global $adb;
         if($userid != '')
         {
-                $sql = "select email1 from users where id=".$userid;
+                $sql = "select email1 from vtiger_users where id=".$userid;
                 $result = $adb->query($sql);
                 $email = $adb->query_result($result,0,"email1");
         }
@@ -899,7 +899,7 @@
 	$log->info("in getUserId_Ol ".$username);
 
 	global $adb;
-	$sql = "select id from users where user_name='".$username."'";
+	$sql = "select id from vtiger_users where user_name='".$username."'";
 	$result = $adb->query($sql);
 	$num_rows = $adb->num_rows($result);
 	if($num_rows > 0)
@@ -923,7 +923,7 @@
 	$log->info("get Actionid ".$action);
 
 	$actionid = '';
-	$query="select * from actionmapping where actionname='".$action."'";
+	$query="select * from vtiger_actionmapping where actionname='".$action."'";
         $result =$adb->query($query);
         $actionid=$adb->query_result($result,0,'actionid');
 	$log->info("action id selected is ".$actionid );
@@ -940,7 +940,7 @@
 	global $adb;
 
 	$actionname='';
-	$query="select * from actionmapping where actionid=".$actionid ." and securitycheck=0";
+	$query="select * from vtiger_actionmapping where actionid=".$actionid ." and securitycheck=0";
 	$result =$adb->query($query);
 	$actionname=$adb->query_result($result,0,"actionname");
 	$log->debug("Exiting getActionname method ...");
@@ -955,7 +955,7 @@
         $log->info("in getUserId ".$record);
 
 	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 * from vtiger_crmentity where crmid = ".$record),0,'smownerid');
 	$log->debug("Exiting getUserId method ...");
 	return $user_id;	
 }
@@ -967,7 +967,7 @@
 
 	global $adb;
 	$ownerArr=Array();
-	$query="select * from crmentity where crmid = ".$record;
+	$query="select * from vtiger_crmentity where crmid = ".$record;
 	$result=$adb->query($query);
 	$user_id=$adb->query_result($result,0,'smownerid');
 	if($user_id != 0)
@@ -980,48 +980,48 @@
 		$module=$adb->query_result($result,0,'setype');
 		if($module == 'Leads')
 		{
-			$query1="select groups.groupid from leadgrouprelation inner join groups on groups.groupname = leadgrouprelation.groupname where leadid=".$record;
+			$query1="select vtiger_groups.groupid from vtiger_leadgrouprelation inner join vtiger_groups on vtiger_groups.groupname = vtiger_leadgrouprelation.groupname where leadid=".$record;
 		}
 		elseif($module == 'Activities' || $module == 'Emails')
 		{
 
-			$query1="select groups.groupid from activitygrouprelation inner join groups on groups.groupname = activitygrouprelation.groupname where activityid=".$record;
+			$query1="select vtiger_groups.groupid from vtiger_activitygrouprelation inner join vtiger_groups on vtiger_groups.groupname = vtiger_activitygrouprelation.groupname where activityid=".$record;
 		}
 		elseif($module == 'HelpDesk')
 		{
-			$query1="select groups.groupid from ticketgrouprelation inner join groups on groups.groupname = ticketgrouprelation.groupname where ticketid=".$record;
+			$query1="select vtiger_groups.groupid from vtiger_ticketgrouprelation inner join vtiger_groups on vtiger_groups.groupname = vtiger_ticketgrouprelation.groupname where ticketid=".$record;
 		}
 		elseif($module == 'Accounts')
 		{
-			$query1="select groups.groupid from accountgrouprelation inner join groups on groups.groupname = accountgrouprelation.groupname where accountid=".$record;
+			$query1="select vtiger_groups.groupid from vtiger_accountgrouprelation inner join vtiger_groups on vtiger_groups.groupname = vtiger_accountgrouprelation.groupname where accountid=".$record;
 		}
 		elseif($module == 'Contacts')
 		{
-			$query1="select groups.groupid from contactgrouprelation inner join groups on groups.groupname = contactgrouprelation.groupname where contactid=".$record;
+			$query1="select vtiger_groups.groupid from vtiger_contactgrouprelation inner join vtiger_groups on vtiger_groups.groupname = vtiger_contactgrouprelation.groupname where contactid=".$record;
 		}
 		elseif($module == 'Potentials')
 		{
-			$query1="select groups.groupid from potentialgrouprelation inner join groups on groups.groupname = potentialgrouprelation.groupname where potentialid=".$record;
+			$query1="select vtiger_groups.groupid from vtiger_potentialgrouprelation inner join vtiger_groups on vtiger_groups.groupname = vtiger_potentialgrouprelation.groupname where potentialid=".$record;
 		}
 		elseif($module == 'Quotes')
 		{
-			$query1="select groups.groupid from quotegrouprelation inner join groups on groups.groupname = quotegrouprelation.groupname where quoteid=".$record;
+			$query1="select vtiger_groups.groupid from vtiger_quotegrouprelation inner join vtiger_groups on vtiger_groups.groupname = vtiger_quotegrouprelation.groupname where quoteid=".$record;
 		}
 		elseif($module == 'PurchaseOrder')
 		{
-			$query1="select groups.groupid from pogrouprelation inner join groups on groups.groupname = pogrouprelation.groupname where purchaseorderid=".$record;
+			$query1="select vtiger_groups.groupid from vtiger_pogrouprelation inner join vtiger_groups on vtiger_groups.groupname = vtiger_pogrouprelation.groupname where purchaseorderid=".$record;
 		}
 		elseif($module == 'SalesOrder')
 		{
-			$query1="select groups.groupid from sogrouprelation inner join groups on groups.groupname = sogrouprelation.groupname where salesorderid=".$record;
+			$query1="select vtiger_groups.groupid from vtiger_sogrouprelation inner join vtiger_groups on vtiger_groups.groupname = vtiger_sogrouprelation.groupname where salesorderid=".$record;
 		}
 		elseif($module == 'Invoice')
 		{
-			$query1="select groups.groupid from invoicegrouprelation inner join groups on groups.groupname = invoicegrouprelation.groupname where invoiceid=".$record;
+			$query1="select vtiger_groups.groupid from vtiger_invoicegrouprelation inner join vtiger_groups on vtiger_groups.groupname = vtiger_invoicegrouprelation.groupname where invoiceid=".$record;
 		}
 		elseif($module == 'Campaigns')
 		{
-			$query1="select groups.groupid from campaigngrouprelation inner join groups on groups.groupname = campaigngrouprelation.groupname where campaignid=".$record;
+			$query1="select vtiger_groups.groupid from vtiger_campaigngrouprelation inner join vtiger_groups on vtiger_groups.groupname = vtiger_campaigngrouprelation.groupname where campaignid=".$record;
 		}
 
 		$result1=$adb->query($query1);
@@ -1043,13 +1043,13 @@
 
 	global $adb;
 	$adb->database->SetFetchMode(ADODB_FETCH_ASSOC); 
-	$fld_result = $adb->query("select * from field where generatedtype=1 and displaytype in (1,2)");
+	$fld_result = $adb->query("select * from vtiger_field where generatedtype=1 and displaytype in (1,2)");
         $num_rows = $adb->num_rows($fld_result);
         for($i=0; $i<$num_rows; $i++)
         {
                  $tab_id = $adb->query_result($fld_result,$i,'tabid');
                  $field_id = $adb->query_result($fld_result,$i,'fieldid');
-                 $adb->query("insert into profile2field values (".$profileid.",".$tab_id.",".$field_id.",0,1)");
+                 $adb->query("insert into vtiger_profile2field values (".$profileid.",".$tab_id.",".$field_id.",0,1)");
 	}
 	$log->debug("Exiting insertProfile2field method ...");
 }
@@ -1060,13 +1060,13 @@
 	$log->debug("Entering insert_def_org_field() method ...");
 	global $adb;
 	$adb->database->SetFetchMode(ADODB_FETCH_ASSOC); 
-	$fld_result = $adb->query("select * from field where generatedtype=1 and displaytype in (1,2)");
+	$fld_result = $adb->query("select * from vtiger_field where generatedtype=1 and displaytype in (1,2)");
         $num_rows = $adb->num_rows($fld_result);
         for($i=0; $i<$num_rows; $i++)
         {
                  $tab_id = $adb->query_result($fld_result,$i,'tabid');
                  $field_id = $adb->query_result($fld_result,$i,'fieldid');
-                 $adb->query("insert into def_org_field values (".$tab_id.",".$field_id.",0,1)");
+                 $adb->query("insert into vtiger_def_org_field values (".$tab_id.",".$field_id.",0,1)");
 	}
 	$log->debug("Exiting insert_def_org_field() method ...");
 }
@@ -1075,12 +1075,12 @@
 {
 	global $log;
 	$log->debug("Entering getProfile2FieldList(".$fld_module.",". $profileid.") method ...");
-        $log->info("in getProfile2FieldList ".$fld_module. ' profile id is  '.$profileid);
+        $log->info("in getProfile2FieldList ".$fld_module. ' vtiger_profile id is  '.$profileid);
 
 	global $adb;
 	$tabid = getTabid($fld_module);
 	
-	$query = "select profile2field.visible,field.* from profile2field inner join field on field.fieldid=profile2field.fieldid where profile2field.profileid=".$profileid." and profile2field.tabid=".$tabid;
+	$query = "select vtiger_profile2field.visible,vtiger_field.* from vtiger_profile2field inner join vtiger_field on vtiger_field.fieldid=vtiger_profile2field.fieldid where vtiger_profile2field.profileid=".$profileid." and vtiger_profile2field.tabid=".$tabid;
 	$result = $adb->query($query);
 	$log->debug("Exiting getProfile2FieldList method ...");
 	return $result;
@@ -1092,12 +1092,12 @@
 {
 	global $log;
 	$log->debug("Entering getProfile2FieldPermissionList(".$fld_module.",". $profileid.") method ...");
-        $log->info("in getProfile2FieldList ".$fld_module. ' profile id is  '.$profileid);
+        $log->info("in getProfile2FieldList ".$fld_module. ' vtiger_profile id is  '.$profileid);
 
 	global $adb;
 	$tabid = getTabid($fld_module);
 	
-	$query = "select profile2field.visible,field.* from profile2field inner join field on field.fieldid=profile2field.fieldid where profile2field.profileid=".$profileid." and profile2field.tabid=".$tabid;
+	$query = "select vtiger_profile2field.visible,vtiger_field.* from vtiger_profile2field inner join vtiger_field on vtiger_field.fieldid=vtiger_profile2field.fieldid where vtiger_profile2field.profileid=".$profileid." and vtiger_profile2field.tabid=".$tabid;
 	$result = $adb->query($query);
 	$return_data=array();
     for($i=0; $i<$adb->num_rows($result); $i++)
@@ -1112,7 +1112,7 @@
 {
 	global $log;
      $log->debug("Entering getProfile2AllFieldList(".$mod_array.",".$profileid.") method ...");
-     $log->info("in getProfile2AllFieldList profile id is " .$profileid);
+     $log->info("in getProfile2AllFieldList vtiger_profile id is " .$profileid);
 
 	global $adb;
 	$profilelist=array();
@@ -1136,7 +1136,7 @@
 	global $adb;
 	$tabid = getTabid($fld_module);
 	
-	$query = "select def_org_field.visible,field.* from def_org_field inner join field on field.fieldid=def_org_field.fieldid where def_org_field.tabid=".$tabid;
+	$query = "select vtiger_def_org_field.visible,vtiger_field.* from vtiger_def_org_field inner join vtiger_field on vtiger_field.fieldid=vtiger_def_org_field.fieldid where vtiger_def_org_field.tabid=".$tabid;
 	$result = $adb->query($query);
 	$log->debug("Exiting getDefOrgFieldList method ...");
 	return $result;
@@ -1163,16 +1163,16 @@
  {
 	global $log;
 	$log->debug("Entering ChangeStatus(".$status.",".$activityid.",".$activity_mode."='') method ...");
-        $log->info("in ChangeStatus ".$status. ' activityid is  '.$activityid);
+        $log->info("in ChangeStatus ".$status. ' vtiger_activityid is  '.$activityid);
 
         global $adb;
         if ($activity_mode == 'Task')
         {
-                $query = "Update activity set status='".$status."' where activityid = ".$activityid;
+                $query = "Update vtiger_activity set status='".$status."' where activityid = ".$activityid;
         }
         elseif ($activity_mode == 'Events')
         {
-                $query = "Update activity set eventstatus='".$status."' where activityid = ".$activityid;
+                $query = "Update vtiger_activity set eventstatus='".$status."' where activityid = ".$activityid;
         }
 	if($query) {
         	$adb->query($query);
@@ -1221,7 +1221,7 @@
         $log->info("in getUnitPrice productid ".$productid);
 
         global $adb;
-        $query = "select unit_price from products where productid=".$productid;
+        $query = "select unit_price from vtiger_products where productid=".$productid;
         $result = $adb->query($query);
         $up = $adb->query_result($result,0,'unit_price');
 	$log->debug("Exiting getUnitPrice method ...");
@@ -1284,7 +1284,7 @@
 	$log->debug("Entering getProductImageName(".$id.",".$deleted_array."='') method ...");
 	global $adb;
 	$image_array=array();	
-	$query = "select imagename from products where productid=".$id;
+	$query = "select imagename from vtiger_products where productid=".$id;
 	$result = $adb->query($query);
 	$image_name = $adb->query_result($result,0,"imagename");
 	$image_array=explode("###",$image_name);
@@ -1308,7 +1308,7 @@
 	global $log;
 	$log->debug("Entering getContactImageName(".$id.") method ...");
         global $adb;
-        $query = "select imagename from contactdetails where contactid=".$id;
+        $query = "select imagename from vtiger_contactdetails where contactid=".$id;
         $result = $adb->query($query);
         $image_name = $adb->query_result($result,0,"imagename");
         $log->debug("Inside getContactImageName. The image_name is ".$image_name);
@@ -1342,11 +1342,11 @@
 	global $adb;
 	if($return_module == "Potentials")
 	{
-		$query ="select products.productname,products.unit_price,products.qtyinstock,seproductsrel.* from products inner join seproductsrel on seproductsrel.productid=products.productid where crmid=".$id;
+		$query ="select vtiger_products.productname,vtiger_products.unit_price,vtiger_products.qtyinstock,vtiger_seproductsrel.* from vtiger_products inner join vtiger_seproductsrel on vtiger_seproductsrel.productid=vtiger_products.productid where crmid=".$id;
 	}
 	elseif($return_module == "Products")
 	{
-		$query="select products.productid,products.productname,products.unit_price,products.qtyinstock,crmentity.* from products inner join crmentity on crmentity.crmid=products.productid where crmentity.deleted=0 and productid=".$id;
+		$query="select vtiger_products.productid,vtiger_products.productname,vtiger_products.unit_price,vtiger_products.qtyinstock,vtiger_crmentity.* from vtiger_products inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_products.productid where vtiger_crmentity.deleted=0 and productid=".$id;
 	}
 	$result = $adb->query($query);
 	$num_rows=$adb->num_rows($result);
@@ -1371,7 +1371,7 @@
 	global $log;
 	$log->debug("Entering updateProductQty(".$product_id.",". $upd_qty.") method ...");
 	global $adb;
-	$query= "update products set qtyinstock=".$upd_qty." where productid=".$product_id;
+	$query= "update vtiger_products set qtyinstock=".$upd_qty." where productid=".$product_id;
         $adb->query($query);
 	$log->debug("Exiting updateProductQty method ...");
 
@@ -1382,7 +1382,7 @@
 	global $log;
 	$log->debug("Entering get_account_info(".$parent_id.") method ...");
         global $adb;
-        $query = "select accountid from potential where potentialid=".$parent_id;
+        $query = "select accountid from vtiger_potential where potentialid=".$parent_id;
         $result = $adb->query($query);
         $accountid=$adb->query_result($result,0,'accountid');
 	$log->debug("Exiting get_account_info method ...");
@@ -1768,7 +1768,7 @@
         if($focus->column_fields['email'] == '' && $focus->column_fields['yahooid'] != '')
                 $fieldname = 'yahooid';
 
-        $res = $adb->query("select * from field where tabid = ".getTabid($module)." and fieldname='".$fieldname."'");
+        $res = $adb->query("select * from vtiger_field where tabid = ".getTabid($module)." and fieldname='".$fieldname."'");
         $fieldid = $adb->query_result($res,0,'fieldid');
 
         $hidden .= '<input type="hidden" name="emailids" value="'.$id.'@'.$fieldid.'|">';
@@ -1791,7 +1791,7 @@
         $log->info("in getPoName ".$po_id);
 
         global $adb;
-        $sql = "select postatus from purchaseorder where purchaseorderid=".$po_id;
+        $sql = "select postatus from vtiger_purchaseorder where purchaseorderid=".$po_id;
         $result = $adb->query($sql);
         $po_status = $adb->query_result($result,0,"postatus");
 	$log->debug("Exiting getPoStatus method ...");
@@ -1810,7 +1810,7 @@
 	global $adb;
 	$qtyInStck=getProductQtyInStock($productId);
 	$updQty=$qtyInStck + $qty;
-	$sql = "UPDATE products set qtyinstock=$updQty where productid=".$productId;
+	$sql = "UPDATE vtiger_products set qtyinstock=$updQty where productid=".$productId;
 	$adb->query($sql);
 	$log->debug("Exiting addToProductStock method ...");
 	
@@ -1824,7 +1824,7 @@
 	global $log;
 	$log->debug("Entering getProductQtyInStock(".$product_id.") method ...");
         global $adb;
-        $query1 = "select qtyinstock from products where productid=".$product_id;
+        $query1 = "select qtyinstock from vtiger_products where productid=".$product_id;
         $result=$adb->query($query1);
         $qtyinstck= $adb->query_result($result,0,"qtyinstock");
 	$log->debug("Exiting getProductQtyInStock method ...");
@@ -1861,10 +1861,10 @@
 
 
 
-/**     Function to get the table name from 'field' table for the input field based on the module
+/**     Function to get the vtiger_table name from 'field' vtiger_table for the input vtiger_field based on the module
  *      @param  : string $module - current module value
- *      @param  : string $fieldname - fieldname to which we want the tablename
- *      @return : string $tablename - tablename in which $fieldname is a column, which is retrieved from 'field' table per $module basis
+ *      @param  : string $fieldname - vtiger_fieldname to which we want the vtiger_tablename
+ *      @return : string $tablename - vtiger_tablename in which $fieldname is a column, which is retrieved from 'field' vtiger_table per $module basis
  */
 function getTableNameForField($module,$fieldname)
 {
@@ -1873,7 +1873,7 @@
 	global $adb;
 	$tabid = getTabid($module);
 
-	$sql = "select tablename from field where tabid=".$tabid." and fieldname like '%".$fieldname."%'";
+	$sql = "select tablename from vtiger_field where tabid=".$tabid." and fieldname like '%".$fieldname."%'";
 	$res = $adb->query($sql);
 
 	$tablename = '';
@@ -1908,7 +1908,7 @@
 	global $log;
 	$log->debug("Entering getPotentialsRelatedAccounts(".$record_id.") method ...");
 	global $adb;
-	$query="select accountid from potential where potentialid=".$record_id;
+	$query="select accountid from vtiger_potential where potentialid=".$record_id;
 	$result=$adb->query($query);
 	$accountid=$adb->query_result($result,0,'accountid');
 	$log->debug("Exiting getPotentialsRelatedAccounts method ...");
@@ -1920,7 +1920,7 @@
 	global $log;
 	$log->debug("Entering getEmailsRelatedAccounts(".$record_id.") method ...");
 	global $adb;
-	$query = "select seactivityrel.crmid from seactivityrel inner join crmentity on crmentity.crmid=seactivityrel.crmid where crmentity.setype='Accounts' and activityid=".$record_id;
+	$query = "select vtiger_seactivityrel.crmid from vtiger_seactivityrel inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_seactivityrel.crmid where vtiger_crmentity.setype='Accounts' and activityid=".$record_id;
 	$result = $adb->query($query);
 	$accountid=$adb->query_result($result,0,'crmid');
 	$log->debug("Exiting getEmailsRelatedAccounts method ...");
@@ -1932,7 +1932,7 @@
 	global $log;
 	$log->debug("Entering getEmailsRelatedLeads(".$record_id.") method ...");
 	global $adb;
-	$query = "select seactivityrel.crmid from seactivityrel inner join crmentity on crmentity.crmid=seactivityrel.crmid where crmentity.setype='Leads' and activityid=".$record_id;
+	$query = "select vtiger_seactivityrel.crmid from vtiger_seactivityrel inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_seactivityrel.crmid where vtiger_crmentity.setype='Leads' and activityid=".$record_id;
 	$result = $adb->query($query);
 	$leadid=$adb->query_result($result,0,'crmid');
 	$log->debug("Exiting getEmailsRelatedLeads method ...");
@@ -1944,7 +1944,7 @@
 	global $log;
 	$log->debug("Entering getHelpDeskRelatedAccounts(".$record_id.") method ...");
 	global $adb;
-        $query="select parent_id from troubletickets inner join crmentity on crmentity.crmid=troubletickets.parent_id where ticketid=".$record_id." and crmentity.setype='Accounts'";
+        $query="select parent_id from vtiger_troubletickets inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_troubletickets.parent_id where ticketid=".$record_id." and vtiger_crmentity.setype='Accounts'";
         $result=$adb->query($query);
         $accountid=$adb->query_result($result,0,'parent_id');
 	$log->debug("Exiting getHelpDeskRelatedAccounts method ...");
@@ -1957,7 +1957,7 @@
 	global $log;
 	$log->debug("Entering getQuotesRelatedAccounts(".$record_id.") method ...");
 	global $adb;
-        $query="select accountid from quotes where quoteid=".$record_id;
+        $query="select accountid from vtiger_quotes where quoteid=".$record_id;
         $result=$adb->query($query);
         $accountid=$adb->query_result($result,0,'accountid');
 	$log->debug("Exiting getQuotesRelatedAccounts method ...");
@@ -1970,7 +1970,7 @@
 	global $log;
 	$log->debug("Entering getQuotesRelatedPotentials(".$record_id.") method ...");
 	global $adb;
-        $query="select potentialid from quotes where quoteid=".$record_id;
+        $query="select potentialid from vtiger_quotes where quoteid=".$record_id;
         $result=$adb->query($query);
         $potid=$adb->query_result($result,0,'potentialid');
 	$log->debug("Exiting getQuotesRelatedPotentials method ...");
@@ -1982,7 +1982,7 @@
 	global $log;
 	$log->debug("Entering getSalesOrderRelatedAccounts(".$record_id.") method ...");
 	global $adb;
-        $query="select accountid from salesorder where salesorder=".$record_id;
+        $query="select accountid from vtiger_salesorder where salesorder=".$record_id;
         $result=$adb->query($query);
         $accountid=$adb->query_result($result,0,'accountid');
 	$log->debug("Exiting getSalesOrderRelatedAccounts method ...");
@@ -1995,7 +1995,7 @@
 	global $log;
 	$log->debug("Entering getSalesOrderRelatedPotentials(".$record_id.") method ...");
 	global $adb;
-        $query="select potentialid from salesorder where salesorder=".$record_id;
+        $query="select potentialid from vtiger_salesorder where salesorder=".$record_id;
         $result=$adb->query($query);
         $potid=$adb->query_result($result,0,'potentialid');
 	$log->debug("Exiting getSalesOrderRelatedPotentials method ...");
@@ -2007,7 +2007,7 @@
 	global $log;
 	$log->debug("Entering getSalesOrderRelatedQuotes(".$record_id.") method ...");
 	global $adb;
-        $query="select quoteid from salesorder where salesorder=".$record_id;
+        $query="select quoteid from vtiger_salesorder where salesorder=".$record_id;
         $result=$adb->query($query);
         $qtid=$adb->query_result($result,0,'quoteid');
 	$log->debug("Exiting getSalesOrderRelatedQuotes method ...");
@@ -2019,7 +2019,7 @@
 	global $log;
 	$log->debug("Entering getInvoiceRelatedAccounts(".$record_id.") method ...");
 	global $adb;
-        $query="select accountid from invoice where invoiceid=".$record_id;
+        $query="select accountid from vtiger_invoice where invoiceid=".$record_id;
         $result=$adb->query($query);
         $accountid=$adb->query_result($result,0,'accountid');
 	$log->debug("Exiting getInvoiceRelatedAccounts method ...");
@@ -2031,7 +2031,7 @@
 	global $log;
 	$log->debug("Entering getInvoiceRelatedSalesOrder(".$record_id.") method ...");
 	global $adb;
-        $query="select salesorderid from invoice where invoiceid=".$record_id;
+        $query="select salesorderid from vtiger_invoice where invoiceid=".$record_id;
         $result=$adb->query($query);
         $soid=$adb->query_result($result,0,'salesorderid');
 	$log->debug("Exiting getInvoiceRelatedSalesOrder method ...");
@@ -2147,7 +2147,7 @@
 }//function ends
 
 
-/**   Function to get the Graph and table format for a particular date
+/**   Function to get the Graph and vtiger_table format for a particular date
         based upon the period
         * Portions created by vtiger are Copyright (C) vtiger.
         * All Rights Reserved.
@@ -2158,7 +2158,7 @@
 	global $log;
 	$log->debug("Entering Graph_n_table_format(".$period_type.",".$date_value.") method ...");
         $date_val=explode("-",$date_value);
-        if($period_type=="month")   //to get the table format dates
+        if($period_type=="month")   //to get the vtiger_table format dates
         {
                 $table_format=date("j",mktime(0,0,0,date($date_val[1]),(date($date_val[2])),date($date_val[0])));
                 $graph_format=date("D",mktime(0,0,0,date($date_val[1]),(date($date_val[2])),date($date_val[0])));
@@ -2185,7 +2185,7 @@
 	$log->debug("Entering getImageCount(".$id.") method ...");
 	global $adb;
 	$image_lists=array();
-	$query="select imagename from products where productid=".$id;
+	$query="select imagename from vtiger_products where productid=".$id;
 	$result=$adb->query($query);
 	$imagename=$adb->query_result($result,0,'imagename');
 	$image_lists=explode("###",$imagename);
@@ -2198,7 +2198,7 @@
 	global $log;
 	$log->debug("Entering getUserImageName(".$id.") method ...");
 	global $adb;
-	$query = "select imagename from users where id=".$id;
+	$query = "select imagename from vtiger_users where id=".$id;
 	$result = $adb->query($query);
 	$image_name = $adb->query_result($result,0,"imagename");
 	$log->debug("Inside getUserImageName. The image_name is ".$image_name);
@@ -2213,7 +2213,7 @@
 	global $log;
 	$log->debug("Entering getUserImageNames() method ...");
 	global $adb;
-	$query = "select imagename from users where deleted=0";
+	$query = "select imagename from vtiger_users where deleted=0";
 	$result = $adb->query($query);
 	$image_name=array();
 	for($i=0;$i<$adb->num_rows($result);$i++)
@@ -2250,6 +2250,6 @@
 
 function useInternalMailer() {
 	global $current_user,$adb;
-	return $adb->query_result($adb->query("select int_mailer from mail_accounts where user_id='".$current_user->id."'"),0,"int_mailer");
+	return $adb->query_result($adb->query("select int_mailer from vtiger_mail_accounts where user_id='".$current_user->id."'"),0,"int_mailer");
 }
 ?>

Modified: vtigercrm/trunk/index.php
==============================================================================
--- vtigercrm/trunk/index.php (original)
+++ vtigercrm/trunk/index.php Mon Jun 12 14:26:25 2006
@@ -15,7 +15,7 @@
 /*********************************************************************************
  * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/index.php,v 1.93 2005/04/21 16:17:25 ray Exp $
  * Description: Main file and starting point for the application.  Calls the 
- * theme header and footer files defined for the user as well as the module as 
+ * theme header and footer vtiger_files defined for the user as well as the module as 
  * defined by the input parameters.
  ********************************************************************************/
 
@@ -105,7 +105,7 @@
 if (isset($_REQUEST['PHPSESSID'])) $log->debug("****Starting for session ".$_REQUEST['PHPSESSID']);
 else $log->debug("****Starting for new session");
 
-// We use the REQUEST_URI later to construct dynamic URLs.  IIS does not pass this field
+// We use the REQUEST_URI later to construct dynamic URLs.  IIS does not pass this vtiger_field
 // to prevent an error, if it is not set, we will assign it to ''
 if(!isset($_SERVER['REQUEST_URI']))
 {
@@ -271,7 +271,7 @@
 			ereg("^Webmails",$module) ))
 	{
 		$skipHeaders=true;
-		//skip headers for all these invocations as they are mostly popups
+		//skip vtiger_headers for all these invocations as they are mostly popups
 		if(ereg("^Popup", $action) ||
 			ereg("^ChangePassword", $action) ||
 			ereg("^Export", $action) ||
@@ -319,7 +319,7 @@
 }
 else {
     // use $default_module and $default_action as set in config.php
-    // Redirect to the correct module with the correct action.  We need the URI to include these fields.
+    // Redirect to the correct module with the correct action.  We need the URI to include these vtiger_fields.
   
 
         header("Location: index.php?action=$default_action&module=$default_module");
@@ -501,9 +501,9 @@
         setcookie('ck_login_language_vtiger', $_SESSION['authenticated_user_language']);
 }
 
-//skip headers for popups, deleting, saving, importing and other actions
+//skip vtiger_headers for popups, deleting, saving, importing and other actions
 if(!$skipHeaders) {
-	$log->debug("including headers");
+	$log->debug("including vtiger_headers");
 	if($use_current_login)
 	{
 		if(isset($_REQUEST['category']) && $_REQUEST['category'] !='')
@@ -522,7 +522,7 @@
 	if(isset($_SESSION['administrator_error']))
 	{
 		// only print DB errors once otherwise they will still look broken after they are fixed.
-		// Only print the errors for admin users.
+		// Only print the errors for admin vtiger_users.
 		if(is_admin($current_user)) 
 			echo $_SESSION['administrator_error'];
 		unset($_SESSION['administrator_error']);
@@ -531,7 +531,7 @@
 	echo "<!-- startscrmprint -->";
 }
 else {
-		$log->debug("skipping headers");
+		$log->debug("skipping vtiger_headers");
 }
 
 

Modified: vtigercrm/trunk/install/0welcome.php
==============================================================================
--- vtigercrm/trunk/install/0welcome.php (original)
+++ vtigercrm/trunk/install/0welcome.php Mon Jun 12 14:26:25 2006
@@ -54,7 +54,7 @@
 <body leftMargin="0" topMargin="0" marginheight="0" marginwidth="0">
 
 
-<!-- Master table -->
+<!-- Master vtiger_table -->
 <table border=0 cellspacing=0 cellpadding=0 width=100%>
 <tr>
 <td width="10%" valign="top"></td>
@@ -95,7 +95,7 @@
 <p><b><i>Again, thanks for taking out the time to try vtiger! We want you to know that we really appreciate it.</i></b>
 
 <p><b>Installation Instructions:-</b></p>
-<p>This Configuration Wizard will create vtiger CRM 5.0 Beta databases and tables and configuration files you need to start. The entire process should take about four minutes. Click the Start button when you are ready. 
+<p>This Configuration Wizard will create vtiger CRM 5.0 Beta databases and vtiger_tables and configuration vtiger_files you need to start. The entire process should take about four minutes. Click the Start button when you are ready. 
 <br><br>
 <p><span style="color:#555555">- vtiger CRM 5.0 Beta is tested on mySQL 4.1.X, mySQL 5.0.19, PHP 5.0.19 and Apache 2.0.40.</p> 
 <p align="center"><font color='red'><b>vtiger CRM 5 Beta will not work on mysql 4.0.x versions</b></font></center><center><font color='blue'><b>vtiger crm can run on a system which has xampp/lampp/wampp already installed in it provided it meets the above mentioned requirements</b></font></center>
@@ -183,7 +183,7 @@
 			form for making modifications,<br>
 			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; including but not limited to software
 			source code, documentation<br>
-			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; source, and configuration files.<br>
+			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; source, and configuration vtiger_files.<br>
 			<br>
 			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; "Object" form shall mean any form
 			resulting from mechanical<br>
@@ -233,8 +233,8 @@
 			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; to the Licensor or its representatives,
 			including but not limited to<br>
 			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; communication on electronic mailing
-			lists, source code control systems,<br>
-			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; and issue tracking systems that are
+			lists, source code control vtiger_systems,<br>
+			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; and issue tracking vtiger_systems that are
 			managed by, or on behalf of, the<br>
 			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Licensor for the purpose of discussing
 			and improving the Work, but<br>
@@ -306,10 +306,10 @@
 			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Derivative Works
 			a copy of this License; and<br>
 			<br>
-			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; (b) You must cause any modified files to
+			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; (b) You must cause any modified vtiger_files to
 			carry prominent notices<br>
 			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; stating that You
-			changed the files; and<br>
+			changed the vtiger_files; and<br>
 			<br>
 			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; (c) You must retain, in the Source form
 			of any Derivative Works<br>
@@ -460,7 +460,7 @@
 			<br>
 			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; To apply the Apache License to your
 			work, attach the following<br>
-			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; boilerplate notice, with the fields
+			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; boilerplate notice, with the vtiger_fields
 			enclosed by brackets "[]"<br>
 			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; replaced with your own identifying
 			information. (Don't include<br>
@@ -547,7 +547,7 @@
 			&nbsp;*<br>
 			&nbsp;* 2. The origin of this software must not be misrepresented,
 			either by<br>
-			&nbsp;* explicit claim or by omission.&nbsp; Since few users ever read
+			&nbsp;* explicit claim or by omission.&nbsp; Since few vtiger_users ever read
 			sources, credits<br>
 			&nbsp;* must appear in the documentation.<br>
 			&nbsp;*<br>
@@ -865,7 +865,7 @@
 			acknowledgments normally appear.<br>
 			&nbsp;*<br>
 			&nbsp;* 4. The names "Apache" and "Apache Software Foundation" must<br>
-			&nbsp;*&nbsp;&nbsp;&nbsp; not be used to endorse or promote products
+			&nbsp;*&nbsp;&nbsp;&nbsp; not be used to endorse or promote vtiger_products
 			derived from this<br>
 			&nbsp;*&nbsp;&nbsp;&nbsp; software without prior written permission.
 			For written<br>
@@ -1018,7 +1018,7 @@
 			<br>
 			&nbsp;&nbsp; somewhere reasonably visible in your documentation and in
 			any relevant<br>
-			&nbsp;&nbsp; files or online help data or similar. A reference to the
+			&nbsp;&nbsp; vtiger_files or online help data or similar. A reference to the
 			ftp site for<br>
 			&nbsp;&nbsp; the source, that is, to<br>
 			<br>
@@ -1092,7 +1092,7 @@
 			and Clark Cooper<br>
 			<br>
 			Permission is hereby granted, free of charge, to any person obtaining<br>
-			a copy of this software and associated documentation files (the<br>
+			a copy of this software and associated documentation vtiger_files (the<br>
 			"Software"), to deal in the Software without restriction, including<br>
 			without limitation the rights to use, copy, modify, merge, publish,<br>
 			distribute, sublicense, and/or sell copies of the Software, and to<br>
@@ -1189,16 +1189,16 @@
 			<br>
 			IMPORTANT:<br>
 			<br>
-			Send bug (error) reports, questions and comments to the mailing list<br>
+			Send bug (error) vtiger_reports, questions and comments to the mailing list<br>
 			at mysql at lists.mysql.com<br>
 			<br>
-			Please use the 'mysqlbug' script when posting bug reports or questions<br>
+			Please use the 'mysqlbug' script when posting bug vtiger_reports or questions<br>
 			about MySQL. mysqlbug will gather some information about your system<br>
 			and start your editor with a form in which you can describe your<br>
-			problem. Bug reports might be silently ignored by the MySQL<br>
-			maintainers if there is not a good reason included in the report as to<br>
-			why mysqlbug has not been used. A report that says 'MySQL does not<br>
-			work for me. Why?' is not considered a valid bug report.<br>
+			problem. Bug vtiger_reports might be silently ignored by the MySQL<br>
+			maintainers if there is not a good reason included in the vtiger_report as to<br>
+			why mysqlbug has not been used. A vtiger_report that says 'MySQL does not<br>
+			work for me. Why?' is not considered a valid bug vtiger_report.<br>
 			<br>
 			The mysqlbug script can be found in the 'scripts' directory of the<br>
 			distribution, that is '&lt;where-you-installed-mysql&gt;/scripts'.<br>
@@ -1228,7 +1228,7 @@
 			provided with the<br>
 			&nbsp;&nbsp;&nbsp;&nbsp; distribution.<br>
 			&nbsp;<br>
-			&nbsp; 3. The name "PHP" must not be used to endorse or promote products<br>
+			&nbsp; 3. The name "PHP" must not be used to endorse or promote vtiger_products<br>
 			&nbsp;&nbsp;&nbsp;&nbsp; derived from this software without prior
 			written permission. For<br>
 			&nbsp;&nbsp;&nbsp;&nbsp; written permission, please contact
@@ -1343,7 +1343,7 @@
 			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 1.9. ''Modifications'' means any
 			addition to or deletion from the substance or structure of either the
 			Original Code or any previous Modifications. When Covered Code is
-			released as a series of files, a Modification is:<br>
+			released as a series of vtiger_files, a Modification is:<br>
 			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; A.
 			Any addition to or deletion from the contents of a file containing
 			Original Code or previous Modifications.<br>
@@ -1367,7 +1367,7 @@
 			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 1.11. ''Source Code'' means the
 			preferred form of the Covered Code for making modifications to it,
 			including all modules it contains, plus any associated interface
-			definition files, scripts used to control compilation and installation
+			definition vtiger_files, scripts used to control compilation and installation
 			of an Executable, or source code differential comparisons against
 			either the Original Code or another well known, available Covered Code
 			of the Contributor's choice. The Source Code can be in a compressed or
@@ -1686,7 +1686,7 @@
 			such claim is resolved (such as by license or settlement) prior to the
 			initiation of patent infringement litigation, then the reasonable value
 			of the licenses granted by such Participant under Sections 2.1 or 2.2
-			shall be taken into account in determining the amount or value of any
+			shall be taken into vtiger_account in determining the amount or value of any
 			payment or license.<br>
 			<br>
 			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 8.4.&nbsp; In the event of termination
@@ -1783,7 +1783,7 @@
 			Contributor(s): ______________________________________.<br>
 			<br>
 			[NOTE: The text of this Exhibit A may differ slightly from the text of
-			the notices in the Source Code files of the Original Code. You should
+			the notices in the Source Code vtiger_files of the Original Code. You should
 			use the text of this Exhibit A rather than the text found in the
 			Original Code Source Code for Your Modifications.]<br>
 			<br>
@@ -1834,7 +1834,7 @@
 			intended to<br>
 			guarantee your freedom to share and change free software--to make sure
 			the<br>
-			software is free for all its users.<br>
+			software is free for all its vtiger_users.<br>
 			<br>
 			This license, the Lesser General Public License, applies to some
 			specially<br>
@@ -1871,7 +1871,7 @@
 			must<br>
 			make sure that they, too, receive or can get the source code. If you
 			link<br>
-			other code with the library, you must provide complete object files to
+			other code with the library, you must provide complete object vtiger_files to
 			the<br>
 			recipients, so that they can relink them with the library after making
 			changes<br>
@@ -1946,7 +1946,7 @@
 			<br>
 			In other cases, permission to use a particular library in non-free
 			programs<br>
-			enables a greater number of people to use a large body of free
+			enables a greater number of people to use a vtiger_large body of free
 			software. For<br>
 			example, permission to use the GNU C Library in non-free programs
 			enables many<br>
@@ -2046,23 +2046,23 @@
 			&nbsp;&nbsp;&nbsp; a) The modified work must itself be a software
 			library.<br>
 			<br>
-			&nbsp;&nbsp;&nbsp; b) You must cause the files modified to carry
+			&nbsp;&nbsp;&nbsp; b) You must cause the vtiger_files modified to carry
 			prominent notices stating<br>
-			that you changed the files and the date of any change.<br>
+			that you changed the vtiger_files and the date of any change.<br>
 			<br>
 			&nbsp;&nbsp;&nbsp; c) You must cause the whole of the work to be
 			licensed at no charge to all<br>
 			third parties under the terms of this License.<br>
 			<br>
 			&nbsp;&nbsp;&nbsp; d) If a facility in the modified Library refers to a
-			function or a table<br>
+			function or a vtiger_table<br>
 			of data to be supplied by an application program that uses the
 			facility, other<br>
 			than as an argument passed when the facility is invoked, then you must
 			make a<br>
 			good faith effort to ensure that, in the event an application does not
 			supply<br>
-			such function or table, the facility still operates, and performs
+			such function or vtiger_table, the facility still operates, and performs
 			whatever<br>
 			part of its purpose remains meaningful.<br>
 			<br>
@@ -2233,7 +2233,7 @@
 			executable<br>
 			containing the modified Library. (It is understood that the user who
 			changes<br>
-			the contents of definitions files in the Library will not necessarily
+			the contents of definitions vtiger_files in the Library will not necessarily
 			be able<br>
 			to recompile the application to use the modified definitions.)<br>
 			<br>
@@ -2526,19 +2526,19 @@
 			Acknowledgements:<br>
 			<br>
 			We have used the following software:<br>
-			<br>1. ExcelReader package to read the xls files. We have taken the utility from the following Web site : <br>
+			<br>1. ExcelReader package to read the xls vtiger_files. We have taken the utility from the following Web site : <br>
 			http://freshmeat.net/projects/phpexcelreader/<br>
 			The product is available as GNU General Public License (GPL).<br>
-			2. E-mail Client to handle attachments with PHP. We have taken the ideas from the article by Kevin Steffer available at the<br>
+			2. E-mail Client to handle vtiger_attachments with PHP. We have taken the ideas from the article by Kevin Steffer available at the<br>
   http://www.linuxscope.net/articles/mailAttachmentsPHP.html<br>
-			3. FPDF package to create PDF reports and documents. We have downloaded package from http://www.fpdf.org<br>
+			3. FPDF package to create PDF vtiger_reports and documents. We have downloaded package from http://www.fpdf.org<br>
 			4. Prototype (Object-Oriented JavaScript framework) package to ease development of dynamic web applications. We have downloaded package from http://prototype.conio.net<br>
 			5. class_http to cache scraped content. We have downloaded package from http://www.troywolf.com/articles/php/class_http/ <br>
-			6.Carousel Slideshow package to display large images as thumbnails. We have downloaded package from http://www.dynamicdrive.com/dynamicindex14/carousel2.htm<br>
-			7. Ajax Popup Chat for enabling instant messaging for vtiger CRM users. We have downloaded package from http://www.os-solution.com/demo/ajaxcsspopupchat/index.php<br>
+			6.Carousel Slideshow package to display vtiger_large images as thumbnails. We have downloaded package from http://www.dynamicdrive.com/dynamicindex14/carousel2.htm<br>
+			7. Ajax Popup Chat for enabling instant messaging for vtiger CRM vtiger_users. We have downloaded package from http://www.os-solution.com/demo/ajaxcsspopupchat/index.php<br>
 			8. Image Crossfade Redux for enabling fade effect to images. We have downloaded package from http://slayeroffice.com/code/imageCrossFade/xfade2.html<br>
 			9. Calculator for enabling calculations in vtiger CRM. We have downloaded package from http://www.hmhd.com/steve<br>
-We are grateful to the creators of the respective products for providing such a beautiful utilities.<br>
+We are grateful to the creators of the respective vtiger_products for providing such a beautiful utilities.<br>
 			
 			&nbsp;<br>
 			<br>
@@ -2587,7 +2587,7 @@
 <td width="10%" valign="top"></td>
 </tr>
 </table>
-<!-- Master table closes -->
+<!-- Master vtiger_table closes -->
 
 </body>
 </html>

Modified: vtigercrm/trunk/install/1checkSystem.php
==============================================================================
--- vtigercrm/trunk/install/1checkSystem.php (original)
+++ vtigercrm/trunk/install/1checkSystem.php Mon Jun 12 14:26:25 2006
@@ -156,7 +156,7 @@
 </head>
 <body leftMargin="0" topMargin="0" marginheight="0" marginwidth="0">
 
-<!-- Master table -->
+<!-- Master vtiger_table -->
 <table border=0 cellspacing=0 cellpadding=0 width=100%>
 <tr>
 	<td align=center>
@@ -250,7 +250,7 @@
         </tr>
 		<tr bgcolor="#fafafa">
 		    <td valign=top ><strong>Uploads Directory</strong><br> (storage/)</td>
-            <td valign=top bgcolor="white"><?php echo (is_writable('./storage/'))?"<strong><font color=\"#0066CC\">Writeable</font></strong>":"<strong><font color=\"#FF0000\">Not Writeable</strong> <br>You might experience problems with the file attachments feature. Refer <a href=http://www.vtiger.com/forums/viewtopic.php?t=24&highlight=permission>File attachments issue</a> for more details </font>"; ?></td>
+            <td valign=top bgcolor="white"><?php echo (is_writable('./storage/'))?"<strong><font color=\"#0066CC\">Writeable</font></strong>":"<strong><font color=\"#FF0000\">Not Writeable</strong> <br>You might experience problems with the file vtiger_attachments feature. Refer <a href=http://www.vtiger.com/forums/viewtopic.php?t=24&highlight=permission>File vtiger_attachments issue</a> for more details </font>"; ?></td>
         </tr>
 		<tr bgcolor="#fafafa">
 		    <td valign=top ><strong>Install Directory</strong><br> (install/)</td>
@@ -262,19 +262,19 @@
         </tr>
 	<tr bgcolor="#fafafa">
 		<td valign=top ><strong>Product Image Directory</strong><br> (test/product/)</td>
-		<td valign=top bgcolor="white"><?php echo (is_writable('./test/product/'))?"<strong><font color=\"#0066CC\">Writeable</font></strong>":"<strong><font color=\"#FF0000\">Not Writeable</strong> <br>You might experience problems while attaching image for Products.Refer <a href=http://www.vtiger.com/forums/viewtopic.php?t=24&highlight=permission>File attachments issue</a> for more details </font>"; ?></td>
+		<td valign=top bgcolor="white"><?php echo (is_writable('./test/product/'))?"<strong><font color=\"#0066CC\">Writeable</font></strong>":"<strong><font color=\"#FF0000\">Not Writeable</strong> <br>You might experience problems while attaching image for Products.Refer <a href=http://www.vtiger.com/forums/viewtopic.php?t=24&highlight=permission>File vtiger_attachments issue</a> for more details </font>"; ?></td>
 	</tr>
 	<tr bgcolor="#fafafa">
 		<td valign=top ><strong>User Image Directory</strong><br> (test/user/)</td>
-		<td valign=top bgcolor="white"><?php echo (is_writable('./test/user/'))?"<strong><font color=\"#0066CC\">Writeable</font></strong>":"<strong><font color=\"#FF0000\">Not Writeable</strong> <br>You might experience problems while attaching image for Users. Refer <a href=http://www.vtiger.com/forums/viewtopic.php?t=24&highlight=permission>File attachments issue</a> for more details </font>"; ?></td>
+		<td valign=top bgcolor="white"><?php echo (is_writable('./test/user/'))?"<strong><font color=\"#0066CC\">Writeable</font></strong>":"<strong><font color=\"#FF0000\">Not Writeable</strong> <br>You might experience problems while attaching image for Users. Refer <a href=http://www.vtiger.com/forums/viewtopic.php?t=24&highlight=permission>File vtiger_attachments issue</a> for more details </font>"; ?></td>
 	</tr>
 	<tr bgcolor="#fafafa">
 		<td valign=top ><strong>Contact Image Directory</strong><br> (test/contact/)</td>
-		<td valign=top bgcolor="white"><?php echo (is_writable('./test/contact/'))?"<strong><font color=\"#0066CC\">Writeable</font></strong>":"<strong><font color=\"#FF0000\">Not Writeable</strong> <br>You might experience problems while attaching image for Contacts. Refer <a href=http://www.vtiger.com/forums/viewtopic.php?t=24&highlight=permission>File attachments issue</a> for more details </font>"; ?></td>
+		<td valign=top bgcolor="white"><?php echo (is_writable('./test/contact/'))?"<strong><font color=\"#0066CC\">Writeable</font></strong>":"<strong><font color=\"#FF0000\">Not Writeable</strong> <br>You might experience problems while attaching image for Contacts. Refer <a href=http://www.vtiger.com/forums/viewtopic.php?t=24&highlight=permission>File vtiger_attachments issue</a> for more details </font>"; ?></td>
 	</tr>
 		<tr bgcolor="#fafafa">
 		    <td valign=top ><strong>Logo Directory</strong><br> (test/logo/)</td>
-            <td valign=top bgcolor="white"><?php echo (is_writable('./test/logo/'))?"<strong><font color=\"#0066CC\">Writeable</font></strong>":"<strong><font color=\"#FF0000\">Not Writeable</strong> <br>You might experience problems with the company logo in the pdf generation. Refer <a href=http://www.vtiger.com/forums/viewtopic.php?t=24&highlight=permission>File attachments issue</a> for more details </font>"; ?></td>
+            <td valign=top bgcolor="white"><?php echo (is_writable('./test/logo/'))?"<strong><font color=\"#0066CC\">Writeable</font></strong>":"<strong><font color=\"#FF0000\">Not Writeable</strong> <br>You might experience problems with the company logo in the pdf generation. Refer <a href=http://www.vtiger.com/forums/viewtopic.php?t=24&highlight=permission>File vtiger_attachments issue</a> for more details </font>"; ?></td>
         </tr>
 
 		<tr bgcolor="#fafafa">
@@ -359,7 +359,7 @@
 </td>
 </tr>
 </table>
-<!-- Master table closes -->
+<!-- Master vtiger_table closes -->
 
 <br><br><br>
 <!--

Modified: vtigercrm/trunk/install/2setConfig.php
==============================================================================
--- vtigercrm/trunk/install/2setConfig.php (original)
+++ vtigercrm/trunk/install/2setConfig.php Mon Jun 12 14:26:25 2006
@@ -234,7 +234,7 @@
 
 	// Here we decide whether to submit the form.
 	if (isError == true) {
-		alert("Missing required fields: " + errorMessage);
+		alert("Missing required vtiger_fields: " + errorMessage);
 		return false;
 	}
 
@@ -244,7 +244,7 @@
 </script>
 
 
-<!-- Master table -->
+<!-- Master vtiger_table -->
 <table border=0 cellspacing=0 cellpadding=0 width=100%>
 <tr>
 	<td align=center>
@@ -291,7 +291,7 @@
 
 					  If you do not have root access to your database (for example you are installing in a virtual
 					  hosting environment), you will need to have your database created for you before you proceed.
-					  However, this installer will still be able to create the necessary database tables. <br><br>
+					  However, this installer will still be able to create the necessary database vtiger_tables. <br><br>
 			
 					  If you unsure of your database host, username or password, we suggest that you use the default
 					  values below. <br><br>
@@ -433,7 +433,7 @@
 </td>
 </tr>
 </table>
-<!-- Master table closes -->
+<!-- Master vtiger_table closes -->
 
 <br><br><br>
 

Modified: vtigercrm/trunk/install/3confirmConfig.php
==============================================================================
--- vtigercrm/trunk/install/3confirmConfig.php (original)
+++ vtigercrm/trunk/install/3confirmConfig.php Mon Jun 12 14:26:25 2006
@@ -131,7 +131,7 @@
 	</head>
 	<body leftMargin="0" topMargin="0" marginheight="0" marginwidth="0">
 
-		<!-- Master table -->
+		<!-- Master vtiger_table -->
 		<table border=0 cellspacing=0 cellpadding=0 width=100%>
 			<tr>
 				<td align=center>
@@ -299,6 +299,6 @@
 				</td>
 			</tr>
 		</table>
-	<!-- Master table closes -->
+	<!-- Master vtiger_table closes -->
 	</body>
 </html>

Modified: vtigercrm/trunk/install/4createConfigFile.php
==============================================================================
--- vtigercrm/trunk/install/4createConfigFile.php (original)
+++ vtigercrm/trunk/install/4createConfigFile.php Mon Jun 12 14:26:25 2006
@@ -121,7 +121,7 @@
 
 <body leftMargin="0" topMargin="0" marginheight="0" marginwidth="0">
 
-<!-- Master table -->
+<!-- Master vtiger_table -->
 <table border=0 cellspacing=0 cellpadding=0 width=100%>
 <tr>
 	<td align=center>
@@ -290,7 +290,7 @@
 </td>
 </tr>
 </table>
-<!-- Master table closes -->
+<!-- Master vtiger_table closes -->
 
 </body>
 

Modified: vtigercrm/trunk/install/5createTables.inc.php
==============================================================================
--- vtigercrm/trunk/install/5createTables.inc.php (original)
+++ vtigercrm/trunk/install/5createTables.inc.php Mon Jun 12 14:26:25 2006
@@ -90,10 +90,10 @@
         $user->save();
 
         // we need to change the admin user to a fixed id of 1.
-        //$query = "update users set id='1' where user_name='$user->user_name'";
+        //$query = "update vtiger_users set id='1' where user_name='$user->user_name'";
         //$result = $db->query($query, true, "Error updating admin user ID: ");
 
-        $log->info("Created ".$user->table_name." table. for user $user->id");
+        $log->info("Created ".$user->table_name." vtiger_table. for user $user->id");
 
 	/*
         if($create_default_user) {
@@ -115,16 +115,16 @@
         }
 	*/
 
-	// insert values into user2role table
-	$role_query = "select roleid from role where rolename='administrator'";
+	// insert values into vtiger_user2role vtiger_table
+	$role_query = "select roleid from vtiger_role where rolename='administrator'";
 	$db->database->SetFetchMode(ADODB_FETCH_ASSOC);
 	$role_result = $db->query($role_query);
 	$role_id = $db->query_result($role_result,0,"roleid");
 
-	$sql_stmt1 = "insert into user2role values(".$user->id.",'".$role_id."')";
+	$sql_stmt1 = "insert into vtiger_user2role values(".$user->id.",'".$role_id."')";
 	$db->query($sql_stmt1) or die($app_strings['ERR_CREATING_TABLE'].mysql_error());
 
-	//Creating the flat files
+	//Creating the flat vtiger_files
 	createUserPrivilegesfile($user->id);
         createUserSharingPrivilegesfile($user->id);
 
@@ -152,15 +152,15 @@
         $user->email = $std_email;
         $user->save();
 
-	$role_query = "select roleid from role where rolename='standard_user'";
+	$role_query = "select roleid from vtiger_role where rolename='standard_user'";
 	$db->database->SetFetchMode(ADODB_FETCH_ASSOC);
 	$role_result = $db->query($role_query);
 	$role_id = $db->query_result($role_result,0,"roleid");
 
-	$sql_stmt2 = "insert into user2role values(".$user->id.",'".$role_id."')";
+	$sql_stmt2 = "insert into vtiger_user2role values(".$user->id.",'".$role_id."')";
 	$db->query($sql_stmt2) or die($app_strings['ERR_CREATING_TABLE'].mysql_error());
 
-	//Creating the flat files
+	//Creating the flat vtiger_files
 	createUserPrivilegesfile($user->id);
         createUserSharingPrivilegesfile($user->id);
 
@@ -169,8 +169,8 @@
 //$startTime = microtime();
 $modules = array("DefaultDataPopulator");
 $focus=0;				
-// tables creation
-eecho("Creating Core tables: ");
+// vtiger_tables creation
+eecho("Creating Core vtiger_tables: ");
 $success = $db->createTables("schema/DatabaseSchema.xml");
 
 // TODO HTML
@@ -188,34 +188,34 @@
 }
 			
 
-// populate users table
+// populate vtiger_users vtiger_table
 //$uid = $db->getUniqueID("users");
-//$sql_stmt1 = "insert into users(id,user_name,user_password,last_name,email1,date_format) values(".$uid.",'standarduser','stX/AHHNK/Gkw','standarduser','standarduser at standard.user.com','yyyy-mm-dd')";
+//$sql_stmt1 = "insert into vtiger_users(id,user_name,user_password,last_name,email1,date_format) values(".$uid.",'standarduser','stX/AHHNK/Gkw','standarduser','standarduser at standard.user.com','yyyy-mm-dd')";
 //$db->query($sql_stmt1) or die($app_strings['ERR_CREATING_TABLE'].mysql_error());
 
 
-// create and populate combo tables
+// create and populate combo vtiger_tables
 require_once('include/PopulateComboValues.php');
 $combo = new PopulateComboValues();
 $combo->create_tables();
 
 create_default_users();
 
-// default report population
+// default vtiger_report population
 require_once('modules/Reports/PopulateReports.php');
 
-// default customview population
+// default vtiger_customview population
 require_once('modules/CustomView/PopulateCustomView.php');
 
-//Writing tab data in flat file
+//Writing vtiger_tab data in flat file
 create_tab_data_file();
 create_parenttab_data_file();
 
 // ensure required sequences are created (adodb creates them as needed, but if
 // creation occurs within a transaction we get problems
-$db->getUniqueID("crmentity");
-$db->getUniqueID("seactivityrel");
-$db->getUniqueID("freetags");
+$db->getUniqueID("vtiger_crmentity");
+$db->getUniqueID("vtiger_seactivityrel");
+$db->getUniqueID("vtiger_freetags");
 
 // populate the db with seed data
 if ($db_populate) {

Modified: vtigercrm/trunk/install/5createTables.php
==============================================================================
--- vtigercrm/trunk/install/5createTables.php (original)
+++ vtigercrm/trunk/install/5createTables.php Mon Jun 12 14:26:25 2006
@@ -193,7 +193,7 @@
 </td>
 </tr>
 </table>
-<!-- master table closes -->
+<!-- master vtiger_table closes -->
 
 
 </body></html>

Modified: vtigercrm/trunk/install/populateSeedData.php
==============================================================================
--- vtigercrm/trunk/install/populateSeedData.php (original)
+++ vtigercrm/trunk/install/populateSeedData.php Mon Jun 12 14:26:25 2006
@@ -145,7 +145,7 @@
 	
 	$account_name = $company_name_array[$i];
 
-	// Create new accounts.
+	// Create new vtiger_accounts.
 	$account = new Account();
 	$account->column_fields["accountname"] = $account_name;
 	$account->column_fields["phone"] = create_phone_number();
@@ -182,11 +182,11 @@
 	if ($i > 3)
 	{
 		$freetag = $adb->getUniqueId('freetags');
-		$query = "insert into freetags values ($freetag, '$cloudtag[1]', '$cloudtag[1]')";
+		$query = "insert into vtiger_freetags values ($freetag, '$cloudtag[1]', '$cloudtag[1]')";
 		$res = $adb->query($query);
 
 		$date = date('YmdHis'); 
-		$query_tag = "insert into freetagged_objects values ($freetag, 1,".$account->id.", $date, 'Accounts')";
+		$query_tag = "insert into vtiger_freetagged_objects values ($freetag, 1,".$account->id.", $date, 'Accounts')";
 		$result = $adb->query($query_tag);
 	}
 
@@ -227,7 +227,7 @@
 	
 	$opportunity_ids[] = $opp->id;
 
-//	$adb->println("PSD Potential [".$opp->id."] - account[".$account->id."]");
+//	$adb->println("PSD Potential [".$opp->id."] - vtiger_account[".$account->id."]");
 	
 }
 
@@ -285,11 +285,11 @@
 	if ($i > 8)
 	{
 		$freetag = $adb->getUniqueId('freetags');
-		$query = "insert into freetags values ($freetag, '$cloudtag[2]', '$cloudtag[2]')";
+		$query = "insert into vtiger_freetags values ($freetag, '$cloudtag[2]', '$cloudtag[2]')";
 		$res1 = $adb->query($query);
 
 		$date = date('YmdHis'); 
-		$query_tag = "insert into freetagged_objects values ($freetag, 1,".$contact->id.", $date, 'Contacts')";
+		$query_tag = "insert into vtiger_freetagged_objects values ($freetag, 1,".$contact->id.", $date, 'Contacts')";
 		$result1 = $adb->query($query_tag);
 	}
 	// This assumes that there will be one opportunity per company in the seed data.
@@ -297,10 +297,10 @@
 	//$query = "insert into opportunities_contacts set id='".create_guid()."', contact_id='$contact->id', contact_role='".$app_list_strings['opportunity_relationship_type_default_key']."', opportunity_id='".$opportunity_ids[$opportunity_key]."'";
 	//$db->query($query, true, "unable to create seed links between opportunities and contacts");
 
-	$query = "insert into contpotentialrel ( contactid, potentialid ) values (".$contact->id.",".$opportunity_ids[$opportunity_key].")";
+	$query = "insert into vtiger_contpotentialrel ( contactid, vtiger_potentialid ) values (".$contact->id.",".$opportunity_ids[$opportunity_key].")";
 	$db->query($query);
 
-//	$adb->println("PSD Contact [".$contact->id."] - account[".$account_ids[$account_key]."] - potential[".$opportunity_ids[$opportunity_key]."]");
+//	$adb->println("PSD Contact [".$contact->id."] - vtiger_account[".$account_ids[$account_key]."] - vtiger_potential[".$opportunity_ids[$opportunity_key]."]");
 
 	//Create new tasks
 	/*$task = new Task();
@@ -396,7 +396,7 @@
 
 }
 
-// Temp fix since user is not logged in while populating data updating creatorid in crmentity - GS
+// Temp fix since user is not logged in while populating data updating creatorid in vtiger_crmentity - GS
 
 
 //Populating Vendor Data
@@ -544,7 +544,7 @@
 http://support.microsoft.com/default.aspx?scid=kb%3BEN-US%3B263074
 
 If you want to continue working with vtiger Outlook Plug-in, select the Allow access for check box and select the time from drop-down box.",
-	" Since, vtigerCRM & all plugins are open source, it is not signed up with third party vendors and IE will ask to download even though the plugin are not signed.
+	" Since, vtigerCRM & all plugins are open source, it is not signed up with third party vtiger_vendors and IE will ask to download even though the plugin are not signed.
 
 This message if produced by Microsoft Windows XP. I English Windows XP with the SP2 and the last updates. I told IE to accept installation of the ActiveX, but after it, this message has appeared. Provably there is a place where to tall to WinXP to not validate if the code is signed... but I don\'t know where.
 
@@ -600,7 +600,7 @@
 	$quote_ids[] = $quote->id;
 
 	$product_key = array_rand($product_ids); 
-	$query = "insert into quotesproductrel ( quoteid, productid, quantity, listprice ) values (".$quote->id.",".$product_ids[$product_key].",10,2999.000 )";
+	$query = "insert into vtiger_quotesproductrel ( quoteid, productid, quantity, listprice ) values (".$quote->id.",".$product_ids[$product_key].",10,2999.000 )";
 	$db->query($query);
 }
 
@@ -633,7 +633,7 @@
 	$salesorder_ids[] = $so->id;
 	
 	$product_key = array_rand($product_ids);
-        $query = "insert into soproductrel ( salesorderid, productid, quantity, listprice ) values (".$so->id.",".$product_ids[$product_key].",12,499.000 )";
+        $query = "insert into vtiger_soproductrel ( vtiger_salesorderid, productid, quantity, listprice ) values (".$so->id.",".$product_ids[$product_key].",12,499.000 )";
         $db->query($query);
 
 }
@@ -668,7 +668,7 @@
 	$purchaseorder_ids[] = $po->id;
 
 	$product_key = array_rand($product_ids);
-        $query = "insert into poproductrel ( purchaseorderid, productid, quantity, listprice ) values (".$po->id.",".$product_ids[$product_key].",15,1299.000 )";
+        $query = "insert into vtiger_poproductrel ( vtiger_purchaseorderid, productid, quantity, listprice ) values (".$po->id.",".$product_ids[$product_key].",15,1299.000 )";
         $db->query($query);
 
 }
@@ -701,16 +701,16 @@
 	if ($i > 3)
 	{
 		$freetag = $adb->getUniqueId('freetags');
-		$query = "insert into freetags values ($freetag, '$cloudtag[0]', '$cloudtag[0]')";
+		$query = "insert into vtiger_freetags values ($freetag, '$cloudtag[0]', '$cloudtag[0]')";
 		$res_inv = $adb->query($query);
 
 		$date = date('YmdHis'); 
-		$query_tag = "insert into freetagged_objects values ($freetag, 1,".$invoice->id.", $date, 'Invoice')";
+		$query_tag = "insert into vtiger_freetagged_objects values ($freetag, 1,".$invoice->id.", $date, 'Invoice')";
 		$result_inv = $adb->query($query_tag);
 	}
 
 	$product_key = array_rand($product_ids);
-        $query = "insert into invoiceproductrel ( invoiceid, productid, quantity, listprice ) values (".$invoice->id.",".$product_ids[$product_key].",18,269.000 )";
+        $query = "insert into vtiger_invoiceproductrel ( vtiger_invoiceid, productid, quantity, listprice ) values (".$invoice->id.",".$product_ids[$product_key].",18,269.000 )";
         $db->query($query);
 	
 }
@@ -781,7 +781,7 @@
 	$notes_ids[] = $notes ->id;
 	
 	$product_key = array_rand($product_ids);
-        $query = "insert into senotesrel (crmid, notesid) values (".$product_ids[$product_key].", ".$notes->id.")";
+        $query = "insert into vtiger_senotesrel (crmid, vtiger_notesid) values (".$product_ids[$product_key].", ".$notes->id.")";
 	$db->query($query);
 		
 }
@@ -823,11 +823,11 @@
 	if ($i > 3)
 	{
 		$freetag = $adb->getUniqueId('freetags');
-		$query = "insert into freetags values ($freetag, '$cloudtag[3]', '$cloudtag[3]')";
+		$query = "insert into vtiger_freetags values ($freetag, '$cloudtag[3]', '$cloudtag[3]')";
 		$res_tkt = $adb->query($query);
 
 		$date = date('YmdHis'); 
-		$query_tag = "insert into freetagged_objects values ($freetag, 1,".$helpdesk->id.", $date, 'HelpDesk')";
+		$query_tag = "insert into vtiger_freetagged_objects values ($freetag, 1,".$helpdesk->id.", $date, 'HelpDesk')";
 		$result_tkt = $adb->query($query_tag);
 	}
 
@@ -915,7 +915,7 @@
 }
 
 
-$adb->query("update crmentity set smcreatorid=".$assigned_user_id);
+$adb->query("update vtiger_crmentity set smcreatorid=".$assigned_user_id);
 
 $expected_revenue = Array("250000","750000","500000");
 $budget_cost = Array("25000","50000","90000");

Modified: vtigercrm/trunk/modules/Accounts/Account.php
==============================================================================
--- vtigercrm/trunk/modules/Accounts/Account.php (original)
+++ vtigercrm/trunk/modules/Accounts/Account.php Mon Jun 12 14:26:25 2006
@@ -33,23 +33,23 @@
 require_once('modules/Emails/Email.php');
 require_once('include/utils/utils.php');
 
-// Account is used to store account information.
+// Account is used to store vtiger_account information.
 class Account extends CRMEntity {
 	var $log;
 	var $db;
 
 	var $table_name = "account";
-	var $tab_name = Array('crmentity','account','accountbillads','accountshipads','accountscf');
-	var $tab_name_index = Array('crmentity'=>'crmid','account'=>'accountid','accountbillads'=>'accountaddressid','accountshipads'=>'accountaddressid','accountscf'=>'accountid');
-
-	var $entity_table = "crmentity";
-
-	var $billadr_table = "accountbillads";
+	var $tab_name = Array('vtiger_crmentity','vtiger_account','vtiger_accountbillads','vtiger_accountshipads','vtiger_accountscf');
+	var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_account'=>'accountid','vtiger_accountbillads'=>'accountaddressid','vtiger_accountshipads'=>'accountaddressid','vtiger_accountscf'=>'accountid');
+
+	var $entity_table = "vtiger_crmentity";
+
+	var $billadr_table = "vtiger_accountbillads";
 
 	var $object_name = "Accounts";
 	// Mike Crowe Mod --------------------------------------------------------added for general search
-	var $base_table_name = "account";
-	var $cf_table_name = "accountscf";
+	var $base_table_name = "vtiger_account";
+	var $cf_table_name = "vtiger_accountscf";
 
 	var $new_schema = true;
 
@@ -60,13 +60,13 @@
 	var $sortby_fields = Array('accountname','city','website','phone','smownerid');		
 
 
-	// This is the list of fields that are in the lists.
+	// This is the list of vtiger_fields that are in the lists.
 	var $list_fields = Array(
-			'Account Name'=>Array('account'=>'accountname'),
-			'City'=>Array('accountbillads'=>'city'), 
-			'Website'=>Array('account'=>'website'),
-			'Phone'=>Array('account'=> 'phone'),
-			'Assigned To'=>Array('crmentity'=>'smownerid')
+			'Account Name'=>Array('vtiger_account'=>'accountname'),
+			'City'=>Array('vtiger_accountbillads'=>'city'), 
+			'Website'=>Array('vtiger_account'=>'website'),
+			'Phone'=>Array('vtiger_account'=> 'phone'),
+			'Assigned To'=>Array('vtiger_crmentity'=>'smownerid')
 			);
 
 	var $list_fields_name = Array(
@@ -79,8 +79,8 @@
 	var $list_link_field= 'accountname';
 
 	var $search_fields = Array(
-			'Account Name'=>Array('account'=>'accountname'),
-			'City'=>Array('accountbillads'=>'city'), 
+			'Account Name'=>Array('vtiger_account'=>'accountname'),
+			'City'=>Array('vtiger_accountbillads'=>'city'), 
 			);
 
 	var $search_fields_name = Array(
@@ -88,7 +88,7 @@
 			'City'=>'bill_city',
 			);
 
-	// This is the list of fields that are required.
+	// This is the list of vtiger_fields that are required.
 	var $required_fields =  array("accountname"=>1);
 
 	//Added these variables which are used as default order by and sortorder in ListView
@@ -149,21 +149,21 @@
 		$returnset = '&return_module=Accounts&return_action=DetailView&return_id='.$id;
 
 		//SQL
-		$query = "SELECT contactdetails.*,
-				crmentity.crmid,
-                        	crmentity.smownerid,
-				users.user_name
-			FROM contactdetails
-			INNER JOIN crmentity
-				ON crmentity.crmid = 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 crmentity.deleted = 0
-			AND contactdetails.accountid = ".$id;
+		$query = "SELECT vtiger_contactdetails.*,
+			vtiger_crmentity.crmid,
+                        vtiger_crmentity.smownerid,
+			vtiger_users.user_name
+			FROM vtiger_contactdetails
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_contactdetails.contactid
+			LEFT JOIN vtiger_contactgrouprelation
+				ON vtiger_contactdetails.contactid = vtiger_contactgrouprelation.contactid
+			LEFT JOIN vtiger_groups
+				ON vtiger_groups.groupname = vtiger_contactgrouprelation.groupname
+			LEFT JOIN vtiger_users
+				ON vtiger_crmentity.smownerid = vtiger_users.id
+			WHERE vtiger_crmentity.deleted = 0
+			AND vtiger_contactdetails.accountid = ".$id;
 		$log->debug("Exiting get_contacts method ...");
 		return GetRelatedList('Accounts','Contacts',$focus,$query,$button,$returnset);
 	}
@@ -188,23 +188,23 @@
 		}
 		$returnset = '&return_module=Accounts&return_action=DetailView&return_id='.$id;
 
-		$query = "SELECT potential.potentialid, potential.accountid,
-				potential.potentialname, potential.sales_stage,
-				potential.potentialtype, potential.amount,
-				potential.closingdate, potential.potentialtype,
-				users.user_name,
-				crmentity.crmid, crmentity.smownerid
-			FROM potential
-			INNER JOIN crmentity
-				ON crmentity.crmid = potential.potentialid
-			LEFT JOIN users
-				ON crmentity.smownerid = users.id
-			LEFT JOIN potentialgrouprelation
-				ON potential.potentialid = potentialgrouprelation.potentialid
-			LEFT JOIN groups
-				ON groups.groupname = potentialgrouprelation.groupname
-			WHERE crmentity.deleted = 0
-			AND potential.accountid = ".$id;
+		$query = "SELECT vtiger_potential.potentialid, vtiger_potential.accountid,
+			vtiger_potential.potentialname, vtiger_potential.sales_stage,
+			vtiger_potential.potentialtype, vtiger_potential.amount,
+			vtiger_potential.closingdate, vtiger_potential.potentialtype,
+			vtiger_users.user_name,
+			vtiger_crmentity.crmid, vtiger_crmentity.smownerid
+			FROM vtiger_potential
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_potential.potentialid
+			LEFT JOIN vtiger_users
+				ON vtiger_crmentity.smownerid = vtiger_users.id
+			LEFT JOIN vtiger_potentialgrouprelation
+				ON vtiger_potential.potentialid = vtiger_potentialgrouprelation.potentialid
+			LEFT JOIN vtiger_groups
+				ON vtiger_groups.groupname = vtiger_potentialgrouprelation.groupname
+			WHERE vtiger_crmentity.deleted = 0
+			AND vtiger_potential.accountid = ".$id;
 		$log->debug("Exiting get_opportunities method ...");
 
 		return GetRelatedList('Accounts','Potentials',$focus,$query,$button,$returnset);
@@ -231,42 +231,42 @@
 		}
 		$returnset = '&return_module=Accounts&return_action=DetailView&return_id='.$id;
 
-		$query = "SELECT activity.*,
-				seactivityrel.*,
-				contactdetails.contactid, contactdetails.lastname,
-				contactdetails.firstname,
-				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."
+		$query = "SELECT vtiger_activity.*,
+			vtiger_seactivityrel.*,
+			vtiger_contactdetails.contactid, vtiger_contactdetails.lastname,
+			vtiger_contactdetails.firstname,
+			vtiger_crmentity.crmid, vtiger_crmentity.smownerid,
+			vtiger_crmentity.modifiedtime,
+			vtiger_users.user_name,
+			vtiger_recurringevents.recurringtype
+			FROM vtiger_activity
+			INNER JOIN vtiger_seactivityrel
+				ON vtiger_seactivityrel.activityid = vtiger_activity.activityid
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_activity.activityid
+			LEFT JOIN vtiger_cntactivityrel
+				ON vtiger_cntactivityrel.activityid = vtiger_activity.activityid
+			LEFT JOIN vtiger_contactdetails
+				ON vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid
+			LEFT JOIN vtiger_users
+				ON vtiger_users.id = vtiger_crmentity.smownerid
+			LEFT OUTER JOIN vtiger_recurringevents
+				ON vtiger_recurringevents.activityid = vtiger_activity.activityid
+			LEFT JOIN vtiger_activitygrouprelation
+				ON vtiger_activitygrouprelation.activityid = vtiger_crmentity.crmid
+			LEFT JOIN vtiger_groups
+				ON vtiger_groups.groupname = vtiger_activitygrouprelation.groupname
+			WHERE vtiger_seactivityrel.crmid = ".$id."
 			AND (activitytype='Task'
-				OR activitytype='Call'
-				OR activitytype='Meeting')
-			AND crmentity.deleted = 0
-			AND ((activity.status IS NOT NULL
-					AND activity.status != 'Completed')
-				AND (activity.status IS NOT NULL
-					AND activity.status != 'Deferred')
-				OR (activity.eventstatus !=''
-					AND  activity.eventstatus != 'Held'))";
+				OR vtiger_activitytype='Call'
+				OR vtiger_activitytype='Meeting')
+			AND vtiger_crmentity.deleted = 0
+			AND ((vtiger_activity.status IS NOT NULL
+					AND vtiger_activity.status != 'Completed')
+				AND (vtiger_activity.status IS NOT NULL
+					AND vtiger_activity.status != 'Deferred')
+				OR (vtiger_activity.eventstatus !=''
+					AND  vtiger_activity.eventstatus != 'Held'))";
 		$log->debug("Exiting get_activities method ...");
 		return GetRelatedList('Accounts','Activities',$focus,$query,$button,$returnset);
 
@@ -276,37 +276,37 @@
 	{
 		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, crmentity.createdtime,
-				crmentity.description,
-				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 activitygrouprelation
-				ON activitygrouprelation.activityid = activity.activityid
-			LEFT JOIN groups
-				ON groups.groupname = activitygrouprelation.groupname
-			INNER JOIN users
-				ON crmentity.smcreatorid = users.id
-			WHERE (activity.activitytype = 'Meeting'
-				OR activity.activitytype = 'Call'
-				OR activity.activitytype = 'Task')
-			AND (activity.status = 'Completed'
-				OR activity.status = 'Deferred'
-				OR (activity.eventstatus = 'Held'
-					AND activity.eventstatus != ''))
-			AND seactivityrel.crmid = ".$id;
+		$query = "SELECT vtiger_activity.activityid, vtiger_activity.subject,
+			vtiger_activity.status, vtiger_activity.eventstatus,
+			vtiger_activity.activitytype,
+			vtiger_contactdetails.contactid, vtiger_contactdetails.firstname,
+			vtiger_contactdetails.lastname,
+			vtiger_crmentity.modifiedtime, vtiger_crmentity.createdtime,
+			vtiger_crmentity.description,
+			vtiger_users.user_name
+			FROM vtiger_activity
+			INNER JOIN vtiger_seactivityrel
+				ON vtiger_seactivityrel.activityid = vtiger_activity.activityid
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_activity.activityid
+			LEFT JOIN vtiger_cntactivityrel
+				ON vtiger_cntactivityrel.activityid = vtiger_activity.activityid 
+			LEFT JOIN vtiger_contactdetails
+				ON vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid
+			LEFT JOIN vtiger_activitygrouprelation
+				ON vtiger_activitygrouprelation.activityid = vtiger_activity.activityid
+			LEFT JOIN vtiger_groups
+				ON vtiger_groups.groupname = vtiger_activitygrouprelation.groupname
+			INNER JOIN vtiger_users
+				ON vtiger_crmentity.smcreatorid = vtiger_users.id
+			WHERE (vtiger_activity.activitytype = 'Meeting'
+				OR vtiger_activity.activitytype = 'Call'
+				OR vtiger_activity.activitytype = 'Task')
+			AND (vtiger_activity.status = 'Completed'
+				OR vtiger_activity.status = 'Deferred'
+				OR (vtiger_activity.eventstatus = 'Held'
+					AND vtiger_activity.eventstatus != ''))
+			AND vtiger_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('Accounts',$query,$id);
@@ -317,49 +317,49 @@
 		 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
-		$query = "SELECT notes.title, notes.notecontent AS description,
-				notes.filename, notes.notesid AS crmid,
+		// Desc: Inserted crm2.createdtime, vtiger_notes.notecontent description, vtiger_users.user_name
+		// Inserted inner join vtiger_users on crm2.smcreatorid= vtiger_users.id
+		$query = "SELECT vtiger_notes.title, vtiger_notes.notecontent AS description,
+			vtiger_notes.filename, vtiger_notes.notesid AS crmid,
 				'Notes      ' AS ActivityType,
-				attachments.type AS FileType,
+			vtiger_attachments.type AS FileType,
 				crm2.modifiedtime AS lastmodified, crm2.createdtime,
-				seattachmentsrel.attachmentsid,
-				users.user_name
-			FROM notes
-			INNER JOIN senotesrel
-				ON senotesrel.notesid = notes.notesid
-			INNER JOIN crmentity
-				ON crmentity.crmid = senotesrel.crmid
-			INNER JOIN crmentity crm2
-				ON crm2.crmid = notes.notesid
+			vtiger_seattachmentsrel.attachmentsid,
+			vtiger_users.user_name
+			FROM vtiger_notes
+			INNER JOIN vtiger_senotesrel
+				ON vtiger_senotesrel.notesid = vtiger_notes.notesid
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_senotesrel.crmid
+			INNER JOIN vtiger_crmentity crm2
+				ON crm2.crmid = vtiger_notes.notesid
 				AND crm2.deleted = 0
-			LEFT JOIN seattachmentsrel
-				ON seattachmentsrel.crmid = notes.notesid
-			LEFT JOIN attachments
-				ON seattachmentsrel.attachmentsid = attachments.attachmentsid
-			INNER JOIN users
-				ON crm2.smcreatorid = users.id
-			WHERE crmentity.crmid = ".$id."
+			LEFT JOIN vtiger_seattachmentsrel
+				ON vtiger_seattachmentsrel.crmid = vtiger_notes.notesid
+			LEFT JOIN vtiger_attachments
+				ON vtiger_seattachmentsrel.attachmentsid = vtiger_attachments.attachmentsid
+			INNER JOIN vtiger_users
+				ON crm2.smcreatorid = vtiger_users.id
+			WHERE vtiger_crmentity.crmid = ".$id."
 		 UNION ALL
-			SELECT attachments.description AS title, attachments.description,
-				attachments.name AS filename,
-				seattachmentsrel.attachmentsid AS crmid,
+			SELECT vtiger_attachments.description AS title, vtiger_attachments.description,
+			vtiger_attachments.name AS filename,
+			vtiger_seattachmentsrel.attachmentsid AS crmid,
 				'Attachments' AS ActivityType,
-				attachments.type AS FileType,
+			vtiger_attachments.type AS FileType,
 				crm2.modifiedtime AS lastmodified, crm2.createdtime,
-				attachments.attachmentsid,
-				users.user_name
-			FROM attachments
-			INNER JOIN seattachmentsrel
-				ON seattachmentsrel.attachmentsid = attachments.attachmentsid
-			INNER JOIN crmentity
-				ON crmentity.crmid = seattachmentsrel.crmid
-			INNER JOIN crmentity crm2
-				ON crm2.crmid = attachments.attachmentsid
-			INNER JOIN users
-				ON crm2.smcreatorid = users.id
-			WHERE crmentity.crmid = ".$id."
+			vtiger_attachments.attachmentsid,
+			vtiger_users.user_name
+			FROM vtiger_attachments
+			INNER JOIN vtiger_seattachmentsrel
+				ON vtiger_seattachmentsrel.attachmentsid = vtiger_attachments.attachmentsid
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_seattachmentsrel.crmid
+			INNER JOIN vtiger_crmentity crm2
+				ON crm2.crmid = vtiger_attachments.attachmentsid
+			INNER JOIN vtiger_users
+				ON crm2.smcreatorid = vtiger_users.id
+			WHERE vtiger_crmentity.crmid = ".$id."
 			ORDER BY createdtime DESC";
 		$log->debug("Exiting get_attachments method ...");
 		return getAttachmentsAndNotes('Accounts',$query,$id);
@@ -381,27 +381,27 @@
 		$returnset = '&return_module=Accounts&return_action=DetailView&return_id='.$id;
 
 
-		$query = "SELECT users.user_name,
-				groups.groupname,
-				crmentity.*,
-				quotes.*,
-				potential.potentialname,
-				account.accountname
-			FROM quotes
-			INNER JOIN crmentity
-				ON crmentity.crmid = quotes.quoteid
-			LEFT OUTER JOIN account
-				ON account.accountid = quotes.accountid
-			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
-			LEFT JOIN users
-				ON crmentity.smownerid = users.id
-			WHERE crmentity.deleted = 0
-			AND account.accountid = ".$id;
+		$query = "SELECT vtiger_users.user_name,
+			vtiger_groups.groupname,
+			vtiger_crmentity.*,
+			vtiger_quotes.*,
+			vtiger_potential.potentialname,
+			vtiger_account.accountname
+			FROM vtiger_quotes
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_quotes.quoteid
+			LEFT OUTER JOIN vtiger_account
+				ON vtiger_account.accountid = vtiger_quotes.accountid
+			LEFT OUTER JOIN vtiger_potential
+				ON vtiger_potential.potentialid = vtiger_quotes.potentialid
+			LEFT JOIN vtiger_quotegrouprelation
+				ON vtiger_quotes.quoteid = vtiger_quotegrouprelation.quoteid
+			LEFT JOIN vtiger_groups
+				ON vtiger_groups.groupname = vtiger_quotegrouprelation.groupname
+			LEFT JOIN vtiger_users
+				ON vtiger_crmentity.smownerid = vtiger_users.id
+			WHERE vtiger_crmentity.deleted = 0
+			AND vtiger_account.accountid = ".$id;
 		$log->debug("Exiting get_quotes method ...");
 		return GetRelatedList('Accounts','Quotes',$focus,$query,$button,$returnset);
 	}
@@ -421,27 +421,27 @@
 		}
 		$returnset = '&return_module=Accounts&return_action=DetailView&return_id='.$id;
 
-		$query = "SELECT users.user_name,
-				groups.groupname,
-				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
-			LEFT OUTER JOIN salesorder
-				ON salesorder.salesorderid = invoice.salesorderid
-			LEFT JOIN invoicegrouprelation
-				ON invoice.invoiceid = invoicegrouprelation.invoiceid
-			LEFT JOIN groups
-				ON groups.groupname = invoicegrouprelation.groupname
-			LEFT JOIN users
-				ON crmentity.smownerid = users.id
-			WHERE crmentity.deleted = 0
-			AND account.accountid = ".$id;
+		$query = "SELECT vtiger_users.user_name,
+			vtiger_groups.groupname,
+			vtiger_crmentity.*,
+			vtiger_invoice.*,
+			vtiger_account.accountname,
+			vtiger_salesorder.subject AS salessubject
+			FROM vtiger_invoice
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_invoice.invoiceid
+			LEFT OUTER JOIN vtiger_account
+				ON vtiger_account.accountid = vtiger_invoice.accountid
+			LEFT OUTER JOIN vtiger_salesorder
+				ON vtiger_salesorder.salesorderid = vtiger_invoice.salesorderid
+			LEFT JOIN vtiger_invoicegrouprelation
+				ON vtiger_invoice.invoiceid = vtiger_invoicegrouprelation.invoiceid
+			LEFT JOIN vtiger_groups
+				ON vtiger_groups.groupname = vtiger_invoicegrouprelation.groupname
+			LEFT JOIN vtiger_users
+				ON vtiger_crmentity.smownerid = vtiger_users.id
+			WHERE vtiger_crmentity.deleted = 0
+			AND vtiger_account.accountid = ".$id;
 		$log->debug("Exiting get_invoices method ...");
 		return GetRelatedList('Accounts','Invoice',$focus,$query,$button,$returnset);
 	}
@@ -462,27 +462,27 @@
 
 		$returnset = '&return_module=Accounts&return_action=DetailView&return_id='.$id;
 
-		$query = "SELECT crmentity.*,
-				salesorder.*,
-				quotes.subject AS quotename,
-				account.accountname,
-				users.user_name,
-				groups.groupname
-			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
-			LEFT JOIN users
-				ON crmentity.smownerid = users.id
-			WHERE crmentity.deleted = 0
-			AND salesorder.accountid = ".$id;
+		$query = "SELECT vtiger_crmentity.*,
+			vtiger_salesorder.*,
+			vtiger_quotes.subject AS quotename,
+			vtiger_account.accountname,
+			vtiger_users.user_name,
+			vtiger_groups.groupname
+			FROM vtiger_salesorder
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_salesorder.salesorderid
+			LEFT OUTER JOIN vtiger_quotes
+				ON vtiger_quotes.quoteid = vtiger_salesorder.quoteid
+			LEFT OUTER JOIN vtiger_account
+				ON vtiger_account.accountid = vtiger_salesorder.accountid
+			LEFT JOIN vtiger_sogrouprelation
+				ON vtiger_salesorder.salesorderid = vtiger_sogrouprelation.salesorderid
+			LEFT JOIN vtiger_groups
+				ON vtiger_groups.groupname = vtiger_sogrouprelation.groupname
+			LEFT JOIN vtiger_users
+				ON vtiger_crmentity.smownerid = vtiger_users.id
+			WHERE vtiger_crmentity.deleted = 0
+			AND vtiger_salesorder.accountid = ".$id;
 		$log->debug("Exiting get_salesorder method ...");		
 		return GetRelatedList('Accounts','SalesOrder',$focus,$query,$button,$returnset);
 	}
@@ -498,23 +498,23 @@
 		$button .= '<td valign="bottom" align="right"><input title="New TICKET" accessyKey="F" class="button" onclick="this.form.action.value=\'EditView\';this.form.module.value=\'HelpDesk\'" type="submit" name="button" value="'.$app_strings['LBL_NEW_TICKET'].'">&nbsp;</td>';
 		$returnset = '&return_module=Accounts&return_action=DetailView&return_id='.$id;
 
-		$query = "SELECT users.user_name, users.id,
-				troubletickets.title, troubletickets.ticketid AS crmid,
-				troubletickets.status, troubletickets.priority,
-				troubletickets.parent_id,
-				crmentity.smownerid, crmentity.modifiedtime
-			FROM troubletickets
-			INNER JOIN crmentity
-				ON crmentity.crmid = troubletickets.ticketid
-			LEFT JOIN account
-				ON account.accountid = 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 account.accountid = ".$id ;
+		$query = "SELECT vtiger_users.user_name, vtiger_users.id,
+			vtiger_troubletickets.title, vtiger_troubletickets.ticketid AS crmid,
+			vtiger_troubletickets.status, vtiger_troubletickets.priority,
+			vtiger_troubletickets.parent_id,
+			vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime
+			FROM vtiger_troubletickets
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_troubletickets.ticketid
+			LEFT JOIN vtiger_account
+				ON vtiger_account.accountid = vtiger_troubletickets.parent_id
+			LEFT JOIN vtiger_users
+				ON vtiger_users.id=vtiger_crmentity.smownerid
+			LEFT JOIN vtiger_ticketgrouprelation
+				ON vtiger_troubletickets.ticketid = vtiger_ticketgrouprelation.ticketid
+			LEFT JOIN vtiger_groups
+				ON vtiger_groups.groupname = vtiger_ticketgrouprelation.groupname
+			WHERE vtiger_account.accountid = ".$id ;
 		//Appending the security parameter
 		global $current_user;
 		require('user_privileges/user_privileges_'.$current_user->id.'.php');
@@ -527,25 +527,25 @@
 
 		}
 		$query .= " UNION ALL
-			SELECT users.user_name, users.id,
-				troubletickets.title, troubletickets.ticketid AS crmid,
-				troubletickets.status, troubletickets.priority,
-				troubletickets.parent_id,
-				crmentity.smownerid, crmentity.modifiedtime
-			FROM troubletickets
-			INNER JOIN crmentity
-				ON crmentity.crmid = troubletickets.ticketid
-			LEFT JOIN contactdetails
-				ON contactdetails.contactid = troubletickets.parent_id
-			LEFT JOIN account
-				ON account.accountid = contactdetails.accountid
-			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 account.accountid = ".$id;
+			SELECT vtiger_users.user_name, vtiger_users.id,
+			vtiger_troubletickets.title, vtiger_troubletickets.ticketid AS crmid,
+			vtiger_troubletickets.status, vtiger_troubletickets.priority,
+			vtiger_troubletickets.parent_id,
+			vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime
+			FROM vtiger_troubletickets
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_troubletickets.ticketid
+			LEFT JOIN vtiger_contactdetails
+				ON vtiger_contactdetails.contactid = vtiger_troubletickets.parent_id
+			LEFT JOIN vtiger_account
+				ON vtiger_account.accountid = vtiger_contactdetails.accountid
+			LEFT JOIN vtiger_users
+				ON vtiger_users.id = vtiger_crmentity.smownerid
+			LEFT JOIN vtiger_ticketgrouprelation
+				ON vtiger_troubletickets.ticketid = vtiger_ticketgrouprelation.ticketid
+			LEFT JOIN vtiger_groups
+				ON vtiger_groups.groupname = vtiger_ticketgrouprelation.groupname
+			WHERE vtiger_account.accountid = ".$id;
 		$log->debug("Exiting get_tickets method ...");
 		return GetRelatedList('Accounts','HelpDesk',$focus,$query,$button,$returnset);
 	}
@@ -569,19 +569,19 @@
 		}
 		$returnset = '&return_module=Accounts&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
-			FROM products
-			INNER JOIN seproductsrel
-				ON products.productid = seproductsrel.productid
-			INNER JOIN crmentity
-				ON crmentity.crmid = products.productid
-			INNER JOIN account
-				ON account.accountid = seproductsrel.crmid
-			WHERE account.accountid = ".$id."
-			AND crmentity.deleted = 0";
+		$query = "SELECT vtiger_products.productid, vtiger_products.productname,
+			vtiger_products.productcode, vtiger_products.commissionrate,
+			vtiger_products.qty_per_unit, vtiger_products.unit_price,
+			vtiger_crmentity.crmid, vtiger_crmentity.smownerid
+			FROM vtiger_products
+			INNER JOIN vtiger_seproductsrel
+				ON vtiger_products.productid = vtiger_seproductsrel.productid
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_products.productid
+			INNER JOIN vtiger_account
+				ON vtiger_account.accountid = vtiger_seproductsrel.crmid
+			WHERE vtiger_account.accountid = ".$id."
+			AND vtiger_crmentity.deleted = 0";
 		$log->debug("Exiting get_products method ...");
 		return GetRelatedList('Accounts','Products',$focus,$query,$button,$returnset);
 	}
@@ -595,62 +595,62 @@
 		{
 
 			$query = $this->constructCustomQueryAddendum('accountscf','Accounts') . "
-					account.*,
+				vtiger_account.*,
 					".$this->entity_table.".*,
-					accountbillads.city AS billing_city,
-					accountbillads.country AS billing_country,
-					accountbillads.code AS billing_code,
-					accountbillads.state AS billing_state,
-					accountbillads.street AS billing_street,
-					accountshipads.city AS shipping_city,
-					accountshipads.country AS shipping_country,
-					accountshipads.code AS shipping_code,
-					accountshipads.state AS shipping_state,
-					accountshipads.street AS shipping_street,
-					users.user_name,
-					users.status AS user_status
+				vtiger_accountbillads.city AS billing_city,
+				vtiger_accountbillads.country AS billing_country,
+				vtiger_accountbillads.code AS billing_code,
+				vtiger_accountbillads.state AS billing_state,
+				vtiger_accountbillads.street AS billing_street,
+				vtiger_accountshipads.city AS shipping_city,
+				vtiger_accountshipads.country AS shipping_country,
+				vtiger_accountshipads.code AS shipping_code,
+				vtiger_accountshipads.state AS shipping_state,
+				vtiger_accountshipads.street AS shipping_street,
+				vtiger_users.user_name,
+				vtiger_users.status AS user_status
 				FROM ".$this->entity_table."
-				INNER JOIN account
-					ON crmentity.crmid = account.accountid
-				LEFT JOIN accountbillads
-					ON account.accountid = accountbillads.accountaddressid
-				LEFT JOIN accountshipads
-					ON account.accountid = accountshipads.accountaddressid
-				LEFT JOIN accountscf 
-					ON accountscf.accountid = account.accountid
-				LEFT JOIN users
-					ON crmentity.smownerid = users.id ";
+				INNER JOIN vtiger_account
+					ON vtiger_crmentity.crmid = vtiger_account.accountid
+				LEFT JOIN vtiger_accountbillads
+					ON vtiger_account.accountid = vtiger_accountbillads.accountaddressid
+				LEFT JOIN vtiger_accountshipads
+					ON vtiger_account.accountid = vtiger_accountshipads.accountaddressid
+				LEFT JOIN vtiger_accountscf 
+					ON vtiger_accountscf.accountid = vtiger_account.accountid
+				LEFT JOIN vtiger_users
+					ON vtiger_crmentity.smownerid = vtiger_users.id ";
 
 		}
 		else
 		{
-			$query = "SELECT account.*,
+			$query = "SELECT vtiger_account.*,
 					".$this->entity_table.".*,
-					accountbillads.city AS billing_city,
-					accountbillads.country AS billing_country,
-					accountbillads.code AS billing_code,
-					accountbillads.state AS billing_state,
-					accountbillads.street AS billing_street,
-					accountshipads.city AS shipping_city,
-					accountshipads.country AS shipping_country,
-					accountshipads.code AS shipping_code,
-					accountshipads.state AS shipping_state,
-					accountshipads.street AS shipping_street,
-					users.user_name,
-					users.status AS user_status
+				vtiger_accountbillads.city AS billing_city,
+				vtiger_accountbillads.country AS billing_country,
+				vtiger_accountbillads.code AS billing_code,
+				vtiger_accountbillads.state AS billing_state,
+				vtiger_accountbillads.street AS billing_street,
+				vtiger_accountshipads.city AS shipping_city,
+				vtiger_accountshipads.country AS shipping_country,
+				vtiger_accountshipads.code AS shipping_code,
+				vtiger_accountshipads.state AS shipping_state,
+				vtiger_accountshipads.street AS shipping_street,
+				vtiger_users.user_name,
+				vtiger_users.status AS user_status
 				FROM ".$this->entity_table."
-				INNER JOIN account
-					ON crmentity.crmid = account.accountid
-				LEFT JOIN accountbillads
-					ON account.accountid = accountbillads.accountaddressid
-				LEFT JOIN accountshipads
-					ON account.accountid = accountshipads.accountaddressid
-				LEFT JOIN users
-					ON crmentity.smownerid = users.id ";
-		}
-
-		$where_auto = " users.status = 'Active'
-			AND crmentity.deleted = 0 ";
+				INNER JOIN vtiger_account
+					ON vtiger_crmentity.crmid = vtiger_account.accountid
+				LEFT JOIN vtiger_accountbillads
+					ON vtiger_account.accountid = vtiger_accountbillads.accountaddressid
+				LEFT JOIN vtiger_accountshipads
+					ON vtiger_account.accountid = vtiger_accountshipads.accountaddressid
+				LEFT JOIN vtiger_users
+					ON vtiger_crmentity.smownerid = vtiger_users.id ";
+		}
+
+		$where_auto = " vtiger_users.status = 'Active'
+			AND vtiger_crmentity.deleted = 0 ";
 
 		if($where != "")
 			$query .= "WHERE ($where) AND ".$where_auto;
@@ -669,7 +669,7 @@
 	{
 		global $log;
                 $log->debug("Entering getColumnNames_Acnt() method ...");
-		$sql1 = "SELECT fieldlabel FROM field WHERE tabid = 6";
+		$sql1 = "SELECT vtiger_fieldlabel FROM vtiger_field WHERE vtiger_tabid = 6";
 		$result = $this->db->query($sql1);
 		$numRows = $this->db->num_rows($result);
 		for($i=0; $i < $numRows;$i++)

Modified: vtigercrm/trunk/modules/Accounts/Forms.php
==============================================================================
--- vtigercrm/trunk/modules/Accounts/Forms.php (original)
+++ vtigercrm/trunk/modules/Accounts/Forms.php Mon Jun 12 14:26:25 2006
@@ -27,7 +27,7 @@
 require_once('include/utils/utils.php'); //new
 
 /**
- * Create HTML form to enter a new record with the minimum necessary fields.
+ * Create HTML form to enter a new record with the minimum necessary vtiger_fields.
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
  * All Rights Reserved.
  * Contributor(s): ______________________________________..
@@ -52,7 +52,7 @@
 $qcreate_form = get_left_form_header($mod_strings['LBL_NEW_FORM_TITLE']);
 
 
-$qcreate_get_field="select * from field where tabid=6 and quickcreate=0 order by quickcreatesequence";
+$qcreate_get_field="select * from vtiger_field where vtiger_tabid=6 and quickcreate=0 order by quickcreatesequence";
 $qcreate_get_result=$adb->query($qcreate_get_field);
 $qcreate_get_noofrows=$adb->num_rows($qcreate_get_result);
 
@@ -138,9 +138,9 @@
 $qcreate_form.='</form>';
 $qcreate_form.='<script type="text/javascript">
 		
-	var fieldname = new Array('.$fieldName.')
-	var fieldlabel = new Array('.$fieldLabel.')
-	var fielddatatype = new Array('.$fldDataType.')
+	var vtiger_fieldname = new Array('.$fieldName.')
+	var vtiger_fieldlabel = new Array('.$fieldLabel.')
+	var vtiger_fielddatatype = new Array('.$fldDataType.')
 
 		</script>';
 

Modified: vtigercrm/trunk/modules/Accounts/ListViewTop.php
==============================================================================
--- vtigercrm/trunk/modules/Accounts/ListViewTop.php (original)
+++ vtigercrm/trunk/modules/Accounts/ListViewTop.php Mon Jun 12 14:26:25 2006
@@ -21,7 +21,7 @@
  ********************************************************************************/
 function getTopAccounts()
 {
-	$log = LoggerManager::getLogger('top accounts_list');
+	$log = LoggerManager::getLogger('top vtiger_accounts_list');
 	$log->debug("Entering getTopAccounts() method ...");
 	require_once("data/Tracker.php");
 	require_once('modules/Potentials/Opportunity.php');
@@ -33,7 +33,7 @@
 	global $current_user;
 	$current_module_strings = return_module_language($current_language, "Accounts");
 
-	$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.accountid, account.accountname, account.tickersymbol order by amount desc;";
+	$list_query = "select vtiger_account.accountid, vtiger_account.accountname, vtiger_account.tickersymbol, sum(vtiger_potential.amount) as amount from vtiger_potential inner join vtiger_crmentity on (vtiger_potential.potentialid=vtiger_crmentity.crmid) inner join vtiger_account on (vtiger_potential.accountid=vtiger_account.accountid) where vtiger_crmentity.deleted=0 AND vtiger_crmentity.smownerid='".$current_user->id."' and vtiger_potential.sales_stage <> '".$app_strings['LBL_CLOSE_WON']."' and vtiger_potential.sales_stage <> '".$app_strings['LBL_CLOSE_LOST']."' group by vtiger_account.accountid, vtiger_account.accountname, vtiger_account.tickersymbol order by amount desc;";
 	$list_result=$adb->query($list_query);
 	$open_accounts_list = array();
 	$noofrows = min($adb->num_rows($list_result),7);

Modified: vtigercrm/trunk/modules/Accounts/Merge.php
==============================================================================
--- vtigercrm/trunk/modules/Accounts/Merge.php (original)
+++ vtigercrm/trunk/modules/Accounts/Merge.php Mon Jun 12 14:26:25 2006
@@ -39,7 +39,7 @@
 }
 //get the particular file from db and store it in the local hard disk.
 //store the path to the location where the file is stored and pass it  as parameter to the method 
-$sql = "select filename,data,filesize from wordtemplates where templateid=".$templateid;
+$sql = "select filename,data,filesize from vtiger_wordtemplates where templateid=".$templateid;
 
 $result = $adb->query($sql);
 $temparray = $adb->fetch_array($result);
@@ -75,8 +75,8 @@
 
 //echo $mass_merge;
 //die;
-//for setting accountid=0 for the contacts which are deleted
-$ct_query = "select crmid from crmentity where setype='Contacts' and deleted=1";
+//for setting vtiger_accountid=0 for the contacts which are deleted
+$ct_query = "select crmid from vtiger_crmentity where setype='Contacts' and deleted=1";
 $result = $adb->query($ct_query);
 
 while($row = $adb->fetch_array($result))
@@ -87,13 +87,13 @@
 if(count($deleted_id) > 0)
 {
 	$deleted_id = implode(",",$deleted_id);
-	$update_query = "update contactdetails set accountid = 0 where contactid in (".$deleted_id.")";
+	$update_query = "update vtiger_contactdetails set vtiger_accountid = 0 where contactid in (".$deleted_id.")";
 	$result = $adb->query($update_query);
 }
-//End setting accountid=0 for the contacts which are deleted
+//End setting vtiger_accountid=0 for the contacts which are deleted
 
 //<<<<<<<<<<<<<<<<header for csv and select columns for query>>>>>>>>>>>>>>>>>>>>>>>>
-$query1="select tab.name,field.tablename,field.columnname,field.fieldlabel from field inner join tab on tab.tabid = field.tabid where field.tabid in (4,6) and field.block <> 6 and field.block <> 75 order by field.tablename";
+$query1="select vtiger_tab.name,vtiger_field.tablename,vtiger_field.columnname,vtiger_field.fieldlabel from vtiger_field inner join vtiger_tab on vtiger_tab.tabid = vtiger_field.tabid where vtiger_field.tabid in (4,6) and vtiger_field.block <> 6 and vtiger_field.block <> 75 order by vtiger_field.tablename";
 
 $result = $adb->query($query1);
 $y=$adb->num_rows($result);
@@ -116,7 +116,7 @@
   {
       if($modulename == "Accounts")
       {
-  			$querycolumns[$x] = "concat(users.last_name,' ',users.first_name) as userjoinname,users.first_name,users.last_name,users.user_name,users.yahoo_id,users.title,users.phone_work,users.department,users.phone_mobile,users.phone_other,users.phone_fax,users.email1,users.phone_home,users.email2,users.address_street,users.address_city,users.address_state,users.address_postalcode,users.address_country";
+  			$querycolumns[$x] = "concat(vtiger_users.last_name,' ',vtiger_users.first_name) as userjoinname,vtiger_users.first_name,vtiger_users.last_name,vtiger_users.user_name,vtiger_users.yahoo_id,vtiger_users.title,vtiger_users.phone_work,vtiger_users.department,vtiger_users.phone_mobile,vtiger_users.phone_other,vtiger_users.phone_fax,vtiger_users.email1,vtiger_users.phone_home,vtiger_users.email2,vtiger_users.address_street,vtiger_users.address_city,vtiger_users.address_state,vtiger_users.address_postalcode,vtiger_users.address_country";
       }
   		if($modulename == "Contacts")
       {
@@ -159,22 +159,22 @@
 {
 	$selectcolumns = implode($querycolumns,",");
 
-$query = "select  ".$selectcolumns." from account 
-				inner join crmentity on crmentity.crmid=account.accountid 
-				inner join accountbillads on account.accountid=accountbillads.accountaddressid 
-				inner join accountshipads on account.accountid=accountshipads.accountaddressid 
-				inner join accountscf on account.accountid = accountscf.accountid 
-				left join account as accountAccount on accountAccount.accountid = account.parentid
-				left join users on users.id = crmentity.smownerid
-				left join contactdetails on contactdetails.accountid=account.accountid
-				left join crmentity as crmentityContacts on crmentityContacts.crmid = contactdetails.contactid 
-				left join contactaddress on contactdetails.contactid = contactaddress.contactaddressid 
-				left join contactsubdetails on contactdetails.contactid = contactsubdetails.contactsubscriptionid 
-				left join contactscf on contactdetails.contactid = contactscf.contactid 
-				left join contactdetails as contactdetailsContacts on contactdetailsContacts.contactid = contactdetails.reportsto
-				left join account as accountContacts on accountContacts.accountid = contactdetails.accountid 
-				left join users as usersContacts on usersContacts.id = crmentityContacts.smownerid
-				where crmentity.deleted=0 and (crmentityContacts.deleted=0 || crmentityContacts.deleted is null) and account.accountid in(".$mass_merge.")";
+$query = "select  ".$selectcolumns." from vtiger_account 
+				inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_account.accountid 
+				inner join vtiger_accountbillads on vtiger_account.accountid=vtiger_accountbillads.accountaddressid 
+				inner join vtiger_accountshipads on vtiger_account.accountid=vtiger_accountshipads.accountaddressid 
+				inner join vtiger_accountscf on vtiger_account.accountid = vtiger_accountscf.accountid 
+				left join vtiger_account as vtiger_accountAccount on vtiger_accountAccount.accountid = vtiger_account.parentid
+				left join vtiger_users on vtiger_users.id = vtiger_crmentity.smownerid
+				left join vtiger_contactdetails on vtiger_contactdetails.accountid=vtiger_account.accountid
+				left join vtiger_crmentity as vtiger_crmentityContacts on vtiger_crmentityContacts.crmid = vtiger_contactdetails.contactid 
+				left join vtiger_contactaddress on vtiger_contactdetails.contactid = vtiger_contactaddress.contactaddressid 
+				left join vtiger_contactsubdetails on vtiger_contactdetails.contactid = vtiger_contactsubdetails.contactsubscriptionid 
+				left join vtiger_contactscf on vtiger_contactdetails.contactid = vtiger_contactscf.contactid 
+				left join vtiger_contactdetails as vtiger_contactdetailsContacts on vtiger_contactdetailsContacts.contactid = vtiger_contactdetails.reportsto
+				left join vtiger_account as vtiger_accountContacts on vtiger_accountContacts.accountid = vtiger_contactdetails.accountid 
+				left join vtiger_users as vtiger_usersContacts on vtiger_usersContacts.id = vtiger_crmentityContacts.smownerid
+				where vtiger_crmentity.deleted=0 and (crmentityContacts.deleted=0 || vtiger_crmentityContacts.deleted is null) and vtiger_account.accountid in(".$mass_merge.")";
 //echo $query;
 //die;	
 $result = $adb->query($query);
@@ -209,7 +209,7 @@
 $csvdata = implode($mergevalue,"###");
 }else
 {
-	die("No fields to do Merge");
+	die("No vtiger_fields to do Merge");
 }
 
 $handle = fopen($wordtemplatedownloadpath."datasrc.csv","wb");

Modified: vtigercrm/trunk/modules/Accounts/Popup_picker.php
==============================================================================
--- vtigercrm/trunk/modules/Accounts/Popup_picker.php (original)
+++ vtigercrm/trunk/modules/Accounts/Popup_picker.php Mon Jun 12 14:26:25 2006
@@ -99,9 +99,9 @@
 if($_REQUEST['form'] == 'TasksEditView')
 {
 	$the_javascript  = "<script type='text/javascript' language='JavaScript'>\n";
-	$the_javascript .= "function set_return(account_id, account_name) {\n";
-	$the_javascript .= "	window.opener.document.EditView.parent_name.value = account_name;\n";
-	$the_javascript .= "	window.opener.document.EditView.parent_id.value = account_id;\n";
+	$the_javascript .= "function set_return(account_id, vtiger_account_name) {\n";
+	$the_javascript .= "	window.opener.document.EditView.parent_name.value = vtiger_account_name;\n";
+	$the_javascript .= "	window.opener.document.EditView.parent_id.value = vtiger_account_id;\n";
 	$the_javascript .= "}\n";
 	$the_javascript .= "</script>\n";
 	$button  = "<table cellspacing='0' cellpadding='1' border='0'><form border='0' action='index.php' method='post' name='form' id='form'>\n";
@@ -113,9 +113,9 @@
 elseif($_REQUEST['form'] == 'HelpDeskEditView')
 {
 	$the_javascript  = "<script type='text/javascript' language='JavaScript'>\n";
-	$the_javascript .= "function set_return(account_id, account_name) {\n";
-	$the_javascript .= "	window.opener.document.EditView.parent_name.value = account_name;\n";
-	$the_javascript .= "	window.opener.document.EditView.parent_id.value = account_id;\n";
+	$the_javascript .= "function set_return(account_id, vtiger_account_name) {\n";
+	$the_javascript .= "	window.opener.document.EditView.parent_name.value = vtiger_account_name;\n";
+	$the_javascript .= "	window.opener.document.EditView.parent_id.value = vtiger_account_id;\n";
 	$the_javascript .= "}\n";
 	$the_javascript .= "</script>\n";
 	$button  = "<table cellspacing='0' cellpadding='1' border='0'><form border='0' action='index.php' method='post' name='form' id='form'>\n";
@@ -127,8 +127,8 @@
 elseif(isset($_REQUEST['form_submit']) && $_REQUEST['form'] == 'AccountDetailView' && $_REQUEST['form_submit'] == 'true')
 {
 	$the_javascript  = "<script type='text/javascript' language='JavaScript'>\n";
-	$the_javascript .= "function set_return(account_id, account_name) {\n";
-	$the_javascript .= "	window.opener.document.DetailView.member_id.value = account_id; \n";
+	$the_javascript .= "function set_return(account_id, vtiger_account_name) {\n";
+	$the_javascript .= "	window.opener.document.DetailView.member_id.value = vtiger_account_id; \n";
 	$the_javascript .= "	window.opener.document.DetailView.return_module.value = window.opener.document.DetailView.module.value; \n";
 	$the_javascript .= "	window.opener.document.DetailView.return_action.value = 'DetailView'; \n";
 	$the_javascript .= "	window.opener.document.DetailView.return_id.value = window.opener.document.DetailView.record.value; \n";
@@ -144,9 +144,9 @@
 elseif ($_REQUEST['form'] == 'EditView') 
 {
 	$the_javascript  = "<script type='text/javascript' language='JavaScript'>\n";
-	$the_javascript .= "function set_return(account_id, account_name) {\n";
-	$the_javascript .= "	window.opener.document.EditView.account_name.value = account_name;\n";
-	$the_javascript .= "	window.opener.document.EditView.account_id.value = account_id;\n";
+	$the_javascript .= "function set_return(account_id, vtiger_account_name) {\n";
+	$the_javascript .= "	window.opener.document.EditView.account_name.value = vtiger_account_name;\n";
+	$the_javascript .= "	window.opener.document.EditView.account_id.value = vtiger_account_id;\n";
 	$the_javascript .= "}\n";
 	$the_javascript .= "</script>\n";
 	$button  = "<table cellspacing='0' cellpadding='1' border='0'><form border='0' action='index.php' method='post' name='form' id='form'>\n";

Modified: vtigercrm/trunk/modules/Accounts/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Accounts/Save.php (original)
+++ vtigercrm/trunk/modules/Accounts/Save.php Mon Jun 12 14:26:25 2006
@@ -98,13 +98,13 @@
 if($_REQUEST['return_viewname'] == '') $return_viewname='0';
 if($_REQUEST['return_viewname'] != '')$return_viewname=$_REQUEST['return_viewname'];
 
-//Send notification mail to the assigned to owner about the account creation
+//Send notification mail to the assigned to owner about the vtiger_account creation
 if($focus->column_fields['notify_owner'] == 1 || $focus->column_fields['notify_owner'] == 'on')
 	$status = sendNotificationToOwner('Accounts',&$focus);
 
 header("Location: index.php?action=$return_action&module=$return_module&parenttab=$parenttab&record=$return_id&viewname=$return_viewname");
 
-//Code to save the custom field info into database
+//Code to save the custom vtiger_field info into database
 function save_customfields($entity_id)
 {
 	global $log;
@@ -114,12 +114,12 @@
 	$dbquery = "SELECT * FROM customfields WHERE module = 'Accounts'";
         /*
 	$result = mysql_query($dbquery);
-	$custquery = "SELECT * FROM accountcf WHERE accountid = '".$entity_id."'";
+	$custquery = "SELECT * FROM vtiger_accountcf WHERE vtiger_accountid = '".$entity_id."'";
         $cust_result = mysql_query($custquery);
 	if(mysql_num_rows($result) != 0)
         */
 	$result = $adb->query($dbquery);
-	$custquery = "SELECT * FROM accountcf WHERE accountid = '".$entity_id."'";
+	$custquery = "SELECT * FROM vtiger_accountcf WHERE vtiger_accountid = '".$entity_id."'";
         $cust_result = $adb->query($custquery);
 	if($adb->num_rows($result) != 0)
 	{
@@ -185,19 +185,19 @@
                   if(isset($_REQUEST['record']) && $_REQUEST['record'] != '' && $adb->num_rows($cust_result) !=0)
 		{
 			//Update Block
-                        $query = "UPDATE accountcf SET ".$update." WHERE accountid='".$entity_id."'"; 
+                        $query = "UPDATE vtiger_accountcf SET ".$update." WHERE vtiger_accountid='".$entity_id."'"; 
 			$adb->query($query);
 		}
 		else
 		{
 			//Insert Block
-			$query = "INSERT INTO accountcf (".$columns.") VALUES(".$values.")";
+			$query = "INSERT INTO vtiger_accountcf (".$columns.") VALUES(".$values.")";
                         $adb->query($query);
 		}
 		
 	}
 	$log->debug("Exiting save_customfields method ...");
-	// commented by srini - PATCH for saving accounts
+	// commented by srini - PATCH for saving vtiger_accounts
 	/*else
 	{
           //if(isset($_REQUEST['record']) && $_REQUEST['record'] != '' && mysql_num_rows($cust_result) !=0)
@@ -208,7 +208,7 @@
 		else
 		{
 			//Insert Block
-			$query = "INSERT INTO accountcf (".$columns.") VALUES(".$values.")";
+			$query = "INSERT INTO vtiger_accountcf (".$columns.") VALUES(".$values.")";
                         $adb->query($query);
 			//mysql_query($query);
 		}

Modified: vtigercrm/trunk/modules/Accounts/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Accounts/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Accounts/language/en_us.lang.php Mon Jun 12 14:26:25 2006
@@ -81,10 +81,10 @@
 'NTC_COPY_SHIPPING_ADDRESS'=>'Copy shipping address to billing address',
 'NTC_REMOVE_MEMBER_ORG_CONFIRMATION'=>'Are you sure you want to remove this record as a member organization?',
 'LBL_DUPLICATE'=>'Potential Duplicate Accounts',
-'MSG_DUPLICATE' => 'Creating this account may potentialy create a duplicate account. You may either select an account from the list below or you may click on Create New Account to continue creating a new account with the previously entered data.',
+'MSG_DUPLICATE' => 'Creating this vtiger_account may vtiger_potentialy create a duplicate vtiger_account. You may either select an vtiger_account from the list below or you may click on Create New Account to continue creating a new vtiger_account with the previously entered data.',
 
 'LBL_INVITEE'=>'Contacts',
-'ERR_DELETE_RECORD'=>"A record number must be specified to delete the account.",
+'ERR_DELETE_RECORD'=>"A record number must be specified to delete the vtiger_account.",
 
 'LBL_SELECT_ACCOUNT'=>'Select Account',
 'LBL_GENERAL_INFORMATION'=>'General Information',
@@ -104,7 +104,7 @@
 'LBL_NEW_CONTACT'=>'New Contact',
 'LBL_CONTACT_TITLE'=>'Contacts',
 
-//Added fields after RC1 - Release
+//Added vtiger_fields after RC1 - Release
 'LBL_ALL'=>'All',
 'LBL_PROSPECT'=>'Prospect',
 'LBL_INVESTOR'=>'Investor',

Modified: vtigercrm/trunk/modules/Activities/Activity.php
==============================================================================
--- vtigercrm/trunk/modules/Activities/Activity.php (original)
+++ vtigercrm/trunk/modules/Activities/Activity.php Mon Jun 12 14:26:25 2006
@@ -32,7 +32,7 @@
 	var $log;
 	var $db;
 
-	// Stored fields
+	// Stored vtiger_fields
   	var $eventid;
 	var $description;
 	var $firstname;
@@ -48,7 +48,7 @@
 
 	var $table_name = "activity";
 	#var $object_name = "activity";	
-		// Mike Crowe Mod --------------------------------------------------------Renamed to match tab
+		// Mike Crowe Mod --------------------------------------------------------Renamed to match vtiger_tab
 	var $object_name = "Activities";
 	// Mike Crowe Mod --------------------------------------------------------added for general search
     var $base_table_name = "activity";
@@ -58,17 +58,17 @@
 	
 	var $reminder_table = "activity_reminder";
 	
-	var $tab_name = Array('crmentity','activity','seactivityrel','cntactivityrel','salesmanactivityrel','activity_reminder','recurringevents','invitees');
-
-	var $tab_name_index = Array('crmentity'=>'crmid','activity'=>'activityid','seactivityrel'=>'activityid','cntactivityrel'=>'activityid','salesmanactivityrel'=>'activityid','activity_reminder'=>'activity_id','recurringevents'=>'activityid');
+	var $tab_name = Array('vtiger_crmentity','vtiger_activity','vtiger_seactivityrel','vtiger_cntactivityrel','vtiger_salesmanactivityrel','vtiger_activity_reminder','vtiger_recurringevents','vtiger_invitees');
+
+	var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_activity'=>'activityid','vtiger_seactivityrel'=>'activityid','vtiger_cntactivityrel'=>'activityid','vtiger_salesmanactivityrel'=>'activityid','vtiger_activity_reminder'=>'activity_id','vtiger_recurringevents'=>'activityid');
 
 	var $column_fields = Array();
 	var $sortby_fields = Array('subject','due_date','date_start','smownerid','activitytype');	//Sorting is added for due date and start date	
 
-	// This is used to retrieve related fields from form posts.
+	// This is used to retrieve related vtiger_fields from form posts.
 	var $additional_column_fields = Array('assigned_user_name', 'assigned_user_id', 'contactname', 'contact_phone', 'contact_email', 'parent_name');
 
-	// This is the list of fields that are in the lists.
+	// This is the list of vtiger_fields that are in the lists.
 	var $list_fields = Array(
        'Close'=>Array('activity'=>'status'),
        'Type'=>Array('activity'=>'activitytype'),
@@ -164,12 +164,12 @@
 
 			if(isPermitted("Contacts",3,"") == 'yes')
 			{
-				$button .= '<input title="Change" accessKey="" tabindex="2" type="button" class="button" value="'.$app_strings['LBL_SELECT_CONTACT_BUTTON_LABEL'].'" name="Button" LANGUAGE=javascript onclick=\'return window.open("index.php?module=Contacts&return_module=Activities&action=Popup&popuptype=detailview&form=EditView&form_submit=false&recordid='.$_REQUEST["record"].'","test","width=600,height=400,resizable=1,scrollbars=1");\'>&nbsp;';
+				$button .= '<input title="Change" accessKey="" vtiger_tabindex="2" type="button" class="button" value="'.$app_strings['LBL_SELECT_CONTACT_BUTTON_LABEL'].'" name="Button" LANGUAGE=javascript onclick=\'return window.open("index.php?module=Contacts&return_module=Activities&action=Popup&popuptype=detailview&form=EditView&form_submit=false&recordid='.$_REQUEST["record"].'","test","width=600,height=400,resizable=1,scrollbars=1");\'>&nbsp;';
 			}
 			$returnset = '&return_module=Activities&return_action=DetailView&activity_mode=Events&return_id='.$id;
 
 
-			$query = 'select contactdetails.accountid, contactdetails.contactid, contactdetails.firstname,contactdetails.lastname, contactdetails.department, contactdetails.title, contactdetails.email, contactdetails.phone, crmentity.crmid, crmentity.smownerid, crmentity.modifiedtime from contactdetails inner join seactivityrel on seactivityrel.crmid=contactdetails.contactid inner join crmentity on crmentity.crmid = contactdetails.contactid where seactivityrel.activityid='.$id.' and crmentity.deleted=0';
+			$query = 'select vtiger_contactdetails.accountid, vtiger_contactdetails.contactid, vtiger_contactdetails.firstname,vtiger_contactdetails.lastname, vtiger_contactdetails.department, vtiger_contactdetails.title, vtiger_contactdetails.email, vtiger_contactdetails.phone, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_contactdetails inner join vtiger_seactivityrel on vtiger_seactivityrel.crmid=vtiger_contactdetails.contactid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid where vtiger_seactivityrel.activityid='.$id.' and vtiger_crmentity.deleted=0';
 			$log->debug("Exiting get_contacts method ...");
 			return GetRelatedList('Activities','Contacts',$focus,$query,$button,$returnset);
         }
@@ -178,7 +178,7 @@
 	{
 			global $adb,$log;
 			$log->debug("Entering get_users(".$id.") method ...");
-			$query = 'SELECT users.id, users.first_name,users.last_name, users.user_name, users.email1, users.email2, users.yahoo_id, users.phone_home, users.phone_work, users.phone_mobile, users.phone_other, users.phone_fax,activity.date_start,activity.due_date,activity.time_start,activity.duration_hours,activity.duration_minutes from users inner join salesmanactivityrel on salesmanactivityrel.smid=users.id  inner join activity on activity.activityid=salesmanactivityrel.activityid where activity.activityid='.$id;
+			$query = 'SELECT vtiger_users.id, vtiger_users.first_name,vtiger_users.last_name, vtiger_users.user_name, vtiger_users.email1, vtiger_users.email2, vtiger_users.yahoo_id, vtiger_users.phone_home, vtiger_users.phone_work, vtiger_users.phone_mobile, vtiger_users.phone_other, vtiger_users.phone_fax,vtiger_activity.date_start,vtiger_activity.due_date,vtiger_activity.time_start,vtiger_activity.duration_hours,vtiger_activity.duration_minutes from vtiger_users inner join vtiger_salesmanactivityrel on vtiger_salesmanactivityrel.smid=vtiger_users.id  inner join vtiger_activity on vtiger_activity.activityid=vtiger_salesmanactivityrel.activityid where vtiger_activity.activityid='.$id;
 			$activity_id=$id;
 
 			global $mod_strings;
@@ -229,12 +229,12 @@
 				}
 
 			// To display the dates for the Group calendar starts -Jaguar
-			$recur_dates_qry='select distinct(recurringdate) from recurringevents where activityid='.$activity_id;
+			$recur_dates_qry='select distinct(recurringdate) from vtiger_recurringevents where vtiger_activityid='.$activity_id;
 			$recur_result=$adb->query($recur_dates_qry);
 			$noofrows_recur = $adb->num_rows($recur_result);
 			if($noofrows_recur==0)
 			{
-				$recur_dates_qry='select activity.date_start,recurringevents.* from activity left outer join recurringevents on activity.activityid=recurringevents.activityid where recurringevents.activityid is NULL and activity.activityid='.$activity_id;
+				$recur_dates_qry='select vtiger_activity.date_start,vtiger_recurringevents.* from vtiger_activity left outer join vtiger_recurringevents on vtiger_activity.activityid=vtiger_recurringevents.activityid where vtiger_recurringevents.activityid is NULL and vtiger_activity.activityid='.$activity_id;
 				$recur_result=$adb->query($recur_dates_qry);
 				$noofrows_recur = $adb->num_rows($recur_result);
 
@@ -251,7 +251,7 @@
 				$activity_start_time=time_to_number($act_time_start);	
 				$activity_end_time=get_duration($act_time_start,$act_hour_dur,$act_mins_dur);	
 
-				$activity_owner_qry='select users.user_name,users.id AS userid from users,crmentity where users.id=crmentity.smownerid and crmentity.crmid='.$id;
+				$activity_owner_qry='select vtiger_users.user_name,vtiger_users.id AS userid from vtiger_users,crmentity where vtiger_users.id=vtiger_crmentity.smownerid and vtiger_crmentity.crmid='.$id;
 				$result_owner=$adb->query($activity_owner_qry);
 
 				while($row_owner = $adb->fetch_array($result_owner))
@@ -259,7 +259,7 @@
 					$owner=$row_owner['userid'];
 				}
 
-				$recur_dates_qry='select recurringdate from recurringevents where activityid ='.$activity_id;
+				$recur_dates_qry='select recurringdate from vtiger_recurringevents where vtiger_activityid ='.$activity_id;
 				$recur_result=$adb->query($recur_dates_qry);
 				$noofrows_recur = $adb->num_rows($recur_result);
 				$userid=$row['id'];
@@ -298,7 +298,7 @@
   	{
 	 global $log;
          $log->debug("Entering get_full_list(".$criteria.") method ...");
-    $query = "select crmentity.crmid,crmentity.smownerid,crmentity.setype, activity.*, contactdetails.lastname, contactdetails.firstname, contactdetails.contactid 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 WHERE crmentity.deleted=0 ".$criteria;
+    $query = "select vtiger_crmentity.crmid,vtiger_crmentity.smownerid,vtiger_crmentity.setype, vtiger_activity.*, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid from vtiger_activity inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid= vtiger_cntactivityrel.contactid left join vtiger_seactivityrel on vtiger_seactivityrel.activityid = vtiger_activity.activityid WHERE vtiger_crmentity.deleted=0 ".$criteria;
     $result =& $this->db->query($query);
 	echo $query;
     $this->log->debug("process_full_list_query: result is ".$result);
@@ -338,7 +338,7 @@
 	{
 		global $log;
 	        $log->debug("Entering getCount_Meeting(".$user_name.") method ...");
-      $query = "select count(*) from activity inner join crmentity on crmentity.crmid=activity.activityid inner join salesmanactivityrel on salesmanactivityrel.activityid=activity.activityid inner join users on users.id=salesmanactivityrel.smid where user_name='" .$user_name ."' and crmentity.deleted=0 and activity.activitytype='Meeting'";
+      $query = "select count(*) from vtiger_activity inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid inner join vtiger_salesmanactivityrel on vtiger_salesmanactivityrel.activityid=vtiger_activity.activityid inner join vtiger_users on vtiger_users.id=vtiger_salesmanactivityrel.smid where user_name='" .$user_name ."' and vtiger_crmentity.deleted=0 and vtiger_activity.activitytype='Meeting'";
 
       $result = $this->db->query($query,true,"Error retrieving contacts count");
       $rows_found =  $this->db->getRowCount($result);
@@ -351,7 +351,7 @@
     {   
 	    global $log;
             $log->debug("Entering get_calendars(".$user_name.",".$from_index.",".$offset.") method ...");
-		$query = "select activity.location as location,activity.duration_hours as duehours, activity.duration_minutes as dueminutes,activity.time_start as time_start, activity.subject as name,crmentity.modifiedtime as date_modified, activity.date_start start_date,activity.activityid as id,activity.status as status, crmentity.description as description, activity.priority as priority, activity.due_date as date_due ,contactdetails.firstname cfn, contactdetails.lastname cln from activity inner join salesmanactivityrel on salesmanactivityrel.activityid=activity.activityid inner join users on users.id=salesmanactivityrel.smid left join cntactivityrel on cntactivityrel.activityid=activity.activityid left join contactdetails on contactdetails.contactid=cntactivityrel.contactid inner join crmentity on crmentity.crmid=activity.activityid where user_name='" .$user_name ."' and crmentity.deleted=0 and activity.activitytype='Meeting' limit " .$from_index ."," .$offset;
+		$query = "select vtiger_activity.location as location,vtiger_activity.duration_hours as duehours, vtiger_activity.duration_minutes as dueminutes,vtiger_activity.time_start as time_start, vtiger_activity.subject as name,vtiger_crmentity.modifiedtime as date_modified, vtiger_activity.date_start start_date,vtiger_activity.activityid as id,vtiger_activity.status as status, vtiger_crmentity.description as description, vtiger_activity.priority as vtiger_priority, vtiger_activity.due_date as date_due ,vtiger_contactdetails.firstname cfn, vtiger_contactdetails.lastname cln from vtiger_activity inner join vtiger_salesmanactivityrel on vtiger_salesmanactivityrel.activityid=vtiger_activity.activityid inner join vtiger_users on vtiger_users.id=vtiger_salesmanactivityrel.smid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid=vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid=vtiger_cntactivityrel.contactid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid where user_name='" .$user_name ."' and vtiger_crmentity.deleted=0 and vtiger_activity.activitytype='Meeting' limit " .$from_index ."," .$offset;
 	$log->debug("Exiting get_calendars method ...");
 	    return $this->process_list_query1($query);   
     }       
@@ -361,7 +361,7 @@
     {
 	    global $log;
             $log->debug("Entering getCount(".$user_name.") method ...");
-        $query = "select count(*) from activity inner join crmentity on crmentity.crmid=activity.activityid inner join salesmanactivityrel on salesmanactivityrel.activityid=activity.activityid inner join users on users.id=salesmanactivityrel.smid where user_name='" .$user_name ."' and crmentity.deleted=0 and activity.activitytype='Task'";
+        $query = "select count(*) from vtiger_activity inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid inner join vtiger_salesmanactivityrel on vtiger_salesmanactivityrel.activityid=vtiger_activity.activityid inner join vtiger_users on vtiger_users.id=vtiger_salesmanactivityrel.smid where user_name='" .$user_name ."' and vtiger_crmentity.deleted=0 and vtiger_activity.activitytype='Task'";
 
         $result = $this->db->query($query,true,"Error retrieving contacts count");
         $rows_found =  $this->db->getRowCount($result);
@@ -375,7 +375,7 @@
     {   
 	global $log;
         $log->debug("Entering get_tasks(".$user_name.",".$from_index.",".$offset.") method ...");
-	 $query = "select activity.subject as name,crmentity.modifiedtime as date_modified, activity.date_start start_date,activity.activityid as id,activity.status as status, crmentity.description as description, activity.priority as priority, activity.due_date as date_due ,contactdetails.firstname cfn, contactdetails.lastname cln from activity inner join salesmanactivityrel on salesmanactivityrel.activityid=activity.activityid inner join users on users.id=salesmanactivityrel.smid left join cntactivityrel on cntactivityrel.activityid=activity.activityid left join contactdetails on contactdetails.contactid=cntactivityrel.contactid inner join crmentity on crmentity.crmid=activity.activityid where user_name='" .$user_name ."' and crmentity.deleted=0 and activity.activitytype='Task' limit " .$from_index ."," .$offset;
+	 $query = "select vtiger_activity.subject as name,vtiger_crmentity.modifiedtime as date_modified, vtiger_activity.date_start start_date,vtiger_activity.activityid as id,vtiger_activity.status as status, vtiger_crmentity.description as description, vtiger_activity.priority as vtiger_priority, vtiger_activity.due_date as date_due ,vtiger_contactdetails.firstname cfn, vtiger_contactdetails.lastname cln from vtiger_activity inner join vtiger_salesmanactivityrel on vtiger_salesmanactivityrel.activityid=vtiger_activity.activityid inner join vtiger_users on vtiger_users.id=vtiger_salesmanactivityrel.smid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid=vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid=vtiger_cntactivityrel.contactid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid where user_name='" .$user_name ."' and vtiger_crmentity.deleted=0 and vtiger_activity.activitytype='Task' limit " .$from_index ."," .$offset;
 	 $log->debug("Exiting get_tasks method ...");
     return $this->process_list_query1($query);
     
@@ -424,12 +424,12 @@
         return $response;
     }
 		
-	function activity_reminder($activity_id,$reminder_time,$reminder_sent=0,$recurid,$remindermode='')
+	function vtiger_activity_reminder($activity_id,$reminder_time,$reminder_sent=0,$recurid,$remindermode='')
 	{
 		global $log;
-		$log->debug("Entering activity_reminder(".$activity_id.",".$reminder_time.",".$reminder_sent.",".$recurid.",".$remindermode.") method ...");
-		//Check for activityid already present in the reminder_table
-		$query_exist = "SELECT activity_id FROM ".$this->reminder_table." WHERE activity_id = ".$activity_id;
+		$log->debug("Entering vtiger_activity_reminder(".$activity_id.",".$reminder_time.",".$reminder_sent.",".$recurid.",".$remindermode.") method ...");
+		//Check for vtiger_activityid already present in the reminder_table
+		$query_exist = "SELECT vtiger_activity_id FROM ".$this->reminder_table." WHERE vtiger_activity_id = ".$activity_id;
 		$result_exist = $this->db->query($query_exist);
 
 		if($remindermode == 'edit')
@@ -438,7 +438,7 @@
 			{
 				$query = "UPDATE ".$this->reminder_table." SET";
 				$query .=" reminder_sent = ".$reminder_sent.",";
-				$query .=" reminder_time = ".$reminder_time." WHERE activity_id =".$activity_id; 
+				$query .=" reminder_time = ".$reminder_time." WHERE vtiger_activity_id =".$activity_id; 
 			}
 			else
 			{
@@ -447,14 +447,14 @@
 		}
 		elseif(($remindermode == 'delete') && ($this->db->num_rows($result_exist) == 1))
 		{
-			$query = "DELETE FROM ".$this->reminder_table." WHERE activity_id = ".$activity_id;
+			$query = "DELETE FROM ".$this->reminder_table." WHERE vtiger_activity_id = ".$activity_id;
 		}
 		else
 		{
 			$query = "INSERT INTO ".$this->reminder_table." VALUES (".$activity_id.",".$reminder_time.",0,'".$recurid."')";
 		}
-      		$this->db->query($query,true,"Error in processing table $this->reminder_table");
-		$log->debug("Exiting activity_reminder method ...");
+      		$this->db->query($query,true,"Error in processing vtiger_table $this->reminder_table");
+		$log->debug("Exiting vtiger_activity_reminder method ...");
 	}
 
 //Used for vtigerCRM Outlook Add-In
@@ -462,15 +462,15 @@
 {
 	global $log;
         $log->debug("Entering get_tasksforol(".$username.") method ...");
-	$query = "select activity.subject,activity.date_start startdate,
-			 activity.activityid as taskid,activity.status,
-			 crmentity.description,activity.priority as priority,activity.due_date as duedate,
-			 contactdetails.firstname, contactdetails.lastname 
-			 from activity inner join crmentity on crmentity.crmid=activity.activityid 
-			 inner join users on users.id = crmentity.smownerid 
-			 left join cntactivityrel on cntactivityrel.activityid=activity.activityid 
-			 left join contactdetails on contactdetails.contactid=cntactivityrel.contactid 
-			 where users.user_name='".$username."' and crmentity.deleted=0 and activity.activitytype='Task'";
+	$query = "select vtiger_activity.subject,vtiger_activity.date_start startdate,
+			 vtiger_activity.activityid as taskid,vtiger_activity.status,
+			 vtiger_crmentity.description,vtiger_activity.priority as vtiger_priority,vtiger_activity.due_date as duedate,
+			 vtiger_contactdetails.firstname, vtiger_contactdetails.lastname 
+			 from vtiger_activity inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid 
+			 inner join vtiger_users on vtiger_users.id = vtiger_crmentity.smownerid 
+			 left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid=vtiger_activity.activityid 
+			 left join vtiger_contactdetails on vtiger_contactdetails.contactid=vtiger_cntactivityrel.contactid 
+			 where vtiger_users.user_name='".$username."' and vtiger_crmentity.deleted=0 and vtiger_activity.activitytype='Task'";
 	$log->debug("Exiting get_tasksforol method ...");		 
 	return $query;
 }
@@ -479,17 +479,17 @@
 {
 	global $log;
         $log->debug("Entering get_calendarsforol(".$user_name.") method ...");
-	  $query = "select activity.location, activity.duration_hours as duehours, 
-				activity.duration_minutes as dueminutes,activity.time_start as startime, 
-				activity.subject,activity.date_start as startdate,activity.activityid as clndrid,
-				crmentity.description,activity.due_date as duedate ,
-				contactdetails.firstname, contactdetails.lastname from activity 
-				inner join salesmanactivityrel on salesmanactivityrel.activityid=activity.activityid 
-				inner join users on users.id=salesmanactivityrel.smid 
-				left join cntactivityrel on cntactivityrel.activityid=activity.activityid 
-				left join contactdetails on contactdetails.contactid=cntactivityrel.contactid 
-				inner join crmentity on crmentity.crmid=activity.activityid 
-				where users.user_name='".$user_name."' and crmentity.deleted=0 and activity.activitytype='Meeting'";
+	  $query = "select vtiger_activity.location, vtiger_activity.duration_hours as duehours, 
+			vtiger_activity.duration_minutes as dueminutes,vtiger_activity.time_start as startime, 
+			vtiger_activity.subject,vtiger_activity.date_start as startdate,vtiger_activity.activityid as clndrid,
+			vtiger_crmentity.description,vtiger_activity.due_date as duedate ,
+			vtiger_contactdetails.firstname, vtiger_contactdetails.lastname from vtiger_activity 
+				inner join vtiger_salesmanactivityrel on vtiger_salesmanactivityrel.activityid=vtiger_activity.activityid 
+				inner join vtiger_users on vtiger_users.id=vtiger_salesmanactivityrel.smid 
+				left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid=vtiger_activity.activityid 
+				left join vtiger_contactdetails on vtiger_contactdetails.contactid=vtiger_cntactivityrel.contactid 
+				inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid 
+				where vtiger_users.user_name='".$user_name."' and vtiger_crmentity.deleted=0 and vtiger_activity.activitytype='Meeting'";
 	$log->debug("Exiting get_calendarsforol method ...");
 	return $query;
 }

Modified: vtigercrm/trunk/modules/Activities/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/Activities/EditView.php (original)
+++ vtigercrm/trunk/modules/Activities/EditView.php Mon Jun 12 14:26:25 2006
@@ -31,7 +31,7 @@
 require_once('include/FormValidationUtil.php');
 global $app_strings;
 global $mod_strings;
-// Unimplemented until jscalendar language files are fixed
+// Unimplemented until jscalendar language vtiger_files are fixed
 $activity_lbl='';
 $activity_mode = $_REQUEST['activity_mode'];
 if($activity_mode == 'Task')
@@ -98,7 +98,7 @@
 $category = getParentTab();
 $smarty->assign("CATEGORY",$category);
 
-// Unimplemented until jscalendar language files are fixed
+// Unimplemented until jscalendar language vtiger_files are fixed
 $smarty->assign("CALENDAR_LANG", $app_strings['LBL_JSCALENDAR_LANG']);
 $smarty->assign("CALENDAR_DATEFORMAT", parse_calendardate($app_strings['NTC_DATE_FORMAT']));
 

Modified: vtigercrm/trunk/modules/Activities/Event.php
==============================================================================
--- vtigercrm/trunk/modules/Activities/Event.php (original)
+++ vtigercrm/trunk/modules/Activities/Event.php Mon Jun 12 14:26:25 2006
@@ -30,7 +30,7 @@
 	var $log;
 	var $db;
 
-	// Stored fields
+	// Stored vtiger_fields
   	var $eventid;
 	var $description;
 	var $status;
@@ -51,10 +51,10 @@
 
 	var $column_fields = Array();
 
-	// This is used to retrieve related fields from form posts.
+	// This is used to retrieve related vtiger_fields from form posts.
 	var $additional_column_fields = Array('assigned_user_name', 'assigned_user_id', 'contactname', 'contact_phone', 'contact_email', 'parent_name');
 
-	// This is the list of fields that are in the lists.
+	// This is the list of vtiger_fields that are in the lists.
 	var $list_fields = Array(
        'Close'=>Array('event'=>'status'),
        'Subject'=>Array('activity'=>'subject'),
@@ -88,7 +88,7 @@
     {
 	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";
+        $query = "select count(*) from tasks inner join vtiger_users on vtiger_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");

Modified: vtigercrm/trunk/modules/Activities/Forms.php
==============================================================================
--- vtigercrm/trunk/modules/Activities/Forms.php (original)
+++ vtigercrm/trunk/modules/Activities/Forms.php Mon Jun 12 14:26:25 2006
@@ -15,7 +15,7 @@
 /*********************************************************************************
  * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Activities/Forms.php,v 1.7 2005/04/19 16:49:29 ray Exp $
  * Description:  Contains a variety of utility functions used to display UI
- * components such as form headers and footers.  Intended to be modified on a per
+ * components such as form vtiger_headers and footers.  Intended to be modified on a per
  * theme basis.
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
  * All Rights Reserved.
@@ -60,23 +60,23 @@
  */
 // Declaring valid date character, minimum year and maximum year
 
-var fieldname,fieldlabel,fielddatatype;	
+var vtiger_fieldname,fieldlabel,fielddatatype;	
 function verify_data(form,fname,flabel,fdatatype) 
 {
 	var form_name=form.name;
 	if(form_name=='ActivitySave')
         {
                form.due_date.value=form.date_start.value;
-	       fieldname =fname.split(",");
-	       fieldlabel = flabel.split(",");
-               fielddatatype = fdatatype.split(",");
+	       vtiger_fieldname =fname.split(",");
+	       vtiger_fieldlabel = flabel.split(",");
+               vtiger_fielddatatype = fdatatype.split(",");
         }
         else
         {
               form.due_date.value=form.date_start.value;
-	      fieldname = fname.split(",");
-              fieldlabel = flabel.split(",");
-              fielddatatype = fdatatype.split(",");
+	      vtiger_fieldname = fname.split(",");
+              vtiger_fieldlabel = flabel.split(",");
+              vtiger_fielddatatype = fdatatype.split(",");
         
         }
 
@@ -93,7 +93,7 @@
 
 /* Commented for RC
 /**
- * Create HTML form to enter a new record with the minimum necessary fields.
+ * Create HTML form to enter a new record with the minimum necessary vtiger_fields.
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
  * All Rights Reserved.
  * Contributor(s): ______________________________________..
@@ -106,13 +106,13 @@
 global $theme;
 global $adb;//for dynamic quickcreateform construction
 
-// Unimplemented until jscalendar language files are fixed
+// Unimplemented until jscalendar language vtiger_files are fixed
 // global $current_language;
 // global $default_language;
 // global $cal_codes;
 
 $user_id = $current_user->id;
-// Unimplemented until jscalendar language files are fixed
+// Unimplemented until jscalendar language vtiger_files are fixed
 // $cal_lang = (empty($cal_codes[$current_language])) ? $cal_codes[$default_language] : $cal_codes[$current_language];
 $cal_lang = "en";
 $cal_dateformat = parse_calendardate($app_strings['NTC_DATE_FORMAT']);
@@ -126,7 +126,7 @@
 $fieldLabel_task = '';
 $fldDataType_task = '';
 
-$qcreate_get_field="select * from field where tabid=9 and quickcreate=0 order by quickcreatesequence";
+$qcreate_get_field="select * from vtiger_field where vtiger_tabid=9 and quickcreate=0 order by quickcreatesequence";
 $qcreate_get_result=$adb->query($qcreate_get_field);
 $qcreate_get_noofrows=$adb->num_rows($qcreate_get_result);
 $fieldName_array_task = Array();//for validation
@@ -239,7 +239,7 @@
 $fieldLabel = '';
 $fldDataType = '';
 
-$qcreate_get_field="select * from field where tabid=16 and quickcreate=0 order by quickcreatesequence";
+$qcreate_get_field="select * from vtiger_field where vtiger_tabid=16 and quickcreate=0 order by quickcreatesequence";
 $qcreate_get_result=$adb->query($qcreate_get_field);
 $qcreate_get_noofrows=$adb->num_rows($qcreate_get_result);
 

Modified: vtigercrm/trunk/modules/Activities/GroupAllocationView.php
==============================================================================
--- vtigercrm/trunk/modules/Activities/GroupAllocationView.php (original)
+++ vtigercrm/trunk/modules/Activities/GroupAllocationView.php Mon Jun 12 14:26:25 2006
@@ -52,7 +52,7 @@
 if(isset($_REQUEST['query']))
 {
 
-  $query = "select leads.last_name,leadgrouprelation.groupname from leads inner join leadgrouprelation on leads.id=leadgrouprelation.leadid where leadgrouprelation.deleted=0  and leads.deleted=0";
+  $query = "select leads.last_name,vtiger_leadgrouprelation.groupname from leads inner join vtiger_leadgrouprelation on leads.id=vtiger_leadgrouprelation.leadid where vtiger_leadgrouprelation.deleted=0  and leads.deleted=0";
   $log->info("Here is the where clause for the list view: $query");
 
 }

Modified: vtigercrm/trunk/modules/Activities/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Activities/ListView.php (original)
+++ vtigercrm/trunk/modules/Activities/ListView.php Mon Jun 12 14:26:25 2006
@@ -125,7 +125,7 @@
 	$list_query .= " AND " .$where;
 }
 
-$list_query .= ' group by activity.activityid';
+$list_query .= ' group by vtiger_activity.activityid';
 
 if(isset($order_by) && $order_by != '')
 {
@@ -177,7 +177,7 @@
 if($viewid !='')
 $url_string .="&viewname=".$viewid;
 
-//Cambiado code to add close button in custom field
+//Cambiado code to add close button in custom vtiger_field
 if (($viewid!=0)&&($viewid!="")){
   if (!isset($oCustomView->list_fields['Close'])) $oCustomView->list_fields['Close']=array ( 'activity' => 'status' );
   if (!isset($oCustomView->list_fields_name['Close'])) $oCustomView->list_fields_name['Close']='status';

Modified: vtigercrm/trunk/modules/Activities/OpenListView.php
==============================================================================
--- vtigercrm/trunk/modules/Activities/OpenListView.php (original)
+++ vtigercrm/trunk/modules/Activities/OpenListView.php Mon Jun 12 14:26:25 2006
@@ -45,7 +45,7 @@
 	//code added to customize upcomming and pending activities
 	if($_REQUEST['activity_view']=='')
 	{	
-		$query = "select activity_view from users where id ='$current_user->id'";
+		$query = "select activity_view from vtiger_users where id ='$current_user->id'";
 		$result=$adb->query($query);
 		$activity_view=$adb->query_result($result,0,'activity_view');
 	}
@@ -78,12 +78,12 @@
 	if($mode != 1)
 	{
 		//for upcoming avtivities
-		$list_query = " select crmentity.crmid,crmentity.smownerid,crmentity.setype, activity.*, contactdetails.lastname, contactdetails.firstname, contactdetails.contactid, account.accountid, account.accountname, recurringevents.recurringtype,recurringevents.recurringdate 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 inner join salesmanactivityrel on salesmanactivityrel.activityid=activity.activityid WHERE crmentity.deleted=0 and (activity.activitytype = 'Meeting' or activity.activitytype='Call' or activity.activitytype='Task') AND ( activity.status is NULL OR activity.status != 'Completed' ) and ( activity.status is NULL OR activity.status != 'Deferred') and  (  activity.eventstatus is NULL OR  activity.eventstatus != 'Held') and (activity.eventstatus is NULL OR  activity.eventstatus != 'Not Held' ) AND (((date_start > '$today' AND date_start < '$later'))  OR (recurringevents.recurringdate between '$today' and '$later') ) AND crmentity.smownerid !=0 AND salesmanactivityrel.smid ='$current_user->id'";
+		$list_query = " select vtiger_crmentity.crmid,vtiger_crmentity.smownerid,vtiger_crmentity.setype, vtiger_activity.*, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid, vtiger_account.accountid, vtiger_account.accountname, vtiger_recurringevents.recurringtype,vtiger_recurringevents.recurringdate from vtiger_activity inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid= vtiger_cntactivityrel.contactid left join vtiger_seactivityrel on vtiger_seactivityrel.activityid = vtiger_activity.activityid left outer join vtiger_account on vtiger_account.accountid = vtiger_contactdetails.accountid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid inner join vtiger_salesmanactivityrel on vtiger_salesmanactivityrel.activityid=vtiger_activity.activityid WHERE vtiger_crmentity.deleted=0 and (vtiger_activity.activitytype = 'Meeting' or vtiger_activity.activitytype='Call' or vtiger_activity.activitytype='Task') AND ( vtiger_activity.status is NULL OR vtiger_activity.status != 'Completed' ) and ( vtiger_activity.status is NULL OR vtiger_activity.status != 'Deferred') and  (  vtiger_activity.eventstatus is NULL OR  vtiger_activity.eventstatus != 'Held') and (vtiger_activity.eventstatus is NULL OR  vtiger_activity.eventstatus != 'Not Held' ) AND (((date_start > '$today' AND date_start < '$later'))  OR (vtiger_recurringevents.recurringdate between '$today' and '$later') ) AND vtiger_crmentity.smownerid !=0 AND vtiger_salesmanactivityrel.smid ='$current_user->id'";
 	}	
 	else
 	{
 		//for pending activities for the last 10 days
-		$list_query = " select crmentity.crmid,crmentity.smownerid,crmentity.setype, activity.*, contactdetails.lastname, contactdetails.firstname, contactdetails.contactid, account.accountid, account.accountname, recurringevents.recurringtype,recurringevents.recurringdate 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 inner join salesmanactivityrel on salesmanactivityrel.activityid=activity.activityid WHERE crmentity.deleted=0 and (activity.activitytype = 'Meeting' or activity.activitytype='Call' or activity.activitytype='Task') AND ( activity.status is NULL OR activity.status != 'Completed' ) and ( activity.status is NULL OR activity.status != 'Deferred') and (  activity.eventstatus is NULL OR  activity.eventstatus != 'Held') and (activity.eventstatus is NULL OR  activity.eventstatus != 'Not Held' ) AND (due_date > '$last_tendays' AND due_date <= '$today') OR (recurringevents.recurringdate > '$last_tendays' AND recurringevents.recurringdate <= '$today') AND crmentity.smownerid !=0 AND salesmanactivityrel.smid ='$current_user->id'";
+		$list_query = " select vtiger_crmentity.crmid,vtiger_crmentity.smownerid,vtiger_crmentity.setype, vtiger_activity.*, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid, vtiger_account.accountid, vtiger_account.accountname, vtiger_recurringevents.recurringtype,vtiger_recurringevents.recurringdate from vtiger_activity inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid= vtiger_cntactivityrel.contactid left join vtiger_seactivityrel on vtiger_seactivityrel.activityid = vtiger_activity.activityid left outer join vtiger_account on vtiger_account.accountid = vtiger_contactdetails.accountid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid inner join vtiger_salesmanactivityrel on vtiger_salesmanactivityrel.activityid=vtiger_activity.activityid WHERE vtiger_crmentity.deleted=0 and (vtiger_activity.activitytype = 'Meeting' or vtiger_activity.activitytype='Call' or vtiger_activity.activitytype='Task') AND ( vtiger_activity.status is NULL OR vtiger_activity.status != 'Completed' ) and ( vtiger_activity.status is NULL OR vtiger_activity.status != 'Deferred') and (  vtiger_activity.eventstatus is NULL OR  vtiger_activity.eventstatus != 'Held') and (vtiger_activity.eventstatus is NULL OR  vtiger_activity.eventstatus != 'Not Held' ) AND (due_date > '$last_tendays' AND due_date <= '$today') OR (vtiger_recurringevents.recurringdate > '$last_tendays' AND vtiger_recurringevents.recurringdate <= '$today') AND vtiger_crmentity.smownerid !=0 AND vtiger_salesmanactivityrel.smid ='$current_user->id'";
 	}
 	$res = $adb->query($list_query);
 	$noofrecords = $adb->num_rows($res);
@@ -110,7 +110,7 @@
 					'recurringdate' => getDisplayDate($adb->query_result($list_result,$i,'recurringdate')),
 					'parent'=> $parent_name,
 					// Fredy Klammsteiner, 4.8.2005: changes from 4.0.1 migrated to 4.2
-					'priority' => $adb->query_result($list_result,$i,'priority'), // Armando L?scher 04.07.2005 -> ?priority -> Desc: Get priority from db
+					'priority' => $adb->query_result($list_result,$i,'priority'), // Armando L?scher 04.07.2005 -> ?priority -> Desc: Get vtiger_priority from db
 					);
 		}
 	$later_day = getDisplayDate(date("Y-m-d", strtotime("$later -1 day ")));
@@ -149,7 +149,7 @@
 			$event['date_start']=$event['recurringdate'];
 			// Fredy Klammsteiner, 4.8.2005: changes from 4.0.1 migrated to 4.2
 		// begin: Armando L?scher 04.07.2005 -> ?priority
-		// Desc: Set priority colors
+		// Desc: Set vtiger_priority colors
 		$font_color_high = "color:#00DD00;";
 		$font_color_medium = "color:#DD00DD;";
 

Modified: vtigercrm/trunk/modules/Activities/RenderRelatedListUI.php
==============================================================================
--- vtigercrm/trunk/modules/Activities/RenderRelatedListUI.php (original)
+++ vtigercrm/trunk/modules/Activities/RenderRelatedListUI.php Mon Jun 12 14:26:25 2006
@@ -64,11 +64,11 @@
 		if( $owner != $userid)
 		{
 			
-			$usr_query="select activityid,activity.date_start,activity.due_date, activity.time_start,activity.duration_hours,activity.duration_minutes,crmentity.smownerid from activity,crmentity where crmentity.crmid=activity.activityid and ('".$avail_date."' like date_start) and crmentity.smownerid=".$userid." and activity.activityid !=".$activity_id."  and crmentity.deleted=0";
+			$usr_query="select vtiger_activityid,vtiger_activity.date_start,vtiger_activity.due_date, vtiger_activity.time_start,vtiger_activity.duration_hours,vtiger_activity.duration_minutes,vtiger_crmentity.smownerid from vtiger_activity,crmentity where vtiger_crmentity.crmid=vtiger_activity.activityid and ('".$avail_date."' like date_start) and vtiger_crmentity.smownerid=".$userid." and vtiger_activity.activityid !=".$activity_id."  and vtiger_crmentity.deleted=0";
 		}
 		else
 		{
-			$usr_query="select activityid,activity.date_start,activity.due_date, activity.time_start,activity.duration_hours,activity.duration_minutes,crmentity.smownerid from activity,crmentity where crmentity.crmid=activity.activityid and ('".$avail_date."' like date_start) and crmentity.smownerid=".$userid." and activity.activityid !=".$activity_id." and crmentity.deleted=0";
+			$usr_query="select vtiger_activityid,vtiger_activity.date_start,vtiger_activity.due_date, vtiger_activity.time_start,vtiger_activity.duration_hours,vtiger_activity.duration_minutes,vtiger_crmentity.smownerid from vtiger_activity,crmentity where vtiger_crmentity.crmid=vtiger_activity.activityid and ('".$avail_date."' like date_start) and vtiger_crmentity.smownerid=".$userid." and vtiger_activity.activityid !=".$activity_id." and vtiger_crmentity.deleted=0";
 		}
 		$result_cal=$adb->query($usr_query);   
 		$noofrows_cal = $adb->num_rows($result_cal);
@@ -98,7 +98,7 @@
 		}
 		if($avail_flag!="true")
 		{
-			$recur_query="SELECT activity.activityid, activity.time_start, activity.duration_hours, activity.duration_minutes , crmentity.smownerid, recurringevents.recurringid, recurringevents.recurringdate as date_start from activity inner join crmentity on activity.activityid = crmentity.crmid inner join recurringevents on activity.activityid=recurringevents.activityid where ('".$avail_date."' like recurringevents.recurringdate) and crmentity.smownerid=".$userid." and activity.activityid !=".$activity_id." and crmentity.deleted=0";
+			$recur_query="SELECT vtiger_activity.activityid, vtiger_activity.time_start, vtiger_activity.duration_hours, vtiger_activity.duration_minutes , vtiger_crmentity.smownerid, vtiger_recurringevents.recurringid, vtiger_recurringevents.recurringdate as date_start from vtiger_activity inner join vtiger_crmentity on vtiger_activity.activityid = vtiger_crmentity.crmid inner join vtiger_recurringevents on vtiger_activity.activityid=vtiger_recurringevents.activityid where ('".$avail_date."' like vtiger_recurringevents.recurringdate) and vtiger_crmentity.smownerid=".$userid." and vtiger_activity.activityid !=".$activity_id." and vtiger_crmentity.deleted=0";
 			
 			$result_cal=$adb->query($recur_query);   
 			$noofrows_cal = $adb->num_rows($result_cal);

Modified: vtigercrm/trunk/modules/Activities/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Activities/Save.php (original)
+++ vtigercrm/trunk/modules/Activities/Save.php Mon Jun 12 14:26:25 2006
@@ -106,7 +106,7 @@
 		$crmid = $_REQUEST['product_id'];
 	if($crmid != $_REQUEST['parent_id'])
 	{
-		$sql = "insert into seactivityrel (activityid, crmid) values('".$focus->id."','".$crmid."')";
+		$sql = "insert into vtiger_seactivityrel (activityid, crmid) values('".$focus->id."','".$crmid."')";
 		$adb->query($sql);
 	}
 }
@@ -114,7 +114,7 @@
 $activemode = "";
 if($activity_mode != '') $activemode = "&activity_mode=".$activity_mode;
 
-//Added code to send mail to the assigned to user about the details of the activity if sendnotification = on and assigned to user
+//Added code to send mail to the assigned to user about the details of the vtiger_activity if sendnotification = on and assigned to user
 if($_REQUEST['sendnotification'] == 'on' && $_REQUEST['assigntype'] == 'U')
 {
 	global $current_user;
@@ -128,7 +128,7 @@
         $mail_status  = send_mail('Activities',$to_email,$current_user->user_name,'',$subject,$description);
 }
 
-//code added to send mail to the invitees
+//code added to send mail to the vtiger_invitees
 if(isset($_REQUEST['inviteesid']) && $_REQUEST['inviteesid']!='')
 {
 	global $current_user;
@@ -163,7 +163,7 @@
 	$page.='&allflag=Normal';
 header("Location: index.php?action=$return_action&module=$return_module$view$hour$day$month$year&record=$return_id$activemode&viewname=$return_viewname$page");
 
-//Function to get the activity details for mail body
+//Function to get the vtiger_activity details for mail body
 function getActivityDetails($description)
 {
 	global $log;
@@ -175,7 +175,7 @@
 	$status = (($_REQUEST['activity_mode']=='Task')?($_REQUEST['taskstatus']):($_REQUEST['eventstatus']));
 
 	$list = 'Dear '.$name.',';
-	$list .= '<br><br> There is an activity('.$_REQUEST['activity_mode'].')'.$reply.'. The details are :';
+	$list .= '<br><br> There is an vtiger_activity('.$_REQUEST['activity_mode'].')'.$reply.'. The details are :';
 	$list .= '<br>Subject : '.$_REQUEST['subject'];
 	$list .= '<br>Status : '.$status;
 	$list .= '<br>Priority : '.$_REQUEST['taskpriority'];

Modified: vtigercrm/trunk/modules/Activities/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Activities/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Activities/language/en_us.lang.php Mon Jun 12 14:26:25 2006
@@ -65,14 +65,14 @@
 'LBL_LIST_LAST_MODIFIED'=>'Last Modified',
 'LBL_LIST_RECURRING_TYPE'=>'Recurring Type',
 
-'ERR_DELETE_RECORD'=>"A record number must be specified to delete the account.",
+'ERR_DELETE_RECORD'=>"A record number must be specified to delete the vtiger_account.",
 'NTC_NONE_SCHEDULED'=>'None scheduled.',
 
-// Added fields for Attachments in Activities/SubPanelView.php
+// Added vtiger_fields for Attachments in Activities/SubPanelView.php
 'LBL_ATTACHMENTS'=>'Attachments',
 'LBL_NEW_ATTACHMENT'=>'New Attachment',
 
-//Added fields after RC1 - Release
+//Added vtiger_fields after RC1 - Release
 'LBL_ALL'=>'All',
 'LBL_CALL'=>'Call',
 'LBL_MEETING'=>'Meeting',

Modified: vtigercrm/trunk/modules/Activities/updateRelations.php
==============================================================================
--- vtigercrm/trunk/modules/Activities/updateRelations.php (original)
+++ vtigercrm/trunk/modules/Activities/updateRelations.php Mon Jun 12 14:26:25 2006
@@ -22,7 +22,7 @@
 		if($id != '')
 		{
 			$record = $_REQUEST['parentid'];
-			$sql = "insert into seactivityrel values (".$id.",".$_REQUEST["parentid"].")";
+			$sql = "insert into vtiger_seactivityrel values (".$id.",".$_REQUEST["parentid"].")";
 			$adb->query($sql);
 		}
 	}
@@ -32,7 +32,7 @@
 elseif(isset($_REQUEST['entityid']) && $_REQUEST['entityid'] != '')
 {
 	$record = $_REQUEST["parid"];
-	$sql = "insert into seactivityrel values (". $_REQUEST["entityid"] .",".$_REQUEST["parid"] .")";
+	$sql = "insert into vtiger_seactivityrel values (". $_REQUEST["entityid"] .",".$_REQUEST["parid"] .")";
 	$adb->query($sql);
 	header("Location: index.php?action=CallRelatedList&module=Activities&activity_mode=Events&record=".$record);
 }
@@ -40,11 +40,11 @@
 
 
  
-//This if for adding the users 
+//This if for adding the vtiger_users 
 if(isset($_REQUEST['user_id']) && $_REQUEST['user_id'] != '')
 {
 	$record = $_REQUEST['record'];
-	$sql = "insert into salesmanactivityrel values (". $_REQUEST["user_id"] .",".$_REQUEST["record"] .")";
+	$sql = "insert into vtiger_salesmanactivityrel values (". $_REQUEST["user_id"] .",".$_REQUEST["record"] .")";
 	$adb->query($sql);
 	header("Location: index.php?action=CallRelatedList&module=Activities&activity_mode=Events&record=".$record);
 

Modified: vtigercrm/trunk/modules/Calendar/Appointment.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/Appointment.php (original)
+++ vtigercrm/trunk/modules/Calendar/Appointment.php Mon Jun 12 14:26:25 2006
@@ -57,20 +57,20 @@
 		$shared_ids = getSharedCalendarId($current_user->id);		
 		if(empty($shared_ids))
 			$shared_ids = $current_user->id;
-                $q= "select activity.*, crmentity.*, account.accountname,account.accountid,activitygrouprelation.groupname FROM activity inner join crmentity on activity.activityid = crmentity.crmid left join recurringevents on activity.activityid=recurringevents.activityid left outer join activitygrouprelation on activitygrouprelation.activityid=activity.activityid left join cntactivityrel on activity.activityid = cntactivityrel.activityid left join contactdetails on cntactivityrel.contactid = contactdetails.contactid left join account  on contactdetails.accountid = account.accountid inner join salesmanactivityrel on salesmanactivityrel.activityid=activity.activityid WHERE activity.activitytype in ('Call','Meeting') AND ";
+                $q= "select vtiger_activity.*, vtiger_crmentity.*, vtiger_account.accountname,vtiger_account.accountid,vtiger_activitygrouprelation.groupname FROM vtiger_activity inner join vtiger_crmentity on vtiger_activity.activityid = vtiger_crmentity.crmid left join vtiger_recurringevents on vtiger_activity.activityid=vtiger_recurringevents.activityid left outer join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_activity.activityid = vtiger_cntactivityrel.activityid left join vtiger_contactdetails on vtiger_cntactivityrel.contactid = vtiger_contactdetails.contactid left join vtiger_account  on vtiger_contactdetails.accountid = vtiger_account.accountid inner join vtiger_salesmanactivityrel on vtiger_salesmanactivityrel.activityid=vtiger_activity.activityid WHERE vtiger_activity.activitytype in ('Call','Meeting') AND ";
 
                 if(!is_admin($current_user))
                 {
                         $q .= " ( ";
                 }
 
-                $q.=" ((activity.date_start < '". $to_datetime->get_formatted_date() ."' AND activity.date_start >= '". $from_datetime->get_formatted_date()."')";
-                if(!is_admin($current_user))
-                {
-                        $q .= "  ) AND ((crmentity.smownerid ='".$current_user->id."' and salesmanactivityrel.smid = '".$current_user->id."') or (crmentity.smownerid in (".$shared_ids.") and salesmanactivityrel.smid in (".$shared_ids.")))";
-                }
-                $q .= " AND crmentity.deleted = 0) AND recurringevents.activityid is NULL ";
-                $q .= " ORDER by activity.date_start,activity.time_start";
+                $q.=" ((vtiger_activity.date_start < '". $to_datetime->get_formatted_date() ."' AND vtiger_activity.date_start >= '". $from_datetime->get_formatted_date()."')";
+                if(!is_admin($current_user))
+                {
+                        $q .= "  ) AND ((vtiger_crmentity.smownerid ='".$current_user->id."' and vtiger_salesmanactivityrel.smid = '".$current_user->id."') or (vtiger_crmentity.smownerid in (".$shared_ids.") and vtiger_salesmanactivityrel.smid in (".$shared_ids.")))";
+                }
+                $q .= " AND vtiger_crmentity.deleted = 0) AND vtiger_recurringevents.activityid is NULL ";
+                $q .= " ORDER by vtiger_activity.date_start,vtiger_activity.time_start";
 		$r = $adb->query($q);
                 $n = $adb->getRowCount($r);
                 $a = 0;
@@ -85,9 +85,9 @@
                         unset($obj);
                 }
 		//Get Recurring events
-		$q = "SELECT activity.activityid, activity.subject, activity.activitytype, crmentity.description, activity.time_start, activity.duration_hours, activity.duration_minutes, activity.priority, activity.location,activity.eventstatus, crmentity.*, recurringevents.recurringid, recurringevents.recurringdate as date_start ,recurringevents.recurringtype,account.accountname,account.accountid,activitygrouprelation.groupname from activity inner join crmentity on activity.activityid = crmentity.crmid inner join recurringevents on activity.activityid=recurringevents.activityid left outer join activitygrouprelation on activitygrouprelation.activityid=activity.activityid left join cntactivityrel on activity.activityid = cntactivityrel.activityid left join contactdetails on cntactivityrel.contactid = contactdetails.contactid left join account  on contactdetails.accountid = account.accountid inner join salesmanactivityrel on salesmanactivityrel.activityid=activity.activityid";
-
-                $q.=" where ( activity.activitytype in ('Call','Meeting') AND ";
+		$q = "SELECT vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.activitytype, vtiger_crmentity.description, vtiger_activity.time_start, vtiger_activity.duration_hours, vtiger_activity.duration_minutes, vtiger_activity.priority, vtiger_activity.location,vtiger_activity.eventstatus, vtiger_crmentity.*, vtiger_recurringevents.recurringid, vtiger_recurringevents.recurringdate as date_start ,vtiger_recurringevents.recurringtype,vtiger_account.accountname,vtiger_account.accountid,vtiger_activitygrouprelation.groupname from vtiger_activity inner join vtiger_crmentity on vtiger_activity.activityid = vtiger_crmentity.crmid inner join vtiger_recurringevents on vtiger_activity.activityid=vtiger_recurringevents.activityid left outer join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_activity.activityid = vtiger_cntactivityrel.activityid left join vtiger_contactdetails on vtiger_cntactivityrel.contactid = vtiger_contactdetails.contactid left join vtiger_account  on vtiger_contactdetails.accountid = vtiger_account.accountid inner join vtiger_salesmanactivityrel on vtiger_salesmanactivityrel.activityid=vtiger_activity.activityid";
+
+                $q.=" where ( vtiger_activity.activitytype in ('Call','Meeting') AND ";
                 if(!is_admin($current_user))
                 {
                         $q .= " ( ";
@@ -95,10 +95,10 @@
                 $q .= "  (recurringdate < '".$to_datetime->get_formatted_date()."' AND recurringdate >= '".$from_datetime->get_formatted_date(). "') ";
                 if(!is_admin($current_user))
                 {
-			$q .= " ) AND ((crmentity.smownerid ='".$current_user->id."' and salesmanactivityrel.smid = '".$current_user->id."' ) or (crmentity.smownerid in (".$shared_ids.") and salesmanactivityrel.smid in (".$shared_ids.")))";
-                }
-
-                $q .= " AND crmentity.deleted = 0 )" ;
+			$q .= " ) AND ((vtiger_crmentity.smownerid ='".$current_user->id."' and vtiger_salesmanactivityrel.smid = '".$current_user->id."' ) or (vtiger_crmentity.smownerid in (".$shared_ids.") and vtiger_salesmanactivityrel.smid in (".$shared_ids.")))";
+                }
+
+                $q .= " AND vtiger_crmentity.deleted = 0 )" ;
                 $q .= " ORDER by recurringid";
                 $r = $adb->query($q);
                 $n = $adb->getRowCount($r);
@@ -120,7 +120,7 @@
 
 
 	/** To read and set the events value in Appointment Obj
-          * @param $act_array -- The activity array :: Type Array
+          * @param $act_array -- The vtiger_activity array :: Type Array
           * @param $view -- The calendar view :: Type String
          */
 	function readResult($act_array, $view)
@@ -199,7 +199,7 @@
 			$this->assignedto ="user";
 			$this->ownerid = $act_array["smownerid"];
 			$this->owner   = getUserName($act_array["smownerid"]);
-                        $query="SELECT cal_color FROM users where id = ".$this->ownerid;
+                        $query="SELECT cal_color FROM vtiger_users where id = ".$this->ownerid;
                         $result=$adb->query($query);
                         if($adb->getRowCount($result)!=0)
 			{
@@ -241,8 +241,8 @@
 }
 
 /** To two array values
-  * @param $a -- The activity array :: Type Array
-  * @param $b -- The activity array :: Type Array
+  * @param $a -- The vtiger_activity array :: Type Array
+  * @param $b -- The vtiger_activity array :: Type Array
   * @returns value 0 or 1 or -1 depends on comparision result
  */
 function compare($a,$b)

Modified: vtigercrm/trunk/modules/Calendar/CalendarCommon.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/CalendarCommon.php (original)
+++ vtigercrm/trunk/modules/Calendar/CalendarCommon.php Mon Jun 12 14:26:25 2006
@@ -19,13 +19,13 @@
 /**
  * To get the lists of sharedids 
  * @param $id -- The user id :: Type integer
- * @returns $sharedids -- The shared users id :: Type Array
+ * @returns $sharedids -- The shared vtiger_users id :: Type Array
  */
 function getSharedUserId($id)
 {
         global $adb;
 	$sharedid = Array();
-        $query = "SELECT * from sharedcalendar where userid=".$id;
+        $query = "SELECT * from vtiger_sharedcalendar where userid=".$id;
         $result = $adb->query($query);
         $rows = $adb->num_rows($result);
         for($j=0;$j<$rows;$j++)
@@ -36,14 +36,14 @@
 }
 
 /**
- * To get the lists of users id who shared their calendar with specified user
+ * To get the lists of vtiger_users id who shared their calendar with specified user
  * @param $sharedid -- The shared user id :: Type integer
- * @returns $shared_ids -- a comma seperated users id  :: Type string
+ * @returns $shared_ids -- a comma seperated vtiger_users id  :: Type string
  */
 function getSharedCalendarId($sharedid)
 {
 	global $adb;
-	$query = "SELECT * from sharedcalendar where sharedid=".$sharedid;
+	$query = "SELECT * from vtiger_sharedcalendar where sharedid=".$sharedid;
 	$result = $adb->query($query);
 	if($adb->num_rows($result)!=0)
 	{
@@ -55,7 +55,7 @@
 }
 
 /**
- * To get userid and username of all users except the current user
+ * To get userid and username of all vtiger_users except the current user
  * @param $id -- The user id :: Type integer
  * @returns $user_details -- Array in the following format:
  * $user_details=Array($userid1=>$username, $userid2=>$username,............,$useridn=>$username);
@@ -63,7 +63,7 @@
 function getOtherUserName($id)
 {
 	global $adb;
-	$query="select * from users where deleted=0 and status='Active' and id!=".$id;
+	$query="select * from vtiger_users where deleted=0 and status='Active' and id!=".$id;
 	$result = $adb->query($query);
 	$num_rows=$adb->num_rows($result);
 	$user_details=Array();

Modified: vtigercrm/trunk/modules/Calendar/addEventUI.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/addEventUI.php (original)
+++ vtigercrm/trunk/modules/Calendar/addEventUI.php Mon Jun 12 14:26:25 2006
@@ -616,9 +616,9 @@
                 </table>
 </form>
 <script>
-	var fieldname = new Array('task_subject','task_date_start','task_time_start','taskstatus');
-        var fieldlabel = new Array('Subject','Date','Time','Status');
-        var fielddatatype = new Array('V~M','D~M~time_start','T~O','V~O');
+	var vtiger_fieldname = new Array('task_subject','task_date_start','task_time_start','taskstatus');
+        var vtiger_fieldlabel = new Array('Subject','Date','Time','Status');
+        var vtiger_fielddatatype = new Array('V~M','D~M~time_start','T~O','V~O');
 </script>	
 
 </div>

Modified: vtigercrm/trunk/modules/Calendar/calendarLayout.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/calendarLayout.php (original)
+++ vtigercrm/trunk/modules/Calendar/calendarLayout.php Mon Jun 12 14:26:25 2006
@@ -997,30 +997,30 @@
 	$shared_ids = getSharedCalendarId($current_user->id);
 	if(empty($shared_ids))
 		$shared_ids = $current_user->id;
-	$query = "SELECT cntactivityrel.contactid, activity.*
-		FROM activity
-		INNER JOIN crmentity
-			ON crmentity.crmid = activity.activityid
-		LEFT JOIN cntactivityrel
-			ON cntactivityrel.activityid = activity.activityid
-		LEFT OUTER JOIN recurringevents
-			ON recurringevents.activityid = activity.activityid
-		WHERE crmentity.deleted = 0
-			AND (activity.activitytype = 'Meeting' OR activity.activitytype = 'Call')
-			AND (activity.date_start BETWEEN '".$start_date."' AND '".$end_date."'
-				OR recurringevents.recurringdate BETWEEN '".$start_date."' AND '".$end_date."')";
+	$query = "SELECT vtiger_cntactivityrel.contactid, vtiger_activity.*
+		FROM vtiger_activity
+		INNER JOIN vtiger_crmentity
+			ON vtiger_crmentity.crmid = vtiger_activity.activityid
+		LEFT JOIN vtiger_cntactivityrel
+			ON vtiger_cntactivityrel.activityid = vtiger_activity.activityid
+		LEFT OUTER JOIN vtiger_recurringevents
+			ON vtiger_recurringevents.activityid = vtiger_activity.activityid
+		WHERE vtiger_crmentity.deleted = 0
+			AND (vtiger_activity.activitytype = 'Meeting' OR vtiger_activity.activitytype = 'Call')
+			AND (vtiger_activity.date_start BETWEEN '".$start_date."' AND '".$end_date."'
+				OR vtiger_recurringevents.recurringdate BETWEEN '".$start_date."' AND '".$end_date."')";
 	if($info != '')
 	{
-		$pending_query = $query." AND (activity.eventstatus = 'Planned')
-			AND crmentity.smownerid = ".$current_user->id."
-		ORDER BY activity.date_start,activity.time_start ASC";
+		$pending_query = $query." AND (vtiger_activity.eventstatus = 'Planned')
+			AND vtiger_crmentity.smownerid = ".$current_user->id."
+		ORDER BY vtiger_activity.date_start,vtiger_activity.time_start ASC";
 		$res = $adb->query($pending_query);
 		$pending_rows = $adb->num_rows($res);
 	}
 	if(!is_admin($current_user))
-		$query .= " AND crmentity.smownerid in (".$shared_ids.")";
+		$query .= " AND vtiger_crmentity.smownerid in (".$shared_ids.")";
 		
-	$query .= "ORDER BY activity.date_start,activity.time_start ASC";
+	$query .= "ORDER BY vtiger_activity.date_start,vtiger_activity.time_start ASC";
 
 	$result = $adb->query($query);
 	$rows = $adb->num_rows($result);
@@ -1083,27 +1083,27 @@
 	$shared_ids = getSharedCalendarId($current_user->id);
 	if(empty($shared_ids))
 		$shared_ids = $current_user->id;
-        $query = "SELECT cntactivityrel.contactid, activity.*
-                FROM activity
-                INNER JOIN crmentity
-                        ON crmentity.crmid = activity.activityid
-                LEFT JOIN cntactivityrel
-                        ON cntactivityrel.activityid = activity.activityid
-                WHERE crmentity.deleted = 0
-                        AND activity.activitytype = 'Task'
-                        AND (activity.date_start BETWEEN '".$start_date."' AND '".$end_date."')";
+        $query = "SELECT vtiger_cntactivityrel.contactid, vtiger_activity.*
+                FROM vtiger_activity
+                INNER JOIN vtiger_crmentity
+                        ON vtiger_crmentity.crmid = vtiger_activity.activityid
+                LEFT JOIN vtiger_cntactivityrel
+                        ON vtiger_cntactivityrel.activityid = vtiger_activity.activityid
+                WHERE vtiger_crmentity.deleted = 0
+                        AND vtiger_activity.activitytype = 'Task'
+                        AND (vtiger_activity.date_start BETWEEN '".$start_date."' AND '".$end_date."')";
         if($info != '')
         {
-                $pending_query = $query." AND (activity.status != 'Completed')
-                        AND crmentity.smownerid = ".$current_user->id."
-                ORDER BY activity.date_start,activity.time_start ASC";
+                $pending_query = $query." AND (vtiger_activity.status != 'Completed')
+                        AND vtiger_crmentity.smownerid = ".$current_user->id."
+                ORDER BY vtiger_activity.date_start,vtiger_activity.time_start ASC";
                 $res = $adb->query($pending_query);
                 $pending_rows = $adb->num_rows($res);
         }
 	
 	if(!is_admin($current_user))
-                $query .= " AND crmentity.smownerid in (".$shared_ids.")";
-        $query .= " ORDER BY activity.date_start,activity.time_start ASC";
+                $query .= " AND vtiger_crmentity.smownerid in (".$shared_ids.")";
+        $query .= " ORDER BY vtiger_activity.date_start,vtiger_activity.time_start ASC";
 
         $result = $adb->query($query);
         $rows = $adb->num_rows($result);

Modified: vtigercrm/trunk/modules/Calendar/disable_sharing.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/disable_sharing.php (original)
+++ vtigercrm/trunk/modules/Calendar/disable_sharing.php Mon Jun 12 14:26:25 2006
@@ -16,7 +16,7 @@
 $storearray = explode(";",$idlist);
 foreach($storearray as $id)
 {
-        $sql="delete from sharedcalendar where sharedid='" .$id ."'";
+        $sql="delete from vtiger_sharedcalendar where sharedid='" .$id ."'";
         $result = $adb->query($sql);
 }
 header("Location:index.php?module=".$returnmodule."&action=".$returnaction);

Modified: vtigercrm/trunk/modules/Calendar/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Calendar/language/en_us.lang.php Mon Jun 12 14:26:25 2006
@@ -108,7 +108,7 @@
 
 'LBL_APP_IGNORE_TIME2' => '(i.e. the appointment takes place<br />at no particular time on these day(s) )',
 
-'LBL_APP_ERR001' =>'Invalid Date in field %s!',
+'LBL_APP_ERR001' =>'Invalid Date in vtiger_field %s!',
 'LBL_APP_ERR002' =>'start after end !',
 'LBL_APP_ERR003' =>'Missing Contact !',
 'LBL_APP_ERR004' =>'Missing Subject !',
@@ -208,10 +208,10 @@
 'LBL_EVERYMON'=>'Every Month',
 'LBL_REPEATEVENT'=>'Repeat Event',
 
-'LBL_INVITE_INST1'=>'To invite, select the users from the "Available Users" list and click the "Add" button.',
-'LBL_INVITE_INST2'=>'To remove, select the users in the "Selected Users" list and the click "Remove" button.',
-'LBL_SELUSR_INFO'=>' Selected users will receive an email about the Event.',
-'LBL_CALSHAREMESSAGE'=>'Share my calendar with the following selected users',
+'LBL_INVITE_INST1'=>'To invite, select the vtiger_users from the "Available Users" list and click the "Add" button.',
+'LBL_INVITE_INST2'=>'To remove, select the vtiger_users in the "Selected Users" list and the click "Remove" button.',
+'LBL_SELUSR_INFO'=>' Selected vtiger_users will receive an email about the Event.',
+'LBL_CALSHAREMESSAGE'=>'Share my calendar with the following selected vtiger_users',
 'LBL_CALSHARE'=>'Calendar Sharing',
 'LBL_SEL_USERS'=>'Selected Users',
 'LBL_AVL_USERS'=>'Available Users',

Modified: vtigercrm/trunk/modules/Calendar/updateCalendarSharing.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/updateCalendarSharing.php (original)
+++ vtigercrm/trunk/modules/Calendar/updateCalendarSharing.php Mon Jun 12 14:26:25 2006
@@ -15,7 +15,7 @@
 	$hour_format = $_REQUEST['hour_format'];
 else
 	$hour_format = 'am/pm';
-$delquery = "delete from sharedcalendar where userid=".$_REQUEST["current_userid"];
+$delquery = "delete from vtiger_sharedcalendar where userid=".$_REQUEST["current_userid"];
 $adb->query($delquery);
 $sharedid = $_REQUEST['user'];
 if(isset($sharedid) && $sharedid != null)
@@ -24,18 +24,18 @@
         {
                 if($sid != '')
                 {
-			$sql = "insert into sharedcalendar values (".$_REQUEST["current_userid"].",".$sid.")";
+			$sql = "insert into vtiger_sharedcalendar values (".$_REQUEST["current_userid"].",".$sid.")";
 		        $adb->query($sql);
                 }
         }
 }
 if(isset($_REQUEST['start_hour']) && $_REQUEST['start_hour'] != '')
 {
-	$sql = "update users set start_hour='".$_REQUEST['start_hour']."' where id=".$current_user->id;
+	$sql = "update vtiger_users set start_hour='".$_REQUEST['start_hour']."' where id=".$current_user->id;
         $adb->query($sql);
 }
 
-$sql = "update users set hour_format='".$hour_format."' where id=".$current_user->id;
+$sql = "update vtiger_users set hour_format='".$hour_format."' where id=".$current_user->id;
 $adb->query($sql);
 header("Location: index.php?action=index&module=Calendar&parenttab=My Home Page");
 

Modified: vtigercrm/trunk/modules/Campaigns/Campaign.php
==============================================================================
--- vtigercrm/trunk/modules/Campaigns/Campaign.php (original)
+++ vtigercrm/trunk/modules/Campaigns/Campaign.php Mon Jun 12 14:26:25 2006
@@ -25,12 +25,12 @@
 	var $log;
 	var $db;
 
-	// Stored fields
+	// Stored vtiger_fields
 	var $id;
 	var $mode;
 
-	var $tab_name = Array('crmentity','campaign','campaignscf');
-	var $tab_name_index = Array('crmentity'=>'crmid','campaign'=>'campaignid','campaignscf'=>'campaignid');
+	var $tab_name = Array('vtiger_crmentity','vtiger_campaign','vtiger_campaignscf');
+	var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_campaign'=>'campaignid','vtiger_campaignscf'=>'campaignid');
 	var $column_fields = Array();
 
 	var $sortby_fields = Array('campaignname','smownerid','expectedcost');
@@ -69,7 +69,7 @@
                 $button = '';
                 $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;
+		$query = 'SELECT vtiger_contactdetails.*, vtiger_crmentity.crmid, vtiger_users.user_name, vtiger_groups.groupname, vtiger_crmentity.smownerid from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid left join vtiger_users on vtiger_crmentity.smownerid = vtiger_users.id left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid left join vtiger_groups on vtiger_groups.groupname=vtiger_contactgrouprelation.groupname  where vtiger_crmentity.deleted=0 and vtiger_contactdetails.campaignid = '.$id;
 		$log->debug("Exiting get_contacts method ...");
                 return GetRelatedList('Campaigns','Contacts',$focus,$query,$button,$returnset);
         }
@@ -84,7 +84,7 @@
                 $button = '';
                 $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;
+		$query = 'SELECT vtiger_leaddetails.*, vtiger_crmentity.crmid, vtiger_users.user_name, vtiger_groups.groupname, vtiger_crmentity.smownerid from vtiger_leaddetails inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_leaddetails.leadid left join vtiger_users on vtiger_crmentity.smownerid = vtiger_users.id left join vtiger_leadgrouprelation on vtiger_leaddetails.leadid=vtiger_leadgrouprelation.leadid left join vtiger_groups on vtiger_groups.groupname=vtiger_leadgrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_leaddetails.campaignid = '.$id;
 		$log->debug("Exiting get_leads method ...");
                 return GetRelatedList('Campaigns','Leads',$focus,$query,$button,$returnset);
         }

Modified: vtigercrm/trunk/modules/Campaigns/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Campaigns/ListView.php (original)
+++ vtigercrm/trunk/modules/Campaigns/ListView.php Mon Jun 12 14:26:25 2006
@@ -136,7 +136,7 @@
 {
 	if($order_by == 'smownerid')
 	{
-		$list_query .= ' ORDER BY users.user_name '.$sorder;
+		$list_query .= ' ORDER BY vtiger_users.user_name '.$sorder;
 	}
 	else
 	{
@@ -148,7 +148,7 @@
 }
 else
 {
-	$list_query .= ' order by campaign.campaignid DESC';
+	$list_query .= ' order by vtiger_campaign.campaignid DESC';
 }
 
 $list_result = $adb->query($list_query);

Modified: vtigercrm/trunk/modules/Contacts/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/Contacts/CallRelatedList.php Mon Jun 12 14:26:25 2006
@@ -29,11 +29,11 @@
 }
 
 global $adb;
-$sql = $adb->query('select accountid from contactdetails where contactid='.$focus->id);
+$sql = $adb->query('select vtiger_accountid from vtiger_contactdetails where contactid='.$focus->id);
 $accountid = $adb->query_result($sql,0,'accountid');
 if($accountid == 0) $accountid='';
 
-$sql1 = $adb->query('select campaignid from contactdetails where contactid='.$focus->id);
+$sql1 = $adb->query('select vtiger_campaignid from vtiger_contactdetails where contactid='.$focus->id);
 $campaignid = $adb->query_result($sql1,0,'campaignid');
 if($campaignid == 0) $campaignid='';
 

Modified: vtigercrm/trunk/modules/Contacts/Contact.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/Contact.php (original)
+++ vtigercrm/trunk/modules/Contacts/Contact.php Mon Jun 12 14:26:25 2006
@@ -38,8 +38,8 @@
 	var $db;
 
 	var $table_name = "contactdetails";
-	var $tab_name = Array('crmentity','contactdetails','contactaddress','contactsubdetails','contactscf','customerdetails','attachments');
-	var $tab_name_index = Array('crmentity'=>'crmid','contactdetails'=>'contactid','contactaddress'=>'contactaddressid','contactsubdetails'=>'contactsubscriptionid','contactscf'=>'contactid','customerdetails'=>'customerid','attachments'=>'attachmentsid');
+	var $tab_name = Array('vtiger_crmentity','vtiger_contactdetails','vtiger_contactaddress','vtiger_contactsubdetails','vtiger_contactscf','vtiger_customerdetails','vtiger_attachments');
+	var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_contactdetails'=>'contactid','vtiger_contactaddress'=>'contactaddressid','vtiger_contactsubdetails'=>'contactsubscriptionid','vtiger_contactscf'=>'contactid','vtiger_customerdetails'=>'customerid','vtiger_attachments'=>'attachmentsid');
 
 	var $module_id = "contactid";
 	var $object_name = "Contact";
@@ -52,7 +52,7 @@
 
 	var $list_link_field= 'lastname';
 
-	// This is the list of fields that are in the lists.
+	// This is the list of vtiger_fields that are in the lists.
 	var $list_fields = Array(
 	'Last Name' => Array('contactdetails'=>'lastname'),
 	'First Name' => Array('contactdetails'=>'firstname'),
@@ -116,7 +116,7 @@
 	'Title' => 'title'
 	);
 
-	// This is the list of fields that are required
+	// This is the list of vtiger_fields that are required
 	var $required_fields =  array("lastname"=>1);
 
 	//Added these variables which are used as default order by and sortorder in ListView
@@ -159,7 +159,7 @@
     {
 	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";
+        $query = "select count(*) from vtiger_contactdetails  inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_contactdetails.contactid inner join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where user_name='" .$user_name ."' and vtiger_crmentity.deleted=0";
 
         $result = $this->db->query($query,true,"Error retrieving contacts count");
         $rows_found =  $this->db->getRowCount($result);
@@ -174,7 +174,7 @@
     {   
 	global $log;
 	$log->debug("Entering get_contacts1(".$user_name.",".$email_address.") method ...");
-      $query = "select users.user_name, 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";
+      $query = "select vtiger_users.user_name, vtiger_contactdetails.lastname last_name,vtiger_contactdetails.firstname first_name,vtiger_contactdetails.contactid as id, vtiger_contactdetails.salutation as salutation, vtiger_contactdetails.email as email1,vtiger_contactdetails.title as title,vtiger_contactdetails.mobile as phone_mobile,vtiger_account.accountname as vtiger_account_name,vtiger_account.accountid as vtiger_account_id   from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_contactdetails.contactid inner join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid  left join vtiger_account on vtiger_account.accountid=vtiger_contactdetails.accountid left join vtiger_contactaddress on vtiger_contactaddress.contactaddressid=vtiger_contactdetails.contactid  left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid where user_name='" .$user_name ."' and vtiger_crmentity.deleted=0  and vtiger_contactdetails.email like '%" .$email_address ."%' limit 50";
     
 	$log->debug("Exiting get_contacts1 method ...");
       return $this->process_list_query1($query);
@@ -184,7 +184,7 @@
     {   
 	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;
+      $query = "select vtiger_users.user_name,vtiger_groups.groupname,vtiger_contactdetails.department department, vtiger_contactdetails.phone office_phone, vtiger_contactdetails.fax fax, vtiger_contactsubdetails.assistant assistant_name, vtiger_contactsubdetails.otherphone other_phone, vtiger_contactsubdetails.homephone home_phone,vtiger_contactsubdetails.birthday birthdate, vtiger_contactdetails.lastname last_name,vtiger_contactdetails.firstname first_name,vtiger_contactdetails.contactid as id, vtiger_contactdetails.salutation as salutation, vtiger_contactdetails.email as email1,vtiger_contactdetails.title as title,vtiger_contactdetails.mobile as phone_mobile,vtiger_account.accountname as vtiger_account_name,vtiger_account.accountid as vtiger_account_id, vtiger_contactaddress.mailingcity as primary_address_city,vtiger_contactaddress.mailingstreet as primary_address_street, vtiger_contactaddress.mailingcountry as primary_address_country,vtiger_contactaddress.mailingstate as primary_address_state, vtiger_contactaddress.mailingzip as primary_address_postalcode,   vtiger_contactaddress.othercity as alt_address_city,vtiger_contactaddress.otherstreet as alt_address_street, vtiger_contactaddress.othercountry as alt_address_country,vtiger_contactaddress.otherstate as alt_address_state, vtiger_contactaddress.otherzip as alt_address_postalcode  from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_contactdetails.contactid inner join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_account on vtiger_account.accountid=vtiger_contactdetails.accountid left join vtiger_contactaddress on vtiger_contactaddress.contactaddressid=vtiger_contactdetails.contactid left join vtiger_contactsubdetails on vtiger_contactsubdetails.contactsubscriptionid = vtiger_contactdetails.contactid left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid left join vtiger_groups on vtiger_groups.groupname=vtiger_contactgrouprelation.groupname left join vtiger_users on vtiger_crmentity.smownerid=vtiger_users.id where user_name='" .$user_name ."' and vtiger_crmentity.deleted=0 limit " .$from_index ."," .$offset;
       
 	$log->debug("Exiting get_contacts method ...");
       return $this->process_list_query1($query);
@@ -218,8 +218,8 @@
                     }   
 	     }	
     
-// TODO OPTIMIZE THE QUERY ACCOUNT NAME AND ID are set separetly for every contactdetails and hence 
-// account query goes for ecery single account row
+// TODO OPTIMIZE THE QUERY ACCOUNT NAME AND ID are set separetly for every vtiger_contactdetails and hence 
+// vtiger_account query goes for ecery single vtiger_account row
 
                     $list[] = $contact;
                 }
@@ -261,7 +261,7 @@
 		$log->info("Potential Related List for Contact Displayed");
 
 		// First, get the list of IDs.
-		$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';
+		$query = 'select vtiger_users.user_name,vtiger_groups.groupname,vtiger_contactdetails.accountid, vtiger_contactdetails.contactid , vtiger_potential.potentialid, vtiger_potential.potentialname, vtiger_potential.potentialtype, vtiger_potential.sales_stage, vtiger_potential.amount, vtiger_potential.closingdate, vtiger_crmentity.crmid, vtiger_crmentity.smownerid from vtiger_contactdetails inner join vtiger_potential on vtiger_contactdetails.accountid = vtiger_potential.accountid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_potential.potentialid left join vtiger_potentialgrouprelation on vtiger_potential.potentialid=vtiger_potentialgrouprelation.potentialid left join vtiger_groups on vtiger_groups.groupname=vtiger_potentialgrouprelation.groupname left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_contactdetails.contactid = '.$id.' and vtiger_crmentity.deleted=0';
 		if($this->column_fields['account_id'] != 0)
 		$log->debug("Exiting get_opportunities method ...");
 		return GetRelatedList('Contacts','Potentials',$focus,$query,$button,$returnset);
@@ -292,7 +292,7 @@
 
 		$log->info("Activity Related List for Contact Displayed");
 
-		$query = "SELECT users.user_name,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 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 contactdetails.contactid=".$id." and crmentity.deleted = 0 and (activity.activitytype = 'Meeting' or activity.activitytype='Call' or activity.activitytype='Task') AND ( activity.status is NULL OR activity.status != 'Completed' ) and ( activity.eventstatus is NULL OR activity.eventstatus != 'Held') ";  //recurring type is added in Query -Jaguar
+		$query = "SELECT vtiger_users.user_name,vtiger_contactdetails.lastname, vtiger_contactdetails.firstname,  vtiger_activity.activityid , vtiger_activity.subject, vtiger_activity.activitytype, vtiger_activity.date_start, vtiger_activity.due_date, vtiger_cntactivityrel.contactid, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_recurringevents.recurringtype  from vtiger_contactdetails inner join vtiger_cntactivityrel on vtiger_cntactivityrel.contactid = vtiger_contactdetails.contactid inner join vtiger_activity on vtiger_cntactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_cntactivityrel.activityid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname  where vtiger_contactdetails.contactid=".$id." and vtiger_crmentity.deleted = 0 and (vtiger_activity.activitytype = 'Meeting' or vtiger_activity.activitytype='Call' or vtiger_activity.activitytype='Task') AND ( vtiger_activity.status is NULL OR vtiger_activity.status != 'Completed' ) and ( vtiger_activity.eventstatus is NULL OR vtiger_activity.eventstatus != 'Held') ";  //recurring type is added in Query -Jaguar
 		$log->debug("Exiting get_activities method ...");
 		return GetRelatedList('Contacts','Activities',$focus,$query,$button,$returnset);
 
@@ -302,21 +302,21 @@
 	{
 		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,
-			crmentity.createdtime, crmentity.description, users.user_name
-				from activity
-				inner join cntactivityrel on cntactivityrel.activityid= activity.activityid
-				inner join contactdetails on contactdetails.contactid= cntactivityrel.contactid
-				inner join crmentity on crmentity.crmid=activity.activityid
-				left join seactivityrel on seactivityrel.activityid=activity.activityid
-				left join activitygrouprelation on activitygrouprelation.activityid=activity.activityid
-                                left join groups on groups.groupname=activitygrouprelation.groupname
-				inner join users on crmentity.smcreatorid= users.id
-				where (activity.activitytype = 'Meeting' or activity.activitytype='Call' or activity.activitytype='Task')
-				and (activity.status = 'Completed' or activity.status = 'Deferred' or (activity.eventstatus = 'Held' and activity.eventstatus != ''))
-				and cntactivityrel.contactid=".$id;
+		$query = "SELECT vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.status, vtiger_activity.eventstatus,
+		vtiger_activity.activitytype, vtiger_contactdetails.contactid, vtiger_contactdetails.firstname,
+		vtiger_contactdetails.lastname, vtiger_crmentity.modifiedtime,
+		vtiger_crmentity.createdtime, vtiger_crmentity.description, vtiger_users.user_name
+				from vtiger_activity
+				inner join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid
+				inner join vtiger_contactdetails on vtiger_contactdetails.contactid= vtiger_cntactivityrel.contactid
+				inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid
+				left join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid
+				left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_activity.activityid
+                                left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname
+				inner join vtiger_users on vtiger_crmentity.smcreatorid= vtiger_users.id
+				where (vtiger_activity.activitytype = 'Meeting' or vtiger_activity.activitytype='Call' or vtiger_activity.activitytype='Task')
+				and (vtiger_activity.status = 'Completed' or vtiger_activity.status = 'Deferred' or (vtiger_activity.eventstatus = 'Held' and vtiger_activity.eventstatus != ''))
+				and vtiger_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);
@@ -332,7 +332,7 @@
 		$button = '<td valign="bottom" align="right"><input title="New Ticket" accessyKey="F" class="button" onclick="this.form.action.value=\'EditView\';this.form.module.value=\'HelpDesk\'" type="submit" name="button" value="'.$app_strings['LBL_NEW_TICKET'].'">&nbsp;</td>';
 		$returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id;
 
-		$query = "select users.user_name,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;
+		$query = "select vtiger_users.user_name,vtiger_crmentity.crmid, vtiger_troubletickets.title, vtiger_contactdetails.contactid, vtiger_troubletickets.parent_id, vtiger_contactdetails.firstname, vtiger_contactdetails.lastname, vtiger_troubletickets.status, vtiger_troubletickets.priority, vtiger_crmentity.smownerid from vtiger_troubletickets inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_troubletickets.ticketid left join vtiger_contactdetails on vtiger_contactdetails.contactid=vtiger_troubletickets.parent_id left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_ticketgrouprelation on vtiger_troubletickets.ticketid=vtiger_ticketgrouprelation.ticketid left join vtiger_groups on vtiger_groups.groupname=vtiger_ticketgrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_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);
@@ -342,28 +342,28 @@
 	{
 		global $log;
 		$log->debug("Entering get_attachments(".$id.") method ...");
-		$query = "select notes.title,'Notes      ' AS ActivityType,
-			notes.filename, attachments.type AS FileType,crm2.modifiedtime AS lastmodified,
-			seattachmentsrel.attachmentsid AS attachmentsid, notes.notesid AS crmid,
-			crm2.createdtime, notes.notecontent AS description, users.user_name
-		from notes
-			inner join crmentity on crmentity.crmid= notes.contact_id
-			inner join crmentity crm2 on crm2.crmid=notes.notesid and crm2.deleted=0
-			left join seattachmentsrel on seattachmentsrel.crmid =notes.notesid
-			left join attachments on seattachmentsrel.attachmentsid = attachments.attachmentsid
-			inner join users on crm2.smcreatorid= users.id
-		where crmentity.crmid=".$id;
+		$query = "select vtiger_notes.title,'Notes      ' AS ActivityType,
+		vtiger_notes.filename, vtiger_attachments.type AS FileType,crm2.modifiedtime AS lastmodified,
+		vtiger_seattachmentsrel.attachmentsid AS vtiger_attachmentsid, vtiger_notes.notesid AS crmid,
+			crm2.createdtime, vtiger_notes.notecontent AS description, vtiger_users.user_name
+		from vtiger_notes
+			inner join vtiger_crmentity on vtiger_crmentity.crmid= vtiger_notes.contact_id
+			inner join vtiger_crmentity crm2 on crm2.crmid=vtiger_notes.notesid and crm2.deleted=0
+			left join vtiger_seattachmentsrel on vtiger_seattachmentsrel.crmid =vtiger_notes.notesid
+			left join vtiger_attachments on vtiger_seattachmentsrel.attachmentsid = vtiger_attachments.attachmentsid
+			inner join vtiger_users on crm2.smcreatorid= vtiger_users.id
+		where vtiger_crmentity.crmid=".$id;
 		$query .= " union all ";
-		$query .= "select attachments.description AS title,'Attachments' AS ActivityType,
-			attachments.name AS filename, attachments.type AS FileType,crm2.modifiedtime AS lastmodified,
-			attachments.attachmentsid AS attachmentsid, seattachmentsrel.attachmentsid AS crmid,
-			crm2.createdtime, attachments.description, users.user_name
-		from attachments
-			inner join seattachmentsrel on seattachmentsrel.attachmentsid= attachments.attachmentsid
-			inner join crmentity on crmentity.crmid= seattachmentsrel.crmid
-			inner join crmentity crm2 on crm2.crmid=attachments.attachmentsid
-			inner join users on crm2.smcreatorid= users.id
-		where crmentity.crmid=".$id."
+		$query .= "select vtiger_attachments.description AS title,'Attachments' AS ActivityType,
+		vtiger_attachments.name AS filename, vtiger_attachments.type AS FileType,crm2.modifiedtime AS lastmodified,
+		vtiger_attachments.attachmentsid AS vtiger_attachmentsid, vtiger_seattachmentsrel.attachmentsid AS crmid,
+			crm2.createdtime, vtiger_attachments.description, vtiger_users.user_name
+		from vtiger_attachments
+			inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid= vtiger_attachments.attachmentsid
+			inner join vtiger_crmentity on vtiger_crmentity.crmid= vtiger_seattachmentsrel.crmid
+			inner join vtiger_crmentity crm2 on crm2.crmid=vtiger_attachments.attachmentsid
+			inner join vtiger_users on crm2.smcreatorid= vtiger_users.id
+		where vtiger_crmentity.crmid=".$id."
 		order by createdtime desc";
 	  	$log->info("Notes&Attachmenmts for Contact Displayed");
 		$log->debug("Exiting get_attachments method ...");
@@ -384,7 +384,7 @@
 		$button .= '<input title="'.$app_strings['LBL_NEW_QUOTE_BUTTON_TITLE'].'" accessyKey="'.$app_strings['LBL_NEW_QUOTE_BUTTON_KEY'].'" class="button" onclick="this.form.action.value=\'EditView\';this.form.module.value=\'Quotes\'" type="submit" name="button" value="'.$app_strings['LBL_NEW_QUOTE_BUTTON'].'">&nbsp;</td>';
 		}
 		$returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id;
-		$query = "select users.user_name,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 users on users.id=crmentity.smownerid left join quotegrouprelation on quotes.quoteid=quotegrouprelation.quoteid left join groups on groups.groupname=quotegrouprelation.groupname where crmentity.deleted=0 and contactdetails.contactid=".$id;
+		$query = "select vtiger_users.user_name,vtiger_crmentity.*, vtiger_quotes.*,vtiger_potential.potentialname,vtiger_contactdetails.lastname from vtiger_quotes inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_quotes.quoteid left outer join vtiger_contactdetails on vtiger_contactdetails.contactid=vtiger_quotes.contactid left outer join vtiger_potential on vtiger_potential.potentialid=vtiger_quotes.potentialid  left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_quotegrouprelation on vtiger_quotes.quoteid=vtiger_quotegrouprelation.quoteid left join vtiger_groups on vtiger_groups.groupname=vtiger_quotegrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_contactdetails.contactid=".$id;
 		$log->debug("Exiting get_quotes method ...");
 		return GetRelatedList('Contacts','Quotes',$focus,$query,$button,$returnset);
 	  }
@@ -405,7 +405,7 @@
 		 }
 		 $returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id;
 
-		 $query = "select users.user_name,crmentity.*, salesorder.*, quotes.subject as quotename, account.accountname, contactdetails.lastname from salesorder inner join crmentity on crmentity.crmid=salesorder.salesorderid left join users on users.id=crmentity.smownerid 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;
+		 $query = "select vtiger_users.user_name,vtiger_crmentity.*, vtiger_salesorder.*, vtiger_quotes.subject as quotename, vtiger_account.accountname, vtiger_contactdetails.lastname from vtiger_salesorder inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_salesorder.salesorderid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left outer join vtiger_quotes on vtiger_quotes.quoteid=vtiger_salesorder.quoteid left outer join vtiger_account on vtiger_account.accountid=vtiger_salesorder.accountid left outer join vtiger_contactdetails on vtiger_contactdetails.contactid=vtiger_salesorder.contactid left join vtiger_sogrouprelation on vtiger_salesorder.salesorderid=vtiger_sogrouprelation.salesorderid left join vtiger_groups on vtiger_groups.groupname=vtiger_sogrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_salesorder.contactid = ".$id;
 		$log->debug("Exiting get_salesorder method ...");
 		 return GetRelatedList('Contacts','SalesOrder',$focus,$query,$button,$returnset);
 	 }
@@ -426,7 +426,7 @@
 		 }
 		 $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';
+		 $query = 'select vtiger_products.productid, vtiger_products.productname, vtiger_products.productcode, vtiger_products.commissionrate, vtiger_products.qty_per_unit, vtiger_products.unit_price, vtiger_crmentity.crmid, vtiger_crmentity.smownerid,vtiger_contactdetails.lastname from vtiger_products inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_products.productid left outer join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_products.contactid where vtiger_contactdetails.contactid = '.$id.' and vtiger_crmentity.deleted = 0';
 		$log->debug("Exiting get_products method ...");
 		 return GetRelatedList('Contacts','Products',$focus,$query,$button,$returnset);
 	 }
@@ -448,7 +448,7 @@
 		 }
 		 $returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id;
 
-		 $query = "select users.user_name,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 users on users.id=crmentity.smownerid left join pogrouprelation on purchaseorder.purchaseorderid=pogrouprelation.purchaseorderid left join groups on groups.groupname=pogrouprelation.groupname where crmentity.deleted=0 and purchaseorder.contactid=".$id;
+		 $query = "select vtiger_users.user_name,vtiger_crmentity.*, vtiger_purchaseorder.*,vtiger_vendor.vendorname,vtiger_contactdetails.lastname from vtiger_purchaseorder inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_purchaseorder.purchaseorderid left outer join vtiger_vendor on vtiger_purchaseorder.vendorid=vtiger_vendor.vendorid left outer join vtiger_contactdetails on vtiger_contactdetails.contactid=vtiger_purchaseorder.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_pogrouprelation on vtiger_purchaseorder.purchaseorderid=vtiger_pogrouprelation.purchaseorderid left join vtiger_groups on vtiger_groups.groupname=vtiger_pogrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_purchaseorder.contactid=".$id;
 		$log->debug("Exiting get_purchase_orders method ...");
 		 return GetRelatedList('Contacts','PurchaseOrder',$focus,$query,$button,$returnset);
 	 }
@@ -476,7 +476,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";
+		$query = "select vtiger_activity.activityid, vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.activitytype, vtiger_users.user_name, vtiger_crmentity.modifiedtime, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_activity.date_start from vtiger_activity, vtiger_seactivityrel, vtiger_contactdetails, vtiger_users, vtiger_crmentity left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.activityid = vtiger_activity.activityid and vtiger_contactdetails.contactid = vtiger_seactivityrel.crmid and vtiger_users.id=vtiger_crmentity.smownerid and vtiger_crmentity.crmid = vtiger_activity.activityid  and vtiger_contactdetails.contactid = ".$id." and vtiger_activity.activitytype='Emails' and vtiger_crmentity.deleted = 0";
 		$log->debug("Exiting get_emails method ...");
 		return GetRelatedList('Contacts','Emails',$focus,$query,$button,$returnset);
 	}
@@ -492,30 +492,30 @@
 		if($this->checkIfCustomTableExists('contactscf'))
 		{
 			$query =  $this->constructCustomQueryAddendum('contactscf','Contacts') ."
-                                contactdetails.*, contactaddress.*,
-                                account.accountname account_name,
-                                users.user_name assigned_user_name
-                                FROM contactdetails
-				inner join crmentity on crmentity.crmid=contactdetails.contactid
-                                LEFT JOIN users ON crmentity.smownerid=users.id
-                                LEFT JOIN account on contactdetails.accountid=account.accountid
-				left join contactaddress on contactaddress.contactaddressid=contactdetails.contactid
-			        left join contactscf on contactscf.contactid=contactdetails.contactid
-				where crmentity.deleted=0 and users.status='Active' ";
+                                vtiger_contactdetails.*, vtiger_contactaddress.*,
+                                vtiger_account.accountname vtiger_account_name,
+                                vtiger_users.user_name assigned_user_name
+                                FROM vtiger_contactdetails
+				inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_contactdetails.contactid
+                                LEFT JOIN vtiger_users ON vtiger_crmentity.smownerid=vtiger_users.id
+                                LEFT JOIN vtiger_account on vtiger_contactdetails.accountid=vtiger_account.accountid
+				left join vtiger_contactaddress on vtiger_contactaddress.contactaddressid=vtiger_contactdetails.contactid
+			        left join vtiger_contactscf on vtiger_contactscf.contactid=vtiger_contactdetails.contactid
+				where vtiger_crmentity.deleted=0 and vtiger_users.status='Active' ";
 		}
 		else
 		{
                   	 $query = "SELECT
-                                contactdetails.*, contactaddress.*,
-                                account.accountname account_name,
-                                users.user_name assigned_user_name
-                                FROM contactdetails
-                                inner join crmentity on crmentity.crmid=contactdetails.contactid
-                                LEFT JOIN users ON crmentity.smownerid=users.id
-                                LEFT JOIN account on contactdetails.accountid=account.accountid
-				left join contactaddress on contactaddress.contactaddressid=contactdetails.contactid
-			        left join contactscf on contactscf.contactid=contactdetails.contactid
-				where crmentity.deleted=0 and users.status='Active' ";
+                                vtiger_contactdetails.*, vtiger_contactaddress.*,
+                                vtiger_account.accountname vtiger_account_name,
+                                vtiger_users.user_name assigned_user_name
+                                FROM vtiger_contactdetails
+                                inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_contactdetails.contactid
+                                LEFT JOIN vtiger_users ON vtiger_crmentity.smownerid=vtiger_users.id
+                                LEFT JOIN vtiger_account on vtiger_contactdetails.accountid=vtiger_account.accountid
+				left join vtiger_contactaddress on vtiger_contactaddress.contactaddressid=vtiger_contactdetails.contactid
+			        left join vtiger_contactscf on vtiger_contactscf.contactid=vtiger_contactdetails.contactid
+				where vtiger_crmentity.deleted=0 and vtiger_users.status='Active' ";
 		}
                  $log->info("Export Query Constructed Successfully");
 		$log->debug("Exiting create_export_query method ...");
@@ -528,7 +528,7 @@
 {
 	global $log;
 	$log->debug("Entering getColumnNames() method ...");
-	$sql1 = "select fieldlabel from field where tabid=4 and block <> 6 and block <> 75";
+	$sql1 = "select vtiger_fieldlabel from vtiger_field where vtiger_tabid=4 and block <> 6 and block <> 75";
 	$result = $this->db->query($sql1);
 	$numRows = $this->db->num_rows($result);
 	for($i=0; $i < $numRows;$i++)
@@ -548,16 +548,16 @@
 {
 	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,
-						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 
-						where user_name='" .$username ."' and crmentity.deleted=0  and contactdetails.email like '%".$emailaddress."%'";
+	$query = "select vtiger_contactdetails.lastname as last_name,vtiger_contactdetails.firstname as first_name,
+					vtiger_contactdetails.contactid as id, vtiger_contactdetails.salutation as salutation, 
+					vtiger_contactdetails.email as email1,vtiger_contactdetails.title as title,
+					vtiger_contactdetails.mobile as phone_mobile,vtiger_account.accountname as vtiger_account_name,
+					vtiger_account.accountid as vtiger_account_id  from vtiger_contactdetails 
+						inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_contactdetails.contactid 
+						inner join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid  
+						left join vtiger_account on vtiger_account.accountid=vtiger_contactdetails.accountid 
+						left join vtiger_contactaddress on vtiger_contactaddress.contactaddressid=vtiger_contactdetails.contactid 
+						where user_name='" .$username ."' and vtiger_crmentity.deleted=0  and vtiger_contactdetails.email like '%".$emailaddress."%'";
 						
 	$log->debug("Exiting get_searchbyemailid method ...");
 	return $this->process_list_query1($query);
@@ -567,27 +567,27 @@
 {
 	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,  
-						contactsubdetails.otherphone, contactsubdetails.homephone,
-						contactsubdetails.birthday birthdate, contactdetails.lastname last_name,
-						contactdetails.firstname first_name,contactdetails.contactid as id, 
-						contactdetails.salutation, contactdetails.email,
-						contactdetails.title,contactdetails.mobile,
-						account.accountname as account_name,account.accountid as account_id, 
-						contactaddress.mailingcity, contactaddress.mailingstreet, 
-						contactaddress.mailingcountry, contactaddress.mailingstate, 
-						contactaddress.mailingzip, contactaddress.othercity,
-						contactaddress.otherstreet, contactaddress.othercountry,
-						contactaddress.otherstate, contactaddress.otherzip   
-						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 
-						where users.user_name='" .$user_name ."' and crmentity.deleted=0";
+	$query = "select vtiger_contactdetails.department department, vtiger_contactdetails.phone, 
+					vtiger_contactdetails.fax, vtiger_contactsubdetails.assistant assistant_name,
+					vtiger_contactsubdetails.assistantphone,  
+					vtiger_contactsubdetails.otherphone, vtiger_contactsubdetails.homephone,
+					vtiger_contactsubdetails.birthday birthdate, vtiger_contactdetails.lastname last_name,
+					vtiger_contactdetails.firstname first_name,vtiger_contactdetails.contactid as id, 
+					vtiger_contactdetails.salutation, vtiger_contactdetails.email,
+					vtiger_contactdetails.title,vtiger_contactdetails.mobile,
+					vtiger_account.accountname as vtiger_account_name,vtiger_account.accountid as vtiger_account_id, 
+					vtiger_contactaddress.mailingcity, vtiger_contactaddress.mailingstreet, 
+					vtiger_contactaddress.mailingcountry, vtiger_contactaddress.mailingstate, 
+					vtiger_contactaddress.mailingzip, vtiger_contactaddress.othercity,
+					vtiger_contactaddress.otherstreet, vtiger_contactaddress.othercountry,
+					vtiger_contactaddress.otherstate, vtiger_contactaddress.otherzip   
+						from vtiger_contactdetails 
+						inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_contactdetails.contactid 
+						inner join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid 
+						left join vtiger_account on vtiger_account.accountid=vtiger_contactdetails.accountid 
+						left join vtiger_contactaddress on vtiger_contactaddress.contactaddressid=vtiger_contactdetails.contactid 
+						left join vtiger_contactsubdetails on vtiger_contactsubdetails.contactsubscriptionid = vtiger_contactdetails.contactid 
+						where vtiger_users.user_name='" .$user_name ."' and vtiger_crmentity.deleted=0";
 						
 	$log->debug("Exiting get_contactsforol method ...");
 	return $query;

Modified: vtigercrm/trunk/modules/Contacts/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/EditView.php (original)
+++ vtigercrm/trunk/modules/Contacts/EditView.php Mon Jun 12 14:26:25 2006
@@ -105,7 +105,7 @@
 
 $smarty->assign("OP_MODE",$disp_view);
 
-//needed when creating a new contact with a default account value passed in
+//needed when creating a new contact with a default vtiger_account value passed in
 if (isset($_REQUEST['account_name']) && is_null($focus->account_name)) {
 	$focus->account_name = $_REQUEST['account_name'];
 	
@@ -147,7 +147,7 @@
 if(isset($_REQUEST['activity_mode']) && $_REQUEST['activity_mode'] !='')
         $smarty->assign("ACTIVITYMODE",$_REQUEST['activity_mode']);
 
-// Unimplemented until jscalendar language files are fixed
+// Unimplemented until jscalendar language vtiger_files are fixed
 $smarty->assign("CALENDAR_LANG", $app_strings['LBL_JSCALENDAR_LANG']);
 $smarty->assign("CALENDAR_DATEFORMAT", parse_calendardate($app_strings['NTC_DATE_FORMAT']));
 

Modified: vtigercrm/trunk/modules/Contacts/Forms.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/Forms.php (original)
+++ vtigercrm/trunk/modules/Contacts/Forms.php Mon Jun 12 14:26:25 2006
@@ -15,7 +15,7 @@
 /*********************************************************************************
  * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Contacts/Forms.php,v 1.7 2005/03/04 15:18:47 jack Exp $
  * Description:  Contains a variety of utility functions used to display UI
- * components such as form headers and footers.  Intended to be modified on a per
+ * components such as form vtiger_headers and footers.  Intended to be modified on a per
  * theme basis.
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
  * All Rights Reserved.
@@ -79,7 +79,7 @@
 }
 
 /**
- * Create HTML form to enter a new record with the minimum necessary fields.
+ * Create HTML form to enter a new record with the minimum necessary vtiger_fields.
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
  * All Rights Reserved.
  * Contributor(s): ______________________________________..
@@ -107,7 +107,7 @@
 $qcreate_form = get_left_form_header($mod_strings['LBL_NEW_FORM_TITLE']);
 
 
-$qcreate_get_field="select * from field where tabid=4 and quickcreate=0 order by quickcreatesequence";
+$qcreate_get_field="select * from vtiger_field where vtiger_tabid=4 and quickcreate=0 order by quickcreatesequence";
 $qcreate_get_result=$adb->query($qcreate_get_field);
 $qcreate_get_noofrows=$adb->num_rows($qcreate_get_result);
 
@@ -196,9 +196,9 @@
 $qcreate_form.='</form>';
 $qcreate_form.='<script type="text/javascript">
 		
-	var fieldname = new Array('.$fieldName.')
-	var fieldlabel = new Array('.$fieldLabel.')
-	var fielddatatype = new Array('.$fldDataType.')
+	var vtiger_fieldname = new Array('.$fieldName.')
+	var vtiger_fieldlabel = new Array('.$fieldLabel.')
+	var vtiger_fielddatatype = new Array('.$fldDataType.')
 
 		</script>';
 

Modified: vtigercrm/trunk/modules/Contacts/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/ListView.php (original)
+++ vtigercrm/trunk/modules/Contacts/ListView.php Mon Jun 12 14:26:25 2006
@@ -79,7 +79,7 @@
 	$smarty->assign("SEARCH_URL",$url_string);
 				
 //Added for Custom Field Search
-/*$sql="select * from field where tablename='contactscf' order by fieldlabel";
+/*$sql="select * from vtiger_field where vtiger_tablename='contactscf' order by vtiger_fieldlabel";
 $result=$adb->query($sql);
 for($i=0;$i<$adb->num_rows($result);$i++)
 {
@@ -91,11 +91,11 @@
         if(isset($customfield[$i]) && $customfield[$i] != '')
         {
 		if($uitype[$i] == 56)
-			$str = " contactscf.".$column[$i]." = 1";
+			$str = " vtiger_contactscf.".$column[$i]." = 1";
 		elseif($uitype[$i] == 15)//Added to handle the picklist customfield - after 4.2 patch2 
-			$str = " contactscf.".$column[$i]." = '".$customfield[$i]."'";
+			$str = " vtiger_contactscf.".$column[$i]." = '".$customfield[$i]."'";
 		else
-	        	$str = " contactscf.".$column[$i]." like '$customfield[$i]%'";
+	        	$str = " vtiger_contactscf.".$column[$i]." like '$customfield[$i]%'";
                 array_push($where_clauses, $str);
 		$url_string .="&".$column[$i]."=".$customfield[$i];
         }

Modified: vtigercrm/trunk/modules/Contacts/Merge.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/Merge.php (original)
+++ vtigercrm/trunk/modules/Contacts/Merge.php Mon Jun 12 14:26:25 2006
@@ -42,7 +42,7 @@
 }
 //get the particular file from db and store it in the local hard disk.
 //store the path to the location where the file is stored and pass it  as parameter to the method 
-$sql = "select filename,data,filesize from wordtemplates where templateid=".$templateid;
+$sql = "select filename,data,filesize from vtiger_wordtemplates where templateid=".$templateid;
 
 $result = $adb->query($sql);
 $temparray = $adb->fetch_array($result);
@@ -77,7 +77,7 @@
 }
 
 //<<<<<<<<<<<<<<<<header for csv and select columns for query>>>>>>>>>>>>>>>>>>>>>>>>
-$query1="select tab.name,field.tablename,field.columnname,field.fieldlabel from field inner join tab on tab.tabid = field.tabid where field.tabid in (4,6) and field.block <> 6 and field.block <> 75 order by field.tablename";
+$query1="select vtiger_tab.name,vtiger_field.tablename,vtiger_field.columnname,vtiger_field.fieldlabel from vtiger_field inner join vtiger_tab on vtiger_tab.tabid = vtiger_field.tabid where vtiger_field.tabid in (4,6) and vtiger_field.block <> 6 and vtiger_field.block <> 75 order by vtiger_field.tablename";
 
 $result = $adb->query($query1);
 $y=$adb->num_rows($result);
@@ -104,7 +104,7 @@
     }
 		if($modulename == "Contacts")
     {
-    	$querycolumns[$x]="concat(users.last_name,' ',users.first_name) as usercname,users.first_name,users.last_name,users.user_name,users.yahoo_id,users.title,users.phone_work,users.department,users.phone_mobile,users.phone_other,users.phone_fax,users.email1,users.phone_home,users.email2,users.address_street,users.address_city,users.address_state,users.address_postalcode,users.address_country";
+    	$querycolumns[$x]="concat(vtiger_users.last_name,' ',vtiger_users.first_name) as usercname,vtiger_users.first_name,vtiger_users.last_name,vtiger_users.user_name,vtiger_users.yahoo_id,vtiger_users.title,vtiger_users.phone_work,vtiger_users.department,vtiger_users.phone_mobile,vtiger_users.phone_other,vtiger_users.phone_fax,vtiger_users.email1,vtiger_users.phone_home,vtiger_users.email2,vtiger_users.address_street,vtiger_users.address_city,vtiger_users.address_state,vtiger_users.address_postalcode,vtiger_users.address_country";
     }
   }
 	if($columnname == "parentid")
@@ -146,22 +146,22 @@
 	$selectcolumns = implode($querycolumns,",");
 	
 
-$query = "select ".$selectcolumns." from contactdetails
-				inner join crmentity on crmentity.crmid = contactdetails.contactid 
-				inner join contactaddress on contactdetails.contactid = contactaddress.contactaddressid 
-				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
-				left join account as accountContacts on accountContacts.accountid = contactdetails.accountid 
-				left join users on users.id = crmentity.smownerid
-				left join account on account.accountid = contactdetails.accountid
-				left join crmentity as crmentityAccounts on crmentityAccounts.crmid=account.accountid
-				left join accountbillads on account.accountid=accountbillads.accountaddressid
-				left join accountshipads on account.accountid=accountshipads.accountaddressid
-				left join accountscf on account.accountid = accountscf.accountid
-				left join account as accountAccounts on accountAccounts.accountid = account.parentid
-				left join users as usersAccounts on usersAccounts.id = crmentityAccounts.smownerid 
-				where crmentity.deleted=0 and (crmentityAccounts.deleted <> 1) and contactdetails.contactid in(".$mass_merge.")";
+$query = "select ".$selectcolumns." from vtiger_contactdetails
+				inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid 
+				inner join vtiger_contactaddress on vtiger_contactdetails.contactid = vtiger_contactaddress.contactaddressid 
+				inner join vtiger_contactsubdetails on vtiger_contactdetails.contactid = vtiger_contactsubdetails.contactsubscriptionid 
+				inner join vtiger_contactscf on vtiger_contactdetails.contactid = vtiger_contactscf.contactid 
+				left join vtiger_contactdetails as vtiger_contactdetailsContacts on vtiger_contactdetailsContacts.contactid = vtiger_contactdetails.reportsto
+				left join vtiger_account as vtiger_accountContacts on vtiger_accountContacts.accountid = vtiger_contactdetails.accountid 
+				left join vtiger_users on vtiger_users.id = vtiger_crmentity.smownerid
+				left join vtiger_account on vtiger_account.accountid = vtiger_contactdetails.accountid
+				left join vtiger_crmentity as vtiger_crmentityAccounts on vtiger_crmentityAccounts.crmid=vtiger_account.accountid
+				left join vtiger_accountbillads on vtiger_account.accountid=vtiger_accountbillads.accountaddressid
+				left join vtiger_accountshipads on vtiger_account.accountid=vtiger_accountshipads.accountaddressid
+				left join vtiger_accountscf on vtiger_account.accountid = vtiger_accountscf.accountid
+				left join vtiger_account as vtiger_accountAccounts on vtiger_accountAccounts.accountid = vtiger_account.parentid
+				left join vtiger_users as vtiger_usersAccounts on vtiger_usersAccounts.id = vtiger_crmentityAccounts.smownerid 
+				where vtiger_crmentity.deleted=0 and (crmentityAccounts.deleted <> 1) and vtiger_contactdetails.contactid in(".$mass_merge.")";
 				
 
 $result = $adb->query($query);
@@ -197,7 +197,7 @@
 $csvdata = implode($mergevalue,"###");
 }else
 {
-	die("No fields to do Merge");
+	die("No vtiger_fields to do Merge");
 }	
 
 $handle = fopen($wordtemplatedownloadpath."datasrc.csv","wb");

Modified: vtigercrm/trunk/modules/Contacts/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/Save.php (original)
+++ vtigercrm/trunk/modules/Contacts/Save.php Mon Jun 12 14:26:25 2006
@@ -84,7 +84,7 @@
         {
                 if(isset($_REQUEST[$fieldname]))
                 {
-			$log->debug("Assigning the previous values given for the contact to respective fields ");
+			$log->debug("Assigning the previous values given for the contact to respective vtiger_fields ");
                         $field_values_passed.="&";
                         $value = $_REQUEST[$fieldname];
                         $focus->column_fields[$fieldname] = $value;
@@ -113,7 +113,7 @@
 if($saveimage=="true")
 {
         $focus->column_fields['imagename']=$image_name_val;
-        $log->debug("Assign the Image name to the field name ");
+        $log->debug("Assign the Image name to the vtiger_field name ");
 }
 //Saving the contact
 if($image_error=="false")
@@ -134,7 +134,7 @@
 	//BEGIN -- Code for Create Customer Portal Users password and Send Mail 
 	if($_REQUEST['portal'] == '' && $_REQUEST['mode'] == 'edit')
 	{
-		$sql = "update portalinfo set user_name='".$_REQUEST['email']."',isactive=0 where id=".$_REQUEST['record'];
+		$sql = "update vtiger_portalinfo set user_name='".$_REQUEST['email']."',isactive=0 where id=".$_REQUEST['record'];
 		$adb->query($sql);
 	}
 	elseif($_REQUEST['portal'] != '' && $_REQUEST['email'] != '')// && $_REQUEST['mode'] != 'edit')
@@ -145,7 +145,7 @@
 		if($_REQUEST['mode'] != 'edit')
 			$insert = 'true';
 
-		$sql = "select id,user_name,user_password,isactive from portalinfo";
+		$sql = "select id,user_name,user_password,isactive from vtiger_portalinfo";
 		$result = $adb->query($sql);
 
 		for($i=0;$i<$adb->num_rows($result);$i++)
@@ -159,7 +159,7 @@
 					$flag = 'true';
 				else
 				{
-					$sql = "update portalinfo set user_name='".$username."', isactive=1 where id=".$id;
+					$sql = "update vtiger_portalinfo set user_name='".$username."', isactive=1 where id=".$id;
 					$adb->query($sql);
 					$update = 'true';
 					$flag = 'true';
@@ -175,7 +175,7 @@
 		if($insert == 'true')
 		{
 			$password = makeRandomPassword();
-			$sql = "insert into portalinfo (id,user_name,user_password,type,isactive) values(".$focus->id.",'".$username."','".$password."','C',1)";
+			$sql = "insert into vtiger_portalinfo (id,user_name,user_password,type,isactive) values(".$focus->id.",'".$username."','".$password."','C',1)";
 			$adb->query($sql);
 		}
 

Modified: vtigercrm/trunk/modules/Contacts/chat.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/chat.php (original)
+++ vtigercrm/trunk/modules/Contacts/chat.php Mon Jun 12 14:26:25 2006
@@ -32,7 +32,7 @@
  * Constants for the chat
  */
 $chat_conf = array();
-$chat_conf['alive_time'] = "30"; // time users should report to be online, in seconds.
+$chat_conf['alive_time'] = "30"; // time vtiger_users should vtiger_report to be online, in seconds.
 $chat_conf['msg_limit'] = "10"; // maximum msg's to send in one request.
 
 /*************************************************************/
@@ -68,7 +68,7 @@
     // las message id received by user
     if(!isset($_SESSION["mlid"]))
       {
-	$res = $adb->query("SELECT max(id) AS id FROM chat_msg");
+	$res = $adb->query("SELECT max(id) AS id FROM vtiger_chat_msg");
 	$line = $adb->fetch_array($res);
 	if(intval($line['id']) == 0)
 	  $_SESSION["mlid"] = 0;
@@ -89,7 +89,7 @@
       }
     else
       {
-	      $res = $adb->query("UPDATE chat_users SET ping = ".$adb->database->sysTimeStamp." WHERE session = '".session_id()."'");
+	      $res = $adb->query("UPDATE vtiger_chat_users SET ping = ".$adb->database->sysTimeStamp." WHERE session = '".session_id()."'");
 	if($adb->getAffectedRowCount($res) == 0)
 	  {
 	    $this->setUserNick();
@@ -164,7 +164,7 @@
   {
 	global $current_user;	
 	global $adb;
-    $res = $adb->query("SELECT id FROM chat_users WHERE session = '".session_id()."'");
+    $res = $adb->query("SELECT id FROM vtiger_chat_users WHERE session = '".session_id()."'");
     if($adb->num_rows($res) > 0)
       {
 	$line = $adb->fetch_array($res);
@@ -174,7 +174,7 @@
     
     $_SESSION['chat_user'] = $adb->getUniqueID('chat_users');
     
-    $res = $adb->query("INSERT INTO chat_users (id, nick, session, ping, ip)
+    $res = $adb->query("INSERT INTO vtiger_chat_users (id, nick, session, ping, ip)
    			 VALUES ('".$_SESSION['chat_user']."',
 			 	'".$current_user->user_name."',
 				 '".session_id()."',
@@ -186,7 +186,7 @@
   }
   
   /**
-   * generate the available users list
+   * generate the available vtiger_users list
    */
   function getUserList()
   {
@@ -194,9 +194,9 @@
     global $chat_conf;
     $tmp = '';
     $delete_from = time() - $chat_conf['alive_time'];
-    $res = $adb->query("DELETE FROM chat_users
+    $res = $adb->query("DELETE FROM vtiger_chat_users
     			WHERE ping > ".$adb->formatDate($delete_from));
-    $res = $adb->query("SELECT id, nick FROM chat_users");
+    $res = $adb->query("SELECT id, nick FROM vtiger_chat_users");
     if($adb->num_rows($res)==0)
       {
 	$this->json = '';
@@ -232,10 +232,10 @@
     $res = $adb->limitQuery("SELECT ms.id AS mid, ms.chat_from AS mfrom,
    				 ms.chat_to AS mto,pv.id AS id,
 				 us.nick AS nfrom, ms.msg AS msg
-			FROM chat_users us
-			INNER JOIN chat_msg ms
+			FROM vtiger_chat_users us
+			INNER JOIN vtiger_chat_msg ms
 				ON us.id = ms.chat_from
-			INNER JOIN chat_pvchat pv
+			INNER JOIN vtiger_chat_pvchat pv
 				ON pv.msg = ms.id
 			WHERE ms.id > '".($_SESSION['mlid'])."'
 			AND (ms.chat_from = '".$_SESSION['chat_user']."'
@@ -277,10 +277,10 @@
     $res = $adb->limitQuery("SELECT ms.id AS mid, ms.chat_from AS mfrom,
     				ms.chat_to AS mto, p.id AS id,
 				us.nick AS nfrom, ms.msg AS msg
-			FROM chat_users us
-			INNER JOIN chat_msg ms
+			FROM vtiger_chat_users us
+			INNER JOIN vtiger_chat_msg ms
 				ON us.id = ms.chat_from
-			INNER JOIN chat_pchat p
+			INNER JOIN vtiger_chat_pchat p
 				ON p.msg = ms.id
 			WHERE ms.id > '".($_SESSION['mlid'])."'
 			AND ms.chat_to = 0
@@ -319,10 +319,10 @@
 	    if(isset($words[1]) && strlen($words[1]) > 3)
 	      {
 		$res = $adb->query("SELECT nick
-				FROM chat_users
+				FROM vtiger_chat_users
 				WHERE id= '".$_SESSION['chat_user']."'");
 		$line = $adb->fetch_array($res);
-		$res = $adb->query("UPDATE chat_users
+		$res = $adb->query("UPDATE vtiger_chat_users
 				SET nick = ".$adb->quote($words[1])."
 				WHERE id = '".$_SESSION['chat_user']."'");
 		$msg = '\sys <span class="sysb">'.$line['nick'].'</span> changed nick to <span class="sysb">'.$words[1].'</span>';
@@ -347,7 +347,7 @@
     if(strlen($msg) == 0) return;
     
     $id = $adb->getUniqueID('chat_msg');
-    $res = $adb->query("INSERT INTO chat_msg (id, chat_from, chat_to, born, msg)
+    $res = $adb->query("INSERT INTO vtiger_chat_msg (id, chat_from, chat_to, born, msg)
     			VALUES (".$id.", '".$_SESSION['chat_user']."', '".$to."', ".$adb->database->sysTimeStamp.", '".$msg."')");
     
     $chat = "p";
@@ -363,7 +363,7 @@
   function pvClose($to)
   {
 	global $adb;
-    $res = $adb->query("DELETE FROM chat_msg
+    $res = $adb->query("DELETE FROM vtiger_chat_msg
    			 WHERE (chat_from = '".$to."'
 				 AND chat_to = '".$_SESSION['chat_user']."')
 			 OR (chat_from = '".$_SESSION['chat_user']."'

Modified: vtigercrm/trunk/modules/Contacts/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Contacts/language/en_us.lang.php Mon Jun 12 14:26:25 2006
@@ -52,8 +52,8 @@
 	
 'LBL_EXISTING_CONTACT' => 'Used an existing contact',
 'LBL_CREATED_CONTACT' => 'Created a new contact',
-'LBL_EXISTING_ACCOUNT' => 'Used an existing account',
-'LBL_CREATED_ACCOUNT' => 'Created a new account',
+'LBL_EXISTING_ACCOUNT' => 'Used an existing vtiger_account',
+'LBL_CREATED_ACCOUNT' => 'Created a new vtiger_account',
 'LBL_CREATED_CALL' => 'Created a new call',
 'LBL_CREATED_MEETING' => 'Created a new meeting',
 'LBL_ADDMORE_BUSINESSCARD' =>'Add another business card',
@@ -102,13 +102,13 @@
 'LBL_CONTACT_ROLE'=>'Role:',
 'LBL_OPP_NAME'=>'Opportunity Name:',
 'LBL_DUPLICATE'=>'Potential Duplicate Contacts',
-'MSG_DUPLICATE' => 'Creating this contact may potentialy create a duplicate contact. You may either select a contact from the list below or you may click on Create New Contact to continue creating a new contact with the previously entered data.',
+'MSG_DUPLICATE' => 'Creating this contact may vtiger_potentialy create a duplicate contact. You may either select a contact from the list below or you may click on Create New Contact to continue creating a new contact with the previously entered data.',
 
 'LNK_NEW_APPOINTMENT' => 'New Appointment',
 'LBL_ADD_BUSINESSCARD' => 'Add Business Card',
 'NTC_DELETE_CONFIRMATION'=>'Are you sure you want to delete this record?',
 'NTC_REMOVE_CONFIRMATION'=>'Are you sure you want to remove this contact from this case?',
-'NTC_REMOVE_DIRECT_REPORT_CONFIRMATION'=>'Are you sure you want to remove this record as a direct report?',
+'NTC_REMOVE_DIRECT_REPORT_CONFIRMATION'=>'Are you sure you want to remove this record as a direct vtiger_report?',
 'ERR_DELETE_RECORD'=>"en_us A record number must be specified to delete the contact.",
 'NTC_COPY_PRIMARY_ADDRESS'=>'Copy primary address to alternate address',
 'NTC_COPY_ALTERNATE_ADDRESS'=>'Copy alternate address to primary address',
@@ -176,7 +176,7 @@
 'Contact Image'=>'Contact Image',
 'Description'=>'Description',
 
-// Added fields for Add Business Card
+// Added vtiger_fields for Add Business Card
 'LBL_NEW_CONTACT'=>'New Contact',
 'LBL_NEW_ACCOUNT'=>'New Account',
 'LBL_NOTE_SUBJECT'=>'Note Subject:',
@@ -187,7 +187,7 @@
 'LBL_START_DATE'=>'Start Date:',
 'LBL_START_TIME'=>'Start Time:',
 
-//Added field after 4_0_1
+//Added vtiger_field after 4_0_1
 'Portal User'=>'Portal User',
 'LBL_CUSTOMER_PORTAL_INFORMATION'=>'Customer Portal Information',
 'Support Start Date'=>'Support Start Date',
@@ -195,7 +195,7 @@
 //Added for 4.2 Release -- CustomView
 'Name'=>'Name',
 'LBL_ALL'=>'All',
-'LBL_MAXIMUM_LIMIT_ERROR'=>'Sorry, the uploaded file exceeds the maximum filesize limit. Please try a file smaller than 800000 bytes',
+'LBL_MAXIMUM_LIMIT_ERROR'=>'Sorry, the uploaded file exceeds the maximum vtiger_filesize limit. Please try a file smaller than 800000 bytes',
 'LBL_UPLOAD_ERROR'=>'Problems in file upload. Please try again!',
 'LBL_IMAGE_ERROR'=>'The given file is not of type image(.gif/.jpg/.png)',
 'LBL_INVALID_IMAGE'=>'Invalid file OR File has no data',

Modified: vtigercrm/trunk/modules/CustomView/CustomView.php
==============================================================================
--- vtigercrm/trunk/modules/CustomView/CustomView.php (original)
+++ vtigercrm/trunk/modules/CustomView/CustomView.php Mon Jun 12 14:26:25 2006
@@ -94,7 +94,7 @@
 				$viewid = $this->setdefaultviewid;
 			}else
 			{
-				$query="select cvid from customview where viewname='All' and entitytype='".$module."'";
+				$query="select cvid from vtiger_customview where viewname='All' and entitytype='".$module."'";
 				$cvresult=$adb->query($query);
 				$viewid = $adb->query_result($cvresult,0,'cvid');;
 			}
@@ -133,14 +133,14 @@
 		return $groupid;
 	}
 
-	// to get the available customviews for a module
+	// to get the available vtiger_customviews for a module
 	// return type array
 	function getCustomViewByCvid($cvid)
 	{
 		global $adb;
 		$tabid = getTabid($this->customviewmodule);
-		$ssql = "select customview.* from customview inner join tab on tab.name = customview.entitytype";
-		$ssql .= " where customview.cvid=".$cvid;		
+		$ssql = "select vtiger_customview.* from vtiger_customview inner join vtiger_tab on vtiger_tab.name = vtiger_customview.entitytype";
+		$ssql .= " where vtiger_customview.cvid=".$cvid;		
 
 		$result = $adb->query($ssql);
 
@@ -157,8 +157,8 @@
 		global $adb;
 		global $app_strings;
 		$tabid = getTabid($this->customviewmodule);
-		$ssql = "select customview.* from customview inner join tab on tab.name = customview.entitytype";
-		$ssql .= " where tab.tabid=".$tabid;
+		$ssql = "select vtiger_customview.* from vtiger_customview inner join vtiger_tab on vtiger_tab.name = vtiger_customview.entitytype";
+		$ssql .= " where vtiger_tab.tabid=".$tabid;
 		$result = $adb->query($ssql);
 		while($cvrow=$adb->fetch_array($result))
 		{
@@ -188,18 +188,18 @@
 
 		if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0)
 		{
-			$sql = "select * from field ";
-			$sql.= " where field.tabid=".$tabid." and field.block in (".$block.") and";
-			$sql.= " field.displaytype in (1,2)";
+			$sql = "select * from vtiger_field ";
+			$sql.= " where vtiger_field.tabid=".$tabid." and vtiger_field.block in (".$block.") and";
+			$sql.= " vtiger_field.displaytype in (1,2)";
 			$sql.= " order by sequence";
 		}
 		else
 		{
 			$profileList = getCurrentUserProfileList();
-			$sql = "select * from field inner join profile2field on profile2field.fieldid=field.fieldid inner join def_org_field on def_org_field.fieldid=field.fieldid ";
-			$sql.= " where field.tabid=".$tabid." and field.block in (".$block.") and";
-			$sql.= " field.displaytype in (1,2) and profile2field.visible=0";
-			$sql.= " and def_org_field.visible=0  and profile2field.profileid in ".$profileList." order by sequence";
+			$sql = "select * from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid ";
+			$sql.= " where vtiger_field.tabid=".$tabid." and vtiger_field.block in (".$block.") and";
+			$sql.= " vtiger_field.displaytype in (1,2) and vtiger_profile2field.visible=0";
+			$sql.= " and vtiger_def_org_field.visible=0  and vtiger_profile2field.profileid in ".$profileList." order by sequence";
 		}	
 
 
@@ -211,7 +211,7 @@
 		{
 			$module_columnlist['crmentity:crmid::HelpDesk_Ticket ID:I'] = 'Ticket ID';
 		}
-		//Added to include activity type in activity customview list
+		//Added to include vtiger_activity type in vtiger_activity vtiger_customview list
 		if($module == 'Activities' && $block == 19)
 		{
 			$module_columnlist['activity:activitytype:activitytype:Activities_Activity Type:C'] = 'Activity Type';
@@ -266,9 +266,9 @@
 	{
 		global $adb;
 		
-		$sSQL = "select cvcolumnlist.* from cvcolumnlist";
-		$sSQL .= " inner join customview on customview.cvid = cvcolumnlist.cvid";
-		$sSQL .= " where customview.cvid =".$cvid." order by cvcolumnlist.columnindex";
+		$sSQL = "select vtiger_cvcolumnlist.* from vtiger_cvcolumnlist";
+		$sSQL .= " inner join vtiger_customview on vtiger_customview.cvid = vtiger_cvcolumnlist.cvid";
+		$sSQL .= " where vtiger_customview.cvid =".$cvid." order by vtiger_cvcolumnlist.columnindex";
 		$result = $adb->query($sSQL);
 		
 		while($columnrow = $adb->fetch_array($result))
@@ -297,18 +297,18 @@
 
 		if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0)
 		{
-			$sql = "select * from field inner join tab on tab.tabid = field.tabid ";
-			$sql.= " where field.tabid=".$tabid." and field.block in (".$blockids.")
-                        and (field.uitype =5 or field.displaytype=2) ";
-			$sql.= " order by field.sequence";
+			$sql = "select * from vtiger_field inner join vtiger_tab on vtiger_tab.tabid = vtiger_field.tabid ";
+			$sql.= " where vtiger_field.tabid=".$tabid." and vtiger_field.block in (".$blockids.")
+                        and (vtiger_field.uitype =5 or vtiger_field.displaytype=2) ";
+			$sql.= " order by vtiger_field.sequence";
 		}
 		else
 		{
 			$profileList = getCurrentUserProfileList();
-			$sql = "select * from field inner join tab on tab.tabid = field.tabid inner join  profile2field on profile2field.fieldid=field.fieldid inner join def_org_field on def_org_field.fieldid=field.fieldid ";
-			$sql.= " where field.tabid=".$tabid." and field.block in (".$blockids.") and (field.uitype =5 or field.displaytype=2)";
-			$sql.= " and profile2field.visible=0";
-			$sql.= " and def_org_field.visible=0  and profile2field.profileid in ".$profileList." order by field.sequence";
+			$sql = "select * from vtiger_field inner join vtiger_tab on vtiger_tab.tabid = vtiger_field.tabid inner join  vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid ";
+			$sql.= " where vtiger_field.tabid=".$tabid." and vtiger_field.block in (".$blockids.") and (vtiger_field.uitype =5 or vtiger_field.displaytype=2)";
+			$sql.= " and vtiger_profile2field.visible=0";
+			$sql.= " and vtiger_def_org_field.visible=0  and vtiger_profile2field.profileid in ".$profileList." order by vtiger_field.sequence";
 		}			
 
 
@@ -609,8 +609,8 @@
 	{
 		global $adb;
 
-		$sSQL = "select cvstdfilter.* from cvstdfilter inner join customview on customview.cvid = cvstdfilter.cvid";
-		$sSQL .= " where cvstdfilter.cvid=".$cvid;
+		$sSQL = "select vtiger_cvstdfilter.* from vtiger_cvstdfilter inner join vtiger_customview on vtiger_customview.cvid = vtiger_cvstdfilter.cvid";
+		$sSQL .= " where vtiger_cvstdfilter.cvid=".$cvid;
 
 		$result = $adb->query($sSQL);
 		$stdfilterrow = $adb->fetch_array($result);
@@ -644,8 +644,8 @@
 		global $adb;
 		global $modules;
 
-		$sSQL = "select cvadvfilter.* from cvadvfilter inner join customview on cvadvfilter.cvid = customview.cvid";
-		$sSQL .= " where cvadvfilter.cvid=".$cvid;
+		$sSQL = "select vtiger_cvadvfilter.* from vtiger_cvadvfilter inner join vtiger_customview on vtiger_cvadvfilter.cvid = vtiger_customview.cvid";
+		$sSQL .= " where vtiger_cvadvfilter.cvid=".$cvid;
 		$result = $adb->query($sSQL);
 
 		while($advfilterrow = $adb->fetch_array($result))
@@ -678,7 +678,7 @@
 					{
 						if($list[1] == "status")
 						{
-							$sqllist_column = "case when (activity.status not like '') then activity.status else activity.eventstatus end as activitystatus";
+							$sqllist_column = "case when (vtiger_activity.status not like '') then vtiger_activity.status else vtiger_activity.eventstatus end as vtiger_activitystatus";
 						}
 					}
 					$sqllist[] = $sqllist_column;
@@ -756,10 +756,10 @@
 							$advfiltersql[] = " (".$advorsqls.") ";
 						}else
 						{
-							//Added for getting activity Status -Jaguar
+							//Added for getting vtiger_activity Status -Jaguar
 							if($this->customviewmodule == "Activities" && $columns[1] == "status")
 							{
-								$advfiltersql[] = "case when (activity.status not like '') then activity.status else activity.eventstatus end".$this->getAdvComparator($advfltrow["comparator"],trim($advfltrow["value"]));
+								$advfiltersql[] = "case when (vtiger_activity.status not like '') then vtiger_activity.status else vtiger_activity.eventstatus end".$this->getAdvComparator($advfltrow["comparator"],trim($advfltrow["value"]));
 							}
 							else
 							{
@@ -833,7 +833,7 @@
                 global $log;
                 $log->info("in getSalesEntityId ".$setype);
 		global $adb;
-		$sql = "select crmid from crmentity where setype='".$setype."' and deleted = 0";
+		$sql = "select crmid from vtiger_crmentity where setype='".$setype."' and deleted = 0";
 		$result = $adb->query($sql);
 		while($row = $adb->fetch_array($result))
 		{
@@ -856,7 +856,7 @@
 		global $adb;
 		if($so_name != '')
 		{
-			$sql = "select salesorderid from salesorder where subject='".$so_name."'";
+			$sql = "select vtiger_salesorderid from vtiger_salesorder where subject='".$so_name."'";
 			$result = $adb->query($sql);
 			$so_id = $adb->query_result($result,0,"salesorderid");
 		}
@@ -870,7 +870,7 @@
 		global $adb;
 		if($product_name != '')
 		{
-			$sql = "select productid from products where productname='".$product_name."'";
+			$sql = "select productid from vtiger_products where productname='".$product_name."'";
 			$result = $adb->query($sql);
 			$productid = $adb->query_result($result,0,"productid");
 		}
@@ -884,7 +884,7 @@
 		global $adb;
 		if($quote_name != '')
 		{
-			$sql = "select quoteid from quotes where subject='".$quote_name."'";
+			$sql = "select quoteid from vtiger_quotes where subject='".$quote_name."'";
 			$result = $adb->query($sql);
 			$quote_id = $adb->query_result($result,0,"quoteid");
 		}
@@ -898,7 +898,7 @@
 		global $adb;
 		if($pot_name != '')
 		{
-			$sql = "select potentialid from potential where potentialname='".$pot_name."'";
+			$sql = "select vtiger_potentialid from vtiger_potential where vtiger_potentialname='".$pot_name."'";
 			$result = $adb->query($sql);
 			$potentialid = $adb->query_result($result,0,"potentialid");
 		}
@@ -911,7 +911,7 @@
 		global $adb;
 		if($vendor_name != '')
 		{
-			$sql = "select vendorid from vendor where vendorname='".$vendor_name."'";
+			$sql = "select vtiger_vendorid from vtiger_vendor where vtiger_vendorname='".$vendor_name."'";
 			$result = $adb->query($sql);
 			$vendor_id = $adb->query_result($result,0,"vendorid");
 		}
@@ -925,7 +925,7 @@
 		global $adb;
 		if($contact_name != '')
 		{
-			$sql = "select contactid from contactdetails where lastname='".$contact_name."'";
+			$sql = "select contactid from vtiger_contactdetails where lastname='".$contact_name."'";
 			$result = $adb->query($sql);
 			$contact_id = $adb->query_result($result,0,"contactid");
 		}
@@ -939,7 +939,7 @@
 		global $adb;
 		if($account_name != '')
 		{
-			$sql = "select accountid from account where accountname='".$account_name."'";
+			$sql = "select vtiger_accountid from vtiger_account where vtiger_accountname='".$account_name."'";
 			$result = $adb->query($sql);
 			$accountid = $adb->query_result($result,0,"accountid");
 		}		
@@ -1235,26 +1235,26 @@
 			$listviewquery = substr($listquery, strpos($listquery,'FROM'),strlen($listquery));
 			if($module == "Activities" || $module == "Emails")
 			{
-				$query = "select groups.groupname ,users.user_name,".$this->getCvColumnListSQL($viewid)." ,crmentity.crmid,activity.* ".$listviewquery;
+				$query = "select vtiger_groups.groupname ,vtiger_users.user_name,".$this->getCvColumnListSQL($viewid)." ,vtiger_crmentity.crmid,vtiger_activity.* ".$listviewquery;
 			}else if($module == "Notes")
 			{
-				$query = "select ".$this->getCvColumnListSQL($viewid)." ,crmentity.crmid,notes.* ".$listviewquery;
+				$query = "select ".$this->getCvColumnListSQL($viewid)." ,vtiger_crmentity.crmid,vtiger_notes.* ".$listviewquery;
 			}
 			else if($module == "Products")
 			{
-				$query = "select ".$this->getCvColumnListSQL($viewid)." ,crmentity.crmid,products.* ".$listviewquery;
+				$query = "select ".$this->getCvColumnListSQL($viewid)." ,vtiger_crmentity.crmid,vtiger_products.* ".$listviewquery;
 			}
 			else if($module == "Vendors")
 			{
-				$query = "select ".$this->getCvColumnListSQL($viewid)." ,crmentity.crmid ".$listviewquery;
+				$query = "select ".$this->getCvColumnListSQL($viewid)." ,vtiger_crmentity.crmid ".$listviewquery;
 			}
 			else if($module == "PriceBooks")
 			{
-				$query = "select ".$this->getCvColumnListSQL($viewid)." ,crmentity.crmid ".$listviewquery;
+				$query = "select ".$this->getCvColumnListSQL($viewid)." ,vtiger_crmentity.crmid ".$listviewquery;
 			}
 			else
 			{
-				$query = "select groups.groupname ,users.user_name,".$this->getCvColumnListSQL($viewid)." ,crmentity.crmid ".$listviewquery;
+				$query = "select vtiger_groups.groupname ,vtiger_users.user_name,".$this->getCvColumnListSQL($viewid)." ,vtiger_crmentity.crmid ".$listviewquery;
 			}
 			$stdfiltersql = $this->getCVStdFilterSQL($viewid);
 			$advfiltersql = $this->getCVAdvFilterSQL($viewid);
@@ -1299,8 +1299,8 @@
 	{
 		global $adb;
 
-		$sSQL = "select customaction.* from customaction inner join customview on customaction.cvid = customview.cvid";
-		$sSQL .= " where customaction.cvid=".$cvid;
+		$sSQL = "select vtiger_customaction.* from vtiger_customaction inner join vtiger_customview on vtiger_customaction.cvid = vtiger_customview.cvid";
+		$sSQL .= " where vtiger_customaction.cvid=".$cvid;
 		$result = $adb->query($sSQL);
 
 		while($carow = $adb->fetch_array($result))

Modified: vtigercrm/trunk/modules/CustomView/Delete.php
==============================================================================
--- vtigercrm/trunk/modules/CustomView/Delete.php (original)
+++ vtigercrm/trunk/modules/CustomView/Delete.php Mon Jun 12 14:26:25 2006
@@ -19,7 +19,7 @@
 
 if(isset($cvid) && $cvid != '')
 {
-	$deletesql = "delete from customview where cvid =".$cvid;
+	$deletesql = "delete from vtiger_customview where cvid =".$cvid;
 	$deleteresult = $adb->query($deletesql);
 	$_SESSION['lvs'][$module]["viewname"] = '';
 }

Modified: vtigercrm/trunk/modules/CustomView/Forms.php
==============================================================================
--- vtigercrm/trunk/modules/CustomView/Forms.php (original)
+++ vtigercrm/trunk/modules/CustomView/Forms.php Mon Jun 12 14:26:25 2006
@@ -50,7 +50,7 @@
 			}
 			if ( hash[ form.elements[i].value ] == 1)
 			{
-				// got same field more than once
+				// got same vtiger_field more than once
 				isError = true;
 			}
 			hash[form.elements[i].value] = 1;
@@ -69,7 +69,7 @@
 		return false;
 	}
 
-	for(var field_name in required)
+	for(var vtiger_field_name in required)
 	{
 		// contacts hack to bypass errors if full_name is set
 		if (field_name == 'last_name' && 
@@ -77,7 +77,7 @@
 		{
 			continue;
 		}
-		if ( hash[ field_name ] != 1 )
+		if ( hash[ vtiger_field_name ] != 1 )
 		{
 				isError = true;
 				errorMessage += "$err_required " + required[field_name];

Modified: vtigercrm/trunk/modules/CustomView/ListViewTop.php
==============================================================================
--- vtigercrm/trunk/modules/CustomView/ListViewTop.php (original)
+++ vtigercrm/trunk/modules/CustomView/ListViewTop.php Mon Jun 12 14:26:25 2006
@@ -92,8 +92,8 @@
 function getMetricList()
 {
 	global $adb;
-	$ssql = "select customview.* from customview inner join tab on tab.name = customview.entitytype";
-	$ssql .= " where customview.setmetrics = 1 order by customview.entitytype";
+	$ssql = "select vtiger_customview.* from vtiger_customview inner join vtiger_tab on vtiger_tab.name = vtiger_customview.entitytype";
+	$ssql .= " where vtiger_customview.setmetrics = 1 order by vtiger_customview.entitytype";
 	$result = $adb->query($ssql);
 	while($cvrow=$adb->fetch_array($result))
 	{

Modified: vtigercrm/trunk/modules/CustomView/PopulateCustomView.php
==============================================================================
--- vtigercrm/trunk/modules/CustomView/PopulateCustomView.php (original)
+++ vtigercrm/trunk/modules/CustomView/PopulateCustomView.php Mon Jun 12 14:26:25 2006
@@ -133,199 +133,199 @@
 		    );
 
 
-$cvcolumns = Array(Array('leaddetails:lastname:lastname:Leads_Last_Name:V',
-                         'leaddetails:firstname:firstname:Leads_First_Name:V',
-                         'leaddetails:company:company:Leads_Company:V',
-			 'leadaddress:phone:phone:Leads_Phone:V',
-                         'leadsubdetails:website:website:Leads_Website:V',
-                         'leaddetails:email:email:Leads_Email:E',
-			 'crmentity:smownerid:assigned_user_id:Leads_Assigned_To:V'),
-
-	           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: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:E'),
+$cvcolumns = Array(Array('vtiger_leaddetails:lastname:lastname:Leads_Last_Name:V',
+                         'vtiger_leaddetails:firstname:firstname:Leads_First_Name:V',
+                         'vtiger_leaddetails:company:company:Leads_Company:V',
+			 'vtiger_leadaddress:phone:phone:Leads_Phone:V',
+                         'vtiger_leadsubdetails:website:website:Leads_Website:V',
+                         'vtiger_leaddetails:email:email:Leads_Email:E',
+			 'vtiger_crmentity:smownerid:assigned_user_id:Leads_Assigned_To:V'),
+
+	           Array('vtiger_leaddetails:firstname:firstname:Leads_First_Name:V',
+                         'vtiger_leaddetails:lastname:lastname:Leads_Last_Name:V',
+                         'vtiger_leaddetails:company:company:Leads_Company:V',
+                         'vtiger_leaddetails:leadsource:leadsource:Leads_Lead_Source:V',
+                         'vtiger_leadsubdetails:website:website:Leads_Website:V',
+                         'vtiger_leaddetails:email:email:Leads_Email:E'),
+
+		   Array('vtiger_leaddetails:firstname:firstname:Leads_First_Name:V',
+                         'vtiger_leaddetails:lastname:lastname:Leads_Last_Name:V',
+                         'vtiger_leaddetails:company:company:Leads_Company:V',
+                         'vtiger_leaddetails:leadsource:leadsource:Leads_Lead_Source:V',
+                         'vtiger_leadsubdetails:website:website:Leads_Website:V',
+                         'vtiger_leaddetails:email:email:Leads_Email:E'),
 	
-		   Array('account:accountname:accountname:Accounts_Account_Name:V',
-                         'accountbillads:city:bill_city:Accounts_City:V',
-                         'account:website:website:Accounts_Website:V',
-                         'account:phone:phone:Accounts_Phone:V',
-                         'crmentity:smownerid:assigned_user_id:Accounts_Assigned_To:V'),
-
-		   Array('account:accountname:accountname:Accounts_Account_Name:V',
-			 'account:phone:phone:Accounts_Phone:V',
-			 'account:website:website:Accounts_Website:V',
-			 'account:rating:rating:Accounts_Rating:V',
-			 'crmentity:smownerid:assigned_user_id:Accounts_Assigned_To:V'),
-
-		   Array('account:accountname:accountname:Accounts_Account_Name:V',
-                         'account:phone:phone:Accounts_Phone:V',
-                         'account:website:website:Accounts_Website:V',
-                         'accountbillads:city:bill_city:Accounts_City:V',
-                         'crmentity:smownerid:assigned_user_id:Accounts_Assigned_To:V'),
-
-		   Array('contactdetails:firstname:firstname:Contacts_First_Name:V',
-                         '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: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',
-                         'contactdetails:lastname:lastname:Contacts_Last_Name:V',
-                         'contactaddress:mailingstreet:mailingstreet:Contacts_Mailing_Street:V',
-                         'contactaddress:mailingcity:mailingcity:Contacts_City:V',
-                         'contactaddress:mailingstate:mailingstate:Contacts_State:V',
-			 'contactaddress:mailingzip:mailingzip:Contacts_Zip:V',
-			 'contactaddress:mailingcountry:mailingcountry:Contacts_Country:V'),
+		   Array('vtiger_account:accountname:accountname:Accounts_Account_Name:V',
+                         'vtiger_accountbillads:city:bill_city:Accounts_City:V',
+                         'vtiger_account:website:website:Accounts_Website:V',
+                         'vtiger_account:phone:phone:Accounts_Phone:V',
+                         'vtiger_crmentity:smownerid:assigned_user_id:Accounts_Assigned_To:V'),
+
+		   Array('vtiger_account:accountname:accountname:Accounts_Account_Name:V',
+			 'vtiger_account:phone:phone:Accounts_Phone:V',
+			 'vtiger_account:website:website:Accounts_Website:V',
+			 'vtiger_account:rating:rating:Accounts_Rating:V',
+			 'vtiger_crmentity:smownerid:assigned_user_id:Accounts_Assigned_To:V'),
+
+		   Array('vtiger_account:accountname:accountname:Accounts_Account_Name:V',
+                         'vtiger_account:phone:phone:Accounts_Phone:V',
+                         'vtiger_account:website:website:Accounts_Website:V',
+                         'vtiger_accountbillads:city:bill_city:Accounts_City:V',
+                         'vtiger_crmentity:smownerid:assigned_user_id:Accounts_Assigned_To:V'),
+
+		   Array('vtiger_contactdetails:firstname:firstname:Contacts_First_Name:V',
+                         'vtiger_contactdetails:lastname:lastname:Contacts_Last_Name:V',
+                         'vtiger_contactdetails:title:title:Contacts_Title:V',
+                         'vtiger_contactdetails:accountid:account_id:Contacts_Account_Name:I',
+                         'vtiger_contactdetails:email:email:Contacts_Email:E',
+                         'vtiger_contactdetails:phone:phone:Contacts_Office_Phone:V',
+			 'vtiger_crmentity:smownerid:assigned_user_id:Contacts_Assigned_To:V'),
+
+		   Array('vtiger_contactdetails:firstname:firstname:Contacts_First_Name:V',
+                         'vtiger_contactdetails:lastname:lastname:Contacts_Last_Name:V',
+                         'vtiger_contactaddress:mailingstreet:mailingstreet:Contacts_Mailing_Street:V',
+                         'vtiger_contactaddress:mailingcity:mailingcity:Contacts_City:V',
+                         'vtiger_contactaddress:mailingstate:mailingstate:Contacts_State:V',
+			 'vtiger_contactaddress:mailingzip:mailingzip:Contacts_Zip:V',
+			 'vtiger_contactaddress:mailingcountry:mailingcountry:Contacts_Country:V'),
 		   
-		   Array('contactdetails:firstname:firstname:Contacts_First_Name:V',
-                         '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:E',
-			 'contactsubdetails:otherphone:otherphone:Contacts_Phone:V',
-			 'crmentity:smownerid:assigned_user_id:Contacts_Assigned_To:V'),
+		   Array('vtiger_contactdetails:firstname:firstname:Contacts_First_Name:V',
+                         'vtiger_contactdetails:lastname:lastname:Contacts_Last_Name:V',
+                         'vtiger_contactdetails:title:title:Contacts_Title:V',
+                         'vtiger_contactdetails:accountid:account_id:Contacts_Account_Name:I',
+                         'vtiger_contactdetails:email:email:Contacts_Email:E',
+			 'vtiger_contactsubdetails:otherphone:otherphone:Contacts_Phone:V',
+			 'vtiger_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: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'),
-
-                   Array('potential:potentialname:potentialname:Potentials_Potential_Name:V',
-                         'potential:accountid:account_id:Potentials_Account_Name:V',
-                         'potential:amount:amount:Potentials_Amount:N',
-                         'potential:closingdate:closingdate:Potentials_Expected_Close_Date:D',
-                         'crmentity:smownerid:assigned_user_id:Potentials_Assigned_To:V'),
-
-		   Array('potential:potentialname:potentialname:Potentials_Potential_Name:V',
-                         'potential:accountid:account_id:Potentials_Account_Name:V',
-                         'potential:amount:amount:Potentials_Amount:N',
-                         'potential:leadsource:leadsource:Potentials_Lead_Source:V',
-                         'potential:closingdate:closingdate:Potentials_Expected_Close_Date:D',
-                         'crmentity:smownerid:assigned_user_id:Potentials_Assigned_To:V'),
-
-		   Array('crmentity:crmid::HelpDesk_Ticket_ID:I',
-			 'troubletickets:title:ticket_title:HelpDesk_Title:V',
-                         'troubletickets:parent_id:parent_id:HelpDesk_Related_to:I',
-                         'troubletickets:status:ticketstatus:HelpDesk_Status:V',
-                         'troubletickets:priority:ticketpriorities:HelpDesk_Priority:V',
-                         'crmentity:smownerid:assigned_user_id:HelpDesk_Assigned_To:V'),
-
-		   Array('troubletickets:title:ticket_title:HelpDesk_Title:V',
-                         'troubletickets:parent_id:parent_id:HelpDesk_Related_to:I',
-                         'troubletickets:priority:ticketpriorities:HelpDesk_Priority:V',
-                         'troubletickets:product_id:product_id:HelpDesk_Product_Name:I',
-                         'crmentity:smownerid:assigned_user_id:HelpDesk_Assigned_To:V'),
-
-		   Array('troubletickets:title:ticket_title:HelpDesk_Title:V',
-                         'troubletickets:parent_id:parent_id:HelpDesk_Related_to:I',
-                         'troubletickets:status:ticketstatus:HelpDesk_Status:V',
-                         'troubletickets:product_id:product_id:HelpDesk_Product_Name:I',
-                         'crmentity:smownerid:assigned_user_id:HelpDesk_Assigned_To:V'),
-
-		   Array('crmentity:crmid::Quotes_Quote_ID:I',
-			 'quotes:subject:subject:Quotes_Subject:V',
-                         'quotes:quotestage:quotestage:Quotes_Quote_Stage:V',
-                         'quotes:potentialid:potential_id:Quotes_Potential_Name:I',
-                         'quotes:accountid:account_id:Quotes_Account_Name:I',
-                         'quotes:total:hdnGrandTotal:Quotes_Total:I',
-			 'crmentity:smownerid:assigned_user_id:Quotes_Assigned_To:V'),
-
-		   Array('quotes:subject:subject:Quotes_Subject:V',
-                         'quotes:quotestage:quotestage:Quotes_Quote_Stage:V',
-                         'quotes:potentialid:potential_id:Quotes_Potential_Name:I',
-                         'quotes:accountid:account_id:Quotes_Account_Name:I',
-                         'quotes:validtill:validtill:Quotes_Valid_Till:D',
-			 'crmentity:smownerid:assigned_user_id:Quotes_Assigned_To:V'),
-
-		   Array('quotes:subject:subject:Quotes_Subject:V',
-                         'quotes:potentialid:potential_id:Quotes_Potential_Name:I',
-                         'quotes:accountid:account_id:Quotes_Account_Name:I',
-                         'quotes:validtill:validtill:Quotes_Valid_Till:D',
-                         'crmentity:smownerid:assigned_user_id:Quotes_Assigned_To:V'),
+		   Array('vtiger_potential:potentialname:potentialname:Potentials_Potential_Name:V',
+                         'vtiger_potential:accountid:account_id:Potentials_Account_Name:V',
+                         'vtiger_potential:sales_stage:sales_stage:Potentials_Sales_Stage:V',
+                         'vtiger_potential:leadsource:leadsource:Potentials_Lead_Source:V',
+                         'vtiger_potential:closingdate:closingdate:Potentials_Expected_Close_Date:D',
+                         'vtiger_crmentity:smownerid:assigned_user_id:Potentials_Assigned_To:V'),
+
+                   Array('vtiger_potential:potentialname:potentialname:Potentials_Potential_Name:V',
+                         'vtiger_potential:accountid:account_id:Potentials_Account_Name:V',
+                         'vtiger_potential:amount:amount:Potentials_Amount:N',
+                         'vtiger_potential:closingdate:closingdate:Potentials_Expected_Close_Date:D',
+                         'vtiger_crmentity:smownerid:assigned_user_id:Potentials_Assigned_To:V'),
+
+		   Array('vtiger_potential:potentialname:potentialname:Potentials_Potential_Name:V',
+                         'vtiger_potential:accountid:account_id:Potentials_Account_Name:V',
+                         'vtiger_potential:amount:amount:Potentials_Amount:N',
+                         'vtiger_potential:leadsource:leadsource:Potentials_Lead_Source:V',
+                         'vtiger_potential:closingdate:closingdate:Potentials_Expected_Close_Date:D',
+                         'vtiger_crmentity:smownerid:assigned_user_id:Potentials_Assigned_To:V'),
+
+		   Array('vtiger_crmentity:crmid::HelpDesk_Ticket_ID:I',
+			 'vtiger_troubletickets:title:ticket_title:HelpDesk_Title:V',
+                         'vtiger_troubletickets:parent_id:parent_id:HelpDesk_Related_to:I',
+                         'vtiger_troubletickets:status:ticketstatus:HelpDesk_Status:V',
+                         'vtiger_troubletickets:priority:ticketpriorities:HelpDesk_Priority:V',
+                         'vtiger_crmentity:smownerid:assigned_user_id:HelpDesk_Assigned_To:V'),
+
+		   Array('vtiger_troubletickets:title:ticket_title:HelpDesk_Title:V',
+                         'vtiger_troubletickets:parent_id:parent_id:HelpDesk_Related_to:I',
+                         'vtiger_troubletickets:priority:ticketpriorities:HelpDesk_Priority:V',
+                         'vtiger_troubletickets:product_id:product_id:HelpDesk_Product_Name:I',
+                         'vtiger_crmentity:smownerid:assigned_user_id:HelpDesk_Assigned_To:V'),
+
+		   Array('vtiger_troubletickets:title:ticket_title:HelpDesk_Title:V',
+                         'vtiger_troubletickets:parent_id:parent_id:HelpDesk_Related_to:I',
+                         'vtiger_troubletickets:status:ticketstatus:HelpDesk_Status:V',
+                         'vtiger_troubletickets:product_id:product_id:HelpDesk_Product_Name:I',
+                         'vtiger_crmentity:smownerid:assigned_user_id:HelpDesk_Assigned_To:V'),
+
+		   Array('vtiger_crmentity:crmid::Quotes_Quote_ID:I',
+			 'vtiger_quotes:subject:subject:Quotes_Subject:V',
+                         'vtiger_quotes:quotestage:quotestage:Quotes_Quote_Stage:V',
+                         'vtiger_quotes:potentialid:potential_id:Quotes_Potential_Name:I',
+                         'vtiger_quotes:accountid:account_id:Quotes_Account_Name:I',
+                         'vtiger_quotes:total:hdnGrandTotal:Quotes_Total:I',
+			 'vtiger_crmentity:smownerid:assigned_user_id:Quotes_Assigned_To:V'),
+
+		   Array('vtiger_quotes:subject:subject:Quotes_Subject:V',
+                         'vtiger_quotes:quotestage:quotestage:Quotes_Quote_Stage:V',
+                         'vtiger_quotes:potentialid:potential_id:Quotes_Potential_Name:I',
+                         'vtiger_quotes:accountid:account_id:Quotes_Account_Name:I',
+                         'vtiger_quotes:validtill:validtill:Quotes_Valid_Till:D',
+			 'vtiger_crmentity:smownerid:assigned_user_id:Quotes_Assigned_To:V'),
+
+		   Array('vtiger_quotes:subject:subject:Quotes_Subject:V',
+                         'vtiger_quotes:potentialid:potential_id:Quotes_Potential_Name:I',
+                         'vtiger_quotes:accountid:account_id:Quotes_Account_Name:I',
+                         'vtiger_quotes:validtill:validtill:Quotes_Valid_Till:D',
+                         'vtiger_crmentity:smownerid:assigned_user_id:Quotes_Assigned_To:V'),
 			
-		   Array('activity:status:taskstatus:Activities_Status:V',
-                         'activity:activitytype:activitytype:Activities_Type:V',
-                         'activity:subject:subject:Activities_Subject: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',
-				'crmentity:smownerid:assigned_user_id:Emails_Sender:V',
-                 'activity:date_start:date_start:Emails_Date_Sent:D'),
+		   Array('vtiger_activity:status:taskstatus:Activities_Status:V',
+                         'vtiger_activity:activitytype:activitytype:Activities_Type:V',
+                         'vtiger_activity:subject:subject:Activities_Subject:V',
+                         'vtiger_cntactivityrel:contactid:contact_id:Activities_Contact_Name:I',
+                         'vtiger_seactivityrel:crmid:parent_id:Activities_Related_to:V',
+                         'vtiger_activity:date_start:date_start:Activities_Start_Date:D',
+                         'vtiger_activity:due_date:due_date:Activities_End_Date:D',
+                         'vtiger_crmentity:smownerid:assigned_user_id:Activities_Assigned_To:V'),
+
+		   Array('vtiger_activity:subject:subject:Emails_Subject:V',
+				'vtiger_crmentity:smownerid:assigned_user_id:Emails_Sender:V',
+                 'vtiger_activity:date_start:date_start:Emails_Date_Sent:D'),
 		
-		   Array('crmentity:crmid::Invoice_Invoice_Id:I',
-                         'invoice:subject:subject:Invoice_Subject: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('vtiger_crmentity:crmid::Invoice_Invoice_Id:I',
+                         'vtiger_invoice:subject:subject:Invoice_Subject:V',
+                         'vtiger_invoice:salesorderid:salesorder_id:Invoice_Sales_Order:I',
+                         'vtiger_invoice:invoicestatus:invoicestatus:Invoice_Status:V',
+                         'vtiger_invoice:total:hdnGrandTotal:Invoice_Total:I',
+                         'vtiger_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:parent_id:Notes_Related_to:I',
-                        'notes:filename:filename:Notes_File:V',
-                        'crmentity:modifiedtime:modifiedtime:Notes_Modified_Time:V'),
+		  Array('vtiger_notes:title:title:Notes_Title:V',
+                        'vtiger_notes:contact_id:contact_id:Notes_Contact_Name:I',
+                        'vtiger_senotesrel:crmid:parent_id:Notes_Related_to:I',
+                        'vtiger_notes:filename:filename:Notes_File:V',
+                        'vtiger_crmentity:modifiedtime:modifiedtime:Notes_Modified_Time:V'),
 		
-		  Array('pricebook:bookname:bookname:PriceBooks_Price_Book_Name:V',
-                        'pricebook:active:active:PriceBooks_Active:V'),
+		  Array('vtiger_pricebook:bookname:bookname:PriceBooks_Price_Book_Name:V',
+                        'vtiger_pricebook:active:active:PriceBooks_Active:V'),
 		  
-		  Array('products:productname:productname:Products_Product_Name:V',
-                        'products:productcode:productcode:Products_Product_Code:V',
-                        'products:commissionrate:commissionrate:Products_Commission_Rate:V',
-                        'products:qty_per_unit:qty_per_unit:Products_Qty/Unit:V',
-                        'products:unit_price:unit_price:Products_Unit_Price:V'),
+		  Array('vtiger_products:productname:productname:Products_Product_Name:V',
+                        'vtiger_products:productcode:productcode:Products_Product_Code:V',
+                        'vtiger_products:commissionrate:commissionrate:Products_Commission_Rate:V',
+                        'vtiger_products:qty_per_unit:qty_per_unit:Products_Qty/Unit:V',
+                        'vtiger_products:unit_price:unit_price:Products_Unit_Price:V'),
 		  
-		  Array('crmentity:crmid::PurchaseOrder_Order_Id:I',
-                        'purchaseorder:subject:subject:PurchaseOrder_Subject:V',
-                        'purchaseorder:vendorid:vendor_id:PurchaseOrder_Vendor_Name:I',
-                        'purchaseorder:tracking_no:tracking_no:PurchaseOrder_Tracking_Number:V',
-                        'crmentity:smownerid:assigned_user_id:PurchaseOrder_Assigned_To:V'),
+		  Array('vtiger_crmentity:crmid::PurchaseOrder_Order_Id:I',
+                        'vtiger_purchaseorder:subject:subject:PurchaseOrder_Subject:V',
+                        'vtiger_purchaseorder:vendorid:vendor_id:PurchaseOrder_Vendor_Name:I',
+                        'vtiger_purchaseorder:tracking_no:tracking_no:PurchaseOrder_Tracking_Number:V',
+                        'vtiger_crmentity:smownerid:assigned_user_id:PurchaseOrder_Assigned_To:V'),
 		  
-	          Array('crmentity:crmid::SalesOrder_Order_Id:I',
-                        'salesorder:subject:subject:SalesOrder_Subject:V',
-                        'account:accountid:account_id:SalesOrder_Account_Name:V',
-                        'quotes:quoteid:quote_id:SalesOrder_Quote_Name:I',
-                        'salesorder:total:hdnGrandTotal:SalesOrder_Total:V',
-                        'crmentity:smownerid:assigned_user_id:SalesOrder_Assigned_To:V'),
-
-	          Array('vendor:vendorname:vendorname:Vendors_Vendor_Name:V',
-			'vendor:phone:phone:Vendors_Phone:V',
-			'vendor:email:email:Vendors_Email:E',
-                        'vendor:category:category:Vendors_Category:V'),
-
-
-
-
-		 Array('faq:id::Faq_FAQ_Id:I',
-		       'faq:question:question:Faq_Question:V',
-		       'faq:category:faqcategories:Faq_Category:V',
-		       'faq:product_id:product_id:Faq_Product_Name:I',
-		       'crmentity:createdtime:createdtime:Faq_Created_Time:D',
-                       'crmentity:modifiedtime:modifiedtime:Faq_Modified_Time:D'),
+	          Array('vtiger_crmentity:crmid::SalesOrder_Order_Id:I',
+                        'vtiger_salesorder:subject:subject:SalesOrder_Subject:V',
+                        'vtiger_account:accountid:account_id:SalesOrder_Account_Name:V',
+                        'vtiger_quotes:quoteid:quote_id:SalesOrder_Quote_Name:I',
+                        'vtiger_salesorder:total:hdnGrandTotal:SalesOrder_Total:V',
+                        'vtiger_crmentity:smownerid:assigned_user_id:SalesOrder_Assigned_To:V'),
+
+	          Array('vtiger_vendor:vendorname:vendorname:Vendors_Vendor_Name:V',
+			'vtiger_vendor:phone:phone:Vendors_Phone:V',
+			'vtiger_vendor:email:email:Vendors_Email:E',
+                        'vtiger_vendor:category:category:Vendors_Category:V'),
+
+
+
+
+		 Array('vtiger_faq:id::Faq_FAQ_Id:I',
+		       'vtiger_faq:question:question:Faq_Question:V',
+		       'vtiger_faq:category:faqcategories:Faq_Category:V',
+		       'vtiger_faq:product_id:product_id:Faq_Product_Name:I',
+		       'vtiger_crmentity:createdtime:createdtime:Faq_Created_Time:D',
+                       'vtiger_crmentity:modifiedtime:modifiedtime:Faq_Modified_Time:D'),
 		      //this sequence has to be maintained 
-		 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'),
+		 Array('vtiger_campaign:campaignname:campaignname:Campaigns_Campaign_Name:V',
+		       'vtiger_campaign:campaigntype:campaigntype:Campaigns_Campaign_Type:N',
+		       'vtiger_campaign:campaignstatus:campaignstatus:Campaigns_Campaign_Status:N',
+		       'vtiger_campaign:expectedrevenue:expectedrevenue:Campaigns_Expected_Revenue:V',
+		       'vtiger_campaign:closingdate:closingdate:Campaigns_Expected_Close_Date:D',
+		       'vtiger_crmentity:smownerid:assigned_user_id:Campaigns_Assigned_To:V'),
 
 
 		 Array('subject:subject:subject:Subject:V',
@@ -336,17 +336,17 @@
 
 
 
-$cvstdfilters = Array(Array('columnname'=>'crmentity:modifiedtime:modifiedtime:Leads_Modified_Time',
+$cvstdfilters = Array(Array('columnname'=>'vtiger_crmentity:modifiedtime:modifiedtime:Leads_Modified_Time',
                             'datefilter'=>'thismonth',
                             'startdate'=>'2005-06-01',
                             'enddate'=>'2005-06-30'),
 
-		      Array('columnname'=>'crmentity:createdtime:createdtime:Accounts_Created_Time',
+		      Array('columnname'=>'vtiger_crmentity:createdtime:createdtime:Accounts_Created_Time',
                             'datefilter'=>'thisweek',
                             'startdate'=>'2005-06-19',
                             'enddate'=>'2005-06-25'),
 
-		      Array('columnname'=>'contactsubdetails:birthday:birthday:Contacts_Birthdate',
+		      Array('columnname'=>'vtiger_contactsubdetails:birthday:birthday:Contacts_Birthdate',
                             'datefilter'=>'today',
                             'startdate'=>'2005-06-25',
                             'enddate'=>'2005-06-25')
@@ -354,53 +354,53 @@
 
 $cvadvfilters = Array(
                 	Array(
-               			 Array('columnname'=>'leaddetails:leadstatus:leadstatus:Leads_Lead_Status:V',
+               			 Array('columnname'=>'vtiger_leaddetails:leadstatus:leadstatus:Leads_Lead_Status:V',
 		                      'comparator'=>'e',
         		              'value'=>'Hot'
                      			)
                      	 ),
 		      		Array(
-                          Array('columnname'=>'account:account_type:accounttype:Accounts_Type:V',
+                          Array('columnname'=>'vtiger_account:account_type:accounttype:Accounts_Type:V',
                                 'comparator'=>'e',
                                  'value'=>'Prospect'
                                  )
                            ),
 				     Array(
-                            Array('columnname'=>'potential:sales_stage:sales_stage:Potentials_Sales_Stage:V',
+                            Array('columnname'=>'vtiger_potential:sales_stage:sales_stage:Potentials_Sales_Stage:V',
                                   'comparator'=>'e',
                                   'value'=>'Closed Won'
                                  )
                            ),
 				     Array(
-                            Array('columnname'=>'potential:sales_stage:sales_stage:Potentials_Sales_Stage:V',
+                            Array('columnname'=>'vtiger_potential:sales_stage:sales_stage:Potentials_Sales_Stage:V',
                                   'comparator'=>'e',
                                   'value'=>'Prospecting'
                                  )
                            ),
 				     Array(
-                            Array('columnname'=>'troubletickets:status:ticketstatus:HelpDesk_Status:V',
+                            Array('columnname'=>'vtiger_troubletickets:status:ticketstatus:HelpDesk_Status:V',
                                   'comparator'=>'n',
                                   'value'=>'Closed'
                                  )
                            ),
 				     Array(
-                            Array('columnname'=>'troubletickets:priority:ticketpriorities:HelpDesk_Priority:V',
+                            Array('columnname'=>'vtiger_troubletickets:priority:ticketpriorities:HelpDesk_Priority:V',
                                   'comparator'=>'e',
                                   'value'=>'High'
                                  )
                            ),
 				     Array(
-	                        Array('columnname'=>'quotes:quotestage:quotestage:Quotes_Quote_Stage:V',
+	                        Array('columnname'=>'vtiger_quotes:quotestage:quotestage:Quotes_Quote_Stage:V',
                                   'comparator'=>'n',
                                   'value'=>'Accepted'
                                  ),
-						    Array('columnname'=>'quotes:quotestage:quotestage:Quotes_Quote_Stage:V',
+						    Array('columnname'=>'vtiger_quotes:quotestage:quotestage:Quotes_Quote_Stage:V',
                                   'comparator'=>'n',
                                   'value'=>'Rejected'
                                  )
                            ),
 				     Array(
-                            Array('columnname'=>'quotes:quotestage:quotestage:Quotes_Quote_Stage:V',
+                            Array('columnname'=>'vtiger_quotes:quotestage:quotestage:Quotes_Quote_Stage:V',
                                   'comparator'=>'e',
                                   'value'=>'Rejected'
                                  )
@@ -432,7 +432,7 @@
 	if($genCVid != "")
 	{
 
-		$customviewsql = "insert into customview(cvid,viewname,setdefault,setmetrics,entitytype)";
+		$customviewsql = "insert into vtiger_customview(cvid,viewname,setdefault,setmetrics,entitytype)";
 		$customviewsql .= " values(".$genCVid.",'".$viewname."',".$setdefault.",".$setmetrics.",'".$cvmodule."')";
 		$customviewresult = $adb->query($customviewsql);
 	}
@@ -446,7 +446,7 @@
 	{
 		for($i=0;$i<count($columnslist);$i++)
 		{
-			$columnsql = "insert into cvcolumnlist (cvid,columnindex,columnname)";
+			$columnsql = "insert into vtiger_cvcolumnlist (cvid,columnindex,columnname)";
 			$columnsql .= " values (".$CVid.",".$i.",'".$columnslist[$i]."')";
 			$columnresult = $adb->query($columnsql);
 		}
@@ -458,7 +458,7 @@
 	global $adb;
 	if($CVid != "")
 	{
-		$stdfiltersql = "insert into cvstdfilter(cvid,columnname,stdfilter,startdate,enddate)";
+		$stdfiltersql = "insert into vtiger_cvstdfilter(cvid,columnname,stdfilter,startdate,enddate)";
 		$stdfiltersql .= " values (".$CVid.",'".$filtercolumn."',";
 		$stdfiltersql .= "'".$filtercriteria."',";
 		$stdfiltersql .= "'".$startdate."',";
@@ -474,7 +474,7 @@
 	{
 		foreach($filters as $i=>$filter)
 		{
-			$advfiltersql = "insert into cvadvfilter(cvid,columnindex,columnname,comparator,value)";
+			$advfiltersql = "insert into vtiger_cvadvfilter(cvid,columnindex,columnname,comparator,value)";
 			$advfiltersql .= " values (".$CVid.",".$i.",'".$filter['columnname']."',";
 			$advfiltersql .= "'".$filter['comparator']."',";
 			$advfiltersql .= "'".$filter['value']."')";

Modified: vtigercrm/trunk/modules/CustomView/Save.php
==============================================================================
--- vtigercrm/trunk/modules/CustomView/Save.php (original)
+++ vtigercrm/trunk/modules/CustomView/Save.php Mon Jun 12 14:26:25 2006
@@ -95,32 +95,32 @@
 
 			if($setdefault == 1)
 			{
-				$updatedefaultsql = "UPDATE customview SET setdefault = 0 WHERE entitytype = ".$adb->quote($cvmodule);
+				$updatedefaultsql = "UPDATE vtiger_customview SET setdefault = 0 WHERE entitytype = ".$adb->quote($cvmodule);
 				$updatedefaultresult = $adb->query($updatedefaultsql);
 			}
 			$log->info("CustomView :: Save :: setdefault upated successfully");
 
-			$customviewsql = "INSERT INTO customview(cvid, viewname,
+			$customviewsql = "INSERT INTO vtiger_customview(cvid, viewname,
 						setdefault, setmetrics,
 						entitytype)
 					VALUES (".$genCVid.",".$adb->quote($viewname).",
 						".$setdefault.",".$setmetrics.",
 						".$adb->quote($cvmodule).")";
 			$customviewresult = $adb->query($customviewsql);
-			$log->info("CustomView :: Save :: customview created successfully");
+			$log->info("CustomView :: Save :: vtiger_customview created successfully");
 			if($customviewresult)
 			{
 				if(isset($columnslist))
 				{
 					for($i=0;$i<count($columnslist);$i++)
 					{
-						$columnsql = "INSERT INTO cvcolumnlist (cvid, columnindex, columnname)
+						$columnsql = "INSERT INTO vtiger_cvcolumnlist (cvid, columnindex, columnname)
 							VALUES (".$genCVid.", ".$i.", ".$adb->quote($columnslist[$i]).")";
 						$columnresult = $adb->query($columnsql);
 					}
-					$log->info("CustomView :: Save :: cvcolumnlist created successfully");
-
-					$stdfiltersql = "INSERT INTO cvstdfilter
+					$log->info("CustomView :: Save :: vtiger_cvcolumnlist created successfully");
+
+					$stdfiltersql = "INSERT INTO vtiger_cvstdfilter
 								(cvid,
 								columnname,
 								stdfilter,
@@ -134,10 +134,10 @@
 								".$adb->formatDate($std_filter_list["startdate"]).",
 								".$adb->formatDate($std_filter_list["enddate"]).")";
 					$stdfilterresult = $adb->query($stdfiltersql);
-					$log->info("CustomView :: Save :: cvstdfilter created successfully");
+					$log->info("CustomView :: Save :: vtiger_cvstdfilter created successfully");
 					for($i=0;$i<count($adv_filter_col);$i++)
 					{
-						$advfiltersql = "INSERT INTO cvadvfilter
+						$advfiltersql = "INSERT INTO vtiger_cvadvfilter
 								(cvid,
 								columnindex,
 								columnname,
@@ -151,7 +151,7 @@
 								".$adb->quote($adv_filter_value[$i]).")";
 						$advfilterresult = $adb->query($advfiltersql);
 					}
-					$log->info("CustomView :: Save :: cvadvfilter created successfully");
+					$log->info("CustomView :: Save :: vtiger_cvadvfilter created successfully");
 				}
 			}
 			$cvid = $genCVid;
@@ -161,26 +161,26 @@
 
 		if($setdefault == 1)
 		{
-			$updatedefaultsql = "UPDATE customview SET setdefault = 0 WHERE entitytype = ".$adb->quote($cvmodule);
+			$updatedefaultsql = "UPDATE vtiger_customview SET setdefault = 0 WHERE entitytype = ".$adb->quote($cvmodule);
 			$updatedefaultresult = $adb->query($updatedefaultsql);
 		}
 		$log->info("CustomView :: Save :: setdefault upated successfully".$genCVid);
-		$updatecvsql = "UPDATE customview
+		$updatecvsql = "UPDATE vtiger_customview
 				SET viewname = ".$adb->quote($viewname).",
 					setdefault = ".$setdefault.",
 					setmetrics = ".$setmetrics."
 				WHERE cvid = ".$cvid;
 		$updatecvresult = $adb->query($updatecvsql);
-		$log->info("CustomView :: Save :: customview upated successfully".$genCVid);
-		$deletesql = "DELETE FROM cvcolumnlist WHERE cvid = ".$cvid;
+		$log->info("CustomView :: Save :: vtiger_customview upated successfully".$genCVid);
+		$deletesql = "DELETE FROM vtiger_cvcolumnlist WHERE cvid = ".$cvid;
 		$deleteresult = $adb->query($deletesql);
 
-		$deletesql = "DELETE FROM cvstdfilter WHERE cvid = ".$cvid;
+		$deletesql = "DELETE FROM vtiger_cvstdfilter WHERE cvid = ".$cvid;
 		$deleteresult = $adb->query($deletesql);
 
-		$deletesql = "DELETE FROM cvadvfilter WHERE cvid = ".$cvid;
+		$deletesql = "DELETE FROM vtiger_cvadvfilter WHERE cvid = ".$cvid;
 		$deleteresult = $adb->query($deletesql);
-		$log->info("CustomView :: Save :: cvcolumnlist,cvstdfilter,cvadvfilter deleted successfully before update".$genCVid);
+		$log->info("CustomView :: Save :: vtiger_cvcolumnlist,cvstdfilter,cvadvfilter deleted successfully before update".$genCVid);
 
 		$genCVid = $cvid;
 		if($updatecvresult)
@@ -189,12 +189,12 @@
 			{
 				for($i=0;$i<count($columnslist);$i++)
 				{
-					$columnsql = "INSERT INTO cvcolumnlist (cvid, columnindex, columnname)
+					$columnsql = "INSERT INTO vtiger_cvcolumnlist (cvid, columnindex, columnname)
 						VALUES (".$genCVid.", ".$i.", ".$adb->quote($columnslist[$i]).")";
 					$columnresult = $adb->query($columnsql);
 				}
-				$log->info("CustomView :: Save :: cvcolumnlist update successfully".$genCVid);
-				$stdfiltersql = "INSERT INTO cvstdfilter
+				$log->info("CustomView :: Save :: vtiger_cvcolumnlist update successfully".$genCVid);
+				$stdfiltersql = "INSERT INTO vtiger_cvstdfilter
 							(cvid,
 							columnname,
 							stdfilter,
@@ -207,10 +207,10 @@
 							".$adb->formatDate($std_filter_list["startdate"]).",
 							".$adb->formatDate($std_filter_list["enddate"]).")";
 				$stdfilterresult = $adb->query($stdfiltersql);
-				$log->info("CustomView :: Save :: cvstdfilter update successfully".$genCVid);
+				$log->info("CustomView :: Save :: vtiger_cvstdfilter update successfully".$genCVid);
 				for($i=0;$i<count($adv_filter_col);$i++)
 				{
-					$advfiltersql = "INSERT INTO cvadvfilter
+					$advfiltersql = "INSERT INTO vtiger_cvadvfilter
 								(cvid,
 								columnindex,
 								columnname,
@@ -224,7 +224,7 @@
 								".$adb->quote($adv_filter_value[$i]).")";
 					$advfilterresult = $adb->query($advfiltersql);
 				}
-				$log->info("CustomView :: Save :: cvadvfilter update successfully".$genCVid);
+				$log->info("CustomView :: Save :: vtiger_cvadvfilter update successfully".$genCVid);
 			}
 		}
 	}

Modified: vtigercrm/trunk/modules/CustomView/SaveAction.php
==============================================================================
--- vtigercrm/trunk/modules/CustomView/SaveAction.php (original)
+++ vtigercrm/trunk/modules/CustomView/SaveAction.php Mon Jun 12 14:26:25 2006
@@ -22,7 +22,7 @@
 {
 	if($mode == "new")
 	{
-		$customactionsql = "insert into customaction(cvid,subject,module,content)";
+		$customactionsql = "insert into vtiger_customaction(cvid,subject,module,content)";
 		$customactionsql .= " values(".$cvid.",'".$subject."','".$cvmodule."','".$body."')";
 		$customactionresult = $adb->query($customactionsql);
 		if($customactionresult == false)
@@ -37,7 +37,7 @@
 
 	}elseif($mode == "edit")
 	{
-		$updatecasql = "update customaction set subject='".$subject."',content='".$body."' where cvid=".$cvid;
+		$updatecasql = "update vtiger_customaction set subject='".$subject."',content='".$body."' where cvid=".$cvid;
 		$updatecaresult = $adb->query($updatecasql);
 		if($updatecaresult == false)
 		{

Modified: vtigercrm/trunk/modules/CustomView/SendMailAction.php
==============================================================================
--- vtigercrm/trunk/modules/CustomView/SendMailAction.php (original)
+++ vtigercrm/trunk/modules/CustomView/SendMailAction.php Mon Jun 12 14:26:25 2006
@@ -38,7 +38,7 @@
 			if($id == '') continue;
 			if($camodule == "Contacts")
 			{
-				$sql="select * from contactdetails inner join crmentity on crmentity.crmid = contactdetails.contactid where crmentity.deleted =0 and contactdetails.contactid='" .$id ."'";
+				$sql="select * from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid where vtiger_crmentity.deleted =0 and vtiger_contactdetails.contactid='" .$id ."'";
 				$result = $adb->query($sql);
 				$camodulerow = $adb->fetch_array($result);
 				if(isset($camodulerow))
@@ -65,7 +65,7 @@
 
 			}elseif($camodule == "Leads")
 			{
-				$sql="select * from leaddetails inner join crmentity on crmentity.crmid = leaddetails.leadid where crmentity.deleted =0 and leaddetails.leadid='" .$id ."'";
+				$sql="select * from vtiger_leaddetails inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_leaddetails.leadid where vtiger_crmentity.deleted =0 and vtiger_leaddetails.leadid='" .$id ."'";
 				$result = $adb->query($sql);
 				$camodulerow = $adb->fetch_array($result);
 				if(isset($camodulerow))
@@ -88,7 +88,7 @@
 				}
 			}elseif($camodule == "Accounts")
 			{
-				$sql="select * from account inner join crmentity on crmentity.crmid = account.accountid where crmentity.deleted =0 and account.accountid='" .$id ."'";
+				$sql="select * from vtiger_account inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_account.accountid where vtiger_crmentity.deleted =0 and vtiger_account.accountid='" .$id ."'";
 				$result = $adb->query($sql);
 				$camodulerow = $adb->fetch_array($result);
 				if(isset($camodulerow))
@@ -128,7 +128,7 @@
 	if($current_user_id != '')
 	{
 		global $adb;
-		$sql = "select * from users where id= ".$current_user_id;
+		$sql = "select * from vtiger_users where id= ".$current_user_id;
 		$result = $adb->query($sql);
 		$from = $adb->query_result($result,0,'email1');
 		$initialfrom = $adb->query_result($result,0,'user_name');
@@ -136,7 +136,7 @@
 	if($mail_server=='')
 	{
 		global $adb;
-		$mailserverresult=$adb->query("select * from systems where server_type='email'");
+		$mailserverresult=$adb->query("select * from vtiger_systems where server_type='email'");
 		$mail_server = $adb->query_result($mailserverresult,0,'server');
 		$mail_server_username = $adb->query_result($mailserverresult,0,'server_username');
 		$mail_server_password = $adb->query_result($mailserverresult,0,'server_password');

Modified: vtigercrm/trunk/modules/CustomView/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/CustomView/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/CustomView/language/en_us.lang.php Mon Jun 12 14:26:25 2006
@@ -86,7 +86,7 @@
 'less_or_equal'=>'less or equal', 
 'greater_or_equal'=>'greater or equal', 
  
-//Strings added to translate field label groups 
+//Strings added to translate vtiger_field label vtiger_groups 
 'Address'=>'Address', 
 'Information'=>'Information', 
 'Description'=>'Description', 
@@ -96,7 +96,7 @@
 '- Task Information'=>'- Task Information', 
 '- Task Description'=>'- Task Description', 
  
-//Strings added for helpdesk module fields 
+//Strings added for helpdesk module vtiger_fields 
 'Title'=>'Title', 
 'Assigned To'=>'Assigned To', 
 'Related to'=>'Related to', 
@@ -109,7 +109,7 @@
 'Modified Time'=>'Modified Time', 
 'Attachment'=>'Attachment', 
  
-//Strings added for Leads module fields 
+//Strings added for Leads module vtiger_fields 
 'First Name'=>'First Name', 
 'Phone'=>'Phone', 
 'Last Name'=>'Last Name', 
@@ -128,7 +128,7 @@
 'Country'=>'Country', 
 'State'=>'State', 
  
-//Strings added for Accounts module fields 
+//Strings added for Accounts module vtiger_fields 
 'Account Name'=>'Account Name', 
 'Ticker Symbol'=>'Ticker Symbol', 
 'Other Phone'=>'Other Phone', 
@@ -153,7 +153,7 @@
 'Billing Country'=>'Billing Country', 
  
  
-//Strings added for Contacts module fields 
+//Strings added for Contacts module vtiger_fields 
  
 'Office Phone'=>'Office Phone', 
 'Home Phone'=>'Home Phone', 
@@ -175,7 +175,7 @@
 'Other Country'=>'Other Country', 
  
  
-//Strings added for Potential module fields 
+//Strings added for Potential module vtiger_fields 
  
 'Potential Name'=>'Potential Name', 
 'Amount'=>'Amount', 
@@ -185,7 +185,7 @@
 'Probability'=>'Probability', 
  
  
-//Strings added for Quotes module fields 
+//Strings added for Quotes module vtiger_fields 
 'Subject'=>'Subject', 
 'Quote Stage'=>'Quote Stage', 
 'Valid Till'=>'Valid Till', 
@@ -195,7 +195,7 @@
 'Shipping'=>'Shipping', 
 'Inventory Manager'=>'Inventory Manager', 
  
-//Strings added for Sales Orders module fields 
+//Strings added for Sales Orders module vtiger_fields 
 'Customer No'=>'Customer No', 
 'Quote Name'=>'Quote Name', 
 'Purchase Order'=>'Purchase Order', 
@@ -204,11 +204,11 @@
 'Sales Commission'=>'Sales Commission', 
 'Excise Duty'=>'Excise Duty', 
  
-//Strings added for Invoices module fields 
+//Strings added for Invoices module vtiger_fields 
 'Sales Order'=>'Sales Order', 
 'Invoice Date'=>'Invoice Date', 
  
-//Strings added for Product module fields 
+//Strings added for Product module vtiger_fields 
 'Product Code'=>'Product Code', 
 'Product Active'=>'Product Active', 
 'Product Category'=>'Product Category', 
@@ -224,16 +224,16 @@
 'Product Sheet'=>'Product Sheet', 
 'GL Account'=>'GL Account', 
  
-//Strings added for Price book module fields 
+//Strings added for Price book module vtiger_fields 
 'Price Book Name'=>'Price Book Name', 
 'Active'=>'Active', 
  
-//Strings added for tasks & events module fields 
+//Strings added for tasks & events module vtiger_fields 
 'Start Date & Time'=>'Start Date & Time', 
  
 //error message 
-'Missing required fields'=>'Missing required fields', 
-//Strings added for campaigns 
+'Missing required vtiger_fields'=>'Missing required vtiger_fields', 
+//Strings added for vtiger_campaigns 
 'Campaign Name'=>'Campaign Name', 
 'Campaign Type'=>'Campaign Type', 
 'Product'=>'Product', 
@@ -255,10 +255,10 @@
  
  
  
-//Added for customview.tpl 
+//Added for vtiger_customview.tpl 
  
 'LBL_Select_a_Column'=>'Select a Column', 
-'Missing_required_fields'=>'Missing required fields', 
+'Missing_required_fields'=>'Missing required vtiger_fields', 
 'Details'=>'Details', 
 'New_Custom_View'=>'New Custom view', 
 'LBL_AF_HDR5'=>'Simple Time Filter allows you to select date based on  

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 Mon Jun 12 14:26:25 2006
@@ -89,7 +89,7 @@
 	$ids = array_keys($ids);
 }
 
-//create unique prefix based on selected users for image files
+//create unique prefix based on selected vtiger_users for image vtiger_files
 $id_hash = '';
 if (isset($ids)) {
 	sort($ids);

Modified: vtigercrm/trunk/modules/Dashboard/Chart_my_pipeline_by_sales_stage.php
==============================================================================
--- vtigercrm/trunk/modules/Dashboard/Chart_my_pipeline_by_sales_stage.php (original)
+++ vtigercrm/trunk/modules/Dashboard/Chart_my_pipeline_by_sales_stage.php Mon Jun 12 14:26:25 2006
@@ -106,7 +106,7 @@
 $log->debug($datax);
 
 $ids = array($current_user->id);
-//create unique prefix based on selected users for image files
+//create unique prefix based on selected vtiger_users for image vtiger_files
 $id_hash = '';
 if (isset($ids)) {
 	sort($ids);

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 Mon Jun 12 14:26:25 2006
@@ -90,7 +90,7 @@
 	$ids = array_keys($ids);
 }
 
-//create unique prefix based on selected users for image files
+//create unique prefix based on selected vtiger_users for image vtiger_files
 $id_hash = '';
 if (isset($ids)) {
 	sort($ids);

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 Mon Jun 12 14:26:25 2006
@@ -89,7 +89,7 @@
 	$ids = array_keys($ids);
 }
 
-//create unique prefix based on selected users for image files
+//create unique prefix based on selected vtiger_users for image vtiger_files
 $id_hash = '';
 if (isset($ids)) {
 	sort($ids);

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 Mon Jun 12 14:26:25 2006
@@ -124,7 +124,7 @@
 	$ids = array_keys($ids);
 }
 
-//create unique prefix based on selected users for image files
+//create unique prefix based on selected vtiger_users for image vtiger_files
 $id_hash = '';
 if (isset($ids)) {
 	sort($ids);

Modified: vtigercrm/trunk/modules/Dashboard/Entity_charts.php
==============================================================================
--- vtigercrm/trunk/modules/Dashboard/Entity_charts.php (original)
+++ vtigercrm/trunk/modules/Dashboard/Entity_charts.php Mon Jun 12 14:26:25 2006
@@ -15,9 +15,9 @@
 require_once('include/database/PearDatabase.php');
 require_once('include/utils/CommonUtils.php');
 
-//To get the account names
-
-/* Function to get the Account name for a given account id
+//To get the vtiger_account names
+
+/* Function to get the Account name for a given vtiger_account id
  * Portions created by vtiger are Copyright (C) vtiger.
  * All Rights Reserved.
  * Contributor(s): ______________________________________..
@@ -27,7 +27,7 @@
 {
 	global $adb;
 
-	$acc_qry="select accountname from account where accountid =".$acc_id;
+	$acc_qry="select vtiger_accountname from vtiger_account where vtiger_accountid =".$acc_id;
 	$acc_result=$adb->query($acc_qry);
 	$no_acc_rows=$adb->num_rows($acc_result);
 
@@ -57,7 +57,7 @@
 	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 vtiger_crmentity.smownerid=".$user_id." and vtiger_crmentity.createdtime between '".$date_start."' and '".$end_date."'" ;
 	$query.=$where;
 	if($added_qry!="")
 		$query.=$added_qry;
@@ -117,7 +117,7 @@
 			$mod_cnt_table="<table border=0 cellspacing=1 cellpadding=3><tr>
 				<th>  Status </th>";
 
-			//Assigning the Header values to the table and giving the dates as graphformat 
+			//Assigning the Header values to the vtiger_table and giving the dates as graphformat 
 			for($i=0; $i<$days; $i++)
 			{
 				$tdate=$date_array[$i];
@@ -235,7 +235,7 @@
 					$test_target_val.="K".$link_val;
 			}
 			$mod_cnt_table .="</tr><tr><td class=\"$class\">Total</td>";
-			//For all Days getting the table 
+			//For all Days getting the vtiger_table 
 			for($k=0; $k<$days;$k++)
 			{
 				$tdate=$date_array[$k];

Modified: vtigercrm/trunk/modules/Dashboard/Forms.php
==============================================================================
--- vtigercrm/trunk/modules/Dashboard/Forms.php (original)
+++ vtigercrm/trunk/modules/Dashboard/Forms.php Mon Jun 12 14:26:25 2006
@@ -15,7 +15,7 @@
 /*********************************************************************************
  * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Dashboard/Forms.php,v 1.2 2004/10/06 09:02:05 jack Exp $
  * Description:  Contains a variety of utility functions used to display UI 
- * components such as form headers and footers.  Intended to be modified on a per 
+ * components such as form vtiger_headers and footers.  Intended to be modified on a per 
  * theme basis.
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
  * All Rights Reserved.

Modified: vtigercrm/trunk/modules/Dashboard/ReportsCharts.php
==============================================================================
--- vtigercrm/trunk/modules/Dashboard/ReportsCharts.php (original)
+++ vtigercrm/trunk/modules/Dashboard/ReportsCharts.php Mon Jun 12 14:26:25 2006
@@ -186,7 +186,7 @@
 	{
 		//Getting the cached image
 		$imgMap_fp = fopen($cache_file_name.'.map', "rb");
-		$imgMap = fread($imgMap_fp, filesize($cache_file_name.'.map'));
+		$imgMap = fread($imgMap_fp, vtiger_filesize($cache_file_name.'.map'));
 		fclose($imgMap_fp);
 		$base_name_cache_file=basename($cache_file_name);
 		$ccc="cache/images/".$base_name_cache_file;

Modified: vtigercrm/trunk/modules/Dashboard/display_charts.php
==============================================================================
--- vtigercrm/trunk/modules/Dashboard/display_charts.php (original)
+++ vtigercrm/trunk/modules/Dashboard/display_charts.php Mon Jun 12 14:26:25 2006
@@ -35,35 +35,35 @@
 $user_id=$current_user->id;
 
 // Query for Leads
-$leads_query="select crmentity.crmid,crmentity.createdtime, leaddetails.*, 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 ";
+$leads_query="select vtiger_crmentity.crmid,vtiger_crmentity.createdtime, vtiger_leaddetails.*, vtiger_crmentity.smownerid, vtiger_leadscf.* from vtiger_leaddetails inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_leaddetails.leadid inner join vtiger_leadsubdetails on vtiger_leadsubdetails.leadsubscriptionid=vtiger_leaddetails.leadid inner join vtiger_leadaddress on vtiger_leadaddress.leadaddressid=vtiger_leadsubdetails.leadsubscriptionid inner join vtiger_leadscf on vtiger_leaddetails.leadid = vtiger_leadscf.leadid left join vtiger_leadgrouprelation on vtiger_leadscf.leadid=vtiger_leadgrouprelation.leadid left join vtiger_groups on vtiger_groups.groupname=vtiger_leadgrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_leaddetails.converted=0 ";
 
 
 //Query for Accounts
-$account_query="select crmentity.*, account.*, accountscf.* from account inner join crmentity on crmentity.crmid=account.accountid inner join accountbillads on account.accountid=accountbillads.accountaddressid inner join accountshipads on account.accountid=accountshipads.accountaddressid inner join accountscf on account.accountid = accountscf.accountid left join accountgrouprelation on accountscf.accountid=accountgrouprelation.accountid left join groups on groups.groupname=accountgrouprelation.groupname left join users on users.id=crmentity.smownerid where crmentity.deleted=0 ";
+$account_query="select vtiger_crmentity.*, vtiger_account.*, vtiger_accountscf.* from vtiger_account inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_account.accountid inner join vtiger_accountbillads on vtiger_account.accountid=vtiger_accountbillads.accountaddressid inner join vtiger_accountshipads on vtiger_account.accountid=vtiger_accountshipads.accountaddressid inner join vtiger_accountscf on vtiger_account.accountid = vtiger_accountscf.accountid left join vtiger_accountgrouprelation on vtiger_accountscf.accountid=vtiger_accountgrouprelation.accountid left join vtiger_groups on vtiger_groups.groupname=vtiger_accountgrouprelation.groupname left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_crmentity.deleted=0 ";
 
 
 //Query For Products
-$products_query="select distinct(crmentity.crmid),crmentity.createdtime,products.*, productcf.* from products inner join crmentity on crmentity.crmid=products.productid left join productcf on products.productid = productcf.productid left join seproductsrel on seproductsrel.productid = products.productid where crmentity.deleted=0 ";
+$products_query="select distinct(vtiger_crmentity.crmid),vtiger_crmentity.createdtime,vtiger_products.*, vtiger_productcf.* from vtiger_products inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_products.productid left join vtiger_productcf on vtiger_products.productid = vtiger_productcf.productid left join vtiger_seproductsrel on vtiger_seproductsrel.productid = vtiger_products.productid where vtiger_crmentity.deleted=0 ";
 
 //Query for Potential
-$potential_query= "select  crmentity.*,account.accountname, potential.*, potentialscf.* from potential inner join crmentity on crmentity.crmid=potential.potentialid inner join account on potential.accountid = account.accountid inner join potentialscf on potentialscf.potentialid = 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 crmentity.deleted=0 ";
+$potential_query= "select  vtiger_crmentity.*,vtiger_account.accountname, vtiger_potential.*, vtiger_potentialscf.* from vtiger_potential inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_potential.potentialid inner join vtiger_account on vtiger_potential.accountid = vtiger_account.accountid inner join vtiger_potentialscf on vtiger_potentialscf.potentialid = vtiger_potential.potentialid left join vtiger_potentialgrouprelation on vtiger_potential.potentialid=vtiger_potentialgrouprelation.potentialid left join vtiger_groups on vtiger_groups.groupname=vtiger_potentialgrouprelation.groupname left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_crmentity.deleted=0 ";
 
 //Query for Sales Order
-$so_query="select crmentity.*,salesorder.*,account.accountid,quotes.quoteid from salesorder inner join crmentity on crmentity.crmid=salesorder.salesorderid inner join sobillads on salesorder.salesorderid=sobillads.sobilladdressid inner join soshipads on salesorder.salesorderid=soshipads.soshipaddressid left join salesordercf on salesordercf.salesorderid = 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 left join users on users.id=crmentity.smownerid where crmentity.deleted=0 ";
+$so_query="select vtiger_crmentity.*,vtiger_salesorder.*,vtiger_account.accountid,vtiger_quotes.quoteid from vtiger_salesorder inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_salesorder.salesorderid inner join vtiger_sobillads on vtiger_salesorder.salesorderid=vtiger_sobillads.sobilladdressid inner join vtiger_soshipads on vtiger_salesorder.salesorderid=vtiger_soshipads.soshipaddressid left join vtiger_salesordercf on vtiger_salesordercf.salesorderid = vtiger_salesorder.salesorderid left outer join vtiger_quotes on vtiger_quotes.quoteid=vtiger_salesorder.quoteid left outer join vtiger_account on vtiger_account.accountid=vtiger_salesorder.accountid left join vtiger_sogrouprelation on vtiger_salesorder.salesorderid=vtiger_sogrouprelation.salesorderid left join vtiger_groups on vtiger_groups.groupname=vtiger_sogrouprelation.groupname left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_crmentity.deleted=0 ";
 
 
 //Query for Purchase Order
 
-$po_query="select crmentity.*,purchaseorder.* from purchaseorder inner join crmentity on crmentity.crmid=purchaseorder.purchaseorderid left outer join vendor on purchaseorder.vendorid=vendor.vendorid inner join pobillads on purchaseorder.purchaseorderid=pobillads.pobilladdressid inner join poshipads on purchaseorder.purchaseorderid=poshipads.poshipaddressid left join purchaseordercf on purchaseordercf.purchaseorderid = purchaseorder.purchaseorderid left join pogrouprelation on purchaseorder.purchaseorderid=pogrouprelation.purchaseorderid left join groups on groups.groupname=pogrouprelation.groupname left join users on users.id=crmentity.smownerid where crmentity.deleted=0 ";
+$po_query="select vtiger_crmentity.*,vtiger_purchaseorder.* from vtiger_purchaseorder inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_purchaseorder.purchaseorderid left outer join vtiger_vendor on vtiger_purchaseorder.vendorid=vtiger_vendor.vendorid inner join vtiger_pobillads on vtiger_purchaseorder.purchaseorderid=vtiger_pobillads.pobilladdressid inner join vtiger_poshipads on vtiger_purchaseorder.purchaseorderid=vtiger_poshipads.poshipaddressid left join vtiger_purchaseordercf on vtiger_purchaseordercf.purchaseorderid = vtiger_purchaseorder.purchaseorderid left join vtiger_pogrouprelation on vtiger_purchaseorder.purchaseorderid=vtiger_pogrouprelation.purchaseorderid left join vtiger_groups on vtiger_groups.groupname=vtiger_pogrouprelation.groupname left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_crmentity.deleted=0 ";
 
 // Query for Quotes
-$quotes_query="select crmentity.*,quotes.* from quotes inner join crmentity on crmentity.crmid=quotes.quoteid inner join quotesbillads on quotes.quoteid=quotesbillads.quotebilladdressid inner join quotesshipads on quotes.quoteid=quotesshipads.quoteshipaddressid left join quotescf on quotes.quoteid = quotescf.quoteid left outer join account on account.accountid=quotes.accountid 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 left join users on users.id=crmentity.smownerid where crmentity.deleted=0 ";
+$quotes_query="select vtiger_crmentity.*,vtiger_quotes.* from vtiger_quotes inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_quotes.quoteid inner join vtiger_quotesbillads on vtiger_quotes.quoteid=vtiger_quotesbillads.quotebilladdressid inner join vtiger_quotesshipads on vtiger_quotes.quoteid=vtiger_quotesshipads.quoteshipaddressid left join vtiger_quotescf on vtiger_quotes.quoteid = vtiger_quotescf.quoteid left outer join vtiger_account on vtiger_account.accountid=vtiger_quotes.accountid left outer join vtiger_potential on vtiger_potential.potentialid=vtiger_quotes.potentialid left join vtiger_quotegrouprelation on vtiger_quotes.quoteid=vtiger_quotegrouprelation.quoteid left join vtiger_groups on vtiger_groups.groupname=vtiger_quotegrouprelation.groupname left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_crmentity.deleted=0 ";
 
 //Query for Invoice
-$invoice_query="select crmentity.*,invoice.* from invoice inner join crmentity on crmentity.crmid=invoice.invoiceid inner join invoicebillads on invoice.invoiceid=invoicebillads.invoicebilladdressid inner join invoiceshipads on invoice.invoiceid=invoiceshipads.invoiceshipaddressid left outer join salesorder on salesorder.salesorderid=invoice.salesorderid inner join invoicecf on invoice.invoiceid = invoicecf.invoiceid left join invoicegrouprelation on invoice.invoiceid=invoicegrouprelation.invoiceid left join groups on groups.groupname=invoicegrouprelation.groupname left join users on users.id=crmentity.smownerid where crmentity.deleted=0 ";
+$invoice_query="select vtiger_crmentity.*,vtiger_invoice.* from vtiger_invoice inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_invoice.invoiceid inner join vtiger_invoicebillads on vtiger_invoice.invoiceid=vtiger_invoicebillads.invoicebilladdressid inner join vtiger_invoiceshipads on vtiger_invoice.invoiceid=vtiger_invoiceshipads.invoiceshipaddressid left outer join vtiger_salesorder on vtiger_salesorder.salesorderid=vtiger_invoice.salesorderid inner join vtiger_invoicecf on vtiger_invoice.invoiceid = vtiger_invoicecf.invoiceid left join vtiger_invoicegrouprelation on vtiger_invoice.invoiceid=vtiger_invoicegrouprelation.invoiceid left join vtiger_groups on vtiger_groups.groupname=vtiger_invoicegrouprelation.groupname left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_crmentity.deleted=0 ";
 
 //Query for tickets
-$helpdesk_query=" select troubletickets.status AS ticketstatus, troubletickets.*,crmentity.* from troubletickets inner join ticketcf on ticketcf.ticketid = troubletickets.ticketid inner join crmentity on crmentity.crmid=troubletickets.ticketid left join ticketgrouprelation on troubletickets.ticketid=ticketgrouprelation.ticketid left join groups on groups.groupname=ticketgrouprelation.groupname 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";
+$helpdesk_query=" select vtiger_troubletickets.status AS vtiger_ticketstatus, vtiger_troubletickets.*,vtiger_crmentity.* from vtiger_troubletickets inner join vtiger_ticketcf on vtiger_ticketcf.ticketid = vtiger_troubletickets.ticketid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_troubletickets.ticketid left join vtiger_ticketgrouprelation on vtiger_troubletickets.ticketid=vtiger_ticketgrouprelation.ticketid left join vtiger_groups on vtiger_groups.groupname=vtiger_ticketgrouprelation.groupname left join vtiger_contactdetails on vtiger_troubletickets.parent_id=vtiger_contactdetails.contactid left join vtiger_account on vtiger_account.accountid=vtiger_troubletickets.parent_id left join vtiger_users on vtiger_crmentity.smownerid=vtiger_users.id and vtiger_troubletickets.ticketid = vtiger_ticketcf.ticketid where vtiger_crmentity.deleted=0";
 
  /**  This function returns  the values for the graph, for any type of graph needed	 
         * Portions created by vtiger are Copyright (C) vtiger.
@@ -257,7 +257,7 @@
 	{
 		//Getting the cached image
 		$imgMap_fp = fopen($cache_file_name.'.map', "rb");
-		$imgMap = fread($imgMap_fp, filesize($cache_file_name.'.map'));
+		$imgMap = fread($imgMap_fp, vtiger_filesize($cache_file_name.'.map'));
 		fclose($imgMap_fp);
 		$base_name_cache_file=basename($cache_file_name);
 		$ccc="cache/images/".$base_name_cache_file;
@@ -408,7 +408,7 @@
                             $graph_by="leadsource";
                             $graph_title=$mod_strings['salesbyleadsource'];
                             $module="Potentials";
-                            $where=" and potential.sales_stage like '%Closed Won%' ";
+                            $where=" and vtiger_potential.sales_stage like '%Closed Won%' ";
                             $query=$potential_query;
                             echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
                     }
@@ -418,7 +418,7 @@
                     	$graph_by="accountid";
                          $graph_title=$mod_strings['salesbyaccount'];
                          $module="Potentials";
-                         $where=" and potential.sales_stage like '%Closed Won%' ";
+                         $where=" and vtiger_potential.sales_stage like '%Closed Won%' ";
                          $query=$potential_query;
                          echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
                     }

Modified: vtigercrm/trunk/modules/Dashboard/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Dashboard/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Dashboard/language/en_us.lang.php Mon Jun 12 14:26:25 2006
@@ -22,13 +22,13 @@
  
 $mod_strings = Array(
 'LBL_SALES_STAGE_FORM_TITLE'=>'Pipeline By Sales Stage',
-'LBL_SALES_STAGE_FORM_DESC'=>'Shows cumulative opportunity amounts by selected sales stages for selected users where the expected closed date is within the specificed date range.',
+'LBL_SALES_STAGE_FORM_DESC'=>'Shows cumulative opportunity amounts by selected sales stages for selected vtiger_users where the expected closed date is within the specificed date range.',
 'LBL_MONTH_BY_OUTCOME'=>'Pipeline By Month By Outcome',
-'LBL_MONTH_BY_OUTCOME_DESC'=>'Shows cumulative opportunity amounts by month by outcome for selected users where the expected closed date is within the specificed date range.  Outcome is based on whether the sales stage is Closed Won, Closed Lost or any other value.',
+'LBL_MONTH_BY_OUTCOME_DESC'=>'Shows cumulative opportunity amounts by month by outcome for selected vtiger_users where the expected closed date is within the specificed date range.  Outcome is based on whether the sales stage is Closed Won, Closed Lost or any other value.',
 'LBL_LEAD_SOURCE_FORM_TITLE'=>'All Opportunities By Lead Source',
-'LBL_LEAD_SOURCE_FORM_DESC'=>'Shows cumulative opportunity amounts by selected lead source for selected users.',
+'LBL_LEAD_SOURCE_FORM_DESC'=>'Shows cumulative opportunity amounts by selected lead source for selected vtiger_users.',
 'LBL_LEAD_SOURCE_BY_OUTCOME'=>'All Opportunities By Lead Source By Outcome',
-'LBL_LEAD_SOURCE_BY_OUTCOME_DESC'=>'Shows cumulative opportunity amounts by selected lead source by outcome for selected users where the expected closed date is within the specificed date range.  Outcome is based on whether the sales stage is Closed Won, Closed Lost or any other value.',
+'LBL_LEAD_SOURCE_BY_OUTCOME_DESC'=>'Shows cumulative opportunity amounts by selected lead source by outcome for selected vtiger_users where the expected closed date is within the specificed date range.  Outcome is based on whether the sales stage is Closed Won, Closed Lost or any other value.',
 'LBL_PIPELINE_FORM_TITLE_DESC'=>'Shows cumulative amounts by selected sales stages for your opportunities where the expected closed date is within the specificed date range.',
 'LBL_DATE_RANGE'=>'Date range is',
 'LBL_DATE_RANGE_TO'=>'to',
@@ -51,8 +51,8 @@
 'LBL_DATE_START'=>'Begin Date:',
 'LBL_DATE_END'=>'End Date:',
 //Added for 5.0 
-'LBL_NO_PERMISSION'=>'Your profile doesn\'t allow you view the Graph for this module',
-'LBL_NO_PERMISSION_FIELD'=>'Your profile doesn\'t allow you view the Graph for this module or for the Field',
+'LBL_NO_PERMISSION'=>'Your vtiger_profile doesn\'t allow you view the Graph for this module',
+'LBL_NO_PERMISSION_FIELD'=>'Your vtiger_profile doesn\'t allow you view the Graph for this module or for the Field',
 
 "leadsource" => "Leads By Source",
 "leadstatus" => "Leads By Status",

Modified: vtigercrm/trunk/modules/Emails/Choose.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/Choose.php (original)
+++ vtigercrm/trunk/modules/Emails/Choose.php Mon Jun 12 14:26:25 2006
@@ -16,15 +16,15 @@
 
 if ($pmodule=='Accounts')
 {
-	$querystr="select fieldid,fieldlabel,columnname,tablename from field where tabid=6 and uitype=13;"; 
+	$querystr="select vtiger_fieldid,fieldlabel,columnname,tablename from vtiger_field where vtiger_tabid=6 and uitype=13;"; 
 }
 elseif ($pmodule=='Contacts')
 {
-	$querystr="select fieldid,fieldlabel,columnname from field where tabid=4 and uitype=13;";
+	$querystr="select vtiger_fieldid,fieldlabel,columnname from vtiger_field where vtiger_tabid=4 and uitype=13;";
 }
 elseif ($pmodule=='Leads')
 {
-	$querystr="select fieldid,fieldlabel,columnname from field where tabid=7 and uitype=13;";
+	$querystr="select vtiger_fieldid,fieldlabel,columnname from vtiger_field where vtiger_tabid=7 and uitype=13;";
 }
 
 $result=$adb->query($querystr);

Modified: vtigercrm/trunk/modules/Emails/ChooseEmail.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/ChooseEmail.php (original)
+++ vtigercrm/trunk/modules/Emails/ChooseEmail.php Mon Jun 12 14:26:25 2006
@@ -14,15 +14,15 @@
 
 if ($pmodule=='Accounts')
 {
-	$querystr="select fieldid,fieldlabel,columnname,tablename from field where tabid=6 and uitype=13;"; 
+	$querystr="select vtiger_fieldid,fieldlabel,columnname,tablename from vtiger_field where vtiger_tabid=6 and uitype=13;"; 
 }
 elseif ($pmodule=='Contacts')
 {
-	$querystr="select fieldid,fieldlabel,columnname from field where tabid=4 and uitype=13;";
+	$querystr="select vtiger_fieldid,fieldlabel,columnname from vtiger_field where vtiger_tabid=4 and uitype=13;";
 }
 elseif ($pmodule=='Leads')
 {
-	$querystr="select fieldid,fieldlabel,columnname from field where tabid=7 and uitype=13;";
+	$querystr="select vtiger_fieldid,fieldlabel,columnname from vtiger_field where vtiger_tabid=7 and uitype=13;";
 }
 $result=$adb->query($querystr);
 $numrows = $adb->num_rows($result);

Modified: vtigercrm/trunk/modules/Emails/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/DetailView.php (original)
+++ vtigercrm/trunk/modules/Emails/DetailView.php Mon Jun 12 14:26:25 2006
@@ -42,7 +42,7 @@
 	$focus->retrieve_entity_info($_REQUEST['record'],"Emails");
 	$log->info("Entity info successfully retrieved for DetailView.");
 	$focus->id = $_REQUEST['record'];
-	$query = 'select email_flag,from_email,to_email,cc_email,bcc_email from emaildetails where emailid ='.$focus->id;
+	$query = 'select email_flag,from_email,to_email,cc_email,bcc_email from vtiger_emaildetails where emailid ='.$focus->id;
 	$result = $adb->query($query);
     	$smarty->assign('FROM_MAIL',$adb->query_result($result,0,'from_email'));	
 	$to_email = ereg_replace('###',', ',$adb->query_result($result,0,'to_email'));

Modified: vtigercrm/trunk/modules/Emails/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/EditView.php (original)
+++ vtigercrm/trunk/modules/Emails/EditView.php Mon Jun 12 14:26:25 2006
@@ -61,7 +61,7 @@
 		$focus->mode = '';
 	}else
 	{
-		$query = 'select idlists,from_email,to_email,cc_email,bcc_email from emaildetails where emailid ='.$focus->id;
+		$query = 'select idlists,from_email,to_email,cc_email,bcc_email from vtiger_emaildetails where emailid ='.$focus->id;
 		$result = $adb->query($query);
 		$smarty->assign('FROM_MAIL',$adb->query_result($result,0,'from_email'));	
 		$to_email = ereg_replace('###',',',$adb->query_result($result,0,'to_email'));
@@ -88,15 +88,15 @@
 	$rec_id = $_REQUEST["rec_id"];
 
 	if($rec_type == "record_id") {
-		$rs = $adb->query("select setype from crmentity where crmid='".$rec_id."'");
+		$rs = $adb->query("select setype from vtiger_crmentity where crmid='".$rec_id."'");
 		$type = $adb->query_result($rs,0,'setype');
 
 		if($type == "Leads") 
-			$q = "select email as email1 from leaddetails where leadid='".$rec_id."'";
+			$q = "select email as email1 from vtiger_leaddetails where leadid='".$rec_id."'";
 		elseif ($type == "Contacts")
-			$q = "select email as email1 from contactdetails where contactid='".$rec_id."'";
+			$q = "select email as email1 from vtiger_contactdetails where contactid='".$rec_id."'";
 		elseif ($type == "Accounts")
-			$q = "select email1,email2 from account where accountid='".$rec_id."'";
+			$q = "select email1,email2 from vtiger_account where vtiger_accountid='".$rec_id."'";
 
 		$email1 = $adb->query_result($adb->query($q),0,"email1");
 	} elseif ($rec_type == "email_addy") {
@@ -217,7 +217,7 @@
         $smarty->assign("MODE", $focus->mode);
 }
 
-// Unimplemented until jscalendar language files are fixed
+// Unimplemented until jscalendar language vtiger_files are fixed
 
 $smarty->assign("CALENDAR_LANG", $app_strings['LBL_JSCALENDAR_LANG']);
 $smarty->assign("CALENDAR_DATEFORMAT", parse_calendardate($app_strings['NTC_DATE_FORMAT']));
@@ -252,7 +252,7 @@
 
 if(isset($focus->parent_type) && $focus->parent_type != "") 
 {
-	$change_parent_button = "<input title='".$app_strings['LBL_CHANGE_BUTTON_TITLE']."' tabindex='2' accessKey='".$app_strings['LBL_CHANGE_BUTTON_KEY']."' type='button' class='button' value='".$app_strings['LBL_CHANGE_BUTTON_LABEL']."' name='button' LANGUAGE=javascript onclick='return window.open(\"index.php?module=\"+ document.EditView.parent_type.value + \"&action=Popup&html=Popup_picker&form=TasksEditView\",\"test\",\"width=600,height=400,resizable=1,scrollbars=1\");'>";
+	$change_parent_button = "<input title='".$app_strings['LBL_CHANGE_BUTTON_TITLE']."' vtiger_tabindex='2' accessKey='".$app_strings['LBL_CHANGE_BUTTON_KEY']."' type='button' class='button' value='".$app_strings['LBL_CHANGE_BUTTON_LABEL']."' name='button' LANGUAGE=javascript onclick='return window.open(\"index.php?module=\"+ document.EditView.parent_type.value + \"&action=Popup&html=Popup_picker&form=TasksEditView\",\"test\",\"width=600,height=400,resizable=1,scrollbars=1\");'>";
 	$smarty->assign("CHANGE_PARENT_BUTTON", $change_parent_button);
 }
 

Modified: vtigercrm/trunk/modules/Emails/Email.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/Email.php (original)
+++ vtigercrm/trunk/modules/Emails/Email.php Mon Jun 12 14:26:25 2006
@@ -35,7 +35,7 @@
 	var $log;
 	var $db;
 
-	// Stored fields
+	// Stored vtiger_fields
 	var $id;
 	var $mode;
 
@@ -46,15 +46,15 @@
 	var $time_start;
   	var $module_id="emailid";
 
-	var $rel_users_table = "salesmanactivityrel";
-	var $rel_contacts_table = "cntactivityrel";
-	var $rel_serel_table = "seactivityrel";
+	var $rel_users_table = "vtiger_salesmanactivityrel";
+	var $rel_contacts_table = "vtiger_cntactivityrel";
+	var $rel_serel_table = "vtiger_seactivityrel";
 
 	var $table_name = "activity";
-	var $tab_name = Array('crmentity','activity','seactivityrel','cntactivityrel','attachments');
-        var $tab_name_index = Array('crmentity'=>'crmid','activity'=>'activityid','seactivityrel'=>'activityid','cntactivityrel'=>'activityid','attachments'=>'attachmentsid');
-
-	// This is the list of fields that are in the lists.
+	var $tab_name = Array('vtiger_crmentity','vtiger_activity','vtiger_seactivityrel','vtiger_cntactivityrel','vtiger_attachments');
+        var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_activity'=>'activityid','vtiger_seactivityrel'=>'activityid','vtiger_cntactivityrel'=>'activityid','vtiger_attachments'=>'attachmentsid');
+
+	// This is the list of vtiger_fields that are in the lists.
         var $list_fields = Array(
 				       'Subject'=>Array('activity'=>'subject'),
 				       'Related to'=>Array('seactivityrel'=>'activityid'),
@@ -109,7 +109,7 @@
 		$button = '';
 		$returnset = '&return_module=Emails&return_action=DetailView&return_id='.$id;
 
-		$query = 'select contactdetails.accountid, contactdetails.contactid, contactdetails.firstname,contactdetails.lastname, contactdetails.department, contactdetails.title, contactdetails.email, contactdetails.phone, contactdetails.emailoptout, crmentity.crmid, crmentity.smownerid, crmentity.modifiedtime from contactdetails inner join cntactivityrel on cntactivityrel.contactid=contactdetails.contactid inner join crmentity on crmentity.crmid = contactdetails.contactid left join contactgrouprelation on contactdetails.contactid=contactgrouprelation.contactid left join groups on groups.groupname=contactgrouprelation.groupname where cntactivityrel.activityid='.$adb->quote($id).' and crmentity.deleted=0';
+		$query = 'select vtiger_contactdetails.accountid, vtiger_contactdetails.contactid, vtiger_contactdetails.firstname,vtiger_contactdetails.lastname, vtiger_contactdetails.department, vtiger_contactdetails.title, vtiger_contactdetails.email, vtiger_contactdetails.phone, vtiger_contactdetails.emailoptout, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_contactdetails inner join vtiger_cntactivityrel on vtiger_cntactivityrel.contactid=vtiger_contactdetails.contactid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid left join vtiger_groups on vtiger_groups.groupname=vtiger_contactgrouprelation.groupname where vtiger_cntactivityrel.activityid='.$adb->quote($id).' and vtiger_crmentity.deleted=0';
 		$log->info("Contact Related List for Email is Displayed");
 		$log->debug("Exiting get_contacts method ...");
 		return GetRelatedList('Emails','Contacts',$focus,$query,$button,$returnset);
@@ -154,7 +154,7 @@
 	}	
 	// Mike Crowe Mod --------------------------------------------------------
 
-	/** Returns a list of the associated users
+	/** Returns a list of the associated vtiger_users
 	 * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc..
 	 * All Rights Reserved..
 	 * Contributor(s): ______________________________________..
@@ -169,7 +169,7 @@
 
 		$id = $_REQUEST['record'];
 
-		$query = 'SELECT users.id, users.first_name,users.last_name, users.user_name, users.email1, users.email2, users.yahoo_id, users.phone_home, users.phone_work, users.phone_mobile, users.phone_other, users.phone_fax from users inner join salesmanactivityrel on salesmanactivityrel.smid=users.id and salesmanactivityrel.activityid='.$adb->quote($id);
+		$query = 'SELECT vtiger_users.id, vtiger_users.first_name,vtiger_users.last_name, vtiger_users.user_name, vtiger_users.email1, vtiger_users.email2, vtiger_users.yahoo_id, vtiger_users.phone_home, vtiger_users.phone_work, vtiger_users.phone_mobile, vtiger_users.phone_other, vtiger_users.phone_fax from vtiger_users inner join vtiger_salesmanactivityrel on vtiger_salesmanactivityrel.smid=vtiger_users.id and vtiger_salesmanactivityrel.activityid='.$adb->quote($id);
 		$result=$adb->query($query);   
 
 		$noofrows = $adb->num_rows($result);
@@ -219,35 +219,35 @@
 	}
 
 	/**
-	  * Returns a list of the associated attachments and notes of the Email
+	  * Returns a list of the associated vtiger_attachments and vtiger_notes of the Email
 	  */
 	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,
-			crm2.createdtime, notes.notecontent description, users.user_name
-		from notes
-			inner join senotesrel on senotesrel.notesid= notes.notesid
-			inner join crmentity on crmentity.crmid= senotesrel.crmid
-			inner join crmentity crm2 on crm2.crmid=notes.notesid and crm2.deleted=0
-			left join seattachmentsrel  on seattachmentsrel.crmid =notes.notesid
-			left join attachments on seattachmentsrel.attachmentsid = attachments.attachmentsid
-			inner join users on crm2.smcreatorid= users.id
-		where crmentity.crmid=".$adb->quote($id);
+		$query = "select vtiger_notes.title,'Notes      '  ActivityType, vtiger_notes.filename,
+		vtiger_attachments.type  FileType,crm2.modifiedtime lastmodified,
+		vtiger_seattachmentsrel.attachmentsid vtiger_attachmentsid, vtiger_notes.notesid crmid,
+			crm2.createdtime, vtiger_notes.notecontent description, vtiger_users.user_name
+		from vtiger_notes
+			inner join vtiger_senotesrel on vtiger_senotesrel.notesid= vtiger_notes.notesid
+			inner join vtiger_crmentity on vtiger_crmentity.crmid= vtiger_senotesrel.crmid
+			inner join vtiger_crmentity crm2 on crm2.crmid=vtiger_notes.notesid and crm2.deleted=0
+			left join vtiger_seattachmentsrel  on vtiger_seattachmentsrel.crmid =vtiger_notes.notesid
+			left join vtiger_attachments on vtiger_seattachmentsrel.attachmentsid = vtiger_attachments.attachmentsid
+			inner join vtiger_users on crm2.smcreatorid= vtiger_users.id
+		where vtiger_crmentity.crmid=".$adb->quote($id);
 		$query .= ' union all ';
-		$query .= "select attachments.description title ,'Attachments'  ActivityType,
-			attachments.name filename, attachments.type FileType,crm2.modifiedtime lastmodified,
-			attachments.attachmentsid  attachmentsid,	seattachmentsrel.attachmentsid crmid,
-			crm2.createdtime, attachments.description, users.user_name
-		from attachments
-			inner join seattachmentsrel on seattachmentsrel.attachmentsid= attachments.attachmentsid
-			inner join crmentity on crmentity.crmid= seattachmentsrel.crmid
-			inner join crmentity crm2 on crm2.crmid=attachments.attachmentsid
-			inner join users on crm2.smcreatorid= users.id
-		where crmentity.crmid=".$adb->quote($id);
+		$query .= "select vtiger_attachments.description title ,'Attachments'  ActivityType,
+		vtiger_attachments.name filename, vtiger_attachments.type FileType,crm2.modifiedtime lastmodified,
+		vtiger_attachments.attachmentsid  vtiger_attachmentsid,vtiger_seattachmentsrel.attachmentsid crmid,
+			crm2.createdtime, vtiger_attachments.description, vtiger_users.user_name
+		from vtiger_attachments
+			inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid= vtiger_attachments.attachmentsid
+			inner join vtiger_crmentity on vtiger_crmentity.crmid= vtiger_seattachmentsrel.crmid
+			inner join vtiger_crmentity crm2 on crm2.crmid=vtiger_attachments.attachmentsid
+			inner join vtiger_users on crm2.smcreatorid= vtiger_users.id
+		where vtiger_crmentity.crmid=".$adb->quote($id);
 		
 		$log->info("Notes&Attachments Related List for Email is Displayed");
 		$log->debug("Exiting get_attachments method ...");
@@ -261,7 +261,7 @@
 	{
 		global $log;
 		$log->debug("Entering create_export_query(".$order_by.",".$where.") method ...");
-		$query = 'SELECT activity.activityid, activity.subject, activity.activitytype, attachments.name as filename, crmentity.description as email_content FROM activity inner join crmentity on crmentity.crmid=activity.activityid left join seattachmentsrel on activity.activityid=seattachmentsrel.crmid left join attachments on seattachmentsrel.attachmentsid = attachments.attachmentsid where activity.activitytype="Emails" and crmentity.deleted=0';
+		$query = 'SELECT vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.activitytype, vtiger_attachments.name as filename, vtiger_crmentity.description as email_content FROM vtiger_activity inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_seattachmentsrel on vtiger_activity.activityid=vtiger_seattachmentsrel.crmid left join vtiger_attachments on vtiger_seattachmentsrel.attachmentsid = vtiger_attachments.attachmentsid where vtiger_activity.activitytype="Emails" and vtiger_crmentity.deleted=0';
 
 		$log->debug("Exiting create_export_query method ...");
                 return $query;
@@ -312,7 +312,7 @@
 function get_to_emailids($module)
 {
 	global $adb;
-	$query = 'select columnname,fieldid from field where fieldid in('.ereg_replace(':',',',$_REQUEST["field_lists"]).')';
+	$query = 'select columnname,fieldid from vtiger_field where vtiger_fieldid in('.ereg_replace(':',',',$_REQUEST["field_lists"]).')';
     $result = $adb->query($query);
 	$columns = Array();
 	$idlists = '';
@@ -327,13 +327,13 @@
 	switch($module)
 	{
 		case 'Leads':
-			$query = 'select crmid,concat(lastname," ",firstname) as entityname,'.$columnlists.' from leaddetails inner join crmentity on crmentity.crmid=leaddetails.leadid left join leadscf on leadscf.leadid = leaddetails.leadid where crmentity.deleted=0 and crmentity.crmid in ('.$crmids.')';
+			$query = 'select crmid,concat(lastname," ",firstname) as entityname,'.$columnlists.' from vtiger_leaddetails inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_leaddetails.leadid left join vtiger_leadscf on vtiger_leadscf.leadid = vtiger_leaddetails.leadid where vtiger_crmentity.deleted=0 and vtiger_crmentity.crmid in ('.$crmids.')';
 			break;
 		case 'Contacts':
-			$query = 'select crmid,concat(lastname," ",firstname) as entityname,'.$columnlists.' from contactdetails inner join crmentity on crmentity.crmid=contactdetails.contactid left join contactscf on contactscf.contactid = contactdetails.contactid where crmentity.deleted=0 and crmentity.crmid in ('.$crmids.')';
+			$query = 'select crmid,concat(lastname," ",firstname) as entityname,'.$columnlists.' from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_contactdetails.contactid left join vtiger_contactscf on vtiger_contactscf.contactid = vtiger_contactdetails.contactid where vtiger_crmentity.deleted=0 and vtiger_crmentity.crmid in ('.$crmids.')';
 			break;
 		case 'Accounts':
-			$query = 'select crmid,accountname as entityname,'.$columnlists.' from account inner join crmentity on crmentity.crmid=account.accountid left join accountscf on accountscf.accountid = account.accountid where crmentity.deleted=0 and crmentity.crmid in ('.$crmids.')';
+			$query = 'select crmid,accountname as entityname,'.$columnlists.' from vtiger_account inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_account.accountid left join vtiger_accountscf on vtiger_accountscf.accountid = vtiger_account.accountid where vtiger_crmentity.deleted=0 and vtiger_crmentity.crmid in ('.$crmids.')';
 			break;
 	}	
 	$result = $adb->query($query);

Modified: vtigercrm/trunk/modules/Emails/Forms.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/Forms.php (original)
+++ vtigercrm/trunk/modules/Emails/Forms.php Mon Jun 12 14:26:25 2006
@@ -15,7 +15,7 @@
 /*********************************************************************************
  * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Emails/Forms.php,v 1.4 2005/04/19 16:48:31 ray Exp $
  * Description:  Contains a variety of utility functions used to display UI
- * components such as form headers and footers.  Intended to be modified on a per
+ * components such as form vtiger_headers and footers.  Intended to be modified on a per
  * theme basis.
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
  * All Rights Reserved.
@@ -211,7 +211,7 @@
 }
 
 /**
- * Create HTML form to enter a new record with the minimum necessary fields.
+ * Create HTML form to enter a new record with the minimum necessary vtiger_fields.
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
  * All Rights Reserved.
  * Contributor(s): ______________________________________..
@@ -226,7 +226,7 @@
 	global $adb;//for dynamic quickcreateform construction
 
 
-	// Unimplemented until jscalendar language files are fixed
+	// Unimplemented until jscalendar language vtiger_files are fixed
 	// global $current_language;
 	// global $default_language;
 	// global $cal_codes;
@@ -244,7 +244,7 @@
 	$default_date_start = date('Y-m-d');
 	$default_time_start = date('H:i');
 	$user_id = $current_user->id;
-	// Unimplemented until jscalendar language files are fixed
+	// Unimplemented until jscalendar language vtiger_files are fixed
 	// $cal_lang = (empty($cal_codes[$current_language])) ? $cal_codes[$default_language] : $cal_codes[$current_language];
 	$cal_lang = "en";
 	$cal_dateformat = parse_calendardate($app_strings['NTC_DATE_FORMAT']);
@@ -252,7 +252,7 @@
 	$qcreate_form = get_left_form_header($mod_strings['LBL_NEW_FORM_TITLE']);
 
 
-	$qcreate_get_field="select * from field where tabid=10 and quickcreate=0 order by quickcreatesequence";
+	$qcreate_get_field="select * from vtiger_field where vtiger_tabid=10 and quickcreate=0 order by quickcreatesequence";
 	$qcreate_get_result=$adb->query($qcreate_get_field);
 	$qcreate_get_noofrows=$adb->num_rows($qcreate_get_result);
 
@@ -345,9 +345,9 @@
 inputField : "QCK_date_start", ifFormat : "'.$cal_dateformat.'", showsTime : false, button : "jscal_trigger", singleClick : true, step : 1
 });
 
-		var fieldname = new Array('.$fieldName.')
-		var fieldlabel = new Array('.$fieldLabel.')
-		var fielddatatype = new Array('.$fldDataType.')
+		var vtiger_fieldname = new Array('.$fieldName.')
+		var vtiger_fieldlabel = new Array('.$fieldLabel.')
+		var vtiger_fielddatatype = new Array('.$fldDataType.')
 
 	</script>';
 

Modified: vtigercrm/trunk/modules/Emails/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/ListView.php (original)
+++ vtigercrm/trunk/modules/Emails/ListView.php Mon Jun 12 14:26:25 2006
@@ -88,14 +88,14 @@
 $display_title = $mod_strings['LBL_LIST_FORM_TITLE'];
 if($email_title)$display_title = $email_title;
 
-//to get the search field if exists
+//to get the search vtiger_field if exists
 if(isset($_REQUEST['search']) && $_REQUEST['search'] != '' && $_REQUEST['search_text'] != '')
 {
 	$url_string .= "&search=".$_REQUEST['search']."&search_field=".$_REQUEST['search_field']."&search_text=".$_REQUEST['search_text'];
 	if($_REQUEST['search_field'] != 'join')
 		$where = $_REQUEST['search_field']." like '%".$_REQUEST['search_text']."%'";	
 	else
-		$where = "(subject like '%".$_REQUEST['search_text']."%' OR users.user_name like '%".$_REQUEST['search_text']."%')";	
+		$where = "(subject like '%".$_REQUEST['search_text']."%' OR vtiger_users.user_name like '%".$_REQUEST['search_text']."%')";	
 }
 
 
@@ -118,23 +118,23 @@
 }
 if($_REQUEST['folderid'] =='2')
 {
-	$list_query .= "AND seactivityrel.crmid in (select contactid from contactdetails) AND emaildetails.email_flag !='WEBMAIL'";
+	$list_query .= "AND vtiger_seactivityrel.crmid in (select contactid from vtiger_contactdetails) AND vtiger_emaildetails.email_flag !='WEBMAIL'";
 }
 if($_REQUEST['folderid'] =='3')
 {
-	$list_query .= "AND seactivityrel.crmid in (select accountid from account)";	
+	$list_query .= "AND vtiger_seactivityrel.crmid in (select vtiger_accountid from vtiger_account)";	
 }
 if($_REQUEST['folderid'] =='4')
 {
-	$list_query .= "AND seactivityrel.crmid in (select leadid from leaddetails)";	
+	$list_query .= "AND vtiger_seactivityrel.crmid in (select leadid from vtiger_leaddetails)";	
 }
 if($_REQUEST['folderid'] =='5')
 {
-	$list_query .= "AND salesmanactivityrel.smid in (select id from users)";	
+	$list_query .= "AND vtiger_salesmanactivityrel.smid in (select id from vtiger_users)";	
 }
 if($_REQUEST['folderid'] =='6')
 {
-	$list_query .= "AND emaildetails.email_flag ='WEBMAIL'";	
+	$list_query .= "AND vtiger_emaildetails.email_flag ='WEBMAIL'";	
 }
 if(isset($order_by) && $order_by != '')
 {

Modified: vtigercrm/trunk/modules/Emails/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/Save.php (original)
+++ vtigercrm/trunk/modules/Emails/Save.php Mon Jun 12 14:26:25 2006
@@ -21,11 +21,11 @@
  * Contributor(s): ______________________________________..
  ********************************************************************************/
 
-//Added on 09-11-2005 to avoid loading the webmail files in Email process
+//Added on 09-11-2005 to avoid loading the webmail vtiger_files in Email process
 if($_REQUEST['smodule'] != '')
 {
 	define('SM_PATH','modules/squirrelmail-1.4.4/');
-	/* SquirrelMail required files. */
+	/* SquirrelMail required vtiger_files. */
 	require_once(SM_PATH . 'functions/strings.php');
 	require_once(SM_PATH . 'functions/imap_general.php');
 	require_once(SM_PATH . 'functions/imap_messages.php');
@@ -130,7 +130,7 @@
 	global $log;
 	$log->debug("Entering checkIfContactExists(".$mailid.") method ...");
 	global $adb;
-	$sql = "select contactid from contactdetails inner join crmentity on crmentity.crmid=contactdetails.contactid where crmentity.deleted=0 and email= ".$adb->quote($mailid);
+	$sql = "select contactid from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_contactdetails.contactid where vtiger_crmentity.deleted=0 and email= ".$adb->quote($mailid);
 	$result = $adb->query($sql);
 	$numRows = $adb->num_rows($result);
 	if($numRows > 0)
@@ -153,10 +153,10 @@
 $focus->column_fields["date_start"]= date('Y-m-d');
 $focus->save("Emails");
 
-//saving the email details in emaildetails table
+//saving the email details in vtiger_emaildetails vtiger_table
 $return_id = $focus->id;
 $email_id = $return_id;
-$query = 'select emailid from emaildetails where emailid ='.$email_id;
+$query = 'select emailid from vtiger_emaildetails where emailid ='.$email_id;
 $result = $adb->query($query);
 if(isset($_REQUEST["hidden_toid"]) && $_REQUEST["hidden_toid"]!='')
 	$all_to_ids = ereg_replace(",","###",$_REQUEST["hidden_toid"]);
@@ -167,10 +167,10 @@
 $all_bcc_ids = ereg_replace(",","###",$_REQUEST["bccmail"]);
 if($adb->num_rows($result) > 0)
 {
-	$query = 'update emaildetails set to_email="'.$all_to_ids.'",cc_email="'.$all_cc_ids.'",bcc_email="'.$all_bcc_ids.'",idlists="'.$_REQUEST["parent_id"].'",email_flag="SAVED" where emailid = '.$email_id;
+	$query = 'update vtiger_emaildetails set to_email="'.$all_to_ids.'",cc_email="'.$all_cc_ids.'",bcc_email="'.$all_bcc_ids.'",idlists="'.$_REQUEST["parent_id"].'",email_flag="SAVED" where emailid = '.$email_id;
 }else
 {
-	$query = 'insert into emaildetails values ('.$email_id.',"","'.$all_to_ids.'","'.$all_cc_ids.'","'.$all_bcc_ids.'","","'.$_REQUEST["parent_id"].'","SAVED")';
+	$query = 'insert into vtiger_emaildetails values ('.$email_id.',"","'.$all_to_ids.'","'.$all_cc_ids.'","'.$all_bcc_ids.'","","'.$_REQUEST["parent_id"].'","SAVED")';
 }
 $adb->query($query);
 

Modified: vtigercrm/trunk/modules/Emails/class.phpmailer.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/class.phpmailer.php (original)
+++ vtigercrm/trunk/modules/Emails/class.phpmailer.php Mon Jun 12 14:26:25 2006
@@ -24,7 +24,7 @@
     /////////////////////////////////////////////////
 
     /**
-     * Email priority (1 = High, 3 = Normal, 5 = low).
+     * Email vtiger_priority (1 = High, 3 = Normal, 5 = low).
      * @var int
      */
     var $Priority          = 3;
@@ -134,7 +134,7 @@
     var $ConfirmReadingTo  = "";
 
     /**
-     *  Sets the hostname to use in Message-Id and Received headers
+     *  Sets the hostname to use in Message-Id and Received vtiger_headers
      *  and as default HELO string. If empty, the value returned
      *  by SERVER_NAME is used or 'localhost.localdomain'.
      *  @var string
@@ -613,7 +613,7 @@
     /////////////////////////////////////////////////
 
     /**
-     * Creates recipient headers.  
+     * Creates recipient vtiger_headers.  
      * @access private
      * @return string
      */
@@ -805,7 +805,7 @@
                        "<" . trim($this->ConfirmReadingTo) . ">");
         }
 
-        // Add custom headers
+        // Add custom vtiger_headers
         for($index = 0; $index < count($this->CustomHeader); $index++)
         {
             $result .= $this->HeaderLine(trim($this->CustomHeader[$index][0]), 
@@ -984,7 +984,7 @@
     /////////////////////////////////////////////////
 
     /**
-     * Adds an attachment from a path on the filesystem.
+     * Adds an attachment from a path on the vtiger_filesystem.
      * Returns false if the file could not be found
      * or accessed.
      * @param string $path Path to the attachment.
@@ -1019,7 +1019,7 @@
     }
 
     /**
-     * Attaches all fs, string, and binary attachments to the message.
+     * Attaches all fs, string, and binary vtiger_attachments to the message.
      * Returns an empty string on failure.
      * @access private
      * @return string
@@ -1028,7 +1028,7 @@
         // Return text of body
         $mime = array();
 
-        // Add all attachments
+        // Add all vtiger_attachments
         for($i = 0; $i < count($this->attachment); $i++)
         {
             // Check for string attachment
@@ -1089,7 +1089,7 @@
         }
         $magic_quotes = get_magic_quotes_runtime();
         set_magic_quotes_runtime(0);
-        $file_buffer = fread($fd, filesize($path));
+        $file_buffer = fread($fd, vtiger_filesize($path));
         $file_buffer = $this->EncodeString($file_buffer, $encoding);
         fclose($fd);
         set_magic_quotes_runtime($magic_quotes);
@@ -1195,7 +1195,7 @@
         // Replace every high ascii, control and = characters
         $encoded = preg_replace('/([\000-\010\013\014\016-\037\075\177-\377])/e',
                   "'='.sprintf('%02X', ord('\\1'))", $encoded);
-        // Replace every spaces and tabs when it's the last character on a line
+        // Replace every spaces and vtiger_tabs when it's the last character on a line
         $encoded = preg_replace("/([\011\040])".$this->LE."/e",
                   "'='.sprintf('%02X', ord('\\1')).'".$this->LE."'", $encoded);
 
@@ -1365,8 +1365,8 @@
     }
 
     /**
-     * Clears all previously set filesystem, string, and binary
-     * attachments.  Returns void.
+     * Clears all previously set vtiger_filesystem, string, and binary
+     * vtiger_attachments.  Returns void.
      * @return void
      */
     function ClearAttachments() {
@@ -1374,7 +1374,7 @@
     }
 
     /**
-     * Clears all custom headers.  Returns void.
+     * Clears all custom vtiger_headers.  Returns void.
      * @return void
      */
     function ClearCustomHeaders() {

Modified: vtigercrm/trunk/modules/Emails/class.smtp.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/class.smtp.php (original)
+++ vtigercrm/trunk/modules/Emails/class.smtp.php Mon Jun 12 14:26:25 2006
@@ -126,7 +126,7 @@
         if(substr(PHP_OS, 0, 3) != "WIN")
            socket_set_timeout($this->smtp_conn, $tval, 0);
 
-        # get any announcement stuff
+        # get any vtiger_announcement stuff
         $announce = $this->get_lines();
 
         # set the timeout  of any socket functions at 1/10 of a second
@@ -252,8 +252,8 @@
     /**
      * Issues a data command and sends the msg_data to the server
      * finializing the mail transaction. $msg_data is the message
-     * that is to be send with the headers. Each header needs to be
-     * on a single line followed by a <CRLF> with the message headers
+     * that is to be send with the vtiger_headers. Each header needs to be
+     * on a single line followed by a <CRLF> with the message vtiger_headers
      * and the message body being seperated by and additional <CRLF>.
      *
      * Implements rfc 821: DATA <CRLF>
@@ -313,13 +313,13 @@
         $msg_data = str_replace("\r","\n",$msg_data);
         $lines = explode("\n",$msg_data);
 
-        # we need to find a good way to determine is headers are
+        # we need to find a good way to determine is vtiger_headers are
         # in the msg_data or if it is a straight msg body
-        # currently I'm assuming rfc 822 definitions of msg headers
-        # and if the first field of the first line (':' sperated)
+        # currently I'm assuming rfc 822 definitions of msg vtiger_headers
+        # and if the first vtiger_field of the first line (':' sperated)
         # does not contain a space then it _should_ be a header
         # and we can process all lines before a blank "" line as
-        # headers.
+        # vtiger_headers.
         $field = substr($lines[0],0,strpos($lines[0],":"));
         $in_headers = false;
         if(!empty($field) && !strstr($field," ")) {
@@ -345,9 +345,9 @@
 
                 $lines_out[] = substr($line,0,$pos);
                 $line = substr($line,$pos + 1);
-                # if we are processing headers we need to
+                # if we are processing vtiger_headers we need to
                 # add a LWSP-char to the front of the new line
-                # rfc 822 on long msg headers
+                # rfc 822 on long msg vtiger_headers
                 if($in_headers) {
                     $line = "\t" . $line;
                 }
@@ -805,7 +805,7 @@
      * $from. Returns true if successful or false otherwise. If True
      * the mail transaction is started and then one or more Recipient
      * commands may be called followed by a Data command. This command
-     * will send the message to the users terminal if they are logged
+     * will send the message to the vtiger_users terminal if they are logged
      * in.
      *
      * Implements rfc 821: SEND <SP> FROM:<reverse-path> <CRLF>
@@ -853,7 +853,7 @@
      * $from. Returns true if successful or false otherwise. If True
      * the mail transaction is started and then one or more Recipient
      * commands may be called followed by a Data command. This command
-     * will send the message to the users terminal if they are logged
+     * will send the message to the vtiger_users terminal if they are logged
      * in and send them an email.
      *
      * Implements rfc 821: SAML <SP> FROM:<reverse-path> <CRLF>
@@ -901,7 +901,7 @@
      * $from. Returns true if successful or false otherwise. If True
      * the mail transaction is started and then one or more Recipient
      * commands may be called followed by a Data command. This command
-     * will send the message to the users terminal if they are logged
+     * will send the message to the vtiger_users terminal if they are logged
      * in or mail it to them if they are not.
      *
      * Implements rfc 821: SOML <SP> FROM:<reverse-path> <CRLF>

Modified: vtigercrm/trunk/modules/Emails/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Emails/language/en_us.lang.php Mon Jun 12 14:26:25 2006
@@ -33,7 +33,7 @@
 'LBL_LIST_DATE'=>'Date Sent',
 'LBL_LIST_TIME'=>'Time Sent',
 
-'ERR_DELETE_RECORD'=>"A record number must be specified to delete the account.",
+'ERR_DELETE_RECORD'=>"A record number must be specified to delete the vtiger_account.",
 'LBL_DATE_SENT'=>'Date Sent:',
 'LBL_SUBJECT'=>'Subject :',
 'LBL_BODY'=>'Body:',
@@ -99,7 +99,7 @@
 'LBL_NEW_ACCOUNT'=>'New Account',
 'LBL_ACCOUNT_TITLE'=>'Accounts',
 
-// Added fields after vtiger4 - Beta
+// Added vtiger_fields after vtiger4 - Beta
 'LBL_USER_TITLE'=>'Users',
 'LBL_NEW_USER'=>'New User',
 

Modified: vtigercrm/trunk/modules/Emails/mail.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/mail.php (original)
+++ vtigercrm/trunk/modules/Emails/mail.php Mon Jun 12 14:26:25 2006
@@ -16,13 +16,13 @@
   *   $module 		-- current module 
   *   $to_email 	-- to email address 
   *   $from_name	-- currently loggedin user name
-  *   $from_email	-- currently loggedin users's email id. you can give as '' if you are not in HelpDesk module
+  *   $from_email	-- currently loggedin vtiger_users's email id. you can give as '' if you are not in HelpDesk module
   *   $subject		-- subject of the email you want to send
   *   $contents		-- body of the email you want to send
   *   $cc		-- add email ids with comma seperated. - optional 
   *   $bcc		-- add email ids with comma seperated. - optional.
-  *   $attachment	-- whether we want to attach the currently selected file or all files.[values = current,all] - optional
-  *   $emailid		-- id of the email object which will be used to get the attachments
+  *   $attachment	-- whether we want to attach the currently selected file or all vtiger_files.[values = current,all] - optional
+  *   $emailid		-- id of the email object which will be used to get the vtiger_attachments
   */
 function send_mail($module,$to_email,$from_name,$from_email,$subject,$contents,$cc='',$bcc='',$attachment='',$emailid='')
 {
@@ -35,7 +35,7 @@
 
 	$adb->println("To id => '".$to_email."'\nSubject ==>'".$subject."'\nContents ==> '".$contents."'");
 
-	//Get the email id of assigned_to user -- pass the value and name, name must be "user_name" or "id"(field names of users table)
+	//Get the email id of assigned_to user -- pass the value and name, name must be "user_name" or "id"(field names of vtiger_users vtiger_table)
 	//$to_email = getUserEmailId('id',$assigned_user_id);
 
 	//if module is HelpDesk then from_email will come based on support email id 
@@ -65,7 +65,7 @@
 }
 
 /**	Function to get the user Email id based on column name and column value
-  *	$name -- column name of the users table 
+  *	$name -- column name of the vtiger_users vtiger_table 
   *	$val  -- column value 
   */
 function getUserEmailId($name,$val)
@@ -74,9 +74,9 @@
 	$adb->println("Inside the function getUserEmailId. --- ".$name." = '".$val."'");
 	if($val != '')
 	{
-		//$sql = "select email1, email2, yahoo_id from users where ".$name." = '".$val."'";
+		//$sql = "select email1, email2, yahoo_id from vtiger_users where ".$name." = '".$val."'";
 		//done to resolve the PHP5 specific behaviour
-		$sql = "select email1, email2, yahoo_id from users where ".$name." = ".$adb->quote($val);
+		$sql = "select email1, email2, yahoo_id from vtiger_users where ".$name." = ".$adb->quote($val);
 		$res = $adb->query($sql);
 		$email = $adb->query_result($res,0,'email1');
 		if($email == '')
@@ -106,7 +106,7 @@
 	global $adb;
 	$adb->println("Inside the function addSignature");
 
-	$sign = $adb->query_result($adb->query("select signature from users where user_name=".$adb->quote($fromname)),0,"signature");
+	$sign = $adb->query_result($adb->query("select signature from vtiger_users where user_name=".$adb->quote($fromname)),0,"signature");
 	if($sign != '')
 	{
 		$contents .= '<br><br><font color=darkgrey>'.$sign.'</font>';
@@ -127,9 +127,9 @@
   *	$from_name	-- from name which will be displayed in the mail
   *	$to_email 	-- to email address  -- This can be an email in a single string, a comma separated
   *			   list of emails or an array of email addresses
-  *	$attachment	-- whether we want to attach the currently selected file or all files.
+  *	$attachment	-- whether we want to attach the currently selected file or all vtiger_files.
   				[values = current,all] - optional
-  *	$emailid	-- id of the email object which will be used to get the attachments - optional
+  *	$emailid	-- id of the email object which will be used to get the vtiger_attachments - optional
   */
 function setMailerProperties($mail,$subject,$contents,$from_email,$from_name,$to_email,$attachment='',$emailid='')
 {
@@ -147,7 +147,7 @@
 
 	//Handle the from name and email for HelpDesk
 	$mail->From = $from_email;
-	$rs = $adb->query("select first_name,last_name from users where user_name='".$from_name."'");
+	$rs = $adb->query("select first_name,last_name from vtiger_users where user_name='".$from_name."'");
 	if($adb->num_rows($rs) > 0)
 		$from_name = $adb->query_result($rs,0,"first_name")." ".$adb->query_result($rs,0,"last_name");
 
@@ -176,7 +176,7 @@
 		addAttachment(&$mail,$_FILES['filename']['name'],$emailid);
 	}
 
-	//This will add all the files which are related to this record or email
+	//This will add all the vtiger_files which are related to this record or email
 	if($attachment == 'all')
 	{
 		addAllAttachments(&$mail,$emailid);
@@ -197,7 +197,7 @@
 	global $adb;
 	$adb->println("Inside the function setMailServerProperties");
 
-	$res = $adb->query("select * from systems where server_type='email'");
+	$res = $adb->query("select * from vtiger_systems where server_type='email'");
 	$server = $adb->query_result($res,0,'server');
         $username = $adb->query_result($res,0,'server_username');
         $password = $adb->query_result($res,0,'server_password');
@@ -231,17 +231,17 @@
         }
 }
 
-/**     Function to add all the files as attachment with the mail object
+/**     Function to add all the vtiger_files as attachment with the mail object
   *     $mail -- reference of the mail object
-  *     $record -- email id ie., record id which is used to get the all attachments from database
+  *     $record -- email id ie., record id which is used to get the all vtiger_attachments from database
   */
 function addAllAttachments($mail,$record)
 {
 	global $adb, $root_directory;
         $adb->println("Inside the function addAllAttachments");
 
-	//Retrieve the files from database where avoid the file which has been currently selected
-	$sql = "select attachments.* from attachments inner join seattachmentsrel on attachments.attachmentsid = seattachmentsrel.attachmentsid inner join crmentity on crmentity.crmid = attachments.attachmentsid where crmentity.deleted=0 and seattachmentsrel.crmid=".$record;
+	//Retrieve the vtiger_files from database where avoid the file which has been currently selected
+	$sql = "select vtiger_attachments.* from vtiger_attachments inner join vtiger_seattachmentsrel on vtiger_attachments.attachmentsid = vtiger_seattachmentsrel.attachmentsid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_attachments.attachmentsid where vtiger_crmentity.deleted=0 and vtiger_seattachmentsrel.crmid=".$record;
 	$res = $adb->query($sql);
 	$count = $adb->num_rows($res);
 
@@ -316,7 +316,7 @@
 
 /**	Function to get the Parent email id from HelpDesk to send the details about the ticket via email
   *	$returnmodule -- Parent module value. Contact or Account for send email about the ticket details
-  *	$parentid -- id of the parent ie., contact or account
+  *	$parentid -- id of the parent ie., contact or vtiger_account
   */
 function getParentMailId($parentmodule,$parentid)
 {
@@ -325,14 +325,14 @@
 
         if($parentmodule == 'Contacts')
         {
-                $tablename = 'contactdetails';
+                $tablename = 'vtiger_contactdetails';
                 $idname = 'contactid';
 		$first_email = 'email';
 		$second_email = 'yahooid';
         }
         if($parentmodule == 'Accounts')
         {
-                $tablename = 'account';
+                $tablename = 'vtiger_account';
                 $idname = 'accountid';
 		$first_email = 'email1';
 		$second_email = 'email2';
@@ -451,7 +451,7 @@
 			}
 			elseif($status_str[1] == '0')
 			{
-				$adb->println("first elseif part - status will be 0 which is the case of assigned to users's email is empty.");
+				$adb->println("first elseif part - status will be 0 which is the case of assigned to vtiger_users's email is empty.");
 				$errorstr .= '<br><b><font color=red> Mail could not be sent to the assigned to user. Please check the assigned to user email id...</font></b>';
 				//Added to display the message about the CC && BCC mail sending status
 				if($status_str[0] == 'cc_success')

Modified: vtigercrm/trunk/modules/Emails/mailSelect.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/mailSelect.php (original)
+++ vtigercrm/trunk/modules/Emails/mailSelect.php Mon Jun 12 14:26:25 2006
@@ -24,15 +24,15 @@
 $smarty = new vtigerCRM_Smarty;
 if ($pmodule=='Accounts')
 {
-	$querystr="select fieldid,fieldlabel,columnname,tablename from field where tabid=6 and uitype=13;"; 
+	$querystr="select vtiger_fieldid,fieldlabel,columnname,tablename from vtiger_field where vtiger_tabid=6 and uitype=13;"; 
 }
 elseif ($pmodule=='Contacts')
 {
-	$querystr="select fieldid,fieldlabel,columnname from field where tabid=4 and uitype=13;";
+	$querystr="select vtiger_fieldid,fieldlabel,columnname from vtiger_field where vtiger_tabid=4 and uitype=13;";
 }
 elseif ($pmodule=='Leads')
 {
-	$querystr="select fieldid,fieldlabel,columnname from field where tabid=7 and uitype=13;";
+	$querystr="select vtiger_fieldid,fieldlabel,columnname from vtiger_field where vtiger_tabid=7 and uitype=13;";
 }
 $result=$adb->query($querystr);
 $numrows = $adb->num_rows($result);

Modified: vtigercrm/trunk/modules/Emails/mailbox.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/mailbox.php (original)
+++ vtigercrm/trunk/modules/Emails/mailbox.php Mon Jun 12 14:26:25 2006
@@ -73,7 +73,7 @@
 	      
 	   function handleFile(nr) {
 	   	if (b != "ie") {
- 	      		alert("This feature is currently only available for Microsoft Internet Explorer 5.5+ users\n\nWait for an update!");
+ 	      		alert("This feature is currently only available for Microsoft Internet Explorer 5.5+ vtiger_users\n\nWait for an update!");
 	   	} else {
 	   		check = confirm("Do you want to download the file ?");
 			if (check) {

Modified: vtigercrm/trunk/modules/Emails/mailsend.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/mailsend.php (original)
+++ vtigercrm/trunk/modules/Emails/mailsend.php Mon Jun 12 14:26:25 2006
@@ -35,7 +35,7 @@
 	$grp_obj = new GetGroupUsers();
 	$grp_obj->getAllUsersInGroup(getGrpId($_REQUEST['assigned_group_name']));
 	$users_list = constructList($grp_obj->group_users,'INTEGER');
-	$sql = "select first_name, last_name, email1, email2, yahoo_id from users where id in ".$users_list;
+	$sql = "select first_name, last_name, email1, email2, yahoo_id from vtiger_users where id in ".$users_list;
 	$res = $adb->query($sql);
 	$user_email = '';
 	while ($user_info = $adb->fetch_array($res))
@@ -73,7 +73,7 @@
 {
 	$mail_status = send_mail('Emails',$to_email,$current_user->user_name,'',$_REQUEST['subject'],$_REQUEST['description'],$cc,$bcc,'all',$focus->id);
 	
-	$query = 'update emaildetails set email_flag ="SENT" where emailid='.$focus->id;
+	$query = 'update vtiger_emaildetails set email_flag ="SENT" where emailid='.$focus->id;
 	$adb->query($query);
 	//set the errorheader1 to 1 if the mail has not been sent to the assigned to user
 	if($mail_status != 1)//when mail send fails
@@ -105,8 +105,8 @@
 	$mycrmid=$realid[0];
 	if($realid[1] == -1)
 	{
-		//handle the mail send to users
-		$emailadd = $adb->query_result($adb->query("select email1 from users where id=$mycrmid"),0,'email1');
+		//handle the mail send to vtiger_users
+		$emailadd = $adb->query_result($adb->query("select email1 from vtiger_users where id=$mycrmid"),0,'email1');
 		$pmodule = 'Users';
 		$description = getMergedDescription($focus->column_fields['description'],$mycrmid,$pmodule);
 		$mail_status = send_mail('Emails',$emailadd,$current_user->user_name,'',$focus->column_fields['subject'],$description,'','','all',$focus->id);
@@ -115,12 +115,12 @@
 	}
 	else
 	{
-		//Send mail to account or lead or contact based on their ids
+		//Send mail to vtiger_account or lead or contact based on their ids
 		$pmodule=getSalesEntityType($mycrmid);
 		for ($j=1;$j<$nemail;$j++)
 		{
 			$temp=$realid[$j];
-			$myquery='Select columnname from field where fieldid='.$adb->quote($temp);
+			$myquery='Select columnname from vtiger_field where vtiger_fieldid='.$adb->quote($temp);
 			$fresult=$adb->query($myquery);			
 			if ($pmodule=='Contacts')
 			{
@@ -180,7 +180,7 @@
 {
 	global $adb;
 	$date_var = date('Ymd');
-	$query = 'update activity set date_start ='.$date_var.' where activityid = '.$returnid;
+	$query = 'update vtiger_activity set date_start ='.$date_var.' where vtiger_activityid = '.$returnid;
 	$adb->query($query);
 }
 //The following function call is used to parse and form a encoded error message and then pass to result page

Modified: vtigercrm/trunk/modules/Emails/sendmail.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/sendmail.php (original)
+++ vtigercrm/trunk/modules/Emails/sendmail.php Mon Jun 12 14:26:25 2006
@@ -38,12 +38,12 @@
 	
 	$noofrows = $adb->num_rows($result);
 
-	$dbQuery = 'select attachments.*, activity.subject, crmentity.description  from activity inner join crmentity on crmentity.crmid = activity.activityid left join seattachmentsrel on seattachmentsrel.crmid = activity.activityid left join attachments on seattachmentsrel.attachmentsid = attachments.attachmentsid where crmentity.crmid = '.$adb->quote($_REQUEST['return_id']);
+	$dbQuery = 'select vtiger_attachments.*, vtiger_activity.subject, vtiger_crmentity.description  from vtiger_activity inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_activity.activityid left join vtiger_seattachmentsrel on vtiger_seattachmentsrel.crmid = vtiger_activity.activityid left join vtiger_attachments on vtiger_seattachmentsrel.attachmentsid = vtiger_attachments.attachmentsid where vtiger_crmentity.crmid = '.$adb->quote($_REQUEST['return_id']);
 
         $result1 = $adb->query($dbQuery) or die("Couldn't get file list");
 	$temparray = $adb->fetch_array($result1);
 
-	$notequery = 'select  attachments.*, notes.notesid, notes.filename,notes.notecontent  from notes inner join senotesrel on senotesrel.notesid= notes.notesid inner join crmentity on crmentity.crmid= senotesrel.crmid left join seattachmentsrel  on seattachmentsrel.crmid =notes.notesid left join attachments on seattachmentsrel.attachmentsid = attachments.attachmentsid where crmentity.crmid='.$adb->quote($_REQUEST['return_id']);
+	$notequery = 'select  vtiger_attachments.*, vtiger_notes.notesid, vtiger_notes.filename,vtiger_notes.notecontent  from vtiger_notes inner join vtiger_senotesrel on vtiger_senotesrel.notesid= vtiger_notes.notesid inner join vtiger_crmentity on vtiger_crmentity.crmid= vtiger_senotesrel.crmid left join vtiger_seattachmentsrel  on vtiger_seattachmentsrel.crmid =vtiger_notes.notesid left join vtiger_attachments on vtiger_seattachmentsrel.attachmentsid = vtiger_attachments.attachmentsid where vtiger_crmentity.crmid='.$adb->quote($_REQUEST['return_id']);
 	$result2 = $adb->query($notequery) or die("Couldn't get file list");
 
 	$mail = new PHPMailer();
@@ -52,7 +52,7 @@
 
 	$DESCRIPTION = $adb->query_result($result1,0,"description");
 	$DESCRIPTION .= '<br><br>';
-	$DESCRIPTION .= '<font color=darkgrey>'.nl2br($adb->query_result($adb->query("select * from users where user_name=".$adb->quote($from)),0,"signature")).'</font>';
+	$DESCRIPTION .= '<font color=darkgrey>'.nl2br($adb->query_result($adb->query("select * from vtiger_users where user_name=".$adb->quote($from)),0,"signature")).'</font>';
 
         $mail->Body    = nl2br($DESCRIPTION);
 	$initialfrom = $from;
@@ -60,7 +60,7 @@
 
 	if($mail_server=='')
 	{
-	        $mailserverresult = $adb->query("select * from systems where server_type = 'email'");
+	        $mailserverresult = $adb->query("select * from vtiger_systems where server_type = 'email'");
         	$mail_server = $adb->query_result($mailserverresult,0,'server');
 		$mail_server_username = $adb->query_result($mailserverresult,0,'server_username');
                 $mail_server_password = $adb->query_result($mailserverresult,0,'server_password');
@@ -73,9 +73,9 @@
 	$mail->SMTPAuth = $smtp_auth;
 	$mail->Username = $mail_server_username;
 	$mail->Password = $mail_server_password;
-	//$mail->From = $adb->query_result($adb->query("select * from users where user_name='".$from."'"),0,"email1");
-
-	$mail->From = $adb->query_result($adb->query("select * from users where user_name=".$adb->quote($from)),0,"email1");
+	//$mail->From = $adb->query_result($adb->query("select * from vtiger_users where user_name='".$from."'"),0,"email1");
+
+	$mail->From = $adb->query_result($adb->query("select * from vtiger_users where user_name=".$adb->quote($from)),0,"email1");
 	$mail->FromName = $initialfrom;
 	$mail->AddReplyTo($from);
 	$mail->WordWrap = 50;
@@ -93,7 +93,7 @@
 		if(!@fwrite($handle,base64_decode($fileContent),$filesize)){}
 		if(!@fclose($handle)){}
 
-		$mail->AddAttachment($root_directory."/test/upload/".$filename);//temparray['filename']) // add attachments
+		$mail->AddAttachment($root_directory."/test/upload/".$filename);//temparray['filename']) // add vtiger_attachments
 		$log->info("File '".$filename."' is attached with the mail.");
 	}
 
@@ -108,7 +108,7 @@
 		if(!@fwrite($handle,base64_decode($fileContent),$filesize)){}
 		if(!@fclose($handle)){}
 
-		$mail->AddAttachment($root_directory."/test/upload/".$filename);//temparray['filename']) // add attachments
+		$mail->AddAttachment($root_directory."/test/upload/".$filename);//temparray['filename']) // add vtiger_attachments
 		$log->info("File '".$filename."' is attached with the mail.");
 	}
 

Modified: vtigercrm/trunk/modules/Emails/updateRelations.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/updateRelations.php (original)
+++ vtigercrm/trunk/modules/Emails/updateRelations.php Mon Jun 12 14:26:25 2006
@@ -24,7 +24,7 @@
 		if($id != '')
 		{
 			$record = $_REQUEST["parentid"];
-			$sql = "insert into seactivityrel values (". $adb->quote($id).",".$adb->quote($_REQUEST["parentid"]) .")";
+			$sql = "insert into vtiger_seactivityrel values (". $adb->quote($id).",".$adb->quote($_REQUEST["parentid"]) .")";
 			$adb->query($sql);
 		}
 	}
@@ -33,8 +33,8 @@
 elseif (isset($_REQUEST['entityid']) && $_REQUEST['entityid'] != '')
 {
 	$record = $_REQUEST["parid"];
-	//$sql = "insert into seactivityrel values (". $_REQUEST["entityid"] .",".$_REQUEST["parid"] .")";
-	$sql = "insert into seactivityrel values (". $adb->quote($_REQUEST["entityid"]).",".$adb->quote($_REQUEST["parid"]) .")";
+	//$sql = "insert into vtiger_seactivityrel values (". $_REQUEST["entityid"] .",".$_REQUEST["parid"] .")";
+	$sql = "insert into vtiger_seactivityrel values (". $adb->quote($_REQUEST["entityid"]).",".$adb->quote($_REQUEST["parid"]) .")";
 	$adb->query($sql);
 	header("Location: index.php?action=CallRelatedList&module=Emails&record=".$record);
 }
@@ -44,8 +44,8 @@
 if(isset($_REQUEST['user_id']) && $_REQUEST['user_id'] != '')
 {
 	$record = $_REQUEST['record'];
-	//$sql = "insert into salesmanactivityrel values (". $_REQUEST["user_id"] .",".$_REQUEST["record"] .")";
-	$sql = "insert into salesmanactivityrel values (".$adb->quote($_REQUEST["user_id"]).",".$adb->quote($_REQUEST["record"]).")";
+	//$sql = "insert into vtiger_salesmanactivityrel values (". $_REQUEST["user_id"] .",".$_REQUEST["record"] .")";
+	$sql = "insert into vtiger_salesmanactivityrel values (".$adb->quote($_REQUEST["user_id"]).",".$adb->quote($_REQUEST["record"]).")";
 	$adb->query($sql);
 	header("Location: index.php?action=CallRelatedList&module=Emails&record=".$record);
 }

Modified: vtigercrm/trunk/modules/Emails/webmailsend.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/webmailsend.php (original)
+++ vtigercrm/trunk/modules/Emails/webmailsend.php Mon Jun 12 14:26:25 2006
@@ -12,7 +12,7 @@
 
 $mail_status = send_mail('Emails',$_REQUEST["parent_name"],$current_user->user_name,'',$_REQUEST['subject'],$_REQUEST['description'],$_REQUEST["ccmail"],$_REQUEST["bccmail"],'all',$focus->id);
 	
-$query = 'update emaildetails set email_flag ="SENT" where emailid='.$focus->id;
+$query = 'update vtiger_emaildetails set email_flag ="SENT" where emailid='.$focus->id;
 $adb->query($query);
 
 //set the errorheader1 to 1 if the mail has not been sent to the assigned to user

Modified: vtigercrm/trunk/modules/Faq/Faq.php
==============================================================================
--- vtigercrm/trunk/modules/Faq/Faq.php (original)
+++ vtigercrm/trunk/modules/Faq/Faq.php Mon Jun 12 14:26:25 2006
@@ -28,25 +28,25 @@
 require_once('data/CRMEntity.php');
 require_once('include/utils/utils.php');
 
-// Faq is used to store faq information.
+// Faq is used to store vtiger_faq information.
 class Faq extends CRMEntity {
 	var $log;
 	var $db;
 
-	// Stored fields
+	// Stored vtiger_fields
 	var $id;
 	var $mode;
 	
-	var $tab_name = Array('crmentity','faq','faqcomments');
-	var $tab_name_index = Array('crmentity'=>'crmid','faq'=>'id','faqcomments'=>'faqid');
+	var $tab_name = Array('vtiger_crmentity','vtiger_faq','vtiger_faqcomments');
+	var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_faq'=>'id','vtiger_faqcomments'=>'faqid');
 				
-	var $entity_table = "crmentity";
+	var $entity_table = "vtiger_crmentity";
 	
 	var $column_fields = Array();
 		
 	var $sortby_fields = Array('question','category','id');		
 
-	// This is the list of fields that are in the lists.
+	// This is the list of vtiger_fields that are in the lists.
 	var $list_fields = Array(
 				'FAQ Id'=>Array('faq'=>'id'),
 				'Question'=>Array('faq'=>'question'),
@@ -100,7 +100,7 @@
 		global $log;
 		$log->debug("Entering getFAQComments(".$faqid.") method ...");
 		global $mod_strings;
-		$sql = "select * from faqcomments where faqid=".$faqid;
+		$sql = "select * from vtiger_faqcomments where faqid=".$faqid;
 		$result = $this->db->query($sql);
 		$noofrows = $this->db->num_rows($result);
 

Modified: vtigercrm/trunk/modules/Faq/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Faq/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Faq/language/en_us.lang.php Mon Jun 12 14:26:25 2006
@@ -78,10 +78,10 @@
 'NTC_COPY_SHIPPING_ADDRESS'=>'Copy shipping address to billing address',
 'NTC_REMOVE_MEMBER_ORG_CONFIRMATION'=>'Are you sure you want to remove this record as a member organization?',
 'LBL_DUPLICATE'=>'Potential Duplicate Faq',
-'MSG_DUPLICATE' => 'Creating this account may potentialy create a duplicate account. You may either select an account from the list below or you may click on Create New Faq to continue creating a new account with the previously entered data.',
+'MSG_DUPLICATE' => 'Creating this vtiger_account may vtiger_potentialy create a duplicate vtiger_account. You may either select an vtiger_account from the list below or you may click on Create New Faq to continue creating a new vtiger_account with the previously entered data.',
 
 'LBL_INVITEE'=>'Contacts',
-'ERR_DELETE_RECORD'=>"A record number must be specified to delete the account.",
+'ERR_DELETE_RECORD'=>"A record number must be specified to delete the vtiger_account.",
 
 'LBL_SELECT_ACCOUNT'=>'Select Faq',
 'LBL_GENERAL_INFORMATION'=>'General Information',
@@ -110,7 +110,7 @@
 'Created Time'=>'Created Time',
 'Modified Time'=>'Modified Time',
 
-//Added fields after 4.2 alpha
+//Added vtiger_fields after 4.2 alpha
 'LBL_TICKETS'=>'Tickets',
 'LBL_FAQ'=>'FAQ',
 'Product Name'=>'Product Name',

Modified: vtigercrm/trunk/modules/HelpDesk/Convert.php
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/Convert.php (original)
+++ vtigercrm/trunk/modules/HelpDesk/Convert.php Mon Jun 12 14:26:25 2006
@@ -71,7 +71,7 @@
 $change='';
 if($_REQUEST['change_owner'])
 {
-	$change .= '<input type="hidden" name="change_owner" value="true"/><td width="20%" valign="top" class="dataLabel">'.$mod_strings['LBL_ASSIGNED_TO'].'<select tabindex="5" name="assigned_user_id" {ASSIGNED_USER_OPTIONS}</select> </td>';
+	$change .= '<input type="hidden" name="change_owner" value="true"/><td width="20%" valign="top" class="dataLabel">'.$mod_strings['LBL_ASSIGNED_TO'].'<select vtiger_tabindex="5" name="assigned_user_id" {ASSIGNED_USER_OPTIONS}</select> </td>';
 	$xtpl->assign("ASSIGNED_USER_OPTIONS",getComboValues("user_name","users","user_name","1",'--None--'));
 }
 if($_REQUEST['change_status'])

Modified: vtigercrm/trunk/modules/HelpDesk/ConvertAsFAQ.php
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/ConvertAsFAQ.php (original)
+++ vtigercrm/trunk/modules/HelpDesk/ConvertAsFAQ.php Mon Jun 12 14:26:25 2006
@@ -13,7 +13,7 @@
 
 $focus = new FAQ();
 
-//Map the fields like ticket column => faq column where ticket column is the troubletikcets field name & faq - column_fields
+//Map the vtiger_fields like ticket column => vtiger_faq column where ticket column is the troubletikcets vtiger_field name & vtiger_faq - column_fields
 $ticket_faq_mapping_fields = Array(
 			'title'=>'question',
 			'product_id'=>'product_id',
@@ -22,7 +22,7 @@
 			//'ticketcategories'=>'faqcategory'
 		   );
 
-$sql = "select ticketid, title, product_id, description, solution,status, category from troubletickets where ticketid=".$_REQUEST['record'];
+$sql = "select ticketid, title, product_id, description, solution,status, category from vtiger_troubletickets where ticketid=".$_REQUEST['record'];
 $res = $adb->query($sql);
 
 //set all the ticket values to FAQ
@@ -45,8 +45,8 @@
 		$answer .= '\r\n\r\nSOLUTION:\r\n'.$solution;
 	}
 
-	//Retrive the ticket comments from the ticketcomments table and added into the faq answer
-	$sql = "select ticketid, comments, createdtime from ticketcomments where ticketid=".$_REQUEST['record'];
+	//Retrive the ticket comments from the vtiger_ticketcomments vtiger_table and added into the vtiger_faq answer
+	$sql = "select ticketid, comments, createdtime from vtiger_ticketcomments where ticketid=".$_REQUEST['record'];
 	$res = $adb->query($sql);
 	$noofrows = $adb->num_rows($res);
 	$answer .= '\r\n\r\nCOMMENTS:';
@@ -59,7 +59,7 @@
 		}
 	}
 
-	$sql1 = "update faq set answer='".$answer."' where id=".$focus->id;
+	$sql1 = "update vtiger_faq set answer='".$answer."' where id=".$focus->id;
 	$adb->query($sql1);
 }
 

Modified: vtigercrm/trunk/modules/HelpDesk/ConvertToEntities.php
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/ConvertToEntities.php (original)
+++ vtigercrm/trunk/modules/HelpDesk/ConvertToEntities.php Mon Jun 12 14:26:25 2006
@@ -20,11 +20,11 @@
 $close_date = $_REQUEST["closedate"];
 $current_user_id = $_REQUEST["current_user_id"];
 
-//$id=$adb->query_result($adb->query('select * from users where user_name="'.$_REQUEST['assigned_user_id'].'"'),0,"id");
+//$id=$adb->query_result($adb->query('select * from vtiger_users where user_name="'.$_REQUEST['assigned_user_id'].'"'),0,"id");
 
 $idlist=split(';',$_REQUEST['idlist']);
 
-$query='select * from troubletickets';
+$query='select * from vtiger_troubletickets';
 $rs=$adb->query($query);
 for($i=0;$i<count($idlist);$i++)
 {
@@ -36,11 +36,11 @@
 	}
 	if(isset($_REQUEST['change_owner']))
 	{
-		$resultset=$adb->query('select * from users where user_name="'.$_REQUEST['assigned_user_id'].'"');
+		$resultset=$adb->query('select * from vtiger_users where user_name="'.$_REQUEST['assigned_user_id'].'"');
 		$changevalue=$adb->query_result($resultset,0,"id");
 		$changekey='assigned_user_id';
 	}
-	$sql="update troubletickets set ".$changekey." = '".$changevalue."' where id = '".$id."'";
+	$sql="update vtiger_troubletickets set ".$changekey." = '".$changevalue."' where id = '".$id."'";
 	$adb->query($sql);
 }
 header("Location: index.php?action=index&module=HelpDesk");

Modified: vtigercrm/trunk/modules/HelpDesk/Forms.php
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/Forms.php (original)
+++ vtigercrm/trunk/modules/HelpDesk/Forms.php Mon Jun 12 14:26:25 2006
@@ -26,7 +26,7 @@
 
 
 /**
- * Create HTML form to enter a new record with the minimum necessary fields.
+ * Create HTML form to enter a new record with the minimum necessary vtiger_fields.
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
  * All Rights Reserved.
  * Contributor(s): ______________________________________..
@@ -59,7 +59,7 @@
 	$qcreate_form = get_left_form_header($mod_strings['LBL_NEW_FORM_TITLE']);
 
 
-	$qcreate_get_field="select * from field where tabid=13 and quickcreate=0 order by quickcreatesequence";
+	$qcreate_get_field="select * from vtiger_field where vtiger_tabid=13 and quickcreate=0 order by quickcreatesequence";
 	$qcreate_get_result=$adb->query($qcreate_get_field);
 	$qcreate_get_noofrows=$adb->num_rows($qcreate_get_result);
 
@@ -141,9 +141,9 @@
 	$qcreate_form.='</form>';
 	$qcreate_form.='<script type="text/javascript">
 
-				var fieldname = new Array('.$fieldName.')
-				var fieldlabel = new Array('.$fieldLabel.')
-				var fielddatatype = new Array('.$fldDataType.')
+				var vtiger_fieldname = new Array('.$fieldName.')
+				var vtiger_fieldlabel = new Array('.$fieldLabel.')
+				var vtiger_fielddatatype = new Array('.$fldDataType.')
 
 			</script>';
 

Modified: vtigercrm/trunk/modules/HelpDesk/HelpDesk.php
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/HelpDesk.php (original)
+++ vtigercrm/trunk/modules/HelpDesk/HelpDesk.php Mon Jun 12 14:26:25 2006
@@ -25,12 +25,12 @@
 	var $db;
 
 
-	// Stored fields
+	// Stored vtiger_fields
 	var $id;
 	var $mode;
 
-	var $tab_name = Array('crmentity','troubletickets','seticketsrel','ticketcf','ticketcomments','attachments');
-	var $tab_name_index = Array('crmentity'=>'crmid','troubletickets'=>'ticketid','seticketsrel'=>'ticketid','ticketcf'=>'ticketid','ticketcomments'=>'ticketid','attachments'=>'attachmentsid');
+	var $tab_name = Array('vtiger_crmentity','vtiger_troubletickets','vtiger_seticketsrel','vtiger_ticketcf','vtiger_ticketcomments','vtiger_attachments');
+	var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_troubletickets'=>'ticketid','vtiger_seticketsrel'=>'ticketid','vtiger_ticketcf'=>'ticketid','vtiger_ticketcomments'=>'ticketid','vtiger_attachments'=>'attachmentsid');
 	var $column_fields = Array();
 
 	var $sortby_fields = Array('title','status','priority','crmid','firstname','smownerid');
@@ -104,7 +104,7 @@
 
 		$returnset = '&return_module=HelpDesk&return_action=DetailView&return_id='.$id;
 
-		$query = "SELECT activity.*, crmentity.crmid, contactdetails.contactid, contactdetails.lastname, contactdetails.firstname, recurringevents.recurringtype, 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 outer join recurringevents on recurringevents.activityid=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')";
+		$query = "SELECT vtiger_activity.*, vtiger_crmentity.crmid, vtiger_contactdetails.contactid, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_recurringevents.recurringtype, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid= vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and (activitytype='Task' or vtiger_activitytype='Call' or vtiger_activitytype='Meeting')";
 		$log->debug("Exiting get_activities method ...");
 		
 		return GetRelatedList('HelpDesk','Activities',$focus,$query,$button,$returnset);
@@ -123,7 +123,7 @@
 		global $log, $adb;
 		$log->debug("Entering into get_ticket_history($ticketid) method ...");
 
-		$query="select title,update_log from troubletickets where ticketid=".$ticketid;
+		$query="select title,update_log from vtiger_troubletickets where ticketid=".$ticketid;
 		$result=$adb->query($query);
 		$update_log = $adb->query_result($result,0,"update_log");
 
@@ -138,7 +138,7 @@
 		return $return_value;
 	}
 
-	/**	Function to form the query to get the list of attachments and notes
+	/**	Function to form the query to get the list of vtiger_attachments and vtiger_notes
 	 *	@param  int $id - ticket id
 	 *	@return void
 	 *	 but this function will call the function renderRelatedAttachments with parameters query and ticket id
@@ -147,31 +147,31 @@
 	{
 		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,
-			crm2.createdtime, notes.notecontent description, users.user_name
-		from notes
-			inner join senotesrel on senotesrel.notesid= notes.notesid
-			inner join crmentity on crmentity.crmid= senotesrel.crmid
-			inner join crmentity crm2 on crm2.crmid=notes.notesid and crm2.deleted=0
-			left join seattachmentsrel  on seattachmentsrel.crmid =notes.notesid
-			left join attachments on seattachmentsrel.attachmentsid = attachments.attachmentsid
-			inner join users on crm2.smcreatorid= users.id
-		where crmentity.crmid=".$id;
+		$query = "select vtiger_notes.title,'Notes      '  ActivityType, vtiger_notes.filename,
+		vtiger_attachments.type  FileType,crm2.modifiedtime lastmodified,
+		vtiger_seattachmentsrel.attachmentsid vtiger_attachmentsid, vtiger_notes.notesid crmid,
+			crm2.createdtime, vtiger_notes.notecontent description, vtiger_users.user_name
+		from vtiger_notes
+			inner join vtiger_senotesrel on vtiger_senotesrel.notesid= vtiger_notes.notesid
+			inner join vtiger_crmentity on vtiger_crmentity.crmid= vtiger_senotesrel.crmid
+			inner join vtiger_crmentity crm2 on crm2.crmid=vtiger_notes.notesid and crm2.deleted=0
+			left join vtiger_seattachmentsrel  on vtiger_seattachmentsrel.crmid =vtiger_notes.notesid
+			left join vtiger_attachments on vtiger_seattachmentsrel.attachmentsid = vtiger_attachments.attachmentsid
+			inner join vtiger_users on crm2.smcreatorid= vtiger_users.id
+		where vtiger_crmentity.crmid=".$id;
 
 		$query .= ' union all ';
 
-		$query .= "select attachments.description title ,'Attachments'  ActivityType,
-			attachments.name filename, attachments.type FileType,crm2.modifiedtime lastmodified,
-			attachments.attachmentsid attachmentsid, seattachmentsrel.attachmentsid crmid,
-			crm2.createdtime, attachments.description, users.user_name
-		from attachments
-			inner join seattachmentsrel on seattachmentsrel.attachmentsid= attachments.attachmentsid
-			inner join crmentity on crmentity.crmid= seattachmentsrel.crmid
-			inner join crmentity crm2 on crm2.crmid=attachments.attachmentsid
-			left join users on crm2.smcreatorid= users.id
-		where crmentity.crmid=".$id;	
+		$query .= "select vtiger_attachments.description title ,'Attachments'  ActivityType,
+		vtiger_attachments.name filename, vtiger_attachments.type FileType,crm2.modifiedtime lastmodified,
+		vtiger_attachments.attachmentsid vtiger_attachmentsid, vtiger_seattachmentsrel.attachmentsid crmid,
+			crm2.createdtime, vtiger_attachments.description, vtiger_users.user_name
+		from vtiger_attachments
+			inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid= vtiger_attachments.attachmentsid
+			inner join vtiger_crmentity on vtiger_crmentity.crmid= vtiger_seattachmentsrel.crmid
+			inner join vtiger_crmentity crm2 on crm2.crmid=vtiger_attachments.attachmentsid
+			left join vtiger_users on crm2.smcreatorid= vtiger_users.id
+		where vtiger_crmentity.crmid=".$id;	
 		$log->debug("Exiting get_attachments method ...");
 		return getAttachmentsAndNotes('HelpDesk',$query,$id);
 	}
@@ -189,7 +189,7 @@
 	{
 		global $log;
 		$log->debug("Entering get_ticket_comments_list(".$ticketid.") method ...");
-		 $sql = "select * from ticketcomments where ticketid=".$ticketid." order by createdtime DESC";
+		 $sql = "select * from vtiger_ticketcomments where ticketid=".$ticketid." order by createdtime DESC";
 		 $result = $this->db->query($sql);
 		 $noofrows = $this->db->num_rows($result);
 		 for($i=0;$i<$noofrows;$i++)
@@ -200,7 +200,7 @@
 				 $name = getUserName($ownerid);
 			 elseif($ownertype == 'customer')
 			 {
-				 $sql1 = 'select * from portalinfo where id='.$ownerid;
+				 $sql1 = 'select * from vtiger_portalinfo where id='.$ownerid;
 				 $name = $this->db->query_result($this->db->query($sql1),0,'user_name');
 			 }
 
@@ -224,7 +224,7 @@
 
 		$this->db->println("where ==> ".$where);
 
-		$query = "select crmentity.crmid, troubletickets.*, crmentity.smownerid, crmentity.createdtime, crmentity.modifiedtime, contactdetails.firstname, contactdetails.lastname, products.productid, products.productname, 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 products on products.productid = troubletickets.product_id left join users on crmentity.smownerid=users.id  where crmentity.deleted=0 and contactdetails.email='".$user_name."' and troubletickets.parent_id = '".$id."'";
+		$query = "select vtiger_crmentity.crmid, vtiger_troubletickets.*, vtiger_crmentity.smownerid, vtiger_crmentity.createdtime, vtiger_crmentity.modifiedtime, vtiger_contactdetails.firstname, vtiger_contactdetails.lastname, vtiger_products.productid, vtiger_products.productname, vtiger_ticketcf.* from vtiger_troubletickets inner join vtiger_ticketcf on vtiger_ticketcf.ticketid = vtiger_troubletickets.ticketid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_troubletickets.ticketid left join vtiger_contactdetails on vtiger_troubletickets.parent_id=vtiger_contactdetails.contactid left join vtiger_products on vtiger_products.productid = vtiger_troubletickets.product_id left join vtiger_users on vtiger_crmentity.smownerid=vtiger_users.id  where vtiger_crmentity.deleted=0 and vtiger_contactdetails.email='".$user_name."' and vtiger_troubletickets.parent_id = '".$id."'";
 
 		if(trim($where) != '')
 		{
@@ -260,10 +260,10 @@
 				$where_conditions = " and ( ".$where_conditions." ) ";
 
 			$query .= $where_conditions;
-			$this->db->println("where condition for customer portal tickets search : ".$where_conditions);
+			$this->db->println("where condition for customer vtiger_portal tickets search : ".$where_conditions);
 		}
 
-		$query .= " order by crmentity.crmid desc";
+		$query .= " order by vtiger_crmentity.crmid desc";
 		$log->debug("Exiting get_user_tickets_list method ...");
 		return $this->process_list_query($query);
 	}
@@ -317,14 +317,14 @@
 	        return $response;
 	}
 
-	/**	Function to get the HelpDesk field labels in caps letters without space
+	/**	Function to get the HelpDesk vtiger_field labels in caps letters without space
 	 *	return array $mergeflds - array(	key => val	)    where   key=0,1,2..n & val = ASSIGNEDTO,RELATEDTO, .,etc
 	**/
 	function getColumnNames_Hd()
 	{
 		global $log;
 		$log->debug("Entering getColumnNames_Hd() method ...");
-		$sql1 = "select fieldlabel from field where tabid=13 and block <> 6 ";
+		$sql1 = "select vtiger_fieldlabel from vtiger_field where vtiger_tabid=13 and block <> 6 ";
 		$result = $this->db->query($sql1);
 		$numRows = $this->db->num_rows($result);
 		for($i=0; $i < $numRows;$i++)
@@ -348,7 +348,7 @@
 		$log->debug("Entering getCommentInformation(".$ticketid.") method ...");
 		global $adb;
 		global $mod_strings;
-		$sql = "select * from ticketcomments where ticketid=".$ticketid;
+		$sql = "select * from vtiger_ticketcomments where ticketid=".$ticketid;
 		$result = $adb->query($sql);
 		$noofrows = $adb->num_rows($result);
 
@@ -389,7 +389,7 @@
 		return $list;
 	}
 
-	/**     Function to get the Customer Name who has made comment to the ticket from the portal
+	/**     Function to get the Customer Name who has made comment to the ticket from the vtiger_portal
 	 *      @param  int    $id   - Ticket id
 	 *      @return string $customername - The contact name
 	**/
@@ -398,7 +398,7 @@
 		global $log;
 		$log->debug("Entering getCustomerName(".$id.") method ...");
         	global $adb;
-	        $sql = "select * from portalinfo inner join troubletickets on troubletickets.parent_id = portalinfo.id where troubletickets.ticketid=".$id;
+	        $sql = "select * from vtiger_portalinfo inner join vtiger_troubletickets on vtiger_troubletickets.parent_id = vtiger_portalinfo.id where vtiger_troubletickets.ticketid=".$id;
         	$result = $adb->query($sql);
 	        $customername = $adb->query_result($result,0,'user_name');
 		$log->debug("Exiting getCustomerName method ...");

Modified: vtigercrm/trunk/modules/HelpDesk/ListTickets.php
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/ListTickets.php (original)
+++ vtigercrm/trunk/modules/HelpDesk/ListTickets.php Mon Jun 12 14:26:25 2006
@@ -24,18 +24,18 @@
 	$theme_path="themes/".$theme."/";
 	$image_path=$theme_path."images/";
 
-	$search_query="select troubletickets.ticketid, parent_id, priority, troubletickets.status, category, troubletickets.title, troubletickets.description, update_log, version_id,
-	crmentity.createdtime, crmentity.modifiedtime, 
-	contactdetails.firstname, contactdetails.lastname, 
-	account.accountid, account.accountname, 
-	users.user_name from 
-	troubletickets 
-	inner join crmentity on crmentity.crmid = troubletickets.ticketid 
-	inner join users on users.id = crmentity.smownerid 
-	left join contactdetails on troubletickets.parent_id = contactdetails.contactid 
-	left join account on account.accountid = troubletickets.parent_id 
-	left join seticketsrel on seticketsrel.ticketid = troubletickets.ticketid 
-	where crmentity.smownerid = ".$current_user->id." and crmentity.deleted = 0 and troubletickets.status <> 'Closed'  ORDER BY createdtime DESC";
+	$search_query="select vtiger_troubletickets.ticketid, parent_id, priority, vtiger_troubletickets.status, category, vtiger_troubletickets.title, vtiger_troubletickets.description, update_log, version_id,
+vtiger_crmentity.createdtime, vtiger_crmentity.modifiedtime, 
+vtiger_contactdetails.firstname, vtiger_contactdetails.lastname, 
+vtiger_account.accountid, vtiger_account.accountname, 
+vtiger_users.user_name from 
+	vtiger_troubletickets 
+	inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_troubletickets.ticketid 
+	inner join vtiger_users on vtiger_users.id = vtiger_crmentity.smownerid 
+	left join vtiger_contactdetails on vtiger_troubletickets.parent_id = vtiger_contactdetails.contactid 
+	left join vtiger_account on vtiger_account.accountid = vtiger_troubletickets.parent_id 
+	left join vtiger_seticketsrel on vtiger_seticketsrel.ticketid = vtiger_troubletickets.ticketid 
+	where vtiger_crmentity.smownerid = ".$current_user->id." and vtiger_crmentity.deleted = 0 and vtiger_troubletickets.status <> 'Closed'  ORDER BY createdtime DESC";
 
 	$resultcount = $adb->num_rows($adb->query($search_query));
 	if($resultcount > 0)
@@ -96,19 +96,19 @@
 	$log->debug("Entering getParentLink(".$parent_id.") method ...");
 	global $adb;
 
-	$sql = "select setype from crmentity where crmid=".$parent_id;
+	$sql = "select setype from vtiger_crmentity where crmid=".$parent_id;
 	$parent_module = $adb->query_result($adb->query($sql),0,'setype');
 
 	if($parent_module == 'Contacts')
 	{
-		$sql = "select firstname,lastname from contactdetails where contactid=".$parent_id;
+		$sql = "select firstname,lastname from vtiger_contactdetails where contactid=".$parent_id;
 		$parentname = $adb->query_result($adb->query($sql),0,'firstname');
 		$parentname .= ' '.$adb->query_result($adb->query($sql),0,'lastname');
 	        $parent_name = '<a href="index.php?action=DetailView&module='.$parent_module.'&record='.$parent_id.'">'.$parentname.'</a>';
 	}
 	if($parent_module == 'Accounts')
 	{
-		$sql = "select accountname from account where accountid=".$parent_id;
+		$sql = "select vtiger_accountname from vtiger_account where vtiger_accountid=".$parent_id;
 		$parentname = $adb->query_result($adb->query($sql),0,'accountname');
 	        $parent_name = '<a href="index.php?action=DetailView&module='.$parent_module.'&record='.$parent_id.'">'.$parentname.'</a>';
 	}

Modified: vtigercrm/trunk/modules/HelpDesk/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/ListView.php (original)
+++ vtigercrm/trunk/modules/HelpDesk/ListView.php Mon Jun 12 14:26:25 2006
@@ -134,7 +134,7 @@
 {
 	if($order_by == 'smownerid')
 	{
-		$list_query .= ' ORDER BY users.user_name '.$sorder;
+		$list_query .= ' ORDER BY vtiger_users.user_name '.$sorder;
 	}
 	else
 	{
@@ -146,7 +146,7 @@
 }
 else
 {
-	$list_query .= ' order by troubletickets.ticketid DESC';
+	$list_query .= ' order by vtiger_troubletickets.ticketid DESC';
 }
 
 

Modified: vtigercrm/trunk/modules/HelpDesk/Merge.php
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/Merge.php (original)
+++ vtigercrm/trunk/modules/HelpDesk/Merge.php Mon Jun 12 14:26:25 2006
@@ -35,7 +35,7 @@
 }
 //get the particular file from db and store it in the local hard disk.
 //store the path to the location where the file is stored and pass it  as parameter to the method 
-$sql = "select filename,data,filesize from wordtemplates where templateid=".$templateid;
+$sql = "select filename,data,filesize from vtiger_wordtemplates where templateid=".$templateid;
 
 $result = $adb->query($sql);
 $temparray = $adb->fetch_array($result);
@@ -71,7 +71,7 @@
 }
 
 //<<<<<<<<<<<<<<<<header for csv and select columns for query>>>>>>>>>>>>>>>>>>>>>>>>
-$query1="select tab.name,field.tablename,field.columnname,field.fieldlabel from field inner join tab on tab.tabid = field.tabid where field.tabid in (13,4,6) and field.uitype <> 61 and (field.tablename <>'CustomerDetails' and block <> 6 and block <> 75) and block <> 30 order by field.tablename";
+$query1="select vtiger_tab.name,vtiger_field.tablename,vtiger_field.columnname,vtiger_field.fieldlabel from vtiger_field inner join vtiger_tab on vtiger_tab.tabid = vtiger_field.tabid where vtiger_field.tabid in (13,4,6) and vtiger_field.uitype <> 61 and (vtiger_field.tablename <>'CustomerDetails' and block <> 6 and block <> 75) and block <> 30 order by vtiger_field.tablename";
 
 $result = $adb->query($query1);
 $y=$adb->num_rows($result);
@@ -86,7 +86,7 @@
 
 	if($columnname == "parent_id")
 	{
-		$column_name = "case crmentityRelHelpDesk.setype when 'Accounts' then accountRelHelpDesk.accountname when 'Contacts' then concat(contactdetailsRelHelpDesk.firstname,' ',contactdetailsRelHelpDesk.lastname) End";
+		$column_name = "case vtiger_crmentityRelHelpDesk.setype when 'Accounts' then vtiger_accountRelHelpDesk.accountname when 'Contacts' then concat(contactdetailsRelHelpDesk.firstname,' ',contactdetailsRelHelpDesk.lastname) End";
 	}
 	if($columnname == "product_id")
 	{
@@ -119,7 +119,7 @@
 		}
 		if($modulename == "HelpDesk")
 		{
-			$column_name = "concat(users.last_name,' ',users.first_name) as userhelpname,users.first_name,users.last_name,users.user_name,users.yahoo_id,users.title,users.phone_work,users.department,users.phone_mobile,users.phone_other,users.phone_fax,users.email1,users.phone_home,users.email2,users.address_street,users.address_city,users.address_state,users.address_postalcode,users.address_country";
+			$column_name = "concat(vtiger_users.last_name,' ',vtiger_users.first_name) as userhelpname,vtiger_users.first_name,vtiger_users.last_name,vtiger_users.user_name,vtiger_users.yahoo_id,vtiger_users.title,vtiger_users.phone_work,vtiger_users.department,vtiger_users.phone_mobile,vtiger_users.phone_other,vtiger_users.phone_fax,vtiger_users.email1,vtiger_users.phone_home,vtiger_users.email2,vtiger_users.address_street,vtiger_users.address_city,vtiger_users.address_state,vtiger_users.address_postalcode,vtiger_users.address_country";
 		}
 	}
 	if($columnname == "parentid")
@@ -162,31 +162,31 @@
 {
 	$selectcolumns = implode($querycolumns,",");
 
-	$query ="select ".$selectcolumns." from troubletickets
-			inner join crmentity on crmentity.crmid=troubletickets.ticketid
-			inner join ticketcf on ticketcf.ticketid = troubletickets.ticketid
-			left join crmentity as crmentityRelHelpDesk on crmentityRelHelpDesk.crmid = troubletickets.parent_id
-			left join account as accountRelHelpDesk on accountRelHelpDesk.accountid=crmentityRelHelpDesk.crmid
-			left join contactdetails as contactdetailsRelHelpDesk on contactdetailsRelHelpDesk.contactid= crmentityRelHelpDesk.crmid
-			left join products as productsRel on productsRel.productid = troubletickets.product_id
-			left join users on crmentity.smownerid=users.id
-			left join account on account.accountid = troubletickets.parent_id               
-			left join crmentity as crmentityAccounts on crmentityAccounts.crmid = account.accountid 
-			left join accountbillads on accountbillads.accountaddressid = account.accountid
-			left join accountshipads on accountshipads.accountaddressid = account.accountid
-			left join accountscf on accountbillads.accountaddressid = accountscf.accountid 
-			left join account as accountAccount on accountAccount.accountid = troubletickets.parent_id
-			left join users as usersAccounts on usersAccounts.id = crmentityAccounts.smownerid
-			left join contactdetails on contactdetails.contactid = troubletickets.parent_id               
-			left join crmentity as crmentityContacts on crmentityContacts.crmid = contactdetails.contactid 
-			left join contactaddress on contactdetails.contactid = contactaddress.contactaddressid 
-			left join contactsubdetails on contactdetails.contactid = contactsubdetails.contactsubscriptionid 
-			left join contactscf on contactdetails.contactid = contactscf.contactid 
-			left join contactdetails as contactdetailsContacts on contactdetailsContacts.contactid = contactdetails.reportsto
-			left join account as accountContacts on accountContacts.accountid = contactdetails.accountid 
-			left join users as usersContacts on usersContacts.id = crmentityContacts.smownerid
-			where crmentity.deleted=0 and ((crmentityContacts.deleted=0 || crmentityContacts.deleted is null)||(crmentityAccounts.deleted=0 || crmentityAccounts.deleted is null)) 
-			and troubletickets.ticketid in (".$mass_merge.")";
+	$query ="select ".$selectcolumns." from vtiger_troubletickets
+			inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_troubletickets.ticketid
+			inner join vtiger_ticketcf on vtiger_ticketcf.ticketid = vtiger_troubletickets.ticketid
+			left join vtiger_crmentity as vtiger_crmentityRelHelpDesk on vtiger_crmentityRelHelpDesk.crmid = vtiger_troubletickets.parent_id
+			left join vtiger_account as vtiger_accountRelHelpDesk on vtiger_accountRelHelpDesk.accountid=crmentityRelHelpDesk.crmid
+			left join vtiger_contactdetails as vtiger_contactdetailsRelHelpDesk on vtiger_contactdetailsRelHelpDesk.contactid= vtiger_crmentityRelHelpDesk.crmid
+			left join vtiger_products as vtiger_productsRel on vtiger_productsRel.productid = vtiger_troubletickets.product_id
+			left join vtiger_users on vtiger_crmentity.smownerid=vtiger_users.id
+			left join vtiger_account on vtiger_account.accountid = vtiger_troubletickets.parent_id               
+			left join vtiger_crmentity as vtiger_crmentityAccounts on vtiger_crmentityAccounts.crmid = vtiger_account.accountid 
+			left join vtiger_accountbillads on vtiger_accountbillads.accountaddressid = vtiger_account.accountid
+			left join vtiger_accountshipads on vtiger_accountshipads.accountaddressid = vtiger_account.accountid
+			left join vtiger_accountscf on vtiger_accountbillads.accountaddressid = vtiger_accountscf.accountid 
+			left join vtiger_account as vtiger_accountAccount on vtiger_accountAccount.accountid = vtiger_troubletickets.parent_id
+			left join vtiger_users as vtiger_usersAccounts on vtiger_usersAccounts.id = vtiger_crmentityAccounts.smownerid
+			left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_troubletickets.parent_id               
+			left join vtiger_crmentity as vtiger_crmentityContacts on vtiger_crmentityContacts.crmid = vtiger_contactdetails.contactid 
+			left join vtiger_contactaddress on vtiger_contactdetails.contactid = vtiger_contactaddress.contactaddressid 
+			left join vtiger_contactsubdetails on vtiger_contactdetails.contactid = vtiger_contactsubdetails.contactsubscriptionid 
+			left join vtiger_contactscf on vtiger_contactdetails.contactid = vtiger_contactscf.contactid 
+			left join vtiger_contactdetails as vtiger_contactdetailsContacts on vtiger_contactdetailsContacts.contactid = vtiger_contactdetails.reportsto
+			left join vtiger_account as vtiger_accountContacts on vtiger_accountContacts.accountid = vtiger_contactdetails.accountid 
+			left join vtiger_users as vtiger_usersContacts on vtiger_usersContacts.id = vtiger_crmentityContacts.smownerid
+			where vtiger_crmentity.deleted=0 and ((crmentityContacts.deleted=0 || vtiger_crmentityContacts.deleted is null)||(crmentityAccounts.deleted=0 || vtiger_crmentityAccounts.deleted is null)) 
+			and vtiger_troubletickets.ticketid in (".$mass_merge.")";
 
 	$result = $adb->query($query);
 
@@ -196,7 +196,7 @@
 		for($x=0; $x<$y; $x++)
 		{
 			$value = $columnValues[$x];
-			//<<<<<<<<<<<<<<<for blank fields>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+			//<<<<<<<<<<<<<<<for blank vtiger_fields>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 			if($value == "0")
 			{
 				$value = "";
@@ -221,7 +221,7 @@
 }
 else
 {
-	die("No fields to do Merge");
+	die("No vtiger_fields to do Merge");
 }	
 
 $handle = fopen($wordtemplatedownloadpath."datasrc.csv","wb");

Modified: vtigercrm/trunk/modules/HelpDesk/Save.php
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/Save.php (original)
+++ vtigercrm/trunk/modules/HelpDesk/Save.php Mon Jun 12 14:26:25 2006
@@ -48,13 +48,13 @@
 
 $emailoptout = 0;
 
-//To get the emailoptout field value and then decide whether send mail about the tickets or not
+//To get the emailoptout vtiger_field value and then decide whether send mail about the tickets or not
 if($focus->column_fields['parent_id'] != '')
 {
 	$parent_module = getSalesEntityType($focus->column_fields['parent_id']);
 	if($parent_module == 'Contacts')
 	{
-		$result = $adb->query("select * from contactdetails where contactid=".$focus->column_fields['parent_id']);
+		$result = $adb->query("select * from vtiger_contactdetails where contactid=".$focus->column_fields['parent_id']);
 		$emailoptout = $adb->query_result($result,0,'emailoptout');
 		$contactname = $adb->query_result($result,0,'firstname').' '.$adb->query_result($result,0,'lastname');
 		$parentname = $contactname;
@@ -62,16 +62,16 @@
 	}
 	if($parent_module == 'Accounts')
 	{
-		$result = $adb->query("select * from account where accountid=".$focus->column_fields['parent_id']);
+		$result = $adb->query("select * from vtiger_account where vtiger_accountid=".$focus->column_fields['parent_id']);
 		$emailoptout = $adb->query_result($result,0,'emailoptout');
 		$parentname = $adb->query_result($result,0,'accountname');
 	}
 }
 
-//Get the status of the portal user. if the customer is active then send the portal link in the mail
+//Get the status of the vtiger_portal user. if the customer is active then send the vtiger_portal link in the mail
 if($contact_mailid != '')
 {
-	$sql = "select * from portalinfo where user_name='".$contact_mailid."'";
+	$sql = "select * from vtiger_portalinfo where user_name='".$contact_mailid."'";
 	$isactive = $adb->query_result($adb->query($sql),0,'isactive');
 }
 if($isactive == 1)
@@ -103,7 +103,7 @@
 
 if($_REQUEST['product_id'] != '' && $focus->id != '' && $_REQUEST['mode'] != 'edit')
 {
-        $sql = 'insert into seticketsrel values('.$_REQUEST['product_id'].' , '.$focus->id.')';
+        $sql = 'insert into vtiger_seticketsrel values('.$_REQUEST['product_id'].' , '.$focus->id.')';
         $adb->query($sql);
 
 	if($_REQUEST['return_module'] == 'Products')
@@ -122,7 +122,7 @@
 {
 	$mail_status_str = "'".$to_email."'=0&&&";
 }
-//added condition to check the emailoptout(this is for contacts and accounts.)
+//added condition to check the emailoptout(this is for contacts and vtiger_accounts.)
 if($emailoptout == 0)
 {
 	//send mail to parent
@@ -159,7 +159,7 @@
 	global $adb;
 
 	$commentlist = '';
-	$sql = "select * from ticketcomments where ticketid=".$ticketid;
+	$sql = "select * from vtiger_ticketcomments where ticketid=".$ticketid;
 	$result = $adb->query($sql);
 	for($i=0;$i<$adb->num_rows($result);$i++)
 	{

Modified: vtigercrm/trunk/modules/HelpDesk/TicketStatisticsUtil.php
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/TicketStatisticsUtil.php (original)
+++ vtigercrm/trunk/modules/HelpDesk/TicketStatisticsUtil.php Mon Jun 12 14:26:25 2006
@@ -19,7 +19,7 @@
 	global $log;
 	$log->debug("Entering getTotalNoofTickets() method ...");
 	global $adb;
-	$query = "select count(*) as totalticketcount from troubletickets inner join crmentity on crmentity.crmid=troubletickets.ticketid where crmentity.deleted=0";
+	$query = "select count(*) as totalticketcount from vtiger_troubletickets inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_troubletickets.ticketid where vtiger_crmentity.deleted=0";
 	$result = $adb->query($query);
 	$totTickets = $adb->query_result($result,0,"totalticketcount");
 	$log->debug("Exiting getTotalNoofTickets method ...");
@@ -34,7 +34,7 @@
 	global $log;
 	$log->debug("Entering getTotalNoofOpenTickets() method ...");
 	global $adb;
-	$query = "select count(*) as totalopenticketcount from troubletickets inner join crmentity on crmentity.crmid=troubletickets.ticketid where crmentity.deleted=0 and troubletickets.status !='Closed'";
+	$query = "select count(*) as totalopenticketcount from vtiger_troubletickets inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_troubletickets.ticketid where vtiger_crmentity.deleted=0 and vtiger_troubletickets.status !='Closed'";
 	$result = $adb->query($query);
 	$totOpenTickets = $adb->query_result($result,0,"totalopenticketcount");
 	$log->debug("Exiting getTotalNoofOpenTickets method ...");
@@ -49,7 +49,7 @@
 	global $log;
 	$log->debug("Entering getTotalNoofClosedTickets() method ...");
 	global $adb;
-	$query = "select count(*) as totalclosedticketcount from troubletickets inner join crmentity on crmentity.crmid=troubletickets.ticketid where crmentity.deleted=0 and troubletickets.status ='Closed'";
+	$query = "select count(*) as totalclosedticketcount from vtiger_troubletickets inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_troubletickets.ticketid where vtiger_crmentity.deleted=0 and vtiger_troubletickets.status ='Closed'";
 	$result = $adb->query($query);
 	$totClosedTickets = $adb->query_result($result,0,"totalclosedticketcount");
 	$log->debug("Exiting getTotalNoofClosedTickets method ...");
@@ -170,7 +170,7 @@
 	
 }
 
-/**     Function to display the statistics based on the Users ie., will display all the users and the no. of tickets per user
+/**     Function to display the statistics based on the Users ie., will display all the vtiger_users and the no. of tickets per user
  *      @param  string $image_path - image path of the bar per theme basis
  *      @param  int $singleUnit - the single bar length value which is calculated as 80/total no. of tickets
  *      @return void.
@@ -218,8 +218,8 @@
 	
 }
 
-/**     Function to retrieve all values from the table which is passed as the parameter
- *      @param  string $tableName - table name in which we want to get the result
+/**     Function to retrieve all values from the vtiger_table which is passed as the parameter
+ *      @param  string $tableName - vtiger_table name in which we want to get the result
  *      @return result $result - the result of the query "select * from $tableName" will be return
 **/
 function getFromDB($tableName)
@@ -235,8 +235,8 @@
 
 /**     Function to get the number of tickets based on the User or Priority or Category which is passed as a parameter
  *      @param  string $mode - the status of the ticket ie., Open or Closed. if Total then all tickets count will be retrieved
- *      @param  string $priority_val - the value based on which we get tickets ie., id of the user or ticketcategories or ticketpriorities
- *      @param  int $critColName - smownerid or category or priority which is the fieldname of the table in which we check $priority_val
+ *      @param  string $priority_val - the value based on which we get tickets ie., id of the user or vtiger_ticketcategories or vtiger_ticketpriorities
+ *      @param  int $critColName - smownerid or category or vtiger_priority which is the vtiger_fieldname of the vtiger_table in which we check $priority_val
  *      @return void.
 **/
 function getTicketCount($mode, $priority_val, $critColName)
@@ -254,16 +254,16 @@
 	global $adb;
 	if($mode == 'Open')
 	{
-		$query = "select count(*) as count from troubletickets inner join crmentity on crmentity.crmid=troubletickets.ticketid where crmentity.deleted=0  and ".$table_name.".".$critColName."='".$priority_val."' and troubletickets.status !='Closed'";
+		$query = "select count(*) as count from vtiger_troubletickets inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_troubletickets.ticketid where vtiger_crmentity.deleted=0  and ".$table_name.".".$critColName."='".$priority_val."' and vtiger_troubletickets.status !='Closed'";
 		
 	}
 	elseif($mode == 'Closed')
 	{
-		$query = "select count(*) as count from troubletickets inner join crmentity on crmentity.crmid=troubletickets.ticketid where crmentity.deleted=0 and ".$table_name.".".$critColName."='".$priority_val."' and troubletickets.status ='Closed'";
+		$query = "select count(*) as count from vtiger_troubletickets inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_troubletickets.ticketid where vtiger_crmentity.deleted=0 and ".$table_name.".".$critColName."='".$priority_val."' and vtiger_troubletickets.status ='Closed'";
 	}
 	elseif($mode == 'Total')
 	{
-		$query = "select count(*) as count from troubletickets inner join crmentity on crmentity.crmid=troubletickets.ticketid where crmentity.deleted=0 and ".$table_name.".".$critColName."='".$priority_val."' and deleted='0'";
+		$query = "select count(*) as count from vtiger_troubletickets inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_troubletickets.ticketid where vtiger_crmentity.deleted=0 and ".$table_name.".".$critColName."='".$priority_val."' and deleted='0'";
 	}
 	$result = $adb->query($query);
 	$nooftickets = $adb->query_result($result,0,"count");

Modified: vtigercrm/trunk/modules/HelpDesk/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/HelpDesk/language/en_us.lang.php Mon Jun 12 14:26:25 2006
@@ -64,12 +64,12 @@
 'LBL_AUTHOR'=>'Author',
 'LBL_QUESTION'=>'Question',
 
-//Added fields for File Attachment and Mail send in Tickets
+//Added vtiger_fields for File Attachment and Mail send in Tickets
 'LBL_ATTACHMENTS'=>'Attachments',
 'LBL_NEW_ATTACHMENT'=>'New Attachment',
 'LBL_SEND_MAIL'=>'Send Mail',
 
-//Added fields for search option  in TicketsList -- 4Beta
+//Added vtiger_fields for search option  in TicketsList -- 4Beta
 'LBL_CREATED_DATE'=>'Created Date',
 'LBL_IS'=>'is',
 'LBL_IS_NOT'=>'is not',
@@ -96,21 +96,21 @@
 'LBL_TICKET_CATEGORY'=>'Category',
 'LBL_TICKET_PRIORITY'=>'Priority',
 
-//Added fields after 4 -- Beta
+//Added vtiger_fields after 4 -- Beta
 'LBL_NEW_TICKET'=>'New Ticket',
 'LBL_TICKET_INFORMATION'=>'Ticket Information',
 
 'LBL_LIST_FORM_TITLE'=>'Tickets List',
 'LBL_SEARCH_FORM_TITLE'=>'Ticket Search',
 
-//Added fields after RC1 - Release
+//Added vtiger_fields after RC1 - Release
 'LBL_CHOOSE_A_VIEW'=>'Choose a View...',
 'LBL_ALL'=>'All',
 'LBL_LOW'=>'Low',
 'LBL_MEDIUM'=>'Medium',
 'LBL_HIGH'=>'High',
 'LBL_CRITICAL'=>'Critical',
-//Added fields for 4GA
+//Added vtiger_fields for 4GA
 'Assigned To'=>'Assigned To',
 'Contact Name'=>'Contact Name',
 'Priority'=>'Priority',
@@ -132,7 +132,7 @@
 'LBL_PRIORITIES'=>'Priorities',
 'LBL_SUPPORTERS'=>'Supporters',
 
-//Added fields after 4_0_1
+//Added vtiger_fields after 4_0_1
 'LBL_TICKET_RESOLUTION'=>'Solution Information',
 'Solution'=>'Solution',
 'Add Comment'=>'Add Comment',

Modified: vtigercrm/trunk/modules/Home/Forms.php
==============================================================================
--- vtigercrm/trunk/modules/Home/Forms.php (original)
+++ vtigercrm/trunk/modules/Home/Forms.php Mon Jun 12 14:26:25 2006
@@ -15,7 +15,7 @@
 /*********************************************************************************
  * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Home/Forms.php,v 1.3 2005/03/04 15:18:47 jack Exp $
  * Description:  Contains a variety of utility functions used to display UI
- * components such as form headers and footers.  Intended to be modified on a per
+ * components such as form vtiger_headers and footers.  Intended to be modified on a per
  * theme basis.
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
  * All Rights Reserved.

Modified: vtigercrm/trunk/modules/Home/LastViewed.php
==============================================================================
--- vtigercrm/trunk/modules/Home/LastViewed.php (original)
+++ vtigercrm/trunk/modules/Home/LastViewed.php Mon Jun 12 14:26:25 2006
@@ -24,7 +24,7 @@
 $theme_path="themes/".$theme."/";
 $image_path=$theme_path."images/";
 
-// Create the head of the table.
+// Create the head of the vtiger_table.
 ?>
 		<table cellpadding="2" cellspacing="0" border="0">
 		<tbody>

Modified: vtigercrm/trunk/modules/Home/UnifiedSearch.php
==============================================================================
--- vtigercrm/trunk/modules/Home/UnifiedSearch.php (original)
+++ vtigercrm/trunk/modules/Home/UnifiedSearch.php Mon Jun 12 14:26:25 2006
@@ -91,11 +91,11 @@
 
 	
 		$listquery = getListQuery($module);
-		//Avoided the modules Faq and PriceBooks. we should remove this if when change the customview function
+		//Avoided the modules Faq and PriceBooks. we should remove this if when change the vtiger_customview function
 		$oCustomView = '';
 		if($module != 'Faq' && $module != 'PriceBooks')
 		{
-			//Added to get the default 'All' customview query
+			//Added to get the default 'All' vtiger_customview query
 			$oCustomView = new CustomView($module);
 			$viewid = $oCustomView->getViewId($module);
 
@@ -163,17 +163,17 @@
 	echo "<br><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<em>".$mod_strings['ERR_ONE_CHAR']."</em>";
 }
 
-/**	Function to get the where condition for a module based on the field table entries
+/**	Function to get the where condition for a module based on the vtiger_field vtiger_table entries
   *	@param  string $listquery  -- ListView query for the module 
   *	@param  string $module     -- module name
   *	@param  string $search_val -- entered search string value
-  *	@return string $where      -- where condition for the module based on field table entries
+  *	@return string $where      -- where condition for the module based on vtiger_field vtiger_table entries
   */
 function getUnifiedWhere($listquery,$module,$search_val)
 {
 	global $adb;
 
-	$query = "SELECT * FROM field WHERE tabid = ".getTabid($module);
+	$query = "SELECT * FROM vtiger_field WHERE vtiger_tabid = ".getTabid($module);
 	$result = $adb->query($query);
 	$noofrows = $adb->num_rows($result);
 
@@ -183,7 +183,7 @@
 		$columnname = $adb->query_result($result,$i,'columnname');
 		$tablename = $adb->query_result($result,$i,'tablename');
 
-		//Before form the where condition, check whether the table for the field has been added in the listview query
+		//Before form the where condition, check whether the vtiger_table for the vtiger_field has been added in the listview query
 		if(strstr($listquery,$tablename))
 		{
 			if($where != '')
@@ -198,7 +198,7 @@
 /**	Function to get the Tags where condition
   *	@param  string $search_val -- entered search string value
   *	@param  string $current_user_id     -- current user id
-  *	@return string $where      -- where condition with the list of crmids, will like crmentity.crmid in (1,3,4,etc.,)
+  *	@return string $where      -- where condition with the list of crmids, will like vtiger_crmentity.crmid in (1,3,4,etc.,)
   */
 function getTagWhere($search_val,$current_user_id)
 {
@@ -211,7 +211,7 @@
 	$where = '';
 	if(count($crmid_array) > 0)
 	{
-		$where = " crmentity.crmid IN (";
+		$where = " vtiger_crmentity.crmid IN (";
 		foreach($crmid_array as $index => $crmid)
 		{
 			$where .= $crmid.',';

Modified: vtigercrm/trunk/modules/Home/home_rss.php
==============================================================================
--- vtigercrm/trunk/modules/Home/home_rss.php (original)
+++ vtigercrm/trunk/modules/Home/home_rss.php Mon Jun 12 14:26:25 2006
@@ -40,7 +40,7 @@
 
 //retrieving notifications******************************
 //<<<<<<<<<<<<<<<< start of owner notify>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-$query = "select crmentity.setype,crmentity.crmid,crmentity.smcreatorid,crmentity.modifiedtime from crmentity inner join ownernotify on crmentity.crmid=ownernotify.crmid";
+$query = "select vtiger_crmentity.setype,vtiger_crmentity.crmid,vtiger_crmentity.smcreatorid,vtiger_crmentity.modifiedtime from vtiger_crmentity inner join vtiger_ownernotify on vtiger_crmentity.crmid=vtiger_ownernotify.crmid";
 
 $result = $adb->query($query);
 for($i=0;$i<$adb->num_rows($result);$i++)
@@ -48,77 +48,77 @@
 	    $mod_notify[$i] = $adb->fetch_array($result);
 		if($mod_notify[$i]['setype']=='Accounts')
 		{
-			$tempquery='select accountname from account where accountid='.$mod_notify[$i]['crmid'];
+			$tempquery='select vtiger_accountname from vtiger_account where vtiger_accountid='.$mod_notify[$i]['crmid'];
 			$tempresult=$adb->query($tempquery);
 			$account_name=$adb->fetch_array($tempresult);
 			$notify_values[$i]=$account_name['accountname'];	
 		}else if($mod_notify[$i]['setype']=='Potentials')
 		{
-			$tempquery='select potentialname from potential where potentialid='.$mod_notify[$i]['crmid'];
+			$tempquery='select vtiger_potentialname from vtiger_potential where vtiger_potentialid='.$mod_notify[$i]['crmid'];
 			$tempresult=$adb->query($tempquery);
 			$potential_name=$adb->fetch_array($tempresult);
 			$notify_values[$i]=$potential_name['potentialname'];
 		}else if($mod_notify[$i]['setype']=='Contacts')
 		{	
-			$tempquery='select lastname from contactdetails where contactid='.$mod_notify[$i]['crmid'];
+			$tempquery='select lastname from vtiger_contactdetails where contactid='.$mod_notify[$i]['crmid'];
 			$tempresult=$adb->query($tempquery);
 			$contact_name=$adb->fetch_array($tempresult);
 			$notify_values[$i]=$contact_name['lastname'];
 
 		}else if($mod_notify[$i]['setype']=='Leads')
 		{
-			$tempquery='select lastname from leaddetails where leadid='.$mod_notify[$i]['crmid'];
+			$tempquery='select lastname from vtiger_leaddetails where leadid='.$mod_notify[$i]['crmid'];
 			$tempresult=$adb->query($tempquery);
 			$lead_name=$adb->fetch_array($tempresult);
 			$notify_values[$i]=$lead_name['lastname'];
 		}else if($mod_notify[$i]['setype']=='SalesOrder')
 		{
-			$tempquery='select subject from salesorder where salesorderid='.$mod_notify[$i]['crmid'];
+			$tempquery='select subject from vtiger_salesorder where vtiger_salesorderid='.$mod_notify[$i]['crmid'];
 			$tempresult=$adb->query($tempquery);
 			$sales_subject=$adb->fetch_array($tempresult);
 			$notify_values[$i]=$sales_subject['subject'];
 
 		}else if($mod_notify[$i]['setype']=='Orders')
 		{
-			$tempquery='select subject from purchaseorder where purchaseorderid='.$mod_notify[$i]['crmid'];
+			$tempquery='select subject from vtiger_purchaseorder where vtiger_purchaseorderid='.$mod_notify[$i]['crmid'];
 			$tempresult=$adb->query($tempquery);
 			$purchase_subject=$adb->fetch_array($tempresult);
 			$notify_values[$i]=$purchase_subject['subject'];
 
 		}else if($mod_notify[$i]['setype']=='Products')
 		{
-			$tempquery='select productname from products where productid='.$mod_notify[$i]['crmid'];
+			$tempquery='select productname from vtiger_products where productid='.$mod_notify[$i]['crmid'];
 			$tempresult=$adb->query($tempquery);
 			$product_name=$adb->fetch_array($tempresult);
 			$notify_values[$i]=$product_name['productname'];
 		}else if($mod_notify[$i]['setype']=='Emails')
 		{
-			$tempquery='select subject from activity where activityid='.$mod_notify[$i]['crmid'];
+			$tempquery='select subject from vtiger_activity where vtiger_activityid='.$mod_notify[$i]['crmid'];
 			$tempresult=$adb->query($tempquery);
 			$email_subject=$adb->fetch_array($tempresult);
 			$notify_values[$i]=$email_subject['subject'];
 
 		}else if($mod_notify[$i]['setype']=='HelpDesk')
 		{
-			$tempquery='select title from troubletickets where ticketid='.$mod_notify[$i]['crmid'];
+			$tempquery='select title from vtiger_troubletickets where ticketid='.$mod_notify[$i]['crmid'];
 			$tempresult=$adb->query($tempquery);
 			$HelpDesk_title=$adb->fetch_array($tempresult);
 			$notify_values[$i]=$HelpDesk_title['title'];
 		}else if($mod_notify[$i]['setype']=='Activities')
 		{
-			$tempquery='select subject from activity where activityid='.$mod_notify[$i]['crmid'];
+			$tempquery='select subject from vtiger_activity where vtiger_activityid='.$mod_notify[$i]['crmid'];
 			$tempresult=$adb->query($tempquery);
 			$Activity_subject=$adb->fetch_array($tempresult);
 			$notify_values[$i]=$Activity_subject['subject'];
 		}else if($mod_notify[$i]['setype']=='Quotes')
 		{
-			$tempquery='select subject from quotes where quoteid='.$mod_notify[$i]['crmid'];
+			$tempquery='select subject from vtiger_quotes where quoteid='.$mod_notify[$i]['crmid'];
 			$tempresult=$adb->query($tempquery);
 			$quote_subject=$adb->fetch_array($tempresult);
 			$notify_values[$i]=$quote_subject['subject'];
 		}else if($mod_notify[$i]['setype']=='Invoice')
 		{
-			$tempquery='select subject from invoice where invoiceid='.$mod_notify[$i]['crmid'];
+			$tempquery='select subject from vtiger_invoice where vtiger_invoiceid='.$mod_notify[$i]['crmid'];
 			$tempresult=$adb->query($tempquery);
 			$invoice_subject=$adb->fetch_array($tempresult);
 			$notify_values[$i]=$invoice_subject['subject'];

Modified: vtigercrm/trunk/modules/Home/index.php
==============================================================================
--- vtigercrm/trunk/modules/Home/index.php (original)
+++ vtigercrm/trunk/modules/Home/index.php Mon Jun 12 14:26:25 2006
@@ -44,7 +44,7 @@
 global $adb;
 global $current_user;
 
-$query = "SELECT users.homeorder FROM users WHERE id=".$current_user->id;
+$query = "SELECT vtiger_users.homeorder FROM vtiger_users WHERE id=".$current_user->id;
 $result =& $adb->query($query, true,"Error getting home order");
 $row = $adb->fetchByAssoc($result);
 
@@ -140,14 +140,14 @@
 function getActivityType($id)
 {
 	global $adb;
-	$quer = "select activitytype from activity where activityid=".$id;
+	$quer = "select vtiger_activitytype from vtiger_activity where vtiger_activityid=".$id;
 	$res = $adb->query($quer);
 	$acti_type = $adb->query_result($res,0,"activitytype");
 	return $acti_type;
 
 }
 
-$query="select tagcloud from users where id=".$current_user->id;
+$query="select tagcloud from vtiger_users where id=".$current_user->id;
 $result=$adb->query($query);
 $tagcloud_js=$adb->query_result($result,0,'tagcloud');
 $smarty->assign("TAGCLOUD_JS",$tagcloud_js);
@@ -176,13 +176,13 @@
 	global $app_strings;
 	$i=0;
 	$userid= $current_user->id;
-	$query="select * from loginhistory inner join users on loginhistory.user_name=users.user_name where users.id=".$userid;
+	$query="select * from vtiger_loginhistory inner join vtiger_users on vtiger_loginhistory.user_name=vtiger_users.user_name where vtiger_users.id=".$userid;
 	$result=$adb->query($query);
 	$count=$adb->num_rows($result);
 	$logout_time=$adb->query_result($result,$count-2,'logout_time');
 	if($logout_time !='' && $logout_time != '0000-00-00 00:00:00' && $count >= 2)
 	{
-		$query ="select * from crmentity where modifiedtime > '".$logout_time."'and smownerid =".$userid;
+		$query ="select * from vtiger_crmentity where modifiedtime > '".$logout_time."'and smownerid =".$userid;
 		$result=$adb->query($query);
 		$entry_list=array();
 		for(;$i < $adb->num_rows($result);$i++)
@@ -210,15 +210,15 @@
 	$groupids = fetchUserGroupids($userid);
 	if($groupids !='')
 	{
-		//code modified to list the groups associates to a user om 21-11-05
+		//code modified to list the vtiger_groups associates to a user om 21-11-05
 		//Get the leads assigned to group
-		$query = "select leaddetails.leadid as id,leaddetails.lastname as name,leadgrouprelation.groupname as groupname, 'Leads     ' as Type from leaddetails inner join leadgrouprelation on leaddetails.leadid=leadgrouprelation.leadid inner join crmentity on crmentity.crmid = leaddetails.leadid inner join groups on leadgrouprelation.groupname=groups.groupname where  crmentity.deleted=0  and leadgrouprelation.groupname is not null and groups.groupid in (".$groupids.")";
+		$query = "select vtiger_leaddetails.leadid as id,vtiger_leaddetails.lastname as name,vtiger_leadgrouprelation.groupname as groupname, 'Leads     ' as Type from vtiger_leaddetails inner join vtiger_leadgrouprelation on vtiger_leaddetails.leadid=vtiger_leadgrouprelation.leadid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_leaddetails.leadid inner join vtiger_groups on vtiger_leadgrouprelation.groupname=vtiger_groups.groupname where  vtiger_crmentity.deleted=0  and vtiger_leadgrouprelation.groupname is not null and vtiger_groups.groupid in (".$groupids.")";
 		$query .= " union all ";
 		//Get the activities assigned to group
-		$query .= "select activity.activityid id,activity.subject,activitygrouprelation.groupname,'Activities' as Type from activity inner join activitygrouprelation on activitygrouprelation.activityid=activity.activityid inner join crmentity on crmentity.crmid = activity.activityid inner join groups on activitygrouprelation.groupname=groups.groupname where  crmentity.deleted=0 and ((activity.eventstatus !='held'and (activity.status is null or activity.status ='')) or (activity.status !='completed' and (activity.eventstatus is null or activity.eventstatus=''))) and activitygrouprelation.groupname is not null and groups.groupid in (".$groupids.")";
+		$query .= "select vtiger_activity.activityid id,vtiger_activity.subject,vtiger_activitygrouprelation.groupname,'Activities' as Type from vtiger_activity inner join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_activity.activityid inner join vtiger_groups on vtiger_activitygrouprelation.groupname=vtiger_groups.groupname where  vtiger_crmentity.deleted=0 and ((vtiger_activity.eventstatus !='held'and (vtiger_activity.status is null or vtiger_activity.status ='')) or (vtiger_activity.status !='completed' and (vtiger_activity.eventstatus is null or vtiger_activity.eventstatus=''))) and vtiger_activitygrouprelation.groupname is not null and vtiger_groups.groupid in (".$groupids.")";
 		$query .= " union all ";
 		//Get the tickets assigned to group (status not Closed -- hardcoded value)
-		$query .= "select troubletickets.ticketid,troubletickets.title,ticketgrouprelation.groupname,'Tickets   ' as Type from troubletickets inner join ticketgrouprelation on ticketgrouprelation.ticketid=troubletickets.ticketid inner join crmentity on crmentity.crmid = troubletickets.ticketid inner join groups on ticketgrouprelation.groupname=groups.groupname where crmentity.deleted=0 and troubletickets.status != 'Closed' and ticketgrouprelation.groupname is not null and groups.groupid in (".$groupids.")";
+		$query .= "select vtiger_troubletickets.ticketid,vtiger_troubletickets.title,vtiger_ticketgrouprelation.groupname,'Tickets   ' as Type from vtiger_troubletickets inner join vtiger_ticketgrouprelation on vtiger_ticketgrouprelation.ticketid=vtiger_troubletickets.ticketid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_troubletickets.ticketid inner join vtiger_groups on vtiger_ticketgrouprelation.groupname=vtiger_groups.groupname where vtiger_crmentity.deleted=0 and vtiger_troubletickets.status != 'Closed' and vtiger_ticketgrouprelation.groupname is not null and vtiger_groups.groupid in (".$groupids.")";
 
 
 		$log->info("Here is the where clause for the list view: $query");

Modified: vtigercrm/trunk/modules/Import/Forms.php
==============================================================================
--- vtigercrm/trunk/modules/Import/Forms.php (original)
+++ vtigercrm/trunk/modules/Import/Forms.php Mon Jun 12 14:26:25 2006
@@ -15,7 +15,7 @@
 /*********************************************************************************
  * $Header$
  * Description:  Contains a variety of utility functions used to display UI 
- * components such as form headers and footers.  Intended to be modified on a per 
+ * components such as form vtiger_headers and footers.  Intended to be modified on a per 
  * theme basis.
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
  * All Rights Reserved.
@@ -64,7 +64,7 @@
 			}
 			if ( hash[ form.elements[i].value ] == 1)
 			{
-				// got same field more than once
+				// got same vtiger_field more than once
 				isError = true;
 			}
 			hash[form.elements[i].value] = 1;
@@ -83,7 +83,7 @@
 		return false;
 	}
 
-	for(var field_name in required)
+	for(var vtiger_field_name in required)
 	{
 		// contacts hack to bypass errors if full_name is set
 		if (field_name == 'last_name' && 
@@ -91,7 +91,7 @@
 		{
 			continue;
 		}
-		if ( hash[ field_name ] != 1 )
+		if ( hash[ vtiger_field_name ] != 1 )
 		{
 				isError = true;
 				errorMessage += "$err_required " + required[field_name];
@@ -177,11 +177,11 @@
 function getFieldSelect(&$column_fields,$colnum,&$required_fields,$suggest_field,$translated_fields,$module)
 {
 /*
-echo '<br> column fields : ';print_r($column_fields);
+echo '<br> column vtiger_fields : ';print_r($column_fields);
 echo '<br> column  : '.$colnum;
-echo '<br> required fields : ';print_r($required_fields);
-echo '<br> suggest fields : '.$suggest_field;
-echo '<br> translated fields : ';print_r($translated_fields);
+echo '<br> required vtiger_fields : ';print_r($required_fields);
+echo '<br> suggest vtiger_fields : '.$suggest_field;
+echo '<br> translated vtiger_fields : ';print_r($translated_fields);
 */	global $mod_strings;
 	global $app_strings;
 	global $outlook_contacts_field_map;
@@ -238,7 +238,7 @@
 	{
 	$module ='contactdetails';
 	}	
-	$custquery = "select * from field where tablename='".$module."'";
+	$custquery = "select * from vtiger_field where vtiger_tablename='".$module."'";
 	$cust_result = $adb->query($custquery);
 	while($row = $adb->fetch_array($cust_result))
 	{

Modified: vtigercrm/trunk/modules/Import/ImportAccount.php
==============================================================================
--- vtigercrm/trunk/modules/Import/ImportAccount.php (original)
+++ vtigercrm/trunk/modules/Import/ImportAccount.php Mon Jun 12 14:26:25 2006
@@ -29,7 +29,7 @@
 require_once('modules/Accounts/Account.php');
 require_once('include/ComboUtil.php');
 
-// Account is used to store account information.
+// Account is used to store vtiger_account information.
 class ImportAccount extends Account {
 	 var $db;
 
@@ -39,7 +39,7 @@
 	//$comboFieldArray = getComboArray($comboFieldNames);
 
 
-	// This is the list of fields that are required.
+	// This is the list of vtiger_fields that are required.
 	var $required_fields =  array("accountname"=>1);
 	
 	// This is the list of the functions to run when importing
@@ -120,7 +120,7 @@
 	}
 
 
-	// This is the list of fields that are importable.
+	// This is the list of vtiger_fields that are importable.
 	// some if these do not map directly to database columns
 	/*var $importable_fields = Array(
 		"id"=>1

Modified: vtigercrm/trunk/modules/Import/ImportContact.php
==============================================================================
--- vtigercrm/trunk/modules/Import/ImportContact.php (original)
+++ vtigercrm/trunk/modules/Import/ImportContact.php Mon Jun 12 14:26:25 2006
@@ -29,9 +29,9 @@
 
 // Contact is used to store customer information.
 class ImportContact extends Contact {
-	// these are fields that may be set on import
+	// these are vtiger_fields that may be set on import
 	// but are to be processed and incorporated
-	// into fields of the parent class
+	// into vtiger_fields of the parent class
 	var $db;
 	var $full_name;
 	var $primary_address_street_2;
@@ -170,18 +170,18 @@
 
 		$query = '';
 
-		// if user is defining the account id to be associated with this contact..
-
-		//Modified to remove the spaces at first and last in account name -- after 4.2 patch 2
+		// if user is defining the vtiger_account id to be associated with this contact..
+
+		//Modified to remove the spaces at first and last in vtiger_account name -- after 4.2 patch 2
 		$acc_name = trim(addslashes($acc_name));
 
-		$query = "select crmentity.deleted, account.* from account,crmentity WHERE accountname='{$acc_name}' and crmentity.crmid =account.accountid";
+		$query = "select vtiger_crmentity.deleted, vtiger_account.* from vtiger_account,crmentity WHERE vtiger_accountname='{$acc_name}' and vtiger_crmentity.crmid =vtiger_account.accountid";
 
                 $result = $adb->query($query)	or die("Error selecting sugarbean: ".mysql_error());
 
                 $row = $this->db->fetchByAssoc($result, -1, false);
 
-		$adb->println("fetched account");
+		$adb->println("fetched vtiger_account");
 		$adb->println($row);
 
 		// we found a row with that id
@@ -191,14 +191,14 @@
                         if ( isset($row['deleted']) && $row['deleted'] == 1)
                         {
 				$adb->println("row exists - deleting");
-                                $query2 = "delete from crmentity WHERE crmid='". $row['accountid']."'";
+                                $query2 = "delete from vtiger_crmentity WHERE crmid='". $row['accountid']."'";
 
                                 $this->log->info($query2);
 
                                 $result2 = $adb->query($query2)	or die("Error deleting existing sugarbean: ".mysql_error());
 
                         }
-			// else just use this id to link the contact to the account
+			// else just use this id to link the contact to the vtiger_account
                         else
                         {				
                                 $focus->id = $row['accountid'];
@@ -206,10 +206,10 @@
                         }
                 }
 
-		// if we didnt find the account, so create it
+		// if we didnt find the vtiger_account, so create it
                 if (! isset($focus->id) || $focus->id == '')
                 {
-			$adb->println("Createing new account");
+			$adb->println("Createing new vtiger_account");
                         $focus->column_fields['accountname'] = $acc_name;
                         $focus->column_fields['assigned_user_id'] = $current_user->id;
                         $focus->column_fields['modified_user_id'] = $current_user->id;
@@ -223,8 +223,8 @@
 			// avoid duplicate mappings:
 			if (! isset( $imported_ids[$acc_id]) )
 			{
-				$adb->println("inserting users last import for accounts");
-				// save the new account as a users_last_import
+				$adb->println("inserting vtiger_users last import for vtiger_accounts");
+				// save the new vtiger_account as a vtiger_users_last_import
                 		$last_import = new UsersLastImport();
                 		$last_import->assigned_user_id = $current_user->id;
                 		$last_import->bean_type = "Accounts";
@@ -235,7 +235,7 @@
                 }
 
 		$adb->println("prev contact accid=".$this->column_fields["account_id"]);
-		// now just link the account
+		// now just link the vtiger_account
                 $this->column_fields["account_id"] = $focus->id;
 		$adb->println("curr contact accid=".$this->column_fields["account_id"]);
 
@@ -243,10 +243,10 @@
 
 	
 
-	// This is the list of fields that can be imported
+	// This is the list of vtiger_fields that can be imported
 	// some of these don't map directly to columns in the db
 
-	//we need to add two or more arrays as the columns are distributed across the tables now
+	//we need to add two or more arrays as the columns are distributed across the vtiger_tables now
 	/*var $importable_fields =  array(
 		"contactid"=>1,
 		"firstname"=>1,

Modified: vtigercrm/trunk/modules/Import/ImportLead.php
==============================================================================
--- vtigercrm/trunk/modules/Import/ImportLead.php (original)
+++ vtigercrm/trunk/modules/Import/ImportLead.php Mon Jun 12 14:26:25 2006
@@ -53,7 +53,7 @@
 		{
 			$this->db->println("searching and assigning ".$ass_user);
 
-			$result = $this->db->query("select id from users where user_name = '".$ass_user."'");
+			$result = $this->db->query("select id from vtiger_users where user_name = '".$ass_user."'");
 			if($this->db->num_rows($result)!=1)
 			{
 				$this->db->println("not exact records setting current userid");

Modified: vtigercrm/trunk/modules/Import/ImportMap.php
==============================================================================
--- vtigercrm/trunk/modules/Import/ImportMap.php (original)
+++ vtigercrm/trunk/modules/Import/ImportMap.php Mon Jun 12 14:26:25 2006
@@ -29,7 +29,7 @@
 	var $log;
 	var $db;
 
-	// Stored fields
+	// Stored vtiger_fields
 	var $id;
 	var $name;
 	var $module;

Modified: vtigercrm/trunk/modules/Import/ImportOpportunity.php
==============================================================================
--- vtigercrm/trunk/modules/Import/ImportOpportunity.php (original)
+++ vtigercrm/trunk/modules/Import/ImportOpportunity.php Mon Jun 12 14:26:25 2006
@@ -35,11 +35,11 @@
                       ,'sales_stage'=>'sales_stage_dom');
 $comboFieldArray = getComboArray($comboFieldNames);
 
-// Account is used to store account information.
+// Account is used to store vtiger_account information.
 class ImportOpportunity extends Potential {
 	 var $db;
 
-	// This is the list of fields that are required.
+	// This is the list of vtiger_fields that are required.
 	/*
 	var $required_fields =  array(
 					"potentialname"=>1,
@@ -133,9 +133,9 @@
 
 		$query = '';
 
-		// if user is defining the account id to be associated with this contact..
+		// if user is defining the vtiger_account id to be associated with this contact..
 		$acc_name = trim(addslashes($acc_name));
-		$query = "select crmentity.deleted, account.* from account,crmentity WHERE accountname='{$acc_name}' and crmentity.crmid =account.accountid";
+		$query = "select vtiger_crmentity.deleted, vtiger_account.* from vtiger_account,crmentity WHERE vtiger_accountname='{$acc_name}' and vtiger_crmentity.crmid =vtiger_account.accountid";
 
                 $this->log->info($query);
 
@@ -143,7 +143,7 @@
 
                 $row = $this->db->fetchByAssoc($result, -1, false);
 
-		$adb->println("fetched account");
+		$adb->println("fetched vtiger_account");
 		$adb->println($row);
 
 		// we found a row with that id
@@ -153,14 +153,14 @@
                         if ( isset($row['deleted']) && $row['deleted'] == 1)
                         {
 				$adb->println("row exists - deleting");
-                                $query2 = "delete from crmentity WHERE crmid='". $row['accountid']."'";
+                                $query2 = "delete from vtiger_crmentity WHERE crmid='". $row['accountid']."'";
 
                                 $this->log->info($query2);
 
                                 $result2 = $adb->query($query2)	or die("Error deleting existing sugarbean: ".mysql_error());
 
                         }
-			// else just use this id to link the contact to the account
+			// else just use this id to link the contact to the vtiger_account
                         else
                         {				
                                 $focus->id = $row['accountid'];
@@ -168,10 +168,10 @@
                         }
                 }
 
-		// if we didnt find the account, so create it
+		// if we didnt find the vtiger_account, so create it
                 if (! isset($focus->id) || $focus->id == '')
                 {
-			$adb->println("Createing new account");
+			$adb->println("Createing new vtiger_account");
                         $focus->column_fields['accountname'] = $acc_name;
                         $focus->column_fields['assigned_user_id'] = $current_user->id;
                         $focus->column_fields['modified_user_id'] = $current_user->id;
@@ -184,8 +184,8 @@
 			// avoid duplicate mappings:
 			if (! isset( $imported_ids[$acc_id]) )
 			{
-				$adb->println("inserting users last import for accounts");
-				// save the new account as a users_last_import
+				$adb->println("inserting vtiger_users last import for vtiger_accounts");
+				// save the new vtiger_account as a vtiger_users_last_import
                 		$last_import = new UsersLastImport();
                 		$last_import->assigned_user_id = $current_user->id;
                 		$last_import->bean_type = "Accounts";
@@ -196,7 +196,7 @@
                 }
 
 		$adb->println("prev contact accid=".$this->column_fields["account_id"]);
-		// now just link the account
+		// now just link the vtiger_account
                 $this->column_fields["account_id"] = $focus->id;
 		$adb->println("curr contact accid=".$this->column_fields["account_id"]);
 
@@ -213,7 +213,7 @@
 	}
 
 	
-	// This is the list of fields that are importable.
+	// This is the list of vtiger_fields that are importable.
 	// some if these do not map directly to database columns
 	/*var $importable_fields = Array(
 		"id"=>1

Modified: vtigercrm/trunk/modules/Import/ImportProduct.php
==============================================================================
--- vtigercrm/trunk/modules/Import/ImportProduct.php (original)
+++ vtigercrm/trunk/modules/Import/ImportProduct.php Mon Jun 12 14:26:25 2006
@@ -54,7 +54,7 @@
 		{
 			$this->db->println("searching and assigning ".$ass_user);
 
-			$result = $this->db->query("select id from users where user_name = '".$ass_user."'");
+			$result = $this->db->query("select id from vtiger_users where user_name = '".$ass_user."'");
 			if($this->db->num_rows($result)!=1)
 			{
 				$this->db->println("not exact records setting current userid");

Modified: vtigercrm/trunk/modules/Import/ImportSave.php
==============================================================================
--- vtigercrm/trunk/modules/Import/ImportSave.php (original)
+++ vtigercrm/trunk/modules/Import/ImportSave.php Mon Jun 12 14:26:25 2006
@@ -17,7 +17,7 @@
 	global $current_user;
 	global $adb;
 
-// MWC ** Getting users
+// MWC ** Getting vtiger_users
 $temp = get_user_array(FALSE);
 foreach ( $temp as $key=>$data)
 	$my_users[$data] = $key;
@@ -84,7 +84,7 @@
 
 	p("setting done");
 	
-	p("do save before req fields=".$do_save);
+	p("do save before req vtiger_fields=".$do_save);
 
 	$adb->println($focus->required_fields);
 
@@ -128,7 +128,7 @@
 			{
 				$_REQUEST['module']='contactdetails';
 			}
-			$dbquery="select * from field where tablename='".$_REQUEST['module']."'";
+			$dbquery="select * from vtiger_field where vtiger_tablename='".$_REQUEST['module']."'";
 			$custresult = $adb->query($dbquery);
 			if($adb->num_rows($custresult) != 0)
 			{

Modified: vtigercrm/trunk/modules/Import/ImportStep2.php
==============================================================================
--- vtigercrm/trunk/modules/Import/ImportStep2.php (original)
+++ vtigercrm/trunk/modules/Import/ImportStep2.php Mon Jun 12 14:26:25 2006
@@ -226,7 +226,7 @@
 
 $translated_column_fields = $mod_list_strings[$list_string_key];
 
-// adding custom fields translations
+// adding custom vtiger_fields translations
 getCustomFieldTrans($_REQUEST['module'],&$translated_column_fields);
 
 $cnt=1;
@@ -355,7 +355,7 @@
 {
 	var tagName;
 	var count = 0;
-	var field_count = "<?php echo $field_count; ?>";
+	var vtiger_field_count = "<?php echo $field_count; ?>";
 	var required_fields = new Array();
 	var required_fields_name = new Array();
 	var seq_string = '';
@@ -384,7 +384,7 @@
 			}
 			else
 			{
-				//if a field mapped more than once, alert the user and return
+				//if a vtiger_field mapped more than once, alert the user and return
 				alert("'"+tagName.options[tagName.selectedIndex].text+"' is mapped more than once. Please check the mapping.");
 				return false;
 			}
@@ -392,12 +392,12 @@
 
 	}
 
-	//check whether the mandatory fields have been mapped.
+	//check whether the mandatory vtiger_fields have been mapped.
 	for(inner_loop = 0; inner_loop<required_fields.length;inner_loop++)
 	{
 		if(seq_string.indexOf(required_fields[inner_loop]) == -1)
 		{
-			alert('Please map the mandatory field "'+required_fields_name[inner_loop]+'"');
+			alert('Please map the mandatory vtiger_field "'+required_fields_name[inner_loop]+'"');
 			return false;
 		}
 	}

Modified: vtigercrm/trunk/modules/Import/ImportStep3.php
==============================================================================
--- vtigercrm/trunk/modules/Import/ImportStep3.php (original)
+++ vtigercrm/trunk/modules/Import/ImportStep3.php Mon Jun 12 14:26:25 2006
@@ -112,13 +112,13 @@
 
 $focus = new $current_bean_type();
 
-//Constructing the custom field Array
+//Constructing the custom vtiger_field Array
 require_once('include/CustomFieldUtil.php');
 $custFldArray = getCustomFieldArray($_REQUEST['module']);
 p("IMP 3: custFldArray");
 p($custFldArray);
 
-//Initializing  an empty Array to store the custom field Column Name and Value
+//Initializing  an empty Array to store the custom vtiger_field Column Name and Value
 $resCustFldArray = Array();
 
 p("Getting from request");
@@ -137,13 +137,13 @@
 		continue;
 	}
 
-	// this value is a user defined field name
+	// this value is a user defined vtiger_field name
 	$user_field = $value;
 
-	// pull out the column position for this field name
+	// pull out the column position for this vtiger_field name
 	$pos = substr($name,6);
 
-	// make sure we haven't seen this field defined yet
+	// make sure we haven't seen this vtiger_field defined yet
 	if ( isset( $field_to_pos[$user_field]) )
 	{
 		show_error_import($mod_strings['LBL_ERROR_MULTIPLE']);
@@ -153,12 +153,12 @@
 
 	p("user_field=".$user_field." if=".$focus->importable_fields[$user_field]);
 	
-	// match up the "official" field to the user 
+	// match up the "official" vtiger_field to the user 
 	// defined one, and map to columm position: 
 	if ( isset( $focus->importable_fields[$user_field] ) || isset( $custFldArray[$user_field] ))
 	{
 		p("user_field SET=".$user_field);
-		// now mark that we've seen this field
+		// now mark that we've seen this vtiger_field
 		$field_to_pos[$user_field] = $pos;
 		$col_pos_to_field[$pos] = $user_field;
 	}
@@ -207,7 +207,7 @@
 	$firstrow = array_shift($datarows);
 }
 
-//Mark the last imported records as deleted which are imported by the current user in users_last_import table
+//Mark the last imported records as deleted which are imported by the current user in vtiger_users_last_import vtiger_table
 if(!isset($_REQUEST['startval']))
 {
 	$seedUsersLastImport = new UsersLastImport();

Modified: vtigercrm/trunk/modules/Import/UsersLastImport.php
==============================================================================
--- vtigercrm/trunk/modules/Import/UsersLastImport.php (original)
+++ vtigercrm/trunk/modules/Import/UsersLastImport.php Mon Jun 12 14:26:25 2006
@@ -32,7 +32,7 @@
 	var $log;
 	var $db;
 
-	// Stored fields
+	// Stored vtiger_fields
 	var $id;
 	var $assigned_user_id;
 	var $bean_type;
@@ -64,7 +64,7 @@
 	function mark_deleted_by_user_id($user_id)
         {
                 $query = "UPDATE $this->table_name set deleted=1 where assigned_user_id='$user_id'";
-                $this->db->query($query,true,"Error marking last imported accounts deleted: ");
+                $this->db->query($query,true,"Error marking last imported vtiger_accounts deleted: ");
         }
 
 
@@ -78,86 +78,86 @@
 		if ($this->bean_type == 'Contacts')
 		{
 				$query = "SELECT distinct crmid,
-				account.accountname as account_name,
-				contactdetails.contactid,
-				contactdetails.accountid,				
-				contactdetails.yahooid,
-				contactdetails.firstname,
-				contactdetails.lastname,
-				contactdetails.phone,
-				contactdetails.title,
-				contactdetails.email,
-				users.id as assigned_user_id,
+			vtiger_account.accountname as vtiger_account_name,
+			vtiger_contactdetails.contactid,
+			vtiger_contactdetails.accountid,				
+			vtiger_contactdetails.yahooid,
+			vtiger_contactdetails.firstname,
+			vtiger_contactdetails.lastname,
+			vtiger_contactdetails.phone,
+			vtiger_contactdetails.title,
+			vtiger_contactdetails.email,
+			vtiger_users.id as assigned_user_id,
 				smownerid,
-                                users.user_name as assigned_user_name
-				FROM contactdetails
-				left join users_last_import on users_last_import.bean_id=contactdetails.contactid
-				LEFT JOIN users ON contactdetails.contactid=users.id 
-				LEFT JOIN account  ON account.accountid=contactdetails.accountid 
-				inner join crmentity on crmentity.crmid=contactdetails.contactid  
-				WHERE users_last_import.assigned_user_id= '{$current_user->id}'  
-				AND users_last_import.bean_type='Contacts' 
-				AND users_last_import.deleted=0  AND crmentity.deleted=0";
+                                vtiger_users.user_name as assigned_user_name
+				FROM vtiger_contactdetails
+				left join vtiger_users_last_import on vtiger_users_last_import.bean_id=vtiger_contactdetails.contactid
+				LEFT JOIN vtiger_users ON vtiger_contactdetails.contactid=vtiger_users.id 
+				LEFT JOIN vtiger_account  ON vtiger_account.accountid=vtiger_contactdetails.accountid 
+				inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_contactdetails.contactid  
+				WHERE vtiger_users_last_import.assigned_user_id= '{$current_user->id}'  
+				AND vtiger_users_last_import.bean_type='Contacts' 
+				AND vtiger_users_last_import.deleted=0  AND vtiger_crmentity.deleted=0";
 			
 		} 
 		else if ($this->bean_type == 'Accounts')
 		{
-				$query = "SELECT distinct account.*, accountbillads.city,
-                                users.user_name assigned_user_name,
+				$query = "SELECT distinct vtiger_account.*, vtiger_accountbillads.city,
+                                vtiger_users.user_name assigned_user_name,
 				crmid, smownerid 
-				FROM account
-				inner join crmentity on crmentity.crmid=account.accountid
-				inner join accountbillads on crmentity.crmid=accountbillads.accountaddressid
-				left join users_last_import on users_last_import.bean_id=crmentity.crmid
-			       	left join users ON crmentity.smownerid=users.id
+				FROM vtiger_account
+				inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_account.accountid
+				inner join vtiger_accountbillads on vtiger_crmentity.crmid=vtiger_accountbillads.accountaddressid
+				left join vtiger_users_last_import on vtiger_users_last_import.bean_id=vtiger_crmentity.crmid
+			       	left join vtiger_users ON vtiger_crmentity.smownerid=vtiger_users.id
 				WHERE 
-				users_last_import.assigned_user_id=
+			vtiger_users_last_import.assigned_user_id=
 					'{$current_user->id}'
-				AND users_last_import.bean_type='Accounts'
-				AND users_last_import.deleted=0
-				AND crmentity.deleted=0
-				AND users.status='Active'";
+				AND vtiger_users_last_import.bean_type='Accounts'
+				AND vtiger_users_last_import.deleted=0
+				AND vtiger_crmentity.deleted=0
+				AND vtiger_users.status='Active'";
 		} 
 		else if ($this->bean_type == 'Potentials')
 		{
 		
 			$query = "SELECT distinct
-                                account.accountid account_id,
-                                account.accountname account_name,
-                                users.user_name assigned_user_name,
-				crmentity.crmid, smownerid,
-				potential.*
-                               FROM potential 
-			       inner join account on account.accountid=potential.accountid 
-			       inner join  crmentity on crmentity.crmid=potential.potentialid 
-			       left join users ON crmentity.smownerid=users.id 
-			       left join users_last_import on users_last_import.assigned_user_id=users.id 
-			       where users_last_import.assigned_user_id='{$current_user->id}'
-				AND users_last_import.bean_type='Potentials'
-				AND users_last_import.bean_id=crmentity.crmid
-				AND users_last_import.deleted=0
-				AND crmentity.deleted=0 
-				AND users.status='Active'";
+                                vtiger_account.accountid vtiger_account_id,
+                                vtiger_account.accountname vtiger_account_name,
+                                vtiger_users.user_name assigned_user_name,
+			vtiger_crmentity.crmid, smownerid,
+			vtiger_potential.*
+                               FROM vtiger_potential 
+			       inner join vtiger_account on vtiger_account.accountid=vtiger_potential.accountid 
+			       inner join  vtiger_crmentity on vtiger_crmentity.crmid=vtiger_potential.potentialid 
+			       left join vtiger_users ON vtiger_crmentity.smownerid=vtiger_users.id 
+			       left join vtiger_users_last_import on vtiger_users_last_import.assigned_user_id=vtiger_users.id 
+			       where vtiger_users_last_import.assigned_user_id='{$current_user->id}'
+				AND vtiger_users_last_import.bean_type='Potentials'
+				AND vtiger_users_last_import.bean_id=vtiger_crmentity.crmid
+				AND vtiger_users_last_import.deleted=0
+				AND vtiger_crmentity.deleted=0 
+				AND vtiger_users.status='Active'";
 
 		}
 		else if($this->bean_type == 'Leads')
 		{
-			$query = "SELECT distinct leaddetails.*, crmentity.crmid, leadaddress.phone,leadsubdetails.website,
-                                users.user_name assigned_user_name,
+			$query = "SELECT distinct vtiger_leaddetails.*, vtiger_crmentity.crmid, vtiger_leadaddress.phone,vtiger_leadsubdetails.website,
+                                vtiger_users.user_name assigned_user_name,
 				smownerid 
-				FROM leaddetails 
-				inner join crmentity on crmentity.crmid=leaddetails.leadid 
-				inner join leadaddress on crmentity.crmid=leadaddress.leadaddressid 
-				inner join leadsubdetails on crmentity.crmid=leadsubdetails.leadsubscriptionid 
-				left join users_last_import on users_last_import.bean_id=crmentity.crmid			       	
-				left join users ON crmentity.smownerid=users.id
+				FROM vtiger_leaddetails 
+				inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_leaddetails.leadid 
+				inner join vtiger_leadaddress on vtiger_crmentity.crmid=vtiger_leadaddress.leadaddressid 
+				inner join vtiger_leadsubdetails on vtiger_crmentity.crmid=vtiger_leadsubdetails.leadsubscriptionid 
+				left join vtiger_users_last_import on vtiger_users_last_import.bean_id=vtiger_crmentity.crmid			       	
+				left join vtiger_users ON vtiger_crmentity.smownerid=vtiger_users.id
 				WHERE 
-				users_last_import.assigned_user_id=
+			vtiger_users_last_import.assigned_user_id=
 					'{$current_user->id}'
-				AND users_last_import.bean_type='Leads'
-				AND users_last_import.deleted=0
-				AND crmentity.deleted=0
-				AND users.status='Active'";
+				AND vtiger_users_last_import.bean_type='Leads'
+				AND vtiger_users_last_import.deleted=0
+				AND vtiger_crmentity.deleted=0
+				AND vtiger_users.status='Active'";
 		}
 
 		
@@ -199,15 +199,15 @@
 	function undo_contacts($user_id)
 	{
 		$count = 0;
-		$query1 = "select bean_id from users_last_import where assigned_user_id='$user_id' AND bean_type='Contacts' AND deleted=0";
-
-		$this->log->info($query1); 
-
-		$result1 = $this->db->query($query1) or die("Error getting last import for undo: ".mysql_error()); 
-
-		while ( $row1 = $this->db->fetchByAssoc($result1))
-		{
-			$query2 = "update crmentity set deleted=1 where crmid='{$row1['bean_id']}'";
+		$query1 = "select bean_id from vtiger_users_last_import where assigned_user_id='$user_id' AND bean_type='Contacts' AND deleted=0";
+
+		$this->log->info($query1); 
+
+		$result1 = $this->db->query($query1) or die("Error getting last import for undo: ".mysql_error()); 
+
+		while ( $row1 = $this->db->fetchByAssoc($result1))
+		{
+			$query2 = "update vtiger_crmentity set deleted=1 where crmid='{$row1['bean_id']}'";
 
 			$this->log->info($query2); 
 
@@ -222,15 +222,15 @@
 	function undo_leads($user_id)
 	{
 		$count = 0;
-		$query1 = "select bean_id from users_last_import where assigned_user_id='$user_id' AND bean_type='Leads' AND deleted=0";
-
-		$this->log->info($query1); 
-
-		$result1 = $this->db->query($query1) or die("Error getting last import for undo: ".mysql_error()); 
-
-		while ( $row1 = $this->db->fetchByAssoc($result1))
-		{
-			$query2 = "update crmentity set deleted=1 where crmid='{$row1['bean_id']}'";
+		$query1 = "select bean_id from vtiger_users_last_import where assigned_user_id='$user_id' AND bean_type='Leads' AND deleted=0";
+
+		$this->log->info($query1); 
+
+		$result1 = $this->db->query($query1) or die("Error getting last import for undo: ".mysql_error()); 
+
+		while ( $row1 = $this->db->fetchByAssoc($result1))
+		{
+			$query2 = "update vtiger_crmentity set deleted=1 where crmid='{$row1['bean_id']}'";
 
 			$this->log->info($query2); 
 
@@ -246,15 +246,15 @@
 	{
 		// this should just be a loop foreach module type
 		$count = 0;
-		$query1 = "select bean_id from users_last_import where assigned_user_id='$user_id' AND bean_type='Accounts' AND deleted=0";
-
-		$this->log->info($query1); 
-
-		$result1 = $this->db->query($query1) or die("Error getting last import for undo: ".mysql_error()); 
-
-		while ( $row1 = $this->db->fetchByAssoc($result1))
-		{
-			$query2 = "update crmentity set deleted=1 where crmid='{$row1['bean_id']}'";
+		$query1 = "select bean_id from vtiger_users_last_import where assigned_user_id='$user_id' AND bean_type='Accounts' AND deleted=0";
+
+		$this->log->info($query1); 
+
+		$result1 = $this->db->query($query1) or die("Error getting last import for undo: ".mysql_error()); 
+
+		while ( $row1 = $this->db->fetchByAssoc($result1))
+		{
+			$query2 = "update vtiger_crmentity set deleted=1 where crmid='{$row1['bean_id']}'";
 
 			$this->log->info($query2); 
 
@@ -270,15 +270,15 @@
 	{
 		// this should just be a loop foreach module type
 		$count = 0;
-		$query1 = "select bean_id from users_last_import where assigned_user_id='$user_id' AND bean_type='Potentials' AND deleted=0";
-
-		$this->log->info($query1); 
-
-		$result1 = $this->db->query($query1) or die("Error getting last import for undo: ".mysql_error()); 
-
-		while ( $row1 = $this->db->fetchByAssoc($result1))
-		{
-			$query2 = "update crmentity set deleted=1 where crmid='{$row1['bean_id']}'";
+		$query1 = "select bean_id from vtiger_users_last_import where assigned_user_id='$user_id' AND bean_type='Potentials' AND deleted=0";
+
+		$this->log->info($query1); 
+
+		$result1 = $this->db->query($query1) or die("Error getting last import for undo: ".mysql_error()); 
+
+		while ( $row1 = $this->db->fetchByAssoc($result1))
+		{
+			$query2 = "update vtiger_crmentity set deleted=1 where crmid='{$row1['bean_id']}'";
 
 			$this->log->info($query2); 
 
@@ -293,15 +293,15 @@
 	function undo_products($user_id)
 	{
 		$count = 0;
-		$query1 = "select bean_id from users_last_import where assigned_user_id='$user_id' AND bean_type='Products' AND deleted=0";
-
-		$this->log->info($query1); 
-
-		$result1 = $this->db->query($query1) or die("Error getting last import for undo: ".mysql_error()); 
-
-		while ( $row1 = $this->db->fetchByAssoc($result1))
-		{
-			$query2 = "update crmentity set deleted=1 where crmid='{$row1['bean_id']}'";
+		$query1 = "select bean_id from vtiger_users_last_import where assigned_user_id='$user_id' AND bean_type='Products' AND deleted=0";
+
+		$this->log->info($query1); 
+
+		$result1 = $this->db->query($query1) or die("Error getting last import for undo: ".mysql_error()); 
+
+		while ( $row1 = $this->db->fetchByAssoc($result1))
+		{
+			$query2 = "update vtiger_crmentity set deleted=1 where crmid='{$row1['bean_id']}'";
 
 			$this->log->info($query2); 
 

Modified: vtigercrm/trunk/modules/Import/index.php
==============================================================================
--- vtigercrm/trunk/modules/Import/index.php (original)
+++ vtigercrm/trunk/modules/Import/index.php Mon Jun 12 14:26:25 2006
@@ -177,7 +177,7 @@
 
 
 /*
-ommited fields to map:
+ommited vtiger_fields to map:
 "Account Number"=>"",
 "Account Site"=>"",
 "Last Activity"=>"",

Modified: vtigercrm/trunk/modules/Import/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Import/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Import/language/en_us.lang.php Mon Jun 12 14:26:25 2006
@@ -25,18 +25,18 @@
 'LBL_IMPORT_MODULE_NO_DIRECTORY'=>'The directory ',
 'LBL_IMPORT_MODULE_NO_DIRECTORY_END'=>' does not exist or is not writable',
 'LBL_IMPORT_MODULE_ERROR_NO_UPLOAD'=>'File was not uploaded successfully, try again',
-'LBL_IMPORT_MODULE_ERROR_LARGE_FILE'=>'File is too large. Max:',
+'LBL_IMPORT_MODULE_ERROR_LARGE_FILE'=>'File is too vtiger_large. Max:',
 'LBL_IMPORT_MODULE_ERROR_LARGE_FILE_END'=>'Bytes. Change $upload_maxsize in config.php',
 'LBL_MODULE_NAME'=>'Import',
 'LBL_TRY_AGAIN'=>'Try Again',
 'LBL_ERROR'=>'Error:',
-'ERR_MULTIPLE'=>'Multiple columns have been defined with the same field name.',
-'ERR_MISSING_REQUIRED_FIELDS'=>'Missing required fields:',
+'ERR_MULTIPLE'=>'Multiple columns have been defined with the same vtiger_field name.',
+'ERR_MISSING_REQUIRED_FIELDS'=>'Missing required vtiger_fields:',
 'ERR_SELECT_FULL_NAME'=>'You cannot select Full Name when First Name and Last Name are selected.',
 'ERR_SELECT_FILE'=>'Select a file to upload.',
 'LBL_SELECT_FILE'=>'Select file:',
 'LBL_CUSTOM'=>'Custom',
-'LBL_DONT_MAP'=>'-- Do not map this field --',
+'LBL_DONT_MAP'=>'-- Do not map this vtiger_field --',
 'LBL_STEP_1_TITLE'=>'Step 1 of 4: Select Data Source',
 'LBL_WHAT_IS'=>'Please select a data source from the following:',
 'LBL_MICROSOFT_OUTLOOK'=>'Microsoft Outlook',
@@ -80,21 +80,21 @@
 'LBL_ACT_NUM_4'=>'Choose a filename and location for the exported data and click <b>Next</b>',
 'LBL_ACT_NUM_5'=>'Select <b>Contacts records only</b>',
 'LBL_ACT_NUM_6'=>'Click the <b>Options...</b> button',
-'LBL_ACT_NUM_7'=>'Select <b>Comma</b> as the field separator character',
-'LBL_ACT_NUM_8'=>'Check the <b>Yes, export field names</b> checkbox and click <b>OK</b>',
+'LBL_ACT_NUM_7'=>'Select <b>Comma</b> as the vtiger_field separator character',
+'LBL_ACT_NUM_8'=>'Check the <b>Yes, export vtiger_field names</b> checkbox and click <b>OK</b>',
 'LBL_ACT_NUM_9'=>'Click <b>Next</b>',
 'LBL_ACT_NUM_10'=>'Select <b>All Records</b> and then Click <b>Finish</b>',
 
 'LBL_IMPORT_SF_TITLE'=>'Salesforce.com can export data in the <b>Comma Separated Values</b> format which can be used to import data into the system. To export your data from Salesforce.com, follow the steps below:',
 'LBL_SF_NUM_1'=>'Open your browser, go to http://www.salesforce.com, and login with your email address and password',
-'LBL_SF_NUM_2'=>'Click on the <b>Reports</b> tab on the top menu',
+'LBL_SF_NUM_2'=>'Click on the <b>Reports</b> vtiger_tab on the top menu',
 'LBL_SF_NUM_3'=>'To export Accounts:</b> Click on the <b>Active Accounts</b> link<br><b>To export Contacts:</b> Click on the <b>Mailing List</b> link',
-'LBL_SF_NUM_4'=>'On <b>Step 1: Select your report type</b>, select <b>Tabular Report</b>click <b>Next</b>',
-'LBL_SF_NUM_5'=>'On <b>Step 2: Select the report columns</b>, choose the columns you want to export and click <b>Next</b>',
+'LBL_SF_NUM_4'=>'On <b>Step 1: Select your vtiger_report type</b>, select <b>Tabular Report</b>click <b>Next</b>',
+'LBL_SF_NUM_5'=>'On <b>Step 2: Select the vtiger_report columns</b>, choose the columns you want to export and click <b>Next</b>',
 'LBL_SF_NUM_6'=>'On <b>Step 3: Select the information to summarize</b>, just click <b>Next</b>',
-'LBL_SF_NUM_7'=>'On <b>Step 4: Order the report columns</b>, just click <b>Next</b>',
-'LBL_SF_NUM_8'=>'On <b>Step 5: Select your report criteria</b>, under <b>Start Date</b>, choose a date far enough in the past to include all your Accounts. You can also export a subset of Accounts using more advanced criteria. When you are done, click <b>Run Report</b>',
-'LBL_SF_NUM_9'=>'A report will be generated, and the page should display <b>Report Generation Status: Complete.</b> Now click <b>Export to Excel</b>',
+'LBL_SF_NUM_7'=>'On <b>Step 4: Order the vtiger_report columns</b>, just click <b>Next</b>',
+'LBL_SF_NUM_8'=>'On <b>Step 5: Select your vtiger_report criteria</b>, under <b>Start Date</b>, choose a date far enough in the past to include all your Accounts. You can also export a subset of Accounts using more advanced criteria. When you are done, click <b>Run Report</b>',
+'LBL_SF_NUM_9'=>'A vtiger_report will be generated, and the page should display <b>Report Generation Status: Complete.</b> Now click <b>Export to Excel</b>',
 'LBL_SF_NUM_10'=>'On <b>Export Report:</b>, for <b>Export File Format:</b>, choose <b>Comma Delimited .csv</b>. Click <b>Export</b>.',
 'LBL_SF_NUM_11'=>'A dialog will pop up for you to save the export file to your computer.',
 'LBL_IMPORT_CUSTOM_TITLE'=>'Many applications will allow you to export data into a <b>Comma Delimited text file (.csv)</b>. Generally most applications follow these general steps:',
@@ -105,9 +105,9 @@
 'LBL_STEP_3_TITLE'=>'Step 3 of 4: Confirm Fields and Import',
 'LBL_STEP_1'=>'Step 1 of 3 : ',
 'LBL_STEP_1_TITLE'=>'Select the .CSV File',
-'LBL_STEP_1_TEXT'=> ' vtiger CRM supports importing records from .csv (<b> Comma Separated Values</b> ) files. To start import, browse to locate the .CSV file and click on the Next button to Continue.',
-
-'LBL_SELECT_FIELDS_TO_MAP'=>'In the list below, select the fields in your import file that should be imported into each field in the system. When you are finished, click <b>Import Now</b>',
+'LBL_STEP_1_TEXT'=> ' vtiger CRM supports importing records from .csv (<b> Comma Separated Values</b> ) vtiger_files. To start import, browse to locate the .CSV file and click on the Next button to Continue.',
+
+'LBL_SELECT_FIELDS_TO_MAP'=>'In the list below, select the vtiger_fields in your import file that should be imported into each vtiger_field in the system. When you are finished, click <b>Import Now</b>',
 
 'LBL_DATABASE_FIELD'=>'Database Field',
 'LBL_HEADER_ROW'=>'Header Row',
@@ -119,15 +119,15 @@
 'LBL_CONTACTS_NOTE_4'=>'Fields ending in Address Street 2 and Address Street 3 are concatenated together with the main Address Street Field when inserted into the database.',
 'LBL_ACCOUNTS_NOTE_1'=>'Account Name must be mapped.',
 'LBL_ACCOUNTS_NOTE_2'=>'Fields ending in Address Street 2 and Address Street 3 are concatenated together with the main Address Street Field when inserted into the database.',
-'LBL_POTENTIALS_NOTE_1'=>'Potential Name, Account Name, Date Closed, and Sales Stage are required fields.',
-'LBL_OPPORTUNITIES_NOTE_1'=>'Opportunity Name, Account Name, Date Closed, and Sales Stage are required fields.',
+'LBL_POTENTIALS_NOTE_1'=>'Potential Name, Account Name, Date Closed, and Sales Stage are required vtiger_fields.',
+'LBL_OPPORTUNITIES_NOTE_1'=>'Opportunity Name, Account Name, Date Closed, and Sales Stage are required vtiger_fields.',
 'LBL_LEADS_NOTE_1'=>'Last Name must be mapped.',
 'LBL_LEADS_NOTE_2'=>'Company Name must be mapped.',
 'LBL_IMPORT_NOW'=>'Import Now',
 'LBL_'=>'',
 'LBL_'=>'',
 'LBL_CANNOT_OPEN'=>'Cannot open the imported file for reading',
-'LBL_NOT_SAME_NUMBER'=>'There were not the same number of fields per line in your file',
+'LBL_NOT_SAME_NUMBER'=>'There were not the same number of vtiger_fields per line in your file',
 'LBL_NO_LINES'=>'There were no lines in your import file',
 'LBL_FILE_ALREADY_BEEN_OR'=>'The import file has already been processed or does not exist',
 'LBL_SUCCESS'=>'Success! ',
@@ -135,7 +135,7 @@
 'LBL_LAST_IMPORT_UNDONE'=>'Your Last Import Was Undone',
 'LBL_NO_IMPORT_TO_UNDO'=>'There was no import to undo.',
 'LBL_FAIL'=>'Fail:',
-'LBL_RECORDS_SKIPPED'=>'records skipped because they were missing one or more required fields',
+'LBL_RECORDS_SKIPPED'=>'records skipped because they were missing one or more required vtiger_fields',
 'LBL_IDS_EXISTED_OR_LONGER'=>'records skipped because the id\'s either existed or where longer than 36 characters',
 'LBL_RESULTS'=>'Results',
 'LBL_IMPORT_MORE'=>'Import More',
@@ -143,7 +143,7 @@
 'LBL_UNDO_LAST_IMPORT'=>'Undo Last Import',
 
 'LBL_SUCCESS_1' => 'No. of Records Successfully Imported : ',
-'LBL_SKIPPED_1' => 'No. of Records Skipped as they were missing one or more required fields : ',
+'LBL_SKIPPED_1' => 'No. of Records Skipped as they were missing one or more required vtiger_fields : ',
 
 //Added for patch2 - Products Import Notes
 'LBL_PRODUCTS_NOTE_1'=>'Product Name must be mapped',
@@ -153,13 +153,13 @@
 'LBL_FILE_LOCATION'=>'File Location :',
 'LBL_STEP_2_3'=>'Step 2 of 3 :',
 'LBL_LIST_MAPPING'=>'List & Mapping',
-'LBL_STEP_2_MSG'=>'The following tables shows the imported',
+'LBL_STEP_2_MSG'=>'The following vtiger_tables shows the imported',
 'LBL_STEP_2_MSG1'=>'and other details.',
-'LBL_STEP_2_TXT'=>'To map the fields, Select the corresponding in combo boxes for each',
+'LBL_STEP_2_TXT'=>'To map the vtiger_fields, Select the corresponding in combo boxes for each',
 'LBL_USE_SAVED_MAPPING'=>'Use Saved Mapping :',
 'LBL_MAPPING'=>'Mapping',
 'LBL_HEADERS'=>'Headers :',
-'LBL_ERROR_MULTIPLE'=>'Same fields may be mapped twice. Please check the mapped fields.',
+'LBL_ERROR_MULTIPLE'=>'Same vtiger_fields may be mapped twice. Please check the mapped vtiger_fields.',
 
 );
 

Modified: vtigercrm/trunk/modules/Import/parse_utils.php
==============================================================================
--- vtigercrm/trunk/modules/Import/parse_utils.php (original)
+++ vtigercrm/trunk/modules/Import/parse_utils.php Mon Jun 12 14:26:25 2006
@@ -14,9 +14,9 @@
  ********************************************************************************/
 
 // takes a string and parses it into one record per line,
-// one field per delimiter, to a maximum number of lines
-// some files have a header, some dont.
-// keeps track of which fields are used
+// one vtiger_field per delimiter, to a maximum number of lines
+// some vtiger_files have a header, some dont.
+// keeps track of which vtiger_fields are used
 
 function parse_import($file_name,$delimiter,$max_lines,$has_header)
 {

Modified: vtigercrm/trunk/modules/Invoice/CreatePDF.php
==============================================================================
--- vtigercrm/trunk/modules/Invoice/CreatePDF.php (original)
+++ vtigercrm/trunk/modules/Invoice/CreatePDF.php Mon Jun 12 14:26:25 2006
@@ -15,7 +15,7 @@
 require_once('include/database/PearDatabase.php');
 
 global $adb,$app_strings,$products_per_page;
-$sql="select currency_symbol from currency_info";
+$sql="select vtiger_currency_symbol from vtiger_currency_info";
 $result = $adb->query($sql);
 $currency_symbol = $adb->query_result($result,0,'currency_symbol');
 
@@ -25,7 +25,7 @@
 
 $id = $_REQUEST['record'];
 
-//retreiving the invoice info
+//retreiving the vtiger_invoice info
 $focus = new Invoice();
 $focus->retrieve_entity_info($_REQUEST['record'],"Invoice");
 $account_name = getAccountName($focus->column_fields[account_id]);
@@ -60,7 +60,7 @@
 $status = $focus->column_fields["invoicestatus"];
 
 // Company information
-$add_query = "select * from organizationdetails";
+$add_query = "select * from vtiger_organizationdetails";
 $result = $adb->query($add_query);
 $num_rows = $adb->num_rows($result);
 
@@ -85,7 +85,7 @@
 $price_total = $currency_symbol.number_format(StripLastZero($focus->column_fields["hdnGrandTotal"]),2,'.',',');
 
 //getting the Product Data
-$query="select products.productname,products.unit_price,products.product_description,invoiceproductrel.* from invoiceproductrel inner join products on products.productid=invoiceproductrel.productid where invoiceid=".$id;
+$query="select vtiger_products.productname,vtiger_products.unit_price,vtiger_products.product_description,vtiger_invoiceproductrel.* from vtiger_invoiceproductrel inner join vtiger_products on vtiger_products.productid=vtiger_invoiceproductrel.productid where vtiger_invoiceid=".$id;
 
 global $result;
 $result = $adb->query($query);

Modified: vtigercrm/trunk/modules/Invoice/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/Invoice/EditView.php (original)
+++ vtigercrm/trunk/modules/Invoice/EditView.php Mon Jun 12 14:26:25 2006
@@ -47,7 +47,7 @@
 	$quote_focus->retrieve_entity_info($quoteid,"Quotes");
 	$focus = getConvertQuoteToInvoice($focus,$quote_focus,$quoteid);
 
-	//Added to display the Quote's associated products -- when we create invoice from Quotes DetailView 
+	//Added to display the Quote's associated vtiger_products -- when we create vtiger_invoice from Quotes DetailView 
 	$associated_prod = getAssociatedProducts("Quotes",$quote_focus);
 	$txtTax = (($quote_focus->column_fields['txtTax'] != '')?$quote_focus->column_fields['txtTax']:'0.000');
 	$txtAdj = (($quote_focus->column_fields['txtAdjustment'] != '')?$quote_focus->column_fields['txtAdjustment']:'0.000');
@@ -68,7 +68,7 @@
         $so_focus->retrieve_entity_info($soid,"SalesOrder");
         $focus = getConvertSoToInvoice($focus,$so_focus,$soid);
 
-	//Added to display the SalesOrder's associated products -- when we create invoice from SO DetailView
+	//Added to display the SalesOrder's associated vtiger_products -- when we create vtiger_invoice from SO DetailView
 	$associated_prod = getAssociatedProducts("SalesOrder",$so_focus);
 	$txtTax = (($so_focus->column_fields['txtTax'] != '')?$so_focus->column_fields['txtTax']:'0.000');
 	$txtAdj = (($so_focus->column_fields['txtAdjustment'] != '')?$so_focus->column_fields['txtAdjustment']:'0.000');
@@ -98,7 +98,7 @@
                 }
 
         }
-	//Handling for dateformat in invoicedate field
+	//Handling for dateformat in vtiger_invoicedate vtiger_field
         if($focus->column_fields['invoicedate'] != '')
         {
               $curr_due_date = $focus->column_fields['invoicedate'];
@@ -137,7 +137,7 @@
 			}
 
 		}
-		//Handling for dateformat in invoicedate field
+		//Handling for dateformat in vtiger_invoicedate vtiger_field
                 if($focus->column_fields['invoicedate'] != '')
                 {
                         $curr_due_date = $focus->column_fields['invoicedate'];

Modified: vtigercrm/trunk/modules/Invoice/Invoice.php
==============================================================================
--- vtigercrm/trunk/modules/Invoice/Invoice.php (original)
+++ vtigercrm/trunk/modules/Invoice/Invoice.php Mon Jun 12 14:26:25 2006
@@ -28,25 +28,25 @@
 require_once('data/CRMEntity.php');
 require_once('include/utils/utils.php');
 
-// Account is used to store account information.
+// Account is used to store vtiger_account information.
 class Invoice extends CRMEntity {
 	var $log;
 	var $db;
 
 
-	// Stored fields
+	// Stored vtiger_fields
 	var $id;
 	var $mode;
 	
 		
-	var $table_name = "invoice";
-	var $tab_name = Array('crmentity','invoice','invoicebillads','invoiceshipads','invoicecf');
-	var $tab_name_index = Array('crmentity'=>'crmid','invoice'=>'invoiceid','invoicebillads'=>'invoicebilladdressid','invoiceshipads'=>'invoiceshipaddressid','invoicecf'=>'invoiceid');
+	var $table_name = "vtiger_invoice";
+	var $tab_name = Array('vtiger_crmentity','vtiger_invoice','vtiger_invoicebillads','vtiger_invoiceshipads','vtiger_invoicecf');
+	var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_invoice'=>'invoiceid','vtiger_invoicebillads'=>'invoicebilladdressid','vtiger_invoiceshipads'=>'invoiceshipaddressid','vtiger_invoicecf'=>'invoiceid');
 				
 	
-	var $entity_table = "crmentity";
-	
-	var $billadr_table = "invoicebillads";
+	var $entity_table = "vtiger_crmentity";
+	
+	var $billadr_table = "vtiger_invoicebillads";
 
 	var $object_name = "Invoice";
 
@@ -58,10 +58,10 @@
 
 	var $sortby_fields = Array('subject','crmid','invoicestatus','smownerid');		
 
-	// This is used to retrieve related fields from form posts.
+	// This is used to retrieve related vtiger_fields from form posts.
 	var $additional_column_fields = Array('assigned_user_name', 'smownerid', 'opportunity_id', 'case_id', 'contact_id', 'task_id', 'note_id', 'meeting_id', 'call_id', 'email_id', 'parent_name', 'member_id' );
 
-	// This is the list of fields that are in the lists.
+	// This is the list of vtiger_fields that are in the lists.
 	var $list_fields = Array(
 				'Invoice Id'=>Array('crmentity'=>'crmid'),
 				'Subject'=>Array('invoice'=>'subject'),
@@ -95,7 +95,7 @@
 				        'Subject'=>'subject',
 				      );
 
-	// This is the list of fields that are required.
+	// This is the list of vtiger_fields that are required.
 	var $required_fields =  array("accountname"=>1);
 
 	//Added these variables which are used as default order by and sortorder in ListView
@@ -129,7 +129,7 @@
 
 		$returnset = '&return_module=Invoice&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')";
+		$query = "SELECT vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid, vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and (activitytype='Task' or vtiger_activitytype='Call' or vtiger_activitytype='Meeting') and vtiger_crmentity.deleted=0 and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Completed') and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Deferred') or (vtiger_activity.eventstatus != '' &&  vtiger_activity.eventstatus = 'Planned')";
 		$log->debug("Exiting get_activities method ...");
 		return  GetRelatedList('Invoice','Activities',$focus,$query,$button,$returnset);
 	}
@@ -137,20 +137,20 @@
 	{
 		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
-			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
-				inner join users on crmentity.smcreatorid= users.id
-				left join activitygrouprelation on activitygrouprelation.activityid=activity.activityid
-                                left join groups on groups.groupname=activitygrouprelation.groupname	
-			where (activity.activitytype = 'Meeting' or activity.activitytype='Call' or activity.activitytype='Task')
-				and (activity.status = 'Completed' or activity.status = 'Deferred' or (activity.eventstatus != 'Planned' and activity.eventstatus != ''))
-				and seactivityrel.crmid=".$id;
+		$query = "SELECT vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid,
+			vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime,
+			vtiger_crmentity.createdtime, vtiger_crmentity.description, vtiger_users.user_name
+			from vtiger_activity
+				inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid
+				inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid
+				left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid
+				left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid
+				inner join vtiger_users on vtiger_crmentity.smcreatorid= vtiger_users.id
+				left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_activity.activityid
+                                left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname	
+			where (vtiger_activity.activitytype = 'Meeting' or vtiger_activity.activitytype='Call' or vtiger_activity.activitytype='Task')
+				and (vtiger_activity.status = 'Completed' or vtiger_activity.status = 'Deferred' or (vtiger_activity.eventstatus != 'Planned' and vtiger_activity.eventstatus != ''))
+				and vtiger_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 ...");
@@ -161,35 +161,35 @@
 		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
-		$query = "select notes.title,'Notes      '  ActivityType, notes.filename,
-			attachments.type  FileType,crm2.modifiedtime lastmodified,
-			seattachmentsrel.attachmentsid attachmentsid, notes.notesid crmid,
-			crm2.createdtime, notes.notecontent description, users.user_name
-		from notes
-			inner join senotesrel on senotesrel.notesid= notes.notesid
-			inner join crmentity on crmentity.crmid= senotesrel.crmid
-			inner join crmentity crm2 on crm2.crmid=notes.notesid and crm2.deleted=0
-			left join seattachmentsrel  on seattachmentsrel.crmid =notes.notesid
-			left join attachments on seattachmentsrel.attachmentsid = attachments.attachmentsid
-			inner join users on crm2.smcreatorid= users.id
-		where crmentity.crmid=".$id;
+		// Desc: Inserted crm2.createdtime, vtiger_notes.notecontent description, vtiger_users.user_name
+		// Inserted inner join vtiger_users on crm2.smcreatorid= vtiger_users.id
+		$query = "select vtiger_notes.title,'Notes      '  ActivityType, vtiger_notes.filename,
+		vtiger_attachments.type  FileType,crm2.modifiedtime lastmodified,
+		vtiger_seattachmentsrel.attachmentsid vtiger_attachmentsid, vtiger_notes.notesid crmid,
+			crm2.createdtime, vtiger_notes.notecontent description, vtiger_users.user_name
+		from vtiger_notes
+			inner join vtiger_senotesrel on vtiger_senotesrel.notesid= vtiger_notes.notesid
+			inner join vtiger_crmentity on vtiger_crmentity.crmid= vtiger_senotesrel.crmid
+			inner join vtiger_crmentity crm2 on crm2.crmid=vtiger_notes.notesid and crm2.deleted=0
+			left join vtiger_seattachmentsrel  on vtiger_seattachmentsrel.crmid =vtiger_notes.notesid
+			left join vtiger_attachments on vtiger_seattachmentsrel.attachmentsid = vtiger_attachments.attachmentsid
+			inner join vtiger_users on crm2.smcreatorid= vtiger_users.id
+		where vtiger_crmentity.crmid=".$id;
 		$query .= ' union all ';
 		// Armando L?scher 18.10.2005 -> ?visibleDescription
-		// Desc: Inserted crm2.createdtime, attachments.description, users.user_name
-		// Inserted inner join users on crm2.smcreatorid= users.id
+		// Desc: Inserted crm2.createdtime, vtiger_attachments.description, vtiger_users.user_name
+		// Inserted inner join vtiger_users on crm2.smcreatorid= vtiger_users.id
 		// Inserted order by createdtime desc
-		$query .= "select attachments.description  title ,'Attachments'  ActivityType,
-			attachments.name filename, attachments.type FileType, crm2.modifiedtime lastmodified,
-			attachments.attachmentsid attachmentsid, seattachmentsrel.attachmentsid crmid,
-			crm2.createdtime, attachments.description, users.user_name
-		from attachments
-			inner join seattachmentsrel on seattachmentsrel.attachmentsid= attachments.attachmentsid
-			inner join crmentity on crmentity.crmid= seattachmentsrel.crmid
-			inner join crmentity crm2 on crm2.crmid=attachments.attachmentsid
-			inner join users on crm2.smcreatorid= users.id
-		where crmentity.crmid=".$id;
+		$query .= "select vtiger_attachments.description  title ,'Attachments'  ActivityType,
+		vtiger_attachments.name filename, vtiger_attachments.type FileType, crm2.modifiedtime lastmodified,
+		vtiger_attachments.attachmentsid vtiger_attachmentsid, vtiger_seattachmentsrel.attachmentsid crmid,
+			crm2.createdtime, vtiger_attachments.description, vtiger_users.user_name
+		from vtiger_attachments
+			inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid= vtiger_attachments.attachmentsid
+			inner join vtiger_crmentity on vtiger_crmentity.crmid= vtiger_seattachmentsrel.crmid
+			inner join vtiger_crmentity crm2 on crm2.crmid=vtiger_attachments.attachmentsid
+			inner join vtiger_users on crm2.smcreatorid= vtiger_users.id
+		where vtiger_crmentity.crmid=".$id;
 		$log->debug("Exiting get_attachments method ...");
 		return getAttachmentsAndNotes('Invoice',$query,$id);
 	}

Modified: vtigercrm/trunk/modules/Invoice/ListTopInvoice.php
==============================================================================
--- vtigercrm/trunk/modules/Invoice/ListTopInvoice.php (original)
+++ vtigercrm/trunk/modules/Invoice/ListTopInvoice.php Mon Jun 12 14:26:25 2006
@@ -52,7 +52,7 @@
 	$date_var = date('Y-m-d');
 
 	//Changed for Patch 2 by Don
-	$where = ' and crmentity.smownerid='.$current_user->id.' and  invoice.invoicestatus != \'Paid\' ORDER BY total DESC';
+	$where = ' and vtiger_crmentity.smownerid='.$current_user->id.' and  vtiger_invoice.invoicestatus != \'Paid\' ORDER BY total DESC';
 	$query = getListQuery("Invoice",$where);
 
 	//<<<<<<<<customview>>>>>>>>>

Modified: vtigercrm/trunk/modules/Invoice/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Invoice/Save.php (original)
+++ vtigercrm/trunk/modules/Invoice/Save.php Mon Jun 12 14:26:25 2006
@@ -34,11 +34,11 @@
 
 $focus->save("Invoice");
 
-//Checking if salesorderid is present and updating the quote status
+//Checking if vtiger_salesorderid is present and updating the quote status
 if($focus->column_fields["salesorder_id"] != '')
 {
         $so_id = $focus->column_fields["salesorder_id"];
-        $query1 = "update salesorder set sostatus='Approved' where salesorderid=".$so_id;
+        $query1 = "update vtiger_salesorder set vtiger_sostatus='Approved' where vtiger_salesorderid=".$so_id;
         $adb->query($query1);
 }
 
@@ -46,7 +46,7 @@
 $ext_prod_arr = Array();
 if($focus->mode == 'edit')
 {
-	$query2  = "select * from invoiceproductrel where invoiceid=".$focus->id;
+	$query2  = "select * from vtiger_invoiceproductrel where vtiger_invoiceid=".$focus->id;
 	$result2 = $adb->query($query2);
 	$num_rows = $adb->num_rows($result2);
 	for($i=0; $i<$num_rows;$i++)
@@ -56,7 +56,7 @@
 		$ext_prod_arr[$pro_id] = $pro_qty;	
 	}	
 
-        $query1 = "delete from invoiceproductrel where invoiceid=".$focus->id;
+        $query1 = "delete from vtiger_invoiceproductrel where vtiger_invoiceid=".$focus->id;
         $adb->query($query1);
 
 }
@@ -84,7 +84,7 @@
         if($prod_status != 'D')
         {
 
-                $query ="insert into invoiceproductrel values($focus->id, $prod_id, $qty, $listprice, $vat, $sales, $service)";
+                $query ="insert into vtiger_invoiceproductrel values($focus->id, $prod_id, $qty, $listprice, $vat, $sales, $service)";
                 $adb->query($query);
 		//Updating the Quantity in Stock in the Product Table
 		updateStk($prod_id,$qty,$focus->mode,$ext_prod_arr,'Invoice');

Modified: vtigercrm/trunk/modules/Invoice/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Invoice/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Invoice/language/en_us.lang.php Mon Jun 12 14:26:25 2006
@@ -83,10 +83,10 @@
 'NTC_COPY_SHIPPING_ADDRESS'=>'Copy shipping address to billing address',
 'NTC_REMOVE_MEMBER_ORG_CONFIRMATION'=>'Are you sure you want to remove this record as a member organization?',
 'LBL_DUPLICATE'=>'Potential Duplicate Accounts',
-'MSG_DUPLICATE' => 'Creating this account may potentialy create a duplicate account. You may either select an account from the list below or you may click on Create New Account to continue creating a new account with the previously entered data.',
+'MSG_DUPLICATE' => 'Creating this vtiger_account may vtiger_potentialy create a duplicate vtiger_account. You may either select an vtiger_account from the list below or you may click on Create New Account to continue creating a new vtiger_account with the previously entered data.',
 
 'LBL_INVITEE'=>'Contacts',
-'ERR_DELETE_RECORD'=>"A record number must be specified to delete the account.",
+'ERR_DELETE_RECORD'=>"A record number must be specified to delete the vtiger_account.",
 
 'LBL_SELECT_ACCOUNT'=>'Select Account',
 'LBL_GENERAL_INFORMATION'=>'General Information',
@@ -106,7 +106,7 @@
 'LBL_NEW_CONTACT'=>'New Contact',
 'LBL_CONTACT_TITLE'=>'Contacts',
 
-//Added fields after RC1 - Release
+//Added vtiger_fields after RC1 - Release
 'LBL_ALL'=>'All',
 'LBL_PROSPECT'=>'Prospect',
 'LBL_INVESTOR'=>'Investor',
@@ -120,7 +120,7 @@
 'Quote Name'=>'Quote Name',
 'Vendor Name'=>'Vendor Name',
 'Invoice Terms'=>'Invoice Terms',
-'Contact Name'=>'Contact Name',//to include contact name field in Invoice
+'Contact Name'=>'Contact Name',//to include contact name vtiger_field in Invoice
 'Invoice Date'=>'Invoice Date',
 'Sub Total'=>'Sub Total',
 'Due Date'=>'Due Date',

Modified: vtigercrm/trunk/modules/Invoice/pdf_templates/header.php
==============================================================================
--- vtigercrm/trunk/modules/Invoice/pdf_templates/header.php (original)
+++ vtigercrm/trunk/modules/Invoice/pdf_templates/header.php Mon Jun 12 14:26:25 2006
@@ -67,7 +67,7 @@
 $dueBlock=array("80","65");
 $pdf->addRecBlock($valid_till, "Due Date",$dueBlock);
 
-// invoice number block
+// vtiger_invoice number block
 $invBlock=array("145","65");
 $pdf->addRecBlock($id, "Invoice Number",$invBlock);
 

Modified: vtigercrm/trunk/modules/Leads/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/Leads/CallRelatedList.php Mon Jun 12 14:26:25 2006
@@ -47,7 +47,7 @@
        unset($_SESSION['rlvs']);
  }
 	
-$sql1 = $adb->query('select campaignid from leaddetails where leadid='.$focus->id);
+$sql1 = $adb->query('select vtiger_campaignid from vtiger_leaddetails where leadid='.$focus->id);
 $campaignid = $adb->query_result($sql1,0,'campaignid');
 if($campaignid == 0) $campaignid='';
 $smarty->assign("campaignid",$campaignid);

Modified: vtigercrm/trunk/modules/Leads/ConvertLead.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/ConvertLead.php (original)
+++ vtigercrm/trunk/modules/Leads/ConvertLead.php Mon Jun 12 14:26:25 2006
@@ -27,7 +27,7 @@
 }
 
 //Retreive lead details from database
-$sql = "SELECT firstname, lastname, company, smownerid from leaddetails inner join crmentity on crmentity.crmid=leaddetails.leadid where leaddetails.leadid =".$id;
+$sql = "SELECT firstname, lastname, company, smownerid from vtiger_leaddetails inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_leaddetails.leadid where vtiger_leaddetails.leadid =".$id;
 $result = $adb->query($sql);
 $row = $adb->fetch_array($result);
 
@@ -38,7 +38,7 @@
 $company = $row["company"];
 $log->debug(" the company is  ".$company);
 $potentialname = $row["company"] ."-";
-$log->debug(" the potentialname is ".$potentialname);
+$log->debug(" the vtiger_potentialname is ".$potentialname);
 $userid = $row["smownerid"];
 $log->debug(" the userid is ".$userid);
 
@@ -48,7 +48,7 @@
 
 $date_format = parse_calendardate($app_strings['NTC_DATE_FORMAT']);
 
-$sales_stage_query="select * from sales_stage";
+$sales_stage_query="select * from vtiger_sales_stage";
 $sales_stage_result = $adb->query($sales_stage_query);
 $noofsalesRows = $adb->num_rows($sales_stage_result);
 $sales_stage_fld = '';
@@ -114,13 +114,13 @@
 						<tr>
 							<td align="right" class="dvtCellLabel" width="50%"><font color="red">*</font>'.$mod_strings['LBL_POTENTIAL_NAME'].'</td>
 							<td class="dvtCellInfo" width="50%">
-							<input name="potential_name" value="'.$potentialname.'" tabindex="3">
+							<input name="potential_name" value="'.$potentialname.'" vtiger_tabindex="3">
                                                         </td>
 						</tr>
 						<tr>
 							<td align="right" class="dvtCellLabel"><font color="red">*</font>'.$mod_strings['LBL_POTENTIAL_CLOSE_DATE'].'</td>
 							<td class="dvtCellInfo">
-								<input name="closedate" class="dvtCellInfo" id="jscal_field" type="text" tabindex="4" size="10" maxlength="10" value="'.$focus->closedate.'">
+								<input name="closedate" class="dvtCellInfo" id="jscal_field" type="text" vtiger_tabindex="4" size="10" maxlength="10" value="'.$focus->closedate.'">
 								<font size=1><em old="(yyyy-mm-dd)">('.$current_user->date_format.')</em></font>
 							</td>
 						</tr>

Modified: vtigercrm/trunk/modules/Leads/Forms.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/Forms.php (original)
+++ vtigercrm/trunk/modules/Leads/Forms.php Mon Jun 12 14:26:25 2006
@@ -66,7 +66,7 @@
 }
 
 /**
- * Create HTML form to enter a new record with the minimum necessary fields.
+ * Create HTML form to enter a new record with the minimum necessary vtiger_fields.
  */
 
  
@@ -95,7 +95,7 @@
 
 $qcreate_form = get_left_form_header($mod_strings['LBL_NEW_FORM_TITLE']);
 
-$qcreate_get_field="select * from field where tabid=7 and quickcreate=0 order by quickcreatesequence";
+$qcreate_get_field="select * from vtiger_field where vtiger_tabid=7 and quickcreate=0 order by quickcreatesequence";
 $qcreate_get_result=$adb->query($qcreate_get_field);
 $qcreate_get_noofrows=$adb->num_rows($qcreate_get_result);
 
@@ -179,9 +179,9 @@
 $qcreate_form.='</form>';
 $qcreate_form.='<script type="text/javascript">
 		
-	var fieldname = new Array('.$fieldName.')
-	var fieldlabel = new Array('.$fieldLabel.')
-	var fielddatatype = new Array('.$fldDataType.')
+	var vtiger_fieldname = new Array('.$fieldName.')
+	var vtiger_fieldlabel = new Array('.$fieldLabel.')
+	var vtiger_fielddatatype = new Array('.$fldDataType.')
 
 		</script>';
 

Modified: vtigercrm/trunk/modules/Leads/Lead.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/Lead.php (original)
+++ vtigercrm/trunk/modules/Leads/Lead.php Mon Jun 12 14:26:25 2006
@@ -30,12 +30,12 @@
 
 	var $module_id = "leadid";
 
-	var $tab_name = Array('crmentity','leaddetails','leadsubdetails','leadaddress','leadscf');
-	var $tab_name_index = Array('crmentity'=>'crmid','leaddetails'=>'leadid','leadsubdetails'=>'leadsubscriptionid','leadaddress'=>'leadaddressid','leadscf'=>'leadid');
-
-
-	var $entity_table = "crmentity";
-	var $table_name = "leaddetails";
+	var $tab_name = Array('vtiger_crmentity','vtiger_leaddetails','vtiger_leadsubdetails','vtiger_leadaddress','vtiger_leadscf');
+	var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_leaddetails'=>'leadid','vtiger_leadsubdetails'=>'leadsubscriptionid','vtiger_leadaddress'=>'leadaddressid','vtiger_leadscf'=>'leadid');
+
+
+	var $entity_table = "vtiger_crmentity";
+	var $table_name = "vtiger_leaddetails";
 
 	var $object_name = "Lead";
 
@@ -53,10 +53,10 @@
 	,'rating'=>'rating_dom'
 	,'licencekey'=>'licensekey_dom');
 
-	// This is used to retrieve related fields from form posts.
+	// This is used to retrieve related vtiger_fields from form posts.
 	var $additional_column_fields = Array('smcreatorid', 'smownerid', 'contactid','potentialid' ,'crmid');
 
-	// This is the list of fields that are in the lists.
+	// This is the list of vtiger_fields that are in the lists.
 	var $list_fields = Array(
 		'Last Name'=>Array('leaddetails'=>'lastname'),
 		'First Name'=>Array('leaddetails'=>'firstname'),
@@ -138,36 +138,36 @@
 		{
 
 			$query = $this->constructCustomQueryAddendum('leadscf','Leads') . " 
-				leaddetails.*, ".$this->entity_table.".*, leadsubdetails.*,leadaddress.city city, leadaddress.state state,leadaddress.code code,leadaddress.country country, leadaddress.phone phone, users.user_name, users.status user_status
+			vtiger_leaddetails.*, ".$this->entity_table.".*, vtiger_leadsubdetails.*,vtiger_leadaddress.city city, vtiger_leadaddress.state state,vtiger_leadaddress.code code,vtiger_leadaddress.country country, vtiger_leadaddress.phone phone, vtiger_users.user_name, vtiger_users.status user_status
 				FROM ".$this->entity_table."
-				INNER JOIN leaddetails
-				ON crmentity.crmid=leaddetails.leadid
-				LEFT JOIN leadaddress 
-				ON leaddetails.leadid=leadaddress.leadaddressid
-				LEFT JOIN leadsubdetails
-				ON leaddetails.leadid=leadsubdetails.leadsubscriptionid
-				LEFT JOIN leadscf 
-				ON leadscf.leadid=leaddetails.leadid
-				LEFT JOIN users
-				ON crmentity.smownerid = users.id ";
+				INNER JOIN vtiger_leaddetails
+				ON vtiger_crmentity.crmid=vtiger_leaddetails.leadid
+				LEFT JOIN vtiger_leadaddress 
+				ON vtiger_leaddetails.leadid=vtiger_leadaddress.leadaddressid
+				LEFT JOIN vtiger_leadsubdetails
+				ON vtiger_leaddetails.leadid=vtiger_leadsubdetails.leadsubscriptionid
+				LEFT JOIN vtiger_leadscf 
+				ON vtiger_leadscf.leadid=vtiger_leaddetails.leadid
+				LEFT JOIN vtiger_users
+				ON vtiger_crmentity.smownerid = vtiger_users.id ";
 
 		}
 		else
 		{
 			$query = "SELECT 
-				leaddetails.*, ".$this->entity_table.".*, leadsubdetails.*,leadaddress.*,users.user_name, users.status user_status FROM ".$this->entity_table."
-				INNER JOIN leaddetails
-				ON crmentity.crmid=leaddetails.leadid
-				LEFT JOIN leadsubdetails
-				ON leaddetails.leadid = leadsubdetails.leadsubscriptionid
-				LEFT JOIN leadaddress
-				ON leaddetails.leadid=leadaddress.leadaddressid
-				LEFT JOIN users
-				ON crmentity.smownerid = users.id ";
+			vtiger_leaddetails.*, ".$this->entity_table.".*, vtiger_leadsubdetails.*,vtiger_leadaddress.*,vtiger_users.user_name, vtiger_users.status user_status FROM ".$this->entity_table."
+				INNER JOIN vtiger_leaddetails
+				ON vtiger_crmentity.crmid=vtiger_leaddetails.leadid
+				LEFT JOIN vtiger_leadsubdetails
+				ON vtiger_leaddetails.leadid = vtiger_leadsubdetails.leadsubscriptionid
+				LEFT JOIN vtiger_leadaddress
+				ON vtiger_leaddetails.leadid=vtiger_leadaddress.leadaddressid
+				LEFT JOIN vtiger_users
+				ON vtiger_crmentity.smownerid = vtiger_users.id ";
 		}
 
-		$where_auto = " users.status='Active'
-			AND crmentity.deleted=0 AND leaddetails.converted =0";
+		$where_auto = " vtiger_users.status='Active'
+			AND vtiger_crmentity.deleted=0 AND vtiger_leaddetails.converted =0";
 
 		if($where != "")
 			$query .= "where ($where) AND ".$where_auto;
@@ -203,7 +203,7 @@
 
 
 	// First, get the list of IDs.
-	$query = "SELECT contactdetails.lastname, contactdetails.firstname, contactdetails.contactid, 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 != 'Held')";
+	$query = "SELECT vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid, vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name,vtiger_recurringevents.recurringtype from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and (activitytype='Task' or vtiger_activitytype='Call' or vtiger_activitytype='Meeting') and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Completed') and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Deferred') or (vtiger_activity.eventstatus !='' && vtiger_activity.eventstatus != 'Held')";
 	$log->debug("Exiting get_activities method ...");
 	return  GetRelatedList('Leads','Activities',$focus,$query,$button,$returnset);
 }
@@ -228,7 +228,7 @@
 	}
 	$returnset = '&return_module=Leads&return_action=DetailView&return_id='.$id;
 
-	$query ="select activity.activityid, activity.subject, activity.semodule, activity.activitytype, activity.date_start, activity.status, activity.priority, 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 inner join users on  users.id=crmentity.smownerid where activity.activitytype='Emails' and crmentity.deleted=0 and seactivityrel.crmid=".$id;
+	$query ="select vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.semodule, vtiger_activity.activitytype, vtiger_activity.date_start, vtiger_activity.status, vtiger_activity.priority, vtiger_crmentity.crmid,vtiger_crmentity.smownerid,vtiger_crmentity.modifiedtime, vtiger_users.user_name from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid inner join vtiger_users on  vtiger_users.id=vtiger_crmentity.smownerid where vtiger_activity.activitytype='Emails' and vtiger_crmentity.deleted=0 and vtiger_seactivityrel.crmid=".$id;
 	$log->debug("Exiting get_emails method ...");
 	return GetRelatedList('Leads','Emails',$focus,$query,$button,$returnset);
 }
@@ -237,21 +237,21 @@
 {
 	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,
-		crmentity.createdtime, crmentity.description, users.user_name,activitygrouprelation.groupname
-			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 activitygrouprelation on activitygrouprelation.activityid=activity.activityid
-			left join groups on groups.groupname=activitygrouprelation.groupname 
-			left join users on crmentity.smownerid= users.id
-			where (activity.activitytype = 'Meeting' or activity.activitytype='Call' or activity.activitytype='Task')
-			and (activity.status = 'Completed' or activity.status = 'Deferred' or (activity.eventstatus = 'Held' and activity.eventstatus != ''))
-			and seactivityrel.crmid=".$id;
+	$query = "SELECT vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.status,
+	vtiger_activity.eventstatus, vtiger_activity.activitytype, vtiger_contactdetails.contactid,
+	vtiger_contactdetails.firstname, vtiger_contactdetails.lastname, vtiger_crmentity.modifiedtime,
+	vtiger_crmentity.createdtime, vtiger_crmentity.description, vtiger_users.user_name,vtiger_activitygrouprelation.groupname
+			from vtiger_activity
+			inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid
+			inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid
+			left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid
+			left join vtiger_contactdetails on vtiger_contactdetails.contactid= vtiger_cntactivityrel.contactid
+			left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_activity.activityid
+			left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname 
+			left join vtiger_users on vtiger_crmentity.smownerid= vtiger_users.id
+			where (vtiger_activity.activitytype = 'Meeting' or vtiger_activity.activitytype='Call' or vtiger_activity.activitytype='Task')
+			and (vtiger_activity.status = 'Completed' or vtiger_activity.status = 'Deferred' or (vtiger_activity.eventstatus = 'Held' and vtiger_activity.eventstatus != ''))
+			and vtiger_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 ...");
@@ -263,35 +263,35 @@
 	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
-	$query = "select notes.title,'Notes      ' ActivityType, notes.filename,
-		attachments.type  FileType,crm2.modifiedtime lastmodified,
-		seattachmentsrel.attachmentsid attachmentsid, notes.notesid crmid,
-		crm2.createdtime, notes.notecontent description, users.user_name
-			from notes
-			inner join senotesrel on senotesrel.notesid= notes.notesid
-			inner join crmentity on crmentity.crmid= senotesrel.crmid
-			inner join crmentity crm2 on crm2.crmid=notes.notesid and crm2.deleted=0
-			left join seattachmentsrel  on seattachmentsrel.crmid =notes.notesid
-			left join attachments on seattachmentsrel.attachmentsid = attachments.attachmentsid
-			inner join users on crm2.smcreatorid= users.id
-			where crmentity.crmid=".$id;
+	// Desc: Inserted crm2.createdtime, vtiger_notes.notecontent description, vtiger_users.user_name
+	// Inserted inner join vtiger_users on crm2.smcreatorid= vtiger_users.id
+	$query = "select vtiger_notes.title,'Notes      ' ActivityType, vtiger_notes.filename,
+	vtiger_attachments.type  FileType,crm2.modifiedtime lastmodified,
+	vtiger_seattachmentsrel.attachmentsid vtiger_attachmentsid, vtiger_notes.notesid crmid,
+		crm2.createdtime, vtiger_notes.notecontent description, vtiger_users.user_name
+			from vtiger_notes
+			inner join vtiger_senotesrel on vtiger_senotesrel.notesid= vtiger_notes.notesid
+			inner join vtiger_crmentity on vtiger_crmentity.crmid= vtiger_senotesrel.crmid
+			inner join vtiger_crmentity crm2 on crm2.crmid=vtiger_notes.notesid and crm2.deleted=0
+			left join vtiger_seattachmentsrel  on vtiger_seattachmentsrel.crmid =vtiger_notes.notesid
+			left join vtiger_attachments on vtiger_seattachmentsrel.attachmentsid = vtiger_attachments.attachmentsid
+			inner join vtiger_users on crm2.smcreatorid= vtiger_users.id
+			where vtiger_crmentity.crmid=".$id;
 	$query .= ' union all ';
 	// Armando L?scher 18.10.2005 -> ?visibleDescription
-	// Desc: Inserted crm2.createdtime, attachments.description, users.user_name
-	// Inserted inner join users on crm2.smcreatorid= users.id
+	// Desc: Inserted crm2.createdtime, vtiger_attachments.description, vtiger_users.user_name
+	// Inserted inner join vtiger_users on crm2.smcreatorid= vtiger_users.id
 	// Inserted order by createdtime desc
-	$query .= "select attachments.description title ,'Attachments' ActivityType,
-		attachments.name filename, attachments.type FileType,crm2.modifiedtime lastmodified,
-		attachments.attachmentsid attachmentsid, seattachmentsrel.attachmentsid crmid,
-		crm2.createdtime, attachments.description, users.user_name
-			from attachments
-			inner join seattachmentsrel on seattachmentsrel.attachmentsid= attachments.attachmentsid
-			inner join crmentity on crmentity.crmid= seattachmentsrel.crmid
-			inner join crmentity crm2 on crm2.crmid=attachments.attachmentsid
-			inner join users on crm2.smcreatorid= users.id
-			where crmentity.crmid=".$id."
+	$query .= "select vtiger_attachments.description title ,'Attachments' ActivityType,
+	vtiger_attachments.name filename, vtiger_attachments.type FileType,crm2.modifiedtime lastmodified,
+	vtiger_attachments.attachmentsid vtiger_attachmentsid, vtiger_seattachmentsrel.attachmentsid crmid,
+		crm2.createdtime, vtiger_attachments.description, vtiger_users.user_name
+			from vtiger_attachments
+			inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid= vtiger_attachments.attachmentsid
+			inner join vtiger_crmentity on vtiger_crmentity.crmid= vtiger_seattachmentsrel.crmid
+			inner join vtiger_crmentity crm2 on crm2.crmid=vtiger_attachments.attachmentsid
+			inner join vtiger_users on crm2.smcreatorid= vtiger_users.id
+			where vtiger_crmentity.crmid=".$id."
 			order by createdtime desc";
 
 	$log->debug("Exiting get_attachments method ...");
@@ -316,7 +316,7 @@
 	}
 	$returnset = '&return_module=Leads&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 from products inner join seproductsrel on products.productid = seproductsrel.productid inner join crmentity on crmentity.crmid = products.productid inner join leaddetails on leaddetails.leadid = seproductsrel.crmid  where leaddetails.leadid = '.$id.' and crmentity.deleted = 0';
+	$query = 'select vtiger_products.productid, vtiger_products.productname, vtiger_products.productcode, vtiger_products.commissionrate, vtiger_products.qty_per_unit, vtiger_products.unit_price, vtiger_crmentity.crmid, vtiger_crmentity.smownerid from vtiger_products inner join vtiger_seproductsrel on vtiger_products.productid = vtiger_seproductsrel.productid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_products.productid inner join vtiger_leaddetails on vtiger_leaddetails.leadid = vtiger_seproductsrel.crmid  where vtiger_leaddetails.leadid = '.$id.' and vtiger_crmentity.deleted = 0';
 	$log->debug("Exiting get_products method ...");
 	return  GetRelatedList('Leads','Products',$focus,$query,$button,$returnset);
 }
@@ -335,7 +335,7 @@
 {
 	global $log;
 	$log->debug("Entering getColumnNames_Lead() method ...");
-	$sql1 = "select fieldlabel from field where tabid=7";
+	$sql1 = "select vtiger_fieldlabel from vtiger_field where vtiger_tabid=7";
 	$result = $this->db->query($sql1);
 	$numRows = $this->db->num_rows($result);
 	for($i=0; $i < $numRows;$i++)

Modified: vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php (original)
+++ vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php Mon Jun 12 14:26:25 2006
@@ -40,7 +40,7 @@
 if($check_unit[1] == "")
         $potential_name = $check_unit[0];
 
-//Retrieve info from all the tables related to leads
+//Retrieve info from all the vtiger_tables related to leads
   $focus = new Lead();
  $focus->retrieve_entity_info($id,"Leads");
 
@@ -54,48 +54,48 @@
 
 $crmid = $adb->getUniqueID("crmentity");
 
-//function for getting the custom values from leads and saving to account/contact/potential custom fields -Jag
+//function for getting the custom values from leads and saving to vtiger_account/contact/potential custom vtiger_fields -Jag
 function getInsertValues($type,$type_id)
 {
 	global $id,$adb,$log;
 	$log->debug("Entering getInsertValues(".$type.",".$type_id.") method ...");
-	$sql_convert_lead="select * from convertleadmapping ";
+	$sql_convert_lead="select * from vtiger_convertleadmapping ";
 	$convert_result = $adb->query($sql_convert_lead);
 	$noofrows = $adb->num_rows($convert_result);
 
 	for($i=0;$i<$noofrows;$i++)
 	{
 		$flag="false";
-	 	$log->info("In convertleadmapping function");
+	 	$log->info("In vtiger_convertleadmapping function");
 		$lead_id=$adb->query_result($convert_result,$i,"leadfid");  
-		//Getting the relatd customfields for Accounts/Contact/potential from convertleadmapping table	
+		//Getting the relatd customfields for Accounts/Contact/potential from vtiger_convertleadmapping vtiger_table	
 		$account_id_val=$adb->query_result($convert_result,$i,"accountfid");
 		$contact_id_val=$adb->query_result($convert_result,$i,"contactfid");
 		$potential_id_val=$adb->query_result($convert_result,$i,"potentialfid");
 		
-		$sql_leads_column="select field.fieldid,field.columnname from field,tab where field.tabid=tab.tabid and generatedtype=2 and tab.name='Leads' and fieldid=".$lead_id; //getting the columnname for the customfield of the lead
-
-		 $log->debug("Lead's custom field coumn name is ".$sql_leads_column);
+		$sql_leads_column="select vtiger_field.fieldid,vtiger_field.columnname from vtiger_field,tab where vtiger_field.tabid=vtiger_tab.tabid and generatedtype=2 and vtiger_tab.name='Leads' and vtiger_fieldid=".$lead_id; //getting the columnname for the customfield of the lead
+
+		 $log->debug("Lead's custom vtiger_field coumn name is ".$sql_leads_column);
 
 		$lead_column_result = $adb->query($sql_leads_column);
 		$leads_no_rows = $adb->num_rows($lead_column_result);
 		if($leads_no_rows>0)
 		{
 			$lead_column_name=$adb->query_result($lead_column_result,0,"columnname");
-			$sql_leads_val="select ".$lead_column_name." from leadscf where leadid=".$id; //custom field value for lead
+			$sql_leads_val="select ".$lead_column_name." from vtiger_leadscf where leadid=".$id; //custom vtiger_field value for lead
 			$lead_val_result = $adb->query($sql_leads_val);
 			$lead_value=$adb->query_result($lead_val_result,0,$lead_column_name);
-			 $log->debug("Lead's custom field value is ".$lead_value);
+			 $log->debug("Lead's custom vtiger_field value is ".$lead_value);
 		}	
-		//Query for getting the column name for Accounts/Contacts/Potentials if custom field for lead is mappped
-		$sql_type="select field.fieldid,field.columnname from field,tab where field.tabid=tab.tabid and generatedtype=2 and tab.name="; 
+		//Query for getting the column name for Accounts/Contacts/Potentials if custom vtiger_field for lead is mappped
+		$sql_type="select vtiger_field.fieldid,vtiger_field.columnname from vtiger_field,tab where vtiger_field.tabid=vtiger_tab.tabid and generatedtype=2 and vtiger_tab.name="; 
 		if($type=="Accounts")
 		{
 			if($account_id_val!="" && $account_id_val!=0)	
 			{
 				$flag="true";
-				 $log->info("Getting the  Accounts custom field column name  ");
-				$sql_type.="'Accounts' and fieldid=".$account_id_val;
+				 $log->info("Getting the  Accounts custom vtiger_field column name  ");
+				$sql_type.="'Accounts' and vtiger_fieldid=".$account_id_val;
 			}
 		}
 		else if($type == "Contacts")
@@ -103,8 +103,8 @@
 			if($contact_id_val!="" && $contact_id_val!=0)	
 			{
 				$flag="true";
-				 $log->info("Getting the  Contacts custom field column name  ");
-				$sql_type.="'Contacts' and fieldid=".$contact_id_val;
+				 $log->info("Getting the  Contacts custom vtiger_field column name  ");
+				$sql_type.="'Contacts' and vtiger_fieldid=".$contact_id_val;
 			}
 		}
 		else if($type == "Potentials")
@@ -112,8 +112,8 @@
 			if($potential_id_val!="" && $potential_id_val!=0)
                         {
 				$flag="true";
-                                  $log->info("Getting the  Potentials custom field column name  ");
-				$sql_type.="'Potentials' and fieldid=".$potential_id_val;
+                                  $log->info("Getting the  Potentials custom vtiger_field column name  ");
+				$sql_type.="'Potentials' and vtiger_fieldid=".$potential_id_val;
                         }
 
 		}
@@ -145,7 +145,7 @@
 	global $adb,$log,$id;
 	$log->debug("Entering getRelatedNotesAttachments(".$id.",".$accountid.") method ...");
 	
-	$sql_lead_notes	="select * from senotesrel where crmid=".$id;
+	$sql_lead_notes	="select * from vtiger_senotesrel where crmid=".$id;
 	$lead_notes_result = $adb->query($sql_lead_notes);
 	$noofrows = $adb->num_rows($lead_notes_result);
 
@@ -154,14 +154,14 @@
 
 		$lead_related_note_id=$adb->query_result($lead_notes_result,$i,"notesid");
 		 $log->debug("Lead related note id ".$lead_related_note_id);
-		$sql_delete_lead_notes="delete from senotesrel where crmid=".$id;
+		$sql_delete_lead_notes="delete from vtiger_senotesrel where crmid=".$id;
 		$adb->query($sql_delete_lead_notes);
 
-		$sql_insert_account_notes="insert into senotesrel(crmid,notesid) values (".$accountid.",".$lead_related_note_id.")";
+		$sql_insert_account_notes="insert into vtiger_senotesrel(crmid,notesid) values (".$accountid.",".$lead_related_note_id.")";
 		$adb->query($sql_insert_account_notes);
 	}
 
-	$sql_lead_attachment="select * from seattachmentsrel where crmid=".$id;
+	$sql_lead_attachment="select * from vtiger_seattachmentsrel where crmid=".$id;
         $lead_attachment_result = $adb->query($sql_lead_attachment);
         $noofrows = $adb->num_rows($lead_attachment_result);
 
@@ -171,10 +171,10 @@
                 $lead_related_attachment_id=$adb->query_result($lead_attachment_result,$i,"attachmentsid");
 		 $log->debug("Lead related attachment id ".$lead_related_attachment_id);
 
-                $sql_delete_lead_attachment="delete from seattachmentsrel where crmid=".$id;
+                $sql_delete_lead_attachment="delete from vtiger_seattachmentsrel where crmid=".$id;
                 $adb->query($sql_delete_lead_attachment);
 
-                $sql_insert_account_attachment="insert into seattachmentsrel(crmid,attachmentsid) values (".$accountid.",".$lead_related_attachment_id.")";                        
+                $sql_insert_account_attachment="insert into vtiger_seattachmentsrel(crmid,attachmentsid) values (".$accountid.",".$lead_related_attachment_id.")";                        
                 $adb->query($sql_insert_account_attachment);
         }
 	$log->debug("Exiting getRelatedNotesAttachments method ...");
@@ -185,61 +185,61 @@
 {
 	global $adb,$log,$id;	
 	$log->debug("Entering getRelatedActivities(".$accountid.",".$contact_id.") method ...");
-	$sql_lead_activity="select * from seactivityrel where crmid=".$id;
+	$sql_lead_activity="select * from vtiger_seactivityrel where crmid=".$id;
 	$lead_activity_result = $adb->query($sql_lead_activity);
         $noofrows = $adb->num_rows($lead_activity_result);
         for($i=0;$i<$noofrows;$i++)
         {
 
                 $lead_related_activity_id=$adb->query_result($lead_activity_result,$i,"activityid");
-		 $log->debug("Lead related activity id ".$lead_related_activity_id);
-
-		$sql_type_email="select setype from crmentity where crmid=".$lead_related_activity_id;
+		 $log->debug("Lead related vtiger_activity id ".$lead_related_activity_id);
+
+		$sql_type_email="select setype from vtiger_crmentity where crmid=".$lead_related_activity_id;
 		$type_email_result = $adb->query($sql_type_email);
                 $type=$adb->query_result($type_email_result,0,"setype");
-		$log->debug("type of activity id ".$type);
-
-                $sql_delete_lead_activity="delete from seactivityrel where crmid=".$id;
+		$log->debug("type of vtiger_activity id ".$type);
+
+                $sql_delete_lead_activity="delete from vtiger_seactivityrel where crmid=".$id;
                 $adb->query($sql_delete_lead_activity);
 
 		if($type != "Emails")
 		{
-                	$sql_insert_account_activity="insert into seactivityrel(crmid,activityid) values (".$accountid.",".$lead_related_activity_id.")";
+                	$sql_insert_account_activity="insert into vtiger_seactivityrel(crmid,activityid) values (".$accountid.",".$lead_related_activity_id.")";
 	                $adb->query($sql_insert_account_activity);
 
-			$sql_insert_account_activity="insert into cntactivityrel(contactid,activityid) values (".$contact_id.",".$lead_related_activity_id.")";
+			$sql_insert_account_activity="insert into vtiger_cntactivityrel(contactid,activityid) values (".$contact_id.",".$lead_related_activity_id.")";
                 	$adb->query($sql_insert_account_activity);
 		}
 		else
 		{
-			 $sql_insert_account_activity="insert into seactivityrel(crmid,activityid) values (".$contact_id.",".$lead_related_activity_id.")";                                                                                     $adb->query($sql_insert_account_activity);
+			 $sql_insert_account_activity="insert into vtiger_seactivityrel(crmid,activityid) values (".$contact_id.",".$lead_related_activity_id.")";                                                                                     $adb->query($sql_insert_account_activity);
 		}
         }
 	$log->debug("Exiting getRelatedActivities method ...");
 	
 }
 
-$sql_crmentity = "insert into crmentity(crmid,smcreatorid,smownerid,setype,presence,createdtime,modifiedtime,deleted,description) values(".$crmid.",".$current_user_id.",".$assigned_user_id.",'Accounts',1,".$date_entered.",".$date_modified.",0,'".$row['description']."')";
+$sql_crmentity = "insert into vtiger_crmentity(crmid,smcreatorid,smownerid,setype,presence,createdtime,modifiedtime,deleted,description) values(".$crmid.",".$current_user_id.",".$assigned_user_id.",'Accounts',1,".$date_entered.",".$date_modified.",0,'".$row['description']."')";
 
 $adb->query($sql_crmentity);
 
 
-$sql_insert_account = "INSERT INTO account (accountid,accountname,industry,annualrevenue,phone,fax,rating,email1,website,employees) VALUES (".$crmid.",'".$accountname ."','".$row["industry"] ."','" .$row["annualrevenue"] ."','" .$row["phone"] ."','".$row["fax"] ."','" .$row["rating"] ."','" .$row["email"] ."','" .$row["website"] ."','" .$row["noofemployees"] ."')";
+$sql_insert_account = "INSERT INTO vtiger_account (accountid,accountname,industry,annualrevenue,phone,fax,rating,email1,website,employees) VALUES (".$crmid.",'".$accountname ."','".$row["industry"] ."','" .$row["annualrevenue"] ."','" .$row["phone"] ."','".$row["fax"] ."','" .$row["rating"] ."','" .$row["email"] ."','" .$row["website"] ."','" .$row["noofemployees"] ."')";
 
 
 $adb->query($sql_insert_account);
 
-$sql_insert_accountbillads = "INSERT INTO accountbillads (accountaddressid,city,code,country,state,street) VALUES (".$crmid.",'".$row["city"] ."','" .$row["code"] ."','" .$row["country"] ."','".$row["state"] ."','" .$row["lane"]."')";
+$sql_insert_accountbillads = "INSERT INTO vtiger_accountbillads (accountaddressid,city,code,country,state,street) VALUES (".$crmid.",'".$row["city"] ."','" .$row["code"] ."','" .$row["country"] ."','".$row["state"] ."','" .$row["lane"]."')";
 
  $adb->query($sql_insert_accountbillads);
 
 
-$sql_insert_accountshipads = "INSERT INTO accountshipads (accountaddressid,city,code,country,state,street) VALUES (".$crmid.",'".$row["city"] ."','" .$row["code"] ."','" .$row["country"] ."','".$row["state"] ."','" .$row["lane"]."')";
+$sql_insert_accountshipads = "INSERT INTO vtiger_accountshipads (accountaddressid,city,code,country,state,street) VALUES (".$crmid.",'".$row["city"] ."','" .$row["code"] ."','" .$row["country"] ."','".$row["state"] ."','" .$row["lane"]."')";
 
 
  $adb->query($sql_insert_accountshipads);
 
-//Getting the custom field values from leads and inserting into Accounts if the field is mapped - Jaguar
+//Getting the custom vtiger_field values from leads and inserting into Accounts if the vtiger_field is mapped - Jaguar
 $insert_value=$crmid;
 $insert_column="accountid";	
 $val= getInsertValues("Accounts",$insert_value);
@@ -250,7 +250,7 @@
 
 $insert_column.=$val[0];
 $insert_value.=$val[1];
-$sql_insert_accountcustomfield = "INSERT INTO accountscf (".$insert_column.") VALUES (".$insert_value.")";
+$sql_insert_accountcustomfield = "INSERT INTO vtiger_accountscf (".$insert_column.") VALUES (".$insert_value.")";
 
 $adb->query($sql_insert_accountcustomfield);
 
@@ -264,7 +264,7 @@
  $date_modified = date('YmdHis');
 
 $crmcontactid = $adb->getUniqueID("crmentity");
-$sql_crmentity1 = "insert into crmentity(crmid,smcreatorid,smownerid,setype,presence,deleted,description,createdtime) values(".$crmcontactid.",".$current_user_id.",".$assigned_user_id.",'Contacts',0,0,'".$row['description']."','".$date_entered."')";
+$sql_crmentity1 = "insert into vtiger_crmentity(crmid,smcreatorid,smownerid,setype,presence,deleted,description,createdtime) values(".$crmcontactid.",".$current_user_id.",".$assigned_user_id.",'Contacts',0,0,'".$row['description']."','".$date_entered."')";
 
 $adb->query($sql_crmentity1);
 
@@ -272,16 +272,16 @@
 $contact_id = $crmcontactid;
 $log->debug("contact id is ".$contact_id);
 
- $sql_insert_contact = "INSERT INTO contactdetails (contactid,accountid,salutation,firstname,lastname,email,phone,mobile,title,fax,yahooid) VALUES (".$contact_id.",".$crmid.",'".$row["salutationtype"] ."','" .$row["firstname"] ."','" .$row["lastname"] ."','" .$row["email"] ."','" .$row["phone"]. "','" .$row["mobile"] ."','" .$row["designation"] ."','".$row["fax"] ."','".$row['yahooid']."')";
+ $sql_insert_contact = "INSERT INTO vtiger_contactdetails (contactid,accountid,salutation,firstname,lastname,email,phone,mobile,title,fax,yahooid) VALUES (".$contact_id.",".$crmid.",'".$row["salutationtype"] ."','" .$row["firstname"] ."','" .$row["lastname"] ."','" .$row["email"] ."','" .$row["phone"]. "','" .$row["mobile"] ."','" .$row["designation"] ."','".$row["fax"] ."','".$row['yahooid']."')";
 
 $adb->query($sql_insert_contact);
 
 
- $sql_insert_contactsubdetails = "INSERT INTO contactsubdetails (contactsubscriptionid,homephone,otherphone,leadsource) VALUES (".$contact_id.",'','','".$row['leadsource']."')";
+ $sql_insert_contactsubdetails = "INSERT INTO vtiger_contactsubdetails (contactsubscriptionid,homephone,otherphone,leadsource) VALUES (".$contact_id.",'','','".$row['leadsource']."')";
 
 $adb->query($sql_insert_contactsubdetails);
 
- $sql_insert_contactaddress = "INSERT INTO contactaddress (contactaddressid,mailingcity,mailingstreet,mailingstate,mailingcountry,mailingzip) VALUES (".$contact_id.",'".$row["city"] ."','" .$row["lane"] ."','".$row['state']."','" .$row["country"] ."','".$row['code']."')";
+ $sql_insert_contactaddress = "INSERT INTO vtiger_contactaddress (contactaddressid,mailingcity,mailingstreet,mailingstate,mailingcountry,mailingzip) VALUES (".$contact_id.",'".$row["city"] ."','" .$row["lane"] ."','".$row['state']."','" .$row["country"] ."','".$row['code']."')";
 
 $adb->query($sql_insert_contactaddress);
 
@@ -298,7 +298,7 @@
 
 $insert_column.=$val[0];
 $insert_value.=$val[1];
-$sql_insert_contactcustomfield = "INSERT INTO contactscf (".$insert_column.") VALUES (".$insert_value.")";
+$sql_insert_contactcustomfield = "INSERT INTO vtiger_contactscf (".$insert_column.") VALUES (".$insert_value.")";
 
 $adb->query($sql_insert_contactcustomfield);
 //
@@ -313,7 +313,7 @@
   
 
   $oppid = $adb->getUniqueID("crmentity");
-  $sql_crmentity = "insert into crmentity(crmid,smcreatorid,smownerid,setype,presence,deleted,createdtime,description) values(".$oppid.",".$current_user_id.",".$assigned_user_id.",'Potentials',0,0,'".$date_entered."','".$row['description']."')";
+  $sql_crmentity = "insert into vtiger_crmentity(crmid,smcreatorid,smownerid,setype,presence,deleted,createdtime,description) values(".$oppid.",".$current_user_id.",".$assigned_user_id.",'Potentials',0,0,'".$date_entered."','".$row['description']."')";
   
   $adb->query($sql_crmentity);
 
@@ -323,7 +323,7 @@
 		$potential_amount=0;
         }
 
-	$sql_insert_opp = "INSERT INTO potential (potentialid,accountid,potentialname,leadsource,closingdate,sales_stage,amount) VALUES (".$oppid.",".$crmid .",'".$potential_name."','".$row['leadsource']."','".$close_date."','".$potential_sales_stage."',".$potential_amount.")";
+	$sql_insert_opp = "INSERT INTO vtiger_potential (potentialid,accountid,potentialname,leadsource,closingdate,sales_stage,amount) VALUES (".$oppid.",".$crmid .",'".$potential_name."','".$row['leadsource']."','".$close_date."','".$potential_sales_stage."',".$potential_amount.")";
 
 	$adb->query($sql_insert_opp);
 
@@ -339,23 +339,23 @@
 	$insert_column.=$val[0];
 	$insert_value.=$val[1];
 
-	$sql_insert_potentialcustomfield = "INSERT INTO potentialscf (".$insert_column.") VALUES (".$insert_value.")";
+	$sql_insert_potentialcustomfield = "INSERT INTO vtiger_potentialscf (".$insert_column.") VALUES (".$insert_value.")";
 //
 
 	$adb->query($sql_insert_potentialcustomfield);
-        $sql_insert2contpotentialrel ="insert into contpotentialrel values(".$contact_id.",".$oppid .")";
+        $sql_insert2contpotentialrel ="insert into vtiger_contpotentialrel values(".$contact_id.",".$oppid .")";
         
         $adb->query($sql_insert2contpotentialrel);
 
 	
 }
 
-//Deleting from the tracker
-$sql_delete_tracker= "DELETE from tracker where item_id='" .$id ."'";
+//Deleting from the vtiger_tracker
+$sql_delete_tracker= "DELETE from vtiger_tracker where item_id='" .$id ."'";
 $adb->query($sql_delete_tracker);
 
 //Updating the deleted status
-$sql_update_converted = "UPDATE leaddetails SET converted = 1 where leadid='" .$id ."'";
+$sql_update_converted = "UPDATE vtiger_leaddetails SET converted = 1 where leadid='" .$id ."'";
 $adb->query($sql_update_converted); 
 
 header("Location: index.php?action=DetailView&module=Accounts&record=$crmid");

Modified: vtigercrm/trunk/modules/Leads/ListViewTop.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/ListViewTop.php (original)
+++ vtigercrm/trunk/modules/Leads/ListViewTop.php Mon Jun 12 14:26:25 2006
@@ -44,7 +44,7 @@
 	require_once($theme_path.'layout_utils.php');
 	if($_REQUEST['lead_view']=='')
 	{	
-		$query = "select lead_view from users where id ='$current_user->id'";
+		$query = "select lead_view from vtiger_users where id ='$current_user->id'";
 		$result=$adb->query($query);
 		$lead_view=$adb->query_result($result,0,'lead_view');
 	}
@@ -66,7 +66,7 @@
 		$start_date = date("Y-m-d", strtotime("-1 week"));
 	}	
 
-	$list_query = 'select leaddetails.*,crmentity.createdtime,crmentity.description from leaddetails inner join crmentity on leaddetails.leadid = crmentity.crmid where crmentity.deleted =0 AND leaddetails.converted =0 AND crmentity.createdtime >='.$start_date.' AND crmentity.smownerid = '.$current_user->id; 
+	$list_query = 'select vtiger_leaddetails.*,vtiger_crmentity.createdtime,vtiger_crmentity.description from vtiger_leaddetails inner join vtiger_crmentity on vtiger_leaddetails.leadid = vtiger_crmentity.crmid where vtiger_crmentity.deleted =0 AND vtiger_leaddetails.converted =0 AND vtiger_crmentity.createdtime >='.$start_date.' AND vtiger_crmentity.smownerid = '.$current_user->id; 
 	
 	$list_result = $adb->query($list_query);
 	$noofrows = $adb->num_rows($list_result);

Modified: vtigercrm/trunk/modules/Leads/Merge.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/Merge.php (original)
+++ vtigercrm/trunk/modules/Leads/Merge.php Mon Jun 12 14:26:25 2006
@@ -38,7 +38,7 @@
 }
 //get the particular file from db and store it in the local hard disk.
 //store the path to the location where the file is stored and pass it  as parameter to the method 
-$sql = "select filename,data,filesize from wordtemplates where templateid=".$templateid;
+$sql = "select filename,data,filesize from vtiger_wordtemplates where templateid=".$templateid;
 
 $result = $adb->query($sql);
 $temparray = $adb->fetch_array($result);
@@ -74,7 +74,7 @@
 }
 
 //<<<<<<<<<<<<<<<<header for csv and select columns for query>>>>>>>>>>>>>>>>>>>>>>>>
-$query1="select tablename,columnname,fieldlabel from field where tabid=7 order by tablename";
+$query1="select vtiger_tablename,columnname,fieldlabel from vtiger_field where vtiger_tabid=7 order by vtiger_tablename";
 $result = $adb->query($query1);
 $y=$adb->num_rows($result);
 	
@@ -85,7 +85,7 @@
 	$querycolumns[$x] = $tablename.".".$columnname;
   if($columnname == "smownerid")
   {
-    $querycolumns[$x] = "concat(users.last_name,' ',users.first_name) as username,users.first_name,users.last_name,users.user_name,users.yahoo_id,users.title,users.phone_work,users.department,users.phone_mobile,users.phone_other,users.phone_fax,users.email1,users.phone_home,users.email2,users.address_street,users.address_city,users.address_state,users.address_postalcode,users.address_country";
+    $querycolumns[$x] = "concat(vtiger_users.last_name,' ',vtiger_users.first_name) as username,vtiger_users.first_name,vtiger_users.last_name,vtiger_users.user_name,vtiger_users.yahoo_id,vtiger_users.title,vtiger_users.phone_work,vtiger_users.department,vtiger_users.phone_mobile,vtiger_users.phone_other,vtiger_users.phone_fax,vtiger_users.email1,vtiger_users.phone_home,vtiger_users.email2,vtiger_users.address_street,vtiger_users.address_city,vtiger_users.address_state,vtiger_users.address_postalcode,vtiger_users.address_country";
   }
   $field_label[$x] = "LEAD_".strtoupper(str_replace(" ","",$adb->query_result($result,$x,"fieldlabel")));
 	if($columnname == "smownerid")
@@ -100,13 +100,13 @@
 {
 	$selectcolumns = implode($querycolumns,",");
 
-$query = "select ".$selectcolumns." 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 users on users.id = crmentity.smownerid
-  where crmentity.deleted=0 and leaddetails.leadid in (".$mass_merge.")";
+$query = "select ".$selectcolumns." from vtiger_leaddetails 
+  inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_leaddetails.leadid 
+  inner join vtiger_leadsubdetails on vtiger_leadsubdetails.leadsubscriptionid=vtiger_leaddetails.leadid 
+  inner join vtiger_leadaddress on vtiger_leadaddress.leadaddressid=vtiger_leadsubdetails.leadsubscriptionid 
+  inner join vtiger_leadscf on vtiger_leaddetails.leadid = vtiger_leadscf.leadid 
+  left join vtiger_users on vtiger_users.id = vtiger_crmentity.smownerid
+  where vtiger_crmentity.deleted=0 and vtiger_leaddetails.leadid in (".$mass_merge.")";
 		
 $result = $adb->query($query);
 	
@@ -140,7 +140,7 @@
 $csvdata = implode($mergevalue,"###");
 }else
 {
-	die("No fields to do Merge");
+	die("No vtiger_fields to do Merge");
 }	
 
 $handle = fopen($wordtemplatedownloadpath."datasrc.csv","wb");

Modified: vtigercrm/trunk/modules/Leads/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/Save.php (original)
+++ vtigercrm/trunk/modules/Leads/Save.php Mon Jun 12 14:26:25 2006
@@ -70,11 +70,11 @@
 if($_REQUEST['return_viewname'] != '')$return_viewname=$_REQUEST['return_viewname'];
 header("Location: index.php?action=$return_action&module=$return_module&record=$return_id&viewname=$return_viewname");
 
-//Code to save the custom field info into database
+//Code to save the custom vtiger_field info into database
 function save_customfields($entity_id)
 {
 	$log->debug("Entering save_customfields(".$entity_id.") method ...");
-	 $log->debug("save custom field invoked ".$entity_id);
+	 $log->debug("save custom vtiger_field invoked ".$entity_id);
 	global $adb;
 	$dbquery="select * from customfields where module='Leads'";
 	$result = $adb->query($dbquery);

Modified: vtigercrm/trunk/modules/Leads/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Leads/language/en_us.lang.php Mon Jun 12 14:26:25 2006
@@ -76,13 +76,13 @@
 
 'NTC_DELETE_CONFIRMATION'=>'Are you sure you want to delete this record?',
 'NTC_REMOVE_CONFIRMATION'=>'Are you sure you want to remove this contact from this case?',
-'NTC_REMOVE_DIRECT_REPORT_CONFIRMATION'=>'Are you sure you want to remove this record as a direct report?',
+'NTC_REMOVE_DIRECT_REPORT_CONFIRMATION'=>'Are you sure you want to remove this record as a direct vtiger_report?',
 'NTC_REMOVE_OPP_CONFIRMATION'=>'Are you sure you want to remove this contact from this opportunity?',
 'ERR_DELETE_RECORD'=>"en_us A record number must be specified to delete the contact.",
 'NTC_COPY_PRIMARY_ADDRESS'=>'Copy primary address to alternate address',
 'NTC_COPY_ALTERNATE_ADDRESS'=>'Copy alternate address to primary address',
 
-// Added fields in fetchfile.php, import.php -- crm4-Beta
+// Added vtiger_fields in fetchfile.php, import.php -- crm4-Beta
 'LBL_COLON'=>' : ', 
 'LBL_IMPORT_LEADS'=>'Import Leads',
 'LBL_LEADS_FILE_LIST'=>'Leads File List',
@@ -114,7 +114,7 @@
 'LBL_ATTACHMENT_TITLE'=>'Attachments',
 
 
-//Added fields after RC1 - Release 
+//Added vtiger_fields after RC1 - Release 
 'LBL_ALL'=>'All',
 'LBL_CONTACTED'=>'Contacted',
 'LBL_LOST'=>'Lost',

Modified: vtigercrm/trunk/modules/Migration/Migration.php
==============================================================================
--- vtigercrm/trunk/modules/Migration/Migration.php (original)
+++ vtigercrm/trunk/modules/Migration/Migration.php Mon Jun 12 14:26:25 2006
@@ -165,7 +165,7 @@
 	{
 		global $conn;
 
-		$sql = "select tabid from tab where name='".$module."'";
+		$sql = "select vtiger_tabid from vtiger_tab where name='".$module."'";
 		$result = $conn->query($sql);
 		$tabid=  $conn->query_result($result,0,"tabid");
 
@@ -207,7 +207,7 @@
 		$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
+		//Here we have to decide which vtiger_files should be included, where the vtiger_files will be added newly for every public release
 		//Handle Here -- Mickie
 		include("modules/Migration/ModifyDatabase/MigrationInfo.php");
 
@@ -289,16 +289,16 @@
 			$this->conn->println("Going to apply the old database dump to the new database.");
 			$this->applyDumpData($new_host_name,$new_mysql_port,$new_mysql_username,$new_mysql_password,$new_dbname,$dump_file);
 
-			//get the number of tables in new database 
+			//get the number of vtiger_tables in new database 
 			$new_tables_count = $this->getTablesCountInNewDatabase();
 
-			//get the number of tables in old database 
+			//get the number of vtiger_tables in old database 
 			$old_tables_count = $this->getTablesCountInOldDatabase();
 
-			//if tables are missing after apply the dump, then alert the user and quit
+			//if vtiger_tables are missing after apply the dump, then alert the user and quit
 			if(($new_tables_count != $old_tables_count && $option == 'dbsource') || ($new_tables_count < 180 && $option == 'dumpsource'))
 			{
-				$this->conn->println("New Database tables not equal to Old Database tables count. Reload the current database again and quit.");
+				$this->conn->println("New Database vtiger_tables not equal to Old Database vtiger_tables count. Reload the current database again and quit.");
 				
 				$continue_process = 0;
 				$msg = "The dump may not be applied correctly. Tables exist in 4.2.3 database : $old_tables_count. Tables exist in current database after apply the dump : $new_tables_count";

Modified: vtigercrm/trunk/modules/Migration/MigrationCheck.php
==============================================================================
--- vtigercrm/trunk/modules/Migration/MigrationCheck.php (original)
+++ vtigercrm/trunk/modules/Migration/MigrationCheck.php Mon Jun 12 14:26:25 2006
@@ -107,7 +107,7 @@
 
 	if($continue2 == 1)
 	{
-		//Check whether the table are exist in the databases or not
+		//Check whether the vtiger_table are exist in the databases or not
 		$old_tables = @mysql_num_rows(mysql_list_tables($old_dbname,$oldconn));
 		//$new_tables = @mysql_num_rows(mysql_list_tables($new_dbname));
 
@@ -289,7 +289,7 @@
 
 	if($continue2 == 1)
 	{
-		//Check whether the table are exist in the databases or not
+		//Check whether the vtiger_table are exist in the databases or not
 		$old_tables = @mysql_num_rows(mysql_list_tables($old_dbname,$oldconn));
 
 		if(!$old_tables)

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 Mon Jun 12 14:26:25 2006
@@ -22,7 +22,7 @@
 /****************** 5.0(Alpha) dev version 1 Database changes -- Starts*********************/
 
 
-//Added the announcement table creation to avoid the error
+//Added the vtiger_announcement vtiger_table creation to avoid the error
 $ann_query = "CREATE TABLE `announcement` (
 	  `creatorid` int(19) NOT NULL,
 	    `announcement` text,
@@ -33,41 +33,41 @@
 	    ) ENGINE=InnoDB DEFAULT CHARSET=latin1";
 Execute($ann_query);
 
-//Added Primay Keys for the left out tables
+//Added Primay Keys for the left out vtiger_tables
 $alter_array1 = Array(
-		"alter table activity_reminder ADD PRIMARY KEY (activity_id,recurringid)",
-		"alter table activitygrouprelation ADD PRIMARY KEY (activityid)",
-		"alter table cvadvfilter ADD PRIMARY KEY (cvid,columnindex)",
-		"alter table cvcolumnlist ADD PRIMARY KEY (cvid,columnindex)",
-		"alter table cvstdfilter ADD PRIMARY KEY (cvid)",
-		"alter table def_org_field ADD PRIMARY KEY (fieldid)",
-		"alter table leadgrouprelation ADD PRIMARY KEY (leadid)",
-		"alter table leadgrouprelation drop key leadgrouprelation_IDX0",
-		"alter table organizationdetails ADD PRIMARY KEY (organizationame)",
-		"alter table profile2field ADD PRIMARY KEY (profileid,fieldid)",
-		"alter table profile2standardpermissions ADD PRIMARY KEY (profileid,tabid,Operation)",
-		"alter table profile2standardpermissions drop index idx_prof2stad",
-		"alter table profile2utility ADD PRIMARY KEY (profileid,tabid,activityid)",
-		"alter table profile2utility drop index idx_prof2utility",
-		"alter table relcriteria ADD PRIMARY KEY (queryid,columnindex)",
-		"alter table reportdatefilter ADD PRIMARY KEY (datefilterid)",
-		"alter table reportdatefilter DROP INDEX reportdatefilter_IDX0",
-		"alter table reportsortcol ADD PRIMARY KEY (sortcolid,reportid)",
-		"alter table reportsummary ADD PRIMARY KEY (reportsummaryid,summarytype,columnname)",
-		"drop table role2action",
-		"drop table role2tab",
-		"alter table selectcolumn ADD PRIMARY KEY (queryid,columnindex)",
-		"alter table ticketgrouprelation ADD PRIMARY KEY (ticketid)",
-		"alter table ticketstracktime ADD PRIMARY KEY (ticket_id)",
-		"alter table users2group ADD PRIMARY KEY (groupname,userid)",
-		"alter table users2group DROP INDEX idx_users2group",
+		"alter vtiger_table vtiger_activity_reminder ADD PRIMARY KEY (activity_id,recurringid)",
+		"alter vtiger_table vtiger_activitygrouprelation ADD PRIMARY KEY (activityid)",
+		"alter vtiger_table vtiger_cvadvfilter ADD PRIMARY KEY (cvid,columnindex)",
+		"alter vtiger_table vtiger_cvcolumnlist ADD PRIMARY KEY (cvid,columnindex)",
+		"alter vtiger_table vtiger_cvstdfilter ADD PRIMARY KEY (cvid)",
+		"alter vtiger_table vtiger_def_org_field ADD PRIMARY KEY (fieldid)",
+		"alter vtiger_table vtiger_leadgrouprelation ADD PRIMARY KEY (leadid)",
+		"alter vtiger_table vtiger_leadgrouprelation drop key vtiger_leadgrouprelation_IDX0",
+		"alter vtiger_table vtiger_organizationdetails ADD PRIMARY KEY (organizationame)",
+		"alter vtiger_table vtiger_profile2field ADD PRIMARY KEY (profileid,fieldid)",
+		"alter vtiger_table vtiger_profile2standardpermissions ADD PRIMARY KEY (profileid,tabid,Operation)",
+		"alter vtiger_table vtiger_profile2standardpermissions drop index idx_prof2stad",
+		"alter vtiger_table vtiger_profile2utility ADD PRIMARY KEY (profileid,tabid,activityid)",
+		"alter vtiger_table vtiger_profile2utility drop index idx_prof2utility",
+		"alter vtiger_table vtiger_relcriteria ADD PRIMARY KEY (queryid,columnindex)",
+		"alter vtiger_table vtiger_reportdatefilter ADD PRIMARY KEY (datefilterid)",
+		"alter vtiger_table vtiger_reportdatefilter DROP INDEX vtiger_reportdatefilter_IDX0",
+		"alter vtiger_table vtiger_reportsortcol ADD PRIMARY KEY (sortcolid,reportid)",
+		"alter vtiger_table vtiger_reportsummary ADD PRIMARY KEY (reportsummaryid,summarytype,columnname)",
+		"drop vtiger_table vtiger_role2action",
+		"drop vtiger_table vtiger_role2tab",
+		"alter vtiger_table vtiger_selectcolumn ADD PRIMARY KEY (queryid,columnindex)",
+		"alter vtiger_table vtiger_ticketgrouprelation ADD PRIMARY KEY (ticketid)",
+		"alter vtiger_table vtiger_ticketstracktime ADD PRIMARY KEY (ticket_id)",
+		"alter vtiger_table vtiger_users2group ADD PRIMARY KEY (groupname,userid)",
+		"alter vtiger_table vtiger_users2group DROP INDEX idx_users2group",
 		);
 foreach($alter_array1 as $query)
 {
 	Execute($query);
 }
 
-//Tables profile2globalpermissions, actionmapping creation
+//Tables vtiger_profile2globalpermissions, vtiger_actionmapping creation
 
 $create_sql1 ="CREATE TABLE `profile2globalpermissions` (`profileid` int(19) NOT NULL, `globalactionid` int(19) NOT NULL, `globalactionpermission` int(19) default NULL, PRIMARY KEY  (`profileid`,`globalactionid`),  KEY `idx_profile2globalpermissions` (`profileid`,`globalactionid`)) ENGINE=InnoDB DEFAULT CHARSET=latin1";
 
@@ -81,8 +81,8 @@
 	) TYPE=InnoDB";
 Execute($create_sql2);
 
-//For all Profiles, insert the following entries into profile2global permissions table:
-$sql = 'select * from profile';
+//For all Profiles, insert the following entries into vtiger_profile2global permissions vtiger_table:
+$sql = 'select * from vtiger_profile';
 $res = $conn->query($sql);
 $noofprofiles = $conn->num_rows($res);
 
@@ -90,20 +90,20 @@
 {
 	$profile_id = $conn->query_result($res,$i,'profileid');
 
-	$sql1 = "insert into profile2globalpermissions values ($profile_id,1,0)";
-	$sql2 = "insert into profile2globalpermissions values ($profile_id,2,0)";
+	$sql1 = "insert into vtiger_profile2globalpermissions values ($profile_id,1,0)";
+	$sql2 = "insert into vtiger_profile2globalpermissions values ($profile_id,2,0)";
 
 	Execute($sql1);
 	Execute($sql2);
 }
 
 
-//Removing entries for Dashboard and Home module from profile2standardpermissions table
-$del_query1 = "delete from profile2standardpermissions where tabid in(1,3)";
+//Removing entries for Dashboard and Home module from vtiger_profile2standardpermissions vtiger_table
+$del_query1 = "delete from vtiger_profile2standardpermissions where vtiger_tabid in(1,3)";
 Execute($del_query1);
 
-//For all Profile do the following insert into profile2utility table:
-$sql = 'select * from profile';
+//For all Profile do the following insert into vtiger_profile2utility vtiger_table:
+$sql = 'select * from vtiger_profile';
 $res = $conn->query($sql);
 $noofprofiles = $conn->num_rows($res);
 
@@ -112,40 +112,40 @@
 {
 	$profile_id = $conn->query_result($res,$i,'profileid');
 
-	$sql1 = "insert into profile2utility values ($profile_id,4,7,0)";
-	$sql2 = "insert into profile2utility values ($profile_id,7,9,0)";
+	$sql1 = "insert into vtiger_profile2utility values ($profile_id,4,7,0)";
+	$sql2 = "insert into vtiger_profile2utility values ($profile_id,7,9,0)";
 
 	Execute($sql1);
 	Execute($sql2);
 }
 */
 
-//Insert Values into action mapping table:
+//Insert Values into action mapping vtiger_table:
 $actionmapping_array = Array(
-		"insert into actionmapping values(0,'Save',0)",
-		"insert into actionmapping values(1,'EditView',0)",
-		"insert into actionmapping values(2,'Delete',0)",
-		"insert into actionmapping values(3,'index',0)",
-		"insert into actionmapping values(4,'DetailView',0)",
-		"insert into actionmapping values(5,'Import',0)",
-		"insert into actionmapping values(6,'Export',0)",
-		"insert into actionmapping values(8,'Merge',0)",
-		"insert into actionmapping values(1,'VendorEditView',1)",
-		"insert into actionmapping values(4,'VendorDetailView',1)",
-		"insert into actionmapping values(0,'SaveVendor',1)",
-		"insert into actionmapping values(2,'DeleteVendor',1)",
-		"insert into actionmapping values(1,'PriceBookEditView',1)",
-		"insert into actionmapping values(4,'PriceBookDetailView',1)",
-		"insert into actionmapping values(0,'SavePriceBook',1)",
-		"insert into actionmapping values(2,'DeletePriceBook',1)",
-		"insert into actionmapping values(1,'SalesOrderEditView',1)",
-		"insert into actionmapping values(4,'SalesOrderDetailView',1)",
-		"insert into actionmapping values(0,'SaveSalesOrder',1)",
-		"insert into actionmapping values(2,'DeleteSalesOrder',1)",
-		"insert into actionmapping values(9,'ConvertLead',0)",
-		"insert into actionmapping values(1,'DetailViewAjax',1)",
-		"insert into actionmapping values(1,'QuickCreate',1)",
-		"insert into actionmapping values(4,'TagCloud',1)"
+		"insert into vtiger_actionmapping values(0,'Save',0)",
+		"insert into vtiger_actionmapping values(1,'EditView',0)",
+		"insert into vtiger_actionmapping values(2,'Delete',0)",
+		"insert into vtiger_actionmapping values(3,'index',0)",
+		"insert into vtiger_actionmapping values(4,'DetailView',0)",
+		"insert into vtiger_actionmapping values(5,'Import',0)",
+		"insert into vtiger_actionmapping values(6,'Export',0)",
+		"insert into vtiger_actionmapping values(8,'Merge',0)",
+		"insert into vtiger_actionmapping values(1,'VendorEditView',1)",
+		"insert into vtiger_actionmapping values(4,'VendorDetailView',1)",
+		"insert into vtiger_actionmapping values(0,'SaveVendor',1)",
+		"insert into vtiger_actionmapping values(2,'DeleteVendor',1)",
+		"insert into vtiger_actionmapping values(1,'PriceBookEditView',1)",
+		"insert into vtiger_actionmapping values(4,'PriceBookDetailView',1)",
+		"insert into vtiger_actionmapping values(0,'SavePriceBook',1)",
+		"insert into vtiger_actionmapping values(2,'DeletePriceBook',1)",
+		"insert into vtiger_actionmapping values(1,'SalesOrderEditView',1)",
+		"insert into vtiger_actionmapping values(4,'SalesOrderDetailView',1)",
+		"insert into vtiger_actionmapping values(0,'SaveSalesOrder',1)",
+		"insert into vtiger_actionmapping values(2,'DeleteSalesOrder',1)",
+		"insert into vtiger_actionmapping values(9,'ConvertLead',0)",
+		"insert into vtiger_actionmapping values(1,'DetailViewAjax',1)",
+		"insert into vtiger_actionmapping values(1,'QuickCreate',1)",
+		"insert into vtiger_actionmapping values(4,'TagCloud',1)"
 		);
 foreach($actionmapping_array as $query)
 {
@@ -153,10 +153,10 @@
 }
 
 
-//Added two columns in field table to construct the quickcreate form dynamically
+//Added two columns in vtiger_field vtiger_table to construct the quickcreate form dynamically
 $alter_array2 = Array(
-		"ALTER TABLE field ADD column quickcreate int(10) after typeofdata",
-		"ALTER TABLE field ADD column quickcreatesequence int(19) after quickcreate",
+		"ALTER TABLE vtiger_field ADD column quickcreate int(10) after typeofdata",
+		"ALTER TABLE vtiger_field ADD column quickcreatesequence int(19) after quickcreate",
 		);
 foreach($alter_array2 as $query)
 {
@@ -164,50 +164,50 @@
 }
 
 $update_array1 = Array(
-		"UPDATE field SET quickcreate = 1,quickcreatesequence = 0",
-
-		"UPDATE field SET quickcreate = 0,quickcreatesequence = 1 WHERE tabid = 2 and fieldlabel = 'Potential Name'",
-		"UPDATE field SET quickcreate = 0,quickcreatesequence = 2 WHERE tabid = 2 and fieldlabel = 'Account Name'",
-		"UPDATE field SET quickcreate = 0,quickcreatesequence = 3 WHERE tabid = 2 and fieldlabel = 'Expected Close Date'",
-		"UPDATE field SET quickcreate = 0,quickcreatesequence = 4 WHERE tabid = 2 and fieldlabel = 'Sales Stage'",
-		"UPDATE field SET quickcreate = 0,quickcreatesequence = 5 WHERE tabid = 2 and fieldlabel = 'Amount'",
-
-		"UPDATE field SET quickcreate = 0,quickcreatesequence = 1 WHERE tabid = 4 and fieldlabel = 'First Name'",
-		"UPDATE field SET quickcreate = 0,quickcreatesequence = 2 WHERE tabid = 4 and fieldlabel = 'Last Name'",
-		"UPDATE field SET quickcreate = 0,quickcreatesequence = 3 WHERE tabid = 4 and fieldlabel = 'Account Name'",
-		"UPDATE field SET quickcreate = 0,quickcreatesequence = 4 WHERE tabid = 4 and fieldlabel = 'Office Phone'",
-		"UPDATE field SET quickcreate = 0,quickcreatesequence = 5 WHERE tabid = 4 and fieldlabel = 'Email'",
-
-		"UPDATE field SET quickcreate = 0,quickcreatesequence = 1 WHERE tabid = 6 and fieldlabel = 'Account Name'",
-		"UPDATE field SET quickcreate = 0,quickcreatesequence = 2 WHERE tabid = 6 and fieldlabel = 'Phone'",
-		"UPDATE field SET quickcreate = 0,quickcreatesequence = 3 WHERE tabid = 6 and fieldlabel = 'Website'",
-
-		"UPDATE field SET quickcreate = 0,quickcreatesequence = 1 WHERE tabid = 7 and fieldlabel = 'First Name'",
-		"UPDATE field SET quickcreate = 0,quickcreatesequence = 2 WHERE tabid = 7 and fieldlabel = 'Last Name'",
-		"UPDATE field SET quickcreate = 0,quickcreatesequence = 3 WHERE tabid = 7 and fieldlabel = 'Company'",
-		"UPDATE field SET quickcreate = 0,quickcreatesequence = 4 WHERE tabid = 7 and fieldlabel = 'Phone'",
-		"UPDATE field SET quickcreate = 0,quickcreatesequence = 5 WHERE tabid = 7 and fieldlabel = 'Email'",
-
-		"UPDATE field SET quickcreate = 0,quickcreatesequence = 1 WHERE tabid = 8 and fieldlabel = 'Subject'",
-
-		"UPDATE field SET quickcreate = 0,quickcreatesequence = 1 WHERE tabid = 9 and fieldlabel = 'Subject'",
-		"UPDATE field SET quickcreate = 0,quickcreatesequence = 2 WHERE tabid = 9 and fieldlabel = 'Start Date & Time'",
-
-		"UPDATE field SET quickcreate = 0,quickcreatesequence = 1 WHERE tabid = 10 and fieldlabel = 'Subject'",
-		"UPDATE field SET quickcreate = 0,quickcreatesequence = 2 WHERE tabid = 10 and fieldlabel = 'Date & Time Sent'",
-
-		"UPDATE field SET quickcreate = 0,quickcreatesequence = 1 WHERE tabid = 13 and fieldlabel = 'Title'",
-		"UPDATE field SET quickcreate = 0,quickcreatesequence = 2 WHERE tabid = 13 and fieldlabel = 'Description'",
-		"UPDATE field SET quickcreate = 0,quickcreatesequence = 3 WHERE tabid = 13 and fieldlabel = 'Priority'",
-
-		"UPDATE field SET quickcreate = 0,quickcreatesequence = 1 WHERE tabid = 14 and fieldlabel = 'Product Name'",
-		"UPDATE field SET quickcreate = 0,quickcreatesequence = 2 WHERE tabid = 14 and fieldlabel = 'Product Code'",
-		"UPDATE field SET quickcreate = 0,quickcreatesequence = 3 WHERE tabid = 14 and fieldlabel = 'Product Category'",
-
-		"UPDATE field SET quickcreate = 0,quickcreatesequence = 1 WHERE tabid = 16 and fieldlabel = 'Subject'",
-		"UPDATE field SET quickcreate = 0,quickcreatesequence = 2 WHERE tabid = 16 and fieldlabel = 'Start Date & Time'",
-		"UPDATE field SET quickcreate = 0,quickcreatesequence = 3 WHERE tabid = 16 and fieldlabel = 'Activity Type'",
-		"UPDATE field SET quickcreate = 0,quickcreatesequence = 4 WHERE tabid = 16 and fieldlabel = 'Duration'",
+		"UPDATE vtiger_field SET quickcreate = 1,quickcreatesequence = 0",
+
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 1 WHERE vtiger_tabid = 2 and vtiger_fieldlabel = 'Potential Name'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 2 WHERE vtiger_tabid = 2 and vtiger_fieldlabel = 'Account Name'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 3 WHERE vtiger_tabid = 2 and vtiger_fieldlabel = 'Expected Close Date'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 4 WHERE vtiger_tabid = 2 and vtiger_fieldlabel = 'Sales Stage'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 5 WHERE vtiger_tabid = 2 and vtiger_fieldlabel = 'Amount'",
+
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 1 WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'First Name'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 2 WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'Last Name'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 3 WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'Account Name'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 4 WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'Office Phone'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 5 WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'Email'",
+
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 1 WHERE vtiger_tabid = 6 and vtiger_fieldlabel = 'Account Name'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 2 WHERE vtiger_tabid = 6 and vtiger_fieldlabel = 'Phone'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 3 WHERE vtiger_tabid = 6 and vtiger_fieldlabel = 'Website'",
+
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 1 WHERE vtiger_tabid = 7 and vtiger_fieldlabel = 'First Name'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 2 WHERE vtiger_tabid = 7 and vtiger_fieldlabel = 'Last Name'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 3 WHERE vtiger_tabid = 7 and vtiger_fieldlabel = 'Company'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 4 WHERE vtiger_tabid = 7 and vtiger_fieldlabel = 'Phone'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 5 WHERE vtiger_tabid = 7 and vtiger_fieldlabel = 'Email'",
+
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 1 WHERE vtiger_tabid = 8 and vtiger_fieldlabel = 'Subject'",
+
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 1 WHERE vtiger_tabid = 9 and vtiger_fieldlabel = 'Subject'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 2 WHERE vtiger_tabid = 9 and vtiger_fieldlabel = 'Start Date & Time'",
+
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 1 WHERE vtiger_tabid = 10 and vtiger_fieldlabel = 'Subject'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 2 WHERE vtiger_tabid = 10 and vtiger_fieldlabel = 'Date & Time Sent'",
+
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 1 WHERE vtiger_tabid = 13 and vtiger_fieldlabel = 'Title'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 2 WHERE vtiger_tabid = 13 and vtiger_fieldlabel = 'Description'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 3 WHERE vtiger_tabid = 13 and vtiger_fieldlabel = 'Priority'",
+
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 1 WHERE vtiger_tabid = 14 and vtiger_fieldlabel = 'Product Name'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 2 WHERE vtiger_tabid = 14 and vtiger_fieldlabel = 'Product Code'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 3 WHERE vtiger_tabid = 14 and vtiger_fieldlabel = 'Product Category'",
+
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 1 WHERE vtiger_tabid = 16 and vtiger_fieldlabel = 'Subject'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 2 WHERE vtiger_tabid = 16 and vtiger_fieldlabel = 'Start Date & Time'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 3 WHERE vtiger_tabid = 16 and vtiger_fieldlabel = 'Activity Type'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 4 WHERE vtiger_tabid = 16 and vtiger_fieldlabel = 'Duration'",
 		);
 foreach($update_array1 as $query)
 {
@@ -218,33 +218,33 @@
 $alter_query1 = "ALTER TABLE `users` ADD `cal_color` VARCHAR(25) DEFAULT '#E6FAD8' AFTER `user_hash`";
 Execute($alter_query1);
 
-//code contributed by Fredy for color priority
+//code contributed by Fredy for color vtiger_priority
 $newfieldid = $conn->getUniqueID("field");
-$insert_query1 = "insert into field values (16,".$newfieldid.",'priority','activity',1,15,'taskpriority','Priority',1,0,0,100,17,1,1,'V~O',1,'')";
+$insert_query1 = "insert into vtiger_field values (16,".$newfieldid.",'priority','activity',1,15,'taskpriority','Priority',1,0,0,100,17,1,1,'V~O',1,'')";
 Execute($insert_query1);
 
-//Added on 23-12-2005 which is missed from Fredy's contribution for Color priority
+//Added on 23-12-2005 which is missed from Fredy's contribution for Color vtiger_priority
 populateFieldForSecurity('16',$newfieldid);
-$activity_alter_query = "alter table activity add column priority varchar(150) default NULL";
+$activity_alter_query = "alter vtiger_table vtiger_activity add column vtiger_priority varchar(150) default NULL";
 Execute($activity_alter_query);
 
 //Code contributed by Raju for better emailing 
 /*
 $insert_array1 = Array(
-		"insert into field values (10,".$conn->getUniqueID("field").",'crmid','seactivityrel',1,'357','parent_id','Related To',1,0,0,100,1,2,1,'I~O',1,'')",
-		"insert into field values (10,".$conn->getUniqueID("field").",'subject','activity',1,'2','subject','Subject',1,0,0,100,1,3,1,'V~M',0,1)",
-		"insert into field values (10,".$conn->getUniqueID("field").",'filename','emails',1,'61','filename','Attachment',1,0,0,100,1,4,1,'V~O',1,'')",
-		"insert into field values (10,".$conn->getUniqueID("field").",'description','emails',1,'19','description','Description',1,0,0,100,1,5,1,'V~O',1,'')",
+		"insert into vtiger_field values (10,".$conn->getUniqueID("field").",'crmid','seactivityrel',1,'357','parent_id','Related To',1,0,0,100,1,2,1,'I~O',1,'')",
+		"insert into vtiger_field values (10,".$conn->getUniqueID("field").",'subject','activity',1,'2','subject','Subject',1,0,0,100,1,3,1,'V~M',0,1)",
+		"insert into vtiger_field values (10,".$conn->getUniqueID("field").",'filename','emails',1,'61','filename','Attachment',1,0,0,100,1,4,1,'V~O',1,'')",
+		"insert into vtiger_field values (10,".$conn->getUniqueID("field").",'description','emails',1,'19','description','Description',1,0,0,100,1,5,1,'V~O',1,'')",
 		);
 */
 //commented the above array as that queries are wrong queries -- changed on 23-12-2005
 $insert_array1 = array(
-			"update field set uitype='357' where tabid=10 and fieldname='parent_id' and tablename='seactivityrel'",
-			"update field set sequence=1 where tabid=10 and fieldname in ('parent_id','subject','filename','description')",
-			"update field set block=2 where tabid=10 and fieldname='parent_id'",
-			"update field set block=3 where tabid=10 and fieldname='subject'",
-			"update field set block=4 where tabid=10 and fieldname='filename'",
-			"update field set block=5 where tabid=10 and fieldname='description'",
+			"update vtiger_field set uitype='357' where vtiger_tabid=10 and vtiger_fieldname='parent_id' and vtiger_tablename='seactivityrel'",
+			"update vtiger_field set sequence=1 where vtiger_tabid=10 and vtiger_fieldname in ('parent_id','subject','filename','description')",
+			"update vtiger_field set block=2 where vtiger_tabid=10 and vtiger_fieldname='parent_id'",
+			"update vtiger_field set block=3 where vtiger_tabid=10 and vtiger_fieldname='subject'",
+			"update vtiger_field set block=4 where vtiger_tabid=10 and vtiger_fieldname='filename'",
+			"update vtiger_field set block=5 where vtiger_tabid=10 and vtiger_fieldname='description'",
 		      );
 foreach($insert_array1 as $query)
 {
@@ -252,40 +252,40 @@
 }
 
 //code contributed by mike to rearrange the home page
-$alter_query2 = "alter table users add column homeorder varchar(255) default 'ALVT,PLVT,QLTQ,CVLVT,HLT,OLV,GRT,OLTSO,ILTI' after date_format";
+$alter_query2 = "alter vtiger_table vtiger_users add column homeorder varchar(255) default 'ALVT,PLVT,QLTQ,CVLVT,HLT,OLV,GRT,OLTSO,ILTI' after date_format";
 Execute($alter_query2);
 
-//Added one column in invoice table to include 'Contact Name' field in Invoice module
-$alter_query3 = "ALTER TABLE invoice ADD column contactid int(19) after customerno";
+//Added one column in vtiger_invoice vtiger_table to include 'Contact Name' vtiger_field in Invoice module
+$alter_query3 = "ALTER TABLE vtiger_invoice ADD column contactid int(19) after customerno";
 Execute($alter_query3);
 
 $newfieldid = $conn->getUniqueID("field");
-$insert_query2 = "insert into field values (23,".$newfieldid.",'contactid','invoice',1,'57','contact_id','Contact Name',1,0,0,100,4,1,1,'I~O',1,'')";
+$insert_query2 = "insert into vtiger_field values (23,".$newfieldid.",'contactid','invoice',1,'57','contact_id','Contact Name',1,0,0,100,4,1,1,'I~O',1,'')";
 Execute($insert_query2);
-//Added on 23-12-2005 because we must populate field entries in profile2field and def_org_field if we add a field in field table
+//Added on 23-12-2005 because we must populate vtiger_field entries in vtiger_profile2field and vtiger_def_org_field if we add a vtiger_field in vtiger_field vtiger_table
 populateFieldForSecurity('23',$newfieldid);
 
 //changes made to fix the bug in Address Information block of Accounts and Contacs module
 $update_array2 = Array(
-		"UPDATE field SET fieldlabel='Billing City' WHERE tabid=6 and tablename='accountbillads' and fieldname='bill_city'",
-		"UPDATE field SET fieldlabel='Billing State' WHERE tabid=6 and tablename='accountbillads' and fieldname='bill_state'",
-		"UPDATE field SET fieldlabel='Billing Code' WHERE tabid=6 and tablename='accountbillads' and fieldname='bill_code'",
-		"UPDATE field SET fieldlabel='Billing Country' WHERE tabid=6 and tablename='accountbillads' and fieldname='bill_country'",
-
-		"UPDATE field SET fieldlabel='Shipping City' WHERE tabid=6 and tablename='accountshipads' and fieldname='ship_city'",
-		"UPDATE field SET fieldlabel='Shipping Country' WHERE tabid=6 and tablename='accountshipads' and fieldname='ship_country'",
-		"UPDATE field SET fieldlabel='Shipping State' WHERE tabid=6 and tablename='accountshipads' and fieldname='ship_state'",
-		"UPDATE field SET fieldlabel='Shipping Code' WHERE tabid=6 and tablename='accountshipads' and fieldname='ship_code'",
-
-		"UPDATE field SET fieldlabel='Mailing City' WHERE tabid=4 and tablename='contactaddress' and fieldname='mailingcity'",
-		"UPDATE field SET fieldlabel='Mailing State' WHERE tabid=4 and tablename='contactaddress' and fieldname='mailingstate'",
-		"UPDATE field SET fieldlabel='Mailing Zip' WHERE tabid=4 and tablename='contactaddress' and fieldname='mailingzip'",
-		"UPDATE field SET fieldlabel='Mailing Country' WHERE tabid=4 and tablename='contactaddress' and fieldname='mailingcountry'",
-
-		"UPDATE field SET fieldlabel='Other City' WHERE tabid=4 and tablename='contactaddress' and fieldname='othercity'",
-		"UPDATE field SET fieldlabel='Other State' WHERE tabid=4 and tablename='contactaddress' and fieldname='otherstate'",
-		"UPDATE field SET fieldlabel='Other Zip' WHERE tabid=4 and tablename='contactaddress' and fieldname='otherzip'",
-		"UPDATE field SET fieldlabel='Other Country' WHERE tabid=4 and tablename='contactaddress' and fieldname='othercountry'",
+		"UPDATE vtiger_field SET vtiger_fieldlabel='Billing City' WHERE vtiger_tabid=6 and vtiger_tablename='accountbillads' and vtiger_fieldname='bill_city'",
+		"UPDATE vtiger_field SET vtiger_fieldlabel='Billing State' WHERE vtiger_tabid=6 and vtiger_tablename='accountbillads' and vtiger_fieldname='bill_state'",
+		"UPDATE vtiger_field SET vtiger_fieldlabel='Billing Code' WHERE vtiger_tabid=6 and vtiger_tablename='accountbillads' and vtiger_fieldname='bill_code'",
+		"UPDATE vtiger_field SET vtiger_fieldlabel='Billing Country' WHERE vtiger_tabid=6 and vtiger_tablename='accountbillads' and vtiger_fieldname='bill_country'",
+
+		"UPDATE vtiger_field SET vtiger_fieldlabel='Shipping City' WHERE vtiger_tabid=6 and vtiger_tablename='accountshipads' and vtiger_fieldname='ship_city'",
+		"UPDATE vtiger_field SET vtiger_fieldlabel='Shipping Country' WHERE vtiger_tabid=6 and vtiger_tablename='accountshipads' and vtiger_fieldname='ship_country'",
+		"UPDATE vtiger_field SET vtiger_fieldlabel='Shipping State' WHERE vtiger_tabid=6 and vtiger_tablename='accountshipads' and vtiger_fieldname='ship_state'",
+		"UPDATE vtiger_field SET vtiger_fieldlabel='Shipping Code' WHERE vtiger_tabid=6 and vtiger_tablename='accountshipads' and vtiger_fieldname='ship_code'",
+
+		"UPDATE vtiger_field SET vtiger_fieldlabel='Mailing City' WHERE vtiger_tabid=4 and vtiger_tablename='contactaddress' and vtiger_fieldname='mailingcity'",
+		"UPDATE vtiger_field SET vtiger_fieldlabel='Mailing State' WHERE vtiger_tabid=4 and vtiger_tablename='contactaddress' and vtiger_fieldname='mailingstate'",
+		"UPDATE vtiger_field SET vtiger_fieldlabel='Mailing Zip' WHERE vtiger_tabid=4 and vtiger_tablename='contactaddress' and vtiger_fieldname='mailingzip'",
+		"UPDATE vtiger_field SET vtiger_fieldlabel='Mailing Country' WHERE vtiger_tabid=4 and vtiger_tablename='contactaddress' and vtiger_fieldname='mailingcountry'",
+
+		"UPDATE vtiger_field SET vtiger_fieldlabel='Other City' WHERE vtiger_tabid=4 and vtiger_tablename='contactaddress' and vtiger_fieldname='othercity'",
+		"UPDATE vtiger_field SET vtiger_fieldlabel='Other State' WHERE vtiger_tabid=4 and vtiger_tablename='contactaddress' and vtiger_fieldname='otherstate'",
+		"UPDATE vtiger_field SET vtiger_fieldlabel='Other Zip' WHERE vtiger_tabid=4 and vtiger_tablename='contactaddress' and vtiger_fieldname='otherzip'",
+		"UPDATE vtiger_field SET vtiger_fieldlabel='Other Country' WHERE vtiger_tabid=4 and vtiger_tablename='contactaddress' and vtiger_fieldname='othercountry'",
 		);
 foreach($update_array2 as $query)
 {
@@ -293,22 +293,22 @@
 }
 
 
-//Added field emailoptout in account table
+//Added vtiger_field emailoptout in vtiger_account vtiger_table
 $newfieldid = $conn->getUniqueID("field");
-$insert_query3 = "insert into field values (6,".$newfieldid.",'emailoptout','account',1,'56','emailoptout','Email Opt Out',1,0,0,100,17,1,1,'C~O',1,'')";
+$insert_query3 = "insert into vtiger_field values (6,".$newfieldid.",'emailoptout','account',1,'56','emailoptout','Email Opt Out',1,0,0,100,17,1,1,'C~O',1,'')";
 Execute($insert_query3);
 
-//Added on 23-12-2005 because we must populate field entries in profile2field and def_org_field if we add a field in field table
+//Added on 23-12-2005 because we must populate vtiger_field entries in vtiger_profile2field and vtiger_def_org_field if we add a vtiger_field in vtiger_field vtiger_table
 populateFieldForSecurity('6',$newfieldid);
 
 //Added on 22-12-2005
-$alter_query4 = "alter table account add column emailoptout varchar(3) default 0";
+$alter_query4 = "alter vtiger_table vtiger_account add column emailoptout varchar(3) default 0";
 Execute($alter_query4);
 
 $update_array3 = Array(
-		"update field set sequence=18 where tabid=6 and fieldname ='assigned_user_id'",
-		"update field set sequence=19 where tabid=6 and fieldname ='createdtime'",
-		"update field set sequence=19 where tabid=6 and fieldname ='modifiedtime'",
+		"update vtiger_field set sequence=18 where vtiger_tabid=6 and vtiger_fieldname ='assigned_user_id'",
+		"update vtiger_field set sequence=19 where vtiger_tabid=6 and vtiger_fieldname ='createdtime'",
+		"update vtiger_field set sequence=19 where vtiger_tabid=6 and vtiger_fieldname ='modifiedtime'",
 		);
 foreach($update_array3 as $query)
 {
@@ -316,7 +316,7 @@
 }
 
 
-//create table moduleowners to assign the module and corresponding owners
+//create vtiger_table vtiger_moduleowners to assign the module and corresponding owners
 $create_query2 = "CREATE TABLE `moduleowners` (
 	  `tabid` int(19) NOT NULL default '0',
 	    `user_id` varchar(11) NOT NULL,
@@ -335,7 +335,7 @@
 */
 Execute($create_query2);
 
-//Populated the default entries for moduleowners which is created newly
+//Populated the default entries for vtiger_moduleowners which is created newly
 $module_array = Array(
 		'Potentials',
 		'Contacts',
@@ -357,18 +357,18 @@
 		);
 foreach($module_array as $mod)
 {
-	$query = "insert into moduleowners values(".$this->localGetTabID($mod).",1)";
-	Execute($query);
-}
-
-
-//Changes made to include status field in Activity Quickcreate Form
+	$query = "insert into vtiger_moduleowners values(".$this->localGetTabID($mod).",1)";
+	Execute($query);
+}
+
+
+//Changes made to include status vtiger_field in Activity Quickcreate Form
 $update_array4 = Array(
-		"UPDATE field SET quickcreate=0,quickcreatesequence=3 WHERE tabid=16 and fieldname='eventstatus'",
-		"UPDATE field SET quickcreate=0,quickcreatesequence=4 WHERE tabid=16 and fieldname='activitytype'",
-		"UPDATE field SET quickcreate=0,quickcreatesequence=5 WHERE tabid=16 and fieldname='duration_hours'",
-
-		"UPDATE field SET quickcreate=0,quickcreatesequence=3 WHERE tabid=9 and fieldname='taskstatus'",
+		"UPDATE vtiger_field SET quickcreate=0,quickcreatesequence=3 WHERE vtiger_tabid=16 and vtiger_fieldname='eventstatus'",
+		"UPDATE vtiger_field SET quickcreate=0,quickcreatesequence=4 WHERE vtiger_tabid=16 and vtiger_fieldname='activitytype'",
+		"UPDATE vtiger_field SET quickcreate=0,quickcreatesequence=5 WHERE vtiger_tabid=16 and vtiger_fieldname='duration_hours'",
+
+		"UPDATE vtiger_field SET quickcreate=0,quickcreatesequence=3 WHERE vtiger_tabid=9 and vtiger_fieldname='taskstatus'",
 		);
 foreach($update_array4 as $query)
 {
@@ -378,10 +378,10 @@
 
 
 //Table 'inventory_tandc' added newly to include Inventory Terms &Conditions
-$create_query1 = "CREATE TABLE  inventory_tandc(id INT(19),type VARCHAR(30) NOT NULL,tandc LONGTEXT default NULL,PRIMARY KEY(id))";
+$create_query1 = "CREATE TABLE  vtiger_inventory_tandc(id INT(19),type VARCHAR(30) NOT NULL,tandc LONGTEXT default NULL,PRIMARY KEY(id))";
 Execute($create_query1);
 
-$insert_query4 = "insert into inventory_tandc values('".$conn->getUniqueID('inventory_tandc')."','Inventory','  ')";
+$insert_query4 = "insert into vtiger_inventory_tandc values('".$conn->getUniqueID('inventory_tandc')."','Inventory','  ')";
 Execute($insert_query4);
 
 /****************** 5.0(Alpha) dev version 1 Database changes -- Ends*********************/
@@ -397,17 +397,17 @@
 
 /****************** 5.0(Alpha) dev version 2 Database changes -- Starts*********************/
 
-$query1 = "ALTER TABLE leadaddress change lane lane varchar(250)";
+$query1 = "ALTER TABLE vtiger_leadaddress change lane lane varchar(250)";
 Execute($query1);
 
 $rename_table_array1 = Array(
-		"update field set tablename='customerdetails' where tabid=4 and fieldname in ('portal','support_start_date','support_end_date')",
-		"alter table PortalInfo drop foreign key fk_PortalInfo",
-		"rename table PortalInfo to portalinfo",
-		"alter table portalinfo add CONSTRAINT `fk_portalinfo` FOREIGN KEY (`id`) REFERENCES `contactdetails` (`contactid`) ON DELETE CASCADE",
-		"alter table CustomerDetails drop foreign key fk_CustomerDetails",
-		"rename table CustomerDetails to customerdetails",
-		"alter table customerdetails add CONSTRAINT `fk_customerdetails` FOREIGN KEY (`customerid`) REFERENCES `contactdetails` (`contactid`) ON DELETE CASCADE"
+		"update vtiger_field set vtiger_tablename='customerdetails' where vtiger_tabid=4 and vtiger_fieldname in ('portal','support_start_date','support_end_date')",
+		"alter vtiger_table PortalInfo drop foreign key fk_PortalInfo",
+		"rename vtiger_table PortalInfo to vtiger_portalinfo",
+		"alter vtiger_table vtiger_portalinfo add CONSTRAINT `fk_portalinfo` FOREIGN KEY (`id`) REFERENCES `contactdetails` (`contactid`) ON DELETE CASCADE",
+		"alter vtiger_table CustomerDetails drop foreign key fk_CustomerDetails",
+		"rename vtiger_table CustomerDetails to vtiger_customerdetails",
+		"alter vtiger_table vtiger_customerdetails add CONSTRAINT `fk_customerdetails` FOREIGN KEY (`customerid`) REFERENCES `contactdetails` (`contactid`) ON DELETE CASCADE"
 		);
 foreach($rename_table_array1 as $query)
 {
@@ -415,12 +415,12 @@
 }
 
 
-$query2 = "create table ownernotify(crmid int(19),smownerid int(19),flag int(3))";
+$query2 = "create vtiger_table vtiger_ownernotify(crmid int(19),smownerid int(19),flag int(3))";
 Execute($query2);
 
 
-//Form the role_map_array as roleid=>name mapping array
-$sql = "select * from role";
+//Form the vtiger_role_map_array as vtiger_roleid=>name mapping array
+$sql = "select * from vtiger_role";
 $res = $conn->query($sql);
 $role_map_array = Array();
 for($i=0;$i<$conn->num_rows($res);$i++)
@@ -429,10 +429,10 @@
 	$name = $conn->query_result($res,$i,'name');
 	$role_map_array[$roleid] = $name;
 }
-//echo '<pre> List of roles :';print_r($role_map_array);echo '</pre>';
-
-//Before delete the role take a backup array for the table user2role
-$sql = "select * from user2role";
+//echo '<pre> List of vtiger_roles :';print_r($role_map_array);echo '</pre>';
+
+//Before delete the vtiger_role take a backup array for the vtiger_table vtiger_user2role
+$sql = "select * from vtiger_user2role";
 $res = $conn->query($sql);
 $user2role_array = array();
 for($i=0;$i<$conn->num_rows($res);$i++)
@@ -441,23 +441,23 @@
 	$roleid = $conn->query_result($res,$i,'roleid');
 	$user2role_array[$userid] = $roleid;
 }
-//echo '<pre> List of user2role : (userid => roleid)';print_r($user2role_array);echo '</pre>';
-
-//Delete the role entries
-$sql = "truncate role";
+//echo '<pre> List of vtiger_user2role : (userid => vtiger_roleid)';print_r($user2role_array);echo '</pre>';
+
+//Delete the vtiger_role entries
+$sql = "truncate vtiger_role";
 Execute($sql);
 
 
-$query3 = "alter table user2role drop FOREIGN KEY fk_user2role2";
+$query3 = "alter vtiger_table vtiger_user2role drop FOREIGN KEY fk_user2role2";
 Execute($query3);
 
 //4,5 th are the Extra added queries
 $alter_query_array1 = Array(
-		"alter table user2role change roleid roleid varchar(255)",
-		"alter table role2profile change roleid roleid varchar(255)",
-		"alter table role CHANGE roleid roleid varchar(255)",
-		"alter table role2profile drop PRIMARY KEY",
-		"alter table role2profile ADD PRIMARY KEY (roleid,profileid)"
+		"alter vtiger_table vtiger_user2role change vtiger_roleid vtiger_roleid varchar(255)",
+		"alter vtiger_table vtiger_role2profile change vtiger_roleid vtiger_roleid varchar(255)",
+		"alter vtiger_table vtiger_role CHANGE vtiger_roleid vtiger_roleid varchar(255)",
+		"alter vtiger_table vtiger_role2profile drop PRIMARY KEY",
+		"alter vtiger_table vtiger_role2profile ADD PRIMARY KEY (roleid,profileid)"
 		);
 foreach($alter_query_array1 as $query)
 {
@@ -465,14 +465,14 @@
 }
 
 
-$query4 = "ALTER TABLE user2role ADD CONSTRAINT fk_user2role2 FOREIGN KEY (roleid) REFERENCES role(roleid) ON DELETE CASCADE";
+$query4 = "ALTER TABLE vtiger_user2role ADD CONSTRAINT fk_user2role2 FOREIGN KEY (roleid) REFERENCES vtiger_role(roleid) ON DELETE CASCADE";
 Execute($query4);
 
 $alter_query_array2 = Array(
-		"alter table role CHANGE name rolename varchar(200)",
-		"alter table role DROP description",
-		"alter table role add parentrole varchar(255)",
-		"alter table role add depth int(19)"
+		"alter vtiger_table vtiger_role CHANGE name vtiger_rolename varchar(200)",
+		"alter vtiger_table vtiger_role DROP description",
+		"alter vtiger_table vtiger_role add parentrole varchar(255)",
+		"alter vtiger_table vtiger_role add depth int(19)"
 		);
 foreach($alter_query_array2 as $query)
 {
@@ -481,17 +481,17 @@
 
 
 
-$query5 = "insert into role values('H1','Organisation','H1',0)";
+$query5 = "insert into vtiger_role values('H1','Organisation','H1',0)";
 Execute($query5);
 
 //include("include/utils/UserInfoUtil.php");
-//Create role based on role_map_array values and form the new_role_map_array with old roleid and new roleid
+//Create vtiger_role based on vtiger_role_map_array values and form the new_role_map_array with old vtiger_roleid and new vtiger_roleid
 foreach($role_map_array as $roleid => $rolename)
 {
 	$parentRole = 'H1';
 	if($rolename == 'standard_user')
 	{
-		$rs = $conn->query("select * from role where rolename='administrator'");
+		$rs = $conn->query("select * from vtiger_role where vtiger_rolename='administrator'");
 		$parentRole = $conn->query_result($rs,0,'roleid');
 	}
 	$empty_array = array(""=>"");
@@ -500,42 +500,42 @@
 }
 
 //Before insert the new entry we should remove the old entries -- added on 06-06-06
-$user2role_del = "truncate user2role";
+$user2role_del = "truncate vtiger_user2role";
 Execute($user2role_del);
 
-//First we will insert the old values from user2role_array to user2role table and then update the new role id
+//First we will insert the old values from vtiger_user2role_array to vtiger_user2role vtiger_table and then update the new vtiger_role id
 foreach($user2role_array as $userid => $roleid)
 {
-	$sql = "insert into user2role (userid, roleid) values(".$userid.",'".$new_role_map_array[$roleid]."')";
+	$sql = "insert into vtiger_user2role (userid, vtiger_roleid) values(".$userid.",'".$new_role_map_array[$roleid]."')";
 	Execute($sql);
 }
-//Commented the following loop as we have backup the user2role and insert the entries with the new rold id using new_role_map_array above
-//Update the user2role table with new roleid
+//Commented the following loop as we have backup the vtiger_user2role and insert the entries with the new rold id using new_role_map_array above
+//Update the vtiger_user2role vtiger_table with new vtiger_roleid
 /*
    foreach($new_role_map_array as $old_roleid => $new_roleid)
    {
-   $update_user2role = "update user2role set roleid='".$new_roleid."' where roleid=".$old_roleid;
+   $update_user2role = "update vtiger_user2role set vtiger_roleid='".$new_roleid."' where vtiger_roleid=".$old_roleid;
    Execute($update_user2role);
    }
  */
-//Update the role2profile table with new roleid
+//Update the vtiger_role2profile vtiger_table with new vtiger_roleid
 foreach($new_role_map_array as $old_roleid => $new_roleid)
 {
-	$update_role2profile = "update role2profile set roleid='".$new_roleid."' where roleid=".$old_roleid;
+	$update_role2profile = "update vtiger_role2profile set vtiger_roleid='".$new_roleid."' where vtiger_roleid=".$old_roleid;
 	Execute($update_role2profile);
 }
 
 
 
 //Group Migration:
-//Step 1 :  form and group_map_array as groupname => description from groups table
-//Step 2 :  form an users2group_map_array array as userid => groupname from users2group table
-//Step 3 :  delete all entries from groups table and enter new values from group_map_array
-//Step 4 :  drop the table users2group and create new table
-//Step 5 :  put entries to users2group table based on users2group_map_array. Here get the groupid from groups table based on groupname
+//Step 1 :  form and group_map_array as groupname => description from vtiger_groups vtiger_table
+//Step 2 :  form an vtiger_users2group_map_array array as userid => groupname from vtiger_users2group vtiger_table
+//Step 3 :  delete all entries from vtiger_groups vtiger_table and enter new values from group_map_array
+//Step 4 :  drop the vtiger_table vtiger_users2group and create new vtiger_table
+//Step 5 :  put entries to vtiger_users2group vtiger_table based on vtiger_users2group_map_array. Here get the groupid from vtiger_groups vtiger_table based on groupname
 
 //Step 1 : Form the group_map_array as groupname => description
-$sql = "select * from groups";
+$sql = "select * from vtiger_groups";
 $res = $conn->query($sql);
 $group_map_array = Array();
 for($i=0;$i<$conn->num_rows($res);$i++)
@@ -547,8 +547,8 @@
 //echo '<pre>List of Groups : ';print_r($group_map_array);echo '</pre>';
 
 
-//Step 2 : form an users2group_map_array array as userid => groupname from users2group table
-$sql = "select * from users2group";
+//Step 2 : form an vtiger_users2group_map_array array as userid => groupname from vtiger_users2group vtiger_table
+$sql = "select * from vtiger_users2group";
 $res = $conn->query($sql);
 $users2group_map_array = Array();
 for($i=0;$i<$conn->num_rows($res);$i++)
@@ -557,18 +557,18 @@
 	$userid = $conn->query_result($res,$i,'userid');
 	$users2group_map_array[$userid] = $groupname;
 }
-//echo '<pre>List of users2group : ';print_r($users2group_map_array);echo '</pre>';
-
-//Step 3 : delete all entries from groups table
-$sql = "truncate groups";
+//echo '<pre>List of vtiger_users2group : ';print_r($users2group_map_array);echo '</pre>';
+
+//Step 3 : delete all entries from vtiger_groups vtiger_table
+$sql = "truncate vtiger_groups";
 Execute($sql);
 
 $alter_query_array3 = Array(
-		"alter table users2group drop FOREIGN KEY fk_users2group",
-		"alter table leadgrouprelation drop FOREIGN KEY fk_leadgrouprelation2",
-		"alter table activitygrouprelation drop FOREIGN KEY fk_activitygrouprelation2",
-		"alter table ticketgrouprelation drop FOREIGN KEY fk_ticketgrouprelation2",
-		"alter table groups drop PRIMARY KEY"
+		"alter vtiger_table vtiger_users2group drop FOREIGN KEY fk_users2group",
+		"alter vtiger_table vtiger_leadgrouprelation drop FOREIGN KEY fk_leadgrouprelation2",
+		"alter vtiger_table vtiger_activitygrouprelation drop FOREIGN KEY fk_activitygrouprelation2",
+		"alter vtiger_table vtiger_ticketgrouprelation drop FOREIGN KEY fk_ticketgrouprelation2",
+		"alter vtiger_table vtiger_groups drop PRIMARY KEY"
 		);
 foreach($alter_query_array3 as $query)
 {
@@ -576,12 +576,12 @@
 }
 
 //2 nd query is the Extra added query
-//Adding columns in group table:
+//Adding columns in group vtiger_table:
 $alter_query_array4 = Array(
-		"alter table groups add column groupid int(19) FIRST",
-		"alter table groups change name  groupname varchar(100)",
-		"alter table groups ADD PRIMARY KEY (groupid)",
-		"alter table groups add index (groupname)"
+		"alter vtiger_table vtiger_groups add column groupid int(19) FIRST",
+		"alter vtiger_table vtiger_groups change name  groupname varchar(100)",
+		"alter vtiger_table vtiger_groups ADD PRIMARY KEY (groupid)",
+		"alter vtiger_table vtiger_groups add index (groupname)"
 		);
 foreach($alter_query_array4 as $query)
 {
@@ -589,7 +589,7 @@
 }
 
 
-//Moved the create table queries for group2grouprel, group2role, group2rs from the end of this block
+//Moved the create vtiger_table queries for vtiger_group2grouprel, vtiger_group2role, vtiger_group2rs from the end of this block
 //Added on 06-06-06
 $query8 = "CREATE TABLE `group2grouprel` (
 	  `groupid` int(19) NOT NULL,
@@ -641,7 +641,7 @@
 */
 Execute($query10);
 
-//Insert all the retrieved old values to the new groups table ie., create new groups
+//Insert all the retrieved old values to the new vtiger_groups vtiger_table ie., create new vtiger_groups
 foreach($group_map_array as $groupname => $description)
 {
 	$empty_array = array(
@@ -655,10 +655,10 @@
 }
 
 
-//Copy all mappings in a user2grop table in a array;
-
-//Step 4 : Drop and again create users2group
-$query6 = "drop table users2group";
+//Copy all mappings in a user2grop vtiger_table in a array;
+
+//Step 4 : Drop and again create vtiger_users2group
+$query6 = "drop vtiger_table vtiger_users2group";
 Execute($query6);
 
 //Added on 06-06-06
@@ -679,30 +679,30 @@
 */
 Execute($query7);
 
-//Step 5 : put entries to users2group table based on users2group_map_array. Here get the groupid from groups table based on groupname
+//Step 5 : put entries to vtiger_users2group vtiger_table based on vtiger_users2group_map_array. Here get the groupid from vtiger_groups vtiger_table based on groupname
 foreach($users2group_map_array as $userid => $groupname)
 {
-	//$groupid = $conn->query_result($conn->query("select * from groups where groupname='".$groupname."'"),0,'groupid');
-	$sql = "insert into users2group (groupid,userid) values(".$group_name_id_mapping[$groupname].",".$userid.")";
+	//$groupid = $conn->query_result($conn->query("select * from vtiger_groups where groupname='".$groupname."'"),0,'groupid');
+	$sql = "insert into vtiger_users2group (groupid,userid) values(".$group_name_id_mapping[$groupname].",".$userid.")";
 	Execute($sql);
 }
 
 
 $alter_query_array5 = Array(
-		"alter table leadgrouprelation ADD CONSTRAINT fk_leadgrouprelation2 FOREIGN KEY (groupname) REFERENCES groups(groupname) ON DELETE CASCADE",
-		"ALTER TABLE activitygrouprelation ADD CONSTRAINT fk_activitygrouprelation2 FOREIGN KEY (groupname) REFERENCES groups(groupname) ON DELETE CASCADE",
-		"ALTER TABLE ticketgrouprelation ADD CONSTRAINT fk_ticketgrouprelation2 FOREIGN KEY (groupname) REFERENCES groups(groupname) ON DELETE CASCADE"
+		"alter vtiger_table vtiger_leadgrouprelation ADD CONSTRAINT fk_leadgrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE",
+		"ALTER TABLE vtiger_activitygrouprelation ADD CONSTRAINT fk_activitygrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE",
+		"ALTER TABLE vtiger_ticketgrouprelation ADD CONSTRAINT fk_ticketgrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE"
 		);
 foreach($alter_query_array5 as $query)
 {
 	Execute($query);
 }
-//Moved the create table queries for group2grouprel, group2role, group2rs to before creatinf the Group ie., before call the createGroup
-
-
-/***Added to include decimal places for amount field in potential table  --by Mangai 15-Nov-2005***/
-
-$query11 = "ALTER TABLE potential change amount amount decimal(10,2)";
+//Moved the create vtiger_table queries for vtiger_group2grouprel, vtiger_group2role, vtiger_group2rs to before creatinf the Group ie., before call the createGroup
+
+
+/***Added to include decimal places for amount vtiger_field in vtiger_potential vtiger_table  --by Mangai 15-Nov-2005***/
+
+$query11 = "ALTER TABLE vtiger_potential change amount amount decimal(10,2)";
 Execute($query11);
 
 /****************** 5.0(Alpha) dev version 2 Database changes -- Ends*********************/
@@ -720,10 +720,10 @@
 
 /****************** 5.0(Alpha) dev version 3 Database changes -- Starts*********************/
 
-//Drop the column company_name from vendor table ---- modified by Mickie on 18-11-2005
-$altersql1 = "alter table vendor drop column company_name";
+//Drop the column company_name from vtiger_vendor vtiger_table ---- modified by Mickie on 18-11-2005
+$altersql1 = "alter vtiger_table vtiger_vendor drop column company_name";
 Execute($altersql1);
-//TODO (check): Remove this company_name entry from the field table if it already exists
+//TODO (check): Remove this company_name entry from the vtiger_field vtiger_table if it already exists
 
 //Migration for Default Organisation Share -- Added by Don on 20-11-2005
 
@@ -743,24 +743,24 @@
 Execute($query2);
 
 
-$query3 = "alter table def_org_share add column editstatus int(19)";
+$query3 = "alter vtiger_table vtiger_def_org_share add column editstatus int(19)";
 Execute($query3);
 
-$query4 = "delete from def_org_share where tabid in(8,14,15,18,19)";
+$query4 = "delete from vtiger_def_org_share where vtiger_tabid in(8,14,15,18,19)";
 Execute($query4);
 
 
 
 //Inserting values into org share action mapping
 $insert_query_array1 = Array(
-			"insert into org_share_action_mapping values(0,'Public: Read Only')",
-			"insert into org_share_action_mapping values(1,'Public:Read,Create/Edit')",
-			"insert into org_share_action_mapping values(2,'Public: Read, Create/Edit, Delete')",
-			"insert into org_share_action_mapping values(3,'Private')",
-			"insert into org_share_action_mapping values(4,'Hide Details')",
-			"insert into org_share_action_mapping values(5,'Hide Details and Add Events')",
-			"insert into org_share_action_mapping values(6,'Show Details')",
-			"insert into org_share_action_mapping values(7,'Show Details and Add Events')"
+			"insert into vtiger_org_share_action_mapping values(0,'Public: Read Only')",
+			"insert into vtiger_org_share_action_mapping values(1,'Public:Read,Create/Edit')",
+			"insert into vtiger_org_share_action_mapping values(2,'Public: Read, Create/Edit, Delete')",
+			"insert into vtiger_org_share_action_mapping values(3,'Private')",
+			"insert into vtiger_org_share_action_mapping values(4,'Hide Details')",
+			"insert into vtiger_org_share_action_mapping values(5,'Hide Details and Add Events')",
+			"insert into vtiger_org_share_action_mapping values(6,'Show Details')",
+			"insert into vtiger_org_share_action_mapping values(7,'Show Details and Add Events')"
 			);
 foreach($insert_query_array1 as $query)
 {
@@ -768,15 +768,15 @@
 }
 
 
-//Inserting for all tabs
+//Inserting for all vtiger_tabs
 $def_org_tabid=Array(2,4,6,7,9,10,13,16,20,21,22,23,26);
 foreach($def_org_tabid as $def_tabid)
 {
 	$insert_query_array2 = Array(
-			"insert into org_share_action2tab values(0,".$def_tabid.")",
-			"insert into org_share_action2tab values(1,".$def_tabid.")",
-			"insert into org_share_action2tab values(2,".$def_tabid.")",
-			"insert into org_share_action2tab values(3,".$def_tabid.")"
+			"insert into vtiger_org_share_action2tab values(0,".$def_tabid.")",
+			"insert into vtiger_org_share_action2tab values(1,".$def_tabid.")",
+			"insert into vtiger_org_share_action2tab values(2,".$def_tabid.")",
+			"insert into vtiger_org_share_action2tab values(3,".$def_tabid.")"
 			);
 	foreach($insert_query_array2 as $query)
 	{
@@ -785,10 +785,10 @@
 }
 
 $insert_query_array3 = Array(
-		"insert into org_share_action2tab values(4,17)",
-		"insert into org_share_action2tab values(5,17)",
-		"insert into org_share_action2tab values(6,17)",
-		"insert into org_share_action2tab values(7,17)"
+		"insert into vtiger_org_share_action2tab values(4,17)",
+		"insert into vtiger_org_share_action2tab values(5,17)",
+		"insert into vtiger_org_share_action2tab values(6,17)",
+		"insert into vtiger_org_share_action2tab values(7,17)"
 		);
 foreach($insert_query_array3 as $query)
 {
@@ -796,11 +796,11 @@
 }
 
 $query_array1 = Array(
-		"insert into def_org_share values(9,17,7,0)",
-		"update def_org_share set editstatus=0",
-		"update def_org_share set editstatus=2 where tabid=4",
-		"update def_org_share set editstatus=1 where tabid=9",
-		"update def_org_share set editstatus=2 where tabid=16"
+		"insert into vtiger_def_org_share values(9,17,7,0)",
+		"update vtiger_def_org_share set editstatus=0",
+		"update vtiger_def_org_share set editstatus=2 where vtiger_tabid=4",
+		"update vtiger_def_org_share set editstatus=1 where vtiger_tabid=9",
+		"update vtiger_def_org_share set editstatus=2 where vtiger_tabid=16"
 		);
 foreach($query_array1 as $query)
 {
@@ -814,8 +814,8 @@
 $conn->println("Database Modifications for 5.0(Alpha) Dev 3 ==> 5.0 Alpha starts here.");
 //echo "<br><br><b>Database Modifications for 5.0(Alpha) Dev3 ==> 5.0 Alpha starts here.....</b><br>";
 $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"
+				"ALTER TABLE vtiger_users ADD column vtiger_activity_view VARCHAR(25) DEFAULT 'Today' AFTER homeorder",
+				"ALTER TABLE vtiger_activity ADD column notime CHAR(3) DEFAULT '0' AFTER location"
 			   );
 foreach($alter_query_array6 as $query)
 {
@@ -823,8 +823,8 @@
 }
 
 $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,'')"
+				"Insert into vtiger_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 vtiger_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)
 {
@@ -832,20 +832,20 @@
 }
 
 $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"
+				"alter vtiger_table vtiger_vendor add column pobox varchar(30) after state",
+				"alter vtiger_table vtiger_leadaddress add column pobox varchar(30) after state",
+				"alter vtiger_table vtiger_accountbillads add column pobox varchar(30) after state",
+				"alter vtiger_table vtiger_accountshipads add column pobox varchar(30) after state",
+				"alter vtiger_table vtiger_contactaddress add column mailingpobox varchar(30) after mailingstate",
+				"alter vtiger_table vtiger_contactaddress add column otherpobox varchar(30) after otherstate",
+				"alter vtiger_table vtiger_quotesbillads add column bill_pobox varchar(30) after bill_street",
+				"alter vtiger_table vtiger_quotesshipads add column ship_pobox varchar(30) after ship_street",
+				"alter vtiger_table vtiger_pobillads add column bill_pobox varchar(30) after bill_street",
+				"alter vtiger_table vtiger_poshipads add column ship_pobox varchar(30) after ship_street",
+				"alter vtiger_table vtiger_sobillads add column bill_pobox varchar(30) after bill_street",
+				"alter vtiger_table vtiger_soshipads add column ship_pobox varchar(30) after ship_street",
+				"alter vtiger_table vtiger_invoicebillads add column bill_pobox varchar(30) after bill_street",
+				"alter vtiger_table vtiger_invoiceshipads add column ship_pobox varchar(30) after ship_street"
 			   );
 foreach($alter_query_array7 as $query)
 {
@@ -853,27 +853,27 @@
 }
 
 $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 vtiger_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 vtiger_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 vtiger_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 vtiger_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,'')"
+				"insert into vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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)
 {
@@ -892,7 +892,7 @@
 	$n = $n+5;
 	for($i = 0;$i < 5;$i++)
 	{
-		$query1 = "update field set sequence=".$sequence[$j]." where tablename='".$tablename[$n+$i]."' && fieldname='".$fieldname[$j]."'";
+		$query1 = "update vtiger_field set sequence=".$sequence[$j]." where vtiger_tablename='".$tablename[$n+$i]."' && vtiger_fieldname='".$fieldname[$j]."'";
 		Execute($query1);
 	}
 }
@@ -902,7 +902,7 @@
 $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]."'";
+	$query2 = "update vtiger_field set sequence=".$sequence[$i]." where vtiger_tablename='".$tablename."' && vtiger_fieldname='".$fieldname[$i]."'";
 	Execute($query2);
 }
 
@@ -912,7 +912,7 @@
 
 for($i = 0;$i < 4;$i++)
 {
-	$query3 = "update field set sequence=".$sequence[$i]." where tablename='".$tablename."' && fieldname='".$fieldname[$i]."'";
+	$query3 = "update vtiger_field set sequence=".$sequence[$i]." where vtiger_tablename='".$tablename."' && vtiger_fieldname='".$fieldname[$i]."'";
 	Execute($query3);
 }
 
@@ -922,43 +922,43 @@
 
 for($i = 0;$i < 8;$i++)
 {
-	$query = "update field set sequence=".$sequence[$i]." where tablename='".$tablename."' && fieldname='".$fieldname[$i]."'";
+	$query = "update vtiger_field set sequence=".$sequence[$i]." where vtiger_tablename='".$tablename."' && vtiger_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"
+			"update vtiger_field set vtiger_tablename='crmentity' where vtiger_tabid=10 and vtiger_fieldname='description'",
+			"update vtiger_field set vtiger_tablename='attachments' where vtiger_tabid=10 and vtiger_fieldname='filename'",
+			"drop vtiger_table emails",
+
+			"alter vtiger_table vtiger_activity drop column description",
+			"update vtiger_field set vtiger_tablename='crmentity' where vtiger_tabid in (9,16) and vtiger_fieldname='description'",
+
+			"update vtiger_tab set name='PurchaseOrder',tablabel='PurchaseOrder' where vtiger_tabid=21",
+			"update vtiger_tab set presence=0 where vtiger_tabid=22 and name='SalesOrder'",
+
+			"delete from vtiger_actionmapping where actionname='SalesOrderDetailView'",
+			"delete from vtiger_actionmapping where actionname='SalesOrderEditView'",
+			"delete from vtiger_actionmapping where actionname='SaveSalesOrder'",
+			"delete from vtiger_actionmapping where actionname='DeleteSalesOrder'",
+
+			"insert into vtiger_field values (13,".$conn->getUniqueID("field").",'filename','attachments',1,'61','filename','Attachment',1,0,0,100,12,2,1,'V~O',0,1)",
+
+			"alter vtiger_table vtiger_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))";
+$create_query3 = "create vtiger_table vtiger_parenttab(parenttabid int(19) not null, vtiger_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)";
+$create_query4 = "create vtiger_table vtiger_parenttabrel(parenttabid int(3) not null, vtiger_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), (2,6,2), (2,4,3) "
+				"insert into vtiger_parenttab values(1,'My Home Page',1,0),(2,'Marketing',2,0),(3,'Sales',3,0),(4,'Support',4,0),(5,'Analytics',5,0),(6,'Inventory',6,0), (7,'Tools',7,0),(8,'Settings',8,0)",
+				"insert into vtiger_parenttabrel values(1,9,2),(1,17,3),(1,10,4),(1,3,1),(3,7,1),(3,6,2),(3,4,3),(3,2,4),(3,20,5),(3,22,6),(3,23,7),(3,14,8),(3,19,9),(3,8,10),(4,13,1),(4,15,2),(4,6,3),(4,4,4),(4,14,5),(4,8,6),(5,1,1),(5,25,2),(6,14,1), (6,18,2), (6,19,3), (6,21,4), (6,22,5), (6,20,6), (6,23,7), (7,24,1), (7,27,2), (7,8,3), (2,26,1), (2,6,2), (2,4,3) "
 			    );
 foreach($insert_query_array4 as $query)
 {
@@ -966,100 +966,100 @@
 }
 
 
-$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))";
+$create_query5 = "CREATE TABLE vtiger_blocks ( blockid int(19) NOT NULL, vtiger_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",//Modified on 24-04-06
-				"update field set block=4 where tabid=4 and block=1",
-				"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",
+				"update vtiger_field set block=2 where vtiger_tabid=2 and block=5",
+				"update vtiger_field set block=3 where vtiger_tabid=2 and block=2",
+
+				//"update vtiger_field set block=4 where vtiger_tabid=4 and block=1",
+				"update vtiger_field set block=5 where vtiger_tabid=4 and block=5",
+				"update vtiger_field set block=6 where vtiger_tabid=4 and block=4",//Modified on 24-04-06
+				"update vtiger_field set block=4 where vtiger_tabid=4 and block=1",
+				"update vtiger_field set block=7 where vtiger_tabid=4 and block=2",
+				"update vtiger_field set block=8 where vtiger_tabid=4 and block=3",
+
+				"update vtiger_field set block=9 where vtiger_tabid=6 and block=1",
+				"update vtiger_field set block=10 where vtiger_tabid=6 and block=5",
+				"update vtiger_field set block=11 where vtiger_tabid=6 and block=2",
+				"update vtiger_field set block=12 where vtiger_tabid=6 and block=3",
+
+				"update vtiger_field set block=13 where vtiger_tabid=7 and block=1",
+				"update vtiger_field set block=14 where vtiger_tabid=7 and block=5",
+				"update vtiger_field set block=15 where vtiger_tabid=7 and block=2",
+				"update vtiger_field set block=16 where vtiger_tabid=7 and block=3",
+
+				"update vtiger_field set block=17 where vtiger_tabid=8 and block=1",
+				"update vtiger_field set block=17 where vtiger_tabid=8 and block=2",
+				"update vtiger_field set block=18 where vtiger_tabid=8 and block=3",
+
+				"update vtiger_field set block=19 where vtiger_tabid=9 and block=1",
+				"update vtiger_field set block=19 where vtiger_tabid=9 and block=7",
+				"update vtiger_field set block=20 where vtiger_tabid=9 and block=2",
+
+				"update vtiger_field set block=21 where vtiger_tabid=10 and block=1",
+				"update vtiger_field set block=22 where vtiger_tabid=10 and block=2",
+				"update vtiger_field set block=23 where vtiger_tabid=10 and block=3",
+				"update vtiger_field set block=23 where vtiger_tabid=10 and block=4",
+				"update vtiger_field set block=24 where vtiger_tabid=10 and block=5",
+
+				"update vtiger_field set block=25 where vtiger_tabid=13 and block=1",
+				"update vtiger_field set block=26 where vtiger_tabid=13 and block=2",
+				"update vtiger_field set block=27 where vtiger_tabid=13 and block=5",
+				"update vtiger_field set block=28 where vtiger_tabid=13 and block=3",
+				"update vtiger_field set block=29 where vtiger_tabid=13 and block=4",
+				"update vtiger_field set block=30 where vtiger_tabid=13 and block=6",
+
+				"update vtiger_field set block=31 where vtiger_tabid=14 and block=1",
+				"update vtiger_field set block=32 where vtiger_tabid=14 and block=2",
+				"update vtiger_field set block=33 where vtiger_tabid=14 and block=3",
+				"update vtiger_field set block=34 where vtiger_tabid=14 and block=5",
+				"update vtiger_field set block=35 where vtiger_tabid=14 and block=6",
+				"update vtiger_field set block=36 where vtiger_tabid=14 and block=4",
+
+				"update vtiger_field set block=37 where vtiger_tabid=15 and block=1",
+				"update vtiger_field set block=38 where vtiger_tabid=15 and block=2",
+				"update vtiger_field set block=39 where vtiger_tabid=15 and block=3",
+				"update vtiger_field set block=40 where vtiger_tabid=15 and block=4",
+
+				"update vtiger_field set block=41 where vtiger_tabid=16 and block=1",
+				"update vtiger_field set block=42 where vtiger_tabid=16 and block=7",
+				"update vtiger_field set block=43 where vtiger_tabid=16 and block=2",
+
+				"update vtiger_field set block=44 where vtiger_tabid=18 and block=1",
+				"update vtiger_field set block=45 where vtiger_tabid=18 and block=5",
+				"update vtiger_field set block=36 where vtiger_tabid=18 and block=2",
+				"update vtiger_field set block=47 where vtiger_tabid=18 and block=3",
+
+				"update vtiger_field set block=48 where vtiger_tabid=19 and block=1",
+				"update vtiger_field set block=49 where vtiger_tabid=19 and block=5",
+				"update vtiger_field set block=50 where vtiger_tabid=19 and block=2",
+
+				"update vtiger_field set block=51 where vtiger_tabid=20 and block=1",
+				"update vtiger_field set block=52 where vtiger_tabid=20 and block=5",
+				"update vtiger_field set block=53 where vtiger_tabid=20 and block=2",
+				"update vtiger_field set block=55 where vtiger_tabid=20 and block=6",
+				"update vtiger_field set block=56 where vtiger_tabid=20 and block=3",
+
+				"update vtiger_field set block=57 where vtiger_tabid=21 and block=1",
+				"update vtiger_field set block=58 where vtiger_tabid=21 and block=5",
+				"update vtiger_field set block=59 where vtiger_tabid=21 and block=2",
+				"update vtiger_field set block=61 where vtiger_tabid=21 and block=6",
+				"update vtiger_field set block=62 where vtiger_tabid=21 and block=3",
+
+				"update vtiger_field set block=63 where vtiger_tabid=22 and block=1",
+				"update vtiger_field set block=64 where vtiger_tabid=22 and block=5",
+				"update vtiger_field set block=65 where vtiger_tabid=22 and block=2",
+				"update vtiger_field set block=67 where vtiger_tabid=22 and block=6",
+				"update vtiger_field set block=68 where vtiger_tabid=22 and block=3",
+
+
+				"update vtiger_field set block=69 where vtiger_tabid=23 and block=1",
+				"update vtiger_field set block=70 where vtiger_tabid=23 and block=5",
+				"update vtiger_field set block=71 where vtiger_tabid=23 and block=2",
+				"update vtiger_field set block=73 where vtiger_tabid=23 and block=6",
+				"update vtiger_field set block=74 where vtiger_tabid=23 and block=3",
 			    );
 foreach($update_query_array1 as $query)
 {
@@ -1067,80 +1067,80 @@
 }
 
 $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)"
+				"insert into vtiger_blocks values (1,2,'LBL_OPPORTUNITY_INFORMATION',1,0,0,0,0,0)",
+				"insert into vtiger_blocks values (2,2,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)",
+				"insert into vtiger_blocks values (3,2,'LBL_DESCRIPTION_INFORMATION',3,0,0,0,0,0)",
+				"insert into vtiger_blocks values (4,4,'LBL_CONTACT_INFORMATION',1,0,0,0,0,0)",
+				"insert into vtiger_blocks values (5,4,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)",
+				"insert into vtiger_blocks values (6,4,'LBL_CUSTOMER_PORTAL_INFORMATION',3,0,0,0,0,0)",
+				"insert into vtiger_blocks values (7,4,'LBL_ADDRESS_INFORMATION',4,0,0,0,0,0)",
+				"insert into vtiger_blocks values (8,4,'LBL_DESCRIPTION_INFORMATION',5,0,0,0,0,0)",
+				"insert into vtiger_blocks values (9,6,'LBL_ACCOUNT_INFORMATION',1,0,0,0,0,0)",
+				"insert into vtiger_blocks values (10,6,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)",
+				"insert into vtiger_blocks values (11,6,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)",
+				"insert into vtiger_blocks values (12,6,'LBL_DESCRIPTION_INFORMATION',4,0,0,0,0,0)",
+				"insert into vtiger_blocks values (13,7,'LBL_LEAD_INFORMATION',1,0,0,0,0,0)",
+				"insert into vtiger_blocks values (14,7,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)",
+				"insert into vtiger_blocks values (15,7,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)",
+				"insert into vtiger_blocks values (16,7,'LBL_DESCRIPTION_INFORMATION',4,0,0,0,0,0)",
+				"insert into vtiger_blocks values (17,8,'LBL_NOTE_INFORMATION',1,0,0,0,0,0)",
+				"insert into vtiger_blocks values (18,8,'',2,1,0,0,0,0)",
+				"insert into vtiger_blocks values (19,9,'LBL_TASK_INFORMATION',1,0,0,0,0,0)",
+				"insert into vtiger_blocks values (20,9,'',2,1,0,0,0,0)",
+				"insert into vtiger_blocks values (21,10,'LBL_EMAIL_INFORMATION',1,0,0,0,0,0)",
+				"insert into vtiger_blocks values (22,10,'',2,1,0,0,0,0)",
+				"insert into vtiger_blocks values (23,10,'',3,1,0,0,0,0)",
+				"insert into vtiger_blocks values (24,10,'',4,1,0,0,0,0)",
+				"insert into vtiger_blocks values (25,13,'LBL_TICKET_INFORMATION',1,0,0,0,0,0)",
+				"insert into vtiger_blocks values (26,13,'',2,1,0,0,0,0)",
+				"insert into vtiger_blocks values (27,13,'LBL_CUSTOM_INFORMATION',3,0,0,0,0,0)",
+				"insert into vtiger_blocks values (28,13,'LBL_DESCRIPTION_INFORMATION',4,0,0,0,0,0)",
+				"insert into vtiger_blocks values (29,13,'LBL_TICKET_RESOLUTION',5,0,0,1,0,0)",
+				"insert into vtiger_blocks values (30,13,'LBL_COMMENTS',6,0,0,1,0,0)",
+				"insert into vtiger_blocks values (31,14,'LBL_PRODUCT_INFORMATION',1,0,0,0,0,0)",
+				"insert into vtiger_blocks values (32,14,'LBL_PRICING_INFORMATION',2,0,0,0,0,0)",
+				"insert into vtiger_blocks values (33,14,'LBL_STOCK_INFORMATION',3,0,0,0,0,0)",
+				"insert into vtiger_blocks values (34,14,'LBL_CUSTOM_INFORMATION',4,0,0,0,0,0)",
+				"insert into vtiger_blocks values (35,14,'LBL_IMAGE_INFORMATION',5,0,0,0,0,0)",
+				"insert into vtiger_blocks values (36,14,'LBL_DESCRIPTION_INFORMATION',6,0,0,0,0,0)",
+				"insert into vtiger_blocks values (37,15,'LBL_FAQ_INFORMATION',1,0,0,0,0,0)",
+				"insert into vtiger_blocks values (38,15,'',2,1,0,0,0,0)",
+				"insert into vtiger_blocks values (39,15,'',3,1,0,0,0,0)",
+				"insert into vtiger_blocks values (40,15,'LBL_COMMENT_INFORMATION',4,0,0,1,0,0)",
+				"insert into vtiger_blocks values (41,16,'LBL_EVENT_INFORMATION',1,0,0,0,0,0)",
+				"insert into vtiger_blocks values (42,16,'',2,1,0,0,0,0)",
+				"insert into vtiger_blocks values (43,16,'',3,1,0,0,0,0)",
+				"insert into vtiger_blocks values (44,18,'LBL_VENDOR_INFORMATION',1,0,0,0,0,0)",
+				"insert into vtiger_blocks values (45,18,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)",
+				"insert into vtiger_blocks values (46,18,'LBL_VENDOR_ADDRESS_INFORMATION',3,0,0,0,0,0)",
+				"insert into vtiger_blocks values (47,18,'LBL_DESCRIPTION_INFORMATION',4,0,0,0,0,0)",
+				"insert into vtiger_blocks values (48,19,'LBL_PRICEBOOK_INFORMATION',1,0,0,0,0,0)",
+				"insert into vtiger_blocks values (49,19,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)",
+				"insert into vtiger_blocks values (50,19,'LBL_DESCRIPTION_INFORMATION',3,0,0,0,0,0)",
+				"insert into vtiger_blocks values (51,20,'LBL_QUOTE_INFORMATION',1,0,0,0,0,0)",
+				"insert into vtiger_blocks values (52,20,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)",
+				"insert into vtiger_blocks values (53,20,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)",
+				"insert into vtiger_blocks values (54,20,'LBL_RELATED_PRODUCTS',4,0,0,0,0,0)",
+				"insert into vtiger_blocks values (55,20,'LBL_TERMS_INFORMATION',5,0,0,0,0,0)",
+				"insert into vtiger_blocks values (56,20,'LBL_DESCRIPTION_INFORMATION',6,0,0,0,0,0)",
+				"insert into vtiger_blocks values (57,21,'LBL_PO_INFORMATION',1,0,0,0,0,0)",
+				"insert into vtiger_blocks values (58,21,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)",
+				"insert into vtiger_blocks values (59,21,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)",
+				"insert into vtiger_blocks values (60,21,'LBL_RELATED_PRODUCTS',4,0,0,0,0,0)",
+				"insert into vtiger_blocks values (61,21,'LBL_TERMS_INFORMATION',5,0,0,0,0,0)",
+				"insert into vtiger_blocks values (62,21,'LBL_DESCRIPTION_INFORMATION',6,0,0,0,0,0)",
+				"insert into vtiger_blocks values (63,22,'LBL_SO_INFORMATION',1,0,0,0,0,0)",
+				"insert into vtiger_blocks values (64,22,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)",
+				"insert into vtiger_blocks values (65,22,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)",
+				"insert into vtiger_blocks values (66,22,'LBL_RELATED_PRODUCTS',4,0,0,0,0,0)",
+				"insert into vtiger_blocks values (67,22,'LBL_TERMS_INFORMATION',5,0,0,0,0,0)",
+				"insert into vtiger_blocks values (68,22,'LBL_DESCRIPTION_INFORMATION',6,0,0,0,0,0)",
+				"insert into vtiger_blocks values (69,23,'LBL_INVOICE_INFORMATION',1,0,0,0,0,0)",
+				"insert into vtiger_blocks values (70,23,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)",
+				"insert into vtiger_blocks values (71,23,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)",
+				"insert into vtiger_blocks values (72,23,'LBL_RELATED_PRODUCTS',4,0,0,0,0,0)",
+				"insert into vtiger_blocks values (73,23,'LBL_TERMS_INFORMATION',5,0,0,0,0,0)",
+				"insert into vtiger_blocks values (74,23,'LBL_DESCRIPTION_INFORMATION',6,0,0,0,0,0)"
 			    );
 foreach($insert_query_array5 as $query)
 {
@@ -1148,117 +1148,117 @@
 }
 
 $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"
+				"update vtiger_tab set name='Vendors', vtiger_tablabel='Vendors' where vtiger_tabid=18",
+				"update vtiger_tab set name='PriceBooks', vtiger_tablabel='PriceBooks' where vtiger_tabid=19",
+				"update vtiger_tab set presence=0 where vtiger_tabid in(18,19)",
+				"update vtiger_relatedlists set label='PriceBooks' where vtiger_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')";
+$delete_query1 = "delete from vtiger_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 vtiger_customview values(".$conn->getUniqueID('customview').",'All',1,0,'Leads')",
+			"insert into vtiger_customview values(".$conn->getUniqueID('customview').",'All',1,0,'Accounts')",
+			"insert into vtiger_customview values(".$conn->getUniqueID('customview').",'All',1,0,'Contacts')",
+			"insert into vtiger_customview values(".$conn->getUniqueID('customview').",'All',1,0,'Potentials')",
+			"insert into vtiger_customview values(".$conn->getUniqueID('customview').",'All',1,0,'HelpDesk')",
+			"insert into vtiger_customview values(".$conn->getUniqueID('customview').",'All',1,0,'Quotes')",
+			"insert into vtiger_customview values(".$conn->getUniqueID('customview').",'All',1,0,'Activities')",
+			"insert into vtiger_customview values(".$conn->getUniqueID('customview').",'All',1,0,'Emails')",
+			"insert into vtiger_customview values(".$conn->getUniqueID('customview').",'All',1,0,'Invoice')",
+			"insert into vtiger_customview values(".$conn->getUniqueID('customview').",'All',1,0,'Notes')",
+			"insert into vtiger_customview values(".$conn->getUniqueID('customview').",'All',1,0,'PriceBooks')",
+			"insert into vtiger_customview values(".$conn->getUniqueID('customview').",'All',1,0,'Products')",
+			"insert into vtiger_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')"
+			"insert into vtiger_customview values(".$conn->getUniqueID('customview').",'All',1,0,'SalesOrder')",
+			"insert into vtiger_customview values(".$conn->getUniqueID('customview').",'All',1,0,'Vendors')",
+			"insert into vtiger_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'");
+$res=$conn->query("select cvid from vtiger_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')"
+			"insert into vtiger_cvcolumnlist values ($cvid,0,'leaddetails:lastname:lastname:Leads_Last_Name:V')",
+			"insert into vtiger_cvcolumnlist values ($cvid,1,'leaddetails:firstname:firstname:Leads_First_Name:V')",
+			"insert into vtiger_cvcolumnlist values ($cvid,2,'leaddetails:company:company:Leads_Company:V')",
+			"insert into vtiger_cvcolumnlist values ($cvid,3,'leadaddress:phone:phone:Leads_Phone:V')",
+			"insert into vtiger_cvcolumnlist values ($cvid,4,'leadsubdetails:website:website:Leads_Website:V')",
+			"insert into vtiger_cvcolumnlist values ($cvid,5,'leaddetails:email:email:Leads_Email:V')",
+			"insert into vtiger_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'");
+$res=$conn->query("select cvid from vtiger_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:bill_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')"
+		"insert into vtiger_cvcolumnlist values ($cvid,0,'account:accountname:accountname:Accounts_Account_Name:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,1,'accountbillads:city:bill_city:Accounts_City:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,2,'account:website:website:Accounts_Website:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,3,'account:phone:phone:Accounts_Phone:V')",
+		"insert into vtiger_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'");
+$res=$conn->query("select cvid from vtiger_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')"
+		"insert into vtiger_cvcolumnlist values ($cvid,0,'contactdetails:firstname:firstname:Contacts_First_Name:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,1,'contactdetails:lastname:lastname:Contacts_Last_Name:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,2,'contactdetails:title:title:Contacts_Title:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,3,'account:accountname:accountname:Contacts_Account_Name:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,4,'contactdetails:email:email:Contacts_Email:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,5,'contactdetails:phone:phone:Contacts_Phone_Name:V')",
+		"insert into vtiger_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'");
+$res=$conn->query("select cvid from vtiger_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')"
+	"insert into vtiger_cvcolumnlist values ($cvid,0,'potential:potentialname:potentialname:Potentials_Potential_Name:V')",
+	"insert into vtiger_cvcolumnlist values ($cvid,1,'potential:accountid:account_id:Potentials_Account_Name:V')",
+	"insert into vtiger_cvcolumnlist values ($cvid,2,'potential:amount:amount:Potentials_Amount:N')",
+	"insert into vtiger_cvcolumnlist values ($cvid,3,'potential:closingdate:closingdate:Potentials_Expected_Close_Date:D')",
+	"insert into vtiger_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'");
+$res=$conn->query("select cvid from vtiger_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')"
+		"insert into vtiger_cvcolumnlist values ($cvid,0,'crmentity:crmid::HelpDesk_Ticket_ID:I')",
+		"insert into vtiger_cvcolumnlist values ($cvid,1,'troubletickets:title:ticket_title:HelpDesk_Title:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,2,'troubletickets:parent_id:parent_id:HelpDesk_Related_to:I')",
+		"insert into vtiger_cvcolumnlist values ($cvid,3,'troubletickets:status:ticketstatus:HelpDesk_Status:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,4,'troubletickets:priority:ticketpriorities:HelpDesk_Priority:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,5,'crmentity:smownerid:assigned_user_id:HelpDesk_Assigned_To:V')"
 			     );
 foreach($insert_query_array11 as $query)
 {
@@ -1266,35 +1266,35 @@
 }
 
 
-$res=$conn->query("select cvid from customview where viewname='All' and entitytype='Quotes'");
+$res=$conn->query("select cvid from vtiger_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')"
+		"insert into vtiger_cvcolumnlist values ($cvid,0,'crmentity:crmid::Quotes_Quote_ID:I')",
+		"insert into vtiger_cvcolumnlist values ($cvid,1,'quotes:subject:subject:Quotes_Subject:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,2,'quotes:quotestage:quotestage:Quotes_Quote_Stage:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,3,'quotes:potentialid:potential_id:Quotes_Potential_Name:I')",
+		"insert into vtiger_cvcolumnlist values ($cvid,4,'quotes:accountid:account_id:Quotes_Account_Name:I')",
+		"insert into vtiger_cvcolumnlist values ($cvid,5,'quotes:total:hdnGrandTotal:Quotes_Total:I')",
+		"insert into vtiger_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'");
+$res=$conn->query("select cvid from vtiger_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:taskstatus: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:crmid:parent_id: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')"
+		"insert into vtiger_cvcolumnlist values ($cvid,0,'activity:status:taskstatus:Activities_Status:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,1,'activity:activitytype:activitytype:Activities_Type:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,2,'activity:subject:subject:Activities_Subject:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,3,'contactdetails:lastname:lastname:Activities_Contact_Name:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,4,'seactivityrel:crmid:parent_id:Activities_Related_To:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,5,'activity:date_start:date_start:Activities_Start_Date:D')",
+		"insert into vtiger_cvcolumnlist values ($cvid,6,'activity:due_date:due_date:Activities_End_Date:D')",
+		"insert into vtiger_cvcolumnlist values ($cvid,7,'crmentity:smownerid:assigned_user_id:Activities_Assigned_To:V')"
 			     );
 foreach($insert_query_array13 as $query)
 {
@@ -1302,30 +1302,30 @@
 }
 
 
-$res=$conn->query("select cvid from customview where viewname='All' and entitytype='Emails'");
+$res=$conn->query("select cvid from vtiger_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:crmid:parent_id: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')"
+		"insert into vtiger_cvcolumnlist values ($cvid,0,'activity:subject:subject:Emails_Subject:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,1,'seactivityrel:crmid:parent_id:Emails_Related_To:I')",
+		"insert into vtiger_cvcolumnlist values ($cvid,2,'activity:date_start:date_start:Emails_Date_Sent:D')",
+		"insert into vtiger_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'");
+$res=$conn->query("select cvid from vtiger_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')"
+		"insert into vtiger_cvcolumnlist values ($cvid,0,'crmentity:crmid::Invoice_Invoice_Id:I')",
+		"insert into vtiger_cvcolumnlist values ($cvid,1,'invoice:subject:subject:Invoice_Subject:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,2,'invoice:salesorderid:salesorder_id:Invoice_Sales_Order:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,3,'invoice:invoicestatus:invoicestatus:Invoice_Status:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,4,'invoice:total:hdnGrandTotal:Invoice_Total:I')",
+		"insert into vtiger_cvcolumnlist values ($cvid,5,'crmentity:smownerid:assigned_user_id:Invoice_Assigned_To:V')"
 			     );
 foreach($insert_query_array15 as $query)
 {
@@ -1333,27 +1333,27 @@
 }
 
 	     
-$res=$conn->query("select cvid from customview where viewname='All' and entitytype='Notes'");
+$res=$conn->query("select cvid from vtiger_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')"
+		"insert into vtiger_cvcolumnlist values ($cvid,0,'notes:title:title:Notes_Title:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,1,'notes:contact_id:contact_id:Notes_Contact_Name:I')",
+		"insert into vtiger_cvcolumnlist values ($cvid,2,'senotesrel:crmid:crmid:Notes_Related_To:I')",
+		"insert into vtiger_cvcolumnlist values ($cvid,3,'notes:filename:filename:Notes_File:V')",
+		"insert into vtiger_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'");
+$res=$conn->query("select cvid from vtiger_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')"
+		"insert into vtiger_cvcolumnlist values ($cvid,1,'pricebook:bookname:bookname:PriceBooks_Price_Book_Name:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,2,'pricebook:active:active:PriceBooks_Active:V')"
 			     );
 foreach($insert_query_array17 as $query)
 {
@@ -1361,76 +1361,76 @@
 }
 
 
-$res=$conn->query("select cvid from customview where viewname='All' and entitytype='Products'");
+$res=$conn->query("select cvid from vtiger_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')"
+	"insert into vtiger_cvcolumnlist values ($cvid,0,'products:productname:productname:Products_Product_Name:V')",
+	"insert into vtiger_cvcolumnlist values ($cvid,1,'products:productcode:productcode:Products_Product_Code:V')",
+	"insert into vtiger_cvcolumnlist values ($cvid,2,'products:commissionrate:commissionrate:Products_Commission_Rate:V')",
+	"insert into vtiger_cvcolumnlist values ($cvid,3,'products:qty_per_unit:qty_per_unit:Products_Qty/Unit:V')",
+	"insert into vtiger_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'");
+$res=$conn->query("select cvid from vtiger_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')"
+	"insert into vtiger_cvcolumnlist values($cvid,0,'crmentity:crmid::PurchaseOrder_Order_Id:I')",
+	"insert into vtiger_cvcolumnlist values($cvid,1,'purchaseorder:subject:subject:PurchaseOrder_Subject:V')",
+	"insert into vtiger_cvcolumnlist values($cvid,2,'purchaseorder:vendorid:vendor_id:PurchaseOrder_Vendor_Name:I')",
+	"insert into vtiger_cvcolumnlist values($cvid,3,'purchaseorder:tracking_no:tracking_no:PurchaseOrder_Tracking_Number:V')",
+	"insert into vtiger_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'");
+$res=$conn->query("select cvid from vtiger_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')"
+		"insert into vtiger_cvcolumnlist values ($cvid,0,'crmentity:crmid::SalesOrder_Order_Id:I')",
+		"insert into vtiger_cvcolumnlist values ($cvid,1,'salesorder:subject:subject:SalesOrder_Subject:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,2,'account:accountid:account_id:SalesOrder_Account_Name:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,3,'quotes:quoteid:quote_id:SalesOrder_Quote_Name:I')",
+		"insert into vtiger_cvcolumnlist values ($cvid,4,'salesorder:total:hdnGrandTotal:SalesOrder_Total:V')",
+		"insert into vtiger_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'");
+$res=$conn->query("select cvid from vtiger_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')"
+			"insert into vtiger_cvcolumnlist values ($cvid,0,'vendor:vendorname:vendorname:Vendors_Vendor_Name:V')",
+			"insert into vtiger_cvcolumnlist values ($cvid,1,'vendor:phone:phone:Vendors_Phone:V')",
+			"insert into vtiger_cvcolumnlist values ($cvid,2,'vendor:email:email:Vendors_Email:V')",
+			"insert into vtiger_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'");
+$res=$conn->query("select cvid from vtiger_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')"
+		"insert into vtiger_cvcolumnlist values ($cvid,0,'faq:id::Faq_FAQ_Id:I')",
+		"insert into vtiger_cvcolumnlist values ($cvid,1,'faq:question:question:Faq_Question:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,2,'faq:category:faqcategories:Faq_Category:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,3,'faq:product_id:product_id:Faq_Product_Name:I')",
+		"insert into vtiger_cvcolumnlist values ($cvid,4,'crmentity:createdtime:createdtime:Faq_Created_Time:D')",
+		"insert into vtiger_cvcolumnlist values ($cvid,5,'crmentity:modifiedtime:modifiedtime:Faq_Modified_Time:D')"
 			     );
 foreach($insert_query_array22 as $query)
 {
@@ -1439,35 +1439,35 @@
 
 
 $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'"
+				"update vtiger_field set uitype=53 where vtiger_tabid=2 and columnname='smownerid'",
+				"update vtiger_field set uitype=53 where vtiger_tabid=4 and columnname='smownerid'",
+				"update vtiger_field set uitype=53 where vtiger_tabid=20 and columnname='smownerid'",
+				"update vtiger_field set uitype=53 where vtiger_tabid=22 and columnname='smownerid'",
+				"update vtiger_field set uitype=53 where vtiger_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`))";
+$create_query6 = "CREATE TABLE vtiger_accountgrouprelation ( vtiger_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"
+				"alter vtiger_table vtiger_accountgrouprelation ADD CONSTRAINT fk_accountgrouprelation FOREIGN KEY (accountid) REFERENCES vtiger_account(accountid) ON DELETE CASCADE",
+				"alter vtiger_table vtiger_accountgrouprelation ADD CONSTRAINT fk_accountgrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_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`))";
+$create_query7 = "CREATE TABLE vtiger_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"
+				"alter vtiger_table vtiger_contactgrouprelation ADD CONSTRAINT fk_contactgrouprelation FOREIGN KEY (contactid) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE",
+				"alter vtiger_table vtiger_contactgrouprelation ADD CONSTRAINT fk_contactgrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_groups(name) ON DELETE CASCADE"
 			   );
 foreach($alter_query_array9 as $query)
 {
@@ -1475,81 +1475,81 @@
 }
 
 
-$create_query10 = "CREATE TABLE potentialgrouprelation ( potentialid int(19) NOT NULL default '0', groupname varchar(100) default NULL, PRIMARY KEY  (`potentialid`))";
+$create_query10 = "CREATE TABLE vtiger_potentialgrouprelation ( vtiger_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"
+				"alter vtiger_table vtiger_potentialgrouprelation ADD CONSTRAINT fk_potentialgrouprelation FOREIGN KEY (potentialid) REFERENCES vtiger_potential(potentialid) ON DELETE CASCADE",
+				"alter vtiger_table vtiger_potentialgrouprelation ADD CONSTRAINT fk_potentialgrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_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`) )";
+$create_query11 = "CREATE TABLE vtiger_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"
+				"alter vtiger_table vtiger_quotegrouprelation ADD CONSTRAINT fk_quotegrouprelation FOREIGN KEY (quoteid) REFERENCES vtiger_quotes(quoteid) ON DELETE CASCADE",
+				"alter vtiger_table vtiger_quotegrouprelation ADD CONSTRAINT fk_quotegrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_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`) )";
+$create_query12 = "CREATE TABLE vtiger_sogrouprelation ( vtiger_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"
+				"alter vtiger_table vtiger_sogrouprelation ADD CONSTRAINT fk_sogrouprelation FOREIGN KEY (salesorderid) REFERENCES vtiger_salesorder(salesorderid) ON DELETE CASCADE",
+				"alter vtiger_table vtiger_sogrouprelation ADD CONSTRAINT fk_sogrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_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`))";
+$create_query13 = "CREATE TABLE vtiger_invoicegrouprelation ( vtiger_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"
+				"alter vtiger_table vtiger_invoicegrouprelation ADD CONSTRAINT fk_invoicegrouprelation FOREIGN KEY (invoiceid) REFERENCES vtiger_invoice(invoiceid) ON DELETE CASCADE",
+				"alter vtiger_table vtiger_invoicegrouprelation ADD CONSTRAINT fk_invoicegrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_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`))";
+$create_query14 = "CREATE TABLE vtiger_pogrouprelation ( vtiger_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"
+				"alter vtiger_table vtiger_pogrouprelation ADD CONSTRAINT fk_pogrouprelation FOREIGN KEY (purchaseorderid) REFERENCES vtiger_purchaseorder(purchaseorderid) ON DELETE CASCADE",
+				"alter vtiger_table vtiger_pogrouprelation ADD CONSTRAINT fk_productgrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_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";
+$alter_query1 = "ALTER TABLE vtiger_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'";
+$update_query1 = "update vtiger_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";
+$alter_query2 = "ALTER TABLE vtiger_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)";
+$alter_query3 = "alter vtiger_table vtiger_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)"
+				"alter vtiger_table vtiger_users add column imagename varchar(250)",
+				"alter vtiger_table vtiger_users add column tagcloud varchar(250)"
 			    );
 foreach($alter_query_array15 as $query)
 {
@@ -1557,8 +1557,8 @@
 }
 
 $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"
+			"alter vtiger_table vtiger_systems change column server server varchar(80) default NULL",
+			"alter vtiger_table vtiger_systems change column server_username server_username varchar(80) default NULL"
 			    );
 foreach($alter_query_array16 as $query)
 {
@@ -1566,71 +1566,71 @@
 }
 
 
-$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))";
+$create_query15 = "create vtiger_table vtiger_portal(portalid int(19), vtiger_portalname varchar(255) NOT NULL, vtiger_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"
+				"alter vtiger_table vtiger_attachments drop column vtiger_attachmentsize",
+				"alter vtiger_table vtiger_attachments drop column attachmentcontents"
 			    );
 foreach($alter_query_array as $query)
 {
 	Execute($query);
 }
 
-$alter_query = "ALTER TABLE field ADD column info_type varchar(20) default NULL after quickcreatesequence";
+$alter_query = "ALTER TABLE vtiger_field ADD column info_type varchar(20) default NULL after quickcreatesequence";
 Execute($alter_query);
 
-//$update_query2 = "UPDATE field SET fieldlabel = 'Reference' WHERE tabid = 4 and tablename = 'contactdetails' and fieldname='reference'";
-//changed in 24-04-06 because the reference has not been entered into the field table. 
-$update_query2 = "insert into field values (4,".$conn->getUniqueID("field").",'reference','contactdetails',1,'56','reference','Reference',1,0,0,10,23,4,1,'C~O',1,null,'ADV')";
+//$update_query2 = "UPDATE vtiger_field SET vtiger_fieldlabel = 'Reference' WHERE vtiger_tabid = 4 and vtiger_tablename = 'contactdetails' and vtiger_fieldname='reference'";
+//changed in 24-04-06 because the reference has not been entered into the vtiger_field vtiger_table. 
+$update_query2 = "insert into vtiger_field values (4,".$conn->getUniqueID("field").",'reference','contactdetails',1,'56','reference','Reference',1,0,0,10,23,4,1,'C~O',1,null,'ADV')";
 Execute($update_query2);
 
 $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'"
+				"UPDATE vtiger_field SET info_type = 'BAS'",
+
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 7 and vtiger_fieldlabel = 'Website'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 7 and vtiger_fieldlabel = 'Industry'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 7 and vtiger_fieldlabel = 'Annual Revenue'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 7 and vtiger_fieldlabel = 'No Of Employees'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 7 and vtiger_fieldlabel = 'Yahoo Id'",
+
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 6 and vtiger_fieldlabel = 'Ticker Symbol'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 6 and vtiger_fieldlabel = 'Other Phone'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 6 and vtiger_fieldlabel = 'Member Of'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 6 and vtiger_fieldlabel = 'Employees'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 6 and vtiger_fieldlabel = 'Other Email'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 6 and vtiger_fieldlabel = 'Ownership'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 6 and vtiger_fieldlabel = 'Rating'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 6 and vtiger_fieldlabel = 'industry'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 6 and vtiger_fieldlabel = 'SIC Code'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 6 and vtiger_fieldlabel = 'Type'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 6 and vtiger_fieldlabel = 'Annual Revenue'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 6 and vtiger_fieldlabel = 'Email Opt Out'",
+
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'Home Phone'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'Department'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'Birthdate'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'Email'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'Reports To'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'Assistant'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'Yahoo Id'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'Assistant Phone'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'Do Not Call'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'Email Opt Out'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'Reference'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'Portal User'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'Support Start Date'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'Support End Date'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'Contact Image'",
+
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 14 and vtiger_fieldlabel = 'Usage Unit'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 14 and vtiger_fieldlabel = 'Qty/Unit'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 14 and vtiger_fieldlabel = 'Qty In Stock'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 14 and vtiger_fieldlabel = 'Reorder Level'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 14 and vtiger_fieldlabel = 'Handler'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 14 and vtiger_fieldlabel = 'Qty In Demand'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 14 and vtiger_fieldlabel = 'Product Image'"
 			    );
 foreach($update_query_array4 as $query)
 {
@@ -1661,35 +1661,35 @@
 	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";
+$create_query20 = "CREATE TABLE vtiger_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`)
+$create_query21 = "CREATE TABLE vtiger_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";
+$alter_query4 = "alter vtiger_table vtiger_profile add column description text";
 Execute($alter_query4);
 
-$alter_query5 = "alter table contactdetails add column imagename varchar(250) after currency";
+$alter_query5 = "alter vtiger_table vtiger_contactdetails add column imagename varchar(250) after vtiger_currency";
 Execute($alter_query5);
 
-$alter_query = "ALTER TABLE contactdetails ADD column reference varchar(3) default NULL after imagename";
+$alter_query = "ALTER TABLE vtiger_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')"
+				"insert into vtiger_blocks values(75,4,'LBL_IMAGE_INFORMATION',5,0,0,0,0,0)",
+				"insert into vtiger_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 vtiger_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 vtiger_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";
+$alter_query6 = "alter vtiger_table vtiger_activity add column vtiger_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";
@@ -1699,42 +1699,42 @@
 $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)";
+$insert_query6 = "INSERT INTO vtiger_tab VALUES(26,'Campaigns',0,23,'Campaigns',null,null,1)";
 Execute($insert_query6);
-$insert_query7 = "INSERT INTO parenttabrel VALUES(2,26,1)";
+$insert_query7 = "INSERT INTO vtiger_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)";
+$insert_query8 = "insert into vtiger_blocks values(76,26,'LBL_CAMPAIGN_INFORMATION',1,0,0,0,0,0)";
 Execute($insert_query8);
-$insert_query8 = "insert into blocks values (77,26,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)";
+$insert_query8 = "insert into vtiger_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)";
+$insert_query9 = "insert into vtiger_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").",'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')"
+	"insert into vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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)
 {
@@ -1742,8 +1742,8 @@
 }
 
 $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)"
+	"insert into vtiger_relatedlists values (".$conn->getUniqueID('relatedlists').",".getTabid("Campaigns").",".getTabid("Contacts").",'get_contacts',1,'Contacts',0)",
+	"insert into vtiger_relatedlists values (".$conn->getUniqueID('relatedlists').",".getTabid("Campaigns").",".getTabid("Leads").",'get_leads',2,'Leads',0)"
 			     );
 foreach($insert_query_array25 as $query)
 {
@@ -1752,8 +1752,8 @@
 
 
 $insert_query_array26 = Array(
-	"insert into field values (7,".$conn->getUniqueID("field").",'campaignid','leaddetails',1,'51','campaignid','Campaign Name',1,0,0,100,6,13,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')"
+	"insert into vtiger_field values (7,".$conn->getUniqueID("field").",'campaignid','leaddetails',1,'51','campaignid','Campaign Name',1,0,0,100,6,13,3,'I~O',1,null,'BAS')",
+	"insert into vtiger_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)
 {
@@ -1858,11 +1858,11 @@
 Execute($create_table_query1);
 
 $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"
+				"alter vtiger_table vtiger_leaddetails add column vtiger_campaignid int(19) default NULL after leadid",
+				"alter vtiger_table vtiger_contactdetails add column  vtiger_campaignid int(19) default NULL after vtiger_accountid",
+				//"alter vtiger_table vtiger_notes drop PRIMARY KEY contact_id",
+				"alter vtiger_table vtiger_notes drop PRIMARY KEY , add primary key(notesid)",
+				"update vtiger_field set uitype=99 where vtiger_fieldname='update_log' and vtiger_tabid=13"
 			    );
 foreach($alter_query_array18 as $query)
 {
@@ -1871,8 +1871,8 @@
 
 
 
-//echo "<br><br><b>Database Modifications for Indexing and some missded tables starts here.....</b><br>";
-//Added queries which are for indexing and the missing tables - Mickie - on 06-04-2006
+//echo "<br><br><b>Database Modifications for Indexing and some missded vtiger_tables starts here.....</b><br>";
+//Added queries which are for indexing and the missing vtiger_tables - Mickie - on 06-04-2006
 
 $query_array = Array(
 
@@ -2605,7 +2605,7 @@
 "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` DROP INDEX vtiger_quotestage",
 "ALTER TABLE `quotes` ADD INDEX `quotestage` (`quoteid`)",
 "ALTER TABLE `quotes` ADD KEY `potentialid2` (`potentialid`)",
 "ALTER TABLE `quotes` ADD KEY `contactid` (`contactid`)",
@@ -2662,20 +2662,20 @@
 $conn->println("Database Modifications after 5.0(Alpha 5) starts here.");
 
 
-//Added on 22-04-06 - to add the Notify Owner field in Contacts and Accounts
+//Added on 22-04-06 - to add the Notify Owner vtiger_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'",
+	"update vtiger_field set sequence=26 where vtiger_tabid=4 and vtiger_fieldname='modifiedtime'",
+	"update vtiger_field set sequence=25 where vtiger_tabid=4 and vtiger_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 vtiger_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 vtiger_table vtiger_contactdetails add column notify_owner varchar(3) default 0 after reference",
+
+	"update vtiger_field set sequence=21 where vtiger_tabid=6 and vtiger_fieldname='modifiedtime'",
+	"update vtiger_field set sequence=20 where vtiger_tabid=6 and vtiger_fieldname='createdtime'",
+	"update vtiger_field set sequence=19 where vtiger_tabid=6 and vtiger_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"
+	"insert into vtiger_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 vtiger_table vtiger_account add column notify_owner varchar(3) default 0 after emailoptout"
 			   );
 foreach($notify_owner_array as $query)
 {
@@ -2683,17 +2683,17 @@
 }
 
 //Added for RSS entries
-$rss_insert_query = "insert into field values (24,".$conn->getUniqueID("field").",'rsscategory','rss',1,'15','rsscategory','rsscategory',1,0,0,255,13,null,1,'V~O',1,null,'BAS')";
+$rss_insert_query = "insert into vtiger_field values (24,".$conn->getUniqueID("field").",'rsscategory','rss',1,'15','rsscategory','rsscategory',1,0,0,255,13,null,1,'V~O',1,null,'BAS')";
 Execute($rss_insert_query);
 
 //Quick Create Feature added for Vendor & PriceBook
 $quickcreate_query = Array(
-	"UPDATE field SET quickcreate = 0,quickcreatesequence = 1 WHERE tabid = 18 and fieldname = 'vendorname'",
-	"UPDATE field SET quickcreate = 0,quickcreatesequence = 2 WHERE tabid = 18 and fieldname = 'phone'",
-	"UPDATE field SET quickcreate = 0,quickcreatesequence = 3 WHERE tabid = 18 and fieldname = 'email'",
-
-	"UPDATE field SET quickcreate = 0,quickcreatesequence = 1 WHERE tabid = 19 and fieldname = 'bookname'",
-	"UPDATE field SET quickcreate = 0,quickcreatesequence = 2 WHERE tabid = 19 and fieldname = 'active'"
+	"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 1 WHERE vtiger_tabid = 18 and vtiger_fieldname = 'vendorname'",
+	"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 2 WHERE vtiger_tabid = 18 and vtiger_fieldname = 'phone'",
+	"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 3 WHERE vtiger_tabid = 18 and vtiger_fieldname = 'email'",
+
+	"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 1 WHERE vtiger_tabid = 19 and vtiger_fieldname = 'bookname'",
+	"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 2 WHERE vtiger_tabid = 19 and vtiger_fieldname = 'active'"
 			  );
 foreach($quickcreate_query as $query)
 {
@@ -2701,24 +2701,24 @@
 }
 
 
-//Added on 24-04-06 to populate customview All for Campaign and webmails modules
+//Added on 24-04-06 to populate vtiger_customview All for Campaign and webmails modules
 $cvid1 = $conn->getUniqueID("customview");
 $cvid2 = $conn->getUniqueID("customview");
 $customview_query_array = Array(
-	"insert into customview(cvid,viewname,setdefault,setmetrics,entitytype) values(".$cvid1.",'All',1,0,'Campaigns')",
-	"insert into cvcolumnlist (cvid,columnindex,columnname) values (".$cvid1.",0,'campaign:campaignname:campaignname:Campaigns_Campaign_Name:V')",
-	"insert into cvcolumnlist (cvid,columnindex,columnname) values (".$cvid1.",1,'campaign:campaigntype:campaigntype:Campaigns_Campaign_Type:N')",
-	"insert into cvcolumnlist (cvid,columnindex,columnname) values (".$cvid1.",2,'campaign:campaignstatus:campaignstatus:Campaigns_Campaign_Status:N')",
-	"insert into cvcolumnlist (cvid,columnindex,columnname) values (".$cvid1.",3,'campaign:expectedrevenue:expectedrevenue:Campaigns_Expected_Revenue:V')",
-	"insert into cvcolumnlist (cvid,columnindex,columnname) values (".$cvid1.",4,'campaign:closingdate:closingdate:Campaigns_Expected_Close_Date:D')",
-	"insert into cvcolumnlist (cvid,columnindex,columnname) values (".$cvid1.",5,'crmentity:smownerid:assigned_user_id:Campaigns_Assigned_To:V')",
-
-
-	"insert into customview(cvid,viewname,setdefault,setmetrics,entitytype) values(".$cvid2.",'All',1,0,'Webmails')",
-	"insert into cvcolumnlist (cvid,columnindex,columnname) values (".$cvid2.",0,'subject:subject:subject:Subject:V')",
-	"insert into cvcolumnlist (cvid,columnindex,columnname) values (".$cvid2.",1,'from:fromname:fromname:From:N')",
-	"insert into cvcolumnlist (cvid,columnindex,columnname) values (".$cvid2.",2,'to:tpname:toname:To:N')",
-	"insert into cvcolumnlist (cvid,columnindex,columnname) values (".$cvid2.",3,'body:body:body:Body:V')"
+	"insert into vtiger_customview(cvid,viewname,setdefault,setmetrics,entitytype) values(".$cvid1.",'All',1,0,'Campaigns')",
+	"insert into vtiger_cvcolumnlist (cvid,columnindex,columnname) values (".$cvid1.",0,'campaign:campaignname:campaignname:Campaigns_Campaign_Name:V')",
+	"insert into vtiger_cvcolumnlist (cvid,columnindex,columnname) values (".$cvid1.",1,'campaign:campaigntype:campaigntype:Campaigns_Campaign_Type:N')",
+	"insert into vtiger_cvcolumnlist (cvid,columnindex,columnname) values (".$cvid1.",2,'campaign:campaignstatus:campaignstatus:Campaigns_Campaign_Status:N')",
+	"insert into vtiger_cvcolumnlist (cvid,columnindex,columnname) values (".$cvid1.",3,'campaign:expectedrevenue:expectedrevenue:Campaigns_Expected_Revenue:V')",
+	"insert into vtiger_cvcolumnlist (cvid,columnindex,columnname) values (".$cvid1.",4,'campaign:closingdate:closingdate:Campaigns_Expected_Close_Date:D')",
+	"insert into vtiger_cvcolumnlist (cvid,columnindex,columnname) values (".$cvid1.",5,'crmentity:smownerid:assigned_user_id:Campaigns_Assigned_To:V')",
+
+
+	"insert into vtiger_customview(cvid,viewname,setdefault,setmetrics,entitytype) values(".$cvid2.",'All',1,0,'Webmails')",
+	"insert into vtiger_cvcolumnlist (cvid,columnindex,columnname) values (".$cvid2.",0,'subject:subject:subject:Subject:V')",
+	"insert into vtiger_cvcolumnlist (cvid,columnindex,columnname) values (".$cvid2.",1,'from:fromname:fromname:From:N')",
+	"insert into vtiger_cvcolumnlist (cvid,columnindex,columnname) values (".$cvid2.",2,'to:tpname:toname:To:N')",
+	"insert into vtiger_cvcolumnlist (cvid,columnindex,columnname) values (".$cvid2.",3,'body:body:body:Body:V')"
 
 			       );
 foreach($customview_query_array as $query)
@@ -2728,25 +2728,25 @@
 
 
 $query_array2 = Array(
-				"INSERT INTO parenttabrel VALUES(2,4,2)",
-				"INSERT INTO parenttabrel VALUES(2,6,3)",
-				"update cvcolumnlist set columnname ='crmentity:smownerid:assigned_user_id:Emails_Sender:V' where cvid=20 and columnindex=3",
-				"update field set sequence = 2 where columnname='filename' and tablename = 'attachments'",
-				"delete from cvcolumnlist where columnname = 'seactivityrel:crmid:parent_id:Emails_Related_To:I'",
-				"update cvcolumnlist set columnindex = 1 where cvid=3 and columnindex=3",
-				"update field set info_type='ADV' where tabid=18 and columnname in ('street','pobox','city','state','postalcode','country','description')",
-				"update field set info_type='ADV' where tabid in (20,21,22,23) and columnname in ('description','terms_conditions')",
-
-				"create table inventorytaxinfo (taxid int(3) NOT NULL auto_increment, taxname varchar(50) default NULL, percentage decimal(7,3) default NULL,  PRIMARY KEY  (taxid), KEY inventorytaxinfo_taxname_idx (taxname))",
-				"create table producttaxrel ( productid int(11) NOT NULL, taxid int(3) NOT NULL, taxpercentage decimal(7,3) default NULL, KEY producttaxrel_productid_idx (productid), KEY producttaxrel_taxid_idx (taxid))",
-
-				"insert into inventorytaxinfo values(".$conn->getUniqueID("inventorytaxinfo").",'VAT','4.5')",
-				"insert into inventorytaxinfo values(".$conn->getUniqueID("inventorytaxinfo").",'Sales','10')",
-				"insert into inventorytaxinfo values(".$conn->getUniqueID("inventorytaxinfo").",'Service','12.5')",
-				"update field set uitype=83, tablename='producttaxrel' where tabid=14 and fieldname='taxclass'",
-				"insert into moduleowners values(".$this->localGetTabID('Campaigns').",1)",
-
-				"alter table attachments add column path varchar(255) default NULL"
+				"INSERT INTO vtiger_parenttabrel VALUES(2,4,2)",
+				"INSERT INTO vtiger_parenttabrel VALUES(2,6,3)",
+				"update vtiger_cvcolumnlist set columnname ='crmentity:smownerid:assigned_user_id:Emails_Sender:V' where cvid=20 and columnindex=3",
+				"update vtiger_field set sequence = 2 where columnname='filename' and vtiger_tablename = 'attachments'",
+				"delete from vtiger_cvcolumnlist where columnname = 'seactivityrel:crmid:parent_id:Emails_Related_To:I'",
+				"update vtiger_cvcolumnlist set columnindex = 1 where cvid=3 and columnindex=3",
+				"update vtiger_field set info_type='ADV' where vtiger_tabid=18 and columnname in ('street','pobox','city','state','postalcode','country','description')",
+				"update vtiger_field set info_type='ADV' where vtiger_tabid in (20,21,22,23) and columnname in ('description','terms_conditions')",
+
+				"create vtiger_table vtiger_inventorytaxinfo (taxid int(3) NOT NULL auto_increment, taxname varchar(50) default NULL, percentage decimal(7,3) default NULL,  PRIMARY KEY  (taxid), KEY vtiger_inventorytaxinfo_taxname_idx (taxname))",
+				"create vtiger_table vtiger_producttaxrel ( productid int(11) NOT NULL, taxid int(3) NOT NULL, taxpercentage decimal(7,3) default NULL, KEY vtiger_producttaxrel_productid_idx (productid), KEY vtiger_producttaxrel_taxid_idx (taxid))",
+
+				"insert into vtiger_inventorytaxinfo values(".$conn->getUniqueID("inventorytaxinfo").",'VAT','4.5')",
+				"insert into vtiger_inventorytaxinfo values(".$conn->getUniqueID("inventorytaxinfo").",'Sales','10')",
+				"insert into vtiger_inventorytaxinfo values(".$conn->getUniqueID("inventorytaxinfo").",'Service','12.5')",
+				"update vtiger_field set uitype=83, vtiger_tablename='producttaxrel' where vtiger_tabid=14 and vtiger_fieldname='taxclass'",
+				"insert into vtiger_moduleowners values(".$this->localGetTabID('Campaigns').",1)",
+
+				"alter vtiger_table vtiger_attachments add column path varchar(255) default NULL"
 			     );
 
 foreach($query_array2 as $query)
@@ -2779,30 +2779,30 @@
 
 }
 
-$update_query3 = "update currency_info set conversion_rate=1, currency_status='Active', defaultid='-11' where id=1";
+$update_query3 = "update vtiger_currency_info set conversion_rate=1, vtiger_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'";
+$update_query4 = "update vtiger_relatedlists set label='Purchase Order' where vtiger_tabid=18 and name='get_purchase_orders'";
 Execute($update_query4);
 
 
 
 //Added on 27-05-06
 
-$create_query27 = "CREATE TABLE invitees (activityid int(19) NOT NULL, inviteeid int(19) NOT NULL, PRIMARY KEY (activityid,inviteeid))";
+$create_query27 = "CREATE TABLE vtiger_invitees (activityid int(19) NOT NULL, inviteeid int(19) NOT NULL, PRIMARY KEY (activityid,inviteeid))";
 Execute($create_query27);
 
 $alter_query_array17 = Array(
-				"ALTER TABLE users ADD column hour_format varchar(30) default 'am/pm' AFTER date_format",
-				"ALTER TABLE users ADD column start_hour varchar(30) default '10:00' AFTER hour_format",
-				"ALTER TABLE users ADD column end_hour varchar(30) default '23:00' AFTER start_hour"
+				"ALTER TABLE vtiger_users ADD column hour_format varchar(30) default 'am/pm' AFTER date_format",
+				"ALTER TABLE vtiger_users ADD column start_hour varchar(30) default '10:00' AFTER hour_format",
+				"ALTER TABLE vtiger_users ADD column end_hour varchar(30) default '23:00' AFTER start_hour"
 			    );
 foreach($alter_query_array17 as $query)
 {
 	Execute($query);
 }
 
-$create_query28 = "CREATE TABLE emaildetails (
+$create_query28 = "CREATE TABLE vtiger_emaildetails (
 			emailid int(19) NOT NULL,
 			from_email varchar(50) NOT NULL default '',
 			to_email text,
@@ -2817,12 +2817,12 @@
 
 
 $obj_array = Array('Leads'=>'leaddetails','Contacts'=>'contactdetails');
-$leadfieldid = $conn->query_result($conn->query("select fieldid from field where tabid=7 and fieldname='email'"),0,'fieldid');
-$contactfieldid = $conn->query_result($conn->query("select fieldid from field where tabid=4 and fieldname='email'"),0,'fieldid');
+$leadfieldid = $conn->query_result($conn->query("select vtiger_fieldid from vtiger_field where vtiger_tabid=7 and vtiger_fieldname='email'"),0,'fieldid');
+$contactfieldid = $conn->query_result($conn->query("select vtiger_fieldid from vtiger_field where vtiger_tabid=4 and vtiger_fieldname='email'"),0,'fieldid');
 $fieldid_array = Array("Leads"=>"$leadfieldid","Contacts"=>"$contactfieldid");
 $idname_array = Array("Leads"=>"leadid","Contacts"=>"contactid");
 
-$query = 'select * from seactivityrel where activityid in (select activityid from activity where activitytype="Emails")';
+$query = 'select * from vtiger_seactivityrel where vtiger_activityid in (select vtiger_activityid from vtiger_activity where vtiger_activitytype="Emails")';
 $result = $conn->query($query);
 $numofrows = $conn->num_rows($result);
 
@@ -2833,7 +2833,7 @@
 	$parentid = $conn->query_result($result,$i,'crmid');
 	$emailid = $conn->query_result($result,$i,'activityid');
 
-	$query = 'select setype from crmentity where crmid='.$parentid;
+	$query = 'select setype from vtiger_crmentity where crmid='.$parentid;
 	$result1 = $conn->query($query);
 	$module = $conn->query_result($result1,0,'setype');
 
@@ -2844,8 +2844,8 @@
 		$result2 = $conn->query("select lastname, firstname, email from $obj_array[$module] where $idname_array[$module] = $parentid");
 		$toemail = $conn->query_result($result2,0,'lastname').' '.$conn->query_result($result2,0,'firstname').'<'.$conn->query_result($result2,0,'email').'>###';
 
-		//insert this idlists and toemail values in emaildetails table
-		$sql = "insert into emaildetails values ($emailid,'',\"$toemail\",'','','',\"$idlists\",'SAVE')";
+		//insert this idlists and toemail values in vtiger_emaildetails vtiger_table
+		$sql = "insert into vtiger_emaildetails values ($emailid,'',\"$toemail\",'','','',\"$idlists\",'SAVE')";
 		Execute($sql);
 	}
 	else
@@ -2854,25 +2854,25 @@
 	}
 }
 
-$update_query5 = "update field set quickcreate=1, quickcreatesequence=NULL where tabid in (10,14)";
+$update_query5 = "update vtiger_field set quickcreate=1, quickcreatesequence=NULL where vtiger_tabid in (10,14)";
 Execute($update_query5);
 
 $alter_query_array18 = Array(
-				"alter table soproductrel add column vattax decimal(7,3) default NULL",
-				"alter table soproductrel add column salestax decimal(7,3) default NULL",
-				"alter table soproductrel add column servicetax decimal(7,3) default NULL",
+				"alter vtiger_table vtiger_soproductrel add column vattax decimal(7,3) default NULL",
+				"alter vtiger_table vtiger_soproductrel add column salestax decimal(7,3) default NULL",
+				"alter vtiger_table vtiger_soproductrel add column servicetax decimal(7,3) default NULL",
 				
-				"alter table poproductrel add column vattax decimal(7,3) default NULL",
-				"alter table poproductrel add column salestax decimal(7,3) default NULL",
-				"alter table poproductrel add column servicetax decimal(7,3) default NULL",
+				"alter vtiger_table vtiger_poproductrel add column vattax decimal(7,3) default NULL",
+				"alter vtiger_table vtiger_poproductrel add column salestax decimal(7,3) default NULL",
+				"alter vtiger_table vtiger_poproductrel add column servicetax decimal(7,3) default NULL",
 				
-				"alter table quotesproductrel add column vattax decimal(7,3) default NULL",
-				"alter table quotesproductrel add column salestax decimal(7,3) default NULL",
-				"alter table quotesproductrel add column servicetax decimal(7,3) default NULL",
+				"alter vtiger_table vtiger_quotesproductrel add column vattax decimal(7,3) default NULL",
+				"alter vtiger_table vtiger_quotesproductrel add column salestax decimal(7,3) default NULL",
+				"alter vtiger_table vtiger_quotesproductrel add column servicetax decimal(7,3) default NULL",
 				
-				"alter table invoiceproductrel add column vattax decimal(7,3) default NULL",
-				"alter table invoiceproductrel add column salestax decimal(7,3) default NULL",
-				"alter table invoiceproductrel add column servicetax decimal(7,3) default NULL",
+				"alter vtiger_table vtiger_invoiceproductrel add column vattax decimal(7,3) default NULL",
+				"alter vtiger_table vtiger_invoiceproductrel add column salestax decimal(7,3) default NULL",
+				"alter vtiger_table vtiger_invoiceproductrel add column servicetax decimal(7,3) default NULL",
 			    );
 foreach($alter_query_array18 as $query)
 {
@@ -2881,91 +2881,91 @@
 
 
 
-//Security profile and tab table handling by DON starts
-$sql_sec="select profileid from  profile";
+//Security vtiger_profile and vtiger_tab vtiger_table handling by DON starts
+$sql_sec="select vtiger_profileid from  vtiger_profile";
 $result_sec=$conn->query($sql_sec);
 $num_rows=$conn->num_rows($result_sec);
 for($i=0;$i<$num_row;$i++)
 {
 	$prof_id=$conn->query_result($result_sec,$i,'profileid');
-	$sql1_sec="insert into profile2utility values(".$prof_id.",13,8,0)";
+	$sql1_sec="insert into vtiger_profile2utility values(".$prof_id.",13,8,0)";
 	Execute($sql1_sec);
 
-	$sql2_sec="insert into profile2utility values(".$prof_id.",7,9,0)";
+	$sql2_sec="insert into vtiger_profile2utility values(".$prof_id.",7,9,0)";
 	Execute($sql2_sec);
 
-	$sql3_sec="insert into profile2tab values(".$prof_id.",26,0)";
+	$sql3_sec="insert into vtiger_profile2tab values(".$prof_id.",26,0)";
 	Execute($sql3_sec);
 
-	$sql4_sec="insert into profile2tab values(".$prof_id.",27,0)";
+	$sql4_sec="insert into vtiger_profile2tab values(".$prof_id.",27,0)";
 	Execute($sql4_sec);
 
-	$sql7_sec="insert into profile2standardpermissions values(".$prof_id.",26,0,0)";
+	$sql7_sec="insert into vtiger_profile2standardpermissions values(".$prof_id.",26,0,0)";
 	Execute($sql7_sec);
 
-	$sql8_sec="insert into profile2standardpermissions values(".$prof_id.",26,1,0)";
+	$sql8_sec="insert into vtiger_profile2standardpermissions values(".$prof_id.",26,1,0)";
 	Execute($sql8_sec);
 
-	$sql9_sec="insert into profile2standardpermissions values(".$prof_id.",26,2,0)";
+	$sql9_sec="insert into vtiger_profile2standardpermissions values(".$prof_id.",26,2,0)";
 	Execute($sql9_sec);
 
-	$sql10_sec="insert into profile2standardpermissions values(".$prof_id.",26,3,0)";
+	$sql10_sec="insert into vtiger_profile2standardpermissions values(".$prof_id.",26,3,0)";
 	Execute($sql10_sec);
 
-	$sql11_sec="insert into profile2standardpermissions values(".$prof_id.",26,4,0)";
+	$sql11_sec="insert into vtiger_profile2standardpermissions values(".$prof_id.",26,4,0)";
 	Execute($sql11_sec);	
 
 }
 
-//Inserting into tab tables
-$sec2="INSERT INTO tab VALUES (27,'Portal',0,24,'Portal',null,null,1)";
-$sec3="INSERT INTO tab VALUES (28,'Webmails',0,25,'Webmails',null,null,1)";
-
-//Insert into def_org_share tables
-$sec4="insert into def_org_share values (".$conn->getUniqueID('def_org_share').",26,2,0)";	
+//Inserting into vtiger_tab vtiger_tables
+$sec2="INSERT INTO vtiger_tab VALUES (27,'Portal',0,24,'Portal',null,null,1)";
+$sec3="INSERT INTO vtiger_tab VALUES (28,'Webmails',0,25,'Webmails',null,null,1)";
+
+//Insert into vtiger_def_org_share vtiger_tables
+$sec4="insert into vtiger_def_org_share values (".$conn->getUniqueID('def_org_share').",26,2,0)";	
 
 Execute($sec2);
 Execute($sec3);
 Execute($sec4);
 
-//Inserting into datashare related modules table
-
-Execute("insert into datashare_relatedmodules_seq values(1)");
+//Inserting into datashare related modules vtiger_table
+
+Execute("insert into vtiger_datashare_relatedmodules_seq values(1)");
 	
 //Lead Related Module
-Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",7,10)");
+Execute("insert into vtiger_datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",7,10)");
 
 //Account Related Module
-Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",6,2)");
-Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",6,13)");
-Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",6,20)");
-Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",6,22)");
-Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",6,23)");
-Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",6,10)");
+Execute("insert into vtiger_datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",6,2)");
+Execute("insert into vtiger_datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",6,13)");
+Execute("insert into vtiger_datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",6,20)");
+Execute("insert into vtiger_datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",6,22)");
+Execute("insert into vtiger_datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",6,23)");
+Execute("insert into vtiger_datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",6,10)");
 
 
 //Potential Related Module
-Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",2,20)");
-Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",2,22)");
+Execute("insert into vtiger_datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",2,20)");
+Execute("insert into vtiger_datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",2,22)");
 
 //Quote Related Module
-Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",20,22)");
+Execute("insert into vtiger_datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",20,22)");
 
 //SO Related Module
-Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",22,23)");
+Execute("insert into vtiger_datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",22,23)");
 	
 
 //By Don Ends
 
-//Added the tabel mail_accounts which has been added by mmbrich
-$alter_query18 = "alter table mail_accounts add column int_mailer int(1) default '0'";
+//Added the vtiger_tabel vtiger_mail_accounts which has been added by mmbrich
+$alter_query18 = "alter vtiger_table vtiger_mail_accounts add column int_mailer int(1) default '0'";
 Execute($alter_query18);
 
 $update_query_array5 = Array(
-	"update field set info_type='BAS' where tabid=6 and fieldname in ('tickersymbol','account_id')",
-	"update relatedlists set label = 'Activity History' where tabid in (4,6,7,20,21,22,23) and label = 'History'",
-	"update relatedlists set label = 'Products' where tabid=2 and name='get_products' and label='History'",
-	"update relatedlists set label = 'Activity History' where tabid=2 and name='get_history' and label='History'"
+	"update vtiger_field set info_type='BAS' where vtiger_tabid=6 and vtiger_fieldname in ('tickersymbol','account_id')",
+	"update vtiger_relatedlists set label = 'Activity History' where vtiger_tabid in (4,6,7,20,21,22,23) and label = 'History'",
+	"update vtiger_relatedlists set label = 'Products' where vtiger_tabid=2 and name='get_products' and label='History'",
+	"update vtiger_relatedlists set label = 'Activity History' where vtiger_tabid=2 and name='get_history' and label='History'"
 			    );
 foreach($update_query_array5 as $query)
 {
@@ -2973,9 +2973,9 @@
 }
 
 $insert_query_array27 = Array(
-	"insert into relatedlists values(".$conn->getUniqueID('relatedlists').",13,0,'get_ticket_history',3,'Ticket History',0)",
-	"insert into parenttabrel values (2,10,4)",
-	"insert into parenttabrel values (4,10,7)"
+	"insert into vtiger_relatedlists values(".$conn->getUniqueID('relatedlists').",13,0,'get_ticket_history',3,'Ticket History',0)",
+	"insert into vtiger_parenttabrel values (2,10,4)",
+	"insert into vtiger_parenttabrel values (4,10,7)"
 			     );
 foreach($insert_query_array27 as $query)
 {
@@ -2996,14 +2996,14 @@
 		alert("Currency Changes has been made Successfully");
 	}
 
-	if(!confirm("Are you using Dollar $ as Currency? \n Click OK to remain as $, Cancel to change the currency conversion rate."))
+	if(!confirm("Are you using Dollar $ as Currency? \n Click OK to remain as $, Cancel to change the vtiger_currency conversion rate."))
 	{
 		getConversionRate('');
 	}
 
 	function getConversionRate(err)
 	{
-		var crate = prompt(err+"\nPlease enter the conversion rate of your currency");
+		var crate = prompt(err+"\nPlease enter the conversion rate of your vtiger_currency");
 
 		if(crate != 0 && crate > 0)
 		{
@@ -3051,21 +3051,21 @@
 	}
 }
 
-//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
+//Added on 23-12-2005 which is used to populate the vtiger_profile2field and vtiger_def_org_field vtiger_table entries for the vtiger_field per vtiger_tab
+//if we enter a vtiger_field in vtiger_field vtiger_table then we must populate that vtiger_field in these vtiger_table for security access
 function populateFieldForSecurity($tabid,$fieldid)
 {
 	global $conn;
 
-	$profileresult = $conn->query("select * from profile");
+	$profileresult = $conn->query("select * from vtiger_profile");
 	$countprofiles = $conn->num_rows($profileresult);
 	for ($i=0;$i<$countprofiles;$i++)
 	{
         	$profileid = $conn->query_result($profileresult,$i,'profileid');
-	        $sqlProf2FieldInsert[$i] = 'insert into profile2field values ('.$profileid.','.$tabid.','.$fieldid.',0,1)';
+	        $sqlProf2FieldInsert[$i] = 'insert into vtiger_profile2field values ('.$profileid.','.$tabid.','.$fieldid.',0,1)';
         	Execute($sqlProf2FieldInsert[$i]);
 	}
-	$def_query = "insert into def_org_field values (".$tabid.",".$fieldid.",0,1)";
+	$def_query = "insert into vtiger_def_org_field values (".$tabid.",".$fieldid.",0,1)";
 	Execute($def_query);
 }
 

Modified: vtigercrm/trunk/modules/Migration/ModifyDatabase/MigrationInfo.php
==============================================================================
--- vtigercrm/trunk/modules/Migration/ModifyDatabase/MigrationInfo.php (original)
+++ vtigercrm/trunk/modules/Migration/ModifyDatabase/MigrationInfo.php Mon Jun 12 14:26:25 2006
@@ -191,7 +191,7 @@
 						<b style="color:#006600">Migration Queries Log</b>
 						<div id="successLog" style="border:1px solid #666666;width:90%;position:relative;height:250px;overflow:auto;left:5%;top:10px;">
 							<!-- we should place the All queries executed-->
-							<!-- This table is designed to display all the queries (before this table a div tag is opened. so all these following queries will be put inside the div tab as a table format) -->
+							<!-- This vtiger_table is designed to display all the queries (before this vtiger_table a div tag is opened. so all these following queries will be put inside the div vtiger_tab as a vtiger_table format) -->
 							<style>
 								.MigInfo{
 									border-collapse:collapse;
@@ -238,7 +238,7 @@
 
 						<br /><br />
 
-						<!-- This table is to show the total, success and failed queries -->
+						<!-- This vtiger_table is to show the total, success and failed queries -->
 						<table width="35%" border="0" cellpadding="5" cellspacing="0" align="center" class="small">
 						   <tr>
 							<td width="75%" align="right" nowrap>

Modified: vtigercrm/trunk/modules/Migration/updateCurrency.php
==============================================================================
--- vtigercrm/trunk/modules/Migration/updateCurrency.php (original)
+++ vtigercrm/trunk/modules/Migration/updateCurrency.php Mon Jun 12 14:26:25 2006
@@ -20,10 +20,10 @@
 	$crate = $_REQUEST['crate'];
 	$conn->println('conversion rate = '.$crate);
 	
-	$query = "update currency_info set conversion_rate='".$_REQUEST['crate']."' where id=1";
+	$query = "update vtiger_currency_info set conversion_rate='".$_REQUEST['crate']."' where id=1";
 	$result = $conn->query($query);
 
-	//array should be id || fieldname => tablename
+	//array should be id || vtiger_fieldname => vtiger_tablename
 	$modules_array = Array(
 				"accountid||annualrevenue"	=>	"account",
 				

Modified: vtigercrm/trunk/modules/Notes/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/Notes/EditView.php (original)
+++ vtigercrm/trunk/modules/Notes/EditView.php Mon Jun 12 14:26:25 2006
@@ -170,7 +170,7 @@
 }
 
 if (isset($focus->parent_type) && $focus->parent_type != "") {
-        $change_parent_button = "<input title='".$app_strings['LBL_CHANGE_BUTTON_TITLE']."' accessKey='".$app_strings['LBL_CHANGE_BUTTON_KEY']."' tabindex='3' type='button' class='button' value='".$app_strings['LBL_CHANGE_BUTTON_LABEL']."' name='button' LANGUAGE=javascript onclick='return window.open(\"index.php?module=\"+ document.EditView.parent_type.value + \"&action=Popup&html=Popup_picker&form=TasksEditView\",\"test\",\"width=600,height=400,resizable=1,scrollbars=1\");'>";
+        $change_parent_button = "<input title='".$app_strings['LBL_CHANGE_BUTTON_TITLE']."' accessKey='".$app_strings['LBL_CHANGE_BUTTON_KEY']."' vtiger_tabindex='3' type='button' class='button' value='".$app_strings['LBL_CHANGE_BUTTON_LABEL']."' name='button' LANGUAGE=javascript onclick='return window.open(\"index.php?module=\"+ document.EditView.parent_type.value + \"&action=Popup&html=Popup_picker&form=TasksEditView\",\"test\",\"width=600,height=400,resizable=1,scrollbars=1\");'>";
         $smarty->assign("CHANGE_PARENT_BUTTON", $change_parent_button);
 }
 if ($focus->parent_type == "Account") $smarty->assign("DEFAULT_SEARCH", "&query=true&account_id=$focus->parent_id&account_name=".urlencode($focus->parent_name));

Modified: vtigercrm/trunk/modules/Notes/Forms.php
==============================================================================
--- vtigercrm/trunk/modules/Notes/Forms.php (original)
+++ vtigercrm/trunk/modules/Notes/Forms.php Mon Jun 12 14:26:25 2006
@@ -64,7 +64,7 @@
 }
 
 /**
- * Create HTML form to enter a new record with the minimum necessary fields.
+ * Create HTML form to enter a new record with the minimum necessary vtiger_fields.
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
  * All Rights Reserved.
  * Contributor(s): ______________________________________..
@@ -86,7 +86,7 @@
 
 $qcreate_form = get_left_form_header($mod_strings['LBL_NEW_FORM_TITLE']);
 
-$qcreate_get_field="select * from field where tabid=8 and quickcreate=0 order by quickcreatesequence";
+$qcreate_get_field="select * from vtiger_field where vtiger_tabid=8 and quickcreate=0 order by quickcreatesequence";
 $qcreate_get_result=$adb->query($qcreate_get_field);
 $qcreate_get_noofrows=$adb->num_rows($qcreate_get_result);
 $fieldName_array = Array();//for validation 
@@ -167,9 +167,9 @@
 $qcreate_form.='</form>';
 $qcreate_form.='<script type="text/javascript">
 		
-	var fieldname = new Array('.$fieldName.')
-	var fieldlabel = new Array('.$fieldLabel.')
-	var fielddatatype = new Array('.$fldDataType.')
+	var vtiger_fieldname = new Array('.$fieldName.')
+	var vtiger_fieldlabel = new Array('.$fieldLabel.')
+	var vtiger_fielddatatype = new Array('.$fldDataType.')
 
 		</script>';
 

Modified: vtigercrm/trunk/modules/Notes/Note.php
==============================================================================
--- vtigercrm/trunk/modules/Notes/Note.php (original)
+++ vtigercrm/trunk/modules/Notes/Note.php Mon Jun 12 14:26:25 2006
@@ -32,7 +32,7 @@
 	var $log;
 	var $db;
 
-	// Stored fields
+	// Stored vtiger_fields
 	var $id;
         var $mode;
 
@@ -49,11 +49,11 @@
 	var $contact_phone;
 	var $contact_email;
 	var $required_fields =  array("name"=>1);
-	var $default_note_name_dom = array('Meeting notes', 'Reminder');
+	var $default_note_name_dom = array('Meeting vtiger_notes', 'Reminder');
 
 	var $table_name = "notes";
-	var $tab_name = Array('crmentity','notes','senotesrel','attachments');
-	var $tab_name_index = Array('crmentity'=>'crmid','notes'=>'notesid','senotesrel'=>'notesid','attachments'=>'attachmentsid');
+	var $tab_name = Array('vtiger_crmentity','vtiger_notes','vtiger_senotesrel','vtiger_attachments');
+	var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_notes'=>'notesid','vtiger_senotesrel'=>'notesid','vtiger_attachments'=>'attachmentsid');
 
   	var $module_id = "notesid";
 	var $object_name = "Note";
@@ -62,10 +62,10 @@
 
         var $sortby_fields = Array('title','modifiedtime');		  
 
-	// This is used to retrieve related fields from form posts.
+	// This is used to retrieve related vtiger_fields from form posts.
 	var $additional_column_fields = Array('', '', '', '');
 
-	// This is the list of fields that are in the lists.
+	// This is the list of vtiger_fields that are in the lists.
 	var $list_fields = Array(
 				'Subject'=>Array('notes'=>'title'),
 				'Contact Name'=>Array('notes'=>'contact_id'),
@@ -101,11 +101,11 @@
 		global $log;
 		$log->debug("Entering create_export_query(".$order_by.",". $where.") method ...");
              $query = "SELECT
-                                        notes.*,
-                                        contactdetails.firstname,
-                                        contactdetails.lastname
-                                        FROM notes
-                                        LEFT JOIN contactdetails ON notes.contact_id=contactdetails.contactid inner join crmentity on crmentity.crmid=notes.notesid and crmentity.deleted=0 ";
+                                        vtiger_notes.*,
+                                        vtiger_contactdetails.firstname,
+                                        vtiger_contactdetails.lastname
+                                        FROM vtiger_notes
+                                        LEFT JOIN vtiger_contactdetails ON vtiger_notes.contact_id=vtiger_contactdetails.contactid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_notes.notesid and vtiger_crmentity.deleted=0 ";
 		$log->debug("Exiting create_export_query method ...");
                 return $query;
         }

Modified: vtigercrm/trunk/modules/Notes/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Notes/Save.php (original)
+++ vtigercrm/trunk/modules/Notes/Save.php Mon Jun 12 14:26:25 2006
@@ -40,16 +40,16 @@
 
 if (!isset($_REQUEST['date_due_flag'])) $focus->date_due_flag = 'off';
 
-//Added for retrieve the old existing attachments when duplicated without new attachment
+//Added for retrieve the old existing vtiger_attachments when duplicated without new attachment
 if($_FILES['filename']['name'] == '' && $_REQUEST['mode'] != 'edit' && $_REQUEST['old_id'] != '')
 {
-        $sql = "select attachments.attachmentsid from attachments inner join seattachmentsrel on seattachmentsrel.attachmentsid=attachments.attachmentsid where seattachmentsrel.crmid= ".$_REQUEST['old_id'];
+        $sql = "select vtiger_attachments.attachmentsid from vtiger_attachments inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid=vtiger_attachments.attachmentsid where vtiger_seattachmentsrel.crmid= ".$_REQUEST['old_id'];
         $result = $adb->query($sql);
         if($adb->num_rows($result) != 0)
                 $attachmentid = $adb->query_result($result,0,'attachmentsid');
 	        if($attachmentid != '')
 	        {
-	                $attachquery = "select * from attachments where attachmentsid = ".$attachmentid;
+	                $attachquery = "select * from vtiger_attachments where vtiger_attachmentsid = ".$attachmentid;
 	                $result = $adb->query($attachquery);
 	                $filename = $adb->query_result($result,0,'name');
 	                $filetype = $adb->query_result($result,0,'type');
@@ -58,8 +58,8 @@
 	                $_FILES['filename']['name'] = $filename;
 	                $_FILES['filename']['type'] = $filetype;
 
-			//we should read the file and calculate the size, without setting filesize, attachment will not save
-	                $filesize = filesize($filepath.$filename);
+			//we should read the file and calculate the size, without setting vtiger_filesize, attachment will not save
+	                $filesize = vtiger_filesize($filepath.$filename);
 	                $_FILES['filename']['size'] = $filesize;
 	        }
 }
@@ -85,7 +85,7 @@
 		$crmid = $_REQUEST['ticket_id'];
 	if($crmid != $_REQUEST['parent_id'])
 	{
-		$sql = "insert into senotesrel (notesid, crmid) values('".$focus->id."','".$crmid."')";
+		$sql = "insert into vtiger_senotesrel (notesid, crmid) values('".$focus->id."','".$crmid."')";
 		$adb->query($sql);
 	}
 }

Modified: vtigercrm/trunk/modules/Notes/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Notes/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Notes/language/en_us.lang.php Mon Jun 12 14:26:25 2006
@@ -42,7 +42,7 @@
 'LBL_EMAIL_ADDRESS'=>'Email Address:',
 'LBL_COLON'=>':',
 
-'ERR_DELETE_RECORD'=>"A record number must be specified to delete the account.",
+'ERR_DELETE_RECORD'=>"A record number must be specified to delete the vtiger_account.",
 'LBL_LIST_FILENAME'=>"File",
 
 // Added for Note(3.2-patch 3) 

Modified: vtigercrm/trunk/modules/Portal/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Portal/ListView.php (original)
+++ vtigercrm/trunk/modules/Portal/ListView.php Mon Jun 12 14:26:25 2006
@@ -21,7 +21,7 @@
 $current_module_strings = return_module_language($current_language, 'Portal');
 global $adb;
 	
-$query="select * from portal";
+$query="select * from vtiger_portal";
 $result=$adb->query($query);
 $no_of_portals=$adb->num_rows($result);
 $portal_info=array();

Modified: vtigercrm/trunk/modules/Portal/Popup.php
==============================================================================
--- vtigercrm/trunk/modules/Portal/Popup.php (original)
+++ vtigercrm/trunk/modules/Portal/Popup.php Mon Jun 12 14:26:25 2006
@@ -17,7 +17,7 @@
 if(isset($_REQUEST['record']) && $_REQUEST['record'] !='')
 {
 	$portalid = $_REQUEST['record'];
-	$query="select * from portal where portalid =$portalid";
+	$query="select * from vtiger_portal where vtiger_portalid =$portalid";
 	$result=$adb->query($query);
 	$portalname = $adb->query_result($result,0,'portalname');
         $portalurl = $adb->query_result($result,0,'portalurl');		

Modified: vtigercrm/trunk/modules/Portal/Portal.php
==============================================================================
--- vtigercrm/trunk/modules/Portal/Portal.php (original)
+++ vtigercrm/trunk/modules/Portal/Portal.php Mon Jun 12 14:26:25 2006
@@ -15,7 +15,7 @@
 	global $adb;
 	$adb->println("just entered the SavePortal method");
 	$portalid=$adb->getUniqueID('portal');
-	$query="insert into portal values(".$portalid.",'".$portalname."','".$portalurl."',0)";
+	$query="insert into vtiger_portal values(".$portalid.",'".$portalname."','".$portalurl."',0)";
 	$adb->println($query);
 	$result=$adb->query($query);
 	return $portalid;
@@ -25,7 +25,7 @@
 {
 	global $adb;
 	$adb->println("just entered the SavePortal method");
-	$query="update portal set portalname='$portalname' ,portalurl='$portalurl' where portalid=$portalid";
+	$query="update vtiger_portal set portalname='$portalname' ,portalurl='$portalurl' where portalid=$portalid";
 	$adb->println($query);
 	$result=$adb->query($query);
 	return $portalid;

Modified: vtigercrm/trunk/modules/Potentials/Charts.php
==============================================================================
--- vtigercrm/trunk/modules/Potentials/Charts.php (original)
+++ vtigercrm/trunk/modules/Potentials/Charts.php Mon Jun 12 14:26:25 2006
@@ -29,7 +29,7 @@
 
 class jpgraph {
 	/**
-	 * Creates opportunity pipeline image as a horizontal accumlated bar graph for multiple users.
+	 * Creates opportunity pipeline image as a horizontal accumlated bar graph for multiple vtiger_users.
 	 * param $datax- the month data to display in the x-axis
 	 * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc..
 	 * All Rights Reserved..
@@ -345,7 +345,7 @@
 		}
 		else {
 			$imgMap_fp = fopen($cache_file_name.'.map', "rb");
-			$imgMap = fread($imgMap_fp, filesize($cache_file_name.'.map'));
+			$imgMap = fread($imgMap_fp, vtiger_filesize($cache_file_name.'.map'));
 			fclose($imgMap_fp);
 		}
 		$fileModTime = filemtime($cache_file_name.'.map');
@@ -355,11 +355,11 @@
 	}
 
 	/**
-	 * Creates lead_source_by_outcome pipeline image as a horizontal accumlated bar graph for multiple users.
+	 * Creates lead_source_by_outcome pipeline image as a horizontal accumlated bar graph for multiple vtiger_users.
 	 * param $datay- the lead source data to display in the x-axis
 	 * param $date_start- the begin date of opps to find
 	 * param $date_end- the end date of opps to find
-	 * param $ids - list of assigned users of opps to find
+	 * param $ids - list of assigned vtiger_users of opps to find
 	 * param $cache_file_name - file name to write image to
 	 * param $refresh - boolean whether to rebuild image if exists
 	 * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc..
@@ -680,7 +680,7 @@
 		}
 		else {
 			$imgMap_fp = fopen($cache_file_name.'.map', "rb");
-			$imgMap = fread($imgMap_fp, filesize($cache_file_name.'.map'));
+			$imgMap = fread($imgMap_fp, vtiger_filesize($cache_file_name.'.map'));
 			fclose($imgMap_fp);
 		}
 		$fileModTime = filemtime($cache_file_name.'.map');
@@ -690,7 +690,7 @@
 	}
 
 	/**
-	 * Creates opportunity pipeline image as a horizontal accumlated bar graph for multiple users.
+	 * Creates opportunity pipeline image as a horizontal accumlated bar graph for multiple vtiger_users.
 	 * param $datax- the sales stage data to display in the x-axis
 	 * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc..
 	 * All Rights Reserved..
@@ -1001,7 +1001,7 @@
 		}
 		else {
 			$imgMap_fp = fopen($cache_file_name.'.map', "rb");
-			$imgMap = fread($imgMap_fp, filesize($cache_file_name.'.map'));
+			$imgMap = fread($imgMap_fp, vtiger_filesize($cache_file_name.'.map'));
 			fclose($imgMap_fp);
 		}
 		$fileModTime = filemtime($cache_file_name.'.map');
@@ -1103,7 +1103,7 @@
 					}
 					else
 					{
-						// put none in if the field is blank.
+						// put none in if the vtiger_field is blank.
 						array_push($visible_legends, $current_module_strings['NTC_NO_LEGENDS']);
 					}
 					array_push($aTargets, "index.php?module=Potentials&action=ListView&leadsource=".urlencode($lead_source_key)."&query=true&type=dbrd");
@@ -1229,7 +1229,7 @@
 		}
 		else {
 			$imgMap_fp = fopen($cache_file_name.'.map', "rb");
-			$imgMap = fread($imgMap_fp, filesize($cache_file_name.'.map'));
+			$imgMap = fread($imgMap_fp, vtiger_filesize($cache_file_name.'.map'));
 			fclose($imgMap_fp);
 		}
 		$fileModTime = filemtime($cache_file_name.'.map');

Modified: vtigercrm/trunk/modules/Potentials/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/Potentials/EditView.php (original)
+++ vtigercrm/trunk/modules/Potentials/EditView.php Mon Jun 12 14:26:25 2006
@@ -61,7 +61,7 @@
 $category = getParentTab();
 $smarty->assign("CATEGORY",$category);
 
-//needed when creating a new opportunity with a default account value passed in
+//needed when creating a new opportunity with a default vtiger_account value passed in
 if (isset($_REQUEST['accountname']) && is_null($focus->accountname)) {
 	$focus->accountname = $_REQUEST['accountname'];
 	
@@ -104,7 +104,7 @@
 
 
 
-// Unimplemented until jscalendar language files are fixed
+// Unimplemented until jscalendar language vtiger_files are fixed
 $smarty->assign("CALENDAR_LANG", $app_strings['LBL_JSCALENDAR_LANG']);
 $smarty->assign("CALENDAR_DATEFORMAT", parse_calendardate($app_strings['NTC_DATE_FORMAT']));
 

Modified: vtigercrm/trunk/modules/Potentials/Forms.php
==============================================================================
--- vtigercrm/trunk/modules/Potentials/Forms.php (original)
+++ vtigercrm/trunk/modules/Potentials/Forms.php Mon Jun 12 14:26:25 2006
@@ -15,7 +15,7 @@
 /*********************************************************************************
  * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Potentials/Forms.php,v 1.11 2005/04/20 20:25:13 ray Exp $
  * Description:  Contains a variety of utility functions used to display UI
- * components such as form headers and footers.  Intended to be modified on a per
+ * components such as form vtiger_headers and footers.  Intended to be modified on a per
  * theme basis.
  ********************************************************************************/
 
@@ -182,7 +182,7 @@
 }
 
 /**
- * Create HTML form to enter a new record with the minimum necessary fields.
+ * Create HTML form to enter a new record with the minimum necessary vtiger_fields.
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
  * All Rights Reserved.
  * Contributor(s): ______________________________________..
@@ -197,7 +197,7 @@
 global $current_user;
 global $adb;//for dynamic quickcreateform construction
 
-// Unimplemented until jscalendar language files are fixed
+// Unimplemented until jscalendar language vtiger_files are fixed
 // global $current_language;
 // global $default_language;
 // global $cal_codes;
@@ -214,7 +214,7 @@
 $lbl_save_button_key = $app_strings['LBL_SAVE_BUTTON_KEY'];
 $lbl_save_button_label = $app_strings['LBL_SAVE_BUTTON_LABEL'];
 $user_id = $current_user->id;
-// Unimplemented until jscalendar language files are fixed
+// Unimplemented until jscalendar language vtiger_files are fixed
 // $cal_lang = (empty($cal_codes[$current_language])) ? $cal_codes[$default_language] : $cal_codes[$current_language];
 $cal_lang = "en";
 $cal_dateformat = parse_calendardate($app_strings['NTC_DATE_FORMAT']);
@@ -227,7 +227,7 @@
 
 $qcreate_form = get_left_form_header($mod_strings['LBL_NEW_FORM_TITLE']);
 
-$qcreate_get_field="select * from field where tabid=2 and quickcreate=0 order by quickcreatesequence";
+$qcreate_get_field="select * from vtiger_field where vtiger_tabid=2 and quickcreate=0 order by quickcreatesequence";
 $qcreate_get_result=$adb->query($qcreate_get_field);
 $qcreate_get_noofrows=$adb->num_rows($qcreate_get_result);
 
@@ -317,9 +317,9 @@
 		Calendar.setup ({
 			inputField : "QCK_closingdate", ifFormat : "'.$cal_dateformat.'", showsTime : false, button : "jscal_trigger", singleClick : true, step : 1
 		});
-	var fieldname = new Array('.$fieldName.')
-	var fieldlabel = new Array('.$fieldLabel.')
-	var fielddatatype = new Array('.$fldDataType.')
+	var vtiger_fieldname = new Array('.$fieldName.')
+	var vtiger_fieldlabel = new Array('.$fieldLabel.')
+	var vtiger_fielddatatype = new Array('.$fldDataType.')
 
 
 		</script>';

Modified: vtigercrm/trunk/modules/Potentials/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Potentials/ListView.php (original)
+++ vtigercrm/trunk/modules/Potentials/ListView.php Mon Jun 12 14:26:25 2006
@@ -80,7 +80,7 @@
 	$smarty->assign("SEARCH_URL",$url_string);
 				
 	//Added for Custom Field Search
-/*	$sql="select * from field where tablename='potentialscf' order by fieldlabel";
+/*	$sql="select * from vtiger_field where vtiger_tablename='potentialscf' order by vtiger_fieldlabel";
 	$result=$adb->query($sql);
 	for($i=0;$i<$adb->num_rows($result);$i++)
 	{
@@ -92,11 +92,11 @@
 		if(isset($customfield[$i]) && $customfield[$i] != '')
 		{
 			if($uitype[$i] == 56)
-				$str = " potentialscf.".$column[$i]." = 1";
+				$str = " vtiger_potentialscf.".$column[$i]." = 1";
 			elseif($uitype[$i] == 15)//Added to handle the picklist customfield - after 4.2 patch2
-				$str = " potentialscf.".$column[$i]." = '".$customfield[$i]."'";
+				$str = " vtiger_potentialscf.".$column[$i]." = '".$customfield[$i]."'";
 			else
-				$str = " potentialscf.".$column[$i]." like '$customfield[$i]%'";
+				$str = " vtiger_potentialscf.".$column[$i]." like '$customfield[$i]%'";
 			array_push($where_clauses, $str);
 			$url_string .="&".$column[$i]."=".$customfield[$i];
 		}

Modified: vtigercrm/trunk/modules/Potentials/ListViewTop.php
==============================================================================
--- vtigercrm/trunk/modules/Potentials/ListViewTop.php (original)
+++ vtigercrm/trunk/modules/Potentials/ListViewTop.php Mon Jun 12 14:26:25 2006
@@ -38,7 +38,7 @@
 	$title[]='myTopOpenPotentials.gif';
 	$title[]=$current_module_strings['LBL_TOP_OPPORTUNITIES'];
 	$title[]='home_mypot';
-	$where = "AND potential.sales_stage <> '".$app_strings['LBL_CLOSE_WON']."' AND potential.sales_stage <> '".$app_strings['LBL_CLOSE_LOST']."' AND crmentity.smownerid='".$current_user->id."' ORDER BY amount DESC";
+	$where = "AND vtiger_potential.sales_stage <> '".$app_strings['LBL_CLOSE_WON']."' AND vtiger_potential.sales_stage <> '".$app_strings['LBL_CLOSE_LOST']."' AND vtiger_crmentity.smownerid='".$current_user->id."' ORDER BY amount DESC";
 	$header=array();
 	$header[]=$current_module_strings['LBL_LIST_OPPORTUNITY_NAME'];
 	$header[]=$current_module_strings['LBL_LIST_ACCOUNT_NAME'];

Modified: vtigercrm/trunk/modules/Potentials/Opportunity.php
==============================================================================
--- vtigercrm/trunk/modules/Potentials/Opportunity.php (original)
+++ vtigercrm/trunk/modules/Potentials/Opportunity.php Mon Jun 12 14:26:25 2006
@@ -31,7 +31,7 @@
 require_once('modules/Emails/Email.php');
 require_once('include/utils/utils.php');
 
-// potential is used to store customer information.
+// vtiger_potential is used to store customer information.
 class Potential extends CRMEntity {
 	var $log;
 	var $db;
@@ -43,15 +43,15 @@
 	var $module_id = "potentialid";
 	var $object_name = "potential";
 
-	var $tab_name = Array('crmentity','potential','potentialscf');
-	var $tab_name_index = Array('crmentity'=>'crmid','potential'=>'potentialid','potentialscf'=>'potentialid');
+	var $tab_name = Array('vtiger_crmentity','vtiger_potential','vtiger_potentialscf');
+	var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_potential'=>'potentialid','vtiger_potentialscf'=>'potentialid');
 
 	var $column_fields = Array();
 
 	var $sortby_fields = Array('potentialname','amount','closingdate','smownerid');
 
 
-	// This is the list of fields that are in the lists.
+	// This is the list of vtiger_fields that are in the lists.
 	var $list_fields = Array(
 			'Potential'=>Array('potential'=>'potentialname'),
 			'Account Name'=>Array('account'=>'accountname'),	  			
@@ -95,7 +95,7 @@
 	var $default_order_by = 'potentialname';
 	var $default_sort_order = 'ASC';
 
-	function potential() {
+	function Potential() {
 		$this->log = LoggerManager::getLogger('potential');
 		$this->db = new PearDatabase();
 		$this->column_fields = getColumnFields('Potentials');
@@ -107,18 +107,18 @@
 	{
 		global $log;
 		$log->debug("Entering create_list_query(".$order_by.",". $where.") method ...");
-		// Determine if the account name is present in the where clause.
+		// Determine if the vtiger_account name is present in the where clause.
 		$account_required = ereg("accounts\.name", $where);
 
 		if($account_required)
 		{
-			$query = "SELECT potential.potentialid,  potential.potentialname, potential.dateclosed FROM potential, account ";
-			$where_auto = "account.accountid = potential.accountid AND crmentity.deleted=0 ";
+			$query = "SELECT vtiger_potential.potentialid,  vtiger_potential.potentialname, vtiger_potential.dateclosed FROM vtiger_potential, vtiger_account ";
+			$where_auto = "account.accountid = vtiger_potential.accountid AND vtiger_crmentity.deleted=0 ";
 		}
 		else
 		{
-			$query = 'SELECT potentialid, potentialname, smcreatorid, closingdate FROM potential inner join crmentity on crmentity.crmid=potential.potentialid ';
-			$where_auto = 'AND crmentity.deleted=0';
+			$query = 'SELECT potentialid, potentialname, smcreatorid, closingdate FROM vtiger_potential inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_potential.potentialid ';
+			$where_auto = 'AND vtiger_crmentity.deleted=0';
 		}
 
 		if($where != "")
@@ -127,9 +127,9 @@
 			$query .= "where ".$where_auto;
 
 		if($order_by != "")
-			$query .= " ORDER BY potential.$order_by";
+			$query .= " ORDER BY vtiger_potential.$order_by";
 		else
-			$query .= " ORDER BY potential.potentialname";
+			$query .= " ORDER BY vtiger_potential.potentialname";
 
 
 
@@ -146,25 +146,25 @@
 		if($this->checkIfCustomTableExists('potentialscf'))
 		{
 			$query = $this->constructCustomQueryAddendum('potentialscf','Potentials') ."
-				potential.*,
-				account.accountname account_name,
-				users.user_name assigned_user_name
-					FROM potential
-					INNER JOIN crmentity
-					ON crmentity.crmid=potential.potentialid
-					LEFT JOIN account on potential.accountid=account.accountid
-					left join potentialscf on potentialscf.potentialid=potential.potentialid
-					left join users on crmentity.smownerid=users.id where crmentity.deleted=0 ";
+			vtiger_potential.*,
+			vtiger_account.accountname vtiger_account_name,
+			vtiger_users.user_name assigned_user_name
+					FROM vtiger_potential
+					INNER JOIN vtiger_crmentity
+					ON vtiger_crmentity.crmid=vtiger_potential.potentialid
+					LEFT JOIN vtiger_account on vtiger_potential.accountid=vtiger_account.accountid
+					left join vtiger_potentialscf on vtiger_potentialscf.potentialid=vtiger_potential.potentialid
+					left join vtiger_users on vtiger_crmentity.smownerid=vtiger_users.id where vtiger_crmentity.deleted=0 ";
 		}
 		else
 		{
 			$query = "SELECT
-				potential.*,
-				account.accountname account_name,
-				users.user_name assigned_user_name
-					FROM potential inner join crmentity on crmentity.crmid=potential.potentialid                                LEFT JOIN users
-					ON crmentity.smownerid=users.id
-					LEFT JOIN account on potential.accountid=account.accountid  LEFT JOIN potentialscf on potentialscf.potentialid=potential.potentialid where crmentity.deleted=0 ";
+			vtiger_potential.*,
+			vtiger_account.accountname vtiger_account_name,
+			vtiger_users.user_name assigned_user_name
+					FROM vtiger_potential inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_potential.potentialid                                LEFT JOIN vtiger_users
+					ON vtiger_crmentity.smownerid=vtiger_users.id
+					LEFT JOIN vtiger_account on vtiger_potential.accountid=vtiger_account.accountid  LEFT JOIN vtiger_potentialscf on vtiger_potentialscf.potentialid=vtiger_potential.potentialid where vtiger_crmentity.deleted=0 ";
 		}	
 
 		$log->debug("Exiting create_export_query method ...");
@@ -192,11 +192,11 @@
 		if(isPermitted("Contacts",3,"") == 'yes')
 		{
 
-			$button .= '<input title="Change" accessKey="" tabindex="2" type="button" class="button" value="'.$app_strings['LBL_SELECT_CONTACT_BUTTON_LABEL'].'" name="Button" LANGUAGE=javascript onclick=\'return window.open("index.php?module=Contacts&action=Popup&return_module=Potentials&popuptype=detailview&form=EditView&form_submit=false&recordid='.$_REQUEST["record"].'","test","width=600,height=400,resizable=1,scrollbars=1");\'>&nbsp;';
+			$button .= '<input title="Change" accessKey="" vtiger_tabindex="2" type="button" class="button" value="'.$app_strings['LBL_SELECT_CONTACT_BUTTON_LABEL'].'" name="Button" LANGUAGE=javascript onclick=\'return window.open("index.php?module=Contacts&action=Popup&return_module=Potentials&popuptype=detailview&form=EditView&form_submit=false&recordid='.$_REQUEST["record"].'","test","width=600,height=400,resizable=1,scrollbars=1");\'>&nbsp;';
 		}
 		$returnset = '&return_module=Potentials&return_action=DetailView&return_id='.$id;
 
-		$query = 'select contactdetails.accountid, users.user_name,groups.groupname,potential.potentialid, potential.potentialname, contactdetails.contactid, contactdetails.lastname, contactdetails.firstname, contactdetails.title, contactdetails.department, contactdetails.email, contactdetails.phone, crmentity.crmid, crmentity.smownerid, crmentity.modifiedtime from potential inner join contpotentialrel on contpotentialrel.potentialid = potential.potentialid inner join contactdetails on contpotentialrel.contactid = contactdetails.contactid inner join crmentity on crmentity.crmid = 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 potential.potentialid = '.$id.' and crmentity.deleted=0';
+		$query = 'select vtiger_contactdetails.accountid, vtiger_users.user_name,vtiger_groups.groupname,vtiger_potential.potentialid, vtiger_potential.potentialname, vtiger_contactdetails.contactid, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.title, vtiger_contactdetails.department, vtiger_contactdetails.email, vtiger_contactdetails.phone, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_potential inner join vtiger_contpotentialrel on vtiger_contpotentialrel.potentialid = vtiger_potential.potentialid inner join vtiger_contactdetails on vtiger_contpotentialrel.contactid = vtiger_contactdetails.contactid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid left join vtiger_groups on vtiger_groups.groupname=vtiger_contactgrouprelation.groupname left join vtiger_users on vtiger_crmentity.smownerid=vtiger_users.id where vtiger_potential.potentialid = '.$id.' and vtiger_crmentity.deleted=0';
 		
 		$log->debug("Exiting get_contacts method ...");
 		return GetRelatedList('Potentials','Contacts',$focus,$query,$button,$returnset);
@@ -225,7 +225,7 @@
 		}
 		$returnset = '&return_module=Potentials&return_action=DetailView&return_id='.$id;
 
-		$query = "SELECT activity.*,seactivityrel.*,crmentity.crmid, crmentity.smownerid, crmentity.modifiedtime, users.user_name, recurringevents.recurringtype, contactdetails.contactid, contactdetails.lastname, contactdetails.firstname from activity inner join seactivityrel on seactivityrel.activityid=activity.activityid inner join crmentity on crmentity.crmid=activity.activityid inner join potential on potential.potentialid=seactivityrel.crmid 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 left outer join recurringevents on recurringevents.activityid=activity.activityid 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 != 'Held')";
+		$query = "SELECT vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name, vtiger_recurringevents.recurringtype, vtiger_contactdetails.contactid, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid inner join vtiger_potential on vtiger_potential.potentialid=vtiger_seactivityrel.crmid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid= vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid where vtiger_seactivityrel.crmid=".$id." and (activitytype='Task' or vtiger_activitytype='Call' or vtiger_activitytype='Meeting') and vtiger_crmentity.deleted=0 and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Completed') and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Deferred') or (vtiger_activity.eventstatus != '' &&  vtiger_activity.eventstatus != 'Held')";
 		$log->debug("Exiting get_activities method ...");
 		return GetRelatedList('Potentials','Activities',$focus,$query,$button,$returnset);
 
@@ -251,11 +251,11 @@
 		}
 		if(isPermitted("Products",3,"") == 'yes')
 		{
-			$button .= '<input title="Change" accessKey="" tabindex="2" type="button" class="button" value="'.$app_strings['LBL_SELECT_PRODUCT_BUTTON_LABEL'].'" name="Button" LANGUAGE=javascript onclick=\'return window.open("index.php?module=Products&action=Popup&return_module=Potentials&popuptype=detailview&form=EditView&form_submit=false&recordid='.$_REQUEST["record"].'","test","width=600,height=400,resizable=1,scrollbars=1");\'>&nbsp;';
+			$button .= '<input title="Change" accessKey="" vtiger_tabindex="2" type="button" class="button" value="'.$app_strings['LBL_SELECT_PRODUCT_BUTTON_LABEL'].'" name="Button" LANGUAGE=javascript onclick=\'return window.open("index.php?module=Products&action=Popup&return_module=Potentials&popuptype=detailview&form=EditView&form_submit=false&recordid='.$_REQUEST["record"].'","test","width=600,height=400,resizable=1,scrollbars=1");\'>&nbsp;';
 		}
 		$returnset = '&return_module=Potentials&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 from products inner join seproductsrel on products.productid = seproductsrel.productid inner join crmentity on crmentity.crmid = products.productid inner join potential on potential.potentialid = seproductsrel.crmid  where potential.potentialid = '.$id.' and crmentity.deleted = 0';
+		$query = 'select vtiger_products.productid, vtiger_products.productname, vtiger_products.productcode, vtiger_products.commissionrate, vtiger_products.qty_per_unit, vtiger_products.unit_price, vtiger_crmentity.crmid, vtiger_crmentity.smownerid from vtiger_products inner join vtiger_seproductsrel on vtiger_products.productid = vtiger_seproductsrel.productid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_products.productid inner join vtiger_potential on vtiger_potential.potentialid = vtiger_seproductsrel.crmid  where vtiger_potential.potentialid = '.$id.' and vtiger_crmentity.deleted = 0';
 		$log->debug("Exiting get_products method ...");
 		return GetRelatedList('Potentials','Products',$focus,$query,$button,$returnset);
 	}
@@ -370,7 +370,7 @@
 
 		}
 
-		$query = 'select potstagehistory.*, potential.potentialname from potstagehistory inner join potential on potential.potentialid = potstagehistory.potentialid inner join crmentity on crmentity.crmid = potential.potentialid where crmentity.deleted = 0 and potential.potentialid = '.$id;
+		$query = 'select vtiger_potstagehistory.*, vtiger_potential.potentialname from vtiger_potstagehistory inner join vtiger_potential on vtiger_potential.potentialid = vtiger_potstagehistory.potentialid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_potential.potentialid where vtiger_crmentity.deleted = 0 and vtiger_potential.potentialid = '.$id;
 	 $log->debug("Exiting get_stage_history method ...");
 	}
 
@@ -378,21 +378,21 @@
 	{
 		 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,
-			crmentity.createdtime, crmentity.description, 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 activitygrouprelation on activitygrouprelation.activityid=activity.activityid
-				left join groups on groups.groupname=activitygrouprelation.groupname
-				inner join users on crmentity.smcreatorid= users.id
-				where (activity.activitytype = 'Meeting' or activity.activitytype='Call' or activity.activitytype='Task')
-				and (activity.status = 'Completed' or activity.status = 'Deferred' or (activity.eventstatus = 'Held' and activity.eventstatus != ''))
-				and seactivityrel.crmid=".$id;
+		$query = "SELECT vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.status,
+		vtiger_activity.eventstatus, vtiger_activity.activitytype, vtiger_contactdetails.contactid,
+		vtiger_contactdetails.firstname, vtiger_contactdetails.lastname, vtiger_crmentity.modifiedtime,
+		vtiger_crmentity.createdtime, vtiger_crmentity.description, vtiger_users.user_name
+				from vtiger_activity
+				inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid
+				inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid
+				left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid
+				left join vtiger_contactdetails on vtiger_contactdetails.contactid= vtiger_cntactivityrel.contactid
+				left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_activity.activityid
+				left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname
+				inner join vtiger_users on vtiger_crmentity.smcreatorid= vtiger_users.id
+				where (vtiger_activity.activitytype = 'Meeting' or vtiger_activity.activitytype='Call' or vtiger_activity.activitytype='Task')
+				and (vtiger_activity.status = 'Completed' or vtiger_activity.status = 'Deferred' or (vtiger_activity.eventstatus = 'Held' and vtiger_activity.eventstatus != ''))
+				and vtiger_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 ...");
@@ -404,35 +404,35 @@
 		 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
-		$query = "select notes.title,'Notes      '  ActivityType, notes.filename,
-			attachments.type  FileType, crm2.modifiedtime lastmodified,
-			seattachmentsrel.attachmentsid, notes.notesid crmid,
-			crm2.createdtime, notes.notecontent description, users.user_name
-				from notes
-				inner join senotesrel on senotesrel.notesid= notes.notesid
-				inner join crmentity on crmentity.crmid= senotesrel.crmid
-				inner join crmentity crm2 on crm2.crmid=notes.notesid and crm2.deleted=0
-				left join seattachmentsrel  on seattachmentsrel.crmid =notes.notesid
-				left join attachments on seattachmentsrel.attachmentsid = attachments.attachmentsid
-				inner join users on crm2.smcreatorid= users.id
-				where crmentity.crmid=".$id;
+		// Desc: Inserted crm2.createdtime, vtiger_notes.notecontent description, vtiger_users.user_name
+		// Inserted inner join vtiger_users on crm2.smcreatorid= vtiger_users.id
+		$query = "select vtiger_notes.title,'Notes      '  ActivityType, vtiger_notes.filename,
+		vtiger_attachments.type  FileType, crm2.modifiedtime lastmodified,
+		vtiger_seattachmentsrel.attachmentsid, vtiger_notes.notesid crmid,
+			crm2.createdtime, vtiger_notes.notecontent description, vtiger_users.user_name
+				from vtiger_notes
+				inner join vtiger_senotesrel on vtiger_senotesrel.notesid= vtiger_notes.notesid
+				inner join vtiger_crmentity on vtiger_crmentity.crmid= vtiger_senotesrel.crmid
+				inner join vtiger_crmentity crm2 on crm2.crmid=vtiger_notes.notesid and crm2.deleted=0
+				left join vtiger_seattachmentsrel  on vtiger_seattachmentsrel.crmid =vtiger_notes.notesid
+				left join vtiger_attachments on vtiger_seattachmentsrel.attachmentsid = vtiger_attachments.attachmentsid
+				inner join vtiger_users on crm2.smcreatorid= vtiger_users.id
+				where vtiger_crmentity.crmid=".$id;
 		$query .= ' union all ';
 		// Armando L?scher 18.10.2005 -> ?visibleDescription
-		// Desc: Inserted crm2.createdtime, attachments.description, users.user_name
-		// Inserted inner join users on crm2.smcreatorid= users.id
+		// Desc: Inserted crm2.createdtime, vtiger_attachments.description, vtiger_users.user_name
+		// Inserted inner join vtiger_users on crm2.smcreatorid= vtiger_users.id
 		// Inserted order by createdtime desc
-		$query .= "select attachments.description title ,'Attachments'  ActivityType,
-			attachments.name filename, attachments.type FileType,crm2.modifiedtime lastmodified,
-			attachments.attachmentsid, seattachmentsrel.attachmentsid crmid,
-			crm2.createdtime, attachments.description, users.user_name
-				from attachments
-				inner join seattachmentsrel on seattachmentsrel.attachmentsid= attachments.attachmentsid
-				inner join crmentity on crmentity.crmid= seattachmentsrel.crmid
-				inner join crmentity crm2 on crm2.crmid=attachments.attachmentsid
-				inner join users on crm2.smcreatorid= users.id
-				where crmentity.crmid=".$id."
+		$query .= "select vtiger_attachments.description title ,'Attachments'  ActivityType,
+		vtiger_attachments.name filename, vtiger_attachments.type FileType,crm2.modifiedtime lastmodified,
+		vtiger_attachments.attachmentsid, vtiger_seattachmentsrel.attachmentsid crmid,
+			crm2.createdtime, vtiger_attachments.description, vtiger_users.user_name
+				from vtiger_attachments
+				inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid= vtiger_attachments.attachmentsid
+				inner join vtiger_crmentity on vtiger_crmentity.crmid= vtiger_seattachmentsrel.crmid
+				inner join vtiger_crmentity crm2 on crm2.crmid=vtiger_attachments.attachmentsid
+				inner join vtiger_users on crm2.smcreatorid= vtiger_users.id
+				where vtiger_crmentity.crmid=".$id."
 				order by createdtime desc";
 
 		$log->debug("Exiting get_attachments method ...");
@@ -457,7 +457,7 @@
 		$returnset = '&return_module=Potentials&return_action=DetailView&return_id='.$id;
 
 
-		$query = "select crmentity.*, quotes.*, potential.potentialname, users.user_name from quotes inner join crmentity on crmentity.crmid=quotes.quoteid 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 left join users on users.id=crmentity.smownerid where crmentity.deleted=0 and potential.potentialid=".$id;
+		$query = "select vtiger_crmentity.*, vtiger_quotes.*, vtiger_potential.potentialname, vtiger_users.user_name from vtiger_quotes inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_quotes.quoteid left outer join vtiger_potential on vtiger_potential.potentialid=vtiger_quotes.potentialid left join vtiger_quotegrouprelation on vtiger_quotes.quoteid=vtiger_quotegrouprelation.quoteid left join vtiger_groups on vtiger_groups.groupname=vtiger_quotegrouprelation.groupname left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_crmentity.deleted=0 and vtiger_potential.potentialid=".$id;
 		$log->debug("Exiting get_quotes method ...");
 		return  GetRelatedList('Potentials','Quotes',$focus,$query,$button,$returnset);
 	}
@@ -480,7 +480,7 @@
 		$returnset = '&return_module=Potentials&return_action=DetailView&return_id='.$id;
 
 
-		$query = "select crmentity.*, salesorder.*, quotes.subject as quotename, account.accountname, potential.potentialname 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 potential on potential.potentialid=salesorder.potentialid left join sogrouprelation on salesorder.salesorderid=sogrouprelation.salesorderid left join groups on groups.groupname=sogrouprelation.groupname where crmentity.deleted=0 and potential.potentialid = ".$id;
+		$query = "select vtiger_crmentity.*, vtiger_salesorder.*, vtiger_quotes.subject as quotename, vtiger_account.accountname, vtiger_potential.potentialname from vtiger_salesorder inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_salesorder.salesorderid left outer join vtiger_quotes on vtiger_quotes.quoteid=vtiger_salesorder.quoteid left outer join vtiger_account on vtiger_account.accountid=vtiger_salesorder.accountid left outer join vtiger_potential on vtiger_potential.potentialid=vtiger_salesorder.potentialid left join vtiger_sogrouprelation on vtiger_salesorder.salesorderid=vtiger_sogrouprelation.salesorderid left join vtiger_groups on vtiger_groups.groupname=vtiger_sogrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_potential.potentialid = ".$id;
 		$log->debug("Exiting get_salesorder method ...");
 		return GetRelatedList('Potentials','SalesOrder',$focus,$query,$button,$returnset);
 

Modified: vtigercrm/trunk/modules/Potentials/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Potentials/Save.php (original)
+++ vtigercrm/trunk/modules/Potentials/Save.php Mon Jun 12 14:26:25 2006
@@ -56,7 +56,7 @@
 if($_REQUEST['return_viewname'] == '') $return_viewname='0';
 if($_REQUEST['return_viewname'] != '')$return_viewname=$_REQUEST['return_viewname'];
 
-//Added to send mail to the potential-owner about the Potential
+//Added to send mail to the vtiger_potential-owner about the Potential
 $status = sendNotificationToOwner('Potentials',&$focus);
 
 header("Location: index.php?action=$return_action&module=$return_module&record=$return_id&viewname=$return_viewname");

Modified: vtigercrm/trunk/modules/Potentials/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Potentials/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Potentials/language/en_us.lang.php Mon Jun 12 14:26:25 2006
@@ -85,7 +85,7 @@
 'LBL_NEW_CONTACT'=>'New Contact',
 'LBL_CONTACT_TITLE'=>'Contacts',
 
-//Added fields after RC1 - Release
+//Added vtiger_fields after RC1 - Release
 'LBL_ALL'=>'All',
 'LBL_WON'=>'Won',
 'LBL_LOST'=>'Lost',

Modified: vtigercrm/trunk/modules/Potentials/updateRelations.php
==============================================================================
--- vtigercrm/trunk/modules/Potentials/updateRelations.php (original)
+++ vtigercrm/trunk/modules/Potentials/updateRelations.php Mon Jun 12 14:26:25 2006
@@ -21,9 +21,9 @@
 	{
 		if($id != '')
 		{
-		$sql = "insert into contpotentialrel values (".$id.",".$_REQUEST["parentid"] .")";
+		$sql = "insert into vtiger_contpotentialrel values (".$id.",".$_REQUEST["parentid"] .")";
 		$adb->query($sql);
-		$sql = "insert into seproductsrel values (". $_REQUEST["parentid"] .",".$id.")";
+		$sql = "insert into vtiger_seproductsrel values (". $_REQUEST["parentid"] .",".$id.")";
 		$adb->query($sql);
 		}
 	}
@@ -31,9 +31,9 @@
 }
 elseif(isset($_REQUEST['entityid']) && $_REQUEST['entityid'] != '')
 {
-		$sql = "insert into contpotentialrel values (". $_REQUEST["entityid"] .",".$_REQUEST["parid"] .")";
+		$sql = "insert into vtiger_contpotentialrel values (". $_REQUEST["entityid"] .",".$_REQUEST["parid"] .")";
 		$adb->query($sql);
-		$sql = "insert into seproductsrel values (". $_REQUEST["parid"] .",".$_REQUEST["entityid"] .")";
+		$sql = "insert into vtiger_seproductsrel values (". $_REQUEST["parid"] .",".$_REQUEST["entityid"] .")";
 		$adb->query($sql);
  		header("Location: index.php?action=CallRelatedList&module=Potentials&record=".$_REQUEST["parid"]);
 }

Modified: vtigercrm/trunk/modules/PriceBooks/PriceBook.php
==============================================================================
--- vtigercrm/trunk/modules/PriceBooks/PriceBook.php (original)
+++ vtigercrm/trunk/modules/PriceBooks/PriceBook.php Mon Jun 12 14:26:25 2006
@@ -22,17 +22,17 @@
 	var $db;
 
 
-	// Stored fields
+	// Stored vtiger_fields
 	var $id;
 	var $mode;
 
-	var $tab_name = Array('crmentity','pricebook','pricebookcf');
-	var $tab_name_index = Array('crmentity'=>'crmid','pricebook'=>'pricebookid','pricebookcf'=>'pricebookid');
+	var $tab_name = Array('vtiger_crmentity','vtiger_pricebook','vtiger_pricebookcf');
+	var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_pricebook'=>'pricebookid','vtiger_pricebookcf'=>'pricebookid');
 	var $column_fields = Array();
 
 	var $sortby_fields = Array('bookname');		  
 
-        // This is the list of fields that are in the lists.
+        // This is the list of vtiger_fields that are in the lists.
 	var $list_fields = Array(
                                 'Price Book Name'=>Array('pricebook'=>'bookname'),
                                 'Active'=>Array('pricebook'=>'active')
@@ -78,7 +78,7 @@
 
 		$returnset = '&return_module=PriceBooks&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,pricebookproductrel.listprice from products inner join pricebookproductrel on products.productid = pricebookproductrel.productid inner join crmentity on crmentity.crmid = products.productid inner join pricebook on pricebook.pricebookid = pricebookproductrel.pricebookid  where pricebook.pricebookid = '.$id.' and crmentity.deleted = 0'; 
+		$query = 'select vtiger_products.productid, vtiger_products.productname, vtiger_products.productcode, vtiger_products.commissionrate, vtiger_products.qty_per_unit, vtiger_products.unit_price, vtiger_crmentity.crmid, vtiger_crmentity.smownerid,vtiger_pricebookproductrel.listprice from vtiger_products inner join vtiger_pricebookproductrel on vtiger_products.productid = vtiger_pricebookproductrel.productid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_products.productid inner join vtiger_pricebook on vtiger_pricebook.pricebookid = vtiger_pricebookproductrel.pricebookid  where vtiger_pricebook.pricebookid = '.$id.' and vtiger_crmentity.deleted = 0'; 
 		$log->debug("Exiting get_pricebook_products method ...");
 		return getPriceBookRelatedProducts($query,$focus,$returnset);
 	}
@@ -87,11 +87,11 @@
 		global $log;
 		$log->debug("Entering get_pricebook_noproduct(".$id.") method ...");
 		 
-		$query = "select crmentity.crmid, pricebook.* from pricebook inner join crmentity on crmentity.crmid=pricebook.pricebookid where crmentity.deleted=0";                                                                                                  $result = $this->db->query($query);
+		$query = "select vtiger_crmentity.crmid, vtiger_pricebook.* from vtiger_pricebook inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_pricebook.pricebookid where vtiger_crmentity.deleted=0";                                                                                                  $result = $this->db->query($query);
 		$no_count = $this->db->num_rows($result);
 		if($no_count !=0)
 		{
-       	 		$pb_query = 'select crmentity.crmid, pricebook.pricebookid,pricebookproductrel.productid from pricebook inner join crmentity on crmentity.crmid=pricebook.pricebookid inner join pricebookproductrel on pricebookproductrel.pricebookid=pricebook.pricebookid where crmentity.deleted=0 and pricebookproductrel.productid='.$id;
+       	 		$pb_query = 'select vtiger_crmentity.crmid, vtiger_pricebook.pricebookid,vtiger_pricebookproductrel.productid from vtiger_pricebook inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_pricebook.pricebookid inner join vtiger_pricebookproductrel on vtiger_pricebookproductrel.pricebookid=vtiger_pricebook.pricebookid where vtiger_crmentity.deleted=0 and vtiger_pricebookproductrel.productid='.$id;
 			$result_pb = $this->db->query($pb_query);
 			if($no_count == $this->db->num_rows($result_pb))
 			{

Modified: vtigercrm/trunk/modules/Products/AddProductToPriceBooks.php
==============================================================================
--- vtigercrm/trunk/modules/Products/AddProductToPriceBooks.php (original)
+++ vtigercrm/trunk/modules/Products/AddProductToPriceBooks.php Mon Jun 12 14:26:25 2006
@@ -50,16 +50,16 @@
 $list_query = getListQuery("PriceBooks");
 $xtpl->assign("PRICEBOOKLISTHEADER", get_form_header($current_module_strings['LBL_LIST_PRICEBOOK_FORM_TITLE'], $other_text, false ));
 
-$list_query .= ' ORDER BY pricebookid DESC ';
+$list_query .= ' ORDER BY vtiger_pricebookid DESC ';
 
 $list_result = $adb->query($list_query);
 $num_rows = $adb->num_rows($list_result);
 
 $record_string= "Total No of Rows: ".$num_rows;
 
-//Retreiving the array of already releated products;
+//Retreiving the array of already releated vtiger_products;
 
-$sql1="select crmentity.crmid, pricebookproductrel.pricebookid,products.unit_price from pricebookproductrel inner join crmentity on crmentity.crmid=pricebookproductrel.productid inner join products on products.productid=pricebookproductrel.productid where crmentity.deleted=0 and pricebookproductrel.productid=".$productid;
+$sql1="select vtiger_crmentity.crmid, vtiger_pricebookproductrel.pricebookid,vtiger_products.unit_price from vtiger_pricebookproductrel inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_pricebookproductrel.productid inner join vtiger_products on vtiger_products.productid=vtiger_pricebookproductrel.productid where vtiger_crmentity.deleted=0 and vtiger_pricebookproductrel.productid=".$productid;
 $res1 = $adb->query($sql1);
 $num_prod_rows = $adb->num_rows($res1);
 $pbk_array = Array();

Modified: vtigercrm/trunk/modules/Products/AddProductsToPriceBook.php
==============================================================================
--- vtigercrm/trunk/modules/Products/AddProductsToPriceBook.php (original)
+++ vtigercrm/trunk/modules/Products/AddProductsToPriceBook.php Mon Jun 12 14:26:25 2006
@@ -58,7 +58,7 @@
 
 	$where_clauses = Array();
 	//Added for Custom Field Search
-	$sql="select * from field where tablename='productcf' order by fieldlabel";
+	$sql="select * from vtiger_field where vtiger_tablename='productcf' order by vtiger_fieldlabel";
 	$result=$adb->query($sql);
 	for($i=0;$i<$adb->num_rows($result);$i++)
 	{
@@ -71,9 +71,9 @@
 	        if(isset($customfield[$i]) && $customfield[$i] != '')
 	        {
 			if($uitype[$i] == 56)
-                                $str=" productcf.".$column[$i]." = 1";
+                                $str=" vtiger_productcf.".$column[$i]." = 1";
                         else
-			        $str=" productcf.".$column[$i]." like '$customfield[$i]%'";
+			        $str=" vtiger_productcf.".$column[$i]." like '$customfield[$i]%'";
 		        array_push($where_clauses, $str);
 			$url_string .="&".$column[$i]."=".$customfield[$i];
 	        }
@@ -178,9 +178,9 @@
 
 $record_string= "Total No of Rows: ".$num_rows;
 
-//Retreiving the array of already releated products;
-
-$sql1 = "select productid from pricebookproductrel where pricebookid=".$pricebook_id;
+//Retreiving the array of already releated vtiger_products;
+
+$sql1 = "select productid from vtiger_pricebookproductrel where vtiger_pricebookid=".$pricebook_id;
 $res1 = $adb->query($sql1);
 $num_prod_rows = $adb->num_rows($res1);
 $prod_array = Array();
@@ -224,7 +224,7 @@
 for($i=0; $i<$num_rows; $i++)
 {
 	
-	 $log->info("Products :: Showing the List of products to be added in price book");
+	 $log->info("Products :: Showing the List of vtiger_products to be added in price book");
 	$entity_id = $adb->query_result($list_result,$i,"crmid");
 	if(! array_key_exists($entity_id, $prod_array))
 	{

Modified: vtigercrm/trunk/modules/Products/DeletePriceBookProductRel.php
==============================================================================
--- vtigercrm/trunk/modules/Products/DeletePriceBookProductRel.php (original)
+++ vtigercrm/trunk/modules/Products/DeletePriceBookProductRel.php Mon Jun 12 14:26:25 2006
@@ -18,13 +18,13 @@
 if($return_action !='' && $return_action=="DetailView")
 {
 	$log->info("Products :: Deleting Price Book");
-	$query = "delete from pricebookproductrel where pricebookid=".$record." and productid=".$return_id;
+	$query = "delete from vtiger_pricebookproductrel where vtiger_pricebookid=".$record." and productid=".$return_id;
 	$adb->query($query); 
 }
 else
 {
 	$log->info("Products :: Deleting Price Book");
-	$query = "delete from pricebookproductrel where pricebookid=".$return_id." and productid=".$record;
+	$query = "delete from vtiger_pricebookproductrel where vtiger_pricebookid=".$return_id." and productid=".$record;
 	$adb->query($query); 
 }
 

Modified: vtigercrm/trunk/modules/Products/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/Products/EditView.php (original)
+++ vtigercrm/trunk/modules/Products/EditView.php Mon Jun 12 14:26:25 2006
@@ -63,7 +63,7 @@
     	$focus->mode = ''; 	
 } 
 
-//needed when creating a new product with a default vendor name to passed 
+//needed when creating a new product with a default vtiger_vendor name to passed 
 if (isset($_REQUEST['name']) && is_null($focus->name)) {
 	$focus->name = $_REQUEST['name'];
 	

Modified: vtigercrm/trunk/modules/Products/Forms.php
==============================================================================
--- vtigercrm/trunk/modules/Products/Forms.php (original)
+++ vtigercrm/trunk/modules/Products/Forms.php Mon Jun 12 14:26:25 2006
@@ -15,7 +15,7 @@
 /*********************************************************************************
  * $Header: /advent/projects/wesat/vtiger_crm/vtigercrm/modules/Products/Forms.php,v 1.3 2005/03/04 17:06:55 saraj Exp $
  * Description:  Contains a variety of utility functions used to display UI
- * components such as form headers and footers.  Intended to be modified on a per
+ * components such as form vtiger_headers and footers.  Intended to be modified on a per
  * theme basis.
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
  * All Rights Reserved.
@@ -23,7 +23,7 @@
  ********************************************************************************/
 
 /**
- * Create HTML form to enter a new record with the minimum necessary fields.
+ * Create HTML form to enter a new record with the minimum necessary vtiger_fields.
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
  * All Rights Reserved.
  * Contributor(s): ______________________________________..
@@ -52,7 +52,7 @@
 $qcreate_form = get_left_form_header($mod_strings['LBL_NEW_FORM_TITLE']);
 
 
-$qcreate_get_field="select * from field where tabid=14 and quickcreate=0 order by quickcreatesequence";
+$qcreate_get_field="select * from vtiger_field where vtiger_tabid=14 and quickcreate=0 order by quickcreatesequence";
 $qcreate_get_result=$adb->query($qcreate_get_field);
 $qcreate_get_noofrows=$adb->num_rows($qcreate_get_result);
 
@@ -140,9 +140,9 @@
 $qcreate_form.='</form>';
 $qcreate_form.='<script type="text/javascript">
 		
-	var fieldname = new Array('.$fieldName.')
-	var fieldlabel = new Array('.$fieldLabel.')
-	var fielddatatype = new Array('.$fldDataType.')
+	var vtiger_fieldname = new Array('.$fieldName.')
+	var vtiger_fieldlabel = new Array('.$fieldLabel.')
+	var vtiger_fielddatatype = new Array('.$fldDataType.')
 
 		</script>';
 

Modified: vtigercrm/trunk/modules/Products/Product.php
==============================================================================
--- vtigercrm/trunk/modules/Products/Product.php (original)
+++ vtigercrm/trunk/modules/Products/Product.php Mon Jun 12 14:26:25 2006
@@ -22,7 +22,7 @@
 	var $db;
 
 
-	// Stored fields
+	// Stored vtiger_fields
 	var $id;
 	var $mode;
 
@@ -42,13 +42,13 @@
         );
 
 
-	var $tab_name = Array('crmentity','products','productcf','seproductsrel','producttaxrel','attachments');
-	var $tab_name_index = Array('crmentity'=>'crmid','products'=>'productid','productcf'=>'productid','seproductsrel'=>'productid','producttaxrel'=>'productid','attachments'=>'attachmentsid');
+	var $tab_name = Array('vtiger_crmentity','vtiger_products','vtiger_productcf','vtiger_seproductsrel','vtiger_producttaxrel','vtiger_attachments');
+	var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_products'=>'productid','vtiger_productcf'=>'productid','vtiger_seproductsrel'=>'productid','vtiger_producttaxrel'=>'productid','vtiger_attachments'=>'attachmentsid');
 	var $column_fields = Array();
 
 	var $sortby_fields = Array('productname','productcode','commissionrate');		  
 
-        // This is the list of fields that are in the lists.
+        // This is the list of vtiger_fields that are in the lists.
         var $list_fields = Array(
                                 'Product Name'=>Array('products'=>'productname'),
                                 'Product Code'=>Array('products'=>'productcode'),
@@ -100,50 +100,50 @@
 		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
-		$query = "SELECT notes.title, 'Notes      ' AS ActivityType,
-				notes.filename, attachments.type  AS FileType,
+		// Desc: Inserted vtiger_crmentity.createdtime, vtiger_notes.notecontent description, vtiger_users.user_name
+		// Inserted inner join vtiger_users on vtiger_crmentity.smcreatorid= vtiger_users.id
+		$query = "SELECT vtiger_notes.title, 'Notes      ' AS ActivityType,
+			vtiger_notes.filename, vtiger_attachments.type  AS FileType,
 				crm2.modifiedtime AS lastmodified,
-				seattachmentsrel.attachmentsid AS attachmentsid,
-				notes.notesid AS crmid, crmentity.createdtime,
-				notes.notecontent AS description,
-				users.user_name
-			FROM notes
-			INNER JOIN senotesrel
-				ON senotesrel.notesid = notes.notesid
-			INNER JOIN crmentity
-				ON crmentity.crmid = senotesrel.crmid
-			INNER JOIN crmentity AS crm2
-				ON crm2.crmid = notes.notesid
+			vtiger_seattachmentsrel.attachmentsid AS vtiger_attachmentsid,
+			vtiger_notes.notesid AS crmid, vtiger_crmentity.createdtime,
+			vtiger_notes.notecontent AS description,
+			vtiger_users.user_name
+			FROM vtiger_notes
+			INNER JOIN vtiger_senotesrel
+				ON vtiger_senotesrel.notesid = vtiger_notes.notesid
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_senotesrel.crmid
+			INNER JOIN vtiger_crmentity AS crm2
+				ON crm2.crmid = vtiger_notes.notesid
 				AND crm2.deleted = 0
-			LEFT JOIN seattachmentsrel
-				ON seattachmentsrel.crmid = notes.notesid
-			LEFT JOIN attachments
-				ON seattachmentsrel.attachmentsid = attachments.attachmentsid
-			INNER JOIN users
-				ON crmentity.smcreatorid = users.id
-			WHERE crmentity.crmid = ".$id."
+			LEFT JOIN vtiger_seattachmentsrel
+				ON vtiger_seattachmentsrel.crmid = vtiger_notes.notesid
+			LEFT JOIN vtiger_attachments
+				ON vtiger_seattachmentsrel.attachmentsid = vtiger_attachments.attachmentsid
+			INNER JOIN vtiger_users
+				ON vtiger_crmentity.smcreatorid = vtiger_users.id
+			WHERE vtiger_crmentity.crmid = ".$id."
 		UNION ALL
-			SELECT attachments.description AS title,
+			SELECT vtiger_attachments.description AS title,
 				'Attachments' AS ActivityType,
-				attachments.name AS filename,
-				attachments.type AS FileType,
+			vtiger_attachments.name AS filename,
+			vtiger_attachments.type AS FileType,
 				crm2.modifiedtime AS lastmodified,
-				attachments.attachmentsid AS attachmentsid,
-				seattachmentsrel.attachmentsid AS crmid,
-				crmentity.createdtime,
-				attachments.description, users.user_name
-			FROM attachments
-			INNER JOIN seattachmentsrel
-				ON seattachmentsrel.attachmentsid = attachments.attachmentsid
-			INNER JOIN crmentity
-				ON crmentity.crmid = seattachmentsrel.crmid
-			INNER JOIN crmentity AS crm2
-				ON crm2.crmid = attachments.attachmentsid
-			INNER JOIN users
-				ON crmentity.smcreatorid = users.id
-			WHERE crmentity.crmid = ".$id;	
+			vtiger_attachments.attachmentsid AS vtiger_attachmentsid,
+			vtiger_seattachmentsrel.attachmentsid AS crmid,
+			vtiger_crmentity.createdtime,
+			vtiger_attachments.description, vtiger_users.user_name
+			FROM vtiger_attachments
+			INNER JOIN vtiger_seattachmentsrel
+				ON vtiger_seattachmentsrel.attachmentsid = vtiger_attachments.attachmentsid
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_seattachmentsrel.crmid
+			INNER JOIN vtiger_crmentity AS crm2
+				ON crm2.crmid = vtiger_attachments.attachmentsid
+			INNER JOIN vtiger_users
+				ON vtiger_crmentity.smcreatorid = vtiger_users.id
+			WHERE vtiger_crmentity.crmid = ".$id;	
 
 		$log->debug("Exiting get_attachments method ...");
         	return getAttachmentsAndNotes('Products',$query,$id);
@@ -153,19 +153,19 @@
 	{
 		global $log;
 		$log->debug("Entering get_opportunities(".$id.") method ...");
-		$query = "SELECT potential.potentialid, potential.potentialname,
-				potential.potentialtype, products.productid,
-				products.productname, products.qty_per_unit,
-				products.unit_price, products.expiry_date
-			FROM potential
-			INNER JOIN products
-				ON potential.productid = products.productid
-			LEFT JOIN potentialgrouprelation
-				ON potential.potentialid = potentialgrouprelation.potentialid
-			LEFT JOIN groups
-				ON groups.groupname = potentialgrouprelation.groupname
-			WHERE crmentity.deleted = 0
-			AND products.productid = ".$id;
+		$query = "SELECT vtiger_potential.potentialid, vtiger_potential.potentialname,
+			vtiger_potential.potentialtype, vtiger_products.productid,
+			vtiger_products.productname, vtiger_products.qty_per_unit,
+			vtiger_products.unit_price, vtiger_products.expiry_date
+			FROM vtiger_potential
+			INNER JOIN vtiger_products
+				ON vtiger_potential.productid = vtiger_products.productid
+			LEFT JOIN vtiger_potentialgrouprelation
+				ON vtiger_potential.potentialid = vtiger_potentialgrouprelation.potentialid
+			LEFT JOIN vtiger_groups
+				ON vtiger_groups.groupname = vtiger_potentialgrouprelation.groupname
+			WHERE vtiger_crmentity.deleted = 0
+			AND vtiger_products.productid = ".$id;
 		$log->debug("Exiting get_opportunities method ...");
           renderRelatedPotentials($query);
         }
@@ -182,26 +182,26 @@
 
 		$returnset = '&return_module=Products&return_action=DetailView&return_id='.$id;
 
-		$query = "SELECT users.user_name, users.id,
-				products.productid, products.productname,
-				troubletickets.ticketid,
-				troubletickets.parent_id, troubletickets.title,
-				troubletickets.status, troubletickets.priority,
-				crmentity.crmid, crmentity.smownerid,
-				crmentity.modifiedtime
-			FROM troubletickets
-			INNER JOIN crmentity
-				ON crmentity.crmid = troubletickets.ticketid
-			LEFT JOIN products
-				ON products.productid = troubletickets.product_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 products.productid = ".$id;
+		$query = "SELECT vtiger_users.user_name, vtiger_users.id,
+			vtiger_products.productid, vtiger_products.productname,
+			vtiger_troubletickets.ticketid,
+			vtiger_troubletickets.parent_id, vtiger_troubletickets.title,
+			vtiger_troubletickets.status, vtiger_troubletickets.priority,
+			vtiger_crmentity.crmid, vtiger_crmentity.smownerid,
+			vtiger_crmentity.modifiedtime
+			FROM vtiger_troubletickets
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_troubletickets.ticketid
+			LEFT JOIN vtiger_products
+				ON vtiger_products.productid = vtiger_troubletickets.product_id
+			LEFT JOIN vtiger_users
+				ON vtiger_users.id = vtiger_crmentity.smownerid
+			LEFT JOIN vtiger_ticketgrouprelation
+				ON vtiger_troubletickets.ticketid = vtiger_ticketgrouprelation.ticketid
+			LEFT JOIN vtiger_groups
+				ON vtiger_groups.groupname = vtiger_ticketgrouprelation.groupname
+			WHERE vtiger_crmentity.deleted = 0
+			AND vtiger_products.productid = ".$id;
 	$log->debug("Exiting get_tickets method ...");
 		return GetRelatedList('Products','HelpDesk',$focus,$query,$button,$returnset);
 	}
@@ -223,36 +223,36 @@
 		$returnset = '&return_module=Products&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,
-				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."
+		$query = "SELECT vtiger_contactdetails.lastname,
+			vtiger_contactdetails.firstname,
+			vtiger_contactdetails.contactid,
+			vtiger_activity.*,
+			vtiger_seactivityrel.*,
+			vtiger_crmentity.crmid, vtiger_crmentity.smownerid,
+			vtiger_crmentity.modifiedtime,
+			vtiger_users.user_name,
+			vtiger_recurringevents.recurringtype
+			FROM vtiger_activity
+			INNER JOIN vtiger_seactivityrel
+				ON vtiger_seactivityrel.activityid = vtiger_activity.activityid
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid=vtiger_activity.activityid
+			LEFT JOIN vtiger_cntactivityrel
+				ON vtiger_cntactivityrel.activityid = vtiger_activity.activityid
+			LEFT JOIN vtiger_contactdetails
+				ON vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid
+			LEFT JOIN vtiger_users
+				ON vtiger_users.id = vtiger_crmentity.smownerid
+			LEFT OUTER JOIN vtiger_recurringevents
+				ON vtiger_recurringevents.activityid = vtiger_activity.activityid
+			LEFT JOIN vtiger_activitygrouprelation
+				ON vtiger_activitygrouprelation.activityid = vtiger_crmentity.crmid
+			LEFT JOIN vtiger_groups
+				ON vtiger_groups.groupname = vtiger_activitygrouprelation.groupname
+			WHERE vtiger_seactivityrel.crmid=".$id."
 			AND (activitytype = 'Task'
-				OR activitytype = 'Call'
-				OR activitytype = 'Meeting')";
+				OR vtiger_activitytype = 'Call'
+				OR vtiger_activitytype = 'Meeting')";
 		$log->debug("Exiting get_activities method ...");
 		return GetRelatedList('Products','Activities',$focus,$query,$button,$returnset);
 	}
@@ -268,26 +268,26 @@
 		$returnset = '&return_module=Products&return_action=DetailView&return_id='.$id;
 
 
-		$query = "SELECT crmentity.*,
-				quotes.*,
-				potential.potentialname,
-				account.accountname,
-				quotesproductrel.productid
-			FROM quotes
-			INNER JOIN crmentity
-				ON crmentity.crmid = quotes.quoteid
-			INNER JOIN quotesproductrel
-				ON quotesproductrel.quoteid = quotes.quoteid
-			LEFT OUTER JOIN account
-				ON account.accountid = quotes.accountid
-			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 quotesproductrel.productid = ".$id;
+		$query = "SELECT vtiger_crmentity.*,
+			vtiger_quotes.*,
+			vtiger_potential.potentialname,
+			vtiger_account.accountname,
+			vtiger_quotesproductrel.productid
+			FROM vtiger_quotes
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_quotes.quoteid
+			INNER JOIN vtiger_quotesproductrel
+				ON vtiger_quotesproductrel.quoteid = vtiger_quotes.quoteid
+			LEFT OUTER JOIN vtiger_account
+				ON vtiger_account.accountid = vtiger_quotes.accountid
+			LEFT OUTER JOIN vtiger_potential
+				ON vtiger_potential.potentialid = vtiger_quotes.potentialid
+			LEFT JOIN vtiger_quotegrouprelation
+				ON vtiger_quotes.quoteid = vtiger_quotegrouprelation.quoteid
+			LEFT JOIN vtiger_groups
+				ON vtiger_groups.groupname = vtiger_quotegrouprelation.groupname
+			WHERE vtiger_crmentity.deleted = 0
+			AND vtiger_quotesproductrel.productid = ".$id;
 		$log->debug("Exiting get_quotes method ...");
 		return GetRelatedList('Products','Quotes',$focus,$query,$button,$returnset);
 	}
@@ -303,23 +303,23 @@
 
 		$returnset = '&return_module=Products&return_action=DetailView&return_id='.$id;
 
-		$query = "SELECT crmentity.*,
-				purchaseorder.*,
-				products.productname,
-				poproductrel.productid
-			FROM purchaseorder
-			INNER JOIN crmentity
-				ON crmentity.crmid = purchaseorder.purchaseorderid
-			INNER JOIN poproductrel
-				ON poproductrel.purchaseorderid = purchaseorder.purchaseorderid
-			INNER JOIN products
-				ON products.productid = poproductrel.productid
-			LEFT JOIN pogrouprelation
-				ON purchaseorder.purchaseorderid = pogrouprelation.purchaseorderid
-			LEFT JOIN groups
-				ON groups.groupname = pogrouprelation.groupname
-			WHERE crmentity.deleted = 0
-			AND products.productid = ".$id;
+		$query = "SELECT vtiger_crmentity.*,
+			vtiger_purchaseorder.*,
+			vtiger_products.productname,
+			vtiger_poproductrel.productid
+			FROM vtiger_purchaseorder
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_purchaseorder.purchaseorderid
+			INNER JOIN vtiger_poproductrel
+				ON vtiger_poproductrel.purchaseorderid = vtiger_purchaseorder.purchaseorderid
+			INNER JOIN vtiger_products
+				ON vtiger_products.productid = vtiger_poproductrel.productid
+			LEFT JOIN vtiger_pogrouprelation
+				ON vtiger_purchaseorder.purchaseorderid = vtiger_pogrouprelation.purchaseorderid
+			LEFT JOIN vtiger_groups
+				ON vtiger_groups.groupname = vtiger_pogrouprelation.groupname
+			WHERE vtiger_crmentity.deleted = 0
+			AND vtiger_products.productid = ".$id;
 		$log->debug("Exiting get_purchase_orders method ...");
 		return GetRelatedList('Products','PurchaseOrder',$focus,$query,$button,$returnset);
 	}
@@ -334,25 +334,25 @@
 		$button = '';
 		$returnset = '&return_module=Products&return_action=DetailView&return_id='.$id;
 
-		$query = "SELECT crmentity.*,
-				salesorder.*,
-				products.productname AS productname,
-				account.accountname
-			FROM salesorder
-			INNER JOIN crmentity
-				ON crmentity.crmid = salesorder.salesorderid
-			INNER JOIN soproductrel
-				ON soproductrel.salesorderid = salesorder.salesorderid
-			INNER JOIN products
-				ON products.productid = soproductrel.productid
-			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 products.productid = ".$id;
+		$query = "SELECT vtiger_crmentity.*,
+			vtiger_salesorder.*,
+			vtiger_products.productname AS productname,
+			vtiger_account.accountname
+			FROM vtiger_salesorder
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_salesorder.salesorderid
+			INNER JOIN vtiger_soproductrel
+				ON vtiger_soproductrel.salesorderid = vtiger_salesorder.salesorderid
+			INNER JOIN vtiger_products
+				ON vtiger_products.productid = vtiger_soproductrel.productid
+			LEFT OUTER JOIN vtiger_account
+				ON vtiger_account.accountid = vtiger_salesorder.accountid
+			LEFT JOIN vtiger_sogrouprelation
+				ON vtiger_salesorder.salesorderid = vtiger_sogrouprelation.salesorderid
+			LEFT JOIN vtiger_groups
+				ON vtiger_groups.groupname = vtiger_sogrouprelation.groupname
+			WHERE vtiger_crmentity.deleted = 0
+			AND vtiger_products.productid = ".$id;
 		$log->debug("Exiting get_salesorder method ...");
 		return GetRelatedList('Products','SalesOrder',$focus,$query,$button,$returnset);
 	}
@@ -368,23 +368,23 @@
 		$returnset = '&return_module=Products&return_action=DetailView&return_id='.$id;
 
 
-		$query = "SELECT crmentity.*,
-				invoice.*,
-				invoiceproductrel.quantity,
-				account.accountname
-			FROM invoice
-			INNER JOIN crmentity
-				ON crmentity.crmid = invoice.invoiceid
-			LEFT OUTER JOIN account
-				ON account.accountid = invoice.accountid
-			INNER JOIN invoiceproductrel
-				ON invoiceproductrel.invoiceid = invoice.invoiceid
-			LEFT JOIN invoicegrouprelation
-				ON invoice.invoiceid = invoicegrouprelation.invoiceid
-			LEFT JOIN groups
-				ON groups.groupname = invoicegrouprelation.groupname
-			WHERE crmentity.deleted = 0
-			AND invoiceproductrel.productid = ".$id;
+		$query = "SELECT vtiger_crmentity.*,
+			vtiger_invoice.*,
+			vtiger_invoiceproductrel.quantity,
+			vtiger_account.accountname
+			FROM vtiger_invoice
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_invoice.invoiceid
+			LEFT OUTER JOIN vtiger_account
+				ON vtiger_account.accountid = vtiger_invoice.accountid
+			INNER JOIN vtiger_invoiceproductrel
+				ON vtiger_invoiceproductrel.invoiceid = vtiger_invoice.invoiceid
+			LEFT JOIN vtiger_invoicegrouprelation
+				ON vtiger_invoice.invoiceid = vtiger_invoicegrouprelation.invoiceid
+			LEFT JOIN vtiger_groups
+				ON vtiger_groups.groupname = vtiger_invoicegrouprelation.groupname
+			WHERE vtiger_crmentity.deleted = 0
+			AND vtiger_invoiceproductrel.productid = ".$id;
 		$log->debug("Exiting get_invoices method ...");
 		return GetRelatedList('Products','Invoice',$focus,$query,$button,$returnset);
 	}
@@ -399,16 +399,16 @@
 		$returnset = '&return_module=Products&return_action=DetailView&return_id='.$id;
 
 
-		$query = "SELECT crmentity.crmid,
-				pricebook.*,
-				pricebookproductrel.productid as prodid
-			FROM pricebook
-			INNER JOIN crmentity
-				ON crmentity.crmid = pricebook.pricebookid
-			INNER JOIN pricebookproductrel
-				ON pricebookproductrel.pricebookid = pricebook.pricebookid
-			WHERE crmentity.deleted = 0
-			AND pricebookproductrel.productid = ".$id; 
+		$query = "SELECT vtiger_crmentity.crmid,
+			vtiger_pricebook.*,
+			vtiger_pricebookproductrel.productid as prodid
+			FROM vtiger_pricebook
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_pricebook.pricebookid
+			INNER JOIN vtiger_pricebookproductrel
+				ON vtiger_pricebookproductrel.pricebookid = vtiger_pricebook.pricebookid
+			WHERE vtiger_crmentity.deleted = 0
+			AND vtiger_pricebookproductrel.productid = ".$id; 
 		$log->debug("Exiting get_product_pricebooks method ...");
 		return GetRelatedList('Products','PriceBooks',$focus,$query,$button,$returnset);
 	}
@@ -417,12 +417,12 @@
 	{
 		global $log;
 		$log->debug("Entering product_novendor() method ...");
-		$query = "SELECT products.productname, crmentity.deleted
-			FROM products
-			INNER JOIN crmentity
-				ON crmentity.crmid = products.productid
-			WHERE crmentity.deleted = 0
-			AND products.vendor_id = ''";
+		$query = "SELECT vtiger_products.productname, vtiger_crmentity.deleted
+			FROM vtiger_products
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_products.productid
+			WHERE vtiger_crmentity.deleted = 0
+			AND vtiger_products.vendor_id = ''";
 		$result=$this->db->query($query);
 		$log->debug("Exiting product_novendor method ...");
 		return $this->db->num_rows($result);
@@ -437,85 +437,85 @@
 		{
 
 		$query = $this->constructCustomQueryAddendum('productcf','Products') ."    
-				products.productid AS productid,
-				products.productname AS productname,
-				products.productcode AS productcode,
-				products.productcategory AS productcategory,
-				products.manufacturer AS manufacturer,
-				products.product_description AS product_description,
-				products.qty_per_unit AS qty_per_unit,
-				products.unit_price AS unit_price,
-				products.weight AS weight,
-				products.pack_size AS pack_size,
-				DATE_FORMAT(products.start_date, '%Y-%M-%D') AS start_date,
-				DATE_FORMAT(products.expiry_date, '%Y-%M-%D') AS expiry_date,
-				products.cost_factor AS cost_factor,
-				products.commissionrate AS commissionrate,
-				products.commissionmethod AS commissionmethod,
-				products.discontinued AS discontinued,
-				products.sales_start_date AS sales_start_date,
-				products.sales_end_date AS sales_end_date,
-				products.usageunit AS usageunit,
-				products.serialno AS serialno,
-				products.currency AS currency,
-				products.reorderlevel AS reorderlevel,
-				products.website AS website,
-				products.taxclass AS taxclass,
-				products.mfr_part_no AS mfr_part_no,
-				products.vendor_part_no AS vendor_part_no,
-				products.qtyinstock AS qtyinstock,
-				products.productsheet AS productsheet,
-				products.qtyindemand AS qtyindemand
+			vtiger_products.productid AS productid,
+			vtiger_products.productname AS productname,
+			vtiger_products.productcode AS productcode,
+			vtiger_products.productcategory AS vtiger_productcategory,
+			vtiger_products.manufacturer AS vtiger_manufacturer,
+			vtiger_products.product_description AS product_description,
+			vtiger_products.qty_per_unit AS qty_per_unit,
+			vtiger_products.unit_price AS unit_price,
+			vtiger_products.weight AS weight,
+			vtiger_products.pack_size AS pack_size,
+				DATE_FORMAT(vtiger_products.start_date, '%Y-%M-%D') AS start_date,
+				DATE_FORMAT(vtiger_products.expiry_date, '%Y-%M-%D') AS expiry_date,
+			vtiger_products.cost_factor AS cost_factor,
+			vtiger_products.commissionrate AS commissionrate,
+			vtiger_products.commissionmethod AS commissionmethod,
+			vtiger_products.discontinued AS discontinued,
+			vtiger_products.sales_start_date AS sales_start_date,
+			vtiger_products.sales_end_date AS sales_end_date,
+			vtiger_products.usageunit AS vtiger_usageunit,
+			vtiger_products.serialno AS serialno,
+			vtiger_products.currency AS vtiger_currency,
+			vtiger_products.reorderlevel AS reorderlevel,
+			vtiger_products.website AS website,
+			vtiger_products.taxclass AS vtiger_taxclass,
+			vtiger_products.mfr_part_no AS mfr_part_no,
+			vtiger_products.vendor_part_no AS vtiger_vendor_part_no,
+			vtiger_products.qtyinstock AS qtyinstock,
+			vtiger_products.productsheet AS vtiger_productsheet,
+			vtiger_products.qtyindemand AS qtyindemand
 			FROM ".$this->entity_table."
-			INNER JOIN products
-				ON crmentity.crmid = products.productid
-			INNER JOIN users
-				ON users.id = crmentity.smownerid 
-			LEFT JOIN productcf
-				ON productcf.productid = products.productid";
+			INNER JOIN vtiger_products
+				ON vtiger_crmentity.crmid = vtiger_products.productid
+			INNER JOIN vtiger_users
+				ON vtiger_users.id = vtiger_crmentity.smownerid 
+			LEFT JOIN vtiger_productcf
+				ON vtiger_productcf.productid = vtiger_products.productid";
 
 		}
 		else
 		{
-			$query = "SELECT products.productid AS productid,
-				products.productname AS productname,
-				products.productcode AS productcode,
-				products.productcategory AS productcategory,
-				products.manufacturer AS manufacturer,
-				products.product_description AS product_description,
-				products.qty_per_unit AS qty_per_unit,
-				products.unit_price AS unit_price,
-				products.weight AS weight,
-				products.pack_size AS pack_size,
-				DATE_FORMAT(products.start_date, '%Y-%M-%D') AS start_date,
-				DATE_FORMAT(products.expiry_date, '%Y-%M-%D') AS expiry_date,
-				products.cost_factor AS cost_factor,
-				products.commissionrate AS commissionrate,
-				products.commissionmethod AS commissionmethod,
-				products.discontinued AS discontinued,
-				products.sales_start_date AS sales_start_date,
-				products.sales_end_date AS sales_end_date,
-				products.usageunit AS usageunit,
-				products.serialno AS serialno,
-				products.currency AS currency,
-				products.reorderlevel AS reorderlevel,
-				products.website AS website,
-				products.taxclass AS taxclass,
-				products.mfr_part_no AS mfr_part_no,
-				products.vendor_part_no AS vendor_part_no,
-				products.qtyinstock AS qtyinstock,
-				products.productsheet AS productsheet,
-				products.qtyindemand AS qtyindemand
+			$query = "SELECT vtiger_products.productid AS productid,
+			vtiger_products.productname AS productname,
+			vtiger_products.productcode AS productcode,
+			vtiger_products.productcategory AS vtiger_productcategory,
+			vtiger_products.manufacturer AS vtiger_manufacturer,
+			vtiger_products.product_description AS product_description,
+			vtiger_products.qty_per_unit AS qty_per_unit,
+			vtiger_products.unit_price AS unit_price,
+			vtiger_products.weight AS weight,
+			vtiger_products.pack_size AS pack_size,
+				DATE_FORMAT(vtiger_products.start_date, '%Y-%M-%D') AS start_date,
+				DATE_FORMAT(vtiger_products.expiry_date, '%Y-%M-%D') AS expiry_date,
+			vtiger_products.cost_factor AS cost_factor,
+			vtiger_products.commissionrate AS commissionrate,
+			vtiger_products.commissionmethod AS commissionmethod,
+			vtiger_products.discontinued AS discontinued,
+			vtiger_products.sales_start_date AS sales_start_date,
+			vtiger_products.sales_end_date AS sales_end_date,
+			vtiger_products.usageunit AS vtiger_usageunit,
+			vtiger_products.serialno AS serialno,
+			vtiger_products.currency AS vtiger_currency,
+			vtiger_products.reorderlevel AS reorderlevel,
+			vtiger_products.website AS website,
+			vtiger_products.taxclass AS vtiger_taxclass,
+			vtiger_products.mfr_part_no AS mfr_part_no,
+			vtiger_products.vendor_part_no AS vtiger_vendor_part_no,
+			vtiger_products.qtyinstock AS qtyinstock,
+			vtiger_products.productsheet AS vtiger_productsheet,
+			vtiger_products.qtyindemand AS qtyindemand
 			FROM ".$this->table_name ."
-			INNER JOIN crmentity
-				ON crmentity.crmid = products.productid 
-			INNER JOIN users
-				ON users.id=crmentity.smownerid ";
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_products.productid 
+			INNER JOIN vtiger_users
+				ON vtiger_users.id=vtiger_crmentity.smownerid ";
 
 		}
 	
-		  $where_auto = " users.status = 'Active'
-                        AND crmentity.deleted = 0 ";
+		  $where_auto = " vtiger_users.status = 'Active'
+                        AND vtiger_crmentity.deleted = 0 ";
 
 
 

Modified: vtigercrm/trunk/modules/Products/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Products/Save.php (original)
+++ vtigercrm/trunk/modules/Products/Save.php Mon Jun 12 14:26:25 2006
@@ -171,7 +171,7 @@
 	{
 		if(isset($_REQUEST[$fieldname]))
 		{
-			 $log->debug("Assigning the previous values given for the product to respective fields ");
+			 $log->debug("Assigning the previous values given for the product to respective vtiger_fields ");
 			$field_values_passed.="&";
 			$value = $_REQUEST[$fieldname];
 			$focus->column_fields[$fieldname] = $value;
@@ -201,7 +201,7 @@
 {
 	$image_lists_db=implode("###",$image_lists);
 	$focus->column_fields['imagename']=$image_lists_db;
-	$log->debug("Assign the Image name to the field name ");
+	$log->debug("Assign the Image name to the vtiger_field name ");
 }
 //Saving the product
 if($image_error=="false")

Modified: vtigercrm/trunk/modules/Products/UpdateListPrice.php
==============================================================================
--- vtigercrm/trunk/modules/Products/UpdateListPrice.php (original)
+++ vtigercrm/trunk/modules/Products/UpdateListPrice.php Mon Jun 12 14:26:25 2006
@@ -15,7 +15,7 @@
 $product_id = $_REQUEST['product_id'];
 $listprice = $_REQUEST['list_price'];
 $return_action = $_REQUEST['return_action'];
-$query = "update pricebookproductrel set listprice=".$listprice." where pricebookid=".$pricebook_id." and productid=".$product_id;
+$query = "update vtiger_pricebookproductrel set listprice=".$listprice." where vtiger_pricebookid=".$pricebook_id." and productid=".$product_id;
 //echo $query;
 $adb->query($query); 
 

Modified: vtigercrm/trunk/modules/Products/addPbProductRelToDB.php
==============================================================================
--- vtigercrm/trunk/modules/Products/addPbProductRelToDB.php (original)
+++ vtigercrm/trunk/modules/Products/addPbProductRelToDB.php Mon Jun 12 14:26:25 2006
@@ -27,9 +27,9 @@
 		if($id != '') {
 			$lp_name = $id.'_listprice';
 			$list_price = $_REQUEST[$lp_name];
-			//Updating the pricebook product rel table
-			 $log->info("Products :: Inserting products to price book");
-			$query= "insert into pricebookproductrel (pricebookid,productid,listprice) values(".$pricebook_id.",".$id.",".$list_price.")";
+			//Updating the vtiger_pricebook product rel vtiger_table
+			 $log->info("Products :: Inserting vtiger_products to price book");
+			$query= "insert into vtiger_pricebookproductrel (pricebookid,productid,listprice) values(".$pricebook_id.",".$id.",".$list_price.")";
 			$adb->query($query);
 		}
 	}
@@ -44,9 +44,9 @@
 		if($id != '') {
 			$lp_name = $id.'_listprice';
 			$list_price = $_REQUEST[$lp_name];
-			//Updating the pricebook product rel table
+			//Updating the vtiger_pricebook product rel vtiger_table
 			 $log->info("Products :: Inserting PriceBooks to Product");
-			$query= "insert into pricebookproductrel (pricebookid,productid,listprice) values(".$id.",".$productid.",".$list_price.")";
+			$query= "insert into vtiger_pricebookproductrel (pricebookid,productid,listprice) values(".$id.",".$productid.",".$list_price.")";
 			$adb->query($query);
 		}
 	}

Modified: vtigercrm/trunk/modules/Products/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Products/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Products/language/en_us.lang.php Mon Jun 12 14:26:25 2006
@@ -85,7 +85,7 @@
 'LBL_NEW_ATTACHMENT'=>'New Attachment',
 'LBL_ATTACHMENT_TITLE'=>'Attachments',
 
-//Added fields after RC1 - Release
+//Added vtiger_fields after RC1 - Release
 'LBL_MANUFACTURER'=>'Manufacturer',
 'LBL_PRODUCTCATEGORY'=>'Product Category',
 'LBL_SUPPORT_START_DATE'=>'Support Start Date',
@@ -167,7 +167,7 @@
 'LBL_ADD_PRODUCTS_PRICEBOOK'=>'Add Products to PriceBook',
 
 //Added for 4.2 patch2 release
-'LBL_MAXIMUM_LIMIT_ERROR'=>'Sorry, the uploaded file exceeds the maximum filesize limit. Please try a file smaller than 800000 bytes',
+'LBL_MAXIMUM_LIMIT_ERROR'=>'Sorry, the uploaded file exceeds the maximum vtiger_filesize limit. Please try a file smaller than 800000 bytes',
 'LBL_UPLOAD_ERROR'=>'Problems in file upload. Please try again!',
 'LBL_IMAGE_ERROR'=>'The given file is not of type image(.gif/.jpg/.png)',
 'LBL_INVALID_IMAGE'=>'Invalid file OR File has no data',

Modified: vtigercrm/trunk/modules/Products/updateRelations.php
==============================================================================
--- vtigercrm/trunk/modules/Products/updateRelations.php (original)
+++ vtigercrm/trunk/modules/Products/updateRelations.php Mon Jun 12 14:26:25 2006
@@ -16,7 +16,7 @@
 {
 	if($_REQUEST['smodule']=='VENDOR')
 	{
-		$sql = "update products set vendor_id=".$_REQUEST['parid']." where productid=".$_REQUEST['entityid'];
+		$sql = "update vtiger_products set vtiger_vendor_id=".$_REQUEST['parid']." where productid=".$_REQUEST['entityid'];
 		$adb->query($sql);
 	}
 }
@@ -24,7 +24,7 @@
 {
 	if($_REQUEST['smodule']=='VENDOR')
 	{
-		$sql = "insert into vendorcontactrel values (".$_REQUEST['parid'].",".$_REQUEST['entityid'].")";
+		$sql = "insert into vtiger_vendorcontactrel values (".$_REQUEST['parid'].",".$_REQUEST['entityid'].")";
 		$adb->query($sql);
 	}
 }

Modified: vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php
==============================================================================
--- vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php (original)
+++ vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php Mon Jun 12 14:26:25 2006
@@ -15,7 +15,7 @@
 
 global $adb,$app_strings;
 
-$sql="select currency_symbol from currency_info";
+$sql="select vtiger_currency_symbol from vtiger_currency_info";
 $result = $adb->query($sql);
 $currency_symbol = $adb->query_result($result,0,'currency_symbol');
 
@@ -25,7 +25,7 @@
 $products_per_page="6";
 
 $id = $_REQUEST['record'];
-//retreiving the invoice info
+//retreiving the vtiger_invoice info
 $focus = new Order();
 $focus->retrieve_entity_info($_REQUEST['record'],"PurchaseOrder");
 $vendor_name = getVendorName($focus->column_fields[vendor_id]);
@@ -56,7 +56,7 @@
 $status = $focus->column_fields["postatus"];
 
 // Company information
-$add_query = "select * from organizationdetails";
+$add_query = "select * from vtiger_organizationdetails";
 $result = $adb->query($add_query);
 $num_rows = $adb->num_rows($result);
 
@@ -82,7 +82,7 @@
 $price_total = $currency_symbol.number_format(StripLastZero($focus->column_fields["hdnGrandTotal"]),2,'.',',');
 
 //getting the Product Data
-$query="select products.productname,products.unit_price,products.product_description,poproductrel.* from poproductrel inner join products on products.productid=poproductrel.productid where purchaseorderid=".$id;
+$query="select vtiger_products.productname,vtiger_products.unit_price,vtiger_products.product_description,vtiger_poproductrel.* from vtiger_poproductrel inner join vtiger_products on vtiger_products.productid=vtiger_poproductrel.productid where vtiger_purchaseorderid=".$id;
 
 global $result;
 $result = $adb->query($query);

Modified: vtigercrm/trunk/modules/PurchaseOrder/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/PurchaseOrder/EditView.php (original)
+++ vtigercrm/trunk/modules/PurchaseOrder/EditView.php Mon Jun 12 14:26:25 2006
@@ -55,7 +55,7 @@
         $associated_prod = getAssociatedProducts("Products",$focus,$focus->column_fields['product_id']);
 }
 
-// Get vendor address if vendorid is given
+// Get vtiger_vendor address if vtiger_vendorid is given
 if(isset($_REQUEST['vendor_id']) && $_REQUEST['vendor_id']!='' && $_REQUEST['record']==''){
 	require_once('modules/Vendors/Vendor.php');
 	$vend_focus = new Vendor();

Modified: vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php
==============================================================================
--- vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php (original)
+++ vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php Mon Jun 12 14:26:25 2006
@@ -28,25 +28,25 @@
 require_once('data/CRMEntity.php');
 require_once('include/utils/utils.php');
 
-// Account is used to store account information.
+// Account is used to store vtiger_account information.
 class Order extends CRMEntity {
 	var $log;
 	var $db;
 
 
-	// Stored fields
+	// Stored vtiger_fields
 	var $id;
 	var $mode;
 	
 		
 	var $table_name = "purchaseorder";
-	var $tab_name = Array('crmentity','purchaseorder','pobillads','poshipads','purchaseordercf');
-	var $tab_name_index = Array('crmentity'=>'crmid','purchaseorder'=>'purchaseorderid','pobillads'=>'pobilladdressid','poshipads'=>'poshipaddressid','purchaseordercf'=>'purchaseorderid');
+	var $tab_name = Array('vtiger_crmentity','vtiger_purchaseorder','vtiger_pobillads','vtiger_poshipads','vtiger_purchaseordercf');
+	var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_purchaseorder'=>'purchaseorderid','vtiger_pobillads'=>'pobilladdressid','vtiger_poshipads'=>'poshipaddressid','vtiger_purchaseordercf'=>'purchaseorderid');
 				
 	
-	var $entity_table = "crmentity";
-	
-	var $billadr_table = "pobillads";
+	var $entity_table = "vtiger_crmentity";
+	
+	var $billadr_table = "vtiger_pobillads";
 
 	var $object_name = "Order";
 
@@ -58,10 +58,10 @@
 
 	var $sortby_fields = Array('subject','tracking_no','smownerid');		
 
-	// This is used to retrieve related fields from form posts.
+	// This is used to retrieve related vtiger_fields from form posts.
 	var $additional_column_fields = Array('assigned_user_name', 'smownerid', 'opportunity_id', 'case_id', 'contact_id', 'task_id', 'note_id', 'meeting_id', 'call_id', 'email_id', 'parent_name', 'member_id' );
 
-	// This is the list of fields that are in the lists.
+	// This is the list of vtiger_fields that are in the lists.
 	var $list_fields = Array(
 				'Order Id'=>Array('crmentity'=>'crmid'),
 				'Subject'=>Array('purchaseorder'=>'subject'),
@@ -93,7 +93,7 @@
 				        'Subject'=>'subject',
 				      );
 
-	// This is the list of fields that are required.
+	// This is the list of vtiger_fields that are required.
 	var $required_fields =  array("accountname"=>1);
 
 	//Added these variables which are used as default order by and sortorder in ListView
@@ -126,7 +126,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')";
+		$query = "SELECT vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid,vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and (activitytype='Task' or vtiger_activitytype='Call' or vtiger_activitytype='Meeting') and vtiger_crmentity.deleted=0 and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Completed') and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Deferred') or (vtiger_activity.eventstatus != '' &&  vtiger_activity.eventstatus = 'Planned')";
 		$log->debug("Exiting get_activities method ...");
 		return GetRelatedList('PurchaseOrder','Activities',$focus,$query,$button,$returnset);
 	}
@@ -139,27 +139,27 @@
 	{
 		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
-			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
-				inner join users on crmentity.smcreatorid= users.id
-				left join activitygrouprelation on activitygrouprelation.activityid=activity.activityid
-                                left join groups on groups.groupname=activitygrouprelation.groupname
-			where (activity.activitytype = 'Meeting' or activity.activitytype='Call' or activity.activitytype='Task')
-				and (activity.status = 'Completed' or activity.status = 'Deferred' or (activity.eventstatus != 'Planned' and activity.eventstatus != '' ))
-				and seactivityrel.crmid=".$id;
+		$query = "SELECT vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid,
+			vtiger_activity.* ,vtiger_seactivityrel.*, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime,
+			vtiger_crmentity.createdtime, vtiger_crmentity.description, vtiger_users.user_name
+			from vtiger_activity
+				inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid
+				inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid
+				left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid
+				left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid
+				inner join vtiger_users on vtiger_crmentity.smcreatorid= vtiger_users.id
+				left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_activity.activityid
+                                left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname
+			where (vtiger_activity.activitytype = 'Meeting' or vtiger_activity.activitytype='Call' or vtiger_activity.activitytype='Task')
+				and (vtiger_activity.status = 'Completed' or vtiger_activity.status = 'Deferred' or (vtiger_activity.eventstatus != 'Planned' and vtiger_activity.eventstatus != '' ))
+				and vtiger_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);
 	}
 
-/** Function to get attachments associated with the id
+/** Function to get vtiger_attachments associated with the id
  *  This function accepts the id as arguments and execute the MySQL query using the id
  *  and sends the query and the id as arguments to renderRelatedAttachments() method.
 */
@@ -168,35 +168,35 @@
 		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
-		$query = "select notes.title, 'Notes      '  ActivityType, notes.filename,
-			attachments.type FileType, crm2.modifiedtime lastmodified,
-			seattachmentsrel.attachmentsid attachmentsid, notes.notesid crmid,
-			crm2.createdtime, notes.notecontent description, users.user_name
-		from notes
-			inner join senotesrel on senotesrel.notesid= notes.notesid
-			inner join crmentity on crmentity.crmid= senotesrel.crmid
-			inner join crmentity crm2 on crm2.crmid=notes.notesid and crm2.deleted=0
-			left join seattachmentsrel  on seattachmentsrel.crmid =notes.notesid
-			left join attachments on seattachmentsrel.attachmentsid = attachments.attachmentsid
-			inner join users on crm2.smcreatorid= users.id
-		where crmentity.crmid=".$id;
+		// Desc: Inserted crm2.createdtime, vtiger_notes.notecontent description, vtiger_users.user_name
+		// Inserted inner join vtiger_users on crm2.smcreatorid= vtiger_users.id
+		$query = "select vtiger_notes.title, 'Notes      '  ActivityType, vtiger_notes.filename,
+		vtiger_attachments.type FileType, crm2.modifiedtime lastmodified,
+		vtiger_seattachmentsrel.attachmentsid vtiger_attachmentsid, vtiger_notes.notesid crmid,
+			crm2.createdtime, vtiger_notes.notecontent description, vtiger_users.user_name
+		from vtiger_notes
+			inner join vtiger_senotesrel on vtiger_senotesrel.notesid= vtiger_notes.notesid
+			inner join vtiger_crmentity on vtiger_crmentity.crmid= vtiger_senotesrel.crmid
+			inner join vtiger_crmentity crm2 on crm2.crmid=vtiger_notes.notesid and crm2.deleted=0
+			left join vtiger_seattachmentsrel  on vtiger_seattachmentsrel.crmid =vtiger_notes.notesid
+			left join vtiger_attachments on vtiger_seattachmentsrel.attachmentsid = vtiger_attachments.attachmentsid
+			inner join vtiger_users on crm2.smcreatorid= vtiger_users.id
+		where vtiger_crmentity.crmid=".$id;
 		$query .= ' union all ';
 		// Armando L?scher 18.10.2005 -> ?visibleDescription
-		// Desc: Inserted crm2.createdtime, attachments.description, users.user_name
-		// Inserted inner join users on crm2.smcreatorid= users.id
+		// Desc: Inserted crm2.createdtime, vtiger_attachments.description, vtiger_users.user_name
+		// Inserted inner join vtiger_users on crm2.smcreatorid= vtiger_users.id
 		// Inserted order by createdtime desc
-		$query .= "select attachments.description  title ,'Attachments'  ActivityType,
-			attachments.name  filename, attachments.type  FileType, crm2.modifiedtime  lastmodified,
-			attachments.attachmentsid  attachmentsid, seattachmentsrel.attachmentsid crmid,
-			crm2.createdtime, attachments.description, users.user_name
-		from attachments
-			inner join seattachmentsrel on seattachmentsrel.attachmentsid= attachments.attachmentsid
-			inner join crmentity on crmentity.crmid= seattachmentsrel.crmid
-			inner join crmentity crm2 on crm2.crmid=attachments.attachmentsid
-			inner join users on crm2.smcreatorid= users.id
-		where crmentity.crmid=".$id."
+		$query .= "select vtiger_attachments.description  title ,'Attachments'  ActivityType,
+		vtiger_attachments.name  filename, vtiger_attachments.type  FileType, crm2.modifiedtime  lastmodified,
+		vtiger_attachments.attachmentsid  vtiger_attachmentsid, vtiger_seattachmentsrel.attachmentsid crmid,
+			crm2.createdtime, vtiger_attachments.description, vtiger_users.user_name
+		from vtiger_attachments
+			inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid= vtiger_attachments.attachmentsid
+			inner join vtiger_crmentity on vtiger_crmentity.crmid= vtiger_seattachmentsrel.crmid
+			inner join vtiger_crmentity crm2 on crm2.crmid=vtiger_attachments.attachmentsid
+			inner join vtiger_users on crm2.smcreatorid= vtiger_users.id
+		where vtiger_crmentity.crmid=".$id."
 		order by createdtime desc";
 		$log->debug("Exiting get_attachments method ...");
 		return getAttachmentsAndNotes('PurchaseOrder',$query,$id,$sid='purchaseorderid');

Modified: vtigercrm/trunk/modules/PurchaseOrder/Save.php
==============================================================================
--- vtigercrm/trunk/modules/PurchaseOrder/Save.php (original)
+++ vtigercrm/trunk/modules/PurchaseOrder/Save.php Mon Jun 12 14:26:25 2006
@@ -46,7 +46,7 @@
 $focus->save("PurchaseOrder");
 if($focus->mode == 'edit')
 {
-        $query1 = "delete from poproductrel where purchaseorderid=".$focus->id;
+        $query1 = "delete from vtiger_poproductrel where vtiger_purchaseorderid=".$focus->id;
         $adb->query($query1);
 
 }
@@ -74,7 +74,7 @@
         if($prod_status != 'D')
         {
 
-                $query ="insert into poproductrel values($focus->id, $prod_id, $qty, $listprice, $vat, $sales, $service)";
+                $query ="insert into vtiger_poproductrel values($focus->id, $prod_id, $qty, $listprice, $vat, $sales, $service)";
                 $adb->query($query);
 		if($update_prod_stock == 'true')
                 {

Modified: vtigercrm/trunk/modules/PurchaseOrder/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/PurchaseOrder/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/PurchaseOrder/language/en_us.lang.php Mon Jun 12 14:26:25 2006
@@ -80,10 +80,10 @@
 'NTC_COPY_SHIPPING_ADDRESS'=>'Copy shipping address to billing address',
 'NTC_REMOVE_MEMBER_ORG_CONFIRMATION'=>'Are you sure you want to remove this record as a member organization?',
 'LBL_DUPLICATE'=>'Potential Duplicate Accounts',
-'MSG_DUPLICATE' => 'Creating this account may potentialy create a duplicate account. You may either select an account from the list below or you may click on Create New Account to continue creating a new account with the previously entered data.',
+'MSG_DUPLICATE' => 'Creating this vtiger_account may vtiger_potentialy create a duplicate vtiger_account. You may either select an vtiger_account from the list below or you may click on Create New Account to continue creating a new vtiger_account with the previously entered data.',
 
 'LBL_INVITEE'=>'Contacts',
-'ERR_DELETE_RECORD'=>"A record number must be specified to delete the account.",
+'ERR_DELETE_RECORD'=>"A record number must be specified to delete the vtiger_account.",
 
 'LBL_SELECT_ACCOUNT'=>'Select Account',
 'LBL_GENERAL_INFORMATION'=>'General Information',
@@ -103,7 +103,7 @@
 'LBL_NEW_CONTACT'=>'New Contact',
 'LBL_CONTACT_TITLE'=>'Contacts',
 
-//Added fields after RC1 - Release
+//Added vtiger_fields after RC1 - Release
 'LBL_ALL'=>'All',
 'LBL_PROSPECT'=>'Prospect',
 'LBL_INVESTOR'=>'Investor',

Modified: vtigercrm/trunk/modules/PurchaseOrder/pdf_templates/header.php
==============================================================================
--- vtigercrm/trunk/modules/PurchaseOrder/pdf_templates/header.php (original)
+++ vtigercrm/trunk/modules/PurchaseOrder/pdf_templates/header.php Mon Jun 12 14:26:25 2006
@@ -67,7 +67,7 @@
 $dueBlock=array("80","65");
 $pdf->addRecBlock($valid_till, "Due Date",$dueBlock);
 
-// invoice number block
+// vtiger_invoice number block
 $invBlock=array("145","65");
 $pdf->addRecBlock($id, "Order Number",$invBlock);
 

Modified: vtigercrm/trunk/modules/Quotes/CreatePDF.php
==============================================================================
--- vtigercrm/trunk/modules/Quotes/CreatePDF.php (original)
+++ vtigercrm/trunk/modules/Quotes/CreatePDF.php Mon Jun 12 14:26:25 2006
@@ -16,7 +16,7 @@
 
 global $adb,$app_strings;
 
-$sql="select currency_symbol from currency_info";
+$sql="select vtiger_currency_symbol from vtiger_currency_info";
 $result = $adb->query($sql);
 $currency_symbol = $adb->query_result($result,0,'currency_symbol');
 
@@ -52,7 +52,7 @@
 $status = $focus->column_fields["quotestage"];
 
 // Company information
-$add_query = "select * from organizationdetails";
+$add_query = "select * from vtiger_organizationdetails";
 $result = $adb->query($add_query);
 $num_rows = $adb->num_rows($result);
 
@@ -78,7 +78,7 @@
 $price_total = $currency_symbol.number_format(StripLastZero($focus->column_fields["hdnGrandTotal"]),2,'.',',');
 
 //getting the Product Data
-$query="select products.productname,products.unit_price,products.product_description,quotesproductrel.* from quotesproductrel inner join products on products.productid=quotesproductrel.productid where quoteid=".$quote_id;
+$query="select vtiger_products.productname,vtiger_products.unit_price,vtiger_products.product_description,vtiger_quotesproductrel.* from vtiger_quotesproductrel inner join vtiger_products on vtiger_products.productid=vtiger_quotesproductrel.productid where quoteid=".$quote_id;
 
 global $result;
 $result = $adb->query($query);

Modified: vtigercrm/trunk/modules/Quotes/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/Quotes/EditView.php (original)
+++ vtigercrm/trunk/modules/Quotes/EditView.php Mon Jun 12 14:26:25 2006
@@ -67,7 +67,7 @@
         $associated_prod = getAssociatedProducts("Products",$focus,$focus->column_fields['product_id']);
 }
 
-// Get Account address if account is given
+// Get Account address if vtiger_account is given
 if(isset($_REQUEST['account_id']) && $_REQUEST['account_id']!='' && $_REQUEST['record']==''){
 	require_once('modules/Accounts/Account.php');
 	$acct_focus = new Account();

Modified: vtigercrm/trunk/modules/Quotes/ListTopQuotes.php
==============================================================================
--- vtigercrm/trunk/modules/Quotes/ListTopQuotes.php (original)
+++ vtigercrm/trunk/modules/Quotes/ListTopQuotes.php Mon Jun 12 14:26:25 2006
@@ -56,7 +56,7 @@
 	//<<<<<<<<<customview>>>>>>>>>
 	$date_var = date('Y-m-d');
 
-	$where = ' and crmentity.smownerid='.$current_user->id.' and  quotes.validtill >= \''.$date_var.'\' ORDER BY total DESC';
+	$where = ' and vtiger_crmentity.smownerid='.$current_user->id.' and  vtiger_quotes.validtill >= \''.$date_var.'\' ORDER BY total DESC';
 	$query = getListQuery("Quotes",$where);
 
 	//<<<<<<<<customview>>>>>>>>>

Modified: vtigercrm/trunk/modules/Quotes/Quote.php
==============================================================================
--- vtigercrm/trunk/modules/Quotes/Quote.php (original)
+++ vtigercrm/trunk/modules/Quotes/Quote.php Mon Jun 12 14:26:25 2006
@@ -28,20 +28,20 @@
 require_once('data/CRMEntity.php');
 require_once('include/utils/utils.php');
 require_once('include/RelatedListView.php');
-// Account is used to store account information.
+// Account is used to store vtiger_account information.
 class Quote extends CRMEntity {
 	var $log;
 	var $db;
 
 
-	// Stored fields
+	// Stored vtiger_fields
 	var $id;
 	var $mode;
 	
 		
 	var $table_name = "quotes";
-	var $tab_name = Array('crmentity','quotes','quotesbillads','quotesshipads','quotescf');
-	var $tab_name_index = Array('crmentity'=>'crmid','quotes'=>'quoteid','quotesbillads'=>'quotebilladdressid','quotesshipads'=>'quoteshipaddressid','quotescf'=>'quoteid');
+	var $tab_name = Array('vtiger_crmentity','vtiger_quotes','vtiger_quotesbillads','vtiger_quotesshipads','vtiger_quotescf');
+	var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_quotes'=>'quoteid','vtiger_quotesbillads'=>'quotebilladdressid','vtiger_quotesshipads'=>'quoteshipaddressid','vtiger_quotescf'=>'quoteid');
 				
 	
 	var $entity_table = "crmentity";
@@ -58,10 +58,10 @@
 
 	var $sortby_fields = Array('subject','crmid','smownerid');		
 
-	// This is used to retrieve related fields from form posts.
+	// This is used to retrieve related vtiger_fields from form posts.
 	var $additional_column_fields = Array('assigned_user_name', 'smownerid', 'opportunity_id', 'case_id', 'contact_id', 'task_id', 'note_id', 'meeting_id', 'call_id', 'email_id', 'parent_name', 'member_id' );
 
-	// This is the list of fields that are in the lists.
+	// This is the list of vtiger_fields that are in the lists.
 	var $list_fields = Array(
 				'Quote Id'=>Array('crmentity'=>'crmid'),
 				'Subject'=>Array('quotes'=>'subject'),
@@ -101,7 +101,7 @@
 				        'Quote Stage'=>'quotestage',
 				      );
 
-	// This is the list of fields that are required.
+	// This is the list of vtiger_fields that are required.
 	var $required_fields =  array("accountname"=>1);
 
 	//Added these variables which are used as default order by and sortorder in ListView
@@ -125,7 +125,7 @@
 
 		$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;
+		$query = "select vtiger_crmentity.*, vtiger_salesorder.*, vtiger_quotes.subject as quotename, vtiger_account.accountname from vtiger_salesorder inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_salesorder.salesorderid left outer join vtiger_quotes on vtiger_quotes.quoteid=vtiger_salesorder.quoteid left outer join vtiger_account on vtiger_account.accountid=vtiger_salesorder.accountid left join vtiger_sogrouprelation on vtiger_salesorder.salesorderid=vtiger_sogrouprelation.salesorderid left join vtiger_groups on vtiger_groups.groupname=vtiger_sogrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_salesorder.quoteid = ".$id;
 		$log->debug("Exiting get_salesorder method ...");
 		return GetRelatedList('Quotes','SalesOrder',$focus,$query,$button,$returnset);
 	}
@@ -142,7 +142,7 @@
 
 		$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')";
+		$query = "SELECT vtiger_contactdetails.contactid, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name,vtiger_recurringevents.recurringtype from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and (activitytype='Task' or vtiger_activitytype='Call' or vtiger_activitytype='Meeting') and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Completed') and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Deferred') or (vtiger_activity.eventstatus !='' && vtiger_activity.eventstatus = 'Planned')";
 		$log->debug("Exiting get_activities method ...");
 		return GetRelatedList('Quotes','Activities',$focus,$query,$button,$returnset);
 	}
@@ -150,21 +150,21 @@
 	{
 		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,
-				crmentity.createdtime, crmentity.description, 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
-				inner join users on crmentity.smcreatorid= users.id
-				left join activitygrouprelation on activitygrouprelation.activityid=activity.activityid
-                                left join groups on groups.groupname=activitygrouprelation.groupname
-			where (activity.activitytype = 'Meeting' or activity.activitytype='Call' or activity.activitytype='Task')
-  				and (activity.status = 'Completed' or activity.status = 'Deferred' or (activity.eventstatus !='Planned' and activity.eventstatus != ''))
-	 	        	and seactivityrel.crmid=".$id;
+		$query = "SELECT vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.status,
+			vtiger_activity.eventstatus, vtiger_activity.activitytype, vtiger_contactdetails.contactid,
+			vtiger_contactdetails.firstname,vtiger_contactdetails.lastname, vtiger_crmentity.modifiedtime,
+			vtiger_crmentity.createdtime, vtiger_crmentity.description, vtiger_users.user_name
+			from vtiger_activity
+				inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid
+				inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid
+				left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid
+				left join vtiger_contactdetails on vtiger_contactdetails.contactid= vtiger_cntactivityrel.contactid
+				inner join vtiger_users on vtiger_crmentity.smcreatorid= vtiger_users.id
+				left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_activity.activityid
+                                left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname
+			where (vtiger_activity.activitytype = 'Meeting' or vtiger_activity.activitytype='Call' or vtiger_activity.activitytype='Task')
+  				and (vtiger_activity.status = 'Completed' or vtiger_activity.status = 'Deferred' or (vtiger_activity.eventstatus !='Planned' and vtiger_activity.eventstatus != ''))
+	 	        	and vtiger_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 ...");

Modified: vtigercrm/trunk/modules/Quotes/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Quotes/Save.php (original)
+++ vtigercrm/trunk/modules/Quotes/Save.php Mon Jun 12 14:26:25 2006
@@ -42,7 +42,7 @@
 $ext_prod_arr = Array();
 if($focus->mode == 'edit')
 {	
-	$query2  = "select * from quotesproductrel where quoteid=".$focus->id;
+	$query2  = "select * from vtiger_quotesproductrel where quoteid=".$focus->id;
 	$result2 = $adb->query($query2);
 	$num_rows = $adb->num_rows($result2);
 	for($i=0; $i<$num_rows;$i++)
@@ -52,8 +52,8 @@
 		$ext_prod_arr[$pro_id] = $pro_qty;	
 	}
 	
-	 $log->debug("Deleting from quotesproductrel table ");
-	$query1 = "delete from quotesproductrel where quoteid=".$focus->id;
+	 $log->debug("Deleting from vtiger_quotesproductrel vtiger_table ");
+	$query1 = "delete from vtiger_quotesproductrel where quoteid=".$focus->id;
 	$adb->query($query1);
 
 }
@@ -82,7 +82,7 @@
 	if($prod_status != 'D')
 	{
 		
-		$query ="insert into quotesproductrel values($focus->id, $prod_id, $qty, $listprice, $vat, $sales, $service)";
+		$query ="insert into vtiger_quotesproductrel values($focus->id, $prod_id, $qty, $listprice, $vat, $sales, $service)";
 		$adb->query($query);
 		//Checking the re-order level and sending mail	
 		updateStk($prod_id,$qty,$focus->mode,$ext_prod_arr,'Quotes');

Modified: vtigercrm/trunk/modules/Quotes/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Quotes/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Quotes/language/en_us.lang.php Mon Jun 12 14:26:25 2006
@@ -79,10 +79,10 @@
 'NTC_COPY_SHIPPING_ADDRESS'=>'Copy shipping address to billing address',
 'NTC_REMOVE_MEMBER_ORG_CONFIRMATION'=>'Are you sure you want to remove this record as a member organization?',
 'LBL_DUPLICATE'=>'Potential Duplicate Accounts',
-'MSG_DUPLICATE' => 'Creating this account may potentialy create a duplicate account. You may either select an account from the list below or you may click on Create New Account to continue creating a new account with the previously entered data.',
+'MSG_DUPLICATE' => 'Creating this vtiger_account may vtiger_potentialy create a duplicate vtiger_account. You may either select an vtiger_account from the list below or you may click on Create New Account to continue creating a new vtiger_account with the previously entered data.',
 
 'LBL_INVITEE'=>'Contacts',
-'ERR_DELETE_RECORD'=>"A record number must be specified to delete the account.",
+'ERR_DELETE_RECORD'=>"A record number must be specified to delete the vtiger_account.",
 
 'LBL_SELECT_ACCOUNT'=>'Select Account',
 'LBL_GENERAL_INFORMATION'=>'General Information',
@@ -102,7 +102,7 @@
 'LBL_NEW_CONTACT'=>'New Contact',
 'LBL_CONTACT_TITLE'=>'Contacts',
 
-//Added fields after RC1 - Release
+//Added vtiger_fields after RC1 - Release
 'LBL_ALL'=>'All',
 'LBL_PROSPECT'=>'Prospect',
 'LBL_INVESTOR'=>'Investor',

Modified: vtigercrm/trunk/modules/Quotes/pdf_templates/header.php
==============================================================================
--- vtigercrm/trunk/modules/Quotes/pdf_templates/header.php (original)
+++ vtigercrm/trunk/modules/Quotes/pdf_templates/header.php Mon Jun 12 14:26:25 2006
@@ -62,7 +62,7 @@
 $dueBlock=array("80","65");
 $pdf->addRecBlock($valid_till, "Valid Till",$dueBlock);
 
-// invoice number block
+// vtiger_invoice number block
 $invBlock=array("147","65");
 $pdf->addRecBlock($quote_id, "Quote Number",$invBlock);
 

Modified: vtigercrm/trunk/modules/Reports/ChangeFolder.php
==============================================================================
--- vtigercrm/trunk/modules/Reports/ChangeFolder.php (original)
+++ vtigercrm/trunk/modules/Reports/ChangeFolder.php Mon Jun 12 14:26:25 2006
@@ -32,7 +32,7 @@
 function ChangeFolder($reportid,$folderid)
 {
 	global $adb;
-	$imovereportsql = "update report set folderid=".$folderid." where reportid=".$reportid;
+	$imovereportsql = "update vtiger_report set folderid=".$folderid." where vtiger_reportid=".$reportid;
 	$imovereportsqlresult = $adb->query($imovereportsql);
 }
 ?>

Modified: vtigercrm/trunk/modules/Reports/Delete.php
==============================================================================
--- vtigercrm/trunk/modules/Reports/Delete.php (original)
+++ vtigercrm/trunk/modules/Reports/Delete.php Mon Jun 12 14:26:25 2006
@@ -31,10 +31,10 @@
 function DeleteReport($reportid)
 {
 	global $adb;
-	$idelreportsql = "delete from selectquery where queryid=".$reportid;
+	$idelreportsql = "delete from vtiger_selectquery where queryid=".$reportid;
 	$idelreportsqlresult = $adb->query($idelreportsql);
 
-	$ireportsql = "delete from report where reportid=".$reportid;
+	$ireportsql = "delete from vtiger_report where vtiger_reportid=".$reportid;
     $ireportsqlresult = $adb->query($ireportsql);
 }
 ?>

Modified: vtigercrm/trunk/modules/Reports/DeleteReportFolder.php
==============================================================================
--- vtigercrm/trunk/modules/Reports/DeleteReportFolder.php (original)
+++ vtigercrm/trunk/modules/Reports/DeleteReportFolder.php Mon Jun 12 14:26:25 2006
@@ -17,7 +17,7 @@
 $rfid = $_REQUEST['record'];
 if($rfid != "")
 {
-	$sql .= "delete from reportfolder where folderid=".$rfid;
+	$sql .= "delete from vtiger_reportfolder where folderid=".$rfid;
 	$result = $adb->query($sql);
 	if($result!=false)
 	{

Modified: vtigercrm/trunk/modules/Reports/PopulateReports.php
==============================================================================
--- vtigercrm/trunk/modules/Reports/PopulateReports.php (original)
+++ vtigercrm/trunk/modules/Reports/PopulateReports.php Mon Jun 12 14:26:25 2006
@@ -274,7 +274,7 @@
 
 		 Array('reportname'=>'Quotes Detailed Report',
                        'reportfolder'=>'Quote Reports',
-                       'description'=>'Quotes detailed report',
+                       'description'=>'Quotes detailed vtiger_report',
                        'reporttype'=>'tabular',
                        'sortid'=>'','stdfilterid'=>'','advfilterid'=>''),
 
@@ -286,13 +286,13 @@
 
 		 Array('reportname'=>'PurchaseOrder Detailed Report',
                        'reportfolder'=>'PurchaseOrder Reports',
-                       'description'=>'PurchaseOrder detailed report',
+                       'description'=>'PurchaseOrder detailed vtiger_report',
                        'reporttype'=>'tabular',
                        'sortid'=>'','stdfilterid'=>'','advfilterid'=>''),
 
 		 Array('reportname'=>'Invoice Detailed Report',
                        'reportfolder'=>'Invoice Reports',
-                       'description'=>'Invoice detailed report',
+                       'description'=>'Invoice detailed vtiger_report',
                        'reporttype'=>'tabular',
                        'sortid'=>'','stdfilterid'=>'','advfilterid'=>'')
 
@@ -416,13 +416,13 @@
 function PopulateReportFolder($fldrname,$fldrdescription)
 {
 	global $adb;
-	$sql = "INSERT INTO reportfolder ";
+	$sql = "INSERT INTO vtiger_reportfolder ";
 	$sql .= "(FOLDERNAME,DESCRIPTION,STATE) ";
 	$sql .= "VALUES ('".$fldrname."','".$fldrdescription."','SAVED')";
 	$result = $adb->query($sql);
 }
 
-/** Function to add an entry in selestquery table 
+/** Function to add an entry in selestquery vtiger_table 
  *
  */
 
@@ -432,14 +432,14 @@
 	$genQueryId = $adb->getUniqueID("selectquery");
         if($genQueryId != "")
         {
-		$iquerysql = "insert into selectquery (QUERYID,STARTINDEX,NUMOFOBJECTS) values (".$genQueryId.",0,0)";
+		$iquerysql = "insert into vtiger_selectquery (QUERYID,STARTINDEX,NUMOFOBJECTS) values (".$genQueryId.",0,0)";
 		$iquerysqlresult = $adb->query($iquerysql);
 	}
 
 	return $genQueryId;
 }
 
-/** Function to store the field names selected for a report to a database
+/** Function to store the vtiger_field names selected for a vtiger_report to a database
  *  
  *  
  */
@@ -451,16 +451,16 @@
 	{
 		for($i=0;$i < count($columnname);$i++)
 		{
-			$icolumnsql = "insert into selectcolumn (QUERYID,COLUMNINDEX,COLUMNNAME) values (".$queryid.",".$i.",'".$columnname[$i]."')";
+			$icolumnsql = "insert into vtiger_selectcolumn (QUERYID,COLUMNINDEX,COLUMNNAME) values (".$queryid.",".$i.",'".$columnname[$i]."')";
 			$icolumnsqlresult = $adb->query($icolumnsql);	
 		}
 	}
 }
 
 
-/** Function to store the report details to database
+/** Function to store the vtiger_report details to database
  *  This function accepts queryid,folderid,reportname,description,reporttype
- *  as arguments and store the informations in report table
+ *  as arguments and store the informations in vtiger_report vtiger_table
  */
 
 function insertReports($queryid,$folderid,$reportname,$description,$reporttype)
@@ -468,15 +468,15 @@
 	global $adb;
 	if($queryid != "")
 	{
-		$ireportsql = "insert into report (REPORTID,FOLDERID,REPORTNAME,DESCRIPTION,REPORTTYPE,QUERYID,STATE)";
+		$ireportsql = "insert into vtiger_report (REPORTID,FOLDERID,REPORTNAME,DESCRIPTION,REPORTTYPE,QUERYID,STATE)";
                 $ireportsql .= " values (".$queryid.",".$folderid.",'".$reportname."','".$description."','".$reporttype."',".$queryid.",'SAVED')";
 		$ireportresult = $adb->query($ireportsql);
 	}
 }
 
-/** Function to store the report modules to database
+/** Function to store the vtiger_report modules to database
  *  This function accepts queryid,primary module and secondary module
- *  as arguments and store the informations in reportmodules table
+ *  as arguments and store the informations in vtiger_reportmodules vtiger_table
  */
 
 
@@ -485,16 +485,16 @@
 	global $adb;
 	if($queryid != "")
 	{
-		$ireportmodulesql = "insert into reportmodules (REPORTMODULESID,PRIMARYMODULE,SECONDARYMODULES) values (".$queryid.",'".$primarymodule."','".$secondarymodule."')";
+		$ireportmodulesql = "insert into vtiger_reportmodules (REPORTMODULESID,PRIMARYMODULE,SECONDARYMODULES) values (".$queryid.",'".$primarymodule."','".$secondarymodule."')";
 		$ireportmoduleresult = $adb->query($ireportmodulesql);
 	}
 }
 
 
-/** Function to store the report sortorder to database
+/** Function to store the vtiger_report sortorder to database
  *  This function accepts queryid,sortlists
  *  as arguments and store the informations sort columns and
- *  and sortorder in reportsortcol table
+ *  and sortorder in vtiger_reportsortcol vtiger_table
  */
 
 
@@ -505,7 +505,7 @@
 	{
 		foreach($sortlists as $i=>$sort)
                 {
-			$sort_bysql = "insert into reportsortcol (SORTCOLID,REPORTID,COLUMNNAME,SORTORDER) 
+			$sort_bysql = "insert into vtiger_reportsortcol (SORTCOLID,REPORTID,COLUMNNAME,SORTORDER) 
 					values (".($i+1).",".$queryid.",'".$sort['columnname']."','".$sort['sortorder']."')";
 			$sort_byresult = $adb->query($sort_bysql);
 		}
@@ -514,9 +514,9 @@
 }
 
 
-/** Function to store the report sort date details to database
+/** Function to store the vtiger_report sort date details to database
  *  This function accepts queryid,filtercolumn,datefilter,startdate,enddate
- *  as arguments and store the informations in reportdatefilter table
+ *  as arguments and store the informations in vtiger_reportdatefilter vtiger_table
  */
 
 
@@ -525,15 +525,15 @@
 	global $adb;
 	if($queryid != "")
 	{
-		$ireportmodulesql = "insert into reportdatefilter (DATEFILTERID,DATECOLUMNNAME,DATEFILTER,STARTDATE,ENDDATE) values (".$queryid.",'".$filtercolumn."','".$datefilter."','".$startdate."','".$enddate."')";
+		$ireportmodulesql = "insert into vtiger_reportdatefilter (DATEFILTERID,DATECOLUMNNAME,DATEFILTER,STARTDATE,ENDDATE) values (".$queryid.",'".$filtercolumn."','".$datefilter."','".$startdate."','".$enddate."')";
 		$ireportmoduleresult = $adb->query($ireportmodulesql);
 	}
 
 }
 
-/** Function to store the report conditions to database
+/** Function to store the vtiger_report conditions to database
  *  This function accepts queryid,filters
- *  as arguments and store the informations in relcriteria table
+ *  as arguments and store the informations in vtiger_relcriteria vtiger_table
  */
 
 
@@ -544,7 +544,7 @@
 	{
 		foreach($filters as $i=>$filter)
 		{
-		      $irelcriteriasql = "insert into relcriteria(QUERYID,COLUMNINDEX,COLUMNNAME,COMPARATOR,VALUE) 
+		      $irelcriteriasql = "insert into vtiger_relcriteria(QUERYID,COLUMNINDEX,COLUMNNAME,COMPARATOR,VALUE) 
 		      values (".$queryid.",".$i.",'".$filter['columnname']."','".$filter['comparator']."','".$filter['value']."')";
 		      $irelcriteriaresult = $adb->query($irelcriteriasql);
 		}

Modified: vtigercrm/trunk/modules/Reports/ReportColumns.php
==============================================================================
--- vtigercrm/trunk/modules/Reports/ReportColumns.php (original)
+++ vtigercrm/trunk/modules/Reports/ReportColumns.php Mon Jun 12 14:26:25 2006
@@ -52,9 +52,9 @@
 	
 }
 
-/** Function to formulate the fields for the primary modules 
+/** Function to formulate the vtiger_fields for the primary modules 
  *  This function accepts the module name 
- *  as arguments and generates the fields for the primary module as
+ *  as arguments and generates the vtiger_fields for the primary module as
  *  a HTML Combo values
  */
 
@@ -85,9 +85,9 @@
 	return $shtml;
 }
 
-/** Function to formulate the fields for the secondary modules
+/** Function to formulate the vtiger_fields for the secondary modules
  *  This function accepts the module name
- *  as arguments and generates the fields for the secondary module as
+ *  as arguments and generates the vtiger_fields for the secondary module as
  *  a HTML Combo values
  */
 

Modified: vtigercrm/trunk/modules/Reports/ReportRun.php
==============================================================================
--- vtigercrm/trunk/modules/Reports/ReportRun.php (original)
+++ vtigercrm/trunk/modules/Reports/ReportRun.php Mon Jun 12 14:26:25 2006
@@ -50,10 +50,10 @@
 		global $modules;
 		global $log;
 
-		$ssql = "select selectcolumn.* from report inner join selectquery on selectquery.queryid = report.queryid";
-                $ssql .= " left join selectcolumn on selectcolumn.queryid = selectquery.queryid";
-		$ssql .= " where report.reportid =".$reportid;
-                $ssql .= " order by selectcolumn.columnindex";
+		$ssql = "select vtiger_selectcolumn.* from vtiger_report inner join vtiger_selectquery on vtiger_selectquery.queryid = vtiger_report.queryid";
+                $ssql .= " left join vtiger_selectcolumn on vtiger_selectcolumn.queryid = vtiger_selectquery.queryid";
+		$ssql .= " where vtiger_report.reportid =".$reportid;
+                $ssql .= " order by vtiger_selectcolumn.columnindex";
 
                 $result = $adb->query($ssql);
 
@@ -82,15 +82,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 vtiger_crmentityRelHelpDesk.setype when 'Accounts' then vtiger_accountRelHelpDesk.accountname when 'Contacts' then vtiger_contactdetailsRelHelpDesk.lastname End"." '".$selectedfields[2]."', vtiger_crmentityRelHelpDesk.setype '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 vtiger_crmentityRelProducts.setype when 'Accounts' then vtiger_accountRelProducts.accountname when 'Leads' then vtiger_leaddetailsRelProducts.lastname when 'Potentials' then vtiger_potentialRelProducts.potentialname End"." '".$selectedfields[2]."', vtiger_crmentityRelProducts.setype '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 'PurchaseOrder' then purchaseorderRelActivities.subject when 'Invoice' then invoiceRelActivities.subject End"." '".$selectedfields[2]."', crmentityRelActivities.setype 'Entity_type'";
+				$querycolumn = "case vtiger_crmentityRelActivities.setype when 'Accounts' then vtiger_accountRelActivities.accountname when 'Leads' then vtiger_leaddetailsRelActivities.lastname when 'Potentials' then vtiger_potentialRelActivities.potentialname when 'Quotes' then vtiger_quotesRelActivities.subject when 'PurchaseOrder' then vtiger_purchaseorderRelActivities.subject when 'Invoice' then vtiger_invoiceRelActivities.subject End"." '".$selectedfields[2]."', vtiger_crmentityRelActivities.setype 'Entity_type'";
 			}
 		}
 		return $querycolumn;
@@ -103,9 +103,9 @@
 		global $modules;
 		global $log;
 		
-		$ssql = "select selectcolumn.* from report inner join selectquery on selectquery.queryid = report.queryid"; 
-		$ssql .= " left join selectcolumn on selectcolumn.queryid = selectquery.queryid where report.reportid =".$reportid; 
-		$ssql .= " order by selectcolumn.columnindex";
+		$ssql = "select vtiger_selectcolumn.* from vtiger_report inner join vtiger_selectquery on vtiger_selectquery.queryid = vtiger_report.queryid"; 
+		$ssql .= " left join vtiger_selectcolumn on vtiger_selectcolumn.queryid = vtiger_selectquery.queryid where vtiger_report.reportid =".$reportid; 
+		$ssql .= " order by vtiger_selectcolumn.columnindex";
 		
 		$result = $adb->query($ssql);
 		$noofrows = $adb->num_rows($result);
@@ -209,11 +209,11 @@
 		global $modules;
 		global $log;
 
-		$advfiltersql =  "select relcriteria.* from report";
-		$advfiltersql .= " inner join selectquery on selectquery.queryid = report.queryid";
-                $advfiltersql .= " left join relcriteria on relcriteria.queryid = selectquery.queryid";
-                $advfiltersql .= " where report.reportid =".$reportid;
-                $advfiltersql .= " order by relcriteria.columnindex";
+		$advfiltersql =  "select vtiger_relcriteria.* from vtiger_report";
+		$advfiltersql .= " inner join vtiger_selectquery on vtiger_selectquery.queryid = vtiger_report.queryid";
+                $advfiltersql .= " left join vtiger_relcriteria on vtiger_relcriteria.queryid = vtiger_selectquery.queryid";
+                $advfiltersql .= " where vtiger_report.reportid =".$reportid;
+                $advfiltersql .= " order by vtiger_relcriteria.columnindex";
 		
 		$result = $adb->query($advfiltersql);
 		while($advfilterrow = $adb->fetch_array($result))
@@ -253,9 +253,9 @@
 		global $modules;
 		global $log;
 
-		$stdfiltersql = "select reportdatefilter.* from report";
-		$stdfiltersql .= " inner join reportdatefilter on report.reportid = reportdatefilter.datefilterid";
-		$stdfiltersql .= " where report.reportid = ".$reportid;
+		$stdfiltersql = "select vtiger_reportdatefilter.* from vtiger_report";
+		$stdfiltersql .= " inner join vtiger_reportdatefilter on vtiger_report.reportid = vtiger_reportdatefilter.datefilterid";
+		$stdfiltersql .= " where vtiger_report.reportid = ".$reportid;
 
 		$result = $adb->query($stdfiltersql);
 		$stdfilterrow = $adb->fetch_array($result);
@@ -324,9 +324,9 @@
 		global $modules;
 		global $log;
 
-		$sreportstdfiltersql = "select reportdatefilter.* from report"; 
-		$sreportstdfiltersql .= " inner join reportdatefilter on report.reportid = reportdatefilter.datefilterid"; 
-		$sreportstdfiltersql .= " where report.reportid =".$reportid;
+		$sreportstdfiltersql = "select vtiger_reportdatefilter.* from vtiger_report"; 
+		$sreportstdfiltersql .= " inner join vtiger_reportdatefilter on vtiger_report.reportid = vtiger_reportdatefilter.datefilterid"; 
+		$sreportstdfiltersql .= " where vtiger_report.reportid =".$reportid;
 		
 		$result = $adb->query($sreportstdfiltersql);
 		$noofrows = $adb->num_rows($result);
@@ -568,9 +568,9 @@
 		global $modules;
 		global $log;
 
-		$sreportsortsql = "select reportsortcol.* from report";
-                $sreportsortsql .= " inner join reportsortcol on report.reportid = reportsortcol.reportid";
-                $sreportsortsql .= " where report.reportid =".$reportid." order by reportsortcol.sortcolid";
+		$sreportsortsql = "select vtiger_reportsortcol.* from vtiger_report";
+                $sreportsortsql .= " inner join vtiger_reportsortcol on vtiger_report.reportid = vtiger_reportsortcol.reportid";
+                $sreportsortsql .= " where vtiger_report.reportid =".$reportid." order by vtiger_reportsortcol.sortcolid";
 		
 		$result = $adb->query($sreportsortsql);
 
@@ -607,9 +607,9 @@
 		global $modules;
 		global $log;
 	
-		$sreportsortsql = "select reportsortcol.* from report"; 
-		$sreportsortsql .= " inner join reportsortcol on report.reportid = reportsortcol.reportid"; 
-		$sreportsortsql .= " where report.reportid =".$reportid." order by reportsortcol.sortcolid";
+		$sreportsortsql = "select vtiger_reportsortcol.* from vtiger_report"; 
+		$sreportsortsql .= " inner join vtiger_reportsortcol on vtiger_report.reportid = vtiger_reportsortcol.reportid"; 
+		$sreportsortsql .= " where vtiger_report.reportid =".$reportid." order by vtiger_reportsortcol.sortcolid";
 		
 		$result = $adb->query($sreportsortsql);
 		$noofrows = $adb->num_rows($result);
@@ -654,43 +654,43 @@
 		{
 			if($secmodule == "Accounts")
 			{
-				$query = "left join account on account.accountid = contactdetails.accountid
-                                left join crmentity as crmentityAccounts on crmentityAccounts.crmid=account.accountid
-                                left join accountbillads on account.accountid=accountbillads.accountaddressid
-                                left join accountshipads on account.accountid=accountshipads.accountaddressid
-                                left join accountscf on account.accountid = accountscf.accountid
-                                left join account as accountAccounts on accountAccounts.accountid = account.parentid
-                                left join users as usersAccounts on usersAccounts.id = crmentityAccounts.smownerid ";
+				$query = "left join vtiger_account on vtiger_account.accountid = vtiger_contactdetails.accountid
+                                left join vtiger_crmentity as vtiger_crmentityAccounts on vtiger_crmentityAccounts.crmid=vtiger_account.accountid
+                                left join vtiger_accountbillads on vtiger_account.accountid=vtiger_accountbillads.accountaddressid
+                                left join vtiger_accountshipads on vtiger_account.accountid=vtiger_accountshipads.accountaddressid
+                                left join vtiger_accountscf on vtiger_account.accountid = vtiger_accountscf.accountid
+                                left join vtiger_account as vtiger_accountAccounts on vtiger_accountAccounts.accountid = vtiger_account.parentid
+                                left join vtiger_users as vtiger_usersAccounts on vtiger_usersAccounts.id = vtiger_crmentityAccounts.smownerid ";
 			}
 			if($secmodule == "Potentials")
 			{
-				$query = "left join  potential on potential.accountid = contactdetails.accountid
-				left join crmentity as crmentityPotentials on crmentityPotentials.crmid=potential.potentialid
-				left join account as accountPotentials on potential.accountid = accountPotentials.accountid
-				left join potentialscf on potentialscf.potentialid = potential.potentialid
-				left join users as usersPotentials on usersPotentials.id = crmentityPotentials.smownerid ";
+				$query = "left join  vtiger_potential on vtiger_potential.accountid = vtiger_contactdetails.accountid
+				left join vtiger_crmentity as vtiger_crmentityPotentials on vtiger_crmentityPotentials.crmid=vtiger_potential.potentialid
+				left join vtiger_account as vtiger_accountPotentials on vtiger_potential.accountid = vtiger_accountPotentials.accountid
+				left join vtiger_potentialscf on vtiger_potentialscf.potentialid = vtiger_potential.potentialid
+				left join vtiger_users as vtiger_usersPotentials on vtiger_usersPotentials.id = vtiger_crmentityPotentials.smownerid ";
 			}
 			if($secmodule == "Quotes")
                         {
-                                $query = "left join quotes on quotes.contactid = contactdetails.contactid
-                                left join crmentity as crmentityQuotes on crmentityQuotes.crmid=quotes.quoteid
-                                left join quotesbillads on quotes.quoteid=quotesbillads.quotebilladdressid
-                                left join quotesshipads on quotes.quoteid=quotesshipads.quoteshipaddressid
-                                left join users as usersQuotes on usersQuotes.id = crmentityQuotes.smownerid
-                                left join users as usersRel1 on usersRel1.id = quotes.inventorymanager
-                                left join potential as potentialRel on potentialRel.potentialid = quotes.potentialid
-                                left join contactdetails as contactdetailsQuotes on contactdetailsQuotes.contactid = quotes.contactid
-                                left join account as accountQuotes on accountQuotes.accountid = quotes.accountid ";
+                                $query = "left join vtiger_quotes on vtiger_quotes.contactid = vtiger_contactdetails.contactid
+                                left join vtiger_crmentity as vtiger_crmentityQuotes on vtiger_crmentityQuotes.crmid=vtiger_quotes.quoteid
+                                left join vtiger_quotesbillads on vtiger_quotes.quoteid=vtiger_quotesbillads.quotebilladdressid
+                                left join vtiger_quotesshipads on vtiger_quotes.quoteid=vtiger_quotesshipads.quoteshipaddressid
+                                left join vtiger_users as vtiger_usersQuotes on vtiger_usersQuotes.id = vtiger_crmentityQuotes.smownerid
+                                left join vtiger_users as vtiger_usersRel1 on vtiger_usersRel1.id = vtiger_quotes.inventorymanager
+                                left join vtiger_potential as vtiger_potentialRel on vtiger_potentialRel.potentialid = vtiger_quotes.potentialid
+                                left join vtiger_contactdetails as vtiger_contactdetailsQuotes on vtiger_contactdetailsQuotes.contactid = vtiger_quotes.contactid
+                                left join vtiger_account as vtiger_accountQuotes on vtiger_accountQuotes.accountid = vtiger_quotes.accountid ";
                         }
                         if($secmodule == "PurchaseOrder")
                         {
-                                $query = "left join purchaseorder on purchaseorder.contactid = contactdetails.contactid
-                                left join crmentity as crmentityPurchaseOrder on crmentityPurchaseOrder.crmid=purchaseorder.purchaseorderid
-                                left join pobillads on purchaseorder.purchaseorderid=pobillads.pobilladdressid
-                                left join poshipads on purchaseorder.purchaseorderid=poshipads.poshipaddressid
-                                left join users as usersPurchaseOrder on usersPurchaseOrder.id = crmentityPurchaseOrder.smownerid
-                                left join vendor as vendorRel on vendorRel.vendorid = purchaseorder.vendorid
-                                left join contactdetails as contactdetailsPurchaseOrder on contactdetailsPurchaseOrder.contactid = purchaseorder.contactid ";
+                                $query = "left join vtiger_purchaseorder on vtiger_purchaseorder.contactid = vtiger_contactdetails.contactid
+                                left join vtiger_crmentity as vtiger_crmentityPurchaseOrder on vtiger_crmentityPurchaseOrder.crmid=vtiger_purchaseorder.purchaseorderid
+                                left join vtiger_pobillads on vtiger_purchaseorder.purchaseorderid=vtiger_pobillads.pobilladdressid
+                                left join vtiger_poshipads on vtiger_purchaseorder.purchaseorderid=vtiger_poshipads.poshipaddressid
+                                left join vtiger_users as vtiger_usersPurchaseOrder on vtiger_usersPurchaseOrder.id = vtiger_crmentityPurchaseOrder.smownerid
+                                left join vtiger_vendor as vtiger_vendorRel on vtiger_vendorRel.vendorid = vtiger_purchaseorder.vendorid
+                                left join vtiger_contactdetails as vtiger_contactdetailsPurchaseOrder on vtiger_contactdetailsPurchaseOrder.contactid = vtiger_purchaseorder.contactid ";
                         }
 
 		}
@@ -699,100 +699,100 @@
 		{
 			if($secmodule == "Potentials")
 			{
-				$query = "left join potential on potential.accountid = account.accountid
-				left join crmentity as crmentityPotentials on crmentityPotentials.crmid=potential.potentialid
-                                left join potentialscf on potentialscf.potentialid = potential.potentialid
-                                left join users as usersPotentials on usersPotentials.id = crmentityPotentials.smownerid ";
+				$query = "left join vtiger_potential on vtiger_potential.accountid = vtiger_account.accountid
+				left join vtiger_crmentity as vtiger_crmentityPotentials on vtiger_crmentityPotentials.crmid=vtiger_potential.potentialid
+                                left join vtiger_potentialscf on vtiger_potentialscf.potentialid = vtiger_potential.potentialid
+                                left join vtiger_users as vtiger_usersPotentials on vtiger_usersPotentials.id = vtiger_crmentityPotentials.smownerid ";
 
 			}
 			if($secmodule == "Contacts")
 			{
-				$query = "left join contactdetails on contactdetails.accountid = account.accountid
-				left join crmentity as crmentityContacts on crmentityContacts.crmid = contactdetails.contactid
-                                left join contactaddress on contactdetails.contactid = contactaddress.contactaddressid
-                                left join contactsubdetails on contactdetails.contactid = contactsubdetails.contactsubscriptionid
-				left join contactdetails as contactdetailsContacts on contactdetailsContacts.contactid = contactdetails.reportsto
-				left join account as accountContacts on accountContacts.accountid = contactdetails.accountid 
-                                left join contactscf on contactdetails.contactid = contactscf.contactid
-                                left join users as usersContacts on usersContacts.id = crmentityContacts.smownerid ";
+				$query = "left join vtiger_contactdetails on vtiger_contactdetails.accountid = vtiger_account.accountid
+				left join vtiger_crmentity as vtiger_crmentityContacts on vtiger_crmentityContacts.crmid = vtiger_contactdetails.contactid
+                                left join vtiger_contactaddress on vtiger_contactdetails.contactid = vtiger_contactaddress.contactaddressid
+                                left join vtiger_contactsubdetails on vtiger_contactdetails.contactid = vtiger_contactsubdetails.contactsubscriptionid
+				left join vtiger_contactdetails as vtiger_contactdetailsContacts on vtiger_contactdetailsContacts.contactid = vtiger_contactdetails.reportsto
+				left join vtiger_account as vtiger_accountContacts on vtiger_accountContacts.accountid = vtiger_contactdetails.accountid 
+                                left join vtiger_contactscf on vtiger_contactdetails.contactid = vtiger_contactscf.contactid
+                                left join vtiger_users as vtiger_usersContacts on vtiger_usersContacts.id = vtiger_crmentityContacts.smownerid ";
 			}
 			if($secmodule == "Quotes")
 			{
-				$query = "left join quotes on quotes.accountid = account.accountid
-                                left join crmentity as crmentityQuotes on crmentityQuotes.crmid=quotes.quoteid
-                                left join quotesbillads on quotes.quoteid=quotesbillads.quotebilladdressid
-                                left join quotesshipads on quotes.quoteid=quotesshipads.quoteshipaddressid
-                                left join users as usersQuotes on usersQuotes.id = crmentityQuotes.smownerid
-                                left join users as usersRel1 on usersRel1.id = quotes.inventorymanager
-                                left join potential as potentialRel on potentialRel.potentialid = quotes.potentialid
-                                left join contactdetails as contactdetailsQuotes on contactdetailsQuotes.contactid = quotes.contactid
-                                left join account as accountQuotes on accountQuotes.accountid = quotes.accountid ";
+				$query = "left join vtiger_quotes on vtiger_quotes.accountid = vtiger_account.accountid
+                                left join vtiger_crmentity as vtiger_crmentityQuotes on vtiger_crmentityQuotes.crmid=vtiger_quotes.quoteid
+                                left join vtiger_quotesbillads on vtiger_quotes.quoteid=vtiger_quotesbillads.quotebilladdressid
+                                left join vtiger_quotesshipads on vtiger_quotes.quoteid=vtiger_quotesshipads.quoteshipaddressid
+                                left join vtiger_users as vtiger_usersQuotes on vtiger_usersQuotes.id = vtiger_crmentityQuotes.smownerid
+                                left join vtiger_users as vtiger_usersRel1 on vtiger_usersRel1.id = vtiger_quotes.inventorymanager
+                                left join vtiger_potential as vtiger_potentialRel on vtiger_potentialRel.potentialid = vtiger_quotes.potentialid
+                                left join vtiger_contactdetails as vtiger_contactdetailsQuotes on vtiger_contactdetailsQuotes.contactid = vtiger_quotes.contactid
+                                left join vtiger_account as vtiger_accountQuotes on vtiger_accountQuotes.accountid = vtiger_quotes.accountid ";
 			}
 			if($secmodule == "PurchaseOrder")
 			{
-				$query = "left join purchaseorder on purchaseorder.accountid = account.accountid
-                                left join crmentity as crmentityPurchaseOrder on crmentityPurchaseOrder.crmid=purchaseorder.purchaseorderid
-                                left join pobillads on purchaseorder.purchaseorderid=pobillads.pobilladdressid
-                                left join poshipads on purchaseorder.purchaseorderid=poshipads.poshipaddressid
-                                left join users as usersPurchaseOrder on usersPurchaseOrder.id = crmentityPurchaseOrder.smownerid
-                                left join vendor as vendorRel on vendorRel.vendorid = purchaseorder.vendorid
-                                left join contactdetails as contactdetailsPurchaseOrder on contactdetailsPurchaseOrder.contactid = purchaseorder.contactid ";
+				$query = "left join vtiger_purchaseorder on vtiger_purchaseorder.accountid = vtiger_account.accountid
+                                left join vtiger_crmentity as vtiger_crmentityPurchaseOrder on vtiger_crmentityPurchaseOrder.crmid=vtiger_purchaseorder.purchaseorderid
+                                left join vtiger_pobillads on vtiger_purchaseorder.purchaseorderid=vtiger_pobillads.pobilladdressid
+                                left join vtiger_poshipads on vtiger_purchaseorder.purchaseorderid=vtiger_poshipads.poshipaddressid
+                                left join vtiger_users as vtiger_usersPurchaseOrder on vtiger_usersPurchaseOrder.id = vtiger_crmentityPurchaseOrder.smownerid
+                                left join vtiger_vendor as vtiger_vendorRel on vtiger_vendorRel.vendorid = vtiger_purchaseorder.vendorid
+                                left join vtiger_contactdetails as vtiger_contactdetailsPurchaseOrder on vtiger_contactdetailsPurchaseOrder.contactid = vtiger_purchaseorder.contactid ";
 			}
 			if($secmodule == "Invoice")
 			{
-				$query = "left join invoice on invoice.accountid = account.accountid
-                                left join crmentity as crmentityInvoice on crmentityInvoice.crmid=invoice.invoiceid
-                                left join invoicebillads on invoice.invoiceid=invoicebillads.invoicebilladdressid
-                                left join invoiceshipads on invoice.invoiceid=invoiceshipads.invoiceshipaddressid
-                                left join users as usersInvoice on usersInvoice.id = crmentityInvoice.smownerid
-                                left join account as accountInvoice on accountInvoice.accountid = invoice.accountid ";
+				$query = "left join vtiger_invoice on vtiger_invoice.accountid = vtiger_account.accountid
+                                left join vtiger_crmentity as vtiger_crmentityInvoice on vtiger_crmentityInvoice.crmid=vtiger_invoice.invoiceid
+                                left join vtiger_invoicebillads on vtiger_invoice.invoiceid=vtiger_invoicebillads.invoicebilladdressid
+                                left join vtiger_invoiceshipads on vtiger_invoice.invoiceid=vtiger_invoiceshipads.invoiceshipaddressid
+                                left join vtiger_users as vtiger_usersInvoice on vtiger_usersInvoice.id = vtiger_crmentityInvoice.smownerid
+                                left join vtiger_account as vtiger_accountInvoice on vtiger_accountInvoice.accountid = vtiger_invoice.accountid ";
 			}
 			if($secmodule == "Products")
 			{
-				$query = "left join seproductsrel on seproductsrel.crmid = account.accountid
-				left join products on products.productid = seproductsrel.productid
-                                left join crmentity as crmentityProducts on crmentityProducts.crmid=products.productid
-                                left join productcf on products.productid = productcf.productid
-                                left join users as usersProducts on usersProducts.id = crmentityProducts.smownerid
-                                left join contactdetails as contactdetailsProducts on contactdetailsProducts.contactid = products.contactid
-                                left join vendor as vendorRel on vendorRel.vendorid = products.vendor_id
-                                left join crmentity as crmentityRel on crmentityRel.crmid = seproductsrel.crmid
-                                left join account as accountRel on accountRel.accountid=crmentityRel.crmid
-                                left join leaddetails as leaddetailsRel on leaddetailsRel.leadid = crmentityRel.crmid
-                                left join potential as potentialRel on potentialRel.potentialid = crmentityRel.crmid ";
+				$query = "left join vtiger_seproductsrel on vtiger_seproductsrel.crmid = vtiger_account.accountid
+				left join vtiger_products on vtiger_products.productid = vtiger_seproductsrel.productid
+                                left join vtiger_crmentity as vtiger_crmentityProducts on vtiger_crmentityProducts.crmid=vtiger_products.productid
+                                left join vtiger_productcf on vtiger_products.productid = vtiger_productcf.productid
+                                left join vtiger_users as vtiger_usersProducts on vtiger_usersProducts.id = vtiger_crmentityProducts.smownerid
+                                left join vtiger_contactdetails as vtiger_contactdetailsProducts on vtiger_contactdetailsProducts.contactid = vtiger_products.contactid
+                                left join vtiger_vendor as vtiger_vendorRel on vtiger_vendorRel.vendorid = vtiger_products.vendor_id
+                                left join vtiger_crmentity as vtiger_crmentityRel on vtiger_crmentityRel.crmid = vtiger_seproductsrel.crmid
+                                left join vtiger_account as vtiger_accountRel on vtiger_accountRel.accountid=crmentityRel.crmid
+                                left join vtiger_leaddetails as vtiger_leaddetailsRel on vtiger_leaddetailsRel.leadid = vtiger_crmentityRel.crmid
+                                left join vtiger_potential as vtiger_potentialRel on vtiger_potentialRel.potentialid = vtiger_crmentityRel.crmid ";
 			}
 		}
 		if($module == "Quotes")
 		{
 			if($secmodule == "Accounts")
                         {
-                                $query = "left join account on account.accountid = quotes.accountid
-                                left join crmentity as crmentityAccounts on crmentityAccounts.crmid=account.accountid
-                                left join accountbillads on account.accountid=accountbillads.accountaddressid
-                                left join accountshipads on account.accountid=accountshipads.accountaddressid
-                                left join accountscf on account.accountid = accountscf.accountid
-                                left join account as accountAccounts on accountAccounts.accountid = account.parentid
-                                left join users as usersAccounts on usersAccounts.id = crmentityAccounts.smownerid ";
+                                $query = "left join vtiger_account on vtiger_account.accountid = vtiger_quotes.accountid
+                                left join vtiger_crmentity as vtiger_crmentityAccounts on vtiger_crmentityAccounts.crmid=vtiger_account.accountid
+                                left join vtiger_accountbillads on vtiger_account.accountid=vtiger_accountbillads.accountaddressid
+                                left join vtiger_accountshipads on vtiger_account.accountid=vtiger_accountshipads.accountaddressid
+                                left join vtiger_accountscf on vtiger_account.accountid = vtiger_accountscf.accountid
+                                left join vtiger_account as vtiger_accountAccounts on vtiger_accountAccounts.accountid = vtiger_account.parentid
+                                left join vtiger_users as vtiger_usersAccounts on vtiger_usersAccounts.id = vtiger_crmentityAccounts.smownerid ";
                         }
 			if($secmodule == "Potentials")
                         {
-                                $query = "left join potential on potential.potentialid = quotes.potentialid
-                                left join crmentity as crmentityPotentials on crmentityPotentials.crmid=potential.potentialid 
-				left join potentialscf on potentialscf.potentialid = potential.potentialid
-                                left join users as usersPotentials on usersPotentials.id = crmentityPotentials.smownerid ";
+                                $query = "left join vtiger_potential on vtiger_potential.potentialid = vtiger_quotes.potentialid
+                                left join vtiger_crmentity as vtiger_crmentityPotentials on vtiger_crmentityPotentials.crmid=vtiger_potential.potentialid 
+				left join vtiger_potentialscf on vtiger_potentialscf.potentialid = vtiger_potential.potentialid
+                                left join vtiger_users as vtiger_usersPotentials on vtiger_usersPotentials.id = vtiger_crmentityPotentials.smownerid ";
 
                         }
 			if($secmodule == "Contacts")
                         {
-                                $query = "left join contactdetails on contactdetails.contactid = quotes.contactid
-                                left join crmentity as crmentityContacts on crmentityContacts.crmid = contactdetails.contactid
-                                left join contactaddress on contactdetails.contactid = contactaddress.contactaddressid
-                                left join contactsubdetails on contactdetails.contactid = contactsubdetails.contactsubscriptionid
-                                left join contactdetails as contactdetailsContacts on contactdetailsContacts.contactid = contactdetails.reportsto
-                                left join account as accountContacts on accountContacts.accountid = contactdetails.accountid
-
-                                left join contactscf on contactdetails.contactid = contactscf.contactid
-                                left join users as usersContacts on usersContacts.id = crmentityContacts.smownerid ";
+                                $query = "left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_quotes.contactid
+                                left join vtiger_crmentity as vtiger_crmentityContacts on vtiger_crmentityContacts.crmid = vtiger_contactdetails.contactid
+                                left join vtiger_contactaddress on vtiger_contactdetails.contactid = vtiger_contactaddress.contactaddressid
+                                left join vtiger_contactsubdetails on vtiger_contactdetails.contactid = vtiger_contactsubdetails.contactsubscriptionid
+                                left join vtiger_contactdetails as vtiger_contactdetailsContacts on vtiger_contactdetailsContacts.contactid = vtiger_contactdetails.reportsto
+                                left join vtiger_account as vtiger_accountContacts on vtiger_accountContacts.accountid = vtiger_contactdetails.accountid
+
+                                left join vtiger_contactscf on vtiger_contactdetails.contactid = vtiger_contactscf.contactid
+                                left join vtiger_users as vtiger_usersContacts on vtiger_usersContacts.id = vtiger_crmentityContacts.smownerid ";
                         }
 
 		}
@@ -800,62 +800,62 @@
 		{
 			if($secmodule == "Accounts")
                         {
-                                $query = "left join account on account.accountid = purchaseorder.accountid
-                                left join crmentity as crmentityAccounts on crmentityAccounts.crmid=account.accountid
-                                left join accountbillads on account.accountid=accountbillads.accountaddressid
-                                left join accountshipads on account.accountid=accountshipads.accountaddressid
-                                left join accountscf on account.accountid = accountscf.accountid
-                                left join account as accountAccounts on accountAccounts.accountid = account.parentid
-                                left join users as usersAccounts on usersAccounts.id = crmentityAccounts.smownerid ";
+                                $query = "left join vtiger_account on vtiger_account.accountid = vtiger_purchaseorder.accountid
+                                left join vtiger_crmentity as vtiger_crmentityAccounts on vtiger_crmentityAccounts.crmid=vtiger_account.accountid
+                                left join vtiger_accountbillads on vtiger_account.accountid=vtiger_accountbillads.accountaddressid
+                                left join vtiger_accountshipads on vtiger_account.accountid=vtiger_accountshipads.accountaddressid
+                                left join vtiger_accountscf on vtiger_account.accountid = vtiger_accountscf.accountid
+                                left join vtiger_account as vtiger_accountAccounts on vtiger_accountAccounts.accountid = vtiger_account.parentid
+                                left join vtiger_users as vtiger_usersAccounts on vtiger_usersAccounts.id = vtiger_crmentityAccounts.smownerid ";
                         }
 			if($secmodule == "Contacts")
 			{
-				$query = "left join contactdetails on contactdetails.contactid = purchaseorder.contactid
-                                left join crmentity as crmentityContacts on crmentityContacts.crmid = contactdetails.contactid
-                                left join contactaddress on contactdetails.contactid = contactaddress.contactaddressid
-                                left join contactsubdetails on contactdetails.contactid = contactsubdetails.contactsubscriptionid
-                                left join contactdetails as contactdetailsContacts on contactdetailsContacts.contactid = contactdetails.reportsto
-                                left join account as accountContacts on accountContacts.accountid = contactdetails.accountid
-
-                                left join contactscf on contactdetails.contactid = contactscf.contactid
-                                left join users as usersContacts on usersContacts.id = crmentityContacts.smownerid ";
+				$query = "left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_purchaseorder.contactid
+                                left join vtiger_crmentity as vtiger_crmentityContacts on vtiger_crmentityContacts.crmid = vtiger_contactdetails.contactid
+                                left join vtiger_contactaddress on vtiger_contactdetails.contactid = vtiger_contactaddress.contactaddressid
+                                left join vtiger_contactsubdetails on vtiger_contactdetails.contactid = vtiger_contactsubdetails.contactsubscriptionid
+                                left join vtiger_contactdetails as vtiger_contactdetailsContacts on vtiger_contactdetailsContacts.contactid = vtiger_contactdetails.reportsto
+                                left join vtiger_account as vtiger_accountContacts on vtiger_accountContacts.accountid = vtiger_contactdetails.accountid
+
+                                left join vtiger_contactscf on vtiger_contactdetails.contactid = vtiger_contactscf.contactid
+                                left join vtiger_users as vtiger_usersContacts on vtiger_usersContacts.id = vtiger_crmentityContacts.smownerid ";
 			}
 		}
 		if($module == "Invoice")
 		{
 			if($secmodule == "Accounts")
 			{
-				$query = "left join account on account.accountid = invoice.accountid
-                                left join crmentity as crmentityAccounts on crmentityAccounts.crmid=account.accountid
-                                left join accountbillads on account.accountid=accountbillads.accountaddressid
-                                left join accountshipads on account.accountid=accountshipads.accountaddressid
-                                left join accountscf on account.accountid = accountscf.accountid
-                                left join account as accountAccounts on accountAccounts.accountid = account.parentid
-                                left join users as usersAccounts on usersAccounts.id = crmentityAccounts.smownerid ";
+				$query = "left join vtiger_account on vtiger_account.accountid = vtiger_invoice.accountid
+                                left join vtiger_crmentity as vtiger_crmentityAccounts on vtiger_crmentityAccounts.crmid=vtiger_account.accountid
+                                left join vtiger_accountbillads on vtiger_account.accountid=vtiger_accountbillads.accountaddressid
+                                left join vtiger_accountshipads on vtiger_account.accountid=vtiger_accountshipads.accountaddressid
+                                left join vtiger_accountscf on vtiger_account.accountid = vtiger_accountscf.accountid
+                                left join vtiger_account as vtiger_accountAccounts on vtiger_accountAccounts.accountid = vtiger_account.parentid
+                                left join vtiger_users as vtiger_usersAccounts on vtiger_usersAccounts.id = vtiger_crmentityAccounts.smownerid ";
 			}
 		}
 		if($module == "Products")
 		{
 			if($secmodule == "Accounts")
                         {
-                                $query = "left join account on account.accountid = crmentityRel.crmid
-                                left join crmentity as crmentityAccounts on crmentityAccounts.crmid=account.accountid
-                                left join accountbillads on account.accountid=accountbillads.accountaddressid
-                                left join accountshipads on account.accountid=accountshipads.accountaddressid
-                                left join accountscf on account.accountid = accountscf.accountid
-                                left join account as accountAccounts on accountAccounts.accountid = account.parentid
-                                left join users as usersAccounts on usersAccounts.id = crmentityAccounts.smownerid ";
+                                $query = "left join vtiger_account on vtiger_account.accountid = vtiger_crmentityRel.crmid
+                                left join vtiger_crmentity as vtiger_crmentityAccounts on vtiger_crmentityAccounts.crmid=vtiger_account.accountid
+                                left join vtiger_accountbillads on vtiger_account.accountid=vtiger_accountbillads.accountaddressid
+                                left join vtiger_accountshipads on vtiger_account.accountid=vtiger_accountshipads.accountaddressid
+                                left join vtiger_accountscf on vtiger_account.accountid = vtiger_accountscf.accountid
+                                left join vtiger_account as vtiger_accountAccounts on vtiger_accountAccounts.accountid = vtiger_account.parentid
+                                left join vtiger_users as vtiger_usersAccounts on vtiger_usersAccounts.id = vtiger_crmentityAccounts.smownerid ";
                         }
 			if($secmodule == "Contacts")
                         {
-                                $query = "left join contactdetails on contactdetails.contactid = products.contactid
-                                left join crmentity as crmentityContacts on crmentityContacts.crmid = contactdetails.contactid
-                                left join contactaddress on contactdetails.contactid = contactaddress.contactaddressid
-                                left join contactsubdetails on contactdetails.contactid = contactsubdetails.contactsubscriptionid
-                                left join contactdetails as contactdetailsContacts on contactdetailsContacts.contactid = contactdetails.reportsto
-                                left join account as accountContacts on accountContacts.accountid = contactdetails.accountid
-                                left join contactscf on contactdetails.contactid = contactscf.contactid
-                                left join users as usersContacts on usersContacts.id = crmentityContacts.smownerid ";
+                                $query = "left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_products.contactid
+                                left join vtiger_crmentity as vtiger_crmentityContacts on vtiger_crmentityContacts.crmid = vtiger_contactdetails.contactid
+                                left join vtiger_contactaddress on vtiger_contactdetails.contactid = vtiger_contactaddress.contactaddressid
+                                left join vtiger_contactsubdetails on vtiger_contactdetails.contactid = vtiger_contactsubdetails.contactsubscriptionid
+                                left join vtiger_contactdetails as vtiger_contactdetailsContacts on vtiger_contactdetailsContacts.contactid = vtiger_contactdetails.reportsto
+                                left join vtiger_account as vtiger_accountContacts on vtiger_accountContacts.accountid = vtiger_contactdetails.accountid
+                                left join vtiger_contactscf on vtiger_contactdetails.contactid = vtiger_contactscf.contactid
+                                left join vtiger_users as vtiger_usersContacts on vtiger_usersContacts.id = vtiger_crmentityContacts.smownerid ";
 
                         }
 
@@ -864,68 +864,68 @@
 		{
 			if($secmodule == "Accounts")
                         {
-                                $query = "left join account on account.accountid = potential.accountid
-                                left join crmentity as crmentityAccounts on crmentityAccounts.crmid=account.accountid
-                                left join accountbillads on account.accountid=accountbillads.accountaddressid
-                                left join accountshipads on account.accountid=accountshipads.accountaddressid
-                                left join accountscf on account.accountid = accountscf.accountid
-                                left join account as accountAccounts on accountAccounts.accountid = account.parentid
-                                left join users as usersAccounts on usersAccounts.id = crmentityAccounts.smownerid ";
+                                $query = "left join vtiger_account on vtiger_account.accountid = vtiger_potential.accountid
+                                left join vtiger_crmentity as vtiger_crmentityAccounts on vtiger_crmentityAccounts.crmid=vtiger_account.accountid
+                                left join vtiger_accountbillads on vtiger_account.accountid=vtiger_accountbillads.accountaddressid
+                                left join vtiger_accountshipads on vtiger_account.accountid=vtiger_accountshipads.accountaddressid
+                                left join vtiger_accountscf on vtiger_account.accountid = vtiger_accountscf.accountid
+                                left join vtiger_account as vtiger_accountAccounts on vtiger_accountAccounts.accountid = vtiger_account.parentid
+                                left join vtiger_users as vtiger_usersAccounts on vtiger_usersAccounts.id = vtiger_crmentityAccounts.smownerid ";
                         }
 			if($secmodule == "Contacts")
 			{
-				$query = "left join contactdetails on contactdetails.accountid = potential.accountid
-				left join crmentity as crmentityContacts on crmentityContacts.crmid = contactdetails.contactid
-				left join contactaddress on contactdetails.contactid = contactaddress.contactaddressid
-				left join contactsubdetails on contactdetails.contactid = contactsubdetails.contactsubscriptionid
-				left join contactdetails as contactdetailsContacts on contactdetailsContacts.contactid = contactdetails.reportsto
-				left join account as accountContacts on accountContacts.accountid = contactdetails.accountid
-				left join contactscf on contactdetails.contactid = contactscf.contactid
-				left join users as usersContacts on usersContacts.id = crmentityContacts.smownerid ";
+				$query = "left join vtiger_contactdetails on vtiger_contactdetails.accountid = vtiger_potential.accountid
+				left join vtiger_crmentity as vtiger_crmentityContacts on vtiger_crmentityContacts.crmid = vtiger_contactdetails.contactid
+				left join vtiger_contactaddress on vtiger_contactdetails.contactid = vtiger_contactaddress.contactaddressid
+				left join vtiger_contactsubdetails on vtiger_contactdetails.contactid = vtiger_contactsubdetails.contactsubscriptionid
+				left join vtiger_contactdetails as vtiger_contactdetailsContacts on vtiger_contactdetailsContacts.contactid = vtiger_contactdetails.reportsto
+				left join vtiger_account as vtiger_accountContacts on vtiger_accountContacts.accountid = vtiger_contactdetails.accountid
+				left join vtiger_contactscf on vtiger_contactdetails.contactid = vtiger_contactscf.contactid
+				left join vtiger_users as vtiger_usersContacts on vtiger_usersContacts.id = vtiger_crmentityContacts.smownerid ";
 
 			}
 			if($secmodule == "Quotes")
 			{
-				$query = "left join quotes on quotes.potentialid = potential.potentialid
-                                left join crmentity as crmentityQuotes on crmentityQuotes.crmid=quotes.quoteid
-                                left join quotesbillads on quotes.quoteid=quotesbillads.quotebilladdressid
-                                left join quotesshipads on quotes.quoteid=quotesshipads.quoteshipaddressid
-                                left join users as usersQuotes on usersQuotes.id = crmentityQuotes.smownerid
-                                left join users as usersRel1 on usersRel1.id = quotes.inventorymanager
-                                left join potential as potentialRel on potentialRel.potentialid = quotes.potentialid
-                                left join contactdetails as contactdetailsQuotes on contactdetailsQuotes.contactid = quotes.contactid
-                                left join account as accountQuotes on accountQuotes.accountid = quotes.accountid ";
+				$query = "left join vtiger_quotes on vtiger_quotes.potentialid = vtiger_potential.potentialid
+                                left join vtiger_crmentity as vtiger_crmentityQuotes on vtiger_crmentityQuotes.crmid=vtiger_quotes.quoteid
+                                left join vtiger_quotesbillads on vtiger_quotes.quoteid=vtiger_quotesbillads.quotebilladdressid
+                                left join vtiger_quotesshipads on vtiger_quotes.quoteid=vtiger_quotesshipads.quoteshipaddressid
+                                left join vtiger_users as vtiger_usersQuotes on vtiger_usersQuotes.id = vtiger_crmentityQuotes.smownerid
+                                left join vtiger_users as vtiger_usersRel1 on vtiger_usersRel1.id = vtiger_quotes.inventorymanager
+                                left join vtiger_potential as vtiger_potentialRel on vtiger_potentialRel.potentialid = vtiger_quotes.potentialid
+                                left join vtiger_contactdetails as vtiger_contactdetailsQuotes on vtiger_contactdetailsQuotes.contactid = vtiger_quotes.contactid
+                                left join vtiger_account as vtiger_accountQuotes on vtiger_accountQuotes.accountid = vtiger_quotes.accountid ";
 			}
 		}
 		if($module == "HelpDesk")
 		{
 			if($secmodule == "Products")
 			{
-				$query = "left join products on products.productid = troubletickets.product_id
-                                left join crmentity as crmentityProducts on crmentityProducts.crmid=products.productid
-                                left join productcf on products.productid = productcf.productid
-                                left join users as usersProducts on usersProducts.id = crmentityProducts.smownerid
-																left join contactdetails as contactdetailsProducts on contactdetailsProducts.contactid = products.contactid 
-                                left join vendor as vendorRel on vendorRel.vendorid = products.vendor_id
-                                left join seproductsrel on seproductsrel.productid = products.productid
-                                left join crmentity as crmentityRelProducts on crmentityRelProducts.crmid = seproductsrel.crmid
-                                left join account as accountRelProducts on accountRelProducts.accountid=seproductsrel.crmid
-                                left join leaddetails as leaddetailsRelProducts on leaddetailsRelProducts.leadid = seproductsrel.crmid
-                                left join potential as potentialRelProducts on potentialRelProducts.potentialid = seproductsrel.crmid ";
+				$query = "left join vtiger_products on vtiger_products.productid = vtiger_troubletickets.product_id
+                                left join vtiger_crmentity as vtiger_crmentityProducts on vtiger_crmentityProducts.crmid=vtiger_products.productid
+                                left join vtiger_productcf on vtiger_products.productid = vtiger_productcf.productid
+                                left join vtiger_users as vtiger_usersProducts on vtiger_usersProducts.id = vtiger_crmentityProducts.smownerid
+																left join vtiger_contactdetails as vtiger_contactdetailsProducts on vtiger_contactdetailsProducts.contactid = vtiger_products.contactid 
+                                left join vtiger_vendor as vtiger_vendorRel on vtiger_vendorRel.vendorid = vtiger_products.vendor_id
+                                left join vtiger_seproductsrel on vtiger_seproductsrel.productid = vtiger_products.productid
+                                left join vtiger_crmentity as vtiger_crmentityRelProducts on vtiger_crmentityRelProducts.crmid = vtiger_seproductsrel.crmid
+                                left join vtiger_account as vtiger_accountRelProducts on vtiger_accountRelProducts.accountid=vtiger_seproductsrel.crmid
+                                left join vtiger_leaddetails as vtiger_leaddetailsRelProducts on vtiger_leaddetailsRelProducts.leadid = vtiger_seproductsrel.crmid
+                                left join vtiger_potential as vtiger_potentialRelProducts on vtiger_potentialRelProducts.potentialid = vtiger_seproductsrel.crmid ";
 			}
 		}
 		if($module == "Activities")
 		{
 			if($secmodule == "Contacts")
 			{
-                                $query = "left join contactdetails on contactdetails.contactid = cntactivityrel.contactid 
-                                left join crmentity as crmentityContacts on crmentityContacts.crmid = contactdetails.contactid
-                                left join contactaddress on contactdetails.contactid = contactaddress.contactaddressid
-                                left join contactsubdetails on contactdetails.contactid = contactsubdetails.contactsubscriptionid
-                                left join contactdetails as contactdetailsContacts on contactdetailsContacts.contactid = contactdetails.reportsto
-                                left join account as accountContacts on accountContacts.accountid = contactdetails.accountid
-                                left join contactscf on contactdetails.contactid = contactscf.contactid
-                                left join users as usersContacts on usersContacts.id = crmentityContacts.smownerid ";
+                                $query = "left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid 
+                                left join vtiger_crmentity as vtiger_crmentityContacts on vtiger_crmentityContacts.crmid = vtiger_contactdetails.contactid
+                                left join vtiger_contactaddress on vtiger_contactdetails.contactid = vtiger_contactaddress.contactaddressid
+                                left join vtiger_contactsubdetails on vtiger_contactdetails.contactid = vtiger_contactsubdetails.contactsubscriptionid
+                                left join vtiger_contactdetails as vtiger_contactdetailsContacts on vtiger_contactdetailsContacts.contactid = vtiger_contactdetails.reportsto
+                                left join vtiger_account as vtiger_accountContacts on vtiger_accountContacts.accountid = vtiger_contactdetails.accountid
+                                left join vtiger_contactscf on vtiger_contactdetails.contactid = vtiger_contactscf.contactid
+                                left join vtiger_users as vtiger_usersContacts on vtiger_usersContacts.id = vtiger_crmentityContacts.smownerid ";
 			}
 		}
 		$log->info("ReportRun :: Successfully returned getRelatedModulesQuery".$secmodule);
@@ -936,143 +936,143 @@
 		global $log;
 		if($module == "Leads")
 		{
-			$query = "from leaddetails 
-				inner join crmentity as crmentityLeads on crmentityLeads.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 users as usersLeads on usersLeads.id = crmentityLeads.smownerid
-				where crmentityLeads.deleted=0 and leaddetails.converted=0";
+			$query = "from vtiger_leaddetails 
+				inner join vtiger_crmentity as vtiger_crmentityLeads on vtiger_crmentityLeads.crmid=vtiger_leaddetails.leadid 
+				inner join vtiger_leadsubdetails on vtiger_leadsubdetails.leadsubscriptionid=vtiger_leaddetails.leadid 
+				inner join vtiger_leadaddress on vtiger_leadaddress.leadaddressid=vtiger_leadsubdetails.leadsubscriptionid 
+				inner join vtiger_leadscf on vtiger_leaddetails.leadid = vtiger_leadscf.leadid 
+				left join vtiger_users as vtiger_usersLeads on vtiger_usersLeads.id = vtiger_crmentityLeads.smownerid
+				where vtiger_crmentityLeads.deleted=0 and vtiger_leaddetails.converted=0";
 		}
 
 		if($module == "Accounts")
                 {
-			$query = "from account 
-				inner join crmentity as crmentityAccounts on crmentityAccounts.crmid=account.accountid 
-				inner join accountbillads on account.accountid=accountbillads.accountaddressid 
-				inner join accountshipads on account.accountid=accountshipads.accountaddressid 
-				inner join accountscf on account.accountid = accountscf.accountid 
-				left join account as accountAccounts on accountAccounts.accountid = account.parentid
-				left join users as usersAccounts on usersAccounts.id = crmentityAccounts.smownerid
+			$query = "from vtiger_account 
+				inner join vtiger_crmentity as vtiger_crmentityAccounts on vtiger_crmentityAccounts.crmid=vtiger_account.accountid 
+				inner join vtiger_accountbillads on vtiger_account.accountid=vtiger_accountbillads.accountaddressid 
+				inner join vtiger_accountshipads on vtiger_account.accountid=vtiger_accountshipads.accountaddressid 
+				inner join vtiger_accountscf on vtiger_account.accountid = vtiger_accountscf.accountid 
+				left join vtiger_account as vtiger_accountAccounts on vtiger_accountAccounts.accountid = vtiger_account.parentid
+				left join vtiger_users as vtiger_usersAccounts on vtiger_usersAccounts.id = vtiger_crmentityAccounts.smownerid
 				".$this->getRelatedModulesQuery($module,$this->secondarymodule)."
-				where crmentityAccounts.deleted=0 ";
+				where vtiger_crmentityAccounts.deleted=0 ";
 		}
 
 		if($module == "Contacts")
                 {
-			$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
-				left join account as accountContacts on accountContacts.accountid = contactdetails.accountid 
-				left join users as usersContacts on usersContacts.id = crmentityContacts.smownerid
+			$query = "from vtiger_contactdetails
+				inner join vtiger_crmentity as vtiger_crmentityContacts on vtiger_crmentityContacts.crmid = vtiger_contactdetails.contactid 
+				inner join vtiger_contactaddress on vtiger_contactdetails.contactid = vtiger_contactaddress.contactaddressid 
+				inner join vtiger_customerdetails on vtiger_customerdetails.customerid = vtiger_contactdetails.contactid
+				inner join vtiger_contactsubdetails on vtiger_contactdetails.contactid = vtiger_contactsubdetails.contactsubscriptionid 
+				inner join vtiger_contactscf on vtiger_contactdetails.contactid = vtiger_contactscf.contactid 
+				left join vtiger_contactdetails as vtiger_contactdetailsContacts on vtiger_contactdetailsContacts.contactid = vtiger_contactdetails.reportsto
+				left join vtiger_account as vtiger_accountContacts on vtiger_accountContacts.accountid = vtiger_contactdetails.accountid 
+				left join vtiger_users as vtiger_usersContacts on vtiger_usersContacts.id = vtiger_crmentityContacts.smownerid
 				".$this->getRelatedModulesQuery($module,$this->secondarymodule)." 
-				where crmentityContacts.deleted=0";
+				where vtiger_crmentityContacts.deleted=0";
 		}
 
 		if($module == "Potentials")
 		{
-			$query = "from potential 
-				inner join crmentity as crmentityPotentials on crmentityPotentials.crmid=potential.potentialid 
-				inner join account as accountPotentials on potential.accountid = accountPotentials.accountid 
-				inner join potentialscf on potentialscf.potentialid = potential.potentialid
-				left join users as usersPotentials on usersPotentials.id = crmentityPotentials.smownerid  
+			$query = "from vtiger_potential 
+				inner join vtiger_crmentity as vtiger_crmentityPotentials on vtiger_crmentityPotentials.crmid=vtiger_potential.potentialid 
+				inner join vtiger_account as vtiger_accountPotentials on vtiger_potential.accountid = vtiger_accountPotentials.accountid 
+				inner join vtiger_potentialscf on vtiger_potentialscf.potentialid = vtiger_potential.potentialid
+				left join vtiger_users as vtiger_usersPotentials on vtiger_usersPotentials.id = vtiger_crmentityPotentials.smownerid  
 				".$this->getRelatedModulesQuery($module,$this->secondarymodule)."
-				where crmentityPotentials.deleted=0 ";
+				where vtiger_crmentityPotentials.deleted=0 ";
 		}
 		
 		if($module == "Products")
 		{
-			$query = "from products 
-				inner join crmentity as crmentityProducts on crmentityProducts.crmid=products.productid 
-				left join productcf on products.productid = productcf.productid 
-				left join users as usersProducts on usersProducts.id = crmentityProducts.smownerid 
-				left join contactdetails as contactdetailsProducts on contactdetailsProducts.contactid = products.contactid
-				left join vendor as vendorRel on vendorRel.vendorid = products.vendor_id  
-				left join seproductsrel on seproductsrel.productid = products.productid 
-				left join crmentity as crmentityRelProducts on crmentityRelProducts.crmid = seproductsrel.crmid 
-				left join account as accountRelProducts on accountRelProducts.accountid=crmentityRelProducts.crmid 
-				left join leaddetails as leaddetailsRelProducts on leaddetailsRelProducts.leadid = crmentityRelProducts.crmid 
-				left join potential as potentialRelProducts on potentialRelProducts.potentialid = crmentityRelProducts.crmid 
+			$query = "from vtiger_products 
+				inner join vtiger_crmentity as vtiger_crmentityProducts on vtiger_crmentityProducts.crmid=vtiger_products.productid 
+				left join vtiger_productcf on vtiger_products.productid = vtiger_productcf.productid 
+				left join vtiger_users as vtiger_usersProducts on vtiger_usersProducts.id = vtiger_crmentityProducts.smownerid 
+				left join vtiger_contactdetails as vtiger_contactdetailsProducts on vtiger_contactdetailsProducts.contactid = vtiger_products.contactid
+				left join vtiger_vendor as vtiger_vendorRel on vtiger_vendorRel.vendorid = vtiger_products.vendor_id  
+				left join vtiger_seproductsrel on vtiger_seproductsrel.productid = vtiger_products.productid 
+				left join vtiger_crmentity as vtiger_crmentityRelProducts on vtiger_crmentityRelProducts.crmid = vtiger_seproductsrel.crmid 
+				left join vtiger_account as vtiger_accountRelProducts on vtiger_accountRelProducts.accountid=crmentityRelProducts.crmid 
+				left join vtiger_leaddetails as vtiger_leaddetailsRelProducts on vtiger_leaddetailsRelProducts.leadid = vtiger_crmentityRelProducts.crmid 
+				left join vtiger_potential as vtiger_potentialRelProducts on vtiger_potentialRelProducts.potentialid = vtiger_crmentityRelProducts.crmid 
 				".$this->getRelatedModulesQuery($module,$this->secondarymodule)."
-				where crmentityProducts.deleted=0 ";
+				where vtiger_crmentityProducts.deleted=0 ";
 		}
 
 		if($module == "HelpDesk")
 		{
-			$query = "from troubletickets 
-				inner join crmentity as crmentityHelpDesk 
-				on crmentityHelpDesk.crmid=troubletickets.ticketid 
-				inner join ticketcf on ticketcf.ticketid = troubletickets.ticketid
-        left join crmentity as crmentityRelHelpDesk on crmentityRelHelpDesk.crmid = troubletickets.parent_id
-				left join account as accountRelHelpDesk on accountRelHelpDesk.accountid=crmentityRelHelpDesk.crmid 
-				left join contactdetails as contactdetailsRelHelpDesk on contactdetailsRelHelpDesk.contactid= crmentityRelHelpDesk.crmid
-				left join products as productsRel on productsRel.productid = crmentityRelHelpDesk.crmid
-				left join users as usersHelpDesk on crmentityHelpDesk.smownerid=usersHelpDesk.id 
+			$query = "from vtiger_troubletickets 
+				inner join vtiger_crmentity as vtiger_crmentityHelpDesk 
+				on vtiger_crmentityHelpDesk.crmid=vtiger_troubletickets.ticketid 
+				inner join vtiger_ticketcf on vtiger_ticketcf.ticketid = vtiger_troubletickets.ticketid
+        left join vtiger_crmentity as vtiger_crmentityRelHelpDesk on vtiger_crmentityRelHelpDesk.crmid = vtiger_troubletickets.parent_id
+				left join vtiger_account as vtiger_accountRelHelpDesk on vtiger_accountRelHelpDesk.accountid=crmentityRelHelpDesk.crmid 
+				left join vtiger_contactdetails as vtiger_contactdetailsRelHelpDesk on vtiger_contactdetailsRelHelpDesk.contactid= vtiger_crmentityRelHelpDesk.crmid
+				left join vtiger_products as vtiger_productsRel on vtiger_productsRel.productid = vtiger_crmentityRelHelpDesk.crmid
+				left join vtiger_users as vtiger_usersHelpDesk on vtiger_crmentityHelpDesk.smownerid=usersHelpDesk.id 
 				".$this->getRelatedModulesQuery($module,$this->secondarymodule)."
-				where crmentityHelpDesk.deleted=0 ";
+				where vtiger_crmentityHelpDesk.deleted=0 ";
 		}
 
 		if($module == "Activities")
 		{
-			$query = "from activity 
-				inner join crmentity as crmentityActivities on crmentityActivities.crmid=activity.activityid 
-				left join cntactivityrel on cntactivityrel.activityid= activity.activityid 
-				left join contactdetails as contactdetailsActivities on contactdetailsActivities.contactid= cntactivityrel.contactid
-				left join users as usersActivities on usersActivities.id = crmentityActivities.smownerid
-				left join seactivityrel on seactivityrel.activityid = activity.activityid
-				left join crmentity as crmentityRelActivities on crmentityRelActivities.crmid = seactivityrel.crmid
-				left join account as accountRelActivities on accountRelActivities.accountid=crmentityRelActivities.crmid
-				left join leaddetails as leaddetailsRelActivities on leaddetailsRelActivities.leadid = crmentityRelActivities.crmid
-				left join potential as potentialRelActivities on potentialRelActivities.potentialid = crmentityRelActivities.crmid
-				left join quotes as quotesRelActivities on quotesRelActivities.quoteid = crmentityRelActivities.crmid
-				left join purchaseorder as purchaseorderRelActivities on purchaseorderRelActivities.purchaseorderid = crmentityRelActivities.crmid
-				left join invoice as invoiceRelActivities on invoiceRelActivities.invoiceid = crmentityRelActivities.crmid
+			$query = "from vtiger_activity 
+				inner join vtiger_crmentity as vtiger_crmentityActivities on vtiger_crmentityActivities.crmid=vtiger_activity.activityid 
+				left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid 
+				left join vtiger_contactdetails as vtiger_contactdetailsActivities on vtiger_contactdetailsActivities.contactid= vtiger_cntactivityrel.contactid
+				left join vtiger_users as vtiger_usersActivities on vtiger_usersActivities.id = vtiger_crmentityActivities.smownerid
+				left join vtiger_seactivityrel on vtiger_seactivityrel.activityid = vtiger_activity.activityid
+				left join vtiger_crmentity as vtiger_crmentityRelActivities on vtiger_crmentityRelActivities.crmid = vtiger_seactivityrel.crmid
+				left join vtiger_account as vtiger_accountRelActivities on vtiger_accountRelActivities.accountid=crmentityRelActivities.crmid
+				left join vtiger_leaddetails as vtiger_leaddetailsRelActivities on vtiger_leaddetailsRelActivities.leadid = vtiger_crmentityRelActivities.crmid
+				left join vtiger_potential as vtiger_potentialRelActivities on vtiger_potentialRelActivities.potentialid = vtiger_crmentityRelActivities.crmid
+				left join vtiger_quotes as vtiger_quotesRelActivities on vtiger_quotesRelActivities.quoteid = vtiger_crmentityRelActivities.crmid
+				left join vtiger_purchaseorder as vtiger_purchaseorderRelActivities on vtiger_purchaseorderRelActivities.purchaseorderid = vtiger_crmentityRelActivities.crmid
+				left join vtiger_invoice as vtiger_invoiceRelActivities on vtiger_invoiceRelActivities.invoiceid = vtiger_crmentityRelActivities.crmid
 				".$this->getRelatedModulesQuery($module,$this->secondarymodule)."
-				WHERE crmentityActivities.deleted=0 and (activity.activitytype = 'Meeting' or activity.activitytype='Call' or activity.activitytype='Task')";
+				WHERE vtiger_crmentityActivities.deleted=0 and (vtiger_activity.activitytype = 'Meeting' or vtiger_activity.activitytype='Call' or vtiger_activity.activitytype='Task')";
 		}
 		
 		if($module == "Quotes")
 		{
-			$query = "from quotes 
-				inner join crmentity as crmentityQuotes on crmentityQuotes.crmid=quotes.quoteid 
-				inner join quotesbillads on quotes.quoteid=quotesbillads.quotebilladdressid 
-				inner join quotesshipads on quotes.quoteid=quotesshipads.quoteshipaddressid 
-				left join users as usersQuotes on usersQuotes.id = crmentityQuotes.smownerid
-				left join users as usersRel1 on usersRel1.id = quotes.inventorymanager
-				left join potential as potentialRel on potentialRel.potentialid = quotes.potentialid
-				left join contactdetails as contactdetailsQuotes on contactdetailsQuotes.contactid = quotes.contactid
-				left join account as accountQuotes on accountQuotes.accountid = quotes.accountid
+			$query = "from vtiger_quotes 
+				inner join vtiger_crmentity as vtiger_crmentityQuotes on vtiger_crmentityQuotes.crmid=vtiger_quotes.quoteid 
+				inner join vtiger_quotesbillads on vtiger_quotes.quoteid=vtiger_quotesbillads.quotebilladdressid 
+				inner join vtiger_quotesshipads on vtiger_quotes.quoteid=vtiger_quotesshipads.quoteshipaddressid 
+				left join vtiger_users as vtiger_usersQuotes on vtiger_usersQuotes.id = vtiger_crmentityQuotes.smownerid
+				left join vtiger_users as vtiger_usersRel1 on vtiger_usersRel1.id = vtiger_quotes.inventorymanager
+				left join vtiger_potential as vtiger_potentialRel on vtiger_potentialRel.potentialid = vtiger_quotes.potentialid
+				left join vtiger_contactdetails as vtiger_contactdetailsQuotes on vtiger_contactdetailsQuotes.contactid = vtiger_quotes.contactid
+				left join vtiger_account as vtiger_accountQuotes on vtiger_accountQuotes.accountid = vtiger_quotes.accountid
 				".$this->getRelatedModulesQuery($module,$this->secondarymodule)."
-				where crmentityQuotes.deleted=0";
+				where vtiger_crmentityQuotes.deleted=0";
 		}
 		
 		if($module == "PurchaseOrder")
 		{
-			$query = "from purchaseorder 
-				inner join crmentity as crmentityPurchaseOrder on crmentityPurchaseOrder.crmid=purchaseorder.purchaseorderid 
-				inner join pobillads on purchaseorder.purchaseorderid=pobillads.pobilladdressid 
-				inner join poshipads on purchaseorder.purchaseorderid=poshipads.poshipaddressid 
-				left join users as usersPurchaseOrder on usersPurchaseOrder.id = crmentityPurchaseOrder.smownerid 
-				left join vendor as vendorRel on vendorRel.vendorid = purchaseorder.vendorid 
-				left join contactdetails as contactdetailsPurchaseOrder on contactdetailsPurchaseOrder.contactid = purchaseorder.contactid 
+			$query = "from vtiger_purchaseorder 
+				inner join vtiger_crmentity as vtiger_crmentityPurchaseOrder on vtiger_crmentityPurchaseOrder.crmid=vtiger_purchaseorder.purchaseorderid 
+				inner join vtiger_pobillads on vtiger_purchaseorder.purchaseorderid=vtiger_pobillads.pobilladdressid 
+				inner join vtiger_poshipads on vtiger_purchaseorder.purchaseorderid=vtiger_poshipads.poshipaddressid 
+				left join vtiger_users as vtiger_usersPurchaseOrder on vtiger_usersPurchaseOrder.id = vtiger_crmentityPurchaseOrder.smownerid 
+				left join vtiger_vendor as vtiger_vendorRel on vtiger_vendorRel.vendorid = vtiger_purchaseorder.vendorid 
+				left join vtiger_contactdetails as vtiger_contactdetailsPurchaseOrder on vtiger_contactdetailsPurchaseOrder.contactid = vtiger_purchaseorder.contactid 
 				".$this->getRelatedModulesQuery($module,$this->secondarymodule)."
-				where crmentityPurchaseOrder.deleted=0";
+				where vtiger_crmentityPurchaseOrder.deleted=0";
 		}
 
 		if($module == "Invoice")
 		{
-			$query = "from invoice 
-				inner join crmentity as crmentityInvoice on crmentityInvoice.crmid=invoice.invoiceid 
-				inner join invoicebillads on invoice.invoiceid=invoicebillads.invoicebilladdressid 
-				inner join invoiceshipads on invoice.invoiceid=invoiceshipads.invoiceshipaddressid 
-				left join users as usersInvoice on usersInvoice.id = crmentityInvoice.smownerid
-				left join account as accountInvoice on accountInvoice.accountid = invoice.accountid
+			$query = "from vtiger_invoice 
+				inner join vtiger_crmentity as vtiger_crmentityInvoice on vtiger_crmentityInvoice.crmid=vtiger_invoice.invoiceid 
+				inner join vtiger_invoicebillads on vtiger_invoice.invoiceid=vtiger_invoicebillads.invoicebilladdressid 
+				inner join vtiger_invoiceshipads on vtiger_invoice.invoiceid=vtiger_invoiceshipads.invoiceshipaddressid 
+				left join vtiger_users as vtiger_usersInvoice on vtiger_usersInvoice.id = vtiger_crmentityInvoice.smownerid
+				left join vtiger_account as vtiger_accountInvoice on vtiger_accountInvoice.accountid = vtiger_invoice.accountid
 				".$this->getRelatedModulesQuery($module,$this->secondarymodule)."
-				where crmentityInvoice.deleted=0";
+				where vtiger_crmentityInvoice.deleted=0";
 		}
 		$log->info("ReportRun :: Successfully returned getReportsQuery".$module);
 		return $query;
@@ -1407,9 +1407,9 @@
 		global $modules;
 		global $log;
 
-		$coltotalsql = "select reportsummary.* from report";
-        $coltotalsql .= " inner join reportsummary on report.reportid = reportsummary.reportsummaryid";
-        $coltotalsql .= " where report.reportid =".$reportid;
+		$coltotalsql = "select vtiger_reportsummary.* from vtiger_report";
+        $coltotalsql .= " inner join vtiger_reportsummary on vtiger_report.reportid = vtiger_reportsummary.reportsummaryid";
+        $coltotalsql .= " where vtiger_report.reportid =".$reportid;
 
         $result = $adb->query($coltotalsql);
 		
@@ -1449,9 +1449,9 @@
 		global $modules;
 		global $log;
 
-		$sreportstdfiltersql = "select reportsummary.* from report"; 
-		$sreportstdfiltersql .= " inner join reportsummary on report.reportid = reportsummary.reportsummaryid"; 
-		$sreportstdfiltersql .= " where report.reportid =".$reportid;
+		$sreportstdfiltersql = "select vtiger_reportsummary.* from vtiger_report"; 
+		$sreportstdfiltersql .= " inner join vtiger_reportsummary on vtiger_report.reportid = vtiger_reportsummary.reportsummaryid"; 
+		$sreportstdfiltersql .= " where vtiger_report.reportid =".$reportid;
 		
 		$result = $adb->query($sreportstdfiltersql);
 		$noofrows = $adb->num_rows($result);

Modified: vtigercrm/trunk/modules/Reports/Reports.php
==============================================================================
--- vtigercrm/trunk/modules/Reports/Reports.php (original)
+++ vtigercrm/trunk/modules/Reports/Reports.php Mon Jun 12 14:26:25 2006
@@ -63,7 +63,7 @@
 
 /**
  * This class has the informations for Reports and inherits class CRMEntity and
- * has the variables required to generate,save,restore reports
+ * has the variables required to generate,save,restore vtiger_reports
  * and also the required functions for the same
  * Contributor(s): ______________________________________..
  */
@@ -119,9 +119,9 @@
 				 "Invoice"=>Array("Information"=>69,"Address"=>71,"Description"=>74,"Custom Information"=>5)
 				);
 
-/** Function to set primodule,secmodule,reporttype,reportname,reportdescription,folderid for given reportid
- *  This function accepts the reportid as argument
- *  It sets primodule,secmodule,reporttype,reportname,reportdescription,folderid for the given reportid
+/** Function to set primodule,secmodule,reporttype,reportname,reportdescription,folderid for given vtiger_reportid
+ *  This function accepts the vtiger_reportid as argument
+ *  It sets primodule,secmodule,reporttype,reportname,reportdescription,folderid for the given vtiger_reportid
  */
 			
 	function Reports($reportid="")
@@ -130,8 +130,8 @@
 
 		if($reportid != "")
 		{
-			$ssql = "select reportmodules.*,report.* from report inner join reportmodules on report.reportid = reportmodules.reportmodulesid";
-			$ssql .= " where report.reportid =".$reportid;
+			$ssql = "select vtiger_reportmodules.*,vtiger_report.* from vtiger_report inner join vtiger_reportmodules on vtiger_report.reportid = vtiger_reportmodules.reportmodulesid";
+			$ssql .= " where vtiger_report.reportid =".$reportid;
 			$result = $adb->query($ssql);
 		        $reportmodulesrow = $adb->fetch_array($result);
 			if($reportmodulesrow)
@@ -159,7 +159,7 @@
 		global $adb;
 		global $log;
 		$returndata = Array();
-		$sql = "select * from reportfolder order by folderid";
+		$sql = "select * from vtiger_reportfolder order by folderid";
 		$result = $adb->query($sql);
 		$reportfldrow = $adb->fetch_array($result);
 		if($mode != '')
@@ -190,7 +190,7 @@
 			}while($reportfldrow = $adb->fetch_array($result));
 		}
 
-		$log->info("Reports :: ListView->Successfully returned report folder HTML");
+		$log->info("Reports :: ListView->Successfully returned vtiger_report folder HTML");
 		return $returndata;
 	}
 
@@ -210,8 +210,8 @@
 		
 		require_once('include/utils/UserInfoUtil.php');
 		
-		$sql = "select report.*, reportmodules.* from report inner join reportfolder on reportfolder.folderid = report.folderid";
-		$sql .= " inner join reportmodules on reportmodules.reportmodulesid = report.reportid where reportfolder.folderid=".$rpt_fldr_id;
+		$sql = "select vtiger_report.*, vtiger_reportmodules.* from vtiger_report inner join vtiger_reportfolder on vtiger_reportfolder.folderid = vtiger_report.folderid";
+		$sql .= " inner join vtiger_reportmodules on vtiger_reportmodules.reportmodulesid = vtiger_report.reportid where vtiger_reportfolder.folderid=".$rpt_fldr_id;
 		$result = $adb->query($sql);
 		$report = $adb->fetch_array($result);
 		if(count($report)>0)
@@ -231,7 +231,7 @@
 					  }while($report = $adb->fetch_array($result));
 		}
 	
-		$log->info("Reports :: ListView->Successfully returned report details HTML");
+		$log->info("Reports :: ListView->Successfully returned vtiger_report details HTML");
 		return $returndata;
 	}
 
@@ -249,9 +249,9 @@
 		return $srptfldr_js;
 	}
 
-/** Function to set the Primary module fields for the given Report 
+/** Function to set the Primary module vtiger_fields for the given Report 
  *  This function sets the primary module columns for the given Report 
- *  It accepts the Primary module as the argument and set the fields of the module
+ *  It accepts the Primary module as the argument and set the vtiger_fields of the module
  *  to the varialbe pri_module_columnslist and returns true if sucess
  */
 
@@ -267,7 +267,7 @@
 
 /** Function to set the Secondary module fileds for the given Report
  *  This function sets the secondary module columns for the given module
- *  It accepts the module as the argument and set the fields of the module
+ *  It accepts the module as the argument and set the vtiger_fields of the module
  *  to the varialbe sec_module_columnslist and returns true if sucess
  */
 	
@@ -288,11 +288,11 @@
             return true;
         }
 
-/** Function to get fields for the given module and block
- *  This function gets the fields for the given module
+/** Function to get vtiger_fields for the given module and block
+ *  This function gets the vtiger_fields for the given module
  *  It accepts the module and the block as arguments and 
  *  returns the array column lists
- *  Array module_columnlist[ fieldtablename:fieldcolname:module_fieldlabel1:fieldname:fieldtypeofdata]=fieldlabel
+ *  Array module_columnlist[ vtiger_fieldtablename:fieldcolname:module_fieldlabel1:fieldname:fieldtypeofdata]=fieldlabel
  */
 
 	function getColumnsListbyBlock($module,$block)
@@ -308,12 +308,12 @@
 	//Security Check 
 	if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] ==0)
 	{
-		$sql = "select * from field where field.uitype != 50 and field.tabid=".$tabid." and field.block in (".$block .") and field.displaytype in (1,2) order by sequence";
+		$sql = "select * from vtiger_field where vtiger_field.uitype != 50 and vtiger_field.tabid=".$tabid." and vtiger_field.block in (".$block .") and vtiger_field.displaytype in (1,2) order by sequence";
 	}
 	else
 	{
 			
-        	$sql = "select * from field inner join profile2field on profile2field.fieldid=field.fieldid inner join def_org_field on def_org_field.fieldid=field.fieldid where field.uitype != 50 and field.tabid=".$tabid." and field.block in (".$block .") and field.displaytype in (1,2) and profile2field.visible=0 and def_org_field.visible=0 and profile2field.profileid in ".$profileList." group by field.fieldid order by sequence";
+        	$sql = "select * from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.uitype != 50 and vtiger_field.tabid=".$tabid." and vtiger_field.block in (".$block .") and vtiger_field.displaytype in (1,2) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList." group by vtiger_field.fieldid order by sequence";
 	}
         $result = $adb->query($sql);
         $noofrows = $adb->num_rows($result);
@@ -375,8 +375,8 @@
 		return $module_columnlist;
 	}
 	
-/** Function to set the standard filter fields for the given report
- *  This function gets the standard filter fields for the given report
+/** Function to set the standard filter vtiger_fields for the given vtiger_report
+ *  This function gets the standard filter vtiger_fields for the given vtiger_report
  *  and set the values to the corresponding variables
  *  It accepts the repordid as argument 
  */
@@ -384,7 +384,7 @@
 	function getSelectedStandardCriteria($reportid)
 	{
 		global $adb;
-		$sSQL = "select reportdatefilter.* from reportdatefilter inner join report on report.reportid = reportdatefilter.datefilterid where report.reportid=".$reportid;
+		$sSQL = "select vtiger_reportdatefilter.* from vtiger_reportdatefilter inner join vtiger_report on vtiger_report.reportid = vtiger_reportdatefilter.datefilterid where vtiger_report.reportid=".$reportid;
 
 		$result = $adb->query($sSQL);
 		$selectedstdfilter = $adb->fetch_array($result);
@@ -406,7 +406,7 @@
 	}
 
 /** Function to get the combo values for the standard filter
- *  This function get the combo values for the standard filter for the given report
+ *  This function get the combo values for the standard filter for the given vtiger_report
  *  and return a HTML string 
  */
 
@@ -441,7 +441,7 @@
 
 /** Function to get the selected standard filter columns 
  *  This function returns the selected standard filter criteria 
- *  which is selected for reports as an array
+ *  which is selected for vtiger_reports as an array
  *  Array stdcriteria_list[fieldtablename:fieldcolname:module_fieldlabel1]=fieldlabel
  */
 
@@ -461,12 +461,12 @@
 
 		if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0)
                 {
-			$sql = "select * from field where field.tabid=".$tabid." and (field.uitype =5 or field.displaytype=2) and field.block in (".$blockids.") order by field.sequence";
+			$sql = "select * from vtiger_field where vtiger_field.tabid=".$tabid." and (vtiger_field.uitype =5 or vtiger_field.displaytype=2) and vtiger_field.block in (".$blockids.") order by vtiger_field.sequence";
 		}
 		else
 		{
 			$profileList = getCurrentUserProfileList();			
-			$sql = "select * from field inner join tab on tab.tabid = field.tabid 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 (field.uitype =5 or field.displaytype=2) and profile2field.visible=0 and def_org_field.visible=0 and field.block in (".$blockids.") and profile2field.profileid in ".$profileList." order by field.sequence";
+			$sql = "select * from vtiger_field inner join vtiger_tab on vtiger_tab.tabid = vtiger_field.tabid inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid  where vtiger_field.tabid=".$tabid." and (vtiger_field.uitype =5 or vtiger_field.displaytype=2) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_field.block in (".$blockids.") and vtiger_profile2field.profileid in ".$profileList." order by vtiger_field.sequence";
 	
 		}
 		
@@ -720,7 +720,7 @@
 
 /** Function to set the order of grouping and to find the columns responsible
  *  to the grouping
- *  This function accepts the reportid as variable,sets the variable ascdescorder[] to the sort order and
+ *  This function accepts the vtiger_reportid as variable,sets the variable ascdescorder[] to the sort order and
  *  returns the array array_list which has the column responsible for the grouping
  *  Array array_list[0]=columnname
  */
@@ -732,9 +732,9 @@
 		global $adb;
 		global $log;
 
-    	$sreportsortsql = "select reportsortcol.* from report";
-		$sreportsortsql .= " inner join reportsortcol on report.reportid = reportsortcol.reportid";
-		$sreportsortsql .= " where report.reportid =".$reportid." order by reportsortcol.sortcolid";
+    	$sreportsortsql = "select vtiger_reportsortcol.* from vtiger_report";
+		$sreportsortsql .= " inner join vtiger_reportsortcol on vtiger_report.reportid = vtiger_reportsortcol.reportid";
+		$sreportsortsql .= " where vtiger_report.reportid =".$reportid." order by vtiger_reportsortcol.sortcolid";
 
 		$result = $adb->query($sreportsortsql);
 		$noofrows = $adb->num_rows($result);
@@ -751,9 +751,9 @@
 		return $array_list;
 	}
 	
-/** Function to get the selected columns list for a selected report
- *  This function accepts the reportid as the argument and get the selected columns
- *  for the given reportid and it forms a combo lists and returns
+/** Function to get the selected columns list for a selected vtiger_report
+ *  This function accepts the vtiger_reportid as the argument and get the selected columns
+ *  for the given vtiger_reportid and it forms a combo lists and returns
  *  HTML of the combo values
  */
 
@@ -764,9 +764,9 @@
 	    global $modules;
 		global $log;
 
-		$ssql = "select selectcolumn.* from report inner join selectquery on selectquery.queryid = report.queryid";
-		$ssql .= " left join selectcolumn on selectcolumn.queryid = selectquery.queryid where report.reportid =".$reportid;
-		$ssql .= " order by selectcolumn.columnindex";
+		$ssql = "select vtiger_selectcolumn.* from vtiger_report inner join vtiger_selectquery on vtiger_selectquery.queryid = vtiger_report.queryid";
+		$ssql .= " left join vtiger_selectcolumn on vtiger_selectcolumn.queryid = vtiger_selectquery.queryid where vtiger_report.reportid =".$reportid;
+		$ssql .= " order by vtiger_selectcolumn.columnindex";
 
 		$result = $adb->query($ssql);
 		$noofrows = $adb->num_rows($result);
@@ -785,8 +785,8 @@
 		return $shtml;
 	}
 
-/** Function to Set the selected columns for the advanced filter for the report
- *  This function accepts the reportid as the argument and get the selected columns
+/** Function to Set the selected columns for the advanced filter for the vtiger_report
+ *  This function accepts the vtiger_reportid as the argument and get the selected columns
  *  in the advanced filter and sets the values
  *  $this->advft_column[] = The column name
  *  $this->advft_option[] = The filter option
@@ -800,8 +800,8 @@
 		global $adb;
 		global $modules;
 		global $log;
-		$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";
+		$ssql = 'select vtiger_relcriteria.* from vtiger_report inner join vtiger_relcriteria on vtiger_relcriteria.queryid = vtiger_report.queryid left join vtiger_selectquery on vtiger_relcriteria.queryid = vtiger_selectquery.queryid';
+		$ssql.= " where vtiger_report.reportid =".$reportid." order by vtiger_relcriteria.columnindex";
 
 		$result = $adb->query($ssql);
 
@@ -817,8 +817,8 @@
 	}
 	//<<<<<<<<advanced filter>>>>>>>>>>>>>>
 	
-/** Function to get the list of report folders when Save and run  the report
- *  This function gets the report folders from database and form
+/** Function to get the list of vtiger_report folders when Save and run  the vtiger_report
+ *  This function gets the vtiger_report folders from database and form
  *  a combo values of the folders and return 
  *  HTML of the combo values
  */
@@ -828,7 +828,7 @@
 		global $adb;
 		global $log;
 
-		$sql = "select * from reportfolder order by folderid";
+		$sql = "select * from vtiger_reportfolder order by folderid";
 		$result = $adb->query($sql);
 		$reportfldrow = $adb->fetch_array($result);
 		$x = 0;
@@ -841,10 +841,10 @@
 		return $shtml;
 	}
 
-/** Function to get the column to total fields in Reports 
- *  This function gets columns to total field 
- *  and generated the html for that fields
- *  It returns the HTML of the fields along with the check boxes
+/** Function to get the column to total vtiger_fields in Reports 
+ *  This function gets columns to total vtiger_field 
+ *  and generated the html for that vtiger_fields
+ *  It returns the HTML of the vtiger_fields along with the check boxes
  */
 
 	function sgetColumntoTotal($primarymodule,$secondarymodule)
@@ -862,10 +862,10 @@
 		return $options;
 	}
 	
-/** Function to get the selected columns of total fields in Reports
- *  This function gets selected columns of total field
- *  and generated the html for that fields
- *  It returns the HTML of the fields along with the check boxes
+/** Function to get the selected columns of total vtiger_fields in Reports
+ *  This function gets selected columns of total vtiger_field
+ *  and generated the html for that vtiger_fields
+ *  It returns the HTML of the vtiger_fields along with the check boxes
  */
 	
 	
@@ -876,7 +876,7 @@
 		$options = Array();
 		if($reportid != "")
 		{
-			$ssql = "select reportsummary.* from reportsummary inner join report on report.reportid = reportsummary.reportsummaryid where report.reportid=".$reportid;
+			$ssql = "select vtiger_reportsummary.* from vtiger_reportsummary inner join vtiger_report on vtiger_report.reportid = vtiger_reportsummary.reportsummaryid where vtiger_report.reportid=".$reportid;
 			$result = $adb->query($ssql);
 			if($result)
 			{
@@ -906,14 +906,14 @@
 
 /** Function to form the HTML for columns to total	
  *  This function formulates the HTML format of the
- *  fields along with four checkboxes
- *  It returns the HTML of the fields along with the check boxes
+ *  vtiger_fields along with four checkboxes
+ *  It returns the HTML of the vtiger_fields along with the check boxes
  */
 	
 	
 	function sgetColumnstoTotalHTML($module)
 	{
-		//retreive the tabid	
+		//retreive the vtiger_tabid	
 		global $adb;
 		global $log;
 		global $current_user;
@@ -922,12 +922,12 @@
 		$escapedchars = Array('_SUM','_AVG','_MIN','_MAX');
 		if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] ==0)
 		{
-			$ssql = "select * from field inner join tab on tab.tabid = field.tabid where field.uitype != 50 and field.tabid=".$tabid." and field.displaytype = 1 order by sequence";
+			$ssql = "select * from vtiger_field inner join vtiger_tab on vtiger_tab.tabid = vtiger_field.tabid where vtiger_field.uitype != 50 and vtiger_field.tabid=".$tabid." and vtiger_field.displaytype = 1 order by sequence";
 		}
 		else
 		{
 			$profileList = getCurrentUserProfileList();
-			$ssql = "select * from field inner join tab on tab.tabid = field.tabid inner join def_org_field on def_org_field.fieldid=field.fieldid inner join profile2field on profile2field.fieldid=field.fieldid  where field.uitype != 50 and field.tabid=".$tabid." and field.displaytype = 1 and def_org_field.visible=0 and profile2field.visible=0 and profile2field.profileid in ".$profileList." order by sequence";
+			$ssql = "select * from vtiger_field inner join vtiger_tab on vtiger_tab.tabid = vtiger_field.tabid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid  where vtiger_field.uitype != 50 and vtiger_field.tabid=".$tabid." and vtiger_field.displaytype = 1 and vtiger_def_org_field.visible=0 and vtiger_profile2field.visible=0 and vtiger_profile2field.profileid in ".$profileList." order by sequence";
 		}
 		$result = $adb->query($ssql);
 		$columntototalrow = $adb->fetch_array($result);
@@ -1009,8 +1009,8 @@
 	}
 }
 
-/** Function to get the primary module list in reports
- *  This function generates the list of primary modules in reports
+/** Function to get the primary module list in vtiger_reports
+ *  This function generates the list of primary modules in vtiger_reports
  *  and returns an array of permitted modules 
  */
 
@@ -1038,8 +1038,8 @@
 	}
 	return $modules;
 }
-/** Function to get the Related module list in reports
- *  This function generates the list of secondary modules in reports
+/** Function to get the Related module list in vtiger_reports
+ *  This function generates the list of secondary modules in vtiger_reports
  *  and returns the related module as an Array 
  */
 

Modified: vtigercrm/trunk/modules/Reports/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Reports/Save.php (original)
+++ vtigercrm/trunk/modules/Reports/Save.php Mon Jun 12 14:26:25 2006
@@ -94,83 +94,83 @@
 	$genQueryId = $adb->getUniqueID("selectquery");
 	if($genQueryId != "")
 	{
-		$iquerysql = "insert into selectquery (QUERYID,STARTINDEX,NUMOFOBJECTS) values (".$genQueryId.",0,0)";
+		$iquerysql = "insert into vtiger_selectquery (QUERYID,STARTINDEX,NUMOFOBJECTS) values (".$genQueryId.",0,0)";
 		$iquerysqlresult = $adb->query($iquerysql);
-		 $log->info("Reports :: Save->Successfully saved selectquery");
+		 $log->info("Reports :: Save->Successfully saved vtiger_selectquery");
 		if($iquerysqlresult!=false)
 		{
-			//<<<<step2 selectcolumn>>>>>>>>
+			//<<<<step2 vtiger_selectcolumn>>>>>>>>
 			if($selectedcolumnstring != "")
 			{
 				$selectedcolumns = explode(";",$selectedcolumnstring);
 				for($i=0 ;$i< count($selectedcolumns) -1 ;$i++)
 				{
-					$icolumnsql = "insert into selectcolumn (QUERYID,COLUMNINDEX,COLUMNNAME) values (".$genQueryId.",".$i.",'".$selectedcolumns[$i]."')";
+					$icolumnsql = "insert into vtiger_selectcolumn (QUERYID,COLUMNINDEX,COLUMNNAME) values (".$genQueryId.",".$i.",'".$selectedcolumns[$i]."')";
 					$icolumnsqlresult = $adb->query($icolumnsql);
 				}
 			}
-			$log->info("Reports :: Save->Successfully saved selectcolumn");
-			//<<<<step2 selectcolumn>>>>>>>>
+			$log->info("Reports :: Save->Successfully saved vtiger_selectcolumn");
+			//<<<<step2 vtiger_selectcolumn>>>>>>>>
 
 		       //$genReportMId = $adb->getUniqueID("reportmodules");
 
 		       if($genQueryId != "")
 		       {
-				$ireportsql = "insert into report (REPORTID,FOLDERID,REPORTNAME,DESCRIPTION,REPORTTYPE,QUERYID,STATE)";
+				$ireportsql = "insert into vtiger_report (REPORTID,FOLDERID,REPORTNAME,DESCRIPTION,REPORTTYPE,QUERYID,STATE)";
 				$ireportsql .= " values (".$genQueryId.",".$folderid.",'".$reportname."','".$reportdescription."','".$reporttype."',".$genQueryId.",'CUSTOM')";
 				$ireportresult = $adb->query($ireportsql);
-			       	$log->info("Reports :: Save->Successfully saved report");
+			       	$log->info("Reports :: Save->Successfully saved vtiger_report");
 				if($ireportresult!=false)
 				{
 					//<<<<reportmodules>>>>>>>
-					$ireportmodulesql = "insert into reportmodules (REPORTMODULESID,PRIMARYMODULE,SECONDARYMODULES) values (".$genQueryId.",'".$pmodule."','".$smodule."')";
+					$ireportmodulesql = "insert into vtiger_reportmodules (REPORTMODULESID,PRIMARYMODULE,SECONDARYMODULES) values (".$genQueryId.",'".$pmodule."','".$smodule."')";
 					$ireportmoduleresult = $adb->query($ireportmodulesql);
-					$log->info("Reports :: Save->Successfully saved reportmodules");
+					$log->info("Reports :: Save->Successfully saved vtiger_reportmodules");
 					//<<<<reportmodules>>>>>>>
 
-					//<<<<step3 reportsortcol>>>>>>>
+					//<<<<step3 vtiger_reportsortcol>>>>>>>
 					if($sort_by1 != "")
 					{
-						$sort_by1sql = "insert into reportsortcol (SORTCOLID,REPORTID,COLUMNNAME,SORTORDER) values (1,".$genQueryId.",'".$sort_by1."','".$sort_order1."')";
+						$sort_by1sql = "insert into vtiger_reportsortcol (SORTCOLID,REPORTID,COLUMNNAME,SORTORDER) values (1,".$genQueryId.",'".$sort_by1."','".$sort_order1."')";
 						$sort_by1result = $adb->query($sort_by1sql);
 					}
 					if($sort_by2 != "")
 					{
-						$sort_by2sql = "insert into reportsortcol (SORTCOLID,REPORTID,COLUMNNAME,SORTORDER) values (2,".$genQueryId.",'".$sort_by2."','".$sort_order2."')";
+						$sort_by2sql = "insert into vtiger_reportsortcol (SORTCOLID,REPORTID,COLUMNNAME,SORTORDER) values (2,".$genQueryId.",'".$sort_by2."','".$sort_order2."')";
 						$sort_by2result = $adb->query($sort_by2sql);
 					}
 					if($sort_by3 != "")
 					{
-						$sort_by3sql = "insert into reportsortcol (SORTCOLID,REPORTID,COLUMNNAME,SORTORDER) values (3,".$genQueryId.",'".$sort_by3."','".$sort_order3."')";
+						$sort_by3sql = "insert into vtiger_reportsortcol (SORTCOLID,REPORTID,COLUMNNAME,SORTORDER) values (3,".$genQueryId.",'".$sort_by3."','".$sort_order3."')";
 						$sort_by3result = $adb->query($sort_by3sql);
 					}
-					$log->info("Reports :: Save->Successfully saved reportsortcol");
-					//<<<<step3 reportsortcol>>>>>>>
+					$log->info("Reports :: Save->Successfully saved vtiger_reportsortcol");
+					//<<<<step3 vtiger_reportsortcol>>>>>>>
 
 					//<<<<step5 standarfilder>>>>>>>
-					$ireportmodulesql = "insert into reportdatefilter (DATEFILTERID,DATECOLUMNNAME,DATEFILTER,STARTDATE,ENDDATE) values (".$genQueryId.",'".$stdDateFilterField."','".$stdDateFilter."','".$startdate."','".$enddate."')";
+					$ireportmodulesql = "insert into vtiger_reportdatefilter (DATEFILTERID,DATECOLUMNNAME,DATEFILTER,STARTDATE,ENDDATE) values (".$genQueryId.",'".$stdDateFilterField."','".$stdDateFilter."','".$startdate."','".$enddate."')";
 					$ireportmoduleresult = $adb->query($ireportmodulesql);
-					$log->info("Reports :: Save->Successfully saved reportdatefilter");
+					$log->info("Reports :: Save->Successfully saved vtiger_reportdatefilter");
 					//<<<<step5 standarfilder>>>>>>>
 
 					//<<<<step4 columnstototal>>>>>>>
 					for ($i=0;$i<count($columnstototal);$i++)
 					{
-						$ireportsummarysql = "insert into reportsummary (REPORTSUMMARYID,SUMMARYTYPE,COLUMNNAME) values (".$genQueryId.",".$i.",'".$columnstototal[$i]."')";
+						$ireportsummarysql = "insert into vtiger_reportsummary (REPORTSUMMARYID,SUMMARYTYPE,COLUMNNAME) values (".$genQueryId.",".$i.",'".$columnstototal[$i]."')";
 						$ireportsummaryresult = $adb->query($ireportsummarysql);
 					}
-					$log->info("Reports :: Save->Successfully saved reportsummary");
+					$log->info("Reports :: Save->Successfully saved vtiger_reportsummary");
 					//<<<<step4 columnstototal>>>>>>>
 
 					//<<<<step5 advancedfilter>>>>>>>
                                         for ($i=0;$i<count($adv_filter_col);$i++)
                                         {
-                                                $irelcriteriasql = "insert into relcriteria(QUERYID,COLUMNINDEX,COLUMNNAME,COMPARATOR,VALUE) values (".$genQueryId.",".$i.",'".$adv_filter_col[$i]."','".$adv_filter_option[$i]."','".$adv_filter_value[$i]."')";
+                                                $irelcriteriasql = "insert into vtiger_relcriteria(QUERYID,COLUMNINDEX,COLUMNNAME,COMPARATOR,VALUE) values (".$genQueryId.",".$i.",'".$adv_filter_col[$i]."','".$adv_filter_option[$i]."','".$adv_filter_value[$i]."')";
 						//echo $irelcriteriasql;
 
                                                 $irelcriteriaresult = $adb->query($irelcriteriasql);
                                         }
-					$log->info("Reports :: Save->Successfully saved relcriteria");
+					$log->info("Reports :: Save->Successfully saved vtiger_relcriteria");
                                         //<<<<step5 advancedfilter>>>>>>>
 
 				}else
@@ -198,7 +198,7 @@
 	{
 		if($selectedcolumnstring != "")
 		{
-			$idelcolumnsql = "delete from selectcolumn where queryid=".$reportid;
+			$idelcolumnsql = "delete from vtiger_selectcolumn where queryid=".$reportid;
 			$idelcolumnsqlresult = $adb->query($idelcolumnsql);
 			//echo $idelcolumnsql;
 			if($idelcolumnsqlresult != false)
@@ -206,83 +206,83 @@
 				$selectedcolumns = explode(";",$selectedcolumnstring);
 				for($i=0 ;$i< count($selectedcolumns) -1 ;$i++)
 				{
-					$icolumnsql = "insert into selectcolumn (QUERYID,COLUMNINDEX,COLUMNNAME) values (".$reportid.",".$i.",'".$selectedcolumns[$i]."')";
+					$icolumnsql = "insert into vtiger_selectcolumn (QUERYID,COLUMNINDEX,COLUMNNAME) values (".$reportid.",".$i.",'".$selectedcolumns[$i]."')";
 					$icolumnsqlresult = $adb->query($icolumnsql);
 					//echo $icolumnsql;
 				}
 			}
 		}
 
-		$ireportsql = "update report set";
+		$ireportsql = "update vtiger_report set";
 		$ireportsql .= " REPORTNAME='".$reportname."',";
 		$ireportsql .= " DESCRIPTION='".$reportdescription."',";
 		$ireportsql .= " REPORTTYPE='".$reporttype."'";
 		$ireportsql .= " where REPORTID=".$reportid;
 		$ireportresult = $adb->query($ireportsql);
-		$log->info("Reports :: Save->Successfully saved report");
+		$log->info("Reports :: Save->Successfully saved vtiger_report");
 		//echo $ireportsql;
 
-		$idelreportsortcolsql = "delete from reportsortcol where reportid=".$reportid;
+		$idelreportsortcolsql = "delete from vtiger_reportsortcol where vtiger_reportid=".$reportid;
 		$idelreportsortcolsqlresult = $adb->query($idelreportsortcolsql);
-		$log->info("Reports :: Save->Successfully deleted reportsortcol");
+		$log->info("Reports :: Save->Successfully deleted vtiger_reportsortcol");
 		//echo $idelreportsortcolsql;
 
 		if($idelreportsortcolsqlresult!=false)
 		{
-			//<<<<step3 reportsortcol>>>>>>>
+			//<<<<step3 vtiger_reportsortcol>>>>>>>
 			if($sort_by1 != "")
 			{
-				$sort_by1sql = "insert into reportsortcol (SORTCOLID,REPORTID,COLUMNNAME,SORTORDER) values (1,".$reportid.",'".$sort_by1."','".$sort_order1."')";
+				$sort_by1sql = "insert into vtiger_reportsortcol (SORTCOLID,REPORTID,COLUMNNAME,SORTORDER) values (1,".$reportid.",'".$sort_by1."','".$sort_order1."')";
 				$sort_by1result = $adb->query($sort_by1sql);
 				//echo $sort_by1sql;
 			}
 			if($sort_by2 != "")
 			{
-				$sort_by2sql = "insert into reportsortcol (SORTCOLID,REPORTID,COLUMNNAME,SORTORDER) values (2,".$reportid.",'".$sort_by2."','".$sort_order2."')";
+				$sort_by2sql = "insert into vtiger_reportsortcol (SORTCOLID,REPORTID,COLUMNNAME,SORTORDER) values (2,".$reportid.",'".$sort_by2."','".$sort_order2."')";
 				$sort_by2result = $adb->query($sort_by2sql);
 			}
 			if($sort_by3 != "")
 			{
-				$sort_by3sql = "insert into reportsortcol (SORTCOLID,REPORTID,COLUMNNAME,SORTORDER) values (3,".$reportid.",'".$sort_by3."','".$sort_order3."')";
+				$sort_by3sql = "insert into vtiger_reportsortcol (SORTCOLID,REPORTID,COLUMNNAME,SORTORDER) values (3,".$reportid.",'".$sort_by3."','".$sort_order3."')";
 				$sort_by3result = $adb->query($sort_by3sql);
 			}
-			$log->info("Reports :: Save->Successfully saved reportsortcol");
-			//<<<<step3 reportsortcol>>>>>>>
-
-			$idelreportdatefiltersql = "delete from reportdatefilter where datefilterid=".$reportid;
+			$log->info("Reports :: Save->Successfully saved vtiger_reportsortcol");
+			//<<<<step3 vtiger_reportsortcol>>>>>>>
+
+			$idelreportdatefiltersql = "delete from vtiger_reportdatefilter where datefilterid=".$reportid;
 			$idelreportdatefiltersqlresult = $adb->query($idelreportdatefiltersql);
 			//echo $idelreportsortcolsql;
 
 			//<<<<step5 standarfilder>>>>>>>
-			$ireportmodulesql = "insert into reportdatefilter (DATEFILTERID,DATECOLUMNNAME,DATEFILTER,STARTDATE,ENDDATE) values (".$reportid.",'".$stdDateFilterField."','".$stdDateFilter."','".$startdate."','".$enddate."')";
+			$ireportmodulesql = "insert into vtiger_reportdatefilter (DATEFILTERID,DATECOLUMNNAME,DATEFILTER,STARTDATE,ENDDATE) values (".$reportid.",'".$stdDateFilterField."','".$stdDateFilter."','".$startdate."','".$enddate."')";
 			$ireportmoduleresult = $adb->query($ireportmodulesql);
-			$log->info("Reports :: Save->Successfully saved reportdatefilter");
+			$log->info("Reports :: Save->Successfully saved vtiger_reportdatefilter");
 			//<<<<step5 standarfilder>>>>>>>
 
 			//<<<<step4 columnstototal>>>>>>>
-			$idelreportsummarysql = "delete from reportsummary where reportsummaryid=".$reportid;
+			$idelreportsummarysql = "delete from vtiger_reportsummary where vtiger_reportsummaryid=".$reportid;
 			$idelreportsummarysqlresult = $adb->query($idelreportsummarysql);
 
 			for ($i=0;$i<count($columnstototal);$i++)
 			{
-				$ireportsummarysql = "insert into reportsummary (REPORTSUMMARYID,SUMMARYTYPE,COLUMNNAME) values (".$reportid.",".$i.",'".$columnstototal[$i]."')";
+				$ireportsummarysql = "insert into vtiger_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 vtiger_reportsummary");
 			//<<<<step4 columnstototal>>>>>>>
 
 
 			//<<<<step5 advancedfilter>>>>>>>
 
-			$idelrelcriteriasql = "delete from relcriteria where queryid=".$reportid;
+			$idelrelcriteriasql = "delete from vtiger_relcriteria where queryid=".$reportid;
 			$idelrelcriteriasqlresult = $adb->query($idelrelcriteriasql);
 
 			for ($i=0;$i<count($adv_filter_col);$i++)
 			{
-				$irelcriteriasql = "insert into relcriteria(QUERYID,COLUMNINDEX,COLUMNNAME,COMPARATOR,VALUE) values (".$reportid.",".$i.",'".$adv_filter_col[$i]."','".$adv_filter_option[$i]."','".$adv_filter_value[$i]."')";
+				$irelcriteriasql = "insert into vtiger_relcriteria(QUERYID,COLUMNINDEX,COLUMNNAME,COMPARATOR,VALUE) values (".$reportid.",".$i.",'".$adv_filter_col[$i]."','".$adv_filter_option[$i]."','".$adv_filter_value[$i]."')";
 				$irelcriteriaresult = $adb->query($irelcriteriasql);
 			}
-			$log->info("Reports :: Save->Successfully saved relcriteria");
+			$log->info("Reports :: Save->Successfully saved vtiger_relcriteria");
 			//<<<<step5 advancedfilter>>>>>>>
 
 		}else

Modified: vtigercrm/trunk/modules/Reports/SaveAndRun.php
==============================================================================
--- vtigercrm/trunk/modules/Reports/SaveAndRun.php (original)
+++ vtigercrm/trunk/modules/Reports/SaveAndRun.php Mon Jun 12 14:26:25 2006
@@ -48,7 +48,7 @@
 
 	$list_report_form = new vtigerCRM_Smarty;
 	$ogReport->getSelectedStandardCriteria($reportid);
-	//commented to omit dashboards for reports
+	//commented to omit dashboards for vtiger_reports
 	//require_once('modules/Dashboard/ReportsCharts.php');
 	//$image = get_graph_by_type('Report','Report',$primarymodule,'',$sshtml[2]);
 	//$list_report_form->assign("GRAPH", $image);
@@ -176,7 +176,7 @@
 function getReportsinFolder($folderid)
 {
 	global $adb;
-	$query = 'select reportid,reportname from report where folderid='.$folderid;
+	$query = 'select vtiger_reportid,reportname from vtiger_report where folderid='.$folderid;
 	$result = $adb->query($query);
 	$reports_array = Array();
 	for($i=0;$i < $adb->num_rows($result);$i++)	

Modified: vtigercrm/trunk/modules/Reports/SaveReportFolder.php
==============================================================================
--- vtigercrm/trunk/modules/Reports/SaveReportFolder.php (original)
+++ vtigercrm/trunk/modules/Reports/SaveReportFolder.php Mon Jun 12 14:26:25 2006
@@ -27,7 +27,7 @@
 {
 	if($rfid=="")
 	{
-		$sql = "INSERT INTO reportfolder ";
+		$sql = "INSERT INTO vtiger_reportfolder ";
 		$sql .= "(FOLDERID,FOLDERNAME,DESCRIPTION,STATE) ";
 		$sql .= "VALUES ('','".$foldername."','".$folderdesc."','CUSTOMIZED')";
 		$result = $adb->query($sql);
@@ -47,7 +47,7 @@
 {
 	if($rfid != "")
 	{
-		$sql = "update reportfolder set ";
+		$sql = "update vtiger_reportfolder set ";
 		$sql .= "FOLDERNAME='".$foldername."', ";
 		$sql .= "DESCRIPTION='".$folderdesc."' ";
 		$sql .= "where folderid=".$rfid;

Modified: vtigercrm/trunk/modules/Reports/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Reports/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Reports/language/en_us.lang.php Mon Jun 12 14:26:25 2006
@@ -36,7 +36,7 @@
 'LBL_NEW_REP0_HDR3'=>'Note:',
 'LBL_NEW_REP0_HDR4'=>'Report Module and related module once selected cannot be modified later',
 'LBL_CONTINUE_BUTTON'=>'Continue',
-'LBL_NEW_REP1_HDR1'=>'Provide the following report information',
+'LBL_NEW_REP1_HDR1'=>'Provide the following vtiger_report information',
 'LBL_REPORT_TYPE'=>'Report Type',
 'LBL_SELECT_COLUMNS'=>'Select Columns',
 'LBL_SPECIFY_GROUPING'=>'Specify Grouping',
@@ -44,9 +44,9 @@
 'LBL_SPECIFY_CRITERIA'=>'Specify Criteria',
 'LBL_SAVERUN_BUTTON'=>'Save And Run',
 'LBL_TABULAT_REPORT'=>'Tabular Report',
-'LBL_REPORT_TYPE_HDR1'=>'Tabular reports are the simplest and fastest way to get a listing of your data.',
+'LBL_REPORT_TYPE_HDR1'=>'Tabular vtiger_reports are the simplest and fastest way to get a listing of your data.',
 'LBL_SUMMARY_REPORT'=>'Summary Report',
-'LBL_REPORT_TYPE_HDR2'=>'Summary reports allow you to view your data along with subtotals and other summary information.',
+'LBL_REPORT_TYPE_HDR2'=>'Summary vtiger_reports allow you to view your data along with subtotals and other summary information.',
 'LBL_AVAILABLE_COLUMNS'=>'Available Columns:',
 'LBL_SELECTED_COLUMNS'=>'Selected Columns:',
 'LBL_ADD_BUTTON'=>'Add',
@@ -79,15 +79,15 @@
 'LBL_EXPORTXL_BUTTON'=>'Export To Excel',
 
 //Added for 5 Beta
-'LBL_NO_PERMISSION'=>'Your profile dosen\'t allow you view the reports for one of the  module(s)',
-'LBL_SELECT_COLUMNS_TO_GENERATE_REPORTS'=>'Select columns to generate reports',
+'LBL_NO_PERMISSION'=>'Your vtiger_profile dosen\'t allow you view the vtiger_reports for one of the  module(s)',
+'LBL_SELECT_COLUMNS_TO_GENERATE_REPORTS'=>'Select columns to generate vtiger_reports',
 'LBL_AVAILABLE_FIELDS'=>'Available Fields',
 'LBL_SELECTED_FIELDS'=>'Selected Fields',
 'LBL_CALCULATIONS'=>'Calculations',
 'LBL_SELECT_COLUMNS_TO_TOTAL'=>'Select columns to Total',
 'LBL_SELECT_FILTERS_TO_STREAMLINE_REPORT_DATA'=>'Select Filters to Streamline Report Data',
 'LBL_SELECT_FILTERS'=>'Filters',
-'LBL_SELECT_COLUMNS_TO_GROUP_REPORTS'=>'Select columns to group reports',
+'LBL_SELECT_COLUMNS_TO_GROUP_REPORTS'=>'Select columns to group vtiger_reports',
 'LBL_BACK_TO_REPORTS'=>'Back to Reports',
 'LBL_SELECT_ANOTHER_REPORT'=>'Select Another Report',
 'LBL_SELECT_COLUMN'=>'Select Column',
@@ -101,7 +101,7 @@
 'LBL_REPORT_TYPE'=>'Report Type',
 'LBL_REPORT_DETAILS'=>'Report Details',
 'LBL_TYPE_THE_NAME'=>'Type the Name',
-'LBL_DESCRIPTION_FOR_REPORT'=>'Description for the report',
+'LBL_DESCRIPTION_FOR_REPORT'=>'Description for the vtiger_report',
 'LBL_REPORT_NAME'=>'Report Name',
 'LBL_DESCRIPTION'=>'Description',
 'LBL_TOOLS'=>'Tools',
@@ -112,7 +112,7 @@
 'LBL_SELECT_REPORT_TYPE_BELOW'=>'Select Report type Below',
 'LBL_TABULAR_FORMAT'=>'Tabular Format',
 'LBL_TABULAR_REPORTS_ARE_SIMPLEST'=>'Tabular Reports are the simplest and fastest way of getting your data',
-'LBL_SUMMARY_REPORT_VIEW_DATA_WITH_SUBTOTALS'=>'Summary reports allow you to view your data along with subtotals and other summary information',
+'LBL_SUMMARY_REPORT_VIEW_DATA_WITH_SUBTOTALS'=>'Summary vtiger_reports allow you to view your data along with subtotals and other summary information',
 'LBL_FILTERS'=>'Filters',
 
 )

Modified: vtigercrm/trunk/modules/Rss/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Rss/ListView.php (original)
+++ vtigercrm/trunk/modules/Rss/ListView.php Mon Jun 12 14:26:25 2006
@@ -70,7 +70,7 @@
 {
 	$rss_form->assign("TITLE",gerRssTitle());
 	$rss_html = $oRss->getStarredRssHTML();
-	$query = "select rssid from rss where starred=1";
+	$query = "select rssid from vtiger_rss where starred=1";
 	$result = $adb->query($query);
 	$recordid = $adb->query_result($result,0,'rssid');
 	$rss_form->assign("ID",$recordid);

Modified: vtigercrm/trunk/modules/Rss/Popup.php
==============================================================================
--- vtigercrm/trunk/modules/Rss/Popup.php (original)
+++ vtigercrm/trunk/modules/Rss/Popup.php Mon Jun 12 14:26:25 2006
@@ -19,9 +19,9 @@
 if(isset($_REQUEST["record"]))
 {
 	global $adb;
-	$query = 'update rss set starred=0';
+	$query = 'update vtiger_rss set starred=0';
 	$adb->query($query);
-	$query = 'update rss set starred=1 where rssid ='.$_REQUEST["record"]; 
+	$query = 'update vtiger_rss set starred=1 where vtiger_rssid ='.$_REQUEST["record"]; 
 	$adb->query($query);
 	echo $_REQUEST["record"];
 }

Modified: vtigercrm/trunk/modules/Rss/Rss.php
==============================================================================
--- vtigercrm/trunk/modules/Rss/Rss.php (original)
+++ vtigercrm/trunk/modules/Rss/Rss.php Mon Jun 12 14:26:25 2006
@@ -112,7 +112,7 @@
 				$rsstitle = $url;
 			}
 			$genRssId = $adb->getUniqueID("rss");
-			$sSQL = "insert into rss (RSSID,RSSURL,RSSTITLE,RSSTYPE,STARRED) values (".$genRssId.",'".addslashes($url);
+			$sSQL = "insert into vtiger_rss (RSSID,RSSURL,RSSTITLE,RSSTYPE,STARRED) values (".$genRssId.",'".addslashes($url);
 			$sSQL .= "','".addslashes($rsstitle)."',0,".$makestarred.")";
 			$result = $adb->query($sSQL);
 			if($result)
@@ -129,7 +129,7 @@
 		global $adb;
 		global $image_path;
 
-		$sSQL = "select * from rss where rsstype=1";
+		$sSQL = "select * from vtiger_rss where rsstype=1";
 		$result = $adb->query($sSQL);
 		while($allrssrow = $adb->fetch_array($result))
 		{
@@ -157,7 +157,7 @@
 		global $adb;
 		global $image_path;
 
-		$sSQL = "select * from rss where rsstype <> 1";
+		$sSQL = "select * from vtiger_rss where rsstype <> 1";
 		$result = $adb->query($sSQL);
 		while($allrssrow = $adb->fetch_array($result))	
 		{
@@ -179,8 +179,8 @@
 		return $shtml;
 	}
 
-	/** Function to get the rssurl for the given id  
-	  * This Function accepts the rssid as argument and returns the rssurl for that id
+	/** Function to get the vtiger_rssurl for the given id  
+	  * This Function accepts the vtiger_rssid as argument and returns the vtiger_rssurl for that id
 	 */
 	function getRssUrlfromId($rssid)
 	{
@@ -188,7 +188,7 @@
 
 		if($rssid != "")
 		{
-			$sSQL = "select * from rss where rssid=".$rssid;
+			$sSQL = "select * from vtiger_rss where rssid=".$rssid;
 			$result = $adb->query($sSQL);
 			$rssrow = $adb->fetch_array($result);
 
@@ -207,7 +207,7 @@
 
 		if($rssid != "")
 		{
-			$sSQL = "select * from rss where rssid=".$rssid;
+			$sSQL = "select * from vtiger_rss where rssid=".$rssid;
 			$result = $adb->query($sSQL);
 			$rssrow = $adb->fetch_array($result);
 
@@ -238,7 +238,7 @@
 		global $adb;
 		global $image_path;
 
-		$sSQL = "select * from rss where starred=1";
+		$sSQL = "select * from vtiger_rss where starred=1";
 		$result = $adb->query($sSQL);
 		$shtml .= "<img src=\"".$image_path."rss.gif\" border=\"0\" align=\"absmiddle\" hspace=\"2\"><a href=\"#\" onclick='window.open(\"index.php?module=Rss&action=Popup\",\"new\",\"width=500,height=300,resizable=1,scrollbars=1\");'>Add New Rss</a>";
 
@@ -250,8 +250,8 @@
 		return $shtml;
 	}
 	
-	/** Function to get the rssfeed lists for the starred Rss feeds  
-	  * This Function accepts no argument and returns the rss feeds of 
+	/** Function to get the vtiger_rssfeed lists for the starred Rss feeds  
+	  * This Function accepts no argument and returns the vtiger_rss feeds of 
 	  * the starred Feeds as HTML strings
 	 */
 	function getStarredRssHTML()
@@ -259,7 +259,7 @@
 		global $adb;
 		global $image_path,$mod_strings;
 
-		$sSQL = "select * from rss where starred=1";
+		$sSQL = "select * from vtiger_rss where starred=1";
 		$result = $adb->query($sSQL);
 		while($allrssrow = $adb->fetch_array($result))
 		{
@@ -298,15 +298,15 @@
 
 	}
 
-	/** Function to get the rssfeed lists for the given rssid  
-	  * This Function accepts the rssid as argument and returns the rss feeds as HTML strings
+	/** Function to get the vtiger_rssfeed lists for the given vtiger_rssid  
+	  * This Function accepts the vtiger_rssid as argument and returns the vtiger_rss feeds as HTML strings
 	 */
 	function getSelectedRssHTML($rssid)
 	{
 		global $adb;
 		global $image_path, $mod_strings;
 
-		$sSQL = "select * from rss where rssid=".$rssid;
+		$sSQL = "select * from vtiger_rss where rssid=".$rssid;
 		$result = $adb->query($sSQL);
 		while($allrssrow = $adb->fetch_array($result))
 		{
@@ -372,7 +372,7 @@
 		global $adb;
 		global $image_path;
 
-		$sSQL = "select * from rss";
+		$sSQL = "select * from vtiger_rss";
 		$result = $adb->query($sSQL);
 		while($allrssrow = $adb->fetch_array($result))
 		{
@@ -393,7 +393,7 @@
 
 	}
 
-	/** Function to get the rsscategories   
+	/** Function to get the vtiger_rsscategories   
 	* This Function accepts no argument and returns the categorylist as an array
 	*/
 
@@ -401,7 +401,7 @@
 	{
 		global $adb;
 		global $image_path;
-		$sSQL = "select * from rsscategory where presence = 1 order by sortorderid";
+		$sSQL = "select * from vtiger_rsscategory where presence = 1 order by sortorderid";
 		$result = $adb->query($sSQL);
 
 		while($categoryrow = $adb->fetch_array($result))
@@ -426,17 +426,17 @@
 	}
 }
 
-/** Function to get the rsstitle for the given rssid  
- * This Function accepts the rssid as an optional argument and returns the title
- * if no id is passed it will return the tittle of the starred rss
+/** Function to get the vtiger_rsstitle for the given vtiger_rssid  
+ * This Function accepts the vtiger_rssid as an optional argument and returns the title
+ * if no id is passed it will return the tittle of the starred vtiger_rss
  */
 function gerRssTitle($id='')
 {
 	global $adb;
 	if($id == '')
-		$query = 'select * from rss where starred=1';	 
+		$query = 'select * from vtiger_rss where starred=1';	 
 	else		
-		$query = 'select * from rss where rssid ='.$id;	 
+		$query = 'select * from vtiger_rss where rssid ='.$id;	 
 	$result = $adb->query($query);	
 	$title = $adb->query_result($result,0,'rsstitle');
 	return $title;

Modified: vtigercrm/trunk/modules/Rss/Star.php
==============================================================================
--- vtigercrm/trunk/modules/Rss/Star.php (original)
+++ vtigercrm/trunk/modules/Rss/Star.php Mon Jun 12 14:26:25 2006
@@ -18,7 +18,7 @@
 	if(!isset($_REQUEST[starred])) $starred = 0;
 	$starred = $_REQUEST[starred];
 	
-	$sSQL = "update rss set starred=".$starred." where rssid=".$recordid;
+	$sSQL = "update vtiger_rss set starred=".$starred." where vtiger_rssid=".$recordid;
 	$result = $adb->query($sSQL);
 }
 header("Location: index.php?module=Rss&action=index");

Modified: vtigercrm/trunk/modules/SalesOrder/CreateSOPDF.php
==============================================================================
--- vtigercrm/trunk/modules/SalesOrder/CreateSOPDF.php (original)
+++ vtigercrm/trunk/modules/SalesOrder/CreateSOPDF.php Mon Jun 12 14:26:25 2006
@@ -16,7 +16,7 @@
 
 global $adb,$app_strings,$products_per_page;
 
-$sql="select currency_symbol from currency_info";
+$sql="select vtiger_currency_symbol from vtiger_currency_info";
 $result = $adb->query($sql);
 $currency_symbol = $adb->query_result($result,0,'currency_symbol');
 
@@ -25,7 +25,7 @@
 $products_per_page="6";
 
 $id = $_REQUEST['record'];
-//retreiving the invoice info
+//retreiving the vtiger_invoice info
 $focus = new SalesOrder();
 $focus->retrieve_entity_info($_REQUEST['record'],"SalesOrder");
 $account_name = getAccountName($focus->column_fields[account_id]);
@@ -59,7 +59,7 @@
 $status = $focus->column_fields["sostatus"];
 
 // Company information
-$add_query = "select * from organizationdetails";
+$add_query = "select * from vtiger_organizationdetails";
 $result = $adb->query($add_query);
 $num_rows = $adb->num_rows($result);
 
@@ -85,7 +85,7 @@
 $price_total = $currency_symbol.number_format(StripLastZero($focus->column_fields["hdnGrandTotal"]),2,'.',',');
 
 //getting the Product Data
-$query="select products.productname,products.unit_price,products.product_description,soproductrel.* from soproductrel inner join products on products.productid=soproductrel.productid where salesorderid=".$id;
+$query="select vtiger_products.productname,vtiger_products.unit_price,vtiger_products.product_description,vtiger_soproductrel.* from vtiger_soproductrel inner join vtiger_products on vtiger_products.productid=vtiger_soproductrel.productid where vtiger_salesorderid=".$id;
 
 global $result;
 $result = $adb->query($query);

Modified: vtigercrm/trunk/modules/SalesOrder/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/SalesOrder/EditView.php (original)
+++ vtigercrm/trunk/modules/SalesOrder/EditView.php Mon Jun 12 14:26:25 2006
@@ -48,7 +48,7 @@
 	$focus = getConvertQuoteToSoObject($focus,$quote_focus,$quoteid);
 	$focus->id = $quoteid;
 
-	//Added to display the Quotes's associated products -- when we create SO from Quotes DetailView 
+	//Added to display the Quotes's associated vtiger_products -- when we create SO from Quotes DetailView 
 	$associated_prod = getAssociatedProducts("Quotes",$quote_focus);
 	$smarty->assign("ASSOCIATEDPRODUCTS", $associated_prod);
 	$smarty->assign("MODE", $quote_focus->mode);
@@ -72,7 +72,7 @@
         	}
 
 	}
-	//Handling for dateformat in due_date field
+	//Handling for dateformat in due_date vtiger_field
 	if($focus->column_fields['duedate'] != '')
 	{
 		$curr_due_date = $focus->column_fields['duedate'];
@@ -111,7 +111,7 @@
         		}
 
 		}
-		//Handling for dateformat in due_date field
+		//Handling for dateformat in due_date vtiger_field
 		if($focus->column_fields['duedate'] != '')
 		{
 			$curr_due_date = $focus->column_fields['duedate'];
@@ -123,7 +123,7 @@
 		$quote_focus->retrieve_entity_info($quoteid,"Quotes");
 		$focus = getConvertQuoteToSoObject($focus,$quote_focus,$quoteid);
 
-		//Added to display the Quotes's associated products -- when we select Quote in New SO page
+		//Added to display the Quotes's associated vtiger_products -- when we select Quote in New SO page
 		if(isset($_REQUEST['quote_id']) && $_REQUEST['quote_id'] !='')
 		{
 			$associated_prod = getAssociatedProducts("Quotes",$quote_focus,$focus->column_fields['quote_id']);
@@ -163,7 +163,7 @@
         $associated_prod = getAssociatedProducts("Products",$focus,$focus->column_fields['product_id']);
 }
 
-// Get Account address if account is given
+// Get Account address if vtiger_account is given
 if(isset($_REQUEST['account_id']) && $_REQUEST['record']=='' && $_REQUEST['account_id'] != ''){
 	require_once('modules/Accounts/Account.php');
 	$acct_focus = new Account();

Modified: vtigercrm/trunk/modules/SalesOrder/ListTopSalesOrder.php
==============================================================================
--- vtigercrm/trunk/modules/SalesOrder/ListTopSalesOrder.php (original)
+++ vtigercrm/trunk/modules/SalesOrder/ListTopSalesOrder.php Mon Jun 12 14:26:25 2006
@@ -51,7 +51,7 @@
 	//<<<<<<<<<customview>>>>>>>>>
 	$date_var = date('Y-m-d');
 
-	$where = ' and crmentity.smownerid='.$current_user->id.' and  salesorder.duedate >= \''.$date_var.'\' ORDER BY total DESC';
+	$where = ' and vtiger_crmentity.smownerid='.$current_user->id.' and  vtiger_salesorder.duedate >= \''.$date_var.'\' ORDER BY total DESC';
 	$query = getListQuery("SalesOrder",$where);
 
 	//<<<<<<<<customview>>>>>>>>>

Modified: vtigercrm/trunk/modules/SalesOrder/SalesOrder.php
==============================================================================
--- vtigercrm/trunk/modules/SalesOrder/SalesOrder.php (original)
+++ vtigercrm/trunk/modules/SalesOrder/SalesOrder.php Mon Jun 12 14:26:25 2006
@@ -28,20 +28,20 @@
 require_once('data/CRMEntity.php');
 require_once('include/utils/utils.php');
 
-// Account is used to store account information.
+// Account is used to store vtiger_account information.
 class SalesOrder extends CRMEntity {
 	var $log;
 	var $db;
 
 
-	// Stored fields
+	// Stored vtiger_fields
 	var $id;
 	var $mode;
 	
 		
 	var $table_name = "salesorder";
-	var $tab_name = Array('crmentity','salesorder','sobillads','soshipads','salesordercf');
-	var $tab_name_index = Array('crmentity'=>'crmid','salesorder'=>'salesorderid','sobillads'=>'sobilladdressid','soshipads'=>'soshipaddressid','salesordercf'=>'salesorderid');
+	var $tab_name = Array('vtiger_crmentity','vtiger_salesorder','vtiger_sobillads','vtiger_soshipads','vtiger_salesordercf');
+	var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_salesorder'=>'salesorderid','vtiger_sobillads'=>'sobilladdressid','vtiger_soshipads'=>'soshipaddressid','vtiger_salesordercf'=>'salesorderid');
 				
 	
 	var $entity_table = "crmentity";
@@ -58,10 +58,10 @@
 
 	var $sortby_fields = Array('subject','smownerid');		
 
-	// This is used to retrieve related fields from form posts.
+	// This is used to retrieve related vtiger_fields from form posts.
 	var $additional_column_fields = Array('assigned_user_name', 'smownerid', 'opportunity_id', 'case_id', 'contact_id', 'task_id', 'note_id', 'meeting_id', 'call_id', 'email_id', 'parent_name', 'member_id' );
 
-	// This is the list of fields that are in the lists.
+	// This is the list of vtiger_fields that are in the lists.
 	var $list_fields = Array(
 				'Order Id'=>Array('crmentity'=>'crmid'),
 				'Subject'=>Array('salesorder'=>'subject'),
@@ -99,7 +99,7 @@
 				        'Quote Name'=>'quote_id'
 				      );
 
-	// This is the list of fields that are required.
+	// This is the list of vtiger_fields that are required.
 	var $required_fields =  array("accountname"=>1);
 
 	//Added these variables which are used as default order by and sortorder in ListView
@@ -131,7 +131,7 @@
 		$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')";
+		$query = "SELECT vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid, vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and (activitytype='Task' or vtiger_activitytype='Call' or vtiger_activitytype='Meeting') and vtiger_crmentity.deleted=0 and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Completed') and (vtiger_activity.status is not NULL && vtiger_activity.status !='Deferred') or (vtiger_activity.eventstatus != '' &&  vtiger_activity.eventstatus = 'Planned')";
 		$log->debug("Exiting get_activities method ...");
 		return GetRelatedList('SalesOrder','Activities',$focus,$query,$button,$returnset);
 	}
@@ -144,27 +144,27 @@
 	{
 		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
-			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
-				inner join users on crmentity.smcreatorid=users.id
-				left join activitygrouprelation on activitygrouprelation.activityid=activity.activityid
-                                left join groups on groups.groupname=activitygrouprelation.groupname
-			where (activitytype='Task' or activitytype='Call' or activitytype='Meeting')
-				and (activity.status = 'Completed' or activity.status = 'Deferred' or (activity.eventstatus !='Planned' and activity.eventstatus != ''))
-				and seactivityrel.crmid=".$id;
+		$query = "SELECT vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid,
+			vtiger_activity.*, vtiger_seactivityrel.*, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime,
+			vtiger_crmentity.createdtime, vtiger_crmentity.description, vtiger_users.user_name
+			from vtiger_activity
+				inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid
+				inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid
+				left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid
+				left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid
+				inner join vtiger_users on vtiger_crmentity.smcreatorid=vtiger_users.id
+				left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_activity.activityid
+                                left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname
+			where (activitytype='Task' or vtiger_activitytype='Call' or vtiger_activitytype='Meeting')
+				and (vtiger_activity.status = 'Completed' or vtiger_activity.status = 'Deferred' or (vtiger_activity.eventstatus !='Planned' and vtiger_activity.eventstatus != ''))
+				and vtiger_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);
 	}
 
-/** Function to get attachments associated with the id
+/** Function to get vtiger_attachments associated with the id
  *  This function accepts the id as arguments and execute the MySQL query using the id
  *  and sends the query and the id as arguments to renderRelatedAttachments() method.
 */
@@ -173,41 +173,41 @@
 		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
-		$query = "select notes.title,'Notes      '  ActivityType, notes.filename,
-			attachments.type  FileType,crm2.modifiedtime lastmodified,
-			seattachmentsrel.attachmentsid attachmentsid, notes.notesid crmid,
-			crmentity.createdtime, notes.notecontent description, users.user_name
-		from notes
-			inner join senotesrel on senotesrel.notesid= notes.notesid
-			inner join crmentity on crmentity.crmid= senotesrel.crmid
-			inner join crmentity crm2 on crm2.crmid=notes.notesid and crm2.deleted=0
-			left join seattachmentsrel  on seattachmentsrel.crmid =notes.notesid
-			left join attachments on seattachmentsrel.attachmentsid = attachments.attachmentsid
-			inner join users on crmentity.smcreatorid= users.id
-		where crmentity.crmid=".$id;
+		// Desc: Inserted vtiger_crmentity.createdtime, vtiger_notes.notecontent description, vtiger_users.user_name
+		// Inserted inner join vtiger_users on vtiger_crmentity.smcreatorid= vtiger_users.id
+		$query = "select vtiger_notes.title,'Notes      '  ActivityType, vtiger_notes.filename,
+		vtiger_attachments.type  FileType,crm2.modifiedtime lastmodified,
+		vtiger_seattachmentsrel.attachmentsid vtiger_attachmentsid, vtiger_notes.notesid crmid,
+		vtiger_crmentity.createdtime, vtiger_notes.notecontent description, vtiger_users.user_name
+		from vtiger_notes
+			inner join vtiger_senotesrel on vtiger_senotesrel.notesid= vtiger_notes.notesid
+			inner join vtiger_crmentity on vtiger_crmentity.crmid= vtiger_senotesrel.crmid
+			inner join vtiger_crmentity crm2 on crm2.crmid=vtiger_notes.notesid and crm2.deleted=0
+			left join vtiger_seattachmentsrel  on vtiger_seattachmentsrel.crmid =vtiger_notes.notesid
+			left join vtiger_attachments on vtiger_seattachmentsrel.attachmentsid = vtiger_attachments.attachmentsid
+			inner join vtiger_users on vtiger_crmentity.smcreatorid= vtiger_users.id
+		where vtiger_crmentity.crmid=".$id;
 		$query .= ' union all ';
 		// Armando L?scher 18.10.2005 -> ?visibleDescription
-		// Desc: Inserted crmentity.createdtime, attachments.description, users.user_name
-		// Inserted inner join users on crmentity.smcreatorid= users.id
+		// Desc: Inserted vtiger_crmentity.createdtime, vtiger_attachments.description, vtiger_users.user_name
+		// Inserted inner join vtiger_users on vtiger_crmentity.smcreatorid= vtiger_users.id
 		// Inserted order by createdtime desc
-		$query .= "select attachments.description  title ,'Attachments'  ActivityType,
-			attachments.name  filename, attachments.type  FileType, crm2.modifiedtime lastmodified,
-			attachments.attachmentsid  attachmentsid, seattachmentsrel.attachmentsid crmid,
-			crmentity.createdtime, attachments.description, users.user_name
-		from attachments
-			inner join seattachmentsrel on seattachmentsrel.attachmentsid= attachments.attachmentsid
-			inner join crmentity on crmentity.crmid= seattachmentsrel.crmid
-			inner join crmentity crm2 on crm2.crmid=attachments.attachmentsid
-			inner join users on crmentity.smcreatorid= users.id
-		where crmentity.crmid=".$id."
+		$query .= "select vtiger_attachments.description  title ,'Attachments'  ActivityType,
+		vtiger_attachments.name  filename, vtiger_attachments.type  FileType, crm2.modifiedtime lastmodified,
+		vtiger_attachments.attachmentsid  vtiger_attachmentsid, vtiger_seattachmentsrel.attachmentsid crmid,
+		vtiger_crmentity.createdtime, vtiger_attachments.description, vtiger_users.user_name
+		from vtiger_attachments
+			inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid= vtiger_attachments.attachmentsid
+			inner join vtiger_crmentity on vtiger_crmentity.crmid= vtiger_seattachmentsrel.crmid
+			inner join vtiger_crmentity crm2 on crm2.crmid=vtiger_attachments.attachmentsid
+			inner join vtiger_users on vtiger_crmentity.smcreatorid= vtiger_users.id
+		where vtiger_crmentity.crmid=".$id."
 		order by createdtime desc";
 	$log->debug("Exiting get_attachments method ...");
 	return getAttachmentsAndNotes('SalesOrder',$query,$id,$sid='salesorderid');
 	}
 
-/** Function to get invoices associated with the id
+/** Function to get vtiger_invoices associated with the id
  *  This function accepts the id as arguments and execute the MySQL query using the id
  *  and sends the query and the id as arguments to renderRelatedInvoices() method.
 */
@@ -223,7 +223,7 @@
 		$returnset = '&return_module=SalesOrder&return_action=DetailView&return_id='.$id;
 
 
-		$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;
+		$query = "select vtiger_crmentity.*, vtiger_invoice.*, vtiger_account.accountname, vtiger_salesorder.subject as salessubject from vtiger_invoice inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_invoice.invoiceid left outer join vtiger_account on vtiger_account.accountid=vtiger_invoice.accountid inner join vtiger_salesorder on vtiger_salesorder.salesorderid=vtiger_invoice.salesorderid left join vtiger_invoicegrouprelation on vtiger_invoice.invoiceid=vtiger_invoicegrouprelation.invoiceid left join vtiger_groups on vtiger_groups.groupname=vtiger_invoicegrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_salesorder.salesorderid=".$id;
 		$log->debug("Exiting get_invoices method ...");
 		return GetRelatedList('SalesOrder','Invoice',$focus,$query,$button,$returnset);
 	

Modified: vtigercrm/trunk/modules/SalesOrder/Save.php
==============================================================================
--- vtigercrm/trunk/modules/SalesOrder/Save.php (original)
+++ vtigercrm/trunk/modules/SalesOrder/Save.php Mon Jun 12 14:26:25 2006
@@ -38,14 +38,14 @@
 if($focus->column_fields["quote_id"] != '')
 {
         $qt_id = $focus->column_fields["quote_id"];
-        $query1 = "update quotes set quotestage='Accepted' where quoteid=".$qt_id;
+        $query1 = "update vtiger_quotes set vtiger_quotestage='Accepted' where quoteid=".$qt_id;
         $adb->query($query1);
 }
 
 $ext_prod_arr = Array();
 if($focus->mode == 'edit')
 {
-	$query2  = "select * from soproductrel where salesorderid=".$focus->id;
+	$query2  = "select * from vtiger_soproductrel where vtiger_salesorderid=".$focus->id;
         $result2 = $adb->query($query2);
         $num_rows = $adb->num_rows($result2);
         for($i=0; $i<$num_rows;$i++)
@@ -56,7 +56,7 @@
         }
 
 	
-        $query1 = "delete from soproductrel where salesorderid=".$focus->id;
+        $query1 = "delete from vtiger_soproductrel where vtiger_salesorderid=".$focus->id;
         $adb->query($query1);
 
 }
@@ -84,7 +84,7 @@
         if($prod_status != 'D')
         {
 
-                $query ="insert into soproductrel values($focus->id, $prod_id , $qty, $listprice, $vat, $sales, $service)";
+                $query ="insert into vtiger_soproductrel values($focus->id, $prod_id , $qty, $listprice, $vat, $sales, $service)";
                 $adb->query($query);
 		updateStk($prod_id,$qty,$focus->mode,$ext_prod_arr,'SalesOrder');
         }

Modified: vtigercrm/trunk/modules/SalesOrder/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/SalesOrder/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/SalesOrder/language/en_us.lang.php Mon Jun 12 14:26:25 2006
@@ -81,10 +81,10 @@
 'NTC_COPY_SHIPPING_ADDRESS'=>'Copy shipping address to billing address',
 'NTC_REMOVE_MEMBER_ORG_CONFIRMATION'=>'Are you sure you want to remove this record as a member organization?',
 'LBL_DUPLICATE'=>'Potential Duplicate Accounts',
-'MSG_DUPLICATE' => 'Creating this account may potentialy create a duplicate account. You may either select an account from the list below or you may click on Create New Account to continue creating a new account with the previously entered data.',
+'MSG_DUPLICATE' => 'Creating this vtiger_account may vtiger_potentialy create a duplicate vtiger_account. You may either select an vtiger_account from the list below or you may click on Create New Account to continue creating a new vtiger_account with the previously entered data.',
 
 'LBL_INVITEE'=>'Contacts',
-'ERR_DELETE_RECORD'=>"A record number must be specified to delete the account.",
+'ERR_DELETE_RECORD'=>"A record number must be specified to delete the vtiger_account.",
 
 'LBL_SELECT_ACCOUNT'=>'Select Account',
 'LBL_GENERAL_INFORMATION'=>'General Information',
@@ -104,7 +104,7 @@
 'LBL_NEW_CONTACT'=>'New Contact',
 'LBL_CONTACT_TITLE'=>'Contacts',
 
-//Added fields after RC1 - Release
+//Added vtiger_fields after RC1 - Release
 'LBL_ALL'=>'All',
 'LBL_PROSPECT'=>'Prospect',
 'LBL_INVESTOR'=>'Investor',

Modified: vtigercrm/trunk/modules/SalesOrder/pdf_templates/header.php
==============================================================================
--- vtigercrm/trunk/modules/SalesOrder/pdf_templates/header.php (original)
+++ vtigercrm/trunk/modules/SalesOrder/pdf_templates/header.php Mon Jun 12 14:26:25 2006
@@ -67,7 +67,7 @@
 $dueBlock=array("80","65");
 $pdf->addRecBlock($valid_till, "Due Date",$dueBlock);
 
-// invoice number block
+// vtiger_invoice number block
 $invBlock=array("145","65");
 $pdf->addRecBlock($id, "Invoice Number",$invBlock);
 

Modified: vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php (original)
+++ vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php Mon Jun 12 14:26:25 2006
@@ -23,9 +23,9 @@
 }
 
 
-//checking if the user is trying to create a custom field which already exists  
-
-$checkquery="select * from field where tabid='".$tabid."'and fieldlabel='".$fldlabel."'";
+//checking if the user is trying to create a custom vtiger_field which already exists  
+
+$checkquery="select * from vtiger_field where vtiger_tabid='".$tabid."'and vtiger_fieldlabel='".$fldlabel."'";
 $checkresult=$adb->query($checkquery);
 
 if($adb->num_rows($checkresult) != 0)
@@ -72,7 +72,7 @@
 		$columnName = $max_fieldid;
 	}
   
-	//Assigning the table Name
+	//Assigning the vtiger_table Name
 	$tableName ='';
 	if($fldmodule == 'Leads')
 	{
@@ -228,8 +228,8 @@
 
         
 
-        //1. add the customfield table to the field table as Block4
-        //2. fetch the contents of the custom field and show in the UI
+        //1. add the customfield vtiger_table to the vtiger_field vtiger_table as Block4
+        //2. fetch the contents of the custom vtiger_field and show in the UI
         
 	//retreiving the sequence
 	if($_REQUEST['fieldid'] == '')
@@ -250,30 +250,30 @@
         {
 		if($_REQUEST['fieldid'] == '')
 		{
-			$query = "insert into field values(".$tabid.",".$custfld_fieldid.",'".$columnName."','".$tableName."',2,".$uitype.",'".$columnName."','".$fldlabel."',0,0,0,100,".$custfld_sequece.",$blockid,1,'".$uichekdata."',1,0,'BAS')";
+			$query = "insert into vtiger_field values(".$tabid.",".$custfld_fieldid.",'".$columnName."','".$tableName."',2,".$uitype.",'".$columnName."','".$fldlabel."',0,0,0,100,".$custfld_sequece.",$blockid,1,'".$uichekdata."',1,0,'BAS')";
 			$adb->query($query);
 			$adb->alterTable($tableName, $columnName." ".$type, "Add_Column");
 		}
 		else
 		{
-			$query = "update field set fieldlabel='".$fldlabel."',typeofdata='".$uichekdata."' where fieldid=".$_REQUEST['fieldid'];
+			$query = "update vtiger_field set vtiger_fieldlabel='".$fldlabel."',typeofdata='".$uichekdata."' where vtiger_fieldid=".$_REQUEST['fieldid'];
 			$adb->query($query);
 		}
-		//Inserting values into profile2field tables
+		//Inserting values into vtiger_profile2field vtiger_tables
 		if($_REQUEST['fieldid'] == '')
 		{
-			$sql1 = "select * from profile";
+			$sql1 = "select * from vtiger_profile";
 			$sql1_result = $adb->query($sql1);
 			$sql1_num = $adb->num_rows($sql1_result);
 			for($i=0; $i<$sql1_num; $i++)
 			{
 				$profileid = $adb->query_result($sql1_result,$i,"profileid");
-				$sql2 = "insert into profile2field values(".$profileid.", ".$tabid.", ".$custfld_fieldid.", 0, 1)";
+				$sql2 = "insert into vtiger_profile2field values(".$profileid.", ".$tabid.", ".$custfld_fieldid.", 0, 1)";
 				$adb->query($sql2);	 	
 			}
 
-			//Inserting values into def_org tables
-			$sql_def = "insert into def_org_field values(".$tabid.", ".$custfld_fieldid.", 0, 1)";
+			//Inserting values into def_org vtiger_tables
+			$sql_def = "insert into vtiger_def_org_field values(".$tabid.", ".$custfld_fieldid.", 0, 1)";
 			$adb->query($sql_def);
 		}
 
@@ -283,7 +283,7 @@
 			// Creating the PickList Table and Populating Values
 			$adb->createTable($columnName, $columnName." C(255)");
 			//Adding Primary Key
-			$qur = "ALTER table ".$columnName." ADD PRIMARY KEY (". $columnName.")";
+			$qur = "ALTER vtiger_table ".$columnName." ADD PRIMARY KEY (". $columnName.")";
 			$adb->query($qur);
 
 			$fldPickList =  $_REQUEST['fldPickList'];
@@ -299,11 +299,11 @@
 				}
 			}
 		}
-		//Inserting into LeadMapping table - Jaguar
+		//Inserting into LeadMapping vtiger_table - Jaguar
 		if($fldmodule == 'Leads')
 		{
 
-			$sql_def = "insert into convertleadmapping (leadfid) values(".$custfld_fieldid.")";
+			$sql_def = "insert into vtiger_convertleadmapping (leadfid) values(".$custfld_fieldid.")";
 			$adb->query($sql_def);
 		}
 	}

Modified: vtigercrm/trunk/modules/Settings/AddMailAccount.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/AddMailAccount.php (original)
+++ vtigercrm/trunk/modules/Settings/AddMailAccount.php Mon Jun 12 14:26:25 2006
@@ -30,7 +30,7 @@
 
 if(isset($_REQUEST['record']) && $_REQUEST['record']!='')
 {
-	$sql = "select * from mail_accounts where user_id=".$_REQUEST['record'];
+	$sql = "select * from vtiger_mail_accounts where user_id=".$_REQUEST['record'];
 	$result = $adb->query($sql);
 	$rowcount = $adb->num_rows($result);
 	

Modified: vtigercrm/trunk/modules/Settings/BackupServerConfig.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/BackupServerConfig.php (original)
+++ vtigercrm/trunk/modules/Settings/BackupServerConfig.php Mon Jun 12 14:26:25 2006
@@ -26,7 +26,7 @@
 {
 		$smarty->assign("ERROR_MSG",'<b><font color="purple">'.$_REQUEST["error"].'</font></b>');
 }
-$sql="select * from systems where server_type = 'backup'";
+$sql="select * from vtiger_systems where server_type = 'backup'";
 $result = $adb->query($sql);
 $server = $adb->query_result($result,0,'server');
 $server_username = $adb->query_result($result,0,'server_username');

Modified: vtigercrm/trunk/modules/Settings/CurrencyDelete.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/CurrencyDelete.php (original)
+++ vtigercrm/trunk/modules/Settings/CurrencyDelete.php Mon Jun 12 14:26:25 2006
@@ -11,9 +11,9 @@
 
 $del_id = $_REQUEST['delete_currency_id'];
 $tran_id = $_REQUEST['transfer_currency_id'];
-$sql0 = "update users set currency_id=".$tran_id." where currency_id=".$del_id;
+$sql0 = "update vtiger_users set vtiger_currency_id=".$tran_id." where vtiger_currency_id=".$del_id;
 $adb->query($sql0);
-$sql = "delete from currency_info where id =".$del_id;
+$sql = "delete from vtiger_currency_info where id =".$del_id;
 $adb->query($sql);
 header("Location: index.php?action=SettingsAjax&module=Settings&file=CurrencyListView&ajax=true");
 

Modified: vtigercrm/trunk/modules/Settings/CurrencyDeleteStep1.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/CurrencyDeleteStep1.php (original)
+++ vtigercrm/trunk/modules/Settings/CurrencyDeleteStep1.php Mon Jun 12 14:26:25 2006
@@ -15,7 +15,7 @@
 require_once('include/utils/utils.php');
 
 $delete_currency_id = $_REQUEST['id'];
-$sql = "select * from currency_info where id=".$delete_currency_id;
+$sql = "select * from vtiger_currency_info where id=".$delete_currency_id;
 $result = $adb->query($sql);
 $delete_currencyname = $adb->query_result($result,0,"currency_name");
 
@@ -48,7 +48,7 @@
 $output.='<select class="select" name="transfer_currency_id" id="transfer_currency_id">';
 	     
 		 global $adb;	
-         $sql = "select * from currency_info";
+         $sql = "select * from vtiger_currency_info";
          $result = $adb->query($sql);
          $temprow = $adb->fetch_array($result);
          do

Modified: vtigercrm/trunk/modules/Settings/CurrencyEditView.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/CurrencyEditView.php (original)
+++ vtigercrm/trunk/modules/Settings/CurrencyEditView.php Mon Jun 12 14:26:25 2006
@@ -18,10 +18,10 @@
 if(isset($_REQUEST['record']) && $_REQUEST['record']!='')
 {
         $tempid = $_REQUEST['record'];
-        $sql = "select * from currency_info where id=".$tempid;
+        $sql = "select * from vtiger_currency_info where id=".$tempid;
         $result = $adb->query($sql);
         $currencyResult = $adb->fetch_array($result);
-	$sql1 = "select * from users where currency_id=".$tempid;
+	$sql1 = "select * from vtiger_users where vtiger_currency_id=".$tempid;
 	$result1 = $adb->query($sql1);
 	$noofrows = $adb->num_rows($result1);
 	if($noofrows != 0)

Modified: vtigercrm/trunk/modules/Settings/CurrencyListView.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/CurrencyListView.php (original)
+++ vtigercrm/trunk/modules/Settings/CurrencyListView.php Mon Jun 12 14:26:25 2006
@@ -17,7 +17,7 @@
 $image_path=$theme_path."images/";
 $smarty=new vtigerCRM_Smarty;
    $parenttab = $_REQUEST['parenttab'];
-   $sql = "select * from currency_info";
+   $sql = "select * from vtiger_currency_info";
    $result = $adb->query($sql);
    $temprow = $adb->fetch_array($result);
    $cnt=1;

Modified: vtigercrm/trunk/modules/Settings/DeleteCustomField.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/DeleteCustomField.php (original)
+++ vtigercrm/trunk/modules/Settings/DeleteCustomField.php Mon Jun 12 14:26:25 2006
@@ -19,18 +19,18 @@
 $uitype = $_REQUEST["uitype"];
 
 //Deleting the CustomField from the Custom Field Table
-$query='delete from field where fieldid="'.$id.'"';
+$query='delete from vtiger_field where vtiger_fieldid="'.$id.'"';
 $adb->query($query);
 
-//Deleting from profile2field table
-$query='delete from profile2field where fieldid="'.$id.'"';
+//Deleting from vtiger_profile2field vtiger_table
+$query='delete from vtiger_profile2field where vtiger_fieldid="'.$id.'"';
 $adb->query($query);
 
-//Deleting from def_org_field table
-$query='delete from def_org_field where fieldid="'.$id.'"';
+//Deleting from vtiger_def_org_field vtiger_table
+$query='delete from vtiger_def_org_field where vtiger_fieldid="'.$id.'"';
 $adb->query($query);
 
-//Dropping the column in the module table
+//Dropping the column in the module vtiger_table
 if($fld_module == "Leads")
 {
 	$tableName = "leadscf";
@@ -57,20 +57,20 @@
 }
 //echo '<BR>';
 //echo $tableName;
-$dbquery = 'Alter table '.$tableName.' Drop Column '.$colName;
+$dbquery = 'Alter vtiger_table '.$tableName.' Drop Column '.$colName;
 $adb->query($dbquery);
 
-//Deleting from convert lead mapping table- Jaguar
+//Deleting from convert lead mapping vtiger_table- Jaguar
 if($fld_module=="Leads")
 {
-	$deletequery = 'delete from convertleadmapping where leadfid='.$id;
+	$deletequery = 'delete from vtiger_convertleadmapping where leadfid='.$id;
 	$adb->query($deletequery);
 }
 
 
 if($uitype == 15)
 {
-$deltablequery = 'drop table '.$colName;
+$deltablequery = 'drop vtiger_table '.$colName;
 $adb->query($deltablequery);
 }
 header("Location:index.php?module=Settings&action=CustomFieldList&fld_module=".$fld_module."&parenttab=Settings");

Modified: vtigercrm/trunk/modules/Settings/DeleteLeadCustomFieldMapping.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/DeleteLeadCustomFieldMapping.php (original)
+++ vtigercrm/trunk/modules/Settings/DeleteLeadCustomFieldMapping.php Mon Jun 12 14:26:25 2006
@@ -16,7 +16,7 @@
 
 if($id !='')
 {
-	$sql="update convertleadmapping set accountfid ='NULL',contactfid='NULL',potentialfid='NULL' where cfmid=".$id;
+	$sql="update vtiger_convertleadmapping set vtiger_accountfid ='NULL',contactfid='NULL',potentialfid='NULL' where cfmid=".$id;
 	$result = $adb->query($sql);
 }
 

Modified: vtigercrm/trunk/modules/Settings/DeleteMailAccount.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/DeleteMailAccount.php (original)
+++ vtigercrm/trunk/modules/Settings/DeleteMailAccount.php Mon Jun 12 14:26:25 2006
@@ -21,7 +21,7 @@
 {
 	if($account_id != '')
 	{
-		$query = "update mail_accounts set status=0 where account_id=".$account_id;
+		$query = "update vtiger_mail_accounts set status=0 where vtiger_account_id=".$account_id;
 		$adb->query($query);
 	}
 }

Modified: vtigercrm/trunk/modules/Settings/EditCompanyDetails.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/EditCompanyDetails.php (original)
+++ vtigercrm/trunk/modules/Settings/EditCompanyDetails.php Mon Jun 12 14:26:25 2006
@@ -28,7 +28,7 @@
 			$smarty->assign("ERRORFLAG","<font color='red'><B>Error Message<ul><li><font color='red'>Invalid file OR</font><li><font color='red'>File has no data</font></ul></B></font>");
 			break;
 		case 3:
-			$smarty->assign("ERRORFLAG","<B><font color='red'>Sorry, the uploaded file exceeds the maximum filesize limit. Please try a file smaller than 800000 bytes</font></B>");
+			$smarty->assign("ERRORFLAG","<B><font color='red'>Sorry, the uploaded file exceeds the maximum vtiger_filesize limit. Please try a file smaller than 800000 bytes</font></B>");
 			break;
 		case 4:
 			$smarty->assign("ERRORFLAG","<b>Problems in file upload. Please try again! </b><br>");
@@ -44,7 +44,7 @@
 $image_path=$theme_path."images/";
 require_once($theme_path.'layout_utils.php');
 
-$sql="select * from organizationdetails";
+$sql="select * from vtiger_organizationdetails";
 $result = $adb->query($sql);
 $organization_name = $adb->query_result($result,0,'organizationame');
 $organization_address= $adb->query_result($result,0,'address');

Modified: vtigercrm/trunk/modules/Settings/EditFieldBlock.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/EditFieldBlock.php (original)
+++ vtigercrm/trunk/modules/Settings/EditFieldBlock.php Mon Jun 12 14:26:25 2006
@@ -33,7 +33,7 @@
 	global $adb,$saveNames;
 
 	$b = array();	
-	$sql="select fieldid,fieldlabel,block from field,tab where field.tabid=tab.tabid and tab.tabid=$tabId order by block,sequence";
+	$sql="select vtiger_fieldid,fieldlabel,block from vtiger_field,tab where vtiger_field.tabid=vtiger_tab.tabid and vtiger_tab.tabid=$tabId order by block,sequence";
 	$result = $adb->query($sql);
 	$noofrows = $adb->num_rows($result);
 	
@@ -114,7 +114,7 @@
 		{
 			$item = mysql_escape_string($item);
 			$block  = mysql_escape_string($block);
-			$result = $adb->query("UPDATE field SET `block`='$block',`sequence`='$i' WHERE `fieldid`='$item' $col_check;");
+			$result = $adb->query("UPDATE vtiger_field SET `block`='$block',`sequence`='$i' WHERE `fieldid`='$item' $col_check;");
 			$i ++;
 		}
 	}
@@ -244,7 +244,7 @@
 	?>
 
 	<p align="left">
-		<b>Please review the notes at the bottom for things to keep in mind!<br></b>
+		<b>Please review the vtiger_notes at the bottom for things to keep in mind!<br></b>
 	</p>
 <script language="JavaScript" type="text/javascript" src="include/dd/dd_files/coordinates.js"></script>
 <script language="JavaScript" type="text/javascript" src="include/dd/dd_files/drag.js"></script>
@@ -289,16 +289,16 @@
 	</tr>
 </table>
 <p align="left">
-	1) &nbsp;If you move a field into a currently unused block, you will have to update the appropriate language file in
+	1) &nbsp;If you move a vtiger_field into a currently unused block, you will have to update the appropriate language file in
 	<b>modules/Potentials/language/en_us.lang.php</b>.<br>
-	2) &nbsp;Please see notes on arranging fields below:
+	2) &nbsp;Please see vtiger_notes on arranging vtiger_fields below:
 </p>
 <div align="left">
 	<table border="1" cellpadding="0" cellspacing="0" bordercolordark="white" bordercolorlight="black">
 		<tr>
 			<td width="325" align="right">
 				<p align="center">
-					The tabs are arrange in 2 columns as follows:
+					The vtiger_tabs are arrange in 2 columns as follows:
 				</p>
 			</td>
 			<td width="325" align="right">

Modified: vtigercrm/trunk/modules/Settings/EmailConfig.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/EmailConfig.php (original)
+++ vtigercrm/trunk/modules/Settings/EmailConfig.php Mon Jun 12 14:26:25 2006
@@ -28,7 +28,7 @@
 $image_path=$theme_path."images/";
 require_once($theme_path.'layout_utils.php');
 
-$sql="select * from systems where server_type = 'email'";
+$sql="select * from vtiger_systems where server_type = 'email'";
 $result = $adb->query($sql);
 $mail_server = $adb->query_result($result,0,'server');
 $mail_server_username = $adb->query_result($result,0,'server_username');

Modified: vtigercrm/trunk/modules/Settings/Forms.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/Forms.php (original)
+++ vtigercrm/trunk/modules/Settings/Forms.php Mon Jun 12 14:26:25 2006
@@ -15,7 +15,7 @@
 /*********************************************************************************
  * $Header$
  * Description:  Contains a variety of utility functions used to display UI
- * components such as form headers and footers.  Intended to be modified on a per
+ * components such as form vtiger_headers and footers.  Intended to be modified on a per
  * theme basis.
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
  * All Rights Reserved.
@@ -88,7 +88,7 @@
 }
 
 /**
- * Create HTML form to enter a new record with the minimum necessary fields.
+ * Create HTML form to enter a new record with the minimum necessary vtiger_fields.
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
  * All Rights Reserved.
  * Contributor(s): ______________________________________..
@@ -115,7 +115,7 @@
 $qcreate_form = get_left_form_header($mod_strings['LBL_NEW_FORM_TITLE']);
 
 
-$qcreate_get_field="select * from field where tabid=4 and quickcreate=0 order by quickcreatesequence";
+$qcreate_get_field="select * from vtiger_field where vtiger_tabid=4 and quickcreate=0 order by quickcreatesequence";
 $qcreate_get_result=$adb->query($qcreate_get_field);
 $qcreate_get_noofrows=$adb->num_rows($qcreate_get_result);
 
@@ -203,9 +203,9 @@
 $qcreate_form.='</form>';
 $qcreate_form.='<script type="text/javascript">
 
-        var fieldname = new Array('.$fieldName.')
-        var fieldlabel = new Array('.$fieldLabel.')
-        var fielddatatype = new Array('.$fldDataType.')
+        var vtiger_fieldname = new Array('.$fieldName.')
+        var vtiger_fieldlabel = new Array('.$fieldLabel.')
+        var vtiger_fielddatatype = new Array('.$fldDataType.')
 
                 </script>';
 

Modified: vtigercrm/trunk/modules/Settings/LeadCustomFieldMapping.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/LeadCustomFieldMapping.php (original)
+++ vtigercrm/trunk/modules/Settings/LeadCustomFieldMapping.php Mon Jun 12 14:26:25 2006
@@ -31,7 +31,7 @@
 {
 	global $adb;
 	$accountcf=Array();
-	$sql="select fieldid,fieldlabel from field,tab where field.tabid=tab.tabid and generatedtype=2 and tab.name='Accounts'";
+	$sql="select vtiger_fieldid,fieldlabel from vtiger_field,tab where vtiger_field.tabid=vtiger_tab.tabid and generatedtype=2 and vtiger_tab.name='Accounts'";
 	$result = $adb->query($sql);
 	$noofrows = $adb->num_rows($result);
 	
@@ -54,7 +54,7 @@
 {	
 	global $adb;	
 	$contactcf=Array();
-	$sql="select fieldid,fieldlabel from field,tab where field.tabid=tab.tabid and generatedtype=2 and tab.name='Contacts'";
+	$sql="select vtiger_fieldid,fieldlabel from vtiger_field,tab where vtiger_field.tabid=vtiger_tab.tabid and generatedtype=2 and vtiger_tab.name='Contacts'";
 	$result = $adb->query($sql);
 	$noofrows = $adb->num_rows($result);
 	for($i=0; $i<$noofrows; $i++)
@@ -76,7 +76,7 @@
 {
 	global $adb;	
 	$potentialcf=Array();
-	$sql="select fieldid,fieldlabel from field,tab where field.tabid=tab.tabid and generatedtype=2 and tab.name='Potentials'";
+	$sql="select vtiger_fieldid,fieldlabel from vtiger_field,tab where vtiger_field.tabid=vtiger_tab.tabid and generatedtype=2 and vtiger_tab.name='Potentials'";
 	$result = $adb->query($sql);
 	$noofrows = $adb->num_rows($result);
 	for($i=0; $i<$noofrows; $i++)
@@ -93,7 +93,7 @@
 	$potentialcf[$leadid.'_potential']=$potential_cfelement;
         return $potentialcf;
 }
-$lead_sql="select fieldid,fieldlabel from field,tab where field.tabid=tab.tabid and generatedtype=2 and tab.name='Leads'";
+$lead_sql="select vtiger_fieldid,fieldlabel from vtiger_field,tab where vtiger_field.tabid=vtiger_tab.tabid and generatedtype=2 and vtiger_tab.name='Leads'";
 $result = $adb->query($lead_sql);
 $noofrows = $adb->num_rows($result);
 
@@ -103,7 +103,7 @@
 {
 	$lead_field['fieldid']=$adb->query_result($result,$i,"fieldid");
 	$lead_field['fieldlabel']=$adb->query_result($result,$i,"fieldlabel");
-	$convert_sql="select * from convertleadmapping where leadfid=".$lead_field['fieldid'];
+	$convert_sql="select * from vtiger_convertleadmapping where leadfid=".$lead_field['fieldid'];
 	$convert_result = $adb->query($convert_sql);
 
 	$no_rows = $adb->num_rows($convert_result);

Modified: vtigercrm/trunk/modules/Settings/ListLeadCustomFieldMapping.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/ListLeadCustomFieldMapping.php (original)
+++ vtigercrm/trunk/modules/Settings/ListLeadCustomFieldMapping.php Mon Jun 12 14:26:25 2006
@@ -26,7 +26,7 @@
 function getListLeadMapping($image_path)
 {
 	global $adb;
-	$sql="select * from convertleadmapping";
+	$sql="select * from vtiger_convertleadmapping";
 	$result = $adb->query($sql);
 	$noofrows = $adb->num_rows($result);
 	for($i =0;$i <$noofrows;$i++)
@@ -38,20 +38,20 @@
 		$cfmid = $adb->query_result($result,$i,'cfmid');
 
 		$display_val .= '<tr height="20" class="Datafield">';
-		$sql1="select fieldlabel from field where fieldid ='".$leadid."'";
+		$sql1="select vtiger_fieldlabel from vtiger_field where vtiger_fieldid ='".$leadid."'";
 		$result1 = $adb->query($sql1);
 		$leadfield = $adb->query_result($result1,0,'fieldlabel');
 		$label['leadlabel'] = $leadfield;
-		$sql2="select fieldlabel from field where fieldid ='".$accountid."'";
+		$sql2="select vtiger_fieldlabel from vtiger_field where vtiger_fieldid ='".$accountid."'";
 		$result2 = $adb->query($sql2);
 		$accountfield = $adb->query_result($result2,0,'fieldlabel');
 		$label['accountlabel'] = $accountfield;
 		
-		$sql3="select fieldlabel from field where fieldid ='".$contactid."'";
+		$sql3="select vtiger_fieldlabel from vtiger_field where vtiger_fieldid ='".$contactid."'";
 		$result3 = $adb->query($sql3);
 		$contactfield = $adb->query_result($result3,0,'fieldlabel');
 		$label['contactlabel'] = $contactfield;
-		$sql4="select fieldlabel from field where fieldid ='".$potentialid."'";
+		$sql4="select vtiger_fieldlabel from vtiger_field where vtiger_fieldid ='".$potentialid."'";
 		$result4 = $adb->query($sql4);
 		$potentialfield = $adb->query_result($result4,0,'fieldlabel');
 		$label['potentiallabel'] = $potentialfield;

Modified: vtigercrm/trunk/modules/Settings/ListModuleOwners.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/ListModuleOwners.php (original)
+++ vtigercrm/trunk/modules/Settings/ListModuleOwners.php Mon Jun 12 14:26:25 2006
@@ -27,7 +27,7 @@
 		$tabid = getTabid($val);
 		if($tabid != '' && $userid != '')
 		{
-			$sql = 'update moduleowners set user_id = '.$userid.' where tabid = '.$tabid;
+			$sql = 'update vtiger_moduleowners set user_id = '.$userid.' where vtiger_tabid = '.$tabid;
 			$adb->query($sql);
 		}
 	}
@@ -81,7 +81,7 @@
 function getModuleOwner($tabid)
 {
 	global $adb;
-	$sql = "select * from moduleowners where tabid=".$tabid;
+	$sql = "select * from vtiger_moduleowners where vtiger_tabid=".$tabid;
 	$res = $adb->query($sql);
 	$userid = $adb->query_result($res,0,'user_id');
 
@@ -92,7 +92,7 @@
 {
 	global $adb;
 
-	$sql = "select moduleowners.*, tab.name from moduleowners inner join tab on moduleowners.tabid = tab.tabid order by tab.tabsequence";
+	$sql = "select vtiger_moduleowners.*, vtiger_tab.name from vtiger_moduleowners inner join vtiger_tab on vtiger_moduleowners.tabid = vtiger_tab.tabid order by vtiger_tab.tabsequence";
 	$res = $adb->query($sql);
 	$mod_array = Array();
 	while($row = $adb->fetchByAssoc($res))
@@ -106,7 +106,7 @@
 	global $adb;
 
 	$tabid = getTabid($name);
-	$sql = "select * from moduleowners where tabid=".$tabid;
+	$sql = "select * from vtiger_moduleowners where vtiger_tabid=".$tabid;
 	$res = $adb->query($sql);
 	$db_userid = $adb->query_result($res,0,'user_id');
 	

Modified: vtigercrm/trunk/modules/Settings/OrganizationConfig.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/OrganizationConfig.php (original)
+++ vtigercrm/trunk/modules/Settings/OrganizationConfig.php Mon Jun 12 14:26:25 2006
@@ -35,7 +35,7 @@
 
 $smarty = new vtigerCRM_Smarty;
 
-$sql="select * from organizationdetails";
+$sql="select * from vtiger_organizationdetails";
 $result = $adb->query($sql);
 $organization_name = $adb->query_result($result,0,'organizationame');
 $organization_address= $adb->query_result($result,0,'address');

Modified: vtigercrm/trunk/modules/Settings/PickList.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/PickList.php (original)
+++ vtigercrm/trunk/modules/Settings/PickList.php Mon Jun 12 14:26:25 2006
@@ -48,7 +48,7 @@
 	global $adb;
 	$user_fld = Array();
 	$tabid = getTabid($fldmodule);
-	$query = "select fieldlabel,generatedtype,columnname,fieldname from field where displaytype = 1 and (tabid = ".getTabid($fld_module)." AND uitype IN (15,16)) OR (tabid = ".getTabid($fld_module)." AND fieldname='salutationtype')";
+	$query = "select vtiger_fieldlabel,generatedtype,columnname,fieldname from vtiger_field where displaytype = 1 and (tabid = ".getTabid($fld_module)." AND uitype IN (15,16)) OR (tabid = ".getTabid($fld_module)." AND vtiger_fieldname='salutationtype')";
 	$result = $adb->query($query);
 	$noofrows = $adb->num_rows($result);
     if($noofrows > 0)
@@ -115,7 +115,7 @@
 function getPickListModules()
 {
 	global $adb;
-	$query = 'select distinct field.fieldname,field.tabid,tablabel from field inner join tab on tab.tabid=field.tabid where uitype IN (15,16)';
+	$query = 'select distinct vtiger_field.fieldname,vtiger_field.tabid,tablabel from vtiger_field inner join vtiger_tab on vtiger_tab.tabid=vtiger_field.tabid where uitype IN (15,16)';
 	$result = $adb->query($query);
 	while($row = $adb->fetch_array($result))
 	{

Modified: vtigercrm/trunk/modules/Settings/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/Save.php (original)
+++ vtigercrm/trunk/modules/Settings/Save.php Mon Jun 12 14:26:25 2006
@@ -21,17 +21,17 @@
 else
 	$smtp_auth = 'false';
 
-$sql="select * from systems where server_type = '".$server_type."'";
+$sql="select * from vtiger_systems where server_type = '".$server_type."'";
 $id=$adb->query_result($adb->query($sql),0,"id");
 
 
 if($id=='')
 {
 	$id = $adb->getUniqueID("systems");
-	$sql="insert into systems values(" .$id .",'".$server."','".$server_username."','".$server_password."','".$server_type."','".$smtp_auth."')";
+	$sql="insert into vtiger_systems values(" .$id .",'".$server."','".$server_username."','".$server_password."','".$server_type."','".$smtp_auth."')";
 }
 else
-	$sql="update systems set server = '".$server."', server_username = '".$server_username."', server_password = '".$server_password."', smtp_auth='".$smtp_auth."', server_type = '".$server_type."' where id = ".$id;
+	$sql="update vtiger_systems set server = '".$server."', server_username = '".$server_username."', server_password = '".$server_password."', smtp_auth='".$smtp_auth."', server_type = '".$server_type."' where id = ".$id;
 
 $adb->query($sql);
 if($server_type == 'backup')

Modified: vtigercrm/trunk/modules/Settings/SaveCompany.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/SaveCompany.php (original)
+++ vtigercrm/trunk/modules/Settings/SaveCompany.php Mon Jun 12 14:26:25 2006
@@ -22,17 +22,17 @@
 $organization_fax=$_REQUEST['organization_fax'];
 $organization_website=$_REQUEST['organization_website'];
 
-$sql="select * from organizationdetails where organizationame = '".$org_name."'";
+$sql="select * from vtiger_organizationdetails where organizationame = '".$org_name."'";
 $result = $adb->query($sql);
 $org_name = $adb->query_result($result,0,'organizationame');
 
 if($org_name=='')
 {
-	$sql="insert into organizationdetails values( '".$organization_name ."','".$organization_address."','". $organization_city."','".$organization_state."','".$organization_code."','".$organization_country."','".$organization_phone."','".$organization_fax."','".$organization_website."')";
+	$sql="insert into vtiger_organizationdetails values( '".$organization_name ."','".$organization_address."','". $organization_city."','".$organization_state."','".$organization_code."','".$organization_country."','".$organization_phone."','".$organization_fax."','".$organization_website."')";
 }
 else
 {
-	$sql="update organizationdetails set organizationame = '".$organization_name."', address = '".$organization_address."', city = '".$organization_city."', state = '".$organization_state."',  code = '".$organization_code."', country = '".$organization_country."' ,  phone = '".$organization_phone."' ,  fax = '".$organization_fax."',  website = '".$organization_website."' where organizationame = '".$org_name."'";
+	$sql="update vtiger_organizationdetails set organizationame = '".$organization_name."', address = '".$organization_address."', city = '".$organization_city."', state = '".$organization_state."',  code = '".$organization_code."', country = '".$organization_country."' ,  phone = '".$organization_phone."' ,  fax = '".$organization_fax."',  website = '".$organization_website."' where organizationame = '".$org_name."'";
 }	
 
 

Modified: vtigercrm/trunk/modules/Settings/SaveConvertLead.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/SaveConvertLead.php (original)
+++ vtigercrm/trunk/modules/Settings/SaveConvertLead.php Mon Jun 12 14:26:25 2006
@@ -15,7 +15,7 @@
 
 //echo"<h3> In Save</h3>";
 	
-	$sql="select fieldid from field, tab where field.tabid=tab.tabid and generatedtype=2 and tab.name='Leads';";	
+	$sql="select vtiger_fieldid from vtiger_field, vtiger_tab where vtiger_field.tabid=vtiger_tab.tabid and generatedtype=2 and vtiger_tab.name='Leads';";	
 //	echo $sql;	
 	$result = $adb->query($sql);
 	$noofrows = $adb->num_rows($result);
@@ -43,7 +43,7 @@
 		{
 			$potential_id_val="";
 		}
-		$update_sql="update convertleadmapping set accountfid='".$account_id_val."',contactfid='".$contact_id_val."',potentialfid='".$potential_id_val."' where leadfid=".$lead_id;
+		$update_sql="update vtiger_convertleadmapping set vtiger_accountfid='".$account_id_val."',contactfid='".$contact_id_val."',potentialfid='".$potential_id_val."' where leadfid=".$lead_id;
 
 		$adb->query($update_sql);
 	}

Modified: vtigercrm/trunk/modules/Settings/SaveCurrencyInfo.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/SaveCurrencyInfo.php (original)
+++ vtigercrm/trunk/modules/Settings/SaveCurrencyInfo.php Mon Jun 12 14:26:25 2006
@@ -20,11 +20,11 @@
 
 if(isset($_REQUEST['record']) && $_REQUEST['record']!='')
 {
-        $sql = "update currency_info set currency_name ='".$currency_name."', currency_code ='".$currency_code."', currency_symbol ='".$currency_symbol."', conversion_rate ='".$conversion_rate."',currency_status='".$currency_status."' where id =".$_REQUEST['record'];
+        $sql = "update vtiger_currency_info set vtiger_currency_name ='".$currency_name."', vtiger_currency_code ='".$currency_code."', vtiger_currency_symbol ='".$currency_symbol."', conversion_rate ='".$conversion_rate."',currency_status='".$currency_status."' where id =".$_REQUEST['record'];
 }
 else
 {
-        $sql = "insert into currency_info values(".$db->getUniqueID("currency_info").",'".$currency_name."','".$currency_code."','".$currency_symbol."','".$conversion_rate."','".$currency_status."','0')";
+        $sql = "insert into vtiger_currency_info values(".$db->getUniqueID("currency_info").",'".$currency_name."','".$currency_code."','".$currency_symbol."','".$conversion_rate."','".$currency_status."','0')";
 }
 $adb->query($sql);
 $loc = "Location: index.php?module=Settings&action=CurrencyListView&parenttab=".$_REQUEST['parenttab'];

Modified: vtigercrm/trunk/modules/Settings/SaveMailAccount.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/SaveMailAccount.php (original)
+++ vtigercrm/trunk/modules/Settings/SaveMailAccount.php Mon Jun 12 14:26:25 2006
@@ -28,17 +28,17 @@
 {
 	$id=$_REQUEST['record'];
 }
-#$sql="select * from systems where server_type = '".$server_type."'";
+#$sql="select * from vtiger_systems where server_type = '".$server_type."'";
 #$id=$adb->query_result($adb->query($sql),0,"id");
 
 if(isset($_REQUEST['edit']) && $_REQUEST['edit'] && $_REQUEST['record']!='')
 {
-	$sql="update mail_accounts set display_name = '".$displayname."', mail_id = '".$email."', account_name = '".$account_name."', mail_protocol = '".$mailprotocol."', mail_username = '".$server_username."', mail_password='".$server_password."', mail_servername='".$mail_servername."',  box_refresh='".$box_refresh."',  mails_per_page='".$mails_per_page."', ssltype='".$ssltype."' , sslmeth='".$sslmeth."', int_mailer='".$_REQUEST["int_mailer"]."' where user_id = '".$id."'";
+	$sql="update vtiger_mail_accounts set display_name = '".$displayname."', mail_id = '".$email."', vtiger_account_name = '".$account_name."', mail_protocol = '".$mailprotocol."', mail_username = '".$server_username."', mail_password='".$server_password."', mail_servername='".$mail_servername."',  box_refresh='".$box_refresh."',  mails_per_page='".$mails_per_page."', ssltype='".$ssltype."' , sslmeth='".$sslmeth."', int_mailer='".$_REQUEST["int_mailer"]."' where user_id = '".$id."'";
 }
 else
 {
 	$account_id = $adb->getUniqueID("mail_accounts");
-	$sql="insert into mail_accounts values(" .$account_id .",'".$current_user->id."','".$displayname."','".$email."','".$account_name."','".$mailprotocol."','".$server_username."','".$server_password."','".$mail_servername."','".$box_refresh."','".$mails_per_page."', '".$ssltype."', '".$sslmeth."', '".$_REQUEST["int_mailer"]."','1','0')";
+	$sql="insert into vtiger_mail_accounts values(" .$account_id .",'".$current_user->id."','".$displayname."','".$email."','".$account_name."','".$mailprotocol."','".$server_username."','".$server_password."','".$mail_servername."','".$box_refresh."','".$mails_per_page."', '".$ssltype."', '".$sslmeth."', '".$_REQUEST["int_mailer"]."','1','0')";
 }
 
 $adb->query($sql);

Modified: vtigercrm/trunk/modules/Settings/SettingsSubMenu.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/SettingsSubMenu.php (original)
+++ vtigercrm/trunk/modules/Settings/SettingsSubMenu.php Mon Jun 12 14:26:25 2006
@@ -88,7 +88,7 @@
 		global $theme;
 		$theme_path="themes/".$theme."/";
 		$image_path=$theme_path."images/";
-		$dbQuery = "select fieldid,columnname,fieldlabel,uitype,displaytype from field where tabid=".$tabid." and generatedtype=2 order by sequence";
+		$dbQuery = "select vtiger_fieldid,columnname,fieldlabel,uitype,displaytype from vtiger_field where vtiger_tabid=".$tabid." and generatedtype=2 order by sequence";
 		$result = $adb->query($dbQuery);
 		$row = $adb->fetch_array($result);
 		$count=1;

Modified: vtigercrm/trunk/modules/Settings/TaxConfig.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/TaxConfig.php (original)
+++ vtigercrm/trunk/modules/Settings/TaxConfig.php Mon Jun 12 14:26:25 2006
@@ -63,7 +63,7 @@
 	
 	foreach($taxes_array as $tax_type)
 	{
-		$res = $adb->query("select * from inventorytaxinfo where taxname=\"$tax_type\"");
+		$res = $adb->query("select * from vtiger_inventorytaxinfo where taxname=\"$tax_type\"");
 		$tax_percentages[$tax_type] = $adb->query_result($res,0,'percentage');	
 	}
 	
@@ -84,7 +84,7 @@
 	foreach($new_percentages as $tax_type => $new_val)
 	{
 		if($new_val != '')
-			$res = $adb->query("update inventorytaxinfo set percentage = \"$new_val\" where taxname=\"$tax_type\"");
+			$res = $adb->query("update vtiger_inventorytaxinfo set percentage = \"$new_val\" where taxname=\"$tax_type\"");
 	}
 
 	$log->debug("Exiting from the function updateTaxPercentages");

Modified: vtigercrm/trunk/modules/Settings/add2db.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/add2db.php (original)
+++ vtigercrm/trunk/modules/Settings/add2db.php Mon Jun 12 14:26:25 2006
@@ -99,7 +99,7 @@
 		if(!isset($organization_logoname))
 			$organization_logoname="";
 
-		$sql="SELECT * FROM organizationdetails WHERE organizationame = ".$adb->quote($org_name);
+		$sql="SELECT * FROM vtiger_organizationdetails WHERE organizationame = ".$adb->quote($org_name);
 		$result = $adb->query($sql);
 		$org_name = $adb->query_result($result,0,'organizationame');
 		$org_logo = $adb->query_result($result,0,'logoname'); 
@@ -107,7 +107,7 @@
 
 		if($org_name=='')
 		{
-			$sql="INSERT INTO organizationdetails
+			$sql="INSERT INTO vtiger_organizationdetails
 				(organizationame, address, city, state, code, country, phone, fax, website, logoname)
 				VALUES (".$adb->quote($organization_name).
 					",".$adb->quote($organization_address).
@@ -142,7 +142,7 @@
 				$organization_logoname=$org_logo;
 			}
 
-			$sql = "UPDATE organizationdetails
+			$sql = "UPDATE vtiger_organizationdetails
 				SET organizationame = ".$adb->quote($organization_name).",
 					address = ".$adb->quote($organization_address).",
 					city = ".$adb->quote($organization_city).",

Modified: vtigercrm/trunk/modules/Settings/downloadfile.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/downloadfile.php (original)
+++ vtigercrm/trunk/modules/Settings/downloadfile.php Mon Jun 12 14:26:25 2006
@@ -17,7 +17,7 @@
 
 $fileid = $_REQUEST['fileid'];
 
-//$dbQuery = "SELECT * from seattachmentsrel where crmid = '" .$fileid ."'";
+//$dbQuery = "SELECT * from vtiger_seattachmentsrel where crmid = '" .$fileid ."'";
 //$attachmentsid = $adb->query_result($adb->query($dbQuery),0,'attachmentsid');
 $attachmentsid = $fileid;
 
@@ -26,7 +26,7 @@
 if($_REQUEST['activity_type']=='Settings')
 	$attachmentsid=$fileid;
 
-$dbQuery = "SELECT * FROM organizationdetails ";
+$dbQuery = "SELECT * FROM vtiger_organizationdetails ";
 
 $result = $adb->query($dbQuery) or die("Couldn't get file list");
 if($adb->num_rows($result) == 1)

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 Jun 12 14:26:25 2006
@@ -62,7 +62,7 @@
 
 'LBL_EMAIL_ADDRESS'=>'Email',
 
-'LBL_TRANSCURR'=>'Transfer User currency to',
+'LBL_TRANSCURR'=>'Transfer User vtiger_currency to',
 
 'LBL_CURRDEL'=>'Currency to be Deleted',
 
@@ -273,7 +273,7 @@
 'LBL_TOOL'=>'Tool',
 
 
-//Added fields for Title Informations -- after 4 Beta
+//Added vtiger_fields for Title Informations -- after 4 Beta
 
 'LBL_EMAIL_CONFIG'=>'Outgoing Mail Server Configuration',
 
@@ -291,7 +291,7 @@
 
 
 
-//Added fields after RC1 - Release
+//Added vtiger_fields after RC1 - Release
 
 'LBL_MAIL_SERVER_INFO'=>'Mail Server Information',
 
@@ -337,13 +337,13 @@
 
 'LBL_ROLES'=>'Roles',
 
-'LBL_CREATE_AND_MANAGE_USER_ROLES'=>'- Create and Manage user roles (e.g., Administrator, Standard User, etc.)',
+'LBL_CREATE_AND_MANAGE_USER_ROLES'=>'- Create and Manage user vtiger_roles (e.g., Administrator, Standard User, etc.)',
 
 'LBL_PROFILES'=>'Profiles',
 
-'LBL_CREATE_AND_MANAGE_USER_PROFILES'=>'- Create and Manage user profiles (e.g., CEO, Sales Manager, etc.)',
-
-'LBL_CREATE_AND_MANAGE_USER_GROUPS'=>'- Create and Manage user groups',
+'LBL_CREATE_AND_MANAGE_USER_PROFILES'=>'- Create and Manage user vtiger_profiles (e.g., CEO, Sales Manager, etc.)',
+
+'LBL_CREATE_AND_MANAGE_USER_GROUPS'=>'- Create and Manage user vtiger_groups',
 
 'LBL_SHARING_ACCESS'=>'Sharing Access',
 
@@ -357,8 +357,8 @@
 
 'LBL_FIELD_ACCESSIBILITY'=>'Field Accessibility',
 
-'LBL_SETTING_FIELD_ACCESSIBILITY'=>' - Setting Field Accessibility for each profiles',
-//<<<<<<<<for edit ordering blocks>>>>>>
+'LBL_SETTING_FIELD_ACCESSIBILITY'=>' - Setting Field Accessibility for each vtiger_profiles',
+//<<<<<<<<for edit ordering vtiger_blocks>>>>>>
 'LBL_FIELD_ORDERING_DESC'=>' - Edit Field Order',
 
 'LBL_FIELD_ORDERING'=>'Edit Field Blocks',
@@ -393,7 +393,7 @@
 
 'LBL_CUSTOM_FIELD_SETTINGS'=>'Custom Field Settings',
 
-'LBL_CREATE_AND_MANAGE_USER_DEFINED_FIELDS'=>'Create and Manage user defined fields...',
+'LBL_CREATE_AND_MANAGE_USER_DEFINED_FIELDS'=>'Create and Manage user defined vtiger_fields...',
 
 'LBL_SELECT_MODULE'=>'Select Module',
 
@@ -403,7 +403,7 @@
 
 'LBL_PICKLIST_SETTINGS'=>'Picklist Settings',
 
-'LBL_EDIT_PICKLIST_VALUES'=>' - Edit values of Picklist fields',
+'LBL_EDIT_PICKLIST_VALUES'=>' - Edit values of Picklist vtiger_fields',
 
 'LBL_EDIT'=>'Editing',
 
@@ -433,7 +433,7 @@
 
 
 
-//Field Types for custom fields
+//Field Types for custom vtiger_fields
 
 'LBL_URL'=>'URL',
 
@@ -487,10 +487,10 @@
 'LBL_LIST_PASSWORD'=>'Password',
 'LBL_MAIL_SERVER_NAME'=>'Mail Server Name or IP',
 'LBL_MAIL_SERVER_SETTINGS'=>'Mail Server Settings',
-'LBL_TEST_SETTINGS'=>'Test my account setting immediately',
-'LBL_TEST_BUTTON_TITLE'=>'Test my account now! [Alt+T]',
+'LBL_TEST_SETTINGS'=>'Test my vtiger_account setting immediately',
+'LBL_TEST_BUTTON_TITLE'=>'Test my vtiger_account now! [Alt+T]',
 'LBL_TEST_BUTTON_KEY'=>'T',
-'LBL_TEST_BUTTON_LABEL'=>'Test my account now!',
+'LBL_TEST_BUTTON_LABEL'=>'Test my vtiger_account now!',
 'LBL_DEFAULT'=>'Default',
 'LBL_IMAP2'=>'IMAP2',
 'LBL_IMAP4'=>'IMAP4',
@@ -573,8 +573,8 @@
 
 //For Custom Fields
 'LBL_LEAD_MAP_CUSTOM_FIELD'=>'Mapping Lead Custom Fields',
-'leadCustomFieldDescription'=>'Map each of your organizations lead custom fields to each of your custom account
-,contact, or potential fields. These mappings will be used when you convert leads',
+'leadCustomFieldDescription'=>'Map each of your organizations lead custom vtiger_fields to each of your custom vtiger_account
+,contact, or vtiger_potential vtiger_fields. These mappings will be used when you convert leads',
 'LBL_MAPPING_INFO'=>'Mapping Information',
 'LBL_ACCOUNT_FIELD'=>'Account Custom Field',
 'LBL_CONTACT_FIELD'=>'Contact Custom Field',
@@ -584,10 +584,10 @@
 'LBL_LEAD_FIELD'=>'Lead Custom Field',
 //After 4.2 GA
 'LBL_TEXT_AREA'=>'Text Area',
-//for Edit ordering the blocks
+//for Edit ordering the vtiger_blocks
 'NOTESCUSTOMFIELDS'=>'Notes Custom Fields',
 
-//Added fields after 4.2 ptach 2
+//Added vtiger_fields after 4.2 ptach 2
 'LBL_ASSIGN_MODULE_OWNERS'=>'Assign Module Owners',
 'LBL_MODULE_OWNERS'=>'Module Owners',
 'LBL_ASSIGN_MODULE_OWNERS_INFO'=>' - Assign Owners for each modules',
@@ -601,12 +601,12 @@
 'LBL_USER_DESCRIPTION'=>'Manage Users list who access CRM',
 'LBL_ROLE_DESCRIPTION'=>'Define hierarchy of Roles and assign to Users',
 'LBL_PROFILE_DESCRIPTION'=>'Define Profiles to provide access rights to each Role',
-'LBL_GROUP_DESCRIPTION'=>'Define Groups based on roles, users, profiles etc',
+'LBL_GROUP_DESCRIPTION'=>'Define Groups based on vtiger_roles, vtiger_users, vtiger_profiles etc',
 'LBL_SHARING_ACCESS_DESCRIPTION'=>'Define privileges for each Role to access CRM modules',
-'LBL_SHARING_FIELDS_DESCRIPTION'=>'Show or hide fields in each CRM Module',
+'LBL_SHARING_FIELDS_DESCRIPTION'=>'Show or hide vtiger_fields in each CRM Module',
 'LBL_MODULE_OWNERS_DESCRIPTION'=>'Assign Owners for each CRM module',
 'LBL_ANNOUNCEMENT_DESCRIPTION'=>'Edit the contents of Announcements display',
-'LBL_CUSTOM_FIELDS_DESCRIPTION'=>'Create and Manage user-defined fields',
+'LBL_CUSTOM_FIELDS_DESCRIPTION'=>'Create and Manage user-defined vtiger_fields',
 'LBL_PICKLIST_DESCRIPTION'=>'Manage contents of Picklists in all CRM Modules',
 'LBL_EMAIL_TEMPLATE_DESCRIPTION'=>'Manage templates for E-Mail module',
 'LBL_MAIL_MERGE_DESCRIPTION'=>'Manage templates for Mail Merging',
@@ -621,11 +621,11 @@
 
 
 
-//Added fields after 5.0 Alpha
+//Added vtiger_fields after 5.0 Alpha
 'LBL_REQUIRE_SMTP_AUTHENTICATION'=>'Require SMTP Authentication?',
 'LBL_ANNOUNCEMENT'=>'Announcements',
 'LBL_SETTING_ANNOUNCEMENT'=>'Announcement',
-'LBL_ANNOUNCEMENT_INFO'=>'Type the announcement text below, and click the save button.',
+'LBL_ANNOUNCEMENT_INFO'=>'Type the vtiger_announcement text below, and click the save button.',
 'LBL_EMAIL_CONTENTS'=>'Email Contents',
 'LBL_SUBJECT'=>'Subject',
 'LBL_MESSAGE'=>'Message',

Modified: vtigercrm/trunk/modules/Users/Announcements.php
==============================================================================
--- vtigercrm/trunk/modules/Users/Announcements.php (original)
+++ vtigercrm/trunk/modules/Users/Announcements.php Mon Jun 12 14:26:25 2006
@@ -15,7 +15,7 @@
 global $theme;
 $theme_path="themes/".$theme."/";
 $image_path=$theme_path."images/";
-$query="select * from announcement where creatorid=".$current_user->id;
+$query="select * from vtiger_announcement where creatorid=".$current_user->id;
 $result=$adb->query($query);
 $announcement=$adb->query_result($result,0,'announcement');
 $title_prev=$adb->query_result($result,0,'title');

Modified: vtigercrm/trunk/modules/Users/Authenticate.php
==============================================================================
--- vtigercrm/trunk/modules/Users/Authenticate.php (original)
+++ vtigercrm/trunk/modules/Users/Authenticate.php Mon Jun 12 14:26:25 2006
@@ -55,7 +55,7 @@
 	//$rolename = fetchUserRole($focus->id);
 	//$profilename = fetchUserProfile($focus->id);
 	$profileid = fetchUserProfileId($focus->id);	
-	//setting the role into the session
+	//setting the vtiger_role into the session
 	//$_SESSION['authenticated_user_roleid'] = $profilename;
 
 	//Setting the Object in Session
@@ -128,7 +128,7 @@
         $log->debug("app_unique_key is $application_unique_key");
 
 	
-// Clear all uploaded import files for this user if it exists
+// Clear all uploaded import vtiger_files for this user if it exists
 
 	global $import_dir;
 

Modified: vtigercrm/trunk/modules/Users/ChangePassword.php
==============================================================================
--- vtigercrm/trunk/modules/Users/ChangePassword.php (original)
+++ vtigercrm/trunk/modules/Users/ChangePassword.php Mon Jun 12 14:26:25 2006
@@ -88,17 +88,17 @@
 <?php if (!is_admin($current_user)) {
 	echo "<tr>";
 	echo "<td width='40%' class='dvtCellLabel' align='right'><b>".$mod_strings['LBL_OLD_PASSWORD']."</b></td>\n";
-	echo "<td width='60%' class='dvtCellInfo'><input name='old_password' type='password' tabindex='1' size='15' maxlength='15'></td>\n";
+	echo "<td width='60%' class='dvtCellInfo'><input name='old_password' type='password' vtiger_tabindex='1' size='15' maxlength='15'></td>\n";
 	echo "<input name='is_admin' type='hidden' value='1'>";
 	echo "</tr><tr>\n";
 }
 else echo "<input name='old_password' type='hidden'><input name='is_admin' type='hidden' value='0'>";
 ?>
 <td width='40%' class='dvtCellLabel' nowrap align="right"><b><?php echo $mod_strings['LBL_NEW_PASSWORD']; ?></b></td>
-<td width='60%' class='dvtCellInfo'><input name='new_password' type='password' tabindex='1' size='15' maxlength='15'></td>
+<td width='60%' class='dvtCellInfo'><input name='new_password' type='password' vtiger_tabindex='1' size='15' maxlength='15'></td>
 </tr><tr>
 <td width='40%' class='dvtCellLabel' nowrap align="right"><b><?php echo $mod_strings['LBL_CONFIRM_PASSWORD']; ?></b></td>
-<td width='60%' class='dvtCellInfo'><input name='confirm_new_password' type='password' tabindex='1' size='15' maxlength='15'></td>
+<td width='60%' class='dvtCellInfo'><input name='confirm_new_password' type='password' vtiger_tabindex='1' size='15' maxlength='15'></td>
 </tr><tr>
 <td width='40%' class='dataLabel'></td>
 <td width='60%' class='dvtCellInfo'></td>

Modified: vtigercrm/trunk/modules/Users/CreateProfile.php
==============================================================================
--- vtigercrm/trunk/modules/Users/CreateProfile.php (original)
+++ vtigercrm/trunk/modules/Users/CreateProfile.php Mon Jun 12 14:26:25 2006
@@ -33,7 +33,7 @@
 if(isset($_REQUEST['profileid']) && $_REQUEST['profileid'] != '')
 {
 	global $adb;	
-	$sql = "select * from profile where profileid=".$_REQUEST['profileid'];
+	$sql = "select * from vtiger_profile where vtiger_profileid=".$_REQUEST['profileid'];
 	$profileResult = $adb->query($sql);
 	$profile_name = $adb->query_result($profileResult,0,"profilename");
 	$profile_description = $adb->query_result($profileResult,0,"description");

Modified: vtigercrm/trunk/modules/Users/CreateProfile1.php
==============================================================================
--- vtigercrm/trunk/modules/Users/CreateProfile1.php (original)
+++ vtigercrm/trunk/modules/Users/CreateProfile1.php Mon Jun 12 14:26:25 2006
@@ -18,7 +18,7 @@
 
 if(isset($_REQUEST['dup_check']) && $_REQUEST['dup_check']!='')
 {
-        $query = 'select profilename from profile where profilename="'.$profilename.'"';
+        $query = 'select vtiger_profilename from vtiger_profile where vtiger_profilename="'.$profilename.'"';
         $result = $adb->query($query);
 
         if($adb->num_rows($result) > 0)
@@ -55,7 +55,7 @@
 $smarty->assign("APP", $app_strings);
 $smarty->assign("CMOD", $mod_strings);
 
-$sql = "select * from profile";
+$sql = "select * from vtiger_profile";
 $result = $adb->query($sql);
 $profilelist = array();
 $temprow = $adb->fetch_array($result);

Modified: vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php
==============================================================================
--- vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php (original)
+++ vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php Mon Jun 12 14:26:25 2006
@@ -132,7 +132,7 @@
 
 			//Constructing the Related Module Sharing Array
 			$relModSharArr=Array();	
-			$query ="select * from datashare_relatedmodules";
+			$query ="select * from vtiger_datashare_relatedmodules";
                 	$result=$adb->query($query);
                 	$num_rows = $adb->num_rows($result);
                 	for($i=0;$i<$num_rows;$i++)
@@ -390,8 +390,8 @@
 		$rs_write_per=Array();
 		$grp_read_per=Array();
 		$grp_write_per=Array();
-		//Retreiving from role to role
-		$query="select datashare_role2role.* from datashare_role2role inner join datashare_module_rel on datashare_module_rel.shareid=datashare_role2role.shareid where datashare_module_rel.tabid=".$mod_tabid." and datashare_role2role.to_roleid='".$current_user_roles."'";
+		//Retreiving from vtiger_role to vtiger_role
+		$query="select vtiger_datashare_role2role.* from vtiger_datashare_role2role inner join vtiger_datashare_module_rel on vtiger_datashare_module_rel.shareid=vtiger_datashare_role2role.shareid where vtiger_datashare_module_rel.tabid=".$mod_tabid." and vtiger_datashare_role2role.to_roleid='".$current_user_roles."'";
 		$result=$adb->query($query);
 		$num_rows=$adb->num_rows($result);
 		for($i=0;$i<$num_rows;$i++)
@@ -439,14 +439,14 @@
 
 
 
-		//Retreiving from role to rs
+		//Retreiving from vtiger_role to rs
 		$parRoleList = "(";
 		foreach($parent_roles as $par_role_id)
 		{
 			$parRoleList .= "'".$par_role_id."',";		
 		}
 		$parRoleList .= "'".$current_user_roles."')";
-		$query="select datashare_role2rs.* from datashare_role2rs inner join datashare_module_rel on datashare_module_rel.shareid=datashare_role2rs.shareid where datashare_module_rel.tabid=".$mod_tabid." and datashare_role2rs.to_roleandsubid in ".$parRoleList;
+		$query="select vtiger_datashare_role2rs.* from vtiger_datashare_role2rs inner join vtiger_datashare_module_rel on vtiger_datashare_module_rel.shareid=vtiger_datashare_role2rs.shareid where vtiger_datashare_module_rel.tabid=".$mod_tabid." and vtiger_datashare_role2rs.to_roleandsubid in ".$parRoleList;
 		$result=$adb->query($query);
 		$num_rows=$adb->num_rows($result);
 		for($i=0;$i<$num_rows;$i++)
@@ -493,7 +493,7 @@
 		}
 
 
-		//Get roles from Role2Grp
+		//Get vtiger_roles from Role2Grp
 		$grpIterator=false;
 		$groupList = "(";
 		foreach($current_user_groups as $grp_id)
@@ -507,7 +507,7 @@
 		}
 		$groupList .= ")";
 
-		$query="select datashare_role2group.* from datashare_role2group inner join datashare_module_rel on datashare_module_rel.shareid=datashare_role2group.shareid where datashare_module_rel.tabid=".$mod_tabid." and datashare_role2group.to_groupid in ".$groupList;
+		$query="select vtiger_datashare_role2group.* from vtiger_datashare_role2group inner join vtiger_datashare_module_rel on vtiger_datashare_module_rel.shareid=vtiger_datashare_role2group.shareid where vtiger_datashare_module_rel.tabid=".$mod_tabid." and vtiger_datashare_role2group.to_groupid in ".$groupList;
 		$result=$adb->query($query);
 		$num_rows=$adb->num_rows($result);
 		for($i=0;$i<$num_rows;$i++)
@@ -554,8 +554,8 @@
 
 
 
-		//Retreiving from rs to role
-		$query="select datashare_rs2role.* from datashare_rs2role inner join datashare_module_rel on datashare_module_rel.shareid=datashare_rs2role.shareid where datashare_module_rel.tabid=".$mod_tabid." and datashare_rs2role.to_roleid='".$current_user_roles."'";
+		//Retreiving from rs to vtiger_role
+		$query="select vtiger_datashare_rs2role.* from vtiger_datashare_rs2role inner join vtiger_datashare_module_rel on vtiger_datashare_module_rel.shareid=vtiger_datashare_rs2role.shareid where vtiger_datashare_module_rel.tabid=".$mod_tabid." and vtiger_datashare_rs2role.to_roleid='".$current_user_roles."'";
 		$result=$adb->query($query);
 		$num_rows=$adb->num_rows($result);
 		for($i=0;$i<$num_rows;$i++)
@@ -614,7 +614,7 @@
 			$parRoleList .= "'".$par_role_id."',";		
 		}
 		$parRoleList .= "'".$current_user_roles."')";
-		$query="select datashare_rs2rs.* from datashare_rs2rs inner join datashare_module_rel on datashare_module_rel.shareid=datashare_rs2rs.shareid where datashare_module_rel.tabid=".$mod_tabid." and datashare_rs2rs.to_roleandsubid in ".$parRoleList;
+		$query="select vtiger_datashare_rs2rs.* from vtiger_datashare_rs2rs inner join vtiger_datashare_module_rel on vtiger_datashare_module_rel.shareid=vtiger_datashare_rs2rs.shareid where vtiger_datashare_module_rel.tabid=".$mod_tabid." and vtiger_datashare_rs2rs.to_roleandsubid in ".$parRoleList;
 		$result=$adb->query($query);
 		$num_rows=$adb->num_rows($result);
 		for($i=0;$i<$num_rows;$i++)
@@ -666,10 +666,10 @@
 		}
 
 
-		//Get roles from Rs2Grp
-
-
-		$query="select datashare_rs2grp.* from datashare_rs2grp inner join datashare_module_rel on datashare_module_rel.shareid=datashare_rs2grp.shareid where datashare_module_rel.tabid=".$mod_tabid." and datashare_rs2grp.to_groupid in ".$groupList;
+		//Get vtiger_roles from Rs2Grp
+
+
+		$query="select vtiger_datashare_rs2grp.* from vtiger_datashare_rs2grp inner join vtiger_datashare_module_rel on vtiger_datashare_module_rel.shareid=vtiger_datashare_rs2grp.shareid where vtiger_datashare_module_rel.tabid=".$mod_tabid." and vtiger_datashare_rs2grp.to_groupid in ".$groupList;
 		$result=$adb->query($query);
 		$num_rows=$adb->num_rows($result);
 		for($i=0;$i<$num_rows;$i++)
@@ -726,7 +726,7 @@
 		$mod_share_write_permission['ROLE']=$role_write_per;
 		
 		//Retreiving from the grp2role sharing
-		$query="select datashare_grp2role.* from datashare_grp2role inner join datashare_module_rel on datashare_module_rel.shareid=datashare_grp2role.shareid where datashare_module_rel.tabid=".$mod_tabid." and datashare_grp2role.to_roleid='".$current_user_roles."'";
+		$query="select vtiger_datashare_grp2role.* from vtiger_datashare_grp2role inner join vtiger_datashare_module_rel on vtiger_datashare_module_rel.shareid=vtiger_datashare_grp2role.shareid where vtiger_datashare_module_rel.tabid=".$mod_tabid." and vtiger_datashare_grp2role.to_roleid='".$current_user_roles."'";
 		$result=$adb->query($query);
 		$num_rows=$adb->num_rows($result);
 		for($i=0;$i<$num_rows;$i++)
@@ -817,7 +817,7 @@
 		//Retreiving from the grp2rs sharing
 
 
-		$query="select datashare_grp2rs.* from datashare_grp2rs inner join datashare_module_rel on datashare_module_rel.shareid=datashare_grp2rs.shareid where datashare_module_rel.tabid=".$mod_tabid." and datashare_grp2rs.to_roleandsubid in ".$parRoleList;
+		$query="select vtiger_datashare_grp2rs.* from vtiger_datashare_grp2rs inner join vtiger_datashare_module_rel on vtiger_datashare_module_rel.shareid=vtiger_datashare_grp2rs.shareid where vtiger_datashare_module_rel.tabid=".$mod_tabid." and vtiger_datashare_grp2rs.to_roleandsubid in ".$parRoleList;
 		$result=$adb->query($query);
 		$num_rows=$adb->num_rows($result);
 		for($i=0;$i<$num_rows;$i++)
@@ -907,7 +907,7 @@
 
 		//Retreiving from the grp2grp sharing
 
-		$query="select datashare_grp2grp.* from datashare_grp2grp inner join datashare_module_rel on datashare_module_rel.shareid=datashare_grp2grp.shareid where datashare_module_rel.tabid=".$mod_tabid." and datashare_grp2grp.to_groupid in ".$groupList;
+		$query="select vtiger_datashare_grp2grp.* from vtiger_datashare_grp2grp inner join vtiger_datashare_module_rel on vtiger_datashare_module_rel.shareid=vtiger_datashare_grp2grp.shareid where vtiger_datashare_module_rel.tabid=".$mod_tabid." and vtiger_datashare_grp2grp.to_groupid in ".$groupList;
 		$result=$adb->query($query);
 		$num_rows=$adb->num_rows($result);
 		for($i=0;$i<$num_rows;$i++)
@@ -1031,7 +1031,7 @@
 
 		foreach($mod_sharingrule_members as $sharingid => $sharingInfoArr)
 		{
-			$query = "select datashare_relatedmodule_permission.* from datashare_relatedmodule_permission inner join datashare_relatedmodules on datashare_relatedmodules.datashare_relatedmodule_id=datashare_relatedmodule_permission.datashare_relatedmodule_id where datashare_relatedmodule_permission.shareid=".$sharingid." and datashare_relatedmodules.tabid=".$par_mod_id." and datashare_relatedmodules.relatedto_tabid=".$share_mod_id;
+			$query = "select vtiger_datashare_relatedmodule_permission.* from vtiger_datashare_relatedmodule_permission inner join vtiger_datashare_relatedmodules on vtiger_datashare_relatedmodules.datashare_relatedmodule_id=vtiger_datashare_relatedmodule_permission.datashare_relatedmodule_id where vtiger_datashare_relatedmodule_permission.shareid=".$sharingid." and vtiger_datashare_relatedmodules.tabid=".$par_mod_id." and vtiger_datashare_relatedmodules.relatedto_tabid=".$share_mod_id;
 			$result = $adb->query($query);
 			$share_permission=$adb->query_result($result,0,'permission');	
 
@@ -1410,7 +1410,7 @@
 {
 	global $adb;
 	require('user_privileges/sharing_privileges_'.$userid.'.php');
-	//Deleting from the existing tables
+	//Deleting from the existing vtiger_tables
 	$table_arr=Array('tmp_read_user_sharing_per', 'tmp_write_user_sharing_per','tmp_read_group_sharing_per','tmp_write_group_sharing_per','tmp_read_user_rel_sharing_per','tmp_write_user_rel_sharing_per','tmp_read_group_rel_sharing_per','tmp_write_group_rel_sharing_per');
 	foreach($table_arr as $tabname)
 	{
@@ -1418,7 +1418,7 @@
 		$adb->query($query);
 	}
 
-	//Populating Values into the tmp sharing tables
+	//Populating Values into the tmp sharing vtiger_tables
 	$sharingArray=Array('Leads','Accounts','Contacts','Potentials','HelpDesk','Emails','Campaigns','Quotes','PurchaseOrder','SalesOrder','Invoice');
 	foreach($sharingArray as $module)
 	{
@@ -1427,7 +1427,7 @@
 		populateSharingPrivileges('GROUP',$userid,$module,'read');
 		populateSharingPrivileges('GROUP',$userid,$module,'write');
 	}
-	//Populating Values into the temp related sharing tables
+	//Populating Values into the temp related sharing vtiger_tables
 	foreach($related_module_share as $rel_tab_id => $tabid_arr)
 	{
 		$rel_tab_name=getTabname($rel_tab_id);

Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original)
+++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Mon Jun 12 14:26:25 2006
@@ -1,2118 +1,2118 @@
-<?php
-
-/*********************************************************************************
-** The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is:  vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
- ********************************************************************************/
-
-include_once('config.php');
-require_once('include/logging.php');
-require_once('include/database/PearDatabase.php');
-require_once('data/SugarBean.php');
-require_once('data/CRMEntity.php');
-require_once('include/utils/utils.php');
-
-class DefaultDataPopulator extends CRMEntity {
-		
-	function DefaultDataPopulator() {
-		$this->log = LoggerManager::getLogger('DefaultDataPopulator');
-		$this->db = new PearDatabase();
-	}
-
-	var $new_schema = true;
-
-	function create_tables () {
-		global $app_strings;
-
-		$role1_id = $this->db->getUniqueID("role");
-		$role2_id = $this->db->getUniqueID("role");
-		$role3_id = $this->db->getUniqueID("role");
-
-		$profile1_id = $this->db->getUniqueID("profile");
-		$profile2_id = $this->db->getUniqueID("profile");
-		$profile3_id = $this->db->getUniqueID("profile");
-		$profile4_id = $this->db->getUniqueID("profile");
-
-                $this->db->query("insert into role values('H".$role1_id."','Organisation','H".$role1_id."',0)");
-                $this->db->query("insert into role values('H".$role2_id."','administrator','H".$role1_id."::H".$role2_id."',1)");
-                $this->db->query("insert into role values('H".$role3_id."','standard_user','H".$role1_id."::H".$role2_id."::H".$role3_id."',2)");
-                
-
- $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',0,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,'Vendors',0,15,'Vendors',null,null,1)");
- $this->db->query("INSERT INTO tab VALUES (19,'PriceBooks',0,16,'PriceBooks',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,'PurchaseOrder',0,18,'PurchaseOrder',null,null,1)");
- $this->db->query("INSERT INTO tab VALUES (22,'SalesOrder',0,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)");
- $this->db->query("INSERT INTO tab VALUES (26,'Campaigns',0,23,'Campaigns',null,null,1)");
- $this->db->query("INSERT INTO tab VALUES (27,'Portal',0,24,'Portal',null,null,1)");
- $this->db->query("INSERT INTO tab VALUES (28,'Webmails',0,25,'Webmails',null,null,1)");
-
-// Populate the blocks table
-$this->db->query("insert into blocks values (1,2,'LBL_OPPORTUNITY_INFORMATION',1,0,0,0,0,0)");
-$this->db->query("insert into blocks values (2,2,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
-$this->db->query("insert into blocks values (3,2,'LBL_DESCRIPTION_INFORMATION',3,0,0,0,0,0)");
-$this->db->query("insert into blocks values (4,4,'LBL_CONTACT_INFORMATION',1,0,0,0,0,0)");
-$this->db->query("insert into blocks values (5,4,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
-$this->db->query("insert into blocks values (6,4,'LBL_CUSTOMER_PORTAL_INFORMATION',3,0,0,0,0,0)");
-$this->db->query("insert into blocks values (7,4,'LBL_ADDRESS_INFORMATION',4,0,0,0,0,0)");
-$this->db->query("insert into blocks values (8,4,'LBL_DESCRIPTION_INFORMATION',6,0,0,0,0,0)");
-$this->db->query("insert into blocks values (9,6,'LBL_ACCOUNT_INFORMATION',1,0,0,0,0,0)");
-$this->db->query("insert into blocks values (10,6,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
-$this->db->query("insert into blocks values (11,6,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)");
-$this->db->query("insert into blocks values (12,6,'LBL_DESCRIPTION_INFORMATION',4,0,0,0,0,0)");
-$this->db->query("insert into blocks values (13,7,'LBL_LEAD_INFORMATION',1,0,0,0,0,0)");
-$this->db->query("insert into blocks values (14,7,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
-$this->db->query("insert into blocks values (15,7,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)");
-$this->db->query("insert into blocks values (16,7,'LBL_DESCRIPTION_INFORMATION',4,0,0,0,0,0)");
-$this->db->query("insert into blocks values (17,8,'LBL_NOTE_INFORMATION',1,0,0,0,0,0)");
-$this->db->query("insert into blocks values (18,8,'',2,1,0,0,0,0)");
-$this->db->query("insert into blocks values (19,9,'LBL_TASK_INFORMATION',1,0,0,0,0,0)");
-$this->db->query("insert into blocks values (20,9,'',2,1,0,0,0,0)");
-$this->db->query("insert into blocks values (21,10,'LBL_EMAIL_INFORMATION',1,0,0,0,0,0)");
-$this->db->query("insert into blocks values (22,10,'',2,1,0,0,0,0)");
-$this->db->query("insert into blocks values (23,10,'',3,1,0,0,0,0)");
-$this->db->query("insert into blocks values (24,10,'',4,1,0,0,0,0)");
-$this->db->query("insert into blocks values (25,13,'LBL_TICKET_INFORMATION',1,0,0,0,0,0)");
-$this->db->query("insert into blocks values (26,13,'',2,1,0,0,0,0)");
-$this->db->query("insert into blocks values (27,13,'LBL_CUSTOM_INFORMATION',3,0,0,0,0,0)");
-$this->db->query("insert into blocks values (28,13,'LBL_DESCRIPTION_INFORMATION',4,0,0,0,0,0)");
-$this->db->query("insert into blocks values (29,13,'LBL_TICKET_RESOLUTION',5,0,0,1,0,0)");
-$this->db->query("insert into blocks values (30,13,'LBL_COMMENTS',6,0,0,1,0,0)");
-$this->db->query("insert into blocks values (31,14,'LBL_PRODUCT_INFORMATION',1,0,0,0,0,0)");
-$this->db->query("insert into blocks values (32,14,'LBL_PRICING_INFORMATION',2,0,0,0,0,0)");
-$this->db->query("insert into blocks values (33,14,'LBL_STOCK_INFORMATION',3,0,0,0,0,0)");
-$this->db->query("insert into blocks values (34,14,'LBL_CUSTOM_INFORMATION',4,0,0,0,0,0)");
-$this->db->query("insert into blocks values (35,14,'LBL_IMAGE_INFORMATION',5,0,0,0,0,0)");
-$this->db->query("insert into blocks values (36,14,'LBL_DESCRIPTION_INFORMATION',6,0,0,0,0,0)");
-$this->db->query("insert into blocks values (37,15,'LBL_FAQ_INFORMATION',1,0,0,0,0,0)");
-$this->db->query("insert into blocks values (38,15,'',2,1,0,0,0,0)");
-$this->db->query("insert into blocks values (39,15,'',3,1,0,0,0,0)");
-$this->db->query("insert into blocks values (40,15,'LBL_COMMENT_INFORMATION',4,0,0,1,0,0)");
-$this->db->query("insert into blocks values (41,16,'LBL_EVENT_INFORMATION',1,0,0,0,0,0)");
-$this->db->query("insert into blocks values (42,16,'',2,1,0,0,0,0)");
-$this->db->query("insert into blocks values (43,16,'',3,1,0,0,0,0)");
-$this->db->query("insert into blocks values (44,18,'LBL_VENDOR_INFORMATION',1,0,0,0,0,0)");
-$this->db->query("insert into blocks values (45,18,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
-$this->db->query("insert into blocks values (46,18,'LBL_VENDOR_ADDRESS_INFORMATION',3,0,0,0,0,0)");
-$this->db->query("insert into blocks values (47,18,'LBL_DESCRIPTION_INFORMATION',4,0,0,0,0,0)");
-$this->db->query("insert into blocks values (48,19,'LBL_PRICEBOOK_INFORMATION',1,0,0,0,0,0)");
-$this->db->query("insert into blocks values (49,19,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
-$this->db->query("insert into blocks values (50,19,'LBL_DESCRIPTION_INFORMATION',3,0,0,0,0,0)");
-$this->db->query("insert into blocks values (51,20,'LBL_QUOTE_INFORMATION',1,0,0,0,0,0)");
-$this->db->query("insert into blocks values (52,20,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
-$this->db->query("insert into blocks values (53,20,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)");
-$this->db->query("insert into blocks values (54,20,'LBL_RELATED_PRODUCTS',4,0,0,0,0,0)");
-$this->db->query("insert into blocks values (55,20,'LBL_TERMS_INFORMATION',5,0,0,0,0,0)");
-$this->db->query("insert into blocks values (56,20,'LBL_DESCRIPTION_INFORMATION',6,0,0,0,0,0)");
-$this->db->query("insert into blocks values (57,21,'LBL_PO_INFORMATION',1,0,0,0,0,0)");
-$this->db->query("insert into blocks values (58,21,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
-$this->db->query("insert into blocks values (59,21,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)");
-$this->db->query("insert into blocks values (60,21,'LBL_RELATED_PRODUCTS',4,0,0,0,0,0)");
-$this->db->query("insert into blocks values (61,21,'LBL_TERMS_INFORMATION',5,0,0,0,0,0)");
-$this->db->query("insert into blocks values (62,21,'LBL_DESCRIPTION_INFORMATION',6,0,0,0,0,0)");
-$this->db->query("insert into blocks values (63,22,'LBL_SO_INFORMATION',1,0,0,0,0,0)");
-$this->db->query("insert into blocks values (64,22,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
-$this->db->query("insert into blocks values (65,22,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)");
-$this->db->query("insert into blocks values (66,22,'LBL_RELATED_PRODUCTS',4,0,0,0,0,0)");
-$this->db->query("insert into blocks values (67,22,'LBL_TERMS_INFORMATION',5,0,0,0,0,0)");
-$this->db->query("insert into blocks values (68,22,'LBL_DESCRIPTION_INFORMATION',6,0,0,0,0,0)");
-$this->db->query("insert into blocks values (69,23,'LBL_INVOICE_INFORMATION',1,0,0,0,0,0)");
-$this->db->query("insert into blocks values (70,23,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
-$this->db->query("insert into blocks values (71,23,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)");
-$this->db->query("insert into blocks values (72,23,'LBL_RELATED_PRODUCTS',4,0,0,0,0,0)");
-$this->db->query("insert into blocks values (73,23,'LBL_TERMS_INFORMATION',5,0,0,0,0,0)");
-$this->db->query("insert into blocks values (74,23,'LBL_DESCRIPTION_INFORMATION',6,0,0,0,0,0)");
-$this->db->query("insert into blocks values (75,4,'LBL_IMAGE_INFORMATION',5,0,0,0,0,0)");
-$this->db->query("insert into blocks values (76,26,'LBL_CAMPAIGN_INFORMATION',1,0,0,0,0,0)");
-$this->db->query("insert into blocks values (77,26,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
-$this->db->query("insert into blocks values (78,26,'LBL_DESCRIPTION_INFORMATION',3,0,0,0,0,0)");
-
-//
-
-//Account Details -- START
- //Block9
-
-$this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'accountname','account',1,'2','accountname','Account Name',1,0,0,100,1,9,1,'V~M',0,1,'BAS')");	
- $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'phone','account',1,'11','phone','Phone',1,0,0,100,2,9,1,'V~O',0,2,'BAS')");	
- $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'website','account',1,'17','website','Website',1,0,0,100,3,9,1,'V~O',0,3,'BAS')");	
-
- $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'fax','account',1,'1','fax','Fax',1,0,0,100,4,9,1,'V~O',1,null,'BAS')");	
- $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'tickersymbol','account',1,'1','tickersymbol','Ticker Symbol',1,0,0,100,5,9,1,'V~O',1,null,'BAS')");	
- $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'otherphone','account',1,'11','otherphone','Other Phone',1,0,0,100,6,9,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'parentid','account',1,'51','account_id','Member Of',1,0,0,100,7,9,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'email1','account',1,'13','email1','Email',1,0,0,100,8,9,1,'E~O',1,null,'BAS')");
- $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'employees','account',1,'7','employees','Employees',1,0,0,100,9,9,1,'I~O',1,null,'ADV')");
- $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'email2','account',1,'13','email2','Other Email',1,0,0,100,10,9,1,'E~O',1,null,'ADV')");
-
- $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'ownership','account',1,'1','ownership','Ownership',1,0,0,100,11,9,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'rating','account',1,'1','rating','Rating',1,0,0,100,12,9,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'industry','account',1,'15','industry','industry',1,0,0,100,13,9,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'siccode','account',1,'1','siccode','SIC Code',1,0,0,100,14,9,1,'I~O',1,null,'ADV')");
- $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'account_type','account',1,'15','accounttype','Type',1,0,0,100,15,9,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'annualrevenue','account',1,'71','annual_revenue','Annual Revenue',1,0,0,100,16,9,1,'I~O',1,null,'ADV')");
- //Added field emailoptout for accounts -- after 4.2 patch2
- $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'emailoptout','account',1,'56','emailoptout','Email Opt Out',1,0,0,100,17,9,1,'C~O',1,null,'ADV')");
- $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'notify_owner','account',1,56,'notify_owner','Notify Owner',1,0,0,10,18,9,1,'C~O',1,NULL,'ADV')");
- $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,19,9,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,20,9,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,21,9,2,'T~O',1,null,'BAS')");
-
-
-
-
- //Block 11
-$this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'street','accountbillads',1,'21','bill_street','Billing Address',1,0,0,100,1,11,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'street','accountshipads',1,'21','ship_street','Shipping Address',1,0,0,100,2,11,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'city','accountbillads',1,'1','bill_city','Billing City',1,0,0,100,5,11,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'city','accountshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,11,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'state','accountbillads',1,'1','bill_state','Billing State',1,0,0,100,7,11,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'state','accountshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,11,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'code','accountbillads',1,'1','bill_code','Billing Code',1,0,0,100,9,11,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'code','accountshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,11,1,'V~O',1,null,'BAS')");
-
-
- $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'country','accountbillads',1,'1','bill_country','Billing Country',1,0,0,100,11,11,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'country','accountshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,11,1,'V~O',1,null,'BAS')");
-
-$this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'pobox','accountbillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,11,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'pobox','accountshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,11,1,'V~O',1,null,'BAS')");
-
-
- //Block12
-$this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,12,1,'V~O',1,null,'BAS')");
- 
-
-
-//Account Details -- END
-
-			
-//Lead Details --- START
-
-//Block13 -- Start
-
-$this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'salutation','leaddetails',1,'55','salutationtype','Salutation',1,0,0,100,1,13,3,'V~O',1,null,'BAS')");	
- $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'firstname','leaddetails',1,'55','firstname','First Name',1,0,0,100,2,13,1,'V~O',0,1,'BAS')");	
- $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'phone','leadaddress',1,'11','phone','Phone',1,0,0,100,3,13,1,'V~O',0,4,'BAS')");	
-
- $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'lastname','leaddetails',1,'2','lastname','Last Name',1,0,0,100,4,13,1,'V~M',0,2,'BAS')");	
- $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'mobile','leadaddress',1,'1','mobile','Mobile',1,0,0,100,5,13,1,'V~O',1,null,'BAS')");	
- $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'company','leaddetails',1,'2','company','Company',1,0,0,100,6,13,1,'V~M',0,3,'BAS')");
- $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'campaignid','leaddetails',1,'51','campaignid','Campaign Name',1,0,0,100,6,4,3,'I~O',1,null,'BAS')");
- $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'fax','leadaddress',1,'1','fax','Fax',1,0,0,100,7,13,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'designation','leaddetails',1,'1','designation','Designation',1,0,0,100,8,13,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'email','leaddetails',1,'13','email','Email',1,0,0,100,9,13,1,'E~O',0,5,'BAS')");
- $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'leadsource','leaddetails',1,'15','leadsource','Lead Source',1,0,0,100,10,13,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'website','leadsubdetails',1,'17','website','Website',1,0,0,100,11,13,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'industry','leaddetails',1,'15','industry','Industry',1,0,0,100,12,13,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'leadstatus','leaddetails',1,'15','leadstatus','Lead Status',1,0,0,100,13,13,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'annualrevenue','leaddetails',1,'71','annualrevenue','Annual Revenue',1,0,0,100,14,13,1,'I~O',1,null,'ADV')");
- $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'rating','leaddetails',1,'15','rating','Rating',1,0,0,100,15,13,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'noofemployees','leaddetails',1,'1','noofemployees','No Of Employees',1,0,0,100,16,13,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,17,13,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'yahooid','leaddetails',1,'13','yahooid','Yahoo Id',1,0,0,100,18,13,1,'V~O',1,null,'ADV')");
-$this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,19,13,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,20,13,2,'T~O',1,null,'BAS')");
-
-//Block13 -- End
-
-
-//Block15 -- Start
-
-$this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'lane','leadaddress',1,'21','lane','Street',1,0,0,100,1,15,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'code','leadaddress',1,'1','code','Postal Code',1,0,0,100,3,15,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'city','leadaddress',1,'1','city','City',1,0,0,100,4,15,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'country','leadaddress',1,'1','country','Country',1,0,0,100,5,15,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'state','leadaddress',1,'1','state','State',1,0,0,100,6,15,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'pobox','leadaddress',1,'1','pobox','Po Box',1,0,0,100,2,15,1,'V~O',1,null,'BAS')");
-
-//Block15 --End
-
-//Block16 -- Start
-
-$this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,16,1,'V~O',1,null,'BAS')");
-
-//Block16 -- End
-
-//Lead Details -- END
-
-
-//Contact Details -- START
-//Block4 -- Start
-
-$this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'salutation','contactdetails',1,'55','salutationtype','Salutation',1,0,0,100,1,4,3,'V~O',1,null,'BAS')");	
- $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'firstname','contactdetails',1,'55','firstname','First Name',1,0,0,100,2,4,1,'V~O',0,1,'BAS')");	
- $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'phone','contactdetails',1,'11','phone','Office Phone',1,0,0,100,3,4,1,'V~O',0,4,'BAS')");	
- $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'lastname','contactdetails',1,'2','lastname','Last Name',1,0,0,100,4,4,1,'V~M',0,2,'BAS')");	
- $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'mobile','contactdetails',1,'1','mobile','Mobile',1,0,0,100,5,4,1,'V~O',1,null,'BAS')");	
- $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'accountid','contactdetails',1,'51','account_id','Account Name',1,0,0,100,6,4,1,'I~O',0,3,'BAS')");	
- $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'campaignid','contactdetails',1,'51','campaignid','Campaign Name',1,0,0,100,6,4,3,'I~O',1,null,'BAS')");
- $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'homephone','contactsubdetails',1,'11','homephone','Home Phone',1,0,0,100,7,4,1,'V~O',1,null,'ADV')");	
- $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'leadsource','contactsubdetails',1,'15','leadsource','Lead Source',1,0,0,100,8,4,1,'V~O',1,null,'BAS')");	
- $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'otherphone','contactsubdetails',1,'11','otherphone','Phone',1,0,0,100,9,4,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'title','contactdetails',1,'1','title','Title',1,0,0,100,10,4,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'fax','contactdetails',1,'1','fax','Fax',1,0,0,100,11,4,1,'V~O',1,null,'BAS')");	
- $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'department','contactdetails',1,'1','department','Department',1,0,0,100,12,4,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'birthday','contactsubdetails',1,'5','birthday','Birthdate',1,0,0,100,14,4,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'email','contactdetails',1,'13','email','Email',1,0,0,100,15,4,1,'E~O',0,5,'ADV')");
- $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'reportsto','contactdetails',1,'57','contact_id','Reports To',1,0,0,100,16,4,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'assistant','contactsubdetails',1,'1','assistant','Assistant',1,0,0,100,17,4,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'yahooid','contactdetails',1,'13','yahooid','Yahoo Id',1,0,0,100,18,4,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'assistantphone','contactsubdetails',1,'11','assistantphone','Assistant Phone',1,0,0,100,19,4,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'donotcall','contactdetails',1,'56','donotcall','Do Not Call',1,0,0,100,20,4,1,'C~O',1,null,'ADV')");
- $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'emailoptout','contactdetails',1,'56','emailoptout','Email Opt Out',1,0,0,100,21,4,1,'C~O',1,null,'ADV')");
- $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,22,4,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'reference','contactdetails',1,'56','reference','Reference',1,0,0,10,23,4,1,'C~O',1,null,'ADV')");
- $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'notify_owner','contactdetails',1,'56','notify_owner','Notify Owner',1,0,0,10,24,4,1,'C~O',1,null,'ADV')");
- $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,25,4,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,26,4,2,'T~O',1,null,'BAS')");
-
-//Block4 -- End
-
-//Block6 - Begin Customer Portal
-
-$this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'portal','customerdetails',1,'56','portal','Portal User',1,0,0,100,1,6,1,'C~O',1,null,'ADV')");
-$this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'support_start_date','customerdetails',1,'5','support_start_date','Support Start Date',1,0,0,100,2,6,1,'D~O',1,null,'ADV')");
-$this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'support_end_date','customerdetails',1,'5','support_end_date','Support End Date',1,0,0,100,3,6,1,'D~O~OTH~GE~support_start_date~Support Start Date',1,null,'ADV')");
-
-//Block6 - End Customer Portal
-
-//Block 7 -- Start
-
-$this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'mailingstreet','contactaddress',1,'21','mailingstreet','Mailing Street',1,0,0,100,1,7,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'otherstreet','contactaddress',1,'21','otherstreet','Other Street',1,0,0,100,2,7,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'mailingcity','contactaddress',1,'1','mailingcity','Mailing City',1,0,0,100,5,7,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'othercity','contactaddress',1,'1','othercity','Other City',1,0,0,100,6,7,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'mailingstate','contactaddress',1,'1','mailingstate','Mailing State',1,0,0,100,7,7,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'otherstate','contactaddress',1,'1','otherstate','Other State',1,0,0,100,8,7,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'mailingzip','contactaddress',1,'1','mailingzip','Mailing Zip',1,0,0,100,9,7,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'otherzip','contactaddress',1,'1','otherzip','Other Zip',1,0,0,100,10,7,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'mailingcountry','contactaddress',1,'1','mailingcountry','Mailing Country',1,0,0,100,11,7,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'othercountry','contactaddress',1,'1','othercountry','Other Country',1,0,0,100,12,7,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'mailingpobox','contactaddress',1,'1','mailingpobox','Mailing Po Box',1,0,0,100,3,7,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'otherpobox','contactaddress',1,'1','otherpobox','Other Po Box',1,0,0,100,4,7,1,'V~O',1,null,'BAS')");
-//Block7 -- End
-
-//ContactImageInformation
- $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'imagename','contactdetails',1,'69','imagename','Contact Image',1,0,0,100,1,75,1,'V~O',1,null,'ADV')");
-
-
-//Block8 -- Start
-$this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,8,1,'V~O',1,null,'BAS')");
-//Block8 -- End
-//Contact Details -- END
-
-
-//Potential Details -- START
-//Block1 -- Start
-
-$this->db->query("insert into field values (2,".$this->db->getUniqueID("field").",'potentialname','potential',1,'2','potentialname','Potential Name',1,0,0,100,1,1,1,'V~M',0,1,'BAS')");	
- $this->db->query("insert into field values (2,".$this->db->getUniqueID("field").",'amount','potential',1,71,'amount','Amount',1,0,0,100,2,1,1,'N~O',0,5,'BAS')");	
- $this->db->query("insert into field values (2,".$this->db->getUniqueID("field").",'accountid','potential',1,'50','account_id','Account Name',1,0,0,100,3,1,1,'V~M',0,2,'BAS')");	
- $this->db->query("insert into field values (2,".$this->db->getUniqueID("field").",'closingdate','potential',1,'23','closingdate','Expected Close Date',1,0,0,100,5,1,1,'D~M',0,3,'BAS')");	
- $this->db->query("insert into field values (2,".$this->db->getUniqueID("field").",'potentialtype','potential',1,'15','opportunity_type','Type',1,0,0,100,6,1,1,'V~O',1,null,'BAS')");	
- $this->db->query("insert into field values (2,".$this->db->getUniqueID("field").",'nextstep','potential',1,'1','nextstep','Next Step',1,0,0,100,7,1,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (2,".$this->db->getUniqueID("field").",'leadsource','potential',1,'15','leadsource','Lead Source',1,0,0,100,8,1,1,'V~O',1,null,'BAS')");	
- $this->db->query("insert into field values (2,".$this->db->getUniqueID("field").",'sales_stage','potential',1,'16','sales_stage','Sales Stage',1,0,0,100,9,1,1,'V~O',0,4,'BAS')");
- $this->db->query("insert into field values (2,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,10,1,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into field values (2,".$this->db->getUniqueID("field").",'probability','potential',1,'9','probability','Probability',1,0,0,100,11,1,1,'N~O',1,null,'BAS')");
-$this->db->query("insert into field values (2,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,13,1,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into field values (2,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,14,1,2,'T~O',1,null,'BAS')");
-
-//Block1 -- End
-
-//Block3 -- Start
-
- $this->db->query("insert into field values (2,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,3,1,'V~O',1,null,'BAS')");
-
-//Block3 -- End
-//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
-
-
- $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'campaignname','campaign',1,'2','campaignname','Campaign Name',1,0,0,100,1,76,1,'V~M',0,1,'BAS')");
- $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'campaigntype','campaign',1,15,'campaigntype','Campaign Type',1,0,0,100,2,76,1,'V~O',0,5,'BAS')");
- $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'product_id','campaign',1,59,'product_id','Product',1,0,0,100,3,76,1,'I~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,'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,'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,'15','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')");
-$this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'sponsor','campaign',1,'1','sponsor','Sponsor',1,0,0,100,12,76,1,'V~O',1,null,'BAS')");
-$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')");
-
-$this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,78,1,'V~O',1,null,'BAS')");
-
-//Campaign entries end
-
-
-//Ticket Details -- START
-//Block25 -- Start
-
- $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,2,25,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'parent_id','troubletickets',1,'68','parent_id','Related To',1,0,0,100,4,25,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'priority','troubletickets',1,'15','ticketpriorities','Priority',1,0,0,100,5,25,1,'V~O',0,3,'BAS')");
- $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'product_id','troubletickets',1,'59','product_id','Product Name',1,0,0,100,6,25,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'severity','troubletickets',1,'15','ticketseverities','Severity',1,0,0,100,7,25,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'status','troubletickets',1,'15','ticketstatus','Status',1,0,0,100,8,25,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'category','troubletickets',1,'15','ticketcategories','Category',1,0,0,100,9,25,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'update_log','troubletickets',1,'15','update_log','Update History',1,0,0,100,9,25,3,'V~O',1,null,'BAS')");
-$this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,10,25,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,11,25,2,'T~O',1,null,'BAS')");
- //Added on 26-12-2005 to add attachment in ticket editview
- $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'filename','attachments',1,'61','filename','Attachment',1,0,0,100,12,26,1,'V~O',0,1,'BAS')");
-
- $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'title','troubletickets',1,'22','ticket_title','Title',1,0,0,100,1,26,1,'V~M',0,1,'BAS')");
- $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'description','troubletickets',1,'19','description','Description',1,0,0,100,1,28,1,'V~O',0,2,'BAS')");
- $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'solution','troubletickets',1,'19','solution','Solution',1,0,0,100,1,29,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'comments','ticketcomments',1,'19','comments','Add Comment',1,0,0,100,1,30,1,'V~O',1,null,'BAS')");
-
-//Block25-30 -- End
-//Ticket Details -- END
-
-//Product Details -- START
-//Block31-36 -- Start
-
-$this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'productname','products',1,'2','productname','Product Name',1,0,0,100,1,31,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'productcode','products',1,'1','productcode','Product Code',1,0,0,100,2,31,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'discontinued','products',1,'56','discontinued','Product Active',1,0,0,100,3,31,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'manufacturer','products',1,'15','manufacturer','Manufacturer',1,0,0,100,4,1,31,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'productcategory','products',1,'15','productcategory','Product Category',1,0,0,100,4,31,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'sales_start_date','products',1,'5','sales_start_date','Sales Start Date',1,0,0,100,5,31,1,'D~O',1,null,'BAS')");
- $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'sales_end_date','products',1,'5','sales_end_date','Sales End Date',1,0,0,100,6,31,1,'D~O~OTH~GE~sales_start_date~Sales Start Date',1,null,'BAS')");
- $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'start_date','products',1,'5','start_date','Support Start Date',1,0,0,100,7,31,1,'D~O',1,null,'BAS')");
- $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'expiry_date','products',1,'5','expiry_date','Support Expiry Date',1,0,0,100,8,31,1,'D~O~OTH~GE~start_date~Start Date',1,null,'BAS')");
- 
-
- $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'crmid','seproductsrel',1,'66','parent_id','Related To',1,0,0,100,10,31,1,'I~O',1,null,'BAS')");
-
- $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'contactid','products',1,'57','contact_id','Contact Name',1,0,0,100,11,31,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'website','products',1,'17','website','Website',1,0,0,100,12,31,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'vendor_id','products',1,'75','vendor_id','Vendor Name',1,0,0,100,13,31,1,'I~O',1,null,'BAS')");
-$this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'mfr_part_no','products',1,'1','mfr_part_no','Mfr PartNo',1,0,0,100,14,31,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'vendor_part_no','products',1,'1','vendor_part_no','Vendor PartNo',1,0,0,100,15,31,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'serialno','products',1,'1','serial_no','Serial No',1,0,0,100,16,31,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'productsheet','products',1,'1','productsheet','Product Sheet',1,0,0,100,17,31,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'glacct','products',1,'15','glacct','GL Account',1,0,0,100,18,31,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,19,31,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,20,31,2,'T~O',1,null,'BAS')");
-
-
-//Block32 Pricing Information
-
-$this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'unit_price','products',1,'71','unit_price','Unit Price',1,0,0,100,1,32,1,'N~O',1,null,'BAS')"); 
- $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'commissionrate','products',1,'9','commissionrate','Commission Rate',1,0,0,100,2,32,1,'N~O',1,null,'BAS')"); 
- $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'taxclass','producttaxrel',1,'83','taxclass','Tax Class',1,0,0,100,4,32,1,'V~O',1,null,'BAS')");
-
-
-//Block 33 stock info
-
- $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'usageunit','products',1,'15','usageunit','Usage Unit',1,0,0,100,1,33,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'qty_per_unit','products',1,'1','qty_per_unit','Qty/Unit',1,0,0,100,2,33,1,'N~O',1,null,'ADV')");
- $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'qtyinstock','products',1,'1','qtyinstock','Qty In Stock',1,0,0,100,3,33,1,'I~O',1,null,'ADV')");
-$this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'reorderlevel','products',1,'1','reorderlevel','Reorder Level',1,0,0,100,4,33,1,'I~O',1,null,'ADV')");
- $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'handler','products',1,'52','assigned_user_id','Handler',1,0,0,100,5,33,1,'I~O',1,null,'ADV')");
- $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'qtyindemand','products',1,'1','qtyindemand','Qty In Demand',1,0,0,100,6,33,1,'I~O',1,null,'ADV')");
-
-
-//ProductImageInformation
-
- $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'imagename','products',1,'69','imagename','Product Image',1,0,0,100,1,35,1,'V~O',1,null,'ADV')");
-
-
-//Block 36 Description Info
- $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'product_description','products',1,'19','product_description','Description',1,0,0,100,1,36,1,'V~O',1,null,'BAS')");
-
-//Product Details -- END
-
-//Note Details -- START
-//Block17 -- Start
-
-$this->db->query("insert into field values (8,".$this->db->getUniqueID("field").",'contact_id','notes',1,'57','contact_id','Contact Name',1,0,0,100,1,17,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (8,".$this->db->getUniqueID("field").",'crmid','senotesrel',1,'62','parent_id','Related To',1,0,0,100,2,17,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into field values (8,".$this->db->getUniqueID("field").",'title','notes',1,'2','title','Subject',1,0,0,100,3,17,1,'V~M',0,1,'BAS')");
-$this->db->query("insert into field values (8,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,4,17,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into field values (8,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,5,17,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into field values (8,".$this->db->getUniqueID("field").",'filename','notes',1,'61','filename','Attachment',1,0,0,100,4,17,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (8,".$this->db->getUniqueID("field").",'notecontent','notes',1,'19','notecontent','Note',1,0,0,100,5,18,1,'V~O',1,null,'BAS')");
-
-//Block17 -- End
-//Note Details -- END
-
-//Email Details -- START
-//Block21 -- Start
-
-	$this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'date_start','activity',1,'6','date_start','Date & Time Sent',1,0,0,100,1,21,1,'DT~M~time_start~Time Start',1,null,'BAS')");
-	$this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'semodule','activity',1,'2','parent_type','Sales Enity Module',1,0,0,100,2,21,3,'',1,null,'BAS')");
-	$this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'activitytype','activity',1,'2','activitytype','Activtiy Type',1,0,0,100,3,21,3,'V~O',1,null,'BAS')");
-	$this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'crmid','seactivityrel',1,'357','parent_id','Related To',1,0,0,100,1,22,1,'I~O',1,null,'BAS')");
-	$this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,5,21,1,'V~M',1,null,'BAS')");
-	$this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'subject','activity',1,'2','subject','Subject',1,0,0,100,1,23,1,'V~M',1,null,'BAS')");
-	$this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'filename','attachments',1,'61','filename','Attachment',1,0,0,100,2,23,1,'V~O',1,null,'BAS')");
-	$this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,24,1,'V~O',1,null,'BAS')");
-	$this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'time_start','activity',1,'2','time_start','Time Start',1,0,0,100,9,1,23,'T~O',1,null,'BAS')");
-	$this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,10,1,22,'T~O',1,null,'BAS')");
- 	$this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,11,21,2,'T~O',1,null,'BAS')");
-
-//Block21 -- End
-//Email Details -- END
-
-//Task Details --START
-//Block19 -- Start
-$this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'subject','activity',1,'2','subject','Subject',1,0,0,100,1,19,1,'V~M',0,1,'BAS')");
- $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,2,19,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'date_start','activity',1,'6','date_start','Start Date & Time',1,0,0,100,3,19,1,'DT~M~time_start',0,2,'BAS')");
- $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'time_start','activity',1,'2','time_start','Time Start',1,0,0,100,4,19,3,'T~O',1,null,'BAS')");
- $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'due_date','activity',1,'23','due_date','Due Date',1,0,0,100,5,19,1,'D~M~OTH~GE~date_start~Start Date & Time',1,null,'BAS')");
- $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'crmid','seactivityrel',1,'66','parent_id','Related To',1,0,0,100,7,19,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'contactid','cntactivityrel',1,'57','contact_id','Contact Name',1,0,0,100,8,19,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'status','activity',1,'15','taskstatus','Status',1,0,0,100,9,19,1,'V~O',0,3,'BAS')");
- $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'eventstatus','activity',1,'15','eventstatus','Status',1,0,0,100,9,19,3,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'priority','activity',1,'15','taskpriority','Priority',1,0,0,100,10,19,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'sendnotification','activity',1,'56','sendnotification','Send Notification',1,0,0,100,11,19,1,'C~O',1,null,'BAS')");
-$this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,14,19,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,15,19,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'activitytype','activity',1,'15','activitytype','Activity Type',1,0,0,100,16,19,3,'V~O',1,null,'BAS')");
- $this->db->query("Insert into field values (9,".$this->db->getUniqueID("field").",'visibility','activity',1,15,'visibility','Visibility',1,0,0,100,17,19,3,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,20,1,'V~O',1,null,'BAS')");
-
-
-$this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'duration_hours','activity',1,'63','duration_hours','Duration',1,0,0,100,17,19,3,'T~O',1,null,'BAS')");
- $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'duration_minutes','activity',1,'15','duration_minutes','Duration Minutes',1,0,0,100,18,19,3,'T~O',1,null,'BAS')");
- $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'location','activity',1,'1','location','Location',1,0,0,100,19,19,3,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'reminder_time','activity_reminder',1,'30','reminder_time','Send Reminder',1,0,0,100,1,19,3,'I~O',1,null,'BAS')");
- 
- $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'recurringtype','recurringevents',1,'15','recurringtype','Recurrence',1,0,0,100,6,19,3,'O~O',1,null,'BAS')");
-
- $this->db->query("Insert into field values (9,".$this->db->getUniqueID("field").",'notime','activity',1,56,'notime','No Time',1,0,0,100,20,19,3,'C~O',1,null,'BAS')");
-//Block19 -- End
-//Task Details -- END
-
-//Event Details --START
-//Block41-43-- Start
- $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'subject','activity',1,'2','subject','Subject',1,0,0,100,1,41,1,'V~M',0,1,'BAS')");
- $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,2,41,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'date_start','activity',1,'6','date_start','Start Date & Time',1,0,0,100,3,41,1,'DT~M~time_start',0,2,'BAS')");
- $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'time_start','activity',1,'2','time_start','Time Start',1,0,0,100,4,41,3,'T~M',1,null,'BAS')");
-
- $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'due_date','activity',1,'23','due_date','End Date',1,0,0,100,5,41,1,'D~M~OTH~GE~date_start~Start Date & Time',1,null,'BAS')");
- $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'recurringtype','recurringevents',1,'15','recurringtype','Recurrence',1,0,0,100,6,41,1,'O~O',1,null,'BAS')");
-  
- $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'duration_hours','activity',1,'63','duration_hours','Duration',1,0,0,100,7,41,1,'I~M',0,5,'BAS')");
- $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'duration_minutes','activity',1,'15','duration_minutes','Duration Minutes',1,0,0,100,8,41,3,'O~O',1,null,'BAS')");
- $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'crmid','seactivityrel',1,'66','parent_id','Related To',1,0,0,100,9,41,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'contactid','cntactivityrel',1,'57','contact_id','Contact Name',1,0,0,100,10,41,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'eventstatus','activity',1,'15','eventstatus','Status',1,0,0,100,11,41,1,'V~O',0,3,'BAS')");
- $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'sendnotification','activity',1,'56','sendnotification','Send Notification',1,0,0,100,12,41,1,'C~O',1,null,'BAS')");
- $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'activitytype','activity',1,'15','activitytype','Activity Type',1,0,0,100,13,41,1,'V~O',0,4,'BAS')");
- $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'location','activity',1,'1','location','Location',1,0,0,100,14,41,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,15,41,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,16,41,2,'T~O',1,null,'BAS')");
- $this->db->query("Insert into field values (16,".$this->db->getUniqueID("field").",'priority','activity',1,15,'taskpriority','Priority',1,0,0,100,17,41,1,'V~O',1,null,'BAS')");
- $this->db->query("Insert into field values (16,".$this->db->getUniqueID("field").",'notime','activity',1,56,'notime','No Time',1,0,0,100,18,41,1,'C~O',1,null,'BAS')");
- $this->db->query("Insert into field values (16,".$this->db->getUniqueID("field").",'visibility','activity',1,15,'visibility','Visibility',1,0,0,100,19,41,1,'V~O',1,null,'BAS')");
- 
- $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,43,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'reminder_time','activity_reminder',1,'30','reminder_time','Send Reminder',1,0,0,100,1,42,1,'I~O',1,null,'BAS')");
-//Block41-43 -- End
-//Event Details -- END
-
-//Faq Details -- START
-//Block37-40 -- Start
-
-$this->db->query("insert into field values (15,".$this->db->getUniqueID("field").",'product_id','faq',1,'59','product_id','Product Name',1,0,0,100,1,37,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into field values (15,".$this->db->getUniqueID("field").",'category','faq',1,'15','faqcategories','Category',1,0,0,100,2,37,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (15,".$this->db->getUniqueID("field").",'status','faq',1,'15','faqstatus','Status',1,0,0,100,3,37,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (15,".$this->db->getUniqueID("field").",'question','faq',1,'20','question','Question',1,0,0,100,1,38,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into field values (15,".$this->db->getUniqueID("field").",'answer','faq',1,'20','faq_answer','Answer',1,0,0,100,1,39,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into field values (15,".$this->db->getUniqueID("field").",'comments','faqcomments',1,'19','comments','Add Comment',1,0,0,100,1,40,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into field values (15,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,3,37,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into field values (15,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,4,37,2,'T~O',1,null,'BAS')");
-
-
-//Block37-40 -- End
-//Ticket Details -- END
-
-//Vendor Details --START
-//Block44-47
-
-$this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'vendorname','vendor',1,'2','vendorname','Vendor Name',1,0,0,100,1,44,1,'V~M',0,1,'BAS')");
- $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'phone','vendor',1,'1','phone','Phone',1,0,0,100,3,44,1,'V~O',0,2,'BAS')");
- $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'email','vendor',1,'13','email','Email',1,0,0,100,4,44,1,'E~O',0,3,'BAS')");
- $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'website','vendor',1,'17','website','Website',1,0,0,100,5,44,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'glacct','vendor',1,'15','glacct','GL Account',1,0,0,100,6,44,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'category','vendor',1,'1','category','Category',1,0,0,100,7,44,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,8,44,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,9,44,2,'T~O',1,null,'BAS')");
-
-//Block 46
-
-$this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'street','vendor',1,'21','street','Street',1,0,0,100,1,46,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'pobox','vendor',1,'1','pobox','Po Box',1,0,0,100,2,46,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'city','vendor',1,'1','city','City',1,0,0,100,3,46,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'state','vendor',1,'1','state','State',1,0,0,100,4,46,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'postalcode','vendor',1,'1','postalcode','Postal Code',1,0,0,100,5,46,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'country','vendor',1,'1','country','Country',1,0,0,100,6,46,1,'V~O',1,null,'ADV')");
-
-//Block 47
-
-$this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,47,1,'V~O',1,null,'ADV')");
-
-//Vendor Details -- END
-
-//PriceBook Details Start
-//Block48
-
-$this->db->query("insert into field values (19,".$this->db->getUniqueID("field").",'bookname','pricebook',1,'2','bookname','Price Book Name',1,0,0,100,1,48,1,'V~M',0,1,'BAS')");
- $this->db->query("insert into field values (19,".$this->db->getUniqueID("field").",'active','pricebook',1,'56','active','Active',1,0,0,100,3,48,1,'V~O',0,2,'BAS')");
-$this->db->query("insert into field values (19,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,4,48,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into field values (19,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,5,48,2,'T~O',1,null,'BAS')");
-
-//Block50
-
-$this->db->query("insert into field values (19,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,50,1,'V~O',1,null,'BAS')");
-
-//PriceBook Details End
-
-
-//Quote Details -- START
- //Block51
-
-$this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'subject','quotes',1,'2','subject','Subject',1,0,0,100,1,51,1,'V~M',1,null,'BAS')");	
- $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'potentialid','quotes',1,'76','potential_id','Potential Name',1,0,0,100,2,51,1,'I~O',1,null,'BAS')");	
- $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'quotestage','quotes',1,'15','quotestage','Quote Stage',1,0,0,100,3,51,1,'V~O',1,null,'BAS')");	
-
- $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'validtill','quotes',1,'5','validtill','Valid Till',1,0,0,100,4,51,1,'D~O',1,null,'BAS')");	
- $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'team','quotes',1,'1','team','Team',1,0,0,100,5,51,1,'V~O',1,null,'BAS')");	
- $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'contactid','quotes',1,'57','contact_id','Contact Name',1,0,0,100,6,51,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'carrier','quotes',1,'15','carrier','Carrier',1,0,0,100,8,51,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'subtotal','quotes',1,'1','hdnSubTotal','Sub Total',1,0,0,100,9,51,3,'N~O',1,null,'BAS')");
- $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'shipping','quotes',1,'1','shipping','Shipping',1,0,0,100,10,51,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'inventorymanager','quotes',1,'77','assigned_user_id1','Inventory Manager',1,0,0,100,11,51,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'tax','quotes',1,'1','txtTax','Tax',1,0,0,100,13,51,3,'N~O',1,null,'BAS')");
- $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'adjustment','quotes',1,'1','txtAdjustment','Adjustment',1,0,0,100,20,51,3,'NN~O',1,null,'BAS')");
- $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'total','quotes',1,'1','hdnGrandTotal','Total',1,0,0,100,14,51,3,'N~O',1,null,'BAS')");
- $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'accountid','quotes',1,'73','account_id','Account Name',1,0,0,100,16,51,1,'I~M',1,null,'BAS')");
- $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,17,51,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,18,51,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,19,51,2,'T~O',1,null,'BAS')");
-
-
- //Block 53
-
-$this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'bill_street','quotesbillads',1,'24','bill_street','Billing Address',1,0,0,100,1,53,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'ship_street','quotesshipads',1,'24','ship_street','Shipping Address',1,0,0,100,2,53,1,'V~M',1,null,'BAS')");
-
- $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'bill_city','quotesbillads',1,'1','bill_city','Billing City',1,0,0,100,5,53,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'ship_city','quotesshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,53,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'bill_state','quotesbillads',1,'1','bill_state','Billing State',1,0,0,100,7,53,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'ship_state','quotesshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,53,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'bill_code','quotesbillads',1,'1','bill_code','Billing Code',1,0,0,100,9,53,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'ship_code','quotesshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,53,1,'V~O',1,null,'BAS')");
-
-
- $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'bill_country','quotesbillads',1,'1','bill_country','Billing Country',1,0,0,100,11,53,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'ship_country','quotesshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,53,1,'V~O',1,null,'BAS')");
-
-$this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'bill_pobox','quotesbillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,53,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'ship_pobox','quotesshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,53,1,'V~O',1,null,'BAS')");
- //Block55
-
-$this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,56,1,'V~O',1,null,'ADV')");
-
-//Block 56
-$this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'terms_conditions','quotes',1,'19','terms_conditions','Terms & Conditions',1,0,0,100,1,55,1,'V~O',1,null,'ADV')");
-
-
-//Quote Details -- END
-
-//Purchase Order Details -- START
- //Block57
- 
-$this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'subject','purchaseorder',1,'2','subject','Subject',1,0,0,100,1,57,1,'V~M',1,null,'BAS')");	
- $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'vendorid','purchaseorder',1,'81','vendor_id','Vendor Name',1,0,0,100,3,57,1,'I~M',1,null,'BAS')");	
- $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'requisition_no','purchaseorder',1,'1','requisition_no','Requisition No',1,0,0,100,4,57,1,'V~O',1,null,'BAS')");	
-
- $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'tracking_no','purchaseorder',1,'1','tracking_no','Tracking Number',1,0,0,100,5,57,1,'V~O',1,null,'BAS')");	
- $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'contactid','purchaseorder',1,'57','contact_id','Contact Name',1,0,0,100,6,57,1,'I~O',1,null,'BAS')");	
- $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'duedate','purchaseorder',1,'5','duedate','Due Date',1,0,0,100,7,57,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'carrier','purchaseorder',1,'15','carrier','Carrier',1,0,0,100,8,57,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'salestax','purchaseorder',1,'1','txtTax','Sales Tax',1,0,0,100,10,57,3,'N~O',1,null,'BAS')");
- $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'adjustment','purchaseorder',1,'1','txtAdjustment','Adjustment',1,0,0,100,10,57,3,'NN~O',1,null,'BAS')");
- $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'salescommission','purchaseorder',1,'1','salescommission','Sales Commission',1,0,0,100,11,57,1,'N~O',1,null,'BAS')");
- $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'exciseduty','purchaseorder',1,'1','exciseduty','Excise Duty',1,0,0,100,12,57,1,'N~O',1,null,'BAS')");
- $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'total','purchaseorder',1,'1','hdnGrandTotal','Total',1,0,0,100,13,57,3,'N~O',1,null,'BAS')");
- $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'subtotal','purchaseorder',1,'1','hdnSubTotal','Sub Total',1,0,0,100,14,57,3,'N~O',1,null,'BAS')");
- $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'postatus','purchaseorder',1,'15','postatus','Status',1,0,0,100,15,57,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,16,57,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,17,57,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,18,57,2,'T~O',1,null,'BAS')");
-
-
-
- //Block 59
-
-$this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'bill_street','pobillads',1,'24','bill_street','Billing Address',1,0,0,100,1,59,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'ship_street','poshipads',1,'24','ship_street','Shipping Address',1,0,0,100,2,59,1,'V~M',1,null,'BAS')");
-
- $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'bill_city','pobillads',1,'1','bill_city','Billing City',1,0,0,100,5,59,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'ship_city','poshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,59,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'bill_state','pobillads',1,'1','bill_state','Billing State',1,0,0,100,7,59,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'ship_state','poshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,59,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'bill_code','pobillads',1,'1','bill_code','Billing Code',1,0,0,100,9,59,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'ship_code','poshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,59,1,'V~O',1,null,'BAS')");
-
-
- $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'bill_country','pobillads',1,'1','bill_country','Billing Country',1,0,0,100,11,59,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'ship_country','poshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,59,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'bill_pobox','pobillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,59,1,'V~O',1,null,'BAS')");
-  $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'ship_pobox','poshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,59,1,'V~O',1,null,'BAS')");
-  
- //Block61
- $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,62,1,'V~O',1,null,'ADV')");
-
- //Block62
- $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'terms_conditions','purchaseorder',1,'19','terms_conditions','Terms & Conditions',1,0,0,100,1,61,1,'V~O',1,null,'ADV')");
-
-//Purchase Order Details -- END
-
-//Sales Order Details -- START
- //Block63
- 
-$this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'subject','salesorder',1,'2','subject','Subject',1,0,0,100,1,63,1,'V~M',1,null,'BAS')");	
- $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'potentialid','salesorder',1,'76','potential_id','Potential Name',1,0,0,100,2,63,1,'I~O',1,null,'BAS')");	
- $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'customerno','salesorder',1,'1','customerno','Customer No',1,0,0,100,3,63,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'quoteid','salesorder',1,'78','quote_id','Quote Name',1,0,0,100,4,63,1,'I~O',1,null,'BAS')");	
-$this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'purchaseorder','salesorder',1,'1','purchaseorder','Purchase Order',1,0,0,100,4,63,1,'V~O',1,null,'BAS')");	
-
- $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'contactid','salesorder',1,'57','contact_id','Contact Name',1,0,0,100,6,63,1,'I~O',1,null,'BAS')");	
- $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'duedate','salesorder',1,'5','duedate','Due Date',1,0,0,100,8,63,1,'D~O',1,null,'BAS')");
- $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'carrier','salesorder',1,'15','carrier','Carrier',1,0,0,100,9,63,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'pending','salesorder',1,'1','pending','Pending',1,0,0,100,10,63,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'sostatus','salesorder',1,'15','sostatus','Status',1,0,0,100,11,63,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'salestax','salesorder',1,'1','txtTax','Sales Tax',1,0,0,100,12,63,3,'N~O',1,null,'BAS')");
- $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'adjustment','salesorder',1,'1','txtAdjustment','Sales Tax',1,0,0,100,12,63,3,'NN~O',1,null,'BAS')");
- $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'salescommission','salesorder',1,'1','salescommission','Sales Commission',1,0,0,100,13,63,1,'N~O',1,null,'BAS')");
- $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'exciseduty','salesorder',1,'1','exciseduty','Excise Duty',1,0,0,100,13,63,1,'N~O',1,null,'BAS')");
- $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'total','salesorder',1,'1','hdnGrandTotal','Total',1,0,0,100,14,63,3,'N~O',1,null,'BAS')");
- $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'subtotal','salesorder',1,'1','hdnSubTotal','Total',1,0,0,100,15,63,3,'N~O',1,null,'BAS')");
- $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'accountid','salesorder',1,'73','account_id','Account Name',1,0,0,100,16,63,1,'I~M',1,null,'BAS')");
- $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,17,63,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,18,63,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,19,63,2,'T~O',1,null,'BAS')");
-
-
-
- //Block 65
-
- $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'bill_street','sobillads',1,'24','bill_street','Billing Address',1,0,0,100,1,65,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'ship_street','soshipads',1,'24','ship_street','Shipping Address',1,0,0,100,2,65,1,'V~M',1,null,'BAS')");
-
- $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'bill_city','sobillads',1,'1','bill_city','Billing City',1,0,0,100,5,65,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'ship_city','soshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,65,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'bill_state','sobillads',1,'1','bill_state','Billing State',1,0,0,100,7,65,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'ship_state','soshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,65,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'bill_code','sobillads',1,'1','bill_code','Billing Code',1,0,0,100,9,65,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'ship_code','soshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,65,1,'V~O',1,null,'BAS')");
-
-
- $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'bill_country','sobillads',1,'1','bill_country','Billing Country',1,0,0,100,11,65,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'ship_country','soshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,65,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'bill_pobox','sobillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,65,1,'V~O',1,null,'BAS')");
-  $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'ship_pobox','soshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,65,1,'V~O',1,null,'BAS')");
-  
-//Block67
- $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,68,1,'V~O',1,null,'ADV')");
-
- //Block68
- $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'terms_conditions','salesorder',1,'19','terms_conditions','Terms & Conditions',1,0,0,100,1,67,1,'V~O',1,null,'ADV')");
-
-
-//Sales Order Details -- END
-
-//Invoice Details -- START
- //Block69
-
-$this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'subject','invoice',1,'2','subject','Subject',1,0,0,100,1,69,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'salesorderid','invoice',1,'80','salesorder_id','Sales Order',1,0,0,100,2,69,1,'I~O',1,null,'BAS')");	
- $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'customerno','invoice',1,'1','customerno','Customer No',1,0,0,100,3,69,1,'V~O',1,null,'BAS')");	
-
- 
-//to include contact name field in Invoice-start
-$this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'contactid','invoice',1,'57','contact_id','Contact Name',1,0,0,100,4,69,1,'I~O',1,null,'BAS')");
-//end
-
-$this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'invoicedate','invoice',1,'5','invoicedate','Invoice Date',1,0,0,100,5,69,1,'D~O',1,null,'BAS')");
- $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'duedate','invoice',1,'5','duedate','Due Date',1,0,0,100,6,69,1,'D~O',1,null,'BAS')");
-$this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'purchaseorder','invoice',1,'1','purchaseorder','Purchase Order',1,0,0,100,8,69,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'salestax','invoice',1,'1','txtTax','Sales Tax',1,0,0,100,9,69,3,'N~O',1,null,'BAS')");
- $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'adjustment','invoice',1,'1','txtAdjustment','Sales Tax',1,0,0,100,9,69,3,'NN~O',1,null,'BAS')");
- $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'salescommission','invoice',1,'1','salescommission','Sales Commission',1,0,0,10,13,69,1,'N~O',1,null,'BAS')");
- $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'exciseduty','invoice',1,'1','exciseduty','Excise Duty',1,0,0,100,11,69,1,'N~O',1,null,'BAS')");
- $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'subtotal','invoice',1,'1','hdnSubTotal','Sub Total',1,0,0,100,12,69,3,'N~O',1,null,'BAS')");
- $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'total','invoice',1,'1','hdnGrandTotal','Total',1,0,0,100,13,69,3,'N~O',1,null,'BAS')");
-$this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'accountid','invoice',1,'73','account_id','Account Name',1,0,0,100,14,69,1,'I~M',1,null,'BAS')");
- $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'invoicestatus','invoice',1,'15','invoicestatus','Status',1,0,0,100,15,69,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,16,69,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,17,69,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,18,69,2,'T~O',1,null,'BAS')"); 
-
- //Block 71
-
-$this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'bill_street','invoicebillads',1,'24','bill_street','Billing Address',1,0,0,100,1,71,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'ship_street','invoiceshipads',1,'24','ship_street','Shipping Address',1,0,0,100,2,71,1,'V~M',1,null,'BAS')");
-
- $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'bill_city','invoicebillads',1,'1','bill_city','Billing City',1,0,0,100,5,71,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'ship_city','invoiceshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,71,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'bill_state','invoicebillads',1,'1','bill_state','Billing State',1,0,0,100,7,71,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'ship_state','invoiceshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,71,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'bill_code','invoicebillads',1,'1','bill_code','Billing Code',1,0,0,100,9,71,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'ship_code','invoiceshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,71,1,'V~O',1,null,'BAS')");
-
-
- $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'bill_country','invoicebillads',1,'1','bill_country','Billing Country',1,0,0,100,11,71,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'ship_country','invoiceshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,71,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'bill_pobox','invoicebillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,71,1,'V~O',1,null,'BAS')");
-  $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'ship_pobox','invoiceshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,71,1,'V~O',1,null,'BAS')");
-
-//Block73
- $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,74,1,'V~O',1,null,'ADV')");
- //Block74
- $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'terms_conditions','invoice',1,'19','terms_conditions','Terms & Conditions',1,0,0,100,1,73,1,'V~O',1,null,'ADV')");
-
-
-//Invoice Details -- END
-
-
-
-                // Insert End
-                
-
-		//New Security Start
-		//Inserting into profile table
-		$this->db->query("insert into profile values ('".$profile1_id."','Administrator',null)");	
-		$this->db->query("insert into profile values ('".$profile2_id."','Sales Profile',null)");
-		$this->db->query("insert into profile values ('".$profile3_id."','Support Profile',null)");
-		$this->db->query("insert into profile values ('".$profile4_id."','Guest Profile',null)");
-		
-		//Inserting into profile2gloabal permissions
-		$this->db->query("insert into profile2globalpermissions values ('".$profile1_id."',1,0)");
-		$this->db->query("insert into profile2globalpermissions values ('".$profile1_id."',2,0)");
-		$this->db->query("insert into profile2globalpermissions values ('".$profile2_id."',1,1)");
-		$this->db->query("insert into profile2globalpermissions values ('".$profile2_id."',2,1)");
-		$this->db->query("insert into profile2globalpermissions values ('".$profile3_id."',1,1)");
-		$this->db->query("insert into profile2globalpermissions values ('".$profile3_id."',2,1)");
-		$this->db->query("insert into profile2globalpermissions values ('".$profile4_id."',1,1)");
-		$this->db->query("insert into profile2globalpermissions values ('".$profile4_id."',2,1)");
-
-		//Inserting into profile2tab
-		$this->db->query("insert into profile2tab values (".$profile1_id.",1,0)");
-		$this->db->query("insert into profile2tab values (".$profile1_id.",2,0)");
-		$this->db->query("insert into profile2tab values (".$profile1_id.",3,0)");
-		$this->db->query("insert into profile2tab values (".$profile1_id.",4,0)");
-		$this->db->query("insert into profile2tab values (".$profile1_id.",6,0)");
-		$this->db->query("insert into profile2tab values (".$profile1_id.",7,0)");
-		$this->db->query("insert into profile2tab values (".$profile1_id.",8,0)");
-		$this->db->query("insert into profile2tab values (".$profile1_id.",9,0)");
-		$this->db->query("insert into profile2tab values (".$profile1_id.",10,0)");
-		$this->db->query("insert into profile2tab values (".$profile1_id.",13,0)");
-		$this->db->query("insert into profile2tab values (".$profile1_id.",14,0)");
-		$this->db->query("insert into profile2tab values (".$profile1_id.",15,0)");
-		$this->db->query("insert into profile2tab values (".$profile1_id.",16,0)");
-		$this->db->query("insert into profile2tab values (".$profile1_id.",17,0)");
-		$this->db->query("insert into profile2tab values (".$profile1_id.",18,0)");
-		$this->db->query("insert into profile2tab values (".$profile1_id.",19,0)");
-		$this->db->query("insert into profile2tab values (".$profile1_id.",20,0)");
-		$this->db->query("insert into profile2tab values (".$profile1_id.",21,0)");
-		$this->db->query("insert into profile2tab values (".$profile1_id.",22,0)");
-		$this->db->query("insert into profile2tab values (".$profile1_id.",23,0)");
-		$this->db->query("insert into profile2tab values (".$profile1_id.",24,0)");
-		$this->db->query("insert into profile2tab values (".$profile1_id.",25,0)");
-       		$this->db->query("insert into profile2tab values (".$profile1_id.",26,0)");
-       		$this->db->query("insert into profile2tab values (".$profile1_id.",27,0)");
-
-		//Inserting into profile2tab
-		$this->db->query("insert into profile2tab values (".$profile2_id.",1,0)");
-		$this->db->query("insert into profile2tab values (".$profile2_id.",2,0)");
-		$this->db->query("insert into profile2tab values (".$profile2_id.",3,0)");
-		$this->db->query("insert into profile2tab values (".$profile2_id.",4,0)");
-		$this->db->query("insert into profile2tab values (".$profile2_id.",6,0)");
-		$this->db->query("insert into profile2tab values (".$profile2_id.",7,0)");
-		$this->db->query("insert into profile2tab values (".$profile2_id.",8,0)");
-		$this->db->query("insert into profile2tab values (".$profile2_id.",9,0)");
-		$this->db->query("insert into profile2tab values (".$profile2_id.",10,0)");
-		$this->db->query("insert into profile2tab values (".$profile2_id.",13,0)");
-		$this->db->query("insert into profile2tab values (".$profile2_id.",14,0)");
-		$this->db->query("insert into profile2tab values (".$profile2_id.",15,0)");
-		$this->db->query("insert into profile2tab values (".$profile2_id.",16,0)");
-		$this->db->query("insert into profile2tab values (".$profile2_id.",17,0)");
-		$this->db->query("insert into profile2tab values (".$profile2_id.",18,0)");
-		$this->db->query("insert into profile2tab values (".$profile2_id.",19,0)");
-		$this->db->query("insert into profile2tab values (".$profile2_id.",20,0)");
-		$this->db->query("insert into profile2tab values (".$profile2_id.",21,0)");
-		$this->db->query("insert into profile2tab values (".$profile2_id.",22,0)");
-		$this->db->query("insert into profile2tab values (".$profile2_id.",23,0)");
-		$this->db->query("insert into profile2tab values (".$profile2_id.",24,0)");
-		$this->db->query("insert into profile2tab values (".$profile2_id.",25,0)");
-        	$this->db->query("insert into profile2tab values (".$profile2_id.",26,0)");
-       		$this->db->query("insert into profile2tab values (".$profile2_id.",27,0)");
-
-		$this->db->query("insert into profile2tab values (".$profile3_id.",1,0)");
-		$this->db->query("insert into profile2tab values (".$profile3_id.",2,0)");
-		$this->db->query("insert into profile2tab values (".$profile3_id.",3,0)");
-		$this->db->query("insert into profile2tab values (".$profile3_id.",4,0)");
-		$this->db->query("insert into profile2tab values (".$profile3_id.",6,0)");
-		$this->db->query("insert into profile2tab values (".$profile3_id.",7,0)");
-		$this->db->query("insert into profile2tab values (".$profile3_id.",8,0)");
-		$this->db->query("insert into profile2tab values (".$profile3_id.",9,0)");
-		$this->db->query("insert into profile2tab values (".$profile3_id.",10,0)");
-		$this->db->query("insert into profile2tab values (".$profile3_id.",13,0)");
-		$this->db->query("insert into profile2tab values (".$profile3_id.",14,0)");
-		$this->db->query("insert into profile2tab values (".$profile3_id.",15,0)");
-		$this->db->query("insert into profile2tab values (".$profile3_id.",16,0)");
-		$this->db->query("insert into profile2tab values (".$profile3_id.",17,0)");
-		$this->db->query("insert into profile2tab values (".$profile3_id.",18,0)");
-		$this->db->query("insert into profile2tab values (".$profile3_id.",19,0)");
-		$this->db->query("insert into profile2tab values (".$profile3_id.",20,0)");
-		$this->db->query("insert into profile2tab values (".$profile3_id.",21,0)");
-		$this->db->query("insert into profile2tab values (".$profile3_id.",22,0)");
-		$this->db->query("insert into profile2tab values (".$profile3_id.",23,0)");
-		$this->db->query("insert into profile2tab values (".$profile3_id.",24,0)");
-		$this->db->query("insert into profile2tab values (".$profile3_id.",25,0)");
-        	$this->db->query("insert into profile2tab values (".$profile3_id.",26,0)");
-       		$this->db->query("insert into profile2tab values (".$profile3_id.",27,0)");
-        
-
-		$this->db->query("insert into profile2tab values (".$profile4_id.",1,0)");
-		$this->db->query("insert into profile2tab values (".$profile4_id.",2,0)");
-		$this->db->query("insert into profile2tab values (".$profile4_id.",3,0)");
-		$this->db->query("insert into profile2tab values (".$profile4_id.",4,0)");
-		$this->db->query("insert into profile2tab values (".$profile4_id.",6,0)");
-		$this->db->query("insert into profile2tab values (".$profile4_id.",7,0)");
-		$this->db->query("insert into profile2tab values (".$profile4_id.",8,0)");
-		$this->db->query("insert into profile2tab values (".$profile4_id.",9,0)");
-		$this->db->query("insert into profile2tab values (".$profile4_id.",10,0)");
-		$this->db->query("insert into profile2tab values (".$profile4_id.",13,0)");
-		$this->db->query("insert into profile2tab values (".$profile4_id.",14,0)");
-		$this->db->query("insert into profile2tab values (".$profile4_id.",15,0)");
-		$this->db->query("insert into profile2tab values (".$profile4_id.",16,0)");	
-		$this->db->query("insert into profile2tab values (".$profile4_id.",17,0)");
-		$this->db->query("insert into profile2tab values (".$profile4_id.",18,0)");
-		$this->db->query("insert into profile2tab values (".$profile4_id.",19,0)");
-		$this->db->query("insert into profile2tab values (".$profile4_id.",20,0)");
-		$this->db->query("insert into profile2tab values (".$profile4_id.",21,0)");
-		$this->db->query("insert into profile2tab values (".$profile4_id.",22,0)");
-		$this->db->query("insert into profile2tab values (".$profile4_id.",23,0)");
-		$this->db->query("insert into profile2tab values (".$profile4_id.",24,0)");
-		$this->db->query("insert into profile2tab values (".$profile4_id.",25,0)");
-		$this->db->query("insert into profile2tab values (".$profile4_id.",26,0)");
-		$this->db->query("insert into profile2tab values (".$profile4_id.",27,0)");
-		//Inserting into profile2standardpermissions  Adminsitrator
-		
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",2,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",2,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",2,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",2,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",2,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",4,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",4,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",4,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",4,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",4,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",6,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",6,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",6,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",6,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",6,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",7,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",7,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",7,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",7,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",7,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",8,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",8,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",8,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",8,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",8,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",9,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",9,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",9,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",9,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",9,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",10,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",10,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",10,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",10,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",10,4,0)");
-
-		
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",13,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",13,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",13,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",13,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",13,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",14,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",14,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",14,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",14,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",14,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",15,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",15,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",15,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",15,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",15,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",16,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",16,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",16,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",16,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",16,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",18,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",18,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",18,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",18,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",18,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",19,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",19,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",19,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",19,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",19,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",20,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",20,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",20,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",20,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",20,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",21,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",21,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",21,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",21,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",21,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",22,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",22,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",22,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",22,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",22,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",23,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",23,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",23,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",23,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",23,4,0)");
-
-
-
-        	$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",26,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",26,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",26,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",26,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",26,4,0)");
-
-
-		//Insert into Profile 2 std permissions for Sales User  
-		//Help Desk Create/Delete not allowed. Read-Only	
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",2,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",2,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",2,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",2,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",2,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",4,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",4,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",4,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",4,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",4,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",6,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",6,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",6,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",6,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",6,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",7,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",7,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",7,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",7,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",7,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",8,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",8,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",8,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",8,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",8,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",9,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",9,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",9,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",9,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",9,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",10,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",10,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",10,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",10,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",10,4,0)");
-
-		
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",13,0,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",13,1,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",13,2,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",13,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",13,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",14,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",14,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",14,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",14,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",14,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",15,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",15,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",15,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",15,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",15,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",16,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",16,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",16,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",16,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",16,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",18,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",18,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",18,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",18,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",18,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",19,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",19,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",19,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",19,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",19,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",20,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",20,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",20,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",20,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",20,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",21,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",21,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",21,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",21,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",21,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",22,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",22,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",22,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",22,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",22,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",23,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",23,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",23,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",23,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",23,4,0)");
-
-
-        	$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",26,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",26,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",26,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",26,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",26,4,0)");
-
-		//Inserting into profile2std for Support Profile
-		// Potential is read-only
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",2,0,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",2,1,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",2,2,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",2,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",2,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",4,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",4,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",4,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",4,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",4,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",6,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",6,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",6,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",6,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",6,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",7,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",7,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",7,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",7,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",7,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",8,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",8,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",8,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",8,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",8,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",9,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",9,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",9,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",9,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",9,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",10,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",10,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",10,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",10,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",10,4,0)");
-
-		
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",13,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",13,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",13,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",13,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",13,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",14,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",14,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",14,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",14,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",14,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",15,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",15,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",15,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",15,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",15,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",16,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",16,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",16,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",16,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",16,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",18,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",18,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",18,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",18,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",18,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",19,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",19,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",19,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",19,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",19,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",20,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",20,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",20,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",20,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",20,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",21,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",21,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",21,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",21,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",21,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",22,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",22,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",22,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",22,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",22,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",23,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",23,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",23,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",23,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",23,4,0)");
-
-
-        	$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",26,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",26,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",26,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",26,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",26,4,0)");
-        
-		//Inserting into profile2stdper for Profile Guest Profile
-		//All Read-Only
-		
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",2,0,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",2,1,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",2,2,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",2,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",2,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",4,0,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",4,1,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",4,2,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",4,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",4,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",6,0,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",6,1,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",6,2,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",6,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",6,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",7,0,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",7,1,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",7,2,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",7,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",7,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",8,0,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",8,1,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",8,2,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",8,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",8,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",9,0,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",9,1,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",9,2,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",9,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",9,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",10,0,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",10,1,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",10,2,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",10,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",10,4,0)");
-
-		
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",13,0,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",13,1,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",13,2,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",13,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",13,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",14,0,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",14,1,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",14,2,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",14,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",14,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",15,0,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",15,1,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",15,2,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",15,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",15,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",16,0,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",16,1,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",16,2,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",16,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",16,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",18,0,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",18,1,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",18,2,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",18,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",18,4,0)");	
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",19,0,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",19,1,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",19,2,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",19,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",19,4,0)");	
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",20,0,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",20,1,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",20,2,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",20,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",20,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",21,0,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",21,1,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",21,2,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",21,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",21,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",22,0,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",22,1,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",22,2,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",22,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",22,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",23,0,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",23,1,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",23,2,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",23,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",23,4,0)");	
-
-
-        $this->db->query("insert into profile2standardpermissions values (".$profile4_id.",26,0,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",26,1,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",26,2,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",26,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",26,4,0)");
-
-		//Insert into role2profile
-		$this->db->query("insert into role2profile values ('H".$role2_id."',".$profile1_id.")");
-		$this->db->query("insert into role2profile values ('H".$role3_id."',".$profile2_id.")");
-	
-		//Insert into profile2field
-			
-                insertProfile2field($profile1_id);
-                insertProfile2field($profile2_id);	
-                insertProfile2field($profile3_id);	
-                insertProfile2field($profile4_id);
-
-		insert_def_org_field();	
-		
-
-		//Inserting into profile 2 utility Admin
-                $this->db->query("insert into profile2utility values (".$profile1_id.",2,5,0)");
-                $this->db->query("insert into profile2utility values (".$profile1_id.",2,6,0)");
-                $this->db->query("insert into profile2utility values (".$profile1_id.",4,5,0)");
-                $this->db->query("insert into profile2utility values (".$profile1_id.",4,6,0)");
-                $this->db->query("insert into profile2utility values (".$profile1_id.",6,5,0)");
-                $this->db->query("insert into profile2utility values (".$profile1_id.",6,6,0)");
-                $this->db->query("insert into profile2utility values (".$profile1_id.",7,5,0)");
-                $this->db->query("insert into profile2utility values (".$profile1_id.",7,6,0)");
-                $this->db->query("insert into profile2utility values (".$profile1_id.",8,6,0)");
-                //$this->db->query("insert into profile2utility values (".$profile1_id.",9,6,0)");
-                $this->db->query("insert into profile2utility values (".$profile1_id.",10,6,0)");
-		$this->db->query("insert into profile2utility values (".$profile1_id.",7,8,0)");
-                $this->db->query("insert into profile2utility values (".$profile1_id.",6,8,0)");
-                $this->db->query("insert into profile2utility values (".$profile1_id.",4,8,0)");
-                $this->db->query("insert into profile2utility values (".$profile1_id.",13,8,0)");
-		$this->db->query("insert into profile2utility values (".$profile1_id.",14,5,0)");
-                $this->db->query("insert into profile2utility values (".$profile1_id.",14,6,0)");
-                $this->db->query("insert into profile2utility values (".$profile1_id.",7,9,0)");
-
-		//Inserting into profile2utility Sales Profile
-		//Import Export Not Allowed.	
-		$this->db->query("insert into profile2utility values (".$profile2_id.",2,5,1)");
-                $this->db->query("insert into profile2utility values (".$profile2_id.",2,6,1)");
-                $this->db->query("insert into profile2utility values (".$profile2_id.",4,5,1)");
-                $this->db->query("insert into profile2utility values (".$profile2_id.",4,6,1)");
-                $this->db->query("insert into profile2utility values (".$profile2_id.",6,5,1)");
-                $this->db->query("insert into profile2utility values (".$profile2_id.",6,6,1)");
-                $this->db->query("insert into profile2utility values (".$profile2_id.",7,5,1)");
-                $this->db->query("insert into profile2utility values (".$profile2_id.",7,6,1)");
-                $this->db->query("insert into profile2utility values (".$profile2_id.",8,6,1)");
-                //$this->db->query("insert into profile2utility values (".$profile2_id.",9,6,1)");
-                $this->db->query("insert into profile2utility values (".$profile2_id.",10,6,1)");
-                $this->db->query("insert into profile2utility values (".$profile2_id.",7,8,0)");
-                $this->db->query("insert into profile2utility values (".$profile2_id.",6,8,0)");
-                $this->db->query("insert into profile2utility values (".$profile2_id.",4,8,0)");
-                $this->db->query("insert into profile2utility values (".$profile2_id.",13,8,0)");
-		$this->db->query("insert into profile2utility values (".$profile2_id.",14,5,1)");
-                $this->db->query("insert into profile2utility values (".$profile2_id.",14,6,1)");
-                $this->db->query("insert into profile2utility values (".$profile2_id.",7,9,0)");
-
-		//Inserting into profile2utility Support Profile
-		//Import Export Not Allowed.	
-		$this->db->query("insert into profile2utility values (".$profile3_id.",2,5,1)");
-                $this->db->query("insert into profile2utility values (".$profile3_id.",2,6,1)");
-                $this->db->query("insert into profile2utility values (".$profile3_id.",4,5,1)");
-                $this->db->query("insert into profile2utility values (".$profile3_id.",4,6,1)");
-                $this->db->query("insert into profile2utility values (".$profile3_id.",6,5,1)");
-                $this->db->query("insert into profile2utility values (".$profile3_id.",6,6,1)");
-                $this->db->query("insert into profile2utility values (".$profile3_id.",7,5,1)");
-                $this->db->query("insert into profile2utility values (".$profile3_id.",7,6,1)");
-                $this->db->query("insert into profile2utility values (".$profile3_id.",8,6,1)");
-                //$this->db->query("insert into profile2utility values (".$profile3_id.",9,6,1)");
-                $this->db->query("insert into profile2utility values (".$profile3_id.",10,6,1)");
-                $this->db->query("insert into profile2utility values (".$profile3_id.",7,8,0)");
-                $this->db->query("insert into profile2utility values (".$profile3_id.",6,8,0)");
-                $this->db->query("insert into profile2utility values (".$profile3_id.",4,8,0)");
-                $this->db->query("insert into profile2utility values (".$profile3_id.",13,8,0)");
-		$this->db->query("insert into profile2utility values (".$profile3_id.",14,5,1)");
-                $this->db->query("insert into profile2utility values (".$profile3_id.",14,6,1)");
-                $this->db->query("insert into profile2utility values (".$profile3_id.",7,9,0)");
-
-		//Inserting into profile2utility Guest Profile Read-Only
-		//Import Export BusinessCar Not Allowed.	
-		$this->db->query("insert into profile2utility values (".$profile4_id.",2,5,1)");
-                $this->db->query("insert into profile2utility values (".$profile4_id.",2,6,1)");
-                $this->db->query("insert into profile2utility values (".$profile4_id.",4,5,1)");
-                $this->db->query("insert into profile2utility values (".$profile4_id.",4,6,1)");
-                $this->db->query("insert into profile2utility values (".$profile4_id.",6,5,1)");
-                $this->db->query("insert into profile2utility values (".$profile4_id.",6,6,1)");
-                $this->db->query("insert into profile2utility values (".$profile4_id.",7,5,1)");
-                $this->db->query("insert into profile2utility values (".$profile4_id.",7,6,1)");
-                $this->db->query("insert into profile2utility values (".$profile4_id.",8,6,1)");
-                //$this->db->query("insert into profile2utility values (".$profile4_id.",9,6,1)");
-                $this->db->query("insert into profile2utility values (".$profile4_id.",10,6,1)");
-                $this->db->query("insert into profile2utility values (".$profile4_id.",7,8,1)");
-                $this->db->query("insert into profile2utility values (".$profile4_id.",6,8,1)");
-                $this->db->query("insert into profile2utility values (".$profile4_id.",4,8,1)");		
-                $this->db->query("insert into profile2utility values (".$profile4_id.",13,8,1)");		
-		$this->db->query("insert into profile2utility values (".$profile4_id.",14,5,1)");
-                $this->db->query("insert into profile2utility values (".$profile4_id.",14,6,1)");
-                $this->db->query("insert into profile2utility values (".$profile4_id.",7,9,0)");
-
-		//Inserting values into org share action mapping
-                $this->db->query("insert into org_share_action_mapping values(0,'Public: Read Only')");
-                $this->db->query("insert into org_share_action_mapping values(1,'Public: Read, Create/Edit')");
-                $this->db->query("insert into org_share_action_mapping values(2,'Public: Read, Create/Edit, Delete')");
-                $this->db->query("insert into org_share_action_mapping values(3,'Private')");
-
-                $this->db->query("insert into org_share_action_mapping values(4,'Hide Details')");
-                $this->db->query("insert into org_share_action_mapping values(5,'Hide Details and Add Events')");
-                $this->db->query("insert into org_share_action_mapping values(6,'Show Details')");
-                $this->db->query("insert into org_share_action_mapping values(7,'Show Details and Add Events')");
-
-
-		//Inserting for all tabs
-                $def_org_tabid= Array(2,4,6,7,9,10,13,16,20,21,22,23,26);
-
-                foreach($def_org_tabid as $def_tabid)
-                {
-                        $this->db->query("insert into org_share_action2tab values(0,".$def_tabid.")");
-                        $this->db->query("insert into org_share_action2tab values(1,".$def_tabid.")");
-                        $this->db->query("insert into org_share_action2tab values(2,".$def_tabid.")");
-                        $this->db->query("insert into org_share_action2tab values(3,".$def_tabid.")");
-                }
-
-                $this->db->query("insert into org_share_action2tab values(4,17)");
-                $this->db->query("insert into org_share_action2tab values(5,17)");
-                $this->db->query("insert into org_share_action2tab values(6,17)");
-                $this->db->query("insert into org_share_action2tab values(7,17)");
-
-		//Insert into default_org_sharingrule
-               $this->db->query("insert into def_org_share values (".$this->db->getUniqueID('def_org_share').",2,2,0)");
-
-               $this->db->query("insert into def_org_share values (".$this->db->getUniqueID('def_org_share').",4,2,2)");
-
-               $this->db->query("insert into def_org_share values (".$this->db->getUniqueID('def_org_share').",6,2,0)");
-
-               $this->db->query("insert into def_org_share values (".$this->db->getUniqueID('def_org_share').",7,2,0)");
-
-               $this->db->query("insert into def_org_share values (".$this->db->getUniqueID('def_org_share').",9,3,1)");
-               $this->db->query("insert into def_org_share values (".$this->db->getUniqueID('def_org_share').",10,2,0)");
-               $this->db->query("insert into def_org_share values (".$this->db->getUniqueID('def_org_share').",13,2,0)");
-               $this->db->query("insert into def_org_share values (".$this->db->getUniqueID('def_org_share').",16,3,2)");
-               $this->db->query("insert into def_org_share values (".$this->db->getUniqueID('def_org_share').",17,7,0)");
-               $this->db->query("insert into def_org_share values (".$this->db->getUniqueID('def_org_share').",20,2,0)");
-               $this->db->query("insert into def_org_share values (".$this->db->getUniqueID('def_org_share').",21,2,0)");
-               $this->db->query("insert into def_org_share values (".$this->db->getUniqueID('def_org_share').",22,2,0)");
-               $this->db->query("insert into def_org_share values (".$this->db->getUniqueID('def_org_share').",23,2,0)");
-               $this->db->query("insert into def_org_share values (".$this->db->getUniqueID('def_org_share').",26,2,0)");
-
-		//Populating the DataShare Related Modules
-
-		//Lead Related Module
-		$this->db->query("insert into datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",7,10)");
-
-		//Account Related Module
-		$this->db->query("insert into datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",6,2)");
-		$this->db->query("insert into datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",6,13)");
-		$this->db->query("insert into datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",6,20)");
-		$this->db->query("insert into datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",6,22)");
-		$this->db->query("insert into datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",6,23)");
-		$this->db->query("insert into datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",6,10)");
-
-		//Potential Related Module
-		$this->db->query("insert into datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",2,20)");
-		$this->db->query("insert into datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",2,22)");
-
-		//Quote Related Module
-		$this->db->query("insert into datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",20,22)");
-
-		//SO Related Module
-		$this->db->query("insert into datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",22,23)");	
-
-
-			
-					
-  // New Secutity End
-
-
-         //insert into the notificationscheduler table
-
-	//insert into related list table
-	//Inserting for account related lists
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("Potentials").",'get_opportunities',1,'Potentials',0)");	
-		
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("Contacts").",'get_contacts',2,'Contacts',0)");
-
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("Activities").",'get_activities',3,'Activities',0)");
-
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("HelpDesk").",'get_tickets',4,'HelpDesk',0)");
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("Activities").",'get_history',5,'Activity History',0)");
-
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",0,'get_attachments',6,'Attachments',0)");
-
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("Quotes").",'get_quotes',7,'Quotes',0)");
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("Invoice").",'get_invoices',8,'Invoice',0)");
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("SalesOrder").",'get_salesorder',9,'Sales Order',0)");
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("Products").",'get_products',10,'Products',0)");
-
-	//Inserting Lead Related Lists	
-
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Leads").",".getTabid("Activities").",'get_activities',1,'Activities',0)");
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Leads").",".getTabid("Emails").",'get_emails',2,'Emails',0)");
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Leads").",".getTabid("Activities").",'get_history',3,'Activity History',0)");
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Leads").",0,'get_attachments',4,'Attachments',0)");
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Leads").",".getTabid("Products").",'get_products',5,'Products',0)");
-
-	//Inserting for contact related lists
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Potentials").",'get_opportunities',1,'Potentials',0)");	
-		
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Activities").",'get_activities',2,'Activities',0)");
-
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Emails").",'get_emails',3,'Emails',0)");
-
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("HelpDesk").",'get_tickets',4,'HelpDesk',0)");
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Quotes").",'get_quotes',5,'Quotes',0)");
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("PurchaseOrder").",'get_purchase_orders',6,'Purchase Order',0)");
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("SalesOrder").",'get_salesorder',7,'Sales Order',0)");
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Products").",'get_products',8,'Products',0)");
-
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Activities").",'get_history',9,'Activity History',0)");
-
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",0,'get_attachments',10,'Attachments',0)");
-
-	//Inserting Potential Related Lists	
-
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",".getTabid("Activities").",'get_activities',1,'Activities',0)");
-
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",".getTabid("Contacts").",'get_contacts',2,'Contacts',0)");
-
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",".getTabid("Products").",'get_products',3,'Products',0)");
-
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",0,'get_stage_history',4,'Sales Stage History',0)");
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",0,'get_attachments',5,'Attachments',0)");
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",".getTabid("Quotes").",'get_Quotes',6,'Quotes',0)");
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",".getTabid("SalesOrder").",'get_salesorder',7,'Sales Order',0)");
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",".getTabid("Activities").",'get_history',8,'Activity History',0)");
-
-		//Inserting Product Related Lists	
-
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",".getTabid("HelpDesk").",'get_tickets',1,'HelpDesk',0)");
-
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",".getTabid("Activities").",'get_activities',2,'Activities',0)");
-
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",0,'get_attachments',3,'Attachments',0)");
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",".getTabid("Quotes").",'get_quotes',4,'Quotes',0)");
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",".getTabid("PurchaseOrder").",'get_purchase_orders',5,'Purchase Order',0)");
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",".getTabid("SalesOrder").",'get_salesorder',6,'Sales Order',0)");
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",".getTabid("Invoice").",'get_invoices',7,'Invoice',0)");
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",".getTabid("PriceBooks").",'get_product_pricebooks',8,'PriceBooks',0)");
-	
-		//Inserting Emails Related Lists	
-
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Emails").",".getTabid("Contacts").",'get_contacts',1,'Contacts',0)");
-
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Emails").",0,'get_users',2,'Users',0)");
-
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Emails").",0,'get_attachments',3,'Attachments',0)");
-
-		//Inserting HelpDesk Related Lists
-		
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("HelpDesk").",".getTabid("Activities").",'get_activities',1,'Activities',0)");
-
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("HelpDesk").",0,'get_attachments',2,'Attachments',0)");
-
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("HelpDesk").",0,'get_ticket_history',3,'Ticket History',0)");
-
-	//Inserting PriceBook Related Lists
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("PriceBooks").",14,'get_pricebook_products',2,'Products',0)");
-
-        // Inserting Vendor Related Lists
-        $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Vendors").",14,'get_products',1,'Products',0)");
-
-        $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Vendors").",21,'get_purchase_orders',2,'Purchase Order',0)");
-
-        $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Vendors").",4,'get_contacts',3,'Contacts',0)");
-
-	// Inserting Quotes Related Lists
-	
-        $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Quotes").",".getTabid("Invoice").",'get_salesorder',1,'Sales Order',0)");
-        
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Quotes").",9,'get_activities',2,'Activities',0)");
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Quotes").",9,'get_history',3,'Activity History',0)");
-
-	// Inserting Purchase order Related Lists
-
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("PurchaseOrder").",9,'get_activities',1,'Activities',0)");
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("PurchaseOrder").",0,'get_attachments',2,'Attachments',0)");
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("PurchaseOrder").",".getTabid("Activities").",'get_history',3,'Activity History',0)");
-	
-	// Inserting Sales order Related Lists
-
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("SalesOrder").",9,'get_activities',1,'Activities',0)");
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("SalesOrder").",0,'get_attachments',2,'Attachments',0)");
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("SalesOrder").",".getTabid("Invoice").",'get_invoices',3,'Invoice',0)");
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("SalesOrder").",".getTabid("Activities").",'get_history',4,'Activity History',0)");
-	
-	// Inserting Invoice Related Lists
-
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Invoice").",9,'get_activities',1,'Activities',0)");
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Invoice").",0,'get_attachments',2,'Attachments',0)");
-
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Invoice").",".getTabid("Activities").",'get_history',3,'Activity History',0)");
-
-	// Inserting Activities Related Lists
-	
-	$this->db->query("insert into relatedlists values (".$this->db->getUniqueID('relatedlists').",".getTabid("Activities").",0,'get_users',1,'Users',0)");
-	$this->db->query("insert into relatedlists values (".$this->db->getUniqueID('relatedlists').",".getTabid("Activities").",4,'get_contacts',2,'Contacts',0)");
-
-	// Inserting Campaigns Related Lists
-
-         $this->db->query("insert into relatedlists values (".$this->db->getUniqueID('relatedlists').",".getTabid("Campaigns").",".getTabid("Contacts").",'get_contacts',1,'Contacts',0)");
-         $this->db->query("insert into relatedlists values (".$this->db->getUniqueID('relatedlists').",".getTabid("Campaigns").",".getTabid("Leads").",'get_leads',2,'Leads',0)");
-
-               $this->db->query("insert into notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("notificationscheduler").",'LBL_TASK_NOTIFICATION_DESCRITPION',1,'Task Delay Notification','Tasks delayed beyond 24 hrs ','LBL_TASK_NOTIFICATION')");
-
-
-                $this->db->query("insert into notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("notificationscheduler").",'LBL_BIG_DEAL_DESCRIPTION' ,1,'Big Deal notification','Success! A big deal has been won! ','LBL_BIG_DEAL')");
-
-
-                $this->db->query("insert into notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("notificationscheduler").",'LBL_TICKETS_DESCRIPTION',1,'Pending Tickets notification','Ticket pending please ','LBL_PENDING_TICKETS')");
-
-
-                $this->db->query("insert into notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("notificationscheduler").",'LBL_MANY_TICKETS_DESCRIPTION',1,'Too many tickets Notification','Too many tickets pending against this entity ','LBL_MANY_TICKETS')");
-
-
-                $this->db->query("insert into notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("notificationscheduler").",'LBL_START_DESCRIPTION' ,1,'Support Start Notification','Support starts please ','LBL_START_NOTIFICATION')");
-
-                $this->db->query("insert into notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("notificationscheduler").",'LBL_SUPPORT_DESCRIPTION',1,'Support ending please','Support Ending Notification','LBL_SUPPORT_NOTICIATION')");
-		
- 		$this->db->query("insert into notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("notificationscheduler").",'LBL_ACTIVITY_REMINDER_DESCRIPTION' ,1,'Activity Reminder Notication','This is a reminder notification for the Activity','LBL_ACTIVITY_NOTIFICATION')");
-
-		//Inserting Inventory Notifications
-	$invoice_body = 'Dear {HANDLER},
-
-The current stock of {PRODUCTNAME} in our warehouse is {CURRENTSTOCK}. Kindly procure required number of units as the stock level is below reorder level {REORDERLEVELVALUE}.
-
-Please treat this information as Urgent as the invoice is already sent  to the customer.
-
-Severity: Critical
-
-Thanks,
-{CURRENTUSER}';
-
-		
-               $this->db->query("insert into inventorynotification(notificationid,notificationname,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("inventorynotification").",'InvoiceNotification','{PRODUCTNAME} Stock Level is Low','".$invoice_body." ','InvoiceNotificationDescription')");
-
-		$quote_body = 'Dear {HANDLER},
-
-Quote is generated for {QUOTEQUANTITY} units of {PRODUCTNAME}. The current stock of {PRODUCTNAME} in our warehouse is {CURRENTSTOCK}. 
-
-Severity: Minor
-
-Thanks,
-{CURRENTUSER}';	
-		
-		
-               $this->db->query("insert into inventorynotification(notificationid,notificationname,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("inventorynotification").",'QuoteNotification','Quote given for {PRODUCTNAME}','".$quote_body." ','QuoteNotificationDescription')");
-
-		$so_body = 'Dear {HANDLER},
-
-SalesOrder is generated for {SOQUANTITY} units of {PRODUCTNAME}. The current stock of {PRODUCTNAME} in our warehouse is {CURRENTSTOCK}. 
-
-Please treat this information  with priority as the sales order is already generated.
-
-Severity: Major
-
-Thanks,
-{CURRENTUSER}';
-
-		
-               $this->db->query("insert into inventorynotification(notificationid,notificationname,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("inventorynotification").",'SalesOrderNotification','Sales Order generated for {PRODUCTNAME}','".$so_body." ','SalesOrderNotificationDescription')");
-
-		//Insert into currency table
-		$this->db->query("insert into currency_info values(".$this->db->getUniqueID("currency_info").",'U.S Dollar','USD','$',1,'Active','-11')");
-                
-
-
-
-//insert into email template table
-
-	$body='
-	Hello!
-
-	On behalf of the vtiger team,  I am pleased to announce the release of vtiger crm4.2 . This is a feature packed release including the mass email template handling, custom view feature, reports feature and a host of other utilities. vtiger runs on all platforms.
-
-	Notable Features of vtiger are :
-	-Email Client Integration
-	-Trouble Ticket Integration
-	-Invoice Management Integration
-	-Reports Integration
-	-Portal Integration
-	-Enhanced Word Plugin Support
-	-Custom View Integration
-
-	Known Issues:
-	-ABCD
-	-EFGH
-	-IJKL
-	-MNOP
-	-QRST';
-
-          $this->db->query("insert into emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Announcement for Release','Announcement for Release','Announcement of a release','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
-	
-
-
-$body='name
-street,
-city,
-state,
- zip)
- 
- Dear
- 
- Please check the following invoices that are yet to be paid by you:
- 
- No. Date      Amount
- 1   1/1/01    $4000
- 2   2/2//01   $5000
- 3   3/3/01    $10000
- 4   7/4/01    $23560
- 
- Kindly let us know if there are any issues that you feel are pending to be discussed.
- We will be more than happy to give you a call.
- We would like to continue our business with you.
- 
- Sincerely,
- name
- title';
-
-
-               $this->db->query("insert into emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Pending Invoices','Invoices Pending','Payment Due','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
-
-
-
-
-
-$body=' Dear
-
-Your proposal on the project XYZW has been reviewed by us
-and is acceptable in its entirety.
-
-We are eagerly looking forward to this project
-and are pleased about having the opportunity to work
-together. We look forward to a long standing relationship
-with your esteemed firm.
-
-I would like to take this opportunity to invite you
-to a game of golf on Wednesday morning 9am at the
-Cuff Links Ground. We will be waiting for you in the
-Executive Lounge.
-
-Looking forward to seeing you there.
-
-Sincerely,
-name
-title';
-	       
-               $this->db->query("insert into emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Acceptance Proposal','Acceptance Proposal','Acceptance of Proposal','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
-
-
-$body= ' The undersigned hereby acknowledges receipt and delivery
-of the goods.
-The undersigned will release the payment subject to the goods being discovered not satisfactory.
-
-Signed under seal this <date>
-
-Sincerely,
-name
-title';
-	       
-               $this->db->query("insert into emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Goods received acknowledgement','Goods received acknowledgement','Acknowledged Receipt of Goods','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
-
-
-	       $body= ' Dear
-	 We are in receipt of your order as contained in the
-   purchase order form.We consider this to be final and binding on both sides.
-If there be any exceptions noted, we shall consider them
-only if the objection is received within ten days of receipt of
-this notice.
-
-Thank you for your patronage.
-Sincerely,
-name
-title';
-
-
-	       
-               $this->db->query("insert into emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Accept Order','Accept Order','Acknowledgement/Acceptance of Order','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
-
-
-
-
-$body='Dear
-
-We are relocating our office to
-11111,XYZDEF Cross,
-UVWWX Circle
-The telephone number for this new location is (101) 1212-1328.
-
-Our Manufacturing Division will continue operations
-at 3250 Lovedale Square Avenue, in Frankfurt.
-
-We hope to keep in touch with you all.
-Please update your addressbooks.
-
-
-Thank You,
-name
-title';
-	       
-               $this->db->query("insert into emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Address Change','Change of Address','Address Change','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
-
-
-
-$body='Dear
-
-Thank you for extending us the opportunity to meet with
-you and members of your staff.
-
-I know that John Doe serviced your account
-for many years and made many friends at your firm. He has personally
-discussed with me the deep relationship that he had with your firm.
-While his presence will be missed, I can promise that we will
-continue to provide the fine service that was accorded by
-John to your firm.
-
-I was genuinely touched to receive such fine hospitality.
-
-Thank you once again.
-
-Sincerely,
-name
-title';
-
-
-	       
-               $this->db->query("insert into emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Follow Up','Follow Up','Follow Up of meeting','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
-
-
-
-$body='Congratulations!
-
-The numbers are in and I am proud to inform you that our
-total sales for the previous quarter
-amounts to $100,000,00.00!. This is the first time
-we have exceeded the target by almost 30%.
-We have also beat the previous quarter record by a
-whopping 75%!
-
-Let us meet at Smoking Joe for a drink in the evening!
-
-C you all there guys!
-
-Sincerely,
-name
-title';
-
-	       
-               $this->db->query("insert into emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Target Crossed!','Target Crossed!','Fantastic Sales Spree!','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
-
-$body='
-Dear
-
-Thank you for your confidence in our ability to serve you.
-We are glad to be given the chance to serve you.I look
-forward to establishing a long term partnership with you.
-Consider me as a friend.
-Should any need arise,please do give us a call.
-
-Sincerely,
-name
-title';
-
-	       
-               $this->db->query("insert into emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Thanks Note','Thanks Note','Note of thanks','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
-
-		
-	       //Insert into organizationdetails table 
-	       $this->db->query("insert into organizationdetails(organizationame,address,city,state,country,code,phone,fax,website,logoname) values ('vtiger',' 40-41-42, Sivasundar Apartments, Flat D-II, Shastri Street, Velachery','Chennai','Tamil Nadu','India','600 042','+91-44-5202-1990','+91-44-5202-1990','www.vtiger.com','vtiger-crm-logo.jpg')");
-
-  //Insert into inventory_tandc table
-               $this->db->query("insert into inventory_tandc values('".$this->db->getUniqueID('inventory_tandc')."','Inventory','')");
-
-	$this->db->query("insert into actionmapping values(0,'Save',0)");
-	$this->db->query("insert into actionmapping values(1,'EditView',0)");
-	$this->db->query("insert into actionmapping values(2,'Delete',0)");
-	$this->db->query("insert into actionmapping values(3,'index',0)");
-	$this->db->query("insert into actionmapping values(4,'DetailView',0)");
-	$this->db->query("insert into actionmapping values(5,'Import',0)");
-	$this->db->query("insert into actionmapping values(6,'Export',0)");
-	//$this->db->query("insert into actionmapping values(7,'AddBusinessCard',0)");
-	$this->db->query("insert into actionmapping values(8,'Merge',0)");
-	$this->db->query("insert into actionmapping values(1,'VendorEditView',1)");
-	$this->db->query("insert into actionmapping values(4,'VendorDetailView',1)");
-	$this->db->query("insert into actionmapping values(0,'SaveVendor',1)");
-	$this->db->query("insert into actionmapping values(2,'DeleteVendor',1)");
-	$this->db->query("insert into actionmapping values(1,'PriceBookEditView',1)");
-	$this->db->query("insert into actionmapping values(4,'PriceBookDetailView',1)");
-	$this->db->query("insert into actionmapping values(0,'SavePriceBook',1)");
-	$this->db->query("insert into actionmapping values(2,'DeletePriceBook',1)");
-	$this->db->query("insert into actionmapping values(9,'ConvertLead',0)");
-	$this->db->query("insert into actionmapping values(1,'DetailViewAjax',1)");
-	$this->db->query("insert into actionmapping values(4,'TagCloud',1)");
-	$this->db->query("insert into actionmapping values(1,'QuickCreate',1)");
-	$this->db->query("insert into actionmapping values(3,'Popup',1)");
-
-	//Insert values for moduleowners table which contains the modules and their users. default user id admin - after 4.2 patch 2
-	$module_array = Array('Potentials','Contacts','Accounts','Leads','Notes','Activities','Emails','HelpDesk','Products','Faq','Vendors','PriceBooks','Quotes','PurchaseOrder','SalesOrder','Invoice','Reports','Campaigns');
-	foreach($module_array as $mod)
-	{
-		$this->db->query("insert into moduleowners values(".getTabid($mod).",1)");
-	}
-	//added by jeri for category view from db
-	$this->db->query("insert into parenttab values (1,'My Home Page',1,0)");
-	$this->db->query("insert into parenttab values (2,'Marketing',2,0)");
-	$this->db->query("insert into parenttab values (3,'Sales',3,0)");
-	$this->db->query("insert into parenttab values (4,'Support',4,0)");
-	$this->db->query("insert into parenttab values (5,'Analytics',5,0)");
-	$this->db->query("insert into parenttab values (6,'Inventory',6,0)");
-	$this->db->query("insert into parenttab values (7,'Tools',7,0)");
-	$this->db->query("insert into parenttab values (8,'Settings',8,0)");
-
-	$this->db->query("insert into parenttabrel values (1,9,2)");
-	$this->db->query("insert into parenttabrel values (1,17,3)");
-	$this->db->query("insert into parenttabrel values (1,10,4)");
-	$this->db->query("insert into parenttabrel values (1,3,1)");
-	$this->db->query("insert into parenttabrel values (3,7,1)");
-	$this->db->query("insert into parenttabrel values (3,6,2)");
-	$this->db->query("insert into parenttabrel values (3,4,3)");
-	$this->db->query("insert into parenttabrel values (3,2,4)");
-	$this->db->query("insert into parenttabrel values (3,20,5)");
-	$this->db->query("insert into parenttabrel values (3,22,6)");
-	$this->db->query("insert into parenttabrel values (3,23,7)");
-	$this->db->query("insert into parenttabrel values (3,14,8)");
-	$this->db->query("insert into parenttabrel values (3,19,9)");
-	$this->db->query("insert into parenttabrel values (3,8,10)");
-	$this->db->query("insert into parenttabrel values (4,13,1)");
-	$this->db->query("insert into parenttabrel values (4,15,2)");
-	$this->db->query("insert into parenttabrel values (4,6,3)");
-	$this->db->query("insert into parenttabrel values (4,4,4)");
-	$this->db->query("insert into parenttabrel values (4,14,5)");
-	$this->db->query("insert into parenttabrel values (4,8,6)");
-	$this->db->query("insert into parenttabrel values (5,1,1)");
-	$this->db->query("insert into parenttabrel values (5,25,2)");
-	$this->db->query("insert into parenttabrel values (6,14,1)");
-	$this->db->query("insert into parenttabrel values (6,18,2)");
-	$this->db->query("insert into parenttabrel values (6,19,3)");
-	$this->db->query("insert into parenttabrel values (6,21,4)");
-	$this->db->query("insert into parenttabrel values (6,22,5)");
-	$this->db->query("insert into parenttabrel values (6,20,6)");
-	$this->db->query("insert into parenttabrel values (6,23,7)");
-	$this->db->query("insert into parenttabrel values (7,24,1)");
-	$this->db->query("insert into parenttabrel values (7,27,2)");
-	$this->db->query("insert into parenttabrel values (7,8,3)");
-	$this->db->query("insert into parenttabrel values (2,26,1)");
-	$this->db->query("insert into parenttabrel values (2,6,2)");
-	$this->db->query("insert into parenttabrel values (2,4,3)");
-	$this->db->query("insert into parenttabrel values (2,10,4)");
-	$this->db->query("insert into parenttabrel values (4,10,7)");
-
-	//Added to populate the default inventory tax informations
-	$this->db->query("insert into inventorytaxinfo values(".$this->db->getUniqueID("inventorytaxinfo").",'VAT','4.5')");
-	$this->db->query("insert into inventorytaxinfo values(".$this->db->getUniqueID("inventorytaxinfo").",'Sales','10')");
-	$this->db->query("insert into inventorytaxinfo values(".$this->db->getUniqueID("inventorytaxinfo").",'Service','12.5')");
-	
-	}
-}
-?>
+<?php
+
+/*********************************************************************************
+** The contents of this file are subject to the vtiger CRM Public License Version 1.0
+ * ("License"); You may not use this file except in compliance with the License
+ * The Original Code is:  vtiger CRM Open Source
+ * The Initial Developer of the Original Code is vtiger.
+ * Portions created by vtiger are Copyright (C) vtiger.
+ * All Rights Reserved.
+ ********************************************************************************/
+
+include_once('config.php');
+require_once('include/logging.php');
+require_once('include/database/PearDatabase.php');
+require_once('data/SugarBean.php');
+require_once('data/CRMEntity.php');
+require_once('include/utils/utils.php');
+
+class DefaultDataPopulator extends CRMEntity {
+		
+	function DefaultDataPopulator() {
+		$this->log = LoggerManager::getLogger('DefaultDataPopulator');
+		$this->db = new PearDatabase();
+	}
+
+	var $new_schema = true;
+
+	function create_tables () {
+		global $app_strings;
+
+		$role1_id = $this->db->getUniqueID("role");
+		$role2_id = $this->db->getUniqueID("role");
+		$role3_id = $this->db->getUniqueID("role");
+
+		$profile1_id = $this->db->getUniqueID("profile");
+		$profile2_id = $this->db->getUniqueID("profile");
+		$profile3_id = $this->db->getUniqueID("profile");
+		$profile4_id = $this->db->getUniqueID("profile");
+
+                $this->db->query("insert into vtiger_role values('H".$role1_id."','Organisation','H".$role1_id."',0)");
+                $this->db->query("insert into vtiger_role values('H".$role2_id."','administrator','H".$role1_id."::H".$role2_id."',1)");
+                $this->db->query("insert into vtiger_role values('H".$role3_id."','standard_user','H".$role1_id."::H".$role2_id."::H".$role3_id."',2)");
+                
+
+ $this->db->query("INSERT INTO vtiger_tab VALUES (3,'Home',0,1,'Home',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (7,'Leads',0,4,'Leads',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (6,'Accounts',0,5,'Accounts',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (4,'Contacts',0,6,'Contacts',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (2,'Potentials',0,7,'Potentials',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (8,'Notes',0,9,'Notes',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (9,'Activities',0,3,'Activities',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (10,'Emails',0,10,'Emails',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (13,'HelpDesk',0,11,'HelpDesk',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (14,'Products',0,8,'Products',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (1,'Dashboard',0,12,'Dashboards',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (15,'Faq',0,14,'Faq',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (16,'Events',2,13,'Events',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (17,'Calendar',0,2,'Calendar',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (18,'Vendors',0,15,'Vendors',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (19,'PriceBooks',0,16,'PriceBooks',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (20,'Quotes',0,17,'Quotes',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (21,'PurchaseOrder',0,18,'PurchaseOrder',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (22,'SalesOrder',0,19,'SalesOrder',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (23,'Invoice',0,20,'Invoice',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (24,'Rss',0,21,'Rss',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (25,'Reports',0,22,'Reports',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (26,'Campaigns',0,23,'Campaigns',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (27,'Portal',0,24,'Portal',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (28,'Webmails',0,25,'Webmails',null,null,1)");
+
+// Populate the vtiger_blocks vtiger_table
+$this->db->query("insert into vtiger_blocks values (1,2,'LBL_OPPORTUNITY_INFORMATION',1,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (2,2,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (3,2,'LBL_DESCRIPTION_INFORMATION',3,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (4,4,'LBL_CONTACT_INFORMATION',1,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (5,4,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (6,4,'LBL_CUSTOMER_PORTAL_INFORMATION',3,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (7,4,'LBL_ADDRESS_INFORMATION',4,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (8,4,'LBL_DESCRIPTION_INFORMATION',6,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (9,6,'LBL_ACCOUNT_INFORMATION',1,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (10,6,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (11,6,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (12,6,'LBL_DESCRIPTION_INFORMATION',4,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (13,7,'LBL_LEAD_INFORMATION',1,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (14,7,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (15,7,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (16,7,'LBL_DESCRIPTION_INFORMATION',4,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (17,8,'LBL_NOTE_INFORMATION',1,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (18,8,'',2,1,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (19,9,'LBL_TASK_INFORMATION',1,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (20,9,'',2,1,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (21,10,'LBL_EMAIL_INFORMATION',1,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (22,10,'',2,1,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (23,10,'',3,1,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (24,10,'',4,1,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (25,13,'LBL_TICKET_INFORMATION',1,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (26,13,'',2,1,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (27,13,'LBL_CUSTOM_INFORMATION',3,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (28,13,'LBL_DESCRIPTION_INFORMATION',4,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (29,13,'LBL_TICKET_RESOLUTION',5,0,0,1,0,0)");
+$this->db->query("insert into vtiger_blocks values (30,13,'LBL_COMMENTS',6,0,0,1,0,0)");
+$this->db->query("insert into vtiger_blocks values (31,14,'LBL_PRODUCT_INFORMATION',1,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (32,14,'LBL_PRICING_INFORMATION',2,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (33,14,'LBL_STOCK_INFORMATION',3,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (34,14,'LBL_CUSTOM_INFORMATION',4,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (35,14,'LBL_IMAGE_INFORMATION',5,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (36,14,'LBL_DESCRIPTION_INFORMATION',6,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (37,15,'LBL_FAQ_INFORMATION',1,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (38,15,'',2,1,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (39,15,'',3,1,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (40,15,'LBL_COMMENT_INFORMATION',4,0,0,1,0,0)");
+$this->db->query("insert into vtiger_blocks values (41,16,'LBL_EVENT_INFORMATION',1,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (42,16,'',2,1,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (43,16,'',3,1,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (44,18,'LBL_VENDOR_INFORMATION',1,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (45,18,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (46,18,'LBL_VENDOR_ADDRESS_INFORMATION',3,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (47,18,'LBL_DESCRIPTION_INFORMATION',4,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (48,19,'LBL_PRICEBOOK_INFORMATION',1,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (49,19,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (50,19,'LBL_DESCRIPTION_INFORMATION',3,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (51,20,'LBL_QUOTE_INFORMATION',1,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (52,20,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (53,20,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (54,20,'LBL_RELATED_PRODUCTS',4,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (55,20,'LBL_TERMS_INFORMATION',5,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (56,20,'LBL_DESCRIPTION_INFORMATION',6,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (57,21,'LBL_PO_INFORMATION',1,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (58,21,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (59,21,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (60,21,'LBL_RELATED_PRODUCTS',4,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (61,21,'LBL_TERMS_INFORMATION',5,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (62,21,'LBL_DESCRIPTION_INFORMATION',6,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (63,22,'LBL_SO_INFORMATION',1,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (64,22,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (65,22,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (66,22,'LBL_RELATED_PRODUCTS',4,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (67,22,'LBL_TERMS_INFORMATION',5,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (68,22,'LBL_DESCRIPTION_INFORMATION',6,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (69,23,'LBL_INVOICE_INFORMATION',1,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (70,23,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (71,23,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (72,23,'LBL_RELATED_PRODUCTS',4,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (73,23,'LBL_TERMS_INFORMATION',5,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (74,23,'LBL_DESCRIPTION_INFORMATION',6,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (75,4,'LBL_IMAGE_INFORMATION',5,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (76,26,'LBL_CAMPAIGN_INFORMATION',1,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (77,26,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (78,26,'LBL_DESCRIPTION_INFORMATION',3,0,0,0,0,0)");
+
+//
+
+//Account Details -- START
+ //Block9
+
+$this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'accountname','vtiger_account',1,'2','accountname','Account Name',1,0,0,100,1,9,1,'V~M',0,1,'BAS')");	
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'phone','vtiger_account',1,'11','phone','Phone',1,0,0,100,2,9,1,'V~O',0,2,'BAS')");	
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'website','vtiger_account',1,'17','website','Website',1,0,0,100,3,9,1,'V~O',0,3,'BAS')");	
+
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'fax','vtiger_account',1,'1','fax','Fax',1,0,0,100,4,9,1,'V~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'tickersymbol','vtiger_account',1,'1','tickersymbol','Ticker Symbol',1,0,0,100,5,9,1,'V~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'otherphone','vtiger_account',1,'11','otherphone','Other Phone',1,0,0,100,6,9,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'parentid','vtiger_account',1,'51','account_id','Member Of',1,0,0,100,7,9,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'email1','vtiger_account',1,'13','email1','Email',1,0,0,100,8,9,1,'E~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'employees','vtiger_account',1,'7','employees','Employees',1,0,0,100,9,9,1,'I~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'email2','vtiger_account',1,'13','email2','Other Email',1,0,0,100,10,9,1,'E~O',1,null,'ADV')");
+
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'ownership','vtiger_account',1,'1','ownership','Ownership',1,0,0,100,11,9,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'rating','vtiger_account',1,'1','rating','Rating',1,0,0,100,12,9,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'industry','vtiger_account',1,'15','industry','industry',1,0,0,100,13,9,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'siccode','vtiger_account',1,'1','siccode','SIC Code',1,0,0,100,14,9,1,'I~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'account_type','vtiger_account',1,'15','accounttype','Type',1,0,0,100,15,9,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'annualrevenue','vtiger_account',1,'71','annual_revenue','Annual Revenue',1,0,0,100,16,9,1,'I~O',1,null,'ADV')");
+ //Added vtiger_field emailoptout for vtiger_accounts -- after 4.2 patch2
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'emailoptout','vtiger_account',1,'56','emailoptout','Email Opt Out',1,0,0,100,17,9,1,'C~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'notify_owner','vtiger_account',1,56,'notify_owner','Notify Owner',1,0,0,10,18,9,1,'C~O',1,NULL,'ADV')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,19,9,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,20,9,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,21,9,2,'T~O',1,null,'BAS')");
+
+
+
+
+ //Block 11
+$this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'street','vtiger_accountbillads',1,'21','bill_street','Billing Address',1,0,0,100,1,11,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'street','vtiger_accountshipads',1,'21','ship_street','Shipping Address',1,0,0,100,2,11,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'city','vtiger_accountbillads',1,'1','bill_city','Billing City',1,0,0,100,5,11,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'city','vtiger_accountshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,11,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'state','vtiger_accountbillads',1,'1','bill_state','Billing State',1,0,0,100,7,11,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'state','vtiger_accountshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,11,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'code','vtiger_accountbillads',1,'1','bill_code','Billing Code',1,0,0,100,9,11,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'code','vtiger_accountshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,11,1,'V~O',1,null,'BAS')");
+
+
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'country','vtiger_accountbillads',1,'1','bill_country','Billing Country',1,0,0,100,11,11,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'country','vtiger_accountshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,11,1,'V~O',1,null,'BAS')");
+
+$this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'pobox','vtiger_accountbillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,11,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'pobox','vtiger_accountshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,11,1,'V~O',1,null,'BAS')");
+
+
+ //Block12
+$this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,12,1,'V~O',1,null,'BAS')");
+ 
+
+
+//Account Details -- END
+
+			
+//Lead Details --- START
+
+//Block13 -- Start
+
+$this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'salutation','vtiger_leaddetails',1,'55','salutationtype','Salutation',1,0,0,100,1,13,3,'V~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'firstname','vtiger_leaddetails',1,'55','firstname','First Name',1,0,0,100,2,13,1,'V~O',0,1,'BAS')");	
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'phone','vtiger_leadaddress',1,'11','phone','Phone',1,0,0,100,3,13,1,'V~O',0,4,'BAS')");	
+
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'lastname','vtiger_leaddetails',1,'2','lastname','Last Name',1,0,0,100,4,13,1,'V~M',0,2,'BAS')");	
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'mobile','vtiger_leadaddress',1,'1','mobile','Mobile',1,0,0,100,5,13,1,'V~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'company','vtiger_leaddetails',1,'2','company','Company',1,0,0,100,6,13,1,'V~M',0,3,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'campaignid','vtiger_leaddetails',1,'51','campaignid','Campaign Name',1,0,0,100,6,4,3,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'fax','vtiger_leadaddress',1,'1','fax','Fax',1,0,0,100,7,13,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'designation','vtiger_leaddetails',1,'1','designation','Designation',1,0,0,100,8,13,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'email','vtiger_leaddetails',1,'13','email','Email',1,0,0,100,9,13,1,'E~O',0,5,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'leadsource','vtiger_leaddetails',1,'15','leadsource','Lead Source',1,0,0,100,10,13,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'website','vtiger_leadsubdetails',1,'17','website','Website',1,0,0,100,11,13,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'industry','vtiger_leaddetails',1,'15','industry','Industry',1,0,0,100,12,13,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'leadstatus','vtiger_leaddetails',1,'15','leadstatus','Lead Status',1,0,0,100,13,13,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'annualrevenue','vtiger_leaddetails',1,'71','annualrevenue','Annual Revenue',1,0,0,100,14,13,1,'I~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'rating','vtiger_leaddetails',1,'15','rating','Rating',1,0,0,100,15,13,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'noofemployees','vtiger_leaddetails',1,'1','noofemployees','No Of Employees',1,0,0,100,16,13,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,17,13,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'yahooid','vtiger_leaddetails',1,'13','yahooid','Yahoo Id',1,0,0,100,18,13,1,'V~O',1,null,'ADV')");
+$this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,19,13,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,20,13,2,'T~O',1,null,'BAS')");
+
+//Block13 -- End
+
+
+//Block15 -- Start
+
+$this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'lane','vtiger_leadaddress',1,'21','lane','Street',1,0,0,100,1,15,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'code','vtiger_leadaddress',1,'1','code','Postal Code',1,0,0,100,3,15,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'city','vtiger_leadaddress',1,'1','city','City',1,0,0,100,4,15,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'country','vtiger_leadaddress',1,'1','country','Country',1,0,0,100,5,15,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'state','vtiger_leadaddress',1,'1','state','State',1,0,0,100,6,15,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'pobox','vtiger_leadaddress',1,'1','pobox','Po Box',1,0,0,100,2,15,1,'V~O',1,null,'BAS')");
+
+//Block15 --End
+
+//Block16 -- Start
+
+$this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,16,1,'V~O',1,null,'BAS')");
+
+//Block16 -- End
+
+//Lead Details -- END
+
+
+//Contact Details -- START
+//Block4 -- Start
+
+$this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'salutation','vtiger_contactdetails',1,'55','salutationtype','Salutation',1,0,0,100,1,4,3,'V~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'firstname','vtiger_contactdetails',1,'55','firstname','First Name',1,0,0,100,2,4,1,'V~O',0,1,'BAS')");	
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'phone','vtiger_contactdetails',1,'11','phone','Office Phone',1,0,0,100,3,4,1,'V~O',0,4,'BAS')");	
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'lastname','vtiger_contactdetails',1,'2','lastname','Last Name',1,0,0,100,4,4,1,'V~M',0,2,'BAS')");	
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'mobile','vtiger_contactdetails',1,'1','mobile','Mobile',1,0,0,100,5,4,1,'V~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'accountid','vtiger_contactdetails',1,'51','account_id','Account Name',1,0,0,100,6,4,1,'I~O',0,3,'BAS')");	
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'campaignid','vtiger_contactdetails',1,'51','campaignid','Campaign Name',1,0,0,100,6,4,3,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'homephone','vtiger_contactsubdetails',1,'11','homephone','Home Phone',1,0,0,100,7,4,1,'V~O',1,null,'ADV')");	
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'leadsource','vtiger_contactsubdetails',1,'15','leadsource','Lead Source',1,0,0,100,8,4,1,'V~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'otherphone','vtiger_contactsubdetails',1,'11','otherphone','Phone',1,0,0,100,9,4,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'title','vtiger_contactdetails',1,'1','title','Title',1,0,0,100,10,4,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'fax','vtiger_contactdetails',1,'1','fax','Fax',1,0,0,100,11,4,1,'V~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'department','vtiger_contactdetails',1,'1','department','Department',1,0,0,100,12,4,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'birthday','vtiger_contactsubdetails',1,'5','birthday','Birthdate',1,0,0,100,14,4,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'email','vtiger_contactdetails',1,'13','email','Email',1,0,0,100,15,4,1,'E~O',0,5,'ADV')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'reportsto','vtiger_contactdetails',1,'57','contact_id','Reports To',1,0,0,100,16,4,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'assistant','vtiger_contactsubdetails',1,'1','assistant','Assistant',1,0,0,100,17,4,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'yahooid','vtiger_contactdetails',1,'13','yahooid','Yahoo Id',1,0,0,100,18,4,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'assistantphone','vtiger_contactsubdetails',1,'11','assistantphone','Assistant Phone',1,0,0,100,19,4,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'donotcall','vtiger_contactdetails',1,'56','donotcall','Do Not Call',1,0,0,100,20,4,1,'C~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'emailoptout','vtiger_contactdetails',1,'56','emailoptout','Email Opt Out',1,0,0,100,21,4,1,'C~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,22,4,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'reference','vtiger_contactdetails',1,'56','reference','Reference',1,0,0,10,23,4,1,'C~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'notify_owner','vtiger_contactdetails',1,'56','notify_owner','Notify Owner',1,0,0,10,24,4,1,'C~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,25,4,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,26,4,2,'T~O',1,null,'BAS')");
+
+//Block4 -- End
+
+//Block6 - Begin Customer Portal
+
+$this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'portal','vtiger_customerdetails',1,'56','portal','Portal User',1,0,0,100,1,6,1,'C~O',1,null,'ADV')");
+$this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'support_start_date','vtiger_customerdetails',1,'5','support_start_date','Support Start Date',1,0,0,100,2,6,1,'D~O',1,null,'ADV')");
+$this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'support_end_date','vtiger_customerdetails',1,'5','support_end_date','Support End Date',1,0,0,100,3,6,1,'D~O~OTH~GE~support_start_date~Support Start Date',1,null,'ADV')");
+
+//Block6 - End Customer Portal
+
+//Block 7 -- Start
+
+$this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'mailingstreet','vtiger_contactaddress',1,'21','mailingstreet','Mailing Street',1,0,0,100,1,7,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'otherstreet','vtiger_contactaddress',1,'21','otherstreet','Other Street',1,0,0,100,2,7,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'mailingcity','vtiger_contactaddress',1,'1','mailingcity','Mailing City',1,0,0,100,5,7,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'othercity','vtiger_contactaddress',1,'1','othercity','Other City',1,0,0,100,6,7,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'mailingstate','vtiger_contactaddress',1,'1','mailingstate','Mailing State',1,0,0,100,7,7,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'otherstate','vtiger_contactaddress',1,'1','otherstate','Other State',1,0,0,100,8,7,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'mailingzip','vtiger_contactaddress',1,'1','mailingzip','Mailing Zip',1,0,0,100,9,7,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'otherzip','vtiger_contactaddress',1,'1','otherzip','Other Zip',1,0,0,100,10,7,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'mailingcountry','vtiger_contactaddress',1,'1','mailingcountry','Mailing Country',1,0,0,100,11,7,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'othercountry','vtiger_contactaddress',1,'1','othercountry','Other Country',1,0,0,100,12,7,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'mailingpobox','vtiger_contactaddress',1,'1','mailingpobox','Mailing Po Box',1,0,0,100,3,7,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'otherpobox','vtiger_contactaddress',1,'1','otherpobox','Other Po Box',1,0,0,100,4,7,1,'V~O',1,null,'BAS')");
+//Block7 -- End
+
+//ContactImageInformation
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'imagename','vtiger_contactdetails',1,'69','imagename','Contact Image',1,0,0,100,1,75,1,'V~O',1,null,'ADV')");
+
+
+//Block8 -- Start
+$this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,8,1,'V~O',1,null,'BAS')");
+//Block8 -- End
+//Contact Details -- END
+
+
+//Potential Details -- START
+//Block1 -- Start
+
+$this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'potentialname','vtiger_potential',1,'2','potentialname','Potential Name',1,0,0,100,1,1,1,'V~M',0,1,'BAS')");	
+ $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'amount','vtiger_potential',1,71,'amount','Amount',1,0,0,100,2,1,1,'N~O',0,5,'BAS')");	
+ $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'accountid','vtiger_potential',1,'50','account_id','Account Name',1,0,0,100,3,1,1,'V~M',0,2,'BAS')");	
+ $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'closingdate','vtiger_potential',1,'23','closingdate','Expected Close Date',1,0,0,100,5,1,1,'D~M',0,3,'BAS')");	
+ $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'potentialtype','vtiger_potential',1,'15','opportunity_type','Type',1,0,0,100,6,1,1,'V~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'nextstep','vtiger_potential',1,'1','nextstep','Next Step',1,0,0,100,7,1,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'leadsource','vtiger_potential',1,'15','leadsource','Lead Source',1,0,0,100,8,1,1,'V~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'sales_stage','vtiger_potential',1,'16','sales_stage','Sales Stage',1,0,0,100,9,1,1,'V~O',0,4,'BAS')");
+ $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,10,1,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'probability','vtiger_potential',1,'9','probability','Probability',1,0,0,100,11,1,1,'N~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,13,1,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,14,1,2,'T~O',1,null,'BAS')");
+
+//Block1 -- End
+
+//Block3 -- Start
+
+ $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,3,1,'V~O',1,null,'BAS')");
+
+//Block3 -- End
+//Potential Details -- END
+
+
+//Rss entries being added
+ $this->db->query("insert into vtiger_field values (24,".$this->db->getUniqueID("field").",'rsscategory','vtiger_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
+
+
+ $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'campaignname','vtiger_campaign',1,'2','campaignname','Campaign Name',1,0,0,100,1,76,1,'V~M',0,1,'BAS')");
+ $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'campaigntype','vtiger_campaign',1,15,'campaigntype','Campaign Type',1,0,0,100,2,76,1,'V~O',0,5,'BAS')");
+ $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'product_id','vtiger_campaign',1,59,'product_id','Product',1,0,0,100,3,76,1,'I~O',0,5,'BAS')");
+ $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'campaignstatus','vtiger_campaign',1,15,'campaignstatus','Campaign Status',1,0,0,100,4,76,1,'V~O',0,5,'BAS')");
+ $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'closingdate','vtiger_campaign',1,'23','closingdate','Expected Close Date',1,0,0,100,5,76,1,'D~M',0,3,'BAS')");
+ $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'expectedrevenue','vtiger_campaign',1,'1','expectedrevenue','Expected Revenue',1,0,0,100,6,76,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'budgetcost','vtiger_campaign',1,'1','budgetcost','Budget Cost',1,0,0,100,7,76,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'actualcost','vtiger_campaign',1,'1','actualcost','Actual Cost',1,0,0,100,8,76,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'expectedresponse','vtiger_campaign',1,'15','expectedresponse','Expected Response',1,0,0,100,9,76,1,'V~O',0,4,'BAS')");
+ $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'smownerid','vtiger_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 vtiger_field values (26,".$this->db->getUniqueID("field").",'numsent','vtiger_campaign',1,'9','numsent','Num Sent',1,0,0,100,11,76,1,'N~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'sponsor','vtiger_campaign',1,'1','sponsor','Sponsor',1,0,0,100,12,76,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'targetaudience','vtiger_campaign',1,'1','targetaudience','Target Audience',1,0,0,100,13,76,1,'V~O',1,null,'BAS')");
+
+$this->db->query("insert into vtiger_field values(26,".$this->db->getUniqueID("field").",'targetsize','vtiger_campaign',1,'1','targetsize','TargetSize',1,0,0,100,14,76,1,'N~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values(26,".$this->db->getUniqueID("field").",'expectedresponsecount','vtiger_campaign',1,'1','expectedresponsecount','Expected Response Count',1,0,0,100,17,76,1,'N~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values(26,".$this->db->getUniqueID("field").",'expectedsalescount','vtiger_campaign',1,'1','expectedsalescount','Expected Sales Count',1,0,0,100,15,76,1,'N~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values(26,".$this->db->getUniqueID("field").",'expectedroi','vtiger_campaign',1,'1','expectedroi','Expected ROI',1,0,0,100,19,76,1,'N~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values(26,".$this->db->getUniqueID("field").",'actualresponsecount','vtiger_campaign',1,'1','actualresponsecount','Actual Response Count',1,0,0,100,18,76,1,'N~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values(26,".$this->db->getUniqueID("field").",'actualsalescount','vtiger_campaign',1,'1','actualsalescount','Actual Sales Count',1,0,0,100,16,76,1,'N~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values(26,".$this->db->getUniqueID("field").",'actualroi','vtiger_campaign',1,'1','actualroi','Actual ROI',1,0,0,100,20,76,1,'N~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,15,76,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,16,76,2,'T~O',1,null,'BAS')");
+
+$this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,78,1,'V~O',1,null,'BAS')");
+
+//Campaign entries end
+
+
+//Ticket Details -- START
+//Block25 -- Start
+
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,2,25,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'parent_id','vtiger_troubletickets',1,'68','parent_id','Related To',1,0,0,100,4,25,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'priority','vtiger_troubletickets',1,'15','ticketpriorities','Priority',1,0,0,100,5,25,1,'V~O',0,3,'BAS')");
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'product_id','vtiger_troubletickets',1,'59','product_id','Product Name',1,0,0,100,6,25,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'severity','vtiger_troubletickets',1,'15','ticketseverities','Severity',1,0,0,100,7,25,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'status','vtiger_troubletickets',1,'15','ticketstatus','Status',1,0,0,100,8,25,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'category','vtiger_troubletickets',1,'15','ticketcategories','Category',1,0,0,100,9,25,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'update_log','vtiger_troubletickets',1,'15','update_log','Update History',1,0,0,100,9,25,3,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,10,25,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,11,25,2,'T~O',1,null,'BAS')");
+ //Added on 26-12-2005 to add attachment in ticket editview
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'filename','vtiger_attachments',1,'61','filename','Attachment',1,0,0,100,12,26,1,'V~O',0,1,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'title','vtiger_troubletickets',1,'22','ticket_title','Title',1,0,0,100,1,26,1,'V~M',0,1,'BAS')");
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'description','vtiger_troubletickets',1,'19','description','Description',1,0,0,100,1,28,1,'V~O',0,2,'BAS')");
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'solution','vtiger_troubletickets',1,'19','solution','Solution',1,0,0,100,1,29,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'comments','vtiger_ticketcomments',1,'19','comments','Add Comment',1,0,0,100,1,30,1,'V~O',1,null,'BAS')");
+
+//Block25-30 -- End
+//Ticket Details -- END
+
+//Product Details -- START
+//Block31-36 -- Start
+
+$this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'productname','vtiger_products',1,'2','productname','Product Name',1,0,0,100,1,31,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'productcode','vtiger_products',1,'1','productcode','Product Code',1,0,0,100,2,31,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'discontinued','vtiger_products',1,'56','discontinued','Product Active',1,0,0,100,3,31,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'manufacturer','vtiger_products',1,'15','manufacturer','Manufacturer',1,0,0,100,4,1,31,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'productcategory','vtiger_products',1,'15','productcategory','Product Category',1,0,0,100,4,31,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'sales_start_date','vtiger_products',1,'5','sales_start_date','Sales Start Date',1,0,0,100,5,31,1,'D~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'sales_end_date','vtiger_products',1,'5','sales_end_date','Sales End Date',1,0,0,100,6,31,1,'D~O~OTH~GE~sales_start_date~Sales Start Date',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'start_date','vtiger_products',1,'5','start_date','Support Start Date',1,0,0,100,7,31,1,'D~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'expiry_date','vtiger_products',1,'5','expiry_date','Support Expiry Date',1,0,0,100,8,31,1,'D~O~OTH~GE~start_date~Start Date',1,null,'BAS')");
+ 
+
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'crmid','vtiger_seproductsrel',1,'66','parent_id','Related To',1,0,0,100,10,31,1,'I~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'contactid','vtiger_products',1,'57','contact_id','Contact Name',1,0,0,100,11,31,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'website','vtiger_products',1,'17','website','Website',1,0,0,100,12,31,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'vendor_id','vtiger_products',1,'75','vendor_id','Vendor Name',1,0,0,100,13,31,1,'I~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'mfr_part_no','vtiger_products',1,'1','mfr_part_no','Mfr PartNo',1,0,0,100,14,31,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'vendor_part_no','vtiger_products',1,'1','vendor_part_no','Vendor PartNo',1,0,0,100,15,31,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'serialno','vtiger_products',1,'1','serial_no','Serial No',1,0,0,100,16,31,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'productsheet','vtiger_products',1,'1','productsheet','Product Sheet',1,0,0,100,17,31,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'glacct','vtiger_products',1,'15','glacct','GL Account',1,0,0,100,18,31,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,19,31,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,20,31,2,'T~O',1,null,'BAS')");
+
+
+//Block32 Pricing Information
+
+$this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'unit_price','vtiger_products',1,'71','unit_price','Unit Price',1,0,0,100,1,32,1,'N~O',1,null,'BAS')"); 
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'commissionrate','vtiger_products',1,'9','commissionrate','Commission Rate',1,0,0,100,2,32,1,'N~O',1,null,'BAS')"); 
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'taxclass','vtiger_producttaxrel',1,'83','taxclass','Tax Class',1,0,0,100,4,32,1,'V~O',1,null,'BAS')");
+
+
+//Block 33 stock info
+
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'usageunit','vtiger_products',1,'15','usageunit','Usage Unit',1,0,0,100,1,33,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'qty_per_unit','vtiger_products',1,'1','qty_per_unit','Qty/Unit',1,0,0,100,2,33,1,'N~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'qtyinstock','vtiger_products',1,'1','qtyinstock','Qty In Stock',1,0,0,100,3,33,1,'I~O',1,null,'ADV')");
+$this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'reorderlevel','vtiger_products',1,'1','reorderlevel','Reorder Level',1,0,0,100,4,33,1,'I~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'handler','vtiger_products',1,'52','assigned_user_id','Handler',1,0,0,100,5,33,1,'I~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'qtyindemand','vtiger_products',1,'1','qtyindemand','Qty In Demand',1,0,0,100,6,33,1,'I~O',1,null,'ADV')");
+
+
+//ProductImageInformation
+
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'imagename','vtiger_products',1,'69','imagename','Product Image',1,0,0,100,1,35,1,'V~O',1,null,'ADV')");
+
+
+//Block 36 Description Info
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'product_description','vtiger_products',1,'19','product_description','Description',1,0,0,100,1,36,1,'V~O',1,null,'BAS')");
+
+//Product Details -- END
+
+//Note Details -- START
+//Block17 -- Start
+
+$this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("field").",'contact_id','vtiger_notes',1,'57','contact_id','Contact Name',1,0,0,100,1,17,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("field").",'crmid','vtiger_senotesrel',1,'62','parent_id','Related To',1,0,0,100,2,17,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("field").",'title','vtiger_notes',1,'2','title','Subject',1,0,0,100,3,17,1,'V~M',0,1,'BAS')");
+$this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,4,17,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,5,17,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("field").",'filename','vtiger_notes',1,'61','filename','Attachment',1,0,0,100,4,17,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("field").",'notecontent','vtiger_notes',1,'19','notecontent','Note',1,0,0,100,5,18,1,'V~O',1,null,'BAS')");
+
+//Block17 -- End
+//Note Details -- END
+
+//Email Details -- START
+//Block21 -- Start
+
+	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'date_start','vtiger_activity',1,'6','date_start','Date & Time Sent',1,0,0,100,1,21,1,'DT~M~time_start~Time Start',1,null,'BAS')");
+	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'semodule','vtiger_activity',1,'2','parent_type','Sales Enity Module',1,0,0,100,2,21,3,'',1,null,'BAS')");
+	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'activitytype','vtiger_activity',1,'2','activitytype','Activtiy Type',1,0,0,100,3,21,3,'V~O',1,null,'BAS')");
+	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'crmid','vtiger_seactivityrel',1,'357','parent_id','Related To',1,0,0,100,1,22,1,'I~O',1,null,'BAS')");
+	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,5,21,1,'V~M',1,null,'BAS')");
+	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'subject','vtiger_activity',1,'2','subject','Subject',1,0,0,100,1,23,1,'V~M',1,null,'BAS')");
+	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'filename','vtiger_attachments',1,'61','filename','Attachment',1,0,0,100,2,23,1,'V~O',1,null,'BAS')");
+	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,24,1,'V~O',1,null,'BAS')");
+	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'time_start','vtiger_activity',1,'2','time_start','Time Start',1,0,0,100,9,1,23,'T~O',1,null,'BAS')");
+	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,10,1,22,'T~O',1,null,'BAS')");
+ 	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,11,21,2,'T~O',1,null,'BAS')");
+
+//Block21 -- End
+//Email Details -- END
+
+//Task Details --START
+//Block19 -- Start
+$this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'subject','vtiger_activity',1,'2','subject','Subject',1,0,0,100,1,19,1,'V~M',0,1,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,2,19,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'date_start','vtiger_activity',1,'6','date_start','Start Date & Time',1,0,0,100,3,19,1,'DT~M~time_start',0,2,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'time_start','vtiger_activity',1,'2','time_start','Time Start',1,0,0,100,4,19,3,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'due_date','vtiger_activity',1,'23','due_date','Due Date',1,0,0,100,5,19,1,'D~M~OTH~GE~date_start~Start Date & Time',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'crmid','vtiger_seactivityrel',1,'66','parent_id','Related To',1,0,0,100,7,19,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'contactid','vtiger_cntactivityrel',1,'57','contact_id','Contact Name',1,0,0,100,8,19,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'status','vtiger_activity',1,'15','taskstatus','Status',1,0,0,100,9,19,1,'V~O',0,3,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'eventstatus','vtiger_activity',1,'15','eventstatus','Status',1,0,0,100,9,19,3,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'priority','vtiger_activity',1,'15','taskpriority','Priority',1,0,0,100,10,19,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'sendnotification','vtiger_activity',1,'56','sendnotification','Send Notification',1,0,0,100,11,19,1,'C~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,14,19,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,15,19,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'activitytype','vtiger_activity',1,'15','activitytype','Activity Type',1,0,0,100,16,19,3,'V~O',1,null,'BAS')");
+ $this->db->query("Insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'visibility','activity',1,15,'visibility','Visibility',1,0,0,100,17,19,3,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,20,1,'V~O',1,null,'BAS')");
+
+
+$this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'duration_hours','vtiger_activity',1,'63','duration_hours','Duration',1,0,0,100,17,19,3,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'duration_minutes','vtiger_activity',1,'15','duration_minutes','Duration Minutes',1,0,0,100,18,19,3,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'location','vtiger_activity',1,'1','location','Location',1,0,0,100,19,19,3,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'reminder_time','vtiger_activity_reminder',1,'30','reminder_time','Send Reminder',1,0,0,100,1,19,3,'I~O',1,null,'BAS')");
+ 
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'recurringtype','vtiger_recurringevents',1,'15','recurringtype','Recurrence',1,0,0,100,6,19,3,'O~O',1,null,'BAS')");
+
+ $this->db->query("Insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'notime','activity',1,56,'notime','No Time',1,0,0,100,20,19,3,'C~O',1,null,'BAS')");
+//Block19 -- End
+//Task Details -- END
+
+//Event Details --START
+//Block41-43-- Start
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'subject','vtiger_activity',1,'2','subject','Subject',1,0,0,100,1,41,1,'V~M',0,1,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,2,41,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'date_start','vtiger_activity',1,'6','date_start','Start Date & Time',1,0,0,100,3,41,1,'DT~M~time_start',0,2,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'time_start','vtiger_activity',1,'2','time_start','Time Start',1,0,0,100,4,41,3,'T~M',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'due_date','vtiger_activity',1,'23','due_date','End Date',1,0,0,100,5,41,1,'D~M~OTH~GE~date_start~Start Date & Time',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'recurringtype','vtiger_recurringevents',1,'15','recurringtype','Recurrence',1,0,0,100,6,41,1,'O~O',1,null,'BAS')");
+  
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'duration_hours','vtiger_activity',1,'63','duration_hours','Duration',1,0,0,100,7,41,1,'I~M',0,5,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'duration_minutes','vtiger_activity',1,'15','duration_minutes','Duration Minutes',1,0,0,100,8,41,3,'O~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'crmid','vtiger_seactivityrel',1,'66','parent_id','Related To',1,0,0,100,9,41,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'contactid','vtiger_cntactivityrel',1,'57','contact_id','Contact Name',1,0,0,100,10,41,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'eventstatus','vtiger_activity',1,'15','eventstatus','Status',1,0,0,100,11,41,1,'V~O',0,3,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'sendnotification','vtiger_activity',1,'56','sendnotification','Send Notification',1,0,0,100,12,41,1,'C~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'activitytype','vtiger_activity',1,'15','activitytype','Activity Type',1,0,0,100,13,41,1,'V~O',0,4,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'location','vtiger_activity',1,'1','location','Location',1,0,0,100,14,41,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,15,41,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,16,41,2,'T~O',1,null,'BAS')");
+ $this->db->query("Insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'priority','activity',1,15,'taskpriority','Priority',1,0,0,100,17,41,1,'V~O',1,null,'BAS')");
+ $this->db->query("Insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'notime','activity',1,56,'notime','No Time',1,0,0,100,18,41,1,'C~O',1,null,'BAS')");
+ $this->db->query("Insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'visibility','activity',1,15,'visibility','Visibility',1,0,0,100,19,41,1,'V~O',1,null,'BAS')");
+ 
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,43,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'reminder_time','vtiger_activity_reminder',1,'30','reminder_time','Send Reminder',1,0,0,100,1,42,1,'I~O',1,null,'BAS')");
+//Block41-43 -- End
+//Event Details -- END
+
+//Faq Details -- START
+//Block37-40 -- Start
+
+$this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("field").",'product_id','vtiger_faq',1,'59','product_id','Product Name',1,0,0,100,1,37,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("field").",'category','vtiger_faq',1,'15','faqcategories','Category',1,0,0,100,2,37,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("field").",'status','vtiger_faq',1,'15','faqstatus','Status',1,0,0,100,3,37,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("field").",'question','vtiger_faq',1,'20','question','Question',1,0,0,100,1,38,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("field").",'answer','vtiger_faq',1,'20','faq_answer','Answer',1,0,0,100,1,39,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("field").",'comments','vtiger_faqcomments',1,'19','comments','Add Comment',1,0,0,100,1,40,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,3,37,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,4,37,2,'T~O',1,null,'BAS')");
+
+
+//Block37-40 -- End
+//Ticket Details -- END
+
+//Vendor Details --START
+//Block44-47
+
+$this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'vendorname','vtiger_vendor',1,'2','vendorname','Vendor Name',1,0,0,100,1,44,1,'V~M',0,1,'BAS')");
+ $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'phone','vtiger_vendor',1,'1','phone','Phone',1,0,0,100,3,44,1,'V~O',0,2,'BAS')");
+ $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'email','vtiger_vendor',1,'13','email','Email',1,0,0,100,4,44,1,'E~O',0,3,'BAS')");
+ $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'website','vtiger_vendor',1,'17','website','Website',1,0,0,100,5,44,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'glacct','vtiger_vendor',1,'15','glacct','GL Account',1,0,0,100,6,44,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'category','vtiger_vendor',1,'1','category','Category',1,0,0,100,7,44,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,8,44,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,9,44,2,'T~O',1,null,'BAS')");
+
+//Block 46
+
+$this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'street','vtiger_vendor',1,'21','street','Street',1,0,0,100,1,46,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'pobox','vtiger_vendor',1,'1','pobox','Po Box',1,0,0,100,2,46,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'city','vtiger_vendor',1,'1','city','City',1,0,0,100,3,46,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'state','vtiger_vendor',1,'1','state','State',1,0,0,100,4,46,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'postalcode','vtiger_vendor',1,'1','postalcode','Postal Code',1,0,0,100,5,46,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'country','vtiger_vendor',1,'1','country','Country',1,0,0,100,6,46,1,'V~O',1,null,'ADV')");
+
+//Block 47
+
+$this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,47,1,'V~O',1,null,'ADV')");
+
+//Vendor Details -- END
+
+//PriceBook Details Start
+//Block48
+
+$this->db->query("insert into vtiger_field values (19,".$this->db->getUniqueID("field").",'bookname','vtiger_pricebook',1,'2','bookname','Price Book Name',1,0,0,100,1,48,1,'V~M',0,1,'BAS')");
+ $this->db->query("insert into vtiger_field values (19,".$this->db->getUniqueID("field").",'active','vtiger_pricebook',1,'56','active','Active',1,0,0,100,3,48,1,'V~O',0,2,'BAS')");
+$this->db->query("insert into vtiger_field values (19,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,4,48,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (19,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,5,48,2,'T~O',1,null,'BAS')");
+
+//Block50
+
+$this->db->query("insert into vtiger_field values (19,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,50,1,'V~O',1,null,'BAS')");
+
+//PriceBook Details End
+
+
+//Quote Details -- START
+ //Block51
+
+$this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'subject','vtiger_quotes',1,'2','subject','Subject',1,0,0,100,1,51,1,'V~M',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'potentialid','vtiger_quotes',1,'76','potential_id','Potential Name',1,0,0,100,2,51,1,'I~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'quotestage','vtiger_quotes',1,'15','quotestage','Quote Stage',1,0,0,100,3,51,1,'V~O',1,null,'BAS')");	
+
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'validtill','vtiger_quotes',1,'5','validtill','Valid Till',1,0,0,100,4,51,1,'D~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'team','vtiger_quotes',1,'1','team','Team',1,0,0,100,5,51,1,'V~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'contactid','vtiger_quotes',1,'57','contact_id','Contact Name',1,0,0,100,6,51,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'carrier','vtiger_quotes',1,'15','carrier','Carrier',1,0,0,100,8,51,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'subtotal','vtiger_quotes',1,'1','hdnSubTotal','Sub Total',1,0,0,100,9,51,3,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'shipping','vtiger_quotes',1,'1','shipping','Shipping',1,0,0,100,10,51,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'inventorymanager','vtiger_quotes',1,'77','assigned_user_id1','Inventory Manager',1,0,0,100,11,51,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'tax','vtiger_quotes',1,'1','txtTax','Tax',1,0,0,100,13,51,3,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'adjustment','vtiger_quotes',1,'1','txtAdjustment','Adjustment',1,0,0,100,20,51,3,'NN~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'total','vtiger_quotes',1,'1','hdnGrandTotal','Total',1,0,0,100,14,51,3,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'accountid','vtiger_quotes',1,'73','account_id','Account Name',1,0,0,100,16,51,1,'I~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,17,51,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,18,51,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,19,51,2,'T~O',1,null,'BAS')");
+
+
+ //Block 53
+
+$this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'bill_street','vtiger_quotesbillads',1,'24','bill_street','Billing Address',1,0,0,100,1,53,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'ship_street','vtiger_quotesshipads',1,'24','ship_street','Shipping Address',1,0,0,100,2,53,1,'V~M',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'bill_city','vtiger_quotesbillads',1,'1','bill_city','Billing City',1,0,0,100,5,53,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'ship_city','vtiger_quotesshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,53,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'bill_state','vtiger_quotesbillads',1,'1','bill_state','Billing State',1,0,0,100,7,53,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'ship_state','vtiger_quotesshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,53,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'bill_code','vtiger_quotesbillads',1,'1','bill_code','Billing Code',1,0,0,100,9,53,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'ship_code','vtiger_quotesshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,53,1,'V~O',1,null,'BAS')");
+
+
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'bill_country','vtiger_quotesbillads',1,'1','bill_country','Billing Country',1,0,0,100,11,53,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'ship_country','vtiger_quotesshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,53,1,'V~O',1,null,'BAS')");
+
+$this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'bill_pobox','vtiger_quotesbillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,53,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'ship_pobox','vtiger_quotesshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,53,1,'V~O',1,null,'BAS')");
+ //Block55
+
+$this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,56,1,'V~O',1,null,'ADV')");
+
+//Block 56
+$this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'terms_conditions','vtiger_quotes',1,'19','terms_conditions','Terms & Conditions',1,0,0,100,1,55,1,'V~O',1,null,'ADV')");
+
+
+//Quote Details -- END
+
+//Purchase Order Details -- START
+ //Block57
+ 
+$this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'subject','vtiger_purchaseorder',1,'2','subject','Subject',1,0,0,100,1,57,1,'V~M',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'vendorid','vtiger_purchaseorder',1,'81','vendor_id','Vendor Name',1,0,0,100,3,57,1,'I~M',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'requisition_no','vtiger_purchaseorder',1,'1','requisition_no','Requisition No',1,0,0,100,4,57,1,'V~O',1,null,'BAS')");	
+
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'tracking_no','vtiger_purchaseorder',1,'1','tracking_no','Tracking Number',1,0,0,100,5,57,1,'V~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'contactid','vtiger_purchaseorder',1,'57','contact_id','Contact Name',1,0,0,100,6,57,1,'I~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'duedate','vtiger_purchaseorder',1,'5','duedate','Due Date',1,0,0,100,7,57,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'carrier','vtiger_purchaseorder',1,'15','carrier','Carrier',1,0,0,100,8,57,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'salestax','vtiger_purchaseorder',1,'1','txtTax','Sales Tax',1,0,0,100,10,57,3,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'adjustment','vtiger_purchaseorder',1,'1','txtAdjustment','Adjustment',1,0,0,100,10,57,3,'NN~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'salescommission','vtiger_purchaseorder',1,'1','salescommission','Sales Commission',1,0,0,100,11,57,1,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'exciseduty','vtiger_purchaseorder',1,'1','exciseduty','Excise Duty',1,0,0,100,12,57,1,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'total','vtiger_purchaseorder',1,'1','hdnGrandTotal','Total',1,0,0,100,13,57,3,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'subtotal','vtiger_purchaseorder',1,'1','hdnSubTotal','Sub Total',1,0,0,100,14,57,3,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'postatus','vtiger_purchaseorder',1,'15','postatus','Status',1,0,0,100,15,57,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,16,57,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,17,57,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,18,57,2,'T~O',1,null,'BAS')");
+
+
+
+ //Block 59
+
+$this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'bill_street','vtiger_pobillads',1,'24','bill_street','Billing Address',1,0,0,100,1,59,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'ship_street','vtiger_poshipads',1,'24','ship_street','Shipping Address',1,0,0,100,2,59,1,'V~M',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'bill_city','vtiger_pobillads',1,'1','bill_city','Billing City',1,0,0,100,5,59,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'ship_city','vtiger_poshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,59,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'bill_state','vtiger_pobillads',1,'1','bill_state','Billing State',1,0,0,100,7,59,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'ship_state','vtiger_poshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,59,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'bill_code','vtiger_pobillads',1,'1','bill_code','Billing Code',1,0,0,100,9,59,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'ship_code','vtiger_poshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,59,1,'V~O',1,null,'BAS')");
+
+
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'bill_country','vtiger_pobillads',1,'1','bill_country','Billing Country',1,0,0,100,11,59,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'ship_country','vtiger_poshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,59,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'bill_pobox','vtiger_pobillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,59,1,'V~O',1,null,'BAS')");
+  $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'ship_pobox','vtiger_poshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,59,1,'V~O',1,null,'BAS')");
+  
+ //Block61
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,62,1,'V~O',1,null,'ADV')");
+
+ //Block62
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'terms_conditions','vtiger_purchaseorder',1,'19','terms_conditions','Terms & Conditions',1,0,0,100,1,61,1,'V~O',1,null,'ADV')");
+
+//Purchase Order Details -- END
+
+//Sales Order Details -- START
+ //Block63
+ 
+$this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'subject','vtiger_salesorder',1,'2','subject','Subject',1,0,0,100,1,63,1,'V~M',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'potentialid','vtiger_salesorder',1,'76','potential_id','Potential Name',1,0,0,100,2,63,1,'I~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'customerno','vtiger_salesorder',1,'1','customerno','Customer No',1,0,0,100,3,63,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'quoteid','vtiger_salesorder',1,'78','quote_id','Quote Name',1,0,0,100,4,63,1,'I~O',1,null,'BAS')");	
+$this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'purchaseorder','vtiger_salesorder',1,'1','vtiger_purchaseorder','Purchase Order',1,0,0,100,4,63,1,'V~O',1,null,'BAS')");	
+
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'contactid','vtiger_salesorder',1,'57','contact_id','Contact Name',1,0,0,100,6,63,1,'I~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'duedate','vtiger_salesorder',1,'5','duedate','Due Date',1,0,0,100,8,63,1,'D~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'carrier','vtiger_salesorder',1,'15','carrier','Carrier',1,0,0,100,9,63,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'pending','vtiger_salesorder',1,'1','pending','Pending',1,0,0,100,10,63,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'sostatus','vtiger_salesorder',1,'15','sostatus','Status',1,0,0,100,11,63,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'salestax','vtiger_salesorder',1,'1','txtTax','Sales Tax',1,0,0,100,12,63,3,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'adjustment','vtiger_salesorder',1,'1','txtAdjustment','Sales Tax',1,0,0,100,12,63,3,'NN~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'salescommission','vtiger_salesorder',1,'1','salescommission','Sales Commission',1,0,0,100,13,63,1,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'exciseduty','vtiger_salesorder',1,'1','exciseduty','Excise Duty',1,0,0,100,13,63,1,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'total','vtiger_salesorder',1,'1','hdnGrandTotal','Total',1,0,0,100,14,63,3,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'subtotal','vtiger_salesorder',1,'1','hdnSubTotal','Total',1,0,0,100,15,63,3,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'accountid','vtiger_salesorder',1,'73','account_id','Account Name',1,0,0,100,16,63,1,'I~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,17,63,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,18,63,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,19,63,2,'T~O',1,null,'BAS')");
+
+
+
+ //Block 65
+
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'bill_street','vtiger_sobillads',1,'24','bill_street','Billing Address',1,0,0,100,1,65,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'ship_street','vtiger_soshipads',1,'24','ship_street','Shipping Address',1,0,0,100,2,65,1,'V~M',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'bill_city','vtiger_sobillads',1,'1','bill_city','Billing City',1,0,0,100,5,65,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'ship_city','vtiger_soshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,65,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'bill_state','vtiger_sobillads',1,'1','bill_state','Billing State',1,0,0,100,7,65,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'ship_state','vtiger_soshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,65,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'bill_code','vtiger_sobillads',1,'1','bill_code','Billing Code',1,0,0,100,9,65,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'ship_code','vtiger_soshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,65,1,'V~O',1,null,'BAS')");
+
+
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'bill_country','vtiger_sobillads',1,'1','bill_country','Billing Country',1,0,0,100,11,65,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'ship_country','vtiger_soshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,65,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'bill_pobox','vtiger_sobillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,65,1,'V~O',1,null,'BAS')");
+  $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'ship_pobox','vtiger_soshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,65,1,'V~O',1,null,'BAS')");
+  
+//Block67
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,68,1,'V~O',1,null,'ADV')");
+
+ //Block68
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'terms_conditions','vtiger_salesorder',1,'19','terms_conditions','Terms & Conditions',1,0,0,100,1,67,1,'V~O',1,null,'ADV')");
+
+
+//Sales Order Details -- END
+
+//Invoice Details -- START
+ //Block69
+
+$this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'subject','vtiger_invoice',1,'2','subject','Subject',1,0,0,100,1,69,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'salesorderid','vtiger_invoice',1,'80','salesorder_id','Sales Order',1,0,0,100,2,69,1,'I~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'customerno','vtiger_invoice',1,'1','customerno','Customer No',1,0,0,100,3,69,1,'V~O',1,null,'BAS')");	
+
+ 
+//to include contact name vtiger_field in Invoice-start
+$this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'contactid','vtiger_invoice',1,'57','contact_id','Contact Name',1,0,0,100,4,69,1,'I~O',1,null,'BAS')");
+//end
+
+$this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'invoicedate','vtiger_invoice',1,'5','invoicedate','Invoice Date',1,0,0,100,5,69,1,'D~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'duedate','vtiger_invoice',1,'5','duedate','Due Date',1,0,0,100,6,69,1,'D~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'purchaseorder','vtiger_invoice',1,'1','vtiger_purchaseorder','Purchase Order',1,0,0,100,8,69,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'salestax','vtiger_invoice',1,'1','txtTax','Sales Tax',1,0,0,100,9,69,3,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'adjustment','vtiger_invoice',1,'1','txtAdjustment','Sales Tax',1,0,0,100,9,69,3,'NN~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'salescommission','vtiger_invoice',1,'1','salescommission','Sales Commission',1,0,0,10,13,69,1,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'exciseduty','vtiger_invoice',1,'1','exciseduty','Excise Duty',1,0,0,100,11,69,1,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'subtotal','vtiger_invoice',1,'1','hdnSubTotal','Sub Total',1,0,0,100,12,69,3,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'total','vtiger_invoice',1,'1','hdnGrandTotal','Total',1,0,0,100,13,69,3,'N~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'accountid','vtiger_invoice',1,'73','account_id','Account Name',1,0,0,100,14,69,1,'I~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'invoicestatus','vtiger_invoice',1,'15','invoicestatus','Status',1,0,0,100,15,69,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,16,69,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,17,69,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,18,69,2,'T~O',1,null,'BAS')"); 
+
+ //Block 71
+
+$this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'bill_street','vtiger_invoicebillads',1,'24','bill_street','Billing Address',1,0,0,100,1,71,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'ship_street','vtiger_invoiceshipads',1,'24','ship_street','Shipping Address',1,0,0,100,2,71,1,'V~M',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'bill_city','vtiger_invoicebillads',1,'1','bill_city','Billing City',1,0,0,100,5,71,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'ship_city','vtiger_invoiceshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,71,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'bill_state','vtiger_invoicebillads',1,'1','bill_state','Billing State',1,0,0,100,7,71,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'ship_state','vtiger_invoiceshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,71,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'bill_code','vtiger_invoicebillads',1,'1','bill_code','Billing Code',1,0,0,100,9,71,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'ship_code','vtiger_invoiceshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,71,1,'V~O',1,null,'BAS')");
+
+
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'bill_country','vtiger_invoicebillads',1,'1','bill_country','Billing Country',1,0,0,100,11,71,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'ship_country','vtiger_invoiceshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,71,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'bill_pobox','vtiger_invoicebillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,71,1,'V~O',1,null,'BAS')");
+  $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'ship_pobox','vtiger_invoiceshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,71,1,'V~O',1,null,'BAS')");
+
+//Block73
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,74,1,'V~O',1,null,'ADV')");
+ //Block74
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'terms_conditions','vtiger_invoice',1,'19','terms_conditions','Terms & Conditions',1,0,0,100,1,73,1,'V~O',1,null,'ADV')");
+
+
+//Invoice Details -- END
+
+
+
+                // Insert End
+                
+
+		//New Security Start
+		//Inserting into vtiger_profile vtiger_table
+		$this->db->query("insert into vtiger_profile values ('".$profile1_id."','Administrator',null)");	
+		$this->db->query("insert into vtiger_profile values ('".$profile2_id."','Sales Profile',null)");
+		$this->db->query("insert into vtiger_profile values ('".$profile3_id."','Support Profile',null)");
+		$this->db->query("insert into vtiger_profile values ('".$profile4_id."','Guest Profile',null)");
+		
+		//Inserting into vtiger_profile2gloabal permissions
+		$this->db->query("insert into vtiger_profile2globalpermissions values ('".$profile1_id."',1,0)");
+		$this->db->query("insert into vtiger_profile2globalpermissions values ('".$profile1_id."',2,0)");
+		$this->db->query("insert into vtiger_profile2globalpermissions values ('".$profile2_id."',1,1)");
+		$this->db->query("insert into vtiger_profile2globalpermissions values ('".$profile2_id."',2,1)");
+		$this->db->query("insert into vtiger_profile2globalpermissions values ('".$profile3_id."',1,1)");
+		$this->db->query("insert into vtiger_profile2globalpermissions values ('".$profile3_id."',2,1)");
+		$this->db->query("insert into vtiger_profile2globalpermissions values ('".$profile4_id."',1,1)");
+		$this->db->query("insert into vtiger_profile2globalpermissions values ('".$profile4_id."',2,1)");
+
+		//Inserting into vtiger_profile2tab
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",1,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",2,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",3,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",4,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",6,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",7,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",8,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",9,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",10,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",13,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",14,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",15,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",16,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",17,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",18,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",19,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",20,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",21,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",22,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",23,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",24,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",25,0)");
+       		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",26,0)");
+       		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",27,0)");
+
+		//Inserting into vtiger_profile2tab
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",1,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",2,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",3,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",4,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",6,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",7,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",8,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",9,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",10,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",13,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",14,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",15,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",16,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",17,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",18,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",19,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",20,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",21,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",22,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",23,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",24,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",25,0)");
+        	$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",26,0)");
+       		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",27,0)");
+
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",1,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",2,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",3,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",4,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",6,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",7,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",8,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",9,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",10,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",13,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",14,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",15,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",16,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",17,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",18,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",19,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",20,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",21,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",22,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",23,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",24,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",25,0)");
+        	$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",26,0)");
+       		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",27,0)");
+        
+
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",1,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",2,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",3,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",4,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",6,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",7,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",8,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",9,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",10,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",13,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",14,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",15,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",16,0)");	
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",17,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",18,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",19,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",20,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",21,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",22,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",23,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",24,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",25,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",26,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",27,0)");
+		//Inserting into vtiger_profile2standardpermissions  Adminsitrator
+		
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",2,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",2,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",2,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",2,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",2,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",4,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",4,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",4,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",4,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",4,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",6,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",6,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",6,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",6,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",6,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",7,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",7,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",7,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",7,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",7,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",8,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",8,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",8,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",8,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",8,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",9,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",9,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",9,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",9,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",9,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",10,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",10,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",10,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",10,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",10,4,0)");
+
+		
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",13,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",13,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",13,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",13,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",13,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",14,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",14,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",14,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",14,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",14,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",15,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",15,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",15,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",15,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",15,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",16,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",16,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",16,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",16,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",16,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",18,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",18,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",18,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",18,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",18,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",19,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",19,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",19,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",19,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",19,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",20,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",20,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",20,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",20,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",20,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",21,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",21,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",21,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",21,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",21,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",22,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",22,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",22,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",22,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",22,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",23,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",23,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",23,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",23,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",23,4,0)");
+
+
+
+        	$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",26,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",26,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",26,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",26,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",26,4,0)");
+
+
+		//Insert into Profile 2 std permissions for Sales User  
+		//Help Desk Create/Delete not allowed. Read-Only	
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",2,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",2,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",2,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",2,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",2,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",4,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",4,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",4,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",4,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",4,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",6,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",6,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",6,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",6,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",6,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",7,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",7,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",7,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",7,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",7,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",8,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",8,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",8,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",8,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",8,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",9,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",9,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",9,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",9,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",9,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",10,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",10,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",10,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",10,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",10,4,0)");
+
+		
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",13,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",13,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",13,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",13,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",13,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",14,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",14,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",14,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",14,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",14,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",15,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",15,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",15,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",15,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",15,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",16,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",16,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",16,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",16,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",16,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",18,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",18,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",18,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",18,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",18,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",19,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",19,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",19,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",19,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",19,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",20,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",20,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",20,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",20,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",20,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",21,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",21,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",21,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",21,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",21,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",22,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",22,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",22,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",22,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",22,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",23,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",23,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",23,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",23,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",23,4,0)");
+
+
+        	$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",26,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",26,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",26,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",26,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",26,4,0)");
+
+		//Inserting into vtiger_profile2std for Support Profile
+		// Potential is read-only
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",2,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",2,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",2,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",2,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",2,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",4,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",4,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",4,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",4,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",4,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",6,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",6,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",6,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",6,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",6,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",7,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",7,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",7,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",7,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",7,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",8,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",8,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",8,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",8,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",8,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",9,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",9,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",9,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",9,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",9,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",10,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",10,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",10,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",10,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",10,4,0)");
+
+		
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",13,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",13,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",13,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",13,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",13,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",14,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",14,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",14,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",14,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",14,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",15,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",15,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",15,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",15,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",15,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",16,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",16,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",16,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",16,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",16,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",18,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",18,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",18,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",18,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",18,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",19,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",19,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",19,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",19,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",19,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",20,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",20,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",20,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",20,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",20,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",21,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",21,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",21,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",21,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",21,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",22,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",22,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",22,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",22,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",22,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",23,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",23,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",23,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",23,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",23,4,0)");
+
+
+        	$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",26,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",26,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",26,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",26,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",26,4,0)");
+        
+		//Inserting into vtiger_profile2stdper for Profile Guest Profile
+		//All Read-Only
+		
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",2,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",2,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",2,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",2,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",2,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",4,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",4,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",4,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",4,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",4,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",6,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",6,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",6,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",6,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",6,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",7,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",7,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",7,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",7,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",7,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",8,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",8,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",8,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",8,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",8,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",9,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",9,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",9,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",9,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",9,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",10,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",10,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",10,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",10,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",10,4,0)");
+
+		
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",13,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",13,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",13,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",13,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",13,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",14,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",14,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",14,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",14,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",14,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",15,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",15,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",15,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",15,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",15,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",16,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",16,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",16,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",16,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",16,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",18,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",18,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",18,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",18,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",18,4,0)");	
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",19,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",19,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",19,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",19,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",19,4,0)");	
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",20,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",20,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",20,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",20,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",20,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",21,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",21,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",21,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",21,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",21,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",22,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",22,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",22,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",22,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",22,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",23,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",23,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",23,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",23,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",23,4,0)");	
+
+
+        $this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",26,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",26,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",26,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",26,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",26,4,0)");
+
+		//Insert into vtiger_role2profile
+		$this->db->query("insert into vtiger_role2profile values ('H".$role2_id."',".$profile1_id.")");
+		$this->db->query("insert into vtiger_role2profile values ('H".$role3_id."',".$profile2_id.")");
+	
+		//Insert into vtiger_profile2field
+			
+                insertProfile2field($profile1_id);
+                insertProfile2field($profile2_id);	
+                insertProfile2field($profile3_id);	
+                insertProfile2field($profile4_id);
+
+		insert_def_org_field();	
+		
+
+		//Inserting into vtiger_profile 2 utility Admin
+                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",2,5,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",2,6,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",4,5,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",4,6,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",6,5,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",6,6,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",7,5,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",7,6,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",8,6,0)");
+                //$this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",9,6,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",10,6,0)");
+		$this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",7,8,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",6,8,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",4,8,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",13,8,0)");
+		$this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",14,5,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",14,6,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",7,9,0)");
+
+		//Inserting into vtiger_profile2utility Sales Profile
+		//Import Export Not Allowed.	
+		$this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",2,5,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",2,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",4,5,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",4,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",6,5,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",6,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",7,5,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",7,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",8,6,1)");
+                //$this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",9,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",10,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",7,8,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",6,8,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",4,8,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",13,8,0)");
+		$this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",14,5,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",14,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",7,9,0)");
+
+		//Inserting into vtiger_profile2utility Support Profile
+		//Import Export Not Allowed.	
+		$this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",2,5,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",2,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",4,5,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",4,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",6,5,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",6,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",7,5,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",7,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",8,6,1)");
+                //$this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",9,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",10,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",7,8,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",6,8,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",4,8,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",13,8,0)");
+		$this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",14,5,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",14,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",7,9,0)");
+
+		//Inserting into vtiger_profile2utility Guest Profile Read-Only
+		//Import Export BusinessCar Not Allowed.	
+		$this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",2,5,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",2,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",4,5,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",4,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",6,5,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",6,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",7,5,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",7,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",8,6,1)");
+                //$this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",9,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",10,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",7,8,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",6,8,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",4,8,1)");		
+                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",13,8,1)");		
+		$this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",14,5,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",14,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",7,9,0)");
+
+		//Inserting values into org share action mapping
+                $this->db->query("insert into vtiger_org_share_action_mapping values(0,'Public: Read Only')");
+                $this->db->query("insert into vtiger_org_share_action_mapping values(1,'Public: Read, Create/Edit')");
+                $this->db->query("insert into vtiger_org_share_action_mapping values(2,'Public: Read, Create/Edit, Delete')");
+                $this->db->query("insert into vtiger_org_share_action_mapping values(3,'Private')");
+
+                $this->db->query("insert into vtiger_org_share_action_mapping values(4,'Hide Details')");
+                $this->db->query("insert into vtiger_org_share_action_mapping values(5,'Hide Details and Add Events')");
+                $this->db->query("insert into vtiger_org_share_action_mapping values(6,'Show Details')");
+                $this->db->query("insert into vtiger_org_share_action_mapping values(7,'Show Details and Add Events')");
+
+
+		//Inserting for all vtiger_tabs
+                $def_org_tabid= Array(2,4,6,7,9,10,13,16,20,21,22,23,26);
+
+                foreach($def_org_tabid as $def_tabid)
+                {
+                        $this->db->query("insert into vtiger_org_share_action2tab values(0,".$def_tabid.")");
+                        $this->db->query("insert into vtiger_org_share_action2tab values(1,".$def_tabid.")");
+                        $this->db->query("insert into vtiger_org_share_action2tab values(2,".$def_tabid.")");
+                        $this->db->query("insert into vtiger_org_share_action2tab values(3,".$def_tabid.")");
+                }
+
+                $this->db->query("insert into vtiger_org_share_action2tab values(4,17)");
+                $this->db->query("insert into vtiger_org_share_action2tab values(5,17)");
+                $this->db->query("insert into vtiger_org_share_action2tab values(6,17)");
+                $this->db->query("insert into vtiger_org_share_action2tab values(7,17)");
+
+		//Insert into default_org_sharingrule
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",2,2,0)");
+
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",4,2,2)");
+
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",6,2,0)");
+
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",7,2,0)");
+
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",9,3,1)");
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",10,2,0)");
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",13,2,0)");
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",16,3,2)");
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",17,7,0)");
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",20,2,0)");
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",21,2,0)");
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",22,2,0)");
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",23,2,0)");
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",26,2,0)");
+
+		//Populating the DataShare Related Modules
+
+		//Lead Related Module
+		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",7,10)");
+
+		//Account Related Module
+		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",6,2)");
+		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",6,13)");
+		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",6,20)");
+		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",6,22)");
+		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",6,23)");
+		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",6,10)");
+
+		//Potential Related Module
+		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",2,20)");
+		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",2,22)");
+
+		//Quote Related Module
+		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",20,22)");
+
+		//SO Related Module
+		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",22,23)");	
+
+
+			
+					
+  // New Secutity End
+
+
+         //insert into the vtiger_notificationscheduler vtiger_table
+
+	//insert into related list vtiger_table
+	//Inserting for vtiger_account related lists
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("Potentials").",'get_opportunities',1,'Potentials',0)");	
+		
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("Contacts").",'get_contacts',2,'Contacts',0)");
+
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("Activities").",'get_activities',3,'Activities',0)");
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("HelpDesk").",'get_tickets',4,'HelpDesk',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("Activities").",'get_history',5,'Activity History',0)");
+
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",0,'get_attachments',6,'Attachments',0)");
+
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("Quotes").",'get_quotes',7,'Quotes',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("Invoice").",'get_invoices',8,'Invoice',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("SalesOrder").",'get_salesorder',9,'Sales Order',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("Products").",'get_products',10,'Products',0)");
+
+	//Inserting Lead Related Lists	
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Leads").",".getTabid("Activities").",'get_activities',1,'Activities',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Leads").",".getTabid("Emails").",'get_emails',2,'Emails',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Leads").",".getTabid("Activities").",'get_history',3,'Activity History',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Leads").",0,'get_attachments',4,'Attachments',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Leads").",".getTabid("Products").",'get_products',5,'Products',0)");
+
+	//Inserting for contact related lists
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Potentials").",'get_opportunities',1,'Potentials',0)");	
+		
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Activities").",'get_activities',2,'Activities',0)");
+
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Emails").",'get_emails',3,'Emails',0)");
+
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("HelpDesk").",'get_tickets',4,'HelpDesk',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Quotes").",'get_quotes',5,'Quotes',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("PurchaseOrder").",'get_purchase_orders',6,'Purchase Order',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("SalesOrder").",'get_salesorder',7,'Sales Order',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Products").",'get_products',8,'Products',0)");
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Activities").",'get_history',9,'Activity History',0)");
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",0,'get_attachments',10,'Attachments',0)");
+
+	//Inserting Potential Related Lists	
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",".getTabid("Activities").",'get_activities',1,'Activities',0)");
+
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",".getTabid("Contacts").",'get_contacts',2,'Contacts',0)");
+
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",".getTabid("Products").",'get_products',3,'Products',0)");
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",0,'get_stage_history',4,'Sales Stage History',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",0,'get_attachments',5,'Attachments',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",".getTabid("Quotes").",'get_Quotes',6,'Quotes',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",".getTabid("SalesOrder").",'get_salesorder',7,'Sales Order',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",".getTabid("Activities").",'get_history',8,'Activity History',0)");
+
+		//Inserting Product Related Lists	
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",".getTabid("HelpDesk").",'get_tickets',1,'HelpDesk',0)");
+
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",".getTabid("Activities").",'get_activities',2,'Activities',0)");
+
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",0,'get_attachments',3,'Attachments',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",".getTabid("Quotes").",'get_quotes',4,'Quotes',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",".getTabid("PurchaseOrder").",'get_purchase_orders',5,'Purchase Order',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",".getTabid("SalesOrder").",'get_salesorder',6,'Sales Order',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",".getTabid("Invoice").",'get_invoices',7,'Invoice',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",".getTabid("PriceBooks").",'get_product_pricebooks',8,'PriceBooks',0)");
+	
+		//Inserting Emails Related Lists	
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Emails").",".getTabid("Contacts").",'get_contacts',1,'Contacts',0)");
+
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Emails").",0,'get_users',2,'Users',0)");
+
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Emails").",0,'get_attachments',3,'Attachments',0)");
+
+		//Inserting HelpDesk Related Lists
+		
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("HelpDesk").",".getTabid("Activities").",'get_activities',1,'Activities',0)");
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("HelpDesk").",0,'get_attachments',2,'Attachments',0)");
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("HelpDesk").",0,'get_ticket_history',3,'Ticket History',0)");
+
+	//Inserting PriceBook Related Lists
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("PriceBooks").",14,'get_pricebook_products',2,'Products',0)");
+
+        // Inserting Vendor Related Lists
+        $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Vendors").",14,'get_products',1,'Products',0)");
+
+        $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Vendors").",21,'get_purchase_orders',2,'Purchase Order',0)");
+
+        $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Vendors").",4,'get_contacts',3,'Contacts',0)");
+
+	// Inserting Quotes Related Lists
+	
+        $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Quotes").",".getTabid("Invoice").",'get_salesorder',1,'Sales Order',0)");
+        
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Quotes").",9,'get_activities',2,'Activities',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Quotes").",9,'get_history',3,'Activity History',0)");
+
+	// Inserting Purchase order Related Lists
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("PurchaseOrder").",9,'get_activities',1,'Activities',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("PurchaseOrder").",0,'get_attachments',2,'Attachments',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("PurchaseOrder").",".getTabid("Activities").",'get_history',3,'Activity History',0)");
+	
+	// Inserting Sales order Related Lists
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("SalesOrder").",9,'get_activities',1,'Activities',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("SalesOrder").",0,'get_attachments',2,'Attachments',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("SalesOrder").",".getTabid("Invoice").",'get_invoices',3,'Invoice',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("SalesOrder").",".getTabid("Activities").",'get_history',4,'Activity History',0)");
+	
+	// Inserting Invoice Related Lists
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Invoice").",9,'get_activities',1,'Activities',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Invoice").",0,'get_attachments',2,'Attachments',0)");
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Invoice").",".getTabid("Activities").",'get_history',3,'Activity History',0)");
+
+	// Inserting Activities Related Lists
+	
+	$this->db->query("insert into vtiger_relatedlists values (".$this->db->getUniqueID('relatedlists').",".getTabid("Activities").",0,'get_users',1,'Users',0)");
+	$this->db->query("insert into vtiger_relatedlists values (".$this->db->getUniqueID('relatedlists').",".getTabid("Activities").",4,'get_contacts',2,'Contacts',0)");
+
+	// Inserting Campaigns Related Lists
+
+         $this->db->query("insert into vtiger_relatedlists values (".$this->db->getUniqueID('relatedlists').",".getTabid("Campaigns").",".getTabid("Contacts").",'get_contacts',1,'Contacts',0)");
+         $this->db->query("insert into vtiger_relatedlists values (".$this->db->getUniqueID('relatedlists').",".getTabid("Campaigns").",".getTabid("Leads").",'get_leads',2,'Leads',0)");
+
+               $this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("notificationscheduler").",'LBL_TASK_NOTIFICATION_DESCRITPION',1,'Task Delay Notification','Tasks delayed beyond 24 hrs ','LBL_TASK_NOTIFICATION')");
+
+
+                $this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("notificationscheduler").",'LBL_BIG_DEAL_DESCRIPTION' ,1,'Big Deal notification','Success! A big deal has been won! ','LBL_BIG_DEAL')");
+
+
+                $this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("notificationscheduler").",'LBL_TICKETS_DESCRIPTION',1,'Pending Tickets notification','Ticket pending please ','LBL_PENDING_TICKETS')");
+
+
+                $this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("notificationscheduler").",'LBL_MANY_TICKETS_DESCRIPTION',1,'Too many tickets Notification','Too many tickets pending against this entity ','LBL_MANY_TICKETS')");
+
+
+                $this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("notificationscheduler").",'LBL_START_DESCRIPTION' ,1,'Support Start Notification','Support starts please ','LBL_START_NOTIFICATION')");
+
+                $this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("notificationscheduler").",'LBL_SUPPORT_DESCRIPTION',1,'Support ending please','Support Ending Notification','LBL_SUPPORT_NOTICIATION')");
+		
+ 		$this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("notificationscheduler").",'LBL_ACTIVITY_REMINDER_DESCRIPTION' ,1,'Activity Reminder Notication','This is a reminder notification for the Activity','LBL_ACTIVITY_NOTIFICATION')");
+
+		//Inserting Inventory Notifications
+	$invoice_body = 'Dear {HANDLER},
+
+The current stock of {PRODUCTNAME} in our warehouse is {CURRENTSTOCK}. Kindly procure required number of units as the stock level is below reorder level {REORDERLEVELVALUE}.
+
+Please treat this information as Urgent as the vtiger_invoice is already sent  to the customer.
+
+Severity: Critical
+
+Thanks,
+{CURRENTUSER}';
+
+		
+               $this->db->query("insert into vtiger_inventorynotification(notificationid,notificationname,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("inventorynotification").",'InvoiceNotification','{PRODUCTNAME} Stock Level is Low','".$invoice_body." ','InvoiceNotificationDescription')");
+
+		$quote_body = 'Dear {HANDLER},
+
+Quote is generated for {QUOTEQUANTITY} units of {PRODUCTNAME}. The current stock of {PRODUCTNAME} in our warehouse is {CURRENTSTOCK}. 
+
+Severity: Minor
+
+Thanks,
+{CURRENTUSER}';	
+		
+		
+               $this->db->query("insert into vtiger_inventorynotification(notificationid,notificationname,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("inventorynotification").",'QuoteNotification','Quote given for {PRODUCTNAME}','".$quote_body." ','QuoteNotificationDescription')");
+
+		$so_body = 'Dear {HANDLER},
+
+SalesOrder is generated for {SOQUANTITY} units of {PRODUCTNAME}. The current stock of {PRODUCTNAME} in our warehouse is {CURRENTSTOCK}. 
+
+Please treat this information  with vtiger_priority as the sales order is already generated.
+
+Severity: Major
+
+Thanks,
+{CURRENTUSER}';
+
+		
+               $this->db->query("insert into vtiger_inventorynotification(notificationid,notificationname,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("inventorynotification").",'SalesOrderNotification','Sales Order generated for {PRODUCTNAME}','".$so_body." ','SalesOrderNotificationDescription')");
+
+		//Insert into vtiger_currency vtiger_table
+		$this->db->query("insert into vtiger_currency_info values(".$this->db->getUniqueID("currency_info").",'U.S Dollar','USD','$',1,'Active','-11')");
+                
+
+
+
+//insert into email template vtiger_table
+
+	$body='
+	Hello!
+
+	On behalf of the vtiger team,  I am pleased to announce the release of vtiger crm4.2 . This is a feature packed release including the mass email template handling, custom view feature, vtiger_reports feature and a host of other utilities. vtiger runs on all platforms.
+
+	Notable Features of vtiger are :
+	-Email Client Integration
+	-Trouble Ticket Integration
+	-Invoice Management Integration
+	-Reports Integration
+	-Portal Integration
+	-Enhanced Word Plugin Support
+	-Custom View Integration
+
+	Known Issues:
+	-ABCD
+	-EFGH
+	-IJKL
+	-MNOP
+	-QRST';
+
+          $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Announcement for Release','Announcement for Release','Announcement of a release','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
+	
+
+
+$body='name
+street,
+city,
+state,
+ zip)
+ 
+ Dear
+ 
+ Please check the following vtiger_invoices that are yet to be paid by you:
+ 
+ No. Date      Amount
+ 1   1/1/01    $4000
+ 2   2/2//01   $5000
+ 3   3/3/01    $10000
+ 4   7/4/01    $23560
+ 
+ Kindly let us know if there are any issues that you feel are pending to be discussed.
+ We will be more than happy to give you a call.
+ We would like to continue our business with you.
+ 
+ Sincerely,
+ name
+ title';
+
+
+               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Pending Invoices','Invoices Pending','Payment Due','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
+
+
+
+
+
+$body=' Dear
+
+Your proposal on the project XYZW has been reviewed by us
+and is acceptable in its entirety.
+
+We are eagerly looking forward to this project
+and are pleased about having the opportunity to work
+together. We look forward to a long standing relationship
+with your esteemed firm.
+
+I would like to take this opportunity to invite you
+to a game of golf on Wednesday morning 9am at the
+Cuff Links Ground. We will be waiting for you in the
+Executive Lounge.
+
+Looking forward to seeing you there.
+
+Sincerely,
+name
+title';
+	       
+               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Acceptance Proposal','Acceptance Proposal','Acceptance of Proposal','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
+
+
+$body= ' The undersigned hereby acknowledges receipt and delivery
+of the goods.
+The undersigned will release the payment subject to the goods being discovered not satisfactory.
+
+Signed under seal this <date>
+
+Sincerely,
+name
+title';
+	       
+               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Goods received acknowledgement','Goods received acknowledgement','Acknowledged Receipt of Goods','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
+
+
+	       $body= ' Dear
+	 We are in receipt of your order as contained in the
+   purchase order form.We consider this to be final and binding on both sides.
+If there be any exceptions noted, we shall consider them
+only if the objection is received within ten days of receipt of
+this notice.
+
+Thank you for your patronage.
+Sincerely,
+name
+title';
+
+
+	       
+               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Accept Order','Accept Order','Acknowledgement/Acceptance of Order','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
+
+
+
+
+$body='Dear
+
+We are relocating our office to
+11111,XYZDEF Cross,
+UVWWX Circle
+The telephone number for this new location is (101) 1212-1328.
+
+Our Manufacturing Division will continue operations
+at 3250 Lovedale Square Avenue, in Frankfurt.
+
+We hope to keep in touch with you all.
+Please update your addressbooks.
+
+
+Thank You,
+name
+title';
+	       
+               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Address Change','Change of Address','Address Change','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
+
+
+
+$body='Dear
+
+Thank you for extending us the opportunity to meet with
+you and members of your staff.
+
+I know that John Doe serviced your vtiger_account
+for many years and made many friends at your firm. He has personally
+discussed with me the deep relationship that he had with your firm.
+While his presence will be missed, I can promise that we will
+continue to provide the fine service that was accorded by
+John to your firm.
+
+I was genuinely touched to receive such fine hospitality.
+
+Thank you once again.
+
+Sincerely,
+name
+title';
+
+
+	       
+               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Follow Up','Follow Up','Follow Up of meeting','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
+
+
+
+$body='Congratulations!
+
+The numbers are in and I am proud to inform you that our
+total sales for the previous quarter
+amounts to $100,000,00.00!. This is the first time
+we have exceeded the target by almost 30%.
+We have also beat the previous quarter record by a
+whopping 75%!
+
+Let us meet at Smoking Joe for a drink in the evening!
+
+C you all there guys!
+
+Sincerely,
+name
+title';
+
+	       
+               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Target Crossed!','Target Crossed!','Fantastic Sales Spree!','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
+
+$body='
+Dear
+
+Thank you for your confidence in our ability to serve you.
+We are glad to be given the chance to serve you.I look
+forward to establishing a long term partnership with you.
+Consider me as a friend.
+Should any need arise,please do give us a call.
+
+Sincerely,
+name
+title';
+
+	       
+               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Thanks Note','Thanks Note','Note of thanks','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
+
+		
+	       //Insert into vtiger_organizationdetails vtiger_table 
+	       $this->db->query("insert into vtiger_organizationdetails(organizationame,address,city,state,country,code,phone,fax,website,logoname) values ('vtiger',' 40-41-42, Sivasundar Apartments, Flat D-II, Shastri Street, Velachery','Chennai','Tamil Nadu','India','600 042','+91-44-5202-1990','+91-44-5202-1990','www.vtiger.com','vtiger-crm-logo.jpg')");
+
+  //Insert into vtiger_inventory_tandc vtiger_table
+               $this->db->query("insert into vtiger_inventory_tandc values('".$this->db->getUniqueID('inventory_tandc')."','Inventory','')");
+
+	$this->db->query("insert into vtiger_actionmapping values(0,'Save',0)");
+	$this->db->query("insert into vtiger_actionmapping values(1,'EditView',0)");
+	$this->db->query("insert into vtiger_actionmapping values(2,'Delete',0)");
+	$this->db->query("insert into vtiger_actionmapping values(3,'index',0)");
+	$this->db->query("insert into vtiger_actionmapping values(4,'DetailView',0)");
+	$this->db->query("insert into vtiger_actionmapping values(5,'Import',0)");
+	$this->db->query("insert into vtiger_actionmapping values(6,'Export',0)");
+	//$this->db->query("insert into vtiger_actionmapping values(7,'AddBusinessCard',0)");
+	$this->db->query("insert into vtiger_actionmapping values(8,'Merge',0)");
+	$this->db->query("insert into vtiger_actionmapping values(1,'VendorEditView',1)");
+	$this->db->query("insert into vtiger_actionmapping values(4,'VendorDetailView',1)");
+	$this->db->query("insert into vtiger_actionmapping values(0,'SaveVendor',1)");
+	$this->db->query("insert into vtiger_actionmapping values(2,'DeleteVendor',1)");
+	$this->db->query("insert into vtiger_actionmapping values(1,'PriceBookEditView',1)");
+	$this->db->query("insert into vtiger_actionmapping values(4,'PriceBookDetailView',1)");
+	$this->db->query("insert into vtiger_actionmapping values(0,'SavePriceBook',1)");
+	$this->db->query("insert into vtiger_actionmapping values(2,'DeletePriceBook',1)");
+	$this->db->query("insert into vtiger_actionmapping values(9,'ConvertLead',0)");
+	$this->db->query("insert into vtiger_actionmapping values(1,'DetailViewAjax',1)");
+	$this->db->query("insert into vtiger_actionmapping values(4,'TagCloud',1)");
+	$this->db->query("insert into vtiger_actionmapping values(1,'QuickCreate',1)");
+	$this->db->query("insert into vtiger_actionmapping values(3,'Popup',1)");
+
+	//Insert values for vtiger_moduleowners vtiger_table which contains the modules and their vtiger_users. default user id admin - after 4.2 patch 2
+	$module_array = Array('Potentials','Contacts','Accounts','Leads','Notes','Activities','Emails','HelpDesk','Products','Faq','Vendors','PriceBooks','Quotes','PurchaseOrder','SalesOrder','Invoice','Reports','Campaigns');
+	foreach($module_array as $mod)
+	{
+		$this->db->query("insert into vtiger_moduleowners values(".getTabid($mod).",1)");
+	}
+	//added by jeri for category view from db
+	$this->db->query("insert into vtiger_parenttab values (1,'My Home Page',1,0)");
+	$this->db->query("insert into vtiger_parenttab values (2,'Marketing',2,0)");
+	$this->db->query("insert into vtiger_parenttab values (3,'Sales',3,0)");
+	$this->db->query("insert into vtiger_parenttab values (4,'Support',4,0)");
+	$this->db->query("insert into vtiger_parenttab values (5,'Analytics',5,0)");
+	$this->db->query("insert into vtiger_parenttab values (6,'Inventory',6,0)");
+	$this->db->query("insert into vtiger_parenttab values (7,'Tools',7,0)");
+	$this->db->query("insert into vtiger_parenttab values (8,'Settings',8,0)");
+
+	$this->db->query("insert into vtiger_parenttabrel values (1,9,2)");
+	$this->db->query("insert into vtiger_parenttabrel values (1,17,3)");
+	$this->db->query("insert into vtiger_parenttabrel values (1,10,4)");
+	$this->db->query("insert into vtiger_parenttabrel values (1,3,1)");
+	$this->db->query("insert into vtiger_parenttabrel values (3,7,1)");
+	$this->db->query("insert into vtiger_parenttabrel values (3,6,2)");
+	$this->db->query("insert into vtiger_parenttabrel values (3,4,3)");
+	$this->db->query("insert into vtiger_parenttabrel values (3,2,4)");
+	$this->db->query("insert into vtiger_parenttabrel values (3,20,5)");
+	$this->db->query("insert into vtiger_parenttabrel values (3,22,6)");
+	$this->db->query("insert into vtiger_parenttabrel values (3,23,7)");
+	$this->db->query("insert into vtiger_parenttabrel values (3,14,8)");
+	$this->db->query("insert into vtiger_parenttabrel values (3,19,9)");
+	$this->db->query("insert into vtiger_parenttabrel values (3,8,10)");
+	$this->db->query("insert into vtiger_parenttabrel values (4,13,1)");
+	$this->db->query("insert into vtiger_parenttabrel values (4,15,2)");
+	$this->db->query("insert into vtiger_parenttabrel values (4,6,3)");
+	$this->db->query("insert into vtiger_parenttabrel values (4,4,4)");
+	$this->db->query("insert into vtiger_parenttabrel values (4,14,5)");
+	$this->db->query("insert into vtiger_parenttabrel values (4,8,6)");
+	$this->db->query("insert into vtiger_parenttabrel values (5,1,1)");
+	$this->db->query("insert into vtiger_parenttabrel values (5,25,2)");
+	$this->db->query("insert into vtiger_parenttabrel values (6,14,1)");
+	$this->db->query("insert into vtiger_parenttabrel values (6,18,2)");
+	$this->db->query("insert into vtiger_parenttabrel values (6,19,3)");
+	$this->db->query("insert into vtiger_parenttabrel values (6,21,4)");
+	$this->db->query("insert into vtiger_parenttabrel values (6,22,5)");
+	$this->db->query("insert into vtiger_parenttabrel values (6,20,6)");
+	$this->db->query("insert into vtiger_parenttabrel values (6,23,7)");
+	$this->db->query("insert into vtiger_parenttabrel values (7,24,1)");
+	$this->db->query("insert into vtiger_parenttabrel values (7,27,2)");
+	$this->db->query("insert into vtiger_parenttabrel values (7,8,3)");
+	$this->db->query("insert into vtiger_parenttabrel values (2,26,1)");
+	$this->db->query("insert into vtiger_parenttabrel values (2,6,2)");
+	$this->db->query("insert into vtiger_parenttabrel values (2,4,3)");
+	$this->db->query("insert into vtiger_parenttabrel values (2,10,4)");
+	$this->db->query("insert into vtiger_parenttabrel values (4,10,7)");
+
+	//Added to populate the default inventory tax informations
+	$this->db->query("insert into vtiger_inventorytaxinfo values(".$this->db->getUniqueID("inventorytaxinfo").",'VAT','4.5')");
+	$this->db->query("insert into vtiger_inventorytaxinfo values(".$this->db->getUniqueID("inventorytaxinfo").",'Sales','10')");
+	$this->db->query("insert into vtiger_inventorytaxinfo values(".$this->db->getUniqueID("inventorytaxinfo").",'Service','12.5')");
+	
+	}
+}
+?>

Modified: vtigercrm/trunk/modules/Users/Delete.php
==============================================================================
--- vtigercrm/trunk/modules/Users/Delete.php (original)
+++ vtigercrm/trunk/modules/Users/Delete.php Mon Jun 12 14:26:25 2006
@@ -10,7 +10,7 @@
  ********************************************************************************/
 
 
-$sql= 'delete from salesmanactivityrel where smid='.$_REQUEST['record'].' and activityid = '.$_REQUEST['return_id'];
+$sql= 'delete from vtiger_salesmanactivityrel where smid='.$_REQUEST['record'].' and vtiger_activityid = '.$_REQUEST['return_id'];
 $adb->query($sql);
 
 if($_REQUEST['return_module'] == 'Activities')

Modified: vtigercrm/trunk/modules/Users/DeleteGroup.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DeleteGroup.php (original)
+++ vtigercrm/trunk/modules/Users/DeleteGroup.php Mon Jun 12 14:26:25 2006
@@ -13,7 +13,7 @@
 global $adb;
 $del_id =  $_REQUEST['groupId'];
 
-//Updating the user2 role table
+//Updating the user2 vtiger_role vtiger_table
 deleteGroup($del_id);
 
 header("Location: index.php?action=listgroups&module=Users&parenttab=Settings");

Modified: vtigercrm/trunk/modules/Users/DeleteUser.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DeleteUser.php (original)
+++ vtigercrm/trunk/modules/Users/DeleteUser.php Mon Jun 12 14:26:25 2006
@@ -13,46 +13,46 @@
 $del_id =  $_REQUEST['delete_user_id'];
 $tran_id = $_REQUEST['transfer_user_id'];
 
-//Updating the smcreatorid,smownerid, modifiedby in crmentity
-$sql1 = "update crmentity set smcreatorid=".$tran_id." where smcreatorid=".$del_id;
+//Updating the smcreatorid,smownerid, modifiedby in vtiger_crmentity
+$sql1 = "update vtiger_crmentity set smcreatorid=".$tran_id." where smcreatorid=".$del_id;
 $adb->query($sql1);
-$sql2 = "update crmentity set smownerid=".$tran_id." where smownerid=".$del_id;
+$sql2 = "update vtiger_crmentity set smownerid=".$tran_id." where smownerid=".$del_id;
 $adb->query($sql2);
-$sql3 = "update crmentity set modifiedby=".$tran_id." where modifiedby=".$del_id;
+$sql3 = "update vtiger_crmentity set modifiedby=".$tran_id." where modifiedby=".$del_id;
 $adb->query($sql3);
 
-//deleting from tracker
-$sql4 = "delete from tracker where user_id='".$del_id."'";
+//deleting from vtiger_tracker
+$sql4 = "delete from vtiger_tracker where user_id='".$del_id."'";
 $adb->query($sql4);
 
-//updating created by in lar table
-$sql5 = "update lar set createdby=".$tran_id." where createdby=".$del_id;
+//updating created by in vtiger_lar vtiger_table
+$sql5 = "update vtiger_lar set createdby=".$tran_id." where createdby=".$del_id;
 $adb->query($sql5);
 
-//updating the import_maps table
-$sql6 ="update import_maps set assigned_user_id='".$tran_id."' where assigned_user_id='".$del_id."'";
+//updating the vtiger_import_maps vtiger_table
+$sql6 ="update vtiger_import_maps set assigned_user_id='".$tran_id."' where assigned_user_id='".$del_id."'";
 $adb->query($sql6);
 
-//update assigned_user_id in files
-$sql7 ="update files set assigned_user_id='".$tran_id."' where assigned_user_id='".$del_id."'";
+//update assigned_user_id in vtiger_files
+$sql7 ="update vtiger_files set assigned_user_id='".$tran_id."' where assigned_user_id='".$del_id."'";
 $adb->query($sql7); 
 
 
-//update assigned_user_id in users_last_import
-$sql8 = "update users_last_import set assigned_user_id='".$tran_id."' where assigned_user_id='".$del_id."'";
+//update assigned_user_id in vtiger_users_last_import
+$sql8 = "update vtiger_users_last_import set assigned_user_id='".$tran_id."' where assigned_user_id='".$del_id."'";
 $adb->query($sql8);
 
-//delete from users to group table
-$sql9 = "delete from user2role where userid=".$del_id;
+//delete from vtiger_users to group vtiger_table
+$sql9 = "delete from vtiger_user2role where userid=".$del_id;
 $adb->query($sql9);
 
-//delete from users to role table
-$sql9 = "delete from users2group where userid=".$del_id;
+//delete from vtiger_users to vtiger_role vtiger_table
+$sql9 = "delete from vtiger_users2group where userid=".$del_id;
 $adb->query($sql9);
 
 
-//delete from user table;
-$sql9 = "delete from users where id=".$del_id;
+//delete from user vtiger_table;
+$sql9 = "delete from vtiger_users where id=".$del_id;
 $adb->query($sql9);
 header("Location: index.php?action=UsersAjax&module=Users&file=ListView&ajax=true");
 ?>

Modified: vtigercrm/trunk/modules/Users/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DetailView.php (original)
+++ vtigercrm/trunk/modules/Users/DetailView.php Mon Jun 12 14:26:25 2006
@@ -86,7 +86,7 @@
 $rolename =  getRoleName($role);
 $currencyid=fetchCurrency($focus->id);
 $currency=getCurrencyName($currencyid);
-//the user might belong to multiple groups
+//the user might belong to multiple vtiger_groups
 if($focus->id != 1)
 {
  $groupids = fetchUserGroupids($focus->id);
@@ -180,7 +180,7 @@
 	$buttons = "<input title='".$app_strings['LBL_DUPLICATE_BUTTON_TITLE']."' accessKey='".$app_strings['LBL_DUPLICATE_BUTTON_KEY']."' class='classBtn' onclick=\"this.form.return_module.value='Users'; this.form.return_action.value='DetailView'; this.form.isDuplicate.value=true; this.form.return_id.value='".$_REQUEST['record']."';this.form.action.value='EditView'\" type='submit' name='Duplicate' value=' ".$app_strings['LBL_DUPLICATE_BUTTON_LABEL']."'   >";
 	$smarty->assign('DUPLICATE_BUTTON',$buttons);
 	
-	//done so that only the admin user can see the customize tab button
+	//done so that only the admin user can see the customize vtiger_tab button
 	if($_REQUEST['record'] == $current_user->id)
 	{
 		$buttons = "<input title='".$app_strings['LBL_TABCUSTOMISE_BUTTON_TITLE']."' accessKey='".$app_strings['LBL_TABCUSTOMISE_BUTTON_KEY']."' class='classBtn' onclick=\"this.form.return_module.value='Users'; this.form.return_action.value='TabCustomise'; this.form.action.value='TabCustomise'\" type='submit' name='Customise' value=' ".$app_strings['LBL_TABCUSTOMISE_BUTTON_LABEL']." '>";
@@ -221,7 +221,7 @@
 //Getting the Group Lists
 $groupids = fetchUserGroupids($focus->id);
 if($groupids) {
-	$query ="select groupid,groupname from groups where groupid in (".$groupids.")";
+	$query ="select groupid,groupname from vtiger_groups where groupid in (".$groupids.")";
 	$result = $adb->query($query);
 	$num_rows = $adb->num_rows($result);
 } else {

Modified: vtigercrm/trunk/modules/Users/EditHomeOrder.php
==============================================================================
--- vtigercrm/trunk/modules/Users/EditHomeOrder.php (original)
+++ vtigercrm/trunk/modules/Users/EditHomeOrder.php Mon Jun 12 14:26:25 2006
@@ -35,7 +35,7 @@
 $record = $_REQUEST['record'];
 
 global $adb;
-$query = "SELECT users.homeorder FROM users WHERE id=$record";
+$query = "SELECT vtiger_users.homeorder FROM vtiger_users WHERE id=$record";
 $result =& $adb->query($query, false,"Error getting home order");
 $row = $adb->fetchByAssoc($result);
 
@@ -80,7 +80,7 @@
 	global $record,$log,$adb;
 	
 	$home_section_order = implode(",",$data['block']);
-	$sql = "UPDATE users SET homeorder='$home_section_order' WHERE id=$record";
+	$sql = "UPDATE vtiger_users SET homeorder='$home_section_order' WHERE id=$record";
 	$log->debug("Updating user $record with SQL=$sql");
 	$result =& $adb->query($sql, false,"Error getting home order");
     return $result;

Modified: vtigercrm/trunk/modules/Users/EditInventoryNotification.php
==============================================================================
--- vtigercrm/trunk/modules/Users/EditInventoryNotification.php (original)
+++ vtigercrm/trunk/modules/Users/EditInventoryNotification.php Mon Jun 12 14:26:25 2006
@@ -24,7 +24,7 @@
 if(isset($_REQUEST['record']) && $_REQUEST['record']!='') 
 {
     $id = $_REQUEST['record'];
-	$sql="select * from inventorynotification where notificationid = ".$id;
+	$sql="select * from vtiger_inventorynotification where notificationid = ".$id;
 	$result = $adb->query($sql);
 	if($adb->num_rows($result) ==1);
 	{

Modified: vtigercrm/trunk/modules/Users/EditNotification.php
==============================================================================
--- vtigercrm/trunk/modules/Users/EditNotification.php (original)
+++ vtigercrm/trunk/modules/Users/EditNotification.php Mon Jun 12 14:26:25 2006
@@ -25,7 +25,7 @@
 {
     $id = $_REQUEST['record'];
 	
-	$sql="select * from notificationscheduler where schedulednotificationid = ".$id;
+	$sql="select * from vtiger_notificationscheduler where schedulednotificationid = ".$id;
 	$result = $adb->query($sql);
 	if($adb->num_rows($result) ==1);
 	{

Modified: vtigercrm/trunk/modules/Users/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/Users/EditView.php (original)
+++ vtigercrm/trunk/modules/Users/EditView.php Mon Jun 12 14:26:25 2006
@@ -45,9 +45,9 @@
 	$mode='create';
 	$password='<tr>
 	   		   <td width="20%" class="dataLabel"><FONT class="required">*</FONT>Password</td>
-		       <td width="30%"><input name="new_password" type="password" tabindex="1" size="25" maxlength="25"></td>
+		       <td width="30%"><input name="new_password" type="password" vtiger_tabindex="1" size="25" maxlength="25"></td>
 			   <td width="20%" class="dataLabel"><FONT class="required">*</FONT>Confirm Password</td>
-			   <td width="30%"><input name="confirm_new_password" type="password" tabindex="2" size="25" maxlength="75"></td>
+			   <td width="30%"><input name="confirm_new_password" type="password" vtiger_tabindex="2" size="25" maxlength="75"></td>
 			  </tr>';
 }
 
@@ -57,9 +57,9 @@
 	$mode='create';
 	$password='<tr>
 	   		   <td width="20%" class="dataLabel"><FONT class="required">*</FONT>Password</td>
-		       <td width="30%"><input name="new_password" type="password" tabindex="1" size="25" maxlength="25"></td>
+		       <td width="30%"><input name="new_password" type="password" vtiger_tabindex="1" size="25" maxlength="25"></td>
 			   <td width="20%" class="dataLabel"><FONT class="required">*</FONT>Confirm Password</td>
-			   <td width="30%"><input name="confirm_new_password" type="password" tabindex="2" size="25" maxlength="75"></td>
+			   <td width="30%"><input name="confirm_new_password" type="password" vtiger_tabindex="2" size="25" maxlength="75"></td>
 			  </tr>';
 }
 
@@ -159,7 +159,7 @@
 $smarty->assign("DATE_FORMAT", $DATE_FORMAT_SELECT_OPTION);
 
 if (is_admin($current_user)) {
-	$status = "<td width='30%'>&nbsp;&nbsp;<select name='status' tabindex='1'";
+	$status = "<td width='30%'>&nbsp;&nbsp;<select name='status' vtiger_tabindex='1'";
 	if (isset($default_user_name)
 		&& $default_user_name != ""
 		&& $default_user_name == $focus->user_name
@@ -175,7 +175,7 @@
 }
 else
 {
-		$status = "<td width='30%'>&nbsp;&nbsp;<select name='status' tabindex='1' disabled>";
+		$status = "<td width='30%'>&nbsp;&nbsp;<select name='status' vtiger_tabindex='1' disabled>";
 		$status .= get_select_options_with_id($app_list_strings['user_status_dom'], $focus->status);
 		$status .= "</select></td>\n";
 		$smarty->assign("USER_STATUS_OPTIONS", $status);
@@ -210,15 +210,15 @@
 		$GROUP_SELECT_OPTION .= '<option value="">--None--</option>';
 		if($focus->id) {
 			$sql = "SELECT groupname
-				FROM users2group
-				INNER JOIN groups
-					ON groups.groupid = users2group.groupid
+				FROM vtiger_users2group
+				INNER JOIN vtiger_groups
+					ON vtiger_groups.groupid = vtiger_users2group.groupid
 				WHERE userid = '" .$focus->id ."'";
 			$result = $adb->query($sql);
 			$groupnameArray = $adb->fetch_array($result);
 		}
 		$groupselected = $groupnameArray["groupname"];
-		$sql2 = "SELECT groupname FROM groups";
+		$sql2 = "SELECT groupname FROM vtiger_groups";
                   $result_name = $adb->query($sql2);
                   $temprow = $adb->fetch_array($result_name);
                    do

Modified: vtigercrm/trunk/modules/Users/Forms.php
==============================================================================
--- vtigercrm/trunk/modules/Users/Forms.php (original)
+++ vtigercrm/trunk/modules/Users/Forms.php Mon Jun 12 14:26:25 2006
@@ -15,7 +15,7 @@
 /*********************************************************************************
  * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Users/Forms.php,v 1.3 2004/11/08 13:48:29 jack Exp $
  * Description:  Contains a variety of utility functions used to display UI
- * components such as form headers and footers.  Intended to be modified on a per
+ * components such as form vtiger_headers and footers.  Intended to be modified on a per
  * theme basis.
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
  * All Rights Reserved.
@@ -96,7 +96,7 @@
 		set_fieldfocus(errorMessage,form.email1);
 	}
 	if (trim(form.email2.value) != "" && !/^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,4})+$/.test(form.email2.value)) {
-		errorMessage='"' + form.email2.value + '" value in other email field is $err_invalid_email_address';
+		errorMessage='"' + form.email2.value + '" value in other email vtiger_field is $err_invalid_email_address';
 		set_fieldfocus(errorMessage,form.email2);
 	}
 	if(form.mode.value != 'edit')

Modified: vtigercrm/trunk/modules/Users/ListProfiles.php
==============================================================================
--- vtigercrm/trunk/modules/Users/ListProfiles.php (original)
+++ vtigercrm/trunk/modules/Users/ListProfiles.php Mon Jun 12 14:26:25 2006
@@ -24,7 +24,7 @@
 require_once($theme_path.'layout_utils.php');
 
 $smarty = new vtigerCRM_Smarty;
-$sql = "select * from profile";
+$sql = "select * from vtiger_profile";
 $profileListResult = $adb->query($sql);
 $noofrows = $adb->num_rows($profileListResult);
 $list_entries = array($mod_strings['LBL_OERATION'],$mod_strings['LBL_NEW_PROFILE_NAME'],$mod_strings['LBL_DESCRIPTION']);

Modified: vtigercrm/trunk/modules/Users/Listhistory.php
==============================================================================
--- vtigercrm/trunk/modules/Users/Listhistory.php (original)
+++ vtigercrm/trunk/modules/Users/Listhistory.php Mon Jun 12 14:26:25 2006
@@ -19,7 +19,7 @@
 
 
 
-	$dbQuery = "SELECT * from loginhistory order by login_id DESC";
+	$dbQuery = "SELECT * from vtiger_loginhistory order by login_id DESC";
 
 	//echo $dbQuery;
 

Modified: vtigercrm/trunk/modules/Users/Login.php
==============================================================================
--- vtigercrm/trunk/modules/Users/Login.php (original)
+++ vtigercrm/trunk/modules/Users/Login.php Mon Jun 12 14:26:25 2006
@@ -111,11 +111,11 @@
 													<li>Sexier Dashboards,Reports,Calendar</li>	 		
 													<li>Migration Support</li><br>	
 															How is 'vtiger-experience' ? <br>	
-													<li><a href='http://blogs.vtiger.com' tabindex="6">vtiger blogs </a></li>
-													<li><a href='http://www.bloglines.com' tabindex="7">bloglines </a></li>
-													<li><a href='http://technorati.com/' tabindex="8">technorati</a></li>
-													<li><a href='http://digg.com/' tabindex="9">digg</a></li>
-													<li><a href='http://www.blogger.com' tabindex="10">blogger</a></li>
+													<li><a href='http://blogs.vtiger.com' vtiger_tabindex="6">vtiger blogs </a></li>
+													<li><a href='http://www.bloglines.com' vtiger_tabindex="7">bloglines </a></li>
+													<li><a href='http://technorati.com/' vtiger_tabindex="8">technorati</a></li>
+													<li><a href='http://digg.com/' vtiger_tabindex="9">digg</a></li>
+													<li><a href='http://www.blogger.com' vtiger_tabindex="10">blogger</a></li>
 										</div>
 							</td>
 							<td valign="top"><br>
@@ -181,7 +181,7 @@
 																						<?php echo $current_module_strings['LBL_USER_NAME'] ?>
 																				</td>
 																				<td class="small">
-																						<input class="textbox" type="text"  name="user_name"   value="<?php echo $login_user_name ?>" tabindex="1">
+																						<input class="textbox" type="text"  name="user_name"   value="<?php echo $login_user_name ?>" vtiger_tabindex="1">
 																				</td>
 																	</tr>
 																	<tr>
@@ -189,7 +189,7 @@
 																							<?php echo $current_module_strings['LBL_PASSWORD'] ?>
 																				</td>
 																				<td class="small">
-																							<input class="textbox" type="password" size='20' name="user_password"  value="<?php echo $login_password ?>" tabindex="2">
+																							<input class="textbox" type="password" size='20' name="user_password"  value="<?php echo $login_password ?>" vtiger_tabindex="2">
 																				</td>
 																	</tr>
 																	<tr>
@@ -197,7 +197,7 @@
 																						<?php echo $current_module_strings['LBL_THEME'] ?>
 																				</td>
 																				<td class="small" style="background-color:#f5f5f5">
-																							<select class='small' name='login_theme' style="width:120px;" tabindex="3">
+																							<select class='small' name='login_theme' style="width:120px;" vtiger_tabindex="3">
 																									<?php echo get_select_options_with_id(get_themes(), $display_theme) ?>
 																							</select>
 																				</td>
@@ -207,7 +207,7 @@
 																							<?php echo $current_module_strings['LBL_LANGUAGE'] ?>
 																				</td>
 																				<td class="small" style="background-color:#f5f5f5">
-																							<select class='small' name='login_language' style="width:120px;" tabindex="4">
+																							<select class='small' name='login_language' style="width:120px;" vtiger_tabindex="4">
 																										<?php echo get_select_options_with_id(get_languages(), $display_language) ?>
 																								</select>
 																				  </td>
@@ -215,7 +215,7 @@
 																	<tr>
 																			<td></td>
 																			<td>
-																				<input class=small title="<?php echo $current_module_strings['LBL_LOGIN_BUTTON_TITLE'] ?>" accesskey="<?php echo $current_module_strings['LBL_LOGIN_BUTTON_TITLE'] ?>"  type="image" src="include/images/loginBtnSignin.gif" name="Login" value="  <?php echo $current_module_strings['LBL_LOGIN_BUTTON_LABEL'] ?>  "  tabindex="5">
+																				<input class=small title="<?php echo $current_module_strings['LBL_LOGIN_BUTTON_TITLE'] ?>" accesskey="<?php echo $current_module_strings['LBL_LOGIN_BUTTON_TITLE'] ?>"  type="image" src="include/images/loginBtnSignin.gif" name="Login" value="  <?php echo $current_module_strings['LBL_LOGIN_BUTTON_LABEL'] ?>  "  vtiger_tabindex="5">
 																				
 																			 </td>
 																	  </tr>

Modified: vtigercrm/trunk/modules/Users/LoginHistory.php
==============================================================================
--- vtigercrm/trunk/modules/Users/LoginHistory.php (original)
+++ vtigercrm/trunk/modules/Users/LoginHistory.php Mon Jun 12 14:26:25 2006
@@ -22,7 +22,7 @@
 	var $log;
 	var $db;
 
-	// Stored fields
+	// Stored vtiger_fields
 	var $login_id;
 	var $user_name;
 	var $user_ip;
@@ -51,7 +51,7 @@
 		$this->db = new PearDatabase();
 	}
 	
-	// This is the list of fields that are in the lists.
+	// This is the list of vtiger_fields that are in the lists.
 	var $list_fields = Array('login_id', 'user_name', 'user_ip', 'login_time', 'logout_time', 'status');	
 		
 	var $default_order_by = "login_id";
@@ -60,7 +60,7 @@
 	/** Records the Login info */
 	function user_login(&$usname,&$usip,&$intime)
 	{
-		$query = "Insert into loginhistory (user_name, user_ip, logout_time, login_time, status) values ('$usname','$usip',null,".$this->db->formatDate($intime).",'Signedin')";
+		$query = "Insert into vtiger_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());
 		
@@ -69,7 +69,7 @@
 	
 	function user_logout(&$usname,&$usip,&$outtime)
 	{
-		$logid_qry = "SELECT max(login_id) AS login_id from loginhistory where user_name='$usname' and user_ip='$usip'";
+		$logid_qry = "SELECT max(login_id) AS login_id from vtiger_loginhistory where user_name='$usname' and user_ip='$usip'";
 		$result = $this->db->query($logid_qry);
 		$loginid = $this->db->query_result($result,0,"login_id");
 		if ($loginid == '')
@@ -77,14 +77,14 @@
                         return;
                 }
 		// update the user login info.
-		$query = "Update loginhistory set logout_time =".$this->db->formatDate($outtime).", status='Signedoff' where login_id = $loginid";
+		$query = "Update vtiger_loginhistory set logout_time =".$this->db->formatDate($outtime).", status='Signedoff' where login_id = $loginid";
 		$result = $this->db->query($query)
                         or die("MySQL error: ".mysql_error());
 	}
 
   	function create_list_query(&$order_by, &$where)
   	{
-		// Determine if the account name is present in the where clause.
+		// Determine if the vtiger_account name is present in the where clause.
 		global $current_user;
 		$query = "SELECT user_name,user_ip, status,
 				".$this->db->getDBDateString("login_time")." AS login_time,

Modified: vtigercrm/trunk/modules/Users/Logout.php
==============================================================================
--- vtigercrm/trunk/modules/Users/Logout.php (original)
+++ vtigercrm/trunk/modules/Users/Logout.php Mon Jun 12 14:26:25 2006
@@ -30,7 +30,7 @@
 $ftpuser = '';
 $ftppassword = '';
 global $adb;
-$query = "select * from systems where server_type='backup'";
+$query = "select * from vtiger_systems where server_type='backup'";
 $result = $adb->query($query);
 $num_rows = $adb->num_rows($result);
 if($num_rows > 0)

Modified: vtigercrm/trunk/modules/Users/OrgSharingDetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Users/OrgSharingDetailView.php (original)
+++ vtigercrm/trunk/modules/Users/OrgSharingDetailView.php Mon Jun 12 14:26:25 2006
@@ -95,7 +95,7 @@
 	{
 
 		$colNameArr=explode("::",$colName);
-		$query = "select ".$table_name.".* from ".$table_name." inner join datashare_module_rel on ".$table_name.".shareid=datashare_module_rel.shareid where datashare_module_rel.tabid=".$tabid;
+		$query = "select ".$table_name.".* from ".$table_name." inner join vtiger_datashare_module_rel on ".$table_name.".shareid=vtiger_datashare_module_rel.shareid where vtiger_datashare_module_rel.tabid=".$tabid;
 		$result=$adb->query($query);
 		$num_rows=$adb->num_rows($result);
 

Modified: vtigercrm/trunk/modules/Users/OrganizationTermsandConditions.php
==============================================================================
--- vtigercrm/trunk/modules/Users/OrganizationTermsandConditions.php (original)
+++ vtigercrm/trunk/modules/Users/OrganizationTermsandConditions.php Mon Jun 12 14:26:25 2006
@@ -24,7 +24,7 @@
 require_once($theme_path.'layout_utils.php');
 
 $smarty = new vtigerCRM_Smarty;
-$sql="select * from inventory_tandc";
+$sql="select * from vtiger_inventory_tandc";
 $result = $adb->query($sql);
 $inventory_id = $adb->query_result($result,0,'id');
 $inventory_type = $adb->query_result($result,0,'type');

Modified: vtigercrm/trunk/modules/Users/ProfileDeleteStep1.php
==============================================================================
--- vtigercrm/trunk/modules/Users/ProfileDeleteStep1.php (original)
+++ vtigercrm/trunk/modules/Users/ProfileDeleteStep1.php Mon Jun 12 14:26:25 2006
@@ -44,7 +44,7 @@
 	<td align="left">';
 	$output.='<select class="select" name="transfer_prof_id">';
 	global $adb;	
-	$sql = "select * from profile";
+	$sql = "select * from vtiger_profile";
 	$result = $adb->query($sql);
 	$temprow = $adb->fetch_array($result);
 	do

Modified: vtigercrm/trunk/modules/Users/RoleDetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Users/RoleDetailView.php (original)
+++ vtigercrm/trunk/modules/Users/RoleDetailView.php Mon Jun 12 14:26:25 2006
@@ -32,9 +32,9 @@
 //Standard PickList Fields
 function getStdOutput($roleid)
 {
-	//Retreiving the related profiles
+	//Retreiving the related vtiger_profiles
 	$roleProfileArr=getRoleRelatedProfiles($roleid);
-	//Retreving the related users
+	//Retreving the related vtiger_users
 	$roleUserArr=getRoleUsers($roleid);
 
 	//Constructing the Profile list

Modified: vtigercrm/trunk/modules/Users/RoleDragDrop.php
==============================================================================
--- vtigercrm/trunk/modules/Users/RoleDragDrop.php (original)
+++ vtigercrm/trunk/modules/Users/RoleDragDrop.php Mon Jun 12 14:26:25 2006
@@ -15,7 +15,7 @@
 
 
 global $adb;
-$query = "select * from role where roleid='".$toid."'";
+$query = "select * from vtiger_role where vtiger_roleid='".$toid."'";
 $result=$adb->query($query);
 $parentRoleList=$adb->query_result($result,0,'parentrole');
 $replace_with=$parentRoleList;
@@ -50,7 +50,7 @@
 	$mvParString=$replace_with.$subPar[1];
 	$subDepth=$mvRoleInfo[2];
 	$mvDepth=$orgDepth+(($subDepth-$stdDepth)+1);
-	$query="update role set parentrole='".$mvParString."',depth=".$mvDepth." where roleid='".$mvRoleId."'";
+	$query="update vtiger_role set parentrole='".$mvParString."',depth=".$mvDepth." where vtiger_roleid='".$mvRoleId."'";
 	//echo $query;
 	$adb->query($query);
 		

Modified: vtigercrm/trunk/modules/Users/RolePopup.php
==============================================================================
--- vtigercrm/trunk/modules/Users/RolePopup.php (original)
+++ vtigercrm/trunk/modules/Users/RolePopup.php Mon Jun 12 14:26:25 2006
@@ -28,7 +28,7 @@
 
 
 //Retreiving the hierarchy
-$hquery = "select * from role order by parentrole asc";
+$hquery = "select * from vtiger_role order by parentrole asc";
 $hr_res = $adb->query($hquery);
 $num_rows = $adb->num_rows($hr_res);
 $hrarray= Array();
@@ -79,7 +79,7 @@
 }
 //Constructing the Roledetails array
 $role_det = getAllRoleDetails();
-$query = "select * from role";
+$query = "select * from vtiger_role";
 $result = $adb->query($query);
 $num_rows=$adb->num_rows($result);
 $mask_roleid='';
@@ -95,7 +95,7 @@
 	foreach($hrarray as $roleid => $value)
 	{
 	
-		//retreiving the role details
+		//retreiving the vtiger_role details
 		$role_det_arr=$role_det[$roleid];
 		$roleid_arr=$role_det_arr[2];
 		$rolename = $role_det_arr[0];

Modified: vtigercrm/trunk/modules/Users/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Users/Save.php (original)
+++ vtigercrm/trunk/modules/Users/Save.php Mon Jun 12 14:26:25 2006
@@ -29,7 +29,7 @@
 $user_name = $_REQUEST['userName'];
 if(isset($_REQUEST['dup_check']) && $_REQUEST['dup_check'] != '')
 {
-        $query = "SELECT user_name FROM users WHERE user_name ='".$user_name."'";
+        $query = "SELECT user_name FROM vtiger_users WHERE user_name ='".$user_name."'";
         $result = $adb->query($query);
         if($adb->num_rows($result) > 0)
         {
@@ -90,7 +90,7 @@
 	}
 	
 	if (!isset($_POST['is_admin'])) $focus->is_admin = 'off';
-	//Code contributed by mike crowe for rearrange the home page and tab
+	//Code contributed by mike crowe for rearrange the home page and vtiger_tab
 	if (!isset($_POST['deleted'])) $focus->deleted = '0';
 	if (!isset($_POST['homeorder']) || $_POST['homeorder'] == "" ) $focus->homeorder = 'ILTI,QLTQ,ALVT,PLVT,CVLVT,HLT,OLV,GRT,OLTSO';
 	

Modified: vtigercrm/trunk/modules/Users/SaveGroup.php
==============================================================================
--- vtigercrm/trunk/modules/Users/SaveGroup.php (original)
+++ vtigercrm/trunk/modules/Users/SaveGroup.php Mon Jun 12 14:26:25 2006
@@ -20,12 +20,12 @@
 {
         if($mode != 'edit')
         {
-                $query = 'select groupname from groups where groupname="'.$groupName.'"';
+                $query = 'select groupname from vtiger_groups where groupname="'.$groupName.'"';
         }
         else
         {
                 $groupid = $_REQUEST['groupid'];
-                $query = 'select groupname from groups  where groupname="'.$groupName.'" and groupid !='.$groupid;
+                $query = 'select groupname from vtiger_groups  where groupname="'.$groupName.'" and groupid !='.$groupid;
 
         }
         $result = $adb->query($query);

Modified: vtigercrm/trunk/modules/Users/SaveInventoryNotification.php
==============================================================================
--- vtigercrm/trunk/modules/Users/SaveInventoryNotification.php (original)
+++ vtigercrm/trunk/modules/Users/SaveInventoryNotification.php Mon Jun 12 14:26:25 2006
@@ -14,7 +14,7 @@
 
 if(isset($_REQUEST['record']) && $_REQUEST['record']!='')
 {
-	$query="UPDATE inventorynotification set notificationsubject='".$_REQUEST['notifysubject']."', notificationbody='".$_REQUEST['notifybody']."' where notificationid=".$_REQUEST['record'];
+	$query="UPDATE vtiger_inventorynotification set notificationsubject='".$_REQUEST['notifysubject']."', notificationbody='".$_REQUEST['notifybody']."' where notificationid=".$_REQUEST['record'];
 	$adb->query($query);	
 }
 $loc = "Location: index.php?action=UsersAjax&file=listinventorynotifications&module=Users&directmode=ajax";

Modified: vtigercrm/trunk/modules/Users/SaveNotification.php
==============================================================================
--- vtigercrm/trunk/modules/Users/SaveNotification.php (original)
+++ vtigercrm/trunk/modules/Users/SaveNotification.php Mon Jun 12 14:26:25 2006
@@ -14,7 +14,7 @@
 
 if(isset($_REQUEST['record']) && $_REQUEST['record']!='')
 {
-	$query="UPDATE notificationscheduler set notificationsubject='".$_REQUEST['notifysubject']."', notificationbody='".$_REQUEST['notifybody']."', active =".$_REQUEST['active']." where schedulednotificationid=".$_REQUEST['record'];
+	$query="UPDATE vtiger_notificationscheduler set notificationsubject='".$_REQUEST['notifysubject']."', notificationbody='".$_REQUEST['notifybody']."', active =".$_REQUEST['active']." where schedulednotificationid=".$_REQUEST['record'];
 	$adb->query($query);	
 }
 $loc = "Location: index.php?action=UsersAjax&file=listnotificationschedulers&module=Users&directmode=ajax";

Modified: vtigercrm/trunk/modules/Users/SaveOrgSharing.php
==============================================================================
--- vtigercrm/trunk/modules/Users/SaveOrgSharing.php (original)
+++ vtigercrm/trunk/modules/Users/SaveOrgSharing.php Mon Jun 12 14:26:25 2006
@@ -12,7 +12,7 @@
 require_once('include/database/PearDatabase.php');
 global $adb;
 
-$sql2 = "select * from def_org_share where editstatus=0";
+$sql2 = "select * from vtiger_def_org_share where editstatus=0";
 $result2 = $adb->query($sql2);
 $num_rows = $adb->num_rows($result2);
 
@@ -22,19 +22,19 @@
 	$tabid=$adb->query_result($result2,$i,'tabid');
 		$reqval = $tabid.'_per';	
 		$permission=$_REQUEST[$reqval];
-		$sql7="update def_org_share set permission=".$permission." where tabid=".$tabid." and ruleid=".$ruleid;
+		$sql7="update vtiger_def_org_share set permission=".$permission." where vtiger_tabid=".$tabid." and ruleid=".$ruleid;
 		$adb->query($sql7);
 
 		if($tabid == 6)
 		{
-			$sql8="update def_org_share set permission=".$permission." where tabid=4";
+			$sql8="update vtiger_def_org_share set permission=".$permission." where vtiger_tabid=4";
 			$adb->query($sql8);
 			
 		}
 
 		if($tabid == 9)
 		{
-			$sql8="update def_org_share set permission=".$permission." where tabid=16";
+			$sql8="update vtiger_def_org_share set permission=".$permission." where vtiger_tabid=16";
 			$adb->query($sql8);
 			
 		}

Modified: vtigercrm/trunk/modules/Users/SaveProfile.php
==============================================================================
--- vtigercrm/trunk/modules/Users/SaveProfile.php (original)
+++ vtigercrm/trunk/modules/Users/SaveProfile.php Mon Jun 12 14:26:25 2006
@@ -18,24 +18,24 @@
 $def_module = $_REQUEST['selected_module'];
 $def_tab = $_REQUEST['selected_tab'];
 //Inserting values into Profile Table
-$sql1 = "insert into profile values('','".$profilename."','".$description."')";
+$sql1 = "insert into vtiger_profile values('','".$profilename."','".$description."')";
 $adb->query($sql1);
 
-        //Retreiving the profileid
-        $sql2 = "select max(profileid) as current_id from profile";
+        //Retreiving the vtiger_profileid
+        $sql2 = "select max(profileid) as current_id from vtiger_profile";
         $result2 = $adb->query($sql2);
         $profileid = $adb->query_result($result2,0,'current_id');
 
 
-//Retreiving the tabs permission array
-$tab_perr_result = $adb->query("select * from profile2tab where profileid=1");
-$act_perr_result = $adb->query("select * from profile2standardpermissions where profileid=1");
-$act_utility_result = $adb->query("select * from profile2utility where profileid=1");
+//Retreiving the vtiger_tabs permission array
+$tab_perr_result = $adb->query("select * from vtiger_profile2tab where vtiger_profileid=1");
+$act_perr_result = $adb->query("select * from vtiger_profile2standardpermissions where vtiger_profileid=1");
+$act_utility_result = $adb->query("select * from vtiger_profile2utility where vtiger_profileid=1");
 $num_tab_per = $adb->num_rows($tab_perr_result);
 $num_act_per = $adb->num_rows($act_perr_result);
 $num_act_util_per = $adb->num_rows($act_utility_result);
 
-	//Updating profile2global permissons table
+	//Updating vtiger_profile2global permissons vtiger_table
 	$view_all_req=$_REQUEST['view_all'];
 	$view_all = getPermissionValue($view_all_req);
 
@@ -43,10 +43,10 @@
 	$edit_all = getPermissionValue($edit_all_req);
 
 
-	$sql4="insert into profile2globalpermissions values(".$profileid.",1, ".$view_all.")";
+	$sql4="insert into vtiger_profile2globalpermissions values(".$profileid.",1, ".$view_all.")";
         $adb->query($sql4);
 
-	$sql4="insert into profile2globalpermissions values(".$profileid.",2, ".$edit_all.")";
+	$sql4="insert into vtiger_profile2globalpermissions values(".$profileid.",2, ".$edit_all.")";
         $adb->query($sql4);
 
 	
@@ -66,23 +66,23 @@
 			{
 				$permission_value = 1;
 			}
-			$sql4="insert into profile2tab values(".$profileid.", ".$tab_id.", ".$permission_value.")";
+			$sql4="insert into vtiger_profile2tab values(".$profileid.", ".$tab_id.", ".$permission_value.")";
                 	$adb->query($sql4);
 
 			if($tab_id ==9)
 			{
-				$sql4="insert into profile2tab values(".$profileid.",16, ".$permission_value.")";
+				$sql4="insert into vtiger_profile2tab values(".$profileid.",16, ".$permission_value.")";
                         	$adb->query($sql4);	
 			}
 		}
 		elseif($tab_id == 13)
 		{
-			$sql4="insert into profile2tab values(".$profileid.",13,0)";
+			$sql4="insert into vtiger_profile2tab values(".$profileid.",13,0)";
                         $adb->query($sql4);
 		}
 		elseif($tab_id == 15)
 		{
-			$sql4="insert into profile2tab values(".$profileid.",15,0)";
+			$sql4="insert into vtiger_profile2tab values(".$profileid.",15,0)";
                         $adb->query($sql4);
 		}
 	}
@@ -118,12 +118,12 @@
 				$permission_value = 1;
 			}
 
-			$sql7="insert into profile2standardpermissions values(".$profileid.", ".$tab_id.", ".$action_id.", ".$permission_value.")";
+			$sql7="insert into vtiger_profile2standardpermissions values(".$profileid.", ".$tab_id.", ".$action_id.", ".$permission_value.")";
                 	$adb->query($sql7);
 
 			if($tab_id ==9)
 			{
-				$sql7="insert into profile2standardpermissions values(".$profileid.", 16, ".$action_id.", ".$permission_value.")";
+				$sql7="insert into vtiger_profile2standardpermissions values(".$profileid.", 16, ".$action_id.", ".$permission_value.")";
                         	$adb->query($sql7);
 			}
 
@@ -133,7 +133,7 @@
 		elseif($tab_id == 15)
 		{
 			
-                          $sql7="insert into profile2standardpermissions values(".$profileid.", 15, ".$action_id.",0)";
+                          $sql7="insert into vtiger_profile2standardpermissions values(".$profileid.", 15, ".$action_id.",0)";
                           $adb->query($sql7);
 		}
 	}
@@ -158,7 +158,7 @@
 			$permission_value = 1;
 		}
 
-		$sql9="insert into profile2utility values(".$profileid.", ".$tab_id.", ".$action_id.", ".$permission_value.")";
+		$sql9="insert into vtiger_profile2utility values(".$profileid.", ".$tab_id.", ".$action_id.", ".$permission_value.")";
                 $adb->query($sql9);
 
 	}
@@ -185,14 +185,14 @@
 		{
 			$visible_value = 1;
 		}
-		//Updating the Mandatory fields
+		//Updating the Mandatory vtiger_fields
 		$uitype = $adb->query_result($fieldListResult,$i,"uitype");
 		if($uitype == 2 || $uitype == 51 || $uitype == 6 || $uitype == 22 || $uitype == 73 || $uitype				== 24 || $uitype == 81 || $uitype == 50 || $uitype == 23 || $uitype == 16)
 		{
 			$visible_value = 0;
 		}
 		//Updating the database
-		$sql11="insert into profile2field values(".$profileid.", ".$tab_id.", ".$fieldid.", ".$visible_value.",1)";
+		$sql11="insert into vtiger_profile2field values(".$profileid.", ".$tab_id.", ".$fieldid.", ".$visible_value.",1)";
                 $adb->query($sql11);
 	}
 }

Modified: vtigercrm/trunk/modules/Users/SaveRole.php
==============================================================================
--- vtigercrm/trunk/modules/Users/SaveRole.php (original)
+++ vtigercrm/trunk/modules/Users/SaveRole.php Mon Jun 12 14:26:25 2006
@@ -17,12 +17,12 @@
 {
 	if($mode != 'edit')
 	{
-		$query = 'select rolename from role where rolename="'.$rolename.'"';
+		$query = 'select vtiger_rolename from vtiger_role where vtiger_rolename="'.$rolename.'"';
 	}
 	else
 	{
 		$roleid=$_REQUEST['roleid'];
-		$query = 'select rolename from role where rolename="'.$rolename.'" and roleid !="'.$roleid.'"';
+		$query = 'select vtiger_rolename from vtiger_role where vtiger_rolename="'.$rolename.'" and vtiger_roleid !="'.$roleid.'"';
 
 	}
 	$result = $adb->query($query);
@@ -51,7 +51,7 @@
 {
 	$selected_col_string = 	$_REQUEST['selectedColumnsString'];
 	$profile_array = explode(';',$selected_col_string);
-	//Inserting into role Table
+	//Inserting into vtiger_role Table
 	$roleId = createRole($rolename,$parentRoleId,$profile_array);
 	 	
 }

Modified: vtigercrm/trunk/modules/Users/TabCustomise.php
==============================================================================
--- vtigercrm/trunk/modules/Users/TabCustomise.php (original)
+++ vtigercrm/trunk/modules/Users/TabCustomise.php Mon Jun 12 14:26:25 2006
@@ -154,7 +154,7 @@
 </style>
 </head>
 <?
-		$tabavail="SELECT tabid,name from tab where presence !=2";
+		$tabavail="SELECT vtiger_tabid,name from vtiger_tab where presence !=2";
 		$tabrow=$adb->query($tabavail);
 		if($adb->num_rows($tabrow) != 0)
 		{
@@ -163,7 +163,7 @@
 				$availabletab[]=$result;
 			}
 		}	
-		$tabsel="SELECT tabid,name from tab where presence=0 order by tabsequence";
+		$tabsel="SELECT vtiger_tabid,name from vtiger_tab where presence=0 order by vtiger_tabsequence";
 		$tabrow=$adb->query($tabsel);
 		if($adb->num_rows($tabrow) != 0)
 		{
@@ -342,7 +342,7 @@
                 } else if (id.indexOf("fieldlist")>=0) {//if Field List
                         if (currSelItemObj.id.indexOf("fd")<0) {
                                 itemObj.style.cursor='move'
-                                itemObj.className='tableBorder mouseover'       //Hiliting Field List only when added fields are removed
+                                itemObj.className='tableBorder mouseover'       //Hiliting Field List only when added vtiger_fields are removed
                         }
                 }
         }

Modified: vtigercrm/trunk/modules/Users/UpdateDefaultFieldLevelAccess.php
==============================================================================
--- vtigercrm/trunk/modules/Users/UpdateDefaultFieldLevelAccess.php (original)
+++ vtigercrm/trunk/modules/Users/UpdateDefaultFieldLevelAccess.php Mon Jun 12 14:26:25 2006
@@ -32,7 +32,7 @@
 		{
 			$visible_value = 1;
 		}
-		//Updating the Mandatory fields
+		//Updating the Mandatory vtiger_fields
 		$uitype = $adb->query_result($fieldListResult,$i,"uitype");
 		if($uitype == 2 || $uitype == 51 || $uitype == 6 || $uitype == 22 || $uitype == 73 || $uitype == 24 || $uitype == 81 || $uitype == 50 || $uitype == 23 || $uitype == 16)
 		{
@@ -40,7 +40,7 @@
 		}		
 
 		//Updating the database
-		$update_query = "update def_org_field set visible=".$visible_value." where fieldid='".$fieldid."' and tabid=".$tab_id;
+		$update_query = "update vtiger_def_org_field set visible=".$visible_value." where vtiger_fieldid='".$fieldid."' and vtiger_tabid=".$tab_id;
 		$adb->query($update_query);
 
 	}

Modified: vtigercrm/trunk/modules/Users/UpdateProfileChanges.php
==============================================================================
--- vtigercrm/trunk/modules/Users/UpdateProfileChanges.php (original)
+++ vtigercrm/trunk/modules/Users/UpdateProfileChanges.php Mon Jun 12 14:26:25 2006
@@ -22,24 +22,24 @@
 else
 	$return_action = 'ListProfiles';
 
-//Retreiving the tabs permission array
-$tab_perr_result = $adb->query("select * from profile2tab where profileid=".$profileid);
-$act_perr_result = $adb->query("select * from profile2standardpermissions where profileid=".$profileid);
-$act_utility_result = $adb->query("select * from profile2utility where profileid=".$profileid);
+//Retreiving the vtiger_tabs permission array
+$tab_perr_result = $adb->query("select * from vtiger_profile2tab where vtiger_profileid=".$profileid);
+$act_perr_result = $adb->query("select * from vtiger_profile2standardpermissions where vtiger_profileid=".$profileid);
+$act_utility_result = $adb->query("select * from vtiger_profile2utility where vtiger_profileid=".$profileid);
 $num_tab_per = $adb->num_rows($tab_perr_result);
 $num_act_per = $adb->num_rows($act_perr_result);
 $num_act_util_per = $adb->num_rows($act_utility_result);
 
-	//Updating profile2global permissons table
+	//Updating vtiger_profile2global permissons vtiger_table
 	$view_all_req=$_REQUEST['view_all'];
 	$view_all = getPermissionValue($view_all_req);
 
 	$edit_all_req=$_REQUEST['edit_all'];
 	$edit_all = getPermissionValue($edit_all_req);
 
-	$update_query = "update  profile2globalpermissions set globalactionpermission=".$view_all." where globalactionid=1 and profileid=".$profileid;
+	$update_query = "update  vtiger_profile2globalpermissions set globalactionpermission=".$view_all." where globalactionid=1 and vtiger_profileid=".$profileid;
 	$adb->query($update_query);
-	$update_query = "update  profile2globalpermissions set globalactionpermission=".$edit_all." where globalactionid=2 and profileid=".$profileid;
+	$update_query = "update  vtiger_profile2globalpermissions set globalactionpermission=".$edit_all." where globalactionid=2 and vtiger_profileid=".$profileid;
 	$adb->query($update_query);
 
 	
@@ -59,11 +59,11 @@
 			{
 				$permission_value = 1;
 			}
-			$update_query = "update profile2tab set permissions=".$permission_value." where tabid=".$tab_id." and profileid=".$profileid;
+			$update_query = "update vtiger_profile2tab set permissions=".$permission_value." where vtiger_tabid=".$tab_id." and vtiger_profileid=".$profileid;
 			$adb->query($update_query);
 			if($tab_id ==9)
 			{
-				$update_query = "update profile2tab set permissions=".$permission_value." where tabid=16 and profileid=".$profileid;
+				$update_query = "update vtiger_profile2tab set permissions=".$permission_value." where vtiger_tabid=16 and vtiger_profileid=".$profileid;
 				$adb->query($update_query);
 			}
 		}
@@ -99,11 +99,11 @@
 			{
 				$permission_value = 1;
 			}
-			$update_query = "update profile2standardpermissions set permissions=".$permission_value." where tabid=".$tab_id." and Operation=".$action_id." and profileid=".$profileid;
+			$update_query = "update vtiger_profile2standardpermissions set permissions=".$permission_value." where vtiger_tabid=".$tab_id." and Operation=".$action_id." and vtiger_profileid=".$profileid;
 			$adb->query($update_query);
 			if($tab_id ==9)
 			{
-				$update_query = "update profile2standardpermissions set permissions=".$permission_value." where tabid=16 and Operation=".$action_id." and profileid=".$profileid;
+				$update_query = "update vtiger_profile2standardpermissions set permissions=".$permission_value." where vtiger_tabid=16 and Operation=".$action_id." and vtiger_profileid=".$profileid;
 				$adb->query($update_query);
 			}
 
@@ -132,7 +132,7 @@
 			$permission_value = 1;
 		}
 
-		$update_query = "update profile2utility set permission=".$permission_value." where tabid=".$tab_id." and activityid=".$action_id." and profileid=".$profileid;
+		$update_query = "update vtiger_profile2utility set permission=".$permission_value." where vtiger_tabid=".$tab_id." and vtiger_activityid=".$action_id." and vtiger_profileid=".$profileid;
 
 		$adb->query($update_query);
 
@@ -160,14 +160,14 @@
 		{
 			$visible_value = 1;
 		}
-		//Updating the Mandatory fields
+		//Updating the Mandatory vtiger_fields
 		$uitype = $adb->query_result($fieldListResult,$i,"uitype");
 		if($uitype == 2 || $uitype == 51 || $uitype == 6 || $uitype == 22 || $uitype == 73 || $uitype				== 24 || $uitype == 81 || $uitype == 50 || $uitype == 23 || $uitype == 16)
 		{
 			$visible_value = 0;
 		}
 		//Updating the database
-		$update_query = "update profile2field set visible=".$visible_value." where fieldid='".$fieldid."' and profileid=".$profileid." and tabid=".$tab_id;
+		$update_query = "update vtiger_profile2field set visible=".$visible_value." where vtiger_fieldid='".$fieldid."' and vtiger_profileid=".$profileid." and vtiger_tabid=".$tab_id;
 		$adb->query($update_query);
 
 	}

Modified: vtigercrm/trunk/modules/Users/UpdateTab.php
==============================================================================
--- vtigercrm/trunk/modules/Users/UpdateTab.php (original)
+++ vtigercrm/trunk/modules/Users/UpdateTab.php Mon Jun 12 14:26:25 2006
@@ -60,12 +60,12 @@
 	$xtpl->out("user_settings");
 }
 
-$sql_set = "update tab set presence=1 where presence !=2";
+$sql_set = "update vtiger_tab set presence=1 where presence !=2";
 $adb->query($sql_set);
 $j=1;
 foreach($_POST as $name=>$value)
 {
-  $sql="update tab set presence=0,tabsequence= " . $j . " where tabid = " .$value;
+  $sql="update vtiger_tab set presence=0,tabsequence= " . $j . " where vtiger_tabid = " .$value;
   $adb->query($sql);
   $j++;
 }

Modified: vtigercrm/trunk/modules/Users/User.php
==============================================================================
--- vtigercrm/trunk/modules/Users/User.php (original)
+++ vtigercrm/trunk/modules/Users/User.php Mon Jun 12 14:26:25 2006
@@ -37,7 +37,7 @@
 class User extends SugarBean {
 	var $log;
 	var $db;
-	// Stored fields
+	// Stored vtiger_fields
 	var $id;
 	var $user_name;
 	var $user_password;
@@ -85,7 +85,7 @@
 
 	var $module_id='id';
 	
-	var $table_name = "users";
+	var $table_name = "vtiger_users";
 	var $module_name = "Users";
 
 	var $object_name = "User";
@@ -144,10 +144,10 @@
 
 	var $encodeFields = Array("first_name", "last_name", "description");
 
-	// This is used to retrieve related fields from form posts.
+	// This is used to retrieve related vtiger_fields from form posts.
 	var $additional_column_fields = Array('reports_to_name');		
 	
-	// This is the list of fields that are in the lists.
+	// This is the list of vtiger_fields that are in the lists.
 	var $list_fields = Array('id', 'first_name', 'last_name', 'user_name', 'status', 'department', 'yahoo_id', 'is_admin', 'email1', 'phone_work');
 	//commented as we get issues with sugarbean
 	/*
@@ -359,7 +359,7 @@
 		$query = "SELECT * from $this->table_name where user_name='$this->user_name'";
 		$result = $this->db->requireSingleResult($query, false);
 
-		// Get the fields for the user
+		// Get the vtiger_fields for the user
 		$row = $this->db->fetchByAssoc($result);
 
 		$user_hash = strtolower(md5($user_password));
@@ -374,7 +374,7 @@
 			$this->db->query($query, true, "Error setting new hash for {$row['user_name']}: ");	
 		}
 		
-		// now fill in the fields.
+		// now fill in the vtiger_fields.
 		foreach($this->column_fields as $field)
 		{
 			//$this->log->info($field);
@@ -453,14 +453,14 @@
 
 	function retrieve_user_id($user_name)
 	{
-		$query = "SELECT id from users where user_name='$user_name' AND deleted=0";
+		$query = "SELECT id from vtiger_users where user_name='$user_name' AND deleted=0";
 		$result  =& $this->db->query($query, false,"Error retrieving user ID: ");
 		$row = $this->db->fetchByAssoc($result);
 		return $row['id'];
 	}
 	
 	/** 
-	 * @return -- returns a list of all users in the system.
+	 * @return -- returns a list of all vtiger_users in the system.
 	 * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc..
 	 * All Rights Reserved..
 	 * Contributor(s): ______________________________________..
@@ -469,12 +469,12 @@
 	{
 		global $mod_strings;
 		
-		$query = "SELECT user_name from users where user_name='$this->user_name' AND id<>'$this->id' AND deleted=0";
+		$query = "SELECT user_name from vtiger_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);
 		
-		$query = "SELECT user_name from users where is_admin = 'on' AND deleted=0";
-		$result =$this->db->query($query, true, "Error selecting possible duplicate users: ");
+		$query = "SELECT user_name from vtiger_users where is_admin = 'on' AND deleted=0";
+		$result =$this->db->query($query, true, "Error selecting possible duplicate vtiger_users: ");
 		$last_admin = $this->db->fetchByAssoc($result);
 
 		$this->log->debug("last admin length: ".count($last_admin));
@@ -507,7 +507,7 @@
 											 "CITY","STATE","POSTALCODE","COUNTRY");	
   	return $mergeflds;
   }
-		//function added for the listview of users for 5.0 beta
+		//function added for the listview of vtiger_users for 5.0 beta
 	function getUserListViewHeader()
 	{
 		global $mod_strings;
@@ -522,9 +522,9 @@
 	    	$theme_path="themes/".$theme."/";
 	    	$image_path=$theme_path."images/";
 		if($sorder != '' && $orderby !='')
-			$list_query = ' SELECT * from users where deleted=0 order by '.$orderby.' '.$sorder; 	
+			$list_query = ' SELECT * from vtiger_users where deleted=0 order by '.$orderby.' '.$sorder; 	
 		else
-			$list_query = "SELECT * from users where deleted=0 order by ".$this->default_order_by." ".$this->default_sort_order;
+			$list_query = "SELECT * from vtiger_users where deleted=0 order by ".$this->default_order_by." ".$this->default_sort_order;
 		$result =$adb->query($list_query);
 		$entries_list = array();
 		$roleinfo = getAllRoleDetails();
@@ -569,9 +569,9 @@
 	
 	function fill_in_additional_detail_fields()
 	{
-		//$query = "SELECT u1.first_name, u1.last_name from users as u1, users as u2 where u1.id = u2.reports_to_id AND u2.id = '$this->id' and u1.deleted=0";
-		$query = "SELECT u1.first_name, u1.last_name from users u1, users u2 where u1.id = u2.reports_to_id AND u2.id = '$this->id' and u1.deleted=0";
-		$result =$this->db->query($query, true, "Error filling in additional detail fields") ;
+		//$query = "SELECT u1.first_name, u1.last_name from vtiger_users as u1, vtiger_users as u2 where u1.id = u2.reports_to_id AND u2.id = '$this->id' and u1.deleted=0";
+		$query = "SELECT u1.first_name, u1.last_name from vtiger_users u1, vtiger_users u2 where u1.id = u2.reports_to_id AND u2.id = '$this->id' and u1.deleted=0";
+		$result =$this->db->query($query, true, "Error filling in additional detail vtiger_fields") ;
 		
 		$row = $this->db->fetchByAssoc($result);
 		$this->log->debug("additional detail query results: $row");

Modified: vtigercrm/trunk/modules/Users/UserDeleteStep1.php
==============================================================================
--- vtigercrm/trunk/modules/Users/UserDeleteStep1.php (original)
+++ vtigercrm/trunk/modules/Users/UserDeleteStep1.php Mon Jun 12 14:26:25 2006
@@ -46,7 +46,7 @@
 $output.='<select class="select" name="transfer_user_id" id="transfer_user_id">';
 	     
 		 global $adb;	
-         $sql = "select * from users";
+         $sql = "select * from vtiger_users";
          $result = $adb->query($sql);
          $temprow = $adb->fetch_array($result);
          do

Modified: vtigercrm/trunk/modules/Users/UsersAjax.php
==============================================================================
--- vtigercrm/trunk/modules/Users/UsersAjax.php (original)
+++ vtigercrm/trunk/modules/Users/UsersAjax.php Mon Jun 12 14:26:25 2006
@@ -23,7 +23,7 @@
 elseif(isset($_REQUEST['announce_rss']) && ($_REQUEST['announce_rss'] != ''))
 {
 	$announcement='';
-	$sql="select * from announcement order by time";
+	$sql="select * from vtiger_announcement order by time";
 	$result=$adb->query($sql);
 	for($i=0;$i<$adb->num_rows($result);$i++)
 	{
@@ -38,12 +38,12 @@
 	$date_var = date('YmdHis');
 	$announcement = $_REQUEST['announcement'];
 	$title = $_REQUEST['title_announcement'];
-	$sql="select * from announcement where creatorid=".$current_user->id;
+	$sql="select * from vtiger_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='announcement' where creatorid=".$current_user->id;
+		$query="update vtiger_announcement set vtiger_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).",'announcement','".$date_var."')";
+		$query="insert into vtiger_announcement values (".$current_user->id.",".$adb->formatString("announcement","announcement",$announcement).",'announcement','".$date_var."')";
 	$result=$adb->query($query);
 	echo $announcement;
 }

Modified: vtigercrm/trunk/modules/Users/add2db.php
==============================================================================
--- vtigercrm/trunk/modules/Users/add2db.php (original)
+++ vtigercrm/trunk/modules/Users/add2db.php Mon Jun 12 14:26:25 2006
@@ -67,7 +67,7 @@
 		if($genQueryId != '')
 		{
 			$module = $_REQUEST['target_module'];
-			$sql = "INSERT INTO wordtemplates ";
+			$sql = "INSERT INTO vtiger_wordtemplates ";
 			$sql .= "(templateid,module,date_entered,parent_type,data,description,filename,filesize,filetype) ";
 			$sql .= "VALUES (".$genQueryId.",'".$module."',".$adb->formatString('wordtemplates','date_entered',$date_entered).",'$parent_type',".$adb->getEmptyBlob().",'$strDescription',";
 			$sql .= "'$filename', '$filesize', '$filetype')";
@@ -108,8 +108,8 @@
   {
     include('themes/'.$theme.'/header.php');
     include "upload.php";
-    //$errormessage = "<B><font color='red'>Sorry, the uploaded file exceeds the maximum filesize limit. Please try a smaller file</font></B> <br>";
-	echo "<script>alert('Sorry, the uploaded file exceeds the maximum filesize limit. Please try a smaller file')</script>";	
+    //$errormessage = "<B><font color='red'>Sorry, the uploaded file exceeds the maximum vtiger_filesize limit. Please try a smaller file</font></B> <br>";
+	echo "<script>alert('Sorry, the uploaded file exceeds the maximum vtiger_filesize limit. Please try a smaller file')</script>";	
     //echo $errormessage;
     //echo $errorCode;
   }

Modified: vtigercrm/trunk/modules/Users/binaryfilelist.php
==============================================================================
--- vtigercrm/trunk/modules/Users/binaryfilelist.php (original)
+++ vtigercrm/trunk/modules/Users/binaryfilelist.php Mon Jun 12 14:26:25 2006
@@ -22,7 +22,7 @@
 
 	$dbQuery = "SELECT templateid, filename,filesize,filetype,description,module ";
 
-	$dbQuery .= "FROM wordtemplates" ;
+	$dbQuery .= "FROM vtiger_wordtemplates" ;
 
 	$dbQuery .= " ORDER BY filename ASC";
 

Modified: vtigercrm/trunk/modules/Users/createrole.php
==============================================================================
--- vtigercrm/trunk/modules/Users/createrole.php (original)
+++ vtigercrm/trunk/modules/Users/createrole.php Mon Jun 12 14:26:25 2006
@@ -29,7 +29,7 @@
 	$thisRoleDet=$roleInfo[$roleid];
 	$rolename = $thisRoleDet[0]; 
 	$parent = $thisRoleDet[3]; 
-	//retreiving the profileid
+	//retreiving the vtiger_profileid
 	$roleRelatedProfiles=getRoleRelatedProfiles($roleid);
 
 }

Modified: vtigercrm/trunk/modules/Users/deleteemailtemplate.php
==============================================================================
--- vtigercrm/trunk/modules/Users/deleteemailtemplate.php (original)
+++ vtigercrm/trunk/modules/Users/deleteemailtemplate.php Mon Jun 12 14:26:25 2006
@@ -14,7 +14,7 @@
 
 for($i=0;$i < count($id_array)-1;$i++)
 {
-		$sql = "delete from emailtemplates where templateid =".$id_array[$i];
+		$sql = "delete from vtiger_emailtemplates where templateid =".$id_array[$i];
 		$adb->query($sql);
 }
 

Modified: vtigercrm/trunk/modules/Users/deletewordtemplate.php
==============================================================================
--- vtigercrm/trunk/modules/Users/deletewordtemplate.php (original)
+++ vtigercrm/trunk/modules/Users/deletewordtemplate.php Mon Jun 12 14:26:25 2006
@@ -15,7 +15,7 @@
  for($i=0; $i < count($id_array)-1; $i++)
  {
 
-	         $sql = "delete from wordtemplates where templateid=".$id_array[$i];
+	         $sql = "delete from vtiger_wordtemplates where templateid=".$id_array[$i];
 	         $adb->query($sql);
 
  }

Modified: vtigercrm/trunk/modules/Users/detailviewemailtemplate.php
==============================================================================
--- vtigercrm/trunk/modules/Users/detailviewemailtemplate.php (original)
+++ vtigercrm/trunk/modules/Users/detailviewemailtemplate.php Mon Jun 12 14:26:25 2006
@@ -38,7 +38,7 @@
 {
 	$log->info("The templateid is set");
 	$tempid = $_REQUEST['templateid'];
-	$sql = "select * from emailtemplates where templateid=".$tempid;
+	$sql = "select * from vtiger_emailtemplates where templateid=".$tempid;
 	$result = $adb->query($sql);
 	$emailtemplateResult = $adb->fetch_array($result);
 }

Modified: vtigercrm/trunk/modules/Users/downloadfile.php
==============================================================================
--- vtigercrm/trunk/modules/Users/downloadfile.php (original)
+++ vtigercrm/trunk/modules/Users/downloadfile.php Mon Jun 12 14:26:25 2006
@@ -16,7 +16,7 @@
 
 $templateid = $_REQUEST['record'];
 $dbQuery = "SELECT filename,filetype, data ";
-$dbQuery .= "FROM wordtemplates ";
+$dbQuery .= "FROM vtiger_wordtemplates ";
 $dbQuery .= "WHERE templateid=" .$templateid;
 
 $result = $adb->query($dbQuery) or die("Couldn't get file list");

Modified: vtigercrm/trunk/modules/Users/editemailtemplate.php
==============================================================================
--- vtigercrm/trunk/modules/Users/editemailtemplate.php (original)
+++ vtigercrm/trunk/modules/Users/editemailtemplate.php Mon Jun 12 14:26:25 2006
@@ -31,7 +31,7 @@
 	$templateid = $_REQUEST['templateid'];
 	 $log->debug("the templateid is set to the value ".$templateid);
 }
-$sql = "select * from emailtemplates where templateid=".$templateid;
+$sql = "select * from vtiger_emailtemplates where templateid=".$templateid;
 $result = $adb->query($sql);
 $emailtemplateResult = $adb->fetch_array($result);
 

Modified: vtigercrm/trunk/modules/Users/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Users/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Users/language/en_us.lang.php Mon Jun 12 14:26:25 2006
@@ -123,7 +123,7 @@
 'ERR_LAST_ADMIN_1'=>'The user name ',
 'ERR_LAST_ADMIN_2'=>' is the last Admin user.  At least one user must be an Admin user.<br>Check the Admin user setting.',
 
-'ERR_DELETE_RECORD'=>"A record number must be specified to delete the account.",
+'ERR_DELETE_RECORD'=>"A record number must be specified to delete the vtiger_account.",
 
 // Additional Fields for i18n --- Release vtigerCRM 3.2 Patch 2
 // Users--listroles.php , createrole.php , ListPermissions.php , editpermissions.php
@@ -186,7 +186,7 @@
 'LBL_COLON'=>':',
 'LBL_EMAIL_TEMPLATE'=>'Email Template',
 'LBL_NEW_TEMPLATE'=>'New Template',
-'LBL_USE_MERGE_FIELDS_TO_EMAIL_CONTENT'=>'Use merge fields to personalize your email content.',
+'LBL_USE_MERGE_FIELDS_TO_EMAIL_CONTENT'=>'Use merge vtiger_fields to personalize your email content.',
 'LBL_AVAILABLE_MERGE_FIELDS'=>'Available Merge Fields',
 'LBL_SELECT_FIELD_TYPE'=>'Select Field Type :',
 'LBL_SELECT_FIELD'=>'Select Field :',
@@ -194,7 +194,7 @@
 'LBL_ACCOUNT_FIELDS'=>'Account Fields',
 'LBL_CONTACT_FIELDS'=>'Contact Fields',
 'LBL_LEAD_FIELDS'=>'Lead Fields',
-'LBL_COPY_AND_PASTE_MERGE_FIELD'=>'Copy and paste the merge field value into your template below.',
+'LBL_COPY_AND_PASTE_MERGE_FIELD'=>'Copy and paste the merge vtiger_field value into your template below.',
 'LBL_EMAIL_TEMPLATE_INFORMATION'=>'Communication Templates > Email Templates > Viewing',
 'LBL_FOLDER'=>'Folder',
 'LBL_PERSONAL'=>'Personal',
@@ -209,7 +209,7 @@
 'LBL_TEMPLATE_MESSAGE'=>'Email Message',
 
 
-// Added fields in createnewgroup.php
+// Added vtiger_fields in createnewgroup.php
 'LBL_CREATE_NEW_GROUP'=>'Create New Group',
 'LBL_NEW_GROUP'=>'New Group',
 'LBL_EDIT_GROUP'=>'Edit Group',
@@ -220,7 +220,7 @@
 'LBL_MEMBER_SELECTED'=>'Selected Member',
 'LBL_DESCRIPTION'=>'Description',
 
-// Added fields in detailViewmailtemplate.html,listgroupmembers.php,listgroups.php
+// Added vtiger_fields in detailViewmailtemplate.html,listgroupmembers.php,listgroups.php
 'LBL_DETAIL_VIEW_OF_EMAIL_TEMPLATE'=>'Detail View of Email Template',
 'LBL_DETAIL_VIEW'=>'Detail View of',
 'LBL_EDIT_VIEW'=>'Edit View of',
@@ -230,7 +230,7 @@
 'LBL_WORD_TEMPLATES'=>'Mail Merge Templates',
 'LBL_NEW_WORD_TEMPLATE'=>'New Template',
 
-// Added fields in TabCustomise.php,html and UpdateTab.php,html
+// Added vtiger_fields in TabCustomise.php,html and UpdateTab.php,html
 'LBL_CUSTOMISE_TABS'=>'Customize Tabs',
 'LBL_CHOOSE_TABS'=>'Choose Tabs',
 'LBL_AVAILABLE_TABS'=>'Available Tabs',
@@ -243,10 +243,10 @@
 'LBL_CHANGE_HOMEPAGE_LABEL'=>'Homepage Order',
 'LBL_CHANGE_HOMEPAGE_TITLE'=>'Homepage',
 
-// Added fields in binaryfilelist.php
+// Added vtiger_fields in binaryfilelist.php
 'LBL_OERATION'=>'Operation',
 
-// Added fields in CreateProfile.php
+// Added vtiger_fields in CreateProfile.php
 'LBL_PROFILE_NAME'=>'Create New Profile:',
 'LBL_NEW_PROFILE'=>'New Profile',
 'LBL_NEW_PROFILE_NAME'=>'Profile Name',
@@ -263,7 +263,7 @@
 'LBL_STANDARD_PRIVILEGES'=>'Standard Privileges',
 'LBL_UTILITY_PRIVILEGES'=>'Utility Privileges',
 'LBL_UTILITIES'=>'Utilities',
-'LBL_BASE_PROFILE_MESG'=>'I would like to setup a base profile and edit privileges <b>(Recommended)</b>',
+'LBL_BASE_PROFILE_MESG'=>'I would like to setup a base vtiger_profile and edit privileges <b>(Recommended)</b>',
 'LBL_BASE_PROFILE'=>'Base Profile:',
 'LBL_OR'=>'OR',
 'LBL_BASE_PROFILE_MESG_ADV'=>'I will choose the privileges from scratch <b>(Advanced Users)</b>',
@@ -275,19 +275,19 @@
 'LBL_MESG_VIEW'=>'to view all information / modules of vtiger CRM',
 'LBL_MESG_EDIT'=>'to edit all information / modules of vtiger CRM',
 'LBL_STD_MESG_OPTION'=>'Select the standard actions to be permitted',
-'LBL_TAB_MESG_OPTION'=>'Select the tabs/modules to be permitted',
+'LBL_TAB_MESG_OPTION'=>'Select the vtiger_tabs/modules to be permitted',
 'LBL_UTILITY_MESG_OPTION'=>'Select the utility actions to be permitted',
-'LBL_FIELD_MESG_OPTION'=>'Select the fields to be permitted',
+'LBL_FIELD_MESG_OPTION'=>'Select the vtiger_fields to be permitted',
 'LBL_FINISH_BUTTON'=>'Finish',
 'LBL_PROFILE_DETAIL_VIEW'=>'Detail View of Profile',
 
 
-//Added fields in createrole.php
+//Added vtiger_fields in createrole.php
 'LBL_HDR_ROLE_NAME'=>'Create New Role:',
 'LBL_TITLE_ROLE_NAME'=>'New Role',
 'LBL_ROLE_NAME'=>'Role Name',
 'LBL_ROLE_PROFILE_NAME'=>'Associate With Profile',
-'LBL_SPECIFY_ROLE_NAME'=>'Specify a name for new role :',
+'LBL_SPECIFY_ROLE_NAME'=>'Specify a name for new vtiger_role :',
 'LBL_ASSIGN_PROFILE'=>'Assign Profile(s)',
 'LBL_PROFILE_SELECT_TEXT'=>'Select the Profiles below and click on assign button',
 'LBL_PROFILES_AVLBL'=>'Profiles Available',
@@ -297,7 +297,7 @@
 'LBL_ASSOCIATED_USERS'=>'Associated Users :',
 
 
-//Added fields in OrgSharingDetailsView.php
+//Added vtiger_fields in OrgSharingDetailsView.php
 'LBL_ORG_SHARING_PRIVILEGES'=>'Organisation Sharing  Privileges',
 'LBL_EDIT_PERMISSIONS'=>'Edit Permissions',
 'LBL_SAVE_PERMISSIONS'=>'Save Permissions',
@@ -306,7 +306,7 @@
 'LBL_READ_CREATE_EDIT_DEL'=>'Public: Read, Create/Edit, Delete',
 'LBL_PRIVATE'=>'Private',
 
-//Added fields in listnotificationschedulers.php
+//Added vtiger_fields in listnotificationschedulers.php
 'LBL_HDR_EMAIL_SCHDS'=>'Users : Email Notifications',
 'LBL_EMAIL_SCHDS_DESC'=>'The following is the list of notifications that are activated automatically when the corresponding event has happened.',
 'LBL_ACTIVE'=>'Active',
@@ -327,13 +327,13 @@
 'LBL_BUTTON_UPDATE'=>'Update',
 'LBL_MODULENAMES'=>'Module',
 
-//Added fields in ListFieldPermissions.html
+//Added vtiger_fields in ListFieldPermissions.html
 'LBL_FIELD_PERMISSION_FIELD_NAME'=>'Field Name',
 'LBL_FIELD_PERMISSION_VISIBLE'=>'Visible',
 'LBL_FIELD_PERMISSIOM_TABLE_HEADER'=>'Standard Fields',
 'LBL_FIELD_LEVEL_ACCESS'=>'Field Level Access',
 
-//Added fields after 4.0.1
+//Added vtiger_fields after 4.0.1
 'LBL_SIGNATURE'=>'Signature',
 
 //Added for Event Reminder 4.2 Alpha release
@@ -352,9 +352,9 @@
 'Show Details'=>'Show Details',
 'Show Details and Add Events'=>'Show Details and Add Events',
 
-'LBL_USR_CANNOT_ACCESS'=>'Users cannot access other users ',
+'LBL_USR_CANNOT_ACCESS'=>'Users cannot access other vtiger_users ',
 'LBL_USR_CAN_ACCESS'=>'Users can ',
-'LBL_USR_OTHERS'=>' other users ',
+'LBL_USR_OTHERS'=>' other vtiger_users ',
 
 'Read Only '=>'Read Only ',
 'Read, Create/Edit, Delete '=>'Read, Create/Edit, Delete ',
@@ -432,7 +432,7 @@
 
 //given for calendar color for an user user
 'LBL_COLOR'=>'Color in Calendar',
-//added for activity view in home page
+//added for vtiger_activity view in home page
 'LBL_ACTIVITY_VIEW'=>'Default Activity View',
 //Added to change Home page order
 'LBL_HOMEPAGE_ORDER_UPDATE'=>'Update Home Page Block Order',
@@ -486,7 +486,7 @@
 'LBL_CREATE_RULE_MESG'=>'to create a new Rule',
 'LBL_SELECT_SCREEN'=>'Select the Screen / Module :',
 'LBL_FIELDS_AVLBL'=>'Fields Available in',
-'LBL_FIELDS_SELECT_DESELECT'=>'Select or De-Select fields to be shown',
+'LBL_FIELDS_SELECT_DESELECT'=>'Select or De-Select vtiger_fields to be shown',
 'LBL_ROLE_TO_BE_DELETED'=>'Role to be Deleted',
 'LBL_TRANSFER_USER_ROLE'=>'Transfer Users to Role',
 'LBL_DELETE_ROLE'=>'Delete Role'

Modified: vtigercrm/trunk/modules/Users/listemailtemplates.php
==============================================================================
--- vtigercrm/trunk/modules/Users/listemailtemplates.php (original)
+++ vtigercrm/trunk/modules/Users/listemailtemplates.php Mon Jun 12 14:26:25 2006
@@ -18,7 +18,7 @@
 
 $log->info("Inside Email Templates List View");
 
-   $sql = "select * from emailtemplates order by templateid DESC";
+   $sql = "select * from vtiger_emailtemplates order by templateid DESC";
    $result = $adb->query($sql);
    $temprow = $adb->fetch_array($result);
    

Modified: vtigercrm/trunk/modules/Users/listinventorynotifications.php
==============================================================================
--- vtigercrm/trunk/modules/Users/listinventorynotifications.php (original)
+++ vtigercrm/trunk/modules/Users/listinventorynotifications.php Mon Jun 12 14:26:25 2006
@@ -18,7 +18,7 @@
 $image_path=$theme_path."images/";
 
 $smarty = new vtigerCRM_Smarty;
-$query = "SELECT * FROM inventorynotification";
+$query = "SELECT * FROM vtiger_inventorynotification";
 $result = $adb->query($query);
 $num_rows = $adb->num_rows($result);
 $output = Array();

Modified: vtigercrm/trunk/modules/Users/listnotificationschedulers.php
==============================================================================
--- vtigercrm/trunk/modules/Users/listnotificationschedulers.php (original)
+++ vtigercrm/trunk/modules/Users/listnotificationschedulers.php Mon Jun 12 14:26:25 2006
@@ -16,7 +16,7 @@
 $image_path=$theme_path."images/";
 
 $smarty = new vtigerCRM_Smarty;
-$query = "SELECT * FROM notificationscheduler";
+$query = "SELECT * FROM vtiger_notificationscheduler";
 $result = $adb->query($query);
 if($adb->num_rows($result) >=1)
 {

Modified: vtigercrm/trunk/modules/Users/listroles.php
==============================================================================
--- vtigercrm/trunk/modules/Users/listroles.php (original)
+++ vtigercrm/trunk/modules/Users/listroles.php Mon Jun 12 14:26:25 2006
@@ -28,7 +28,7 @@
 
 
 //Retreiving the hierarchy
-$hquery = "select * from role order by parentrole asc";
+$hquery = "select * from vtiger_role order by parentrole asc";
 $hr_res = $adb->query($hquery);
 $num_rows = $adb->num_rows($hr_res);
 $hrarray= Array();
@@ -79,7 +79,7 @@
 }
 //Constructing the Roledetails array
 $role_det = getAllRoleDetails();
-$query = "select * from role";
+$query = "select * from vtiger_role";
 $result = $adb->query($query);
 $num_rows=$adb->num_rows($result);
 
@@ -93,7 +93,7 @@
 	foreach($hrarray as $roleid => $value)
 	{
 	
-		//retreiving the role details
+		//retreiving the vtiger_role details
 		$role_det_arr=$role_det[$roleid];
 		$roleid_arr=$role_det_arr[2];
 		$rolename = $role_det_arr[0];

Modified: vtigercrm/trunk/modules/Users/listwordtemplates.php
==============================================================================
--- vtigercrm/trunk/modules/Users/listwordtemplates.php (original)
+++ vtigercrm/trunk/modules/Users/listwordtemplates.php Mon Jun 12 14:26:25 2006
@@ -13,7 +13,7 @@
 require_once('include/database/PearDatabase.php');
 
    global $adb;
-   $sql = "select templateid, module, description, filename, filesize, filetype from wordtemplates order by filename ASC";
+   $sql = "select templateid, module, description, filename, vtiger_filesize, filetype from vtiger_wordtemplates order by filename ASC";
    $result = $adb->query($sql);
 
 $edit="Edit  ";

Modified: vtigercrm/trunk/modules/Users/lookupemailtemplates.php
==============================================================================
--- vtigercrm/trunk/modules/Users/lookupemailtemplates.php (original)
+++ vtigercrm/trunk/modules/Users/lookupemailtemplates.php Mon Jun 12 14:26:25 2006
@@ -36,7 +36,7 @@
                 <th width="65%" class="lvtCol"><b><?php echo $mod_strings['LBL_DESCRIPTION']; ?></b></td>
                 </tr>
 <?php
-   $sql = "select * from emailtemplates order by templateid desc";
+   $sql = "select * from vtiger_emailtemplates order by templateid desc";
    $result = $adb->query($sql);
    $temprow = $adb->fetch_array($result);
 $cnt=1;

Modified: vtigercrm/trunk/modules/Users/massChangeStatus.php
==============================================================================
--- vtigercrm/trunk/modules/Users/massChangeStatus.php (original)
+++ vtigercrm/trunk/modules/Users/massChangeStatus.php Mon Jun 12 14:26:25 2006
@@ -39,7 +39,7 @@
 }
 function updateStatus()
 {
-	var leadstatusvalue=document.setLeadStatus.lead_status.value
+	var vtiger_leadstatusvalue=document.setLeadStatus.lead_status.value
 	//alert(leadstatusvalue);
 	document.setLeadStatus.leadval.value=leadstatusvalue;
 	document.setLeadStatus.action="index.php?module=Users&action=updateLeadDBStatus"
@@ -96,7 +96,7 @@
 }
 elseif(isset($_REQUEST['change_owner']) && $_REQUEST['change_owner']=='true')
 {
-	$result=$adb->query("select * from users");
+	$result=$adb->query("select * from vtiger_users");
 	for($i=0;$i<$adb->num_rows($result);$i++)
 	{
 		$useridlist[$i]=$adb->query_result($result,$i,'id');

Modified: vtigercrm/trunk/modules/Users/massdelete.php
==============================================================================
--- vtigercrm/trunk/modules/Users/massdelete.php (original)
+++ vtigercrm/trunk/modules/Users/massdelete.php Mon Jun 12 14:26:25 2006
@@ -27,7 +27,7 @@
 {
         if(isPermitted($returnmodule,'Delete',$id) == 'yes')
         {
-                $sql="update crmentity set deleted=1 where crmid='" .$id ."'";
+                $sql="update vtiger_crmentity set deleted=1 where crmid='" .$id ."'";
                 $result = $adb->query($sql);
         }
         else

Modified: vtigercrm/trunk/modules/Users/populatetemplate.php
==============================================================================
--- vtigercrm/trunk/modules/Users/populatetemplate.php (original)
+++ vtigercrm/trunk/modules/Users/populatetemplate.php Mon Jun 12 14:26:25 2006
@@ -8,7 +8,7 @@
  * All Rights Reserved.
 *
  ********************************************************************************/
-//query the specific table and then get the data and write the data here 
+//query the specific vtiger_table and then get the data and write the data here 
 require_once('include/database/PearDatabase.php');
 include_once('modules/Contacts/Contact.php');
 include_once('modules/Leads/Lead.php');
@@ -16,7 +16,7 @@
 global $log;
 
 //download the template file and store it in some specific location
-$sql = "select templatename,body from emailtemplates where templateid='".$_REQUEST["templateid"] ."'";
+$sql = "select templatename,body from vtiger_emailtemplates where templateid='".$_REQUEST["templateid"] ."'";
 $tempresult = $adb->query($sql);
 $tempArray = $adb->fetch_array($tempresult);
 $fileContent = $tempArray["body"];
@@ -86,7 +86,7 @@
 
 global $current_user;
 global $adb;
-$query = 'select * from users where id= '.$current_user->id;
+$query = 'select * from vtiger_users where id= '.$current_user->id;
 $result = $adb->query($query);
 $res_row = $adb->fetchByAssoc($result);
 foreach ($res_row as $columnName=>$value)

Modified: vtigercrm/trunk/modules/Users/profilePrivileges.php
==============================================================================
--- vtigercrm/trunk/modules/Users/profilePrivileges.php (original)
+++ vtigercrm/trunk/modules/Users/profilePrivileges.php Mon Jun 12 14:26:25 2006
@@ -71,7 +71,7 @@
 
 
 
-//Initially setting the secondary selected tab
+//Initially setting the secondary selected vtiger_tab
 $mode=$_REQUEST['mode'];
 if($mode == 'create')
 {

Modified: vtigercrm/trunk/modules/Users/saveemailtemplate.php
==============================================================================
--- vtigercrm/trunk/modules/Users/saveemailtemplate.php (original)
+++ vtigercrm/trunk/modules/Users/saveemailtemplate.php Mon Jun 12 14:26:25 2006
@@ -33,7 +33,7 @@
 if(isset($templateid) && $templateid !='')
 {
 	$log->info("the templateid is set");  
-	$sql = "update emailtemplates set foldername = '".$folderName."', templatename ='".$templateName."', subject ='".$subject."', description ='".$description."', body ='".$body."' where templateid =".$templateid;
+	$sql = "update vtiger_emailtemplates set foldername = '".$folderName."', templatename ='".$templateName."', subject ='".$subject."', description ='".$description."', body ='".$body."' where templateid =".$templateid;
 	$adb->query($sql);
  
 	$log->info("about to invoke the detailviewemailtemplate file");  
@@ -42,7 +42,7 @@
 else
 {
 	$templateid = $db->getUniqueID('emailtemplates');
-	$sql = "insert into emailtemplates values ('". $folderName. "','".$templateName."','".$subject."','".$description."','".$body."',0,".$templateid.")";
+	$sql = "insert into vtiger_emailtemplates values ('". $folderName. "','".$templateName."','".$subject."','".$description."','".$body."',0,".$templateid.")";
 	$adb->query($sql);
 
 	 $log->info("added to the db the emailtemplate");

Modified: vtigercrm/trunk/modules/Users/savetermsandconditions.php
==============================================================================
--- vtigercrm/trunk/modules/Users/savetermsandconditions.php (original)
+++ vtigercrm/trunk/modules/Users/savetermsandconditions.php Mon Jun 12 14:26:25 2006
@@ -14,17 +14,17 @@
 $inv_type='Inventory';
 $inv_tandc=$_REQUEST['inventory_tandc'];
 
-$sql="select * from inventory_tandc where type='".$inv_type."'";
+$sql="select * from vtiger_inventory_tandc where type='".$inv_type."'";
 $result = $adb->query($sql);
 $inv_id = $adb->query_result($result,0,'id');
 if($inv_id == '')
 {
         $inv_id=$adb->getUniqueID('inventory_tandc');
-        $sql="insert into inventory_tandc values( '".$inv_id ."','".$inv_type."','". $inv_tandc."')";
+        $sql="insert into vtiger_inventory_tandc values( '".$inv_id ."','".$inv_type."','". $inv_tandc."')";
 }
 else
 {
-	$sql="update inventory_tandc set type = '".$inv_type."', tandc = '".$inv_tandc."' where id = ".$inv_id;
+	$sql="update vtiger_inventory_tandc set type = '".$inv_type."', tandc = '".$inv_tandc."' where id = ".$inv_id;
 }
 $adb->query($sql);
 

Modified: vtigercrm/trunk/modules/Users/updateLeadDBStatus.php
==============================================================================
--- vtigercrm/trunk/modules/Users/updateLeadDBStatus.php (original)
+++ vtigercrm/trunk/modules/Users/updateLeadDBStatus.php Mon Jun 12 14:26:25 2006
@@ -32,7 +32,7 @@
 		if(isPermitted($return_module,'EditView',$id) == 'yes')
 		{
 			if($id != '') {
-				$sql = "update crmentity set modifiedby=".$current_user->id.",smownerid='" .$idval ."', modifiedtime=".$adb->formatString("crmentity","modifiedtime",$date_var)." where crmid='" .$id."'";
+				$sql = "update vtiger_crmentity set modifiedby=".$current_user->id.",smownerid='" .$idval ."', modifiedtime=".$adb->formatString("crmentity","modifiedtime",$date_var)." where crmid='" .$id."'";
 				$result = $adb->query($sql);
 			}
 		}
@@ -49,9 +49,9 @@
 		if(isPermitted($return_module,'EditView',$id) == 'yes')
 		{
 			if($id != '') {
-				$sql = "update leaddetails set leadstatus='" .$leadstatusval ."' where leadid='" .$id."'";
+				$sql = "update vtiger_leaddetails set vtiger_leadstatus='" .$leadstatusval ."' where leadid='" .$id."'";
 				$result = $adb->query($sql);
-				$query = "update crmentity set modifiedby=".$current_user->id.",modifiedtime=".$adb->formatString("crmentity","modifiedtime",$date_var)." where crmid=".$id;
+				$query = "update vtiger_crmentity set modifiedby=".$current_user->id.",modifiedtime=".$adb->formatString("crmentity","modifiedtime",$date_var)." where crmid=".$id;
 				$result1 = $adb->query($query);
 			}
 		}

Modified: vtigercrm/trunk/modules/Users/updateNotificationSchedulers.php
==============================================================================
--- vtigercrm/trunk/modules/Users/updateNotificationSchedulers.php (original)
+++ vtigercrm/trunk/modules/Users/updateNotificationSchedulers.php Mon Jun 12 14:26:25 2006
@@ -23,7 +23,7 @@
 
 global $adb;
 $flag=0;
-//pass the table id as a parameter and then update directly instead of using the name field 
+//pass the vtiger_table id as a parameter and then update directly instead of using the name vtiger_field 
 for ($i=1;$i<10;$i++)
 {
   if($_POST[$i] == 'on')
@@ -34,7 +34,7 @@
   {
     $flag=0;
   }
- $sql = "update notificationscheduler set active=".$flag."  where schedulednotificationid=".$i;
+ $sql = "update vtiger_notificationscheduler set active=".$flag."  where schedulednotificationid=".$i;
  
  $adb->query($sql);
 }

Modified: vtigercrm/trunk/modules/Utilities/Merge.php
==============================================================================
--- vtigercrm/trunk/modules/Utilities/Merge.php (original)
+++ vtigercrm/trunk/modules/Utilities/Merge.php Mon Jun 12 14:26:25 2006
@@ -18,7 +18,7 @@
 $mergeFileName = $_REQUEST['mergefile'];
 //get the particular file from db and store it in the local hard disk.
 //store the path to the location where the file is stored and pass it  as parameter to the method 
-$sql = "select filename,data,filesize from wordtemplatestorage where filename='".$mergeFileName."'";
+$sql = "select filename,data,filesize from vtiger_wordtemplatestorage where filename='".$mergeFileName."'";
 
 $result = $adb->query($sql);
 $temparray = $adb->fetch_array($result);

Modified: vtigercrm/trunk/modules/Vendors/Vendor.php
==============================================================================
--- vtigercrm/trunk/modules/Vendors/Vendor.php (original)
+++ vtigercrm/trunk/modules/Vendors/Vendor.php Mon Jun 12 14:26:25 2006
@@ -22,17 +22,17 @@
 	var $db;
 
 
-	// Stored fields
+	// Stored vtiger_fields
 	var $id;
 	var $mode;
 
-	var $tab_name = Array('crmentity','vendor','vendorcf');
-	var $tab_name_index = Array('crmentity'=>'crmid','vendor'=>'vendorid','vendorcf'=>'vendorid');
+	var $tab_name = Array('vtiger_crmentity','vtiger_vendor','vtiger_vendorcf');
+	var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_vendor'=>'vendorid','vtiger_vendorcf'=>'vendorid');
 	var $column_fields = Array();
 
 	var $sortby_fields = Array('vendorname','category');		  
 
-        // This is the list of fields that are in the lists.
+        // This is the list of vtiger_fields that are in the lists.
 	var $list_fields = Array(
                                 'Vendor Name'=>Array('vendor'=>'vendorname'),
                                 'Phone'=>Array('vendor'=>'phone'),
@@ -84,7 +84,7 @@
 
 		$returnset = '&return_module=Vendors&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,vendor.vendorname from products inner join crmentity on crmentity.crmid = products.productid left outer join vendor on vendor.vendorid = products.vendor_id where vendor.vendorid = '.$id.' and crmentity.deleted = 0';
+		$query = 'select vtiger_products.productid, vtiger_products.productname, vtiger_products.productcode, vtiger_products.commissionrate, vtiger_products.qty_per_unit, vtiger_products.unit_price, vtiger_crmentity.crmid, vtiger_crmentity.smownerid,vtiger_vendor.vendorname from vtiger_products inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_products.productid left outer join vtiger_vendor on vtiger_vendor.vendorid = vtiger_products.vendor_id where vtiger_vendor.vendorid = '.$id.' and vtiger_crmentity.deleted = 0';
 		$log->debug("Exiting get_products method ...");
 		return GetRelatedList('Vendors','Products',$focus,$query,$button,$returnset);
 	}
@@ -100,7 +100,7 @@
 
 		$returnset = '&return_module=Vendors&return_action=DetailView&return_id='.$id;
 
-		$query = "select crmentity.*, purchaseorder.*,vendor.vendorname from purchaseorder inner join crmentity on crmentity.crmid=purchaseorder.purchaseorderid left outer join vendor on purchaseorder.vendorid=vendor.vendorid left join pogrouprelation on purchaseorder.purchaseorderid=pogrouprelation.purchaseorderid left join groups on groups.groupname=pogrouprelation.groupname where crmentity.deleted=0 and purchaseorder.vendorid=".$id;
+		$query = "select vtiger_crmentity.*, vtiger_purchaseorder.*,vtiger_vendor.vendorname from vtiger_purchaseorder inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_purchaseorder.purchaseorderid left outer join vtiger_vendor on vtiger_purchaseorder.vendorid=vtiger_vendor.vendorid left join vtiger_pogrouprelation on vtiger_purchaseorder.purchaseorderid=vtiger_pogrouprelation.purchaseorderid left join vtiger_groups on vtiger_groups.groupname=vtiger_pogrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_purchaseorder.vendorid=".$id;
 		$log->debug("Exiting get_purchase_orders method ...");
 		return GetRelatedList('Vendors','PurchaseOrder',$focus,$query,$button,$returnset);
 	}
@@ -115,7 +115,7 @@
 		$button = '';
 		$returnset = '&return_module=Vendors&return_action=DetailView&return_id='.$id;
 
-		$query = 'SELECT contactdetails.*, crmentity.crmid, crmentity.smownerid,vendorcontactrel.vendorid from contactdetails inner join crmentity on crmentity.crmid = contactdetails.contactid  inner join vendorcontactrel on vendorcontactrel.contactid=contactdetails.contactid left join contactgrouprelation on contactdetails.contactid=contactgrouprelation.contactid left join groups on groups.groupname=contactgrouprelation.groupname where crmentity.deleted=0 and vendorcontactrel.vendorid = '.$id;
+		$query = 'SELECT vtiger_contactdetails.*, vtiger_crmentity.crmid, vtiger_crmentity.smownerid,vtiger_vendorcontactrel.vendorid from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid  inner join vtiger_vendorcontactrel on vtiger_vendorcontactrel.contactid=vtiger_contactdetails.contactid left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid left join vtiger_groups on vtiger_groups.groupname=vtiger_contactgrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_vendorcontactrel.vendorid = '.$id;
 		$log->debug("Exiting get_contacts method ...");
 		return GetRelatedList('Vendor','Contacts',$focus,$query,$button,$returnset);
 

Modified: vtigercrm/trunk/modules/Vendors/updateRelations.php
==============================================================================
--- vtigercrm/trunk/modules/Vendors/updateRelations.php (original)
+++ vtigercrm/trunk/modules/Vendors/updateRelations.php Mon Jun 12 14:26:25 2006
@@ -21,9 +21,9 @@
 	{
 		if($id != '')
 		{
-			$sql = "insert into vendorcontactrel values (".$_REQUEST["parentid"].",".$id.")";
+			$sql = "insert into vtiger_vendorcontactrel values (".$_REQUEST["parentid"].",".$id.")";
 			$adb->query($sql);
-			$sql = "insert into seproductsrel values (". $_REQUEST["parentid"] .",".$id.")";
+			$sql = "insert into vtiger_seproductsrel values (". $_REQUEST["parentid"] .",".$id.")";
 			$adb->query($sql);
 		}
 	}
@@ -33,9 +33,9 @@
 elseif(isset($_REQUEST['entityid']) && $_REQUEST['entityid'] != '')
 {
 
-		$sql = "insert into vendorcontactrel values (".$_REQUEST['parid'].",".$_REQUEST['entityid'].")";
+		$sql = "insert into vtiger_vendorcontactrel values (".$_REQUEST['parid'].",".$_REQUEST['entityid'].")";
 		$adb->query($sql);
-		$sql = "insert into seproductsrel values (". $_REQUEST["parid"] .",".$_REQUEST["entityid"] .")";
+		$sql = "insert into vtiger_seproductsrel values (". $_REQUEST["parid"] .",".$_REQUEST["entityid"] .")";
 		$adb->query($sql);
  		header("Location:index.php?action=CallRelatedList&module=Vendors&record=".$_REQUEST["parid"]);
 }

Modified: vtigercrm/trunk/modules/Webmails/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/Webmails/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/Webmails/CallRelatedList.php Mon Jun 12 14:26:25 2006
@@ -52,21 +52,21 @@
 $block["Leads"]= "";
 global $adb;
 if($email->relationship != 0 && $email->relationship["type"] == "Leads") {
-	$q = "SELECT leaddetails.firstname, leaddetails.lastname, leaddetails.email, leaddetails.company, crmentity.smownerid from leaddetails left join crmentity on crmentity.crmid=leaddetails.leadid WHERE leaddetails.leadid='".$email->relationship["id"]."'";
+	$q = "SELECT vtiger_leaddetails.firstname, vtiger_leaddetails.lastname, vtiger_leaddetails.email, vtiger_leaddetails.company, vtiger_crmentity.smownerid from vtiger_leaddetails left join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_leaddetails.leadid WHERE vtiger_leaddetails.leadid='".$email->relationship["id"]."'";
 	$rs = $adb->query($q);
 	$block["Leads"]["header"]= array("0"=>"First Name","1"=>"Last Name","2"=>"Company Name","3"=>"Email Address","4"=>"Assigned To");
 	$block["Leads"]["entries"]= array("0"=>array($adb->query_result($rs,0,'firstname'),"1"=>$adb->query_result($rs,0,'lastname'),2=>$adb->query_result($rs,0,'company'),3=>$adb->query_result($rs,0,'email'),4=>$adb->query_result($rs,0,'smownerid')));
 }
 $block["Contacts"]= "";
 if($email->relationship != 0 && $email->relationship["type"] == "Contacts") {
-	$q = "SELECT contactdetails.firstname, contactdetails.lastname, contactdetails.email, contactdetails.title, crmentity.smownerid from contactdetails left join crmentity on crmentity.crmid=contactdetails.contactid WHERE contactdetails.contactid='".$email->relationship["id"]."'";
+	$q = "SELECT vtiger_contactdetails.firstname, vtiger_contactdetails.lastname, vtiger_contactdetails.email, vtiger_contactdetails.title, vtiger_crmentity.smownerid from vtiger_contactdetails left join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_contactdetails.contactid WHERE vtiger_contactdetails.contactid='".$email->relationship["id"]."'";
 	$rs = $adb->query($q);
 	$block["Contacts"]["header"]= array("0"=>"First Name","1"=>"Last Name","2"=>"Title","3"=>"Email Address","4"=>"Assigned To");
 	$block["Contacts"]["entries"]= array("0"=>array($adb->query_result($rs,0,'firstname'),"1"=>$adb->query_result($rs,0,'lastname'),2=>$adb->query_result($rs,0,'title'),3=>$adb->query_result($rs,0,'email'),4=>$adb->query_result($rs,0,'smownerid')));
 }
 $block["Accounts"]= "";
 if($email->relationship != 0 && $email->relationship["type"] == "Accounts") {
-	$q = "SELECT acccount.accountname, account.email1, account.website, account.industry, crmentity.smownerid from account left join crmentity on crmentity.crmid=account.accountid WHERE account.accountid='".$email->relationship["id"]."'";
+	$q = "SELECT acccount.accountname, vtiger_account.email1, vtiger_account.website, vtiger_account.industry, vtiger_crmentity.smownerid from vtiger_account left join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_account.accountid WHERE vtiger_account.accountid='".$email->relationship["id"]."'";
 	$rs = $adb->query($q);
 	$block["Accounts"]["header"]= array("0"=>"Account Name","1"=>"Email","2"=>"Web Site","3"=>"Industry","4"=>"Assigned To");
 	$block["Accounts"]["entries"]= array("0"=>array($adb->query_result($rs,0,'accountname'),"1"=>$adb->query_result($rs,0,'email'),2=>$adb->query_result($rs,0,'website'),3=>$adb->query_result($rs,0,'industry'),4=>$adb->query_result($rs,0,'smownerid')));

Modified: vtigercrm/trunk/modules/Webmails/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Webmails/ListView.php (original)
+++ vtigercrm/trunk/modules/Webmails/ListView.php Mon Jun 12 14:26:25 2006
@@ -150,7 +150,7 @@
  	global $mbox,$displayed_msgs,$show_hidden,$new_msgs;
 
   	$num = $mails[$start_message]->msgno;
-  	// TODO: scan the current db tables to find a
+  	// TODO: scan the current db vtiger_tables to find a
   	// matching email address that will make a good
   	// candidate for record_id
   	// this module will also need to be able to associate to any entity type

Modified: vtigercrm/trunk/modules/Webmails/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Webmails/Save.php (original)
+++ vtigercrm/trunk/modules/Webmails/Save.php Mon Jun 12 14:26:25 2006
@@ -76,8 +76,8 @@
 $focus->column_fields["description"]=$msgData;
 
 
-//to save the email details in emaildetails tables
-$fieldid = $adb->query_result($adb->query('select fieldid from field where tablename="contactdetails" and fieldname="email" and columnname="email"'),0,'fieldid');
+//to save the email details in vtiger_emaildetails vtiger_tables
+$fieldid = $adb->query_result($adb->query('select vtiger_fieldid from vtiger_field where vtiger_tablename="contactdetails" and vtiger_fieldname="email" and columnname="email"'),0,'fieldid');
 if($email->relationship != 0) {
 	$focus->column_fields['parent_id']=$email->relationship["id"].'@'.$fieldid.'|';
 
@@ -96,7 +96,7 @@
 }
 
 function add_attachment_to_contact($cid,$email) {
-	// add attachments to contact
+	// add vtiger_attachments to contact
 	global $adb,$current_user;
 	for($j=0;$j<2;$j++) {
 	    if($j==0)
@@ -113,16 +113,16 @@
         	$filetype= substr($filename,strstr($filename,"."),strlen($filename));
 		$filesize = $attachments[$i]["filesize"];
 
-                $query = "insert into crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime) values('";
+                $query = "insert into vtiger_crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime) values('";
                 $query .= $current_id."','".$current_user->id."','".$current_user->id."','Contacts Attachment','Uploaded from webmail during qualification','".$date_var."')";
                 $result = $adb->query($query);
 
-                $sql = "insert into attachments values(";
+                $sql = "insert into vtiger_attachments values(";
                 $sql .= $current_id.",'".$filename."','Uploaded ".$filename." from webmail','".$filetype."','".$upload_filepath."')";
 		echo $query;
                 $result = $adb->query($sql);
 
-                $sql1 = "insert into seattachmentsrel values('";
+                $sql1 = "insert into vtiger_seattachmentsrel values('";
                 $sql1 .= $cid."','".$current_id."')";
                 $result = $adb->query($sql1);
 
@@ -136,10 +136,10 @@
 $_REQUEST['parent_id'] = $focus->column_fields['parent_id'];
 $focus->save("Emails");
 
-//saving in emaildetails table
+//saving in vtiger_emaildetails vtiger_table
 $id_lists = $focus->column_fields['parent_id'].'@'.$fieldid;
 $all_to_ids = $email->from;
-$query = 'insert into emaildetails values ('.$focus->id.',"","'.$all_to_ids.'","","","","'.$id_lists.'","WEBMAIL")';
+$query = 'insert into vtiger_emaildetails values ('.$focus->id.',"","'.$all_to_ids.'","","","","'.$id_lists.'","WEBMAIL")';
 $adb->query($query);
 
 $return_id = $_REQUEST["mailid"];

Modified: vtigercrm/trunk/modules/Webmails/Webmail.php
==============================================================================
--- vtigercrm/trunk/modules/Webmails/Webmail.php (original)
+++ vtigercrm/trunk/modules/Webmails/Webmail.php Mon Jun 12 14:26:25 2006
@@ -137,21 +137,21 @@
 function find_relationships($db,$from) {
 
 	// leads search
-	$sql = "SELECT * from leaddetails left join crmentity on crmentity.crmid=leaddetails.leadid where leaddetails.email = '".$from."' AND crmentity.deleted='0'";
+	$sql = "SELECT * from vtiger_leaddetails left join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_leaddetails.leadid where vtiger_leaddetails.email = '".$from."' AND vtiger_crmentity.deleted='0'";
 	$res = $db->query($sql,true,"Error: "."<BR>$query");
 	$numRows = $db->num_rows($res);
 	if($numRows > 0)
 		return array('type'=>"Leads",'id'=>$db->query_result($res,0,"leadid"),'name'=>$db->query_result($res,0,"firstname")." ".$db->query_result($res,0,"lastname"));
 
 	// contacts search
-	$sql = "SELECT * from contactdetails left join crmentity on crmentity.crmid=contactdetails.contactid where contactdetails.email = '".$from."'  AND crmentity.deleted='0'";
+	$sql = "SELECT * from vtiger_contactdetails left join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_contactdetails.contactid where vtiger_contactdetails.email = '".$from."'  AND vtiger_crmentity.deleted='0'";
 	$res = $db->query($sql,true,"Error: "."<BR>$query");
 	$numRows = $db->num_rows($res);
 	if($numRows > 0)
 		return array('type'=>"Contacts",'id'=>$db->query_result($res,0,"contactid"),'name'=>$db->query_result($res,0,"firstname")." ".$db->query_result($res,0,"lastname"));
 
-	// accounts search
-	$sql = "SELECT * from account left join crmentity on crmentity.crmid=account.accountid where account.email1 = '".$from."' OR account.email1='".$from."'  AND crmentity.deleted='0'";
+	// vtiger_accounts search
+	$sql = "SELECT * from vtiger_account left join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_account.accountid where vtiger_account.email1 = '".$from."' OR vtiger_account.email1='".$from."'  AND vtiger_crmentity.deleted='0'";
 	$res = $db->query($sql,true,"Error: "."<BR>$query");
 	$numRows = $db->num_rows($res);
 	if($numRows > 0)
@@ -262,7 +262,7 @@
         $content = array();
         $i = 0;
         if (!$parts) { /* Simple message, only 1 piece */
-         $attachment = array(); /* No attachments */
+         $attachment = array(); /* No vtiger_attachments */
          $bod=imap_body($mbox, $mailid);
          if(preg_match("/\<br\>/",$bod))
                 	$content['body'] = $bod;

Modified: vtigercrm/trunk/modules/Webmails/dlAttachments.php
==============================================================================
--- vtigercrm/trunk/modules/Webmails/dlAttachments.php (original)
+++ vtigercrm/trunk/modules/Webmails/dlAttachments.php Mon Jun 12 14:26:25 2006
@@ -44,7 +44,7 @@
 	echo "</table><br><br>";
 
 } elseif (count(attachments) == 0 && count($inline) == 0) {
-	echo "<center><strong>No attachments for this email</strong></center><br><br>";
+	echo "<center><strong>No vtiger_attachments for this email</strong></center><br><br>";
 } else {
 
 global $root_directory;

Modified: vtigercrm/trunk/modules/Webmails/images/index.php
==============================================================================
--- vtigercrm/trunk/modules/Webmails/images/index.php (original)
+++ vtigercrm/trunk/modules/Webmails/images/index.php Mon Jun 12 14:26:25 2006
@@ -11,7 +11,7 @@
 /**
  ** index.php
  **
- ** This file simply takes any attempt to view source files
+ ** This file simply takes any attempt to view source vtiger_files
  ** and sends those people to the login screen. At this
  ** point no attempt is made to see if the person is logged
  ** or not.

Modified: vtigercrm/trunk/modules/Webmails/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Webmails/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Webmails/language/en_us.lang.php Mon Jun 12 14:26:25 2006
@@ -32,7 +32,7 @@
 'LBL_MOVE_TO'=>'Move To',
 'LBL_DELETE'=>'Delete',
 
-'ERR_DELETE_RECORD'=>"A record number must be specified to delete the account.",
+'ERR_DELETE_RECORD'=>"A record number must be specified to delete the vtiger_account.",
 'LBL_DATE_SENT'=>'Date Sent:',
 'LBL_SUBJECT'=>'Subject :',
 'LBL_DATE_AND_TIME'=>'Date & Time Sent:',
@@ -100,7 +100,7 @@
 'LBL_NEW_ACCOUNT'=>'New Account',
 'LBL_ACCOUNT_TITLE'=>'Accounts',
 
-// Added fields after vtiger4 - Beta
+// Added vtiger_fields after vtiger4 - Beta
 'LBL_USER_TITLE'=>'Users',
 'LBL_NEW_USER'=>'New User',
 

Modified: vtigercrm/trunk/soap/contactserialize.php
==============================================================================
--- vtigercrm/trunk/soap/contactserialize.php (original)
+++ vtigercrm/trunk/soap/contactserialize.php Mon Jun 12 14:26:25 2006
@@ -325,7 +325,7 @@
 
 //end code for mail merge
 
-//Field array for troubletickets
+//Field array for vtiger_troubletickets
 
 $server->wsdl->addComplexType(
 	'tickets_list_array',
@@ -1018,7 +1018,7 @@
 {
 	global $adb;
 	$output = Array();
-	$sql = "select * from products inner join crmentity on crmentity.crmid=products.productid where crmentity.deleted=0";
+	$sql = "select * from vtiger_products inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_products.productid where vtiger_crmentity.deleted=0";
 	$result = $adb->query($sql);
 	$noofrows = $adb->num_rows($result);
 	for($i=0;$i<$noofrows;$i++)
@@ -1027,26 +1027,26 @@
                 $output['productname']['productname'][$i] = $adb->query_result($result,$i,"productname");
         }
 
-	$result1 = $adb->query("select * from ticketpriorities");
+	$result1 = $adb->query("select * from vtiger_ticketpriorities");
 	for($i=0;$i<$adb->num_rows($result1);$i++)
 	{
 		$output['ticketpriorities']['ticketpriorities'][$i] = $adb->query_result($result1,$i,"ticketpriorities");
 	}
 
-        $result2 = $adb->query("select * from ticketseverities");
+        $result2 = $adb->query("select * from vtiger_ticketseverities");
         for($i=0;$i<$adb->num_rows($result2);$i++)
         {
                 $output['ticketseverities']['ticketseverities'][$i] = $adb->query_result($result2,$i,"ticketseverities");
         }
 
-        $result3 = $adb->query("select * from ticketcategories");
+        $result3 = $adb->query("select * from vtiger_ticketcategories");
         for($i=0;$i<$adb->num_rows($result3);$i++)
         {
                 $output['ticketcategories']['ticketcategories'][$i] = $adb->query_result($result3,$i,"ticketcategories");
         }
 
 	//Added to get the modules list -- september 10 2005
-        $sql2 = "select moduleowners.*,tab.name from moduleowners inner join tab on moduleowners.tabid = tab.tabid order by tab.tabsequence";
+        $sql2 = "select vtiger_moduleowners.*,vtiger_tab.name from vtiger_moduleowners inner join vtiger_tab on vtiger_moduleowners.tabid = vtiger_tab.tabid order by vtiger_tab.tabsequence";
         $result4 = $adb->query($sql2);
 	for($i=0;$i<$adb->num_rows($result4);$i++)
         {
@@ -1059,7 +1059,7 @@
 {
 	global $adb;
 
-	$category_query = "select * from faqcategories";
+	$category_query = "select * from vtiger_faqcategories";
 	$category_result = $adb->query($category_query);
 	$category_noofrows = $adb->num_rows($category_result);
 	for($j=0;$j<$category_noofrows;$j++)
@@ -1068,7 +1068,7 @@
 		$result['faqcategory'][$j] = $faqcategory;
 	}
 
-	$product_query = "select * from products inner join crmentity on crmentity.crmid=products.productid where crmentity.deleted=0";
+	$product_query = "select * from vtiger_products inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_products.productid where vtiger_crmentity.deleted=0";
         $product_result = $adb->query($product_query);
         $product_noofrows = $adb->num_rows($product_result);
         for($i=0;$i<$product_noofrows;$i++)
@@ -1079,7 +1079,7 @@
                 $result['product'][$i]['productname'] = $productname;
 	}
 
-	$faq_query = "select faq.*, crmentity.createdtime, crmentity.modifiedtime from faq inner join crmentity on crmentity.crmid=faq.id where crmentity.deleted=0 and faq.status='Published' order by crmentity.modifiedtime DESC";
+	$faq_query = "select vtiger_faq.*, vtiger_crmentity.createdtime, vtiger_crmentity.modifiedtime from vtiger_faq inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_faq.id where vtiger_crmentity.deleted=0 and vtiger_faq.status='Published' order by vtiger_crmentity.modifiedtime DESC";
 	$faq_result = $adb->query($faq_query);
 	$faq_noofrows = $adb->num_rows($faq_result);
 	for($k=0;$k<$faq_noofrows;$k++)
@@ -1093,7 +1093,7 @@
 		$result['faq'][$k]['faqcreatedtime'] = $adb->query_result($faq_result,$k,'createdtime');
 		$result['faq'][$k]['faqmodifiedtime'] = $adb->query_result($faq_result,$k,'modifiedtime');
 
-		$faq_comment_query = "select * from faqcomments where faqid=".$faqid;
+		$faq_comment_query = "select * from vtiger_faqcomments where vtiger_faqid=".$faqid;
 		$faq_comment_result = $adb->query($faq_comment_query);
 		$faq_comment_noofrows = $adb->num_rows($faq_comment_result);
 		for($l=0;$l<$faq_comment_noofrows;$l++)
@@ -1141,7 +1141,7 @@
 {
 	global $adb;
 	$createdtime = date('Y-m-d H:i:s');
-	$faq_query = "insert into faqcomments values('',".$faqid.",'".$comment."','".$createdtime."')";
+	$faq_query = "insert into vtiger_faqcomments values('',".$faqid.",'".$comment."','".$createdtime."')";
 	$adb->query($faq_query);
 	$result = get_KBase_details('');
 	return $result;
@@ -1689,12 +1689,12 @@
 	$ticket->column_fields[parent_id]=$parent_id;
 	$ticket->column_fields[product_id]=$product_id;
 
-	//Added to get the user based on module from moduleowners -- 10-11-2005
+	//Added to get the user based on module from vtiger_moduleowners -- 10-11-2005
 	global $adb;
 	$user_id = 1;//Default admin user id
 	if($module != '')
 	{
-		$res = $adb->query("select moduleowners.*, tab.name from moduleowners inner join tab on moduleowners.tabid = tab.tabid where name='".$module."'");
+		$res = $adb->query("select vtiger_moduleowners.*, vtiger_tab.name from vtiger_moduleowners inner join vtiger_tab on vtiger_moduleowners.tabid = vtiger_tab.tabid where name='".$module."'");
 		if($adb->num_rows($res) > 0)
 		{
 			$user_id = $adb->query_result($res,0,"user_id");
@@ -1710,18 +1710,18 @@
 	$contents = ' Ticket ID : '.$ticket->id.'<br> Ticket Title : '.$title.'<br><br>'.$description;
 
 	require_once('modules/Emails/mail.php');
-	//get the contact email id who creates the ticket from portal and use this email as from email id in email
-	$result = $adb->query("select email from contactdetails where contactid=".$parent_id);
+	//get the contact email id who creates the ticket from vtiger_portal and use this email as from email id in email
+	$result = $adb->query("select email from vtiger_contactdetails where contactid=".$parent_id);
 	$contact_email = $adb->query_result($result,0,'email');
 	$from_email = $contact_email;
 
 	//send mail to assigned to user
 	$to_email = getUserEmailId('id',$user_id);
-	$adb->println("Send mail to the user who is the owner of the module about the portal ticket");
+	$adb->println("Send mail to the user who is the owner of the module about the vtiger_portal ticket");
 	$mail_status = send_mail('HelpDesk',$to_email,'',$from_email,$subject,$contents);
 
-	//send mail to the customer(contact who creates the ticket from portal)
-	$adb->println("Send mail to the customer(contact) who creates the portal ticket");
+	//send mail to the customer(contact who creates the ticket from vtiger_portal)
+	$adb->println("Send mail to the customer(contact) who creates the vtiger_portal ticket");
 	$mail_status = send_mail('Contacts',$contact_email,'',$from_email,$subject,$contents);
 
 	$tickets_list =  get_tickets_list($user_name,$parent_id); 
@@ -1750,16 +1750,16 @@
 {
 	global $adb;
 	$servercreatedtime = date("Y-m-d H:i:s");
-	$sql = "insert into ticketcomments values('',".$ticketid.",'".$comments."','".$ownerid."','customer','".$servercreatedtime."')";
+	$sql = "insert into vtiger_ticketcomments values('',".$ticketid.",'".$comments."','".$ownerid."','customer','".$servercreatedtime."')";
 	$adb->query($sql);
 
-	$updatequery = "update crmentity set modifiedtime = '".$servercreatedtime."' where crmid=".$ticketid;
+	$updatequery = "update vtiger_crmentity set modifiedtime = '".$servercreatedtime."' where crmid=".$ticketid;
 	$adb->query($updatequery);
 }
 function close_current_ticket($ticketid)
 {
 	global $adb;
-	$sql = "update troubletickets set status='Closed' where ticketid=".$ticketid;
+	$sql = "update vtiger_troubletickets set status='Closed' where ticketid=".$ticketid;
 	$result = $adb->query($sql);
 	if($result)
 		return "<br><b>Ticket status is updated as 'Closed'.</b>";
@@ -1770,7 +1770,7 @@
 {
 	global $adb;
 	$current_date = date("Y-m-d");
-	$sql = "select id, user_name, user_password,last_login_time, support_start_date, support_end_date from portalinfo inner join customerdetails on portalinfo.id=customerdetails.customerid where user_name='".$username."' and user_password = '".$password."' and isactive=1 and customerdetails.support_end_date >= '".$current_date."'";
+	$sql = "select id, user_name, user_password,last_login_time, support_start_date, support_end_date from vtiger_portalinfo inner join vtiger_customerdetails on vtiger_portalinfo.id=vtiger_customerdetails.customerid where user_name='".$username."' and user_password = '".$password."' and isactive=1 and vtiger_customerdetails.support_end_date >= '".$current_date."'";
 	$result = $adb->query($sql);	
 	$list['id'] = $adb->query_result($result,0,'id');
 	$list['user_name'] = $adb->query_result($result,0,'user_name');
@@ -1784,7 +1784,7 @@
 function change_password($id,$username,$password)
 {
 	global $adb;
-	$sql = "update portalinfo set user_password='".$password."' where id=".$id." and user_name='".$username."'";
+	$sql = "update vtiger_portalinfo set user_password='".$password."' where id=".$id." and user_name='".$username."'";
 	$result = $adb->query($sql);
 
 	$list = authenticate_user($username,$password);
@@ -1798,17 +1798,17 @@
 
 	if($flag == 'login')
 	{
-	        $sql = "update portalinfo set login_time='".$current_time."' where id=".$id;
+	        $sql = "update vtiger_portalinfo set login_time='".$current_time."' where id=".$id;
 	        $result = $adb->query($sql);
 	}
 	elseif($flag == 'logout')
 	{
-		$sql = "select * from portalinfo where id=".$id;
+		$sql = "select * from vtiger_portalinfo where id=".$id;
                 $result = $adb->query($sql);
                 if($adb->num_rows($result) != 0)
                         $last_login = $adb->query_result($result,0,'login_time');
 
-		$sql = "update portalinfo set logout_time = '".$current_time."', last_login_time='".$last_login."' where id=".$id;
+		$sql = "update vtiger_portalinfo set logout_time = '".$current_time."', last_login_time='".$last_login."' where id=".$id;
 		$result = $adb->query($sql);
 	}
 
@@ -1819,12 +1819,12 @@
 	global $adb;
         include("modules/Emails/class.phpmailer.php");
 
-	$sql = "select * from portalinfo  where user_name='".$mailid."'";
+	$sql = "select * from vtiger_portalinfo  where user_name='".$mailid."'";
 	$user_name = $adb->query_result($adb->query($sql),0,'user_name');
 	$password = $adb->query_result($adb->query($sql),0,'user_password');
 	$isactive = $adb->query_result($adb->query($sql),0,'isactive');
 
-	$fromquery = "select users.user_name, users.email1 from users inner join crmentity on users.id = crmentity.smownerid inner join contactdetails on contactdetails.contactid=crmentity.crmid where contactdetails.email ='".$mailid."'";
+	$fromquery = "select vtiger_users.user_name, vtiger_users.email1 from vtiger_users inner join vtiger_crmentity on vtiger_users.id = vtiger_crmentity.smownerid inner join vtiger_contactdetails on vtiger_contactdetails.contactid=vtiger_crmentity.crmid where vtiger_contactdetails.email ='".$mailid."'";
 	$initialfrom = $adb->query_result($adb->query($fromquery),0,'user_name');
 	$from = $adb->query_result($adb->query($fromquery),0,'email1');
 
@@ -1838,7 +1838,7 @@
         $mail->Body    = $contents;
         $mail->IsSMTP();
 
-        $mailserverresult=$adb->query("select * from systems where server_type='email'");
+        $mailserverresult=$adb->query("select * from vtiger_systems where server_type='email'");
         $mail_server = $adb->query_result($mailserverresult,0,'server');
         $mail_server_username = $adb->query_result($mailserverresult,0,'server_username');
         $mail_server_password = $adb->query_result($mailserverresult,0,'server_password');
@@ -1875,7 +1875,7 @@
 		return "false@@@<b>Mail could not be sent</b>";
 	}
 	else
-		return "true@@@<b>Mail has been sent to your mail id with the customer portal login details</b>";
+		return "true@@@<b>Mail has been sent to your mail id with the customer vtiger_portal login details</b>";
 
 }
 
@@ -1915,7 +1915,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 vtiger_contactdetails.contactid as contactid from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_contactdetails.contactid where vtiger_crmentity.deleted=0 and vtiger_contactdetails.firstname like '".$first_name ."' and vtiger_contactdetails.lastname like '" .$last_name ."'";
 
 
 
@@ -1962,7 +1962,7 @@
         return null;
     }
 
-    $query = "select account.accountname accountname,account.accountid accountid from account inner join crmentity on crmentity.crmid=account.accountid where crmentity.deleted=0 and account.accountname='" .$account_name."'";
+    $query = "select vtiger_account.accountname vtiger_accountname,vtiger_account.accountid vtiger_accountid from vtiger_account inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_account.accountid where vtiger_crmentity.deleted=0 and vtiger_account.accountname='" .$account_name."'";
 
 
 	$db = new PearDatabase();
@@ -2000,7 +2000,7 @@
 {
 	//global $log;
 	
-	//todo make the activity body not be html encoded
+	//todo make the vtiger_activity body not be html encoded
 	//$log->fatal("In Create contact: username: $user_name first/last/email ($first_name, $last_name, $email_address)");
 	
 	global $current_user;

Modified: vtigercrm/trunk/soap/customerportal.php
==============================================================================
--- vtigercrm/trunk/soap/customerportal.php (original)
+++ vtigercrm/trunk/soap/customerportal.php Mon Jun 12 14:26:25 2006
@@ -25,7 +25,7 @@
 
 
 
-//Field array for troubletickets
+//Field array for vtiger_troubletickets
 $server->wsdl->addComplexType(
 	'tickets_list_array',
 	'complexType',
@@ -148,7 +148,7 @@
              )
 );
 
-//Added for ticket attachments
+//Added for ticket vtiger_attachments
 $server->wsdl->addComplexType(
         'get_ticket_attachments_array',
         'complexType',
@@ -291,7 +291,7 @@
 {
 	global $adb;
 	$output = Array();
-	$sql = "select * from products inner join crmentity on crmentity.crmid=products.productid where crmentity.deleted=0";
+	$sql = "select * from vtiger_products inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_products.productid where vtiger_crmentity.deleted=0";
 	$result = $adb->query($sql);
 	$noofrows = $adb->num_rows($result);
 	for($i=0;$i<$noofrows;$i++)
@@ -300,26 +300,26 @@
                 $output['productname']['productname'][$i] = $adb->query_result($result,$i,"productname");
         }
 
-	$result1 = $adb->query("select * from ticketpriorities");
+	$result1 = $adb->query("select * from vtiger_ticketpriorities");
 	for($i=0;$i<$adb->num_rows($result1);$i++)
 	{
 		$output['ticketpriorities']['ticketpriorities'][$i] = $adb->query_result($result1,$i,"ticketpriorities");
 	}
 
-        $result2 = $adb->query("select * from ticketseverities");
+        $result2 = $adb->query("select * from vtiger_ticketseverities");
         for($i=0;$i<$adb->num_rows($result2);$i++)
         {
                 $output['ticketseverities']['ticketseverities'][$i] = $adb->query_result($result2,$i,"ticketseverities");
         }
 
-        $result3 = $adb->query("select * from ticketcategories");
+        $result3 = $adb->query("select * from vtiger_ticketcategories");
         for($i=0;$i<$adb->num_rows($result3);$i++)
         {
                 $output['ticketcategories']['ticketcategories'][$i] = $adb->query_result($result3,$i,"ticketcategories");
         }
 
 	//Added to get the modules list -- september 10 2005
-        $sql2 = "select moduleowners.*,tab.name from moduleowners inner join tab on moduleowners.tabid = tab.tabid order by tab.tabsequence";
+        $sql2 = "select vtiger_moduleowners.*,vtiger_tab.name from vtiger_moduleowners inner join vtiger_tab on vtiger_moduleowners.tabid = vtiger_tab.tabid order by vtiger_tab.tabsequence";
         $result4 = $adb->query($sql2);
 	for($i=0;$i<$adb->num_rows($result4);$i++)
         {
@@ -332,7 +332,7 @@
 {
 	global $adb;
 
-	$category_query = "select * from faqcategories";
+	$category_query = "select * from vtiger_faqcategories";
 	$category_result = $adb->query($category_query);
 	$category_noofrows = $adb->num_rows($category_result);
 	for($j=0;$j<$category_noofrows;$j++)
@@ -341,7 +341,7 @@
 		$result['faqcategory'][$j] = $faqcategory;
 	}
 
-	$product_query = "select * from products inner join crmentity on crmentity.crmid=products.productid where crmentity.deleted=0";
+	$product_query = "select * from vtiger_products inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_products.productid where vtiger_crmentity.deleted=0";
         $product_result = $adb->query($product_query);
         $product_noofrows = $adb->num_rows($product_result);
         for($i=0;$i<$product_noofrows;$i++)
@@ -352,7 +352,7 @@
                 $result['product'][$i]['productname'] = $productname;
 	}
 
-	$faq_query = "select faq.*, crmentity.createdtime, crmentity.modifiedtime from faq inner join crmentity on crmentity.crmid=faq.id where crmentity.deleted=0 and faq.status='Published' order by crmentity.modifiedtime DESC";
+	$faq_query = "select vtiger_faq.*, vtiger_crmentity.createdtime, vtiger_crmentity.modifiedtime from vtiger_faq inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_faq.id where vtiger_crmentity.deleted=0 and vtiger_faq.status='Published' order by vtiger_crmentity.modifiedtime DESC";
 	$faq_result = $adb->query($faq_query);
 	$faq_noofrows = $adb->num_rows($faq_result);
 	for($k=0;$k<$faq_noofrows;$k++)
@@ -366,7 +366,7 @@
 		$result['faq'][$k]['faqcreatedtime'] = $adb->query_result($faq_result,$k,'createdtime');
 		$result['faq'][$k]['faqmodifiedtime'] = $adb->query_result($faq_result,$k,'modifiedtime');
 
-		$faq_comment_query = "select * from faqcomments where faqid=".$faqid." order by createdtime DESC";
+		$faq_comment_query = "select * from vtiger_faqcomments where vtiger_faqid=".$faqid." order by createdtime DESC";
 		$faq_comment_result = $adb->query($faq_comment_query);
 		$faq_comment_noofrows = $adb->num_rows($faq_comment_result);
 		for($l=0;$l<$faq_comment_noofrows;$l++)
@@ -389,7 +389,7 @@
 {
 	global $adb;
 	$createdtime = date('Y-m-d H:i:s');
-	$faq_query = "insert into faqcomments values('',".$faqid.",'".$comment."','".$createdtime."')";
+	$faq_query = "insert into vtiger_faqcomments values('',".$faqid.",'".$comment."','".$createdtime."')";
 	$adb->query($faq_query);
 	$result = get_KBase_details('');
 	return $result;
@@ -450,11 +450,11 @@
 	$ticket->column_fields[parent_id]=$parent_id;
 	$ticket->column_fields[product_id]=$product_id;
 
-	//Added to get the user based on module from moduleowners -- 10-11-2005
+	//Added to get the user based on module from vtiger_moduleowners -- 10-11-2005
 	$user_id = 1;//Default admin user id
 	if($module != '')
 	{
-		$res = $adb->query("select moduleowners.*, tab.name from moduleowners inner join tab on moduleowners.tabid = tab.tabid where name='".$module."'");
+		$res = $adb->query("select vtiger_moduleowners.*, vtiger_tab.name from vtiger_moduleowners inner join vtiger_tab on vtiger_moduleowners.tabid = vtiger_tab.tabid where name='".$module."'");
 		if($adb->num_rows($res) > 0)
 		{
 			$user_id = $adb->query_result($res,0,"user_id");
@@ -468,18 +468,18 @@
 	$subject = '[From Portal][ Ticket ID : '.$ticket->id.' ] '.$title;
 	$contents = ' Ticket ID : '.$ticket->id.'<br> Ticket Title : '.$title.'<br><br>'.$description;
 
-	//get the contact email id who creates the ticket from portal and use this email as from email id in email
-	$result = $adb->query("select email from contactdetails where contactid=".$parent_id);
+	//get the contact email id who creates the ticket from vtiger_portal and use this email as from email id in email
+	$result = $adb->query("select email from vtiger_contactdetails where contactid=".$parent_id);
 	$contact_email = $adb->query_result($result,0,'email');
 	$from_email = $contact_email;
 
 	//send mail to assigned to user
 	$to_email = getUserEmailId('id',$user_id);
-	$adb->println("Send mail to the user who is the owner of the module about the portal ticket");
+	$adb->println("Send mail to the user who is the owner of the module about the vtiger_portal ticket");
 	$mail_status = send_mail('HelpDesk',$to_email,'',$from_email,$subject,$contents);
 
-	//send mail to the customer(contact who creates the ticket from portal)
-	$adb->println("Send mail to the customer(contact) who creates the portal ticket");
+	//send mail to the customer(contact who creates the ticket from vtiger_portal)
+	$adb->println("Send mail to the customer(contact) who creates the vtiger_portal ticket");
 	$mail_status = send_mail('Contacts',$contact_email,'',$from_email,$subject,$contents);
 
 	$tickets_list =  get_tickets_list($user_name,$parent_id); 
@@ -508,17 +508,17 @@
 {
 	global $adb;
 	$servercreatedtime = date("Y-m-d H:i:s");
-	$sql = "insert into ticketcomments values('',".$ticketid.",'".$comments."','".$ownerid."','customer','".$servercreatedtime."')";
+	$sql = "insert into vtiger_ticketcomments values('',".$ticketid.",'".$comments."','".$ownerid."','customer','".$servercreatedtime."')";
 	$adb->query($sql);
 
-	$updatequery = "update crmentity set modifiedtime = '".$servercreatedtime."' where crmid=".$ticketid;
+	$updatequery = "update vtiger_crmentity set modifiedtime = '".$servercreatedtime."' where crmid=".$ticketid;
 	$adb->query($updatequery);
 }
 
 function close_current_ticket($ticketid)
 {
 	global $adb;
-	$sql = "update troubletickets set status='Closed' where ticketid=".$ticketid;
+	$sql = "update vtiger_troubletickets set status='Closed' where ticketid=".$ticketid;
 	$result = $adb->query($sql);
 	if($result)
 		return "<br><b>Ticket status is updated as 'Closed'.</b>";
@@ -529,7 +529,7 @@
 {
 	global $adb;
 	$current_date = date("Y-m-d");
-	$sql = "select id, user_name, user_password,last_login_time, support_start_date, support_end_date from portalinfo inner join customerdetails on portalinfo.id=customerdetails.customerid inner join crmentity on crmentity.crmid=portalinfo.id where crmentity.deleted=0 and user_name='".$username."' and user_password = '".$password."' and isactive=1 and customerdetails.support_end_date >= '".$current_date."'";
+	$sql = "select id, user_name, user_password,last_login_time, support_start_date, support_end_date from vtiger_portalinfo inner join vtiger_customerdetails on vtiger_portalinfo.id=vtiger_customerdetails.customerid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_portalinfo.id where vtiger_crmentity.deleted=0 and user_name='".$username."' and user_password = '".$password."' and isactive=1 and vtiger_customerdetails.support_end_date >= '".$current_date."'";
 	$result = $adb->query($sql);	
 	$list['id'] = $adb->query_result($result,0,'id');
 	$list['user_name'] = $adb->query_result($result,0,'user_name');
@@ -544,7 +544,7 @@
 function change_password($id,$username,$password)
 {
 	global $adb;
-	$sql = "update portalinfo set user_password='".$password."' where id=".$id." and user_name='".$username."'";
+	$sql = "update vtiger_portalinfo set user_password='".$password."' where id=".$id." and user_name='".$username."'";
 	$result = $adb->query($sql);
 
 	$list = authenticate_user($username,$password);
@@ -558,17 +558,17 @@
 
 	if($flag == 'login')
 	{
-	        $sql = "update portalinfo set login_time='".$current_time."' where id=".$id;
+	        $sql = "update vtiger_portalinfo set login_time='".$current_time."' where id=".$id;
 	        $result = $adb->query($sql);
 	}
 	elseif($flag == 'logout')
 	{
-		$sql = "select * from portalinfo where id=".$id;
+		$sql = "select * from vtiger_portalinfo where id=".$id;
                 $result = $adb->query($sql);
                 if($adb->num_rows($result) != 0)
                         $last_login = $adb->query_result($result,0,'login_time');
 
-		$sql = "update portalinfo set logout_time = '".$current_time."', last_login_time='".$last_login."' where id=".$id;
+		$sql = "update vtiger_portalinfo set logout_time = '".$current_time."', last_login_time='".$last_login."' where id=".$id;
 		$result = $adb->query($sql);
 	}
 
@@ -578,12 +578,12 @@
 {
 	global $adb;
 
-	$sql = "select * from portalinfo  where user_name='".$mailid."'";
+	$sql = "select * from vtiger_portalinfo  where user_name='".$mailid."'";
 	$user_name = $adb->query_result($adb->query($sql),0,'user_name');
 	$password = $adb->query_result($adb->query($sql),0,'user_password');
 	$isactive = $adb->query_result($adb->query($sql),0,'isactive');
 
-	$fromquery = "select users.user_name, users.email1 from users inner join crmentity on users.id = crmentity.smownerid inner join contactdetails on contactdetails.contactid=crmentity.crmid where contactdetails.email ='".$mailid."'";
+	$fromquery = "select vtiger_users.user_name, vtiger_users.email1 from vtiger_users inner join vtiger_crmentity on vtiger_users.id = vtiger_crmentity.smownerid inner join vtiger_contactdetails on vtiger_contactdetails.contactid=vtiger_crmentity.crmid where vtiger_contactdetails.email ='".$mailid."'";
 	$initialfrom = $adb->query_result($adb->query($fromquery),0,'user_name');
 	$from = $adb->query_result($adb->query($fromquery),0,'email1');
 
@@ -597,7 +597,7 @@
         $mail->Body    = $contents;
         $mail->IsSMTP();
 
-        $mailserverresult = $adb->query("select * from systems where server_type='email'");
+        $mailserverresult = $adb->query("select * from vtiger_systems where server_type='email'");
         $mail_server = $adb->query_result($mailserverresult,0,'server');
         $mail_server_username = $adb->query_result($mailserverresult,0,'server_username');
         $mail_server_password = $adb->query_result($mailserverresult,0,'server_password');
@@ -634,7 +634,7 @@
 		return "false@@@<b>Mail could not be sent</b>";
 	}
 	else
-		return "true@@@<b>Mail has been sent to your mail id with the customer portal login details</b>";
+		return "true@@@<b>Mail has been sent to your mail id with the customer vtiger_portal login details</b>";
 
 }
 
@@ -642,7 +642,7 @@
 {
 	global $adb;
 
-	$res = $adb->query("select smcreatorid from crmentity where crmid=".$ticketid);
+	$res = $adb->query("select smcreatorid from vtiger_crmentity where crmid=".$ticketid);
 	$creator = $adb->query_result($res,0,'smcreatorid');
 
 	return $creator;
@@ -663,13 +663,13 @@
 	return $picklist_array;
 }
 
-//Added function to get the attachments of the ticket
+//Added function to get the vtiger_attachments of the ticket
 function get_ticket_attachments($userid,$ticketid)
 {
 
 	global $adb;
 
-	$query = "select troubletickets.ticketid, attachments.* from troubletickets inner join seattachmentsrel on seattachmentsrel.crmid = troubletickets.ticketid inner join attachments on seattachmentsrel.attachmentsid = attachments.attachmentsid where troubletickets.ticketid=".$ticketid;
+	$query = "select vtiger_troubletickets.ticketid, vtiger_attachments.* from vtiger_troubletickets inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.crmid = vtiger_troubletickets.ticketid inner join vtiger_attachments on vtiger_seattachmentsrel.attachmentsid = vtiger_attachments.attachmentsid where vtiger_troubletickets.ticketid=".$ticketid;
 	$res = $adb->query($query);
 	$noofrows = $adb->num_rows($res);
 
@@ -678,7 +678,7 @@
 		$filename = $adb->query_result($res,$i,'name');
 		$filepath = $adb->query_result($res,$i,'path');
 
-		$filesize = filesize($filepath.$filename);
+		$filesize = vtiger_filesize($filepath.$filename);
 		$fileid = $adb->query_result($res,$i,'attachmentsid');
 		$filetype = $adb->query_result($res,$i,'type');
 
@@ -717,13 +717,13 @@
 	$date_var = date('YmdHis');
 	$description = 'CustomerPortal Attachment';
 
-	$crmquery = "insert into crmentity (crmid,setype,description,createdtime) values('".$attachmentid."','HelpDesk Attachment','".$description."','".$date_var."')";
+	$crmquery = "insert into vtiger_crmentity (crmid,setype,description,createdtime) values('".$attachmentid."','HelpDesk Attachment','".$description."','".$date_var."')";
 	$crmresult = $adb->query($crmquery);
 
-	$attachmentquery = "insert into attachments values(".$attachmentid.",'".$new_filename."','".$description."','".$filetype."','".$upload_filepath."')";
+	$attachmentquery = "insert into vtiger_attachments values(".$attachmentid.",'".$new_filename."','".$description."','".$filetype."','".$upload_filepath."')";
 	$attachmentreulst = $adb->query($attachmentquery);
 
-	$relatedquery = $sql1 = "insert into seattachmentsrel values('".$ticketid."','".$attachmentid."')";
+	$relatedquery = $sql1 = "insert into vtiger_seattachmentsrel values('".$ticketid."','".$attachmentid."')";
 	$relatedresult = $adb->query($relatedquery);
 
 }

Modified: vtigercrm/trunk/soap/vtigerolservice.php
==============================================================================
--- vtigercrm/trunk/soap/vtigerolservice.php (original)
+++ vtigercrm/trunk/soap/vtigerolservice.php Mon Jun 12 14:26:25 2006
@@ -314,13 +314,13 @@
           	$email->set_emails_contact_invitee_relationship($email->id,$contactid);
           	$email->set_emails_se_invitee_relationship($email->id,$contactid);
           	$email->set_emails_user_invitee_relationship($email->id,$user_id);
-		$sql = "select email from contactdetails inner join crmentity on crmentity.crmid = contactdetails.contactid where crmentity.deleted =0 and contactdetails.contactid='".$contactid."'";
+		$sql = "select email from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid where vtiger_crmentity.deleted =0 and vtiger_contactdetails.contactid='".$contactid."'";
 		$result = $adb->query($sql);
 		$camodulerow = $adb->fetch_array($result);
 		if(isset($camodulerow))
 		{
 			$emailid = $camodulerow["email"];
-			$query = 'insert into emaildetails values ('.$email->id.',"","'.$emailid.'","","","","'.$cotactid."@77|".'","OUTLOOK")';
+			$query = 'insert into vtiger_emaildetails values ('.$email->id.',"","'.$emailid.'","","","","'.$cotactid."@77|".'","OUTLOOK")';
 			$adb->query($query);
 		}
 		return $email->id;
@@ -380,7 +380,7 @@
      fwrite($handle,base64_decode($filedata),$filesize);
      fclose($handle);
 
-     $sql1 = "insert into crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime,modifiedtime) 
+     $sql1 = "insert into vtiger_crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime,modifiedtime) 
      values(".$crmid.",".$user_id.",".$user_id.",'Emails Attachment',' ',".$adb->formatString("crmentity","createdtime",$date_var).",".$adb->formatString("crmentity","modifiedtime",$date_var).")";
      
      $entityresult = $adb->query($sql1);	
@@ -388,12 +388,12 @@
      
      if($entityresult != false)
      {
-    	$sql2="insert into attachments(attachmentsid, name, description, type, path) 
+    	$sql2="insert into vtiger_attachments(attachmentsid, name, description, type, path) 
                values(".$crmid.",'".$filename."',' ','".$filetype."','".$upload_file_path."')";
     	    
         $result=$adb->query($sql2);
      
-        $sql3='insert into seattachmentsrel values('.$emailid.','.$crmid.')';
+        $sql3='insert into vtiger_seattachmentsrel values('.$emailid.','.$crmid.')';
         $adb->query($sql3);
      
         return $crmid;   
@@ -631,7 +631,7 @@
         return null;
     }
 
-    $query = "select account.accountname accountname,account.accountid accountid from account inner join crmentity on crmentity.crmid=account.accountid where crmentity.deleted=0 and account.accountname='" .$account_name."'";
+    $query = "select vtiger_account.accountname vtiger_accountname,vtiger_account.accountid vtiger_accountid from vtiger_account inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_account.accountid where vtiger_crmentity.deleted=0 and vtiger_account.accountname='" .$account_name."'";
 
 
 	  $db = new PearDatabase();

Modified: vtigercrm/trunk/soap/webforms.php
==============================================================================
--- vtigercrm/trunk/soap/webforms.php (original)
+++ vtigercrm/trunk/soap/webforms.php Mon Jun 12 14:26:25 2006
@@ -61,7 +61,7 @@
 	if($assigned_user_id == '')
 	{
 		//if the user id is empty then assign it to the admin user
-		$assigned_user_id = $adb->query_result($adb->query("select id from users where user_name='admin'"),0,'id');
+		$assigned_user_id = $adb->query_result($adb->query("select id from vtiger_users where user_name='admin'"),0,'id');
 	}
 
 	require_once("modules/Leads/Lead.php");
@@ -95,7 +95,7 @@
 	if($assigned_user_id == '')
 	{
 		//if the user id is empty then assign it to the admin user
-		$assigned_user_id = $adb->query_result($adb->query("select id from users where user_name='admin'"),0,'id');
+		$assigned_user_id = $adb->query_result($adb->query("select id from vtiger_users where user_name='admin'"),0,'id');
 	}
 
 	require_once('modules/Contacts/Contact.php');



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 12 13:33:13 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 12 Jun 2006 20:33:13 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7004 -
	/vtigercrm/trunk/schema/DatabaseSchema.xml
Message-ID: <20060612203314.BBBEA7E8BE5@vtiger.fosslabs.com>

Author: don
Date: Mon Jun 12 14:33:10 2006
New Revision: 7004

Log:
prefixed vtiger_ in all table names

Modified:
    vtigercrm/trunk/schema/DatabaseSchema.xml

Modified: vtigercrm/trunk/schema/DatabaseSchema.xml
==============================================================================
--- vtigercrm/trunk/schema/DatabaseSchema.xml (original)
+++ vtigercrm/trunk/schema/DatabaseSchema.xml Mon Jun 12 14:33:10 2006
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <schema version="0.2">
 
-	<table name="users">
+	<table name="vtiger_users">
 		<field name="id" type="I" >
 			<key />
 			<autoincrement />
@@ -91,7 +91,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="crmentity">
+	<table name="vtiger_crmentity">
 		<field name="crmid" type="I" size="19">
 			<key />
 		</field>
@@ -152,7 +152,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="sharedcalendar">
+	<table name="vtiger_sharedcalendar">
 		<field name="userid" type="I" size="19">
 			<key />
 		</field>
@@ -161,7 +161,7 @@
 		</field>
 	</table>
 
-	<table name="tab">
+	<table name="vtiger_tab">
 		<field name="tabid" type="I" size="19">
 			<key />
 			<default value="0" />
@@ -194,7 +194,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="blocks">
+	<table name="vtiger_blocks">
 		<field name="blockid" type="I" size="19">
 			<key />
 			<notnull />
@@ -229,14 +229,14 @@
 		</index>
 	</table>
 
-	<table name="field">
+	<table name="vtiger_field">
 		<field name="tabid" type="I" size="19">
 			<notnull />
 		</field>
 		<field name="fieldid" type="I" size="19">
 			<key />
 			<autoincrement />
-			<constraint>REFERENCES tab(tabid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_tab(tabid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="columnname" type="C" size="30">
 			<notnull />
@@ -295,12 +295,12 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="account">
+	<table name="vtiger_account">
 		<field name="accountid" type="I" size="19">
 			<key />
 			<notnull />
 			<default value="0" />
-			<constraint>REFERENCES crmentity(crmid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="accountname" type="C" size="100">
 			<unique />
@@ -342,11 +342,11 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="accountbillads">
+	<table name="vtiger_accountbillads">
 		<field name="accountaddressid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES account(accountid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_account(accountid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="city" type="C" size="30" />
 		<field name="code" type="C" size="30" />
@@ -358,11 +358,11 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="accountshipads">
+	<table name="vtiger_accountshipads">
 		<field name="accountaddressid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES account(accountid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_account(accountid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="city" type="C" size="30" />
 		<field name="code" type="C" size="30" />
@@ -374,21 +374,21 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="accountscf">
+	<table name="vtiger_accountscf">
 		<field name="accountid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES account(accountid) ON DELETE CASCADE</constraint>
-		</field>
-
-		<opt platform="mysql">Type=InnoDB</opt>
-	</table>
-
-	<table name="contactdetails">
+			<constraint>REFERENCES vtiger_account(accountid) ON DELETE CASCADE</constraint>
+		</field>
+
+		<opt platform="mysql">Type=InnoDB</opt>
+	</table>
+
+	<table name="vtiger_contactdetails">
 		<field name="contactid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES crmentity(crmid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="accountid" type="I" size="19" />
 		<field name="campaignid" type="I" size="19" />
@@ -430,11 +430,11 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="contactsubdetails">
+	<table name="vtiger_contactsubdetails">
 		<field name="contactsubscriptionid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES contactdetails(contactid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="homephone" type="C" size="50" />
 		<field name="otherphone" type="C" size="50" />
@@ -452,11 +452,11 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="contactaddress">
+	<table name="vtiger_contactaddress">
 		<field name="contactaddressid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES contactdetails(contactid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="mailingcity" type="C" size="40" />
 		<field name="mailingstreet" type="C" size="250" />
@@ -474,20 +474,20 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="contactscf">
+	<table name="vtiger_contactscf">
 		<field name="contactid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES contactdetails(contactid) ON DELETE CASCADE</constraint>
-		</field>
-
-		<opt platform="mysql">Type=InnoDB</opt>
-	</table>
-
-	<table name="portalinfo">
+			<constraint>REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE</constraint>
+		</field>
+
+		<opt platform="mysql">Type=InnoDB</opt>
+	</table>
+
+	<table name="vtiger_portalinfo">
 		<field name="id" type="I" size="11">
 			<key />
-			<constraint>REFERENCES contactdetails(contactid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="user_name" type="C" size="50" />
 		<field name="user_password" type="C" size="30" />
@@ -504,20 +504,20 @@
 		<field name="isactive" type="I" size="1" />
 	</table>
 
-	<table name="customerdetails">
+	<table name="vtiger_customerdetails">
 		<field name="customerid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES contactdetails(contactid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="portal" type="C" size="3" />
 		<field name="support_start_date" type="D" />
 		<field name="support_end_date" type="D" />
 	</table>
 
-	<table name="leaddetails">
+	<table name="vtiger_leaddetails">
 		<field name="leadid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES crmentity(crmid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="campaignid" type="I" size="19" />
 		<field name="email" type="C" size="100" />
@@ -572,11 +572,11 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="leadsubdetails">
+	<table name="vtiger_leadsubdetails">
 		<field name="leadsubscriptionid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES leaddetails(leadid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_leaddetails(leadid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="currency" type="C" size="20">
 			<default value="Dollars" />
@@ -595,11 +595,11 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="leadaddress">
+	<table name="vtiger_leadaddress">
 		<field name="leadaddressid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES leaddetails(leadid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_leaddetails(leadid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="city" type="C" size="30" />
 		<field name="code" type="C" size="30" />
@@ -617,21 +617,21 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="leadscf">
+	<table name="vtiger_leadscf">
 		<field name="leadid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES leaddetails(leadid) ON DELETE CASCADE</constraint>
-		</field>
-
-		<opt platform="mysql">Type=InnoDB</opt>
-	</table>
-
-	<table name="notes">
+			<constraint>REFERENCES vtiger_leaddetails(leadid) ON DELETE CASCADE</constraint>
+		</field>
+
+		<opt platform="mysql">Type=InnoDB</opt>
+	</table>
+
+	<table name="vtiger_notes">
 		<field name="notesid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES crmentity(crmid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="contact_id" type="I" size="19">
 			<default value="0" />
@@ -654,11 +654,11 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="potential">
+	<table name="vtiger_potential">
 		<field name="potentialid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES crmentity(crmid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="accountid" type="I" size="19" />
 		<field name="potentialname" type="C" size="120">
@@ -711,14 +711,14 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="potstagehistory">
+	<table name="vtiger_potstagehistory">
 		<field name="historyid" type="I" size="19">
 			<key />
 			<autoincrement />
 		</field>
 		<field name="potentialid" type="I" size="19">
 			<notnull />
-			<constraint>REFERENCES potential(potentialid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_potential(potentialid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="amount" type="N" />
 		<field name="stage" type="C" size="100" />
@@ -733,21 +733,21 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="potentialscf">
+	<table name="vtiger_potentialscf">
 		<field name="potentialid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES potential(potentialid) ON DELETE CASCADE</constraint>
-		</field>
-
-		<opt platform="mysql">Type=InnoDB</opt>
-	</table>
-
-	<table name="activity">
+			<constraint>REFERENCES vtiger_potential(potentialid) ON DELETE CASCADE</constraint>
+		</field>
+
+		<opt platform="mysql">Type=InnoDB</opt>
+	</table>
+
+	<table name="vtiger_activity">
 		<field name="activityid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES crmentity(crmid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="subject" type="C" size="100">
 			<notnull />
@@ -807,10 +807,10 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="attachments">
+	<table name="vtiger_attachments">
 		<field name="attachmentsid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES crmentity(crmid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="name" type="C" size="100">
 			<notnull />
@@ -830,7 +830,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="seattachmentsrel">
+	<table name="vtiger_seattachmentsrel">
 		<field name="crmid" type="I" size="19">
 			<key />
 			<default value="0" />
@@ -838,7 +838,7 @@
 		<field name="attachmentsid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES attachments(attachmentsid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_attachments(attachmentsid) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="seattachmentsrel_attachmentsid_idx">
@@ -846,7 +846,7 @@
 		</index>
 		<index name="seattachmentsrel_crmid_idx">
 			<col>crmid</col>
-			<constraint>REFERENCES crmentity(crmid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE</constraint>
 		</index>
 		<index name="seattachmentsrel_attachmentsid_crmid_idx">
 			<col>attachmentsid</col>
@@ -855,7 +855,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="tracker">
+	<table name="vtiger_tracker">
 		<field name="id" type="I" size="11">
 			<key />
 			<autoincrement />
@@ -866,10 +866,10 @@
 		<field name="item_summary" type="C" size="255" />
 	</table>
 
-	<table name="competitor">
+	<table name="vtiger_competitor">
 		<field name="competitorid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES crmentity(crmid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="competitorname" type="C" size="100">
 			<notnull />
@@ -881,14 +881,14 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="potcompetitorrel">
+	<table name="vtiger_potcompetitorrel">
 		<field name="potentialid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES potential(potentialid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_potential(potentialid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="competitorid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES competitor(competitorid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_competitor(competitorid) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="potcompetitorrel_potentialid_idx">
@@ -900,12 +900,12 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="vendor">
+	<table name="vtiger_vendor">
 		<field name="vendorid" type="I" size="19">
 			<key />
 			<notnull />
 			<default value="0" />
-			<constraint>REFERENCES crmentity(crmid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="vendorname" type="C" size="100" />
 		<field name="phone" type="C" size="100" />
@@ -924,10 +924,10 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="products">
+	<table name="vtiger_products">
 		<field name="productid" type="I" size="11">
 			<key />
-			<constraint>REFERENCES crmentity(crmid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="productname" type="C" size="50">
 			<notnull />
@@ -970,7 +970,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="currency">
+	<table name="vtiger_currency">
 		<field name="currencyid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -994,7 +994,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="visibility">
+	<table name="vtiger_visibility">
 		<field name="visibilityid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -1018,7 +1018,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="manufacturer">
+	<table name="vtiger_manufacturer">
 		<field name="manufacturerid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -1042,10 +1042,10 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="productcollaterals">
+	<table name="vtiger_productcollaterals">
 		<field name="productid" type="I" size="11">
 			<key />
-			<constraint>REFERENCES products(productid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_products(productid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="date_entered" type="T">
 			<notnull />
@@ -1070,7 +1070,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="role">
+	<table name="vtiger_role">
 		<field name="roleid" type="C" size="255">
 			<key />
 		</field>
@@ -1081,14 +1081,14 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="user2role">
+	<table name="vtiger_user2role">
 		<field name="userid" type="I" size="11">
 			<key />
-			<constraint>REFERENCES users(id) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_users(id) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="roleid" type="C" size="255">
 			<notnull />
-			<constraint>REFERENCES role(roleid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_role(roleid) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="user2role_roleid_idx">
@@ -1097,7 +1097,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="groups">
+	<table name="vtiger_groups">
 		<field name="groupid" type="I" size="19">
 			<key />
 		</field>
@@ -1111,14 +1111,14 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="users2group">
+	<table name="vtiger_users2group">
 		<field name="groupid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES groups(groupid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_groups(groupid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="userid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES users(id) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_users(id) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="users2group_groupname_uerid_idx">
@@ -1127,51 +1127,51 @@
 		</index>
 	</table>
 
-	<table name="group2grouprel">
+	<table name="vtiger_group2grouprel">
 		<field name="groupid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES groups(groupid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_groups(groupid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="containsgroupid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES groups(groupid) ON DELETE CASCADE</constraint>
-		</field>
-
-		<opt platform="mysql">Type=InnoDB</opt>
-	</table>
-
-	<table name="group2role">
+			<constraint>REFERENCES vtiger_groups(groupid) ON DELETE CASCADE</constraint>
+		</field>
+
+		<opt platform="mysql">Type=InnoDB</opt>
+	</table>
+
+	<table name="vtiger_group2role">
 		<field name="groupid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES groups(groupid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_groups(groupid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="roleid" type="C" size="255">
 			<key />
-			<constraint>REFERENCES role(roleid) ON DELETE CASCADE</constraint>
-		</field>
-	</table>
-
-	<table name="group2rs">
+			<constraint>REFERENCES vtiger_role(roleid) ON DELETE CASCADE</constraint>
+		</field>
+	</table>
+
+	<table name="vtiger_group2rs">
 		<field name="groupid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES groups(groupid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_groups(groupid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="roleandsubid" type="C" size="255">
 			<key />
-			<constraint>REFERENCES role(roleid) ON DELETE CASCADE</constraint>
-		</field>
-	</table>
-
-	<table name="leadpotrel">
+			<constraint>REFERENCES vtiger_role(roleid) ON DELETE CASCADE</constraint>
+		</field>
+	</table>
+
+	<table name="vtiger_leadpotrel">
 		<field name="leadid" type="I" size="19">
 			<notnull />
 			<default value="0" />
-			<constraint>REFERENCES leaddetails(leadid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_leaddetails(leadid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="potentialid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES potential(potentialid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_potential(potentialid) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="leadpotrel_leadid_idx">
@@ -1181,7 +1181,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="campaign">
+	<table name="vtiger_campaign">
 		<field name="campaignname" type="C" size="255" />
 		<field name="campaigntype" type="C" size="255" />
 		<field name="campaignstatus" type="C" size="255" />
@@ -1217,26 +1217,26 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="campaignscf">
+	<table name="vtiger_campaignscf">
 		<field name="campaignid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES campaign(campaignid) ON DELETE CASCADE</constraint>
-		</field>
-
-		<opt platform="mysql">Type=InnoDB</opt>
-	</table>
-
-	<table name="campaigncontrel">
+			<constraint>REFERENCES vtiger_campaign(campaignid) ON DELETE CASCADE</constraint>
+		</field>
+
+		<opt platform="mysql">Type=InnoDB</opt>
+	</table>
+
+	<table name="vtiger_campaigncontrel">
 		<field name="campaignid" type="I" size="19">
 			<key />
 			<default value="0"/>
-			<constraint>REFERENCES campaign(campaignid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_campaign(campaignid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="contactid" type="I" size="19">
 			<notnull />
 			<default value="0"/>
-			<constraint>REFERENCES contactdetails(contactid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="campaigncontrel_contractid_idx">
@@ -1245,16 +1245,16 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="campaignleadrel">
+	<table name="vtiger_campaignleadrel">
 		<field name="campaignid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES campaign(campaignid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_campaign(campaignid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="leadid" type="I" size="19">
 			<notnull />
 			<default value="0" />
-			<constraint>REFERENCES leaddetails(leadid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_leaddetails(leadid) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="campaignleadrel_leadid_campaignid_idx">
@@ -1264,11 +1264,11 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="leadcontrel">
+	<table name="vtiger_leadcontrel">
 		<field name="leadid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES leaddetails(leadid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_leaddetails(leadid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="contactid" type="I" size="19">
 			<notnull />
@@ -1277,21 +1277,21 @@
 
 		<index name="leadcontrel_contactid_idx">
 			<col>contactid</col>
-			<constraint>REFERENCES contactdetails(contactid) ON DELETE CASCADE</constraint>
-		</index>
-		<opt platform="mysql">Type=InnoDB</opt>
-	</table>
-
-	<table name="leadacctrel">
+			<constraint>REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE</constraint>
+		</index>
+		<opt platform="mysql">Type=InnoDB</opt>
+	</table>
+
+	<table name="vtiger_leadacctrel">
 		<field name="leadid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES leaddetails(leadid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_leaddetails(leadid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="accountid" type="I" size="19">
 			<notnull />
 			<default value="0" />
-			<constraint>REFERENCES account(accountid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_account(accountid) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="leadacctrel_accountid_idx">
@@ -1300,17 +1300,17 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="contpotentialrel">
+	<table name="vtiger_contpotentialrel">
 		<field name="contactid" type="I" size="19">
 			<key />
 			<notnull />
 			<default value="0" />
-			<constraint>REFERENCES contactdetails(contactid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="potentialid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES potential(potentialid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_potential(potentialid) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="contpotentialrel_potentialid_idx">
@@ -1322,7 +1322,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="dealintimation">
+	<table name="vtiger_dealintimation">
 		<field name="dealintimationid" type="I" size="19">
 			<key />
 			<default value="0" />
@@ -1364,16 +1364,16 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="cntactivityrel">
+	<table name="vtiger_cntactivityrel">
 		<field name="contactid" type="I" size="19">
 			<notnull />
 			<default value="0" />
-			<constraint>REFERENCES contactdetails(contactid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="activityid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES activity(activityid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_activity(activityid) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="cntactivityrel_contactid_idx">
@@ -1383,7 +1383,7 @@
 	</table>
 
 	<!-- Lead Assignment Rule -->
-	<table name="lar">
+	<table name="vtiger_lar">
 		<field name="larid" type="I" size="19">
 			<key />
 			<default value="0" />
@@ -1394,7 +1394,7 @@
 		<field name="createdby" type="I" size="19">
 			<notnull />
 			<default value="0" />
-			<constraint>REFERENCES users(id) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_users(id) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="createdon" type="D">
 			<notnull />
@@ -1410,16 +1410,16 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="crmentitynotesrel">
+	<table name="vtiger_crmentitynotesrel">
 		<field name="crmid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES crmentity(crmid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="notesid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES notes(notesid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_notes(notesid) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="crmentitynotesrel_notesid_idx">
@@ -1431,10 +1431,10 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="troubletickets">
+	<table name="vtiger_troubletickets">
 		<field name="ticketid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES crmentity(crmid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="groupname" type="C" size="100" />
 		<field name="parent_id" type="C" size="100" />
@@ -1461,13 +1461,13 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="ticketcomments">
+	<table name="vtiger_ticketcomments">
 		<field name="commentid" type="I" size="19">
 			<key />
 			<autoincrement />
 		</field>
 		<field name="ticketid" type="I" size="19">
-			<constraint>REFERENCES troubletickets(ticketid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_troubletickets(ticketid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="comments" type="X" />
 		<field name="ownerid" type="I" size="19">
@@ -1485,16 +1485,16 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="salesmanactivityrel">
+	<table name="vtiger_salesmanactivityrel">
 		<field name="smid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES users(id) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_users(id) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="activityid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES activity(activityid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_activity(activityid) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="salesmanactivityrel_activityid_idx">
@@ -1506,16 +1506,16 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="vendorcontactrel">
+	<table name="vtiger_vendorcontactrel">
 		<field name="vendorid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES vendor(vendorid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_vendor(vendorid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="contactid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES contactdetails(contactid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="vendorcontactrel_vendorid_idx">
@@ -1527,16 +1527,16 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="salesmanticketrel">
+	<table name="vtiger_salesmanticketrel">
 		<field name="smid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES users(id) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_users(id) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="id" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES troubletickets(ticketid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_troubletickets(ticketid) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="salesmanticketrel_smid_idx">
@@ -1548,14 +1548,14 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="seactivityrel">
+	<table name="vtiger_seactivityrel">
 		<field name="crmid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES crmentity(crmid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="activityid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES activity(activityid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_activity(activityid) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="seactivityrel_activityid_idx">
@@ -1567,16 +1567,16 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="seproductsrel">
+	<table name="vtiger_seproductsrel">
 		<field name="crmid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES crmentity(crmid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="productid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES products(productid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_products(productid) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="seproductsrel_productid_idx">
@@ -1588,16 +1588,16 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="seticketsrel">
+	<table name="vtiger_seticketsrel">
 		<field name="crmid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES crmentity(crmid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="ticketid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES troubletickets(ticketid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_troubletickets(ticketid) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="seticketsrel_crmid_idx">
@@ -1609,7 +1609,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="headers">
+	<table name="vtiger_headers">
 		<field name="fileid" type="I" size="3">
 			<key />
 			<autoincrement />
@@ -1619,7 +1619,7 @@
 		</field>
 	</table>
 
-	<table name="import_maps">
+	<table name="vtiger_import_maps">
 		<field name="id" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -1661,13 +1661,13 @@
 		</index>
 	</table>
 
-	<table name="leadgrouprelation">
+	<table name="vtiger_leadgrouprelation">
 		<field name="leadid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES leaddetails(leadid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_leaddetails(leadid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="groupname" type="C" size="100">
-			<constraint>REFERENCES groups(groupname) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_groups(groupname) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="leadgrouprelation_leadid_idx">
@@ -1679,13 +1679,13 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="accountgrouprelation">
+	<table name="vtiger_accountgrouprelation">
 		<field name="accountid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES account(accountid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_account(accountid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="groupname" type="C" size="100">
-			<constraint>REFERENCES groups(groupname) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_groups(groupname) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="accountgrouprelation_groupname_idx">
@@ -1694,13 +1694,13 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="contactgrouprelation">
+	<table name="vtiger_contactgrouprelation">
 		<field name="contactid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES contactdetails(contactid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="groupname" type="C" size="100">
-			<constraint>REFERENCES groups(groupname) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_groups(groupname) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="contactgrouprelation_groupname_idx">
@@ -1709,13 +1709,13 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="potentialgrouprelation">
+	<table name="vtiger_potentialgrouprelation">
 		<field name="potentialid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES potential(potentialid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_potential(potentialid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="groupname" type="C" size="100">
-			<constraint>REFERENCES groups(groupname) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_groups(groupname) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="potentialgrouprelation_groupname_idx">
@@ -1724,13 +1724,13 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="campaigngrouprelation">
+	<table name="vtiger_campaigngrouprelation">
 		<field name="campaignid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES campaign(campaignid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_campaign(campaignid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="groupname" type="C" size="100">
-			<constraint>REFERENCES groups(groupname) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_groups(groupname) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="campaigngrouprelation_IDX1">
@@ -1739,13 +1739,13 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="activitygrouprelation">
+	<table name="vtiger_activitygrouprelation">
 		<field name="activityid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES activity(activityid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_activity(activityid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="groupname" type="C" size="100">
-			<constraint>REFERENCES groups(groupname) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_groups(groupname) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="activitygrouprelation_activityid_idx">
@@ -1757,13 +1757,13 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="ticketgrouprelation">
+	<table name="vtiger_ticketgrouprelation">
 		<field name="ticketid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES troubletickets(ticketid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_troubletickets(ticketid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="groupname" type="C" size="100">
-			<constraint>REFERENCES groups(groupname) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_groups(groupname) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="ticketgrouprelation_ticketid_idx">
@@ -1775,7 +1775,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="systems">
+	<table name="vtiger_systems">
 		<field name="id" type="I" size="19">
 			<key />
 		</field>
@@ -1786,7 +1786,7 @@
 		<field name="smtp_auth" type="C" size="5" />
 	</table>
 
-	<table name="currency_info">
+	<table name="vtiger_currency_info">
 		<field name="id" type="I" >
 			<key />
 			<autoincrement />
@@ -1803,10 +1803,10 @@
 		</field>
 	</table>
 
-	<table name="defaultcv">
+	<table name="vtiger_defaultcv">
 		<field name="tabid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES tab(tabid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_tab(tabid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="defaultviewname" type="C" size="50">
 			<notnull />
@@ -1814,7 +1814,7 @@
 		<field name="query" type="X" />
 	</table>
 
-	<table name="emailtemplates">
+	<table name="vtiger_emailtemplates">
 		<field name="foldername" type="C" size="100" />
 		<field name="templatename" type="C" size="100" />
 		<field name="subject" type="C" size="100" />
@@ -1836,11 +1836,11 @@
 		</index>
 	</table>
 
-	<table name="faq">
+	<table name="vtiger_faq">
 		<field name="id" type="I" size="11">
 			<key />
 			<autoincrement />
-			<constraint>REFERENCES crmentity(crmid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="product_id" type="C" size="100" />
 		<field name="question" type="X">
@@ -1860,13 +1860,13 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="faqcomments">
+	<table name="vtiger_faqcomments">
 		<field name="commentid" type="I" size="19">
 			<key />
 			<autoincrement />
 		</field>
 		<field name="faqid" type="I" size="19">
-			<constraint>REFERENCES faq(id) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_faq(id) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="comments" type="X" />
 		<field name="createdtime" type="T">
@@ -1879,7 +1879,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="files">
+	<table name="vtiger_files">
 		<field name="id" type="C" size="36">
 			<key />
 		</field>
@@ -1902,7 +1902,7 @@
 		</index>
 	</table>
 
-	<table name="loginhistory">
+	<table name="vtiger_loginhistory">
 		<field name="login_id" type="I" size="11">
 			<key />
 			<autoincrement />
@@ -1922,16 +1922,16 @@
 		<field name="status" type="C" size="25" />
 	</table>
 
-	<table name="senotesrel">
+	<table name="vtiger_senotesrel">
 		<field name="crmid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES crmentity(crmid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="notesid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES notes(notesid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_notes(notesid) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="senotesrel_notesid_idx">
@@ -1943,7 +1943,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="ticketstracktime">
+	<table name="vtiger_ticketstracktime">
 		<field name="ticket_id" type="I" size="11">
 			<key />
 			<notnull />
@@ -1966,27 +1966,27 @@
 		</index>
 	</table>
 
-	<table name="ticketcf">
+	<table name="vtiger_ticketcf">
 		<field name="ticketid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES troubletickets(ticketid) ON DELETE CASCADE</constraint>
-		</field>
-
-		<opt platform="mysql">Type=InnoDB</opt>
-	</table>
-
-	<table name="productcf">
+			<constraint>REFERENCES vtiger_troubletickets(ticketid) ON DELETE CASCADE</constraint>
+		</field>
+
+		<opt platform="mysql">Type=InnoDB</opt>
+	</table>
+
+	<table name="vtiger_productcf">
 		<field name="productid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES products(productid) ON DELETE CASCADE</constraint>
-		</field>
-
-		<opt platform="mysql">Type=InnoDB</opt>
-	</table>
-
-	<table name="users_last_import">
+			<constraint>REFERENCES vtiger_products(productid) ON DELETE CASCADE</constraint>
+		</field>
+
+		<opt platform="mysql">Type=InnoDB</opt>
+	</table>
+
+	<table name="vtiger_users_last_import">
 		<field name="id" type="I" size="36">
 			<autoincrement />
 			<key />
@@ -2004,7 +2004,7 @@
 		</index>
 	</table>
 
-	<table name="wordtemplates">
+	<table name="vtiger_wordtemplates">
 		<field name="templateid" type="I" size="19">
 			<key />
 		</field>
@@ -2038,7 +2038,7 @@
 	</table>
 
 	<!-- Dropdown fields -->
-	<table name="accountdepstatus">
+	<table name="vtiger_accountdepstatus">
 		<field name="deploymentstatusid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -2062,7 +2062,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="accountownership">
+	<table name="vtiger_accountownership">
 		<field name="acctownershipid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -2086,7 +2086,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="accountrating">
+	<table name="vtiger_accountrating">
 		<field name="accountratingid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -2110,7 +2110,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="accountregion">
+	<table name="vtiger_accountregion">
 		<field name="accountregionid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -2134,7 +2134,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="accounttype">
+	<table name="vtiger_accounttype">
 		<field name="accounttypeid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -2158,7 +2158,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="contacttype">
+	<table name="vtiger_contacttype">
 		<field name="contacttypeid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -2182,7 +2182,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="leadsource">
+	<table name="vtiger_leadsource">
 		<field name="leadsourceid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -2206,7 +2206,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="opportunity_type">
+	<table name="vtiger_opportunity_type">
 		<field name="opptypeid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -2230,7 +2230,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="leadstage">
+	<table name="vtiger_leadstage">
 		<field name="leadstageid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -2254,7 +2254,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="leadstatus">
+	<table name="vtiger_leadstatus">
 		<field name="leadstatusid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -2278,7 +2278,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="eventstatus">
+	<table name="vtiger_eventstatus">
 		<field name="eventstatusid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -2302,7 +2302,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="duration_minutes">
+	<table name="vtiger_duration_minutes">
 		<field name="minutesid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -2326,7 +2326,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="licencekeystatus">
+	<table name="vtiger_licencekeystatus">
 		<field name="licencekeystatusid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -2350,7 +2350,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="opportunitystage">
+	<table name="vtiger_opportunitystage">
 		<field name="potstageid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -2377,7 +2377,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="priority">
+	<table name="vtiger_priority">
 		<field name="priorityid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -2401,7 +2401,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="businesstype">
+	<table name="vtiger_businesstype">
 		<field name="businesstypeid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -2425,7 +2425,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="industry">
+	<table name="vtiger_industry">
 		<field name="industryid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -2449,7 +2449,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="revenuetype">
+	<table name="vtiger_revenuetype">
 		<field name="revenuetypeid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -2473,7 +2473,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="salutationtype">
+	<table name="vtiger_salutationtype">
 		<field name="salutationid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -2491,7 +2491,7 @@
 		</field>
 	</table>
 
-	<table name="taskpriority">
+	<table name="vtiger_taskpriority">
 		<field name="taskpriorityid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -2507,7 +2507,7 @@
 		</field>
 	</table>
 
-	<table name="taskstatus">
+	<table name="vtiger_taskstatus">
 		<field name="taskstatusid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -2523,7 +2523,7 @@
 		</field>
 	</table>
 
-	<table name="activitytype">
+	<table name="vtiger_activitytype">
 		<field name="activitytypeid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -2547,7 +2547,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="usertype">
+	<table name="vtiger_usertype">
 		<field name="usertypeid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -2571,7 +2571,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="sales_stage">
+	<table name="vtiger_sales_stage">
 		<field name="sales_stage_id" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -2588,7 +2588,7 @@
 		</field>
 	</table>
 
-	<table name="faqcategories">
+	<table name="vtiger_faqcategories">
 		<field name="faqcategories_id" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -2604,7 +2604,7 @@
 		</field>
 	</table>
 
-	<table name="faqstatus">
+	<table name="vtiger_faqstatus">
 		<field name="faqstatus_id" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -2620,7 +2620,7 @@
 		</field>
 	</table>
 
-	<table name="rating">
+	<table name="vtiger_rating">
 		<field name="rating_id" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -2636,7 +2636,7 @@
 		</field>
 	</table>
 
-	<table name="ticketcategories">
+	<table name="vtiger_ticketcategories">
 		<field name="ticketcategories_id" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -2652,7 +2652,7 @@
 		</field>
 	</table>
 
-	<table name="ticketpriorities">
+	<table name="vtiger_ticketpriorities">
 		<field name="ticketpriorities_id" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -2668,7 +2668,7 @@
 		</field>
 	</table>
 
-	<table name="ticketseverities">
+	<table name="vtiger_ticketseverities">
 		<field name="ticketseverities_id" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -2684,7 +2684,7 @@
 		</field>
 	</table>
 
-	<table name="ticketstatus">
+	<table name="vtiger_ticketstatus">
 		<field name="ticketstatus_id" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -2700,7 +2700,7 @@
 		</field>
 	</table>
 
-	<table name="activsubtype">
+	<table name="vtiger_activsubtype">
 		<field name="activesubtypeid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -2716,7 +2716,7 @@
 		</field>
 	</table>
 
-	<table name="downloadpurpose">
+	<table name="vtiger_downloadpurpose">
 		<field name="downloadpurposeid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -2740,7 +2740,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="durationhrs">
+	<table name="vtiger_durationhrs">
 		<field name="hrsid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -2756,7 +2756,7 @@
 		</field>
 	</table>
 
-	<table name="durationmins">
+	<table name="vtiger_durationmins">
 		<field name="minsid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -2772,7 +2772,7 @@
 		</field>
 	</table>
 
-	<table name="evaluationstatus">
+	<table name="vtiger_evaluationstatus">
 		<field name="evalstatusid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -2796,7 +2796,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="profile">
+	<table name="vtiger_profile">
 		<field name="profileid" type="I" size="10">
 			<key />
 			<autoincrement />
@@ -2809,10 +2809,10 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="profile2globalpermissions">
+	<table name="vtiger_profile2globalpermissions">
 		<field name="profileid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES profile(profileid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_profile(profileid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="globalactionid" type="I" size="19">
 			<key />
@@ -2826,7 +2826,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="profile2tab">
+	<table name="vtiger_profile2tab">
 		<field name="profileid" type="I" size="11" />
 		<field name="tabid" type="I" size="10" />
 		<field name="permissions" type="I" size="10">
@@ -2840,7 +2840,7 @@
 		</index>
 	</table>
 
-	<table name="profile2standardpermissions">
+	<table name="vtiger_profile2standardpermissions">
 		<field name="profileid" type="I" size="11">
 			<key />
 		</field>
@@ -2859,7 +2859,7 @@
 		</index>
 	</table>
 
-	<table name="profile2field">
+	<table name="vtiger_profile2field">
 		<field name="profileid" type="I" size="11">
 			<key />
 		</field>
@@ -2885,7 +2885,7 @@
 		</index>
 	</table>
 
-	<table name="role2profile">
+	<table name="vtiger_role2profile">
 		<field name="roleid" type="C" size="255">
 			<key />
 		</field>
@@ -2898,7 +2898,7 @@
 		</index>
 	</table>
 
-	<table name="org_share_action_mapping">
+	<table name="vtiger_org_share_action_mapping">
 		<field name="share_action_id" type="I" size="19">
 			<key />
 		</field>
@@ -2907,7 +2907,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="def_org_share">
+	<table name="vtiger_def_org_share">
 		<field name="ruleid" type="I" size="11">
 			<key />
 			<autoincrement />
@@ -2916,12 +2916,12 @@
 			<notnull />
 		</field>
 		<field name="permission" type="I" size="19">
-			<constraint>REFERENCES org_share_action_mapping(share_action_id) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_org_share_action_mapping(share_action_id) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="editstatus" type="I" size="19" />
 	</table>
 
-	<table name="def_org_field">
+	<table name="vtiger_def_org_field">
 		<field name="tabid" type="I" size="10" />
 		<field name="fieldid" type="I" size="19">
 			<key />
@@ -2942,7 +2942,7 @@
 		</index>
 	</table>
 
-	<table name="profile2utility">
+	<table name="vtiger_profile2utility">
 		<field name="profileid" type="I" size="11">
 			<key />
 		</field>
@@ -2961,7 +2961,7 @@
 		</index>
 	</table>
 
-	<table name="productcategory">
+	<table name="vtiger_productcategory">
 		<field name="productcategoryid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -2985,12 +2985,12 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="salesorder">
+	<table name="vtiger_salesorder">
 		<field name="salesorderid" type="I" size="19">
 			<key />
 			<notnull />
 			<default value="0" />
-			<constraint>REFERENCES crmentity(crmid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="subject" type="C" size="100" />
 		<field name="potentialid" type="I" size="19" />
@@ -2998,10 +2998,10 @@
 		<field name="quoteid" type="I" size="19" />
 		<field name="vendorterms" type="C" size="100" />
 		<field name="contactid" type="I" size="19">
-			<constraint>REFERENCES contactdetails(contactid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="vendorid" type="I" size="19">
-			<constraint>REFERENCES vendor(vendorid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_vendor(vendorid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="duedate" type="D" />
 		<field name="carrier" type="C" size='100' />
@@ -3027,13 +3027,13 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="sogrouprelation">
+	<table name="vtiger_sogrouprelation">
 		<field name="salesorderid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES salesorder(salesorderid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_salesorder(salesorderid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="groupname" type="C" size="100">
-			<constraint>REFERENCES groups(groupname) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_groups(groupname) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="sogrouprelation_groupname_idx">
@@ -3042,11 +3042,11 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="sobillads">
+	<table name="vtiger_sobillads">
 		<field name="sobilladdressid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES salesorder(salesorderid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_salesorder(salesorderid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="bill_city" type="C" size="30" />
 		<field name="bill_code" type="C" size="30" />
@@ -3058,11 +3058,11 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="soshipads">
+	<table name="vtiger_soshipads">
 		<field name="soshipaddressid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES salesorder(salesorderid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_salesorder(salesorderid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="ship_city" type="C" size="30" />
 		<field name="ship_code" type="C" size="30" />
@@ -3074,24 +3074,24 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="salesordercf">
+	<table name="vtiger_salesordercf">
 		<field name="salesorderid" type="I" size="19">
 			<key />
 			<default value="0"/>
-			<constraint>REFERENCES salesorder(salesorderid) ON DELETE CASCADE</constraint>
-		</field>
-
-		<opt platform="mysql">Type=InnoDB</opt>
-	</table>
-
-	<table name="soproductrel">
+			<constraint>REFERENCES vtiger_salesorder(salesorderid) ON DELETE CASCADE</constraint>
+		</field>
+
+		<opt platform="mysql">Type=InnoDB</opt>
+	</table>
+
+	<table name="vtiger_soproductrel">
 		<field name="salesorderid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES salesorder(salesorderid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_salesorder(salesorderid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="productid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES products(productid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_products(productid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="quantity" type="I" size="19" />
 		<field name="listprice" type="N" size="11.3" />
@@ -3108,7 +3108,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="notificationscheduler">
+	<table name="vtiger_notificationscheduler">
 		<field name="schedulednotificationid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -3126,16 +3126,16 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="activityproductrel">
+	<table name="vtiger_activityproductrel">
 		<field name="activityid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES activity(activityid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_activity(activityid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="productid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES products(productid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_products(productid) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="activityproductrel_activityid_idx">
@@ -3147,7 +3147,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="relatedlists">
+	<table name="vtiger_relatedlists">
 		<field name="relation_id" type="I" size="19">
 			<key />
 		</field>
@@ -3166,7 +3166,7 @@
 		</index>
 	</table>
 
-	<table name="rss">
+	<table name="vtiger_rss">
 		<field name="rssid" type="I" size="19">
 			<key />
 		</field>
@@ -3183,22 +3183,22 @@
 		</field>
 	</table>
 
-	<table name="vendorcf">
+	<table name="vtiger_vendorcf">
 		<field name="vendorid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES vendor(vendorid) ON DELETE CASCADE</constraint>
-		</field>
-
-		<opt platform="mysql">Type=InnoDB</opt>
-	</table>
-
-	<table name="pricebook">
+			<constraint>REFERENCES vtiger_vendor(vendorid) ON DELETE CASCADE</constraint>
+		</field>
+
+		<opt platform="mysql">Type=InnoDB</opt>
+	</table>
+
+	<table name="vtiger_pricebook">
 		<field name="pricebookid" type="I" size="19">
 			<key />
 			<notnull />
 			<default value="0" />
-			<constraint>REFERENCES crmentity(crmid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="bookname" type="C" size="100" />
 		<field name="active" type="I" size="1" />
@@ -3207,24 +3207,24 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="pricebookcf">
+	<table name="vtiger_pricebookcf">
 		<field name="pricebookid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES pricebook(pricebookid) ON DELETE CASCADE</constraint>
-		</field>
-
-		<opt platform="mysql">Type=InnoDB</opt>
-	</table>
-
-	<table name="pricebookproductrel">
+			<constraint>REFERENCES vtiger_pricebook(pricebookid) ON DELETE CASCADE</constraint>
+		</field>
+
+		<opt platform="mysql">Type=InnoDB</opt>
+	</table>
+
+	<table name="vtiger_pricebookproductrel">
 		<field name="pricebookid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES pricebook(pricebookid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_pricebook(pricebookid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="productid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES products(productid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_products(productid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="listprice" type="N" size="11.3" />
 
@@ -3237,7 +3237,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="mail_accounts">
+	<table name="vtiger_mail_accounts">
 		<field name="account_id" type="I" size="11">
 			<key />
 		</field>
@@ -3266,22 +3266,22 @@
 		<field name="set_default" type="I" size="2" />
 	</table>
 
-	<table name="quotes">
+	<table name="vtiger_quotes">
 		<field name="quoteid" type="I" size="19">
 			<key />
 			<notnull />
 			<default value="0" />
-			<constraint>REFERENCES crmentity(crmid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="subject" type="C" size="100" />
 		<field name="potentialid" type="I" size="19">
-			<constraint>REFERENCES potential(potentialid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_potential(potentialid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="quotestage" type="C" size="200" />
 		<field name="validtill" type="D" />
 		<field name="team" type="C" size="200" />
 		<field name="contactid" type="I" size="19">
-			<constraint>REFERENCES contactdetails(contactid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="currency" type="C" size="100" />
 		<field name="subtotal" type="N" size="11.3" />
@@ -3307,11 +3307,11 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="quotesbillads">
+	<table name="vtiger_quotesbillads">
 		<field name="quotebilladdressid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES quotes(quoteid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_quotes(quoteid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="bill_city" type="C" size="30" />
 		<field name="bill_code" type="C" size="30" />
@@ -3323,11 +3323,11 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="quotesshipads">
+	<table name="vtiger_quotesshipads">
 		<field name="quoteshipaddressid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES quotes(quoteid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_quotes(quoteid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="ship_city" type="C" size="30" />
 		<field name="ship_code" type="C" size="30" />
@@ -3339,13 +3339,13 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="quotegrouprelation">
+	<table name="vtiger_quotegrouprelation">
 		<field name="quoteid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES quotes(quoteid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_quotes(quoteid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="groupname" type="C" size="100">
-			<constraint>REFERENCES groups(groupname) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_groups(groupname) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="quotegrouprelation_groupname_idx">
@@ -3354,24 +3354,24 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="quotescf">
+	<table name="vtiger_quotescf">
 		<field name="quoteid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES quotes(quoteid) ON DELETE CASCADE</constraint>
-		</field>
-
-		<opt platform="mysql">Type=InnoDB</opt>
-	</table>
-
-	<table name="quotesproductrel">
+			<constraint>REFERENCES vtiger_quotes(quoteid) ON DELETE CASCADE</constraint>
+		</field>
+
+		<opt platform="mysql">Type=InnoDB</opt>
+	</table>
+
+	<table name="vtiger_quotesproductrel">
 		<field name="quoteid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES quotes(quoteid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_quotes(quoteid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="productid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES products(productid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_products(productid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="quantity" type="I" size="19" />
 		<field name="listprice" type="N" size="11.3" />
@@ -3388,24 +3388,24 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="purchaseorder">
+	<table name="vtiger_purchaseorder">
 		<field name="purchaseorderid" type="I" size="19">
 			<key />
 			<notnull />
 			<default value="0" />
-			<constraint>REFERENCES crmentity(crmid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="subject" type="C" size="100" />
 		<field name="quoteid" type="I" size="19">
-			<constraint>REFERENCES quotes(quoteid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_quotes(quoteid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="vendorid" type="I" size="19">
-			<constraint>REFERENCES vendor(vendorid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_vendor(vendorid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="requisition_no" type="C" size="100" />
 		<field name="tracking_no" type="C" size="100" />
 		<field name="contactid" type="I" size="19">
-			<constraint>REFERENCES contactdetails(contactid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="duedate" type="D" />
 		<field name="carrier" type="C" size='100' />
@@ -3431,13 +3431,13 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="pogrouprelation">
+	<table name="vtiger_pogrouprelation">
 		<field name="purchaseorderid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES purchaseorder(purchaseorderid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_purchaseorder(purchaseorderid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="groupname" type="C" size="100">
-			<constraint>REFERENCES groups(groupname) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_groups(groupname) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="pogrouprelation_groupname_purchaseorderid_idx">
@@ -3447,11 +3447,11 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="pobillads">
+	<table name="vtiger_pobillads">
 		<field name="pobilladdressid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES purchaseorder(purchaseorderid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_purchaseorder(purchaseorderid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="bill_city" type="C" size="30" />
 		<field name="bill_code" type="C" size="30" />
@@ -3463,11 +3463,11 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="poshipads">
+	<table name="vtiger_poshipads">
 		<field name="poshipaddressid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES purchaseorder(purchaseorderid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_purchaseorder(purchaseorderid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="ship_city" type="C" size="30" />
 		<field name="ship_code" type="C" size="30" />
@@ -3479,24 +3479,24 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="purchaseordercf">
+	<table name="vtiger_purchaseordercf">
 		<field name="purchaseorderid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES purchaseorder(purchaseorderid) ON DELETE CASCADE</constraint>
-		</field>
-
-		<opt platform="mysql">Type=InnoDB</opt>
-	</table>
-
-	<table name="poproductrel">
+			<constraint>REFERENCES vtiger_purchaseorder(purchaseorderid) ON DELETE CASCADE</constraint>
+		</field>
+
+		<opt platform="mysql">Type=InnoDB</opt>
+	</table>
+
+	<table name="vtiger_poproductrel">
 		<field name="purchaseorderid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES purchaseorder(purchaseorderid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_purchaseorder(purchaseorderid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="productid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES products(productid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_products(productid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="quantity" type="I" size="19" />
 		<field name="listprice" type="N" size="11.3" />
@@ -3513,16 +3513,16 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="invoice">
+	<table name="vtiger_invoice">
 		<field name="invoiceid" type="I" size="19">
 			<key />
 			<notnull />
 			<default value="0" />
-			<constraint>REFERENCES crmentity(crmid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="subject" type="C" size="100" />
 		<field name="salesorderid" type="I" size="19">
-			<constraint>REFERENCES salesorder(salesorderid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_salesorder(salesorderid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="customerno" type="C" size="100" />
 		<field name="contactid" type="I" size="19" />
@@ -3549,13 +3549,13 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="invoicegrouprelation">
+	<table name="vtiger_invoicegrouprelation">
 		<field name="invoiceid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES invoice(invoiceid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_invoice(invoiceid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="groupname" type="C" size="100">
-			<constraint>REFERENCES groups(groupname) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_groups(groupname) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="invoicegrouprelation_groupname_invoiceid_idx">
@@ -3565,11 +3565,11 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="invoicebillads">
+	<table name="vtiger_invoicebillads">
 		<field name="invoicebilladdressid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES invoice(invoiceid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_invoice(invoiceid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="bill_city" type="C" size="30" />
 		<field name="bill_code" type="C" size="30" />
@@ -3581,11 +3581,11 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="invoiceshipads">
+	<table name="vtiger_invoiceshipads">
 		<field name="invoiceshipaddressid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES invoice(invoiceid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_invoice(invoiceid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="ship_city" type="C" size="30" />
 		<field name="ship_code" type="C" size="30" />
@@ -3597,24 +3597,24 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="invoicecf">
+	<table name="vtiger_invoicecf">
 		<field name="invoiceid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES invoice(invoiceid) ON DELETE CASCADE</constraint>
-		</field>
-
-		<opt platform="mysql">Type=InnoDB</opt>
-	</table>
-
-	<table name="invoiceproductrel">
+			<constraint>REFERENCES vtiger_invoice(invoiceid) ON DELETE CASCADE</constraint>
+		</field>
+
+		<opt platform="mysql">Type=InnoDB</opt>
+	</table>
+
+	<table name="vtiger_invoiceproductrel">
 		<field name="invoiceid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES invoice(invoiceid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_invoice(invoiceid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="productid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES products(productid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_products(productid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="quantity" type="I" size="19" />
 		<field name="listprice" type="N" size="11.3" />
@@ -3631,7 +3631,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="activity_reminder">
+	<table name="vtiger_activity_reminder">
 		<field name="activity_id" type="I" size="11">
 			<key />
 			<notnull />
@@ -3648,7 +3648,7 @@
 		</field>
 	</table>
 
-	<table name="customview">
+	<table name="vtiger_customview">
 		<field name="cvid" type="I" size="19">
 			<key />
 		</field>
@@ -3668,11 +3668,11 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="cvcolumnlist">
+	<table name="vtiger_cvcolumnlist">
 		<field name="cvid" type="I" size="19">
 			<key />
 			<notnull />
-			<constraint>REFERENCES customview (cvid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_customview (cvid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="columnindex" type="I" size="11">
 			<key />
@@ -3691,10 +3691,10 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="cvstdfilter">
+	<table name="vtiger_cvstdfilter">
 		<field name="cvid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES customview (cvid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_customview (cvid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="columnname" type="C" size="250">
 			<default value="" />
@@ -3715,10 +3715,10 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="cvadvfilter">
+	<table name="vtiger_cvadvfilter">
 		<field name="cvid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES customview (cvid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_customview (cvid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="columnindex" type="I" size="11">
 			<key />
@@ -3740,10 +3740,10 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="customaction">
+	<table name="vtiger_customaction">
 		<field name="cvid" type="I" size="19">
 			<notnull />
-			<constraint>REFERENCES customview (cvid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_customview (cvid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="subject" type="C" size="250">
 			<notnull />
@@ -3761,7 +3761,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="selectquery">
+	<table name="vtiger_selectquery">
 		<field name="queryid" type="I" size="19">
 			<key />
 		</field>
@@ -3778,10 +3778,10 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="selectcolumn">
+	<table name="vtiger_selectcolumn">
 		<field name="queryid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES selectquery (queryid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_selectquery (queryid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="columnindex" type="I" size="11">
 			<key />
@@ -3798,10 +3798,10 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="relcriteria">
+	<table name="vtiger_relcriteria">
 		<field name="queryid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES selectquery (queryid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_selectquery (queryid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="columnindex" type="I" size="11">
 			<key />
@@ -3823,7 +3823,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="reportfolder">
+	<table name="vtiger_reportfolder">
 		<field name="folderid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -3842,13 +3842,13 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="report">
+	<table name="vtiger_report">
 		<field name="reportid" type="I" size="19">
 			<key />
 		</field>
 		<field name="folderid" type="I" size="19">
 			<notnull />
-			<constraint>REFERENCES reportfolder (folderid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_reportfolder (folderid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="reportname" type="C" size="100">
 			<default value="" />
@@ -3862,7 +3862,7 @@
 		<field name="queryid" type="I" size="19">
 			<notnull />
 			<default value="0" />
-			<constraint>REFERENCES selectquery (queryid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_selectquery (queryid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="state" type="C" size="50">
 			<default value="SAVED" />
@@ -3883,10 +3883,10 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="reportmodules">
+	<table name="vtiger_reportmodules">
 		<field name="reportmodulesid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES report (reportid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_report (reportid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="primarymodule" type="C" size="50">
 			<notnull />
@@ -3899,13 +3899,13 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="reportsortcol">
+	<table name="vtiger_reportsortcol">
 		<field name="sortcolid" type="I" size="19">
 			<key />
 		</field>
 		<field name="reportid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES report (reportid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_report (reportid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="columnname" type="C" size="250">
 			<default value="" />
@@ -3917,10 +3917,10 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="reportdatefilter">
+	<table name="vtiger_reportdatefilter">
 		<field name="datefilterid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES report (reportid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_report (reportid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="datecolumnname" type="C" size="250">
 			<default value="" />
@@ -3941,10 +3941,10 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="reportsummary">
+	<table name="vtiger_reportsummary">
 		<field name="reportsummaryid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES report (reportid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_report (reportid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="summarytype" type="I" size="19">
 			<key />
@@ -3960,7 +3960,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="usageunit">
+	<table name="vtiger_usageunit">
 		<field name="usageunitid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -3984,7 +3984,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="glacct">
+	<table name="vtiger_glacct">
 		<field name="glacctid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -4008,7 +4008,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="quotestage">
+	<table name="vtiger_quotestage">
 		<field name="quotestageid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -4032,7 +4032,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="invoicestatus">
+	<table name="vtiger_invoicestatus">
 		<field name="inovicestatusid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -4056,7 +4056,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="postatus">
+	<table name="vtiger_postatus">
 		<field name="postatusid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -4080,7 +4080,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="sostatus">
+	<table name="vtiger_sostatus">
 		<field name="sostatusid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -4105,7 +4105,7 @@
 
 	</table>
 
-	<table name="carrier">
+	<table name="vtiger_carrier">
 		<field name="carrierid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -4129,7 +4129,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="taxclass">
+	<table name="vtiger_taxclass">
 		<field name="taxclassid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -4153,7 +4153,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="organizationdetails">
+	<table name="vtiger_organizationdetails">
 		<field name="organizationame" type="C" size="60">
 			<key />
 		</field>
@@ -4171,7 +4171,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="recurringtype">
+	<table name="vtiger_recurringtype">
 		<field name="recurringeventid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -4195,7 +4195,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="recurringevents">
+	<table name="vtiger_recurringevents">
 		<field name="recurringid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -4209,7 +4209,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="inventorynotification">
+	<table name="vtiger_inventorynotification">
 		<field name="notificationid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -4222,7 +4222,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="inventory_tandc">
+	<table name="vtiger_inventory_tandc">
 		<field name="id" type="I" size="19">
 			<key />
 		</field>
@@ -4232,7 +4232,7 @@
 		<field name="tandc" type="X" />
 	</table>
 
-	<table name="convertleadmapping">
+	<table name="vtiger_convertleadmapping">
 		<field name="cfmid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -4247,7 +4247,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="actionmapping">
+	<table name="vtiger_actionmapping">
 		<field name="actionid" type="I" size="19">
 			<key />
 		</field>
@@ -4259,25 +4259,25 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="org_share_action2tab">
+	<table name="vtiger_org_share_action2tab">
 		<field name="share_action_id" type="I" size="19">
 			<key />
-			<constraint>REFERENCES org_share_action_mapping(share_action_id) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_org_share_action_mapping(share_action_id) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="tabid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES tab(tabid) ON DELETE CASCADE</constraint>
-		</field>
-
-		<opt platform="mysql">Type=InnoDB</opt>
-	</table>
-
-	<table name="moduleowners">
+			<constraint>REFERENCES vtiger_tab(tabid) ON DELETE CASCADE</constraint>
+		</field>
+
+		<opt platform="mysql">Type=InnoDB</opt>
+	</table>
+
+	<table name="vtiger_moduleowners">
 		<field name="tabid" type="I" size="19">
 			<key />
 			<unique />
 			<default value="0" />
-			<constraint>REFERENCES tab(tabid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_tab(tabid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="user_id" type="C" size="11">
 			<notnull />
@@ -4289,7 +4289,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="ownernotify">
+	<table name="vtiger_ownernotify">
 		<field name="crmid" type="I" size="19" />
 		<field name="smownerid" type="I" size="19" />
 		<field name="flag" type="I" size="3" />
@@ -4301,13 +4301,13 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="datashare_module_rel">
+	<table name="vtiger_datashare_module_rel">
 		<field name="shareid" type="I" size="19">
 			<key />
 		</field>
 		<field name="tabid" type="I" size="19">
 			<notnull />
-			<constraint>REFERENCES tab(tabid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_tab(tabid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="relationtype" type="C" size="200">
 		</field>
@@ -4317,16 +4317,16 @@
 		</index>
 	</table>
 
-	<table name="datashare_grp2grp">
+	<table name="vtiger_datashare_grp2grp">
 		<field name="shareid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES datashare_module_rel(shareid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_datashare_module_rel(shareid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="share_groupid" type="I" size="19">
-			<constraint>REFERENCES groups(groupid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_groups(groupid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="to_groupid" type="I" size="19">
-			<constraint>REFERENCES groups(groupid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_groups(groupid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="permission" type="I" size="19" />
 
@@ -4339,16 +4339,16 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="datashare_grp2role">
+	<table name="vtiger_datashare_grp2role">
 		<field name="shareid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES datashare_module_rel(shareid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_datashare_module_rel(shareid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="share_groupid" type="I" size="19">
-			<constraint>REFERENCES groups(groupid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_groups(groupid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="to_roleid" type="C" size="255">
-			<constraint>REFERENCES role(roleid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_role(roleid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="permission" type="I" size="19" />
 
@@ -4361,16 +4361,16 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="datashare_grp2rs">
+	<table name="vtiger_datashare_grp2rs">
 		<field name="shareid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES datashare_module_rel(shareid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_datashare_module_rel(shareid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="share_groupid" type="I" size="19">
-			<constraint>REFERENCES groups(groupid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_groups(groupid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="to_roleandsubid" type="C" size="255">
-			<constraint>REFERENCES role(roleid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_role(roleid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="permission" type="I" size="19" />
 
@@ -4383,16 +4383,16 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="datashare_role2group">
+	<table name="vtiger_datashare_role2group">
 		<field name="shareid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES datashare_module_rel(shareid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_datashare_module_rel(shareid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="share_roleid" type="C" size="255">
-			<constraint>REFERENCES role(roleid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_role(roleid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="to_groupid" type="I" size="19">
-			<constraint>REFERENCES groups(groupid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_groups(groupid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="permission" type="I" size="19" />
 
@@ -4405,16 +4405,16 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="datashare_role2role">
+	<table name="vtiger_datashare_role2role">
 		<field name="shareid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES datashare_module_rel(shareid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_datashare_module_rel(shareid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="share_roleid" type="C" size="255">
-			<constraint>REFERENCES role(roleid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_role(roleid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="to_roleid" type="C" size="255">
-			<constraint>REFERENCES role(roleid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_role(roleid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="permission" type="I" size="19" />
 
@@ -4427,16 +4427,16 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="datashare_role2rs">
+	<table name="vtiger_datashare_role2rs">
 		<field name="shareid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES datashare_module_rel(shareid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_datashare_module_rel(shareid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="share_roleid" type="C" size="255">
-			<constraint>REFERENCES role(roleid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_role(roleid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="to_roleandsubid" type="C" size="255">
-			<constraint>REFERENCES role(roleid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_role(roleid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="permission" type="I" size="19" />
 
@@ -4449,16 +4449,16 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="datashare_rs2grp">
+	<table name="vtiger_datashare_rs2grp">
 		<field name="shareid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES datashare_module_rel(shareid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_datashare_module_rel(shareid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="share_roleandsubid" type="C" size="255">
-			<constraint>REFERENCES role(roleid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_role(roleid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="to_groupid" type="I" size="19">
-			<constraint>REFERENCES groups(groupid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_groups(groupid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="permission" type="I" size="19" />
 
@@ -4471,16 +4471,16 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="datashare_rs2role">
+	<table name="vtiger_datashare_rs2role">
 		<field name="shareid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES datashare_module_rel(shareid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_datashare_module_rel(shareid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="share_roleandsubid" type="C" size="255">
-			<constraint>REFERENCES role(roleid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_role(roleid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="to_roleid" type="C" size="255">
-			<constraint>REFERENCES role(roleid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_role(roleid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="permission" type="I" size="19" />
 
@@ -4493,16 +4493,16 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="datashare_rs2rs">
+	<table name="vtiger_datashare_rs2rs">
 		<field name="shareid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES datashare_module_rel(shareid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_datashare_module_rel(shareid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="share_roleandsubid" type="C" size="255">
-			<constraint>REFERENCES role(roleid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_role(roleid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="to_roleandsubid" type="C" size="255">
-			<constraint>REFERENCES role(roleid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_role(roleid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="permission" type="I" size="19" />
 
@@ -4515,15 +4515,15 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="datashare_relatedmodules">
+	<table name="vtiger_datashare_relatedmodules">
 		<field name="datashare_relatedmodule_id" type="I" size="19">
 			<key />
 		</field>
 		<field name="tabid" type="I" size="19">
-			<constraint>REFERENCES tab(tabid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_tab(tabid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="relatedto_tabid" type="I" size="19">
-			<constraint>REFERENCES tab(tabid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_tab(tabid) ON DELETE CASCADE</constraint>
 		</field>
 		<index name="datashare_relatedmodules_tabid_idx">
 			<col>tabid</col>
@@ -4534,7 +4534,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="datashare_relatedmodule_permission">
+	<table name="vtiger_datashare_relatedmodule_permission">
 		<field name="shareid" type="I" size="19">
 			<key />
 		</field>
@@ -4550,7 +4550,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="parenttab">
+	<table name="vtiger_parenttab">
 		<field name="parenttabid" type="I" size="19">
 			<notnull />
 			<key />
@@ -4572,18 +4572,18 @@
 		</index>
 	</table>
 
-	<table name="tmp_read_user_sharing_per">
+	<table name="vtiger_tmp_read_user_sharing_per">
 		<field name="userid" type="I" size="11">
 			<key />
-			<constraint>REFERENCES users(id) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_users(id) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="tabid" type="I" size="11">
 			<key />
-			<constraint>REFERENCES tab(tabid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_tab(tabid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="shareduserid" type="I" size="11">
 			<key />
-			<constraint>REFERENCES users(id) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_users(id) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="tmp_read_user_sharing_per_userid_shareduserid_idx">
@@ -4593,18 +4593,18 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="tmp_read_group_sharing_per">
+	<table name="vtiger_tmp_read_group_sharing_per">
 		<field name="userid" type="I" size="11">
 			<key />
-			<constraint>REFERENCES users(id) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_users(id) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="tabid" type="I" size="11">
 			<key />
-			<constraint>REFERENCES tab(tabid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_tab(tabid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="sharedgroupid" type="I" size="11">
 			<key />
-			<constraint>REFERENCES groups(groupid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_groups(groupid) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="tmp_read_group_sharing_per_userid_sharedgroupid_idx">
@@ -4614,18 +4614,18 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="tmp_write_user_sharing_per">
+	<table name="vtiger_tmp_write_user_sharing_per">
 		<field name="userid" type="I" size="11">
 			<key />
-			<constraint>REFERENCES users(id) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_users(id) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="tabid" type="I" size="11">
 			<key />
-			<constraint>REFERENCES tab(tabid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_tab(tabid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="shareduserid" type="I" size="11">
 			<key />
-			<constraint>REFERENCES users(id) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_users(id) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="tmp_write_user_sharing_per_userid_shareduserid_idx">
@@ -4635,18 +4635,18 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="tmp_write_group_sharing_per">
+	<table name="vtiger_tmp_write_group_sharing_per">
 		<field name="userid" type="I" size="11">
 			<key />
-			<constraint>REFERENCES users(id) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_users(id) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="tabid" type="I" size="11">
 			<key />
-			<constraint>REFERENCES tab(tabid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_tab(tabid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="sharedgroupid" type="I" size="11">
 			<key />
-			<constraint>REFERENCES groups(groupid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_groups(groupid) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="tmp_write_group_sharing_per_UK1">
@@ -4656,22 +4656,22 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="tmp_read_user_rel_sharing_per">
+	<table name="vtiger_tmp_read_user_rel_sharing_per">
 		<field name="userid" type="I" size="11">
 			<key />
-			<constraint>REFERENCES users(id) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_users(id) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="tabid" type="I" size="11">
 			<key />
-			<constraint>REFERENCES tab(tabid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_tab(tabid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="relatedtabid" type="I" size="11">
 			<key />
-			<constraint>REFERENCES tab(tabid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_tab(tabid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="shareduserid" type="I" size="11">
 			<key />
-			<constraint>REFERENCES users(id) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_users(id) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="tmp_read_user_rel_sharing_per_userid_shared_reltabid_idx">
@@ -4682,22 +4682,22 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="tmp_read_group_rel_sharing_per">
+	<table name="vtiger_tmp_read_group_rel_sharing_per">
 		<field name="userid" type="I" size="11">
 			<key />
-			<constraint>REFERENCES users(id) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_users(id) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="tabid" type="I" size="11">
 			<key />
-			<constraint>REFERENCES tab(tabid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_tab(tabid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="relatedtabid" type="I" size="11">
 			<key />
-			<constraint>REFERENCES tab(tabid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_tab(tabid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="sharedgroupid" type="I" size="11">
 			<key />
-			<constraint>REFERENCES groups(groupid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_groups(groupid) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="tmp_read_group_rel_sharing_per_userid_sharedgroupid_tabid">
@@ -4708,22 +4708,22 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="tmp_write_user_rel_sharing_per">
+	<table name="vtiger_tmp_write_user_rel_sharing_per">
 		<field name="userid" type="I" size="11">
 			<key />
-			<constraint>REFERENCES users(id) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_users(id) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="tabid" type="I" size="11">
 			<key />
-			<constraint>REFERENCES tab(tabid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_tab(tabid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="relatedtabid" type="I" size="11">
 			<key />
-			<constraint>REFERENCES tab(tabid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_tab(tabid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="shareduserid" type="I" size="11">
 			<key />
-			<constraint>REFERENCES users(id) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_users(id) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="tmp_write_user_rel_sharing_per_userid_sharduserid_tabid_idx">
@@ -4734,22 +4734,22 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="tmp_write_group_rel_sharing_per">
+	<table name="vtiger_tmp_write_group_rel_sharing_per">
 		<field name="userid" type="I" size="11">
 			<key />
-			<constraint>REFERENCES users(id) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_users(id) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="tabid" type="I" size="11">
 			<key />
-			<constraint>REFERENCES tab(tabid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_tab(tabid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="relatedtabid" type="I" size="11">
 			<key />
-			<constraint>REFERENCES tab(tabid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_tab(tabid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="sharedgroupid" type="I" size="11">
 			<key />
-			<constraint>REFERENCES groups(groupid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_groups(groupid) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="tmp_write_group_rel_sharing_per_userid_sharedgroupid_tabid_idx">
@@ -4760,7 +4760,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="parenttabrel">
+	<table name="vtiger_parenttabrel">
 		<field name="parenttabid" type="I" size="3">
 			<notnull />
 		</field>
@@ -4778,7 +4778,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="campaigntype">
+	<table name="vtiger_campaigntype">
 		<field name="campaigntypeid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -4802,7 +4802,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="campaignstatus">
+	<table name="vtiger_campaignstatus">
 		<field name="campaignstatusid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -4825,7 +4825,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="expectedresponse">
+	<table name="vtiger_expectedresponse">
 		<field name="expectedresponseid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -4849,7 +4849,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="portal">
+	<table name="vtiger_portal">
 		<field name="portalid" type="I" size="19">
 			<key />
 		</field>
@@ -4869,7 +4869,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="announcement">
+	<table name="vtiger_announcement">
 		<field name="creatorid" type="I" size="19">
 			<key />
 		</field>
@@ -4885,7 +4885,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="chat_users">
+	<table name="vtiger_chat_users">
 		<field name="id" type="I" size="20">
 			<autoincrement />
 			<notnull />
@@ -4917,7 +4917,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="chat_msg">
+	<table name="vtiger_chat_msg">
 		<field name="id" type="I" size="20">
 			<autoincrement />
 			<notnull />
@@ -4926,7 +4926,7 @@
 		<field name="chat_from" type="I" size="20">
 			<default value="0" />
 			<notnull />
-			<constraint>REFERENCES chat_users(id) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_chat_users(id) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="chat_to" type="I" size="20">
 			<default value="0" />
@@ -4951,7 +4951,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="chat_pchat">
+	<table name="vtiger_chat_pchat">
 		<field name="id" type="I" size="20">
 			<autoincrement />
 			<notnull />
@@ -4959,7 +4959,7 @@
 		</field>
 		<field name="msg" type="I" size="20">
 			<default value="0"/>
-			<constraint>REFERENCES chat_msg(id) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_chat_msg(id) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="chat_pchat_msg_idx">
@@ -4969,7 +4969,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="chat_pvchat">
+	<table name="vtiger_chat_pvchat">
 		<field name="id" type="I" size="20">
 			<autoincrement />
 			<notnull />
@@ -4977,7 +4977,7 @@
 		</field>
 		<field name="msg" type="I" size="20">
 			<default value="0"/>
-			<constraint>REFERENCES chat_msg(id) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_chat_msg(id) ON DELETE CASCADE</constraint>
 		</field>
 		<index name="chat_pvchat_msg_idx">
 			<col>msg</col>
@@ -4986,7 +4986,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="freetags">
+	<table name="vtiger_freetags">
 		<field name="id" type="I" size="19">
 			<notnull />
 			<key />
@@ -5001,7 +5001,7 @@
 		</field>
 	</table>
 
-	<table name="freetagged_objects">
+	<table name="vtiger_freetagged_objects">
 		<field name="tag_id" type="I" size="20">
 			<notnull />
 			<default value="0" />
@@ -5033,7 +5033,7 @@
 		</index>
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
-	<table name="emaildetails">
+	<table name="vtiger_emaildetails">
 		<field name="emailid" type="I" size="19">
 			<notnull />
 			<key />
@@ -5065,7 +5065,7 @@
 		</field>
 	</table>
 
-	<table name="invitees">
+	<table name="vtiger_invitees">
 		<field name="activityid" type="I" size="19">
 			<KEY/>
 		</field>
@@ -5074,7 +5074,7 @@
 		</field>
 	</table>
 
-	<table name="inventorytaxinfo">
+	<table name="vtiger_inventorytaxinfo">
 		<field name="taxid" type="I" size="3">
 			<KEY/>
 			<notnull />
@@ -5092,10 +5092,10 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="producttaxrel">
+	<table name="vtiger_producttaxrel">
 		<field name="productid" type="I" size="11">
 			<notnull />
-			<constraint>REFERENCES products(productid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_products(productid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="taxid" type="I" size="3">
 			<notnull />



From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 12 14:08:59 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 12 Jun 2006 21:08:59 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231297=3A?=
 =?utf-8?q?_alternative_database_backends=3F?=
Message-ID: <076.1f5ecc93726b0e4d2e62c44198f6448a@vtiger.fosslabs.com>

#1297: alternative database backends?
-------------------------------+--------------------------------------------
 Reporter:  martti at aplcomplfi  |       Owner:  developer
     Type:  enhancement        |      Status:  new      
 Priority:  major              |   Milestone:           
Component:  vtigercrm          |     Version:  5.0.0    
 Keywords:  mysql              |  
-------------------------------+--------------------------------------------
 Is it possible to replace mysql by another database mrg?
 Are the docs which I can make use of for that purpose.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1297>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 12 14:09:23 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 12 Jun 2006 21:09:23 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231297=3A?=
 =?utf-8?q?_alternative_database_backends=3F?=
In-Reply-To: <076.1f5ecc93726b0e4d2e62c44198f6448a@vtiger.fosslabs.com>
References: <076.1f5ecc93726b0e4d2e62c44198f6448a@vtiger.fosslabs.com>
Message-ID: <085.ed9f6ca7f7a3b7972a5df7f2eca02277@vtiger.fosslabs.com>

#1297: alternative database backends?
--------------------------------+-------------------------------------------
  Reporter:  martti at aplcomplfi  |       Owner:  developer
      Type:  enhancement        |      Status:  new      
  Priority:  major              |   Milestone:           
 Component:  vtigercrm          |     Version:  5.0.0    
Resolution:                     |    Keywords:  mysql    
--------------------------------+-------------------------------------------
-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1297>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 12 14:24:17 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 12 Jun 2006 21:24: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.c0517a3839346f3d4874b31469d8d63f@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 [7005]) Fixed issue with sub modules being rendered as related lists
 caused by changeset:5571, which messes up the row counts.  Refs #750.

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/750>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 12 14:24:18 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 12 Jun 2006 21:24:18 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7005 -
	/vtigercrm/branches/4.2/include/utils.php
Message-ID: <20060612212418.962687E8C1E@vtiger.fosslabs.com>

Author: allanbush
Date: Mon Jun 12 15:24:14 2006
New Revision: 7005

Log:
Fixed issue with sub modules being rendered as related lists caused by changeset:5571, which messes up the row counts.  Refs #750.

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 Mon Jun 12 15:24:14 2006
@@ -3050,7 +3050,7 @@
                 }
         }
 
-	$relmodule = $_REQUEST['module'] == $module || $_REQUEST['module'] == 'Home' ? '' : $module;
+	$relmodule = ($_REQUEST['module'] == $module || !$relatedlist) || $_REQUEST['module'] == 'Home' ? '' : $module;
 	$start = $relmodule.'start';
 	$end_val = $relmodule.'end_val'; 
 	for ($i=$navigation_array[$start]; $i<=$navigation_array[$end_val]; $i++)



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 12 14:26:03 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 12 Jun 2006 21:26:03 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7006 -
 /vtigercrm/branches/4.2/modules/Products/addPbProductRelToDB.php
Message-ID: <20060612212603.0A5B07E8C1D@vtiger.fosslabs.com>

Author: allanbush
Date: Mon Jun 12 15:26:01 2006
New Revision: 7006

Log:
Fixed sql injection problems.

Modified:
    vtigercrm/branches/4.2/modules/Products/addPbProductRelToDB.php

Modified: vtigercrm/branches/4.2/modules/Products/addPbProductRelToDB.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Products/addPbProductRelToDB.php (original)
+++ vtigercrm/branches/4.2/modules/Products/addPbProductRelToDB.php Mon Jun 12 15:26:01 2006
@@ -16,19 +16,21 @@
 require_once('include/database/PearDatabase.php');
 $idlist = $_POST['idlist'];
 $returnmodule=$_REQUEST['return_module'];
-$pricebook_id=$_REQUEST['pricebook_id'];
-$productid=$_REQUEST['product_id'];
+$pricebook_id=(int)$_REQUEST['pricebook_id'];
+$productid=(int)$_REQUEST['product_id'];
 if(isset($_REQUEST['pricebook_id']) && $_REQUEST['pricebook_id']!='')
 {
 	//split the string and store in an array
 	$storearray = explode(";",$idlist);
+	array_filter($storearray);
 	foreach($storearray as $id)
 	{
+		$id = (int) $id;
 		$lp_name = $id.'_listprice';
 		$list_price = $_REQUEST[$lp_name];
 		//Updating the pricebook product rel table
 		$vtlog->logthis("Products :: Inserting products to price book","info");
-		$query= "insert into pricebookproductrel (pricebookid,productid,listprice) values(".$pricebook_id.",".$id.",".$list_price.")";
+		$query= "insert into pricebookproductrel (pricebookid,productid,listprice) values(".$pricebook_id.",".$id.",".$adb->quote($list_price).")";
 		$adb->query($query);
 	}
 	header("Location: index.php?module=Products&action=PriceBookDetailView&record=".$pricebook_id);
@@ -37,13 +39,15 @@
 {
 	//split the string and store in an array
 	$storearray = explode(";",$idlist);
+	array_filter($storearray);
 	foreach($storearray as $id)
 	{
+		$id = (int) $id;
 		$lp_name = $id.'_listprice';
 		$list_price = $_REQUEST[$lp_name];
 		//Updating the pricebook product rel table
 		$vtlog->logthis("Products :: Inserting PriceBooks to Product","info");
-		$query= "insert into pricebookproductrel (pricebookid,productid,listprice) values(".$id.",".$productid.",".$list_price.")";
+		$query= "insert into pricebookproductrel (pricebookid,productid,listprice) values(".$id.",".$productid.",".$adb->quote($list_price).")";
 		$adb->query($query);
 	}
 	header("Location: index.php?module=Products&action=DetailView&record=".$productid);



From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 12 16:13:12 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 12 Jun 2006 23:13:12 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231298=3A?=
 =?utf-8?q?_revert_r7003=3A7004_prefix_vtiger=5F_to_all_tablenames?=
Message-ID: <076.32456f312efcd1431e178d7f1df1ccb0@vtiger.fosslabs.com>

#1298: revert r7003:7004 prefix vtiger_ to all tablenames
-----------------------+----------------------------------------------------
 Reporter:  jeffk      |       Owner:  don  
     Type:  defect     |      Status:  new  
 Priority:  major      |   Milestone:  5.0.0
Component:  vtigercrm  |     Version:  5.0.0
 Keywords:  database   |  
-----------------------+----------------------------------------------------
 These are scary changesets, and I think they're going to break a lot of
 code in ways yet to be found. I'm not completely opposed to tablename
 prefixes, but there needs to be a consensus and a lot of eyeballs
 following the change.

 Please document (with a trac ticket) why we need these, and consider
 whether this amount of change can be sustained between beta 1 and beta2
 status.

 If you decided to revert the changesets, you want to undo r7003 and r7004,
 taking you back to r7002. In a working copy (aka checkout) of
 vtigercrm/trunk, the command would look something like this:
 {{{
 $ svn merge -r 7004:7002
 http://username at vtiger.fosslabs.com/svn/vtiger/vtigercrm/trunk
 }}}
 Then commit and ref this ticket.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1298>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 12 22:00:34 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 13 Jun 2006 05:00:34 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=2359=3A_r?=
 =?utf-8?q?eplace_jpgraph_by_Image=5Fgraph?=
In-Reply-To: <076.b821c43b0373542aacafa531d0ee60aa@vtiger.fosslabs.com>
References: <076.b821c43b0373542aacafa531d0ee60aa@vtiger.fosslabs.com>
Message-ID: <085.4c02e1684e810e5d7fc49e069e1e7c96@vtiger.fosslabs.com>

#59: replace jpgraph by Image_graph
------------------------+---------------------------------------------------
  Reporter:  fathi      |       Owner:  developer
      Type:  task       |      Status:  closed   
  Priority:  major      |   Milestone:  4.2.5    
 Component:  vtigercrm  |     Version:  4.2.3    
Resolution:  fixed      |    Keywords:           
------------------------+---------------------------------------------------
Changes (by allanbush):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 [6998] closes this as well.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/59>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 12 22:07:59 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 13 Jun 2006 05:07:59 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=2349=3A_R?=
 =?utf-8?q?emove_files_from_previous_versions_in_4=2E2?=
In-Reply-To: <076.3af4fecaf060a1d1e8bbd0759bce146e@vtiger.fosslabs.com>
References: <076.3af4fecaf060a1d1e8bbd0759bce146e@vtiger.fosslabs.com>
Message-ID: <085.064dfbf0adb82b7b777f8f3cc2172713@vtiger.fosslabs.com>

#49: Remove files from previous versions in 4.2
------------------------+---------------------------------------------------
  Reporter:  mfedyk     |       Owner:  developer
      Type:  defect     |      Status:  new      
  Priority:  trivial    |   Milestone:  4.2.5    
 Component:  vtigercrm  |     Version:  4.2.4rc2 
Resolution:             |    Keywords:           
------------------------+---------------------------------------------------
Comment (by allanbush):

 changetsets [6981], [6980] and [6978] should reference this.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/49>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 12 22:19:41 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 05:19:41 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7007 -
 /vtigercrm/branches/4.2/include/database/PearDatabase.php
Message-ID: <20060613051941.9BBC87E8C31@vtiger.fosslabs.com>

Author: allanbush
Date: Mon Jun 12 23:19:33 2006
New Revision: 7007

Log:
Undoing change committed in changeset:6981 as it including debugging information which doesn't need to be checked in.

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 Mon Jun 12 23:19:33 2006
@@ -15,8 +15,7 @@
 
 require_once('include/logging.php');
 include('adodb/adodb.inc.php');
-require_once("adodb/adodb-xmlschema03.inc.php");
-require_once("include/utils.php");
+require_once("adodb/adodb-xmlschema.inc.php");
 
 require_once('vtigerlogger.php');
 global $vtlog;
@@ -665,7 +664,7 @@
 		}
 		
 		$this->database = ADONewConnection($this->dbType);
-		$this->database->debug = true;
+		//$this->database->debug = true;
 		
 		$this->database->Connect($this->dbHostName, $this->userName, $this->userPassword, $this->dbName);
 		$this->database->LogSQL($this->enableSQLlog);



From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 12 22:24:43 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 13 Jun 2006 05:24:43 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=2340=3A_c?=
 =?utf-8?q?reate=5Fdefault=5Fusers=28=29_outputs_blank_line?=
In-Reply-To: <076.0ca26064fb8fcb73ccc115fc38d48ac3@vtiger.fosslabs.com>
References: <076.0ca26064fb8fcb73ccc115fc38d48ac3@vtiger.fosslabs.com>
Message-ID: <085.a98ca3789641ff7e0298ea3cb87634fa@vtiger.fosslabs.com>

#40: create_default_users() outputs blank line
------------------------+---------------------------------------------------
  Reporter:  mfedyk     |       Owner:  developer
      Type:  defect     |      Status:  closed   
  Priority:  trivial    |   Milestone:  4.2.5    
 Component:  vtigercrm  |     Version:  4.2.4rc1 
Resolution:  fixed      |    Keywords:           
------------------------+---------------------------------------------------
Changes (by allanbush):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/40>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 12 22:38:58 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 13 Jun 2006 05:38:58 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=2341=3A_P?=
 =?utf-8?q?eardatabase=2Ephp=2C_minor_erroneous_coding_in_createTables?=
In-Reply-To: <076.39e4a5f55adc4717e869543b8e6a41e1@vtiger.fosslabs.com>
References: <076.39e4a5f55adc4717e869543b8e6a41e1@vtiger.fosslabs.com>
Message-ID: <085.a6847eb6d427616d5791ba68277ef49b@vtiger.fosslabs.com>

#41: Peardatabase.php, minor erroneous coding in createTables
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  allanbush                
      Type:  defect     |      Status:  assigned                 
  Priority:  trivial    |   Milestone:  4.2.5                    
 Component:  vtigercrm  |     Version:  4.2.4rc1                 
Resolution:             |    Keywords:  peardatabase createtables
------------------------+---------------------------------------------------
Changes (by allanbush):

  * status:  new => assigned
  * owner:  developer => allanbush

Comment:

 Interesting it seems that what this patch fixes is the variable $schema
 and $sehema are being interchanged in this part of the code.  The end
 result is that adodb debug mode isn't being set here before loading the
 database schema.

 It looks like the debugging mode is too verbose (gives status reports as
 well as errors) so this attempt to set the debugging mode should be
 removed.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/41>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 12 22:43:02 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 13 Jun 2006 05:43:02 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=2341=3A_P?=
 =?utf-8?q?eardatabase=2Ephp=2C_minor_erroneous_coding_in_createTables?=
In-Reply-To: <076.39e4a5f55adc4717e869543b8e6a41e1@vtiger.fosslabs.com>
References: <076.39e4a5f55adc4717e869543b8e6a41e1@vtiger.fosslabs.com>
Message-ID: <085.12acabe85e13facca9d1ec4b65f809ae@vtiger.fosslabs.com>

#41: Peardatabase.php, minor erroneous coding in createTables
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  allanbush                
      Type:  defect     |      Status:  closed                   
  Priority:  trivial    |   Milestone:  4.2.5                    
 Component:  vtigercrm  |     Version:  4.2.4rc1                 
Resolution:  fixed      |    Keywords:  peardatabase createtables
------------------------+---------------------------------------------------
Changes (by allanbush):

  * resolution:  => fixed
  * status:  assigned => closed

Comment:

 (In [7008]) Fixed typo in variable name to set debugging mode on database
 creation and commented it out so debugging mode is not set by default.
 Closes #41.

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/41>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 12 22:43:02 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 05:43:02 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7008 -
 /vtigercrm/branches/4.2/include/database/PearDatabase.php
Message-ID: <20060613054302.9EB127E8C3D@vtiger.fosslabs.com>

Author: allanbush
Date: Mon Jun 12 23:42:58 2006
New Revision: 7008

Log:
Fixed typo in variable name to set debugging mode on database creation and commented it out so debugging mode is not set by default.  Closes #41.

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 Mon Jun 12 23:42:58 2006
@@ -807,12 +807,10 @@
 	//$db->debug = true;
 	
 
-	//$this->println("ADODB createTables connect status=".$db->Connect($this->dbHostName, $this->userName, $this->userPassword, $this->dbName));
 	$schema = new adoSchema( $db );
-	//Debug Adodb XML Schema
-	$sehema->XMLS_DEBUG = TRUE;
-	//Debug Adodb
-	$sehema->debug = true;
+	// Debug Adodb XML Schema
+	// $schema->XMLS_DEBUG = TRUE;
+	// $schema->debug = true;
 	$sql = $schema->ParseSchema( $schemaFile );
 
 	$this->println("--------------Starting the table creation------------------");



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 12 22:55:23 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 05:55:23 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7009 -
 /vtigercrm/branches/4.2/modules/Activities/OpenListView.html
Message-ID: <20060613055523.D30F17E8C37@vtiger.fosslabs.com>

Author: allanbush
Date: Mon Jun 12 23:55:21 2006
New Revision: 7009

Log:
Fixing mime-type properties.

Modified:
    vtigercrm/branches/4.2/modules/Activities/OpenListView.html   (props changed)



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 12 23:00:24 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 06:00:24 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7010 - in
 /vtigercrm/branches/4.2/modules: Activities/OpenListView.html
 Potentials/ListViewTop.html
Message-ID: <20060613060024.924187E8C41@vtiger.fosslabs.com>

Author: allanbush
Date: Tue Jun 13 00:00:22 2006
New Revision: 7010

Log:
Fixing mime-type properties.

Modified:
    vtigercrm/branches/4.2/modules/Activities/OpenListView.html   (props changed)
    vtigercrm/branches/4.2/modules/Potentials/ListViewTop.html   (props changed)



From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 12 23:02:25 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 13 Jun 2006 06:02:25 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231263=3A?=
 =?utf-8?q?_Miscellaneous_Formatting_Issues_on_Home_Page?=
In-Reply-To: <076.5f75ce96bab4ec540e83025d032a7109@vtiger.fosslabs.com>
References: <076.5f75ce96bab4ec540e83025d032a7109@vtiger.fosslabs.com>
Message-ID: <085.a040b8a842ac9cc622e5cb29fbc4416b@vtiger.fosslabs.com>

#1263: Miscellaneous Formatting Issues on Home Page
------------------------+---------------------------------------------------
  Reporter:  briand     |       Owner:  developer
      Type:  defect     |      Status:  closed   
  Priority:  minor      |   Milestone:  4.2.5    
 Component:  vtigercrm  |     Version:  4.2.4rc3 
Resolution:  fixed      |    Keywords:           
------------------------+---------------------------------------------------
Changes (by allanbush):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 (In [7011]) Applied patch from #1263, which cleans up the html under the
 home tab.  Closes #1263.

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1263>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 12 23:02:26 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 06:02:26 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7011 - in
 /vtigercrm/branches/4.2/modules: Accounts/ Activities/ Activities/language/
 Home/ Potentials/ Potentials/language/
Message-ID: <20060613060226.61DAD7E8C47@vtiger.fosslabs.com>

Author: allanbush
Date: Tue Jun 13 00:02:21 2006
New Revision: 7011

Log:
Applied patch from #1263, which cleans up the html under the home tab.  Closes #1263.

Modified:
    vtigercrm/branches/4.2/modules/Accounts/ListViewTop.html
    vtigercrm/branches/4.2/modules/Accounts/ListViewTop.php
    vtigercrm/branches/4.2/modules/Activities/OpenListView.html
    vtigercrm/branches/4.2/modules/Activities/language/en_us.lang.php
    vtigercrm/branches/4.2/modules/Home/index.php
    vtigercrm/branches/4.2/modules/Potentials/ListViewTop.html
    vtigercrm/branches/4.2/modules/Potentials/ListViewTop.php
    vtigercrm/branches/4.2/modules/Potentials/language/en_us.lang.php

Modified: vtigercrm/branches/4.2/modules/Accounts/ListViewTop.html
==============================================================================
--- vtigercrm/branches/4.2/modules/Accounts/ListViewTop.html (original)
+++ vtigercrm/branches/4.2/modules/Accounts/ListViewTop.html Tue Jun 13 00:02:21 2006
@@ -22,7 +22,7 @@
 <tr><td colspan=3 bgcolor="#000000" style="height:1px;"></td></tr>
 <tr><td colspan=3>
 <div id="home_myaccount" style="display:block;">
-<table cellpadding="0" cellspacing="0" width="100%" border="0" class="FormBorder"><tbody>
+<table cellpadding="0" cellspacing="0" width="100%" border="0"><tbody>
 	<tr height="20" class="moduleListTitle">
 	<td WIDTH="1" class="blackLine"><IMG SRC="{IMAGE_PATH}blank.gif">
 		<td width="70%" class="moduleListTitle">&nbsp;{MOD.LBL_LIST_ACCOUNT_NAME}</td>
@@ -40,13 +40,12 @@
     	<td WIDTH="1" class="blackLine"><IMG SRC="{IMAGE_PATH}blank.gif"></td>
 </tr>
 <!-- END: row -->
-<tr><td COLSPAN="9"></td></tr>
+<tr><td COLSPAN="9" class="blackLine"><IMG SRC="{IMAGE_PATH}blank.gif"></td></tr>
 </table>
 </div>
 </td></tr>
 </table>
-<BR><BR>
 <script language='Javascript'>
         var leftpanelistarray=new Array('home_myaccount');
-  setExpandCollapse_gen()</script
+  setExpandCollapse_gen()</script>
 <!-- END: main -->

Modified: vtigercrm/branches/4.2/modules/Accounts/ListViewTop.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Accounts/ListViewTop.php (original)
+++ vtigercrm/branches/4.2/modules/Accounts/ListViewTop.php Tue Jun 13 00:02:21 2006
@@ -82,9 +82,10 @@
 }
 
 $xtpl->parse("main");
-if (count($open_accounts_list)>0) $xtpl->out("main");
-else echo "<em>".$current_module_strings['NTC_NONE_SCHEDULED']."</em>";
-echo "<BR>";
+if (count($open_accounts_list)>0) {
+	$xtpl->out("main");
+	echo "<BR>";
+}
 // Stick on the form footer
 echo get_form_footer();
 

Modified: vtigercrm/branches/4.2/modules/Activities/OpenListView.html
==============================================================================
--- vtigercrm/branches/4.2/modules/Activities/OpenListView.html (original)
+++ vtigercrm/branches/4.2/modules/Activities/OpenListView.html Tue Jun 13 00:02:21 2006
@@ -46,7 +46,7 @@
 			<td width="10%" class="moduleListTitle">&nbsp;{MOD.LBL_LIST_RECURRING_TYPE}</td>
 	<td WIDTH="1" class="blackLine"><IMG SRC="{IMAGE_PATH}blank.gif">
 	  </tr>
-	<tr><td COLSPAN="17" class="blackLine"><IMG SRC="{IMAGE_PATH}/blank.gif"></td></tr>
+	<tr><td COLSPAN="17" class="blackLine"><IMG SRC="{IMAGE_PATH}blank.gif"></td></tr>
 
 
 <!-- BEGIN: row -->
@@ -77,7 +77,7 @@
 	  	<td WIDTH="1" class="blackLine"><IMG SRC="{IMAGE_PATH}blank.gif"></td>
 </tr>
 <!-- END: row -->
-	<tr><td COLSPAN="17" class="blackLine"><IMG SRC="{IMAGE_PATH}/blank.gif"></td></tr>
+	<tr><td COLSPAN="17" class="blackLine"><IMG SRC="{IMAGE_PATH}blank.gif"></td></tr>
 </table>
 </div>
 </td></tr>

Modified: vtigercrm/branches/4.2/modules/Activities/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Activities/language/en_us.lang.php (original)
+++ vtigercrm/branches/4.2/modules/Activities/language/en_us.lang.php Tue Jun 13 00:02:21 2006
@@ -66,7 +66,6 @@
 'LBL_LIST_RECURRING_TYPE'=>'Recurring Type',
 
 'ERR_DELETE_RECORD'=>"A record number must be specified to delete the account.",
-'NTC_NONE_SCHEDULED'=>'None scheduled.',
 
 // Added fields for Attachments in Activities/SubPanelView.php
 'LBL_ATTACHMENTS'=>'Attachments',

Modified: vtigercrm/branches/4.2/modules/Home/index.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Home/index.php (original)
+++ vtigercrm/branches/4.2/modules/Home/index.php Tue Jun 13 00:02:21 2006
@@ -68,7 +68,9 @@
 		include("modules/Accounts/ListViewTop.php");
 	}
 }
-	
+?>
+<br>
+<?php
 if($tab_per_Data[2] == 0)
 {
 	if($permissionData[2][3] == 0)

Modified: vtigercrm/branches/4.2/modules/Potentials/ListViewTop.html
==============================================================================
--- vtigercrm/branches/4.2/modules/Potentials/ListViewTop.html (original)
+++ vtigercrm/branches/4.2/modules/Potentials/ListViewTop.html Tue Jun 13 00:02:21 2006
@@ -22,7 +22,6 @@
 <tr><td colspan=3 bgcolor="#000000" style="height:1px;"></td></tr>
 <tr><td colspan=3>
 <div id="home_mypot" style="display:block;">
-<div id="{DIVID}" style="display:block;">
 <table cellpadding="0" cellspacing="0" width="100%" border="0"><tbody>
 	<tr height="20" class="moduleListTitle">
 	<td WIDTH="1" class="blackLine"><IMG SRC="{IMAGE_PATH}blank.gif">

Modified: vtigercrm/branches/4.2/modules/Potentials/ListViewTop.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Potentials/ListViewTop.php (original)
+++ vtigercrm/branches/4.2/modules/Potentials/ListViewTop.php Tue Jun 13 00:02:21 2006
@@ -93,9 +93,10 @@
 }
 
 $xtpl->parse("main");
-if (count($open_potentials_list)>0) $xtpl->out("main");
-else echo "<em>".$current_module_strings['NTC_NONE_SCHEDULED']."</em>";
-echo "<BR>";
+if (count($open_potentials_list)>0) {
+	$xtpl->out("main");
+	echo "<BR>";
+}
 // Stick on the form footer
 echo get_form_footer();
 

Modified: vtigercrm/branches/4.2/modules/Potentials/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Potentials/language/en_us.lang.php (original)
+++ vtigercrm/branches/4.2/modules/Potentials/language/en_us.lang.php Tue Jun 13 00:02:21 2006
@@ -57,8 +57,6 @@
 
 'NTC_REMOVE_OPP_CONFIRMATION'=>'Are you sure you want to remove this contact from this opportunity?',
 
-'NTC_NONE_SCHEDULED'=>'None scheduled.',
-
 'LBL_SELECT_OPPOPTUNITY'=>'Select Potential',
 'LBL_GENERAL_INFORMATION'=>'General Information',
 



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 00:05:01 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 07:05:01 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7012 - in /vtigercrm/trunk:
 include/utils/SearchUtils.php modules/Dashboard/Entity_charts.php
Message-ID: <20060613070503.CDFD57D809C@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 13 01:04:55 2006
New Revision: 7012

Log:
changes made to show proper records from dashboard

Modified:
    vtigercrm/trunk/include/utils/SearchUtils.php
    vtigercrm/trunk/modules/Dashboard/Entity_charts.php

Modified: vtigercrm/trunk/include/utils/SearchUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/SearchUtils.php (original)
+++ vtigercrm/trunk/include/utils/SearchUtils.php Tue Jun 13 01:04:55 2006
@@ -357,6 +357,12 @@
 			}
 		}
 	}
+	if($_REQUEST['type'] == 'entchar')
+	{
+		$search = array('Un Assigned','%','like');
+		$replace = array('','','=');
+		$where= str_replace($search,$replace,$where);
+	}
 	$log->debug("Exiting BasicSearch method ...");
 	return $where;
 }

Modified: vtigercrm/trunk/modules/Dashboard/Entity_charts.php
==============================================================================
--- vtigercrm/trunk/modules/Dashboard/Entity_charts.php (original)
+++ vtigercrm/trunk/modules/Dashboard/Entity_charts.php Tue Jun 13 01:04:55 2006
@@ -213,7 +213,7 @@
 
 					if($graph_for == "accountid") $graph_for = "account_id";
 					
-					$link_val="index.php?module=".$module."&action=index&search_text=".$name."&search_field=".$graph_for."&searchtype=BasicSearch&query=true";
+					$link_val="index.php?module=".$module."&action=index&search_text=".$name."&search_field=".$graph_for."&searchtype=BasicSearch&query=true&type=entchar";
 
 					if($graph_for == "account_id") $graph_for = "accountid";
 



From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 13 00:11:11 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 13 Jun 2006 07:11:11 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23308=3A_?=
 =?utf-8?q?Drilldown_for_leads_by_industry_shows_no_data?=
In-Reply-To: <076.5d99378440512439b590243aefe328d5@vtiger.fosslabs.com>
References: <076.5d99378440512439b590243aefe328d5@vtiger.fosslabs.com>
Message-ID: <085.7c9934b07444d505b39806ebbec80927@vtiger.fosslabs.com>

#308: Drilldown for leads by industry shows no data
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  philip
      Type:  defect     |      Status:  closed
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by anonymous):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/308>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 13 00:11:51 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 13 Jun 2006 07:11:51 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23311=3A_?=
 =?utf-8?q?SalesOrder_by_Accounts_on_drilldown_shows_list_view?=
In-Reply-To: <076.29219bf9f0339a70006794e41204abf3@vtiger.fosslabs.com>
References: <076.29219bf9f0339a70006794e41204abf3@vtiger.fosslabs.com>
Message-ID: <085.d0afad5261ad2ffe27be38f532f9295c@vtiger.fosslabs.com>

#311: SalesOrder by Accounts on drilldown shows list view
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  philip   
      Type:  defect     |      Status:  closed   
  Priority:  critical   |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:  fixed      |    Keywords:  dashboard
------------------------+---------------------------------------------------
Changes (by anonymous):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/311>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 13 00:12:38 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 13 Jun 2006 07:12:38 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231199=3A?=
 =?utf-8?q?_DashBoard_-_Leads_by_Industry_Issue?=
In-Reply-To: <076.3535dcc3d95c5df1eb70a7d4b867c8f6@vtiger.fosslabs.com>
References: <076.3535dcc3d95c5df1eb70a7d4b867c8f6@vtiger.fosslabs.com>
Message-ID: <085.d702bfa2e26cff4018d8f7b592300fc8@vtiger.fosslabs.com>

#1199: DashBoard - Leads by Industry Issue
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  philip
      Type:  defect     |      Status:  closed
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by anonymous):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1199>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 13 00:13:33 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 13 Jun 2006 07:13:33 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231296=3A?=
 =?utf-8?q?_Sort_order_hide_the_related_datas?=
In-Reply-To: <076.89346f6520426628c32e65be31646f8e@vtiger.fosslabs.com>
References: <076.89346f6520426628c32e65be31646f8e@vtiger.fosslabs.com>
Message-ID: <085.c6429fa38b3255449b7076713e4bd7a1@vtiger.fosslabs.com>

#1296: Sort order hide the related datas
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  developer                   
      Type:  defect     |      Status:  new                         
  Priority:  critical   |   Milestone:                              
 Component:  vtigercrm  |     Version:  5.0.0                       
Resolution:             |    Keywords:  related, data, sorder, order
------------------------+---------------------------------------------------
Comment (by abos):

 See on products, vendors, salesorders, quotes, account.... modules with
 the demo datas.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1296>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 13 00:13:55 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 13 Jun 2006 07:13:55 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231200=3A?=
 =?utf-8?q?_Dashboard_-_Sales_By_Account_Issue?=
In-Reply-To: <076.a611d6f1b0bc365b4af107afbcdf3dc9@vtiger.fosslabs.com>
References: <076.a611d6f1b0bc365b4af107afbcdf3dc9@vtiger.fosslabs.com>
Message-ID: <085.0405dab04a785c068ef026d5e16d9ac8@vtiger.fosslabs.com>

#1200: Dashboard - Sales By Account Issue
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  philip
      Type:  defect     |      Status:  closed
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by anonymous):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1200>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 02:57:26 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 09:57:26 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7013 -
	/vtigercrm/trunk/data/CRMEntity.php
Message-ID: <20060613095726.AE1D97E8C31@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 13 03:57:18 2006
New Revision: 7013

Log:
users module added in CRMEntity

Modified:
    vtigercrm/trunk/data/CRMEntity.php

Modified: vtigercrm/trunk/data/CRMEntity.php
==============================================================================
--- vtigercrm/trunk/data/CRMEntity.php (original)
+++ vtigercrm/trunk/data/CRMEntity.php Tue Jun 13 03:57:18 2006
@@ -45,7 +45,7 @@
 	global $current_user, $adb;//$adb added by raju for mass mailing
 	$insertion_mode = $this->mode;
 
-	$this->db->println("TRANS saveentity starts");
+	$this->db->println("TRANS saveentity starts $module");
 	$this->db->startTransaction();
 	
 	// Code included by Jaguar - starts    
@@ -197,15 +197,6 @@
 		}
 	}
 
-
-	/*if($module == 'Emails' || $module == 'Notes' || $module == 'HelpDesk')
-	{
-		if(isset($_FILES['filename']['name']) && $_FILES['filename']['name']!='')
-		{
-			$this->insertIntoAttachment($this->id,$module);
-		}
-	}*/
-
 	$this->db->completeTransaction();
         $this->db->println("TRANS saveentity ends");
   }
@@ -437,10 +428,6 @@
 		$this->id = $current_id;
 	}
 
-	//$sql = "insert into vtiger_crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime,modifiedtime) values(".$current_id.",".$current_user->id.",".$ownerid.",'".$module."','".$this->column_fields['description']."',".$adb->formatString("crmentity","createdtime",$date_var).",".$adb->formatString("crmentity","modifiedtime",$date_var).")";
-	//$adb->query($sql);
-	//echo $sql;
-	//$this->id = $current_id;
     }
 
 
@@ -543,6 +530,11 @@
 	  else
 	  {
 		  $column = $this->tab_name_index[$table_name];
+		  if($column == 'id' && $table_name == 'users')
+		  {
+		 	$currentuser_id = $adb->getUniqueID("users");
+			$this->id = $currentuser_id;
+		  }
 		  $value = $this->id;
 	  }
 
@@ -629,28 +621,7 @@
 			  }
 			  if($table_name == 'vtiger_products' && $columname == 'imagename')
 			  {
-			/*	  //Product Image Handling done
-				  if($_FILES['imagename']['name'] != '')
-				  {
-
-					  $prd_img_arr = upload_product_image_file("edit",$this->id);
-					  //print_r($prd_img_arr);
-					  if($prd_img_arr["status"] == "yes")
-					  {
-						  $fldvalue ="'".$prd_img_arr["file_name"]."'";
-					  }
-					  else
-					  {
-						  $fldvalue ="'".getProductImageName($this->id)."'";
-					  }	 
-
-
-				  }
-				  else
-				  {
-					  $fldvalue ="'".getProductImageName($this->id)."'";
-				  }
-		      */		  
+					  
 
 			  }
 			  if($table_name != 'vtiger_ticketcomments')
@@ -692,32 +663,6 @@
 				  $fldvalue = from_html($adb->formatString($table_name,$columname,$fldvalue),($insertion_mode == 'edit')?true:false);
 				  //echo ' updatevalue is ............. ' .$fldvalue;
 			  }
-			  elseif($table_name == 'vtiger_products' && $columname == 'imagename')
-			  {
-				  //Product Image Handling done
-			/*	  if($_FILES['imagename']['name'] != '')
-				  {
-
-					  $prd_img_arr = upload_product_image_file("create",$this->id);
-					  //print_r($prd_img_arr);
-					  if($prd_img_arr["status"] == "yes")
-					  {
-						  $fldvalue ="'".$prd_img_arr["file_name"]."'";
-					  }
-					  else
-					  {
-						  $fldvalue ="''";
-					  }	 
-
-
-				  }
-				  else
-				  {
-					  $fldvalue ="''";
-				  }
-			*/	  
-
-			  }
 			  //code by richie ends
 			  $column .= ", ".$columname;
 			  $value .= ", ".$fldvalue."";
@@ -733,13 +678,11 @@
 	  {
 		  if($_REQUEST['module'] == 'Potentials')
 		  {
-			  $dbquery = 'select vtiger_sales_stage from vtiger_potential where potentialid = '.$this->id;
+			  $dbquery = 'select sales_stage from vtiger_potential where potentialid = '.$this->id;
 			  $sales_stage = $adb->query_result($adb->query($dbquery),0,'sales_stage');
 			  if($sales_stage != $_REQUEST['sales_stage'])
 			  {
 				  $date_var = date('YmdHis');
-				  //$sql = "insert into vtiger_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).")";
-				  //Changed to insert the close date based on user date format - after 4.2 patch2
 				  $closingdate = getDBInsertDateValue($_REQUEST['closingdate']);
 				  $sql = "insert into vtiger_potstagehistory values('',".$this->id.",'".$_REQUEST['amount']."','".$sales_stage."','".$_REQUEST['probability']."',0,".$adb->formatString("vtiger_potstagehistory","closedate",$closingdate).",".$adb->formatString("vtiger_potstagehistory","lastmodified",$date_var).")";
 				  $adb->query($sql);
@@ -1153,36 +1096,12 @@
 	
   function retrieve_entity_info($record, $module)
   {
-    global $adb;
+    global $adb,$log;
     $result = Array();
     foreach($this->tab_name_index as $table_name=>$index)
     {
 	    $result[$table_name] = $adb->query("select * from ".$table_name." where ".$index."=".$record);
     }
-    //Integrated&Commented by Minnie -- as common query affecting detailview
-    /*$table_list = Array();
-    $table_index = Array();
-    $table_list = array_keys($this->tab_name_index);
-    $table_index = array_values($this->tab_name_index);
-    $detailview_query = "select ";
-    $j=0;
-    for($i=1;$i<count($table_list);$i++)
-    {
-	if($j != 0)
-	{
-		$detailview_query .= ", ";
-	}
-	$detailview_query .= $table_list[$i].".*";
-	$j++;
-    }
-    $detailview_query .=  ", ".$table_list[0].". * from ".$table_list[0];
-    for($i=1;$i<count($table_list);$i++)
-    {
-	$detailview_query .= " left join ".$table_list[$i]." on ".$table_list[$i].".".$table_index[$i]." = ";
-	$detailview_query .= $table_list[0].".".$table_index[0];
-    }
-    $detailview_query .= " where ".$table_list[0].".".$table_index[0]." = ".$record;
-    $result = $adb->query($detailview_query);*/
     $tabid = getTabid($module);
     $sql1 =  "select * from vtiger_field where tabid=".$tabid;
     $result1 = $adb->query($sql1);
@@ -1197,9 +1116,21 @@
       $this->column_fields[$fieldname] = $fld_value;
 				
     }
+	if($module == 'Users')
+	{
+		for($i=0; $i<$noofrows; $i++)
+		{
+			$fieldcolname = $adb->query_result($result1,$i,"columnname");
+			$tablename = $adb->query_result($result1,$i,"tablename");
+			$fieldname = $adb->query_result($result1,$i,"fieldname");
+			$fld_value = $adb->query_result($result[$tablename],0,$fieldcolname);
+			$this->$fieldname = $fld_value;
+
+		}
+	}
+		
     $this->column_fields["record_id"] = $record;
     $this->column_fields["record_module"] = $module;
-		
   }
 
 	function save($module_name) 



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 02:58:13 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 09:58:13 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7014 - in
 /vtigercrm/trunk/Smarty/templates: Buttons_List.tpl Buttons_List1.tpl
Message-ID: <20060613095813.847997E8C31@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 13 03:58:07 2006
New Revision: 7014

Log:
changes made to integrate googlemap

Modified:
    vtigercrm/trunk/Smarty/templates/Buttons_List.tpl
    vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl

Modified: vtigercrm/trunk/Smarty/templates/Buttons_List.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Buttons_List.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Buttons_List.tpl Tue Jun 13 03:58:07 2006
@@ -118,6 +118,16 @@
 				</tr>
 				</table>
 		</td>			
+		{if $MODULE eq 'Contacts' || $MODULE eq 'Leads' || $MODULE eq 'Accounts'}
+                        <td class="small">
+                                <!-- Google Map -->
+                                        <table border=0 cellspacing=0 cellpadding=5>
+                                                <tr>
+                                                        <td style="padding-left:10px;"><a href="#" onclick='window.open("index.php?module={$MODULE}&action=googlemap","test","width=600,height=400,resizable=1,scrollbars=1");'><img src="{$IMAGE_PATH}btnL3AllMenu.gif" alt="GoogleMap" title="GoogleMap" border="0"></a></td>
+                                                </tr>
+                                        </table>
+                        </td>
+                {/if}
 		</tr>
 		</table>
 	</td>

Modified: vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl Tue Jun 13 03:58:07 2006
@@ -114,6 +114,16 @@
 				</tr>
 				</table>
 		</td>			
+		{if $MODULE eq 'Contacts' || $MODULE eq 'Leads' || $MODULE eq 'Accounts'}
+                        <td class="small">
+                                <!-- Google Map -->
+                                        <table border=0 cellspacing=0 cellpadding=5>
+                                                <tr>
+                                                        <td style="padding-left:10px;"><a href="#" onclick='window.open("index.php?module={$MODULE}&action=googlemap&record={$ID}","test","width=600,height=400,resizable=1,scrollbars=1");'><img src="{$IMAGE_PATH}btnL3AllMenu.gif" alt="GoogleMap" title="GoogleMap" border="0"></a></td>
+                                                </tr>
+                                        </table>
+                        </td>
+                {/if}
 		</tr>
 		</table>
 	</td>



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 02:59:45 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 09:59:45 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7015 - in
 /vtigercrm/trunk/include/utils: CommonUtils.php EditViewUtils.php
Message-ID: <20060613095945.C65847E8C31@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 13 03:59:41 2006
New Revision: 7015

Log:
users module added in CRMEntity

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

Modified: vtigercrm/trunk/include/utils/CommonUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/CommonUtils.php (original)
+++ vtigercrm/trunk/include/utils/CommonUtils.php Tue Jun 13 03:59:41 2006
@@ -945,7 +945,7 @@
 			else
 			{
 				$profileList = getCurrentUserProfileList();
-				$sql = "select vtiger_field.* from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid  where vtiger_field.tabid=".$tabid." and vtiger_field.block in ".$blockid_list." and vtiger_field.displaytype=1 and info_type = '".$info_type."' and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList.=" group by vtiger_field.fieldid order by block,sequence";
+				$sql = "select vtiger_field.* from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid  where vtiger_field.tabid=".$tabid." and vtiger_field.block in ".$blockid_list." and vtiger_field.displaytype in (1,4) and info_type = '".$info_type."' and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList.=" group by vtiger_field.fieldid order by block,sequence";
 			}
 		}
 		else
@@ -957,7 +957,7 @@
 			else
 			{
 				$profileList = getCurrentUserProfileList();
-				$sql = "select vtiger_field.* from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid  where vtiger_field.tabid=".$tabid." and vtiger_field.block in ".$blockid_list." and vtiger_field.displaytype=1 and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList.=" group by vtiger_field.fieldid order by block,sequence";
+				$sql = "select vtiger_field.* from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid  where vtiger_field.tabid=".$tabid." and vtiger_field.block in ".$blockid_list." and vtiger_field.displaytype in (1,4) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList.=" group by vtiger_field.fieldid order by block,sequence";
 			}
 		}
 		$result = $adb->query($sql);

Modified: vtigercrm/trunk/include/utils/EditViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/EditViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/EditViewUtils.php Tue Jun 13 03:59:41 2006
@@ -1012,6 +1012,84 @@
 		$fieldvalue[] = array($SET_REM,$mod_strings['LBL_YES'],$mod_strings['LBL_NO']);
 		$SET_REM = '';
 	}
+	elseif($uitype == 115)
+	{
+		$editview_label[]=$mod_strings[$fieldlabel];
+		$pick_query="select * from ".$fieldname;
+		$pickListResult = $adb->query($pick_query);
+		$noofpickrows = $adb->num_rows($pickListResult);
+
+		//Mikecrowe fix to correctly default for custom pick lists
+		$options = array();
+		$found = false;
+		for($j = 0; $j < $noofpickrows; $j++)
+		{
+			$pickListValue=$adb->query_result($pickListResult,$j,strtolower($fieldname));
+
+			if($value == $pickListValue)
+			{
+				$chk_val = "selected";	
+				$found = true;
+			}
+			else
+			{	
+				$chk_val = '';
+			}
+			$options[] = array($pickListValue=>$chk_val );	
+		}
+		$fieldvalue [] = $options;
+	}
+	elseif($uitype == 116)
+	{
+		$editview_label[]=$mod_strings[$fieldlabel];
+		$pick_query="select * from currency_info";
+		$pickListResult = $adb->query($pick_query);
+		$noofpickrows = $adb->num_rows($pickListResult);
+
+		//Mikecrowe fix to correctly default for custom pick lists
+		$options = array();
+		$found = false;
+		for($j = 0; $j < $noofpickrows; $j++)
+		{
+			$pickListValue=$adb->query_result($pickListResult,$j,'currency_name');
+			$currency_id=$adb->query_result($pickListResult,$j,'id');
+			if($value == $pickListValue)
+			{
+				$chk_val = "selected";	
+				$found = true;
+			}
+			else
+			{	
+				$chk_val = '';
+			}
+			$options[$currency_id] = array($pickListValue=>$chk_val );	
+		}
+		$fieldvalue [] = $options;
+	}
+	elseif($uitype ==98)
+	{
+		$editview_label[]=$mod_strings[$fieldlabel];
+		$fieldvalue[]=$value;
+        $fieldvalue[]=getRoleName($value);
+	}
+	elseif($uitype == 105)
+	{
+		$editview_label[]=$mod_strings[$fieldlabel];
+			$query = "select attachments.path, attachments.name from contactdetails left join seattachmentsrel on seattachmentsrel.crmid=contactdetails.contactid inner join attachments on attachments.attachmentsid=seattachmentsrel.attachmentsid where contactdetails.imagename=attachments.name and contactid=".$col_fields['record_id'];
+		$result_image = $adb->query($query);
+		for($image_iter=0;$image_iter < $adb->num_rows($result_image);$image_iter++)	
+		{
+			$image_array[] = $adb->query_result($result_image,$image_iter,'name');	
+			$image_path_array[] = $adb->query_result($result_image,$image_iter,'path');	
+		}
+		if(is_array($image_array))
+			for($img_itr=0;$img_itr<count($image_array);$img_itr++)
+			{
+				$fieldvalue[] = array('name'=>$image_array[$img_itr],'path'=>$image_path_array[$img_itr]);
+			}
+		else
+			$fieldvalue[] = '';
+	}
 	else
 	{
 		//Added condition to set the subject if click Reply All from web mail



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 03:01:38 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 10:01:38 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7016 - in
 /vtigercrm/trunk/install: 5createTables.inc.php populateSeedData.php
Message-ID: <20060613100139.2B37F7E8C31@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 13 04:01:33 2006
New Revision: 7016

Log:
users module added in CRMEntity

Modified:
    vtigercrm/trunk/install/5createTables.inc.php
    vtigercrm/trunk/install/populateSeedData.php

Modified: vtigercrm/trunk/install/5createTables.inc.php
==============================================================================
--- vtigercrm/trunk/install/5createTables.inc.php (original)
+++ vtigercrm/trunk/install/5createTables.inc.php Tue Jun 13 04:01:33 2006
@@ -67,27 +67,35 @@
 
         // create default admin user
     	$user = new User();
-        $user->last_name = 'Administrator';
-        $user->user_name = 'admin';
-        $user->status = 'Active';
-        $user->is_admin = 'on';
-        $user->user_password = $user->encrypt_password($admin_password);
-        $user->tz = 'Europe/Berlin';
-        $user->holidays = 'de,en_uk,fr,it,us,';
-        $user->workdays = '0,1,2,3,4,5,6,';
-        $user->weekstart = '1';
-        $user->namedays = '';
-	$user->date_format = 'yyyy-mm-dd';
+        $user->column_fields["last_name"] = 'Administrator';
+        $user->column_fields["user_name"] = 'admin';
+        $user->column_fields["status"] = 'Active';
+        $user->column_fields["is_admin"] = 'on';
+        $user->column_fields["user_password"] = $user->encrypt_password($admin_password);
+        $user->column_fields["tz"] = 'Europe/Berlin';
+        $user->column_fields["holidays"] = 'de,en_uk,fr,it,us,';
+        $user->column_fields["workdays"] = '0,1,2,3,4,5,6,';
+        $user->column_fields["weekstart"] = '1';
+        $user->column_fields["namedays"] = '';
+        $user->column_fields["currency_id"] = 1;
+	$user->column_fields["date_format"] = 'yyyy-mm-dd';
 	// added by jeri to populate default image and tagcloud for admin	
-	$user->imagename = 'shanky.jpg';
-        $user->tagcloud = '';	
-        $user->activity_view = 'This Year';	
-	$user->defhomeview = 'home_metrics';
+	$user->column_fields["imagename"] = 'shanky.jpg';
+        $user->column_fields["tagcloud"] = '';	
+        $user->column_fields["activity_view"] = 'This Year';	
+	$user->column_fields["defhomeview"] = 'home_metrics';
         //added by philip for default default admin emailid
 	if($admin_email == '')
 	$admin_email ="admin at administrator.com";
-        $user->email = $admin_email;
-        $user->save();
+        $user->column_fields["email"] = $admin_email;
+	//to get the role id for standard_user	
+	$role_query = "select roleid from role where rolename='administrator'";
+	$db->database->SetFetchMode(ADODB_FETCH_ASSOC);
+	$role_result = $db->query($role_query);
+	$role_id = $db->query_result($role_result,0,"roleid");
+	$user->column_fields["roleid"] = $role_id;
+
+        $user->save("Users");
 
         // we need to change the admin user to a fixed id of 1.
         //$query = "update vtiger_users set id='1' where user_name='$user->user_name'";
@@ -95,70 +103,41 @@
 
         $log->info("Created ".$user->table_name." vtiger_table. for user $user->id");
 
-	/*
-        if($create_default_user) {
-                $default_user = new User();
-                $default_user->last_name = $default_user_name;
-                $default_user->user_name = $default_user_name;
-                $default_user->status = 'Active';
-
-		if (isset($default_user_is_admin) && $default_user_is_admin)
-			$default_user->is_admin = 'on';
-
-                $default_user->user_password = $default_user->encrypt_password($default_password);
-        	$default_user->tz = 'Europe/Berlin';
-	        $default_user->holidays = 'de,en_uk,fr,it,us,';
-        	$default_user->workdays = '0,1,2,3,4,5,6,';
-	        $default_user->weekstart = '1';
-        	$default_user->namedays = '';
-                $default_user->save();
-        }
-	*/
-
-	// insert values into vtiger_user2role vtiger_table
-	$role_query = "select roleid from vtiger_role where rolename='administrator'";
-	$db->database->SetFetchMode(ADODB_FETCH_ASSOC);
-	$role_result = $db->query($role_query);
-	$role_id = $db->query_result($role_result,0,"roleid");
-
-	$sql_stmt1 = "insert into vtiger_user2role values(".$user->id.",'".$role_id."')";
-	$db->query($sql_stmt1) or die($app_strings['ERR_CREATING_TABLE'].mysql_error());
-
-	//Creating the flat vtiger_files
+	//Creating the flat files
 	createUserPrivilegesfile($user->id);
         createUserSharingPrivilegesfile($user->id);
 
 
 	//Creating the Standard User
     	$user = new User();
-        $user->last_name = 'StandardUser';
-        $user->user_name = 'standarduser';
-        $user->status = 'Active';
-        $user->user_password = $user->encrypt_password('standarduser');
-        $user->tz = 'Europe/Berlin';
-        $user->holidays = 'de,en_uk,fr,it,us,';
-        $user->workdays = '0,1,2,3,4,5,6,';
-        $user->weekstart = '1';
-        $user->namedays = '';
-	$user->date_format = 'yyyy-mm-dd';
+        $user->column_fields["last_name"] = 'StandardUser';
+        $user->column_fields["user_name"] = 'standarduser';
+        $user->column_fields["status"] = 'Active';
+        $user->column_fields["user_password"] = $user->encrypt_password('standarduser');
+        $user->column_fields["tz"] = 'Europe/Berlin';
+        $user->column_fields["holidays"] = 'de,en_uk,fr,it,us,';
+        $user->column_fields["workdays"] = '0,1,2,3,4,5,6,';
+        $user->column_fields["weekstart"] = '1';
+        $user->column_fields["namedays"] = '';
+        $user->column_fields["currency_id"] = 1;
+	$user->column_fields["date_format"] = 'yyyy-mm-dd';
 	// added by jeri to populate default image and tagcloud for admin	
-	$user->imagename = 'ela.jpg';
-        $user->activity_view = 'This Year';	
-        $user->tagcloud = '';	
-	$user->defhomeview = 'home_metrics';
+	$user->column_fields["imagename"] = 'ela.jpg';
+        $user->column_fields["activity_view"] = 'This Year';	
+        $user->column_fields["tagcloud"] = '';	
+	$user->column_fields["defhomeview"] = 'home_metrics';
         //added by philip for default default admin emailid
 	if($admin_email == '')
 	$std_email ="standarduser at standarduser.com";
-        $user->email = $std_email;
-        $user->save();
-
+        $user->column_fields["email"] = $std_email;
+	//to get the role id for standard_user	
 	$role_query = "select roleid from vtiger_role where rolename='standard_user'";
 	$db->database->SetFetchMode(ADODB_FETCH_ASSOC);
 	$role_result = $db->query($role_query);
 	$role_id = $db->query_result($role_result,0,"roleid");
-
-	$sql_stmt2 = "insert into vtiger_user2role values(".$user->id.",'".$role_id."')";
-	$db->query($sql_stmt2) or die($app_strings['ERR_CREATING_TABLE'].mysql_error());
+	$user->column_fields["roleid"] = $role_id;
+
+        $user->save('Users');
 
 	//Creating the flat vtiger_files
 	createUserPrivilegesfile($user->id);
@@ -169,8 +148,8 @@
 //$startTime = microtime();
 $modules = array("DefaultDataPopulator");
 $focus=0;				
-// vtiger_tables creation
-eecho("Creating Core vtiger_tables: ");
+// tables creation
+eecho("Creating Core tables: ");
 $success = $db->createTables("schema/DatabaseSchema.xml");
 
 // TODO HTML
@@ -194,20 +173,20 @@
 //$db->query($sql_stmt1) or die($app_strings['ERR_CREATING_TABLE'].mysql_error());
 
 
-// create and populate combo vtiger_tables
+// create and populate combo tables
 require_once('include/PopulateComboValues.php');
 $combo = new PopulateComboValues();
 $combo->create_tables();
 
 create_default_users();
 
-// default vtiger_report population
+// default report population
 require_once('modules/Reports/PopulateReports.php');
 
-// default vtiger_customview population
+// default customview population
 require_once('modules/CustomView/PopulateCustomView.php');
 
-//Writing vtiger_tab data in flat file
+//Writing tab data in flat file
 create_tab_data_file();
 create_parenttab_data_file();
 

Modified: vtigercrm/trunk/install/populateSeedData.php
==============================================================================
--- vtigercrm/trunk/install/populateSeedData.php (original)
+++ vtigercrm/trunk/install/populateSeedData.php Tue Jun 13 04:01:33 2006
@@ -121,7 +121,7 @@
 global $current_user;
 
 $current_user = new User();
-$result = $current_user->retrieve($assigned_user_id);
+$result = $current_user->retrieve_entity_info($assigned_user_id,'Users');
 
 $tagkey = 1;
 
@@ -145,7 +145,7 @@
 	
 	$account_name = $company_name_array[$i];
 
-	// Create new vtiger_accounts.
+	// Create new accounts.
 	$account = new Account();
 	$account->column_fields["accountname"] = $account_name;
 	$account->column_fields["phone"] = create_phone_number();
@@ -227,7 +227,7 @@
 	
 	$opportunity_ids[] = $opp->id;
 
-//	$adb->println("PSD Potential [".$opp->id."] - vtiger_account[".$account->id."]");
+//	$adb->println("PSD Potential [".$opp->id."] - account[".$account->id."]");
 	
 }
 
@@ -297,10 +297,10 @@
 	//$query = "insert into opportunities_contacts set id='".create_guid()."', contact_id='$contact->id', contact_role='".$app_list_strings['opportunity_relationship_type_default_key']."', opportunity_id='".$opportunity_ids[$opportunity_key]."'";
 	//$db->query($query, true, "unable to create seed links between opportunities and contacts");
 
-	$query = "insert into vtiger_contpotentialrel ( contactid, vtiger_potentialid ) values (".$contact->id.",".$opportunity_ids[$opportunity_key].")";
+	$query = "insert into vtiger_contpotentialrel ( contactid, potentialid ) values (".$contact->id.",".$opportunity_ids[$opportunity_key].")";
 	$db->query($query);
 
-//	$adb->println("PSD Contact [".$contact->id."] - vtiger_account[".$account_ids[$account_key]."] - vtiger_potential[".$opportunity_ids[$opportunity_key]."]");
+//	$adb->println("PSD Contact [".$contact->id."] - account[".$account_ids[$account_key]."] - potential[".$opportunity_ids[$opportunity_key]."]");
 
 	//Create new tasks
 	/*$task = new Task();
@@ -396,7 +396,7 @@
 
 }
 
-// Temp fix since user is not logged in while populating data updating creatorid in vtiger_crmentity - GS
+// Temp fix since user is not logged in while populating data updating creatorid in crmentity - GS
 
 
 //Populating Vendor Data
@@ -544,7 +544,7 @@
 http://support.microsoft.com/default.aspx?scid=kb%3BEN-US%3B263074
 
 If you want to continue working with vtiger Outlook Plug-in, select the Allow access for check box and select the time from drop-down box.",
-	" Since, vtigerCRM & all plugins are open source, it is not signed up with third party vtiger_vendors and IE will ask to download even though the plugin are not signed.
+	" Since, vtigerCRM & all plugins are open source, it is not signed up with third party vendors and IE will ask to download even though the plugin are not signed.
 
 This message if produced by Microsoft Windows XP. I English Windows XP with the SP2 and the last updates. I told IE to accept installation of the ActiveX, but after it, this message has appeared. Provably there is a place where to tall to WinXP to not validate if the code is signed... but I don\'t know where.
 
@@ -633,7 +633,7 @@
 	$salesorder_ids[] = $so->id;
 	
 	$product_key = array_rand($product_ids);
-        $query = "insert into vtiger_soproductrel ( vtiger_salesorderid, productid, quantity, listprice ) values (".$so->id.",".$product_ids[$product_key].",12,499.000 )";
+        $query = "insert into vtiger_soproductrel ( salesorderid, productid, quantity, listprice ) values (".$so->id.",".$product_ids[$product_key].",12,499.000 )";
         $db->query($query);
 
 }
@@ -668,7 +668,7 @@
 	$purchaseorder_ids[] = $po->id;
 
 	$product_key = array_rand($product_ids);
-        $query = "insert into vtiger_poproductrel ( vtiger_purchaseorderid, productid, quantity, listprice ) values (".$po->id.",".$product_ids[$product_key].",15,1299.000 )";
+        $query = "insert into vtiger_poproductrel ( purchaseorderid, productid, quantity, listprice ) values (".$po->id.",".$product_ids[$product_key].",15,1299.000 )";
         $db->query($query);
 
 }
@@ -710,7 +710,7 @@
 	}
 
 	$product_key = array_rand($product_ids);
-        $query = "insert into vtiger_invoiceproductrel ( vtiger_invoiceid, productid, quantity, listprice ) values (".$invoice->id.",".$product_ids[$product_key].",18,269.000 )";
+        $query = "insert into vtiger_invoiceproductrel ( invoiceid, productid, quantity, listprice ) values (".$invoice->id.",".$product_ids[$product_key].",18,269.000 )";
         $db->query($query);
 	
 }
@@ -781,7 +781,7 @@
 	$notes_ids[] = $notes ->id;
 	
 	$product_key = array_rand($product_ids);
-        $query = "insert into vtiger_senotesrel (crmid, vtiger_notesid) values (".$product_ids[$product_key].", ".$notes->id.")";
+        $query = "insert into vtiger_senotesrel (crmid, notesid) values (".$product_ids[$product_key].", ".$notes->id.")";
 	$db->query($query);
 		
 }



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 03:03:59 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 10:03:59 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7017 -
	/vtigercrm/trunk/googlemap.php
Message-ID: <20060613100359.474367E8C4C@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 13 04:03:54 2006
New Revision: 7017

Log:
added for googlemap integration

Added:
    vtigercrm/trunk/googlemap.php



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 03:04:44 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 10:04:44 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7018 - in
 /vtigercrm/trunk/modules/Users: Authenticate.php
 CreateUserPrivilegeFile.php DetailView.php EditView.php Forms.php Save.php
 User.php
Message-ID: <20060613100444.D89D67E8C4C@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 13 04:04:34 2006
New Revision: 7018

Log:
users module added in CRMEntity

Modified:
    vtigercrm/trunk/modules/Users/Authenticate.php
    vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php
    vtigercrm/trunk/modules/Users/DetailView.php
    vtigercrm/trunk/modules/Users/EditView.php
    vtigercrm/trunk/modules/Users/Forms.php
    vtigercrm/trunk/modules/Users/Save.php
    vtigercrm/trunk/modules/Users/User.php

Modified: vtigercrm/trunk/modules/Users/Authenticate.php
==============================================================================
--- vtigercrm/trunk/modules/Users/Authenticate.php (original)
+++ vtigercrm/trunk/modules/Users/Authenticate.php Tue Jun 13 04:04:34 2006
@@ -31,7 +31,7 @@
 $focus = new User();
 
 // Add in defensive code here.
-$focus->user_name = to_html($_REQUEST['user_name']);
+$focus->column_fields["user_name"] = to_html($_REQUEST['user_name']);
 $user_password = $_REQUEST['user_password'];
 
 $focus->load_user($user_password);
@@ -43,33 +43,16 @@
         $intime=date("Y/m/d H:i:s");
         require_once('modules/Users/LoginHistory.php');
         $loghistory=new LoginHistory();
-        $Signin = $loghistory->user_login($focus->user_name,$usip,$intime);
-
-	//Authentication for tutos
-        //include('modules/Calendar/Authenticate.php');
+        $Signin = $loghistory->user_login($focus->column_fields["user_name"],$usip,$intime);
 
 	// save the user information into the session
 	// go to the home screen
 	//Security related entries start
 	require_once('include/utils/UserInfoUtil.php');
-	//$rolename = fetchUserRole($focus->id);
-	//$profilename = fetchUserProfile($focus->id);
 	$profileid = fetchUserProfileId($focus->id);	
-	//setting the vtiger_role into the session
-	//$_SESSION['authenticated_user_roleid'] = $profilename;
-
-	//Setting the Object in Session
-	/*
-	$accessObj = new AccessControl();
-	$accessObj->authenticated_user_profileid = $profileid;
-	$accessObj->tab_permission_set = setPermittedTabs2Session($profileid);
-	
-	$accessObj->action_permission_set = setPermittedActions2Session($profileid);
-	$_SESSION['access_privileges'] = $accessObj; 
-	*/
+	//setting the role into the session
 
 	createUserPrivilegesfile($focus->id);
-        //createUserSharingPrivilegesfile($focus->id);	
 		
 	$_SESSION['authenticated_user_profileid'] = $profileid;
 	setGlobalProfilePermission2Session($profileid);
@@ -128,7 +111,7 @@
         $log->debug("app_unique_key is $application_unique_key");
 
 	
-// Clear all uploaded import vtiger_files for this user if it exists
+// Clear all uploaded import files for this user if it exists
 
 	global $import_dir;
 
@@ -141,7 +124,7 @@
 }
 else
 {
-	$_SESSION['login_user_name'] = $focus->user_name;
+	$_SESSION['login_user_name'] = $focus->column_fields["user_name"];
 	$_SESSION['login_password'] = $user_password;
 	$_SESSION['login_error'] = $mod_strings['ERR_INVALID_PASSWORD'];
 	

Modified: vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php
==============================================================================
--- vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php (original)
+++ vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php Tue Jun 13 04:04:34 2006
@@ -30,9 +30,12 @@
 		$newbuf .="\n";		
 		$newbuf .= "//This is the access privilege file\n";
 		$user_focus= new User();
-		$user_focus->retrieve($userid);
+		$user_focus->retrieve_entity_info($userid,'Users');
+		
 		$userInfo=Array();
-		foreach($user_focus->column_fields as $field)
+		$user_focus->column_fields["id"] = '';
+		$user_focus->id = $userid; 
+		foreach($user_focus->column_fields as $field=>$value_iter)
         	{
                		$userInfo[$field]= $user_focus->$field;
         	}
@@ -113,7 +116,7 @@
 		$newbuf .="\n";		
 		$newbuf .= "//This is the sharing access privilege file\n";
 		$user_focus= new User();
-		$user_focus->retrieve($userid);
+		$user_focus->retrieve_entity_info($userid,'Users');
 		if($user_focus->is_admin == 'on')
 		{
 			$newbuf .= "\n";
@@ -439,7 +442,7 @@
 
 
 
-		//Retreiving from vtiger_role to rs
+		//Retreiving from role to rs
 		$parRoleList = "(";
 		foreach($parent_roles as $par_role_id)
 		{

Modified: vtigercrm/trunk/modules/Users/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DetailView.php (original)
+++ vtigercrm/trunk/modules/Users/DetailView.php Tue Jun 13 04:04:34 2006
@@ -32,18 +32,18 @@
 global $theme;
 global $default_language;
 global $adb;
-
+global $currentModule;
 global $app_strings;
 global $mod_strings;
 
 $focus = new User();
 
 if(!empty($_REQUEST['record'])) {
-        $focus->retrieve($_REQUEST['record']);
+	$focus->retrieve_entity_info($_REQUEST['record'],'Users');
+	$focus->id = $_REQUEST['record'];	
 }
 else
 {
- //       header("Location: index.php?module=Users&action=ListView");
 
     echo "
         <script type='text/javascript'>
@@ -82,11 +82,7 @@
 $image_path=$theme_path."images/";
 require_once($theme_path.'layout_utils.php');
 
-$role = fetchUserRole($focus->id);
-$rolename =  getRoleName($role);
-$currencyid=fetchCurrency($focus->id);
-$currency=getCurrencyName($currencyid);
-//the user might belong to multiple vtiger_groups
+//the user might belong to multiple groups
 if($focus->id != 1)
 {
  $groupids = fetchUserGroupids($focus->id);
@@ -107,13 +103,7 @@
 $smarty->assign("THEME", $theme);
 $smarty->assign("IMAGE_PATH", $image_path);$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']);
 $smarty->assign("ID", $focus->id);
-$smarty->assign("USER_NAME", $focus->user_name);
-$smarty->assign("FIRST_NAME", $focus->first_name);
-$smarty->assign("LAST_NAME", $focus->last_name);
 $smarty->assign("CATEGORY", $category);
-$smarty->assign("STATUS", $focus->status);
-$smarty->assign("YAHOO_ID", $focus->yahoo_id);
-$smarty->assign("DATE_FORMAT", $focus->date_format);
 if(isset($focus->imagename) && $focus->imagename!='')
 {
 	$imagestring="<div id='track1' style='margin: 4px 0pt 0pt 10px; width: 200px; background-image: url(themes/images/scaler_slider_track.gif); background-repeat: repeat-x; background-position: left center; height: 18px;'>
@@ -123,11 +113,9 @@
 
 	<div class='scale-image' style='padding: 10px; float: left; width: 83.415px;'><img src='test/user/".$focus->imagename."' width='100%'</div>
 	<p><script type='text/javascript' src='include/js/scale_demo.js'></script></p>";
-	$smarty->assign("USER_IMAGE",$imagestring);
+	//$smarty->assign("USER_IMAGE",$imagestring);
 }
 				
-if (isset($focus->yahoo_id) && $focus->yahoo_id !== "") $smarty->assign("YAHOO_MESSENGER", "<a href='http://edit.yahoo.com/config/send_webmesg?.target=".$focus->yahoo_id."'><img border=0 src='http://opi.yahoo.com/online?u=".$focus->yahoo_id."'&m=g&t=2'></a>");
-
 if(isset($_REQUEST['modechk']) && $_REQUEST['modechk'] != '' )
 {
 	$modepref = $_REQUEST['modechk'];
@@ -151,11 +139,8 @@
 	$buttons = "<input title='".$app_strings['LBL_EDIT_BUTTON_TITLE']."' accessKey='".$app_strings['LBL_EDIT_BUTTON_KEY']."' class='classBtn' onclick=\"this.form.return_module.value='Users'; this.form.return_action.value='DetailView'; this.form.return_id.value='$focus->id'; this.form.action.value='EditView'; this.form.parenttab.value='$parenttab'\" type='submit' name='Edit' value='  ".$app_strings['LBL_EDIT_BUTTON_LABEL']."  '>";
 	$smarty->assign('EDIT_BUTTON',$buttons);
 	
- //global $AUTHCFG;
- 	//if (strtoupper($AUTHCFG['authType']) == 'SQL') {
 		$buttons = "<input title='".$mod_strings['LBL_CHANGE_PASSWORD_BUTTON_TITLE']."' accessKey='".$mod_strings['LBL_CHANGE_PASSWORD_BUTTON_KEY']."' class='classBtn' LANGUAGE=javascript onclick='return window.open(\"index.php?module=Users&action=ChangePassword&form=DetailView\",\"test\",\"width=320,height=165,resizable=no,scrollbars=0, toolbar=no, titlebar=no, left=100, top=126, screenX=100, screenY=126\");' type='button' name='password' value='".$mod_strings['LBL_CHANGE_PASSWORD_BUTTON_LABEL']."'>";
 		$smarty->assign('CHANGE_PW_BUTTON',$buttons);
-	//}
 	
 	$buttons = "<input title='".$mod_strings['LBL_LOGIN_HISTORY_BUTTON_TITLE']."' accessKey='".$mod_strings['LBL_LOGIN_HISTORY_BUTTON_KEY']."' class='classBtn' onclick=\"this.form.return_module.value='Users'; this.form.return_action.value='ShowHistory'; this.form.return_id.value='$focus->id'; this.form.action.value='ShowHistory'\" type='submit' name='LoginHistory' value=' ".$mod_strings['LBL_LOGIN_HISTORY_BUTTON_LABEL']." '>";	
 	$smarty->assign('LOGIN_HISTORY_BUTTON',$buttons);
@@ -166,33 +151,18 @@
 
 	
 }
-/* Forum Display/Hide Button
-if($_REQUEST['forumDisplay'] == "true" || $displayForums == "true"){
-	$buttons .= "<input title='".$app_strings['LBL_FORUM_HIDE_BUTTON_TITLE']."' accessKey='".$app_strings['LBL_FORUM_HIDE_BUTTON_KEY']."' class='button' onclick=\"this.form.module.value='Users'; this.form.forumDisplay.value='false'; this.form.action.value='DetailView'\" type='submit' name='Display' value=' ".$app_strings['LBL_FORUM_HIDE_BUTTON_LABEL']." '></td>\n";
-}
-else
-{
-	$buttons .= "<input title='".$app_strings['LBL_FORUM_SHOW_BUTTON_TITLE']."' accessKey='".$app_strings['LBL_FORUM_SHOW_BUTTON_KEY']."' class='button' onclick=\"this.form.module.value='Users'; this.form.forumDisplay.value='true'; this.form.action.value='DetailView'\" type='submit' name='Display' value=' ".$app_strings['LBL_FORUM_SHOW_BUTTON_LABEL']." '></td>\n";
-}
-*/
 if (is_admin($current_user)) 
 {
 	$buttons = "<input title='".$app_strings['LBL_DUPLICATE_BUTTON_TITLE']."' accessKey='".$app_strings['LBL_DUPLICATE_BUTTON_KEY']."' class='classBtn' onclick=\"this.form.return_module.value='Users'; this.form.return_action.value='DetailView'; this.form.isDuplicate.value=true; this.form.return_id.value='".$_REQUEST['record']."';this.form.action.value='EditView'\" type='submit' name='Duplicate' value=' ".$app_strings['LBL_DUPLICATE_BUTTON_LABEL']."'   >";
 	$smarty->assign('DUPLICATE_BUTTON',$buttons);
 	
-	//done so that only the admin user can see the customize vtiger_tab button
-	if($_REQUEST['record'] == $current_user->id)
-	{
-		$buttons = "<input title='".$app_strings['LBL_TABCUSTOMISE_BUTTON_TITLE']."' accessKey='".$app_strings['LBL_TABCUSTOMISE_BUTTON_KEY']."' class='classBtn' onclick=\"this.form.return_module.value='Users'; this.form.return_action.value='TabCustomise'; this.form.action.value='TabCustomise'\" type='submit' name='Customise' value=' ".$app_strings['LBL_TABCUSTOMISE_BUTTON_LABEL']." '>";
-		$smarty->assign('TABCUSTOMIZE_BUTTON',$buttons);
-	}
+	//done so that only the admin user can see the customize tab button
 	if($_REQUEST['record'] != $current_user->id)
 	{
 		$buttons = "<input title='".$app_strings['LBL_DELETE_BUTTON_TITLE']."' accessKey='".$app_strings['LBL_DELETE_BUTTON_KEY']."' class='classBtn' onclick=\"deleteUser('$focus->id')\" type='button' name='Delete' value='  ".$app_strings['LBL_DELETE_BUTTON_LABEL']."  '>";
 		$smarty->assign('DELETE_BUTTON',$buttons);
 	}
 
-        //$buttons .= "<input title='".$app_strings['LBL_ROLES_BUTTON_TITLE']."' accessKey='".$app_strings['LBL_ROLES_BUTTON_KEY']."' class='button' onclick=\"this.form.return_module.value='Users'; this.form.return_action.value='TabCustomise'; this.form.action.value='ListPermissions'\" type='submit' name='ListPermissions' value=' ".$app_strings['LBL_ROLES_BUTTON_LABEL']." '></td>\n";
 	if($_SESSION['authenticated_user_roleid'] == 'administrator')
 	{
 		$buttons = "<input title='".$app_strings['LBL_LISTROLES_BUTTON_TITLE']."' accessKey='".$app_strings['LBL_LISTROLES_BUTTON_KEY']."' class='classBtn' onclick=\"this.form.return_module.value='Users'; this.form.return_action.value='TabCustomise'; this.form.action.value='listroles'; this.form.record.value= '". $current_user->id ."'\" type='submit' name='ListRoles' value=' ".$app_strings['LBL_LISTROLES_BUTTON_LABEL']." '>";
@@ -202,99 +172,12 @@
 }
 
 
-if ((is_admin($current_user) || $_REQUEST['record'] == $current_user->id) && $focus->is_admin == 'on') {
-	$smarty->assign("IS_ADMIN", "checked");
-}
 
-$smarty->assign("DESCRIPTION", nl2br($focus->description));
-if(is_admin($current_user))
-{
-	$smarty->assign("ROLEASSIGNED","<a href=index.php?module=Users&action=RoleDetailView&roleid=".$role .">" .$rolename ."</a>");
-}
-else
-{
-	$smarty->assign("ROLEASSIGNED",$rolename);
-}
+$smarty->assign("MODULE", 'Settings');
+$smarty->assign("BLOCKS", getBlocks($currentModule,"detail_view",'',$focus->column_fields));
 
-	$smarty->assign("CURRENCY_NAME",$currency);
-
-//Getting the Group Lists
-$groupids = fetchUserGroupids($focus->id);
-if($groupids) {
-	$query ="select groupid,groupname from vtiger_groups where groupid in (".$groupids.")";
-	$result = $adb->query($query);
-	$num_rows = $adb->num_rows($result);
-} else {
-	$num_rows = 0;
-}
-
-
-
-//Assigning the group lists
-if(is_admin($current_user))
-{
-	for($i=0;$i < $num_rows;$i++)
-	{
-		$groupid = $adb->query_result($result,$i,'groupid');
-		$groupname = $adb->query_result($result,$i,'groupname');
-		$grouplists[$i] ="<a href='index.php?module=Users&action=GroupDetailView&groupId=".$groupid."'>".$groupname."</a>";
-	}
-	if($grouplists != '')
-	{	
-		$group_lists = implode(",",$grouplists);
-	}	
-	$smarty->assign("GROUPASSIGNED",$group_lists);
-}
-else
-{
-	for($i=0;$i < $num_rows;$i++)
-	{
-		$groupname = $adb->query_result($result,$i,'groupname');
-		$grouplists[$i] =$groupname;
-	}
-	if($grouplists != '')
-	{	
-		$group_lists = implode(",",$grouplists);
-	}
-	$smarty->assign("GROUPASSIGNED",$group_lists);
-}
-$smarty->assign("COLORASSIGNED", "<div style='background-color:".$focus->cal_color.";'>".$focus->cal_color."</div>");
-if($focus->hour_format == 'am/pm')
-{
-	$smarty->assign("CAL_HRFORMAT", "11:00pm");
-}
-else
-{
-	$smarty->assign("CAL_HRFORMAT", "23:00");
-}
-$smarty->assign("CAL_HRDURATION", $focus->start_hour."&nbsp;ends at&nbsp;".$focus->end_hour);
-$smarty->assign("ACTIVITY_VIEW", $focus->activity_view);
-$smarty->assign("LEAD_VIEW", $focus->lead_view);
-$smarty->assign("TITLE", $focus->title);
-$smarty->assign("DEPARTMENT", $focus->department);
-$smarty->assign("REPORTS_TO_ID", $focus->reports_to_id);
-$smarty->assign("REPORTS_TO_NAME", $focus->reports_to_name);
-$smarty->assign("PHONE_HOME", $focus->phone_home);
-$smarty->assign("PHONE_MOBILE", $focus->phone_mobile);
-$smarty->assign("PHONE_WORK", $focus->phone_work);
-$smarty->assign("PHONE_OTHER", $focus->phone_other);
-$smarty->assign("PHONE_FAX", $focus->phone_fax);
-$smarty->assign("EMAIL1", $focus->email1);
-$smarty->assign("EMAIL2", $focus->email2);
-$smarty->assign("ADDRESS_STREET", $focus->address_street);
-$smarty->assign("ADDRESS_CITY", $focus->address_city);
-$smarty->assign("ADDRESS_STATE", $focus->address_state);
-$smarty->assign("ADDRESS_POSTALCODE", $focus->address_postalcode);
-$smarty->assign("ADDRESS_COUNTRY", $focus->address_country);
-$smarty->assign("SIGNATURE", nl2br($focus->signature));
-$smarty->assign("MODULE", 'Settings');
-
-
-$mode1 = 'pref';
-$smarty->assign("MODE1", $mode1);
 
         $smarty->display("UserDetailView.tpl");
 
-echo "</td></tr>\n";
 
 ?>

Modified: vtigercrm/trunk/modules/Users/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/Users/EditView.php (original)
+++ vtigercrm/trunk/modules/Users/EditView.php Tue Jun 13 04:04:34 2006
@@ -32,35 +32,26 @@
 global $app_strings;
 global $app_list_strings;
 global $mod_strings;
+global $currentModule;
 
 
+$smarty=new vtigerCRM_Smarty;
 $focus = new User();
 
 if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) {
+	$smarty->assign("ID",$_REQUEST['record']);
 	$mode='edit';
 	if (!is_admin($current_user) && $_REQUEST['record'] != $current_user->id) die ("Unauthorized access to user administration.");
-    $focus->retrieve($_REQUEST['record']);
+    $focus->retrieve_entity_info($_REQUEST['record'],'Users');
 }else
 {
 	$mode='create';
-	$password='<tr>
-	   		   <td width="20%" class="dataLabel"><FONT class="required">*</FONT>Password</td>
-		       <td width="30%"><input name="new_password" type="password" vtiger_tabindex="1" size="25" maxlength="25"></td>
-			   <td width="20%" class="dataLabel"><FONT class="required">*</FONT>Confirm Password</td>
-			   <td width="30%"><input name="confirm_new_password" type="password" vtiger_tabindex="2" size="25" maxlength="75"></td>
-			  </tr>';
 }
 
 if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') {
 	$focus->id = "";
 	$focus->user_name = "";
 	$mode='create';
-	$password='<tr>
-	   		   <td width="20%" class="dataLabel"><FONT class="required">*</FONT>Password</td>
-		       <td width="30%"><input name="new_password" type="password" vtiger_tabindex="1" size="25" maxlength="25"></td>
-			   <td width="20%" class="dataLabel"><FONT class="required">*</FONT>Confirm Password</td>
-			   <td width="30%"><input name="confirm_new_password" type="password" vtiger_tabindex="2" size="25" maxlength="75"></td>
-			  </tr>';
 }
 
 global $theme;
@@ -70,8 +61,8 @@
 
 $log->info("User edit view");
 
-$smarty=new vtigerCRM_Smarty;
 
+$smarty->assign("JAVASCRIPT", get_validate_record_js());
 $smarty->assign("UMOD", $mod_strings);
 global $current_language;
 $smod_strings = return_module_language($current_language,'Settings');
@@ -90,255 +81,18 @@
         $smarty->assign("RETURN_ACTION", $_REQUEST['return_action']);
         $RETURN_ACTION = $_REQUEST['return_action'];
 }
-if(isset($_REQUEST['activity_mode']))
-{
-	$smarty->assign("ACTIVITYMODE",$_REQUEST['activity_mode']);
-}
 if ($_REQUEST['isDuplicate'] != 'true' && isset($_REQUEST['return_id']))
 {
         $smarty->assign("RETURN_ID", $_REQUEST['return_id']);
         $RETURN_ID = $_REQUEST['return_id'];
 }
 
-$smarty->assign("JAVASCRIPT", get_validate_record_js());
-
 $smarty->assign("IMAGE_PATH", $image_path);$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']);
-$smarty->assign("ID", $focus->id);
-$smarty->assign("USER_NAME", $focus->user_name);
-$smarty->assign("FIRST_NAME", $focus->first_name);
-$smarty->assign("LAST_NAME", $focus->last_name);
-$smarty->assign("TITLE", $focus->title);
-$smarty->assign("DEPARTMENT", $focus->department);
-$smarty->assign("REPORTS_TO_ID", $focus->reports_to_id);
-$smarty->assign("REPORTS_TO_NAME", $focus->reports_to_name);
-$smarty->assign("PHONE_HOME", $focus->phone_home);
-$smarty->assign("PHONE_MOBILE", $focus->phone_mobile);
-$smarty->assign("PHONE_WORK", $focus->phone_work);
-$smarty->assign("PHONE_OTHER", $focus->phone_other);
-$smarty->assign("PHONE_FAX", $focus->phone_fax);
-$smarty->assign("EMAIL1", $focus->email1);
-$smarty->assign("EMAIL2", $focus->email2);
-$smarty->assign("YAHOO_ID", $focus->yahoo_id);
-if (isset($focus->yahoo_id) && $focus->yahoo_id !== "") $smarty->assign("YAHOO_MESSENGER", "<a href='http://edit.yahoo.com/config/send_webmesg?.target=".$focus->yahoo_id."'><img border=0 src='http://opi.yahoo.com/online?u=".$focus->yahoo_id."'&m=g&t=2'></a>");
-$smarty->assign("ADDRESS_STREET", $focus->address_street);
-$smarty->assign("ADDRESS_CITY", $focus->address_city);
-$smarty->assign("ADDRESS_STATE", $focus->address_state);
-$smarty->assign("ADDRESS_POSTALCODE", $focus->address_postalcode);
-$smarty->assign("ADDRESS_COUNTRY", $focus->address_country);
-$smarty->assign("SIGNATURE", $focus->signature);
-$smarty->assign("DESCRIPTION", $focus->description);
-$smarty->assign("USERIMAGE", $focus->imagename);
-$smarty->assign("MODE", $mode);
+$focus->mode = $mode;
+$disp_view = getView($focus->mode);
+$smarty->assign("BLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields));	
 $smarty->assign("MODULE", 'Settings');
-
-$DATE_FORMAT_SELECT_OPTION = '<select name="date_format">';
-		
-               
-if($focus->date_format == 'dd-mm-yyyy')
-{
-	$selected1 = 'selected';
-}
-elseif($focus->date_format == 'mm-dd-yyyy')
-{
-	$selected2 = 'selected';
-}
-elseif($focus->date_format == 'yyyy-mm-dd')
-{
-	$selected3 = 'selected';
-}
-$DATE_FORMAT_SELECT_OPTION .= '<option value="dd-mm-yyyy" '.$selected1.'>';
-$DATE_FORMAT_SELECT_OPTION .= 'dd-mm-yyyy';
-$DATE_FORMAT_SELECT_OPTION .= '</option>';
-$DATE_FORMAT_SELECT_OPTION .= '<option value="mm-dd-yyyy" '.$selected2.'>';
-$DATE_FORMAT_SELECT_OPTION .= 'mm-dd-yyyy';
-$DATE_FORMAT_SELECT_OPTION .= '</option>';
-$DATE_FORMAT_SELECT_OPTION .= '<option value="yyyy-mm-dd" '.$selected3.'>';
-$DATE_FORMAT_SELECT_OPTION .= 'yyyy-mm-dd';
-$DATE_FORMAT_SELECT_OPTION .= '</option>';	
-$DATE_FORMAT_SELECT_OPTION .= ' </select>';
-$smarty->assign("DATE_FORMAT", $DATE_FORMAT_SELECT_OPTION);
-
-if (is_admin($current_user)) {
-	$status = "<td width='30%'>&nbsp;&nbsp;<select name='status' vtiger_tabindex='1'";
-	if (isset($default_user_name)
-		&& $default_user_name != ""
-		&& $default_user_name == $focus->user_name
-		&& isset($lock_default_user_name)
-		&& $lock_default_user_name == true ) {
-		$status .= " disabled ";
-	}
-	$status .= ">";
-	$status .= get_select_options_with_id($app_list_strings['user_status_dom'], $focus->status);
-	$status .= "</select></td>\n";
-	$smarty->assign("USER_STATUS_OPTIONS", $status);
-
-}
-else
-{
-		$status = "<td width='30%'>&nbsp;&nbsp;<select name='status' vtiger_tabindex='1' disabled>";
-		$status .= get_select_options_with_id($app_list_strings['user_status_dom'], $focus->status);
-		$status .= "</select></td>\n";
-		$smarty->assign("USER_STATUS_OPTIONS", $status);
-
-}	
-
-if (is_admin($current_user)) {
-     
-               
-		 $opt =	'<a href="javascript:openPopup();"><img src="'.$image_path.'select.gif" border="0" align="absmiddle"></a>';
-                $smarty->assign("ROLEPOPUPBUTTON", $opt);
-	
-	}
-		
-        if($focus->id != '')
-        {
-
-		$roleselectedid=fetchUserRole($focus->id);
-		$roleselected=getRoleName($roleselectedid);
-                $smarty->assign("USERROLE", $roleselectedid);
-                $smarty->assign("ROLENAME", $roleselected);
-
-        }
-               
-		
-		 
-
-
-
-if (is_admin($current_user)) {                   
-        $GROUP_SELECT_OPTION = '<select name="group_name">';
-		$GROUP_SELECT_OPTION .= '<option value="">--None--</option>';
-		if($focus->id) {
-			$sql = "SELECT groupname
-				FROM vtiger_users2group
-				INNER JOIN vtiger_groups
-					ON vtiger_groups.groupid = vtiger_users2group.groupid
-				WHERE userid = '" .$focus->id ."'";
-			$result = $adb->query($sql);
-			$groupnameArray = $adb->fetch_array($result);
-		}
-		$groupselected = $groupnameArray["groupname"];
-		$sql2 = "SELECT groupname FROM vtiger_groups";
-                  $result_name = $adb->query($sql2);
-                  $temprow = $adb->fetch_array($result_name);
-                   do
-                   {
-          		  $selected = '';
-
-                    $groupname=$temprow["groupname"];
-		       if($groupselected != '' && $groupname == $groupselected)
-	        	{
-		                $selected = 'selected';
-        		}
-                    $GROUP_SELECT_OPTION .= '<option value="'.$groupname.'" '.$selected.'>';
-                    $GROUP_SELECT_OPTION .= $temprow["groupname"];
-                    $GROUP_SELECT_OPTION .= '</option>';
-                   }while($temprow = $adb->fetch_array($result_name));
-                                  
-                   $GROUP_SELECT_OPTION .= ' </select>';
-                   
-                   $smarty->assign("GROUP_NAME", $GROUP_SELECT_OPTION);
- }
-
-if (is_admin($current_user)) { 
-	$CURRENCY_SELECT_OPTION = '<select name="currency_id" class="small">';
-	}
-else
-{
-	$CURRENCY_SELECT_OPTION = '<select name="currency_id" class="small" disabled>';
-}
-	
-        if($focus->id != '')
-        {
-                $currencyselectedid=fetchCurrency($focus->id);
-                $currencyselected=getCurrencyName($currencyselectedid);
-        }
-        $allCurrency=getDisplayCurrency();
-        foreach($allCurrency as $id=>$currencyInfoArr)
-        {
-               $currencyname=$currencyInfoArr;
-               $selected = '';
-               if($currencyselected != '' && $currencyname == $currencyselected)
-               {
-                       $selected = 'selected';
-               }
-               $CURRENCY_SELECT_OPTION .= '<option value="'.$id .'" '.$selected .'>';
-               $CURRENCY_SELECT_OPTION .= $currencyname;
-               $CURRENCY_SELECT_OPTION .= '</option>';
-        }
-        $CURRENCY_SELECT_OPTION .= ' </select>';
-        $smarty->assign("CURRENCY_NAME", $CURRENCY_SELECT_OPTION);
-
-
-
-$smarty->assign("ACTIVITY_VIEW", getActivityVIew($focus->activity_view));
-$smarty->assign("CLOUD_TAG", $focus->tagcloud);
-
-$smarty->assign("LEAD_VIEW", getLeadVIew($focus->lead_view));
-
-		if($focus->cal_color == '') $focus->cal_color = '#E6FAD8';
-
- 		$smarty->assign("CAL_COLOR",'<INPUT TYPE="text" readonly NAME="cal_color" SIZE="10" VALUE="'.$focus->cal_color.'" style="background-color:'.$focus->cal_color.';"> <img src="include/images/bgcolor.gif" onClick="cp2.select(document.EditView.cal_color,\'pick2\');return false;" NAME="pick2" ID="pick2" align="middle">');
-		
-		$hrformat = '<select name="hour_format" class="small">';
-		if($focus->hour_format == '24')
-		{
-			$_24selected = 'selected';
-			$_ampmselected = '';
-		}
-		elseif($focus->hour_format == 'am/pm')
-		{
-			$_24selected = '';
-			$_ampmselected = 'selected';
-		}
-		$hrformat .= '<option value="24" '.$_24selected.'>23:00</option>';
-		$hrformat .= '<option value="am/pm" '.$_ampmselected.'>11:00pm</option>';
-		$hrformat .= '</select>';
-		$smarty->assign("CAL_HRFORMAT",$hrformat);
-
-		$stend_hour = '<select name="start_hour" class="small">';
-		for($i=0;$i<=15;$i++)
-		{
-			if($i == $focus->start_hour)
-				$selected = 'selected';
-			else
-				$selected = '';
-			if($i <= 9 && strlen(trim($i)) < 2)
-			{
-				$hrvalue= '0'.$i.':00';
-			}
-			else
-				$hrvalue= $i.':00';
-			$stend_hour .= '<option value="'.$hrvalue.'" '.$selected.'>'.$hrvalue.'</option>';
-		}
-		$stend_hour .= '</select>&nbsp;ends at:';
-		$stend_hour .= '<select name="end_hour" class="small">';
-		for($i=16;$i<=23;$i++)
-		{
-			if($i == $focus->end_hour)
-				$selected = 'selected';
-			else
-				$selected = '';
-			if($i <= 9 && strlen(trim($i)) < 2)
-			{
-				$hrvalue= '0'.$i.':00';
-			}
-			else
-				$hrvalue= $i.':00';
-			$stend_hour .= '<option value="'.$hrvalue.'" '.$selected.'>'.$hrvalue.'</option>';
-		}
-		$stend_hour .= '</select>&nbsp;';
-		$smarty->assign("CAL_HRDURATION",$stend_hour);
-
-if (isset($default_user_name)
-	&& $default_user_name != ""
-	&& $default_user_name == $focus->user_name
-	&& isset($lock_default_user_name)
-	&& $lock_default_user_name == true ) {
-	$status .= " disabled ";
-	$smarty->assign("DISABLED", "disabled");
-}
-
+$smarty->assign("MODE",$focus->mode);
 if ($_REQUEST['Edit'] == ' Edit ')
 {
 	$smarty->assign("READONLY", "readonly");
@@ -352,12 +106,6 @@
 
 
 
-if (is_admin($current_user) && $focus->is_admin == 'on') $smarty->assign("IS_ADMIN", "checked");
-elseif (is_admin($current_user) && $focus->is_admin != 'on') ;
-elseif (!is_admin($current_user) && $focus->is_admin == 'on') $smarty->assign("IS_ADMIN", "disabled checked");
-else $smarty->assign("IS_ADMIN", "disabled");
-
-//$smarty->assign("",$focus->getUserListViewHeader());
 
 $smarty->assign('PARENTTAB',$_REQUEST['parenttab']);
 

Modified: vtigercrm/trunk/modules/Users/Forms.php
==============================================================================
--- vtigercrm/trunk/modules/Users/Forms.php (original)
+++ vtigercrm/trunk/modules/Users/Forms.php Tue Jun 13 04:04:34 2006
@@ -54,7 +54,7 @@
 function verify_data(form) {
 	var isError = false;
 	var errorMessage = "";
-	if (trim(form.email1.value) == "") {
+	if (trim(form.email.value) == "") {
 		isError = true;
 		errorMessage += "\\n$lbl_user_email1";
 		oField_miss = form.email1;
@@ -71,15 +71,15 @@
 	}
 	if(form.mode.value !='edit')
 	{
-		if (trim(form.new_password.value) == "") {
+		if (trim(form.user_password.value) == "") {
 			isError = true;
 			errorMessage += "\\n$lbl_new_password";
-			oField_miss =form.new_password;
+			oField_miss =form.user_password;
 		}
-		if (trim(form.confirm_new_password.value) == "") {
+		if (trim(form.confirm_password.value) == "") {
 			isError = true;
 			errorMessage += "\\n$lbl_confirm_new_password";
-			oField_miss =form.confirm_new_password;
+			oField_miss =form.confirm_password;
 		}
 	}
 	if (trim(form.user_name.value) == "") {
@@ -91,19 +91,19 @@
 	if (isError == true) {
 		set_fieldfocus(errorMessage,oField_miss);
 	}
-	if (trim(form.email1.value) != "" && !/^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,4})+$/.test(form.email1.value)) {
-		errorMessage='"' + form.email1.value + '" is $err_invalid_email_address';
+	if (trim(form.email.value) != "" && !/^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,4})+$/.test(form.email.value)) {
+		errorMessage='"' + form.email.value + '" is $err_invalid_email_address';
 		set_fieldfocus(errorMessage,form.email1);
 	}
 	if (trim(form.email2.value) != "" && !/^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,4})+$/.test(form.email2.value)) {
-		errorMessage='"' + form.email2.value + '" value in other email vtiger_field is $err_invalid_email_address';
+		errorMessage='"' + form.email2.value + '" value in other email field is $err_invalid_email_address';
 		set_fieldfocus(errorMessage,form.email2);
 	}
 	if(form.mode.value != 'edit')
 	{
-		if(trim(form.new_password.value) != trim(form.confirm_new_password.value))
+		if(trim(form.user_password.value) != trim(form.confirm_password.value))
 		{
-			set_fieldfocus("The password does't match",form.form.new_password);
+			set_fieldfocus("The password does't match",form.user_password);
 		}
 		check_duplicate();
 	}else

Modified: vtigercrm/trunk/modules/Users/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Users/Save.php (original)
+++ vtigercrm/trunk/modules/Users/Save.php Tue Jun 13 04:04:34 2006
@@ -46,13 +46,16 @@
 elseif (!isset($_POST['record']) && !is_admin($current_user)) echo ("Unauthorized access to user administration.");
 
 $focus = new User();
-$focus->retrieve($_POST['record']);
-if(isset($focus->id) && $focus->id != '')
-    $mode='edit';
+if(isset($_REQUEST["record"]) && $_REQUEST["record"] != '')
+{
+    $focus->mode='edit';
+	$focus->id = $_REQUEST["record"];
+}
 else
-    $mode='';
+    $focus->mode='';
+	
 //save user Image
-$image_upload_array=SaveImage($_FILES,'user',$focus->id,$mode);
+$image_upload_array=SaveImage($_FILES,'user',$focus->id,$focus->mode);
 $focus->imagename = $image_upload_array['imagename'];
 $image_error = $image_upload_array['imageerror'];
 $errormessage = $image_upload_array['errormessage'];
@@ -69,61 +72,21 @@
 		exit;
 	}
 	
-	foreach($focus->column_fields as $field)
-	{
-		if(isset($_POST[$field]))
-		{
-			$value = $_POST[$field];
-			$focus->$field = $value;
 			
-		}
-	}
+	if (!isset($_POST['is_admin'])) $_REQUEST["is_admin"] = 'off';
+	//Code contributed by mike crowe for rearrange the home page and tab
+	if (!isset($_POST['deleted'])) $_REQUEST["deleted"] = '0';
+	if (!isset($_POST['homeorder']) || $_POST['homeorder'] == "" ) $_REQUEST["homeorder"] = 'ILTI,QLTQ,ALVT,PLVT,CVLVT,HLT,OLV,GRT,OLTSO';
 	
-	foreach($focus->additional_column_fields as $field)
-	{
-		if(isset($_POST[$field]))
-		{
-			$value = $_POST[$field];
-			$focus->$field = $value;
-			
-		}
-	}
-	
-	if (!isset($_POST['is_admin'])) $focus->is_admin = 'off';
-	//Code contributed by mike crowe for rearrange the home page and vtiger_tab
-	if (!isset($_POST['deleted'])) $focus->deleted = '0';
-	if (!isset($_POST['homeorder']) || $_POST['homeorder'] == "" ) $focus->homeorder = 'ILTI,QLTQ,ALVT,PLVT,CVLVT,HLT,OLV,GRT,OLTSO';
-	
-/*	if (!$focus->verify_data()) {
-		header("Location: index.php?action=Error&module=Users&error_string=".urlencode($focus->error_string));
-		exit;
-	}
-	else{	*/
+	setObjectValuesFromRequest(&$focus);
 		$focus->save("Users");
-//		include('modules/Calendar/user_ins.php');
-//		include("modules/Users/forum_register.php");	
 		$return_id = $focus->id;
-//	}
+
 if (isset($_POST['user_name']) && isset($_POST['new_password'])) {
-	/*	
-		//changing fourm password	
-		define('IN_PHPBB', 1);
-		
-		$phpbb_root_path = "modules/MessageBoard/";
-		require($phpbb_root_path . 'extension.inc');
-		include($phpbb_root_path . 'common.php');
-	*/	
 		$new_pass = $_POST['new_password'];
 		$new_passwd = $_POST['new_password'];
 		$new_pass = md5($new_pass);
 		$uname = $_POST['user_name'];
-		//$sql = "UPDATE " . USERS_TABLE . " SET user_password = '$new_pass' WHERE username = '$uname'";
-	/*
-		if (!($result = $db->sql_query($sql)) )
-		{
-			message_die(GENERAL_ERROR, 'Could not update user password', '', __LINE__, __FILE__, $sql);
-		}
-	*/
 		if (!$focus->change_password($_POST['confirm_new_password'], $_POST['new_password'])) {
 		
 			header("Location: index.php?action=Error&module=Users&error_string=".urlencode($focus->error_string));

Modified: vtigercrm/trunk/modules/Users/User.php
==============================================================================
--- vtigercrm/trunk/modules/Users/User.php (original)
+++ vtigercrm/trunk/modules/Users/User.php Tue Jun 13 04:04:34 2006
@@ -30,14 +30,14 @@
 
 require_once('include/logging.php');
 require_once('include/database/PearDatabase.php');
-require_once('data/SugarBean.php');
+require_once('data/CRMEntity.php');
 require_once('include/utils/UserInfoUtil.php');
 
 // User is used to store customer information.
-class User extends SugarBean {
+class User extends CRMEntity {
 	var $log;
 	var $db;
-	// Stored vtiger_fields
+	// Stored fields
 	var $id;
 	var $user_name;
 	var $user_password;
@@ -84,8 +84,22 @@
 	var $reports_to_id;
 
 	var $module_id='id';
-	
-	var $table_name = "vtiger_users";
+	var $tab_name = Array('vtiger_users','vtiger_attachments','vtiger_user2role');	
+	var $tab_name_index = Array('vtiger_users'=>'id','vtiger_attachments'=>'attachmentsid','vtiger_user2role'=>'userid');
+	var $column_fields = Array();
+	var $table_name = "users";
+	var $sortby_fields = Array();		  
+	
+    // This is the list of fields that are in the lists.
+    var $list_fields_name = Array();
+    var $list_link_field= '';
+
+	var $list_mode;
+	var $popup_type;
+
+	var $search_fields = Array();
+    var $search_fields_name = Array();
+	
 	var $module_name = "Users";
 
 	var $object_name = "User";
@@ -96,58 +110,13 @@
 	var $imagename;
 	var $defhomeview;
 	//var $sortby_fields = Array('user_name','email1','last_name','is_admin','status');	
-	var $column_fields = Array("id"
-		,"user_name"
-		,"user_password"
-		,"cal_color"
-		,"hour_format"
-		,"start_hour"
-		,"end_hour"
-		,"first_name"
-		,"last_name"
-		,"description"
-		,"date_entered"
-		,"date_modified"
-		,"modified_user_id"
-		,"title"
-		,"department"
-		,"is_admin"
-		,"currency_id"
-		,"phone_home"
-		,"phone_mobile"
-		,"phone_work"
-		,"phone_other"
-		,"phone_fax"
-		,"email1"
-		,"email2"
-		,"signature"
-		,"yahoo_id"
-		,"address_street"
-		,"address_city"
-		,"address_state"
-		,"address_postalcode"
-		,"address_country"
-		,"reports_to_id"
-		,"tz"
-		,"holidays"
-		,"namedays"
-		,"workdays"
-		,"weekstart"
-		,"status"
-		,"date_format"
-		,"activity_view"
-		,"lead_view"
-		,"tagcloud"
-		,"imagename"
-		,"defhomeview"
-		);
 
 	var $encodeFields = Array("first_name", "last_name", "description");
 
-	// This is used to retrieve related vtiger_fields from form posts.
+	// This is used to retrieve related fields from form posts.
 	var $additional_column_fields = Array('reports_to_name');		
 	
-	// This is the list of vtiger_fields that are in the lists.
+	// This is the list of fields that are in the lists.
 	var $list_fields = Array('id', 'first_name', 'last_name', 'user_name', 'status', 'department', 'yahoo_id', 'is_admin', 'email1', 'phone_work');
 	//commented as we get issues with sugarbean
 	/*
@@ -169,7 +138,10 @@
 
 	function User() {
 		$this->log = LoggerManager::getLogger('user');
+		$this->log->debug("Entering User() method ...");
 		$this->db = new PearDatabase();
+		$this->column_fields = getColumnFields('Users');
+		$this->log->debug("Exiting User() method ...");
 		
 	}
 
@@ -225,19 +197,20 @@
 	function encrypt_password($user_password)
 	{
 		// encrypt the password.
-		$salt = substr($this->user_name, 0, 2);
+		$salt = substr($this->column_fields["user_name"], 0, 2);
 		$encrypted_password = crypt($user_password, $salt);	
 
 		return $encrypted_password;
 	}
 	
 	function authenticate_user($password){
-	
-		$query = "SELECT * from $this->table_name where user_name='$this->user_name' AND user_hash='$password'";
+		$usr_name = $this->column_fields["user_name"];
+	
+		$query = "SELECT * from $this->table_name where user_name='$usr_name' AND user_hash='$password'";
 		$result = $this->db->requireSingleResult($query, false);
 
 		if(empty($result)){
-			$this->log->fatal("SECURITY: failed login by $this->user_name");
+			$this->log->fatal("SECURITY: failed login by $usr_name");
 			return false;
 		}
 
@@ -278,12 +251,13 @@
 	 */
 	function doLogin($user_password) {
 		global $AUTHCFG;
+		$usr_name = $this->column_fields["user_name"];
 	
 		switch (strtoupper($AUTHCFG['authType'])) {
 			case 'LDAP':
 				$this->log->debug("Using LDAP authentication");
 				require_once('modules/Users/authTypes/LDAP.php');
-				$result = ldapAuthenticate($this->user_name, $user_password);
+				$result = ldapAuthenticate($this->column_fields["user_name"], $user_password);
 				if ($result == NULL) {
 					return false;
 				} else {
@@ -295,7 +269,7 @@
 				$this->log->debug("Using Active Directory authentication");
 				require_once('modules/Users/authTypes/adLDAP.php');
 				$adldap = new adLDAP();
-				if ($adldap->authenticate($this->user_name,$user_password)) {
+				if ($adldap->authenticate($this->column_fields["user_name"],$user_password)) {
 					return true;
 				} else {
 					return false;
@@ -305,7 +279,7 @@
 			default:
 				$this->log->debug("Using integrated/SQL authentication");
 				$encrypted_password = $this->encrypt_password($user_password);
-				$query = "SELECT * from $this->table_name where user_name='$this->user_name' AND user_password='$encrypted_password'";
+				$query = "SELECT * from $this->table_name where user_name='$usr_name' AND user_password='$encrypted_password'";
 				$result = $this->db->requireSingleResult($query, false);
 				if (empty($result)) {
 					return false;
@@ -327,18 +301,19 @@
 	 */
 	function load_user($user_password)
 	{
+		$usr_name = $this->column_fields["user_name"];
 		if(isset($_SESSION['loginattempts'])){
 				 $_SESSION['loginattempts'] += 1;
 		}else{
 			$_SESSION['loginattempts'] = 1;	
 		}
 		if($_SESSION['loginattempts'] > 5){
-			$this->log->warn("SECURITY: " . $this->user_name . " has attempted to login ". 	$_SESSION['loginattempts'] . " times.");
-		}
-		$this->log->debug("Starting user load for $this->user_name");
+			$this->log->warn("SECURITY: " . $usr_name . " has attempted to login ". 	$_SESSION['loginattempts'] . " times.");
+		}
+		$this->log->debug("Starting user load for $usr_name");
 		$validation = 0;
 		unset($_SESSION['validation']);
-		if( !isset($this->user_name) || $this->user_name == "" || !isset($user_password) || $user_password == "")
+		if( !isset($this->column_fields["user_name"]) || $this->column_fields["user_name"] == "" || !isset($user_password) || $user_password == "")
 			return null;
 			
 		if($this->validation_check('aW5jbHVkZS9pbWFnZXMvc3VnYXJzYWxlc19tZC5naWY=','1a44d4ab8f2d6e15e0ff6ac1c2c87e6f', '866bba5ae0a15180e8613d33b0acc6bd') == -1)$validation = -1;
@@ -352,19 +327,18 @@
 		
 		if(!$authCheck)
 		{
-			$this->log->warn("User authentication for $this->user_name failed");
+			$this->log->warn("User authentication for $usr_name failed");
 			return null;
 		}
 		
-		$query = "SELECT * from $this->table_name where user_name='$this->user_name'";
+		$query = "SELECT * from $this->table_name where user_name='$usr_name'";
 		$result = $this->db->requireSingleResult($query, false);
 
-		// Get the vtiger_fields for the user
+		// Get the fields for the user
 		$row = $this->db->fetchByAssoc($result);
+		$this->id = $row['id'];	
 
 		$user_hash = strtolower(md5($user_password));
-		
-		
 		
 		
 		// If there is no user_hash is not present or is out of date, then create a new one.
@@ -372,19 +346,6 @@
 		{
 			$query = "UPDATE $this->table_name SET user_hash='$user_hash' where id='{$row['id']}'";
 			$this->db->query($query, true, "Error setting new hash for {$row['user_name']}: ");	
-		}
-		
-		// now fill in the vtiger_fields.
-		foreach($this->column_fields as $field)
-		{
-			//$this->log->info($field);
-			
-			if(isset($row[$field]))
-			{
-				$this->log->debug("=".$row[$field]);
-	
-				$this->$field = $row[$field];
-			}
 		}
 		$this->loadPreferencesFromDB($row['user_preferences']);
 		
@@ -408,9 +369,10 @@
 	*/
 	function change_password($user_password, $new_password)
 	{
+		$usr_name = $this->column_fields["user_name"];
 		global $mod_strings;
 		global $current_user;
-		$this->log->debug("Starting password change for $this->user_name");
+		$this->log->debug("Starting password change for $usr_name");
 		
 		if( !isset($new_password) || $new_password == "") {
 			$this->error_string = $mod_strings['ERR_PASSWORD_CHANGE_FAILED_1'].$user_name.$mod_strings['ERR_PASSWORD_CHANGE_FAILED_2'];
@@ -430,7 +392,7 @@
 	
 			if($row == null)
 			{
-				$this->log->warn("Incorrect old password for $this->user_name");
+				$this->log->warn("Incorrect old password for $usr_name");
 				$this->error_string = $mod_strings['ERR_PASSWORD_INCORRECT_OLD'];
 				return false;
 			}
@@ -441,7 +403,7 @@
 		
 		//set new password
 		$query = "UPDATE $this->table_name SET user_password='$encrypted_new_password', user_hash='$user_hash' where id='$this->id'";
-		$this->db->query($query, true, "Error setting new password for $this->user_name: ");	
+		$this->db->query($query, true, "Error setting new password for $usr_name: ");	
 		return true;
 	}
 	
@@ -460,16 +422,17 @@
 	}
 	
 	/** 
-	 * @return -- returns a list of all vtiger_users in the system.
+	 * @return -- returns a list of all users in the system.
 	 * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc..
 	 * All Rights Reserved..
 	 * Contributor(s): ______________________________________..
 	 */
 	function verify_data()
 	{
+		$usr_name = $this->column_fields["user_name"];
 		global $mod_strings;
 		
-		$query = "SELECT user_name from vtiger_users where user_name='$this->user_name' AND id<>'$this->id' AND deleted=0";
+		$query = "SELECT user_name from vtiger_users where user_name='$usr_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);
 		
@@ -478,20 +441,20 @@
 		$last_admin = $this->db->fetchByAssoc($result);
 
 		$this->log->debug("last admin length: ".count($last_admin));
-		$this->log->debug($last_admin['user_name']." == ".$this->user_name);
+		$this->log->debug($last_admin['user_name']." == ".$usr_name);
 
 		$verified = true;
 		if($dup_users != null)
 		{
-			$this->error_string .= $mod_strings['ERR_USER_NAME_EXISTS_1'].$this->user_name.$mod_strings['ERR_USER_NAME_EXISTS_2'];
+			$this->error_string .= $mod_strings['ERR_USER_NAME_EXISTS_1'].$usr_name.''.$mod_strings['ERR_USER_NAME_EXISTS_2'];
 			$verified = false;
 		}
 		if(!isset($_REQUEST['is_admin']) &&
 			count($last_admin) == 1 && 
-			$last_admin['user_name'] == $this->user_name) {
+			$last_admin['user_name'] == $usr_name) {
 			$this->log->debug("last admin length: ".count($last_admin));
 
-			$this->error_string .= $mod_strings['ERR_LAST_ADMIN_1'].$this->user_name.$mod_strings['ERR_LAST_ADMIN_2'];
+			$this->error_string .= $mod_strings['ERR_LAST_ADMIN_1'].$usr_name.$mod_strings['ERR_LAST_ADMIN_2'];
 			$verified = false;
 		}
 		
@@ -589,13 +552,14 @@
 	function retrieveCurrentUserInfoFromFile($userid)
 	{
 		require('user_privileges/user_privileges_'.$userid.'.php');
-		foreach($this->column_fields as $field)
+		foreach($this->column_fields as $field=>$value_iter)
                 {
                         if(isset($user_info[$field]))
                         {
                                 $this->$field = $user_info[$field];
                         }
                 }
+		$this->id = $userid;
 		return $this;
 		
 	}



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 03:06:34 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 10:06:34 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7019 - in
 /vtigercrm/trunk/Smarty/templates: DisplayFields.tpl UserDetailView.tpl
 UserEditView.tpl
Message-ID: <20060613100634.DA4A57E8C4C@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 13 04:06:27 2006
New Revision: 7019

Log:
users module added in CRMEntity


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

Modified: vtigercrm/trunk/Smarty/templates/DisplayFields.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DisplayFields.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DisplayFields.tpl Tue Jun 13 04:06:27 2006
@@ -452,6 +452,104 @@
 				<input name="{$fldname}"  type="file" value="{$secondvalue}"/>
 				<input type="hidden" name="id" value=""/>{$fldvalue}
 			</td>
+		{elseif $uitype eq 156}
+			<td width="20%" class="dvtCellLabel" align=right>
+				{$fldlabel}
+			</td>
+				{if $fldvalue eq 1}
+					<td width="30%" align=left class="dvtCellInfo">
+						<input name="{$fldname}" type="checkbox"  checked>
+					</td>
+				{else}
+					<td width="30%" align=left class="dvtCellInfo">
+						<input name="{$fldname}" type="checkbox">
+					</td>
+				{/if}
+		{elseif $uitype eq 98}<!-- Role Selection Popup -->		
+			<td width="20%" class="dvtCellLabel" align=right>
+			<font color="red">*</font>
+				{$fldlabel}
+			</td>
+			<td width="30%" align=left class="dvtCellInfo">
+			<input name="role_name" id="role_name" class="txtBox" value="{$secondvalue}" type="text">&nbsp;
+			<a href="javascript:openPopup();"><img src="{$IMAGE_PATH}select.gif" align="absmiddle" border="0"></a>
+			<input name="user_role" id="user_role" value="{$fldvalue}" type="hidden">
+			</td>
+		{elseif $uitype eq 104}<!-- Mandatory Email Fields -->			
+			 <td width=20% class="dvtCellLabel" align=right>
+			 <font color="red">*</font>
+			 {$fldlabel}
+			 </td>
+    	     <td width=30% align=left class="dvtCellInfo"><input type="text" name="{$fldname}" id ="{$fldname}" value="{$fldvalue}" class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'"></td>
+			{elseif $uitype eq 115}<!-- for Status field Disabled for nonadmin -->
+			<td width="20%" class="dvtCellLabel" align=right>
+				{$fldlabel}
+			</td>
+			<td width="30%" align=left class="dvtCellInfo">
+			   <select name="{$fldname}">
+				{foreach item=arr from=$fldvalue}
+					{foreach key=sel_value item=value from=$arr}
+						<option value="{$sel_value}" {$value}>{$sel_value}</option>
+					{/foreach}
+				{/foreach}
+			   </select>
+			</td>
+			{elseif $uitype eq 105}
+			<td width="20%" class="dvtCellLabel" align=right>
+				{$fldlabel}
+			</td>
+			<td width="30%" align=left class="dvtCellInfo">
+					<input name="{$fldname}"  type="file" value="{$maindata[3].0.name}"/>
+					<input type="hidden" name="id" value=""/>
+					{$maindata[3].0.name}
+			</td>
+			{elseif $uitype eq 103}
+			<td width="20%" class="dvtCellLabel" align=right>
+				{$fldlabel}
+			</td>
+			<td width="30%" colspan="3" align=left class="dvtCellInfo">
+				<input type="text" name="{$fldname}" value="{$fldvalue}" class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'">
+			</td>	
+			{elseif $uitype eq 101}<!-- for reportsto field USERS POPUP -->
+				<td width="20%" class="dvtCellLabel" align=right>
+			       {$fldlabel}
+	            </td>
+				<td width="30%" colspan="3" align=left class="dvtCellInfo">
+				<input readonly name='{$fldname}' class="small" type="text" value='{$fldvalue}'><input name='reports_to_id' type="hidden" value='{$fldvalue}'>&nbsp;<input title="Change [Alt+C]" accessKey="C" type="button" class="small" value='{$UMOD.LBL_CHANGE}' name=btn1 LANGUAGE=javascript onclick='return window.open("index.php?module=Users&action=Popup&form=UsersEditView&form_submit=false","test","width=640,height=522,resizable=0,scrollbars=0");'>
+	            </td>
+			{elseif $uitype eq 116}<!-- for currency in users details-->	
+			<td width="20%" class="dvtCellLabel" align=right>
+				{$fldlabel}
+			</td>
+			<td width="30%" align=left class="dvtCellInfo">
+			   <select name="{$fldname}">
+				{foreach item=arr key=uivalueid from=$fldvalue}
+					{foreach key=sel_value item=value from=$arr}
+						<option value="{$uivalueid}" {$value}>{$sel_value}</option>
+					{/foreach}
+				{/foreach}
+			   </select>
+			</td>
+			{elseif $uitype eq 106}
+			<td width=20% class="dvtCellLabel" align=right>
+				<font color="red">*</font>{$fldlabel}
+			</td>
+			<td width=30% align=left class="dvtCellInfo">
+				{if $MODE eq 'edit'}
+				<input type="text" readonly name="{$fldname}" value="{$fldvalue}" class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'">
+				{else}
+				<input type="text" name="{$fldname}" value="{$fldvalue}" class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'">
+				{/if}
+			</td>
+			{elseif $uitype eq 99}
+				{if $MODE eq 'create'}
+				<td width=20% class="dvtCellLabel" align=right>
+					<font color="red">*</font>{$fldlabel}
+				</td>
+				<td width=30% align=left class="dvtCellInfo">
+					<input type="password" name="{$fldname}" value="{$fldvalue}" class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'">
+				</td>
+				{/if}
 		{elseif $uitype eq 30}
 			<td width="20%" class="dvtCellLabel" align=right>
 				{$fldlabel}

Modified: vtigercrm/trunk/Smarty/templates/UserDetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/UserDetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/UserDetailView.tpl Tue Jun 13 04:06:27 2006
@@ -11,11 +11,12 @@
 -->*}
 <script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
 <script language="JavaScript" type="text/javascript" src="include/js/ColorPicker2.js"></script>
-<script language="JavaScript" type="text/javascript" src="include/js/prototype.js"></script>
-<script language="JavaScript" type="text/javascript" src="include/js/slider.js"></script>
-<script language="JavaScript" type="text/javascript" src="include/js/prototype_fade.js"></script>
-<script language="JavaScript" type="text/javascript" src="include/js/effectspack.js"></script>
 <script language="javascript" type="text/javascript" src="include/js/general.js"></script>
+<script language="JavaScript" type="text/javascript" src="include/js/dtlviewajax.js"></script>
+<span id="crmspanid" style="display:none;position:absolute;"  onmouseover="show('crmspanid');">
+   <a class="link"  align="right" href="javascript:;">Edit</a>
+</span>
+
 <style type="text/css">@import url(themes/blue/style.css);</style>
 
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
@@ -94,10 +95,8 @@
 			<td>
 			  <table class="small" border="0" cellpadding="3" cellspacing="0" width="100%">
 			  <tr >
+			        <td id="prof" width="25%" align="center" nowrap="nowrap" class="dvtSelectedCell" onClick="fnVis('prof')"><b>{$UMOD.LBL_USER_LOGIN_ROLE}</b></td>
 			     <td class="dvtTabCache" width="10" nowrap="nowrap">&nbsp;</td>
-			        <td id="prof" width="25%" align="center" nowrap="nowrap" class="dvtSelectedCell" onClick="fnVis('prof')"><b>{$UMOD.LBL_USER_LOGIN_ROLE}</b></td>
-				    <td id="more" width="25%" align="center" nowrap="nowrap" class="dvtUnSelectedCell" onClick="fnVis('more')"><b>{$UMOD.LBL_USER_MORE_INFN}</b></td>
-				    <td id="addr" width="25%" align="center" nowrap="nowrap" class="dvtUnSelectedCell" onClick="fnVis('addr')"><b>{$UMOD.LBL_USER_ADDR_INFN}</b></td>
 				    <td class="dvtTabCache" nowrap="nowrap" width="10">&nbsp;</td>
 			  </tr>
 			  </table>
@@ -105,162 +104,50 @@
 		  </tr>
 		  <tr>
 		  	<td align="left" valign="top">
-			<div id="mnuTab">
-				<table class="dvtContentSpace" border="0" cellpadding="0" cellspacing="0" width="100%">
-				<tr><td height="35">&nbsp;</td></tr>
-				<tr><td align="left">
-				<table width="99%"  border="0" cellspacing="0" cellpadding="5" align="center" class="small">
+				{foreach key=header item=detail from=$BLOCKS}
+				<table border=0 cellspacing=0 cellpadding=0 width=100% class="small">
   		    	<tr>
-				<td colspan="4" class="detailedViewHeader"><b>{$UMOD.LBL_USER_INFORMATION}</b></td>
+    	               <td>&nbsp;</td>
+        	           <td>&nbsp;</td>
+            	       <td>&nbsp;</td>
+                	   <td align=right>
 				</tr>  
 				<tr>
-				<td class="dvtCellLabel" align="right"><span class="style1"><font color='red'>{$APP.LBL_REQUIRED_SYMBOL}</font></span>{$UMOD.LBL_USER_NAME} </td>
-				<td class="dvtCellInfo">{$USER_NAME}&nbsp;</td>
-				<td class="dvtCellLabel" align="right">{$UMOD.LBL_ADMIN} </td>
-        	    <td class="dvtCellInfo"><input type="checkbox" name="is_admin" {$IS_ADMIN}/></td>
-				</tr>
-				{if $MODE eq 'edit'}
-				<tr>
-				<td class="dvtCellLabel" align="right" width="20%"><span class="style1"><font color='red'>{$APP.LBL_REQUIRED_SYMBOL}</font></span>{$UMOD.LBL_PASSWORD} </td>
-			    <td class="dvtCellInfo" width="20%"><input  name="new_password" type="password" class="detailedViewTextBox"  onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'" /></td>
-			    <td class="dvtCellLabel" width="20%" align="right"><span class="style1"><font color='red'>{$APP.LBL_REQUIRED_SYMBOL}</font></span>{$UMOD.LBL_CONFIRM_PASSWORD} </td>
-			    <td class="dvtCellInfo" width="20%"><input name="confirm_new_password" type="password" class="detailedViewTextBox"  onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'" /></td>
+						{strip}
+					     <td colspan=4 style="border-bottom:1px solid #999999;padding:5px;" bgcolor="#e5e5e5">
+							<b>	{$header}</b>
+						 </td>
+						 {/strip}
 			    </tr>
+					{foreach item=detail from=$detail}
+					<tr style="height:25px">
+							{foreach key=label item=data from=$detail}
+							   {assign var=keyid value=$data.ui}
+							   {assign var=keyval value=$data.value}
+							   {assign var=keytblname value=$data.tablename}
+							   {assign var=keyfldname value=$data.fldname}
+							   {assign var=keyoptions value=$data.options}
+							   {assign var=keysecid value=$data.secid}
+							   {assign var=keyseclink value=$data.link}
+							   {assign var=keycursymb value=$data.cursymb}
+							   {assign var=keysalut value=$data.salut}
+							   {assign var=keycntimage value=$data.cntimage}
+							   {assign var=keyadmin value=$data.isadmin}
+							   
+							   <input type="hidden" id="hdtxt_IsAdmin" value={$keyadmin}></input>
+							   	{if $label ne ''}
+									<td class="dvtCellLabel" align=right width=25%>{$label}</td>
+									{include file="DetailViewUI.tpl"}
+								{else}
+                                    <td class="dvtCellLabel" align=right>&nbsp;</td>
+                                    <td class="dvtCellInfo" align=left >&nbsp;</td>
 				{/if}	
-			    <tr>
-			    <td class="dvtCellLabel" align="right">{$UMOD.LBL_FIRST_NAME} </td>
-			    <td class="dvtCellInfo">{$FIRST_NAME}&nbsp;</td>
-			    <td class="dvtCellLabel" align="right"><span class="style1"><font color='red'>{$APP.LBL_REQUIRED_SYMBOL}</font></span>{$UMOD.LBL_LAST_NAME}</td>
-			    <td class="dvtCellInfo">{$LAST_NAME}&nbsp;</td>
+							{/foreach}
 			 	</tr>
-				<tr>
-				<td class="dvtCellLabel" align="right"><span class="style1"><font color='red'>{$APP.LBL_REQUIRED_SYMBOL}</font></span>{$UMOD.LBL_USER_ROLE}</td>
-				<td class="dvtCellInfo">{$ROLEASSIGNED}&nbsp;</td>							      <td class="dvtCellLabel" align="right">{$UMOD.LBL_GROUP_NAME}</td>
-				<td class="dvtCellInfo">{$GROUPASSIGNED}&nbsp;</td>
-			    </tr>
-				<tr>
-				<td class="dvtCellLabel" align="right"><span class="style1"><font color='red'>{$APP.LBL_REQUIRED_SYMBOL}</font></span>{$UMOD.LBL_EMAIL}</td>
-				<td class="dvtCellInfo"><a href="mailto:{$EMAIL1}" target="_blank">{$EMAIL1}</a>&nbsp;</td>
-				<td class="dvtCellLabel" align="right"><span class="style1"><font color='red'>{$APP.LBL_REQUIRED_SYMBOL}</font></span>{$UMOD.LBL_STATUS}</td>
+					{/foreach}
+					</table>
+				 {/foreach}
 
-				<td class="dvtCellInfo">{$STATUS}&nbsp;</td>
-				</tr>
-				<tr><td colspan="4" class="dvtCellInfo" height="30">&nbsp;</td></tr>
-				<tr>
-				<td class="dvtCellLabel" align="right">{$UMOD.LBL_ACTIVITY_VIEW}</td>
-				<td class="dvtCellInfo">{$ACTIVITY_VIEW}&nbsp;</td>
-				<td class="dvtCellLabel" align="right">{$UMOD.LBL_LEAD_VIEW}</td>
-				<td span class="dvtCellInfo">{$LEAD_VIEW}&nbsp;</td>
-				</tr>
-				<tr>
-				<td class="dvtCellLabel" align="right">{$UMOD.LBL_CURRENCY_NAME}</td>
-		                <td span class="dvtCellInfo">{$CURRENCY_NAME}&nbsp;</td>
-				<td class="dvtCellLabel" align="right"></td>
-				<td class="dvtCellInfo">&nbsp;</td>
-				</tr>
-				<tr><td colspan="4" height="30">&nbsp;</td></tr>
-				</table>
-				</td></tr>
-				</table>
-			</div>
-			<div id="mnuTab1" >
-			  	<table class="dvtContentSpace" border="0" cellpadding="0" cellspacing="0" width="100%">
-				<tr><td height="35">&nbsp;</td></tr>
-				<tr><td align="left">
-				<table width="99%"  border="0" cellspacing="0" cellpadding="5" align="center" class="small">
-				<tr>
-				<td colspan="4" class="detailedViewHeader"><b>{$UMOD.LBL_USER_MORE_INFN}</b></td>
-				</tr>  
-				<tr>
-				<td class="dvtCellLabel" align="right">{$UMOD.LBL_TITLE}</td>
-				<td class="dvtCellInfo">{$TITLE}&nbsp;</td>
-				<td class="dvtCellLabel" align="right">{$UMOD.LBL_OFFICE_PHONE}</td>
-         		<td class="dvtCellInfo">{$PHONE_WORK}&nbsp;</td>
-				</tr>
-				<tr>
-				<td class="dvtCellLabel" align="right" width="20%">{$UMOD.LBL_DEPARTMENT}</td>
-				<td class="dvtCellInfo" width="20%">{$DEPARTMENT}&nbsp;</td>
-				<td class="dvtCellLabel" width="20%" align="right">{$UMOD.LBL_MOBILE_PHONE}</td>
-				<td class="dvtCellInfo" width="20%">{$PHONE_MOBILE}&nbsp;</td>
-			    </tr>
-			    <tr>
-				<td class="dvtCellLabel" align="right">{$UMOD.LBL_REPORTS_TO}</td>
-				<td class="dvtCellInfo" width="20%">{$REPORTS_TO_NAME}{$REPORTS_TO_ID}&nbsp;</td>
-				<td class="dvtCellLabel" align="right">{$UMOD.LBL_OTHER_PHONE}</td>
-				<td class="dvtCellInfo">{$PHONE_OTHER}&nbsp;</td>
-				</tr>
-				<tr>
-				<td class="dvtCellLabel" align="right">{$UMOD.LBL_OTHER_EMAIL}</td>
-				<td class="dvtCellInfo">{$EMAIL2}&nbsp;</td>
-				<td class="dvtCellLabel" align="right">{$UMOD.LBL_FAX}</td>
-				<td class="dvtCellInfo">{$PHONE_FAX}&nbsp;</td>
-				</tr>
-				<tr>
-				<td class="dvtCellLabel" align="right">{$UMOD.LBL_YAHOO_ID}</td>
-				<td class="dvtCellInfo">{$YAHOO_ID}&nbsp;</td>
-				<td class="dvtCellLabel" align="right">{$UMOD.LBL_HOME_PHONE}</td>
-				<td class="dvtCellInfo">{$PHONE_HOME}&nbsp;</td>
-				</tr>
-				<tr>
-				<td class="dvtCellLabel" align="right">{$UMOD.LBL_DATE_FORMAT}</td>
-				<td class="dvtCellInfo" width="30%">{$DATE_FORMAT}&nbsp;</td>
-				<td class="dvtCellLabel" align="right">&nbsp;</td>
-				<td class="dvtCellInfo">&nbsp;</td>
-				</tr>
-				<tr>
-				<td class="dvtCellLabel" align="right">{$UMOD.LBL_SIGNATURE}</td>
-				<td class="dvtCellInfo">{$SIGNATURE}&nbsp;</td>
-				<td class="dvtCellLabel" align="right">{$UMOD.LBL_NOTES}</td>
-				<td span class="dvtCellInfo">{$DESCRIPTION}&nbsp;</td>
-				</tr>
-				<tr><td colspan="4" height="30">&nbsp;</td></tr>
-				</table>
-				</td></tr>
-				</table>
-			</div>
-		  	<div id="mnuTab2" >
- 			    <table class="dvtContentSpace" border="0" cellpadding="0" cellspacing="0" width="100%">
-			    <tr><td height="35">&nbsp;</td></tr>
-			    <tr><td align="left">
-				<table width="99%"  border="0" cellspacing="0" cellpadding="5" align="center" class="small">
-				<tr>
-				<td colspan="4" class="detailedViewHeader"><b>{$UMOD.LBL_USER_ADDR_INFN}</b></td>
-				</tr>  
-				<tr>
-				<td class="dvtCellLabel" align="right">{$UMOD.LBL_ADDRESS}</td>
-				<td class="dvtCellInfo">{$ADDRESS_STREET}&nbsp;</td>
-				<td class="dvtCellInfo" >&nbsp;</td>
-				<td class="dvtCellInfo">&nbsp;</td>
-				</tr>
-				<tr>
-				<td class="dvtCellLabel" align="right" width="20%">{$UMOD.LBL_CITY}</td>
-				<td class="dvtCellInfo" width="20%">{$ADDRESS_CITY}&nbsp;</td>
-				<td class="dvtCellInfo" width="20%">&nbsp;</td>
-				<td class="dvtCellInfo" width="20%">&nbsp;</td>
-				</tr>
-				<tr>
-				<td class="dvtCellLabel" align="right">{$UMOD.LBL_STATE}</td>
-				<td class="dvtCellInfo">{$ADDRESS_STATE}&nbsp;</td>
-				<td class="dvtCellInfo">&nbsp;</td>
-				<td class="dvtCellInfo">&nbsp;</td>
-				</tr>
-				<tr>
-				<td class="dvtCellLabel" align="right">{$UMOD.LBL_POSTAL_CODE}</td>
-				<td class="dvtCellInfo">{$ADDRESS_POSTALCODE}&nbsp;</td>
-			    <td class="dvtCellInfo">&nbsp;</td>
-			    <td class="dvtCellInfo">&nbsp;</td>
-				</tr>
-				<tr>
-			    <td class="dvtCellLabel" align="right">{$UMOD.LBL_COUNTRY}</td>
-			    <td class="dvtCellInfo">{$ADDRESS_COUNTRY}&nbsp;</td>
-			    <td class="dvtCellInfo" >&nbsp;</td>
-			    <td class="dvtCellInfo">&nbsp;</td>
-			    </tr>
-			    <tr><td colspan="4" height="30">&nbsp;</td></tr>
-				</table>
-				</td></tr>
-				</table>
-			</div>
 			</td>
 			</tr>
 			

Modified: vtigercrm/trunk/Smarty/templates/UserEditView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/UserEditView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/UserEditView.tpl Tue Jun 13 04:06:27 2006
@@ -115,11 +115,8 @@
 			<td>
 			  <table class="small" border="0" cellpadding="3" cellspacing="0" width="100%">
 			  <tr>
+			     <td id="prof" width="25%" align="center" nowrap="nowrap" class="dvtSelectedCell" onclick="fnVis('prof')" ><b>{$UMOD.LBL_USER_LOGIN_ROLE}</b></td>
 			     <td class="dvtTabCache" width="10" nowrap="nowrap">&nbsp;</td>
-			        <td id="prof" width="25%" align="center" nowrap="nowrap" class="dvtSelectedCell" onclick="fnVis('prof')" ><b>{$UMOD.LBL_USER_LOGIN_ROLE}</b></td>
-				 <td id="more" width="25%" align="center" nowrap="nowrap" class="dvtUnSelectedCell" onclick="fnVis('more')"><b>{$UMOD.LBL_USER_MORE_INFN}</b></td>
-				 <td id="addr" width="25%" align="center" nowrap="nowrap" class="dvtUnSelectedCell" onclick="fnVis('addr')"><b>{$UMOD.LBL_USER_ADDR_INFN}</b></td>
-				<td class="dvtTabCache" nowrap="nowrap" width="10">&nbsp;</td>
 			  </tr>
 			  </table>
 			</td>
@@ -131,194 +128,21 @@
 				        <tr><td height="35">&nbsp;</td></tr>
 					<tr><td align="left">
 					   <table width="99%"  border="0" cellspacing="0" cellpadding="5" align="center" class="small">
-  		                           <tr>
-						{if $MODE eq 'edit'}
-					           <td colspan="4" class="detailedViewHeader"><b>{$APP.LBL_EDIT} {$UMOD.LBL_USER_INFORMATION}</b></td>
-						{else}
-					           <td colspan="4" class="detailedViewHeader"><b>{$UMOD.LBL_NEW_FORM_TITLE}</b></td>
-						{/if}	
-					   </tr>  
-				<tr>
-				    <td class="dvtCellLabel" align="right"><span class="style1"><font color='red'>{$APP.LBL_REQUIRED_SYMBOL}</font></span>{$UMOD.LBL_USER_NAME} </td>
-				    <td class="dvtCellInfo"><input type="text" id="user_name" name="user_name" value='{$USER_NAME}' class="detailedViewTextBox"  onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'"{$USERNAME_READONLY} /></td>
-				     <td class="dvtCellLabel" align="right">{$UMOD.LBL_ADMIN} </td>
-                                     <td class="dvtCellInfo"><input type="checkbox" name="is_admin" {$DISABLED} {$IS_ADMIN}/></td>
-				</tr>
-				{if $MODE neq 'edit'}
-				<tr>
-				    <td class="dvtCellLabel" align="right" width="20%"><span class="style1"><font color='red'>{$APP.LBL_REQUIRED_SYMBOL}</font></span>{$UMOD.LBL_PASSWORD} </td>
-				    <td class="dvtCellInfo" width="20%"><input name="new_password" type="password" class="detailedViewTextBox"  onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'" /></td>
-				    <td class="dvtCellLabel" width="20%" align="right"><span class="style1"><font color='red'>{$APP.LBL_REQUIRED_SYMBOL}</font></span>{$UMOD.LBL_CONFIRM_PASSWORD} </td>
-				    <td class="dvtCellInfo" width="20%"><input name="confirm_new_password" type="password" class="detailedViewTextBox"  onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'" /></td>
-			        </tr>
-				{/if}	
-			        <tr>
-				    <td class="dvtCellLabel" align="right">{$UMOD.LBL_FIRST_NAME} </td>
-				    <td class="dvtCellInfo"><input type="text" name="first_name" value='{$FIRST_NAME}' class="detailedViewTextBox"  onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'" /></td>
-				    <td class="dvtCellLabel" align="right"><span class="style1"><font color='red'>{$APP.LBL_REQUIRED_SYMBOL}</font></span>{$UMOD.LBL_LAST_NAME}</td>
-				    <td class="dvtCellInfo"><input type="text" name="last_name" value='{$LAST_NAME}' class="detailedViewTextBox"  onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'" /></td>
-				 </tr>
-				 <tr>
-				    <td class="dvtCellLabel" align="right"><span class="style1"><font color='red'>{$APP.LBL_REQUIRED_SYMBOL}</font></span>{$UMOD.LBL_USER_ROLE}</td>
-				    <td class="dvtCellInfo"><!-- {$USER_ROLE} -->
-							<input type="text" name="role_name"  id="role_name" value="{$ROLENAME}" class="txtBox" readonly="readonly">&nbsp;
-							{$ROLEPOPUPBUTTON}
-							<input type="hidden" name="user_role" id="user_role" value="{$USERROLE}">
-					</td>
+
+									   {foreach key=header item=data from=$BLOCKS}
+					     <tr>
+											<td colspan=4 class="detailedViewHeader">
+											<b>{$header}</b>
+						</td>
+					     </tr>
+										<!-- Handle the ui types display -->
+										{include file="DisplayFields.tpl"}
+
+									   {/foreach}
 
 
-				   <td class="dvtCellLabel" align="right"><span class="style1"><font color='red'>{$APP.LBL_REQUIRED_SYMBOL}</font></span>{$UMOD.LBL_EMAIL}</td>
-                                    <td class="dvtCellInfo"><input type="text" name="email1" value='{$EMAIL1}' class="detailedViewTextBox"  onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'" /></td>
-			         </tr>
-				 <tr>
-
-				  <td class="dvtCellLabel" align="right"><span class="style1"><font color='red'>{$APP.LBL_REQUIRED_SYMBOL}</font></span>{$UMOD.LBL_STATUS}</td>
-				 {$USER_STATUS_OPTIONS}
-				<td class="dvtCellInfo" colspan="2" >&nbsp;</td>	
-				 </tr>
-				 <tr><td colspan="4" class="dvtCellInfo" height="30">&nbsp;</td></tr>
-				 <tr>
-				    <td class="dvtCellLabel" align="right">{$UMOD.LBL_ACTIVITY_VIEW}</td>
-				    <td class="dvtCellInfo">{$ACTIVITY_VIEW}</td>
-				    <td class="dvtCellLabel" align="right">{$UMOD.LBL_LEAD_VIEW}</td>
-				    <td span class="dvtCellInfo">{$LEAD_VIEW}</td>
-				 </tr>
-				 <tr>
-				   <td class="dvtCellLabel" align="right">{$UMOD.LBL_CURRENCY_NAME}</td>
-                                   <td span class="dvtCellInfo">{$CURRENCY_NAME}</td>
-				   <td class="dvtCellLabel" align="right"></td>
-			 	   <td class="dvtCellInfo">&nbsp;</td>
-				 </tr>
-				 <tr><td colspan="4" height="30">&nbsp;</td></tr>
-				 </table>
-				 </td></tr>
-				 </table>
-				  </div>
-					<div id="mnuTab1">
-					  <table class="dvtContentSpace" border="0" cellpadding="0" cellspacing="0" width="100%">
-					   <tr><td height="35">&nbsp;</td></tr>
-					   <tr><td align="left">
-					   <table width="99%"  border="0" cellspacing="0" cellpadding="5" align="center" class="small">
-					     <tr>
-						{if $MODE eq 'edit'}
-					           <td colspan="4" class="detailedViewHeader"><b>{$APP.LBL_EDIT} {$UMOD.LBL_USER_INFORMATION}</b></td>
-						{else}
-					           <td colspan="4" class="detailedViewHeader"><b>{$UMOD.LBL_NEW_FORM_TITLE}</b></td>
-						{/if}	
-					     </tr>  
-					     <tr>
-						<td class="dvtCellLabel" align="right">{$UMOD.LBL_TITLE}</td>
-						<td class="dvtCellInfo"><input type="text" name="title" value='{$TITLE}' class="detailedViewTextBox"  onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" /></td>
-						<td class="dvtCellLabel" align="right">{$UMOD.LBL_OFFICE_PHONE}</td>
-         					<td class="dvtCellInfo"><input type="text" name="phone_work" value='{$PHONE_WORK}' class="detailedViewTextBox"  onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'" /></td>
-					     </tr>
-					     <tr>
-						<td class="dvtCellLabel" align="right" width="20%">{$UMOD.LBL_DEPARTMENT}</td>
-						<td class="dvtCellInfo" width="20%"><input type="text" name="department" value='{$DEPARTMENT}' class="detailedViewTextBox"  onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'" /></td>
-						<td class="dvtCellLabel" width="20%" align="right">{$UMOD.LBL_MOBILE_PHONE}</td>
-
-						<td class="dvtCellInfo" width="20%"><input type="text" value='{$PHONE_MOBILE}' name="phone_mobile" class="detailedViewTextBox"  onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'" /></td>
-					     </tr>
-					     <tr>
-						<td class="dvtCellLabel" align="right">{$UMOD.LBL_REPORTS_TO}</td>
-						<td class="dvtCellInfo" width="20%"><input readonly name='reports_to_name' class="small" type="text" value='{$REPORTS_TO_NAME}'><input name='reports_to_id' type="hidden" value='{$REPORTS_TO_ID}'>&nbsp;<input title="Change [Alt+C]" accessKey="C" type="button" class="small" value='{$UMOD.LBL_CHANGE}' name=btn1 LANGUAGE=javascript onclick='return window.open("index.php?module=Users&action=Popup&form=UsersEditView&form_submit=false","test","width=640,height=522,resizable=0,scrollbars=0");'></td>
-						<td class="dvtCellLabel" align="right">{$UMOD.LBL_OTHER_PHONE}</td>
-						<td class="dvtCellInfo"><input type="text" name="phone_other" value='{$PHONE_OTHER}' class="detailedViewTextBox"  onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'" /></td>
-					     </tr>
-					     <tr>
-						<td class="dvtCellLabel" align="right">{$UMOD.LBL_OTHER_EMAIL}</td>
-						<td class="dvtCellInfo"><input type="text" name="email2" value='{$EMAIL2}' class="detailedViewTextBox"  onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'" /></td>
-						<td class="dvtCellLabel" align="right">{$UMOD.LBL_FAX}</td>
-						<td class="dvtCellInfo"><input type="text" name="phone_fax" value='{$PHONE_FAX}' class="detailedViewTextBox"  onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'" /></td>
-					     </tr>
-					     <tr>
-						<td class="dvtCellLabel" align="right">{$UMOD.LBL_YAHOO_ID}</td>
-						<td class="dvtCellInfo"><input type="text" name="yahoo_id" value='{$YAHOO_ID}' class="detailedViewTextBox"  onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'" /></td>
-						<td class="dvtCellLabel" align="right">{$UMOD.LBL_HOME_PHONE}</td>
-						<td class="dvtCellInfo"><input type="text" name="phone_home" value='{$PHONE_HOME}' class="detailedViewTextBox"  onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'" /></td>
-					     </tr>
-						
-					     <tr>
-					     <td class="dvtCellLabel" align="right">{$UMOD.LBL_USER_IMAGE}</td
->
-					<td class="dvtCellInfo"><input name="imagename" value="" type="file" class="small"></td>
-					<td class="dvtCellLabel" align="right">{$UMOD.LBL_DATE_FORMAT}</td>
-                    <td class="dvtCellInfo" width="30%">{$DATE_FORMAT}</td>
-				       	</tr>	
-						
-						
-						 <tr><td class="dvtCellLabel" align="right">
-						 {$UMOD.LBL_TAG_CLOUD}
-						 </td>
-						 <td colspan=3 class="dvtCellInfo"><input name='tagcloud' type="text" size='40' maxlength='250' value="{$CLOUD_TAG}" class="detailedViewTextBox"  onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'"></td>
-						 </tr>
-					     <tr>
-					    <td class="dvtCellLabel" align="right">{$UMOD.LBL_SIGNATURE}</td>
-						<td class="dvtCellInfo"><textarea name="signature" rows="3" class="detailedViewTextBox"  onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'" >{$SIGNATURE}</textarea></td>
-						<td class="dvtCellLabel" align="right">{$UMOD.LBL_NOTES}</td>
-						<td span class="dvtCellInfo"><textarea name="description" rows="3" class="detailedViewTextBox"  onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'" >{$DESCRIPTION}</textarea>
-						</td>
-					     </tr>
-					     <tr><td colspan="4" height="30">&nbsp;</td></tr>
-					     </table>
-					     </td></tr>
-					     </table>
-					       </div>
-
-						  <div id="mnuTab2">
- 						     <table class="dvtContentSpace" border="0" cellpadding="0" cellspacing="0" width="100%">
-						       <tr><td height="35">&nbsp;</td></tr>
-						       <tr><td align="left">
-							   <table width="99%"  border="0" cellspacing="0" cellpadding="5" align="center" class="small">
-						       <tr>
-							{if $MODE eq 'edit'}
-					           		<td colspan="4" class="detailedViewHeader"><b>{$APP.LBL_EDIT} {$UMOD.LBL_USER_INFORMATION}</b></td>
-							{else}
-					           		<td colspan="4" class="detailedViewHeader"><b>{$UMOD.LBL_NEW_FORM_TITLE}</b></td>
-							{/if}	
-						       </tr>  
-						       <tr>
-							   <td class="dvtCellLabel" align="right">{$UMOD.LBL_ADDRESS}</td>
-							   <td class="dvtCellInfo"><textarea name="address_street" rows="3" class="detailedViewTextBox"  onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'" >{$ADDRESS_STREET}</textarea></td>
-							   <td class="dvtCellInfo" >&nbsp;</td>
-							   <td class="dvtCellInfo">&nbsp;</td>
-							</tr>
-							<tr>
-							   <td class="dvtCellLabel" align="right" width="20%">{$UMOD.LBL_CITY}</td>
-							   <td class="dvtCellInfo" width="20%"><input type="text" name="address_city" value='{$ADDRESS_CITY}' class="detailedViewTextBox"  onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'" /></td>
-							   <td class="dvtCellInfo" width="20%">&nbsp;</td>
-							   <td class="dvtCellInfo" width="20%">&nbsp;</td>
-							</tr>
-							<tr>
-							   <td class="dvtCellLabel" align="right">{$UMOD.LBL_STATE}</td>
-							   <td class="dvtCellInfo"><input type="text" value='{$ADDRESS_STATE}' name="address_state" class="detailedViewTextBox"  onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'" /></td>
-							   <td class="dvtCellInfo">&nbsp;</td>
-							   <td class="dvtCellInfo">&nbsp;</td>
-							</tr>
-							<tr>
-							   <td class="dvtCellLabel" align="right">{$UMOD.LBL_POSTAL_CODE}</td>
-							   <td class="dvtCellInfo"><input type="text" value='{$ADDRESS_POSTALCODE}' name="address_postalcode" class="detailedViewTextBox"  onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'" /></td>
-
-							    <td class="dvtCellInfo">&nbsp;</td>
-							    <td class="dvtCellInfo">&nbsp;</td>
-							</tr>
-							<tr>
-							    <td class="dvtCellLabel" align="right">{$UMOD.LBL_COUNTRY}</td>
-							    <td class="dvtCellInfo"><input type="text" value='{$ADDRESS_COUNTRY}' name="address_country" class="detailedViewTextBox"  onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'" /></td>
-							    <td class="dvtCellInfo" >&nbsp;</td>
-							    <td class="dvtCellInfo">&nbsp;</td>
-							 </tr>
-							 <tr><td colspan="4" height="30">&nbsp;</td></tr>
-							 </table>
-						 	  </td></tr>
-							 </table>
-						</div>
-						    </td>
-						     </tr>
-
-							        <tr><td>&nbsp;</td></tr>
 							        <tr>
-							            <td><div align="center">
+							            <td colspan=4><div align="center">
 								    <input title="{$APP.LBL_SAVE_BUTTON_TITLE}" accesskey="{$APP.LBL_SAVE_BUTTON_KEY}" class="small"  name="button" value="  {$APP.LBL_SAVE_BUTTON_LABEL}  "  onclick="this.form.action.value='Save'; return verify_data(EditView)" style="width: 70px;" type="button" />
 								    <input title="{$APP.LBL_CANCEL_BUTTON_TITLE}" accesskey="{$APP.LBL_CANCEL_BUTTON_KEY}" class="small" name="button" value="  {$APP.LBL_CANCEL_BUTTON_LABEL}  " onclick="window.history.back()" style="width: 70px;" type="button" />
 								        </div></td>



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 03:31:45 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 10:31:45 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7020 -
	/vtigercrm/trunk/Smarty/templates/GlobalListView.tpl
Message-ID: <20060613103145.44E547E8C55@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 13 04:31:41 2006
New Revision: 7020

Log:
* Modified to display all the module search lists defaultly

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

Modified: vtigercrm/trunk/Smarty/templates/GlobalListView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/GlobalListView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/GlobalListView.tpl Tue Jun 13 04:31:41 2006
@@ -35,7 +35,7 @@
 {elseif $MODULE eq 'Contacts' && $SEARCH_MODULE eq ''}
 	<div id="global_list_{$MODULE}" style="display:block">
 {else}
-	<div id="global_list_{$MODULE}" style="display:none">
+	<div id="global_list_{$MODULE}" style="display:block">
 {/if}
 <table border=0 cellspacing=0 cellpadding=0 width=98% align=center>
      <form name="massdelete" method="POST">



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 03:33:46 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 10:33:46 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7021 -
	/vtigercrm/trunk/modules/Home/UnifiedSearch.php
Message-ID: <20060613103347.1840E7E8A6C@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 13 04:33:42 2006
New Revision: 7021

Log:
* Modified to get the mod_strings for all modules and display all module entries as default view

Modified:
    vtigercrm/trunk/modules/Home/UnifiedSearch.php

Modified: vtigercrm/trunk/modules/Home/UnifiedSearch.php
==============================================================================
--- vtigercrm/trunk/modules/Home/UnifiedSearch.php (original)
+++ vtigercrm/trunk/modules/Home/UnifiedSearch.php Tue Jun 13 04:33:42 2006
@@ -82,6 +82,9 @@
 
 		$smarty = new vtigerCRM_Smarty;
 
+		require_once("modules/$module/language/en_us.lang.php");
+		global $mod_strings;
+
 		$smarty->assign("MOD", $mod_strings);
 		$smarty->assign("APP", $app_strings);
 		$smarty->assign("IMAGE_PATH",$image_path);
@@ -91,11 +94,11 @@
 
 	
 		$listquery = getListQuery($module);
-		//Avoided the modules Faq and PriceBooks. we should remove this if when change the vtiger_customview function
+		//Avoided the modules Faq and PriceBooks. we should remove this if when change the customview function
 		$oCustomView = '';
 		if($module != 'Faq' && $module != 'PriceBooks')
 		{
-			//Added to get the default 'All' vtiger_customview query
+			//Added to get the default 'All' customview query
 			$oCustomView = new CustomView($module);
 			$viewid = $oCustomView->getViewId($module);
 
@@ -154,7 +157,7 @@
 	//Added to display the Total record count
 ?>
 	<script>
-		document.getElementById("global_search_total_count").innerHTML = "Total Number of Records : <b><?php echo $total_record_count; ?></b>";
+		document.getElementById("global_search_total_count").innerHTML = "Total Records found : <b><?php echo $total_record_count; ?></b>";
 	</script>
 <?php
 
@@ -163,17 +166,17 @@
 	echo "<br><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<em>".$mod_strings['ERR_ONE_CHAR']."</em>";
 }
 
-/**	Function to get the where condition for a module based on the vtiger_field vtiger_table entries
+/**	Function to get the where condition for a module based on the field table entries
   *	@param  string $listquery  -- ListView query for the module 
   *	@param  string $module     -- module name
   *	@param  string $search_val -- entered search string value
-  *	@return string $where      -- where condition for the module based on vtiger_field vtiger_table entries
+  *	@return string $where      -- where condition for the module based on field table entries
   */
 function getUnifiedWhere($listquery,$module,$search_val)
 {
 	global $adb;
 
-	$query = "SELECT * FROM vtiger_field WHERE vtiger_tabid = ".getTabid($module);
+	$query = "SELECT * FROM vtiger_field WHERE tabid = ".getTabid($module);
 	$result = $adb->query($query);
 	$noofrows = $adb->num_rows($result);
 
@@ -183,7 +186,7 @@
 		$columnname = $adb->query_result($result,$i,'columnname');
 		$tablename = $adb->query_result($result,$i,'tablename');
 
-		//Before form the where condition, check whether the vtiger_table for the vtiger_field has been added in the listview query
+		//Before form the where condition, check whether the table for the field has been added in the listview query
 		if(strstr($listquery,$tablename))
 		{
 			if($where != '')
@@ -267,7 +270,7 @@
 							$selected = '';
 							if($search_module != '' && $module == $search_module)
 								$selected = 'selected';
-							if($search_module == '' && $module == 'Contacts')
+							if($search_module == '' && $module == 'All')
 								$selected = 'selected';
 							?>
 							<option value="<?php echo $module; ?>" <?php echo $selected; ?> ><?php echo $module; ?></option>



From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 13 03:34:22 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 13 Jun 2006 10:34:22 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23963=3A_?=
 =?utf-8?q?Global_Search_-_In_potentials_column_title_is_empty?=
In-Reply-To: <076.a81342c95e46c46e8e51dc5866a915a2@vtiger.fosslabs.com>
References: <076.a81342c95e46c46e8e51dc5866a915a2@vtiger.fosslabs.com>
Message-ID: <085.5cb18df0bd483170fe8d6100dad57548@vtiger.fosslabs.com>

#963: Global Search - In potentials column title is empty
------------------------+---------------------------------------------------
  Reporter:  mickie     |       Owner:  mickie
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mickie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 This issue is fixed.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/963>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 13 03:35:45 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 13 Jun 2006 10:35:45 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23964=3A_?=
 =?utf-8?q?global_search_-_some_column_headers_are_empty?=
In-Reply-To: <076.66a0fea7b92031ee50f58920bde82d69@vtiger.fosslabs.com>
References: <076.66a0fea7b92031ee50f58920bde82d69@vtiger.fosslabs.com>
Message-ID: <085.2b8e4068acdfcbc76acb4be36b0142c6@vtiger.fosslabs.com>

#964: global search - some column headers are empty
------------------------+---------------------------------------------------
  Reporter:  mickie     |       Owner:  mickie
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mickie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 This issue is fixed.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/964>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 13 03:36:05 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 13 Jun 2006 10:36:05 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231271=3A?=
 =?utf-8?q?_Organisation_wont_save_when_containt_=27?=
In-Reply-To: <076.62b916cddc422a4f2f6a8828de68207a@vtiger.fosslabs.com>
References: <076.62b916cddc422a4f2f6a8828de68207a@vtiger.fosslabs.com>
Message-ID: <085.09e0ef4403cce39556229b5fda5d861d@vtiger.fosslabs.com>

#1271: Organisation wont save when containt '
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  allanbush          
      Type:  defect     |      Status:  reopened           
  Priority:  major      |   Milestone:  5.0.0              
 Component:  vtigercrm  |     Version:  5.0.0              
Resolution:             |    Keywords:  organisation, quote
------------------------+---------------------------------------------------
Changes (by abos):

  * resolution:  fixed =>
  * keywords:  => organisation, quote
  * status:  closed => reopened

Comment:

 Hi, very sorry to reopen this ticket, but $adb->quote("string") remove the
 quotes.

 If my address is "Jeanne d'Arc", i obtain "Jeanne DArc".
 It's better, but not perfect.
 A function addq(), which is analogous to addslashes(). Seem to exist in
 adodb, but i can't use with vtiger 5.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1271>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 03:48:56 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 10:48:56 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7022 - in
 /vtigercrm/trunk/include: ComboStrings.php PopulateComboValues.php
Message-ID: <20060613104856.74B797E8C59@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 13 04:48:52 2006
New Revision: 7022

Log:
picklist values are moved to databases for Users

Modified:
    vtigercrm/trunk/include/ComboStrings.php
    vtigercrm/trunk/include/PopulateComboValues.php

Modified: vtigercrm/trunk/include/ComboStrings.php
==============================================================================
--- vtigercrm/trunk/include/ComboStrings.php (original)
+++ vtigercrm/trunk/include/ComboStrings.php Tue Jun 13 04:48:52 2006
@@ -292,11 +292,26 @@
 			      'Average'=>'Average',
                               'Poor'=>'Poor'
 			      ),			      
-
-			    
+'status_dom' => Array('Active'=>'Active',
+			      'Inactive'=>'Inactive'
+			      ),
+'activity_view_dom' => Array('Today'=>'Today',
+			      'This Week'=>'This Week',
+			      'This Month'=>'This Month',
+			      'This Year'=>'This Year'
+		      ),
+'lead_view_dom' => Array('Today'=>'Today',
+			      'Last 2 Days'=>'Last 2 Days',
+                              'Last Week'=>'Last Week'
+		      ),
+'date_format_dom' => Array('dd-mm-yyyy'=>'dd-mm-yyyy',
+			      'mm-dd-yyyy'=>'mm-dd-yyyy',
+                              'yyyy-mm-dd'=>'yyyy-mm-dd'
+			      ),		      
 		
 );
 
+
 ?>
 
 

Modified: vtigercrm/trunk/include/PopulateComboValues.php
==============================================================================
--- vtigercrm/trunk/include/PopulateComboValues.php (original)
+++ vtigercrm/trunk/include/PopulateComboValues.php Tue Jun 13 04:48:52 2006
@@ -60,7 +60,7 @@
 				
 		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');
+		$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','status','activity_view','lead_view','date_format');
 
 		foreach ($comboTables as $comTab)
 		{



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 03:49:44 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 10:49:44 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7023 -
 /vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
Message-ID: <20060613104945.12CAF7E8A6C@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 13 04:49:34 2006
New Revision: 7023

Log:
picklist values are moved to databases for Users and the fields are added in field table

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

Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original)
+++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Tue Jun 13 04:49:34 2006
@@ -67,6 +67,7 @@
  $this->db->query("INSERT INTO vtiger_tab VALUES (26,'Campaigns',0,23,'Campaigns',null,null,1)");
  $this->db->query("INSERT INTO vtiger_tab VALUES (27,'Portal',0,24,'Portal',null,null,1)");
  $this->db->query("INSERT INTO vtiger_tab VALUES (28,'Webmails',0,25,'Webmails',null,null,1)");
+ $this->db->query("insert into vtiger_tab values (29,'Users',0,26,'Users',null,null,1)");
 
 // Populate the vtiger_blocks vtiger_table
 $this->db->query("insert into vtiger_blocks values (1,2,'LBL_OPPORTUNITY_INFORMATION',1,0,0,0,0,0)");
@@ -147,6 +148,9 @@
 $this->db->query("insert into vtiger_blocks values (76,26,'LBL_CAMPAIGN_INFORMATION',1,0,0,0,0,0)");
 $this->db->query("insert into vtiger_blocks values (77,26,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
 $this->db->query("insert into vtiger_blocks values (78,26,'LBL_DESCRIPTION_INFORMATION',3,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (79,29,'LBL_USERLOGIN_ROLE',1,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (80,29,'LBL_MORE_INFORMATION',2,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (81,29,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)");
 
 //
 
@@ -837,6 +841,41 @@
 
 
 //Invoice Details -- END
+ //users Details Starts Block 79,80,81
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'user_name','vtiger_users',1,'106','user_name','User Name',1,0,0,11,1,79,1,'V~M',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'is_admin','vtiger_users',1,'156','is_admin','Admin',1,0,0,3,2,79,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'user_password','vtiger_users',1,'99','user_password','Password',1,0,0,30,3,79,4,'P~M',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'confirm_password','vtiger_users',1,'99','confirm_password','Confirm Password',1,0,0,30,4,79,4,'P~M',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'first_name','vtiger_users',1,'1','first_name','First Name',1,0,0,30,5,79,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'last_name','vtiger_users',1,'2','last_name','Last Name',1,0,0,30,6,79,1,'V~M',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'roleid','vtiger_user2role',1,'98','roleid','Role',1,0,0,200,7,79,1,'V~M',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'email1','vtiger_users',1,'104','email','Email',1,0,0,100,9,79,1,'E~M',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'status','vtiger_users',1,'115','status','Status',1,0,0,100,10,79,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'activity_view','vtiger_users',1,'15','activity_view','Default Activity View',1,0,0,100,13,79,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'lead_view','vtiger_users',1,'15','lead_view','Default Lead View',1,0,0,100,12,79,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'currency_id','vtiger_users',1,'116','currency_id','Currency',1,0,0,100,11,79,1,'I~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'title','vtiger_users',1,'1','title','Title',1,0,0,50,1,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'phone_work','vtiger_users',1,'1','phone_work','Office Phone',1,0,0,50,2,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'department','vtiger_users',1,'1','department','Department',1,0,0,50,3,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'phone_mobile','vtiger_users',1,'1','phone_mobile','Mobile',1,0,0,50,4,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'reports_to_id','vtiger_users',1,'101','reports_to_id','Reports To',1,0,0,50,5,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'phone_other','vtiger_users',1,'1','phone_other','Other Phone',1,0,0,50,5,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'email2','vtiger_users',1,'13','email2','Other Email',1,0,0,100,6,80,1,'E~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'phone_fax','vtiger_users',1,'1','phone_fax','Fax',1,0,0,50,7,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'yahoo_id','vtiger_users',1,'13','yahoo_id','Yahoo id',1,0,0,100,7,80,1,'E~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'phone_home','vtiger_users',1,'1','phone_home','Home Phone',1,0,0,50,8,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'imagename','vtiger_users',1,'105','imagename','User Image',1,0,0,250,9,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'date_format','vtiger_users',1,'15','date_format','Date Format',1,0,0,30,10,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'tagcloud','vtiger_users',1,'103','tagcloud','Tag Cloud',1,0,0,250,13,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'signature','vtiger_users',1,'21','signature','Signature',1,0,0,250,11,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'description','vtiger_users',1,'21','description','Notes',1,0,0,250,12,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'address_street','vtiger_users',1,'21','address_street','Street Address',1,0,0,250,1,81,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'address_city','vtiger_users',1,'1','address_city','City',1,0,0,100,2,81,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'address_state','vtiger_users',1,'1','address_state','State',1,0,0,100,3,81,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'address_postalcode','vtiger_users',1,'1','address_postalcode','Postal Code',1,0,0,100,4,81,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'address_country','vtiger_users',1,'1','address_country','Country',1,0,0,100,5,81,1,'V~O',1,null,'BAS')");
+
+ //user Details End
 
 
 



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 03:51:26 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 10:51:26 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7024 -
	/vtigercrm/trunk/schema/DatabaseSchema.xml
Message-ID: <20060613105127.35A277E8C5A@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 13 04:51:23 2006
New Revision: 7024

Log:
picklist values are moved to databases for Users modules

Modified:
    vtigercrm/trunk/schema/DatabaseSchema.xml

Modified: vtigercrm/trunk/schema/DatabaseSchema.xml
==============================================================================
--- vtigercrm/trunk/schema/DatabaseSchema.xml (original)
+++ vtigercrm/trunk/schema/DatabaseSchema.xml Tue Jun 13 04:51:23 2006
@@ -81,6 +81,7 @@
 			<default value="0" />
 		</field>
 		<field name="defhomeview" type="C" size="100" />
+		<field name="confirm_password" type="C" size="30" />
 
 		<index name="user_user_name_idx">
 			<col>user_name</col>
@@ -5112,5 +5113,97 @@
 
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
-
+	<table name="vtiger_status">
+		<field name="statusid" type="I" size="19">
+			<key />
+			<autoincrement />
+		</field>
+		<field name="status" type="C" size="200">
+			<notnull />
+		</field>
+		<field name="sortorderid" type="I" size="19">
+			<notnull />
+			<default value="0" />
+		</field>
+		<field name="presence" type="I" size="1">
+			<notnull />
+			<default value="1" />
+		</field>
+
+		<index name="vtiger_status_status_idx">
+			<col>source</col>
+			<unique />
+		</index>
+		<opt platform="mysql">Type=InnoDB</opt>
+	</table>
+	<table name="vtiger_activity_view">
+		<field name="activity_viewid" type="I" size="19">
+			<key />
+			<autoincrement />
+		</field>
+		<field name="activity_view" type="C" size="200">
+			<notnull />
+		</field>
+		<field name="sortorderid" type="I" size="19">
+			<notnull />
+			<default value="0" />
+		</field>
+		<field name="presence" type="I" size="1">
+			<notnull />
+			<default value="1" />
+		</field>
+
+		<index name="vtiger_activity_view_status_idx">
+			<col>source</col>
+			<unique />
+		</index>
+		<opt platform="mysql">Type=InnoDB</opt>
+	</table>
+	<table name="vtiger_lead_view">
+		<field name="lead_viewid" type="I" size="19">
+			<key />
+			<autoincrement />
+		</field>
+		<field name="lead_view" type="C" size="200">
+			<notnull />
+		</field>
+		<field name="sortorderid" type="I" size="19">
+			<notnull />
+			<default value="0" />
+		</field>
+		<field name="presence" type="I" size="1">
+			<notnull />
+			<default value="1" />
+		</field>
+
+		<index name="vtiger_lead_viewstatus_idx">
+			<col>source</col>
+			<unique />
+		</index>
+		<opt platform="mysql">Type=InnoDB</opt>
+	</table>
+	<table name="vtiger_date_format">
+		<field name="date_formatid" type="I" size="19">
+			<key />
+			<autoincrement />
+		</field>
+		<field name="date_format" type="C" size="200">
+			<notnull />
+		</field>
+		<field name="sortorderid" type="I" size="19">
+			<notnull />
+			<default value="0" />
+		</field>
+		<field name="presence" type="I" size="1">
+			<notnull />
+			<default value="1" />
+		</field>
+
+		<index name="vtiger_date_format_status_idx">
+			<col>source</col>
+			<unique />
+		</index>
+		<opt platform="mysql">Type=InnoDB</opt>
+	</table>
+	
 </schema>



From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 13 03:51:43 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 13 Jun 2006 10:51:43 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231205=3A?=
 =?utf-8?q?_DashBoard_-_Purchase_Order_by_Status_gives_improper_results?=
In-Reply-To: <076.9e81b8c641a00ed7ecd42317cc381367@vtiger.fosslabs.com>
References: <076.9e81b8c641a00ed7ecd42317cc381367@vtiger.fosslabs.com>
Message-ID: <085.233e493e0480074cf89e00cc09d483fe@vtiger.fosslabs.com>

#1205: DashBoard - Purchase Order by Status gives improper results
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  philip
      Type:  defect     |      Status:  closed
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by saraj):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 (In [7025]) Status value Canceled changed to Cancelled. Fixes #1205

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1205>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 03:51:44 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 10:51:44 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7025 -
	/vtigercrm/trunk/include/ComboStrings.php
Message-ID: <20060613105144.6B9937E8C60@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 13 04:51:39 2006
New Revision: 7025

Log:
Status value Canceled changed to Cancelled. Fixes #1205

Modified:
    vtigercrm/trunk/include/ComboStrings.php

Modified: vtigercrm/trunk/include/ComboStrings.php
==============================================================================
--- vtigercrm/trunk/include/ComboStrings.php (original)
+++ vtigercrm/trunk/include/ComboStrings.php Tue Jun 13 04:51:39 2006
@@ -257,14 +257,14 @@
 'postatus_dom' => Array('Created'=>'Created',
 			'Approved'=>'Approved',
 			'Delivered'=>'Delivered',
-			'Canceled'=>'Canceled',
+			'Cancelled'=>'Cancelled',
 			'Received Shipment'=>'Received Shipment'
 			),
 
 'sostatus_dom' => Array('Created'=>'Created',
 			'Approved'=>'Approved',
 			'Delivered'=>'Delivered',
-			'Canceled'=>'Canceled'
+			'Cancelled'=>'Cancelled'
 			),
 
 'campaignstatus_dom' => Array(''=>'',



From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 13 03:52:54 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 13 Jun 2006 10:52:54 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231206=3A?=
 =?utf-8?q?_DashBoard_-_Quotes_by_Accounts_Search_gives_all_list_view_reco?=
 =?utf-8?q?rds?=
In-Reply-To: <076.2d93dc91ebb8c9d712cebc7da12b81a8@vtiger.fosslabs.com>
References: <076.2d93dc91ebb8c9d712cebc7da12b81a8@vtiger.fosslabs.com>
Message-ID: <085.3d298d4f4a1dd708b6c6a1f754871685@vtiger.fosslabs.com>

#1206: DashBoard - Quotes by Accounts Search gives all list view records
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  philip
      Type:  defect     |      Status:  closed
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by anonymous):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1206>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 04:05:17 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 11:05:17 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7026 -
	/vtigercrm/trunk/googlemap.php
Message-ID: <20060613110517.DCB017E8C62@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 13 05:05:11 2006
New Revision: 7026

Log:
googlemap.php has been deleted

Removed:
    vtigercrm/trunk/googlemap.php



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 04:09:00 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 11:09:00 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7027 - in
 /vtigercrm/trunk/Smarty/templates: Buttons_List.tpl Buttons_List1.tpl
Message-ID: <20060613110900.7BB007E8C62@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 13 05:08:53 2006
New Revision: 7027

Log:
googlemap code removed

Modified:
    vtigercrm/trunk/Smarty/templates/Buttons_List.tpl
    vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl

Modified: vtigercrm/trunk/Smarty/templates/Buttons_List.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Buttons_List.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Buttons_List.tpl Tue Jun 13 05:08:53 2006
@@ -118,16 +118,6 @@
 				</tr>
 				</table>
 		</td>			
-		{if $MODULE eq 'Contacts' || $MODULE eq 'Leads' || $MODULE eq 'Accounts'}
-                        <td class="small">
-                                <!-- Google Map -->
-                                        <table border=0 cellspacing=0 cellpadding=5>
-                                                <tr>
-                                                        <td style="padding-left:10px;"><a href="#" onclick='window.open("index.php?module={$MODULE}&action=googlemap","test","width=600,height=400,resizable=1,scrollbars=1");'><img src="{$IMAGE_PATH}btnL3AllMenu.gif" alt="GoogleMap" title="GoogleMap" border="0"></a></td>
-                                                </tr>
-                                        </table>
-                        </td>
-                {/if}
 		</tr>
 		</table>
 	</td>

Modified: vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl Tue Jun 13 05:08:53 2006
@@ -114,16 +114,6 @@
 				</tr>
 				</table>
 		</td>			
-		{if $MODULE eq 'Contacts' || $MODULE eq 'Leads' || $MODULE eq 'Accounts'}
-                        <td class="small">
-                                <!-- Google Map -->
-                                        <table border=0 cellspacing=0 cellpadding=5>
-                                                <tr>
-                                                        <td style="padding-left:10px;"><a href="#" onclick='window.open("index.php?module={$MODULE}&action=googlemap&record={$ID}","test","width=600,height=400,resizable=1,scrollbars=1");'><img src="{$IMAGE_PATH}btnL3AllMenu.gif" alt="GoogleMap" title="GoogleMap" border="0"></a></td>
-                                                </tr>
-                                        </table>
-                        </td>
-                {/if}
 		</tr>
 		</table>
 	</td>



From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 13 04:14:46 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 13 Jun 2006 11:14:46 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231208=3A?=
 =?utf-8?q?_DashBoard_-_Search_non_function_for_Invoice_by_Accounts?=
In-Reply-To: <076.ef725bada1eb2853037e604a524e0d12@vtiger.fosslabs.com>
References: <076.ef725bada1eb2853037e604a524e0d12@vtiger.fosslabs.com>
Message-ID: <085.8b5c159bf464f8d34f52088286b1a858@vtiger.fosslabs.com>

#1208: DashBoard - Search non function for Invoice by Accounts
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  philip
      Type:  defect     |      Status:  closed
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by saraj):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 (In [7028]) Invoice query modified to get accountname. Fixes #1208

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1208>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 04:14:46 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 11:14:46 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7028 -
	/vtigercrm/trunk/include/utils/ListViewUtils.php
Message-ID: <20060613111446.060FA7E8C68@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 13 05:14:23 2006
New Revision: 7028

Log:
Invoice query modified to get accountname. Fixes #1208

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 Jun 13 05:14:23 2006
@@ -1933,6 +1933,7 @@
 			vtiger_invoicebillads.*,
 			vtiger_invoiceshipads.*,
 			vtiger_salesorder.subject AS salessubject
+			vtiger_account.accountname
 			FROM vtiger_invoice
 			INNER JOIN vtiger_crmentity
 				ON vtiger_crmentity.crmid = vtiger_invoice.invoiceid
@@ -1942,6 +1943,8 @@
 				ON vtiger_invoice.invoiceid = vtiger_invoiceshipads.invoiceshipaddressid
 			LEFT OUTER JOIN vtiger_salesorder
 				ON vtiger_salesorder.salesorderid = vtiger_invoice.salesorderid
+			LEFT OUTER JOIN vtiger_account
+			        ON vtiger_account.accountid = vtiger_invoice.accountid
 			INNER JOIN vtiger_invoicecf
 				ON vtiger_invoice.invoiceid = vtiger_invoicecf.invoiceid
 			LEFT JOIN vtiger_invoicegrouprelation



From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 13 04:15:08 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 13 Jun 2006 11:15:08 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231250=3A?=
 =?utf-8?q?_Beta__Demo=3A_Sales_=3E_Leads_=3E_Detail_View_fatal_error?=
In-Reply-To: <076.78fe8716a71e90b18b5ac94f0c53cd10@vtiger.fosslabs.com>
References: <076.78fe8716a71e90b18b5ac94f0c53cd10@vtiger.fosslabs.com>
Message-ID: <085.70eb778b21ca63d7f4875ae23458a699@vtiger.fosslabs.com>

#1250: Beta  Demo: Sales > Leads > Detail View fatal error
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       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:

 Unable to reproduce

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1250>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 13 04:31:28 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 13 Jun 2006 11:31:28 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231299=3A?=
 =?utf-8?q?_MySQL_version_5=2E0=2E22_is_not_supported=2C_kindly_connect_to?=
 =?utf-8?q?_MySQL_4=2E1=2Ex_or_above?=
Message-ID: <076.bb406000b4b59efeb8cc8221dd00f6f4@vtiger.fosslabs.com>

#1299: MySQL version 5.0.22 is not supported, kindly connect to MySQL 4.1.x or
above
-----------------------+----------------------------------------------------
 Reporter:  fh         |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  major      |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:  Bug        |  
-----------------------+----------------------------------------------------
 Hello, I tried to install vtiger on the latest version of MySQL(5.0.22) on
 the third step of the installation i get an error message that i need 4.1
 or above! how can i fix that?

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1299>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 13 04:31:46 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 13 Jun 2006 11:31:46 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231299=3A?=
 =?utf-8?q?_MySQL_version_5=2E0=2E22_is_not_supported=2C_kindly_connect_to?=
 =?utf-8?q?_MySQL_4=2E1=2Ex_or_above?=
In-Reply-To: <076.bb406000b4b59efeb8cc8221dd00f6f4@vtiger.fosslabs.com>
References: <076.bb406000b4b59efeb8cc8221dd00f6f4@vtiger.fosslabs.com>
Message-ID: <085.8918426f9ccead6448e05bb98db4dbb7@vtiger.fosslabs.com>

#1299: MySQL version 5.0.22 is not supported, kindly connect to MySQL 4.1.x or
above
------------------------+---------------------------------------------------
  Reporter:  fh         |       Owner:  developer
      Type:  defect     |      Status:  new      
  Priority:  major      |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:             |    Keywords:  Bug      
------------------------+---------------------------------------------------
-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1299>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 04:32:36 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 11:32:36 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7029 -
	/vtigercrm/trunk/Smarty/templates/Header.tpl
Message-ID: <20060613113237.16F257E8C6D@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 13 05:32:32 2006
New Revision: 7029

Log:
added an anchor tag in Header file - 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 Tue Jun 13 05:32:32 2006
@@ -19,6 +19,7 @@
 	<style type="text/css">@import url("themes/{$THEME}/style.css");</style>
 </head>
 	<body leftmargin=0 topmargin=0 marginheight=0 marginwidth=0 class=small onLoad="Announcement_rss()">
+	<a name="top">
 	<!-- header -->
 	<!-- header-vtiger crm name & RSS -->
 	<script language="JavaScript" type="text/javascript" src="include/js/general.js"></script>



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 04:46:21 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 11:46:21 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7030 -
	/vtigercrm/trunk/modules/Users/User.php
Message-ID: <20060613114621.135867E8A6C@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 13 05:46:14 2006
New Revision: 7030

Log:
Updated the List Header & Entries function for New UI of UserListView - 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 Jun 13 05:46:14 2006
@@ -470,62 +470,64 @@
 											 "CITY","STATE","POSTALCODE","COUNTRY");	
   	return $mergeflds;
   }
-		//function added for the listview of vtiger_users for 5.0 beta
-	function getUserListViewHeader()
-	{
-		global $mod_strings;
-		$header_array=array($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_ADMIN'],$mod_strings['LBL_STATUS'],$mod_strings['LBL_LIST_TOOLS']);
-		return $header_array;
-	}
-
-	function getUserListViewEntries($navigation_array,$sorder='',$orderby='')
-	{
-		global $theme;
-		global $adb, $current_user;	
-	    	$theme_path="themes/".$theme."/";
-	    	$image_path=$theme_path."images/";
-		if($sorder != '' && $orderby !='')
-			$list_query = ' SELECT * from vtiger_users where deleted=0 order by '.$orderby.' '.$sorder; 	
-		else
-			$list_query = "SELECT * from vtiger_users where deleted=0 order by ".$this->default_order_by." ".$this->default_sort_order;
-		$result =$adb->query($list_query);
-		$entries_list = array();
-		$roleinfo = getAllRoleDetails();
-		
-		for($i = $navigation_array['start'];$i <= $navigation_array['end_val']; $i++)
-		{
-			$entries=array();
-			$id=$adb->query_result($result,$i-1,'id');
-			
-			$entries[]='<a href="index.php?action=DetailView&module=Users&parenttab=Settings&record='.$id.'">'.$this->db->query_result($result,$i-1,'user_name').'</a>';
-
-                        $rolecode= fetchUserRole($adb->query_result($result,$i-1,'id'));
-                        $entries[]='<a href="index.php?action=RoleDetailView&module=Users&parenttab=Settings&roleid='.$rolecode.'">'.$roleinfo[$rolecode][0];
-
-			$entries[]='<a href="mailto:'.$adb->query_result($result,$i-1,'email1').'">'.$adb->query_result($result,$i-1,'email1').' </a>';
-
-			$entries[]='<a href="index.php?action=DetailView&module=Users&parenttab=Settings&record='.$id.'">'. $this->db->query_result($result,$i-1,'last_name').' '.$adb->query_result($result,$i-1,'first_name').'</a>';
-
-			$entries[]=$adb->query_result($result,$i-1,'is_admin');
-			$entries[]=$adb->query_result($result,$i-1,'status');
-			if($adb->query_result($result,$i-1,'user_name') == 'admin' || $adb->query_result($result,$i-1,'user_name') == 'standarduser' )
-			{
-			      $entries[]='<a href="index.php?action=EditView&return_action=ListView&return_module=Users&module=Users&parenttab=Settings&record='.$id.'"><img src="'.$image_path.'editfield.gif" border="0" alt="Edit" title="Edit"/></a>&nbsp;&nbsp;';
-	                }
-			elseif($adb->query_result($result,$i-1,'id') == $current_user->id)
-                        {
-                              $entries[]='<a href="index.php?action=EditView&return_action=ListView&return_module=Users&module=Users&parenttab=Settings&record='.$id.'"><img src="'.$image_path.'editfield.gif" border="0" alt="Edit" title="Edit"/></a>&nbsp;&nbsp;';
-	                }
-		        else
-			  
-	    	              $entries[]='<a href="index.php?action=EditView&return_action=ListView&return_module=Users&module=Users&parenttab=Settings&record='.$id.'"><img src="'.$image_path.'editfield.gif" border="0" alt="Edit" title="Edit"/></a>&nbsp;&nbsp;<img src="'.$image_path.'delete.gif" onclick="deleteUser('.$id.')" border="0"  alt="Delete" title="Delete"/></a>';
-
-			$entries_list[]=$entries;
-													
-		}
-		return $entries_list;
-	}
-	function fill_in_additional_list_fields()
+
+//function added for the listview of vtiger_users for 5.0 beta
+  function getUserListViewHeader()
+  {
+	  global $mod_strings;
+	  $header_array=array($mod_strings['LBL_LIST_NO'],$mod_strings['LBL_LIST_TOOLS'],$mod_strings['LBL_LIST_USER_NAME_ROLE'],$mod_strings['LBL_LIST_EMAIL'],$mod_strings['LBL_LIST_PHONE'],$mod_strings['LBL_ADMIN'],$mod_strings['LBL_STATUS']);
+	  return $header_array;
+  }
+
+  function getUserListViewEntries($navigation_array,$sorder='',$orderby='')
+  {
+	  global $theme;
+	  global $adb, $current_user;
+	  $theme_path="themes/".$theme."/";
+	  $image_path=$theme_path."images/";
+	  if($sorder != '' && $orderby !='')
+	  $list_query = ' SELECT * from users where deleted=0 order by '.$orderby.' '.$sorder;
+	  else
+	  $list_query = "SELECT * from users where deleted=0 order by ".$this->default_order_by." ".$this->default_sort_order;
+	  $result =$adb->query($list_query);
+	  $entries_list = array();
+	  $roleinfo = getAllRoleDetails();
+
+	  for($i = $navigation_array['start'];$i <= $navigation_array['end_val']; $i++)
+	  {
+		  $entries=array();
+		  $id=$adb->query_result($result,$i-1,'id');
+
+		  $entries[]='<a href="index.php?action=DetailView&module=Users&parenttab=Settings&record='.$id.'">'.$this->db->query_result($result,$i-1,'user_name').'</a>';
+
+		  $rolecode= fetchUserRole($adb->query_result($result,$i-1,'id'));
+		  $entries[]='<a href="index.php?action=RoleDetailView&module=Users&parenttab=Settings&roleid='.$rolecode.'">'.$roleinfo[$rolecode][0];
+		  $entries[]='<a href="mailto:'.$adb->query_result($result,$i-1,'email1').'">'.$adb->query_result($result,$i-1,'email1').' </a>';
+
+		  $entries[]='<a href="index.php?action=DetailView&module=Users&parenttab=Settings&record='.$id.'">'. $this->db->query_result($result,$i-1,'last_name').' '.$adb->query_result($result,$i-1,'first_name').'</a>';
+
+		  $entries[]=$adb->query_result($result,$i-1,'is_admin');
+		  $entries[]=$adb->query_result($result,$i-1,'status');
+		  $entries[]=$adb->query_result($result,$i-1,'phone_work');
+		  if($adb->query_result($result,$i-1,'user_name') == 'admin' || $adb->query_result($result,$i-1,'user_name') == 'standarduser' )
+		  {
+			  $entries[]='<a href="index.php?action=EditView&return_action=ListView&return_module=Users&module=Users&parenttab=Settings&record='.$id.'"><img src="'.$image_path.'editfield.gif" border="0" alt="Edit" title="Edit"/></a>&nbsp;&nbsp;';
+			  }
+			  elseif($adb->query_result($result,$i-1,'id') == $current_user->id)
+			  {
+				  $entries[]='<a href="index.php?action=EditView&return_action=ListView&return_module=Users&module=Users&parenttab=Settings&record='.$id.'"><img src="'.$image_path.'editfield.gif" border="0" alt="Edit" title="Edit"/></a>&nbsp;&nbsp;';
+			  }
+			  else
+
+			  $entries[]='<a href="index.php?action=EditView&return_action=ListView&return_module=Users&module=Users&parenttab=Settings&record='.$id.'"><img src="'.$image_path.'editfield.gif" border="0" alt="Edit" title="Edit"/></a>&nbsp;&nbsp;<img src="'.$image_path.'delete.gif" onclick="deleteUser('.$id.')" border="0"  alt="Delete" title="Delete"/></a>';
+
+			  $entries_list[]=$entries;
+
+			  }
+			  return $entries_list;
+  }
+
+	  function fill_in_additional_list_fields()
 	{
 		$this->fill_in_additional_detail_fields();	
 	}



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 04:53:38 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 11:53:38 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7031 - in
 /vtigercrm/trunk/modules: Settings/language/en_us.lang.php
 Users/language/en_us.lang.php
Message-ID: <20060613115338.E8E437E8C6D@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 13 05:53:32 2006
New Revision: 7031

Log:
update language file

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

Modified: vtigercrm/trunk/modules/Settings/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Settings/language/en_us.lang.php Tue Jun 13 05:53:32 2006
@@ -62,7 +62,7 @@
 
 'LBL_EMAIL_ADDRESS'=>'Email',
 
-'LBL_TRANSCURR'=>'Transfer User vtiger_currency to',
+'LBL_TRANSCURR'=>'Transfer User currency to',
 
 'LBL_CURRDEL'=>'Currency to be Deleted',
 
@@ -273,7 +273,7 @@
 'LBL_TOOL'=>'Tool',
 
 
-//Added vtiger_fields for Title Informations -- after 4 Beta
+//Added fields for Title Informations -- after 4 Beta
 
 'LBL_EMAIL_CONFIG'=>'Outgoing Mail Server Configuration',
 
@@ -291,7 +291,7 @@
 
 
 
-//Added vtiger_fields after RC1 - Release
+//Added fields after RC1 - Release
 
 'LBL_MAIL_SERVER_INFO'=>'Mail Server Information',
 
@@ -333,17 +333,21 @@
 
 'LBL_USERS'=>'Users',
 
+'LBL_USERS_LIST'=>'Users List',
+
 'LBL_CREATE_AND_MANAGE_USERS'=>'- Create and Manage Users (e.g., admin)',
 
 'LBL_ROLES'=>'Roles',
 
-'LBL_CREATE_AND_MANAGE_USER_ROLES'=>'- Create and Manage user vtiger_roles (e.g., Administrator, Standard User, etc.)',
+'LBL_CREATE_AND_MANAGE_USER_ROLES'=>'- Create and Manage user roles (e.g., Administrator, Standard User, etc.)',
 
 'LBL_PROFILES'=>'Profiles',
 
-'LBL_CREATE_AND_MANAGE_USER_PROFILES'=>'- Create and Manage user vtiger_profiles (e.g., CEO, Sales Manager, etc.)',
-
-'LBL_CREATE_AND_MANAGE_USER_GROUPS'=>'- Create and Manage user vtiger_groups',
+'LBL_PROFILES_LIST'=>'Profiles List',
+
+'LBL_CREATE_AND_MANAGE_USER_PROFILES'=>'- Create and Manage user profiles (e.g., CEO, Sales Manager, etc.)',
+
+'LBL_CREATE_AND_MANAGE_USER_GROUPS'=>'- Create and Manage user groups',
 
 'LBL_SHARING_ACCESS'=>'Sharing Access',
 
@@ -357,8 +361,8 @@
 
 'LBL_FIELD_ACCESSIBILITY'=>'Field Accessibility',
 
-'LBL_SETTING_FIELD_ACCESSIBILITY'=>' - Setting Field Accessibility for each vtiger_profiles',
-//<<<<<<<<for edit ordering vtiger_blocks>>>>>>
+'LBL_SETTING_FIELD_ACCESSIBILITY'=>' - Setting Field Accessibility for each profiles',
+//<<<<<<<<for edit ordering blocks>>>>>>
 'LBL_FIELD_ORDERING_DESC'=>' - Edit Field Order',
 
 'LBL_FIELD_ORDERING'=>'Edit Field Blocks',
@@ -393,7 +397,7 @@
 
 'LBL_CUSTOM_FIELD_SETTINGS'=>'Custom Field Settings',
 
-'LBL_CREATE_AND_MANAGE_USER_DEFINED_FIELDS'=>'Create and Manage user defined vtiger_fields...',
+'LBL_CREATE_AND_MANAGE_USER_DEFINED_FIELDS'=>'Create and Manage user defined fields...',
 
 'LBL_SELECT_MODULE'=>'Select Module',
 
@@ -403,7 +407,7 @@
 
 'LBL_PICKLIST_SETTINGS'=>'Picklist Settings',
 
-'LBL_EDIT_PICKLIST_VALUES'=>' - Edit values of Picklist vtiger_fields',
+'LBL_EDIT_PICKLIST_VALUES'=>' - Edit values of Picklist fields',
 
 'LBL_EDIT'=>'Editing',
 
@@ -433,7 +437,7 @@
 
 
 
-//Field Types for custom vtiger_fields
+//Field Types for custom fields
 
 'LBL_URL'=>'URL',
 
@@ -487,10 +491,10 @@
 'LBL_LIST_PASSWORD'=>'Password',
 'LBL_MAIL_SERVER_NAME'=>'Mail Server Name or IP',
 'LBL_MAIL_SERVER_SETTINGS'=>'Mail Server Settings',
-'LBL_TEST_SETTINGS'=>'Test my vtiger_account setting immediately',
-'LBL_TEST_BUTTON_TITLE'=>'Test my vtiger_account now! [Alt+T]',
+'LBL_TEST_SETTINGS'=>'Test my account setting immediately',
+'LBL_TEST_BUTTON_TITLE'=>'Test my account now! [Alt+T]',
 'LBL_TEST_BUTTON_KEY'=>'T',
-'LBL_TEST_BUTTON_LABEL'=>'Test my vtiger_account now!',
+'LBL_TEST_BUTTON_LABEL'=>'Test my account now!',
 'LBL_DEFAULT'=>'Default',
 'LBL_IMAP2'=>'IMAP2',
 'LBL_IMAP4'=>'IMAP4',
@@ -559,6 +563,7 @@
 'LBL_INVENTORY_TERMSANDCONDITIONS'=>' - Edit Inventory Terms & Conditions',//newly added
 
 'LBL_OTHER_SETTINGS'=>'Other Settings',
+'LBL_SCROLL'=>'Scroll to Top',
 
 'LBL_INV_NOT_DESC'=>'The following is the list of notifications that are sent to the product handler regarding the demand and the current quantity in hand during the creation of a Quote, SalesOrder and Invoice.',
 
@@ -573,8 +578,8 @@
 
 //For Custom Fields
 'LBL_LEAD_MAP_CUSTOM_FIELD'=>'Mapping Lead Custom Fields',
-'leadCustomFieldDescription'=>'Map each of your organizations lead custom vtiger_fields to each of your custom vtiger_account
-,contact, or vtiger_potential vtiger_fields. These mappings will be used when you convert leads',
+'leadCustomFieldDescription'=>'Map each of your organizations lead custom fields to each of your custom account
+,contact, or potential fields. These mappings will be used when you convert leads',
 'LBL_MAPPING_INFO'=>'Mapping Information',
 'LBL_ACCOUNT_FIELD'=>'Account Custom Field',
 'LBL_CONTACT_FIELD'=>'Contact Custom Field',
@@ -584,10 +589,10 @@
 'LBL_LEAD_FIELD'=>'Lead Custom Field',
 //After 4.2 GA
 'LBL_TEXT_AREA'=>'Text Area',
-//for Edit ordering the vtiger_blocks
+//for Edit ordering the blocks
 'NOTESCUSTOMFIELDS'=>'Notes Custom Fields',
 
-//Added vtiger_fields after 4.2 ptach 2
+//Added fields after 4.2 ptach 2
 'LBL_ASSIGN_MODULE_OWNERS'=>'Assign Module Owners',
 'LBL_MODULE_OWNERS'=>'Module Owners',
 'LBL_ASSIGN_MODULE_OWNERS_INFO'=>' - Assign Owners for each modules',
@@ -601,12 +606,12 @@
 'LBL_USER_DESCRIPTION'=>'Manage Users list who access CRM',
 'LBL_ROLE_DESCRIPTION'=>'Define hierarchy of Roles and assign to Users',
 'LBL_PROFILE_DESCRIPTION'=>'Define Profiles to provide access rights to each Role',
-'LBL_GROUP_DESCRIPTION'=>'Define Groups based on vtiger_roles, vtiger_users, vtiger_profiles etc',
+'LBL_GROUP_DESCRIPTION'=>'Define Groups based on roles, users, profiles etc',
 'LBL_SHARING_ACCESS_DESCRIPTION'=>'Define privileges for each Role to access CRM modules',
-'LBL_SHARING_FIELDS_DESCRIPTION'=>'Show or hide vtiger_fields in each CRM Module',
+'LBL_SHARING_FIELDS_DESCRIPTION'=>'Show or hide fields in each CRM Module',
 'LBL_MODULE_OWNERS_DESCRIPTION'=>'Assign Owners for each CRM module',
 'LBL_ANNOUNCEMENT_DESCRIPTION'=>'Edit the contents of Announcements display',
-'LBL_CUSTOM_FIELDS_DESCRIPTION'=>'Create and Manage user-defined vtiger_fields',
+'LBL_CUSTOM_FIELDS_DESCRIPTION'=>'Create and Manage user-defined fields',
 'LBL_PICKLIST_DESCRIPTION'=>'Manage contents of Picklists in all CRM Modules',
 'LBL_EMAIL_TEMPLATE_DESCRIPTION'=>'Manage templates for E-Mail module',
 'LBL_MAIL_MERGE_DESCRIPTION'=>'Manage templates for Mail Merging',
@@ -621,11 +626,14 @@
 
 
 
-//Added vtiger_fields after 5.0 Alpha
+//Added fields after 5.0 Alpha
 'LBL_REQUIRE_SMTP_AUTHENTICATION'=>'Require SMTP Authentication?',
 'LBL_ANNOUNCEMENT'=>'Announcements',
 'LBL_SETTING_ANNOUNCEMENT'=>'Announcement',
-'LBL_ANNOUNCEMENT_INFO'=>'Type the vtiger_announcement text below, and click the save button.',
+'LBL_ANNOUNCE_TEXT'=>'Announcement Text',
+'LBL_UPDATE_BUTTON'=>'Update',
+'LBL_ANNOUNCEMENT_INFO'=>'Type the announcement text below, and click the Update button.',
+'LBL_ANNOUNCEMENT_DESC'=>'Change the text that appears in the announcement display on top of each page',
 'LBL_EMAIL_CONTENTS'=>'Email Contents',
 'LBL_SUBJECT'=>'Subject',
 'LBL_MESSAGE'=>'Message',

Modified: vtigercrm/trunk/modules/Users/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Users/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Users/language/en_us.lang.php Tue Jun 13 05:53:32 2006
@@ -31,11 +31,18 @@
 'LBL_LIST_LAST_NAME'=>'Last Name',
 'LBL_LIST_USER_NAME'=>'UserName',
 'LBL_LIST_DEPARTMENT'=>'Department',
-'LBL_LIST_EMAIL'=>'Email',
+'LBL_LIST_EMAIL'=>'E-Mail',
 'LBL_LIST_PRIMARY_PHONE'=>'Primary Phone',
 'LBL_LIST_ADMIN'=>'Admin',
 'LBL_LIST_PASSWORD'=>'Password',
 'LBL_LIST_CONFIRM_PASSWORD'=>'Confirm Password',
+'LBL_LIST_USER_NAME_ROLE'=>'User ID , Name & Role',
+'LBL_LIST_SELECT'=>'Select',
+'LBL_LIST_PHONE'=>'Phone',
+'LBL_LIST_NO'=>'#',
+
+'LBL_ADMINS'=>'Admins',
+'LBL_STD_USERS'=>'Standard Users',
 
 'UserName'=>'UserName',
 'Role'=>'Role',
@@ -123,7 +130,7 @@
 'ERR_LAST_ADMIN_1'=>'The user name ',
 'ERR_LAST_ADMIN_2'=>' is the last Admin user.  At least one user must be an Admin user.<br>Check the Admin user setting.',
 
-'ERR_DELETE_RECORD'=>"A record number must be specified to delete the vtiger_account.",
+'ERR_DELETE_RECORD'=>"A record number must be specified to delete the account.",
 
 // Additional Fields for i18n --- Release vtigerCRM 3.2 Patch 2
 // Users--listroles.php , createrole.php , ListPermissions.php , editpermissions.php
@@ -186,7 +193,7 @@
 'LBL_COLON'=>':',
 'LBL_EMAIL_TEMPLATE'=>'Email Template',
 'LBL_NEW_TEMPLATE'=>'New Template',
-'LBL_USE_MERGE_FIELDS_TO_EMAIL_CONTENT'=>'Use merge vtiger_fields to personalize your email content.',
+'LBL_USE_MERGE_FIELDS_TO_EMAIL_CONTENT'=>'Use merge fields to personalize your email content.',
 'LBL_AVAILABLE_MERGE_FIELDS'=>'Available Merge Fields',
 'LBL_SELECT_FIELD_TYPE'=>'Select Field Type :',
 'LBL_SELECT_FIELD'=>'Select Field :',
@@ -194,7 +201,7 @@
 'LBL_ACCOUNT_FIELDS'=>'Account Fields',
 'LBL_CONTACT_FIELDS'=>'Contact Fields',
 'LBL_LEAD_FIELDS'=>'Lead Fields',
-'LBL_COPY_AND_PASTE_MERGE_FIELD'=>'Copy and paste the merge vtiger_field value into your template below.',
+'LBL_COPY_AND_PASTE_MERGE_FIELD'=>'Copy and paste the merge field value into your template below.',
 'LBL_EMAIL_TEMPLATE_INFORMATION'=>'Communication Templates > Email Templates > Viewing',
 'LBL_FOLDER'=>'Folder',
 'LBL_PERSONAL'=>'Personal',
@@ -207,9 +214,10 @@
 'LBL_TEMPLATE_PRIVATE'=>'Private Access',
 'LBL_TEMPLATE_SUBJECT'=>'Email Subject',
 'LBL_TEMPLATE_MESSAGE'=>'Email Message',
-
-
-// Added vtiger_fields in createnewgroup.php
+'LBL_VIEWING'=>'Viewing',
+
+
+// Added fields in createnewgroup.php
 'LBL_CREATE_NEW_GROUP'=>'Create New Group',
 'LBL_NEW_GROUP'=>'New Group',
 'LBL_EDIT_GROUP'=>'Edit Group',
@@ -220,7 +228,7 @@
 'LBL_MEMBER_SELECTED'=>'Selected Member',
 'LBL_DESCRIPTION'=>'Description',
 
-// Added vtiger_fields in detailViewmailtemplate.html,listgroupmembers.php,listgroups.php
+// Added fields in detailViewmailtemplate.html,listgroupmembers.php,listgroups.php
 'LBL_DETAIL_VIEW_OF_EMAIL_TEMPLATE'=>'Detail View of Email Template',
 'LBL_DETAIL_VIEW'=>'Detail View of',
 'LBL_EDIT_VIEW'=>'Edit View of',
@@ -230,7 +238,7 @@
 'LBL_WORD_TEMPLATES'=>'Mail Merge Templates',
 'LBL_NEW_WORD_TEMPLATE'=>'New Template',
 
-// Added vtiger_fields in TabCustomise.php,html and UpdateTab.php,html
+// Added fields in TabCustomise.php,html and UpdateTab.php,html
 'LBL_CUSTOMISE_TABS'=>'Customize Tabs',
 'LBL_CHOOSE_TABS'=>'Choose Tabs',
 'LBL_AVAILABLE_TABS'=>'Available Tabs',
@@ -243,10 +251,10 @@
 'LBL_CHANGE_HOMEPAGE_LABEL'=>'Homepage Order',
 'LBL_CHANGE_HOMEPAGE_TITLE'=>'Homepage',
 
-// Added vtiger_fields in binaryfilelist.php
+// Added fields in binaryfilelist.php
 'LBL_OERATION'=>'Operation',
 
-// Added vtiger_fields in CreateProfile.php
+// Added fields in CreateProfile.php
 'LBL_PROFILE_NAME'=>'Create New Profile:',
 'LBL_NEW_PROFILE'=>'New Profile',
 'LBL_NEW_PROFILE_NAME'=>'Profile Name',
@@ -263,7 +271,7 @@
 'LBL_STANDARD_PRIVILEGES'=>'Standard Privileges',
 'LBL_UTILITY_PRIVILEGES'=>'Utility Privileges',
 'LBL_UTILITIES'=>'Utilities',
-'LBL_BASE_PROFILE_MESG'=>'I would like to setup a base vtiger_profile and edit privileges <b>(Recommended)</b>',
+'LBL_BASE_PROFILE_MESG'=>'I would like to setup a base profile and edit privileges <b>(Recommended)</b>',
 'LBL_BASE_PROFILE'=>'Base Profile:',
 'LBL_OR'=>'OR',
 'LBL_BASE_PROFILE_MESG_ADV'=>'I will choose the privileges from scratch <b>(Advanced Users)</b>',
@@ -275,19 +283,21 @@
 'LBL_MESG_VIEW'=>'to view all information / modules of vtiger CRM',
 'LBL_MESG_EDIT'=>'to edit all information / modules of vtiger CRM',
 'LBL_STD_MESG_OPTION'=>'Select the standard actions to be permitted',
-'LBL_TAB_MESG_OPTION'=>'Select the vtiger_tabs/modules to be permitted',
+'LBL_TAB_MESG_OPTION'=>'Select the tabs / modules to be shown',
 'LBL_UTILITY_MESG_OPTION'=>'Select the utility actions to be permitted',
-'LBL_FIELD_MESG_OPTION'=>'Select the vtiger_fields to be permitted',
+'LBL_FIELD_MESG_OPTION'=>'Select the fields to be permitted',
 'LBL_FINISH_BUTTON'=>'Finish',
 'LBL_PROFILE_DETAIL_VIEW'=>'Detail View of Profile',
-
-
-//Added vtiger_fields in createrole.php
+'LBL_PROFILE_MESG'=>'Viewing access privileges for',
+'LBL_PROFILE_M'=>'Profile',
+
+
+//Added fields in createrole.php
 'LBL_HDR_ROLE_NAME'=>'Create New Role:',
 'LBL_TITLE_ROLE_NAME'=>'New Role',
 'LBL_ROLE_NAME'=>'Role Name',
 'LBL_ROLE_PROFILE_NAME'=>'Associate With Profile',
-'LBL_SPECIFY_ROLE_NAME'=>'Specify a name for new vtiger_role :',
+'LBL_SPECIFY_ROLE_NAME'=>'Specify a name for new role :',
 'LBL_ASSIGN_PROFILE'=>'Assign Profile(s)',
 'LBL_PROFILE_SELECT_TEXT'=>'Select the Profiles below and click on assign button',
 'LBL_PROFILES_AVLBL'=>'Profiles Available',
@@ -297,7 +307,7 @@
 'LBL_ASSOCIATED_USERS'=>'Associated Users :',
 
 
-//Added vtiger_fields in OrgSharingDetailsView.php
+//Added fields in OrgSharingDetailsView.php
 'LBL_ORG_SHARING_PRIVILEGES'=>'Organisation Sharing  Privileges',
 'LBL_EDIT_PERMISSIONS'=>'Edit Permissions',
 'LBL_SAVE_PERMISSIONS'=>'Save Permissions',
@@ -306,7 +316,7 @@
 'LBL_READ_CREATE_EDIT_DEL'=>'Public: Read, Create/Edit, Delete',
 'LBL_PRIVATE'=>'Private',
 
-//Added vtiger_fields in listnotificationschedulers.php
+//Added fields in listnotificationschedulers.php
 'LBL_HDR_EMAIL_SCHDS'=>'Users : Email Notifications',
 'LBL_EMAIL_SCHDS_DESC'=>'The following is the list of notifications that are activated automatically when the corresponding event has happened.',
 'LBL_ACTIVE'=>'Active',
@@ -327,13 +337,13 @@
 'LBL_BUTTON_UPDATE'=>'Update',
 'LBL_MODULENAMES'=>'Module',
 
-//Added vtiger_fields in ListFieldPermissions.html
+//Added fields in ListFieldPermissions.html
 'LBL_FIELD_PERMISSION_FIELD_NAME'=>'Field Name',
 'LBL_FIELD_PERMISSION_VISIBLE'=>'Visible',
 'LBL_FIELD_PERMISSIOM_TABLE_HEADER'=>'Standard Fields',
 'LBL_FIELD_LEVEL_ACCESS'=>'Field Level Access',
 
-//Added vtiger_fields after 4.0.1
+//Added fields after 4.0.1
 'LBL_SIGNATURE'=>'Signature',
 
 //Added for Event Reminder 4.2 Alpha release
@@ -352,9 +362,9 @@
 'Show Details'=>'Show Details',
 'Show Details and Add Events'=>'Show Details and Add Events',
 
-'LBL_USR_CANNOT_ACCESS'=>'Users cannot access other vtiger_users ',
+'LBL_USR_CANNOT_ACCESS'=>'Users cannot access other users ',
 'LBL_USR_CAN_ACCESS'=>'Users can ',
-'LBL_USR_OTHERS'=>' other vtiger_users ',
+'LBL_USR_OTHERS'=>' other users ',
 
 'Read Only '=>'Read Only ',
 'Read, Create/Edit, Delete '=>'Read, Create/Edit, Delete ',
@@ -432,7 +442,7 @@
 
 //given for calendar color for an user user
 'LBL_COLOR'=>'Color in Calendar',
-//added for vtiger_activity view in home page
+//added for activity view in home page
 'LBL_ACTIVITY_VIEW'=>'Default Activity View',
 //Added to change Home page order
 'LBL_HOMEPAGE_ORDER_UPDATE'=>'Update Home Page Block Order',
@@ -452,7 +462,7 @@
 'MNL'=>'My New Leads',
 'LBL_LEAD_VIEW'=>'Default Lead View',
 'LBL_TAG_CLOUD'=>'Tag Cloud',
-'LBL_LIST_TOOLS'=>'Operations',
+'LBL_LIST_TOOLS'=>'Tools',
 'LBL_STATISTICS'=>'Statistics',
 'LBL_TOTAL'=>'Total :',
 'LBL_OTHERS'=>'Others :',
@@ -486,7 +496,7 @@
 'LBL_CREATE_RULE_MESG'=>'to create a new Rule',
 'LBL_SELECT_SCREEN'=>'Select the Screen / Module :',
 'LBL_FIELDS_AVLBL'=>'Fields Available in',
-'LBL_FIELDS_SELECT_DESELECT'=>'Select or De-Select vtiger_fields to be shown',
+'LBL_FIELDS_SELECT_DESELECT'=>'Select or De-Select fields to be shown',
 'LBL_ROLE_TO_BE_DELETED'=>'Role to be Deleted',
 'LBL_TRANSFER_USER_ROLE'=>'Transfer Users to Role',
 'LBL_DELETE_ROLE'=>'Delete Role'



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 04:58:18 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 11:58:18 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7032 -
	/vtigercrm/trunk/themes/blue/style.css
Message-ID: <20060613115818.023EF7E8A6C@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 13 05:58:15 2006
New Revision: 7032

Log:
style css updated

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 Tue Jun 13 05:58:15 2006
@@ -1570,7 +1570,7 @@
 }
 
 .prvPrfTexture {
-	background:url(../images/prvPrfTexture1.gif);
+	background:url(images/prvPrfTexture1.gif);
 
 }
 .prvPrfBgOn{
@@ -1589,19 +1589,19 @@
 }
 
 .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 {
@@ -2659,7 +2659,7 @@
 	background-color:#ffffff;
 	border-bottom:2px solid #aaaaaa;
 }
-.ColHeader{
+.colHeader{
 	background-color:#dadada;
 	border-left:1px solid #eaeaea;
 	border-top:1px solid #eaeaea;
@@ -2770,17 +2770,17 @@
 }
 
 .prvPrfSelectedTab {
-	background:url(../images/prvPrfSelectedTab.gif) repeat-x;
+	background:url(images/prvPrfSelectedTab.gif) repeat-x;
 
 }
 
 .prvPrfUnSelectedTab {
-	background:url(../images/prvPrfUnSelectedTab.gif) repeat-x;
+	background:url(images/prvPrfUnSelectedTab.gif) repeat-x;
 
 }
 
 .prvPrfTexture {
-	background:url(../images/prvPrfTexture1.gif);
+	background:url(images/prvPrfTexture1.gif);
 
 }
 .prvPrfBgOn{
@@ -2799,19 +2799,19 @@
 }
 
 .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 {



From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 13 04:59:31 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 13 Jun 2006 11:59:31 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231292=3A?=
	=?utf-8?q?_This_is_Spam?=
In-Reply-To: <076.3be71aaa1fa450bc94bdfa03d862bd31@vtiger.fosslabs.com>
References: <076.3be71aaa1fa450bc94bdfa03d862bd31@vtiger.fosslabs.com>
Message-ID: <085.c0961149b3cc1e1a329e883b17768ba7@vtiger.fosslabs.com>

#1292: This is Spam
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  developer                          
      Type:  defect     |      Status:  new                                
  Priority:  major      |   Milestone:                                     
 Component:  vtigercrm  |     Version:  5.0.0                              
Resolution:             |    Keywords:  Viagra,Ambien,Diazepam,Levitra,Soma
------------------------+---------------------------------------------------
Changes (by anonymous):

  * summary:  Buy Viagra => This is Spam

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1292>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 13 05:05:48 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 13 Jun 2006 12:05:48 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231202=3A?=
 =?utf-8?q?_DashBoard_-_Improper_Search_Result_for_=22Sales_Order_by_Accou?=
 =?utf-8?q?nts=22?=
In-Reply-To: <076.8281dc6ab2dd859b8af8651259da94b9@vtiger.fosslabs.com>
References: <076.8281dc6ab2dd859b8af8651259da94b9@vtiger.fosslabs.com>
Message-ID: <085.39b612acbdda9b1093f446f0aaf9a907@vtiger.fosslabs.com>

#1202: DashBoard - Improper Search Result for "Sales Order by Accounts"
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  philip
      Type:  defect     |      Status:  closed
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by anonymous):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1202>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 05:08:05 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 12:08:05 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7033 - in
 /vtigercrm/trunk/Smarty/templates: UserListView.tpl
 UserListViewContents.tpl
Message-ID: <20060613120805.D72457E8C6B@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 13 06:08:00 2006
New Revision: 7033

Log:
updated the user list view tpl file - ahmed

Modified:
    vtigercrm/trunk/Smarty/templates/UserListView.tpl
    vtigercrm/trunk/Smarty/templates/UserListViewContents.tpl

Modified: vtigercrm/trunk/Smarty/templates/UserListView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/UserListView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/UserListView.tpl Tue Jun 13 06:08:00 2006
@@ -1,120 +1,126 @@
-{*<!--
-/*********************************************************************************
-  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
-   * ("License"); You may not use this file except in compliance with the License
-   * The Original Code is:  vtiger CRM Open Source
-   * The Initial Developer of the Original Code is vtiger.
-   * Portions created by vtiger are Copyright (C) vtiger.
-   * All Rights Reserved.
-  *
- ********************************************************************************/
--->*}
-<script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
-<style type="text/css">@import url(themes/blue/style.css);</style>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-<tr>
-	{include file='SettingsMenu.tpl'}
-<td width="75%" valign="top" class="showPanelBg">
-		<form action="index.php" method="post" name="EditView" id="form">
-		<input type='hidden' name='module' value='Users'>
-<input type='hidden' name='action' value='EditView'>
-<input type='hidden' name='return_action' value='ListView'>
-<input type='hidden' name='return_module' value='Users'>
-<input type='hidden' name='parenttab' value='Settings'>
-		<table width="100%" border="0" cellpadding="0" cellspacing="0" class="small">
-			<tr>
-					<td colspan="2" style="padding:5px;">
-							<span class="lvtHeaderText">
-							<b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS} </a>
-									 > {$MOD.LBL_USER_MANAGEMENT} > {$MOD.LBL_USERS}</b></span>
-									<hr noshade="noshade" size="1" />
-					</td>
-			  </tr>
-			  <tr>
-					<td style="padding:5px;"> 
-							<table border="0" cellpadding="0" cellspacing="0" width="100%">
-								<tr>
-									<td colspan="2" align="left"><img src="{$IMAGE_PATH}user.gif" align="absmiddle">&nbsp;<span class="genHeaderGray">{$MOD.LBL_USER_MANAGEMENT}</span></td>
-									<td align="right" style="padding:5px; ">
-											<input title="{$CMOD.LBL_NEW_USER_BUTTON_TITLE}" accessyKey="{$CMOD.LBL_NEW_USER_BUTTON_KEY}" class='classBtn' type='submit' name='button' value="{$CMOD.LBL_NEW_USER_BUTTON_LABEL}" >
-								 	 </td>
-								</tr>
-								<tr><td colspan="3" style="border-bottom:1px dashed #CCCCCC;">&nbsp;</td></tr>
-							</table>
-					</td>
-					<td>&nbsp;</td>
-			</tr>
-			<tr><td colspan=2>
-					<div id="ListViewContents">
-						{include file="UserListViewContents.tpl"}
-					</div>
-					
-			</td>
-			</tr>
-		</table>
-	</form>
-</td>
-</tr>
-</table>
-
-</td>
-</tr>
-</table>
-<div id="tempdiv" style="display:block;position:absolute;left:350px;top:200px;"></div>
-{literal}
-<script>
-function getListViewEntries_js(module,url)
-{
-	$("status").style.display="inline";
-        new Ajax.Request(
-		'index.php',
-                {queue: {position: 'end', scope: 'command'},
-                        method: 'post',
-                        postBody: 'module=Users&action=UsersAjax&file=ListView&ajax=true&'+url,
-                        onComplete: function(response) {
-                                $("status").style.display="none";
-				$("ListViewContents").innerHTML= response.responseText;
-                        }
-                }
-        );
-}
-
-function deleteUser(userid)
-{
-	$("status").style.display="inline";
-        new Ajax.Request(
-                'index.php',
-                {queue: {position: 'end', scope: 'command'},
-                        method: 'post',
-                        postBody: 'action=UsersAjax&file=UserDeleteStep1&return_action=ListView&return_module=Users&module=Users&parenttab=Settings&record='+userid,
-                        onComplete: function(response) {
-                                $("status").style.display="none";
-				$("tempdiv").innerHTML= response.responseText;
-                        }
-                }
-        );
-}
-
-function transferUser(del_userid)
-{
-	$("status").style.display="inline";
-	$("DeleteLay").style.display="none";
-	var trans_userid=$('transfer_user_id').options[$('transfer_user_id').options.selectedIndex].value;
-        new Ajax.Request(
-                'index.php',
-                {queue: {position: 'end', scope: 'command'},
-                        method: 'post',
-                        postBody: 'module=Users&action=UsersAjax&file=DeleteUser&ajax=true&delete_user_id='+del_userid+'&transfer_user_id='+trans_userid,
-                        onComplete: function(response) {
-                                $("status").style.display="none";
-                                $("ListViewContents").innerHTML= response.responseText;
-                        }
-                }
-        );
-
-}
-</script>
-{/literal}
-
-	{include file='SettingsSubMenu.tpl'}
-
+{*<!--
+/*********************************************************************************
+  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
+   * ("License"); You may not use this file except in compliance with the License
+   * The Original Code is:  vtiger CRM Open Source
+   * The Initial Developer of the Original Code is vtiger.
+   * Portions created by vtiger are Copyright (C) vtiger.
+   * All Rights Reserved.
+  *
+ ********************************************************************************/
+-->*}
+
+<script language="JAVASCRIPT" type="text/javascript" src="include/js/smoothscroll.js"></script>
+
+<br>
+<table align="center" border="0" cellpadding="0" cellspacing="0" width="98%">
+<tbody><tr>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
+        <td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
+<form action="index.php" method="post" name="EditView" id="form">
+<input type='hidden' name='module' value='Users'>
+<input type='hidden' name='action' value='EditView'>
+<input type='hidden' name='return_action' value='ListView'>
+<input type='hidden' name='return_module' value='Users'>
+<input type='hidden' name='parenttab' value='Settings'>
+
+        <br>
+
+	<div align=center>
+			{include file='SetMenu.tpl'}
+				<!-- DISPLAY -->
+				<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
+				<tr>
+					<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}ico-users.gif" alt="{$MOD.LBL_USERS}" width="48" height="48" border=0 title="{$MOD.LBL_USERS}"></td>
+					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > {$MOD.LBL_USERS}</b></td>
+				</tr>
+				<tr>
+					<td valign=top class="small">{$MOD.LBL_USER_DESCRIPTION}</td>
+				</tr>
+				</table>
+				
+				<br>
+				<table border=0 cellspacing=0 cellpadding=10 width=100% >
+				<tr>
+				<td>
+					<div id="ListViewContents">
+						{include file="UserListViewContents.tpl"}
+					</div>	
+				</td>
+				</tr>
+				</table>
+			
+			
+			
+			</td>
+			</tr>
+			</table>
+		</td>
+	</tr>
+	</table>
+		
+	</div>
+
+</td>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
+   </tr>
+</tbody>
+</form>
+</table>
+
+<div id="tempdiv" style="display:block;position:absolute;left:350px;top:200px;"></div>
+{literal}
+<script>
+function getListViewEntries_js(module,url)
+{
+        $("status").style.display="inline";
+        new Ajax.Request(
+                'index.php',
+                {queue: {position: 'end', scope: 'command'},
+                        method: 'post',
+                        postBody: 'module=Users&action=UsersAjax&file=ListView&ajax=true&'+url,
+                        onComplete: function(response) {
+                                $("status").style.display="none";
+                                $("ListViewContents").innerHTML= response.responseText;
+                        }
+                }
+        );
+}
+
+function deleteUser(userid)
+{
+        $("status").style.display="inline";
+        new Ajax.Request(
+                'index.php',
+                {queue: {position: 'end', scope: 'command'},
+                        method: 'post',
+                        postBody: 'action=UsersAjax&file=UserDeleteStep1&return_action=ListView&return_module=Users&module=Users&parenttab=Settings&record='+userid,
+                        onComplete: function(response) {
+                                $("status").style.display="none";
+                                $("tempdiv").innerHTML= response.responseText;
+                        }
+                }
+        );
+}
+function transferUser(del_userid)
+{
+        $("status").style.display="inline";
+        $("DeleteLay").style.display="none";
+        var trans_userid=$('transfer_user_id').options[$('transfer_user_id').options.selectedIndex].value;
+        new Ajax.Request(
+                'index.php',
+                {queue: {position: 'end', scope: 'command'},
+                        method: 'post',
+                        postBody: 'module=Users&action=UsersAjax&file=DeleteUser&ajax=true&delete_user_id='+del_userid+'&transfer_user_id='+trans_userid,
+                        onComplete: function(response) {
+                                $("status").style.display="none";
+                                $("ListViewContents").innerHTML= response.responseText;
+                        }
+                }
+        );
+
+}
+</script>
+{/literal}
+
+

Modified: vtigercrm/trunk/Smarty/templates/UserListViewContents.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/UserListViewContents.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/UserListViewContents.tpl Tue Jun 13 06:08:00 2006
@@ -1,59 +1,41 @@
-{*<!--
-/*********************************************************************************
-  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
-   * ("License"); You may not use this file except in compliance with the License
-   * The Original Code is:  vtiger CRM Open Source
-   * The Initial Developer of the Original Code is vtiger.
-   * Portions created by vtiger are Copyright (C) vtiger.
-   * All Rights Reserved.
-  *
- ********************************************************************************/
--->*}
-<!-- BEGIN: main -->
-<table width="100%" border=0>
-					<tr>
-					<td width="75%" style="border-right:1px dashed #CCCCCC;padding:5px;">
-							<table width="100%" border="0">
-								<tr>
-									<td align="left" style="padding:5px;">{$RECORD_COUNTS}</td>
-									{$NAVIGATION}
-								</tr>
-							</table>
-							<table width="100%" border="0" cellpadding="5" cellspacing="1" class="small" style="background-color: rgb(204, 204, 204);">
-                          <tbody>
-                          	<tr>
-							{foreach item=header from=$LIST_HEADER}
-                              <td class="lvtCol">{$header}</td>
-							{/foreach}	
-                            </tr>
-							{section name=entries loop=$LIST_ENTRIES}
-             <tr  class="lvtColData" onmouseover="this.className='lvtColDataHover'" onmouseout="this.className='lvtColData'" bgcolor="white">
-             {foreach item=listvalues from=$LIST_ENTRIES[entries]}
-				  <td >{$listvalues}</td>
-             {/foreach}
-			 </tr>
-		{/section}	
-        </tbody>
-        </table>
-	</td>
-	<td width="25%" class="padTab" align="center" valign="top">
-		<div id="chPhoto" style="display:block;width:80%;">
-			<table width="100%"   cellspacing="0" cellpadding="5" class="small">
-				<tr><td align="left" colspan="2" style="border-bottom:1px dotted #CCCCCC;">
-					<b>{$CMOD.LBL_STATISTICS}</b></td>
-				</tr>
-				<tr><td align="right"><b>{$CMOD.LBL_TOTAL}</b></td>
-					<td  align="left">{$USER_COUNT.user} {$CMOD.LBL_USERS}</td>	
-				</tr>	
-				<tr><td  align="right"><b>{$CMOD.LBL_ADMIN} {$CMOD.LBL_COLON}</b></td>
-					<td  align="left">{$USER_COUNT.admin} {$CMOD.LBL_USERS}</td>	
-				</tr>	
-				<tr><td  align="right"><b>{$CMOD.LBL_OTHERS}</b></td>
-					<td  align="left">{$USER_COUNT.nonadmin} {$CMOD.LBL_USERS}</td>
-				</tr>	
-			</table>
-	    </div>
-	</td>
-	</tr>
+	
+<table border=0 cellspacing=0 cellpadding=5 width=100% class="tableHeading">
+<tr>
+	<td class="big"><strong>{$MOD.LBL_USERS_LIST}</strong></td>
+	<td class="small" align=right>{$CMOD.LBL_TOTAL} {$USER_COUNT.user} {$MOD.LBL_USERS} ({$USER_COUNT.admin} {$CMOD.LBL_ADMINS}, {$USER_COUNT.nonadmin} {$CMOD.LBL_STD_USERS})</td>
+</tr>
+</table>
+					
+<table border=0 cellspacing=0 cellpadding=5 width=100% class="listTableTopButtons">
+<tr>
+	<td class=small align=right><input title="{$CMOD.LBL_NEW_USER_BUTTON_TITLE}" accessyKey="{$CMOD.LBL_NEW_USER_BUTTON_KEY}" type="submit" name="button" value="{$CMOD.LBL_NEW_USER_BUTTON_LABEL}" class="crmButton create small"></td>
+</tr>
+</table>
+						
+<table border=0 cellspacing=0 cellpadding=5 width=100% class="listTable">
+<tr>
+	{foreach item=header from=$LIST_HEADER} 
+		<td class="colHeader small" valign=top>{$header}</td>
+	{/foreach}
+</tr>
+	{foreach name=userlist item=listvalues from=$LIST_ENTRIES}
+<tr>
+	<td class="listTableRow small" valign=top>{$smarty.foreach.userlist.iteration}</td>
+	<td class="listTableRow small" valign=top>{$listvalues.7}</td>
+	<td class="listTableRow small" valign=top><b>{$listvalues.0}</b><br>{$listvalues.3} <a> (</a>{$listvalues.1})</td>
+	<td class="listTableRow small" valign=top>{$listvalues.2}</td>
+	<td class="listTableRow small" valign=top>{$listvalues.6}</td>
+	<td class="listTableRow small" valign=top>{$listvalues.4}</td>
+	{if $listvalues.5 eq 'Active'}
+	<td class="listTableRow small active" valign=top>{$listvalues.5}</td>
+	{else}
+	<td class="listTableRow small inactive" valign=top>{$listvalues.5}</td>
+	{/if}	
+
+</tr>
+	{/foreach}
+</table>
+<table border=0 cellspacing=0 cellpadding=5 width=100% >
+	<tr><td class="small" nowrap align=right><a href="#top">{$MOD.LBL_SCROLL}</a></td></tr>
 </table>
 



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 05:09:49 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 12:09:49 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7034 -
	/vtigercrm/trunk/install/populateSeedData.php
Message-ID: <20060613120949.DDFBE7E8C68@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 13 06:09:46 2006
New Revision: 7034

Log:
value added in salesorder status array and in Invoice, accountid changed to account_id

Modified:
    vtigercrm/trunk/install/populateSeedData.php

Modified: vtigercrm/trunk/install/populateSeedData.php
==============================================================================
--- vtigercrm/trunk/install/populateSeedData.php (original)
+++ vtigercrm/trunk/install/populateSeedData.php Tue Jun 13 06:09:46 2006
@@ -607,7 +607,7 @@
 //Populate SalesOrder Data
 
 $subj_array = array ("SO_vtiger", "SO_zoho", "SO_vtiger5usrp", "SO_vt100usrpk", "SO_vendtl");
-$status_array = array ("Created",  "Delivered", "Approved" , "Cancelled");
+$status_array = array ("Created",  "Delivered", "Approved" , "Cancelled" , "Created");
 $sototal_array = array ("5988.000", "5988.000", "5988.000", "5988.000", "5988.000");
 $carrier_array = array ("FedEx", "UPS", "USPS", "DHL", "BlueDart");
 
@@ -685,7 +685,7 @@
 	
 	$invoice->column_fields["assigned_user_id"] = $assigned_user_id;
 	$account_key = array_rand($account_ids);
-	$invoice->column_fields["accountid"] = $account_ids[$account_key];
+	$invoice->column_fields["account_id"] = $account_ids[$account_key];
 	$so_key = array_rand($salesorder_ids);
 	$invoice->column_fields["salesorder_id"] = $salesorder_ids[$so_key];
 	$contact_key = array_rand($contact_ids);



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 05:10:55 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 12:10:55 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7035 -
	/vtigercrm/trunk/Smarty/templates/SetMenu.tpl
Message-ID: <20060613121055.D05407E8C6B@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 13 06:10:52 2006
New Revision: 7035

Log:
Added new settings menu tpl file - ahmed

Added:
    vtigercrm/trunk/Smarty/templates/SetMenu.tpl



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 05:20:40 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 12:20:40 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7036 -
	/vtigercrm/trunk/modules/Users/ListProfiles.php
Message-ID: <20060613122040.093167E8C6B@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 13 06:20:37 2006
New Revision: 7036

Log:
updated Profiles List.php - ahmed

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

Modified: vtigercrm/trunk/modules/Users/ListProfiles.php
==============================================================================
--- vtigercrm/trunk/modules/Users/ListProfiles.php (original)
+++ vtigercrm/trunk/modules/Users/ListProfiles.php Tue Jun 13 06:20:37 2006
@@ -27,7 +27,7 @@
 $sql = "select * from vtiger_profile";
 $profileListResult = $adb->query($sql);
 $noofrows = $adb->num_rows($profileListResult);
-$list_entries = array($mod_strings['LBL_OERATION'],$mod_strings['LBL_NEW_PROFILE_NAME'],$mod_strings['LBL_DESCRIPTION']);
+$list_entries = array($mod_strings['LBL_LIST_NO'],$mod_strings['LBL_LIST_TOOLS'],$mod_strings['LBL_NEW_PROFILE_NAME'],$mod_strings['LBL_DESCRIPTION']);
 
 //Standard PickList Fields
 function getStdOutput($profileListResult, $noofrows, $mod_strings)
@@ -60,10 +60,9 @@
 $smarty->assign("MOD", return_module_language($current_language,'Settings'));
 $smarty->assign("PROFILES", $standCustFld);
 $smarty->assign("IMAGE_PATH",$image_path);
+$smarty->assign("COUNT",$noofrows);
 $smarty->assign("APP", $app_strings);
 $smarty->assign("CMOD", $mod_strings);
 
-
-
-$smarty->display("UserProfile.tpl");
+$smarty->display("UserProfileList.tpl");
 ?>



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 05:22:09 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 12:22:09 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7037 -
	/vtigercrm/trunk/Smarty/templates/UserProfile.tpl
Message-ID: <20060613122209.5AED27E8C6B@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 13 06:22:05 2006
New Revision: 7037

Log:
Replaced the file with UserProfileList - ahmed

Removed:
    vtigercrm/trunk/Smarty/templates/UserProfile.tpl



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 05:22:57 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 12:22:57 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7038 -
 /vtigercrm/trunk/Smarty/templates/UserProfileList.tpl
Message-ID: <20060613122257.CC86F7E8C6B@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 13 06:22:53 2006
New Revision: 7038

Log:
Added profile list file for new ui - ahmed

Added:
    vtigercrm/trunk/Smarty/templates/UserProfileList.tpl



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 05:29:10 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 12:29:10 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7039 -
 /vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl
Message-ID: <20060613122911.7B3467E8AC7@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 13 06:29:05 2006
New Revision: 7039

Log:
Updated the detailview profile file for new ui - ahmed

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 Jun 13 06:29:05 2006
@@ -9,127 +9,191 @@
   *
  ********************************************************************************/
 -->*}
-<script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
-<style type="text/css">@import url(themes/blue/style.css);</style>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-<tr>
-	{include file='SettingsMenu.tpl'}
-<td width="75%" valign="top">
-
-<table width="100%" border="0" cellpadding="0" cellspacing="0" height="100%">
-<tr>
-<td class="showPanelBg" valign="top" width="100%" colspan="3" style="padding-left:20px; "><br />
-<span class="lvtHeaderText"><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS} </a> > {$MOD.LBL_USER_MANAGEMENT} > {$MOD.LBL_PROFILES}</b></span>
-<hr noshade="noshade" size="1" />
-</td>
-</tr>
-<tr>
-<td width="75%" style="padding-left:20px;" valign="top">
-	
-	<table width="75%" border="0" cellpadding="5" cellspacing="0" align="center">
-	<tr>
-															<td width="5%" style="border-bottom:1px dashed #CCCCCC;">
-																	<img src="{$IMAGE_PATH}profile.gif" align="absmiddle">
-															</td>
-															<td style="border-bottom:1px dashed #CCCCCC;"> 
-																	<span class="genHeaderGrayBig">{$CMOD.LBL_PROFILE_DETAIL_VIEW}</span><br>
-																	<span	class="genHeaderSmall">{$PROFILE_NAME}</span>
-															</td>
-													</tr>
-	<tr>
-	<td colspan="2"><table border="0" cellspacing="0" cellpadding="0" width="100%">
-	<tr class="small">
-	<td><img src="{$IMAGE_PATH}prvPrfTopLeft.gif" /></td>
-	<td class="prvPrfTopBg" width="100%" ></td>
-
-	<td><img src="{$IMAGE_PATH}prvPrfTopRight.gif" /></td>
-	</tr>
-	</table>
-	<form action="index.php" method="post" name="new" id="form">
-	<input type="hidden" name="module" value="Users">		
-	<input type="hidden" name="action" value="profilePrivileges">		
-	<input type="hidden" name="parenttab" value="Settings">
-	<input type="hidden" name="return_action" value="profilePrivileges">		
-	<input type="hidden" name="mode" value="edit">	
-	<input type="hidden" name="profileid" value="{$PROFILEID}">	
-	
-	<table border="0" cellspacing="0" cellpadding=	"0" width="100%" class="prvPrfOutline">
-	<tr>
-	<td>
-	<!-- tabs -->
-	<table border="0" cellspacing="0" cellpadding="5" width="100%" class="small">
-	<tr>
-	<td width="20%" id="prvPrfTab1" class="prvPrfUnSelectedTab" align="center" style="height:31px;" onClick="toggleshowhide('global_privileges','prvPrfTab1');">{$CMOD.LBL_GLOBAL_PRIVILEGES}</td>
-	<td width="20%" id="prvPrfTab2" class="prvPrfUnSelectedTab" align="center" onClick="toggleshowhide('tab_privileges','prvPrfTab2');">{$CMOD.LBL_TAB_PRIVILEGES}</td>
-	<td width="20%" id="prvPrfTab3" class="prvPrfUnSelectedTab" align="center" onClick="toggleshowhide('standard_privileges','prvPrfTab3');">{$CMOD.LBL_STANDARD_PRIVILEGES}</td>
-	<td width="20%" id="prvPrfTab4" class="prvPrfUnSelectedTab" align="center" onClick="toggleshowhide('field_privileges','prvPrfTab4');">{$CMOD.LBL_FIELD_PRIVILEGES}</td>
-	<td width="20%" id="prvPrfTab5" class="prvPrfUnSelectedTab" align="center" onClick="toggleshowhide('utility_privileges','prvPrfTab5');">{$CMOD.LBL_UTILITIES}</td>
-	</tr>
-	</table>
-		<div id="global_privileges" style="display:none;">
-		<!-- Headers -->
-		<table border="0" cellspacing="0" cellpadding="5" width="100%" class="prvPrfBgImgGlobal">
-		<tr>
-		<td>
-		<table border="0" cellspacing="0" cellpadding="5" width="100%" class="small">
-		<tr>
-		<td><!-- Module name heading -->
-		<table border="0" cellspacing="0" cellpadding="2" class="small">
-		<tr>
-		<td valign="top"><img src="{$IMAGE_PATH}prvPrfHdrArrow.gif"/> </td>
-	
-		<td class="prvPrfBigText"><b> {$CMOD.LBL_GLOBAL_PRIVILEGES} {$CMOD.LBL_FOR} "{$PROFILE_NAME}"</b> <br />
-		<font class="small">{$CMOD.LBL_GLOBAL_MESG_OPTION} </font> </td>
-		<td class="small" style="padding-left:10px" align="right"></td>
-		</tr>
-		</table></td>
-		<td align="right" valign="bottom">&nbsp; </td>
-
+
+<script language="JAVASCRIPT" type="text/javascript" src="include/js/smoothscroll.js"></script>
+
+<br>
+<table align="center" border="0" cellpadding="0" cellspacing="0" width="98%">
+<tbody><tr>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
+        <td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
+<br>
+	<div align=center>
+		{include file="SetMenu.tpl"}	
+				<!-- DISPLAY -->
+				<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
+				<tr>
+					<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}ico-profile.gif" alt="{$MOD.LBL_PROFILES}" width="48" height="48" border=0 title="{$MOD.LBL_PROFILES}"></td>
+					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&
+parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Users&action=ListProfiles&parenttab=Settings">{$CMOD.LBL_PROFILE_PRIVILEGES}</a> &gt; {$CMOD.LBL_VIEWING} &quot;{$PROFILE_NAME}&quot; </b></td>
+				</tr>
+				<tr>
+					<td valign=top class="small">{$CMOD.LBL_PROFILE_MESG} &quot;{$PROFILE_NAME}&quot;</td>
+				</tr>
+				</table>
+				
+				
+				<table border=0 cellspacing=0 cellpadding=10 width=100% >
+				<tr>
+				<td valign=top>
+					<table border="0" cellspacing="0" cellpadding="0" width="100%">
+                      <tr>
+                        <td><table border="0" cellspacing="0" cellpadding="0" width="100%">
+                            <tr class="small">
+                              <td><img src="{$IMAGE_PATH}prvPrfTopLeft.gif"></td>
+
+                              <td class="prvPrfTopBg" width="100%" ></td>
+                              <td><img src="{$IMAGE_PATH}prvPrfTopRight.gif"></td>
+                            </tr>
+                          </table>
+				<form action="index.php" method="post" name="new" id="form">
+			        <input type="hidden" name="module" value="Users">
+			        <input type="hidden" name="action" value="profilePrivileges">
+			        <input type="hidden" name="parenttab" value="Settings">
+			        <input type="hidden" name="return_action" value="profilePrivileges">
+			        <input type="hidden" name="mode" value="edit">
+			        <input type="hidden" name="profileid" value="{$PROFILEID}">
+	
+                            <table border="0" cellspacing="0" cellpadding="0" width="100%" class="prvPrfOutline">
+                              <tr>
+                                <td><!-- tabs -->
+                                    <table border="0" cellspacing="0" cellpadding="5" width="100%" class="small">
+                                      <tr>
+                                        <td width="20%" id="prvPrfTab1" class="prvPrfSelectedTab" align="center" style="height:31px;" onClick="toggleshowhide('global_privileges','prvPrfTab1');"><a href="#">{$CMOD.LBL_GLOBAL_PRIVILEGES}</a></td>
+                                        <td width="20%" id="prvPrfTab2" class="prvPrfUnSelectedTab" align="center" onClick="toggleshowhide('tab_privileges','prvPrfTab2');"><a href="#">{$CMOD.LBL_TAB_PRIVILEGES}</a></td>
+                                        <td width="20%" id="prvPrfTab3" class="prvPrfUnSelectedTab" align="center" onClick="toggleshowhide('standard_privileges','prvPrfTab3');"><a href="#">{$CMOD.LBL_STANDARD_PRIVILEGES}</a></td>
+                                        <td width="20%" id="prvPrfTab4" class="prvPrfUnSelectedTab" align="center" onClick="toggleshowhide('field_privileges','prvPrfTab4');"><a href="#">{$CMOD.LBL_FIELD_PRIVILEGES}</a></td>
+                                        <td width="20%" id="prvPrfTab5" class="prvPrfUnSelectedTab" align="center" onClick="toggleshowhide('utility_privileges','prvPrfTab5');" ><a href="#">{$CMOD.LBL_UTILITIES}</a></td>
+                                      </tr>
+                                    </table>
+				   <div id="global_privileges" style="display:none;">
+                                    <!-- Headers -->
+                                    <table border="0" cellspacing="0" cellpadding="5" width="100%" class="prvPrfBgImgGlobal">
+                                      <tr>
+                                        <td><table border="0" cellspacing="0" cellpadding="5" width="100%" class="small">
+                                            <tr>
+                                              <td><!-- Module name heading -->
+                                                  <table border="0" cellspacing="0" cellpadding="2" class="small">
+                                                    <tr>
+                                                      <td valign="top" ><img src="{$IMAGE_PATH}prvPrfHdrArrow.gif" /> </td>
+                                                      <td class="prvPrfBigText"><b> {$CMOD.LBL_GLOBAL_PRIVILEGES} {$CMOD.LBL_FOR} "{$PROFILE_NAME}"</b> <br />
+                                                          <font class="small">{$CMOD.LBL_GLOBAL_MESG_OPTION}</font></td>
+                                                      <td class="small" style="padding-left:10px" align="right"></td>
+                                                    </tr>
+                                                </table></td>
+                                              <td align="right" valign="bottom">
+						<input type="hidden" id="selected_tab" name="selected_tab" value="{$SELECTED_TAB}">
+					        <input type="hidden" id="selected_module" name="selected_module" value="{$SELECTED_MODULE}">
+						<input type="submit" value="{$APP.LBL_EDIT_BUTTON_LABEL}" class="crmButton small edit" name="edit"></td>
+                                            </tr>
+                                          </table>
+                                            <!-- privilege lists -->
+                                            <table border="0" cellspacing="0" cellpadding="0" width="100%" >
+                                              <tr>
+                                                <td align="center" style="height:10px"><img src="{$IMAGE_PATH}prvPrfLine.gif" style="width:100%;height:1px" /></td>
+                                              </tr>
+                                            </table>
+                                            <table border="0" cellspacing="0" cellpadding="10" width="100%">
+                                              <tr>
+                                                <td ><table border="0" cellspacing="0" cellpadding="5" width="90%" class="small" align="center">
+                                                  <tr>
+                                                    <td class="prvPrfTexture" style="width:20px">&nbsp;</td>
+                                                    <td width="97%" valign="top"><table border="0" cellspacing="0" cellpadding="2" width="100%" class="small">
+                                                        <tr id="gva">
+                                                          <td valign="top">{$GLOBAL_PRIV.0}</td>
+                                                          <td ><b>{$CMOD.LBL_VIEW_ALL}</b> </td>
+                                                        </tr>
+                                                        <tr >
+                                                          <td valign="top"></td>
+                                                          <td width="100%" >{$CMOD.LBL_ALLOW} "{$PROFILE_NAME}" {$CMOD.LBL_MESG_VIEW}</td>
+                                                        </tr>
+                                                        <tr>
+                                                          <td>&nbsp;</td>
+                                                        </tr>
+							<tr>
+							<td valign="top">{$GLOBAL_PRIV.1}</td>
+							<td ><b>{$CMOD.LBL_EDIT_ALL}</b> </td>
+							</tr>
+                                                        <tr>
+                                                          <td valign="top"></td>
+                                                          <td > {$CMOD.LBL_ALLOW} "{$PROFILE_NAME}" {$CMOD.LBL_MESG_EDIT}</td>
+                                                        </tr>
+                                                      </table>
+                                                     </td>
+                                                  </tr>
+                                                </table></td>
+                                              </tr>
+                                          </table></td>
+                                      </tr>
+                                  </table></td>
+                              </tr>
+                            </table>
+			    </div>		
+	
+		<div id="tab_privileges" style="display:none;">
+		<table border=0 cellspacing=0 cellpadding=5 width=100% >
+		<tr>
+		<td>
+		<table border=0 cellspacing=0 cellpadding=5 width=100% class=small>
+		<tr>
+		<td>
+		<!-- Module name heading -->
+		<table border=0 cellspacing=0 cellpadding=2 class=small>
+		<tr>
+		<td valign=top >
+		<img src="{$IMAGE_PATH}prvPrfHdrArrow.gif"></td>
+		<td class="prvPrfBigText">
+		<b> {$CMOD.LBL_TAB_PRIVILEGES} {$CMOD.LBL_FOR} "{$PROFILE_NAME}"</b> <br>
+		<font class=small>{$CMOD.LBL_TAB_MESG_OPTION} </font> 
+		</td>
+		</tr>
+		</table>
+		</td>
+		<td align=right valign=bottom>
+			<input type="hidden" id="selected_tab" name="selected_tab" value="{$SELECTED_TAB}">
+			<input type="hidden" id="selected_module" name="selected_module" value="{$SELECTED_MODULE}">
+			<input type="submit" value="{$APP.LBL_EDIT_BUTTON_LABEL}" class="crmButton small edit" name="edit">
+		</td>
 		</tr>
 		</table>
 		<!-- privilege lists -->
-		<table border="0" cellspacing="0" cellpadding="0" width="100%" >
-		<tr>
-		<td align="center" style="height:10px"><img src="{$IMAGE_PATH}prvPrfLine.gif" style="width:100%;height:1px" /></td>
-		</tr>
-		</table>
-		<table border="0" cellspacing="0" cellpadding="10" width="100%">
+		<table border=0 cellspacing=0 cellpadding=0 width=100% >
+		<tr>
+		<td align=center style="height:10px"><img src="{$IMAGE_PATH}prvPrfLine.gif" style="width:100%;height:1px"></td>
+		</tr>
+		</table>
+		<table border=0 cellspacing=0 cellpadding=10 width=100%>
 		<tr>
 		<td >
-		<table border="0" cellspacing="0" cellpadding="5" width="90%" class="small" align="center">
-		<tr>
+		<!-- Home tab -->
+		<table border=0 cellspacing=0 cellpadding=5 width=95% class=small align=center >
+		<tr>
+			<td valign=top width="25%" ><table border=0 cellspacing=0 cellpadding=5 width=100% class=small>
+		
+
+		{foreach item=value from=$TAB_PRIV}
+		<tr>
+		{foreach item=element from=$value}
 		<td class="prvPrfTexture" style="width:20px">&nbsp;</td>
-		<td width="97%" valign="top">
-		<table border="0" cellspacing="0" cellpadding="2" width="100%" class="small">
-		<tr id="gva">
-		<td valign="top">{$GLOBAL_PRIV.0}</td>
-		<td ><b>{$CMOD.LBL_VIEW_ALL}</b> </td>
-		</tr>
-		<tr >
-		<td valign="top"></td>
-		<td width="100%" >{$CMOD.LBL_ALLOW} "{$PROFILE_NAME}" {$CMOD.LBL_MESG_VIEW}</td>
-		</tr>
-		<tr>
-		<td>&nbsp;</td>
-		</tr>
-		<tr>
-		<td valign="top">{$GLOBAL_PRIV.1}</td>
-		<td ><b>{$CMOD.LBL_EDIT_ALL}</b> </td>
-		</tr>
-		<tr>
-		<td valign="top"></td>
-		<td > {$CMOD.LBL_ALLOW} "{$PROFILE_NAME}" {$CMOD.LBL_MESG_EDIT}</td>
-		</tr>
-		</table>
-		</td>
-		</tr>	
-		</table></td>
-		</tr>
-		</table></td>
-		</tr>
+		<td width=5% id="perm{$element.0}">{$element.1}</td>
+		<td width=30% nowrap onMouseOver="this.className='prvPrfHoverOn',$('perm{$element.0}').className='prvPrfHoverOn'" onMouseOut="this.className='prvPrfHoverOff',$('perm{$element.0}').className='prvPrfHoverOff'">{$APP[$element.0]}</td>
+		{/foreach}
+		</tr>
+		{/foreach}
+	
+		</table>
+		</td>
+		</tr>
+		</table>
+		</td>
+		</tr>
+		</table>
+		</td>
+		</tr>
+
 		</table>
 		</div>
-		
+	
 		<div id="standard_privileges" style="display:none;">
 		<table border=0 cellspacing=0 cellpadding=5 width=100% >
 		<tr>
@@ -150,9 +214,12 @@
 		</tr>
 		</table>
 		</td>
-		<td align=right valign=bottom>&nbsp;
-		
-		</td>
+		<td align=right valign=bottom>
+			<input type="hidden" id="selected_tab" name="selected_tab" value="{$SELECTED_TAB}">
+			<input type="hidden" id="selected_module" name="selected_module" value="{$SELECTED_MODULE}">
+			<input type="submit" value="{$APP.LBL_EDIT_BUTTON_LABEL}" class="crmButton small edit" name="edit">
+		</td>	
+
 		</tr>
 		</table>
 		<!-- privilege lists -->
@@ -167,10 +234,10 @@
 		<table border=0 cellspacing=0 cellpadding=5 width=90% class=small align=center >
 		<tr>
 		<td class="prvPrfTexture" style="width:20px">&nbsp;</td>
-		<td width=97% valign=top onMouseOver="this.className='prvPrfHoverOn'" onMouseOut="this.className='prvPrfHoverOff'" >
+		<td width=97% valign=top>
 		<table border=0 cellspacing=0 cellpadding=5 width=100% class=small>
 		
-		<tr>
+		<tr onMouseOver="this.className='prvPrfHoverOn'" onMouseOut="this.className='prvPrfHoverOff'">
 		<td><b>{$CMOD.LBL_ENTITY}</b></td>
 		<td><b>{$CMOD.LBL_CREATE_EDIT}</b></td>
 		<td><b>{$CMOD.LBL_DELETE}</b></td>
@@ -178,7 +245,7 @@
 		</tr>
 		
 		{foreach item=value from=$STANDARD_PRIV}
-		<tr>
+		<tr onMouseOver="this.className='prvPrfHoverOn'" onMouseOut="this.className='prvPrfHoverOff'">
 		<td>{$APP[$value.0]}</td>
 		<td>{$value.1}</td>
 		<td>{$value.2}</td>
@@ -198,70 +265,75 @@
 		</table>
 		</div>
 		
-		<div id="tab_privileges" style="display:none;">
-		<table border=0 cellspacing=0 cellpadding=5 width=100% >
-		<tr>
-		<td>
-		<table border=0 cellspacing=0 cellpadding=5 width=100% class=small>
-		<tr>
-		<td>
-		<!-- Module name heading -->
-		<table border=0 cellspacing=0 cellpadding=2 class=small>
-		<tr>
-		<td valign=top >
-		<img src="{$IMAGE_PATH}prvPrfHdrArrow.gif">
-		</td>
-		<td class="prvPrfBigText">
-		<b> {$CMOD.LBL_TAB_PRIVILEGES} {$CMOD.LBL_FOR} "{$PROFILE_NAME}"</b> <br>
-		<font class=small>{$CMOD.LBL_TAB_MESG_OPTION} </font> 
-		</td>
-		</tr>
-		</table>
-		</td>
-		<td align=right valign=bottom>&nbsp;
-		
-		</td>
+		<div id="field_privileges" style="display:none;">
+		<table border="0" cellspacing="0" cellpadding="5" width="100%" >
+		<tr>
+		<td><table border="0" cellspacing="0" cellpadding="5" width="100%" class="small">
+		<tr>
+		<td><!-- Module name heading -->
+		<table border="0" cellspacing="0" cellpadding="2" class="small">
+		<tr>
+		<td valign="top" ><img src="{$IMAGE_PATH}prvPrfHdrArrow.gif" /> </td>
+
+		<td class="prvPrfBigText"><b> {$CMOD.LBL_FIELD_PRIVILEGES} {$CMOD.LBL_FOR} "{$PROFILE_NAME}"</b> <br />
+		<font class="small">{$CMOD.LBL_FIELD_MESG_OPTION} </font> </td>
+		</tr>
+		</table></td>
+		<td align="right" valign="bottom">
+			<input type="hidden" id="selected_tab" name="selected_tab" value="{$SELECTED_TAB}">
+			<input type="hidden" id="selected_module" name="selected_module" value="{$SELECTED_MODULE}">
+			<input type="submit" value="{$APP.LBL_EDIT_BUTTON_LABEL}" class="crmButton small edit" name="edit">
+		</td>	
 		</tr>
 		</table>
 		<!-- privilege lists -->
-		<table border=0 cellspacing=0 cellpadding=0 width=100% >
-		<tr>
-		<td align=center style="height:10px"><img src="{$IMAGE_PATH}prvPrfLine.gif" style="width:100%;height:1px"></td>
-		</tr>
-		</table>
-		<table border=0 cellspacing=0 cellpadding=10 width=100%>
+		<table border="0" cellspacing="0" cellpadding="0" width="100%" >
+		<tr>
+		<td align="center" style="height:10px"><img src="{$IMAGE_PATH}prvPrfLine.gif" style="width:100%;height:1px" /></td>
+		</tr>
+
+		</table>
+		<table border="0" cellspacing="0" cellpadding="10" width="100%">
 		<tr>
 		<td >
-		<!-- Home tab -->
-		<table border=0 cellspacing=0 cellpadding=5 width=90% class=small align=center >
-		<tr>
-		<td class="prvPrfTexture" style="width:20px">&nbsp;</td>
-		<td width=97% valign=top onMouseOver="this.className='prvPrfHoverOn'" onMouseOut="this.className='prvPrfHoverOff'" >
-		<table border=0 cellspacing=0 cellpadding=5 width=100% class=small>
-		
-
-		{foreach item=value from=$TAB_PRIV}
-		<tr>
-		{foreach item=element from=$value}
-		<td width=35%>{$APP[$element.0]}</td>
-		<td width=15%>{$element.1}</td>
-		{/foreach}
-		</tr>
-		{/foreach}
-	
-		</table>
-		</td>
-		</tr>
-		</table>
-		</td>
-		</tr>
-		</table>
-		</td>
-		</tr>
-
+		<table border="0" cellspacing="0" cellpadding="5" width="100%" class="small">
+		<tr>
+		<td>
+		<select id="module_list" name="module_list" onchange="showmoduleperm(this)">
+		{foreach key=module item=label from=$PRI_FIELD_LIST}
+			<option value="{$label}">{$APP.$label}</option>
+		{/foreach}
+		</td>
+		<td width=50%>&nbsp;</td>
+		</tr>
+		<tr>
+		<td colspan=2>
+	
+		{foreach key=module item=value from=$FIELD_PRIVILEGES}
+		<div id="field_{$module}" style="display:none;">
+		<table border="0" cellspacing="0" cellpadding="5" width="100%" class="small">
+		{foreach item=row_value from=$value}
+		<tr>
+		{foreach item=element from=$row_value}
+		<td class="prvPrfTexture" style="width:5px">&nbsp;</td>
+		<td id="fldperm{$element.0}">{$element.1}</td>
+		<td onMouseOver="this.className='prvPrfHoverOn',$('fldperm{$element.0}').className='prvPrfHoverOn'" onMouseOut="this.className='prvPrfHoverOff',$('fldperm{$element.0}').className='prvPrfHoverOff' ">{$element.0}</td>
+		{/foreach}
+		</tr>
+		{/foreach}
 		</table>
 		</div>
-		
+		{/foreach}
+		
+		</td>
+		</tr>
+		</table></td>
+		</tr>
+		</table></td>
+		</tr>
+		</table>
+		</div>
+	
 		<div id="utility_privileges" style="display:none;">
 		<table border=0 cellspacing=0 cellpadding=5 width=100% >
 		<tr>
@@ -282,9 +354,10 @@
 		</tr>
 		</table>
 		</td>
-		<td align=right valign=bottom>&nbsp;
-		
-		</td>
+		<td align=right valign=bottom>
+			<input type="hidden" id="selected_tab" name="selected_tab" value="{$SELECTED_TAB}">
+		        <input type="hidden" id="selected_module" name="selected_module" value="{$SELECTED_MODULE}">
+			<input type="submit" value="{$APP.LBL_EDIT_BUTTON_LABEL}" class="crmButton small edit" name="edit"></td>
 		</tr>
 		</table>
 		<!-- privilege lists -->
@@ -330,114 +403,47 @@
 		</table>
 
 		</div>
-		
-		
-		<div id="field_privileges" style="display:none;">
-		<table border="0" cellspacing="0" cellpadding="5" width="100%" >
-		<tr>
-		<td><table border="0" cellspacing="0" cellpadding="5" width="100%" class="small">
-		<tr>
-		<td><!-- Module name heading -->
-		<table border="0" cellspacing="0" cellpadding="2" class="small">
-		<tr>
-		<td valign="top" ><img src="{$IMAGE_PATH}prvPrfHdrArrow.gif" /> </td>
-
-		<td class="prvPrfBigText"><b> {$CMOD.LBL_FIELD_PRIVILEGES} {$CMOD.LBL_FOR} "{$PROFILE_NAME}"</b> <br />
-		<font class="small">{$CMOD.LBL_FIELD_MESG_OPTION} </font> </td>
-		</tr>
-		</table></td>
-		<td align="right" valign="bottom">
-		</td>
-		</tr>
-		</table>
-		<!-- privilege lists -->
-		<table border="0" cellspacing="0" cellpadding="0" width="100%" >
-		<tr>
-		<td align="center" style="height:10px"><img src="{$IMAGE_PATH}prvPrfLine.gif" style="width:100%;height:1px" /></td>
-		</tr>
-
-		</table>
-		<table border="0" cellspacing="0" cellpadding="10" width="100%">
-		<tr>
-		<td >
-		<table border="0" cellspacing="0" cellpadding="5" width="100%" class="small">
-		<tr>
-		<td>
-		<select id="module_list" name="module_list" onchange="showmoduleperm(this)">
-		{foreach key=module item=label from=$PRI_FIELD_LIST}
-			<option value="{$label}">{$APP.$label}</option>
-		{/foreach}
-		</td>
-		<td width=50%>&nbsp;</td>
-		</tr>
-		<tr>
-		<td colspan=2>
-	
-		{foreach key=module item=value from=$FIELD_PRIVILEGES}
-		<div id="field_{$module}" style="display:none;">
-		<table border="0" cellspacing="0" cellpadding="5" width="100%" class="small">
-		{foreach item=row_value from=$value}
-		<tr>
-		{foreach item=element from=$row_value}
-		<td>{$element.0}</td>
-		<td>{$element.1}</td>
-		{/foreach}
-		</tr>
-		{/foreach}
-		</table>
-		</div>
-		{/foreach}
-		
-		</td>
-		</tr>
-		</table></td>
-		</tr>
-		</table></td>
-		</tr>
-		</table>
-		</div>
-		
-		</td>
+
+	
+
+                            <table border="0" cellspacing="0" cellpadding="0" width="100%" class="small">
+                              <tr>
+                                <td><img src="{$IMAGE_PATH}prvPrfBottomLeft.gif" /></td>
+                                <td class="prvPrfBottomBg" width="100%"></td>
+                                <td><img src="{$IMAGE_PATH}prvPrfBottomRight.gif" /></td>
+                              </tr>
+                          </table>
 			
-		</tr>
-		</table>
-	<table border="0" cellspacing="0" cellpadding="0" width="100%" class="small">
-	<tr>
-	<td><img src="{$IMAGE_PATH}prvPrfBottomLeft.gif" /></td>
-	<td class="prvPrfBottomBg" width="100%"></td>
-	<td><img src="{$IMAGE_PATH}prvPrfBottomRight.gif" /></td>
+			</td>
+                      </tr>
+                    </table>
+					<p>&nbsp;</p>
+					<table border=0 cellspacing=0 cellpadding=5 width=100% >
+					<tr><td class="small" nowrap align=right><a href="#top">{$MOD.LBL_SCROLL}</a></td></tr>
+					</table>
+				
+					
+					
+				</td>
+				</tr>
+				</table>
+			
+			
+			
+			</td>
+			</tr>
+			</table>
+		</td>
 	</tr>
-	</table></td>
-
-	</tr>
-	</table></td>
-	</tr>	
-	<tr><td colspan="2" style="border-bottom:1px dashed #CCCCCC;">&nbsp;</td></tr>
-	<tr><td colspan="2">&nbsp;</td></tr>
-	<tr>
-	<td colspan="2" align="center">
-	<input type="hidden" id="selected_tab" name="selected_tab" value="{$SELECTED_TAB}">		
-	<input type="hidden" id="selected_module" name="selected_module" value="{$SELECTED_MODULE}">		
-	<input type="submit" value=" {$APP.LBL_EDIT_BUTTON_LABEL} " onClick="page_submit(this);" name="edit" class="classBtn"/>&nbsp;&nbsp;
-	<input type="button" value=" {$APP.LBL_CANCEL_BUTTON_LABEL} " name="Cancel" onClick="window.history.back();" class="classBtn"/>
-
-	</td>
-	</tr>
-	<tr><td colspan="2">&nbsp;</td></tr>
-	<tr><td colspan="2" style="border-top:1px solid #CCCCCC;">&nbsp;</td></tr>
 	</table>
-	
+		
+	</div>
+
 </td>
-<td width="1%" style="border-right:1px dotted #CCCCCC;">&nbsp;</td>
-</tr>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
+   </tr>
+</tbody>
 </table>
-</td>
-</tr>
-</table>
-</td>
-</tr>
-</table>
-	{include file='SettingsSubMenu.tpl'}
 
 <script language="javascript" type="text/javascript">
 var Selected_div= '{$SELECTED_TAB}';



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 05:34:07 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 12:34:07 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7040 -
	/vtigercrm/trunk/modules/Users/profilePrivileges.php
Message-ID: <20060613123407.1F2F07E8B74@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 13 06:34:01 2006
New Revision: 7040

Log:
Update profile privelege file for new ui - ahmed

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

Modified: vtigercrm/trunk/modules/Users/profilePrivileges.php
==============================================================================
--- vtigercrm/trunk/modules/Users/profilePrivileges.php (original)
+++ vtigercrm/trunk/modules/Users/profilePrivileges.php Tue Jun 13 06:34:01 2006
@@ -290,7 +290,7 @@
 	}
 
 }
-$privileges_tab = array_chunk($privileges_tab, 2);
+$privileges_tab = array_chunk($privileges_tab, 4);
 $smarty->assign("TAB_PRIV",$privileges_tab);			
 
 //utilities privileges
@@ -412,7 +412,7 @@
 			$field=array();
 			if($fieldListResult[$module_name][$j][1] == 0)
 			{
-				$visible = "<img src=".$image_path."/yes.gif>";
+				$visible = "<img src=".$image_path."/prvPrfSelectedTick.gif>";
 			}
 			else
 			{
@@ -422,7 +422,7 @@
 			$field[]=$visible;
 			$field_module[]=$field;
 		}
-		$privilege_field[$module_name] = array_chunk($field_module,2);
+		$privilege_field[$module_name] = array_chunk($field_module,4);
 		next($fieldListResult);
 	}
 }
@@ -458,7 +458,7 @@
 			$field[]='<input type="checkbox" name="'.$fieldListResult[$module_name][$j][4].'" '.$visible.' '.$readonly.'>';
 			$field_module[]=$field;
 		}
-		$privilege_field[$module_name] = array_chunk($field_module,2);
+		$privilege_field[$module_name] = array_chunk($field_module,4);
 		next($fieldListResult);
 	}
 }
@@ -496,7 +496,7 @@
 				$field[]='<input type="checkbox" name="'.$fieldListResult[$module_name][$j][4].'" '.$visible.' '.$readonly.'>';
 				$field_module[]=$field;
 			}
-			$privilege_field[$module_name] = array_chunk($field_module,2);
+			$privilege_field[$module_name] = array_chunk($field_module,4);
 			next($fieldListResult);
 		}
 	}
@@ -525,7 +525,7 @@
 				$field[]='<input type="checkbox" name="'.$fieldListResult[$module_name][$j][4].'" '.$visible.' '.$readonly.'>';
 				$field_module[]=$field;
 			}
-			$privilege_field[$module_name] = array_chunk($field_module,2);
+			$privilege_field[$module_name] = array_chunk($field_module,4);
 			next($fieldListResult);
 		}	
 	}
@@ -548,7 +548,7 @@
 	}
 	elseif($id == 0)
 	{
-		$value = '<img src="'.$image_path.'yes.gif">';
+		$value = '<img src="'.$image_path.'prvPrfSelectedTick.gif">';
 	}
 	elseif($id == 1)
 	{
@@ -601,7 +601,7 @@
 	}
 	elseif($id == 0)
 	{
-		$value = '<img src="'.$image_path.'yes.gif">';
+		$value = '<img src="'.$image_path.'prvPrfSelectedTick.gif">';
 	}
 	elseif($id == 1)
 	{



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 05:51:40 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 12:51:40 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7041 -
	/vtigercrm/trunk/modules/Dashboard/index.php
Message-ID: <20060613125140.E9A277E8C68@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 13 06:51:36 2006
New Revision: 7041

Log:
changes made to include extra graphs

Modified:
    vtigercrm/trunk/modules/Dashboard/index.php

Modified: vtigercrm/trunk/modules/Dashboard/index.php
==============================================================================
--- vtigercrm/trunk/modules/Dashboard/index.php (original)
+++ vtigercrm/trunk/modules/Dashboard/index.php Tue Jun 13 06:51:36 2006
@@ -48,6 +48,8 @@
           "invoicebystatus" => $mod_strings['invoicebystatus'],
           "ticketsbystatus" => $mod_strings['ticketsbystatus'],
           "ticketsbypriority" => $mod_strings['ticketsbypriority'],
+	  "ticketsbycategory" => $mod_strings['ticketsbycategory'], 
+	  "ticketsbyowner" => $mod_strings['ticketsbyowner'],
           );
           
 $log = LoggerManager::getLogger('dashboard');



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 06:02:31 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 13:02:31 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7042 -
 /vtigercrm/trunk/modules/Dashboard/display_charts.php
Message-ID: <20060613130232.1E2CF7E8C84@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 13 07:02:28 2006
New Revision: 7042

Log:
changes made to include extra graphs

Modified:
    vtigercrm/trunk/modules/Dashboard/display_charts.php

Modified: vtigercrm/trunk/modules/Dashboard/display_charts.php
==============================================================================
--- vtigercrm/trunk/modules/Dashboard/display_charts.php (original)
+++ vtigercrm/trunk/modules/Dashboard/display_charts.php Tue Jun 13 07:02:28 2006
@@ -87,6 +87,8 @@
           "invoicebystatus" => $mod_strings['invoicebystatus'],
           "ticketsbystatus" => $mod_strings['ticketsbystatus'],
           "ticketsbypriority" => $mod_strings['ticketsbypriority'],
+	  "ticketsbycategory" => $mod_strings['ticketsbycategory'],
+	  "ticketsbyowner" => $mod_strings['ticketsbyowner'],
           );
 function get_graph_by_type($graph_by,$graph_title,$module,$where,$query)
 {
@@ -532,6 +534,26 @@
                             $query=$helpdesk_query;
                             echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
                     }
+		    //Tickets by Category
+		    elseif (($type == "ticketsbycategory") && (getFieldVisibilityPermission('HelpDesk',$user_id,'ticketcategory') == "0"))
+		    {
+			    $graph_by="category";
+			    $graph_title=$mod_strings['ticketsbycategory'];
+			    $module="HelpDesk";
+			    $where="";
+			    $query=$helpdesk_query;
+			    echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
+		    }
+		    //Tickets by Owner   
+		    elseif (($type == "ticketsbyowner") && (getFieldVisibilityPermission('HelpDesk',$user_id,'ticketowner') == "0"))
+		    {
+			    $graph_by="smownerid";
+			    $graph_title=$mod_strings['ticketsbyowner'];
+			    $module="HelpDesk";
+			    $where="";
+			    $query=$helpdesk_query;
+			    echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
+		    }
 		    else
                     {
                         echo $mod_strings['LBL_NO_PERMISSION_FIELD'];



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 06:05:17 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 13:05:17 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7043 -
	/vtigercrm/trunk/modules/Dashboard/Entity_charts.php
Message-ID: <20060613130517.055F17E8C84@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 13 07:05:14 2006
New Revision: 7043

Log:
changes made to include extra graphs

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 Tue Jun 13 07:05:14 2006
@@ -191,6 +191,12 @@
 				if($graph_for =="accountid")
 				{
 					$name_val=get_account_name($name);
+					if($name_val!="")
+						$name=$name_val;
+				}
+				if($graph_for =="smownerid")
+				{
+					$name_val=get_assigned_user_name($name);
 					if($name_val!="")
 						$name=$name_val;
 				}



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 06:08:02 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 13:08:02 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7044 -
 /vtigercrm/trunk/modules/Dashboard/language/en_us.lang.php
Message-ID: <20060613130803.17C327E8C5A@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 13 07:07:59 2006
New Revision: 7044

Log:
label added to include extra graphs

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

Modified: vtigercrm/trunk/modules/Dashboard/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Dashboard/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Dashboard/language/en_us.lang.php Tue Jun 13 07:07:59 2006
@@ -70,6 +70,8 @@
 "invoicebystatus" => "Invoices by Status",
 "ticketsbystatus" => "Tickets by Status",
 "ticketsbypriority" => "Tickets by Priority",
+"ticketsbycategory" => "Tickets by Category",
+"ticketsbyowner" => "Tickets by Owner",
 
 'LBL_DASHBRD_HOME'=>'Dashboard Home',
 'LBL_HORZ_BAR_CHART'=>'Horizontal Bar Chart',



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 06:35:45 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 13:35:45 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7045 - in
 /vtigercrm/trunk/themes/blue/images: prvPrfBgImgField.jpg
 prvPrfBgImgGlobal.jpg prvPrfBgImgStandard.jpg prvPrfBgImgTab.jpg
 prvPrfBgImgUtils.jpg
Message-ID: <20060613133545.720227E8B74@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 13 07:35:36 2006
New Revision: 7045

Log:
Added images for new UI of Settings - ahmed

Added:
    vtigercrm/trunk/themes/blue/images/prvPrfBgImgField.jpg   (with props)
    vtigercrm/trunk/themes/blue/images/prvPrfBgImgGlobal.jpg   (with props)
    vtigercrm/trunk/themes/blue/images/prvPrfBgImgStandard.jpg   (with props)
    vtigercrm/trunk/themes/blue/images/prvPrfBgImgTab.jpg   (with props)
    vtigercrm/trunk/themes/blue/images/prvPrfBgImgUtils.jpg   (with props)



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 06:55:57 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 13:55:57 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7046 - in
 /vtigercrm/trunk/modules: Leads/Lead.php Products/Product.php
Message-ID: <20060613135557.E5E817E8C8A@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 13 07:55:51 2006
New Revision: 7046

Log:
Removed the combofieldname var from module.php files - ahmed

Modified:
    vtigercrm/trunk/modules/Leads/Lead.php
    vtigercrm/trunk/modules/Products/Product.php

Modified: vtigercrm/trunk/modules/Leads/Lead.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/Lead.php (original)
+++ vtigercrm/trunk/modules/Leads/Lead.php Tue Jun 13 07:55:51 2006
@@ -36,22 +36,12 @@
 
 	var $entity_table = "vtiger_crmentity";
 	var $table_name = "vtiger_leaddetails";
-
 	var $object_name = "Lead";
-
 	var $new_schema = true;
 
 	//construct this from database;	
 	var $column_fields = Array();
-
 	var $sortby_fields = Array('lastname','firstname','email','phone','company','smownerid','website');
-
-	var $combofieldNames = Array('leadsource'=>'leadsource_dom'
-	,'salutation'=>'salutation_dom'
-	,'status'=>'leadstatus_dom'
-	,'industry'=>'industry_dom'
-	,'rating'=>'rating_dom'
-	,'licencekey'=>'licensekey_dom');
 
 	// This is used to retrieve related vtiger_fields from form posts.
 	var $additional_column_fields = Array('smcreatorid', 'smownerid', 'contactid','potentialid' ,'crmid');

Modified: vtigercrm/trunk/modules/Products/Product.php
==============================================================================
--- vtigercrm/trunk/modules/Products/Product.php (original)
+++ vtigercrm/trunk/modules/Products/Product.php Tue Jun 13 07:55:51 2006
@@ -80,9 +80,6 @@
                                         'Unit Price'=>'unit_price'
                                      );
 	
-	var $combofieldNames = Array('manufacturer'=>'manufacturer_dom'
-                      ,'productcategory'=>'productcategory_dom');
-
 	//Added these variables which are used as default order by and sortorder in ListView
 	var $default_order_by = 'productname';
 	var $default_sort_order = 'ASC';



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 07:03:02 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 14:03:02 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7047 -
	/vtigercrm/trunk/modules/Users/Announcements.php
Message-ID: <20060613140302.611B97E8C84@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 13 08:02:58 2006
New Revision: 7047

Log:
Updated the announcement file

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

Modified: vtigercrm/trunk/modules/Users/Announcements.php
==============================================================================
--- vtigercrm/trunk/modules/Users/Announcements.php (original)
+++ vtigercrm/trunk/modules/Users/Announcements.php Tue Jun 13 08:02:58 2006
@@ -9,7 +9,8 @@
  *
  ********************************************************************************/
 
-require_once('XTemplate/xtpl.php');
+require_once('Smarty_setup.php');
+
 global $adb;
 global $current_user;
 global $theme;
@@ -21,6 +22,8 @@
 $title_prev=$adb->query_result($result,0,'title');
 $id=$adb->query_result($result,0,'creatorid');
 
+$smarty = new vtigerCRM_Smarty;
+
 $smarty->assign("ANNOUNCE",$announcement);
 $smarty->assign("MOD", return_module_language($current_language,'Settings'));
 $smarty->assign("IMAGE_PATH",$image_path);



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 07:05:52 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 14:05:52 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7048 -
 /vtigercrm/trunk/Smarty/templates/Settings/Announcements.tpl
Message-ID: <20060613140552.019E67E8C92@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 13 08:05:48 2006
New Revision: 7048

Log:
updated the announcement tpl file - ahmed

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 Tue Jun 13 08:05:48 2006
@@ -1,114 +1,108 @@
-{*<!--
-/*********************************************************************************
-  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
-   * ("License"); You may not use this file except in compliance with the License
-   * The Original Code is:  vtiger CRM Open Source
-   * The Initial Developer of the Original Code is vtiger.
-   * Portions created by vtiger are Copyright (C) vtiger.
-   * All Rights Reserved.
-  *
- ********************************************************************************/
--->*}
-<script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
-{literal}
-<script>
-function Announcement()
-{
-	$("an_busy").style.display="inline";
-	var announcement=$("announcement").value;
-	new Ajax.Request(
-	'index.php',
-        {queue: {position: 'end', scope: 'command'},
-       		method: 'post',
-	        postBody: 'module=Users&action=UsersAjax&announcement='+announcement+'&announce_save=yes',
-	        onComplete: function(response) {
-					$("announcement").innerHTML=response.responseText;
-					$("an_busy").style.display="none";
-                        	}
-	        }
-	);
-}
-</script>
-{/literal}
-<style type="text/css">@import url(themes/blue/style.css);</style>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-<tr>
-	{include file='SettingsMenu.tpl'}
-<td width="75%" valign="top">
-
-<table width="100%" border="0" cellpadding="0" cellspacing="0" height="100%">
-<td class="showPanelBg" valign="top" width="100%" colspan="3" style="padding-left:20px; "><br/>
-<span class="lvtHeaderText"><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS} </a> > {$MOD.LBL_USER_MANAGEMENT} > {$MOD.LBL_ANNOUNCEMENT}</b><div id="an_busy" style="display:none;float:left;position:relative;"><img src="{$IMAGE_PATH}vtbusy.gif" align="right"></div></span>
-<hr noshade="noshade" size="1" />
-</td>
-</tr>
-<tr>
-<td width="75%" style="padding-left:20px;" valign="top">
-
-	<table align="center" border="0" cellpadding="0" cellspacing="0" width="95%">
-	<tbody><tr>
-	<td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif;" height="6" width="7"><img src="{$IMAGE_PATH}top_left.jpg" align="top"></td>
-	<td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif; height: 6px;" bgcolor="#ebebeb"></td>
-	<td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif;" height="6" width="8"><img src="{$IMAGE_PATH}top_right.jpg" align="top" height="6" width="8"></td>
-	</tr>
-	<tr>
-
-	<td bgcolor="#ebebeb" width="7"></td>
-	<td bgcolor="#ececec">
-	<table border="0" cellpadding="5" cellspacing="0" width="100%">
-	<tbody><tr bgcolor="#ffffff">
-	<td width="5%"><img src="include/images/announ.gif" align="absmiddle" hspace="5" vspace="5"></td>
-	<td width="95%">
-	<span class="genHeaderBig">{$MOD.LBL_SETTING_ANNOUNCEMENT}</span><br>
-	{$MOD.LBL_ANNOUNCEMENT_INFO}
-	</td>
-	
-	</tr>
-	<tr><td colspan="2">&nbsp;</td></tr>
-	<tr>
-	<td align="right" valign="top">&nbsp;</td>
-	<td align="left"><b>{$MOD.LBL_SETTING_ANNOUNCEMENT}</b><br>
-	<textarea id="announcement" name="announcement" class="detailedViewTextBox" rows="5">{$ANNOUNCE}</textarea>
-	</td>
-	</tr>	
-
-	<tr>
-	<td align="right" valign="top">&nbsp;</td>
-	<td align="center">
-	<input title="{$APP.LBL_SAVE_BUTTON_LABEL}" value=" &nbsp;{$APP.LBL_SAVE_BUTTON_LABEL}&nbsp; " accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="classBtn" onclick="javascript:Announcement();" type="button">
-	<input title="{$APP.LBL_CANCEL_BUTTON_LABEL}" value=" &nbsp;{$APP.LBL_CANCEL_BUTTON_LABEL}&nbsp; " accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" class="classBtn" onclick="window.history.back()" type="button">
-	</td>
-	</tr>
-	</tbody></table>
-	</td>
-	<td bgcolor="#ebebeb" width="8"></td>
-	
-	</tr>
-	<tr>
-	<td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif;" height="8" width="7"><img src="{$IMAGE_PATH}bottom_left.jpg" align="bottom"></td>
-	<td style="font-size: 1px;" bgcolor="#ececec" height="8"></td>
-	<td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif;" height="8" width="8"><img src="{$IMAGE_PATH}bottom_right.jpg" align="bottom"></td>
-	</tr>
-	</tbody></table>
-
-</td>
-<td width="1%" style="border-right:1px dotted #CCCCCC;">&nbsp;</td>
-</tr>
-</table>
-</td>
-</tr>
-</table>
-</td>
-</tr>
-</table>
-	{include file='SettingsSubMenu.tpl'}
-{literal}
-<script>
-function validate() {
-	if (!emptyCheck("server","ftp Server Name","text")) return false
-		if (!emptyCheck("server_username","ftp User Name","text")) return false
-			return true;
-
-}
-</script>
-{/literal}
+{*<!--
+/*********************************************************************************
+  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
+   * ("License"); You may not use this file except in compliance with the License
+   * The Original Code is:  vtiger CRM Open Source
+   * The Initial Developer of the Original Code is vtiger.
+   * Portions created by vtiger are Copyright (C) vtiger.
+   * All Rights Reserved.
+  *
+ ********************************************************************************/
+-->*}
+
+<script language="JAVASCRIPT" type="text/javascript" src="include/js/smoothscroll.js"></script>
+<script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
+{literal}
+<script>
+function Announcement()
+{
+	$("an_busy").style.display="inline";
+	var announcement=$("announcement").value;
+	new Ajax.Request(
+	'index.php',
+        {queue: {position: 'end', scope: 'command'},
+       		method: 'post',
+	        postBody: 'module=Users&action=UsersAjax&announcement='+announcement+'&announce_save=yes',
+	        onComplete: function(response) {
+					$("announcement").innerHTML=response.responseText;
+					$("an_busy").style.display="none";
+                        	}
+	        }
+	);
+}
+</script>
+{/literal}
+
+<br>
+<table align="center" border="0" cellpadding="0" cellspacing="0" width="98%">
+<tbody><tr>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
+        <td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
+<br>
+	<div align=center>
+	
+			{include file='SetMenu.tpl'}
+				<!-- DISPLAY -->
+				<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
+				<tr>
+					<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}announ.gif" width="48" height="48" border=0></td>
+					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > {$MOD.LBL_ANNOUNCEMENT} </b><div id="an_busy" style="display:none;float:left;position:relative;"><img src="{$IMAGE_PATH}vtbusy.gif" align="right"></div></td>
+				</tr>
+				<tr>
+					<td valign=top class="small">{$MOD.LBL_ANNOUNCEMENT_DESC} </td>
+				</tr>
+				</table>
+				
+				<br>
+				<table border=0 cellspacing=0 cellpadding=10 width=100% >
+				<tr>
+				<td>
+				
+					<table border=0 cellspacing=0 cellpadding=5 width=100% class="tableHeading">
+					<tr>
+						<td class="big"><strong>{$MOD.LBL_ANNOUNCE_TEXT}</strong></td>
+						<td class="small" align=right><input type="button" class="crmButton small save" value="{$MOD.LBL_UPDATE_BUTTON}" onclick="javascript:Announcement();"></td>
+					</tr>
+					</table>
+					
+					<table border=0 cellspacing=0 cellpadding=5 width=100% class="listTable">
+					<tr>
+						<td class="colHeader small" valign=top>{$MOD.LBL_ANNOUNCEMENT_INFO}</td>
+					  </tr>
+					<tr>
+						<td class="listTableRow small" valign=top><textarea class=small width=90% height=100px id="announcement" name="announcement">{$ANNOUNCE}</textarea></td>
+					  </tr>
+					</table>
+					<table border=0 cellspacing=0 cellpadding=5 width=100% >
+					<tr><td class="small" nowrap align=right><a href="#top">{$MOD.LBL_SCROLL}</a></td></tr>
+					</table>
+				</td>
+				</tr>
+				</table>
+			
+			
+			
+			</td>
+			</tr>
+			</table>
+		</td>
+	</tr>
+	</table>
+		
+	</div>
+
+</td>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
+   </tr>
+</tbody>
+</table>
+{literal}
+<script>
+function validate() {
+	if (!emptyCheck("server","ftp Server Name","text")) return false
+		if (!emptyCheck("server_username","ftp User Name","text")) return false
+			return true;
+
+}
+</script>
+{/literal}



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 07:28:02 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 14:28:02 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7049 - in
 /vtigercrm/trunk/modules: Activities/ Campaigns/ Emails/ Faq/ HelpDesk/
 Invoice/ Notes/ PriceBooks/ Products/ PurchaseOrder/ Quotes/ Rss/
 SalesOrder/ Vendors/
Message-ID: <20060613142802.727D47E8C84@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 13 08:27:44 2006
New Revision: 7049

Log:
Removed the junk variables from all module.php - ahmed

Modified:
    vtigercrm/trunk/modules/Activities/Activity.php
    vtigercrm/trunk/modules/Campaigns/Campaign.php
    vtigercrm/trunk/modules/Emails/Email.php
    vtigercrm/trunk/modules/Faq/Faq.php
    vtigercrm/trunk/modules/HelpDesk/HelpDesk.php
    vtigercrm/trunk/modules/Invoice/Invoice.php
    vtigercrm/trunk/modules/Notes/Note.php
    vtigercrm/trunk/modules/PriceBooks/PriceBook.php
    vtigercrm/trunk/modules/Products/Product.php
    vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php
    vtigercrm/trunk/modules/Quotes/Quote.php
    vtigercrm/trunk/modules/Rss/Rss.php
    vtigercrm/trunk/modules/SalesOrder/SalesOrder.php
    vtigercrm/trunk/modules/Vendors/Vendor.php

Modified: vtigercrm/trunk/modules/Activities/Activity.php
==============================================================================
--- vtigercrm/trunk/modules/Activities/Activity.php (original)
+++ vtigercrm/trunk/modules/Activities/Activity.php Tue Jun 13 08:27:44 2006
@@ -32,20 +32,6 @@
 	var $log;
 	var $db;
 
-	// Stored vtiger_fields
-  	var $eventid;
-	var $description;
-	var $firstname;
-	var $lastname;
-	var $setype;
-	var $status;
-	var $date_start;
-	var $time_start;
-	var $priority;
-   	var $sendnotification;
-	var $duration_hours;
-	var $duration_minutes;
-
 	var $table_name = "activity";
 	#var $object_name = "activity";	
 		// Mike Crowe Mod --------------------------------------------------------Renamed to match vtiger_tab
@@ -54,7 +40,6 @@
     var $base_table_name = "activity";
     var $cf_table_name = "";
 	var $module_id = "activityid";
-
 	
 	var $reminder_table = "activity_reminder";
 	

Modified: vtigercrm/trunk/modules/Campaigns/Campaign.php
==============================================================================
--- vtigercrm/trunk/modules/Campaigns/Campaign.php (original)
+++ vtigercrm/trunk/modules/Campaigns/Campaign.php Tue Jun 13 08:27:44 2006
@@ -25,9 +25,6 @@
 	var $log;
 	var $db;
 
-	// Stored vtiger_fields
-	var $id;
-	var $mode;
 
 	var $tab_name = Array('vtiger_crmentity','vtiger_campaign','vtiger_campaignscf');
 	var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_campaign'=>'campaignid','vtiger_campaignscf'=>'campaignid');

Modified: vtigercrm/trunk/modules/Emails/Email.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/Email.php (original)
+++ vtigercrm/trunk/modules/Emails/Email.php Tue Jun 13 08:27:44 2006
@@ -36,14 +36,6 @@
 	var $db;
 
 	// Stored vtiger_fields
-	var $id;
-	var $mode;
-
-	var $emailid;
-	var $description;
-	var $name;
-	var $date_start;
-	var $time_start;
   	var $module_id="emailid";
 
 	var $rel_users_table = "vtiger_salesmanactivityrel";

Modified: vtigercrm/trunk/modules/Faq/Faq.php
==============================================================================
--- vtigercrm/trunk/modules/Faq/Faq.php (original)
+++ vtigercrm/trunk/modules/Faq/Faq.php Tue Jun 13 08:27:44 2006
@@ -33,10 +33,6 @@
 	var $log;
 	var $db;
 
-	// Stored vtiger_fields
-	var $id;
-	var $mode;
-	
 	var $tab_name = Array('vtiger_crmentity','vtiger_faq','vtiger_faqcomments');
 	var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_faq'=>'id','vtiger_faqcomments'=>'faqid');
 				
@@ -65,9 +61,6 @@
 					'Modified Time'=>'modifiedtime' 
 				      );
 	var $list_link_field= 'question';
-
-	var $list_mode;
-        var $popup_type;
 
 	var $search_fields = Array(
 				'Account Name'=>Array('account'=>'accountname'),

Modified: vtigercrm/trunk/modules/HelpDesk/HelpDesk.php
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/HelpDesk.php (original)
+++ vtigercrm/trunk/modules/HelpDesk/HelpDesk.php Tue Jun 13 08:27:44 2006
@@ -23,11 +23,6 @@
 class HelpDesk extends CRMEntity {
 	var $log;
 	var $db;
-
-
-	// Stored vtiger_fields
-	var $id;
-	var $mode;
 
 	var $tab_name = Array('vtiger_crmentity','vtiger_troubletickets','vtiger_seticketsrel','vtiger_ticketcf','vtiger_ticketcomments','vtiger_attachments');
 	var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_troubletickets'=>'ticketid','vtiger_seticketsrel'=>'ticketid','vtiger_ticketcf'=>'ticketid','vtiger_ticketcomments'=>'ticketid','vtiger_attachments'=>'attachmentsid');

Modified: vtigercrm/trunk/modules/Invoice/Invoice.php
==============================================================================
--- vtigercrm/trunk/modules/Invoice/Invoice.php (original)
+++ vtigercrm/trunk/modules/Invoice/Invoice.php Tue Jun 13 08:27:44 2006
@@ -32,12 +32,6 @@
 class Invoice extends CRMEntity {
 	var $log;
 	var $db;
-
-
-	// Stored vtiger_fields
-	var $id;
-	var $mode;
-	
 		
 	var $table_name = "vtiger_invoice";
 	var $tab_name = Array('vtiger_crmentity','vtiger_invoice','vtiger_invoicebillads','vtiger_invoiceshipads','vtiger_invoicecf');
@@ -80,10 +74,6 @@
 				        'Assigned To'=>'assigned_user_id'
 				      );
 	var $list_link_field= 'subject';
-
-	var $record_id;
-	var $list_mode;
-        var $popup_type;
 
 	var $search_fields = Array(
 				'Invoice Id'=>Array('crmentity'=>'crmid'),

Modified: vtigercrm/trunk/modules/Notes/Note.php
==============================================================================
--- vtigercrm/trunk/modules/Notes/Note.php (original)
+++ vtigercrm/trunk/modules/Notes/Note.php Tue Jun 13 08:27:44 2006
@@ -32,22 +32,6 @@
 	var $log;
 	var $db;
 
-	// Stored vtiger_fields
-	var $id;
-        var $mode;
-
-	var $notesid;
-	var $description;
-	var $name;
-	var $filename;
-	var $parent_type;
-	var $parent_id;
-	var $contact_id;
-
-	var $parent_name;
-	var $contact_name;
-	var $contact_phone;
-	var $contact_email;
 	var $required_fields =  array("name"=>1);
 	var $default_note_name_dom = array('Meeting vtiger_notes', 'Reminder');
 

Modified: vtigercrm/trunk/modules/PriceBooks/PriceBook.php
==============================================================================
--- vtigercrm/trunk/modules/PriceBooks/PriceBook.php (original)
+++ vtigercrm/trunk/modules/PriceBooks/PriceBook.php Tue Jun 13 08:27:44 2006
@@ -21,11 +21,6 @@
 	var $log;
 	var $db;
 
-
-	// Stored vtiger_fields
-	var $id;
-	var $mode;
-
 	var $tab_name = Array('vtiger_crmentity','vtiger_pricebook','vtiger_pricebookcf');
 	var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_pricebook'=>'pricebookid','vtiger_pricebookcf'=>'pricebookid');
 	var $column_fields = Array();
@@ -42,10 +37,6 @@
                                         'Active'=>'active'
                                      );
         var $list_link_field= 'bookname';
-
-
-	var $list_mode;
-	var $popup_type;
 
 	var $search_fields = Array(
                                 'Price Book Name'=>Array('pricebook'=>'bookname')

Modified: vtigercrm/trunk/modules/Products/Product.php
==============================================================================
--- vtigercrm/trunk/modules/Products/Product.php (original)
+++ vtigercrm/trunk/modules/Products/Product.php Tue Jun 13 08:27:44 2006
@@ -21,17 +21,6 @@
 	var $log;
 	var $db;
 
-
-	// Stored vtiger_fields
-	var $id;
-	var $mode;
-
-	// These are related
-	var $name;
-	var $vendorid;
-	var $contactname;
-	var $contactid;
-	
 	 // Josh added for importing and exporting -added in patch2
         var $unit_price;
         var $table_name = "products";
@@ -64,10 +53,6 @@
                                         'Unit Price'=>'unit_price'
                                      );
         var $list_link_field= 'productname';
-
-
-	var $list_mode;
-	var $popup_type;
 
 	var $search_fields = Array(
                                 'Product Name'=>Array('products'=>'productname'),

Modified: vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php
==============================================================================
--- vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php (original)
+++ vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php Tue Jun 13 08:27:44 2006
@@ -32,17 +32,10 @@
 class Order extends CRMEntity {
 	var $log;
 	var $db;
-
-
-	// Stored vtiger_fields
-	var $id;
-	var $mode;
-	
 		
 	var $table_name = "purchaseorder";
 	var $tab_name = Array('vtiger_crmentity','vtiger_purchaseorder','vtiger_pobillads','vtiger_poshipads','vtiger_purchaseordercf');
 	var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_purchaseorder'=>'purchaseorderid','vtiger_pobillads'=>'pobilladdressid','vtiger_poshipads'=>'poshipaddressid','vtiger_purchaseordercf'=>'purchaseorderid');
-				
 	
 	var $entity_table = "vtiger_crmentity";
 	
@@ -78,10 +71,6 @@
 				        'Assigned To'=>'assigned_user_id'
 				      );
 	var $list_link_field= 'subject';
-
-	var $record_id;
-	var $list_mode;
-        var $popup_type;
 
 	var $search_fields = Array(
 				'Order Id'=>Array('crmentity'=>'crmid'),

Modified: vtigercrm/trunk/modules/Quotes/Quote.php
==============================================================================
--- vtigercrm/trunk/modules/Quotes/Quote.php (original)
+++ vtigercrm/trunk/modules/Quotes/Quote.php Tue Jun 13 08:27:44 2006
@@ -32,17 +32,10 @@
 class Quote extends CRMEntity {
 	var $log;
 	var $db;
-
-
-	// Stored vtiger_fields
-	var $id;
-	var $mode;
-	
 		
 	var $table_name = "quotes";
 	var $tab_name = Array('vtiger_crmentity','vtiger_quotes','vtiger_quotesbillads','vtiger_quotesshipads','vtiger_quotescf');
 	var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_quotes'=>'quoteid','vtiger_quotesbillads'=>'quotebilladdressid','vtiger_quotesshipads'=>'quoteshipaddressid','vtiger_quotescf'=>'quoteid');
-				
 	
 	var $entity_table = "crmentity";
 	
@@ -82,10 +75,6 @@
 				        'Assigned To'=>'assigned_user_id'
 				      );
 	var $list_link_field= 'subject';
-
-	var $record_id;
-	var $list_mode;
-        var $popup_type;
 
 	var $search_fields = Array(
 				'Quote Id'=>Array('crmentity'=>'crmid'),

Modified: vtigercrm/trunk/modules/Rss/Rss.php
==============================================================================
--- vtigercrm/trunk/modules/Rss/Rss.php (original)
+++ vtigercrm/trunk/modules/Rss/Rss.php Tue Jun 13 08:27:44 2006
@@ -27,12 +27,7 @@
 
 class vtigerRSS extends CRMEntity
 {
-	var $rss;
 	var $rsscache_time = 1200;
-	var $rss_object;
-	var $rss_title;
-	var $rss_link;
-
 	
 	/** Function to get the Rss Feeds from the Given URL 
 	  * This Function accepts the url string as the argument 

Modified: vtigercrm/trunk/modules/SalesOrder/SalesOrder.php
==============================================================================
--- vtigercrm/trunk/modules/SalesOrder/SalesOrder.php (original)
+++ vtigercrm/trunk/modules/SalesOrder/SalesOrder.php Tue Jun 13 08:27:44 2006
@@ -33,16 +33,9 @@
 	var $log;
 	var $db;
 
-
-	// Stored vtiger_fields
-	var $id;
-	var $mode;
-	
-		
 	var $table_name = "salesorder";
 	var $tab_name = Array('vtiger_crmentity','vtiger_salesorder','vtiger_sobillads','vtiger_soshipads','vtiger_salesordercf');
 	var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_salesorder'=>'salesorderid','vtiger_sobillads'=>'sobilladdressid','vtiger_soshipads'=>'soshipaddressid','vtiger_salesordercf'=>'salesorderid');
-				
 	
 	var $entity_table = "crmentity";
 	
@@ -80,10 +73,6 @@
 				        'Assigned To'=>'assigned_user_id'
 				      );
 	var $list_link_field= 'subject';
-
-	var $record_id;
-	var $list_mode;
-        var $popup_type;
 
 	var $search_fields = Array(
 				'Order Id'=>Array('crmentity'=>'crmid'),

Modified: vtigercrm/trunk/modules/Vendors/Vendor.php
==============================================================================
--- vtigercrm/trunk/modules/Vendors/Vendor.php (original)
+++ vtigercrm/trunk/modules/Vendors/Vendor.php Tue Jun 13 08:27:44 2006
@@ -21,11 +21,6 @@
 	var $log;
 	var $db;
 
-
-	// Stored vtiger_fields
-	var $id;
-	var $mode;
-
 	var $tab_name = Array('vtiger_crmentity','vtiger_vendor','vtiger_vendorcf');
 	var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_vendor'=>'vendorid','vtiger_vendorcf'=>'vendorid');
 	var $column_fields = Array();
@@ -46,10 +41,6 @@
                                         'Category'=>'category'
                                      );
         var $list_link_field= 'vendorname';
-
-
-	var $list_mode;
-	var $popup_type;
 
 	var $search_fields = Array(
                                 'Vendor Name'=>Array('vendor'=>'vendorname'),



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 07:59:28 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 14:59:28 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7050 - in /vtigercrm/trunk:
 data/CRMEntity.php index.php install/5createTables.inc.php
 modules/Users/User.php
Message-ID: <20060613145929.5CB9F7E8C98@vtiger.fosslabs.com>

Author: don
Date: Tue Jun 13 08:59:21 2006
New Revision: 7050

Log:
issues in users has been fixed

Modified:
    vtigercrm/trunk/data/CRMEntity.php
    vtigercrm/trunk/index.php
    vtigercrm/trunk/install/5createTables.inc.php
    vtigercrm/trunk/modules/Users/User.php

Modified: vtigercrm/trunk/data/CRMEntity.php
==============================================================================
--- vtigercrm/trunk/data/CRMEntity.php (original)
+++ vtigercrm/trunk/data/CRMEntity.php Tue Jun 13 08:59:21 2006
@@ -26,7 +26,7 @@
 require_once('include/utils/utils.php');
 require_once('include/utils/UserInfoUtil.php');
 
-class CRMEntity extends SugarBean
+class CRMEntity
 {
   /**
    * This method implements a generic insert and update logic for any SugarBean
@@ -526,20 +526,22 @@
 	  if($insertion_mode == 'edit')
 	  {
 		  $update = '';
+		  $tabid= getTabid($module);	
+		  $sql = "select * from vtiger_field where tabid=".$tabid." and tablename='".$table_name."' and displaytype in (1,3)"; 
 	  }
 	  else
 	  {
 		  $column = $this->tab_name_index[$table_name];
-		  if($column == 'id' && $table_name == 'users')
-		  {
-		 	$currentuser_id = $adb->getUniqueID("users");
+		  if($column == 'id' && $table_name == 'vtiger_users')
+		  {
+		 	$currentuser_id = $adb->getUniqueID("vtiger_users");
 			$this->id = $currentuser_id;
 		  }
 		  $value = $this->id;
+	  	  $tabid= getTabid($module);	
+		  $sql = "select * from vtiger_field where tabid=".$tabid." and tablename='".$table_name."' and displaytype in (1,3,4)"; 
 	  }
 
-	  $tabid= getTabid($module);	
-	  $sql = "select * from vtiger_field where tabid=".$tabid." and tablename='".$table_name."' and displaytype in (1,3)"; 
 	  $result = $adb->query($sql);
 	  $noofrows = $adb->num_rows($result);
 	  for($i=0; $i<$noofrows; $i++)

Modified: vtigercrm/trunk/index.php
==============================================================================
--- vtigercrm/trunk/index.php (original)
+++ vtigercrm/trunk/index.php Tue Jun 13 08:59:21 2006
@@ -482,7 +482,7 @@
 	if(isset($_REQUEST['record']) && $_REQUEST['record']!='' && $_REQUEST["module"] != "Webmails") 
         {
                 // Only track a viewing if the record was retrieved.
-                $focus->track_view($current_user->id, $actualModule,$_REQUEST['record']);
+                //$focus->track_view($current_user->id, $actualModule,$_REQUEST['record']);
         }
 
 }	

Modified: vtigercrm/trunk/install/5createTables.inc.php
==============================================================================
--- vtigercrm/trunk/install/5createTables.inc.php (original)
+++ vtigercrm/trunk/install/5createTables.inc.php Tue Jun 13 08:59:21 2006
@@ -89,7 +89,7 @@
 	$admin_email ="admin at administrator.com";
         $user->column_fields["email"] = $admin_email;
 	//to get the role id for standard_user	
-	$role_query = "select roleid from role where rolename='administrator'";
+	$role_query = "select roleid from vtiger_role where rolename='administrator'";
 	$db->database->SetFetchMode(ADODB_FETCH_ASSOC);
 	$role_result = $db->query($role_query);
 	$role_id = $db->query_result($role_result,0,"roleid");
@@ -160,7 +160,7 @@
 else
 	eecho("Tables Successfully created.\n");
 
-foreach ( $modules as $module ) 
+foreach ($modules as $module ) 
 {
 	$focus = new $module();
 	$focus->create_tables();
@@ -178,17 +178,18 @@
 $combo = new PopulateComboValues();
 $combo->create_tables();
 
-create_default_users();
-
-// default report population
-require_once('modules/Reports/PopulateReports.php');
-
-// default customview population
-require_once('modules/CustomView/PopulateCustomView.php');
-
 //Writing tab data in flat file
 create_tab_data_file();
 create_parenttab_data_file();
+
+create_default_users();
+
+// default report population
+require_once('modules/Reports/PopulateReports.php');
+
+// default customview population
+require_once('modules/CustomView/PopulateCustomView.php');
+
 
 // ensure required sequences are created (adodb creates them as needed, but if
 // creation occurs within a transaction we get problems

Modified: vtigercrm/trunk/modules/Users/User.php
==============================================================================
--- vtigercrm/trunk/modules/Users/User.php (original)
+++ vtigercrm/trunk/modules/Users/User.php Tue Jun 13 08:59:21 2006
@@ -87,7 +87,7 @@
 	var $tab_name = Array('vtiger_users','vtiger_attachments','vtiger_user2role');	
 	var $tab_name_index = Array('vtiger_users'=>'id','vtiger_attachments'=>'attachmentsid','vtiger_user2role'=>'userid');
 	var $column_fields = Array();
-	var $table_name = "users";
+	var $table_name = "vtiger_users";
 	var $sortby_fields = Array();		  
 	
     // This is the list of fields that are in the lists.
@@ -201,6 +201,7 @@
 		$encrypted_password = crypt($user_password, $salt);	
 
 		return $encrypted_password;
+
 	}
 	
 	function authenticate_user($password){
@@ -486,9 +487,9 @@
 	  $theme_path="themes/".$theme."/";
 	  $image_path=$theme_path."images/";
 	  if($sorder != '' && $orderby !='')
-	  $list_query = ' SELECT * from users where deleted=0 order by '.$orderby.' '.$sorder;
+	  $list_query = ' SELECT * from vtiger_users where deleted=0 order by '.$orderby.' '.$sorder;
 	  else
-	  $list_query = "SELECT * from users where deleted=0 order by ".$this->default_order_by." ".$this->default_sort_order;
+	  $list_query = "SELECT * from vtiger_users where deleted=0 order by ".$this->default_order_by." ".$this->default_sort_order;
 	  $result =$adb->query($list_query);
 	  $entries_list = array();
 	  $roleinfo = getAllRoleDetails();



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 08:01:02 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 15:01:02 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7051 -
	/vtigercrm/trunk/modules/Dashboard/index.php
Message-ID: <20060613150102.400127E8C98@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 13 09:00:58 2006
New Revision: 7051

Log:
changes made to include extra graphs

Modified:
    vtigercrm/trunk/modules/Dashboard/index.php

Modified: vtigercrm/trunk/modules/Dashboard/index.php
==============================================================================
--- vtigercrm/trunk/modules/Dashboard/index.php (original)
+++ vtigercrm/trunk/modules/Dashboard/index.php Tue Jun 13 09:00:58 2006
@@ -37,8 +37,11 @@
           "leadindustry" => $mod_strings['leadindustry'],
           "salesbyleadsource" => $mod_strings['salesbyleadsource'],
           "salesbyaccount" => $mod_strings['salesbyaccount'],
+	  "salesbyuser" => $mod_strings['salesbyuser'],
+	  "salesbyteam" => $mod_strings['salesbyteam'],
           "accountindustry" => $mod_strings['accountindustry'],
           "productcategory" => $mod_strings['productcategory'],
+	  "productbyqtyinstock" => $mod_strings['productbyqtyinstock'],
           "sobyaccounts" => $mod_strings['sobyaccounts'],
           "sobystatus" => $mod_strings['sobystatus'],
           "pobystatus" => $mod_strings['pobystatus'],
@@ -50,6 +53,7 @@
           "ticketsbypriority" => $mod_strings['ticketsbypriority'],
 	  "ticketsbycategory" => $mod_strings['ticketsbycategory'], 
 	  "ticketsbyowner" => $mod_strings['ticketsbyowner'],
+	  "ticketsbyproduct"=> $mod_strings['ticketsbyproduct'],
           );
           
 $log = LoggerManager::getLogger('dashboard');



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 08:04:32 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 15:04:32 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7052 -
 /vtigercrm/trunk/modules/Users/language/en_us.lang.php
Message-ID: <20060613150432.618CF7E8C9D@vtiger.fosslabs.com>

Author: don
Date: Tue Jun 13 09:04:28 2006
New Revision: 7052

Log:
language strings added

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

Modified: vtigercrm/trunk/modules/Users/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Users/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Users/language/en_us.lang.php Tue Jun 13 09:04:28 2006
@@ -499,8 +499,43 @@
 'LBL_FIELDS_SELECT_DESELECT'=>'Select or De-Select fields to be shown',
 'LBL_ROLE_TO_BE_DELETED'=>'Role to be Deleted',
 'LBL_TRANSFER_USER_ROLE'=>'Transfer Users to Role',
-'LBL_DELETE_ROLE'=>'Delete Role'
-
+'LBL_DELETE_ROLE'=>'Delete Role',
+'LBL_MORE_INFORMATION'=>'More Information',
+'LBL_USERLOGIN_ROLE'=>'User Login & Role',
+
+//Added for 5.0 for all fields
+'Role'=>'Role',
+'Email'=>'Email',
+'Admin'=>'Admin',
+'User Name'=>'User Name',
+'First Name'=>'First Name',
+'Last Name'=>'Last Name',
+'Status'=>'Status',
+'Default Activity View'=>'Default Activity View',
+'Default Lead View'=>'Default Lead View',
+'Currency'=>'Currency',
+'Title'=>'Title',
+'Office Phone'=>'Office Phone',
+'Department'=>'Department',
+'Mobile'=>'Mobile',
+'Reports To'=>'Reports To',
+'Other Phone'=>'Other Phone',
+'Other Email'=>'Other Email',
+'Fax'=>'Fax',
+'Yahoo id'=>'Yahoo id',
+'Home Phone'=>'Home Phone',
+'User Image'=>'User Image',
+'Date Format'=>'Date Format',
+'Tag Cloud'=>'Tag Cloud',
+'Signature'=>'Signature',
+'Notes'=>'Notes',
+'Street Address'=>'Street Address',
+'City'=>'City',
+'State'=>'State',
+'Postal Code'=>'Postal Code',
+'Country'=>'Country',
+'Password'=>'Password',
+'Confirm Password'=>'Confirm Password',
 
 );
 



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 08:10:55 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 15:10:55 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7053 -
 /vtigercrm/trunk/modules/Dashboard/display_charts.php
Message-ID: <20060613151055.98D0E7E8C84@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 13 09:10:52 2006
New Revision: 7053

Log:
changes made to include extra graphs

Modified:
    vtigercrm/trunk/modules/Dashboard/display_charts.php

Modified: vtigercrm/trunk/modules/Dashboard/display_charts.php
==============================================================================
--- vtigercrm/trunk/modules/Dashboard/display_charts.php (original)
+++ vtigercrm/trunk/modules/Dashboard/display_charts.php Tue Jun 13 09:10:52 2006
@@ -76,8 +76,11 @@
           "leadindustry" => $mod_strings['leadindustry'],
           "salesbyleadsource" => $mod_strings['salesbyleadsource'],
           "salesbyaccount" => $mod_strings['salesbyaccount'],
+	  "salesbyuser" => $mod_strings['salesbyuser'],
+	  "salesbyteam" => $mod_strings['salesbyteam'],
           "accountindustry" => $mod_strings['accountindustry'],
           "productcategory" => $mod_strings['productcategory'],
+	  "productbyqtyinstock" => $mod_strings['productbyqtyinstock'],
           "sobyaccounts" => $mod_strings['sobyaccounts'],
           "sobystatus" => $mod_strings['sobystatus'],
           "pobystatus" => $mod_strings['pobystatus'],
@@ -89,6 +92,7 @@
           "ticketsbypriority" => $mod_strings['ticketsbypriority'],
 	  "ticketsbycategory" => $mod_strings['ticketsbycategory'],
 	  "ticketsbyowner" => $mod_strings['ticketsbyowner'],
+	  "ticketsbyproduct"=> $mod_strings['ticketsbyproduct'],
           );
 function get_graph_by_type($graph_by,$graph_title,$module,$where,$query)
 {
@@ -424,6 +428,26 @@
                          $query=$potential_query;
                          echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
                     }
+		    //Sales by User
+		    elseif (($type == "salesbyuser") && (getFieldVisibilityPermission('Potentials',$user_id,'smownerid') == "0"))
+		    {
+			$graph_by="smownerid";
+			$graph_title=$mod_strings['salesbyuser'];
+			$module="Potentials";
+			$where="";
+			$query=$potential_query;
+			echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
+		    }
+		    //Sales by team
+		    elseif (($type == "salesbyteam") && (getFieldVisibilityPermission('Potentials',$user_id,'groupname') == "0"))
+		    {
+			$graph_by="groupname";
+			$graph_title=$mod_strings['salesbyteam'];
+			$module="Potentials";
+			$where="";
+			$query=$potential_query;
+			echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
+		    }
                     //Charts for Account by Industry
                     elseif (($type == "accountindustry") && (getFieldVisibilityPermission('Accounts',$user_id,'industry') == "0"))
                     {
@@ -444,6 +468,17 @@
                             $query=$products_query;
                             echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
                     }
+		    //Charts for Products by Quantity in stock
+		    elseif (($type == "productbyqtyinstock") && (getFieldVisibilityPermission('Products',$user_id,'productqtyinstock') == "0"))
+		    {
+			$graph_by="qtyinstock";
+			    $graph_title=$mod_strings['productbyqtyinstock'];
+			    $module="Products";
+			    $where="";
+			    $query=$products_query;
+			    echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
+		    }
+
                     // Sales Order by Accounts
                     elseif (($type == "sobyaccounts") && (getFieldVisibilityPermission('SalesOrder',$user_id,'account_id') == "0"))
                     {
@@ -554,6 +589,16 @@
 			    $query=$helpdesk_query;
 			    echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
 		    }
+		    //Tickets by Product
+		    elseif (($type == "ticketsbyproduct") && (getFieldVisibilityPermission('HelpDesk',$user_id,'ticketproduct') == "0"))
+		    {
+			    $graph_by="product_id";
+			    $graph_title=$mod_strings['ticketsbyproduct'];
+			    $module="HelpDesk";
+			    $where="";
+			    $query=$helpdesk_query;
+			    echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
+		    }
 		    else
                     {
                         echo $mod_strings['LBL_NO_PERMISSION_FIELD'];



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 08:15:56 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 15:15:56 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7054 -
	/vtigercrm/trunk/modules/Dashboard/Entity_charts.php
Message-ID: <20060613151556.C5C677E8CA5@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 13 09:15:53 2006
New Revision: 7054

Log:
changes made to include extra graphs

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 Tue Jun 13 09:15:53 2006
@@ -199,6 +199,14 @@
 					$name_val=get_assigned_user_name($name);
 					if($name_val!="")
 						$name=$name_val;
+				}
+				if($graph_for =="product_id")
+				{
+					$query = "SELECT productname FROM vtiger_products WHERE productid=".$name;
+					$result = $adb->query($query);
+					$name_val = $adb->query_result($result,0,"productname");
+					if($name_val!="")
+					$name=$name_val;
 				}
 				//Passing name to graph
 				if($mod_name_val!="") $mod_name_val.=",$name";



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 08:21:01 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 15:21:01 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7055 -
 /vtigercrm/trunk/modules/Dashboard/language/en_us.lang.php
Message-ID: <20060613152101.563327E8CAB@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 13 09:20:57 2006
New Revision: 7055

Log:
label added to include extra graphs

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

Modified: vtigercrm/trunk/modules/Dashboard/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Dashboard/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Dashboard/language/en_us.lang.php Tue Jun 13 09:20:57 2006
@@ -59,8 +59,11 @@
 "leadindustry" => "Leads By Industry",
 "salesbyleadsource" => "Sales by LeadSource",
 "salesbyaccount" => "Sales by Accounts",
+"salesbyuser" => "Sales by User",
+"salesbyteam"=>"Sales by Team",
 "accountindustry" => "Account By Industry",
 "productcategory" => "Products by Category",
+"productbyqtyinstock" => "Products by Quantity in stock",
 "sobyaccounts" => "Sales Order by Accounts",
 "sobystatus" => "Sales Order by Status",
 "pobystatus" => "Purchase Order by Status",
@@ -72,6 +75,7 @@
 "ticketsbypriority" => "Tickets by Priority",
 "ticketsbycategory" => "Tickets by Category",
 "ticketsbyowner" => "Tickets by Owner",
+"ticketsbyproduct"=>"Tickets by Product",
 
 'LBL_DASHBRD_HOME'=>'Dashboard Home',
 'LBL_HORZ_BAR_CHART'=>'Horizontal Bar Chart',



From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 13 09:10:00 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 13 Jun 2006 16:10:00 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231271=3A?=
 =?utf-8?q?_Organisation_wont_save_when_containt_=27?=
In-Reply-To: <076.62b916cddc422a4f2f6a8828de68207a@vtiger.fosslabs.com>
References: <076.62b916cddc422a4f2f6a8828de68207a@vtiger.fosslabs.com>
Message-ID: <085.dcf5c62f2bef382f7b7be11b55b002d3@vtiger.fosslabs.com>

#1271: Organisation wont save when containt '
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  allanbush          
      Type:  defect     |      Status:  closed             
  Priority:  major      |   Milestone:  5.0.0              
 Component:  vtigercrm  |     Version:  5.0.0              
Resolution:  fixed      |    Keywords:  organisation, quote
------------------------+---------------------------------------------------
Changes (by allanbush):

  * resolution:  => fixed
  * status:  reopened => closed

Comment:

 (In [7056]) Fixes #1271.  Using the instance quote method from adodb
 instead of the static one as the instance knows the database type and can
 do the correct thing.

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1271>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 09:10:01 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 16:10:01 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7056 - in
 /vtigercrm/branches/4.2: include/database/PearDatabase.php
 modules/Settings/add2db.php
Message-ID: <20060613161001.1AC507E8CB6@vtiger.fosslabs.com>

Author: allanbush
Date: Tue Jun 13 10:09:56 2006
New Revision: 7056

Log:
Fixes #1271.  Using the instance quote method from adodb instead of the static one as the instance knows the database type and can do the correct thing.

Modified:
    vtigercrm/branches/4.2/include/database/PearDatabase.php
    vtigercrm/branches/4.2/modules/Settings/add2db.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 Jun 13 10:09:56 2006
@@ -744,20 +744,8 @@
         }
 }
 
-/* ADODB converted	
 function quote($string){
-	global $dbconfig;
-	if($dbconfig['db_type'] == 'mysql'){
-		$string = mysql_escape_string($string);
-	}else {$string = quoteSmart($string);}
-	}else {$string = $this->database->qstr($string,get_magic_quotes_gpc());}
-	//$string = strtr($string, array('_' => '\_', '%'=>'\%'));
-	return $string;
-}*/
-
-
-function quote($string){
-	return ADOConnection::qstr($string);	
+	return $this->database->qstr($string);	
 }
 
 

Modified: vtigercrm/branches/4.2/modules/Settings/add2db.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Settings/add2db.php (original)
+++ vtigercrm/branches/4.2/modules/Settings/add2db.php Tue Jun 13 10:09:56 2006
@@ -112,7 +112,7 @@
 
 	$sql="SELECT * FROM organizationdetails WHERE organizationame = ".$adb->quote($org_name);
 	$result = $adb->query($sql);
-	$org_name = $adb->query_result($result,0,'organizationame');
+	$org_name = from_html($adb->query_result($result,0,'organizationame'));
 	$org_logo = $adb->query_result($result,0,'logoname'); 
 
 



From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 13 09:18:00 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 13 Jun 2006 16:18:00 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231271=3A?=
 =?utf-8?q?_Organisation_wont_save_when_containt_=27?=
In-Reply-To: <076.62b916cddc422a4f2f6a8828de68207a@vtiger.fosslabs.com>
References: <076.62b916cddc422a4f2f6a8828de68207a@vtiger.fosslabs.com>
Message-ID: <085.b29d7929aae0fa125a785c95707c503a@vtiger.fosslabs.com>

#1271: Organisation wont save when containt '
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  allanbush          
      Type:  defect     |      Status:  closed             
  Priority:  major      |   Milestone:  5.0.0              
 Component:  vtigercrm  |     Version:  5.0.0              
Resolution:  fixed      |    Keywords:  organisation, quote
------------------------+---------------------------------------------------
Comment (by allanbush):

 (In [7057]) Fixes #1271.  Using the instance quote method from adodb
 instead of the static one as the instance knows the database type and can
 do the correct thing.

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1271>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 09:18:00 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 16:18:00 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7057 - in /vtigercrm/trunk:
 include/database/PearDatabase.php modules/Settings/add2db.php
Message-ID: <20060613161801.176A47E8CBA@vtiger.fosslabs.com>

Author: allanbush
Date: Tue Jun 13 10:17:58 2006
New Revision: 7057

Log:
Fixes #1271.  Using the instance quote method from adodb instead of the static one as the instance knows the database type and can do the correct thing.

Modified:
    vtigercrm/trunk/include/database/PearDatabase.php
    vtigercrm/trunk/modules/Settings/add2db.php

Modified: vtigercrm/trunk/include/database/PearDatabase.php
==============================================================================
--- vtigercrm/trunk/include/database/PearDatabase.php (original)
+++ vtigercrm/trunk/include/database/PearDatabase.php Tue Jun 13 10:17:58 2006
@@ -742,20 +742,8 @@
         }
 }
 
-/* ADODB converted	
 function quote($string){
-	global $dbconfig;
-	if($dbconfig['db_type'] == 'mysql'){
-		$string = mysql_escape_string($string);
-	}else {$string = quoteSmart($string);}
-	}else {$string = $this->database->qstr($string,get_magic_quotes_gpc());}
-	//$string = strtr($string, array('_' => '\_', '%'=>'\%'));
-	return $string;
-}*/
-
-
-function quote($string){
-	return ADOConnection::qstr($string);	
+	return $this->database->qstr($string);	
 }
 
 

Modified: vtigercrm/trunk/modules/Settings/add2db.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/add2db.php (original)
+++ vtigercrm/trunk/modules/Settings/add2db.php Tue Jun 13 10:17:58 2006
@@ -101,7 +101,7 @@
 
 		$sql="SELECT * FROM vtiger_organizationdetails WHERE organizationame = ".$adb->quote($org_name);
 		$result = $adb->query($sql);
-		$org_name = $adb->query_result($result,0,'organizationame');
+		$org_name = from_html($adb->query_result($result,0,'organizationame'));
 		$org_logo = $adb->query_result($result,0,'logoname'); 
 
 



From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 13 09:36:31 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 13 Jun 2006 16:36:31 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231283=3A?=
 =?utf-8?q?_Issue_in_Related_List_Sorting?=
In-Reply-To: <076.eb979459170c63c66e73d114d83eb936@vtiger.fosslabs.com>
References: <076.eb979459170c63c66e73d114d83eb936@vtiger.fosslabs.com>
Message-ID: <085.4e81f262300e17a04febc9d035f550fe@vtiger.fosslabs.com>

#1283: Issue in Related List Sorting
------------------------+---------------------------------------------------
  Reporter:  saraj      |       Owner:  saraj               
      Type:  defect     |      Status:  closed              
  Priority:  major      |   Milestone:                      
 Component:  vtigercrm  |     Version:  5.0.0               
Resolution:  fixed      |    Keywords:  sorting related list
------------------------+---------------------------------------------------
Changes (by saraj):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 (In [7058]) Issue in related list sorting fixed. Fixes #1283

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1283>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 09:36:31 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 16:36:31 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7058 - in
 /vtigercrm/trunk/modules: HelpDesk/ Invoice/ Potentials/ PriceBooks/
 Products/ PurchaseOrder/ Quotes/ SalesOrder/
Message-ID: <20060613163632.CBA527E8CBE@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 13 10:36:15 2006
New Revision: 7058

Log:
Issue in related list sorting fixed. Fixes #1283

Modified:
    vtigercrm/trunk/modules/HelpDesk/HelpDesk.php
    vtigercrm/trunk/modules/HelpDesk/ListView.php
    vtigercrm/trunk/modules/Invoice/Invoice.php
    vtigercrm/trunk/modules/Invoice/ListView.php
    vtigercrm/trunk/modules/Potentials/ListView.php
    vtigercrm/trunk/modules/Potentials/Opportunity.php
    vtigercrm/trunk/modules/PriceBooks/ListView.php
    vtigercrm/trunk/modules/PriceBooks/PriceBook.php
    vtigercrm/trunk/modules/Products/ListView.php
    vtigercrm/trunk/modules/Products/Product.php
    vtigercrm/trunk/modules/PurchaseOrder/ListView.php
    vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php
    vtigercrm/trunk/modules/Quotes/ListView.php
    vtigercrm/trunk/modules/Quotes/Quote.php
    vtigercrm/trunk/modules/SalesOrder/ListView.php
    vtigercrm/trunk/modules/SalesOrder/SalesOrder.php

Modified: vtigercrm/trunk/modules/HelpDesk/HelpDesk.php
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/HelpDesk.php (original)
+++ vtigercrm/trunk/modules/HelpDesk/HelpDesk.php Tue Jun 13 10:36:15 2006
@@ -80,6 +80,31 @@
 		$this->column_fields = getColumnFields('HelpDesk');
 		$this->log->debug("Exiting HelpDesk method ...");
 	}
+
+	// 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['HELPDESK_SORT_ORDER'] != '')?($_SESSION['HELPDESK_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['HELPDESK_ORDER_BY'] != '')?($_SESSION['HELPDESK_ORDER_BY']):($this->default_order_by));
+		$log->debug("Exiting getOrderBy method ...");
+		return $order_by;
+	}	
 
 	/**     Function to form the query to get the list of activities
          *      @param  int $id - ticket id

Modified: vtigercrm/trunk/modules/HelpDesk/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/ListView.php (original)
+++ vtigercrm/trunk/modules/HelpDesk/ListView.php Tue Jun 13 10:36:15 2006
@@ -53,15 +53,8 @@
 $url_string = ''; // assigning http url string
 
 //<<<<<<<<<<<<<<<<<<< sorting - stored in session >>>>>>>>>>>>>>>>>>>>
-if($_REQUEST['order_by'] != '')
-	$order_by = $_REQUEST['order_by'];
-else
-	$order_by = (($_SESSION['HELPDESK_ORDER_BY'] != '')?($_SESSION['HELPDESK_ORDER_BY']):($focus->default_order_by));
-
-if($_REQUEST['sorder'] != '')
-	$sorder = $_REQUEST['sorder'];
-else
-	$sorder = (($_SESSION['HELPDESK_SORT_ORDER'] != '')?($_SESSION['HELPDESK_SORT_ORDER']):($focus->default_sort_order));
+$sorder = $focus->getSortOrder();
+$order_by = $focus->getOrderBy();
 
 $_SESSION['HELPDESK_ORDER_BY'] = $order_by;
 $_SESSION['HELPDESK_SORT_ORDER'] = $sorder;

Modified: vtigercrm/trunk/modules/Invoice/Invoice.php
==============================================================================
--- vtigercrm/trunk/modules/Invoice/Invoice.php (original)
+++ vtigercrm/trunk/modules/Invoice/Invoice.php Tue Jun 13 10:36:15 2006
@@ -99,6 +99,31 @@
 		$this->column_fields = getColumnFields('Invoice');
 		$this->log->debug("Exiting Invoice method ...");
 	}
+
+	// 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['INVOICE_SORT_ORDER'] != '')?($_SESSION['INVOICE_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['INVOICE_ORDER_BY'] != '')?($_SESSION['INVOICE_ORDER_BY']):($this->default_order_by));
+		$log->debug("Exiting getOrderBy method ...");
+		return $order_by;
+	}	
 
 	function get_summary_text()
 	{

Modified: vtigercrm/trunk/modules/Invoice/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Invoice/ListView.php (original)
+++ vtigercrm/trunk/modules/Invoice/ListView.php Tue Jun 13 10:36:15 2006
@@ -55,15 +55,8 @@
         $smarty->assign("ERROR","");
 }
 //<<<<<<<<<<<<<<<<<<< sorting - stored in session >>>>>>>>>>>>>>>>>>>>
-if($_REQUEST['order_by'] != '')
-	$order_by = $_REQUEST['order_by'];
-else
-	$order_by = (($_SESSION['INVOICE_ORDER_BY'] != '')?($_SESSION['INVOICE_ORDER_BY']):($focus->default_order_by));
-
-if($_REQUEST['sorder'] != '')
-	$sorder = $_REQUEST['sorder'];
-else
-	$sorder = (($_SESSION['INVOICE_SORT_ORDER'] != '')?($_SESSION['INVOICE_SORT_ORDER']):($focus->default_sort_order));
+$sorder = $focus->getSortOrder();
+$order_by = $focus->getOrderBy();
 
 $_SESSION['INVOICE_ORDER_BY'] = $order_by;
 $_SESSION['INVOICE_SORT_ORDER'] = $sorder;

Modified: vtigercrm/trunk/modules/Potentials/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Potentials/ListView.php (original)
+++ vtigercrm/trunk/modules/Potentials/ListView.php Tue Jun 13 10:36:15 2006
@@ -57,15 +57,8 @@
         $smarty->assign("ERROR","");
 }
 //<<<<<<<<<<<<<<<<<<< sorting - stored in session >>>>>>>>>>>>>>>>>>>>
-if($_REQUEST['order_by'] != '')
-	$order_by = $_REQUEST['order_by'];
-else
-	$order_by = (($_SESSION['POTENTIALS_ORDER_BY'] != '')?($_SESSION['POTENTIALS_ORDER_BY']):($focus->default_order_by));
-
-if($_REQUEST['sorder'] != '')
-	$sorder = $_REQUEST['sorder'];
-else
-	$sorder = (($_SESSION['POTENTIALS_SORT_ORDER'] != '')?($_SESSION['POTENTIALS_SORT_ORDER']):($focus->default_sort_order));
+$sorder = $focus->getSortOrder();
+$order_by = $focus->getOrderBy();
 
 $_SESSION['POTENTIALS_ORDER_BY'] = $order_by;
 $_SESSION['POTENTIALS_SORT_ORDER'] = $sorder;

Modified: vtigercrm/trunk/modules/Potentials/Opportunity.php
==============================================================================
--- vtigercrm/trunk/modules/Potentials/Opportunity.php (original)
+++ vtigercrm/trunk/modules/Potentials/Opportunity.php Tue Jun 13 10:36:15 2006
@@ -102,6 +102,30 @@
 	}
 
 	var $new_schema = true;
+	
+	function getSortOrder()
+	{
+		global $log;
+                $log->debug("Entering getSortOrder() method ...");	
+		if(isset($_REQUEST['sorder'])) 
+			$sorder = $_REQUEST['sorder'];
+		else
+			$sorder = (($_SESSION['POTENTIALS_SORT_ORDER'] != '')?($_SESSION['POTENTIALS_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['POTENTIALS_ORDER_BY'] != '')?($_SESSION['POTENTIALS_ORDER_BY']):($this->default_order_by));
+		$log->debug("Exiting getOrderBy method ...");
+		return $order_by;
+	}	
 
 	function create_list_query($order_by, $where)
 	{

Modified: vtigercrm/trunk/modules/PriceBooks/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/PriceBooks/ListView.php (original)
+++ vtigercrm/trunk/modules/PriceBooks/ListView.php Tue Jun 13 10:36:15 2006
@@ -54,15 +54,8 @@
 if (!isset($where)) $where = "";
 
 //<<<<<<<<<<<<<<<<<<< sorting - stored in session >>>>>>>>>>>>>>>>>>>>
-if($_REQUEST['order_by'] != '')
-	$order_by = $_REQUEST['order_by'];
-else
-	$order_by = (($_SESSION['PRICEBOOK_ORDER_BY'] != '')?($_SESSION['PRICEBOOK_ORDER_BY']):($focus->default_order_by));
-
-if($_REQUEST['sorder'] != '')
-	$sorder = $_REQUEST['sorder'];
-else
-	$sorder = (($_SESSION['PRICEBOOK_SORT_ORDER'] != '')?($_SESSION['PRICEBOOK_SORT_ORDER']):($focus->default_sort_order));
+$sorder = $focus->getSortOrder();
+$order_by = $focus->getOrderBy();
 
 $_SESSION['PRICEBOOK_ORDER_BY'] = $order_by;
 $_SESSION['PRICEBOOK_SORT_ORDER'] = $sorder;

Modified: vtigercrm/trunk/modules/PriceBooks/PriceBook.php
==============================================================================
--- vtigercrm/trunk/modules/PriceBooks/PriceBook.php (original)
+++ vtigercrm/trunk/modules/PriceBooks/PriceBook.php Tue Jun 13 10:36:15 2006
@@ -57,6 +57,31 @@
 		$this->log->debug("Exiting PriceBook method ...");
 	}
 
+	// 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['PRICEBOOK_SORT_ORDER'] != '')?($_SESSION['PRICEBOOK_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['PRICEBOOK_ORDER_BY'] != '')?($_SESSION['PRICEBOOK_ORDER_BY']):($this->default_order_by));
+		$log->debug("Exiting getOrderBy method ...");
+		return $order_by;
+	}	
+
 	function get_pricebook_products($id)
 	{
 		global $log;

Modified: vtigercrm/trunk/modules/Products/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Products/ListView.php (original)
+++ vtigercrm/trunk/modules/Products/ListView.php Tue Jun 13 10:36:15 2006
@@ -59,15 +59,8 @@
 $focus = new Product();
 
 //<<<<<<<<<<<<<<<<<<< sorting - stored in session >>>>>>>>>>>>>>>>>>>>
-if($_REQUEST['order_by'] != '')
-	$order_by = $_REQUEST['order_by'];
-else
-	$order_by = (($_SESSION['PRODUCTS_ORDER_BY'] != '')?($_SESSION['PRODUCTS_ORDER_BY']):($focus->default_order_by));
-
-if($_REQUEST['sorder'] != '')
-	$sorder = $_REQUEST['sorder'];
-else
-	$sorder = (($_SESSION['PRODUCTS_SORT_ORDER'] != '')?($_SESSION['PRODUCTS_SORT_ORDER']):($focus->default_sort_order));
+$sorder = $focus->getSortOrder();
+$order_by = $focus->getOrderBy();
 
 $_SESSION['PRODUCTS_ORDER_BY'] = $order_by;
 $_SESSION['PRODUCTS_SORT_ORDER'] = $sorder;

Modified: vtigercrm/trunk/modules/Products/Product.php
==============================================================================
--- vtigercrm/trunk/modules/Products/Product.php (original)
+++ vtigercrm/trunk/modules/Products/Product.php Tue Jun 13 10:36:15 2006
@@ -75,6 +75,32 @@
 		$this->db = new PearDatabase();
 		$this->column_fields = getColumnFields('Products');
 		$this->log->debug("Exiting Product method ...");
+	}
+	
+	function getSortOrder()
+	{
+		global $log;
+		$log->debug("Entering getSortOrder() method ...");
+		if(isset($_REQUEST['sorder']))
+		$sorder = $_REQUEST['sorder'];
+		else
+		$sorder = (($_SESSION['PRODUCTS_SORT_ORDER'] != '')?($_SESSION['PRODUCTS_SORT_ORDER']):($this->defa
+		ult_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['PRODUCTS_ORDER_BY'] != '')?($_SESSION['PRODUCTS_ORDER_BY']):($this->defaul
+		t_order_by));
+		$log->debug("Exiting getOrderBy method ...");
+		return $order_by;
 	}
 
 	function get_attachments($id)

Modified: vtigercrm/trunk/modules/PurchaseOrder/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/PurchaseOrder/ListView.php (original)
+++ vtigercrm/trunk/modules/PurchaseOrder/ListView.php Tue Jun 13 10:36:15 2006
@@ -54,15 +54,8 @@
         $smarty->assign("ERROR","");
 }
 //<<<<<<<<<<<<<<<<<<< sorting - stored in session >>>>>>>>>>>>>>>>>>>>
-if($_REQUEST['order_by'] != '')
-	$order_by = $_REQUEST['order_by'];
-else
-	$order_by = (($_SESSION['PURCHASEORDER_ORDER_BY'] != '')?($_SESSION['PURCHASEORDER_ORDER_BY']):($focus->default_order_by));
-
-if($_REQUEST['sorder'] != '')
-	$sorder = $_REQUEST['sorder'];
-else
-	$sorder = (($_SESSION['PURCHASEORDER_SORT_ORDER'] != '')?($_SESSION['PURCHASEORDER_SORT_ORDER']):($focus->default_sort_order));
+$sorder = $focus->getSortOrder();
+$order_by = $focus->getOrderBy();
 
 $_SESSION['PURCHASEORDER_ORDER_BY'] = $order_by;
 $_SESSION['PURCHASEORDER_SORT_ORDER'] = $sorder;

Modified: vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php
==============================================================================
--- vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php (original)
+++ vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php Tue Jun 13 10:36:15 2006
@@ -98,6 +98,31 @@
 		$this->db = new PearDatabase();
 		$this->column_fields = getColumnFields('PurchaseOrder');
 	}
+
+	// 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['PURCHASEORDER_SORT_ORDER'] != '')?($_SESSION['PURCHASEORDER_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['PURCHASEORDER_ORDER_BY'] != '')?($_SESSION['PURCHASEORDER_ORDER_BY']):($this->default_order_by));
+		$log->debug("Exiting getOrderBy method ...");
+		return $order_by;
+	}	
 
 /** Function to get activities associated with the id
  *  This function accepts the id as arguments and execute the MySQL query using the id

Modified: vtigercrm/trunk/modules/Quotes/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Quotes/ListView.php (original)
+++ vtigercrm/trunk/modules/Quotes/ListView.php Tue Jun 13 10:36:15 2006
@@ -55,15 +55,8 @@
         $smarty->assign("ERROR","");
 }
 //<<<<<<<<<<<<<<<<<<< sorting - stored in session >>>>>>>>>>>>>>>>>>>>
-if($_REQUEST['order_by'] != '')
-	$order_by = $_REQUEST['order_by'];
-else
-	$order_by = (($_SESSION['QUOTES_ORDER_BY'] != '')?($_SESSION['QUOTES_ORDER_BY']):($focus->default_order_by));
-
-if($_REQUEST['sorder'] != '')
-	$sorder = $_REQUEST['sorder'];
-else
-	$sorder = (($_SESSION['QUOTES_SORT_ORDER'] != '')?($_SESSION['QUOTES_SORT_ORDER']):($focus->default_sort_order));
+$sorder = $focus->getSortOrder();
+$order_by = $focus->getOrderBy();
 
 $_SESSION['QUOTES_ORDER_BY'] = $order_by;
 $_SESSION['QUOTES_SORT_ORDER'] = $sorder;

Modified: vtigercrm/trunk/modules/Quotes/Quote.php
==============================================================================
--- vtigercrm/trunk/modules/Quotes/Quote.php (original)
+++ vtigercrm/trunk/modules/Quotes/Quote.php Tue Jun 13 10:36:15 2006
@@ -102,6 +102,32 @@
 		$this->db = new PearDatabase();
 		$this->column_fields = getColumnFields('Quotes');
 	}
+	
+	// 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['QUOTES_SORT_ORDER'] != '')?($_SESSION['QUOTES_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['QUOTES_ORDER_BY'] != '')?($_SESSION['QUOTES_ORDER_BY']):($this->default_order_by));
+		$log->debug("Exiting getOrderBy method ...");
+		return $order_by;
+	}	
+	// Mike Crowe Mod --------------------------------------------------------
 
 	function get_salesorder($id)
 	{

Modified: vtigercrm/trunk/modules/SalesOrder/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/SalesOrder/ListView.php (original)
+++ vtigercrm/trunk/modules/SalesOrder/ListView.php Tue Jun 13 10:36:15 2006
@@ -52,15 +52,8 @@
         $smarty->assign("ERROR","");
 }
 //<<<<<<<<<<<<<<<<<<< sorting - stored in session >>>>>>>>>>>>>>>>>>>>
-if($_REQUEST['order_by'] != '')
-	$order_by = $_REQUEST['order_by'];
-else
-	$order_by = (($_SESSION['SALESORDER_ORDER_BY'] != '')?($_SESSION['SALESORDER_ORDER_BY']):($focus->default_order_by));
-
-if($_REQUEST['sorder'] != '')
-	$sorder = $_REQUEST['sorder'];
-else
-	$sorder = (($_SESSION['SALESORDER_SORT_ORDER'] != '')?($_SESSION['SALESORDER_SORT_ORDER']):($focus->default_sort_order));
+$sorder = $focus->getSortOrder();
+$order_by = $focus->getOrderBy();
 
 $_SESSION['SALESORDER_ORDER_BY'] = $order_by;
 $_SESSION['SALESORDER_SORT_ORDER'] = $sorder;

Modified: vtigercrm/trunk/modules/SalesOrder/SalesOrder.php
==============================================================================
--- vtigercrm/trunk/modules/SalesOrder/SalesOrder.php (original)
+++ vtigercrm/trunk/modules/SalesOrder/SalesOrder.php Tue Jun 13 10:36:15 2006
@@ -104,6 +104,32 @@
 		$this->db = new PearDatabase();
 		$this->column_fields = getColumnFields('SalesOrder');
 	}
+	
+	// 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['SALESORDER_SORT_ORDER'] != '')?($_SESSION['SALESORDER_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['SALESORDER_ORDER_BY'] != '')?($_SESSION['SALESORDER_ORDER_BY']):($this->default_order_by));
+		$log->debug("Exiting getOrderBy method ...");
+		return $order_by;
+	}	
+	// Mike Crowe Mod --------------------------------------------------------
 
 /** Function to get activities associated with the id
  *  This function accepts the id as arguments and execute the MySQL query using the id



From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 13 10:21:58 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 13 Jun 2006 17:21:58 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231116=3A?=
 =?utf-8?q?_FCKeditor=3A_document_version_used=2C_merge_new_versions_as_re?=
 =?utf-8?q?leased?=
In-Reply-To: <076.23b59aa20444402e3e3f439012465746@vtiger.fosslabs.com>
References: <076.23b59aa20444402e3e3f439012465746@vtiger.fosslabs.com>
Message-ID: <085.a323be8f31988eda34f3223b95adb2ea@vtiger.fosslabs.com>

#1116: FCKeditor: document version used, merge new versions as released
------------------------+---------------------------------------------------
  Reporter:  jeffk      |       Owner:  jeffk                    
      Type:  defect     |      Status:  new                      
  Priority:  major      |   Milestone:  5.0.0                    
 Component:  vtigercrm  |     Version:  5.0.0                    
Resolution:             |    Keywords:  editor packaging snapshot
------------------------+---------------------------------------------------
Comment (by jeffk):

 FCKEditor 2.3 has been released. Since we are still in beta (not rc)
 status, I suggest integrating the new release version.

 "FCKeditor 2.3 released: The changes in this release are as follows:
 The "Extreme Fast Loading!" experience is now complete. The editor has
 been deeply tested, and is ready to be integrated into professional
 applications."

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1116>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 13 10:34:06 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 13 Jun 2006 17:34:06 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231300=3A?=
 =?utf-8?q?_Google_Maps_support_by_way_integrating_third-party_Google_Maps?=
 =?utf-8?q?_API_library?=
Message-ID: <076.caa8db848bf4889be2ed2b950d38a6e9@vtiger.fosslabs.com>

#1300: Google Maps support by way integrating third-party Google Maps API library
----------------------------------------------+-----------------------------
 Reporter:  jeffk                             |       Owner:  developer
     Type:  defect                            |      Status:  new      
 Priority:  major                             |   Milestone:  5.0.0    
Component:  vtigercrm                         |     Version:  5.0.0    
 Keywords:  maps google third-party snapshot  |  
----------------------------------------------+-----------------------------
 As discussed on the mailing list, there is a pending feature initiative to
 add Google Maps support to vtigercrm-5.x.

 Since the Google Maps service is a moving target (perpetual 'beta'
 status), it makes sense to choose and integrate a third-party PHP Google
 Maps API library, one which will track new features and API changes
 without any duplicated work on our part.

  * (GoogleMapAPI-2.0) http://www.phpinsider.com/php/code/GoogleMapAPI/
 (actively developed)

  * (Phoogle Maps 2.0) http://www.system7designs.com/codebase  (last
 release Nov 2005)

 Separate tickets will be introduced to suggest vtigercrm-integrated Google
 Maps features, this ticket is only to discuss/select the third-party
 library we should choose.

 As with vtiger's use of other third-party libraries, I'm OK with snapshot
 versions, but we need a standing policy to merge in new releases to our
 local snapshot, except at such times as vtigercrm is very close to final
 release candidate status.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1300>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 13 10:36:55 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 13 Jun 2006 17:36:55 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231287=3A?=
	=?utf-8?q?_Support_PHP_5?=
In-Reply-To: <076.34213a5e5121e9857e7ff28b81783537@vtiger.fosslabs.com>
References: <076.34213a5e5121e9857e7ff28b81783537@vtiger.fosslabs.com>
Message-ID: <085.6c09181a43321d7fd931190f64ea6f63@vtiger.fosslabs.com>

#1287: Support PHP 5
------------------------+---------------------------------------------------
  Reporter:  allanbush  |       Owner:  developer
      Type:  defect     |      Status:  new      
  Priority:  major      |   Milestone:  4.2.5    
 Component:  vtigercrm  |     Version:  4.2.4rc3 
Resolution:             |    Keywords:  php5     
------------------------+---------------------------------------------------
Comment (by jeffk):

 Echoing my mailing-list comment about a possible way to run PHP4 and PHP5
 simultaneously:

 How To Set Up suPHP With PHP4 And PHP5

 http://www.howtoforge.com/book/print/1341

 http://www.suphp.org

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1287>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 13 10:47:09 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 13 Jun 2006 17:47:09 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=2314=3A_T?=
 =?utf-8?q?oo_late_for_unit_testing=2C_consider_functional_testing_with_se?=
 =?utf-8?q?lenium?=
In-Reply-To: <076.80be249f77bed75d5430ff99ca979397@vtiger.fosslabs.com>
References: <076.80be249f77bed75d5430ff99ca979397@vtiger.fosslabs.com>
Message-ID: <085.c1cc8b60eb6b73d2d9ebb664932bfe02@vtiger.fosslabs.com>

#14: Too late for unit testing, consider functional testing with selenium
------------------------+---------------------------------------------------
  Reporter:  jeffk      |       Owner:  developer
      Type:  task       |      Status:  new      
  Priority:  major      |   Milestone:  5.0.0    
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:             |    Keywords:  testing  
------------------------+---------------------------------------------------
Changes (by jeffk):

  * milestone:  => 5.0.0
  * version:  => 5.0.0

Comment:

 The Firefox extension 'Selenium IDE' is a very powerful tool for recording
 Selenium tests.

 http://www.openqa.org/selenium-ide/

 Selenium tests can be recorded by anyone using an ordinary Firefox,
 browser, and attached to trac tickets or simply checked in to the
 repository.

 Selenium test can be run by anyone to report failures or verify success.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/14>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 13 11:08:54 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 13 Jun 2006 18:08:54 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231301=3A?=
	=?utf-8?q?_email_attachments?=
Message-ID: <076.501e7e6107480ab0a6afe33d21a7a29f@vtiger.fosslabs.com>

#1301: email attachments
-------------------------+--------------------------------------------------
 Reporter:  anonymous    |       Owner:  developer
     Type:  enhancement  |      Status:  new      
 Priority:  major        |   Milestone:           
Component:  vtigercrm    |     Version:  5.0.0    
 Keywords:               |  
-------------------------+--------------------------------------------------
 At Beta you can attach one file only at emails. You should be able to
 attach multiple files.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1301>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 13 11:14:16 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 13 Jun 2006 18:14:16 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231302=3A?=
 =?utf-8?q?_Update_to_new_adodb-4=2E90_release?=
Message-ID: <076.cfae0e78298741dfce9c6a4f41a70218@vtiger.fosslabs.com>

#1302: Update to new adodb-4.90 release
------------------------------------+---------------------------------------
 Reporter:  jeffk                   |       Owner:  jeffk
     Type:  defect                  |      Status:  new  
 Priority:  major                   |   Milestone:  5.0.0
Component:  vtigercrm               |     Version:  5.0.0
 Keywords:  adodb database package  |  
------------------------------------+---------------------------------------
 There is a new release of adodb-4.90. The changelog seems to have several
 useful features and fixes.

 http://phplens.com/lens/adodb/docs-adodb.htm#4.90

  * Changed adodb_countrec() in adodb-lib.inc.php to allow LIMIT to be used
 as a speedup to reduce no of records counted.

  * Added support for transaction modes for postgres and oci8 with
 SetTransactionMode(). These transaction modes affect all subsequent
 transactions of that connection. Thanks to Halmai Csongor for suggestion.

  * Removed $off = $fieldOffset - 1 line in db2 driver, FetchField(). Tx
 Larry Menard.

  * Added support for PHP5 objects as Execute() bind parameters using
 __toString (eg. Simple-XML). Thx Carl-Christian Salvesen.

  * Rounding in tohtml.inc.php did not work properly. Fixed.

  * MetaIndexes in postgres fails when fields are deleted then added in
 again because the attnum has gaps in it. See
 http://sourceforge.net/tracker/index.php?func=detail&aid=1451245&group_id=42718&atid=433976.
 Fixed.

  * MetaForeignkeys in mysql and mysqli did not work when
 fetchMode==ADODB_FETCH_ASSOC used. Fixed.

  * Reference error in AutoExecute() fixed.

  * Added macaddr postgres type to MetaType. Maps to 'C'.

  * Added to _connect() in adodb-ado5.inc.php support for $database and
 $dataProvider parameters. Thx Larry Menard.

  * Added support for sequences in adodb-ado_mssql.inc.php. Thx Larry
 Menard.

  * Added ADODB_SESSION_READONLY.

  * Added session expiryref support to crc32 mode, and in LOB code.

  * Clear _errorMsg in postgres7 driver, so that ErrorMsg() displays
 properly when no error occurs.

  * Added BindDate and BindTimeStamp

 I would like to update the snapshotted adodb in
 source:vtigercrm/trunk/adodb and source:vtigercrm/branches/4.2/adodb to be
 zero-diff with the release files of adodb-4.91.

 We have had good results with this snapshot update pattern previously.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1302>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 13 17:46:14 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 00:46:14 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231303=3A?=
 =?utf-8?q?_Invoice=2C_Sales_Orders=2C_Quotes?=
Message-ID: <076.3417cd31c74551f10ccb510284b2b2f8@vtiger.fosslabs.com>

#1303: Invoice, Sales Orders, Quotes
---------------------------------------+------------------------------------
 Reporter:  anthony11221               |       Owner:  developer
     Type:  defect                     |      Status:  new      
 Priority:  major                      |   Milestone:  5.0.0    
Component:  vtigercrm                  |     Version:  5.0.0    
 Keywords:  invoice sales order quote  |  
---------------------------------------+------------------------------------
 There isn't any way to delete an item from the list after you have created
 the invoice, sales order or quote.  This would be a necessity if the
 customer decided not to carry out a particular item.

 It doesn't seem possible to add the same product twice.  Although it is
 much appreciated that a warning is displayed that a duplicated product
 exists, it would be possible for someone to order a particular product at
 one price and several more at another price.

 It should also be possible to override the price (perhpas with the right
 access level) while entering the invoice, sales order, or quote.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1303>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 13 17:52:18 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 00:52:18 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231304=3A?=
 =?utf-8?q?_Invoice=2C_Sales_Orders=2C_Quotes?=
Message-ID: <076.169f9e55fd2e82b71a7818aafacbc6fa@vtiger.fosslabs.com>

#1304: Invoice, Sales Orders, Quotes
-------------------------+--------------------------------------------------
 Reporter:  anonymous    |       Owner:  developer
     Type:  enhancement  |      Status:  new      
 Priority:  major        |   Milestone:           
Component:  vtigercrm    |     Version:  5.0.0    
 Keywords:               |  
-------------------------+--------------------------------------------------
 Need an alternative method to entering items in these modules.  I
 understand the requirement to pull the product ID from the database
 tables, however for entering large numbers of invoices, waiting for screen
 updates in the pick list is too slow.  Perhaps being able to hand key in
 the product ID and doing a quick query to see if that ID exists or even
 preloading the products table and doing a string compare to find items
 matching a manually typed in string.  There are several examples of this
 in other areas of vtiger and SugarCRM.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1304>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 20:57:30 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 14 Jun 2006 03:57:30 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7059 -
	/vtigercrm/trunk/modules/Products/Product.php
Message-ID: <20060614035730.97AB77ECF7A@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 13 21:57:26 2006
New Revision: 7059

Log:
line break has been removed at line number 84 and 97

Modified:
    vtigercrm/trunk/modules/Products/Product.php

Modified: vtigercrm/trunk/modules/Products/Product.php
==============================================================================
--- vtigercrm/trunk/modules/Products/Product.php (original)
+++ vtigercrm/trunk/modules/Products/Product.php Tue Jun 13 21:57:26 2006
@@ -84,8 +84,7 @@
 		if(isset($_REQUEST['sorder']))
 		$sorder = $_REQUEST['sorder'];
 		else
-		$sorder = (($_SESSION['PRODUCTS_SORT_ORDER'] != '')?($_SESSION['PRODUCTS_SORT_ORDER']):($this->defa
-		ult_sort_order));
+		$sorder = (($_SESSION['PRODUCTS_SORT_ORDER'] != '')?($_SESSION['PRODUCTS_SORT_ORDER']):($this->default_sort_order));
 		$log->debug("Exiting getSortOrder() method ...");
 		return $sorder;
 	}
@@ -97,8 +96,7 @@
 		if (isset($_REQUEST['order_by']))
 		$order_by = $_REQUEST['order_by'];
 		else
-		$order_by = (($_SESSION['PRODUCTS_ORDER_BY'] != '')?($_SESSION['PRODUCTS_ORDER_BY']):($this->defaul
-		t_order_by));
+		$order_by = (($_SESSION['PRODUCTS_ORDER_BY'] != '')?($_SESSION['PRODUCTS_ORDER_BY']):($this->default_order_by));
 		$log->debug("Exiting getOrderBy method ...");
 		return $order_by;
 	}



From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 13 23:34:18 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 06:34:18 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23236=3A_?=
 =?utf-8?q?Scalability_Isse_in_All_link_in_list_view?=
In-Reply-To: <076.51adff6f3414f5a553ed4c62a54f0d49@vtiger.fosslabs.com>
References: <076.51adff6f3414f5a553ed4c62a54f0d49@vtiger.fosslabs.com>
Message-ID: <085.f868461c11215ffaed2a30e607714de2@vtiger.fosslabs.com>

#236: Scalability Isse in All link in list view
------------------------+---------------------------------------------------
  Reporter:  don        |       Owner:  philip
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  invalid    |    Keywords:        
------------------------+---------------------------------------------------
Changes (by saraj):

  * resolution:  => invalid
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/236>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 00:04:14 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 14 Jun 2006 07:04:14 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7060 -
	/vtigercrm/trunk/modules/Dashboard/index.php
Message-ID: <20060614070414.888947ECF7E@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 14 01:04:06 2006
New Revision: 7060

Log:
changes made to include extra graphs

Modified:
    vtigercrm/trunk/modules/Dashboard/index.php

Modified: vtigercrm/trunk/modules/Dashboard/index.php
==============================================================================
--- vtigercrm/trunk/modules/Dashboard/index.php (original)
+++ vtigercrm/trunk/modules/Dashboard/index.php Wed Jun 14 01:04:06 2006
@@ -42,6 +42,9 @@
           "accountindustry" => $mod_strings['accountindustry'],
           "productcategory" => $mod_strings['productcategory'],
 	  "productbyqtyinstock" => $mod_strings['productbyqtyinstock'],
+	  "productbypo" => $mod_strings['productbypo'],
+	  "productbyquotes" => $mod_strings['productbyquotes'],
+	  "productbyinvoice" => $mod_strings['productbyinvoice'],
           "sobyaccounts" => $mod_strings['sobyaccounts'],
           "sobystatus" => $mod_strings['sobystatus'],
           "pobystatus" => $mod_strings['pobystatus'],



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 00:07:21 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 14 Jun 2006 07:07:21 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7061 -
	/vtigercrm/trunk/modules/Products/Product.php
Message-ID: <20060614070721.997257ECF82@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 14 01:06:35 2006
New Revision: 7061

Log:
added tab space

Modified:
    vtigercrm/trunk/modules/Products/Product.php

Modified: vtigercrm/trunk/modules/Products/Product.php
==============================================================================
--- vtigercrm/trunk/modules/Products/Product.php (original)
+++ vtigercrm/trunk/modules/Products/Product.php Wed Jun 14 01:06:35 2006
@@ -82,9 +82,9 @@
 		global $log;
 		$log->debug("Entering getSortOrder() method ...");
 		if(isset($_REQUEST['sorder']))
-		$sorder = $_REQUEST['sorder'];
+			$sorder = $_REQUEST['sorder'];
 		else
-		$sorder = (($_SESSION['PRODUCTS_SORT_ORDER'] != '')?($_SESSION['PRODUCTS_SORT_ORDER']):($this->default_sort_order));
+			$sorder = (($_SESSION['PRODUCTS_SORT_ORDER'] != '')?($_SESSION['PRODUCTS_SORT_ORDER']):($this->default_sort_order));
 		$log->debug("Exiting getSortOrder() method ...");
 		return $sorder;
 	}
@@ -94,9 +94,9 @@
 		global $log;
 		$log->debug("Entering getOrderBy() method ...");
 		if (isset($_REQUEST['order_by']))
-		$order_by = $_REQUEST['order_by'];
+			$order_by = $_REQUEST['order_by'];
 		else
-		$order_by = (($_SESSION['PRODUCTS_ORDER_BY'] != '')?($_SESSION['PRODUCTS_ORDER_BY']):($this->default_order_by));
+			$order_by = (($_SESSION['PRODUCTS_ORDER_BY'] != '')?($_SESSION['PRODUCTS_ORDER_BY']):($this->default_order_by));
 		$log->debug("Exiting getOrderBy method ...");
 		return $order_by;
 	}



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 00:08:37 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 14 Jun 2006 07:08:37 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7062 -
	/vtigercrm/trunk/modules/Dashboard/Entity_charts.php
Message-ID: <20060614070837.454F47ECF7E@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 14 01:08:32 2006
New Revision: 7062

Log:
changes made to include extra graphs

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 Wed Jun 14 01:08:32 2006
@@ -202,11 +202,35 @@
 				}
 				if($graph_for =="product_id")
 				{
-					$query = "SELECT productname FROM vtiger_products WHERE productid=".$name;
+					$query = "SELECT productname FROM vtiger_products WHERE productid='".$name."'";
 					$result = $adb->query($query);
 					$name_val = $adb->query_result($result,0,"productname");
 					if($name_val!="")
-					$name=$name_val;
+						$name=$name_val;
+				}
+				if($graph_for =="purchaseorderid")
+				{
+					$query = "SELECT subject FROM purchaseorder WHERE purchaseorderid='".$name."'";
+					$result = $adb->query($query);
+					$name_val = $adb->query_result($result,0,"subject");
+					if($name_val!="")
+						$name=$name_val;
+				}
+				if($graph_for =="quoteid")
+				{
+					$query = "SELECT subject FROM quotes WHERE quoteid='".$name."'";
+					$result = $adb->query($query);
+					$name_val = $adb->query_result($result,0,"subject");
+					if($name_val!="")
+						$name=$name_val;
+				}
+				if($graph_for =="invoiceid")
+				{
+					$query = "SELECT subject FROM invoice WHERE invoiceid='".$name."'";
+					$result = $adb->query($query);
+					$name_val = $adb->query_result($result,0,"subject");
+					if($name_val!="")
+						$name=$name_val;
 				}
 				//Passing name to graph
 				if($mod_name_val!="") $mod_name_val.=",$name";



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 00:21:14 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 14 Jun 2006 07:21:14 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7063 -
 /vtigercrm/trunk/modules/Dashboard/display_charts.php
Message-ID: <20060614072115.3CB6B7ECF82@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 14 01:21:06 2006
New Revision: 7063

Log:
changes made to include extra graphs

Modified:
    vtigercrm/trunk/modules/Dashboard/display_charts.php

Modified: vtigercrm/trunk/modules/Dashboard/display_charts.php
==============================================================================
--- vtigercrm/trunk/modules/Dashboard/display_charts.php (original)
+++ vtigercrm/trunk/modules/Dashboard/display_charts.php Wed Jun 14 01:21:06 2006
@@ -43,7 +43,7 @@
 
 
 //Query For Products
-$products_query="select distinct(vtiger_crmentity.crmid),vtiger_crmentity.createdtime,vtiger_products.*, vtiger_productcf.* from vtiger_products inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_products.productid left join vtiger_productcf on vtiger_products.productid = vtiger_productcf.productid left join vtiger_seproductsrel on vtiger_seproductsrel.productid = vtiger_products.productid where vtiger_crmentity.deleted=0 ";
+$products_query="select distinct(vtiger_crmentity.crmid),vtiger_crmentity.createdtime,vtiger_products.*, vtiger_poproductrel.purchaseorderid, vtiger_quotesproductrel.quoteid, vtiger_invoiceproductrel.invoiceid,vtiger_productcf.* from vtiger_products inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_products.productid left join vtiger_poproductrel on vtiger_products.productid = vtiger_poproductrel.productid left join vtiger_quotesproductrel on vtiger_products.productid = vtiger_quotesproductrel.productid left join vtiger_invoiceproductrel on vtiger_products.productid = vtiger_invoiceproductrel.productid left join vtiger_productcf on vtiger_products.productid = vtiger_productcf.productid left join vtiger_seproductsrel on vtiger_seproductsrel.productid = vtiger_products.productid where vtiger_crmentity.deleted=0 ";
 
 //Query for Potential
 $potential_query= "select  vtiger_crmentity.*,vtiger_account.accountname, vtiger_potential.*, vtiger_potentialscf.* from vtiger_potential inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_potential.potentialid inner join vtiger_account on vtiger_potential.accountid = vtiger_account.accountid inner join vtiger_potentialscf on vtiger_potentialscf.potentialid = vtiger_potential.potentialid left join vtiger_potentialgrouprelation on vtiger_potential.potentialid=vtiger_potentialgrouprelation.potentialid left join vtiger_groups on vtiger_groups.groupname=vtiger_potentialgrouprelation.groupname left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_crmentity.deleted=0 ";
@@ -81,6 +81,9 @@
           "accountindustry" => $mod_strings['accountindustry'],
           "productcategory" => $mod_strings['productcategory'],
 	  "productbyqtyinstock" => $mod_strings['productbyqtyinstock'],
+	  "productbypo" => $mod_strings['productbypo'],
+	  "productbyquotes" => $mod_strings['productbyquotes'],
+	  "productbyinvoice" => $mod_strings['productbyinvoice'],
           "sobyaccounts" => $mod_strings['sobyaccounts'],
           "sobystatus" => $mod_strings['sobystatus'],
           "pobystatus" => $mod_strings['pobystatus'],
@@ -478,6 +481,36 @@
 			    $query=$products_query;
 			    echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
 		    }
+		    //Charts for Products by PO
+		    elseif (($type == "productbypo") && (getFieldVisibilityPermission('Products',$user_id,'productpurchaseorder') == "0"))
+		    { 
+			$graph_by="purchaseorderid";
+			    $graph_title=$mod_strings['productbypo'];
+			    $module="Products";
+			    $where="";
+			    $query=$products_query;
+			    echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
+		    }
+		    //Charts for Products by Quotes
+		    elseif (($type == "productbyquotes") && (getFieldVisibilityPermission('Products',$user_id,'productquotes') == "0"))
+		    { 
+                        $graph_by="quoteid";
+   			    $graph_title=$mod_strings['productbyquotes'];
+			    $module="Products";
+			    $where=""; 
+			    $query=$products_query;
+			    echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
+		    }
+		    //Charts for Products by Invoice
+		    elseif (($type == "productbyinvoice") && (getFieldVisibilityPermission('Products',$user_id,'productinvoice') == "0"))
+		    {
+		        $graph_by="invoiceid";
+			    $graph_title=$mod_strings['productbyinvoice'];
+			    $module="Products";
+			    $where="";
+			    $query=$products_query;
+			    echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
+		    }
 
                     // Sales Order by Accounts
                     elseif (($type == "sobyaccounts") && (getFieldVisibilityPermission('SalesOrder',$user_id,'account_id') == "0"))



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 00:22:36 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 14 Jun 2006 07:22:36 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7064 -
	/vtigercrm/trunk/modules/Dashboard/Entity_charts.php
Message-ID: <20060614072236.2D2047ECF82@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 14 01:22:32 2006
New Revision: 7064

Log:
changes made to include extra graphs

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 Wed Jun 14 01:22:32 2006
@@ -210,7 +210,7 @@
 				}
 				if($graph_for =="purchaseorderid")
 				{
-					$query = "SELECT subject FROM purchaseorder WHERE purchaseorderid='".$name."'";
+					$query = "SELECT subject FROM vtiger_purchaseorder WHERE purchaseorderid='".$name."'";
 					$result = $adb->query($query);
 					$name_val = $adb->query_result($result,0,"subject");
 					if($name_val!="")
@@ -218,7 +218,7 @@
 				}
 				if($graph_for =="quoteid")
 				{
-					$query = "SELECT subject FROM quotes WHERE quoteid='".$name."'";
+					$query = "SELECT subject FROM vtiger_quotes WHERE quoteid='".$name."'";
 					$result = $adb->query($query);
 					$name_val = $adb->query_result($result,0,"subject");
 					if($name_val!="")
@@ -226,7 +226,7 @@
 				}
 				if($graph_for =="invoiceid")
 				{
-					$query = "SELECT subject FROM invoice WHERE invoiceid='".$name."'";
+					$query = "SELECT subject FROM vtiger_invoice WHERE invoiceid='".$name."'";
 					$result = $adb->query($query);
 					$name_val = $adb->query_result($result,0,"subject");
 					if($name_val!="")



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 00:25:00 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 14 Jun 2006 07:25:00 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7065 -
 /vtigercrm/trunk/modules/Dashboard/language/en_us.lang.php
Message-ID: <20060614072500.A3B6B7ECF69@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 14 01:24:00 2006
New Revision: 7065

Log:
label added to include extra graphs

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

Modified: vtigercrm/trunk/modules/Dashboard/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Dashboard/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Dashboard/language/en_us.lang.php Wed Jun 14 01:24:00 2006
@@ -64,6 +64,9 @@
 "accountindustry" => "Account By Industry",
 "productcategory" => "Products by Category",
 "productbyqtyinstock" => "Products by Quantity in stock",
+"productbypo" => "Products by PurchaseOrder",
+"productbyquotes" => "Products by Quotes",
+"productbyinvoice" => "Products by Invoice",
 "sobyaccounts" => "Sales Order by Accounts",
 "sobystatus" => "Sales Order by Status",
 "pobystatus" => "Purchase Order by Status",



From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 00:29:55 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 07:29:55 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231284=3A?=
 =?utf-8?q?_Removal_of_commented-out_code_is_helpful?=
In-Reply-To: <076.1f009815df5e22f62e7a2c599acd3ebf@vtiger.fosslabs.com>
References: <076.1f009815df5e22f62e7a2c599acd3ebf@vtiger.fosslabs.com>
Message-ID: <085.b63024db017223e41acd9a49819a8455@vtiger.fosslabs.com>

#1284: Removal of commented-out code is helpful
------------------------+---------------------------------------------------
  Reporter:  jeffk      |       Owner:  developer
      Type:  defect     |      Status:  new      
  Priority:  minor      |   Milestone:  5.0.0    
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:             |    Keywords:           
------------------------+---------------------------------------------------
Comment (by richie):

 Exactly my thoughts. My logic is a little simpler.

 No code, no bugs. Less code, less bugs.
 Moreover, it annoys me no end to see big files.

 Caution: We need to take out all unwanted/junk/unused code totally but
 keep future-feature code in comments if needed.

 I encourage the community to identify junk code and help us in the
 process.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1284>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 00:30:11 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 07:30:11 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231290=3A?=
	=?utf-8?q?_Company_Information?=
In-Reply-To: <076.d72bc388560618f95d42b1de2961a633@vtiger.fosslabs.com>
References: <076.d72bc388560618f95d42b1de2961a633@vtiger.fosslabs.com>
Message-ID: <085.5adc591572d6758e1793bbd0953aba83@vtiger.fosslabs.com>

#1290: Company Information
------------------------+---------------------------------------------------
  Reporter:  daneswood  |       Owner:  jeri               
      Type:  defect     |      Status:  new                
  Priority:  minor      |   Milestone:                     
 Component:  vtigercrm  |     Version:  5.0.0              
Resolution:             |    Keywords:  company information
------------------------+---------------------------------------------------
Changes (by richie):

  * owner:  developer => jeri

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1290>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 00:30:26 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 07:30:26 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231295=3A?=
 =?utf-8?q?_Color_code_items_in_the_shared_calendar_view?=
In-Reply-To: <076.b4a0b4e8d19ce6073a31a3ecfcb23759@vtiger.fosslabs.com>
References: <076.b4a0b4e8d19ce6073a31a3ecfcb23759@vtiger.fosslabs.com>
Message-ID: <085.e50b45687f55f17a6a0650d9487b38bc@vtiger.fosslabs.com>

#1295: Color code items in the shared calendar view
--------------------------+-------------------------------------------------
  Reporter:  anonymous    |       Owner:  minnie  
      Type:  enhancement  |      Status:  new     
  Priority:  minor        |   Milestone:  5.0.0   
 Component:  vtigercrm    |     Version:  5.0.0   
Resolution:               |    Keywords:  calendar
--------------------------+-------------------------------------------------
Changes (by richie):

  * owner:  developer => minnie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1295>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 00:30:40 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 07:30:40 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231259=3A?=
	=?utf-8?q?_i18n_issues_with_Beta?=
In-Reply-To: <076.f7b53125520cc2d8322c4161c2676a8c@vtiger.fosslabs.com>
References: <076.f7b53125520cc2d8322c4161c2676a8c@vtiger.fosslabs.com>
Message-ID: <085.71d54f59ddad8fed51673d1def8ff952@vtiger.fosslabs.com>

#1259: i18n issues with Beta
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  ahmed
      Type:  defect     |      Status:  new  
  Priority:  minor      |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by richie):

  * owner:  developer => ahmed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1259>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 00:31:05 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 07:31:05 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231251=3A?=
 =?utf-8?q?_Chat_not_working=3F=3F?=
In-Reply-To: <076.c47ecc4624fe78215a43eca164a2c051@vtiger.fosslabs.com>
References: <076.c47ecc4624fe78215a43eca164a2c051@vtiger.fosslabs.com>
Message-ID: <085.6b797cdbadd32298cc48551fa4451f2b@vtiger.fosslabs.com>

#1251: Chat not working??
------------------------+---------------------------------------------------
  Reporter:             |       Owner:  richie
      Type:  defect     |      Status:  new   
  Priority:  minor      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * owner:  developer => richie

Comment:

 fixed in the cvs. Ajax.js renamed to vtiger_ajax.js

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1251>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 00:31:28 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 07:31:28 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231015=3A?=
 =?utf-8?q?_Add_select_week_to_calendar_pop-up=2C_navigates_directly_to_we?=
 =?utf-8?q?ek_view_calendar?=
In-Reply-To: <076.7a8ad8915c93d41df220001f2abd43de@vtiger.fosslabs.com>
References: <076.7a8ad8915c93d41df220001f2abd43de@vtiger.fosslabs.com>
Message-ID: <085.1bbbbbda2ab893603d2698e136299399@vtiger.fosslabs.com>

#1015: Add select week to calendar pop-up, navigates directly to week view
calendar
--------------------------+-------------------------------------------------
  Reporter:  jeffk        |       Owner:  minnie  
      Type:  enhancement  |      Status:  new     
  Priority:  minor        |   Milestone:  5.0.0   
 Component:  vtigercrm    |     Version:  5.0.0   
Resolution:               |    Keywords:  calendar
--------------------------+-------------------------------------------------
Changes (by richie):

  * owner:  developer => minnie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1015>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 00:31:36 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 07:31:36 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23951=3A_?=
 =?utf-8?q?Alphabetical_Search_Option_hidden_in_Advanced_Search_mode?=
In-Reply-To: <076.ffa1f6294657a1518192941039b69227@vtiger.fosslabs.com>
References: <076.ffa1f6294657a1518192941039b69227@vtiger.fosslabs.com>
Message-ID: <085.81c4c98985069ade305dee7ac2eade93@vtiger.fosslabs.com>

#951: Alphabetical Search Option hidden in Advanced Search mode
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  philip
      Type:  defect     |      Status:  new   
  Priority:  minor      |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by anonymous):

  * owner:  developer => philip

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/951>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 00:31:53 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 07:31:53 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23949=3A_?=
 =?utf-8?q?Advanced_Search_table_attached_to_List_View?=
In-Reply-To: <076.64fbeb656c1ed239c500613565fa6b30@vtiger.fosslabs.com>
References: <076.64fbeb656c1ed239c500613565fa6b30@vtiger.fosslabs.com>
Message-ID: <085.65a641ded9c0db5cd67c9f9a71449a5d@vtiger.fosslabs.com>

#949: Advanced Search table attached to List View
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  philip
      Type:  defect     |      Status:  new   
  Priority:  minor      |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * owner:  developer => philip

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/949>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 00:32:04 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 07:32:04 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23926=3A_?=
 =?utf-8?q?If_database_fails=2C_installation_script_loses_path_variable?=
In-Reply-To: <076.3dff578d41ed95759b327615c9ea781a@vtiger.fosslabs.com>
References: <076.3dff578d41ed95759b327615c9ea781a@vtiger.fosslabs.com>
Message-ID: <085.a48c067d8e0e22ae9f59258f4c4da205@vtiger.fosslabs.com>

#926: If database fails, installation script loses path variable
------------------------+---------------------------------------------------
  Reporter:  neofis     |       Owner:  jeri        
      Type:  defect     |      Status:  new         
  Priority:  minor      |   Milestone:              
 Component:  vtigercrm  |     Version:  5.0.0       
Resolution:             |    Keywords:  installation
------------------------+---------------------------------------------------
Changes (by richie):

  * owner:  developer => jeri

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/926>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 00:32:15 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 07:32:15 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23925=3A_?=
 =?utf-8?q?User_=26_Access_Mangement_=3E_Users?=
In-Reply-To: <076.985552b2efff10758471252d4d2fc42c@vtiger.fosslabs.com>
References: <076.985552b2efff10758471252d4d2fc42c@vtiger.fosslabs.com>
Message-ID: <085.86f4fd3b9fdd1013b233995c193da0a9@vtiger.fosslabs.com>

#925: User & Access Mangement > Users
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  don  
      Type:  defect     |      Status:  new  
  Priority:  minor      |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by anonymous):

  * owner:  developer => don

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/925>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 00:32:26 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 07:32:26 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23846=3A_?=
 =?utf-8?q?Member_Of_Field_can_be_moved_to_Basic_Information_Tab?=
In-Reply-To: <076.76722003fcd7d8c307a684829482c1f2@vtiger.fosslabs.com>
References: <076.76722003fcd7d8c307a684829482c1f2@vtiger.fosslabs.com>
Message-ID: <085.6cc4e86ed2d7b48d86e9e5a71901f37e@vtiger.fosslabs.com>

#846: Member Of Field can be moved to Basic Information Tab
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  don  
      Type:  defect     |      Status:  new  
  Priority:  minor      |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/846>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 00:32:33 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 07:32:33 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23843=3A_?=
 =?utf-8?q?Settings_=3E_Studio_=3E_Custom_Field_Settings_=3E_New_Custom_Fi?=
 =?utf-8?q?eld_Menu?=
In-Reply-To: <076.36c563ce6b93b6329417988edcf38a5b@vtiger.fosslabs.com>
References: <076.36c563ce6b93b6329417988edcf38a5b@vtiger.fosslabs.com>
Message-ID: <085.c3788204f0f5a0dc10eba54e0604c9ea@vtiger.fosslabs.com>

#843: Settings > Studio > Custom Field Settings > New Custom Field Menu
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  minnie
      Type:  defect     |      Status:  new   
  Priority:  minor      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by anonymous):

  * owner:  developer => minnie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/843>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 00:33:10 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 07:33:10 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=23784=3A_?=
	=?utf-8?q?My_Mail_Server_Details?=
In-Reply-To: <076.040e58efc5cbbc00df7731dcc0dafd9a@vtiger.fosslabs.com>
References: <076.040e58efc5cbbc00df7731dcc0dafd9a@vtiger.fosslabs.com>
Message-ID: <085.8c9a85143e4ea21538b5721e1ca4e13f@vtiger.fosslabs.com>

#784: My Mail Server Details
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  developer
      Type:  defect     |      Status:  closed   
  Priority:  minor      |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:  wontfix    |    Keywords:           
------------------------+---------------------------------------------------
Changes (by richie):

  * resolution:  => wontfix
  * status:  new => closed

Comment:

 This will not be handled as of now.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/784>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 00:33:23 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 07:33:23 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23778=3A_?=
 =?utf-8?q?Update_Home_Page_Block_Order?=
In-Reply-To: <076.1fa487f17244c9f4a65d58c7d48e16d4@vtiger.fosslabs.com>
References: <076.1fa487f17244c9f4a65d58c7d48e16d4@vtiger.fosslabs.com>
Message-ID: <085.b384f1708188701823b6a81a1f71b5e6@vtiger.fosslabs.com>

#778: Update Home Page Block Order
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  don  
      Type:  defect     |      Status:  new  
  Priority:  minor      |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by richie):

  * owner:  developer => don

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/778>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 00:33:35 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 07:33:35 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23770=3A_?=
 =?utf-8?q?More_intellegent_screen_placement_for_Add_Event_Popup?=
In-Reply-To: <076.7225c0eefa273e52db2513ebc3084433@vtiger.fosslabs.com>
References: <076.7225c0eefa273e52db2513ebc3084433@vtiger.fosslabs.com>
Message-ID: <085.04b2c9fb89c7fa894dc865c2204e25c4@vtiger.fosslabs.com>

#770: More intellegent screen placement for Add Event Popup
------------------------------+---------------------------------------------
  Reporter:  brian at awnow.com  |       Owner:  minnie  
      Type:  enhancement      |      Status:  new     
  Priority:  minor            |   Milestone:  5.0.0   
 Component:  vtigercrm        |     Version:  5.0.0   
Resolution:                   |    Keywords:  Calendar
------------------------------+---------------------------------------------
Changes (by richie):

  * owner:  developer => minnie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/770>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 00:33:56 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 07:33:56 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23396=3A_?=
 =?utf-8?q?Unable_to_sort_accounts_in_Contacts_List_View?=
In-Reply-To: <076.458c7d1acc4332636d7a3ab839407613@vtiger.fosslabs.com>
References: <076.458c7d1acc4332636d7a3ab839407613@vtiger.fosslabs.com>
Message-ID: <085.f12f74335c179f659f207dcda36efacd@vtiger.fosslabs.com>

#396: Unable to sort accounts in Contacts List View
------------------------+---------------------------------------------------
  Reporter:  don        |       Owner:  philip
      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 [7066]) Account Name sorting added. Fixes #396

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/396>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 00:33:57 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 14 Jun 2006 07:33:57 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7066 -
	/vtigercrm/trunk/modules/Contacts/Contact.php
Message-ID: <20060614073357.1DE117ECF8E@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 14 01:33:18 2006
New Revision: 7066

Log:
Account Name sorting added. Fixes #396

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 Wed Jun 14 01:33:18 2006
@@ -48,7 +48,7 @@
 
 	var $column_fields = Array();
 	
-	var $sortby_fields = Array('lastname','firstname','title','email','phone','smownerid');
+	var $sortby_fields = Array('lastname','firstname','title','email','phone','smownerid','accountid');
 
 	var $list_link_field= 'lastname';
 



From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 00:53:53 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 07:53:53 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23413=3A_?=
 =?utf-8?q?notes_can_not_shorted_by_Contact_name=2CRelated_to_and_File?=
In-Reply-To: <076.b0a80bc08839a88be787f3bb4694d7e2@vtiger.fosslabs.com>
References: <076.b0a80bc08839a88be787f3bb4694d7e2@vtiger.fosslabs.com>
Message-ID: <085.58b06dd3f28ed88c6d9b95263eb39528@vtiger.fosslabs.com>

#413: notes can not shorted by Contact name,Related to and File
--------------------------------+-------------------------------------------
  Reporter:  minnie at vtiger.com  |       Owner:  philip
      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 [7067]) Few more sorting in listview added. Fixes #413

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/413>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 00:53:54 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 14 Jun 2006 07:53:54 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7067 -
	/vtigercrm/trunk/modules/Notes/Note.php
Message-ID: <20060614075354.8824B7ECF92@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 14 01:53:50 2006
New Revision: 7067

Log:
Few more sorting in listview added. Fixes #413

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

Modified: vtigercrm/trunk/modules/Notes/Note.php
==============================================================================
--- vtigercrm/trunk/modules/Notes/Note.php (original)
+++ vtigercrm/trunk/modules/Notes/Note.php Wed Jun 14 01:53:50 2006
@@ -44,7 +44,7 @@
 
 	var $column_fields = Array();
 
-        var $sortby_fields = Array('title','modifiedtime');		  
+        var $sortby_fields = Array('title','modifiedtime','contact_id','filename');		  
 
 	// This is used to retrieve related vtiger_fields from form posts.
 	var $additional_column_fields = Array('', '', '', '');



From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 01:33:17 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 08:33:17 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231305=3A?=
	=?utf-8?q?_Total_taxes_not_auto?=
Message-ID: <076.952daacfec18eaf8adefbd4e7d778e41@vtiger.fosslabs.com>

#1305: Total taxes not auto
-------------------------------------------------------------------+--------
 Reporter:  abos                                                   |       Owner:  developer
     Type:  defect                                                 |      Status:  new      
 Priority:  minor                                                  |   Milestone:           
Component:  vtigercrm                                              |     Version:  5.0.0    
 Keywords:  quotes, invoices, sales order, so, purchase order, po  |  
-------------------------------------------------------------------+--------
 Hi, the total amount of taxes is not calculed in modules quotes, invoices,
 so,po. If the field Adjustment is not egal to something the grand total is
 NaN.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1305>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 01:40:07 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 08:40:07 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231306=3A?=
 =?utf-8?q?_Missing_fields_in_detailview_for_other_langs?=
Message-ID: <076.9fc5d3aab2b86e9e74117e8341c6ee53@vtiger.fosslabs.com>

#1306: Missing fields in detailview for other langs
------------------------------------+---------------------------------------
 Reporter:  abos                    |       Owner:  developer
     Type:  defect                  |      Status:  new      
 Priority:  minor                   |   Milestone:           
Component:  vtigercrm               |     Version:  5.0.0    
 Keywords:  detailview, tranlation  |  
------------------------------------+---------------------------------------
 Hi, for the detailview, in lot of module (leads is correct) we miss fields
 when using another language than english. See attached files for module
 products and accounts.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1306>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 02:02:20 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 14 Jun 2006 09:02:20 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7068 -
	/vtigercrm/trunk/data/SugarBean.php
Message-ID: <20060614090220.08FDA7ECF9A@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 14 03:01:43 2006
New Revision: 7068

Log:
commented out most of the SugarBean code. If all ok, 
then delete the commented code itself.

Modified:
    vtigercrm/trunk/data/SugarBean.php

Modified: vtigercrm/trunk/data/SugarBean.php
==============================================================================
--- vtigercrm/trunk/data/SugarBean.php (original)
+++ vtigercrm/trunk/data/SugarBean.php Wed Jun 14 03:01:43 2006
@@ -164,7 +164,6 @@
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
  * All Rights Reserved.
  * Contributor(s): ______________________________________..
-     */
 	 function retrieve($id = -1, $encodeThis=true) {
 		if ($id == -1) {
 			$id = $this->id;
@@ -193,11 +192,9 @@
 				$this->$field = $row[$field];
 			}
 		}
-
-		$this->fill_in_additional_detail_fields();
-
 		return $this;
 	}
+     */
 
 	function get_list($order_by = "", $where = "", $row_offset = 0, $limit=-1, $max=-1) {
 		$this->log->debug("get_list:  order_by = '$order_by' and where = '$where' and limit = '$limit'");
@@ -215,12 +212,6 @@
 	 */
 	function get_full_list($order_by = "", $where = "") {
 		$this->log->debug("get_full_list:  order_by = '$order_by' and where = '$where'");
-		$query = $this->create_list_query($order_by, $where);
-		return $this->process_full_list_query($query);
-	}
-
-	function create_list_query($order_by, $where)
-	{
 		$query = "SELECT * FROM $this->table_name ";
 		
 		if($where != "")
@@ -231,7 +222,45 @@
 		if(!empty($order_by))
 			$query .= " ORDER BY $order_by";
 
-		
+		$result =& $this->db->query($query, false);
+
+		if($this->db->getRowCount($result) > 0){
+		
+			// We have some data.
+			while ($row = $this->db->fetchByAssoc($result)) {
+				foreach($this->list_fields as $field)
+				{
+					if (isset($row[$field])) {
+						$this->$field = $row[$field];
+						
+						$this->log->debug("process_full_list: $this->object_name({$row['id']}): ".$field." = ".$this->$field);
+					}
+					else {
+ 	                                                $this->$field = '';   
+					}
+				}
+
+
+				$list[] = clone($this);         //added clone tosupport PHP5
+			}
+		}
+
+		if (isset($list)) return $list;
+		else return null;
+
+	}
+
+	function create_list_query($order_by, $where)
+	{
+		$query = "SELECT * FROM $this->table_name ";
+		
+		if($where != "")
+			$query .= "where ($where) AND deleted=0";
+		else
+			$query .= "where deleted=0";
+
+		if(!empty($order_by))
+			$query .= " ORDER BY $order_by";
 
 		return $query;
 	}
@@ -278,7 +307,6 @@
 					}
 				}
 
-				$this->fill_in_additional_list_fields();
 
 				$list[] = clone($this);   //added clone to support PHP5
 			}
@@ -293,37 +321,6 @@
 		return $response;
 	}
 
-	function process_full_list_query($query)
-	{
-		$this->log->debug("process_full_list_query: query is ".$query);
-		$result =& $this->db->query($query, false);
-		$this->log->debug("process_full_list_query: result is ".$result);
-
-		if($this->db->getRowCount($result) > 0){
-		
-			// We have some data.
-			while ($row = $this->db->fetchByAssoc($result)) {
-				foreach($this->list_fields as $field)
-				{
-					if (isset($row[$field])) {
-						$this->$field = $row[$field];
-						
-						$this->log->debug("process_full_list: $this->object_name({$row['id']}): ".$field." = ".$this->$field);
-					}
-					else {
- 	                                                $this->$field = '';   
-					}
-				}
-
-				$this->fill_in_additional_list_fields();
-
-				$list[] = clone($this);         //added clone tosupport PHP5
-			}
-		}
-
-		if (isset($list)) return $list;
-		else return null;
-	}
 	
 	/**
 	 * Track the viewing of a detail record.  This leverages get_summary_text() which is object specific
@@ -366,7 +363,7 @@
 	{
 	}
 	*/
-	/* This function assigns all of the values into the template for the list view */
+	/* This function assigns all of the values into the template for the list view 
 	function get_list_view_array(){
 		$return_array = Array();
 		
@@ -427,7 +424,6 @@
 				$this->$field = $row[$field];
 			}
 		} 
-		$this->fill_in_additional_detail_fields();
 		return $this;
 	}
 
@@ -447,6 +443,8 @@
 			} 
 		} 
 	}
+
+	*/
 }
 
 



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 02:08:49 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 14 Jun 2006 09:08:49 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7069 -
	/vtigercrm/trunk/database/DatabaseConnection.php
Message-ID: <20060614090850.8C0F77ECF9A@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 14 03:08:43 2006
New Revision: 7069

Log:
unwanted method removed

Modified:
    vtigercrm/trunk/database/DatabaseConnection.php

Modified: vtigercrm/trunk/database/DatabaseConnection.php
==============================================================================
--- vtigercrm/trunk/database/DatabaseConnection.php (original)
+++ vtigercrm/trunk/database/DatabaseConnection.php Wed Jun 14 03:08:43 2006
@@ -18,44 +18,7 @@
  ********************************************************************************/
 
 class DatabaseConnection {
-/*
-	var $connection;
 
-	function connect() {
-		global $dbconfig;
-		global $disable_persistent_connections;
-
-		$this->connection = false;
-		
-		if(!isset($disable_persistent_connections) || $disable_persistent_connections == false)
-		{
-			$this->connection = @mysql_pconnect($dbconfig['db_host_name'], $dbconfig['db_user_name'], 
-				$dbconfig['db_password']);
-				
-		}
-		
-		if($this->connection == false)
-		{
-			// We were unable to connect with pconnect.  Try connect	
-			$this->connection = mysql_connect($dbconfig['db_host_name'], 
-				$dbconfig['db_user_name'], 
-				$dbconfig['db_password']) 
-				or die("Could not connect to server ".$dbconfig['db_host_name']." as ".$dbconfig['db_user_name'].".".mysql_error());
-
-			if($this->connection == false && !isset($disable_persistent_connections) || $disable_persistent_connections == false)
-			{
-				
-				$_SESSION['administrator_error'] = "<B>Severe Performance Degradation: Persistent Database Connections not working.  Please set \$disable_persistent_connections to true in your config.php file</B>";  			
-			}
-
-		}
-			
-		mysql_select_db($dbconfig['db_name'],$this->connection)
-			or die("Could not select database. Reason: ".mysql_error());
-	}
-	function disconnect() {
-		mysql_close($this->connection);
-	}*/
 
 	function println($msg)
 	{
@@ -63,15 +26,7 @@
 	$log1 =& LoggerManager::getLogger('GS');
 	if(is_array($msg))
 	{
-		$log1->info("PearDatabse ->".print_r($msg,true));
-/*		$log1->fatal("PearDatabse ->".$this->getString($msg));
-		foreach ($msg as $str)
-		{
-			if(is_array($str)) 
-				$this->println($str);
-			else
-				$log1->fatal("PearDatabase ->".$str);
-		}*/		
+			$log1->fatal("PearDatabse ->".print_r($msg,true));
 	}
 	else
 	{



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 02:12:56 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 14 Jun 2006 09:12:56 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7070 -
	/vtigercrm/trunk/include/utils/export.php
Message-ID: <20060614091256.6F0887ECF93@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 14 03:12:52 2006
New Revision: 7070

Log:
passed an additional variable to the method

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 Wed Jun 14 03:12:52 2006
@@ -40,7 +40,7 @@
 
 if(isset($_SESSION['authenticated_user_id']))
 {
-        $result = $current_user->retrieve($_SESSION['authenticated_user_id']);
+        $result = $current_user->retrieve_entity_info($_SESSION['authenticated_user_id'],"users");
         if($result == null)
         {
 		session_destroy();



From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 03:15:11 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 10:15:11 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231307=3A?=
 =?utf-8?q?_Print_function_missing_in_Beta?=
Message-ID: <076.d87e178fda241c6536574413a592943f@vtiger.fosslabs.com>

#1307: Print function missing in Beta
-----------------------+----------------------------------------------------
 Reporter:  gopal      |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  major      |   Milestone:  5.0.0    
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 Print function is missing in v5 beta. We have to provide this option in
 GA.

 Thanks,
 Gopal

 Reported by: Frank in vtiger discussions.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1307>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 03:39:18 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 14 Jun 2006 10:39:18 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7071 -
	/vtigercrm/trunk/soap/contactserialize.php
Message-ID: <20060614103918.4568A7D7E4F@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 14 04:39:13 2006
New Revision: 7071

Log:
unwanted method removed

Modified:
    vtigercrm/trunk/soap/contactserialize.php

Modified: vtigercrm/trunk/soap/contactserialize.php
==============================================================================
--- vtigercrm/trunk/soap/contactserialize.php (original)
+++ vtigercrm/trunk/soap/contactserialize.php Wed Jun 14 04:39:13 2006
@@ -1330,50 +1330,6 @@
 	return "Success";	
 }
  
-function add_contacts_matching_email_address(&$output_list, $email_address, &$seed_contact)	
-{
-  //global $log;
-	$safe_email_address = addslashes($email_address);
-	
-	$where = "email1 like '$safe_email_address' OR email2 like '$safe_email_address'";
-	$response = $seed_contact->get_list("first_name,last_name,primary_address_city", $where, 0);
-	$contactList = $response['list'];
-	
-	//$log->fatal("Retrieved the list");
-	
-	// create a return array of names and email addresses.
-	foreach($contactList as $contact)
-	{
-		//$log->fatal("Adding another contact to the list: $contact-first_name");
-		$output_list[] = Array("first_name"	=> $contact->first_name,
-			"last_name" => $contact->last_name,
-                        "primary_address_city" => $contact->primary_address_city,
-                        "account_name" => $contact->account_name,
-			"id" => $contact->id,
-                        "email_address" => $contact->email1,
-                       "salutation"=>$contact->salutation,
-                       "title"=>$contact->title,
-                       "phone_mobile"=>$contact->phone_mobile,
-                      "reports_to_id"=>$contact->reports_to_id,
-                      "primary_address_street"=>$contact->primary_address_street,
-                     "primary_address_city"=>$contact->primary_address_city,
-                     "primary_address_state"=>$contact->primary_address_state ,
-                     "primary_address_postalcode"=>$contact->primary_address_postalcode,
-                     "primary_address_country"=>$contact->primary_address_country,
-                     "alt_address_city"=>$contact->alt_address_city,
-                    "alt_address_street"=>$contact->alt_address_street,
-                    "alt_address_city"=>$contact->alt_address_city,
-                   "alt_address_state"=>$contact->alt_address_state,
-                   "alt_address_postalcode"=>$contact->alt_address_postalcode,
-                   "alt_address_country"=>$contact->alt_address_country,
-);
-        }
-          }
-
-
-
-
-
 
 function delete_contact($user_name,$id)
 {
@@ -1393,60 +1349,6 @@
         return "Suceeded in deleting contact";
 }
 
-/*
-function sync_contact($user_name)
-{
-  return "synchronized contact successfully";
-}
-*/
-
-/*
-function contact_by_email($email_address) 
-{ 
-  //global $log;
-  //$this->log->debug("Contact by email called with: $email_address" .$email_address);
-	
-	$seed_contact = new Contact();
-	$output_list = Array();
-
-	$email_address_list = explode("; ", $email_address);
-
-	// remove duplicate email addresses
-	$non_duplicate_email_address_list = Array();
-	foreach( $email_address_list as $single_address)
-	{
-		// Check to see if the current address is a match of an existing address
-		$found_match = false;
-		foreach( $non_duplicate_email_address_list as $non_dupe_single)
-		{
-			if(strtolower($single_address) == $non_dupe_single)
-			{
-				$found_match = true;
-				break;
-			}
-		}	
-		
-		if($found_match == false)
-		{
-			$non_duplicate_email_address_list[] = strtolower($single_address);
-		}	
-	}
-	
-	// now copy over the non-duplicated list as the original list.
-	$email_address_list = &$non_duplicate_email_address_list;
-	
-	foreach( $email_address_list as $single_address)
-	{
-          add_contacts_matching_email_address($output_list, $single_address, $seed_contact);	
-	}
-
-	//to remove an erroneous compiler warning
-	$seed_contact = $seed_contact;
-	
-	//$log->debug("Contact by email returning");
-	return $output_list;
-}  
-*/
 function contact_by_search($name) 
 { 
 //	global $log;
@@ -1543,20 +1445,6 @@
 	return $email->id;
 }
 
-/*
-function sync_task($user_name)
-{
-  return "synchronized task successfully";
-}
-
-*/
-
-/*
-
-    array('user_name'=>'xsd:string', 'first_name'=>'xsd:string', 'last_name'=>'xsd:string', 'email_address'=>'xsd:string','account_name'=>'xsd:string', 'salutation'=>'xsd:string', 'title'=>'xsd:string', 'phone_mobile'=>'xsd:string' , 'reports_to_id'=>'xsd:string', 'primary_address_street'=>'xsd:string', 'primary_address_city'=>'xsd:string', 'primary_address_state'=>'xsd:string' , 'primary_address_postalcode'=>'xsd:string', 'primary_address_country'=>'xsd:string', 'alt_address_city'=>'xsd:string', 'alt_address_street'=>'xsd:string','alt_address_city'=>'xsd:string', 'alt_address_state'=>'xsd:string', 'alt_address_postalcode'=>'xsd:string', 'alt_address_country'=>'xsd:string'),
-
-
-*/
 
 function create_contact($user_name, $first_name, $last_name, $email_address ,$account_name , $salutation , $title, $phone_mobile, $reports_to,$primary_address_street,$primary_address_city,$primary_address_state,$primary_address_postalcode,$primary_address_country,$alt_address_city,$alt_address_street,$alt_address_state,$alt_address_postalcode,$alt_address_country,$office_phone="",$home_phone="",$fax="",$department="",$description="")
 {
@@ -2045,46 +1933,9 @@
 	
 	require_once('modules/Contacts/Contact.php');
 	$contact = new Contact();
-	/*
-        $contact->first_name = $first_name;
-	$contact->last_name = $last_name;
-	$contact->email1 = $email_address;
-        //$contact->account_name = $account_name;
-	$contact->account_id=retrieve_account_id($account_name,$user_id);
-        $contact->salutation = $salutation;
-        $contact->title = $title;
-        $contact->phone_mobile = $phone_mobile;
-        $contact->reports_to_id = retrievereportsto($reports_to,$user_id,$contact->account_id);  
-	$contact->primary_address_city = $primary_address_city;
-        $contact->primary_address_postalcode = $primary_address_postalcode;
-        $contact->primary_address_state = $primary_address_state;
-        $contact->primary_address_street = $primary_address_street;
-   $contact->primary_address_country = $primary_address_country; 
-        $contact->alt_address_country = $alt_address_country;
-        $contact->alt_address_postalcode = $alt_address_postalcode;
-        $contact->alt_address_state = $alt_address_state;
-        $contact->alt_address_street = $alt_address_street;
-
-  $contact->alt_address_city = $alt_address_city;
-
-	$contact->id=$id;
-
-	
-
-	$contact->save();
-	*/
 	
 	$contact->column_fields[firstname]=$first_name;
 	$contact->column_fields['lastname']=$last_name;
-	
-	/*if($account_name=='')
-	{
-		$account_name="Vtiger_Crm";
-	}
-	else if($account_name==null)
-	{
-		$account_name="Vtiger_Crm";
-	}*/
 	
 	$contact->column_fields[account_id]=retrieve_account_id($account_name,$user_id);// NULL value is not supported NEED TO FIX
 	
@@ -2580,10 +2431,6 @@
 }
 
 
-//calendar
-
-//$log->fatal("In soap.php");
-
 /* Begin the HTTP listener service and exit. */ 
 $server->service($HTTP_RAW_POST_DATA); 
 



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 03:46:18 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 14 Jun 2006 10:46:18 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7072 -
	/vtigercrm/trunk/modules/Dashboard/index.php
Message-ID: <20060614104618.AF9017D7E4F@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 14 04:46:14 2006
New Revision: 7072

Log:
changes made to include extra graph

Modified:
    vtigercrm/trunk/modules/Dashboard/index.php

Modified: vtigercrm/trunk/modules/Dashboard/index.php
==============================================================================
--- vtigercrm/trunk/modules/Dashboard/index.php (original)
+++ vtigercrm/trunk/modules/Dashboard/index.php Wed Jun 14 04:46:14 2006
@@ -55,7 +55,8 @@
           "ticketsbystatus" => $mod_strings['ticketsbystatus'],
           "ticketsbypriority" => $mod_strings['ticketsbypriority'],
 	  "ticketsbycategory" => $mod_strings['ticketsbycategory'], 
-	  "ticketsbyowner" => $mod_strings['ticketsbyowner'],
+	  "ticketsbyuser" => $mod_strings['ticketsbyuser'],
+	  "ticketsbyteam" => $mod_strings['ticketsbyteam'],
 	  "ticketsbyproduct"=> $mod_strings['ticketsbyproduct'],
           );
           



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 03:46:23 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 14 Jun 2006 10:46:23 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7073 -
	/vtigercrm/trunk/modules/Leads/ListViewTop.php
Message-ID: <20060614104623.42A337191B2@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 14 04:46:18 2006
New Revision: 7073

Log:
unwanted include removed

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

Modified: vtigercrm/trunk/modules/Leads/ListViewTop.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/ListViewTop.php (original)
+++ vtigercrm/trunk/modules/Leads/ListViewTop.php Wed Jun 14 04:46:18 2006
@@ -24,7 +24,6 @@
 {
 	global $log;
 	$log->debug("Entering getNewLeads() method ...");
-	require_once('XTemplate/xtpl.php');
 	require_once("data/Tracker.php");
 	require_once("include/utils/utils.php");
 



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 03:47:49 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 14 Jun 2006 10:47:49 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7074 -
 /vtigercrm/trunk/modules/Dashboard/language/en_us.lang.php
Message-ID: <20060614104749.440027D7E4F@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 14 04:47:45 2006
New Revision: 7074

Log:
label added to include extra graphs

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

Modified: vtigercrm/trunk/modules/Dashboard/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Dashboard/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Dashboard/language/en_us.lang.php Wed Jun 14 04:47:45 2006
@@ -77,7 +77,8 @@
 "ticketsbystatus" => "Tickets by Status",
 "ticketsbypriority" => "Tickets by Priority",
 "ticketsbycategory" => "Tickets by Category",
-"ticketsbyowner" => "Tickets by Owner",
+"ticketsbyuser"=>"Tickets by User",
+"ticketsbyteam"=>"Tickets by Team",
 "ticketsbyproduct"=>"Tickets by Product",
 
 'LBL_DASHBRD_HOME'=>'Dashboard Home',



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 03:50:05 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 14 Jun 2006 10:50:05 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7075 -
	/vtigercrm/trunk/modules/Activities/Activity.php
Message-ID: <20060614105006.0FD5D7ECFAD@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 14 04:50:01 2006
New Revision: 7075

Log:
unwanted method removed

Modified:
    vtigercrm/trunk/modules/Activities/Activity.php

Modified: vtigercrm/trunk/modules/Activities/Activity.php
==============================================================================
--- vtigercrm/trunk/modules/Activities/Activity.php (original)
+++ vtigercrm/trunk/modules/Activities/Activity.php Wed Jun 14 04:50:01 2006
@@ -149,7 +149,7 @@
 
 			if(isPermitted("Contacts",3,"") == 'yes')
 			{
-				$button .= '<input title="Change" accessKey="" vtiger_tabindex="2" type="button" class="button" value="'.$app_strings['LBL_SELECT_CONTACT_BUTTON_LABEL'].'" name="Button" LANGUAGE=javascript onclick=\'return window.open("index.php?module=Contacts&return_module=Activities&action=Popup&popuptype=detailview&form=EditView&form_submit=false&recordid='.$_REQUEST["record"].'","test","width=600,height=400,resizable=1,scrollbars=1");\'>&nbsp;';
+				$button .= '<input title="Change" accessKey="" tabindex="2" type="button" class="button" value="'.$app_strings['LBL_SELECT_CONTACT_BUTTON_LABEL'].'" name="Button" LANGUAGE=javascript onclick=\'return window.open("index.php?module=Contacts&return_module=Activities&action=Popup&popuptype=detailview&form=EditView&form_submit=false&recordid='.$_REQUEST["record"].'","test","width=600,height=400,resizable=1,scrollbars=1");\'>&nbsp;';
 			}
 			$returnset = '&return_module=Activities&return_action=DetailView&activity_mode=Events&return_id='.$id;
 
@@ -286,7 +286,6 @@
     $query = "select vtiger_crmentity.crmid,vtiger_crmentity.smownerid,vtiger_crmentity.setype, vtiger_activity.*, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid from vtiger_activity inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid= vtiger_cntactivityrel.contactid left join vtiger_seactivityrel on vtiger_seactivityrel.activityid = vtiger_activity.activityid WHERE vtiger_crmentity.deleted=0 ".$criteria;
     $result =& $this->db->query($query);
 	echo $query;
-    $this->log->debug("process_full_list_query: result is ".$result);
         
     if($this->db->getRowCount($result) > 0){
 		
@@ -409,7 +408,7 @@
         return $response;
     }
 		
-	function vtiger_activity_reminder($activity_id,$reminder_time,$reminder_sent=0,$recurid,$remindermode='')
+	function activity_reminder($activity_id,$reminder_time,$reminder_sent=0,$recurid,$remindermode='')
 	{
 		global $log;
 		$log->debug("Entering vtiger_activity_reminder(".$activity_id.",".$reminder_time.",".$reminder_sent.",".$recurid.",".$remindermode.") method ...");



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 03:50:46 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 14 Jun 2006 10:50:46 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7076 -
 /vtigercrm/trunk/modules/Activities/GroupAllocationView.php
Message-ID: <20060614105046.561B97ECFAD@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 14 04:50:42 2006
New Revision: 7076

Log:
unwanted include removed

Modified:
    vtigercrm/trunk/modules/Activities/GroupAllocationView.php

Modified: vtigercrm/trunk/modules/Activities/GroupAllocationView.php
==============================================================================
--- vtigercrm/trunk/modules/Activities/GroupAllocationView.php (original)
+++ vtigercrm/trunk/modules/Activities/GroupAllocationView.php Wed Jun 14 04:50:42 2006
@@ -20,7 +20,6 @@
  * Contributor(s): ______________________________________..
  ********************************************************************************/
 
-require_once('XTemplate/xtpl.php');
 require_once("data/Tracker.php");
 require_once('modules/Activities/Activity.php');
 require_once('themes/'.$theme.'/layout_utils.php');



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 03:51:32 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 14 Jun 2006 10:51:32 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7077 -
	/vtigercrm/trunk/modules/Activities/OpenListView.php
Message-ID: <20060614105132.45E477ECFAD@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 14 04:51:21 2006
New Revision: 7077

Log:
unwanted include removed

Modified:
    vtigercrm/trunk/modules/Activities/OpenListView.php

Modified: vtigercrm/trunk/modules/Activities/OpenListView.php
==============================================================================
--- vtigercrm/trunk/modules/Activities/OpenListView.php (original)
+++ vtigercrm/trunk/modules/Activities/OpenListView.php Wed Jun 14 04:51:21 2006
@@ -24,7 +24,6 @@
 {
 	global $log;
         $log->debug("Entering getPendingActivities() method ...");
-	require_once('XTemplate/xtpl.php');
 	require_once("data/Tracker.php");
 	require_once("include/utils/utils.php");
 
@@ -187,7 +186,6 @@
 		else
 			$activity_type = 'Task';
 
-		//$xtpl->assign("ACTIVITY", $activity_fields);
 
 
 		//Code included for showing Overdue Activities in Upcoming Activities -Jaguar



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 03:59:11 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 14 Jun 2006 10:59:11 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7079 - in
 /vtigercrm/trunk/cron: executecron.sh intimateTaskStatus.bat
Message-ID: <20060614105911.D340A7ECFAD@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 14 04:59:07 2006
New Revision: 7079

Log:
Path changed for intimateTaskStatus

Modified:
    vtigercrm/trunk/cron/executecron.sh
    vtigercrm/trunk/cron/intimateTaskStatus.bat

Modified: vtigercrm/trunk/cron/executecron.sh
==============================================================================
--- vtigercrm/trunk/cron/executecron.sh (original)
+++ vtigercrm/trunk/cron/executecron.sh Wed Jun 14 04:59:07 2006
@@ -1,1 +1,1 @@
-wget http://localhost:APACHEPORT/intimateTaskStatus.php -O intimatelog.txt
+wget http://localhost:APACHEPORT/cron/intimateTaskStatus.php -O intimatelog.txt

Modified: vtigercrm/trunk/cron/intimateTaskStatus.bat
==============================================================================
--- vtigercrm/trunk/cron/intimateTaskStatus.bat (original)
+++ vtigercrm/trunk/cron/intimateTaskStatus.bat Wed Jun 14 04:59:07 2006
@@ -1,3 +1,2 @@
 @echo off
-cd ..\
-..\..\..\php\php.exe intimateTaskStatus.php
+..\..\..\..\php\php.exe intimateTaskStatus.php



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 04:02:00 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 14 Jun 2006 11:02:00 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7080 -
	/vtigercrm/trunk/modules/Reports/SaveReport.php
Message-ID: <20060614110201.112477ECFAD@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 14 05:01:57 2006
New Revision: 7080

Log:
unwanted include removed

Modified:
    vtigercrm/trunk/modules/Reports/SaveReport.php

Modified: vtigercrm/trunk/modules/Reports/SaveReport.php
==============================================================================
--- vtigercrm/trunk/modules/Reports/SaveReport.php (original)
+++ vtigercrm/trunk/modules/Reports/SaveReport.php Wed Jun 14 05:01:57 2006
@@ -8,7 +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');



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 04:04:03 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 14 Jun 2006 11:04:03 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7081 -
 /vtigercrm/trunk/modules/Dashboard/display_charts.php
Message-ID: <20060614110403.62D287ECFB8@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 14 05:03:59 2006
New Revision: 7081

Log:
changes made to include extra graph

Modified:
    vtigercrm/trunk/modules/Dashboard/display_charts.php

Modified: vtigercrm/trunk/modules/Dashboard/display_charts.php
==============================================================================
--- vtigercrm/trunk/modules/Dashboard/display_charts.php (original)
+++ vtigercrm/trunk/modules/Dashboard/display_charts.php Wed Jun 14 05:03:59 2006
@@ -46,7 +46,7 @@
 $products_query="select distinct(vtiger_crmentity.crmid),vtiger_crmentity.createdtime,vtiger_products.*, vtiger_poproductrel.purchaseorderid, vtiger_quotesproductrel.quoteid, vtiger_invoiceproductrel.invoiceid,vtiger_productcf.* from vtiger_products inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_products.productid left join vtiger_poproductrel on vtiger_products.productid = vtiger_poproductrel.productid left join vtiger_quotesproductrel on vtiger_products.productid = vtiger_quotesproductrel.productid left join vtiger_invoiceproductrel on vtiger_products.productid = vtiger_invoiceproductrel.productid left join vtiger_productcf on vtiger_products.productid = vtiger_productcf.productid left join vtiger_seproductsrel on vtiger_seproductsrel.productid = vtiger_products.productid where vtiger_crmentity.deleted=0 ";
 
 //Query for Potential
-$potential_query= "select  vtiger_crmentity.*,vtiger_account.accountname, vtiger_potential.*, vtiger_potentialscf.* from vtiger_potential inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_potential.potentialid inner join vtiger_account on vtiger_potential.accountid = vtiger_account.accountid inner join vtiger_potentialscf on vtiger_potentialscf.potentialid = vtiger_potential.potentialid left join vtiger_potentialgrouprelation on vtiger_potential.potentialid=vtiger_potentialgrouprelation.potentialid left join vtiger_groups on vtiger_groups.groupname=vtiger_potentialgrouprelation.groupname left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_crmentity.deleted=0 ";
+$potential_query= "select  vtiger_crmentity.*,vtiger_account.accountname, vtiger_potential.*, vtiger_potentialscf.*, vtiger_potentialgrouprelation.groupname from vtiger_potential inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_potential.potentialid inner join vtiger_account on vtiger_potential.accountid = vtiger_account.accountid inner join vtiger_potentialscf on vtiger_potentialscf.potentialid = vtiger_potential.potentialid left join vtiger_potentialgrouprelation on vtiger_potential.potentialid=vtiger_potentialgrouprelation.potentialid left join vtiger_groups on vtiger_groups.groupname=vtiger_potentialgrouprelation.groupname left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_crmentity.deleted=0 ";
 
 //Query for Sales Order
 $so_query="select vtiger_crmentity.*,vtiger_salesorder.*,vtiger_account.accountid,vtiger_quotes.quoteid from vtiger_salesorder inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_salesorder.salesorderid inner join vtiger_sobillads on vtiger_salesorder.salesorderid=vtiger_sobillads.sobilladdressid inner join vtiger_soshipads on vtiger_salesorder.salesorderid=vtiger_soshipads.soshipaddressid left join vtiger_salesordercf on vtiger_salesordercf.salesorderid = vtiger_salesorder.salesorderid left outer join vtiger_quotes on vtiger_quotes.quoteid=vtiger_salesorder.quoteid left outer join vtiger_account on vtiger_account.accountid=vtiger_salesorder.accountid left join vtiger_sogrouprelation on vtiger_salesorder.salesorderid=vtiger_sogrouprelation.salesorderid left join vtiger_groups on vtiger_groups.groupname=vtiger_sogrouprelation.groupname left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_crmentity.deleted=0 ";
@@ -63,7 +63,7 @@
 $invoice_query="select vtiger_crmentity.*,vtiger_invoice.* from vtiger_invoice inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_invoice.invoiceid inner join vtiger_invoicebillads on vtiger_invoice.invoiceid=vtiger_invoicebillads.invoicebilladdressid inner join vtiger_invoiceshipads on vtiger_invoice.invoiceid=vtiger_invoiceshipads.invoiceshipaddressid left outer join vtiger_salesorder on vtiger_salesorder.salesorderid=vtiger_invoice.salesorderid inner join vtiger_invoicecf on vtiger_invoice.invoiceid = vtiger_invoicecf.invoiceid left join vtiger_invoicegrouprelation on vtiger_invoice.invoiceid=vtiger_invoicegrouprelation.invoiceid left join vtiger_groups on vtiger_groups.groupname=vtiger_invoicegrouprelation.groupname left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_crmentity.deleted=0 ";
 
 //Query for tickets
-$helpdesk_query=" select vtiger_troubletickets.status AS vtiger_ticketstatus, vtiger_troubletickets.*,vtiger_crmentity.* from vtiger_troubletickets inner join vtiger_ticketcf on vtiger_ticketcf.ticketid = vtiger_troubletickets.ticketid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_troubletickets.ticketid left join vtiger_ticketgrouprelation on vtiger_troubletickets.ticketid=vtiger_ticketgrouprelation.ticketid left join vtiger_groups on vtiger_groups.groupname=vtiger_ticketgrouprelation.groupname left join vtiger_contactdetails on vtiger_troubletickets.parent_id=vtiger_contactdetails.contactid left join vtiger_account on vtiger_account.accountid=vtiger_troubletickets.parent_id left join vtiger_users on vtiger_crmentity.smownerid=vtiger_users.id and vtiger_troubletickets.ticketid = vtiger_ticketcf.ticketid where vtiger_crmentity.deleted=0";
+$helpdesk_query=" select vtiger_troubletickets.status AS ticketstatus, vtiger_ticketgrouprelation.groupname AS ticketgroupname, vtiger_troubletickets.*,vtiger_crmentity.* from vtiger_troubletickets inner join vtiger_ticketcf on vtiger_ticketcf.ticketid = vtiger_troubletickets.ticketid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_troubletickets.ticketid left join vtiger_ticketgrouprelation on vtiger_troubletickets.ticketid=vtiger_ticketgrouprelation.ticketid left join vtiger_groups on vtiger_groups.groupname=vtiger_ticketgrouprelation.groupname left join vtiger_contactdetails on vtiger_troubletickets.parent_id=vtiger_contactdetails.contactid left join vtiger_account on vtiger_account.accountid=vtiger_troubletickets.parent_id left join vtiger_users on vtiger_crmentity.smownerid=vtiger_users.id and vtiger_troubletickets.ticketid = vtiger_ticketcf.ticketid where vtiger_crmentity.deleted=0";
 
  /**  This function returns  the values for the graph, for any type of graph needed	 
         * Portions created by vtiger are Copyright (C) vtiger.
@@ -94,7 +94,8 @@
           "ticketsbystatus" => $mod_strings['ticketsbystatus'],
           "ticketsbypriority" => $mod_strings['ticketsbypriority'],
 	  "ticketsbycategory" => $mod_strings['ticketsbycategory'],
-	  "ticketsbyowner" => $mod_strings['ticketsbyowner'],
+	  "ticketsbyuser" => $mod_strings['ticketsbyuser'],
+	  "ticketsbyteam" => $mod_strings['ticketsbyteam'],
 	  "ticketsbyproduct"=> $mod_strings['ticketsbyproduct'],
           );
 function get_graph_by_type($graph_by,$graph_title,$module,$where,$query)
@@ -437,7 +438,7 @@
 			$graph_by="smownerid";
 			$graph_title=$mod_strings['salesbyuser'];
 			$module="Potentials";
-			$where="";
+			$where=" and (crmentity.smownerid != NULL || crmentity.smownerid != ' ')";
 			$query=$potential_query;
 			echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
 		    }
@@ -447,7 +448,7 @@
 			$graph_by="groupname";
 			$graph_title=$mod_strings['salesbyteam'];
 			$module="Potentials";
-			$where="";
+			$where=" and (potentialgrouprelation.groupname != NULL || potentialgrouprelation.groupname != '')";
 			$query=$potential_query;
 			echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
 		    }
@@ -612,16 +613,26 @@
 			    $query=$helpdesk_query;
 			    echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
 		    }
-		    //Tickets by Owner   
-		    elseif (($type == "ticketsbyowner") && (getFieldVisibilityPermission('HelpDesk',$user_id,'ticketowner') == "0"))
+		    //Tickets by User   
+		    elseif (($type == "ticketsbyuser") && (getFieldVisibilityPermission('HelpDesk',$user_id,'ticketuser') == "0"))
 		    {
 			    $graph_by="smownerid";
 			    $graph_title=$mod_strings['ticketsbyowner'];
 			    $module="HelpDesk";
-			    $where="";
+			    $where=" and (crmentity.smownerid != NULL || crmentity.smownerid != ' ')";
 			    $query=$helpdesk_query;
 			    echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
 		    }
+		    //Tickets by Team
+		    elseif (($type == "ticketsbyteam") && (getFieldVisibilityPermission('HelpDesk',$user_id,'ticketteam') == "0"))
+		    {
+			    $graph_by="ticketgroupname";
+			    $graph_title=$mod_strings['ticketsbyteam'];
+			    $module="HelpDesk";
+			    $where=" and (ticketgrouprelation.groupname != NULL || ticketgrouprelation.groupname != ' ')";
+			    $query=$helpdesk_query;
+			    echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
+		    }    
 		    //Tickets by Product
 		    elseif (($type == "ticketsbyproduct") && (getFieldVisibilityPermission('HelpDesk',$user_id,'ticketproduct') == "0"))
 		    {



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 04:08:43 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 14 Jun 2006 11:08:43 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7082 -
 /vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php
Message-ID: <20060614110843.7E0147ECFB8@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 14 05:08:36 2006
New Revision: 7082

Log:
* Modified to handle the attachments

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 Jun 14 05:08:36 2006
@@ -1568,15 +1568,6 @@
 
 $create_query15 = "create vtiger_table vtiger_portal(portalid int(19), vtiger_portalname varchar(255) NOT NULL, vtiger_portalurl varchar(255) NOT NULL,sequence int(3) NOT NULL, PRIMARY KEY (portalid))";
 Execute($create_query15);
-
-$alter_query_array = Array( 
-				"alter vtiger_table vtiger_attachments drop column vtiger_attachmentsize",
-				"alter vtiger_table vtiger_attachments drop column attachmentcontents"
-			    );
-foreach($alter_query_array as $query)
-{
-	Execute($query);
-}
 
 $alter_query = "ALTER TABLE vtiger_field ADD column info_type varchar(20) default NULL after quickcreatesequence";
 Execute($alter_query);
@@ -2746,7 +2737,7 @@
 				"update vtiger_field set uitype=83, vtiger_tablename='producttaxrel' where vtiger_tabid=14 and vtiger_fieldname='taxclass'",
 				"insert into vtiger_moduleowners values(".$this->localGetTabID('Campaigns').",1)",
 
-				"alter vtiger_table vtiger_attachments add column path varchar(255) default NULL"
+				"alter table vtiger_attachments add column path varchar(255) default NULL"
 			     );
 
 foreach($query_array2 as $query)
@@ -2754,7 +2745,65 @@
 	Execute($query);
 }
 
-			     
+//This code will retrieve all the attachments from db and write it in a file
+$attach_query_result = $conn->query("select vtiger_crmentity.createdtime, vtiger_attachments.* from vtiger_attachments inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_attachments.attachmentsid");
+$noof_attachments = $conn->num_rows($attach_query_result);
+for($attach_count = 0;$attach_count < $noof_attachments ;$attach_count++)
+{
+	$attach_id   = $conn->query_result($attach_query_result,$attach_count,'attachmentsid');
+	$attach_name = $conn->query_result($attach_query_result,$attach_count,'name');
+	$attach_data = $conn->query_result($attach_query_result,$attach_count,'attachmentcontents');
+
+	$created_time = $conn->query_result($attach_query_result,$attach_count,'createdtime');
+	//$filepath = decideFilePath();
+
+	//Added to set the file path where to store the file based on the created time	
+	$date = explode(" ",$created_time);
+	$date_details = explode("-",$date[0]);
+
+	$year = $date_details[0];
+	$month = $date_details[1];
+	$day = $date_details[2];
+	
+	//this is used to convert the month from number to string ie., 03 - March, 04 - April, etc.,
+	$month = date("F", mktime(0, 0, 0, $month, $day, $year));
+
+	$week_no = floor(($day-1)/7)+1;//decide the week ie., 1-7 = week1, 8-14=week2, 15-21=week3, etc.,
+	$week = "week".$week_no;
+
+	$filepath = 'storage/';
+	
+	if(!is_dir($filepath.$year))
+		mkdir($filepath.$year);
+	if(!is_dir($filepath.$year."/".$month))
+		mkdir($filepath."$year/$month");
+	if(!is_dir($filepath.$year."/".$month."/".$week))
+		mkdir($filepath."$year/$month/$week");
+
+	$filepath = $filepath.$year."/".$month."/".$week."/";
+	$conn->println("File Path = $filepath");
+	//upto this added to set the file path based on attachment created time
+
+	//write the contents in the file
+	$handle = @fopen($filepath.$attach_name,'w');
+	fputs($handle, base64_decode($attach_data));
+	fclose($handle);
+
+	//update the path in the db
+	$update_attach = Execute("update vtiger_attachments set path='".$filepath."' where attachmentsid=$attach_id");
+}
+
+//Before drop these fields we had read the contents of the file from db and wrote it in a file.
+$alter_query_array = Array( 
+				"alter table vtiger_attachments drop column attachmentsize",
+				"alter table vtiger_attachments drop column attachmentcontents"
+			    );
+foreach($alter_query_array as $query)
+{
+	Execute($query);
+}
+
+
 //To populate the comboStrings for Campaigns module which are added newly
 require_once('include/ComboStrings.php');
 global $combo_strings;



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 04:09:07 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 14 Jun 2006 11:09:07 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7083 - in
 /vtigercrm/trunk/modules/Users: CreateUserPrivilegeFile.php
 EditDefOrgFieldLevelAccess.php ShowHistory.php TabCustomise.php
 UpdateTab.php
Message-ID: <20060614110907.F20357ECFA5@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 14 05:08:59 2006
New Revision: 7083

Log:
unwanted include removed
passed an additional variable to the method

Modified:
    vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php
    vtigercrm/trunk/modules/Users/EditDefOrgFieldLevelAccess.php
    vtigercrm/trunk/modules/Users/ShowHistory.php
    vtigercrm/trunk/modules/Users/TabCustomise.php
    vtigercrm/trunk/modules/Users/UpdateTab.php

Modified: vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php
==============================================================================
--- vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php (original)
+++ vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php Wed Jun 14 05:08:59 2006
@@ -30,8 +30,7 @@
 		$newbuf .="\n";		
 		$newbuf .= "//This is the access privilege file\n";
 		$user_focus= new User();
-		$user_focus->retrieve_entity_info($userid,'Users');
-		
+		$user_focus->retrieve_entity_info($userid,"Users");
 		$userInfo=Array();
 		$user_focus->column_fields["id"] = '';
 		$user_focus->id = $userid; 
@@ -116,7 +115,7 @@
 		$newbuf .="\n";		
 		$newbuf .= "//This is the sharing access privilege file\n";
 		$user_focus= new User();
-		$user_focus->retrieve_entity_info($userid,'Users');
+		$user_focus->retrieve_entity_info($userid,"Users");
 		if($user_focus->is_admin == 'on')
 		{
 			$newbuf .= "\n";
@@ -496,7 +495,7 @@
 		}
 
 
-		//Get vtiger_roles from Role2Grp
+		//Get roles from Role2Grp
 		$grpIterator=false;
 		$groupList = "(";
 		foreach($current_user_groups as $grp_id)
@@ -669,7 +668,7 @@
 		}
 
 
-		//Get vtiger_roles from Rs2Grp
+		//Get roles from Rs2Grp
 
 
 		$query="select vtiger_datashare_rs2grp.* from vtiger_datashare_rs2grp inner join vtiger_datashare_module_rel on vtiger_datashare_module_rel.shareid=vtiger_datashare_rs2grp.shareid where vtiger_datashare_module_rel.tabid=".$mod_tabid." and vtiger_datashare_rs2grp.to_groupid in ".$groupList;
@@ -1421,7 +1420,7 @@
 		$adb->query($query);
 	}
 
-	//Populating Values into the tmp sharing vtiger_tables
+	//Populating Values into the tmp sharing tables
 	$sharingArray=Array('Leads','Accounts','Contacts','Potentials','HelpDesk','Emails','Campaigns','Quotes','PurchaseOrder','SalesOrder','Invoice');
 	foreach($sharingArray as $module)
 	{
@@ -1430,7 +1429,7 @@
 		populateSharingPrivileges('GROUP',$userid,$module,'read');
 		populateSharingPrivileges('GROUP',$userid,$module,'write');
 	}
-	//Populating Values into the temp related sharing vtiger_tables
+	//Populating Values into the temp related sharing tables
 	foreach($related_module_share as $rel_tab_id => $tabid_arr)
 	{
 		$rel_tab_name=getTabname($rel_tab_id);

Modified: vtigercrm/trunk/modules/Users/EditDefOrgFieldLevelAccess.php
==============================================================================
--- vtigercrm/trunk/modules/Users/EditDefOrgFieldLevelAccess.php (original)
+++ vtigercrm/trunk/modules/Users/EditDefOrgFieldLevelAccess.php Wed Jun 14 05:08:59 2006
@@ -12,7 +12,6 @@
 
 
 require_once('include/database/PearDatabase.php');
-require_once('XTemplate/xtpl.php');
 require_once('themes/'.$theme.'/layout_utils.php');
 require_once('include/utils/UserInfoUtil.php');
 require_once('include/utils/utils.php');

Modified: vtigercrm/trunk/modules/Users/ShowHistory.php
==============================================================================
--- vtigercrm/trunk/modules/Users/ShowHistory.php (original)
+++ vtigercrm/trunk/modules/Users/ShowHistory.php Wed Jun 14 05:08:59 2006
@@ -38,7 +38,7 @@
 $focus = new User();
 
 if(isset($_REQUEST['record'])) {
-	$focus->retrieve($_REQUEST['record']);
+	$focus->retrieve_entity_info($_REQUEST['record'],"Users");
 }
 if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') {
 	$focus->id = "";

Modified: vtigercrm/trunk/modules/Users/TabCustomise.php
==============================================================================
--- vtigercrm/trunk/modules/Users/TabCustomise.php (original)
+++ vtigercrm/trunk/modules/Users/TabCustomise.php Wed Jun 14 05:08:59 2006
@@ -28,7 +28,7 @@
 $focus = new User();
 
 if(isset($_REQUEST['record'])) {
-	$focus->retrieve($_REQUEST['record']);
+	$focus->retrieve_entity_info($_REQUEST['record'],"Users");
 }
 if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') {
 	$focus->id = "";
@@ -342,7 +342,7 @@
                 } else if (id.indexOf("fieldlist")>=0) {//if Field List
                         if (currSelItemObj.id.indexOf("fd")<0) {
                                 itemObj.style.cursor='move'
-                                itemObj.className='tableBorder mouseover'       //Hiliting Field List only when added vtiger_fields are removed
+                                itemObj.className='tableBorder mouseover'       //Hiliting Field List only when added fields are removed
                         }
                 }
         }

Modified: vtigercrm/trunk/modules/Users/UpdateTab.php
==============================================================================
--- vtigercrm/trunk/modules/Users/UpdateTab.php (original)
+++ vtigercrm/trunk/modules/Users/UpdateTab.php Wed Jun 14 05:08:59 2006
@@ -25,7 +25,7 @@
 $focus = new User();
 
 if(isset($_REQUEST['record'])) {
-	$focus->retrieve($_REQUEST['record']);
+	$focus->retrieve_entity_info($_REQUEST['record'],"Users");
 }
 if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') {
 	$focus->id = "";
@@ -60,12 +60,12 @@
 	$xtpl->out("user_settings");
 }
 
-$sql_set = "update vtiger_tab set presence=1 where presence !=2";
+$sql_set = "update tab set presence=1 where presence !=2";
 $adb->query($sql_set);
 $j=1;
 foreach($_POST as $name=>$value)
 {
-  $sql="update vtiger_tab set presence=0,tabsequence= " . $j . " where vtiger_tabid = " .$value;
+  $sql="update tab set presence=0,tabsequence= " . $j . " where tabid = " .$value;
   $adb->query($sql);
   $j++;
 }



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 04:11:17 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 14 Jun 2006 11:11:17 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7084 -
	/vtigercrm/trunk/index.php
Message-ID: <20060614111118.1BA687ECFAD@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 14 05:11:14 2006
New Revision: 7084

Log:
uncommented track_view

Modified:
    vtigercrm/trunk/index.php

Modified: vtigercrm/trunk/index.php
==============================================================================
--- vtigercrm/trunk/index.php (original)
+++ vtigercrm/trunk/index.php Wed Jun 14 05:11:14 2006
@@ -15,7 +15,7 @@
 /*********************************************************************************
  * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/index.php,v 1.93 2005/04/21 16:17:25 ray Exp $
  * Description: Main file and starting point for the application.  Calls the 
- * theme header and footer vtiger_files defined for the user as well as the module as 
+ * theme header and footer files defined for the user as well as the module as 
  * defined by the input parameters.
  ********************************************************************************/
 
@@ -105,7 +105,7 @@
 if (isset($_REQUEST['PHPSESSID'])) $log->debug("****Starting for session ".$_REQUEST['PHPSESSID']);
 else $log->debug("****Starting for new session");
 
-// We use the REQUEST_URI later to construct dynamic URLs.  IIS does not pass this vtiger_field
+// We use the REQUEST_URI later to construct dynamic URLs.  IIS does not pass this field
 // to prevent an error, if it is not set, we will assign it to ''
 if(!isset($_SERVER['REQUEST_URI']))
 {
@@ -271,7 +271,7 @@
 			ereg("^Webmails",$module) ))
 	{
 		$skipHeaders=true;
-		//skip vtiger_headers for all these invocations as they are mostly popups
+		//skip headers for all these invocations as they are mostly popups
 		if(ereg("^Popup", $action) ||
 			ereg("^ChangePassword", $action) ||
 			ereg("^Export", $action) ||
@@ -319,7 +319,7 @@
 }
 else {
     // use $default_module and $default_action as set in config.php
-    // Redirect to the correct module with the correct action.  We need the URI to include these vtiger_fields.
+    // Redirect to the correct module with the correct action.  We need the URI to include these fields.
   
 
         header("Location: index.php?action=$default_action&module=$default_module");
@@ -482,7 +482,7 @@
 	if(isset($_REQUEST['record']) && $_REQUEST['record']!='' && $_REQUEST["module"] != "Webmails") 
         {
                 // Only track a viewing if the record was retrieved.
-                //$focus->track_view($current_user->id, $actualModule,$_REQUEST['record']);
+                $focus->track_view($current_user->id, $actualModule,$_REQUEST['record']);
         }
 
 }	
@@ -501,9 +501,9 @@
         setcookie('ck_login_language_vtiger', $_SESSION['authenticated_user_language']);
 }
 
-//skip vtiger_headers for popups, deleting, saving, importing and other actions
+//skip headers for popups, deleting, saving, importing and other actions
 if(!$skipHeaders) {
-	$log->debug("including vtiger_headers");
+	$log->debug("including headers");
 	if($use_current_login)
 	{
 		if(isset($_REQUEST['category']) && $_REQUEST['category'] !='')
@@ -522,7 +522,7 @@
 	if(isset($_SESSION['administrator_error']))
 	{
 		// only print DB errors once otherwise they will still look broken after they are fixed.
-		// Only print the errors for admin vtiger_users.
+		// Only print the errors for admin users.
 		if(is_admin($current_user)) 
 			echo $_SESSION['administrator_error'];
 		unset($_SESSION['administrator_error']);
@@ -531,7 +531,7 @@
 	echo "<!-- startscrmprint -->";
 }
 else {
-		$log->debug("skipping vtiger_headers");
+		$log->debug("skipping headers");
 }
 
 



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 04:48:59 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 14 Jun 2006 11:48:59 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7085 -
	/vtigercrm/trunk/include/utils/SearchUtils.php
Message-ID: <20060614114859.A8AA87ECFAD@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 14 05:48:55 2006
New Revision: 7085

Log:
table name prefixed with vtiger

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 Wed Jun 14 05:48:55 2006
@@ -288,7 +288,7 @@
 			$x=count($explode_column);	
 			if($x == 1 )
 			{
-				$where="$val like '%".$search_string ."%'";
+				$where=" $val like '%".$search_string ."%'";
 			}
 			else 
 			{
@@ -327,7 +327,7 @@
 	if($search_field =='crmid')
 	{
 		$column_name='crmid';
-		$table_name='crmentity';
+		$table_name='vtiger_crmentity';
 		$where="$table_name.$column_name like '%".$search_string."%'";	
 	}else
 	{	
@@ -339,11 +339,11 @@
 			$column_name=$adb->query_result($result,0,'columnname');
 			$table_name=$adb->query_result($result,0,'tablename');
 
-			if($table_name == "crmentity" && $column_name == "smownerid")
+			if($table_name == "vtiger_crmentity" && $column_name == "smownerid")
 			{
 				$where = get_usersid($table_name,$column_name,$search_string);
 			}
-			elseif($table_name == "activity" && $column_name == "status")
+			elseif($table_name == "vtiger_activity" && $column_name == "status")
 			{
 				$where="$table_name.$column_name like '%".$search_string."%' or vtiger_activity.eventstatus like '%".$search_string."%'";
 			}
@@ -555,17 +555,17 @@
 			$srch_val = $_REQUEST[$search_value];
 			list($tab_name,$column_name) = split("[.]",$tab_col);
 			$url_string .="&Fields".$i."=".$tab_col."&Condition".$i."=".$srch_cond."&Srch_value".$i."=".$srch_val;
-			if($tab_col == "crmentity.smownerid")
+			if($tab_col == "vtiger_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;	
 			}
-			elseif($tab_col == "activity.status")
+			elseif($tab_col == "vtiger_activity.status")
 			{
 				$adv_string .= " (".getSearch_criteria($srch_cond,$srch_val,'activity.status')." or";	
 				$adv_string .= " ".getSearch_criteria($srch_cond,$srch_val,'activity.eventstatus')." )".$matchtype;	
 			}
-			elseif($tab_col == "cntactivityrel.contactid")
+			elseif($tab_col == "vtiger_cntactivityrel.contactid")
 			{
 				$adv_string .= " (".getSearch_criteria($srch_cond,$srch_val,'contactdetails.firstname')." or";	
 				$adv_string .= " ".getSearch_criteria($srch_cond,$srch_val,'contactdetails.lastname')." )".$matchtype;	
@@ -614,7 +614,7 @@
 
 	if(isset($date_closed_start) && $date_closed_start != "" && isset($date_closed_end) && $date_closed_end != "")
 	{
-		array_push($where_clauses, "potential.closingdate >= ".$adb->quote($date_closed_start)." and vtiger_potential.closingdate <= ".$adb->quote($date_closed_end));
+		array_push($where_clauses, "vtiger_potential.closingdate >= ".$adb->quote($date_closed_start)." and vtiger_potential.closingdate <= ".$adb->quote($date_closed_end));
 		$url_string .= "&closingdate_start=".$date_closed_start."&closingdate_end=".$date_closed_end;
 	}
 	
@@ -622,16 +622,16 @@
 		if($sales_stage=='Other')
 		array_push($where_clauses, "(vtiger_potential.sales_stage <> 'Closed Won' and vtiger_potential.sales_stage <> 'Closed Lost')");
 		else
-		array_push($where_clauses, "potential.sales_stage = ".$adb->quote($sales_stage));
+		array_push($where_clauses, "vtiger_potential.sales_stage = ".$adb->quote($sales_stage));
 		$url_string .= "&sales_stage=".$sales_stage;
 	}
 	if(isset($lead_source) && $lead_source != "") {
-		array_push($where_clauses, "potential.leadsource = ".$adb->quote($lead_source));
+		array_push($where_clauses, "vtiger_potential.leadsource = ".$adb->quote($lead_source));
 		$url_string .= "&leadsource=".$lead_source;
 	}
 	
 	if(isset($date_closed) && $date_closed != "") {
-		array_push($where_clauses, $adb->getDBDateString("potential.closingdate")." like ".$adb->quote($date_closed.'%')."");
+		array_push($where_clauses, $adb->getDBDateString("vtiger_potential.closingdate")." like ".$adb->quote($date_closed.'%')."");
 		$url_string .= "&date_closed=".$date_closed;
 	}
 	$where = "";



From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 04:50:55 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 11:50:55 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=23851=3A_?=
	=?utf-8?q?advanced_search_issue?=
In-Reply-To: <076.b3d3e6e81efa7d100b1be9e497c241aa@vtiger.fosslabs.com>
References: <076.b3d3e6e81efa7d100b1be9e497c241aa@vtiger.fosslabs.com>
Message-ID: <085.6eeca5ce90183794282be76d10ba2224@vtiger.fosslabs.com>

#851: advanced search issue
------------------------+---------------------------------------------------
  Reporter:  mickie     |       Owner:  philip
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by saraj):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/851>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 04:57:42 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 11:57:42 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23852=3A_?=
 =?utf-8?q?basic_search_not_work_properly_when_come_from_advanced_issue?=
In-Reply-To: <076.638c4aad56664f1dab58e6c4b1cb0bf5@vtiger.fosslabs.com>
References: <076.638c4aad56664f1dab58e6c4b1cb0bf5@vtiger.fosslabs.com>
Message-ID: <085.5592b15c4e57cc0564f249e776c24f0f@vtiger.fosslabs.com>

#852: basic search not work properly when come from advanced issue
------------------------+---------------------------------------------------
  Reporter:  mickie     |       Owner:  philip
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by saraj):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/852>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 05:24:51 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 14 Jun 2006 12:24:51 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7086 -
 /vtigercrm/trunk/modules/Contacts/CallRelatedList.php
Message-ID: <20060614122451.D1BB67ECFCE@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 14 06:24:47 2006
New Revision: 7086

Log:
query has been modified

Modified:
    vtigercrm/trunk/modules/Contacts/CallRelatedList.php

Modified: vtigercrm/trunk/modules/Contacts/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/Contacts/CallRelatedList.php Wed Jun 14 06:24:47 2006
@@ -29,11 +29,11 @@
 }
 
 global $adb;
-$sql = $adb->query('select vtiger_accountid from vtiger_contactdetails where contactid='.$focus->id);
+$sql = $adb->query('select accountid from vtiger_contactdetails where contactid='.$focus->id);
 $accountid = $adb->query_result($sql,0,'accountid');
 if($accountid == 0) $accountid='';
 
-$sql1 = $adb->query('select vtiger_campaignid from vtiger_contactdetails where contactid='.$focus->id);
+$sql1 = $adb->query('select campaignid from vtiger_contactdetails where contactid='.$focus->id);
 $campaignid = $adb->query_result($sql1,0,'campaignid');
 if($campaignid == 0) $campaignid='';
 



From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 05:32:12 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 12:32:12 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23881=3A_?=
 =?utf-8?q?sort_by_is_not_working_in_relatedlist_headers?=
In-Reply-To: <076.f679ccaf4274fcb496a8ad40bcc9549c@vtiger.fosslabs.com>
References: <076.f679ccaf4274fcb496a8ad40bcc9549c@vtiger.fosslabs.com>
Message-ID: <085.d4d523312b10551c41cf3b825ddac20c@vtiger.fosslabs.com>

#881: sort by is not working in relatedlist headers
------------------------+---------------------------------------------------
  Reporter:  mickie     |       Owner:  philip
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by saraj):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/881>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 05:42:36 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 12:42:36 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231308=3A?=
 =?utf-8?q?_Role_security_issue_=28cf_=23599=29?=
Message-ID: <076.c439add42e557216aac6af17846b79b5@vtiger.fosslabs.com>

#1308: Role security issue (cf #599)
----------------------------+-----------------------------------------------
 Reporter:  anonymous       |       Owner:  developer
     Type:  defect          |      Status:  new      
 Priority:  critical        |   Milestone:  5.0.0    
Component:  vtigercrm       |     Version:  5.0.0    
 Keywords:  security roles  |  
----------------------------+-----------------------------------------------
 Settings  > Users & Access Management > Organisation Sharing Privileges
 Add Custom Privilege Rule
 related to issue 599

 if you give to a role A rights to read-only to a role B the role A can
 delete items associated to role B.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1308>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 06:34:36 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 13:34:36 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23913=3A_?=
 =?utf-8?q?parent_tab_selection_issue?=
In-Reply-To: <076.f8a21216a5bb1c53f9233d41dce8cc29@vtiger.fosslabs.com>
References: <076.f8a21216a5bb1c53f9233d41dce8cc29@vtiger.fosslabs.com>
Message-ID: <085.c9372e140558fe50cea52674d0875e47@vtiger.fosslabs.com>

#913: parent tab selection issue
------------------------+---------------------------------------------------
  Reporter:  mickie     |       Owner:  philip
      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 [7087]) Parent tab issue while deleting contact resolved. Fixes #913

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/913>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 06:34:37 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 14 Jun 2006 13:34:37 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7087 - in /vtigercrm/trunk:
 Smarty/templates/DetailView.tpl modules/Contacts/Delete.php
Message-ID: <20060614133437.5EB037ECFDB@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 14 07:34:30 2006
New Revision: 7087

Log:
Parent tab issue while deleting contact resolved. Fixes #913

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

Modified: vtigercrm/trunk/Smarty/templates/DetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DetailView.tpl Wed Jun 14 07:34:30 2006
@@ -64,6 +64,7 @@
 
 		{include file='Buttons_List1.tpl'}
 
+		<input type="hidden" name="parenttab" value={$CATEGORY}></input>
 <!-- Contents -->
 <table border=0 cellspacing=0 cellpadding=0 width=98% align=center>
 <tr>

Modified: vtigercrm/trunk/modules/Contacts/Delete.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/Delete.php (original)
+++ vtigercrm/trunk/modules/Contacts/Delete.php Wed Jun 14 07:34:30 2006
@@ -33,5 +33,7 @@
 //code added for returning back to the current view after delete from list view
 if($_REQUEST['return_viewname'] == '') $return_viewname='0';
 if($_REQUEST['return_viewname'] != '')$return_viewname=$_REQUEST['return_viewname'];
-header("Location: index.php?module=".$_REQUEST['return_module']."&action=".$_REQUEST['return_action']."&activity_mode=".$_REQUEST['activity_mode']."&record=".$_REQUEST['return_id']."&viewname=".$return_viewname);
+if(isset($_REQUEST['parenttab']) && $_REQUEST['parenttab'] != "") $parenttab = $_REQUEST['parenttab'];
+
+header("Location: index.php?module=".$_REQUEST['return_module']."&action=".$_REQUEST['return_action']."&parenttab=$parenttab&activity_mode=".$_REQUEST['activity_mode']."&record=".$_REQUEST['return_id']."&viewname=".$return_viewname);
 ?>



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 06:43:55 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 14 Jun 2006 13:43:55 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7088 - in
 /vtigercrm/trunk/include/utils: CommonUtils.php DetailViewUtils.php
 EditViewUtils.php
Message-ID: <20060614134355.6D2297ECFCA@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 14 07:43:50 2006
New Revision: 7088

Log:
Issues in Users UI types has been fixed

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

Modified: vtigercrm/trunk/include/utils/CommonUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/CommonUtils.php (original)
+++ vtigercrm/trunk/include/utils/CommonUtils.php Wed Jun 14 07:43:50 2006
@@ -245,7 +245,7 @@
 	global $log;
 	$log->debug("Entering getCurrencyName(".$currencyid.") method ...");
         global $adb;
-        $sql1 = "select * from currency_info where id=".$currencyid;
+        $sql1 = "select * from vtiger_currency_info where id=".$currencyid;
         $result = $adb->query($sql1);
         $currencyname = $adb->query_result($result,0,"currency_name");
         $curr_symbol = $adb->query_result($result,0,"currency_symbol");

Modified: vtigercrm/trunk/include/utils/DetailViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/DetailViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/DetailViewUtils.php Wed Jun 14 07:43:50 2006
@@ -55,12 +55,15 @@
 
         if($col_fields[$fieldname]=='--None--')
                 $col_fields[$fieldname]='';
-	
-	if($uitype == 13)
+	if($uitype == 116)
+	{
+		$label_fld[] = $mod_strings[$fieldlabel];
+                $label_fld[] = getCurrencyName($col_fields[$fieldname]);
+	}	
+	elseif($uitype == 13 || $uitype == 115)
 	{
 		$label_fld[] = $mod_strings[$fieldlabel];
 		$label_fld[] = $col_fields[$fieldname];
-		//$label_fld[] = '<a href="mailto:'.$col_fields[$fieldname].'">'.$col_fields[$fieldname].'</a>';
 	}
 	elseif($uitype == 15 || $uitype == 16)
 	{
@@ -808,6 +811,13 @@
                         $reminder_str= $rem_days.'&nbsp;'.$mod_strings['LBL_DAYS'].'&nbsp;'.$rem_hrs.'&nbsp;'.$mod_strings['LBL_HOURS'].'&nbsp;'.$rem_min.'&nbsp;'.$mod_strings['LBL_MINUTES'].'&nbsp;&nbsp;'.$mod_strings['LBL_BEFORE_EVENT'];
                 }
 		$label_fld[] = '&nbsp;'.$reminder_str;
+	}elseif($uitype == 98)
+	{
+	 	$label_fld[] =$mod_strings[$fieldlabel];
+		if(is_admin($current_user))
+			$label_fld[] = '<a href="index.php?module=Users&action=RoleDetailView&roldeid='.$col_fields[$fieldname].'">'.getRoleName($col_fields[$fieldname]).'</a>';
+		else
+			$label_fld[] = getRoleName($col_fields[$fieldname]);
 	}
 	else
 	{

Modified: vtigercrm/trunk/include/utils/EditViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/EditViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/EditViewUtils.php Wed Jun 14 07:43:50 2006
@@ -435,6 +435,12 @@
 		$editview_label[]=$mod_strings[$fieldlabel];
 		$date_format = parse_calendardate($app_strings['NTC_DATE_FORMAT']);
 		$fieldvalue[] = $value;
+	}
+	elseif($uitype == 156)
+	{
+		$editview_label[]=$mod_strings[$fieldlabel];
+		$fieldvalue[] = $value;	
+		$fieldvalue[] = $is_admin;
 	}
 	elseif($uitype == 56)
 	{
@@ -1015,7 +1021,7 @@
 	elseif($uitype == 115)
 	{
 		$editview_label[]=$mod_strings[$fieldlabel];
-		$pick_query="select * from ".$fieldname;
+		$pick_query="select * from vtiger_".$fieldname;
 		$pickListResult = $adb->query($pick_query);
 		$noofpickrows = $adb->num_rows($pickListResult);
 
@@ -1038,11 +1044,12 @@
 			$options[] = array($pickListValue=>$chk_val );	
 		}
 		$fieldvalue [] = $options;
+		$fieldvalue [] = $is_admin;
 	}
 	elseif($uitype == 116)
 	{
 		$editview_label[]=$mod_strings[$fieldlabel];
-		$pick_query="select * from currency_info";
+		$pick_query="select * from vtiger_currency_info";
 		$pickListResult = $adb->query($pick_query);
 		$noofpickrows = $adb->num_rows($pickListResult);
 
@@ -1065,12 +1072,14 @@
 			$options[$currency_id] = array($pickListValue=>$chk_val );	
 		}
 		$fieldvalue [] = $options;
+		$fieldvalue [] = $is_admin;
 	}
 	elseif($uitype ==98)
 	{
 		$editview_label[]=$mod_strings[$fieldlabel];
 		$fieldvalue[]=$value;
-        $fieldvalue[]=getRoleName($value);
+        	$fieldvalue[]=getRoleName($value);
+		$fieldvalue[]=$is_admin;
 	}
 	elseif($uitype == 105)
 	{



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 06:46:26 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 14 Jun 2006 13:46:26 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7089 - in
 /vtigercrm/trunk/Smarty/templates: DetailViewUI.tpl DisplayFields.tpl
Message-ID: <20060614134626.E10E47ECFCA@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 14 07:46:22 2006
New Revision: 7089

Log:
Issues in Users UI types has been fixed

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

Modified: vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl Wed Jun 14 07:46:22 2006
@@ -198,6 +198,8 @@
 							</td>
 	
 
-				{else}
+				{elseif $keyid eq 103}<!-- for Tag Cloud -->
+                                                  	<td class="dvtCellInfo" align="left" width=25%">{$keyval}</td>
+				{else}									
                                                   	<td class="dvtCellInfo" align="left" width=25%">{$keyval}</td>
 				{/if}

Modified: vtigercrm/trunk/Smarty/templates/DisplayFields.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DisplayFields.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DisplayFields.tpl Wed Jun 14 07:46:22 2006
@@ -27,6 +27,7 @@
 		{assign var="fldname" value="$maindata[2][0]"}
 		{assign var="fldvalue" value="$maindata[3][0]"}
 		{assign var="secondvalue" value="$maindata[3][1]"}
+		{assign var="thirdvalue" value="$maindata[3][2]"}
 
 		{if $uitype eq 2}
 			<td width=20% class="dvtCellLabel" align=right>
@@ -456,13 +457,18 @@
 			<td width="20%" class="dvtCellLabel" align=right>
 				{$fldlabel}
 			</td>
+				{if $secondvalue eq 1}
+					{assign var="disable_status" value=""}
+				{else}
+					{assign var="disable_status" value="disabled"}
+				{/if}	
 				{if $fldvalue eq 1}
 					<td width="30%" align=left class="dvtCellInfo">
-						<input name="{$fldname}" type="checkbox"  checked>
+						<input name="{$fldname}" {$disable_status} type="checkbox"  checked>
 					</td>
 				{else}
 					<td width="30%" align=left class="dvtCellInfo">
-						<input name="{$fldname}" type="checkbox">
+						<input name="{$fldname}" {$disable_status} type="checkbox">
 					</td>
 				{/if}
 		{elseif $uitype eq 98}<!-- Role Selection Popup -->		
@@ -471,8 +477,12 @@
 				{$fldlabel}
 			</td>
 			<td width="30%" align=left class="dvtCellInfo">
-			<input name="role_name" id="role_name" class="txtBox" value="{$secondvalue}" type="text">&nbsp;
-			<a href="javascript:openPopup();"><img src="{$IMAGE_PATH}select.gif" align="absmiddle" border="0"></a>
+			{if $thirdvalue eq 1}
+				<input name="role_name" id="role_name" class="txtBox" value="{$secondvalue}" type="text">&nbsp;
+				<a href="javascript:openPopup();"><img src="{$IMAGE_PATH}select.gif" align="absmiddle" border="0"></a>
+			{else}	
+				<input name="role_name" id="role_name" class="txtBox" readonly value="{$secondvalue}" type="text">&nbsp;
+			{/if}	
 			<input name="user_role" id="user_role" value="{$fldvalue}" type="hidden">
 			</td>
 		{elseif $uitype eq 104}<!-- Mandatory Email Fields -->			
@@ -486,7 +496,11 @@
 				{$fldlabel}
 			</td>
 			<td width="30%" align=left class="dvtCellInfo">
-			   <select name="{$fldname}">
+			   {if $secondvalue eq 1}
+			   	<select name="{$fldname}">
+			   {else}
+			   	<select disabled name="{$fldname}">
+			   {/if} 
 				{foreach item=arr from=$fldvalue}
 					{foreach key=sel_value item=value from=$arr}
 						<option value="{$sel_value}" {$value}>{$sel_value}</option>
@@ -514,7 +528,7 @@
 				<td width="20%" class="dvtCellLabel" align=right>
 			       {$fldlabel}
 	            </td>
-				<td width="30%" colspan="3" align=left class="dvtCellInfo">
+				<td width="30%" align=left class="dvtCellInfo">
 				<input readonly name='{$fldname}' class="small" type="text" value='{$fldvalue}'><input name='reports_to_id' type="hidden" value='{$fldvalue}'>&nbsp;<input title="Change [Alt+C]" accessKey="C" type="button" class="small" value='{$UMOD.LBL_CHANGE}' name=btn1 LANGUAGE=javascript onclick='return window.open("index.php?module=Users&action=Popup&form=UsersEditView&form_submit=false","test","width=640,height=522,resizable=0,scrollbars=0");'>
 	            </td>
 			{elseif $uitype eq 116}<!-- for currency in users details-->	
@@ -522,7 +536,12 @@
 				{$fldlabel}
 			</td>
 			<td width="30%" align=left class="dvtCellInfo">
-			   <select name="{$fldname}">
+			   {if $secondvalue eq 1}
+			   	<select name="{$fldname}">
+			   {else}
+			   	<select disabled name="{$fldname}">
+			   {/if} 
+
 				{foreach item=arr key=uivalueid from=$fldvalue}
 					{foreach key=sel_value item=value from=$arr}
 						<option value="{$uivalueid}" {$value}>{$sel_value}</option>



From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 07:04:11 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 14:04:11 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23939=3A_?=
 =?utf-8?q?username_not_displayed_in_contacts_table_in_activity_related_li?=
 =?utf-8?q?st_issue?=
In-Reply-To: <076.d5768cf75230f4a33c4c174f03d2da21@vtiger.fosslabs.com>
References: <076.d5768cf75230f4a33c4c174f03d2da21@vtiger.fosslabs.com>
Message-ID: <085.6b5c9263fb25f3f967f8cfddf6e4ebff@vtiger.fosslabs.com>

#939: username not displayed in contacts table in activity related list issue
------------------------+---------------------------------------------------
  Reporter:  mickie     |       Owner:  philip
      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 [7090]) username made to display in contact releated list. Fixes #939

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/939>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 07:04:12 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 14 Jun 2006 14:04:12 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7090 -
	/vtigercrm/trunk/modules/Activities/Activity.php
Message-ID: <20060614140412.78AFA7ECFE8@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 14 08:04:07 2006
New Revision: 7090

Log:
username made to display in contact releated list. Fixes #939

Modified:
    vtigercrm/trunk/modules/Activities/Activity.php

Modified: vtigercrm/trunk/modules/Activities/Activity.php
==============================================================================
--- vtigercrm/trunk/modules/Activities/Activity.php (original)
+++ vtigercrm/trunk/modules/Activities/Activity.php Wed Jun 14 08:04:07 2006
@@ -154,7 +154,7 @@
 			$returnset = '&return_module=Activities&return_action=DetailView&activity_mode=Events&return_id='.$id;
 
 
-			$query = 'select vtiger_contactdetails.accountid, vtiger_contactdetails.contactid, vtiger_contactdetails.firstname,vtiger_contactdetails.lastname, vtiger_contactdetails.department, vtiger_contactdetails.title, vtiger_contactdetails.email, vtiger_contactdetails.phone, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_contactdetails inner join vtiger_seactivityrel on vtiger_seactivityrel.crmid=vtiger_contactdetails.contactid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid where vtiger_seactivityrel.activityid='.$id.' and vtiger_crmentity.deleted=0';
+			$query = 'select vtiger_users.user_name,vtiger_contactdetails.accountid, vtiger_contactdetails.contactid, vtiger_contactdetails.firstname,vtiger_contactdetails.lastname, vtiger_contactdetails.department, vtiger_contactdetails.title, vtiger_contactdetails.email, vtiger_contactdetails.phone, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_contactdetails inner join vtiger_seactivityrel on vtiger_seactivityrel.crmid=vtiger_contactdetails.contactid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid left join vtiger_users on vtiger_users.id = vtiger_crmentity.smownerid where vtiger_seactivityrel.activityid='.$id.' and vtiger_crmentity.deleted=0';
 			$log->debug("Exiting get_contacts method ...");
 			return GetRelatedList('Activities','Contacts',$focus,$query,$button,$returnset);
         }



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 07:11:04 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 14 Jun 2006 14:11:04 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7091 -
 /vtigercrm/trunk/modules/Dashboard/display_charts.php
Message-ID: <20060614141104.86AE27ECFDE@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 14 08:11:00 2006
New Revision: 7091

Log:
query has been modified

Modified:
    vtigercrm/trunk/modules/Dashboard/display_charts.php

Modified: vtigercrm/trunk/modules/Dashboard/display_charts.php
==============================================================================
--- vtigercrm/trunk/modules/Dashboard/display_charts.php (original)
+++ vtigercrm/trunk/modules/Dashboard/display_charts.php Wed Jun 14 08:11:00 2006
@@ -438,7 +438,7 @@
 			$graph_by="smownerid";
 			$graph_title=$mod_strings['salesbyuser'];
 			$module="Potentials";
-			$where=" and (crmentity.smownerid != NULL || crmentity.smownerid != ' ')";
+			$where=" and (vtiger_crmentity.smownerid != NULL || vtiger_crmentity.smownerid != ' ')";
 			$query=$potential_query;
 			echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
 		    }
@@ -448,7 +448,7 @@
 			$graph_by="groupname";
 			$graph_title=$mod_strings['salesbyteam'];
 			$module="Potentials";
-			$where=" and (potentialgrouprelation.groupname != NULL || potentialgrouprelation.groupname != '')";
+			$where=" and (vtiger_potentialgrouprelation.groupname != NULL || vtiger_potentialgrouprelation.groupname != '')";
 			$query=$potential_query;
 			echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
 		    }
@@ -619,7 +619,7 @@
 			    $graph_by="smownerid";
 			    $graph_title=$mod_strings['ticketsbyowner'];
 			    $module="HelpDesk";
-			    $where=" and (crmentity.smownerid != NULL || crmentity.smownerid != ' ')";
+			    $where=" and (vtiger_crmentity.smownerid != NULL || vtiger_crmentity.smownerid != ' ')";
 			    $query=$helpdesk_query;
 			    echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
 		    }
@@ -629,7 +629,7 @@
 			    $graph_by="ticketgroupname";
 			    $graph_title=$mod_strings['ticketsbyteam'];
 			    $module="HelpDesk";
-			    $where=" and (ticketgrouprelation.groupname != NULL || ticketgrouprelation.groupname != ' ')";
+			    $where=" and (vtiger_ticketgrouprelation.groupname != NULL || vtiger_ticketgrouprelation.groupname != ' ')";
 			    $query=$helpdesk_query;
 			    echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
 		    }    



From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 07:37:14 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 14:37:14 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231020=3A?=
 =?utf-8?q?_FAQ_-_Search_throws_javascript_exception?=
In-Reply-To: <076.61b749f6e782dbb80d04322db36325d8@vtiger.fosslabs.com>
References: <076.61b749f6e782dbb80d04322db36325d8@vtiger.fosslabs.com>
Message-ID: <085.eedbd057c2a702d258a1a9912add8acc@vtiger.fosslabs.com>

#1020: FAQ - Search throws javascript exception
------------------------+---------------------------------------------------
  Reporter:  saraj      |       Owner:  philip    
      Type:  defect     |      Status:  closed    
  Priority:  major      |   Milestone:            
 Component:  vtigercrm  |     Version:  5.0.0     
Resolution:  fixed      |    Keywords:  faq search
------------------------+---------------------------------------------------
Changes (by saraj):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 (In [7092]) Faq search issue fixed. Fixes #1020

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1020>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 07:37:15 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 14 Jun 2006 14:37:15 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7092 -
	/vtigercrm/trunk/include/utils/SearchUtils.php
Message-ID: <20060614143715.5EFB67ECFFD@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 14 08:37:11 2006
New Revision: 7092

Log:
Faq search issue fixed. Fixes #1020

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 Wed Jun 14 08:37:11 2006
@@ -15,8 +15,8 @@
 require_once('include/ComboUtil.php'); //new
 require_once('include/utils/CommonUtils.php'); //new
 	
-$column_array=array('accountid','contact_id');
-$table_col_array=array('vtiger_account.accountname','vtiger_contactdetails.firstname,vtiger_contactdetails.lastname');
+$column_array=array('accountid','contact_id','product_id');
+$table_col_array=array('vtiger_account.accountname','vtiger_contactdetails.firstname,vtiger_contactdetails.lastname','vtiger_products.productname');
 
 /**This function is used to get the list view header values in a list view during search
 *Param $focus - module object



From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 07:40:26 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 14:40:26 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231033=3A?=
 =?utf-8?q?_Advanced_search_not_working?=
In-Reply-To: <076.1e3b2b27397659ad6ee116717f9fcc28@vtiger.fosslabs.com>
References: <076.1e3b2b27397659ad6ee116717f9fcc28@vtiger.fosslabs.com>
Message-ID: <085.b74d911de962a2cb8805d1946de88ab5@vtiger.fosslabs.com>

#1033: Advanced search not working
---------------------------+------------------------------------------------
  Reporter:  jerrydgeorge  |       Owner:  philip
      Type:  defect        |      Status:  closed
  Priority:  major         |   Milestone:        
 Component:  vtigercrm     |     Version:  5.0.0 
Resolution:  fixed         |    Keywords:        
---------------------------+------------------------------------------------
Changes (by saraj):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1033>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 07:44:31 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 14:44:31 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23951=3A_?=
 =?utf-8?q?Alphabetical_Search_Option_hidden_in_Advanced_Search_mode?=
In-Reply-To: <076.ffa1f6294657a1518192941039b69227@vtiger.fosslabs.com>
References: <076.ffa1f6294657a1518192941039b69227@vtiger.fosslabs.com>
Message-ID: <085.334f4eccb7c7fbadd5c7e4d1d8f83be8@vtiger.fosslabs.com>

#951: Alphabetical Search Option hidden in Advanced Search mode
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  philip
      Type:  defect     |      Status:  closed
  Priority:  minor      |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  wontfix    |    Keywords:        
------------------------+---------------------------------------------------
Changes (by saraj):

  * resolution:  => wontfix
  * status:  new => closed

Comment:

 We have provided alphabetical search only for basic search and not for
 advance. Also this a part of basic search.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/951>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 08:46:32 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 15:46:32 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231309=3A?=
 =?utf-8?q?_Insert_quote=3A_PearDatabase=2Ephp_on_line_440?=
Message-ID: <076.186c762880d05d8b6373c69434b073dc@vtiger.fosslabs.com>

#1309: Insert quote: PearDatabase.php on line 440
-----------------------------------------+----------------------------------
 Reporter:  michael at flooringdepot.co.za  |       Owner:  developer
     Type:  defect                       |      Status:  new      
 Priority:  critical                     |   Milestone:  4.2.4    
Component:  vtigercrm                    |     Version:  4.2.4rc3 
 Keywords:  PearDatabase.php  line 440   |  
-----------------------------------------+----------------------------------
 I seem to have a problem creating a quote. Once I have created a lead
 converted it and then viewed the account, I then create a quote. Once the
 quote has been created, it returns to the ACCOUNT LIST view. Where it then
 shows the error,
 Fatal error: Call to a member function on a non-object in
 C:\wamp\www\vtiger44\include\database\PearDatabase.php on line 440

 It seems that something is not hundreds when using SQL.
 It seems that this problem has remained from 4.2.3.
 This error does not appear in BETA 5, however I would prefer running the
 stable 4.2.4.

 I am using Apache/2.0.55 (Win32),
 PHP version : 4.4.2 Loaded extensions :standard, bcmath, calendar, ctype,
 com, ftp, mysql, odbc, overload, pcre, session, tokenizer, xml, wddx,
 zlib, apache2handler, mbstring, gd.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1309>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 09:46:00 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 14 Jun 2006 16:46:00 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7093 -
	/vtigercrm/trunk/modules/Leads/Lead.php
Message-ID: <20060614164601.7C3BF7ED163@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 14 10:45:55 2006
New Revision: 7093

Log:
Removed vtiger prefix from the column activitytype - ahmed

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

Modified: vtigercrm/trunk/modules/Leads/Lead.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/Lead.php (original)
+++ vtigercrm/trunk/modules/Leads/Lead.php Wed Jun 14 10:45:55 2006
@@ -193,7 +193,7 @@
 
 
 	// First, get the list of IDs.
-	$query = "SELECT vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid, vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name,vtiger_recurringevents.recurringtype from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and (activitytype='Task' or vtiger_activitytype='Call' or vtiger_activitytype='Meeting') and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Completed') and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Deferred') or (vtiger_activity.eventstatus !='' && vtiger_activity.eventstatus != 'Held')";
+	$query = "SELECT vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid, vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name,vtiger_recurringevents.recurringtype from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting') and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Completed') and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Deferred') or (vtiger_activity.eventstatus !='' && vtiger_activity.eventstatus != 'Held')";
 	$log->debug("Exiting get_activities method ...");
 	return  GetRelatedList('Leads','Activities',$focus,$query,$button,$returnset);
 }



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 09:47:21 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 14 Jun 2006 16:47:21 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7094 -
	/vtigercrm/trunk/modules/Leads/CallRelatedList.php
Message-ID: <20060614164721.D63A17ED163@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 14 10:47:18 2006
New Revision: 7094

Log:
removed the vtiger prefix from fieldname- ahmed

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

Modified: vtigercrm/trunk/modules/Leads/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/Leads/CallRelatedList.php Wed Jun 14 10:47:18 2006
@@ -47,7 +47,7 @@
        unset($_SESSION['rlvs']);
  }
 	
-$sql1 = $adb->query('select vtiger_campaignid from vtiger_leaddetails where leadid='.$focus->id);
+$sql1 = $adb->query('select campaignid from vtiger_leaddetails where leadid='.$focus->id);
 $campaignid = $adb->query_result($sql1,0,'campaignid');
 if($campaignid == 0) $campaignid='';
 $smarty->assign("campaignid",$campaignid);



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 09:49:26 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 14 Jun 2006 16:49:26 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7095 -
	/vtigercrm/trunk/modules/uploads/add2db.php
Message-ID: <20060614164926.E806E7ED163@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 14 10:49:23 2006
New Revision: 7095

Log:
Added the prefix vtiger to tables names - ahmed

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

Modified: vtigercrm/trunk/modules/uploads/add2db.php
==============================================================================
--- vtigercrm/trunk/modules/uploads/add2db.php (original)
+++ vtigercrm/trunk/modules/uploads/add2db.php Wed Jun 14 10:49:23 2006
@@ -58,16 +58,16 @@
 			$description = addslashes($desc);
 			$date_var = date('YmdHis');
 
-			$query = "insert into crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime) values('";
+			$query = "insert into vtiger_crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime) values('";
 			$query .= $current_id."','".$current_user->id."','".$current_user->id."','".$_REQUEST['return_module'].' Attachment'."','".$description."','".$date_var."')";
 			$result = $adb->query($query);
 
-			$sql = "insert into attachments values(";
+			$sql = "insert into vtiger_attachments values(";
 			$sql .= $current_id.",'".$filename."','".$description."','".$filetype."','".$upload_filepath."')";
 			$result = $adb->query($sql);
 
 
-			$sql1 = "insert into seattachmentsrel values('";
+			$sql1 = "insert into vtiger_seattachmentsrel values('";
 			$sql1 .= $crmid."','".$current_id."')";
 			$result = $adb->query($sql1);
 



From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 10:03:15 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 17:03:15 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231310=3A?=
 =?utf-8?q?_Translation_for_=22my_preference=22_=26_home_page?=
Message-ID: <076.a6a7ecaca440fce3cdf9dde7ec76ec0a@vtiger.fosslabs.com>

#1310: Translation for "my preference" & home page
---------------------------------------------------+------------------------
 Reporter:  abos                                   |       Owner:  developer
     Type:  defect                                 |      Status:  new      
 Priority:  minor                                  |   Milestone:           
Component:  vtigercrm                              |     Version:  5.0.0    
 Keywords:  translation, homepage, my preferences  |  
---------------------------------------------------+------------------------
 Hi,
 in homepage, and my preference,
 the strings This Year,This week, This day
 have to be translated.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1310>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 10:07:37 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 17:07:37 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231311=3A?=
	=?utf-8?q?_Error_on_report_module_link?=
Message-ID: <076.c88d9dad0e512beb782fc9feab6fceee@vtiger.fosslabs.com>

#1311: Error on report module link
----------------------------------+-----------------------------------------
 Reporter:  abos                  |       Owner:  developer
     Type:  defect                |      Status:  new      
 Priority:  major                 |   Milestone:           
Component:  vtigercrm             |     Version:  5.0.0    
 Keywords:  reports, translation  |  
----------------------------------+-----------------------------------------
 Hi,
 the links to create a report (the dropdown with module name) pass the
 translated name of the module, not the real name.
 So we obtain a Warning: Invalid argument supplied for foreach() in....

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1311>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 10:17:56 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 17:17:56 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231309=3A?=
 =?utf-8?q?_Insert_quote=3A_PearDatabase=2Ephp_on_line_440?=
In-Reply-To: <076.186c762880d05d8b6373c69434b073dc@vtiger.fosslabs.com>
References: <076.186c762880d05d8b6373c69434b073dc@vtiger.fosslabs.com>
Message-ID: <085.bbc04969878245434633c1e6ea1fbdd2@vtiger.fosslabs.com>

#1309: Insert quote: PearDatabase.php on line 440
------------------------------------------+---------------------------------
  Reporter:  michael at flooringdepot.co.za  |       Owner:  developer                 
      Type:  defect                       |      Status:  closed                    
  Priority:  critical                     |   Milestone:  4.2.4                     
 Component:  vtigercrm                    |     Version:  4.2.4rc3                  
Resolution:  duplicate                    |    Keywords:  PearDatabase.php  line 440
------------------------------------------+---------------------------------
Changes (by allanbush):

  * resolution:  => duplicate
  * status:  new => closed

Comment:

 This is the same problem as ticket #1281.

 People seems to be experiencing this a lot (I'm not sure why it wasn't
 discovered in 4.2.3 as it has the same bug) I think we should create a
 4.2.4.1 release to fix this issue.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1309>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 10:24:47 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 17:24:47 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231312=3A?=
	=?utf-8?q?_Lead_conversion_fails?=
Message-ID: <076.cad199d426a899437d6da0170c5b1684@vtiger.fosslabs.com>

#1312: Lead conversion fails
-----------------------+----------------------------------------------------
 Reporter:  allanbush  |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  major      |   Milestone:  4.2.4    
Component:  vtigercrm  |     Version:  4.2.4rc3 
 Keywords:  sql        |  
-----------------------+----------------------------------------------------
 There's an SQL query in lead conversion due to a double set of quotes
 around the leadsource when inserting into contactsubdetails.

 Depending on the database transaction support this either causes the
 entire conversion to fail or the contactsubdetails entry to be missing.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1312>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 10:25:56 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 17:25:56 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231313=3A?=
	=?utf-8?q?_Pop_up_size?=
Message-ID: <076.d5cfe0f287242a74ba422f819314f615@vtiger.fosslabs.com>

#1313: Pop up size
-----------------------------------+----------------------------------------
 Reporter:  abos                   |       Owner:  developer
     Type:  defect                 |      Status:  new      
 Priority:  major                  |   Milestone:           
Component:  vtigercrm              |     Version:  5.0.0    
 Keywords:  email, report, pop up  |  
-----------------------------------+----------------------------------------
 Hi, for some module, the pop up are too small.
 Report creation, email compose.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1313>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 10:42:44 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 17:42:44 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231314=3A?=
 =?utf-8?q?_Create_a_4=2E2=2E4=2E1_release?=
Message-ID: <076.0bb25652495a5800a354264247f65b15@vtiger.fosslabs.com>

#1314: Create a 4.2.4.1 release
-----------------------+----------------------------------------------------
 Reporter:  allanbush  |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  major      |   Milestone:  4.2.4    
Component:  vtigercrm  |     Version:  4.2.4rc3 
 Keywords:             |  
-----------------------+----------------------------------------------------
 I'm proposing a 4.2.4.1 release to the fix for ticket #1281 out.

 I propose we waiting until Monday (June 19th) to see if any other bugs
 come up and then release the update that day.

 To do this we should reopen the 4.2.4 branch and create the changes there
 and tag it as 4.2.4.1 before release.  I'm not sure what the proper way to
 do this is, I'm thinking we do svn merge -r 6963:6962
 http://vtiger.fosslabs.com/svn/vtgier/vtigercrm/branches/4.2.4

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1314>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 10:43:17 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 17:43:17 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231314=3A?=
 =?utf-8?q?_Create_a_4=2E2=2E4=2E1_release?=
In-Reply-To: <076.0bb25652495a5800a354264247f65b15@vtiger.fosslabs.com>
References: <076.0bb25652495a5800a354264247f65b15@vtiger.fosslabs.com>
Message-ID: <085.f675800880e6731d95a26f5c475320e9@vtiger.fosslabs.com>

#1314: Create a 4.2.4.1 release
------------------------+---------------------------------------------------
  Reporter:  allanbush  |       Owner:  developer
      Type:  defect     |      Status:  new      
  Priority:  major      |   Milestone:  4.2.4    
 Component:  vtigercrm  |     Version:  4.2.4rc3 
Resolution:             |    Keywords:           
------------------------+---------------------------------------------------
Comment (by allanbush):

 Ticket #1312 should be included in this release as well.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1314>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 11:20:40 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 18:20:40 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231315=3A?=
	=?utf-8?q?_security_default_settings?=
Message-ID: <076.a7f8c2b4c218135f5d494288a285aeb9@vtiger.fosslabs.com>

#1315: security default settings
-----------------------------+----------------------------------------------
 Reporter:  web at reponse.net  |       Owner:  developer
     Type:  enhancement      |      Status:  new      
 Priority:  major            |   Milestone:           
Component:  vtigercrm        |     Version:  5.0.0    
 Keywords:  security roles   |  
-----------------------------+----------------------------------------------
 Security Management - Test Cases     Author: Gopal

 Users at higher role can access  provided they have access privilege at
 profile level. For example, "VP Engineering" can access data of "Manager
 1" only if he/she has privilege to access all the modules "Manager 1" has.
 ----
 I think this should not be automatic, the GUI give a quick way to do that.
 For exemple, In my case i need for legal resons that the higher role can
 read but not modify other users data below their hierarchy.
 Actually we can manage nothing about that. (perhaps an option)
 :-)

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1315>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 11:50:27 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 18:50:27 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231314=3A?=
 =?utf-8?q?_Create_a_4=2E2=2E4=2E1_release?=
In-Reply-To: <076.0bb25652495a5800a354264247f65b15@vtiger.fosslabs.com>
References: <076.0bb25652495a5800a354264247f65b15@vtiger.fosslabs.com>
Message-ID: <085.05ae76a64a853c89bbcaa4d42c47d552@vtiger.fosslabs.com>

#1314: Create a 4.2.4.1 release
------------------------+---------------------------------------------------
  Reporter:  allanbush  |       Owner:  developer
      Type:  defect     |      Status:  new      
  Priority:  major      |   Milestone:  4.2.4    
 Component:  vtigercrm  |     Version:  4.2.4rc3 
Resolution:             |    Keywords:           
------------------------+---------------------------------------------------
Comment (by jeffk):

 You can copy the URL at REV to the same name, current rev. You're carrying
 that node across revision space and dropping it at current revision with a
 name you specify, which happens to be the same name in this case.

 The branch was removed by r6963, so copy the URL from one revision
 previous to that
 {{{

 svn cp -r 6962
 http://vtiger.fosslabs.com/svn/vtgier/vtigercrm/branches/4.2.4 \
 http://vtiger.fosslabs.com/svn/vtgier/vtigercrm/branches/4.2.4

 }}}

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1314>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 11:53:23 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 18:53:23 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231314=3A?=
 =?utf-8?q?_Create_a_4=2E2=2E4=2E1_release?=
In-Reply-To: <076.0bb25652495a5800a354264247f65b15@vtiger.fosslabs.com>
References: <076.0bb25652495a5800a354264247f65b15@vtiger.fosslabs.com>
Message-ID: <085.fcf140227a33895440712ca713226a30@vtiger.fosslabs.com>

#1314: Create a 4.2.4.1 release
------------------------+---------------------------------------------------
  Reporter:  allanbush  |       Owner:  developer
      Type:  defect     |      Status:  new      
  Priority:  major      |   Milestone:  4.2.4    
 Component:  vtigercrm  |     Version:  4.2.4rc3 
Resolution:             |    Keywords:           
------------------------+---------------------------------------------------
Comment (by jeffk):

 Or, the seond URL in the svn cp could be given the name 4.2.4.1, which
 would be consistent with what the release is going to be named.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1314>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 22:13:27 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 05:13:27 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231316=3A?=
	=?utf-8?q?_Problem_in_VCRM_4=2E2=2E4?=
Message-ID: <076.bd13c28908a052328e19e2f345da9f18@vtiger.fosslabs.com>

#1316: Problem in VCRM 4.2.4
---------------------------------------+------------------------------------
 Reporter:  Simon                      |       Owner:  developer
     Type:  defect                     |      Status:  new      
 Priority:  major                      |   Milestone:  4.2.4    
Component:  vtigercrm                  |     Version:           
 Keywords:  email, quote, sales order  |  
---------------------------------------+------------------------------------
 Hi all,
 i am a new user to the vtiger crm, below is the error after i try install
 and use the VCRM (vtiger crm) 4.2.4 with the source files
 http://www.vtiger.com/download/vtigercrm-4.2.4.exe:-


 1. when creating a new event in module activity, the 'send notification'
 is still function error while my setting is configurated already.
 (Settings->Outgoing Mail Server Configuration, vtiger user who is assigned
 to the activity that is the one who will be getting the email has a valid
 email address entered in their user settings already, vtiger user has a
 valid email address entered in their user settings already).

 'Mail Error : Please check your outgoing mail server configuration in
 Settings->Outgoing Mail Server Configuration OR MailId for the present
 user is not Configured'

 2. When sending a email using [New Email], it cannot be sent, below is the
 error message,

 'Please Check the Mail Server Name...'

 3. when creating a sales order directly from a quote, it contains bug too.
 if you follows below step to create a sales order:-
 -create a quote using [New Quote], and save it
 -then open [Export To PDF] to view the quote in pdf
 -then create sales order directly from quote using [Create Sales Order]
 above the detail view of that quote and save it
 -then the bug occur which is the detail view of sales order is empty after
 save.

 4. i can't view module Quote (continue from no.3).

 'Fatal error: Call to a member function on a non-object in C:\Program
 Files\vtigerCRM4.2.4rc2\apache\htdocs\vtigerCRM\include\database\PearDatabase.php
 on line 440'

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1316>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 22:58:33 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 05:58:33 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=2343=3A_m?=
 =?utf-8?q?ysql5_support_for_4=2E2?=
In-Reply-To: <076.5bcca5c51fbf18f9d9447ba5444f5acd@vtiger.fosslabs.com>
References: <076.5bcca5c51fbf18f9d9447ba5444f5acd@vtiger.fosslabs.com>
Message-ID: <085.b4b2a35290be280e339c43d8e880a1f9@vtiger.fosslabs.com>

#43: mysql5 support for 4.2
--------------------------+-------------------------------------------------
  Reporter:  fathi        |       Owner:  developer
      Type:  enhancement  |      Status:  new      
  Priority:  major        |   Milestone:  4.2.5    
 Component:  vtigercrm    |     Version:  4.2.4rc1 
Resolution:               |    Keywords:  mysql    
--------------------------+-------------------------------------------------
Comment (by allanbush):

 As postgres support has landed it seems to me that most of these issues
 should be fixed now.

 I'm unsure of the timestamp problems.  This seems like a mysql bug (the
 generated table creation code is valid SQL) is it only present in certain
 version of mysql 5.0.x? I seem to remember the first couple being pretty
 buggy.

 Re Changing ON DELETE CASCADE to ON DELETE NO ACTION would simply
 determining and removing the circular references work instead?  If not
 can't we just leave the ON DELETE part out (I'm pretty sure NO ACTION must
 be the default on just about every database).

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/43>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 23:07:29 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 06:07:29 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=2348=3A_S?=
 =?utf-8?q?ales_Orders_Created_from_Quote_are_not_saved_and_do_not_retain_?=
 =?utf-8?q?associations?=
In-Reply-To: <076.6d585e55b32136b76a36642c5be35e19@vtiger.fosslabs.com>
References: <076.6d585e55b32136b76a36642c5be35e19@vtiger.fosslabs.com>
Message-ID: <085.0cf25ed16d48ef745af93cd6f21a335d@vtiger.fosslabs.com>

#48: Sales Orders Created from Quote are not saved and do not retain
associations
-----------------------------------------------+----------------------------
  Reporter:  onwealdandy <arodes at onweald.com>  |       Owner:  developer
      Type:  defect                            |      Status:  closed   
  Priority:  major                             |   Milestone:  4.2.5    
 Component:  vtigercrm                         |     Version:  4.2.3    
Resolution:  fixed                             |    Keywords:  order    
-----------------------------------------------+----------------------------
Changes (by allanbush):

  * resolution:  => fixed
  * status:  reopened => closed

Comment:

 I'm pretty sure that changeset:5080 fixed this issue (for invoices and
 orders as well as quotes).

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/48>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 23:12:12 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 06:12:12 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231317=3A?=
	=?utf-8?q?_Compose_Email_Page_Issue?=
Message-ID: <076.a9eeeed40174d2838271904b6989fe27@vtiger.fosslabs.com>

#1317: Compose Email Page Issue
--------------------------+-------------------------------------------------
 Reporter:  jerrydgeorge  |       Owner:  Ela  
     Type:  defect        |      Status:  new  
 Priority:  blocker       |   Milestone:       
Component:  vtigercrm     |     Version:  5.0.0
 Keywords:                |  
--------------------------+-------------------------------------------------
 Unable to find the Send Button

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1317>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 23:14:36 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 06:14:36 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7096 -
 /vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php
Message-ID: <20060615061437.1E6CE7ED1B9@vtiger.fosslabs.com>

Author: don
Date: Thu Jun 15 00:14:32 2006
New Revision: 7096

Log:
added vtiger_ prefix for table names

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

Modified: vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php (original)
+++ vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php Thu Jun 15 00:14:32 2006
@@ -25,7 +25,7 @@
 
 //checking if the user is trying to create a custom vtiger_field which already exists  
 
-$checkquery="select * from vtiger_field where vtiger_tabid='".$tabid."'and vtiger_fieldlabel='".$fldlabel."'";
+$checkquery="select * from vtiger_field where tabid='".$tabid."'and fieldlabel='".$fldlabel."'";
 $checkresult=$adb->query($checkquery);
 
 if($adb->num_rows($checkresult) != 0)
@@ -256,7 +256,7 @@
 		}
 		else
 		{
-			$query = "update vtiger_field set vtiger_fieldlabel='".$fldlabel."',typeofdata='".$uichekdata."' where vtiger_fieldid=".$_REQUEST['fieldid'];
+			$query = "update vtiger_field set fieldlabel='".$fldlabel."',typeofdata='".$uichekdata."' where fieldid=".$_REQUEST['fieldid'];
 			$adb->query($query);
 		}
 		//Inserting values into vtiger_profile2field vtiger_tables
@@ -283,7 +283,7 @@
 			// Creating the PickList Table and Populating Values
 			$adb->createTable($columnName, $columnName." C(255)");
 			//Adding Primary Key
-			$qur = "ALTER vtiger_table ".$columnName." ADD PRIMARY KEY (". $columnName.")";
+			$qur = "ALTER table ".$columnName." ADD PRIMARY KEY (". $columnName.")";
 			$adb->query($qur);
 
 			$fldPickList =  $_REQUEST['fldPickList'];



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 23:17:34 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 06:17:34 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7097 -
	/vtigercrm/trunk/modules/Settings/CurrencyDelete.php
Message-ID: <20060615061735.1C65F7ED1BD@vtiger.fosslabs.com>

Author: don
Date: Thu Jun 15 00:17:31 2006
New Revision: 7097

Log:
added vtiger_ prefix for table names

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

Modified: vtigercrm/trunk/modules/Settings/CurrencyDelete.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/CurrencyDelete.php (original)
+++ vtigercrm/trunk/modules/Settings/CurrencyDelete.php Thu Jun 15 00:17:31 2006
@@ -11,7 +11,7 @@
 
 $del_id = $_REQUEST['delete_currency_id'];
 $tran_id = $_REQUEST['transfer_currency_id'];
-$sql0 = "update vtiger_users set vtiger_currency_id=".$tran_id." where vtiger_currency_id=".$del_id;
+$sql0 = "update vtiger_users set currency_id=".$tran_id." where currency_id=".$del_id;
 $adb->query($sql0);
 $sql = "delete from vtiger_currency_info where id =".$del_id;
 $adb->query($sql);



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 23:19:14 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 06:19:14 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7098 -
 /vtigercrm/trunk/modules/Settings/CurrencyEditView.php
Message-ID: <20060615061914.EE5DE7ED1BD@vtiger.fosslabs.com>

Author: don
Date: Thu Jun 15 00:19:11 2006
New Revision: 7098

Log:
prefixed vtiger_ in all table names

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

Modified: vtigercrm/trunk/modules/Settings/CurrencyEditView.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/CurrencyEditView.php (original)
+++ vtigercrm/trunk/modules/Settings/CurrencyEditView.php Thu Jun 15 00:19:11 2006
@@ -21,7 +21,7 @@
         $sql = "select * from vtiger_currency_info where id=".$tempid;
         $result = $adb->query($sql);
         $currencyResult = $adb->fetch_array($result);
-	$sql1 = "select * from vtiger_users where vtiger_currency_id=".$tempid;
+	$sql1 = "select * from vtiger_users where currency_id=".$tempid;
 	$result1 = $adb->query($sql1);
 	$noofrows = $adb->num_rows($result1);
 	if($noofrows != 0)



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 23:22:45 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 06:22:45 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7099 -
 /vtigercrm/trunk/modules/Settings/DeleteCustomField.php
Message-ID: <20060615062245.88B137ED1BD@vtiger.fosslabs.com>

Author: don
Date: Thu Jun 15 00:22:41 2006
New Revision: 7099

Log:
prefixed vtiger_ in all table names

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

Modified: vtigercrm/trunk/modules/Settings/DeleteCustomField.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/DeleteCustomField.php (original)
+++ vtigercrm/trunk/modules/Settings/DeleteCustomField.php Thu Jun 15 00:22:41 2006
@@ -19,15 +19,15 @@
 $uitype = $_REQUEST["uitype"];
 
 //Deleting the CustomField from the Custom Field Table
-$query='delete from vtiger_field where vtiger_fieldid="'.$id.'"';
+$query='delete from vtiger_field where fieldid="'.$id.'"';
 $adb->query($query);
 
 //Deleting from vtiger_profile2field vtiger_table
-$query='delete from vtiger_profile2field where vtiger_fieldid="'.$id.'"';
+$query='delete from vtiger_profile2field where fieldid="'.$id.'"';
 $adb->query($query);
 
 //Deleting from vtiger_def_org_field vtiger_table
-$query='delete from vtiger_def_org_field where vtiger_fieldid="'.$id.'"';
+$query='delete from vtiger_def_org_field where fieldid="'.$id.'"';
 $adb->query($query);
 
 //Dropping the column in the module vtiger_table
@@ -57,7 +57,7 @@
 }
 //echo '<BR>';
 //echo $tableName;
-$dbquery = 'Alter vtiger_table '.$tableName.' Drop Column '.$colName;
+$dbquery = 'Alter table '.$tableName.' Drop Column '.$colName;
 $adb->query($dbquery);
 
 //Deleting from convert lead mapping vtiger_table- Jaguar
@@ -70,7 +70,7 @@
 
 if($uitype == 15)
 {
-$deltablequery = 'drop vtiger_table '.$colName;
+$deltablequery = 'drop table '.$colName;
 $adb->query($deltablequery);
 }
 header("Location:index.php?module=Settings&action=CustomFieldList&fld_module=".$fld_module."&parenttab=Settings");



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 23:41:14 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 06:41:14 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7100 -
 /vtigercrm/trunk/modules/Settings/DeleteLeadCustomFieldMapping.php
Message-ID: <20060615064114.9C47E7ED1B1@vtiger.fosslabs.com>

Author: don
Date: Thu Jun 15 00:41:11 2006
New Revision: 7100

Log:
prefixed vtiger_ in all table names

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

Modified: vtigercrm/trunk/modules/Settings/DeleteLeadCustomFieldMapping.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/DeleteLeadCustomFieldMapping.php (original)
+++ vtigercrm/trunk/modules/Settings/DeleteLeadCustomFieldMapping.php Thu Jun 15 00:41:11 2006
@@ -16,7 +16,7 @@
 
 if($id !='')
 {
-	$sql="update vtiger_convertleadmapping set vtiger_accountfid ='NULL',contactfid='NULL',potentialfid='NULL' where cfmid=".$id;
+	$sql="update vtiger_convertleadmapping set accountfid ='NULL',contactfid='NULL',potentialfid='NULL' where cfmid=".$id;
 	$result = $adb->query($sql);
 }
 



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 23:42:22 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 06:42:22 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7101 -
 /vtigercrm/trunk/modules/Settings/DeleteMailAccount.php
Message-ID: <20060615064222.19BC37ED1B1@vtiger.fosslabs.com>

Author: don
Date: Thu Jun 15 00:42:18 2006
New Revision: 7101

Log:
prefixed vtiger_ in all table names

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

Modified: vtigercrm/trunk/modules/Settings/DeleteMailAccount.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/DeleteMailAccount.php (original)
+++ vtigercrm/trunk/modules/Settings/DeleteMailAccount.php Thu Jun 15 00:42:18 2006
@@ -21,7 +21,7 @@
 {
 	if($account_id != '')
 	{
-		$query = "update vtiger_mail_accounts set status=0 where vtiger_account_id=".$account_id;
+		$query = "update vtiger_mail_accounts set status=0 where account_id=".$account_id;
 		$adb->query($query);
 	}
 }



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 23:44:08 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 06:44:08 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7102 -
	/vtigercrm/trunk/modules/Settings/EditComboField.php
Message-ID: <20060615064408.7131A7ED1AE@vtiger.fosslabs.com>

Author: don
Date: Thu Jun 15 00:44:04 2006
New Revision: 7102

Log:
prefixed vtiger_ in all table names

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

Modified: vtigercrm/trunk/modules/Settings/EditComboField.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/EditComboField.php (original)
+++ vtigercrm/trunk/modules/Settings/EditComboField.php Thu Jun 15 00:44:04 2006
@@ -23,7 +23,7 @@
 require_once($theme_path.'layout_utils.php');
 
 $smarty = new vtigerCRM_Smarty;
-$query = "select * from ".$tableName ;//." order by sortorderid";
+$query = "select * from vtiger_".$tableName ;//." order by sortorderid";
 $result = $adb->query($query);
 $fldVal='';
 



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 23:48:57 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 06:48:57 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7103 -
	/vtigercrm/trunk/modules/Settings/EditFieldBlock.php
Message-ID: <20060615064857.ACBB87ED1B6@vtiger.fosslabs.com>

Author: don
Date: Thu Jun 15 00:48:53 2006
New Revision: 7103

Log:
prefixed vtiger_ in all table names

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

Modified: vtigercrm/trunk/modules/Settings/EditFieldBlock.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/EditFieldBlock.php (original)
+++ vtigercrm/trunk/modules/Settings/EditFieldBlock.php Thu Jun 15 00:48:53 2006
@@ -33,7 +33,7 @@
 	global $adb,$saveNames;
 
 	$b = array();	
-	$sql="select vtiger_fieldid,fieldlabel,block from vtiger_field,tab where vtiger_field.tabid=vtiger_tab.tabid and vtiger_tab.tabid=$tabId order by block,sequence";
+	$sql="select fieldid,fieldlabel,block from vtiger_field,tab where vtiger_field.tabid=vtiger_tab.tabid and vtiger_tab.tabid=$tabId order by block,sequence";
 	$result = $adb->query($sql);
 	$noofrows = $adb->num_rows($result);
 	
@@ -244,7 +244,7 @@
 	?>
 
 	<p align="left">
-		<b>Please review the vtiger_notes at the bottom for things to keep in mind!<br></b>
+		<b>Please review the notes at the bottom for things to keep in mind!<br></b>
 	</p>
 <script language="JavaScript" type="text/javascript" src="include/dd/dd_files/coordinates.js"></script>
 <script language="JavaScript" type="text/javascript" src="include/dd/dd_files/drag.js"></script>
@@ -289,16 +289,16 @@
 	</tr>
 </table>
 <p align="left">
-	1) &nbsp;If you move a vtiger_field into a currently unused block, you will have to update the appropriate language file in
+	1) &nbsp;If you move a field into a currently unused block, you will have to update the appropriate language file in
 	<b>modules/Potentials/language/en_us.lang.php</b>.<br>
-	2) &nbsp;Please see vtiger_notes on arranging vtiger_fields below:
+	2) &nbsp;Please see notes on arranging fields below:
 </p>
 <div align="left">
 	<table border="1" cellpadding="0" cellspacing="0" bordercolordark="white" bordercolorlight="black">
 		<tr>
 			<td width="325" align="right">
 				<p align="center">
-					The vtiger_tabs are arrange in 2 columns as follows:
+					The tabs are arrange in 2 columns as follows:
 				</p>
 			</td>
 			<td width="325" align="right">



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 23:51:14 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 06:51:14 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7104 -
	/vtigercrm/trunk/modules/Settings/Forms.php
Message-ID: <20060615065114.D2E387ED1B6@vtiger.fosslabs.com>

Author: don
Date: Thu Jun 15 00:51:10 2006
New Revision: 7104

Log:
prefixed vtiger_ in all table names

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

Modified: vtigercrm/trunk/modules/Settings/Forms.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/Forms.php (original)
+++ vtigercrm/trunk/modules/Settings/Forms.php Thu Jun 15 00:51:10 2006
@@ -115,7 +115,7 @@
 $qcreate_form = get_left_form_header($mod_strings['LBL_NEW_FORM_TITLE']);
 
 
-$qcreate_get_field="select * from vtiger_field where vtiger_tabid=4 and quickcreate=0 order by quickcreatesequence";
+$qcreate_get_field="select * from vtiger_field where tabid=4 and quickcreate=0 order by quickcreatesequence";
 $qcreate_get_result=$adb->query($qcreate_get_field);
 $qcreate_get_noofrows=$adb->num_rows($qcreate_get_result);
 
@@ -203,9 +203,9 @@
 $qcreate_form.='</form>';
 $qcreate_form.='<script type="text/javascript">
 
-        var vtiger_fieldname = new Array('.$fieldName.')
-        var vtiger_fieldlabel = new Array('.$fieldLabel.')
-        var vtiger_fielddatatype = new Array('.$fldDataType.')
+        var fieldname = new Array('.$fieldName.')
+        var fieldlabel = new Array('.$fieldLabel.')
+        var fielddatatype = new Array('.$fldDataType.')
 
                 </script>';
 



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 00:08:48 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 07:08:48 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7105 -
 /vtigercrm/trunk/modules/Settings/LeadCustomFieldMapping.php
Message-ID: <20060615070848.56A307ED1CB@vtiger.fosslabs.com>

Author: don
Date: Thu Jun 15 01:08:44 2006
New Revision: 7105

Log:
prefixed vtiger_ in all table names

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

Modified: vtigercrm/trunk/modules/Settings/LeadCustomFieldMapping.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/LeadCustomFieldMapping.php (original)
+++ vtigercrm/trunk/modules/Settings/LeadCustomFieldMapping.php Thu Jun 15 01:08:44 2006
@@ -31,7 +31,7 @@
 {
 	global $adb;
 	$accountcf=Array();
-	$sql="select vtiger_fieldid,fieldlabel from vtiger_field,tab where vtiger_field.tabid=vtiger_tab.tabid and generatedtype=2 and vtiger_tab.name='Accounts'";
+	$sql="select fieldid,fieldlabel from vtiger_field,vtiger_tab where vtiger_field.tabid=vtiger_tab.tabid and generatedtype=2 and vtiger_tab.name='Accounts'";
 	$result = $adb->query($sql);
 	$noofrows = $adb->num_rows($result);
 	
@@ -54,7 +54,7 @@
 {	
 	global $adb;	
 	$contactcf=Array();
-	$sql="select vtiger_fieldid,fieldlabel from vtiger_field,tab where vtiger_field.tabid=vtiger_tab.tabid and generatedtype=2 and vtiger_tab.name='Contacts'";
+	$sql="select fieldid,fieldlabel from vtiger_field,vtiger_tab where vtiger_field.tabid=vtiger_tab.tabid and generatedtype=2 and vtiger_tab.name='Contacts'";
 	$result = $adb->query($sql);
 	$noofrows = $adb->num_rows($result);
 	for($i=0; $i<$noofrows; $i++)
@@ -76,7 +76,7 @@
 {
 	global $adb;	
 	$potentialcf=Array();
-	$sql="select vtiger_fieldid,fieldlabel from vtiger_field,tab where vtiger_field.tabid=vtiger_tab.tabid and generatedtype=2 and vtiger_tab.name='Potentials'";
+	$sql="select fieldid,fieldlabel from vtiger_field,vtiger_tab where vtiger_field.tabid=vtiger_tab.tabid and generatedtype=2 and vtiger_tab.name='Potentials'";
 	$result = $adb->query($sql);
 	$noofrows = $adb->num_rows($result);
 	for($i=0; $i<$noofrows; $i++)
@@ -93,7 +93,7 @@
 	$potentialcf[$leadid.'_potential']=$potential_cfelement;
         return $potentialcf;
 }
-$lead_sql="select vtiger_fieldid,fieldlabel from vtiger_field,tab where vtiger_field.tabid=vtiger_tab.tabid and generatedtype=2 and vtiger_tab.name='Leads'";
+$lead_sql="select vtiger_fieldid,fieldlabel from vtiger_field,vtiger_tab where vtiger_field.tabid=vtiger_tab.tabid and generatedtype=2 and vtiger_tab.name='Leads'";
 $result = $adb->query($lead_sql);
 $noofrows = $adb->num_rows($result);
 



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 00:11:01 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 07:11:01 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7106 -
 /vtigercrm/trunk/modules/Settings/ListLeadCustomFieldMapping.php
Message-ID: <20060615071101.B16BC7ED1BC@vtiger.fosslabs.com>

Author: don
Date: Thu Jun 15 01:10:57 2006
New Revision: 7106

Log:
prefixed vtiger_ in all table names

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

Modified: vtigercrm/trunk/modules/Settings/ListLeadCustomFieldMapping.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/ListLeadCustomFieldMapping.php (original)
+++ vtigercrm/trunk/modules/Settings/ListLeadCustomFieldMapping.php Thu Jun 15 01:10:57 2006
@@ -38,20 +38,20 @@
 		$cfmid = $adb->query_result($result,$i,'cfmid');
 
 		$display_val .= '<tr height="20" class="Datafield">';
-		$sql1="select vtiger_fieldlabel from vtiger_field where vtiger_fieldid ='".$leadid."'";
+		$sql1="select fieldlabel from vtiger_field where fieldid ='".$leadid."'";
 		$result1 = $adb->query($sql1);
 		$leadfield = $adb->query_result($result1,0,'fieldlabel');
 		$label['leadlabel'] = $leadfield;
-		$sql2="select vtiger_fieldlabel from vtiger_field where vtiger_fieldid ='".$accountid."'";
+		$sql2="select fieldlabel from vtiger_field where fieldid ='".$accountid."'";
 		$result2 = $adb->query($sql2);
 		$accountfield = $adb->query_result($result2,0,'fieldlabel');
 		$label['accountlabel'] = $accountfield;
 		
-		$sql3="select vtiger_fieldlabel from vtiger_field where vtiger_fieldid ='".$contactid."'";
+		$sql3="select fieldlabel from vtiger_field where fieldid ='".$contactid."'";
 		$result3 = $adb->query($sql3);
 		$contactfield = $adb->query_result($result3,0,'fieldlabel');
 		$label['contactlabel'] = $contactfield;
-		$sql4="select vtiger_fieldlabel from vtiger_field where vtiger_fieldid ='".$potentialid."'";
+		$sql4="select fieldlabel from vtiger_field where fieldid ='".$potentialid."'";
 		$result4 = $adb->query($sql4);
 		$potentialfield = $adb->query_result($result4,0,'fieldlabel');
 		$label['potentiallabel'] = $potentialfield;



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 00:13:09 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 07:13:09 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7107 -
 /vtigercrm/trunk/modules/Settings/ListModuleOwners.php
Message-ID: <20060615071309.B20357ED1C9@vtiger.fosslabs.com>

Author: don
Date: Thu Jun 15 01:13:06 2006
New Revision: 7107

Log:
prefixed vtiger_ in all table names

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 Thu Jun 15 01:13:06 2006
@@ -27,7 +27,7 @@
 		$tabid = getTabid($val);
 		if($tabid != '' && $userid != '')
 		{
-			$sql = 'update vtiger_moduleowners set user_id = '.$userid.' where vtiger_tabid = '.$tabid;
+			$sql = 'update vtiger_moduleowners set user_id = '.$userid.' where tabid = '.$tabid;
 			$adb->query($sql);
 		}
 	}
@@ -81,7 +81,7 @@
 function getModuleOwner($tabid)
 {
 	global $adb;
-	$sql = "select * from vtiger_moduleowners where vtiger_tabid=".$tabid;
+	$sql = "select * from vtiger_moduleowners where tabid=".$tabid;
 	$res = $adb->query($sql);
 	$userid = $adb->query_result($res,0,'user_id');
 
@@ -106,7 +106,7 @@
 	global $adb;
 
 	$tabid = getTabid($name);
-	$sql = "select * from vtiger_moduleowners where vtiger_tabid=".$tabid;
+	$sql = "select * from vtiger_moduleowners where tabid=".$tabid;
 	$res = $adb->query($sql);
 	$db_userid = $adb->query_result($res,0,'user_id');
 	



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 00:16:40 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 07:16:40 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7108 -
	/vtigercrm/trunk/modules/Settings/PickList.php
Message-ID: <20060615071640.48F9C7ED1C9@vtiger.fosslabs.com>

Author: don
Date: Thu Jun 15 01:16:36 2006
New Revision: 7108

Log:
prefixed vtiger_ in all table names

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

Modified: vtigercrm/trunk/modules/Settings/PickList.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/PickList.php (original)
+++ vtigercrm/trunk/modules/Settings/PickList.php Thu Jun 15 01:16:36 2006
@@ -48,7 +48,7 @@
 	global $adb;
 	$user_fld = Array();
 	$tabid = getTabid($fldmodule);
-	$query = "select vtiger_fieldlabel,generatedtype,columnname,fieldname from vtiger_field where displaytype = 1 and (tabid = ".getTabid($fld_module)." AND uitype IN (15,16)) OR (tabid = ".getTabid($fld_module)." AND vtiger_fieldname='salutationtype')";
+	$query = "select fieldlabel,generatedtype,columnname,fieldname from vtiger_field where displaytype = 1 and (tabid = ".getTabid($fld_module)." AND uitype IN (15,16)) OR (tabid = ".getTabid($fld_module)." AND fieldname='salutationtype')";
 	$result = $adb->query($query);
 	$noofrows = $adb->num_rows($result);
     if($noofrows > 0)
@@ -115,7 +115,7 @@
 function getPickListModules()
 {
 	global $adb;
-	$query = 'select distinct vtiger_field.fieldname,vtiger_field.tabid,tablabel from vtiger_field inner join vtiger_tab on vtiger_tab.tabid=vtiger_field.tabid where uitype IN (15,16)';
+	$query = 'select distinct field.fieldname,vtiger_field.tabid,tablabel from vtiger_field inner join vtiger_tab on vtiger_tab.tabid=vtiger_field.tabid where uitype IN (15,16)';
 	$result = $adb->query($query);
 	while($row = $adb->fetch_array($result))
 	{



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 00:21:57 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 07:21:57 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7109 -
 /vtigercrm/trunk/modules/Settings/SaveConvertLead.php
Message-ID: <20060615072157.5F3207ED1C9@vtiger.fosslabs.com>

Author: don
Date: Thu Jun 15 01:21:53 2006
New Revision: 7109

Log:
prefixed vtiger_ in all table names

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

Modified: vtigercrm/trunk/modules/Settings/SaveConvertLead.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/SaveConvertLead.php (original)
+++ vtigercrm/trunk/modules/Settings/SaveConvertLead.php Thu Jun 15 01:21:53 2006
@@ -15,7 +15,7 @@
 
 //echo"<h3> In Save</h3>";
 	
-	$sql="select vtiger_fieldid from vtiger_field, vtiger_tab where vtiger_field.tabid=vtiger_tab.tabid and generatedtype=2 and vtiger_tab.name='Leads';";	
+	$sql="select fieldid from vtiger_field, vtiger_tab where vtiger_field.tabid=vtiger_tab.tabid and generatedtype=2 and vtiger_tab.name='Leads';";	
 //	echo $sql;	
 	$result = $adb->query($sql);
 	$noofrows = $adb->num_rows($result);
@@ -43,7 +43,7 @@
 		{
 			$potential_id_val="";
 		}
-		$update_sql="update vtiger_convertleadmapping set vtiger_accountfid='".$account_id_val."',contactfid='".$contact_id_val."',potentialfid='".$potential_id_val."' where leadfid=".$lead_id;
+		$update_sql="update vtiger_convertleadmapping set accountfid='".$account_id_val."',contactfid='".$contact_id_val."',potentialfid='".$potential_id_val."' where leadfid=".$lead_id;
 
 		$adb->query($update_sql);
 	}



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 00:25:04 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 07:25:04 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7110 -
 /vtigercrm/trunk/modules/Settings/SaveCurrencyInfo.php
Message-ID: <20060615072504.49BDA7ED1C9@vtiger.fosslabs.com>

Author: don
Date: Thu Jun 15 01:24:59 2006
New Revision: 7110

Log:
prefixed vtiger_ in all table names

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

Modified: vtigercrm/trunk/modules/Settings/SaveCurrencyInfo.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/SaveCurrencyInfo.php (original)
+++ vtigercrm/trunk/modules/Settings/SaveCurrencyInfo.php Thu Jun 15 01:24:59 2006
@@ -20,7 +20,7 @@
 
 if(isset($_REQUEST['record']) && $_REQUEST['record']!='')
 {
-        $sql = "update vtiger_currency_info set vtiger_currency_name ='".$currency_name."', vtiger_currency_code ='".$currency_code."', vtiger_currency_symbol ='".$currency_symbol."', conversion_rate ='".$conversion_rate."',currency_status='".$currency_status."' where id =".$_REQUEST['record'];
+        $sql = "update vtiger_currency_info set currency_name ='".$currency_name."', currency_code ='".$currency_code."', currency_symbol ='".$currency_symbol."', conversion_rate ='".$conversion_rate."',currency_status='".$currency_status."' where id =".$_REQUEST['record'];
 }
 else
 {



From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 02:01:05 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 09:01:05 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231308=3A?=
 =?utf-8?q?_Role_security_issue_=28cf_=23599=29?=
In-Reply-To: <076.c439add42e557216aac6af17846b79b5@vtiger.fosslabs.com>
References: <076.c439add42e557216aac6af17846b79b5@vtiger.fosslabs.com>
Message-ID: <085.2b8191e4d6281cccc3e6b69566684f19@vtiger.fosslabs.com>

#1308: Role security issue (cf #599)
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  developer     
      Type:  defect     |      Status:  new           
  Priority:  critical   |   Milestone:                
 Component:  vtigercrm  |     Version:  5.0.0         
Resolution:             |    Keywords:  security roles
------------------------+---------------------------------------------------
Changes (by web at reponse.net):

  * milestone:  5.0.0 =>

Comment:

 Settings > Users & Access Management > Organisation Sharing Privileges Add
 Custom Privilege Rule related to issue 599

 if you give to a role A rights to read-only to a role B items, the role A
 can delete thems !

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1308>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 02:33:23 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 09:33:23 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7111 -
 /vtigercrm/trunk/modules/Settings/SaveMailAccount.php
Message-ID: <20060615093323.C521E7ED1C9@vtiger.fosslabs.com>

Author: don
Date: Thu Jun 15 03:33:19 2006
New Revision: 7111

Log:
prefixed vtiger_ in all table names

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

Modified: vtigercrm/trunk/modules/Settings/SaveMailAccount.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/SaveMailAccount.php (original)
+++ vtigercrm/trunk/modules/Settings/SaveMailAccount.php Thu Jun 15 03:33:19 2006
@@ -33,7 +33,7 @@
 
 if(isset($_REQUEST['edit']) && $_REQUEST['edit'] && $_REQUEST['record']!='')
 {
-	$sql="update vtiger_mail_accounts set display_name = '".$displayname."', mail_id = '".$email."', vtiger_account_name = '".$account_name."', mail_protocol = '".$mailprotocol."', mail_username = '".$server_username."', mail_password='".$server_password."', mail_servername='".$mail_servername."',  box_refresh='".$box_refresh."',  mails_per_page='".$mails_per_page."', ssltype='".$ssltype."' , sslmeth='".$sslmeth."', int_mailer='".$_REQUEST["int_mailer"]."' where user_id = '".$id."'";
+	$sql="update vtiger_mail_accounts set display_name = '".$displayname."', mail_id = '".$email."', account_name = '".$account_name."', mail_protocol = '".$mailprotocol."', mail_username = '".$server_username."', mail_password='".$server_password."', mail_servername='".$mail_servername."',  box_refresh='".$box_refresh."',  mails_per_page='".$mails_per_page."', ssltype='".$ssltype."' , sslmeth='".$sslmeth."', int_mailer='".$_REQUEST["int_mailer"]."' where user_id = '".$id."'";
 }
 else
 {



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 02:36:34 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 09:36:34 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7112 -
 /vtigercrm/trunk/modules/Settings/SettingsSubMenu.php
Message-ID: <20060615093634.233457ED1E5@vtiger.fosslabs.com>

Author: don
Date: Thu Jun 15 03:36:30 2006
New Revision: 7112

Log:
prefixed vtiger_ in all table names

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

Modified: vtigercrm/trunk/modules/Settings/SettingsSubMenu.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/SettingsSubMenu.php (original)
+++ vtigercrm/trunk/modules/Settings/SettingsSubMenu.php Thu Jun 15 03:36:30 2006
@@ -88,7 +88,7 @@
 		global $theme;
 		$theme_path="themes/".$theme."/";
 		$image_path=$theme_path."images/";
-		$dbQuery = "select vtiger_fieldid,columnname,fieldlabel,uitype,displaytype from vtiger_field where vtiger_tabid=".$tabid." and generatedtype=2 order by sequence";
+		$dbQuery = "select fieldid,columnname,fieldlabel,uitype,displaytype from vtiger_field where tabid=".$tabid." and generatedtype=2 order by sequence";
 		$result = $adb->query($dbQuery);
 		$row = $adb->fetch_array($result);
 		$count=1;



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 02:40:56 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 09:40:56 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7113 -
 /vtigercrm/trunk/modules/Settings/UpdateComboValues.php
Message-ID: <20060615094056.D10897ED1E5@vtiger.fosslabs.com>

Author: don
Date: Thu Jun 15 03:40:52 2006
New Revision: 7113

Log:
prefixed vtiger_ in all table names

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

Modified: vtigercrm/trunk/modules/Settings/UpdateComboValues.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/UpdateComboValues.php (original)
+++ vtigercrm/trunk/modules/Settings/UpdateComboValues.php Thu Jun 15 03:40:52 2006
@@ -14,7 +14,7 @@
 $fldPickList =  $_REQUEST['listarea'];
 
 //Deleting the already existing values
-$delquery="delete from ".$tableName;
+$delquery="delete from vtiger_".$tableName;
 $adb->query($delquery);
 
 $pickArray = explode("\n",$fldPickList);
@@ -31,9 +31,9 @@
 	if($pickArray[$i] != '')
 	{
 		if($custom)
-			$query = "insert into ".$tableName." values('".$pickArray[$i]."')";
+			$query = "insert into vtiger_".$tableName." values('".$pickArray[$i]."')";
 		else
-			$query = "insert into ".$tableName." values('','".$pickArray[$i]."',".$i.",1)";
+			$query = "insert into vtiger_".$tableName." values('','".$pickArray[$i]."',".$i.",1)";
         $adb->query($query);
 	}
 }



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 02:46:29 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 09:46:29 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7114 -
	/vtigercrm/trunk/include/CustomFieldUtil.php
Message-ID: <20060615094629.CE8D47ED1E9@vtiger.fosslabs.com>

Author: don
Date: Thu Jun 15 03:46:25 2006
New Revision: 7114

Log:
prefixed vtiger_ in all table names

Modified:
    vtigercrm/trunk/include/CustomFieldUtil.php

Modified: vtigercrm/trunk/include/CustomFieldUtil.php
==============================================================================
--- vtigercrm/trunk/include/CustomFieldUtil.php (original)
+++ vtigercrm/trunk/include/CustomFieldUtil.php Thu Jun 15 03:46:25 2006
@@ -91,7 +91,7 @@
 	global $log;
 	$log->debug("Entering getCustomFieldArray(".$module.") method ...");
 	global $adb;
-	$custquery = "select * from vtiger_field where vtiger_tablename='".$module."'";
+	$custquery = "select * from vtiger_field where tablename='".$module."'";
 	$custresult = $adb->query($custquery);
 	$custFldArray = Array();
 	$noofrows = $adb->num_rows($custresult);
@@ -117,7 +117,7 @@
 	$log->debug("Entering getCustomFieldTrans(".$module.",". $trans_array.") method ...");
 	global $adb;
 	$tab_id = getTabid($module);	
-	$custquery = "select columnname,fieldlabel from vtiger_field where generatedtype=2 and vtiger_tabid=".$tab_id;
+	$custquery = "select columnname,fieldlabel from vtiger_field where generatedtype=2 and tabid=".$tab_id;
 	$custresult = $adb->query($custquery);
 	$custFldArray = Array();
 	$noofrows = $adb->num_rows($custresult);
@@ -143,7 +143,7 @@
 	global $log;
 	$log->debug("Entering getCustomFieldData(".$tab.",".$id.",".$datatype.") method ...");
 	global $adb;
-	$query = "select * from vtiger_field where vtiger_tabid=".$tab." and vtiger_fieldid=".$id;
+	$query = "select * from vtiger_field where tabid=".$tab." and fieldid=".$id;
 	$result = $adb->query($query);
 	$return_data=$adb->fetch_array($result);
 	$log->debug("Exiting getCustomFieldData method ...");



From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 02:55:26 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 09:55:26 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231271=3A?=
 =?utf-8?q?_Organisation_wont_save_when_containt_=27?=
In-Reply-To: <076.62b916cddc422a4f2f6a8828de68207a@vtiger.fosslabs.com>
References: <076.62b916cddc422a4f2f6a8828de68207a@vtiger.fosslabs.com>
Message-ID: <085.7d2757daf0f7edafdbfebcff51e91a02@vtiger.fosslabs.com>

#1271: Organisation wont save when containt '
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  allanbush          
      Type:  defect     |      Status:  closed             
  Priority:  major      |   Milestone:  5.0.0              
 Component:  vtigercrm  |     Version:  5.0.0              
Resolution:  fixed      |    Keywords:  organisation, quote
------------------------+---------------------------------------------------
Comment (by abos):

 Working now, nopb.
 Thanks, and sorry.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1271>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 03:14:50 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 10:14:50 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7116 -
 /vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php
Message-ID: <20060615101451.3FB967ED1C9@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 15 04:14:47 2006
New Revision: 7116

Log:
* Modified the crmid to parent_id which throws error in Notes Listview

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 Thu Jun 15 04:14:47 2006
@@ -1339,7 +1339,7 @@
 $insert_query_array16 = Array(
 		"insert into vtiger_cvcolumnlist values ($cvid,0,'notes:title:title:Notes_Title:V')",
 		"insert into vtiger_cvcolumnlist values ($cvid,1,'notes:contact_id:contact_id:Notes_Contact_Name:I')",
-		"insert into vtiger_cvcolumnlist values ($cvid,2,'senotesrel:crmid:crmid:Notes_Related_To:I')",
+		"insert into vtiger_cvcolumnlist values ($cvid,2,'senotesrel:crmid:parent_id:Notes_Related_to:I')",
 		"insert into vtiger_cvcolumnlist values ($cvid,3,'notes:filename:filename:Notes_File:V')",
 		"insert into vtiger_cvcolumnlist values ($cvid,4,'crmentity:modifiedtime:modifiedtime:Notes_Modified_Time:V')"
 			     );



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 03:24:44 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 10:24:44 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7118 -
 /vtigercrm/trunk/modules/Settings/CreateCustomField.php
Message-ID: <20060615102444.C565F7ED1E9@vtiger.fosslabs.com>

Author: don
Date: Thu Jun 15 04:24:40 2006
New Revision: 7118

Log:
prefixed vtiger_ in all table names

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

Modified: vtigercrm/trunk/modules/Settings/CreateCustomField.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/CreateCustomField.php (original)
+++ vtigercrm/trunk/modules/Settings/CreateCustomField.php Thu Jun 15 04:24:40 2006
@@ -61,7 +61,7 @@
 	$readonly = "readonly";
 	if($fieldtype == '7' || $fieldtype == '11')
 	{
-		$query = "select * from ".$customfield_columnname;
+		$query = "select * from vtiger_".$customfield_columnname;
 		$result = $adb->query($query);
 		$fldVal='';
 		while($row = $adb->fetch_array($result))



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 03:27:49 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 10:27:49 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7119 -
	/vtigercrm/trunk/modules/Settings/PickList.php
Message-ID: <20060615102749.2EB027D7FF0@vtiger.fosslabs.com>

Author: don
Date: Thu Jun 15 04:27:45 2006
New Revision: 7119

Log:
prefixed vtiger_ in all table names

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

Modified: vtigercrm/trunk/modules/Settings/PickList.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/PickList.php (original)
+++ vtigercrm/trunk/modules/Settings/PickList.php Thu Jun 15 04:27:45 2006
@@ -115,7 +115,7 @@
 function getPickListModules()
 {
 	global $adb;
-	$query = 'select distinct field.fieldname,vtiger_field.tabid,tablabel from vtiger_field inner join vtiger_tab on vtiger_tab.tabid=vtiger_field.tabid where uitype IN (15,16)';
+	$query = 'select distinct vtiger_field.fieldname,vtiger_field.tabid,tablabel from vtiger_field inner join vtiger_tab on vtiger_tab.tabid=vtiger_field.tabid where uitype IN (15,16)';
 	$result = $adb->query($query);
 	while($row = $adb->fetch_array($result))
 	{



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 03:36:36 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 10:36:36 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7120 -
 /vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php
Message-ID: <20060615103637.321FC7D7FF0@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 15 04:36:33 2006
New Revision: 7120

Log:
* Added queries to modify the wordtemplates table when the user migrates from 4.2 Patch 2 instead of 4.2.3

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 Thu Jun 15 04:36:33 2006
@@ -17,6 +17,20 @@
 global $success_query_array, $failure_query_array;
 
 $conn->println("Database Modifications for 4.2 Patch2 ==> 5.0(Alpha) Dev 3 Starts here.");
+
+
+
+//These changes have been made in 4.2.3. The following queries have been included who has run the migration from 4.2 Patch2
+$wordtemplate_query1 = "alter table wordtemplates DROP PRIMARY KEY";
+Execute($wordtemplate_query1);
+
+$wordtemplate_query2 = "alter table wordtemplates DROP templateid";//this will fail if 4.2 Patch 2.
+$conn->query($wordtemplate_query2);
+
+$wordtemplate_query3 = "alter table wordtemplates add column templateid integer(19) unsigned auto_increment primary key FIRST";
+Execute($wordtemplate_query3);
+//upto this added to modify the wordtemplates table which will be in the case of migrate from 4.2 Path2.
+
 
 
 /****************** 5.0(Alpha) dev version 1 Database changes -- Starts*********************/



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 03:37:43 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 10:37:43 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7121 -
	/vtigercrm/trunk/modules/Settings/PickList.php
Message-ID: <20060615103743.84F587D7FF0@vtiger.fosslabs.com>

Author: don
Date: Thu Jun 15 04:37:39 2006
New Revision: 7121

Log:
prefixed vtiger_ in all table names

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

Modified: vtigercrm/trunk/modules/Settings/PickList.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/PickList.php (original)
+++ vtigercrm/trunk/modules/Settings/PickList.php Thu Jun 15 04:37:39 2006
@@ -103,7 +103,7 @@
 function getPickListValues($tablename)
 {
 	global $adb;	
-	$query = "select * from ".$tablename." order by sortorderid";
+	$query = "select * from vtiger_".$tablename." order by sortorderid";
 	$result = $adb->query($query);
 	$fldVal = Array();
 	while($row = $adb->fetch_array($result))



From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 03:53:19 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 10:53:19 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231318=3A?=
	=?utf-8?q?_Outlook_Connector_Bugs?=
Message-ID: <076.efa3e47083b3f3c62106837df2debdd5@vtiger.fosslabs.com>

#1318: Outlook Connector Bugs
---------------------------+------------------------------------------------
 Reporter:  arosewarne     |       Owner:  developer
     Type:  defect         |      Status:  new      
 Priority:  major          |   Milestone:           
Component:  outlookplugin  |     Version:  5.0.0    
 Keywords:                 |  
---------------------------+------------------------------------------------
 Outlook
 - When associating an email the search doesn't find anything for any
 search string of more than one character
 - When uploading incoming emails they are stored in vTiger as sent to the
 contact you choose. I can't see a way to upload mails to the inbox.
 - In the contact view emails uploaded show as related to multiple even
 though they were uploaded as related to a single item
 - Tasks from outlook are not uploading to vTiger - works fine the other
 way.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1318>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 03:53:50 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 10:53:50 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231319=3A?=
	=?utf-8?q?_Thunderbird_Connector_Bugs?=
Message-ID: <076.6c811b9cd61da3ae39b454241d719204@vtiger.fosslabs.com>

#1319: Thunderbird Connector Bugs
-----------------------------+----------------------------------------------
 Reporter:  anonymous        |       Owner:  developer
     Type:  defect           |      Status:  new      
 Priority:  major            |   Milestone:           
Component:  thunderbirdextn  |     Version:  5.0.0    
 Keywords:                   |  
-----------------------------+----------------------------------------------
 Thunderbird
 - When importing emails no sender or receiver is set although the
 association is correct.
 - The related to field on the contact screen is set to Multiple. Same with
 the outlook plug in.
 - Attachments don't seem to be supported, unlike the outlook plugin.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1319>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 04:00:35 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 11:00:35 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231320=3A?=
 =?utf-8?q?_Adding_Products_in_Internet_Explorer?=
Message-ID: <076.5033f28ff91a008f6982f96dac47c920@vtiger.fosslabs.com>

#1320: Adding Products in Internet Explorer
------------------------+---------------------------------------------------
 Reporter:  arosewarne  |       Owner:  developer
     Type:  defect      |      Status:  new      
 Priority:  major       |   Milestone:           
Component:  vtigercrm   |     Version:  5.0.0    
 Keywords:              |  
------------------------+---------------------------------------------------
 When adding Products to Quotes or Sales Orders using Internet Explorer 6
 if you do a search based on either the text box or alphabet buttons you
 get a 'HTTP 404 - File not found' error when selecting a product.
 (Pop Up Blocker turned on or off)

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1320>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 04:05:31 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 11:05:31 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7122 - in
 /vtigercrm/trunk/modules/uploads: add2db.php downloadfile.php
Message-ID: <20060615110531.B99337ED201@vtiger.fosslabs.com>

Author: don
Date: Thu Jun 15 05:05:27 2006
New Revision: 7122

Log:
prefixed vtiger_ in all table names

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

Modified: vtigercrm/trunk/modules/uploads/add2db.php
==============================================================================
--- vtigercrm/trunk/modules/uploads/add2db.php (original)
+++ vtigercrm/trunk/modules/uploads/add2db.php Thu Jun 15 05:05:27 2006
@@ -53,7 +53,7 @@
 
 		if($filesize != 0)	
 		{
-			$current_id = $adb->getUniqueID("crmentity");
+			$current_id = $adb->getUniqueID("vtiger_crmentity");
 			$desc = $_REQUEST['txtDescription'];
 			$description = addslashes($desc);
 			$date_var = date('YmdHis');

Modified: vtigercrm/trunk/modules/uploads/downloadfile.php
==============================================================================
--- vtigercrm/trunk/modules/uploads/downloadfile.php (original)
+++ vtigercrm/trunk/modules/uploads/downloadfile.php Thu Jun 15 05:05:27 2006
@@ -20,7 +20,7 @@
 
 $returnmodule=$_REQUEST['return_module'];
 
-$dbQuery = "SELECT * FROM attachments WHERE attachmentsid = " .$attachmentsid ;
+$dbQuery = "SELECT * FROM vtiger_attachments WHERE attachmentsid = " .$attachmentsid ;
 
 $result = $adb->query($dbQuery) or die("Couldn't get file list");
 if($adb->num_rows($result) == 1)



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 04:10:56 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 11:10:56 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7123 -
 /vtigercrm/trunk/modules/Settings/LeadCustomFieldMapping.php
Message-ID: <20060615111056.880D67ED201@vtiger.fosslabs.com>

Author: don
Date: Thu Jun 15 05:10:52 2006
New Revision: 7123

Log:
prefixed vtiger_ in all table names

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

Modified: vtigercrm/trunk/modules/Settings/LeadCustomFieldMapping.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/LeadCustomFieldMapping.php (original)
+++ vtigercrm/trunk/modules/Settings/LeadCustomFieldMapping.php Thu Jun 15 05:10:52 2006
@@ -93,7 +93,7 @@
 	$potentialcf[$leadid.'_potential']=$potential_cfelement;
         return $potentialcf;
 }
-$lead_sql="select vtiger_fieldid,fieldlabel from vtiger_field,vtiger_tab where vtiger_field.tabid=vtiger_tab.tabid and generatedtype=2 and vtiger_tab.name='Leads'";
+$lead_sql="select fieldid,fieldlabel from vtiger_field,vtiger_tab where vtiger_field.tabid=vtiger_tab.tabid and generatedtype=2 and vtiger_tab.name='Leads'";
 $result = $adb->query($lead_sql);
 $noofrows = $adb->num_rows($result);
 



From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 04:58:01 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 11:58:01 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23919=3A_?=
 =?utf-8?q?Delayed_Task_Notification_scheduler_is_not_working?=
In-Reply-To: <076.2696d2b97fde7410db77fba51c909ec3@vtiger.fosslabs.com>
References: <076.2696d2b97fde7410db77fba51c909ec3@vtiger.fosslabs.com>
Message-ID: <085.d07571887d535976534e93f1ab219e31@vtiger.fosslabs.com>

#919: Delayed Task Notification scheduler is not working
------------------------+---------------------------------------------------
  Reporter:  mangai     |       Owner:  philip
      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 [7124]) problem in sending mail in schedule task fixed. Fixes #919

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/919>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 04:58:02 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 11:58:02 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7124 -
	/vtigercrm/trunk/cron/intimateTaskStatus.php
Message-ID: <20060615115802.1EE897ED209@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 15 05:57:57 2006
New Revision: 7124

Log:
problem in sending mail in schedule task fixed. Fixes #919

Modified:
    vtigercrm/trunk/cron/intimateTaskStatus.php

Modified: vtigercrm/trunk/cron/intimateTaskStatus.php
==============================================================================
--- vtigercrm/trunk/cron/intimateTaskStatus.php (original)
+++ vtigercrm/trunk/cron/intimateTaskStatus.php Thu Jun 15 05:57:57 2006
@@ -2,8 +2,8 @@
 require('send_mail.php');
 require_once('../config.php');
 
-$dbhost = $dbconfig['db_host_name'];
-$dbuser =$dbconfig['db_user_name']; 
+$dbhost = $dbconfig['db_hostname'];
+$dbuser =$dbconfig['db_username']; 
 $dbpass = $dbconfig['db_password'];
 $db = mysql_connect($dbhost, $dbuser, $dbpass) or die ('Error connecting to mysql');
 if (!$db) {
@@ -45,7 +45,7 @@
   $status=$myrow[0];
   if($status != 'Completed')
   {
-	 sendmail($emailaddress,$emailaddress,"test mail","Not completed task",$mailserver,$mailuname,$mailpwd,"");	
+	 sendmail($emailaddress,$emailaddress,"Task Not completed","Not completed task",$mailserver,$mailuname,$mailpwd,"");	
   }
 }
 }
@@ -86,8 +86,7 @@
   if($status != 'Completed')
   {
 
-    echo 'mail sent';
-    sendmail($emailaddress,$emailaddress,"test mail","Ticket number ".$ticketid ." yet to be closed",$mailserver,$mailuname,$mailpwd,"");	
+    sendmail($emailaddress,$emailaddress,"Pending Ticket notification","Ticket number ".$ticketid ." yet to be closed",$mailserver,$mailuname,$mailpwd,"");	
   }
 }
 
@@ -107,8 +106,7 @@
 {
   $status=$myrow[0];
   $ticketid = $myrow[1];
-  echo 'mail sent';
-  sendmail($emailaddress,$emailaddress,"Too many pending tickets","Too many pending tickets ".$ticketid ." too many pending tickets",$mailserver,$mailuname,$mailpwd,"");	
+  sendmail($emailaddress,$emailaddress,"Too many pending tickets","Too many tickets pending",$mailserver,$mailuname,$mailpwd,"");	
 }
 
 }
@@ -120,11 +118,11 @@
 $activevalue = mysql_fetch_row($result);
 if($activevalue[0] == 1)
 {
-$result = mysql_query("SELECT start_date FROM vtiger_products",$db);
+$result = mysql_query("SELECT productname FROM vtiger_products where start_date like '".date('Y-m-d')."%'",$db);
 while ($myrow = mysql_fetch_row($result))
 {
-  $status=$myrow[0];
-  sendmail($emailaddress,$emailaddress,"Support starting","Support Starting ".$ticketid ."Congratulations! Your support starts from today",$mailserver,$mailuname,$mailpwd,"");	
+  $productname=$myrow[0];
+  sendmail($emailaddress,$emailaddress,"Support starting","Support Starts for ".$productname ."\n Congratulations! Your support starts from today",$mailserver,$mailuname,$mailpwd,"");	
 }
 
 }
@@ -137,11 +135,11 @@
 if($activevalue[0] == 1)
 {
 
-$result = mysql_query("SELECT expiry_date from vtiger_products",$db);
+$result = mysql_query("SELECT productname from vtiger_products where expiry_date like '".date('Y-m-d')."%'",$db);
 while ($myrow = mysql_fetch_row($result))
 {
-  $status=$myrow[0];
-  sendmail($emailaddress,$emailaddress,"Support Ending","Support Ending ".$ticketid ." Renew support please",$mailserver,$mailuname,$mailpwd,"");	
+  $productname=$myrow[0];
+  sendmail($emailaddress,$emailaddress,"Support Ending","Support Ends for ".$productname ."\n Renew support please",$mailserver,$mailuname,$mailpwd,"");	
 }
 
 }



From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 05:05:37 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 12:05:37 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23953=3A_?=
 =?utf-8?q?Inconsistency_in_Global_Search_function?=
In-Reply-To: <076.0e9f83b845f7f23e047d6bd25f0184d0@vtiger.fosslabs.com>
References: <076.0e9f83b845f7f23e047d6bd25f0184d0@vtiger.fosslabs.com>
Message-ID: <085.3f31fe7e70bc6feb3c51bac6992a91b5@vtiger.fosslabs.com>

#953: Inconsistency in Global Search function
------------------------+---------------------------------------------------
  Reporter:  Gopal      |       Owner:  mickie
      Type:  defect     |      Status:  new   
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/953>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 05:06:44 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 12:06:44 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=23955=3A_?=
	=?utf-8?q?Horizontal_Scrolling?=
In-Reply-To: <076.a9ffd2be9e68b865905be8a48c3dc0a1@vtiger.fosslabs.com>
References: <076.a9ffd2be9e68b865905be8a48c3dc0a1@vtiger.fosslabs.com>
Message-ID: <085.5a498506d07cc23b5a74a201bf9a0b48@vtiger.fosslabs.com>

#955: Horizontal Scrolling
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  ela  
      Type:  defect     |      Status:  new  
  Priority:  critical   |   Milestone:  5.0.0
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => ela

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/955>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 05:08:16 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 12:08:16 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231105=3A?=
	=?utf-8?q?_Calendar_Issue?=
In-Reply-To: <076.828097aad950dc3eaa698a08d3117831@vtiger.fosslabs.com>
References: <076.828097aad950dc3eaa698a08d3117831@vtiger.fosslabs.com>
Message-ID: <085.30719dc55ea1f01de8bc57a696d567d2@vtiger.fosslabs.com>

#1105: Calendar Issue
---------------------------+------------------------------------------------
  Reporter:  jerrydgeorge  |       Owner:  mangai
      Type:  defect        |      Status:  new   
  Priority:  critical      |   Milestone:        
 Component:  vtigercrm     |     Version:  5.0.0 
Resolution:                |    Keywords:        
---------------------------+------------------------------------------------
Changes (by don):

  * owner:  developer => mangai

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1105>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 05:11:29 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 12:11:29 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231151=3A?=
 =?utf-8?q?_Error_message_in_Installer=2E=2E?=
In-Reply-To: <076.5644658cbeac029416aebb3b898c0527@vtiger.fosslabs.com>
References: <076.5644658cbeac029416aebb3b898c0527@vtiger.fosslabs.com>
Message-ID: <085.d827fddde0842f522dfd75ed115b57af@vtiger.fosslabs.com>

#1151: Error message in Installer..
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  jeri 
      Type:  defect     |      Status:  new  
  Priority:  critical   |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => jeri

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1151>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 05:12:03 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 12:12:03 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7125 -
	/vtigercrm/trunk/modules/Users/about_us.php
Message-ID: <20060615121204.1E3767ED1FE@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 15 06:11:58 2006
New Revision: 7125

Log:
contributors name made to display properly

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

Modified: vtigercrm/trunk/modules/Users/about_us.php
==============================================================================
--- vtigercrm/trunk/modules/Users/about_us.php (original)
+++ vtigercrm/trunk/modules/Users/about_us.php Thu Jun 15 06:11:58 2006
@@ -102,8 +102,9 @@
 										<tr><td>Mike Crowe </td></tr>
 										<tr><td>Allan Bush</td></tr>
 										<tr><td>Frank Piepiorra</td></tr>
-										<tr><td>Dino Eberle and Jamie Jackson</td></tr>
-										<tr><td>B??la??d A??ssa</td></tr>
+										<tr><td>Dino Eberle </td></tr>
+										<tr><td>Jamie Jackson</td></tr>
+										<tr><td>Aissa Belaid</td></tr>
 										<tr><td>Sergio A. Kessler</td></tr>
 										<tr><td>Jeff Kowalczyk</td></tr>
 										<tr><td>Brian Devendorf</td></tr>
@@ -116,6 +117,8 @@
 										<tr><td>Mike Fedyk</td></tr>
 										<tr><td>&nbsp;</td></tr>
 										<tr><td><b>And vtiger Community</b></td></tr>
+										<tr><td>&nbsp;</td></tr>
+										<tr><td>&nbsp;</td></tr>
 								</table>
 						</marquee>
 				</td>



From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 05:13:24 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 12:13:24 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231161=3A?=
 =?utf-8?q?_Roles_link_-_JavaScript_error_in_IE_6?=
In-Reply-To: <076.1d3f81da3d97d1c4e9f35cf771595b2d@vtiger.fosslabs.com>
References: <076.1d3f81da3d97d1c4e9f35cf771595b2d@vtiger.fosslabs.com>
Message-ID: <085.772ab999844c0c6bae6bb2ae3b149f19@vtiger.fosslabs.com>

#1161: Roles link - JavaScript error in IE 6
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  ela  
      Type:  defect     |      Status:  new  
  Priority:  critical   |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => ela

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1161>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 05:16:32 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 12:16:32 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231168=3A?=
	=?utf-8?q?_Inconsistent_buttons?=
In-Reply-To: <076.9785f194df3f213625826a4d8c4e3b59@vtiger.fosslabs.com>
References: <076.9785f194df3f213625826a4d8c4e3b59@vtiger.fosslabs.com>
Message-ID: <085.9e60c968e3dfd4004286f5a4af5dfb17@vtiger.fosslabs.com>

#1168: Inconsistent buttons
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  ela  
      Type:  defect     |      Status:  new  
  Priority:  critical   |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => ela

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1168>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 05:22:36 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 12:22:36 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231238=3A?=
 =?utf-8?q?_To_do_UI_flow_need_to_be_improved?=
In-Reply-To: <076.c26502e33442e4fe1e9904d1a3d2b8a5@vtiger.fosslabs.com>
References: <076.c26502e33442e4fe1e9904d1a3d2b8a5@vtiger.fosslabs.com>
Message-ID: <085.36a0189dd48d4e2543a8adcb718d53bc@vtiger.fosslabs.com>

#1238: To do UI flow need to be improved
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  saint
      Type:  defect     |      Status:  new  
  Priority:  critical   |   Milestone:  5.0.0
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => saint

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1238>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 05:23:49 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 12:23:49 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231239=3A?=
 =?utf-8?q?_Calendar_Settings_-_Horizontal_Scrolling?=
In-Reply-To: <076.44abdc0a6dba43610981769125583aec@vtiger.fosslabs.com>
References: <076.44abdc0a6dba43610981769125583aec@vtiger.fosslabs.com>
Message-ID: <085.50546b8d3f06c0dd24050894cab5c55d@vtiger.fosslabs.com>

#1239: Calendar Settings - Horizontal Scrolling
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  ela  
      Type:  defect     |      Status:  new  
  Priority:  critical   |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => ela

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1239>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 05:25:16 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 12:25:16 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231245=3A?=
 =?utf-8?q?_edit_and_del_links_are_not_exist_in_listview_and_relatedlists?=
In-Reply-To: <076.4ddff9b4349d2a2ad1f3163458b73b34@vtiger.fosslabs.com>
References: <076.4ddff9b4349d2a2ad1f3163458b73b34@vtiger.fosslabs.com>
Message-ID: <085.9ec751c35080fbd97eb4e722439a0495@vtiger.fosslabs.com>

#1245: edit and del links are not exist in listview and relatedlists
------------------------+---------------------------------------------------
  Reporter:  mickie     |       Owner:  ahmed
      Type:  defect     |      Status:  new  
  Priority:  critical   |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => ahmed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1245>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 05:26:45 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 12:26:45 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231252=3A?=
 =?utf-8?q?_Ticket_-_Activity_-_Relation?=
In-Reply-To: <076.f54f7a210a2bc06ab7c96747af544498@vtiger.fosslabs.com>
References: <076.f54f7a210a2bc06ab7c96747af544498@vtiger.fosslabs.com>
Message-ID: <085.58ba5fd6773e5def7173bc4699fbdc19@vtiger.fosslabs.com>

#1252: Ticket - Activity - Relation
------------------------+---------------------------------------------------
  Reporter:  eberled    |       Owner:  mickie
      Type:  defect     |      Status:  new   
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1252>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 05:28:12 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 12:28:12 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231288=3A?=
 =?utf-8?q?_Calendar_Creating_new_task?=
In-Reply-To: <076.273e3446e6cf906546860e7682d35c38@vtiger.fosslabs.com>
References: <076.273e3446e6cf906546860e7682d35c38@vtiger.fosslabs.com>
Message-ID: <085.ed4be51247b777e73068824ee6e25b6b@vtiger.fosslabs.com>

#1288: Calendar Creating new task
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  mangai
      Type:  defect     |      Status:  new   
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => mangai

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1288>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 05:29:05 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 12:29:05 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231289=3A?=
 =?utf-8?q?_Edit/Del_links_are_must_in_relatedlists?=
In-Reply-To: <076.c2484dcccdec49e5b30c79bee458fec5@vtiger.fosslabs.com>
References: <076.c2484dcccdec49e5b30c79bee458fec5@vtiger.fosslabs.com>
Message-ID: <085.faec8e0c8062bc96f7caf2237c8415e1@vtiger.fosslabs.com>

#1289: Edit/Del links are must in relatedlists
------------------------+---------------------------------------------------
  Reporter:  mickie     |       Owner:  ahmed
      Type:  task       |      Status:  new  
  Priority:  critical   |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  don => ahmed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1289>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 05:29:56 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 12:29:56 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231296=3A?=
 =?utf-8?q?_Sort_order_hide_the_related_datas?=
In-Reply-To: <076.89346f6520426628c32e65be31646f8e@vtiger.fosslabs.com>
References: <076.89346f6520426628c32e65be31646f8e@vtiger.fosslabs.com>
Message-ID: <085.af76d568f74f43dee7cfa66af6616c91@vtiger.fosslabs.com>

#1296: Sort order hide the related datas
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  philip                      
      Type:  defect     |      Status:  new                         
  Priority:  critical   |   Milestone:                              
 Component:  vtigercrm  |     Version:  5.0.0                       
Resolution:             |    Keywords:  related, data, sorder, order
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => philip

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1296>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 05:30:47 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 12:30:47 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231308=3A?=
 =?utf-8?q?_Role_security_issue_=28cf_=23599=29?=
In-Reply-To: <076.c439add42e557216aac6af17846b79b5@vtiger.fosslabs.com>
References: <076.c439add42e557216aac6af17846b79b5@vtiger.fosslabs.com>
Message-ID: <085.cc4f5d48557b6dec180c1852fe821ce5@vtiger.fosslabs.com>

#1308: Role security issue (cf #599)
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  don           
      Type:  defect     |      Status:  new           
  Priority:  critical   |   Milestone:                
 Component:  vtigercrm  |     Version:  5.0.0         
Resolution:             |    Keywords:  security roles
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => don

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1308>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 05:12:03 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 12:12:03 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231157=3A?=
 =?utf-8?q?_Wrong_display_of_Roles_in_Roles_Home?=
In-Reply-To: <076.0042ce49f00228b56312a0bfc5ea57d9@vtiger.fosslabs.com>
References: <076.0042ce49f00228b56312a0bfc5ea57d9@vtiger.fosslabs.com>
Message-ID: <085.17b060f06ad11355c178a5f4bf08a052@vtiger.fosslabs.com>

#1157: Wrong display of Roles in Roles Home
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  don  
      Type:  defect     |      Status:  new  
  Priority:  critical   |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => don

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1157>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 05:38:38 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 12:38:38 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23795=3A_?=
 =?utf-8?q?Reformat_long_queries_to_span_multiple_lines?=
In-Reply-To: <076.1fdfe4f34a2d2496c7c18911ad082758@vtiger.fosslabs.com>
References: <076.1fdfe4f34a2d2496c7c18911ad082758@vtiger.fosslabs.com>
Message-ID: <085.6c96be613ef340a7af4f46fb3d7134ae@vtiger.fosslabs.com>

#795: Reformat long queries to span multiple lines
------------------------+---------------------------------------------------
  Reporter:  allanbush  |       Owner:  developer 
      Type:  defect     |      Status:  new       
  Priority:  minor      |   Milestone:  5.0.0     
 Component:  vtigercrm  |     Version:  5.0.1     
Resolution:             |    Keywords:  formatting
------------------------+---------------------------------------------------
Changes (by don):

  * version:  5.0.0 => 5.0.1

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/795>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 05:39:16 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 12:39:16 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23532=3A_?=
 =?utf-8?q?Vtiger_beta=2C_Invoice_template=2C_VAT_and_products?=
In-Reply-To: <076.123c9f47c472bc36773dd906f577728f@vtiger.fosslabs.com>
References: <076.123c9f47c472bc36773dd906f577728f@vtiger.fosslabs.com>
Message-ID: <085.63cc69728de935df4dee115b9bc13b72@vtiger.fosslabs.com>

#532: Vtiger beta, Invoice template, VAT and products
-----------------------------+----------------------------------------------
  Reporter:  maxx292 at web.de  |       Owner:  mickie          
      Type:  enhancement     |      Status:  new             
  Priority:  major           |   Milestone:                  
 Component:  vtigercrm       |     Version:  5.0.0           
Resolution:                  |    Keywords:  Invoice template
-----------------------------+----------------------------------------------
Changes (by saraj):

  * owner:  developer => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/532>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 05:40:32 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 12:40:32 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23926=3A_?=
 =?utf-8?q?If_database_fails=2C_installation_script_loses_path_variable?=
In-Reply-To: <076.3dff578d41ed95759b327615c9ea781a@vtiger.fosslabs.com>
References: <076.3dff578d41ed95759b327615c9ea781a@vtiger.fosslabs.com>
Message-ID: <085.78f7e83ba7bbdab8cab6110466f6b21a@vtiger.fosslabs.com>

#926: If database fails, installation script loses path variable
------------------------+---------------------------------------------------
  Reporter:  neofis     |       Owner:  jeri        
      Type:  defect     |      Status:  new         
  Priority:  critical   |   Milestone:              
 Component:  vtigercrm  |     Version:  5.0.0       
Resolution:             |    Keywords:  installation
------------------------+---------------------------------------------------
Changes (by don):

  * priority:  minor => critical

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/926>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 05:42:39 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 12:42:39 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231159=3A?=
 =?utf-8?q?_Roles_-_Expand_icon_is_not_intuitive?=
In-Reply-To: <076.baaaff1e8853707e998ecfdccb70cd44@vtiger.fosslabs.com>
References: <076.baaaff1e8853707e998ecfdccb70cd44@vtiger.fosslabs.com>
Message-ID: <085.a58aa0f755d7967681a7cb83f58977e0@vtiger.fosslabs.com>

#1159: Roles - Expand icon is not intuitive
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  ela  
      Type:  defect     |      Status:  new  
  Priority:  minor      |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => ela

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1159>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 05:43:53 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 12:43:53 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231226=3A?=
 =?utf-8?q?_Currency_configuration_-_image_for_international_currencies?=
In-Reply-To: <076.623ba2470db6ef6e32b001dae6f27356@vtiger.fosslabs.com>
References: <076.623ba2470db6ef6e32b001dae6f27356@vtiger.fosslabs.com>
Message-ID: <085.6037e8e3dec8207ec7642fb42884c3e5@vtiger.fosslabs.com>

#1226: Currency configuration - image for international currencies
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  ela  
      Type:  defect     |      Status:  new  
  Priority:  minor      |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => ela

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1226>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 05:44:51 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 12:44:51 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23763=3A_?=
 =?utf-8?q?Inventory_Terms_=26_Conditions_can_be_moved_to_different_sectio?=
 =?utf-8?q?n?=
In-Reply-To: <076.afaed639175411364f6ac75d41b10dd1@vtiger.fosslabs.com>
References: <076.afaed639175411364f6ac75d41b10dd1@vtiger.fosslabs.com>
Message-ID: <085.0d79e78ab45fed7bcb948bb9e10c15b0@vtiger.fosslabs.com>

#763: Inventory Terms & Conditions can be moved to different section
--------------------------+-------------------------------------------------
  Reporter:  gopal        |       Owner:  jerrydgeorge
      Type:  enhancement  |      Status:  new         
  Priority:  major        |   Milestone:  5.0.0       
 Component:  vtigercrm    |     Version:  5.0.0       
Resolution:               |    Keywords:              
--------------------------+-------------------------------------------------
Changes (by saraj):

  * owner:  developer => jerrydgeorge

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/763>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 05:45:24 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 12:45:24 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23953=3A_?=
 =?utf-8?q?Inconsistency_in_Global_Search_function?=
In-Reply-To: <076.0e9f83b845f7f23e047d6bd25f0184d0@vtiger.fosslabs.com>
References: <076.0e9f83b845f7f23e047d6bd25f0184d0@vtiger.fosslabs.com>
Message-ID: <085.e5e489fd05799b8152814a6cf0049e65@vtiger.fosslabs.com>

#953: Inconsistency in Global Search function
------------------------+---------------------------------------------------
  Reporter:  Gopal      |       Owner:  mickie
      Type:  defect     |      Status:  closed
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mickie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 when we do global search, all modules will be searched and defaultly we
 showed the contact module result only. when we change the module from
 combo box the corresponding result will be shown.
 Now we have changed to show all module results as default.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/953>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 05:45:59 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 12:45:59 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=23774=3A_?=
	=?utf-8?q?Theme_error?=
In-Reply-To: <076.cace9562acb121b40381ab28bed91baf@vtiger.fosslabs.com>
References: <076.cace9562acb121b40381ab28bed91baf@vtiger.fosslabs.com>
Message-ID: <085.b8e9e4d62eace0a2d68131dc9d40fb5e@vtiger.fosslabs.com>

#774: Theme error
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       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

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/774>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 05:46:10 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 12:46:10 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231237=3A?=
 =?utf-8?q?_Usage_of_todos=2C_to-do=2C_To_Do?=
In-Reply-To: <076.cd52e3648a156e2549605fdddbbfdc7b@vtiger.fosslabs.com>
References: <076.cd52e3648a156e2549605fdddbbfdc7b@vtiger.fosslabs.com>
Message-ID: <085.b4b30df9757b5fc49020733f3efbf515@vtiger.fosslabs.com>

#1237: Usage of todos, to-do, To Do
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  ahmed
      Type:  defect     |      Status:  new  
  Priority:  minor      |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => ahmed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1237>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 05:50:04 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 12:50:04 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=23781=3A_?=
	=?utf-8?q?My_Preferences?=
In-Reply-To: <076.de29f722ccd714a4c6614d03a0a6957f@vtiger.fosslabs.com>
References: <076.de29f722ccd714a4c6614d03a0a6957f@vtiger.fosslabs.com>
Message-ID: <085.b349878beaa707841da10ee47e4a16dc@vtiger.fosslabs.com>

#781: My Preferences
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  jerrydgeorge
      Type:  defect     |      Status:  new         
  Priority:  major      |   Milestone:              
 Component:  vtigercrm  |     Version:  5.0.0       
Resolution:             |    Keywords:              
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => jerrydgeorge

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/781>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 05:50:20 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 12:50:20 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23532=3A_?=
 =?utf-8?q?Vtiger_beta=2C_Invoice_template=2C_VAT_and_products?=
In-Reply-To: <076.123c9f47c472bc36773dd906f577728f@vtiger.fosslabs.com>
References: <076.123c9f47c472bc36773dd906f577728f@vtiger.fosslabs.com>
Message-ID: <085.d2c87705b7248aa0e2341d58b97ccc06@vtiger.fosslabs.com>

#532: Vtiger beta, Invoice template, VAT and products
-----------------------------+----------------------------------------------
  Reporter:  maxx292 at web.de  |       Owner:  mickie          
      Type:  enhancement     |      Status:  new             
  Priority:  major           |   Milestone:                  
 Component:  vtigercrm       |     Version:  5.0.0           
Resolution:                  |    Keywords:  Invoice template
-----------------------------+----------------------------------------------
Comment (by mickie):

 we have released Beta on 31 st May. i think you have told about the Pre-
 Beta release. Before beta the inventory was not worked. we have changed
 the inventory as working in our Beta release.
 So the reported issues are working and if you still face any issues please
 do post.
 Print option will be provided in our GA release.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/532>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 05:59:48 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 12:59:48 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231323=3A?=
 =?utf-8?q?_Performance_Issue_in_ListView?=
Message-ID: <076.1ec7598e9f7965c44699ac918e5801a3@vtiger.fosslabs.com>

#1323: Performance Issue in ListView
--------------------------+-------------------------------------------------
 Reporter:  jerrydgeorge  |       Owner:  philip
     Type:  defect        |      Status:  new   
 Priority:  critical      |   Milestone:        
Component:  vtigercrm     |     Version:  5.0.0 
 Keywords:                |  
--------------------------+-------------------------------------------------
 In ListView all records are queried from database and we are showing some
 x records.This should be optimised

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1323>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 05:59:42 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 12:59:42 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231322=3A?=
 =?utf-8?q?_issue_in_customfield_picklist?=
Message-ID: <076.0444d61c632efd55ca5f5274820cefee@vtiger.fosslabs.com>

#1322: issue in customfield picklist
-----------------------+----------------------------------------------------
 Reporter:  mangai     |       Owner:  mangai
     Type:  defect     |      Status:  new   
 Priority:  blocker    |   Milestone:  5.0.0 
Component:  vtigercrm  |     Version:  5.0.0 
 Keywords:             |  
-----------------------+----------------------------------------------------
 could not edit customfield picklist thro picklist edit

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1322>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 06:03:34 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 13:03:34 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231007=3A?=
 =?utf-8?q?_undo_last_import_issue?=
In-Reply-To: <076.b72fd0c8557c71f7c763fc0c271c8112@vtiger.fosslabs.com>
References: <076.b72fd0c8557c71f7c763fc0c271c8112@vtiger.fosslabs.com>
Message-ID: <085.6bc72f7b7121767a809bc38f796a515d@vtiger.fosslabs.com>

#1007: undo last import issue
------------------------+---------------------------------------------------
  Reporter:  mickie     |       Owner:  mickie
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mickie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 This issue has been fixed.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1007>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 06:04:05 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 13:04:05 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23791=3A_?=
 =?utf-8?q?config=2Einc=2Ephp_altered_by_install_process=2C_should_only_al?=
 =?utf-8?q?ter_files_not_under_source_control?=
In-Reply-To: <076.151bf2d07dee39290c0944d7c7eb5ff2@vtiger.fosslabs.com>
References: <076.151bf2d07dee39290c0944d7c7eb5ff2@vtiger.fosslabs.com>
Message-ID: <085.67afecaa01c5d060bf33fd64f7c4cb56@vtiger.fosslabs.com>

#791: config.inc.php altered by install process, should only alter files not
under source control
------------------------+---------------------------------------------------
  Reporter:  jeffk      |       Owner:  developer         
      Type:  defect     |      Status:  new               
  Priority:  major      |   Milestone:  5.0.0             
 Component:  vtigercrm  |     Version:  5.0.1             
Resolution:             |    Keywords:  install repository
------------------------+---------------------------------------------------
Changes (by saraj):

  * version:  5.0.0 => 5.0.1

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/791>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 05:43:03 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 12:43:03 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23752=3A_?=
 =?utf-8?q?Add_postgresql_support_to_trunk?=
In-Reply-To: <076.ca4a4f28d7793b630896001aef3c1d00@vtiger.fosslabs.com>
References: <076.ca4a4f28d7793b630896001aef3c1d00@vtiger.fosslabs.com>
Message-ID: <085.29276cbb01b66c91848133cb75124097@vtiger.fosslabs.com>

#752: Add postgresql support to trunk
--------------------------+-------------------------------------------------
  Reporter:  jeffk        |       Owner:  developer                
      Type:  enhancement  |      Status:  new                      
  Priority:  major        |   Milestone:  5.0.0                    
 Component:  vtigercrm    |     Version:  5.0.0                    
Resolution:               |    Keywords:  adodb postgresql database
--------------------------+-------------------------------------------------
Changes (by saraj):

  * type:  defect => enhancement

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/752>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 05:42:52 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 12:42:52 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231321=3A?=
 =?utf-8?q?_Inconsistent_pagination_behaviour_in_Related_Lists_of_Leads_Mo?=
 =?utf-8?q?dule?=
Message-ID: <076.6915ecc3787751002b5c1b5587a1f1a7@vtiger.fosslabs.com>

#1321: Inconsistent pagination behaviour in Related Lists of Leads Module
-----------------------+----------------------------------------------------
 Reporter:  ahmed      |       Owner:  saraj
     Type:  defect     |      Status:  new  
 Priority:  critical   |   Milestone:       
Component:  vtigercrm  |     Version:  5.0.0
 Keywords:             |  
-----------------------+----------------------------------------------------
 Sometimes the pagination is displayed properly, at other times it doesn't

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1321>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 06:12:06 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 13:12:06 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=23797=3A_?=
	=?utf-8?q?Import_Accounts_step_3?=
In-Reply-To: <076.84e3b6e50e6005621030121ec2b4f656@vtiger.fosslabs.com>
References: <076.84e3b6e50e6005621030121ec2b4f656@vtiger.fosslabs.com>
Message-ID: <085.9d2f0d52d2c163da99c05170c2cd2b1c@vtiger.fosslabs.com>

#797: Import Accounts step 3
------------------------+---------------------------------------------------
  Reporter:  Balduin    |       Owner:  mickie
      Type:  defect     |      Status:  closed
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mickie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 In Beta we have fixed this issues. if you still face this issue please let
 us know.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/797>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 06:13:10 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 13:13:10 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23794=3A_?=
 =?utf-8?q?remove_subversion_id_tags?=
In-Reply-To: <076.7ed6822a7672e8340718bd63738879ea@vtiger.fosslabs.com>
References: <076.7ed6822a7672e8340718bd63738879ea@vtiger.fosslabs.com>
Message-ID: <085.91ad98a4fc60c64e440f72a0c5241098@vtiger.fosslabs.com>

#794: remove subversion id tags
------------------------+---------------------------------------------------
  Reporter:  jeffk      |       Owner:  developer          
      Type:  defect     |      Status:  new                
  Priority:  major      |   Milestone:  5.0.0              
 Component:  vtigercrm  |     Version:  5.0.1              
Resolution:             |    Keywords:  repository keywords
------------------------+---------------------------------------------------
Changes (by saraj):

  * version:  5.0.0 => 5.0.1

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/794>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 06:14:45 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 13:14:45 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231286=3A?=
 =?utf-8?q?_Getting_a_warning_message_in_the_week_view_of_the_calendar?=
In-Reply-To: <076.09b3d19c2818c145cad7974f71d66816@vtiger.fosslabs.com>
References: <076.09b3d19c2818c145cad7974f71d66816@vtiger.fosslabs.com>
Message-ID: <085.8cd035f23be8292d3ddb2a6d0551c08d@vtiger.fosslabs.com>

#1286: Getting a warning message in the week view of the calendar
------------------------+---------------------------------------------------
  Reporter:  Jaguar     |       Owner:  mangai
      Type:  defect     |      Status:  new   
  Priority:  minor      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => mangai

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1286>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 06:15:03 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 13:15:03 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23807=3A_?=
 =?utf-8?q?Enhance_Contacts_List_Navigation?=
In-Reply-To: <076.b4ed0b9a47318420c8b67dcb5e05ecbb@vtiger.fosslabs.com>
References: <076.b4ed0b9a47318420c8b67dcb5e05ecbb@vtiger.fosslabs.com>
Message-ID: <085.aa38552599facda558f75e890f1f4019@vtiger.fosslabs.com>

#807: Enhance Contacts List Navigation
--------------------------------+-------------------------------------------
  Reporter:  kenlyle at yahoo.com  |       Owner:  developer             
      Type:  enhancement        |      Status:  new                   
  Priority:  major              |   Milestone:                        
 Component:  vtigercrm          |     Version:  5.0.1                 
Resolution:                     |    Keywords:  scroll, navigate, list
--------------------------------+-------------------------------------------
Changes (by saraj):

  * version:  5.0.0 => 5.0.1

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/807>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 06:15:25 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 13:15:25 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231305=3A?=
	=?utf-8?q?_Total_taxes_not_auto?=
In-Reply-To: <076.952daacfec18eaf8adefbd4e7d778e41@vtiger.fosslabs.com>
References: <076.952daacfec18eaf8adefbd4e7d778e41@vtiger.fosslabs.com>
Message-ID: <085.9fcb5ff97fe0b99053821a44fada3654@vtiger.fosslabs.com>

#1305: Total taxes not auto
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  mickie                                               
      Type:  defect     |      Status:  new                                                  
  Priority:  minor      |   Milestone:                                                       
 Component:  vtigercrm  |     Version:  5.0.0                                                
Resolution:             |    Keywords:  quotes, invoices, sales order, so, purchase order, po
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1305>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 06:16:21 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 13:16:21 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231001=3A?=
 =?utf-8?q?_issue_in_display_imported_records_in_last_step?=
In-Reply-To: <076.75256648969123de1075c72421e06edd@vtiger.fosslabs.com>
References: <076.75256648969123de1075c72421e06edd@vtiger.fosslabs.com>
Message-ID: <085.f25773d1f4c103b92ba51030ecf97216@vtiger.fosslabs.com>

#1001: issue in display imported records in last step
------------------------+---------------------------------------------------
  Reporter:  mickie     |       Owner:  mickie
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mickie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 This issue has been fixed.now all the records are displayed when we have
 more than 500 records

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1001>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 06:16:19 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 13:16:19 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23808=3A_?=
 =?utf-8?q?Recently_Used_-_Contacts=2C_Leads=2C_Emails=2C_etc=2E?=
In-Reply-To: <076.732df8a9c67d4b57a254501f77c190bf@vtiger.fosslabs.com>
References: <076.732df8a9c67d4b57a254501f77c190bf@vtiger.fosslabs.com>
Message-ID: <085.f85518a693f158397f9b8663e6efacdb@vtiger.fosslabs.com>

#808: Recently Used - Contacts, Leads, Emails, etc.
--------------------------------+-------------------------------------------
  Reporter:  kenlyle at yahoo.com  |       Owner:  jerrydgeorge         
      Type:  enhancement        |      Status:  new                  
  Priority:  major              |   Milestone:                       
 Component:  vtigercrm          |     Version:  5.0.0                
Resolution:                     |    Keywords:  recent, recently used
--------------------------------+-------------------------------------------
Changes (by saraj):

  * owner:  developer => jerrydgeorge

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/808>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 06:16:43 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 13:16:43 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231306=3A?=
 =?utf-8?q?_Missing_fields_in_detailview_for_other_langs?=
In-Reply-To: <076.9fc5d3aab2b86e9e74117e8341c6ee53@vtiger.fosslabs.com>
References: <076.9fc5d3aab2b86e9e74117e8341c6ee53@vtiger.fosslabs.com>
Message-ID: <085.bd4f491440665fc10e567209c79ea9e2@vtiger.fosslabs.com>

#1306: Missing fields in detailview for other langs
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  ahmed                 
      Type:  defect     |      Status:  new                   
  Priority:  minor      |   Milestone:                        
 Component:  vtigercrm  |     Version:  5.0.0                 
Resolution:             |    Keywords:  detailview, tranlation
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => ahmed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1306>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 06:18:40 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 13:18:40 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231310=3A?=
 =?utf-8?q?_Translation_for_=22my_preference=22_=26_home_page?=
In-Reply-To: <076.a6a7ecaca440fce3cdf9dde7ec76ec0a@vtiger.fosslabs.com>
References: <076.a6a7ecaca440fce3cdf9dde7ec76ec0a@vtiger.fosslabs.com>
Message-ID: <085.c63502cc1ab843879250d2be1ef54daf@vtiger.fosslabs.com>

#1310: Translation for "my preference" & home page
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  ahmed                                
      Type:  defect     |      Status:  new                                  
  Priority:  minor      |   Milestone:                                       
 Component:  vtigercrm  |     Version:  5.0.0                                
Resolution:             |    Keywords:  translation, homepage, my preferences
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => ahmed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1310>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 06:19:31 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 13:19:31 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23811=3A_?=
 =?utf-8?q?Recurring_Events_Functionality_Issue?=
In-Reply-To: <076.8585fb4bdf941329df8632100a82d2cd@vtiger.fosslabs.com>
References: <076.8585fb4bdf941329df8632100a82d2cd@vtiger.fosslabs.com>
Message-ID: <085.fb38adc5cd5d97eaf44fd93eda245e6f@vtiger.fosslabs.com>

#811: Recurring Events Functionality Issue
----------------------------------+-----------------------------------------
  Reporter:  sganendra at yahoo.com  |       Owner:  mangai                  
      Type:  defect               |      Status:  new                     
  Priority:  major                |   Milestone:  5.0.0                   
 Component:  vtigercrm            |     Version:  5.0.1                   
Resolution:                       |    Keywords:  recurring, events, tasks
----------------------------------+-----------------------------------------
Changes (by saraj):

  * version:  5.0.0 => 5.0.1
  * owner:  developer => mangai

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/811>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 06:19:42 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 13:19:42 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23355=3A_?=
 =?utf-8?q?Option_can_be_provided_to_convert_a_lead_from_leads_list_view_i?=
 =?utf-8?q?tself?=
In-Reply-To: <076.723759bda055b76b6a827d918860919f@vtiger.fosslabs.com>
References: <076.723759bda055b76b6a827d918860919f@vtiger.fosslabs.com>
Message-ID: <085.227e9f6a2712fe606a1989edb39fafa2@vtiger.fosslabs.com>

#355: Option can be provided to convert a lead from leads list view itself
--------------------------+-------------------------------------------------
  Reporter:  don          |       Owner:  saint
      Type:  enhancement  |      Status:  new  
  Priority:  major        |   Milestone:       
 Component:  vtigercrm    |     Version:  5.0.0
Resolution:               |    Keywords:       
--------------------------+-------------------------------------------------
Changes (by richie):

  * type:  defect => enhancement

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/355>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 06:19:46 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 13:19:46 -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.01a2f50cf14b30a22e65f45e0510b8cf@vtiger.fosslabs.com>

#146: labels not in single line
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  ela      
      Type:  defect     |      Status:  new      
  Priority:  trivial    |   Milestone:  5.0.0    
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:             |    Keywords:  staggered
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  saint => ela

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/146>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 06:20:56 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 13:20:56 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23779=3A_?=
 =?utf-8?q?Update_Home_Page_Block_Order_Terms?=
In-Reply-To: <076.211ee58adeeafe8bd16e6d4f4857e285@vtiger.fosslabs.com>
References: <076.211ee58adeeafe8bd16e6d4f4857e285@vtiger.fosslabs.com>
Message-ID: <085.73082c1dc354f0753d536e3cf464c346@vtiger.fosslabs.com>

#779: Update Home Page Block Order Terms
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  don  
      Type:  defect     |      Status:  new  
  Priority:  trivial    |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => don

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/779>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 06:22:21 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 13:22:21 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231251=3A?=
 =?utf-8?q?_Chat_not_working=3F=3F?=
In-Reply-To: <076.c47ecc4624fe78215a43eca164a2c051@vtiger.fosslabs.com>
References: <076.c47ecc4624fe78215a43eca164a2c051@vtiger.fosslabs.com>
Message-ID: <085.c455043001410fd44dc156db0e2e67b7@vtiger.fosslabs.com>

#1251: Chat not working??
------------------------+---------------------------------------------------
  Reporter:             |       Owner:  jeri  
      Type:  defect     |      Status:  closed
  Priority:  minor      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by anonymous):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1251>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 06:22:34 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 13:22:34 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=23813=3A_?=
	=?utf-8?q?New_Quote?=
In-Reply-To: <076.3772e0ff3b6afff03f74ea9a4892bb7f@vtiger.fosslabs.com>
References: <076.3772e0ff3b6afff03f74ea9a4892bb7f@vtiger.fosslabs.com>
Message-ID: <085.6493f8f64b0a6107e963e0937c1f9349@vtiger.fosslabs.com>

#813: New Quote
------------------------+---------------------------------------------------
  Reporter:  Balduin    |       Owner:  mickie
      Type:  defect     |      Status:  new   
  Priority:  trivial    |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/813>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 06:23:11 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 13:23:11 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=23814=3A_?=
	=?utf-8?q?RSS_image?=
In-Reply-To: <076.272628496df02a123a203fa1bf2cbdb1@vtiger.fosslabs.com>
References: <076.272628496df02a123a203fa1bf2cbdb1@vtiger.fosslabs.com>
Message-ID: <085.28e74d940e4feeb0a8df0aea490b3616@vtiger.fosslabs.com>

#814: RSS image
------------------------+---------------------------------------------------
  Reporter:  Balduin    |       Owner:  ela  
      Type:  defect     |      Status:  new  
  Priority:  trivial    |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => ela

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/814>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 06:23:29 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 13:23:29 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23839=3A_?=
 =?utf-8?q?Settings_=3E_CommunicationsTemplates_=3E_Mail_Merge_Template=2C?=
 =?utf-8?q?_Edit?=
In-Reply-To: <076.0201dd774bc7d66d5dc9d197e1979c28@vtiger.fosslabs.com>
References: <076.0201dd774bc7d66d5dc9d197e1979c28@vtiger.fosslabs.com>
Message-ID: <085.dd14243fcbc9ce5e44cbec2e48e56ee1@vtiger.fosslabs.com>

#839: Settings > CommunicationsTemplates > Mail Merge Template, Edit
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  ela  
      Type:  defect     |      Status:  new  
  Priority:  trivial    |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => ela

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/839>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 06:23:40 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 13:23:40 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231077=3A?=
 =?utf-8?q?_Inventory_=3E_Products=2C_Step_2_spelling_error?=
In-Reply-To: <076.afa5672c1a2f342659af400a47199461@vtiger.fosslabs.com>
References: <076.afa5672c1a2f342659af400a47199461@vtiger.fosslabs.com>
Message-ID: <085.8aff243ed1b2c690ad0588a818180ef5@vtiger.fosslabs.com>

#1077: Inventory > Products, Step 2 spelling error
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  mickie
      Type:  defect     |      Status:  new   
  Priority:  trivial    |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1077>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 06:24:01 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 13:24:01 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=23923=3A_?=
	=?utf-8?q?Studio_=3E_Picklist?=
In-Reply-To: <076.b4e0e1396a2feb913df180b7b4a56c2c@vtiger.fosslabs.com>
References: <076.b4e0e1396a2feb913df180b7b4a56c2c@vtiger.fosslabs.com>
Message-ID: <085.85b7130df9540148e5e07be1823bb812@vtiger.fosslabs.com>

#923: Studio > Picklist
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  ela  
      Type:  defect     |      Status:  new  
  Priority:  trivial    |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => ela

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/923>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 06:24:08 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 13:24:08 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231302=3A?=
 =?utf-8?q?_Update_to_new_adodb-4=2E90_release?=
In-Reply-To: <076.cfae0e78298741dfce9c6a4f41a70218@vtiger.fosslabs.com>
References: <076.cfae0e78298741dfce9c6a4f41a70218@vtiger.fosslabs.com>
Message-ID: <085.8e4fd2e0c9f75f91b535d3ea57eb9327@vtiger.fosslabs.com>

#1302: Update to new adodb-4.90 release
------------------------+---------------------------------------------------
  Reporter:  jeffk      |       Owner:  jeffk                 
      Type:  defect     |      Status:  new                   
  Priority:  major      |   Milestone:  5.0.0                 
 Component:  vtigercrm  |     Version:  5.0.0                 
Resolution:             |    Keywords:  adodb database package
------------------------+---------------------------------------------------
Comment (by richie):

 go ahead JeffK.
 I think you do have the permission. Put in a word to Allan Bush as he is
 the maintainer.
 Do you suggest the same for 5.0 too?

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1302>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 06:28:11 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 13:28:11 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231298=3A?=
 =?utf-8?q?_revert_r7003=3A7004_prefix_vtiger=5F_to_all_tablenames?=
In-Reply-To: <076.32456f312efcd1431e178d7f1df1ccb0@vtiger.fosslabs.com>
References: <076.32456f312efcd1431e178d7f1df1ccb0@vtiger.fosslabs.com>
Message-ID: <085.a6cbb632d17d6cc88f202ed129ed1d2f@vtiger.fosslabs.com>

#1298: revert r7003:7004 prefix vtiger_ to all tablenames
------------------------+---------------------------------------------------
  Reporter:  jeffk      |       Owner:  don     
      Type:  defect     |      Status:  new     
  Priority:  major      |   Milestone:  5.0.0   
 Component:  vtigercrm  |     Version:  5.0.0   
Resolution:             |    Keywords:  database
------------------------+---------------------------------------------------
Comment (by richie):

 We are in the process of testing and fixing the breakages.
 We are in the process of making enmasse changes to all the other plugins
 too.
 We are automating the testing to ensure that we cover most of the areas.

 This will not be reverted.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1298>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 06:28:53 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 13:28:53 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231292=3A?=
	=?utf-8?q?_This_is_Spam?=
In-Reply-To: <076.3be71aaa1fa450bc94bdfa03d862bd31@vtiger.fosslabs.com>
References: <076.3be71aaa1fa450bc94bdfa03d862bd31@vtiger.fosslabs.com>
Message-ID: <085.8945ae323cfa7ca5be67cfcb84f60a42@vtiger.fosslabs.com>

#1292: This is Spam
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  developer                          
      Type:  defect     |      Status:  closed                             
  Priority:  major      |   Milestone:                                     
 Component:  vtigercrm  |     Version:  5.0.0                              
Resolution:  duplicate  |    Keywords:  Viagra,Ambien,Diazepam,Levitra,Soma
------------------------+---------------------------------------------------
Changes (by anonymous):

  * resolution:  => duplicate
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1292>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 06:31:24 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 13:31:24 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=23840=3A_?=
	=?utf-8?q?Email_templates?=
In-Reply-To: <076.532bdc25e39b6eb5497600f7e0581cdd@vtiger.fosslabs.com>
References: <076.532bdc25e39b6eb5497600f7e0581cdd@vtiger.fosslabs.com>
Message-ID: <085.6ff1d3792901f8338eb988e80099855d@vtiger.fosslabs.com>

#840: Email templates
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  developer
      Type:  defect     |      Status:  closed   
  Priority:  major      |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:  invalid    |    Keywords:           
------------------------+---------------------------------------------------
Changes (by saraj):

  * resolution:  => invalid
  * status:  new => closed

Comment:

 Yes, we can't assign personal templates (private) to users expect it is
 public. We allow only public templates to be assigned to other users.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/840>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 06:33:08 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 13:33:08 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23912=3A_?=
 =?utf-8?q?Calendar_-_Yearly_View_-_List_View?=
In-Reply-To: <076.61f66c44706ccd2abe1008172c1eb65b@vtiger.fosslabs.com>
References: <076.61f66c44706ccd2abe1008172c1eb65b@vtiger.fosslabs.com>
Message-ID: <085.4fa90ad1ddb4b1b14e6b2c748691911d@vtiger.fosslabs.com>

#912: Calendar - Yearly View - List View
--------------------------+-------------------------------------------------
  Reporter:  anonymous    |       Owner:  developer
      Type:  enhancement  |      Status:  new      
  Priority:  major        |   Milestone:           
 Component:  vtigercrm    |     Version:  5.0.0    
Resolution:               |    Keywords:           
--------------------------+-------------------------------------------------
Changes (by saraj):

  * cc:  => mangai

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/912>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 06:34:02 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 13:34:02 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7126 - in
 /vtigercrm/trunk/modules/Import: ImportMap.php UsersLastImport.php
Message-ID: <20060615133402.5660B7ED222@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 15 07:33:57 2006
New Revision: 7126

Log:
* Removed the vtiger prefix which have been added for the table's columnnames

Modified:
    vtigercrm/trunk/modules/Import/ImportMap.php
    vtigercrm/trunk/modules/Import/UsersLastImport.php

Modified: vtigercrm/trunk/modules/Import/ImportMap.php
==============================================================================
--- vtigercrm/trunk/modules/Import/ImportMap.php (original)
+++ vtigercrm/trunk/modules/Import/ImportMap.php Thu Jun 15 07:33:57 2006
@@ -41,7 +41,7 @@
 	var $assigned_user_id;
 	var $is_published;
 
-	var $table_name = "import_maps";
+	var $table_name = "vtiger_import_maps";
 	var $object_name = "ImportMap";
 	var $module_id="id";
 	

Modified: vtigercrm/trunk/modules/Import/UsersLastImport.php
==============================================================================
--- vtigercrm/trunk/modules/Import/UsersLastImport.php (original)
+++ vtigercrm/trunk/modules/Import/UsersLastImport.php Thu Jun 15 07:33:57 2006
@@ -38,7 +38,7 @@
 	var $bean_type;
 	var $bean_id;
 
-	var $table_name = "users_last_import";
+	var $table_name = "vtiger_users_last_import";
 	var $object_name = "UsersLastImport";
 	var $column_fields = Array(
 					"id"



From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 06:35:15 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 13:35:15 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23912=3A_?=
 =?utf-8?q?Calendar_-_Yearly_View_-_List_View?=
In-Reply-To: <076.61f66c44706ccd2abe1008172c1eb65b@vtiger.fosslabs.com>
References: <076.61f66c44706ccd2abe1008172c1eb65b@vtiger.fosslabs.com>
Message-ID: <085.0d110b557572f291bb52f179878bbf9e@vtiger.fosslabs.com>

#912: Calendar - Yearly View - List View
--------------------------+-------------------------------------------------
  Reporter:  anonymous    |       Owner:  mangai
      Type:  enhancement  |      Status:  new   
  Priority:  major        |   Milestone:        
 Component:  vtigercrm    |     Version:  5.0.0 
Resolution:               |    Keywords:        
--------------------------+-------------------------------------------------
Changes (by saraj):

  * owner:  developer => mangai
  * cc:  mangai =>

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/912>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 06:36:14 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 13:36:14 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23914=3A_?=
 =?utf-8?q?Sales_=3E_Quotes_=3E_Detail_View?=
In-Reply-To: <076.51b57cd15fe20b42398ea79fb1064f23@vtiger.fosslabs.com>
References: <076.51b57cd15fe20b42398ea79fb1064f23@vtiger.fosslabs.com>
Message-ID: <085.2bf2bcac4fb2910871d20bee6249d01a@vtiger.fosslabs.com>

#914: Sales > Quotes > Detail View
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  mickie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/914>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 06:37:45 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 13:37:45 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23918=3A_?=
 =?utf-8?q?Global_search_function_shows_wrong_results?=
In-Reply-To: <076.a484dea87ad7ce51b1edd92f46c3ba8a@vtiger.fosslabs.com>
References: <076.a484dea87ad7ce51b1edd92f46c3ba8a@vtiger.fosslabs.com>
Message-ID: <085.a55b71cc64f85bbcb2ab28ba4eb9eb7c@vtiger.fosslabs.com>

#918: Global search function shows wrong results
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  mickie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/918>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 06:22:00 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 13:22:00 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23824=3A_?=
 =?utf-8?q?Quotes_still_don=27t_display_product_info_on_edit?=
In-Reply-To: <076.45312decf82d04fd634c43e6cb09ed21@vtiger.fosslabs.com>
References: <076.45312decf82d04fd634c43e6cb09ed21@vtiger.fosslabs.com>
Message-ID: <085.14387b893af07de35c45dad459d70fc9@vtiger.fosslabs.com>

#824: Quotes still don't display product info on edit
-----------------------------------+----------------------------------------
  Reporter:  jay at forecasttech.com  |       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:

 This has been fixed from vtigercrm 5 beta onwards.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/824>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 06:13:00 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 13:13:00 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231284=3A?=
 =?utf-8?q?_Removal_of_commented-out_code_is_helpful?=
In-Reply-To: <076.1f009815df5e22f62e7a2c599acd3ebf@vtiger.fosslabs.com>
References: <076.1f009815df5e22f62e7a2c599acd3ebf@vtiger.fosslabs.com>
Message-ID: <085.cd5b7f13f1fecce9f20ab328097d4625@vtiger.fosslabs.com>

#1284: Removal of commented-out code is helpful
------------------------+---------------------------------------------------
  Reporter:  jeffk      |       Owner:  developer
      Type:  defect     |      Status:  new      
  Priority:  minor      |   Milestone:  5.0.0    
 Component:  vtigercrm  |     Version:  5.0.1    
Resolution:             |    Keywords:           
------------------------+---------------------------------------------------
Changes (by don):

  * version:  5.0.0 => 5.0.1

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1284>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 06:41:35 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 13:41:35 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23927=3A_?=
 =?utf-8?q?Shortcut_=22New_Account=22_doesn=27t_work?=
In-Reply-To: <076.97aed0717bb7c14bc4216213f908cd2e@vtiger.fosslabs.com>
References: <076.97aed0717bb7c14bc4216213f908cd2e@vtiger.fosslabs.com>
Message-ID: <085.61127374c8f3fcca9048c3af13419d32@vtiger.fosslabs.com>

#927: Shortcut "New Account" doesn't work
------------------------+---------------------------------------------------
  Reporter:  neofis     |       Owner:  ahmed           
      Type:  defect     |      Status:  new             
  Priority:  major      |   Milestone:                  
 Component:  vtigercrm  |     Version:  5.0.0           
Resolution:             |    Keywords:  New Account menu
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => ahmed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/927>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 06:43:35 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 13:43:35 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23945=3A_?=
 =?utf-8?q?Marketing_-_Acccounts_link_may_not_require?=
In-Reply-To: <076.b7fed829ea74af680063f59f27e9abdb@vtiger.fosslabs.com>
References: <076.b7fed829ea74af680063f59f27e9abdb@vtiger.fosslabs.com>
Message-ID: <085.4cf29b699fed29cdd5cd08ae05544cb6@vtiger.fosslabs.com>

#945: Marketing - Acccounts link may not require
--------------------------+-------------------------------------------------
  Reporter:  gopal        |       Owner:  jerrydgeorge
      Type:  enhancement  |      Status:  new         
  Priority:  major        |   Milestone:  5.0.0       
 Component:  vtigercrm    |     Version:  5.0.0       
Resolution:               |    Keywords:              
--------------------------+-------------------------------------------------
Changes (by saraj):

  * owner:  developer => jerrydgeorge

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/945>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 06:44:09 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 13:44:09 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23946=3A_?=
 =?utf-8?q?Enable_Sorting_for_all_fields_in_List_Views?=
In-Reply-To: <076.0eef908f7d31c54e7a8ca30ca48b0825@vtiger.fosslabs.com>
References: <076.0eef908f7d31c54e7a8ca30ca48b0825@vtiger.fosslabs.com>
Message-ID: <085.f4a83f186ecb1a7eb016e9687c0ba0ad@vtiger.fosslabs.com>

#946: Enable Sorting for all fields in List Views
--------------------------+-------------------------------------------------
  Reporter:  gopal        |       Owner:  saraj
      Type:  enhancement  |      Status:  new  
  Priority:  major        |   Milestone:  5.0.0
 Component:  vtigercrm    |     Version:  5.0.0
Resolution:               |    Keywords:       
--------------------------+-------------------------------------------------
Changes (by saraj):

  * owner:  developer => saraj

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/946>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 06:47:11 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 13:47:11 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23959=3A_?=
 =?utf-8?q?=22Invoice=22_Tab_name_change_to_=22Invoices=22?=
In-Reply-To: <076.d7d8ff8c07778d7ac5419325b92b757a@vtiger.fosslabs.com>
References: <076.d7d8ff8c07778d7ac5419325b92b757a@vtiger.fosslabs.com>
Message-ID: <085.d503a24bcc8fcfc4426ebe4cabf5fc4a@vtiger.fosslabs.com>

#959: "Invoice" Tab name change to "Invoices"
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  saraj
      Type:  defect     |      Status:  new  
  Priority:  major      |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => saraj

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/959>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 06:48:17 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 13:48:17 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=23965=3A_?= =?utf-8?q?FAQ?=
In-Reply-To: <076.6d8684c7a7aea333e48cd0c6ba6467b4@vtiger.fosslabs.com>
References: <076.6d8684c7a7aea333e48cd0c6ba6467b4@vtiger.fosslabs.com>
Message-ID: <085.ee7f70640ade35e38514903763e0d1c4@vtiger.fosslabs.com>

#965: FAQ
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  mickie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/965>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 06:53:28 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 13:53:28 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23968=3A_?=
 =?utf-8?q?Quick_Edit_of_Assigned_Group_not_functional?=
In-Reply-To: <076.66451d79109fe79c040c7aba7d66b2ee@vtiger.fosslabs.com>
References: <076.66451d79109fe79c040c7aba7d66b2ee@vtiger.fosslabs.com>
Message-ID: <085.e61d4629bb832be1747dc96409ffd2f5@vtiger.fosslabs.com>

#968: Quick Edit of Assigned Group not functional
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  jerrydgeorge
      Type:  defect     |      Status:  new         
  Priority:  major      |   Milestone:              
 Component:  vtigercrm  |     Version:  5.0.0       
Resolution:             |    Keywords:              
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => jerrydgeorge

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/968>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 06:37:22 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 13:37:22 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23918=3A_?=
 =?utf-8?q?Global_search_function_shows_wrong_results?=
In-Reply-To: <076.a484dea87ad7ce51b1edd92f46c3ba8a@vtiger.fosslabs.com>
References: <076.a484dea87ad7ce51b1edd92f46c3ba8a@vtiger.fosslabs.com>
Message-ID: <085.63c9b386d4538f2a3aa00ca0b366b16d@vtiger.fosslabs.com>

#918: Global search function shows wrong results
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  mickie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/918>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 07:04:50 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 14:04:50 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7127 -
	/vtigercrm/trunk/Popup.php
Message-ID: <20060615140450.33E0D7ED1BF@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 15 08:04:46 2006
New Revision: 7127

Log:
campaign popup has been integrated

Modified:
    vtigercrm/trunk/Popup.php

Modified: vtigercrm/trunk/Popup.php
==============================================================================
--- vtigercrm/trunk/Popup.php (original)
+++ vtigercrm/trunk/Popup.php Thu Jun 15 08:04:46 2006
@@ -48,6 +48,18 @@
 		if (isset($_REQUEST['select'])) $smarty->assign("SELECT",'enable');
 		$alphabetical = AlphabeticalSearch($currentModule,'Popup','lastname','true','basic',$popuptype,"","","");
 		break;
+	case 'Campaigns':
+		require_once("modules/$currentModule/Campaign.php");
+		$focus = new Campaign();
+		$log = LoggerManager::getLogger('campaign_list');
+		$comboFieldNames = Array('campaignstatus'=>'campaignstatus_dom',
+					 'campaigntype'=>'campaigntype_dom');
+		$comboFieldArray = getComboArray($comboFieldNames);
+		$smarty->assign("SINGLE_MOD",'Campaign');
+		if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] !='')
+			$smarty->assign("RETURN_MODULE",$_REQUEST['return_module']);
+		$alphabetical = AlphabeticalSearch($currentModule,'Popup','campaignname','true','basic',$popuptype,"","","");
+		break;
 	case 'Accounts':
 		require_once("modules/$currentModule/Account.php");
 		$focus = new Account();



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 07:11:29 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 14:11:29 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7128 -
	/vtigercrm/trunk/modules/Campaigns/Campaign.js
Message-ID: <20060615141129.3F9A57ED1D8@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 15 08:11:25 2006
New Revision: 7128

Log:
js function set_return_specific_campaign has been included

Modified:
    vtigercrm/trunk/modules/Campaigns/Campaign.js

Modified: vtigercrm/trunk/modules/Campaigns/Campaign.js
==============================================================================
--- vtigercrm/trunk/modules/Campaigns/Campaign.js (original)
+++ vtigercrm/trunk/modules/Campaigns/Campaign.js Thu Jun 15 08:11:25 2006
@@ -1,0 +1,17 @@
+/*********************************************************************************
+
+** The contents of this file are subject to the vtiger CRM Public License Version 1.0
+ * ("License"); You may not use this file except in compliance with the License
+ * The Original Code is:  vtiger CRM Open Source
+ * The Initial Developer of the Original Code is vtiger.
+ * Portions created by vtiger are Copyright (C) vtiger.
+ * All Rights Reserved.
+ ********************************************************************************/
+
+
+
+function set_return_specific_campaign(campaign_id, campaign_name) {
+        window.opener.document.EditView.campaignname.value = campaign_name;
+        window.opener.document.EditView.campaignid.value = campaign_id;
+}
+



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 07:22:49 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 14:22:49 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7129 -
	/vtigercrm/trunk/modules/Campaigns/Campaign.php
Message-ID: <20060615142249.5AF877ED209@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 15 08:22:45 2006
New Revision: 7129

Log:
changes made to integrate campaign related list

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 Jun 15 08:22:45 2006
@@ -49,6 +49,16 @@
 	var $default_order_by = 'crmid';
 	var $default_sort_order = 'DESC';
 
+	var $search_fields = Array(
+			'Campaign Name'=>Array('vtiger_campaign'=>'campaignname'),
+			'Campaign Type'=>Array('vtiger_campaign'=>'campaigntype'),
+			);
+
+	var $search_fields_name = Array(
+			'Campaign Name'=>'campaignname',
+			'Campaign Type'=>'campaigntype',
+			);
+
 	function Campaign() 
 	{
 		$this->log =LoggerManager::getLogger('campaign');
@@ -65,8 +75,9 @@
                 $focus = new Contact();
                 $button = '';
                 $returnset = '&return_module=Campaigns&return_action=DetailView&return_id='.$id;
+		$query = 'select vtiger_contactdetails.accountid, vtiger_users.user_name,vtiger_groups.groupname,vtiger_campaign.campaignid, vtiger_campaign.campaignname, vtiger_contactdetails.contactid, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.title, vtiger_contactdetails.department, vtiger_contactdetails.email, vtiger_contactdetails.phone, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_campaign inner join vtiger_campaigncontrel on vtiger_campaigncontrel.campaignid = vtiger_campaign.campaignid inner join vtiger_contactdetails on vtiger_campaigncontrel.contactid = vtiger_contactdetails.contactid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid left join vtiger_groups on vtiger_groups.groupname=vtiger_contactgrouprelation.groupname left join vtiger_users on vtiger_crmentity.smownerid=vtiger_users.id where vtiger_campaign.campaignid = '.$id.' and vtiger_crmentity.deleted=0';
 
-		$query = 'SELECT vtiger_contactdetails.*, vtiger_crmentity.crmid, vtiger_users.user_name, vtiger_groups.groupname, vtiger_crmentity.smownerid from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid left join vtiger_users on vtiger_crmentity.smownerid = vtiger_users.id left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid left join vtiger_groups on vtiger_groups.groupname=vtiger_contactgrouprelation.groupname  where vtiger_crmentity.deleted=0 and vtiger_contactdetails.campaignid = '.$id;
+		//$query = 'SELECT vtiger_contactdetails.*, vtiger_crmentity.crmid, vtiger_users.user_name, vtiger_groups.groupname, vtiger_crmentity.smownerid from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid left join vtiger_users on vtiger_crmentity.smownerid = vtiger_users.id left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid left join vtiger_groups on vtiger_groups.groupname=vtiger_contactgrouprelation.groupname  where vtiger_crmentity.deleted=0 and vtiger_contactdetails.campaignid = '.$id;
 		$log->debug("Exiting get_contacts method ...");
                 return GetRelatedList('Campaigns','Contacts',$focus,$query,$button,$returnset);
         }
@@ -85,6 +96,23 @@
 		$log->debug("Exiting get_leads method ...");
                 return GetRelatedList('Campaigns','Leads',$focus,$query,$button,$returnset);
         }
+	function get_opportunities($id)
+	{
+		global $log;
+		$log->debug("Entering get_opportunities(".$id.") method ...");
+		global $mod_strings;
+
+		$focus = new Potential();
+
+		$button = '';
+		$returnset = '&return_module=Campaigns&return_action=DetailView&return_id='.$id;
+
+		$query = 'select vtiger_users.user_name,vtiger_groups.groupname, vtiger_potential.potentialid, vtiger_potential.potentialname, vtiger_potential.potentialtype, vtiger_potential.sales_stage, vtiger_potential.amount, vtiger_potential.closingdate, vtiger_crmentity.crmid, vtiger_crmentity.smownerid from vtiger_campaign inner join vtiger_potential on vtiger_campaign.campaignid = vtiger_potential.campaignid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_potential.potentialid left join vtiger_potentialgrouprelation on vtiger_potential.potentialid=vtiger_potentialgrouprelation.potentialid left join vtiger_groups on vtiger_groups.groupname=vtiger_potentialgrouprelation.groupname left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_campaign.campaignid = '.$id.' and vtiger_crmentity.deleted=0';
+		if($this->column_fields['account_id'] != 0)
+		$log->debug("Exiting get_opportunities method ...");
+		return GetRelatedList('Campaigns','Potentials',$focus,$query,$button,$returnset);
+
+	}
 
 }
 ?>



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 07:29:27 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 14:29:27 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7130 -
	/vtigercrm/trunk/modules/Campaigns/Popup.php
Message-ID: <20060615142927.53A437ED21B@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 15 08:29:23 2006
New Revision: 7130

Log:
Campaign popup has been integrated

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



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 07:33:26 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 14:33:26 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7131 -
 /vtigercrm/trunk/modules/Campaigns/updateRelations.php
Message-ID: <20060615143326.63B887ED20C@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 15 08:33:19 2006
New Revision: 7131

Log:
changes made to integrate campaign related list

Added:
    vtigercrm/trunk/modules/Campaigns/updateRelations.php



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 07:43:39 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 14:43:39 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7132 - in
 /vtigercrm/trunk/modules: Invoice/Save.php PurchaseOrder/Save.php
 SalesOrder/Save.php
Message-ID: <20060615144340.646327ED20C@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 15 08:43:30 2006
New Revision: 7132

Log:
* Removed the vtiger prefix which have been added for the table's columnnames

Modified:
    vtigercrm/trunk/modules/Invoice/Save.php
    vtigercrm/trunk/modules/PurchaseOrder/Save.php
    vtigercrm/trunk/modules/SalesOrder/Save.php

Modified: vtigercrm/trunk/modules/Invoice/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Invoice/Save.php (original)
+++ vtigercrm/trunk/modules/Invoice/Save.php Thu Jun 15 08:43:30 2006
@@ -38,7 +38,7 @@
 if($focus->column_fields["salesorder_id"] != '')
 {
         $so_id = $focus->column_fields["salesorder_id"];
-        $query1 = "update vtiger_salesorder set vtiger_sostatus='Approved' where vtiger_salesorderid=".$so_id;
+        $query1 = "update vtiger_salesorder set sostatus='Approved' where salesorderid=".$so_id;
         $adb->query($query1);
 }
 
@@ -46,7 +46,7 @@
 $ext_prod_arr = Array();
 if($focus->mode == 'edit')
 {
-	$query2  = "select * from vtiger_invoiceproductrel where vtiger_invoiceid=".$focus->id;
+	$query2  = "select * from vtiger_invoiceproductrel where invoiceid=".$focus->id;
 	$result2 = $adb->query($query2);
 	$num_rows = $adb->num_rows($result2);
 	for($i=0; $i<$num_rows;$i++)
@@ -56,7 +56,7 @@
 		$ext_prod_arr[$pro_id] = $pro_qty;	
 	}	
 
-        $query1 = "delete from vtiger_invoiceproductrel where vtiger_invoiceid=".$focus->id;
+        $query1 = "delete from vtiger_invoiceproductrel where invoiceid=".$focus->id;
         $adb->query($query1);
 
 }

Modified: vtigercrm/trunk/modules/PurchaseOrder/Save.php
==============================================================================
--- vtigercrm/trunk/modules/PurchaseOrder/Save.php (original)
+++ vtigercrm/trunk/modules/PurchaseOrder/Save.php Thu Jun 15 08:43:30 2006
@@ -46,7 +46,7 @@
 $focus->save("PurchaseOrder");
 if($focus->mode == 'edit')
 {
-        $query1 = "delete from vtiger_poproductrel where vtiger_purchaseorderid=".$focus->id;
+        $query1 = "delete from vtiger_poproductrel where purchaseorderid=".$focus->id;
         $adb->query($query1);
 
 }

Modified: vtigercrm/trunk/modules/SalesOrder/Save.php
==============================================================================
--- vtigercrm/trunk/modules/SalesOrder/Save.php (original)
+++ vtigercrm/trunk/modules/SalesOrder/Save.php Thu Jun 15 08:43:30 2006
@@ -38,14 +38,14 @@
 if($focus->column_fields["quote_id"] != '')
 {
         $qt_id = $focus->column_fields["quote_id"];
-        $query1 = "update vtiger_quotes set vtiger_quotestage='Accepted' where quoteid=".$qt_id;
+        $query1 = "update vtiger_quotes set quotestage='Accepted' where quoteid=".$qt_id;
         $adb->query($query1);
 }
 
 $ext_prod_arr = Array();
 if($focus->mode == 'edit')
 {
-	$query2  = "select * from vtiger_soproductrel where vtiger_salesorderid=".$focus->id;
+	$query2  = "select * from vtiger_soproductrel where salesorderid=".$focus->id;
         $result2 = $adb->query($query2);
         $num_rows = $adb->num_rows($result2);
         for($i=0; $i<$num_rows;$i++)
@@ -56,7 +56,7 @@
         }
 
 	
-        $query1 = "delete from vtiger_soproductrel where vtiger_salesorderid=".$focus->id;
+        $query1 = "delete from vtiger_soproductrel where salesorderid=".$focus->id;
         $adb->query($query1);
 
 }



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 07:54:20 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 14:54:20 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7133 -
 /vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
Message-ID: <20060615145420.2D3537ED22E@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 15 08:54:13 2006
New Revision: 7133

Log:
campaign related list has been integrated

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

Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original)
+++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Thu Jun 15 08:54:13 2006
@@ -225,7 +225,6 @@
  $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'lastname','vtiger_leaddetails',1,'2','lastname','Last Name',1,0,0,100,4,13,1,'V~M',0,2,'BAS')");	
  $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'mobile','vtiger_leadaddress',1,'1','mobile','Mobile',1,0,0,100,5,13,1,'V~O',1,null,'BAS')");	
  $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'company','vtiger_leaddetails',1,'2','company','Company',1,0,0,100,6,13,1,'V~M',0,3,'BAS')");
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'campaignid','vtiger_leaddetails',1,'51','campaignid','Campaign Name',1,0,0,100,6,4,3,'I~O',1,null,'BAS')");
  $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'fax','vtiger_leadaddress',1,'1','fax','Fax',1,0,0,100,7,13,1,'V~O',1,null,'BAS')");
  $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'designation','vtiger_leaddetails',1,'1','designation','Designation',1,0,0,100,8,13,1,'V~O',1,null,'BAS')");
  $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'email','vtiger_leaddetails',1,'13','email','Email',1,0,0,100,9,13,1,'E~O',0,5,'BAS')");
@@ -237,6 +236,7 @@
  $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'rating','vtiger_leaddetails',1,'15','rating','Rating',1,0,0,100,15,13,1,'V~O',1,null,'ADV')");
  $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'noofemployees','vtiger_leaddetails',1,'1','noofemployees','No Of Employees',1,0,0,100,16,13,1,'V~O',1,null,'ADV')");
  $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,17,13,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'campaignid','vtiger_leaddetails',1,'58','campaignid','Campaign Source',1,0,0,100,18,13,1,'I~O',1,null,'BAS')");
  $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'yahooid','vtiger_leaddetails',1,'13','yahooid','Yahoo Id',1,0,0,100,18,13,1,'V~O',1,null,'ADV')");
 $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,19,13,2,'T~O',1,null,'BAS')");
  $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,20,13,2,'T~O',1,null,'BAS')");
@@ -273,7 +273,7 @@
  $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'lastname','vtiger_contactdetails',1,'2','lastname','Last Name',1,0,0,100,4,4,1,'V~M',0,2,'BAS')");	
  $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'mobile','vtiger_contactdetails',1,'1','mobile','Mobile',1,0,0,100,5,4,1,'V~O',1,null,'BAS')");	
  $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'accountid','vtiger_contactdetails',1,'51','account_id','Account Name',1,0,0,100,6,4,1,'I~O',0,3,'BAS')");	
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'campaignid','vtiger_contactdetails',1,'51','campaignid','Campaign Name',1,0,0,100,6,4,3,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'campaignid','vtiger_contactdetails',1,'58','campaignid','Campaign Source',1,0,0,100,6,4,1,'I~O',1,null,'BAS')");
  $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'homephone','vtiger_contactsubdetails',1,'11','homephone','Home Phone',1,0,0,100,7,4,1,'V~O',1,null,'ADV')");	
  $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'leadsource','vtiger_contactsubdetails',1,'15','leadsource','Lead Source',1,0,0,100,8,4,1,'V~O',1,null,'BAS')");	
  $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'otherphone','vtiger_contactsubdetails',1,'11','otherphone','Phone',1,0,0,100,9,4,1,'V~O',1,null,'BAS')");
@@ -343,6 +343,7 @@
  $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'sales_stage','vtiger_potential',1,'16','sales_stage','Sales Stage',1,0,0,100,9,1,1,'V~O',0,4,'BAS')");
  $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,10,1,1,'V~M',1,null,'BAS')");
  $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'probability','vtiger_potential',1,'9','probability','Probability',1,0,0,100,11,1,1,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'campaignid','vtiger_potential',1,'58','campaignid','Campaign Source',1,0,0,100,12,1,1,'N~O',1,null,'BAS')");
 $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,13,1,2,'T~O',1,null,'BAS')");
  $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,14,1,2,'T~O',1,null,'BAS')");
 
@@ -1799,6 +1800,7 @@
 
          $this->db->query("insert into vtiger_relatedlists values (".$this->db->getUniqueID('relatedlists').",".getTabid("Campaigns").",".getTabid("Contacts").",'get_contacts',1,'Contacts',0)");
          $this->db->query("insert into vtiger_relatedlists values (".$this->db->getUniqueID('relatedlists').",".getTabid("Campaigns").",".getTabid("Leads").",'get_leads',2,'Leads',0)");
+	 $this->db->query("insert into vtiger_relatedlists values (".$this->db->getUniqueID('relatedlists').",".getTabid("Campaigns").",".getTabid("Potentials").",'get_opportunities',3,'Potentials',0)");
 
                $this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("notificationscheduler").",'LBL_TASK_NOTIFICATION_DESCRITPION',1,'Task Delay Notification','Tasks delayed beyond 24 hrs ','LBL_TASK_NOTIFICATION')");
 



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 07:56:25 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 14:56:25 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7134 - in /vtigercrm/trunk:
 Smarty/templates/Header.tpl include/language/en_us.lang.php
Message-ID: <20060615145625.F0DAA7ED20C@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 15 08:56:18 2006
New Revision: 7134

Log:
Added the default value quick create in the combo options - ahmed

Modified:
    vtigercrm/trunk/Smarty/templates/Header.tpl
    vtigercrm/trunk/include/language/en_us.lang.php

Modified: vtigercrm/trunk/Smarty/templates/Header.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Header.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Header.tpl Thu Jun 15 08:56:18 2006
@@ -75,12 +75,14 @@
 			<td style="padding-left:10px" nowrap>
 			{if $CNT eq 1}
                                 <select class=small style="width:120px" title="Create New" onclick="QCreate(this);">
+					<option value="none">{$APP.LBL_QUICK_CREATE}</option>
                         {foreach  item=detail from=$QCMODULE}
                                         <option value="{$detail.1}">{$APP[$detail.0]}</option>
                         {/foreach}
                                 </select>
                         {else}
                                 <select class=small style="width:120px" title="Create New" onchange="QCreate(this);">
+					<option value="none">{$APP.LBL_QUICK_CREATE}</option>
                         {foreach  item=detail from=$QCMODULE}
                                         <option value="{$detail.1}">{$APP[$detail.0]}</option>
                         {/foreach}
@@ -201,8 +203,10 @@
 
 function QCreate(qcoptions)
 {ldelim}
+	var module = qcoptions.options[qcoptions.options.selectedIndex].value;
+	if(module != 'none')
+	{ldelim}
 	$("status").style.display="inline";
-	var module = qcoptions.options[qcoptions.options.selectedIndex].value;
 	if(module == 'Events')
 	{ldelim}
 		module = 'Activities';
@@ -225,6 +229,9 @@
                                         {rdelim}
                 {rdelim}
         );
+	{rdelim}
+	else
+		hide('qcform');
 {rdelim}
 
 </script>

Modified: vtigercrm/trunk/include/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/include/language/en_us.lang.php (original)
+++ vtigercrm/trunk/include/language/en_us.lang.php Thu Jun 15 08:56:18 2006
@@ -360,6 +360,8 @@
 'LBL_EXPORT'=>'Export',
 
 'LBL_EXPORT_ALL'=>'Export All',
+
+'LBL_QUICK_CREATE'=>'Quick Create...',
 
 'Export'=>'Export',
 'Import'=>'Import',



From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 07:57:47 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 14:57:47 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231066=3A?=
 =?utf-8?q?_Parse_version_from_a_version=2Etxt_file_for_formatted_display_?=
 =?utf-8?q?in_templates?=
In-Reply-To: <076.429749330f6d0cb63095ac82d78c73a9@vtiger.fosslabs.com>
References: <076.429749330f6d0cb63095ac82d78c73a9@vtiger.fosslabs.com>
Message-ID: <085.d72c213f5b3d232dc27faeeb5829c061@vtiger.fosslabs.com>

#1066: Parse version from a version.txt file for formatted display in templates
------------------------+---------------------------------------------------
  Reporter:  jeffk      |       Owner:  saraj               
      Type:  defect     |      Status:  new                 
  Priority:  major      |   Milestone:  5.0.0               
 Component:  vtigercrm  |     Version:  5.0.0               
Resolution:             |    Keywords:  versioning packaging
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => saraj

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1066>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 08:00:12 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 15:00:12 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7135 - in
 /vtigercrm/trunk/modules: Contacts/language/en_us.lang.php
 Leads/language/en_us.lang.php Potentials/language/en_us.lang.php
Message-ID: <20060615150012.AD1087ED20C@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 15 09:00:04 2006
New Revision: 7135

Log:
label added

Modified:
    vtigercrm/trunk/modules/Contacts/language/en_us.lang.php
    vtigercrm/trunk/modules/Leads/language/en_us.lang.php
    vtigercrm/trunk/modules/Potentials/language/en_us.lang.php

Modified: vtigercrm/trunk/modules/Contacts/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Contacts/language/en_us.lang.php Thu Jun 15 09:00:04 2006
@@ -158,6 +158,7 @@
 'Do Not Call'=>'Do Not Call',
 'Email Opt Out'=>'Email Opt Out',
 'Assigned To'=>'Assigned To',
+'Campaign Source'=>'Campaign Source',
 'Reference' =>'Reference',
 'Created Time'=>'Created Time',
 'Modified Time'=>'Modified Time',

Modified: vtigercrm/trunk/modules/Leads/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Leads/language/en_us.lang.php Thu Jun 15 09:00:04 2006
@@ -154,6 +154,7 @@
 'State'=>'State',
 'Description'=>'Description',
 'Po Box'=>'Po Box',
+'Campaign Source'=>'Campaign Source',
 //Added for CustomView 4.2 Release
 'Name'=>'Name',
 'LBL_NEW_LEADS'=>'My New Leads',

Modified: vtigercrm/trunk/modules/Potentials/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Potentials/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Potentials/language/en_us.lang.php Thu Jun 15 09:00:04 2006
@@ -106,6 +106,7 @@
 'Sales Stage'=>'Sales Stage',
 'Assigned To'=>'Assigned To',
 'Probability'=>'Probability (%)',
+'Campaign Source'=>'Campaign Source',
 'Description'=>'Description',
 'Created Time'=>'Created Time',
 'Modified Time'=>'Modified Time',



From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 08:00:10 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 15:00:10 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231068=3A?=
 =?utf-8?q?_Gray_color_Arch_-_missing?=
In-Reply-To: <076.28808b1bbcb52a79f7663717dd8edd08@vtiger.fosslabs.com>
References: <076.28808b1bbcb52a79f7663717dd8edd08@vtiger.fosslabs.com>
Message-ID: <085.104c575451507cb10591a6f7c31ca212@vtiger.fosslabs.com>

#1068: Gray color Arch - missing
------------------------+---------------------------------------------------
  Reporter:  ela        |       Owner:  developer
      Type:  defect     |      Status:  closed   
  Priority:  major      |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:  fixed      |    Keywords:  UI       
------------------------+---------------------------------------------------
Changes (by saraj):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1068>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 08:00:34 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 15:00:34 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231070=3A?=
	=?utf-8?q?_Quote_PDF_Output?=
In-Reply-To: <076.38772bdb8ba951744608d634ceddc572@vtiger.fosslabs.com>
References: <076.38772bdb8ba951744608d634ceddc572@vtiger.fosslabs.com>
Message-ID: <085.479fedfe8ae606e45d34bbf27bcc3897@vtiger.fosslabs.com>

#1070: Quote PDF Output
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  mickie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1070>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 08:00:54 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 15:00:54 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231071=3A?=
 =?utf-8?q?_FAQ_Detail_View_=22Save=22_not_working?=
In-Reply-To: <076.651331afa5aa806fc7b30ae0e7a3feb5@vtiger.fosslabs.com>
References: <076.651331afa5aa806fc7b30ae0e7a3feb5@vtiger.fosslabs.com>
Message-ID: <085.b1646a88842a1f5d6bbfc696bf7f52d8@vtiger.fosslabs.com>

#1071: FAQ Detail View "Save" not working
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  mickie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1071>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 08:05:49 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 15:05:49 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7136 -
 /vtigercrm/trunk/Smarty/templates/Inventory/InventoryDetailView.tpl
Message-ID: <20060615150549.178097ED236@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 15 09:05:45 2006
New Revision: 7136

Log:
Commented Export to PDF, Convert to SO and Convert to Invoice  buttons in DetailView because these buttons have been given as links

Modified:
    vtigercrm/trunk/Smarty/templates/Inventory/InventoryDetailView.tpl

Modified: vtigercrm/trunk/Smarty/templates/Inventory/InventoryDetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Inventory/InventoryDetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Inventory/InventoryDetailView.tpl Thu Jun 15 09:05:45 2006
@@ -112,6 +112,7 @@
 		{if $DELETE eq 'permitted'}
 			<input title="{$APP.LBL_DELETE_BUTTON_TITLE}" accessKey="{$APP.LBL_DELETE_BUTTON_KEY}" class="small" onclick="this.form.return_module.value='{$MODULE}'; this.form.return_action.value='index'; this.form.action.value='Delete'; return confirm('{$APP.NTC_DELETE_CONFIRMATION}')" type="submit" name="Delete" value="{$APP.LBL_DELETE_BUTTON_LABEL}">&nbsp;
 		{/if}
+		<!-- Commented the buttons in DetailView because these buttons have been given as links
 		{if $MODULE eq 'Quotes' || $MODULE eq 'PurchaseOrder' || $MODULE eq 'SalesOrder' || $MODULE eq 'Invoice'}
 			{if $CREATEPDF eq 'permitted'}
 				<input title="Export To PDF" accessKey="Alt+e" class="small" onclick="this.form.return_module.value='{$MODULE}'; this.form.return_action.value='DetailView'; this.form.return_id.value='{$ID}'; this.form.module.value='{$MODULE}'; {if $MODULE eq 'SalesOrder'} this.form.action.value='CreateSOPDF'" {else} this.form.action.value='CreatePDF'" {/if} type="submit" name="Export To PDF" value="{$APP.LBL_EXPORT_TO_PDF}">&nbsp;
@@ -127,6 +128,7 @@
 				<input title="{$APP.LBL_CONVERTINVOICE_BUTTON_TITLE}" accessKey="{$APP.LBL_CONVERTINVOICE_BUTTON_KEY}" class="small" onclick="this.form.return_module.value='{$MODULE}'; this.form.return_action.value='DetailView'; this.form.return_id.value='{$ID}';this.form.convertmode.value='{$CONVERTMODE}';this.form.module.value='Invoice'; this.form.action.value='EditView'" type="submit" name="Convert To Invoice" value="{$APP.LBL_CONVERTINVOICE_BUTTON_LABEL}">&nbsp;
 			{/if}
 		{/if}
+		-->
 	</td>
    </tr>
    {/strip}



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 08:06:23 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 15:06:23 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7137 -
 /vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php
Message-ID: <20060615150623.4097D7ED236@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 15 09:06:19 2006
New Revision: 7137

Log:
changes made to handle campaign source during lead conversion

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

Modified: vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php (original)
+++ vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php Thu Jun 15 09:06:19 2006
@@ -272,7 +272,7 @@
 $contact_id = $crmcontactid;
 $log->debug("contact id is ".$contact_id);
 
- $sql_insert_contact = "INSERT INTO vtiger_contactdetails (contactid,accountid,salutation,firstname,lastname,email,phone,mobile,title,fax,yahooid) VALUES (".$contact_id.",".$crmid.",'".$row["salutationtype"] ."','" .$row["firstname"] ."','" .$row["lastname"] ."','" .$row["email"] ."','" .$row["phone"]. "','" .$row["mobile"] ."','" .$row["designation"] ."','".$row["fax"] ."','".$row['yahooid']."')";
+ $sql_insert_contact = "INSERT INTO vtiger_contactdetails (contactid,accountid,campaignid,salutation,firstname,lastname,email,phone,mobile,title,fax,yahooid) VALUES (".$contact_id.",".$crmid."," .$row["campaignid"]. ",'".$row["salutationtype"] ."','" .$row["firstname"] ."','" .$row["lastname"] ."','" .$row["email"] ."','" .$row["phone"]. "','" .$row["mobile"] ."','" .$row["designation"] ."','".$row["fax"] ."','".$row['yahooid']."')";
 
 $adb->query($sql_insert_contact);
 
@@ -323,7 +323,7 @@
 		$potential_amount=0;
         }
 
-	$sql_insert_opp = "INSERT INTO vtiger_potential (potentialid,accountid,potentialname,leadsource,closingdate,sales_stage,amount) VALUES (".$oppid.",".$crmid .",'".$potential_name."','".$row['leadsource']."','".$close_date."','".$potential_sales_stage."',".$potential_amount.")";
+	$sql_insert_opp = "INSERT INTO vtiger_potential (potentialid,accountid,campaignid,potentialname,leadsource,closingdate,sales_stage,amount) VALUES (".$oppid.",".$crmid .",".$row["campaignid"]. ",'".$potential_name."','".$row['leadsource']."','".$close_date."','".$potential_sales_stage."',".$potential_amount.")";
 
 	$adb->query($sql_insert_opp);
 



From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 08:09:17 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 15:09:17 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231073=3A?=
 =?utf-8?q?_Inventory_=3E_Vendors_=3E_Products?=
In-Reply-To: <076.6756be513a6a47a241a70293fa5e1bbe@vtiger.fosslabs.com>
References: <076.6756be513a6a47a241a70293fa5e1bbe@vtiger.fosslabs.com>
Message-ID: <085.ed9ee87bfb039f24a6837430ce63ae60@vtiger.fosslabs.com>

#1073: Inventory > Vendors > Products
--------------------------+-------------------------------------------------
  Reporter:  anonymous    |       Owner:  jerrydgeorge
      Type:  enhancement  |      Status:  new         
  Priority:  major        |   Milestone:              
 Component:  vtigercrm    |     Version:  5.0.0       
Resolution:               |    Keywords:              
--------------------------+-------------------------------------------------
Changes (by saraj):

  * owner:  developer => jerrydgeorge

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1073>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 08:09:24 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 15:09:24 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231299=3A?=
 =?utf-8?q?_MySQL_version_5=2E0=2E22_is_not_supported=2C_kindly_connect_to?=
 =?utf-8?q?_MySQL_4=2E1=2Ex_or_above?=
In-Reply-To: <076.bb406000b4b59efeb8cc8221dd00f6f4@vtiger.fosslabs.com>
References: <076.bb406000b4b59efeb8cc8221dd00f6f4@vtiger.fosslabs.com>
Message-ID: <085.6f4a93427473aea31b6345d166537ca3@vtiger.fosslabs.com>

#1299: MySQL version 5.0.22 is not supported, kindly connect to MySQL 4.1.x or
above
------------------------+---------------------------------------------------
  Reporter:  fh         |       Owner:  developer
      Type:  defect     |      Status:  closed   
  Priority:  major      |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:  fixed      |    Keywords:  Bug      
------------------------+---------------------------------------------------
Changes (by anonymous):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1299>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 08:11:24 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 15:11:24 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231074=3A?=
 =?utf-8?q?_Document_file_permissions_needed_for_install?=
In-Reply-To: <076.dfa8cdb6063a10bf60cc34f2fe53fa59@vtiger.fosslabs.com>
References: <076.dfa8cdb6063a10bf60cc34f2fe53fa59@vtiger.fosslabs.com>
Message-ID: <085.869ac01db5224eec6019638bbfc1c7b7@vtiger.fosslabs.com>

#1074: Document file permissions needed for install
------------------------+---------------------------------------------------
  Reporter:  jeffk      |       Owner:  richie 
      Type:  defect     |      Status:  new    
  Priority:  major      |   Milestone:  5.0.0  
 Component:  vtigercrm  |     Version:  5.0.0  
Resolution:             |    Keywords:  install
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => richie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1074>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 08:14:05 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 15:14:05 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231085=3A?=
 =?utf-8?q?_Copyright_message_missed_in_Installer?=
In-Reply-To: <076.ca4f7110cd4c9640e7ef0f709ef932b5@vtiger.fosslabs.com>
References: <076.ca4f7110cd4c9640e7ef0f709ef932b5@vtiger.fosslabs.com>
Message-ID: <085.e3cc095cd1325f9c368a130cebfc317c@vtiger.fosslabs.com>

#1085: Copyright message missed in Installer
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  saraj
      Type:  defect     |      Status:  new  
  Priority:  major      |   Milestone:  5.0.0
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => saraj

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1085>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 08:14:25 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 15:14:25 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231091=3A?=
 =?utf-8?q?_My_Preferences_-_Photo_does_not_work?=
In-Reply-To: <076.0a340fe4771c5eb83733cd4065926089@vtiger.fosslabs.com>
References: <076.0a340fe4771c5eb83733cd4065926089@vtiger.fosslabs.com>
Message-ID: <085.df4ef91bb537ca4869a2be49a74efe5a@vtiger.fosslabs.com>

#1091: My Preferences - Photo does not work
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  jerrydgeorge
      Type:  defect     |      Status:  new         
  Priority:  major      |   Milestone:              
 Component:  vtigercrm  |     Version:  5.0.0       
Resolution:             |    Keywords:              
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => jerrydgeorge

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1091>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 08:15:10 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 15:15:10 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7138 -
	/vtigercrm/trunk/include/utils/CommonUtils.php
Message-ID: <20060615151510.574DE7ED246@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 15 09:15:06 2006
New Revision: 7138

Log:
getCampaignName function included

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 Jun 15 09:15:06 2006
@@ -410,6 +410,27 @@
 	$log->debug("Exiting getContactName method ...");
         return $contact_name;
 }
+
+/**
+ * Function to get the Campaign Name when a campaign id is given
+ * Takes the input as $campaign_id - campaign id
+ * returns the Campaign Name in string format.
+ */
+
+function getCampaignName($campaign_id)
+{
+	global $log;
+	$log->debug("Entering getCampaignName(".$campaign_id.") method ...");
+	$log->info("in getCampaignName ".$campaign_id);
+
+	global $adb;
+	$sql = "select * from vtiger_campaign where campaignid=".$campaign_id;
+	$result = $adb->query($sql);
+	$campaign_name = $adb->query_result($result,0,"campaignname");
+	$log->debug("Exiting getCampaignName method ...");
+	return $campaign_name;
+}
+
 
 /**
  * Function to get the Vendor Name when a vtiger_vendor id is given 



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 08:15:43 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 15:15:43 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7139 -
	/vtigercrm/trunk/include/utils/ListViewUtils.php
Message-ID: <20060615151543.60CCD7ED246@vtiger.fosslabs.com>

Author: richie
Date: Thu Jun 15 09:15:38 2006
New Revision: 7139

Log:
User List view from getListViewEntries fn

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 Thu Jun 15 09:15:38 2006
@@ -145,19 +145,6 @@
 						{
 							$temp_sorder = 'ASC';
 						}
-					/*	if($relatedlist !='')
-						{
-							if($app_strings[$name])
-							{
-								$name = $app_strings[$name];
-							}
-							else
-							{
-								$name = $mod_strings[$name];
-							}
-						}
-						else
-						{*/
 							if($app_strings[$name])
 							{
 								$lbl_name = $app_strings[$name];
@@ -176,10 +163,11 @@
 							}
 							if($relatedlist !='')
 								$name = "<a href='index.php?module=".$relatedmodule."&action=CallRelatedList&relmodule=".$module."&order_by=".$col."&record=".$relatedlist."&sorder=".$temp_sorder."' class='listFormHeaderLinks'>".$lbl_name."&nbsp;".$arrow."</a>";
+							elseif($module == 'Users' && $name == 'User Name')
+								$name = "<a href='javascript:;' onClick='getListViewEntries_js(\"".$module."\",\"order_by=".$col."&sorder=".$temp_sorder."".$sort_qry."\");' class='listFormHeaderLinks'>".$mod_strings['LBL_LIST_USER_NAME_ROLE']."&nbsp;".$arrow."</a>";
 							else
 								$name = "<a href='javascript:;' onClick='getListViewEntries_js(\"".$module."\",\"order_by=".$col."&sorder=".$temp_sorder."".$sort_qry."\");' class='listFormHeaderLinks'>".$lbl_name."&nbsp;".$arrow."</a>";
 							$arrow = '';
-						//}
 					}
 					else
 					{       if($app_strings[$name])
@@ -418,6 +406,7 @@
 	$navigation_array['verylast'] =$paging;
 	$log->debug("Exiting getNavigationValues method ...");
 	return $navigation_array;
+	
 }
 
 
@@ -527,9 +516,14 @@
 	{
 		$list_header =Array();
 		//Getting the entityid
-		$entity_id = $adb->query_result($list_result,$i-1,"crmid");
-		$owner_id = $adb->query_result($list_result,$i-1,"smownerid");
-
+		if($module != 'Users')
+		{
+			$entity_id = $adb->query_result($list_result,$i-1,"crmid");
+			$owner_id = $adb->query_result($list_result,$i-1,"smownerid");
+		}else
+		{
+			$entity_id = $adb->query_result($list_result,$i-1,"id");
+		}	
 		// Fredy Klammsteiner, 4.8.2005: changes from 4.0.1 migrated to 4.2
 		// begin: Armando L??scher 05.07.2005 -> ??priority
 		// Code contri buted by fredy Desc: Set Priority color
@@ -953,7 +947,6 @@
 	foreach($uicolarr as $key=>$value)
 	{
 		$uitype = $key;
-	
 		$colname = $value;
         }
 
@@ -964,12 +957,10 @@
 	}
 	//Ends
 	$temp_val = $adb->query_result($list_result,$list_result_count,$colname);
-
 	if(strlen($temp_val) > 40)
         {
                 $temp_val = substr($temp_val,0,40).'...';
         }
-		
 	if($uitype == 52 || $uitype == 53 || $uitype == 77)
 	{
 		$value = $adb->query_result($list_result,$list_result_count,'user_name');
@@ -1238,9 +1229,13 @@
 		else
 			$value='';
         }
+	elseif($uitype == 98)
+	{
+		$value = '<a href="index.php?action=RoleDetailView&module=Users&parenttab=Settings&roleid='.$temp_val.'">'.getRoleName($temp_val).'</a>';  
+	}
 	else
 	{
-	
+
 		if($fieldname == $focus->list_link_field)
 		{
 			if($mode == "search")
@@ -1248,29 +1243,29 @@
 				if($popuptype == "specific")
 				{
 					// Added for get the first name of contact in Popup window
-                                        if($colname == "lastname" && $module == 'Contacts')
+					if($colname == "lastname" && $module == 'Contacts')
 					{
-                                               $firstname=$adb->query_result($list_result,$list_result_count,'firstname');
-                                        	$temp_val =$temp_val.' '.$firstname;
+						$firstname=$adb->query_result($list_result,$list_result_count,'firstname');
+						$temp_val =$temp_val.' '.$firstname;
 					}
 
 					$temp_val = str_replace("'",'\"',$temp_val);
-			
+
 					//Added to avoid the error when select SO from Invoice through AjaxEdit
 					if($module == 'SalesOrder')
 						$value = '<a href="a" LANGUAGE=javascript onclick=\'set_return_specific("'.$entity_id.'", "'.br2nl($temp_val).'","'.$_REQUEST['form'].'"); window.close()\'>'.$temp_val.'</a>';
 					else
-					$value = '<a href="a" LANGUAGE=javascript onclick=\'set_return_specific("'.$entity_id.'", "'.br2nl($temp_val).'"); window.close()\'>'.$temp_val.'</a>';
+						$value = '<a href="a" LANGUAGE=javascript onclick=\'set_return_specific("'.$entity_id.'", "'.br2nl($temp_val).'"); window.close()\'>'.$temp_val.'</a>';
 				}
 				elseif($popuptype == "detailview")
-                                {
-                                        if($colname == "lastname" && $module == 'Contacts')
-                                               $firstname=$adb->query_result($list_result,$list_result_count,'firstname');
-                                        $temp_val =$temp_val.' '.$firstname;
+				{
+					if($colname == "lastname" && $module == 'Contacts')
+						$firstname=$adb->query_result($list_result,$list_result_count,'firstname');
+					$temp_val =$temp_val.' '.$firstname;
 
 					$focus->record_id = $_REQUEST['recordid'];
-                                        $value = '<a href="a" LANGUAGE=javascript onclick=\'add_data_to_relatedlist("'.$entity_id.'","'.$focus->record_id.'"); window.close()\'>'.$temp_val.'</a>';
-                                }
+					$value = '<a href="a" LANGUAGE=javascript onclick=\'add_data_to_relatedlist("'.$entity_id.'","'.$focus->record_id.'"); window.close()\'>'.$temp_val.'</a>';
+				}
 				elseif($popuptype == "formname_specific")
 				{
 					$value = '<a href="a" LANGUAGE=javascript onclick=\'set_return_formname_specific("'.$_REQUEST['form'].'", "'.$entity_id.'", "'.br2nl($temp_val).'"); window.close()\'>'.$temp_val.'</a>';
@@ -1304,7 +1299,7 @@
 					$prod_id = $_REQUEST['productid'];
 					$flname =  $_REQUEST['fldname'];
 					$listprice=getListPrice($prod_id,$entity_id);	
-					
+
 					$value = '<a href="a" LANGUAGE=javascript onclick=\'set_return_inventory_pb("'.$listprice.'", "'.$flname.'"); window.close()\'>'.$temp_val.'</a>';
 				}
 				elseif($popuptype == "specific_account_address")
@@ -1312,32 +1307,32 @@
 					require_once('modules/Accounts/Account.php');
 					$acct_focus = new Account();
 					$acct_focus->retrieve_entity_info($entity_id,"Accounts");
-					
+
 					$value = '<a href="a" LANGUAGE=javascript onclick=\'set_return_address("'.$entity_id.'", "'.br2nl($temp_val).'", "'.br2nl($acct_focus->column_fields['bill_street']).'", "'.br2nl($acct_focus->column_fields['ship_street']).'", "'.br2nl($acct_focus->column_fields['bill_city']).'", "'.br2nl($acct_focus->column_fields['ship_city']).'", "'.br2nl($acct_focus->column_fields['bill_state']).'", "'.br2nl($acct_focus->column_fields['ship_state']).'", "'.br2nl($acct_focus->column_fields['bill_code']).'", "'.br2nl($acct_focus->column_fields['ship_code']).'", "'.br2nl($acct_focus->column_fields['bill_country']).'", "'.br2nl($acct_focus->column_fields['ship_country']).'","'.br2nl($acct_focus->column_fields['bill_pobox']).'", "'.br2nl($acct_focus->column_fields['ship_pobox']).'"); window.close()\'>'.$temp_val.'</a>';
 
 				}
 				elseif($popuptype == "specific_contact_account_address")
-                                {
-                                        require_once('modules/Accounts/Account.php');
-                                        $acct_focus = new Account();
-                                        $acct_focus->retrieve_entity_info($entity_id,"Accounts");
-
-                                        $value = '<a href="a" LANGUAGE=javascript onclick=\'set_return_contact_address("'.$entity_id.'", "'.br2nl($temp_val).'", "'.br2nl($acct_focus->column_fields['bill_street']).'", "'.br2nl($acct_focus->column_fields['ship_street']).'", "'.br2nl($acct_focus->column_fields['bill_city']).'", "'.br2nl($acct_focus->column_fields['ship_city']).'", "'.br2nl($acct_focus->column_fields['bill_state']).'", "'.br2nl($acct_focus->column_fields['ship_state']).'", "'.br2nl($acct_focus->column_fields['bill_code']).'", "'.br2nl($acct_focus->column_fields['ship_code']).'", "'.br2nl($acct_focus->column_fields['bill_country']).'", "'.br2nl($acct_focus->column_fields['ship_country']).'","'.br2nl($acct_focus->column_fields['bill_pobox']).'", "'.br2nl($acct_focus->column_fields['ship_pobox']).'"); window.close()\'>'.$temp_val.'</a>';
-
-                                }
+				{
+					require_once('modules/Accounts/Account.php');
+					$acct_focus = new Account();
+					$acct_focus->retrieve_entity_info($entity_id,"Accounts");
+
+					$value = '<a href="a" LANGUAGE=javascript onclick=\'set_return_contact_address("'.$entity_id.'", "'.br2nl($temp_val).'", "'.br2nl($acct_focus->column_fields['bill_street']).'", "'.br2nl($acct_focus->column_fields['ship_street']).'", "'.br2nl($acct_focus->column_fields['bill_city']).'", "'.br2nl($acct_focus->column_fields['ship_city']).'", "'.br2nl($acct_focus->column_fields['bill_state']).'", "'.br2nl($acct_focus->column_fields['ship_state']).'", "'.br2nl($acct_focus->column_fields['bill_code']).'", "'.br2nl($acct_focus->column_fields['ship_code']).'", "'.br2nl($acct_focus->column_fields['bill_country']).'", "'.br2nl($acct_focus->column_fields['ship_country']).'","'.br2nl($acct_focus->column_fields['bill_pobox']).'", "'.br2nl($acct_focus->column_fields['ship_pobox']).'"); window.close()\'>'.$temp_val.'</a>';
+
+				}
 
 				elseif($popuptype == "specific_potential_account_address")
-                                {
-                                        $acntid = $adb->query_result($list_result,$list_result_count,"accountid");
-                                        require_once('modules/Accounts/Account.php');
-                                        $acct_focus = new Account();
-                                        $acct_focus->retrieve_entity_info($acntid,"Accounts");
-                                        $account_name = getAccountName($acntid);
-
-                                        $value = '<a href="a" LANGUAGE=javascript onclick=\'set_return_address("'.$entity_id.'", "'.br2nl($temp_val).'", "'.$acntid.'", "'.br2nl($account_name).'", "'.br2nl($acct_focus->column_fields['bill_street']).'", "'.br2nl($acct_focus->column_fields['ship_street']).'", "'.br2nl($acct_focus->column_fields['bill_city']).'", "'.br2nl($acct_focus->column_fields['ship_city']).'", "'.br2nl($acct_focus->column_fields['bill_state']).'", "'.br2nl($acct_focus->column_fields['ship_state']).'", "'.br2nl($acct_focus->column_fields['bill_code']).'", "'.br2nl($acct_focus->column_fields['ship_code']).'", "'.br2nl($acct_focus->column_fields['bill_country']).'", "'.br2nl($acct_focus->column_fields['ship_country']).'","'.br2nl($acct_focus->column_fields['bill_pobox']).'", "'.br2nl($acct_focus->column_fields['ship_pobox']).'"); window.close()\'>'.$temp_val.'</a>';
-
-                                }
-//added by rdhital/Raju for better emails 
+				{
+					$acntid = $adb->query_result($list_result,$list_result_count,"accountid");
+					require_once('modules/Accounts/Account.php');
+					$acct_focus = new Account();
+					$acct_focus->retrieve_entity_info($acntid,"Accounts");
+					$account_name = getAccountName($acntid);
+
+					$value = '<a href="a" LANGUAGE=javascript onclick=\'set_return_address("'.$entity_id.'", "'.br2nl($temp_val).'", "'.$acntid.'", "'.br2nl($account_name).'", "'.br2nl($acct_focus->column_fields['bill_street']).'", "'.br2nl($acct_focus->column_fields['ship_street']).'", "'.br2nl($acct_focus->column_fields['bill_city']).'", "'.br2nl($acct_focus->column_fields['ship_city']).'", "'.br2nl($acct_focus->column_fields['bill_state']).'", "'.br2nl($acct_focus->column_fields['ship_state']).'", "'.br2nl($acct_focus->column_fields['bill_code']).'", "'.br2nl($acct_focus->column_fields['ship_code']).'", "'.br2nl($acct_focus->column_fields['bill_country']).'", "'.br2nl($acct_focus->column_fields['ship_country']).'","'.br2nl($acct_focus->column_fields['bill_pobox']).'", "'.br2nl($acct_focus->column_fields['ship_pobox']).'"); window.close()\'>'.$temp_val.'</a>';
+
+				}
+				//added by rdhital/Raju for better emails 
 				elseif($popuptype == "set_return_emails")
 				{	
 					if ($module=='Accounts')
@@ -1381,19 +1376,19 @@
 					require_once('modules/Vendors/Vendor.php');
 					$acct_focus = new Vendor();
 					$acct_focus->retrieve_entity_info($entity_id,"Vendors");
-					
+
 					$value = '<a href="a" LANGUAGE=javascript onclick=\'set_return_address("'.$entity_id.'", "'.br2nl($temp_val).'", "'.br2nl($acct_focus->column_fields['treet']).'", "'.br2nl($acct_focus->column_fields['city']).'", "'.br2nl($acct_focus->column_fields['state']).'", "'.br2nl($acct_focus->column_fields['postalcode']).'", "'.br2nl($acct_focus->column_fields['country']).'","'.br2nl($acct_focus->column_fields['pobox']).'"); window.close()\'>'.$temp_val.'</a>';
 
 				}
 				else
 				{
 					if($colname == "lastname")
-                                                $firstname=$adb->query_result($list_result,$list_result_count,'firstname');
-                                        $temp_val =$temp_val.' '.$firstname;
+						$firstname=$adb->query_result($list_result,$list_result_count,'firstname');
+					$temp_val =$temp_val.' '.$firstname;
 
 					$temp_val = str_replace("'",'\"',$temp_val);
-	
-$log->debug("Exiting getValue method ...");
+
+					$log->debug("Exiting getValue method ...");
 					$value = '<a href="a" LANGUAGE=javascript onclick=\'set_return("'.$entity_id.'", "'.br2nl($temp_val).'"); window.close()\'>'.$temp_val.'</a>';
 				}
 			}
@@ -1402,58 +1397,58 @@
 				if(($module == "Leads" && $colname == "lastname") || ($module == "Contacts" && $colname == "lastname"))
 				{
 					if($module == "Contacts")
-                                        {
-                                                 $query="SELECT vtiger_contactdetails.imagename FROM vtiger_contactdetails WHERE lastname='".$temp_val."'";
-                                                //echo $query;
-                                                 $result = $adb->query($query);
-                                                 $imagename=$adb->query_result($result,0,'imagename');
-                                                 if($imagename != '')
-                                                 {
-                                                         $imgpath = "test/contact/".$imagename;
-                                                         $contact_image='<img align="absmiddle" src="'.$imgpath.'" width="20" height="20" border="0" onMouseover=modifyimage("dynloadarea","'.$imgpath.'"); onMouseOut=fnhide("dynloadarea");>';
-                                                 }
+					{
+						$query="SELECT vtiger_contactdetails.imagename FROM vtiger_contactdetails WHERE lastname='".$temp_val."'";
+						//echo $query;
+						$result = $adb->query($query);
+						$imagename=$adb->query_result($result,0,'imagename');
+						if($imagename != '')
+						{
+							$imgpath = "test/contact/".$imagename;
+							$contact_image='<img align="absmiddle" src="'.$imgpath.'" width="20" height="20" border="0" onMouseover=modifyimage("dynloadarea","'.$imgpath.'"); onMouseOut=fnhide("dynloadarea");>';
+						}
 						$value = '<table width=100% border=0 cellpadding=0 cellspacing=0><tr><td align="left"><a href="index.php?action=DetailView&module='.$module.'&record='.$entity_id.'&parenttab='.$tabname.'">'.$temp_val.'</a></td><td align="right">'.$contact_image.'</td></tr></table>';
 					}else
 					{
-					//Commented to give link even to the first name - Jaguar
-					$value = $contact_image.'<a href="index.php?action=DetailView&module='.$module.'&record='.$entity_id.'&parenttab='.$tabname.'">'.$temp_val.'</a>';
+						//Commented to give link even to the first name - Jaguar
+						$value = $contact_image.'<a href="index.php?action=DetailView&module='.$module.'&record='.$entity_id.'&parenttab='.$tabname.'">'.$temp_val.'</a>';
 					}
 				}
 				elseif($module == "Activities")
-                                {
-                                        $actvity_type = $adb->query_result($list_result,$list_result_count,'activitytype');
-                                        if($actvity_type == "Task")
-                                        {
-                                               $value = '<a href="index.php?action=DetailView&module='.$module.'&record='.$entity_id.'&activity_mode=Task">'.$temp_val.'</a>';
-                                        }
-                                        else
-                                        {
-                                                $value = '<a href="index.php?action=DetailView&module='.$module.'&record='.$entity_id.'&activity_mode=Events">'.$temp_val.'</a>';
-                                        }
-                                }
+				{
+					$actvity_type = $adb->query_result($list_result,$list_result_count,'activitytype');
+					if($actvity_type == "Task")
+					{
+						$value = '<a href="index.php?action=DetailView&module='.$module.'&record='.$entity_id.'&activity_mode=Task">'.$temp_val.'</a>';
+					}
+					else
+					{
+						$value = '<a href="index.php?action=DetailView&module='.$module.'&record='.$entity_id.'&activity_mode=Events">'.$temp_val.'</a>';
+					}
+				}
 				elseif($module == "Vendors")
 				{
-						
-                                        $value = '<a href="index.php?action=DetailView&module=Vendors&record='.$entity_id.'&parenttab='.$tabname.'">'.$temp_val.'</a>';
+
+					$value = '<a href="index.php?action=DetailView&module=Vendors&record='.$entity_id.'&parenttab='.$tabname.'">'.$temp_val.'</a>';
 				}
 				elseif($module == "PriceBooks")
 				{
-						
-                                        $value = '<a href="index.php?action=DetailView&module=PriceBooks&record='.$entity_id.'&parenttab='.$tabname.'">'.$temp_val.'</a>';
+
+					$value = '<a href="index.php?action=DetailView&module=PriceBooks&record='.$entity_id.'&parenttab='.$tabname.'">'.$temp_val.'</a>';
 				}
 				elseif($module == "SalesOrder")
 				{
-						
-                                        $value = '<a href="index.php?action=DetailView&module=SalesOrder&record='.$entity_id.'&parenttab='.$tabname.'">'.$temp_val.'</a>';
+
+					$value = '<a href="index.php?action=DetailView&module=SalesOrder&record='.$entity_id.'&parenttab='.$tabname.'">'.$temp_val.'</a>';
 				}
 				elseif($module == 'Emails')
 				{
 					$value = $temp_val;
 				}
-                else
-                {
-                   	$value = '<a href="index.php?action=DetailView&module='.$module.'&record='.$entity_id.'&parenttab='.$tabname.'">'.$temp_val.'</a>';
-                }
+				else
+				{
+					$value = '<a href="index.php?action=DetailView&module='.$module.'&record='.$entity_id.'&parenttab='.$tabname.'">'.$temp_val.'</a>';
+				}
 			}
 		}
 		else
@@ -1982,6 +1977,10 @@
 			$query .= $sec_parameter;	
 		}
 	}
+	if($module == "Users")
+	{
+		$query = "select id,user_name,roleid,first_name,last_name,email1,phone_mobile,phone_work,is_admin,status from vtiger_users inner join vtiger_user2role on vtiger_user2role.userid=vtiger_users.id where deleted=0";
+	}
 	
 
 	$log->debug("Exiting getListQuery method ...");



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 08:17:37 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 15:17:37 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7140 - in
 /vtigercrm/trunk/modules/Users: Forms.php ListView.php Save.php User.php
Message-ID: <20060615151737.848D87ED245@vtiger.fosslabs.com>

Author: richie
Date: Thu Jun 15 09:17:31 2006
New Revision: 7140

Log:
User List view from getListViewEntries fn

Modified:
    vtigercrm/trunk/modules/Users/Forms.php
    vtigercrm/trunk/modules/Users/ListView.php
    vtigercrm/trunk/modules/Users/Save.php
    vtigercrm/trunk/modules/Users/User.php

Modified: vtigercrm/trunk/modules/Users/Forms.php
==============================================================================
--- vtigercrm/trunk/modules/Users/Forms.php (original)
+++ vtigercrm/trunk/modules/Users/Forms.php Thu Jun 15 09:17:31 2006
@@ -54,7 +54,7 @@
 function verify_data(form) {
 	var isError = false;
 	var errorMessage = "";
-	if (trim(form.email.value) == "") {
+	if (trim(form.email1.value) == "") {
 		isError = true;
 		errorMessage += "\\n$lbl_user_email1";
 		oField_miss = form.email1;
@@ -91,8 +91,8 @@
 	if (isError == true) {
 		set_fieldfocus(errorMessage,oField_miss);
 	}
-	if (trim(form.email.value) != "" && !/^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,4})+$/.test(form.email.value)) {
-		errorMessage='"' + form.email.value + '" is $err_invalid_email_address';
+	if (trim(form.email1.value) != "" && !/^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,4})+$/.test(form.email1.value)) {
+		errorMessage='"' + form.email1.value + '" is $err_invalid_email_address';
 		set_fieldfocus(errorMessage,form.email1);
 	}
 	if (trim(form.email2.value) != "" && !/^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,4})+$/.test(form.email2.value)) {

Modified: vtigercrm/trunk/modules/Users/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Users/ListView.php (original)
+++ vtigercrm/trunk/modules/Users/ListView.php Thu Jun 15 09:17:31 2006
@@ -19,6 +19,8 @@
 global $mod_strings;
 global $currentModule;
 global $theme;
+$theme_path="themes/".$theme."/";
+$image_path=$theme_path."images/";
 global $current_language;
 $mod_strings = return_module_language($current_language,'Users');
 $category = getParentTab();
@@ -37,31 +39,39 @@
 else
 	$start=1;
 
+$list_query = getListQuery("Users"); 
+
 $_SESSION['user_pagestart'] = $start;
 if($_REQUEST['sorder'] !='')
-	$sortorder = $_REQUEST['sorder'];
+	$sorder = $_REQUEST['sorder'];
+elseif($_SESSION['user_sorder'] != '')
+	$sorder = $_SESSION['user_sorder'];
 else
-	$sortorder = $_SESSION['user_sorder'];
-$_SESSION['user_sorder'] = $sortorder;
+	$sorder = 'ASC';
+$_SESSION['user_sorder'] = $sorder;
 if($_REQUEST['order_by'] != '')
-	$sortby = $_REQUEST['order_by'];
+	$order_by = $_REQUEST['order_by'];
+elseif($_SESSION['user_orderby'] != '')
+	$order_by = $_SESSION['user_orderby'];
 else
-	$sortby = $_SESSION['user_orderby'];
-$_SESSION['user_orderby'] = $sortby;
-
+	$order_by = 'last_name';
+$_SESSION['user_orderby'] = $orderby;
+$list_query .= ' ORDER BY '.$order_by.' '.$sorder;
+$list_result = $adb->query($list_query);
 //Retreive the Navigation array
 $navigation_array = getNavigationValues($start, $no_of_users['user'], '10');
 $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] ." ".$no_of_users['user'];
+
 $navigationOutput = getTableHeaderNavigation($navigation_array, $url_string,"Administration","index",'');
 $smarty->assign("MOD", return_module_language($current_language,'Settings'));
 $smarty->assign("CMOD", $mod_strings);
 $smarty->assign("APP", $app_strings);
 $smarty->assign("IMAGE_PATH",$image_path);
 $smarty->assign("CATEGORY",$category);
-$smarty->assign("LIST_HEADER",$focus->getUserListViewHeader());
-$smarty->assign("LIST_ENTRIES",$focus->getUserListViewEntries($navigation_array,$sortorder,$sortby));
+$smarty->assign("LIST_HEADER",getListViewHeader($focus,"Users",$url_string,$sorder,$order_by,"",""));
+$smarty->assign("LIST_ENTRIES",getListViewEntries($focus,"Users",$list_result,$navigation_array,"","","EditView","Delete",""));
 $smarty->assign("USER_COUNT",$no_of_users);
 $smarty->assign("RECORD_COUNTS", $record_string);
 $smarty->assign("NAVIGATION", $navigationOutput);

Modified: vtigercrm/trunk/modules/Users/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Users/Save.php (original)
+++ vtigercrm/trunk/modules/Users/Save.php Thu Jun 15 09:17:31 2006
@@ -79,8 +79,8 @@
 	if (!isset($_POST['homeorder']) || $_POST['homeorder'] == "" ) $_REQUEST["homeorder"] = 'ILTI,QLTQ,ALVT,PLVT,CVLVT,HLT,OLV,GRT,OLTSO';
 	
 	setObjectValuesFromRequest(&$focus);
-		$focus->save("Users");
-		$return_id = $focus->id;
+	$focus->saveentity("Users");
+	$return_id = $focus->id;
 
 if (isset($_POST['user_name']) && isset($_POST['new_password'])) {
 		$new_pass = $_POST['new_password'];
@@ -91,7 +91,7 @@
 		
 			header("Location: index.php?action=Error&module=Users&error_string=".urlencode($focus->error_string));
 		exit;
-	}
+}
 }  
 
 if(isset($focus->id) && $focus->id != '')
@@ -134,9 +134,9 @@
 createUserSharingPrivilegesfile($focus->id);
 
 if($_REQUEST['modechk'] == 'prefview')
-header("Location: index.php?action=$return_action&module=$return_module&record=$return_id");
+	header("Location: index.php?action=$return_action&module=$return_module&record=$return_id");
 else
-header("Location: index.php?action=$return_action&module=$return_module&record=$return_id&parenttab=$parenttab");
+	header("Location: index.php?action=$return_action&module=$return_module&record=$return_id&parenttab=$parenttab");
 
 
 ?>

Modified: vtigercrm/trunk/modules/Users/User.php
==============================================================================
--- vtigercrm/trunk/modules/Users/User.php (original)
+++ vtigercrm/trunk/modules/Users/User.php Thu Jun 15 09:17:31 2006
@@ -34,7 +34,7 @@
 require_once('include/utils/UserInfoUtil.php');
 
 // User is used to store customer information.
-class User extends CRMEntity {
+class User {
 	var $log;
 	var $db;
 	// Stored fields
@@ -79,7 +79,7 @@
 	var $date_format;
 	var $deleted;
 	var $homeorder;
-	
+
 	var $reports_to_name;
 	var $reports_to_id;
 
@@ -88,18 +88,17 @@
 	var $tab_name_index = Array('vtiger_users'=>'id','vtiger_attachments'=>'attachmentsid','vtiger_user2role'=>'userid');
 	var $column_fields = Array();
 	var $table_name = "vtiger_users";
-	var $sortby_fields = Array();		  
-	
-    // This is the list of fields that are in the lists.
-    var $list_fields_name = Array();
-    var $list_link_field= '';
+
+	// This is the list of fields that are in the lists.
+	var $list_fields_name = Array();
+	var $list_link_field= '';
 
 	var $list_mode;
 	var $popup_type;
 
 	var $search_fields = Array();
-    var $search_fields_name = Array();
-	
+	var $search_fields_name = Array();
+
 	var $module_name = "Users";
 
 	var $object_name = "User";
@@ -115,21 +114,34 @@
 
 	// This is used to retrieve related fields from form posts.
 	var $additional_column_fields = Array('reports_to_name');		
-	
+
+	var $sortby_fields = Array('status','email1','phone_work','is_admin','user_name');	  
+
+	var $default_order_by = 'lastname';
+	var $default_sort_order = 'ASC';
+	// This is the list of vtiger_fields that are in the lists.
+	var $list_fields = Array(
+		'First Name'=>Array('vtiger_users'=>'first_name'),
+		'Last Name'=>Array('vtiger_users'=>'last_name'),
+		'Role Name'=>Array('vtiger_user2role'=>'roleid'),
+		'User Name'=>Array('vtiger_users'=>'user_name'),
+		'Status'=>Array('vtiger_users'=>'status'),
+		'Email'=>Array('vtiger_users'=>'email1'),
+		'Admin'=>Array('vtiger_users'=>'is_admin'),
+		'Phone'=>Array('vtiger_users'=>'phone_work')
+	);
+	var $list_fields_name = Array(
+		'Last Name'=>'last_name',
+		'First Name'=>'first_name',
+		'Role Name'=>'roleid',
+		'User Name'=>'user_name',
+		'Status'=>'status',
+		'Email'=>'email1',	
+		'Admin'=>'is_admin',	
+		'Phone'=>'phone_work'	
+	);
+
 	// This is the list of fields that are in the lists.
-	var $list_fields = Array('id', 'first_name', 'last_name', 'user_name', 'status', 'department', 'yahoo_id', 'is_admin', 'email1', 'phone_work');
-	//commented as we get issues with sugarbean
-	/*
-	var $list_fields = Array(
-		'UserName'=>Array('users'=>'user_name'),
-		'Role'=>Array(''=>''),
-		'Email'=>Array('users'=>'email1'),
-		'Name'=>Array('users'=>'last_name'),
-		'Admin'=>Array('users'=>'is_admin'),
-		'Status'=>Array('users'=>'status'),
-		'Tools'=>Array(''=>''),
-	);*/	
-		
 	var $default_order_by = "user_name";
 	var $default_sort_order = 'ASC';
 
@@ -142,27 +154,27 @@
 		$this->db = new PearDatabase();
 		$this->column_fields = getColumnFields('Users');
 		$this->log->debug("Exiting User() method ...");
-		
+
 	}
 
 	function setPreference($name, $value){
-			if(!isset($this->user_preferences)){
-				if(isset($_SESSION["USER_PREFERENCES"]))
-					$this->user_preferences = $_SESSION["USER_PREFERENCES"];
-				else 
-					$this->user_preferences = array();	
-			}
-			if(!array_key_exists($name,$this->user_preferences )|| $this->user_preferences[$name] != $value){
-				$this->log->debug("Saving To Preferences:". $name."=".$value);
-				$this->user_preferences[$name] = $value;
-				$this->savePreferecesToDB();	
-				
-			}
-			$_SESSION[$name] = $value;
-
-			
-	}
-	
+		if(!isset($this->user_preferences)){
+			if(isset($_SESSION["USER_PREFERENCES"]))
+				$this->user_preferences = $_SESSION["USER_PREFERENCES"];
+			else 
+				$this->user_preferences = array();	
+		}
+		if(!array_key_exists($name,$this->user_preferences )|| $this->user_preferences[$name] != $value){
+			$this->log->debug("Saving To Preferences:". $name."=".$value);
+			$this->user_preferences[$name] = $value;
+			$this->savePreferecesToDB();	
+
+		}
+		$_SESSION[$name] = $value;
+
+
+	}
+
 	function savePreferecesToDB(){
 		$data = base64_encode(serialize($this->user_preferences));
 		$query = "UPDATE $this->table_name SET user_preferences='$data' where id='$this->id'";
@@ -171,29 +183,29 @@
 		$_SESSION["USER_PREFERENCES"] = $this->user_preferences;
 	}
 	function loadPreferencesFromDB($value){
-		
-			if(isset($value) && !empty($value)){
-				$this->log->debug("LOADING :PREFERENCES SIZE ". strlen($value));
-				$this->user_preferences = unserialize(base64_decode($value));
-				$_SESSION = array_merge($this->user_preferences, $_SESSION);
-				$this->log->debug("Finished Loading");
-				$_SESSION["USER_PREFERENCES"] = $this->user_preferences;
-		
-				
-		}
-		
-	}
-	
-	
+
+		if(isset($value) && !empty($value)){
+			$this->log->debug("LOADING :PREFERENCES SIZE ". strlen($value));
+			$this->user_preferences = unserialize(base64_decode($value));
+			$_SESSION = array_merge($this->user_preferences, $_SESSION);
+			$this->log->debug("Finished Loading");
+			$_SESSION["USER_PREFERENCES"] = $this->user_preferences;
+
+
+		}
+
+	}
+
+
 	/**
-	* @return string encrypted password for storage in DB and comparison against DB password.
-	* @param string $user_name - Must be non null and at least 2 characters
-	* @param string $user_password - Must be non null and at least 1 character.
-	* @desc Take an unencrypted username and password and return the encrypted password
+	 * @return string encrypted password for storage in DB and comparison against DB password.
+	 * @param string $user_name - Must be non null and at least 2 characters
+	 * @param string $user_password - Must be non null and at least 1 character.
+	 * @desc Take an unencrypted username and password and return the encrypted password
 	 * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc..
 	 * All Rights Reserved..
 	 * Contributor(s): ______________________________________..
-	*/
+	 */
 	function encrypt_password($user_password)
 	{
 		// encrypt the password.
@@ -203,10 +215,10 @@
 		return $encrypted_password;
 
 	}
-	
+
 	function authenticate_user($password){
 		$usr_name = $this->column_fields["user_name"];
-	
+
 		$query = "SELECT * from $this->table_name where user_name='$usr_name' AND user_hash='$password'";
 		$result = $this->db->requireSingleResult($query, false);
 
@@ -227,11 +239,11 @@
 			return -1;
 
 		}else{
-				return -1;
-		}
-	
-	}
-	
+			return -1;
+		}
+
+	}
+
 	function authorization_check($validate, $authkey, $i){
 		$validate = base64_decode($validate);
 		$authkey = base64_decode($authkey);
@@ -240,11 +252,11 @@
 			if(substr_count($buffer, $authkey) < $i)
 				return -1;
 		}else{
-				return -1;
-		}
-		
-	}
-/**
+			return -1;
+		}
+
+	}
+	/**
 	 * Checks the config.php AUTHCFG value for login type and forks off to the proper module
 	 *
 	 * @param string $user_password - The password of the user to authenticate
@@ -253,7 +265,7 @@
 	function doLogin($user_password) {
 		global $AUTHCFG;
 		$usr_name = $this->column_fields["user_name"];
-	
+
 		switch (strtoupper($AUTHCFG['authType'])) {
 			case 'LDAP':
 				$this->log->debug("Using LDAP authentication");
@@ -265,7 +277,7 @@
 					return true;
 				}
 				break;
-				
+
 			case 'AD':
 				$this->log->debug("Using Active Directory authentication");
 				require_once('modules/Users/authTypes/adLDAP.php');
@@ -276,7 +288,7 @@
 					return false;
 				}
 				break;
-				
+
 			default:
 				$this->log->debug("Using integrated/SQL authentication");
 				$encrypted_password = $this->encrypt_password($user_password);
@@ -304,7 +316,7 @@
 	{
 		$usr_name = $this->column_fields["user_name"];
 		if(isset($_SESSION['loginattempts'])){
-				 $_SESSION['loginattempts'] += 1;
+			$_SESSION['loginattempts'] += 1;
 		}else{
 			$_SESSION['loginattempts'] = 1;	
 		}
@@ -316,22 +328,22 @@
 		unset($_SESSION['validation']);
 		if( !isset($this->column_fields["user_name"]) || $this->column_fields["user_name"] == "" || !isset($user_password) || $user_password == "")
 			return null;
-			
+
 		if($this->validation_check('aW5jbHVkZS9pbWFnZXMvc3VnYXJzYWxlc19tZC5naWY=','1a44d4ab8f2d6e15e0ff6ac1c2c87e6f', '866bba5ae0a15180e8613d33b0acc6bd') == -1)$validation = -1;
 		//if($this->validation_check('aW5jbHVkZS9pbWFnZXMvc3VnYXJzYWxlc19tZC5naWY=','1a44d4ab8f2d6e15e0ff6ac1c2c87e6f') == -1)$validation = -1;
 		if($this->validation_check('aW5jbHVkZS9pbWFnZXMvcG93ZXJlZF9ieV9zdWdhcmNybS5naWY=' , '3d49c9768de467925daabf242fe93cce') == -1)$validation = -1;
 		if($this->authorization_check('aW5kZXgucGhw' , 'PEEgaHJlZj0naHR0cDovL3d3dy5zdWdhcmNybS5jb20nIHRhcmdldD0nX2JsYW5rJz48aW1nIGJvcmRlcj0nMCcgc3JjPSdpbmNsdWRlL2ltYWdlcy9wb3dlcmVkX2J5X3N1Z2FyY3JtLmdpZicgYWx0PSdQb3dlcmVkIEJ5IFN1Z2FyQ1JNJz48L2E+', 1) == -1)$validation = -1;
 		$encrypted_password = $this->encrypt_password($user_password);
-	
+
 		$authCheck = false;
 		$authCheck = $this->doLogin($user_password);
-		
+
 		if(!$authCheck)
 		{
 			$this->log->warn("User authentication for $usr_name failed");
 			return null;
 		}
-		
+
 		$query = "SELECT * from $this->table_name where user_name='$usr_name'";
 		$result = $this->db->requireSingleResult($query, false);
 
@@ -340,8 +352,8 @@
 		$this->id = $row['id'];	
 
 		$user_hash = strtolower(md5($user_password));
-		
-		
+
+
 		// If there is no user_hash is not present or is out of date, then create a new one.
 		if(!isset($row['user_hash']) || $row['user_hash'] != $user_hash)
 		{
@@ -349,37 +361,37 @@
 			$this->db->query($query, true, "Error setting new hash for {$row['user_name']}: ");	
 		}
 		$this->loadPreferencesFromDB($row['user_preferences']);
-		
-		
+
+
 		if ($this->status != "Inactive") $this->authenticated = true;
-		
+
 		unset($_SESSION['loginattempts']);
 		return $this;
 	}		
 
-	
+
 	/**
-	* @param string $user name - Must be non null and at least 1 character.
-	* @param string $user_password - Must be non null and at least 1 character.
-	* @param string $new_password - Must be non null and at least 1 character.
-	* @return boolean - If passwords pass verification and query succeeds, return true, else return false.
-	* @desc Verify that the current password is correct and write the new password to the DB.
+	 * @param string $user name - Must be non null and at least 1 character.
+	 * @param string $user_password - Must be non null and at least 1 character.
+	 * @param string $new_password - Must be non null and at least 1 character.
+	 * @return boolean - If passwords pass verification and query succeeds, return true, else return false.
+	 * @desc Verify that the current password is correct and write the new password to the DB.
 	 * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc..
 	 * All Rights Reserved..
 	 * Contributor(s): ______________________________________..
-	*/
+	 */
 	function change_password($user_password, $new_password)
 	{
 		$usr_name = $this->column_fields["user_name"];
 		global $mod_strings;
 		global $current_user;
 		$this->log->debug("Starting password change for $usr_name");
-		
+
 		if( !isset($new_password) || $new_password == "") {
 			$this->error_string = $mod_strings['ERR_PASSWORD_CHANGE_FAILED_1'].$user_name.$mod_strings['ERR_PASSWORD_CHANGE_FAILED_2'];
 			return false;
 		}
-		
+
 		$encrypted_password = $this->encrypt_password($user_password);
 		$encrypted_new_password = $this->encrypt_password($new_password);
 
@@ -390,7 +402,7 @@
 			$row = $this->db->fetchByAssoc($result);
 			$this->log->debug("select old password query: $query");
 			$this->log->debug("return result of $row");
-	
+
 			if($row == null)
 			{
 				$this->log->warn("Incorrect old password for $usr_name");
@@ -399,20 +411,20 @@
 			}
 		}		
 
-		
+
 		$user_hash = strtolower(md5($new_password));
-		
+
 		//set new password
 		$query = "UPDATE $this->table_name SET user_password='$encrypted_new_password', user_hash='$user_hash' where id='$this->id'";
 		$this->db->query($query, true, "Error setting new password for $usr_name: ");	
 		return true;
 	}
-	
+
 	function is_authenticated()
 	{
 		return $this->authenticated;
 	}
-	
+
 
 	function retrieve_user_id($user_name)
 	{
@@ -421,7 +433,7 @@
 		$row = $this->db->fetchByAssoc($result);
 		return $row['id'];
 	}
-	
+
 	/** 
 	 * @return -- returns a list of all users in the system.
 	 * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc..
@@ -432,11 +444,11 @@
 	{
 		$usr_name = $this->column_fields["user_name"];
 		global $mod_strings;
-		
+
 		$query = "SELECT user_name from vtiger_users where user_name='$usr_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);
-		
+
 		$query = "SELECT user_name from vtiger_users where is_admin = 'on' AND deleted=0";
 		$result =$this->db->query($query, true, "Error selecting possible duplicate vtiger_users: ");
 		$last_admin = $this->db->fetchByAssoc($result);
@@ -451,97 +463,42 @@
 			$verified = false;
 		}
 		if(!isset($_REQUEST['is_admin']) &&
-			count($last_admin) == 1 && 
-			$last_admin['user_name'] == $usr_name) {
+				count($last_admin) == 1 && 
+				$last_admin['user_name'] == $usr_name) {
 			$this->log->debug("last admin length: ".count($last_admin));
 
 			$this->error_string .= $mod_strings['ERR_LAST_ADMIN_1'].$usr_name.$mod_strings['ERR_LAST_ADMIN_2'];
 			$verified = false;
 		}
-		
+
 		return $verified;
 	}
-	
+
 	function getColumnNames_User()
-  {
-  	
-  	$mergeflds = array("FIRSTNAME","LASTNAME","USERNAME","YAHOOID","TITLE","OFFICEPHONE","DEPARTMENT",
-											 "MOBILE","OTHERPHONE","FAX","EMAIL",
-											 "HOMEPHONE","OTHEREMAIL","PRIMARYADDRESS",
-											 "CITY","STATE","POSTALCODE","COUNTRY");	
-  	return $mergeflds;
-  }
-
-//function added for the listview of vtiger_users for 5.0 beta
-  function getUserListViewHeader()
-  {
-	  global $mod_strings;
-	  $header_array=array($mod_strings['LBL_LIST_NO'],$mod_strings['LBL_LIST_TOOLS'],$mod_strings['LBL_LIST_USER_NAME_ROLE'],$mod_strings['LBL_LIST_EMAIL'],$mod_strings['LBL_LIST_PHONE'],$mod_strings['LBL_ADMIN'],$mod_strings['LBL_STATUS']);
-	  return $header_array;
-  }
-
-  function getUserListViewEntries($navigation_array,$sorder='',$orderby='')
-  {
-	  global $theme;
-	  global $adb, $current_user;
-	  $theme_path="themes/".$theme."/";
-	  $image_path=$theme_path."images/";
-	  if($sorder != '' && $orderby !='')
-	  $list_query = ' SELECT * from vtiger_users where deleted=0 order by '.$orderby.' '.$sorder;
-	  else
-	  $list_query = "SELECT * from vtiger_users where deleted=0 order by ".$this->default_order_by." ".$this->default_sort_order;
-	  $result =$adb->query($list_query);
-	  $entries_list = array();
-	  $roleinfo = getAllRoleDetails();
-
-	  for($i = $navigation_array['start'];$i <= $navigation_array['end_val']; $i++)
-	  {
-		  $entries=array();
-		  $id=$adb->query_result($result,$i-1,'id');
-
-		  $entries[]='<a href="index.php?action=DetailView&module=Users&parenttab=Settings&record='.$id.'">'.$this->db->query_result($result,$i-1,'user_name').'</a>';
-
-		  $rolecode= fetchUserRole($adb->query_result($result,$i-1,'id'));
-		  $entries[]='<a href="index.php?action=RoleDetailView&module=Users&parenttab=Settings&roleid='.$rolecode.'">'.$roleinfo[$rolecode][0];
-		  $entries[]='<a href="mailto:'.$adb->query_result($result,$i-1,'email1').'">'.$adb->query_result($result,$i-1,'email1').' </a>';
-
-		  $entries[]='<a href="index.php?action=DetailView&module=Users&parenttab=Settings&record='.$id.'">'. $this->db->query_result($result,$i-1,'last_name').' '.$adb->query_result($result,$i-1,'first_name').'</a>';
-
-		  $entries[]=$adb->query_result($result,$i-1,'is_admin');
-		  $entries[]=$adb->query_result($result,$i-1,'status');
-		  $entries[]=$adb->query_result($result,$i-1,'phone_work');
-		  if($adb->query_result($result,$i-1,'user_name') == 'admin' || $adb->query_result($result,$i-1,'user_name') == 'standarduser' )
-		  {
-			  $entries[]='<a href="index.php?action=EditView&return_action=ListView&return_module=Users&module=Users&parenttab=Settings&record='.$id.'"><img src="'.$image_path.'editfield.gif" border="0" alt="Edit" title="Edit"/></a>&nbsp;&nbsp;';
-			  }
-			  elseif($adb->query_result($result,$i-1,'id') == $current_user->id)
-			  {
-				  $entries[]='<a href="index.php?action=EditView&return_action=ListView&return_module=Users&module=Users&parenttab=Settings&record='.$id.'"><img src="'.$image_path.'editfield.gif" border="0" alt="Edit" title="Edit"/></a>&nbsp;&nbsp;';
-			  }
-			  else
-
-			  $entries[]='<a href="index.php?action=EditView&return_action=ListView&return_module=Users&module=Users&parenttab=Settings&record='.$id.'"><img src="'.$image_path.'editfield.gif" border="0" alt="Edit" title="Edit"/></a>&nbsp;&nbsp;<img src="'.$image_path.'delete.gif" onclick="deleteUser('.$id.')" border="0"  alt="Delete" title="Delete"/></a>';
-
-			  $entries_list[]=$entries;
-
-			  }
-			  return $entries_list;
-  }
-
-	  function fill_in_additional_list_fields()
+	{
+
+		$mergeflds = array("FIRSTNAME","LASTNAME","USERNAME","YAHOOID","TITLE","OFFICEPHONE","DEPARTMENT",
+				"MOBILE","OTHERPHONE","FAX","EMAIL",
+				"HOMEPHONE","OTHEREMAIL","PRIMARYADDRESS",
+				"CITY","STATE","POSTALCODE","COUNTRY");	
+		return $mergeflds;
+	}
+
+
+	function fill_in_additional_list_fields()
 	{
 		$this->fill_in_additional_detail_fields();	
 	}
-	
+
 	function fill_in_additional_detail_fields()
 	{
 		//$query = "SELECT u1.first_name, u1.last_name from vtiger_users as u1, vtiger_users as u2 where u1.id = u2.reports_to_id AND u2.id = '$this->id' and u1.deleted=0";
 		$query = "SELECT u1.first_name, u1.last_name from vtiger_users u1, vtiger_users u2 where u1.id = u2.reports_to_id AND u2.id = '$this->id' and u1.deleted=0";
 		$result =$this->db->query($query, true, "Error filling in additional detail vtiger_fields") ;
-		
+
 		$row = $this->db->fetchByAssoc($result);
 		$this->log->debug("additional detail query results: $row");
-		
+
 		if($row != null)
 		{
 			$this->reports_to_name = stripslashes($row['first_name'].' '.$row['last_name']);
@@ -556,21 +513,289 @@
 	{
 		require('user_privileges/user_privileges_'.$userid.'.php');
 		foreach($this->column_fields as $field=>$value_iter)
-                {
-                        if(isset($user_info[$field]))
-                        {
-                                $this->$field = $user_info[$field];
-                        }
-                }
+		{
+			if(isset($user_info[$field]))
+			{
+				$this->$field = $user_info[$field];
+				$this->column_fields[$field] = $user_info[$field];	
+			}
+		}
 		$this->id = $userid;
 		return $this;
+
+	}
+	function saveentity($module)
+	{
+		global $current_user, $adb;//$adb added by raju for mass mailing
+		$insertion_mode = $this->mode;
+
+		$this->db->println("TRANS saveentity starts $module");
+		$this->db->startTransaction();
+		foreach($this->tab_name as $table_name)
+		{
+			if($table_name == 'vtiger_attachments')
+			{
+				$this->insertIntoAttachment($this->id,$module);
+			}
+			else
+			{
+				$this->insertIntoEntityTable($table_name, $module);			
+			}
+		}
+
+		$this->db->completeTransaction();
+		$this->db->println("TRANS saveentity ends");
+	}
+	function insertIntoEntityTable($table_name, $module)
+	{
+		global $log;	
+		$log->info("function insertIntoEntityTable ".$module.' vtiger_table name ' .$table_name);
+		global $adb;
+		$insertion_mode = $this->mode;
+
+		//Checkin whether an entry is already is present in the vtiger_table to update
+		if($insertion_mode == 'edit')
+		{
+			$check_query = "select * from ".$table_name." where ".$this->tab_name_index[$table_name]."=".$this->id;
+			$check_result=$adb->query($check_query);
+
+			$num_rows = $adb->num_rows($check_result);
+
+			if($num_rows <= 0)
+			{
+				$insertion_mode = '';
+			}	 
+		}
+
+		if($insertion_mode == 'edit')
+		{
+			$update = '';
+			$tabid= getTabid($module);	
+			$sql = "select * from vtiger_field where tabid=".$tabid." and tablename='".$table_name."' and displaytype in (1,3)"; 
+		}
+		else
+		{
+			$column = $this->tab_name_index[$table_name];
+			if($column == 'id' && $table_name == 'vtiger_users')
+			{
+				$currentuser_id = $adb->getUniqueID("vtiger_users");
+				$this->id = $currentuser_id;
+			}
+			$value = $this->id;
+			$tabid= getTabid($module);	
+			$sql = "select * from vtiger_field where tabid=".$tabid." and tablename='".$table_name."' and displaytype in (1,3,4)"; 
+		}
+
+		$result = $adb->query($sql);
+		$noofrows = $adb->num_rows($result);
+		for($i=0; $i<$noofrows; $i++)
+		{
+			$fieldname=$adb->query_result($result,$i,"fieldname");
+			$columname=$adb->query_result($result,$i,"columnname");
+			$uitype=$adb->query_result($result,$i,"uitype");
+			if(isset($this->column_fields[$fieldname]))
+			{
+				if($uitype == 56)
+				{
+					if($this->column_fields[$fieldname] == 'on' || $this->column_fields[$fieldname] == 1)
+					{
+						$fldvalue = 1;
+					}
+					else
+					{
+						$fldvalue = 0;
+					}
+
+				}
+				elseif($uitype == 33)
+				{
+					$j = 0;
+					$field_list = '';
+					if(is_array($this->column_fields[$fieldname]) && count($this->column_fields[$fieldname]) > 0)
+					{
+						foreach($this->column_fields[$fieldname] as $key=>$multivalue)
+						{
+							if($j != 0)
+							{
+								$field_list .= ' , ';
+							}
+							$field_list .= $multivalue;
+							$j++;
+						}
+					}
+					$fldvalue = $field_list;
+				}
+				else
+				{
+					$fldvalue = $this->column_fields[$fieldname]; 
+					$fldvalue = stripslashes($fldvalue);
+				}
+				$fldvalue = from_html($adb->formatString($table_name,$columname,$fldvalue),($insertion_mode == 'edit')?true:false);
+
+
+
+			}
+			else
+			{
+				$fldvalue = '';
+			}
+			if($fldvalue=='') $fldvalue ="NULL";
+			if($insertion_mode == 'edit')
+			{
+				if($i == 0)
+				{
+					$update = $columname."=".$fldvalue."";
+				}
+				else
+				{
+					$update .= ', '.$columname."=".$fldvalue."";
+				}
+			}
+			else
+			{
+				$column .= ", ".$columname;
+				$value .= ", ".$fldvalue."";
+			}
+
+		}
+
+
+
+
+
+		if($insertion_mode == 'edit')
+		{
+			//Check done by Don. If update is empty the the query fails
+			if(trim($update) != '')
+			{
+				$sql1 = "update ".$table_name." set ".$update." where ".$this->tab_name_index[$table_name]."=".$this->id;
+
+				$adb->query($sql1); 
+			}
+
+		}
+		else
+		{	
+			$sql1 = "insert into ".$table_name." (".$column.") values(".$value.")";
+			$adb->query($sql1); 
+		}
+
+	}
+	function insertIntoAttachment($id,$module)
+	{
+		global $log, $adb;
+		$log->debug("Entering into insertIntoAttachment($id,$module) method.");
+
+		foreach($_FILES as $fileindex => $files)
+		{
+			if($files['name'] != '' && $files['size'] > 0)
+			{
+				$this->uploadAndSaveFile($id,$module,$files);
+			}
+		}
+
+		$log->debug("Exiting from insertIntoAttachment($id,$module) method.");
+	}
+
+	function retrieve_entity_info($record, $module)
+	{
+		global $adb,$log;
+		$result = Array();
+		foreach($this->tab_name_index as $table_name=>$index)
+		{
+			$result[$table_name] = $adb->query("select * from ".$table_name." where ".$index."=".$record);
+		}
+		$tabid = getTabid($module);
+		$sql1 =  "select * from vtiger_field where tabid=".$tabid;
+		$result1 = $adb->query($sql1);
+		$noofrows = $adb->num_rows($result1);
+		for($i=0; $i<$noofrows; $i++)
+		{
+			$fieldcolname = $adb->query_result($result1,$i,"columnname");
+			$tablename = $adb->query_result($result1,$i,"tablename");
+			$fieldname = $adb->query_result($result1,$i,"fieldname");
+
+			$fld_value = $adb->query_result($result[$tablename],0,$fieldcolname);
+			$this->column_fields[$fieldname] = $fld_value;
+			$this->$fieldname = $fld_value;
+
+		}
+		$this->column_fields["record_id"] = $record;
+		$this->column_fields["record_module"] = $module;
+	}
+	function uploadAndSaveFile($id,$module,$file_details)
+	{
+		global $log;
+		$log->debug("Entering into uploadAndSaveFile($id,$module,$file_details) method.");
 		
-	}
+		global $adb, $current_user;
+		global $upload_badext;
+
+		$date_var = date('YmdHis');
+
+		//to get the owner id
+		$ownerid = $this->column_fields['assigned_user_id'];
+		if(!isset($ownerid) || $ownerid=='')
+			$ownerid = $current_user->id;
 
 	
+		// Arbitrary File Upload Vulnerability fix - Philip
+		$binFile = $file_details['name'];
+		$ext_pos = strrpos($binFile, ".");
+
+		$ext = substr($binFile, $ext_pos + 1);
+
+		if (in_array($ext, $upload_badext))
+		{
+			$binFile .= ".txt";
+		}
+		// Vulnerability fix ends
+
+		$filename = basename($binFile);
+		$filetype= $file_details['type'];
+		$filesize = $file_details['size'];
+		$filetmp_name = $file_details['tmp_name'];
+		
+		//get the file path inwhich folder we want to upload the file
+		$upload_file_path = decideFilePath();
+		//upload the file in server
+		$upload_status = move_uploaded_file($filetmp_name,$upload_file_path.$binFile);
+
+		$save_file = 'true';
+		//only images are allowed for these modules
+		if($module == 'Users')
+		{
+			$save_file = validateImageFile(&$file_details);
+		}
+		if($save_file == 'true')
+		{
+			$current_id = $adb->getUniqueID("vtiger_crmentity");
+
+			$sql1 = "insert into vtiger_crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime,modifiedtime) values(".$current_id.",".$current_user->id.",".$ownerid.",'".$module." Attachment','".$this->column_fields['description']."',".$adb->formatString("vtiger_crmentity","createdtime",$date_var).",".$adb->formatString("vtiger_crmentity","modifiedtime",$date_var).")";
+			$adb->query($sql1);
+
+			$sql2="insert into vtiger_attachments(attachmentsid, name, description, type, path) values(".$current_id.",'".$filename."','".$this->column_fields['description']."','".$filetype."','".$upload_file_path."')";
+			$result=$adb->query($sql2);
+
+			if($_REQUEST['mode'] == 'edit')
+			{
+				if($id != '' && $_REQUEST['fileid'] != '')
+				{
+					$delquery = 'delete from vtiger_seattachmentsrel where crmid = '.$id.' and attachmentsid = '.$_REQUEST['fileid'];
+					$adb->query($delquery);
+				}
+			}
+			$sql3='insert into vtiger_seattachmentsrel values('.$id.','.$current_id.')';
+			$adb->query($sql3);
+		}
+		else
+		{
+			$log->debug("Skip the save attachment process.");
+		}
+		$log->debug("Exiting from uploadAndSaveFile($id,$module,$file_details) method.");
+
+		return;
+	}
+
 }
-
-	
-
-
 ?>



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 08:20:15 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 15:20:15 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7141 - in
 /vtigercrm/trunk/Smarty/templates: DisplayFields.tpl
 UserListViewContents.tpl
Message-ID: <20060615152015.2A0427ED24F@vtiger.fosslabs.com>

Author: richie
Date: Thu Jun 15 09:20:10 2006
New Revision: 7141

Log:
User List view from custom view fn

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

Modified: vtigercrm/trunk/Smarty/templates/DisplayFields.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DisplayFields.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DisplayFields.tpl Thu Jun 15 09:20:10 2006
@@ -462,7 +462,7 @@
 				{else}
 					{assign var="disable_status" value="disabled"}
 				{/if}	
-				{if $fldvalue eq 1}
+				{if $fldvalue eq 'on'}
 					<td width="30%" align=left class="dvtCellInfo">
 						<input name="{$fldname}" {$disable_status} type="checkbox"  checked>
 					</td>

Modified: vtigercrm/trunk/Smarty/templates/UserListViewContents.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/UserListViewContents.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/UserListViewContents.tpl Thu Jun 15 09:20:10 2006
@@ -14,22 +14,30 @@
 						
 <table border=0 cellspacing=0 cellpadding=5 width=100% class="listTable">
 <tr>
-	{foreach item=header from=$LIST_HEADER} 
-		<td class="colHeader small" valign=top>{$header}</td>
-	{/foreach}
+	<td class="colHeader small" valign=top>#</td>
+	<td class="colHeader small" valign=top>{$APP.Tools}</td>
+	<td class="colHeader small" valign=top>{$LIST_HEADER.3}</td>
+	<td class="colHeader small" valign=top>{$LIST_HEADER.5}</td>
+	<td class="colHeader small" valign=top>{$LIST_HEADER.7}</td>
+	<td class="colHeader small" valign=top>{$LIST_HEADER.6}</td>
+	<td class="colHeader small" valign=top>{$LIST_HEADER.4}</td>
 </tr>
-	{foreach name=userlist item=listvalues from=$LIST_ENTRIES}
+	{foreach name=userlist item=listvalues key=userid from=$LIST_ENTRIES}
 <tr>
 	<td class="listTableRow small" valign=top>{$smarty.foreach.userlist.iteration}</td>
+	<td class="listTableRow small" valign=top><a href="index.php?action=EditView&return_action=ListView&return_module=Users&module=Users&parenttab=Settings&record={$userid}"><img src="{$IMAGE_PATH}editfield.gif" alt="Edit" title="Edit" border="0"></a>&nbsp;
+	{if $userid neq 1 && $userid neq 2}	
+	<img src="{$IMAGE_PATH}delete.gif" onclick="deleteUser('{$userid}')" border="0"  alt="Delete" title="Delete"/></a>
+	{/if}
+&nbsp;</td>
+	<td class="listTableRow small" valign=top><b><a href="index.php?module=Users&action=DetailView&parenttab=Settings&record={$userid}"> {$listvalues.3} </a></b><br><a href="index.php?module=Users&action=DetailView&parenttab=Settings&record={$userid}"> {$listvalues.1} {$listvalues.0}</a> ({$listvalues.2})</td>
+	<td class="listTableRow small" valign=top>{$listvalues.5}</td>
 	<td class="listTableRow small" valign=top>{$listvalues.7}</td>
-	<td class="listTableRow small" valign=top><b>{$listvalues.0}</b><br>{$listvalues.3} <a> (</a>{$listvalues.1})</td>
-	<td class="listTableRow small" valign=top>{$listvalues.2}</td>
 	<td class="listTableRow small" valign=top>{$listvalues.6}</td>
-	<td class="listTableRow small" valign=top>{$listvalues.4}</td>
-	{if $listvalues.5 eq 'Active'}
-	<td class="listTableRow small active" valign=top>{$listvalues.5}</td>
+	{if $listvalues.4 eq 'Active'}
+	<td class="listTableRow small active" valign=top>{$listvalues.4}</td>
 	{else}
-	<td class="listTableRow small inactive" valign=top>{$listvalues.5}</td>
+	<td class="listTableRow small inactive" valign=top>{$listvalues.4}</td>
 	{/if}	
 
 </tr>



From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 08:21:41 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 15:21:41 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231111=3A?=
	=?utf-8?q?_Unit_price_alignment?=
In-Reply-To: <076.200736e54b6b9a89af6abc5d64dea244@vtiger.fosslabs.com>
References: <076.200736e54b6b9a89af6abc5d64dea244@vtiger.fosslabs.com>
Message-ID: <085.1eb5dcff469826ecb86063c57156a0a9@vtiger.fosslabs.com>

#1111: Unit price alignment
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  ela       
      Type:  defect     |      Status:  new       
  Priority:  major      |   Milestone:            
 Component:  vtigercrm  |     Version:  5.0.0     
Resolution:             |    Keywords:  unit price
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => ela

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1111>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 08:23:22 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 15:23:22 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231114=3A?=
 =?utf-8?q?_tax_split_up_shows_only_upon_clicking_on_button?=
In-Reply-To: <076.e0fc7e9f8cb228797d775f33694000ad@vtiger.fosslabs.com>
References: <076.e0fc7e9f8cb228797d775f33694000ad@vtiger.fosslabs.com>
Message-ID: <085.d9b73e742a251e2364a826c81d603290@vtiger.fosslabs.com>

#1114: tax split up shows only upon clicking on button
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  mickie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1114>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 08:23:45 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 15:23:45 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231128=3A?=
 =?utf-8?q?_too_high_reaction_time_in_using_inventory?=
In-Reply-To: <076.209b6cc7a2151c8fd5ca32cfa5df69e2@vtiger.fosslabs.com>
References: <076.209b6cc7a2151c8fd5ca32cfa5df69e2@vtiger.fosslabs.com>
Message-ID: <085.f1dcceee3b24470f0829c99864d57bff@vtiger.fosslabs.com>

#1128: too high reaction time in using inventory
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  saraj      
      Type:  defect     |      Status:  new        
  Priority:  major      |   Milestone:             
 Component:  vtigercrm  |     Version:  5.0.0      
Resolution:             |    Keywords:  performance
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => saraj

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1128>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 08:24:42 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 15:24:42 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231130=3A?=
 =?utf-8?q?_more_information_tab_ajaxified?=
In-Reply-To: <076.d1ddb83143327b9a11f01d548facd399@vtiger.fosslabs.com>
References: <076.d1ddb83143327b9a11f01d548facd399@vtiger.fosslabs.com>
Message-ID: <085.e02ddd4d571956c1ce55cc0b23e1545f@vtiger.fosslabs.com>

#1130: more information tab ajaxified
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  jerrydgeorge
      Type:  defect     |      Status:  new         
  Priority:  major      |   Milestone:              
 Component:  vtigercrm  |     Version:  5.0.1       
Resolution:             |    Keywords:  performance 
------------------------+---------------------------------------------------
Changes (by saraj):

  * version:  5.0.0 => 5.0.1
  * owner:  developer => jerrydgeorge

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1130>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 08:26:41 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 15:26:41 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7142 -
	/vtigercrm/trunk/include/utils/ListViewUtils.php
Message-ID: <20060615152641.4010E7ED254@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 15 09:26:37 2006
New Revision: 7142

Log:
changes made to get CampaignName 

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 Thu Jun 15 09:26:37 2006
@@ -1031,6 +1031,21 @@
 		else
 			$value='';
 	}
+	//Added by Minnie to get Campaign Source
+	elseif($uitype == 58)
+	{
+		global $adb;
+		if($temp_val != '')
+		{
+			$sql="SELECT * FROM vtiger_campaign WHERE campaignid=".$temp_val;
+			$result=$adb->query($sql);
+			$campaignname=$adb->query_result($result,0,"campaignname");
+			$value= '<a href=index.php?module=Campaigns&action=DetailView&record='.$temp_val.'>'.$campaignname.'</a>';
+		}
+		else
+			$value='';
+	}
+	//End
 	//Added By *Raj* for the Issue ProductName not displayed in CustomView of HelpDesk
 	elseif($uitype == 59)
 	{
@@ -1379,6 +1394,10 @@
 
 					$value = '<a href="a" LANGUAGE=javascript onclick=\'set_return_address("'.$entity_id.'", "'.br2nl($temp_val).'", "'.br2nl($acct_focus->column_fields['treet']).'", "'.br2nl($acct_focus->column_fields['city']).'", "'.br2nl($acct_focus->column_fields['state']).'", "'.br2nl($acct_focus->column_fields['postalcode']).'", "'.br2nl($acct_focus->column_fields['country']).'","'.br2nl($acct_focus->column_fields['pobox']).'"); window.close()\'>'.$temp_val.'</a>';
 
+				}
+				elseif($popuptype == "specific_campaign")
+				{
+					$value = '<a href="a" LANGUAGE=javascript onclick=\'set_return_specific_campaign("'.$entity_id.'", "'.br2nl($temp_val).'"); window.close()\'>'.$temp_val.'</a>';
 				}
 				else
 				{



From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 08:26:45 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 15:26:45 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231133=3A?=
 =?utf-8?q?_in_related_list_note_can_be_shown_in_a_different_color?=
In-Reply-To: <076.2f01c0cdb39b0c84bd3ed216997c2d77@vtiger.fosslabs.com>
References: <076.2f01c0cdb39b0c84bd3ed216997c2d77@vtiger.fosslabs.com>
Message-ID: <085.ffcc268c88106e21273fd153fb69e178@vtiger.fosslabs.com>

#1133: in related list note can be shown in a different color
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  developer
      Type:  defect     |      Status:  new      
  Priority:  major      |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.1    
Resolution:             |    Keywords:           
------------------------+---------------------------------------------------
Changes (by saraj):

  * version:  5.0.0 => 5.0.1

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1133>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 08:29:09 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 15:29:09 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231135=3A?=
 =?utf-8?q?_The_History_of_the_Purchase_Order_not_getting_displayed?=
In-Reply-To: <076.70a50c265764e891dd51a97dd8390af4@vtiger.fosslabs.com>
References: <076.70a50c265764e891dd51a97dd8390af4@vtiger.fosslabs.com>
Message-ID: <085.fef20c173b258cb03a89ebc2198d8a42@vtiger.fosslabs.com>

#1135: The History of the Purchase Order not getting displayed
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  mickie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1135>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 08:29:14 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 15:29:14 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7143 -
	/vtigercrm/trunk/include/utils/EditViewUtils.php
Message-ID: <20060615152914.6D0777ED25A@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 15 09:29:10 2006
New Revision: 7143

Log:
changes made to get CampaignName 

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

Modified: vtigercrm/trunk/include/utils/EditViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/EditViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/EditViewUtils.php Thu Jun 15 09:29:10 2006
@@ -474,6 +474,32 @@
 		$fieldvalue[] = $contact_name;
 		$fieldvalue[] = $value;
 	}
+
+	elseif($uitype == 58)
+	{
+
+		if($value != '')
+		{
+			$campaign_name = getCampaignName($value);
+		}
+		elseif(isset($_REQUEST['campaignid']) && $_REQUEST['campaignid'] != '')
+		{
+			if($_REQUEST['module'] == 'Campaigns' && $fieldname = 'campaignid')
+			{
+				$campaign_name = '';
+			}
+			else
+			{
+				$value = $_REQUEST['campaignid'];
+				$campaign_name = getCampaignName($value);
+			}
+
+		}
+		$editview_label[]=$mod_strings[$fieldlabel];
+		$fieldvalue[]=$campaign_name;
+		$fieldvalue[] = $value;
+	}
+	
 	elseif($uitype == 61)
 	{
 		global $current_user;



From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 08:29:32 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 15:29:32 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231141=3A?=
 =?utf-8?q?_mandatory_shown_but_not_so?=
In-Reply-To: <076.02fcc522483405a938931a6090a37b4c@vtiger.fosslabs.com>
References: <076.02fcc522483405a938931a6090a37b4c@vtiger.fosslabs.com>
Message-ID: <085.2cc963bec46838f6a3f85ae4088c0b7c@vtiger.fosslabs.com>

#1141: mandatory shown but not so
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  mickie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:  PO    
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1141>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 08:31:25 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 15:31:25 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7144 -
	/vtigercrm/trunk/include/utils/DetailViewUtils.php
Message-ID: <20060615153125.EB26A7ED25D@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 15 09:31:22 2006
New Revision: 7144

Log:
changes made to get CampaignName 

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 Thu Jun 15 09:31:22 2006
@@ -318,6 +318,19 @@
 		$label_fld["secid"] = $contact_id;
 		$label_fld["link"] = "index.php?module=Contacts&action=DetailView&record=".$contact_id; 
         }
+	elseif($uitype == 58)
+	{
+		$label_fld[] =$mod_strings[$fieldlabel];
+		$campaign_id = $col_fields[$fieldname];
+		if($campaign_id != '')
+		{
+			$campaign_name = getCampaignName($campaign_id);
+		}
+		$label_fld[] = $campaign_name;
+		$label_fld["secid"] = $campaign_id;
+		$label_fld["link"] = "index.php?module=Campaigns&action=DetailView&record=".$campaign_id;
+
+	}
 	elseif($uitype == 59)
 	{
 		$label_fld[] =$mod_strings[$fieldlabel];



From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 08:32:08 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 15:32:08 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231145=3A?=
 =?utf-8?q?_in_edit_view_of_inventory=2C_the_right_hand_side_options_are_h?=
 =?utf-8?q?ardcoded?=
In-Reply-To: <076.0e62778b6100dd068d2df9182121005c@vtiger.fosslabs.com>
References: <076.0e62778b6100dd068d2df9182121005c@vtiger.fosslabs.com>
Message-ID: <085.92041fcfeff5c3c40d7181caddca2312@vtiger.fosslabs.com>

#1145: in edit view of inventory, the right hand side options are hardcoded
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  mickie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1145>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 08:32:15 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 15:32:15 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231324=3A?=
	=?utf-8?q?_Fatal_error_orders=3Csales?=
Message-ID: <076.020fb265047737595a1c038934006563@vtiger.fosslabs.com>

#1324: Fatal error orders<sales
-----------------------------------------+----------------------------------
 Reporter:  sansnailmail (at) xs4all.nl  |       Owner:  developer
     Type:  defect                       |      Status:  new      
 Priority:  major                        |   Milestone:           
Component:  vtigercrm                    |     Version:  4.2.4rc3 
 Keywords:                               |  
-----------------------------------------+----------------------------------
 This bug is related to ticket #1281: After applying Changeset 6964
 (utils.php) the quote problem is solved (thanks!)

 New problem: After converting the (now visible) quote to a sales order
 with the "Create  Salesorder" button, the sales order appears fine in the
 edit view of sales. However, when i click Orders<Sales there is a fatal
 error code, the same as in #1281:
 ----
 Fatal error: Call to a member function on a non-object in
 /Library/WebServer/Documents/include/database/PearDatabase.php on line 440
 ----


 mysql 4.0.20
 apache 1.3
 php 4.?

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1324>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 08:13:14 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 15:13:14 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231081=3A?=
 =?utf-8?q?_Yahoo_ID_at_mails_from_contacts?=
In-Reply-To: <076.559e47f8ca8be49e3698d4378d040b16@vtiger.fosslabs.com>
References: <076.559e47f8ca8be49e3698d4378d040b16@vtiger.fosslabs.com>
Message-ID: <085.86b12f7879ef49338eb0fc33d3441406@vtiger.fosslabs.com>

#1081: Yahoo ID at mails from contacts
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  ahmed
      Type:  defect     |      Status:  new  
  Priority:  major      |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => ahmed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1081>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 08:09:56 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 15:09:56 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231073=3A?=
 =?utf-8?q?_Inventory_=3E_Vendors_=3E_Products?=
In-Reply-To: <076.6756be513a6a47a241a70293fa5e1bbe@vtiger.fosslabs.com>
References: <076.6756be513a6a47a241a70293fa5e1bbe@vtiger.fosslabs.com>
Message-ID: <085.71a496dcedaf72fa74b458347c4c228e@vtiger.fosslabs.com>

#1073: Inventory > Vendors > Products
--------------------------+-------------------------------------------------
  Reporter:  anonymous    |       Owner:  mickie
      Type:  enhancement  |      Status:  new   
  Priority:  major        |   Milestone:        
 Component:  vtigercrm    |     Version:  5.0.0 
Resolution:               |    Keywords:        
--------------------------+-------------------------------------------------
Changes (by saraj):

  * owner:  jerrydgeorge => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1073>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 08:10:56 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 15:10:56 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231299=3A?=
 =?utf-8?q?_MySQL_version_5=2E0=2E22_is_not_supported=2C_kindly_connect_to?=
 =?utf-8?q?_MySQL_4=2E1=2Ex_or_above?=
In-Reply-To: <076.bb406000b4b59efeb8cc8221dd00f6f4@vtiger.fosslabs.com>
References: <076.bb406000b4b59efeb8cc8221dd00f6f4@vtiger.fosslabs.com>
Message-ID: <085.3dfda9c4deabf66ec6600a807c9a673e@vtiger.fosslabs.com>

#1299: MySQL version 5.0.22 is not supported, kindly connect to MySQL 4.1.x or
above
------------------------+---------------------------------------------------
  Reporter:  fh         |       Owner:  developer
      Type:  defect     |      Status:  closed   
  Priority:  major      |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:  fixed      |    Keywords:  Bug      
------------------------+---------------------------------------------------
Comment (by jerrydgeorge):

 Check made for version less than 4.1

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1299>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 08:36:31 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 15:36:31 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231146=3A?=
 =?utf-8?q?_PriceBook_Popup_screen_too_big?=
In-Reply-To: <076.30e2595c2b37b1575bee462504899f2f@vtiger.fosslabs.com>
References: <076.30e2595c2b37b1575bee462504899f2f@vtiger.fosslabs.com>
Message-ID: <085.fe028f938eb410150ffe1a95b6029f9d@vtiger.fosslabs.com>

#1146: PriceBook Popup screen too big
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  developer
      Type:  defect     |      Status:  closed   
  Priority:  major      |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:  wontfix    |    Keywords:           
------------------------+---------------------------------------------------
Changes (by saraj):

  * resolution:  => wontfix
  * status:  new => closed

Comment:

 Since we need to get more information while adding product to a price
 book, we are showing a new page instead of popup.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1146>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 08:37:11 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 15:37:11 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7145 -
	/vtigercrm/trunk/Smarty/templates/DisplayFields.tpl
Message-ID: <20060615153711.AF8417ED23B@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 15 09:37:07 2006
New Revision: 7145

Log:
changes made to get CampaignName 

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

Modified: vtigercrm/trunk/Smarty/templates/DisplayFields.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DisplayFields.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DisplayFields.tpl Thu Jun 15 09:37:07 2006
@@ -224,6 +224,14 @@
 			</td>
 			<td width="30%" align=left class="dvtCellInfo">
 				<input name="contact_name" readonly type="text" style="border:1px solid #bababa;" value="{$fldvalue}"><input name="{$fldname}" type="hidden" value="{$secondvalue}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Contacts&action=Popup&html=Popup_picker&popuptype=specific&form=EditView","test","width=640,height=565,resizable=0,scrollbars=0");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.contact_id.value=''; this.form.contact_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
+			</td>
+		
+		{elseif $uitype eq 58}
+			<td width="20%" class="dvtCellLabel" align=right>
+				{$fldlabel}
+			</td>
+			<td width="30%" align=left class="dvtCellInfo">
+				<input name="campaignname" readonly type="text" style="border:1px solid #bababa;" value="{$fldvalue}"><input name="{$fldname}" type="hidden" value="{$secondvalue}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Campaigns&action=Popup&html=Popup_picker&popuptype=specific_campaign&form=EditView","test","width=640,height=565,resizable=0,scrollbars=0");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.campaignid.value=''; this.form.campaignname.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
 			</td>
 
 		{elseif $uitype eq 80}



From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 08:38:00 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 15:38:00 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231147=3A?=
 =?utf-8?q?_Vendor_Popup_screen_too_big?=
In-Reply-To: <076.0794d0812b807cd905b48ff6aa59084a@vtiger.fosslabs.com>
References: <076.0794d0812b807cd905b48ff6aa59084a@vtiger.fosslabs.com>
Message-ID: <085.9751df0958538cf9af710f5771b80892@vtiger.fosslabs.com>

#1147: Vendor Popup screen too big
------------------------+---------------------------------------------------
  Reporter:  richie     |       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

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1147>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 08:42:44 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 15:42:44 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231148=3A?=
 =?utf-8?q?_category_not_drop_down_in_pricebook_creation?=
In-Reply-To: <076.e7a68cf911647e37fc94092599e028b4@vtiger.fosslabs.com>
References: <076.e7a68cf911647e37fc94092599e028b4@vtiger.fosslabs.com>
Message-ID: <085.e4f812a500691b35463a4bb01e3a3379@vtiger.fosslabs.com>

#1148: category not drop down in pricebook creation
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  developer
      Type:  defect     |      Status:  closed   
  Priority:  major      |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:  invalid    |    Keywords:           
------------------------+---------------------------------------------------
Changes (by saraj):

  * resolution:  => invalid
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1148>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 08:46:31 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 15:46:31 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231150=3A?=
 =?utf-8?q?_related_list_not_gettng_populated?=
In-Reply-To: <076.4e1f98aeb67bc6258cc11f40272f4eef@vtiger.fosslabs.com>
References: <076.4e1f98aeb67bc6258cc11f40272f4eef@vtiger.fosslabs.com>
Message-ID: <085.ab72886fd66fb749a2d02497cec5dede@vtiger.fosslabs.com>

#1150: related list not gettng populated
------------------------+---------------------------------------------------
  Reporter:  richie     |       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

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1150>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 08:47:28 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 15:47:28 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231152=3A?=
 =?utf-8?q?_cannot_go_to_different_months/years__from_popup_calendar?=
In-Reply-To: <076.305f67d0510043ae0fbe7bd653f4aa48@vtiger.fosslabs.com>
References: <076.305f67d0510043ae0fbe7bd653f4aa48@vtiger.fosslabs.com>
Message-ID: <085.3f54778fa4edc57548236900becaba20@vtiger.fosslabs.com>

#1152: cannot go to different months/years  from popup calendar
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  mangai
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => mangai

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1152>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 08:49:05 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 15:49:05 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231156=3A?=
 =?utf-8?q?_can_create_invoice_without_specifying_product_quantity?=
In-Reply-To: <076.92edb3c9cf4881a366e5a914f7e21365@vtiger.fosslabs.com>
References: <076.92edb3c9cf4881a366e5a914f7e21365@vtiger.fosslabs.com>
Message-ID: <085.25d1a6449d2c9c878eaf7d731a240dca@vtiger.fosslabs.com>

#1156: can create invoice without specifying product quantity
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  mickie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1156>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 08:51:51 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 15:51:51 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231160=3A?=
 =?utf-8?q?_Improper_Navigation_links?=
In-Reply-To: <076.04585a3838305ae5eda12ac53ec9b7cd@vtiger.fosslabs.com>
References: <076.04585a3838305ae5eda12ac53ec9b7cd@vtiger.fosslabs.com>
Message-ID: <085.344801405fb5e227e47b2d496d84a892@vtiger.fosslabs.com>

#1160: Improper Navigation links
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  developer
      Type:  defect     |      Status:  new      
  Priority:  major      |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.1    
Resolution:             |    Keywords:           
------------------------+---------------------------------------------------
Changes (by saraj):

  * version:  5.0.0 => 5.0.1

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1160>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 08:25:32 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 15:25:32 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231132=3A?=
 =?utf-8?q?_creation_of_related_entities_ought_to_be_ajaxified?=
In-Reply-To: <076.343f75f8c959bb0da4c9f8e348afe0b2@vtiger.fosslabs.com>
References: <076.343f75f8c959bb0da4c9f8e348afe0b2@vtiger.fosslabs.com>
Message-ID: <085.ab7ad26676e28d30a951655a90c5001c@vtiger.fosslabs.com>

#1132: creation of related entities ought to be ajaxified
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  jerrydgeorge
      Type:  defect     |      Status:  new         
  Priority:  major      |   Milestone:              
 Component:  vtigercrm  |     Version:  5.0.1       
Resolution:             |    Keywords:  performance 
------------------------+---------------------------------------------------
Changes (by saraj):

  * version:  5.0.0 => 5.0.1
  * owner:  developer => jerrydgeorge

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1132>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 08:28:27 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 15:28:27 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231134=3A?=
 =?utf-8?q?_unable_to_change_state_of_purchase_order_using_ajax_feature?=
In-Reply-To: <076.6b6e1bdd6d4cf54f7a2bce3761f03794@vtiger.fosslabs.com>
References: <076.6b6e1bdd6d4cf54f7a2bce3761f03794@vtiger.fosslabs.com>
Message-ID: <085.a0d55d27a61f8b46e569a98eea2db7e1@vtiger.fosslabs.com>

#1134: unable to change state of purchase order using ajax feature
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  jerrydgeorge
      Type:  defect     |      Status:  new         
  Priority:  major      |   Milestone:              
 Component:  vtigercrm  |     Version:  5.0.0       
Resolution:             |    Keywords:              
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => jerrydgeorge

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1134>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 08:22:22 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 15:22:22 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231112=3A?=
 =?utf-8?q?_copy_shipping_to_billing_and_vice-versa_not_supported?=
In-Reply-To: <076.7b8b2189052f43a7391dbcc8289cc21c@vtiger.fosslabs.com>
References: <076.7b8b2189052f43a7391dbcc8289cc21c@vtiger.fosslabs.com>
Message-ID: <085.d6002a226c1e31090665c563a33d8ef1@vtiger.fosslabs.com>

#1112: copy shipping to billing and vice-versa not supported
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  mangai       
      Type:  defect     |      Status:  new          
  Priority:  major      |   Milestone:               
 Component:  vtigercrm  |     Version:  5.0.0        
Resolution:             |    Keywords:  product,quote
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => mangai

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1112>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 08:53:17 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 15:53:17 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231162=3A?=
 =?utf-8?q?_navigation_issue_from_Calendar?=
In-Reply-To: <076.be19fd30fd8c810bee45f8361c2c8b04@vtiger.fosslabs.com>
References: <076.be19fd30fd8c810bee45f8361c2c8b04@vtiger.fosslabs.com>
Message-ID: <085.7f221a0b6e34397a346eeb0d54114f5c@vtiger.fosslabs.com>

#1162: navigation issue from Calendar
------------------------+---------------------------------------------------
  Reporter:  richie     |       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

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1162>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 08:54:45 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 15:54:45 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7147 -
	/vtigercrm/trunk/include/js/Inventory.js
Message-ID: <20060615155445.464D67ED255@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 15 09:54:41 2006
New Revision: 7147

Log:
* Added validation for Tax and Adjustment where as previously if we give empty or alphabetic value then the total comes as Nan. now this will occur

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

Modified: vtigercrm/trunk/include/js/Inventory.js
==============================================================================
--- vtigercrm/trunk/include/js/Inventory.js (original)
+++ vtigercrm/trunk/include/js/Inventory.js Thu Jun 15 09:54:41 2006
@@ -285,15 +285,22 @@
 }
 
 function calcGrandTotal() {
-	var subTotal=0,grandTotal=0;
+	var subTotal=0, grandTotal=0, txtTaxVal = 0, txtAdjVal = 0;
+
 	for (var i=1;i<=rowCnt;i++) {
 		if (getObj("hdnTotal"+i).value=="") 
 			getObj("hdnTotal"+i).value=0
 		if (!isNaN(getObj("hdnTotal"+i).value)) 
 			subTotal+=parseFloat(getObj("hdnTotal"+i).value)
 	}
-	
-	grandTotal=subTotal+parseFloat(getObj("txtTax").value)+parseFloat(getObj("txtAdjustment").value)
+
+	//Tax and Adjustment values will be taken when they are valid integer or decimal values
+	if(/^-?(0|[1-9]{1}\d{0,})(\.(\d{1}\d{0,}))?$/.test(document.getElementById("txtTax").value))
+		txtTaxVal = parseFloat(getObj("txtTax").value);	
+	if(/^-?(0|[1-9]{1}\d{0,})(\.(\d{1}\d{0,}))?$/.test(document.getElementById("txtAdjustment").value))
+		txtAdjVal = parseFloat(getObj("txtAdjustment").value);
+
+	grandTotal=subTotal+txtTaxVal+txtAdjVal
 	
 	getObj("subTotal").value=getObj("hdnSubTotal").value=roundValue(subTotal.toString())
 	getObj("grandTotal").value=getObj("hdnGrandTotal").value=roundValue(grandTotal.toString())



From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 08:56:20 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 15:56:20 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231163=3A?=
 =?utf-8?q?_unable_to_save_Ajaxified_Terms_and_Conditions_field_in_Invoice?=
In-Reply-To: <076.81406a0d124351606d1fccac357d6e5d@vtiger.fosslabs.com>
References: <076.81406a0d124351606d1fccac357d6e5d@vtiger.fosslabs.com>
Message-ID: <085.f927be864b55207e7e9542f111ce6163@vtiger.fosslabs.com>

#1163: unable to save Ajaxified Terms and Conditions field in Invoice
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  jerrydgeorge
      Type:  defect     |      Status:  new         
  Priority:  major      |   Milestone:              
 Component:  vtigercrm  |     Version:  5.0.0       
Resolution:             |    Keywords:              
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => jerrydgeorge

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1163>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 08:56:55 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 15:56:55 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231164=3A?=
 =?utf-8?q?_unable_to_save_Ajaxified_Description_field_in_Invoice?=
In-Reply-To: <076.b0bc283a60909e304007e4b26726e2ef@vtiger.fosslabs.com>
References: <076.b0bc283a60909e304007e4b26726e2ef@vtiger.fosslabs.com>
Message-ID: <085.486f64c30c3bccafbe208c0dcee327ce@vtiger.fosslabs.com>

#1164: unable to save Ajaxified Description field in Invoice
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  jerrydgeorge
      Type:  defect     |      Status:  new         
  Priority:  major      |   Milestone:              
 Component:  vtigercrm  |     Version:  5.0.0       
Resolution:             |    Keywords:              
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => jerrydgeorge

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1164>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 08:58:55 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 15:58:55 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231167=3A?=
 =?utf-8?q?_able_to_store_negative_value_in_stock_while_creation_of_invoic?=
 =?utf-8?q?e?=
In-Reply-To: <076.90681771b7b03afd5ee26a72d90bd95f@vtiger.fosslabs.com>
References: <076.90681771b7b03afd5ee26a72d90bd95f@vtiger.fosslabs.com>
Message-ID: <085.8f9a28fe4e7c4fb7f3af9e24ff26f3c7@vtiger.fosslabs.com>

#1167: able to store negative value in stock while creation of invoice
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  developer
      Type:  defect     |      Status:  closed   
  Priority:  major      |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:  wontfix    |    Keywords:           
------------------------+---------------------------------------------------
Changes (by saraj):

  * resolution:  => wontfix
  * status:  new => closed

Comment:

 Expected behaviour.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1167>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 09:02:33 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 16:02:33 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231169=3A?=
 =?utf-8?q?_unable_to_relate_Quote_to_SalesOrder?=
In-Reply-To: <076.bec9bdcd41de51d9a21b66c7a45dbe9a@vtiger.fosslabs.com>
References: <076.bec9bdcd41de51d9a21b66c7a45dbe9a@vtiger.fosslabs.com>
Message-ID: <085.35d0bcb74fa1306664ed68948d3d65fe@vtiger.fosslabs.com>

#1169: unable to relate Quote to SalesOrder
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  mickie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1169>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 09:03:27 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 16:03:27 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231172=3A?=
 =?utf-8?q?_unable_to_store_any_Ajax_edited_value?=
In-Reply-To: <076.626fce50467ea4fac0273a3fb6aad256@vtiger.fosslabs.com>
References: <076.626fce50467ea4fac0273a3fb6aad256@vtiger.fosslabs.com>
Message-ID: <085.48cdd772bec3d2bb096aaa30d5c60b35@vtiger.fosslabs.com>

#1172: unable to store any Ajax edited value
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  jerrydgeorge
      Type:  defect     |      Status:  new         
  Priority:  major      |   Milestone:              
 Component:  vtigercrm  |     Version:  5.0.0       
Resolution:             |    Keywords:              
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => jerrydgeorge

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1172>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 09:05:21 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 16:05:21 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231173=3A?=
	=?utf-8?q?_unable_to_veiw_pdf?=
In-Reply-To: <076.2f691fd08704f9500476c37cc5e5685c@vtiger.fosslabs.com>
References: <076.2f691fd08704f9500476c37cc5e5685c@vtiger.fosslabs.com>
Message-ID: <085.a8c3834b3a803308aa36ada83b505a8f@vtiger.fosslabs.com>

#1173: unable to veiw pdf
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  jerrydgeorge
      Type:  defect     |      Status:  new         
  Priority:  major      |   Milestone:              
 Component:  vtigercrm  |     Version:  5.0.0       
Resolution:             |    Keywords:              
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => jerrydgeorge

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1173>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 09:05:42 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 16:05:42 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231174=3A?=
 =?utf-8?q?_unable_to_change_months/years_from_mini-calendar?=
In-Reply-To: <076.2ef668b0f99e11dc546be8a077110184@vtiger.fosslabs.com>
References: <076.2ef668b0f99e11dc546be8a077110184@vtiger.fosslabs.com>
Message-ID: <085.e3f3ac927d7c0332655588594a7640af@vtiger.fosslabs.com>

#1174: unable to change months/years from mini-calendar
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  mangai
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => mangai

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1174>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 09:05:47 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 16:05:47 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23748=3A_?=
 =?utf-8?q?Eliminate_php_notice_errors?=
In-Reply-To: <076.c75696aed703c24c8b151bd87264b9e6@vtiger.fosslabs.com>
References: <076.c75696aed703c24c8b151bd87264b9e6@vtiger.fosslabs.com>
Message-ID: <085.a413b215a284f9f1e3b2ab8c8c622653@vtiger.fosslabs.com>

#748: Eliminate php notice errors
------------------------+---------------------------------------------------
  Reporter:  allanbush  |       Owner:  jrydbeck
      Type:  task       |      Status:  new     
  Priority:  minor      |   Milestone:  4.2.5   
 Component:  vtigercrm  |     Version:  4.2.4rc3
Resolution:             |    Keywords:          
------------------------+---------------------------------------------------
Changes (by jrydbeck):

  * owner:  developer => jrydbeck

Comment:

 Taking this over for cleanup in the 4.2.4 codebase, ideally for release as
 4.2.4.1 or 4.2.5.  This will be an ongoing effort so anyone with
 contributions please dive in.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/748>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 09:06:00 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 16:06:00 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231175=3A?=
 =?utf-8?q?_add_products_to_pricebook_UI_is_old?=
In-Reply-To: <076.88a213b6789fd810420b69633d85a7ad@vtiger.fosslabs.com>
References: <076.88a213b6789fd810420b69633d85a7ad@vtiger.fosslabs.com>
Message-ID: <085.0ef14b00fd1372d700baff54025d3595@vtiger.fosslabs.com>

#1175: add products to pricebook UI is old
------------------------+---------------------------------------------------
  Reporter:  richie     |       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

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1175>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 09:08:28 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 16:08:28 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7148 - in
 /vtigercrm/branches/4.2: include/ListView/ListView.php include/utils.php
 install/2setConfig.php modules/Contacts/ListView.php
 modules/CustomView/CustomView.php themes/blue/header.php
Message-ID: <20060615160829.378767ED265@vtiger.fosslabs.com>

Author: jrydbeck
Date: Thu Jun 15 10:08:20 2006
New Revision: 7148

Log:
Begin fixing variable undefined errors for bug #748.  This is an ongoing effort so fixes will be incremental.

Modified:
    vtigercrm/branches/4.2/include/ListView/ListView.php
    vtigercrm/branches/4.2/include/utils.php
    vtigercrm/branches/4.2/install/2setConfig.php
    vtigercrm/branches/4.2/modules/Contacts/ListView.php
    vtigercrm/branches/4.2/modules/CustomView/CustomView.php
    vtigercrm/branches/4.2/themes/blue/header.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 Jun 15 10:08:20 2006
@@ -597,20 +597,20 @@
 		break;
 }
 
-session_start();
+//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]"];
+} elseif (isset($_SESSION['ListViewOrder']) && $_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]"];
+		        $_SESSION['ListViewOrder[$currentModule_name][1]'] = $sorder;
+} elseif (isset($_SESSION['ListViewOrder']) && $_SESSION['ListViewOrder[$currentModule_name][1]'] != '') {
+	        $sorder = $_SESSION['ListViewOrder[$currentModule_name][1]'];
 }
 
 

Modified: vtigercrm/branches/4.2/include/utils.php
==============================================================================
--- vtigercrm/branches/4.2/include/utils.php (original)
+++ vtigercrm/branches/4.2/include/utils.php Thu Jun 15 10:08:20 2006
@@ -4160,28 +4160,51 @@
 //parameter $viewid added for customview 27/5
 function AlphabeticalSearch($module,$action,$fieldname,$query,$type,$popuptype='',$recordid='',$return_module='',$append_url='',$viewid='')
 {
-  /* for access to alphabetical_search values stored in /include/$lang.language.php */
-  global $app_list_strings;
+	/* for access to alphabetical_search values stored in /include/$lang.language.php */
+	global $app_list_strings;
   
 	if($type=='advanced')
-		$flag='&advanced=true';
+	{
+		$flag = '&advanced=true';
+	}
+	else
+	{
+		$flag = '';
+	}
 
 	if($popuptype != '')
-		$popuptypevalue = "&popuptype=".$popuptype;
-
-        if($recordid != '')
-                $returnvalue = '&recordid='.$recordid;
-        if($return_module != '')
-                $returnvalue .= '&return_module='.$return_module;
+	{
+		$popuptypevalue = '&popuptype='.$popuptype;
+	}
+	else
+	{
+		$popuptypevalue = '';
+	}
+
+    if($return_module != '')
+    {
+    	$returnvalue .= '&return_module='.$return_module;
+    }
+    elseif($recordid != '')
+    {
+    	$returnvalue = '&recordid='.$recordid;
+    }
+    else
+    {
+    	$returnvalue = '';
+    }
+    
 	// gettin' values
 	$alphabetical_search_values = & $app_list_strings['alphabetical_search_values'];
 	/* world alphabets has different count of letters. Plus we can add "special" (multucharacter) values in alphabetical seach bar */
-  $count = count($alphabetical_search_values);
+	$count = count($alphabetical_search_values);
   
 	// building alphabetical search bar from array values
-  for($i =0;$i<=$count;$i++)
-		$list .= '<td class="alphaBg"><a href="index.php?module='.$module.'&action='.$action.'&viewname='.$viewid.'&query='.$query.'&'.$fieldname.'='.$alphabetical_search_values[$i].$flag.$popuptypevalue.$returnvalue.$append_url.'">'.$alphabetical_search_values[$i].'</a></td>';
-
+	for($i =0;$i<$count;$i++)
+	{
+		$list = '<td class="alphaBg"><a href="index.php?module='.$module.'&action='.$action.'&viewname='.$viewid.'&query='.$query.'&'.$fieldname.'='.$alphabetical_search_values[$i].$flag.$popuptypevalue.$returnvalue.$append_url.'">'.$alphabetical_search_values[$i].'</a></td>';
+	}
+	
 	return $list;
 }
 

Modified: vtigercrm/branches/4.2/install/2setConfig.php
==============================================================================
--- vtigercrm/branches/4.2/install/2setConfig.php (original)
+++ vtigercrm/branches/4.2/install/2setConfig.php Thu Jun 15 10:08:20 2006
@@ -344,6 +344,7 @@
 	        <select class="dataInput" name="dbtype">
 		  <option value="mysql" <?php echo $dbconfig['db_type'] == 'mysql' ? 'selected' : '' ?>>MySQL</option>
 		  <option value="pgsql" <?php echo $dbconfig['db_type'] == 'pgsql' ? 'selected' : '' ?>>Postgresql</option>
+		  <option value="oci8" <?php echo $dbconfig['db_type'] == 'oci8' ? 'selected' : '' ?>>Oracle 8+</option>
 	        </select>
 	      </td>
 	    </tr>

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 Jun 15 10:08:20 2006
@@ -219,13 +219,21 @@
 	$search_form->assign("MOD", $current_module_strings);
 	$search_form->assign("APP", $app_strings);
 
-	if ($order_by !='') $search_form->assign("ORDER_BY", $order_by);
-	if ($sorder !='') $search_form->assign("SORDER", $sorder);
+	if (isset($order_by) && $order_by !='')
+	{
+		$search_form->assign("ORDER_BY", $order_by);
+	}
+	
+	if ($sorder !='')
+	{
+		$search_form->assign("SORDER", $sorder);
+	}
 	
 	$search_form->assign("VIEWID",$viewid);
-
 	$search_form->assign("JAVASCRIPT", get_clear_form_js());
-	if($order_by != '') {
+	
+	if(isset($order_by) && $order_by != '')
+	{
 		$ordby = "&order_by=".$order_by;
 	}
 	else

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 Thu Jun 15 10:08:20 2006
@@ -97,14 +97,15 @@
 	function getCustomViewCombo()
 	{
 		global $adb;
-                $tabid = getTabid($this->customviewmodule);
-                $ssql = "select customview.* from customview inner join tab on tab.name = customview.entitytype";
-                $ssql .= " where tab.tabid=".$tabid;
-		//echo $ssql;
-                $result = $adb->query($ssql);
-                while($cvrow=$adb->fetch_array($result))
-                {
-                        if($cvrow['setdefault'] == 1)
+        $tabid = getTabid($this->customviewmodule);
+        $ssql = "select customview.* from customview inner join tab on tab.name = customview.entitytype";
+        $ssql .= " where tab.tabid=".$tabid;
+        $result = $adb->query($ssql);
+        $shtml = '';
+        
+        while($cvrow=$adb->fetch_array($result))
+        {
+			if($cvrow['setdefault'] == 1)
 			{
 				$shtml .= "<option selected value=\"".$cvrow['cvid']."\">".$cvrow['viewname']."</option>";
 				$this->setdefaultviewid = $cvrow['cvid'];
@@ -113,9 +114,8 @@
 			{
 				$shtml .= "<option value=\"".$cvrow['cvid']."\">".$cvrow['viewname']."</option>";
 			}
-                }
-		//echo $shtml;
-                return $shtml;
+        }
+        return $shtml;
 	}
 	function getColumnsListbyBlock($module,$block)
         {

Modified: vtigercrm/branches/4.2/themes/blue/header.php
==============================================================================
--- vtigercrm/branches/4.2/themes/blue/header.php (original)
+++ vtigercrm/branches/4.2/themes/blue/header.php Thu Jun 15 10:08:20 2006
@@ -254,15 +254,19 @@
 
 		$xtpl->assign("RECENT_LABEL",$row['item_summary']);
 
-                if($row['module_name']=='Activities')
-                {
-                        $sql = 'select activitytype from activity where activityid = '.$row['item_id'];
-                        $activitytype = $adb->query_result($adb->query($sql),0,'activitytype');
-                        if($activitytype == 'Task')
-                                $activity_mode = '&activity_mode=Task';
-                        elseif($activitytype == 'Call' || $activitytype == 'Meeting')
-                                $activity_mode = '&activity_mode=Events';
-                }
+        if($row['module_name']=='Activities')
+        {
+                $sql = 'select activitytype from activity where activityid = '.$row['item_id'];
+                $activitytype = $adb->query_result($adb->query($sql),0,'activitytype');
+                if($activitytype == 'Task')
+                        $activity_mode = '&activity_mode=Task';
+                elseif($activitytype == 'Call' || $activitytype == 'Meeting')
+                        $activity_mode = '&activity_mode=Events';
+        }
+        else
+        {
+        	$activity_mode = null;          
+        }
 
 		$url_module = $row['module_name'];
 		$url_action = 'DetailView';



From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 08:11:55 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 15:11:55 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231078=3A?=
 =?utf-8?q?_Import_Products=2C_last_step?=
In-Reply-To: <076.057c37e4d4720839331492b5e07b914c@vtiger.fosslabs.com>
References: <076.057c37e4d4720839331492b5e07b914c@vtiger.fosslabs.com>
Message-ID: <085.b25c00416406b220a6bd2a25c5c8721c@vtiger.fosslabs.com>

#1078: Import Products, last step
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  mickie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1078>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 08:48:46 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 15:48:46 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231155=3A?=
 =?utf-8?q?_Home_page_-_not_much_informative?=
In-Reply-To: <076.df32a5a4f009111920e73e95331da209@vtiger.fosslabs.com>
References: <076.df32a5a4f009111920e73e95331da209@vtiger.fosslabs.com>
Message-ID: <085.f7856fae22e40f962a63f2818ccc736d@vtiger.fosslabs.com>

#1155: Home page - not much informative
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  developer
      Type:  defect     |      Status:  new      
  Priority:  major      |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.1    
Resolution:             |    Keywords:           
------------------------+---------------------------------------------------
Changes (by saraj):

  * version:  5.0.0 => 5.0.1

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1155>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 08:47:54 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 15:47:54 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231153=3A?=
 =?utf-8?q?_Source_Installer=3A_data_in_=22Path=22_field_disappears?=
In-Reply-To: <076.a6308f317cdefba138949240f46f1aae@vtiger.fosslabs.com>
References: <076.a6308f317cdefba138949240f46f1aae@vtiger.fosslabs.com>
Message-ID: <085.c9ed74e3b5400b4328bffe6a8d2d6148@vtiger.fosslabs.com>

#1153: Source Installer: data in "Path" field disappears
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  saraj
      Type:  defect     |      Status:  new  
  Priority:  major      |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => saraj

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1153>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 09:10:44 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 16:10:44 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231180=3A?=
 =?utf-8?q?_pricebook_related_list_shows_products_which_cannot_be_deleted_?=
 =?utf-8?q?from_related_list?=
In-Reply-To: <076.0271cde3695160584f02fe99d754d59c@vtiger.fosslabs.com>
References: <076.0271cde3695160584f02fe99d754d59c@vtiger.fosslabs.com>
Message-ID: <085.f3b86095ab96fc49dee6154944a5c8de@vtiger.fosslabs.com>

#1180: pricebook related list shows products which cannot be deleted from related
list
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  mickie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1180>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 09:11:45 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 16:11:45 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231184=3A?=
 =?utf-8?q?_system_configuration_page_needs_css_implementation?=
In-Reply-To: <076.147d86285bbc713c647806428425b67d@vtiger.fosslabs.com>
References: <076.147d86285bbc713c647806428425b67d@vtiger.fosslabs.com>
Message-ID: <085.f4c532e430aba557734bf19b3afac0ac@vtiger.fosslabs.com>

#1184: system configuration page needs css implementation
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  ela  
      Type:  defect     |      Status:  new  
  Priority:  major      |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => ela

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1184>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 09:12:09 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 16:12:09 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231186=3A?=
 =?utf-8?q?_webmails_not_working_in_linux_systems?=
In-Reply-To: <076.f90486e13eb47978a671c1ca4ead62d2@vtiger.fosslabs.com>
References: <076.f90486e13eb47978a671c1ca4ead62d2@vtiger.fosslabs.com>
Message-ID: <085.b0e06a876a6a7f629dbe4f3915fcb0a5@vtiger.fosslabs.com>

#1186: webmails not working in linux systems
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  richie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => richie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1186>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 09:13:32 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 16:13:32 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231271=3A?=
 =?utf-8?q?_Organisation_wont_save_when_containt_=27?=
In-Reply-To: <076.62b916cddc422a4f2f6a8828de68207a@vtiger.fosslabs.com>
References: <076.62b916cddc422a4f2f6a8828de68207a@vtiger.fosslabs.com>
Message-ID: <085.2470494dc9558909019a61b276f74945@vtiger.fosslabs.com>

#1271: Organisation wont save when containt '
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  allanbush          
      Type:  defect     |      Status:  closed             
  Priority:  major      |   Milestone:  5.0.0              
 Component:  vtigercrm  |     Version:  5.0.0              
Resolution:  fixed      |    Keywords:  organisation, quote
------------------------+---------------------------------------------------
Comment (by allanbush):

 Don't be sorry, without good bug reports the problems would never be
 found.  You've just help make the product better for everyone.  We should
 be thanking you.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1271>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 09:14:18 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 16:14:18 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231210=3A?=
 =?utf-8?q?_Compose_Email_-_Part_of_the_RHS_is_hidden?=
In-Reply-To: <076.53700680c5c774c5e8324a16ab813603@vtiger.fosslabs.com>
References: <076.53700680c5c774c5e8324a16ab813603@vtiger.fosslabs.com>
Message-ID: <085.ab3898121da0ccd75ee1cada46ae7331@vtiger.fosslabs.com>

#1210: Compose Email - Part of the RHS is hidden
------------------------+---------------------------------------------------
  Reporter:  gopal      |       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

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1210>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 09:18:42 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 16:18:42 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231216=3A?=
 =?utf-8?q?_Event/Meeting_-_Start_Date_Pop-up_not_working?=
In-Reply-To: <076.3f1ce92c2f0a821d660e0302d0052d6f@vtiger.fosslabs.com>
References: <076.3f1ce92c2f0a821d660e0302d0052d6f@vtiger.fosslabs.com>
Message-ID: <085.3be9c927b544e3298f4b1fe42c069ff1@vtiger.fosslabs.com>

#1216: Event/Meeting - Start Date Pop-up not working
------------------------+---------------------------------------------------
  Reporter:  gopal      |       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

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1216>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 09:22:00 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 16:22:00 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231219=3A?=
 =?utf-8?q?_from_Activities_list_view_must_have_facility_to_directly_see_i?=
 =?utf-8?q?n_Calendar=2C_Show_in_Calendar_feature?=
In-Reply-To: <076.5c77d473768220f38634c6a8fcae7177@vtiger.fosslabs.com>
References: <076.5c77d473768220f38634c6a8fcae7177@vtiger.fosslabs.com>
Message-ID: <085.657384c767ac5c3541a5a456a47c5ace@vtiger.fosslabs.com>

#1219: from Activities list view must have facility to directly see in Calendar,
Show in Calendar feature
--------------------------+-------------------------------------------------
  Reporter:  richie       |       Owner:  developer
      Type:  enhancement  |      Status:  new      
  Priority:  major        |   Milestone:           
 Component:  vtigercrm    |     Version:  5.0.1    
Resolution:               |    Keywords:           
--------------------------+-------------------------------------------------
Changes (by saraj):

  * version:  5.0.0 => 5.0.1

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1219>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 08:52:37 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 15:52:37 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7146 -
	/vtigercrm/trunk/schema/DatabaseSchema.xml
Message-ID: <20060615155238.3E5C17ED24A@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 15 09:52:32 2006
New Revision: 7146

Log:
changes made to integrate campaign relatedlist

Modified:
    vtigercrm/trunk/schema/DatabaseSchema.xml

Modified: vtigercrm/trunk/schema/DatabaseSchema.xml
==============================================================================
--- vtigercrm/trunk/schema/DatabaseSchema.xml (original)
+++ vtigercrm/trunk/schema/DatabaseSchema.xml Thu Jun 15 09:52:32 2006
@@ -671,7 +671,6 @@
 		<field name="currency" type="C" size="20" />
 		<field name="closingdate" type="D" />
 		<field name="typeofrevenue" type="C" size="50" />
-		<field name="campaignsource" type="C" size="30" />
 		<field name="nextstep" type="C" size="100" />
 		<field name="private" type="I" size="1">
 			<default value="0" />
@@ -679,6 +678,7 @@
 		<field name="probability" type="N" size="7.3">
 			<default value="0" />
 		</field>
+		<field name="campaignid" type="I" size="19" />
 		<field name="sales_stage" type="C" size="50" />
 		<field name="potentialtype" type="C" size="50" />
 		<field name="leadsource" type="C" size="50" />
@@ -1235,6 +1235,7 @@
 			<constraint>REFERENCES vtiger_campaign(campaignid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="contactid" type="I" size="19">
+			<key />
 			<notnull />
 			<default value="0"/>
 			<constraint>REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE</constraint>
@@ -1253,6 +1254,7 @@
 			<constraint>REFERENCES vtiger_campaign(campaignid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="leadid" type="I" size="19">
+			<key />
 			<notnull />
 			<default value="0" />
 			<constraint>REFERENCES vtiger_leaddetails(leadid) ON DELETE CASCADE</constraint>



From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 09:03:00 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 16:03:00 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231170=3A?=
 =?utf-8?q?_PO_related_to_SO_does_not_have_assigned_to_value?=
In-Reply-To: <076.846167eef3e3ff8046106f91876e5bb5@vtiger.fosslabs.com>
References: <076.846167eef3e3ff8046106f91876e5bb5@vtiger.fosslabs.com>
Message-ID: <085.880e80800c3d5480681863df76285257@vtiger.fosslabs.com>

#1170: PO related to SO does not have assigned to value
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  saraj
      Type:  defect     |      Status:  new  
  Priority:  major      |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => saraj

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1170>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 09:27:41 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 16:27:41 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231221=3A?=
 =?utf-8?q?_Usage_of_Sub-tabs_for_single_section?=
In-Reply-To: <076.2f323372d07ad5631728b02fb41df643@vtiger.fosslabs.com>
References: <076.2f323372d07ad5631728b02fb41df643@vtiger.fosslabs.com>
Message-ID: <085.4836c7f37641b7fccd1d30dee2714629@vtiger.fosslabs.com>

#1221: Usage of Sub-tabs for single section
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  developer
      Type:  defect     |      Status:  closed   
  Priority:  major      |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:  duplicate  |    Keywords:           
------------------------+---------------------------------------------------
Changes (by saraj):

  * resolution:  => duplicate
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1221>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 09:28:17 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 16:28:17 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231221=3A?=
 =?utf-8?q?_Usage_of_Sub-tabs_for_single_section?=
In-Reply-To: <076.2f323372d07ad5631728b02fb41df643@vtiger.fosslabs.com>
References: <076.2f323372d07ad5631728b02fb41df643@vtiger.fosslabs.com>
Message-ID: <085.390e4ff2a038f64e394541e43c70388a@vtiger.fosslabs.com>

#1221: Usage of Sub-tabs for single section
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  developer
      Type:  defect     |      Status:  reopened 
  Priority:  major      |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:             |    Keywords:           
------------------------+---------------------------------------------------
Changes (by saraj):

  * resolution:  duplicate =>
  * status:  closed => reopened

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1221>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 09:28:35 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 16:28:35 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231220=3A?=
 =?utf-8?q?_Usage_of_Sub-tabs_for_single_section?=
In-Reply-To: <076.0cb5c9c15de16babde2de07049fd9221@vtiger.fosslabs.com>
References: <076.0cb5c9c15de16babde2de07049fd9221@vtiger.fosslabs.com>
Message-ID: <085.bd6263906ed708a977a5db30178516a0@vtiger.fosslabs.com>

#1220: Usage of Sub-tabs for single section
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  saraj 
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  duplicate  |    Keywords:        
------------------------+---------------------------------------------------
Changes (by saraj):

  * resolution:  => duplicate
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1220>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 09:32:22 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 16:32:22 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231227=3A?=
 =?utf-8?q?_ListView_of_Events/Tasks_accessible_only_from_Calendar?=
In-Reply-To: <076.fdf1e38f077c44a77d796a91336823d8@vtiger.fosslabs.com>
References: <076.fdf1e38f077c44a77d796a91336823d8@vtiger.fosslabs.com>
Message-ID: <085.09628d77dcc4b18f8c7f46458f66b7bd@vtiger.fosslabs.com>

#1227: ListView of Events/Tasks accessible only from Calendar
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  developer
      Type:  defect     |      Status:  closed   
  Priority:  major      |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:  invalid    |    Keywords:           
------------------------+---------------------------------------------------
Changes (by saraj):

  * resolution:  => invalid
  * status:  new => closed

Comment:

 It is also be access from Activities ListView.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1227>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 09:35:28 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 16:35:28 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231228=3A?=
 =?utf-8?q?_AddEvent_mouseover_persists_for_long?=
In-Reply-To: <076.8a08c7ad8c090a6fc574e4ebe19bc6b1@vtiger.fosslabs.com>
References: <076.8a08c7ad8c090a6fc574e4ebe19bc6b1@vtiger.fosslabs.com>
Message-ID: <085.7baf9782017d7c99853f6a450d9276d2@vtiger.fosslabs.com>

#1228: AddEvent mouseover persists for long
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  ela  
      Type:  defect     |      Status:  new  
  Priority:  major      |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1228>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 09:37:51 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 16:37:51 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231240=3A?=
 =?utf-8?q?_Office_Plugin_-_Change_Splash_screen?=
In-Reply-To: <076.25c934e0f37ff93790a99a1672638afb@vtiger.fosslabs.com>
References: <076.25c934e0f37ff93790a99a1672638afb@vtiger.fosslabs.com>
Message-ID: <085.332aba67358d9a6b057c648cd5ca5a40@vtiger.fosslabs.com>

#1240: Office Plugin - Change Splash screen
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  jerrydgeorge
      Type:  defect     |      Status:  new         
  Priority:  major      |   Milestone:              
 Component:  vtigercrm  |     Version:  5.0.0       
Resolution:             |    Keywords:              
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => jerrydgeorge

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1240>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 09:39:34 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 16:39:34 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231242=3A?=
 =?utf-8?q?_Activities_history_is_missing_in_Product_relatedlist?=
In-Reply-To: <076.4b9590790acecb205e8103ff0f8ca3a2@vtiger.fosslabs.com>
References: <076.4b9590790acecb205e8103ff0f8ca3a2@vtiger.fosslabs.com>
Message-ID: <085.e33e2d99d3db7e54e586b743fe718648@vtiger.fosslabs.com>

#1242: Activities history is missing in Product relatedlist
--------------------------+-------------------------------------------------
  Reporter:  mickie       |       Owner:  saraj
      Type:  enhancement  |      Status:  new  
  Priority:  major        |   Milestone:       
 Component:  vtigercrm    |     Version:  5.0.1
Resolution:               |    Keywords:       
--------------------------+-------------------------------------------------
Changes (by saraj):

  * version:  5.0.0 => 5.0.1
  * owner:  developer => saraj

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1242>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 09:40:14 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 16:40:14 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231244=3A?=
 =?utf-8?q?_Support_=3E_HelpDesk_-_Ticket_Comments?=
In-Reply-To: <076.37c737bcf82ff17f40eb1ca85dac14f6@vtiger.fosslabs.com>
References: <076.37c737bcf82ff17f40eb1ca85dac14f6@vtiger.fosslabs.com>
Message-ID: <085.7fb1dd8b3e480dc363a982e99e905d7c@vtiger.fosslabs.com>

#1244: Support > HelpDesk - Ticket Comments
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  mickie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1244>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 09:21:16 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 16:21:16 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231218=3A?=
 =?utf-8?q?_CSS_not_applied_properly_in_Event_Creation_page?=
In-Reply-To: <076.44fb062ecefa40ef28af880bc5b9aae0@vtiger.fosslabs.com>
References: <076.44fb062ecefa40ef28af880bc5b9aae0@vtiger.fosslabs.com>
Message-ID: <085.1e06d1076ba26705b178902afb8643f8@vtiger.fosslabs.com>

#1218: CSS not applied properly in Event Creation page
------------------------+---------------------------------------------------
  Reporter:  gopal      |       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

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1218>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 09:43:41 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 16:43:41 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231246=3A?=
 =?utf-8?q?_email_not_displayed_in_contact_related_list?=
In-Reply-To: <076.bb51c9882ca3da9b29e43b10d6709695@vtiger.fosslabs.com>
References: <076.bb51c9882ca3da9b29e43b10d6709695@vtiger.fosslabs.com>
Message-ID: <085.f87569cddaeef7190cd6e946d95e0a22@vtiger.fosslabs.com>

#1246: email not displayed in contact related list
------------------------+---------------------------------------------------
  Reporter:  mickie     |       Owner:  richie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => richie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1246>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 09:51:19 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 16:51:19 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231247=3A?=
 =?utf-8?q?_dashboard_not_printable?=
In-Reply-To: <076.a3fd81704060a1a7525a1879e6b6b088@vtiger.fosslabs.com>
References: <076.a3fd81704060a1a7525a1879e6b6b088@vtiger.fosslabs.com>
Message-ID: <085.8d74d4abf73a56edbd2c762e100b3b0a@vtiger.fosslabs.com>

#1247: dashboard not printable
-------------------------+--------------------------------------------------
  Reporter:  anonymous   |       Owner:  developer
      Type:  defect      |      Status:  closed   
  Priority:  major       |   Milestone:           
 Component:  vtigercrm   |     Version:  5.0.0    
Resolution:  worksforme  |    Keywords:  dashboard
-------------------------+--------------------------------------------------
Changes (by saraj):

  * resolution:  => worksforme
  * status:  new => closed

Comment:

 It works (mozilla 1.7.3 / linux mandriva)

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1247>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 09:51:24 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 16:51:24 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7150 - in
 /vtigercrm/trunk/modules/Emails: Choose.php ChooseEmail.php EditView.php
 ListView.php class.phpmailer.php mailSelect.php mailbox.php mailsend.php
Message-ID: <20060615165125.26A787ED23B@vtiger.fosslabs.com>

Author: don
Date: Thu Jun 15 10:51:15 2006
New Revision: 7150

Log:
prefixed vtiger_ in all table names

Modified:
    vtigercrm/trunk/modules/Emails/Choose.php
    vtigercrm/trunk/modules/Emails/ChooseEmail.php
    vtigercrm/trunk/modules/Emails/EditView.php
    vtigercrm/trunk/modules/Emails/ListView.php
    vtigercrm/trunk/modules/Emails/class.phpmailer.php
    vtigercrm/trunk/modules/Emails/mailSelect.php
    vtigercrm/trunk/modules/Emails/mailbox.php
    vtigercrm/trunk/modules/Emails/mailsend.php

Modified: vtigercrm/trunk/modules/Emails/Choose.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/Choose.php (original)
+++ vtigercrm/trunk/modules/Emails/Choose.php Thu Jun 15 10:51:15 2006
@@ -16,15 +16,15 @@
 
 if ($pmodule=='Accounts')
 {
-	$querystr="select vtiger_fieldid,fieldlabel,columnname,tablename from vtiger_field where vtiger_tabid=6 and uitype=13;"; 
+	$querystr="select fieldid,fieldlabel,columnname,tablename from vtiger_field where tabid=6 and uitype=13;"; 
 }
 elseif ($pmodule=='Contacts')
 {
-	$querystr="select vtiger_fieldid,fieldlabel,columnname from vtiger_field where vtiger_tabid=4 and uitype=13;";
+	$querystr="select fieldid,fieldlabel,columnname from vtiger_field where tabid=4 and uitype=13;";
 }
 elseif ($pmodule=='Leads')
 {
-	$querystr="select vtiger_fieldid,fieldlabel,columnname from vtiger_field where vtiger_tabid=7 and uitype=13;";
+	$querystr="select fieldid,fieldlabel,columnname from vtiger_field where tabid=7 and uitype=13;";
 }
 
 $result=$adb->query($querystr);

Modified: vtigercrm/trunk/modules/Emails/ChooseEmail.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/ChooseEmail.php (original)
+++ vtigercrm/trunk/modules/Emails/ChooseEmail.php Thu Jun 15 10:51:15 2006
@@ -14,15 +14,15 @@
 
 if ($pmodule=='Accounts')
 {
-	$querystr="select vtiger_fieldid,fieldlabel,columnname,tablename from vtiger_field where vtiger_tabid=6 and uitype=13;"; 
+	$querystr="select fieldid,fieldlabel,columnname,tablename from vtiger_field where tabid=6 and uitype=13;"; 
 }
 elseif ($pmodule=='Contacts')
 {
-	$querystr="select vtiger_fieldid,fieldlabel,columnname from vtiger_field where vtiger_tabid=4 and uitype=13;";
+	$querystr="select fieldid,fieldlabel,columnname from vtiger_field where tabid=4 and uitype=13;";
 }
 elseif ($pmodule=='Leads')
 {
-	$querystr="select vtiger_fieldid,fieldlabel,columnname from vtiger_field where vtiger_tabid=7 and uitype=13;";
+	$querystr="select fieldid,fieldlabel,columnname from vtiger_field where tabid=7 and uitype=13;";
 }
 $result=$adb->query($querystr);
 $numrows = $adb->num_rows($result);

Modified: vtigercrm/trunk/modules/Emails/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/EditView.php (original)
+++ vtigercrm/trunk/modules/Emails/EditView.php Thu Jun 15 10:51:15 2006
@@ -96,7 +96,7 @@
 		elseif ($type == "Contacts")
 			$q = "select email as email1 from vtiger_contactdetails where contactid='".$rec_id."'";
 		elseif ($type == "Accounts")
-			$q = "select email1,email2 from vtiger_account where vtiger_accountid='".$rec_id."'";
+			$q = "select email1,email2 from vtiger_account where accountid='".$rec_id."'";
 
 		$email1 = $adb->query_result($adb->query($q),0,"email1");
 	} elseif ($rec_type == "email_addy") {
@@ -252,7 +252,7 @@
 
 if(isset($focus->parent_type) && $focus->parent_type != "") 
 {
-	$change_parent_button = "<input title='".$app_strings['LBL_CHANGE_BUTTON_TITLE']."' vtiger_tabindex='2' accessKey='".$app_strings['LBL_CHANGE_BUTTON_KEY']."' type='button' class='button' value='".$app_strings['LBL_CHANGE_BUTTON_LABEL']."' name='button' LANGUAGE=javascript onclick='return window.open(\"index.php?module=\"+ document.EditView.parent_type.value + \"&action=Popup&html=Popup_picker&form=TasksEditView\",\"test\",\"width=600,height=400,resizable=1,scrollbars=1\");'>";
+	$change_parent_button = "<input title='".$app_strings['LBL_CHANGE_BUTTON_TITLE']."' tabindex='2' accessKey='".$app_strings['LBL_CHANGE_BUTTON_KEY']."' type='button' class='button' value='".$app_strings['LBL_CHANGE_BUTTON_LABEL']."' name='button' LANGUAGE=javascript onclick='return window.open(\"index.php?module=\"+ document.EditView.parent_type.value + \"&action=Popup&html=Popup_picker&form=TasksEditView\",\"test\",\"width=600,height=400,resizable=1,scrollbars=1\");'>";
 	$smarty->assign("CHANGE_PARENT_BUTTON", $change_parent_button);
 }
 

Modified: vtigercrm/trunk/modules/Emails/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/ListView.php (original)
+++ vtigercrm/trunk/modules/Emails/ListView.php Thu Jun 15 10:51:15 2006
@@ -122,7 +122,7 @@
 }
 if($_REQUEST['folderid'] =='3')
 {
-	$list_query .= "AND vtiger_seactivityrel.crmid in (select vtiger_accountid from vtiger_account)";	
+	$list_query .= "AND vtiger_seactivityrel.crmid in (select accountid from vtiger_account)";	
 }
 if($_REQUEST['folderid'] =='4')
 {

Modified: vtigercrm/trunk/modules/Emails/class.phpmailer.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/class.phpmailer.php (original)
+++ vtigercrm/trunk/modules/Emails/class.phpmailer.php Thu Jun 15 10:51:15 2006
@@ -1089,7 +1089,7 @@
         }
         $magic_quotes = get_magic_quotes_runtime();
         set_magic_quotes_runtime(0);
-        $file_buffer = fread($fd, vtiger_filesize($path));
+        $file_buffer = fread($fd, filesize($path));
         $file_buffer = $this->EncodeString($file_buffer, $encoding);
         fclose($fd);
         set_magic_quotes_runtime($magic_quotes);
@@ -1496,4 +1496,4 @@
     }
 }
 
-?>
+?>

Modified: vtigercrm/trunk/modules/Emails/mailSelect.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/mailSelect.php (original)
+++ vtigercrm/trunk/modules/Emails/mailSelect.php Thu Jun 15 10:51:15 2006
@@ -24,15 +24,15 @@
 $smarty = new vtigerCRM_Smarty;
 if ($pmodule=='Accounts')
 {
-	$querystr="select vtiger_fieldid,fieldlabel,columnname,tablename from vtiger_field where vtiger_tabid=6 and uitype=13;"; 
+	$querystr="select fieldid,fieldlabel,columnname,tablename from vtiger_field where tabid=6 and uitype=13;"; 
 }
 elseif ($pmodule=='Contacts')
 {
-	$querystr="select vtiger_fieldid,fieldlabel,columnname from vtiger_field where vtiger_tabid=4 and uitype=13;";
+	$querystr="select fieldid,fieldlabel,columnname from vtiger_field where tabid=4 and uitype=13;";
 }
 elseif ($pmodule=='Leads')
 {
-	$querystr="select vtiger_fieldid,fieldlabel,columnname from vtiger_field where vtiger_tabid=7 and uitype=13;";
+	$querystr="select fieldid,fieldlabel,columnname from vtiger_field where tabid=7 and uitype=13;";
 }
 $result=$adb->query($querystr);
 $numrows = $adb->num_rows($result);

Modified: vtigercrm/trunk/modules/Emails/mailbox.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/mailbox.php (original)
+++ vtigercrm/trunk/modules/Emails/mailbox.php Thu Jun 15 10:51:15 2006
@@ -73,7 +73,7 @@
 	      
 	   function handleFile(nr) {
 	   	if (b != "ie") {
- 	      		alert("This feature is currently only available for Microsoft Internet Explorer 5.5+ vtiger_users\n\nWait for an update!");
+ 	      		alert("This feature is currently only available for Microsoft Internet Explorer 5.5+ users\n\nWait for an update!");
 	   	} else {
 	   		check = confirm("Do you want to download the file ?");
 			if (check) {

Modified: vtigercrm/trunk/modules/Emails/mailsend.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/mailsend.php (original)
+++ vtigercrm/trunk/modules/Emails/mailsend.php Thu Jun 15 10:51:15 2006
@@ -120,7 +120,7 @@
 		for ($j=1;$j<$nemail;$j++)
 		{
 			$temp=$realid[$j];
-			$myquery='Select columnname from vtiger_field where vtiger_fieldid='.$adb->quote($temp);
+			$myquery='Select columnname from vtiger_field where fieldid='.$adb->quote($temp);
 			$fresult=$adb->query($myquery);			
 			if ($pmodule=='Contacts')
 			{
@@ -180,7 +180,7 @@
 {
 	global $adb;
 	$date_var = date('Ymd');
-	$query = 'update vtiger_activity set date_start ='.$date_var.' where vtiger_activityid = '.$returnid;
+	$query = 'update vtiger_activity set date_start ='.$date_var.' where activityid = '.$returnid;
 	$adb->query($query);
 }
 //The following function call is used to parse and form a encoded error message and then pass to result page



From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 09:27:14 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 16:27:14 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231220=3A?=
 =?utf-8?q?_Usage_of_Sub-tabs_for_single_section?=
In-Reply-To: <076.0cb5c9c15de16babde2de07049fd9221@vtiger.fosslabs.com>
References: <076.0cb5c9c15de16babde2de07049fd9221@vtiger.fosslabs.com>
Message-ID: <085.69181a598d34a6bfba6a94e22ca22524@vtiger.fosslabs.com>

#1220: Usage of Sub-tabs for single section
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  saraj
      Type:  defect     |      Status:  new  
  Priority:  major      |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => saraj

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1220>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 09:35:46 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 16:35:46 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231229=3A?=
 =?utf-8?q?_LHS_panel_missing_for_System_Information=2E?=
In-Reply-To: <076.9948487d1aec14088b1363d9ae418188@vtiger.fosslabs.com>
References: <076.9948487d1aec14088b1363d9ae418188@vtiger.fosslabs.com>
Message-ID: <085.b48de2862ab17c9c821760f561a5bf19@vtiger.fosslabs.com>

#1229: LHS panel missing for System Information.
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  saraj
      Type:  defect     |      Status:  new  
  Priority:  major      |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => saraj

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1229>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 09:36:44 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 16:36:44 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231230=3A?=
 =?utf-8?q?_need_to_have_user_related_list?=
In-Reply-To: <076.425eb57365ab50184f38cc4f63b6a400@vtiger.fosslabs.com>
References: <076.425eb57365ab50184f38cc4f63b6a400@vtiger.fosslabs.com>
Message-ID: <085.c4162eb820dfb9cfaa8a7f4196753465@vtiger.fosslabs.com>

#1230: need to have user related list
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  developer
      Type:  defect     |      Status:  new      
  Priority:  major      |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.1    
Resolution:             |    Keywords:           
------------------------+---------------------------------------------------
Changes (by saraj):

  * version:  5.0.0 => 5.0.1

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1230>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 10:13:35 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 17:13:35 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231248=3A?=
	=?utf-8?q?_Invoice_/_SO_/_PO?=
In-Reply-To: <076.e4d8f1e341c634b1bfe89089253ec586@vtiger.fosslabs.com>
References: <076.e4d8f1e341c634b1bfe89089253ec586@vtiger.fosslabs.com>
Message-ID: <085.43dc5463509e77de0b80010b71f95d50@vtiger.fosslabs.com>

#1248: Invoice / SO / PO
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  mickie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1248>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 10:14:51 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 17:14:51 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231320=3A?=
 =?utf-8?q?_Adding_Products_in_Internet_Explorer?=
In-Reply-To: <076.5033f28ff91a008f6982f96dac47c920@vtiger.fosslabs.com>
References: <076.5033f28ff91a008f6982f96dac47c920@vtiger.fosslabs.com>
Message-ID: <085.b003d018a0666c487e35d3f8d35377e5@vtiger.fosslabs.com>

#1320: Adding Products in Internet Explorer
-------------------------+--------------------------------------------------
  Reporter:  arosewarne  |       Owner:  ela  
      Type:  defect      |      Status:  new  
  Priority:  major       |   Milestone:       
 Component:  vtigercrm   |     Version:  5.0.0
Resolution:              |    Keywords:       
-------------------------+--------------------------------------------------
Changes (by don):

  * owner:  developer => ela

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1320>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 10:21:47 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 17:21:47 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231319=3A?=
 =?utf-8?q?_Thunderbird_Connector_Bugs?=
In-Reply-To: <076.6c811b9cd61da3ae39b454241d719204@vtiger.fosslabs.com>
References: <076.6c811b9cd61da3ae39b454241d719204@vtiger.fosslabs.com>
Message-ID: <085.87e642387f0888c0149872cafa104172@vtiger.fosslabs.com>

#1319: Thunderbird Connector Bugs
------------------------------+---------------------------------------------
  Reporter:  anonymous        |       Owner:  mangai
      Type:  defect           |      Status:  new   
  Priority:  major            |   Milestone:        
 Component:  thunderbirdextn  |     Version:  5.0.0 
Resolution:                   |    Keywords:        
------------------------------+---------------------------------------------
Changes (by don):

  * owner:  developer => mangai

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1319>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 10:22:49 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 17:22:49 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231318=3A?=
 =?utf-8?q?_Outlook_Connector_Bugs?=
In-Reply-To: <076.efa3e47083b3f3c62106837df2debdd5@vtiger.fosslabs.com>
References: <076.efa3e47083b3f3c62106837df2debdd5@vtiger.fosslabs.com>
Message-ID: <085.596faf898c86ffb0802eddb996375b5e@vtiger.fosslabs.com>

#1318: Outlook Connector Bugs
----------------------------+-----------------------------------------------
  Reporter:  arosewarne     |       Owner:  sraj 
      Type:  defect         |      Status:  new  
  Priority:  major          |   Milestone:       
 Component:  outlookplugin  |     Version:  5.0.0
Resolution:                 |    Keywords:       
----------------------------+-----------------------------------------------
Changes (by don):

  * owner:  developer => sraj

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1318>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 10:23:06 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 17:23:06 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231313=3A?=
	=?utf-8?q?_Pop_up_size?=
In-Reply-To: <076.d5cfe0f287242a74ba422f819314f615@vtiger.fosslabs.com>
References: <076.d5cfe0f287242a74ba422f819314f615@vtiger.fosslabs.com>
Message-ID: <085.cee740ab570de66ae0adafa2ed0791af@vtiger.fosslabs.com>

#1313: Pop up size
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  ela                  
      Type:  defect     |      Status:  new                  
  Priority:  major      |   Milestone:                       
 Component:  vtigercrm  |     Version:  5.0.0                
Resolution:             |    Keywords:  email, report, pop up
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => ela

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1313>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 10:26:22 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 17:26:22 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231249=3A?=
	=?utf-8?q?_Task_Information?=
In-Reply-To: <076.e46a01212fb9981d78bbf6e6e2673af6@vtiger.fosslabs.com>
References: <076.e46a01212fb9981d78bbf6e6e2673af6@vtiger.fosslabs.com>
Message-ID: <085.b1eacd5cd246ba293ac02458f74df04e@vtiger.fosslabs.com>

#1249: Task Information
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  saraj
      Type:  defect     |      Status:  new  
  Priority:  major      |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => saraj

Comment:

 Expected

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1249>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 10:26:42 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 17:26:42 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231253=3A?=
 =?utf-8?q?_Campaigns_Cannot_Assign_To_Existing_Contacts=2C_Leads_or_Accou?=
 =?utf-8?q?nts?=
In-Reply-To: <076.329f0bfa1e61cd49791cee91bbc8d6ba@vtiger.fosslabs.com>
References: <076.329f0bfa1e61cd49791cee91bbc8d6ba@vtiger.fosslabs.com>
Message-ID: <085.ce59151b2bce41c060ebefeafd974893@vtiger.fosslabs.com>

#1253: Campaigns Cannot Assign To Existing Contacts, Leads or Accounts
------------------------------------+---------------------------------------
  Reporter:  robbie-w at boston.ac.uk  |       Owner:  mangai
      Type:  task                   |      Status:  new   
  Priority:  major                  |   Milestone:        
 Component:  vtigercrm              |     Version:  5.0.0 
Resolution:                         |    Keywords:        
------------------------------------+---------------------------------------
Changes (by saraj):

  * owner:  developer => mangai

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1253>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 10:27:14 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 17:27:14 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231303=3A?=
 =?utf-8?q?_Invoice=2C_Sales_Orders=2C_Quotes?=
In-Reply-To: <076.3417cd31c74551f10ccb510284b2b2f8@vtiger.fosslabs.com>
References: <076.3417cd31c74551f10ccb510284b2b2f8@vtiger.fosslabs.com>
Message-ID: <085.b4b6f14e6ce0be6a42fc067437768b8b@vtiger.fosslabs.com>

#1303: Invoice, Sales Orders, Quotes
---------------------------+------------------------------------------------
  Reporter:  anthony11221  |       Owner:  mickie                   
      Type:  defect        |      Status:  new                      
  Priority:  major         |   Milestone:  5.0.0                    
 Component:  vtigercrm     |     Version:  5.0.0                    
Resolution:                |    Keywords:  invoice sales order quote
---------------------------+------------------------------------------------
Changes (by don):

  * owner:  developer => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1303>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 10:27:34 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 17:27:34 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231311=3A?=
 =?utf-8?q?_Error_on_report_module_link?=
In-Reply-To: <076.c88d9dad0e512beb782fc9feab6fceee@vtiger.fosslabs.com>
References: <076.c88d9dad0e512beb782fc9feab6fceee@vtiger.fosslabs.com>
Message-ID: <085.27ae10d8dc1e9e3be363fe8e0265e944@vtiger.fosslabs.com>

#1311: Error on report module link
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  jeri                
      Type:  defect     |      Status:  new                 
  Priority:  major      |   Milestone:                      
 Component:  vtigercrm  |     Version:  5.0.0               
Resolution:             |    Keywords:  reports, translation
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => jeri

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1311>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 10:29:23 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 17:29:23 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231255=3A?=
 =?utf-8?q?_Adding_products_to_leads=2C_contacts_or_potentials_-_should_se?=
 =?utf-8?q?lect_from_a_list_of_existing?=
In-Reply-To: <076.deb11edc283ea7cd73ede48a39d03e8e@vtiger.fosslabs.com>
References: <076.deb11edc283ea7cd73ede48a39d03e8e@vtiger.fosslabs.com>
Message-ID: <085.e895aac02174c3d7cff7412780dbb228@vtiger.fosslabs.com>

#1255: Adding products to leads, contacts or potentials - should select from a
list of existing
-------------------------+--------------------------------------------------
  Reporter:  arosewarne  |       Owner:  saraj
      Type:  defect      |      Status:  new  
  Priority:  major       |   Milestone:       
 Component:  vtigercrm   |     Version:  5.0.1
Resolution:              |    Keywords:       
-------------------------+--------------------------------------------------
Changes (by saraj):

  * version:  5.0.0 => 5.0.1
  * owner:  developer => saraj

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1255>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 10:30:40 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 17:30:40 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231258=3A?=
 =?utf-8?q?_Can=27t_create_custom_fields?=
In-Reply-To: <076.e2de34810640366206140549ecde537d@vtiger.fosslabs.com>
References: <076.e2de34810640366206140549ecde537d@vtiger.fosslabs.com>
Message-ID: <085.64755780a1ececf4113964f821544821@vtiger.fosslabs.com>

#1258: Can't create custom fields
------------------------+---------------------------------------------------
  Reporter:  nik        |       Owner:  mangai
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => mangai

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1258>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 10:31:28 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 17:31:28 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231294=3A?=
 =?utf-8?q?_Picklist_/_Custom_Fields_Error?=
In-Reply-To: <076.0f035f4d3e1919336e3dcf1142be6790@vtiger.fosslabs.com>
References: <076.0f035f4d3e1919336e3dcf1142be6790@vtiger.fosslabs.com>
Message-ID: <085.ee200880f70e021cd087c05cd0b022da@vtiger.fosslabs.com>

#1294: Picklist / Custom Fields Error
------------------------+---------------------------------------------------
  Reporter:  JHoevel    |       Owner:  mangai
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => mangai

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1294>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 10:32:36 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 17:32:36 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231293=3A?=
 =?utf-8?q?_Select_Products_missing_from_Activities_in_5=2E0?=
In-Reply-To: <076.0fa458c2ddcf4a4ee4262524258defbd@vtiger.fosslabs.com>
References: <076.0fa458c2ddcf4a4ee4262524258defbd@vtiger.fosslabs.com>
Message-ID: <085.ef1ddb0ed2167ae859669050490b76ab@vtiger.fosslabs.com>

#1293: Select Products missing from Activities in 5.0
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  ahmed
      Type:  defect     |      Status:  new  
  Priority:  major      |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => ahmed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1293>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 10:32:52 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 17:32:52 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231282=3A?=
 =?utf-8?q?_Problems_with_graphs_-_Sales_Orders_by_Account?=
In-Reply-To: <076.9cc8264925ac84b43a6a0aafbcf08aae@vtiger.fosslabs.com>
References: <076.9cc8264925ac84b43a6a0aafbcf08aae@vtiger.fosslabs.com>
Message-ID: <085.3d536bd3c47e52d99b8880f0fc3be705@vtiger.fosslabs.com>

#1282: Problems with graphs - Sales Orders by Account
-------------------------+--------------------------------------------------
  Reporter:  arosewarne  |       Owner:  mangai         
      Type:  defect      |      Status:  new            
  Priority:  major       |   Milestone:                 
 Component:  vtigercrm   |     Version:  5.0.0          
Resolution:              |    Keywords:  analytics graph
-------------------------+--------------------------------------------------
Changes (by don):

  * owner:  developer => mangai

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1282>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 10:32:49 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 17:32:49 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231260=3A?=
 =?utf-8?q?_i18n_issue_at_activities?=
In-Reply-To: <076.bf2281a02d95e6f032d828d0839694a6@vtiger.fosslabs.com>
References: <076.bf2281a02d95e6f032d828d0839694a6@vtiger.fosslabs.com>
Message-ID: <085.f479553389ff918b255a27de56ac07aa@vtiger.fosslabs.com>

#1260: i18n issue at activities
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  mangai
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => mangai

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1260>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 10:33:13 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 17:33:13 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231279=3A?=
 =?utf-8?q?_database_creation_error_problems_afterword?=
In-Reply-To: <076.fb2022c8962a6bd349bf1145132bfaa6@vtiger.fosslabs.com>
References: <076.fb2022c8962a6bd349bf1145132bfaa6@vtiger.fosslabs.com>
Message-ID: <085.97fc6e2b3eac50414a23e775e635db03@vtiger.fosslabs.com>

#1279: database creation error problems afterword
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  jeri 
      Type:  defect     |      Status:  new  
  Priority:  major      |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => jeri

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1279>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 10:33:33 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 17:33:33 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231277=3A?=
 =?utf-8?q?_Can=27t_translate_term_close_without_problem?=
In-Reply-To: <076.d518c5251779ede24caf171d8d809788@vtiger.fosslabs.com>
References: <076.d518c5251779ede24caf171d8d809788@vtiger.fosslabs.com>
Message-ID: <085.cccc46759238f7c12441c4856e819eea@vtiger.fosslabs.com>

#1277: Can't translate term close without problem
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  ahmed
      Type:  defect     |      Status:  new  
  Priority:  major      |   Milestone:  5.0.0
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => ahmed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1277>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 10:33:44 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 17:33:44 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231270=3A?=
 =?utf-8?q?_Picklist_editor_not_exist_for_invoices?=
In-Reply-To: <076.9bd0e7d72add51e29114ababf0f13b67@vtiger.fosslabs.com>
References: <076.9bd0e7d72add51e29114ababf0f13b67@vtiger.fosslabs.com>
Message-ID: <085.ed29814e1607c7d286ab9e82a77efe77@vtiger.fosslabs.com>

#1270: Picklist editor not exist for invoices
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  mangai            
      Type:  defect     |      Status:  new               
  Priority:  major      |   Milestone:  5.0.0             
 Component:  vtigercrm  |     Version:  5.0.0             
Resolution:             |    Keywords:  invoices, picklist
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => mangai

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1270>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 10:33:59 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 17:33:59 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231265=3A?=
 =?utf-8?q?_Global_Search_Function_throws_error?=
In-Reply-To: <076.76671c46776deb9518824e095947cbde@vtiger.fosslabs.com>
References: <076.76671c46776deb9518824e095947cbde@vtiger.fosslabs.com>
Message-ID: <085.d2ef5f6739f1cb98fbe3948c6d2352bf@vtiger.fosslabs.com>

#1265: Global Search Function throws error
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  mickie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1265>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 10:34:00 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 17:34:00 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231262=3A?=
 =?utf-8?q?_Products_not_being_listed_against_Accounts_when_Sales_Order/In?=
 =?utf-8?q?voice_created?=
In-Reply-To: <076.fd68f0c276cf51384c7c588eeaea61be@vtiger.fosslabs.com>
References: <076.fd68f0c276cf51384c7c588eeaea61be@vtiger.fosslabs.com>
Message-ID: <085.8a2543332b718d7a2d21167cdf5d2234@vtiger.fosslabs.com>

#1262: Products not being listed against Accounts when Sales Order/Invoice created
----------------------------------+-----------------------------------------
  Reporter:  thealbs at yahoo.co.uk  |       Owner:  saraj   
      Type:  defect               |      Status:  new     
  Priority:  major                |   Milestone:          
 Component:  vtigercrm            |     Version:  5.0.0   
Resolution:                       |    Keywords:  products
----------------------------------+-----------------------------------------
Changes (by saraj):

  * owner:  developer => saraj

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1262>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 10:34:28 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 17:34:28 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231264=3A?=
 =?utf-8?q?_MsSql_and_IIS_--_Please?=
In-Reply-To: <076.38e4ee7739ea23c2b97e6055bc35f7d1@vtiger.fosslabs.com>
References: <076.38e4ee7739ea23c2b97e6055bc35f7d1@vtiger.fosslabs.com>
Message-ID: <085.71a7268c7d134faa7a780277fd4896aa@vtiger.fosslabs.com>

#1264: MsSql and IIS -- Please
-------------------------------------------+--------------------------------
  Reporter:  joe.green at heartlandfarms.com  |       Owner:  developer
      Type:  defect                        |      Status:  new      
  Priority:  major                         |   Milestone:           
 Component:  vtigercrm                     |     Version:  5.0.1    
Resolution:                                |    Keywords:           
-------------------------------------------+--------------------------------
Changes (by saraj):

  * version:  5.0.0 => 5.0.1

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1264>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 10:34:56 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 17:34:56 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231269=3A?=
 =?utf-8?q?_Picklist_editing_impossible_when_customfield_created?=
In-Reply-To: <076.0ac8352198014e97e1e06ac4c87ba236@vtiger.fosslabs.com>
References: <076.0ac8352198014e97e1e06ac4c87ba236@vtiger.fosslabs.com>
Message-ID: <085.9dbf90fa6577f948acbbcbab59cc94c7@vtiger.fosslabs.com>

#1269: Picklist editing impossible when customfield created
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  mangai
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => mangai

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1269>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 10:34:57 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 17:34:57 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231265=3A?=
 =?utf-8?q?_Global_Search_Function_throws_error?=
In-Reply-To: <076.76671c46776deb9518824e095947cbde@vtiger.fosslabs.com>
References: <076.76671c46776deb9518824e095947cbde@vtiger.fosslabs.com>
Message-ID: <085.aa9d2fd0167e59d87beeb82b70601af9@vtiger.fosslabs.com>

#1265: Global Search Function throws error
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  mickie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1265>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 10:35:26 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 17:35:26 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231266=3A?=
 =?utf-8?q?_Email_Opt-out_missing_in_Leads?=
In-Reply-To: <076.98612190c9a98af18e148b6e53d138fc@vtiger.fosslabs.com>
References: <076.98612190c9a98af18e148b6e53d138fc@vtiger.fosslabs.com>
Message-ID: <085.89be2cdd21716f42489bc7dedbfb3c19@vtiger.fosslabs.com>

#1266: Email Opt-out missing in Leads
--------------------------+-------------------------------------------------
  Reporter:  gopal        |       Owner:  developer
      Type:  enhancement  |      Status:  new      
  Priority:  major        |   Milestone:           
 Component:  vtigercrm    |     Version:  5.0.1    
Resolution:               |    Keywords:           
--------------------------+-------------------------------------------------
Changes (by saraj):

  * version:  5.0.0 => 5.0.1

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1266>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 10:36:43 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 17:36:43 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=23789=3A_?=
	=?utf-8?q?Picklist_Settings?=
In-Reply-To: <076.cbf12ece226925b117517ea71d90b26b@vtiger.fosslabs.com>
References: <076.cbf12ece226925b117517ea71d90b26b@vtiger.fosslabs.com>
Message-ID: <085.08f48df1650dded28b2d7e129fe11888@vtiger.fosslabs.com>

#789: Picklist Settings
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  developer
      Type:  defect     |      Status:  new      
  Priority:  major      |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.1    
Resolution:             |    Keywords:           
------------------------+---------------------------------------------------
Changes (by saraj):

  * version:  5.0.0 => 5.0.1

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/789>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 10:45:27 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 17:45:27 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231325=3A?=
 =?utf-8?q?_reference_all_clanups_of_vtiger=5F_table_prefix_to_trac_ticket?=
Message-ID: <076.dc2b0777399119340aa2cb60903488d4@vtiger.fosslabs.com>

#1325: reference all clanups of vtiger_ table prefix to trac ticket
-----------------------+----------------------------------------------------
 Reporter:  jeffk      |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  major      |   Milestone:  5.0.0    
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:  database   |  
-----------------------+----------------------------------------------------
 The vtiger_ table prefix introduced in r7003 and r7004, will necessitate
 many cleanups. The following checkins should have referenced a bug like
 this one. Future checkins please use 'refs #1325', so we can collect these
 related changesets.

  * r7150
  * r7149
  * r7132
  * r7126
  * r7123
  * r7122
  * r7121
  * r7119
  * r7118
  * r7117
  * r7114
  * r7113
  * r7112
  * r7111
  * r7110
  * r7109
  * r7108
  * r7107
  * r7106
  * r7105
  * r7104
  * r7103
  * r7102
  * r7101
  * r7100
  * r7099
  * r7098
  * r7097
  * r7096
  * r7095
  * r7094
  * r7093
  * r7085
  * r7004
  * r7003

 Ticket to question wisdom of changeset is deprecated, but not yet closed.
 Configurable prefixing using adodb features may be discussed there.

 #1298: revert r7003:7004 prefix vtiger_ to all tablenames

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1325>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 10:48:30 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 17:48:30 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23842=3A_?=
 =?utf-8?q?Settings_=3E_Studio_=3E_Edit_Field_Blocks_=3E_Lead_Field_Access?=
In-Reply-To: <076.d63efdd85ec6ace106fdc96d0c6667d5@vtiger.fosslabs.com>
References: <076.d63efdd85ec6ace106fdc96d0c6667d5@vtiger.fosslabs.com>
Message-ID: <085.47c3b321ee164c9a9df623fba60d2cd5@vtiger.fosslabs.com>

#842: Settings > Studio > Edit Field Blocks > Lead Field Access
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  anonymous
      Type:  defect     |      Status:  assigned 
  Priority:  major      |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.1    
Resolution:             |    Keywords:           
------------------------+---------------------------------------------------
Changes (by don):

  * version:  5.0.0 => 5.0.1

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/842>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 10:28:16 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 17:28:16 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231300=3A?=
 =?utf-8?q?_Google_Maps_support_by_way_integrating_third-party_Google_Maps?=
 =?utf-8?q?_API_library?=
In-Reply-To: <076.caa8db848bf4889be2ed2b950d38a6e9@vtiger.fosslabs.com>
References: <076.caa8db848bf4889be2ed2b950d38a6e9@vtiger.fosslabs.com>
Message-ID: <085.5e0834253b006def9b80cbc82333924b@vtiger.fosslabs.com>

#1300: Google Maps support by way integrating third-party Google Maps API library
------------------------+---------------------------------------------------
  Reporter:  jeffk      |       Owner:  developer                       
      Type:  defect     |      Status:  new                             
  Priority:  major      |   Milestone:  5.0.0                           
 Component:  vtigercrm  |     Version:  5.0.1                           
Resolution:             |    Keywords:  maps google third-party snapshot
------------------------+---------------------------------------------------
Changes (by don):

  * version:  5.0.0 => 5.0.1

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1300>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 10:30:15 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 17:30:15 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231257=3A?=
 =?utf-8?q?_calender-_time_display_should_start_earlier_instead_of_10=2E00?=
 =?utf-8?q?_am?=
In-Reply-To: <076.d27bacbd23f52c8c928d56ba5872fc60@vtiger.fosslabs.com>
References: <076.d27bacbd23f52c8c928d56ba5872fc60@vtiger.fosslabs.com>
Message-ID: <085.4a9db32961ed85041a0e0b241ac02c60@vtiger.fosslabs.com>

#1257: calender- time display should start earlier instead of 10.00 am
--------------------------+-------------------------------------------------
  Reporter:  ftc          |       Owner:  mangai
      Type:  enhancement  |      Status:  new   
  Priority:  major        |   Milestone:        
 Component:  vtigercrm    |     Version:  5.0.0 
Resolution:               |    Keywords:        
--------------------------+-------------------------------------------------
Changes (by saraj):

  * owner:  developer => mangai

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1257>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 10:27:51 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 17:27:51 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231307=3A?=
 =?utf-8?q?_Print_function_missing_in_Beta?=
In-Reply-To: <076.d87e178fda241c6536574413a592943f@vtiger.fosslabs.com>
References: <076.d87e178fda241c6536574413a592943f@vtiger.fosslabs.com>
Message-ID: <085.7c4d9d0617f31fb0e8ae0bbbc050f2e3@vtiger.fosslabs.com>

#1307: Print function missing in Beta
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  ahmed
      Type:  defect     |      Status:  new  
  Priority:  major      |   Milestone:  5.0.0
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => ahmed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1307>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 10:49:05 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 17:49:05 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231325=3A?=
 =?utf-8?q?_reference_all_clanups_of_vtiger=5F_table_prefix_to_trac_ticket?=
In-Reply-To: <076.dc2b0777399119340aa2cb60903488d4@vtiger.fosslabs.com>
References: <076.dc2b0777399119340aa2cb60903488d4@vtiger.fosslabs.com>
Message-ID: <085.1088b5959a4d0032eab01ff9b158cef6@vtiger.fosslabs.com>

#1325: reference all clanups of vtiger_ table prefix to trac ticket
------------------------+---------------------------------------------------
  Reporter:  jeffk      |       Owner:  don     
      Type:  defect     |      Status:  new     
  Priority:  major      |   Milestone:  5.0.0   
 Component:  vtigercrm  |     Version:  5.0.0   
Resolution:             |    Keywords:  database
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => don

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1325>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 10:49:42 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 17:49:42 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=2319=3A_v?=
 =?utf-8?q?tiger_team_start_to_merge_relevant_branches/4=2E2_changes?=
In-Reply-To: <076.daa670ff81a40e9078f708efc9d0a64f@vtiger.fosslabs.com>
References: <076.daa670ff81a40e9078f708efc9d0a64f@vtiger.fosslabs.com>
Message-ID: <085.86f248140a4cd658a2a97fdd1ee52931@vtiger.fosslabs.com>

#19: vtiger team start to merge relevant branches/4.2 changes
------------------------+---------------------------------------------------
  Reporter:  jeffk      |       Owner:  developer
      Type:  task       |      Status:  new      
  Priority:  major      |   Milestone:  5.0.0    
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:             |    Keywords:  process  
------------------------+---------------------------------------------------
Changes (by don):

  * type:  defect => task

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/19>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 10:50:03 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 17:50:03 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231096=3A?=
 =?utf-8?q?_Change_=22My_Home_Page=22_to_=22Home=22?=
In-Reply-To: <076.50f200c2a1dbfab77f88a21e59e45693@vtiger.fosslabs.com>
References: <076.50f200c2a1dbfab77f88a21e59e45693@vtiger.fosslabs.com>
Message-ID: <085.347f40631729b0d6f94e9384bb61e408@vtiger.fosslabs.com>

#1096: Change "My Home Page" to "Home"
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  ahmed
      Type:  defect     |      Status:  new  
  Priority:  minor      |   Milestone:  5.0.0
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => ahmed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1096>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 12:28:05 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 19:28:05 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231302=3A?=
 =?utf-8?q?_Update_to_new_adodb-4=2E90_release?=
In-Reply-To: <076.cfae0e78298741dfce9c6a4f41a70218@vtiger.fosslabs.com>
References: <076.cfae0e78298741dfce9c6a4f41a70218@vtiger.fosslabs.com>
Message-ID: <085.513790e7117ea060d946d1cb93ae6280@vtiger.fosslabs.com>

#1302: Update to new adodb-4.90 release
------------------------+---------------------------------------------------
  Reporter:  jeffk      |       Owner:  jeffk                 
      Type:  defect     |      Status:  new                   
  Priority:  major      |   Milestone:  5.0.0                 
 Component:  vtigercrm  |     Version:  5.0.0                 
Resolution:             |    Keywords:  adodb database package
------------------------+---------------------------------------------------
Comment (by allanbush):

 I'd go ahead and do this on both the 4.2 branch and the trunk.  I don't
 see anything that will help us in particular but nothing should break.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1302>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 12:43:22 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 19:43:22 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23748=3A_?=
 =?utf-8?q?Eliminate_php_notice_errors?=
In-Reply-To: <076.c75696aed703c24c8b151bd87264b9e6@vtiger.fosslabs.com>
References: <076.c75696aed703c24c8b151bd87264b9e6@vtiger.fosslabs.com>
Message-ID: <085.fe7e8288b0785396ce85fbd413e44b97@vtiger.fosslabs.com>

#748: Eliminate php notice errors
------------------------+---------------------------------------------------
  Reporter:  allanbush  |       Owner:  anonymous
      Type:  task       |      Status:  assigned 
  Priority:  minor      |   Milestone:  4.2.5    
 Component:  vtigercrm  |     Version:  4.2.4rc3 
Resolution:             |    Keywords:           
------------------------+---------------------------------------------------
Changes (by anonymous):

  * status:  new => assigned
  * owner:  jrydbeck => anonymous

Comment:

 Uploaded initial changeset [7148].  A significant number of changes are
 similar to the following case:
 {{{
 function iAmAnExample($x)
 {
   if ($x == 2)
   {
     $var = 123;
   }

   return ($var + 4);  // error thrown here if $x wasn't 2; $var wasn't
 initialized
 }
 }}}

 This stuff throws errors in PHP; presuming the 'IF' block didn't test true
 and execute, $var hasn't been initialized.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/748>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 13:42:23 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 20:42:23 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231326=3A?=
 =?utf-8?q?_Auto_Tax_and_quote_workflow_improvement?=
Message-ID: <076.151dc33d86c777ebfd974d4b1529c9ea@vtiger.fosslabs.com>

#1326: Auto Tax and quote workflow improvement
--------------------------------------+-------------------------------------
 Reporter:  mvhman                    |       Owner:  developer
     Type:  defect                    |      Status:  new      
 Priority:  major                     |   Milestone:  5.0.0    
Component:  vtigercrm                 |     Version:  5.0.0    
 Keywords:  auto tax improved quotes  |  
--------------------------------------+-------------------------------------
 I do not understand how quotes work in vtiger5beta. There seems to be
 complex pricing books, but when it comes to adding discounts, automatic
 tax and adjustments, it does not seem to cover the basics of a quote. As
 well as when printing to PDF, the quotes come out with the tax included in
 line items but excluded from subtotal. Not structured.
 Maybe someone could clear this up for me, as I am not sure whether it is
 vtiger or me thats confused.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1326>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 17:35:14 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 00:35:14 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231314=3A?=
 =?utf-8?q?_Create_a_4=2E2=2E4=2E1_release?=
In-Reply-To: <076.0bb25652495a5800a354264247f65b15@vtiger.fosslabs.com>
References: <076.0bb25652495a5800a354264247f65b15@vtiger.fosslabs.com>
Message-ID: <085.35d802460cb9e920e456717cfabfde8a@vtiger.fosslabs.com>

#1314: Create a 4.2.4.1 release
------------------------+---------------------------------------------------
  Reporter:  allanbush  |       Owner:  developer
      Type:  defect     |      Status:  new      
  Priority:  major      |   Milestone:  4.2.4    
 Component:  vtigercrm  |     Version:  4.2.4rc3 
Resolution:             |    Keywords:           
------------------------+---------------------------------------------------
Comment (by allanbush):

 Apparently I'm not authorized to create a branch.

 Could someone with the proper access please do this.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1314>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 20:54:02 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 03:54:02 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231036=3A?=
 =?utf-8?q?_campaign_-_contact=2C_lead_relatedlist_issue?=
In-Reply-To: <076.8fe1163333beca0ce17a56ea62d1f555@vtiger.fosslabs.com>
References: <076.8fe1163333beca0ce17a56ea62d1f555@vtiger.fosslabs.com>
Message-ID: <085.f9ae503633af6a3788e93a6520b185b7@vtiger.fosslabs.com>

#1036: campaign - contact, lead relatedlist issue
--------------------------+-------------------------------------------------
  Reporter:  mickie       |       Owner:  mangai
      Type:  enhancement  |      Status:  new   
  Priority:  major        |   Milestone:        
 Component:  vtigercrm    |     Version:  5.0.0 
Resolution:               |    Keywords:        
--------------------------+-------------------------------------------------
Comment (by mangai):

 fixed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1036>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 20:54:22 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 03:54:22 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231036=3A?=
 =?utf-8?q?_campaign_-_contact=2C_lead_relatedlist_issue?=
In-Reply-To: <076.8fe1163333beca0ce17a56ea62d1f555@vtiger.fosslabs.com>
References: <076.8fe1163333beca0ce17a56ea62d1f555@vtiger.fosslabs.com>
Message-ID: <085.c154f0209c4fa2fe1d47818c03233760@vtiger.fosslabs.com>

#1036: campaign - contact, lead relatedlist issue
--------------------------+-------------------------------------------------
  Reporter:  mickie       |       Owner:  mangai
      Type:  enhancement  |      Status:  closed
  Priority:  major        |   Milestone:        
 Component:  vtigercrm    |     Version:  5.0.0 
Resolution:  fixed        |    Keywords:        
--------------------------+-------------------------------------------------
Changes (by mangai):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1036>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 21:54:44 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 04:54:44 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231269=3A?=
 =?utf-8?q?_Picklist_editing_impossible_when_customfield_created?=
In-Reply-To: <076.0ac8352198014e97e1e06ac4c87ba236@vtiger.fosslabs.com>
References: <076.0ac8352198014e97e1e06ac4c87ba236@vtiger.fosslabs.com>
Message-ID: <085.4f354fb8d9ba5c05e6695f62d0596b8a@vtiger.fosslabs.com>

#1269: Picklist editing impossible when customfield created
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  mangai
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  duplicate  |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mangai):

  * resolution:  => duplicate
  * status:  new => closed

Comment:

 id:1294

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1269>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 21:56:16 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 04:56:16 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231294=3A?=
 =?utf-8?q?_Picklist_/_Custom_Fields_Error?=
In-Reply-To: <076.0f035f4d3e1919336e3dcf1142be6790@vtiger.fosslabs.com>
References: <076.0f035f4d3e1919336e3dcf1142be6790@vtiger.fosslabs.com>
Message-ID: <085.3af3c73c3a2b0687f104d85c36eba991@vtiger.fosslabs.com>

#1294: Picklist / Custom Fields Error
------------------------+---------------------------------------------------
  Reporter:  JHoevel    |       Owner:  mangai
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  duplicate  |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mangai):

  * resolution:  => duplicate
  * status:  new => closed

Comment:

 Id:1322

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1294>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 21:58:11 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 04:58:11 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231174=3A?=
 =?utf-8?q?_unable_to_change_months/years_from_mini-calendar?=
In-Reply-To: <076.2ef668b0f99e11dc546be8a077110184@vtiger.fosslabs.com>
References: <076.2ef668b0f99e11dc546be8a077110184@vtiger.fosslabs.com>
Message-ID: <085.d8376802844c22814701ec3ce70ac807@vtiger.fosslabs.com>

#1174: unable to change months/years from mini-calendar
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  mangai
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  duplicate  |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mangai):

  * resolution:  => duplicate
  * status:  new => closed

Comment:

 Id:1030

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1174>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 22:03:49 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 05:03:49 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231152=3A?=
 =?utf-8?q?_cannot_go_to_different_months/years__from_popup_calendar?=
In-Reply-To: <076.305f67d0510043ae0fbe7bd653f4aa48@vtiger.fosslabs.com>
References: <076.305f67d0510043ae0fbe7bd653f4aa48@vtiger.fosslabs.com>
Message-ID: <085.932eabc3587c6f33f47ce18865d15d31@vtiger.fosslabs.com>

#1152: cannot go to different months/years  from popup calendar
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  mangai
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mangai):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 Id:1030

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1152>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 22:06:40 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 05:06:40 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231035=3A?=
 =?utf-8?q?_parent_not_shown_in_new_contact_page_from_campaigns?=
In-Reply-To: <076.c9bee8e3710559047c6624af68bf079e@vtiger.fosslabs.com>
References: <076.c9bee8e3710559047c6624af68bf079e@vtiger.fosslabs.com>
Message-ID: <085.918cbed9bdce9b5dd94eb6c4ef992f25@vtiger.fosslabs.com>

#1035: parent not shown in new contact page from campaigns
--------------------------+-------------------------------------------------
  Reporter:  mickie       |       Owner:  mangai
      Type:  enhancement  |      Status:  closed
  Priority:  major        |   Milestone:        
 Component:  vtigercrm    |     Version:  5.0.0 
Resolution:  fixed        |    Keywords:        
--------------------------+-------------------------------------------------
Changes (by mangai):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 fixed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1035>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 22:27:54 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 05:27:54 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23914=3A_?=
 =?utf-8?q?Sales_=3E_Quotes_=3E_Detail_View?=
In-Reply-To: <076.51b57cd15fe20b42398ea79fb1064f23@vtiger.fosslabs.com>
References: <076.51b57cd15fe20b42398ea79fb1064f23@vtiger.fosslabs.com>
Message-ID: <085.01c00b3f422fefdeb8ca27761bc0a5a4@vtiger.fosslabs.com>

#914: Sales > Quotes > Detail View
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  mickie
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mickie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 This issue has been fixed as now we have remove the buttons and provided
 the links. In the mean time we have removed the links which are non
 functional. we will provide these links once we have made that work in
 future relases.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/914>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 22:34:28 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 05:34:28 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=23965=3A_?= =?utf-8?q?FAQ?=
In-Reply-To: <076.6d8684c7a7aea333e48cd0c6ba6467b4@vtiger.fosslabs.com>
References: <076.6d8684c7a7aea333e48cd0c6ba6467b4@vtiger.fosslabs.com>
Message-ID: <085.874431e7d550d1a9e4592f24414c921e@vtiger.fosslabs.com>

#965: FAQ
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  mickie
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mickie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 This issue has been fixed and is available from 5.0Beta.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/965>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 22:34:41 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 05:34:41 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7151 -
	/vtigercrm/trunk/Smarty/templates/RelatedLists.tpl
Message-ID: <20060616053441.A5E917ED2CE@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 15 23:34:37 2006
New Revision: 7151

Log:
select contact has been included in campaign related list

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

Modified: vtigercrm/trunk/Smarty/templates/RelatedLists.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/RelatedLists.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/RelatedLists.tpl Thu Jun 15 23:34:37 2006
@@ -91,7 +91,7 @@
 							{elseif $header eq 'Leads'}
                                                         <input title="{$APP.LBL_ADD_NEW} {$APP.Lead}" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='Leads'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Lead}"></td>
 							{elseif $header eq 'Contacts' }
-							{if $MODULE eq 'Activities' || $MODULE eq 'Potentials' || $MODULE eq 'Vendors'}
+							{if $MODULE eq 'Activities' || $MODULE eq 'Potentials' || $MODULE eq 'Vendors' || $MODULE eq 'Campaigns'}
                                                         <input title="Change" accessKey="" class="small" value="{$APP.LBL_SELECT_BUTTON_LABEL} {$APP.Contact}" LANGUAGE=javascript onclick='return window.open("index.php?module=Contacts&return_module={$MODULE}&action=Popup&popuptype=detailview&select=enable&form=EditView&form_submit=false&recordid={$ID}","test","width=640,height=570,resizable=0,scrollbars=0");' type="button"  name="button"></td>
 							{elseif $MODULE eq 'Emails'}
 							<input title="{$APP.LBL_BULK_MAILS}" accessykey="F" class="small" onclick="this.form.action.value='sendmail';this.form.return_action.value='DetailView';this.form.module.value='Emails';this.form.return_module.value='Emails';" name="button" value="{$APP.LBL_BULK_MAILS}" type="submit">&nbsp;



From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 22:45:21 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 05:45:21 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231071=3A?=
 =?utf-8?q?_FAQ_Detail_View_=22Save=22_not_working?=
In-Reply-To: <076.651331afa5aa806fc7b30ae0e7a3feb5@vtiger.fosslabs.com>
References: <076.651331afa5aa806fc7b30ae0e7a3feb5@vtiger.fosslabs.com>
Message-ID: <085.2ed47753e846aed7f141af2cbe6e1569@vtiger.fosslabs.com>

#1071: FAQ Detail View "Save" not working
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  mickie
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mickie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 This issue has been fixed and you can find it working in 5.0 Beta

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1071>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 22:46:25 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 05:46:25 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231078=3A?=
 =?utf-8?q?_Import_Products=2C_last_step?=
In-Reply-To: <076.057c37e4d4720839331492b5e07b914c@vtiger.fosslabs.com>
References: <076.057c37e4d4720839331492b5e07b914c@vtiger.fosslabs.com>
Message-ID: <085.2af571daefa91b651fe9635a4484ea6e@vtiger.fosslabs.com>

#1078: Import Products, last step
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  mickie
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mickie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 In 5.0Beta we have fixed these issues. if you still face this problem then
 please let us know and reopen this ticket.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1078>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 22:56:21 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 05:56:21 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7152 - in
 /vtigercrm/trunk/modules: Invoice/CreatePDF.php PurchaseOrder/CreatePDF.php
 Quotes/CreatePDF.php SalesOrder/CreateSOPDF.php
Message-ID: <20060616055622.1E0F07ED2CC@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 15 23:56:15 2006
New Revision: 7152

Log:
* Removed the vtiger prefix which have been added for the table's columnnames

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

Modified: vtigercrm/trunk/modules/Invoice/CreatePDF.php
==============================================================================
--- vtigercrm/trunk/modules/Invoice/CreatePDF.php (original)
+++ vtigercrm/trunk/modules/Invoice/CreatePDF.php Thu Jun 15 23:56:15 2006
@@ -15,7 +15,7 @@
 require_once('include/database/PearDatabase.php');
 
 global $adb,$app_strings,$products_per_page;
-$sql="select vtiger_currency_symbol from vtiger_currency_info";
+$sql="select currency_symbol from vtiger_currency_info";
 $result = $adb->query($sql);
 $currency_symbol = $adb->query_result($result,0,'currency_symbol');
 

Modified: vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php
==============================================================================
--- vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php (original)
+++ vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php Thu Jun 15 23:56:15 2006
@@ -15,7 +15,7 @@
 
 global $adb,$app_strings;
 
-$sql="select vtiger_currency_symbol from vtiger_currency_info";
+$sql="select currency_symbol from vtiger_currency_info";
 $result = $adb->query($sql);
 $currency_symbol = $adb->query_result($result,0,'currency_symbol');
 

Modified: vtigercrm/trunk/modules/Quotes/CreatePDF.php
==============================================================================
--- vtigercrm/trunk/modules/Quotes/CreatePDF.php (original)
+++ vtigercrm/trunk/modules/Quotes/CreatePDF.php Thu Jun 15 23:56:15 2006
@@ -16,7 +16,7 @@
 
 global $adb,$app_strings;
 
-$sql="select vtiger_currency_symbol from vtiger_currency_info";
+$sql="select currency_symbol from vtiger_currency_info";
 $result = $adb->query($sql);
 $currency_symbol = $adb->query_result($result,0,'currency_symbol');
 

Modified: vtigercrm/trunk/modules/SalesOrder/CreateSOPDF.php
==============================================================================
--- vtigercrm/trunk/modules/SalesOrder/CreateSOPDF.php (original)
+++ vtigercrm/trunk/modules/SalesOrder/CreateSOPDF.php Thu Jun 15 23:56:15 2006
@@ -16,7 +16,7 @@
 
 global $adb,$app_strings,$products_per_page;
 
-$sql="select vtiger_currency_symbol from vtiger_currency_info";
+$sql="select currency_symbol from vtiger_currency_info";
 $result = $adb->query($sql);
 $currency_symbol = $adb->query_result($result,0,'currency_symbol');
 



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 22:58:21 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 05:58:21 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7153 -
	/vtigercrm/trunk/modules/Users/User.php
Message-ID: <20060616055821.93CD87ED2D0@vtiger.fosslabs.com>

Author: don
Date: Thu Jun 15 23:58:17 2006
New Revision: 7153

Log:
Issue in user save has been fixed

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 Thu Jun 15 23:58:17 2006
@@ -90,7 +90,6 @@
 	var $table_name = "vtiger_users";
 
 	// This is the list of fields that are in the lists.
-	var $list_fields_name = Array();
 	var $list_link_field= '';
 
 	var $list_mode;
@@ -108,7 +107,6 @@
 	var $tagcloud;
 	var $imagename;
 	var $defhomeview;
-	//var $sortby_fields = Array('user_name','email1','last_name','is_admin','status');	
 
 	var $encodeFields = Array("first_name", "last_name", "description");
 
@@ -117,8 +115,6 @@
 
 	var $sortby_fields = Array('status','email1','phone_work','is_admin','user_name');	  
 
-	var $default_order_by = 'lastname';
-	var $default_sort_order = 'ASC';
 	// This is the list of vtiger_fields that are in the lists.
 	var $list_fields = Array(
 		'First Name'=>Array('vtiger_users'=>'first_name'),
@@ -796,6 +792,13 @@
 
 		return;
 	}
+	function save($module_name) 
+	{
+		global $log;
+	        $log->debug("module name is ".$module_name);
+		//GS Save entity being called with the modulename as parameter
+		$this->saveentity($module_name);
+	}
 
 }
 ?>



From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 22:59:14 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 05:59:14 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231145=3A?=
 =?utf-8?q?_in_edit_view_of_inventory=2C_the_right_hand_side_options_are_h?=
 =?utf-8?q?ardcoded?=
In-Reply-To: <076.0e62778b6100dd068d2df9182121005c@vtiger.fosslabs.com>
References: <076.0e62778b6100dd068d2df9182121005c@vtiger.fosslabs.com>
Message-ID: <085.b8f413ad1b47ccba02c4a5d90ea2b897@vtiger.fosslabs.com>

#1145: in edit view of inventory, the right hand side options are hardcoded
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  mickie
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mickie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 These hardcoded values have beem i18n-ed in 5.0Beta

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1145>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 23:05:59 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 06:05:59 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7154 -
 /vtigercrm/trunk/modules/Import/language/en_us.lang.php
Message-ID: <20060616060559.1CB217ED2DC@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 16 00:05:56 2006
New Revision: 7154

Log:
* Corrected the information displayed in step 2 of import

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

Modified: vtigercrm/trunk/modules/Import/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Import/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Import/language/en_us.lang.php Fri Jun 16 00:05:56 2006
@@ -155,7 +155,7 @@
 'LBL_LIST_MAPPING'=>'List & Mapping',
 'LBL_STEP_2_MSG'=>'The following vtiger_tables shows the imported',
 'LBL_STEP_2_MSG1'=>'and other details.',
-'LBL_STEP_2_TXT'=>'To map the vtiger_fields, Select the corresponding in combo boxes for each',
+'LBL_STEP_2_TXT'=>'To map the fields, select the corresponding in combo boxes for each',
 'LBL_USE_SAVED_MAPPING'=>'Use Saved Mapping :',
 'LBL_MAPPING'=>'Mapping',
 'LBL_HEADERS'=>'Headers :',



From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 23:06:55 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 06:06:55 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231077=3A?=
 =?utf-8?q?_Inventory_=3E_Products=2C_Step_2_spelling_error?=
In-Reply-To: <076.afa5672c1a2f342659af400a47199461@vtiger.fosslabs.com>
References: <076.afa5672c1a2f342659af400a47199461@vtiger.fosslabs.com>
Message-ID: <085.a738703e6ea3a8106d05dc18cb6e3403@vtiger.fosslabs.com>

#1077: Inventory > Products, Step 2 spelling error
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  mickie
      Type:  defect     |      Status:  closed
  Priority:  trivial    |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mickie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 This issue has been fixed.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1077>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 23:10:07 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 06:10:07 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231305=3A?=
	=?utf-8?q?_Total_taxes_not_auto?=
In-Reply-To: <076.952daacfec18eaf8adefbd4e7d778e41@vtiger.fosslabs.com>
References: <076.952daacfec18eaf8adefbd4e7d778e41@vtiger.fosslabs.com>
Message-ID: <085.848b1af49dd57d2b08e40d872fca257a@vtiger.fosslabs.com>

#1305: Total taxes not auto
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  mickie                                               
      Type:  defect     |      Status:  closed                                               
  Priority:  minor      |   Milestone:                                                       
 Component:  vtigercrm  |     Version:  5.0.0                                                
Resolution:  fixed      |    Keywords:  quotes, invoices, sales order, so, purchase order, po
------------------------+---------------------------------------------------
Changes (by mickie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 the total amount has been calculated even if the tax and adjustment may be
 anything like alphabetical and all. if tax and adjustment are valid then
 it will be added in total otherwise it will be rejected and the total will
 not come as NaN.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1305>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 23:12:02 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 06:12:02 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231156=3A?=
 =?utf-8?q?_can_create_invoice_without_specifying_product_quantity?=
In-Reply-To: <076.92edb3c9cf4881a366e5a914f7e21365@vtiger.fosslabs.com>
References: <076.92edb3c9cf4881a366e5a914f7e21365@vtiger.fosslabs.com>
Message-ID: <085.365755e5eab6fa5c741761e97cbcac5b@vtiger.fosslabs.com>

#1156: can create invoice without specifying product quantity
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  mickie
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mickie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 This issue has been fixed in 5.0Beta itself.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1156>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 23:20:27 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 06:20:27 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7155 - in /vtigercrm/trunk:
 Smarty/templates/UserEditView.tpl include/utils/CommonUtils.php
Message-ID: <20060616062028.30CDB7ED2D7@vtiger.fosslabs.com>

Author: don
Date: Fri Jun 16 00:20:22 2006
New Revision: 7155

Log:
display type =4 for create view has been added

Modified:
    vtigercrm/trunk/Smarty/templates/UserEditView.tpl
    vtigercrm/trunk/include/utils/CommonUtils.php

Modified: vtigercrm/trunk/Smarty/templates/UserEditView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/UserEditView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/UserEditView.tpl Fri Jun 16 00:20:22 2006
@@ -31,7 +31,7 @@
 <script language="javascript">
 function check_duplicate()
 {ldelim}
-	var user_name = $('user_name').value;
+	var user_name = window.document.EditView.user_name.value;
 	new Ajax.Request(
                 'index.php',
                 {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},

Modified: vtigercrm/trunk/include/utils/CommonUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/CommonUtils.php (original)
+++ vtigercrm/trunk/include/utils/CommonUtils.php Fri Jun 16 00:20:22 2006
@@ -939,6 +939,13 @@
 		$block_label[$blockid] = $adb->query_result($result,$i,"blocklabel");
 	}
 	$blockid_list .= ')';
+	if($mode == 'edit')	
+	{
+		$display_type_check = 'vtiger_field.displaytype = 1';
+	}else
+	{
+		$display_type_check = 'vtiger_field.displaytype in (1,4)';
+	}
 	//retreive the vtiger_profileList from database
 	require('user_privileges/user_privileges_'.$current_user->id.'.php');
 	if($disp_view == "detail_view")
@@ -961,7 +968,7 @@
 		{
 			if($is_admin==true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2]== 0)
 			{
-				$sql = "select vtiger_field.* from vtiger_field where vtiger_field.tabid=".$tabid." and vtiger_field.block in ".$blockid_list ." and vtiger_field.displaytype=1 and info_type = '".$info_type."' order by block,sequence";
+				$sql = "select vtiger_field.* from vtiger_field where vtiger_field.tabid=".$tabid." and vtiger_field.block in ".$blockid_list ." and ".$display_type_check." and info_type = '".$info_type."' order by block,sequence";
 			}
 			else
 			{
@@ -973,7 +980,7 @@
 		{
 			if($is_admin==true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0)
 			{
-				$sql = "select vtiger_field.* from vtiger_field where vtiger_field.tabid=".$tabid." and vtiger_field.block in ".$blockid_list." and vtiger_field.displaytype=1 order by block,sequence";
+				$sql = "select vtiger_field.* from vtiger_field where vtiger_field.tabid=".$tabid." and vtiger_field.block in ".$blockid_list." and ".$display_type_check." order by block,sequence";
 			}
 			else
 			{



From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 23:41:46 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 06:41:46 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231074=3A?=
 =?utf-8?q?_Document_file_permissions_needed_for_install?=
In-Reply-To: <076.dfa8cdb6063a10bf60cc34f2fe53fa59@vtiger.fosslabs.com>
References: <076.dfa8cdb6063a10bf60cc34f2fe53fa59@vtiger.fosslabs.com>
Message-ID: <085.d6cb2cfc4ab8f4de519601e5224c1a9c@vtiger.fosslabs.com>

#1074: Document file permissions needed for install
-------------------------+--------------------------------------------------
  Reporter:  jeffk       |       Owner:  richie 
      Type:  defect      |      Status:  closed 
  Priority:  major       |   Milestone:  5.0.0  
 Component:  vtigercrm   |     Version:  5.0.0  
Resolution:  worksforme  |    Keywords:  install
-------------------------+--------------------------------------------------
Changes (by richie):

  * resolution:  => worksforme
  * status:  new => closed

Comment:

 I am closing this issue Jeff. Feel free to reopen if you get the issue
 again.
 I have not been able to reproduce this for sometime now.

 Richie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1074>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 23:42:25 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 06:42:25 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231186=3A?=
 =?utf-8?q?_webmails_not_working_in_linux_systems?=
In-Reply-To: <076.f90486e13eb47978a671c1ca4ead62d2@vtiger.fosslabs.com>
References: <076.f90486e13eb47978a671c1ca4ead62d2@vtiger.fosslabs.com>
Message-ID: <085.4f29f10624476e5ab275fd462b509b7f@vtiger.fosslabs.com>

#1186: webmails not working in linux systems
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  richie
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  wontfix    |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * resolution:  => wontfix
  * status:  new => closed

Comment:

 This is due to improper php compilation. imap must be enabled during php
 compilation.

 Richie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1186>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 23:44:11 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 06:44:11 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231140=3A?=
	=?utf-8?q?_Issue_in_Emails?=
In-Reply-To: <076.a35124f4112b6efc1ce3a64ae8820aed@vtiger.fosslabs.com>
References: <076.a35124f4112b6efc1ce3a64ae8820aed@vtiger.fosslabs.com>
Message-ID: <085.8ba8673479a1567de0e9dcffebfa8f6f@vtiger.fosslabs.com>

#1140: Issue in Emails
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  richie
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  wontfix    |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * resolution:  => wontfix
  * status:  new => closed

Comment:

 This will not be fixed as it is a low priority. Moreover, it will be
 better if you have a consensus on this issue.

 Richie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1140>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 23:44:50 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 06:44:50 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231246=3A?=
 =?utf-8?q?_email_not_displayed_in_contact_related_list?=
In-Reply-To: <076.bb51c9882ca3da9b29e43b10d6709695@vtiger.fosslabs.com>
References: <076.bb51c9882ca3da9b29e43b10d6709695@vtiger.fosslabs.com>
Message-ID: <085.d466f1aa8b776bae35c136092ea32edf@vtiger.fosslabs.com>

#1246: email not displayed in contact related list
------------------------+---------------------------------------------------
  Reporter:  mickie     |       Owner:  richie
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  duplicate  |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * resolution:  => duplicate
  * status:  new => closed

Comment:

 1211

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1246>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 23:49:16 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 06:49:16 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231127=3A?=
	=?utf-8?q?_Issue_in_Emaol?=
In-Reply-To: <076.5f2796ef1febe6076fd5ba3545997e71@vtiger.fosslabs.com>
References: <076.5f2796ef1febe6076fd5ba3545997e71@vtiger.fosslabs.com>
Message-ID: <085.9fba6fcde33886661ca2de6d2154c9d9@vtiger.fosslabs.com>

#1127: Issue in Emaol
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  richie
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  wontfix    |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * resolution:  => wontfix
  * status:  new => closed

Comment:

 This is not the behaviour with respect to any mail client.
 This will not be fixed.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1127>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 00:04:24 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 07:04:24 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7156 -
	/vtigercrm/trunk/install/0welcome.php
Message-ID: <20060616070424.5C7A47ED2DA@vtiger.fosslabs.com>

Author: richie
Date: Fri Jun 16 01:04:19 2006
New Revision: 7156

Log:
message updated

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

Modified: vtigercrm/trunk/install/0welcome.php
==============================================================================
--- vtigercrm/trunk/install/0welcome.php (original)
+++ vtigercrm/trunk/install/0welcome.php Fri Jun 16 01:04:19 2006
@@ -77,7 +77,7 @@
 <p>This is a product of pure teamwork, passion, and fanaticism!</p>
 <p>We are not perfect and neither do we seek perfection; but we do seek excellence. Yes, there will be issues in the product, but we will fix them too. Your help will be invaluable for the same.</p>
 <p><b>vtiger is 100% pure Open Source.</b> <em>You do not have to pay anything to use the product. If you do subscribe to the support package though, you will be able to get time-bound answers to all your queries</em>. We do provide telephone-support for paid customers only.<b><a href="http://vtiger.com/index.php?option=com_content&task=view&id=19&Itemid=37">Click here</a></b> for subscribing to the Support.</p>
-<p>vtiger believes in word of mouth alone, in fact, vtiger is nearing 0.30 million downloads without any advertisement whatsoever.</p>
+<p>vtiger believes in word of mouth alone, in fact, vtiger has been downloaded more than 0.30 million times without any advertisement whatsoever.</p>
 <p align="center">We do believe that <b>YOU</b> can and will make a difference.</p>
 <p>If you feel we have lived up to your expectations,  do consider spreading the word about vtiger by whichever means convenient to you.</p>
 <p>Please find mentioned below some information about us that you could utilize:<p>



From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 00:17:51 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 07:17:51 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231327=3A?=
 =?utf-8?q?_not_smartified=2C_still_in_xtemplate?=
Message-ID: <076.14a4dc55fd3e2cc898c582ff8d811185@vtiger.fosslabs.com>

#1327: not smartified, still in xtemplate
-----------------------+----------------------------------------------------
 Reporter:  mickie     |       Owner:  mangai
     Type:  defect     |      Status:  new   
 Priority:  major      |   Milestone:        
Component:  vtigercrm  |     Version:  5.0.0 
 Keywords:             |  
-----------------------+----------------------------------------------------
 In PriceBook relatedlist we have Products table where for each products we
 have edit link which goes to modules/Products/EditListPrice.php file which
 is not smartified ie., this file is still using the XTemplate.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1327>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 00:21:16 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 07:21:16 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23949=3A_?=
 =?utf-8?q?Advanced_Search_table_attached_to_List_View?=
In-Reply-To: <076.64fbeb656c1ed239c500613565fa6b30@vtiger.fosslabs.com>
References: <076.64fbeb656c1ed239c500613565fa6b30@vtiger.fosslabs.com>
Message-ID: <085.67a8a7c280df40113bc66ece5f6765ab@vtiger.fosslabs.com>

#949: Advanced Search table attached to List View
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  philip
      Type:  defect     |      Status:  closed
  Priority:  minor      |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by saraj):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 (In [7157]) changes made to have space between search box and listview.
 Fixes #949

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/949>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 00:21:17 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 07:21:17 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7157 -
	/vtigercrm/trunk/Smarty/templates/ListView.tpl
Message-ID: <20060616072117.5DACA7ED2E3@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 16 01:21:13 2006
New Revision: 7157

Log:
changes made to have space between search box and listview. Fixes #949

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 Fri Jun 16 01:21:13 2006
@@ -110,7 +110,33 @@
 </div>
 {/if}
 <!-- Activity createlink layer end  -->
-<!-- SIMPLE SEARCH -->
+
+                                <div id="searchingUI" style="display:none;">
+                                        <table border=0 cellspacing=0 cellpadding=0 width=100%>
+                                        <tr>
+                                                <td align=center>
+                                                <img src="images/searching.gif" alt="Searching... please wait"  title="Searching... please wait">
+                                                </td>
+                                        </tr>
+                                        </table>
+
+                                </div>
+                        </td>
+                </tr>
+                </table>
+        </td>
+</tr>
+</table>
+</form>
+</div>
+
+{*<!-- Contents -->*}
+<table border=0 cellspacing=0 cellpadding=0 width=98% align=center>
+     <tr>
+        <td valign=top><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
+
+	<td class="showPanelBg" valign="top" width=100% style="padding:10px;">
+	 <!-- SIMPLE SEARCH -->
 <div id="searchAcc" style="z-index:1;display:none;position:relative;">
 <form name="basicSearch" action="index.php">
 <table width="80%" cellpadding="5" cellspacing="0" style="border:1px dashed #CCCCCC;" class="small" align="center">
@@ -189,31 +215,7 @@
 	</table>
 </div>		
 {*<!-- Searching UI -->*}
-                                <div id="searchingUI" style="display:none;">
-                                        <table border=0 cellspacing=0 cellpadding=0 width=100%>
-                                        <tr>
-                                                <td align=center>
-                                                <img src="images/searching.gif" alt="Searching... please wait"  title="Searching... please wait">
-                                                </td>
-                                        </tr>
-                                        </table>
-
-                                </div>
-                        </td>
-                </tr>
-                </table>
-        </td>
-</tr>
-</table>
-</form>
-</div>
-
-{*<!-- Contents -->*}
-<table border=0 cellspacing=0 cellpadding=0 width=98% align=center>
-     <tr>
-        <td valign=top><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
-
-	<td class="showPanelBg" valign="top" width=100% style="padding:10px;">
+	 <br>
 	   <!-- PUBLIC CONTENTS STARTS-->
 	   <div id="ListViewContents" class="small" style="width:100%;position:relative;">
 	<input name='search_url' id="search_url" type='hidden' value='{$SEARCH_URL}'>



From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 00:32:59 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 07:32:59 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231143=3A?=
	=?utf-8?q?_Issue_in_Email_Search?=
In-Reply-To: <076.602112a95e47edfea50fc9b4ff0606e7@vtiger.fosslabs.com>
References: <076.602112a95e47edfea50fc9b4ff0606e7@vtiger.fosslabs.com>
Message-ID: <085.7f193d1b709e5d97c91cf867a2bd8f0f@vtiger.fosslabs.com>

#1143: Issue in Email Search
------------------------+---------------------------------------------------
  Reporter:  don        |       Owner:  richie
      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: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1143>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 00:49:58 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 07:49:58 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7158 -
	/vtigercrm/trunk/modules/Users/Users.js
Message-ID: <20060616074958.000EB7ED2CF@vtiger.fosslabs.com>

Author: don
Date: Fri Jun 16 01:49:55 2006
New Revision: 7158

Log:
js file added for users

Added:
    vtigercrm/trunk/modules/Users/Users.js



From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 00:50:38 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 07:50:38 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7159 -
	/vtigercrm/trunk/modules/Products/EditListPrice.html
Message-ID: <20060616075038.D37057ED2CF@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 16 01:50:34 2006
New Revision: 7159

Log:
* Modified the cancel button action to history back

Modified:
    vtigercrm/trunk/modules/Products/EditListPrice.html

Modified: vtigercrm/trunk/modules/Products/EditListPrice.html
==============================================================================
--- vtigercrm/trunk/modules/Products/EditListPrice.html (original)
+++ vtigercrm/trunk/modules/Products/EditListPrice.html Fri Jun 16 01:50:34 2006
@@ -38,7 +38,7 @@
 	<tr>
 	         <td align="center">
 			<input title="{APP.LBL_SAVE_BUTTON_LABEL}" accessKey="{APP.LBL_SAVE_BUTTON_KEY}" class="button" onclick="this.form.action.value='UpdateListPrice'; return verify_data(EditView)" type="submit" name="button" value="{APP.LBL_SAVE_BUTTON_LABEL}" >
-	                <input title="{APP.LBL_CANCEL_BUTTON_LABEL}>" accessKey="{APP.LBL_CANCEL_BUTTON_KEY}" class="button" onclick="this.form.action.value='DetailView'; this.form.module.value='PriceBooks'; this.form.return_action.value='DetailView'; this.form.return_module.value='PriceBooks';" type="submit" name="button" value="{APP.LBL_CANCEL_BUTTON_LABEL}"></td>
+	                <input title="{APP.LBL_CANCEL_BUTTON_LABEL}>" accessKey="{APP.LBL_CANCEL_BUTTON_KEY}" class="button" onclick="window.history.back()" type="submit" name="button" value="{APP.LBL_CANCEL_BUTTON_LABEL}"></td>
 	</tr>
 	</form>
 </table>



From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 00:53:42 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 07:53:42 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7160 -
	/vtigercrm/trunk/modules/Campaigns/Campaign.php
Message-ID: <20060616075342.E6E987ED2CF@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 16 01:53:39 2006
New Revision: 7160

Log:
task included as relatedlist for campaign

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 Fri Jun 16 01:53:39 2006
@@ -75,9 +75,9 @@
                 $focus = new Contact();
                 $button = '';
                 $returnset = '&return_module=Campaigns&return_action=DetailView&return_id='.$id;
-		$query = 'select vtiger_contactdetails.accountid, vtiger_users.user_name,vtiger_groups.groupname,vtiger_campaign.campaignid, vtiger_campaign.campaignname, vtiger_contactdetails.contactid, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.title, vtiger_contactdetails.department, vtiger_contactdetails.email, vtiger_contactdetails.phone, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_campaign inner join vtiger_campaigncontrel on vtiger_campaigncontrel.campaignid = vtiger_campaign.campaignid inner join vtiger_contactdetails on vtiger_campaigncontrel.contactid = vtiger_contactdetails.contactid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid left join vtiger_groups on vtiger_groups.groupname=vtiger_contactgrouprelation.groupname left join vtiger_users on vtiger_crmentity.smownerid=vtiger_users.id where vtiger_campaign.campaignid = '.$id.' and vtiger_crmentity.deleted=0';
+		//$query = 'select vtiger_contactdetails.accountid, vtiger_users.user_name,vtiger_groups.groupname,vtiger_campaign.campaignid, vtiger_campaign.campaignname, vtiger_contactdetails.contactid, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.title, vtiger_contactdetails.department, vtiger_contactdetails.email, vtiger_contactdetails.phone, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_campaign inner join vtiger_campaigncontrel on vtiger_campaigncontrel.campaignid = vtiger_campaign.campaignid inner join vtiger_contactdetails on vtiger_campaigncontrel.contactid = vtiger_contactdetails.contactid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid left join vtiger_groups on vtiger_groups.groupname=vtiger_contactgrouprelation.groupname left join vtiger_users on vtiger_crmentity.smownerid=vtiger_users.id where vtiger_campaign.campaignid = '.$id.' and vtiger_crmentity.deleted=0';
 
-		//$query = 'SELECT vtiger_contactdetails.*, vtiger_crmentity.crmid, vtiger_users.user_name, vtiger_groups.groupname, vtiger_crmentity.smownerid from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid left join vtiger_users on vtiger_crmentity.smownerid = vtiger_users.id left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid left join vtiger_groups on vtiger_groups.groupname=vtiger_contactgrouprelation.groupname  where vtiger_crmentity.deleted=0 and vtiger_contactdetails.campaignid = '.$id;
+		$query = 'SELECT vtiger_contactdetails.*, vtiger_crmentity.crmid, vtiger_users.user_name, vtiger_groups.groupname, vtiger_crmentity.smownerid from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid left join vtiger_users on vtiger_crmentity.smownerid = vtiger_users.id left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid left join vtiger_groups on vtiger_groups.groupname=vtiger_contactgrouprelation.groupname  where vtiger_crmentity.deleted=0 and vtiger_contactdetails.campaignid = '.$id;
 		$log->debug("Exiting get_contacts method ...");
                 return GetRelatedList('Campaigns','Contacts',$focus,$query,$button,$returnset);
         }
@@ -113,6 +113,53 @@
 		return GetRelatedList('Campaigns','Potentials',$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();
+
+		$button = '';
+
+		$returnset = '&return_module=Products&return_action=DetailView&return_id='.$id;
+
+		$query = "SELECT vtiger_contactdetails.lastname,
+			vtiger_contactdetails.firstname,
+			vtiger_contactdetails.contactid,
+			vtiger_activity.*,
+			vtiger_seactivityrel.*,
+			vtiger_crmentity.crmid, vtiger_crmentity.smownerid,
+			vtiger_crmentity.modifiedtime,
+			vtiger_users.user_name,
+			vtiger_recurringevents.recurringtype
+			FROM vtiger_activity
+			INNER JOIN vtiger_seactivityrel
+				ON vtiger_seactivityrel.activityid = vtiger_activity.activityid
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid=vtiger_activity.activityid
+			LEFT JOIN vtiger_cntactivityrel
+				ON vtiger_cntactivityrel.activityid = vtiger_activity.activityid
+			LEFT JOIN vtiger_contactdetails
+				ON vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid
+			LEFT JOIN vtiger_users
+				ON vtiger_users.id = vtiger_crmentity.smownerid
+			LEFT OUTER JOIN vtiger_recurringevents
+				ON vtiger_recurringevents.activityid = vtiger_activity.activityid
+			LEFT JOIN vtiger_activitygrouprelation
+				ON vtiger_activitygrouprelation.activityid = vtiger_crmentity.crmid
+			LEFT JOIN vtiger_groups
+				ON vtiger_groups.groupname = vtiger_activitygrouprelation.groupname
+			WHERE vtiger_seactivityrel.crmid=".$id."
+			AND (activitytype = 'Task'
+				OR activitytype = 'Call'
+				OR activitytype = 'Meeting')";
+		$log->debug("Exiting get_activities method ...");
+		return GetRelatedList('Campaigns','Activities',$focus,$query,$button,$returnset);
+	}
 
 }
 ?>



From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 00:55:34 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 07:55:34 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231180=3A?=
 =?utf-8?q?_pricebook_related_list_shows_products_which_cannot_be_deleted_?=
 =?utf-8?q?from_related_list?=
In-Reply-To: <076.0271cde3695160584f02fe99d754d59c@vtiger.fosslabs.com>
References: <076.0271cde3695160584f02fe99d754d59c@vtiger.fosslabs.com>
Message-ID: <085.1c9bad5eeae5bbda4de1d564bc3beaa2@vtiger.fosslabs.com>

#1180: pricebook related list shows products which cannot be deleted from related
list
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  mickie
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mickie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 This issue has been fixed and the edit and delete links are working and
 the control will return the relatedlist.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1180>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 00:55:55 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 07:55:55 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7162 -
 /vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
Message-ID: <20060616075556.14CAE7ED2CF@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 16 01:55:52 2006
New Revision: 7162

Log:
task included as relatedlist for campaign

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

Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original)
+++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Fri Jun 16 01:55:52 2006
@@ -1801,6 +1801,7 @@
          $this->db->query("insert into vtiger_relatedlists values (".$this->db->getUniqueID('relatedlists').",".getTabid("Campaigns").",".getTabid("Contacts").",'get_contacts',1,'Contacts',0)");
          $this->db->query("insert into vtiger_relatedlists values (".$this->db->getUniqueID('relatedlists').",".getTabid("Campaigns").",".getTabid("Leads").",'get_leads',2,'Leads',0)");
 	 $this->db->query("insert into vtiger_relatedlists values (".$this->db->getUniqueID('relatedlists').",".getTabid("Campaigns").",".getTabid("Potentials").",'get_opportunities',3,'Potentials',0)");
+	 $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Campaigns").",9,'get_activities',4,'Activities',0)");
 
                $this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("notificationscheduler").",'LBL_TASK_NOTIFICATION_DESCRITPION',1,'Task Delay Notification','Tasks delayed beyond 24 hrs ','LBL_TASK_NOTIFICATION')");
 



From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 00:56:28 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 07:56:28 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7163 - in /vtigercrm/trunk:
 Popup.php Smarty/templates/DisplayFields.tpl
 include/utils/EditViewUtils.php include/utils/ListViewUtils.php
 modules/Users/Popup.php modules/Users/User.php
Message-ID: <20060616075629.1689218189C@vtiger.fosslabs.com>

Author: don
Date: Fri Jun 16 01:56:18 2006
New Revision: 7163

Log:
user popup from Popup.php

Modified:
    vtigercrm/trunk/Popup.php
    vtigercrm/trunk/Smarty/templates/DisplayFields.tpl
    vtigercrm/trunk/include/utils/EditViewUtils.php
    vtigercrm/trunk/include/utils/ListViewUtils.php
    vtigercrm/trunk/modules/Users/Popup.php
    vtigercrm/trunk/modules/Users/User.php

Modified: vtigercrm/trunk/Popup.php
==============================================================================
--- vtigercrm/trunk/Popup.php (original)
+++ vtigercrm/trunk/Popup.php Fri Jun 16 01:56:18 2006
@@ -174,6 +174,14 @@
 		}
 		$alphabetical = AlphabeticalSearch($currentModule,'Popup','bookname','true','basic',$popuptype,"","","");
 		break;
+	case 'Users':
+                require_once("modules/$currentModule/User.php");
+                $focus = new User();
+                $smarty->assign("SINGLE_MOD",'Users');
+                if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] !='')
+                    $smarty->assign("RETURN_MODULE",$_REQUEST['return_module']);
+                $alphabetical = AlphabeticalSearch($currentModule,'Popup','user_name','true','basic',$popuptype,"","","");
+                break;	
 
 
 }

Modified: vtigercrm/trunk/Smarty/templates/DisplayFields.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DisplayFields.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DisplayFields.tpl Fri Jun 16 01:56:18 2006
@@ -537,7 +537,7 @@
 			       {$fldlabel}
 	            </td>
 				<td width="30%" align=left class="dvtCellInfo">
-				<input readonly name='{$fldname}' class="small" type="text" value='{$fldvalue}'><input name='reports_to_id' type="hidden" value='{$fldvalue}'>&nbsp;<input title="Change [Alt+C]" accessKey="C" type="button" class="small" value='{$UMOD.LBL_CHANGE}' name=btn1 LANGUAGE=javascript onclick='return window.open("index.php?module=Users&action=Popup&form=UsersEditView&form_submit=false","test","width=640,height=522,resizable=0,scrollbars=0");'>
+				<input readonly name='reports_to_name' class="small" type="text" value='{$fldvalue}'><input name='reports_to_id' type="hidden" value='{$secondvalue}'>&nbsp;<input title="Change [Alt+C]" accessKey="C" type="button" class="small" value='{$UMOD.LBL_CHANGE}' name=btn1 LANGUAGE=javascript onclick='return window.open("index.php?module=Users&action=Popup&form=UsersEditView&form_submit=false","test","width=640,height=522,resizable=0,scrollbars=0");'>
 	            </td>
 			{elseif $uitype eq 116}<!-- for currency in users details-->	
 			<td width="20%" class="dvtCellLabel" align=right>

Modified: vtigercrm/trunk/include/utils/EditViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/EditViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/EditViewUtils.php Fri Jun 16 01:56:18 2006
@@ -1124,6 +1124,11 @@
 			}
 		else
 			$fieldvalue[] = '';
+	}elseif($uitype == 101)
+	{
+		$editview_label[]=$mod_strings[$fieldlabel];
+        $fieldvalue[] = getUserName($value);
+        $fieldvalue[] = $value;
 	}
 	else
 	{

Modified: vtigercrm/trunk/include/utils/ListViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/ListViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/ListViewUtils.php Fri Jun 16 01:56:18 2006
@@ -828,7 +828,14 @@
 		{
 
 			//Getting the entityid
-			$entity_id = $adb->query_result($list_result,$i-1,"crmid");
+			if($module != 'Users')	
+			{
+				$entity_id = $adb->query_result($list_result,$i-1,"crmid");
+			}else
+			{
+				$entity_id = $adb->query_result($list_result,$i-1,"id");
+			}	
+				
 			$list_header=Array();
 
 			foreach($focus->search_fields as $name=>$tableinfo)
@@ -949,7 +956,6 @@
 		$uitype = $key;
 		$colname = $value;
         }
-
 	//added for getting event status in Custom view - Jaguar
 	if($module == 'Activities' && $colname == "status")
 	{
@@ -997,7 +1003,7 @@
 	{
 		$value = '<a href="http://'.$temp_val.'" target="_blank">'.$temp_val.'</a>';
 	}
-	elseif($uitype == 13)
+	elseif($uitype == 13 || $uitype == 104)
         {
 		if(useInternalMailer() == 1)
                 	$value = '<a href="javascript:InternalMailer('.$entity_id.',\'record_id\')">'.$temp_val.'</a>';
@@ -1354,7 +1360,6 @@
 					{
 						$name = $adb->query_result($list_result,$list_result_count,'accountname');
 						$accid =$adb->query_result($list_result,$list_result_count,'accountid');
-						//$value = '<a href="javascript: submitform('.$accid.');">'.$temp_val.'</a>';
 						$emailaddress=$adb->query_result($list_result,$list_result_count,"email1");
 						if($emailaddress == '')
 							$emailaddress=$adb->query_result($list_result,$list_result_count,"email2");
@@ -1380,11 +1385,19 @@
 						//Change this index 0 - to get the vtiger_fieldid based on email or yahooid
 						$fieldid = $adb->query_result($queryres,0,'fieldid');
 
-						//$value = '<a href="javascript: submitform('.$entity_id.');">'.$name.'</a>';
 						$value = '<a href="a" LANGUAGE=javascript onclick=\'return set_return_emails('.$entity_id.','.$fieldid.',"'.$name.'","'.$emailaddress.'"); \'>'.$name.'</a>';
 
-
+					}else
+					{
+						$firstname=$adb->query_result($list_result,$list_result_count,"first_name");
+						$lastname=$adb->query_result($list_result,$list_result_count,"last_name");
+						$name=$lastname.' '.$firstname;
+						$emailaddress=$adb->query_result($list_result,$list_result_count,"email1");
+
+						$value = '<a href="a" LANGUAGE=javascript onclick=\'return set_return_emails('.$entity_id.',-1,"'.$name.'","'.$emailaddress.'"); \'>'.$name.'</a>';
+						
 					}
+						
 				}	
 				elseif($popuptype == "specific_vendor_address")
 				{

Modified: vtigercrm/trunk/modules/Users/Popup.php
==============================================================================
--- vtigercrm/trunk/modules/Users/Popup.php (original)
+++ vtigercrm/trunk/modules/Users/Popup.php Fri Jun 16 01:56:18 2006
@@ -1,180 +1,20 @@
-<?php
-/*********************************************************************************
- * The contents of this file are subject to the SugarCRM Public License Version 1.1.2
- * ("License"); You may not use this file except in compliance with the 
- * License. You may obtain a copy of the License at http://www.sugarcrm.com/SPL
- * Software distributed under the License is distributed on an  "AS IS"  basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
- * the specific language governing rights and limitations under the License.
- * The Original Code is:  SugarCRM Open Source
- * The Initial Developer of the Original Code is SugarCRM, Inc.
- * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.;
- * All Rights Reserved.
- * Contributor(s): ______________________________________.
- ********************************************************************************/
-/*********************************************************************************
- * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Users/Popup.php,v 1.5 2005/04/27 09:51:34 rank Exp $
- * Description:  TODO: To be written.
- * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
- * All Rights Reserved.
- * Contributor(s): ______________________________________..
- ********************************************************************************/
-// This file is used for all popups on this module
-// The popup_picker.html file is used for generating a list from which to find and choose one instance.
-
-global $theme;
-require_once('modules/Users/User.php');
-require_once('themes/'.$theme.'/layout_utils.php');
-require_once('include/logging.php');
-require_once('XTemplate/xtpl.php');
-require_once('include/utils/utils.php');
-require_once('include/ListView/ListView.php');
-
-global $mod_strings;
-global $app_strings;
-
-global $list_max_entries_per_page;
-global $urlPrefix;
-global $currentModule;
-
-$log = LoggerManager::getLogger('user');
-
-$seed_object = new User();
-
-
-$where = "";
-if(isset($_REQUEST['query']))
-{
-	$search_fields = Array("first_name", "last_name", "user_name");
-
-	$where_clauses = Array();
-
-	append_where_clause($where_clauses, "first_name", "users.first_name");
-	append_where_clause($where_clauses, "last_name", "users.last_name");
-	append_where_clause($where_clauses, "user_name", "users.user_name");
-
-	$where = generate_where_statement($where_clauses);
-}
-
-
-$image_path = 'themes/'.$theme.'/images';
-
-////////////////////////////////////////////////////////
-// Start the output
-////////////////////////////////////////////////////////
-if (!isset($_REQUEST['html'])) {
-	if($_REQUEST['popuptype'] != 'set_return_emails')
-		$form =new XTemplate ('modules/Users/Popup_picker.html');
-	else
-		$form =new XTemplate ('modules/Users/Popup_picker_emails.html');
-	$log->debug("using file modules/Users/Popup_picker.html");
-}
-else {
-	if($_REQUEST['popuptype'] != 'set_return_emails')
-		$form =new XTemplate ('modules/Users/'.$_REQUEST['html'].'.html');
-	else
-		$form =new XTemplate ('modules/Users/Popup_picker_emails.html');
-	$log->debug("using file modules/Users/".$_REQUEST['html'].'.html');
-	$log->debug("_REQUEST['html'] is ".$_REQUEST['html']);
-}
-	$form->assign("POPUPTYPE",$_REQUEST['popuptype']);
-
-$form->assign("MOD", $mod_strings);
-$form->assign("IMAGE_PATH", $image_path);
-$form->assign("APP", $app_strings);
-
-// the form key is required
-if(!isset($_REQUEST['form']))
-	die("Missing 'form' parameter");
-
-
-// This code should always return an answer.
-// The form name should be made into a parameter and not be hard coded in this file.
-if(isset($_REQUEST['form_submit']) && $_REQUEST['popuptype'] == 'detailview' && $_REQUEST['form_submit'] == 'true')
-{
-	$the_javascript  = "<script type='text/javascript' language='JavaScript'>\n";
-	$the_javascript .= "function set_return(user_id, user_name) {\n";
-	//$the_javascript .= 'opener.document.location.href="index.php?module='.$return_module.'&action=updateRelations&entityid="+user_id+"&parid='.$recordid.'"; \n';
-	$the_javascript .= "	window.opener.document.form.user_id.value = user_id; \n";
-	$the_javascript .= "	window.opener.document.form.return_module.value = window.opener.document.form.return_module.value; \n";
-	//$the_javascript .= "	window.opener.document.DetailView.return_action.value = 'DetailView'; \n";
-	$the_javascript .= "	window.opener.document.form.return_id.value = window.opener.document.form.record.value; \n";
-	$the_javascript .= "   window.opener.document.form.module.value = window.opener.document.form.return_module.value; \n";
-	$the_javascript .= "	window.opener.document.form.action.value = 'updateRelations'; \n";
-	$the_javascript .= "	window.opener.document.form.submit(); \n";
-	$the_javascript .= "}\n";
-	$the_javascript .= "</script>\n";
-}
-elseif ($_REQUEST['form'] == 'UsersEditView') 
-{
-	$the_javascript  = "<script type='text/javascript' language='JavaScript'>\n";
-	$the_javascript .= "function set_return(user_id, user_name) {\n";
-	$the_javascript .= "	window.opener.document.EditView.reports_to_name.value = user_name;\n";
-	$the_javascript .= "	window.opener.document.EditView.reports_to_id.value = user_id;\n";
-	$the_javascript .= "}\n";
-	$the_javascript .= "</script>\n";
-}
-elseif($_REQUEST['popuptype'] == 'set_return_emails')
-{
-	$the_javascript = "<script type='text/javascript' src='include/js/Mail.js'></script>";	
-}
-else // ($_REQUEST['form'] == 'EditView') 
-{
-	$the_javascript  = "<script type='text/javascript' language='JavaScript'>\n";
-	$the_javascript .= "function set_return(user_id, user_name) {\n";
-	$the_javascript .= "	window.opener.document.EditView.user_name.value = user_name;\n";
-	$the_javascript .= "	window.opener.document.EditView.user_id.value = user_id;\n";
-	$the_javascript .= "}\n";
-	$the_javascript .= "</script>\n";
-}	
-
-$form->assign("SET_RETURN_JS", $the_javascript);
-
-$form->assign("THEME", $theme);
-$form->assign("IMAGE_PATH", $image_path);
-$form->assign("MODULE_NAME", $currentModule);
-$form->assign("FORM_SUBMIT", $_REQUEST['form_submit']);
-$form->assign("FORM", $_REQUEST['form']);
-
-insert_popup_header($theme);
-
-// Quick search.
-echo "<form>";
-echo get_form_header($mod_strings['LBL_SEARCH_FORM_TITLE'], "", false);
-
-if (isset($_REQUEST['first_name'])) $last_search['FIRST_NAME'] = $_REQUEST['first_name'];
-if (isset($_REQUEST['last_name'])) $last_search['LAST_NAME'] = $_REQUEST['last_name'];
-if (isset($_REQUEST['user_name'])) $last_search['USER_NAME'] = $_REQUEST['user_name'];
-if (isset($last_search)) $form->assign("LAST_SEARCH", $last_search);
-
-$form->parse("main.SearchHeader");
-$form->out("main.SearchHeader");
-
-echo get_form_footer();
-
-$form->parse("main.SearchHeaderEnd");
-$form->out("main.SearchHeaderEnd");
-
-// Reset the sections that are already in the page so that they do not print again later.
-$form->reset("main.SearchHeader");
-$form->reset("main.SearchHeaderEnd");
-
-// start the form before the form header to avoid creating a gap in IE
-$button  = "<table cellspacing='0' cellpadding='1' border='0'><form border='0' action='index.php' method='post' name='form' id='form'>\n";
-$button .= "<tr><td>&nbsp;</td>";
-/*if ($_REQUEST['form_submit'] != 'true') $button .= "<td><input title='".$app_strings['LBL_CLEAR_BUTTON_TITLE']."' accessyKey='".$app_strings['LBL_CLEAR_BUTTON_KEY']."' class='button' LANGUAGE=javascript onclick=\"window.opener.document.EditView.account_name.value = '';window.opener.document.EditView.account_id.value = ''; window.close()\" type='submit' name='button' value='  Clear  '></td>\n";
-$button .= "<td><input title='".$app_strings['LBL_CANCEL_BUTTON_TITLE']."' accessyKey='".$app_strings['LBL_CANCEL_BUTTON_KEY']."' class='button' LANGUAGE=javascript onclick=\"window.close()\" type='submit' name='button' value='  ".$app_strings['LBL_CANCEL_BUTTON_LABEL']."  '></td>\n";
-$button .= "</tr></form></table>\n";
-*/
-
-$ListView = new ListView();
-$ListView->setXTemplate($form);
-$ListView->setHeaderTitle($mod_strings['LBL_LIST_FORM_TITLE']);
-//$ListView->setHeaderText($button);
-$ListView->setQuery($where, "", "user_name", "USER");
-$ListView->setModStrings($mod_strings);
-$ListView->processListView($seed_object, "main", "USER");
-
-
-
-?>
+<?php
+/*********************************************************************************
+ * The contents of this file are subject to the SugarCRM Public License Version 1.1.2
+ * ("License"); You may not use this file except in compliance with the 
+ * License. You may obtain a copy of the License at http://www.sugarcrm.com/SPL
+ * Software distributed under the License is distributed on an  "AS IS"  basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
+ * the specific language governing rights and limitations under the License.
+ * The Original Code is:  SugarCRM Open Source
+ * The Initial Developer of the Original Code is SugarCRM, Inc.
+ * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.;
+ * All Rights Reserved.
+ * Contributor(s): ______________________________________.
+ ********************************************************************************/
+/*********************************************************************************
+ * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Leads/Popup.php,v 1.7 2005/03/23 14:19:48 samk Exp $
+ * Description:  TODO: To be written.
+ ********************************************************************************/
+require_once('Popup.php');
+?>

Modified: vtigercrm/trunk/modules/Users/User.php
==============================================================================
--- vtigercrm/trunk/modules/Users/User.php (original)
+++ vtigercrm/trunk/modules/Users/User.php Fri Jun 16 01:56:18 2006
@@ -90,13 +90,19 @@
 	var $table_name = "vtiger_users";
 
 	// This is the list of fields that are in the lists.
-	var $list_link_field= '';
+	var $list_link_field= 'last_name';
 
 	var $list_mode;
 	var $popup_type;
 
-	var $search_fields = Array();
-	var $search_fields_name = Array();
+	var $search_fields = Array(
+		'Name'=>Array('vtiger_users'=>'last_name'),
+		'Email'=>Array('vtiger_users'=>'email1')
+	);
+	var $search_fields_name = Array(
+		'Name'=>'last_name',
+		'Email'=>'email1'
+	);
 
 	var $module_name = "Users";
 
@@ -113,7 +119,7 @@
 	// This is used to retrieve related fields from form posts.
 	var $additional_column_fields = Array('reports_to_name');		
 
-	var $sortby_fields = Array('status','email1','phone_work','is_admin','user_name');	  
+	var $sortby_fields = Array('status','email1','phone_work','is_admin','user_name','last_name');	  
 
 	// This is the list of vtiger_fields that are in the lists.
 	var $list_fields = Array(



From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 00:56:58 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 07:56:58 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7164 -
	/vtigercrm/trunk/install/2setConfig.php
Message-ID: <20060616075658.AAACE638FE3@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 16 01:56:54 2006
New Revision: 7164

Log:
changes made to display path name. Fixes #1153

Modified:
    vtigercrm/trunk/install/2setConfig.php

Modified: vtigercrm/trunk/install/2setConfig.php
==============================================================================
--- vtigercrm/trunk/install/2setConfig.php (original)
+++ vtigercrm/trunk/install/2setConfig.php Fri Jun 16 01:56:54 2006
@@ -110,11 +110,9 @@
 	$site_URL = $site_URL;
 	else $site_URL = $web_root;
 
-	if (! isset($_REQUEST['root_directory']))
-	{
-	 	$root_directory = $current_dir;
-	}
-
+	if(isset($_REQUEST['root_directory'])) $root_directory = $_REQUEST['root_directory'];
+	else $root_directory = $current_dir;
+	    
 	if (isset($_REQUEST['cache_dir']))
 	$cache_dir= $_REQUEST['cache_dir'];
 



From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 00:56:57 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 07:56:57 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231153=3A?=
 =?utf-8?q?_Source_Installer=3A_data_in_=22Path=22_field_disappears?=
In-Reply-To: <076.a6308f317cdefba138949240f46f1aae@vtiger.fosslabs.com>
References: <076.a6308f317cdefba138949240f46f1aae@vtiger.fosslabs.com>
Message-ID: <085.4d6a543a6e744b30e6b6c6a5095be4b1@vtiger.fosslabs.com>

#1153: Source Installer: data in "Path" field disappears
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  saraj 
      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 [7164]) changes made to display path name. Fixes #1153

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1153>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 00:57:16 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 07:57:16 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7165 - in
 /vtigercrm/trunk/modules/Users: Popup_picker.html Popup_picker_emails.html
Message-ID: <20060616075716.457DA18189C@vtiger.fosslabs.com>

Author: don
Date: Fri Jun 16 01:57:12 2006
New Revision: 7165

Log:
smartified so removed

Removed:
    vtigercrm/trunk/modules/Users/Popup_picker.html
    vtigercrm/trunk/modules/Users/Popup_picker_emails.html



From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 00:58:40 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 07:58:40 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7166 -
	/vtigercrm/trunk/Smarty/templates/Popup.tpl
Message-ID: <20060616075840.8853449A299@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 16 01:58:36 2006
New Revision: 7166

Log:
js function add_leaddata_to_relatedlist included

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

Modified: vtigercrm/trunk/Smarty/templates/Popup.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Popup.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Popup.tpl Fri Jun 16 01:58:36 2006
@@ -20,6 +20,10 @@
 function add_data_to_relatedlist(entity_id,recordid) {ldelim}
 
         opener.document.location.href="index.php?module={$RETURN_MODULE}&action=updateRelations&destination_module=Contacts&entityid="+entity_id+"&parid="+recordid;
+{rdelim}
+
+function add_leaddata_to_relatedlist(entity_id,recordid) {ldelim}
+        opener.document.location.href="index.php?module={$RETURN_MODULE}&action=updateRelations&destination_module=Leads&entityid="+entity_id+"&parid="+recordid;
 {rdelim}
 </script>
 <body class="small" marginwidth=0 marginheight=0 leftmargin=0 topmargin=0 bottommargin=0 rigthmargin=0>



From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 01:00:48 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 08:00:48 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7167 -
	/vtigercrm/trunk/include/utils/DetailViewUtils.php
Message-ID: <20060616080048.B948618189C@vtiger.fosslabs.com>

Author: don
Date: Fri Jun 16 02:00:45 2006
New Revision: 7167

Log:
link displayed for username in reports to field in users

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 Fri Jun 16 02:00:45 2006
@@ -125,7 +125,7 @@
 		$label_fld["secid"] = $account_id;
 		$label_fld["link"] = "index.php?module=Accounts&action=DetailView&record=".$account_id;
 	}
-	elseif($uitype == 52 || $uitype == 77)
+	elseif($uitype == 52 || $uitype == 77  || $uitype == 101)
 	{
 		$label_fld[] = $mod_strings[$fieldlabel];
 		$user_id = $col_fields[$fieldname];



From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 01:02:14 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 08:02:14 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231235=3A?=
 =?utf-8?q?_Outgoing_VS_OutGoing_-_Maili_Server_config=2E?=
In-Reply-To: <076.9f4f1255a0b8a49b0a0a3ec2cdef0c20@vtiger.fosslabs.com>
References: <076.9f4f1255a0b8a49b0a0a3ec2cdef0c20@vtiger.fosslabs.com>
Message-ID: <085.7bca0f118dd241fae85351a62fc4fccd@vtiger.fosslabs.com>

#1235: Outgoing VS OutGoing - Maili Server config.
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  saraj 
      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 [7168]) 'OutGoing' changed to 'Outgoing'. Fixes #1235

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1235>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 01:02:15 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 08:02:15 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7168 -
 /vtigercrm/trunk/modules/Settings/language/en_us.lang.php
Message-ID: <20060616080215.3C3F07ED2ED@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 16 02:02:11 2006
New Revision: 7168

Log:
'OutGoing' changed to 'Outgoing'. Fixes #1235

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 Fri Jun 16 02:02:11 2006
@@ -295,11 +295,11 @@
 
 'LBL_MAIL_SERVER_INFO'=>'Mail Server Information',
 
-'LBL_OUTGOING_MAIL_SERVER'=>'OutGoing Mail Server',
-
-'LBL_OUTGOING_MAIL_SERVER_LOGIN_USER_NAME'=>'OutGoing Mail Server Login User Name',
-
-'LBL_OUTGOING_MAIL_SERVER_PASSWORD'=>'OutGoing Mail Server Password',
+'LBL_OUTGOING_MAIL_SERVER'=>'Outgoing Mail Server',
+
+'LBL_OUTGOING_MAIL_SERVER_LOGIN_USER_NAME'=>'Outgoing Mail Server Login User Name',
+
+'LBL_OUTGOING_MAIL_SERVER_PASSWORD'=>'Outgoing Mail Server Password',
 
 'LBL_MAIL_SERVER_SMTP'=>'Mail Server (SMTP)',
 



From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 01:04:11 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 08:04:11 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7169 -
	/vtigercrm/trunk/Smarty/templates/RelatedLists.tpl
Message-ID: <20060616080411.6065249A299@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 16 02:04:06 2006
New Revision: 7169

Log:
js function add_leaddata_to_relatedlist included

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

Modified: vtigercrm/trunk/Smarty/templates/RelatedLists.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/RelatedLists.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/RelatedLists.tpl Fri Jun 16 02:04:06 2006
@@ -89,19 +89,25 @@
 							<input title="{$APP.LBL_ADD_NEW} {$APP.Product}" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='Products';this.form.return_module.value='{$MODULE}';this.form.return_action.value='CallRelatedList'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Product}"></td>				
 							{/if}	
 							{elseif $header eq 'Leads'}
+							{if $MODULE eq 'Campaigns'}
+                                                        <input title="Change" accessKey="" class="small" value="{$APP.LBL_SELECT_BUTTON_LABEL} {$APP.Lead}" LANGUAGE=javascript onclick='return window.open("index.php?module=Leads&return_module={$MODULE}&action=Popup&popuptype=detailview&select=enable&form=EditView&form_submit=false&recordid={$ID}","test","width=640,height=570,resizable=0,scrollbars=0");' type="button"  name="button">
+                                                        {/if}
                                                         <input title="{$APP.LBL_ADD_NEW} {$APP.Lead}" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='Leads'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Lead}"></td>
 							{elseif $header eq 'Contacts' }
-							{if $MODULE eq 'Activities' || $MODULE eq 'Potentials' || $MODULE eq 'Vendors' || $MODULE eq 'Campaigns'}
+							{if $MODULE eq 'Activities' || $MODULE eq 'Potentials' || $MODULE eq 'Vendors'}
                                                         <input title="Change" accessKey="" class="small" value="{$APP.LBL_SELECT_BUTTON_LABEL} {$APP.Contact}" LANGUAGE=javascript onclick='return window.open("index.php?module=Contacts&return_module={$MODULE}&action=Popup&popuptype=detailview&select=enable&form=EditView&form_submit=false&recordid={$ID}","test","width=640,height=570,resizable=0,scrollbars=0");' type="button"  name="button"></td>
 							{elseif $MODULE eq 'Emails'}
 							<input title="{$APP.LBL_BULK_MAILS}" accessykey="F" class="small" onclick="this.form.action.value='sendmail';this.form.return_action.value='DetailView';this.form.module.value='Emails';this.form.return_module.value='Emails';" name="button" value="{$APP.LBL_BULK_MAILS}" type="submit">&nbsp;
                                                         <input title="Change" accessKey="" class="small" value="{$APP.LBL_SELECT_BUTTON_LABEL} {$APP.Contact}" LANGUAGE=javascript onclick='return window.open("index.php?module=Contacts&return_module=Emails&action=Popup&popuptype=detailview&form=EditView&form_submit=false&recordid={$ID}","test","width=640,height=570,resizable=0,scrollbars=0");' type="button"  name="button"></td>
+							{elseif $MODULE eq 'Campaigns'}
+                                                        <input title="Change" accessKey="" class="small" value="{$APP.LBL_SELECT_BUTTON_LABEL} {$APP.Contact}" LANGUAGE=javascript onclick='return window.open("index.php?module=Contacts&return_module={$MODULE}&action=Popup&popuptype=detailview&select=enable&form=EditView&form_submit=false&recordid={$ID}","test","width=640,height=570,resizable=0,scrollbars=0");' type="button"  name="button">
+                                                        <input title="{$APP.LBL_ADD_NEW} {$APP.Contact}" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='Contacts'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Contact}"></td>
 							{else}
                                                         <input title="{$APP.LBL_ADD_NEW} {$APP.Contact}" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='Contacts'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Contact}"></td>
                                                         {/if}
 
 							{elseif $header eq 'Activities'}
-							{if $MODULE eq 'PurchaseOrder' || $MODULE eq 'Invoice' || $MODULE eq 'SalesOrder' || $MODULE eq 'Quotes'}	
+							{if $MODULE eq 'PurchaseOrder' || $MODULE eq 'Invoice' || $MODULE eq 'SalesOrder' || $MODULE eq 'Quotes' || $MODULE eq 'Campaigns'}	
 							<input type="hidden" name="activity_mode">
 							<input title="{$APP.LBL_ADD_NEW} {$APP.Task}" accessyKey="F" class="small" onclick="this.form.action.value='EditView'; this.form.return_action.value='CallRelatedList'; this.form.module.value='Activities'; this.form.return_module.value='{$MODULE}'; this.form.activity_mode.value='Task'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Task}"></td>
 							{else}



From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 01:06:35 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 08:06:35 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7170 -
	/vtigercrm/trunk/Smarty/templates/AddMailAccount.tpl
Message-ID: <20060616080635.8465649A299@vtiger.fosslabs.com>

Author: don
Date: Fri Jun 16 02:06:31 2006
New Revision: 7170

Log:
announcement issue has been fixed

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

Modified: vtigercrm/trunk/Smarty/templates/AddMailAccount.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/AddMailAccount.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/AddMailAccount.tpl Fri Jun 16 02:06:31 2006
@@ -10,11 +10,6 @@
  ********************************************************************************/
 -->*}
 <script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
-<script language="JavaScript" type="text/javascript" src="include/js/ColorPicker2.js"></script>
-<script language="JavaScript" type="text/javascript" src="include/js/prototype.js"></script>
-<script language="JavaScript" type="text/javascript" src="include/js/slider.js"></script>
-<script language="JavaScript" type="text/javascript" src="include/js/prototype_fade.js"></script>
-<script language="JavaScript" type="text/javascript" src="include/js/effectspack.js"></script>
 <style type="text/css">@import url(themes/blue/style.css);</style>
 
 



From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 01:09:17 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 08:09:17 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231233=3A?=
 =?utf-8?q?_ftp_Server_Name_-_Usage_of_language?=
In-Reply-To: <076.8bacf82bf2e5bf63cfebb5dfb0157357@vtiger.fosslabs.com>
References: <076.8bacf82bf2e5bf63cfebb5dfb0157357@vtiger.fosslabs.com>
Message-ID: <085.1131803ce9b936a55baa40949bba507a@vtiger.fosslabs.com>

#1233: ftp Server Name - Usage of language
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  saraj 
      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 [7171]) 'ftp' changed to 'FTP'. Fixes #1233

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1233>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 01:09:17 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 08:09:17 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7171 -
 /vtigercrm/trunk/modules/Settings/language/en_us.lang.php
Message-ID: <20060616080917.DAA1C7ED2F9@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 16 02:09:13 2006
New Revision: 7171

Log:
'ftp' changed to 'FTP'. Fixes #1233

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 Fri Jun 16 02:09:13 2006
@@ -305,11 +305,11 @@
 
 'LBL_BACKUP_SERVER_CONFIG'=>'Backup Server Configuration',
 
-'LBL_FTP_SERVER_NAME'=>'ftp Server Name',
-
-'LBL_FTP_USER_NAME'=>'ftp User Name',
-
-'LBL_FTP_PASSWORD'=>'ftp Password',
+'LBL_FTP_SERVER_NAME'=>'FTP Server Name',
+
+'LBL_FTP_USER_NAME'=>'FTP User Name',
+
+'LBL_FTP_PASSWORD'=>'FTP Password',
 
 'LBL_SYSTEM_CONFIG'=>'System Configuration',
 



From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 01:10:30 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 08:10:30 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7172 -
	/vtigercrm/trunk/include/utils/ListViewUtils.php
Message-ID: <20060616081031.1557749A299@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 16 02:10:27 2006
New Revision: 7172

Log:
changes made for leads popup

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 Fri Jun 16 02:10:27 2006
@@ -1282,10 +1282,15 @@
 				{
 					if($colname == "lastname" && $module == 'Contacts')
 						$firstname=$adb->query_result($list_result,$list_result_count,'firstname');
+					elseif($colname == "lastname" && $module == 'Leads')
+						$firstname=$adb->query_result($list_result,$list_result_count,'firstname');
 					$temp_val =$temp_val.' '.$firstname;
 
 					$focus->record_id = $_REQUEST['recordid'];
-					$value = '<a href="a" LANGUAGE=javascript onclick=\'add_data_to_relatedlist("'.$entity_id.'","'.$focus->record_id.'"); window.close()\'>'.$temp_val.'</a>';
+					if($module == 'Leads')
+						$value = '<a href="a" LANGUAGE=javascript onclick=\'add_leaddata_to_relatedlist("'.$entity_id.'","'.$focus->record_id.'"); window.close()\'>'.$temp_val.'</a>';
+					else
+						$value = '<a href="a" LANGUAGE=javascript onclick=\'add_data_to_relatedlist("'.$entity_id.'","'.$focus->record_id.'"); window.close()\'>'.$temp_val.'</a>';
 				}
 				elseif($popuptype == "formname_specific")
 				{



From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 01:55:47 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 08:55:47 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7173 -
 /vtigercrm/trunk/modules/Campaigns/updateRelations.php
Message-ID: <20060616085548.1C6557ED2FA@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 16 02:55:44 2006
New Revision: 7173

Log:
changes made to update lead data in campaign RL

Modified:
    vtigercrm/trunk/modules/Campaigns/updateRelations.php

Modified: vtigercrm/trunk/modules/Campaigns/updateRelations.php
==============================================================================
--- vtigercrm/trunk/modules/Campaigns/updateRelations.php (original)
+++ vtigercrm/trunk/modules/Campaigns/updateRelations.php Fri Jun 16 02:55:44 2006
@@ -12,7 +12,19 @@
 require_once('include/database/PearDatabase.php');
 global $adb;
 $idlist = $_REQUEST['idlist'];
-$returnmodule = $_REQUEST['return_module'];
+$update_mod = $_REQUEST['destination_module'];
+if($update_mod == 'Leads')
+{
+	$rel_table = 'vtiger_campaignleadrel';
+	$mod_table = 'vtiger_leaddetails';
+	$mod_field = 'leadid';
+}
+elseif($update_mod == 'Contacts')
+{
+	$rel_table = 'vtiger_campaigncontrel';
+	$mod_table = 'vtiger_contactdetails';
+	$mod_field = 'contactid';
+}
 if(isset($_REQUEST['idlist']) && $_REQUEST['idlist'] != '')
 {
 	//split the string and store in an array
@@ -21,9 +33,9 @@
 	{
 		if($id != '')
 		{
-		    $sql = "insert into  vtiger_campaigncontrel values(".$_REQUEST["parentid"]." , ".$id.")";
+		    $sql = "insert into  ".$rel_table." values(".$_REQUEST["parentid"]." , ".$id.")";
 	            $adb->query($sql);
-		    $sql = "update vtiger_contactdetails set campaignid = ".$_REQUEST["parentid"]." where contactid = ".$id;
+		    $sql = "update ".$mod_table." set campaignid = ".$_REQUEST["parentid"]." where ".$mod_field." = ".$id;
                     $adb->query($sql);
 		}
 	}
@@ -31,9 +43,9 @@
 }
 elseif(isset($_REQUEST['entityid']) && $_REQUEST['entityid'] != '')
 {	
-		$sql = "insert into vtiger_campaigncontrel values(".$_REQUEST["parid"].",".$_REQUEST["entityid"].")";
+		$sql = "insert into ".$rel_table." values(".$_REQUEST["parid"].",".$_REQUEST["entityid"].")";
 		$adb->query($sql);
-		$sql = "update vtiger_contactdetails set campaignid = ".$_REQUEST["parid"]." where contactid = ".$_REQUEST["entityid"];
+		$sql = "update ".$mod_table." set campaignid = ".$_REQUEST["parid"]." where ".$mod_field." = ".$_REQUEST["entityid"];
                 $adb->query($sql);
  		header("Location: index.php?action=CallRelatedList&module=Campaigns&record=".$_REQUEST["parid"]);
 }



From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 01:59:41 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 08:59:41 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7174 -
	/vtigercrm/trunk/modules/Emails/Email.php
Message-ID: <20060616085941.33A2A7ED2FA@vtiger.fosslabs.com>

Author: richie
Date: Fri Jun 16 02:59:36 2006
New Revision: 7174

Log:
corrected proper field name

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

Modified: vtigercrm/trunk/modules/Emails/Email.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/Email.php (original)
+++ vtigercrm/trunk/modules/Emails/Email.php Fri Jun 16 02:59:36 2006
@@ -304,7 +304,7 @@
 function get_to_emailids($module)
 {
 	global $adb;
-	$query = 'select columnname,fieldid from vtiger_field where vtiger_fieldid in('.ereg_replace(':',',',$_REQUEST["field_lists"]).')';
+	$query = 'select columnname,fieldid from vtiger_field where fieldid in('.ereg_replace(':',',',$_REQUEST["field_lists"]).')';
     $result = $adb->query($query);
 	$columns = Array();
 	$idlists = '';



From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 02:02:59 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 09:02:59 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7175 -
 /vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php
Message-ID: <20060616090259.E0A547ED305@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 16 03:02:56 2006
New Revision: 7175

Log:
changes made to update campaign data while converting lead

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

Modified: vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php (original)
+++ vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php Fri Jun 16 03:02:56 2006
@@ -272,7 +272,7 @@
 $contact_id = $crmcontactid;
 $log->debug("contact id is ".$contact_id);
 
- $sql_insert_contact = "INSERT INTO vtiger_contactdetails (contactid,accountid,salutation,firstname,lastname,email,phone,mobile,title,fax,yahooid) VALUES (".$contact_id.",".$crmid.",'".$row["salutationtype"] ."','" .$row["firstname"] ."','" .$row["lastname"] ."','" .$row["email"] ."','" .$row["phone"]. "','" .$row["mobile"] ."','" .$row["designation"] ."','".$row["fax"] ."','".$row['yahooid']."')";
+ $sql_insert_contact = "INSERT INTO vtiger_contactdetails (contactid,accountid,campaignid,salutation,firstname,lastname,email,phone,mobile,title,fax,yahooid) VALUES (".$contact_id.",".$crmid."," .$row["campaignid"]. ",'".$row["salutationtype"] ."','" .$row["firstname"] ."','" .$row["lastname"] ."','" .$row["email"] ."','" .$row["phone"]. "','" .$row["mobile"] ."','" .$row["designation"] ."','".$row["fax"] ."','".$row['yahooid']."')";
 
 $adb->query($sql_insert_contact);
 
@@ -323,7 +323,7 @@
 		$potential_amount=0;
         }
 
-	$sql_insert_opp = "INSERT INTO vtiger_potential (potentialid,accountid,potentialname,leadsource,closingdate,sales_stage,amount) VALUES (".$oppid.",".$crmid .",'".$potential_name."','".$row['leadsource']."','".$close_date."','".$potential_sales_stage."',".$potential_amount.")";
+	$sql_insert_opp = "INSERT INTO vtiger_potential (potentialid,accountid,campaignid,potentialname,leadsource,closingdate,sales_stage,amount) VALUES (".$oppid.",".$crmid .",".$row["campaignid"]. ",'".$potential_name."','".$row['leadsource']."','".$close_date."','".$potential_sales_stage."',".$potential_amount.")";
 
 	$adb->query($sql_insert_opp);
 



From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 02:05:27 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 09:05:27 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231211=3A?=
 =?utf-8?q?_emails_related_to_contact_not_shown_in_contact_related_list?=
In-Reply-To: <076.68324496101fd75efdb14aeacd9abb05@vtiger.fosslabs.com>
References: <076.68324496101fd75efdb14aeacd9abb05@vtiger.fosslabs.com>
Message-ID: <085.bc42ca152b54b48c106c0471ad9e7fa2@vtiger.fosslabs.com>

#1211: emails related to contact not shown in contact related list
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  richie
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 (In [7176]) Fixes #1211

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1211>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 02:05:28 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 09:05:28 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7176 -
	/vtigercrm/trunk/modules/Emails/mailsend.php
Message-ID: <20060616090528.5C9D87ED30B@vtiger.fosslabs.com>

Author: richie
Date: Fri Jun 16 03:05:23 2006
New Revision: 7176

Log:
Fixes #1211

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

Modified: vtigercrm/trunk/modules/Emails/mailsend.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/mailsend.php (original)
+++ vtigercrm/trunk/modules/Emails/mailsend.php Fri Jun 16 03:05:23 2006
@@ -188,8 +188,8 @@
 $adb->println("Mail Sending Process has been finished.\n\n");
 if(isset($_REQUEST['popupaction']) && $_REQUEST['popupaction'] != '')
 {
-	//$inputs="<script>window.opener.location.href=window.opener.location.href;window.self.close();</script>";
-	$inputs="<script>window.self.close();</script>";
+	//this will fix #1211
+	$inputs="<script>window.opener.location.href=window.opener.location.href;window.self.close();</script>";
 	echo $inputs;
 }
 //header("Location:index.php?module=$returnmodule&action=$returnaction&record=$returnid&$returnset&$mail_error_str");



From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 02:08:45 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 09:08:45 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=23810=3A_?=
	=?utf-8?q?Creating_New_Potential?=
In-Reply-To: <076.b82f5ddc46ef8a0cb2806330580b0dba@vtiger.fosslabs.com>
References: <076.b82f5ddc46ef8a0cb2806330580b0dba@vtiger.fosslabs.com>
Message-ID: <085.7637c510e7289737655ff2a86f72e192@vtiger.fosslabs.com>

#810: Creating New Potential
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  richie
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  invalid    |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * resolution:  => invalid
  * status:  assigned => closed

Comment:

 closing this as no info to follow up on

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/810>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 02:12:14 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 09:12:14 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23958=3A_?=
 =?utf-8?q?Form_Validation_in_Potential_not_Proper?=
In-Reply-To: <076.b9e85f1cd53d96e1ff34954b81dc868e@vtiger.fosslabs.com>
References: <076.b9e85f1cd53d96e1ff34954b81dc868e@vtiger.fosslabs.com>
Message-ID: <085.673a657550a9402e6373fb1d40faa650@vtiger.fosslabs.com>

#958: Form Validation in Potential not Proper
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  mangai
      Type:  defect     |      Status:  closed
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  wontfix    |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * resolution:  => wontfix
  * status:  new => closed

Comment:

 will not b fixed. let us wait for community reaction to this issue.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/958>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 02:15:07 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 09:15:07 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=23224=3A_?=
	=?utf-8?q?Validation_not_proper?=
In-Reply-To: <076.8342f02ae6134b90ef70026e212bd85e@vtiger.fosslabs.com>
References: <076.8342f02ae6134b90ef70026e212bd85e@vtiger.fosslabs.com>
Message-ID: <085.1a7287c8f1a02fd6e62c642ff584533f@vtiger.fosslabs.com>

#224: Validation not proper
---------------------------+------------------------------------------------
  Reporter:  jerrydgeorge  |       Owner:  mangai    
      Type:  defect        |      Status:  closed    
  Priority:  major         |   Milestone:            
 Component:  vtigercrm     |     Version:  5.0.0     
Resolution:  wontfix       |    Keywords:  validation
---------------------------+------------------------------------------------
Changes (by richie):

  * resolution:  => wontfix
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/224>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 02:15:17 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 09:15:17 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=23227=3A_?=
	=?utf-8?q?Validation_not_proper?=
In-Reply-To: <076.4d0af3665d7fb13a9e1f2ab8cf2d2a62@vtiger.fosslabs.com>
References: <076.4d0af3665d7fb13a9e1f2ab8cf2d2a62@vtiger.fosslabs.com>
Message-ID: <085.d3549934109932229067bffebc23370c@vtiger.fosslabs.com>

#227: Validation not proper
---------------------------+------------------------------------------------
  Reporter:  jerrydgeorge  |       Owner:  mangai    
      Type:  defect        |      Status:  closed    
  Priority:  major         |   Milestone:            
 Component:  vtigercrm     |     Version:  5.0.0     
Resolution:  wontfix       |    Keywords:  validation
---------------------------+------------------------------------------------
Changes (by richie):

  * resolution:  => wontfix
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/227>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 02:15:33 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 09:15:33 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=23650=3A_?=
	=?utf-8?q?Create_View_Issue?=
In-Reply-To: <076.533f9bf1a724614bf3d2b0408f730475@vtiger.fosslabs.com>
References: <076.533f9bf1a724614bf3d2b0408f730475@vtiger.fosslabs.com>
Message-ID: <085.9d5c056e20e0a17ee6c2986d2dd02492@vtiger.fosslabs.com>

#650: Create View Issue
---------------------------+------------------------------------------------
  Reporter:  jerrydgeorge  |       Owner:  mangai     
      Type:  defect        |      Status:  closed     
  Priority:  major         |   Milestone:             
 Component:  vtigercrm     |     Version:  5.0.0      
Resolution:  fixed         |    Keywords:  Create View
---------------------------+------------------------------------------------
Changes (by minnie):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/650>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 02:15:41 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 09:15:41 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23749=3A_?=
 =?utf-8?q?Bugs_with_apostrophes_in_Lead_conversion_and_Helpdesk_ticket?=
In-Reply-To: <076.6c5a8e4857db1ceb5cdfe4078eda9b17@vtiger.fosslabs.com>
References: <076.6c5a8e4857db1ceb5cdfe4078eda9b17@vtiger.fosslabs.com>
Message-ID: <085.a8d3390a09b90cfdf36415d39edeb2af@vtiger.fosslabs.com>

#749: Bugs with apostrophes in Lead conversion and Helpdesk ticket
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  mickie               
      Type:  defect     |      Status:  new                  
  Priority:  major      |   Milestone:                       
 Component:  vtigercrm  |     Version:  5.0.0                
Resolution:             |    Keywords:  apostrophe conversion
------------------------+---------------------------------------------------
Changes (by richie):

  * owner:  mangai => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/749>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 02:15:58 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 09:15:58 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23902=3A_?=
 =?utf-8?q?yahoo_id_is_not_validated_in_create_contact?=
In-Reply-To: <076.4b5ea1d99ba4583cebb1764d6707acbf@vtiger.fosslabs.com>
References: <076.4b5ea1d99ba4583cebb1764d6707acbf@vtiger.fosslabs.com>
Message-ID: <085.737fef1201f535f268eb7295667d7d35@vtiger.fosslabs.com>

#902: yahoo id is not validated in create contact
------------------------+---------------------------------------------------
  Reporter:  mickie     |       Owner:  mangai
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  wontfix    |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * resolution:  => wontfix
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/902>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 02:16:06 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 09:16:06 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23936=3A_?=
 =?utf-8?q?validation_not_performed_in_chat_window?=
In-Reply-To: <076.4a509e9ad2dcb708710e1319ff1b284e@vtiger.fosslabs.com>
References: <076.4a509e9ad2dcb708710e1319ff1b284e@vtiger.fosslabs.com>
Message-ID: <085.4af6f48cb428b04a674e0d8cff664e7c@vtiger.fosslabs.com>

#936: validation not performed in chat window
------------------------+---------------------------------------------------
  Reporter:  mickie     |       Owner:  mangai
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  wontfix    |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * resolution:  => wontfix
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/936>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 02:16:20 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 09:16:20 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231101=3A?=
 =?utf-8?q?_UI_issue_View_Names_for_Calendar?=
In-Reply-To: <076.b7a056cbb88a5a06ee49d953312cc2d3@vtiger.fosslabs.com>
References: <076.b7a056cbb88a5a06ee49d953312cc2d3@vtiger.fosslabs.com>
Message-ID: <085.76d6045cd5601d6986f0be626b8c4d9b@vtiger.fosslabs.com>

#1101: UI issue View Names for Calendar
---------------------------+------------------------------------------------
  Reporter:  jerrydgeorge  |       Owner:  saint
      Type:  defect        |      Status:  new  
  Priority:  major         |   Milestone:       
 Component:  vtigercrm     |     Version:  5.0.0
Resolution:                |    Keywords:       
---------------------------+------------------------------------------------
Changes (by richie):

  * owner:  mangai => saint

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1101>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 02:17:57 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 09:17:57 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231253=3A?=
 =?utf-8?q?_Campaigns_Cannot_Assign_To_Existing_Contacts=2C_Leads_or_Accou?=
 =?utf-8?q?nts?=
In-Reply-To: <076.329f0bfa1e61cd49791cee91bbc8d6ba@vtiger.fosslabs.com>
References: <076.329f0bfa1e61cd49791cee91bbc8d6ba@vtiger.fosslabs.com>
Message-ID: <085.c0fb630606d59771667deafc62b9121b@vtiger.fosslabs.com>

#1253: Campaigns Cannot Assign To Existing Contacts, Leads or Accounts
------------------------------------+---------------------------------------
  Reporter:  robbie-w at boston.ac.uk  |       Owner:  mangai
      Type:  task                   |      Status:  closed
  Priority:  major                  |   Milestone:        
 Component:  vtigercrm              |     Version:  5.0.0 
Resolution:  fixed                  |    Keywords:        
------------------------------------+---------------------------------------
Changes (by minnie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 Accounts will not be related as of now.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1253>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 02:24:13 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 09:24:13 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7177 -
	/vtigercrm/trunk/install.php
Message-ID: <20060616092413.DF7247ED311@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 16 03:24:09 2006
New Revision: 7177

Log:
copyright info added in installation pages. Fixes #1085

Modified:
    vtigercrm/trunk/install.php

Modified: vtigercrm/trunk/install.php
==============================================================================
--- vtigercrm/trunk/install.php (original)
+++ vtigercrm/trunk/install.php Fri Jun 16 03:24:09 2006
@@ -49,4 +49,25 @@
 
 include("install/".$the_file);
 
+echo "<style>
+		.bggray
+		{
+			background-color: #dfdfdf;
+		}
+	.bgwhite
+	{
+		background-color: #FFFFFF;
+	}
+	.copy
+	{
+		font-size:9px;
+		font-family: Verdana, Arial, Helvetica, Sans-serif;
+	}
+	</style>
+	<script language = 'JavaScript' type='text/javascript' src = 'include/js/popup.js'></script>
+	<table width=20% border=0 cellspacing=1 cellpadding=0 class=\"bggray\" align=center><tr><td align=center>\n
+	<table width=100% border=0 cellspacing=1 cellpadding=0 class=\"bgwhite\" align=center><tr><td align=center class=\"copy\">\n
+	&copy; Click <a href ='javascript:mypopup()'>here</a> for Copyright details.<br>
+	</td></tr></table></td></tr></table>\n";
+
 ?>



From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 02:24:13 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 09:24:13 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231085=3A?=
 =?utf-8?q?_Copyright_message_missed_in_Installer?=
In-Reply-To: <076.ca4f7110cd4c9640e7ef0f709ef932b5@vtiger.fosslabs.com>
References: <076.ca4f7110cd4c9640e7ef0f709ef932b5@vtiger.fosslabs.com>
Message-ID: <085.2581f1fd0cef89945bac805265287832@vtiger.fosslabs.com>

#1085: Copyright message missed in Installer
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  saraj 
      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 [7177]) copyright info added in installation pages. Fixes #1085

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1085>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 02:25:18 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 09:25:18 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23639=3A_?=
 =?utf-8?q?issue_in_notification_schedular?=
In-Reply-To: <076.f200a972484f8418950e2e27d65d4d44@vtiger.fosslabs.com>
References: <076.f200a972484f8418950e2e27d65d4d44@vtiger.fosslabs.com>
Message-ID: <085.d2865d94fa80e301097d57b8baa718ca@vtiger.fosslabs.com>

#639: issue in notification schedular
--------------------------------+-------------------------------------------
  Reporter:  minnie at vtiger.com  |       Owner:  philip
      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

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/639>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 02:40:06 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 09:40:06 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231303=3A?=
 =?utf-8?q?_Invoice=2C_Sales_Orders=2C_Quotes?=
In-Reply-To: <076.3417cd31c74551f10ccb510284b2b2f8@vtiger.fosslabs.com>
References: <076.3417cd31c74551f10ccb510284b2b2f8@vtiger.fosslabs.com>
Message-ID: <085.aed0b9517d349c50c5636f26823790e7@vtiger.fosslabs.com>

#1303: Invoice, Sales Orders, Quotes
---------------------------+------------------------------------------------
  Reporter:  anthony11221  |       Owner:  mickie                   
      Type:  defect        |      Status:  new                      
  Priority:  major         |   Milestone:  5.0.0                    
 Component:  vtigercrm     |     Version:  5.0.1                    
Resolution:                |    Keywords:  invoice sales order quote
---------------------------+------------------------------------------------
Changes (by mickie):

  * version:  5.0.0 => 5.0.1

Comment:

 Delete for the first row in Product Details will not be given. if you want
 to delete that product in first row then you should select another product
 ie., overwrite with another product because if we deleted that first row
 we cannot validate whether the product has been given or not where as
 product is mandatory to create PO, SO, Quotes and Invoice.

 Regarding add same product more than once and override the ListPrice value
 we will look into that and then take in our future release.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1303>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 02:41:46 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 09:41:46 -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.932bd0333a6727d659b20d1c6ebf81be@vtiger.fosslabs.com>

#474: UI issue in global search
------------------------+---------------------------------------------------
  Reporter:  don        |       Owner:  mickie
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  wontfix    |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * resolution:  => wontfix
  * status:  assigned => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/474>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 02:48:06 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 09:48:06 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7178 - in
 /vtigercrm/trunk/modules/Accounts: Account.php ListViewTop.php Merge.php
 Popup_picker.php
Message-ID: <20060616094806.5D6EB7ED307@vtiger.fosslabs.com>

Author: don
Date: Fri Jun 16 03:48:00 2006
New Revision: 7178

Log:
Fixed issues in vtiger_ prefixing in table names

Modified:
    vtigercrm/trunk/modules/Accounts/Account.php
    vtigercrm/trunk/modules/Accounts/ListViewTop.php
    vtigercrm/trunk/modules/Accounts/Merge.php
    vtigercrm/trunk/modules/Accounts/Popup_picker.php

Modified: vtigercrm/trunk/modules/Accounts/Account.php
==============================================================================
--- vtigercrm/trunk/modules/Accounts/Account.php (original)
+++ vtigercrm/trunk/modules/Accounts/Account.php Fri Jun 16 03:48:00 2006
@@ -38,7 +38,7 @@
 	var $log;
 	var $db;
 
-	var $table_name = "account";
+	var $table_name = "vtiger_account";
 	var $tab_name = Array('vtiger_crmentity','vtiger_account','vtiger_accountbillads','vtiger_accountshipads','vtiger_accountscf');
 	var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_account'=>'accountid','vtiger_accountbillads'=>'accountaddressid','vtiger_accountshipads'=>'accountaddressid','vtiger_accountscf'=>'accountid');
 
@@ -258,8 +258,8 @@
 				ON vtiger_groups.groupname = vtiger_activitygrouprelation.groupname
 			WHERE vtiger_seactivityrel.crmid = ".$id."
 			AND (activitytype='Task'
-				OR vtiger_activitytype='Call'
-				OR vtiger_activitytype='Meeting')
+				OR activitytype='Call'
+				OR activitytype='Meeting')
 			AND vtiger_crmentity.deleted = 0
 			AND ((vtiger_activity.status IS NOT NULL
 					AND vtiger_activity.status != 'Completed')
@@ -669,7 +669,7 @@
 	{
 		global $log;
                 $log->debug("Entering getColumnNames_Acnt() method ...");
-		$sql1 = "SELECT vtiger_fieldlabel FROM vtiger_field WHERE vtiger_tabid = 6";
+		$sql1 = "SELECT fieldlabel FROM vtiger_field WHERE tabid = 6";
 		$result = $this->db->query($sql1);
 		$numRows = $this->db->num_rows($result);
 		for($i=0; $i < $numRows;$i++)

Modified: vtigercrm/trunk/modules/Accounts/ListViewTop.php
==============================================================================
--- vtigercrm/trunk/modules/Accounts/ListViewTop.php (original)
+++ vtigercrm/trunk/modules/Accounts/ListViewTop.php Fri Jun 16 03:48:00 2006
@@ -21,7 +21,7 @@
  ********************************************************************************/
 function getTopAccounts()
 {
-	$log = LoggerManager::getLogger('top vtiger_accounts_list');
+	$log = LoggerManager::getLogger('top accounts_list');
 	$log->debug("Entering getTopAccounts() method ...");
 	require_once("data/Tracker.php");
 	require_once('modules/Potentials/Opportunity.php');

Modified: vtigercrm/trunk/modules/Accounts/Merge.php
==============================================================================
--- vtigercrm/trunk/modules/Accounts/Merge.php (original)
+++ vtigercrm/trunk/modules/Accounts/Merge.php Fri Jun 16 03:48:00 2006
@@ -87,7 +87,7 @@
 if(count($deleted_id) > 0)
 {
 	$deleted_id = implode(",",$deleted_id);
-	$update_query = "update vtiger_contactdetails set vtiger_accountid = 0 where contactid in (".$deleted_id.")";
+	$update_query = "update vtiger_contactdetails set accountid = 0 where contactid in (".$deleted_id.")";
 	$result = $adb->query($update_query);
 }
 //End setting vtiger_accountid=0 for the contacts which are deleted
@@ -209,7 +209,7 @@
 $csvdata = implode($mergevalue,"###");
 }else
 {
-	die("No vtiger_fields to do Merge");
+	die("No fields to do Merge");
 }
 
 $handle = fopen($wordtemplatedownloadpath."datasrc.csv","wb");

Modified: vtigercrm/trunk/modules/Accounts/Popup_picker.php
==============================================================================
--- vtigercrm/trunk/modules/Accounts/Popup_picker.php (original)
+++ vtigercrm/trunk/modules/Accounts/Popup_picker.php Fri Jun 16 03:48:00 2006
@@ -99,9 +99,9 @@
 if($_REQUEST['form'] == 'TasksEditView')
 {
 	$the_javascript  = "<script type='text/javascript' language='JavaScript'>\n";
-	$the_javascript .= "function set_return(account_id, vtiger_account_name) {\n";
-	$the_javascript .= "	window.opener.document.EditView.parent_name.value = vtiger_account_name;\n";
-	$the_javascript .= "	window.opener.document.EditView.parent_id.value = vtiger_account_id;\n";
+	$the_javascript .= "function set_return(account_id, account_name) {\n";
+	$the_javascript .= "	window.opener.document.EditView.parent_name.value = account_name;\n";
+	$the_javascript .= "	window.opener.document.EditView.parent_id.value = account_id;\n";
 	$the_javascript .= "}\n";
 	$the_javascript .= "</script>\n";
 	$button  = "<table cellspacing='0' cellpadding='1' border='0'><form border='0' action='index.php' method='post' name='form' id='form'>\n";
@@ -113,9 +113,9 @@
 elseif($_REQUEST['form'] == 'HelpDeskEditView')
 {
 	$the_javascript  = "<script type='text/javascript' language='JavaScript'>\n";
-	$the_javascript .= "function set_return(account_id, vtiger_account_name) {\n";
-	$the_javascript .= "	window.opener.document.EditView.parent_name.value = vtiger_account_name;\n";
-	$the_javascript .= "	window.opener.document.EditView.parent_id.value = vtiger_account_id;\n";
+	$the_javascript .= "function set_return(account_id, account_name) {\n";
+	$the_javascript .= "	window.opener.document.EditView.parent_name.value = account_name;\n";
+	$the_javascript .= "	window.opener.document.EditView.parent_id.value = account_id;\n";
 	$the_javascript .= "}\n";
 	$the_javascript .= "</script>\n";
 	$button  = "<table cellspacing='0' cellpadding='1' border='0'><form border='0' action='index.php' method='post' name='form' id='form'>\n";
@@ -127,8 +127,8 @@
 elseif(isset($_REQUEST['form_submit']) && $_REQUEST['form'] == 'AccountDetailView' && $_REQUEST['form_submit'] == 'true')
 {
 	$the_javascript  = "<script type='text/javascript' language='JavaScript'>\n";
-	$the_javascript .= "function set_return(account_id, vtiger_account_name) {\n";
-	$the_javascript .= "	window.opener.document.DetailView.member_id.value = vtiger_account_id; \n";
+	$the_javascript .= "function set_return(account_id, account_name) {\n";
+	$the_javascript .= "	window.opener.document.DetailView.member_id.value = account_id; \n";
 	$the_javascript .= "	window.opener.document.DetailView.return_module.value = window.opener.document.DetailView.module.value; \n";
 	$the_javascript .= "	window.opener.document.DetailView.return_action.value = 'DetailView'; \n";
 	$the_javascript .= "	window.opener.document.DetailView.return_id.value = window.opener.document.DetailView.record.value; \n";
@@ -144,9 +144,9 @@
 elseif ($_REQUEST['form'] == 'EditView') 
 {
 	$the_javascript  = "<script type='text/javascript' language='JavaScript'>\n";
-	$the_javascript .= "function set_return(account_id, vtiger_account_name) {\n";
-	$the_javascript .= "	window.opener.document.EditView.account_name.value = vtiger_account_name;\n";
-	$the_javascript .= "	window.opener.document.EditView.account_id.value = vtiger_account_id;\n";
+	$the_javascript .= "function set_return(account_id, account_name) {\n";
+	$the_javascript .= "	window.opener.document.EditView.account_name.value = account_name;\n";
+	$the_javascript .= "	window.opener.document.EditView.account_id.value = account_id;\n";
 	$the_javascript .= "}\n";
 	$the_javascript .= "</script>\n";
 	$button  = "<table cellspacing='0' cellpadding='1' border='0'><form border='0' action='index.php' method='post' name='form' id='form'>\n";



From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 02:49:54 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 09:49:54 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231248=3A?=
	=?utf-8?q?_Invoice_/_SO_/_PO?=
In-Reply-To: <076.e4d8f1e341c634b1bfe89089253ec586@vtiger.fosslabs.com>
References: <076.e4d8f1e341c634b1bfe89089253ec586@vtiger.fosslabs.com>
Message-ID: <085.629740a5432ae0f5abe3bef73dfb9c11@vtiger.fosslabs.com>

#1248: Invoice / SO / PO
--------------------------+-------------------------------------------------
  Reporter:  anonymous    |       Owner:  mickie
      Type:  enhancement  |      Status:  new   
  Priority:  major        |   Milestone:        
 Component:  vtigercrm    |     Version:  5.0.1 
Resolution:               |    Keywords:        
--------------------------+-------------------------------------------------
Changes (by mickie):

  * version:  5.0.0 => 5.0.1
  * type:  defect => enhancement

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1248>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 02:55:28 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 09:55:28 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23857=3A_?=
 =?utf-8?q?Links_in_Communication_Templates_Headings?=
In-Reply-To: <076.b701bab91b5663913e5b005347f8c28e@vtiger.fosslabs.com>
References: <076.b701bab91b5663913e5b005347f8c28e@vtiger.fosslabs.com>
Message-ID: <085.b21519426280561c2c7ccd127391a834@vtiger.fosslabs.com>

#857: Links in Communication Templates Headings
--------------------------+-------------------------------------------------
  Reporter:  mangai       |       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 is fixed with New UI for Settings.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/857>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 03:00:11 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 10:00:11 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23927=3A_?=
 =?utf-8?q?Shortcut_=22New_Account=22_doesn=27t_work?=
In-Reply-To: <076.97aed0717bb7c14bc4216213f908cd2e@vtiger.fosslabs.com>
References: <076.97aed0717bb7c14bc4216213f908cd2e@vtiger.fosslabs.com>
Message-ID: <085.c1f3070f3fa36cb0b0047531daa0eb64@vtiger.fosslabs.com>

#927: Shortcut "New Account" doesn't work
------------------------+---------------------------------------------------
  Reporter:  neofis     |       Owner:  ahmed           
      Type:  defect     |      Status:  closed          
  Priority:  major      |   Milestone:                  
 Component:  vtigercrm  |     Version:  5.0.0           
Resolution:  fixed      |    Keywords:  New Account menu
------------------------+---------------------------------------------------
Changes (by ahmed):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 Issue Fixed - Now we have a dummy Quick Create text as the 1st select
 option.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/927>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 03:00:33 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 10:00:33 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231141=3A?=
 =?utf-8?q?_mandatory_shown_but_not_so?=
In-Reply-To: <076.02fcc522483405a938931a6090a37b4c@vtiger.fosslabs.com>
References: <076.02fcc522483405a938931a6090a37b4c@vtiger.fosslabs.com>
Message-ID: <085.233a620b7bb0cf931b22ef1a2e257459@vtiger.fosslabs.com>

#1141: mandatory shown but not so
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  mickie
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:  PO    
------------------------+---------------------------------------------------
Changes (by mickie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 Product Details are validated correctly in 5.0Beta.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1141>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 03:02:46 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 10:02:46 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231138=3A?=
 =?utf-8?q?_could_be_made_more_usable?=
In-Reply-To: <076.6260faca7a3dab8756ec45d2be226913@vtiger.fosslabs.com>
References: <076.6260faca7a3dab8756ec45d2be226913@vtiger.fosslabs.com>
Message-ID: <085.c0fac00f5fd7f0fcaa1c1d9cdec05bf2@vtiger.fosslabs.com>

#1138: could be made more usable
--------------------------+-------------------------------------------------
  Reporter:  richie       |       Owner:  mickie
      Type:  enhancement  |      Status:  new   
  Priority:  major        |   Milestone:        
 Component:  vtigercrm    |     Version:  5.0.1 
Resolution:               |    Keywords:        
--------------------------+-------------------------------------------------
Changes (by mickie):

  * version:  5.0.0 => 5.0.1
  * type:  defect => enhancement

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1138>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 03:03:57 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 10:03:57 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231064=3A?=
 =?utf-8?q?_Check_for_uploading_only_=2Edoc_=26_=2Ertf_files_missing?=
In-Reply-To: <076.eba850e718f7a468f321f45d292974b7@vtiger.fosslabs.com>
References: <076.eba850e718f7a468f321f45d292974b7@vtiger.fosslabs.com>
Message-ID: <085.214505e29bb3cb671beb39c53530877b@vtiger.fosslabs.com>

#1064: Check for uploading only .doc & .rtf files missing
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  ahmed 
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  duplicate  |    Keywords:        
------------------------+---------------------------------------------------
Changes (by anonymous):

  * resolution:  => duplicate
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1064>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 03:04:46 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 10:04:46 -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.34cf4cffb556c3e9b9fb18b523c165e6@vtiger.fosslabs.com>

#459: Highliting of the search criteria in global search
--------------------------+-------------------------------------------------
  Reporter:  don          |       Owner:  mickie  
      Type:  enhancement  |      Status:  assigned
  Priority:  major        |   Milestone:  5.0.0   
 Component:  vtigercrm    |     Version:  5.0.1   
Resolution:               |    Keywords:          
--------------------------+-------------------------------------------------
Changes (by richie):

  * type:  defect => enhancement

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/459>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 03:04:36 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 10:04:36 -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.79fa6b27be71a9adf592eadca896d156@vtiger.fosslabs.com>

#455: Pagination is not supported in global search
--------------------------+-------------------------------------------------
  Reporter:  don          |       Owner:  mickie  
      Type:  enhancement  |      Status:  assigned
  Priority:  major        |   Milestone:          
 Component:  vtigercrm    |     Version:  5.0.1   
Resolution:               |    Keywords:          
--------------------------+-------------------------------------------------
Changes (by richie):

  * type:  defect => enhancement

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/455>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 03:06:02 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 10:06:02 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231259=3A?=
	=?utf-8?q?_i18n_issues_with_Beta?=
In-Reply-To: <076.f7b53125520cc2d8322c4161c2676a8c@vtiger.fosslabs.com>
References: <076.f7b53125520cc2d8322c4161c2676a8c@vtiger.fosslabs.com>
Message-ID: <085.5959be52873ed2fda2134312d312f0dc@vtiger.fosslabs.com>

#1259: i18n issues with Beta
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       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:

 Issues fixed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1259>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 03:06:39 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 10:06:39 -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.b11c74cb5f35be1e1d0033cb8102ae25@vtiger.fosslabs.com>

#470: Enhancement in Global Search
--------------------------+-------------------------------------------------
  Reporter:  don          |       Owner:  mickie  
      Type:  enhancement  |      Status:  assigned
  Priority:  major        |   Milestone:  5.0.0   
 Component:  vtigercrm    |     Version:  5.0.1   
Resolution:               |    Keywords:          
--------------------------+-------------------------------------------------
Changes (by anonymous):

  * type:  defect => enhancement

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/470>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 03:07:28 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 10:07:28 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23918=3A_?=
 =?utf-8?q?Global_search_function_shows_wrong_results?=
In-Reply-To: <076.a484dea87ad7ce51b1edd92f46c3ba8a@vtiger.fosslabs.com>
References: <076.a484dea87ad7ce51b1edd92f46c3ba8a@vtiger.fosslabs.com>
Message-ID: <085.3fad67b1bc90f8af4fa21ac09ed775ac@vtiger.fosslabs.com>

#918: Global search function shows wrong results
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  richie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * owner:  mickie => richie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/918>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 03:07:38 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 10:07:38 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231265=3A?=
 =?utf-8?q?_Global_Search_Function_throws_error?=
In-Reply-To: <076.76671c46776deb9518824e095947cbde@vtiger.fosslabs.com>
References: <076.76671c46776deb9518824e095947cbde@vtiger.fosslabs.com>
Message-ID: <085.0117b548c0234d1e33e8feacf6555b18@vtiger.fosslabs.com>

#1265: Global Search Function throws error
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  richie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * owner:  mickie => richie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1265>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 03:08:21 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 10:08:21 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231081=3A?=
 =?utf-8?q?_Yahoo_ID_at_mails_from_contacts?=
In-Reply-To: <076.559e47f8ca8be49e3698d4378d040b16@vtiger.fosslabs.com>
References: <076.559e47f8ca8be49e3698d4378d040b16@vtiger.fosslabs.com>
Message-ID: <085.443fae7a8ec2c5d11a3a37915c92b727@vtiger.fosslabs.com>

#1081: Yahoo ID at mails from contacts
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  ahmed 
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  wontfix    |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * resolution:  => wontfix
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1081>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 03:11:23 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 10:11:23 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231289=3A?=
 =?utf-8?q?_Edit/Del_links_are_must_in_relatedlists?=
In-Reply-To: <076.c2484dcccdec49e5b30c79bee458fec5@vtiger.fosslabs.com>
References: <076.c2484dcccdec49e5b30c79bee458fec5@vtiger.fosslabs.com>
Message-ID: <085.971d378126729ca30737aabc0f03e9ec@vtiger.fosslabs.com>

#1289: Edit/Del links are must in relatedlists
------------------------+---------------------------------------------------
  Reporter:  mickie     |       Owner:  mickie
      Type:  task       |      Status:  new   
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * owner:  ahmed => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1289>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 03:12:03 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 10:12:03 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23540=3A_?=
 =?utf-8?q?No_Parenttab_for_attachments?=
In-Reply-To: <076.797e4af97597407a1eca0a9f8d46ceb4@vtiger.fosslabs.com>
References: <076.797e4af97597407a1eca0a9f8d46ceb4@vtiger.fosslabs.com>
Message-ID: <085.e82a7a549f4e92358f200ae624dc6e4b@vtiger.fosslabs.com>

#540: No Parenttab for attachments
---------------------------+------------------------------------------------
  Reporter:  jerrydgeorge  |       Owner:  ahmed 
      Type:  defect        |      Status:  closed
  Priority:  major         |   Milestone:        
 Component:  vtigercrm     |     Version:  5.0.0 
Resolution:  fixed         |    Keywords:  UI    
---------------------------+------------------------------------------------
Changes (by richie):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/540>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 03:12:35 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 10:12:35 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23895=3A_?=
 =?utf-8?q?inconsistency_attachment_=26_notes_in_relatedlist?=
In-Reply-To: <076.79c7c9588e335e83363cae55ee4ba916@vtiger.fosslabs.com>
References: <076.79c7c9588e335e83363cae55ee4ba916@vtiger.fosslabs.com>
Message-ID: <085.30754082ed36e860b3ae61ceae30f410@vtiger.fosslabs.com>

#895: inconsistency attachment & notes in relatedlist
------------------------+---------------------------------------------------
  Reporter:  mickie     |       Owner:  mickie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * owner:  ahmed => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/895>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 03:13:10 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 10:13:10 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231307=3A?=
 =?utf-8?q?_Print_function_missing_in_Beta?=
In-Reply-To: <076.d87e178fda241c6536574413a592943f@vtiger.fosslabs.com>
References: <076.d87e178fda241c6536574413a592943f@vtiger.fosslabs.com>
Message-ID: <085.ef67e710c0f870b397dac156e5e5b68a@vtiger.fosslabs.com>

#1307: Print function missing in Beta
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  philip
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * owner:  ahmed => philip

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1307>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 03:13:21 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 10:13:21 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23169=3A_?=
 =?utf-8?q?missing_parent_tab_in_import_steps?=
In-Reply-To: <076.fa0e7db7145b84cd9df79a70a28c175a@vtiger.fosslabs.com>
References: <076.fa0e7db7145b84cd9df79a70a28c175a@vtiger.fosslabs.com>
Message-ID: <085.fd999fdc328044160eb6bd9bfb8db8aa@vtiger.fosslabs.com>

#169: missing parent tab in import steps
---------------------------+------------------------------------------------
  Reporter:  jerrydgeorge  |       Owner:  mickie
      Type:  defect        |      Status:  new   
  Priority:  minor         |   Milestone:  5.0.0 
 Component:  vtigercrm     |     Version:  5.0.0 
Resolution:                |    Keywords:  import
---------------------------+------------------------------------------------
Changes (by richie):

  * owner:  ahmed => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/169>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 03:13:54 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 10:13:54 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231096=3A?=
 =?utf-8?q?_Change_=22My_Home_Page=22_to_=22Home=22?=
In-Reply-To: <076.50f200c2a1dbfab77f88a21e59e45693@vtiger.fosslabs.com>
References: <076.50f200c2a1dbfab77f88a21e59e45693@vtiger.fosslabs.com>
Message-ID: <085.2793eef0fe3b0812fe2d2327dee2ce65@vtiger.fosslabs.com>

#1096: Change "My Home Page" to "Home"
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  ahmed 
      Type:  defect     |      Status:  closed
  Priority:  minor      |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  wontfix    |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * resolution:  => wontfix
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1096>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 03:15:21 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 10:15:21 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231188=3A?=
 =?utf-8?q?_default_email_population_not_proper?=
In-Reply-To: <076.c8af4af2b612afa73930163d3526615a@vtiger.fosslabs.com>
References: <076.c8af4af2b612afa73930163d3526615a@vtiger.fosslabs.com>
Message-ID: <085.b7d54ea1bd8cd02403eaf7e13a65ed4a@vtiger.fosslabs.com>

#1188: default email population not proper
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  richie
      Type:  defect     |      Status:  new   
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * owner:  ahmed => richie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1188>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 03:15:36 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 10:15:36 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231277=3A?=
 =?utf-8?q?_Can=27t_translate_term_close_without_problem?=
In-Reply-To: <076.d518c5251779ede24caf171d8d809788@vtiger.fosslabs.com>
References: <076.d518c5251779ede24caf171d8d809788@vtiger.fosslabs.com>
Message-ID: <085.74c2e249e7bcc5fab6fb9faa35df6a52@vtiger.fosslabs.com>

#1277: Can't translate term close without problem
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  richie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * owner:  ahmed => richie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1277>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 03:16:39 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 10:16:39 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7179 - in
 /vtigercrm/trunk/modules/HelpDesk: Convert.php HelpDesk.php ListTickets.php
 Merge.php Save.php
Message-ID: <20060616101639.037387ED31A@vtiger.fosslabs.com>

Author: don
Date: Fri Jun 16 04:16:33 2006
New Revision: 7179

Log:
Fixed issues in vtiger_ prefixing in table names

Modified:
    vtigercrm/trunk/modules/HelpDesk/Convert.php
    vtigercrm/trunk/modules/HelpDesk/HelpDesk.php
    vtigercrm/trunk/modules/HelpDesk/ListTickets.php
    vtigercrm/trunk/modules/HelpDesk/Merge.php
    vtigercrm/trunk/modules/HelpDesk/Save.php

Modified: vtigercrm/trunk/modules/HelpDesk/Convert.php
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/Convert.php (original)
+++ vtigercrm/trunk/modules/HelpDesk/Convert.php Fri Jun 16 04:16:33 2006
@@ -71,7 +71,7 @@
 $change='';
 if($_REQUEST['change_owner'])
 {
-	$change .= '<input type="hidden" name="change_owner" value="true"/><td width="20%" valign="top" class="dataLabel">'.$mod_strings['LBL_ASSIGNED_TO'].'<select vtiger_tabindex="5" name="assigned_user_id" {ASSIGNED_USER_OPTIONS}</select> </td>';
+	$change .= '<input type="hidden" name="change_owner" value="true"/><td width="20%" valign="top" class="dataLabel">'.$mod_strings['LBL_ASSIGNED_TO'].'<select tabindex="5" name="assigned_user_id" {ASSIGNED_USER_OPTIONS}</select> </td>';
 	$xtpl->assign("ASSIGNED_USER_OPTIONS",getComboValues("user_name","users","user_name","1",'--None--'));
 }
 if($_REQUEST['change_status'])

Modified: vtigercrm/trunk/modules/HelpDesk/HelpDesk.php
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/HelpDesk.php (original)
+++ vtigercrm/trunk/modules/HelpDesk/HelpDesk.php Fri Jun 16 04:16:33 2006
@@ -124,7 +124,7 @@
 
 		$returnset = '&return_module=HelpDesk&return_action=DetailView&return_id='.$id;
 
-		$query = "SELECT vtiger_activity.*, vtiger_crmentity.crmid, vtiger_contactdetails.contactid, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_recurringevents.recurringtype, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid= vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and (activitytype='Task' or vtiger_activitytype='Call' or vtiger_activitytype='Meeting')";
+		$query = "SELECT vtiger_activity.*, vtiger_crmentity.crmid, vtiger_contactdetails.contactid, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_recurringevents.recurringtype, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid= vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting')";
 		$log->debug("Exiting get_activities method ...");
 		
 		return GetRelatedList('HelpDesk','Activities',$focus,$query,$button,$returnset);
@@ -169,7 +169,7 @@
 		$log->debug("Entering get_attachments(".$id.") method ...");
 		$query = "select vtiger_notes.title,'Notes      '  ActivityType, vtiger_notes.filename,
 		vtiger_attachments.type  FileType,crm2.modifiedtime lastmodified,
-		vtiger_seattachmentsrel.attachmentsid vtiger_attachmentsid, vtiger_notes.notesid crmid,
+		vtiger_seattachmentsrel.attachmentsid attachmentsid, vtiger_notes.notesid crmid,
 			crm2.createdtime, vtiger_notes.notecontent description, vtiger_users.user_name
 		from vtiger_notes
 			inner join vtiger_senotesrel on vtiger_senotesrel.notesid= vtiger_notes.notesid
@@ -184,7 +184,7 @@
 
 		$query .= "select vtiger_attachments.description title ,'Attachments'  ActivityType,
 		vtiger_attachments.name filename, vtiger_attachments.type FileType,crm2.modifiedtime lastmodified,
-		vtiger_attachments.attachmentsid vtiger_attachmentsid, vtiger_seattachmentsrel.attachmentsid crmid,
+		vtiger_attachments.attachmentsid attachmentsid, vtiger_seattachmentsrel.attachmentsid crmid,
 			crm2.createdtime, vtiger_attachments.description, vtiger_users.user_name
 		from vtiger_attachments
 			inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid= vtiger_attachments.attachmentsid
@@ -344,7 +344,7 @@
 	{
 		global $log;
 		$log->debug("Entering getColumnNames_Hd() method ...");
-		$sql1 = "select vtiger_fieldlabel from vtiger_field where vtiger_tabid=13 and block <> 6 ";
+		$sql1 = "select fieldlabel from vtiger_field where tabid=13 and block <> 6 ";
 		$result = $this->db->query($sql1);
 		$numRows = $this->db->num_rows($result);
 		for($i=0; $i < $numRows;$i++)

Modified: vtigercrm/trunk/modules/HelpDesk/ListTickets.php
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/ListTickets.php (original)
+++ vtigercrm/trunk/modules/HelpDesk/ListTickets.php Fri Jun 16 04:16:33 2006
@@ -108,7 +108,7 @@
 	}
 	if($parent_module == 'Accounts')
 	{
-		$sql = "select vtiger_accountname from vtiger_account where vtiger_accountid=".$parent_id;
+		$sql = "select accountname from vtiger_account where accountid=".$parent_id;
 		$parentname = $adb->query_result($adb->query($sql),0,'accountname');
 	        $parent_name = '<a href="index.php?action=DetailView&module='.$parent_module.'&record='.$parent_id.'">'.$parentname.'</a>';
 	}

Modified: vtigercrm/trunk/modules/HelpDesk/Merge.php
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/Merge.php (original)
+++ vtigercrm/trunk/modules/HelpDesk/Merge.php Fri Jun 16 04:16:33 2006
@@ -86,7 +86,7 @@
 
 	if($columnname == "parent_id")
 	{
-		$column_name = "case vtiger_crmentityRelHelpDesk.setype when 'Accounts' then vtiger_accountRelHelpDesk.accountname when 'Contacts' then concat(contactdetailsRelHelpDesk.firstname,' ',contactdetailsRelHelpDesk.lastname) End";
+		$column_name = "case crmentityRelHelpDesk.setype when 'Accounts' then accountRelHelpDesk.accountname when 'Contacts' then concat(contactdetailsRelHelpDesk.firstname,' ',contactdetailsRelHelpDesk.lastname) End";
 	}
 	if($columnname == "product_id")
 	{
@@ -165,27 +165,27 @@
 	$query ="select ".$selectcolumns." from vtiger_troubletickets
 			inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_troubletickets.ticketid
 			inner join vtiger_ticketcf on vtiger_ticketcf.ticketid = vtiger_troubletickets.ticketid
-			left join vtiger_crmentity as vtiger_crmentityRelHelpDesk on vtiger_crmentityRelHelpDesk.crmid = vtiger_troubletickets.parent_id
-			left join vtiger_account as vtiger_accountRelHelpDesk on vtiger_accountRelHelpDesk.accountid=crmentityRelHelpDesk.crmid
-			left join vtiger_contactdetails as vtiger_contactdetailsRelHelpDesk on vtiger_contactdetailsRelHelpDesk.contactid= vtiger_crmentityRelHelpDesk.crmid
-			left join vtiger_products as vtiger_productsRel on vtiger_productsRel.productid = vtiger_troubletickets.product_id
+			left join vtiger_crmentity as crmentityRelHelpDesk on crmentityRelHelpDesk.crmid = vtiger_troubletickets.parent_id
+			left join vtiger_account as accountRelHelpDesk on accountRelHelpDesk.accountid=crmentityRelHelpDesk.crmid
+			left join vtiger_contactdetails as contactdetailsRelHelpDesk on contactdetailsRelHelpDesk.contactid= crmentityRelHelpDesk.crmid
+			left join vtiger_products as productsRel on productsRel.productid = vtiger_troubletickets.product_id
 			left join vtiger_users on vtiger_crmentity.smownerid=vtiger_users.id
 			left join vtiger_account on vtiger_account.accountid = vtiger_troubletickets.parent_id               
-			left join vtiger_crmentity as vtiger_crmentityAccounts on vtiger_crmentityAccounts.crmid = vtiger_account.accountid 
+			left join vtiger_crmentity as _crmentityAccounts on crmentityAccounts.crmid = vtiger_account.accountid 
 			left join vtiger_accountbillads on vtiger_accountbillads.accountaddressid = vtiger_account.accountid
 			left join vtiger_accountshipads on vtiger_accountshipads.accountaddressid = vtiger_account.accountid
 			left join vtiger_accountscf on vtiger_accountbillads.accountaddressid = vtiger_accountscf.accountid 
-			left join vtiger_account as vtiger_accountAccount on vtiger_accountAccount.accountid = vtiger_troubletickets.parent_id
-			left join vtiger_users as vtiger_usersAccounts on vtiger_usersAccounts.id = vtiger_crmentityAccounts.smownerid
+			left join vtiger_account as accountAccount on accountAccount.accountid = vtiger_troubletickets.parent_id
+			left join vtiger_users as usersAccounts on usersAccounts.id = crmentityAccounts.smownerid
 			left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_troubletickets.parent_id               
-			left join vtiger_crmentity as vtiger_crmentityContacts on vtiger_crmentityContacts.crmid = vtiger_contactdetails.contactid 
+			left join vtiger_crmentity as crmentityContacts on crmentityContacts.crmid = vtiger_contactdetails.contactid 
 			left join vtiger_contactaddress on vtiger_contactdetails.contactid = vtiger_contactaddress.contactaddressid 
 			left join vtiger_contactsubdetails on vtiger_contactdetails.contactid = vtiger_contactsubdetails.contactsubscriptionid 
 			left join vtiger_contactscf on vtiger_contactdetails.contactid = vtiger_contactscf.contactid 
-			left join vtiger_contactdetails as vtiger_contactdetailsContacts on vtiger_contactdetailsContacts.contactid = vtiger_contactdetails.reportsto
-			left join vtiger_account as vtiger_accountContacts on vtiger_accountContacts.accountid = vtiger_contactdetails.accountid 
-			left join vtiger_users as vtiger_usersContacts on vtiger_usersContacts.id = vtiger_crmentityContacts.smownerid
-			where vtiger_crmentity.deleted=0 and ((crmentityContacts.deleted=0 || vtiger_crmentityContacts.deleted is null)||(crmentityAccounts.deleted=0 || vtiger_crmentityAccounts.deleted is null)) 
+			left join vtiger_contactdetails as contactdetailsContacts on contactdetailsContacts.contactid = vtiger_contactdetails.reportsto
+			left join vtiger_account as accountContacts on accountContacts.accountid = vtiger_contactdetails.accountid 
+			left join vtiger_users as usersContacts on usersContacts.id = crmentityContacts.smownerid
+			where vtiger_crmentity.deleted=0 and ((crmentityContacts.deleted=0 || crmentityContacts.deleted is null)||(crmentityAccounts.deleted=0 || crmentityAccounts.deleted is null)) 
 			and vtiger_troubletickets.ticketid in (".$mass_merge.")";
 
 	$result = $adb->query($query);
@@ -221,7 +221,7 @@
 }
 else
 {
-	die("No vtiger_fields to do Merge");
+	die("No fields to do Merge");
 }	
 
 $handle = fopen($wordtemplatedownloadpath."datasrc.csv","wb");

Modified: vtigercrm/trunk/modules/HelpDesk/Save.php
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/Save.php (original)
+++ vtigercrm/trunk/modules/HelpDesk/Save.php Fri Jun 16 04:16:33 2006
@@ -62,7 +62,7 @@
 	}
 	if($parent_module == 'Accounts')
 	{
-		$result = $adb->query("select * from vtiger_account where vtiger_accountid=".$focus->column_fields['parent_id']);
+		$result = $adb->query("select * from vtiger_account where accountid=".$focus->column_fields['parent_id']);
 		$emailoptout = $adb->query_result($result,0,'emailoptout');
 		$parentname = $adb->query_result($result,0,'accountname');
 	}



From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 03:06:33 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 10:06:33 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=23305=3A_?=
	=?utf-8?q?Global_Search_issue?=
In-Reply-To: <076.5981abe1cf9dd755f16174b0b5441e02@vtiger.fosslabs.com>
References: <076.5981abe1cf9dd755f16174b0b5441e02@vtiger.fosslabs.com>
Message-ID: <085.dad98c8f0641fcb7ddc0e6bec8356f4e@vtiger.fosslabs.com>

#305: Global Search issue
---------------------------+------------------------------------------------
  Reporter:  jerrydgeorge  |       Owner:  mickie       
      Type:  enhancement   |      Status:  assigned     
  Priority:  major         |   Milestone:               
 Component:  vtigercrm     |     Version:  5.0.1        
Resolution:                |    Keywords:  global search
---------------------------+------------------------------------------------
Changes (by anonymous):

  * type:  defect => enhancement

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/305>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 03:38:01 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 10:38:01 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23959=3A_?=
 =?utf-8?q?=22Invoice=22_Tab_name_change_to_=22Invoices=22?=
In-Reply-To: <076.d7d8ff8c07778d7ac5419325b92b757a@vtiger.fosslabs.com>
References: <076.d7d8ff8c07778d7ac5419325b92b757a@vtiger.fosslabs.com>
Message-ID: <085.d0069af55942503d0bc15fea5eb50b37@vtiger.fosslabs.com>

#959: "Invoice" Tab name change to "Invoices"
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  saraj 
      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 [7180]) tab names modified. Fixes #959

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/959>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 03:38:02 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 10:38:02 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7180 -
	/vtigercrm/trunk/include/language/en_us.lang.php
Message-ID: <20060616103802.2C4A47ED31C@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 16 04:37:56 2006
New Revision: 7180

Log:
tab names modified. Fixes #959

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

Modified: vtigercrm/trunk/include/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/include/language/en_us.lang.php (original)
+++ vtigercrm/trunk/include/language/en_us.lang.php Fri Jun 16 04:37:56 2006
@@ -737,7 +737,7 @@
 'PriceBook'=>'Price Books',
 'PurchaseOrder'=>'Purchase Order',
 'SalesOrder'=> 'Sales Order',
-'Invoice'=>'Invoice',
+'Invoice'=>'Invoices',
 'Calendar'=>'Calendar',
 'Home'=>'Home',
 'Campaigns'=>'Campaigns',
@@ -795,7 +795,7 @@
 'SalesOrder'=> 'Sales Order',
 'Campaign'=>'Campaign',
 'Note'=>'Note',
-'Dashboard'=>'Dashboard',
+'Dashboard'=>'Dashboards',
 'Report'=>'Report',
 'Vendor'=>'Vendor',
 'Webmail'=>'Webmail',
@@ -838,8 +838,8 @@
 'Start Date'=>'Start Date',
 'Related to'=>'Related To',
 'Recurring Type'=> 'Recurring Type',
-'SalesOrder'=> 'Sales Order',
-'PurchaseOrder'=> 'Purchase Order',
+'SalesOrder'=> 'Sales Orders',
+'PurchaseOrder'=> 'Purchase Orders',
 'LBL_QUOTE_NAME'=>'Quote Name',
  //Added Orders in activity parent type selection / Related list
 'LBL_NEW_QUOTE_BUTTON_TITLE'=>'New Quote [Alt+Q]',



From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 03:12:19 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 10:12:19 -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.da3993981a6af659e5ea13509a51aab6@vtiger.fosslabs.com>

#723: Parent tab not highlighted
------------------------+---------------------------------------------------
  Reporter:  saraj      |       Owner:  mickie    
      Type:  defect     |      Status:  new       
  Priority:  major      |   Milestone:  5.0.0     
 Component:  vtigercrm  |     Version:  5.0.0     
Resolution:             |    Keywords:  Parent tab
------------------------+---------------------------------------------------
Changes (by richie):

  * owner:  ahmed => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/723>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 03:12:54 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 10:12:54 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231293=3A?=
 =?utf-8?q?_Select_Products_missing_from_Activities_in_5=2E0?=
In-Reply-To: <076.0fa458c2ddcf4a4ee4262524258defbd@vtiger.fosslabs.com>
References: <076.0fa458c2ddcf4a4ee4262524258defbd@vtiger.fosslabs.com>
Message-ID: <085.55a87fb26c06d2efc15c29876c6bfd0a@vtiger.fosslabs.com>

#1293: Select Products missing from Activities in 5.0
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  minnie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * owner:  ahmed => minnie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1293>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 04:10:15 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 11:10:15 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7181 -
	/vtigercrm/trunk/Popup.php
Message-ID: <20060616111015.F16607ED2DA@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 16 05:10:11 2006
New Revision: 7181

Log:
multiselect is enable for lead popup

Modified:
    vtigercrm/trunk/Popup.php

Modified: vtigercrm/trunk/Popup.php
==============================================================================
--- vtigercrm/trunk/Popup.php (original)
+++ vtigercrm/trunk/Popup.php Fri Jun 16 05:10:11 2006
@@ -84,6 +84,7 @@
 				,'industry'=>'industry_dom');
 		$comboFieldArray = getComboArray($comboFieldNames);
 		$smarty->assign("SINGLE_MOD",'Lead');
+		if (isset($_REQUEST['select'])) $smarty->assign("SELECT",'enable');
 		if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] !='')
 			$smarty->assign("RETURN_MODULE",$_REQUEST['return_module']);
 		else



From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 04:15:35 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 11:15:35 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7182 -
	/vtigercrm/trunk/modules/Contacts/Contact.js
Message-ID: <20060616111535.50E7F7ED312@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 16 05:15:30 2006
New Revision: 7182

Log:
url string has been modified

Modified:
    vtigercrm/trunk/modules/Contacts/Contact.js

Modified: vtigercrm/trunk/modules/Contacts/Contact.js
==============================================================================
--- vtigercrm/trunk/modules/Contacts/Contact.js (original)
+++ vtigercrm/trunk/modules/Contacts/Contact.js Fri Jun 16 05:15:30 2006
@@ -106,7 +106,7 @@
 	}
 		if(confirm("Are you sure you want to add the selected "+xx+" records ?"))
 		{
-		opener.document.location.href="index.php?module="+module+"&parentid="+entity_id+"&action=updateRelations&return_module=Potentials&return_action=CallRelatedList&idlist="+idstring;
+		opener.document.location.href="index.php?module="+module+"&parentid="+entity_id+"&action=updateRelations&destination_module=Contacts&idlist="+idstring;
 		self.close();
 		}
 		else



From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 04:20:22 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 11:20:22 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7183 -
	/vtigercrm/trunk/modules/Leads/Lead.js
Message-ID: <20060616112022.30AB57ED2FF@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 16 05:20:18 2006
New Revision: 7183

Log:
js function SelectAll has been included

Modified:
    vtigercrm/trunk/modules/Leads/Lead.js

Modified: vtigercrm/trunk/modules/Leads/Lead.js
==============================================================================
--- vtigercrm/trunk/modules/Leads/Lead.js (original)
+++ vtigercrm/trunk/modules/Leads/Lead.js Fri Jun 16 05:20:18 2006
@@ -65,7 +65,60 @@
 
 }
 
+//Function added for Mass select in Popup - Philip
+function SelectAll()
+{
 
+        x = document.selectall.selected_id.length;
+        var entity_id = window.opener.document.getElementById('parent_id').value
+        var module = window.opener.document.getElementById('return_module').value
+        document.selectall.action.value='updateRelations'
+        idstring = "";
+
+        if ( x == undefined)
+        {
+
+                if (document.selectall.selected_id.checked)
+                {
+                        document.selectall.idlist.value=document.selectall.selected_id.value;
+                }
+                else
+                {
+                        alert("Please select atleast one entity");
+                        return false;
+                }
+        }
+        else
+        {
+                xx = 0;
+                for(i = 0; i < x ; i++)
+                {
+                        if(document.selectall.selected_id[i].checked)
+                        {
+                                idstring = document.selectall.selected_id[i].value +";"+idstring
+                        xx++
+                        }
+                }
+                if (xx != 0)
+                {
+                        document.selectall.idlist.value=idstring;
+                }
+		else
+                {
+                        alert("Please select atleast one entity");
+                        return false;
+                }
+        }
+        if(confirm("Are you sure you want to add the selected "+xx+" records ?"))
+        {
+                opener.document.location.href="index.php?module="+module+"&parentid="+entity_id+"&action=updateRelations&destination_module=Leads&idlist="+idstring;
+                self.close();
+        }
+        else
+        {
+                return false;
+        }
+}
 
 function set_return(product_id, product_name) {
         window.opener.document.EditView.parent_name.value = product_name;



From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 04:20:58 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 11:20:58 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=23508=3A_?=
	=?utf-8?q?validation_for_search?=
In-Reply-To: <076.937f1cb0969bd6cc06f852196b3b683b@vtiger.fosslabs.com>
References: <076.937f1cb0969bd6cc06f852196b3b683b@vtiger.fosslabs.com>
Message-ID: <085.871d6402b7a582f4ea40f9507ada108a@vtiger.fosslabs.com>

#508: validation for search
--------------------------------+-------------------------------------------
  Reporter:  minnie at vtiger.com  |       Owner:  richie
      Type:  defect             |      Status:  new   
  Priority:  major              |   Milestone:        
 Component:  vtigercrm          |     Version:  5.0.0 
Resolution:                     |    Keywords:        
--------------------------------+-------------------------------------------
Changes (by richie):

  * owner:  philip => richie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/508>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 04:21:11 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 11:21:11 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23940=3A_?=
 =?utf-8?q?contact_not_displayed_in_activity_relatedlit?=
In-Reply-To: <076.65ef01ee3bf555e0572b3067a1b9889c@vtiger.fosslabs.com>
References: <076.65ef01ee3bf555e0572b3067a1b9889c@vtiger.fosslabs.com>
Message-ID: <085.ec599642e1b394b36816dc52ba695a3c@vtiger.fosslabs.com>

#940: contact not displayed in activity relatedlit
------------------------+---------------------------------------------------
  Reporter:  mickie     |       Owner:  minnie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * owner:  philip => minnie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/940>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 04:21:22 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 11:21:22 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23457=3A_?=
 =?utf-8?q?Inconsistency_in_List_Views?=
In-Reply-To: <076.62f80fd69dd6508b4f16ec9faaf586f8@vtiger.fosslabs.com>
References: <076.62f80fd69dd6508b4f16ec9faaf586f8@vtiger.fosslabs.com>
Message-ID: <085.484c7304813590903fa66a1d11dcc50e@vtiger.fosslabs.com>

#457: Inconsistency in List Views
--------------------------+-------------------------------------------------
  Reporter:  don          |       Owner:  saraj
      Type:  enhancement  |      Status:  new  
  Priority:  critical     |   Milestone:  5.0.0
 Component:  vtigercrm    |     Version:  5.0.0
Resolution:               |    Keywords:       
--------------------------+-------------------------------------------------
Changes (by richie):

  * type:  defect => enhancement

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/457>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 04:21:55 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 11:21:55 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231128=3A?=
 =?utf-8?q?_too_high_reaction_time_in_using_inventory?=
In-Reply-To: <076.209b6cc7a2151c8fd5ca32cfa5df69e2@vtiger.fosslabs.com>
References: <076.209b6cc7a2151c8fd5ca32cfa5df69e2@vtiger.fosslabs.com>
Message-ID: <085.500dca906c6a6d8a26b182f28a70dcef@vtiger.fosslabs.com>

#1128: too high reaction time in using inventory
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  mickie     
      Type:  defect     |      Status:  new        
  Priority:  major      |   Milestone:             
 Component:  vtigercrm  |     Version:  5.0.0      
Resolution:             |    Keywords:  performance
------------------------+---------------------------------------------------
Changes (by richie):

  * owner:  saraj => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1128>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 04:22:10 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 11:22:10 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231170=3A?=
 =?utf-8?q?_PO_related_to_SO_does_not_have_assigned_to_value?=
In-Reply-To: <076.846167eef3e3ff8046106f91876e5bb5@vtiger.fosslabs.com>
References: <076.846167eef3e3ff8046106f91876e5bb5@vtiger.fosslabs.com>
Message-ID: <085.dc63b10458b665ca77539e4624b37d17@vtiger.fosslabs.com>

#1170: PO related to SO does not have assigned to value
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  mickie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * owner:  saraj => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1170>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 04:22:15 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 11:22:15 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231262=3A?=
 =?utf-8?q?_Products_not_being_listed_against_Accounts_when_Sales_Order/In?=
 =?utf-8?q?voice_created?=
In-Reply-To: <076.fd68f0c276cf51384c7c588eeaea61be@vtiger.fosslabs.com>
References: <076.fd68f0c276cf51384c7c588eeaea61be@vtiger.fosslabs.com>
Message-ID: <085.33e3ee21dd9aeb7ac1bc00e711d54e7b@vtiger.fosslabs.com>

#1262: Products not being listed against Accounts when Sales Order/Invoice created
----------------------------------+-----------------------------------------
  Reporter:  thealbs at yahoo.co.uk  |       Owner:  saraj   
      Type:  defect               |      Status:  new     
  Priority:  major                |   Milestone:          
 Component:  vtigercrm            |     Version:  5.0.1   
Resolution:                       |    Keywords:  products
----------------------------------+-----------------------------------------
Changes (by saraj):

  * version:  5.0.0 => 5.0.1

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1262>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 04:22:25 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 11:22:25 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231207=3A?=
 =?utf-8?q?_products_related_to_lead_are_not_carried_over_when_lead_is_con?=
 =?utf-8?q?verted?=
In-Reply-To: <076.029392e9fc29e5d7b21c662647a73612@vtiger.fosslabs.com>
References: <076.029392e9fc29e5d7b21c662647a73612@vtiger.fosslabs.com>
Message-ID: <085.d7dfb25580ef19914444eb96bc4fb700@vtiger.fosslabs.com>

#1207: products related to lead are not carried over when lead is converted
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  mickie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mickie):

  * owner:  saraj => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1207>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 04:22:40 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 11:22:40 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231229=3A?=
 =?utf-8?q?_LHS_panel_missing_for_System_Information=2E?=
In-Reply-To: <076.9948487d1aec14088b1363d9ae418188@vtiger.fosslabs.com>
References: <076.9948487d1aec14088b1363d9ae418188@vtiger.fosslabs.com>
Message-ID: <085.6095172ee24db4fc35d03a35e794758b@vtiger.fosslabs.com>

#1229: LHS panel missing for System Information.
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  saint
      Type:  defect     |      Status:  new  
  Priority:  major      |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by richie):

  * owner:  saraj => saint

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1229>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 04:22:56 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 11:22:56 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231249=3A?=
	=?utf-8?q?_Task_Information?=
In-Reply-To: <076.e46a01212fb9981d78bbf6e6e2673af6@vtiger.fosslabs.com>
References: <076.e46a01212fb9981d78bbf6e6e2673af6@vtiger.fosslabs.com>
Message-ID: <085.0b04af1f378cb9bd70d3a72ab903e9d5@vtiger.fosslabs.com>

#1249: Task Information
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  minnie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * owner:  saraj => minnie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1249>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 04:39:20 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 11:39:20 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231245=3A?=
 =?utf-8?q?_edit_and_del_links_are_not_exist_in_listview_and_relatedlists?=
In-Reply-To: <076.4ddff9b4349d2a2ad1f3163458b73b34@vtiger.fosslabs.com>
References: <076.4ddff9b4349d2a2ad1f3163458b73b34@vtiger.fosslabs.com>
Message-ID: <085.53230406c9d396e38f1ef215f6d32f0a@vtiger.fosslabs.com>

#1245: edit and del links are not exist in listview and relatedlists
------------------------+---------------------------------------------------
  Reporter:  mickie     |       Owner:  mickie
      Type:  defect     |      Status:  new   
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * owner:  ahmed => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1245>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 04:39:50 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 11:39:50 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231268=3A?=
 =?utf-8?q?_Error_in_Email_language_file?=
In-Reply-To: <076.e552d828a7b238f9e865edf84f9ad995@vtiger.fosslabs.com>
References: <076.e552d828a7b238f9e865edf84f9ad995@vtiger.fosslabs.com>
Message-ID: <085.085b931478bee9be799deeda8e0882a7@vtiger.fosslabs.com>

#1268: Error in Email language file
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  ahmed 
      Type:  defect     |      Status:  closed
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  wontfix    |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * resolution:  => wontfix
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1268>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 04:42:04 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 11:42:04 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231031=3A?=
 =?utf-8?q?_could_not_create_customview?=
In-Reply-To: <076.6bcaa1e937849dde732bcec957022b60@vtiger.fosslabs.com>
References: <076.6bcaa1e937849dde732bcec957022b60@vtiger.fosslabs.com>
Message-ID: <085.1825c7221c30574108d83e82016312ac@vtiger.fosslabs.com>

#1031: could not create customview
------------------------+---------------------------------------------------
  Reporter:  mangai     |       Owner:  philip
      Type:  defect     |      Status:  new   
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by saraj):

  * summary:  could not create custom field => could not create customview

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1031>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 04:44:17 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 11:44:17 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231276=3A?=
 =?utf-8?q?_Language_file_issue_/include/language?=
In-Reply-To: <076.705db0ccf0fb3c7495be9bad38dc724d@vtiger.fosslabs.com>
References: <076.705db0ccf0fb3c7495be9bad38dc724d@vtiger.fosslabs.com>
Message-ID: <085.d45af841ba8c2971b22961f08278e5c3@vtiger.fosslabs.com>

#1276: Language file issue /include/language
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  ahmed 
      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: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1276>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 04:48:43 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 11:48:43 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7184 - in
 /vtigercrm/trunk/modules/Contacts: Contact.php Merge.php
Message-ID: <20060616114843.1649E7ED31F@vtiger.fosslabs.com>

Author: don
Date: Fri Jun 16 05:48:39 2006
New Revision: 7184

Log:
Fixed issues in vtiger_ prefixing in table names

Modified:
    vtigercrm/trunk/modules/Contacts/Contact.php
    vtigercrm/trunk/modules/Contacts/Merge.php

Modified: vtigercrm/trunk/modules/Contacts/Contact.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/Contact.php (original)
+++ vtigercrm/trunk/modules/Contacts/Contact.php Fri Jun 16 05:48:39 2006
@@ -184,7 +184,7 @@
     {   
 	global $log;
 	$log->debug("Entering get_contacts(".$user_name.",".$from_index.",".$offset.") method ...");
-      $query = "select vtiger_users.user_name,vtiger_groups.groupname,vtiger_contactdetails.department department, vtiger_contactdetails.phone office_phone, vtiger_contactdetails.fax fax, vtiger_contactsubdetails.assistant assistant_name, vtiger_contactsubdetails.otherphone other_phone, vtiger_contactsubdetails.homephone home_phone,vtiger_contactsubdetails.birthday birthdate, vtiger_contactdetails.lastname last_name,vtiger_contactdetails.firstname first_name,vtiger_contactdetails.contactid as id, vtiger_contactdetails.salutation as salutation, vtiger_contactdetails.email as email1,vtiger_contactdetails.title as title,vtiger_contactdetails.mobile as phone_mobile,vtiger_account.accountname as vtiger_account_name,vtiger_account.accountid as vtiger_account_id, vtiger_contactaddress.mailingcity as primary_address_city,vtiger_contactaddress.mailingstreet as primary_address_street, vtiger_contactaddress.mailingcountry as primary_address_country,vtiger_contactaddress.mailingstate as primary_address_state, vtiger_contactaddress.mailingzip as primary_address_postalcode,   vtiger_contactaddress.othercity as alt_address_city,vtiger_contactaddress.otherstreet as alt_address_street, vtiger_contactaddress.othercountry as alt_address_country,vtiger_contactaddress.otherstate as alt_address_state, vtiger_contactaddress.otherzip as alt_address_postalcode  from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_contactdetails.contactid inner join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_account on vtiger_account.accountid=vtiger_contactdetails.accountid left join vtiger_contactaddress on vtiger_contactaddress.contactaddressid=vtiger_contactdetails.contactid left join vtiger_contactsubdetails on vtiger_contactsubdetails.contactsubscriptionid = vtiger_contactdetails.contactid left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid left join vtiger_groups on vtiger_groups.groupname=vtiger_contactgrouprelation.groupname left join vtiger_users on vtiger_crmentity.smownerid=vtiger_users.id where user_name='" .$user_name ."' and vtiger_crmentity.deleted=0 limit " .$from_index ."," .$offset;
+      $query = "select vtiger_users.user_name,vtiger_groups.groupname,vtiger_contactdetails.department department, vtiger_contactdetails.phone office_phone, vtiger_contactdetails.fax fax, vtiger_contactsubdetails.assistant assistant_name, vtiger_contactsubdetails.otherphone other_phone, vtiger_contactsubdetails.homephone home_phone,vtiger_contactsubdetails.birthday birthdate, vtiger_contactdetails.lastname last_name,vtiger_contactdetails.firstname first_name,vtiger_contactdetails.contactid as id, vtiger_contactdetails.salutation as salutation, vtiger_contactdetails.email as email1,vtiger_contactdetails.title as title,vtiger_contactdetails.mobile as phone_mobile,vtiger_account.accountname as account_name,vtiger_account.accountid as account_id, vtiger_contactaddress.mailingcity as primary_address_city,vtiger_contactaddress.mailingstreet as primary_address_street, vtiger_contactaddress.mailingcountry as primary_address_country,vtiger_contactaddress.mailingstate as primary_address_state, vtiger_contactaddress.mailingzip as primary_address_postalcode,   vtiger_contactaddress.othercity as alt_address_city,vtiger_contactaddress.otherstreet as alt_address_street, vtiger_contactaddress.othercountry as alt_address_country,vtiger_contactaddress.otherstate as alt_address_state, vtiger_contactaddress.otherzip as alt_address_postalcode  from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_contactdetails.contactid inner join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_account on vtiger_account.accountid=vtiger_contactdetails.accountid left join vtiger_contactaddress on vtiger_contactaddress.contactaddressid=vtiger_contactdetails.contactid left join vtiger_contactsubdetails on vtiger_contactsubdetails.contactsubscriptionid = vtiger_contactdetails.contactid left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid left join vtiger_groups on vtiger_groups.groupname=vtiger_contactgrouprelation.groupname left join vtiger_users on vtiger_crmentity.smownerid=vtiger_users.id where user_name='" .$user_name ."' and vtiger_crmentity.deleted=0 limit " .$from_index ."," .$offset;
       
 	$log->debug("Exiting get_contacts method ...");
       return $this->process_list_query1($query);
@@ -356,7 +356,7 @@
 		$query .= " union all ";
 		$query .= "select vtiger_attachments.description AS title,'Attachments' AS ActivityType,
 		vtiger_attachments.name AS filename, vtiger_attachments.type AS FileType,crm2.modifiedtime AS lastmodified,
-		vtiger_attachments.attachmentsid AS vtiger_attachmentsid, vtiger_seattachmentsrel.attachmentsid AS crmid,
+		vtiger_attachments.attachmentsid AS attachmentsid, vtiger_seattachmentsrel.attachmentsid AS crmid,
 			crm2.createdtime, vtiger_attachments.description, vtiger_users.user_name
 		from vtiger_attachments
 			inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid= vtiger_attachments.attachmentsid
@@ -493,7 +493,7 @@
 		{
 			$query =  $this->constructCustomQueryAddendum('contactscf','Contacts') ."
                                 vtiger_contactdetails.*, vtiger_contactaddress.*,
-                                vtiger_account.accountname vtiger_account_name,
+                                vtiger_account.accountname account_name,
                                 vtiger_users.user_name assigned_user_name
                                 FROM vtiger_contactdetails
 				inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_contactdetails.contactid
@@ -507,7 +507,7 @@
 		{
                   	 $query = "SELECT
                                 vtiger_contactdetails.*, vtiger_contactaddress.*,
-                                vtiger_account.accountname vtiger_account_name,
+                                vtiger_account.accountname account_name,
                                 vtiger_users.user_name assigned_user_name
                                 FROM vtiger_contactdetails
                                 inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_contactdetails.contactid
@@ -528,7 +528,7 @@
 {
 	global $log;
 	$log->debug("Entering getColumnNames() method ...");
-	$sql1 = "select vtiger_fieldlabel from vtiger_field where vtiger_tabid=4 and block <> 6 and block <> 75";
+	$sql1 = "select fieldlabel from vtiger_field where tabid=4 and block <> 6 and block <> 75";
 	$result = $this->db->query($sql1);
 	$numRows = $this->db->num_rows($result);
 	for($i=0; $i < $numRows;$i++)

Modified: vtigercrm/trunk/modules/Contacts/Merge.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/Merge.php (original)
+++ vtigercrm/trunk/modules/Contacts/Merge.php Fri Jun 16 05:48:39 2006
@@ -151,16 +151,16 @@
 				inner join vtiger_contactaddress on vtiger_contactdetails.contactid = vtiger_contactaddress.contactaddressid 
 				inner join vtiger_contactsubdetails on vtiger_contactdetails.contactid = vtiger_contactsubdetails.contactsubscriptionid 
 				inner join vtiger_contactscf on vtiger_contactdetails.contactid = vtiger_contactscf.contactid 
-				left join vtiger_contactdetails as vtiger_contactdetailsContacts on vtiger_contactdetailsContacts.contactid = vtiger_contactdetails.reportsto
-				left join vtiger_account as vtiger_accountContacts on vtiger_accountContacts.accountid = vtiger_contactdetails.accountid 
+				left join vtiger_contactdetails as contactdetailsContacts on contactdetailsContacts.contactid = vtiger_contactdetails.reportsto
+				left join vtiger_account as accountContacts on accountContacts.accountid = contactdetails.accountid 
 				left join vtiger_users on vtiger_users.id = vtiger_crmentity.smownerid
 				left join vtiger_account on vtiger_account.accountid = vtiger_contactdetails.accountid
-				left join vtiger_crmentity as vtiger_crmentityAccounts on vtiger_crmentityAccounts.crmid=vtiger_account.accountid
+				left join vtiger_crmentity as crmentityAccounts on crmentityAccounts.crmid=vtiger_account.accountid
 				left join vtiger_accountbillads on vtiger_account.accountid=vtiger_accountbillads.accountaddressid
 				left join vtiger_accountshipads on vtiger_account.accountid=vtiger_accountshipads.accountaddressid
 				left join vtiger_accountscf on vtiger_account.accountid = vtiger_accountscf.accountid
-				left join vtiger_account as vtiger_accountAccounts on vtiger_accountAccounts.accountid = vtiger_account.parentid
-				left join vtiger_users as vtiger_usersAccounts on vtiger_usersAccounts.id = vtiger_crmentityAccounts.smownerid 
+				left join vtiger_account as accountAccounts on accountAccounts.accountid = vtiger_account.parentid
+				left join vtiger_users as usersAccounts on usersAccounts.id = crmentityAccounts.smownerid 
 				where vtiger_crmentity.deleted=0 and (crmentityAccounts.deleted <> 1) and vtiger_contactdetails.contactid in(".$mass_merge.")";
 				
 
@@ -197,7 +197,7 @@
 $csvdata = implode($mergevalue,"###");
 }else
 {
-	die("No vtiger_fields to do Merge");
+	die("No fields to do Merge");
 }	
 
 $handle = fopen($wordtemplatedownloadpath."datasrc.csv","wb");



From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 04:49:28 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 11:49:28 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=2379=3A_A?=
	=?utf-8?q?ddress_inheritance?=
In-Reply-To: <076.cc7367ebe2ccb8423599b01e9c951b5c@vtiger.fosslabs.com>
References: <076.cc7367ebe2ccb8423599b01e9c951b5c@vtiger.fosslabs.com>
Message-ID: <085.1494e168568fc0c83275eed8dea8f03d@vtiger.fosslabs.com>

#79: Address inheritance
-------------------------------+--------------------------------------------
  Reporter:  eberle.d at 4net.ch  |       Owner:  saraj
      Type:  enhancement       |      Status:  new  
  Priority:  critical          |   Milestone:  5.0.0
 Component:  vtigercrm         |     Version:  5.0.1
Resolution:                    |    Keywords:       
-------------------------------+--------------------------------------------
Changes (by saraj):

  * version:  5.0.0 => 5.0.1

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/79>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 05:05:03 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 12:05:03 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231330=3A?=
 =?utf-8?q?_Admin_changed_to_non-admin_throws_exception?=
Message-ID: <076.0c85df12391add0bf2240fd158a748fe@vtiger.fosslabs.com>

#1330: Admin changed to non-admin throws exception
-----------------------+----------------------------------------------------
 Reporter:  saraj      |       Owner:  don  
     Type:  defect     |      Status:  new  
 Priority:  major      |   Milestone:  5.0.0
Component:  vtigercrm  |     Version:  5.0.0
 Keywords:             |  
-----------------------+----------------------------------------------------
 Created a profile with following permissions and assigned it to a role.

 Global Privileges: no permission

 Tab Privileges: All modules permitted

 Standard Privileges: All opration permitted

 Field Privileges: All

 Utility Privileges: All

 Default Organization Sharing Access: Prinvate Default Organization Fields
 Access:All

 Assigned this role to admin user (having user id 1) and unchecked the
 admin option, after recalulating and relogin, got the following exception.

 Parse error: parse error, unexpected ';' in
 /home/jerijohn/vtigeralpha2/vtigerbeta20_03/vtigerCRM5_beta/apache/htdocs/vtigerCRM/jun14/user_privileges/user_privileges_1.php
 on line 15

 P.S found out that in user_privileges/user_privileges_1.php file the line
 no. 15 looks like this $profileTabsPermission=;

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1330>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 05:23:09 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 12:23:09 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231265=3A?=
 =?utf-8?q?_Global_Search_Function_throws_error?=
In-Reply-To: <076.76671c46776deb9518824e095947cbde@vtiger.fosslabs.com>
References: <076.76671c46776deb9518824e095947cbde@vtiger.fosslabs.com>
Message-ID: <085.079a2def53b5acc20383cc5191085fe2@vtiger.fosslabs.com>

#1265: Global Search Function throws error
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  richie
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1265>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 05:23:33 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 12:23:33 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23918=3A_?=
 =?utf-8?q?Global_search_function_shows_wrong_results?=
In-Reply-To: <076.a484dea87ad7ce51b1edd92f46c3ba8a@vtiger.fosslabs.com>
References: <076.a484dea87ad7ce51b1edd92f46c3ba8a@vtiger.fosslabs.com>
Message-ID: <085.db971ff4d9cd364a01dae93078656d6c@vtiger.fosslabs.com>

#918: Global search function shows wrong results
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  richie
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 unable to reproduce this.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/918>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 05:24:09 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 12:24:09 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231277=3A?=
 =?utf-8?q?_Can=27t_translate_term_close_without_problem?=
In-Reply-To: <076.d518c5251779ede24caf171d8d809788@vtiger.fosslabs.com>
References: <076.d518c5251779ede24caf171d8d809788@vtiger.fosslabs.com>
Message-ID: <085.26869a3d9e1fb75255099ae46b2403d1@vtiger.fosslabs.com>

#1277: Can't translate term close without problem
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  richie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Comment (by richie):

 need more info in this. The image too is not proper.
 Kindly provide proper image please.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1277>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 05:25:59 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 12:25:59 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=23508=3A_?=
	=?utf-8?q?validation_for_search?=
In-Reply-To: <076.937f1cb0969bd6cc06f852196b3b683b@vtiger.fosslabs.com>
References: <076.937f1cb0969bd6cc06f852196b3b683b@vtiger.fosslabs.com>
Message-ID: <085.71fd4786685b03e2f4206dfcbe824045@vtiger.fosslabs.com>

#508: validation for search
--------------------------------+-------------------------------------------
  Reporter:  minnie at vtiger.com  |       Owner:  richie
      Type:  defect             |      Status:  closed
  Priority:  major              |   Milestone:        
 Component:  vtigercrm          |     Version:  5.0.0 
Resolution:  fixed              |    Keywords:        
--------------------------------+-------------------------------------------
Changes (by richie):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/508>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 05:36:24 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 12:36:24 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231222=3A?=
 =?utf-8?q?_Usage_of_Sub-tabs_for_single_section?=
In-Reply-To: <076.78247280d8dd9123017382a76f8fea10@vtiger.fosslabs.com>
References: <076.78247280d8dd9123017382a76f8fea10@vtiger.fosslabs.com>
Message-ID: <085.71b2681dc58096c1305bd07b69b0dbe2@vtiger.fosslabs.com>

#1222: Usage of Sub-tabs for single section
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  saraj 
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  wontfix    |    Keywords:        
------------------------+---------------------------------------------------
Changes (by saraj):

  * resolution:  => wontfix
  * status:  new => closed

Comment:

 Hi Gopal,

 To have a consistent view across the modules and sections, even we have
 single section we are showing it in tabbed view.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1222>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 06:04:06 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 13:04:06 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231302=3A?=
 =?utf-8?q?_Update_to_new_adodb-4=2E90_release?=
In-Reply-To: <076.cfae0e78298741dfce9c6a4f41a70218@vtiger.fosslabs.com>
References: <076.cfae0e78298741dfce9c6a4f41a70218@vtiger.fosslabs.com>
Message-ID: <085.1ebf649ac611c45407409eadc8738dfa@vtiger.fosslabs.com>

#1302: Update to new adodb-4.90 release
------------------------+---------------------------------------------------
  Reporter:  jeffk      |       Owner:  jeffk                 
      Type:  defect     |      Status:  new                   
  Priority:  major      |   Milestone:  5.0.0                 
 Component:  vtigercrm  |     Version:  5.0.0                 
Resolution:             |    Keywords:  adodb database package
------------------------+---------------------------------------------------
Comment (by jeffk):

 (In [7185]) refs #1302. update adodb-4.81 to adodb-4.90

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1302>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 06:04:06 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 13:04:06 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7185 - in
 /vtigercrm/branches/4.2/adodb: ./ datadict/ drivers/ perf/ session/
 session/old/ tests/
Message-ID: <20060616130408.EAA6D7ED334@vtiger.fosslabs.com>

Author: jeffk
Date: Fri Jun 16 07:03:47 2006
New Revision: 7185

Log:
refs #1302. update adodb-4.81 to adodb-4.90

Modified:
    vtigercrm/branches/4.2/adodb/adodb-active-record.inc.php
    vtigercrm/branches/4.2/adodb/adodb-csvlib.inc.php
    vtigercrm/branches/4.2/adodb/adodb-datadict.inc.php
    vtigercrm/branches/4.2/adodb/adodb-error.inc.php
    vtigercrm/branches/4.2/adodb/adodb-errorhandler.inc.php
    vtigercrm/branches/4.2/adodb/adodb-errorpear.inc.php
    vtigercrm/branches/4.2/adodb/adodb-exceptions.inc.php
    vtigercrm/branches/4.2/adodb/adodb-iterator.inc.php
    vtigercrm/branches/4.2/adodb/adodb-lib.inc.php
    vtigercrm/branches/4.2/adodb/adodb-pager.inc.php
    vtigercrm/branches/4.2/adodb/adodb-pear.inc.php
    vtigercrm/branches/4.2/adodb/adodb-perf.inc.php
    vtigercrm/branches/4.2/adodb/adodb-php4.inc.php
    vtigercrm/branches/4.2/adodb/adodb.inc.php
    vtigercrm/branches/4.2/adodb/datadict/datadict-access.inc.php
    vtigercrm/branches/4.2/adodb/datadict/datadict-db2.inc.php
    vtigercrm/branches/4.2/adodb/datadict/datadict-firebird.inc.php
    vtigercrm/branches/4.2/adodb/datadict/datadict-generic.inc.php
    vtigercrm/branches/4.2/adodb/datadict/datadict-ibase.inc.php
    vtigercrm/branches/4.2/adodb/datadict/datadict-informix.inc.php
    vtigercrm/branches/4.2/adodb/datadict/datadict-mssql.inc.php
    vtigercrm/branches/4.2/adodb/datadict/datadict-mysql.inc.php
    vtigercrm/branches/4.2/adodb/datadict/datadict-oci8.inc.php
    vtigercrm/branches/4.2/adodb/datadict/datadict-postgres.inc.php
    vtigercrm/branches/4.2/adodb/datadict/datadict-sybase.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-access.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-ado.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-ado5.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-ado_access.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-ado_mssql.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-borland_ibase.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-csv.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-db2.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-fbsql.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-firebird.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-ibase.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-informix.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-informix72.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-ldap.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-mssql.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-mssqlpo.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-mysql.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-mysqli.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-mysqlt.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-netezza.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-oci8.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-oci805.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-oci8po.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-odbc.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-odbc_db2.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-odbc_mssql.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-odbc_oracle.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-odbtp.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-odbtp_unicode.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-oracle.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-pdo.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-pdo_mssql.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-pdo_mysql.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-pdo_oci.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-pdo_pgsql.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-postgres.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-postgres64.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-postgres7.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-postgres8.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-proxy.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-sapdb.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-sqlanywhere.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-sqlite.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-sqlitepo.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-sybase.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-sybase_ase.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-vfp.inc.php
    vtigercrm/branches/4.2/adodb/perf/perf-db2.inc.php
    vtigercrm/branches/4.2/adodb/perf/perf-informix.inc.php
    vtigercrm/branches/4.2/adodb/perf/perf-mssql.inc.php
    vtigercrm/branches/4.2/adodb/perf/perf-mysql.inc.php
    vtigercrm/branches/4.2/adodb/perf/perf-oci8.inc.php
    vtigercrm/branches/4.2/adodb/perf/perf-postgres.inc.php
    vtigercrm/branches/4.2/adodb/pivottable.inc.php
    vtigercrm/branches/4.2/adodb/rsfilter.inc.php
    vtigercrm/branches/4.2/adodb/server.php
    vtigercrm/branches/4.2/adodb/session/adodb-compress-bzip2.php
    vtigercrm/branches/4.2/adodb/session/adodb-compress-gzip.php
    vtigercrm/branches/4.2/adodb/session/adodb-cryptsession.php
    vtigercrm/branches/4.2/adodb/session/adodb-encrypt-mcrypt.php
    vtigercrm/branches/4.2/adodb/session/adodb-encrypt-md5.php
    vtigercrm/branches/4.2/adodb/session/adodb-encrypt-secret.php
    vtigercrm/branches/4.2/adodb/session/adodb-session-clob.php
    vtigercrm/branches/4.2/adodb/session/adodb-session.php
    vtigercrm/branches/4.2/adodb/session/old/adodb-cryptsession.php
    vtigercrm/branches/4.2/adodb/session/old/adodb-session-clob.php
    vtigercrm/branches/4.2/adodb/session/old/adodb-session.php
    vtigercrm/branches/4.2/adodb/tests/test-active-recs2.php
    vtigercrm/branches/4.2/adodb/tests/test.php
    vtigercrm/branches/4.2/adodb/tests/testdatabases.inc.php
    vtigercrm/branches/4.2/adodb/toexport.inc.php
    vtigercrm/branches/4.2/adodb/tohtml.inc.php

Modified: vtigercrm/branches/4.2/adodb/adodb-active-record.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/adodb-active-record.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/adodb-active-record.inc.php Fri Jun 16 07:03:47 2006
@@ -1,7 +1,7 @@
 <?php
 /*
 
- at version V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ at version V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Latest version is available at http://adodb.sourceforge.net
  
   Released under both BSD license and Lesser GPL library license. 
@@ -10,7 +10,7 @@
   
   Active Record implementation. Superset of Zend Framework's.
   
-  Version 0.03
+  Version 0.04
   
   See http://www-128.ibm.com/developerworks/java/library/j-cb03076/?ca=dgr-lnxw01ActiveRecord 
   	for info on Ruby on Rails Active Record implementation
@@ -56,7 +56,7 @@
 
 class ADODB_Active_Record {
 	var $_dbat; // associative index pointing to ADODB_Active_DB eg. $ADODB_Active_DBS[_dbat]
-	var $_table; // tablename
+	var $_table; // tablename, if set in class definition then use it as table name
 	var $_tableat; // associative index pointing to ADODB_Active_Table, eg $ADODB_Active_DBS[_dbat]->tables[$this->_tableat]
 	var $_where; // where clause set in Load()
 	var $_saved = false; // indicates whether data is already inserted.
@@ -85,8 +85,10 @@
 			$pkeyarr = false;
 		}
 		
-		if (!$table) $table = $this->_pluralize(get_class($this));
-		
+		if (!$table) { 
+			if (!empty($this->_table)) $table = $this->_table;
+			else $table = $this->_pluralize(get_class($this));
+		}
 		if ($db) {
 			$this->_dbat = ADODB_Active_Record::SetDatabaseAdapter($db);
 		} else
@@ -455,6 +457,13 @@
 		$db->Execute($sql);
 	}
 	
+	// returns an array of active record objects
+	function &Find($whereOrderBy,$bindarr=false,$pkeysArr=false)
+	{
+		$db =& $this->DB(); if (!$db || empty($this->_table)) return false;
+		$arr =& $db->GetActiveRecordsClass(get_class($this),$this->_table, $whereOrderBy,$bindarr,$pkeysArr);
+		return $arr;
+	}
 	
 	// returns 0 on error, 1 on update, 2 on insert
 	function Replace()

Modified: vtigercrm/branches/4.2/adodb/adodb-csvlib.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/adodb-csvlib.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/adodb-csvlib.inc.php Fri Jun 16 07:03:47 2006
@@ -8,7 +8,7 @@
 
 /* 
 
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. See License.txt. 

Modified: vtigercrm/branches/4.2/adodb/adodb-datadict.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/adodb-datadict.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/adodb-datadict.inc.php Fri Jun 16 07:03:47 2006
@@ -1,7 +1,7 @@
 <?php
 
 /**
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/branches/4.2/adodb/adodb-error.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/adodb-error.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/adodb-error.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /** 
- * @version V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ * @version V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
  * Released under both BSD license and Lesser GPL library license. 
  * Whenever there is any discrepancy between the two licenses, 
  * the BSD license will take precedence. 

Modified: vtigercrm/branches/4.2/adodb/adodb-errorhandler.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/adodb-errorhandler.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/adodb-errorhandler.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ * @version V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
  * Released under both BSD license and Lesser GPL library license.
  * Whenever there is any discrepancy between the two licenses,
  * the BSD license will take precedence.

Modified: vtigercrm/branches/4.2/adodb/adodb-errorpear.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/adodb-errorpear.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/adodb-errorpear.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /** 
- * @version V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ * @version V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
  * Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. 

Modified: vtigercrm/branches/4.2/adodb/adodb-exceptions.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/adodb-exceptions.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/adodb-exceptions.inc.php Fri Jun 16 07:03:47 2006
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @version V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ * @version V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
  * Released under both BSD license and Lesser GPL library license.
  * Whenever there is any discrepancy between the two licenses,
  * the BSD license will take precedence.

Modified: vtigercrm/branches/4.2/adodb/adodb-iterator.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/adodb-iterator.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/adodb-iterator.inc.php Fri Jun 16 07:03:47 2006
@@ -1,7 +1,7 @@
 <?php
 
 /*
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

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 Fri Jun 16 07:03:47 2006
@@ -7,7 +7,7 @@
 $ADODB_INCLUDED_LIB = 1;
 
 /* 
- @version V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim\@natsoft.com.my). All rights reserved.
+ @version V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim\@natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. See License.txt. 
@@ -325,6 +325,8 @@
 		$rewritesql = preg_replace(
 					'/^\s*SELECT\s.*\s+FROM\s/Uis','SELECT COUNT(*) FROM ',$sql);
 
+		
+		
 		// fix by alexander zhukov, alex#unipack.ru, because count(*) and 'order by' fails 
 		// with mssql, access and postgresql. Also a good speedup optimization - skips sorting!
 		// also see http://phplens.com/lens/lensforum/msgs.php?id=12752
@@ -332,10 +334,13 @@
 			$rewritesql = preg_replace('/(\sORDER\s+BY\s.*)/is','',$rewritesql);
 		else
 			$rewritesql = preg_replace('/(\sORDER\s+BY\s[^)]*)/is','',$rewritesql);
+	}
+	
+	
+	
+	if (isset($rewritesql) && $rewritesql != $sql) {
+		if (preg_match('/\sLIMIT\s+[0-9]+/i',$sql,$limitarr)) $rewritesql .= $limitarr[1];
 		 
-	}
-	
-	if (isset($rewritesql) && $rewritesql != $sql) {
 		if ($secs2cache) {
 			// we only use half the time of secs2cache because the count can quickly
 			// become inaccurate if new records are added
@@ -354,6 +359,8 @@
 	if (preg_match('/\s*UNION\s*/is', $sql)) $rewritesql = $sql;
 	else $rewritesql = preg_replace('/(\sORDER\s+BY\s.*)/is','',$sql); 
 	
+	if (preg_match('/\sLIMIT\s+[0-9]+/i',$sql,$limitarr)) $rewritesql .= $limitarr[0];
+		
 	$rstest = &$zthis->Execute($rewritesql,$inputarr);
 	if (!$rstest) $rstest = $zthis->Execute($sql,$inputarr);
 	
@@ -1017,5 +1024,47 @@
 	
 	return $s;
 }
+/*
+function _adodb_find_from($sql) 
+{
+
+	$sql = str_replace(array("\n","\r"), ' ', $sql);
+	$charCount = strlen($sql);
+	
+	$inString = false;
+	$quote = '';
+	$parentheseCount = 0;
+	$prevChars = '';
+	$nextChars = '';
+	
+
+	for($i = 0; $i < $charCount; $i++) {
+
+    	$char = substr($sql,$i,1);
+	    $prevChars = substr($sql,0,$i);
+    	$nextChars = substr($sql,$i+1);
+
+		if((($char == "'" || $char == '"' || $char == '`') && substr($prevChars,-1,1) != '\\') && $inString === false) {
+			$quote = $char;
+			$inString = true;
+		}
+
+		elseif((($char == "'" || $char == '"' || $char == '`') && substr($prevChars,-1,1) != '\\') && $inString === true && $quote == $char) {
+			$quote = "";
+			$inString = false;
+		}
+
+		elseif($char == "(" && $inString === false)
+			$parentheseCount++;
+
+		elseif($char == ")" && $inString === false && $parentheseCount > 0)
+			$parentheseCount--;
+
+		elseif($parentheseCount <= 0 && $inString === false && $char == " " && strtoupper(substr($prevChars,-5,5)) == " FROM")
+			return $i;
+
+	}
+}
+*/
 
 ?>

Modified: vtigercrm/branches/4.2/adodb/adodb-pager.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/adodb-pager.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/adodb-pager.inc.php Fri Jun 16 07:03:47 2006
@@ -1,7 +1,7 @@
 <?php
 
 /*
-	V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+	V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
 	  Released under both BSD license and Lesser GPL library license. 
 	  Whenever there is any discrepancy between the two licenses, 
 	  the BSD license will take precedence. 

Modified: vtigercrm/branches/4.2/adodb/adodb-pear.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/adodb-pear.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/adodb-pear.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /** 
- * @version V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ * @version V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
  * Released under both BSD license and Lesser GPL library license. 
  * Whenever there is any discrepancy between the two licenses, 
  * the BSD license will take precedence. 

Modified: vtigercrm/branches/4.2/adodb/adodb-perf.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/adodb-perf.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/adodb-perf.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. See License.txt. 

Modified: vtigercrm/branches/4.2/adodb/adodb-php4.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/adodb-php4.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/adodb-php4.inc.php Fri Jun 16 07:03:47 2006
@@ -1,7 +1,7 @@
 <?php
 
 /*
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

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 Fri Jun 16 07:03:47 2006
@@ -14,7 +14,7 @@
 /**
 	\mainpage 	
 	
-	 @version V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+	 @version V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
 
 	Released under both BSD license and Lesser GPL library license. You can choose which license
 	you prefer.
@@ -171,7 +171,7 @@
 		/**
 		 * ADODB version as a string.
 		 */
-		$ADODB_vers = 'V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved. Released BSD & LGPL.';
+		$ADODB_vers = 'V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved. Released BSD & LGPL.';
 	
 		/**
 		 * Determines whether recordset->RecordCount() is used. 
@@ -314,6 +314,7 @@
 	var $_evalAll = false;
 	var $_affected = false;
 	var $_logsql = false;
+	var $_transmode = ''; // transaction mode
 	
 	/**
 	 * Constructor
@@ -823,7 +824,10 @@
 							$sql .= str_replace(',','.',$v); // locales fix so 1.1 does not get converted to 1,1
 						else if ($typ == 'boolean')
 							$sql .= $v ? $this->true : $this->false;
-						else if ($v === null)
+						else if ($typ == 'object') {
+							if (method_exists($v, '__toString')) $sql .= $this->qstr($v->__toString());
+							else $sql .= $this->qstr((string) $v);
+						} else if ($v === null)
 							$sql .= 'NULL';
 						else
 							$sql .= $v;
@@ -1732,15 +1736,16 @@
 	 */
 	function& AutoExecute($table, $fields_values, $mode = 'INSERT', $where = FALSE, $forceUpdate=true, $magicq=false) 
 	{
+		$false = false;
 		$sql = 'SELECT * FROM '.$table;  
 		if ($where!==FALSE) $sql .= ' WHERE '.$where;
 		else if ($mode == 'UPDATE' || $mode == 2 /* DB_AUTOQUERY_UPDATE */) {
 			ADOConnection::outp('AutoExecute: Illegal mode=UPDATE with empty WHERE clause');
-			return false;
+			return $false;
 		}
 
 		$rs =& $this->SelectLimit($sql,1);
-		if (!$rs) return false; // table does not exist
+		if (!$rs) return $false; // table does not exist
 		$rs->tableName = $table;
 		
 		switch((string) $mode) {
@@ -1754,7 +1759,7 @@
 			break;
 		default:
 			ADOConnection::outp("AutoExecute: Unknown mode=$mode");
-			return false;
+			return $false;
 		}
 		$ret = false;
 		if ($sql) $ret = $this->Execute($sql);
@@ -2017,6 +2022,57 @@
 	 */
 	function BeginTrans() {return false;}
 	
+	/* set transaction mode */
+	function SetTransactionMode( $transaction_mode ) 
+	{
+		$transaction_mode = $this->MetaTransaction($transaction_mode, $this->dataProvider);
+		$this->_transmode  = $transaction_mode;
+	}
+/*
+http://msdn2.microsoft.com/en-US/ms173763.aspx
+http://dev.mysql.com/doc/refman/5.0/en/innodb-transaction-isolation.html
+http://www.postgresql.org/docs/8.1/interactive/sql-set-transaction.html
+http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_10005.htm
+*/
+	function MetaTransaction($mode,$db)
+	{
+		$mode = strtoupper($mode);
+		$mode = str_replace('ISOLATION LEVEL ','',$mode);
+		
+		switch($mode) {
+
+		case 'READ UNCOMMITTED':
+			switch($db) { 
+			case 'oci8':
+			case 'oracle':
+				return 'ISOLATION LEVEL READ COMMITTED';
+			default:
+				return 'ISOLATION LEVEL READ UNCOMMITTED';
+			}
+			break;
+					
+		case 'READ COMMITTED':
+				return 'ISOLATION LEVEL READ COMMITTED';
+			break;
+			
+		case 'REPEATABLE READ':
+			switch($db) {
+			case 'oci8':
+			case 'oracle':
+				return 'ISOLATION LEVEL SERIALIZABLE';
+			default:
+				return 'ISOLATION LEVEL REPEATABLE READ';
+			}
+			break;
+			
+		case 'SERIALIZABLE':
+				return 'ISOLATION LEVEL SERIALIZABLE';
+			break;
+			
+		default:
+			return $mode;
+		}
+	}
 	
 	/**
 	 * If database does not support transactions, always return true as data always commited
@@ -2208,7 +2264,7 @@
 	 *
 	 * @return  array of column names for current table.
 	 */ 
-	function &MetaColumnNames($table, $numIndexes=false) 
+	function &MetaColumnNames($table, $numIndexes=false,$useattnum=false /* only for postgres */) 
 	{
 		$objarr =& $this->MetaColumns($table);
 		if (!is_array($objarr)) {
@@ -2218,7 +2274,12 @@
 		$arr = array();
 		if ($numIndexes) {
 			$i = 0;
-			foreach($objarr as $v) $arr[$i++] = $v->name;
+			if ($useattnum) {
+				foreach($objarr as $v) 
+					$arr[$v->attnum] = $v->name;
+				
+			} else
+				foreach($objarr as $v) $arr[$i++] = $v->name;
 		} else
 			foreach($objarr as $v) $arr[strtoupper($v->name)] = $v->name;
 		
@@ -2260,6 +2321,22 @@
 		}
 
 		return adodb_date($this->fmtDate,$d);
+	}
+	
+	function BindDate($d)
+	{
+		$d = $this->DBDate($d);
+		if (strncmp($d,"'",1)) return $d;
+		
+		return substr($d,1,strlen($d)-2);
+	}
+	
+	function BindTimeStamp($d)
+	{
+		$d = $this->DBTimeStamp($d);
+		if (strncmp($d,"'",1)) return $d;
+		
+		return substr($d,1,strlen($d)-2);
 	}
 	
 	
@@ -3361,6 +3438,7 @@
 		'BPCHAR' => 'C',
 		'CHARACTER' => 'C',
 		'INTERVAL' => 'C',  # Postgres
+		'MACADDR' => 'C', # postgres
 		##
 		'LONGCHAR' => 'X',
 		'TEXT' => 'X',
@@ -3387,6 +3465,7 @@
 		'DATETIME' => 'T',
 		'TIMESTAMPTZ' => 'T',
 		'T' => 'T',
+		'TIMESTAMP WITHOUT TIME ZONE' => 'T', // postgresql
 		##
 		'BOOL' => 'L',
 		'BOOLEAN' => 'L', 

Modified: vtigercrm/branches/4.2/adodb/datadict/datadict-access.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/datadict/datadict-access.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/datadict/datadict-access.inc.php Fri Jun 16 07:03:47 2006
@@ -1,7 +1,7 @@
 <?php
 
 /**
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/branches/4.2/adodb/datadict/datadict-db2.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/datadict/datadict-db2.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/datadict/datadict-db2.inc.php Fri Jun 16 07:03:47 2006
@@ -1,7 +1,7 @@
 <?php
 
 /**
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/branches/4.2/adodb/datadict/datadict-firebird.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/datadict/datadict-firebird.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/datadict/datadict-firebird.inc.php Fri Jun 16 07:03:47 2006
@@ -1,7 +1,7 @@
 <?php
 
 /**
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/branches/4.2/adodb/datadict/datadict-generic.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/datadict/datadict-generic.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/datadict/datadict-generic.inc.php Fri Jun 16 07:03:47 2006
@@ -1,7 +1,7 @@
 <?php
 
 /**
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/branches/4.2/adodb/datadict/datadict-ibase.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/datadict/datadict-ibase.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/datadict/datadict-ibase.inc.php Fri Jun 16 07:03:47 2006
@@ -1,7 +1,7 @@
 <?php
 
 /**
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/branches/4.2/adodb/datadict/datadict-informix.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/datadict/datadict-informix.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/datadict/datadict-informix.inc.php Fri Jun 16 07:03:47 2006
@@ -1,7 +1,7 @@
 <?php
 
 /**
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/branches/4.2/adodb/datadict/datadict-mssql.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/datadict/datadict-mssql.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/datadict/datadict-mssql.inc.php Fri Jun 16 07:03:47 2006
@@ -1,7 +1,7 @@
 <?php
 
 /**
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/branches/4.2/adodb/datadict/datadict-mysql.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/datadict/datadict-mysql.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/datadict/datadict-mysql.inc.php Fri Jun 16 07:03:47 2006
@@ -1,7 +1,7 @@
 <?php
 
 /**
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/branches/4.2/adodb/datadict/datadict-oci8.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/datadict/datadict-oci8.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/datadict/datadict-oci8.inc.php Fri Jun 16 07:03:47 2006
@@ -1,7 +1,7 @@
 <?php
 
 /**
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/branches/4.2/adodb/datadict/datadict-postgres.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/datadict/datadict-postgres.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/datadict/datadict-postgres.inc.php Fri Jun 16 07:03:47 2006
@@ -1,7 +1,7 @@
 <?php
 
 /**
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/branches/4.2/adodb/datadict/datadict-sybase.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/datadict/datadict-sybase.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/datadict/datadict-sybase.inc.php Fri Jun 16 07:03:47 2006
@@ -1,7 +1,7 @@
 <?php
 
 /**
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-access.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-access.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-access.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. See License.txt. 

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-ado.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-ado.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-ado.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. 

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-ado5.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-ado5.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-ado5.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. 
@@ -58,8 +58,22 @@
 	// you can also pass a connection string like this:
 	//
 	// $DB->Connect('USER ID=sa;PASSWORD=pwd;SERVER=mangrove;DATABASE=ai',false,false,'SQLOLEDB');
-	function _connect($argHostname, $argUsername, $argPassword, $argProvider= 'MSDASQL')
-	{
+	function _connect($argHostname, $argUsername, $argPassword,$argDBorProvider, $argProvider= '')
+	{
+	// two modes
+	//	-	if $argProvider is empty, we assume that $argDBorProvider holds provider -- this is for backward compat
+	//	- 	if $argProvider is not empty, then $argDBorProvider holds db
+	
+		
+		 if ($argProvider) {
+		 	$argDatabasename = $argDBorProvider;
+		 } else {
+		 	$argDatabasename = '';
+		 	if ($argDBorProvider) $argProvider = $argDBorProvider;
+			else $argProvider = 'MSDASQL';
+		}
+		
+		
 		try {
 		$u = 'UID';
 		$p = 'PWD';
@@ -86,7 +100,11 @@
 			$argProvider = "Microsoft.Jet.OLEDB.4.0"; // Microsoft Jet Provider
 		
 		if ($argProvider) $dbc->Provider = $argProvider;	
-		
+
+		if ($argProvider) $argHostname = "PROVIDER=$argProvider;DRIVER={SQL Server};SERVER=$argHostname";	
+		
+
+		if ($argDatabasename) $argHostname .= ";DATABASE=$argDatabasename";		
 		if ($argUsername) $argHostname .= ";$u=$argUsername";
 		if ($argPassword)$argHostname .= ";$p=$argPassword";
 		
@@ -205,9 +223,6 @@
 		return $arr;
 	}
 	
-
-
-	
 	/* returns queryID or false */
 	function &_query($sql,$inputarr=false) 
 	{
@@ -251,7 +266,8 @@
 		if ($rs->State == 0) {
 			$true = true;
 			return $true; // 0 = adStateClosed means no records returned
-		} return $rs;
+		}
+		return $rs;
 		
 		} catch (exception $e) {
 			
@@ -296,11 +312,17 @@
 	function ErrorMsg() 
 	{
 		if (!$this->_connectionID) return "No connection established";
-		$errc = $this->_connectionID->Errors;
-		if (!$errc) return "No Errors object found";
-		if ($errc->Count == 0) return '';
-		$err = $errc->Item($errc->Count-1);
-		return $err->Description;
+		$errmsg = '';
+		
+		try {
+			$errc = $this->_connectionID->Errors;
+			if (!$errc) return "No Errors object found";
+			if ($errc->Count == 0) return '';
+			$err = $errc->Item($errc->Count-1);
+			$errmsg = $err->Description;
+		}catch(exception $e) {
+		}
+		return $errmsg;
 	}
 	
 	function ErrorNo() 

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-ado_access.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-ado_access.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-ado_access.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
 Released under both BSD license and Lesser GPL library license. 
 Whenever there is any discrepancy between the two licenses, 
 the BSD license will take precedence. See License.txt. 

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-ado_mssql.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-ado_mssql.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-ado_mssql.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. 
@@ -11,8 +11,8 @@
   Microsoft SQL Server ADO data driver. Requires ADO and MSSQL client. 
   Works only on MS Windows.
   
-  It is normally better to use the mssql driver directly because it is much faster. 
-  This file is only a technology demonstration and for test purposes.
+  Warning: Some versions of PHP (esp PHP4) leak memory when ADO/COM is used. 
+  Please check http://bugs.php.net/ for more info.
 */
 
 // security - hide paths
@@ -53,6 +53,17 @@
 	        return $this->GetOne('select @@rowcount');
 	}
 	
+	function SetTransactionMode( $transaction_mode ) 
+	{
+		$this->_transmode  = $transaction_mode;
+		if (empty($transaction_mode)) {
+			$this->Execute('SET TRANSACTION ISOLATION LEVEL READ COMMITTED');
+			return;
+		}
+		if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
+		$this->Execute("SET TRANSACTION ".$transaction_mode);
+	}
+	
 	function MetaColumns($table)
 	{
         $table = strtoupper($table);
@@ -84,6 +95,44 @@
 		return empty($arr) ? $false : $arr;
 	}
 	
+	function CreateSequence($seq='adodbseq',$start=1)
+	{
+		
+		$this->Execute('BEGIN TRANSACTION adodbseq');
+		$start -= 1;
+		$this->Execute("create table $seq (id float(53))");
+		$ok = $this->Execute("insert into $seq with (tablock,holdlock) values($start)");
+		if (!$ok) {
+				$this->Execute('ROLLBACK TRANSACTION adodbseq');
+				return false;
+		}
+		$this->Execute('COMMIT TRANSACTION adodbseq'); 
+		return true;
+	}
+
+	function GenID($seq='adodbseq',$start=1)
+	{
+		//$this->debug=1;
+		$this->Execute('BEGIN TRANSACTION adodbseq');
+		$ok = $this->Execute("update $seq with (tablock,holdlock) set id = id + 1");
+		if (!$ok) {
+			$this->Execute("create table $seq (id float(53))");
+			$ok = $this->Execute("insert into $seq with (tablock,holdlock) values($start)");
+			if (!$ok) {
+				$this->Execute('ROLLBACK TRANSACTION adodbseq');
+				return false;
+			}
+			$this->Execute('COMMIT TRANSACTION adodbseq'); 
+			return $start;
+		}
+		$num = $this->GetOne("select id from $seq");
+		$this->Execute('COMMIT TRANSACTION adodbseq'); 
+		return $num;
+		
+		// in old implementation, pre 1.90, we returned GUID...
+		//return $this->GetOne("SELECT CONVERT(varchar(255), NEWID()) AS 'Char'");
+	}
+	
 	} // end class 
 	
 	class  ADORecordSet_ado_mssql extends ADORecordSet_ado {        

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-borland_ibase.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-borland_ibase.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-borland_ibase.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. 

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-csv.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-csv.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-csv.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-db2.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-db2.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-db2.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-  V4.81 3 May 2006  (c) 2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2006 John Lim (jlim#natsoft.com.my). All rights reserved.
 
 This is a version of the ADODB driver for DB2.  It uses the 'ibm_db2' PECL extension for PHP
   (http://pecl.php.net/package/ibm_db2), which in turn requires DB2 V8.2.2.
@@ -25,7 +25,14 @@
 class ADODB_db2 extends ADOConnection {
 	var $databaseType = "db2";	
 	var $fmtDate = "'Y-m-d'";
-	var $fmtTimeStamp = "'Y-m-d, h:i:sA'";
+	var $concat_operator = '||';
+	
+	var $sysTime = 'CURRENT TIME';
+	var $sysDate = 'CURRENT DATE';
+	var $sysTimeStamp = 'CURRENT TIMESTAMP';
+	
+	var $fmtTimeStamp = "'Y-m-d-H.i.s'";
+	#var $fmtTimeStamp = "'Y-m-d, h:i:sA'";
 	var $replaceQuote = "''"; // string to use to replace quotes
 	var $dataProvider = "db2";
 	var $hasAffectedRows = true;
@@ -40,6 +47,12 @@
 	var $_haserrorfunctions = true;
 	var $_lastAffectedRows = 0;
 	var $uCaseTables = true; // for meta* functions, uppercase table names
+	var $hasInsertID = true;
+	
+    function _insertid()
+    {
+        return ADOConnection::GetOne('VALUES IDENTITY_VAL_LOCAL()');
+    }
 	
 	function ADODB_db2() 
 	{ 	
@@ -103,6 +116,61 @@
 		return $this->_connectionID != false;
 	}
 
+	
+	// Format date column in sql string given an input format that understands Y M D
+	function SQLDate($fmt, $col=false)
+	{	
+	// use right() and replace() ?
+		if (!$col) $col = $this->sysDate;
+		$s = '';
+		
+		$len = strlen($fmt);
+		for ($i=0; $i < $len; $i++) {
+			if ($s) $s .= $this->concat_operator;
+			$ch = $fmt[$i];
+			switch($ch) {
+			case 'Y':
+			case 'y':
+				$s .= "char(year($col))";
+				break;
+			case 'M':
+				$s .= "substr(monthname($col),1,3)";
+				break;
+			case 'm':
+				$s .= "right(digits(month($col)),2)";
+				break;
+			case 'D':
+			case 'd':
+				$s .= "right(digits(day($col)),2)";
+				break;
+			case 'H':
+			case 'h':
+				if ($col != $this->sysDate) $s .= "right(digits(hour($col)),2)";	
+				else $s .= "''";
+				break;
+			case 'i':
+			case 'I':
+				if ($col != $this->sysDate)
+					$s .= "right(digits(minute($col)),2)";
+					else $s .= "''";
+				break;
+			case 'S':
+			case 's':
+				if ($col != $this->sysDate)
+					$s .= "right(digits(second($col)),2)";
+				else $s .= "''";
+				break;
+			default:
+				if ($ch == '\\') {
+					$i++;
+					$ch = substr($fmt,$i,1);
+				}
+				$s .= $this->qstr($ch);
+			}
+		}
+		return $s;
+	} 
+ 
 	
 	function ServerInfo()
 	{
@@ -575,15 +643,12 @@
 
 
 	// returns the field object
-	function &FetchField($fieldOffset = -1) 
-	{
-		
-		$off=$fieldOffset+1; // offsets begin at 1
-		
+	function &FetchField($offset = -1) 
+	{
 		$o= new ADOFieldObject();
-		$o->name = @db2_field_name($this->_queryID,$off);
-		$o->type = @db2_field_type($this->_queryID,$off);
-		$o->max_length = db2_field_width($this->_queryID,$off);
+		$o->name = @db2_field_name($this->_queryID,$offset);
+		$o->type = @db2_field_type($this->_queryID,$offset);
+		$o->max_length = db2_field_width($this->_queryID,$offset);
 		if (ADODB_ASSOC_CASE == 0) $o->name = strtolower($o->name);
 		else if (ADODB_ASSOC_CASE == 1) $o->name = strtoupper($o->name);
 		return $o;

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-fbsql.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-fbsql.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-fbsql.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /*
- @version V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ @version V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
  Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. 

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-firebird.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-firebird.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-firebird.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. 

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-ibase.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-ibase.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-ibase.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.  
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.  
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-informix.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-informix.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-informix.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+* @version V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
 * Released under both BSD license and Lesser GPL library license.
 * Whenever there is any discrepancy between the two licenses,
 * the BSD license will take precedence.

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-informix72.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-informix72.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-informix72.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim. All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim. All rights reserved.
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-ldap.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-ldap.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-ldap.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /*
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
    Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-mssql.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-mssql.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-mssql.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. 
@@ -296,6 +296,17 @@
 		return true;
 	}
 	
+	function SetTransactionMode( $transaction_mode ) 
+	{
+		$this->_transmode  = $transaction_mode;
+		if (empty($transaction_mode)) {
+			$this->Execute('SET TRANSACTION ISOLATION LEVEL READ COMMITTED');
+			return;
+		}
+		if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
+		$this->Execute("SET TRANSACTION ".$transaction_mode);
+	}
+	
 	/*
 		Usage:
 		

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-mssqlpo.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-mssqlpo.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-mssqlpo.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+* @version V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
 * Released under both BSD license and Lesser GPL library license.
 * Whenever there is any discrepancy between the two licenses,
 * the BSD license will take precedence.

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 Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.
@@ -542,6 +542,9 @@
 	// "Innox - Juan Carlos Gonzalez" <jgonzalez#innox.com.mx>
 	function MetaForeignKeys( $table, $owner = FALSE, $upper = FALSE, $associative = FALSE )
      {
+	 global $ADODB_FETCH_MODE;
+		if ($ADODB_FETCH_MODE == ADODB_FETCH_ASSOC || $this->fetchMode == ADODB_FETCH_ASSOC) $associative = true;
+
          if ( !empty($owner) ) {
             $table = "$owner.$table";
          }

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-mysqli.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-mysqli.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-mysqli.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.
@@ -58,6 +58,16 @@
 	    
 	}
 	
+	function SetTransactionMode( $transaction_mode ) 
+	{
+		$this->_transmode  = $transaction_mode;
+		if (empty($transaction_mode)) {
+			$this->Execute('SET SESSION TRANSACTION ISOLATION LEVEL REPEATABLE READ');
+			return;
+		}
+		if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
+		$this->Execute("SET SESSION TRANSACTION ".$transaction_mode);
+	}
 
 	// returns true or false
 	// To add: parameter int $port,
@@ -445,6 +455,10 @@
 	// "Innox - Juan Carlos Gonzalez" <jgonzalez#innox.com.mx>
 	function MetaForeignKeys( $table, $owner = FALSE, $upper = FALSE, $associative = FALSE )
 	{
+	 global $ADODB_FETCH_MODE;
+		
+		if ($ADODB_FETCH_MODE == ADODB_FETCH_ASSOC || $this->fetchMode == ADODB_FETCH_ASSOC) $associative = true;
+		
 	    if ( !empty($owner) ) {
 	       $table = "$owner.$table";
 	    }

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-mysqlt.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-mysqlt.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-mysqlt.inc.php Fri Jun 16 07:03:47 2006
@@ -1,7 +1,7 @@
 <?php
 
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.
@@ -28,6 +28,23 @@
 	function ADODB_mysqlt() 
 	{			
 	global $ADODB_EXTENSION; if ($ADODB_EXTENSION) $this->rsPrefix .= 'ext_';
+	}
+	
+	/* set transaction mode
+	
+	SET [GLOBAL | SESSION] TRANSACTION ISOLATION LEVEL
+{ READ UNCOMMITTED | READ COMMITTED | REPEATABLE READ | SERIALIZABLE }
+
+	*/
+	function SetTransactionMode( $transaction_mode ) 
+	{
+		$this->_transmode  = $transaction_mode;
+		if (empty($transaction_mode)) {
+			$this->Execute('SET SESSION TRANSACTION ISOLATION LEVEL REPEATABLE READ');
+			return;
+		}
+		if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
+		$this->Execute("SET SESSION TRANSACTION ".$transaction_mode);
 	}
 	
 	function BeginTrans()

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-netezza.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-netezza.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-netezza.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /*
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
  
   First cut at the Netezza Driver by Josh Eldridge joshuae74#hotmail.com
  Based on the previous postgres drivers.

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-oci8.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-oci8.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-oci8.inc.php Fri Jun 16 07:03:47 2006
@@ -1,7 +1,7 @@
 <?php
 /*
 
-  version V4.81 3 May 2006 (c) 2000-2006 John Lim. All rights reserved.
+  version V4.90 8 June 2006 (c) 2000-2006 John Lim. All rights reserved.
 
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
@@ -278,6 +278,21 @@
 		return "TO_DATE(".adodb_date($this->fmtDate,$d).",'".$this->NLS_DATE_FORMAT."')";
 	}
 
+	function BindDate($d)
+	{
+		$d = ADOConnection::DBDate($d);
+		if (strncmp($d,"'",1)) return $d;
+		
+		return substr($d,1,strlen($d)-2);
+	}
+	
+	function BindTimeStamp($d)
+	{
+		$d = ADOConnection::DBTimeStamp($d);
+		if (strncmp($d,"'",1)) return $d;
+		
+		return substr($d,1,strlen($d)-2);
+	}
 	
 	// format and return date string in database timestamp format
 	function DBTimeStamp($ts)
@@ -381,6 +396,8 @@
 		$this->transCnt += 1;
 		$this->autoCommit = false;
 		$this->_commit = OCI_DEFAULT;
+		
+		if ($this->_transmode) $this->Execute("SET TRANSACTION ".$this->_transmode);
 		return true;
 	}
 	

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-oci805.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-oci805.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-oci805.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /** 
- * @version V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ * @version V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
  * Released under both BSD license and Lesser GPL library license. 
  * Whenever there is any discrepancy between the two licenses, 
  * the BSD license will take precedence. 

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-oci8po.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-oci8po.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-oci8po.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim. All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim. All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-odbc.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-odbc.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-odbc.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. 

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-odbc_db2.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-odbc_db2.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-odbc_db2.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. 
@@ -60,7 +60,7 @@
 ========================
 To set SQL_CUR_USE_ODBC for drivers that require it, do this:
 
-$db = NewADOConnection('db2');
+$db = NewADOConnection('odbc_db2');
 $db->curMode = SQL_CUR_USE_ODBC;
 $db->Connect($dsn, $userid, $pwd);
 
@@ -80,6 +80,10 @@
 > In case of DB2 I had to swap the first and last arguments in order to connect properly. 
 
 
+System Error 5
+==============
+IF you get a System Error 5 when trying to Connect/Load, it could be a permission problem. Give the user connecting
+to DB2 full rights to the DB2 SQLLIB directory, and place the user in the DBUSERS group.
 */
 
 // security - hide paths
@@ -88,13 +92,14 @@
 if (!defined('_ADODB_ODBC_LAYER')) {
 	include(ADODB_DIR."/drivers/adodb-odbc.inc.php");
 }
-if (!defined('ADODB_DB2')){
-define('ADODB_DB2',1);
-
-class ADODB_DB2 extends ADODB_odbc {
+if (!defined('ADODB_ODBC_DB2')){
+define('ADODB_ODBC_DB2',1);
+
+class ADODB_ODBC_DB2 extends ADODB_odbc {
 	var $databaseType = "db2";	
 	var $concat_operator = '||';
-	var $sysDate = 'CURRENT_DATE';
+	var $sysTime = 'CURRENT TIME';
+	var $sysDate = 'CURRENT DATE';
 	var $sysTimeStamp = 'CURRENT TIMESTAMP';
 	// The complete string representation of a timestamp has the form 
 	// yyyy-mm-dd-hh.mm.ss.nnnnnn.
@@ -103,6 +108,7 @@
 	var $identitySQL = 'values IDENTITY_VAL_LOCAL()';
 	var $_bindInputArray = true;
 	 var $hasInsertID = true;
+	var $rsPrefix = 'ADORecordset_odbc_';
 	
 	function ADODB_DB2()
 	{
@@ -294,7 +300,7 @@
 };
  
 
-class  ADORecordSet_db2 extends ADORecordSet_odbc {	
+class  ADORecordSet_odbc_db2 extends ADORecordSet_odbc {	
 	
 	var $databaseType = "db2";		
 	

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-odbc_mssql.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-odbc_mssql.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-odbc_mssql.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. 
@@ -142,6 +142,17 @@
 		return ADODB_odbc::_query($sql,$inputarr);
 	}
 	
+	function SetTransactionMode( $transaction_mode ) 
+	{
+		$this->_transmode  = $transaction_mode;
+		if (empty($transaction_mode)) {
+			$this->Execute('SET TRANSACTION ISOLATION LEVEL READ COMMITTED');
+			return;
+		}
+		if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
+		$this->Execute("SET TRANSACTION ".$transaction_mode);
+	}
+	
 	// "Stein-Aksel Basma" <basma at accelero.no>
 	// tested with MSSQL 2000
 	function &MetaPrimaryKeys($table)

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-odbc_oracle.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-odbc_oracle.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-odbc_oracle.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. 

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-odbtp.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-odbtp.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-odbtp.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /*
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence. See License.txt.

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-odbtp_unicode.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-odbtp_unicode.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-odbtp_unicode.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /*
-	V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+	V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence. See License.txt.

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-oracle.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-oracle.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-oracle.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.
@@ -45,6 +45,24 @@
 		if (is_string($ts)) $d = ADORecordSet::UnixTimeStamp($ts);
 		return 'TO_DATE('.adodb_date($this->fmtTimeStamp,$ts).",'RRRR-MM-DD, HH:MI:SS AM')";
 	}
+	
+	
+	function BindDate($d)
+	{
+		$d = ADOConnection::DBDate($d);
+		if (strncmp($d,"'",1)) return $d;
+		
+		return substr($d,1,strlen($d)-2);
+	}
+	
+	function BindTimeStamp($d)
+	{
+		$d = ADOConnection::DBTimeStamp($d);
+		if (strncmp($d,"'",1)) return $d;
+		
+		return substr($d,1,strlen($d)-2);
+	}
+	
 
 	
 	function BeginTrans()

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-pdo.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-pdo.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-pdo.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. 

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-pdo_mssql.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-pdo_mssql.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-pdo_mssql.inc.php Fri Jun 16 07:03:47 2006
@@ -2,7 +2,7 @@
 
 
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.
@@ -36,6 +36,17 @@
 		return $ret;
 	}
 	
+	function SetTransactionMode( $transaction_mode ) 
+	{
+		$this->_transmode  = $transaction_mode;
+		if (empty($transaction_mode)) {
+			$this->Execute('SET TRANSACTION ISOLATION LEVEL READ COMMITTED');
+			return;
+		}
+		if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
+		$this->Execute("SET TRANSACTION ".$transaction_mode);
+	}
+	
 	function MetaTables()
 	{
 		return false;

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-pdo_mysql.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-pdo_mysql.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-pdo_mysql.inc.php Fri Jun 16 07:03:47 2006
@@ -2,7 +2,7 @@
 
 
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.
@@ -48,6 +48,17 @@
 		
 		$this->metaTablesSQL = $save;
 		return $ret;
+	}
+	
+	function SetTransactionMode( $transaction_mode ) 
+	{
+		$this->_transmode  = $transaction_mode;
+		if (empty($transaction_mode)) {
+			$this->Execute('SET TRANSACTION ISOLATION LEVEL REPEATABLE READ');
+			return;
+		}
+		if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
+		$this->Execute("SET SESSION TRANSACTION ".$transaction_mode);
 	}
 	
  	function &MetaColumns($table) 

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-pdo_oci.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-pdo_oci.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-pdo_oci.inc.php Fri Jun 16 07:03:47 2006
@@ -2,7 +2,7 @@
 
 
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-pdo_pgsql.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-pdo_pgsql.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-pdo_pgsql.inc.php Fri Jun 16 07:03:47 2006
@@ -1,7 +1,7 @@
 <?php
 
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-postgres.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-postgres.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-postgres.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /*
- V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-postgres64.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-postgres64.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-postgres64.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /*
- V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.
@@ -174,7 +174,7 @@
 	{
 		if ($this->transOff) return true;
 		$this->transCnt += 1;
-		return @pg_Exec($this->_connectionID, "begin");
+		return @pg_Exec($this->_connectionID, "begin ".$this->_transmode);
 	}
 	
 	function RowLock($tables,$where,$flds='1 as ignore') 
@@ -532,6 +532,8 @@
 			$fld->name = $rs->fields[0];
 			$fld->type = $rs->fields[1];
 			$fld->max_length = $rs->fields[2];
+			$fld->attnum = $rs->fields[6];
+			
 			if ($fld->max_length <= 0) $fld->max_length = $rs->fields[3]-4;
 			if ($fld->max_length <= 0) $fld->max_length = -1;
 			if ($fld->type == 'numeric') {
@@ -617,12 +619,14 @@
 					return $false;
                 }
 				
-                $col_names = $this->MetaColumnNames($table,true);
+                $col_names = $this->MetaColumnNames($table,true,true); 
+				//3rd param is use attnum, 
+				// see http://sourceforge.net/tracker/index.php?func=detail&aid=1451245&group_id=42718&atid=433976
                 $indexes = array();
                 while ($row = $rs->FetchRow()) {
                         $columns = array();
                         foreach (explode(' ', $row[2]) as $col) {
-                                $columns[] = $col_names[$col - 1];
+                                $columns[] = $col_names[$col];
                         }
                         
                         $indexes[$row[0]] = array(
@@ -701,7 +705,7 @@
 	// returns queryID or false
 	function _query($sql,$inputarr)
 	{
-		
+		$this->_errorMsg = false;
 		if ($inputarr) {
 		/*
 			It appears that PREPARE/EXECUTE is slower for many queries.
@@ -730,6 +734,7 @@
 			
 			if ($execp) $exsql = "EXECUTE $plan ($execp)";
 			else $exsql = "EXECUTE $plan";
+			
 			
 			$rez = @pg_exec($this->_connectionID,$exsql);
 			if (!$rez) {
@@ -756,12 +761,11 @@
 				$s = "PREPARE $plan ($params) AS ".substr($sql,0,strlen($sql)-2);		
 				//adodb_pr($s);
 				pg_exec($this->_connectionID,$s);
-				echo $this->ErrorMsg();
+				//echo $this->ErrorMsg();
 			}
 			
 			$rez = pg_exec($this->_connectionID,$exsql);
 		} else {
-			$this->_errorMsg = false;
 			//adodb_backtrace();
 			$rez = pg_exec($this->_connectionID,$sql);
 		}
@@ -1000,6 +1004,7 @@
 		   		case 'BPCHAR':
 				case '_VARCHAR':
 				case 'INET':
+				case 'MACADDR':
 					if ($len <= $this->blobSize) return 'C';
 				
 				case 'TEXT':
@@ -1019,6 +1024,8 @@
 				case 'DATE':
 					return 'D';
 				
+				
+				case 'TIMESTAMP WITHOUT TIME ZONE':
 				case 'TIME':
 				case 'DATETIME':
 				case 'TIMESTAMP':

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-postgres7.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-postgres7.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-postgres7.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /*
- V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.
@@ -55,6 +55,7 @@
 		return $sql;
 	}
  	*/
+
 
 	// from  Edward Jaramilla, improved version - works on pg 7.4
 	function MetaForeignKeys($table, $owner=false, $upper=false)
@@ -96,6 +97,7 @@
 			// We don't have native support for parameterized queries, so let's emulate it at the parent
 			return ADODB_postgres64::_query($sql, $inputarr);
 		}
+		$this->_errorMsg = false;
 		// -- added Cristiano da Cunha Duarte
 		if ($inputarr) {
 			$sqlarr = explode('?',trim($sql));

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-postgres8.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-postgres8.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-postgres8.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /*
- V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-proxy.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-proxy.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-proxy.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-sapdb.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-sapdb.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-sapdb.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. 

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-sqlanywhere.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-sqlanywhere.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-sqlanywhere.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-version V4.81 3 May 2006 (c) 2000-2006  John Lim (jlim#natsoft.com.my).  All rights
+version V4.90 8 June 2006 (c) 2000-2006  John Lim (jlim#natsoft.com.my).  All rights
 reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-sqlite.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-sqlite.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-sqlite.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-sqlitepo.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-sqlitepo.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-sqlitepo.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-sybase.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-sybase.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-sybase.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim. All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim. All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. 

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-sybase_ase.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-sybase_ase.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-sybase_ase.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /*
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-vfp.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-vfp.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-vfp.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. 

Modified: vtigercrm/branches/4.2/adodb/perf/perf-db2.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/perf/perf-db2.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/perf/perf-db2.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. See License.txt. 

Modified: vtigercrm/branches/4.2/adodb/perf/perf-informix.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/perf/perf-informix.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/perf/perf-informix.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. See License.txt. 

Modified: vtigercrm/branches/4.2/adodb/perf/perf-mssql.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/perf/perf-mssql.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/perf/perf-mssql.inc.php Fri Jun 16 07:03:47 2006
@@ -1,7 +1,7 @@
 <?php
 
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. See License.txt. 

Modified: vtigercrm/branches/4.2/adodb/perf/perf-mysql.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/perf/perf-mysql.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/perf/perf-mysql.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. See License.txt. 

Modified: vtigercrm/branches/4.2/adodb/perf/perf-oci8.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/perf/perf-oci8.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/perf/perf-oci8.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. See License.txt. 

Modified: vtigercrm/branches/4.2/adodb/perf/perf-postgres.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/perf/perf-postgres.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/perf/perf-postgres.inc.php Fri Jun 16 07:03:47 2006
@@ -1,7 +1,7 @@
 <?php
 
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. See License.txt. 

Modified: vtigercrm/branches/4.2/adodb/pivottable.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/pivottable.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/pivottable.inc.php Fri Jun 16 07:03:47 2006
@@ -1,15 +1,12 @@
 <?php
 /** 
- * @version V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ * @version V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
  * Released under both BSD license and Lesser GPL library license. 
  * Whenever there is any discrepancy between the two licenses, 
  * the BSD license will take precedence. 
  *
  * Set tabs to 4 for best viewing.
  * 
- * Latest version is available at http://php.weblogs.com
- *
- * Requires PHP4.01pl2 or later because it uses include_once
 */
 
 /*
@@ -38,7 +35,7 @@
 	else $hidecnt = false;
 	
 	$iif = strpos($db->databaseType,'access') !== false; 
-		// note - vfp still doesn' work even with IIF enabled || $db->databaseType == 'vfp';
+		// note - vfp 6 still doesn' work even with IIF enabled || $db->databaseType == 'vfp';
 	
 	//$hidecnt = false;
 	
@@ -95,7 +92,12 @@
 	else
 		$sel = substr($sel,0,strlen($sel)-2);
 	
+	
+	// Strip aliases
+	$rowfields = preg_replace('/ AS (\w+)/i', '', $rowfields);
+	
 	$sql = "SELECT $sel \nFROM $tables $where \nGROUP BY $rowfields";
+	
 	return $sql;
  }
 

Modified: vtigercrm/branches/4.2/adodb/rsfilter.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/rsfilter.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/rsfilter.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /** 
- * @version V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ * @version V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
  * Released under both BSD license and Lesser GPL library license. 
  * Whenever there is any discrepancy between the two licenses, 
  * the BSD license will take precedence. 

Modified: vtigercrm/branches/4.2/adodb/server.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/server.php (original)
+++ vtigercrm/branches/4.2/adodb/server.php Fri Jun 16 07:03:47 2006
@@ -1,7 +1,7 @@
 <?php
 
 /** 
- * @version V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ * @version V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
  * Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. 

Modified: vtigercrm/branches/4.2/adodb/session/adodb-compress-bzip2.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/session/adodb-compress-bzip2.php (original)
+++ vtigercrm/branches/4.2/adodb/session/adodb-compress-bzip2.php Fri Jun 16 07:03:47 2006
@@ -1,7 +1,7 @@
 <?php
 
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
          Contributed by Ross Smith (adodb at netebb.com). 
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,

Modified: vtigercrm/branches/4.2/adodb/session/adodb-compress-gzip.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/session/adodb-compress-gzip.php (original)
+++ vtigercrm/branches/4.2/adodb/session/adodb-compress-gzip.php Fri Jun 16 07:03:47 2006
@@ -2,7 +2,7 @@
 
 
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
          Contributed by Ross Smith (adodb at netebb.com). 
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,

Modified: vtigercrm/branches/4.2/adodb/session/adodb-cryptsession.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/session/adodb-cryptsession.php (original)
+++ vtigercrm/branches/4.2/adodb/session/adodb-cryptsession.php Fri Jun 16 07:03:47 2006
@@ -2,7 +2,7 @@
 
 
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
          Contributed by Ross Smith (adodb at netebb.com). 
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,

Modified: vtigercrm/branches/4.2/adodb/session/adodb-encrypt-mcrypt.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/session/adodb-encrypt-mcrypt.php (original)
+++ vtigercrm/branches/4.2/adodb/session/adodb-encrypt-mcrypt.php Fri Jun 16 07:03:47 2006
@@ -2,7 +2,7 @@
 
 
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
          Contributed by Ross Smith (adodb at netebb.com). 
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,

Modified: vtigercrm/branches/4.2/adodb/session/adodb-encrypt-md5.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/session/adodb-encrypt-md5.php (original)
+++ vtigercrm/branches/4.2/adodb/session/adodb-encrypt-md5.php Fri Jun 16 07:03:47 2006
@@ -1,7 +1,7 @@
 <?php
 
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
          Contributed by Ross Smith (adodb at netebb.com). 
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,

Modified: vtigercrm/branches/4.2/adodb/session/adodb-encrypt-secret.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/session/adodb-encrypt-secret.php (original)
+++ vtigercrm/branches/4.2/adodb/session/adodb-encrypt-secret.php Fri Jun 16 07:03:47 2006
@@ -1,7 +1,7 @@
 <?php
 
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
          Contributed by Ross Smith (adodb at netebb.com). 
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,

Modified: vtigercrm/branches/4.2/adodb/session/adodb-session-clob.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/session/adodb-session-clob.php (original)
+++ vtigercrm/branches/4.2/adodb/session/adodb-session-clob.php Fri Jun 16 07:03:47 2006
@@ -2,7 +2,7 @@
 
 
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
          Contributed by Ross Smith (adodb at netebb.com). 
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,

Modified: vtigercrm/branches/4.2/adodb/session/adodb-session.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/session/adodb-session.php (original)
+++ vtigercrm/branches/4.2/adodb/session/adodb-session.php Fri Jun 16 07:03:47 2006
@@ -2,7 +2,7 @@
 
 
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
          Contributed by Ross Smith (adodb at netebb.com). 
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,
@@ -492,6 +492,19 @@
 	/////////////////////
 	// public methods
 	/////////////////////
+	
+	function config($driver, $host, $user, $password, $database=false,$options=false)
+	{
+		ADODB_Session::driver($driver);
+		ADODB_Session::host($host);
+		ADODB_Session::user($user);
+		ADODB_Session::password($password);
+		ADODB_Session::database($database);
+		
+		if (isset($options['table'])) ADODB_Session::table($options['table']);
+		if (isset($options['clob'])) ADODB_Session::table($options['clob']);
+		if (isset($options['field'])) ADODB_Session::dataFieldName($options['field']);
+	}
 
 	/*!
 		Create the connection to the database.
@@ -523,7 +536,6 @@
 #		assert('$driver');
 #		assert('$host');
 
-		// cannot use =& below - do not know why...
 		$conn =& ADONewConnection($driver);
 
 		if ($debug) {
@@ -618,6 +630,10 @@
 		If the data has not been modified since the last read(), we do not write.
 	*/
 	function write($key, $val) {
+	global $ADODB_SESSION_READONLY;
+	
+		if (!empty($ADODB_SESSION_READONLY)) return;
+		
 		$clob			= ADODB_Session::clob();
 		$conn			=& ADODB_Session::_conn();
 		$crc			= ADODB_Session::_crc();
@@ -646,12 +662,19 @@
 			if ($debug) {
 				echo '<p>Session: Only updating date - crc32 not changed</p>';
 			}
-			$sql = "UPDATE $table SET expiry = ".$conn->Param('0')." WHERE $binary sesskey = ".$conn->Param('1')." AND expiry >= ".$conn->Param('2');
-			$rs =& $conn->Execute($sql,array($expiry,$key,time()));
-			ADODB_Session::_dumprs($rs);
-			if ($rs) {
-				$rs->Close();
-			}
+			
+			$expirevar = '';
+			if ($expire_notify) {
+				$var = reset($expire_notify);
+				global $$var;
+				if (isset($$var)) {
+					$expirevar = $$var;
+				}
+			}
+			
+			
+			$sql = "UPDATE $table SET expiry = ".$conn->Param('0').",expireref=".$conn->Param('1')." WHERE $binary sesskey = ".$conn->Param('2')." AND expiry >= ".$conn->Param('3');
+			$rs =& $conn->Execute($sql,array($expiry,$expirevar,$key,time()));
 			return true;
 		}
 		$val = rawurlencode($val);
@@ -673,7 +696,7 @@
 		if (!$clob) {	// no lobs, simply use replace()
 			$arr[$data] = $conn->qstr($val);
 			$rs = $conn->Replace($table, $arr, 'sesskey', $autoQuote = true);
-			ADODB_Session::_dumprs($rs);
+			
 		} else {
 			// what value shall we insert/update for lob row?
 			switch ($driver) {
@@ -691,13 +714,13 @@
 					break;
 			}
 			
+			$expiryref = $conn->qstr($arr['expireref']);
 			// do we insert or update? => as for sesskey
 			$rs =& $conn->Execute("SELECT COUNT(*) AS cnt FROM $table WHERE $binary sesskey = $qkey");
-			ADODB_Session::_dumprs($rs);
 			if ($rs && reset($rs->fields) > 0) {
-				$sql = "UPDATE $table SET expiry = $expiry, $data = $lob_value WHERE  sesskey = $qkey";
+				$sql = "UPDATE $table SET expiry = $expiry, $data = $lob_value, expireref=$expiryref WHERE  sesskey = $qkey";
 			} else {
-				$sql = "INSERT INTO $table (expiry, $data, sesskey) VALUES ($expiry, $lob_value, $qkey)";
+				$sql = "INSERT INTO $table (expiry, $data, sesskey,expireref) VALUES ($expiry, $lob_value, $qkey,$expiryref)";
 			}
 			if ($rs) {
 				$rs->Close();
@@ -705,12 +728,11 @@
 
 			$err = '';
 			$rs1 =& $conn->Execute($sql);
-			ADODB_Session::_dumprs($rs1);
 			if (!$rs1) {
 				$err = $conn->ErrorMsg()."\n";
 			}
 			$rs2 =& $conn->UpdateBlob($table, $data, $val, " sesskey=$qkey", strtoupper($clob));
-			ADODB_Session::_dumprs($rs2);
+			
 			if (!$rs2) {
 				$err .= $conn->ErrorMsg()."\n";
 			}
@@ -901,7 +923,8 @@
 }
 
 ADODB_Session::_init();
-register_shutdown_function('session_write_close');
+if (empty($ADODB_SESSION_READONLY))
+	register_shutdown_function('session_write_close');
 
 // for backwards compatability only
 function adodb_sess_open($save_path, $session_name, $persist = true) {
@@ -914,4 +937,4 @@
 	return ADODB_Session::gc($t);
 }
 
-?>
+?>

Modified: vtigercrm/branches/4.2/adodb/session/old/adodb-cryptsession.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/session/old/adodb-cryptsession.php (original)
+++ vtigercrm/branches/4.2/adodb/session/old/adodb-cryptsession.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/branches/4.2/adodb/session/old/adodb-session-clob.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/session/old/adodb-session-clob.php (original)
+++ vtigercrm/branches/4.2/adodb/session/old/adodb-session-clob.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /*
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/branches/4.2/adodb/session/old/adodb-session.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/session/old/adodb-session.php (original)
+++ vtigercrm/branches/4.2/adodb/session/old/adodb-session.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/branches/4.2/adodb/tests/test-active-recs2.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/tests/test-active-recs2.php (original)
+++ vtigercrm/branches/4.2/adodb/tests/test-active-recs2.php Fri Jun 16 07:03:47 2006
@@ -29,9 +29,11 @@
 
 
 
+
 $rec = new ADODB_Active_Record('photos');
 
 $rec = new ADODB_Active_Record('products');
+
 
 adodb_pr($rec->getAttributeNames());
 

Modified: vtigercrm/branches/4.2/adodb/tests/test.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/tests/test.php (original)
+++ vtigercrm/branches/4.2/adodb/tests/test.php Fri Jun 16 07:03:47 2006
@@ -747,7 +747,14 @@
 		where id=".$db->Param('zid')." and created>=".$db->Param('ZDATE')."",
 		$array);
 	if ($id != 1) Err("Bad bind; id=$id");
-	else echo "<br>Bind date/integer passed";
+	else echo "<br>Bind date/integer 1 passed";
+	
+	$array =array(1,$db->BindDate(time()));
+	$id = $db->GetOne("select id from ADOXYZ 
+		where id=".$db->Param('0')." and created>=".$db->Param('1')."",
+		$array);
+	if ($id != 1) Err("Bad bind; id=$id");
+	else echo "<br>Bind date/integer 2 passed";
 	
 	$db->debug = false;
 	$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
@@ -1327,13 +1334,16 @@
 	$date = $db->SQLDate('d-m-M-Y-\QQ h:i:s A',$db->DBDate("1974-02-25"));
 	$sql = "SELECT $date from ADOXYZ";
 	print "<p>Test SQLDate: ".htmlspecialchars($sql)."</p>";
+	$db->debug=1;
 	$rs = $db->SelectLimit($sql,1);
 	$ts = ADOConnection::UnixDate('1974-02-25');
 	$d = date('d-m-M-Y-',$ts).'Q'.(ceil(date('m',$ts)/3.0)).date(' h:i:s A',$ts);
 	if (!$rs) {
 		Err("SQLDate query returned no recordset");
 		echo $db->ErrorMsg(),'<br>';
-	} else if ($d != $rs->fields[0]) Err("SQLDate 2 failed expected: <br>act:$d <br>sql:".$rs->fields[0]);
+	} else if ($d != reset($rs->fields)) {
+		Err("SQLDate 2 failed expected: <br>act:$d <br>sql:".$rs->fields[0].' <br>'.$db->ErrorMsg());
+	}
 	
 	
 	print "<p>Test Filter</p>";
@@ -1504,9 +1514,11 @@
 	flush();
 	
 	if ($db->hasTransactions) {
-		//$db->debug=1;
+		$db->debug=1;
 		echo "<p>Testing StartTrans CompleteTrans</p>";
 		$db->raiseErrorFn = false;
+		
+		$db->SetTransactionMode('SERIALIZABLE');
 		$db->StartTrans();
 		$rs = $db->Execute('select * from notable');
 			$db->StartTrans();
@@ -1515,6 +1527,8 @@
 				$db->CommitTrans();
 			$db->CompleteTrans();
 		$rez = $db->CompleteTrans();
+		$db->SetTransactionMode('');
+		$db->debug=0;
 		if ($rez !== false) {
 			if (is_null($rez)) Err("Error: _transOK not modified");
 			else Err("Error: CompleteTrans (1) should have failed");

Modified: vtigercrm/branches/4.2/adodb/tests/testdatabases.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/tests/testdatabases.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/tests/testdatabases.inc.php Fri Jun 16 07:03:47 2006
@@ -314,17 +314,28 @@
 
 }
 
-ADOLoadCode("db2"); // no longer supported
-if (!empty($testdb2)) { 
-	$db = ADONewConnection();
-	print "<h1>Connecting $db->databaseType...</h1>";
-	
-	$dsn = "db2_sample";
-	$dsn = "driver={IBM db2 odbc DRIVER};Database=sample;hostname=localhost;port=50000;protocol=TCPIP; uid=root; pwd=natsoft";
-	if ($db->Connect($dsn)) {
-	//	testdb($db,"create table ADOXYZ (id int, firstname varchar(24), lastname varchar(24),created date)");
-	} else print "ERROR: DB2 test requires an server setup with odbc data source db2_sample".'<BR>'.$db->ErrorMsg();
-
+ADOLoadCode("odbc_db2"); // no longer supported
+if (!empty($testdb2)) {
+	if (PHP_VERSION>=5.1) {
+		$db = ADONewConnection("db2");
+		print "<h1>Connecting $db->databaseType...</h1>";
+		
+		#$db->curMode = SQL_CUR_USE_ODBC;
+		#$dsn = "driver={IBM db2 odbc DRIVER};Database=test;hostname=localhost;port=50000;protocol=TCPIP; uid=natsoft; pwd=guest";
+		if ($db->Connect('localhost','natsoft','guest','test')) {
+			testdb($db,"create table ADOXYZ (id int, firstname varchar(24), lastname varchar(24),created date)");
+		} else print "ERROR: DB2 test requires an server setup with odbc data source db2_sample".'<BR>'.$db->ErrorMsg();
+	} else { 
+		$db = ADONewConnection("odbc_db2");
+		print "<h1>Connecting $db->databaseType...</h1>";
+		
+		$dsn = "db2test";
+		#$db->curMode = SQL_CUR_USE_ODBC;
+		#$dsn = "driver={IBM db2 odbc DRIVER};Database=test;hostname=localhost;port=50000;protocol=TCPIP; uid=natsoft; pwd=guest";
+		if ($db->Connect($dsn)) {
+			testdb($db,"create table ADOXYZ (id int, firstname varchar(24), lastname varchar(24),created date)");
+		} else print "ERROR: DB2 test requires an server setup with odbc data source db2_sample".'<BR>'.$db->ErrorMsg();
+	}
 echo "<hr />";
 flush();
 	$dsn = "driver={IBM db2 odbc DRIVER};Database=sample;hostname=localhost;port=50000;protocol=TCPIP; uid=root; pwd=natsoft";

Modified: vtigercrm/branches/4.2/adodb/toexport.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/toexport.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/toexport.inc.php Fri Jun 16 07:03:47 2006
@@ -1,7 +1,7 @@
 <?php
 
 /** 
- * @version V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ * @version V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
  * Released under both BSD license and Lesser GPL library license. 
  * Whenever there is any discrepancy between the two licenses, 
  * the BSD license will take precedence. 

Modified: vtigercrm/branches/4.2/adodb/tohtml.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/tohtml.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/tohtml.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php 
 /*
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.
@@ -95,7 +95,7 @@
 			break;
 			
 			case 'N':
-				if (abs($v) - round($v,0) < 0.00000001)
+				if (abs(abs($v) - round($v,0)) < 0.00000001)
 					$v = round($v);
 				else
 					$v = round($v,$ADODB_ROUND);



From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 06:06:48 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 13:06:48 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231302=3A?=
 =?utf-8?q?_Update_to_new_adodb-4=2E90_release?=
In-Reply-To: <076.cfae0e78298741dfce9c6a4f41a70218@vtiger.fosslabs.com>
References: <076.cfae0e78298741dfce9c6a4f41a70218@vtiger.fosslabs.com>
Message-ID: <085.887164ea1764a31bc31d5687b8afdc49@vtiger.fosslabs.com>

#1302: Update to new adodb-4.90 release
------------------------+---------------------------------------------------
  Reporter:  jeffk      |       Owner:  jeffk                 
      Type:  defect     |      Status:  closed                
  Priority:  major      |   Milestone:  5.0.0                 
 Component:  vtigercrm  |     Version:  5.0.0                 
Resolution:  fixed      |    Keywords:  adodb database package
------------------------+---------------------------------------------------
Changes (by jeffk):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 (In [7186]) closes #1302. update adodb-4.81 to adodb-4.90

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1302>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 06:06:48 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 13:06:48 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7186 - in
 /vtigercrm/trunk/adodb: ./ datadict/ drivers/ perf/ session/ session/old/
 tests/
Message-ID: <20060616130650.06FC07ED33A@vtiger.fosslabs.com>

Author: jeffk
Date: Fri Jun 16 07:06:09 2006
New Revision: 7186

Log:
closes #1302. update adodb-4.81 to adodb-4.90

Modified:
    vtigercrm/trunk/adodb/adodb-active-record.inc.php
    vtigercrm/trunk/adodb/adodb-csvlib.inc.php
    vtigercrm/trunk/adodb/adodb-datadict.inc.php
    vtigercrm/trunk/adodb/adodb-error.inc.php
    vtigercrm/trunk/adodb/adodb-errorhandler.inc.php
    vtigercrm/trunk/adodb/adodb-errorpear.inc.php
    vtigercrm/trunk/adodb/adodb-exceptions.inc.php
    vtigercrm/trunk/adodb/adodb-iterator.inc.php
    vtigercrm/trunk/adodb/adodb-lib.inc.php
    vtigercrm/trunk/adodb/adodb-pager.inc.php
    vtigercrm/trunk/adodb/adodb-pear.inc.php
    vtigercrm/trunk/adodb/adodb-perf.inc.php
    vtigercrm/trunk/adodb/adodb-php4.inc.php
    vtigercrm/trunk/adodb/adodb.inc.php
    vtigercrm/trunk/adodb/datadict/datadict-access.inc.php
    vtigercrm/trunk/adodb/datadict/datadict-db2.inc.php
    vtigercrm/trunk/adodb/datadict/datadict-firebird.inc.php
    vtigercrm/trunk/adodb/datadict/datadict-generic.inc.php
    vtigercrm/trunk/adodb/datadict/datadict-ibase.inc.php
    vtigercrm/trunk/adodb/datadict/datadict-informix.inc.php
    vtigercrm/trunk/adodb/datadict/datadict-mssql.inc.php
    vtigercrm/trunk/adodb/datadict/datadict-mysql.inc.php
    vtigercrm/trunk/adodb/datadict/datadict-oci8.inc.php
    vtigercrm/trunk/adodb/datadict/datadict-postgres.inc.php
    vtigercrm/trunk/adodb/datadict/datadict-sybase.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-access.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-ado.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-ado5.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-ado_access.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-ado_mssql.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-borland_ibase.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-csv.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-db2.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-fbsql.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-firebird.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-ibase.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-informix.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-informix72.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-ldap.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-mssql.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-mssqlpo.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-mysql.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-mysqli.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-mysqlt.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-netezza.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-oci8.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-oci805.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-oci8po.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-odbc.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-odbc_db2.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-odbc_mssql.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-odbc_oracle.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-odbtp.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-odbtp_unicode.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-oracle.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-pdo.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-pdo_mssql.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-pdo_mysql.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-pdo_oci.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-pdo_pgsql.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-postgres.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-postgres64.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-postgres7.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-postgres8.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-proxy.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-sapdb.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-sqlanywhere.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-sqlite.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-sqlitepo.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-sybase.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-sybase_ase.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-vfp.inc.php
    vtigercrm/trunk/adodb/perf/perf-db2.inc.php
    vtigercrm/trunk/adodb/perf/perf-informix.inc.php
    vtigercrm/trunk/adodb/perf/perf-mssql.inc.php
    vtigercrm/trunk/adodb/perf/perf-mysql.inc.php
    vtigercrm/trunk/adodb/perf/perf-oci8.inc.php
    vtigercrm/trunk/adodb/perf/perf-postgres.inc.php
    vtigercrm/trunk/adodb/pivottable.inc.php
    vtigercrm/trunk/adodb/rsfilter.inc.php
    vtigercrm/trunk/adodb/server.php
    vtigercrm/trunk/adodb/session/adodb-compress-bzip2.php
    vtigercrm/trunk/adodb/session/adodb-compress-gzip.php
    vtigercrm/trunk/adodb/session/adodb-cryptsession.php
    vtigercrm/trunk/adodb/session/adodb-encrypt-mcrypt.php
    vtigercrm/trunk/adodb/session/adodb-encrypt-md5.php
    vtigercrm/trunk/adodb/session/adodb-encrypt-secret.php
    vtigercrm/trunk/adodb/session/adodb-session-clob.php
    vtigercrm/trunk/adodb/session/adodb-session.php
    vtigercrm/trunk/adodb/session/old/adodb-cryptsession.php
    vtigercrm/trunk/adodb/session/old/adodb-session-clob.php
    vtigercrm/trunk/adodb/session/old/adodb-session.php
    vtigercrm/trunk/adodb/tests/test-active-recs2.php
    vtigercrm/trunk/adodb/tests/test.php
    vtigercrm/trunk/adodb/tests/testdatabases.inc.php
    vtigercrm/trunk/adodb/toexport.inc.php
    vtigercrm/trunk/adodb/tohtml.inc.php

Modified: vtigercrm/trunk/adodb/adodb-active-record.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/adodb-active-record.inc.php (original)
+++ vtigercrm/trunk/adodb/adodb-active-record.inc.php Fri Jun 16 07:06:09 2006
@@ -1,7 +1,7 @@
 <?php
 /*
 
- at version V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ at version V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Latest version is available at http://adodb.sourceforge.net
  
   Released under both BSD license and Lesser GPL library license. 
@@ -10,7 +10,7 @@
   
   Active Record implementation. Superset of Zend Framework's.
   
-  Version 0.03
+  Version 0.04
   
   See http://www-128.ibm.com/developerworks/java/library/j-cb03076/?ca=dgr-lnxw01ActiveRecord 
   	for info on Ruby on Rails Active Record implementation
@@ -56,7 +56,7 @@
 
 class ADODB_Active_Record {
 	var $_dbat; // associative index pointing to ADODB_Active_DB eg. $ADODB_Active_DBS[_dbat]
-	var $_table; // tablename
+	var $_table; // tablename, if set in class definition then use it as table name
 	var $_tableat; // associative index pointing to ADODB_Active_Table, eg $ADODB_Active_DBS[_dbat]->tables[$this->_tableat]
 	var $_where; // where clause set in Load()
 	var $_saved = false; // indicates whether data is already inserted.
@@ -85,8 +85,10 @@
 			$pkeyarr = false;
 		}
 		
-		if (!$table) $table = $this->_pluralize(get_class($this));
-		
+		if (!$table) { 
+			if (!empty($this->_table)) $table = $this->_table;
+			else $table = $this->_pluralize(get_class($this));
+		}
 		if ($db) {
 			$this->_dbat = ADODB_Active_Record::SetDatabaseAdapter($db);
 		} else
@@ -455,6 +457,13 @@
 		$db->Execute($sql);
 	}
 	
+	// returns an array of active record objects
+	function &Find($whereOrderBy,$bindarr=false,$pkeysArr=false)
+	{
+		$db =& $this->DB(); if (!$db || empty($this->_table)) return false;
+		$arr =& $db->GetActiveRecordsClass(get_class($this),$this->_table, $whereOrderBy,$bindarr,$pkeysArr);
+		return $arr;
+	}
 	
 	// returns 0 on error, 1 on update, 2 on insert
 	function Replace()

Modified: vtigercrm/trunk/adodb/adodb-csvlib.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/adodb-csvlib.inc.php (original)
+++ vtigercrm/trunk/adodb/adodb-csvlib.inc.php Fri Jun 16 07:06:09 2006
@@ -8,7 +8,7 @@
 
 /* 
 
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. See License.txt. 

Modified: vtigercrm/trunk/adodb/adodb-datadict.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/adodb-datadict.inc.php (original)
+++ vtigercrm/trunk/adodb/adodb-datadict.inc.php Fri Jun 16 07:06:09 2006
@@ -1,7 +1,7 @@
 <?php
 
 /**
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/trunk/adodb/adodb-error.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/adodb-error.inc.php (original)
+++ vtigercrm/trunk/adodb/adodb-error.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /** 
- * @version V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ * @version V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
  * Released under both BSD license and Lesser GPL library license. 
  * Whenever there is any discrepancy between the two licenses, 
  * the BSD license will take precedence. 

Modified: vtigercrm/trunk/adodb/adodb-errorhandler.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/adodb-errorhandler.inc.php (original)
+++ vtigercrm/trunk/adodb/adodb-errorhandler.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ * @version V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
  * Released under both BSD license and Lesser GPL library license.
  * Whenever there is any discrepancy between the two licenses,
  * the BSD license will take precedence.

Modified: vtigercrm/trunk/adodb/adodb-errorpear.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/adodb-errorpear.inc.php (original)
+++ vtigercrm/trunk/adodb/adodb-errorpear.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /** 
- * @version V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ * @version V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
  * Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. 

Modified: vtigercrm/trunk/adodb/adodb-exceptions.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/adodb-exceptions.inc.php (original)
+++ vtigercrm/trunk/adodb/adodb-exceptions.inc.php Fri Jun 16 07:06:09 2006
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @version V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ * @version V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
  * Released under both BSD license and Lesser GPL library license.
  * Whenever there is any discrepancy between the two licenses,
  * the BSD license will take precedence.

Modified: vtigercrm/trunk/adodb/adodb-iterator.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/adodb-iterator.inc.php (original)
+++ vtigercrm/trunk/adodb/adodb-iterator.inc.php Fri Jun 16 07:06:09 2006
@@ -1,7 +1,7 @@
 <?php
 
 /*
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/trunk/adodb/adodb-lib.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/adodb-lib.inc.php (original)
+++ vtigercrm/trunk/adodb/adodb-lib.inc.php Fri Jun 16 07:06:09 2006
@@ -7,7 +7,7 @@
 $ADODB_INCLUDED_LIB = 1;
 
 /* 
- @version V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim\@natsoft.com.my). All rights reserved.
+ @version V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim\@natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. See License.txt. 
@@ -325,6 +325,8 @@
 		$rewritesql = preg_replace(
 					'/^\s*SELECT\s.*\s+FROM\s/Uis','SELECT COUNT(*) FROM ',$sql);
 
+		
+		
 		// fix by alexander zhukov, alex#unipack.ru, because count(*) and 'order by' fails 
 		// with mssql, access and postgresql. Also a good speedup optimization - skips sorting!
 		// also see http://phplens.com/lens/lensforum/msgs.php?id=12752
@@ -332,10 +334,13 @@
 			$rewritesql = preg_replace('/(\sORDER\s+BY\s.*)/is','',$rewritesql);
 		else
 			$rewritesql = preg_replace('/(\sORDER\s+BY\s[^)]*)/is','',$rewritesql);
+	}
+	
+	
+	
+	if (isset($rewritesql) && $rewritesql != $sql) {
+		if (preg_match('/\sLIMIT\s+[0-9]+/i',$sql,$limitarr)) $rewritesql .= $limitarr[1];
 		 
-	}
-	
-	if (isset($rewritesql) && $rewritesql != $sql) {
 		if ($secs2cache) {
 			// we only use half the time of secs2cache because the count can quickly
 			// become inaccurate if new records are added
@@ -354,6 +359,8 @@
 	if (preg_match('/\s*UNION\s*/is', $sql)) $rewritesql = $sql;
 	else $rewritesql = preg_replace('/(\sORDER\s+BY\s.*)/is','',$sql); 
 	
+	if (preg_match('/\sLIMIT\s+[0-9]+/i',$sql,$limitarr)) $rewritesql .= $limitarr[0];
+		
 	$rstest = &$zthis->Execute($rewritesql,$inputarr);
 	if (!$rstest) $rstest = $zthis->Execute($sql,$inputarr);
 	
@@ -1017,5 +1024,47 @@
 	
 	return $s;
 }
+/*
+function _adodb_find_from($sql) 
+{
+
+	$sql = str_replace(array("\n","\r"), ' ', $sql);
+	$charCount = strlen($sql);
+	
+	$inString = false;
+	$quote = '';
+	$parentheseCount = 0;
+	$prevChars = '';
+	$nextChars = '';
+	
+
+	for($i = 0; $i < $charCount; $i++) {
+
+    	$char = substr($sql,$i,1);
+	    $prevChars = substr($sql,0,$i);
+    	$nextChars = substr($sql,$i+1);
+
+		if((($char == "'" || $char == '"' || $char == '`') && substr($prevChars,-1,1) != '\\') && $inString === false) {
+			$quote = $char;
+			$inString = true;
+		}
+
+		elseif((($char == "'" || $char == '"' || $char == '`') && substr($prevChars,-1,1) != '\\') && $inString === true && $quote == $char) {
+			$quote = "";
+			$inString = false;
+		}
+
+		elseif($char == "(" && $inString === false)
+			$parentheseCount++;
+
+		elseif($char == ")" && $inString === false && $parentheseCount > 0)
+			$parentheseCount--;
+
+		elseif($parentheseCount <= 0 && $inString === false && $char == " " && strtoupper(substr($prevChars,-5,5)) == " FROM")
+			return $i;
+
+	}
+}
+*/
 
 ?>

Modified: vtigercrm/trunk/adodb/adodb-pager.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/adodb-pager.inc.php (original)
+++ vtigercrm/trunk/adodb/adodb-pager.inc.php Fri Jun 16 07:06:09 2006
@@ -1,7 +1,7 @@
 <?php
 
 /*
-	V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+	V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
 	  Released under both BSD license and Lesser GPL library license. 
 	  Whenever there is any discrepancy between the two licenses, 
 	  the BSD license will take precedence. 

Modified: vtigercrm/trunk/adodb/adodb-pear.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/adodb-pear.inc.php (original)
+++ vtigercrm/trunk/adodb/adodb-pear.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /** 
- * @version V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ * @version V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
  * Released under both BSD license and Lesser GPL library license. 
  * Whenever there is any discrepancy between the two licenses, 
  * the BSD license will take precedence. 

Modified: vtigercrm/trunk/adodb/adodb-perf.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/adodb-perf.inc.php (original)
+++ vtigercrm/trunk/adodb/adodb-perf.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. See License.txt. 

Modified: vtigercrm/trunk/adodb/adodb-php4.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/adodb-php4.inc.php (original)
+++ vtigercrm/trunk/adodb/adodb-php4.inc.php Fri Jun 16 07:06:09 2006
@@ -1,7 +1,7 @@
 <?php
 
 /*
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/trunk/adodb/adodb.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/adodb.inc.php (original)
+++ vtigercrm/trunk/adodb/adodb.inc.php Fri Jun 16 07:06:09 2006
@@ -14,7 +14,7 @@
 /**
 	\mainpage 	
 	
-	 @version V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+	 @version V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
 
 	Released under both BSD license and Lesser GPL library license. You can choose which license
 	you prefer.
@@ -171,7 +171,7 @@
 		/**
 		 * ADODB version as a string.
 		 */
-		$ADODB_vers = 'V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved. Released BSD & LGPL.';
+		$ADODB_vers = 'V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved. Released BSD & LGPL.';
 	
 		/**
 		 * Determines whether recordset->RecordCount() is used. 
@@ -314,6 +314,7 @@
 	var $_evalAll = false;
 	var $_affected = false;
 	var $_logsql = false;
+	var $_transmode = ''; // transaction mode
 	
 	/**
 	 * Constructor
@@ -823,7 +824,10 @@
 							$sql .= str_replace(',','.',$v); // locales fix so 1.1 does not get converted to 1,1
 						else if ($typ == 'boolean')
 							$sql .= $v ? $this->true : $this->false;
-						else if ($v === null)
+						else if ($typ == 'object') {
+							if (method_exists($v, '__toString')) $sql .= $this->qstr($v->__toString());
+							else $sql .= $this->qstr((string) $v);
+						} else if ($v === null)
 							$sql .= 'NULL';
 						else
 							$sql .= $v;
@@ -1732,15 +1736,16 @@
 	 */
 	function& AutoExecute($table, $fields_values, $mode = 'INSERT', $where = FALSE, $forceUpdate=true, $magicq=false) 
 	{
+		$false = false;
 		$sql = 'SELECT * FROM '.$table;  
 		if ($where!==FALSE) $sql .= ' WHERE '.$where;
 		else if ($mode == 'UPDATE' || $mode == 2 /* DB_AUTOQUERY_UPDATE */) {
 			ADOConnection::outp('AutoExecute: Illegal mode=UPDATE with empty WHERE clause');
-			return false;
+			return $false;
 		}
 
 		$rs =& $this->SelectLimit($sql,1);
-		if (!$rs) return false; // table does not exist
+		if (!$rs) return $false; // table does not exist
 		$rs->tableName = $table;
 		
 		switch((string) $mode) {
@@ -1754,7 +1759,7 @@
 			break;
 		default:
 			ADOConnection::outp("AutoExecute: Unknown mode=$mode");
-			return false;
+			return $false;
 		}
 		$ret = false;
 		if ($sql) $ret = $this->Execute($sql);
@@ -2017,6 +2022,57 @@
 	 */
 	function BeginTrans() {return false;}
 	
+	/* set transaction mode */
+	function SetTransactionMode( $transaction_mode ) 
+	{
+		$transaction_mode = $this->MetaTransaction($transaction_mode, $this->dataProvider);
+		$this->_transmode  = $transaction_mode;
+	}
+/*
+http://msdn2.microsoft.com/en-US/ms173763.aspx
+http://dev.mysql.com/doc/refman/5.0/en/innodb-transaction-isolation.html
+http://www.postgresql.org/docs/8.1/interactive/sql-set-transaction.html
+http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_10005.htm
+*/
+	function MetaTransaction($mode,$db)
+	{
+		$mode = strtoupper($mode);
+		$mode = str_replace('ISOLATION LEVEL ','',$mode);
+		
+		switch($mode) {
+
+		case 'READ UNCOMMITTED':
+			switch($db) { 
+			case 'oci8':
+			case 'oracle':
+				return 'ISOLATION LEVEL READ COMMITTED';
+			default:
+				return 'ISOLATION LEVEL READ UNCOMMITTED';
+			}
+			break;
+					
+		case 'READ COMMITTED':
+				return 'ISOLATION LEVEL READ COMMITTED';
+			break;
+			
+		case 'REPEATABLE READ':
+			switch($db) {
+			case 'oci8':
+			case 'oracle':
+				return 'ISOLATION LEVEL SERIALIZABLE';
+			default:
+				return 'ISOLATION LEVEL REPEATABLE READ';
+			}
+			break;
+			
+		case 'SERIALIZABLE':
+				return 'ISOLATION LEVEL SERIALIZABLE';
+			break;
+			
+		default:
+			return $mode;
+		}
+	}
 	
 	/**
 	 * If database does not support transactions, always return true as data always commited
@@ -2208,7 +2264,7 @@
 	 *
 	 * @return  array of column names for current table.
 	 */ 
-	function &MetaColumnNames($table, $numIndexes=false) 
+	function &MetaColumnNames($table, $numIndexes=false,$useattnum=false /* only for postgres */) 
 	{
 		$objarr =& $this->MetaColumns($table);
 		if (!is_array($objarr)) {
@@ -2218,7 +2274,12 @@
 		$arr = array();
 		if ($numIndexes) {
 			$i = 0;
-			foreach($objarr as $v) $arr[$i++] = $v->name;
+			if ($useattnum) {
+				foreach($objarr as $v) 
+					$arr[$v->attnum] = $v->name;
+				
+			} else
+				foreach($objarr as $v) $arr[$i++] = $v->name;
 		} else
 			foreach($objarr as $v) $arr[strtoupper($v->name)] = $v->name;
 		
@@ -2260,6 +2321,22 @@
 		}
 
 		return adodb_date($this->fmtDate,$d);
+	}
+	
+	function BindDate($d)
+	{
+		$d = $this->DBDate($d);
+		if (strncmp($d,"'",1)) return $d;
+		
+		return substr($d,1,strlen($d)-2);
+	}
+	
+	function BindTimeStamp($d)
+	{
+		$d = $this->DBTimeStamp($d);
+		if (strncmp($d,"'",1)) return $d;
+		
+		return substr($d,1,strlen($d)-2);
 	}
 	
 	
@@ -3361,6 +3438,7 @@
 		'BPCHAR' => 'C',
 		'CHARACTER' => 'C',
 		'INTERVAL' => 'C',  # Postgres
+		'MACADDR' => 'C', # postgres
 		##
 		'LONGCHAR' => 'X',
 		'TEXT' => 'X',
@@ -3387,6 +3465,7 @@
 		'DATETIME' => 'T',
 		'TIMESTAMPTZ' => 'T',
 		'T' => 'T',
+		'TIMESTAMP WITHOUT TIME ZONE' => 'T', // postgresql
 		##
 		'BOOL' => 'L',
 		'BOOLEAN' => 'L', 

Modified: vtigercrm/trunk/adodb/datadict/datadict-access.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/datadict/datadict-access.inc.php (original)
+++ vtigercrm/trunk/adodb/datadict/datadict-access.inc.php Fri Jun 16 07:06:09 2006
@@ -1,7 +1,7 @@
 <?php
 
 /**
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/trunk/adodb/datadict/datadict-db2.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/datadict/datadict-db2.inc.php (original)
+++ vtigercrm/trunk/adodb/datadict/datadict-db2.inc.php Fri Jun 16 07:06:09 2006
@@ -1,7 +1,7 @@
 <?php
 
 /**
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/trunk/adodb/datadict/datadict-firebird.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/datadict/datadict-firebird.inc.php (original)
+++ vtigercrm/trunk/adodb/datadict/datadict-firebird.inc.php Fri Jun 16 07:06:09 2006
@@ -1,7 +1,7 @@
 <?php
 
 /**
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/trunk/adodb/datadict/datadict-generic.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/datadict/datadict-generic.inc.php (original)
+++ vtigercrm/trunk/adodb/datadict/datadict-generic.inc.php Fri Jun 16 07:06:09 2006
@@ -1,7 +1,7 @@
 <?php
 
 /**
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/trunk/adodb/datadict/datadict-ibase.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/datadict/datadict-ibase.inc.php (original)
+++ vtigercrm/trunk/adodb/datadict/datadict-ibase.inc.php Fri Jun 16 07:06:09 2006
@@ -1,7 +1,7 @@
 <?php
 
 /**
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/trunk/adodb/datadict/datadict-informix.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/datadict/datadict-informix.inc.php (original)
+++ vtigercrm/trunk/adodb/datadict/datadict-informix.inc.php Fri Jun 16 07:06:09 2006
@@ -1,7 +1,7 @@
 <?php
 
 /**
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/trunk/adodb/datadict/datadict-mssql.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/datadict/datadict-mssql.inc.php (original)
+++ vtigercrm/trunk/adodb/datadict/datadict-mssql.inc.php Fri Jun 16 07:06:09 2006
@@ -1,7 +1,7 @@
 <?php
 
 /**
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/trunk/adodb/datadict/datadict-mysql.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/datadict/datadict-mysql.inc.php (original)
+++ vtigercrm/trunk/adodb/datadict/datadict-mysql.inc.php Fri Jun 16 07:06:09 2006
@@ -1,7 +1,7 @@
 <?php
 
 /**
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/trunk/adodb/datadict/datadict-oci8.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/datadict/datadict-oci8.inc.php (original)
+++ vtigercrm/trunk/adodb/datadict/datadict-oci8.inc.php Fri Jun 16 07:06:09 2006
@@ -1,7 +1,7 @@
 <?php
 
 /**
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/trunk/adodb/datadict/datadict-postgres.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/datadict/datadict-postgres.inc.php (original)
+++ vtigercrm/trunk/adodb/datadict/datadict-postgres.inc.php Fri Jun 16 07:06:09 2006
@@ -1,7 +1,7 @@
 <?php
 
 /**
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/trunk/adodb/datadict/datadict-sybase.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/datadict/datadict-sybase.inc.php (original)
+++ vtigercrm/trunk/adodb/datadict/datadict-sybase.inc.php Fri Jun 16 07:06:09 2006
@@ -1,7 +1,7 @@
 <?php
 
 /**
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/trunk/adodb/drivers/adodb-access.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-access.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-access.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. See License.txt. 

Modified: vtigercrm/trunk/adodb/drivers/adodb-ado.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-ado.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-ado.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. 

Modified: vtigercrm/trunk/adodb/drivers/adodb-ado5.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-ado5.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-ado5.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. 
@@ -58,8 +58,22 @@
 	// you can also pass a connection string like this:
 	//
 	// $DB->Connect('USER ID=sa;PASSWORD=pwd;SERVER=mangrove;DATABASE=ai',false,false,'SQLOLEDB');
-	function _connect($argHostname, $argUsername, $argPassword, $argProvider= 'MSDASQL')
-	{
+	function _connect($argHostname, $argUsername, $argPassword,$argDBorProvider, $argProvider= '')
+	{
+	// two modes
+	//	-	if $argProvider is empty, we assume that $argDBorProvider holds provider -- this is for backward compat
+	//	- 	if $argProvider is not empty, then $argDBorProvider holds db
+	
+		
+		 if ($argProvider) {
+		 	$argDatabasename = $argDBorProvider;
+		 } else {
+		 	$argDatabasename = '';
+		 	if ($argDBorProvider) $argProvider = $argDBorProvider;
+			else $argProvider = 'MSDASQL';
+		}
+		
+		
 		try {
 		$u = 'UID';
 		$p = 'PWD';
@@ -86,7 +100,11 @@
 			$argProvider = "Microsoft.Jet.OLEDB.4.0"; // Microsoft Jet Provider
 		
 		if ($argProvider) $dbc->Provider = $argProvider;	
-		
+
+		if ($argProvider) $argHostname = "PROVIDER=$argProvider;DRIVER={SQL Server};SERVER=$argHostname";	
+		
+
+		if ($argDatabasename) $argHostname .= ";DATABASE=$argDatabasename";		
 		if ($argUsername) $argHostname .= ";$u=$argUsername";
 		if ($argPassword)$argHostname .= ";$p=$argPassword";
 		
@@ -205,9 +223,6 @@
 		return $arr;
 	}
 	
-
-
-	
 	/* returns queryID or false */
 	function &_query($sql,$inputarr=false) 
 	{
@@ -251,7 +266,8 @@
 		if ($rs->State == 0) {
 			$true = true;
 			return $true; // 0 = adStateClosed means no records returned
-		} return $rs;
+		}
+		return $rs;
 		
 		} catch (exception $e) {
 			
@@ -296,11 +312,17 @@
 	function ErrorMsg() 
 	{
 		if (!$this->_connectionID) return "No connection established";
-		$errc = $this->_connectionID->Errors;
-		if (!$errc) return "No Errors object found";
-		if ($errc->Count == 0) return '';
-		$err = $errc->Item($errc->Count-1);
-		return $err->Description;
+		$errmsg = '';
+		
+		try {
+			$errc = $this->_connectionID->Errors;
+			if (!$errc) return "No Errors object found";
+			if ($errc->Count == 0) return '';
+			$err = $errc->Item($errc->Count-1);
+			$errmsg = $err->Description;
+		}catch(exception $e) {
+		}
+		return $errmsg;
 	}
 	
 	function ErrorNo() 

Modified: vtigercrm/trunk/adodb/drivers/adodb-ado_access.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-ado_access.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-ado_access.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
 Released under both BSD license and Lesser GPL library license. 
 Whenever there is any discrepancy between the two licenses, 
 the BSD license will take precedence. See License.txt. 

Modified: vtigercrm/trunk/adodb/drivers/adodb-ado_mssql.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-ado_mssql.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-ado_mssql.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. 
@@ -11,8 +11,8 @@
   Microsoft SQL Server ADO data driver. Requires ADO and MSSQL client. 
   Works only on MS Windows.
   
-  It is normally better to use the mssql driver directly because it is much faster. 
-  This file is only a technology demonstration and for test purposes.
+  Warning: Some versions of PHP (esp PHP4) leak memory when ADO/COM is used. 
+  Please check http://bugs.php.net/ for more info.
 */
 
 // security - hide paths
@@ -53,6 +53,17 @@
 	        return $this->GetOne('select @@rowcount');
 	}
 	
+	function SetTransactionMode( $transaction_mode ) 
+	{
+		$this->_transmode  = $transaction_mode;
+		if (empty($transaction_mode)) {
+			$this->Execute('SET TRANSACTION ISOLATION LEVEL READ COMMITTED');
+			return;
+		}
+		if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
+		$this->Execute("SET TRANSACTION ".$transaction_mode);
+	}
+	
 	function MetaColumns($table)
 	{
         $table = strtoupper($table);
@@ -84,6 +95,44 @@
 		return empty($arr) ? $false : $arr;
 	}
 	
+	function CreateSequence($seq='adodbseq',$start=1)
+	{
+		
+		$this->Execute('BEGIN TRANSACTION adodbseq');
+		$start -= 1;
+		$this->Execute("create table $seq (id float(53))");
+		$ok = $this->Execute("insert into $seq with (tablock,holdlock) values($start)");
+		if (!$ok) {
+				$this->Execute('ROLLBACK TRANSACTION adodbseq');
+				return false;
+		}
+		$this->Execute('COMMIT TRANSACTION adodbseq'); 
+		return true;
+	}
+
+	function GenID($seq='adodbseq',$start=1)
+	{
+		//$this->debug=1;
+		$this->Execute('BEGIN TRANSACTION adodbseq');
+		$ok = $this->Execute("update $seq with (tablock,holdlock) set id = id + 1");
+		if (!$ok) {
+			$this->Execute("create table $seq (id float(53))");
+			$ok = $this->Execute("insert into $seq with (tablock,holdlock) values($start)");
+			if (!$ok) {
+				$this->Execute('ROLLBACK TRANSACTION adodbseq');
+				return false;
+			}
+			$this->Execute('COMMIT TRANSACTION adodbseq'); 
+			return $start;
+		}
+		$num = $this->GetOne("select id from $seq");
+		$this->Execute('COMMIT TRANSACTION adodbseq'); 
+		return $num;
+		
+		// in old implementation, pre 1.90, we returned GUID...
+		//return $this->GetOne("SELECT CONVERT(varchar(255), NEWID()) AS 'Char'");
+	}
+	
 	} // end class 
 	
 	class  ADORecordSet_ado_mssql extends ADORecordSet_ado {        

Modified: vtigercrm/trunk/adodb/drivers/adodb-borland_ibase.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-borland_ibase.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-borland_ibase.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. 

Modified: vtigercrm/trunk/adodb/drivers/adodb-csv.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-csv.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-csv.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/trunk/adodb/drivers/adodb-db2.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-db2.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-db2.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-  V4.81 3 May 2006  (c) 2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2006 John Lim (jlim#natsoft.com.my). All rights reserved.
 
 This is a version of the ADODB driver for DB2.  It uses the 'ibm_db2' PECL extension for PHP
   (http://pecl.php.net/package/ibm_db2), which in turn requires DB2 V8.2.2.
@@ -25,7 +25,14 @@
 class ADODB_db2 extends ADOConnection {
 	var $databaseType = "db2";	
 	var $fmtDate = "'Y-m-d'";
-	var $fmtTimeStamp = "'Y-m-d, h:i:sA'";
+	var $concat_operator = '||';
+	
+	var $sysTime = 'CURRENT TIME';
+	var $sysDate = 'CURRENT DATE';
+	var $sysTimeStamp = 'CURRENT TIMESTAMP';
+	
+	var $fmtTimeStamp = "'Y-m-d-H.i.s'";
+	#var $fmtTimeStamp = "'Y-m-d, h:i:sA'";
 	var $replaceQuote = "''"; // string to use to replace quotes
 	var $dataProvider = "db2";
 	var $hasAffectedRows = true;
@@ -40,6 +47,12 @@
 	var $_haserrorfunctions = true;
 	var $_lastAffectedRows = 0;
 	var $uCaseTables = true; // for meta* functions, uppercase table names
+	var $hasInsertID = true;
+	
+    function _insertid()
+    {
+        return ADOConnection::GetOne('VALUES IDENTITY_VAL_LOCAL()');
+    }
 	
 	function ADODB_db2() 
 	{ 	
@@ -103,6 +116,61 @@
 		return $this->_connectionID != false;
 	}
 
+	
+	// Format date column in sql string given an input format that understands Y M D
+	function SQLDate($fmt, $col=false)
+	{	
+	// use right() and replace() ?
+		if (!$col) $col = $this->sysDate;
+		$s = '';
+		
+		$len = strlen($fmt);
+		for ($i=0; $i < $len; $i++) {
+			if ($s) $s .= $this->concat_operator;
+			$ch = $fmt[$i];
+			switch($ch) {
+			case 'Y':
+			case 'y':
+				$s .= "char(year($col))";
+				break;
+			case 'M':
+				$s .= "substr(monthname($col),1,3)";
+				break;
+			case 'm':
+				$s .= "right(digits(month($col)),2)";
+				break;
+			case 'D':
+			case 'd':
+				$s .= "right(digits(day($col)),2)";
+				break;
+			case 'H':
+			case 'h':
+				if ($col != $this->sysDate) $s .= "right(digits(hour($col)),2)";	
+				else $s .= "''";
+				break;
+			case 'i':
+			case 'I':
+				if ($col != $this->sysDate)
+					$s .= "right(digits(minute($col)),2)";
+					else $s .= "''";
+				break;
+			case 'S':
+			case 's':
+				if ($col != $this->sysDate)
+					$s .= "right(digits(second($col)),2)";
+				else $s .= "''";
+				break;
+			default:
+				if ($ch == '\\') {
+					$i++;
+					$ch = substr($fmt,$i,1);
+				}
+				$s .= $this->qstr($ch);
+			}
+		}
+		return $s;
+	} 
+ 
 	
 	function ServerInfo()
 	{
@@ -575,15 +643,12 @@
 
 
 	// returns the field object
-	function &FetchField($fieldOffset = -1) 
-	{
-		
-		$off=$fieldOffset+1; // offsets begin at 1
-		
+	function &FetchField($offset = -1) 
+	{
 		$o= new ADOFieldObject();
-		$o->name = @db2_field_name($this->_queryID,$off);
-		$o->type = @db2_field_type($this->_queryID,$off);
-		$o->max_length = db2_field_width($this->_queryID,$off);
+		$o->name = @db2_field_name($this->_queryID,$offset);
+		$o->type = @db2_field_type($this->_queryID,$offset);
+		$o->max_length = db2_field_width($this->_queryID,$offset);
 		if (ADODB_ASSOC_CASE == 0) $o->name = strtolower($o->name);
 		else if (ADODB_ASSOC_CASE == 1) $o->name = strtoupper($o->name);
 		return $o;

Modified: vtigercrm/trunk/adodb/drivers/adodb-fbsql.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-fbsql.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-fbsql.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /*
- @version V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ @version V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
  Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. 

Modified: vtigercrm/trunk/adodb/drivers/adodb-firebird.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-firebird.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-firebird.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. 

Modified: vtigercrm/trunk/adodb/drivers/adodb-ibase.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-ibase.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-ibase.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.  
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.  
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/trunk/adodb/drivers/adodb-informix.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-informix.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-informix.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+* @version V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
 * Released under both BSD license and Lesser GPL library license.
 * Whenever there is any discrepancy between the two licenses,
 * the BSD license will take precedence.

Modified: vtigercrm/trunk/adodb/drivers/adodb-informix72.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-informix72.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-informix72.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim. All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim. All rights reserved.
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.

Modified: vtigercrm/trunk/adodb/drivers/adodb-ldap.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-ldap.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-ldap.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /*
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
    Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/trunk/adodb/drivers/adodb-mssql.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-mssql.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-mssql.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. 
@@ -296,6 +296,17 @@
 		return true;
 	}
 	
+	function SetTransactionMode( $transaction_mode ) 
+	{
+		$this->_transmode  = $transaction_mode;
+		if (empty($transaction_mode)) {
+			$this->Execute('SET TRANSACTION ISOLATION LEVEL READ COMMITTED');
+			return;
+		}
+		if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
+		$this->Execute("SET TRANSACTION ".$transaction_mode);
+	}
+	
 	/*
 		Usage:
 		

Modified: vtigercrm/trunk/adodb/drivers/adodb-mssqlpo.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-mssqlpo.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-mssqlpo.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+* @version V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
 * Released under both BSD license and Lesser GPL library license.
 * Whenever there is any discrepancy between the two licenses,
 * the BSD license will take precedence.

Modified: vtigercrm/trunk/adodb/drivers/adodb-mysql.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-mysql.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-mysql.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.
@@ -542,6 +542,9 @@
 	// "Innox - Juan Carlos Gonzalez" <jgonzalez#innox.com.mx>
 	function MetaForeignKeys( $table, $owner = FALSE, $upper = FALSE, $associative = FALSE )
      {
+	 global $ADODB_FETCH_MODE;
+		if ($ADODB_FETCH_MODE == ADODB_FETCH_ASSOC || $this->fetchMode == ADODB_FETCH_ASSOC) $associative = true;
+
          if ( !empty($owner) ) {
             $table = "$owner.$table";
          }

Modified: vtigercrm/trunk/adodb/drivers/adodb-mysqli.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-mysqli.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-mysqli.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.
@@ -58,6 +58,16 @@
 	    
 	}
 	
+	function SetTransactionMode( $transaction_mode ) 
+	{
+		$this->_transmode  = $transaction_mode;
+		if (empty($transaction_mode)) {
+			$this->Execute('SET SESSION TRANSACTION ISOLATION LEVEL REPEATABLE READ');
+			return;
+		}
+		if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
+		$this->Execute("SET SESSION TRANSACTION ".$transaction_mode);
+	}
 
 	// returns true or false
 	// To add: parameter int $port,
@@ -445,6 +455,10 @@
 	// "Innox - Juan Carlos Gonzalez" <jgonzalez#innox.com.mx>
 	function MetaForeignKeys( $table, $owner = FALSE, $upper = FALSE, $associative = FALSE )
 	{
+	 global $ADODB_FETCH_MODE;
+		
+		if ($ADODB_FETCH_MODE == ADODB_FETCH_ASSOC || $this->fetchMode == ADODB_FETCH_ASSOC) $associative = true;
+		
 	    if ( !empty($owner) ) {
 	       $table = "$owner.$table";
 	    }

Modified: vtigercrm/trunk/adodb/drivers/adodb-mysqlt.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-mysqlt.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-mysqlt.inc.php Fri Jun 16 07:06:09 2006
@@ -1,7 +1,7 @@
 <?php
 
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.
@@ -28,6 +28,23 @@
 	function ADODB_mysqlt() 
 	{			
 	global $ADODB_EXTENSION; if ($ADODB_EXTENSION) $this->rsPrefix .= 'ext_';
+	}
+	
+	/* set transaction mode
+	
+	SET [GLOBAL | SESSION] TRANSACTION ISOLATION LEVEL
+{ READ UNCOMMITTED | READ COMMITTED | REPEATABLE READ | SERIALIZABLE }
+
+	*/
+	function SetTransactionMode( $transaction_mode ) 
+	{
+		$this->_transmode  = $transaction_mode;
+		if (empty($transaction_mode)) {
+			$this->Execute('SET SESSION TRANSACTION ISOLATION LEVEL REPEATABLE READ');
+			return;
+		}
+		if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
+		$this->Execute("SET SESSION TRANSACTION ".$transaction_mode);
 	}
 	
 	function BeginTrans()

Modified: vtigercrm/trunk/adodb/drivers/adodb-netezza.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-netezza.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-netezza.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /*
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
  
   First cut at the Netezza Driver by Josh Eldridge joshuae74#hotmail.com
  Based on the previous postgres drivers.

Modified: vtigercrm/trunk/adodb/drivers/adodb-oci8.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-oci8.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-oci8.inc.php Fri Jun 16 07:06:09 2006
@@ -1,7 +1,7 @@
 <?php
 /*
 
-  version V4.81 3 May 2006 (c) 2000-2006 John Lim. All rights reserved.
+  version V4.90 8 June 2006 (c) 2000-2006 John Lim. All rights reserved.
 
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
@@ -278,6 +278,21 @@
 		return "TO_DATE(".adodb_date($this->fmtDate,$d).",'".$this->NLS_DATE_FORMAT."')";
 	}
 
+	function BindDate($d)
+	{
+		$d = ADOConnection::DBDate($d);
+		if (strncmp($d,"'",1)) return $d;
+		
+		return substr($d,1,strlen($d)-2);
+	}
+	
+	function BindTimeStamp($d)
+	{
+		$d = ADOConnection::DBTimeStamp($d);
+		if (strncmp($d,"'",1)) return $d;
+		
+		return substr($d,1,strlen($d)-2);
+	}
 	
 	// format and return date string in database timestamp format
 	function DBTimeStamp($ts)
@@ -381,6 +396,8 @@
 		$this->transCnt += 1;
 		$this->autoCommit = false;
 		$this->_commit = OCI_DEFAULT;
+		
+		if ($this->_transmode) $this->Execute("SET TRANSACTION ".$this->_transmode);
 		return true;
 	}
 	

Modified: vtigercrm/trunk/adodb/drivers/adodb-oci805.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-oci805.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-oci805.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /** 
- * @version V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ * @version V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
  * Released under both BSD license and Lesser GPL library license. 
  * Whenever there is any discrepancy between the two licenses, 
  * the BSD license will take precedence. 

Modified: vtigercrm/trunk/adodb/drivers/adodb-oci8po.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-oci8po.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-oci8po.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim. All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim. All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/trunk/adodb/drivers/adodb-odbc.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-odbc.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-odbc.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. 

Modified: vtigercrm/trunk/adodb/drivers/adodb-odbc_db2.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-odbc_db2.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-odbc_db2.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. 
@@ -60,7 +60,7 @@
 ========================
 To set SQL_CUR_USE_ODBC for drivers that require it, do this:
 
-$db = NewADOConnection('db2');
+$db = NewADOConnection('odbc_db2');
 $db->curMode = SQL_CUR_USE_ODBC;
 $db->Connect($dsn, $userid, $pwd);
 
@@ -80,6 +80,10 @@
 > In case of DB2 I had to swap the first and last arguments in order to connect properly. 
 
 
+System Error 5
+==============
+IF you get a System Error 5 when trying to Connect/Load, it could be a permission problem. Give the user connecting
+to DB2 full rights to the DB2 SQLLIB directory, and place the user in the DBUSERS group.
 */
 
 // security - hide paths
@@ -88,13 +92,14 @@
 if (!defined('_ADODB_ODBC_LAYER')) {
 	include(ADODB_DIR."/drivers/adodb-odbc.inc.php");
 }
-if (!defined('ADODB_DB2')){
-define('ADODB_DB2',1);
-
-class ADODB_DB2 extends ADODB_odbc {
+if (!defined('ADODB_ODBC_DB2')){
+define('ADODB_ODBC_DB2',1);
+
+class ADODB_ODBC_DB2 extends ADODB_odbc {
 	var $databaseType = "db2";	
 	var $concat_operator = '||';
-	var $sysDate = 'CURRENT_DATE';
+	var $sysTime = 'CURRENT TIME';
+	var $sysDate = 'CURRENT DATE';
 	var $sysTimeStamp = 'CURRENT TIMESTAMP';
 	// The complete string representation of a timestamp has the form 
 	// yyyy-mm-dd-hh.mm.ss.nnnnnn.
@@ -103,6 +108,7 @@
 	var $identitySQL = 'values IDENTITY_VAL_LOCAL()';
 	var $_bindInputArray = true;
 	 var $hasInsertID = true;
+	var $rsPrefix = 'ADORecordset_odbc_';
 	
 	function ADODB_DB2()
 	{
@@ -294,7 +300,7 @@
 };
  
 
-class  ADORecordSet_db2 extends ADORecordSet_odbc {	
+class  ADORecordSet_odbc_db2 extends ADORecordSet_odbc {	
 	
 	var $databaseType = "db2";		
 	

Modified: vtigercrm/trunk/adodb/drivers/adodb-odbc_mssql.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-odbc_mssql.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-odbc_mssql.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. 
@@ -142,6 +142,17 @@
 		return ADODB_odbc::_query($sql,$inputarr);
 	}
 	
+	function SetTransactionMode( $transaction_mode ) 
+	{
+		$this->_transmode  = $transaction_mode;
+		if (empty($transaction_mode)) {
+			$this->Execute('SET TRANSACTION ISOLATION LEVEL READ COMMITTED');
+			return;
+		}
+		if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
+		$this->Execute("SET TRANSACTION ".$transaction_mode);
+	}
+	
 	// "Stein-Aksel Basma" <basma at accelero.no>
 	// tested with MSSQL 2000
 	function &MetaPrimaryKeys($table)

Modified: vtigercrm/trunk/adodb/drivers/adodb-odbc_oracle.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-odbc_oracle.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-odbc_oracle.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. 

Modified: vtigercrm/trunk/adodb/drivers/adodb-odbtp.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-odbtp.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-odbtp.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /*
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence. See License.txt.

Modified: vtigercrm/trunk/adodb/drivers/adodb-odbtp_unicode.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-odbtp_unicode.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-odbtp_unicode.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /*
-	V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+	V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence. See License.txt.

Modified: vtigercrm/trunk/adodb/drivers/adodb-oracle.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-oracle.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-oracle.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.
@@ -45,6 +45,24 @@
 		if (is_string($ts)) $d = ADORecordSet::UnixTimeStamp($ts);
 		return 'TO_DATE('.adodb_date($this->fmtTimeStamp,$ts).",'RRRR-MM-DD, HH:MI:SS AM')";
 	}
+	
+	
+	function BindDate($d)
+	{
+		$d = ADOConnection::DBDate($d);
+		if (strncmp($d,"'",1)) return $d;
+		
+		return substr($d,1,strlen($d)-2);
+	}
+	
+	function BindTimeStamp($d)
+	{
+		$d = ADOConnection::DBTimeStamp($d);
+		if (strncmp($d,"'",1)) return $d;
+		
+		return substr($d,1,strlen($d)-2);
+	}
+	
 
 	
 	function BeginTrans()

Modified: vtigercrm/trunk/adodb/drivers/adodb-pdo.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-pdo.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-pdo.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. 

Modified: vtigercrm/trunk/adodb/drivers/adodb-pdo_mssql.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-pdo_mssql.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-pdo_mssql.inc.php Fri Jun 16 07:06:09 2006
@@ -2,7 +2,7 @@
 
 
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.
@@ -36,6 +36,17 @@
 		return $ret;
 	}
 	
+	function SetTransactionMode( $transaction_mode ) 
+	{
+		$this->_transmode  = $transaction_mode;
+		if (empty($transaction_mode)) {
+			$this->Execute('SET TRANSACTION ISOLATION LEVEL READ COMMITTED');
+			return;
+		}
+		if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
+		$this->Execute("SET TRANSACTION ".$transaction_mode);
+	}
+	
 	function MetaTables()
 	{
 		return false;

Modified: vtigercrm/trunk/adodb/drivers/adodb-pdo_mysql.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-pdo_mysql.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-pdo_mysql.inc.php Fri Jun 16 07:06:09 2006
@@ -2,7 +2,7 @@
 
 
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.
@@ -48,6 +48,17 @@
 		
 		$this->metaTablesSQL = $save;
 		return $ret;
+	}
+	
+	function SetTransactionMode( $transaction_mode ) 
+	{
+		$this->_transmode  = $transaction_mode;
+		if (empty($transaction_mode)) {
+			$this->Execute('SET TRANSACTION ISOLATION LEVEL REPEATABLE READ');
+			return;
+		}
+		if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
+		$this->Execute("SET SESSION TRANSACTION ".$transaction_mode);
 	}
 	
  	function &MetaColumns($table) 

Modified: vtigercrm/trunk/adodb/drivers/adodb-pdo_oci.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-pdo_oci.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-pdo_oci.inc.php Fri Jun 16 07:06:09 2006
@@ -2,7 +2,7 @@
 
 
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/trunk/adodb/drivers/adodb-pdo_pgsql.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-pdo_pgsql.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-pdo_pgsql.inc.php Fri Jun 16 07:06:09 2006
@@ -1,7 +1,7 @@
 <?php
 
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/trunk/adodb/drivers/adodb-postgres.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-postgres.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-postgres.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /*
- V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/trunk/adodb/drivers/adodb-postgres64.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-postgres64.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-postgres64.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /*
- V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.
@@ -174,7 +174,7 @@
 	{
 		if ($this->transOff) return true;
 		$this->transCnt += 1;
-		return @pg_Exec($this->_connectionID, "begin");
+		return @pg_Exec($this->_connectionID, "begin ".$this->_transmode);
 	}
 	
 	function RowLock($tables,$where,$flds='1 as ignore') 
@@ -532,6 +532,8 @@
 			$fld->name = $rs->fields[0];
 			$fld->type = $rs->fields[1];
 			$fld->max_length = $rs->fields[2];
+			$fld->attnum = $rs->fields[6];
+			
 			if ($fld->max_length <= 0) $fld->max_length = $rs->fields[3]-4;
 			if ($fld->max_length <= 0) $fld->max_length = -1;
 			if ($fld->type == 'numeric') {
@@ -617,12 +619,14 @@
 					return $false;
                 }
 				
-                $col_names = $this->MetaColumnNames($table,true);
+                $col_names = $this->MetaColumnNames($table,true,true); 
+				//3rd param is use attnum, 
+				// see http://sourceforge.net/tracker/index.php?func=detail&aid=1451245&group_id=42718&atid=433976
                 $indexes = array();
                 while ($row = $rs->FetchRow()) {
                         $columns = array();
                         foreach (explode(' ', $row[2]) as $col) {
-                                $columns[] = $col_names[$col - 1];
+                                $columns[] = $col_names[$col];
                         }
                         
                         $indexes[$row[0]] = array(
@@ -701,7 +705,7 @@
 	// returns queryID or false
 	function _query($sql,$inputarr)
 	{
-		
+		$this->_errorMsg = false;
 		if ($inputarr) {
 		/*
 			It appears that PREPARE/EXECUTE is slower for many queries.
@@ -730,6 +734,7 @@
 			
 			if ($execp) $exsql = "EXECUTE $plan ($execp)";
 			else $exsql = "EXECUTE $plan";
+			
 			
 			$rez = @pg_exec($this->_connectionID,$exsql);
 			if (!$rez) {
@@ -756,12 +761,11 @@
 				$s = "PREPARE $plan ($params) AS ".substr($sql,0,strlen($sql)-2);		
 				//adodb_pr($s);
 				pg_exec($this->_connectionID,$s);
-				echo $this->ErrorMsg();
+				//echo $this->ErrorMsg();
 			}
 			
 			$rez = pg_exec($this->_connectionID,$exsql);
 		} else {
-			$this->_errorMsg = false;
 			//adodb_backtrace();
 			$rez = pg_exec($this->_connectionID,$sql);
 		}
@@ -1000,6 +1004,7 @@
 		   		case 'BPCHAR':
 				case '_VARCHAR':
 				case 'INET':
+				case 'MACADDR':
 					if ($len <= $this->blobSize) return 'C';
 				
 				case 'TEXT':
@@ -1019,6 +1024,8 @@
 				case 'DATE':
 					return 'D';
 				
+				
+				case 'TIMESTAMP WITHOUT TIME ZONE':
 				case 'TIME':
 				case 'DATETIME':
 				case 'TIMESTAMP':

Modified: vtigercrm/trunk/adodb/drivers/adodb-postgres7.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-postgres7.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-postgres7.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /*
- V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.
@@ -55,6 +55,7 @@
 		return $sql;
 	}
  	*/
+
 
 	// from  Edward Jaramilla, improved version - works on pg 7.4
 	function MetaForeignKeys($table, $owner=false, $upper=false)
@@ -96,6 +97,7 @@
 			// We don't have native support for parameterized queries, so let's emulate it at the parent
 			return ADODB_postgres64::_query($sql, $inputarr);
 		}
+		$this->_errorMsg = false;
 		// -- added Cristiano da Cunha Duarte
 		if ($inputarr) {
 			$sqlarr = explode('?',trim($sql));

Modified: vtigercrm/trunk/adodb/drivers/adodb-postgres8.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-postgres8.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-postgres8.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /*
- V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/trunk/adodb/drivers/adodb-proxy.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-proxy.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-proxy.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/trunk/adodb/drivers/adodb-sapdb.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-sapdb.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-sapdb.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. 

Modified: vtigercrm/trunk/adodb/drivers/adodb-sqlanywhere.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-sqlanywhere.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-sqlanywhere.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-version V4.81 3 May 2006 (c) 2000-2006  John Lim (jlim#natsoft.com.my).  All rights
+version V4.90 8 June 2006 (c) 2000-2006  John Lim (jlim#natsoft.com.my).  All rights
 reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 

Modified: vtigercrm/trunk/adodb/drivers/adodb-sqlite.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-sqlite.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-sqlite.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/trunk/adodb/drivers/adodb-sqlitepo.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-sqlitepo.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-sqlitepo.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.

Modified: vtigercrm/trunk/adodb/drivers/adodb-sybase.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-sybase.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-sybase.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim. All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim. All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. 

Modified: vtigercrm/trunk/adodb/drivers/adodb-sybase_ase.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-sybase_ase.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-sybase_ase.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /*
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/trunk/adodb/drivers/adodb-vfp.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-vfp.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-vfp.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. 

Modified: vtigercrm/trunk/adodb/perf/perf-db2.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/perf/perf-db2.inc.php (original)
+++ vtigercrm/trunk/adodb/perf/perf-db2.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. See License.txt. 

Modified: vtigercrm/trunk/adodb/perf/perf-informix.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/perf/perf-informix.inc.php (original)
+++ vtigercrm/trunk/adodb/perf/perf-informix.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. See License.txt. 

Modified: vtigercrm/trunk/adodb/perf/perf-mssql.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/perf/perf-mssql.inc.php (original)
+++ vtigercrm/trunk/adodb/perf/perf-mssql.inc.php Fri Jun 16 07:06:09 2006
@@ -1,7 +1,7 @@
 <?php
 
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. See License.txt. 

Modified: vtigercrm/trunk/adodb/perf/perf-mysql.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/perf/perf-mysql.inc.php (original)
+++ vtigercrm/trunk/adodb/perf/perf-mysql.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. See License.txt. 

Modified: vtigercrm/trunk/adodb/perf/perf-oci8.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/perf/perf-oci8.inc.php (original)
+++ vtigercrm/trunk/adodb/perf/perf-oci8.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. See License.txt. 

Modified: vtigercrm/trunk/adodb/perf/perf-postgres.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/perf/perf-postgres.inc.php (original)
+++ vtigercrm/trunk/adodb/perf/perf-postgres.inc.php Fri Jun 16 07:06:09 2006
@@ -1,7 +1,7 @@
 <?php
 
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. See License.txt. 

Modified: vtigercrm/trunk/adodb/pivottable.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/pivottable.inc.php (original)
+++ vtigercrm/trunk/adodb/pivottable.inc.php Fri Jun 16 07:06:09 2006
@@ -1,15 +1,12 @@
 <?php
 /** 
- * @version V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ * @version V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
  * Released under both BSD license and Lesser GPL library license. 
  * Whenever there is any discrepancy between the two licenses, 
  * the BSD license will take precedence. 
  *
  * Set tabs to 4 for best viewing.
  * 
- * Latest version is available at http://php.weblogs.com
- *
- * Requires PHP4.01pl2 or later because it uses include_once
 */
 
 /*
@@ -38,7 +35,7 @@
 	else $hidecnt = false;
 	
 	$iif = strpos($db->databaseType,'access') !== false; 
-		// note - vfp still doesn' work even with IIF enabled || $db->databaseType == 'vfp';
+		// note - vfp 6 still doesn' work even with IIF enabled || $db->databaseType == 'vfp';
 	
 	//$hidecnt = false;
 	
@@ -95,7 +92,12 @@
 	else
 		$sel = substr($sel,0,strlen($sel)-2);
 	
+	
+	// Strip aliases
+	$rowfields = preg_replace('/ AS (\w+)/i', '', $rowfields);
+	
 	$sql = "SELECT $sel \nFROM $tables $where \nGROUP BY $rowfields";
+	
 	return $sql;
  }
 

Modified: vtigercrm/trunk/adodb/rsfilter.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/rsfilter.inc.php (original)
+++ vtigercrm/trunk/adodb/rsfilter.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /** 
- * @version V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ * @version V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
  * Released under both BSD license and Lesser GPL library license. 
  * Whenever there is any discrepancy between the two licenses, 
  * the BSD license will take precedence. 

Modified: vtigercrm/trunk/adodb/server.php
==============================================================================
--- vtigercrm/trunk/adodb/server.php (original)
+++ vtigercrm/trunk/adodb/server.php Fri Jun 16 07:06:09 2006
@@ -1,7 +1,7 @@
 <?php
 
 /** 
- * @version V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ * @version V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
  * Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. 

Modified: vtigercrm/trunk/adodb/session/adodb-compress-bzip2.php
==============================================================================
--- vtigercrm/trunk/adodb/session/adodb-compress-bzip2.php (original)
+++ vtigercrm/trunk/adodb/session/adodb-compress-bzip2.php Fri Jun 16 07:06:09 2006
@@ -1,7 +1,7 @@
 <?php
 
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
          Contributed by Ross Smith (adodb at netebb.com). 
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,

Modified: vtigercrm/trunk/adodb/session/adodb-compress-gzip.php
==============================================================================
--- vtigercrm/trunk/adodb/session/adodb-compress-gzip.php (original)
+++ vtigercrm/trunk/adodb/session/adodb-compress-gzip.php Fri Jun 16 07:06:09 2006
@@ -2,7 +2,7 @@
 
 
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
          Contributed by Ross Smith (adodb at netebb.com). 
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,

Modified: vtigercrm/trunk/adodb/session/adodb-cryptsession.php
==============================================================================
--- vtigercrm/trunk/adodb/session/adodb-cryptsession.php (original)
+++ vtigercrm/trunk/adodb/session/adodb-cryptsession.php Fri Jun 16 07:06:09 2006
@@ -2,7 +2,7 @@
 
 
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
          Contributed by Ross Smith (adodb at netebb.com). 
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,

Modified: vtigercrm/trunk/adodb/session/adodb-encrypt-mcrypt.php
==============================================================================
--- vtigercrm/trunk/adodb/session/adodb-encrypt-mcrypt.php (original)
+++ vtigercrm/trunk/adodb/session/adodb-encrypt-mcrypt.php Fri Jun 16 07:06:09 2006
@@ -2,7 +2,7 @@
 
 
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
          Contributed by Ross Smith (adodb at netebb.com). 
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,

Modified: vtigercrm/trunk/adodb/session/adodb-encrypt-md5.php
==============================================================================
--- vtigercrm/trunk/adodb/session/adodb-encrypt-md5.php (original)
+++ vtigercrm/trunk/adodb/session/adodb-encrypt-md5.php Fri Jun 16 07:06:09 2006
@@ -1,7 +1,7 @@
 <?php
 
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
          Contributed by Ross Smith (adodb at netebb.com). 
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,

Modified: vtigercrm/trunk/adodb/session/adodb-encrypt-secret.php
==============================================================================
--- vtigercrm/trunk/adodb/session/adodb-encrypt-secret.php (original)
+++ vtigercrm/trunk/adodb/session/adodb-encrypt-secret.php Fri Jun 16 07:06:09 2006
@@ -1,7 +1,7 @@
 <?php
 
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
          Contributed by Ross Smith (adodb at netebb.com). 
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,

Modified: vtigercrm/trunk/adodb/session/adodb-session-clob.php
==============================================================================
--- vtigercrm/trunk/adodb/session/adodb-session-clob.php (original)
+++ vtigercrm/trunk/adodb/session/adodb-session-clob.php Fri Jun 16 07:06:09 2006
@@ -2,7 +2,7 @@
 
 
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
          Contributed by Ross Smith (adodb at netebb.com). 
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,

Modified: vtigercrm/trunk/adodb/session/adodb-session.php
==============================================================================
--- vtigercrm/trunk/adodb/session/adodb-session.php (original)
+++ vtigercrm/trunk/adodb/session/adodb-session.php Fri Jun 16 07:06:09 2006
@@ -2,7 +2,7 @@
 
 
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
          Contributed by Ross Smith (adodb at netebb.com). 
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,
@@ -492,6 +492,19 @@
 	/////////////////////
 	// public methods
 	/////////////////////
+	
+	function config($driver, $host, $user, $password, $database=false,$options=false)
+	{
+		ADODB_Session::driver($driver);
+		ADODB_Session::host($host);
+		ADODB_Session::user($user);
+		ADODB_Session::password($password);
+		ADODB_Session::database($database);
+		
+		if (isset($options['table'])) ADODB_Session::table($options['table']);
+		if (isset($options['clob'])) ADODB_Session::table($options['clob']);
+		if (isset($options['field'])) ADODB_Session::dataFieldName($options['field']);
+	}
 
 	/*!
 		Create the connection to the database.
@@ -523,7 +536,6 @@
 #		assert('$driver');
 #		assert('$host');
 
-		// cannot use =& below - do not know why...
 		$conn =& ADONewConnection($driver);
 
 		if ($debug) {
@@ -618,6 +630,10 @@
 		If the data has not been modified since the last read(), we do not write.
 	*/
 	function write($key, $val) {
+	global $ADODB_SESSION_READONLY;
+	
+		if (!empty($ADODB_SESSION_READONLY)) return;
+		
 		$clob			= ADODB_Session::clob();
 		$conn			=& ADODB_Session::_conn();
 		$crc			= ADODB_Session::_crc();
@@ -646,12 +662,19 @@
 			if ($debug) {
 				echo '<p>Session: Only updating date - crc32 not changed</p>';
 			}
-			$sql = "UPDATE $table SET expiry = ".$conn->Param('0')." WHERE $binary sesskey = ".$conn->Param('1')." AND expiry >= ".$conn->Param('2');
-			$rs =& $conn->Execute($sql,array($expiry,$key,time()));
-			ADODB_Session::_dumprs($rs);
-			if ($rs) {
-				$rs->Close();
-			}
+			
+			$expirevar = '';
+			if ($expire_notify) {
+				$var = reset($expire_notify);
+				global $$var;
+				if (isset($$var)) {
+					$expirevar = $$var;
+				}
+			}
+			
+			
+			$sql = "UPDATE $table SET expiry = ".$conn->Param('0').",expireref=".$conn->Param('1')." WHERE $binary sesskey = ".$conn->Param('2')." AND expiry >= ".$conn->Param('3');
+			$rs =& $conn->Execute($sql,array($expiry,$expirevar,$key,time()));
 			return true;
 		}
 		$val = rawurlencode($val);
@@ -673,7 +696,7 @@
 		if (!$clob) {	// no lobs, simply use replace()
 			$arr[$data] = $conn->qstr($val);
 			$rs = $conn->Replace($table, $arr, 'sesskey', $autoQuote = true);
-			ADODB_Session::_dumprs($rs);
+			
 		} else {
 			// what value shall we insert/update for lob row?
 			switch ($driver) {
@@ -691,13 +714,13 @@
 					break;
 			}
 			
+			$expiryref = $conn->qstr($arr['expireref']);
 			// do we insert or update? => as for sesskey
 			$rs =& $conn->Execute("SELECT COUNT(*) AS cnt FROM $table WHERE $binary sesskey = $qkey");
-			ADODB_Session::_dumprs($rs);
 			if ($rs && reset($rs->fields) > 0) {
-				$sql = "UPDATE $table SET expiry = $expiry, $data = $lob_value WHERE  sesskey = $qkey";
+				$sql = "UPDATE $table SET expiry = $expiry, $data = $lob_value, expireref=$expiryref WHERE  sesskey = $qkey";
 			} else {
-				$sql = "INSERT INTO $table (expiry, $data, sesskey) VALUES ($expiry, $lob_value, $qkey)";
+				$sql = "INSERT INTO $table (expiry, $data, sesskey,expireref) VALUES ($expiry, $lob_value, $qkey,$expiryref)";
 			}
 			if ($rs) {
 				$rs->Close();
@@ -705,12 +728,11 @@
 
 			$err = '';
 			$rs1 =& $conn->Execute($sql);
-			ADODB_Session::_dumprs($rs1);
 			if (!$rs1) {
 				$err = $conn->ErrorMsg()."\n";
 			}
 			$rs2 =& $conn->UpdateBlob($table, $data, $val, " sesskey=$qkey", strtoupper($clob));
-			ADODB_Session::_dumprs($rs2);
+			
 			if (!$rs2) {
 				$err .= $conn->ErrorMsg()."\n";
 			}
@@ -901,7 +923,8 @@
 }
 
 ADODB_Session::_init();
-register_shutdown_function('session_write_close');
+if (empty($ADODB_SESSION_READONLY))
+	register_shutdown_function('session_write_close');
 
 // for backwards compatability only
 function adodb_sess_open($save_path, $session_name, $persist = true) {
@@ -914,4 +937,4 @@
 	return ADODB_Session::gc($t);
 }
 
-?>
+?>

Modified: vtigercrm/trunk/adodb/session/old/adodb-cryptsession.php
==============================================================================
--- vtigercrm/trunk/adodb/session/old/adodb-cryptsession.php (original)
+++ vtigercrm/trunk/adodb/session/old/adodb-cryptsession.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/trunk/adodb/session/old/adodb-session-clob.php
==============================================================================
--- vtigercrm/trunk/adodb/session/old/adodb-session-clob.php (original)
+++ vtigercrm/trunk/adodb/session/old/adodb-session-clob.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /*
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/trunk/adodb/session/old/adodb-session.php
==============================================================================
--- vtigercrm/trunk/adodb/session/old/adodb-session.php (original)
+++ vtigercrm/trunk/adodb/session/old/adodb-session.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/trunk/adodb/tests/test-active-recs2.php
==============================================================================
--- vtigercrm/trunk/adodb/tests/test-active-recs2.php (original)
+++ vtigercrm/trunk/adodb/tests/test-active-recs2.php Fri Jun 16 07:06:09 2006
@@ -29,9 +29,11 @@
 
 
 
+
 $rec = new ADODB_Active_Record('photos');
 
 $rec = new ADODB_Active_Record('products');
+
 
 adodb_pr($rec->getAttributeNames());
 

Modified: vtigercrm/trunk/adodb/tests/test.php
==============================================================================
--- vtigercrm/trunk/adodb/tests/test.php (original)
+++ vtigercrm/trunk/adodb/tests/test.php Fri Jun 16 07:06:09 2006
@@ -747,7 +747,14 @@
 		where id=".$db->Param('zid')." and created>=".$db->Param('ZDATE')."",
 		$array);
 	if ($id != 1) Err("Bad bind; id=$id");
-	else echo "<br>Bind date/integer passed";
+	else echo "<br>Bind date/integer 1 passed";
+	
+	$array =array(1,$db->BindDate(time()));
+	$id = $db->GetOne("select id from ADOXYZ 
+		where id=".$db->Param('0')." and created>=".$db->Param('1')."",
+		$array);
+	if ($id != 1) Err("Bad bind; id=$id");
+	else echo "<br>Bind date/integer 2 passed";
 	
 	$db->debug = false;
 	$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
@@ -1327,13 +1334,16 @@
 	$date = $db->SQLDate('d-m-M-Y-\QQ h:i:s A',$db->DBDate("1974-02-25"));
 	$sql = "SELECT $date from ADOXYZ";
 	print "<p>Test SQLDate: ".htmlspecialchars($sql)."</p>";
+	$db->debug=1;
 	$rs = $db->SelectLimit($sql,1);
 	$ts = ADOConnection::UnixDate('1974-02-25');
 	$d = date('d-m-M-Y-',$ts).'Q'.(ceil(date('m',$ts)/3.0)).date(' h:i:s A',$ts);
 	if (!$rs) {
 		Err("SQLDate query returned no recordset");
 		echo $db->ErrorMsg(),'<br>';
-	} else if ($d != $rs->fields[0]) Err("SQLDate 2 failed expected: <br>act:$d <br>sql:".$rs->fields[0]);
+	} else if ($d != reset($rs->fields)) {
+		Err("SQLDate 2 failed expected: <br>act:$d <br>sql:".$rs->fields[0].' <br>'.$db->ErrorMsg());
+	}
 	
 	
 	print "<p>Test Filter</p>";
@@ -1504,9 +1514,11 @@
 	flush();
 	
 	if ($db->hasTransactions) {
-		//$db->debug=1;
+		$db->debug=1;
 		echo "<p>Testing StartTrans CompleteTrans</p>";
 		$db->raiseErrorFn = false;
+		
+		$db->SetTransactionMode('SERIALIZABLE');
 		$db->StartTrans();
 		$rs = $db->Execute('select * from notable');
 			$db->StartTrans();
@@ -1515,6 +1527,8 @@
 				$db->CommitTrans();
 			$db->CompleteTrans();
 		$rez = $db->CompleteTrans();
+		$db->SetTransactionMode('');
+		$db->debug=0;
 		if ($rez !== false) {
 			if (is_null($rez)) Err("Error: _transOK not modified");
 			else Err("Error: CompleteTrans (1) should have failed");

Modified: vtigercrm/trunk/adodb/tests/testdatabases.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/tests/testdatabases.inc.php (original)
+++ vtigercrm/trunk/adodb/tests/testdatabases.inc.php Fri Jun 16 07:06:09 2006
@@ -314,17 +314,28 @@
 
 }
 
-ADOLoadCode("db2"); // no longer supported
-if (!empty($testdb2)) { 
-	$db = ADONewConnection();
-	print "<h1>Connecting $db->databaseType...</h1>";
-	
-	$dsn = "db2_sample";
-	$dsn = "driver={IBM db2 odbc DRIVER};Database=sample;hostname=localhost;port=50000;protocol=TCPIP; uid=root; pwd=natsoft";
-	if ($db->Connect($dsn)) {
-	//	testdb($db,"create table ADOXYZ (id int, firstname varchar(24), lastname varchar(24),created date)");
-	} else print "ERROR: DB2 test requires an server setup with odbc data source db2_sample".'<BR>'.$db->ErrorMsg();
-
+ADOLoadCode("odbc_db2"); // no longer supported
+if (!empty($testdb2)) {
+	if (PHP_VERSION>=5.1) {
+		$db = ADONewConnection("db2");
+		print "<h1>Connecting $db->databaseType...</h1>";
+		
+		#$db->curMode = SQL_CUR_USE_ODBC;
+		#$dsn = "driver={IBM db2 odbc DRIVER};Database=test;hostname=localhost;port=50000;protocol=TCPIP; uid=natsoft; pwd=guest";
+		if ($db->Connect('localhost','natsoft','guest','test')) {
+			testdb($db,"create table ADOXYZ (id int, firstname varchar(24), lastname varchar(24),created date)");
+		} else print "ERROR: DB2 test requires an server setup with odbc data source db2_sample".'<BR>'.$db->ErrorMsg();
+	} else { 
+		$db = ADONewConnection("odbc_db2");
+		print "<h1>Connecting $db->databaseType...</h1>";
+		
+		$dsn = "db2test";
+		#$db->curMode = SQL_CUR_USE_ODBC;
+		#$dsn = "driver={IBM db2 odbc DRIVER};Database=test;hostname=localhost;port=50000;protocol=TCPIP; uid=natsoft; pwd=guest";
+		if ($db->Connect($dsn)) {
+			testdb($db,"create table ADOXYZ (id int, firstname varchar(24), lastname varchar(24),created date)");
+		} else print "ERROR: DB2 test requires an server setup with odbc data source db2_sample".'<BR>'.$db->ErrorMsg();
+	}
 echo "<hr />";
 flush();
 	$dsn = "driver={IBM db2 odbc DRIVER};Database=sample;hostname=localhost;port=50000;protocol=TCPIP; uid=root; pwd=natsoft";

Modified: vtigercrm/trunk/adodb/toexport.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/toexport.inc.php (original)
+++ vtigercrm/trunk/adodb/toexport.inc.php Fri Jun 16 07:06:09 2006
@@ -1,7 +1,7 @@
 <?php
 
 /** 
- * @version V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ * @version V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
  * Released under both BSD license and Lesser GPL library license. 
  * Whenever there is any discrepancy between the two licenses, 
  * the BSD license will take precedence. 

Modified: vtigercrm/trunk/adodb/tohtml.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/tohtml.inc.php (original)
+++ vtigercrm/trunk/adodb/tohtml.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php 
 /*
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.
@@ -95,7 +95,7 @@
 			break;
 			
 			case 'N':
-				if (abs($v) - round($v,0) < 0.00000001)
+				if (abs(abs($v) - round($v,0)) < 0.00000001)
 					$v = round($v);
 				else
 					$v = round($v,$ADODB_ROUND);



From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 06:08:13 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 13:08:13 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7187 -
	/vtigercrm/trunk/install/populateSeedData.php
Message-ID: <20060616130814.148EC7ED33C@vtiger.fosslabs.com>

Author: richie
Date: Fri Jun 16 07:08:09 2006
New Revision: 7187

Log:
Fixes #1188

Modified:
    vtigercrm/trunk/install/populateSeedData.php

Modified: vtigercrm/trunk/install/populateSeedData.php
==============================================================================
--- vtigercrm/trunk/install/populateSeedData.php (original)
+++ vtigercrm/trunk/install/populateSeedData.php Fri Jun 16 07:08:09 2006
@@ -722,9 +722,15 @@
 
 //Populate Email Data
 
-$esubj_array =  array ("Vtiger Releases 5.0 Alpha4", "Try Zoho Writer", "Hi There!!!", "Welcome to Open Source", "SOS Vtiger");
+$esubj_array =  array ("Vtiger Beta Released", "Try vtigercrm!", "Hi There!!!", "Welcome to Open Source", "Help needed in customization of Vtiger");
 $startdate_array =  array ("2006-1-2","2003-3-4","2003-4-5","2001-2-1","2005-8-8");
 $filename_array = array ("vtiger5alpha.tar.gz", "zohowriter.zip", "hi.doc", "welcome.pps", "sos.doc");
+
+$to_array = array("a at a.com","b at b.com", "tester at testvtiger.com","xanth at yaz.com","violet at bing.com");
+$cc_array = array("andrewa at a.com","casterb at b.com", "indomine at variancevtiger.com","becker at nosbest.com","electra at violet.com");
+$bcc_array = array("nathan at nathantests.com","jeff at karl1.com", "isotope at uranium.com","bunny at bugs.com","explosive at dud.com");
+$from_array = array("harvest at zss.com","rain at sunshine.com", "gloom at rainyday.com");
+$body_array = array("This is a good product! Have a go at it! ","Nice to have you visit us, very nice of you. Stay for sometime and have a look at our product. I am sure you will like it", "This will take some time to fix. Can you provide me more details please?","What a cool tool! I wish I had found it earlier. Oh it has a lot of my friends name in it too! I too can contribute. But how?","Urgent. I need this done last week! Guys, you are the ones I am depending on. Do something!");
 
 for($i=0;$i<5;$i++)
 {
@@ -738,11 +744,12 @@
 	$email->column_fields["date_start"] = $startdate_array[$i];
 	$email->column_fields["semodule"] = 'Tasks';
 	$email->column_fields["activitytype"] = 'Emails';
-	
+	$email->column_fields["description"] = $body_array[$i];	
 	$email->save("Emails");
-
 	$email_ids[] = $email->id;
 	
+	$query = "insert into vtiger_emaildetails(emailid,from_email,to_email,cc_email,bcc_email) values (".$email->id.", '".$from_array[$i]."', '".$to_array[$i]."','".$cc_array[$i]."','".$bcc_array[$i] ."')";
+		$res = $adb->query($query);
 }
 
 



From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 06:08:13 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 13:08:13 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231188=3A?=
 =?utf-8?q?_default_email_population_not_proper?=
In-Reply-To: <076.c8af4af2b612afa73930163d3526615a@vtiger.fosslabs.com>
References: <076.c8af4af2b612afa73930163d3526615a@vtiger.fosslabs.com>
Message-ID: <085.15046dc44551a573d15450ab637c86fc@vtiger.fosslabs.com>

#1188: default email population not proper
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  richie
      Type:  defect     |      Status:  closed
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 (In [7187]) Fixes #1188

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1188>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 06:38:32 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 13:38:32 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231314=3A?=
 =?utf-8?q?_Create_a_4=2E2=2E4=2E1_release?=
In-Reply-To: <076.0bb25652495a5800a354264247f65b15@vtiger.fosslabs.com>
References: <076.0bb25652495a5800a354264247f65b15@vtiger.fosslabs.com>
Message-ID: <085.dc069c808dd1334564ee181475ba30e0@vtiger.fosslabs.com>

#1314: Create a 4.2.4.1 release
------------------------+---------------------------------------------------
  Reporter:  allanbush  |       Owner:  developer
      Type:  defect     |      Status:  new      
  Priority:  major      |   Milestone:  4.2.4    
 Component:  vtigercrm  |     Version:  4.2.4rc3 
Resolution:             |    Keywords:           
------------------------+---------------------------------------------------
Comment (by jeffk):

 The full command to try is:
 {{{
  # svn cp -r 6962 \
  (repos)/vtigercrm/branches/4.2.4 \
  (repos)/vtigercrm/branches/4.2.4.1 \
  -m 'refs #1314. resurrect 4.2.4 branch for 4.2.4.1 bugfix release'
 }}}
 subsitute (repos) based on your local or http access method, obviously.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1314>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 06:42:46 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 13:42:46 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23901=3A_?=
 =?utf-8?q?module_and_picklist_mismatch?=
In-Reply-To: <076.4ab5d2daa3e1fd4b360860bc41a84b82@vtiger.fosslabs.com>
References: <076.4ab5d2daa3e1fd4b360860bc41a84b82@vtiger.fosslabs.com>
Message-ID: <085.1d6aa013d50509874cb7cddf22bc0123@vtiger.fosslabs.com>

#901: module and picklist mismatch
------------------------+---------------------------------------------------
  Reporter:  mangai     |       Owner:  mangai
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mangai):

  * owner:  jeri => mangai

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/901>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 06:44:18 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 13:44:18 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23865=3A_?=
 =?utf-8?q?missing_label_and_image?=
In-Reply-To: <076.cbba2af40571aeadb462b203aa78494a@vtiger.fosslabs.com>
References: <076.cbba2af40571aeadb462b203aa78494a@vtiger.fosslabs.com>
Message-ID: <085.04019129b41cdc5d1e0738dc5ec4d8a3@vtiger.fosslabs.com>

#865: missing label and image
------------------------+---------------------------------------------------
  Reporter:  mangai     |       Owner:  mangai
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mangai):

  * owner:  jeri => mangai

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/865>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 07:10:52 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 14:10:52 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231325=3A?=
 =?utf-8?q?_reference_all_clanups_of_vtiger=5F_table_prefix_to_trac_ticket?=
In-Reply-To: <076.dc2b0777399119340aa2cb60903488d4@vtiger.fosslabs.com>
References: <076.dc2b0777399119340aa2cb60903488d4@vtiger.fosslabs.com>
Message-ID: <085.ff8b432780451741ff38e101985bc8ed@vtiger.fosslabs.com>

#1325: reference all clanups of vtiger_ table prefix to trac ticket
------------------------+---------------------------------------------------
  Reporter:  jeffk      |       Owner:  don     
      Type:  defect     |      Status:  new     
  Priority:  major      |   Milestone:  5.0.0   
 Component:  vtigercrm  |     Version:  5.0.0   
Resolution:             |    Keywords:  database
------------------------+---------------------------------------------------
Comment (by jeffk):

 Thanks, Don. More changesets:

  * r7184
  * r7179
  * r7178
  * r7152

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1325>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 07:14:05 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 14:14:05 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7188 - in
 /vtigercrm/trunk/Smarty/templates: ImportStep1.tpl ImportStep2.tpl
 Importerror.tpl
Message-ID: <20060616141405.032C97ED2DA@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 16 08:14:01 2006
New Revision: 7188

Log:
* Modified to display the second level tabs ie., add, search, import and export buttons and passed the parenttab value

Modified:
    vtigercrm/trunk/Smarty/templates/ImportStep1.tpl
    vtigercrm/trunk/Smarty/templates/ImportStep2.tpl
    vtigercrm/trunk/Smarty/templates/Importerror.tpl

Modified: vtigercrm/trunk/Smarty/templates/ImportStep1.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ImportStep1.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ImportStep1.tpl Fri Jun 16 08:14:01 2006
@@ -14,17 +14,7 @@
 <script type="text/javascript" src="modules/{$MODULE}/{$SINGLE_MOD}.js"></script>
 
 <!-- header - level 2 tabs -->
-<br>
-<table class="small" border="0" cellpadding="0" cellspacing="0" width="100%">
-   <tbody>
-   <tr>
-	<td style="height: 2px;"></td>
-   </tr>
-   <tr>
-	<td style="padding-left:10px;padding-right:10px" class="moduleName" nowrap>{$CATEGORY} > <a class="hdrLink" href="index.php?action=ListView&module={$MODULE}">{$MODULE}</a></td>
-   </tr>
-   </tbody>
-</table>
+{include file='Buttons_List1.tpl'}	
 
 <table align="center" border="0" cellpadding="0" cellspacing="0" width="98%" class="small">
    <tbody>
@@ -44,6 +34,7 @@
 				<input type="hidden" name="return_module" value="{$RETURN_MODULE}">
 				<input type="hidden" name="return_id" value="{$RETURN_ID}">
 				<input type="hidden" name="return_action" value="{$RETURN_ACTION}">
+				<input type="hidden" name="parenttab" value="{$CATEGORY}">
 
 				<!-- IMPORT LEADS STARTS HERE  -->
 				<br />

Modified: vtigercrm/trunk/Smarty/templates/ImportStep2.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ImportStep2.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ImportStep2.tpl Fri Jun 16 08:14:01 2006
@@ -32,17 +32,7 @@
 
 </script>
 <!-- header - level 2 tabs -->
-<br>
-<table class="small" border="0" cellpadding="0" cellspacing="0" width="100%">
-   <tbody>
-   <tr>
-	<td style="height: 2px;"></td>
-   </tr>
-   <tr>
-	<td style="padding-left:10px;padding-right:10px" class="moduleName" nowrap>{$CATEGORY} > <a class="hdrLink" href="index.php?action=ListView&module={$MODULE}">{$MODULE}</a></td>
-   </tr>
-   </tbody>
-</table>
+{include file='Buttons_List1.tpl'}	
 
 <table align="center" border="0" cellpadding="0" cellspacing="0" width="98%" class="small">
 <tbody>
@@ -63,6 +53,7 @@
 				<input type="hidden" name="return_module" value="{$RETURN_MODULE}">
 				<input type="hidden" name="return_id" value="{$RETURN_ID}">
 				<input type="hidden" name="return_action" value="{$RETURN_ACTION}">
+				<input type="hidden" name="parenttab" value="{$CATEGORY}">
 
 				<!-- IMPORT LEADS STARTS HERE  -->
 				<br />

Modified: vtigercrm/trunk/Smarty/templates/Importerror.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Importerror.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Importerror.tpl Fri Jun 16 08:14:01 2006
@@ -9,6 +9,9 @@
   *
  ********************************************************************************/
 -->*}
+
+{include file='Buttons_List1.tpl'}	
+
 <table  cellpadding="0" cellspacing="0" width="100%">
    <tr>
 	<td width="75%" valign=top>



From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 07:20:09 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 14:20:09 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=23890=3A_?=
	=?utf-8?q?Email_popup_issue?=
In-Reply-To: <076.af87ee9fab4462c5b5f953df35dd36b6@vtiger.fosslabs.com>
References: <076.af87ee9fab4462c5b5f953df35dd36b6@vtiger.fosslabs.com>
Message-ID: <085.ab748027f3f0f93ce53ea4dab055186d@vtiger.fosslabs.com>

#890: Email popup issue
------------------------+---------------------------------------------------
  Reporter:  mickie     |       Owner:  ela  
      Type:  defect     |      Status:  new  
  Priority:  major      |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by richie):

  * owner:  jeri => ela

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/890>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 07:20:21 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 14:20:21 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231121=3A?=
	=?utf-8?q?_Picklist_UI_is_broken?=
In-Reply-To: <076.aefce13e2b710220e208efde54caf14e@vtiger.fosslabs.com>
References: <076.aefce13e2b710220e208efde54caf14e@vtiger.fosslabs.com>
Message-ID: <085.4ae95296a7c070d6c108d68918c9d6b3@vtiger.fosslabs.com>

#1121: Picklist UI is broken
------------------------+---------------------------------------------------
  Reporter:  mangai     |       Owner:  mangai
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * owner:  jeri => mangai

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1121>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 07:21:41 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 14:21:41 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7189 - in
 /vtigercrm/trunk/modules/Import: ImportStep1.php ImportStep2.php
Message-ID: <20060616142142.10BDC7ED2DA@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 16 08:21:37 2006
New Revision: 7189

Log:
* Modified to set the parent tab from request value

Modified:
    vtigercrm/trunk/modules/Import/ImportStep1.php
    vtigercrm/trunk/modules/Import/ImportStep2.php

Modified: vtigercrm/trunk/modules/Import/ImportStep1.php
==============================================================================
--- vtigercrm/trunk/modules/Import/ImportStep1.php (original)
+++ vtigercrm/trunk/modules/Import/ImportStep1.php Fri Jun 16 08:21:37 2006
@@ -40,8 +40,7 @@
 $smarty->assign("APP", $app_strings);
 $smarty->assign("IMP", $import_mod_strings);
 
-$category = getParenttab();
-$smarty->assign("CATEGORY", $category);
+$smarty->assign("CATEGORY", $_REQUEST['parenttab']);
 
 $import_object_array = Array(
 				"Leads"=>"ImportLead",

Modified: vtigercrm/trunk/modules/Import/ImportStep2.php
==============================================================================
--- vtigercrm/trunk/modules/Import/ImportStep2.php (original)
+++ vtigercrm/trunk/modules/Import/ImportStep2.php Fri Jun 16 08:21:37 2006
@@ -341,10 +341,8 @@
 }
 
 $smarty->assign("MODULE", $_REQUEST['module']);
-
-$category = getParenttab();
-$smarty->assign('CATEGORY' , $category);
-
+$smarty->assign('CATEGORY' , $_REQUEST['parenttab']);
+@$_SESSION['import_parenttab'] = $_REQUEST['parenttab'];
 $smarty->assign("JAVASCRIPT2", get_readonly_js() );
 
 $smarty->display('ImportStep2.tpl');
@@ -355,7 +353,7 @@
 {
 	var tagName;
 	var count = 0;
-	var vtiger_field_count = "<?php echo $field_count; ?>";
+	var field_count = "<?php echo $field_count; ?>";
 	var required_fields = new Array();
 	var required_fields_name = new Array();
 	var seq_string = '';



From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 07:22:26 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 14:22:26 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231224=3A?=
 =?utf-8?q?_LHS_Settings_panel_missing_for_=22Migrate_From_Previous_Versio?=
 =?utf-8?q?n=3A_page?=
In-Reply-To: <076.7d8220c17518a7cddc64da5e5a35272f@vtiger.fosslabs.com>
References: <076.7d8220c17518a7cddc64da5e5a35272f@vtiger.fosslabs.com>
Message-ID: <085.dd2389926e03423982e0be924ba5d3c8@vtiger.fosslabs.com>

#1224: LHS Settings panel missing for "Migrate From Previous Version: page
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  ela  
      Type:  defect     |      Status:  new  
  Priority:  major      |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by richie):

  * owner:  jerrydgeorge => ela

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1224>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 07:27:25 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 14:27:25 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7190 - in
 /vtigercrm/trunk/modules/Potentials: Charts.php Opportunity.php
Message-ID: <20060616142725.099477E89E6@vtiger.fosslabs.com>

Author: don
Date: Fri Jun 16 08:27:21 2006
New Revision: 7190

Log:
Fixed issues in vtiger_ prefixing in table names

Modified:
    vtigercrm/trunk/modules/Potentials/Charts.php
    vtigercrm/trunk/modules/Potentials/Opportunity.php

Modified: vtigercrm/trunk/modules/Potentials/Charts.php
==============================================================================
--- vtigercrm/trunk/modules/Potentials/Charts.php (original)
+++ vtigercrm/trunk/modules/Potentials/Charts.php Fri Jun 16 08:27:21 2006
@@ -345,7 +345,7 @@
 		}
 		else {
 			$imgMap_fp = fopen($cache_file_name.'.map', "rb");
-			$imgMap = fread($imgMap_fp, vtiger_filesize($cache_file_name.'.map'));
+			$imgMap = fread($imgMap_fp, filesize($cache_file_name.'.map'));
 			fclose($imgMap_fp);
 		}
 		$fileModTime = filemtime($cache_file_name.'.map');
@@ -680,7 +680,7 @@
 		}
 		else {
 			$imgMap_fp = fopen($cache_file_name.'.map', "rb");
-			$imgMap = fread($imgMap_fp, vtiger_filesize($cache_file_name.'.map'));
+			$imgMap = fread($imgMap_fp, filesize($cache_file_name.'.map'));
 			fclose($imgMap_fp);
 		}
 		$fileModTime = filemtime($cache_file_name.'.map');
@@ -1001,7 +1001,7 @@
 		}
 		else {
 			$imgMap_fp = fopen($cache_file_name.'.map', "rb");
-			$imgMap = fread($imgMap_fp, vtiger_filesize($cache_file_name.'.map'));
+			$imgMap = fread($imgMap_fp, filesize($cache_file_name.'.map'));
 			fclose($imgMap_fp);
 		}
 		$fileModTime = filemtime($cache_file_name.'.map');
@@ -1229,7 +1229,7 @@
 		}
 		else {
 			$imgMap_fp = fopen($cache_file_name.'.map', "rb");
-			$imgMap = fread($imgMap_fp, vtiger_filesize($cache_file_name.'.map'));
+			$imgMap = fread($imgMap_fp, filesize($cache_file_name.'.map'));
 			fclose($imgMap_fp);
 		}
 		$fileModTime = filemtime($cache_file_name.'.map');

Modified: vtigercrm/trunk/modules/Potentials/Opportunity.php
==============================================================================
--- vtigercrm/trunk/modules/Potentials/Opportunity.php (original)
+++ vtigercrm/trunk/modules/Potentials/Opportunity.php Fri Jun 16 08:27:21 2006
@@ -37,9 +37,9 @@
 	var $db;
 
 	var $module_name="Potentials";
-	var $table_name = "potential";
-	var $rel_product_table = "seproductsrel";
-	var $rel_opportunity_table = "contpotentialrel";
+	var $table_name = "vtiger_potential";
+	var $rel_product_table = "vtiger_seproductsrel";
+	var $rel_opportunity_table = "vtiger_contpotentialrel";
 	var $module_id = "potentialid";
 	var $object_name = "potential";
 
@@ -171,7 +171,7 @@
 		{
 			$query = $this->constructCustomQueryAddendum('potentialscf','Potentials') ."
 			vtiger_potential.*,
-			vtiger_account.accountname vtiger_account_name,
+			vtiger_account.accountname account_name,
 			vtiger_users.user_name assigned_user_name
 					FROM vtiger_potential
 					INNER JOIN vtiger_crmentity
@@ -216,7 +216,7 @@
 		if(isPermitted("Contacts",3,"") == 'yes')
 		{
 
-			$button .= '<input title="Change" accessKey="" vtiger_tabindex="2" type="button" class="button" value="'.$app_strings['LBL_SELECT_CONTACT_BUTTON_LABEL'].'" name="Button" LANGUAGE=javascript onclick=\'return window.open("index.php?module=Contacts&action=Popup&return_module=Potentials&popuptype=detailview&form=EditView&form_submit=false&recordid='.$_REQUEST["record"].'","test","width=600,height=400,resizable=1,scrollbars=1");\'>&nbsp;';
+			$button .= '<input title="Change" accessKey="" tabindex="2" type="button" class="button" value="'.$app_strings['LBL_SELECT_CONTACT_BUTTON_LABEL'].'" name="Button" LANGUAGE=javascript onclick=\'return window.open("index.php?module=Contacts&action=Popup&return_module=Potentials&popuptype=detailview&form=EditView&form_submit=false&recordid='.$_REQUEST["record"].'","test","width=600,height=400,resizable=1,scrollbars=1");\'>&nbsp;';
 		}
 		$returnset = '&return_module=Potentials&return_action=DetailView&return_id='.$id;
 
@@ -275,7 +275,7 @@
 		}
 		if(isPermitted("Products",3,"") == 'yes')
 		{
-			$button .= '<input title="Change" accessKey="" vtiger_tabindex="2" type="button" class="button" value="'.$app_strings['LBL_SELECT_PRODUCT_BUTTON_LABEL'].'" name="Button" LANGUAGE=javascript onclick=\'return window.open("index.php?module=Products&action=Popup&return_module=Potentials&popuptype=detailview&form=EditView&form_submit=false&recordid='.$_REQUEST["record"].'","test","width=600,height=400,resizable=1,scrollbars=1");\'>&nbsp;';
+			$button .= '<input title="Change" accessKey="" tabindex="2" type="button" class="button" value="'.$app_strings['LBL_SELECT_PRODUCT_BUTTON_LABEL'].'" name="Button" LANGUAGE=javascript onclick=\'return window.open("index.php?module=Products&action=Popup&return_module=Potentials&popuptype=detailview&form=EditView&form_submit=false&recordid='.$_REQUEST["record"].'","test","width=600,height=400,resizable=1,scrollbars=1");\'>&nbsp;';
 		}
 		$returnset = '&return_module=Potentials&return_action=DetailView&return_id='.$id;
 



From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 07:33:54 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 14:33:54 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7191 -
	/vtigercrm/trunk/modules/Potentials/Opportunity.php
Message-ID: <20060616143354.0A04B7ED342@vtiger.fosslabs.com>

Author: don
Date: Fri Jun 16 08:33:50 2006
New Revision: 7191

Log:
Fixed issues in vtiger_ prefixing in table names

Modified:
    vtigercrm/trunk/modules/Potentials/Opportunity.php

Modified: vtigercrm/trunk/modules/Potentials/Opportunity.php
==============================================================================
--- vtigercrm/trunk/modules/Potentials/Opportunity.php (original)
+++ vtigercrm/trunk/modules/Potentials/Opportunity.php Fri Jun 16 08:33:50 2006
@@ -249,7 +249,7 @@
 		}
 		$returnset = '&return_module=Potentials&return_action=DetailView&return_id='.$id;
 
-		$query = "SELECT vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name, vtiger_recurringevents.recurringtype, vtiger_contactdetails.contactid, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid inner join vtiger_potential on vtiger_potential.potentialid=vtiger_seactivityrel.crmid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid= vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid where vtiger_seactivityrel.crmid=".$id." and (activitytype='Task' or vtiger_activitytype='Call' or vtiger_activitytype='Meeting') and vtiger_crmentity.deleted=0 and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Completed') and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Deferred') or (vtiger_activity.eventstatus != '' &&  vtiger_activity.eventstatus != 'Held')";
+		$query = "SELECT vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name, vtiger_recurringevents.recurringtype, vtiger_contactdetails.contactid, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid inner join vtiger_potential on vtiger_potential.potentialid=vtiger_seactivityrel.crmid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid= vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid where vtiger_seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting') and vtiger_crmentity.deleted=0 and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Completed') and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Deferred') or (vtiger_activity.eventstatus != '' &&  vtiger_activity.eventstatus != 'Held')";
 		$log->debug("Exiting get_activities method ...");
 		return GetRelatedList('Potentials','Activities',$focus,$query,$button,$returnset);
 



From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 07:34:13 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 14:34:13 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231289=3A?=
 =?utf-8?q?_Edit/Del_links_are_must_in_relatedlists?=
In-Reply-To: <076.c2484dcccdec49e5b30c79bee458fec5@vtiger.fosslabs.com>
References: <076.c2484dcccdec49e5b30c79bee458fec5@vtiger.fosslabs.com>
Message-ID: <085.ebe7604e16638613f5d28191f34c8688@vtiger.fosslabs.com>

#1289: Edit/Del links are must in relatedlists
------------------------+---------------------------------------------------
  Reporter:  mickie     |       Owner:  mickie
      Type:  task       |      Status:  closed
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  duplicate  |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mickie):

  * resolution:  => duplicate
  * status:  new => closed

Comment:

 This is already posted in ticket 1245

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1289>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 07:35:15 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 14:35:15 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231267=3A?=
 =?utf-8?q?_Reports_for_Management?=
In-Reply-To: <076.7d4de1023a5c8c54e4e4d481bd7635f2@vtiger.fosslabs.com>
References: <076.7d4de1023a5c8c54e4e4d481bd7635f2@vtiger.fosslabs.com>
Message-ID: <085.c60971a03995bcdd5fc52b81726b36b9@vtiger.fosslabs.com>

#1267: Reports for Management
--------------------------+-------------------------------------------------
  Reporter:  anonymous    |       Owner:  developer
      Type:  enhancement  |      Status:  closed   
  Priority:  major        |   Milestone:           
 Component:  vtigercrm    |     Version:  5.0.0    
Resolution:  fixed        |    Keywords:           
--------------------------+-------------------------------------------------
Changes (by richie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 This will be addressed by the Security Audit feature in a way.
 Though I do concede that it is more a deductive methodology but it will do
 the job.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1267>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 07:43:37 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 14:43:37 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231170=3A?=
 =?utf-8?q?_PO_related_to_SO_does_not_have_assigned_to_value?=
In-Reply-To: <076.846167eef3e3ff8046106f91876e5bb5@vtiger.fosslabs.com>
References: <076.846167eef3e3ff8046106f91876e5bb5@vtiger.fosslabs.com>
Message-ID: <085.5e77587d583618952b3752a7c6d481ab@vtiger.fosslabs.com>

#1170: PO related to SO does not have assigned to value
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  mickie
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  invalid    |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mickie):

  * resolution:  => invalid
  * status:  new => closed

Comment:

 PO and SO does not have relationship.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1170>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 08:08:22 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 15:08:22 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7192 -
	/vtigercrm/trunk/modules/Quotes/Quote.php
Message-ID: <20060616150822.983E07ED350@vtiger.fosslabs.com>

Author: don
Date: Fri Jun 16 09:08:18 2006
New Revision: 7192

Log:
Fixed issues in vtiger_ prefixing in table names

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 Jun 16 09:08:18 2006
@@ -37,9 +37,9 @@
 	var $tab_name = Array('vtiger_crmentity','vtiger_quotes','vtiger_quotesbillads','vtiger_quotesshipads','vtiger_quotescf');
 	var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_quotes'=>'quoteid','vtiger_quotesbillads'=>'quotebilladdressid','vtiger_quotesshipads'=>'quoteshipaddressid','vtiger_quotescf'=>'quoteid');
 	
-	var $entity_table = "crmentity";
+	var $entity_table = "vtiger_crmentity";
 	
-	var $billadr_table = "quotesbillads";
+	var $billadr_table = "vtiger_quotesbillads";
 
 	var $object_name = "Quote";
 
@@ -157,7 +157,7 @@
 
 		$returnset = '&return_module=Quotes&return_action=DetailView&return_id='.$id;
 
-		$query = "SELECT vtiger_contactdetails.contactid, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name,vtiger_recurringevents.recurringtype from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and (activitytype='Task' or vtiger_activitytype='Call' or vtiger_activitytype='Meeting') and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Completed') and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Deferred') or (vtiger_activity.eventstatus !='' && vtiger_activity.eventstatus = 'Planned')";
+		$query = "SELECT vtiger_contactdetails.contactid, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name,vtiger_recurringevents.recurringtype from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting') and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Completed') and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Deferred') or (vtiger_activity.eventstatus !='' && vtiger_activity.eventstatus = 'Planned')";
 		$log->debug("Exiting get_activities method ...");
 		return GetRelatedList('Quotes','Activities',$focus,$query,$button,$returnset);
 	}



From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 08:15:36 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 15:15:36 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7193 -
	/vtigercrm/trunk/modules/Import/ImportSteplast.php
Message-ID: <20060616151536.0194B7ED342@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 16 09:15:32 2006
New Revision: 7193

Log:
* Added code to display the add, search, import, export, etc., buttons

Modified:
    vtigercrm/trunk/modules/Import/ImportSteplast.php

Modified: vtigercrm/trunk/modules/Import/ImportSteplast.php
==============================================================================
--- vtigercrm/trunk/modules/Import/ImportSteplast.php (original)
+++ vtigercrm/trunk/modules/Import/ImportSteplast.php Fri Jun 16 09:15:32 2006
@@ -33,31 +33,49 @@
 global $app_list_strings;
 global $app_strings;
 global $current_user;
+
+if (! isset( $_REQUEST['module']))
+{
+	$_REQUEST['module'] = 'Home';
+}
+
+if (! isset( $_REQUEST['return_id']))
+{
+	$_REQUEST['return_id'] = '';
+}
+if (! isset( $_REQUEST['return_module']))
+{
+	$_REQUEST['return_module'] = '';
+}
+
+if (! isset( $_REQUEST['return_action']))
+{
+	$_REQUEST['return_action'] = '';
+}
+
 global $theme;
-if (! isset( $_REQUEST['module']))
-{
-	$_REQUEST['module'] = 'Home';
-}
-
-if (! isset( $_REQUEST['return_id']))
-{
-	$_REQUEST['return_id'] = '';
-}
-if (! isset( $_REQUEST['return_module']))
-{
-	$_REQUEST['return_module'] = '';
-}
-
-if (! isset( $_REQUEST['return_action']))
-{
-	$_REQUEST['return_action'] = '';
-}
-
 $theme_path="themes/".$theme."/";
 $image_path=$theme_path."images/";
 require_once($theme_path.'layout_utils.php');
 
 $log->info("Import Step last");
+
+//This Buttons_List1.tpl is is called to display the add, search, import and export buttons ie., second level tabs
+$smarty = new vtigerCRM_Smarty;
+
+$smarty->assign("MOD", $mod_strings);
+$smarty->assign("APP", $app_strings);
+$smarty->assign("IMP", $import_mod_strings);
+$smarty->assign("THEME", $theme);
+$smarty->assign("IMAGE_PATH", $image_path);
+
+$smarty->assign("MODULE", $_REQUEST['modulename']);
+$smarty->assign("SINGLE_MOD", $_REQUEST['modulename']);
+$smarty->assign("CATEGORY", $_SESSION['import_parenttab']);
+//@session_unregister("import_parenttab");
+
+$smarty->display("Buttons_List1.tpl");
+
 
 if ( isset($_REQUEST['message']))
 {



From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 08:17:18 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 15:17:18 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7194 -
	/vtigercrm/branches/4.2.4.1/
Message-ID: <20060616151718.C5DD97ED352@vtiger.fosslabs.com>

Author: jeffk
Date: Fri Jun 16 09:17:16 2006
New Revision: 7194

Log:
refs #1314. resurrect 4.2.4 branch for 4.2.4.1 bugfix release

Added:
    vtigercrm/branches/4.2.4.1/
      - copied from r6962, vtigercrm/branches/4.2.4/



From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 08:17:18 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 15:17:18 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231314=3A?=
 =?utf-8?q?_Create_a_4=2E2=2E4=2E1_release?=
In-Reply-To: <076.0bb25652495a5800a354264247f65b15@vtiger.fosslabs.com>
References: <076.0bb25652495a5800a354264247f65b15@vtiger.fosslabs.com>
Message-ID: <085.4cd75637eb0b92c4a9158f37502fc6c7@vtiger.fosslabs.com>

#1314: Create a 4.2.4.1 release
------------------------+---------------------------------------------------
  Reporter:  allanbush  |       Owner:  developer
      Type:  defect     |      Status:  new      
  Priority:  major      |   Milestone:  4.2.4    
 Component:  vtigercrm  |     Version:  4.2.4rc3 
Resolution:             |    Keywords:           
------------------------+---------------------------------------------------
Comment (by jeffk):

 (In [7194]) refs #1314. resurrect 4.2.4 branch for 4.2.4.1 bugfix release

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1314>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 08:18:32 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 15:18:32 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7195 -
	/vtigercrm/trunk/modules/Import/ImportSave.php
Message-ID: <20060616151833.149A37ED356@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 16 09:18:29 2006
New Revision: 7195

Log:
Passed the parent tab value to highlight the parent tab name

Modified:
    vtigercrm/trunk/modules/Import/ImportSave.php

Modified: vtigercrm/trunk/modules/Import/ImportSave.php
==============================================================================
--- vtigercrm/trunk/modules/Import/ImportSave.php (original)
+++ vtigercrm/trunk/modules/Import/ImportSave.php Fri Jun 16 09:18:29 2006
@@ -212,7 +212,7 @@
 setTimeout("b()",1000);
 function b()
 {
-        document.location.href="index.php?action=<?php echo $action?>&module=<?php echo $module?>&modulename=<?php echo $modulename?>&startval=<?php echo $end?>&recordcount=<?php echo $RECORDCOUNT?>&noofrows=<?php echo $totalnoofrows?>&message=<?php echo $message?>&skipped_record_count=<?php echo $skip_required_count?>";
+	document.location.href="index.php?action=<?php echo $action?>&module=<?php echo $module?>&modulename=<?php echo $modulename?>&startval=<?php echo $end?>&recordcount=<?php echo $RECORDCOUNT?>&noofrows=<?php echo $totalnoofrows?>&message=<?php echo $message?>&skipped_record_count=<?php echo $skip_required_count?>&parenttab=<?php echo $_SESSION['import_parenttab']?>";
 }
 </script>
 



From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 08:19:43 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 15:19:43 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7196 -
	/vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl
Message-ID: <20060616151943.C5A867ED342@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 16 09:19:40 2006
New Revision: 7196

Log:
* Modified the step value for Import

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

Modified: vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl Fri Jun 16 09:19:40 2006
@@ -81,7 +81,7 @@
 			<tr>
 			{if $MODULE eq 'Contacts' || $MODULE eq 'Leads' || $MODULE eq 'Accounts' || $MODULE eq 'Potentials' || $MODULE eq 'Products' }
 		   		{if $CHECK.Import eq 'yes'}	
-					<td style="padding-right:0px;padding-left:10px;"><a href="index.php?module={$MODULE}&action=Import&step=2&return_module={$MODULE}&return_action=index&parenttab={$CATEGORY}"><img src="{$IMAGE_PATH}tbarImport.gif" alt="{$APP.LBL_IMPORT} {$APP.$MODULE}" title="{$APP.LBL_IMPORT} {$APP.$MODULE}" border="0"></a></td>	
+					<td style="padding-right:0px;padding-left:10px;"><a href="index.php?module={$MODULE}&action=Import&step=1&return_module={$MODULE}&return_action=index&parenttab={$CATEGORY}"><img src="{$IMAGE_PATH}tbarImport.gif" alt="{$APP.LBL_IMPORT} {$APP.$MODULE}" title="{$APP.LBL_IMPORT} {$APP.$MODULE}" border="0"></a></td>	
 				{else}	
 					<td style="padding-right:0px;padding-left:10px;"><img src="{$IMAGE_PATH}tbarImport-Faded.gif" alt="{$APP.LBL_IMPORT} {$APP.$MODULE}" title="{$APP.LBL_IMPORT} {$APP.$MODULE}" border="0"></td>	
 				{/if}	



From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 08:20:36 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 15:20:36 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231181=3A?=
 =?utf-8?q?_header_buttons_missing_from_Import_Products_screen?=
In-Reply-To: <076.4f57062275dd6f6a01adeebb79425762@vtiger.fosslabs.com>
References: <076.4f57062275dd6f6a01adeebb79425762@vtiger.fosslabs.com>
Message-ID: <085.8475f137d7a9c48ec4799bc934a21b82@vtiger.fosslabs.com>

#1181: header buttons missing from Import Products screen
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  mickie
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mickie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 This issue has been fixed.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1181>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 08:21:28 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 15:21:28 -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.7206c1d450847ef744129a5021ac4809@vtiger.fosslabs.com>

#723: Parent tab not highlighted
------------------------+---------------------------------------------------
  Reporter:  saraj      |       Owner:  mickie    
      Type:  defect     |      Status:  closed    
  Priority:  major      |   Milestone:  5.0.0     
 Component:  vtigercrm  |     Version:  5.0.0     
Resolution:  fixed      |    Keywords:  Parent tab
------------------------+---------------------------------------------------
Changes (by mickie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 This issue is fixed and now in the step3 the parent tab will be
 highlighted and the module name list will be displayed.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/723>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 08:22:11 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 15:22:11 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23169=3A_?=
 =?utf-8?q?missing_parent_tab_in_import_steps?=
In-Reply-To: <076.fa0e7db7145b84cd9df79a70a28c175a@vtiger.fosslabs.com>
References: <076.fa0e7db7145b84cd9df79a70a28c175a@vtiger.fosslabs.com>
Message-ID: <085.9556bfac4e2d7ee2d4863604e2223c23@vtiger.fosslabs.com>

#169: missing parent tab in import steps
---------------------------+------------------------------------------------
  Reporter:  jerrydgeorge  |       Owner:  mickie
      Type:  defect        |      Status:  closed
  Priority:  minor         |   Milestone:  5.0.0 
 Component:  vtigercrm     |     Version:  5.0.0 
Resolution:  fixed         |    Keywords:  import
---------------------------+------------------------------------------------
Changes (by mickie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 This issue has been fixed and now when we do import the parent tab and the
 module name will be selected.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/169>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 09:01:03 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 16:01:03 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7197 -
	/vtigercrm/trunk/modules/CustomView/CustomView.php
Message-ID: <20060616160103.891147ED35C@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 16 10:00:56 2006
New Revision: 7197

Log:
changes made to display status

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 Fri Jun 16 10:00:56 2006
@@ -678,7 +678,7 @@
 					{
 						if($list[1] == "status")
 						{
-							$sqllist_column = "case when (vtiger_activity.status not like '') then vtiger_activity.status else vtiger_activity.eventstatus end as vtiger_activitystatus";
+							$sqllist_column = "case when (vtiger_activity.status not like '') then vtiger_activity.status else vtiger_activity.eventstatus end as activitystatus";
 						}
 					}
 					$sqllist[] = $sqllist_column;



From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 09:39:26 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 16:39:26 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231331=3A?=
 =?utf-8?q?_rename_PearDatabase_to_signify_adodb_wrapper=2C_update_source?=
Message-ID: <076.b5a070e4cc46d3aaf4b69d4eea42547e@vtiger.fosslabs.com>

#1331: rename PearDatabase to signify adodb wrapper, update source
---------------------------------+------------------------------------------
 Reporter:  jeffk                |       Owner:  developer
     Type:  defect               |      Status:  new      
 Priority:  major                |   Milestone:  5.0.0    
Component:  vtigercrm            |     Version:  5.0.0    
 Keywords:  database adodb pear  |  
---------------------------------+------------------------------------------
 To clarify the primacy of adodb in the vtigercrm codebase, rename the
 PearDatabase file and class to something that properly indicates its adodb
 wrapper function.

 I'll leave suggested names up to someone who knows more about
 PearDatabase's function and origin.

 Please include 'refs #1331' in checkin messages, and 'closes #1331' when
 finished.
 {{{
 (in vtigercrm/trunk working copy)
 $ grep -R PearDatabase --exclude=*.svn* *
 Popup.php:require_once('include/database/PearDatabase.php');
 SendReminder.php:require_once("include/database/PearDatabase.php");
 data/Tracker.php:require_once('include/database/PearDatabase.php');
 data/Tracker.php:       //$this->db = new PearDatabase();
 data/SugarBean.php:require_once('include/database/PearDatabase.php');
 database/DatabaseConnection.php:                $log1->info("PearDatabase
 ->".$msg);
 include/database/.svn/entries:   name="PearDatabase.php"
 include/database/PearDatabase.php:class PearDatabase{
 include/database/PearDatabase.php:
 $log1->info("PearDatabase ->".$msg);
 include/database/PearDatabase.php:      function PearDatabase(){
 include/database/PearDatabase.php:
 //$this->println("PearDatabase");
 include/database/PearDatabase.php:                      $this->log =&
 LoggerManager::getLogger('PearDatabase_'. $currentModule);
 include/database/PearDatabase.php:      function
 PearDatabase($dbtype='',$host='',$dbname='',$username='',$passwd=''){
 include/database/PearDatabase.php:
 //$this->println("PearDatabase");
 include/database/PearDatabase.php:                      $this->log =&
 LoggerManager::getLogger('PearDatabase_'. $currentModule);
 include/database/PearDatabase.php:$adb = new PearDatabase();
 include/RelatedListView.php:
 require_once('include/database/PearDatabase.php');
 include/utils/ListViewUtils.php:require_once('include/database/PearDatabase.php');
 include/utils/DetailViewUtils.php:require_once('include/database/PearDatabase.php');
 include/utils/SearchUtils.php:require_once('include/database/PearDatabase.php');
 include/utils/UserInfoUtil.php:require_once('include/database/PearDatabase.php');
 include/utils/EditViewUtils.php:require_once('include/database/PearDatabase.php');
 include/utils/export.php:require_once('include/database/PearDatabase.php');
 include/utils/export.php:       $db = new PearDatabase();
 include/utils/CommonUtils.php:
 require_once('include/database/PearDatabase.php');
 include/utils/utils.php:
 require_once('include/database/PearDatabase.php');
 include/utils/utils.php:
 require_once('include/database/PearDatabase.php');
 include/utils/utils.php:                $db = new PearDatabase();
 include/ComboUtil.php:require_once('include/database/PearDatabase.php');
 include/PopulateComboValues.php:require_once('include/database/PearDatabase.php');
 include/CustomFieldUtil.php:require_once('include/database/PearDatabase.php');
 include/db_backup/backup.php:require_once("include/database/PearDatabase.php");
 install/5createTables.inc.php:require_once('include/database/PearDatabase.php');
 install/5createTables.inc.php:$db = new PearDatabase();
 install/populateSeedData.php:require_once('include/database/PearDatabase.php');
 install/populateSeedData.php: $db = new PearDatabase();
 modules/Faq/DetailView.php:require_once('include/database/PearDatabase.php');
 modules/Faq/ListView.php:require_once('include/database/PearDatabase.php');
 modules/Faq/DetailViewAjax.php:require_once('include/database/PearDatabase.php');
 modules/Faq/Faq.php:require_once('include/database/PearDatabase.php');
 modules/Faq/Faq.php:            $this->db = new PearDatabase();
 modules/Faq/Save.php:require_once('include/database/PearDatabase.php');
 modules/Rss/Star.php:require_once('include/database/PearDatabase.php');
 modules/Rss/Rss.php:require_once('include/database/PearDatabase.php');
 modules/Home/UnifiedSearch.php:require_once('include/database/PearDatabase.php');
 modules/Home/home_rss.php:require_once('include/database/PearDatabase.php');
 modules/Home/home_rss.php:$db = new PearDatabase();
 modules/Home/index.php:require_once('include/database/PearDatabase.php');
 modules/Vendors/updateRelations.php:require_once('include/database/PearDatabase.php');
 modules/Vendors/Vendor.php:require_once('include/database/PearDatabase.php');
 modules/Vendors/Vendor.php:             $this->db = new PearDatabase();
 modules/Vendors/DetailView.php:require_once('include/database/PearDatabase.php');
 modules/Vendors/EditView.php:require_once('include/database/PearDatabase.php');
 modules/Vendors/ListView.php:require_once('include/database/PearDatabase.php');
 modules/Vendors/DetailViewAjax.php:require_once('include/database/PearDatabase.php');
 modules/Vendors/Save.php:require_once('include/database/PearDatabase.php');
 modules/CustomView/PopulateCustomView.php:require_once('include/database/PearDatabase.php');
 modules/CustomView/Forms.php:
 require_once('include/database/PearDatabase.php');
 modules/CustomView/Forms.php:
 require_once("include/database/PearDatabase.php");
 modules/CustomView/CustomView.php:require_once('include/database/PearDatabase.php');
 modules/CustomView/SaveAction.php:require_once('include/database/PearDatabase.php');
 modules/CustomView/SendMailAction.php:require_once('include/database/PearDatabase.php');
 modules/CustomView/Delete.php:require_once('include/database/PearDatabase.php');
 modules/CustomView/Save.php:require_once('include/database/PearDatabase.php');
 modules/Emails/updateRelations.php:require_once('include/database/PearDatabase.php');
 modules/Emails/DetailView.php:require_once('include/database/PearDatabase.php');
 modules/Emails/Choose.php:require_once('include/database/PearDatabase.php');
 modules/Emails/sendmail.php:require_once('include/database/PearDatabase.php');
 modules/Emails/EmailsAjax.php:require_once('include/database/PearDatabase.php');
 modules/Emails/mailSelect.php:require_once('include/database/PearDatabase.php');
 modules/Emails/Save.php:require_once('include/database/PearDatabase.php');
 modules/Emails/Email.php:require_once('include/database/PearDatabase.php');
 modules/Emails/Email.php:               $this->db = new PearDatabase();
 modules/Migration/MigrationCheck.php:           $conn = new
 PearDatabase("mysql",$new_host_name,$new_dbname,$new_mysql_username,$new_mysql_password);
 modules/Migration/MigrationCheck.php:           $conn = new
 PearDatabase("mysql",$new_host_name,$new_dbname,$new_mysql_username,$new_mysql_password);
 modules/Migration/MigrationCheck.php:           $conn = new
 PearDatabase("mysql",$old_host_name.":".$old_mysql_port,$old_dbname,$old_mysql_username,$old_mysql_password);
 modules/Migration/updateCurrency.php:require_once("include/database/PearDatabase.php");
 modules/Migration/updateCurrency.php:$conn = new PearDatabase();
 modules/Accounts/Merge.php:require_once('include/database/PearDatabase.php');
 modules/Accounts/DetailView.php:require_once('include/database/PearDatabase.php');
 modules/Accounts/ListView.php:require_once('include/database/PearDatabase.php');
 modules/Accounts/DetailViewAjax.php:require_once('include/database/PearDatabase.php');
 modules/Accounts/Account.php:require_once('include/database/PearDatabase.php');
 modules/Accounts/Account.php:           $this->db = new PearDatabase();
 modules/Accounts/Save.php:require_once('include/database/PearDatabase.php');
 modules/Leads/Merge.php:require_once('include/database/PearDatabase.php');
 modules/Leads/ConvertLead.php:require_once('include/database/PearDatabase.php');
 modules/Leads/DetailView.php:require_once('include/database/PearDatabase.php');
 modules/Leads/EditView.php:require_once('include/database/PearDatabase.php');
 modules/Leads/ListView.php:require_once('include/database/PearDatabase.php');
 modules/Leads/DetailViewAjax.php:require_once('include/database/PearDatabase.php');
 modules/Leads/result.php:require_once('include/database/PearDatabase.php');
 modules/Leads/Save.php:require_once('include/database/PearDatabase.php');
 modules/Leads/LeadConvertToEntities.php:require_once('include/database/PearDatabase.php');
 modules/Leads/Lead.php:require_once('include/database/PearDatabase.php');
 modules/Leads/Lead.php:         $this->db = new PearDatabase();
 modules/Notes/DetailViewAjax.php:require_once('include/database/PearDatabase.php');
 modules/Notes/Note.php:require_once('include/database/PearDatabase.php');
 modules/Notes/Note.php:         $this->db = new PearDatabase();
 modules/Calendar/disable_sharing.php:require_once('include/database/PearDatabase.php');
 modules/Calendar/updateCalendarSharing.php:require_once('include/database/PearDatabase.php');
 modules/Calendar/calendar_share.php:require_once('include/database/PearDatabase.php');
 modules/Calendar/Appointment.php:require_once('include/database/PearDatabase.php');
 modules/Calendar/TodoSave.php:require_once('include/database/PearDatabase.php');
 modules/Calendar/calendarLayout.php:require_once('include/database/PearDatabase.php');
 modules/Calendar/CalendarCommon.php:require_once('include/database/PearDatabase.php');
 modules/Import/ImportAccount.php:require_once('include/database/PearDatabase.php');
 modules/Import/ImportAccount.php:               $this->db = new
 PearDatabase();
 modules/Import/ImportLead.php:require_once('include/database/PearDatabase.php');
 modules/Import/ImportLead.php:          $this->db = new PearDatabase();
 modules/Import/ImportStep2.php:require_once('include/database/PearDatabase.php');
 modules/Import/ImportStep3.php:require_once('include/database/PearDatabase.php');
 modules/Import/Forms.php:
 require_once('include/database/PearDatabase.php');
 modules/Import/Forms.php:
 require_once("include/database/PearDatabase.php");
 modules/Import/UsersLastImport.php:require_once('include/database/PearDatabase.php');
 modules/Import/UsersLastImport.php:             $this->db = new
 PearDatabase();
 modules/Import/ImportMap.php:require_once('include/database/PearDatabase.php');
 modules/Import/ImportMap.php:           $this->db = new PearDatabase();
 modules/Import/ImportOpportunity.php:require_once('include/database/PearDatabase.php');
 modules/Import/ImportOpportunity.php:           $this->db = new
 PearDatabase();
 modules/Import/ImportContact.php:require_once('include/database/PearDatabase.php');
 modules/Import/ImportContact.php:               $this->db = new
 PearDatabase();
 modules/Import/ImportProduct.php:require_once('include/database/PearDatabase.php');
 modules/Import/ImportProduct.php:               $this->db = new
 PearDatabase();
 modules/Users/UpdateProfileChanges.php:require_once('include/database/PearDatabase.php');
 modules/Users/SaveSharingRule.php:require_once('include/database/PearDatabase.php');
 modules/Users/savetermsandconditions.php:require_once('include/database/PearDatabase.php');
 modules/Users/add2db.php:require_once('include/database/PearDatabase.php');
 modules/Users/RoleDeleteStep1.php:require_once('include/database/PearDatabase.php');
 modules/Users/listwordtemplates.php:require_once('include/database/PearDatabase.php');
 modules/Users/CreateProfile.php:require_once('include/database/PearDatabase.php');
 modules/Users/listemailtemplates.php:require_once('include/database/PearDatabase.php');
 modules/Users/UpdateTab.php:require_once('include/database/PearDatabase.php');
 modules/Users/DefaultDataPopulator.php:require_once('include/database/PearDatabase.php');
 modules/Users/DefaultDataPopulator.php:         $this->db = new
 PearDatabase();
 modules/Users/binaryfilelist.php:require_once('include/database/PearDatabase.php');
 modules/Users/listgroups.php:require_once('include/database/PearDatabase.php');
 modules/Users/lookupemailtemplates.php:require_once('include/database/PearDatabase.php');
 modules/Users/EditDefOrgFieldLevelAccess.php:require_once('include/database/PearDatabase.php');
 modules/Users/updateLeadDBStatus.php:require_once('include/database/PearDatabase.php');
 modules/Users/DetailView.php:require_once('include/database/PearDatabase.php');
 modules/Users/DefaultFieldPermissions.php:require_once('include/database/PearDatabase.php');
 modules/Users/UpdateDefaultFieldLevelAccess.php:require_once('include/database/PearDatabase.php');
 modules/Users/EditView.php:require_once('include/database/PearDatabase.php');
 modules/Users/populatetemplate.php:require_once('include/database/PearDatabase.php');
 modules/Users/CreateProfile1.php:require_once('include/database/PearDatabase.php');
 modules/Users/createemailtemplate.php:require_once('include/database/PearDatabase.php');
 modules/Users/SaveRole.php:require_once('include/database/PearDatabase.php');
 modules/Users/SaveOrgSharing.php:require_once('include/database/PearDatabase.php');
 modules/Users/SaveInventoryNotification.php:require_once('include/database/PearDatabase.php');
 modules/Users/User.php:require_once('include/database/PearDatabase.php');
 modules/Users/User.php:         $this->db = new PearDatabase();
 modules/Users/ShowHistory.php:require_once('include/database/PearDatabase.php');
 modules/Users/OrganizationTermsandConditions.php:require_once('include/database/PearDatabase.php');
 modules/Users/createrole.php:require_once('include/database/PearDatabase.php');
 modules/Users/saveemailtemplate.php:require_once('include/database/PearDatabase.php');
 modules/Users/saveemailtemplate.php:$db = new PearDatabase();
 modules/Users/UserDeleteStep1.php:require_once('include/database/PearDatabase.php');
 modules/Users/upload.php:require_once('include/database/PearDatabase.php');
 modules/Users/editemailtemplate.php:require_once('include/database/PearDatabase.php');
 modules/Users/detailviewemailtemplate.php:require_once('include/database/PearDatabase.php');
 modules/Users/createnewgroup.php:require_once('include/database/PearDatabase.php');
 modules/Users/ListProfiles.php:require_once('include/database/PearDatabase.php');
 modules/Users/GroupDetailView.php:require_once('include/database/PearDatabase.php');
 modules/Users/RoleDetailView.php:require_once('include/database/PearDatabase.php');
 modules/Users/SaveProfile.php:require_once('include/database/PearDatabase.php');
 modules/Users/SaveGroup.php:require_once('include/database/PearDatabase.php');
 modules/Users/Logout.php:require_once('include/database/PearDatabase.php');
 modules/Users/about_us.php:require_once('include/database/PearDatabase.php');
 modules/Users/CreateSharingRule.php:require_once('include/database/PearDatabase.php');
 modules/Users/listinventorynotifications.php:require_once('include/database/PearDatabase.php');
 modules/Users/downloadfile.php:require_once('include/database/PearDatabase.php');
 modules/Users/LoginHistory.php:require_once('include/database/PearDatabase.php');
 modules/Users/LoginHistory.php:         $this->db = new PearDatabase();
 modules/Users/SaveNotification.php:require_once('include/database/PearDatabase.php');
 modules/Users/massdelete.php:require_once('include/database/PearDatabase.php');
 modules/Users/TabCustomise.php:require_once('include/database/PearDatabase.php');
 modules/Users/ProfileDeleteStep1.php:require_once('include/database/PearDatabase.php');
 modules/Users/listnotificationschedulers.php:require_once('include/database/PearDatabase.php');
 modules/SalesOrder/CreateSOPDF.php:require_once('include/database/PearDatabase.php');
 modules/SalesOrder/DetailView.php:require_once('include/database/PearDatabase.php');
 modules/SalesOrder/ListView.php:require_once('include/database/PearDatabase.php');
 modules/SalesOrder/DetailViewAjax.php:require_once('include/database/PearDatabase.php');
 modules/SalesOrder/ListTopSalesOrder.php:
 require_once('include/database/PearDatabase.php');
 modules/SalesOrder/Save.php:require_once('include/database/PearDatabase.php');
 modules/SalesOrder/SalesOrder.php:require_once('include/database/PearDatabase.php');
 modules/SalesOrder/SalesOrder.php: *  creates an instance for PearDatabase
 class and get values for column_fields array of SalesOrder class.
 modules/SalesOrder/SalesOrder.php:              $this->db = new
 PearDatabase();
 modules/Contacts/Merge.php:require_once('include/database/PearDatabase.php');
 modules/Contacts/chat.php:require_once('include/database/PearDatabase.php');
 modules/Contacts/DetailView.php:require_once('include/database/PearDatabase.php');
 modules/Contacts/DetailViewAjax.php:require_once('include/database/PearDatabase.php');
 modules/Contacts/contactSeedData.php:require_once('include/database/PearDatabase.php');
 modules/Contacts/Contact.php:require_once('include/database/PearDatabase.php');
 modules/Contacts/Contact.php:           $this->db = new PearDatabase();
 modules/Contacts/Save.php:require_once('include/database/PearDatabase.php');
 modules/Quotes/DetailView.php:require_once('include/database/PearDatabase.php');
 modules/Quotes/ListTopQuotes.php:
 require_once('include/database/PearDatabase.php');
 modules/Quotes/ListView.php:require_once('include/database/PearDatabase.php');
 modules/Quotes/DetailViewAjax.php:require_once('include/database/PearDatabase.php');
 modules/Quotes/CreatePDF.php:require_once('include/database/PearDatabase.php');
 modules/Quotes/Save.php:require_once('include/database/PearDatabase.php');
 modules/Quotes/Quote.php:require_once('include/database/PearDatabase.php');
 modules/Quotes/Quote.php:               $this->db = new PearDatabase();
 modules/Potentials/updateRelations.php:require_once('include/database/PearDatabase.php');
 modules/Potentials/DetailViewAjax.php:require_once('include/database/PearDatabase.php');
 modules/Potentials/Opportunity.php:require_once('include/database/PearDatabase.php');
 modules/Potentials/Opportunity.php:             $this->db = new
 PearDatabase();
 modules/Potentials/Save.php:require_once('include/database/PearDatabase.php');
 modules/Invoice/ListTopInvoice.php:
 require_once('include/database/PearDatabase.php');
 modules/Invoice/DetailView.php:require_once('include/database/PearDatabase.php');
 modules/Invoice/ListView.php:require_once('include/database/PearDatabase.php');
 modules/Invoice/DetailViewAjax.php:require_once('include/database/PearDatabase.php');
 modules/Invoice/Invoice.php:require_once('include/database/PearDatabase.php');
 modules/Invoice/Invoice.php:            $this->db = new PearDatabase();
 modules/Invoice/CreatePDF.php:require_once('include/database/PearDatabase.php');
 modules/Invoice/Save.php:require_once('include/database/PearDatabase.php');
 modules/Activities/updateRelations.php:require_once('include/database/PearDatabase.php');
 modules/Activities/Event.php:require_once('include/database/PearDatabase.php');
 modules/Activities/Event.php:           $this->db = new PearDatabase();
 modules/Activities/Activity.php:require_once('include/database/PearDatabase.php');
 modules/Activities/Activity.php:                $this->db = new
 PearDatabase();
 modules/Activities/DetailView.php:require_once('include/database/PearDatabase.php');
 modules/Activities/EditView.php:require_once('include/database/PearDatabase.php');
 modules/Activities/ListView.php:require_once('include/database/PearDatabase.php');
 modules/Activities/DetailViewAjax.php:require_once('include/database/PearDatabase.php');
 modules/Activities/Save.php:require_once('include/database/PearDatabase.php');
 modules/PurchaseOrder/DetailView.php:require_once('include/database/PearDatabase.php');
 modules/PurchaseOrder/ListView.php:require_once('include/database/PearDatabase.php');
 modules/PurchaseOrder/DetailViewAjax.php:require_once('include/database/PearDatabase.php');
 modules/PurchaseOrder/PurchaseOrder.php:require_once('include/database/PearDatabase.php');
 modules/PurchaseOrder/PurchaseOrder.php: *  creates an instance for
 PearDatabase class and get values for column_fields array of Order class.
 modules/PurchaseOrder/PurchaseOrder.php:                $this->db = new
 PearDatabase();
 modules/PurchaseOrder/CreatePDF.php:require_once('include/database/PearDatabase.php');
 modules/PurchaseOrder/Save.php:require_once('include/database/PearDatabase.php');
 modules/Reports/ChangeFolder.php:require_once('include/database/PearDatabase.php');
 modules/Reports/ReportGrouping.php:require_once('include/database/PearDatabase.php');
 modules/Reports/SaveReport0.php:require_once('include/database/PearDatabase.php');
 modules/Reports/PopulateReports.php:require_once('include/database/PearDatabase.php');
 modules/Reports/DeleteReportFolder.php:require_once('include/database/PearDatabase.php');
 modules/Reports/ReportType.php:require_once('include/database/PearDatabase.php');
 modules/Reports/ReportColumnsTotal.php:require_once('include/database/PearDatabase.php');
 modules/Reports/Delete.php:require_once('include/database/PearDatabase.php');
 modules/Reports/SaveAndRun.php:require_once('include/database/PearDatabase.php');
 modules/Reports/ReportRun.php:require_once('include/database/PearDatabase.php');
 modules/Reports/ReportColumns.php:require_once('include/database/PearDatabase.php');
 modules/Reports/ReportFilters.php:require_once('include/database/PearDatabase.php');
 modules/Reports/Reports.php:require_once('include/database/PearDatabase.php');
 modules/Reports/Save.php:require_once('include/database/PearDatabase.php');
 modules/Reports/SaveReportFolder.php:require_once('include/database/PearDatabase.php');
 modules/Campaigns/updateRelations.php:require_once('include/database/PearDatabase.php');
 modules/Campaigns/DetailView.php:require_once('include/database/PearDatabase.php');
 modules/Campaigns/Campaign.php:require_once('include/database/PearDatabase.php');
 modules/Campaigns/Campaign.php:         $this->db = new PearDatabase();
 modules/Campaigns/EditView.php:require_once('include/database/PearDatabase.php');
 modules/Campaigns/ListView.php:require_once('include/database/PearDatabase.php');
 modules/Campaigns/DetailViewAjax.php:require_once('include/database/PearDatabase.php');
 modules/Campaigns/Save.php:require_once('include/database/PearDatabase.php');
 modules/Settings/add2db.php:require_once('include/database/PearDatabase.php');
 modules/Settings/SaveConvertLead.php:require_once('include/database/PearDatabase.php');
 modules/Settings/PickList.php:require_once('include/database/PearDatabase.php');
 modules/Settings/ListMailAccount.php:require_once('include/database/PearDatabase.php');
 modules/Settings/SaveMailAccount.php:require_once("include/database/PearDatabase.php");
 modules/Settings/DeleteLeadCustomFieldMapping.php:require_once('include/database/PearDatabase.php');
 modules/Settings/UpdateComboValues.php:require_once('include/database/PearDatabase.php');
 modules/Settings/EditComboField.php:require_once('include/database/PearDatabase.php');
 modules/Settings/SaveCompany.php:require_once("include/database/PearDatabase.php");
 modules/Settings/DeleteCustomField.php:require_once('include/database/PearDatabase.php');
 modules/Settings/CurrencyDeleteStep1.php:require_once('include/database/PearDatabase.php');
 modules/Settings/CustomFieldList.php:require_once('include/database/PearDatabase.php');
 modules/Settings/AddCustomFieldToDB.php:require_once('include/database/PearDatabase.php');
 modules/Settings/Save.php:require_once("include/database/PearDatabase.php");
 modules/Settings/downloadfile.php:require_once('include/database/PearDatabase.php');
 modules/Settings/SaveCurrencyInfo.php:require_once('include/database/PearDatabase.php');
 modules/Settings/SaveCurrencyInfo.php:$db = new PearDatabase();
 modules/Settings/CurrencyListView.php:require_once('include/database/PearDatabase.php');
 modules/Products/updateRelations.php:require_once('include/database/PearDatabase.php');
 modules/Products/DetailView.php:require_once('include/database/PearDatabase.php');
 modules/Products/EditView.php:require_once('include/database/PearDatabase.php');
 modules/Products/AddProductToPriceBooks.php:require_once('include/database/PearDatabase.php');
 modules/Products/ListView.php:require_once('include/database/PearDatabase.php');
 modules/Products/AddProductsToPriceBook.php:require_once('include/database/PearDatabase.php');
 modules/Products/DetailViewAjax.php:require_once('include/database/PearDatabase.php');
 modules/Products/addPbProductRelToDB.php:require_once('include/database/PearDatabase.php');
 modules/Products/Product.php:require_once('include/database/PearDatabase.php');
 modules/Products/Product.php:           $this->db = new PearDatabase();
 modules/Products/Save.php:require_once('include/database/PearDatabase.php');
 modules/Webmails/Webmail.php:require_once('include/database/PearDatabase.php');
 modules/Webmails/Webmail.php:           $this->db = new PearDatabase();
 modules/Webmails/CallRelatedList.php:require_once('include/database/PearDatabase.php');
 modules/Webmails/Save.php:require_once('include/database/PearDatabase.php');
 modules/Webmails/WebmailsAjax.php:require_once('include/database/PearDatabase.php');
 modules/Utilities/Merge.php:require_once('include/database/PearDatabase.php');
 modules/uploads/add2db.php:require_once('include/database/PearDatabase.php');
 modules/uploads/deleteattachments.php:require_once('include/database/PearDatabase.php');
 modules/uploads/downloadfile.php:require_once('include/database/PearDatabase.php');
 modules/HelpDesk/TicketStatisticsUtil.php:require_once('include/database/PearDatabase.php');
 modules/HelpDesk/CumulStatistics.php:require_once('include/database/PearDatabase.php');
 modules/HelpDesk/Merge.php:require_once('include/database/PearDatabase.php');
 modules/HelpDesk/DetailView.php:require_once('include/database/PearDatabase.php');
 modules/HelpDesk/EditView.php:require_once('include/database/PearDatabase.php');
 modules/HelpDesk/ListView.php:require_once('include/database/PearDatabase.php');
 modules/HelpDesk/DetailViewAjax.php:require_once('include/database/PearDatabase.php');
 modules/HelpDesk/Convert.php:require_once('include/database/PearDatabase.php');
 modules/HelpDesk/HelpDesk.php:require_once('include/database/PearDatabase.php');
 modules/HelpDesk/HelpDesk.php:          $this->db = new PearDatabase();
 modules/HelpDesk/Save.php:require_once('include/database/PearDatabase.php');
 modules/HelpDesk/ConvertToEntities.php:require_once('include/database/PearDatabase.php');
 modules/Dashboard/Entity_charts.php:require_once('include/database/PearDatabase.php');
 modules/PriceBooks/DetailView.php:require_once('include/database/PearDatabase.php');
 modules/PriceBooks/EditView.php:require_once('include/database/PearDatabase.php');
 modules/PriceBooks/ListView.php:require_once('include/database/PearDatabase.php');
 modules/PriceBooks/DetailViewAjax.php:require_once('include/database/PearDatabase.php');
 modules/PriceBooks/PriceBook.php:require_once('include/database/PearDatabase.php');
 modules/PriceBooks/PriceBook.php:               $this->db = new
 PearDatabase();
 modules/PriceBooks/Save.php:require_once('include/database/PearDatabase.php');
 soap/vtigerolservice.php:require_once('include/database/PearDatabase.php');
 soap/vtigerolservice.php:         $db = new PearDatabase();
 soap/contactserialize.php:require_once('include/database/PearDatabase.php');
 soap/contactserialize.php:    $db = new PearDatabase();
 soap/contactserialize.php:      $db = new PearDatabase();
 soap/webforms.php:require_once('include/database/PearDatabase.php');
 }}}

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1331>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 13:31:15 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 20:31:15 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23748=3A_?=
 =?utf-8?q?Eliminate_php_notice_errors?=
In-Reply-To: <076.c75696aed703c24c8b151bd87264b9e6@vtiger.fosslabs.com>
References: <076.c75696aed703c24c8b151bd87264b9e6@vtiger.fosslabs.com>
Message-ID: <085.a7b9cec150407e651633c58d16007b4e@vtiger.fosslabs.com>

#748: Eliminate php notice errors
------------------------+---------------------------------------------------
  Reporter:  allanbush  |       Owner:  jrydbeck
      Type:  task       |      Status:  new     
  Priority:  minor      |   Milestone:  4.2.5   
 Component:  vtigercrm  |     Version:  4.2.4rc3
Resolution:             |    Keywords:          
------------------------+---------------------------------------------------
Changes (by jrydbeck):

  * status:  assigned => new
  * owner:  anonymous => jrydbeck

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/748>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 13:31:42 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 20:31:42 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23748=3A_?=
 =?utf-8?q?Eliminate_php_notice_errors?=
In-Reply-To: <076.c75696aed703c24c8b151bd87264b9e6@vtiger.fosslabs.com>
References: <076.c75696aed703c24c8b151bd87264b9e6@vtiger.fosslabs.com>
Message-ID: <085.365107f52bd89862eaa4e23f9e6e9f53@vtiger.fosslabs.com>

#748: Eliminate php notice errors
------------------------+---------------------------------------------------
  Reporter:  allanbush  |       Owner:  jrydbeck
      Type:  task       |      Status:  assigned
  Priority:  minor      |   Milestone:  4.2.5   
 Component:  vtigercrm  |     Version:  4.2.4rc3
Resolution:             |    Keywords:          
------------------------+---------------------------------------------------
Changes (by jrydbeck):

  * status:  new => assigned

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/748>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 14:12:31 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 21:12:31 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7199 - in
 /vtigercrm/branches/4.2: include/database/PearDatabase.php
 include/utils.php modules/Activities/OpenListView.php
 modules/CustomView/CustomView.php modules/Users/UserInfoUtil.php
 themes/blue/header.php themes/orange/header.php
Message-ID: <20060616211232.488BF7ED396@vtiger.fosslabs.com>

Author: jrydbeck
Date: Fri Jun 16 15:12:22 2006
New Revision: 7199

Log:
Multiple-file update to remove notices. There's still a ways to go, but this is starting to wrap up bug #748. Header files for other themes will need these updates.

Modified:
    vtigercrm/branches/4.2/include/database/PearDatabase.php
    vtigercrm/branches/4.2/include/utils.php
    vtigercrm/branches/4.2/modules/Activities/OpenListView.php
    vtigercrm/branches/4.2/modules/CustomView/CustomView.php
    vtigercrm/branches/4.2/modules/Users/UserInfoUtil.php
    vtigercrm/branches/4.2/themes/blue/header.php
    vtigercrm/branches/4.2/themes/orange/header.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 Fri Jun 16 15:12:22 2006
@@ -437,15 +437,17 @@
 
 	function query_result(&$result, $row, $col=0)
 	{		
-		//$this->println("ADODB query_result r=".$row." c=".$col);
-		$result->Move($row);
-		$rowdata = $this->change_key_case($result->FetchRow());
-		//$this->println($rowdata);
-		$coldata = to_html($rowdata[$col]);
-		//$this->println("ADODB query_result ". $coldata);
-		return $coldata;
-	}
-	
+		if($result->_numOfRows > $row)
+		{
+			$result->Move($row);
+			$rowdata = $this->change_key_case($result->FetchRow());
+			return to_html($rowdata[$col]);
+		}
+		else
+		{
+			return to_html(null);
+		}
+	}
 
 	/* ADODB Converted	
 	function getAffectedRowCount(&$result){

Modified: vtigercrm/branches/4.2/include/utils.php
==============================================================================
--- vtigercrm/branches/4.2/include/utils.php (original)
+++ vtigercrm/branches/4.2/include/utils.php Fri Jun 16 15:12:22 2006
@@ -3029,8 +3029,8 @@
 //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 $app_strings;
+	global $adb, $theme, $app_strings;
+	
 	$noofrows = $adb->num_rows($list_result);
 	$list_header = '<script>
 			function confirmdelete(url)
@@ -3041,32 +3041,35 @@
 				}
 			}
 		</script>';
-	global $theme;
-	$evt_status;
 	$theme_path="themes/".$theme."/";
 	$image_path=$theme_path."images/";
 
 	//getting the fieldtable entries from database
 	$tabid = getTabid($module);
-	
+
 	//added for customview 27/5
 	if($oCv)
-        {
-                if(isset($oCv->list_fields))
-                {
-                        $focus->list_fields = $oCv->list_fields;
-                }
-        }
+	{
+		if(isset($oCv->list_fields))
+		{
+			$focus->list_fields = $oCv->list_fields;
+		}
+	}
 
 	$relmodule = ($_REQUEST['module'] == $module || !$relatedlist) || $_REQUEST['module'] == 'Home' ? '' : $module;
 	$start = $relmodule.'start';
-	$end_val = $relmodule.'end_val'; 
+	$end_val = $relmodule.'end_val';
+	
 	for ($i=$navigation_array[$start]; $i<=$navigation_array[$end_val]; $i++)
 	{
 		if (($i%2)==0)
+		{
 			$list_header .= '<tr height=20 class=evenListRow>';
+		}
 		else
+		{
 			$list_header .= '<tr height=20 class=oddListRow>';
+		}
 
 		//Getting the entityid
 		$entity_id = $adb->query_result($list_result,$i-1,"crmid");
@@ -3079,163 +3082,163 @@
 		}
 		$list_header .= '<td WIDTH="1" class="blackLine"><IMG SRC="'.$image_path.'blank.gif"></td>';
 		$names = get_field_list($focus, $oCv, $tabid);
-			
+
 
 		foreach($names as $fieldname=>$data) {
 			list($name, $is_column) = $data;
 
 			if($is_column)
+			{
+				$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");
+					if($status == '')
+					$status = $adb->query_result($list_result,$i-1,"eventstatus");
+					if ($name=='Related to')
+					$value=getRelatedTo($module,$list_result,$i-1);
+					if($name=='Contact Name')
+
 					{
-				$value = $adb->query_result($list_result,$i-1,$fieldname);
+						$first_name = $adb->query_result($list_result,$i-1,"firstname");
+						$last_name = $adb->query_result($list_result,$i-1,"lastname");
+						$contact_id = $adb->query_result($list_result,$i-1,"contactid");
+						$contact_name = "";
+						$value="";
+						if($last_name != 'NULL')
+						$contact_name .= $last_name;
+						if($first_name != 'NULL')
+						$contact_name .= " ".$first_name;
+						//Added to get the contactname for activities custom view - t=2190
+						if($contact_id != '' && $last_name == '')
+						{
+							$contact_name = getContactName($contact_id);
+						}
+
+						if(($contact_name != "") && ($contact_id !='NULL'))
+						$value =  "<a href='index.php?module=Contacts&action=DetailView&record=".$contact_id."'>".$contact_name."</a>";
+					}
+					if ($name == 'Close')
+
+					{
+						if($status =='Deferred' || $status == 'Completed' || $status == 'Held' || $status == '')
+						{
+							$value="";
+						}
+						else
+						{
+							$activityid = $adb->query_result($list_result,$i-1,"activityid");
+							$activitytype = $adb->query_result($list_result,$i-1,"activitytype");
+							if($activitytype=='Task')
+							$evt_status='&status=Completed';
+							else
+							$evt_status='&eventstatus=Held';
+							if(isPermitted("Activities",1,$activityid) == 'yes')
+
+							{
+								$value = "<a href='index.php?return_module=Activities&return_action=index&return_id=".$activityid."&action=Save&module=Activities&record=".$activityid."&change_status=true".$evt_status."'>X</a>";
+							}
+							else
+							{
+								$value = "";
+							}
+						}
+					}
+				}
+				elseif($module == "Products" && $name == "Related to")
+				{
+					$value=getRelatedTo($module,$list_result,$i-1);
+				}
+				elseif($module == 'Notes' && $name=='Related to')
+				{
+					$value=getRelatedTo($module,$list_result,$i-1);
+				}
+				elseif($name=='Account Name')
+				{
+					//modified for customview 27/5
+					if($module == 'Accounts')
+					{
+						$account_id = $adb->query_result($list_result,$i-1,"crmid");
+						$account_name = getAccountName($account_id);
+						$value = '<a href="index.php?module=Accounts&action=DetailView&record='.$account_id.'">'.$account_name.'</a>';
+					}else
+					{
+						$account_id = $adb->query_result($list_result,$i-1,"accountid");
+						$account_name = getAccountName($account_id);
+						$value = '<a href="index.php?module=Accounts&action=DetailView&record='.$account_id.'">'.$account_name.'</a>';
+					}
+				}
+				elseif(($module == 'HelpDesk' || $module == 'PriceBook' || $module == 'Quotes' || $module == 'Orders' || $module == 'Faq') && $name == 'Product Name')
+				{
+					if($module == 'HelpDesk' || $module == 'Faq')
+					$product_id = $adb->query_result($list_result,$i-1,"product_id");
+					else
+					$product_id = $adb->query_result($list_result,$i-1,"productid");
+
+					if($product_id != '')
+					$product_name = getProductName($product_id);
+					else
+					$product_name = '';
+
+					$value = '<a href="index.php?module=Products&action=DetailView&record='.$product_id.'">'.$product_name.'</a>';
+				}
+				elseif($module == 'Quotes' && $name == 'Potential Name')
+				{
+					$potential_id = $adb->query_result($list_result,$i-1,"potentialid");
+					if('' != $potential_id) {
+						$potential_name = getPotentialName($potential_id);
+						$value = '<a href="index.php?module=Potentials&action=DetailView&record='.$potential_id.'">'.$potential_name.'</a>';
+					}
+				}
+				elseif($owner_id == 0 && $name == 'Assigned To')
+				{
+					$value = getGroupName($entity_id, $module);
 				}
 				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");
-						if($status == '')
-                                                $status = $adb->query_result($list_result,$i-1,"eventstatus");
-						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");
-							$contact_id = $adb->query_result($list_result,$i-1,"contactid");
-							$contact_name = "";
-							$value="";
-							if($last_name != 'NULL')
-								$contact_name .= $last_name;
-							if($first_name != 'NULL')
-								$contact_name .= " ".$first_name;
-							//Added to get the contactname for activities custom view - t=2190
-                                                        if($contact_id != '' && $last_name == '')
-                                                        {
-                                                                $contact_name = getContactName($contact_id);
-                                                        }
-							
-							if(($contact_name != "") && ($contact_id !='NULL'))
-								$value =  "<a href='index.php?module=Contacts&action=DetailView&record=".$contact_id."'>".$contact_name."</a>";
-						}
-						if ($name == 'Close')
-
-						{
-							if($status =='Deferred' || $status == 'Completed' || $status == 'Held' || $status == '')
-							{
-								$value="";
-							}
-							else
-							{
-								$activityid = $adb->query_result($list_result,$i-1,"activityid");
-								$activitytype = $adb->query_result($list_result,$i-1,"activitytype");
-                                                                if($activitytype=='Task')
-                                                                $evt_status='&status=Completed';
-                                                                else
-                                                                $evt_status='&eventstatus=Held';
-								if(isPermitted("Activities",1,$activityid) == 'yes')
-
-                        					{
-                                                                	$value = "<a href='index.php?return_module=Activities&return_action=index&return_id=".$activityid."&action=Save&module=Activities&record=".$activityid."&change_status=true".$evt_status."'>X</a>";
-								}
-								else
-								{
-									$value = "";
-								}
-							}
-						}
-					}
-					elseif($module == "Products" && $name == "Related to")
-                                        {
-                                                $value=getRelatedTo($module,$list_result,$i-1);
-                                        }
-					elseif($module == 'Notes' && $name=='Related to')
-					{
-						$value=getRelatedTo($module,$list_result,$i-1);
-					}
-					elseif($name=='Account Name')
-					{
-						//modified for customview 27/5
-						if($module == 'Accounts')
-                                                {
-                                                	$account_id = $adb->query_result($list_result,$i-1,"crmid");
-                                                	$account_name = getAccountName($account_id);
-                                                	$value = '<a href="index.php?module=Accounts&action=DetailView&record='.$account_id.'">'.$account_name.'</a>';
-                                                }else
-                                                {
-                                                	$account_id = $adb->query_result($list_result,$i-1,"accountid");
-                                                	$account_name = getAccountName($account_id);
-                                                	$value = '<a href="index.php?module=Accounts&action=DetailView&record='.$account_id.'">'.$account_name.'</a>';
-                                                }
-					}
-					elseif(($module == 'HelpDesk' || $module == 'PriceBook' || $module == 'Quotes' || $module == 'Orders' || $module == 'Faq') && $name == 'Product Name')
-					{
-						if($module == 'HelpDesk' || $module == 'Faq')
-							$product_id = $adb->query_result($list_result,$i-1,"product_id");
-						else
-							$product_id = $adb->query_result($list_result,$i-1,"productid");
-
-						if($product_id != '')
-							$product_name = getProductName($product_id);
-						else
-                                                        $product_name = '';
-
-						$value = '<a href="index.php?module=Products&action=DetailView&record='.$product_id.'">'.$product_name.'</a>';
-					}
-					elseif($module == 'Quotes' && $name == 'Potential Name')
-					{
-						$potential_id = $adb->query_result($list_result,$i-1,"potentialid");
-						if('' != $potential_id) {
-							$potential_name = getPotentialName($potential_id);
-							$value = '<a href="index.php?module=Potentials&action=DetailView&record='.$potential_id.'">'.$potential_name.'</a>';
-						}
-					}
-					elseif($owner_id == 0 && $name == 'Assigned To')
-                                        {
-                                               $value = getGroupName($entity_id, $module);
-                                       }
-				       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 == "<a href='index.php?return_module=Activities&return_action=index&return_id=".$activityid."&action=Save&module=Activities&record=".$activityid."&change_status=true&status=Completed'>X</a>")
-				if($name == $app_strings['Close'] && $relatedlist != '')
-				{
-					$list_header .= '';
-				}
-				else
-				{
-					$list_header .= '<td height="21" style="padding:0px 3px 0px 3px;">'.$value.'</td>';
-					$list_header .='<td WIDTH="1" class="blackLine" NOWRAP><IMG SRC="'.$image_path.'blank.gif"></td>';
-				}
-				if($fieldname=='filename')
-				{
-					$filename = $adb->query_result($list_result,$list_result_count,$fieldname);
+					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 == "<a href='index.php?return_module=Activities&return_action=index&return_id=".$activityid."&action=Save&module=Activities&record=".$activityid."&change_status=true&status=Completed'>X</a>")
+			if($name == $app_strings['Close'] && $relatedlist != '')
+			{
+				$list_header .= '';
+			}
+			else
+			{
+				$list_header .= '<td height="21" style="padding:0px 3px 0px 3px;">'.$value.'</td>';
+				$list_header .='<td WIDTH="1" class="blackLine" NOWRAP><IMG SRC="'.$image_path.'blank.gif"></td>';
+			}
+			if($fieldname=='filename')
+			{
+				$filename = $adb->query_result($list_result,$list_result_count,$fieldname);
+			}
+		}
 
 		if($returnset=='')
-			$returnset = '&return_module='.$module.'&return_action=index';
+		$returnset = '&return_module='.$module.'&return_action=index';
 
 		if($module == 'Activities')
 		{
 			$actvity_type = $adb->query_result($list_result,$list_result_count,'activitytype');
 			if($actvity_type == 'Task')
-				$returnset .= '&activity_mode=Task';
+			$returnset .= '&activity_mode=Task';
 			else
-				$returnset .= '&activity_mode=Events';
+			$returnset .= '&activity_mode=Events';
 		}
 		$list_header .= '<td style="padding:0px 3px 0px 3px;">';
 		$mod_dir=getModuleDirName($module);
 		if(isPermitted($module,1,$entity_id) == 'yes')
 		{
-			
-			
+
+
 			$list_header .='<a href="index.php?action='.$edit_action.'&module='.$mod_dir.'&record='.$entity_id.$returnset.'&filename='.$filename.'">'.$app_strings['LNK_EDIT'].'</a>&nbsp;|&nbsp;';
 		}
 		if(isPermitted($module,2,$entity_id) == 'yes')
@@ -4130,24 +4133,25 @@
 
 function getQuickCreate($tabid,$actionid)
 {
-        $QuickCreateForm= 'true';
-
-        $profile_id = $_SESSION['authenticated_user_profileid'];
-        $tab_per_Data = getAllTabsPermission($profile_id);
-
-        $permissionData = $_SESSION['action_permission_set'];
-
-        if($tab_per_Data[$tabid] !=0)
-        {
-                $QuickCreateForm= 'false';
-        }
-        if($permissionData[$tabid][1] !=0)
-        {
-                $QuickCreateForm= 'false';
-        }
+	$QuickCreateForm= 'true';
+
+	$profile_id = $_SESSION['authenticated_user_profileid'];
+	$tab_per_Data = getAllTabsPermission($profile_id);
+
+	$permissionData = $_SESSION['action_permission_set'];
+
+	if(isset($tab_per_Data[$tabid]) && $tab_per_Data[$tabid] !=0)
+	{
+		$QuickCreateForm= 'false';
+	}
+	if(isset($permissionData[$tabid][1]) && $permissionData[$tabid][1] !=0)
+	{
+		$QuickCreateForm= 'false';
+	}
+
 	return $QuickCreateForm;
-
-}
+}
+
 function ChangeStatus($status,$activityid,$activity_mode='')
  {
 	global $vtlog;
@@ -4220,33 +4224,37 @@
 {
 	global $current_user;
 	$dat_fmt = $current_user->date_format;
+
+	if($dat_fmt == '')
+	{
+		$dat_fmt = 'dd-mm-yyyy';
+	}
+
+	$date_value = explode(' ',$cur_date_val);
+	$display_date = '--';
 	
-	if($dat_fmt == '')
-	{
-		$dat_fmt = 'dd-mm-yyyy';
-	}
-
-	$date_value = explode(' ',$cur_date_val);
-	list($y,$m,$d) = split('-',$date_value[0]);
-
-	if($dat_fmt == 'dd-mm-yyyy')
-	{
-		$display_date = $d.'-'.$m.'-'.$y;
-	}
-	elseif($dat_fmt == 'mm-dd-yyyy')
-	{
-		$display_date = $m.'-'.$d.'-'.$y;
-	}
-	elseif($dat_fmt == 'yyyy-mm-dd')
-	{
-		$display_date = $y.'-'.$m.'-'.$d;
-	}
-
-	if(isset($date_value[1]) && $date_value[1] != '')
-	{
-		$display_date = $display_date.' '.$date_value[1];
-	}
-	
+	if(isset($date_value[0]) && $date_value[0] != 0)
+	{
+		list($y,$m,$d) = split('-',$date_value[0]);
+
+		if($dat_fmt == 'dd-mm-yyyy')
+		{
+			$display_date = $d.'-'.$m.'-'.$y;
+		}
+		elseif($dat_fmt == 'mm-dd-yyyy')
+		{
+			$display_date = $m.'-'.$d.'-'.$y;
+		}
+		elseif($dat_fmt == 'yyyy-mm-dd')
+		{
+			$display_date = $y.'-'.$m.'-'.$d;
+		}
+
+		if(isset($date_value[1]) && $date_value[1] != '')
+		{
+			$display_date = $display_date.' '.$date_value[1];
+		}
+	}
 	return $display_date;
 }
 

Modified: vtigercrm/branches/4.2/modules/Activities/OpenListView.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Activities/OpenListView.php (original)
+++ vtigercrm/branches/4.2/modules/Activities/OpenListView.php Fri Jun 16 15:12:22 2006
@@ -94,7 +94,7 @@
 				     'date_start' => getDisplayDate($adb->query_result($list_result,$i,'date_start')),
 				     'time_start' => $adb->query_result($list_result,$i,'time_start'),
 				     'due_date' => getDisplayDate($adb->query_result($list_result,$i,'due_date')),
-				     'recurringtype' => getDisplayDate($adb->query_result($list_result,$i,'recurringtype')),
+				     'recurringtype' => $adb->query_result($list_result,$i,'recurringtype'),
 				     'recurringdate' => getDisplayDate($adb->query_result($list_result,$i,'recurringdate')),
 
 				     'parent'=> $parent_name,	

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 Fri Jun 16 15:12:22 2006
@@ -555,8 +555,9 @@
 	{
 		global $adb;
 
+		$stdfiltersql = '';
 		$stdfilterlist = $this->getStdFilterByCvid($cvid);
-		//print_r($stdfilterlist);
+
 		if(isset($stdfilterlist))
 		{
 			foreach($stdfilterlist as $columnname=>$value)
@@ -588,9 +589,10 @@
 				$stdfiltersql = $columns[0].".".$columns[1]." between '".$startdate." 00:00:00' and '".$enddate." 23:59:00'";
 			}
 		}
-		//echo $stdfiltersql;
+		
 		return $stdfiltersql;
 	}
+
 	function getCVAdvFilterSQL($cvid)
 	{
 		$advfilter = $this->getAdvFilterByCvid($cvid);

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 Fri Jun 16 15:12:22 2006
@@ -70,12 +70,11 @@
 function fetchUserGroups($userid)
 {
 	global $adb;
+
 	$sql= "select groupname from users2group where userid='" .$userid ."'";
-        //echo $sql;
-        $result = $adb->query($sql);
-        //store the groupnames in a comma separated string
-        //echo 'count is ' .count($result);
-	if($adb->num_rows($result)!=0)	$groupname=  $adb->query_result($result,0,"groupname");
+	$result = $adb->query($sql);
+	$groupname = $adb->query_result($result, 0, 'groupname');
+
 	return $groupname;
 }
 

Modified: vtigercrm/branches/4.2/themes/blue/header.php
==============================================================================
--- vtigercrm/branches/4.2/themes/blue/header.php (original)
+++ vtigercrm/branches/4.2/themes/blue/header.php Fri Jun 16 15:12:22 2006
@@ -124,45 +124,26 @@
 // For the current tab, parse a tab_on
 
 foreach($moduleList as $module_name)
-
-{
-
+{
 	$xtpl->assign("MODULE_NAME", $app_list_strings['moduleList'][$module_name]);
-
 	$xtpl->assign("MODULE_KEY", $module_name);
 
-	
-
 	if($module_name == $currentModule)
-
-	{
-
+	{
 		$xtpl->assign("TAB_CLASS", "currentTab");
-
 		$xtpl->assign("IMAGE_TABTILE", "menu_on_tile.gif");
-
 		$xtpl->assign("IMAGE_TABSTART", "menu_on_start.gif");
-
 		$xtpl->assign("IMAGE_TABEND", "menu_on_end.gif");
-
-	}
-
+	}
 	else
-
-	{
-
+	{
 		$xtpl->assign("TAB_CLASS", "otherTab");
-
 		$xtpl->assign("IMAGE_TABTILE", "menu_off_tile.gif");
-
 		$xtpl->assign("IMAGE_TABSTART", "menu_off_start.gif");
-
 		$xtpl->assign("IMAGE_TABEND", "menu_off_end.gif");
-
 	}
 
 	$xtpl->parse("main.tab");
-
 }
 
 

Modified: vtigercrm/branches/4.2/themes/orange/header.php
==============================================================================
--- vtigercrm/branches/4.2/themes/orange/header.php (original)
+++ vtigercrm/branches/4.2/themes/orange/header.php Fri Jun 16 15:12:22 2006
@@ -172,15 +172,27 @@
 		$xtpl->assign("ROW_NUMBER",$current_row);
 		$xtpl->assign("RECENT_LABEL",$row['item_summary']);
 
-                if($row['module_name']=='Activities')
-                {
-                        $sql = 'select activitytype from activity where activityid = '.$row['item_id'];
-                        $activitytype = $adb->query_result($adb->query($sql),0,'activitytype');
-                        if($activitytype == 'Task')
-                                $activity_mode = '&activity_mode=Task';
-                        elseif($activitytype == 'Call' || $activitytype == 'Meeting')
-                                $activity_mode = '&activity_mode=Events';
-                }
+        if($row['module_name']=='Activities')
+        {
+	        $sql = 'select activitytype from activity where activityid = '.$row['item_id'];
+	        $activitytype = $adb->query_result($adb->query($sql),0,'activitytype');
+	        if($activitytype == 'Task')
+	        {
+				$activity_mode = '&activity_mode=Task';
+	        }
+	        elseif($activitytype == 'Call' || $activitytype == 'Meeting')
+	        {
+				$activity_mode = '&activity_mode=Events';
+	        }
+	        else
+	        {
+	        	$activity_mode = '';
+	        }
+        }
+        else
+        {
+        	$activity_mode = '';
+        }
 
 		$url_module = $row['module_name'];
 		$url_action = 'DetailView';
@@ -212,8 +224,6 @@
 			$xtpl->assign("MODULE_IMAGE_NAME",$row['module_name']);
 		}
 
-		 
-
 		$xtpl->assign("RECENT_URL","index.php?module=$url_module&action=$url_action&record=$row[item_id]$activity_mode");	
 
 		$activity_mode = '';



From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 14:13:52 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 21:13:52 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23748=3A_?=
 =?utf-8?q?Eliminate_php_notice_errors?=
In-Reply-To: <076.c75696aed703c24c8b151bd87264b9e6@vtiger.fosslabs.com>
References: <076.c75696aed703c24c8b151bd87264b9e6@vtiger.fosslabs.com>
Message-ID: <085.e8990533c4cee9efdebbe02e59f2ff97@vtiger.fosslabs.com>

#748: Eliminate php notice errors
------------------------+---------------------------------------------------
  Reporter:  allanbush  |       Owner:  jrydbeck
      Type:  task       |      Status:  assigned
  Priority:  minor      |   Milestone:  4.2.5   
 Component:  vtigercrm  |     Version:  4.2.4rc3
Resolution:             |    Keywords:          
------------------------+---------------------------------------------------
Comment (by jrydbeck):

 Changesets [7198] & [7199] tackled a significant amount of this.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/748>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 14:18:41 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 21:18:41 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7200 -
	/vtigercrm/branches/4.2.4.1/include/utils.php
Message-ID: <20060616211842.170577ED39A@vtiger.fosslabs.com>

Author: allanbush
Date: Fri Jun 16 15:18:36 2006
New Revision: 7200

Log:
Fixes quote display problem.  Closes #1281.

Modified:
    vtigercrm/branches/4.2.4.1/include/utils.php

Modified: vtigercrm/branches/4.2.4.1/include/utils.php
==============================================================================
--- vtigercrm/branches/4.2.4.1/include/utils.php (original)
+++ vtigercrm/branches/4.2.4.1/include/utils.php Fri Jun 16 15:18:36 2006
@@ -2304,6 +2304,7 @@
 {
 global $vtlog;
 $vtlog->logthis("in getPotentialName ".$potential_id,'info');  
+	if(!$potential_id) return '';
 	global $adb;
 	$sql = "select potentialname from potential where potentialid=".$potential_id;
         $result = $adb->query($sql);



From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 14:18:41 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 21:18:41 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231281=3A?=
 =?utf-8?q?_Quotes_without_an_associated_potential_do_not_display_in_list_?=
 =?utf-8?q?views=2E?=
In-Reply-To: <076.8b6d308ffb189659226c108a73a27dea@vtiger.fosslabs.com>
References: <076.8b6d308ffb189659226c108a73a27dea@vtiger.fosslabs.com>
Message-ID: <085.5aa41417d130f690322169be50ae722b@vtiger.fosslabs.com>

#1281: Quotes without an associated potential do not display in list views.
---------------------------------------+------------------------------------
  Reporter:  sebastian_sw at hotmail.com  |       Owner:  allanbush
      Type:  defect                    |      Status:  closed   
  Priority:  critical                  |   Milestone:           
 Component:  vtigercrm                 |     Version:  4.2.4rc3 
Resolution:  fixed                     |    Keywords:           
---------------------------------------+------------------------------------
Changes (by allanbush):

  * resolution:  => fixed
  * status:  assigned => closed

Comment:

 (In [7200]) Fixes quote display problem.  Closes #1281.

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1281>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 13:52:37 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 20:52:37 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231332=3A?=
 =?utf-8?q?_Settings/System_Configuration_shows_multiple_errors_if_run_in_?=
 =?utf-8?q?a_FreeBSD_4=2Ex_jail?=
Message-ID: <076.a93b6ad7676760fac679377c0350d918@vtiger.fosslabs.com>

#1332: Settings/System Configuration shows multiple errors if run in a FreeBSD 4.x
jail
------------------------------------------------+---------------------------
 Reporter:  m at greencampaigns.com                |       Owner:  developer
     Type:  defect                              |      Status:  new      
 Priority:  minor                               |   Milestone:  5.0.0    
Component:  vtigercrm                           |     Version:  5.0.1    
 Keywords:  Freebsd jail, system configuration  |  
------------------------------------------------+---------------------------
 The full text of the error:

 {{{
 Notice: Undefined index: free in
 /usr/local/www/greencampaigns.com/vtiger_crm/modules/System/includes/os/class.BSD.common.inc.php
 on line 244

 Notice: Undefined index: free in
 /usr/local/www/greencampaigns.com/vtiger_crm/modules/System/includes/os/class.BSD.common.inc.php
 on line 247

 Warning: Division by zero in
 /usr/local/www/greencampaigns.com/vtiger_crm/modules/System/includes/os/class.BSD.common.inc.php
 on line 279

 Warning: Invalid argument supplied for foreach() in
 /usr/local/www/greencampaigns.com/vtiger_crm/modules/System/includes/xml/memory.php
 on line 51
 ERRORS
 File    Line    Command         Message
 common_functions.php    176     /usr/bin/netstat        netstat: short
 read
 common_functions.php    176     /usr/bin/vmstat         vmstat: boottime:
 short read
 common_functions.php    176     /usr/sbin/swapinfo      swapinfo: cannot
 read nswdev: short read swapinfo: cannot read dmmax: short read swapinfo:
 cannot read sw: short read swapinfo: cannot read sw: short read swapinfo:
 cannot read swapblist: short read
 }}}

 This may apply to all FreeBSD 4.x systems. I have only tested it in a
 jail.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1332>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 14:20:26 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 21:20:26 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7201 -
 /vtigercrm/branches/4.2.4.1/modules/Leads/LeadConvertToEntities.php
Message-ID: <20060616212026.C70BA7ED399@vtiger.fosslabs.com>

Author: allanbush
Date: Fri Jun 16 15:20:23 2006
New Revision: 7201

Log:
Fixes query error when converting leads.  Closes #1312.

Modified:
    vtigercrm/branches/4.2.4.1/modules/Leads/LeadConvertToEntities.php

Modified: vtigercrm/branches/4.2.4.1/modules/Leads/LeadConvertToEntities.php
==============================================================================
--- vtigercrm/branches/4.2.4.1/modules/Leads/LeadConvertToEntities.php (original)
+++ vtigercrm/branches/4.2.4.1/modules/Leads/LeadConvertToEntities.php Fri Jun 16 15:20:23 2006
@@ -279,7 +279,7 @@
 $adb->query($sql_insert_contact);
 
 
-$sql_insert_contactsubdetails = "INSERT INTO contactsubdetails (contactsubscriptionid,homephone,otherphone,leadsource) VALUES (".$contact_id.",'','','".$adb->quote($row['leadsource'])."')";
+$sql_insert_contactsubdetails = "INSERT INTO contactsubdetails (contactsubscriptionid,homephone,otherphone,leadsource) VALUES (".$contact_id.",'','',".$adb->quote($row['leadsource']).")";
 
 $adb->query($sql_insert_contactsubdetails);
 



From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 14:33:18 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 21:33:18 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7202 - in
 /vtigercrm/branches/4.2: include/ListView/ListView.php include/utils.php
 modules/Accounts/ListView.php modules/Notes/ListView.php
Message-ID: <20060616213319.6ABBB7ED3A0@vtiger.fosslabs.com>

Author: jrydbeck
Date: Fri Jun 16 15:33:12 2006
New Revision: 7202

Log:
Continued work on bug #748.

Modified:
    vtigercrm/branches/4.2/include/ListView/ListView.php
    vtigercrm/branches/4.2/include/utils.php
    vtigercrm/branches/4.2/modules/Accounts/ListView.php
    vtigercrm/branches/4.2/modules/Notes/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 Fri Jun 16 15:33:12 2006
@@ -598,6 +598,7 @@
 }
 
 //session_start();
+$order_by = '';
 if (isset($_REQUEST['order_by'])) {
 	$order_by = $_REQUEST['order_by'];
 	$_SESSION["ListViewOrder[$currentModule_name][0]"] = $order_by;

Modified: vtigercrm/branches/4.2/include/utils.php
==============================================================================
--- vtigercrm/branches/4.2/include/utils.php (original)
+++ vtigercrm/branches/4.2/include/utils.php Fri Jun 16 15:33:12 2006
@@ -892,6 +892,7 @@
         $theme_path="themes/".$theme."/";
         $image_path=$theme_path."images/";
 	$fieldlabel = from_html($fieldlabel);
+	$filename = '';
 
 	//Commented for vulnerability fix as the convertion is added in Peardatabase - Philip
         //$value = htmlentities($col_fields[$fieldname]);
@@ -3030,6 +3031,7 @@
 function getListViewEntries($focus, $module,$list_result,$navigation_array,$relatedlist='',$returnset='',$edit_action='EditView',$del_action='Delete',$oCv='')
 {
 	global $adb, $theme, $app_strings;
+	$filename = '';
 	
 	$noofrows = $adb->num_rows($list_result);
 	$list_header = '<script>
@@ -3237,8 +3239,6 @@
 		$mod_dir=getModuleDirName($module);
 		if(isPermitted($module,1,$entity_id) == 'yes')
 		{
-
-
 			$list_header .='<a href="index.php?action='.$edit_action.'&module='.$mod_dir.'&record='.$entity_id.$returnset.'&filename='.$filename.'">'.$app_strings['LNK_EDIT'].'</a>&nbsp;|&nbsp;';
 		}
 		if(isPermitted($module,2,$entity_id) == 'yes')

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 Fri Jun 16 15:33:12 2006
@@ -233,8 +233,14 @@
 	$search_form->assign("MOD", $current_module_strings);
 	$search_form->assign("APP", $app_strings);
 
-	if ($order_by !='') $search_form->assign("ORDER_BY", $order_by);
-	if ($sorder !='') $search_form->assign("SORDER", $sorder);
+	if ($order_by !='')
+	{
+		$search_form->assign("ORDER_BY", $order_by);
+	}
+	if ($sorder !='')
+	{
+		$search_form->assign("SORDER", $sorder);
+	}
 
 	$search_form->assign("VIEWID",$viewid);
 	
@@ -325,7 +331,7 @@
 	<input name="viewname" type="hidden" value="'.$viewid.'">'; //give the viewid to hidden //customview
 if(isPermitted('Accounts',2,'') == 'yes')
 {
-        $other_text .=	'<td width="10"><input class="button" type="submit" value="'.$app_strings[LBL_MASS_DELETE].'" onclick="return massDelete()"/></td>';
+        $other_text .=	'<td width="10"><input class="button" type="submit" value="'.$app_strings['LBL_MASS_DELETE'].'" onclick="return massDelete()"/></td>';
 }
 if(isset($CActionDtls))
 {
@@ -357,9 +363,9 @@
 	<span class="sep">|</span>
 	<a href="index.php?module=Accounts&action=CustomView" class="link">'.$app_strings['LNK_CV_CREATEVIEW'].'</a>';
 }
-	$other_text .='<td align="right">'.$app_strings[LBL_VIEW].'
+	$other_text .='<td align="right">'.$app_strings['LBL_VIEW'].'
                         <SELECT NAME="view" onchange="showDefaultCustomView(this)">
-                                <OPTION VALUE="0">'.$mod_strings[LBL_ALL].'</option>
+                                <OPTION VALUE="0">'.$mod_strings['LBL_ALL'].'</option>
 				'.$customviewcombo_html.'
                         </SELECT>
 			'.$cvHTML.'
@@ -441,7 +447,7 @@
 $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;
+$record_string= $app_strings['LBL_SHOWING']." " .$start_rec." - ".$end_rec." " .$app_strings['LBL_LIST_OF'] ." ".$noofrows;
 
 //Retreive the List View Table Header
 if($viewid !='')

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 Fri Jun 16 15:33:12 2006
@@ -150,7 +150,7 @@
 	<td>';
 if(isPermitted('Notes',2,'') == 'yes')
 {
-        $other_text .='<input class="button" type="submit" value="'.$app_strings[LBL_MASS_DELETE].'" onclick="return massDelete()"/>';
+        $other_text .='<input class="button" type="submit" value="'.$app_strings['LBL_MASS_DELETE'].'" onclick="return massDelete()"/>';
 }
 
 if($viewid == 0)
@@ -168,9 +168,9 @@
 <a href="index.php?module=Notes&action=CustomView" class="link">'.$app_strings['LNK_CV_CREATEVIEW'].'</a>';
 }
 
-$other_text .='<td align="right">'.$app_strings[LBL_VIEW].'
+$other_text .='<td align="right">'.$app_strings['LBL_VIEW'].'
                         <SELECT NAME="view" onchange="showDefaultCustomView(this)">
-                                <OPTION VALUE="0">'.$mod_strings[LBL_ALL].'</option>
+                                <OPTION VALUE="0">'.$mod_strings['LBL_ALL'].'</option>
 				'.$customviewcombo_html.'
                         </SELECT>
 			'.$cvHTML.'
@@ -238,22 +238,27 @@
 	</script>";
 
 //Retreiving the start value from request
-if(isset($_REQUEST['start']) && $_REQUEST['start'] != '') {
-        $start = $_REQUEST['start'];
-} else {
-        $start = 1;
-}
+if(isset($_REQUEST['start']) && $_REQUEST['start'] != '')
+{
+	$start = $_REQUEST['start'];
+}
+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'];
 
-$record_string= $app_strings[LBL_SHOWING]." " .$start_rec." - ".$end_rec." " .$app_strings[LBL_LIST_OF] ." ".$noofrows;
-
+$record_string= $app_strings['LBL_SHOWING']." " .$start_rec." - ".$end_rec." " .$app_strings['LBL_LIST_OF'] ." ".$noofrows;
 
 //Retreive the List View Table Header
 if($viewid !='')
-$url_string .="&viewname=".$viewid;
+{
+	$url_string .="&viewname=".$viewid;
+}
 
 $listview_header = getListViewHeader($focus,"Notes",$url_string,$sorder,$order_by,"",$oCustomView);
 $xtpl->assign("LISTHEADER", $listview_header);
@@ -264,9 +269,13 @@
 $xtpl->assign("SELECT_SCRIPT", $view_script);
 
 if($order_by !='')
-$url_string .="&order_by=".$order_by;
+{
+	$url_string .="&order_by=".$order_by;
+}
 if($sorder !='')
-$url_string .="&sorder=".$sorder;
+{
+	$url_string .="&sorder=".$sorder;
+}
 
 $navigationOutput = getTableHeaderNavigation($navigation_array, $url_string,"Notes","index",$viewid);
 $xtpl->assign("NAVIGATION", $navigationOutput);
@@ -275,5 +284,4 @@
 $xtpl->parse("main");
 $xtpl->out("main");
 
-
 ?>



From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 21:38:51 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sat, 17 Jun 2006 04:38:51 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23865=3A_?=
 =?utf-8?q?missing_label_and_image?=
In-Reply-To: <076.cbba2af40571aeadb462b203aa78494a@vtiger.fosslabs.com>
References: <076.cbba2af40571aeadb462b203aa78494a@vtiger.fosslabs.com>
Message-ID: <085.176926f09a0d59dd5161044e20efb51a@vtiger.fosslabs.com>

#865: missing label and image
------------------------+---------------------------------------------------
  Reporter:  mangai     |       Owner:  mangai
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mangai):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/865>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 21:40:16 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sat, 17 Jun 2006 04:40:16 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231121=3A?=
	=?utf-8?q?_Picklist_UI_is_broken?=
In-Reply-To: <076.aefce13e2b710220e208efde54caf14e@vtiger.fosslabs.com>
References: <076.aefce13e2b710220e208efde54caf14e@vtiger.fosslabs.com>
Message-ID: <085.a676b268a490f2c03178607acc078609@vtiger.fosslabs.com>

#1121: Picklist UI is broken
------------------------+---------------------------------------------------
  Reporter:  mangai     |       Owner:  mangai
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mangai):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1121>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 21:50:32 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sat, 17 Jun 2006 04:50:32 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23843=3A_?=
 =?utf-8?q?Settings_=3E_Studio_=3E_Custom_Field_Settings_=3E_New_Custom_Fi?=
 =?utf-8?q?eld_Menu?=
In-Reply-To: <076.36c563ce6b93b6329417988edcf38a5b@vtiger.fosslabs.com>
References: <076.36c563ce6b93b6329417988edcf38a5b@vtiger.fosslabs.com>
Message-ID: <085.433c2b1b637da08a2832a25ff4d9b6f7@vtiger.fosslabs.com>

#843: Settings > Studio > Custom Field Settings > New Custom Field Menu
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  minnie
      Type:  defect     |      Status:  closed
  Priority:  minor      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  wontfix    |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mangai):

  * resolution:  => wontfix
  * status:  new => closed

Comment:

 We are having type '''Text''' and '''Text Area''' for two different
 fields.

 Type:'''Text''' - allow maximum of 255 characters.so it is useful to
 create fields like First Name,Company Name etc.
 Type:'''Text Area''' - It is useful to create fields like
 Description,Terms and Conditions etc.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/843>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 22:14:59 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 05:14:59 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7203 -
	/vtigercrm/trunk/Smarty/templates/PopupContents.tpl
Message-ID: <20060617051459.AB6FC7ED3AC@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 16 23:14:55 2006
New Revision: 7203

Log:
select label has been modified

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

Modified: vtigercrm/trunk/Smarty/templates/PopupContents.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/PopupContents.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/PopupContents.tpl Fri Jun 16 23:14:55 2006
@@ -14,7 +14,7 @@
 <table width="100%" border="0" cellspacing="0" cellpadding="0" class="small">
 	<tr>
 	{if $SELECT eq 'enable'}
-		<td style="padding-left:10px;" align="left"><input class="small" type="button" value="Add Contacts" onclick="if(SelectAll()) window.close();"/></td>
+		<td style="padding-left:10px;" align="left"><input class="small" type="button" value="Add {$MODULE}" onclick="if(SelectAll()) window.close();"/></td>
 	{else}		
 		<td>&nbsp;</td>	
 	{/if}



From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 22:20:04 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 05:20:04 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7204 -
	/vtigercrm/trunk/themes/blue/style.css
Message-ID: <20060617052004.82CD27ED3AF@vtiger.fosslabs.com>

Author: richie
Date: Fri Jun 16 23:19:59 2006
New Revision: 7204

Log:
Updated the style.css file

Added:
    vtigercrm/trunk/themes/blue/style.css



From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 22:27:38 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 05:27:38 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7205 -
 /vtigercrm/trunk/modules/Settings/language/en_us.lang.php
Message-ID: <20060617052738.E323C7ED3A7@vtiger.fosslabs.com>

Author: richie
Date: Fri Jun 16 23:27:33 2006
New Revision: 7205

Log:
Updated the language file

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



From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 22:31:31 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 05:31:31 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7206 - in
 /vtigercrm/trunk/Smarty/templates/Settings: CompanyInfo.tpl EmailConfig.tpl
 InventoryTerms.tpl TaxConfig.tpl
Message-ID: <20060617053131.6E8477ED3A7@vtiger.fosslabs.com>

Author: richie
Date: Fri Jun 16 23:31:25 2006
New Revision: 7206

Log:
Updated the tpl files for new settings ui

Added:
    vtigercrm/trunk/Smarty/templates/Settings/CompanyInfo.tpl
    vtigercrm/trunk/Smarty/templates/Settings/EmailConfig.tpl
    vtigercrm/trunk/Smarty/templates/Settings/InventoryTerms.tpl
    vtigercrm/trunk/Smarty/templates/Settings/TaxConfig.tpl



From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 23:41:16 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sat, 17 Jun 2006 06:41:16 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23268=3A_?=
 =?utf-8?q?Selection_in_multiple_pages_from_list_view_is_not_supported?=
In-Reply-To: <076.30c1b9af33fc83b78b78088399b52250@vtiger.fosslabs.com>
References: <076.30c1b9af33fc83b78b78088399b52250@vtiger.fosslabs.com>
Message-ID: <085.974ce894681c3e2c4d077d412b83f145@vtiger.fosslabs.com>

#268: Selection in multiple pages from list view is not supported
------------------------+---------------------------------------------------
  Reporter:  don        |       Owner:  philip
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.1 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by anonymous):

  * version:  5.0.0 => 5.0.1

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/268>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 23:54:39 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sat, 17 Jun 2006 06:54:39 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231333=3A?=
 =?utf-8?q?_Avoid_Usage_of_Plural_forms_for_Create_Record?=
Message-ID: <076.18d7de57d208fc4aee376b0dac1a75a7@vtiger.fosslabs.com>

#1333: Avoid Usage of Plural forms for Create Record
-----------------------+----------------------------------------------------
 Reporter:  gopal      |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  major      |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 Currently we are using Create Contacts, Create Leads, Create Campaigns
 etc..

 But in a single click we are creating a single Contact, Lead, or Campaign.
 Hence it is better to Change the Alt text to Create Contact, Create Lead,
 Create Campaign respectively.

 Gopal

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1333>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 17 00:03:01 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 07:03:01 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7207 - in
 /vtigercrm/trunk/Smarty/templates: Inventory/InventoryEditView.tpl
 salesEditView.tpl
Message-ID: <20060617070301.9CD7D7ED3B3@vtiger.fosslabs.com>

Author: saraj
Date: Sat Jun 17 01:02:57 2006
New Revision: 7207

Log:
changes made to fix the issue 1040

Modified:
    vtigercrm/trunk/Smarty/templates/Inventory/InventoryEditView.tpl
    vtigercrm/trunk/Smarty/templates/salesEditView.tpl

Modified: vtigercrm/trunk/Smarty/templates/Inventory/InventoryEditView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Inventory/InventoryEditView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Inventory/InventoryEditView.tpl Sat Jun 17 01:02:57 2006
@@ -80,7 +80,7 @@
 	                                        <td class="dvtTabCache" style="width:10px">&nbsp;</td>
 
         	                                {if $OP_MODE neq 'create_view'}
-	                                        <td class="dvtUnSelectedCell" align=center nowrap><a href="index.php?action=CallRelatedList&module={$MODULE}&record={$ID}&parenttab={$CATEGORY}" onclick="getRelatedLink()">{$APP.LBL_MORE} {$APP.LBL_INFORMATION}</a></td>
+	                                        <td class="dvtUnSelectedCell" align=center nowrap><a href="index.php?action=CallRelatedList&module={$MODULE}&record={$ID}&parenttab={$CATEGORY}&mode={$OP_MODE}" onclick="getRelatedLink()">{$APP.LBL_MORE} {$APP.LBL_INFORMATION}</a></td>
         	                                {/if}
 
                 	                        <td class="dvtTabCache" style="width:100%">&nbsp;</td>

Modified: vtigercrm/trunk/Smarty/templates/salesEditView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/salesEditView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/salesEditView.tpl Sat Jun 17 01:02:57 2006
@@ -82,7 +82,7 @@
 						<td class="dvtTabCache" style="width:10px">&nbsp;</td>
 
 	               	                        {if $OP_MODE neq 'create_view'}
-                				<td class="dvtUnSelectedCell" align=center nowrap><a href="index.php?action=CallRelatedList&module={$MODULE}&record={$ID}&parenttab={$CATEGORY}" onclick="getRelatedLink()">{$APP.LBL_MORE} {$APP.LBL_INFORMATION}</a></td>
+                				<td class="dvtUnSelectedCell" align=center nowrap><a href="index.php?action=CallRelatedList&module={$MODULE}&record={$ID}&parenttab={$CATEGORY}&mode={$OP_MODE}" onclick="getRelatedLink()">{$APP.LBL_MORE} {$APP.LBL_INFORMATION}</a></td>
 						{/if}
 
 						<td class="dvtTabCache" style="width:100%">&nbsp;</td>



From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 17 00:06:35 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 07:06:35 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7208 -
	/vtigercrm/trunk/Smarty/templates/RelatedLists.tpl
Message-ID: <20060617070635.D6ADE7ED3B7@vtiger.fosslabs.com>

Author: saraj
Date: Sat Jun 17 01:06:32 2006
New Revision: 7208

Log:
changes made to fix the issue 1040

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

Modified: vtigercrm/trunk/Smarty/templates/RelatedLists.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/RelatedLists.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/RelatedLists.tpl Sat Jun 17 01:06:32 2006
@@ -35,11 +35,16 @@
 			<td>
 				<table border=0 cellspacing=0 cellpadding=3 width=100% class="small">
 				<tr>
+					{if $OP_MODE eq 'edit_view'}
+                                                {assign var="action" value="EditView"}
+                                        {else}
+                                                {assign var="action" value="DetailView"}
+                                        {/if}
 					<td class="dvtTabCache" style="width:10px" nowrap>&nbsp;</td>
 					{if $MODULE eq 'Activities'}
-                                                <td class="dvtUnSelectedCell" align=center nowrap><a href="index.php?action=DetailView&module={$MODULE}&record={$ID}&activity_mode={$ACTIVITY_MODE}&parenttab={$CATEGORY}">{$SINGLE_MOD} {$APP.LBL_INFORMATION}</a></td>
+                                                <td class="dvtUnSelectedCell" align=center nowrap><a href="index.php?action={$action}&module={$MODULE}&record={$ID}&activity_mode={$ACTIVITY_MODE}&parenttab={$CATEGORY}">{$SINGLE_MOD} {$APP.LBL_INFORMATION}</a></td>
                                         {else}
-                                        <td class="dvtUnSelectedCell" align=center nowrap><a href="index.php?action=DetailView&module={$MODULE}&record={$ID}&parenttab={$CATEGORY}">{$SINGLE_MOD} {$APP.LBL_INFORMATION}</a></td>
+                                        <td class="dvtUnSelectedCell" align=center nowrap><a href="index.php?action={$action}&module={$MODULE}&record={$ID}&parenttab={$CATEGORY}">{$SINGLE_MOD} {$APP.LBL_INFORMATION}</a></td>
                                         {/if}
 					<td class="dvtTabCache" style="width:10px">&nbsp;</td>
 					<td class="dvtSelectedCell" align=center nowrap>{$APP.LBL_MORE} {$APP.LBL_INFORMATION}</td>



From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 17 00:15:11 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 07:15:11 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7209 - in
 /vtigercrm/trunk/modules: Accounts/CallRelatedList.php
 Activities/CallRelatedList.php Campaigns/CallRelatedList.php
 Contacts/CallRelatedList.php Emails/CallRelatedList.php
 HelpDesk/CallRelatedList.php
Message-ID: <20060617071511.E87687ED3B9@vtiger.fosslabs.com>

Author: saraj
Date: Sat Jun 17 01:15:02 2006
New Revision: 7209

Log:
changes made to fix the issue 1040

Modified:
    vtigercrm/trunk/modules/Accounts/CallRelatedList.php
    vtigercrm/trunk/modules/Activities/CallRelatedList.php
    vtigercrm/trunk/modules/Campaigns/CallRelatedList.php
    vtigercrm/trunk/modules/Contacts/CallRelatedList.php
    vtigercrm/trunk/modules/Emails/CallRelatedList.php
    vtigercrm/trunk/modules/HelpDesk/CallRelatedList.php

Modified: vtigercrm/trunk/modules/Accounts/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/Accounts/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/Accounts/CallRelatedList.php Sat Jun 17 01:15:02 2006
@@ -39,7 +39,9 @@
 if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') {
         $focus->id = "";
 }
-
+if(isset($_REQUEST['mode']) && $_REQUEST['mode'] != ' ') {
+	$smarty->assign("OP_MODE",$_REQUEST['mode']);
+}
  if(!$_SESSION['rlvs'][$module])
  {
        unset($_SESSION['rlvs']);

Modified: vtigercrm/trunk/modules/Activities/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/Activities/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/Activities/CallRelatedList.php Sat Jun 17 01:15:02 2006
@@ -41,7 +41,9 @@
 $smarty->assign("APP", $app_strings);
 $smarty->assign("UPDATEINFO",updateInfo($focus->id));
 if (isset($focus->name)) $smarty->assign("NAME", $focus->name);
-
+if(isset($_REQUEST['mode']) && $_REQUEST['mode'] != ' ') {
+	$smarty->assign("OP_MODE",$_REQUEST['mode']);
+}
 $related_array = getRelatedLists("Activities", $focus);
 $smarty->assign("id",$focus->id);
 $smarty->assign("RELATEDLISTS", $related_array);

Modified: vtigercrm/trunk/modules/Campaigns/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/Campaigns/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/Campaigns/CallRelatedList.php Sat Jun 17 01:15:02 2006
@@ -41,7 +41,9 @@
 if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') {
         $focus->id = "";
 }
-
+if(isset($_REQUEST['mode']) && $_REQUEST['mode'] != ' ') {
+	$smarty->assign("OP_MODE",$_REQUEST['mode']);
+}
 if (isset($focus->name)) $smarty->assign("NAME", $focus->name);
 $related_array=getRelatedLists($currentModule,$focus);
 $smarty->assign("RELATEDLISTS", $related_array);

Modified: vtigercrm/trunk/modules/Contacts/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/Contacts/CallRelatedList.php Sat Jun 17 01:15:02 2006
@@ -53,6 +53,9 @@
 if(isset($_request['isduplicate']) && $_request['isduplicate'] == 'true') {
         $focus->id = "";
 }
+if(isset($_REQUEST['mode']) && $_REQUEST['mode'] != ' ') {
+	$smarty->assign("OP_MODE",$_REQUEST['mode']);
+}
 $parent_email = getEmailParentsList('Contacts',$_REQUEST['record']);
         $smarty->assign("HIDDEN_PARENTS_LIST",$parent_email);
 $category = getparenttab();

Modified: vtigercrm/trunk/modules/Emails/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/Emails/CallRelatedList.php Sat Jun 17 01:15:02 2006
@@ -42,7 +42,9 @@
 $related_array=getRelatedLists($currentModule,$focus);
 $category = getParentTab();
 $smarty->assign("CATEGORY",$category);
-
+if(isset($_REQUEST['mode']) && $_REQUEST['mode'] != ' ') {
+        $smarty->assign("OP_MODE",$_REQUEST['mode']);
+}
 $smarty->assign("id",$focus->id);
 $smarty->assign("RELATEDLISTS", $related_array);
 $smarty->assign("ID",$RECORD );

Modified: vtigercrm/trunk/modules/HelpDesk/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/HelpDesk/CallRelatedList.php Sat Jun 17 01:15:02 2006
@@ -41,7 +41,9 @@
 if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') {
         $focus->id = "";
 }
-
+if(isset($_REQUEST['mode']) && $_REQUEST['mode'] != ' ') {
+        $smarty->assign("OP_MODE",$_REQUEST['mode']);
+}
 if (isset($focus->name)) $smarty->assign("NAME", $focus->name);
 $related_array=getRelatedLists($currentModule,$focus);
 $smarty->assign("RELATEDLISTS", $related_array);



From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 17 00:24:06 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 07:24:06 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7210 - in
 /vtigercrm/trunk/modules: Invoice/ Leads/ Potentials/ PriceBooks/ Products/
 PurchaseOrder/ Quotes/
Message-ID: <20060617072407.1535F7ED3B9@vtiger.fosslabs.com>

Author: saraj
Date: Sat Jun 17 01:23:56 2006
New Revision: 7210

Log:
changes made to fix the issue 1040

Modified:
    vtigercrm/trunk/modules/Invoice/CallRelatedList.php
    vtigercrm/trunk/modules/Leads/CallRelatedList.php
    vtigercrm/trunk/modules/Potentials/CallRelatedList.php
    vtigercrm/trunk/modules/PriceBooks/CallRelatedList.php
    vtigercrm/trunk/modules/Products/CallRelatedList.php
    vtigercrm/trunk/modules/PurchaseOrder/CallRelatedList.php
    vtigercrm/trunk/modules/Quotes/CallRelatedList.php

Modified: vtigercrm/trunk/modules/Invoice/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/Invoice/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/Invoice/CallRelatedList.php Sat Jun 17 01:23:56 2006
@@ -40,6 +40,9 @@
 $smarty->assign("RELATEDLISTS", $related_array);
 $category = getParentTab();
 $smarty->assign("CATEGORY",$category);
+if(isset($_REQUEST['mode']) && $_REQUEST['mode'] != ' ') {
+	$smarty->assign("OP_MODE",$_REQUEST['mode']);
+}
 
 $smarty->assign("id",$focus->id);
 $smarty->assign("ID",$RECORD );

Modified: vtigercrm/trunk/modules/Leads/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/Leads/CallRelatedList.php Sat Jun 17 01:23:56 2006
@@ -41,7 +41,10 @@
 if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') {
         $focus->id = "";
 }
-
+if(isset($_REQUEST['mode']) && $_REQUEST['mode'] != ' ') {
+	$smarty->assign("OP_MODE",$_REQUEST['mode']);
+}
+		
  if(!$_SESSION['rlvs'][$module])
  {
        unset($_SESSION['rlvs']);

Modified: vtigercrm/trunk/modules/Potentials/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/Potentials/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/Potentials/CallRelatedList.php Sat Jun 17 01:23:56 2006
@@ -37,6 +37,9 @@
 if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') {
         $focus->id = "";
 }
+if(isset($_REQUEST['mode']) && $_REQUEST['mode'] != ' ') {
+        $smarty->assign("OP_MODE",$_REQUEST['mode']);
+}
 if (isset($focus->name)) $smarty->assign("NAME", $focus->name);
 $related_array = getRelatedLists($currentModule,$focus);
 $smarty->assign("RELATEDLISTS", $related_array);

Modified: vtigercrm/trunk/modules/PriceBooks/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/PriceBooks/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/PriceBooks/CallRelatedList.php Sat Jun 17 01:23:56 2006
@@ -47,7 +47,9 @@
 	$smarty->assign("NAME", $focus->name);
 $category = getParentTab();
 $smarty->assign("CATEGORY",$category);
-
+if(isset($_REQUEST['mode']) && $_REQUEST['mode'] != ' ') {
+	$smarty->assign("OP_MODE",$_REQUEST['mode']);
+}
 $smarty->assign("id",$focus->id);
 $smarty->assign("ID",$RECORD );
 $smarty->assign("MODULE",$currentmodule);

Modified: vtigercrm/trunk/modules/Products/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/Products/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/Products/CallRelatedList.php Sat Jun 17 01:23:56 2006
@@ -37,7 +37,9 @@
 {
         $focus->id = "";
 }
-
+if(isset($_REQUEST['mode']) && $_REQUEST['mode'] != ' ') {
+	$smarty->assign("OP_MODE",$_REQUEST['mode']);
+}
 if (isset($focus->name)) $smarty->assign("NAME", $focus->name);
 $related_array=getRelatedLists($currentModule,$focus);
 $smarty->assign("RELATEDLISTS", $related_array);

Modified: vtigercrm/trunk/modules/PurchaseOrder/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/PurchaseOrder/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/PurchaseOrder/CallRelatedList.php Sat Jun 17 01:23:56 2006
@@ -37,7 +37,9 @@
 $smarty->assign("RELATEDLISTS", $related_array);
 $category = getParentTab();
 $smarty->assign("CATEGORY",$category);
-
+if(isset($_REQUEST['mode']) && $_REQUEST['mode'] != ' ') {
+	$smarty->assign("OP_MODE",$_REQUEST['mode']);
+}
 $smarty->assign("id",$focus->id);
 $smarty->assign("ID",$RECORD );
 $smarty->assign("MODULE",$currentmodule);

Modified: vtigercrm/trunk/modules/Quotes/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/Quotes/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/Quotes/CallRelatedList.php Sat Jun 17 01:23:56 2006
@@ -37,7 +37,9 @@
 $smarty->assign("RELATEDLISTS", $related_array);
 $category = getParentTab();
 $smarty->assign("CATEGORY",$category);
-
+if(isset($_REQUEST['mode']) && $_REQUEST['mode'] != ' ') {
+	$smarty->assign("OP_MODE",$_REQUEST['mode']);
+}
 $smarty->assign("id",$focus->id);
 $smarty->assign("ID",$RECORD );
 $smarty->assign("MODULE",$currentmodule);



From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 17 00:26:27 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 07:26:27 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7211 - in
 /vtigercrm/trunk/modules: SalesOrder/CallRelatedList.php
 Vendors/CallRelatedList.php
Message-ID: <20060617072627.569E87ED3B9@vtiger.fosslabs.com>

Author: saraj
Date: Sat Jun 17 01:26:21 2006
New Revision: 7211

Log:
changes made to fix the issue 1040

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

Modified: vtigercrm/trunk/modules/SalesOrder/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/SalesOrder/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/SalesOrder/CallRelatedList.php Sat Jun 17 01:26:21 2006
@@ -31,6 +31,9 @@
 
 $smarty = new vtigerCRM_Smarty;
 
+if(isset($_REQUEST['mode']) && $_REQUEST['mode'] != ' ') {
+        $smarty->assign("OP_MODE",$_REQUEST['mode']);
+}
 if (isset($focus->name)) $smarty->assign("NAME", $focus->name);
 $related_array=getRelatedLists($currentModule,$focus);
 $smarty->assign("RELATEDLISTS", $related_array);

Modified: vtigercrm/trunk/modules/Vendors/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/Vendors/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/Vendors/CallRelatedList.php Sat Jun 17 01:26:21 2006
@@ -45,6 +45,9 @@
 $category = getParentTab();
 $smarty->assign("CATEGORY",$category);
 
+if(isset($_REQUEST['mode']) && $_REQUEST['mode'] != ' ') {
+        $smarty->assign("OP_MODE",$_REQUEST['mode']);
+}
 if(isset($focus->name))
 $smarty->assign("UPDATEINFO",updateInfo($focus->id));
 $smarty->assign("NAME", $focus->name);



From vtiger-tickets at vtiger.fosslabs.com  Sat Jun 17 00:27:00 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sat, 17 Jun 2006 07:27:00 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231040=3A?=
 =?utf-8?q?_in_editview=2C_entiry_information_goes_to_detailview_after_cli?=
 =?utf-8?q?ck_on_more_information?=
In-Reply-To: <076.80dd04e6af4a83501512f60298676764@vtiger.fosslabs.com>
References: <076.80dd04e6af4a83501512f60298676764@vtiger.fosslabs.com>
Message-ID: <085.1e1f2a31c971eb5a64e6f9d71d9121dd@vtiger.fosslabs.com>

#1040: in editview, entiry information goes to detailview after click on more
information
--------------------------+-------------------------------------------------
  Reporter:  mickie       |       Owner:  mangai
      Type:  enhancement  |      Status:  closed
  Priority:  major        |   Milestone:        
 Component:  vtigercrm    |     Version:  5.0.0 
Resolution:  fixed        |    Keywords:        
--------------------------+-------------------------------------------------
Changes (by mangai):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 fixed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1040>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 17 00:33:10 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 07:33:10 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7212 -
	/vtigercrm/trunk/modules/SalesOrder/SalesOrder.php
Message-ID: <20060617073311.129217ED3B9@vtiger.fosslabs.com>

Author: don
Date: Sat Jun 17 01:33:05 2006
New Revision: 7212

Log:
Fixed issues in vtiger_ prefixing in table names

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

Modified: vtigercrm/trunk/modules/SalesOrder/SalesOrder.php
==============================================================================
--- vtigercrm/trunk/modules/SalesOrder/SalesOrder.php (original)
+++ vtigercrm/trunk/modules/SalesOrder/SalesOrder.php Sat Jun 17 01:33:05 2006
@@ -33,13 +33,13 @@
 	var $log;
 	var $db;
 
-	var $table_name = "salesorder";
+	var $table_name = "vtiger_salesorder";
 	var $tab_name = Array('vtiger_crmentity','vtiger_salesorder','vtiger_sobillads','vtiger_soshipads','vtiger_salesordercf');
 	var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_salesorder'=>'salesorderid','vtiger_sobillads'=>'sobilladdressid','vtiger_soshipads'=>'soshipaddressid','vtiger_salesordercf'=>'salesorderid');
 	
-	var $entity_table = "crmentity";
-	
-	var $billadr_table = "sobillads";
+	var $entity_table = "vtiger_crmentity";
+	
+	var $billadr_table = "vtiger_sobillads";
 
 	var $object_name = "SalesOrder";
 
@@ -146,7 +146,7 @@
 		$button = '';
 
 		$returnset = '&return_module=SalesOrder&return_action=DetailView&return_id='.$id;
-		$query = "SELECT vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid, vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and (activitytype='Task' or vtiger_activitytype='Call' or vtiger_activitytype='Meeting') and vtiger_crmentity.deleted=0 and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Completed') and (vtiger_activity.status is not NULL && vtiger_activity.status !='Deferred') or (vtiger_activity.eventstatus != '' &&  vtiger_activity.eventstatus = 'Planned')";
+		$query = "SELECT vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid, vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting') and vtiger_crmentity.deleted=0 and (vtiger_activity.status is not NULL && activity.status != 'Completed') and (vtiger_activity.status is not NULL && vtiger_activity.status !='Deferred') or (vtiger_activity.eventstatus != '' &&  vtiger_activity.eventstatus = 'Planned')";
 		$log->debug("Exiting get_activities method ...");
 		return GetRelatedList('SalesOrder','Activities',$focus,$query,$button,$returnset);
 	}
@@ -192,7 +192,7 @@
 		// Inserted inner join vtiger_users on vtiger_crmentity.smcreatorid= vtiger_users.id
 		$query = "select vtiger_notes.title,'Notes      '  ActivityType, vtiger_notes.filename,
 		vtiger_attachments.type  FileType,crm2.modifiedtime lastmodified,
-		vtiger_seattachmentsrel.attachmentsid vtiger_attachmentsid, vtiger_notes.notesid crmid,
+		vtiger_seattachmentsrel.attachmentsid attachmentsid, vtiger_notes.notesid crmid,
 		vtiger_crmentity.createdtime, vtiger_notes.notecontent description, vtiger_users.user_name
 		from vtiger_notes
 			inner join vtiger_senotesrel on vtiger_senotesrel.notesid= vtiger_notes.notesid
@@ -209,7 +209,7 @@
 		// Inserted order by createdtime desc
 		$query .= "select vtiger_attachments.description  title ,'Attachments'  ActivityType,
 		vtiger_attachments.name  filename, vtiger_attachments.type  FileType, crm2.modifiedtime lastmodified,
-		vtiger_attachments.attachmentsid  vtiger_attachmentsid, vtiger_seattachmentsrel.attachmentsid crmid,
+		vtiger_attachments.attachmentsid  attachmentsid, vtiger_seattachmentsrel.attachmentsid crmid,
 		vtiger_crmentity.createdtime, vtiger_attachments.description, vtiger_users.user_name
 		from vtiger_attachments
 			inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid= vtiger_attachments.attachmentsid



From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 17 00:37:46 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 07:37:46 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7213 -
	/vtigercrm/trunk/modules/SalesOrder/SalesOrder.php
Message-ID: <20060617073746.D17D57ED3B9@vtiger.fosslabs.com>

Author: don
Date: Sat Jun 17 01:37:43 2006
New Revision: 7213

Log:
Fixed issues in vtiger_ prefixing in table names

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

Modified: vtigercrm/trunk/modules/SalesOrder/SalesOrder.php
==============================================================================
--- vtigercrm/trunk/modules/SalesOrder/SalesOrder.php (original)
+++ vtigercrm/trunk/modules/SalesOrder/SalesOrder.php Sat Jun 17 01:37:43 2006
@@ -146,7 +146,7 @@
 		$button = '';
 
 		$returnset = '&return_module=SalesOrder&return_action=DetailView&return_id='.$id;
-		$query = "SELECT vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid, vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting') and vtiger_crmentity.deleted=0 and (vtiger_activity.status is not NULL && activity.status != 'Completed') and (vtiger_activity.status is not NULL && vtiger_activity.status !='Deferred') or (vtiger_activity.eventstatus != '' &&  vtiger_activity.eventstatus = 'Planned')";
+		$query = "SELECT vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid, vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting') and vtiger_crmentity.deleted=0 and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Completed') and (vtiger_activity.status is not NULL && vtiger_activity.status !='Deferred') or (vtiger_activity.eventstatus != '' &&  vtiger_activity.eventstatus = 'Planned')";
 		$log->debug("Exiting get_activities method ...");
 		return GetRelatedList('SalesOrder','Activities',$focus,$query,$button,$returnset);
 	}
@@ -170,7 +170,7 @@
 				inner join vtiger_users on vtiger_crmentity.smcreatorid=vtiger_users.id
 				left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_activity.activityid
                                 left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname
-			where (activitytype='Task' or vtiger_activitytype='Call' or vtiger_activitytype='Meeting')
+			where (activitytype='Task' or activitytype='Call' or activitytype='Meeting')
 				and (vtiger_activity.status = 'Completed' or vtiger_activity.status = 'Deferred' or (vtiger_activity.eventstatus !='Planned' and vtiger_activity.eventstatus != ''))
 				and vtiger_seactivityrel.crmid=".$id;
 		//Don't add order by, because, for security, one more condition will be added with this query in include/RelatedListView.php



From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 17 01:16:27 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 08:16:27 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7214 -
	/vtigercrm/trunk/include/js/smoothscroll.js
Message-ID: <20060617081627.08D7B7ED3B9@vtiger.fosslabs.com>

Author: richie
Date: Sat Jun 17 02:16:21 2006
New Revision: 7214

Log:
Added the smoothscroll.js for new settings ui

Added:
    vtigercrm/trunk/include/js/smoothscroll.js



From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 17 02:32:04 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 09:32:04 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7215 - in
 /vtigercrm/trunk/modules/Settings: AddCustomFieldToDB.php
 UpdateComboValues.php
Message-ID: <20060617093204.D461E7ED3CD@vtiger.fosslabs.com>

Author: saraj
Date: Sat Jun 17 03:31:59 2006
New Revision: 7215

Log:
changes made to fix the issue 1322 and 1285

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

Modified: vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php (original)
+++ vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php Sat Jun 17 03:31:59 2006
@@ -281,9 +281,13 @@
 		if($fldType == 'Picklist' || $fldType == 'MultiSelectCombo')
 		{
 			// Creating the PickList Table and Populating Values
-			$adb->createTable('vtiger_'.$columnName, $columnName." C(255)");
-			//Adding Primary Key
-			$qur = "ALTER table vtiger_".$columnName." ADD PRIMARY KEY (". $columnName.")";
+			$qur = "CREATE TABLE vtiger_".$columnName." (
+					".$columnName."id int(19) NOT NULL auto_increment,
+					".$columnName." varchar(200) NOT NULL,
+					sortorderid int(19) NOT NULL default '0',
+					presence int(1) NOT NULL default '1',
+				        PRIMARY KEY  (".$columnName."id)
+				)";
 			$adb->query($qur);
 
 			$fldPickList =  $_REQUEST['fldPickList'];
@@ -292,9 +296,10 @@
 			for($i = 0; $i < $count; $i++)
 			{
 				$pickArray[$i] = trim($pickArray[$i]);
+				$id = $adb->getUniqueID($columnName);
 				if($pickArray[$i] != '')
 				{
-					$query = "insert into vtiger_".$columnName." values('".$pickArray[$i]."')";
+					$query = "insert into vtiger_".$columnName." values(".$id.",'".$pickArray[$i]."',".$i.",1)";
 					$adb->query($query);
 				}
 			}

Modified: vtigercrm/trunk/modules/Settings/UpdateComboValues.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/UpdateComboValues.php (original)
+++ vtigercrm/trunk/modules/Settings/UpdateComboValues.php Sat Jun 17 03:31:59 2006
@@ -30,11 +30,8 @@
 	$pickArray[$i] = trim($pickArray[$i]);
 	if($pickArray[$i] != '')
 	{
-		if($custom)
-			$query = "insert into vtiger_".$tableName." values('".$pickArray[$i]."')";
-		else
-			$query = "insert into vtiger_".$tableName." values('','".$pickArray[$i]."',".$i.",1)";
-        $adb->query($query);
+		$query = "insert into vtiger_".$tableName." values('','".$pickArray[$i]."',".$i.",1)";
+	        $adb->query($query);
 	}
 }
 header("Location:index.php?action=SettingsAjax&module=Settings&directmode=ajax&file=PickList&fld_module=".$fld_module);



From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 17 02:33:40 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 09:33:40 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7216 -
	/vtigercrm/trunk/include/utils/EditViewUtils.php
Message-ID: <20060617093340.D00F67ED3CD@vtiger.fosslabs.com>

Author: saraj
Date: Sat Jun 17 03:33:37 2006
New Revision: 7216

Log:
vtiger_ updated

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

Modified: vtigercrm/trunk/include/utils/EditViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/EditViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/EditViewUtils.php Sat Jun 17 03:33:37 2006
@@ -139,10 +139,10 @@
 		$editview_label[]=$mod_strings[$fieldlabel];
 		$fieldvalue [] = $value;
 	}
-	elseif($uitype ==33)
-	{
-		$editview_label[]=$mod_strings[$fieldlabel];
-		$mulsel="select * from ".$fieldname;
+	elseif($uitype == 33)
+	{
+		$editview_label[]=$mod_strings[$fieldlabel];
+		$mulsel="select * from vtiger_".$fieldname;
 		$multiselect_result = $adb->query($mulsel);
 		$noofoptions = $adb->num_rows($multiselect_result);
 		$options = array();



From vtiger-tickets at vtiger.fosslabs.com  Sat Jun 17 02:34:20 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sat, 17 Jun 2006 09:34:20 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231322=3A?=
 =?utf-8?q?_issue_in_customfield_picklist?=
In-Reply-To: <076.0444d61c632efd55ca5f5274820cefee@vtiger.fosslabs.com>
References: <076.0444d61c632efd55ca5f5274820cefee@vtiger.fosslabs.com>
Message-ID: <085.a41a6c39a656e67cb9a09d1c0a1447c3@vtiger.fosslabs.com>

#1322: issue in customfield picklist
------------------------+---------------------------------------------------
  Reporter:  mangai     |       Owner:  mangai
      Type:  defect     |      Status:  closed
  Priority:  blocker    |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mangai):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 fixed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1322>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Sat Jun 17 02:36:45 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sat, 17 Jun 2006 09:36:45 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231285=3A?=
 =?utf-8?q?_picklist_-_custom_field?=
In-Reply-To: <076.d54873cd2f44419ccf2fc08db8faed61@vtiger.fosslabs.com>
References: <076.d54873cd2f44419ccf2fc08db8faed61@vtiger.fosslabs.com>
Message-ID: <085.e0fad10affc05c1034165e057b6f8cea@vtiger.fosslabs.com>

#1285: picklist - custom field
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  minnie
      Type:  defect     |      Status:  closed
  Priority:  blocker    |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mangai):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 fixed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1285>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Sat Jun 17 02:37:42 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sat, 17 Jun 2006 09:37:42 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231334=3A?=
	=?utf-8?q?_Calendar_translation?=
Message-ID: <076.9648d4b16d7e7ade09293afbcbfcb43e@vtiger.fosslabs.com>

#1334: Calendar translation
-----------------------------------+----------------------------------------
 Reporter:  abos                   |       Owner:  developer
     Type:  defect                 |      Status:  new      
 Priority:  minor                  |   Milestone:           
Component:  vtigercrm              |     Version:  5.0.0    
 Keywords:  calendar, translation  |  
-----------------------------------+----------------------------------------
 Hi,
 in calendar the term "View" (top of the calendar) is not translated,
 The dropdown for create events/task is too small for french,
 The term "None Scheduled" is not translated,
 Thanks

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1334>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 17 02:57:39 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 09:57:39 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7217 -
	/vtigercrm/trunk/modules/Invoice/Invoice.php
Message-ID: <20060617095739.C55387ED3CD@vtiger.fosslabs.com>

Author: don
Date: Sat Jun 17 03:57:35 2006
New Revision: 7217

Log:
Fixed issues in vtiger_ prefixing in table names

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

Modified: vtigercrm/trunk/modules/Invoice/Invoice.php
==============================================================================
--- vtigercrm/trunk/modules/Invoice/Invoice.php (original)
+++ vtigercrm/trunk/modules/Invoice/Invoice.php Sat Jun 17 03:57:35 2006
@@ -144,7 +144,7 @@
 
 		$returnset = '&return_module=Invoice&return_action=DetailView&return_id='.$id;
 
-		$query = "SELECT vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid, vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and (activitytype='Task' or vtiger_activitytype='Call' or vtiger_activitytype='Meeting') and vtiger_crmentity.deleted=0 and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Completed') and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Deferred') or (vtiger_activity.eventstatus != '' &&  vtiger_activity.eventstatus = 'Planned')";
+		$query = "SELECT vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid, vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or ativitytype='Meeting') and vtiger_crmentity.deleted=0 and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Completed') and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Deferred') or (vtiger_activity.eventstatus != '' &&  vtiger_activity.eventstatus = 'Planned')";
 		$log->debug("Exiting get_activities method ...");
 		return  GetRelatedList('Invoice','Activities',$focus,$query,$button,$returnset);
 	}
@@ -180,7 +180,7 @@
 		// Inserted inner join vtiger_users on crm2.smcreatorid= vtiger_users.id
 		$query = "select vtiger_notes.title,'Notes      '  ActivityType, vtiger_notes.filename,
 		vtiger_attachments.type  FileType,crm2.modifiedtime lastmodified,
-		vtiger_seattachmentsrel.attachmentsid vtiger_attachmentsid, vtiger_notes.notesid crmid,
+		vtiger_seattachmentsrel.attachmentsid attachmentsid, vtiger_notes.notesid crmid,
 			crm2.createdtime, vtiger_notes.notecontent description, vtiger_users.user_name
 		from vtiger_notes
 			inner join vtiger_senotesrel on vtiger_senotesrel.notesid= vtiger_notes.notesid



From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 17 03:34:11 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 10:34:11 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7218 -
	/vtigercrm/trunk/modules/Dashboard/Entity_charts.php
Message-ID: <20060617103412.280E37E8ABC@vtiger.fosslabs.com>

Author: saraj
Date: Sat Jun 17 04:34:07 2006
New Revision: 7218

Log:
vtiger_ updated

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 Sat Jun 17 04:34:07 2006
@@ -27,7 +27,7 @@
 {
 	global $adb;
 
-	$acc_qry="select vtiger_accountname from vtiger_account where vtiger_accountid =".$acc_id;
+	$acc_qry="select accountname from vtiger_account where vtiger_accountid =".$acc_id;
 	$acc_result=$adb->query($acc_qry);
 	$no_acc_rows=$adb->num_rows($acc_result);
 



From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 17 03:36:14 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 10:36:14 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7219 -
 /vtigercrm/trunk/modules/Dashboard/display_charts.php
Message-ID: <20060617103615.265D17E8ABC@vtiger.fosslabs.com>

Author: saraj
Date: Sat Jun 17 04:36:11 2006
New Revision: 7219

Log:
label has been changed

Modified:
    vtigercrm/trunk/modules/Dashboard/display_charts.php

Modified: vtigercrm/trunk/modules/Dashboard/display_charts.php
==============================================================================
--- vtigercrm/trunk/modules/Dashboard/display_charts.php (original)
+++ vtigercrm/trunk/modules/Dashboard/display_charts.php Sat Jun 17 04:36:11 2006
@@ -617,7 +617,7 @@
 		    elseif (($type == "ticketsbyuser") && (getFieldVisibilityPermission('HelpDesk',$user_id,'ticketuser') == "0"))
 		    {
 			    $graph_by="smownerid";
-			    $graph_title=$mod_strings['ticketsbyowner'];
+			    $graph_title=$mod_strings['ticketsbyuser'];
 			    $module="HelpDesk";
 			    $where=" and (vtiger_crmentity.smownerid != NULL || vtiger_crmentity.smownerid != ' ')";
 			    $query=$helpdesk_query;



From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 17 03:41:30 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 10:41:30 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7220 -
	/vtigercrm/trunk/modules/Dashboard/Entity_charts.php
Message-ID: <20060617104130.32B387ED3CA@vtiger.fosslabs.com>

Author: saraj
Date: Sat Jun 17 04:41:26 2006
New Revision: 7220

Log:
vtiger_ updated

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 Sat Jun 17 04:41:26 2006
@@ -27,7 +27,7 @@
 {
 	global $adb;
 
-	$acc_qry="select accountname from vtiger_account where vtiger_accountid =".$acc_id;
+	$acc_qry="select accountname from vtiger_account where accountid =".$acc_id;
 	$acc_result=$adb->query($acc_qry);
 	$no_acc_rows=$adb->num_rows($acc_result);
 



From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 17 03:45:49 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 10:45:49 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7221 -
	/vtigercrm/trunk/include/utils/ListViewUtils.php
Message-ID: <20060617104549.AADF07ED3CA@vtiger.fosslabs.com>

Author: saraj
Date: Sat Jun 17 04:45:45 2006
New Revision: 7221

Log:
* Modified to add the edit and del links in listview and related 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 Sat Jun 17 04:45:45 2006
@@ -202,6 +202,10 @@
 		}
 	}
      }
+
+	//Added for Action - edit and delete link header in listview
+	$list_header[] = $app_strings["LBL_ACTION"];
+
 	$log->debug("Exiting getListViewHeader method ...");
 	return $list_header;
 }
@@ -732,6 +736,23 @@
 			else
 				$varreturnset .= '&activity_mode=Events';
 		}
+
+		//Added for Actions ie., edit and delete links in listview 
+		$edit_link = getListViewEditLink($module,$entity_id,$relatedlist,$returnset);
+		$del_link = getListViewDeleteLink($module,$entity_id,$relatedlist,$returnset);
+
+		$list_header[] = "<a href=\"$edit_link\"> &nbsp;".$app_strings["LNK_EDIT"]." </a> | 
+				  <a href=\"javascript:;\" onclick=confirmdelete(\"$del_link\")> ".$app_strings["LNK_DELETE"]." </a>";
+		echo '<script>
+				function confirmdelete(url)
+		                {
+		                        if(confirm("Are you sure?"))
+		                        {
+		                                document.location.href=url;
+		                        }
+		                }
+		        </script>';
+
 		$list_block[$entity_id] = $list_header;
 
 	}
@@ -2609,5 +2630,56 @@
 		return $output;
 }
 
+/**	Function to get the Edit link details for ListView and RelatedListView
+ *	@param string 	$module 	- module name
+ *	@param int 	$entity_id 	- record id
+ *	@param string 	$relatedlist 	- string "relatedlist" or may be empty. if empty means ListView else relatedlist
+ *	@param string 	$returnset 	- may be empty in case of ListView. For relatedlists, return_module, return_action and return_id values will be passed like &return_module=Accounts&return_action=CallRelatedList&return_id=10
+ *	return string	$edit_link	- url string which cotains the editlink details (module, action, record, etc.,) like index.php?module=Accounts&action=EditView&record=10
+ */
+function getListViewEditLink($module,$entity_id,$relatedlist,$returnset)
+{
+	$edit_link = "index.php?module=$module&action=EditView&record=$entity_id";
+
+	//This is relatedlist listview
+	if($relatedlist == 'relatedlist')
+	{
+		$edit_link .= $returnset;
+	}
+	else
+	{
+		$edit_link .= "&return_module=$module&return_action=index";
+	}
+
+	$edit_link .= "&parenttab=".$_REQUEST["parenttab"];
+
+	return $edit_link;
+}
+
+/**	Function to get the Del link details for ListView and RelatedListView
+ *	@param string 	$module 	- module name
+ *	@param int 	$entity_id 	- record id
+ *	@param string 	$relatedlist 	- string "relatedlist" or may be empty. if empty means ListView else relatedlist
+ *	@param string 	$returnset 	- may be empty in case of ListView. For relatedlists, return_module, return_action and return_id values will be passed like &return_module=Accounts&return_action=CallRelatedList&return_id=10
+ *	return string	$del_link	- url string which cotains the editlink details (module, action, record, etc.,) like index.php?module=Accounts&action=Delete&record=10
+ */
+function getListViewDeleteLink($module,$entity_id,$relatedlist,$returnset)
+{
+	$del_link = "index.php?module=$module&action=Delete&record=$entity_id";
+
+	//This is added for relatedlist listview
+	if($relatedlist == 'relatedlist')
+	{
+		$del_link .= $returnset;
+	}
+	else
+	{
+		$del_link .= "&return_module=$module&return_action=index";
+	}
+
+	$del_link .= "&parenttab=".$_REQUEST["parenttab"];
+	
+	return $del_link;
+}
 
 ?>



From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 17 04:02:27 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 11:02:27 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7222 - in
 /vtigercrm/trunk/modules/Activities: Activity.php RenderRelatedListUI.php
Message-ID: <20060617110227.B51027ED3E5@vtiger.fosslabs.com>

Author: don
Date: Sat Jun 17 05:02:23 2006
New Revision: 7222

Log:
Fixed issues in vtiger_ prefixing in table names

Modified:
    vtigercrm/trunk/modules/Activities/Activity.php
    vtigercrm/trunk/modules/Activities/RenderRelatedListUI.php

Modified: vtigercrm/trunk/modules/Activities/Activity.php
==============================================================================
--- vtigercrm/trunk/modules/Activities/Activity.php (original)
+++ vtigercrm/trunk/modules/Activities/Activity.php Sat Jun 17 05:02:23 2006
@@ -32,16 +32,16 @@
 	var $log;
 	var $db;
 
-	var $table_name = "activity";
+	var $table_name = "vtiger_activity";
 	#var $object_name = "activity";	
 		// Mike Crowe Mod --------------------------------------------------------Renamed to match vtiger_tab
 	var $object_name = "Activities";
 	// Mike Crowe Mod --------------------------------------------------------added for general search
-    var $base_table_name = "activity";
+    var $base_table_name = "vtiger_activity";
     var $cf_table_name = "";
 	var $module_id = "activityid";
 	
-	var $reminder_table = "activity_reminder";
+	var $reminder_table = "vtiger_activity_reminder";
 	
 	var $tab_name = Array('vtiger_crmentity','vtiger_activity','vtiger_seactivityrel','vtiger_cntactivityrel','vtiger_salesmanactivityrel','vtiger_activity_reminder','vtiger_recurringevents','vtiger_invitees');
 
@@ -214,7 +214,7 @@
 				}
 
 			// To display the dates for the Group calendar starts -Jaguar
-			$recur_dates_qry='select distinct(recurringdate) from vtiger_recurringevents where vtiger_activityid='.$activity_id;
+			$recur_dates_qry='select distinct(recurringdate) from vtiger_recurringevents where activityid='.$activity_id;
 			$recur_result=$adb->query($recur_dates_qry);
 			$noofrows_recur = $adb->num_rows($recur_result);
 			if($noofrows_recur==0)
@@ -244,7 +244,7 @@
 					$owner=$row_owner['userid'];
 				}
 
-				$recur_dates_qry='select recurringdate from vtiger_recurringevents where vtiger_activityid ='.$activity_id;
+				$recur_dates_qry='select recurringdate from vtiger_recurringevents where activityid ='.$activity_id;
 				$recur_result=$adb->query($recur_dates_qry);
 				$noofrows_recur = $adb->num_rows($recur_result);
 				$userid=$row['id'];
@@ -359,7 +359,7 @@
     {   
 	global $log;
         $log->debug("Entering get_tasks(".$user_name.",".$from_index.",".$offset.") method ...");
-	 $query = "select vtiger_activity.subject as name,vtiger_crmentity.modifiedtime as date_modified, vtiger_activity.date_start start_date,vtiger_activity.activityid as id,vtiger_activity.status as status, vtiger_crmentity.description as description, vtiger_activity.priority as vtiger_priority, vtiger_activity.due_date as date_due ,vtiger_contactdetails.firstname cfn, vtiger_contactdetails.lastname cln from vtiger_activity inner join vtiger_salesmanactivityrel on vtiger_salesmanactivityrel.activityid=vtiger_activity.activityid inner join vtiger_users on vtiger_users.id=vtiger_salesmanactivityrel.smid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid=vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid=vtiger_cntactivityrel.contactid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid where user_name='" .$user_name ."' and vtiger_crmentity.deleted=0 and vtiger_activity.activitytype='Task' limit " .$from_index ."," .$offset;
+	 $query = "select vtiger_activity.subject as name,vtiger_crmentity.modifiedtime as date_modified, vtiger_activity.date_start start_date,vtiger_activity.activityid as id,vtiger_activity.status as status, vtiger_crmentity.description as description, vtiger_activity.priority as priority, vtiger_activity.due_date as date_due ,vtiger_contactdetails.firstname cfn, vtiger_contactdetails.lastname cln from vtiger_activity inner join vtiger_salesmanactivityrel on vtiger_salesmanactivityrel.activityid=vtiger_activity.activityid inner join vtiger_users on vtiger_users.id=vtiger_salesmanactivityrel.smid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid=vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid=vtiger_cntactivityrel.contactid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid where user_name='" .$user_name ."' and vtiger_crmentity.deleted=0 and vtiger_activity.activitytype='Task' limit " .$from_index ."," .$offset;
 	 $log->debug("Exiting get_tasks method ...");
     return $this->process_list_query1($query);
     
@@ -413,7 +413,7 @@
 		global $log;
 		$log->debug("Entering vtiger_activity_reminder(".$activity_id.",".$reminder_time.",".$reminder_sent.",".$recurid.",".$remindermode.") method ...");
 		//Check for vtiger_activityid already present in the reminder_table
-		$query_exist = "SELECT vtiger_activity_id FROM ".$this->reminder_table." WHERE vtiger_activity_id = ".$activity_id;
+		$query_exist = "SELECT activity_id FROM ".$this->reminder_table." WHERE activity_id = ".$activity_id;
 		$result_exist = $this->db->query($query_exist);
 
 		if($remindermode == 'edit')
@@ -422,7 +422,7 @@
 			{
 				$query = "UPDATE ".$this->reminder_table." SET";
 				$query .=" reminder_sent = ".$reminder_sent.",";
-				$query .=" reminder_time = ".$reminder_time." WHERE vtiger_activity_id =".$activity_id; 
+				$query .=" reminder_time = ".$reminder_time." WHERE activity_id =".$activity_id; 
 			}
 			else
 			{
@@ -431,7 +431,7 @@
 		}
 		elseif(($remindermode == 'delete') && ($this->db->num_rows($result_exist) == 1))
 		{
-			$query = "DELETE FROM ".$this->reminder_table." WHERE vtiger_activity_id = ".$activity_id;
+			$query = "DELETE FROM ".$this->reminder_table." WHERE activity_id = ".$activity_id;
 		}
 		else
 		{

Modified: vtigercrm/trunk/modules/Activities/RenderRelatedListUI.php
==============================================================================
--- vtigercrm/trunk/modules/Activities/RenderRelatedListUI.php (original)
+++ vtigercrm/trunk/modules/Activities/RenderRelatedListUI.php Sat Jun 17 05:02:23 2006
@@ -64,11 +64,11 @@
 		if( $owner != $userid)
 		{
 			
-			$usr_query="select vtiger_activityid,vtiger_activity.date_start,vtiger_activity.due_date, vtiger_activity.time_start,vtiger_activity.duration_hours,vtiger_activity.duration_minutes,vtiger_crmentity.smownerid from vtiger_activity,crmentity where vtiger_crmentity.crmid=vtiger_activity.activityid and ('".$avail_date."' like date_start) and vtiger_crmentity.smownerid=".$userid." and vtiger_activity.activityid !=".$activity_id."  and vtiger_crmentity.deleted=0";
+			$usr_query="select activityid,vtiger_activity.date_start,vtiger_activity.due_date, vtiger_activity.time_start,vtiger_activity.duration_hours,vtiger_activity.duration_minutes,vtiger_crmentity.smownerid from vtiger_activity,crmentity where vtiger_crmentity.crmid=vtiger_activity.activityid and ('".$avail_date."' like date_start) and vtiger_crmentity.smownerid=".$userid." and vtiger_activity.activityid !=".$activity_id."  and vtiger_crmentity.deleted=0";
 		}
 		else
 		{
-			$usr_query="select vtiger_activityid,vtiger_activity.date_start,vtiger_activity.due_date, vtiger_activity.time_start,vtiger_activity.duration_hours,vtiger_activity.duration_minutes,vtiger_crmentity.smownerid from vtiger_activity,crmentity where vtiger_crmentity.crmid=vtiger_activity.activityid and ('".$avail_date."' like date_start) and vtiger_crmentity.smownerid=".$userid." and vtiger_activity.activityid !=".$activity_id." and vtiger_crmentity.deleted=0";
+			$usr_query="select activityid,vtiger_activity.date_start,vtiger_activity.due_date, vtiger_activity.time_start,vtiger_activity.duration_hours,vtiger_activity.duration_minutes,vtiger_crmentity.smownerid from vtiger_activity,crmentity where vtiger_crmentity.crmid=vtiger_activity.activityid and ('".$avail_date."' like date_start) and vtiger_crmentity.smownerid=".$userid." and vtiger_activity.activityid !=".$activity_id." and vtiger_crmentity.deleted=0";
 		}
 		$result_cal=$adb->query($usr_query);   
 		$noofrows_cal = $adb->num_rows($result_cal);



From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 17 04:07:45 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 11:07:45 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7223 -
 /vtigercrm/trunk/Smarty/templates/CurrencyEditView.tpl
Message-ID: <20060617110745.9F4207ED3E5@vtiger.fosslabs.com>

Author: saraj
Date: Sat Jun 17 05:07:40 2006
New Revision: 7223

Log:
changes made to fix the issue 1122

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

Modified: vtigercrm/trunk/Smarty/templates/CurrencyEditView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/CurrencyEditView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/CurrencyEditView.tpl Sat Jun 17 05:07:40 2006
@@ -51,19 +51,19 @@
 							<hr /> </td>
 						</tr>
 					        <tr>
-							<td align="right" width="25%"><b>{$MOD.LBL_CURRENCY_NAME} : </b></td>
+							<td align="right" width="25%"><font color="red">*</font><b>{$MOD.LBL_CURRENCY_NAME} : </b></td>
 							<td width="50%" align="left" ><input type="text" name="currency_name" value="{$CURRENCY_NAME}" class="txtBox" /></td>
 						</tr>
 						<tr>
-							<td align="right"><b>{$MOD.LBL_CURRENCY_CODE} : </b></td>
+							<td align="right"><font color="red">*</font><b>{$MOD.LBL_CURRENCY_CODE} : </b></td>
 							<td><input type="text" name="currency_code" value="{$CURRENCY_CODE}" class="txtBox" /></td>
 						</tr>
 						<tr>
-							<td align="right"><b>{$MOD.LBL_CURRENCY_SYMBOL} : </b></td>
+							<td align="right"><font color="red">*</font><b>{$MOD.LBL_CURRENCY_SYMBOL} : </b></td>
 							<td><input type="text" name="currency_symbol" value="{$CURRENCY_SYMBOL}" class="txtBox" /></td>
 						</tr>
 						<tr>
-							<td align="right"><b>{$MOD.LBL_CURRENCY_CRATE}  : </b></td>
+							<td align="right"><font color="red">*</font><b>{$MOD.LBL_CURRENCY_CRATE}  : </b></td>
 							<td>
 								<input type="text" name="conversion_rate" value="{$CONVERSION_RATE}" class="txtBox" />
 								<br>(Eg: 1 U.S. Dollar equal to 0.78 Euro) 



From vtiger-tickets at vtiger.fosslabs.com  Sat Jun 17 04:08:47 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sat, 17 Jun 2006 11:08:47 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231122=3A?=
 =?utf-8?q?_required_symbol_in_currency_editview_is_missing?=
In-Reply-To: <076.e304b32450477f1ef20d72ae1c371e6d@vtiger.fosslabs.com>
References: <076.e304b32450477f1ef20d72ae1c371e6d@vtiger.fosslabs.com>
Message-ID: <085.5cc1f52512386b8ba41840cfd95458bb@vtiger.fosslabs.com>

#1122: required symbol in currency editview is missing
------------------------+---------------------------------------------------
  Reporter:  mangai     |       Owner:  mangai
      Type:  defect     |      Status:  closed
  Priority:  minor      |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mangai):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 fixed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1122>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 17 04:15:07 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 11:15:07 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7224 - in
 /vtigercrm/trunk/modules: Accounts/ Campaigns/ Contacts/ Emails/ HelpDesk/
 Leads/ Potentials/ PriceBooks/ Products/ PurchaseOrder/ Quotes/ Vendors/
Message-ID: <20060617111507.9BD9D7ED3E5@vtiger.fosslabs.com>

Author: saraj
Date: Sat Jun 17 05:14:50 2006
New Revision: 7224

Log:
* Modified the return module name in the returnset which will be used in the relatedlist

Modified:
    vtigercrm/trunk/modules/Accounts/Account.php
    vtigercrm/trunk/modules/Campaigns/Campaign.php
    vtigercrm/trunk/modules/Contacts/Contact.php
    vtigercrm/trunk/modules/Emails/Email.php
    vtigercrm/trunk/modules/HelpDesk/HelpDesk.php
    vtigercrm/trunk/modules/Leads/Lead.php
    vtigercrm/trunk/modules/Potentials/Opportunity.php
    vtigercrm/trunk/modules/PriceBooks/PriceBook.php
    vtigercrm/trunk/modules/Products/Product.php
    vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php
    vtigercrm/trunk/modules/Quotes/Quote.php
    vtigercrm/trunk/modules/Vendors/Vendor.php

Modified: vtigercrm/trunk/modules/Accounts/Account.php
==============================================================================
--- vtigercrm/trunk/modules/Accounts/Account.php (original)
+++ vtigercrm/trunk/modules/Accounts/Account.php Sat Jun 17 05:14:50 2006
@@ -146,7 +146,7 @@
 		{
 			$button .= '<input title="New Contact" accessyKey="F" class="button" onclick="this.form.action.value=\'EditView\';this.form.module.value=\'Contacts\'" type="submit" name="button" value="'.$mod_strings['LBL_NEW_CONTACT'].'">&nbsp;</td>';
 		}
-		$returnset = '&return_module=Accounts&return_action=DetailView&return_id='.$id;
+		$returnset = '&return_module=Accounts&return_action=CallRelatedList&return_id='.$id;
 
 		//SQL
 		$query = "SELECT vtiger_contactdetails.*,
@@ -186,7 +186,7 @@
 		{
 			$button .= '<input title="New Potential" accessyKey="F" class="button" onclick="this.form.action.value=\'EditView\';this.form.module.value=\'Potentials\'" type="submit" name="button" value="'.$mod_strings['LBL_NEW_POTENTIAL'].'">';
 		}
-		$returnset = '&return_module=Accounts&return_action=DetailView&return_id='.$id;
+		$returnset = '&return_module=Accounts&return_action=CallRelatedList&return_id='.$id;
 
 		$query = "SELECT vtiger_potential.potentialid, vtiger_potential.accountid,
 			vtiger_potential.potentialname, vtiger_potential.sales_stage,
@@ -229,7 +229,7 @@
 			$button .= '<input title="New Task" accessyKey="F" class="button" onclick="this.form.action.value=\'EditView\';this.form.return_action.value=\'DetailView\';this.form.module.value=\'Activities\';this.form.return_module.value=\'Accounts\';this.form.activity_mode.value=\'Task\'" type="submit" name="button" value="'.$mod_strings['LBL_NEW_TASK'].'">&nbsp;';
 			$button .= '<input title="New Event" accessyKey="F" class="button" onclick="this.form.action.value=\'EditView\';this.form.return_action.value=\'DetailView\';this.form.module.value=\'Activities\';this.form.return_module.value=\'Accounts\';this.form.activity_mode.value=\'Events\'" type="submit" name="button" value="'.$app_strings['LBL_NEW_EVENT'].'">&nbsp;</td>';
 		}
-		$returnset = '&return_module=Accounts&return_action=DetailView&return_id='.$id;
+		$returnset = '&return_module=Accounts&return_action=CallRelatedList&return_id='.$id;
 
 		$query = "SELECT vtiger_activity.*,
 			vtiger_seactivityrel.*,
@@ -378,8 +378,7 @@
 		{
 			$button .= '<input title="'.$app_strings['LBL_NEW_QUOTE_BUTTON_TITLE'].'" accessyKey="'.$app_strings['LBL_NEW_QUOTE_BUTTON_KEY'].'" class="button" onclick="this.form.action.value=\'EditView\';this.form.module.value=\'Quotes\'" type="submit" name="button" value="'.$app_strings['LBL_NEW_QUOTE_BUTTON'].'">&nbsp;</td>';
 		}
-		$returnset = '&return_module=Accounts&return_action=DetailView&return_id='.$id;
-
+		$returnset = '&return_module=Accounts&return_action=CallRelatedList&return_id='.$id;
 
 		$query = "SELECT vtiger_users.user_name,
 			vtiger_groups.groupname,
@@ -419,7 +418,7 @@
 		{
 			$button .= '<input title="'.$app_strings['LBL_NEW_INVOICE_BUTTON_TITLE'].'" accessyKey="'.$app_strings['LBL_NEW_INVOICE_BUTTON_KEY'].'" class="button" onclick="this.form.action.value=\'EditView\';this.form.module.value=\'Invoice\'" type="submit" name="button" value="'.$app_strings['LBL_NEW_INVOICE_BUTTON'].'">&nbsp;</td>';
 		}
-		$returnset = '&return_module=Accounts&return_action=DetailView&return_id='.$id;
+		$returnset = '&return_module=Accounts&return_action=CallRelatedList&return_id='.$id;
 
 		$query = "SELECT vtiger_users.user_name,
 			vtiger_groups.groupname,
@@ -460,7 +459,7 @@
 			$button .= '<input title="'.$app_strings['LBL_NEW_SORDER_BUTTON_TITLE'].'" accessyKey="'.$app_strings['LBL_NEW_SORDER_BUTTON_KEY'].'" class="button" onclick="this.form.action.value=\'EditView\';this.form.module.value=\'SalesOrder\'" type="submit" name="button" value="'.$app_strings['LBL_NEW_SORDER_BUTTON'].'">&nbsp;</td>';
 		}
 
-		$returnset = '&return_module=Accounts&return_action=DetailView&return_id='.$id;
+		$returnset = '&return_module=Accounts&return_action=CallRelatedList&return_id='.$id;
 
 		$query = "SELECT vtiger_crmentity.*,
 			vtiger_salesorder.*,
@@ -496,7 +495,7 @@
 		$button = '';
 
 		$button .= '<td valign="bottom" align="right"><input title="New TICKET" accessyKey="F" class="button" onclick="this.form.action.value=\'EditView\';this.form.module.value=\'HelpDesk\'" type="submit" name="button" value="'.$app_strings['LBL_NEW_TICKET'].'">&nbsp;</td>';
-		$returnset = '&return_module=Accounts&return_action=DetailView&return_id='.$id;
+		$returnset = '&return_module=Accounts&return_action=CallRelatedList&return_id='.$id;
 
 		$query = "SELECT vtiger_users.user_name, vtiger_users.id,
 			vtiger_troubletickets.title, vtiger_troubletickets.ticketid AS crmid,
@@ -567,7 +566,7 @@
 
 			$button .= '<input title="New Product" accessyKey="F" class="button" onclick="this.form.action.value=\'EditView\';this.form.module.value=\'Products\';this.form.return_module.value=\'Accounts\';this.form.return_action.value=\'DetailView\'" type="submit" name="button" value="'.$app_strings['LBL_NEW_PRODUCT'].'">&nbsp;';
 		}
-		$returnset = '&return_module=Accounts&return_action=DetailView&return_id='.$id;
+		$returnset = '&return_module=Accounts&return_action=CallRelatedList&return_id='.$id;
 
 		$query = "SELECT vtiger_products.productid, vtiger_products.productname,
 			vtiger_products.productcode, vtiger_products.commissionrate,

Modified: vtigercrm/trunk/modules/Campaigns/Campaign.php
==============================================================================
--- vtigercrm/trunk/modules/Campaigns/Campaign.php (original)
+++ vtigercrm/trunk/modules/Campaigns/Campaign.php Sat Jun 17 05:14:50 2006
@@ -74,7 +74,7 @@
 
                 $focus = new Contact();
                 $button = '';
-                $returnset = '&return_module=Campaigns&return_action=DetailView&return_id='.$id;
+                $returnset = '&return_module=Campaigns&return_action=CallRelatedList&return_id='.$id;
 		//$query = 'select vtiger_contactdetails.accountid, vtiger_users.user_name,vtiger_groups.groupname,vtiger_campaign.campaignid, vtiger_campaign.campaignname, vtiger_contactdetails.contactid, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.title, vtiger_contactdetails.department, vtiger_contactdetails.email, vtiger_contactdetails.phone, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_campaign inner join vtiger_campaigncontrel on vtiger_campaigncontrel.campaignid = vtiger_campaign.campaignid inner join vtiger_contactdetails on vtiger_campaigncontrel.contactid = vtiger_contactdetails.contactid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid left join vtiger_groups on vtiger_groups.groupname=vtiger_contactgrouprelation.groupname left join vtiger_users on vtiger_crmentity.smownerid=vtiger_users.id where vtiger_campaign.campaignid = '.$id.' and vtiger_crmentity.deleted=0';
 
 		$query = 'SELECT vtiger_contactdetails.*, vtiger_crmentity.crmid, vtiger_users.user_name, vtiger_groups.groupname, vtiger_crmentity.smownerid from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid left join vtiger_users on vtiger_crmentity.smownerid = vtiger_users.id left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid left join vtiger_groups on vtiger_groups.groupname=vtiger_contactgrouprelation.groupname  where vtiger_crmentity.deleted=0 and vtiger_contactdetails.campaignid = '.$id;
@@ -90,7 +90,7 @@
                 $focus = new Lead();
 
                 $button = '';
-                $returnset = '&return_module=Campaigns&return_action=DetailView&return_id='.$id;
+                $returnset = '&return_module=Campaigns&return_action=CallRelatedList&return_id='.$id;
 
 		$query = 'SELECT vtiger_leaddetails.*, vtiger_crmentity.crmid, vtiger_users.user_name, vtiger_groups.groupname, vtiger_crmentity.smownerid from vtiger_leaddetails inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_leaddetails.leadid left join vtiger_users on vtiger_crmentity.smownerid = vtiger_users.id left join vtiger_leadgrouprelation on vtiger_leaddetails.leadid=vtiger_leadgrouprelation.leadid left join vtiger_groups on vtiger_groups.groupname=vtiger_leadgrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_leaddetails.campaignid = '.$id;
 		$log->debug("Exiting get_leads method ...");
@@ -105,7 +105,7 @@
 		$focus = new Potential();
 
 		$button = '';
-		$returnset = '&return_module=Campaigns&return_action=DetailView&return_id='.$id;
+		$returnset = '&return_module=Campaigns&return_action=CallRelatedList&return_id='.$id;
 
 		$query = 'select vtiger_users.user_name,vtiger_groups.groupname, vtiger_potential.potentialid, vtiger_potential.potentialname, vtiger_potential.potentialtype, vtiger_potential.sales_stage, vtiger_potential.amount, vtiger_potential.closingdate, vtiger_crmentity.crmid, vtiger_crmentity.smownerid from vtiger_campaign inner join vtiger_potential on vtiger_campaign.campaignid = vtiger_potential.campaignid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_potential.potentialid left join vtiger_potentialgrouprelation on vtiger_potential.potentialid=vtiger_potentialgrouprelation.potentialid left join vtiger_groups on vtiger_groups.groupname=vtiger_potentialgrouprelation.groupname left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_campaign.campaignid = '.$id.' and vtiger_crmentity.deleted=0';
 		if($this->column_fields['account_id'] != 0)
@@ -125,7 +125,7 @@
 
 		$button = '';
 
-		$returnset = '&return_module=Products&return_action=DetailView&return_id='.$id;
+		$returnset = '&return_module=Products&return_action=CallRelatedList&return_id='.$id;
 
 		$query = "SELECT vtiger_contactdetails.lastname,
 			vtiger_contactdetails.firstname,

Modified: vtigercrm/trunk/modules/Contacts/Contact.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/Contact.php (original)
+++ vtigercrm/trunk/modules/Contacts/Contact.php Sat Jun 17 05:14:50 2006
@@ -256,7 +256,7 @@
 
 			$button .= '<input title="New Potential" accessyKey="F" class="button" onclick="this.form.action.value=\'EditView\';this.form.module.value=\'Potentials\'" type="submit" name="button" value="'.$mod_strings['LBL_NEW_POTENTIAL'].'">&nbsp;';
 		}
-		$returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id;
+		$returnset = '&return_module=Contacts&return_action=CallRelatedList&return_id='.$id;
 
 		$log->info("Potential Related List for Contact Displayed");
 
@@ -288,7 +288,7 @@
 		$button .= '<input title="New Task" accessyKey="F" class="button" onclick="this.form.action.value=\'EditView\';this.form.return_action.value=\'DetailView\';this.form.module.value=\'Activities\';this.form.activity_mode.value=\'Task\';this.form.return_module.value=\'Contacts\'" type="submit" name="button" value="'.$mod_strings['LBL_NEW_TASK'].'">&nbsp;';
 		$button .= '<input title="New Event" accessyKey="F" class="button" onclick="this.form.action.value=\'EditView\';this.form.return_action.value=\'DetailView\';this.form.module.value=\'Activities\';this.form.return_module.value=\'Contacts\';this.form.activity_mode.value=\'Events\'" type="submit" name="button" value="'.$app_strings['LBL_NEW_EVENT'].'">&nbsp;';
 		}
-		$returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id;
+		$returnset = '&return_module=Contacts&return_action=CallRelatedList&return_id='.$id;
 
 		$log->info("Activity Related List for Contact Displayed");
 
@@ -330,7 +330,7 @@
 		$focus = new HelpDesk();
 
 		$button = '<td valign="bottom" align="right"><input title="New Ticket" accessyKey="F" class="button" onclick="this.form.action.value=\'EditView\';this.form.module.value=\'HelpDesk\'" type="submit" name="button" value="'.$app_strings['LBL_NEW_TICKET'].'">&nbsp;</td>';
-		$returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id;
+		$returnset = '&return_module=Contacts&return_action=CallRelatedList&return_id='.$id;
 
 		$query = "select vtiger_users.user_name,vtiger_crmentity.crmid, vtiger_troubletickets.title, vtiger_contactdetails.contactid, vtiger_troubletickets.parent_id, vtiger_contactdetails.firstname, vtiger_contactdetails.lastname, vtiger_troubletickets.status, vtiger_troubletickets.priority, vtiger_crmentity.smownerid from vtiger_troubletickets inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_troubletickets.ticketid left join vtiger_contactdetails on vtiger_contactdetails.contactid=vtiger_troubletickets.parent_id left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_ticketgrouprelation on vtiger_troubletickets.ticketid=vtiger_ticketgrouprelation.ticketid left join vtiger_groups on vtiger_groups.groupname=vtiger_ticketgrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_contactdetails.contactid=".$id;
 		$log->info("Ticket Related List for Contact Displayed");
@@ -383,7 +383,7 @@
         {
 		$button .= '<input title="'.$app_strings['LBL_NEW_QUOTE_BUTTON_TITLE'].'" accessyKey="'.$app_strings['LBL_NEW_QUOTE_BUTTON_KEY'].'" class="button" onclick="this.form.action.value=\'EditView\';this.form.module.value=\'Quotes\'" type="submit" name="button" value="'.$app_strings['LBL_NEW_QUOTE_BUTTON'].'">&nbsp;</td>';
 		}
-		$returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id;
+		$returnset = '&return_module=Contacts&return_action=CallRelatedList&return_id='.$id;
 		$query = "select vtiger_users.user_name,vtiger_crmentity.*, vtiger_quotes.*,vtiger_potential.potentialname,vtiger_contactdetails.lastname from vtiger_quotes inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_quotes.quoteid left outer join vtiger_contactdetails on vtiger_contactdetails.contactid=vtiger_quotes.contactid left outer join vtiger_potential on vtiger_potential.potentialid=vtiger_quotes.potentialid  left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_quotegrouprelation on vtiger_quotes.quoteid=vtiger_quotegrouprelation.quoteid left join vtiger_groups on vtiger_groups.groupname=vtiger_quotegrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_contactdetails.contactid=".$id;
 		$log->debug("Exiting get_quotes method ...");
 		return GetRelatedList('Contacts','Quotes',$focus,$query,$button,$returnset);
@@ -403,7 +403,7 @@
 
 			 $button .= '<input title="'.$app_strings['LBL_NEW_SORDER_BUTTON_TITLE'].'" accessyKey="O" class="button" onclick="this.form.action.value=\'EditView\';this.form.module.value=\'SalesOrder\';this.form.return_module.value=\'Contacts\';this.form.return_action.value=\'DetailView\'" type="submit" name="button" value="'.$app_strings['LBL_NEW_SORDER_BUTTON'].'">&nbsp;';
 		 }
-		 $returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id;
+		 $returnset = '&return_module=Contacts&return_action=CallRelatedList&return_id='.$id;
 
 		 $query = "select vtiger_users.user_name,vtiger_crmentity.*, vtiger_salesorder.*, vtiger_quotes.subject as quotename, vtiger_account.accountname, vtiger_contactdetails.lastname from vtiger_salesorder inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_salesorder.salesorderid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left outer join vtiger_quotes on vtiger_quotes.quoteid=vtiger_salesorder.quoteid left outer join vtiger_account on vtiger_account.accountid=vtiger_salesorder.accountid left outer join vtiger_contactdetails on vtiger_contactdetails.contactid=vtiger_salesorder.contactid left join vtiger_sogrouprelation on vtiger_salesorder.salesorderid=vtiger_sogrouprelation.salesorderid left join vtiger_groups on vtiger_groups.groupname=vtiger_sogrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_salesorder.contactid = ".$id;
 		$log->debug("Exiting get_salesorder method ...");
@@ -424,7 +424,7 @@
 
 			 $button .= '<input title="'.$app_strings['LBL_NEW_PRODUCT'].'" accessyKey="F" class="button" onclick="this.form.action.value=\'EditView\';this.form.module.value=\'Products\';this.form.return_module.value=\'Contacts\';this.form.return_action.value=\'DetailView\'" type="submit" name="button" value="'.$app_strings['LBL_NEW_PRODUCT'].'">&nbsp;';
 		 }
-		 $returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id;
+		 $returnset = '&return_module=Contacts&return_action=CallRelatedList&return_id='.$id;
 
 		 $query = 'select vtiger_products.productid, vtiger_products.productname, vtiger_products.productcode, vtiger_products.commissionrate, vtiger_products.qty_per_unit, vtiger_products.unit_price, vtiger_crmentity.crmid, vtiger_crmentity.smownerid,vtiger_contactdetails.lastname from vtiger_products inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_products.productid left outer join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_products.contactid where vtiger_contactdetails.contactid = '.$id.' and vtiger_crmentity.deleted = 0';
 		$log->debug("Exiting get_products method ...");
@@ -446,7 +446,7 @@
 
 			 $button .= '<input title="'.$app_strings['LBL_PORDER_BUTTON_TITLE'].'" accessyKey="O" class="button" onclick="this.form.action.value=\'EditView\';this.form.module.value=\'PurchaseOrder\';this.form.return_module.value=\'Contacts\';this.form.return_action.value=\'DetailView\'" type="submit" name="button" value="'.$app_strings['LBL_PORDER_BUTTON'].'">&nbsp;';
 		 }
-		 $returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id;
+		 $returnset = '&return_module=Contacts&return_action=CallRelatedList&return_id='.$id;
 
 		 $query = "select vtiger_users.user_name,vtiger_crmentity.*, vtiger_purchaseorder.*,vtiger_vendor.vendorname,vtiger_contactdetails.lastname from vtiger_purchaseorder inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_purchaseorder.purchaseorderid left outer join vtiger_vendor on vtiger_purchaseorder.vendorid=vtiger_vendor.vendorid left outer join vtiger_contactdetails on vtiger_contactdetails.contactid=vtiger_purchaseorder.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_pogrouprelation on vtiger_purchaseorder.purchaseorderid=vtiger_pogrouprelation.purchaseorderid left join vtiger_groups on vtiger_groups.groupname=vtiger_pogrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_purchaseorder.contactid=".$id;
 		$log->debug("Exiting get_purchase_orders method ...");
@@ -472,7 +472,7 @@
 		{	
 			$button .= '<input title="New Email" accessyKey="F" class="button" onclick="this.form.action.value=\'EditView\';this.form.module.value=\'Emails\';this.form.email_directing_module.value=\'contacts\';this.form.record.value='.$id.';this.form.return_action.value=\'DetailView\'" type="submit" name="button" value="'.$mod_strings['LBL_NEW_EMAIL'].'">';
 		}
-		$returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id;
+		$returnset = '&return_module=Contacts&return_action=CallRelatedList&return_id='.$id;
 
 		$log->info("Email Related List for Contact Displayed");
 

Modified: vtigercrm/trunk/modules/Emails/Email.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/Email.php (original)
+++ vtigercrm/trunk/modules/Emails/Email.php Sat Jun 17 05:14:50 2006
@@ -99,7 +99,7 @@
 		$focus = new Contact();
 
 		$button = '';
-		$returnset = '&return_module=Emails&return_action=DetailView&return_id='.$id;
+		$returnset = '&return_module=Emails&return_action=CallRelatedList&return_id='.$id;
 
 		$query = 'select vtiger_contactdetails.accountid, vtiger_contactdetails.contactid, vtiger_contactdetails.firstname,vtiger_contactdetails.lastname, vtiger_contactdetails.department, vtiger_contactdetails.title, vtiger_contactdetails.email, vtiger_contactdetails.phone, vtiger_contactdetails.emailoptout, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_contactdetails inner join vtiger_cntactivityrel on vtiger_cntactivityrel.contactid=vtiger_contactdetails.contactid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid left join vtiger_groups on vtiger_groups.groupname=vtiger_contactgrouprelation.groupname where vtiger_cntactivityrel.activityid='.$adb->quote($id).' and vtiger_crmentity.deleted=0';
 		$log->info("Contact Related List for Email is Displayed");

Modified: vtigercrm/trunk/modules/HelpDesk/HelpDesk.php
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/HelpDesk.php (original)
+++ vtigercrm/trunk/modules/HelpDesk/HelpDesk.php Sat Jun 17 05:14:50 2006
@@ -122,7 +122,7 @@
 
 		$button = '';
 
-		$returnset = '&return_module=HelpDesk&return_action=DetailView&return_id='.$id;
+		$returnset = '&return_module=HelpDesk&return_action=CallRelatedList&return_id='.$id;
 
 		$query = "SELECT vtiger_activity.*, vtiger_crmentity.crmid, vtiger_contactdetails.contactid, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_recurringevents.recurringtype, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid= vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting')";
 		$log->debug("Exiting get_activities method ...");

Modified: vtigercrm/trunk/modules/Leads/Lead.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/Lead.php (original)
+++ vtigercrm/trunk/modules/Leads/Lead.php Sat Jun 17 05:14:50 2006
@@ -189,7 +189,7 @@
 		$button .= '<input title="New Task" accessyKey="F" class="button" onclick="this.form.action.value=\'EditView\';this.form.return_action.value=\'DetailView\';this.form.module.value=\'Activities\';i;this.form.return_module.value=\'Leads\';this.form.activity_mode.value=\'Task\'" type="submit" name="button" value="'.$mod_strings['LBL_NEW_TASK'].'">&nbsp;';
 		$button .= '<input title="New Event" accessyKey="F" class="button" onclick="this.form.action.value=\'EditView\';this.form.return_action.value=\'DetailView\';this.form.module.value=\'Activities\';this.form.return_module.value=\'Leads\';this.form.activity_mode.value=\'Events\'" type="submit" name="button" value="'.$app_strings['LBL_NEW_EVENT'].'">&nbsp;</td>';
 	}
-	$returnset = '&return_module=Leads&return_action=DetailView&return_id='.$id;
+	$returnset = '&return_module=Leads&return_action=CallRelatedList&return_id='.$id;
 
 
 	// First, get the list of IDs.
@@ -216,7 +216,7 @@
 
 		$button .= '<input title="New Email" accessyKey="F" class="button" onclick="this.form.action.value=\'EditView\';this.form.return_action.value=\'DetailView\';this.form.module.value=\'Emails\';this.form.email_directing_module.value=\'leads\';this.form.record.value='.$id.';this.form.return_action.value=\'DetailView\'" type="submit" name="button" value="'.$mod_strings['LBL_NEW_EMAIL'].'">&nbsp;';
 	}
-	$returnset = '&return_module=Leads&return_action=DetailView&return_id='.$id;
+	$returnset = '&return_module=Leads&return_action=CallRelatedList&return_id='.$id;
 
 	$query ="select vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.semodule, vtiger_activity.activitytype, vtiger_activity.date_start, vtiger_activity.status, vtiger_activity.priority, vtiger_crmentity.crmid,vtiger_crmentity.smownerid,vtiger_crmentity.modifiedtime, vtiger_users.user_name from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid inner join vtiger_users on  vtiger_users.id=vtiger_crmentity.smownerid where vtiger_activity.activitytype='Emails' and vtiger_crmentity.deleted=0 and vtiger_seactivityrel.crmid=".$id;
 	$log->debug("Exiting get_emails method ...");
@@ -304,7 +304,7 @@
 	{
 		$button .= '<input title="New Product" accessyKey="F" class="button" onclick="this.form.action.value=\'EditView\';this.form.module.value=\'Products\';this.form.return_module.value=\'Leads\';this.form.return_action.value=\'DetailView\'" type="submit" name="button" value="'.$app_strings['LBL_NEW_PRODUCT'].'">&nbsp;';
 	}
-	$returnset = '&return_module=Leads&return_action=DetailView&return_id='.$id;
+	$returnset = '&return_module=Leads&return_action=CallRelatedList&return_id='.$id;
 
 	$query = 'select vtiger_products.productid, vtiger_products.productname, vtiger_products.productcode, vtiger_products.commissionrate, vtiger_products.qty_per_unit, vtiger_products.unit_price, vtiger_crmentity.crmid, vtiger_crmentity.smownerid from vtiger_products inner join vtiger_seproductsrel on vtiger_products.productid = vtiger_seproductsrel.productid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_products.productid inner join vtiger_leaddetails on vtiger_leaddetails.leadid = vtiger_seproductsrel.crmid  where vtiger_leaddetails.leadid = '.$id.' and vtiger_crmentity.deleted = 0';
 	$log->debug("Exiting get_products method ...");

Modified: vtigercrm/trunk/modules/Potentials/Opportunity.php
==============================================================================
--- vtigercrm/trunk/modules/Potentials/Opportunity.php (original)
+++ vtigercrm/trunk/modules/Potentials/Opportunity.php Sat Jun 17 05:14:50 2006
@@ -218,7 +218,7 @@
 
 			$button .= '<input title="Change" accessKey="" tabindex="2" type="button" class="button" value="'.$app_strings['LBL_SELECT_CONTACT_BUTTON_LABEL'].'" name="Button" LANGUAGE=javascript onclick=\'return window.open("index.php?module=Contacts&action=Popup&return_module=Potentials&popuptype=detailview&form=EditView&form_submit=false&recordid='.$_REQUEST["record"].'","test","width=600,height=400,resizable=1,scrollbars=1");\'>&nbsp;';
 		}
-		$returnset = '&return_module=Potentials&return_action=DetailView&return_id='.$id;
+		$returnset = '&return_module=Potentials&return_action=CallRelatedList&return_id='.$id;
 
 		$query = 'select vtiger_contactdetails.accountid, vtiger_users.user_name,vtiger_groups.groupname,vtiger_potential.potentialid, vtiger_potential.potentialname, vtiger_contactdetails.contactid, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.title, vtiger_contactdetails.department, vtiger_contactdetails.email, vtiger_contactdetails.phone, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_potential inner join vtiger_contpotentialrel on vtiger_contpotentialrel.potentialid = vtiger_potential.potentialid inner join vtiger_contactdetails on vtiger_contpotentialrel.contactid = vtiger_contactdetails.contactid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid left join vtiger_groups on vtiger_groups.groupname=vtiger_contactgrouprelation.groupname left join vtiger_users on vtiger_crmentity.smownerid=vtiger_users.id where vtiger_potential.potentialid = '.$id.' and vtiger_crmentity.deleted=0';
 		
@@ -247,7 +247,7 @@
 			$button .= '<input title="New Task" accessyKey="F" class="button" onclick="this.form.action.value=\'EditView\';this.form.return_action.value=\'DetailView\';this.form.module.value=\'Activities\';this.form.activity_mode.value=\'Task\';this.form.return_module.value=\'Potentials\'" type="submit" name="button" value="'.$mod_strings['LBL_NEW_TASK'].'">&nbsp;';
 			$button .= '<input title="New Event" accessyKey="F" class="button" onclick="this.form.action.value=\'EditView\';this.form.return_action.value=\'DetailView\';this.form.module.value=\'Activities\';this.form.return_module.value=\'Potentials\';this.form.activity_mode.value=\'Events\'" type="submit" name="button" value="'.$app_strings['LBL_NEW_EVENT'].'">&nbsp;';
 		}
-		$returnset = '&return_module=Potentials&return_action=DetailView&return_id='.$id;
+		$returnset = '&return_module=Potentials&return_action=CallRelatedList&return_id='.$id;
 
 		$query = "SELECT vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name, vtiger_recurringevents.recurringtype, vtiger_contactdetails.contactid, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid inner join vtiger_potential on vtiger_potential.potentialid=vtiger_seactivityrel.crmid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid= vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid where vtiger_seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting') and vtiger_crmentity.deleted=0 and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Completed') and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Deferred') or (vtiger_activity.eventstatus != '' &&  vtiger_activity.eventstatus != 'Held')";
 		$log->debug("Exiting get_activities method ...");
@@ -277,7 +277,7 @@
 		{
 			$button .= '<input title="Change" accessKey="" tabindex="2" type="button" class="button" value="'.$app_strings['LBL_SELECT_PRODUCT_BUTTON_LABEL'].'" name="Button" LANGUAGE=javascript onclick=\'return window.open("index.php?module=Products&action=Popup&return_module=Potentials&popuptype=detailview&form=EditView&form_submit=false&recordid='.$_REQUEST["record"].'","test","width=600,height=400,resizable=1,scrollbars=1");\'>&nbsp;';
 		}
-		$returnset = '&return_module=Potentials&return_action=DetailView&return_id='.$id;
+		$returnset = '&return_module=Potentials&return_action=CallRelatedList&return_id='.$id;
 
 		$query = 'select vtiger_products.productid, vtiger_products.productname, vtiger_products.productcode, vtiger_products.commissionrate, vtiger_products.qty_per_unit, vtiger_products.unit_price, vtiger_crmentity.crmid, vtiger_crmentity.smownerid from vtiger_products inner join vtiger_seproductsrel on vtiger_products.productid = vtiger_seproductsrel.productid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_products.productid inner join vtiger_potential on vtiger_potential.potentialid = vtiger_seproductsrel.crmid  where vtiger_potential.potentialid = '.$id.' and vtiger_crmentity.deleted = 0';
 		$log->debug("Exiting get_products method ...");
@@ -478,7 +478,7 @@
 		{
 			$button .= '<input title="'.$app_strings['LBL_NEW_QUOTE_BUTTON_TITLE'].'" accessyKey="'.$app_strings['LBL_NEW_QUOTE_BUTTON_KEY'].'" class="button" onclick="this.form.action.value=\'EditView\';this.form.module.value=\'Quotes\'" type="submit" name="button" value="'.$app_strings['LBL_NEW_QUOTE_BUTTON'].'">&nbsp;</td>';
 		}
-		$returnset = '&return_module=Potentials&return_action=DetailView&return_id='.$id;
+		$returnset = '&return_module=Potentials&return_action=CallRelatedList&return_id='.$id;
 
 
 		$query = "select vtiger_crmentity.*, vtiger_quotes.*, vtiger_potential.potentialname, vtiger_users.user_name from vtiger_quotes inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_quotes.quoteid left outer join vtiger_potential on vtiger_potential.potentialid=vtiger_quotes.potentialid left join vtiger_quotegrouprelation on vtiger_quotes.quoteid=vtiger_quotegrouprelation.quoteid left join vtiger_groups on vtiger_groups.groupname=vtiger_quotegrouprelation.groupname left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_crmentity.deleted=0 and vtiger_potential.potentialid=".$id;
@@ -501,7 +501,7 @@
 			$button .= '<input title="'.$app_strings['LBL_NEW_SORDER_BUTTON_TITLE'].'" accessyKey="'.$app_strings['LBL_NEW_SORDER_BUTTON_KEY'].'" class="button" onclick="this.form.action.value=\'EditView\';this.form.module.value=\'SalesOrder\'" type="submit" name="button" value="'.$app_strings['LBL_NEW_SORDER_BUTTON'].'">&nbsp;</td>';
 		}
 
-		$returnset = '&return_module=Potentials&return_action=DetailView&return_id='.$id;
+		$returnset = '&return_module=Potentials&return_action=CallRelatedList&return_id='.$id;
 
 
 		$query = "select vtiger_crmentity.*, vtiger_salesorder.*, vtiger_quotes.subject as quotename, vtiger_account.accountname, vtiger_potential.potentialname from vtiger_salesorder inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_salesorder.salesorderid left outer join vtiger_quotes on vtiger_quotes.quoteid=vtiger_salesorder.quoteid left outer join vtiger_account on vtiger_account.accountid=vtiger_salesorder.accountid left outer join vtiger_potential on vtiger_potential.potentialid=vtiger_salesorder.potentialid left join vtiger_sogrouprelation on vtiger_salesorder.salesorderid=vtiger_sogrouprelation.salesorderid left join vtiger_groups on vtiger_groups.groupname=vtiger_sogrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_potential.potentialid = ".$id;

Modified: vtigercrm/trunk/modules/PriceBooks/PriceBook.php
==============================================================================
--- vtigercrm/trunk/modules/PriceBooks/PriceBook.php (original)
+++ vtigercrm/trunk/modules/PriceBooks/PriceBook.php Sat Jun 17 05:14:50 2006
@@ -92,7 +92,7 @@
 
 		$button = '';
 
-		$returnset = '&return_module=PriceBooks&return_action=DetailView&return_id='.$id;
+		$returnset = '&return_module=PriceBooks&return_action=CallRelatedList&return_id='.$id;
 
 		$query = 'select vtiger_products.productid, vtiger_products.productname, vtiger_products.productcode, vtiger_products.commissionrate, vtiger_products.qty_per_unit, vtiger_products.unit_price, vtiger_crmentity.crmid, vtiger_crmentity.smownerid,vtiger_pricebookproductrel.listprice from vtiger_products inner join vtiger_pricebookproductrel on vtiger_products.productid = vtiger_pricebookproductrel.productid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_products.productid inner join vtiger_pricebook on vtiger_pricebook.pricebookid = vtiger_pricebookproductrel.pricebookid  where vtiger_pricebook.pricebookid = '.$id.' and vtiger_crmentity.deleted = 0'; 
 		$log->debug("Exiting get_pricebook_products method ...");

Modified: vtigercrm/trunk/modules/Products/Product.php
==============================================================================
--- vtigercrm/trunk/modules/Products/Product.php (original)
+++ vtigercrm/trunk/modules/Products/Product.php Sat Jun 17 05:14:50 2006
@@ -186,7 +186,7 @@
 
 		$button = '';
 
-		$returnset = '&return_module=Products&return_action=DetailView&return_id='.$id;
+		$returnset = '&return_module=Products&return_action=CallRelatedList&return_id='.$id;
 
 		$query = "SELECT vtiger_users.user_name, vtiger_users.id,
 			vtiger_products.productid, vtiger_products.productname,
@@ -226,7 +226,7 @@
 
 		$button = '';
 
-		$returnset = '&return_module=Products&return_action=DetailView&return_id='.$id;
+		$returnset = '&return_module=Products&return_action=CallRelatedList&return_id='.$id;
 
 
 		$query = "SELECT vtiger_contactdetails.lastname,
@@ -271,7 +271,7 @@
 		$focus = new Quote();
 	
 		$button = '';
-		$returnset = '&return_module=Products&return_action=DetailView&return_id='.$id;
+		$returnset = '&return_module=Products&return_action=CallRelatedList&return_id='.$id;
 
 
 		$query = "SELECT vtiger_crmentity.*,
@@ -307,7 +307,7 @@
 
 		$button = '';
 
-		$returnset = '&return_module=Products&return_action=DetailView&return_id='.$id;
+		$returnset = '&return_module=Products&return_action=CallRelatedList&return_id='.$id;
 
 		$query = "SELECT vtiger_crmentity.*,
 			vtiger_purchaseorder.*,
@@ -335,10 +335,11 @@
 		$log->debug("Entering get_salesorder(".$id.") method ...");
 		global $app_strings;
 		require_once('modules/SalesOrder/SalesOrder.php');
-        $focus = new SalesOrder();
+
+	        $focus = new SalesOrder();
  
 		$button = '';
-		$returnset = '&return_module=Products&return_action=DetailView&return_id='.$id;
+		$returnset = '&return_module=Products&return_action=CallRelatedList&return_id='.$id;
 
 		$query = "SELECT vtiger_crmentity.*,
 			vtiger_salesorder.*,
@@ -371,7 +372,7 @@
 		$focus = new Invoice();
 
 		$button = '';
-		$returnset = '&return_module=Products&return_action=DetailView&return_id='.$id;
+		$returnset = '&return_module=Products&return_action=CallRelatedList&return_id='.$id;
 
 
 		$query = "SELECT vtiger_crmentity.*,
@@ -402,7 +403,7 @@
 		require_once('modules/PriceBooks/PriceBook.php');
 		$focus = new PriceBook();
 		$button = '';
-		$returnset = '&return_module=Products&return_action=DetailView&return_id='.$id;
+		$returnset = '&return_module=Products&return_action=CallRelatedList&return_id='.$id;
 
 
 		$query = "SELECT vtiger_crmentity.crmid,

Modified: vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php
==============================================================================
--- vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php (original)
+++ vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php Sat Jun 17 05:14:50 2006
@@ -138,7 +138,7 @@
 
 		$button = '';
 
-		$returnset = '&return_module=PurchaseOrder&return_action=DetailView&return_id='.$id;
+		$returnset = '&return_module=PurchaseOrder&return_action=CallRelatedList&return_id='.$id;
 
 		$query = "SELECT vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid,vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and (activitytype='Task' or vtiger_activitytype='Call' or vtiger_activitytype='Meeting') and vtiger_crmentity.deleted=0 and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Completed') and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Deferred') or (vtiger_activity.eventstatus != '' &&  vtiger_activity.eventstatus = 'Planned')";
 		$log->debug("Exiting get_activities method ...");

Modified: vtigercrm/trunk/modules/Quotes/Quote.php
==============================================================================
--- vtigercrm/trunk/modules/Quotes/Quote.php (original)
+++ vtigercrm/trunk/modules/Quotes/Quote.php Sat Jun 17 05:14:50 2006
@@ -138,7 +138,7 @@
  
 		$button = '';
 
-		$returnset = '&return_module=Quotes&return_action=DetailView&return_id='.$id;
+		$returnset = '&return_module=Quotes&return_action=CallRelatedList&return_id='.$id;
 
 		$query = "select vtiger_crmentity.*, vtiger_salesorder.*, vtiger_quotes.subject as quotename, vtiger_account.accountname from vtiger_salesorder inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_salesorder.salesorderid left outer join vtiger_quotes on vtiger_quotes.quoteid=vtiger_salesorder.quoteid left outer join vtiger_account on vtiger_account.accountid=vtiger_salesorder.accountid left join vtiger_sogrouprelation on vtiger_salesorder.salesorderid=vtiger_sogrouprelation.salesorderid left join vtiger_groups on vtiger_groups.groupname=vtiger_sogrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_salesorder.quoteid = ".$id;
 		$log->debug("Exiting get_salesorder method ...");
@@ -155,7 +155,7 @@
 
 		$button = '';
 
-		$returnset = '&return_module=Quotes&return_action=DetailView&return_id='.$id;
+		$returnset = '&return_module=Quotes&return_action=CallRelatedList&return_id='.$id;
 
 		$query = "SELECT vtiger_contactdetails.contactid, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name,vtiger_recurringevents.recurringtype from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting') and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Completed') and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Deferred') or (vtiger_activity.eventstatus !='' && vtiger_activity.eventstatus = 'Planned')";
 		$log->debug("Exiting get_activities method ...");

Modified: vtigercrm/trunk/modules/Vendors/Vendor.php
==============================================================================
--- vtigercrm/trunk/modules/Vendors/Vendor.php (original)
+++ vtigercrm/trunk/modules/Vendors/Vendor.php Sat Jun 17 05:14:50 2006
@@ -73,7 +73,7 @@
 
 		$button = '';
 
-		$returnset = '&return_module=Vendors&return_action=DetailView&return_id='.$id;
+		$returnset = '&return_module=Vendors&return_action=CallRelatedList&return_id='.$id;
 
 		$query = 'select vtiger_products.productid, vtiger_products.productname, vtiger_products.productcode, vtiger_products.commissionrate, vtiger_products.qty_per_unit, vtiger_products.unit_price, vtiger_crmentity.crmid, vtiger_crmentity.smownerid,vtiger_vendor.vendorname from vtiger_products inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_products.productid left outer join vtiger_vendor on vtiger_vendor.vendorid = vtiger_products.vendor_id where vtiger_vendor.vendorid = '.$id.' and vtiger_crmentity.deleted = 0';
 		$log->debug("Exiting get_products method ...");
@@ -89,7 +89,7 @@
 
 		$button = '';
 
-		$returnset = '&return_module=Vendors&return_action=DetailView&return_id='.$id;
+		$returnset = '&return_module=Vendors&return_action=CallRelatedList&return_id='.$id;
 
 		$query = "select vtiger_crmentity.*, vtiger_purchaseorder.*,vtiger_vendor.vendorname from vtiger_purchaseorder inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_purchaseorder.purchaseorderid left outer join vtiger_vendor on vtiger_purchaseorder.vendorid=vtiger_vendor.vendorid left join vtiger_pogrouprelation on vtiger_purchaseorder.purchaseorderid=vtiger_pogrouprelation.purchaseorderid left join vtiger_groups on vtiger_groups.groupname=vtiger_pogrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_purchaseorder.vendorid=".$id;
 		$log->debug("Exiting get_purchase_orders method ...");
@@ -104,7 +104,7 @@
 		$focus = new Contact();
 
 		$button = '';
-		$returnset = '&return_module=Vendors&return_action=DetailView&return_id='.$id;
+		$returnset = '&return_module=Vendors&return_action=CallRelatedList&return_id='.$id;
 
 		$query = 'SELECT vtiger_contactdetails.*, vtiger_crmentity.crmid, vtiger_crmentity.smownerid,vtiger_vendorcontactrel.vendorid from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid  inner join vtiger_vendorcontactrel on vtiger_vendorcontactrel.contactid=vtiger_contactdetails.contactid left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid left join vtiger_groups on vtiger_groups.groupname=vtiger_contactgrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_vendorcontactrel.vendorid = '.$id;
 		$log->debug("Exiting get_contacts method ...");



From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 17 04:17:01 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 11:17:01 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7225 - in
 /vtigercrm/trunk/modules: Invoice/Invoice.php SalesOrder/SalesOrder.php
Message-ID: <20060617111701.0E0D27ED3E5@vtiger.fosslabs.com>

Author: saraj
Date: Sat Jun 17 05:16:54 2006
New Revision: 7225

Log:
* Modified the return module name in the returnset which will be used in the relatedlist

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

Modified: vtigercrm/trunk/modules/Invoice/Invoice.php
==============================================================================
--- vtigercrm/trunk/modules/Invoice/Invoice.php (original)
+++ vtigercrm/trunk/modules/Invoice/Invoice.php Sat Jun 17 05:16:54 2006
@@ -142,7 +142,7 @@
 
 		$button = '';
 
-		$returnset = '&return_module=Invoice&return_action=DetailView&return_id='.$id;
+		$returnset = '&return_module=Invoice&return_action=CallRelatedList&return_id='.$id;
 
 		$query = "SELECT vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid, vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or ativitytype='Meeting') and vtiger_crmentity.deleted=0 and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Completed') and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Deferred') or (vtiger_activity.eventstatus != '' &&  vtiger_activity.eventstatus = 'Planned')";
 		$log->debug("Exiting get_activities method ...");

Modified: vtigercrm/trunk/modules/SalesOrder/SalesOrder.php
==============================================================================
--- vtigercrm/trunk/modules/SalesOrder/SalesOrder.php (original)
+++ vtigercrm/trunk/modules/SalesOrder/SalesOrder.php Sat Jun 17 05:16:54 2006
@@ -145,7 +145,8 @@
 
 		$button = '';
 
-		$returnset = '&return_module=SalesOrder&return_action=DetailView&return_id='.$id;
+		$returnset = '&return_module=SalesOrder&return_action=CallRelatedList&return_id='.$id;
+
 		$query = "SELECT vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid, vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting') and vtiger_crmentity.deleted=0 and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Completed') and (vtiger_activity.status is not NULL && vtiger_activity.status !='Deferred') or (vtiger_activity.eventstatus != '' &&  vtiger_activity.eventstatus = 'Planned')";
 		$log->debug("Exiting get_activities method ...");
 		return GetRelatedList('SalesOrder','Activities',$focus,$query,$button,$returnset);
@@ -235,7 +236,7 @@
 		$focus = new Invoice();
 	
 		$button = '';
-		$returnset = '&return_module=SalesOrder&return_action=DetailView&return_id='.$id;
+		$returnset = '&return_module=SalesOrder&return_action=CallRelatedList&return_id='.$id;
 
 
 		$query = "select vtiger_crmentity.*, vtiger_invoice.*, vtiger_account.accountname, vtiger_salesorder.subject as salessubject from vtiger_invoice inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_invoice.invoiceid left outer join vtiger_account on vtiger_account.accountid=vtiger_invoice.accountid inner join vtiger_salesorder on vtiger_salesorder.salesorderid=vtiger_invoice.salesorderid left join vtiger_invoicegrouprelation on vtiger_invoice.invoiceid=vtiger_invoicegrouprelation.invoiceid left join vtiger_groups on vtiger_groups.groupname=vtiger_invoicegrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_salesorder.salesorderid=".$id;



From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 17 04:57:25 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 11:57:25 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7226 -
	/vtigercrm/trunk/themes/blue/images/del_tag.gif
Message-ID: <20060617115725.4B65F7ED3F0@vtiger.fosslabs.com>

Author: don
Date: Sat Jun 17 05:57:21 2006
New Revision: 7226

Log:
image added for tag delete

Added:
    vtigercrm/trunk/themes/blue/images/del_tag.gif   (with props)



From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 17 05:00:57 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 12:00:57 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7227 - in /vtigercrm/trunk:
 Smarty/templates/DetailView.tpl include/Ajax/TagCloud.php
 include/freetag/freetag.class.php modules/Home/index.php
Message-ID: <20060617120057.C25597ED3FD@vtiger.fosslabs.com>

Author: don
Date: Sat Jun 17 06:00:49 2006
New Revision: 7227

Log:
Tag delete integrated

Modified:
    vtigercrm/trunk/Smarty/templates/DetailView.tpl
    vtigercrm/trunk/include/Ajax/TagCloud.php
    vtigercrm/trunk/include/freetag/freetag.class.php
    vtigercrm/trunk/modules/Home/index.php

Modified: vtigercrm/trunk/Smarty/templates/DetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DetailView.tpl Sat Jun 17 06:00:49 2006
@@ -12,8 +12,8 @@
 
 -->*}
 <script type="text/javascript" src="modules/{$MODULE}/{$SINGLE_MOD}.js"></script>
-
-
+<script src="include/scriptaculous/prototype.js" type="text/javascript"></script>
+<script src="include/scriptaculous/scriptaculous.js" type="text/javascript"></script>
 <script language="JavaScript" type="text/javascript" src="include/js/dtlviewajax.js"></script>
 <span id="crmspanid" style="display:none;position:absolute;"  onmouseover="show('crmspanid');">
    <a class="link"  align="right" href="javascript:;">{$APP.LBL_EDIT_BUTTON}</a>
@@ -51,6 +51,22 @@
 		alert("Please enter a tag");
 		return false;
 	{rdelim}
+{rdelim}
+function DeleteTag(id)
+{ldelim}
+	$("vtbusy_info").style.display="inline";
+	Effect.Fade('tag_'+id);
+	new Ajax.Request(
+		'index.php',
+                {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+                        method: 'post',
+                        postBody: "file=TagCloud&module={$MODULE}&action={$MODULE}Ajax&ajxaction=DELETETAG&tagid=" +id,
+                        onComplete: function(response) {ldelim}
+						getTagCloud();
+						$("vtbusy_info").style.display="none";
+                        {rdelim}
+                {rdelim}
+        );
 {rdelim}
 </script>
 
@@ -323,17 +339,21 @@
 {/if}
 
 <script>
+function getTagCloud()
+{ldelim}
 new Ajax.Request(
         'index.php',
         {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
         method: 'post',
-        postBody: 'module={$MODULE}&action={$MODULE}Ajax&file=TagCloud&ajxaction=GETTAGCLOUD',
+        postBody: 'module={$MODULE}&action={$MODULE}Ajax&file=TagCloud&ajxaction=GETTAGCLOUD&recordid={$ID}',
         onComplete: function(response) {ldelim}
                                 $("tagfields").innerHTML=response.responseText;
                                 $("txtbox_tagfields").value ='';
                         {rdelim}
         {rdelim}
 );
+{rdelim}
+getTagCloud();
 </script>
 <!-- added for validation -->
 <script language="javascript">

Modified: vtigercrm/trunk/include/Ajax/TagCloud.php
==============================================================================
--- vtigercrm/trunk/include/Ajax/TagCloud.php (original)
+++ vtigercrm/trunk/include/Ajax/TagCloud.php Sat Jun 17 06:00:49 2006
@@ -9,49 +9,45 @@
   *
   ********************************************************************************/
 $ajaxaction = $_REQUEST['ajxaction'];
+global $current_user;
+$crmid = $_REQUEST["recordid"];
+$module = $_REQUEST["module"];
+$userid = $current_user->id;
 if($ajaxaction == "SAVETAG")
 {
 	
 	require_once('include/freetag/freetag.class.php');
-	global $current_user;
-	$crmid = $_REQUEST["recordid"];
-	$module = $_REQUEST["module"];
 	$tagfields = $_REQUEST["tagfields"];
-	$userid = $current_user->id;
-    $freetag = new freetag();
+    	$freetag = new freetag();
 	if (isset($_REQUEST["tagfields"]) && trim($_REQUEST["tagfields"]) != "")
 	{
-	      $freetag->tag_object($userid,$crmid,$tagfields,$module);
-	 	  $tagcloud = $freetag->get_tag_cloud_html($module);
-		  echo $tagcloud;
+	      	$freetag->tag_object($userid,$crmid,$tagfields,$module);
+	  	$tagcloud = $freetag->get_tag_cloud_html($module,$userid,$crmid);
+	  	echo $tagcloud;
 	}
-	
+
 }
 elseif($ajaxaction == 'GETTAGCLOUD')
 {
 	require_once('include/freetag/freetag.class.php');
 	$freetag = new freetag();
-	$module = $_REQUEST["module"];
-	$useid = $current_user->id;
+	if(trim($module) != "")
+	{
+		$tagcloud = $freetag->get_tag_cloud_html($module,$userid,$crmid);
+		echo $tagcloud;
+	}else
+	{
+		$tagcloud = $freetag->get_tag_cloud_html("",$userid);
+		echo $tagcloud;
+	}
+}elseif($ajaxaction == 'DELETETAG')
+{
+	$tagid = $_REQUEST['tagid']; 
 	global $adb;
-	$query="select * from vtiger_freetagged_objects where module = '".$module ."'";
+	$query="delete from vtiger_freetagged_objects where tag_id=".$tagid;
 	$result=$adb->query($query);
-	if($adb->num_rows($result) > 0)
-	{
-		if(trim($module) != "")
-		{
-			$tagcloud = $freetag->get_tag_cloud_html($module);
-			echo $tagcloud;
-		}else
-		{
-			$tagcloud = $freetag->get_tag_cloud_html();
-			echo $tagcloud;
-		}
-	}
-	else
-	{
-		echo '';
-	}
+	$query="delete from vtiger_freetags where id=".$tagid;
+	$result=$adb->query($query);
+	echo 'SUCESS';
 }
-
 ?>

Modified: vtigercrm/trunk/include/freetag/freetag.class.php
==============================================================================
--- vtigercrm/trunk/include/freetag/freetag.class.php (original)
+++ vtigercrm/trunk/include/freetag/freetag.class.php Sat Jun 17 06:00:49 2006
@@ -894,13 +894,16 @@
 	 * @return string Returns an HTML snippet that can be used directly as a tag cloud.
 	 */
 
-	function get_tag_cloud_html($module="",$num_tags = 100, $min_font_size = 10, $max_font_size = 20, $font_units = 'px', $span_class = '', $tag_page_url = '/tag/', $tagger_id = NULL) {
-		$tag_list = $this->get_tag_cloud_tags($num_tags, $tagger_id,$module);
-		if(!$tag_list) return;
+	function get_tag_cloud_html($module="",$tagger_id = NULL,$obj_id= NULL,$num_tags = 100, $min_font_size = 10, $max_font_size = 20, $font_units = 'px', $span_class = '', $tag_page_url = '/tag/') {
+		global $theme;
+		$theme_path="themes/".$theme."/";
+		$image_path=$theme_path."images/";	
+		$tag_list = $this->get_tag_cloud_tags($num_tags, $tagger_id,$module,$obj_id);
+		if(!$tag_list[0]) return;
 		// Get the maximum qty of tagged objects in the set
-		$max_qty = max(array_values($tag_list));
+		$max_qty = max(array_values($tag_list[0]));
 		// Get the min qty of tagged objects in the set
-		$min_qty = min(array_values($tag_list));
+		$min_qty = min(array_values($tag_list[0]));
 
 		// For ever additional tagged object from min to max, we add
 		// $step to the font size.
@@ -920,11 +923,22 @@
 		include("config.php");
 		if($module =='')
 			$module = 'All';	
-		foreach ($tag_list as $tag => $qty) {
-          		$size = $min_font_size + ($qty - $min_qty) * 3;
-			$cloud_span[] = '<span class="' . $span_class . '"><a class="tagit" href="'.$site_URL.'/index.php?module=Home&action=UnifiedSearch&search_module='.$module.'&query_string='. $tag . '" style="font-size: '. $size . $font_units . '">' . htmlspecialchars(stripslashes($tag)) . '</a></span>';
-
-		}
+		if($module != 'All')	
+		{	
+			foreach($tag_list[0] as $tag => $qty) {
+				$size = $min_font_size + ($qty - $min_qty) * 3;
+				$cloud_span[] = '<span id="tag_'.$tag_list[1][$tag].'" class="' . $span_class . '" onMouseOver=$("tagspan_'.$tag_list[1][$tag].'").style.display="inline"; onMouseOut=$("tagspan_'.$tag_list[1][$tag].'").style.display="none";><a class="tagit" href="'.$site_URL.'/index.php?module=Home&action=UnifiedSearch&search_module='.$module.'&query_string='. $tag . '" style="font-size: '. $size . $font_units . '">' . htmlspecialchars(stripslashes($tag)) . '</a><span class="'. $span_class .'" id="tagspan_'.$tag_list[1][$tag].'" style="display:none;cursor:pointer;" onClick="DeleteTag('.$tag_list[1][$tag].');"><img src="'.$image_path.'del_tag.gif"></span></span>';
+
+			}
+		}else
+		{
+			foreach($tag_list[0] as $tag => $qty) {
+				$size = $min_font_size + ($qty - $min_qty) * 3;
+				$cloud_span[] = '<span class="' . $span_class . '"><a class="tagit" href="'.$site_URL.'/index.php?module=Home&action=UnifiedSearch&search_module='.$module.'&query_string='. $tag . '" style="font-size: '. $size . $font_units . '">' . htmlspecialchars(stripslashes($tag)) . '</a></span>';
+
+			}
+
+		}	
 		$cloud_html = join("\n ", $cloud_span);
 
 		return $cloud_html;
@@ -948,22 +962,28 @@
 	 * values are numeric quantity of objects tagged with that tag.
 	 */
 
-	function get_tag_cloud_tags($max = 100, $tagger_id = NULL,$module = "") {
+	function get_tag_cloud_tags($max = 100, $tagger_id = NULL,$module = "",$obj_id = NULL) {
 		global $adb;
 		if(isset($tagger_id) && ($tagger_id > 0)) {
-			$tagger_sql = "AND tagger_id = $tagger_id";
+			$tagger_sql = " AND tagger_id = $tagger_id";
 		} else {
 			$tagger_sql = "";
 		}
 
 		if($module != "") {
-			$tagger_sql .= "AND module = '$module'";
+			$tagger_sql .= " AND module = '$module'";
 		} else {
 			$tagger_sql .= "";
 		}
 
-		$prefix = $this->_table_prefix;
-		$sql = "SELECT tag, COUNT(object_id) AS quantity
+		if(isset($obj_id) && $obj_id > 0) {
+                        $tagger_sql .= " AND object_id = $obj_id";
+                } else {
+                        $tagger_sql .= "";
+                }
+
+		$prefix = $this->_table_prefix;
+		$sql = "SELECT tag,tag_id,COUNT(object_id) AS quantity
 			FROM ${prefix}freetags INNER JOIN ${prefix}freetagged_objects
 			ON (${prefix}freetags.id = tag_id)
 			WHERE 1=1
@@ -975,39 +995,15 @@
 		$retarr = array();
 		while(!$rs->EOF) {
 			$retarr[$rs->fields['tag']] = $rs->fields['quantity'];
+			$retarr1[$rs->fields['tag']] = $rs->fields['tag_id'];
 			$rs->MoveNext();
 		}
-
 		if($retarr) ksort($retarr);
-
-		return $retarr;
-
-	}
-
-
-	/**
-	 * silly_list
-	 *
-	 * silly_list is now deprecated in favor of using get_tag_cloud_tags. It's still
-	 * available for compatibility. If you're just looking to get a tag cloud going,
-	 * try get_tag_cloud_html().
-	 * 
-	 * This is a function built explicitly to set up a page with most popular tags
-	 * that contains an alphabetically sorted list of tags, which can then be sized
-	 * or colored by popularity.
-	 *
-	 * Also known more popularly as Tag Clouds!
-	 *
-	 * Here's the example case: http://upcoming.org/tag/
-	 *
-	 * @param int The maximum number of tags to return.
-	 *
-	 * @return array Returns an array where the keys are normalized tags, and the
-	 * values are numeric quantity of objects tagged with that tag.
-	 */
-
-	function silly_list($max = 100, $tagger_id = NULL) {
-		return $this->get_tag_cloud_tags($max, $tagger_id);
+		if($retarr1) ksort($retarr1);
+		$return_value[]=$retarr;
+		$return_value[]=$retarr1;
+		return $return_value;
+
 	}
 
 	/**

Modified: vtigercrm/trunk/modules/Home/index.php
==============================================================================
--- vtigercrm/trunk/modules/Home/index.php (original)
+++ vtigercrm/trunk/modules/Home/index.php Sat Jun 17 06:00:49 2006
@@ -166,7 +166,7 @@
 $smarty->assign("HOMEDEFAULTVIEW",DefHomeView());
 $smarty->assign("ACTIVITIES",$activities);
 $freetag = new freetag();
-$smarty->assign("ALL_TAG",$freetag->get_tag_cloud_html());
+$smarty->assign("ALL_TAG",$freetag->get_tag_cloud_html("",$current_user->id));
 $smarty->display("HomePage.tpl");
 
 function getLoginHistory()



From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 17 05:45:04 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 12:45:04 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7228 - in /vtigercrm/trunk:
 include/utils/DeleteUtils.php modules/Users/massdelete.php
Message-ID: <20060617124504.E6B6B7E8A8F@vtiger.fosslabs.com>

Author: don
Date: Sat Jun 17 06:44:56 2006
New Revision: 7228

Log:
deleting tag while deleting the entity

Modified:
    vtigercrm/trunk/include/utils/DeleteUtils.php
    vtigercrm/trunk/modules/Users/massdelete.php

Modified: vtigercrm/trunk/include/utils/DeleteUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/DeleteUtils.php (original)
+++ vtigercrm/trunk/include/utils/DeleteUtils.php Sat Jun 17 06:44:56 2006
@@ -289,13 +289,13 @@
 			$adb->query($del_query);
 	break;
 	endswitch;
-	global $current_user;
-	require_once('include/freetag/freetag.class.php');
-	$freetag=new freetag();
-	$freetag->delete_all_object_tags_for_user($current_user->id,$record);
 	
 	if($return_module == $module && $return_module !='Rss' && $return_module !='Portal')
 	{	
+		global $current_user;
+		require_once('include/freetag/freetag.class.php');
+		$freetag=new freetag();
+		$freetag->delete_all_object_tags_for_user($current_user->id,$record);
 		$focus->mark_deleted($record);
 	}
 	if($module != 'Faq')

Modified: vtigercrm/trunk/modules/Users/massdelete.php
==============================================================================
--- vtigercrm/trunk/modules/Users/massdelete.php (original)
+++ vtigercrm/trunk/modules/Users/massdelete.php Sat Jun 17 06:44:56 2006
@@ -27,6 +27,10 @@
 {
         if(isPermitted($returnmodule,'Delete',$id) == 'yes')
         {
+		global $current_user;
+                require_once('include/freetag/freetag.class.php');
+                $freetag=new freetag();
+                $freetag->delete_all_object_tags_for_user($current_user->id,$id);
                 $sql="update vtiger_crmentity set deleted=1 where crmid='" .$id ."'";
                 $result = $adb->query($sql);
         }



From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 17 05:51:43 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 12:51:43 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7229 - in /vtigercrm/trunk:
 Smarty/templates/DetailView.tpl Smarty/templates/DetailViewUI.tpl
 include/utils/DetailViewUtils.php
Message-ID: <20060617125143.568A27ED3B3@vtiger.fosslabs.com>

Author: don
Date: Sat Jun 17 06:51:36 2006
New Revision: 7229

Log:
fade effect for Contact image has been integrated

Modified:
    vtigercrm/trunk/Smarty/templates/DetailView.tpl
    vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl
    vtigercrm/trunk/include/utils/DetailViewUtils.php

Modified: vtigercrm/trunk/Smarty/templates/DetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DetailView.tpl Sat Jun 17 06:51:36 2006
@@ -12,6 +12,7 @@
 
 -->*}
 <script type="text/javascript" src="modules/{$MODULE}/{$SINGLE_MOD}.js"></script>
+<script type="text/javascript" src="reflection.js"></script>
 <script src="include/scriptaculous/prototype.js" type="text/javascript"></script>
 <script src="include/scriptaculous/scriptaculous.js" type="text/javascript"></script>
 <script language="JavaScript" type="text/javascript" src="include/js/dtlviewajax.js"></script>

Modified: vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl Sat Jun 17 06:51:36 2006
@@ -198,8 +198,8 @@
 							</td>
 	
 
-				{elseif $keyid eq 103}<!-- for Tag Cloud -->
-                                                  	<td class="dvtCellInfo" align="left" width=25%">{$keyval}</td>
+				{elseif $keyid eq 69}<!-- for Image Reflection -->
+                                                  	<td align="left" width=25%">{$keyval}</td>
 				{else}									
                                                   	<td class="dvtCellInfo" align="left" width=25%">{$keyval}</td>
 				{/if}

Modified: vtigercrm/trunk/include/utils/DetailViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/DetailViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/DetailViewUtils.php Sat Jun 17 06:51:36 2006
@@ -408,7 +408,7 @@
 		if($tabid==4)
 		{
 			$imgpath = getModuleFileStoragePath('Contacts').$col_fields[$fieldname];
-			$label_fld[] ='<img src="'.$imgpath.'" border="0">';
+			$label_fld[] ='<img src="'.$imgpath.'" class="reflect" width="450" height="300" alt="">';
 		}
 
 	}



From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 17 05:52:46 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 12:52:46 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7230 -
	/vtigercrm/trunk/Smarty/templates/DetailView.tpl
Message-ID: <20060617125246.766C27ED212@vtiger.fosslabs.com>

Author: don
Date: Sat Jun 17 06:52:42 2006
New Revision: 7230

Log:
reflect js moved to include/js

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 Sat Jun 17 06:52:42 2006
@@ -12,7 +12,7 @@
 
 -->*}
 <script type="text/javascript" src="modules/{$MODULE}/{$SINGLE_MOD}.js"></script>
-<script type="text/javascript" src="reflection.js"></script>
+<script type="text/javascript" src="include/js/reflection.js"></script>
 <script src="include/scriptaculous/prototype.js" type="text/javascript"></script>
 <script src="include/scriptaculous/scriptaculous.js" type="text/javascript"></script>
 <script language="JavaScript" type="text/javascript" src="include/js/dtlviewajax.js"></script>



From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 17 05:53:50 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 12:53:50 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7231 -
	/vtigercrm/trunk/include/js/reflection.js
Message-ID: <20060617125350.865937ED212@vtiger.fosslabs.com>

Author: don
Date: Sat Jun 17 06:53:46 2006
New Revision: 7231

Log:
js added for reflection effect

Added:
    vtigercrm/trunk/include/js/reflection.js



From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 17 06:26:03 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 13:26:03 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7232 -
	/vtigercrm/trunk/include/js/ajax.js
Message-ID: <20060617132603.A15FB7ED422@vtiger.fosslabs.com>

Author: don
Date: Sat Jun 17 07:25:59 2006
New Revision: 7232

Log:
file retained as it is used for migration and ajax chat

Added:
    vtigercrm/trunk/include/js/ajax.js



From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 17 07:31:01 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 14:31:01 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7233 -
 /vtigercrm/trunk/modules/Settings/language/en_us.lang.php
Message-ID: <20060617143101.ED5307ED428@vtiger.fosslabs.com>

Author: richie
Date: Sat Jun 17 08:30:56 2006
New Revision: 7233

Log:
Updated language file

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



From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 17 07:31:55 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 14:31:55 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7234 -
 /vtigercrm/trunk/modules/Users/language/en_us.lang.php
Message-ID: <20060617143155.EE1737ED428@vtiger.fosslabs.com>

Author: richie
Date: Sat Jun 17 08:31:51 2006
New Revision: 7234

Log:
update lang file

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

Modified: vtigercrm/trunk/modules/Users/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Users/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Users/language/en_us.lang.php Sat Jun 17 08:31:51 2006
@@ -320,6 +320,7 @@
 'LBL_HDR_EMAIL_SCHDS'=>'Users : Email Notifications',
 'LBL_EMAIL_SCHDS_DESC'=>'The following is the list of notifications that are activated automatically when the corresponding event has happened.',
 'LBL_ACTIVE'=>'Active',
+'LBL_INACTIVE'=>'Inactive',
 'LBL_NOTIFICATION'=>'Notification',
 'LBL_DESCRIPTION'=>'Description',
 'LBL_TASK_NOTIFICATION'=>'Delayed Task Notification',



From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 17 07:33:21 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 14:33:21 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7235 -
 /vtigercrm/trunk/modules/Users/listnotificationschedulers.php
Message-ID: <20060617143321.59BEF7ED428@vtiger.fosslabs.com>

Author: richie
Date: Sat Jun 17 08:33:17 2006
New Revision: 7235

Log:
Updated the file for new UI

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

Modified: vtigercrm/trunk/modules/Users/listnotificationschedulers.php
==============================================================================
--- vtigercrm/trunk/modules/Users/listnotificationschedulers.php (original)
+++ vtigercrm/trunk/modules/Users/listnotificationschedulers.php Sat Jun 17 08:33:17 2006
@@ -29,9 +29,9 @@
 		$result_data['id'] = $result_row['schedulednotificationid'];
 	
 		if($result_data['active'] != 1)	
-			$result_data['active'] = '<img src="'.$image_path.'no.gif">';
+			$result_data['active'] = $mod_strings['LBL_INACTIVE'];
 		else
-			$result_data['active'] = '<img src="'.$image_path.'yes.gif">';
+			$result_data['active'] = $mod_strings['LBL_ACTIVE'];
 			
 		$result_data['label'] = $mod_strings[$result_row['label']];
 		$notifiy_array []= $result_data;



From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 17 07:40:51 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 14:40:51 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7236 -
	/vtigercrm/trunk/Smarty/templates/Header.tpl
Message-ID: <20060617144051.5D0397E8A8F@vtiger.fosslabs.com>

Author: richie
Date: Sat Jun 17 08:40:47 2006
New Revision: 7236

Log:
Header template file updated

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

Modified: vtigercrm/trunk/Smarty/templates/Header.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Header.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Header.tpl Sat Jun 17 08:40:47 2006
@@ -10,9 +10,26 @@
  ********************************************************************************/
 -->*}
 <!-- BEGIN: main -->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>
+
+{literal}	
+<!--[if lte IE 6]>
+<STYLE type=text/css>HTML {
+	OVERFLOW: auto; HEIGHT: 100%
+}
+BODY {
+	margin:0 0 0 0;
+	OVERFLOW: auto; HEIGHT: 100%
+}
+DIV.fixedLay {
+	POSITION: absolute;
+}
+</STYLE>
+<![endif]-->
+{/literal}
+
 	<title>{$CURRENT_USER} - {$APP.$CATEGORY} - {$APP.$MODULE_NAME} - {$APP.LBL_BROWSER_TITLE}</title>
 	<link rel="stylesheet" type="text/css" href="style.css">
 	<link REL="SHORTCUT ICON" HREF="include/images/vtigercrm_icon.ico">	



From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 17 07:42:39 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 14:42:39 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7237 -
 /vtigercrm/trunk/Smarty/templates/Settings/BackupServer.tpl
Message-ID: <20060617144239.34D5A7ED41E@vtiger.fosslabs.com>

Author: richie
Date: Sat Jun 17 08:42:35 2006
New Revision: 7237

Log:
Updated tpl file for new UI

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 Sat Jun 17 08:42:35 2006
@@ -1,142 +1,145 @@
-{*<!--
-/*********************************************************************************
-  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
-   * ("License"); You may not use this file except in compliance with the License
-   * The Original Code is:  vtiger CRM Open Source
-   * The Initial Developer of the Original Code is vtiger.
-   * Portions created by vtiger are Copyright (C) vtiger.
-   * All Rights Reserved.
-  *
- ********************************************************************************/
--->*}
-<script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
-<style type="text/css">@import url(themes/blue/style.css);</style>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-<tr>
-	{include file='SettingsMenu.tpl'}
-<td width="75%" valign="top">
-
-<table width="100%" border="0" cellpadding="0" cellspacing="0" height="100%">
-<form action="index.php" method="post" name="tandc">
-<input type="hidden" name="server_type" value="backup">
-<input type="hidden" name="module" value="Settings">
-<input type="hidden" name="action" value="index">
-<input type="hidden" name="bkp_server_mode">
-<input type="hidden" name="server_type" value="backup">
-<input type="hidden" name="parenttab" value="Settings">
-<tr>
-<td class="showPanelBg" valign="top" width="100%" colspan="3" style="padding-left:20px; "><br/>
-<span class="lvtHeaderText"><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS} </a> > {$MOD.LBL_CONFIGURATION} > {$MOD.LBL_BACKUP_SERVER_CONFIG}</b></span>
-<hr noshade="noshade" size="1" />
-</td>
-</tr>
-<tr>
-<td width="75%" style="padding-left:20px;" valign="top">
-
-	<table align="center" border="0" cellpadding="0" cellspacing="0" width="95%">
-	<tbody><tr>
-	<td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif;" height="6" width="7"><img src="{$IMAGE_PATH}top_left.jpg" align="top"></td>
-	<td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif; height: 6px;" bgcolor="#ebebeb"></td>
-	<td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif;" height="6" width="8"><img src="{$IMAGE_PATH}top_right.jpg" align="top" height="6" width="8"></td>
-	</tr>
-	<tr>
-
-	<td bgcolor="#ebebeb" width="7"></td>
-	<td style="padding-left: 10px; padding-top: 10px; vertical-align: top;" bgcolor="#ececec">
-	<table border="0" cellpadding="10" cellspacing="0" width="100%" class="small">
-	<tbody><tr>
-	<td rowspan="6" bgcolor="#ffffff" width="30%" valign="bottom" background="{$IMAGE_PATH}BackupServer_top.gif" style="background-position:top right;background-repeat:no-repeat;">
-		<table width="100%" border="0" cellpadding="0" cellspacing="0">
-				<tr>
-						<td background="{$IMAGE_PATH}BackupServer_btm.gif" style="background-position:bottom right;background-repeat:no-repeat; " height="150">&nbsp;</td>
-				</tr>
-		</table>
-	</td>
-	{if $BKP_SERVER_MODE neq 'edit'}
-	<td colspan="2" style="padding-top: 0px;" align="right" width="70%">
-	<input title="{$APP.LBL_EDIT_BUTTON_TITLE}" accessKey="{$APP.LBL_EDIT_BUTTON_KEY}" class="classBtn" onclick="this.form.action.value='BackupServerConfig';this.form.bkp_server_mode.value='edit'" type="submit" name="Edit" value="{$APP.LBL_EDIT_BUTTON_LABEL}"><br><hr>
-	</td>
-	{else}	
-	<td colspan="2" style="padding-top: 0px;" align="left" width="75%">
-	<b>{$MOD.LBL_BACKUP_SERVER_INFO}</b>&nbsp;{$ERROR_MSG}<br><hr>
-	</td>
-	{/if}
-	</tr>
-	
-	{if $BKP_SERVER_MODE eq 'edit'}
-	<tr>
-		<td><font color="red">*</font>{$MOD.LBL_FTP_SERVER_NAME}:</td>
-		<td><input class="dataInput" type="text" name="server" value="{$FTPSERVER}" size="25" /></td>
-	</tr>
-	<tr>
-		<td><font color="red">*</font>{$MOD.LBL_FTP_USER_NAME}:</td>
-		<td><input class="dataInput" type="text" name="server_username" value="{$FTPUSER}" size="25" /></td>
-	</tr>
-	<tr>
-		<td><font color="red">*</font>{$MOD.LBL_FTP_PASSWORD}:</td>
-		<td><input class="dataInput" type="password" name="server_password" value="{$FTPPASSWORD}" size="25" /></td>
-	</tr>
-	{else}
-	<tr>
-		<td width=40%>{$MOD.LBL_FTP_SERVER_NAME}:</td>
-		<td>{$FTPSERVER}</td>
-	</tr>
-	<tr>
-		<td>{$MOD.LBL_FTP_USER_NAME}:</td>
-		<td>{$FTPUSER}</td>
-	</tr>
-	<tr>
-		<td>{$MOD.LBL_FTP_PASSWORD}:</td>
-		<td>
-		{if $FTPPASSWORD neq ''}
-		******
-		{/if}&nbsp;
-		</td>
-	</tr>
-	{/if}
-
-	<tr><td colspan="2" width="75%">&nbsp; </td></tr>
-	<tr><td colspan="2" align="center"width="75%"><hr> <br>
-	
-	{if $BKP_SERVER_MODE eq 'edit'}
-	<input title="{$APP.LBL_SAVE_BUTTON_LABEL}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="classBtn" type="submit" name="button" value="{$APP.LBL_SAVE_BUTTON_LABEL}" onclick="this.form.action.value='Save'; return validate()"">&nbsp;&nbsp;&nbsp;
-    <input title="{$APP.LBL_CANCEL_BUTTON_LABEL}" accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" class="classBtn" onclick="window.history.back()" type="button" name="button" value="{$APP.LBL_CANCEL_BUTTON_LABEL}">
-	{/if}	
-
-	</td></tr>
-	</tbody></table>
-	</td>
-	<td bgcolor="#ebebeb" width="8"></td>
-	</tr>
-
-	<tr>
-	<td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif;" height="8" width="7"><img src="{$IMAGE_PATH}bottom_left.jpg" align="bottom"></td>
-	<td style="font-size: 1px;" bgcolor="#ececec" height="8"></td>
-	
-	<td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif;" height="8" width="8"><img src="{$IMAGE_PATH}bottom_right.jpg" align="bottom"></td>
-	</tr>
-	</tbody></table>
-
-</td>
-<td width="1%" style="border-right:1px dotted #CCCCCC;">&nbsp;</td>
-</tr>
-</form>
-</table>
-</td>
-</tr>
-</table>
-</td>
-</tr>
-</table>
-	{include file='SettingsSubMenu.tpl'}
-{literal}
-<script>
-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;
-
-}
-</script>
-{/literal}
+{*<!--
+/*********************************************************************************
+  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
+   * ("License"); You may not use this file except in compliance with the License
+   * The Original Code is:  vtiger CRM Open Source
+   * The Initial Developer of the Original Code is vtiger.
+   * Portions created by vtiger are Copyright (C) vtiger.
+   * All Rights Reserved.
+  *
+ ********************************************************************************/
+-->*}
+<script language="JAVASCRIPT" type="text/javascript" src="include/js/smoothscroll.js"></script>
+<br>
+<table align="center" border="0" cellpadding="0" cellspacing="0" width="98%">
+<tbody><tr>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
+        <td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
+<br>
+	<div align=center>
+			{include file="SetMenu.tpl"}
+				<!-- DISPLAY -->
+				<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
+				<form action="index.php" method="post" name="tandc">
+				<input type="hidden" name="server_type" value="backup">
+				<input type="hidden" name="module" value="Settings">
+				<input type="hidden" name="action" value="index">
+				<input type="hidden" name="bkp_server_mode">
+				<input type="hidden" name="server_type" value="backup">
+				<input type="hidden" name="parenttab" value="Settings">
+				<tr>
+					<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}backupserver.gif" alt="Users" width="48" height="48" border=0 title="Users"></td>
+					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > {$MOD.LBL_BACKUP_SERVER_SETTINGS} </b></td>
+				</tr>
+				<tr>
+					<td valign=top class="small">{$MOD.LBL_BACKUP_SERVER_DESC} </td>
+				</tr>
+				</table>
+				
+				<br>
+				<table border=0 cellspacing=0 cellpadding=10 width=100% >
+				<tr>
+				<td>
+				
+					<table border=0 cellspacing=0 cellpadding=5 width=100% class="tableHeading">
+					<tr>
+						<td class="big"><strong>{$MOD.LBL_BACKUP_SERVER_SETTINGS} ({$MOD.LBL_FTP})<br>{$ERROR_MSG}</strong></td>
+						{if $BKP_SERVER_MODE neq 'edit'}
+						<td class="small" align=right>
+							<input title="{$APP.LBL_EDIT_BUTTON_TITLE}" accessKey="{$APP.LBL_EDIT_BUTTON_KEY}" class="crmButton small edit" onclick="this.form.action.value='BackupServerConfig';this.form.bkp_server_mode.value='edit'" type="submit" name="Edit" value="{$APP.LBL_EDIT_BUTTON_LABEL}">
+						</td>
+						{else}
+						<td class="small" align=right>
+							<input title="{$APP.LBL_SAVE_BUTTON_LABEL}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="crmButton small save" type="submit" name="button" value="{$APP.LBL_SAVE_BUTTON_LABEL}" onclick="this.form.action.value='Save'; return validate()">&nbsp;&nbsp;
+						    <input title="{$APP.LBL_CANCEL_BUTTON_LABEL}" accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" class="crmButton small cancel" onclick="window.history.back()" type="button" name="button" value="{$APP.LBL_CANCEL_BUTTON_LABEL}">
+						</td>
+						{/if}
+					</tr>
+					</table>
+				
+			{if $BKP_SERVER_MODE eq 'edit'}	
+			<table border=0 cellspacing=0 cellpadding=0 width=100% class="listRow">
+			<tr>
+      			    <td class="small" valign=top ><table width="100%"  border="0" cellspacing="0" cellpadding="5">
+                        <tr>
+                            <td width="20%" nowrap class="small cellLabel"><font color="red">*</font><strong>{$MOD.LBL_SERVER_ADDRESS} </strong></td>
+                            <td width="80%" class="small cellText">
+				<input type="text" class="detailedViewTextBox small" value="{$FTPSERVER}" name="server"></strong>
+			    </td>
+                          </tr>
+                          <tr valign="top">
+
+                            <td nowrap class="small cellLabel"><font color="red">*</font><strong>{$MOD.LBL_USERNAME}</strong></td>
+                            <td class="small cellText">
+				<input type="text" class="detailedViewTextBox small" value="{$FTPUSER}" name="server_username">
+			    </td>
+                          </tr>
+                          <tr>
+                            <td nowrap class="small cellLabel"><font color="red">*</font><strong>{$MOD.LBL_PASWRD}</strong></td>
+                            <td class="small cellText">
+				<input type="password" class="detailedViewTextBox small" value="{$FTPPASSWORD}" name="server_password">
+			    </td>
+                          </tr>
+                        </table>
+			{else}
+			<table border=0 cellspacing=0 cellpadding=0 width=100% class="listRow">
+			<tr>
+	         	    <td class="small" valign=top ><table width="100%"  border="0" cellspacing="0" cellpadding="5">
+                        <tr>
+                            <td width="20%" nowrap class="small cellLabel"><strong>{$MOD.LBL_SERVER_ADDRESS} </strong></td>
+                            <td width="80%" class="small cellText"><strong>{$FTPSERVER}</strong></td>
+                        </tr>
+                        <tr valign="top">
+                            <td nowrap class="small cellLabel"><strong>{$MOD.LBL_USERNAME}</strong></td>
+                            <td class="small cellText">{$FTPUSER}</td>
+                        </tr>
+                        <tr>
+                            <td nowrap class="small cellLabel"><strong>{$MOD.LBL_PASWRD}</strong></td>
+                            <td class="small cellText">
+				{if $FTPPASSWORD neq ''}
+				******
+				{/if}&nbsp;
+			    </td>
+                        </tr>
+                        </table>
+					
+			{/if}				
+						</td>
+					  </tr>
+					</table>
+					<table border=0 cellspacing=0 cellpadding=5 width=100% >
+					<tr>
+					  <td class="small" nowrap align=right><a href="#top">{$MOD.LBL_SCROLL}</a></td>
+					</tr>
+					</table>
+				</td>
+				</tr>
+				</table>
+			
+			
+			
+			</td>
+			</tr>
+			</table>
+		</td>
+	</tr>
+	</form>
+	</table>
+		
+	</div>
+</td>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
+   </tr>
+</tbody>
+</table>
+{literal}
+<script>
+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;
+
+}
+</script>
+{/literal}



From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 17 07:43:45 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 14:43:45 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7238 -
 /vtigercrm/trunk/Smarty/templates/Settings/EditCompanyInfo.tpl
Message-ID: <20060617144345.F1CF77ED41E@vtiger.fosslabs.com>

Author: richie
Date: Sat Jun 17 08:43:41 2006
New Revision: 7238

Log:
Update company info file according to new ui

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 Sat Jun 17 08:43:41 2006
@@ -9,134 +9,134 @@
   *
  ********************************************************************************/
 -->*}
+<script language="JAVASCRIPT" type="text/javascript" src="include/js/smoothscroll.js"></script>
 <script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
-<style type="text/css">@import url(themes/blue/style.css);</style>
-<table width="100%" border="0" cellpadding="0" cellspacing="0" class="small">
-<tr>
-	{include file='SettingsMenu.tpl'}
-<td width="75%" valign="top">
-
-<table width="100%" border="0" cellpadding="0" cellspacing="0" height="100%" class="small">
-<td class="showPanelBg" valign="top" width="100%" colspan="3" style="padding-left:20px; "><br/>
-<span class="lvtHeaderText"><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS} </a> > {$MOD.LBL_CONFIGURATION} > {$MOD.LBL_COMPANY_INFO}</b></span>
-<hr noshade="noshade" size="1" />
-</td>
-</tr>
-<tr>
-<td width="75%" style="padding-left:20px;" valign="top">
-	
+<br>
+<table align="center" border="0" cellpadding="0" cellspacing="0" width="98%">
+<tbody><tr>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
+        <td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
+<br>
 	<form action="index.php?module=Settings&action=add2db" method="post" name="index" enctype="multipart/form-data">
  	<input type="hidden" name="return_module" value="Settings">
  	<input type="hidden" name="parenttab" value="Settings">
-    <input type="hidden" name="return_action" value="OrganizationConfig">
-	<table align="center" border="0" cellpadding="0" cellspacing="0" width="95%" class="small">
-	<tbody><tr>
-	<td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif;" height="6" width="7"><img src="{$IMAGE_PATH}top_left.jpg" align="top"></td>
-	<td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif; height: 6px;" bgcolor="#ebebeb"></td>
-	<td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif;" height="6" width="8"><img src="{$IMAGE_PATH}top_right.jpg" align="top" height="6" width="8"></td>
+    	<input type="hidden" name="return_action" value="OrganizationConfig">
+	<div align=center>
+			{include file="SetMenu.tpl"}	
+				<!-- DISPLAY -->
+				<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
+				<tr>
+					<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}company.gif" width="48" height="48" border=0 ></td>
+					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > {$MOD.LBL_EDIT} {$MOD.LBL_COMPANY_DETAILS} </b></td>
+				</tr>
+				<tr>
+					<td valign=top class="small">{$MOD.LBL_COMPANY_DESC}</td>
+				</tr>
+				</table>
+				
+				<br>
+				<table border=0 cellspacing=0 cellpadding=10 width=100% >
+				<tr>
+				<td>
+				
+					<table border=0 cellspacing=0 cellpadding=5 width=100% class="tableHeading">
+					<tr>
+						<td class="big"><strong>{$MOD.LBL_COMPANY_DETAILS} </strong>
+						{$ERRORFLAG}<br>
+						</td>
+						<td class="small" align=right>
+							<input title="{$APP.LBL_SAVE_BUTTON_LABEL}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="crmButton small save" type="submit" name="button" value="{$APP.LBL_SAVE_BUTTON_LABEL}" onclick="return verify_data(form,'{$MOD.LBL_ORGANIZATION_NAME}');" >
+							<input title="{$APP.LBL_CANCEL_BUTTON_LABEL}" accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" class="crmButton small cancel" onclick="window.history.back()" type="button" name="button" value="{$APP.LBL_CANCEL_BUTTON_LABEL}">
+						</td>
+					</tr>
+					</table>
+					
+					<table border=0 cellspacing=0 cellpadding=0 width=100% class="listRow">
+					<tr>
+						<td class="small" valign=top ><table width="100%"  border="0" cellspacing="0" cellpadding="5">
+                          <tr>
+                            <td width="20%" class="small cellLabel"><font color="red">*</font><strong>{$MOD.LBL_ORGANIZATION_NAME}</strong></td>
+                            <td width="80%" class="small cellText">
+				<input type="text" name="organization_name" class="detailedViewTextBox small" value="{$ORGANIZATIONNAME}">
+				<input type="hidden" name="org_name" value="{$ORGANIZATIONNAME}">
+			    </strong></td>
+                          </tr>
+                          <tr valign="top">
+                            <td class="small cellLabel"><strong>{$MOD.LBL_ORGANIZATION_LOGO}</strong></td>
+			    {if $ORGANIZATIONLOGONAME neq ''}	
+                            <td class="small cellText" style="background-image: url(test/logo/{$ORGANIZATIONLOGONAME}); background-position: left; background-repeat: no-repeat;" width="48" height="48" border="0" >
+			    {else}
+                            <td class="small cellText" style="background-image: url(include/images/noimage.gif); background-position: left; background-repeat: no-repeat;" width="48" height="48" border="0" >
+			     {/if}	
+				<br><br><br><br>
+                             {$MOD.LBL_SELECT_LOGO} 
+				<INPUT TYPE="HIDDEN" NAME="MAX_FILE_SIZE" VALUE="800000">
+		                <INPUT TYPE="HIDDEN" NAME="PREV_FILE" VALUE="{$ORGANIZATIONLOGONAME}">	 
+                                <input type="file" name="binFile" class="small" value="{$ORGANIZATIONLOGONAME}">[{$ORGANIZATIONLOGONAME}]
+			      </td>
+                          </tr>
+                          <tr>
+                            <td class="small cellLabel"><strong>{$MOD.LBL_ORGANIZATION_ADDRESS}</strong></td>
+                            <td class="small cellText"><input type="text" name="organization_address" class="detailedViewTextBox small" value="{$ORGANIZATIONADDRESS}"></td>
+                          </tr>
+                          <tr> 
+                            <td class="small cellLabel"><strong>{$MOD.LBL_ORGANIZATION_CITY}</strong></td>
+                            <td class="small cellText"><input type="text" name="organization_city" class="detailedViewTextBox small" value="{$ORGANIZATIONCITY}"></td>
+                          </tr>
+                          <tr>
+                            <td class="small cellLabel"><strong>{$MOD.LBL_ORGANIZATION_STATE}</strong></td>
+                            <td class="small cellText"><input type="text" name="organization_state" class="detailedViewTextBox small" value="{$ORGANIZATIONSTATE}"></td>
+                          </tr>
+                          <tr>
+                            <td class="small cellLabel"><strong>{$MOD.LBL_ORGANIZATION_CODE}</strong></td>
+                            <td class="small cellText"><input type="text" name="organization_code" class="detailedViewTextBox small" value="{$ORGANIZATIONCODE}"></td>
+                          </tr>
+                          <tr>
+                            <td class="small cellLabel"><strong>{$MOD.LBL_ORGANIZATION_COUNTRY}</strong></td>
+                            <td class="small cellText"><input type="text" name="organization_country" class="detailedViewTextBox small" value="{$ORGANIZATIONCOUNTRY}"></td>
+
+                          </tr>
+                          <tr>
+                            <td class="small cellLabel"><strong>{$MOD.LBL_ORGANIZATION_PHONE}</strong></td>
+                            <td class="small cellText"><input type="text" name="organization_phone" class="detailedViewTextBox small" value="{$ORGANIZATIONPHONE}"></td>
+                          </tr>
+                          <tr>
+                            <td class="small cellLabel"><strong>{$MOD.LBL_ORGANIZATION_FAX}</strong></td>
+                            <td class="small cellText"><input type="text" name="organization_fax" class="detailedViewTextBox small" value="{$ORGANIZATIONFAX}"></td>
+                          </tr>
+                          <tr>
+                            <td class="small cellLabel"><strong>{$MOD.LBL_ORGANIZATION_WEBSITE}</strong></td>
+                            <td class="small cellText"><input type="text" name="organization_website" class="detailedViewTextBox small" value="{$ORGANIZATIONWEBSITE}"></td>
+                          </tr>
+                        </table>
+						
+						</td>
+					  </tr>
+					</table>
+					<table border=0 cellspacing=0 cellpadding=5 width=100% >
+					<tr>
+					  <td class="small" nowrap align=right><a href="#top">{$MOD.LBL_SCROLL}</a></td>
+					</tr>
+					</table>
+				</td>
+				</tr>
+				</table>
+			
+			
+			
+			</td>
+			</tr>
+			</table>
+		</td>
 	</tr>
-	<tr>
-
-	<td bgcolor="#ebebeb" width="7"></td>
-	<td style="padding-left: 10px; padding-top: 10px; vertical-align: top;" bgcolor="#ececec">
-	<table border="0" cellpadding="10" cellspacing="0" width="100%" class="small">
-	<tbody><tr>
-	{if $ORGANIZATIONLOGONAME neq ''}
-	<td rowspan="11" style="background-image: url(test/logo/{$ORGANIZATIONLOGONAME}); background-position: center; background-repeat: no-repeat;" bgcolor="#ffffff" width="25%">&nbsp;</td>
-	{else}
-	<td rowspan="11" style="background-image: url(include/images/noimage.gif); background-position: center; background-repeat: no-repeat;" bgcolor="#ffffff" width="25%">&nbsp;</td>
-	{/if}
-	<td colspan="2" class="genHeaderBig" width="75%">{$ORGANIZATIONNAME}
-	{$ERRORFLAG}
-	<br><hr> </td>
-	</tr>
-	<tr>
-
-	<td align="right" width="25%"><font color="red">*</font><b>{$MOD.LBL_ORGANIZATION_NAME} : </b></td>
-	<td align="left" width="50%"><input name="organization_name" class="txtBox" value="{$ORGANIZATIONNAME}" type="text">
-	<input type="hidden" name="org_name" value="{$ORGANIZATIONNAME}">
-	</td>
-	</tr>
-	<tr>
-	<td align="right"><b>{$MOD.LBL_ORGANIZATION_ADDRESS} : </b></td>
-	<td><input name="organization_address" class="txtBox" value="{$ORGANIZATIONADDRESS}" type="text"></td>
-	</tr>
-	<tr>
-
-	<td align="right"><b>{$MOD.LBL_ORGANIZATION_CITY} : </b></td>
-	<td><input name="organization_city" class="txtBox" value="{$ORGANIZATIONCITY}" type="text"></td>
-	</tr>
-	<tr>
-	<td align="right"><b>{$MOD.LBL_ORGANIZATION_STATE} : </b></td>
-	<td><input name="organization_state" class="txtBox" value="{$ORGANIZATIONSTATE}" type="text"></td>
-	</tr>
-	<tr>
-
-	<td align="right"><b>{$MOD.LBL_ORGANIZATION_CODE}  : </b></td>
-	<td><input name="organization_code" class="txtBox" value="{$ORGANIZATIONCODE}" type="text"></td>
-	</tr>
-	<tr>
-	<td align="right"><b>{$MOD.LBL_ORGANIZATION_COUNTRY} : </b></td>
-	<td><input name="organization_country" class="txtBox" value="{$ORGANIZATIONCOUNTRY}" type="text"></td>
-	</tr>
-	<tr>
-
-	<td colspan="2" style="padding-bottom: 0px; padding-top: 0px;" width="75%"><hr> </td>
-	</tr>
-	<tr>
-	<td colspan="2" style="padding: 0px;" width="75%">
-	<table border="0" cellpadding="5" cellspacing="0" width="100%" class="small">
-	<tbody><tr>
-	<td nowrap align="right" width="15%"><b>{$MOD.LBL_ORGANIZATION_PHONE} : </b></td>
-	<td width="40%"><input name="organization_phone" class="txtBox" value="{$ORGANIZATIONPHONE}" type="text"></td>
-
-	<td nowrap align="right" width="15%"><b>{$MOD.LBL_ORGANIZATION_WEBSITE} : </b></td>
-	<td width="30%"><input name="organization_website" class="txtBox" value="{$ORGANIZATIONWEBSITE}" type="text"></td>
-	</tr>
-	<tr>
-	<td nowrap align="right"><b>{$MOD.LBL_ORGANIZATION_FAX} : </b></td>
-	<td><input name="organization_fax" class="txtBox" value="{$ORGANIZATIONFAX}" type="text"></td>
-	<td nowrap align="right"><b>{$MOD.LBL_ORGANIZATION_LOGO} : </b></td>
-
-	<td><INPUT TYPE="HIDDEN" NAME="MAX_FILE_SIZE" VALUE="800000">
-	    <INPUT TYPE="HIDDEN" NAME="PREV_FILE" VALUE="{$ORGANIZATIONLOGONAME}">
-	    <input type="file" class="txtBox" name="binFile" value="{$ORGANIZATIONLOGONAME}">[{$ORGANIZATIONLOGONAME}]
-	</td>
-	</tr>
-	</tbody></table></td>
-	</tr>
-	<tr>
-	<td colspan="2" style="padding-top: 0px; padding-bottom: 0px;"><hr></td>
-	</tr>
-	<tr>
-	<td	colspan="2" align="center">
-	<input title="{$APP.LBL_SAVE_BUTTON_LABEL}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="classBtn" type="submit" name="button" value="{$APP.LBL_SAVE_BUTTON_LABEL}" onclick="return verify_data(form,'{$MOD.LBL_ORGANIZATION_NAME}');" >
-    <input title="{$APP.LBL_CANCEL_BUTTON_LABEL}" accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" class="classBtn" onclick="window.history.back()" type="button" name="button" value="{$APP.LBL_CANCEL_BUTTON_LABEL}"></td>
-	</td>
-	</tr>
-	</tbody></table>
-	</td>
-	<td bgcolor="#ebebeb" width="8"></td>
-	</tr>
-	<tr>
-	<td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif;" height="8" width="7"><img src="{$IMAGE_PATH}bottom_left.jpg" align="bottom"></td>
-	<td style="font-size: 1px;" bgcolor="#ececec" height="8"></td>
-	<td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif;" height="8" width="8"><img src="{$IMAGE_PATH}bottom_right.jpg" align="bottom"></td>
-	</tr>
-	</tbody></table>
-	</form>
-
+	</table>
+	</div>
+	</form>		
 </td>
-<td width="1%" style="border-right:1px dotted #CCCCCC;">&nbsp;</td>
-</tr>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
+   </tr>
+</tbody>
 </table>
-</td>
-</tr>
-</table>
-</td>
-</tr>
-</table>
-	{include file='SettingsSubMenu.tpl'}
 {literal}
 <script>
 function verify_data(form,company_name)
@@ -144,7 +144,8 @@
 	if (form.organization_name.value == "" )
 	{
 		alert(company_name +" cannot be none");
-		return false
+		form.organization_name.focus();
+		return false;
 
 	}
 	else if (form.organization_name.value.replace(/^\s+/g, '').replace(/\s+$/g, '').length==0)



From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 17 07:44:55 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 14:44:55 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7239 -
	/vtigercrm/trunk/Smarty/templates/Settings/
Message-ID: <20060617144455.271D47ED41E@vtiger.fosslabs.com>

Author: richie
Date: Sat Jun 17 08:44:46 2006
New Revision: 7239

Log:
Updated the tpl file for new UI

Modified:
    vtigercrm/trunk/Smarty/templates/Settings/EditEmailNotification.tpl
    vtigercrm/trunk/Smarty/templates/Settings/EditInventoryNotify.tpl
    vtigercrm/trunk/Smarty/templates/Settings/EmailNotification.tpl
    vtigercrm/trunk/Smarty/templates/Settings/EmailNotificationContents.tpl
    vtigercrm/trunk/Smarty/templates/Settings/InventoryNotify.tpl
    vtigercrm/trunk/Smarty/templates/Settings/InventoryNotifyContents.tpl
    vtigercrm/trunk/Smarty/templates/Settings/ModuleOwners.tpl
    vtigercrm/trunk/Smarty/templates/Settings/ModuleOwnersContents.tpl

Modified: vtigercrm/trunk/Smarty/templates/Settings/EditEmailNotification.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Settings/EditEmailNotification.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Settings/EditEmailNotification.tpl Sat Jun 17 08:44:46 2006
@@ -9,7 +9,7 @@
   *
  ********************************************************************************/
 -->*}
-<div id="orgLay">
+<div id="editnot" class="fixedLay">
 <table width="100%">
 <tbody>
 <tr>
@@ -50,8 +50,8 @@
 <tr><td colspan="2" style="border-bottom: 1px dashed rgb(204, 204, 204);">&nbsp;</td></tr>
 <tr>
 <td colspan="2" align="center">
-<input name="save" value=" &nbsp;Save&nbsp; " class="classBtn" type="button" onClick="fetchSaveNotify('{$NOTIFY_DETAILS.id}','{$NOTIFY_DETAILS.subject}','{$NOTIFY_DETAILS.body}')">
-<input name="cancel" value=" &nbsp;Cancel&nbsp; " class="classBtn" type="button" onClick="hide('editdiv');">
+<input name="save" value=" {$APP.LBL_SAVE_BUTTON_LABEL} " class="crmButton small save" type="button" onClick="fetchSaveNotify('{$NOTIFY_DETAILS.id}','{$NOTIFY_DETAILS.subject}','{$NOTIFY_DETAILS.body}')">
+<input name="cancel" value=" {$APP.LBL_CANCEL_BUTTON_LABEL} " class="crmButton small cancel" type="button" onClick="hide('editdiv');">
 </td>
 </tr>
 <tr><td colspan="2" style="border-top: 1px dashed rgb(204, 204, 204);">&nbsp;</td></tr>

Modified: vtigercrm/trunk/Smarty/templates/Settings/EditInventoryNotify.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Settings/EditInventoryNotify.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Settings/EditInventoryNotify.tpl Sat Jun 17 08:44:46 2006
@@ -9,7 +9,7 @@
   *
  ********************************************************************************/
 -->*}
-<div id="orgLay">
+<div id="EditInv" class="fixedLay">
 <table width="100%">
 	<tbody>
 	<tr>
@@ -37,8 +37,8 @@
 	<tr><td colspan="4" style="border-bottom: 1px dashed rgb(204, 204, 204);">&nbsp;</td></tr>
 	<tr>
 		<td colspan="4" align="center">
-	<input name="save" value=" &nbsp;Save&nbsp; " class="classBtn" type="button" onClick="fetchSaveNotify('{$NOTIFY_DETAILS.id}')">
-	<input name="cancel" value=" &nbsp;Cancel&nbsp; " class="classBtn" type="button" onClick="hide('editdiv');">
+	<input name="save" value="{$APP.LBL_SAVE_BUTTON_LABEL}" class="crmButton small save" type="button" onClick="fetchSaveNotify('{$NOTIFY_DETAILS.id}')">
+	<input name="cancel" value="{$APP.LBL_CANCEL_BUTTON_LABEL}" class="crmButton small cancel" type="button" onClick="hide('editdiv');">
 		</td>
 	</tr>
 	<tr><td colspan="4" style="border-top: 1px dashed rgb(204, 204, 204);">&nbsp;</td></tr>

Modified: vtigercrm/trunk/Smarty/templates/Settings/EmailNotification.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Settings/EmailNotification.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Settings/EmailNotification.tpl Sat Jun 17 08:44:46 2006
@@ -9,37 +9,93 @@
   *
  ********************************************************************************/
 -->*}
+<script language="JAVASCRIPT" type="text/javascript" src="include/js/smoothscroll.js"></script>
 <script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
-<style type="text/css">@import url(themes/blue/style.css);</style>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-<tr>
-	{include file='SettingsMenu.tpl'}
-<td width="75%" valign="top">
+{literal}
+<style>
+DIV.fixedLay{
+	border:3px solid #CCCCCC;
+	background-color:#FFFFFF;
+	width:500px;
+	position:fixed;
+	left:250px;
+	top:200px;
+	display:block;
+}
+</style>
+{/literal}
+{literal}
+<!--[if lte IE 6]>
+<STYLE type=text/css>
+DIV.fixedLay {
+	POSITION: absolute;
+}
+</STYLE>
+<![endif]-->
 
-<table width="100%" border="0" cellpadding="0" cellspacing="0" height="100%">
-<td class="showPanelBg" valign="top" width="100%" colspan="3" style="padding-left:20px; "><br/>
-<span class="lvtHeaderText"><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS} </a> > {$MOD.LBL_COMMUNICATION_TEMPLATES} > {$MOD.NOTIFICATIONSCHEDULERS}</b></span>
-<hr noshade="noshade" size="1" />
-</td>
-</tr>
-<tr>
-<td width="75%" style="padding-left:20px;" valign="top">
+{/literal}
+<br>
+<table align="center" border="0" cellpadding="0" cellspacing="0" width="98%">
+<tbody><tr>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
+        <td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
+<br>
+	<div align=center>
+	
+			{include file='SetMenu.tpl'}
+		
+			<!-- DISPLAY -->
+			<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
+			<tr>
+				<td width="50" rowspan="2" valign="top"><img src="{$IMAGE_PATH}notification.gif" alt="Users" width="48" height="48" border=0 title="Users"></td>
+				<td colspan="2" class="heading2" valign=bottom align="left"><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > {$MOD.NOTIFICATIONSCHEDULERS} </b></td>
+				<td rowspan=2 class="small" align=right>&nbsp;</td>
+			</tr>
+			<tr>
+				<td valign=top class="small" align="left">{$MOD.LBL_NOTIF_SCHED_DESCRIPTION}</td>
+			</tr>
+			</table>
+<table border=0 cellspacing=0 cellpadding=5 width=100% class="tableHeading">
+						<tr><td>&nbsp;</td></tr>
+				</table>
+
+				<table width="100%" border="0" cellpadding="5" cellspacing="0" class="listTableTopButtons">
+                  <tr >
+
+                    <td  style="padding-left:5px;" class="big">{$MOD.NOTIFICATIONSCHEDULERS}</td>
+                    <td align="right">&nbsp;</td>
+                  </tr>
+			  </table>
+
+
 	
 	<div id="notifycontents">
 	{include file='Settings/EmailNotificationContents.tpl'}
 	</div>
-	
+
+	<table border=0 cellspacing=0 cellpadding=5 width=100% >
+	<tr><td class="small" nowrap align=right><a href="#top">{$MOD.LBL_SCROLL}</a></td></tr>
+	</table>
+	</td>
+	</tr>
+	</table>
+			
+			
+			
+			</td>
+			</tr>
+			</table>
+		</td>
+	</tr>
+	</table>
+		
+	</div>
+
 </td>
-<td width="1%" style="border-right:1px dotted #CCCCCC;">&nbsp;</td>
-</tr>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
+   </tr>
+</tbody>
 </table>
-</td>
-</tr>
-</table>
-</td>
-</tr>
-</table>
-	{include file='SettingsSubMenu.tpl'}
 	<div id="editdiv" style="display:none;position:absolute;left:180px;top:30px;"></div>
 {literal}
 <script>

Modified: vtigercrm/trunk/Smarty/templates/Settings/EmailNotificationContents.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Settings/EmailNotificationContents.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Settings/EmailNotificationContents.tpl Sat Jun 17 08:44:46 2006
@@ -9,24 +9,26 @@
   *
  ********************************************************************************/
 -->*}
-<table style="background-color: rgb(204, 204, 204);" class="small" border="0" cellpadding="5" cellspacing="1" width="100%">
-	<tbody>
+<table width="100%" cellpadding="5" cellspacing="0" class="listTable" >
 	<tr>
-	<td class="lvtCol" width="5%">#</td>
-	<td class="lvtCol" width="35%">{$MOD.LBL_NOTIFICATION}</td>
-	<td class="lvtCol" width="50%">{$MOD.LBL_DESCRIPTION}</td>
-	<td class="lvtCol" width="10%">{$MOD.LBL_ACTIVE}</td>
-	<td class="lvtCol" width="10%">{$MOD.LBL_TOOL}</td>
+	<td class="colHeader small" width="5%">#</td>
+	<td class="colHeader small" width="35%">{$MOD.LBL_NOTIFICATION}</td>
+	<td class="colHeader small" width="50%">{$MOD.LBL_DESCRIPTION}</td>
+	<td class="colHeader small" width="10%">{$MOD.LBL_STATUS}</td>
+	<td class="colHeader small" width="10%">{$MOD.LBL_TOOL}</td>
 	</tr>
 	{foreach name=notifyfor item=elements from=$NOTIFICATION}
-	<tr class="lvtColData" onmouseover="this.className='lvtColDataHover'" onmouseout="this.className='lvtColData'" bgcolor="white">
-	<td>{$smarty.foreach.notifyfor.iteration}</td>
-	<td>{$elements.label}</td>
-	<td>{$elements.schedulename}</td>
-	<td>{$elements.active}</td>
-	<td onClick="fetchEditNotify('{$smarty.foreach.notifyfor.iteration}');"><img src="{$IMAGE_PATH}editfield.gif" title="edit"></td>
+	<tr>
+	<td class="listTableRow small">{$smarty.foreach.notifyfor.iteration}</td>
+	<td class="listTableRow small">{$elements.label}</td>
+	<td class="listTableRow small">{$elements.schedulename}</td>
+	{if $elements.active eq 'Active'}
+	<td class="listTableRow small active">{$elements.active}</td>
+	{else}
+	<td class="listTableRow small inactive">{$elements.active}</td>
+	{/if}
+	<td class="listTableRow small" onClick="fetchEditNotify('{$smarty.foreach.notifyfor.iteration}');"><img src="{$IMAGE_PATH}editfield.gif" title="edit"></td>
 	</tr>
 	{/foreach}
-	</tbody>
 	</table>
 

Modified: vtigercrm/trunk/Smarty/templates/Settings/InventoryNotify.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Settings/InventoryNotify.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Settings/InventoryNotify.tpl Sat Jun 17 08:44:46 2006
@@ -9,37 +9,88 @@
   *
  ********************************************************************************/
 -->*}
+<script language="JAVASCRIPT" type="text/javascript" src="include/js/smoothscroll.js"></script>
 <script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
-<style type="text/css">@import url(themes/blue/style.css);</style>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-<tr>
-	{include file='SettingsMenu.tpl'}
-<td width="75%" valign="top">
+{literal}
+<style>
+DIV.fixedLay{
+	border:3px solid #CCCCCC;
+	background-color:#FFFFFF;
+	width:500px;
+	position:fixed;
+	left:250px;
+	top:200px;
+	display:block;
+}
+</style>
+{/literal}
+{literal}
+<!--[if lte IE 6]>
+<STYLE type=text/css>
+DIV.fixedLay {
+	POSITION: absolute;
+}
+</STYLE>
+<![endif]-->
 
-<table width="100%" border="0" cellpadding="0" cellspacing="0" height="100%">
-<td class="showPanelBg" valign="top" width="100%" colspan="3" style="padding-left:20px; "><br/>
-<span class="lvtHeaderText"><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS} </a> > {$MOD.LBL_COMMUNICATION_TEMPLATES} > {$MOD.INVENTORYNOTIFICATION}</b></span>
-<hr noshade="noshade" size="1" />
-</td>
-</tr>
-<tr>
-<td width="75%" style="padding-left:20px;" valign="top">
+{/literal}
+<br>
+<table align="center" border="0" cellpadding="0" cellspacing="0" width="98%">
+<tbody><tr>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
+        <td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
+<br>
+	<div align=center>
+	
+			{include file='SetMenu.tpl'}
+
+			<!-- DISPLAY -->
+			<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
+			<tr>
+				<td width="50" rowspan="2" valign="top"><img src="{$IMAGE_PATH}inventory.gif" alt="Users" width="48" height="48" border=0 title="Users"></td>
+				<td colspan="2" class="heading2" valign=bottom align="left"><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > {$MOD.INVENTORYNOTIFICATION} </b></td>
+				<td rowspan=2 class="small" align=right>&nbsp;</td>
+			</tr>
+			<tr>
+				<td valign=top class="small" align="left">{$MOD.LBL_INV_NOTIF_DESCRIPTION}</td>
+			</tr>
+			</table>
+<table border=0 cellspacing=0 cellpadding=5 width=100% class="tableHeading">
+						<tr><td>&nbsp;</td></tr>
+				</table>
+
+				<table width="100%" border="0" cellpadding="5" cellspacing="0" class="listTableTopButtons">
+                  <tr >
+
+                    <td  style="padding-left:5px;" class="big">{$MOD.INVENTORYNOTIFICATION}</td>
+                    <td align="right">&nbsp;</td>
+                  </tr>
+			  </table>
 	
 	<div id="notifycontents">
 	{include file='Settings/InventoryNotifyContents.tpl'}
 	</div>
 	
+	<table border=0 cellspacing=0 cellpadding=5 width=100% >
+	<tr><td class="small" nowrap align=right><a href="#top">{$MOD.LBL_SCROLL}</a></td></tr>
+	</table>
+	</td>
+	</tr>
+	</table>
+	</td>
+	</tr>
+	</table>
+	</td>
+	</tr>
+	</table>
+		
+	</div>
+
 </td>
-<td width="1%" style="border-right:1px dotted #CCCCCC;">&nbsp;</td>
-</tr>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
+   </tr>
+</tbody>
 </table>
-</td>
-</tr>
-</table>
-</td>
-</tr>
-</table>
-	{include file='SettingsSubMenu.tpl'}
 	<div id="editdiv" style="display:none;position:absolute;left:180px;top:30px;"></div>
 {literal}
 <script>

Modified: vtigercrm/trunk/Smarty/templates/Settings/InventoryNotifyContents.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Settings/InventoryNotifyContents.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Settings/InventoryNotifyContents.tpl Sat Jun 17 08:44:46 2006
@@ -9,21 +9,21 @@
   *
  ********************************************************************************/
 -->*}
-<table style="background-color: rgb(204, 204, 204);" class="small" border="0" cellpadding="5" cellspacing="1" width="100%">
+<table width="100%" cellpadding="5" cellspacing="0" class="listTable" >
 	
 	<tbody>
 	<tr>
-	<td class="lvtCol" width="5%">#</td>
-	<td class="lvtCol" width="40%">{$CMOD.LBL_NOTIFICATION}</td>
-	<td class="lvtCol" width="50%">{$CMOD.LBL_DESCRIPTION}</td>
-	<td class="lvtCol" width="5%">{$CMOD.Tools}</td>
+	<td class="colHeader small" width="5%">#</td>
+	<td class="colHeader small" width="40%">{$CMOD.LBL_NOTIFICATION}</td>
+	<td class="colHeader small" width="50%">{$CMOD.LBL_DESCRIPTION}</td>
+	<td class="colHeader small" width="5%">{$CMOD.Tools}</td>
 	</tr>
 	{foreach name=notifyfor item=elements from=$NOTIFICATION}
-	<tr class="lvtColData" onmouseover="this.className='lvtColDataHover'" onmouseout="this.className='lvtColData'" bgcolor="white">
-	<td>{$smarty.foreach.notifyfor.iteration}</td>
-	<td>{$elements.notificationname}</td>
-	<td>{$elements.label}</td>
-	<td align="center" onClick="fetchEditNotify('{$elements.id}');"><img src="{$IMAGE_PATH}editfield.gif"></td>
+	<tr>
+	<td class="listTableRow small">{$smarty.foreach.notifyfor.iteration}</td>
+	<td class="listTableRow small">{$elements.notificationname}</td>
+	<td class="listTableRow small">{$elements.label}</td>
+	<td class="listTableRow small" align="center" onClick="fetchEditNotify('{$elements.id}');"><img src="{$IMAGE_PATH}editfield.gif"></td>
 	</tr>
 	{/foreach}
 	</tbody>

Modified: vtigercrm/trunk/Smarty/templates/Settings/ModuleOwners.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Settings/ModuleOwners.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Settings/ModuleOwners.tpl Sat Jun 17 08:44:46 2006
@@ -9,37 +9,60 @@
   *
  ********************************************************************************/
 -->*}
+<script language="JAVASCRIPT" type="text/javascript" src="include/js/smoothscroll.js"></script>
 <script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
-<style type="text/css">@import url(themes/blue/style.css);</style>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-<tr>
-	{include file='SettingsMenu.tpl'}
-<td width="75%" valign="top">
+<br>
+<table align="center" border="0" cellpadding="0" cellspacing="0" width="98%">
+<tbody><tr>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
+        <td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
+<br>
+	<div align=center>
+	
+			{include file='SetMenu.tpl'}
 
-<table width="100%" border="0" cellpadding="0" cellspacing="0" height="100%">
-<td class="showPanelBg" valign="top" width="100%" colspan="3" style="padding-left:20px; "><br/>
-<span class="lvtHeaderText"><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS} </a> > {$MOD.LBL_USER_MANAGEMENT} > {$MOD.LBL_ASSIGN_MODULE_OWNERS}</b></span>
-<hr noshade="noshade" size="1" />
+			<!-- DISPLAY -->
+			<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
+			<tr>
+					<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}assign.gif" alt="Users" width="48" height="48" border=0 title="Users"></td>
+				<td class="heading2" valign="bottom" ><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > {$MOD.LBL_MODULE_OWNERS} </b></td>
+			</tr>
+			<tr>
+				<td valign=top class="small">{$MOD.LBL_MODULE_OWNERS_DESCRIPTION}</td>
+			</tr>
+			</table>
+			<br>
+			<table border=0 cellspacing=0 cellpadding=10 width=100% >
+			<tr>
+			<td>
+
+					<div id="module_list_owner">	
+						{include file='Settings/ModuleOwnersContents.tpl'}
+					</div>
+	
+	<table border=0 cellspacing=0 cellpadding=5 width=100% >
+	<tr><td class="small" nowrap align=right><a href="#top">{$MOD.LBL_SCROLL}</a></td></tr>
+	</table>
+	</td>
+	</tr>
+	</table>
+	</td>
+	</tr>
+	</table>
+	</td>
+	</tr>
+	</form>
+	</table>
+		
+	</div>
+
 </td>
-</tr>
-<tr>
-<td width="75%" style="padding-left:20px;" valign="top">
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
+   </tr>
+</tbody>
+</table>
+
 	
-	<div id="module_list_owner">	
-	{include file='Settings/ModuleOwnersContents.tpl'}
-	</div>
-	
-</td>
-<td width="1%" style="border-right:1px dotted #CCCCCC;">&nbsp;</td>
-</tr>
-</table>
-</td>
-</tr>
-</table>
-</td>
-</tr>
-</table>
-	{include file='SettingsSubMenu.tpl'}
 {literal}
 <script>
 function assignmodulefn(mode)

Modified: vtigercrm/trunk/Smarty/templates/Settings/ModuleOwnersContents.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Settings/ModuleOwnersContents.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Settings/ModuleOwnersContents.tpl Sat Jun 17 08:44:46 2006
@@ -11,46 +11,47 @@
 -->*}
 <form name="support_owners" method="POST" action="index.php">
 	<input type="hidden" name="module" value="Settings">
+	<input type="hidden" name="parenttab" value="Settings">
 	<input type="hidden" name="action" value="SettingsAjax">
 	<input type="hidden" name="file" value="ListModuleOwners">
-	<table class="prdTab" align="center" cellpadding="3" cellspacing="0">
-	<tbody><tr><td colspan="3" style="border: 0px none ;">&nbsp;</td></tr>
+<table border=0 cellspacing=0 cellpadding=5 width=100% class="tableHeading">
+<tr>
+	<td class="big"><strong>{$MOD.LBL_MODULES_AND_OWNERS}</strong></td>
+	<td class="small" align=right>
+<div align="right">
+{if $MODULE_MODE neq 'edit'}
+		<input title="{$APP.LBL_EDIT_BUTTON_LABEL}" accessKey="{$APP.LBL_EDIT_BUTTON_KEY}" class="crmButton small edit" type="button" name="button" value="{$APP.LBL_EDIT_BUTTON_LABEL}" onClick="assignmodulefn('edit');">
+{else}
+		<input title="{$APP.LBL_SAVE_BUTTON_LABEL}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="crmButton small save" type="button" name="button" value="{$APP.LBL_SAVE_BUTTON_LABEL}" onClick="assignmodulefn('save');" >&nbsp;
+						<input title="{$APP.LBL_CANCEL_BUTTON_LABEL}" accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" class="crmButton small cancel" onclick="this.form.action.value='ListModuleOwners'; this.form.parenttab.value='Settings';" type="submit" name="button" value="{$APP.LBL_CANCEL_BUTTON_LABEL}" >
+{/if}
+</div>
+</td>
+</tr>
+					
+</table>
+	<table border=0 cellspacing=0 cellpadding=5 width=100% class="listTable">	
 	<tr>
-	<td style="border: 0px none ;" colspan="2" align="left">&nbsp;</td>
-	<td style="border: 0px none ;" align="right">
-	<div align="right">
-	{if $MODULE_MODE neq 'edit'}
-	<input title="{$APP.LBL_EDIT_BUTTON_LABEL}" accessKey="{$APP.LBL_EDIT_BUTTON_KEY}" class="classBtn" type="button" name="button" value="{$APP.LBL_EDIT_BUTTON_LABEL}" onClick="assignmodulefn('edit');">
-	{else}
-	<input title="{$APP.LBL_SAVE_BUTTON_LABEL}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="classBtn" type="button" name="button" value="{$APP.LBL_SAVE_BUTTON_LABEL}" onClick="assignmodulefn('save');" >
-	<input title="{$APP.LBL_CANCEL_BUTTON_LABEL}" accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" class="classBtn" onclick="this.form.action.value='ListModuleOwners';" type="submit" name="button" value="{$APP.LBL_CANCEL_BUTTON_LABEL}" >
-	{/if}
-	</div>
-	</td>
-	</tr>
-	<tr><td colspan="3" style="border: 0px none ;">&nbsp;</td></tr>
-	
-	<tr>
-	<th style="border-top: 1px solid rgb(204, 204, 204); height: 30px;" width="10%"><b>#</b></th>
-	<th style="border-top: 1px solid rgb(204, 204, 204);" width="45%"><b>{$MOD.LBL_MODULE}</b></th>
-	<th style="border-top: 1px solid rgb(204, 204, 204);" width="45%"><b>{$MOD.LBL_OWNER} </b></th>
+		<td class="colHeader small" width="2%">#</td>
+		<td class="colHeader small" width="30%">{$MOD.LBL_MODULE}</td>
+		<td class="colHeader small" width="65%">{$MOD.LBL_OWNER}</td>
 	</tr>
 	{if $MODULE_MODE neq 'edit'}
 	{foreach name=modulelists item=modules from=$USER_LIST}
-	<tr class="prvPrfHoverOff" onmouseover="this.className='prvPrfHoverOn'" onmouseout="this.className='prvPrfHoverOff'">
-		<td>{$smarty.foreach.modulelists.iteration}</td>
-		<td>{$APP[$modules.0]}</td>
-		<td><a href="index.php?module=Users&action=DetailView&record={$modules.1}">{$modules.2}</a></td>	
+	<tr>
+		<td class="listTableRow small" valign="top">{$smarty.foreach.modulelists.iteration}</td>
+		<td class="listTableRow small" valign="top">{$APP[$modules.0]}</td>
+		<td class="listTableRow small" valign="top"><a href="index.php?module=Users&action=DetailView&record={$modules.1}">{$modules.2}</a></td>	
 	</tr>
 	{/foreach}
 	{else}
 	{foreach name=modulelists item=modules from=$USER_LIST}
-	<tr class="prvPrfHoverOff">
-		<td>{$smarty.foreach.modulelists.iteration}</td>
-		<td>{$APP[$modules.0]}</td>
-		<td>{$modules.1}</td>	
+	<tr>
+		<td class="listTableRow small" valign="top">{$smarty.foreach.modulelists.iteration}</td>
+		<td class="listTableRow small" valign="top">{$APP[$modules.0]}</td>
+		<td class="listTableRow small" valign="top">{$modules.1}</td>	
 	</tr>
 	{/foreach}
 	{/if}
-	</tbody></table>
-	</form>
+	</table>
+</form>



From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 17 07:48:19 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 14:48:19 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7240 - in
 /vtigercrm/trunk/Smarty/templates: CurrencyListView.tpl
 CurrencyListViewEntries.tpl
Message-ID: <20060617144819.533E47ED41E@vtiger.fosslabs.com>

Author: richie
Date: Sat Jun 17 08:48:15 2006
New Revision: 7240

Log:
Updated the CurrencyListView.tpl CurrencyListViewEntries.tpl files

Modified:
    vtigercrm/trunk/Smarty/templates/CurrencyListView.tpl
    vtigercrm/trunk/Smarty/templates/CurrencyListViewEntries.tpl

Modified: vtigercrm/trunk/Smarty/templates/CurrencyListView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/CurrencyListView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/CurrencyListView.tpl Sat Jun 17 08:48:15 2006
@@ -1,5 +1,4 @@
 {*<!--
-
 /*********************************************************************************
 ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
  * ("License"); You may not use this file except in compliance with the License
@@ -9,8 +8,81 @@
  * All Rights Reserved.
 *
  ********************************************************************************/
+-->*}
+<script language="JAVASCRIPT" type="text/javascript" src="include/js/smoothscroll.js"></script>
+<script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
+<br>
+<table align="center" border="0" cellpadding="0" cellspacing="0" width="98%">
+<tbody><tr>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
+        <td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
+<br>
+	<div align=center>
+	
+			{include file='SetMenu.tpl'}
 
--->*}
+			<!-- DISPLAY -->
+			<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
+			<form action="index.php">
+			<input type="hidden" name="module" value="Settings">
+			<input type="hidden" name="action" value="CurrencyEditView">
+			<input type="hidden" name="parenttab" value="{$PARENTTAB}">
+			<tr>
+					<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}currency.gif" alt="Users" width="48" height="48" border=0 title="Users"></td>
+				<td class="heading2" valign="bottom" ><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > {$MOD.LBL_CURRENCY_SETTINGS} </b></td>
+			</tr>
+			<tr>
+				<td valign=top class="small">{$MOD.LBL_CURRENCY_DESCRIPTION}</td>
+			</tr>
+			</table>
+			<br>
+			<table border=0 cellspacing=0 cellpadding=10 width=100% >
+			<tr>
+			<td>
+
+			<table border=0 cellspacing=0 cellpadding=5 width=100% class="tableHeading">
+				<tr>
+					<td class="big"><strong>{$MOD.LBL_CURRENCY_LIST}</strong></td>
+                	       		<td class="small" align="right">&nbsp;</td>
+				</tr>
+			</table>
+
+			<table width="100%" border="0" cellpadding="5" cellspacing="0" class="listTableTopButtons">
+	                <tr>
+				<td class=small align=right>
+					<input type="submit" value="{$MOD.LBL_NEW_CURRENCY}" class="crmButton create small">
+				</td>
+	                </tr>
+	                </table>
+
+			<div id="CurrencyListViewContents">
+				{include file="CurrencyListViewEntries.tpl"}
+			</div>
+
+	<table border=0 cellspacing=0 cellpadding=5 width=100% >
+	<tr><td class="small" nowrap align=right><a href="#top">{$MOD.LBL_SCROLL}</a></td></tr>
+	</table>
+	</td>
+	</tr>
+	</table>
+	</td>
+	</tr>
+	</table>
+	</td>
+	</tr>
+	</form>
+	</table>
+		
+	</div>
+
+</td>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
+   </tr>
+</tbody>
+</table>
+
+<div id="currencydiv" style="display:block;position:absolute;left:350px;top:200px;"></div>
+
 {literal}
 <script>
 	function deleteCurrency(currid)
@@ -49,35 +121,3 @@
 </script>
 
 {/literal}
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-<tr>
-        {include file='SettingsMenu.tpl'}
-<td width="75%" valign="top">
-<form action="index.php">
-<input type="hidden" name="module" value="Settings">
-<input type="hidden" name="action" value="CurrencyEditView">
-<input type="hidden" name="parenttab" value="{$PARENTTAB}">
-<table width="100%" border="0" cellpadding="0" cellspacing="0" height="100%">
-	<tr>
-		<td class="showPanelBg" valign="top" width="90%"  style="padding-left:20px; "><br />
-			<span class="lvtHeaderText">{$MOD.LBL_MODULE_NAME} &gt;{$MOD.LBL_CONFIGURATION} &gt; {$MOD.LBL_CURRENCY_CONFIG}</span>
-			<hr noshade="noshade" size="1" />
-		</td>
-		<td width="10%" class="showPanelBg">&nbsp;</td>
-	</tr>
-	<tr>
-		<td width="90%" style="padding-left:20px;" valign="top">
-			<input type="submit" name="new" value="{$MOD.LBL_NEW_CURRENCY}" class="classBtn" /><br /><br />
-			<div id="CurrencyListViewContents">
-				{include file="CurrencyListViewEntries.tpl"}
-			</div>
-		</td>
-		<td>&nbsp;</td>
-	</tr>
-</table>
-</form>
-</td>
-</tr>
-</table>
-<div id="currencydiv" style="display:block;position:absolute;left:350px;top:200px;"></div>
-{include file='SettingsSubMenu.tpl'}

Modified: vtigercrm/trunk/Smarty/templates/CurrencyListViewEntries.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/CurrencyListViewEntries.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/CurrencyListViewEntries.tpl Sat Jun 17 08:48:15 2006
@@ -1,5 +1,4 @@
 {*<!--
-
 /*********************************************************************************
 ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
  * ("License"); You may not use this file except in compliance with the License
@@ -12,21 +11,29 @@
 
 -->*}
 
-
-<table style="background-color: rgb(204, 204, 204);" class="small" border="0" cellpadding="5" cellspacing="1" width="100%">
+<table width="100%" cellpadding="5" cellspacing="0" class="listTable" >
 	<tr>
-        	<td class="lvtCol" width="25%">{$MOD.LBL_CURRENCY_NAME}</td>
-                <td class="lvtCol" width="20%">{$MOD.LBL_CURRENCY_CODE}</td>
-                <td class="lvtCol" width="5%">{$MOD.LBL_CURRENCY_SYMBOL}</td>
-                <td class="lvtCol" width="20%">{$MOD.LBL_CURRENCY_CRATE}</td>
-                <td class="lvtCol" width="15%">{$MOD.LBL_CURRENCY_STATUS}</td>
-                <td class="lvtCol" width="15%">{$MOD.LBL_CURRENCY_TOOL}</td>
+                <td class="colHeader small" width="3%">#</td>
+                <td class="colHeader small" width="9%">{$MOD.LBL_CURRENCY_TOOL}</td>
+        	<td class="colHeader small" width="23%">{$MOD.LBL_CURRENCY_NAME}</td>
+                <td class="colHeader small" width="20%">{$MOD.LBL_CURRENCY_CODE}</td>
+                <td class="colHeader small" width="10%">{$MOD.LBL_CURRENCY_SYMBOL}</td>
+                <td class="colHeader small" width="20%">{$MOD.LBL_CURRENCY_CRATE}</td>
+                <td class="colHeader small" width="15%">{$MOD.LBL_CURRENCY_STATUS}</td>
 	</tr>
-	{foreach item=currency_array key=id from=$CURRENCY_LIST}
-		<tr class="lvtColData" onmouseover="this.className='lvtColDataHover'" onmouseout="this.className='lvtColData'" bgcolor="white">
-			{foreach item=currencyvalues from=$currency_array}
-				<td nowrap>{$currencyvalues}</td>
-			{/foreach}
+	{foreach item=currencyvalues name=currlist key=id from=$CURRENCY_LIST}
+		<tr>
+			<td nowrap class="listTableRow small" valign="top">{$smarty.foreach.currlist.iteration}</td>
+			<td nowrap class="listTableRow small" valign="top">{$currencyvalues.tool}</td>
+			<td nowrap class="listTableRow small" valign="top"><b>{$currencyvalues.name}</b></td>
+			<td nowrap class="listTableRow small" valign="top">{$currencyvalues.code}</td>
+			<td nowrap class="listTableRow small" valign="top">{$currencyvalues.symbol}</td>
+			<td nowrap class="listTableRow small" valign="top">{$currencyvalues.crate}</td>
+			{if $currencyvalues.status eq 'Active'}
+			<td nowrap class="listTableRow small active" valign="top">{$currencyvalues.status}</td>
+			{else}
+			<td nowrap class="listTableRow small inactive" valign="top">{$currencyvalues.status}</td>
+			{/if}
                  </tr>
         {/foreach}
 </table>



From vtiger-tickets at vtiger.fosslabs.com  Sat Jun 17 07:51:26 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sat, 17 Jun 2006 14:51:26 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23898=3A_?=
 =?utf-8?q?navigation_information_issue_in_relatedlist?=
In-Reply-To: <076.a96614f2714cd8babb913ad5c1afb3f6@vtiger.fosslabs.com>
References: <076.a96614f2714cd8babb913ad5c1afb3f6@vtiger.fosslabs.com>
Message-ID: <085.b834ceb802b1a864f3404f3c81a8b1ba@vtiger.fosslabs.com>

#898: navigation information issue in relatedlist
------------------------+---------------------------------------------------
  Reporter:  mickie     |       Owner:  philip
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  wontfix    |    Keywords:        
------------------------+---------------------------------------------------
Changes (by anonymous):

  * resolution:  => wontfix
  * status:  new => closed

Comment:

 For Attachments and History this will not be present, as these are not
 stand alone modules, for this the navigation info will not be present.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/898>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Sat Jun 17 07:53:10 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sat, 17 Jun 2006 14:53:10 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231321=3A?=
 =?utf-8?q?_Inconsistent_pagination_behaviour_in_Related_Lists_of_Leads_Mo?=
 =?utf-8?q?dule?=
In-Reply-To: <076.6915ecc3787751002b5c1b5587a1f1a7@vtiger.fosslabs.com>
References: <076.6915ecc3787751002b5c1b5587a1f1a7@vtiger.fosslabs.com>
Message-ID: <085.310a2e435fcd7c7f158c7c083d20c81e@vtiger.fosslabs.com>

#1321: Inconsistent pagination behaviour in Related Lists of Leads Module
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  saraj 
      Type:  defect     |      Status:  closed
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by saraj):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 (In [7241]) unwanted code commented. Fixes #1321

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1321>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 17 07:53:10 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 14:53:10 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7241 -
	/vtigercrm/trunk/include/utils/ListViewUtils.php
Message-ID: <20060617145310.C0E8B7ED435@vtiger.fosslabs.com>

Author: saraj
Date: Sat Jun 17 08:53:05 2006
New Revision: 7241

Log:
unwanted code commented. Fixes #1321

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 Sat Jun 17 08:53:05 2006
@@ -345,7 +345,7 @@
 	$log->debug("Entering getNavigationValues(".$display.",".$noofrows.",".$limit.") method ...");
 	$navigation_array = Array();   
 	global $limitpage_navigation;
-	if(isset($_REQUEST['allflag']) && $_REQUEST['allflag'] == 'All'){
+/*	if(isset($_REQUEST['allflag']) && $_REQUEST['allflag'] == 'All'){
 		$navigation_array['start'] =1;
 		$navigation_array['first'] = 1;
 		$navigation_array['end'] = 1;
@@ -357,7 +357,7 @@
 		$navigation_array['verylast'] =1;
 		$log->debug("Exiting getNavigationValues method ...");
 		return $navigation_array;
-	}
+	}*/
 	if($noofrows != 0)
 	$start = ((($display * $limit) - $limit)+1);
 	else



From vtiger-tickets at vtiger.fosslabs.com  Sat Jun 17 13:27:42 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sat, 17 Jun 2006 20:27:42 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231335=3A?=
 =?utf-8?q?_Repeated_loads_of_language_files?=
Message-ID: <076.d2e877577a1b60bc98a97be803210fac@vtiger.fosslabs.com>

#1335: Repeated loads of language files
--------------------------+-------------------------------------------------
 Reporter:  jrydbeck      |       Owner:  developer
     Type:  defect        |      Status:  new      
 Priority:  major         |   Milestone:  4.2.5    
Component:  vtigercrm     |     Version:  4.2.4rc3 
 Keywords:  optimization  |  
--------------------------+-------------------------------------------------
 The language file is loaded repeatedly by utils.php (roughly 7 times when
 the Account tab is clicked).  This is not efficient; scoping should be
 performed properly at initialization so that this isn't necessary.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1335>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Sat Jun 17 13:27:55 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sat, 17 Jun 2006 20:27:55 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231335=3A?=
 =?utf-8?q?_Repeated_loads_of_language_files?=
In-Reply-To: <076.d2e877577a1b60bc98a97be803210fac@vtiger.fosslabs.com>
References: <076.d2e877577a1b60bc98a97be803210fac@vtiger.fosslabs.com>
Message-ID: <085.e3b36722ba55eac9dc0d2609894d8111@vtiger.fosslabs.com>

#1335: Repeated loads of language files
------------------------+---------------------------------------------------
  Reporter:  jrydbeck   |       Owner:  developer   
      Type:  defect     |      Status:  new         
  Priority:  minor      |   Milestone:  4.2.5       
 Component:  vtigercrm  |     Version:  4.2.4rc3    
Resolution:             |    Keywords:  optimization
------------------------+---------------------------------------------------
Changes (by jrydbeck):

  * priority:  major => minor

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1335>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Sat Jun 17 14:02:07 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sat, 17 Jun 2006 21:02:07 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231336=3A?=
 =?utf-8?q?_Advsearch_variable_is_referenced_but_never_defined?=
Message-ID: <076.1bba32b704b652f0769856fc81d1d1ab@vtiger.fosslabs.com>

#1336: Advsearch variable is referenced but never defined
---------------------------------+------------------------------------------
 Reporter:  jrydbeck             |       Owner:  developer
     Type:  defect               |      Status:  new      
 Priority:  minor                |   Milestone:  4.2.5    
Component:  vtigercrm            |     Version:  4.2.4rc3 
 Keywords:  variable definition  |  
---------------------------------+------------------------------------------
 modules\Quotes\ListView.php lines 175 & 176 reference $advsearch but it is
 never defined.  This produces a php notice as follows:
 {{{
 Notice: C:\Nubrek\Projects\vtigercrm4\modules\Quotes\ListView.php line 176
 - Undefined variable:  advsearch
 }}}
 Bug #748 addressed most notices; however, this one isn't clear where the
 definition should be or what it should be.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1336>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 17 14:03:52 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 21:03:52 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7242 - in
 /vtigercrm/branches/4.2: ./ include/ include/database/ include/language/
 modules/Accounts/ modules/Activities/ modules/Activities/language/
 modules/Calendar/ modules/Contacts/ modules/Emails/ modules/HelpDesk/
 modules/Leads/ modules/Potentials/ modules/Products/ modules/Quotes/
Message-ID: <20060617210353.C7F32809620@vtiger.fosslabs.com>

Author: jrydbeck
Date: Sat Jun 17 15:03:33 2006
New Revision: 7242

Log:
Additional fixes on bug #748.  Most ListView's no longer produce notices.  There are some that will give errors (including 2 notices on the homepage); but for the most part things are a lot cleaner.

Modified:
    vtigercrm/branches/4.2/include/database/PearDatabase.php
    vtigercrm/branches/4.2/include/language/en_us.lang.php
    vtigercrm/branches/4.2/include/utils.php
    vtigercrm/branches/4.2/index.php
    vtigercrm/branches/4.2/modules/Accounts/ListView.php
    vtigercrm/branches/4.2/modules/Activities/ListView.php
    vtigercrm/branches/4.2/modules/Activities/language/en_us.lang.php
    vtigercrm/branches/4.2/modules/Calendar/webelements.p3
    vtigercrm/branches/4.2/modules/Contacts/ListView.php
    vtigercrm/branches/4.2/modules/Contacts/index.php
    vtigercrm/branches/4.2/modules/Emails/ListView.php
    vtigercrm/branches/4.2/modules/HelpDesk/ListView.php
    vtigercrm/branches/4.2/modules/Leads/ListView.php
    vtigercrm/branches/4.2/modules/Potentials/Charts.php
    vtigercrm/branches/4.2/modules/Potentials/ListView.php
    vtigercrm/branches/4.2/modules/Products/ListView.php
    vtigercrm/branches/4.2/modules/Products/index.php
    vtigercrm/branches/4.2/modules/Quotes/ListView.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 Sat Jun 17 15:03:33 2006
@@ -436,17 +436,20 @@
 	/* ADODB newly added. replacement for mysql_result() */
 
 	function query_result(&$result, $row, $col=0)
-	{		
+	{
+		$return_val = null;
+		
 		if($result->_numOfRows > $row)
 		{
 			$result->Move($row);
 			$rowdata = $this->change_key_case($result->FetchRow());
-			return to_html($rowdata[$col]);
-		}
-		else
-		{
-			return to_html(null);
-		}
+			if(isset($rowdata[$col]))
+			{
+				return to_html($rowdata[$col]);
+			}
+		}
+		
+		return to_html($return_val);
 	}
 
 	/* ADODB Converted	

Modified: vtigercrm/branches/4.2/include/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/4.2/include/language/en_us.lang.php (original)
+++ vtigercrm/branches/4.2/include/language/en_us.lang.php Sat Jun 17 15:03:33 2006
@@ -738,7 +738,7 @@
 'LBL_JSCALENDAR_LANG'=>'en',
 'LNK_CV_EDIT'=>'Edit',
 'LNK_CV_DELETE'=>'Delete',
-'LNK_CV_CREATEVIEW'=>'Create View',
+'LNK_CV_CREATEVIEW'=>'Create View'
 
 );
 

Modified: vtigercrm/branches/4.2/include/utils.php
==============================================================================
--- vtigercrm/branches/4.2/include/utils.php (original)
+++ vtigercrm/branches/4.2/include/utils.php Sat Jun 17 15:03:33 2006
@@ -189,11 +189,14 @@
 	$temp_app_list_strings = $app_list_strings;
 	$language_used = $language;
 
-	@include("include/language/$language.lang.php");
 	if(!isset($app_list_strings))
 	{
+		@include("include/language/$language.lang.php");
+	}
+	if(!isset($app_list_strings))
+	{
 		$log->warn("Unable to find the application language file for language: ".$language);
-		require("include/language/$default_language.lang.php");
+		@include("include/language/$default_language.lang.php");
 		$language_used = $default_language;
 	}
 
@@ -221,11 +224,14 @@
 	$temp_app_strings = $app_strings;
 	$language_used = $language;
 
-	@include("include/language/$language.lang.php");
 	if(!isset($app_strings))
 	{
+		@include("include/language/$language.lang.php");
+	}
+	if(!isset($app_strings))
+	{
 		$log->warn("Unable to find the application language file for language: ".$language);
-		require("include/language/$default_language.lang.php");
+		@include("include/language/$default_language.lang.php");
 		$language_used = $default_language;
 	}
 
@@ -269,11 +275,14 @@
 	$temp_mod_strings = $mod_strings;
 	$language_used = $language;
 
-	@include("modules/$module/language/$language.lang.php");
 	if(!isset($mod_strings))
 	{
+		@include("include/language/$language.lang.php");
+	}
+	if(!isset($mod_strings))
+	{
 		$log->warn("Unable to find the module language file for language: ".$language." and module: ".$module);
-		require("modules/$module/language/$default_language.lang.php");
+		@include("modules/$module/language/$default_language.lang.php");
 		$language_used = $default_language;
 	}
 
@@ -315,8 +324,10 @@
 		return $mod_list_strings;
 	}
 
-	@include("modules/$module/language/$language.lang.php");
-
+	if(!isset($mod_list_strings))
+	{
+		@include("include/language/$language.lang.php");
+	}
 	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)");
@@ -340,14 +351,16 @@
 
 	$language_used = $language;
 
-	@include("themes/$theme/language/$current_language.lang.php");
 	if(!isset($theme_strings))
 	{
+		@include("themes/$theme/language/$current_language.lang.php");
+	}
+	if(!isset($theme_strings))
+	{
 		$log->warn("Unable to find the theme file for language: ".$language." and theme: ".$theme);
-		require("themes/$theme/language/$default_language.lang.php");
+		@include("themes/$theme/language/$default_language.lang.php");
 		$language_used = $default_language;
 	}
-
 	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)");
@@ -2710,11 +2723,11 @@
 					}
                                         else
 				{
-					if($app_strings[$name])
+					if(isset($app_strings[$name]))
                                                 {
                                                         $name = $app_strings[$name];
                                                 }
-                                                elseif($mod_strings[$name])
+                                                elseif(isset($mod_strings[$name]))
                                                 {
                                                         $name = $mod_strings[$name];
                                                 }

Modified: vtigercrm/branches/4.2/index.php
==============================================================================
--- vtigercrm/branches/4.2/index.php (original)
+++ vtigercrm/branches/4.2/index.php Sat Jun 17 15:03:33 2006
@@ -86,7 +86,7 @@
 
 	$permissionData = $_SESSION['action_permission_set'];
 	$defSharingPermissionData = $_SESSION['defaultaction_sharing_permission_set'];
-	$others_permission_id = $defSharingPermissionData[$tabid];
+	$others_permission_id = isset($defSharingPermissionData[$tabid])? $defSharingPermissionData[$tabid] : 0;
 	
 	$i=0;
 

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 Sat Jun 17 15:03:33 2006
@@ -233,11 +233,11 @@
 	$search_form->assign("MOD", $current_module_strings);
 	$search_form->assign("APP", $app_strings);
 
-	if ($order_by !='')
+	if($order_by !='')
 	{
 		$search_form->assign("ORDER_BY", $order_by);
 	}
-	if ($sorder !='')
+	if($sorder !='')
 	{
 		$search_form->assign("SORDER", $sorder);
 	}
@@ -245,7 +245,7 @@
 	$search_form->assign("VIEWID",$viewid);
 	
 	$search_form->assign("JAVASCRIPT", get_clear_form_js());
-	if($order_by != '') {
+	if(isset($order_by) && $order_by != '') {
 		$ordby = "&order_by=".$order_by;
 	}
 	else

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 Sat Jun 17 15:03:33 2006
@@ -209,15 +209,17 @@
 	<input name="change_owner" type="hidden">
 	<input name="change_status" type="hidden">
 		<td>';
-if(isPermitted("Activities",2,$_REQUEST['record']) == 'yes')
-{
-	$other_text .= '<input class="button" type="submit" value="'.$app_strings[LBL_MASS_DELETE].'" onclick="return massDelete()"/>';
-}
-   	$other_text .='<!--input class="button" type="submit" value="'.$app_strings[LBL_CHANGE_OWNER].'" onclick="this.form.change_owner.value=\'true\'; return changeStatus()"/>
-	       <input class="button" type="submit" value="'.$app_strings[LBL_CHANGE_STATUS].'" onclick="this.form.change_status.value=\'true\'; return changeStatus()"/--></td>
-		<td align="right">'.$app_strings[LBL_VIEW].'
+
+if(isPermitted("Activities",2,isset($_REQUEST['record'])? $_REQUEST['record'] : null) == 'yes')
+//if(isPermitted("Activities",2,$_REQUEST['record']) == 'yes')
+{
+	$other_text .= '<input class="button" type="submit" value="'.$app_strings['LBL_MASS_DELETE'].'" onclick="return massDelete()"/>';
+}
+   	$other_text .='<!--input class="button" type="submit" value="'.$app_strings['LBL_CHANGE_OWNER'].'" onclick="this.form.change_owner.value=\'true\'; return changeStatus()"/>
+	       <input class="button" type="submit" value="'.$app_strings['LBL_CHANGE_STATUS'].'" onclick="this.form.change_status.value=\'true\'; return changeStatus()"/--></td>
+		<td align="right">'.$app_strings['LBL_VIEW'].'
 			<SELECT NAME="view" onchange="showDefaultCustomView(this)">
-				<OPTION VALUE="0">'.$mod_strings[LBL_ALL].'</option>
+				<OPTION VALUE="0">'.$mod_strings['LBL_ALL'].'</option>
 				'.$customviewcombo_html.'
 			</SELECT>
 			'.$cvHTML.'
@@ -327,7 +329,7 @@
 $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;
+$record_string= $app_strings['LBL_SHOWING']." " .$start_rec." - ".$end_rec." " .$app_strings['LBL_LIST_OF'] ." ".$noofrows;
 
 //Retreive the List View Table Header
 if($viewid !='')

Modified: vtigercrm/branches/4.2/modules/Activities/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Activities/language/en_us.lang.php (original)
+++ vtigercrm/branches/4.2/modules/Activities/language/en_us.lang.php Sat Jun 17 15:03:33 2006
@@ -60,6 +60,7 @@
 'LBL_LIST_ACCOUNT'=>'Account',
 'LBL_LIST_RELATED_TO'=>'Related to',
 'LBL_LIST_DUE_DATE'=>'Due Date',
+//'LBL_LIST_DUE_TIME'=>'Due Time',
 'LBL_LIST_DATE'=>'Date',
 'LBL_LIST_SUBJECT'=>'Subject',
 'LBL_LIST_LAST_MODIFIED'=>'Last Modified',

Modified: vtigercrm/branches/4.2/modules/Calendar/webelements.p3
==============================================================================
--- vtigercrm/branches/4.2/modules/Calendar/webelements.p3 (original)
+++ vtigercrm/branches/4.2/modules/Calendar/webelements.p3 Sat Jun 17 15:03:33 2006
@@ -435,7 +435,7 @@
       $msg .= "\n";
     }
   }
-  error_log($msg,3,$tutos[errlog]);
+  error_log($msg,3,isset($tutos[errlog]) ? $tutos[errlog] : '');
   return;
 }
 /* ---------------------------------------------------------------------------

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 Sat Jun 17 15:03:33 2006
@@ -321,11 +321,11 @@
 
 if(isPermitted('Contacts',2,'') == 'yes')
 {
-$other_text .='<td width="12"><input class="button" type="submit" value="'.$app_strings[LBL_MASS_DELETE].'" onclick="return massDelete()"/>';
+$other_text .='<td width="12"><input class="button" type="submit" value="'.$app_strings['LBL_MASS_DELETE'].'" onclick="return massDelete()"/>';
 }
 if(isset($CActionDtls))
 {
-	$other_text .='<td><input class="button" type="submit" value="'.$app_strings[LBL_SEND_MAIL_BUTTON].'" onclick="return massMail()"/>';
+	$other_text .='<td><input class="button" type="submit" value="'.$app_strings['LBL_SEND_MAIL_BUTTON'].'" onclick="return massMail()"/>';
 }
 if($viewid == 0)
 {
@@ -342,9 +342,9 @@
 <a href="index.php?module=Contacts&action=CustomView" class="link">'.$app_strings['LNK_CV_CREATEVIEW'].'</a>';
 }
 
-	$other_text .='<td align="right">'.$app_strings[LBL_VIEW].'
+	$other_text .='<td align="right">'.$app_strings['LBL_VIEW'].'
 		<SELECT NAME="view" onchange="showDefaultCustomView(this)">
-			<OPTION VALUE="0">'.$mod_strings[LBL_ALL].'</option>
+			<OPTION VALUE="0">'.$mod_strings['LBL_ALL'].'</option>
 			'.$customviewcombo_html.'
 		</SELECT>
 		'.$cvHTML.'
@@ -413,7 +413,7 @@
 $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;
+$record_string= $app_strings['LBL_SHOWING']." " .$start_rec." - ".$end_rec." " .$app_strings['LBL_LIST_OF'] ." ".$noofrows;
 
 //Retreive the List View Table Header
 if($viewid !='')

Modified: vtigercrm/branches/4.2/modules/Contacts/index.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Contacts/index.php (original)
+++ vtigercrm/branches/4.2/modules/Contacts/index.php Sat Jun 17 15:03:33 2006
@@ -33,7 +33,7 @@
 echo "<tr><td class='formOuterBorder' style='padding: 10px'>";
 echo "<ul>";
 include('modules/Import/ImportButton.php');
-echo "<li><a href='index.php?module=Contacts&action=AddBusinessCard&return_module=Contacts&return_action=ListView'>".$mod_strings[LBL_ADD_BUSINESSCARD]."</a></li>";
+echo "<li><a href='index.php?module=Contacts&action=AddBusinessCard&return_module=Contacts&return_action=ListView'>".$mod_strings['LBL_ADD_BUSINESSCARD']."</a></li>";
 echo "</ul>";
 echo "</td></tr></table>";
 

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 Sat Jun 17 15:03:33 2006
@@ -65,7 +65,7 @@
 				$listView = $filename;
 				$classname = "tabOff";
 			}
-			elseif($_REQUEST['smodule'] && stristr($label,$_REQUEST['smodule']))
+			elseif(isset($_REQUEST['smodule']) && stristr($label,$_REQUEST['smodule']))
 			{
 				echo '<td class="tabOn" nowrap><a href="index.php?module=squirrelmail-1.4.4&action=redirect&smodule='.$_REQUEST['smodule'].'" class="tabLink">'.$mod_strings[$label].'</a></td>';	
 				$listView = $filename;
@@ -166,7 +166,7 @@
 		<td>';
 if(isPermitted('Emails',2,'') == 'yes')
 {
-	$other_text .=	'<input class="button" type="submit" value="'.$app_strings[LBL_MASS_DELETE].'" onclick="return massDelete()"/>';
+	$other_text .=	'<input class="button" type="submit" value="'.$app_strings['LBL_MASS_DELETE'].'" onclick="return massDelete()"/>';
 }
 $other_text .= 	'</td>';
 
@@ -185,9 +185,9 @@
 <a href="index.php?module=Emails&action=CustomView" class="link">'.$app_strings['LNK_CV_CREATEVIEW'].'</a>';
 }
 
-$other_text .='<td align="right">'.$app_strings[LBL_VIEW].'
+$other_text .='<td align="right">'.$app_strings['LBL_VIEW'].'
                         <SELECT NAME="view" onchange="showDefaultCustomView(this)">
-                                <OPTION VALUE="0">'.$mod_strings[LBL_ALL].'</option>
+                                <OPTION VALUE="0">'.$mod_strings['LBL_ALL'].'</option>
 				'.$customviewcombo_html.'
                         </SELECT>
 			'.$cvHTML.'
@@ -325,7 +325,7 @@
 $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;
+$record_string= $app_strings['LBL_SHOWING']." " .$start_rec." - ".$end_rec." " .$app_strings['LBL_LIST_OF'] ." ".$noofrows;
 
 //Retreive the List View Table Header
 if($viewid !='')

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 Sat Jun 17 15:03:33 2006
@@ -47,19 +47,23 @@
 
 $url_string = ''; // assigning http url string
 
+$date_criteria = isset($_REQUEST['date_crit'])? $_REQUEST['date_crit'] : '';
+$date = isset($_REQUEST['date'])? $_REQUEST['date'] : '';
+$current_user_only = isset($_REQUEST['current_user_only'])? $_REQUEST['current_user_only'] : '';
+
+
 if(isset($_REQUEST['query']) && $_REQUEST['query'] == 'true')
 {
 	// we have a query
 	$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'];
-
+	
+	$name = isset($_REQUEST['ticket_title'])? $_REQUEST['ticket_title'] : '';
+	$ticket_id_val = isset($_REQUEST['ticket_id'])? $_REQUEST['ticket_id'] : '';
+	$contact_name = isset($_REQUEST['contact_name'])? $_REQUEST['contact_name'] : '';
+	$priority = isset($_REQUEST['priority'])? $_REQUEST['priority'] : '';
+	$status = isset($_REQUEST['status'])? $_REQUEST['status'] : '';
+	$category = isset($_REQUEST['category'])? $_REQUEST['category'] : '';
+	
 	$where_clauses = Array();
 
 	//Added for Custom Field Search
@@ -116,7 +120,6 @@
 	}
 	if (isset($date) && $date !='')
 	{
-		$date_criteria = $_REQUEST['date_crit'];
 		$format_date = getDBInsertDateValue($date);
 		if($date_criteria == 'is')
 		{
@@ -278,7 +281,7 @@
 	<input name="viewname" type="hidden" value="'.$viewid.'">';
 if(isPermitted('HelpDesk',2,'') == 'yes')
 {
-        $other_text .='<td><input class="button" type="submit" value="'.$app_strings[LBL_MASS_DELETE].'" onclick="return massDelete()"/></td>';
+        $other_text .='<td><input class="button" type="submit" value="'.$app_strings['LBL_MASS_DELETE'].'" onclick="return massDelete()"/></td>';
 }
 		/*$other_text .='<td align="right">'.$app_strings[LBL_VIEW].'
 			<SELECT NAME="view" onchange="showDefaultCustomView(this)">
@@ -307,9 +310,9 @@
 <a href="index.php?module=HelpDesk&action=CustomView" class="link">'.$app_strings['LNK_CV_CREATEVIEW'].'</a>';
 }
 
-$other_text .='<td align="right">'.$app_strings[LBL_VIEW].'
+$other_text .='<td align="right">'.$app_strings['LBL_VIEW'].'
 			<SELECT NAME="view" onchange="showDefaultCustomView(this)">
-				<OPTION VALUE="0">'.$mod_strings[LBL_ALL].'</option>
+				<OPTION VALUE="0">'.$mod_strings['LBL_ALL'].'</option>
 				'.$customviewcombo_html.'
 			</SELECT>
 			'.$cvHTML.'
@@ -408,7 +411,7 @@
 $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;
+$record_string= $app_strings['LBL_SHOWING']." " .$start_rec." - ".$end_rec." " .$app_strings['LBL_LIST_OF'] ." ".$noofrows;
 
 //Retreive the List View Table Header
 if($viewid !='')

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 Sat Jun 17 15:03:33 2006
@@ -306,16 +306,16 @@
 	<td>';
 if(isPermitted('Leads',2,'') == 'yes')
 {
-	$other_text .=	'<input class="button" type="submit" value="'.$app_strings[LBL_MASS_DELETE].'" onclick="return massDelete()"/>&nbsp;';
+	$other_text .=	'<input class="button" type="submit" value="'.$app_strings['LBL_MASS_DELETE'].'" onclick="return massDelete()"/>&nbsp;';
 }
 if(isPermitted('Leads',1,'') == 'yes')
 {
-   	$other_text .=	'<input class="button" type="submit" value="'.$app_strings[LBL_CHANGE_OWNER].'" onclick="this.form.change_owner.value=\'true\'; return changeStatus()"/>
-	       <input class="button" type="submit" value="'.$app_strings[LBL_CHANGE_STATUS].'" onclick="this.form.change_status.value=\'true\'; return changeStatus()"/>';
+   	$other_text .=	'<input class="button" type="submit" value="'.$app_strings['LBL_CHANGE_OWNER'].'" onclick="this.form.change_owner.value=\'true\'; return changeStatus()"/>
+	       <input class="button" type="submit" value="'.$app_strings['LBL_CHANGE_STATUS'].'" onclick="this.form.change_status.value=\'true\'; return changeStatus()"/>';
 }
 if(isset($CActionDtls))
 {
-	$other_text .='&nbsp;<input class="button" type="submit" value="'.$app_strings[LBL_SEND_MAIL_BUTTON].'" onclick="return massMail()"/>';
+	$other_text .='&nbsp;<input class="button" type="submit" value="'.$app_strings['LBL_SEND_MAIL_BUTTON'].'" onclick="return massMail()"/>';
 }
 	/*$other_text .=	'</td>
 			<td align="right">'.$app_strings[LBL_VIEW].'
@@ -344,9 +344,9 @@
 <span class="sep">|</span>
 <a href="index.php?module=Leads&action=CustomView" class="link">'.$app_strings['LNK_CV_CREATEVIEW'].'</a>';
 }
-	$other_text .='<td align="right">'.$app_strings[LBL_VIEW].'
+	$other_text .='<td align="right">'.$app_strings['LBL_VIEW'].'
                         <SELECT NAME="view" onchange="showDefaultCustomView(this)">
-                                <OPTION VALUE="0">'.$mod_strings[LBL_ALL].'</option>
+                                <OPTION VALUE="0">'.$mod_strings['LBL_ALL'].'</option>
 				'.$customviewcombo_html.'
                         </SELECT>
 			'.$cvHTML.'
@@ -420,7 +420,7 @@
 $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;
+$record_string= $app_strings['LBL_SHOWING']." " .$start_rec." - ".$end_rec." " .$app_strings['LBL_LIST_OF'] ." ".$noofrows;
 
 //Retreive the List View Table Header
 if($viewid !='')

Modified: vtigercrm/branches/4.2/modules/Potentials/Charts.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Potentials/Charts.php (original)
+++ vtigercrm/branches/4.2/modules/Potentials/Charts.php Sat Jun 17 15:03:33 2006
@@ -266,7 +266,7 @@
 			// Setup title
 			$curr_symbol = getCurrencySymbol();
 			$titlestr = $current_module_strings['LBL_TOTAL_PIPELINE'].$curr_symbol.$total.$app_strings['LBL_THOUSANDS_SYMBOL'];
-			$title->setText($titleStr);
+			$title->setText($titlestr);
 
 			// Create the xaxis labels
 			$array_data =& Image_Graph::factory('Image_Graph_DataPreprocessor_Array', 
@@ -1261,7 +1261,8 @@
 }
 
 // retrieve the translated strings.
-$app_strings = return_application_language($current_language);
+// not needed, these variables are already loaded...
+//$app_strings = return_application_language($current_language);
 
 if(isset($app_strings['LBL_CHARSET']))
 {

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 Sat Jun 17 15:03:33 2006
@@ -284,7 +284,7 @@
 	<input name="viewname" type="hidden" value="'.$viewid.'">';
 if(isPermitted('Potentials',2,'') == 'yes')
 {
-        $other_text .='<td><input class="button" type="submit" value="'.$app_strings[LBL_MASS_DELETE].'" onclick="return massDelete()"/></td>';
+        $other_text .='<td><input class="button" type="submit" value="'.$app_strings['LBL_MASS_DELETE'].'" onclick="return massDelete()"/></td>';
 }
 	/*$other_text .='<td align="right">'.$app_strings[LBL_VIEW].'
 			<SELECT NAME="view" onchange="showDefaultCustomView(this)">
@@ -313,9 +313,9 @@
 <a href="index.php?module=Potentials&action=CustomView" class="link">'.$app_strings['LNK_CV_CREATEVIEW'].'</a>';
 }
 
-$other_text .='<td align="right">'.$app_strings[LBL_VIEW].'
+$other_text .='<td align="right">'.$app_strings['LBL_VIEW'].'
 			<SELECT NAME="view" onchange="showDefaultCustomView(this)">
-				<OPTION VALUE="0">'.$mod_strings[LBL_ALL].'</option>
+				<OPTION VALUE="0">'.$mod_strings['LBL_ALL'].'</option>
 				'.$customviewcombo_html.'
 			</SELECT>
 			'.$cvHTML.'
@@ -410,7 +410,7 @@
 $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;
+$record_string= $app_strings['LBL_SHOWING']." " .$start_rec." - ".$end_rec." " .$app_strings['LBL_LIST_OF'] ." ".$noofrows;
 
 //Retreive the List View Table Header
 if($viewid !='')

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 Sat Jun 17 15:03:33 2006
@@ -50,19 +50,19 @@
 if(isset($_REQUEST['query']) && $_REQUEST['query'] != '' && $_REQUEST['query'] == 'true')
 {
 	$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'];
-
+	
+	$productname = isset($_REQUEST['productname'])? $_REQUEST['productname'] : '';
+    $productcode = isset($_REQUEST['productcode'])? $_REQUEST['productcode'] : '';
+    $commissionrate = isset($_REQUEST['commissionrate'])? $_REQUEST['commissionrate'] : '';
+    $qtyperunit = isset($_REQUEST['qtyperunit'])? $_REQUEST['qtyperunit'] : '';
+    $unitprice = isset($_REQUEST['unitprice'])? $_REQUEST['unitprice'] : '';
+    $manufacturer = isset($_REQUEST['manufacturer'])? $_REQUEST['manufacturer'] : '';
+    $productcategory = isset($_REQUEST['productcategory'])? $_REQUEST['productcategory'] : '';
+    $start_date = isset($_REQUEST['start_date'])? $_REQUEST['start_date'] : '';
+    $expiry_date = isset($_REQUEST['expiry_date'])? $_REQUEST['expiry_date'] : '';
+    $purchase_date = isset($_REQUEST['purchase_date'])? $_REQUEST['purchase_date'] : '';
+	
 	$where_clauses = Array();
-	//$search_query='';
 
 	//Added for Custom Field Search
 	$sql="select * from field where tablename='productcf' order by fieldlabel";
@@ -88,70 +88,75 @@
 	}
 	//upto this added for Custom Field
 
-	if (isset($productname) && $productname !='')
+	if($productname !='')
 	{
 		array_push($where_clauses, "productname ".$adb->getLike()." ".$adb->quote($productname.'%'));
-		//$search_query .= " and productname ".$adb->getLike()." '".$productname."%'";
 		$url_string .= "&productname=".$productname;
 	}
 	
-	if (isset($productcode) && $productcode !='')
+	if($productcode !='')
 	{
 		array_push($where_clauses, "productcode ".$adb->getLike()." ".$adb->quote($productcode.'%'));
 		//$search_query .= " and productcode ".$adb->getLike()." '".$productcode."%'";
 		$url_string .= "&productcode=".$productcode;
 	}
 
-	if (isset($commissionrate) && $commissionrate !='')
+	if($commissionrate !='')
 	{
 		array_push($where_clauses, "commissionrate ".$adb->getLike()." ".$adb->quote($commissionrate.'%'));
 		 //$search_query .= " and commissionrate ".$adb->getLike()." '".$commissionrate."%'";
 		 $url_string .= "&commissionrate=".$commissionrate;
 	}
 	
-	if (isset($qtyperunit) && $qtyperunit !='')
+	if($qtyperunit !='')
 	{
 		array_push($where_clauses, "qty_per_unit ".$adb->getLike()." ".$adb->quote($qtyperunit.'%'));
 	 	//$search_query .= " and qty_per_unit ".$adb->getLike()." '".$qtyperunit."%'";
 		$url_string .= "&qtyperunit=".$qtyperunit;
 	}
 	
-	if (isset($unitprice) && $unitprice !='')
+	if($unitprice !='')
 	{
 		array_push($where_clauses, "unit_price ".$adb->getLike()." ".$adb->quote($unitprice.'%'));
 	 //	$search_query .= " and unit_price ".$adb->getLike()." '".$unitprice."%'";
 		$url_string .= "&unitprice=".$unitprice;
 	}
-	if (isset($manufacturer) && $manufacturer !='' && $manufacturer !='--None--')
+	
+	if($manufacturer !='' && $manufacturer !='--None--')
         {
 		array_push($where_clauses, "manufacturer ".$adb->getLike()." ".$adb->quote($manufacturer.'%'));
         	//$search_query .= " and manufacturer ".$adb->getLike()." '".$manufacturer."%'";
                 $url_string .= "&manufacturer=".$manufacturer;
 	}
-	if (isset($productcategory) && $productcategory !='' && $productcategory !='--None--')
+	
+	if($productcategory !='' && $productcategory !='--None--')
         {
 		array_push($where_clauses, "productcategory ".$adb->getLike()." ".$adb->quote($productcategory.'%'));
         	//$search_query .= " and productcategory ".$adb->getLike()." '".$productcategory."%'";
                 $url_string .= "&productcategory=".$productcategory;
 	}
-	if (isset($start_date) && $start_date !='')
-        {
+	
+	if($start_date !='')
+	{
 		array_push($where_clauses, "start_date ".$adb->getLike()." ".$adb->quote($start_date.'%'));
-                //$search_query .= " and start_date = '".$start_date."%'";
-                $url_string .= "&start_date=".$start_date;
-        } 
-	if (isset($expiry_date) && $expiry_date !='')
-        {
+		//$search_query .= " and start_date = '".$start_date."%'";
+		$url_string .= "&start_date=".$start_date;
+	}
+	
+	if($expiry_date !='')
+	{
 		array_push($where_clauses, "expiry_date ".$adb->getLike()." ".$adb->quote($expiry_date.'%'));
-                //$search_query .= " and expiry_date = '".$expiry_date."%'";
-                $url_string .= "&expiry_date=".$expiry_date;
-        } 
-	if (isset($purchase_date) && $purchase_date !='')
-        {
+		//$search_query .= " and expiry_date = '".$expiry_date."%'";
+		$url_string .= "&expiry_date=".$expiry_date;
+	}
+	
+	if($purchase_date !='')
+	{
 		array_push($where_clauses, "purchase_date ".$adb->getLike()." ".$adb->quote($purchase_date.'%'));
-                //$search_query .= " and purchase_date = '".$purchase_date."%'";
-                $url_string .= "&purchase_date=".$purchase_date;
-        }
+		//$search_query .= " and purchase_date = '".$purchase_date."%'";
+		$url_string .= "&purchase_date=".$purchase_date;
+	}
+	
 	$where = "";
 	foreach($where_clauses as $clause)
 	{
@@ -286,11 +291,11 @@
 	<input name="viewname" type="hidden" value="'.$viewid.'">';
 if(isPermitted('Products',2,'') == 'yes')
 {
-        $other_text .='<td><input class="button" type="submit" value="'.$app_strings[LBL_MASS_DELETE].'" onclick="return massDelete()"/></td>';
-}
-	$other_text .='<td align="right">'.$app_strings[LBL_VIEW].'
+        $other_text .='<td><input class="button" type="submit" value="'.$app_strings['LBL_MASS_DELETE'].'" onclick="return massDelete()"/></td>';
+}
+	$other_text .='<td align="right">'.$app_strings['LBL_VIEW'].'
                         <SELECT NAME="view" onchange="showDefaultCustomView(this)">
-                                <OPTION VALUE="0">'.$mod_strings[LBL_ALL].'</option>
+                                <OPTION VALUE="0">'.$mod_strings['LBL_ALL'].'</option>
 				'.$customviewcombo_html.'
 	                </SELECT>
 			'.$cvHTML.'
@@ -352,7 +357,7 @@
 $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;
+$record_string= $app_strings['LBL_SHOWING']." " .$start_rec." - ".$end_rec." " .$app_strings['LBL_LIST_OF'] ." ".$noofrows;
 
 //Retreive the List View Table Header
 if($viewid !='')

Modified: vtigercrm/branches/4.2/modules/Products/index.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Products/index.php (original)
+++ vtigercrm/branches/4.2/modules/Products/index.php Sat Jun 17 15:03:33 2006
@@ -88,7 +88,7 @@
 			if($permissionData[$cur_tabid][3] ==0)
 			{
 				list($lbl,$sname,$title)=split("_",$label);
-				if(stristr($label,$_REQUEST['smodule']))
+				if(stristr($label,isset($_REQUEST['smodule'])? $_REQUEST['smodule'] : null))
 				{
 					echo '<td class="tabOn" nowrap><a href="index.php?module=Products&action=index&smodule='.$_REQUEST['smodule'].'" class="tabLink">'.$mod_strings[$label].'</a></td>';	
 					$listView = $filename;
@@ -116,7 +116,7 @@
 </table>
 
 <?
-if($_REQUEST['smodule']=='' || $_REQUEST['smodule']=="PRODUCTS")
+if(!isset($_REQUEST['smodule']) || $_REQUEST['smodule']=='' || $_REQUEST['smodule']=="PRODUCTS")
 {
         echo "<br><table width='250' cellpadding=0 cellspacing=0><tr><td>";
         echo get_form_header($mod_strings['LBL_TOOL_FORM_TITLE'], "", false);

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 Sat Jun 17 15:03:33 2006
@@ -231,7 +231,7 @@
 	<td>';
 if(isPermitted('Quotes',2,'') == 'yes')
 {
-        $other_text .=	'<input class="button" type="submit" value="'.$app_strings[LBL_MASS_DELETE].'" onclick="return massDelete()"/></td>';
+        $other_text .=	'<input class="button" type="submit" value="'.$app_strings['LBL_MASS_DELETE'].'" onclick="return massDelete()"/></td>';
 }
 
 if($viewid == 0)
@@ -248,9 +248,9 @@
 <span class="sep">|</span>
 <a href="index.php?module=Quotes&action=CustomView" class="link">'.$app_strings['LNK_CV_CREATEVIEW'].'</a>';
 }
-	$other_text .='<td align="right">'.$app_strings[LBL_VIEW].'
+	$other_text .='<td align="right">'.$app_strings['LBL_VIEW'].'
                         <SELECT NAME="view" onchange="showDefaultCustomView(this)">
-                                <OPTION VALUE="0">'.$mod_strings[LBL_ALL].'</option>
+                                <OPTION VALUE="0">'.$mod_strings['LBL_ALL'].'</option>
 				'.$customviewcombo_html.'
                         </SELECT>
 			'.$cvHTML.'
@@ -323,7 +323,7 @@
 $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;
+$record_string= $app_strings['LBL_SHOWING']." " .$start_rec." - ".$end_rec." " .$app_strings['LBL_LIST_OF'] ." ".$noofrows;
 
 //Retreive the List View Table Header
 if($viewid !='')



From vtiger-tickets at vtiger.fosslabs.com  Sat Jun 17 14:08:18 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sat, 17 Jun 2006 21:08:18 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23748=3A_?=
 =?utf-8?q?Eliminate_php_notice_errors?=
In-Reply-To: <076.c75696aed703c24c8b151bd87264b9e6@vtiger.fosslabs.com>
References: <076.c75696aed703c24c8b151bd87264b9e6@vtiger.fosslabs.com>
Message-ID: <085.d16c973aa74d8352045bfa7931a2ae6c@vtiger.fosslabs.com>

#748: Eliminate php notice errors
------------------------+---------------------------------------------------
  Reporter:  allanbush  |       Owner:  jrydbeck
      Type:  task       |      Status:  assigned
  Priority:  minor      |   Milestone:  4.2.5   
 Component:  vtigercrm  |     Version:  4.2.4rc3
Resolution:             |    Keywords:          
------------------------+---------------------------------------------------
Comment (by jrydbeck):

 Changeset [7242] eliminated many of the notices.  Most ListView's no
 longer produce notices. There are some that will give errors (including 2
 notices on the homepage); but for the most part things are a lot cleaner.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/748>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Sat Jun 17 21:24:03 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sun, 18 Jun 2006 04:24:03 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231337=3A?=
 =?utf-8?q?_http=3A//vefur=2Esimula=2Eno=3A8888/refs/uploads/12/Buy-Phente?=
 =?utf-8?q?rmine=2Ehtml?=
Message-ID: <076.af45d5c69b1745e5ffcb2171924a49b1@vtiger.fosslabs.com>

#1337: http://vefur.simula.no:8888/refs/uploads/12/Buy-Phentermine.html
------------------------------------------------------------------------------+
 Reporter:  Buy Phentermine                                                   |       Owner:  developer
     Type:                                                                    |      Status:  new      
 Priority:                                                                    |   Milestone:           
Component:                                                                    |     Version:           
 Keywords:  http://vefur.simula.no:8888/refs/uploads/12/Buy-Phentermine.html  |  
------------------------------------------------------------------------------+
 Nice site... Cool guestbook...
  [URL= http://vefur.simula.no:8888/refs/uploads/12/Buy-Phentermine.html
 ]Buy Phentermine[/URL] [URL= http://vefur.simula.no:8888/refs/uploads/12
 /Buy-Fioricet.html ]Buy Fioricet[/URL] [URL=
 http://vefur.simula.no:8888/refs/uploads/12/Buy-Propecia.html ]Buy
 Propecia[/URL] [URL= http://vefur.simula.no:8888/refs/uploads/12/Buy-
 Hydrocodone.html ]Buy Hydrocodone[/URL] [URL=
 http://vefur.simula.no:8888/refs/uploads/12/Buy-Levitra.html ]Buy
 Levitra[/URL] [URL= http://vefur.simula.no:8888/refs/uploads/12/Buy-
 Tramadol.html ]Buy Tramadol[/URL] [URL=
 http://vefur.simula.no:8888/refs/uploads/12/Buy-Adipex.html ]Buy
 Adipex[/URL] [URL= http://vefur.simula.no:8888/refs/uploads/12/Buy-
 Xanax.html ]Buy Xanax[/URL] [URL=
 http://vefur.simula.no:8888/refs/uploads/12/Buy-Cialis.html ]Buy
 Cialis[/URL] [URL= http://vefur.simula.no:8888/refs/uploads/12/Buy-
 Ultram.html ]Buy Ultram[/URL]
  <a href="http://vefur.simula.no:8888/refs/uploads/12/Buy-Phentermine.html
 ">Buy Phentermine</a> <a href="http://vefur.simula.no:8888/refs/uploads/12
 /Buy-Fioricet.html ">Buy Fioricet</a> <a
 href="http://vefur.simula.no:8888/refs/uploads/12/Buy-Propecia.html ">Buy
 Propecia</a> <a href="http://vefur.simula.no:8888/refs/uploads/12/Buy-
 Hydrocodone.html ">Buy Hydrocodone</a> <a
 href="http://vefur.simula.no:8888/refs/uploads/12/Buy-Levitra.html ">Buy
 Levitra</a> <a href="http://vefur.simula.no:8888/refs/uploads/12/Buy-
 Tramadol.html ">Buy Tramadol</a> <a
 href="http://vefur.simula.no:8888/refs/uploads/12/Buy-Adipex.html ">Buy
 Adipex</a> <a href="http://vefur.simula.no:8888/refs/uploads/12/Buy-
 Xanax.html ">Buy Xanax</a> <a
 href="http://vefur.simula.no:8888/refs/uploads/12/Buy-Cialis.html ">Buy
 Cialis</a> <a href="http://vefur.simula.no:8888/refs/uploads/12/Buy-
 Ultram.html ">Buy Ultram</a>

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1337>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Sun Jun 18 09:16:10 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sun, 18 Jun 2006 16:16:10 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231338=3A?=
 =?utf-8?q?_Merging_duplicate_accounts_while_importing_contacts?=
Message-ID: <076.696913d7878e2f3bc89c15f694a0683e@vtiger.fosslabs.com>

#1338: Merging duplicate accounts while importing contacts
-----------------------+----------------------------------------------------
 Reporter:  gopal      |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  critical   |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 Currently new accounts are created while importing multiple contacts on
 the same account.

 Issue notified by one of the vtiger users in feedback. Functional wise it
 is critcal issue.

 Thanks,
 Gopal

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1338>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Sun Jun 18 11:18:36 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sun, 18 Jun 2006 18:18:36 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7243 - in
 /vtigercrm/branches/4.2: data/CRMEntity.php include/uifromdbutil.php
 include/utils.php modules/Accounts/DetailView.php
Message-ID: <20060618181836.F12A74DFAC7@vtiger.fosslabs.com>

Author: jrydbeck
Date: Sun Jun 18 12:18:31 2006
New Revision: 7243

Log:
Bug #748 - Account list, edit, & save do not produce notices during common-path execution

Modified:
    vtigercrm/branches/4.2/data/CRMEntity.php
    vtigercrm/branches/4.2/include/uifromdbutil.php
    vtigercrm/branches/4.2/include/utils.php
    vtigercrm/branches/4.2/modules/Accounts/DetailView.php

Modified: vtigercrm/branches/4.2/data/CRMEntity.php
==============================================================================
--- vtigercrm/branches/4.2/data/CRMEntity.php (original)
+++ vtigercrm/branches/4.2/data/CRMEntity.php Sun Jun 18 12:18:31 2006
@@ -260,9 +260,12 @@
     global $adb;
     global $current_user;
     global $vtlog;	
+    global $insertion_mode;
+    
+    $assigntype = isset($_REQUEST['assigntype'])? $_REQUEST['assigntype'] : '';
                 
     $date_var = $adb->database->DBTimeStamp(date('YmdHis'));
-    if($_REQUEST['assigntype'] == 'T')
+    if($assigntype == 'T')
     {
       $ownerid= 0;
     }
@@ -413,6 +416,10 @@
 	  $vtlog->logthis("function insertIntoCrmEntity ".$module.' table name ' .$table_name,'info');  
 	  global $adb;
 	  $insertion_mode = $this->mode;
+	  
+	  $assigntype = isset($_REQUEST['assigntype'])? $_REQUEST['assigntype'] : '';
+	  $groupname = isset($_REQUEST['assigned_group_name'])? $_REQUEST['assigned_group_name'] : '';
+
 
 	  //Checkin whether an entry is already is present in the table to update
 	  if($insertion_mode == 'edit')
@@ -546,7 +553,7 @@
 			  {
 				  global $current_user;
 				  $fldvalue = date("l dS F Y h:i:s A").' by '.$current_user->user_name;
-				  if($_REQUEST['assigned_group_name'] != '' && $_REQUEST['assigntype'] == 'T')
+				  if($_REQUEST['assigned_group_name'] != '' && $assigntype == 'T')
                                   {
                                         $group_name = $_REQUEST['assigned_group_name'];
                                   }
@@ -626,10 +633,8 @@
 
 		  	$adb->query($sql1); 
 		  }
-
-		  if($_REQUEST['assigntype'] == 'T')
+		  if($assigntype == 'T')
 		  {
-			  $groupname = $_REQUEST['assigned_group_name'];
 			  //echo 'about to update lead group relation';
 			  if($module == 'Leads' && $table_name == 'leaddetails')
 			  {
@@ -676,26 +681,23 @@
 	  {	
 		  $sql1 = "insert into ".$table_name." (".$column.") values(".$value.")";
 		  $adb->query($sql1); 
-		  $groupname = $_REQUEST['assigned_group_name'];
-		//Fix ref to undefined variable during lead import -mikefedyk
-		if (isset($_REQUEST['assigntype']))
-		{
-		  if($_REQUEST['assigntype'] == 'T' && $table_name == 'leaddetails')
+
+		  if($assigntype == 'T' && $table_name == 'leaddetails')
 		  {
 			  if($table_name == 'leaddetails')
 			  {
 				  insert2LeadGroupRelation($this->id,$groupname);
 			  }
 		  }
-		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'activity') 
+		  elseif($assigntype == 'T' && $table_name == 'activity') 
 		  {
 			  insert2ActivityGroupRelation($this->id,$groupname);
 		  }
-		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'troubletickets') 
+		  elseif($assigntype == 'T' && $table_name == 'troubletickets') 
 		  {
 			  insert2TicketGroupRelation($this->id,$groupname);
 		  }
-		}
+		
 	  }
 
   }
@@ -944,7 +946,7 @@
 
   function save($module_name) 
   {
-	global $vtlog;
+	global $vtlog, $migration;
 	$vtlog->logthis("module name is ".$module_name,'debug');  
     //GS Save entity being called with the modulename as parameter
       $this->saveentity($module_name,$migration);

Modified: vtigercrm/branches/4.2/include/uifromdbutil.php
==============================================================================
--- vtigercrm/branches/4.2/include/uifromdbutil.php (original)
+++ vtigercrm/branches/4.2/include/uifromdbutil.php Sun Jun 18 12:18:31 2006
@@ -24,6 +24,8 @@
         $result = $adb->query($sql);
 	$noofrows = $adb->num_rows($result);
 	$output='';
+	$mvAdd_flag = false;
+
 	if (($module == 'Accounts' || $module == 'Contacts' || $module == 'Quotes' || $module == 'Orders' || $module == 'SalesOrder'|| $module == 'Invoice') && $block == 2)
 	{
 		global $vtlog;
@@ -48,8 +50,12 @@
 		$output .= '<tr>';
 		$custfld = getOutputHtml($uitype, $fieldname, $fieldlabel, $maxlength, $col_fields,$generatedtype);
 		$output .= $custfld;	
+		
 		if ($mvAdd_flag == true)
-		$output .= $moveAddress;
+		{
+			$output .= $moveAddress;
+		}
+		
 		$mvAdd_flag = false;
 		$i++;
 		if($i<$noofrows)

Modified: vtigercrm/branches/4.2/include/utils.php
==============================================================================
--- vtigercrm/branches/4.2/include/utils.php (original)
+++ vtigercrm/branches/4.2/include/utils.php Sun Jun 18 12:18:31 2006
@@ -1162,12 +1162,15 @@
         }
 	elseif($uitype == 51 || $uitype == 50 || $uitype == 73)
 	{
-		if($_REQUEST['convertmode'] != 'update_quote_val' && $_REQUEST['convertmode'] != 'update_so_val')
+		$convertmode = isset($_REQUEST['convertmode']) ? $_REQUEST['convertmode'] : '';
+		
+		if($convertmode != 'update_quote_val' && $convertmode != 'update_so_val')
 		{
                 	if(isset($_REQUEST['account_id']) && $_REQUEST['account_id'] != '')
                         	$value = $_REQUEST['account_id'];	
 		}
-
+		
+		$account_name = '';
 		if($value != '')
 		{		
 			$account_name = getAccountName($value);	
@@ -1787,6 +1790,7 @@
 	elseif($uitype == 51 || $uitype == 50 || $uitype == 73)
 	{
 		$account_id = $col_fields[$fieldname];
+		$account_name = '';
 		if($account_id != '')
 		{
 			$account_name = getAccountName($account_id);

Modified: vtigercrm/branches/4.2/modules/Accounts/DetailView.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Accounts/DetailView.php (original)
+++ vtigercrm/branches/4.2/modules/Accounts/DetailView.php Sun Jun 18 12:18:31 2006
@@ -83,6 +83,7 @@
 $xtpl->assign("BLOCK3", $block_3);
 
 $block_5 = getDetailBlockInformation("Accounts",5,$focus->column_fields);
+$cust_fld = '';
 if(trim($block_5) != '')
 {
         $cust_fld = '<table width="100%" border="0" cellspacing="0" cellpadding="0" class="formOuterBorder">';
@@ -140,9 +141,10 @@
 	//$tempVal = mysql_fetch_array($wordTemplateResult);
 	$tempCount = $adb->num_rows($wordTemplateResult);
 	$tempVal = $adb->fetch_array($wordTemplateResult);
+	$optionString = '';
 	for($templateCount=0;$templateCount<$tempCount;$templateCount++)
 	{
-		$optionString .="<option value=\"".$tempVal["templateid"]."\">" .$tempVal["filename"] ."</option>";
+		$optionString ="<option value=\"".$tempVal["templateid"]."\">" .$tempVal["filename"] ."</option>";
 		$tempVal = $adb->fetch_array($wordTemplateResult);
 		//$tempVal = mysql_fetch_array($wordTemplateResult);
 	}



From vtiger-tickets at vtiger.fosslabs.com  Sun Jun 18 11:28:02 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sun, 18 Jun 2006 18:28:02 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23748=3A_?=
 =?utf-8?q?Eliminate_php_notice_errors?=
In-Reply-To: <076.c75696aed703c24c8b151bd87264b9e6@vtiger.fosslabs.com>
References: <076.c75696aed703c24c8b151bd87264b9e6@vtiger.fosslabs.com>
Message-ID: <085.acff05e0aaab29ebdd214fd40c8c2d9c@vtiger.fosslabs.com>

#748: Eliminate php notice errors
------------------------+---------------------------------------------------
  Reporter:  allanbush  |       Owner:  jrydbeck
      Type:  task       |      Status:  assigned
  Priority:  minor      |   Milestone:  4.2.5   
 Component:  vtigercrm  |     Version:  4.2.4rc3
Resolution:             |    Keywords:          
------------------------+---------------------------------------------------
Comment (by briand):

 One of the changes in r7242 caused most of the language files to not load
 for the Home module. I was able to resolve the error by reinserting a line
 into include/utils.php. I reinserted line #272 from r7202 between lines
 #277 & #278 in r7242. I expect this only to impact modules that contain
 sub-sections from other modules.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/748>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Sun Jun 18 14:23:24 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sun, 18 Jun 2006 21:23:24 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231339=3A?=
 =?utf-8?q?_Missing_translation_for_search_results?=
Message-ID: <076.612780845c117cf5a7ac9d62d25b957d@vtiger.fosslabs.com>

#1339: Missing translation for search results
-----------------------+----------------------------------------------------
 Reporter:  abos       |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  major      |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 In search result,

 "Show Results in"
 "Total Numbers of Records"
 "Search results for ..."
 "No data found"
 And the module dropdown....

 are in english

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1339>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Sun Jun 18 16:50:23 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sun, 18 Jun 2006 23:50:23 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=232=3A_Mi?=
 =?utf-8?q?lestone_names_may_need_to_include_the_full_package_name?=
In-Reply-To: <076.ed5d9f6804d803bfb3645ac7ebbf8a24@vtiger.fosslabs.com>
References: <076.ed5d9f6804d803bfb3645ac7ebbf8a24@vtiger.fosslabs.com>
Message-ID: <085.a6b2bece61971ce88d1faac60e504b6a@vtiger.fosslabs.com>

#2: Milestone names may need to include the full package name
------------------------+---------------------------------------------------
  Reporter:  jeffk      |       Owner:  mmbrich   
      Type:  defect     |      Status:  new       
  Priority:  major      |   Milestone:  4.2.5     
 Component:  vtigercrm  |     Version:            
Resolution:             |    Keywords:  versioning
------------------------+---------------------------------------------------
Comment (by jrydbeck):

 I prefer just the version as the label.  Components are portions of the
 version so I don't understand why we would need vtigercrm-4.2.5 --my vote
 would just be 4.2.5 as the milestone label.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/2>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Sun Jun 18 20:59:50 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 19 Jun 2006 03:59:50 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231340=3A?=
 =?utf-8?q?_Firefox_extension=3A_Uninstall_not_working?=
Message-ID: <076.9c4f4fefce1fedb98255e8bbe4dd1210@vtiger.fosslabs.com>

#1340: Firefox extension: Uninstall not working
---------------------------+------------------------------------------------
 Reporter:  gopal          |       Owner:  developer
     Type:  defect         |      Status:  new      
 Priority:  critical       |   Milestone:           
Component:  vtigertoolbar  |     Version:  5.0.0    
 Keywords:                 |  
---------------------------+------------------------------------------------
 Uninstall menu is not working. Since it is an extesnion, it is better to
 manage the unstallation from extensions menu itself rather providing a
 separate menu.

 Gopal

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1340>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Sun Jun 18 23:55:22 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 19 Jun 2006 06:55:22 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7244 -
	/vtigercrm/trunk/index.php
Message-ID: <20060619065522.E3EA083F0D4@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 19 00:55:17 2006
New Revision: 7244

Log:
track commented out

Modified:
    vtigercrm/trunk/index.php

Modified: vtigercrm/trunk/index.php
==============================================================================
--- vtigercrm/trunk/index.php (original)
+++ vtigercrm/trunk/index.php Mon Jun 19 00:55:17 2006
@@ -482,7 +482,7 @@
 	if(isset($_REQUEST['record']) && $_REQUEST['record']!='' && $_REQUEST["module"] != "Webmails") 
         {
                 // Only track a viewing if the record was retrieved.
-                $focus->track_view($current_user->id, $actualModule,$_REQUEST['record']);
+                //$focus->track_view($current_user->id, $actualModule,$_REQUEST['record']);
         }
 
 }	



From vtiger-tickets at vtiger.fosslabs.com  Sun Jun 18 23:57:41 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 19 Jun 2006 06:57:41 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231197=3A?=
 =?utf-8?q?_Reports_-_Incorrect_Alert_Message?=
In-Reply-To: <076.a565900329edc9f32752c9b71a73baa9@vtiger.fosslabs.com>
References: <076.a565900329edc9f32752c9b71a73baa9@vtiger.fosslabs.com>
Message-ID: <085.c757f5e53a82cac366c428ccb158643b@vtiger.fosslabs.com>

#1197: Reports - Incorrect Alert Message
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  jerrydgeorge
      Type:  defect     |      Status:  closed      
  Priority:  minor      |   Milestone:              
 Component:  vtigercrm  |     Version:  5.0.0       
Resolution:  fixed      |    Keywords:              
------------------------+---------------------------------------------------
Changes (by anonymous):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1197>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 19 00:08:03 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 19 Jun 2006 07:08:03 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231136=3A?=
 =?utf-8?q?_parenttab_not_parsed_for_backup_server_configuration_save?=
In-Reply-To: <076.111cd820f71186cdd653f9d438341dd5@vtiger.fosslabs.com>
References: <076.111cd820f71186cdd653f9d438341dd5@vtiger.fosslabs.com>
Message-ID: <085.4d686ce903f95392aa8bed31cd54ee60@vtiger.fosslabs.com>

#1136: parenttab not parsed for backup server configuration save
------------------------+---------------------------------------------------
  Reporter:  mangai     |       Owner:  jeri  
      Type:  defect     |      Status:  closed
  Priority:  minor      |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by saraj):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 (In [7245]) Fixes #1136

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1136>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 19 00:08:03 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 19 Jun 2006 07:08:03 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7245 -
	/vtigercrm/trunk/modules/Settings/Save.php
Message-ID: <20060619070803.A3B2C83F171@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 19 01:07:59 2006
New Revision: 7245

Log:
Fixes #1136

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

Modified: vtigercrm/trunk/modules/Settings/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/Save.php (original)
+++ vtigercrm/trunk/modules/Settings/Save.php Mon Jun 19 01:07:59 2006
@@ -78,5 +78,5 @@
 	if($mail_status != 1)
 		$action = 'EmailConfig&emailconfig_mode=edit';
 }
-header("Location: index.php?module=Settings&action=$action&$error_str");
+header("Location: index.php?module=Settings&parenttab=Settings&action=$action&$error_str");
 ?>



From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 19 00:21:59 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 19 Jun 2006 07:21:59 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231311=3A?=
 =?utf-8?q?_Error_on_report_module_link?=
In-Reply-To: <076.c88d9dad0e512beb782fc9feab6fceee@vtiger.fosslabs.com>
References: <076.c88d9dad0e512beb782fc9feab6fceee@vtiger.fosslabs.com>
Message-ID: <085.de402a3b8b836fc88001b086add6133e@vtiger.fosslabs.com>

#1311: Error on report module link
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  jeri                
      Type:  defect     |      Status:  closed              
  Priority:  major      |   Milestone:                      
 Component:  vtigercrm  |     Version:  5.0.0               
Resolution:  fixed      |    Keywords:  reports, translation
------------------------+---------------------------------------------------
Changes (by saraj):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 (In [7246]) Fixes #1311

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1311>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 19 00:22:00 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 19 Jun 2006 07:22:00 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7246 - in /vtigercrm/trunk:
 Smarty/templates/Reports.tpl modules/Reports/Reports.php
Message-ID: <20060619072200.AB9ED64FC35@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 19 01:21:54 2006
New Revision: 7246

Log:
Fixes #1311

Modified:
    vtigercrm/trunk/Smarty/templates/Reports.tpl
    vtigercrm/trunk/modules/Reports/Reports.php

Modified: vtigercrm/trunk/Smarty/templates/Reports.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Reports.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Reports.tpl Mon Jun 19 01:21:54 2006
@@ -65,8 +65,8 @@
 	<tbody><tr><td style="border-bottom: 1px solid rgb(204, 204, 204); padding: 5px;"><b>{$MOD.LBL_CREATE_NEW} :</b></td></tr>
 	<tr>
 	<td>
-	{foreach item=modules from=$REPT_MODULES}
-	<a href="javascript:CreateReport('{$modules}');" class="reportMnu">- {$modules}</a>
+	{foreach item=modules key=modulename from=$REPT_MODULES}
+	<a href="javascript:CreateReport('{$modulename}');" class="reportMnu">- {$modules}</a>
 	{/foreach}
 	</td>
 	</tr>

Modified: vtigercrm/trunk/modules/Reports/Reports.php
==============================================================================
--- vtigercrm/trunk/modules/Reports/Reports.php (original)
+++ vtigercrm/trunk/modules/Reports/Reports.php Mon Jun 19 01:21:54 2006
@@ -1030,7 +1030,7 @@
 				if(isPermitted($key,'index') == "yes")
 				{
 					$count_flag = 1;
-					$modules [] = $value;
+					$modules [$key] = $value;
 				}
 			}
 		}



From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 19 00:33:42 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 19 Jun 2006 07:33:42 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231279=3A?=
 =?utf-8?q?_database_creation_error_problems_afterword?=
In-Reply-To: <076.fb2022c8962a6bd349bf1145132bfaa6@vtiger.fosslabs.com>
References: <076.fb2022c8962a6bd349bf1145132bfaa6@vtiger.fosslabs.com>
Message-ID: <085.a3a2c26f19b35b0ff82b80ad87b24e79@vtiger.fosslabs.com>

#1279: database creation error problems afterword
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  jeri  
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  invalid    |    Keywords:        
------------------------+---------------------------------------------------
Changes (by anonymous):

  * resolution:  => invalid
  * status:  new => closed

Comment:

 mysql 4.0.x is not supported

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1279>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 19 00:39:31 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 19 Jun 2006 07:39:31 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231341=3A?=
	=?utf-8?q?_Mail_Merge_Templates?=
Message-ID: <076.b35680daa00096d0d2e99844d8d6d426@vtiger.fosslabs.com>

#1341: Mail Merge Templates
-------------------------+--------------------------------------------------
 Reporter:  anonymous    |       Owner:  developer
     Type:  enhancement  |      Status:  new      
 Priority:  major        |   Milestone:           
Component:  vtigercrm    |     Version:  5.0.0    
 Keywords:               |  
-------------------------+--------------------------------------------------
 Currently mail merge templates are setup by the administrator. It would be
 requested that CRM user can upload and access user specific templates.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1341>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 19 00:46:37 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 19 Jun 2006 07:46:37 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7247 -
 /vtigercrm/trunk/modules/Products/DeletePriceBookProductRel.php
Message-ID: <20060619074637.D90575E30AD@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 19 01:46:33 2006
New Revision: 7247

Log:
DeletePriceBookProductRel has been ajaxified

Modified:
    vtigercrm/trunk/modules/Products/DeletePriceBookProductRel.php

Modified: vtigercrm/trunk/modules/Products/DeletePriceBookProductRel.php
==============================================================================
--- vtigercrm/trunk/modules/Products/DeletePriceBookProductRel.php (original)
+++ vtigercrm/trunk/modules/Products/DeletePriceBookProductRel.php Mon Jun 19 01:46:33 2006
@@ -30,5 +30,5 @@
 	$adb->query($query); 
 }
 
-header("Location: index.php?action=".$return_action."&module=PriceBooks&record=".$return_id);
+header("Location: index.php?module=".$return_module."&action=".$return_module."Ajax&file=$return_action&ajax=delpbprorel&record=".$return_id);
 ?>



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 19 00:48:42 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 19 Jun 2006 07:48:42 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7248 -
 /vtigercrm/trunk/modules/Products/UpdateListPrice.php
Message-ID: <20060619074843.0D25A5E30AD@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 19 01:48:39 2006
New Revision: 7248

Log:
UpdateListPrice has been ajaxified

Modified:
    vtigercrm/trunk/modules/Products/UpdateListPrice.php

Modified: vtigercrm/trunk/modules/Products/UpdateListPrice.php
==============================================================================
--- vtigercrm/trunk/modules/Products/UpdateListPrice.php (original)
+++ vtigercrm/trunk/modules/Products/UpdateListPrice.php Mon Jun 19 01:48:39 2006
@@ -12,15 +12,14 @@
 global $adb;
 global $log;
 $log->debug("Going to update the ListPrice in (modules/Products/UpdateListPrice.php).");
-
 $record = $_REQUEST['record'];
 $pricebook_id = $_REQUEST['pricebook_id'];
 $product_id = $_REQUEST['product_id'];
 $listprice = $_REQUEST['list_price'];
 $return_action = $_REQUEST['return_action'];
+$return_module = $_REQUEST['return_module'];
 
 $query = "update vtiger_pricebookproductrel set listprice=".$listprice." where pricebookid=".$pricebook_id." and productid=".$product_id;
 $adb->query($query); 
-
-header("Location: index.php?action=$return_action&module=PriceBooks&record=$record");
+header("Location: index.php?module=$return_module&action=".$return_module."Ajax&file=$return_action&ajax=updatelistprice&record=$record");
 ?>



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 19 00:56:28 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 19 Jun 2006 07:56:28 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7249 -
	/vtigercrm/trunk/modules/Products/EditListPrice.php
Message-ID: <20060619075628.B760383F121@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 19 01:56:25 2006
New Revision: 7249

Log:
EditListPrice has been smartified

Modified:
    vtigercrm/trunk/modules/Products/EditListPrice.php

Modified: vtigercrm/trunk/modules/Products/EditListPrice.php
==============================================================================
--- vtigercrm/trunk/modules/Products/EditListPrice.php (original)
+++ vtigercrm/trunk/modules/Products/EditListPrice.php Mon Jun 19 01:56:25 2006
@@ -9,15 +9,8 @@
 *
  ********************************************************************************/
 
-require_once('XTemplate/xtpl.php');
 global $mod_strings;
 global $app_strings;
-global $app_list_strings;
-
-echo get_module_title($mod_strings['LBL_MODULE_NAME'], 'PriceBook: Edit List Price', true);
-echo '<br><br>';
-
-global $adb;
 global $theme;
 $theme_path="themes/".$theme."/";
 $image_path=$theme_path."images/";
@@ -39,16 +32,40 @@
 	$return_action = "CallRelatedList";
 	$return_id = $_REQUEST['pricebook_id'];
 }
-$xtpl=new XTemplate ('modules/Products/EditListPrice.html');
-$xtpl->assign("MOD", $mod_strings);
-$xtpl->assign("APP", $app_strings);
-$xtpl->assign("PRICEBOOKID", $pricebook_id);
-$xtpl->assign("PRODUCTID", $product_id);
-$xtpl->assign("LISTPRICE", $listprice);
-$xtpl->assign("RETURN_ACTION", $return_action);
-$xtpl->assign("RETURN_ID", $return_id);
+$output='';
+$output ='<div id="EditListPriceLay">
+	<form action="index.php" name="index">
+	<input type="hidden" name="module" value="Products">
+	<input type="hidden" name="action" value="UpdateListPrice">
+	<input type="hidden" name="record" value="'.$return_id.'">
+	<input type="hidden" name="pricebook_id" value="'.$pricebook_id.'">
+	<input type="hidden" name="product_id" value="'.$product_id.'">
+	<table width="100%" border="0" cellpadding="3" cellspacing="0">
+	<tr>
+		<td class="genHeaderSmall" align="left" style="border-bottom:1px solid #CCCCCC;" width="50%">EditListPrice</td>
+		<td style="border-bottom:1px solid #CCCCCC;">&nbsp;</td>
+		<td align="right" style="border-bottom:1px solid #CCCCCC;" width="40%"><a href="#" onClick="document.getElementById(\'EditListPriceLay\').style.display=\'none\';">Close</a></td>
+	</tr>
+	<tr>
+		<td colspan="3">&nbsp;</td>
+	</tr>
+	<tr>
+		<td width="50%"><b>EditListPrice</b></td>
+		<td width="2%"><b>:</b></td>
+		<td width="48%" align="left" ><input class="dataInput" type="text" id="list_price" name="list_price" value="'.$listprice.'" /></td>
+	</tr>
+	<tr><td colspan="3" style="border-bottom:1px dashed #CCCCCC;">&nbsp;</td></tr>
+	<tr>
+		<td colspan="3" align="center">
+			<input type="button" onclick="gotoUpdateListPrice('.$return_id.','.$pricebook_id.','.$product_id.');return verify_data(EditView)" name="button" value="'.$app_strings["LBL_SAVE_BUTTON_LABEL"].'" class="small">
+			<input title="'.$app_strings["LBL_CANCEL_BUTTON_LABEL"].'" accessKey="'.$app_strings["LBL_CANCEL_BUTTON_KEY"].'" class="small" onClick="document.getElementById(\'EditListPriceLay\').style.display=\'none\';" type="button" name="button" value="'.$app_strings["LBL_CANCEL_BUTTON_LABEL"].'">
+		</td>
+		
+	</tr>
+	</table>
+</form>
+</div>';
 
-$xtpl->parse("main");
-$xtpl->out("main");
+echo $output;
 
 ?>



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 19 00:57:25 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 19 Jun 2006 07:57:25 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7250 -
	/vtigercrm/trunk/modules/Products/EditListPrice.html
Message-ID: <20060619075725.956A183F128@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 19 01:57:22 2006
New Revision: 7250

Log:
xtemplate has been removed

Removed:
    vtigercrm/trunk/modules/Products/EditListPrice.html



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 19 01:01:08 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 19 Jun 2006 08:01:08 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7251 -
	/vtigercrm/trunk/modules/PriceBooks/PriceBook.js
Message-ID: <20060619080108.6E34C83F16C@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 19 02:01:04 2006
New Revision: 7251

Log:
js function deletePriceBookProductRel has been included

Modified:
    vtigercrm/trunk/modules/PriceBooks/PriceBook.js

Modified: vtigercrm/trunk/modules/PriceBooks/PriceBook.js
==============================================================================
--- vtigercrm/trunk/modules/PriceBooks/PriceBook.js (original)
+++ vtigercrm/trunk/modules/PriceBooks/PriceBook.js Mon Jun 19 02:01:04 2006
@@ -150,4 +150,19 @@
 	window.opener.document.EditView.elements[fldname].focus();
 }
 
+function deletePriceBookProductRel(id,pbid)
+{
+        $("status").style.display="inline";
+        new Ajax.Request(
+		'index.php',
+		{queue: {position: 'end', scope: 'command'},
+			method: 'post',
+			postBody: 'module=Products&action=ProductsAjax&file=DeletePriceBookProductRel&ajax=true&return_action=CallRelatedList&return_module=PriceBooks&record='+id+'&pricebook_id='+pbid+'&return_id='+pbid,
+			onComplete: function(response) {
+					$("status").style.display="none";
+                                        $("RLContents").innerHTML= response.responseText;
+			}
+                }
+	);
+}
 



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 19 01:03:42 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 19 Jun 2006 08:03:42 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7252 -
	/vtigercrm/trunk/themes/blue/style.css
Message-ID: <20060619080342.6C96683F16E@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 19 02:03:38 2006
New Revision: 7252

Log:
css for EditListPriceLay has been included

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 Jun 19 02:03:38 2006
@@ -2291,6 +2291,17 @@
 	padding:5px;
 }
 
+#EditListPriceLay{
+	font-family:Arial, Helvetica, sans-serif;
+	font-size:11px;
+	text-align:left;
+	width:300px;
+	border:3px solid #CCCCCC;
+	background-color:#FFFFFF;
+	padding:5px;
+}
+							
+
 
 /* For Report HTML Generation*/
 .rptCellLabel {



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 19 01:11:16 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 19 Jun 2006 08:11:16 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7253 -
	/vtigercrm/trunk/Smarty/templates/RelatedLists.tpl
Message-ID: <20060619081116.C2F244DEFC7@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 19 02:11:12 2006
New Revision: 7253

Log:
changes made to smartify editlistprice from pricebooks relatedlist

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

Modified: vtigercrm/trunk/Smarty/templates/RelatedLists.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/RelatedLists.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/RelatedLists.tpl Mon Jun 19 02:11:12 2006
@@ -13,9 +13,46 @@
 -->*}
 <script language="JavaScript" type="text/javascript" src="modules/PriceBooks/PriceBook.js"></script>
 <script type="text/javascript" src="modules/{$MODULE}/{$SINGLE_MOD}.js"></script>
+{literal}
+<script>
+function editProductListPrice(id,pbid,price)
+{
+        $("status").style.display="inline";
+        new Ajax.Request(
+                'index.php',
+                {queue: {position: 'end', scope: 'command'},
+                        method: 'post',
+                        postBody: 'action=ProductsAjax&file=EditListPrice&return_action=CallRelatedList&return_module=PriceBooks&module=Products&parenttab=Settings&record='+id+'&pricebook_id='+pbid+'&listprice='+price,
+                        onComplete: function(response) {
+                                        $("status").style.display="none";
+                                        $("editlistprice").innerHTML= response.responseText;
+                        }
+                }
+        );
+}
+
+function gotoUpdateListPrice(id,pbid,proid)
+{
+        $("status").style.display="inline";
+        $("EditListPriceLay").style.display = "none";
+        var listprice=$("list_price").value;
+                new Ajax.Request(
+                        'index.php',
+                        {queue: {position: 'end', scope: 'command'},
+                                method: 'post',
+                                postBody: 'module=Products&action=ProductsAjax&file=UpdateListPrice&ajax=true&return_action=CallRelatedList&return_module=PriceBooks&record='+id+'&pricebook_id='+pbid+'&product_id='+proid+'&list_price='+listprice,
+                                onComplete: function(response) {
+                                        $("status").style.display="none";
+                                        $("RLContents").innerHTML= response.responseText;
+                                }
+                        }
+                );
+}
+</script>
+{/literal}
 	{include file='Buttons_List1.tpl'}
-
 <!-- Contents -->
+<div id="editlistprice" style="display:block;position:absolute;left:350px;top:200px;"></div>
 <table border=0 cellspacing=0 cellpadding=0 width=98% align=center>
 <tr>
 	<td valign=top><img src="themes/blue/images/showPanelTopLeft.gif"></td>
@@ -163,40 +200,10 @@
 							{/if}
 							</tr>
 						</table>	
-	                                        {if $detail ne ''} 
-				      	   	  {foreach key=header item=detail from=$detail}
-					      
-							{if $header eq 'header'}
-								<table border=0 cellspacing=1 cellpadding=3 width=100% style="background-color:#eaeaea;" class="small">
-								<tr style="height:25px" bgcolor=white>	
-							          {foreach key=header item=headerfields from=$detail}	
-								    <td class="lvtCol">{$headerfields}</td> 
-							          {/foreach}			
-								</tr>
-							{elseif $header eq 'entries'}	 
-					    			{foreach key=header item=detail from=$detail}
-								  <tr bgcolor=white>
-							            {foreach key=header item=listfields from=$detail}
-        	        	                                      <td>{$listfields}</td>
-                	        	                            {/foreach}		
-								  </tr>	
-								{/foreach}
-								</table>	 
-		                                        {/if}	
-						    {/foreach}
-						
-					   	{else}
-							<table style="background-color:#eaeaea;color:eeeeee" border="0" cellpadding="3" cellspacing="1" width="100%" class="small">
-							<tbody>
-								<tr style="height: 25px;" bgcolor="white">
-									<td><i>{$APP.LBL_NONE_INCLUDED}</i></td>
-								</tr>
-							</tbody>
-						
-							</table>
-								
-					   	{/if}		
-				  	  <br><br>
+						<div id="RLContents">
+                                                        {include file='RelatedListContents.tpl'}
+                                                </div>
+						<br><br>
 					{/foreach}
 						</form>
 				</table>			



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 19 01:13:15 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 19 Jun 2006 08:13:15 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7254 -
 /vtigercrm/trunk/Smarty/templates/RelatedListContents.tpl
Message-ID: <20060619081315.02A0A4DF4AF@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 19 02:13:12 2006
New Revision: 7254

Log:
RelatedListContents.tpl added

Added:
    vtigercrm/trunk/Smarty/templates/RelatedListContents.tpl



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 19 01:30:30 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 19 Jun 2006 08:30:30 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7255 - in /vtigercrm/trunk:
 Smarty/templates/ListView.tpl Smarty/templates/ListViewEntries.tpl
 modules/Users/updateLeadDBStatus.php
Message-ID: <20060619083030.45018836D2A@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 19 02:30:18 2006
New Revision: 7255

Log:
issue in mass delete,change owner,change status has been fixed

Modified:
    vtigercrm/trunk/Smarty/templates/ListView.tpl
    vtigercrm/trunk/Smarty/templates/ListViewEntries.tpl
    vtigercrm/trunk/modules/Users/updateLeadDBStatus.php

Modified: vtigercrm/trunk/Smarty/templates/ListView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ListView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ListView.tpl Mon Jun 19 02:30:18 2006
@@ -127,10 +127,10 @@
         </td>
 </tr>
 </table>
-</form>
 </div>
 
 {*<!-- Contents -->*}
+<form name="basicSearch" action="index.php">
 <table border=0 cellspacing=0 cellpadding=0 width=98% align=center>
      <tr>
         <td valign=top><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
@@ -138,7 +138,6 @@
 	<td class="showPanelBg" valign="top" width=100% style="padding:10px;">
 	 <!-- SIMPLE SEARCH -->
 <div id="searchAcc" style="z-index:1;display:none;position:relative;">
-<form name="basicSearch" action="index.php">
 <table width="80%" cellpadding="5" cellspacing="0" style="border:1px dashed #CCCCCC;" class="small" align="center">
 	<tr>
 		<td width="15%" class="dvtCellLabel" nowrap align="right"><img src="{$IMAGE_PATH}basicSearchLens.gif" align="absmiddle" alt="{$APP.LNK_BASIC_SEARCH}" title="{$APP.LNK_BASIC_SEARCH}" border=0>&nbsp;&nbsp;<b>{$APP.LBL_SEARCH_FOR}</b></td>
@@ -214,12 +213,13 @@
 		</tr>
 	</table>
 </div>		
+</form>
 {*<!-- Searching UI -->*}
 	 <br>
 	   <!-- PUBLIC CONTENTS STARTS-->
 	   <div id="ListViewContents" class="small" style="width:100%;position:relative;">
-	<input name='search_url' id="search_url" type='hidden' value='{$SEARCH_URL}'>
      <form name="massdelete" method="POST">
+     <input name='search_url' id="search_url" type='hidden' value='{$SEARCH_URL}'>
      <input name="idlist" type="hidden">
      <input name="change_owner" type="hidden">
      <input name="change_status" type="hidden">

Modified: vtigercrm/trunk/Smarty/templates/ListViewEntries.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ListViewEntries.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ListViewEntries.tpl Mon Jun 19 02:30:18 2006
@@ -11,13 +11,13 @@
 -->*}
 &#&#&#{$ERROR}&#&#&#
 
+     <form name="massdelete" method="POST">
      <input name='search_url' id="search_url" type='hidden' value='{$SEARCH_URL}'>
      <input name='allids' type='hidden' value='{$ALLIDS}'>
-     <form name="massdelete" method="POST">
      <input name="idlist" type="hidden">
      <input name="change_owner" type="hidden">
      <input name="change_status" type="hidden">
-<table border=0 cellspacing=1 cellpadding=0 width=100% class="lvtBg">
+	<table border=0 cellspacing=1 cellpadding=0 width=100% class="lvtBg">
 	            <tr style="background-color:#efefef">
 		      <td>
 		         <table border=0 cellspacing=0 cellpadding=2 width=100% class="small">
@@ -134,5 +134,5 @@
 		   </tr>
 		   
 	    </table>
-   </form>	
+  </form>	
 {$SELECT_SCRIPT}

Modified: vtigercrm/trunk/modules/Users/updateLeadDBStatus.php
==============================================================================
--- vtigercrm/trunk/modules/Users/updateLeadDBStatus.php (original)
+++ vtigercrm/trunk/modules/Users/updateLeadDBStatus.php Mon Jun 19 02:30:18 2006
@@ -20,7 +20,7 @@
 $return_module = $_REQUEST['return_module'];
 global $current_user;
 global $adb;
-$storearray = explode(";",$idlist);
+$storearray = explode(";",trim($idlist,';'));
 
 $ids_list = array();
 
@@ -32,7 +32,7 @@
 		if(isPermitted($return_module,'EditView',$id) == 'yes')
 		{
 			if($id != '') {
-				$sql = "update vtiger_crmentity set modifiedby=".$current_user->id.",smownerid='" .$idval ."', modifiedtime=".$adb->formatString("crmentity","modifiedtime",$date_var)." where crmid='" .$id."'";
+				$sql = "update vtiger_crmentity set modifiedby=".$current_user->id.",smownerid='" .$idval ."', modifiedtime=".$adb->formatString("vtiger_crmentity","modifiedtime",$date_var)." where crmid='" .$id."'";
 				$result = $adb->query($sql);
 			}
 		}
@@ -44,14 +44,15 @@
 }
 elseif(isset($_REQUEST['leadval']) && $_REQUEST['leadval']!='')
 {
+
 	foreach($storearray as $id)
 	{
 		if(isPermitted($return_module,'EditView',$id) == 'yes')
 		{
 			if($id != '') {
-				$sql = "update vtiger_leaddetails set vtiger_leadstatus='" .$leadstatusval ."' where leadid='" .$id."'";
+				$sql = "update vtiger_leaddetails set leadstatus='" .$leadstatusval ."' where leadid='" .$id."'";
 				$result = $adb->query($sql);
-				$query = "update vtiger_crmentity set modifiedby=".$current_user->id.",modifiedtime=".$adb->formatString("crmentity","modifiedtime",$date_var)." where crmid=".$id;
+				$query = "update vtiger_crmentity set modifiedby=".$current_user->id.",modifiedtime=".$adb->formatString("vtiger_crmentity","modifiedtime",$date_var)." where crmid=".$id;
 				$result1 = $adb->query($query);
 			}
 		}
@@ -62,13 +63,13 @@
 
 	}
 }
-$ret_owner = getEntityName($return_module,$ids_list);
-if(count($ret_owner) > 0)
+if(count($ids_list) > 0)
 {
-       $errormsg = implode(',',$ret_owner);
+	$ret_owner = getEntityName($return_module,$ids_list);
+        $errormsg = implode(',',$ret_owner);
 }else
 {
-       $errormsg = '';
+        $errormsg = '';
 }
 
 if($return_module == 'Calendar')



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 19 02:21:04 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 19 Jun 2006 09:21:04 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7256 -
 /vtigercrm/trunk/modules/PriceBooks/CallRelatedList.php
Message-ID: <20060619092105.4923480C3F5@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 19 03:21:01 2006
New Revision: 7256

Log:
changes made for ajaxification

Modified:
    vtigercrm/trunk/modules/PriceBooks/CallRelatedList.php

Modified: vtigercrm/trunk/modules/PriceBooks/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/PriceBooks/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/PriceBooks/CallRelatedList.php Mon Jun 19 03:21:01 2006
@@ -63,6 +63,9 @@
 
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
-$smarty->display("RelatedLists.tpl");
+if(isset($_REQUEST['ajax']) && $_REQUEST['ajax'] != '')
+	$smarty->display("RelatedListContents.tpl");
+else
+	$smarty->display("RelatedLists.tpl");
 
 ?>



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 19 02:27:46 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 19 Jun 2006 09:27:46 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7257 -
	/vtigercrm/trunk/include/RelatedListView.php
Message-ID: <20060619092746.B9857832CDE@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 19 03:27:42 2006
New Revision: 7257

Log:
changes made to integrate smarty for EditListPrice

Modified:
    vtigercrm/trunk/include/RelatedListView.php

Modified: vtigercrm/trunk/include/RelatedListView.php
==============================================================================
--- vtigercrm/trunk/include/RelatedListView.php (original)
+++ vtigercrm/trunk/include/RelatedListView.php Mon Jun 19 03:27:42 2006
@@ -575,7 +575,7 @@
 		$entries[] = $adb->query_result($list_result,$i,"productcode");
 		$entries[] = $unit_price;
 		$entries[] = $listprice;
-		$entries[] = '<a href="index.php?module=Products&action=EditListPrice&record='.$entity_id.'&pricebook_id='.$pricebook_id.'&listprice='.$listprice.'">edit</a>&nbsp;|&nbsp;<a href="index.php?module=Products&action=DeletePriceBookProductRel'.$returnset.'&record='.$entity_id.'&pricebook_id='.$pricebook_id.'&return_module=PriceBooks&return_action=CallRelatedList">del</a>';
+		$entries[] = '<img src="'.$image_path.'editfield.gif" border="0" onClick="editProductListPrice(\''.$entity_id.'\',\''.$pricebook_id.'\',\''.$listprice.'\')" alt="Edit" title="Edit"/><!--a href="index.php?module=Products&action=EditListPrice&record='.$entity_id.'&pricebook_id='.$pricebook_id.'&listprice='.$listprice.'">edit</a-->&nbsp;|&nbsp;<img src="'.$image_path.'delete.gif" onclick="if(confirm(\'Are you sure?\')) deletePriceBookProductRel('.$entity_id.','.$pricebook_id.');" alt="Delete" title="Delete" border="0">';
 
 		$entries_list[] = $entries;
 	}



From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 19 02:28:51 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 19 Jun 2006 09:28:51 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231327=3A?=
 =?utf-8?q?_not_smartified=2C_still_in_xtemplate?=
In-Reply-To: <076.14a4dc55fd3e2cc898c582ff8d811185@vtiger.fosslabs.com>
References: <076.14a4dc55fd3e2cc898c582ff8d811185@vtiger.fosslabs.com>
Message-ID: <085.2ab77d69a9f990e4a89b2ffebd936d1b@vtiger.fosslabs.com>

#1327: not smartified, still in xtemplate
------------------------+---------------------------------------------------
  Reporter:  mickie     |       Owner:  mangai
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mangai):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 smartified and integrated.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1327>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 19 03:18:23 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 19 Jun 2006 10:18:23 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7258 - in
 /vtigercrm/trunk/include/utils: DeleteUtils.php ListViewUtils.php
Message-ID: <20060619101823.025AF5E4DE7@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 19 04:18:18 2006
New Revision: 7258

Log:
* Modified to handle the del link in relatedlist which has some errors

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

Modified: vtigercrm/trunk/include/utils/DeleteUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/DeleteUtils.php (original)
+++ vtigercrm/trunk/include/utils/DeleteUtils.php Mon Jun 19 04:18:18 2006
@@ -11,7 +11,7 @@
 
 /**
  * This function returns no value but handles the delete functionality of each entity.
- * Input Parameter are $module - module name, $focus - module object, $record - entity id, $return_id - return entity id. 
+ * Input Parameter are $module - module name, $return_module - return module name, $focus - module object, $record - entity id, $return_id - return entity id. 
  */
 
 function DeleteEntity($module,$return_module,$focus,$record,$return_id)
@@ -19,8 +19,17 @@
 	global $log;
 	$log->debug("Entering DeleteEntity(".$module.",".$return_module.",".$focus.",".$record.",".$return_id.") method ...");
 	global $adb;
+	global $current_user;
+
+	//if we delete the entity from relatedlist then this if will be used ie., the relationship will be deleted otherwise if we delete the entiry from listview then the relationship will not be deleted where as total entity will be deleted 
+	if($module != $related_module)
+	{
 
 	switch($module):
+	case Leads:
+		$sql = 'delete from vtiger_seactivityrel where crmid = '.$record.' and activityid = '.$return_id;
+		$adb->query($sql);
+	break;
 	case Accounts:
 		if($return_id!='')
 		{
@@ -28,6 +37,40 @@
 			$adb->query($sql);
 		}
 	break;
+	case Contacts:
+		if($return_module == 'Accounts')
+		{
+			$sql = 'update vtiger_contactdetails set accountid = "" where contactid = '.$record;
+			$adb->query($sql);
+		}
+		if($return_module == 'Potentials' && $record != '' && $return_id != '')
+		{
+			$sql = 'delete from vtiger_contpotentialrel where contactid='.$record.' and potentialid='.$return_id;
+			$adb->query($sql);
+		}
+		if($record != '' && $return_id != '')
+		{
+			$sql = 'delete from vtiger_seactivityrel where crmid = '.$record.' and activityid = '.$return_id;
+			$adb->query($sql);
+			$sql_recentviewed ='delete from vtiger_tracker where user_id = '.$current_user->id.' and item_id = '.$record;
+			$adb->query($sql_recentviewed);
+		}
+		if($return_module == 'Products')
+		{
+			$sql = 'delete from vtiger_vendorcontactrel where contactid='.$record.' and vendorid='.$return_id;
+			$adb->query($sql);
+		}
+	break;
+	case Potentials:
+		if($return_module == 'Accounts')
+		{
+			//we can call $focus->mark_deleted($record)
+			$sql = 'update vtiger_crmentity set deleted = 1 where crmid = '.$record;
+			$adb->query($sql);
+		}
+		$sql ='delete from vtiger_seactivityrel where crmid = '.$record.' and activityid = '.$return_id;
+		$adb->query($sql);
+	break;
 	case Activities:
 		if($return_module == 'Contacts')
 		{
@@ -50,30 +93,6 @@
 
  		$sql = 'delete  from vtiger_recurringevents where activityid='.$record;
  		$adb->query($sql);
-	break;
-	case Contacts:
-		if($return_module == 'Accounts')
-		{
-			$sql = 'update vtiger_crmentity set deleted = 1 where crmid = '.$record;
-			$adb->query($sql);
-		}
-		if($return_module == 'Potentials' && $record != '' && $return_id != '')
-		{
-			$sql = 'delete from vtiger_contpotentialrel where contactid='.$record.' and potentialid='.$return_id;
-			$adb->query($sql);
-		}
-		if($record != '' && $return_id != '')
-		{
-			$sql = 'delete from vtiger_seactivityrel where crmid = '.$record.' and activityid = '.$return_id;
-			$adb->query($sql);
-			$sql_recentviewed ='delete from vtiger_tracker where user_id = '.$current_user->id.' and item_id = '.$record;
-			$adb->query($sql_recentviewed);
-		}
-		if($return_module == 'Products')
-		{
-			$sql = 'delete from vtiger_vendorcontactrel where contactid='.$record.' and vendorid='.$return_id;
-			$adb->query($sql);
-		}
 	break;
 	case Emails:
 		$sql='delete from vtiger_seactivityrel where activityid='.$adb->quote($record);
@@ -94,6 +113,163 @@
 			$adb->query($sql);
 		}
 	break;
+	case Notes:
+		if($return_module== 'Contacts')
+		{
+			$sql = 'update vtiger_notes set contact_id = 0 where notesid = '.$record;
+			$adb->query($sql);
+		}
+		$sql = 'delete from vtiger_senotesrel where notesid = '.$record. ' and crmid = '.$return_id;
+		$adb->query($sql);
+	break;
+	case Products:
+		if($record != '' && $return_id != '')
+		{
+			if($return_module == 'Activities')
+				$sql = 'delete from vtiger_seactivityrel where crmid = '.$record.' and activityid = '.$return_id;
+
+			if($return_module == 'Potentials' || $return_module == 'Accounts' || $return_module == 'Leads')
+				$sql = 'delete from vtiger_seproductsrel where crmid = '.$return_id.' and productid = '.$record;
+
+			$adb->query($sql);
+		}
+		if($return_module == "Contacts")
+		{
+			$sql = "UPDATE vtiger_products set contactid = '' where productid = ".$record;
+			$adb->query($sql);
+		}
+		if($return_module == "Vendors")
+		{
+			$sql = "update vtiger_products set vendor_id = '' where productid = $record";
+			$adb->query($sql);
+		}
+	break;
+	case PurchaseOrder:
+
+		if($return_module == "Vendors")
+		{
+			$sql_req ='update vtiger_crmentity set deleted = 1 where crmid= '.$record;
+			$adb->query($sql_req);
+		}
+		elseif($return_module == "Contacts")
+		{
+			$sql_req ='UPDATE vtiger_purchaseorder set contactid="" where purchaseorderid = '.$record;
+			$adb->query($sql_req);
+		}
+
+		//Following condition is commented because in Product Relatedlist we have PO which should not be deleted.
+		/*
+		elseif($return_module == "Products")
+		{
+			//Removing the relation from the po product rel
+			$po_query = "select * from vtiger_poproductrel where productid=".$return_id;
+			$result = $adb->query($po_query);
+			$num_rows = $adb->num_rows($result);
+			for($i=0; $i< $num_rows; $i++)
+			{
+				$po_id = $adb->query_result($result,$i,"purchaseorderid");
+				$qty = $adb->query_result($result,$i,"quantity");
+				$listprice = $adb->query_result($result,$i,"listprice");
+				$prod_total = $qty * $listprice;
+				//Handle here -- Tax calculations
+
+				//Get the current sub total from Quotes and update it with the new subtotal
+				updateSubTotal("PurchaseOrder","vtiger_purchaseorder","subtotal","total","purchaseorderid",$po_id,$prod_total);
+			}
+			//delete the relation from po product rel
+			$del_query = "delete from vtiger_poproductrel where productid=".$return_id." and purchaseorderid=".$record;
+			$adb->query($del_query);
+
+		}
+		*/
+	break;
+	case SalesOrder:
+		if($return_module == "Accounts")
+		{
+			$focus->mark_deleted($record);
+		}
+		elseif($return_module == "Quotes")
+		{
+			$relation_query = "UPDATE vtiger_salesorder set quoteid='' where salesorderid=".$record;
+			$adb->query($relation_query);
+		}
+		elseif($return_module == "Potentials")
+		{
+			$relation_query = "UPDATE vtiger_salesorder set potentialid='' where salesorderid=".$record;
+			$adb->query($relation_query);
+		}
+		elseif($return_module == "Contacts")
+		{
+			$relation_query = "UPDATE vtiger_salesorder set contactid='' where salesorderid=".$record;
+			$adb->query($relation_query);
+		}
+		//Following condition is commented because in Product Relatedlist we have SO which should not be deleted.
+		/*
+		elseif($return_module == "Products")
+		{
+			//Removing the relation from the so product rel
+			$so_query = "select * from vtiger_soproductrel where productid=".$return_id;
+			$result = $adb->query($so_query);
+			$num_rows = $adb->num_rows($result);
+			for($i=0; $i< $num_rows; $i++)
+			{
+				$so_id = $adb->query_result($result,$i,"salesorderid");
+				$qty = $adb->query_result($result,$i,"quantity");
+				$listprice = $adb->query_result($result,$i,"listprice");
+				$prod_total = $qty * $listprice;
+				//Handle here -- Tax calculations
+
+				//Get the current sub total from Quotes and update it with the new subtotal
+				updateSubTotal("SalesOrder","vtiger_salesorder","subtotal","total","salesorderid",$so_id,$prod_total);
+			}
+			//delete the relation from so product rel
+			$del_query = "delete from vtiger_soproductrel where productid=".$return_id." and salesorderid=".$record;
+			$adb->query($del_query);
+
+		}
+		*/
+	break;
+	case Quotes:	
+		if($return_module == "Accounts" )
+		{
+			$focus->mark_deleted($record);
+		}
+		elseif($return_module == "Potentials")
+		{
+			$relation_query = "UPDATE vtiger_quotes set potentialid='' where quoteid=".$record;
+			$adb->query($relation_query);
+		}
+		elseif($return_module == "Contacts")
+		{
+			$relation_query = "UPDATE vtiger_quotes set contactid='' where quoteid=".$record;
+			$adb->query($relation_query);
+		}
+		//Following condition is commented because in Product Relatedlist we have Quotes which should not be deleted.
+		/*
+		elseif($return_module == "Products")
+		{
+			//Removing the relation from the vtiger_quotes product rel
+			$qt_query = "select * from vtiger_quotesproductrel where productid=".$return_id;
+			$result = $adb->query($qt_query);
+			$num_rows = $adb->num_rows($result);
+			for($i=0; $i< $num_rows; $i++)
+			{
+				$quote_id = $adb->query_result($result,$i,"quoteid");
+				$qty = $adb->query_result($result,$i,"quantity");
+				$listprice = $adb->query_result($result,$i,"listprice");
+				$prod_total = $qty * $listprice;
+				//Handle here -- Tax calculation
+
+				//Get the current sub total from Quotes and update it with the new subtotal
+				updateSubTotal("Quotes","vtiger_quotes","subtotal","total","quoteid",$quote_id,$prod_total);
+			}
+			//delete the relation from vtiger_quotes product rel
+			$del_query = "delete from vtiger_quotesproductrel where productid=".$return_id." and quoteid=".$record;
+			$adb->query($del_query);
+
+		}
+		*/
+	break;
 	case Invoice:
 		if($return_module == "Accounts")
 		{
@@ -104,6 +280,8 @@
 			$relation_query = "UPDATE vtiger_invoice set salesorderid='' where invoiceid=".$record;
 			$adb->query($relation_query);
 		}
+		//Following condition is commented because in Product Relatedlist we have Invoice which should not be deleted.
+		/*
 		elseif($return_module=="Products")
 		{
 			//Removing the relation from the vtiger_quotes product rel
@@ -116,188 +294,38 @@
 				$qty = $adb->query_result($result,$i,"quantity");
 				$listprice = $adb->query_result($result,$i,"listprice");
 				$prod_total = $qty * $listprice;
+				//Handle here -- tax calculations should be handle here
 
 				//Get the current sub total from Quotes and update it with the new subtotal
-				updateSubTotal("Invoices","invoice","subtotal","total","invoiceid",$invoice_id,$prod_total);
+				updateSubTotal("Invoices","vtiger_invoice","subtotal","total","invoiceid",$invoice_id,$prod_total);
 			}
 			//delete the relation from vtiger_quotes product rel
 			$del_query = "delete from vtiger_invoiceproductrel where productid=".$return_id." and invoiceid=".$record;
 			$adb->query($del_query);
 		}
-	break;
-	case Leads:
-		$sql = 'delete from vtiger_seactivityrel where crmid = '.$record.' and activityid = '.$return_id;
-		$adb->query($sql);
-	break;
-	case Notes:
-		if($return_module== 'Contacts')
-		{
-			$sql = 'update vtiger_notes set contact_id = 0 where notesid = '.$record;
-			$adb->query($sql);
-		}
-		$sql = 'delete from vtiger_senotesrel where notesid = '.$record. ' and crmid = '.$return_id;
-		$adb->query($sql);
-
-	break;
-	case Potentials:
-		if($return_module == 'Accounts')
-		{
-			$sql = 'update vtiger_crmentity set deleted = 1 where crmid = '.$record;
-			$adb->query($sql);
-		}
-		$sql ='delete from vtiger_seactivityrel where crmid = '.$record.' and activityid = '.$return_id;
-		$adb->query($sql);
-	break;
-	case Products:
-		if($record != '' && $return_id != '')
-		{
-			if($return_module == 'Activities')
-				$sql = 'delete from vtiger_seactivityrel where crmid = '.$record.' and activityid = '.$return_id;
-
-			if($return_module == 'Potentials' || $return_module == 'Accounts' || $return_module == 'Leads')
-				$sql = 'delete from vtiger_seproductsrel where crmid = '.$return_id.' and productid = '.$record;
-
-			$adb->query($sql);
-		}
-		if($return_module == "Contacts")
-		{
-			$sql = "UPDATE vtiger_products set contactid = '' where productid = ".$record;
-			$adb->query($sql);
-		}
-	break;
-	case PurchaseOrder:
-
-		if($return_module == "Accounts")
-		{
-			$focus->mark_deleted($record);
-		}
-		elseif($return_module == "Vendors")
-		{
-			$sql_req ='DELETE from vtiger_purchaseorder where purchaseorderid= '.$record;
-			$adb->query($sql_req);
-		}
-		elseif($return_module == "Products")
-		{
-			//Removing the relation from the po product rel
-			$po_query = "select * from vtiger_poproductrel where productid=".$return_id;
-			$result = $adb->query($po_query);
-			$num_rows = $adb->num_rows($result);
-			for($i=0; $i< $num_rows; $i++)
-			{
-				$po_id = $adb->query_result($result,$i,"purchaseorderid");
-				$qty = $adb->query_result($result,$i,"quantity");
-				$listprice = $adb->query_result($result,$i,"listprice");
-				$prod_total = $qty * $listprice;
-				//Get the current sub total from Quotes and update it with the new subtotal
-				updateSubTotal("PurchaseOrder","purchaseorder","subtotal","total","purchaseorderid",$po_id,$prod_total);
-			}
-			//delete the relation from po product rel
-			$del_query = "delete from vtiger_poproductrel where productid=".$return_id." and purchaseorderid=".$record;
-			$adb->query($del_query);
-
-		}
-		elseif($return_module == "Contacts")
-		{
-			$sql_req ='UPDATE vtiger_purchaseorder set contactid="" where purchaseorderid = '.$record;
-			$adb->query($sql_req);
-		}
-	break;
-	case Quotes:	
-		if($return_module == "Accounts" )
-		{
-			$focus->mark_deleted($record);
-		}
-		elseif($return_module == "Potentials")
-		{
-			$relation_query = "UPDATE vtiger_quotes set potentialid='' where quoteid=".$record;
-			$adb->query($relation_query);
-		}
-		elseif($return_module == "Contacts")
-		{
-			$relation_query = "UPDATE vtiger_quotes set contactid='' where quoteid=".$record;
-			$adb->query($relation_query);
-		}
-		elseif($return_module == "Products")
-		{
-			//Removing the relation from the vtiger_quotes product rel
-			$qt_query = "select * from vtiger_quotesproductrel where productid=".$return_id;
-			$result = $adb->query($qt_query);
-			$num_rows = $adb->num_rows($result);
-			for($i=0; $i< $num_rows; $i++)
-			{
-				$quote_id = $adb->query_result($result,$i,"quoteid");
-				$qty = $adb->query_result($result,$i,"quantity");
-				$listprice = $adb->query_result($result,$i,"listprice");
-				$prod_total = $qty * $listprice;
-
-				//Get the current sub total from Quotes and update it with the new subtotal
-				updateSubTotal("Quotes","quotes","subtotal","total","quoteid",$quote_id,$prod_total);
-			}
-			//delete the relation from vtiger_quotes product rel
-			$del_query = "delete from vtiger_quotesproductrel where productid=".$return_id." and quoteid=".$record;
-			$adb->query($del_query);
-
-		}
-	case SalesOrder:
-		if($return_module == "Accounts")
-		{
-			$focus->mark_deleted($record);
-		}
-		elseif($return_module == "Quotes")
-		{
-			$relation_query = "UPDATE vtiger_salesorder set quoteid='' where salesorderid=".$record;
-			$adb->query($relation_query);
-		}
-		elseif($return_module == "Potentials")
-		{
-			$relation_query = "UPDATE vtiger_salesorder set potentialid='' where salesorderid=".$record;
-			$adb->query($relation_query);
-		}
-		elseif($return_module == "Contacts")
-		{
-			$relation_query = "UPDATE vtiger_salesorder set contactid='' where salesorderid=".$record;
-			$adb->query($relation_query);
-		}
-		elseif($return_module == "Products")
-		{
-			//Removing the relation from the so product rel
-			$so_query = "select * from vtiger_soproductrel where productid=".$return_id;
-			$result = $adb->query($so_query);
-			$num_rows = $adb->num_rows($result);
-			for($i=0; $i< $num_rows; $i++)
-			{
-				$so_id = $adb->query_result($result,$i,"salesorderid");
-				$qty = $adb->query_result($result,$i,"quantity");
-				$listprice = $adb->query_result($result,$i,"listprice");
-				$prod_total = $qty * $listprice;
-
-				//Get the current sub total from Quotes and update it with the new subtotal
-				updateSubTotal("SalesOrder","salesorder","subtotal","total","salesorderid",$so_id,$prod_total);
-			}
-			//delete the relation from so product rel
-			$del_query = "delete from vtiger_soproductrel where productid=".$return_id." and salesorderid=".$record;
-			$adb->query($del_query);
-
-		}
-	break;
-		case Rss:
-			$del_query = "delete from vtiger_rss where rssid=".$record;
-			$adb->query($del_query);
-	break;
-		case Portal:
-			$del_query = "delete from vtiger_portal where portalid=".$record;
-			$adb->query($del_query);
+		*/
+	break;
+	case Rss:
+		$del_query = "delete from vtiger_rss where rssid=".$record;
+		$adb->query($del_query);
+	break;
+	case Portal:
+		$del_query = "delete from vtiger_portal where portalid=".$record;
+		$adb->query($del_query);
 	break;
 	endswitch;
-	
+	}
+
+	//this is added to update the crmentity.deleted=1 when we delete from listview and not from relatedlist
 	if($return_module == $module && $return_module !='Rss' && $return_module !='Portal')
 	{	
-		global $current_user;
 		require_once('include/freetag/freetag.class.php');
 		$freetag=new freetag();
 		$freetag->delete_all_object_tags_for_user($current_user->id,$record);
 		$focus->mark_deleted($record);
 	}
+
+	//This is to delete the entity information from tracker ie., lastviewed 
 	if($module != 'Faq')
 	{	
 		$sql_recentviewed ='delete from vtiger_tracker where user_id = '.$current_user->id.' and item_id = '.$record;

Modified: vtigercrm/trunk/include/utils/ListViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/ListViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/ListViewUtils.php Mon Jun 19 04:18:18 2006
@@ -741,8 +741,12 @@
 		$edit_link = getListViewEditLink($module,$entity_id,$relatedlist,$returnset);
 		$del_link = getListViewDeleteLink($module,$entity_id,$relatedlist,$returnset);
 
-		$list_header[] = "<a href=\"$edit_link\"> &nbsp;".$app_strings["LNK_EDIT"]." </a> | 
-				  <a href=\"javascript:;\" onclick=confirmdelete(\"$del_link\")> ".$app_strings["LNK_DELETE"]." </a>";
+		$links_info = "<a href=\"$edit_link\"> &nbsp;".$app_strings["LNK_EDIT"]." </a> ";
+		if($del_link != '')
+			$links_info .=	" | <a href=\"javascript:;\" onclick=confirmdelete(\"$del_link\")> ".$app_strings["LNK_DELETE"]." </a>";
+
+		$list_header[] = $links_info;
+
 		echo '<script>
 				function confirmdelete(url)
 		                {
@@ -2665,6 +2669,16 @@
  */
 function getListViewDeleteLink($module,$entity_id,$relatedlist,$returnset)
 {
+	$current_module = $_REQUEST['module'];
+
+	//This is added to avoid the del link in Product related list for the following modules
+	$avoid_del_links = Array("PurchaseOrder","SalesOrder","Quotes","Invoice");
+
+	if($current_module == 'Products' && in_array($module,$avoid_del_links))
+	{
+		return '';
+	}
+
 	$del_link = "index.php?module=$module&action=Delete&record=$entity_id";
 
 	//This is added for relatedlist listview



From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 19 03:27:25 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 19 Jun 2006 10:27:25 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231245=3A?=
 =?utf-8?q?_edit_and_del_links_are_not_exist_in_listview_and_relatedlists?=
In-Reply-To: <076.4ddff9b4349d2a2ad1f3163458b73b34@vtiger.fosslabs.com>
References: <076.4ddff9b4349d2a2ad1f3163458b73b34@vtiger.fosslabs.com>
Message-ID: <085.ffe2fce9ca560f97fd3da6d62281eb2e@vtiger.fosslabs.com>

#1245: edit and del links are not exist in listview and relatedlists
------------------------+---------------------------------------------------
  Reporter:  mickie     |       Owner:  mickie
      Type:  defect     |      Status:  closed
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mickie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 This issue has been fixed as edit and delete links are provided in
 ListView and RelatedList where as in listview if we delete the entity then
 the entity will be deleted and in relatedlist if we click on delete link
 then the relationship will be deleted and the entity will be remained.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1245>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 19 03:55:54 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 19 Jun 2006 10:55:54 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7259 -
	/vtigercrm/trunk/data/CRMEntity.php
Message-ID: <20060619105555.4415783F126@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 19 04:55:51 2006
New Revision: 7259

Log:
* Modified to handle the comments information save using Ajax edit where as previously when we save using ajax (from detailview) it wont save because in this case the request value is empty

Modified:
    vtigercrm/trunk/data/CRMEntity.php

Modified: vtigercrm/trunk/data/CRMEntity.php
==============================================================================
--- vtigercrm/trunk/data/CRMEntity.php (original)
+++ vtigercrm/trunk/data/CRMEntity.php Mon Jun 19 04:55:51 2006
@@ -905,9 +905,14 @@
 	else
 		$ownertype = 'customer';
 
-	if($_REQUEST['comments'] != '')
-	{
-		$comment = addslashes($_REQUEST['comments']);
+	if($this->column_fields['comments'] != '')
+		$comment = $this->column_fields['comments'];
+	else
+		$comment = $_REQUEST['comments'];
+
+	if($comment != '')
+	{
+		$comment = addslashes($comment);
 		$sql = "insert into vtiger_ticketcomments values('',".$this->id.",'".$comment."','".$current_user->id."','".$ownertype."','".$current_time."')";
 	        $adb->query($sql);
 	}



From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 19 03:56:40 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 19 Jun 2006 10:56:40 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231244=3A?=
 =?utf-8?q?_Support_=3E_HelpDesk_-_Ticket_Comments?=
In-Reply-To: <076.37c737bcf82ff17f40eb1ca85dac14f6@vtiger.fosslabs.com>
References: <076.37c737bcf82ff17f40eb1ca85dac14f6@vtiger.fosslabs.com>
Message-ID: <085.bf0b38ae2ed5635cf6c8803840483232@vtiger.fosslabs.com>

#1244: Support > HelpDesk - Ticket Comments
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  mickie
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mickie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 This issue is fixed.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1244>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 19 04:10:26 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 19 Jun 2006 11:10:26 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7260 -
 /vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
Message-ID: <20060619111027.5187F2B7C92@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 19 05:10:22 2006
New Revision: 7260

Log:
hour_format,end_hour and start_hour fields have been included in field table for user

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

Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original)
+++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Mon Jun 19 05:10:22 2006
@@ -855,6 +855,9 @@
 $this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'activity_view','vtiger_users',1,'15','activity_view','Default Activity View',1,0,0,100,13,79,1,'V~O',1,null,'BAS')");
 $this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'lead_view','vtiger_users',1,'15','lead_view','Default Lead View',1,0,0,100,12,79,1,'V~O',1,null,'BAS')");
 $this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'currency_id','vtiger_users',1,'116','currency_id','Currency',1,0,0,100,11,79,1,'I~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'hour_format','vtiger_users',1,'116','hour_format','Calendar Hour Format',1,0,0,100,13,79,3,'I~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'end_hour','vtiger_users',1,'116','end_hour','Day ends at',1,0,0,100,15,79,3,'I~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'start_hour','vtiger_users',1,'116','start_hour','Day starts at',1,0,0,100,14,79,3,'I~O',1,null,'BAS')");
 $this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'title','vtiger_users',1,'1','title','Title',1,0,0,50,1,80,1,'V~O',1,null,'BAS')");
 $this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'phone_work','vtiger_users',1,'1','phone_work','Office Phone',1,0,0,50,2,80,1,'V~O',1,null,'BAS')");
 $this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'department','vtiger_users',1,'1','department','Department',1,0,0,50,3,80,1,'V~O',1,null,'BAS')");



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 19 04:12:40 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 19 Jun 2006 11:12:40 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7261 -
	/vtigercrm/trunk/install/5createTables.inc.php
Message-ID: <20060619111240.5CA765CE174@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 19 05:12:35 2006
New Revision: 7261

Log:
default data has been given for hour_format,start_hour and end_hour

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 Jun 19 05:12:35 2006
@@ -79,6 +79,9 @@
         $user->column_fields["namedays"] = '';
         $user->column_fields["currency_id"] = 1;
 	$user->column_fields["date_format"] = 'yyyy-mm-dd';
+	$user->column_fields["hour_format"] = 'am/pm';
+	$user->column_fields["start_hour"] = '08:00';
+	$user->column_fields["end_hour"] = '23:00';
 	// added by jeri to populate default image and tagcloud for admin	
 	$user->column_fields["imagename"] = 'shanky.jpg';
         $user->column_fields["tagcloud"] = '';	



From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 19 04:13:48 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 19 Jun 2006 11:13:48 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231257=3A?=
 =?utf-8?q?_calender-_time_display_should_start_earlier_instead_of_10=2E00?=
 =?utf-8?q?_am?=
In-Reply-To: <076.d27bacbd23f52c8c928d56ba5872fc60@vtiger.fosslabs.com>
References: <076.d27bacbd23f52c8c928d56ba5872fc60@vtiger.fosslabs.com>
Message-ID: <085.4ceca578fc97e34b243058e50ca31173@vtiger.fosslabs.com>

#1257: calender- time display should start earlier instead of 10.00 am
--------------------------+-------------------------------------------------
  Reporter:  ftc          |       Owner:  mangai
      Type:  enhancement  |      Status:  closed
  Priority:  major        |   Milestone:        
 Component:  vtigercrm    |     Version:  5.0.0 
Resolution:  fixed        |    Keywords:        
--------------------------+-------------------------------------------------
Changes (by mangai):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 fixed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1257>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 19 04:19:25 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 19 Jun 2006 11:19:25 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231342=3A?=
	=?utf-8?b?IFtVTktd?=
Message-ID: <076.97f27bff752ea9480bafe55e13c1a680@vtiger.fosslabs.com>

#1342: [UNK]
-------------------------------+--------------------------------------------
 Reporter:  buy adipex online  |       Owner:  developer
     Type:                     |      Status:  new      
 Priority:                     |   Milestone:           
Component:                     |     Version:           
 Keywords:  [UNK]              |  
-------------------------------+--------------------------------------------
 <a href="http://gvm.bitacoras.com/order-adipex.html ">order adipex</a>

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1342>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 19 06:58:35 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 19 Jun 2006 13:58:35 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7262 -
 /vtigercrm/trunk/modules/Settings/CreateCustomField.php
Message-ID: <20060619135835.01EA783F166@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 19 07:58:32 2006
New Revision: 7262

Log:
changes made to fix the issue 1118

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

Modified: vtigercrm/trunk/modules/Settings/CreateCustomField.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/CreateCustomField.php (original)
+++ vtigercrm/trunk/modules/Settings/CreateCustomField.php Mon Jun 19 07:58:32 2006
@@ -21,6 +21,10 @@
 
 $tabid=$_REQUEST['tabid'];
 $fieldid=$_REQUEST['fieldid'];
+if(isset($_REQUEST['uitype']) && $_REQUEST['uitype'] != '')
+	$uitype=$_REQUEST['uitype'];
+else
+	$uitype=1;
 $readonly = '';
 $smarty = new vtigerCRM_Smarty;
 $cfimagecombo = Array($image_path."text.gif",
@@ -55,7 +59,7 @@
 	$customfield_columnname=getCustomFieldData($tabid,$fieldid,'columnname');
 	$customfield_typeofdata=getCustomFieldData($tabid,$fieldid,'typeofdata');
 	$customfield_fieldlabel=getCustomFieldData($tabid,$fieldid,'fieldlabel');
-	$customfield_typename=getCustomFieldTypeName($_REQUEST['uitype']);
+	$customfield_typename=getCustomFieldTypeName($uitype);
 	$fieldtype_lengthvalue=getFldTypeandLengthValue($customfield_typename,$customfield_typeofdata);
 	list($fieldtype,$fieldlength,$decimalvalue)= explode(";",$fieldtype_lengthvalue);
 	$readonly = "readonly";
@@ -141,8 +145,43 @@
 						<tr>
 							<td class="dataLabel" nowrap="nowrap" align="right"><b>'.$mod_strings['LBL_LABEL'].' </b></td>
 							<td align="left"><input name="fldLabel" value="'.$customfield_fieldlabel.'" type="text" class="txtBox"></td>
-						</tr>
-						<tr id="lengthdetails">
+						</tr>';
+					if($mode == 'edit')
+					{
+						switch($uitype)
+						{
+							case 1:
+								$output .= '<tr id="lengthdetails">
+									<td class="dataLabel" nowrap="nowrap" align="right"><b>'.$mod_strings['LBL_LENGTH'].'</b></td>
+									<td align="left"><input type="text" name="fldLength" value="'.$fieldlength.'" '.$readonly.' class="txtBox"></td>
+								</tr>';
+								break;
+							case 71:
+							case 9:
+							case 7:
+								$output .= '<tr id="lengthdetails">
+									<td class="dataLabel" nowrap="nowrap" align="right"><b>'.$mod_strings['LBL_LENGTH'].'</b></td>
+									<td align="left"><input type="text" name="fldLength" value="'.$fieldlength.'" '.$readonly.' class="txtBox"></td>
+								</tr>';
+								$output .= '<tr id="decimaldetails">
+									<td class="dataLabel" nowrap="nowrap" align="right"><b>'.$mod_strings['LBL_DECIMAL_PLACES'].'</b></td>
+									<td align="left"><input type="text" name="fldDecimal" value="'.$decimalvalue.'" '.$readonly.' class="txtBox"></td>
+								</tr>';
+								break;
+							case 33:
+							case 15:
+								$output .= '<tr id="picklist">
+									<td class="dataLabel" nowrap="nowrap" align="right" valign="top"><b>'.$mod_strings['LBL_PICK_LIST_VALUES'].'</b></td>
+									<td align="left" valign="top"><textarea name="fldPickList" rows="10" class="txtBox" '.$readonly.'>'.$fldVal.'</textarea></td>
+									<!--td style="padding-left:10px"><img src="themes/Aqua/images/picklist_hint.gif"/></td-->
+								</tr>';
+								break;
+								
+						}
+					}
+					else
+					{
+						$output .= '<tr id="lengthdetails">
 							<td class="dataLabel" nowrap="nowrap" align="right"><b>'.$mod_strings['LBL_LENGTH'].'</b></td>
 							<td align="left"><input type="text" name="fldLength" value="'.$fieldlength.'" '.$readonly.' class="txtBox"></td>
 						</tr>
@@ -154,7 +193,9 @@
 							<td class="dataLabel" nowrap="nowrap" align="right" valign="top"><b>'.$mod_strings['LBL_PICK_LIST_VALUES'].'</b></td>
 							<td align="left" valign="top"><textarea name="fldPickList" rows="10" class="txtBox" '.$readonly.'>'.$fldVal.'</textarea></td>
 							<!--td style="padding-left:10px"><img src="themes/Aqua/images/picklist_hint.gif"/></td-->
-						</tr>
+						</tr>';
+					}
+				$output .= '	
 					</table>
 				</td>
 			</tr>



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 19 07:01:09 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 19 Jun 2006 14:01:09 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7263 -
	/vtigercrm/trunk/include/CustomFieldUtil.php
Message-ID: <20060619140109.77E0783F1C6@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 19 08:01:05 2006
New Revision: 7263

Log:
changes made to fix the issue 1118

Modified:
    vtigercrm/trunk/include/CustomFieldUtil.php

Modified: vtigercrm/trunk/include/CustomFieldUtil.php
==============================================================================
--- vtigercrm/trunk/include/CustomFieldUtil.php (original)
+++ vtigercrm/trunk/include/CustomFieldUtil.php Mon Jun 19 08:01:05 2006
@@ -37,10 +37,6 @@
 	{
 		$fldname = 'Percent';
 	}
-	elseif($uitype == 3)
-	{
-		$fldname = 'Currency';
-	}
 	elseif($uitype == 5)
 	{
 		$fldname = 'Date';
@@ -185,7 +181,7 @@
 	{
 		$types = explode("~",$typeofdata);
 		$data_decimal = explode(",",$types[2]);
-		$data_array=array('3',$data_decimal);
+		$data_array=array('71',$data_decimal[0],$data_decimal[1]);
 		$fieldtype = implode(";",$data_array);
 	}
 	elseif($label == 'Date')



From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 19 07:03:25 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 19 Jun 2006 14:03:25 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231118=3A?=
	=?utf-8?q?_issue_in_custom_field?=
In-Reply-To: <076.b7ca86dba4ffe927aca5a0856f25df73@vtiger.fosslabs.com>
References: <076.b7ca86dba4ffe927aca5a0856f25df73@vtiger.fosslabs.com>
Message-ID: <085.fd7805328dfd5f5d80ea3fcc368cf29f@vtiger.fosslabs.com>

#1118: issue in custom field
------------------------+---------------------------------------------------
  Reporter:  mangai     |       Owner:  mangai
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mangai):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 fixed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1118>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 19 07:27:35 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 19 Jun 2006 14:27:35 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23901=3A_?=
 =?utf-8?q?module_and_picklist_mismatch?=
In-Reply-To: <076.4ab5d2daa3e1fd4b360860bc41a84b82@vtiger.fosslabs.com>
References: <076.4ab5d2daa3e1fd4b360860bc41a84b82@vtiger.fosslabs.com>
Message-ID: <085.6ed80e13ab7cda3e5c83f5f335a75117@vtiger.fosslabs.com>

#901: module and picklist mismatch
------------------------+---------------------------------------------------
  Reporter:  mangai     |       Owner:  mangai
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mangai):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 fixed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/901>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 19 08:01:11 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 19 Jun 2006 15:01:11 -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.9231d8dbce18c5bb42c94e051d929bc3@vtiger.fosslabs.com>

#727: Tab order is wrong
-------------------------+--------------------------------------------------
  Reporter:  OnwealdTim  |       Owner:  philip      
      Type:  defect      |      Status:  closed      
  Priority:  critical    |   Milestone:  5.0.0       
 Component:  vtigercrm   |     Version:  5.0.0       
Resolution:  fixed       |    Keywords:  ui tab order
-------------------------+--------------------------------------------------
Changes (by saraj):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 (In [7264]) Changes made to have logical cursor crawling in the form
 fields. Fixes #727 and #78, and refs #78 and #727.

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/727>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 19 08:01:12 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 19 Jun 2006 15:01:12 -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.6d3cc3264c50fdc9e792db64b985b4d0@vtiger.fosslabs.com>

#78: Input tab field order for contacts
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  philip
      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 [7264]) Changes made to have logical cursor crawling in the form
 fields. Fixes #727 and #78, and refs #78 and #727.

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/78>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 19 08:01:13 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 19 Jun 2006 15:01:13 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7264 - in /vtigercrm/trunk:
 Smarty/templates/DisplayFields.tpl include/utils/CommonUtils.php
Message-ID: <20060619150113.8619583F1EF@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 19 09:01:04 2006
New Revision: 7264

Log:
Changes made to have logical cursor crawling in the form fields. Fixes #727 and #78, and refs #78 and #727.

Modified:
    vtigercrm/trunk/Smarty/templates/DisplayFields.tpl
    vtigercrm/trunk/include/utils/CommonUtils.php

Modified: vtigercrm/trunk/Smarty/templates/DisplayFields.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DisplayFields.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DisplayFields.tpl Mon Jun 19 09:01:04 2006
@@ -28,25 +28,26 @@
 		{assign var="fldvalue" value="$maindata[3][0]"}
 		{assign var="secondvalue" value="$maindata[3][1]"}
 		{assign var="thirdvalue" value="$maindata[3][2]"}
+		{assign var="vt_tab" value="$maindata[4][0]"}
 
 		{if $uitype eq 2}
 			<td width=20% class="dvtCellLabel" align=right>
 				<font color="red">*</font>{$fldlabel}
 			</td>
 			<td width=30% align=left class="dvtCellInfo">
-				<input type="text" name="{$fldname}" value="{$fldvalue}" class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'">
+				<input type="text" name="{$fldname}" tabindex="{$vt_tab}" value="{$fldvalue}" tabindex="{$vt_tab}" class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'">
 			</td>
 		{elseif $uitype eq 11 || $uitype eq 1 || $uitype eq 13 || $uitype eq 7 || $uitype eq 9}
 			<td width=20% class="dvtCellLabel" align=right>{$fldlabel}</td>
 
 			{if $fldname eq 'tickersymbol' && $MODULE eq 'Accounts'}
 				<td width=30% align=left class="dvtCellInfo">
-					<input type="text" name="{$fldname}" id ="{$fldname}" value="{$fldvalue}" class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn';" onBlur="this.className='detailedViewTextBox';{if $fldname eq 'tickersymbol' && $MODULE eq 'Accounts'}sensex_info(){/if}">
+					<input type="text" name="{$fldname}" tabindex="{$vt_tab}" id ="{$fldname}" value="{$fldvalue}" class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn';" onBlur="this.className='detailedViewTextBox';{if $fldname eq 'tickersymbol' && $MODULE eq 'Accounts'}sensex_info(){/if}">
 					<span id="vtbusy_info" style="display:none;">
 						<img src="themes/blue/images/vtbusy.gif" border="0"></span>
 				</td>
 			{else}
-				<td width=30% align=left class="dvtCellInfo"><input type="text" name="{$fldname}" id ="{$fldname}" value="{$fldvalue}" class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'"></td>
+				<td width=30% align=left class="dvtCellInfo"><input type="text" tabindex="{$vt_tab}" name="{$fldname}" id ="{$fldname}" value="{$fldvalue}" class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'"></td>
 			{/if}
 		{elseif $uitype eq 19 || $uitype eq 20}
 			<!-- In Add Comment are we should not display anything -->
@@ -60,7 +61,7 @@
 				{$fldlabel}
 			</td>
 			<td colspan=3>
-				<textarea class="detailedViewTextBox" onFocus="this.className='detailedViewTextBoxOn'" name="{$fldname}"  onBlur="this.className='detailedViewTextBox'" cols="90" rows="8">{$fldvalue}</textarea>
+				<textarea class="detailedViewTextBox" tabindex="{$vt_tab}" onFocus="this.className='detailedViewTextBoxOn'" name="{$fldname}"  onBlur="this.className='detailedViewTextBox'" cols="90" rows="8">{$fldvalue}</textarea>
 			</td>
 		{elseif $uitype eq 21 || $uitype eq 24}
 			<td width=20% class="dvtCellLabel" align=right>
@@ -70,7 +71,7 @@
 				{$fldlabel}
 			</td>
 			<td width=30% align=left class="dvtCellInfo">
-				<textarea value="{$fldvalue}" name="{$fldname}"  class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" rows=2>{$fldvalue}</textarea>
+				<textarea value="{$fldvalue}" name="{$fldname}" tabindex="{$vt_tab}" class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" rows=2>{$fldvalue}</textarea>
 			</td>
 		{elseif $uitype eq 15 || $uitype eq 16}
 			<td width="20%" class="dvtCellLabel" align=right>
@@ -80,7 +81,7 @@
 				{$fldlabel}
 			</td>
 			<td width="30%" align=left class="dvtCellInfo">
-			   <select name="{$fldname}">
+			   <select name="{$fldname}" tabindex="{$vt_tab}" >
 				{foreach item=arr from=$fldvalue}
 					{foreach key=sel_value item=value from=$arr}
 						<option value="{$sel_value}" {$value}>{$sel_value}</option>
@@ -93,7 +94,7 @@
 				{$fldlabel}
 			</td>
 			<td width="30%" align=left class="dvtCellInfo">
-			   <select MULTIPLE name="{$fldname}[]" size="2">
+			   <select MULTIPLE name="{$fldname}[]" size="2" tabindex="{$vt_tab}" >
 				{foreach item=arr from=$fldvalue}
 					{foreach key=sel_value item=value from=$arr}
 						<option value="{$sel_value}" {$value}>{$sel_value}</option>
@@ -128,7 +129,7 @@
 					{assign var=style_group value='display:block'}
 				{/if}
 
-				<input type="radio" name="assigntype" {$select_user} value="U" onclick="toggleAssignType(this.value)">&nbsp;User
+				<input type="radio" tabindex="{$vt_tab}" name="assigntype" {$select_user} value="U" onclick="toggleAssignType(this.value)">&nbsp;User
 
 				{if $secondvalue neq ''}
 					<input type="radio" name="assigntype" {$select_group} value="T" onclick="toggleAssignType(this.value)">&nbsp;Group
@@ -163,9 +164,9 @@
 				{if $uitype eq 52}
 					<select name="assigned_user_id">
 				{elseif $uitype eq 77}
-					<select name="assigned_user_id1">
-				{else}
-					<select name="{$fldname}">
+					<select name="assigned_user_id1" tabindex="{$vt_tab}" >
+				{else}
+					<select name="{$fldname}" tabindex="{$vt_tab}" >
 				{/if}
 
 				{foreach key=key_one item=arr from=$fldvalue}
@@ -185,7 +186,7 @@
 				{$fldlabel}
 			</td>
 			<td width="30%" align=left class="dvtCellInfo">
-				<input readonly name="account_name" style="border:1px solid #bababa;" type="text" value="{$fldvalue}"><input name="{$fldname}" type="hidden" value="{$secondvalue}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Accounts&action=Popup&popuptype={$popuptype}&form=TasksEditView&form_submit=false","test","width=640,height=565,resizable=0,scrollbars=0");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.account_id.value=''; this.form.account_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
+				<input readonly name="account_name" style="border:1px solid #bababa;" type="text" value="{$fldvalue}"><input name="{$fldname}" type="hidden" value="{$secondvalue}">&nbsp;<img tabindex="{$vt_tab}" src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Accounts&action=Popup&popuptype={$popuptype}&form=TasksEditView&form_submit=false","test","width=640,height=565,resizable=0,scrollbars=0");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.account_id.value=''; this.form.account_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
 			</td>
 
 		{elseif $uitype eq 50}
@@ -215,7 +216,7 @@
 			<td width="30%" align=left class="dvtCellInfo">
 				<input name="vendor_name" readonly type="text" style="border:1px solid #bababa;" value="{$fldvalue}"><input name="{$fldname}" type="hidden" value="{$secondvalue}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Vendors&action=Popup&html=Popup_picker&popuptype={$pop_type}&form=EditView","test","width=640,height=565,resizable=0,scrollbars=0");' align="absmiddle" style='cursor:hand;cursor:pointer'>
 				{if $uitype eq 75}
-					&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.vendor_id.value='';this.form.vendor_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
+					&nbsp;<input type="image" tabindex="{$vt_tab}" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.vendor_id.value='';this.form.vendor_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
 				{/if}
 			</td>
 		{elseif $uitype eq 57}
@@ -223,7 +224,7 @@
 				{$fldlabel}
 			</td>
 			<td width="30%" align=left class="dvtCellInfo">
-				<input name="contact_name" readonly type="text" style="border:1px solid #bababa;" value="{$fldvalue}"><input name="{$fldname}" type="hidden" value="{$secondvalue}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Contacts&action=Popup&html=Popup_picker&popuptype=specific&form=EditView","test","width=640,height=565,resizable=0,scrollbars=0");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.contact_id.value=''; this.form.contact_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
+				<input name="contact_name" readonly type="text" style="border:1px solid #bababa;" value="{$fldvalue}"><input name="{$fldname}" type="hidden" value="{$secondvalue}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Contacts&action=Popup&html=Popup_picker&popuptype=specific&form=EditView","test","width=640,height=565,resizable=0,scrollbars=0");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" tabindex="{$vt_tab}" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.contact_id.value=''; this.form.contact_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
 			</td>
 		
 		{elseif $uitype eq 58}
@@ -231,7 +232,7 @@
 				{$fldlabel}
 			</td>
 			<td width="30%" align=left class="dvtCellInfo">
-				<input name="campaignname" readonly type="text" style="border:1px solid #bababa;" value="{$fldvalue}"><input name="{$fldname}" type="hidden" value="{$secondvalue}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Campaigns&action=Popup&html=Popup_picker&popuptype=specific_campaign&form=EditView","test","width=640,height=565,resizable=0,scrollbars=0");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.campaignid.value=''; this.form.campaignname.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
+				<input name="campaignname" readonly type="text" style="border:1px solid #bababa;" value="{$fldvalue}"><input name="{$fldname}" type="hidden" value="{$secondvalue}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Campaigns&action=Popup&html=Popup_picker&popuptype=specific_campaign&form=EditView","test","width=640,height=565,resizable=0,scrollbars=0");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" tabindex="{$vt_tab}" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.campaignid.value=''; this.form.campaignname.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
 			</td>
 
 		{elseif $uitype eq 80}
@@ -239,7 +240,7 @@
 				{$fldlabel}
 			</td>
 			<td width="30%" align=left class="dvtCellInfo">
-				<input name="salesorder_name" readonly type="text" style="border:1px solid #bababa;" value="{$fldvalue}"><input name="{$fldname}" type="hidden" value="{$secondvalue}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=SalesOrder&action=Popup&html=Popup_picker&popuptype=specific&form=EditView","test","width=640,height=565,resizable=0,scrollbars=0");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.salesorder_id.value=''; this.form.salesorder_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
+				<input name="salesorder_name" readonly type="text" style="border:1px solid #bababa;" value="{$fldvalue}"><input name="{$fldname}" type="hidden" value="{$secondvalue}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=SalesOrder&action=Popup&html=Popup_picker&popuptype=specific&form=EditView","test","width=640,height=565,resizable=0,scrollbars=0");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" tabindex="{$vt_tab}" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.salesorder_id.value=''; this.form.salesorder_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
 			</td>
 
 		{elseif $uitype eq 78}
@@ -247,7 +248,7 @@
 				{$fldlabel}
 			</td>
 			<td width="30%" align=left class="dvtCellInfo">
-				<input name="quote_name" readonly type="text" style="border:1px solid #bababa;" value="{$fldvalue}"><input name="{$fldname}" type="hidden" value="{$ID}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Quotes&action=Popup&html=Popup_picker&popuptype=specific&form=EditView","test","width=640,height=565,resizable=0,scrollbars=0");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.quote_id.value=''; this.form.quote_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
+				<input name="quote_name" readonly type="text" style="border:1px solid #bababa;" value="{$fldvalue}"><input name="{$fldname}" type="hidden" value="{$ID}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Quotes&action=Popup&html=Popup_picker&popuptype=specific&form=EditView","test","width=640,height=565,resizable=0,scrollbars=0");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" tabindex="{$vt_tab}" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.quote_id.value=''; this.form.quote_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
 			</td>
 
 		{elseif $uitype eq 76}
@@ -255,7 +256,7 @@
 				{$fldlabel}
 			</td>
 			<td width="30%" align=left class="dvtCellInfo">
-				<input name="potential_name" readonly type="text" style="border:1px solid #bababa;" value="{$fldvalue}"><input name="{$fldname}" type="hidden" value="{$secondvalue}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Potentials&action=Popup&html=Popup_picker&popuptype=specific_potential_account_address&form=EditView","test","width=640,height=565,resizable=0,scrollbars=0");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.potential_id.value=''; this.form.potential_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
+				<input name="potential_name" readonly type="text" style="border:1px solid #bababa;" value="{$fldvalue}"><input name="{$fldname}" type="hidden" value="{$secondvalue}">&nbsp;<img tabindex="{$vt_tab}" src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Potentials&action=Popup&html=Popup_picker&popuptype=specific_potential_account_address&form=EditView","test","width=640,height=565,resizable=0,scrollbars=0");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.potential_id.value=''; this.form.potential_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
 			</td>
 
 		{elseif $uitype eq 17}
@@ -264,7 +265,7 @@
 			</td>
 			<td width="30%" align=left class="dvtCellInfo">
 				&nbsp;&nbsp;http://&nbsp;
-				<input type="text" name="{$fldname}" style="border:1px solid #bababa;" size="27" onFocus="this.className='detailedViewTextBoxOn'"onBlur="this.className='detailedViewTextBox'" value="{$fldvalue}">
+				<input type="text" tabindex="{$vt_tab}" name="{$fldname}" style="border:1px solid #bababa;" size="27" onFocus="this.className='detailedViewTextBoxOn'"onBlur="this.className='detailedViewTextBox'" value="{$fldvalue}">
 			</td>
 
 		{elseif $uitype eq 71 || $uitype eq 72}
@@ -275,7 +276,7 @@
 				{$fldlabel}
 			</td>
 			<td width="30%" align=left class="dvtCellInfo">
-				<input name="{$fldname}" type="text" class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'"  value="{$fldvalue}">
+				<input name="{$fldname}" tabindex="{$vt_tab}" type="text" class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'"  value="{$fldvalue}">
 			</td>
 
 		{elseif $uitype eq 56}
@@ -285,21 +286,21 @@
 			{if $fldname eq 'notime' && $ACTIVITY_MODE eq 'Events'}
 				{if $fldvalue eq 1}
 					<td width="30%" align=left class="dvtCellInfo">
-						<input name="{$fldname}" type="checkbox"  onclick="toggleTime()" checked>
+						<input name="{$fldname}" type="checkbox" tabindex="{$vt_tab}" onclick="toggleTime()" checked>
 					</td>
 				{else}
 					<td width="30%" align=left class="dvtCellInfo">
-						<input name="{$fldname}" type="checkbox" onclick="toggleTime()" >
+						<input name="{$fldname}" tabindex="{$vt_tab}" type="checkbox" onclick="toggleTime()" >
 					</td>
 				{/if}
 			{else}
 				{if $fldvalue eq 1}
 					<td width="30%" align=left class="dvtCellInfo">
-						<input name="{$fldname}" type="checkbox"  checked>
+						<input name="{$fldname}" type="checkbox" tabindex="{$vt_tab}" checked>
 					</td>
 				{else}
 					<td width="30%" align=left class="dvtCellInfo">
-						<input name="{$fldname}" type="checkbox">
+						<input name="{$fldname}" tabindex="{$vt_tab}" type="checkbox">
 					</td>
 				{/if}
 			{/if}
@@ -313,11 +314,11 @@
 					{assign var=time_val value="$time_value"}
 				{/foreach}
 
-				<input name="{$fldname}" id="jscal_field_{$fldname}" type="text" style="border:1px solid #bababa;" size="11" maxlength="10" value="{$date_val}">
+				<input name="{$fldname}" tabindex="{$vt_tab}" id="jscal_field_{$fldname}" type="text" style="border:1px solid #bababa;" size="11" maxlength="10" value="{$date_val}">
 				<img src="{$IMAGE_PATH}calendar.gif" id="jscal_trigger_{$fldname}">
 
 				{if $uitype eq 6}
-					<input name="time_start" style="border:1px solid #bababa;" size="5" maxlength="5" type="text" value="{$time_val}">
+					<input name="time_start" tabindex="{$vt_tab}" style="border:1px solid #bababa;" size="5" maxlength="5" type="text" value="{$time_val}">
 				{/if}
 
 				{foreach key=date_format item=date_str from=$secondvalue}
@@ -345,8 +346,8 @@
 				{$fldlabel}
 			</td>
 			<td width="30%" align=left class="dvtCellInfo">
-				<input name="{$fldname}" type="text" size="2" value="{$fldvalue}">&nbsp;
-				<select name="duration_minutes">
+				<input name="{$fldname}" type="text" size="2" value="{$fldvalue}" tabindex="{$vt_tab}" >&nbsp;
+				<select name="duration_minutes" tabindex="{$vt_tab}" >
 					{foreach key=labelval item=selectval from=$secondvalue}
 						<option value="{$labelval}" {$selectval}>{$labelval}</option>
 					{/foreach}
@@ -363,7 +364,7 @@
 			<td width="30%" align=left class="dvtCellInfo">
 				<input name="{$fldname}" type="hidden" value="{$secondvalue}">
 				<input name="parent_name" readonly type="text" style="border:1px solid #bababa;" value="{$fldvalue}">
-				&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module="+ document.EditView.parent_type.value +"&action=Popup&html=Popup_picker&form=HelpDeskEditView","test","width=640,height=565,resizable=0,scrollbars=0,top=150,left=200");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.parent_id.value=''; this.form.parent_name.value=''; return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
+				&nbsp;<img src="{$IMAGE_PATH}select.gif" tabindex="{$vt_tab}" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module="+ document.EditView.parent_type.value +"&action=Popup&html=Popup_picker&form=HelpDeskEditView","test","width=640,height=565,resizable=0,scrollbars=0,top=150,left=200");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.parent_id.value=''; this.form.parent_name.value=''; return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
 			</td>
 
 		{elseif $uitype eq 357}
@@ -376,7 +377,7 @@
 						<option value="{$labelval}" {$selectval}>{$labelval}</option>
 					{/foreach}
 				</select>
-				&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module="+ document.EditView.parent_type.value +"&action=Popup&html=Popup_picker&form=HelpDeskEditView","test","width=640,height=565,resizable=0,scrollbars=0,top=150,left=200");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.parent_id.value=''; this.form.parent_name.value=''; return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
+				&nbsp;<img tabindex="{$vt_tab}" src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module="+ document.EditView.parent_type.value +"&action=Popup&html=Popup_picker&form=HelpDeskEditView","test","width=640,height=565,resizable=0,scrollbars=0,top=150,left=200");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.parent_id.value=''; this.form.parent_name.value=''; return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
 			</td>
 		   <tr style="height:25px">
 			<td width="20%" class="dvtCellLabel" align=right>CC:&nbsp;</td>	
@@ -395,7 +396,7 @@
 			</td>
 			<td width="30%" align=left class="dvtCellInfo">
 				<input name="{$fldname}" type="hidden" value="{$secondvalue}">
-				<input name="product_name" readonly type="text" value="{$fldvalue}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Products&action=Popup&html=Popup_picker&form=HelpDeskEditView&popuptype=specific","test","width=640,height=565,resizable=0,scrollbars=0,top=150,left=200");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.product_id.value=''; this.form.product_name.value=''; return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
+				<input name="product_name" readonly type="text" value="{$fldvalue}">&nbsp;<img tabindex="{$vt_tab}" src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Products&action=Popup&html=Popup_picker&form=HelpDeskEditView&popuptype=specific","test","width=640,height=565,resizable=0,scrollbars=0,top=150,left=200");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.product_id.value=''; this.form.product_name.value=''; return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
 			</td>
 
 		{elseif $uitype eq 55} 
@@ -408,7 +409,7 @@
 						{/foreach}
 					{/foreach}
 				</select>
-				<input type="text" name="{$fldname}"  class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" value= "{$secondvalue}">
+				<input type="text" name="{$fldname}" tabindex="{$vt_tab}" class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" value= "{$secondvalue}">
 			</td>
 
 		{elseif $uitype eq 22}
@@ -416,7 +417,7 @@
 				<font color="red">*</font>{$fldlabel}
 			</td>
 			<td width="30%" align=left class="dvtCellInfo">
-				<textarea name="{$fldname}" cols="30" rows="2">{$fldvalue}</textarea>
+				<textarea name="{$fldname}" cols="30" tabindex="{$vt_tab}" rows="2">{$fldvalue}</textarea>
 			</td>
 
 		{elseif $uitype eq 69}
@@ -427,7 +428,7 @@
 				{if $MODULE eq 'Products'}
 					<input name="del_file_list" type="hidden" value="">
 					<div id="files_list" style="border: 1px solid grey; width: 500px; padding: 5px; background: rgb(255, 255, 255) none repeat scroll 0%; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial; font-size: x-small">Files Maximum 6
-						<input id="my_file_element" type="file" name="file_1" >
+						<input id="my_file_element" type="file" name="file_1" tabindex="{$vt_tab}" >
 						{assign var=image_count value=0}
 						{if $maindata[3].0.name neq ''}
 						   {foreach name=image_loop key=num item=image_details from=$maindata[3]}
@@ -447,7 +448,7 @@
 						multi_selector.addElement( document.getElementById( 'my_file_element' ) );
 					</script>
 				{else}
-					<input name="{$fldname}"  type="file" value="{$maindata[3].0.name}"/>
+					<input name="{$fldname}"  type="file" value="{$maindata[3].0.name}" tabindex="{$vt_tab}" />
 					<input type="hidden" name="id" value=""/>
 					{$maindata[3].0.name}
 				{/if}
@@ -458,7 +459,7 @@
 				{$fldlabel}
 			</td>
 			<td colspan="3" width="30%" align=left class="dvtCellInfo">
-				<input name="{$fldname}"  type="file" value="{$secondvalue}"/>
+				<input name="{$fldname}"  type="file" value="{$secondvalue}" tabindex="{$vt_tab}" />
 				<input type="hidden" name="id" value=""/>{$fldvalue}
 			</td>
 		{elseif $uitype eq 156}
@@ -472,11 +473,11 @@
 				{/if}	
 				{if $fldvalue eq 'on'}
 					<td width="30%" align=left class="dvtCellInfo">
-						<input name="{$fldname}" {$disable_status} type="checkbox"  checked>
+						<input name="{$fldname}" {$disable_status} tabindex="{$vt_tab}" type="checkbox"  checked>
 					</td>
 				{else}
 					<td width="30%" align=left class="dvtCellInfo">
-						<input name="{$fldname}" {$disable_status} type="checkbox">
+						<input name="{$fldname}" {$disable_status} tabindex="{$vt_tab}" type="checkbox">
 					</td>
 				{/if}
 		{elseif $uitype eq 98}<!-- Role Selection Popup -->		
@@ -486,10 +487,10 @@
 			</td>
 			<td width="30%" align=left class="dvtCellInfo">
 			{if $thirdvalue eq 1}
-				<input name="role_name" id="role_name" class="txtBox" value="{$secondvalue}" type="text">&nbsp;
+				<input name="role_name" id="role_name" class="txtBox" tabindex="{$vt_tab}" value="{$secondvalue}" type="text">&nbsp;
 				<a href="javascript:openPopup();"><img src="{$IMAGE_PATH}select.gif" align="absmiddle" border="0"></a>
 			{else}	
-				<input name="role_name" id="role_name" class="txtBox" readonly value="{$secondvalue}" type="text">&nbsp;
+				<input name="role_name" id="role_name" tabindex="{$vt_tab}" class="txtBox" readonly value="{$secondvalue}" type="text">&nbsp;
 			{/if}	
 			<input name="user_role" id="user_role" value="{$fldvalue}" type="hidden">
 			</td>
@@ -498,14 +499,14 @@
 			 <font color="red">*</font>
 			 {$fldlabel}
 			 </td>
-    	     <td width=30% align=left class="dvtCellInfo"><input type="text" name="{$fldname}" id ="{$fldname}" value="{$fldvalue}" class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'"></td>
+    	     <td width=30% align=left class="dvtCellInfo"><input type="text" name="{$fldname}" id ="{$fldname}" value="{$fldvalue}" tabindex="{$vt_tab}" class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'"></td>
 			{elseif $uitype eq 115}<!-- for Status field Disabled for nonadmin -->
 			<td width="20%" class="dvtCellLabel" align=right>
 				{$fldlabel}
 			</td>
 			<td width="30%" align=left class="dvtCellInfo">
 			   {if $secondvalue eq 1}
-			   	<select name="{$fldname}">
+			   	<select name="{$fldname}" tabindex="{$vt_tab}" >
 			   {else}
 			   	<select disabled name="{$fldname}">
 			   {/if} 
@@ -521,7 +522,7 @@
 				{$fldlabel}
 			</td>
 			<td width="30%" align=left class="dvtCellInfo">
-					<input name="{$fldname}"  type="file" value="{$maindata[3].0.name}"/>
+					<input name="{$fldname}"  type="file" value="{$maindata[3].0.name}" tabindex="{$vt_tab}" />
 					<input type="hidden" name="id" value=""/>
 					{$maindata[3].0.name}
 			</td>
@@ -530,14 +531,14 @@
 				{$fldlabel}
 			</td>
 			<td width="30%" colspan="3" align=left class="dvtCellInfo">
-				<input type="text" name="{$fldname}" value="{$fldvalue}" class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'">
+				<input type="text" name="{$fldname}" value="{$fldvalue}" tabindex="{$vt_tab}" class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'">
 			</td>	
 			{elseif $uitype eq 101}<!-- for reportsto field USERS POPUP -->
 				<td width="20%" class="dvtCellLabel" align=right>
 			       {$fldlabel}
 	            </td>
 				<td width="30%" align=left class="dvtCellInfo">
-				<input readonly name='reports_to_name' class="small" type="text" value='{$fldvalue}'><input name='reports_to_id' type="hidden" value='{$secondvalue}'>&nbsp;<input title="Change [Alt+C]" accessKey="C" type="button" class="small" value='{$UMOD.LBL_CHANGE}' name=btn1 LANGUAGE=javascript onclick='return window.open("index.php?module=Users&action=Popup&form=UsersEditView&form_submit=false","test","width=640,height=522,resizable=0,scrollbars=0");'>
+				<input readonly name='reports_to_name' class="small" type="text" value='{$fldvalue}' tabindex="{$vt_tab}" ><input name='reports_to_id' type="hidden" value='{$secondvalue}'>&nbsp;<input title="Change [Alt+C]" accessKey="C" type="button" class="small" value='{$UMOD.LBL_CHANGE}' name=btn1 LANGUAGE=javascript onclick='return window.open("index.php?module=Users&action=Popup&form=UsersEditView&form_submit=false","test","width=640,height=522,resizable=0,scrollbars=0");'>
 	            </td>
 			{elseif $uitype eq 116}<!-- for currency in users details-->	
 			<td width="20%" class="dvtCellLabel" align=right>
@@ -545,9 +546,9 @@
 			</td>
 			<td width="30%" align=left class="dvtCellInfo">
 			   {if $secondvalue eq 1}
-			   	<select name="{$fldname}">
+			   	<select name="{$fldname}" tabindex="{$vt_tab}" >
 			   {else}
-			   	<select disabled name="{$fldname}">
+			   	<select disabled name="{$fldname}" tabindex="{$vt_tab}" >
 			   {/if} 
 
 				{foreach item=arr key=uivalueid from=$fldvalue}
@@ -563,9 +564,9 @@
 			</td>
 			<td width=30% align=left class="dvtCellInfo">
 				{if $MODE eq 'edit'}
-				<input type="text" readonly name="{$fldname}" value="{$fldvalue}" class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'">
-				{else}
-				<input type="text" name="{$fldname}" value="{$fldvalue}" class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'">
+				<input type="text" readonly name="{$fldname}" value="{$fldvalue}" tabindex="{$vt_tab}" class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'">
+				{else}
+				<input type="text" name="{$fldname}" value="{$fldvalue}" tabindex="{$vt_tab}" class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'">
 				{/if}
 			</td>
 			{elseif $uitype eq 99}
@@ -574,7 +575,7 @@
 					<font color="red">*</font>{$fldlabel}
 				</td>
 				<td width=30% align=left class="dvtCellInfo">
-					<input type="password" name="{$fldname}" value="{$fldvalue}" class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'">
+					<input type="password" name="{$fldname}" tabindex="{$vt_tab}" value="{$fldvalue}" class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'">
 				</td>
 				{/if}
 		{elseif $uitype eq 30}
@@ -586,7 +587,7 @@
 				{assign var=yes_val value=$secondvalue[1]}
 				{assign var=no_val value=$secondvalue[2]}
 
-				<input type="radio" name="set_reminder" value="Yes" {$check}>&nbsp;{$yes_val}&nbsp;
+				<input type="radio" name="set_reminder" tabindex="{$vt_tab}" value="Yes" {$check}>&nbsp;{$yes_val}&nbsp;
 				<input type="radio" name="set_reminder" value="No">&nbsp;{$no_val}&nbsp;
 
 				{foreach item=val_arr from=$fldvalue}

Modified: vtigercrm/trunk/include/utils/CommonUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/CommonUtils.php (original)
+++ vtigercrm/trunk/include/utils/CommonUtils.php Mon Jun 19 09:01:04 2006
@@ -992,6 +992,30 @@
                 $getBlockInfo=getBlockInformation($module,$result,$col_fields,$tabid,$block_label);	
 	}
 	$log->debug("Exiting getBlocks method ...");
+	$index_count =1;
+	$max_index =0;
+	foreach($getBlockInfo as $label=>$contents)
+	{
+			$no_rows = count($contents);	
+			$index_count = $max_index+1;
+		foreach($contents as $block_row => $elements)
+		{
+			$max_index= $no_rows+$index_count;
+			
+			for($i=0;$i<count($elements);$i++)
+			{	
+				if(sizeof($getBlockInfo[$label][$block_row][$i])!=0)
+				{
+					if($i==0)
+					$getBlockInfo[$label][$block_row][$i][]=array($index_count);
+					else
+					$getBlockInfo[$label][$block_row][$i][]=array($max_index);
+				}
+			}
+			$index_count++;
+			
+		}
+	}
 	return $getBlockInfo;
 }	
 /**



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 19 08:02:03 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 19 Jun 2006 15:02:03 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7265 -
	/vtigercrm/trunk/include/utils/EditViewUtils.php
Message-ID: <20060619150203.5948883F1EB@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 19 09:01:59 2006
New Revision: 7265

Log:
cahnges made to fix the issue 1260

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

Modified: vtigercrm/trunk/include/utils/EditViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/EditViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/EditViewUtils.php Mon Jun 19 09:01:59 2006
@@ -1035,12 +1035,10 @@
 		$rem_hrs = floor(($col_fields[$fieldname]-$rem_days*24*60)/60);
 		$rem_min = ($col_fields[$fieldname]-$rem_days*24*60)%60;
 		$editview_label[]=$mod_strings[$fieldlabel];
-		$custfld .= '<td valign="top" colspan=3>&nbsp;<input type="radio" name="set_reminder" value="Yes" '.$SET_REM.'>&nbsp;'.$mod_strings['LBL_YES'].'&nbsp;<input type="radio" name="set_reminder" value="No">&nbsp;'.$mod_strings['LBL_NO'].'&nbsp;';
 		$day_options = getReminderSelectOption(0,31,'remdays',$rem_days);
 		$hr_options = getReminderSelectOption(0,23,'remhrs',$rem_hrs);
 		$min_options = getReminderSelectOption(1,59,'remmin',$rem_min);
-		$custfld .= '&nbsp;&nbsp;'.$day_options.' &nbsp;'.$mod_strings['LBL_DAYS'].'&nbsp;&nbsp;'.$hr_options.'&nbsp;'.$mod_strings['LBL_HOURS'].'&nbsp;&nbsp;'.$min_options.'&nbsp;'.$mod_strings['LBL_MINUTES'].'&nbsp;&nbsp;'.$mod_strings['LBL_BEFORE_EVENT'].'</td>';
-		$fieldvalue[] = array(array(0,32,'remdays','days',$rem_days),array(0,24,'remhrs','hours',$rem_hrs),array(1,60,'remmin','minutes  before event',$rem_min));
+		$fieldvalue[] = array(array(0,32,'remdays',$mod_strings['LBL_DAYS'],$rem_days),array(0,24,'remhrs',$mod_strings['LBL_HOURS'],$rem_hrs),array(1,60,'remmin',$mod_strings['LBL_MINUTES'].'&nbsp;&nbsp;'.$mod_strings['LBL_BEFORE_EVENT'],$rem_min));
 		$fieldvalue[] = array($SET_REM,$mod_strings['LBL_YES'],$mod_strings['LBL_NO']);
 		$SET_REM = '';
 	}



From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 19 08:03:18 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 19 Jun 2006 15:03:18 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231260=3A?=
 =?utf-8?q?_i18n_issue_at_activities?=
In-Reply-To: <076.bf2281a02d95e6f032d828d0839694a6@vtiger.fosslabs.com>
References: <076.bf2281a02d95e6f032d828d0839694a6@vtiger.fosslabs.com>
Message-ID: <085.5f9e494a495a1db24843508f559e34ec@vtiger.fosslabs.com>

#1260: i18n issue at activities
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  mangai
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mangai):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 Fixed.
 Some of the picklist can not edit through picklist editor due to query
 check.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1260>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 19 08:25:39 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 19 Jun 2006 15:25:39 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7266 -
 /vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php
Message-ID: <20060619152539.EEF6B83F1B0@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 19 09:25:35 2006
New Revision: 7266

Log:
* Modified to handle the special characters in account name and potential name when convert the lead.

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

Modified: vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php (original)
+++ vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php Mon Jun 19 09:25:35 2006
@@ -41,8 +41,8 @@
         $potential_name = $check_unit[0];
 
 //Retrieve info from all the vtiger_tables related to leads
-  $focus = new Lead();
- $focus->retrieve_entity_info($id,"Leads");
+$focus = new Lead();
+$focus->retrieve_entity_info($id,"Leads");
 
 //get all the lead related columns 
 $row = $focus->column_fields;
@@ -52,7 +52,7 @@
 $date_entered = date('YmdHis');
 $date_modified = date('YmdHis');
 
-$crmid = $adb->getUniqueID("crmentity");
+$crmid = $adb->getUniqueID("vtiger_crmentity");
 
 //function for getting the custom values from leads and saving to vtiger_account/contact/potential custom vtiger_fields -Jag
 function getInsertValues($type,$type_id)
@@ -132,10 +132,11 @@
 		}
 
 	}
-	 $log->debug("columns to be inserted are ".$type_insert_column);
+	$log->debug("columns to be inserted are ".$type_insert_column);
         $log->debug("columns to be inserted are ".$insert_value);
 	$values = array ($type_insert_column,$insert_value);
 	$log->debug("Exiting getInsertValues method ...");
+
 	return $values;	
 }
 //function Ends
@@ -216,28 +217,27 @@
 		}
         }
 	$log->debug("Exiting getRelatedActivities method ...");
-	
+
 }
 
+//Saving Account - starts
 $sql_crmentity = "insert into vtiger_crmentity(crmid,smcreatorid,smownerid,setype,presence,createdtime,modifiedtime,deleted,description) values(".$crmid.",".$current_user_id.",".$assigned_user_id.",'Accounts',1,".$date_entered.",".$date_modified.",0,'".$row['description']."')";
 
 $adb->query($sql_crmentity);
 
-
-$sql_insert_account = "INSERT INTO vtiger_account (accountid,accountname,industry,annualrevenue,phone,fax,rating,email1,website,employees) VALUES (".$crmid.",'".$accountname ."','".$row["industry"] ."','" .$row["annualrevenue"] ."','" .$row["phone"] ."','".$row["fax"] ."','" .$row["rating"] ."','" .$row["email"] ."','" .$row["website"] ."','" .$row["noofemployees"] ."')";
-
+$sql_insert_account = "INSERT INTO vtiger_account (accountid,accountname,industry,annualrevenue,phone,fax,rating,email1,website,employees) VALUES (".$crmid.",'".addslashes($accountname)."','".$row["industry"] ."','" .$row["annualrevenue"] ."','" .$row["phone"] ."','".$row["fax"] ."','" .$row["rating"] ."','" .$row["email"] ."','" .$row["website"] ."','" .$row["noofemployees"] ."')";
 
 $adb->query($sql_insert_account);
 
 $sql_insert_accountbillads = "INSERT INTO vtiger_accountbillads (accountaddressid,city,code,country,state,street) VALUES (".$crmid.",'".$row["city"] ."','" .$row["code"] ."','" .$row["country"] ."','".$row["state"] ."','" .$row["lane"]."')";
 
- $adb->query($sql_insert_accountbillads);
+$adb->query($sql_insert_accountbillads);
 
 
 $sql_insert_accountshipads = "INSERT INTO vtiger_accountshipads (accountaddressid,city,code,country,state,street) VALUES (".$crmid.",'".$row["city"] ."','" .$row["code"] ."','" .$row["country"] ."','".$row["state"] ."','" .$row["lane"]."')";
 
 
- $adb->query($sql_insert_accountshipads);
+$adb->query($sql_insert_accountshipads);
 
 //Getting the custom vtiger_field values from leads and inserting into Accounts if the vtiger_field is mapped - Jaguar
 $insert_value=$crmid;
@@ -253,35 +253,33 @@
 $sql_insert_accountcustomfield = "INSERT INTO vtiger_accountscf (".$insert_column.") VALUES (".$insert_value.")";
 
 $adb->query($sql_insert_accountcustomfield);
-
-//
-
+//Saving Account - ends
 
 $acccount_id=$crmid;
 getRelatedNotesAttachments($id,$crmid); //To Convert Related Notes & Attachments -Jaguar
 
- $date_entered = date('YmdHis');
- $date_modified = date('YmdHis');
-
-$crmcontactid = $adb->getUniqueID("crmentity");
+$date_entered = date('YmdHis');
+$date_modified = date('YmdHis');
+
+//Saving Contact - starts
+$crmcontactid = $adb->getUniqueID("vtiger_crmentity");
 $sql_crmentity1 = "insert into vtiger_crmentity(crmid,smcreatorid,smownerid,setype,presence,deleted,description,createdtime) values(".$crmcontactid.",".$current_user_id.",".$assigned_user_id.",'Contacts',0,0,'".$row['description']."','".$date_entered."')";
 
 $adb->query($sql_crmentity1);
-
 
 $contact_id = $crmcontactid;
 $log->debug("contact id is ".$contact_id);
 
- $sql_insert_contact = "INSERT INTO vtiger_contactdetails (contactid,accountid,campaignid,salutation,firstname,lastname,email,phone,mobile,title,fax,yahooid) VALUES (".$contact_id.",".$crmid."," .$row["campaignid"]. ",'".$row["salutationtype"] ."','" .$row["firstname"] ."','" .$row["lastname"] ."','" .$row["email"] ."','" .$row["phone"]. "','" .$row["mobile"] ."','" .$row["designation"] ."','".$row["fax"] ."','".$row['yahooid']."')";
+$sql_insert_contact = "INSERT INTO vtiger_contactdetails (contactid,accountid,campaignid,salutation,firstname,lastname,email,phone,mobile,title,fax,yahooid) VALUES (".$contact_id.",".$crmid.",'".$row["campaignid"]. "','".$row["salutationtype"] ."','" .$row["firstname"] ."','" .$row["lastname"] ."','" .$row["email"] ."','" .$row["phone"]. "','" .$row["mobile"] ."','" .$row["designation"] ."','".$row["fax"] ."','".$row['yahooid']."')";
 
 $adb->query($sql_insert_contact);
 
 
- $sql_insert_contactsubdetails = "INSERT INTO vtiger_contactsubdetails (contactsubscriptionid,homephone,otherphone,leadsource) VALUES (".$contact_id.",'','','".$row['leadsource']."')";
+$sql_insert_contactsubdetails = "INSERT INTO vtiger_contactsubdetails (contactsubscriptionid,homephone,otherphone,leadsource) VALUES (".$contact_id.",'','','".$row['leadsource']."')";
 
 $adb->query($sql_insert_contactsubdetails);
 
- $sql_insert_contactaddress = "INSERT INTO vtiger_contactaddress (contactaddressid,mailingcity,mailingstreet,mailingstate,mailingcountry,mailingzip) VALUES (".$contact_id.",'".$row["city"] ."','" .$row["lane"] ."','".$row['state']."','" .$row["country"] ."','".$row['code']."')";
+$sql_insert_contactaddress = "INSERT INTO vtiger_contactaddress (contactaddressid,mailingcity,mailingstreet,mailingstate,mailingcountry,mailingzip) VALUES (".$contact_id.",'".$row["city"] ."','" .$row["lane"] ."','".$row['state']."','" .$row["country"] ."','".$row['code']."')";
 
 $adb->query($sql_insert_contactaddress);
 
@@ -301,21 +299,22 @@
 $sql_insert_contactcustomfield = "INSERT INTO vtiger_contactscf (".$insert_column.") VALUES (".$insert_value.")";
 
 $adb->query($sql_insert_contactcustomfield);
-//
+//Saving Contact - ends
 
 getRelatedActivities($acccount_id,$contact_id); //To convert relates Activites  and Email -Jaguar
 
+//Saving Potential - starts
 if(! isset($createpotential) || ! $createpotential == "on")
 {
-   $log->info("createpotential is not set");
-  $date_entered = date('YmdHis');
-  $date_modified = date('YmdHis');
+	$log->info("createpotential is not set");
+	$date_entered = date('YmdHis');
+	$date_modified = date('YmdHis');
   
 
-  $oppid = $adb->getUniqueID("crmentity");
-  $sql_crmentity = "insert into vtiger_crmentity(crmid,smcreatorid,smownerid,setype,presence,deleted,createdtime,description) values(".$oppid.",".$current_user_id.",".$assigned_user_id.",'Potentials',0,0,'".$date_entered."','".$row['description']."')";
+	$oppid = $adb->getUniqueID("vtiger_crmentity");
+	$sql_crmentity = "insert into vtiger_crmentity(crmid,smcreatorid,smownerid,setype,presence,deleted,createdtime,description) values(".$oppid.",".$current_user_id.",".$assigned_user_id.",'Potentials',0,0,'".$date_entered."','".$row['description']."')";
   
-  $adb->query($sql_crmentity);
+	$adb->query($sql_crmentity);
 
 
 	if(!isset($potential_amount) || $potential_amount == null)
@@ -323,11 +322,11 @@
 		$potential_amount=0;
         }
 
-	$sql_insert_opp = "INSERT INTO vtiger_potential (potentialid,accountid,campaignid,potentialname,leadsource,closingdate,sales_stage,amount) VALUES (".$oppid.",".$crmid .",".$row["campaignid"]. ",'".$potential_name."','".$row['leadsource']."','".$close_date."','".$potential_sales_stage."',".$potential_amount.")";
+	$sql_insert_opp = "INSERT INTO vtiger_potential (potentialid,accountid,campaignid,potentialname,leadsource,closingdate,sales_stage,amount) VALUES (".$oppid.",".$crmid .",'".$row["campaignid"]. "','".addslashes($potential_name)."','".$row['leadsource']."','".$close_date."','".$potential_sales_stage."',".$potential_amount.")";
 
 	$adb->query($sql_insert_opp);
 
-//Getting the customfield values from leads and inserting into the respected PotentialCustomfield to which it is mapped - Jaguar
+	//Getting the customfield values from leads and inserting into the respected PotentialCustomfield to which it is mapped - Jaguar
 	$insert_column="potentialid";
 	$insert_value=$oppid;
 	$val= getInsertValues("Potentials",$oppid);
@@ -340,15 +339,14 @@
 	$insert_value.=$val[1];
 
 	$sql_insert_potentialcustomfield = "INSERT INTO vtiger_potentialscf (".$insert_column.") VALUES (".$insert_value.")";
-//
 
 	$adb->query($sql_insert_potentialcustomfield);
-        $sql_insert2contpotentialrel ="insert into vtiger_contpotentialrel values(".$contact_id.",".$oppid .")";
-        
+
+	$sql_insert2contpotentialrel ="insert into vtiger_contpotentialrel values(".$contact_id.",".$oppid .")";
         $adb->query($sql_insert2contpotentialrel);
-
-	
 }
+//Saving Potential - ends
+
 
 //Deleting from the vtiger_tracker
 $sql_delete_tracker= "DELETE from vtiger_tracker where item_id='" .$id ."'";



From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 19 08:27:07 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 19 Jun 2006 15:27:07 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23749=3A_?=
 =?utf-8?q?Bugs_with_apostrophes_in_Lead_conversion_and_Helpdesk_ticket?=
In-Reply-To: <076.6c5a8e4857db1ceb5cdfe4078eda9b17@vtiger.fosslabs.com>
References: <076.6c5a8e4857db1ceb5cdfe4078eda9b17@vtiger.fosslabs.com>
Message-ID: <085.aa08b51171ca38866b604bd9bfeedfbc@vtiger.fosslabs.com>

#749: Bugs with apostrophes in Lead conversion and Helpdesk ticket
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  mickie               
      Type:  defect     |      Status:  closed               
  Priority:  major      |   Milestone:                       
 Component:  vtigercrm  |     Version:  5.0.0                
Resolution:  fixed      |    Keywords:  apostrophe conversion
------------------------+---------------------------------------------------
Changes (by mickie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 These issues have been fixed.Now we can save account and contact with
 special characters in convert lead.

 Also in ticket module we can save the comments event the title contains
 special characters.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/749>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 19 08:50:05 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 19 Jun 2006 15:50:05 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7267 -
	/vtigercrm/trunk/modules/Users/add2db.php
Message-ID: <20060619155005.374DB83F084@vtiger.fosslabs.com>

Author: richie
Date: Mon Jun 19 09:48:57 2006
New Revision: 7267

Log:
fixed vtiger_ table prefixing issues

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

Modified: vtigercrm/trunk/modules/Users/add2db.php
==============================================================================
--- vtigercrm/trunk/modules/Users/add2db.php (original)
+++ vtigercrm/trunk/modules/Users/add2db.php Mon Jun 19 09:48:57 2006
@@ -108,8 +108,8 @@
   {
     include('themes/'.$theme.'/header.php');
     include "upload.php";
-    //$errormessage = "<B><font color='red'>Sorry, the uploaded file exceeds the maximum vtiger_filesize limit. Please try a smaller file</font></B> <br>";
-	echo "<script>alert('Sorry, the uploaded file exceeds the maximum vtiger_filesize limit. Please try a smaller file')</script>";	
+    //$errormessage = "<B><font color='red'>Sorry, the uploaded file exceeds the maximum filesize limit. Please try a smaller file</font></B> <br>";
+	echo "<script>alert('Sorry, the uploaded file exceeds the maximum filesize limit. Please try a smaller file')</script>";	
     //echo $errormessage;
     //echo $errorCode;
   }



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 19 08:59:13 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 19 Jun 2006 15:59:13 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7268 -
	/vtigercrm/trunk/modules/Users/ChangePassword.php
Message-ID: <20060619155913.09530802E29@vtiger.fosslabs.com>

Author: richie
Date: Mon Jun 19 09:58:59 2006
New Revision: 7268

Log:
fixed vtiger_ prefixing issues

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

Modified: vtigercrm/trunk/modules/Users/ChangePassword.php
==============================================================================
--- vtigercrm/trunk/modules/Users/ChangePassword.php (original)
+++ vtigercrm/trunk/modules/Users/ChangePassword.php Mon Jun 19 09:58:59 2006
@@ -88,17 +88,17 @@
 <?php if (!is_admin($current_user)) {
 	echo "<tr>";
 	echo "<td width='40%' class='dvtCellLabel' align='right'><b>".$mod_strings['LBL_OLD_PASSWORD']."</b></td>\n";
-	echo "<td width='60%' class='dvtCellInfo'><input name='old_password' type='password' vtiger_tabindex='1' size='15' maxlength='15'></td>\n";
+	echo "<td width='60%' class='dvtCellInfo'><input name='old_password' type='password' tabindex='1' size='15' maxlength='15'></td>\n";
 	echo "<input name='is_admin' type='hidden' value='1'>";
 	echo "</tr><tr>\n";
 }
 else echo "<input name='old_password' type='hidden'><input name='is_admin' type='hidden' value='0'>";
 ?>
 <td width='40%' class='dvtCellLabel' nowrap align="right"><b><?php echo $mod_strings['LBL_NEW_PASSWORD']; ?></b></td>
-<td width='60%' class='dvtCellInfo'><input name='new_password' type='password' vtiger_tabindex='1' size='15' maxlength='15'></td>
+<td width='60%' class='dvtCellInfo'><input name='new_password' type='password' tabindex='1' size='15' maxlength='15'></td>
 </tr><tr>
 <td width='40%' class='dvtCellLabel' nowrap align="right"><b><?php echo $mod_strings['LBL_CONFIRM_PASSWORD']; ?></b></td>
-<td width='60%' class='dvtCellInfo'><input name='confirm_new_password' type='password' vtiger_tabindex='1' size='15' maxlength='15'></td>
+<td width='60%' class='dvtCellInfo'><input name='confirm_new_password' type='password' tabindex='1' size='15' maxlength='15'></td>
 </tr><tr>
 <td width='40%' class='dataLabel'></td>
 <td width='60%' class='dvtCellInfo'></td>



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 19 09:17:37 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 19 Jun 2006 16:17:37 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7269 - in
 /vtigercrm/trunk/modules/Users: CreateProfile.php CreateProfile1.php
Message-ID: <20060619161737.76F3C433AD7@vtiger.fosslabs.com>

Author: richie
Date: Mon Jun 19 10:17:26 2006
New Revision: 7269

Log:
fixed vtiger_ issues

Modified:
    vtigercrm/trunk/modules/Users/CreateProfile.php
    vtigercrm/trunk/modules/Users/CreateProfile1.php

Modified: vtigercrm/trunk/modules/Users/CreateProfile.php
==============================================================================
--- vtigercrm/trunk/modules/Users/CreateProfile.php (original)
+++ vtigercrm/trunk/modules/Users/CreateProfile.php Mon Jun 19 10:17:26 2006
@@ -33,7 +33,7 @@
 if(isset($_REQUEST['profileid']) && $_REQUEST['profileid'] != '')
 {
 	global $adb;	
-	$sql = "select * from vtiger_profile where vtiger_profileid=".$_REQUEST['profileid'];
+	$sql = "select * from vtiger_profile where profileid=".$_REQUEST['profileid'];
 	$profileResult = $adb->query($sql);
 	$profile_name = $adb->query_result($profileResult,0,"profilename");
 	$profile_description = $adb->query_result($profileResult,0,"description");

Modified: vtigercrm/trunk/modules/Users/CreateProfile1.php
==============================================================================
--- vtigercrm/trunk/modules/Users/CreateProfile1.php (original)
+++ vtigercrm/trunk/modules/Users/CreateProfile1.php Mon Jun 19 10:17:26 2006
@@ -18,7 +18,7 @@
 
 if(isset($_REQUEST['dup_check']) && $_REQUEST['dup_check']!='')
 {
-        $query = 'select vtiger_profilename from vtiger_profile where vtiger_profilename="'.$profilename.'"';
+        $query = 'select profilename from vtiger_profile where profilename="'.$profilename.'"';
         $result = $adb->query($query);
 
         if($adb->num_rows($result) > 0)



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 19 09:20:48 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 19 Jun 2006 16:20:48 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7270 -
 /vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php
Message-ID: <20060619162048.E85C9433AD7@vtiger.fosslabs.com>

Author: richie
Date: Mon Jun 19 10:20:38 2006
New Revision: 7270

Log:
fixed vtiger_prefix issues

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

Modified: vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php
==============================================================================
--- vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php (original)
+++ vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php Mon Jun 19 10:20:38 2006
@@ -1413,7 +1413,7 @@
 	global $adb;
 	require('user_privileges/sharing_privileges_'.$userid.'.php');
 	//Deleting from the existing vtiger_tables
-	$table_arr=Array('tmp_read_user_sharing_per', 'tmp_write_user_sharing_per','tmp_read_group_sharing_per','tmp_write_group_sharing_per','tmp_read_user_rel_sharing_per','tmp_write_user_rel_sharing_per','tmp_read_group_rel_sharing_per','tmp_write_group_rel_sharing_per');
+	$table_arr=Array('vtiger_tmp_read_user_sharing_per', 'vtiger_tmp_write_user_sharing_per','vtiger_tmp_read_group_sharing_per','vtiger_tmp_write_group_sharing_per','vtiger_tmp_read_user_rel_sharing_per','vtiger_tmp_write_user_rel_sharing_per','vtiger_tmp_read_group_rel_sharing_per','vtiger_tmp_write_group_rel_sharing_per');
 	foreach($table_arr as $tabname)
 	{
 		$query = "delete from ".$tabname." where userid=".$userid;
@@ -1454,12 +1454,12 @@
 	{
 		if($pertype =='read')
 		{
-			$table_name='tmp_read_user_sharing_per';
+			$table_name='vtiger_tmp_read_user_sharing_per';
 			$var_name=$module.'_share_read_permission';
 		}
 		elseif($pertype == 'write')
 		{
-			$table_name='tmp_write_user_sharing_per';
+			$table_name='vtiger_tmp_write_user_sharing_per';
 			$var_name=$module.'_share_write_permission';
 		}
 		$var_name_arr=$$var_name;	
@@ -1502,12 +1502,12 @@
 	{
 		if($pertype =='read')
 		{
-			$table_name='tmp_read_group_sharing_per';
+			$table_name='vtiger_tmp_read_group_sharing_per';
 			$var_name=$module.'_share_read_permission';
 		}
 		elseif($pertype == 'write')
 		{
-			$table_name='tmp_write_group_sharing_per';
+			$table_name='vtiger_tmp_write_group_sharing_per';
 			$var_name=$module.'_share_write_permission';
 		}
 		$var_name_arr=$$var_name;
@@ -1542,12 +1542,12 @@
 	{
 		if($pertype =='read')
 		{
-			$table_name='tmp_read_user_rel_sharing_per';
+			$table_name='vtiger_tmp_read_user_rel_sharing_per';
 			$var_name=$module.'_'.$relmodule.'_share_read_permission';
 		}
 		elseif($pertype == 'write')
 		{
-			$table_name='tmp_write_user_rel_sharing_per';
+			$table_name='vtiger_tmp_write_user_rel_sharing_per';
 			$var_name=$module.'_'.$relmodule.'_share_write_permission';
 		}
 		$var_name_arr=$$var_name;	
@@ -1590,12 +1590,12 @@
 	{
 		if($pertype =='read')
 		{
-			$table_name='tmp_read_group_rel_sharing_per';
+			$table_name='vtiger_tmp_read_group_rel_sharing_per';
 			$var_name=$module.'_'.$relmodule.'_share_read_permission';
 		}
 		elseif($pertype == 'write')
 		{
-			$table_name='tmp_write_group_rel_sharing_per';
+			$table_name='vtiger_tmp_write_group_rel_sharing_per';
 			$var_name=$module.'_'.$relmodule.'_share_write_permission';
 		}
 		$var_name_arr=$$var_name;



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 19 09:22:15 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 19 Jun 2006 16:22:15 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7271 -
	/vtigercrm/trunk/modules/Users/Delete.php
Message-ID: <20060619162215.754725E3B9C@vtiger.fosslabs.com>

Author: richie
Date: Mon Jun 19 10:22:03 2006
New Revision: 7271

Log:
fixed vtiger_ prefix issues

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

Modified: vtigercrm/trunk/modules/Users/Delete.php
==============================================================================
--- vtigercrm/trunk/modules/Users/Delete.php (original)
+++ vtigercrm/trunk/modules/Users/Delete.php Mon Jun 19 10:22:03 2006
@@ -10,7 +10,7 @@
  ********************************************************************************/
 
 
-$sql= 'delete from vtiger_salesmanactivityrel where smid='.$_REQUEST['record'].' and vtiger_activityid = '.$_REQUEST['return_id'];
+$sql= 'delete from vtiger_salesmanactivityrel where smid='.$_REQUEST['record'].' and activityid = '.$_REQUEST['return_id'];
 $adb->query($sql);
 
 if($_REQUEST['return_module'] == 'Activities')



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 19 09:29:14 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 19 Jun 2006 16:29:14 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7272 - in
 /vtigercrm/trunk/modules/Users: LoginHistory.php RoleDragDrop.php
 SaveOrgSharing.php SaveProfile.php SaveRole.php TabCustomise.php
 UpdateDefaultFieldLevelAccess.php UpdateProfileChanges.php UsersAjax.php
 massChangeStatus.php
Message-ID: <20060619162915.7A7CC5E3B9C@vtiger.fosslabs.com>

Author: richie
Date: Mon Jun 19 10:28:50 2006
New Revision: 7272

Log:
fixed the vtiger_ prefix issues

Modified:
    vtigercrm/trunk/modules/Users/LoginHistory.php
    vtigercrm/trunk/modules/Users/RoleDragDrop.php
    vtigercrm/trunk/modules/Users/SaveOrgSharing.php
    vtigercrm/trunk/modules/Users/SaveProfile.php
    vtigercrm/trunk/modules/Users/SaveRole.php
    vtigercrm/trunk/modules/Users/TabCustomise.php
    vtigercrm/trunk/modules/Users/UpdateDefaultFieldLevelAccess.php
    vtigercrm/trunk/modules/Users/UpdateProfileChanges.php
    vtigercrm/trunk/modules/Users/UsersAjax.php
    vtigercrm/trunk/modules/Users/massChangeStatus.php

Modified: vtigercrm/trunk/modules/Users/LoginHistory.php
==============================================================================
--- vtigercrm/trunk/modules/Users/LoginHistory.php (original)
+++ vtigercrm/trunk/modules/Users/LoginHistory.php Mon Jun 19 10:28:50 2006
@@ -31,7 +31,7 @@
 	var $status;
 	var $module_name = "Users";
 
-	var $table_name = "loginhistory";
+	var $table_name = "vtiger_loginhistory";
 
 	var $object_name = "LoginHistory";
 	

Modified: vtigercrm/trunk/modules/Users/RoleDragDrop.php
==============================================================================
--- vtigercrm/trunk/modules/Users/RoleDragDrop.php (original)
+++ vtigercrm/trunk/modules/Users/RoleDragDrop.php Mon Jun 19 10:28:50 2006
@@ -15,7 +15,7 @@
 
 
 global $adb;
-$query = "select * from vtiger_role where vtiger_roleid='".$toid."'";
+$query = "select * from vtiger_role where roleid='".$toid."'";
 $result=$adb->query($query);
 $parentRoleList=$adb->query_result($result,0,'parentrole');
 $replace_with=$parentRoleList;
@@ -50,7 +50,7 @@
 	$mvParString=$replace_with.$subPar[1];
 	$subDepth=$mvRoleInfo[2];
 	$mvDepth=$orgDepth+(($subDepth-$stdDepth)+1);
-	$query="update vtiger_role set parentrole='".$mvParString."',depth=".$mvDepth." where vtiger_roleid='".$mvRoleId."'";
+	$query="update vtiger_role set parentrole='".$mvParString."',depth=".$mvDepth." where roleid='".$mvRoleId."'";
 	//echo $query;
 	$adb->query($query);
 		

Modified: vtigercrm/trunk/modules/Users/SaveOrgSharing.php
==============================================================================
--- vtigercrm/trunk/modules/Users/SaveOrgSharing.php (original)
+++ vtigercrm/trunk/modules/Users/SaveOrgSharing.php Mon Jun 19 10:28:50 2006
@@ -22,19 +22,19 @@
 	$tabid=$adb->query_result($result2,$i,'tabid');
 		$reqval = $tabid.'_per';	
 		$permission=$_REQUEST[$reqval];
-		$sql7="update vtiger_def_org_share set permission=".$permission." where vtiger_tabid=".$tabid." and ruleid=".$ruleid;
+		$sql7="update vtiger_def_org_share set permission=".$permission." where tabid=".$tabid." and ruleid=".$ruleid;
 		$adb->query($sql7);
 
 		if($tabid == 6)
 		{
-			$sql8="update vtiger_def_org_share set permission=".$permission." where vtiger_tabid=4";
+			$sql8="update vtiger_def_org_share set permission=".$permission." where tabid=4";
 			$adb->query($sql8);
 			
 		}
 
 		if($tabid == 9)
 		{
-			$sql8="update vtiger_def_org_share set permission=".$permission." where vtiger_tabid=16";
+			$sql8="update vtiger_def_org_share set permission=".$permission." where tabid=16";
 			$adb->query($sql8);
 			
 		}

Modified: vtigercrm/trunk/modules/Users/SaveProfile.php
==============================================================================
--- vtigercrm/trunk/modules/Users/SaveProfile.php (original)
+++ vtigercrm/trunk/modules/Users/SaveProfile.php Mon Jun 19 10:28:50 2006
@@ -28,9 +28,9 @@
 
 
 //Retreiving the vtiger_tabs permission array
-$tab_perr_result = $adb->query("select * from vtiger_profile2tab where vtiger_profileid=1");
-$act_perr_result = $adb->query("select * from vtiger_profile2standardpermissions where vtiger_profileid=1");
-$act_utility_result = $adb->query("select * from vtiger_profile2utility where vtiger_profileid=1");
+$tab_perr_result = $adb->query("select * from vtiger_profile2tab where profileid=1");
+$act_perr_result = $adb->query("select * from vtiger_profile2standardpermissions where profileid=1");
+$act_utility_result = $adb->query("select * from vtiger_profile2utility where profileid=1");
 $num_tab_per = $adb->num_rows($tab_perr_result);
 $num_act_per = $adb->num_rows($act_perr_result);
 $num_act_util_per = $adb->num_rows($act_utility_result);

Modified: vtigercrm/trunk/modules/Users/SaveRole.php
==============================================================================
--- vtigercrm/trunk/modules/Users/SaveRole.php (original)
+++ vtigercrm/trunk/modules/Users/SaveRole.php Mon Jun 19 10:28:50 2006
@@ -17,12 +17,12 @@
 {
 	if($mode != 'edit')
 	{
-		$query = 'select vtiger_rolename from vtiger_role where vtiger_rolename="'.$rolename.'"';
+		$query = 'select rolename from vtiger_role where rolename="'.$rolename.'"';
 	}
 	else
 	{
 		$roleid=$_REQUEST['roleid'];
-		$query = 'select vtiger_rolename from vtiger_role where vtiger_rolename="'.$rolename.'" and vtiger_roleid !="'.$roleid.'"';
+		$query = 'select rolename from vtiger_role where rolename="'.$rolename.'" and roleid !="'.$roleid.'"';
 
 	}
 	$result = $adb->query($query);

Modified: vtigercrm/trunk/modules/Users/TabCustomise.php
==============================================================================
--- vtigercrm/trunk/modules/Users/TabCustomise.php (original)
+++ vtigercrm/trunk/modules/Users/TabCustomise.php Mon Jun 19 10:28:50 2006
@@ -154,7 +154,7 @@
 </style>
 </head>
 <?
-		$tabavail="SELECT vtiger_tabid,name from vtiger_tab where presence !=2";
+		$tabavail="SELECT tabid,name from vtiger_tab where presence !=2";
 		$tabrow=$adb->query($tabavail);
 		if($adb->num_rows($tabrow) != 0)
 		{
@@ -163,7 +163,7 @@
 				$availabletab[]=$result;
 			}
 		}	
-		$tabsel="SELECT vtiger_tabid,name from vtiger_tab where presence=0 order by vtiger_tabsequence";
+		$tabsel="SELECT tabid,name from vtiger_tab where presence=0 order by tabsequence";
 		$tabrow=$adb->query($tabsel);
 		if($adb->num_rows($tabrow) != 0)
 		{

Modified: vtigercrm/trunk/modules/Users/UpdateDefaultFieldLevelAccess.php
==============================================================================
--- vtigercrm/trunk/modules/Users/UpdateDefaultFieldLevelAccess.php (original)
+++ vtigercrm/trunk/modules/Users/UpdateDefaultFieldLevelAccess.php Mon Jun 19 10:28:50 2006
@@ -40,7 +40,7 @@
 		}		
 
 		//Updating the database
-		$update_query = "update vtiger_def_org_field set visible=".$visible_value." where vtiger_fieldid='".$fieldid."' and vtiger_tabid=".$tab_id;
+		$update_query = "update vtiger_def_org_field set visible=".$visible_value." where fieldid='".$fieldid."' and tabid=".$tab_id;
 		$adb->query($update_query);
 
 	}

Modified: vtigercrm/trunk/modules/Users/UpdateProfileChanges.php
==============================================================================
--- vtigercrm/trunk/modules/Users/UpdateProfileChanges.php (original)
+++ vtigercrm/trunk/modules/Users/UpdateProfileChanges.php Mon Jun 19 10:28:50 2006
@@ -23,9 +23,9 @@
 	$return_action = 'ListProfiles';
 
 //Retreiving the vtiger_tabs permission array
-$tab_perr_result = $adb->query("select * from vtiger_profile2tab where vtiger_profileid=".$profileid);
-$act_perr_result = $adb->query("select * from vtiger_profile2standardpermissions where vtiger_profileid=".$profileid);
-$act_utility_result = $adb->query("select * from vtiger_profile2utility where vtiger_profileid=".$profileid);
+$tab_perr_result = $adb->query("select * from vtiger_profile2tab where profileid=".$profileid);
+$act_perr_result = $adb->query("select * from vtiger_profile2standardpermissions where profileid=".$profileid);
+$act_utility_result = $adb->query("select * from vtiger_profile2utility where profileid=".$profileid);
 $num_tab_per = $adb->num_rows($tab_perr_result);
 $num_act_per = $adb->num_rows($act_perr_result);
 $num_act_util_per = $adb->num_rows($act_utility_result);
@@ -37,9 +37,9 @@
 	$edit_all_req=$_REQUEST['edit_all'];
 	$edit_all = getPermissionValue($edit_all_req);
 
-	$update_query = "update  vtiger_profile2globalpermissions set globalactionpermission=".$view_all." where globalactionid=1 and vtiger_profileid=".$profileid;
+	$update_query = "update  vtiger_profile2globalpermissions set globalactionpermission=".$view_all." where globalactionid=1 and profileid=".$profileid;
 	$adb->query($update_query);
-	$update_query = "update  vtiger_profile2globalpermissions set globalactionpermission=".$edit_all." where globalactionid=2 and vtiger_profileid=".$profileid;
+	$update_query = "update  vtiger_profile2globalpermissions set globalactionpermission=".$edit_all." where globalactionid=2 and profileid=".$profileid;
 	$adb->query($update_query);
 
 	
@@ -59,11 +59,11 @@
 			{
 				$permission_value = 1;
 			}
-			$update_query = "update vtiger_profile2tab set permissions=".$permission_value." where vtiger_tabid=".$tab_id." and vtiger_profileid=".$profileid;
+			$update_query = "update vtiger_profile2tab set permissions=".$permission_value." where tabid=".$tab_id." and profileid=".$profileid;
 			$adb->query($update_query);
 			if($tab_id ==9)
 			{
-				$update_query = "update vtiger_profile2tab set permissions=".$permission_value." where vtiger_tabid=16 and vtiger_profileid=".$profileid;
+				$update_query = "update vtiger_profile2tab set permissions=".$permission_value." where tabid=16 and profileid=".$profileid;
 				$adb->query($update_query);
 			}
 		}
@@ -99,11 +99,11 @@
 			{
 				$permission_value = 1;
 			}
-			$update_query = "update vtiger_profile2standardpermissions set permissions=".$permission_value." where vtiger_tabid=".$tab_id." and Operation=".$action_id." and vtiger_profileid=".$profileid;
+			$update_query = "update vtiger_profile2standardpermissions set permissions=".$permission_value." where tabid=".$tab_id." and Operation=".$action_id." and profileid=".$profileid;
 			$adb->query($update_query);
 			if($tab_id ==9)
 			{
-				$update_query = "update vtiger_profile2standardpermissions set permissions=".$permission_value." where vtiger_tabid=16 and Operation=".$action_id." and vtiger_profileid=".$profileid;
+				$update_query = "update vtiger_profile2standardpermissions set permissions=".$permission_value." where tabid=16 and Operation=".$action_id." and profileid=".$profileid;
 				$adb->query($update_query);
 			}
 
@@ -132,7 +132,7 @@
 			$permission_value = 1;
 		}
 
-		$update_query = "update vtiger_profile2utility set permission=".$permission_value." where vtiger_tabid=".$tab_id." and vtiger_activityid=".$action_id." and vtiger_profileid=".$profileid;
+		$update_query = "update vtiger_profile2utility set permission=".$permission_value." where tabid=".$tab_id." and activityid=".$action_id." and profileid=".$profileid;
 
 		$adb->query($update_query);
 
@@ -167,7 +167,7 @@
 			$visible_value = 0;
 		}
 		//Updating the database
-		$update_query = "update vtiger_profile2field set visible=".$visible_value." where vtiger_fieldid='".$fieldid."' and vtiger_profileid=".$profileid." and vtiger_tabid=".$tab_id;
+		$update_query = "update vtiger_profile2field set visible=".$visible_value." where fieldid='".$fieldid."' and profileid=".$profileid." and tabid=".$tab_id;
 		$adb->query($update_query);
 
 	}

Modified: vtigercrm/trunk/modules/Users/UsersAjax.php
==============================================================================
--- vtigercrm/trunk/modules/Users/UsersAjax.php (original)
+++ vtigercrm/trunk/modules/Users/UsersAjax.php Mon Jun 19 10:28:50 2006
@@ -41,7 +41,7 @@
 	$sql="select * from vtiger_announcement where creatorid=".$current_user->id;
 	$is_announce=$adb->query($sql);
 	if($adb->num_rows($is_announce) > 0)
-		$query="update vtiger_announcement set vtiger_announcement=".$adb->formatString("announcement","announcement",$announcement).",time=".$adb->formatString("announcement","time",$date_var).",title='announcement' where creatorid=".$current_user->id;
+		$query="update vtiger_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 vtiger_announcement values (".$current_user->id.",".$adb->formatString("announcement","announcement",$announcement).",'announcement','".$date_var."')";
 	$result=$adb->query($query);

Modified: vtigercrm/trunk/modules/Users/massChangeStatus.php
==============================================================================
--- vtigercrm/trunk/modules/Users/massChangeStatus.php (original)
+++ vtigercrm/trunk/modules/Users/massChangeStatus.php Mon Jun 19 10:28:50 2006
@@ -39,7 +39,7 @@
 }
 function updateStatus()
 {
-	var vtiger_leadstatusvalue=document.setLeadStatus.lead_status.value
+	var leadstatusvalue=document.setLeadStatus.lead_status.value
 	//alert(leadstatusvalue);
 	document.setLeadStatus.leadval.value=leadstatusvalue;
 	document.setLeadStatus.action="index.php?module=Users&action=updateLeadDBStatus"



From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 19 10:44:30 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 19 Jun 2006 17:44:30 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23895=3A_?=
 =?utf-8?q?inconsistency_attachment_=26_notes_in_relatedlist?=
In-Reply-To: <076.79c7c9588e335e83363cae55ee4ba916@vtiger.fosslabs.com>
References: <076.79c7c9588e335e83363cae55ee4ba916@vtiger.fosslabs.com>
Message-ID: <085.9f6772222233b71bd842700e408d402b@vtiger.fosslabs.com>

#895: inconsistency attachment & notes in relatedlist
------------------------+---------------------------------------------------
  Reporter:  mickie     |       Owner:  mickie
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mickie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 Edit and delete links are provided for all modules.

 Regarding subject column, for attachment we have only desctiption and the
 Attachments string is displayed in Type column. so there is no need to
 display the string Attachments in the subject column.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/895>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 19 12:09:51 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 19 Jun 2006 19:09:51 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7273 -
 /vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php
Message-ID: <20060619190951.29BE3298FCE@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 19 13:09:47 2006
New Revision: 7273

Log:
* Modified to related all the lead related products to account, contact and potential

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

Modified: vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php (original)
+++ vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php Mon Jun 19 13:09:47 2006
@@ -27,14 +27,7 @@
 $potential_sales_stage = $_REQUEST['potential_sales_stage'];
 
 global $log;
-$log->debug("id is ".$id);
-$log->debug("assigned_user_id is ".$assigned_user_id);
-$log->debug("createpotential is ".$createpotential);
-$log->debug("close date is ".$close_date);
-$log->debug("current user id is ".$current_user_id);
-$log->debug("assigned user id is ".$assigned_user_id);
-$log->debug("accountname is ".$accountname);
-$log->debug("module is ".$module);
+$log->debug("id = $id \n assigned_user_id = $assigned_user_id \n createpotential = $createpotential \n close date = $close_date \n current user id = $current_user_id \n accountname = $accountname \n module = $module");
 
 $check_unit = explode("-",$potential_name);
 if($check_unit[1] == "")
@@ -46,13 +39,9 @@
 
 //get all the lead related columns 
 $row = $focus->column_fields;
-$date_entered;
-$date_modified;
 
 $date_entered = date('YmdHis');
 $date_modified = date('YmdHis');
-
-$crmid = $adb->getUniqueID("vtiger_crmentity");
 
 //function for getting the custom values from leads and saving to vtiger_account/contact/potential custom vtiger_fields -Jag
 function getInsertValues($type,$type_id)
@@ -220,23 +209,48 @@
 
 }
 
+/**	Function used to save the lead related products with other entities Account, Contact and Potential
+ *	$leadid - leadid
+ *	$relatedid - related entity id (accountid/contactid/potentialid)
+ *	$relatedmodule - related entity module name - optional, but for contacts we have to pass Contact because we have to update contactid in vtiger_products table.
+ */
+function saveLeadRelatedProducts($leadid, $relatedid, $relatedmodule = '')
+{
+	global $adb, $log;
+	$log->debug("Entering into function saveLeadRelatedProducts($leadid, $relatedid, \"$relatedmodule\")");
+
+	$product_result = $adb->query("select * from vtiger_seproductsrel where crmid=$leadid");
+	$noofproducts = $adb->num_rows($product_result);
+	for($i = 0; $i < $noofproducts; $i++)
+	{
+		$productid = $adb->query_result($product_result,$i,'productid');
+
+		$adb->query("insert into vtiger_seproductsrel (productid, crmid) values($productid, $relatedid)");
+
+		if($relatedmodule == 'Contacts')
+		{
+			//update contactid in products table then only the products will be shown in contact relatedlist
+			$adb->query("update vtiger_products set contactid=$relatedid where productid=$productid");
+		}
+	}
+
+	$log->debug("Exit from function saveLeadRelatedProducts.");
+}
+
+$crmid = $adb->getUniqueID("vtiger_crmentity");
+
 //Saving Account - starts
 $sql_crmentity = "insert into vtiger_crmentity(crmid,smcreatorid,smownerid,setype,presence,createdtime,modifiedtime,deleted,description) values(".$crmid.",".$current_user_id.",".$assigned_user_id.",'Accounts',1,".$date_entered.",".$date_modified.",0,'".$row['description']."')";
-
 $adb->query($sql_crmentity);
 
 $sql_insert_account = "INSERT INTO vtiger_account (accountid,accountname,industry,annualrevenue,phone,fax,rating,email1,website,employees) VALUES (".$crmid.",'".addslashes($accountname)."','".$row["industry"] ."','" .$row["annualrevenue"] ."','" .$row["phone"] ."','".$row["fax"] ."','" .$row["rating"] ."','" .$row["email"] ."','" .$row["website"] ."','" .$row["noofemployees"] ."')";
-
 $adb->query($sql_insert_account);
 
 $sql_insert_accountbillads = "INSERT INTO vtiger_accountbillads (accountaddressid,city,code,country,state,street) VALUES (".$crmid.",'".$row["city"] ."','" .$row["code"] ."','" .$row["country"] ."','".$row["state"] ."','" .$row["lane"]."')";
-
 $adb->query($sql_insert_accountbillads);
 
 
 $sql_insert_accountshipads = "INSERT INTO vtiger_accountshipads (accountaddressid,city,code,country,state,street) VALUES (".$crmid.",'".$row["city"] ."','" .$row["code"] ."','" .$row["country"] ."','".$row["state"] ."','" .$row["lane"]."')";
-
-
 $adb->query($sql_insert_accountshipads);
 
 //Getting the custom vtiger_field values from leads and inserting into Accounts if the vtiger_field is mapped - Jaguar
@@ -251,12 +265,18 @@
 $insert_column.=$val[0];
 $insert_value.=$val[1];
 $sql_insert_accountcustomfield = "INSERT INTO vtiger_accountscf (".$insert_column.") VALUES (".$insert_value.")";
-
 $adb->query($sql_insert_accountcustomfield);
 //Saving Account - ends
 
-$acccount_id=$crmid;
+$account_id=$crmid;
 getRelatedNotesAttachments($id,$crmid); //To Convert Related Notes & Attachments -Jaguar
+
+//Retrieve the lead related products and relate them with this new account
+saveLeadRelatedProducts($id, $crmid);
+
+//Up to this, Account related data save finshed
+
+
 
 $date_entered = date('YmdHis');
 $date_modified = date('YmdHis');
@@ -301,7 +321,16 @@
 $adb->query($sql_insert_contactcustomfield);
 //Saving Contact - ends
 
-getRelatedActivities($acccount_id,$contact_id); //To convert relates Activites  and Email -Jaguar
+getRelatedActivities($account_id,$contact_id); //To convert relates Activites  and Email -Jaguar
+
+//Retrieve the lead related products and relate them with this new contact
+saveLeadRelatedProducts($id, $contact_id, "Contacts");
+
+//Up to this, Contact related data save finshed
+
+
+
+
 
 //Saving Potential - starts
 if(! isset($createpotential) || ! $createpotential == "on")
@@ -344,8 +373,13 @@
 
 	$sql_insert2contpotentialrel ="insert into vtiger_contpotentialrel values(".$contact_id.",".$oppid .")";
         $adb->query($sql_insert2contpotentialrel);
+
+	//Retrieve the lead related products and relate them with this new potential
+	saveLeadRelatedProducts($id, $oppid);
+
 }
 //Saving Potential - ends
+//Up to this, Potential related data save finshed
 
 
 //Deleting from the vtiger_tracker



From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 19 12:11:11 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 19 Jun 2006 19:11:11 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231207=3A?=
 =?utf-8?q?_products_related_to_lead_are_not_carried_over_when_lead_is_con?=
 =?utf-8?q?verted?=
In-Reply-To: <076.029392e9fc29e5d7b21c662647a73612@vtiger.fosslabs.com>
References: <076.029392e9fc29e5d7b21c662647a73612@vtiger.fosslabs.com>
Message-ID: <085.28a5c18403be1e6e839acf0b5100ad2b@vtiger.fosslabs.com>

#1207: products related to lead are not carried over when lead is converted
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  mickie
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mickie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 This issue is fixed as now the products related to lead will be carried
 ie., related to account, contact and potential on Lead conversion.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1207>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 19 13:37:53 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 19 Jun 2006 20:37:53 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7274 - in
 /vtigercrm/trunk/modules: Contacts/Contact.php Emails/Email.php
 Invoice/Invoice.php Products/Product.php PurchaseOrder/PurchaseOrder.php
Message-ID: <20060619203754.3FEF98181FA@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 19 14:37:42 2006
New Revision: 7274

Log:
* Modified the fieldname vtiger_attachmentsid to attachmentsid which is used to get the relatedlist fileid

Modified:
    vtigercrm/trunk/modules/Contacts/Contact.php
    vtigercrm/trunk/modules/Emails/Email.php
    vtigercrm/trunk/modules/Invoice/Invoice.php
    vtigercrm/trunk/modules/Products/Product.php
    vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php

Modified: vtigercrm/trunk/modules/Contacts/Contact.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/Contact.php (original)
+++ vtigercrm/trunk/modules/Contacts/Contact.php Mon Jun 19 14:37:42 2006
@@ -344,7 +344,7 @@
 		$log->debug("Entering get_attachments(".$id.") method ...");
 		$query = "select vtiger_notes.title,'Notes      ' AS ActivityType,
 		vtiger_notes.filename, vtiger_attachments.type AS FileType,crm2.modifiedtime AS lastmodified,
-		vtiger_seattachmentsrel.attachmentsid AS vtiger_attachmentsid, vtiger_notes.notesid AS crmid,
+		vtiger_seattachmentsrel.attachmentsid AS attachmentsid, vtiger_notes.notesid AS crmid,
 			crm2.createdtime, vtiger_notes.notecontent AS description, vtiger_users.user_name
 		from vtiger_notes
 			inner join vtiger_crmentity on vtiger_crmentity.crmid= vtiger_notes.contact_id

Modified: vtigercrm/trunk/modules/Emails/Email.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/Email.php (original)
+++ vtigercrm/trunk/modules/Emails/Email.php Mon Jun 19 14:37:42 2006
@@ -219,7 +219,7 @@
 		$log->debug("Entering get_attachments(".$id.") method ...");
 		$query = "select vtiger_notes.title,'Notes      '  ActivityType, vtiger_notes.filename,
 		vtiger_attachments.type  FileType,crm2.modifiedtime lastmodified,
-		vtiger_seattachmentsrel.attachmentsid vtiger_attachmentsid, vtiger_notes.notesid crmid,
+		vtiger_seattachmentsrel.attachmentsid attachmentsid, vtiger_notes.notesid crmid,
 			crm2.createdtime, vtiger_notes.notecontent description, vtiger_users.user_name
 		from vtiger_notes
 			inner join vtiger_senotesrel on vtiger_senotesrel.notesid= vtiger_notes.notesid
@@ -232,7 +232,7 @@
 		$query .= ' union all ';
 		$query .= "select vtiger_attachments.description title ,'Attachments'  ActivityType,
 		vtiger_attachments.name filename, vtiger_attachments.type FileType,crm2.modifiedtime lastmodified,
-		vtiger_attachments.attachmentsid  vtiger_attachmentsid,vtiger_seattachmentsrel.attachmentsid crmid,
+		vtiger_attachments.attachmentsid  attachmentsid,vtiger_seattachmentsrel.attachmentsid crmid,
 			crm2.createdtime, vtiger_attachments.description, vtiger_users.user_name
 		from vtiger_attachments
 			inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid= vtiger_attachments.attachmentsid

Modified: vtigercrm/trunk/modules/Invoice/Invoice.php
==============================================================================
--- vtigercrm/trunk/modules/Invoice/Invoice.php (original)
+++ vtigercrm/trunk/modules/Invoice/Invoice.php Mon Jun 19 14:37:42 2006
@@ -197,7 +197,7 @@
 		// Inserted order by createdtime desc
 		$query .= "select vtiger_attachments.description  title ,'Attachments'  ActivityType,
 		vtiger_attachments.name filename, vtiger_attachments.type FileType, crm2.modifiedtime lastmodified,
-		vtiger_attachments.attachmentsid vtiger_attachmentsid, vtiger_seattachmentsrel.attachmentsid crmid,
+		vtiger_attachments.attachmentsid attachmentsid, vtiger_seattachmentsrel.attachmentsid crmid,
 			crm2.createdtime, vtiger_attachments.description, vtiger_users.user_name
 		from vtiger_attachments
 			inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid= vtiger_attachments.attachmentsid

Modified: vtigercrm/trunk/modules/Products/Product.php
==============================================================================
--- vtigercrm/trunk/modules/Products/Product.php (original)
+++ vtigercrm/trunk/modules/Products/Product.php Mon Jun 19 14:37:42 2006
@@ -111,7 +111,7 @@
 		$query = "SELECT vtiger_notes.title, 'Notes      ' AS ActivityType,
 			vtiger_notes.filename, vtiger_attachments.type  AS FileType,
 				crm2.modifiedtime AS lastmodified,
-			vtiger_seattachmentsrel.attachmentsid AS vtiger_attachmentsid,
+			vtiger_seattachmentsrel.attachmentsid AS attachmentsid,
 			vtiger_notes.notesid AS crmid, vtiger_crmentity.createdtime,
 			vtiger_notes.notecontent AS description,
 			vtiger_users.user_name
@@ -136,7 +136,7 @@
 			vtiger_attachments.name AS filename,
 			vtiger_attachments.type AS FileType,
 				crm2.modifiedtime AS lastmodified,
-			vtiger_attachments.attachmentsid AS vtiger_attachmentsid,
+			vtiger_attachments.attachmentsid AS attachmentsid,
 			vtiger_seattachmentsrel.attachmentsid AS crmid,
 			vtiger_crmentity.createdtime,
 			vtiger_attachments.description, vtiger_users.user_name

Modified: vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php
==============================================================================
--- vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php (original)
+++ vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php Mon Jun 19 14:37:42 2006
@@ -186,7 +186,7 @@
 		// Inserted inner join vtiger_users on crm2.smcreatorid= vtiger_users.id
 		$query = "select vtiger_notes.title, 'Notes      '  ActivityType, vtiger_notes.filename,
 		vtiger_attachments.type FileType, crm2.modifiedtime lastmodified,
-		vtiger_seattachmentsrel.attachmentsid vtiger_attachmentsid, vtiger_notes.notesid crmid,
+		vtiger_seattachmentsrel.attachmentsid attachmentsid, vtiger_notes.notesid crmid,
 			crm2.createdtime, vtiger_notes.notecontent description, vtiger_users.user_name
 		from vtiger_notes
 			inner join vtiger_senotesrel on vtiger_senotesrel.notesid= vtiger_notes.notesid
@@ -203,7 +203,7 @@
 		// Inserted order by createdtime desc
 		$query .= "select vtiger_attachments.description  title ,'Attachments'  ActivityType,
 		vtiger_attachments.name  filename, vtiger_attachments.type  FileType, crm2.modifiedtime  lastmodified,
-		vtiger_attachments.attachmentsid  vtiger_attachmentsid, vtiger_seattachmentsrel.attachmentsid crmid,
+		vtiger_attachments.attachmentsid  attachmentsid, vtiger_seattachmentsrel.attachmentsid crmid,
 			crm2.createdtime, vtiger_attachments.description, vtiger_users.user_name
 		from vtiger_attachments
 			inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid= vtiger_attachments.attachmentsid



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 19 16:13:36 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 19 Jun 2006 23:13:36 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7275 - in /vtigercrm/trunk:
 Smarty/templates/ modules/Reports/
Message-ID: <20060619231337.3938D83F1B0@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 19 17:13:26 2006
New Revision: 7275

Log:
issues in reports has been fixed

Modified:
    vtigercrm/trunk/Smarty/templates/ReportFilters.tpl
    vtigercrm/trunk/modules/Reports/Delete.php
    vtigercrm/trunk/modules/Reports/Report.js
    vtigercrm/trunk/modules/Reports/ReportColumns.php
    vtigercrm/trunk/modules/Reports/ReportRun.php
    vtigercrm/trunk/modules/Reports/Reports.php
    vtigercrm/trunk/modules/Reports/Save.php
    vtigercrm/trunk/modules/Reports/SaveAndRun.php

Modified: vtigercrm/trunk/Smarty/templates/ReportFilters.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ReportFilters.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ReportFilters.tpl Mon Jun 19 17:13:26 2006
@@ -159,7 +159,7 @@
 		</tbody>
 	</table>
 	</td></tr>
-	<tr><td colspan="2" height="63">&nbsp;</td></tr>
+	<tr><td colspan="2" height="40">&nbsp;</td></tr>
 	</tbody>
 </table>
 {literal}

Modified: vtigercrm/trunk/modules/Reports/Delete.php
==============================================================================
--- vtigercrm/trunk/modules/Reports/Delete.php (original)
+++ vtigercrm/trunk/modules/Reports/Delete.php Mon Jun 19 17:13:26 2006
@@ -34,7 +34,7 @@
 	$idelreportsql = "delete from vtiger_selectquery where queryid=".$reportid;
 	$idelreportsqlresult = $adb->query($idelreportsql);
 
-	$ireportsql = "delete from vtiger_report where vtiger_reportid=".$reportid;
+	$ireportsql = "delete from vtiger_report where reportid=".$reportid;
     $ireportsqlresult = $adb->query($ireportsql);
 }
 ?>

Modified: vtigercrm/trunk/modules/Reports/Report.js
==============================================================================
--- vtigercrm/trunk/modules/Reports/Report.js (original)
+++ vtigercrm/trunk/modules/Reports/Report.js Mon Jun 19 17:13:26 2006
@@ -7,7 +7,6 @@
  * All Rights Reserved.
  *
  ********************************************************************************/
-
 var typeofdata = new Array();
 typeofdata['V'] = ['e','n','s','c','k'];
 typeofdata['N'] = ['e','n','l','g','m','h'];
@@ -159,287 +158,184 @@
 }
 
 function setObjects() 
-        {
-            availListObj=getObj("availList")
-            selectedColumnsObj=getObj("selectedColumns")
-
-            moveupLinkObj=getObj("moveup_link")
-            moveupDisabledObj=getObj("moveup_disabled")
-            movedownLinkObj=getObj("movedown_link")
-            movedownDisabledObj=getObj("movedown_disabled")
-        }
-
-        function addColumn() 
-        {
-            for (i=0;i<selectedColumnsObj.length;i++) 
-            {
-                selectedColumnsObj.options[i].selected=false
-            }
-
-            for (i=0;i<availListObj.length;i++) 
-            {
-                if (availListObj.options[i].selected==true) 
-                {
-                    for (j=0;j<selectedColumnsObj.length;j++) 
-                    {
-                        if (selectedColumnsObj.options[j].value==availListObj.options[i].value) 
-                        {
-                            var rowFound=true
-                            var existingObj=selectedColumnsObj.options[j]
-                            break
-                        }
-                    }
-
-                    if (rowFound!=true) 
-                    {
-                        var newColObj=document.createElement("OPTION")
-                        newColObj.value=availListObj.options[i].value
-                        if (browser_ie) newColObj.innerText=availListObj.options[i].innerText
-                        else if (browser_nn4 || browser_nn6) newColObj.text=availListObj.options[i].text
-                        selectedColumnsObj.appendChild(newColObj)
-                        availListObj.options[i].selected=false
-                        newColObj.selected=true
-                        rowFound=false
-                    } 
-                    else 
-                    {
-                        existingObj.selected=true
-                    }
-                }
-            }
-        }
-
-        function delColumn() 
-        {
-            for (i=0;i<=selectedColumnsObj.options.length;i++) 
-            {
-                if (selectedColumnsObj.options.selectedIndex>=0)
-                selectedColumnsObj.remove(selectedColumnsObj.options.selectedIndex)
-            }
-        }
-                        
-        function formSelectColumnString()
-        {
-            var selectedColStr = "";
-            for (i=0;i<selectedColumnsObj.options.length;i++) 
-            {
-                selectedColStr += selectedColumnsObj.options[i].value + ";";
-            }
-            document.NewReport.selectedColumnsString.value = selectedColStr;
-        }
+{
+	availListObj=getObj("availList")
+	selectedColumnsObj=getObj("selectedColumns")
+
+	moveupLinkObj=getObj("moveup_link")
+	moveupDisabledObj=getObj("moveup_disabled")
+	movedownLinkObj=getObj("movedown_link")
+	movedownDisabledObj=getObj("movedown_disabled")
+}
+
+function addColumn() 
+{
+	for (i=0;i<selectedColumnsObj.length;i++) 
+	{
+		selectedColumnsObj.options[i].selected=false
+	}
+
+	for (i=0;i<availListObj.length;i++) 
+	{
+		if (availListObj.options[i].selected==true) 
+		{
+			for (j=0;j<selectedColumnsObj.length;j++) 
+			{
+				if (selectedColumnsObj.options[j].value==availListObj.options[i].value) 
+				{
+					var rowFound=true
+						var existingObj=selectedColumnsObj.options[j]
+						break
+				}
+			}
+
+			if (rowFound!=true) 
+			{
+				var newColObj=document.createElement("OPTION")
+					newColObj.value=availListObj.options[i].value
+					if (browser_ie) newColObj.innerText=availListObj.options[i].innerText
+					else if (browser_nn4 || browser_nn6) newColObj.text=availListObj.options[i].text
+						selectedColumnsObj.appendChild(newColObj)
+							availListObj.options[i].selected=false
+							newColObj.selected=true
+							rowFound=false
+			} 
+			else 
+			{
+				existingObj.selected=true
+			}
+		}
+	}
+}
+
+function delColumn() 
+{
+	for (i=0;i<=selectedColumnsObj.options.length;i++) 
+	{
+		if (selectedColumnsObj.options.selectedIndex>=0)
+			selectedColumnsObj.remove(selectedColumnsObj.options.selectedIndex)
+	}
+}
+
+function formSelectColumnString()
+{
+	var selectedColStr = "";
+	for (i=0;i<selectedColumnsObj.options.length;i++) 
+	{
+		selectedColStr += selectedColumnsObj.options[i].value + ";";
+	}
+	document.NewReport.selectedColumnsString.value = selectedColStr;
+}
+
+function moveUp() 
+{
+	var currpos=selectedColumnsObj.options.selectedIndex
+		if (currpos>0) 
+		{
+			var prevpos=selectedColumnsObj.options.selectedIndex-1
+
+				if (browser_ie) 
+				{
+					temp=selectedColumnsObj.options[prevpos].innerText
+						selectedColumnsObj.options[prevpos].innerText=selectedColumnsObj.options[currpos].innerText
+						selectedColumnsObj.options[currpos].innerText=temp     
+				} 
+				else if (browser_nn4 || browser_nn6) 
+				{
+					temp=selectedColumnsObj.options[prevpos].text
+						selectedColumnsObj.options[prevpos].text=selectedColumnsObj.options[currpos].text
+						selectedColumnsObj.options[currpos].text=temp
+				}
+			temp=selectedColumnsObj.options[prevpos].value
+				selectedColumnsObj.options[prevpos].value=selectedColumnsObj.options[currpos].value
+				selectedColumnsObj.options[currpos].value=temp
+
+				selectedColumnsObj.options[prevpos].selected=true
+				selectedColumnsObj.options[currpos].selected=false
+		}
+}
+
+function moveDown() 
+{
+	var currpos=selectedColumnsObj.options.selectedIndex
+		if (currpos<selectedColumnsObj.options.length-1)	
+		{
+			var nextpos=selectedColumnsObj.options.selectedIndex+1
+
+				if (browser_ie) 
+				{	
+					temp=selectedColumnsObj.options[nextpos].innerText
+						selectedColumnsObj.options[nextpos].innerText=selectedColumnsObj.options[currpos].innerText
+						selectedColumnsObj.options[currpos].innerText=temp
+				}
+				else if (browser_nn4 || browser_nn6) 
+				{
+					temp=selectedColumnsObj.options[nextpos].text
+						selectedColumnsObj.options[nextpos].text=selectedColumnsObj.options[currpos].text
+						selectedColumnsObj.options[currpos].text=temp
+				}
+			temp=selectedColumnsObj.options[nextpos].value
+				selectedColumnsObj.options[nextpos].value=selectedColumnsObj.options[currpos].value
+				selectedColumnsObj.options[currpos].value=temp
+
+				selectedColumnsObj.options[nextpos].selected=true
+				selectedColumnsObj.options[currpos].selected=false
+		}
+}
+
+function disableMove() 
+{
+	var cnt=0
+		for (i=0;i<selectedColumnsObj.options.length;i++) 
+		{
+			if (selectedColumnsObj.options[i].selected==true)
+				cnt++
+		}
+
+	if (cnt>1) 
+	{
+		moveupLinkObj.style.display=movedownLinkObj.style.display="none"
+			moveupDisabledObj.style.display=movedownDisabledObj.style.display="block"
+	}
+	else 
+	{
+		moveupLinkObj.style.display=movedownLinkObj.style.display="block"
+			moveupDisabledObj.style.display=movedownDisabledObj.style.display="none"
+	}
+}        
+
+
+function hideTabs()
+{
+	var objreportType = getObj('reportType');
+	if(objreportType[0].checked == true)
+	{
+		divarray = new Array('step1','step2','step4','step5');
+	}
+	else
+	{
+		divarray = new Array('step1','step2','step3','step4','step5');
+	}
+}
         
-        function moveUp() 
-        {
-            var currpos=selectedColumnsObj.options.selectedIndex
-            if (currpos>0) 
-            {
-                var prevpos=selectedColumnsObj.options.selectedIndex-1
-		
-                if (browser_ie) 
-                {
-                    temp=selectedColumnsObj.options[prevpos].innerText
-                    selectedColumnsObj.options[prevpos].innerText=selectedColumnsObj.options[currpos].innerText
-                    selectedColumnsObj.options[currpos].innerText=temp     
-                } 
-                else if (browser_nn4 || browser_nn6) 
-                {
-                    temp=selectedColumnsObj.options[prevpos].text
-                    selectedColumnsObj.options[prevpos].text=selectedColumnsObj.options[currpos].text
-                    selectedColumnsObj.options[currpos].text=temp
-                }
-                temp=selectedColumnsObj.options[prevpos].value
-                selectedColumnsObj.options[prevpos].value=selectedColumnsObj.options[currpos].value
-                selectedColumnsObj.options[currpos].value=temp
-	
-            selectedColumnsObj.options[prevpos].selected=true
-            selectedColumnsObj.options[currpos].selected=false
-            }
-        }
-
-        function moveDown() 
-        {
-            var currpos=selectedColumnsObj.options.selectedIndex
-            if (currpos<selectedColumnsObj.options.length-1)	
-            {
-                var nextpos=selectedColumnsObj.options.selectedIndex+1
-
-                if (browser_ie) 
-                {	
-                    temp=selectedColumnsObj.options[nextpos].innerText
-                    selectedColumnsObj.options[nextpos].innerText=selectedColumnsObj.options[currpos].innerText
-                    selectedColumnsObj.options[currpos].innerText=temp
-                }
-                else if (browser_nn4 || browser_nn6) 
-                {
-                    temp=selectedColumnsObj.options[nextpos].text
-                    selectedColumnsObj.options[nextpos].text=selectedColumnsObj.options[currpos].text
-                    selectedColumnsObj.options[currpos].text=temp
-                }
-                temp=selectedColumnsObj.options[nextpos].value
-                selectedColumnsObj.options[nextpos].value=selectedColumnsObj.options[currpos].value
-                selectedColumnsObj.options[currpos].value=temp
-                    
-                selectedColumnsObj.options[nextpos].selected=true
-                selectedColumnsObj.options[currpos].selected=false
-            }
-        }
-
-        function disableMove() 
-        {
-            var cnt=0
-            for (i=0;i<selectedColumnsObj.options.length;i++) 
-            {
-                if (selectedColumnsObj.options[i].selected==true)
-                cnt++
-            }
-
-            if (cnt>1) 
-            {
-                moveupLinkObj.style.display=movedownLinkObj.style.display="none"
-                moveupDisabledObj.style.display=movedownDisabledObj.style.display="block"
-            }
-            else 
-            {
-                moveupLinkObj.style.display=movedownLinkObj.style.display="block"
-                moveupDisabledObj.style.display=movedownDisabledObj.style.display="none"
-            }
-        }        
+function showSaveDialog()
+{    
+	url = "index.php?module=Reports&action=SaveReport";
+	window.open(url,"Save_Report","width=550,height=350,top=20,left=20;toolbar=no,status=no,menubar=no,directories=no,resizable=yes,scrollbar=no")
+}
+    
+function saveAndRunReport()
+{
+	if(selectedColumnsObj.options.length == 0)
+	{
+		alert("Selected Columns cannot be empty");
+		return false;
+	}
+
+	formSelectColumnString();
+	document.NewReport.submit();
+}       
         
-        function selectAction( url )
-        {
-            formSelectColumnString();
-            document.NewReport.action = url;
-            document.NewReport.submit();
-        }
-
-function getOpenerObj(n) {
-
-   return getObj(n,opener.document)
-
-}
-function saveReport( dlgType )
-    {
-       if( !emptyCheck( "reportName", "Report Name" ) )
-       return false;    
-                
-        var repNameObj = getObj( "reportName" );
-        var repDescObj = getObj( "reportDesc" );
-        var folderObj = getObj( "folder" );
-        var actionObj = getObj( "actionItem" );
-        var formObj = getObj( "NewReport" );
-		alert(repNameObj+'=='+repDescObj+'=='+folderObj+'=='+actionObj+'=='+formObj);
-        if( dlgType == "save" )
-        {
-           formObj = getObj( "NewReport" );
-            if( getObj( 'reportId' ) != null )
-            {
-                formObj.removeChild( getOpenerObj( 'reportId' ) );
-            }
-        }
-        else
-        {
-//            formObj = getOpenerObj( "SaveAsForm" );
-            actionObj.value = "saveAs";
-        }
-        
-        repNameObj.value = document.NewReport.reportName.value;
-        repDescObj.value = document.NewReport.reportDesc.value;
-        folderObj.value = document.NewReport.folder.value;        
-        formObj.submit();
-        
-        window.self.close();
-        return false;
-    }   
-		function switchToStep( num )
-        {
-            if( num == 1 )
-            {
-                document.StepOne.submit();
-            }
-        }
-        
-        function hideTabs()
-        {
-	    var objreportType = getObj('reportType');
-            if(objreportType[0].checked == true)
-            {
-		divarray = new Array('step1','step2','step4','step5');
-            }
-            else
-            {
-		divarray = new Array('step1','step2','step3','step4','step5');
-            }
-        }
-        
-        function showSaveDialog()
-        {    
-            url = "index.php?module=Reports&action=SaveReport";
-            window.open(url,"Save_Report","width=550,height=350,top=20,left=20;toolbar=no,status=no,menubar=no,directories=no,resizable=yes,scrollbar=no")
-        }
-    
-        function saveAndRunReport()
-        {
-            if(selectedColumnsObj.options.length == 0)
-            {
-                alert("Selected Columns cannot be empty");
-                return false;
-            }
-
-	    		formSelectColumnString();
-            if( trim(getObj( 'record' ).value) == "" )
-            {
-				saveReport( 'save' );
-            }
-            else
-            {
-		    	document.NewReport.submit();
-            }
-        }       
-        
-        function saveAsNewAndRunReport()
-        {
-            formSelectColumnString();
-            showSaveDialog();
-        }       
-        
-        function cancelWizard()
-        {
-	    document.location.href = "index.php?module=Reports&action=index";		
-        }       
-        function updateYAxisFields( colToTotalField, value, bool )
-        {
-        }
-        
-        function updateXAxisFields( value, label )
-        {
-        }
-        
-        function displayStep( num )
-        {
-            if( num == 3 || num == 6 )
-            {
-		var typeObj = getObj( 'reportType' );
-                if( typeObj[0].checked == true )
-                {
-                    return;
-                }
-            }
-            
-            for( i=1; i <= 5; i++ )
-            {
-                var stepId = "step" + i;
-                var tabId = "tab" + i;
-                if( i != num )
-                {                    
-                    getObj( stepId ).style.display = "none";
-                }
-                else
-                {
-                    getObj( stepId ).style.display = "block";
-                }
-            }            
-        }
-
 function changeSteps1() 
 {
 	if(getObj('step5').style.display != 'none')
@@ -486,16 +382,6 @@
 		}
 	}
 }
-function saveAndRunReport()
-{
-	if(selectedColumnsObj.options.length == 0)
-	{
-		alert("Selected Columns cannot be empty");
-		return false;
-	}
-	formSelectColumnString();
-	document.NewReport.submit();
-}
 function changeSteps()
 {
 	if(getObj('step1').style.display != 'none')

Modified: vtigercrm/trunk/modules/Reports/ReportColumns.php
==============================================================================
--- vtigercrm/trunk/modules/Reports/ReportColumns.php (original)
+++ vtigercrm/trunk/modules/Reports/ReportColumns.php Mon Jun 19 17:13:26 2006
@@ -35,21 +35,21 @@
 $report_column->assign("IMAGE_PATH",$image_path);
 if(isset($_REQUEST["record"]))
 {
-        $recordid = $_REQUEST["record"];
-        $oReport = new Reports($recordid);
+	$recordid = $_REQUEST["record"];
+	$oReport = new Reports($recordid);
 	$BLOCK1 = getPrimaryColumnsHTML($oReport->primodule);
 	$BLOCK1 .= getSecondaryColumnsHTML($oReport->secmodule);
-        $BLOCK2 = $oReport->getSelectedColumnsList($recordid);
+	$BLOCK2 = $oReport->getSelectedColumnsList($recordid);
 	$report_column->assign("BLOCK1",$BLOCK1);
 	$report_column->assign("BLOCK2",$BLOCK2);
 }else
 {
 	$primarymodule = $_REQUEST["primarymodule"];
-        $secondarymodule = $_REQUEST["secondarymodule"];
+	$secondarymodule = $_REQUEST["secondarymodule"];
 	$BLOCK1 = getPrimaryColumnsHTML($primarymodule);
 	$BLOCK1 .= getSecondaryColumnsHTML($secondarymodule);
 	$report_column->assign("BLOCK1",$BLOCK1);
-	
+
 }
 
 /** Function to formulate the vtiger_fields for the primary modules 
@@ -60,28 +60,28 @@
 
 function getPrimaryColumnsHTML($module)
 {
-        global $ogReport;
+	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 .= "<optgroup label=\"".$app_list_strings['moduleList'][$module]." ".$key."\" class=\"select\" style=\"border:none\">";
-	    if(isset($ogReport->pri_module_columnslist[$module][$key]))
-	    {
-		foreach($ogReport->pri_module_columnslist[$module][$key] as $field=>$fieldlabel)
+	{
+		if(isset($ogReport->pri_module_columnslist[$module][$key]))
 		{
-			if(isset($mod_strings[$fieldlabel]))
+			$shtml .= "<optgroup label=\"".$app_list_strings['moduleList'][$module]." ".$key."\" class=\"select\" style=\"border:none\">";
+			foreach($ogReport->pri_module_columnslist[$module][$key] as $field=>$fieldlabel)
 			{
-				$shtml .= "<option value=\"".$field."\">".$mod_strings[$fieldlabel]."</option>";
-			}else
-			{
-				$shtml .= "<option value=\"".$field."\">".$fieldlabel."</option>";
+				if(isset($mod_strings[$fieldlabel]))
+				{
+					$shtml .= "<option value=\"".$field."\">".$mod_strings[$fieldlabel]."</option>";
+				}else
+				{
+					$shtml .= "<option value=\"".$field."\">".$fieldlabel."</option>";
+				}
 			}
 		}
-	    }
-        }
+	}
 	return $shtml;
 }
 
@@ -100,30 +100,30 @@
 
 	if($module != "")
 	{
-        $secmodule = explode(":",$module);
-        for($i=0;$i < count($secmodule) ;$i++)
-        {
-		$mod_strings = return_module_language($current_language,$secmodule[$i]);
-	       	foreach($ogReport->module_list[$secmodule[$i]] as $key=>$value)
-        	{
-            		$shtml .= "<optgroup label=\"".$app_list_strings['moduleList'][$secmodule[$i]]." ".$key."\" class=\"select\" style=\"border:none\">";
-			if(isset($ogReport->sec_module_columnslist[$secmodule[$i]][$key]))
+		$secmodule = explode(":",$module);
+		for($i=0;$i < count($secmodule) ;$i++)
+		{
+			$mod_strings = return_module_language($current_language,$secmodule[$i]);
+			foreach($ogReport->module_list[$secmodule[$i]] as $key=>$value)
 			{
-				foreach($ogReport->sec_module_columnslist[$secmodule[$i]][$key] as $field=>$fieldlabel)
+				if(isset($ogReport->sec_module_columnslist[$secmodule[$i]][$key]))
 				{
-					if(isset($mod_strings[$fieldlable]))
+					$shtml .= "<optgroup label=\"".$app_list_strings['moduleList'][$secmodule[$i]]." ".$key."\" class=\"select\" style=\"border:none\">";
+					foreach($ogReport->sec_module_columnslist[$secmodule[$i]][$key] as $field=>$fieldlabel)
 					{
-					$shtml .= "<option value=\"".$field."\">".$mod_strings[$fieldlabel]."</option>";
-					}else
-					{
-	  			        $shtml .= "<option value=\"".$field."\">".$fieldlabel."</option>";
+						if(isset($mod_strings[$fieldlable]))
+						{
+							$shtml .= "<option value=\"".$field."\">".$mod_strings[$fieldlabel]."</option>";
+						}else
+						{
+							$shtml .= "<option value=\"".$field."\">".$fieldlabel."</option>";
+						}
 					}
 				}
 			}
-        	}
+		}
 	}
-	}
-        return $shtml;
+	return $shtml;
 }
 
 $report_column->display("ReportColumns.tpl");

Modified: vtigercrm/trunk/modules/Reports/ReportRun.php
==============================================================================
--- vtigercrm/trunk/modules/Reports/ReportRun.php (original)
+++ vtigercrm/trunk/modules/Reports/ReportRun.php Mon Jun 19 17:13:26 2006
@@ -30,7 +30,7 @@
 
 	var $selectcolumns;
 	var $groupbylist;
-    var $reporttype;
+	var $reporttype;
 	var $reportname;
 	var $totallist;
 
@@ -43,7 +43,7 @@
 		$this->reporttype = $oReport->reporttype;
 		$this->reportname = $oReport->reportname;
 	}
-	
+
 	function getQueryColumnsList($reportid)
 	{
 		global $adb;
@@ -51,11 +51,11 @@
 		global $log;
 
 		$ssql = "select vtiger_selectcolumn.* from vtiger_report inner join vtiger_selectquery on vtiger_selectquery.queryid = vtiger_report.queryid";
-                $ssql .= " left join vtiger_selectcolumn on vtiger_selectcolumn.queryid = vtiger_selectquery.queryid";
+		$ssql .= " left join vtiger_selectcolumn on vtiger_selectcolumn.queryid = vtiger_selectquery.queryid";
 		$ssql .= " where vtiger_report.reportid =".$reportid;
-                $ssql .= " order by vtiger_selectcolumn.columnindex";
-
-                $result = $adb->query($ssql);
+		$ssql .= " order by vtiger_selectcolumn.columnindex";
+
+		$result = $adb->query($ssql);
 
 		while($columnslistrow = $adb->fetch_array($result))
 		{
@@ -95,18 +95,18 @@
 		}
 		return $querycolumn;
 	}
-	
+
 	function getSelectedColumnsList($reportid)
 	{
-	
+
 		global $adb;
 		global $modules;
 		global $log;
-		
+
 		$ssql = "select vtiger_selectcolumn.* from vtiger_report inner join vtiger_selectquery on vtiger_selectquery.queryid = vtiger_report.queryid"; 
 		$ssql .= " left join vtiger_selectcolumn on vtiger_selectcolumn.queryid = vtiger_selectquery.queryid where vtiger_report.reportid =".$reportid; 
 		$ssql .= " order by vtiger_selectcolumn.columnindex";
-		
+
 		$result = $adb->query($ssql);
 		$noofrows = $adb->num_rows($result);
 
@@ -114,7 +114,7 @@
 		{
 			$sSQL .= $this->orderbylistsql.", ";	
 		}
-				
+
 		for($i=0; $i<$noofrows; $i++)
 		{
 			$fieldcolname = $adb->query_result($result,$i,"columnname");
@@ -140,69 +140,69 @@
 			}
 		}
 		$sSQL .= implode(",",$sSQLList);
-		
-		 $log->info("ReportRun :: Successfully returned getSelectedColumnsList".$reportid);
+
+		$log->info("ReportRun :: Successfully returned getSelectedColumnsList".$reportid);
 		return $sSQL;
 	}
-	
+
 	function getAdvComparator($comparator,$value)
-        {
+	{
 
 		global $log,$adb;
 
 		if($comparator == "e")
-                {
-                        if(trim($value) != "")
+		{
+			if(trim($value) != "")
 			{
 				$rtvalue = " = ".$adb->quote($value);
 			}else
 			{
 				$rtvalue = " is NULL";
 			}
-                }
-                if($comparator == "n")
-                {
-                        if(trim($value) != "")
+		}
+		if($comparator == "n")
+		{
+			if(trim($value) != "")
 			{
 				$rtvalue = " <> ".$adb->quote($value);
 			}else
 			{
 				$rtvalue = " is NOT NULL";
 			}
-                }
-                if($comparator == "s")
-                {
-                        $rtvalue = " like ".$adb->quote($value."%");
-                }
-                if($comparator == "c")
-                {
-                        $rtvalue = " like ".$adb->quote("%".$value."%");
-                }
-                if($comparator == "k")
-                {
-                        $rtvalue = " not like ".$adb->quote("%".$value."%");
-                }
-                if($comparator == "l")
-                {
-                        $rtvalue = " < ".$adb->quote($value);
-                }
-                if($comparator == "g")
-								{
-                        $rtvalue = " > ".$adb->quote($value);
-                }
-                if($comparator == "m")
-                {
-                        $rtvalue = " <= ".$adb->quote($value);
-                }
-                if($comparator == "h")
-                {
-                        $rtvalue = " >= ".$adb->quote($value);
-                }
-
-		 $log->info("ReportRun :: Successfully returned getAdvComparator");
+		}
+		if($comparator == "s")
+		{
+			$rtvalue = " like ".$adb->quote($value."%");
+		}
+		if($comparator == "c")
+		{
+			$rtvalue = " like ".$adb->quote("%".$value."%");
+		}
+		if($comparator == "k")
+		{
+			$rtvalue = " not like ".$adb->quote("%".$value."%");
+		}
+		if($comparator == "l")
+		{
+			$rtvalue = " < ".$adb->quote($value);
+		}
+		if($comparator == "g")
+		{
+			$rtvalue = " > ".$adb->quote($value);
+		}
+		if($comparator == "m")
+		{
+			$rtvalue = " <= ".$adb->quote($value);
+		}
+		if($comparator == "h")
+		{
+			$rtvalue = " >= ".$adb->quote($value);
+		}
+
+		$log->info("ReportRun :: Successfully returned getAdvComparator");
 		return $rtvalue;
-        }
-	
+	}
+
 	function getAdvFilterList($reportid)
 	{
 		global $adb;
@@ -211,37 +211,37 @@
 
 		$advfiltersql =  "select vtiger_relcriteria.* from vtiger_report";
 		$advfiltersql .= " inner join vtiger_selectquery on vtiger_selectquery.queryid = vtiger_report.queryid";
-                $advfiltersql .= " left join vtiger_relcriteria on vtiger_relcriteria.queryid = vtiger_selectquery.queryid";
-                $advfiltersql .= " where vtiger_report.reportid =".$reportid;
-                $advfiltersql .= " order by vtiger_relcriteria.columnindex";
-		
+		$advfiltersql .= " left join vtiger_relcriteria on vtiger_relcriteria.queryid = vtiger_selectquery.queryid";
+		$advfiltersql .= " where vtiger_report.reportid =".$reportid;
+		$advfiltersql .= " order by vtiger_relcriteria.columnindex";
+
 		$result = $adb->query($advfiltersql);
 		while($advfilterrow = $adb->fetch_array($result))
 		{
-		     $fieldcolname = $advfilterrow["columnname"];
-		     $comparator = $advfilterrow["comparator"];
-		     $value = $advfilterrow["value"];
-		     
-		     if($fieldcolname != "" && $comparator != "")
-		     {
-			$selectedfields = explode(":",$fieldcolname);
-			$valuearray = explode(",",trim($value));
-                        if(isset($valuearray) && count($valuearray) > 1)
-                        {
-				$advorsql = "";
-				for($n=0;$n<count($valuearray);$n++)
-				{
-					$advorsql[] = $selectedfields[0].".".$selectedfields[1].$this->getAdvComparator($comparator,trim($valuearray[$n]));
-				}
-				$advorsqls = implode(" or ",$advorsql);
-				$fieldvalue = " (".$advorsqls.") ";
-			}else
-			{
-				$fieldvalue = $selectedfields[0].".".$selectedfields[1].$this->getAdvComparator($comparator,trim($value));
-			}
-			$advfilterlist[$fieldcolname] = $fieldvalue;		
-		     }
-	    						
+			$fieldcolname = $advfilterrow["columnname"];
+			$comparator = $advfilterrow["comparator"];
+			$value = $advfilterrow["value"];
+
+			if($fieldcolname != "" && $comparator != "")
+			{
+				$selectedfields = explode(":",$fieldcolname);
+				$valuearray = explode(",",trim($value));
+				if(isset($valuearray) && count($valuearray) > 1)
+				{
+					$advorsql = "";
+					for($n=0;$n<count($valuearray);$n++)
+					{
+						$advorsql[] = $selectedfields[0].".".$selectedfields[1].$this->getAdvComparator($comparator,trim($valuearray[$n]));
+					}
+					$advorsqls = implode(" or ",$advorsql);
+					$fieldvalue = " (".$advorsqls.") ";
+				}else
+				{
+					$fieldvalue = $selectedfields[0].".".$selectedfields[1].$this->getAdvComparator($comparator,trim($value));
+				}
+				$advfilterlist[$fieldcolname] = $fieldvalue;		
+			}
+
 		}
 		$log->info("ReportRun :: Successfully returned getAdvFilterList".$reportid);
 		return $advfilterlist;
@@ -269,21 +269,21 @@
 			if($fieldcolname != "none")
 			{
 				if($datefilter == "custom")
-                                {
-                                        if($startdate != "0000-00-00" && $enddate != "0000-00-00")
-                                        {
-                                                $selectedfields = explode(":",$fieldcolname);
-                                                $stdfilterlist[$fieldcolname] = $selectedfields[0].".".$selectedfields[1]." between '".$startdate."' and '".$enddate."'";
-                                        }
-                                }else
-                                {
-                                        $selectedfields = explode(":",$fieldcolname);
-                                        $startenddate = $this->getStandarFiltersStartAndEndDate($datefilter);
-                                        if($startenddate[0] != "" && $startenddate[1] != "")
-                                        {
-                                                $stdfilterlist[$fieldcolname] = $selectedfields[0].".".$selectedfields[1]." between '".$startenddate[0]." 00:00:00' and '".$startenddate[1]." 23:59:00'";
-                                        }
-                                }
+				{
+					if($startdate != "0000-00-00" && $enddate != "0000-00-00")
+					{
+						$selectedfields = explode(":",$fieldcolname);
+						$stdfilterlist[$fieldcolname] = $selectedfields[0].".".$selectedfields[1]." between '".$startdate."' and '".$enddate."'";
+					}
+				}else
+				{
+					$selectedfields = explode(":",$fieldcolname);
+					$startenddate = $this->getStandarFiltersStartAndEndDate($datefilter);
+					if($startenddate[0] != "" && $startenddate[1] != "")
+					{
+						$stdfilterlist[$fieldcolname] = $selectedfields[0].".".$selectedfields[1]." between '".$startenddate[0]." 00:00:00' and '".$startenddate[1]." 23:59:00'";
+					}
+				}
 
 			}		
 		}
@@ -304,13 +304,13 @@
 			}else
 			{
 				if($startdate != "" && $enddate != "")
-                                {
-				$selectedfields = explode(":",$filtercolumn);
-				$startenddate = $this->getStandarFiltersStartAndEndDate($filter);
-				if($startenddate[0] != "" && $startenddate[1] != "")
-				{
-					$stdfilterlist[$filtercolumn] = $selectedfields[0].".".$selectedfields[1]." between '".$startenddate[0]." 00:00:00' and '".$startenddate[1]." 23:59:00'";
-				}
+				{
+					$selectedfields = explode(":",$filtercolumn);
+					$startenddate = $this->getStandarFiltersStartAndEndDate($filter);
+					if($startenddate[0] != "" && $startenddate[1] != "")
+					{
+						$stdfilterlist[$filtercolumn] = $selectedfields[0].".".$selectedfields[1]." between '".$startenddate[0]." 00:00:00' and '".$startenddate[1]." 23:59:00'";
+					}
 				}
 			}
 
@@ -327,17 +327,17 @@
 		$sreportstdfiltersql = "select vtiger_reportdatefilter.* from vtiger_report"; 
 		$sreportstdfiltersql .= " inner join vtiger_reportdatefilter on vtiger_report.reportid = vtiger_reportdatefilter.datefilterid"; 
 		$sreportstdfiltersql .= " where vtiger_report.reportid =".$reportid;
-		
+
 		$result = $adb->query($sreportstdfiltersql);
 		$noofrows = $adb->num_rows($result);
-	
+
 		for($i=0; $i<$noofrows; $i++)
 		{
 			$fieldcolname = $adb->query_result($result,$i,"datecolumnname");
 			$datefilter = $adb->query_result($result,$i,"datefilter");
 			$startdate = $adb->query_result($result,$i,"startdate");
 			$enddate = $adb->query_result($result,$i,"enddate");
-			
+
 			if($fieldcolname != "none")
 			{
 				if($datefilter == "custom")
@@ -358,208 +358,208 @@
 				}
 			}
 		}
-		 $log->info("ReportRun :: Successfully returned getStandardCriterialSql".$reportid);
+		$log->info("ReportRun :: Successfully returned getStandardCriterialSql".$reportid);
 		return $sSQL;
 	}
 
 	function getStandarFiltersStartAndEndDate($type)
 	{
-			$today = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d"), date("Y")));
-			$tomorrow  = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d")+1, date("Y")));
-			$yesterday  = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d")-1, date("Y")));
-			
-			$currentmonth0 = date("Y-m-d",mktime(0, 0, 0, date("m"), "01",   date("Y")));
-			$currentmonth1 = date("Y-m-t");
-			$lastmonth0 = date("Y-m-d",mktime(0, 0, 0, date("m")-1, "01",   date("Y")));
-			$lastmonth1 = date("Y-m-t", strtotime("-1 Month"));
-			$nextmonth0 = date("Y-m-d",mktime(0, 0, 0, date("m")+1, "01",   date("Y")));
-			$nextmonth1 = date("Y-m-t", strtotime("+1 Month"));
-			
-			$lastweek0 = date("Y-m-d",strtotime("-2 week Sunday"));
-			$lastweek1 = date("Y-m-d",strtotime("-1 week Saturday"));
-			
-			$thisweek0 = date("Y-m-d",strtotime("-1 week Sunday"));
-			$thisweek1 = date("Y-m-d",strtotime("this Saturday"));
-			
-			$nextweek0 = date("Y-m-d",strtotime("this Sunday"));
-			$nextweek1 = date("Y-m-d",strtotime("+1 week Saturday"));
-			
-			$next7days = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d")+6, date("Y")));
-			$next30days = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d")+29, date("Y")));
-			$next60days = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d")+59, date("Y")));
-			$next90days = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d")+89, date("Y")));
-			$next120days = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d")+119, date("Y")));
-			
-			$last7days = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d")-6, date("Y")));
-			$last30days = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d")-29, date("Y")));
-			$last60days = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d")-59, date("Y")));
-			$last90days = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d")-89, date("Y")));
-			$last120days = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d")-119, date("Y")));
-			
-			$currentFY0 = date("Y-m-d",mktime(0, 0, 0, "01", "01",   date("Y")));
-			$currentFY1 = date("Y-m-t",mktime(0, 0, 0, "12", date("d"),   date("Y")));
-			$lastFY0 = date("Y-m-d",mktime(0, 0, 0, "01", "01",   date("Y")-1));
-			$lastFY1 = date("Y-m-t", mktime(0, 0, 0, "12", date("d"), date("Y")-1));
-			$nextFY0 = date("Y-m-d",mktime(0, 0, 0, "01", "01",   date("Y")+1));
-			$nextFY1 = date("Y-m-t", mktime(0, 0, 0, "12", date("d"), date("Y")+1));
-			
-			if($type == "today" )
-			{
-			
+		$today = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d"), date("Y")));
+		$tomorrow  = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d")+1, date("Y")));
+		$yesterday  = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d")-1, date("Y")));
+
+		$currentmonth0 = date("Y-m-d",mktime(0, 0, 0, date("m"), "01",   date("Y")));
+		$currentmonth1 = date("Y-m-t");
+		$lastmonth0 = date("Y-m-d",mktime(0, 0, 0, date("m")-1, "01",   date("Y")));
+		$lastmonth1 = date("Y-m-t", strtotime("-1 Month"));
+		$nextmonth0 = date("Y-m-d",mktime(0, 0, 0, date("m")+1, "01",   date("Y")));
+		$nextmonth1 = date("Y-m-t", strtotime("+1 Month"));
+
+		$lastweek0 = date("Y-m-d",strtotime("-2 week Sunday"));
+		$lastweek1 = date("Y-m-d",strtotime("-1 week Saturday"));
+
+		$thisweek0 = date("Y-m-d",strtotime("-1 week Sunday"));
+		$thisweek1 = date("Y-m-d",strtotime("this Saturday"));
+
+		$nextweek0 = date("Y-m-d",strtotime("this Sunday"));
+		$nextweek1 = date("Y-m-d",strtotime("+1 week Saturday"));
+
+		$next7days = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d")+6, date("Y")));
+		$next30days = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d")+29, date("Y")));
+		$next60days = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d")+59, date("Y")));
+		$next90days = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d")+89, date("Y")));
+		$next120days = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d")+119, date("Y")));
+
+		$last7days = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d")-6, date("Y")));
+		$last30days = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d")-29, date("Y")));
+		$last60days = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d")-59, date("Y")));
+		$last90days = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d")-89, date("Y")));
+		$last120days = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d")-119, date("Y")));
+
+		$currentFY0 = date("Y-m-d",mktime(0, 0, 0, "01", "01",   date("Y")));
+		$currentFY1 = date("Y-m-t",mktime(0, 0, 0, "12", date("d"),   date("Y")));
+		$lastFY0 = date("Y-m-d",mktime(0, 0, 0, "01", "01",   date("Y")-1));
+		$lastFY1 = date("Y-m-t", mktime(0, 0, 0, "12", date("d"), date("Y")-1));
+		$nextFY0 = date("Y-m-d",mktime(0, 0, 0, "01", "01",   date("Y")+1));
+		$nextFY1 = date("Y-m-t", mktime(0, 0, 0, "12", date("d"), date("Y")+1));
+
+		if($type == "today" )
+		{
+
 			$datevalue[0] = $today;
 			$datevalue[1] = $today;
-			}
-			elseif($type == "yesterday" )
-			{
-			    
+		}
+		elseif($type == "yesterday" )
+		{
+
 			$datevalue[0] = $yesterday;
 			$datevalue[1] = $yesterday;
-			}
-			elseif($type == "tomorrow" )
-			{
-			    
+		}
+		elseif($type == "tomorrow" )
+		{
+
 			$datevalue[0] = $tomorrow;
 			$datevalue[1] = $tomorrow;
-			}        
-			elseif($type == "thisweek" )
-			{
-			    
+		}        
+		elseif($type == "thisweek" )
+		{
+
 			$datevalue[0] = $thisweek0;
 			$datevalue[1] = $thisweek1;
-			}                
-			elseif($type == "lastweek" )
-			{
-			    
+		}                
+		elseif($type == "lastweek" )
+		{
+
 			$datevalue[0] = $lastweek0;
 			$datevalue[1] = $lastweek1;
-			}                
-			elseif($type == "nextweek" )
-			{
-			    
+		}                
+		elseif($type == "nextweek" )
+		{
+
 			$datevalue[0] = $nextweek0;
 			$datevalue[1] = $nextweek1;
-			}                
-			elseif($type == "thismonth" )
-			{
-			    
+		}                
+		elseif($type == "thismonth" )
+		{
+
 			$datevalue[0] =$currentmonth0;
 			$datevalue[1] = $currentmonth1;
-			}                
-			
-			elseif($type == "lastmonth" )
-			{
-			    
+		}                
+
+		elseif($type == "lastmonth" )
+		{
+
 			$datevalue[0] = $lastmonth0;
 			$datevalue[1] = $lastmonth1;
-			}             
-			elseif($type == "nextmonth" )
-			{
-			    
+		}             
+		elseif($type == "nextmonth" )
+		{
+
 			$datevalue[0] = $nextmonth0;
 			$datevalue[1] = $nextmonth1;
-			}           
-			elseif($type == "next7days" )
-			{
-			    
+		}           
+		elseif($type == "next7days" )
+		{
+
 			$datevalue[0] = $today;
 			$datevalue[1] = $next7days;
-			}                
-			elseif($type == "next30days" )
-			{
-			    
+		}                
+		elseif($type == "next30days" )
+		{
+
 			$datevalue[0] =$today;
 			$datevalue[1] =$next30days;
-			}                
-			elseif($type == "next60days" )
-			{
-			    
+		}                
+		elseif($type == "next60days" )
+		{
+
 			$datevalue[0] = $today;
 			$datevalue[1] = $next60days;
-			}                
-			elseif($type == "next90days" )
-			{
-			    
+		}                
+		elseif($type == "next90days" )
+		{
+
 			$datevalue[0] = $today;
 			$datevalue[1] = $next90days;
-			}        
-			elseif($type == "next120days" )
-			{
-			    
+		}        
+		elseif($type == "next120days" )
+		{
+
 			$datevalue[0] = $today;
 			$datevalue[1] = $next120days;
-			}        
-			elseif($type == "last7days" )
-			{
-			    
+		}        
+		elseif($type == "last7days" )
+		{
+
 			$datevalue[0] = $last7days;
 			$datevalue[1] = $today;
-			}                        
-			elseif($type == "last30days" )
-			{
-			    
+		}                        
+		elseif($type == "last30days" )
+		{
+
 			$datevalue[0] = $last30days;
 			$datevalue[1] =  $today;
-			}                
-			elseif($type == "last60days" )
-			{
-			    
+		}                
+		elseif($type == "last60days" )
+		{
+
 			$datevalue[0] = $last60days;
 			$datevalue[1] = $today;
-			}        
-			else if($type == "last90days" )
-			{
-			    
+		}        
+		else if($type == "last90days" )
+		{
+
 			$datevalue[0] = $last90days;
 			$datevalue[1] = $today;
-			}        
-			elseif($type == "last120days" )
-			{
-			    
+		}        
+		elseif($type == "last120days" )
+		{
+
 			$datevalue[0] = $last120days;
 			$datevalue[1] = $today;
-			}        
-			elseif($type == "thisfy" )
-			{
-			    
+		}        
+		elseif($type == "thisfy" )
+		{
+
 			$datevalue[0] = $currentFY0;
 			$datevalue[1] = $currentFY1;
-			}                
-			elseif($type == "prevfy" )
-			{
-			    
+		}                
+		elseif($type == "prevfy" )
+		{
+
 			$datevalue[0] = $lastFY0;
 			$datevalue[1] = $lastFY1;
-			}                
-			elseif($type == "nextfy" )
-			{
-			    
+		}                
+		elseif($type == "nextfy" )
+		{
+
 			$datevalue[0] = $nextFY0;
 			$datevalue[1] = $nextFY1;
-			}                
-			elseif($type == "nextfq" )
-			{
-			    
+		}                
+		elseif($type == "nextfq" )
+		{
+
 			$datevalue[0] = "2005-07-01";
 			$datevalue[1] = "2005-09-30";
-			}                        
-			elseif($type == "prevfq" )
-			{
-			    
+		}                        
+		elseif($type == "prevfq" )
+		{
+
 			$datevalue[0] = "2005-01-01";
 			$datevalue[1] = "2005-03-31";
-			}                
-			elseif($type == "thisfq" )
-			{
+		}                
+		elseif($type == "thisfq" )
+		{
 			$datevalue[0] = "2005-04-01";
 			$datevalue[1] = "2005-06-30";
-			}                
-			else
-			{
+		}                
+		else
+		{
 			$datevalue[0] = "";
 			$datevalue[1] = "";
-			}
-
-			return $datevalue;
+		}
+
+		return $datevalue;
 	}
 
 	function getGroupingList($reportid)
@@ -569,16 +569,16 @@
 		global $log;
 
 		$sreportsortsql = "select vtiger_reportsortcol.* from vtiger_report";
-                $sreportsortsql .= " inner join vtiger_reportsortcol on vtiger_report.reportid = vtiger_reportsortcol.reportid";
-                $sreportsortsql .= " where vtiger_report.reportid =".$reportid." order by vtiger_reportsortcol.sortcolid";
-		
+		$sreportsortsql .= " inner join vtiger_reportsortcol on vtiger_report.reportid = vtiger_reportsortcol.reportid";
+		$sreportsortsql .= " where vtiger_report.reportid =".$reportid." order by vtiger_reportsortcol.sortcolid";
+
 		$result = $adb->query($sreportsortsql);
 
 		while($reportsortrow = $adb->fetch_array($result))
 		{
 			$fieldcolname = $reportsortrow["columnname"];
 			$sortorder = $reportsortrow["sortorder"];
-			
+
 			if($sortorder == "Ascending")
 			{
 				$sortorder = "ASC";
@@ -587,7 +587,7 @@
 			{
 				$sortorder = "DESC";
 			}
-			
+
 			if($fieldcolname != "none")
 			{
 				$selectedfields = explode(":",$fieldcolname);
@@ -596,29 +596,29 @@
 				$this->groupbylist[$fieldcolname] = $selectedfields[0].".".$selectedfields[1]." ".$selectedfields[2];
 			}
 		}
-		 $log->info("ReportRun :: Successfully returned getGroupingList".$reportid);
+		$log->info("ReportRun :: Successfully returned getGroupingList".$reportid);
 		return $grouplist;
 	}
 
 	function getSelectedOrderbyList($reportid)
 	{
-	
+
 		global $adb;
 		global $modules;
 		global $log;
-	
+
 		$sreportsortsql = "select vtiger_reportsortcol.* from vtiger_report"; 
 		$sreportsortsql .= " inner join vtiger_reportsortcol on vtiger_report.reportid = vtiger_reportsortcol.reportid"; 
 		$sreportsortsql .= " where vtiger_report.reportid =".$reportid." order by vtiger_reportsortcol.sortcolid";
-		
+
 		$result = $adb->query($sreportsortsql);
 		$noofrows = $adb->num_rows($result);
-	
+
 		for($i=0; $i<$noofrows; $i++)
 		{
 			$fieldcolname = $adb->query_result($result,$i,"columnname");
 			$sortorder = $adb->query_result($result,$i,"sortorder");
-			
+
 			if($sortorder == "Ascending")
 			{
 				$sortorder = "ASC";
@@ -627,7 +627,7 @@
 			{
 				$sortorder = "DESC";
 			}
-			
+
 			if($fieldcolname != "none")
 			{
 				$this->orderbylistcolumns[] = $fieldcolname;
@@ -655,43 +655,45 @@
 			if($secmodule == "Accounts")
 			{
 				$query = "left join vtiger_account on vtiger_account.accountid = vtiger_contactdetails.accountid
-                                left join vtiger_crmentity as vtiger_crmentityAccounts on vtiger_crmentityAccounts.crmid=vtiger_account.accountid
-                                left join vtiger_accountbillads on vtiger_account.accountid=vtiger_accountbillads.accountaddressid
-                                left join vtiger_accountshipads on vtiger_account.accountid=vtiger_accountshipads.accountaddressid
-                                left join vtiger_accountscf on vtiger_account.accountid = vtiger_accountscf.accountid
-                                left join vtiger_account as vtiger_accountAccounts on vtiger_accountAccounts.accountid = vtiger_account.parentid
-                                left join vtiger_users as vtiger_usersAccounts on vtiger_usersAccounts.id = vtiger_crmentityAccounts.smownerid ";
+					left join vtiger_crmentity as vtiger_crmentityAccounts on vtiger_crmentityAccounts.crmid=vtiger_account.accountid
+					left join vtiger_accountbillads on vtiger_account.accountid=vtiger_accountbillads.accountaddressid
+					left join vtiger_accountshipads on vtiger_account.accountid=vtiger_accountshipads.accountaddressid
+					left join vtiger_accountscf on vtiger_account.accountid = vtiger_accountscf.accountid
+					left join vtiger_account as vtiger_accountAccounts on vtiger_accountAccounts.accountid = vtiger_account.parentid
+					left join vtiger_users as vtiger_usersAccounts on vtiger_usersAccounts.id = vtiger_crmentityAccounts.smownerid ";
 			}
 			if($secmodule == "Potentials")
 			{
 				$query = "left join  vtiger_potential on vtiger_potential.accountid = vtiger_contactdetails.accountid
-				left join vtiger_crmentity as vtiger_crmentityPotentials on vtiger_crmentityPotentials.crmid=vtiger_potential.potentialid
-				left join vtiger_account as vtiger_accountPotentials on vtiger_potential.accountid = vtiger_accountPotentials.accountid
-				left join vtiger_potentialscf on vtiger_potentialscf.potentialid = vtiger_potential.potentialid
-				left join vtiger_users as vtiger_usersPotentials on vtiger_usersPotentials.id = vtiger_crmentityPotentials.smownerid ";
+					left join vtiger_crmentity as vtiger_crmentityPotentials on vtiger_crmentityPotentials.crmid=vtiger_potential.potentialid
+					left join vtiger_account as vtiger_accountPotentials on vtiger_potential.accountid = vtiger_accountPotentials.accountid
+					left join vtiger_potentialscf on vtiger_potentialscf.potentialid = vtiger_potential.potentialid
+					left join vtiger_users as vtiger_usersPotentials on vtiger_usersPotentials.id = vtiger_crmentityPotentials.smownerid ";
 			}
 			if($secmodule == "Quotes")
-                        {
-                                $query = "left join vtiger_quotes on vtiger_quotes.contactid = vtiger_contactdetails.contactid
-                                left join vtiger_crmentity as vtiger_crmentityQuotes on vtiger_crmentityQuotes.crmid=vtiger_quotes.quoteid
-                                left join vtiger_quotesbillads on vtiger_quotes.quoteid=vtiger_quotesbillads.quotebilladdressid
-                                left join vtiger_quotesshipads on vtiger_quotes.quoteid=vtiger_quotesshipads.quoteshipaddressid
-                                left join vtiger_users as vtiger_usersQuotes on vtiger_usersQuotes.id = vtiger_crmentityQuotes.smownerid
-                                left join vtiger_users as vtiger_usersRel1 on vtiger_usersRel1.id = vtiger_quotes.inventorymanager
-                                left join vtiger_potential as vtiger_potentialRel on vtiger_potentialRel.potentialid = vtiger_quotes.potentialid
-                                left join vtiger_contactdetails as vtiger_contactdetailsQuotes on vtiger_contactdetailsQuotes.contactid = vtiger_quotes.contactid
-                                left join vtiger_account as vtiger_accountQuotes on vtiger_accountQuotes.accountid = vtiger_quotes.accountid ";
-                        }
-                        if($secmodule == "PurchaseOrder")
-                        {
-                                $query = "left join vtiger_purchaseorder on vtiger_purchaseorder.contactid = vtiger_contactdetails.contactid
-                                left join vtiger_crmentity as vtiger_crmentityPurchaseOrder on vtiger_crmentityPurchaseOrder.crmid=vtiger_purchaseorder.purchaseorderid
-                                left join vtiger_pobillads on vtiger_purchaseorder.purchaseorderid=vtiger_pobillads.pobilladdressid
-                                left join vtiger_poshipads on vtiger_purchaseorder.purchaseorderid=vtiger_poshipads.poshipaddressid
-                                left join vtiger_users as vtiger_usersPurchaseOrder on vtiger_usersPurchaseOrder.id = vtiger_crmentityPurchaseOrder.smownerid
-                                left join vtiger_vendor as vtiger_vendorRel on vtiger_vendorRel.vendorid = vtiger_purchaseorder.vendorid
-                                left join vtiger_contactdetails as vtiger_contactdetailsPurchaseOrder on vtiger_contactdetailsPurchaseOrder.contactid = vtiger_purchaseorder.contactid ";
-                        }
+			{
+				$query = "left join vtiger_quotes on vtiger_quotes.contactid = vtiger_contactdetails.contactid
+					left join vtiger_quotescf on vtiger_quotes.quoteid = vtiger_quotescf.quoteid 
+					left join vtiger_crmentity as vtiger_crmentityQuotes on vtiger_crmentityQuotes.crmid=vtiger_quotes.quoteid
+					left join vtiger_quotesbillads on vtiger_quotes.quoteid=vtiger_quotesbillads.quotebilladdressid
+					left join vtiger_quotesshipads on vtiger_quotes.quoteid=vtiger_quotesshipads.quoteshipaddressid
+					left join vtiger_users as vtiger_usersQuotes on vtiger_usersQuotes.id = vtiger_crmentityQuotes.smownerid
+					left join vtiger_users as vtiger_usersRel1 on vtiger_usersRel1.id = vtiger_quotes.inventorymanager
+					left join vtiger_potential as vtiger_potentialRel on vtiger_potentialRel.potentialid = vtiger_quotes.potentialid
+					left join vtiger_contactdetails as vtiger_contactdetailsQuotes on vtiger_contactdetailsQuotes.contactid = vtiger_quotes.contactid
+					left join vtiger_account as vtiger_accountQuotes on vtiger_accountQuotes.accountid = vtiger_quotes.accountid ";
+			}
+			if($secmodule == "PurchaseOrder")
+			{
+				$query = "left join vtiger_purchaseorder on vtiger_purchaseorder.contactid = vtiger_contactdetails.contactid
+					left join vtiger_purchaseordercf on vtiger_purchaseorder.purchaseorderid = vtiger_purchaseordercf.purchaseorderid  
+					left join vtiger_crmentity as vtiger_crmentityPurchaseOrder on vtiger_crmentityPurchaseOrder.crmid=vtiger_purchaseorder.purchaseorderid
+					left join vtiger_pobillads on vtiger_purchaseorder.purchaseorderid=vtiger_pobillads.pobilladdressid
+					left join vtiger_poshipads on vtiger_purchaseorder.purchaseorderid=vtiger_poshipads.poshipaddressid
+					left join vtiger_users as vtiger_usersPurchaseOrder on vtiger_usersPurchaseOrder.id = vtiger_crmentityPurchaseOrder.smownerid
+					left join vtiger_vendor as vtiger_vendorRel on vtiger_vendorRel.vendorid = vtiger_purchaseorder.vendorid
+					left join vtiger_contactdetails as vtiger_contactdetailsPurchaseOrder on vtiger_contactdetailsPurchaseOrder.contactid = vtiger_purchaseorder.contactid ";
+			}
 
 		}
 
@@ -700,125 +702,131 @@
 			if($secmodule == "Potentials")
 			{
 				$query = "left join vtiger_potential on vtiger_potential.accountid = vtiger_account.accountid
-				left join vtiger_crmentity as vtiger_crmentityPotentials on vtiger_crmentityPotentials.crmid=vtiger_potential.potentialid
-                                left join vtiger_potentialscf on vtiger_potentialscf.potentialid = vtiger_potential.potentialid
-                                left join vtiger_users as vtiger_usersPotentials on vtiger_usersPotentials.id = vtiger_crmentityPotentials.smownerid ";
+					left join vtiger_crmentity as vtiger_crmentityPotentials on vtiger_crmentityPotentials.crmid=vtiger_potential.potentialid
+					left join vtiger_potentialscf on vtiger_potentialscf.potentialid = vtiger_potential.potentialid
+					left join vtiger_users as vtiger_usersPotentials on vtiger_usersPotentials.id = vtiger_crmentityPotentials.smownerid ";
 
 			}
 			if($secmodule == "Contacts")
 			{
 				$query = "left join vtiger_contactdetails on vtiger_contactdetails.accountid = vtiger_account.accountid
-				left join vtiger_crmentity as vtiger_crmentityContacts on vtiger_crmentityContacts.crmid = vtiger_contactdetails.contactid
-                                left join vtiger_contactaddress on vtiger_contactdetails.contactid = vtiger_contactaddress.contactaddressid
-                                left join vtiger_contactsubdetails on vtiger_contactdetails.contactid = vtiger_contactsubdetails.contactsubscriptionid
-				left join vtiger_contactdetails as vtiger_contactdetailsContacts on vtiger_contactdetailsContacts.contactid = vtiger_contactdetails.reportsto
-				left join vtiger_account as vtiger_accountContacts on vtiger_accountContacts.accountid = vtiger_contactdetails.accountid 
-                                left join vtiger_contactscf on vtiger_contactdetails.contactid = vtiger_contactscf.contactid
-                                left join vtiger_users as vtiger_usersContacts on vtiger_usersContacts.id = vtiger_crmentityContacts.smownerid ";
+					left join vtiger_crmentity as vtiger_crmentityContacts on vtiger_crmentityContacts.crmid = vtiger_contactdetails.contactid
+					left join vtiger_contactaddress on vtiger_contactdetails.contactid = vtiger_contactaddress.contactaddressid
+					left join vtiger_contactsubdetails on vtiger_contactdetails.contactid = vtiger_contactsubdetails.contactsubscriptionid
+					left join vtiger_contactdetails as vtiger_contactdetailsContacts on vtiger_contactdetailsContacts.contactid = vtiger_contactdetails.reportsto
+					left join vtiger_customerdetails on vtiger_customerdetails.customerid = vtiger_contactdetails.contactid
+					left join vtiger_account as vtiger_accountContacts on vtiger_accountContacts.accountid = vtiger_contactdetails.accountid 
+					left join vtiger_contactscf on vtiger_contactdetails.contactid = vtiger_contactscf.contactid
+					left join vtiger_users as vtiger_usersContacts on vtiger_usersContacts.id = vtiger_crmentityContacts.smownerid ";
 			}
 			if($secmodule == "Quotes")
 			{
 				$query = "left join vtiger_quotes on vtiger_quotes.accountid = vtiger_account.accountid
-                                left join vtiger_crmentity as vtiger_crmentityQuotes on vtiger_crmentityQuotes.crmid=vtiger_quotes.quoteid
-                                left join vtiger_quotesbillads on vtiger_quotes.quoteid=vtiger_quotesbillads.quotebilladdressid
-                                left join vtiger_quotesshipads on vtiger_quotes.quoteid=vtiger_quotesshipads.quoteshipaddressid
-                                left join vtiger_users as vtiger_usersQuotes on vtiger_usersQuotes.id = vtiger_crmentityQuotes.smownerid
-                                left join vtiger_users as vtiger_usersRel1 on vtiger_usersRel1.id = vtiger_quotes.inventorymanager
-                                left join vtiger_potential as vtiger_potentialRel on vtiger_potentialRel.potentialid = vtiger_quotes.potentialid
-                                left join vtiger_contactdetails as vtiger_contactdetailsQuotes on vtiger_contactdetailsQuotes.contactid = vtiger_quotes.contactid
-                                left join vtiger_account as vtiger_accountQuotes on vtiger_accountQuotes.accountid = vtiger_quotes.accountid ";
+					left join vtiger_quotescf on vtiger_quotes.quoteid = vtiger_quotescf.quoteid 
+					left join vtiger_crmentity as vtiger_crmentityQuotes on vtiger_crmentityQuotes.crmid=vtiger_quotes.quoteid
+					left join vtiger_quotesbillads on vtiger_quotes.quoteid=vtiger_quotesbillads.quotebilladdressid
+					left join vtiger_quotesshipads on vtiger_quotes.quoteid=vtiger_quotesshipads.quoteshipaddressid
+					left join vtiger_users as vtiger_usersQuotes on vtiger_usersQuotes.id = vtiger_crmentityQuotes.smownerid
+					left join vtiger_users as vtiger_usersRel1 on vtiger_usersRel1.id = vtiger_quotes.inventorymanager
+					left join vtiger_potential as vtiger_potentialRel on vtiger_potentialRel.potentialid = vtiger_quotes.potentialid
+					left join vtiger_contactdetails as vtiger_contactdetailsQuotes on vtiger_contactdetailsQuotes.contactid = vtiger_quotes.contactid
+					left join vtiger_account as vtiger_accountQuotes on vtiger_accountQuotes.accountid = vtiger_quotes.accountid ";
 			}
 			if($secmodule == "PurchaseOrder")
 			{
 				$query = "left join vtiger_purchaseorder on vtiger_purchaseorder.accountid = vtiger_account.accountid
-                                left join vtiger_crmentity as vtiger_crmentityPurchaseOrder on vtiger_crmentityPurchaseOrder.crmid=vtiger_purchaseorder.purchaseorderid
-                                left join vtiger_pobillads on vtiger_purchaseorder.purchaseorderid=vtiger_pobillads.pobilladdressid
-                                left join vtiger_poshipads on vtiger_purchaseorder.purchaseorderid=vtiger_poshipads.poshipaddressid
-                                left join vtiger_users as vtiger_usersPurchaseOrder on vtiger_usersPurchaseOrder.id = vtiger_crmentityPurchaseOrder.smownerid
-                                left join vtiger_vendor as vtiger_vendorRel on vtiger_vendorRel.vendorid = vtiger_purchaseorder.vendorid
-                                left join vtiger_contactdetails as vtiger_contactdetailsPurchaseOrder on vtiger_contactdetailsPurchaseOrder.contactid = vtiger_purchaseorder.contactid ";
+					left join vtiger_purchaseordercf on vtiger_purchaseorder.purchaseorderid = vtiger_purchaseordercf.purchaseorderid  
+					left join vtiger_crmentity as vtiger_crmentityPurchaseOrder on vtiger_crmentityPurchaseOrder.crmid=vtiger_purchaseorder.purchaseorderid
+					left join vtiger_pobillads on vtiger_purchaseorder.purchaseorderid=vtiger_pobillads.pobilladdressid
+					left join vtiger_poshipads on vtiger_purchaseorder.purchaseorderid=vtiger_poshipads.poshipaddressid
+					left join vtiger_users as vtiger_usersPurchaseOrder on vtiger_usersPurchaseOrder.id = vtiger_crmentityPurchaseOrder.smownerid
+					left join vtiger_vendor as vtiger_vendorRel on vtiger_vendorRel.vendorid = vtiger_purchaseorder.vendorid
+					left join vtiger_contactdetails as vtiger_contactdetailsPurchaseOrder on vtiger_contactdetailsPurchaseOrder.contactid = vtiger_purchaseorder.contactid ";
 			}
 			if($secmodule == "Invoice")
 			{
 				$query = "left join vtiger_invoice on vtiger_invoice.accountid = vtiger_account.accountid
-                                left join vtiger_crmentity as vtiger_crmentityInvoice on vtiger_crmentityInvoice.crmid=vtiger_invoice.invoiceid
-                                left join vtiger_invoicebillads on vtiger_invoice.invoiceid=vtiger_invoicebillads.invoicebilladdressid
-                                left join vtiger_invoiceshipads on vtiger_invoice.invoiceid=vtiger_invoiceshipads.invoiceshipaddressid
-                                left join vtiger_users as vtiger_usersInvoice on vtiger_usersInvoice.id = vtiger_crmentityInvoice.smownerid
-                                left join vtiger_account as vtiger_accountInvoice on vtiger_accountInvoice.accountid = vtiger_invoice.accountid ";
+					left join vtiger_invoicecf on vtiger_invoice.invoiceid = vtiger_invoicecf.invoiceid 
+					left join vtiger_crmentity as vtiger_crmentityInvoice on vtiger_crmentityInvoice.crmid=vtiger_invoice.invoiceid
+					left join vtiger_invoicebillads on vtiger_invoice.invoiceid=vtiger_invoicebillads.invoicebilladdressid
+					left join vtiger_invoiceshipads on vtiger_invoice.invoiceid=vtiger_invoiceshipads.invoiceshipaddressid
+					left join vtiger_users as vtiger_usersInvoice on vtiger_usersInvoice.id = vtiger_crmentityInvoice.smownerid
+					left join vtiger_account as vtiger_accountInvoice on vtiger_accountInvoice.accountid = vtiger_invoice.accountid ";
 			}
 			if($secmodule == "Products")
 			{
 				$query = "left join vtiger_seproductsrel on vtiger_seproductsrel.crmid = vtiger_account.accountid
-				left join vtiger_products on vtiger_products.productid = vtiger_seproductsrel.productid
-                                left join vtiger_crmentity as vtiger_crmentityProducts on vtiger_crmentityProducts.crmid=vtiger_products.productid
-                                left join vtiger_productcf on vtiger_products.productid = vtiger_productcf.productid
-                                left join vtiger_users as vtiger_usersProducts on vtiger_usersProducts.id = vtiger_crmentityProducts.smownerid
-                                left join vtiger_contactdetails as vtiger_contactdetailsProducts on vtiger_contactdetailsProducts.contactid = vtiger_products.contactid
-                                left join vtiger_vendor as vtiger_vendorRel on vtiger_vendorRel.vendorid = vtiger_products.vendor_id
-                                left join vtiger_crmentity as vtiger_crmentityRel on vtiger_crmentityRel.crmid = vtiger_seproductsrel.crmid
-                                left join vtiger_account as vtiger_accountRel on vtiger_accountRel.accountid=crmentityRel.crmid
-                                left join vtiger_leaddetails as vtiger_leaddetailsRel on vtiger_leaddetailsRel.leadid = vtiger_crmentityRel.crmid
-                                left join vtiger_potential as vtiger_potentialRel on vtiger_potentialRel.potentialid = vtiger_crmentityRel.crmid ";
+					left join vtiger_products on vtiger_products.productid = vtiger_seproductsrel.productid
+					left join vtiger_crmentity as vtiger_crmentityProducts on vtiger_crmentityProducts.crmid=vtiger_products.productid
+					left join vtiger_productcf on vtiger_products.productid = vtiger_productcf.productid
+					left join vtiger_users as vtiger_usersProducts on vtiger_usersProducts.id = vtiger_crmentityProducts.smownerid
+					left join vtiger_contactdetails as vtiger_contactdetailsProducts on vtiger_contactdetailsProducts.contactid = vtiger_products.contactid
+					left join vtiger_vendor as vtiger_vendorRel on vtiger_vendorRel.vendorid = vtiger_products.vendor_id
+					left join vtiger_crmentity as vtiger_crmentityRel on vtiger_crmentityRel.crmid = vtiger_seproductsrel.crmid
+					left join vtiger_account as vtiger_accountRel on vtiger_accountRel.accountid=crmentityRel.crmid
+					left join vtiger_leaddetails as vtiger_leaddetailsRel on vtiger_leaddetailsRel.leadid = vtiger_crmentityRel.crmid
+					left join vtiger_potential as vtiger_potentialRel on vtiger_potentialRel.potentialid = vtiger_crmentityRel.crmid ";
 			}
 		}
 		if($module == "Quotes")
 		{
 			if($secmodule == "Accounts")
-                        {
-                                $query = "left join vtiger_account on vtiger_account.accountid = vtiger_quotes.accountid
-                                left join vtiger_crmentity as vtiger_crmentityAccounts on vtiger_crmentityAccounts.crmid=vtiger_account.accountid
-                                left join vtiger_accountbillads on vtiger_account.accountid=vtiger_accountbillads.accountaddressid
-                                left join vtiger_accountshipads on vtiger_account.accountid=vtiger_accountshipads.accountaddressid
-                                left join vtiger_accountscf on vtiger_account.accountid = vtiger_accountscf.accountid
-                                left join vtiger_account as vtiger_accountAccounts on vtiger_accountAccounts.accountid = vtiger_account.parentid
-                                left join vtiger_users as vtiger_usersAccounts on vtiger_usersAccounts.id = vtiger_crmentityAccounts.smownerid ";
-                        }
+			{
+				$query = "left join vtiger_account on vtiger_account.accountid = vtiger_quotes.accountid
+					left join vtiger_crmentity as vtiger_crmentityAccounts on vtiger_crmentityAccounts.crmid=vtiger_account.accountid
+					left join vtiger_accountbillads on vtiger_account.accountid=vtiger_accountbillads.accountaddressid
+					left join vtiger_accountshipads on vtiger_account.accountid=vtiger_accountshipads.accountaddressid
+					left join vtiger_accountscf on vtiger_account.accountid = vtiger_accountscf.accountid
+					left join vtiger_account as vtiger_accountAccounts on vtiger_accountAccounts.accountid = vtiger_account.parentid
+					left join vtiger_users as vtiger_usersAccounts on vtiger_usersAccounts.id = vtiger_crmentityAccounts.smownerid ";
+			}
 			if($secmodule == "Potentials")
-                        {
-                                $query = "left join vtiger_potential on vtiger_potential.potentialid = vtiger_quotes.potentialid
-                                left join vtiger_crmentity as vtiger_crmentityPotentials on vtiger_crmentityPotentials.crmid=vtiger_potential.potentialid 
-				left join vtiger_potentialscf on vtiger_potentialscf.potentialid = vtiger_potential.potentialid
-                                left join vtiger_users as vtiger_usersPotentials on vtiger_usersPotentials.id = vtiger_crmentityPotentials.smownerid ";
-
-                        }
+			{
+				$query = "left join vtiger_potential on vtiger_potential.potentialid = vtiger_quotes.potentialid
+					left join vtiger_crmentity as vtiger_crmentityPotentials on vtiger_crmentityPotentials.crmid=vtiger_potential.potentialid 
+					left join vtiger_potentialscf on vtiger_potentialscf.potentialid = vtiger_potential.potentialid
+					left join vtiger_users as vtiger_usersPotentials on vtiger_usersPotentials.id = vtiger_crmentityPotentials.smownerid ";
+
+			}
 			if($secmodule == "Contacts")
-                        {
-                                $query = "left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_quotes.contactid
-                                left join vtiger_crmentity as vtiger_crmentityContacts on vtiger_crmentityContacts.crmid = vtiger_contactdetails.contactid
-                                left join vtiger_contactaddress on vtiger_contactdetails.contactid = vtiger_contactaddress.contactaddressid
-                                left join vtiger_contactsubdetails on vtiger_contactdetails.contactid = vtiger_contactsubdetails.contactsubscriptionid
-                                left join vtiger_contactdetails as vtiger_contactdetailsContacts on vtiger_contactdetailsContacts.contactid = vtiger_contactdetails.reportsto
-                                left join vtiger_account as vtiger_accountContacts on vtiger_accountContacts.accountid = vtiger_contactdetails.accountid
-
-                                left join vtiger_contactscf on vtiger_contactdetails.contactid = vtiger_contactscf.contactid
-                                left join vtiger_users as vtiger_usersContacts on vtiger_usersContacts.id = vtiger_crmentityContacts.smownerid ";
-                        }
+			{
+				$query = "left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_quotes.contactid
+					left join vtiger_crmentity as vtiger_crmentityContacts on vtiger_crmentityContacts.crmid = vtiger_contactdetails.contactid
+					left join vtiger_contactaddress on vtiger_contactdetails.contactid = vtiger_contactaddress.contactaddressid
+					left join vtiger_contactsubdetails on vtiger_contactdetails.contactid = vtiger_contactsubdetails.contactsubscriptionid
+					left join vtiger_contactdetails as vtiger_contactdetailsContacts on vtiger_contactdetailsContacts.contactid = vtiger_contactdetails.reportsto
+					left join vtiger_customerdetails on vtiger_customerdetails.customerid = vtiger_contactdetails.contactid
+					left join vtiger_account as vtiger_accountContacts on vtiger_accountContacts.accountid = vtiger_contactdetails.accountid
+
+					left join vtiger_contactscf on vtiger_contactdetails.contactid = vtiger_contactscf.contactid
+					left join vtiger_users as vtiger_usersContacts on vtiger_usersContacts.id = vtiger_crmentityContacts.smownerid ";
+			}
 
 		}
 		if($module == "PurchaseOrder")
 		{
 			if($secmodule == "Accounts")
-                        {
-                                $query = "left join vtiger_account on vtiger_account.accountid = vtiger_purchaseorder.accountid
-                                left join vtiger_crmentity as vtiger_crmentityAccounts on vtiger_crmentityAccounts.crmid=vtiger_account.accountid
-                                left join vtiger_accountbillads on vtiger_account.accountid=vtiger_accountbillads.accountaddressid
-                                left join vtiger_accountshipads on vtiger_account.accountid=vtiger_accountshipads.accountaddressid
-                                left join vtiger_accountscf on vtiger_account.accountid = vtiger_accountscf.accountid
-                                left join vtiger_account as vtiger_accountAccounts on vtiger_accountAccounts.accountid = vtiger_account.parentid
-                                left join vtiger_users as vtiger_usersAccounts on vtiger_usersAccounts.id = vtiger_crmentityAccounts.smownerid ";
-                        }
+			{
+				$query = "left join vtiger_account on vtiger_account.accountid = vtiger_purchaseorder.accountid
+					left join vtiger_crmentity as vtiger_crmentityAccounts on vtiger_crmentityAccounts.crmid=vtiger_account.accountid
+					left join vtiger_accountbillads on vtiger_account.accountid=vtiger_accountbillads.accountaddressid
+					left join vtiger_accountshipads on vtiger_account.accountid=vtiger_accountshipads.accountaddressid
+					left join vtiger_accountscf on vtiger_account.accountid = vtiger_accountscf.accountid
+					left join vtiger_account as vtiger_accountAccounts on vtiger_accountAccounts.accountid = vtiger_account.parentid
+					left join vtiger_users as vtiger_usersAccounts on vtiger_usersAccounts.id = vtiger_crmentityAccounts.smownerid ";
+			}
 			if($secmodule == "Contacts")
 			{
 				$query = "left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_purchaseorder.contactid
-                                left join vtiger_crmentity as vtiger_crmentityContacts on vtiger_crmentityContacts.crmid = vtiger_contactdetails.contactid
-                                left join vtiger_contactaddress on vtiger_contactdetails.contactid = vtiger_contactaddress.contactaddressid
-                                left join vtiger_contactsubdetails on vtiger_contactdetails.contactid = vtiger_contactsubdetails.contactsubscriptionid
-                                left join vtiger_contactdetails as vtiger_contactdetailsContacts on vtiger_contactdetailsContacts.contactid = vtiger_contactdetails.reportsto
-                                left join vtiger_account as vtiger_accountContacts on vtiger_accountContacts.accountid = vtiger_contactdetails.accountid
-
-                                left join vtiger_contactscf on vtiger_contactdetails.contactid = vtiger_contactscf.contactid
-                                left join vtiger_users as vtiger_usersContacts on vtiger_usersContacts.id = vtiger_crmentityContacts.smownerid ";
+					left join vtiger_crmentity as vtiger_crmentityContacts on vtiger_crmentityContacts.crmid = vtiger_contactdetails.contactid
+					left join vtiger_contactaddress on vtiger_contactdetails.contactid = vtiger_contactaddress.contactaddressid
+					left join vtiger_contactsubdetails on vtiger_contactdetails.contactid = vtiger_contactsubdetails.contactsubscriptionid
+					left join vtiger_contactdetails as vtiger_contactdetailsContacts on vtiger_contactdetailsContacts.contactid = vtiger_contactdetails.reportsto
+					left join vtiger_customerdetails on vtiger_customerdetails.customerid = vtiger_contactdetails.contactid
+					left join vtiger_account as vtiger_accountContacts on vtiger_accountContacts.accountid = vtiger_contactdetails.accountid
+
+					left join vtiger_contactscf on vtiger_contactdetails.contactid = vtiger_contactscf.contactid
+					left join vtiger_users as vtiger_usersContacts on vtiger_usersContacts.id = vtiger_crmentityContacts.smownerid ";
 			}
 		}
 		if($module == "Invoice")
@@ -826,75 +834,77 @@
 			if($secmodule == "Accounts")
 			{
 				$query = "left join vtiger_account on vtiger_account.accountid = vtiger_invoice.accountid
-                                left join vtiger_crmentity as vtiger_crmentityAccounts on vtiger_crmentityAccounts.crmid=vtiger_account.accountid
-                                left join vtiger_accountbillads on vtiger_account.accountid=vtiger_accountbillads.accountaddressid
-                                left join vtiger_accountshipads on vtiger_account.accountid=vtiger_accountshipads.accountaddressid
-                                left join vtiger_accountscf on vtiger_account.accountid = vtiger_accountscf.accountid
-                                left join vtiger_account as vtiger_accountAccounts on vtiger_accountAccounts.accountid = vtiger_account.parentid
-                                left join vtiger_users as vtiger_usersAccounts on vtiger_usersAccounts.id = vtiger_crmentityAccounts.smownerid ";
+					left join vtiger_crmentity as vtiger_crmentityAccounts on vtiger_crmentityAccounts.crmid=vtiger_account.accountid
+					left join vtiger_accountbillads on vtiger_account.accountid=vtiger_accountbillads.accountaddressid
+					left join vtiger_accountshipads on vtiger_account.accountid=vtiger_accountshipads.accountaddressid
+					left join vtiger_accountscf on vtiger_account.accountid = vtiger_accountscf.accountid
+					left join vtiger_account as vtiger_accountAccounts on vtiger_accountAccounts.accountid = vtiger_account.parentid
+					left join vtiger_users as vtiger_usersAccounts on vtiger_usersAccounts.id = vtiger_crmentityAccounts.smownerid ";
 			}
 		}
 		if($module == "Products")
 		{
 			if($secmodule == "Accounts")
-                        {
-                                $query = "left join vtiger_account on vtiger_account.accountid = vtiger_crmentityRel.crmid
-                                left join vtiger_crmentity as vtiger_crmentityAccounts on vtiger_crmentityAccounts.crmid=vtiger_account.accountid
-                                left join vtiger_accountbillads on vtiger_account.accountid=vtiger_accountbillads.accountaddressid
-                                left join vtiger_accountshipads on vtiger_account.accountid=vtiger_accountshipads.accountaddressid
-                                left join vtiger_accountscf on vtiger_account.accountid = vtiger_accountscf.accountid
-                                left join vtiger_account as vtiger_accountAccounts on vtiger_accountAccounts.accountid = vtiger_account.parentid
-                                left join vtiger_users as vtiger_usersAccounts on vtiger_usersAccounts.id = vtiger_crmentityAccounts.smownerid ";
-                        }
+			{
+				$query = "left join vtiger_account on vtiger_account.accountid = vtiger_crmentityRel.crmid
+					left join vtiger_crmentity as vtiger_crmentityAccounts on vtiger_crmentityAccounts.crmid=vtiger_account.accountid
+					left join vtiger_accountbillads on vtiger_account.accountid=vtiger_accountbillads.accountaddressid
+					left join vtiger_accountshipads on vtiger_account.accountid=vtiger_accountshipads.accountaddressid
+					left join vtiger_accountscf on vtiger_account.accountid = vtiger_accountscf.accountid
+					left join vtiger_account as vtiger_accountAccounts on vtiger_accountAccounts.accountid = vtiger_account.parentid
+					left join vtiger_users as vtiger_usersAccounts on vtiger_usersAccounts.id = vtiger_crmentityAccounts.smownerid ";
+			}
 			if($secmodule == "Contacts")
-                        {
-                                $query = "left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_products.contactid
-                                left join vtiger_crmentity as vtiger_crmentityContacts on vtiger_crmentityContacts.crmid = vtiger_contactdetails.contactid
-                                left join vtiger_contactaddress on vtiger_contactdetails.contactid = vtiger_contactaddress.contactaddressid
-                                left join vtiger_contactsubdetails on vtiger_contactdetails.contactid = vtiger_contactsubdetails.contactsubscriptionid
-                                left join vtiger_contactdetails as vtiger_contactdetailsContacts on vtiger_contactdetailsContacts.contactid = vtiger_contactdetails.reportsto
-                                left join vtiger_account as vtiger_accountContacts on vtiger_accountContacts.accountid = vtiger_contactdetails.accountid
-                                left join vtiger_contactscf on vtiger_contactdetails.contactid = vtiger_contactscf.contactid
-                                left join vtiger_users as vtiger_usersContacts on vtiger_usersContacts.id = vtiger_crmentityContacts.smownerid ";
-
-                        }
+			{
+				$query = "left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_products.contactid
+					left join vtiger_crmentity as vtiger_crmentityContacts on vtiger_crmentityContacts.crmid = vtiger_contactdetails.contactid
+					left join vtiger_contactaddress on vtiger_contactdetails.contactid = vtiger_contactaddress.contactaddressid
+					left join vtiger_contactsubdetails on vtiger_contactdetails.contactid = vtiger_contactsubdetails.contactsubscriptionid
+					left join vtiger_contactdetails as vtiger_contactdetailsContacts on vtiger_contactdetailsContacts.contactid = vtiger_contactdetails.reportsto
+					left join vtiger_customerdetails on vtiger_customerdetails.customerid = vtiger_contactdetails.contactid
+					left join vtiger_account as vtiger_accountContacts on vtiger_accountContacts.accountid = vtiger_contactdetails.accountid
+					left join vtiger_contactscf on vtiger_contactdetails.contactid = vtiger_contactscf.contactid
+					left join vtiger_users as vtiger_usersContacts on vtiger_usersContacts.id = vtiger_crmentityContacts.smownerid ";
+
+			}
 
 		}
 		if($module == "Potentials")
 		{
 			if($secmodule == "Accounts")
-                        {
-                                $query = "left join vtiger_account on vtiger_account.accountid = vtiger_potential.accountid
-                                left join vtiger_crmentity as vtiger_crmentityAccounts on vtiger_crmentityAccounts.crmid=vtiger_account.accountid
-                                left join vtiger_accountbillads on vtiger_account.accountid=vtiger_accountbillads.accountaddressid
-                                left join vtiger_accountshipads on vtiger_account.accountid=vtiger_accountshipads.accountaddressid
-                                left join vtiger_accountscf on vtiger_account.accountid = vtiger_accountscf.accountid
-                                left join vtiger_account as vtiger_accountAccounts on vtiger_accountAccounts.accountid = vtiger_account.parentid
-                                left join vtiger_users as vtiger_usersAccounts on vtiger_usersAccounts.id = vtiger_crmentityAccounts.smownerid ";
-                        }
+			{
+				$query = "left join vtiger_account on vtiger_account.accountid = vtiger_potential.accountid
+					left join vtiger_crmentity as vtiger_crmentityAccounts on vtiger_crmentityAccounts.crmid=vtiger_account.accountid
+					left join vtiger_accountbillads on vtiger_account.accountid=vtiger_accountbillads.accountaddressid
+					left join vtiger_accountshipads on vtiger_account.accountid=vtiger_accountshipads.accountaddressid
+					left join vtiger_accountscf on vtiger_account.accountid = vtiger_accountscf.accountid
+					left join vtiger_account as vtiger_accountAccounts on vtiger_accountAccounts.accountid = vtiger_account.parentid
+					left join vtiger_users as vtiger_usersAccounts on vtiger_usersAccounts.id = vtiger_crmentityAccounts.smownerid ";
+			}
 			if($secmodule == "Contacts")
 			{
 				$query = "left join vtiger_contactdetails on vtiger_contactdetails.accountid = vtiger_potential.accountid
-				left join vtiger_crmentity as vtiger_crmentityContacts on vtiger_crmentityContacts.crmid = vtiger_contactdetails.contactid
-				left join vtiger_contactaddress on vtiger_contactdetails.contactid = vtiger_contactaddress.contactaddressid
-				left join vtiger_contactsubdetails on vtiger_contactdetails.contactid = vtiger_contactsubdetails.contactsubscriptionid
-				left join vtiger_contactdetails as vtiger_contactdetailsContacts on vtiger_contactdetailsContacts.contactid = vtiger_contactdetails.reportsto
-				left join vtiger_account as vtiger_accountContacts on vtiger_accountContacts.accountid = vtiger_contactdetails.accountid
-				left join vtiger_contactscf on vtiger_contactdetails.contactid = vtiger_contactscf.contactid
-				left join vtiger_users as vtiger_usersContacts on vtiger_usersContacts.id = vtiger_crmentityContacts.smownerid ";
+					left join vtiger_crmentity as vtiger_crmentityContacts on vtiger_crmentityContacts.crmid = vtiger_contactdetails.contactid
+					left join vtiger_contactaddress on vtiger_contactdetails.contactid = vtiger_contactaddress.contactaddressid
+					left join vtiger_customerdetails on vtiger_customerdetails.customerid = vtiger_contactdetails.contactid
+					left join vtiger_contactsubdetails on vtiger_contactdetails.contactid = vtiger_contactsubdetails.contactsubscriptionid
+					left join vtiger_contactdetails as vtiger_contactdetailsContacts on vtiger_contactdetailsContacts.contactid = vtiger_contactdetails.reportsto
+					left join vtiger_account as vtiger_accountContacts on vtiger_accountContacts.accountid = vtiger_contactdetails.accountid
+					left join vtiger_contactscf on vtiger_contactdetails.contactid = vtiger_contactscf.contactid
+					left join vtiger_users as vtiger_usersContacts on vtiger_usersContacts.id = vtiger_crmentityContacts.smownerid ";
 
 			}
 			if($secmodule == "Quotes")
 			{
 				$query = "left join vtiger_quotes on vtiger_quotes.potentialid = vtiger_potential.potentialid
-                                left join vtiger_crmentity as vtiger_crmentityQuotes on vtiger_crmentityQuotes.crmid=vtiger_quotes.quoteid
-                                left join vtiger_quotesbillads on vtiger_quotes.quoteid=vtiger_quotesbillads.quotebilladdressid
-                                left join vtiger_quotesshipads on vtiger_quotes.quoteid=vtiger_quotesshipads.quoteshipaddressid
-                                left join vtiger_users as vtiger_usersQuotes on vtiger_usersQuotes.id = vtiger_crmentityQuotes.smownerid
-                                left join vtiger_users as vtiger_usersRel1 on vtiger_usersRel1.id = vtiger_quotes.inventorymanager
-                                left join vtiger_potential as vtiger_potentialRel on vtiger_potentialRel.potentialid = vtiger_quotes.potentialid
-                                left join vtiger_contactdetails as vtiger_contactdetailsQuotes on vtiger_contactdetailsQuotes.contactid = vtiger_quotes.contactid
-                                left join vtiger_account as vtiger_accountQuotes on vtiger_accountQuotes.accountid = vtiger_quotes.accountid ";
+					left join vtiger_crmentity as vtiger_crmentityQuotes on vtiger_crmentityQuotes.crmid=vtiger_quotes.quoteid
+					left join vtiger_quotesbillads on vtiger_quotes.quoteid=vtiger_quotesbillads.quotebilladdressid
+					left join vtiger_quotesshipads on vtiger_quotes.quoteid=vtiger_quotesshipads.quoteshipaddressid
+					left join vtiger_users as vtiger_usersQuotes on vtiger_usersQuotes.id = vtiger_crmentityQuotes.smownerid
+					left join vtiger_users as vtiger_usersRel1 on vtiger_usersRel1.id = vtiger_quotes.inventorymanager
+					left join vtiger_potential as vtiger_potentialRel on vtiger_potentialRel.potentialid = vtiger_quotes.potentialid
+					left join vtiger_contactdetails as vtiger_contactdetailsQuotes on vtiger_contactdetailsQuotes.contactid = vtiger_quotes.contactid
+					left join vtiger_account as vtiger_accountQuotes on vtiger_accountQuotes.accountid = vtiger_quotes.accountid ";
 			}
 		}
 		if($module == "HelpDesk")
@@ -902,30 +912,31 @@
 			if($secmodule == "Products")
 			{
 				$query = "left join vtiger_products on vtiger_products.productid = vtiger_troubletickets.product_id
-                                left join vtiger_crmentity as vtiger_crmentityProducts on vtiger_crmentityProducts.crmid=vtiger_products.productid
-                                left join vtiger_productcf on vtiger_products.productid = vtiger_productcf.productid
-                                left join vtiger_users as vtiger_usersProducts on vtiger_usersProducts.id = vtiger_crmentityProducts.smownerid
-																left join vtiger_contactdetails as vtiger_contactdetailsProducts on vtiger_contactdetailsProducts.contactid = vtiger_products.contactid 
-                                left join vtiger_vendor as vtiger_vendorRel on vtiger_vendorRel.vendorid = vtiger_products.vendor_id
-                                left join vtiger_seproductsrel on vtiger_seproductsrel.productid = vtiger_products.productid
-                                left join vtiger_crmentity as vtiger_crmentityRelProducts on vtiger_crmentityRelProducts.crmid = vtiger_seproductsrel.crmid
-                                left join vtiger_account as vtiger_accountRelProducts on vtiger_accountRelProducts.accountid=vtiger_seproductsrel.crmid
-                                left join vtiger_leaddetails as vtiger_leaddetailsRelProducts on vtiger_leaddetailsRelProducts.leadid = vtiger_seproductsrel.crmid
-                                left join vtiger_potential as vtiger_potentialRelProducts on vtiger_potentialRelProducts.potentialid = vtiger_seproductsrel.crmid ";
+					left join vtiger_crmentity as vtiger_crmentityProducts on vtiger_crmentityProducts.crmid=vtiger_products.productid
+					left join vtiger_productcf on vtiger_products.productid = vtiger_productcf.productid
+					left join vtiger_users as vtiger_usersProducts on vtiger_usersProducts.id = vtiger_crmentityProducts.smownerid
+					left join vtiger_contactdetails as vtiger_contactdetailsProducts on vtiger_contactdetailsProducts.contactid = vtiger_products.contactid 
+					left join vtiger_vendor as vtiger_vendorRel on vtiger_vendorRel.vendorid = vtiger_products.vendor_id
+					left join vtiger_seproductsrel on vtiger_seproductsrel.productid = vtiger_products.productid
+					left join vtiger_crmentity as vtiger_crmentityRelProducts on vtiger_crmentityRelProducts.crmid = vtiger_seproductsrel.crmid
+					left join vtiger_account as vtiger_accountRelProducts on vtiger_accountRelProducts.accountid=vtiger_seproductsrel.crmid
+					left join vtiger_leaddetails as vtiger_leaddetailsRelProducts on vtiger_leaddetailsRelProducts.leadid = vtiger_seproductsrel.crmid
+					left join vtiger_potential as vtiger_potentialRelProducts on vtiger_potentialRelProducts.potentialid = vtiger_seproductsrel.crmid ";
 			}
 		}
 		if($module == "Activities")
 		{
 			if($secmodule == "Contacts")
 			{
-                                $query = "left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid 
-                                left join vtiger_crmentity as vtiger_crmentityContacts on vtiger_crmentityContacts.crmid = vtiger_contactdetails.contactid
-                                left join vtiger_contactaddress on vtiger_contactdetails.contactid = vtiger_contactaddress.contactaddressid
-                                left join vtiger_contactsubdetails on vtiger_contactdetails.contactid = vtiger_contactsubdetails.contactsubscriptionid
-                                left join vtiger_contactdetails as vtiger_contactdetailsContacts on vtiger_contactdetailsContacts.contactid = vtiger_contactdetails.reportsto
-                                left join vtiger_account as vtiger_accountContacts on vtiger_accountContacts.accountid = vtiger_contactdetails.accountid
-                                left join vtiger_contactscf on vtiger_contactdetails.contactid = vtiger_contactscf.contactid
-                                left join vtiger_users as vtiger_usersContacts on vtiger_usersContacts.id = vtiger_crmentityContacts.smownerid ";
+				$query = "left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid 
+					left join vtiger_crmentity as vtiger_crmentityContacts on vtiger_crmentityContacts.crmid = vtiger_contactdetails.contactid
+					left join vtiger_contactaddress on vtiger_contactdetails.contactid = vtiger_contactaddress.contactaddressid
+					left join vtiger_customerdetails on vtiger_customerdetails.customerid = vtiger_contactdetails.contactid
+					left join vtiger_contactsubdetails on vtiger_contactdetails.contactid = vtiger_contactsubdetails.contactsubscriptionid
+					left join vtiger_contactdetails as vtiger_contactdetailsContacts on vtiger_contactdetailsContacts.contactid = vtiger_contactdetails.reportsto
+					left join vtiger_account as vtiger_accountContacts on vtiger_accountContacts.accountid = vtiger_contactdetails.accountid
+					left join vtiger_contactscf on vtiger_contactdetails.contactid = vtiger_contactscf.contactid
+					left join vtiger_users as vtiger_usersContacts on vtiger_usersContacts.id = vtiger_crmentityContacts.smownerid ";
 			}
 		}
 		$log->info("ReportRun :: Successfully returned getRelatedModulesQuery".$secmodule);
@@ -944,9 +955,8 @@
 				left join vtiger_users as vtiger_usersLeads on vtiger_usersLeads.id = vtiger_crmentityLeads.smownerid
 				where vtiger_crmentityLeads.deleted=0 and vtiger_leaddetails.converted=0";
 		}
-
 		if($module == "Accounts")
-                {
+		{
 			$query = "from vtiger_account 
 				inner join vtiger_crmentity as vtiger_crmentityAccounts on vtiger_crmentityAccounts.crmid=vtiger_account.accountid 
 				inner join vtiger_accountbillads on vtiger_account.accountid=vtiger_accountbillads.accountaddressid 
@@ -959,7 +969,7 @@
 		}
 
 		if($module == "Contacts")
-                {
+		{
 			$query = "from vtiger_contactdetails
 				inner join vtiger_crmentity as vtiger_crmentityContacts on vtiger_crmentityContacts.crmid = vtiger_contactdetails.contactid 
 				inner join vtiger_contactaddress on vtiger_contactdetails.contactid = vtiger_contactaddress.contactaddressid 
@@ -983,7 +993,7 @@
 				".$this->getRelatedModulesQuery($module,$this->secondarymodule)."
 				where vtiger_crmentityPotentials.deleted=0 ";
 		}
-		
+
 		if($module == "Products")
 		{
 			$query = "from vtiger_products 
@@ -1007,7 +1017,7 @@
 				inner join vtiger_crmentity as vtiger_crmentityHelpDesk 
 				on vtiger_crmentityHelpDesk.crmid=vtiger_troubletickets.ticketid 
 				inner join vtiger_ticketcf on vtiger_ticketcf.ticketid = vtiger_troubletickets.ticketid
-        left join vtiger_crmentity as vtiger_crmentityRelHelpDesk on vtiger_crmentityRelHelpDesk.crmid = vtiger_troubletickets.parent_id
+				left join vtiger_crmentity as vtiger_crmentityRelHelpDesk on vtiger_crmentityRelHelpDesk.crmid = vtiger_troubletickets.parent_id
 				left join vtiger_account as vtiger_accountRelHelpDesk on vtiger_accountRelHelpDesk.accountid=crmentityRelHelpDesk.crmid 
 				left join vtiger_contactdetails as vtiger_contactdetailsRelHelpDesk on vtiger_contactdetailsRelHelpDesk.contactid= vtiger_crmentityRelHelpDesk.crmid
 				left join vtiger_products as vtiger_productsRel on vtiger_productsRel.productid = vtiger_crmentityRelHelpDesk.crmid
@@ -1025,7 +1035,7 @@
 				left join vtiger_users as vtiger_usersActivities on vtiger_usersActivities.id = vtiger_crmentityActivities.smownerid
 				left join vtiger_seactivityrel on vtiger_seactivityrel.activityid = vtiger_activity.activityid
 				left join vtiger_crmentity as vtiger_crmentityRelActivities on vtiger_crmentityRelActivities.crmid = vtiger_seactivityrel.crmid
-				left join vtiger_account as vtiger_accountRelActivities on vtiger_accountRelActivities.accountid=crmentityRelActivities.crmid
+				left join vtiger_account as vtiger_accountRelActivities on vtiger_accountRelActivities.accountid=vtiger_crmentityRelActivities.crmid
 				left join vtiger_leaddetails as vtiger_leaddetailsRelActivities on vtiger_leaddetailsRelActivities.leadid = vtiger_crmentityRelActivities.crmid
 				left join vtiger_potential as vtiger_potentialRelActivities on vtiger_potentialRelActivities.potentialid = vtiger_crmentityRelActivities.crmid
 				left join vtiger_quotes as vtiger_quotesRelActivities on vtiger_quotesRelActivities.quoteid = vtiger_crmentityRelActivities.crmid
@@ -1034,13 +1044,14 @@
 				".$this->getRelatedModulesQuery($module,$this->secondarymodule)."
 				WHERE vtiger_crmentityActivities.deleted=0 and (vtiger_activity.activitytype = 'Meeting' or vtiger_activity.activitytype='Call' or vtiger_activity.activitytype='Task')";
 		}
-		
+
 		if($module == "Quotes")
 		{
 			$query = "from vtiger_quotes 
 				inner join vtiger_crmentity as vtiger_crmentityQuotes on vtiger_crmentityQuotes.crmid=vtiger_quotes.quoteid 
 				inner join vtiger_quotesbillads on vtiger_quotes.quoteid=vtiger_quotesbillads.quotebilladdressid 
-				inner join vtiger_quotesshipads on vtiger_quotes.quoteid=vtiger_quotesshipads.quoteshipaddressid 
+				inner join vtiger_quotesshipads on vtiger_quotes.quoteid=vtiger_quotesshipads.quoteshipaddressid  
+				left join vtiger_quotescf on vtiger_quotes.quoteid = vtiger_quotescf.quoteid 
 				left join vtiger_users as vtiger_usersQuotes on vtiger_usersQuotes.id = vtiger_crmentityQuotes.smownerid
 				left join vtiger_users as vtiger_usersRel1 on vtiger_usersRel1.id = vtiger_quotes.inventorymanager
 				left join vtiger_potential as vtiger_potentialRel on vtiger_potentialRel.potentialid = vtiger_quotes.potentialid
@@ -1049,13 +1060,14 @@
 				".$this->getRelatedModulesQuery($module,$this->secondarymodule)."
 				where vtiger_crmentityQuotes.deleted=0";
 		}
-		
+
 		if($module == "PurchaseOrder")
 		{
 			$query = "from vtiger_purchaseorder 
 				inner join vtiger_crmentity as vtiger_crmentityPurchaseOrder on vtiger_crmentityPurchaseOrder.crmid=vtiger_purchaseorder.purchaseorderid 
 				inner join vtiger_pobillads on vtiger_purchaseorder.purchaseorderid=vtiger_pobillads.pobilladdressid 
 				inner join vtiger_poshipads on vtiger_purchaseorder.purchaseorderid=vtiger_poshipads.poshipaddressid 
+				left join vtiger_purchaseordercf on vtiger_purchaseorder.purchaseorderid = vtiger_purchaseordercf.purchaseorderid  
 				left join vtiger_users as vtiger_usersPurchaseOrder on vtiger_usersPurchaseOrder.id = vtiger_crmentityPurchaseOrder.smownerid 
 				left join vtiger_vendor as vtiger_vendorRel on vtiger_vendorRel.vendorid = vtiger_purchaseorder.vendorid 
 				left join vtiger_contactdetails as vtiger_contactdetailsPurchaseOrder on vtiger_contactdetailsPurchaseOrder.contactid = vtiger_purchaseorder.contactid 
@@ -1069,11 +1081,28 @@
 				inner join vtiger_crmentity as vtiger_crmentityInvoice on vtiger_crmentityInvoice.crmid=vtiger_invoice.invoiceid 
 				inner join vtiger_invoicebillads on vtiger_invoice.invoiceid=vtiger_invoicebillads.invoicebilladdressid 
 				inner join vtiger_invoiceshipads on vtiger_invoice.invoiceid=vtiger_invoiceshipads.invoiceshipaddressid 
+				left join vtiger_invoicecf on vtiger_invoice.invoiceid = vtiger_invoicecf.invoiceid 
 				left join vtiger_users as vtiger_usersInvoice on vtiger_usersInvoice.id = vtiger_crmentityInvoice.smownerid
 				left join vtiger_account as vtiger_accountInvoice on vtiger_accountInvoice.accountid = vtiger_invoice.accountid
 				".$this->getRelatedModulesQuery($module,$this->secondarymodule)."
 				where vtiger_crmentityInvoice.deleted=0";
 		}
+		if($module == "SalesOrder")
+		{
+			$query = "from vtiger_salesorder 
+				inner join vtiger_crmentity as vtiger_crmentitySalesOrder on vtiger_crmentitySalesOrder.crmid=vtiger_salesorder.salesorderid 
+				inner join vtiger_sobillads on vtiger_salesorder.salesorderid=vtiger_sobillads.sobilladdressid 
+				inner join vtiger_soshipads on vtiger_salesorder.salesorderid=vtiger_soshipads.soshipaddressid 
+				left join vtiger_salesordercf on vtiger_salesorder.salesorderid = vtiger_salesordercf.salesorderid  
+				left join vtiger_contactdetails as vtiger_contactdetailsSalesOrder on vtiger_contactdetailsSalesOrder.contactid = vtiger_salesorder.contactid 
+				left join vtiger_quotes as vtiger_quotesSalesOrder on vtiger_quotesSalesOrder.quoteid = vtiger_salesorder.quoteid				
+				left join vtiger_account as vtiger_accountSalesOrder on vtiger_accountSalesOrder.accountid = vtiger_salesorder.accountid
+				left join vtiger_potential as vtiger_potentialRel on vtiger_potentialRel.potentialid = vtiger_salesorder.potentialid 
+				left join vtiger_users as vtiger_usersSalesOrder on vtiger_usersSalesOrder.id = vtiger_crmentitySalesOrder.smownerid 
+				where vtiger_crmentitySalesOrder.deleted=0";
+
+
+		}	
 		$log->info("ReportRun :: Successfully returned getReportsQuery".$module);
 		return $query;
 	}
@@ -1114,13 +1143,12 @@
 		{
 			$groupsquery = implode(", ",$groupslist);
 		}
-		
+
 		//standard list
 		if(isset($stdfilterlist))
 		{
 			$stdfiltersql = implode(", ",$stdfilterlist);
 		}
-		//print_r($filterlist);
 		if(isset($filterlist))
 		{
 			$stdfiltersql = implode(", ",$filterlist);
@@ -1128,7 +1156,7 @@
 		//columns to total list
 		if(isset($columnstotallist))
 		{
-	       $columnstotalsql = implode(", ",$columnstotallist);
+			$columnstotalsql = implode(", ",$columnstotallist);
 		}
 		//advanced filterlist
 		if(isset($advfilterlist))
@@ -1141,11 +1169,11 @@
 		}
 		if($advfiltersql != "")
 		{
-				$wheresql .= " and ".$advfiltersql;
-		}
-		
+			$wheresql .= " and ".$advfiltersql;
+		}
+
 		$reportquery = $this->getReportsQuery($this->primarymodule);
-			
+
 		if($type == 'COLUMNSTOTOTAL')
 		{
 			if(trim($groupsquery) != "")
@@ -1178,9 +1206,9 @@
 
 	function GenerateReport($outputformat,$filterlist)
 	{
-                 global $adb;
-         	 global $modules;
-		 global $mod_strings;
+		global $adb;
+		global $modules;
+		global $mod_strings;
 
 		if($outputformat == "HTML")
 		{
@@ -1195,7 +1223,7 @@
 					$fld = $adb->field_name($result, $x);
 					$header .= "<td class='rptCellLabel'>".str_replace($modules," ",$fld->name)."</td>";
 				}
-				
+
 				$noofrows = $adb->num_rows($result);
 				$custom_field_values = $adb->fetch_array($result);
 				$groupslist = $this->getGroupingList($this->reportid);
@@ -1213,18 +1241,18 @@
 					}elseif(count($groupslist) == 3)
 					{
 						$newvalue = $custom_field_values[0];
-                                                $snewvalue = $custom_field_values[1];
+						$snewvalue = $custom_field_values[1];
 						$tnewvalue = $custom_field_values[2];
 					}
-					
+
 					if($newvalue == "") $newvalue = "-";
 
 					if($snewvalue == "") $snewvalue = "-";
 
 					if($tnewvalue == "") $tnewvalue = "-";
- 
+
 					$valtemplate .= "<tr>";
-					
+
 					for ($i=0; $i<$y; $i++)
 					{
 						$fld = $adb->field_name($result, $i);
@@ -1273,22 +1301,22 @@
 								$valtemplate .= "<td class='rptGrpHead'>".$fieldvalue."</td>";
 							}
 						}
-					  }
-					 $valtemplate .= "</tr>";
-					 $lastvalue = $newvalue;
-					 $secondvalue = $snewvalue;
-					 $thirdvalue = $tnewvalue;
-				$arr_val[] = $arraylists;
+					}
+					$valtemplate .= "</tr>";
+					$lastvalue = $newvalue;
+					$secondvalue = $snewvalue;
+					$thirdvalue = $tnewvalue;
+					$arr_val[] = $arraylists;
 				}while($custom_field_values = $adb->fetch_array($result));
-				
-				 $sHTML ='<table cellpadding="5" cellspacing="0" align="center" class="rptTable">
-				  <tr>'. 
-				   $header
-				  .'<!-- BEGIN values -->
-				  <tr>'. 
-				   $valtemplate
-				  .'</tr>
-				</table>';
+
+				$sHTML ='<table cellpadding="5" cellspacing="0" align="center" class="rptTable">
+					<tr>'. 
+					$header
+					.'<!-- BEGIN values -->
+					<tr>'. 
+					$valtemplate
+					.'</tr>
+					</table>';
 				//<<<<<<<<construct HTML>>>>>>>>>>>>
 				$return_data[] = $sHTML;
 				$return_data[] = $noofrows;
@@ -1297,7 +1325,7 @@
 			}
 		}elseif($outputformat == "PDF")
 		{
-			
+
 			$sSQL = $this->sGetSQLforReport($this->reportid,$filterlist);
 			$result = $adb->query($sSQL);
 			$y=$adb->num_fields($result);
@@ -1306,7 +1334,7 @@
 			{
 				$noofrows = $adb->num_rows($result);
 				$custom_field_values = $adb->fetch_array($result);
-				
+
 				do
 				{
 					$arraylists = Array();
@@ -1316,7 +1344,7 @@
 						$fieldvalue = $custom_field_values[$i];
 						if($fieldvalue == "" )
 						{
-						   $fieldvalue = "-";
+							$fieldvalue = "-";
 						}
 						$arraylists[str_replace($modules," ",$fld->name)] = $fieldvalue;
 					}
@@ -1352,7 +1380,7 @@
 					}
 					foreach($totclmnflds as $key=>$value)
 					{
-						
+
 						$coltotalhtml .= '<tr class="rptGrpHead" valign=top><td class="rptData">'.str_replace($modules," ",$value).'</td>';
 						$arraykey = trim($value).'_SUM';
 						if(isset($keyhdr[$arraykey]))
@@ -1399,7 +1427,7 @@
 			return $coltotalhtml;
 		}
 	}
-	
+
 	//<<<<<<<new>>>>>>>>>>
 	function getColumnsTotal($reportid)
 	{
@@ -1408,34 +1436,34 @@
 		global $log;
 
 		$coltotalsql = "select vtiger_reportsummary.* from vtiger_report";
-        $coltotalsql .= " inner join vtiger_reportsummary on vtiger_report.reportid = vtiger_reportsummary.reportsummaryid";
-        $coltotalsql .= " where vtiger_report.reportid =".$reportid;
-
-        $result = $adb->query($coltotalsql);
-		
+		$coltotalsql .= " inner join vtiger_reportsummary on vtiger_report.reportid = vtiger_reportsummary.reportsummaryid";
+		$coltotalsql .= " where vtiger_report.reportid =".$reportid;
+
+		$result = $adb->query($coltotalsql);
+
 		while($coltotalrow = $adb->fetch_array($result))
 		{
 			$fieldcolname = $coltotalrow["columnname"];
-			
+
 			if($fieldcolname != "none")
 			{
-					$fieldlist = explode(":",$fieldcolname);
-					if($fieldlist[4] == 2)
-					{
-					  $stdfilterlist[$fieldcolname] = "sum(".$fieldlist[1].".".$fieldlist[2].") ".$fieldlist[3];
-					}
-					if($fieldlist[4] == 3)
-					{
-					  $stdfilterlist[$fieldcolname] = "avg(".$fieldlist[1].".".$fieldlist[2].") ".$fieldlist[3];
-					}
-					if($fieldlist[4] == 4)
-					{
-					  $stdfilterlist[$fieldcolname] = "min(".$fieldlist[1].".".$fieldlist[2].") ".$fieldlist[3];
-					}
-					if($fieldlist[4] == 5)
-					{
-					  $stdfilterlist[$fieldcolname] = "max(".$fieldlist[1].".".$fieldlist[2].") ".$fieldlist[3];
-					}
+				$fieldlist = explode(":",$fieldcolname);
+				if($fieldlist[4] == 2)
+				{
+					$stdfilterlist[$fieldcolname] = "sum(".$fieldlist[1].".".$fieldlist[2].") ".$fieldlist[3];
+				}
+				if($fieldlist[4] == 3)
+				{
+					$stdfilterlist[$fieldcolname] = "avg(".$fieldlist[1].".".$fieldlist[2].") ".$fieldlist[3];
+				}
+				if($fieldlist[4] == 4)
+				{
+					$stdfilterlist[$fieldcolname] = "min(".$fieldlist[1].".".$fieldlist[2].") ".$fieldlist[3];
+				}
+				if($fieldlist[4] == 5)
+				{
+					$stdfilterlist[$fieldcolname] = "max(".$fieldlist[1].".".$fieldlist[2].") ".$fieldlist[3];
+				}
 			}
 		}
 		$log->info("ReportRun :: Successfully returned getColumnsTotal".$reportid);
@@ -1452,14 +1480,14 @@
 		$sreportstdfiltersql = "select vtiger_reportsummary.* from vtiger_report"; 
 		$sreportstdfiltersql .= " inner join vtiger_reportsummary on vtiger_report.reportid = vtiger_reportsummary.reportsummaryid"; 
 		$sreportstdfiltersql .= " where vtiger_report.reportid =".$reportid;
-		
+
 		$result = $adb->query($sreportstdfiltersql);
 		$noofrows = $adb->num_rows($result);
-	
+
 		for($i=0; $i<$noofrows; $i++)
 		{
 			$fieldcolname = $adb->query_result($result,$i,"columnname");
-			
+
 			if($fieldcolname != "none")
 			{
 				$fieldlist = explode(":",$fieldcolname);

Modified: vtigercrm/trunk/modules/Reports/Reports.php
==============================================================================
--- vtigercrm/trunk/modules/Reports/Reports.php (original)
+++ vtigercrm/trunk/modules/Reports/Reports.php Mon Jun 19 17:13:26 2006
@@ -36,7 +36,7 @@
 			   );
 
 $report_modules = Array('Leads','Accounts','Contacts','Potentials','Products',
-			'HelpDesk','Quotes','PurchaseOrder','Invoice','Activities'
+			'HelpDesk','Quotes','PurchaseOrder','Invoice','Activities','SalesOrder'
 		       );
 
 $related_modules = Array('Leads'=>Array(),
@@ -48,6 +48,7 @@
 			 'HelpDesk'=>Array('Products'),
 			 'Quotes'=>Array('Accounts','Contacts','Potentials'),
 			 'PurchaseOrder'=>Array('Contacts'),
+			 'SalesOrder'=>Array(),
 			 'Invoice'=>Array('Accounts')
 			);
 
@@ -61,12 +62,12 @@
 
 
 
-/**
- * This class has the informations for Reports and inherits class CRMEntity and
- * has the variables required to generate,save,restore vtiger_reports
- * and also the required functions for the same
- * Contributor(s): ______________________________________..
- */
+	/**
+	 * This class has the informations for Reports and inherits class CRMEntity and
+	 * has the variables required to generate,save,restore vtiger_reports
+	 * and also the required functions for the same
+	 * Contributor(s): ______________________________________..
+	 */
 
 
 	var $srptfldridjs;
@@ -102,28 +103,29 @@
 	var $sec_module_columnslist;
 
 	var $advft_column;
-        var $advft_option;
-        var $advft_value;
-
-	var $module_list = Array("Leads"=>Array("Information"=>13,"Address"=>15,"Description"=>16,"Custom Information"=>5),
-	 			 "Contacts"=>Array("Information"=>4,"- Portal Information"=>6,"Address"=>7,"Description"=>8,"Custom Information"=>5),
-				 "Accounts"=>Array("Information"=>9,"Address"=>11,"Description"=>12,"Custom Information"=>5),
-				 "Potentials"=>Array("Information"=>1,"Description"=>3,"Custom Information"=>5),
-				 "Activities"=>Array("Information"=>19,"Description"=>20),
-				 "Products"=>Array("Information"=>31,"Description"=>36,"Custom Information"=>5),
-				 "Notes"=>Array("Information"=>17,"Description"=>18),
-				 "Emails"=>Array("Information"=>1,"Description"=>24),
-				 "HelpDesk"=>Array("Information"=>'25,26',"Custom Information"=>5,"Description"=>28,"Solution"=>29),//patch2
-				 "Quotes"=>Array("Information"=>51,"Address"=>53,"Description"=>56,"Custom Information"=>5),
-				 "PurchaseOrder"=>Array("Information"=>57,"Address"=>59,"Description"=>61,"Custom Information"=>5),
-				 "Invoice"=>Array("Information"=>69,"Address"=>71,"Description"=>74,"Custom Information"=>5)
-				);
-
-/** Function to set primodule,secmodule,reporttype,reportname,reportdescription,folderid for given vtiger_reportid
- *  This function accepts the vtiger_reportid as argument
- *  It sets primodule,secmodule,reporttype,reportname,reportdescription,folderid for the given vtiger_reportid
- */
-			
+	var $advft_option;
+	var $advft_value;
+
+	var $module_list = Array("Leads"=>Array("Information"=>13,"Address"=>15,"Description"=>16,"Custom Information"=>14),
+							"Contacts"=>Array("Information"=>4,"- Portal Information"=>6,"Address"=>7,"Description"=>8,"Custom Information"=>5),
+							"Accounts"=>Array("Information"=>9,"Address"=>11,"Description"=>12,"Custom Information"=>10),
+							"Potentials"=>Array("Information"=>1,"Description"=>3,"Custom Information"=>2),
+							"Activities"=>Array("Information"=>19,"Description"=>20),
+							"Products"=>Array("Information"=>31,"Description"=>36,"Custom Information"=>34),
+							"Notes"=>Array("Information"=>17,"Description"=>18),
+							"Emails"=>Array("Information"=>21,"Description"=>24),
+							"HelpDesk"=>Array("Information"=>'25,26',"Custom Information"=>27,"Description"=>28,"Solution"=>29),//patch2
+							"Quotes"=>Array("Information"=>51,"Address"=>53,"Description"=>56,"Custom Information"=>52),
+							"PurchaseOrder"=>Array("Information"=>57,"Address"=>59,"Description"=>61,"Custom Information"=>58),
+							"SalesOrder"=>Array("Information"=>63,"Address"=>65,"Description"=>68,"Custom Information"=>64),
+							"Invoice"=>Array("Information"=>69,"Address"=>71,"Description"=>74,"Custom Information"=>70)
+					);
+
+	/** Function to set primodule,secmodule,reporttype,reportname,reportdescription,folderid for given vtiger_reportid
+	 *  This function accepts the vtiger_reportid as argument
+	 *  It sets primodule,secmodule,reporttype,reportname,reportdescription,folderid for the given vtiger_reportid
+	 */
+
 	function Reports($reportid="")
 	{
 		global $adb;
@@ -133,7 +135,7 @@
 			$ssql = "select vtiger_reportmodules.*,vtiger_report.* from vtiger_report inner join vtiger_reportmodules on vtiger_report.reportid = vtiger_reportmodules.reportmodulesid";
 			$ssql .= " where vtiger_report.reportid =".$reportid;
 			$result = $adb->query($ssql);
-		        $reportmodulesrow = $adb->fetch_array($result);
+			$reportmodulesrow = $adb->fetch_array($result);
 			if($reportmodulesrow)
 			{
 				$this->primodule = $reportmodulesrow["primarymodule"];
@@ -147,12 +149,12 @@
 	}
 
 
-/** Function to get the Listview of Reports
- *  This function accepts no argument
- *  This generate the Reports view page and returns a string
- *  contains HTML 
- */
-	
+	/** Function to get the Listview of Reports
+	 *  This function accepts no argument
+	 *  This generate the Reports view page and returns a string
+	 *  contains HTML 
+	 */
+
 	function sgetRptFldr($mode='')
 	{
 
@@ -194,11 +196,11 @@
 		return $returndata;
 	}
 
-/** Function to get the Reports inside each modules
- *  This function accepts the folderid
- *  This Generates the Reports under each Reports module 
- *  This Returns a HTML sring
- */
+	/** Function to get the Reports inside each modules
+	 *  This function accepts the folderid
+	 *  This Generates the Reports under each Reports module 
+	 *  This Returns a HTML sring
+	 */
 
 	function sgetRptsforFldr($rpt_fldr_id)
 	{
@@ -207,53 +209,53 @@
 		global $log;
 		global $mod_strings;
 		$returndata = Array();
-		
+
 		require_once('include/utils/UserInfoUtil.php');
-		
+
 		$sql = "select vtiger_report.*, vtiger_reportmodules.* from vtiger_report inner join vtiger_reportfolder on vtiger_reportfolder.folderid = vtiger_report.folderid";
 		$sql .= " inner join vtiger_reportmodules on vtiger_reportmodules.reportmodulesid = vtiger_report.reportid where vtiger_reportfolder.folderid=".$rpt_fldr_id;
 		$result = $adb->query($sql);
 		$report = $adb->fetch_array($result);
 		if(count($report)>0)
 		{
-					  do
-					  {
-						  	$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));
-		}
-	
+			do
+			{
+				$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));
+		}
+
 		$log->info("Reports :: ListView->Successfully returned vtiger_report details HTML");
 		return $returndata;
 	}
 
-/** Function to get the array of ids
- *  This function forms the array for the ExpandCollapse
- *  Javascript
- *  It returns the array of ids
- *  Array('1RptFldr','2RptFldr',........,'9RptFldr','10RptFldr')
- */
+	/** Function to get the array of ids
+	 *  This function forms the array for the ExpandCollapse
+	 *  Javascript
+	 *  It returns the array of ids
+	 *  Array('1RptFldr','2RptFldr',........,'9RptFldr','10RptFldr')
+	 */
 
 	function sgetJsRptFldr()
 	{
 		$srptfldr_js = "var ReportListArray=new Array(".$this->srptfldridjs.")
-		setExpandCollapse()";
+			setExpandCollapse()";
 		return $srptfldr_js;
 	}
 
-/** Function to set the Primary module vtiger_fields for the given Report 
- *  This function sets the primary module columns for the given Report 
- *  It accepts the Primary module as the argument and set the vtiger_fields of the module
- *  to the varialbe pri_module_columnslist and returns true if sucess
- */
+	/** Function to set the Primary module vtiger_fields for the given Report 
+	 *  This function sets the primary module columns for the given Report 
+	 *  It accepts the Primary module as the argument and set the vtiger_fields of the module
+	 *  to the varialbe pri_module_columnslist and returns true if sucess
+	 */
 
 	function getPriModuleColumnsList($module)
 	{
@@ -265,121 +267,125 @@
 		return true;
 	}
 
-/** Function to set the Secondary module fileds for the given Report
- *  This function sets the secondary module columns for the given module
- *  It accepts the module as the argument and set the vtiger_fields of the module
- *  to the varialbe sec_module_columnslist and returns true if sucess
- */
-	
+	/** Function to set the Secondary module fileds for the given Report
+	 *  This function sets the secondary module columns for the given module
+	 *  It accepts the module as the argument and set the vtiger_fields of the module
+	 *  to the varialbe sec_module_columnslist and returns true if sucess
+	 */
+
 	function getSecModuleColumnsList($module)
-        {
-        	if($module != "")
-			{
-				$secmodule = explode(":",$module);
-               	for($i=0;$i < count($secmodule) ;$i++)
-               	{
-					foreach($this->module_list[$secmodule[$i]] as $key=>$value)
-               		{
-                       	$ret_module_list[$secmodule[$i]][$key] = $this->getColumnsListbyBlock($secmodule[$i],$value);
-               		}
+	{
+		if($module != "")
+		{
+			$secmodule = explode(":",$module);
+			for($i=0;$i < count($secmodule) ;$i++)
+			{
+				foreach($this->module_list[$secmodule[$i]] as $key=>$value)
+				{
+					$ret_module_list[$secmodule[$i]][$key] = $this->getColumnsListbyBlock($secmodule[$i],$value);
 				}
-               	$this->sec_module_columnslist = $ret_module_list;
-			}
-            return true;
-        }
-
-/** Function to get vtiger_fields for the given module and block
- *  This function gets the vtiger_fields for the given module
- *  It accepts the module and the block as arguments and 
- *  returns the array column lists
- *  Array module_columnlist[ vtiger_fieldtablename:fieldcolname:module_fieldlabel1:fieldname:fieldtypeofdata]=fieldlabel
- */
+			}
+			$this->sec_module_columnslist = $ret_module_list;
+		}
+		return true;
+	}
+
+	/** Function to get vtiger_fields for the given module and block
+	 *  This function gets the vtiger_fields for the given module
+	 *  It accepts the module and the block as arguments and 
+	 *  returns the array column lists
+	 *  Array module_columnlist[ vtiger_fieldtablename:fieldcolname:module_fieldlabel1:fieldname:fieldtypeofdata]=fieldlabel
+	 */
 
 	function getColumnsListbyBlock($module,$block)
 	{
-        global $adb;
-	global $log;
-	global $profileList;
-	global $current_user;
-	
-
-        $tabid = getTabid($module);
-	
-	//Security Check 
-	if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] ==0)
-	{
-		$sql = "select * from vtiger_field where vtiger_field.uitype != 50 and vtiger_field.tabid=".$tabid." and vtiger_field.block in (".$block .") and vtiger_field.displaytype in (1,2) order by sequence";
-	}
-	else
-	{
-			
-        	$sql = "select * from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.uitype != 50 and vtiger_field.tabid=".$tabid." and vtiger_field.block in (".$block .") and vtiger_field.displaytype in (1,2) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList." group by vtiger_field.fieldid order by sequence";
-	}
-        $result = $adb->query($sql);
-        $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");
+		global $adb;
+		global $log;
+		global $profileList;
+		global $current_user;
+
+
+		$tabid = getTabid($module);
+
+		//Security Check 
+		if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] ==0)
+		{
+			$sql = "select * from vtiger_field where vtiger_field.uitype != 50 and vtiger_field.tabid=".$tabid." and vtiger_field.block in (".$block .") and vtiger_field.displaytype in (1,2) order by sequence";
+		}
+		else
+		{
+
+			$sql = "select * from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.uitype != 50 and vtiger_field.tabid=".$tabid." and vtiger_field.block in (".$block .") and vtiger_field.displaytype in (1,2) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList." group by vtiger_field.fieldid order by sequence";
+		}
+		$result = $adb->query($sql);
+		$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");
 			$fieldname = $adb->query_result($result,$i,"fieldname");
 			$fieldtype = $adb->query_result($result,$i,"typeofdata");
 			$fieldtype = explode("~",$fieldtype);
 			$fieldtypeofdata = $fieldtype[0];
-
-            if($fieldtablename == "crmentity")
-            {
-   	        	$fieldtablename = $fieldtablename.$module;
-            }
+			if($fieldtablename == "vtiger_crmentity")
+			{
+				$fieldtablename = $fieldtablename.$module;
+			}
 			if($fieldname == "assigned_user_id")
 			{
-			   $fieldtablename = "users".$module;
-			   $fieldcolname = "user_name";
+				$fieldtablename = "vtiger_users".$module;
+				$fieldcolname = "user_name";
 			}
 			if($fieldname == "account_id")
 			{
-				$fieldtablename = "account".$module;
+				$fieldtablename = "vtiger_account".$module;
 				$fieldcolname = "accountname";
 			}
 			if($fieldname == "contact_id")
 			{
-				$fieldtablename = "contactdetails".$module;
+				$fieldtablename = "vtiger_contactdetails".$module;
 				$fieldcolname = "lastname";
 			}
 			if($fieldname == "parent_id")
 			{
-  				$fieldtablename = "crmentityRel".$module;
-					$fieldcolname = "setype";
+				$fieldtablename = "vtiger_crmentityRel".$module;
+				$fieldcolname = "setype";
 			}
 			if($fieldname == "vendor_id")
-	        {
-               	$fieldtablename = "vendorRel";
+			{
+				$fieldtablename = "vtiger_vendorRel";
 				$fieldcolname = "vendorname";
-            }
-            if($fieldname == "potential_id")
-            {
-               	$fieldtablename = "potentialRel";
-			    $fieldcolname = "potentialname";
-            }
-            if($fieldname == "assigned_user_id1")
-            {
-               	$fieldtablename = "usersRel1";
-			    $fieldcolname = "user_name";
-            }
-
-            $fieldlabel = $adb->query_result($result,$i,"fieldlabel");
-            $fieldlabel1 = str_replace(" ","_",$fieldlabel);
-            $optionvalue = $fieldtablename.":".$fieldcolname.":".$module."_".$fieldlabel1.":".$fieldname.":".$fieldtypeofdata;
+			}
+			if($fieldname == "potential_id")
+			{
+				$fieldtablename = "vtiger_potentialRel";
+				$fieldcolname = "potentialname";
+			}
+			if($fieldname == "assigned_user_id1")
+			{
+				$fieldtablename = "vtiger_usersRel1";
+				$fieldcolname = "user_name";
+			}
+			if($fieldname == 'quote_id')
+			{
+				$fieldtablename = "vtiger_quotes".$module;
+				$fieldcolname = "subject";
+			}
+
+			$fieldlabel = $adb->query_result($result,$i,"fieldlabel");
+			$fieldlabel1 = str_replace(" ","_",$fieldlabel);
+			$optionvalue = $fieldtablename.":".$fieldcolname.":".$module."_".$fieldlabel1.":".$fieldname.":".$fieldtypeofdata;
 			$module_columnlist[$optionvalue] = $fieldlabel;
 		}
-        $log->info("Reports :: FieldColumns->Successfully returned ColumnslistbyBlock".$module.$block);
+		$log->info("Reports :: FieldColumns->Successfully returned ColumnslistbyBlock".$module.$block);
 		return $module_columnlist;
 	}
-	
-/** Function to set the standard filter vtiger_fields for the given vtiger_report
- *  This function gets the standard filter vtiger_fields for the given vtiger_report
- *  and set the values to the corresponding variables
- *  It accepts the repordid as argument 
- */
+
+	/** Function to set the standard filter vtiger_fields for the given vtiger_report
+	 *  This function gets the standard filter vtiger_fields for the given vtiger_report
+	 *  and set the values to the corresponding variables
+	 *  It accepts the repordid as argument 
+	 */
 
 	function getSelectedStandardCriteria($reportid)
 	{
@@ -390,8 +396,8 @@
 		$selectedstdfilter = $adb->fetch_array($result);
 
 		$this->stdselectedcolumn = $selectedstdfilter["datecolumnname"];
-	    $this->stdselectedfilter = $selectedstdfilter["datefilter"];
-		
+		$this->stdselectedfilter = $selectedstdfilter["datefilter"];
+
 		if($selectedstdfilter["datefilter"] == "custom")
 		{
 			if($selectedstdfilter["startdate"] != "0000-00-00")
@@ -405,26 +411,26 @@
 		}
 	}
 
-/** Function to get the combo values for the standard filter
- *  This function get the combo values for the standard filter for the given vtiger_report
- *  and return a HTML string 
- */
+	/** Function to get the combo values for the standard filter
+	 *  This function get the combo values for the standard filter for the given vtiger_report
+	 *  and return a HTML string 
+	 */
 
 	function getSelectedStdFilterCriteria($selecteddatefilter = "")
 	{
-		    
+
 		$datefiltervalue = Array("custom","prevfy","thisfy","nextfy","prevfq","thisfq","nextfq",
-                                 "yesterday","today","tomorrow","lastweek","thisweek","nextweek","lastmonth","thismonth",
-		                         "nextmonth","last7days","last30days", "last60days","last90days","last120days",
-		                         "next30days","next60days","next90days","next120days"
-								);
-		
+				"yesterday","today","tomorrow","lastweek","thisweek","nextweek","lastmonth","thismonth",
+				"nextmonth","last7days","last30days", "last60days","last90days","last120days",
+				"next30days","next60days","next90days","next120days"
+				);
+
 		$datefilterdisplay = Array("Custom","Previous FY", "Current FY","Next FY","Previous FQ","Current FQ","Next FQ","Yesterday",
-                                   "Today","Tomorrow","Last Week","Current Week","Next Week","Last Month","Current Month",
-                                   "Next Month","Last 7 Days","Last 30 Days","Last 60 Days","Last 90 Days","Last 120 Days",
-                                   "Next 7 Days","Next 30 Days","Next 60 Days","Next 90 Days","Next 120 Days"
-								  );
-						     
+				"Today","Tomorrow","Last Week","Current Week","Next Week","Last Month","Current Month",
+				"Next Month","Last 7 Days","Last 30 Days","Last 60 Days","Last 90 Days","Last 120 Days",
+				"Next 7 Days","Next 30 Days","Next 60 Days","Next 90 Days","Next 120 Days"
+				);
+
 		for($i=0;$i<count($datefiltervalue);$i++)
 		{
 			if($selecteddatefilter == $datefiltervalue[$i])
@@ -435,15 +441,15 @@
 				$sshtml .= "<option value='".$datefiltervalue[$i]."'>".$datefilterdisplay[$i]."</option>";
 			}
 		}
-			
+
 		return $sshtml;
 	}
 
-/** Function to get the selected standard filter columns 
- *  This function returns the selected standard filter criteria 
- *  which is selected for vtiger_reports as an array
- *  Array stdcriteria_list[fieldtablename:fieldcolname:module_fieldlabel1]=fieldlabel
- */
+	/** Function to get the selected standard filter columns 
+	 *  This function returns the selected standard filter criteria 
+	 *  which is selected for vtiger_reports as an array
+	 *  Array stdcriteria_list[fieldtablename:fieldcolname:module_fieldlabel1]=fieldlabel
+	 */
 
 	function getStdCriteriaByModule($module)
 	{	
@@ -460,270 +466,270 @@
 		$blockids = implode(",",$blockids);	
 
 		if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0)
-                {
+		{
 			$sql = "select * from vtiger_field where vtiger_field.tabid=".$tabid." and (vtiger_field.uitype =5 or vtiger_field.displaytype=2) and vtiger_field.block in (".$blockids.") order by vtiger_field.sequence";
 		}
 		else
 		{
 			$profileList = getCurrentUserProfileList();			
 			$sql = "select * from vtiger_field inner join vtiger_tab on vtiger_tab.tabid = vtiger_field.tabid inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid  where vtiger_field.tabid=".$tabid." and (vtiger_field.uitype =5 or vtiger_field.displaytype=2) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_field.block in (".$blockids.") and vtiger_profile2field.profileid in ".$profileList." order by vtiger_field.sequence";
-	
-		}
-		
-        $result = $adb->query($sql);
-
-        while($criteriatyperow = $adb->fetch_array($result))
-        {
+
+		}
+
+		$result = $adb->query($sql);
+
+		while($criteriatyperow = $adb->fetch_array($result))
+		{
 			$fieldtablename = $criteriatyperow["tablename"];
-            $fieldcolname = $criteriatyperow["columnname"];
-            $fieldlabel = $criteriatyperow["fieldlabel"];
-
-			if($fieldtablename == "crmentity")
-            {
-	            $fieldtablename = $fieldtablename.$module;
-            }
-            $fieldlabel1 = str_replace(" ","_",$fieldlabel);
-            $optionvalue = $fieldtablename.":".$fieldcolname.":".$module."_".$fieldlabel1;
+			$fieldcolname = $criteriatyperow["columnname"];
+			$fieldlabel = $criteriatyperow["fieldlabel"];
+
+			if($fieldtablename == "vtiger_crmentity")
+			{
+				$fieldtablename = $fieldtablename.$module;
+			}
+			$fieldlabel1 = str_replace(" ","_",$fieldlabel);
+			$optionvalue = $fieldtablename.":".$fieldcolname.":".$module."_".$fieldlabel1;
 			$stdcriteria_list[$optionvalue] = $fieldlabel;
 		}
-		
+
 		$log->info("Reports :: StdfilterColumns->Successfully returned Stdfilter for".$module);
 		return $stdcriteria_list;
-		
-	}
-	
-/** Function to form a javascript to determine the start date and end date for a standard filter 
- *  This function is to form a javascript to determine
- *  the start date and End date from the value selected in the combo lists
- */
+
+	}
+
+	/** Function to form a javascript to determine the start date and end date for a standard filter 
+	 *  This function is to form a javascript to determine
+	 *  the start date and End date from the value selected in the combo lists
+	 */
 
 	function getCriteriaJS()
 	{
 		$today = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d"), date("Y")));
 		$tomorrow  = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d")+1, date("Y")));
 		$yesterday  = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d")-1, date("Y")));
-		
+
 		$currentmonth0 = date("Y-m-d",mktime(0, 0, 0, date("m"), "01",   date("Y")));
 		$currentmonth1 = date("Y-m-t");
 		$lastmonth0 = date("Y-m-d",mktime(0, 0, 0, date("m")-1, "01",   date("Y")));
 		$lastmonth1 = date("Y-m-t", strtotime("-1 Month"));
 		$nextmonth0 = date("Y-m-d",mktime(0, 0, 0, date("m")+1, "01",   date("Y")));
 		$nextmonth1 = date("Y-m-t", strtotime("+1 Month"));
-		
+
 		$lastweek0 = date("Y-m-d",strtotime("-2 week Sunday"));
 		$lastweek1 = date("Y-m-d",strtotime("-1 week Saturday"));
-		
+
 		$thisweek0 = date("Y-m-d",strtotime("-1 week Sunday"));
 		$thisweek1 = date("Y-m-d",strtotime("this Saturday"));
-		
+
 		$nextweek0 = date("Y-m-d",strtotime("this Sunday"));
 		$nextweek1 = date("Y-m-d",strtotime("+1 week Saturday"));
-		
+
 		$next7days = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d")+6, date("Y")));
 		$next30days = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d")+29, date("Y")));
 		$next60days = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d")+59, date("Y")));
 		$next90days = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d")+89, date("Y")));
 		$next120days = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d")+119, date("Y")));
-		
+
 		$last7days = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d")-6, date("Y")));
 		$last30days = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d")-29, date("Y")));
 		$last60days = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d")-59, date("Y")));
 		$last90days = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d")-89, date("Y")));
 		$last120days = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d")-119, date("Y")));
-		
+
 		$currentFY0 = date("Y-m-d",mktime(0, 0, 0, "01", "01",   date("Y")));
 		$currentFY1 = date("Y-m-t",mktime(0, 0, 0, "12", date("d"),   date("Y")));
 		$lastFY0 = date("Y-m-d",mktime(0, 0, 0, "01", "01",   date("Y")-1));
 		$lastFY1 = date("Y-m-t", mktime(0, 0, 0, "12", date("d"), date("Y")-1));
 		$nextFY0 = date("Y-m-d",mktime(0, 0, 0, "01", "01",   date("Y")+1));
 		$nextFY1 = date("Y-m-t", mktime(0, 0, 0, "12", date("d"), date("Y")+1));
-		
+
 
 		$sjsStr = '<script language="JavaScript" type="text/javaScript">
-		function showDateRange( type )
-		{
-			if (type!="custom")
-			{
-				document.NewReport.startdate.readOnly=true
-				document.NewReport.enddate.readOnly=true
-				getObj("jscal_trigger_date_start").style.visibility="hidden"
-				getObj("jscal_trigger_date_end").style.visibility="hidden"
-			}
-			else
-			{
-				document.NewReport.startdate.readOnly=false
-				document.NewReport.enddate.readOnly=false
-				getObj("jscal_trigger_date_start").style.visibility="visible"
-				getObj("jscal_trigger_date_end").style.visibility="visible"
-			}
-			if( type == "today" )
-			{
-			
-			document.NewReport.startdate.value = "'.$today.'";
-			document.NewReport.enddate.value = "'.$today.'";
-			}
-			else if( type == "yesterday" )
-			{
-			    
-			document.NewReport.startdate.value = "'.$yesterday.'";
-			document.NewReport.enddate.value = "'.$yesterday.'";
-			}
-			else if( type == "tomorrow" )
-			{
-			    
-			document.NewReport.startdate.value = "'.$tomorrow.'";
-			document.NewReport.enddate.value = "'.$tomorrow.'";
+			function showDateRange( type )
+			{
+				if (type!="custom")
+				{
+					document.NewReport.startdate.readOnly=true
+						document.NewReport.enddate.readOnly=true
+						getObj("jscal_trigger_date_start").style.visibility="hidden"
+						getObj("jscal_trigger_date_end").style.visibility="hidden"
+				}
+				else
+				{
+					document.NewReport.startdate.readOnly=false
+						document.NewReport.enddate.readOnly=false
+						getObj("jscal_trigger_date_start").style.visibility="visible"
+						getObj("jscal_trigger_date_end").style.visibility="visible"
+				}
+				if( type == "today" )
+				{
+
+					document.NewReport.startdate.value = "'.$today.'";
+					document.NewReport.enddate.value = "'.$today.'";
+				}
+				else if( type == "yesterday" )
+				{
+
+					document.NewReport.startdate.value = "'.$yesterday.'";
+					document.NewReport.enddate.value = "'.$yesterday.'";
+				}
+				else if( type == "tomorrow" )
+				{
+
+					document.NewReport.startdate.value = "'.$tomorrow.'";
+					document.NewReport.enddate.value = "'.$tomorrow.'";
+				}        
+				else if( type == "thisweek" )
+				{
+
+					document.NewReport.startdate.value = "'.$thisweek0.'";
+					document.NewReport.enddate.value = "'.$thisweek1.'";
+				}                
+				else if( type == "lastweek" )
+				{
+
+					document.NewReport.startdate.value = "'.$lastweek0.'";
+					document.NewReport.enddate.value = "'.$lastweek1.'";
+				}                
+				else if( type == "nextweek" )
+				{
+
+					document.NewReport.startdate.value = "'.$nextweek0.'";
+					document.NewReport.enddate.value = "'.$nextweek1.'";
+				}                
+
+				else if( type == "thismonth" )
+				{
+
+					document.NewReport.startdate.value = "'.$currentmonth0.'";
+					document.NewReport.enddate.value = "'.$currentmonth1.'";
+				}                
+
+				else if( type == "lastmonth" )
+				{
+
+					document.NewReport.startdate.value = "'.$lastmonth0.'";
+					document.NewReport.enddate.value = "'.$lastmonth1.'";
+				}             
+				else if( type == "nextmonth" )
+				{
+
+					document.NewReport.startdate.value = "'.$nextmonth0.'";
+					document.NewReport.enddate.value = "'.$nextmonth1.'";
+				}           
+				else if( type == "next7days" )
+				{
+
+					document.NewReport.startdate.value = "'.$today.'";
+					document.NewReport.enddate.value = "'.$next7days.'";
+				}                
+				else if( type == "next30days" )
+				{
+
+					document.NewReport.startdate.value = "'.$today.'";
+					document.NewReport.enddate.value = "'.$next30days.'";
+				}                
+				else if( type == "next60days" )
+				{
+
+					document.NewReport.startdate.value = "'.$today.'";
+					document.NewReport.enddate.value = "'.$next60days.'";
+				}                
+				else if( type == "next90days" )
+				{
+
+					document.NewReport.startdate.value = "'.$today.'";
+					document.NewReport.enddate.value = "'.$next90days.'";
+				}        
+				else if( type == "next120days" )
+				{
+
+					document.NewReport.startdate.value = "'.$today.'";
+					document.NewReport.enddate.value = "'.$next120days.'";
+				}        
+				else if( type == "last7days" )
+				{
+
+					document.NewReport.startdate.value = "'.$last7days.'";
+					document.NewReport.enddate.value =  "'.$today.'";
+				}                        
+				else if( type == "last30days" )
+				{
+
+					document.NewReport.startdate.value = "'.$last30days.'";
+					document.NewReport.enddate.value = "'.$today.'";
+				}                
+				else if( type == "last60days" )
+				{
+
+					document.NewReport.startdate.value = "'.$last60days.'";
+					document.NewReport.enddate.value = "'.$today.'";
+				}        
+				else if( type == "last90days" )
+				{
+
+					document.NewReport.startdate.value = "'.$last90days.'";
+					document.NewReport.enddate.value = "'.$today.'";
+				}        
+				else if( type == "last120days" )
+				{
+
+					document.NewReport.startdate.value = "'.$last120days.'";
+					document.NewReport.enddate.value = "'.$today.'";
+				}        
+				else if( type == "thisfy" )
+				{
+
+					document.NewReport.startdate.value = "'.$currentFY0.'";
+					document.NewReport.enddate.value = "'.$currentFY1.'";
+				}                
+				else if( type == "prevfy" )
+				{
+
+					document.NewReport.startdate.value = "'.$lastFY0.'";
+					document.NewReport.enddate.value = "'.$lastFY1.'";
+				}                
+				else if( type == "nextfy" )
+				{
+
+					document.NewReport.startdate.value = "'.$nextFY0.'";
+					document.NewReport.enddate.value = "'.$nextFY1.'";
+				}                
+				else if( type == "nextfq" )
+				{
+
+					document.NewReport.startdate.value = "2005-07-01";
+					document.NewReport.enddate.value = "2005-09-30";
+				}                        
+				else if( type == "prevfq" )
+				{
+
+					document.NewReport.startdate.value = "2005-01-01";
+					document.NewReport.enddate.value = "2005-03-31";
+				}                
+				else if( type == "thisfq" )
+				{
+					document.NewReport.startdate.value = "2005-04-01";
+					document.NewReport.enddate.value = "2005-06-30";
+				}                
+				else
+				{
+					document.NewReport.startdate.value = "";
+					document.NewReport.enddate.value = "";
+				}        
 			}        
-			else if( type == "thisweek" )
-			{
-			    
-			document.NewReport.startdate.value = "'.$thisweek0.'";
-			document.NewReport.enddate.value = "'.$thisweek1.'";
-			}                
-			else if( type == "lastweek" )
-			{
-			    
-			document.NewReport.startdate.value = "'.$lastweek0.'";
-			document.NewReport.enddate.value = "'.$lastweek1.'";
-			}                
-			else if( type == "nextweek" )
-			{
-			    
-			document.NewReport.startdate.value = "'.$nextweek0.'";
-			document.NewReport.enddate.value = "'.$nextweek1.'";
-			}                
-			
-			else if( type == "thismonth" )
-			{
-			    
-			document.NewReport.startdate.value = "'.$currentmonth0.'";
-			document.NewReport.enddate.value = "'.$currentmonth1.'";
-			}                
-			
-			else if( type == "lastmonth" )
-			{
-			    
-			document.NewReport.startdate.value = "'.$lastmonth0.'";
-			document.NewReport.enddate.value = "'.$lastmonth1.'";
-			}             
-			else if( type == "nextmonth" )
-			{
-			    
-			document.NewReport.startdate.value = "'.$nextmonth0.'";
-			document.NewReport.enddate.value = "'.$nextmonth1.'";
-			}           
-			else if( type == "next7days" )
-			{
-			    
-			document.NewReport.startdate.value = "'.$today.'";
-			document.NewReport.enddate.value = "'.$next7days.'";
-			}                
-			else if( type == "next30days" )
-			{
-			    
-			document.NewReport.startdate.value = "'.$today.'";
-			document.NewReport.enddate.value = "'.$next30days.'";
-			}                
-			else if( type == "next60days" )
-			{
-			    
-			document.NewReport.startdate.value = "'.$today.'";
-			document.NewReport.enddate.value = "'.$next60days.'";
-			}                
-			else if( type == "next90days" )
-			{
-			    
-			document.NewReport.startdate.value = "'.$today.'";
-			document.NewReport.enddate.value = "'.$next90days.'";
-			}        
-			else if( type == "next120days" )
-			{
-			    
-			document.NewReport.startdate.value = "'.$today.'";
-			document.NewReport.enddate.value = "'.$next120days.'";
-			}        
-			else if( type == "last7days" )
-			{
-			    
-			document.NewReport.startdate.value = "'.$last7days.'";
-			document.NewReport.enddate.value =  "'.$today.'";
-			}                        
-			else if( type == "last30days" )
-			{
-			    
-			document.NewReport.startdate.value = "'.$last30days.'";
-			document.NewReport.enddate.value = "'.$today.'";
-			}                
-			else if( type == "last60days" )
-			{
-			    
-			document.NewReport.startdate.value = "'.$last60days.'";
-			document.NewReport.enddate.value = "'.$today.'";
-			}        
-			else if( type == "last90days" )
-			{
-			    
-			document.NewReport.startdate.value = "'.$last90days.'";
-			document.NewReport.enddate.value = "'.$today.'";
-			}        
-			else if( type == "last120days" )
-			{
-			    
-			document.NewReport.startdate.value = "'.$last120days.'";
-			document.NewReport.enddate.value = "'.$today.'";
-			}        
-			else if( type == "thisfy" )
-			{
-			    
-			document.NewReport.startdate.value = "'.$currentFY0.'";
-			document.NewReport.enddate.value = "'.$currentFY1.'";
-			}                
-			else if( type == "prevfy" )
-			{
-			    
-			document.NewReport.startdate.value = "'.$lastFY0.'";
-			document.NewReport.enddate.value = "'.$lastFY1.'";
-			}                
-			else if( type == "nextfy" )
-			{
-			    
-			document.NewReport.startdate.value = "'.$nextFY0.'";
-			document.NewReport.enddate.value = "'.$nextFY1.'";
-			}                
-			else if( type == "nextfq" )
-			{
-			    
-			document.NewReport.startdate.value = "2005-07-01";
-			document.NewReport.enddate.value = "2005-09-30";
-			}                        
-			else if( type == "prevfq" )
-			{
-			    
-			document.NewReport.startdate.value = "2005-01-01";
-			document.NewReport.enddate.value = "2005-03-31";
-			}                
-			else if( type == "thisfq" )
-			{
-			document.NewReport.startdate.value = "2005-04-01";
-			document.NewReport.enddate.value = "2005-06-30";
-			}                
-			else
-			{
-			document.NewReport.startdate.value = "";
-			document.NewReport.enddate.value = "";
-			}        
-		}        
 		</script>';
-		
+
 		return $sjsStr;
 	}
 
-/** Function to set the order of grouping and to find the columns responsible
- *  to the grouping
- *  This function accepts the vtiger_reportid as variable,sets the variable ascdescorder[] to the sort order and
- *  returns the array array_list which has the column responsible for the grouping
- *  Array array_list[0]=columnname
- */
+	/** Function to set the order of grouping and to find the columns responsible
+	 *  to the grouping
+	 *  This function accepts the vtiger_reportid as variable,sets the variable ascdescorder[] to the sort order and
+	 *  returns the array array_list which has the column responsible for the grouping
+	 *  Array array_list[0]=columnname
+	 */
 
 
 	function getSelctedSortingColumns($reportid)
@@ -732,7 +738,7 @@
 		global $adb;
 		global $log;
 
-    	$sreportsortsql = "select vtiger_reportsortcol.* from vtiger_report";
+		$sreportsortsql = "select vtiger_reportsortcol.* from vtiger_report";
 		$sreportsortsql .= " inner join vtiger_reportsortcol on vtiger_report.reportid = vtiger_reportsortcol.reportid";
 		$sreportsortsql .= " where vtiger_report.reportid =".$reportid." order by vtiger_reportsortcol.sortcolid";
 
@@ -746,22 +752,22 @@
 			$this->ascdescorder[] = $sort_values;
 			$array_list[] = $fieldcolname;
 		}
-		
+
 		$log->info("Reports :: Successfully returned getSelctedSortingColumns");
 		return $array_list;
 	}
-	
-/** Function to get the selected columns list for a selected vtiger_report
- *  This function accepts the vtiger_reportid as the argument and get the selected columns
- *  for the given vtiger_reportid and it forms a combo lists and returns
- *  HTML of the combo values
- */
+
+	/** Function to get the selected columns list for a selected vtiger_report
+	 *  This function accepts the vtiger_reportid as the argument and get the selected columns
+	 *  for the given vtiger_reportid and it forms a combo lists and returns
+	 *  HTML of the combo values
+	 */
 
 	function getSelectedColumnsList($reportid)
 	{
 
 		global $adb;
-	    global $modules;
+		global $modules;
 		global $log;
 
 		$ssql = "select vtiger_selectcolumn.* from vtiger_report inner join vtiger_selectquery on vtiger_selectquery.queryid = vtiger_report.queryid";
@@ -785,14 +791,14 @@
 		return $shtml;
 	}
 
-/** Function to Set the selected columns for the advanced filter for the vtiger_report
- *  This function accepts the vtiger_reportid as the argument and get the selected columns
- *  in the advanced filter and sets the values
- *  $this->advft_column[] = The column name
- *  $this->advft_option[] = The filter option
- *  $this->advft_value[] = The value to be compared
- *	and returns true in sucess
- */
+	/** Function to Set the selected columns for the advanced filter for the vtiger_report
+	 *  This function accepts the vtiger_reportid as the argument and get the selected columns
+	 *  in the advanced filter and sets the values
+	 *  $this->advft_column[] = The column name
+	 *  $this->advft_option[] = The filter option
+	 *  $this->advft_value[] = The value to be compared
+	 *	and returns true in sucess
+	 */
 
 	//<<<<<<<<advanced filter>>>>>>>>>>>>>>
 	function getAdvancedFilterList($reportid)
@@ -816,13 +822,13 @@
 		return true;
 	}
 	//<<<<<<<<advanced filter>>>>>>>>>>>>>>
-	
-/** Function to get the list of vtiger_report folders when Save and run  the vtiger_report
- *  This function gets the vtiger_report folders from database and form
- *  a combo values of the folders and return 
- *  HTML of the combo values
- */
-	
+
+	/** Function to get the list of vtiger_report folders when Save and run  the vtiger_report
+	 *  This function gets the vtiger_report folders from database and form
+	 *  a combo values of the folders and return 
+	 *  HTML of the combo values
+	 */
+
 	function sgetRptFldrSaveReport()
 	{
 		global $adb;
@@ -832,20 +838,20 @@
 		$result = $adb->query($sql);
 		$reportfldrow = $adb->fetch_array($result);
 		$x = 0;
-        do
+		do
 		{
 			$shtml .= "<option value='".$reportfldrow['folderid']."'>".$reportfldrow['foldername']."</option>";
 		}while($reportfldrow = $adb->fetch_array($result));
-		
+
 		$log->info("Reports :: Successfully returned sgetRptFldrSaveReport");
 		return $shtml;
 	}
 
-/** Function to get the column to total vtiger_fields in Reports 
- *  This function gets columns to total vtiger_field 
- *  and generated the html for that vtiger_fields
- *  It returns the HTML of the vtiger_fields along with the check boxes
- */
+	/** Function to get the column to total vtiger_fields in Reports 
+	 *  This function gets columns to total vtiger_field 
+	 *  and generated the html for that vtiger_fields
+	 *  It returns the HTML of the vtiger_fields along with the check boxes
+	 */
 
 	function sgetColumntoTotal($primarymodule,$secondarymodule)
 	{
@@ -861,14 +867,14 @@
 		}
 		return $options;
 	}
-	
-/** Function to get the selected columns of total vtiger_fields in Reports
- *  This function gets selected columns of total vtiger_field
- *  and generated the html for that vtiger_fields
- *  It returns the HTML of the vtiger_fields along with the check boxes
- */
-	
-	
+
+	/** Function to get the selected columns of total vtiger_fields in Reports
+	 *  This function gets selected columns of total vtiger_field
+	 *  and generated the html for that vtiger_fields
+	 *  It returns the HTML of the vtiger_fields along with the check boxes
+	 */
+
+
 	function sgetColumntoTotalSelected($primarymodule,$secondarymodule,$reportid)
 	{
 		global $adb;
@@ -881,11 +887,11 @@
 			if($result)
 			{
 				$reportsummaryrow = $adb->fetch_array($result);
-				
+
 				do
 				{
 					$this->columnssummary[] = $reportsummaryrow["columnname"];
-					
+
 				}while($reportsummaryrow = $adb->fetch_array($result));
 			}
 		}	
@@ -898,19 +904,19 @@
 				$options []= $this->sgetColumnstoTotalHTML($secondarymodule[$i],($i+1));
 			}
 		}
-		
+
 		$log->info("Reports :: Successfully returned sgetColumntoTotalSelected");
 		return $options;
 	}
 
 
-/** Function to form the HTML for columns to total	
- *  This function formulates the HTML format of the
- *  vtiger_fields along with four checkboxes
- *  It returns the HTML of the vtiger_fields along with the check boxes
- */
-	
-	
+	/** Function to form the HTML for columns to total	
+	 *  This function formulates the HTML format of the
+	 *  vtiger_fields along with four checkboxes
+	 *  It returns the HTML of the vtiger_fields along with the check boxes
+	 */
+
+
 	function sgetColumnstoTotalHTML($module)
 	{
 		//retreive the vtiger_tabid	
@@ -935,15 +941,15 @@
 		do
 		{
 			$typeofdata = explode("~",$columntototalrow["typeofdata"]);
-		
-  		    if($typeofdata[0] == "N" || $typeofdata[0] == "I")
+
+			if($typeofdata[0] == "N" || $typeofdata[0] == "I")
 			{
 				$options = Array();
 				if(isset($this->columnssummary))
 				{
 					$selectedcolumn = "";
 					$selectedcolumn1 = "";
-					
+
 					for($i=0;$i < count($this->columnssummary) ;$i++)
 					{
 						$selectedcolumnarray = explode(":",$this->columnssummary[$i]);
@@ -957,41 +963,41 @@
 						{
 							$selectedcolumn1[$selectedcolumnarray[4]] = $this->columnssummary[$i];
 						}
-						
-      				          }
-
-$columntototalrow['fieldlabel'] = str_replace(" ","_",$columntototalrow['fieldlabel']);
+
+					}
+
+					$columntototalrow['fieldlabel'] = str_replace(" ","_",$columntototalrow['fieldlabel']);
 					$options []= $columntototalrow['tablabel'].' - '.$columntototalrow['fieldlabel'];
-						if($selectedcolumn1[2] == "cb:".$columntototalrow['tablename'].':'.$columntototalrow['columnname'].':'.$columntototalrow['fieldlabel']."_SUM:2")
-					    {
-					    $options []=  '<input checked name="cb:'.$columntototalrow['tablename'].':'.$columntototalrow['columnname'].':'.$columntototalrow['fieldlabel'].'_SUM:2" type="checkbox" value="">';					    
-						}else
-					    {
-						    $options []=  '<input name="cb:'.$columntototalrow['tablename'].':'.$columntototalrow['columnname'].':'.$columntototalrow['fieldlabel'].'_SUM:2" type="checkbox" value="">';
-					    }
-					    if($selectedcolumn1[3] == "cb:".$columntototalrow['tablename'].':'.$columntototalrow['columnname'].':'.$columntototalrow['fieldlabel']."_AVG:3")
-					    {
-						   $options []=  '<input checked name="cb:'.$columntototalrow['tablename'].':'.$columntototalrow['columnname'].':'.$columntototalrow['fieldlabel'].'_AVG:3" type="checkbox" value="">';
-					    }else
-					    {
-						    $options []=  '<input name="cb:'.$columntototalrow['tablename'].':'.$columntototalrow['columnname'].':'.$columntototalrow['fieldlabel'].'_AVG:3" type="checkbox" value="">';
-					    }
-
-					    if($selectedcolumn1[4] == "cb:".$columntototalrow['tablename'].':'.$columntototalrow['columnname'].':'.$columntototalrow['fieldlabel']."_MIN:4")
-					    {
-						   $options []=  '<input checked name="cb:'.$columntototalrow['tablename'].':'.$columntototalrow['columnname'].':'.$columntototalrow['fieldlabel'].'_MIN:4" type="checkbox" value="">';
-					    }else
-					    {
-						    $options []=  '<input name="cb:'.$columntototalrow['tablename'].':'.$columntototalrow['columnname'].':'.$columntototalrow['fieldlabel'].'_MIN:4" type="checkbox" value="">';
-					    }
-
-					    if($selectedcolumn1[5] == "cb:".$columntototalrow['tablename'].':'.$columntototalrow['columnname'].':'.$columntototalrow['fieldlabel']."_MAX:5")
-					    {
-						   $options []=  '<input checked name="cb:'.$columntototalrow['tablename'].':'.$columntototalrow['columnname'].':'.$columntototalrow['fieldlabel'].'_MAX:5" type="checkbox" value="">';
-					    }else
-					    {
-						    $options []=  '<input name="cb:'.$columntototalrow['tablename'].':'.$columntototalrow['columnname'].':'.$columntototalrow['fieldlabel'].'_MAX:5" type="checkbox" value="">';
-					    }
+					if($selectedcolumn1[2] == "cb:".$columntototalrow['tablename'].':'.$columntototalrow['columnname'].':'.$columntototalrow['fieldlabel']."_SUM:2")
+					{
+						$options []=  '<input checked name="cb:'.$columntototalrow['tablename'].':'.$columntototalrow['columnname'].':'.$columntototalrow['fieldlabel'].'_SUM:2" type="checkbox" value="">';					    
+					}else
+					{
+						$options []=  '<input name="cb:'.$columntototalrow['tablename'].':'.$columntototalrow['columnname'].':'.$columntototalrow['fieldlabel'].'_SUM:2" type="checkbox" value="">';
+					}
+					if($selectedcolumn1[3] == "cb:".$columntototalrow['tablename'].':'.$columntototalrow['columnname'].':'.$columntototalrow['fieldlabel']."_AVG:3")
+					{
+						$options []=  '<input checked name="cb:'.$columntototalrow['tablename'].':'.$columntototalrow['columnname'].':'.$columntototalrow['fieldlabel'].'_AVG:3" type="checkbox" value="">';
+					}else
+					{
+						$options []=  '<input name="cb:'.$columntototalrow['tablename'].':'.$columntototalrow['columnname'].':'.$columntototalrow['fieldlabel'].'_AVG:3" type="checkbox" value="">';
+					}
+
+					if($selectedcolumn1[4] == "cb:".$columntototalrow['tablename'].':'.$columntototalrow['columnname'].':'.$columntototalrow['fieldlabel']."_MIN:4")
+					{
+						$options []=  '<input checked name="cb:'.$columntototalrow['tablename'].':'.$columntototalrow['columnname'].':'.$columntototalrow['fieldlabel'].'_MIN:4" type="checkbox" value="">';
+					}else
+					{
+						$options []=  '<input name="cb:'.$columntototalrow['tablename'].':'.$columntototalrow['columnname'].':'.$columntototalrow['fieldlabel'].'_MIN:4" type="checkbox" value="">';
+					}
+
+					if($selectedcolumn1[5] == "cb:".$columntototalrow['tablename'].':'.$columntototalrow['columnname'].':'.$columntototalrow['fieldlabel']."_MAX:5")
+					{
+						$options []=  '<input checked name="cb:'.$columntototalrow['tablename'].':'.$columntototalrow['columnname'].':'.$columntototalrow['fieldlabel'].'_MAX:5" type="checkbox" value="">';
+					}else
+					{
+						$options []=  '<input name="cb:'.$columntototalrow['tablename'].':'.$columntototalrow['columnname'].':'.$columntototalrow['fieldlabel'].'_MAX:5" type="checkbox" value="">';
+					}
 				}else
 				{
 					$options []= $columntototalrow['tablabel'].' - '.$columntototalrow['fieldlabel'];
@@ -1003,7 +1009,7 @@
 				$options_list [] = $options;
 			}
 		}while($columntototalrow = $adb->fetch_array($result));
-		
+
 		$log->info("Reports :: Successfully returned sgetColumnstoTotalHTML");
 		return $options_list;
 	}

Modified: vtigercrm/trunk/modules/Reports/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Reports/Save.php (original)
+++ vtigercrm/trunk/modules/Reports/Save.php Mon Jun 19 17:13:26 2006
@@ -11,10 +11,8 @@
 require_once('modules/Reports/Reports.php');
 require_once('include/logging.php');
 require_once('include/database/PearDatabase.php');
-
 global $adb;
 global $log;
-
 $reportid = $_REQUEST["record"];
 
 //<<<<<<<selectcolumn>>>>>>>>>
@@ -96,7 +94,7 @@
 	{
 		$iquerysql = "insert into vtiger_selectquery (QUERYID,STARTINDEX,NUMOFOBJECTS) values (".$genQueryId.",0,0)";
 		$iquerysqlresult = $adb->query($iquerysql);
-		 $log->info("Reports :: Save->Successfully saved vtiger_selectquery");
+		$log->info("Reports :: Save->Successfully saved vtiger_selectquery");
 		if($iquerysqlresult!=false)
 		{
 			//<<<<step2 vtiger_selectcolumn>>>>>>>>
@@ -112,14 +110,12 @@
 			$log->info("Reports :: Save->Successfully saved vtiger_selectcolumn");
 			//<<<<step2 vtiger_selectcolumn>>>>>>>>
 
-		       //$genReportMId = $adb->getUniqueID("reportmodules");
-
-		       if($genQueryId != "")
-		       {
+			if($genQueryId != "")
+			{
 				$ireportsql = "insert into vtiger_report (REPORTID,FOLDERID,REPORTNAME,DESCRIPTION,REPORTTYPE,QUERYID,STATE)";
 				$ireportsql .= " values (".$genQueryId.",".$folderid.",'".$reportname."','".$reportdescription."','".$reporttype."',".$genQueryId.",'CUSTOM')";
 				$ireportresult = $adb->query($ireportsql);
-			       	$log->info("Reports :: Save->Successfully saved vtiger_report");
+				$log->info("Reports :: Save->Successfully saved vtiger_report");
 				if($ireportresult!=false)
 				{
 					//<<<<reportmodules>>>>>>>
@@ -163,32 +159,30 @@
 					//<<<<step4 columnstototal>>>>>>>
 
 					//<<<<step5 advancedfilter>>>>>>>
-                                        for ($i=0;$i<count($adv_filter_col);$i++)
-                                        {
-                                                $irelcriteriasql = "insert into vtiger_relcriteria(QUERYID,COLUMNINDEX,COLUMNNAME,COMPARATOR,VALUE) values (".$genQueryId.",".$i.",'".$adv_filter_col[$i]."','".$adv_filter_option[$i]."','".$adv_filter_value[$i]."')";
-						//echo $irelcriteriasql;
-
-                                                $irelcriteriaresult = $adb->query($irelcriteriasql);
-                                        }
+					for ($i=0;$i<count($adv_filter_col);$i++)
+					{
+						$irelcriteriasql = "insert into vtiger_relcriteria(QUERYID,COLUMNINDEX,COLUMNNAME,COMPARATOR,VALUE) values (".$genQueryId.",".$i.",'".$adv_filter_col[$i]."','".$adv_filter_option[$i]."','".$adv_filter_value[$i]."')";
+						$irelcriteriaresult = $adb->query($irelcriteriasql);
+					}
 					$log->info("Reports :: Save->Successfully saved vtiger_relcriteria");
-                                        //<<<<step5 advancedfilter>>>>>>>
+					//<<<<step5 advancedfilter>>>>>>>
 
 				}else
 				{
-					include('themes/'.$theme.'/header.php');
 					$errormessage = "<font color='red'><B>Error Message<ul>
-					<li><font color='red'>Error while inserting the record</font>
-					</ul></B></font> <br>" ;
+						<li><font color='red'>Error while inserting the record</font>
+						</ul></B></font> <br>" ;
 					echo $errormessage;
+					die;
 				}
-		       }
+			}
 		}else
 		{
-			include('themes/'.$theme.'/header.php');
 			$errormessage = "<font color='red'><B>Error Message<ul>
-			<li><font color='red'>Error while inserting the record</font>
-			</ul></B></font> <br>" ;
+				<li><font color='red'>Error while inserting the record</font>
+				</ul></B></font> <br>" ;
 			echo $errormessage;
+			die;
 		}
 		echo '<script>window.opener.location.href =window.opener.location.href;self.close();</script>';
 	}
@@ -200,7 +194,6 @@
 		{
 			$idelcolumnsql = "delete from vtiger_selectcolumn where queryid=".$reportid;
 			$idelcolumnsqlresult = $adb->query($idelcolumnsql);
-			//echo $idelcolumnsql;
 			if($idelcolumnsqlresult != false)
 			{
 				$selectedcolumns = explode(";",$selectedcolumnstring);
@@ -208,7 +201,6 @@
 				{
 					$icolumnsql = "insert into vtiger_selectcolumn (QUERYID,COLUMNINDEX,COLUMNNAME) values (".$reportid.",".$i.",'".$selectedcolumns[$i]."')";
 					$icolumnsqlresult = $adb->query($icolumnsql);
-					//echo $icolumnsql;
 				}
 			}
 		}
@@ -220,12 +212,10 @@
 		$ireportsql .= " where REPORTID=".$reportid;
 		$ireportresult = $adb->query($ireportsql);
 		$log->info("Reports :: Save->Successfully saved vtiger_report");
-		//echo $ireportsql;
-
-		$idelreportsortcolsql = "delete from vtiger_reportsortcol where vtiger_reportid=".$reportid;
+
+		$idelreportsortcolsql = "delete from vtiger_reportsortcol where reportid=".$reportid;
 		$idelreportsortcolsqlresult = $adb->query($idelreportsortcolsql);
 		$log->info("Reports :: Save->Successfully deleted vtiger_reportsortcol");
-		//echo $idelreportsortcolsql;
 
 		if($idelreportsortcolsqlresult!=false)
 		{
@@ -234,7 +224,6 @@
 			{
 				$sort_by1sql = "insert into vtiger_reportsortcol (SORTCOLID,REPORTID,COLUMNNAME,SORTORDER) values (1,".$reportid.",'".$sort_by1."','".$sort_order1."')";
 				$sort_by1result = $adb->query($sort_by1sql);
-				//echo $sort_by1sql;
 			}
 			if($sort_by2 != "")
 			{
@@ -251,7 +240,6 @@
 
 			$idelreportdatefiltersql = "delete from vtiger_reportdatefilter where datefilterid=".$reportid;
 			$idelreportdatefiltersqlresult = $adb->query($idelreportdatefiltersql);
-			//echo $idelreportsortcolsql;
 
 			//<<<<step5 standarfilder>>>>>>>
 			$ireportmodulesql = "insert into vtiger_reportdatefilter (DATEFILTERID,DATECOLUMNNAME,DATEFILTER,STARTDATE,ENDDATE) values (".$reportid.",'".$stdDateFilterField."','".$stdDateFilter."','".$startdate."','".$enddate."')";
@@ -260,7 +248,7 @@
 			//<<<<step5 standarfilder>>>>>>>
 
 			//<<<<step4 columnstototal>>>>>>>
-			$idelreportsummarysql = "delete from vtiger_reportsummary where vtiger_reportsummaryid=".$reportid;
+			$idelreportsummarysql = "delete from vtiger_reportsummary where reportsummaryid=".$reportid;
 			$idelreportsummarysqlresult = $adb->query($idelreportsummarysql);
 
 			for ($i=0;$i<count($columnstototal);$i++)
@@ -287,20 +275,20 @@
 
 		}else
 		{
-			include('themes/'.$theme.'/header.php');
 			$errormessage = "<font color='red'><B>Error Message<ul>
 				<li><font color='red'>Error while inserting the record</font>
 				</ul></B></font> <br>" ;
 			echo $errormessage;
+			die;
 		}
 	}else
 	{
-		include('themes/'.$theme.'/header.php');
 		$errormessage = "<font color='red'><B>Error Message<ul>
-		<li><font color='red'>Error while inserting the record</font>
-		</ul></B></font> <br>" ;
+			<li><font color='red'>Error while inserting the record</font>
+			</ul></B></font> <br>" ;
 		echo $errormessage;
+		die;
 	}
-	echo '<script>window.opener.location.href =window.opener.location.href;self.close();</script>';
+	echo '<script>window.opener.location.href = window.opener.location.href;self.close();</script>';
 }
 ?>

Modified: vtigercrm/trunk/modules/Reports/SaveAndRun.php
==============================================================================
--- vtigercrm/trunk/modules/Reports/SaveAndRun.php (original)
+++ vtigercrm/trunk/modules/Reports/SaveAndRun.php Mon Jun 19 17:13:26 2006
@@ -176,11 +176,11 @@
 function getReportsinFolder($folderid)
 {
 	global $adb;
-	$query = 'select vtiger_reportid,reportname from vtiger_report where folderid='.$folderid;
+	$query = 'select reportid,reportname from vtiger_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; 



From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 19 16:14:39 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 19 Jun 2006 23:14:39 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=23656=3A_?=
	=?utf-8?q?Issue__in_reports?=
In-Reply-To: <076.9a50a711bb6613348988ceaefce9a4e7@vtiger.fosslabs.com>
References: <076.9a50a711bb6613348988ceaefce9a4e7@vtiger.fosslabs.com>
Message-ID: <085.7b03fddb07fd064987deec13c36ad558@vtiger.fosslabs.com>

#656: Issue  in reports
---------------------------+------------------------------------------------
  Reporter:  jerrydgeorge  |       Owner:  jerrydgeorge
      Type:  defect        |      Status:  closed      
  Priority:  major         |   Milestone:              
 Component:  vtigercrm     |     Version:  5.0.0       
Resolution:  fixed         |    Keywords:  Reports     
---------------------------+------------------------------------------------
Changes (by anonymous):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/656>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 19 16:15:36 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 19 Jun 2006 23:15:36 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=2345=3A_F?=
 =?utf-8?q?ix_for_=22Fatal_error=2E=2E=2E=22_by_reports_with_custom_field?=
In-Reply-To: <076.fa266ece6c0b08774a7c6b47ebf5d995@vtiger.fosslabs.com>
References: <076.fa266ece6c0b08774a7c6b47ebf5d995@vtiger.fosslabs.com>
Message-ID: <085.6ee8f9448e001847d0f4940cafe99418@vtiger.fosslabs.com>

#45: Fix for "Fatal error..." by reports with custom field
------------------------+---------------------------------------------------
  Reporter:  Kleo       |       Owner:  jerrydgeorge
      Type:  defect     |      Status:  closed      
  Priority:  major      |   Milestone:  4.2.5       
 Component:  vtigercrm  |     Version:  4.2.4rc1    
Resolution:  fixed      |    Keywords:              
------------------------+---------------------------------------------------
Changes (by anonymous):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/45>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 19 16:18:06 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 19 Jun 2006 23:18:06 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7276 - in /vtigercrm/trunk:
 data/ include/ include/utils/ modules/Contacts/ modules/Emails/
 modules/Products/ modules/uploads/
Message-ID: <20060619231807.0DB6783F1B0@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 19 17:17:55 2006
New Revision: 7276

Log:
* Changes made for handling the attachment as generic one

Modified:
    vtigercrm/trunk/data/CRMEntity.php
    vtigercrm/trunk/include/RelatedListView.php
    vtigercrm/trunk/include/utils/DetailViewUtils.php
    vtigercrm/trunk/modules/Contacts/Save.php
    vtigercrm/trunk/modules/Emails/mail.php
    vtigercrm/trunk/modules/Products/Save.php
    vtigercrm/trunk/modules/uploads/add2db.php
    vtigercrm/trunk/modules/uploads/deleteattachments.php
    vtigercrm/trunk/modules/uploads/downloadfile.php

Modified: vtigercrm/trunk/data/CRMEntity.php
==============================================================================
--- vtigercrm/trunk/data/CRMEntity.php (original)
+++ vtigercrm/trunk/data/CRMEntity.php Mon Jun 19 17:17:55 2006
@@ -255,13 +255,27 @@
 		global $log, $adb;
 		$log->debug("Entering into insertIntoAttachment($id,$module) method.");
 		
+		$file_saved = false;
+
+		//This is to added to store the existing attachment id of the contact where we should delete this when we give new image
+		if($module == 'Contacts')
+			$old_attachmentid = $adb->query_result($adb->query("select * from vtiger_seattachmentsrel where crmid=$id"),0,'attachmentsid');
+
 		foreach($_FILES as $fileindex => $files)
 		{
 			if($files['name'] != '' && $files['size'] > 0)
 			{
-				$this->uploadAndSaveFile($id,$module,$files);
-			}
-		}
+				$file_saved = $this->uploadAndSaveFile($id,$module,$files);
+			}
+		}
+
+		//This is to handle the delete image for contacts
+		if($module == 'Contacts' && $file_saved)
+		{
+			$del_res1 = $adb->query("delete from vtiger_attachments where attachmentsid=$old_attachmentid");
+			$del_res2 = $adb->query("delete from vtiger_seattachmentsrel where attachmentsid=$old_attachmentid");
+		}
+
 
 		//Remove the deleted vtiger_attachments from db - Products
 		if($module == 'Products' && $_REQUEST['del_file_list'] != '')
@@ -291,7 +305,7 @@
 	{
 		global $log;
 		$log->debug("Entering into uploadAndSaveFile($id,$module,$file_details) method.");
-		
+
 		global $adb, $current_user;
 		global $upload_badext;
 
@@ -315,16 +329,18 @@
 		}
 		// Vulnerability fix ends
 
+		$current_id = $adb->getUniqueID("vtiger_crmentity");
+
 		$filename = basename($binFile);
 		$filetype= $file_details['type'];
 		$filesize = $file_details['size'];
 		$filetmp_name = $file_details['tmp_name'];
-		
+
 		//get the file path inwhich folder we want to upload the file
 		$upload_file_path = decideFilePath();
 
 		//upload the file in server
-		$upload_status = move_uploaded_file($filetmp_name,$upload_file_path.$binFile);
+		$upload_status = move_uploaded_file($filetmp_name,$upload_file_path.$current_id."_".$binFile);
 
 		$save_file = 'true';
 		//only images are allowed for these modules
@@ -333,10 +349,8 @@
 			$save_file = validateImageFile(&$file_details);
 		}
 
-		if($save_file == 'true')
-		{
-			$current_id = $adb->getUniqueID("vtiger_crmentity");
-
+		if($save_file == 'true' && $upload_status == 'true')
+		{
 			//This is only to update the attached filename in the vtiger_notes vtiger_table for the Notes module
 			if($module=='Notes')
 			{
@@ -365,14 +379,14 @@
 			}
 			$sql3='insert into vtiger_seattachmentsrel values('.$id.','.$current_id.')';
 			$adb->query($sql3);
+
+			return true;
 		}
 		else
 		{
 			$log->debug("Skip the save attachment process.");
-		}
-		$log->debug("Exiting from uploadAndSaveFile($id,$module,$file_details) method.");
-
-		return;
+			return false;
+		}
 	}
 
 

Modified: vtigercrm/trunk/include/RelatedListView.php
==============================================================================
--- vtigercrm/trunk/include/RelatedListView.php (original)
+++ vtigercrm/trunk/include/RelatedListView.php Mon Jun 19 17:17:55 2006
@@ -259,7 +259,7 @@
 		}
 
 		$entries[] = nl2br($row['description']); 
-		$attachmentname = ltrim($row['filename'],$id.'_');//explode('_',$row['filename'],2);
+		$attachmentname = ltrim($row['filename'],$row['attachmentsid'].'_');//explode('_',$row['filename'],2);
 
 		$entries[] = '<a href="index.php?module=uploads&action=downloadfile&entityid='.$id.'&fileid='.$row['attachmentsid'].'">'.$attachmentname.'</a>';
 

Modified: vtigercrm/trunk/include/utils/DetailViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/DetailViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/DetailViewUtils.php Mon Jun 19 17:17:55 2006
@@ -372,10 +372,11 @@
 		if($tabid==14)
 		{
 			$images=array();
-			$query = 'select productname,vtiger_attachments.path,vtiger_attachments.name from vtiger_products left join vtiger_seattachmentsrel on vtiger_seattachmentsrel.crmid=vtiger_products.productid inner join vtiger_attachments on vtiger_attachments.attachmentsid=vtiger_seattachmentsrel.attachmentsid where productid='.$col_fields['record_id'];
+			$query = 'select productname, vtiger_attachments.path, vtiger_attachments.attachmentsid, vtiger_attachments.name from vtiger_products left join vtiger_seattachmentsrel on vtiger_seattachmentsrel.crmid=vtiger_products.productid inner join vtiger_attachments on vtiger_attachments.attachmentsid=vtiger_seattachmentsrel.attachmentsid where productid='.$col_fields['record_id'];
 			$result_image = $adb->query($query);
 			for($image_iter=0;$image_iter < $adb->num_rows($result_image);$image_iter++)	
 			{
+				$image_id_array[] = $adb->query_result($result_image,$image_iter,'attachmentsid');	
 				$image_array[] = $adb->query_result($result_image,$image_iter,'name');	
 				$imagepath_array[] = $adb->query_result($result_image,$image_iter,'path');	
 			}
@@ -392,13 +393,13 @@
 
 				for($image_iter=0;$image_iter < count($image_array);$image_iter++)
 				{
-					$images[]='"'.$imagepath_array[$image_iter].$image_array[$image_iter].'","'.$imagepath_array[$image_iter].$image_array[$image_iter].'"';
+					$images[]='"'.$imagepath_array[$image_iter].$image_id_array[$image_iter]."_".$image_array[$image_iter].'","'.$imagepath_array[$image_iter].$image_id_array[$image_iter]."_".$image_array[$image_iter].'"';
 				}	
 				$image_lists .=implode(',',$images).');</script>';
 				$label_fld[] =$image_lists;
 			}elseif(count($image_array)==1)
 			{
-				$label_fld[] ='<img src="'.$imagepath_array[0].$image_array[0].'" border="0" width="450" height="300">';
+				$label_fld[] ='<img src="'.$imagepath_array[0].$image_id_array[0]."_".$image_array[0].'" border="0" width="450" height="300">';
 			}else
 			{
 				$label_fld[] ='';
@@ -407,7 +408,13 @@
 		}	
 		if($tabid==4)
 		{
-			$imgpath = getModuleFileStoragePath('Contacts').$col_fields[$fieldname];
+			//$imgpath = getModuleFileStoragePath('Contacts').$col_fields[$fieldname];
+			$sql = "select vtiger_attachments.* from vtiger_attachments inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid = vtiger_attachments.attachmentsid where vtiger_seattachmentsrel.crmid=".$col_fields['record_id'];
+			$image_res = $adb->query($sql);
+			$image_id = $adb->query_result($image_res,0,'attachmentsid');
+			$image_path = $adb->query_result($image_res,0,'path');
+			$image_name = $adb->query_result($image_res,0,'name');
+			$imgpath = $image_path.$image_id."_".$image_name;
 			$label_fld[] ='<img src="'.$imgpath.'" class="reflect" width="450" height="300" alt="">';
 		}
 

Modified: vtigercrm/trunk/modules/Contacts/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/Save.php (original)
+++ vtigercrm/trunk/modules/Contacts/Save.php Mon Jun 19 17:17:55 2006
@@ -60,9 +60,9 @@
 if (!isset($_REQUEST['do_not_call'])) $focus->do_not_call = 'off';
 
 //Checking If image is given or not
-$image_upload_array=SaveImage($_FILES,'contact',$focus->id,$focus->mode);
+//$image_upload_array=SaveImage($_FILES,'contact',$focus->id,$focus->mode);
 $image_name_val=$image_upload_array['imagename'];
-$image_error=$image_upload_array['imageerror'];
+$image_error="false";
 $errormessage=$image_upload_array['errormessage'];
 $saveimage=$image_upload_array['saveimage'];
 

Modified: vtigercrm/trunk/modules/Emails/mail.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/mail.php (original)
+++ vtigercrm/trunk/modules/Emails/mail.php Mon Jun 19 17:17:55 2006
@@ -247,25 +247,16 @@
 
 	for($i=0;$i<$count;$i++)
 	{
+		$fileid = $adb->query_result($res,$i,'attachmentsid');
 		$filename = $adb->query_result($res,$i,'name');
-		$filewithpath = $root_directory."test/upload/".$filename;
+		$filepath = $adb->query_result($res,$i,'path');
+		$filewithpath = $root_directory.$filepath.$fileid."_".$filename;
 
 		//if the file is exist in test/upload directory then we will add directly
 		//else get the contents of the file and write it as a file and then attach (this will occur when we unlink the file)
 		if(is_file($filewithpath))
 		{
-			$mail->AddAttachment($filewithpath);
-		}
-		elseif($filename != '')
-		{
-			$contents = $adb->query_result($res,$i,'attachmentcontents');
-			$size = $adb->query_result($res,$i,'attachmentsize');
-
-			@$handle = fopen($filewithpath,'wb');
-			@fwrite($handle,base64_decode($contents),$size);
-			@fclose($handle);
-
-			$mail->AddAttachment($filewithpath);
+			$mail->AddAttachment($filewithpath,$filename);
 		}
 	}
 }

Modified: vtigercrm/trunk/modules/Products/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Products/Save.php (original)
+++ vtigercrm/trunk/modules/Products/Save.php Mon Jun 19 17:17:55 2006
@@ -56,104 +56,14 @@
 }
 
 //Checking If image is given or not 
-$uploaddir = $root_directory."test/product/" ;//set this to which location you need to give the product image
-$log->info("The Location to Save the Product Image is ".$uploaddir);
 $image_lists=array();
 $count=0;
 
 $saveimage = "true";
 $image_error = "false";
-/*
-foreach($_FILES as $files)
-{
-	$file_path_name = $files['name'];
-	$image_error="false";
-	$saveimage="true";
-	$file_name = basename($file_path_name);
-	//if the image is given
-	if($file_name!="")
-	{
-		$log->debug("Product Image is given for uploading");
-		$image_name_val=file_exist_fn($file_name,0);
-		$image_lists[]=$image_name_val;
-		$encode_field_values="";
-		$errormessage="";
-
-		$move_upload_status=move_uploaded_file($files["tmp_name"],$uploaddir.$image_name_val);
-		$image_error="false";
-
-		//if there is an error in the uploading of image
-
-		$filetype= $files['type'];
-		$filesize = $files['size'];
-
-		$filetype_array=explode("/",$filetype);
-
-		$file_type_val_image=strtolower($filetype_array[0]);
-		$file_type_val=strtolower($filetype_array[1]);
-		$log->info("The File type of the Product Image is :: ".$file_type_val);
-		//checking the uploaded image is if an image type or not
-		if(!$move_upload_status) //if any error during file uploading  
-		{
-			$log->debug("Error is present in uploading product Image.");	
-			$errorCode =  $files['error'];
-			if($errorCode == 4)
-			{
-				$errorcode="no-image";
-				$saveimage="false";
-				$image_error="true";
-			}
-			else if($errorCode == 2)
-			{
-				$errormessage = 2;
-				$saveimage="false";
-				$image_error="true";
-			}
-			else if($errorCode == 3 )
-			{
-				$errormessage = 3;
-				$saveimage="false";
-				$image_error="true";
-			}
-		}
-		else 
-		{
-			$log->debug("Successfully uploaded the product Image.");
-			if($filesize != 0)
-			{
-				if (($file_type_val == "jpeg" ) || ($file_type_val == "png") || ($file_type_val == "jpg" ) || ($file_type_val == "pjpeg" ) || ($file_type_val == "x-png") || ($file_type_val == "gif") ) //Checking whether the file is an image or not
-				{
-					$saveimage="true";
-					$image_error="false";
-				}
-				else
-				{
-					$savelogo="false";
-					$image_error="true";
-					$errormessage = "image";
-				}
-
-			}
-			else
-			{	$savelogo="false";
-				$image_error="true";
-				$errormessage = "invalid";
-			}
-
-		}
-	}
-}
-
-//added to retain the pictures from db
-if($mode=="edit" && $image_error=="false" )
-{
-		$image_lists[]= getProductImageName($record_id,$del_image_array);
-		$saveimage="true";
-}
-*/
 //end of code to retain the pictures from db
 
- //code added for returning back to the current view after edit from list view
+//code added for returning back to the current view after edit from list view
 if($_REQUEST['return_viewname'] == '') $return_viewname='0';
 if($_REQUEST['return_viewname'] != '')$return_viewname=$_REQUEST['return_viewname'];
 

Modified: vtigercrm/trunk/modules/uploads/add2db.php
==============================================================================
--- vtigercrm/trunk/modules/uploads/add2db.php (original)
+++ vtigercrm/trunk/modules/uploads/add2db.php Mon Jun 19 17:17:55 2006
@@ -14,17 +14,7 @@
 global $current_user;
 $vtigerpath = $_SERVER['REQUEST_URI'];
 $vtigerpath = str_replace("/index.php?module=uploads&action=add2db", "", $vtigerpath);
-$directory = $root_directory."/storage/user_".getUserName($current_user->id)."/attachments/";
 
-if(!is_dir($directory))
-{
-	if(!mkdirs($directory, 0777))	
-	{
-		echo "Access denined to create folder";
-		die;
-	}
-}
-$uploaddir = $directory;
 $crmid = $_REQUEST['return_id'];
 
 	// Arbitrary File Upload Vulnerability fix - Philip
@@ -45,15 +35,16 @@
 	//decide the file path where we should upload the file in the server
 	$upload_filepath = decideFilePath();
 
-	if(move_uploaded_file($_FILES["filename"]["tmp_name"],$upload_filepath.$crmid."_".$_FILES["filename"]["name"])) 
+	$current_id = $adb->getUniqueID("vtiger_crmentity");
+	
+	if(move_uploaded_file($_FILES["filename"]["tmp_name"],$upload_filepath.$current_id."_".$_FILES["filename"]["name"])) 
 	{
-		$filename = $crmid.'_'.basename($binFile);
+		$filename = basename($binFile);
 		$filetype= $_FILES['filename']['type'];
 		$filesize = $_FILES['filename']['size'];
 
 		if($filesize != 0)	
 		{
-			$current_id = $adb->getUniqueID("vtiger_crmentity");
 			$desc = $_REQUEST['txtDescription'];
 			$description = addslashes($desc);
 			$date_var = date('YmdHis');

Modified: vtigercrm/trunk/modules/uploads/deleteattachments.php
==============================================================================
--- vtigercrm/trunk/modules/uploads/deleteattachments.php (original)
+++ vtigercrm/trunk/modules/uploads/deleteattachments.php Mon Jun 19 17:17:55 2006
@@ -12,10 +12,10 @@
 
 $id=$_REQUEST['record'];
 
-$sql = "delete from seattachmentsrel where attachmentsid ='".$id."'";
+$sql = "delete from vtiger_seattachmentsrel where attachmentsid ='".$id."'";
 $adb->query($sql);
 
-$sql = "delete from attachments where attachmentsid ='".$id."'";
+$sql = "delete from vtiger_attachments where attachmentsid ='".$id."'";
 $adb->query($sql);
 
 header("Location:index.php?module=".$_REQUEST['return_module']."&action=".$_REQUEST['return_action']."&record=".$_REQUEST['return_id']);

Modified: vtigercrm/trunk/modules/uploads/downloadfile.php
==============================================================================
--- vtigercrm/trunk/modules/uploads/downloadfile.php (original)
+++ vtigercrm/trunk/modules/uploads/downloadfile.php Mon Jun 19 17:17:55 2006
@@ -29,15 +29,14 @@
 	$name = @$adb->query_result($result, 0, "name");
 	$filepath = @$adb->query_result($result, 0, "path");
 
-	$filesize = filesize($filepath.$name);
-	$fileContent = fread(fopen($filepath.$name, "r"), $filesize);
-
-	$org_filename = ltrim($name,$entityid.'_');
+	$saved_filename = $attachmentsid."_".$name;
+	$filesize = filesize($filepath.$saved_filename);
+	$fileContent = fread(fopen($filepath.$saved_filename, "r"), $filesize);
 
 	header("Content-type: $fileType");
 	header("Content-length: $filesize");
 	header("Cache-Control: private");
-	header("Content-Disposition: attachment; filename=$org_filename");
+	header("Content-Disposition: attachment; filename=$name");
 	header("Content-Description: PHP Generated Data");
 	echo $fileContent;
 }



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 19 16:20:15 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 19 Jun 2006 23:20:15 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7277 -
	/vtigercrm/trunk/include/utils/EditViewUtils.php
Message-ID: <20060619232015.0408883F1B0@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 19 17:20:12 2006
New Revision: 7277

Log:
* Changes made for handling the attachment as generic one

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

Modified: vtigercrm/trunk/include/utils/EditViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/EditViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/EditViewUtils.php Mon Jun 19 17:20:12 2006
@@ -532,22 +532,23 @@
 		//This query is for Products only
 		if($module_name == 'Products')
 		{
-			$query = 'select vtiger_attachments.path,vtiger_attachments.name from vtiger_products left join vtiger_seattachmentsrel on vtiger_seattachmentsrel.crmid=vtiger_products.productid inner join vtiger_attachments on vtiger_attachments.attachmentsid=vtiger_seattachmentsrel.attachmentsid where productid='.$col_fields['record_id'];
+			$query = 'select vtiger_attachments.path, vtiger_attachments.attachmentsid, vtiger_attachments.name from vtiger_products left join vtiger_seattachmentsrel on vtiger_seattachmentsrel.crmid=vtiger_products.productid inner join vtiger_attachments on vtiger_attachments.attachmentsid=vtiger_seattachmentsrel.attachmentsid where productid='.$col_fields['record_id'];
 		}
 		else
 		{
-			$query = "select vtiger_attachments.path, vtiger_attachments.name from vtiger_contactdetails left join vtiger_seattachmentsrel on vtiger_seattachmentsrel.crmid=vtiger_contactdetails.contactid inner join vtiger_attachments on vtiger_attachments.attachmentsid=vtiger_seattachmentsrel.attachmentsid where vtiger_contactdetails.imagename=vtiger_attachments.name and contactid=".$col_fields['record_id'];
+			$query = "select vtiger_attachments.path, vtiger_attachments.attachmentsid, vtiger_attachments.name from vtiger_contactdetails left join vtiger_seattachmentsrel on vtiger_seattachmentsrel.crmid=vtiger_contactdetails.contactid inner join vtiger_attachments on vtiger_attachments.attachmentsid=vtiger_seattachmentsrel.attachmentsid where contactid=".$col_fields['record_id'];
 		}
 		$result_image = $adb->query($query);
 		for($image_iter=0;$image_iter < $adb->num_rows($result_image);$image_iter++)	
 		{
-			$image_array[] = $adb->query_result($result_image,$image_iter,'name');	
+			$image_id_array[] = $adb->query_result($result_image,$image_iter,'attachmentsid');
+			$image_array[] = $adb->query_result($result_image,$image_iter,'name');
 			$image_path_array[] = $adb->query_result($result_image,$image_iter,'path');	
 		}
 		if(is_array($image_array))
 			for($img_itr=0;$img_itr<count($image_array);$img_itr++)
 			{
-				$fieldvalue[] = array('name'=>$image_array[$img_itr],'path'=>$image_path_array[$img_itr]);
+				$fieldvalue[] = array('name'=>$image_array[$img_itr],'path'=>$image_path_array[$img_itr].$image_id_array[$img_itr]."_");
 			}
 		else
 			$fieldvalue[] = '';



From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 19 16:21:37 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 19 Jun 2006 23:21:37 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23893=3A_?=
 =?utf-8?q?attachment_inconsistency_in_server_side_coding?=
In-Reply-To: <076.ba62bb894b4c96ede7fdca75d2060c81@vtiger.fosslabs.com>
References: <076.ba62bb894b4c96ede7fdca75d2060c81@vtiger.fosslabs.com>
Message-ID: <085.c24fb4b0672eb9b6d290480823dd67ae@vtiger.fosslabs.com>

#893: attachment inconsistency in server side coding
------------------------+---------------------------------------------------
  Reporter:  mickie     |       Owner:  mickie
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mickie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 This issue has been fixed as now the attachments will be stored in a same
 manner as attachmentid_filename.ext

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/893>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 19 23:21:55 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 20 Jun 2006 06:21:55 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7278 - in
 /vtigercrm/trunk/modules/Users: add2db.php saveemailtemplate.php
Message-ID: <20060620062156.4CD7483F212@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 20 00:21:50 2006
New Revision: 7278

Log:
Parenttab for email templates & mailmerge templates made proper - ahmed

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

Modified: vtigercrm/trunk/modules/Users/add2db.php
==============================================================================
--- vtigercrm/trunk/modules/Users/add2db.php (original)
+++ vtigercrm/trunk/modules/Users/add2db.php Tue Jun 20 00:21:50 2006
@@ -75,9 +75,9 @@
 			$result = $adb->query($sql);
 			if($result!=false)
 			{
-			   $result = $adb->updateBlob('wordtemplates','data'," filename='".$filename."'",$data);
+			   $result = $adb->updateBlob('vtiger_wordtemplates','data'," filename='".$filename."'",$data);
 			   deleteFile($uploaddir,$filename);
-			   header("Location: index.php?action=listwordtemplates&module=Users");	
+			   header("Location: index.php?action=listwordtemplates&module=Users&parenttab=Settings");	
 			}
 			else
 			{

Modified: vtigercrm/trunk/modules/Users/saveemailtemplate.php
==============================================================================
--- vtigercrm/trunk/modules/Users/saveemailtemplate.php (original)
+++ vtigercrm/trunk/modules/Users/saveemailtemplate.php Tue Jun 20 00:21:50 2006
@@ -37,7 +37,7 @@
 	$adb->query($sql);
  
 	$log->info("about to invoke the detailviewemailtemplate file");  
-	header("Location:index.php?module=Users&action=detailviewemailtemplate&templateid=".$templateid);
+	header("Location:index.php?module=Users&action=detailviewemailtemplate&parenttab=Settings&templateid=".$templateid);
 }
 else
 {
@@ -46,6 +46,6 @@
 	$adb->query($sql);
 
 	 $log->info("added to the db the emailtemplate");
-	header("Location:index.php?module=Users&action=detailviewemailtemplate&templateid=".$templateid);
+	header("Location:index.php?module=Users&action=detailviewemailtemplate&parenttab=Settings&templateid=".$templateid);
 }
 ?>



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 19 23:23:53 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 20 Jun 2006 06:23:53 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7279 - in /vtigercrm/trunk:
 modules/Users/language/en_us.lang.php themes/blue/style.css
Message-ID: <20060620062354.3684083F212@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 20 00:23:48 2006
New Revision: 7279

Log:
updated user lang file and style css - ahmed

Modified:
    vtigercrm/trunk/modules/Users/language/en_us.lang.php
    vtigercrm/trunk/themes/blue/style.css

Modified: vtigercrm/trunk/modules/Users/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Users/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Users/language/en_us.lang.php Tue Jun 20 00:23:48 2006
@@ -53,7 +53,7 @@
 
 
 //added for patch2
-'LBL_GROUP_NAME'=>'Group',
+'LBL_GROUP'=>'Group',
 'LBL_CURRENCY_NAME'=>'Currency',
 
 'LBL_NEW_USER_BUTTON_TITLE'=>'New User [Alt+N]',
@@ -178,6 +178,7 @@
 'LBL_TEMPLATE_HEADER'=>'Template',
 'LBL_TEMPLATE_DETAILS'=>'Template Details',
 'LBL_EDIT_TEMPLATE'=>'Edit Template',
+'LBL_TEMPLATE_FILE'=>'Template File',
 'LBL_DESCRIPTION'=>'Description',
 'LBL_EMAIL_TEMPLATES_LIST'=>'Communication Templates > Email Templates',
 'LBL_MAILMERGE_TEMPLATES_LIST'=>' > Communication Templates > Mail Merge Templates',
@@ -187,15 +188,17 @@
 'LBL_SELECT_MODULE'=>'Select Module',
 'LBL_MERGE_FILE'=>'File : ',
 'LBL_MERGE_MSG'=>'Select a module to assign this Template',
-
+'LBL_MERGE_FIELDS'=>'Merge Fields',
+'LBL_COPY_PASTE'=>'Copy & Paste',
 'LNK_GO_TO_TOP'=>'Go to Page Top',
 'LNK_SAMPLE_EMAIL'=>'View Sample Email',
 'LBL_COLON'=>':',
 'LBL_EMAIL_TEMPLATE'=>'Email Template',
 'LBL_NEW_TEMPLATE'=>'New Template',
+'LBL_ADD_TEMPLATE'=>'Add Template',
 'LBL_USE_MERGE_FIELDS_TO_EMAIL_CONTENT'=>'Use merge fields to personalize your email content.',
 'LBL_AVAILABLE_MERGE_FIELDS'=>'Available Merge Fields',
-'LBL_SELECT_FIELD_TYPE'=>'Select Field Type :',
+'LBL_SELECT_FIELD_TYPE'=>'Select Field Type',
 'LBL_SELECT_FIELD'=>'Select Field :',
 'LBL_MERGE_FIELD_VALUE'=>'Copy Merge Field Value :',
 'LBL_ACCOUNT_FIELDS'=>'Account Fields',
@@ -215,6 +218,8 @@
 'LBL_TEMPLATE_SUBJECT'=>'Email Subject',
 'LBL_TEMPLATE_MESSAGE'=>'Email Message',
 'LBL_VIEWING'=>'Viewing',
+'LBL_PROPERTIES'=>'Properties of',
+
 
 
 // Added fields in createnewgroup.php
@@ -223,10 +228,14 @@
 'LBL_EDIT_GROUP'=>'Edit Group',
 'LBL_GROUP_NAME'=>'Group Name',
 'LBL_GROUP_DETAILS'=>'Group Details',
-'LBL_MEMBER_LIST'=>'Member List',
-'LBL_MEMBER_AVLBL'=>'Member Available',
-'LBL_MEMBER_SELECTED'=>'Selected Member',
+'LBL_MEMBER'=>'Members',
+'LBL_MEMBER_AVLBL'=>'Available Entities & Members',
+'LBL_MEMBER_SELECTED'=>'Selected Members',
 'LBL_DESCRIPTION'=>'Description',
+'LBL_GROUP_MESG1'=>'Groups are a flexible way to assign access rights, when complex access rights has to be defined. You can combine multiple entities like Roles, Users, profiles etc into a single group.',
+'LBL_GROUP_MESG2'=>'To add, select the Entity members from left and click the ">>" button.',
+'LBL_GROUP_MESG3'=>'To remove, select the group members from the right and click the "<<" button.',
+
 
 // Added fields in detailViewmailtemplate.html,listgroupmembers.php,listgroups.php
 'LBL_DETAIL_VIEW_OF_EMAIL_TEMPLATE'=>'Detail View of Email Template',
@@ -237,6 +246,8 @@
 'LBL_ADD_GROUP_BUTTON'=>'Add Group',
 'LBL_WORD_TEMPLATES'=>'Mail Merge Templates',
 'LBL_NEW_WORD_TEMPLATE'=>'New Template',
+'LBL_EMAIL_TEMPLATE_DESC'=>'Manage email templates used for Campaigns and Mass mailing',
+'LBL_NAME'=>'Name',
 
 // Added fields in TabCustomise.php,html and UpdateTab.php,html
 'LBL_CUSTOMISE_TABS'=>'Customize Tabs',
@@ -263,6 +274,7 @@
 'LBL_STEP_1_3'=>'Step 1 of 3',
 'LBL_STEP_2_3'=>'Step 2 of 3',
 'LBL_STEP_3_3'=>'Step 3 of 3',
+'LBL_STEP'=>'Step',
 'LBL_SELECT_BASE_PROFILE'=>'Select Base Profile',
 'LBL_PROFILE_PRIVILEGES'=>'Profile Privileges',
 'LBL_GLOBAL_PRIVILEGES'=>'Global Privileges',

Modified: vtigercrm/trunk/themes/blue/style.css
==============================================================================
--- vtigercrm/trunk/themes/blue/style.css (original)
+++ vtigercrm/trunk/themes/blue/style.css Tue Jun 20 00:23:48 2006
@@ -2291,17 +2291,6 @@
 	padding:5px;
 }
 
-#EditListPriceLay{
-	font-family:Arial, Helvetica, sans-serif;
-	font-size:11px;
-	text-align:left;
-	width:300px;
-	border:3px solid #CCCCCC;
-	background-color:#FFFFFF;
-	padding:5px;
-}
-							
-
 
 /* For Report HTML Generation*/
 .rptCellLabel {
@@ -2544,18 +2533,15 @@
 
 }
 
-
-
-
 ul {
-	list-style:none;
+	list-style:circle;
 	line-height:20px;
-	padding-left:20px;
-	margin-left:0px;
+	padding-left:5px;
+	margin-left:20px;
 	font-weight:normal;
-	border-top:1px dotted #dadada;
-
-}
+
+}
+
 	
 .branch {
 	list-style-image: url("secAdd.gif");
@@ -2835,3 +2821,28 @@
 	border-right:1px solid #a1a1a1;
 }
 
+.cellBottomDotLine {
+	border-bottom-width: 2px;
+	border-bottom-style: dotted;
+	border-bottom-color: #CCCCCC;
+	background-color:#ededed;
+}
+.crmFormList{
+	border:1px solid #cccccc;
+	width:90%;
+	height:120px;
+
+}
+.cellBottomDotLinePlain {
+	border-bottom-width: 2px;
+	border-bottom-style: dotted;
+	border-bottom-color: #CCCCCC;
+	
+}
+.crmFormDropDown {
+border-width:1px;
+}
+.thickBorder {
+	border: 2px solid #999999;
+}
+



From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 19 23:35:56 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 06:35:56 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231343=3A?=
	=?utf-8?q?_Inconsistance_in_Popups?=
Message-ID: <076.55f234b9e9de01eb9b601afafe3fd459@vtiger.fosslabs.com>

#1343: Inconsistance in Popups
-----------------------+----------------------------------------------------
 Reporter:  anonymous  |       Owner:  Ela  
     Type:  defect     |      Status:  new  
 Priority:  blocker    |   Milestone:       
Component:  vtigercrm  |     Version:  5.0.0
 Keywords:             |  
-----------------------+----------------------------------------------------
 Popups are not right.Most of the cases the buttons are hidded
 For example Reports,Emails ....

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1343>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 19 23:42:46 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 20 Jun 2006 06:42:46 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7283 -
 /vtigercrm/trunk/modules/Settings/language/en_us.lang.php
Message-ID: <20060620064246.4F17C83F20E@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 20 00:42:42 2006
New Revision: 7283

Log:
updated settings lang file - ahmed

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

Modified: vtigercrm/trunk/modules/Settings/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Settings/language/en_us.lang.php Tue Jun 20 00:42:42 2006
@@ -69,6 +69,8 @@
 'LBL_NEW_FORM_TITLE'=>'New Contact',
 
 'LBL_NEW_CURRENCY'=>'New Currency',
+
+'LBL_VIEWING'=>'Viewing',
 
 'LBL_CURRENCY_NAME'=>'Currency Name',
 
@@ -342,6 +344,7 @@
 'LBL_USERS'=>'Users',
 
 'LBL_USERS_LIST'=>'Users List',
+'LBL_GROUP_LIST'=>'Groups List',
 
 'LBL_CREATE_AND_MANAGE_USERS'=>'- Create and Manage Users (e.g., admin)',
 
@@ -359,7 +362,7 @@
 
 'LBL_SHARING_ACCESS'=>'Sharing Access',
 
-'LBL_FIELDS_ACCESS'=>'Fields',
+'LBL_FIELDS_ACCESS'=>'Fields Access',
 
 'LBL_DEFAULT_ORGANIZATION_FIELDS'=>'Default Organization Fields Access',
 
@@ -421,7 +424,7 @@
 
 'LBL_COMMUNICATION_TEMPLATES'=>'Communication Templates',
 
-'LBL_CREATE_EMAIL_TEMPLATES'=>'Creating Email Template',
+'LBL_CREATE_EMAIL_TEMPLATES'=>'New Email Template',
 
 'LBL_UPLOAD_MSWORD_TEMPLATES'=>' - Upload MS Word Templates for Mail Merge',
 
@@ -639,6 +642,8 @@
 'LBL_MAIL_SERVER_DESC'=>'Manage your Email Server Settings',
 'LBL_BACKUP_SERVER_DESC'=>'Manage your Backup Server Settings',
 'LBL_MODULES_AND_OWNERS'=>'Modules & Owners',
+'LBL_GROUP_DESC'=>'Manage User groups',
+'LBL_MAIL_MERGE_DESC'=>'Manage Mail Merge templates used in CRM modules',
 
 
 //Added fields after 5.0 Alpha



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 19 23:47:34 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 20 Jun 2006 06:47:34 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7284 - in
 /vtigercrm/trunk/Smarty/templates: GroupDetailview.tpl GroupEditView.tpl
 ListGroup.tpl
Message-ID: <20060620064735.2B52F83F225@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 20 00:47:29 2006
New Revision: 7284

Log:
Updated the groups tpl file -ahmed

Modified:
    vtigercrm/trunk/Smarty/templates/GroupDetailview.tpl
    vtigercrm/trunk/Smarty/templates/GroupEditView.tpl
    vtigercrm/trunk/Smarty/templates/ListGroup.tpl

Modified: vtigercrm/trunk/Smarty/templates/GroupDetailview.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/GroupDetailview.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/GroupDetailview.tpl Tue Jun 20 00:47:29 2006
@@ -9,121 +9,121 @@
   *
  ********************************************************************************/
 -->*}
-<script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
-<style type="text/css">@import url(themes/blue/style.css);</style>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-	<tr>
-			{include file='SettingsMenu.tpl'}
-<td width="75%" valign="top">
-	<form action="index.php" method="post" name="new" id="form">
-<input type="hidden" name="module" value="Users">
-<input type="hidden" name="action" value="createnewgroup">
-<input type="hidden" name="groupId" value="{$GROUPID}">
-<input type="hidden" name="mode" value="edit">
-<input type="hidden" name="parenttab" value="Settings">
-  <table width="100%" border="0" cellpadding="0" cellspacing="0" height="100%">
-    <tr>
-      <td class="showPanelBg" valign="top" width="95%"  style="padding-left:20px; "><br />
-          <span class="lvtHeaderText"><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS} </a> > {$MOD.LBL_USER_MANAGEMENT} > {$CMOD.LBL_GROUP_MEMBERS_LIST}</b> </span>
-          <hr noshade="noshade" size="1" />
-      </td>
-    </tr>
-    <tr>
-      <td>&nbsp;</td>
-    </tr>
-    <tr>
-      <td width="95%" style="padding-left:20px;" valign="top"><table width="95%" cellpadding="5" cellspacing="0" class="leadTable" align="center">
-          <tr>
-            <td style="padding:5px;border-bottom:2px dotted #CCCCCC;" width="5%" ><img src="{$IMAGE_PATH}groups.gif" width="48" height="48" align="absmiddle" /> </td>
-            <td style="padding:5px;border-bottom:2px dotted #AAAAAA;"><span class="genHeaderGrayBig">{$GROUPINFO.0.groupname} {$APP.LBL_GROUP}</span><br />
-                <span class="big">{$CMOD.LBL_DETAIL_VIEW} {$GROUPINFO.0.groupname} {$APP.LBL_GROUP}</span> </td>
-          </tr>
-          <tr>
-            <td colspan="2">&nbsp;</td>
-          </tr>
-          <tr>
-            <td colspan="2" ><table width="100%" cellpadding="5" cellspacing="0" border="0" >
-                <tr>
-                  <td colspan="4" class="detailedViewHeader"><b>{$CMOD.LBL_GROUP_DETAILS}</b></td>
-                </tr>
-                <tr>
-                  <td class="dvtCellLabel" width="5%">&nbsp;</td>
-				  <td class="dvtCellLabel" align="right" width="25%"><b>{$CMOD.LBL_GROUP_NAME} {$CMOD.LBL_COLON}</b></td>
-                  <td class="dvtCellInfo" align="left" width="25%">{$GROUPINFO.0.groupname}</td>
-                  <td class="dvtCellInfo" width="45%">&nbsp;</td>
-                </tr>
-                <tr>
-                  <td class="dvtCellLabel" width="5%">&nbsp;</td>
-				  <td class="dvtCellLabel" align="right"><b>{$CMOD.LBL_DESCRIPTION} {$CMOD.LBL_COLON}</b></td>
-                  <td colspan="2" align="left" class="dvtCellInfo">{$GROUPINFO.0.description}</td>
-                </tr>
-                <tr>
-                  <td colspan="4"  class="dvtCellInfo">&nbsp;</td>
-                </tr>
-                <tr>
-                  <td colspan="4"  class="detailedViewHeader"><b>{$CMOD.LBL_MEMBER_LIST}</b></td>
-                </tr>
-                <tr>
-                  	{foreach key=type item=details from=$GROUPINFO.1} 
-							{if $details.0 neq ''}		
-                      	  	<tr>
-								{if $type == "User"}
-								<td class="dvtCellLabel" valign="top" align="left" width="5%">
-										<img src="{$IMAGE_PATH}user_icon.gif" align="absmiddle">
-								</td>
-								{/if}
-								{if $type == "Role" }
-								<td class="dvtCellLabel" valign="top" align="left" width="5%">
-										<img src="{$IMAGE_PATH}roles_icon.gif" align="absmiddle">
-								</td>
-								{/if}
-								{if $type == "Role and Subordinates" }
-								<td class="dvtCellLabel" valign="top" align="left" width="5%">
-										<img src="{$IMAGE_PATH}roles_icon.gif" align="absmiddle">
-								</td>
-								{/if}
-								{if $type == "Group" }
-								<td class="dvtCellLabel" valign="top" align="left" width="5%">
-										<img src="{$IMAGE_PATH}groups_icon.gif" align="absmiddle">
-								</td>
-								{/if}
-								<td class="dvtCellLabel" valign="top" align="right" width="15%"><b>{$type} {$CMOD.LBL_COLON} </b></td>
-                          		<td class="dvtCellInfo" width="45%" colspan="2">
-									{foreach item=element from=$details}
-											<a href="index.php?module=Users&action={$element.memberaction}&{$element.actionparameter}={$element.memberid}">{$element.membername}</a><br />
-									{/foreach}
-                              </td>
-                        </tr>
-						{/if}
-						{/foreach}	
-                 <tr>
-                  <td colspan="4"  class="dvtCellInfo" align="center">
-				  	<!-- <input title="Back" accessKey="C" class="classBtn" onclick="window.history.back();" type="button" name="New" value=" <  Back " > &nbsp; -->
-					 <input value="   {$APP.LBL_EDIT_BUTTON_LABEL}   " title="{$APP.LBL_EDIT_BUTTON_TITLE}" accessKey="{$APP.LBL_EDIT_BUTTON_KEY}" class="classBtn" type="submit" name="Edit" >
-                    &nbsp;<input value=" {$APP.LBL_DELETE_BUTTON_LABEL} " title="{$APP.LBL_DELETE_BUTTON_TITLE}" accessKey="{$APP.LBL_DELETE_BUTTON_KEY}" class="classBtn" type="button" name="Delete" onClick="deletegroup('{$GROUPID}','{$GROUP_NAME}')";>	
+<script language="JAVASCRIPT" type="text/javascript" src="include/js/smoothscroll.js"></script>
+
+<br>
+<table align="center" border="0" cellpadding="0" cellspacing="0" width="98%">
+<tbody><tr>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
+        <td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
+        <br>
+
+	<div align=center>
+			{include file='SetMenu.tpl'}
+				<!-- DISPLAY -->
+				<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
+				<form action="index.php" method="post" name="new" id="form">
+				<input type="hidden" name="module" value="Users">
+				<input type="hidden" name="action" value="createnewgroup">
+				<input type="hidden" name="groupId" value="{$GROUPID}">
+				<input type="hidden" name="mode" value="edit">
+				<input type="hidden" name="parenttab" value="Settings">
+				<tr>
+					<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}ico-groups.gif" width="48" height="48" border=0 ></td>
+					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Users&action=listgroups&parenttab=Settings">{$CMOD.LBL_GROUPS}</a> &gt; {$CMOD.LBL_VIEWING} &quot;{$GROUPINFO.0.groupname}&quot; </b></td>
+				</tr>
+				<tr>
+					<td valign=top class="small">{$CMOD.LBL_VIEWING} {$CMOD.LBL_PROPERTIES} &quot;{$GROUPINFO.0.groupname}`&quot; {$CMOD.LBL_GROUP_NAME} </td>
+				</tr>
+				</table>
+				
+				<br>
+				<table border=0 cellspacing=0 cellpadding=10 width=100% >
+				<tr>
+				<td valign=top>
+					
+					<table border=0 cellspacing=0 cellpadding=5 width=100% class="tableHeading">
+					<tr>
+						<td class="big"><strong>{$CMOD.LBL_PROPERTIES} &quot;{$GROUPINFO.0.groupname}&quot; </strong></td>
+						<td><div align="right">
+					 	    <input value="   {$APP.LBL_EDIT_BUTTON_LABEL}   " title="{$APP.LBL_EDIT_BUTTON_TITLE}" accessKey="{$APP.LBL_EDIT_BUTTON_KEY}" class="crmButton small edit" type="submit" name="Edit" >
+						</div></td>
+					  </tr>
+					</table>
+					<table width="100%"  border="0" cellspacing="0" cellpadding="5">
+                      <tr class="small">
+                        <td width="15%" class="small cellLabel"><strong>{$CMOD.LBL_GROUP_NAME}</strong></td>
+                        <td width="85%" class="cellText" >{$GROUPINFO.0.groupname}</td>
+                      </tr>
+                      <tr class="small">
+                        <td class="small cellLabel"><strong>{$CMOD.LBL_DESCRIPTION}</strong></td>
+                        <td class="cellText">{$GROUPINFO.0.description}</td>
+                      </tr>
+                      <tr class="small">
+                        <td valign=top class="cellLabel"><strong>{$CMOD.LBL_MEMBER}</strong></td>
+                        <td class="cellText">
+						<table width="70%"  border="0" cellspacing="0" cellpadding="5">
+                          <tr class="small">
+                  		{foreach key=type item=details from=$GROUPINFO.1} 
+				{if $details.0 neq ''}		
+					{if $type == "User"}
+                            		<td colspan="2" class="cellBottomDotLine">
+						<div align="left"><strong>{$MOD.LBL_USERS}</strong></div>
+					</td>
+					{/if}	
+					{if $type == "Role"}
+                            		<td colspan="2" class="cellBottomDotLine">
+						<div align="left"><strong>{$MOD.LBL_ROLES}</strong></div>
+					</td>
+					{/if}	
+					{if $type == "Role and Subordinates"}
+                            		<td colspan="2" class="cellBottomDotLine">
+						<div align="left"><strong>{$type}</strong></div>
+					</td>
+					{/if}	
+					{if $type == "Group"}
+                            		<td colspan="2" class="cellBottomDotLine">
+						<div align="left"><strong>{$CMOD.LBL_GROUPS}</strong></div>
+					</td>
+					{/if}	
+                            </tr>
+                          <tr class="small">
+
+                            <td width="16"><div align="center"></div></td>
+                            <td>
+					{foreach item=element from=$details}
+						<a href="index.php?module=Users&action={$element.memberaction}&{$element.actionparameter}={$element.memberid}">{$element.membername}</a><br />
+					{/foreach}
+			    </td>  	 
+                          </tr>
+				{/if}
+				{/foreach}
+                        </table></td>
+                      </tr>
+                    </table>
+					<br>
+					<table border=0 cellspacing=0 cellpadding=5 width=100% >
+					<tr><td class="small" nowrap align=right><a href="#top">{$MOD.LBL_SCROLL}</a></td></tr>
+					</table>
+					
+					
 				</td>
-                </tr>
-            </table></td>
-          </tr>
-          <tr>
-            <td colspan="2">&nbsp;</td>
-          </tr>
-      </table></td>
-    </tr>
-  </table></td>
-</tr>
-</table></from>
+				</tr>
+				</table>
+			
+			
+			
+			</td>
+			</tr>
+			</table>
+		</td>
+	</tr>
+	</form>
+	</table>
+		
+	</div>
 </td>
-</tr>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
+   </tr>
+</tbody>
 </table>
-<script>
-function deletegroup(id,groupname)
-{ldelim}
-		if(confirm("Are you sure you want to delete the group "+groupname+" ?"))
-			document.location.href="index.php?module=Users&action=DeleteGroup&groupId="+id;	
-		else
-			return false;
-{rdelim}
-</script>
-	{include file='SettingsSubMenu.tpl'}
-

Modified: vtigercrm/trunk/Smarty/templates/GroupEditView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/GroupEditView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/GroupEditView.tpl Tue Jun 20 00:47:29 2006
@@ -9,8 +9,7 @@
   *
  ********************************************************************************/
 -->*}
-<script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
-<style type="text/css">@import url(themes/blue/style.css);</style>
+<script language="JAVASCRIPT" type="text/javascript" src="include/js/smoothscroll.js"></script>
 <script language="javascript">
 
 function dup_validation()
@@ -146,134 +145,160 @@
 {rdelim}
 </script>
 
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-<tr>
-	{include file='SettingsMenu.tpl'}
-<td width="75%" valign="top">
-
-<form name="newGroupForm" action="index.php" method="post">
-<input type="hidden" name="module" value="Users">
-<input type="hidden" name="action" value="SaveGroup">
-<input type="hidden" name="mode" value="{$MODE}">
-<input type="hidden" name="parenttab" value="Settings">
-<input type="hidden" name="groupId" value="{$GROUPID}">
-<table width="100%" border="0" cellpadding="0" cellspacing="0" height="100%">
-<tr>
-<td class="showPanelBg" valign="top" width="100%" style="padding-left:20px; "><br />
-{if $MODE eq 'edit'}
-	<span class="lvtHeaderText"><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS} </a> > {$MOD.LBL_USER_MANAGEMENT} > {$CMOD.LBL_EDIT_GROUP}</b></span>
-{else}
-	<span class="lvtHeaderText"><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS} </a> > {$MOD.LBL_USER_MANAGEMENT} > {$CMOD.LBL_CREATE_NEW_GROUP}</b></span>
-{/if}	
-<hr noshade="noshade" size="1"/>
-</td>
-</tr>
-<tr>
-<td width="75%" style="padding-left:20px;" valign="top">
-
-	<table align="center" border="0" cellpadding="5" cellspacing="0" width="100%" class="leadTable">
-	<tbody>
-	<tr>
-			<td align="left" style="padding:10px;border-bottom:1px dashed #CCCCCC;" colspan="3">
-					<img src="{$IMAGE_PATH}groups.gif" align="absmiddle">
+<br>
+<table align="center" border="0" cellpadding="0" cellspacing="0" width="98%">
+<tbody><tr>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
+        <td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
+        <br>
+
+	<div align=center>
+			{include file='SetMenu.tpl'}
+				<!-- DISPLAY -->
+				<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
+				<form name="newGroupForm" action="index.php" method="post">
+				<input type="hidden" name="module" value="Users">
+				<input type="hidden" name="action" value="SaveGroup">
+				<input type="hidden" name="mode" value="{$MODE}">
+				<input type="hidden" name="parenttab" value="Settings">
+				<input type="hidden" name="groupId" value="{$GROUPID}">
+				<tr>
+					<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}ico-groups.gif" alt="Groups" width="48" height="48" border=0 title="Roles"></td>
 					{if $MODE eq 'edit'}
-						<span class="genHeaderGray">{$CMOD.LBL_EDIT_GROUP}</span>
+					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Users&action=listgroups&parenttab=Settings">{$CMOD.LBL_GROUPS}</a> &gt; {$MOD.LBL_EDIT} &quot;{$GROUPNAME}&quot; </b></td>
+					{else}	
+					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Users&action=listgroups&parenttab=Settings">{$CMOD.LBL_GROUPS}</a> &gt; {$CMOD.LBL_CREATE_NEW_GROUP}</b></td>
+					{/if}
+				</tr>
+				<tr>
+					{if $MODE eq 'edit'}
+					<td valign=top class="small">{$MOD.LBL_EDIT} {$CMOD.LBL_PROPERTIES} &quot;{$GROUPNAME}&quot; {$CMOD.LBL_GROUP}</td>
 					{else}
-						<span class="genHeaderGray">{$CMOD.LBL_CREATE_NEW_GROUP}</span>
+					<td valign=top class="small">{$CMOD.LBL_NEW_GROUP}</td>
 					{/if}
+				</tr>
+				</table>
+				
+				<br>
+				<table border=0 cellspacing=0 cellpadding=10 width=100% >
+				<tr>
+				<td valign=top>
+					
+					<table border=0 cellspacing=0 cellpadding=5 width=100% class="tableHeading">
+					<tr>
+						{if $MODE eq 'edit'}
+						<td class="big"><strong>{$CMOD.LBL_PROPERTIES} &quot;{$GROUPNAME}&quot; </strong></td>
+						{else}
+						<td class="big"><strong>{$CMOD.LBL_NEW_GROUP}</strong></td>
+						{/if}
+						<td><div align="right">
+						{if $MODE eq 'edit'}
+							<input type="button" class="crmButton small save" name="add" value="  {$APP.LBL_SAVE_BUTTON_LABEL}  " onClick="return validate()">
+						{else}
+							<input type="button" class="crmButton create small" name="add" value="{$CMOD.LBL_ADD_GROUP_BUTTON}" onClick="return validate()">
+						{/if}
+						&nbsp;
+						<input type="button" class="crmButton cancel small" name="cancel" value="{$APP.LBL_CANCEL_BUTTON_LABEL}" onClick="window.history.back()">
+						</div></td>
+					  </tr>
+					</table>
+					<table width="100%"  border="0" cellspacing="0" cellpadding="5">
+                      <tr class="small">
+                        <td width="15%" class="small cellLabel"><font color="red">*</font><strong>{$CMOD.LBL_GROUP_NAME}</strong></td>
+                        <td width="85%" class="cellText" ><input id="groupName" name="groupName" type="text" value="{$GROUPNAME}" class="detailedViewTextBox"></td>
+                      </tr>
+                      <tr class="small">
+                        <td class="small cellLabel"><strong>{$CMOD.LBL_DESCRIPTION}</strong></td>
+                        <td class="cellText"><input name="description" type="text" value="{$DESCRIPTION}" class="detailedViewTextBox"> </td>
+                      </tr>
+                      <tr class="small">
+                        <td colspan="2" valign=top class="cellLabel"><strong>{$CMOD.LBL_MEMBER}</strong>						</td>
+                      </tr>
+                      <tr class="small">
+                        <td colspan="2" valign=top class="cellText"> 
+						<br>
+						<table width="95%"  border="0" align="center" cellpadding="5" cellspacing="0">
+                          <tr>
+                            <td width="40%" valign=top class="cellBottomDotLinePlain small"><strong>{$CMOD.LBL_MEMBER_AVLBL}</strong></td>
+                            <td width="10%">&nbsp;</td>
+                            <td width="40%" class="cellBottomDotLinePlain small"><strong>{$CMOD.LBL_MEMBER_SELECTED}</strong></td>
+                          </tr>
+                          <tr>
+                            <td valign=top class="small">
+				{$CMOD.LBL_ENTITY}:&nbsp;
+				<select id="memberType" name="memberType" class="small" onchange="showOptions()">
+				          <option value="groups" selected>{$CMOD.LBL_GROUPS}</option>
+				          <option value="roles">{$CMOD.LBL_ROLES}</option>
+				          <option value="rs">{$CMOD.LBL_ROLES_SUBORDINATES}</option>
+				          <option value="users">{$MOD.LBL_USERS}</option>
+				</select>
+		<input type="hidden" name="findStr" class="small">&nbsp;
+			    </td>
+                            <td width="50">&nbsp;</td>
+                            <td class="small">&nbsp;</td>
+                          </tr>
+                          <tr class=small>
+                            <td valign=top>{$CMOD.LBL_MEMBER} {$CMOD.LBL_OF} {$CMOD.LBL_ENTITY}<br>
+				<select id="availList" name="availList" multiple size="10" class="small crmFormList">
+				</select>
+				<input type="hidden" name="selectedColumnsString"/>
+							
+			    </td>
+                            <td width="50"><div align="center">
+				<input type="button" name="Button" value="&nbsp;&rsaquo;&rsaquo;&nbsp;" onClick="addColumn()" class="crmButton small"/><br /><br />
+				<input type="button" name="Button1" value="&nbsp;&lsaquo;&lsaquo;&nbsp;" onClick="delColumn()" class="crmButton small"/>
+                            	  </div></td>
+                            <td class="small" style="background-color:#ddFFdd" valign=top>{$CMOD.LBL_MEMBER} {$CMOD.LBL_OF} &quot;{$GROUPNAME}&quot; <br>
+			      <select id="selectedColumns" name="selectedColumns" multiple size="10" class="small crmFormList">
+				{foreach item=element from=$MEMBER}
+				<option value="{$element.0}">{$element.1}</option>
+				{/foreach}
+                              </select></td>
+                          </tr>
+						  <tr>
+						  	<td colspan=3>
+							<ul class=small>
+							<li>{$CMOD.LBL_GROUP_MESG1}</li>
+							<li>{$CMOD.LBL_GROUP_MESG2}</li>
+							<li>{$CMOD.LBL_GROUP_MESG3}</li>
+							</ul>
+							
+							</td>
+						</tr>
+                        </table>
+						
+						</td>
+                      </tr>
+                    </table>
+					<br>
+					<table border=0 cellspacing=0 cellpadding=5 width=100% >
+					<tr><td class="small" nowrap align=right><a href="#top">{$MOD.LBL_SCROLL}</a></td></tr>
+					</table>
+					
+					
+				</td>
+				</tr>
+				<tr>
+				  <td valign=top>&nbsp;</td>
+				  </tr>
+				</table>
+			
+			
+			
 			</td>
-	</tr>
-	<tr>
-	<td width="10%"></td>
-	<td width="10%">&nbsp;</td>
-	<td width="80%">&nbsp;</td>
-	</tr>
-	<tr>
-	<td align="right"><img src="{$IMAGE_PATH}one.gif" align="absmiddle"> </td>
-	<td style="padding-right: 10px;" align="right" width="20%">
-			<b>{$CMOD.LBL_GROUP_NAME} {$CMOD.LBL_COLON}</b></td>
-	<td style="padding-left: 10px;" align="left" width="80%">
-	<input id="groupName"  name="groupName" class="importBox" style="width:40%;" type="text" value="{$GROUPNAME}">
-	</td>
-	</tr>
-	<tr><td colspan="3">&nbsp;</td></tr>
-	<tr>
-	<td align="right"><img src="{$IMAGE_PATH}two.gif" align="absmiddle"></td>
-	<td style="padding-right: 10px;" align="right" valign="top">
-			<b>{$CMOD.LBL_DESCRIPTION} {$CMOD.LBL_COLON} </b></td>
-	<td style="padding-left: 10px;" align="left">
-	<textarea name="description"  class="txtBox" style="width:40%;" >{$DESCRIPTION}</textarea>
-	</td>
-	</tr>
-	<tr><td colspan="3">&nbsp;</td></tr>
-	<tr>
-		<td align="right"><img src="{$IMAGE_PATH}three.gif" align="absmiddle"></td>
-		<td style="padding-right: 10px;" align="right">
-			<b>{$APP.LBL_VIEW} </b></td>
-		<td><select id="memberType" name="memberType" onchange="showOptions()">
-          <option value="groups" selected>{$CMOD.LBL_GROUPS}</option>
-          <option value="roles">{$CMOD.LBL_ROLES}</option>
-          <option value="rs">{$CMOD.LBL_ROLES_SUBORDINATES}</option>
-          <option value="users">{$MOD.LBL_USERS}</option>
-        </select>&nbsp;&nbsp;
-		<input type="text" name="findStr">&nbsp;
-          <input type="button" name="Find" value="{$APP.LBL_FIND_BUTTON}" class="classBtn" onClick="showOptions()">
+			</tr>
+			</table>
 		</td>
 	</tr>
-	<tr><td colspan="3">&nbsp;</td></tr>
-	<tr>
-	<td	colspan="3">
-	<table align="center" border="0" cellpadding="0" cellspacing="0" width="75%">
-	<tbody>
-	<tr>
-	<td align="center"><b>{$CMOD.LBL_MEMBER_AVLBL}</b><br>
-	<select id="availList" name="availList" multiple size="10" style="width:200px; ">
-	</select>
-	<input type="hidden" name="selectedColumnsString"/>
-	</td>
-	<td align="center">
-	<input type="button" name="Button" value="&nbsp;&rsaquo;&rsaquo;&nbsp;" onClick="addColumn()" class="classBtn"/><br /><br />
-	<input type="button" name="Button1" value="&nbsp;&lsaquo;&lsaquo;&nbsp;" onClick="delColumn()" class="classBtn"/>
-	</td>
-	<td align="center"><b>{$CMOD.LBL_MEMBER_SELECTED}</b><br>
-	<select id="selectedColumns" name="selectedColumns" multiple size="10" style="width:200px; ">
-  	{foreach item=element from=$MEMBER}
-	<option value="{$element.0}">{$element.1}</option>
-	{/foreach}
-	</select>
-	
-	</td>
-	</tr>
-	</tbody></table></td>
-	</tr>
-
-	<tr>
-	<td colspan="3" style="border-bottom: 1px dashed rgb(204, 204, 204);">&nbsp;</td>
-	</tr>
-	<tr>
-	<td colspan="3" align="center"> 	
-	{if $MODE eq 'edit'}
-		<input type="button" class="classBtn" name="add" value="  {$APP.LBL_SAVE_BUTTON_LABEL}  " onClick="return validate()">
-	{else}
-		<input type="button" class="classBtn" name="add" value="{$CMOD.LBL_ADD_GROUP_BUTTON}" onClick="return validate()">
-	{/if}
-	&nbsp;&nbsp;
-	<input type="button" class="classBtn" name="cancel" value="{$APP.LBL_CANCEL_BUTTON_LABEL}" onClick="window.history.back()">
-	</td>
-	</tr>
-	</tbody></table>
-
-</tr>
-</table>
-</form>
+	</form>
+	</table>
+		
+	</div>
+
 </td>
-
-</tr>
-</table>
-		
-</td>
-<td width="1%" style="border-right:1px dotted #CCCCCC;">&nbsp;</td>
-</tr>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
+   </tr>
+</tbody>
 </table>
 <script language="JavaScript" type="text/JavaScript">    
 var moveupLinkObj,moveupDisabledObj,movedownLinkObj,movedownDisabledObj;
@@ -345,11 +370,3 @@
 setObjects();
 showOptions();
 </script>
-</td>
-</tr>
-</table>
-</td>
-</tr>
-</table>
-	{include file='SettingsSubMenu.tpl'}
-

Modified: vtigercrm/trunk/Smarty/templates/ListGroup.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ListGroup.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ListGroup.tpl Tue Jun 20 00:47:29 2006
@@ -9,73 +9,100 @@
   *
  ********************************************************************************/
 -->*}
-<script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
-<style type="text/css">@import url(themes/blue/style.css);</style>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-<tr>
-	{include file='SettingsMenu.tpl'}
-<td width="75%" valign="top">
+<script language="JAVASCRIPT" type="text/javascript" src="include/js/smoothscroll.js"></script>
 
-<table width="95%" border="0" cellpadding="0" cellspacing="0"  align="center">
-<form action="index.php" method="post" name="new" id="form">
-<input type="hidden" name="module" value="Users">
-<input type="hidden" name="action" value="createnewgroup">
-<input type="hidden" name="mode" value="create">
-<input type="hidden" name="parenttab" value="Settings">
-<tr>
-<td class="showPanelBg" valign="top" width="100%" colspan="3" style="padding-left:20px; "><br/>
-<span class="lvtHeaderText"><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS} </a> > {$MOD.LBL_USER_MANAGEMENT} > {$CMOD.LBL_GROUP_NAME}</b></span>
-<hr noshade="noshade" size="1" /><br>
-</td>
-</tr>
-<tr>
-<td valign="top" class="leadTable" style="padding:20px; ">
-<table width="100%" cellpadding="5" cellspacing="0" >
-	<tr>
-		<td style="border-bottom:1px dashed #CCCCCC;" width="50%">
-			<img src="{$IMAGE_PATH}groups.gif" align="absmiddle">&nbsp;<span class="genHeaderGrayBig">{$CMOD.LBL_GROUP_NAME}</span>
-		</td>
-		<td style="border-bottom:1px dashed #CCCCCC;" width="50%" align="right">
-			<input title="{$CMOD.LBL_NEW_GROUP}" class="classBtn" type="submit" name="New" value="{$CMOD.LBL_NEW_GROUP}"/>
+<br>
+<table align="center" border="0" cellpadding="0" cellspacing="0" width="98%">
+<tbody><tr>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
+        <td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
+        <br>
+
+	<div align=center>
+			{include file='SetMenu.tpl'}
+				<!-- DISPLAY -->
+				<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
+				<form action="index.php" method="post" name="new" id="form">
+				<input type="hidden" name="module" value="Users">
+				<input type="hidden" name="action" value="createnewgroup">
+				<input type="hidden" name="mode" value="create">
+				<input type="hidden" name="parenttab" value="Settings">
+				<tr>
+					<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}ico-groups.gif" alt="{$MOD.LBL_GROUPS}" width="48" height="48" border=0 title="{$MOD.LBL_GROUPS}"></td>
+					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > {$CMOD.LBL_GROUPS}</b></td>
+				</tr>
+				<tr>
+					<td valign=top class="small">{$MOD.LBL_GROUP_DESC}</td>
+				</tr>
+				</table>
+				<br>
+				<table border=0 cellspacing=0 cellpadding=10 width=100% >
+				<tr>
+
+				<td>
+				
+					<table border=0 cellspacing=0 cellpadding=5 width=100% class="tableHeading">
+					<tr>
+						<td class="big"><strong>{$MOD.LBL_GROUP_LIST}</strong></td>
+						<td class="small" align=right>{$CMOD.LBL_TOTAL} {$GRPCNT} {$CMOD.LBL_GROUPS} </td>
+					</tr>
+					</table>
+					<table border=0 cellspacing=0 cellpadding=5 width=100% class="listTableTopButtons">
+
+					<tr>
+					     <td class=small align=right>
+						<input title="{$CMOD.LBL_NEW_GROUP}" class="crmButton create small" type="submit" name="New" value="{$CMOD.LBL_NEW_GROUP}"/>
+					     </td>
+					</tr>
+					</table>
+						
+					<table border=0 cellspacing=0 cellpadding=5 width=100% class="listTable">
+					<tr>
+						<td class="colHeader small" valign=top width=2%>#</td>
+						<td class="colHeader small" valign=top width=8%>{$LIST_HEADER.0}</td>
+						<td class="colHeader small" valign=top width=30%>{$LIST_HEADER.1}</td>
+						<td class="colHeader small" valign=top width=60%>{$LIST_HEADER.2}</td>
+					  </tr>
+						{foreach name=grouplist item=groupvalues from=$LIST_ENTRIES}
+					  <tr>
+						<td class="listTableRow small" valign=top>{$smarty.foreach.grouplist.iteration}</td>
+						<td class="listTableRow small" valign=top>
+							  	<a href="index.php?module=Users&action=createnewgroup&returnaction=listgroups&parenttab=Settings&mode=edit&groupId={$groupvalues.groupid}"><img src="{$IMAGE_PATH}editfield.gif" alt="{$APP.LNK_EDIT}" title="{$APP.LNK_EDIT}" border="0" align="absmiddle"></a>&nbsp;|	
+								<a href="#" onClick="deletegroup('{$groupvalues.groupid}','{$groupvalues.groupname}')";><img src="{$IMAGE_PATH}delete.gif" alt="{$LNK_DELETE}" title="{$APP.LNK_DELETE}" border="0" align="absmiddle"></a>
+						</td>
+						<td class="listTableRow small" valign=top><strong>
+                              				<a href="index.php?module=Users&action=GroupDetailView&parenttab=Settings&groupId={$groupvalues.groupid}">{$groupvalues.groupname}</a></strong>
+						</td>
+						<td class="listTableRow small" valign=top>{$groupvalues.description}</td>
+					  </tr>
+					{/foreach}
+					</table>
+					<table border=0 cellspacing=0 cellpadding=5 width=100% >
+					<tr><td class="small" nowrap align=right><a href="#top">{$MOD.LBL_SCROLL}</a></td></tr>
+					</table>
+					
+					
+				</td>
+				</tr>
+				</table>
+			
+			
+			
+			</td>
+			</tr>
+			</table>
 		</td>
 	</tr>
-	<tr><td colspan="2">&nbsp;</td></tr>
-	<tr>
-		<td colspan="2" >
-			<table width="100%" border="0" cellpadding="5" cellspacing="1" class="small" style="background-color: rgb(204, 204, 204);">
-                          <tbody>
-                            <tr>
-                              <td class="lvtCol" width="35%">{$LIST_HEADER.1}</td>
-                              <td class="lvtCol" width="50%">{$LIST_HEADER.2}</td>
-							  <td class="lvtCol" width="15%">{$LIST_HEADER.0}</td>
-                            </tr>
-							{section name=entries loop=$LIST_ENTRIES}
-                            <tr  class="lvtColData" onmouseover="this.className='lvtColDataHover'" onmouseout="this.className='lvtColData'" bgcolor="white">
-                              <td ><a href="index.php?module=Users&action=GroupDetailView&parenttab=Settings&groupId={$LIST_ENTRIES[entries].groupid}">{$LIST_ENTRIES[entries].groupname}</a></td>
-                              <td >{$LIST_ENTRIES[entries].description}</td>
-							  <td align="center" >
-							  	<a href="index.php?module=Users&action=createnewgroup&returnaction=listgroups&parenttab=Settings&mode=edit&groupId={$LIST_ENTRIES[entries].groupid}">
-								<img src="{$IMAGE_PATH}editfield.gif" alt="{$APP.LNK_EDIT}" title="{$APP.LNK_EDIT}" border="0" align="absmiddle"></a>&nbsp;|	
-								<a href="#" onClick="deletegroup('{$LIST_ENTRIES[entries].groupid}','{$LIST_ENTRIES[entries].groupname}')";><img src="{$IMAGE_PATH}delete.gif" alt="{$LNK_DELETE}" title="{$APP.LNK_DELETE}" border="0" align="absmiddle"></a>
-							</td>
-                            </tr>
-							{/section}	
-                          </tbody>
-                        </table>
-			</td>
-	</tr>
+	</form>
+	</table>
+		
+	</div>
+</td>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
+   </tr>
+</tbody>
 </table>
 
-</td>
-
-</tr>
-</table>
-</td>
-</tr>
-</table>
-</td>
-</tr>
-</table>
 <script>
 function deletegroup(id,groupname)
 {ldelim}
@@ -85,23 +112,3 @@
 			return false;
 {rdelim}
 </script>
-	{include file='SettingsSubMenu.tpl'}
-
-<!-- 
-
-<td class="detailedViewHeader" width="15%"><b>{$LIST_HEADER.0}</b></td>
-	<td class="detailedViewHeader" width="35%"><b>{$LIST_HEADER.1}</b></td>
-	<td class="detailedViewHeader" width="50%"><b>{$LIST_HEADER.2}</b></td>
-	</tr>
-	
-	{section name=entries loop=$LIST_ENTRIES}
-		<tr class="{cycle values="dvtCellInfo,dvtCellLabel"}">
-		<td nowrap>&nbsp;
-		<img src="{$IMAGE_PATH}del.gif" alt="{$APP.LNK_DELETE}" title="{$APP.LNK_DELETE}" border="0" height="15" width="15" onClick="deletegroup('{$LIST_ENTRIES[entries].groupid}','{$LIST_ENTRIES[entries].groupname}')";>
-		<a href="index.php?module=Users&action=createnewgroup&returnaction=listgroups&mode=edit&groupId={$LIST_ENTRIES[entries].groupid}"><img src="{$IMAGE_PATH}edit.gif" alt="{$APP.LNK_EDIT}" title="{$APP.LNK_EDIT}" border="0"></a>
-		&nbsp;</td>
-		<td nowrap><a href="index.php?module=Users&action=GroupDetailView&groupId={$LIST_ENTRIES[entries].groupid}">{$LIST_ENTRIES[entries].groupname}</a></td>
-		<td nowrap>{$LIST_ENTRIES[entries].description}&nbsp;</td>
-		<tr>
-	{/section}	
- -->



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 19 23:50:02 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 20 Jun 2006 06:50:02 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7285 -
 /vtigercrm/trunk/Smarty/templates/CurrencyEditView.tpl
Message-ID: <20060620065002.11F1083F230@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 20 00:49:58 2006
New Revision: 7285

Log:
updated currency editview file - ahmed

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

Modified: vtigercrm/trunk/Smarty/templates/CurrencyEditView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/CurrencyEditView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/CurrencyEditView.tpl Tue Jun 20 00:49:58 2006
@@ -1,118 +1,125 @@
-{*
-
-/*********************************************************************************
-** The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is:  vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
-*
- ********************************************************************************/ *}
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-<tr>
-        {include file='SettingsMenu.tpl'}
-<td width="75%" valign="top">
-<form action="index.php" method="post" name="index" id="form">
-<input type="hidden" name="module" value="Settings">
-<input type="hidden" name="parenttab" value="{$PARENTTAB}">
-<input type="hidden" name="action" value="index">
-<input type="hidden" name="record" value="{$ID}">
-<table width="100%" border="0" cellpadding="0" cellspacing="0" height="100%">
-	<tr>
-		<td class="showPanelBg" valign="top" width="95%"  style="padding-left:20px; "><br />
-			<span class="lvtHeaderText"> {$MOD.LBL_MODULE_NAME} &gt; {$MOD.LBL_CONFIGURATION} &gt; {$MOD.LBL_CURRENCY_INFO} </span>
-			<hr noshade="noshade" size="1" />
-		</td>
-		<td width="5%" class="showPanelBg">&nbsp;</td>
-	</tr>
-	<tr>
-		<td width="98%" style="padding-left:20px;" valign="top">
-			<!-- module Select Table -->
-			<table width="95%"  border="0" cellspacing="0" cellpadding="0" align="center">
-				<tr>
-					<td width="7" height="6" style="font-size:1px;font-family:Arial, Helvetica, sans-serif;"><img src="{$IMAGE_PATH}top_left.jpg" align="top"  /></td>
-					<td bgcolor="#EBEBEB" style="font-size:1px;font-family:Arial, Helvetica, sans-serif;height:6px;"></td>
-					<td width="8" height="6" style="font-size:1px;font-family:Arial, Helvetica, sans-serif;"><img src="{$IMAGE_PATH}top_right.jpg" width="8" height="6" align="top" /></td>
-				</tr>
-				<tr>
-					<td bgcolor="#EBEBEB" width="7"></td>
-					<td bgcolor="#ECECEC" style="padding-left:10px;padding-top:10px;vertical-align:top;">
-					<table width="100%"  border="0" cellspacing="0" cellpadding="10" class="small">
-						<tr>
-							<td rowspan="11" bgcolor="#ffffff" width="30%" valign="bottom" background="{$IMAGE_PATH}CurrConfig_top.gif" style="background-position:top right;background-repeat:no-repeat;">
-		<table width="100%" border="0" cellpadding="0" cellspacing="0">
-				<tr>
-						<td background="{$IMAGE_PATH}CurrConfig_btm.gif" style="background-position:bottom right;background-repeat:no-repeat; " height="150">&nbsp;</td>
-				</tr>
-		</table>
-	</td>
-							<td colspan="2" class="genHeaderBig" width="70%">{$MOD.LBL_CURRENCY_TITLE}<br />
-							<hr /> </td>
-						</tr>
-					        <tr>
-							<td align="right" width="25%"><font color="red">*</font><b>{$MOD.LBL_CURRENCY_NAME} : </b></td>
-							<td width="50%" align="left" ><input type="text" name="currency_name" value="{$CURRENCY_NAME}" class="txtBox" /></td>
-						</tr>
-						<tr>
-							<td align="right"><font color="red">*</font><b>{$MOD.LBL_CURRENCY_CODE} : </b></td>
-							<td><input type="text" name="currency_code" value="{$CURRENCY_CODE}" class="txtBox" /></td>
-						</tr>
-						<tr>
-							<td align="right"><font color="red">*</font><b>{$MOD.LBL_CURRENCY_SYMBOL} : </b></td>
-							<td><input type="text" name="currency_symbol" value="{$CURRENCY_SYMBOL}" class="txtBox" /></td>
-						</tr>
-						<tr>
-							<td align="right"><font color="red">*</font><b>{$MOD.LBL_CURRENCY_CRATE}  : </b></td>
-							<td>
-								<input type="text" name="conversion_rate" value="{$CONVERSION_RATE}" class="txtBox" />
-								<br>(Eg: 1 U.S. Dollar equal to 0.78 Euro) 
-							</td>
-						</tr>
-						<tr>
-							<td align="right"><b>{$MOD.LBL_CURRENCY_STATUS} : </b></td>
-							<td><select name="currency_status" {$STATUS_DISABLE} class="importBox">
-								<option value="Active"  {$ACTSELECT}>{$MOD.LBL_ACTIVE}</option>
-					        	        <option value="Inactive" {$INACTSELECT}>{$MOD.LBL_INACTIVE}</option>
-					                    </select>
-							</td>
-						</tr>
-						<tr>
-							<td colspan="2"  width="75%" style="padding-bottom:0px;padding-top:0px; "><hr /> </td>
-						</tr>
-						<tr>
-							<td colspan="2" align="center">
-							<input title="{$APP.LBL_SAVE_BUTTON_LABEL}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="classBtn" onclick="this.form.action.value='SaveCurrencyInfo'; return validate()" type="submit" name="button" value="{$APP.LBL_SAVE_BUTTON_LABEL}" >&nbsp;&nbsp;
-							<input title="{$APP.LBL_CANCEL_BUTTON_LABEL}>" accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" class="classBtn" onclick="window.history.back()" type="button" name="button" value="{$APP.LBL_CANCEL_BUTTON_LABEL}">
-							</td>
-						</tr>
-					</table>
-					</td>
-					<td bgcolor="#EBEBEB" width="8"></td>
-				</tr>
-				<tr>
-					<td width="7" height="8" style="font-size:1px;font-family:Arial, Helvetica, sans-serif;"><img src="{$IMAGE_PATH}bottom_left.jpg" align="bottom"  /></td>
-					<td bgcolor="#ECECEC" height="8" style="font-size:1px;" ></td>
-					<td width="8" height="8" style="font-size:1px;font-family:Arial, Helvetica, sans-serif;"><img src="{$IMAGE_PATH}bottom_right.jpg" align="bottom" /></td>
-				</tr>
-			</table><br />
-		</td>
-		<td>&nbsp;</td>
-	</tr>
-</table>
-</form>
-</td>
-</tr>
-</table>
-<script>
-        function validate() {ldelim}
-                if (!emptyCheck("currency_name","Currency Name","text")) return false
-                        if (!emptyCheck("currency_code","Currency Code","text")) return false
-                                if (!emptyCheck("currency_symbol","Currency Symbol","text")) return false
-                                        if (!emptyCheck("conversion_rate","Conversion Rate","text")) return false
-                                                if (!emptyCheck("currency_status","Currency Status","text")) return false
-                                                        return true;
-
-        {rdelim}
-</script>
-{include file='SettingsSubMenu.tpl'}
+{*<!--
+/*********************************************************************************
+** The contents of this file are subject to the vtiger CRM Public License Version 1.0
+ * ("License"); You may not use this file except in compliance with the License
+ * The Original Code is:  vtiger CRM Open Source
+ * The Initial Developer of the Original Code is vtiger.
+ * Portions created by vtiger are Copyright (C) vtiger.
+ * All Rights Reserved.
+*
+ ********************************************************************************/
+-->*}
+<script language="JAVASCRIPT" type="text/javascript" src="include/js/smoothscroll.js"></script>
+<script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
+<br>
+<table align="center" border="0" cellpadding="0" cellspacing="0" width="98%">
+<tbody><tr>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
+        <td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
+<br>
+	<div align=center>
+			{include file='SetMenu.tpl'}
+			<!-- DISPLAY -->
+			<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
+			<form action="index.php" method="post" name="index" id="form">
+			<input type="hidden" name="module" value="Settings">
+			<input type="hidden" name="parenttab" value="{$PARENTTAB}">
+			<input type="hidden" name="action" value="index">
+			<input type="hidden" name="record" value="{$ID}">
+			<tr>
+				<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}currency.gif" alt="Users" width="48" height="48" border=0 title="Users"></td>
+				<td class="heading2" valign="bottom" ><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Settings&action=CurrencyListView&parenttab=Settings">{$MOD.LBL_CURRENCY_SETTINGS}</a> > {$MOD.LBL_EDIT} &quot;{$CURRENCY_NAME}&quot; </b></td>
+			</tr>
+			<tr>
+				<td valign=top class="small">{$MOD.LBL_CURRENCY_DESCRIPTION}</td>
+			</tr>
+			</table>
+				
+				<br>
+				<table border=0 cellspacing=0 cellpadding=10 width=100% >
+				<tr>
+				<td>
+				
+					<table border=0 cellspacing=0 cellpadding=5 width=100% class="tableHeading">
+					<tr>
+						<td class="big"><strong>{$MOD.LBL_SETTINGS} {$APP.LBL_FOR} &quot;{$CURRENCY_NAME}&quot;  </strong></td>
+						<td class="small" align=right>
+							<input title="{$APP.LBL_SAVE_BUTTON_LABEL}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="crmButton small save" onclick="this.form.action.value='SaveCurrencyInfo'; return validate()" type="submit" name="button" value="{$APP.LBL_SAVE_BUTTON_LABEL}" >&nbsp;&nbsp;
+							<input title="{$APP.LBL_CANCEL_BUTTON_LABEL}>" accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" class="crmButton small cancel" onclick="window.history.back()" type="button" name="button" value="{$APP.LBL_CANCEL_BUTTON_LABEL}">
+						</td>
+					</tr>
+					</table>
+					
+			<table border=0 cellspacing=0 cellpadding=0 width=100% class="listRow">
+			<tr>
+			<td class="small" valign=top >
+			<table width="100%"  border="0" cellspacing="0" cellpadding="5">
+			  <tr>
+                            <td width="20%" nowrap class="small cellLabel"><font color="red">*</font><strong>{$MOD.LBL_CURRENCY_NAME}</strong></td>
+                            <td width="80%" class="small cellText"><input type="text" class="detailedViewTextBox small" value="{$CURRENCY_NAME}" name="currency_name"></td>
+                          </tr>
+                          <tr valign="top">
+                            <td nowrap class="small cellLabel"><font color="red">*</font><strong>{$MOD.LBL_CURRENCY_CODE}</strong></td>
+                            <td class="small cellText"><input type="text" class="detailedViewTextBox small" value="{$CURRENCY_CODE}" name="currency_code"></td>
+                          </tr>
+                          <tr valign="top">
+                            <td nowrap class="small cellLabel"><font color="red">*</font><strong>{$MOD.LBL_CURRENCY_SYMBOL}</strong></td>
+                            <td class="small cellText"><input type="text" class="detailedViewTextBox small" value="{$CURRENCY_SYMBOL}" name="currency_symbol"></td>
+                          </tr>
+                          <tr valign="top">
+                            <td nowrap class="small cellLabel"><font color="red">*</font><strong>{$MOD.LBL_CURRENCY_CRATE}</strong></td>
+
+                            <td class="small cellText"><input type="text" class="detailedViewTextBox small" value="{$CONVERSION_RATE}" name="conversion_rate"></td>
+                          </tr>
+                          <tr>
+                            <td nowrap class="small cellLabel"><strong>{$MOD.LBL_CURRENCY_STATUS}</strong></td>
+                            <td class="small cellText">
+				<select name="currency_status" {$STATUS_DISABLE} class="importBox">
+					<option value="Active"  {$ACTSELECT}>{$MOD.LBL_ACTIVE}</option>
+		        	        <option value="Inactive" {$INACTSELECT}>{$MOD.LBL_INACTIVE}</option>
+              	                </select>
+			    </td>
+                          </tr>	
+                        </table>
+						
+						</td>
+					  </tr>
+					</table>
+					<table border=0 cellspacing=0 cellpadding=5 width=100% >
+					<tr>
+					  <td class="small" nowrap align=right><a href="#top">{$MOD.LBL_SCROLL}</a></td>
+					</tr>
+					</table>
+				</td>
+				</tr>
+				</table>
+			
+			
+			
+			</td>
+			</tr>
+			</table>
+		</td>
+	</tr>
+	</form>
+	</table>
+		
+	</div>
+</td>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
+   </tr>
+</tbody>
+</table>
+{literal}
+<script>
+        function validate() {
+                if (!emptyCheck("currency_name","Currency Name","text")) return false
+                        if (!emptyCheck("currency_code","Currency Code","text")) return false
+                                if (!emptyCheck("currency_symbol","Currency Symbol","text")) return false
+                                        if (!emptyCheck("conversion_rate","Conversion Rate","text")) return false
+                                                if (!emptyCheck("currency_status","Currency Status","text")) return false
+                                                        return true;
+
+        }
+</script>
+{/literal}



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 19 23:50:47 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 20 Jun 2006 06:50:47 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7286 -
 /vtigercrm/trunk/Smarty/templates/CurrencyDetailView.tpl
Message-ID: <20060620065047.F217A83F22E@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 20 00:50:43 2006
New Revision: 7286

Log:
Added the currency detailview file - ahmed

Added:
    vtigercrm/trunk/Smarty/templates/CurrencyDetailView.tpl



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 19 23:59:25 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 20 Jun 2006 06:59:25 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7287 - in
 /vtigercrm/trunk/Smarty/templates: CreateEmailTemplate.tpl
 DetailViewEmailTemplate.tpl ListEmailTemplates.tpl
Message-ID: <20060620065925.C9F8A83F230@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 20 00:59:19 2006
New Revision: 7287

Log:
Updated the tpl file for email templates - ahmed

Modified:
    vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl
    vtigercrm/trunk/Smarty/templates/DetailViewEmailTemplate.tpl
    vtigercrm/trunk/Smarty/templates/ListEmailTemplates.tpl

Modified: vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl Tue Jun 20 00:59:19 2006
@@ -1,325 +1,325 @@
-{*<!--
-/*********************************************************************************
-  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
-   * ("License"); You may not use this file except in compliance with the License
-   * The Original Code is:  vtiger CRM Open Source
-   * The Initial Developer of the Original Code is vtiger.
-   * Portions created by vtiger are Copyright (C) vtiger.
-   * All Rights Reserved.
-  *
- ********************************************************************************/
--->*}
-<script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
-<style type="text/css">@import url(../themes/blue/style.css);</style>
-
-<script language="JavaScript" type="text/javascript">
-    var allOptions = null;
-
-    function setAllOptions(inputOptions) 
-    {ldelim}
-        allOptions = inputOptions;
-    {rdelim}
-
-    function modifyMergeFieldSelect(cause, effect) 
-    {ldelim}
-        var selected = cause.options[cause.selectedIndex].value;  id="mergeFieldValue"
-        var s = allOptions[cause.selectedIndex];
-            
-        effect.length = s;
-        for (var i = 0; i < s; i++) 
-	{ldelim}
-            effect.options[i] = s[i];
-        {rdelim}
-        document.getElementById('mergeFieldValue').value = '';
-    {rdelim}
-{literal}
-    function init() 
-    {
-        var blankOption = new Option('--None--', '--None--');
-        var allOpts = new Object(0);
-        var options = null;
-            
-	    options = new Object(19);
-            options[0] = blankOption;
-            
-                
-                options[1] = new Option('Account: Account Name', '$accounts-accountname$'); 
-                options[2] = new Option('Account: Account Type', '$accounts-account_type$'); 
-                options[3] = new Option('Account: Industry', '$accounts-industry$'); 
-                options[4] = new Option('Account: Annual Revenue', '$accounts-annualrevenue$'); 
-                options[5] = new Option('Account: Phone', '$accounts-phone$'); 
-                options[6] = new Option('Account: Email', '$accounts-email1$'); 
-                options[7] = new Option('Account: Rating', '$accounts-rating$'); 
-                options[8] = new Option('Account: Website', '$accounts-website$'); 
-                options[9] = new Option('Account: Fax', '$accounts-fax$'); 
-            
-	        allOpts[1] = options;
-        
-            options = new Object(11);
-            options[0] = blankOption;
-                
-                options[1] = new Option('Contact: First Name', '$contacts-firstname$'); 
-                options[2] = new Option('Contact: Last Name', '$contacts-lastname$'); 
-                options[3] = new Option('Contact: Salutation', '$contacts-salutationtype$'); 
-                options[4] = new Option('Contact: Title', '$contacts-title$'); 
-                options[5] = new Option('Contact: Email', '$contacts-email$'); 
-                options[6] = new Option('Contact: Department', '$contacts-department$'); 
-                options[7] = new Option('Contact: Other Email','$contacts-otheremail$'); 
-                options[8] = new Option('Contact: Phone', '$contacts-phone$'); 
-                options[9] = new Option('Contact: Mobile', '$contacts-mobile$'); 
-                options[10] = new Option('Contact: Currency', '$contacts-currency$'); 
-                            
-            allOpts[2] = options;
-        
-            
-            options = new Object(19);
-            options[0] = blankOption;
-            
-                
-                options[1] = new Option('Lead: First Name', '$leads-firstname$'); 
-                options[2] = new Option('Lead: Last Name', '$leads-lastname$'); 
-                options[3] = new Option('Lead: Lead Source', '$leads-leadsource$'); 
-                options[4] = new Option('Lead: Status', '$leads-leadstatus$'); 
-                options[5] = new Option('Lead: Rating', '$leads-rating$'); 
-                options[6] = new Option('Lead: Industry', '$leads-industry$'); 
-                options[7] = new Option('Lead: Yahoo ID', '$leads-yahooid$'); 
-                options[8] = new Option('Lead: Email', '$leads-email$'); 
-                options[9] = new Option('Lead: Annual Revenue', '$leads-annualrevenue$'); 
-                options[10] = new Option('Lead: Title', '$leads-designation$'); 
-                options[11] = new Option('Lead: Salutation', '$leads-salutation$'); 
-            
-	        allOpts[3] = options;
-
-	        options = new Object(19);
-                options[0] = blankOption;
-            
-                options[1] = new Option('User: First Name', '$users-first_name$'); 
-                options[2] = new Option('User: Last Name', '$users-last_name$'); 
-		options[3] = new Option('User: Title', '$users-title$'); 
-		options[4] = new Option('User: Department', '$users-department$'); 
-		options[5] = new Option('User: HomePhone', '$users-phone_home$'); 
-		options[6] = new Option('User: Mobile', '$users-phone_mobile$'); 
-		options[7] = new Option('User: Signature', '$users-signature$'); 
-		options[8] = new Option('User: Email', '$users-email$'); 
-		options[9] = new Option('User: Street', '$users-address_street$'); 
-		options[10] = new Option('User: City', '$users-address_city$'); 
-		options[11] = new Option('User: State', '$users-address_state$'); 
-		options[11] = new Option('User: Country', '$users-address_country$'); 
-		options[11] = new Option('User: PostalCode', '$users-address_postalcode$'); 
-            
-            	allOpts[4] = options;
-	    
-        setAllOptions(allOpts);
-    }
-	
-	function cancelForm(frm)
-	{
-		frm.action.value='detailviewemailtemplate'
-		frm.submit()
-	}
-{/literal}
-</script>
-
-
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-<tr>
-	{include file='SettingsMenu.tpl'}
-<td width="75%" valign="top">
-<form action="index.php" method="post" name="templatecreate" onsubmit="return check4null(templatecreate);">  
-<input type="hidden" name="action">
-<input type="hidden" name="mode" value="{$MODE}">
-<input type="hidden" name="module" value="Users">
-<input type="hidden" name="templateid" value="{$TEMPLATEID}">
-
-<!-- EMAIL TEMPLATE PAGE STARTS HERE -->
-<table width="100%" border="0" cellpadding="0" cellspacing="0" height="100%" class="small">
-	<tr>
-		 <td class="showPanelBg" valign="top" width="90%"  style="padding-left:20px; "><br />
-			{if $EMODE eq 'edit'}
-        	        	<span class="lvtHeaderText"><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a>
-				<a href="index.php?module=Users&action=detailviewemailtemplate&templateid={$TEMPLATEID}"> &gt; {$MOD.LBL_COMMUNICATION_TEMPLATES} &gt; {$MOD.LBL_EDIT} {$MOD.EMAILTEMPLATES} &gt; {$TEMPLATENAME}</a></b></span>
-			{else}
-				<span class="lvtHeaderText"><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a>
-				<a href="index.php?module=Users&action=listemailtemplates">&gt; {$MOD.LBL_COMMUNICATION_TEMPLATES} &gt; {$MOD.LBL_CREATE_EMAIL_TEMPLATES} &gt; {$MOD.NEW}</a></b> </span>
-			{/if}
-            	    <hr noshade="noshade" size="1" />
-		</td>
-		<td width="10%" class="showPanelBg">&nbsp;</td>
-	</tr>
-	<tr>
-		<td width="90%" style="padding-left:20px;" valign="top">
-			<table width="100%"  border="0" cellspacing="0" cellpadding="0">
-			  <tr><td colspan="2">&nbsp;</td></tr>
-			  <tr>
-
-				<td colspan="2">
-					<table width="100%" border="0" cellpadding="0" cellspacing="0" class="small">
-						<tr>
-						  <td width="5%" valign="top" align="right" nowrap>
-								<img src="{$IMAGE_PATH}ViewTemplate.gif" align="left" />
-							</td>
-								<td width="5%" valign="top" align="right" nowrap>
-									<b><font color='red'>*</font>{$UMOD.LBL_TEMPLATE_NAME}</b><br />
-									<br />
-									<b>{$UMOD.LBL_DESCRIPTION}{$UMOD.LBL_COLON}</b><br />
-									<br /><br />
-									<b><font color='red'>{$APP.LBL_REQUIRED_SYMBOL}</font>{$UMOD.LBL_FOLDER}{$UMOD.LBL_COLON}</b>
-
-								</td>
-							<td width="85%" align="left" style="padding-left:10px;">
-								<input name="templatename" type="text" class="detailedViewTextBox" onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'" value="{$TEMPLATENAME}" tabindex="1"/>
-								<br />
-								<textarea name="description" cols="30" rows="3" class="detailedViewTextBox" onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'" tabindex="2" >{$DESCRIPTION}</textarea>
-								<br />
-								{if $EMODE eq 'edit'}
-									<select name="foldername" class="detailedViewTextBox" tabindex="3">
-                                                                {foreach item=arr from=$FOLDERNAME}
-
-                                                                 <option value="{$FOLDERNAME}" {$arr}>{$FOLDERNAME}</option>
-
-                                                                        {if $FOLDERNAME == 'Public'}
-                                                                                <option value="Personal">{$UMOD.LBL_PERSONAL}</option>
-                                                                        {else}
-                                                                                <option value="Public">{$UMOD.LBL_PUBLIC}</option>
-                                                                        {/if}
-
-                                                                {/foreach}
-                                                                </select>
-								{else}
-									<select name="foldername" class="detailedViewTextBox" tabindex="3" value="{$FOLDERNAME}">
-                	                                                        <option value="Personal">{$UMOD.LBL_PERSONAL}</option>
-                        	                                                <option value="Public" selected>{$UMOD.LBL_PUBLIC}</option>
-        	                                                        </select>
-								{/if}
-							</td>
-						</tr>
-					</table>
-
-				</td>
-			  </tr>
-			  <tr>
-				<td>&nbsp;</td>
-				<td>&nbsp;</td>
-			  </tr>
-			  <tr>
-			    <td colspan="2" style="border:2px solid #CCCCCC;">
-					<table width="100%" border="0" cellpadding="5" cellspacing="0" class="small">
-
-	                  <tr>
-    	                <td width="15%" align="right" bgcolor="#F6F6F6"><b><font color='red'>*</font>{$UMOD.LBL_TEMPLATE_SUBJECT}</b></td>
-        	            <td width="60%" style="border-right:1px dashed #CCCCCC;">
-							<input name="subject" type="text" class="detailedViewTextBox" value="{$SUBJECT}" onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'" tabindex="4"/></td>
-            	      	<td width="25%" rowspan="3" style="padding:5px;text-align:left;vertical-align:top;">
-							<table width="100%" border="0" cellpadding="0" cellspacing="0" class="small">
-								<tr><td style="color:#999999;">{$UMOD.LBL_USE_MERGE_FIELDS_TO_EMAIL_CONTENT}</td></tr>
-
-								<tr><td><b><u>{$UMOD.LBL_AVAILABLE_MERGE_FIELDS}</u></b></td></tr>
-								<tr><td>&nbsp;</td></tr>
-
-								<tr><td><b>{$UMOD.LBL_SELECT_FIELD_TYPE}</b></td></tr>
-								<tr><td><select class="detailedViewTextBox" id="entityType" ONCHANGE="modifyMergeFieldSelect(this, document.getElementById('mergeFieldSelect'));" tabindex="6">
-								<OPTION VALUE="0" selected>{$APP.LBL_NONE}                            
-								<OPTION VALUE="1">{$UMOD.LBL_ACCOUNT_FIELDS}                            
-                        				        <OPTION VALUE="2">{$UMOD.LBL_CONTACT_FIELDS}
-                            
-								<OPTION VALUE="3" >{$UMOD.LBL_LEAD_FIELDS}
-
-                                				<OPTION VALUE="4" >{$UMOD.LBL_USER_FIELDS}
-                            
-								</select></td></tr>
-								<tr><td>&nbsp;</td></tr>
-								<tr><td><b>{$UMOD.LBL_SELECT_FIELD}</b></td></tr>
-								<tr><td><select class="detailedViewTextBox" id="mergeFieldSelect" onchange="document.getElementById('mergeFieldValue').value=this.options[this.selectedIndex].value;" tabindex="7"><option value="0" selected>{$APP.LBL_NONE}</select></td></tr>
-								<tr><td>&nbsp;</td></tr>
-								<tr><td><b>{$UMOD.LBL_MERGE_FIELD_VALUE}</b></td></tr>
-
-								<tr><td><input type="text"  id="mergeFieldValue" name="variable" value="variable" class="detailedViewTextBoxOn" tabindex="8"/></td></tr>
-								<tr><td style="color:#999999;">({$UMOD.LBL_COPY_AND_PASTE_MERGE_FIELD})</td></tr>
-							</table>
-							<script>
-						                modifyMergeFieldSelect(document.getElementById('mergeTypeSelect'), document.getElementById('mergeFieldSelect'));
-						        </script>
-						
-						</td>
-
-					  </tr>
-					  <tr>
-					  	<td bgcolor="#F6F6F6">&nbsp;</td>
-
-					  	<td style="border-right:1px dashed #CCCCCC;">&nbsp;</td>
-					  </tr>
-	                  <tr>
-	                    <td  align="right" bgcolor="#F6F6F6" valign="top"><b>{$UMOD.LBL_TEMPLATE_MESSAGE}</b></td>
-	                    <td style="border-right:1px dashed #CCCCCC;" nowrap>
-				<textarea name="body" rows="10" class="detailedViewTextBox" onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'" tabindex="5">{$BODY}</textarea>
-			    </td>
-			  </tr>
-
-               	  </table>
-		      </td>
-		      </tr>
-			</table>
-		</td>
-		<td>&nbsp;</td>
-	</tr>
-	<tr><td colspan="2">&nbsp;</td></tr>
-	<tr>
-
-		<td align="center">
-			<input type="submit" value="{$APP.LBL_SAVE_BUTTON_LABEL}" class="small" onclick="this.form.action.value='saveemailtemplate'" tabindex="9"/>&nbsp;&nbsp;
-			{if $EMODE eq 'edit'}
-				<input type="submit" value="{$APP.LBL_CANCEL_BUTTON_LABEL}" class="small" onclick="cancelForm(this.form)" tabindex="10"/>
-			{else}
-				<input type="button" value="{$APP.LBL_CANCEL_BUTTON_LABEL}" class="small" onclick="window.history.back()" tabindex="10">
-			{/if}
-		</td>
-		<td>&nbsp;</td>
-	</tr>
-	
-</table>
-
-</form>
-</td>
-</tr>
-</table>
-
-<script>
-
-function check4null(form)
-{ldelim}
-
-        var isError = false;
-        var errorMessage = "";
-        // Here we decide whether to submit the form.
-        if (trim(form.templatename.value) =='') {ldelim}
-                isError = true;
-                errorMessage += "\n template name";
-                form.templatename.focus();
-        {rdelim}
-        if (trim(form.foldername.value) =='') {ldelim}
-                isError = true;
-                errorMessage += "\n folder name";
-                form.foldername.focus();
-        {rdelim}
-        if (trim(form.subject.value) =='') {ldelim}
-                isError = true;
-                errorMessage += "\n subject";
-                form.subject.focus();
-        {rdelim}
-
-        // Here we decide whether to submit the form.
-        if (isError == true) {ldelim}
-                alert("Missing required fields: " + errorMessage);
-                return false;
-        {rdelim}
- return true;
-
-{rdelim}
-
-init();
-
-</script>
-
-{$JAVASCRIPT}
-{include file='SettingsSubMenu.tpl'}
-
+{*<!--
+/*********************************************************************************
+  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
+   * ("License"); You may not use this file except in compliance with the License
+   * The Original Code is:  vtiger CRM Open Source
+   * The Initial Developer of the Original Code is vtiger.
+   * Portions created by vtiger are Copyright (C) vtiger.
+   * All Rights Reserved.
+  *
+ ********************************************************************************/
+-->*}
+<script language="JAVASCRIPT" type="text/javascript" src="include/js/smoothscroll.js"></script>
+<script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
+<style type="text/css">@import url(../themes/blue/style.css);</style>
+
+<script language="JavaScript" type="text/javascript">
+    var allOptions = null;
+
+    function setAllOptions(inputOptions) 
+    {ldelim}
+        allOptions = inputOptions;
+    {rdelim}
+
+    function modifyMergeFieldSelect(cause, effect) 
+    {ldelim}
+        var selected = cause.options[cause.selectedIndex].value;  id="mergeFieldValue"
+        var s = allOptions[cause.selectedIndex];
+            
+        effect.length = s;
+        for (var i = 0; i < s; i++) 
+	{ldelim}
+            effect.options[i] = s[i];
+        {rdelim}
+        document.getElementById('mergeFieldValue').value = '';
+    {rdelim}
+{literal}
+    function init() 
+    {
+        var blankOption = new Option('--None--', '--None--');
+        var allOpts = new Object(0);
+        var options = null;
+            
+	    options = new Object(19);
+            options[0] = blankOption;
+            
+                
+                options[1] = new Option('Account: Account Name', '$accounts-accountname$'); 
+                options[2] = new Option('Account: Account Type', '$accounts-account_type$'); 
+                options[3] = new Option('Account: Industry', '$accounts-industry$'); 
+                options[4] = new Option('Account: Annual Revenue', '$accounts-annualrevenue$'); 
+                options[5] = new Option('Account: Phone', '$accounts-phone$'); 
+                options[6] = new Option('Account: Email', '$accounts-email1$'); 
+                options[7] = new Option('Account: Rating', '$accounts-rating$'); 
+                options[8] = new Option('Account: Website', '$accounts-website$'); 
+                options[9] = new Option('Account: Fax', '$accounts-fax$'); 
+            
+	        allOpts[1] = options;
+        
+            options = new Object(11);
+            options[0] = blankOption;
+                
+                options[1] = new Option('Contact: First Name', '$contacts-firstname$'); 
+                options[2] = new Option('Contact: Last Name', '$contacts-lastname$'); 
+                options[3] = new Option('Contact: Salutation', '$contacts-salutationtype$'); 
+                options[4] = new Option('Contact: Title', '$contacts-title$'); 
+                options[5] = new Option('Contact: Email', '$contacts-email$'); 
+                options[6] = new Option('Contact: Department', '$contacts-department$'); 
+                options[7] = new Option('Contact: Other Email','$contacts-otheremail$'); 
+                options[8] = new Option('Contact: Phone', '$contacts-phone$'); 
+                options[9] = new Option('Contact: Mobile', '$contacts-mobile$'); 
+                options[10] = new Option('Contact: Currency', '$contacts-currency$'); 
+                            
+            allOpts[2] = options;
+        
+            
+            options = new Object(19);
+            options[0] = blankOption;
+            
+                
+                options[1] = new Option('Lead: First Name', '$leads-firstname$'); 
+                options[2] = new Option('Lead: Last Name', '$leads-lastname$'); 
+                options[3] = new Option('Lead: Lead Source', '$leads-leadsource$'); 
+                options[4] = new Option('Lead: Status', '$leads-leadstatus$'); 
+                options[5] = new Option('Lead: Rating', '$leads-rating$'); 
+                options[6] = new Option('Lead: Industry', '$leads-industry$'); 
+                options[7] = new Option('Lead: Yahoo ID', '$leads-yahooid$'); 
+                options[8] = new Option('Lead: Email', '$leads-email$'); 
+                options[9] = new Option('Lead: Annual Revenue', '$leads-annualrevenue$'); 
+                options[10] = new Option('Lead: Title', '$leads-designation$'); 
+                options[11] = new Option('Lead: Salutation', '$leads-salutation$'); 
+            
+	        allOpts[3] = options;
+
+	        options = new Object(19);
+                options[0] = blankOption;
+            
+                options[1] = new Option('User: First Name', '$users-first_name$'); 
+                options[2] = new Option('User: Last Name', '$users-last_name$'); 
+		options[3] = new Option('User: Title', '$users-title$'); 
+		options[4] = new Option('User: Department', '$users-department$'); 
+		options[5] = new Option('User: HomePhone', '$users-phone_home$'); 
+		options[6] = new Option('User: Mobile', '$users-phone_mobile$'); 
+		options[7] = new Option('User: Signature', '$users-signature$'); 
+		options[8] = new Option('User: Email', '$users-email$'); 
+		options[9] = new Option('User: Street', '$users-address_street$'); 
+		options[10] = new Option('User: City', '$users-address_city$'); 
+		options[11] = new Option('User: State', '$users-address_state$'); 
+		options[11] = new Option('User: Country', '$users-address_country$'); 
+		options[11] = new Option('User: PostalCode', '$users-address_postalcode$'); 
+            
+            	allOpts[4] = options;
+	    
+        setAllOptions(allOpts);
+    }
+	
+	function cancelForm(frm)
+	{
+		frm.action.value='detailviewemailtemplate';
+		frm.parenttab.value='Settings';
+		frm.submit();
+	}
+{/literal}
+</script>
+
+<br>
+<table align="center" border="0" cellpadding="0" cellspacing="0" width="98%">
+<tbody><tr>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
+        <td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
+<br>
+	<div align=center>
+	
+			{include file='SetMenu.tpl'}
+				<!-- DISPLAY -->
+				<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
+				<form action="index.php" method="post" name="templatecreate" onsubmit="return check4null(templatecreate);">  
+				<input type="hidden" name="action">
+				<input type="hidden" name="mode" value="{$EMODE}">
+				<input type="hidden" name="module" value="Users">
+				<input type="hidden" name="templateid" value="{$TEMPLATEID}">
+				<input type="hidden" name="parenttab" value="PARENTTAB}">
+				<tr>
+					<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}ViewTemplate.gif" alt="Users" width="45" height="60" border=0 title="Users"></td>
+				{if $EMODE eq 'edit'}
+					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Users&action=listemailtemplates&parenttab=Settings">{$UMOD.LBL_EMAIL_TEMPLATES}</a> &gt; {$MOD.LBL_EDIT} &quot;{$TEMPLATENAME}&quot; </b></td>
+				{else}
+					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Users&action=listemailtemplates&parenttab=Settings">{$UMOD.LBL_EMAIL_TEMPLATES}</a> &gt; {$MOD.LBL_CREATE_EMAIL_TEMPLATES} </b></td>
+				{/if}
+					
+				</tr>
+				<tr>
+					<td valign=top class="small">{$UMOD.LBL_EMAIL_TEMPLATE_DESC}</td>
+				</tr>
+				</table>
+				
+				<br>
+				<table border=0 cellspacing=0 cellpadding=10 width=100% >
+				<tr>
+				<td>
+				
+					<table border=0 cellspacing=0 cellpadding=5 width=100% class="tableHeading">
+					<tr>
+						{if $EMODE eq 'edit'}
+						<td class="big"><strong>{$UMOD.LBL_PROPERTIES} &quot;{$TEMPLATENAME}&quot; </strong></td>
+						{else}
+						<td class="big"><strong>{$MOD.LBL_CREATE_EMAIL_TEMPLATES}</strong></td>
+						{/if}
+						<td class="small" align=right>
+							<input type="submit" value="{$APP.LBL_SAVE_BUTTON_LABEL}" class="crmButton small save" onclick="this.form.action.value='saveemailtemplate'; this.form.parenttab.value='Settings'" >&nbsp;&nbsp;
+			{if $EMODE eq 'edit'}
+				<input type="submit" value="{$APP.LBL_CANCEL_BUTTON_LABEL}" class="crmButton small cancel" onclick="cancelForm(this.form)" />
+			{else}
+				<input type="button" value="{$APP.LBL_CANCEL_BUTTON_LABEL}" class="crmButton small cancel" onclick="window.history.back()" >
+			{/if}
+						</td>
+					</tr>
+					</table>
+					
+					<table border=0 cellspacing=0 cellpadding=5 width=100% >
+					<tr>
+						<td width=20% class="small cellLabel"><font color="red">*</font><strong>{$UMOD.LBL_NAME}</strong></td>
+						<td width=80% class="small cellText"><input name="templatename" type="text" value="{$TEMPLATENAME}" class="detailedViewTextBox" tabindex="1">&nbsp;</td>
+					  </tr>
+					<tr>
+						<td valign=top class="small cellLabel"><strong>{$UMOD.LBL_DESCRIPTION}</strong></td>
+						<td class="cellText small" valign=top><span class="small cellText">
+						  <input name="description" type="text" value="{$DESCRIPTION}" class="detailedViewTextBox" tabindex="2">
+						</span></td>
+					  </tr>
+					<tr>
+						<td valign=top class="small cellLabel"><strong>{$UMOD.LBL_FOLDER}</strong></td>
+						<td class="cellText small" valign=top>
+						{if $EMODE eq 'edit'}
+						<select name="foldername" class="small" tabindex="" style="width:100%" tabindex="3">
+                                                    {foreach item=arr from=$FOLDERNAME}
+                                                     <option value="{$FOLDERNAME}" {$arr}>{$FOLDERNAME}</option>
+                                                        {if $FOLDERNAME == 'Public'}
+                                                          <option value="Personal">{$UMOD.LBL_PERSONAL}</option>
+                                                        {else}
+                                                          <option value="Public">{$UMOD.LBL_PUBLIC}</option>
+                                                         {/if}
+                                                   {/foreach}
+                                                 </select>
+						{else}
+						<select name="foldername" class="small" tabindex="" value="{$FOLDERNAME}" style="width:100%" tabindex="3">
+                                                    <option value="Personal">{$UMOD.LBL_PERSONAL}</option>
+                                                    <option value="Public" selected>{$UMOD.LBL_PUBLIC}</option>
+        	                                </select>
+						{/if}
+					
+						</td>
+					  </tr>
+					
+					
+					<tr>
+					  <td colspan="2" valign=top class="cellText small"><table width="100%"  border="0" cellspacing="0" cellpadding="0" class="thickBorder">
+                        <tr>
+                          <td valign=top><table width="100%"  border="0" cellspacing="0" cellpadding="5" >
+                              <tr>
+                                <td colspan="3" valign="top" class="small" style="background-color:#cccccc"><strong>{$UMOD.LBL_EMAIL_TEMPLATE}</strong></td>
+                                </tr>
+                              <tr>
+                                <td width="15%" valign="top" class="cellLabel small"><font color='red'>*</font>{$UMOD.LBL_SUBJECT}</td>
+                                <td width="85%" colspan="2" class="cellText small"><span class="small cellText">
+                                  <input name="subject" type="text" value="{$SUBJECT}" class="detailedViewTextBox" tabindex="4">
+                                </span></td>
+                              </tr>
+                              <tr>
+                                <td valign="top" width=10% class="cellLabel small">{$UMOD.LBL_MESSAGE}</td>
+                                 <td valign="top" width=60% class="cellText small"><p><textarea name="body" style="width:90%;height:200px" class=small tabindex="5">{$BODY}</textarea></p>
+                                    </td>
+                                <td valign="top" width=30% class="cellText small" style="border-left:2px dotted #cccccc;"><table width="100%"  border="0" cellspacing="0" cellpadding="5" >
+                                  <tr>
+                                    <td class="small"><strong>{$UMOD.LBL_MERGE_FIELDS}<br>
+                                    </strong>{$UMOD.LBL_USE_MERGE_FIELDS_TO_EMAIL_CONTENT}</td>
+                                  </tr>
+                                  <tr>
+                                    <td class="small" nowrap><strong>{$UMOD.LBL_STEP} 1. {$UMOD.LBL_SELECT_FIELD_TYPE}</strong></td>
+                                  </tr>
+				<tr><td><select class="detailedViewTextBox" id="entityType" ONCHANGE="modifyMergeFieldSelect(this, document.getElementById('mergeFieldSelect'));" tabindex="6">
+					<OPTION VALUE="0" selected>{$APP.LBL_NONE}                            
+					<OPTION VALUE="1">{$UMOD.LBL_ACCOUNT_FIELDS}                            
+                        	        <OPTION VALUE="2">{$UMOD.LBL_CONTACT_FIELDS}
+                      			<OPTION VALUE="3" >{$UMOD.LBL_LEAD_FIELDS}
+               				<OPTION VALUE="4" >{$UMOD.LBL_USER_FIELDS}
+					</select></td></tr>
+                                  <tr>
+                                    <td class="small"><strong>{$UMOD.LBL_STEP} 2. {$UMOD.LBL_SELECT_FIELD} </strong></td>
+                                  </tr>
+					<tr><td><select class="detailedViewTextBox" id="mergeFieldSelect" onchange="document.getElementById('mergeFieldValue').value=this.options[this.selectedIndex].value;" tabindex="7"><option value="0" selected>{$APP.LBL_NONE}</select></td></tr>
+                                  <tr>
+                                    <td class="small"><strong>{$UMOD.LBL_STEP} 3. {$UMOD.LBL_COPY_PASTE} </strong></td>
+                                  </tr>
+					<tr><td><input type="text"  id="mergeFieldValue" name="variable" value="variable" class="detailedViewTextBoxOn" tabindex="8"/></td></tr>
+                                </table></td>
+                              </tr>
+                          </table></td>
+                          
+                        </tr>
+                      </table></td>
+					  </tr>
+					</table>
+					<br>
+					<table border=0 cellspacing=0 cellpadding=5 width=100% >
+					<tr>
+					  <td class="small" nowrap align=right><a href="#top">{$MOD.LBL_SCROLL}</a></td>
+					</tr>
+					</table>
+				</td>
+				</tr>
+				</table>
+			
+			
+			
+			</td>
+			</tr>
+			</table>
+		</td>
+	</tr>
+	</form>
+	</table>
+		
+	</div>
+
+</td>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
+   </tr>
+</tbody>
+</table>
+<script>
+
+function check4null(form)
+{ldelim}
+
+        var isError = false;
+        var errorMessage = "";
+        // Here we decide whether to submit the form.
+        if (trim(form.templatename.value) =='') {ldelim}
+                isError = true;
+                errorMessage += "\n template name";
+                form.templatename.focus();
+        {rdelim}
+        if (trim(form.foldername.value) =='') {ldelim}
+                isError = true;
+                errorMessage += "\n folder name";
+                form.foldername.focus();
+        {rdelim}
+        if (trim(form.subject.value) =='') {ldelim}
+                isError = true;
+                errorMessage += "\n subject";
+                form.subject.focus();
+        {rdelim}
+
+        // Here we decide whether to submit the form.
+        if (isError == true) {ldelim}
+                alert("Missing required fields: " + errorMessage);
+                return false;
+        {rdelim}
+ return true;
+
+{rdelim}
+
+init();
+
+</script>

Modified: vtigercrm/trunk/Smarty/templates/DetailViewEmailTemplate.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DetailViewEmailTemplate.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DetailViewEmailTemplate.tpl Tue Jun 20 00:59:19 2006
@@ -1,99 +1,117 @@
-{*<!--
-/*********************************************************************************
-  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
-   * ("License"); You may not use this file except in compliance with the License
-   * The Original Code is:  vtiger CRM Open Source
-   * The Initial Developer of the Original Code is vtiger.
-   * Portions created by vtiger are Copyright (C) vtiger.
-   * All Rights Reserved.
-  *
- ********************************************************************************/
--->*}
-<script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
-<style type="text/css">@import url(themes/blue/style.css);</style>
-
-<table width="100%" border="0" cellpadding="0" cellspacing="0" class="small">
-<tr>
-	{include file='SettingsMenu.tpl'}
-<td width="75%" valign="top">
-<!-- EMAIL TEMPLATE PAGE STARTS HERE -->
-<table width="100%" border="0" cellpadding="0" cellspacing="0" height="100%" class="small">
-	<tr>
-	   <td class="showPanelBg" valign="top" width="90%"  style="padding-left:20px; "><br />
-              <span class="lvtHeaderText"><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a>
-		<a href="index.php?module=Users&action=listemailtemplates&parenttab=Settings">&gt; {$UMOD.LBL_EMAIL_TEMPLATE_INFORMATION} &quot;{$TEMPLATENAME}&quot;</a></b></span>
-	        <hr noshade="noshade" size="1" />
-	   </td>
-		<td width="10%" class="showPanelBg">&nbsp;</td>
-	</tr>
-	 <tr>
-	     <td width="90%" style="padding-left:20px;" valign="top">
-		<table width="100%"  border="0" cellspacing="0" cellpadding="0">
-		    <form method="post" action="index.php" name="etemplatedetailview">  
-			<input type="hidden" name="action" >
-			<input type="hidden" name="module" value="Users">
-			<input type="hidden" name="templatename" value="{$TEMPLATENAME}">
-			<input type="hidden" name="templateid" value="{$TEMPLATEID}">
-			<input type="hidden" name="foldername" value="{$FOLDERNAME}">
-		    
-			<tr><td colspan="2">&nbsp;</td></tr>
-			<tr><td colspan="2">
-			    <table width="100%" border="0" cellpadding="0" cellspacing="0" class="small">
-				<tr><td width="75%" valign="middle" >
-					<img src="{$IMAGE_PATH}ViewTemplate.gif" align="left" />
-					<span class="genHeaderBig">{$TEMPLATENAME}</span><br />
-					<span class="dashMnuUnSel">{$TEMPLATENAME} {$UMOD.LBL_TEMPLATE_HEADER} </span> 
-				    </td>
-				    <td width="25%" align="right" valign="bottom"><input type="submit" name="Button" value="{$UMOD.LBL_EDIT_TEMPLATE}" class="small" onclick="this.form.action.value='editemailtemplate'"/></td>
-				</tr>
-			    </table>
-			    </td>
-			</tr>
-			  <tr>
-				<td>&nbsp;</td>
-				<td>&nbsp;</td>
-			  </tr>
-			  
-			  <tr>
-			    <td colspan="2" style="border:2px solid #CCCCCC;">
-				<table width="100%" border="0" cellpadding="5" cellspacing="0" class="small">
-			          <tr>
-			
-    	                		<td width="25%" align="right" bgcolor="#F6F6F6"><b>{$UMOD.LBL_FOLDER}</b></td>
-        	            		<td width="75%" class="mnuTab">{$FOLDERNAME}</td>
-            	      		  </tr>
-					  <tr><td bgcolor="#F6F6F6">&nbsp;</td>
-					  <td>&nbsp;</td></tr>
-	
-	                  	  <tr>
-			
-    	        		        <td width="25%" align="right" bgcolor="#F6F6F6"><b>{$UMOD.LBL_SUBJECT}</b></td>
-        	            		<td width="75%" class="mnuTab">{$SUBJECT}</td>
-            	      		  </tr>
-					  <tr><td bgcolor="#F6F6F6">&nbsp;</td>
-					  <td>&nbsp;</td></tr>
-
-	                  	  <tr>
-	                    		<td  align="right" bgcolor="#F6F6F6" valign="top"><b>{$UMOD.LBL_MESSAGE}</b></td>
-	                    		<td width="75%" valign="top" class="mnuTab">{$BODY}</td>
-                      		  </tr>
-                		</table>
-			   </td>
-		         </tr>
-		</table>
-		</td>
-		<td>&nbsp;</td>
-
-</form>	</tr>
-</table>
-<!-- END -->
-
-
-</td>
-</tr>
-</table>
-
-{$JAVASCRIPT}
-{include file='SettingsSubMenu.tpl'}
-
-
+{*<!--
+/*********************************************************************************
+  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
+   * ("License"); You may not use this file except in compliance with the License
+   * The Original Code is:  vtiger CRM Open Source
+   * The Initial Developer of the Original Code is vtiger.
+   * Portions created by vtiger are Copyright (C) vtiger.
+   * All Rights Reserved.
+  *
+ ********************************************************************************/
+-->*}
+<script language="JAVASCRIPT" type="text/javascript" src="include/js/smoothscroll.js"></script>
+<br>
+<table align="center" border="0" cellpadding="0" cellspacing="0" width="98%">
+<tbody><tr>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
+        <td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
+<br>
+	<div align=center>
+	
+			{include file='SetMenu.tpl'}
+
+				<!-- DISPLAY -->
+				<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
+		    		<form method="post" action="index.php" name="etemplatedetailview">  
+				<input type="hidden" name="action" value="editemailtemplate">
+				<input type="hidden" name="module" value="Users">
+				<input type="hidden" name="templatename" value="{$TEMPLATENAME}">
+				<input type="hidden" name="templateid" value="{$TEMPLATEID}">
+				<input type="hidden" name="foldername" value="{$FOLDERNAME}">
+				<input type="hidden" name="parenttab" value="{$PARENTTAB}">
+				<tr>
+					<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}ViewTemplate.gif" width="45" height="60" border=0 ></td>
+					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Users&action=listemailtemplates&parenttab=Settings">{$UMOD.LBL_EMAIL_TEMPLATES}</a> &gt; {$MOD.LBL_VIEWING} &quot;{$TEMPLATENAME}&quot; </b></td>
+				</tr>
+				<tr>
+					<td valign=top class="small">{$UMOD.LBL_EMAIL_TEMPLATE_DESC}</td>
+				</tr>
+				</table>
+				
+				<br>
+				<table border=0 cellspacing=0 cellpadding=10 width=100% >
+				<tr>
+				<td>
+				
+					<table border=0 cellspacing=0 cellpadding=5 width=100% class="tableHeading">
+					<tr>
+						<td class="big"><strong>{$UMOD.LBL_PROPERTIES} &quot;{$TEMPLATENAME}&quot; </strong></td>
+						<td class="small" align=right>						  &nbsp;&nbsp;
+						  <input class="crmButton edit small" type="submit" name="Button" value="{$APP.LBL_EDIT_BUTTON_LABEL}" class="small" onclick="this.form.action.value='editemailtemplate'; this.form.parenttab.value='Settings'">&nbsp;&nbsp;
+						</td>
+					</tr>
+					</table>
+					
+					<table border=0 cellspacing=0 cellpadding=5 width=100% >
+					<tr>
+						<td width=20% class="small cellLabel"><strong>{$UMOD.LBL_NAME}</strong></td>
+						<td width=80% class="small cellText"><strong>{$TEMPLATENAME}</strong></td>
+					  </tr>
+					<tr>
+						<td valign=top class="small cellLabel"><strong>{$UMOD.LBL_DESCRIPTION}</strong></td>
+						<td class="cellText small" valign=top>{$DESCRIPTION}</td>
+					  </tr>
+					<tr>
+						<td valign=top class="small cellLabel"><strong>{$UMOD.LBL_FOLDER}</strong></td>
+						<td class="cellText small" valign=top>{$FOLDERNAME}</td>
+					  </tr>
+					
+					
+					<tr>
+					  <td colspan="2" valign=top class="cellText small"><table width="100%"  border="0" cellspacing="0" cellpadding="0" class="thickBorder">
+                        <tr>
+                          <td valign=top><table width="100%"  border="0" cellspacing="0" cellpadding="5" >
+                              <tr>
+                                <td colspan="2" valign="top" class="small" style="background-color:#cccccc"><strong>{$UMOD.LBL_EMAIL_TEMPLATE}</strong></td>
+                                </tr>
+                              <tr>
+                                <td width="15%" valign="top" class="cellLabel small">{$UMOD.LBL_SUBJECT}</td>
+                                <td width="85%" class="cellText small">{$SUBJECT}</td>
+                              </tr>
+                              <tr>
+                                <td valign="top" class="cellLabel small">{$UMOD.LBL_MESSAGE}</td>
+                                <td class="cellText small">{$BODY}</td>
+                              </tr>
+                          </table></td>
+                          
+                        </tr>
+                      </table></td>
+					  </tr>
+					</table>
+					<br>
+					<table border=0 cellspacing=0 cellpadding=5 width=100% >
+					<tr>
+					  <td class="small" nowrap align=right><a href="#top">{$MOD.LBL_SCROLL}</a></td>
+					</tr>
+					</table>
+				</td>
+				</tr>
+				</table>
+			
+			
+			
+			</td>
+			</tr>
+			</table>
+		</td>
+	</tr>
+	</form>
+	</table>
+		
+	</div>
+
+</td>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
+   </tr>
+</tbody>
+</table>

Modified: vtigercrm/trunk/Smarty/templates/ListEmailTemplates.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ListEmailTemplates.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ListEmailTemplates.tpl Tue Jun 20 00:59:19 2006
@@ -1,155 +1,155 @@
-{*<!--
-/*********************************************************************************
-  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
-   * ("License"); You may not use this file except in compliance with the License
-   * The Original Code is:  vtiger CRM Open Source
-   * The Initial Developer of the Original Code is vtiger.
-   * Portions created by vtiger are Copyright (C) vtiger.
-   * All Rights Reserved.
-  *
- ********************************************************************************/
--->*}
-<script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
-<script language="JavaScript" type="text/javascript" src="modules/{$MODULE}/{$SINGLE_MOD}.js"></script>
-<style type="text/css">@import url(themes/blue/style.css);</style>
-
-<script>
-function massDelete()
-{ldelim}
-        x = document.massdelete.selected_id.length;
-        idstring = "";
-
-        if ( x == undefined)
-        {ldelim}
-
-                if (document.massdelete.selected_id.checked)
-               {ldelim}
-                        document.massdelete.idlist.value=document.massdelete.selected_id.value;
-                {rdelim}
-                else
-                {ldelim}
-                        alert("Please select atleast one entity");
-                        return false;
-                {rdelim}
-        {rdelim}
-        else
-        {ldelim}
-                xx = 0;
-                for(i = 0; i < x ; i++)
-                {ldelim}
-                        if(document.massdelete.selected_id[i].checked)
-                        {ldelim}
-                                idstring = document.massdelete.selected_id[i].value +";"+idstring
-                        xx++
-                        {rdelim}
-                {rdelim}
-                if (xx != 0)
-                {ldelim}
-                        document.massdelete.idlist.value=idstring;
-                {rdelim}
-               else
-                {ldelim}
-                        alert("Please select atleast one entity");
-                        return false;
-                {rdelim}
-       {rdelim}
-		if(confirm("Are you sure you want to delete the selected "+xx+" records ?"))
-		{ldelim}
-	        document.massdelete.action="index.php?module=Users&action=deleteemailtemplate&return_module=Users&return_action=listemailtemplates";
-		{rdelim}
-		else
-		{ldelim}
-			return false;
-		{rdelim}
-
-{rdelim}
-</script>
-
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-<tr>
-	{include file='SettingsMenu.tpl'}
-<td width="75%" valign="top">
-<!-- EMAIL TEMPLATE PAGE STARTS HERE -->
-<table width="100%" border="0" cellpadding="0" cellspacing="0" height="100%">
-	<tr>
-		 <td class="showPanelBg" valign="top" width="90%"  style="padding-left:20px; "><br />
-        	        <span class="lvtHeaderText"><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a>
-			 <a href="index.php?module=Users&action=listemailtemplates&parenttab=Settings">&gt; {$UMOD.LBL_EMAIL_TEMPLATES_LIST}</a></b></span>
-            	    <hr noshade="noshade" size="1" />
-		</td>
-
-		<td width="10%" class="showPanelBg">&nbsp;</td>
-	</tr>
-	<tr>
-		<td width="90%" style="padding-left:20px;" valign="top">
-			<table width="100%" cellpadding="3" cellspacing="0" border="0" class="small" >
-			<form  name="massdelete" method="POST">
-    			<input name="idlist" type="hidden">
-    			<input name="module" type="hidden" value="Users">
-    			<input name="action" type="hidden" value="deleteemailtemplate">
-				<tr><td colspan="4" style="border:0px;">&nbsp;</td></tr>
-				<tr>
-					<td colspan="2" align="left" style="border:0px;"><input type="submit" value="{$UMOD.LBL_DELETE}" onclick="return massDelete();" class="classBtn" /></td>
-					<td style="border:0px;">&nbsp;</td>
-
-					<td align="right" style="border:0px;">
-						<div align="right"><input type="submit" value="{$UMOD.LBL_NEW_TEMPLATE}" name="profile"  class="classBtn" onclick="this.form.action.value='createemailtemplate';this.form.parenttab.value='Settings';"/></div>
-					</td>
-				</tr>
-				<tr>{*<td colspan="4" style="border:0px;">&nbsp;</td>*}</tr>
-				<tr><td colspan="4">
-					<table style="background-color: rgb(204, 204, 204);" class="small" border="0" cellpadding="5" cellspacing="1" width="100%">
-						<tr>
-				  <th width="5%" class="lvtCol" ><input type="checkbox" name="selectall" onClick=toggleSelect(this.checked,"selected_id") ></th>
-				  <th width="20%" class="lvtCol"><b>{$UMOD.LBL_TEMPLATE_HEADER}</b></th>
-
-				  <th width="50%" class="lvtCol"><b>{$UMOD.LBL_DESCRIPTION}</b></th>
-				  <th width="25%" class="lvtCol"><b>{$UMOD.LBL_TEMPLATE_TOOLS}</b></th>
-			  </tr>
-				{foreach item=template from=$TEMPLATES}
-				<tr class="lvtColData" onmouseover="this.className='lvtColDataHover'" onmouseout="this.className='lvtColData'" bgcolor="white">
-				<td><input type="checkbox" name="selected_id" value="{$template.templateid}" onClick=toggleSelectAll(this.name,"selectall") /></td>
-				<td nowrap>
-				{if $template.foldername == "Public"}
-					<img src="{$IMAGE_PATH}public.gif" align="absmiddle" />
-				{else}
-					<img src="{$IMAGE_PATH}private.gif" align="absmiddle" />
-				{/if}				
-				&nbsp;<a href="index.php?module=Users&action=detailviewemailtemplate&parenttab=Settings&templateid={$template.templateid}" >{$template.templatename}</a></td>
-				<td>{$template.description}</td>
-				<td><a href="index.php?module=Users&action=detailviewemailtemplate&parenttab=Settings&templateid={$template.templateid}">{$UMOD.LNK_SAMPLE_EMAIL}</a></td>
-			  	</tr>
-				
-				{/foreach}
-				<tr>
-					</table>
-				</td></tr>
-				<tr>
-				  <td colspan="3" style="border:0px">
-
-				  	<img src="{$IMAGE_PATH}private.gif" align="absmiddle" />&nbsp;{$UMOD.LBL_TEMPLATE_PRIVATE}
-					&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-					<img src="{$IMAGE_PATH}public.gif" align="absmiddle"/>&nbsp;{$UMOD.LBL_TEMPLATE_PUBLIC}
-					
-				  </td>
-				  <td style="border:0px">
-				  	<div align="right"><a href="#">{$UMOD.LNK_GO_TO_TOP}</a></div>
-				  </td>
-			  	</tr>
-			</form>	
-			</table>
-			
-		</td>
-		<td>&nbsp;</td>
-	</tr>
-</table>
-<!-- END -->
-
-</td>
-</tr>
-</table>
-
-{$JAVASCRIPT}
-{include file='SettingsSubMenu.tpl'}
-
-
+{*<!--
+/*********************************************************************************
+  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
+   * ("License"); You may not use this file except in compliance with the License
+   * The Original Code is:  vtiger CRM Open Source
+   * The Initial Developer of the Original Code is vtiger.
+   * Portions created by vtiger are Copyright (C) vtiger.
+   * All Rights Reserved.
+  *
+ ********************************************************************************/
+-->*}
+<script language="JAVASCRIPT" type="text/javascript" src="include/js/smoothscroll.js"></script>
+<script>
+function massDelete()
+{ldelim}
+        x = document.massdelete.selected_id.length;
+        idstring = "";
+
+        if ( x == undefined)
+        {ldelim}
+
+                if (document.massdelete.selected_id.checked)
+               {ldelim}
+                        document.massdelete.idlist.value=document.massdelete.selected_id.value+';';
+			xx=1;
+                {rdelim}
+                else
+                {ldelim}
+                        alert("Please select atleast one entity");
+                        return false;
+                {rdelim}
+        {rdelim}
+        else
+        {ldelim}
+                xx = 0;
+                for(i = 0; i < x ; i++)
+                {ldelim}
+                        if(document.massdelete.selected_id[i].checked)
+                        {ldelim}
+                                idstring = document.massdelete.selected_id[i].value +";"+idstring
+                        xx++
+                        {rdelim}
+                {rdelim}
+                if (xx != 0)
+                {ldelim}
+                        document.massdelete.idlist.value=idstring;
+                {rdelim}
+               else
+                {ldelim}
+                        alert("Please select atleast one entity");
+                        return false;
+                {rdelim}
+       {rdelim}
+		if(confirm("Are you sure you want to delete the selected "+xx+" records ?"))
+		{ldelim}
+	        document.massdelete.action="index.php?module=Users&action=deleteemailtemplate&return_module=Users&return_action=listemailtemplates";
+		{rdelim}
+		else
+		{ldelim}
+			return false;
+		{rdelim}
+
+{rdelim}
+</script>
+<br>
+<table align="center" border="0" cellpadding="0" cellspacing="0" width="98%">
+<tbody><tr>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
+        <td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
+<br>
+	<div align=center>
+	
+			{include file='SetMenu.tpl'}
+
+				<!-- DISPLAY -->
+				<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
+				<form  name="massdelete" method="POST">
+	    			<input name="idlist" type="hidden">
+    				<input name="module" type="hidden" value="Users">
+    				<input name="action" type="hidden" value="deleteemailtemplate">
+				<tr>
+					<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}ViewTemplate.gif" width="45" height="60" border=0></td>
+					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > {$UMOD.LBL_EMAIL_TEMPLATES} </b></td>
+				</tr>
+				<tr>
+					<td valign=top class="small">{$UMOD.LBL_EMAIL_TEMPLATE_DESC}</td>
+				</tr>
+				</table>
+				
+				<br>
+				<table border=0 cellspacing=0 cellpadding=10 width=100% >
+				<tr>
+				<td>
+				
+					<table border=0 cellspacing=0 cellpadding=5 width=100% class="tableHeading">
+					<tr>
+						<td class="big"><strong>{$UMOD.LBL_EMAIL_TEMPLATES}</strong></td>
+						<td class="small" align=right>&nbsp;
+						</td>
+					</tr>
+					</table>
+					
+					<table border=0 cellspacing=0 cellpadding=5 width=100% class="listTableTopButtons">
+					<tr>
+						<td class=small><input type="submit" value="{$UMOD.LBL_DELETE}" onclick="return massDelete();" class="crmButton delete small"></td>
+						<td class=small align=right><input class="crmButton create small" type="submit" value="{$UMOD.LBL_NEW_TEMPLATE}" name="profile"  class="classBtn" onclick="this.form.action.value='createemailtemplate';this.form.parenttab.value='Settings';"></td>
+					</tr>
+					</table>
+					<table border="0" cellspacing="0" cellpadding="5" width="100%" class="listTable">
+					<tr>
+						<td width="2%" class="colHeader small">#</td>
+						<td width="3%" class="colHeader small">{$UMOD.LBL_LIST_SELECT}</td>
+						<td width="25%" class="colHeader small">{$UMOD.LBL_EMAIL_TEMPLATE}</td>
+						<td width="50%" class="colHeader small">{$UMOD.LBL_DESCRIPTION}</td>
+					        <td width="20%" class="colHeader small">{$UMOD.LBL_TEMPLATE_TOOLS}</td>
+					</tr>
+					{foreach name=emailtemplate item=template from=$TEMPLATES}
+					<tr>
+						<td class="listTableRow small" valign=top>{$smarty.foreach.emailtemplate.iteration}</td>
+						<td class="listTableRow small" valign=top><input type="checkbox" name="selected_id" value="{$template.templateid}" onClick=toggleSelectAll(this.name,"selectall") class=small></td>
+						<td class="listTableRow small" valign=top>
+							<a href="index.php?module=Users&action=detailviewemailtemplate&parenttab=Settings&templateid={$template.templateid}" ><b>{$template.templatename}</b></a>
+						</td>
+						<td class="listTableRow small" valign=top>{$template.description}</td>
+					        <td class="listTableRow small" valign=top>
+							<a href="index.php?module=Users&action=detailviewemailtemplate&parenttab=Settings&templateid={$template.templateid}">{$UMOD.LNK_SAMPLE_EMAIL}</a>
+						</td>
+					</tr>
+					{/foreach}	
+					</table>
+					<table border=0 cellspacing=0 cellpadding=5 width=100% >
+					<tr>
+					  <td class="small" nowrap align=right><a href="#top">{$MOD.LBL_SCROLL}</a></td>
+					</tr>
+					</table>
+				</td>
+				</tr>
+				</table>
+			
+			
+			
+			</td>
+			</tr>
+			</table>
+		</td>
+	</tr>
+	</form>
+	</table>
+		
+	</div>
+</td>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
+   </tr>
+</tbody>
+</table>



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 20 00:00:19 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 20 Jun 2006 07:00:19 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7288 - in
 /vtigercrm/trunk/Smarty/templates: CreateWordTemplate.tpl
 ListWordTemplates.tpl
Message-ID: <20060620070019.6E8112B0167@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 20 01:00:14 2006
New Revision: 7288

Log:
updated tpl file for mail merge templates - ahmed

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

Modified: vtigercrm/trunk/Smarty/templates/CreateWordTemplate.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/CreateWordTemplate.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/CreateWordTemplate.tpl Tue Jun 20 01:00:14 2006
@@ -1,118 +1,100 @@
-{*<!--
-/*********************************************************************************
-  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
-   * ("License"); You may not use this file except in compliance with the License
-   * The Original Code is:  vtiger CRM Open Source
-   * The Initial Developer of the Original Code is vtiger.
-   * Portions created by vtiger are Copyright (C) vtiger.
-   * All Rights Reserved.
-  *
- ********************************************************************************/
--->*}
-<script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
-<style type="text/css">@import url(themes/blue/style.css);</style>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-<tr>
-	{include file='SettingsMenu.tpl'}
-<td width="75%" valign="top">
-
-<!--  CREATE WORD TEMPLATES PAGE STARTS HERE -->
-<table width="100%" border="0" cellpadding="0" cellspacing="0" height="100%">
-<form action="index.php?module=Users&action=add2db" method="post" enctype="multipart/form-data">
-<input type="hidden" name="return_module" value="Settings">
-<input type="hidden" name="MAX_FILE_SIZE" value="100000">
-<input type="hidden" name="action">
-<tr>
-<td class="showPanelBg" valign="top" width="95%"  style="padding-left:20px; "><br />
-<span class="lvtHeaderText"><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS} </a> <a href="index.php?module=Users&action=listwordtemplates&parenttab=Settings">{$UMOD.LBL_MAILMERGE_TEMPLATES_ATTACHMENT}</a></b></span>
-<hr noshade="noshade" size="1" />
-</td>
-	<td width="5%" class="showPanelBg">&nbsp;</td>
-</tr>
-<tr>
-<td width="98%" style="padding-left:20px;" valign="top">
-<!-- module Select Table -->
-<table width="95%"  border="0" cellspacing="0" cellpadding="0" align="center">
-<tr>
-	<td width="7" height="6" style="font-size:1px;font-family:Arial, Helvetica, sans-serif;"><img src="{$IMAGE_PATH}top_left.jpg" align="top"  /></td>
-	<td bgcolor="#EBEBEB" style="font-size:1px;font-family:Arial, Helvetica, sans-serif;height:6px;"></td>
-	<td width="8" height="6" style="font-size:1px;font-family:Arial, Helvetica, sans-serif;"><img src="{$IMAGE_PATH}top_right.jpg" width="8" height="6" align="top" /></td>
-</tr>
-<tr>
-	<td bgcolor="#EBEBEB" width="7"></td>
-	<td bgcolor="#ECECEC" style="padding-left:10px;padding-top:10px;vertical-align:top;">
-		<table width="100%"  border="0" cellspacing="0" cellpadding="10" class="small">
-                <tr>
-                     <td rowspan="11" bgcolor="#ffffff" width="30%" valign="bottom" background="{$IMAGE_PATH}MailMerge_top.gif" style="background-position:top right;background-repeat:no-repeat;">
-		<table width="100%" border="0" cellpadding="0" cellspacing="0">
-				<tr>
-						<td background="{$IMAGE_PATH}MailMerge_btm.gif" style="background-position:bottom right;background-repeat:no-repeat; " height="150">&nbsp;</td>
-				</tr>
-		</table>
-	</td>
-                      <td colspan="2" class="genHeaderSmall" width="70%"><img src="{$IMAGE_PATH}fp1.gif" width="59" height="40" align="absmiddle" />{$UMOD.LBL_TEMPLATE_DETAILS} </td>
-               </tr>
-		<tr>
-                      <td align="right" valign="top"><b>{$UMOD.LBL_DESCRIPTION}  : </b></td>
-                      <td><textarea name="txtDescription" tabindex="1" class="txtBox" rows="3" value={$textDesc} /></textarea></td>
-                </tr>
-                <tr><td colspan="2"  width="75%" style="padding-bottom:0px;" ><hr /> </td></tr>
-
-		<tr>
-			<td  width="75%" colspan="2"  >
-				<img src="{$IMAGE_PATH}fp2.gif" width="59" height="40"  align="left"/>
-				<span class="genHeaderSmall">{$UMOD.LBL_SELECT_MODULE}</span><br />
-				 {$UMOD.LBL_MERGE_MSG}
-			</td>
-		</tr>
-		<tr>
-                      <td align="right"><b>{$UMOD.LBL_MODULENAMES} : </b></td>
-
-                      <td><select name="target_module" class="txtBox" tabindex="2">
-			<option value="Leads">{$APP.COMBO_LEADS}</option>	
-			<option value="Accounts">{$APP.COMBO_ACCOUNTS}</option>	
-			<option value="Contacts">{$APP.COMBO_CONTACTS}</option>	
-			<option value="HelpDesk">{$APP.COMBO_HELPDESK}</option>	
-                      </select></td>
-                </tr>
-		 <tr><td colspan="2"  width="75%" style="padding-bottom:0px;" ><hr /> </td></tr>
-		<tr>
-		      <td  width="75%" colspan="2" style="padding-bottom:0px;padding-top:0px; "  >
-			<img src="{$IMAGE_PATH}fp3.gif" width="59" height="40"  align="absmiddle"/>
-				<span class="genHeaderSmall">{$UMOD.LBL_UPLOAD} </span>
-		      </td>
-		</tr>
-		 <tr>
-                      <td align="right" valign="top"><font color="red">{$APP.LBL_REQUIRED_SYMBOL}</font><b>{$UMOD.LBL_MERGE_FILE}</b></td>
-                      <td><input type="file" name="binFile" size="40" tabindex="3" /><br />(Upload only <b>'.doc'</b> files)</td>
-		 </tr>
-		 <tr>
-		      <td colspan="2"  width="75%" style="border-top:1px dashed #CCCCCC;border-bottom:1px dashed #CCCCCC;"  align="center">
-			<input title="{$APP.LBL_SAVE_BUTTON_LABEL}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" type="submit" tabindex="4" name="button" value="{$APP.LBL_SAVE_BUTTON_LABEL}" onclick="this.form.action.value='add2db';" class="classBtn" />&nbsp;
-			&nbsp;<input title="{$APP.LBL_CANCEL_BUTTON_LABEL}" accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" tabindex="5"  onclick="window.history.back()" type="button" name="button" value="{$APP.LBL_CANCEL_BUTTON_LABEL}" class="classBtn" />
- 		      </td>
-		 </tr>
-		 <tr>
-		       <td colspan="2" style="padding-bottom:0px;" >&nbsp;</td>
-		 </tr>
-                 </table>
-		   </td>
-			<td bgcolor="#EBEBEB" width="8"></td>
-		  </tr>
-		  <tr>
-				<td width="7" height="8" style="font-size:1px;font-family:Arial, Helvetica, sans-serif;"><img src="{$IMAGE_PATH}bottom_left.jpg" align="bottom"  /></td>
-				<td bgcolor="#ECECEC" height="8" style="font-size:1px;" ></td>
-				<td width="8" height="8" style="font-size:1px;font-family:Arial, Helvetica, sans-serif;"><img src="{$IMAGE_PATH}bottom_right.jpg" align="bottom" /></td>
-		  </tr>
-		  </table><br />
-		</td>
-
-		<td>&nbsp;</td>
-	</tr>
-</form>
-</table>
-</td>
-</tr>
-</table>
-	{include file='SettingsSubMenu.tpl'}
-<!-- END -->
+{*<!--
+/*********************************************************************************
+  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
+   * ("License"); You may not use this file except in compliance with the License
+   * The Original Code is:  vtiger CRM Open Source
+   * The Initial Developer of the Original Code is vtiger.
+   * Portions created by vtiger are Copyright (C) vtiger.
+   * All Rights Reserved.
+  *
+ ********************************************************************************/
+-->*}
+<script language="JAVASCRIPT" type="text/javascript" src="include/js/smoothscroll.js"></script>
+<br>
+<table align="center" border="0" cellpadding="0" cellspacing="0" width="98%">
+<tbody><tr>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
+        <td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
+<br>
+	<div align=center>
+	
+			{include file='SetMenu.tpl'}
+
+				<!-- DISPLAY -->
+				<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
+				<form action="index.php?module=Users&action=add2db" method="post" enctype="multipart/form-data">
+				<input type="hidden" name="return_module" value="Settings">
+				<input type="hidden" name="parenttab" value="{$PARENTTAB}">
+				<input type="hidden" name="MAX_FILE_SIZE" value="100000">
+				<input type="hidden" name="action">
+				<tr>
+					<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}mailmarge.gif" alt="Users" width="48" height="48" border=0 title="Users"></td>
+					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Users&action=listwordtemplates&parenttab=Settings">{$UMOD.LBL_WORD_TEMPLATES}</a> > {$UMOD.LBL_NEW_TEMPLATE} </b></td>
+				</tr>
+				<tr>
+					<td valign=top class="small">{$MOD.LBL_MAIL_MERGE_DESC}</td>
+				</tr>
+				</table>
+				
+				<br>
+				<table border=0 cellspacing=0 cellpadding=10 width=100% >
+				<tr>
+				<td>
+				
+					<table border=0 cellspacing=0 cellpadding=5 width=100% class="tableHeading">
+					<tr>
+						<td class="big"><strong>{$UMOD.LBL_NEW_TEMPLATE}</strong></td>
+						<td class="small" align=right>
+							<input title="{$APP.LBL_SAVE_BUTTON_LABEL}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" type="submit" tabindex="4" name="button" value="{$APP.LBL_SAVE_BUTTON_LABEL}" onclick="this.form.action.value='add2db'; this.form.parenttab.value='Settings'" class="crmButton small save" />&nbsp;
+							&nbsp;<input title="{$APP.LBL_CANCEL_BUTTON_LABEL}" accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" tabindex="5"  onclick="window.history.back()" type="button" name="button" value="{$APP.LBL_CANCEL_BUTTON_LABEL}" class="crmButton small cancel" />
+						</td>
+					</tr>
+					</table>
+					
+					<table border=0 cellspacing=0 cellpadding=5 width=100% >
+					<tr valign="top">
+					  <td nowrap class="cellLabel small"><font color="red">*</font><strong>{$UMOD.LBL_NEW} {$UMOD.LBL_TEMPLATE_FILE}</strong></td>
+					  <td class="cellText small"><strong>
+					    <input type="file" name="binFile" class="small">
+					  </strong></td>
+					  </tr>
+					<tr>
+						<td valign=top class="small cellLabel"><strong>{$UMOD.LBL_DESCRIPTION}</strong></td>
+						<td class="cellText small" valign=top><textarea name="txtDescription" class=small style="width:90%;height:50px" value={$textDesc}></textarea></td>
+					  </tr>
+					<tr>
+						<td valign=top class="small cellLabel"><strong>{$UMOD.LBL_MODULENAMES}</strong></td>
+						<td class="cellText small" valign=top>
+						<select name="target_module" size=1 class="small" tabindex="3">
+							<option value="Leads">{$APP.COMBO_LEADS}</option>	
+							<option value="Accounts">{$APP.COMBO_ACCOUNTS}</option>	
+							<option value="Contacts">{$APP.COMBO_CONTACTS}</option>	
+							<option value="HelpDesk">{$APP.COMBO_HELPDESK}</option>	
+			                      </select>
+						</td>
+					  </tr>
+					</table>
+					<table border=0 cellspacing=0 cellpadding=5 width=100% >
+					<tr>
+					  <td class="small" nowrap align=right><a href="#top">[Scroll to Top]</a></td>
+					</tr>
+					</table>
+				</td>
+				</tr>
+				</table>
+			
+			
+			
+			</td>
+			</tr>
+			</table>
+		</td>
+	</tr>
+	</form>
+	</table>
+</div>		
+	</td>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
+   </tr>
+</tbody>
+</table>

Modified: vtigercrm/trunk/Smarty/templates/ListWordTemplates.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ListWordTemplates.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ListWordTemplates.tpl Tue Jun 20 01:00:14 2006
@@ -1,139 +1,155 @@
-{*<!--
-/*********************************************************************************
-  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
-   * ("License"); You may not use this file except in compliance with the License
-   * The Original Code is:  vtiger CRM Open Source
-   * The Initial Developer of the Original Code is vtiger.
-   * Portions created by vtiger are Copyright (C) vtiger.
-   * All Rights Reserved.
-  *
- ********************************************************************************/
--->*}
-<script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
-<script language="JavaScript" type="text/javascript" src="modules/{$MODULE}/{$SINGLE_MOD}.js"></script>
-<style type="text/css">@import url(../themes/blue/style.css);</style>
-
-<script>
-function massDelete()
-{ldelim}
-        x = document.massdelete.selected_id.length;
-        idstring = "";
-
-        if ( x == undefined)
-        {ldelim}
-
-                if (document.massdelete.selected_id.checked)
-               {ldelim}
-                        document.massdelete.idlist.value=document.massdelete.selected_id.value;
-                {rdelim}
-                else
-                {ldelim}
-                        alert("Please select atleast one entity");
-                        return false;
-                {rdelim}
-        {rdelim}
-        else
-        {ldelim}
-                xx = 0;
-                for(i = 0; i < x ; i++)
-                {ldelim}
-                        if(document.massdelete.selected_id[i].checked)
-                        {ldelim}
-                                idstring = document.massdelete.selected_id[i].value +";"+idstring
-                        xx++
-                        {rdelim}
-                {rdelim}
-                if (xx != 0)
-                {ldelim}
-                        document.massdelete.idlist.value=idstring;
-                {rdelim}
-               else
-                {ldelim}
-                        alert("Please select atleast one entity");
-                        return false;
-                {rdelim}
-       {rdelim}
-		if(confirm("Are you sure you want to delete the selected "+xx+" records ?"))
-		{ldelim}
-	        document.massdelete.action="index.php?module=Users&action=deletewordtemplate&return_module=Users&return_action=listwordtemplates";
-		{rdelim}
-		else
-		{ldelim}
-			return false;
-		{rdelim}
-
-{rdelim}
-</script>
-
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-<tr>
-	{include file='SettingsMenu.tpl'}
-<td width="75%" valign="top">
-<!-- MAIL MERGE TEMPLATE PAGE STARTS HERE -->
-<table width="100%" border="0" cellpadding="0" cellspacing="0" height="100%">
-	<tr>
-		 <td class="showPanelBg" valign="top" width="90%"  style="padding-left:20px; "><br />
-        	        <span class="lvtHeaderText"><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a><a href="index.php?module=Users&action=listwordtemplates&parenttab=Settings">{$UMOD.LBL_MAILMERGE_TEMPLATES_LIST}</a></b> </span>
-
-            	    <hr noshade="noshade" size="1" />
-		</td>
-
-		<td width="10%" class="showPanelBg">&nbsp;</td>
-	</tr>
-	<tr>
-		<td width="90%" style="padding-left:20px;" valign="top">
-			  <form  name="massdelete" method="POST">
-    			<input name="idlist" type="hidden">
-    			<input name="module" type="hidden" value="Users">
-    			<input name="action" type="hidden" value="deletewordtemplate">
-			<table width="100%" cellpadding="3" cellspacing="0" class="small" >
-			   
-				<tr><td colspan="6" style="border:0px;">&nbsp;</td></tr>
-				<tr>
-					<td colspan="2" align="left" style="border:0px;"><input type="submit" value="{$UMOD.LBL_DELETE}" onclick="return massDelete();" class="classBtn" /></td>
-					<td style="border:0px;">&nbsp;</td>
-
-					<td align="right" colspan="3" style="border:0px;">
-						<div align="right" ><input type="submit" value="{$UMOD.LBL_NEW_TEMPLATE}" name="profile"  class="classBtn" onclick="this.form.action.value='upload';"/></div>
-					</td>
-				</tr>
-				<tr>{*<td colspan="6" style="border:0px;">&nbsp;</td>*}</tr>
-				<tr>
-				<td colspan="6">
-					<table style="background-color: rgb(204, 204, 204);" class="small" border="0" cellpadding="5" cellspacing="1" width="100%">
-						<tr>
-						  <th width="5%" class="lvtCol" ><input type="checkbox" name="selectall" onClick=toggleSelect(this.checked,"selected_id") ></th>
-						  <th width="20%" nowrap class="lvtCol"><b>{$UMOD.LBL_FILE}</b></th>
-						  <th width="50%" nowrap class="lvtCol"><b>{$UMOD.LBL_DESCRIPTION}</b></th>
-						  <th width="25%"  nowrap class="lvtCol"><b>{$UMOD.LBL_MODULENAMES}</b></th>
-						  <th width="25%"  nowrap class="lvtCol"><b>{$UMOD.LBL_DOWNLOAD}</b></th>
-						  <th width="25%"  nowrap class="lvtCol"><b>{$UMOD.LBL_FILE_TYPE}</b></th>
-					  </tr>
-						{foreach item=template from=$WORDTEMPLATES}
-						<tr class="lvtColData" onmouseover="this.className='lvtColDataHover'" onmouseout="this.className='lvtColData'" bgcolor="white">
-							<td><input type="checkbox" name="selected_id" value="{$template.templateid}" onClick=toggleSelectAll(this.name,"selectall") /></td>
-							<td nowrap>{$template.filename}</td>
-							<td nowrap>{$template.description}</td>
-							<td nowrap>{$template.module}</td>
-							<td nowrap><a href="index.php?module=Users&action=downloadfile&record={$template.templateid}">{$UMOD.LBL_DOWNLOAD_NOW}</a></td>
-							<td nowrap>{$template.filetype}</td>	
-				  	</tr>
-					{/foreach}
-				</table>
-			</td>
-		</tr>	
-	</table>
-			</form>
-		</td>
-		<td>&nbsp;</td>
-	</tr>
-</table>
-<!-- END -->
-
-</td>
-</tr>
-</table>
-
-{$JAVASCRIPT}
-{include file='SettingsSubMenu.tpl'}
-
+{*<!--
+/*********************************************************************************
+  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
+   * ("License"); You may not use this file except in compliance with the License
+   * The Original Code is:  vtiger CRM Open Source
+   * The Initial Developer of the Original Code is vtiger.
+   * Portions created by vtiger are Copyright (C) vtiger.
+   * All Rights Reserved.
+  *
+ ********************************************************************************/
+-->*}
+<script language="JAVASCRIPT" type="text/javascript" src="include/js/smoothscroll.js"></script>
+<script>
+function massDelete()
+{ldelim}
+        x = document.massdelete.selected_id.length;
+        idstring = "";
+
+        if ( x == undefined)
+        {ldelim}
+
+                if (document.massdelete.selected_id.checked)
+               {ldelim}
+                        document.massdelete.idlist.value=document.massdelete.selected_id.value+';';
+			xx=1;
+                {rdelim}
+                else
+                {ldelim}
+                        alert("Please select atleast one entity");
+                        return false;
+                {rdelim}
+        {rdelim}
+        else
+        {ldelim}
+                xx = 0;
+                for(i = 0; i < x ; i++)
+                {ldelim}
+                        if(document.massdelete.selected_id[i].checked)
+                        {ldelim}
+                                idstring = document.massdelete.selected_id[i].value +";"+idstring
+                        xx++
+                        {rdelim}
+                {rdelim}
+                if (xx != 0)
+                {ldelim}
+                        document.massdelete.idlist.value=idstring;
+                {rdelim}
+               else
+                {ldelim}
+                        alert("Please select atleast one entity");
+                        return false;
+                {rdelim}
+       {rdelim}
+		if(confirm("Are you sure you want to delete the selected "+xx+" records ?"))
+		{ldelim}
+	        document.massdelete.action="index.php?module=Users&action=deletewordtemplate&return_module=Users&return_action=listwordtemplates";
+		{rdelim}
+		else
+		{ldelim}
+			return false;
+		{rdelim}
+
+{rdelim}
+</script>
+<br>
+<table align="center" border="0" cellpadding="0" cellspacing="0" width="98%">
+<tbody><tr>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
+        <td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
+<br>
+	<div align=center>
+	
+			{include file='SetMenu.tpl'}
+
+				<!-- DISPLAY -->
+				<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
+	               		<form  name="massdelete" method="POST">
+	    			<input name="idlist" type="hidden">
+    				<input name="module" type="hidden" value="Users">
+    				<input name="parenttab" type="hidden" value="Settings">
+    				<input name="action" type="hidden" value="deletewordtemplate">
+				<tr>
+					<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}mailmarge.gif" alt="Users" width="48" height="48" border=0 title="Users"></td>
+					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > {$UMOD.LBL_WORD_TEMPLATES} </b></td>
+				</tr>
+				<tr>
+					<td valign=top class="small">{$MOD.LBL_MAIL_MERGE_DESC}</td>
+				</tr>
+				</table>
+				
+				<br>
+				<table border=0 cellspacing=0 cellpadding=10 width=100% >
+				<tr>
+				<td>
+				
+					<table border=0 cellspacing=0 cellpadding=5 width=100% class="tableHeading">
+					<tr>
+						<td class="big"><strong>{$UMOD.LBL_WORD_TEMPLATES}</strong></td>
+						<td class="small" align=right>&nbsp;
+						</td>
+					</tr>
+					</table>
+					
+					<table border=0 cellspacing=0 cellpadding=5 width=100% class="listTableTopButtons">
+					<tr>
+						<td class=small><input type="submit" value="{$UMOD.LBL_DELETE}" onclick="return massDelete();" class="crmButton delete small"></td>
+						<td class=small align=right><input class="crmButton create small" type="submit" value="{$UMOD.LBL_ADD_TEMPLATE}" name="profile"  onclick="this.form.action.value='upload'; this.form.parenttab.value='Settings'">&nbsp;&nbsp;</td>
+					</tr>
+					</table>
+						
+					<table border=0 cellspacing=0 cellpadding=5 width=100% class="listTable">
+					<tr>
+						<td width=2% class="colHeader small">#</td>
+						<td width=3% class="colHeader small">{$UMOD.LBL_LIST_SELECT}</td>
+						<td width=20% class="colHeader small">{$UMOD.LBL_TEMPLATE_FILE}</td>
+						<td width=50% class="colHeader small">{$UMOD.LBL_DESCRIPTION}</td>
+				        <td width=15% class="colHeader small">{$UMOD.LBL_MODULENAMES}</td>
+				        <td width=15% class="colHeader small">{$UMOD.LBL_LIST_TOOLS}</td>
+			          </tr>
+					{foreach item=template name=mailmerge from=$WORDTEMPLATES}
+					<tr>
+						<td class="listTableRow small" valign=top>{$smarty.foreach.mailmerge.iteration}</td>
+						<td class="listTableRow small" valign=top><input type="checkbox" class=small name="selected_id" value="{$template.templateid}" onClick=toggleSelectAll(this.name,"selectall")></td>
+						<td class="listTableRow small" valign=top><b>{$template.filename}</b></a></td>
+						<td class="listTableRow small" valign=top>{$template.description}</td>
+				        <td class="listTableRow small" valign=top>{$template.module}</td>
+				        <td class="listTableRow small" valign=top><a href="index.php?module=Users&action=downloadfile&record={$template.templateid}">{$UMOD.LBL_DOWNLOAD}</a></td>
+			          </tr>
+					{/foreach}
+					</table>
+					<table border=0 cellspacing=0 cellpadding=5 width=100% >
+					<tr>
+					  <td class="small" nowrap align=right><a href="#top">{$MOD.LBL_SCROLL}</a></td>
+					</tr>
+					</table>
+				</td>
+				</tr>
+				</table>
+			
+			
+			
+			</td>
+			</tr>
+			</table>
+		</td>
+	</tr>
+	</form>
+	</table>
+		
+	</div>
+</td>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
+   </tr>
+</tbody>
+</table>



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 20 00:02:30 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 20 Jun 2006 07:02:30 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7289 - in
 /vtigercrm/trunk/Smarty/templates: OrgSharingDetailView.tpl
 OrgSharingEditView.tpl
Message-ID: <20060620070231.2A8245E4DC7@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 20 01:02:26 2006
New Revision: 7289

Log:
Updated the org sharing file - ahmed

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

Modified: vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl Tue Jun 20 01:02:26 2006
@@ -1,271 +1,232 @@
-{*<!--
-/*********************************************************************************
-  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
-   * ("License"); You may not use this file except in compliance with the License
-   * The Original Code is:  vtiger CRM Open Source
-   * The Initial Developer of the Original Code is vtiger.
-   * Portions created by vtiger are Copyright (C) vtiger.
-   * All Rights Reserved.
-  *
- ********************************************************************************/
--->*}
-<script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
-<style type="text/css">@import url(themes/blue/style.css);</style>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-<tr>
-	{include file='SettingsMenu.tpl'}
-<td width="75%" valign="top">
-
-<table width="100%" border="0" cellpadding="0" cellspacing="0" height="100%">
-<tr>
-<td class="showPanelBg" valign="top" width="100%" colspan="3" style="padding-left:20px; "><br/>
-<span class="lvtHeaderText"><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS} </a> > {$MOD.LBL_USER_MANAGEMENT} > {$CMOD.LBL_ORG_SHARING_PRIVILEGES}</b></span>
-<hr noshade="noshade" size="1" />
-</td>
-</tr>
-<tr>
-<td width="75%" style="padding-left:20px;" valign="top">
-	
-			<!-- module Select Table -->
-			<table border="0" cellpadding="0" cellspacing="0" width="100%">
-			  <tbody><tr>
-				<td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif;" height="6" width="7"><img src="{$IMAGE_PATH}top_left.jpg" align="top"></td>
-				<td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif; height: 6px;" bgcolor="#ebebeb"></td>
-				<td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif;" height="6" width="8"><img src="{$IMAGE_PATH}top_right.jpg" align="top" height="6" width="8"></td>
-			  </tr>
-
-			  <tr>
-				<td bgcolor="#ebebeb" width="7"></td>
-				<td style="padding-left: 10px; height: 20px; vertical-align: middle;" bgcolor="#ececec">
-						{$CMOD.LBL_VIEW} :&nbsp;<a href="javascript:show('customdiv');show('globaldiv');">{$CMOD.LBL_BOTH}</a>&nbsp;|&nbsp;<a href="javascript:hide('customdiv');show('globaldiv');" >{$CMOD.LBL_GLOBAL_ACCESS_PRIVILEGES}</a>&nbsp;|&nbsp;
-						<a href="javascript:show('customdiv');hide('globaldiv');">{$CMOD.LBL_CUSTOM_ACCESS_PRIVILEGES}</a>
-				</td>
-
-				<td bgcolor="#ebebeb" width="8"></td>
-			  </tr>
-			  <tr>
-				<td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif;" height="8" width="7"><img src="{$IMAGE_PATH}bottom_left.jpg" align="bottom"></td>
-				<td style="font-size: 1px;" bgcolor="#ececec" height="8"></td>
-				<td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif;" height="8" width="8"><img src="{$IMAGE_PATH}bottom_right.jpg" align="bottom"></td>
-			  </tr>
-		  </tbody></table><br>
-		  <!-- end of module select -->
-
-		  <!-- GLOBAL ACCESS MODULE -->
-		  	<div id="globaldiv">
-		  	  <table border="0" cellpadding="0" cellspacing="0" width="100%">
-			  <tbody><tr>
-				<td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif;" height="6" width="7"><img src="{$IMAGE_PATH}top_left.jpg" align="top"></td>
-				<td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif; height: 6px;" bgcolor="#ebebeb"></td>
-				<td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif;" height="6" width="8"><img src="{$IMAGE_PATH}top_right.jpg" align="top" height="6" width="8"></td>
-			  </tr>
-			  <tr>
-				<td bgcolor="#ebebeb" width="7"></td>
-
-				<td bgcolor="#ebebeb">	
-						<table border="0" cellpadding="3" cellspacing="0" width="100%">
-							<tbody>
-							<form action="index.php" method="post" name="new" id="form">
-							<input type="hidden" name="module" value="Users">
-							<input type="hidden" name="action" value="OrgSharingEditView">
-							<input type="hidden" name="parenttab" value="Settings">
-							<tr>
-								<td class="genHeaderSmall" height="25" valign="middle">{$CMOD.LBL_GLOBAL_ACCESS_PRIVILEGES}</td>
-								<td align="right"><input class=small title="{$CMOD.LBL_RECALCULATE_BUTTON}"  type="submit" name="recalculate" value="{$CMOD.LBL_RECALCULATE_BUTTON}" onclick="this.form.action.value='RecalculateSharingRules'; return confirm('Recalculate Sharing Rules will calculate the sharing rules for the whole organization. This Operation will take some time. Do you want to contunue? ')">	
-	&nbsp;<input class=small type="submit" name="Edit" value={$CMOD.LBL_EDIT_PERMISSIONS}></td>
-								
-							</tr>
-							<tr><td colspan="2"></td></tr>
-							 <tr>
-						  		<td colspan="2" style="padding: 0px 0px 0px 1px;" bgcolor="#ffffff">
-
-									<table class="globTab" cellpadding="0" cellspacing="0">
-									<tbody>
-									{foreach item=module from=$DEFAULT_SHARING}	
-										<tr class="prvPrfHoverOff" onmouseover="this.className='prvPrfHoverOn'" onmouseout="this.className='prvPrfHoverOff'">
-									    <th width="20%">{$APP[$module.0]}</th>
-									    <td width="30%">
-										{if $module.1 neq 'Private' && $module.1 neq 'Hide Details'}
-											<img src="{$IMAGE_PATH}public.gif" align="absmiddle">
-										{else}
-											<img src="{$IMAGE_PATH}private.gif" align="absmiddle">
-										{/if}
-										{$CMOD[$module.1]}</td>
-									    <td width="50%">{$module.2}</td>
-								      	</tr>
-								 	{/foreach} 
-								  	</tbody>
-									</table>
-								</td>
-						  </tr>
-						</form>
-						</tbody>
-						</table>
-						 <!-- End of Module Display -->
-			         </td>
-				<td bgcolor="#ebebeb" width="8"></td>
-			  </tr>
-
-			  <tr>
-				<td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif;" height="8" width="7"><img src="{$IMAGE_PATH}bottom_left.jpg" align="bottom"></td>
-				<td style="font-size: 1px;" bgcolor="#ebebeb" height="8"></td>
-				<td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif;" height="8" width="8"><img src="{$IMAGE_PATH}bottom_right.jpg" align="bottom"></td>
-			  </tr>
-		  </tbody></table><br>
-		</div>
-
-		  <!-- END OF GLOBAL -->
-		  
-		  
-		  <!-- Custom Access Module Display Table -->
-		  <div id="customdiv">
-		  <table border="0" cellpadding="0" cellspacing="0" width="100%">
-		  <tbody>
-		  <tr>
-		  	<td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif;" height="6" width="7"><img src="{$IMAGE_PATH}top_left.jpg" align="top"></td>
-			<td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif; height: 6px;" bgcolor="#ebebeb"></td>
-			<td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif;" height="6" width="8"><img src="{$IMAGE_PATH}top_right.jpg" align="top" height="6" width="8"></td>
-		 </tr>
-		 <tr>
-			<td bgcolor="#ebebeb" width="7"></td>
-			<td bgcolor="#ebebeb">	
-				<table border="0" cellpadding="3" cellspacing="0" width="100%">
-				<tbody>
-				<tr>
-					<td class="genHeaderSmall" colspan="2" height="25" valign="middle">{$CMOD.LBL_CUSTOM_ACCESS_PRIVILEGES}</td>
-				</tr>
-				<tr><td colspan="2"></td></tr>
-				<tr>
-					<td colspan="2" style="padding: 0px 0px 0px 1px;" bgcolor="#ebebeb">
-						
-				<!-- Start of Module Display -->
-						{foreach key=modulename item=details from=$MODSHARING}
-						<div align="right"><a href="#">{$CMOD.LBL_GO_TO_TOP}</a></div>
-						{if $details.0 neq ''}
-						<table class="orgTab" cellpadding="0" cellspacing="0">
-						<tbody>
-						<tr bgcolor="#cccccc">
-							<td colspan=3 style="border: 1px solid rgb(204, 204, 204); padding-left: 5px;">
-							<img src="{$IMAGE_PATH}arrow.jpg" align="absmiddle">&nbsp;
-							<b>{$APP.$modulename}</b>&nbsp; 
-							</td>
-							<td align="right" colspan=2><input title="New" class="small" type="button" name="Create" value="{$CMOD.LBL_ADD_PRIVILEGES_BUTTON}" onClick="callEditDiv('{$modulename}','create','')"></td>
-						</tr>
-					  	<tr>
-							<th class="lvtCol" nowrap width="9%">{$CMOD.LBL_RULE_NO}</th>
-							<th class="lvtCol" width="20%">{$APP.$modulename} {$CMOD.LBL_OF} </th>
-							<th class="lvtCol" width="25%">{$CMOD.LBL_CAN_BE_ACCESSED}</th>
-							<th class="lvtCol" width="40%">{$CMOD.LBL_PRIVILEGES}</th>
-							<th class="lvtCol" width="6%">{$APP.Tools}</th>
-						</tr>
-						{foreach key=sno item=elements from=$details}
-						<tr class="prvPrfHoverOut" onmouseover="this.className='prvPrfHoverOn'" onmouseout="this.className='prvPrfHoverOut'">
-							<td>{$sno+1}</td>
-							<td>{$elements.1}</td>
-							<td>{$elements.2}</td>
-							<td>{$elements.3}</td>
-							<td align="center"><a href="javascript:onClick=callEditDiv('{$modulename}','edit','{$elements.0}')"><img src="{$IMAGE_PATH}editfield.gif" title='edit' align="absmiddle" height="15" width="16" border=0></a>|<a href="index.php?module=Users&action=DeleteSharingRule&shareid={$elements.0}"><img src="{$IMAGE_PATH}delete.gif" title='del' align="absmiddle" height="15" width="16" border=0></a></td>
-					    </tr>
-						{/foreach}
-				  		</tbody></table>
-				<!-- End of Module Display -->
-					{else}
-				<!-- Start FOR NO DATA -->
-					<table border="0" cellpadding="3" cellspacing="0" width="100%">
-					<tbody>
-					<tr><td colspan="2"></td></tr>
-					<tr bgcolor="#cccccc">
-					  	<td style="border: 1px solid rgb(204, 204, 204); padding-left: 5px;">
-					  	<img src="{$IMAGE_PATH}arrow.jpg" align="absmiddle">&nbsp;
-						<b>{$APP.$modulename}</b>&nbsp;&nbsp; 
-						</td>
-					 	<td align="right"><input title="New" class="small" type="button" name="Create" value="{$APP.LBL_ADD_ITEM} {$CMOD.LBL_PRIVILEGES}" onClick="callEditDiv('{$modulename}','create','')"></td>
-				  	</tr>
-				  	<tr>
-				  		<td colspan="2" style="padding: 20px;" bgcolor="#ffffff" align="center">
-						{$CMOD.LBL_CUSTOM_ACCESS_MESG} 
-						<a href="javascript:onClick=callEditDiv('{$modulename}','create','')">{$CMOD.LNK_CLICK_HERE}</a>
-						{$CMOD.LBL_CREATE_RULE_MESG}
-					    </td>
-				  	</tr>
-					</tbody>
-					</table>
-			    <!-- END OF NO DATA -->
-					{/if}
-					<br><br>
-					{/foreach}
-					</td>
-					</tr>
-					</tbody></table>
-				</td>
-				<td bgcolor="#ebebeb" width="8"></td>
-			  </tr>
-			  <tr>
-				<td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif;" height="8" width="7"><img src="{$IMAGE_PATH}bottom_left.jpg" align="bottom"></td>
-				<td style="font-size: 1px;" bgcolor="#ebebeb" height="8"></td>
-				<td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif;" height="8" width="8"><img src="{$IMAGE_PATH}bottom_right.jpg" align="bottom"></td>
-			  </tr>
-		  </tbody></table><br>
-			</div>		
-		  		<!-- END OF CUSTOM ACCESS -->
-
-
-</td>
-<td width="1%" style="border-right:1px dotted #CCCCCC;">&nbsp;</td>
-</tr>
-</table>
-</td>
-</tr>
-</table>
-</td>
-</tr>
-</table>
-<div id="tempdiv" style="display:block;position:absolute;left:225px;top:150px;"></div>
-<script>
-
-function callEditDiv(modulename,mode,id)
-{ldelim}
-	$("status").style.display="inline";
-	new Ajax.Request(
-		'index.php',
-		{ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
-			method: 'post',
-			postBody: 'module=Users&action=UsersAjax&orgajax=true&mode='+mode+'&sharing_module='+modulename+'&shareid='+id,
-			onComplete: function(response) {ldelim}
-				$("status").style.display="none";
-				$("tempdiv").innerHTML=response.responseText;
-			{rdelim}
-		{rdelim}
-	);
-{rdelim}
-
-function fnwriteRules(module,related)
-{ldelim}
-		var modulelists = new Array();
-		modulelists = related.split('###');
-		var relatedstring ='';
-		var relatedtag;
-		var relatedselect;
-		var modulename;
-		for(i=0;i < modulelists.length-1;i++)
-		{ldelim}
-			modulename = modulelists[i]+"_accessopt";
-			relatedtag = document.getElementById(modulename);
-			relatedselect = relatedtag.options[relatedtag.selectedIndex].text;
-			relatedstring += modulelists[i]+':'+relatedselect+' ';
-		{rdelim}	
-		var tagName = document.getElementById(module+"_share");
-		var tagName2 = document.getElementById(module+"_access");
-		var tagName3 = document.getElementById('share_memberType');
-		var soucre =  document.getElementById("rules");
-		var soucre1 =  document.getElementById("relrules");
-		var select1 = tagName.options[tagName.selectedIndex].text;
-		var select2 = tagName2.options[tagName2.selectedIndex].text;
-		var select3 = tagName3.options[tagName3.selectedIndex].text;
-		soucre.innerHTML = module +" of <b>\"" + select1 + "\"</b> can be accessed by <b>\"" +select2 + "\"</b> in the permission "+select3;
-		soucre1.innerHTML = "<b>Related Module Rights</b> "+ relatedstring;
-{rdelim}
-
-</script>
-{include file='SettingsSubMenu.tpl'}
-
+{*<!--
+/*********************************************************************************
+  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
+   * ("License"); You may not use this file except in compliance with the License
+   * The Original Code is:  vtiger CRM Open Source
+   * The Initial Developer of the Original Code is vtiger.
+   * Portions created by vtiger are Copyright (C) vtiger.
+   * All Rights Reserved.
+  *
+ ********************************************************************************/
+-->*}
+<script language="JAVASCRIPT" type="text/javascript" src="include/js/smoothscroll.js"></script>
+{literal}
+<style>
+DIV.fixedLay{
+	border:3px solid #CCCCCC;
+	background-color:#FFFFFF;
+	width:500px;
+	position:fixed;
+	left:250px;
+	top:200px;
+	display:block;
+}
+</style>
+{/literal}
+{literal}
+<!--[if lte IE 6]>
+<STYLE type=text/css>
+DIV.fixedLay {
+	POSITION: absolute;
+}
+</STYLE>
+<![endif]-->
+
+{/literal}
+<br>
+<table align="center" border="0" cellpadding="0" cellspacing="0" width="98%">
+<tbody><tr>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
+        <td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
+        <br>
+
+	<div align=center>
+			{include file="SetMenu.tpl"}
+				<!-- DISPLAY -->
+				<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
+				<tr>
+					<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}shareaccess.gif" alt="Users" width="48" height="48" border=0 title="Users"></td>
+					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > {$MOD.LBL_SHARING_ACCESS} </b></td>
+					<td rowspan=2 class="small" align=right>&nbsp;</td>
+				</tr>
+				<tr>
+					<td valign=top class="small">{$MOD.LBL_SHARING_ACCESS_DESCRIPTION}</td>
+				</tr>
+				</table>
+
+				<br>
+			  	<!-- GLOBAL ACCESS MODULE -->
+		  		<div id="globaldiv">
+				<table border=0 cellspacing=0 cellpadding=5 width=100% class="tableHeading">
+				<form action="index.php" method="post" name="new" id="form">
+				<input type="hidden" name="module" value="Users">
+				<input type="hidden" name="action" value="OrgSharingEditView">
+				<input type="hidden" name="parenttab" value="Settings">
+				<tr>
+					<td class="big"><strong>1. {$CMOD.LBL_GLOBAL_ACCESS_PRIVILEGES}</strong></td>
+					<td class="small" align=right>
+						<input class="crmButton small cancel" title="{$CMOD.LBL_RECALCULATE_BUTTON}"  type="submit" name="recalculate" value="{$CMOD.LBL_RECALCULATE_BUTTON}" onclick="this.form.action.value='RecalculateSharingRules'; return confirm('Recalculate Sharing Rules will calculate the sharing rules for the whole organization. This Operation will take some time. Do you want to contunue? ')">	
+	&nbsp;<input class="crmButton small edit" type="submit" name="Edit" value="{$CMOD.LBL_CHANGE} {$CMOD.LBL_PRIVILEGES}" ></td>
+					</td>
+				</tr>
+				</table>
+				<table cellspacing="0" cellpadding="5" class="listTable" width="100%">
+				{foreach item=module from=$DEFAULT_SHARING}	
+                  <tr>
+                    <td width="20%" class="colHeader small" nowrap>{$APP[$module.0]}</td>
+                    <td width="30%" class="listTableRow small" nowrap>
+			{if $module.1 neq 'Private' && $module.1 neq 'Hide Details'}
+				<img src="{$IMAGE_PATH}public.gif" align="absmiddle">
+			{else}
+				<img src="{$IMAGE_PATH}private.gif" align="absmiddle">
+			{/if}
+				{$CMOD[$module.1]}
+		    </td>
+                    <td width="50%" class="listTableRow small" nowrap>{$module.2}</td>
+                  </tr>
+		  {/foreach}
+		</form>	
+              </table>
+		</div>	
+		  <!-- END OF GLOBAL -->
+				<br><br>
+		  <!-- Custom Access Module Display Table -->
+		  <div id="customdiv">
+				<table border=0 cellspacing=0 cellpadding=5 width=100% class="tableHeading">
+				<tr>
+					<td class="big"><strong>2. {$CMOD.LBL_CUSTOM_ACCESS_PRIVILEGES}</strong></td>
+					<td class="small" align=right>&nbsp;</td>
+				</tr>
+				</table>
+				<!-- Start of Module Display -->
+				{foreach  key=modulename item=details from=$MODSHARING}
+				{if $details.0 neq ''}
+				<table width="100%" border="0" cellpadding="5" cellspacing="0" class="listTableTopButtons">
+                  		<tr>
+		                    <td  style="padding-left:5px;" class="big"><img src="{$IMAGE_PATH}arrow.jpg" width="19" height="21" align="absmiddle" />&nbsp; <b>{$APP.$modulename}</b>&nbsp; </td>
+                		    <td align="right">
+					<input class="crmButton small save" type="button" name="Create" value="{$CMOD.LBL_ADD_PRIVILEGES_BUTTON}" onClick="callEditDiv('{$modulename}','create','')">
+				    </td>
+                  		</tr>
+			  	</table>
+				<table width="100%" cellpadding="5" cellspacing="0" class="listTable" >
+                    		<tr>
+                    		<td width="7%" class="colHeader small" nowrap>{$CMOD.LBL_RULE_NO}</td>
+                          	<td width="20%" class="colHeader small" nowrap>{$APP.$modulename} {$CMOD.LBL_OF}</td>
+                          	<td width="25%" class="colHeader small" nowrap>{$CMOD.LBL_CAN_BE_ACCESSED}</td>
+                          	<td width="40%" class="colHeader small" nowrap>{$CMOD.LBL_PRIVILEGES}</td>
+                          	<td width="8%" class="colHeader small" nowrap>{$APP.Tools}</td>
+                        	</tr>
+                        <tr >
+			  {foreach key=sno item=elements from=$details}
+                          <td class="listTableRow small">{$sno+1}</td>
+                          <td class="listTableRow small">{$elements.1}</td>
+                          <td class="listTableRow small">{$elements.2}</td>
+                          <td class="listTableRow small">{$elements.3}</td>
+                          <td align="center" class="listTableRow small">
+				<a href="javascript:onClick=callEditDiv('{$modulename}','edit','{$elements.0}')"><img src="{$IMAGE_PATH}editfield.gif" title='edit' align="absmiddle" height="15" width="16" border=0></a>|<a href="index.php?module=Users&action=DeleteSharingRule&shareid={$elements.0}"><img src="{$IMAGE_PATH}delete.gif" title='del' align="absmiddle" height="15" width="16" border=0></a></td>
+                        </tr>
+                     {/foreach} 
+                    </table>
+	<!-- End of Module Display -->
+	<!-- Start FOR NO DATA -->	
+			<table border=0 cellspacing=0 cellpadding=5 width=100% class="tableHeading">
+			<tr><td>&nbsp;</td></tr>
+			</table>
+		    {else}
+                    <table width="100%" cellpadding="0" cellspacing="0" class="listTable"><tr><td>
+		      <table width="100%" border="0" cellpadding="5" cellspacing="0" class="listTableTopButtons">
+                      <tr>
+                        <td  style="padding-left:5px;" class="big"><img src="{$IMAGE_PATH}arrow.jpg" width="19" height="21" align="absmiddle" />&nbsp; <b>{$APP.$modulename}</b>&nbsp; </td>
+                        <td align="right">
+				<input class="crmButton small save" type="button" name="Create" value="{$APP.LBL_ADD_ITEM} {$CMOD.LBL_PRIVILEGES}" onClick="callEditDiv('{$modulename}','create','')">
+			</td>
+                      </tr>
+			<table width="100%" cellpadding="5" cellspacing="0">
+			<tr>
+			<td colspan="2"  style="padding:20px ;" align="center" class="small">
+			   {$CMOD.LBL_CUSTOM_ACCESS_MESG} 
+			   <a href="javascript:onClick=callEditDiv('{$modulename}','create','')">{$CMOD.LNK_CLICK_HERE}</a>
+			   {$CMOD.LBL_CREATE_RULE_MESG}
+			</td>
+			</tr>
+		    </table>
+		    </table>	
+			<table border=0 cellspacing=0 cellpadding=5 width=100% class="tableHeading">
+			<tr><td>&nbsp;</td></tr>
+			</table>
+		    {/if}
+		    {/foreach}			
+		   </td></tr></table>
+				<br>
+		   </div>	
+				<!-- Edit Button -->
+				<table border=0 cellspacing=0 cellpadding=5 width=100% >
+				<tr><td class="small" ><div align=right><a href="#top">{$MOD.LBL_SCROLL}</a></div></td></tr>				</table>
+		 </td>
+                  </tr>
+				
+                </table>
+			
+			
+			
+			</td>
+			</tr>
+			</table>
+		</td>
+	</tr>
+	</table>
+		
+	</div>
+</td>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
+   </tr>
+</tbody>
+</table>
+<div id="tempdiv" style="display:block;position:absolute;left:225px;top:150px;"></div>
+<script>
+
+function callEditDiv(modulename,mode,id)
+{ldelim}
+	$("status").style.display="inline";
+	new Ajax.Request(
+		'index.php',
+		{ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+			method: 'post',
+			postBody: 'module=Users&action=UsersAjax&orgajax=true&mode='+mode+'&sharing_module='+modulename+'&shareid='+id,
+			onComplete: function(response) {ldelim}
+				$("status").style.display="none";
+				$("tempdiv").innerHTML=response.responseText;
+			{rdelim}
+		{rdelim}
+	);
+{rdelim}
+
+function fnwriteRules(module,related)
+{ldelim}
+		var modulelists = new Array();
+		modulelists = related.split('###');
+		var relatedstring ='';
+		var relatedtag;
+		var relatedselect;
+		var modulename;
+		for(i=0;i < modulelists.length-1;i++)
+		{ldelim}
+			modulename = modulelists[i]+"_accessopt";
+			relatedtag = document.getElementById(modulename);
+			relatedselect = relatedtag.options[relatedtag.selectedIndex].text;
+			relatedstring += modulelists[i]+':'+relatedselect+' ';
+		{rdelim}	
+		var tagName = document.getElementById(module+"_share");
+		var tagName2 = document.getElementById(module+"_access");
+		var tagName3 = document.getElementById('share_memberType');
+		var soucre =  document.getElementById("rules");
+		var soucre1 =  document.getElementById("relrules");
+		var select1 = tagName.options[tagName.selectedIndex].text;
+		var select2 = tagName2.options[tagName2.selectedIndex].text;
+		var select3 = tagName3.options[tagName3.selectedIndex].text;
+		soucre.innerHTML = module +" of <b>\"" + select1 + "\"</b> can be accessed by <b>\"" +select2 + "\"</b> in the permission "+select3;
+		soucre1.innerHTML = "<b>Related Module Rights</b> "+ relatedstring;
+{rdelim}
+
+</script>

Modified: vtigercrm/trunk/Smarty/templates/OrgSharingEditView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/OrgSharingEditView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/OrgSharingEditView.tpl Tue Jun 20 01:02:26 2006
@@ -9,67 +9,77 @@
   *
  ********************************************************************************/
 -->*}
-<script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
-<style type="text/css">@import url(themes/blue/style.css);</style>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-<tr>
-	{include file='SettingsMenu.tpl'}
-<td width="75%" valign="top">
+<script language="JAVASCRIPT" type="text/javascript" src="include/js/smoothscroll.js"></script>
+<br>
+<table align="center" border="0" cellpadding="0" cellspacing="0" width="98%">
+<tbody><tr>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
+        <td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
+        <br>
 
-<table width="100%" border="0" cellpadding="0" cellspacing="0" height="100%">
-<tr>
-<td class="showPanelBg" valign="top" width="100%" colspan="3" style="padding-left:20px; "><br/>
-<span class="lvtHeaderText"><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS} </a> > {$MOD.LBL_USER_MANAGEMENT} > {$CMOD.LBL_ORG_SHARING_PRIVILEGES}</b></span>
-<hr noshade="noshade" size="1" />
-</td>
-</tr>
-<tr><td height=20 colspan=3>&nbsp;</td></tr>
-<tr>
-<td width="75%" style="padding-left:20px;" valign="top">
+	<div align=center>
+			{include file="SetMenu.tpl"}
+				<!-- DISPLAY -->
+				<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
+				<form action="index.php" method="post" name="def_org_share" id="form">
+				<input type="hidden" name="module" value="Users">
+				<input type="hidden" name="action" value="SaveOrgSharing">
+				<input type="hidden" name="parenttab" value="Settings">
+				<tr>
+					<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}shareaccess.gif" alt="Users" width="48" height="48" border=0 title="Users"></td>
+					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > {$MOD.LBL_EDIT} {$MOD.LBL_SHARING_ACCESS} </b></td>
+					<td rowspan=2 class="small" align=right>&nbsp;</td>
+				</tr>
+				<tr>
+					<td valign=top class="small">{$MOD.LBL_SHARING_ACCESS_DESCRIPTION}</td>
+				</tr>
+				</table>
+
+				<br>
+				<table border=0 cellspacing=0 cellpadding=5 width=100% class="tableHeading">
+				<tr>
+					<td class="big"><strong>{$CMOD.LBL_GLOBAL_ACCESS_PRIVILEGES}</strong></td>
+					<td class="small" align=right>
+						<input class="crmButton small save" title="Save" accessKey="C" type="submit" name="Save" value="{$CMOD.LBL_SAVE_PERMISSIONS}">&nbsp;
+						<input class="crmButton small cancel" title="{$APP.LBL_CANCEL_BUTTON_TITLE}" accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" type="button" name="Cancel" value="{$APP.LBL_CANCEL_BUTTON_LABEL}" onClick="window.history.back();">
+					</td>
+				</tr>
+				</table>
+
 	
-	<table border="0" cellpadding="" cellspacing="0" width="75%">
-	<tbody>
-	<form action="index.php" method="post" name="def_org_share" id="form">
-	<input type="hidden" name="module" value="Users">
-	<input type="hidden" name="action" value="SaveOrgSharing">
-	<input type="hidden" name="parenttab" value="Settings">
-	<tr>
-	<td class="genHeaderSmall" height="25" valign="middle">{$CMOD.LBL_GLOBAL_ACCESS_PRIVILEGES}</td>
-	<td align="right"><input class="small" title="Save" accessKey="C" type="submit" name="Save" value="{$CMOD.LBL_SAVE_PERMISSIONS}"></td>
-	</tr>
-	<tr><td colspan="2" height="20">&nbsp;</td></tr>
-	<tr>
-	<td colspan="2" style="padding: 0px 0px 0px 1px;" bgcolor="#ffffff">
-
-	<table class="globTab" cellpadding="5" cellspacing="0">
-	<tbody>
-	{foreach item=elements from=$ORGINFO}	
-	<tr>
-	<th width="30%">{$APP[$elements.0]}</th>
-	<td width="70%">{$elements.2}</td>
-	<tr>
-	{/foreach}
-	</tbody>
-	</table>
-	</td>
-	</tr>
-	<tr><td colspan="2" height="20">&nbsp;</td></tr>
-	<tr>
-	<td align="center" colspan=2><input class="small" title="{$APP.LBL_CANCEL_BUTTON_TITLE}" accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" type="button" name="Cancel" value="{$APP.LBL_CANCEL_BUTTON_LABEL}" onClick="window.history.back();"></td>
-	</tr>
+				<table cellspacing="0" cellpadding="5" class="listTable" width="100%">
+				{foreach item=elements from=$ORGINFO}	
+				<tr>
+                    		    <td width="30%" class="colHeader small" nowrap>{$APP[$elements.0]}</td>
+				    <td width="70%" class="listTable small">{$elements.2}</td>
+				<tr>
+				{/foreach}
+				</table>
 	</form>
-	</tbody>
 	</table>
 
+				<table border=0 cellspacing=0 cellpadding=5 width=100% >
+				<tr><td class="small" ><div align=right><a href="#top">{$MOD.LBL_SCROLL}</a></div></td></tr>				</table>
+		 </td>
+                  </tr>
+				
+                </table>
+			
+			
+			
+			</td>
+			</tr>
+			</table>
+		</td>
+	</tr>
+	</table>
+		
+
+
 </td>
-<td width="1%" style="border-right:1px dotted #CCCCCC;">&nbsp;</td>
-</tr>
-</table>
-</td>
-</tr>
-</table>
-</td>
-</tr>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
+   </tr>
+</tbody>
 </table>
 <script>
 



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 20 00:06:53 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 20 Jun 2006 07:06:53 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7290 -
 /vtigercrm/trunk/modules/Users/listemailtemplates.php
Message-ID: <20060620070653.1364A5E4DC7@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 20 01:06:50 2006
New Revision: 7290

Log:
updated listemailtemplate.php

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

Modified: vtigercrm/trunk/modules/Users/listemailtemplates.php
==============================================================================
--- vtigercrm/trunk/modules/Users/listemailtemplates.php (original)
+++ vtigercrm/trunk/modules/Users/listemailtemplates.php Tue Jun 20 01:06:50 2006
@@ -42,8 +42,11 @@
 $smarty->assign("MOD", $smod_strings);
 $smarty->assign("MODULE", 'Settings');
 $smarty->assign("IMAGE_PATH", $image_path);
+$smarty->assign("PARENTTAB", $_REQUEST['parenttab']);
 
 $return_data=array();
+if ($temprow != null)
+{
 do
 {
   $templatearray=array();
@@ -54,6 +57,7 @@
   $return_data[]=$templatearray;
   $cnt++;
 }while($temprow = $adb->fetch_array($result));
+}
 
 $log->info("Exiting Email Templates List View");
 



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 20 00:11:20 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 20 Jun 2006 07:11:20 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7291 - in
 /vtigercrm/trunk/modules/Users: createemailtemplate.php
 editemailtemplate.php listwordtemplates.php upload.php
Message-ID: <20060620071120.A31C45E4D89@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 20 01:11:13 2006
New Revision: 7291

Log:
updated the files for mail & email templates - ahmed

Modified:
    vtigercrm/trunk/modules/Users/createemailtemplate.php
    vtigercrm/trunk/modules/Users/editemailtemplate.php
    vtigercrm/trunk/modules/Users/listwordtemplates.php
    vtigercrm/trunk/modules/Users/upload.php

Modified: vtigercrm/trunk/modules/Users/createemailtemplate.php
==============================================================================
--- vtigercrm/trunk/modules/Users/createemailtemplate.php (original)
+++ vtigercrm/trunk/modules/Users/createemailtemplate.php Tue Jun 20 01:11:13 2006
@@ -31,6 +31,7 @@
 $smarty->assign("IMAGE_PATH", $image_path);
 $smarty->assign("THEME_PATH", $theme_path);
 $smarty->assign("UMOD", $mod_strings);
+$smarty->assign("PARENTTAB", $_REQUEST['parenttab']);
 
 $smarty->assign("MOD", $smod_strings);
 $smarty->assign("MODULE", 'Settings');

Modified: vtigercrm/trunk/modules/Users/editemailtemplate.php
==============================================================================
--- vtigercrm/trunk/modules/Users/editemailtemplate.php (original)
+++ vtigercrm/trunk/modules/Users/editemailtemplate.php Tue Jun 20 01:11:13 2006
@@ -51,6 +51,7 @@
 $smarty->assign("SUBJECT", $emailtemplateResult["subject"]);
 $smarty->assign("BODY", $emailtemplateResult["body"]);
 $smarty->assign("MODULE", 'Settings');
+$smarty->assign("PARENTTAB", $_REQUEST['parenttab']);
 $smarty->assign("EMODE", $mode);
 
 $smarty->display("CreateEmailTemplate.tpl");

Modified: vtigercrm/trunk/modules/Users/listwordtemplates.php
==============================================================================
--- vtigercrm/trunk/modules/Users/listwordtemplates.php (original)
+++ vtigercrm/trunk/modules/Users/listwordtemplates.php Tue Jun 20 01:11:13 2006
@@ -48,6 +48,7 @@
 $smod_strings = return_module_language($current_language,'Settings');
 $smarty->assign("MOD", $smod_strings);
 $smarty->assign("UMOD", $mod_strings);
+$smarty->assign("PARENTTAB", $_REQUEST['parenttab']);
 $smarty->assign("IMAGE_PATH",$image_path);
 
 

Modified: vtigercrm/trunk/modules/Users/upload.php
==============================================================================
--- vtigercrm/trunk/modules/Users/upload.php (original)
+++ vtigercrm/trunk/modules/Users/upload.php Tue Jun 20 01:11:13 2006
@@ -31,6 +31,7 @@
 $smarty->assign("IMAGE_PATH",$image_path);
 $smarty->assign("APP", $app_strings);
 $smarty->assign("UMOD", $mod_strings);
+$smarty->assign("PARENTTAB", $_REQUEST['parenttab']);
 
 $smarty->display('CreateWordTemplate.tpl');
 



From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 00:19:44 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 07:19:44 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=23691=3A_?=
	=?utf-8?q?installation?=
In-Reply-To: <076.1bead8693dac1b3fa05155cdcb028a72@vtiger.fosslabs.com>
References: <076.1bead8693dac1b3fa05155cdcb028a72@vtiger.fosslabs.com>
Message-ID: <085.fb9f09987770069f6a5e03466cd12eb0@vtiger.fosslabs.com>

#691: installation
--------------------------+-------------------------------------------------
  Reporter:  mickie       |       Owner:  Richie      
      Type:  enhancement  |      Status:  new         
  Priority:  critical     |   Milestone:              
 Component:  vtigercrm    |     Version:  5.0.0       
Resolution:               |    Keywords:  installation
--------------------------+-------------------------------------------------
Changes (by anonymous):

  * owner:  jerrydgeorge => Richie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/691>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 00:19:59 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 07:19:59 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23926=3A_?=
 =?utf-8?q?If_database_fails=2C_installation_script_loses_path_variable?=
In-Reply-To: <076.3dff578d41ed95759b327615c9ea781a@vtiger.fosslabs.com>
References: <076.3dff578d41ed95759b327615c9ea781a@vtiger.fosslabs.com>
Message-ID: <085.9c02dc73e7a26bd127d9b091f4f12795@vtiger.fosslabs.com>

#926: If database fails, installation script loses path variable
------------------------+---------------------------------------------------
  Reporter:  neofis     |       Owner:  Richie      
      Type:  defect     |      Status:  new         
  Priority:  critical   |   Milestone:              
 Component:  vtigercrm  |     Version:  5.0.0       
Resolution:             |    Keywords:  installation
------------------------+---------------------------------------------------
Changes (by anonymous):

  * owner:  jeri => Richie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/926>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 00:20:15 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 07:20:15 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231151=3A?=
 =?utf-8?q?_Error_message_in_Installer=2E=2E?=
In-Reply-To: <076.5644658cbeac029416aebb3b898c0527@vtiger.fosslabs.com>
References: <076.5644658cbeac029416aebb3b898c0527@vtiger.fosslabs.com>
Message-ID: <085.bd0afc913027e74023881ee88071c535@vtiger.fosslabs.com>

#1151: Error message in Installer..
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  Richie
      Type:  defect     |      Status:  new   
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by anonymous):

  * owner:  jeri => Richie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1151>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 00:20:35 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 07:20:35 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231185=3A?=
 =?utf-8?q?_could_not_install_=2Ebin_with_default_apache_and_bundled_mysql?=
In-Reply-To: <076.6370e2d438c2565f58d0b5d3f57b00ec@vtiger.fosslabs.com>
References: <076.6370e2d438c2565f58d0b5d3f57b00ec@vtiger.fosslabs.com>
Message-ID: <085.bad9ec6dcf0cf845575c12c1d397c87e@vtiger.fosslabs.com>

#1185: could not install .bin with default apache and bundled mysql
------------------------+---------------------------------------------------
  Reporter:  mangai     |       Owner:  Richie
      Type:  defect     |      Status:  new   
  Priority:  critical   |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by anonymous):

  * owner:  jeri => Richie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1185>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 00:20:43 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 07:20:43 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231201=3A?=
 =?utf-8?q?_could_not_install_=2Ebin_with_default_apache_and_mysql?=
In-Reply-To: <076.a2a48d622de2b413e928bb5187dbd9ad@vtiger.fosslabs.com>
References: <076.a2a48d622de2b413e928bb5187dbd9ad@vtiger.fosslabs.com>
Message-ID: <085.ce7c34d483187d6683596682c0d5cef2@vtiger.fosslabs.com>

#1201: could not install .bin with default apache and mysql
------------------------+---------------------------------------------------
  Reporter:  mangai     |       Owner:  Richie
      Type:  defect     |      Status:  new   
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by anonymous):

  * owner:  jeri => Richie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1201>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 00:21:31 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 07:21:31 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23703=3A_?=
 =?utf-8?q?installation_issue_in_bin?=
In-Reply-To: <076.d5b75a39847faef3b46084de29b76436@vtiger.fosslabs.com>
References: <076.d5b75a39847faef3b46084de29b76436@vtiger.fosslabs.com>
Message-ID: <085.7c5d60e2df4633ab0a39bcb0c56c7e0c@vtiger.fosslabs.com>

#703: installation issue in bin
---------------------------+------------------------------------------------
  Reporter:  jerrydgeorge  |       Owner:  Richie      
      Type:  defect        |      Status:  new         
  Priority:  major         |   Milestone:              
 Component:  vtigercrm     |     Version:  5.0.0       
Resolution:                |    Keywords:  installation
---------------------------+------------------------------------------------
Changes (by anonymous):

  * owner:  jerrydgeorge => Richie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/703>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 00:24:49 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 07:24:49 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231258=3A?=
 =?utf-8?q?_Can=27t_create_custom_fields?=
In-Reply-To: <076.e2de34810640366206140549ecde537d@vtiger.fosslabs.com>
References: <076.e2de34810640366206140549ecde537d@vtiger.fosslabs.com>
Message-ID: <085.f542985ecd8b5aa81b84ee6ceb7ff841@vtiger.fosslabs.com>

#1258: Can't create custom fields
------------------------+---------------------------------------------------
  Reporter:  nik        |       Owner:  ela  
      Type:  defect     |      Status:  new  
  Priority:  major      |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by mangai):

  * owner:  mangai => ela

Comment:

 Ocurred in IE.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1258>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 00:26:01 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 07:26:01 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231119=3A?=
 =?utf-8?q?_custom_field_UI_not_proper_in_IE?=
In-Reply-To: <076.fd3163da175acd9436235ee85221b737@vtiger.fosslabs.com>
References: <076.fd3163da175acd9436235ee85221b737@vtiger.fosslabs.com>
Message-ID: <085.6b97ce8dcf311bd02bdb0a445988363d@vtiger.fosslabs.com>

#1119: custom field UI not proper in IE
------------------------+---------------------------------------------------
  Reporter:  mangai     |       Owner:  ela  
      Type:  defect     |      Status:  new  
  Priority:  major      |   Milestone:  5.0.0
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by mangai):

  * owner:  mangai => ela

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1119>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 20 00:37:25 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 20 Jun 2006 07:37:25 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7292 - in /vtigercrm/trunk:
 Smarty/templates/ComposeEmail.tpl Smarty/templates/Header.tpl
 modules/Emails/ListView.php modules/Emails/Save.php
Message-ID: <20060620073726.0D8CA83F257@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 20 01:37:17 2006
New Revision: 7292

Log:
mail server check has been added and float div integrated

Modified:
    vtigercrm/trunk/Smarty/templates/ComposeEmail.tpl
    vtigercrm/trunk/Smarty/templates/Header.tpl
    vtigercrm/trunk/modules/Emails/ListView.php
    vtigercrm/trunk/modules/Emails/Save.php

Modified: vtigercrm/trunk/Smarty/templates/ComposeEmail.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ComposeEmail.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ComposeEmail.tpl Tue Jun 20 01:37:17 2006
@@ -19,6 +19,7 @@
 <title>Compose Mail</title>
 <link REL="SHORTCUT ICON" HREF="include/images/vtigercrm_icon.ico">	
 <style type="text/css">@import url("themes/{$THEME}/style.css");</style>
+<script language="javascript" type="text/javascript" src="include/scriptaculous/prototype.js"></script>
 </head>
 <body marginheight="0" marginwidth="0" topmargin="0" bottommargin="0" leftmargin="0" rightmargin="0">
 <form name="EditView" method="POST" ENCTYPE="multipart/form-data" action="index.php">
@@ -107,7 +108,7 @@
 	{elseif $elements.2.0 eq 'description'}
    <tr>
 	<td colspan="3" align="center" height="320">
-        <input id="description___Config" value="" style="display: none;" type="hidden"><iframe id="description___Frame" src="include/fckeditor/editor/fckeditor.html?InstanceName=description&amp;Toolbar=Default" frameborder="no" height="400" scrolling="no" width="100%"></iframe>
+        <input id="description___Config" value="" style="display: none;" type="hidden"><iframe id="description___Frame" src="include/fckeditor/editor/fckeditor.html?InstanceName=description&amp;Toolbar=Default" frameborder="no" height="370" scrolling="no" width="100%"></iframe>
         {if $WEBMAIL eq 'true'}
                 <textarea style="display: none;" class="detailedViewTextBox" name="description" cols="90" rows="8">{$DESCRIPTION}</textarea>
         {else}
@@ -151,10 +152,35 @@
 	}
 	if(mode == 'send')
 	{
-		oform.send_mail.value='true';
+		server_check()	
+	}else
+	{
+		oform.action.value='Save';
+		oform.submit();
 	}
-	oform.action.value='Save';
-	oform.submit();
+}
+function server_check()
+{
+	var oform = window.document.EditView;
+        new Ajax.Request(
+        	'index.php',
+                {queue: {position: 'end', scope: 'command'},
+                	method: 'post',
+                        postBody:"module=Emails&action=EmailsAjax&file=Save&ajax=true&server_check=true",
+			onComplete: function(response) {
+			if(response.responseText == 'SUCESS')
+			{
+				oform.send_mail.value='true';
+				oform.action.value='Save';
+				oform.submit();
+			}else
+			{
+				alert('Please Configure Your Mail Server');
+				return false;
+			}
+               	    }
+                }
+        );
 }
 </script>
 {/literal}

Modified: vtigercrm/trunk/Smarty/templates/Header.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Header.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Header.tpl Tue Jun 20 01:37:17 2006
@@ -9,19 +9,22 @@
   *
  ********************************************************************************/
 -->*}
-<!-- BEGIN: main -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>
-
-{literal}	
+{literal}
+<style>
+DIV.fixedLay{
+	position:fixed;
+}
+</style>
 <!--[if lte IE 6]>
 <STYLE type=text/css>HTML {
-	OVERFLOW: auto; HEIGHT: 100%
+	OVERFLOW: auto; HEIGHT: 100%;
 }
-BODY {
+BODY {  
 	margin:0 0 0 0;
-	OVERFLOW: auto; HEIGHT: 100%
+	OVERFLOW: auto; HEIGHT: 100%;
 }
 DIV.fixedLay {
 	POSITION: absolute;
@@ -29,7 +32,6 @@
 </STYLE>
 <![endif]-->
 {/literal}
-
 	<title>{$CURRENT_USER} - {$APP.$CATEGORY} - {$APP.$MODULE_NAME} - {$APP.LBL_BROWSER_TITLE}</title>
 	<link rel="stylesheet" type="text/css" href="style.css">
 	<link REL="SHORTCUT ICON" HREF="include/images/vtigercrm_icon.ico">	
@@ -462,7 +464,7 @@
 </div>
 
 
-<div id="status" style="display:none;position:absolute;left:930px;top:90px;height:27px;white-space:nowrap;"><img src="{$IMAGEPATH}status.gif"></div>
+<div id="status" class="fixedLay" style="display:none;left:930px;top:88px;height:27px;white-space:nowrap;"><img src="{$IMAGEPATH}status.gif"></div>
 <script>
 function openwin()
 {ldelim}

Modified: vtigercrm/trunk/modules/Emails/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/ListView.php (original)
+++ vtigercrm/trunk/modules/Emails/ListView.php Tue Jun 20 01:37:17 2006
@@ -162,7 +162,7 @@
 
 //Retreive the Navigation array
 $_REQUEST['allflag'] = 'All';
-$navigation_array = getNavigationValues(1, $noofrows, $list_max_entries_per_page);
+$navigation_array = getNavigationValues(1, $noofrows, $noofrows);
 
 //Retreive the List View Table Header
 if($viewid !='')

Modified: vtigercrm/trunk/modules/Emails/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/Save.php (original)
+++ vtigercrm/trunk/modules/Emails/Save.php Tue Jun 20 01:37:17 2006
@@ -1,199 +1,210 @@
-<?php
-/*********************************************************************************
- * The contents of this file are subject to the SugarCRM Public License Version 1.1.2
- * ("License"); You may not use this file except in compliance with the 
- * License. You may obtain a copy of the License at http://www.sugarcrm.com/SPL
- * Software distributed under the License is distributed on an  "AS IS"  basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
- * the specific language governing rights and limitations under the License.
- * The Original Code is:  SugarCRM Open Source
- * The Initial Developer of the Original Code is SugarCRM, Inc.
- * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.;
- * All Rights Reserved.
- * Contributor(s): ______________________________________.
- ********************************************************************************/
-/*********************************************************************************
- * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Emails/Save.php,v 1.27 2005/04/29 08:54:38 rank Exp $
- * Description:  Saves an Account record and then redirects the browser to the 
- * defined return URL.
- * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
- * All Rights Reserved.
- * Contributor(s): ______________________________________..
- ********************************************************************************/
-
-//Added on 09-11-2005 to avoid loading the webmail vtiger_files in Email process
-if($_REQUEST['smodule'] != '')
-{
-	define('SM_PATH','modules/squirrelmail-1.4.4/');
-	/* SquirrelMail required vtiger_files. */
-	require_once(SM_PATH . 'functions/strings.php');
-	require_once(SM_PATH . 'functions/imap_general.php');
-	require_once(SM_PATH . 'functions/imap_messages.php');
-	require_once(SM_PATH . 'functions/i18n.php');
-	require_once(SM_PATH . 'functions/mime.php');
-	require_once(SM_PATH .'include/load_prefs.php');
-	//require_once(SM_PATH . 'class/mime/Message.class.php');
-	require_once(SM_PATH . 'class/mime.class.php');
-	sqgetGlobalVar('key',       $key,           SQ_COOKIE);
-	sqgetGlobalVar('username',  $username,      SQ_SESSION);
-	sqgetGlobalVar('onetimepad',$onetimepad,    SQ_SESSION);
-	$mailbox = 'INBOX';
-}
-
-require_once('modules/Emails/Email.php');
-require_once('include/logging.php');
-require_once('include/database/PearDatabase.php');
-
-$local_log =& LoggerManager::getLogger('index');
-
-$focus = new Email();
-
-global $current_user;
-setObjectValuesFromRequest(&$focus);
-//Check if the file is exist or not.
-if($_FILES["filename"]["size"] == 0 && $_FILES["filename"]["name"] != '')
-{
-        $file_upload_error = true;
-        $_FILES = '';
-}
-if((isset($_REQUEST['deletebox']) && $_REQUEST['deletebox'] != null) && $_REQUEST['addbox'] == null)
-{
-	imap_delete($mbox,$_REQUEST['deletebox']);
-	imap_expunge($mbox);
-	header("Location: index.php?module=Emails&action=index");
-	exit();
-}
-/*if(isset($_REQUEST['fromemail']) && $_REQUEST['fromemail'] != null)
-{
-	//get the list of data from the comma separated array
-	$emailids = explode(",",$_REQUEST['fromemail']);
-	$subjects = explode(",",$_REQUEST['subject']);
-	$ids = explode(",",$_REQUEST['idlist']);
-	$total = count($ids);
-	for($z=0;$z<$total;$z++)
-	{
-		$msgData='';
-		global $current_user;
-		require_once('include/utils/UserInfoUtil.php');
-		$mailInfo = getMailServerInfo($current_user);
-		$temprow = $adb->fetch_array($mailInfo);
-
-		$secretkey=$temprow["mail_password"];
-		$imapServerAddress=$temprow["mail_servername"];
-		$imapPort="143";
-
-		$key = OneTimePadEncrypt($secretkey, $onetimepad);
-		$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
-		$mbx_response=sqimap_mailbox_select($imapConnection, $mailbox);
-
-		$message = sqimap_get_message($imapConnection, $ids[$z], $mailbox);
-		$header = $message->rfc822_header;
-		$ent_ar = $message->findDisplayEntity(array(), array('text/plain'));
-		$cnt = count($ent_ar);
-		global $color;
-		for ($u = 0; $u < $cnt; $u++)
-		{
-			$messagebody .= formatBody($imapConnection, $message, $color, $wrap_at, $ent_ar[$u], $ids[$z], $mailbox);
-			$msgData = $messagebody;
-		}
-
-			$ctctExists = checkIfContactExists($emailids[$z]);
-			if($ctctExists > 0)
-			{
-				$focus->column_fields['parent_id']=$ctctExists;
-			}
-			global $current_user;
-
-			$focus->column_fields['subject']=$subjects[$z];
-			$focus->column_fields["activitytype"]="Emails";
-			//this line has been added to get the related list data in the contact description
-			$focus->column_fields["assigned_user_id"]=$current_user->id;
-			$focus->column_fields["date_start"]=$_REQUEST['adddate'];
-			$focus->column_fields["time_start"]=$_REQUEST['adddate'];
-
-			$focus->column_fields["description"]=$msgData;
-			$focus->save("Emails");
-			$return_id = $focus->id;
-			$return_module='Emails';	
-			$return_action='DetailView';	
-	}
-	header("Location: index.php?action=$return_action&module=$return_module&parent_id=$parent_id&record=$return_id&filename=$filename");
-	return;
-}*/
-
-/**	Function to check whether the contact is exist of not
- *	input  : contact id
- *	return : contact id if contact exist, else -1 will be return
- */
-function checkIfContactExists($mailid)
-{
-	global $log;
-	$log->debug("Entering checkIfContactExists(".$mailid.") method ...");
-	global $adb;
-	$sql = "select contactid from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_contactdetails.contactid where vtiger_crmentity.deleted=0 and email= ".$adb->quote($mailid);
-	$result = $adb->query($sql);
-	$numRows = $adb->num_rows($result);
-	if($numRows > 0)
-	{
-		$log->debug("Exiting checkIfContactExists method ...");
-		return $adb->query_result($result,0,"contactid");
-	}
-	else
-	{
-		$log->debug("Exiting checkIfContactExists method ...");
-		return -1;
-	}
-}
-//assign the focus values
-$focus->filename = $_REQUEST['file_name'];
-$focus->parent_id = $_REQUEST['parent_id'];
-$focus->parent_type = $_REQUEST['parent_type'];
-$focus->column_fields["assigned_user_id"]=$current_user->id;
-$focus->column_fields["activitytype"]="Emails";
-$focus->column_fields["date_start"]= date('Y-m-d');
-$focus->save("Emails");
-
-//saving the email details in vtiger_emaildetails vtiger_table
-$return_id = $focus->id;
-$email_id = $return_id;
-$query = 'select emailid from vtiger_emaildetails where emailid ='.$email_id;
-$result = $adb->query($query);
-if(isset($_REQUEST["hidden_toid"]) && $_REQUEST["hidden_toid"]!='')
-	$all_to_ids = ereg_replace(",","###",$_REQUEST["hidden_toid"]);
-if(isset($_REQUEST["saved_toid"]) && $_REQUEST["saved_toid"]!='')
-	$all_to_ids .= ereg_replace(",","###",$_REQUEST["saved_toid"]);
-	
-$all_cc_ids = ereg_replace(",","###",$_REQUEST["ccmail"]);
-$all_bcc_ids = ereg_replace(",","###",$_REQUEST["bccmail"]);
-if($adb->num_rows($result) > 0)
-{
-	$query = 'update vtiger_emaildetails set to_email="'.$all_to_ids.'",cc_email="'.$all_cc_ids.'",bcc_email="'.$all_bcc_ids.'",idlists="'.$_REQUEST["parent_id"].'",email_flag="SAVED" where emailid = '.$email_id;
-}else
-{
-	$query = 'insert into vtiger_emaildetails values ('.$email_id.',"","'.$all_to_ids.'","'.$all_cc_ids.'","'.$all_bcc_ids.'","","'.$_REQUEST["parent_id"].'","SAVED")';
-}
-$adb->query($query);
-
-
-$focus->retrieve_entity_info($return_id,"Emails");
-
-//this is to receive the data from the Select Users button
-if($_REQUEST['source_module'] == null)
-{
-	$module = 'users';
-}
-//this will be the case if the Select Contact button is chosen
-else
-{
-	$module = $_REQUEST['source_module'];
-}
-
-if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] != "") $return_module = $_REQUEST['return_module'];
-else $return_module = "Emails";
-if(isset($_REQUEST['return_action']) && $_REQUEST['return_action'] != "") $return_action = $_REQUEST['return_action'];
-else $return_action = "DetailView";
-if(isset($_REQUEST['return_id']) && $_REQUEST['return_id'] != "") $return_id = $_REQUEST['return_id'];
-if(isset($_REQUEST['filename']) && $_REQUEST['filename'] != "") $filename = $_REQUEST['filename'];
+<?php
+/*********************************************************************************
+ * The contents of this file are subject to the SugarCRM Public License Version 1.1.2
+ * ("License"); You may not use this file except in compliance with the 
+ * License. You may obtain a copy of the License at http://www.sugarcrm.com/SPL
+ * Software distributed under the License is distributed on an  "AS IS"  basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
+ * the specific language governing rights and limitations under the License.
+ * The Original Code is:  SugarCRM Open Source
+ * The Initial Developer of the Original Code is SugarCRM, Inc.
+ * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.;
+ * All Rights Reserved.
+ * Contributor(s): ______________________________________.
+ ********************************************************************************/
+/*********************************************************************************
+ * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Emails/Save.php,v 1.27 2005/04/29 08:54:38 rank Exp $
+ * Description:  Saves an Account record and then redirects the browser to the 
+ * defined return URL.
+ * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
+ * All Rights Reserved.
+ * Contributor(s): ______________________________________..
+ ********************************************************************************/
+ //check for mail server configuration thro ajax
+if(isset($_REQUEST['server_check']) && $_REQUEST['server_check'] == 'true')
+{
+	$sql="select * from vtiger_systems where server_type = 'email'";
+	$records=$adb->num_rows($adb->query($sql),0,"id");
+	if($records != '')
+		echo 'SUCESS';
+	else
+		echo 'FAILURE';	
+	die;	
+}
+
+//Added on 09-11-2005 to avoid loading the webmail vtiger_files in Email process
+if($_REQUEST['smodule'] != '')
+{
+	define('SM_PATH','modules/squirrelmail-1.4.4/');
+	/* SquirrelMail required vtiger_files. */
+	require_once(SM_PATH . 'functions/strings.php');
+	require_once(SM_PATH . 'functions/imap_general.php');
+	require_once(SM_PATH . 'functions/imap_messages.php');
+	require_once(SM_PATH . 'functions/i18n.php');
+	require_once(SM_PATH . 'functions/mime.php');
+	require_once(SM_PATH .'include/load_prefs.php');
+	//require_once(SM_PATH . 'class/mime/Message.class.php');
+	require_once(SM_PATH . 'class/mime.class.php');
+	sqgetGlobalVar('key',       $key,           SQ_COOKIE);
+	sqgetGlobalVar('username',  $username,      SQ_SESSION);
+	sqgetGlobalVar('onetimepad',$onetimepad,    SQ_SESSION);
+	$mailbox = 'INBOX';
+}
+
+require_once('modules/Emails/Email.php');
+require_once('include/logging.php');
+require_once('include/database/PearDatabase.php');
+
+$local_log =& LoggerManager::getLogger('index');
+
+$focus = new Email();
+
+global $current_user;
+setObjectValuesFromRequest(&$focus);
+//Check if the file is exist or not.
+if($_FILES["filename"]["size"] == 0 && $_FILES["filename"]["name"] != '')
+{
+        $file_upload_error = true;
+        $_FILES = '';
+}
+if((isset($_REQUEST['deletebox']) && $_REQUEST['deletebox'] != null) && $_REQUEST['addbox'] == null)
+{
+	imap_delete($mbox,$_REQUEST['deletebox']);
+	imap_expunge($mbox);
+	header("Location: index.php?module=Emails&action=index");
+	exit();
+}
+/*if(isset($_REQUEST['fromemail']) && $_REQUEST['fromemail'] != null)
+{
+	//get the list of data from the comma separated array
+	$emailids = explode(",",$_REQUEST['fromemail']);
+	$subjects = explode(",",$_REQUEST['subject']);
+	$ids = explode(",",$_REQUEST['idlist']);
+	$total = count($ids);
+	for($z=0;$z<$total;$z++)
+	{
+		$msgData='';
+		global $current_user;
+		require_once('include/utils/UserInfoUtil.php');
+		$mailInfo = getMailServerInfo($current_user);
+		$temprow = $adb->fetch_array($mailInfo);
+
+		$secretkey=$temprow["mail_password"];
+		$imapServerAddress=$temprow["mail_servername"];
+		$imapPort="143";
+
+		$key = OneTimePadEncrypt($secretkey, $onetimepad);
+		$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
+		$mbx_response=sqimap_mailbox_select($imapConnection, $mailbox);
+
+		$message = sqimap_get_message($imapConnection, $ids[$z], $mailbox);
+		$header = $message->rfc822_header;
+		$ent_ar = $message->findDisplayEntity(array(), array('text/plain'));
+		$cnt = count($ent_ar);
+		global $color;
+		for ($u = 0; $u < $cnt; $u++)
+		{
+			$messagebody .= formatBody($imapConnection, $message, $color, $wrap_at, $ent_ar[$u], $ids[$z], $mailbox);
+			$msgData = $messagebody;
+		}
+
+			$ctctExists = checkIfContactExists($emailids[$z]);
+			if($ctctExists > 0)
+			{
+				$focus->column_fields['parent_id']=$ctctExists;
+			}
+			global $current_user;
+
+			$focus->column_fields['subject']=$subjects[$z];
+			$focus->column_fields["activitytype"]="Emails";
+			//this line has been added to get the related list data in the contact description
+			$focus->column_fields["assigned_user_id"]=$current_user->id;
+			$focus->column_fields["date_start"]=$_REQUEST['adddate'];
+			$focus->column_fields["time_start"]=$_REQUEST['adddate'];
+
+			$focus->column_fields["description"]=$msgData;
+			$focus->save("Emails");
+			$return_id = $focus->id;
+			$return_module='Emails';	
+			$return_action='DetailView';	
+	}
+	header("Location: index.php?action=$return_action&module=$return_module&parent_id=$parent_id&record=$return_id&filename=$filename");
+	return;
+}*/
+
+/**	Function to check whether the contact is exist of not
+ *	input  : contact id
+ *	return : contact id if contact exist, else -1 will be return
+ */
+function checkIfContactExists($mailid)
+{
+	global $log;
+	$log->debug("Entering checkIfContactExists(".$mailid.") method ...");
+	global $adb;
+	$sql = "select contactid from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_contactdetails.contactid where vtiger_crmentity.deleted=0 and email= ".$adb->quote($mailid);
+	$result = $adb->query($sql);
+	$numRows = $adb->num_rows($result);
+	if($numRows > 0)
+	{
+		$log->debug("Exiting checkIfContactExists method ...");
+		return $adb->query_result($result,0,"contactid");
+	}
+	else
+	{
+		$log->debug("Exiting checkIfContactExists method ...");
+		return -1;
+	}
+}
+//assign the focus values
+$focus->filename = $_REQUEST['file_name'];
+$focus->parent_id = $_REQUEST['parent_id'];
+$focus->parent_type = $_REQUEST['parent_type'];
+$focus->column_fields["assigned_user_id"]=$current_user->id;
+$focus->column_fields["activitytype"]="Emails";
+$focus->column_fields["date_start"]= date('Y-m-d');
+$focus->save("Emails");
+
+//saving the email details in vtiger_emaildetails vtiger_table
+$return_id = $focus->id;
+$email_id = $return_id;
+$query = 'select emailid from vtiger_emaildetails where emailid ='.$email_id;
+$result = $adb->query($query);
+if(isset($_REQUEST["hidden_toid"]) && $_REQUEST["hidden_toid"]!='')
+	$all_to_ids = ereg_replace(",","###",$_REQUEST["hidden_toid"]);
+if(isset($_REQUEST["saved_toid"]) && $_REQUEST["saved_toid"]!='')
+	$all_to_ids .= ereg_replace(",","###",$_REQUEST["saved_toid"]);
+	
+$all_cc_ids = ereg_replace(",","###",$_REQUEST["ccmail"]);
+$all_bcc_ids = ereg_replace(",","###",$_REQUEST["bccmail"]);
+if($adb->num_rows($result) > 0)
+{
+	$query = 'update vtiger_emaildetails set to_email="'.$all_to_ids.'",cc_email="'.$all_cc_ids.'",bcc_email="'.$all_bcc_ids.'",idlists="'.$_REQUEST["parent_id"].'",email_flag="SAVED" where emailid = '.$email_id;
+}else
+{
+	$query = 'insert into vtiger_emaildetails values ('.$email_id.',"","'.$all_to_ids.'","'.$all_cc_ids.'","'.$all_bcc_ids.'","","'.$_REQUEST["parent_id"].'","SAVED")';
+}
+$adb->query($query);
+
+
+$focus->retrieve_entity_info($return_id,"Emails");
+
+//this is to receive the data from the Select Users button
+if($_REQUEST['source_module'] == null)
+{
+	$module = 'users';
+}
+//this will be the case if the Select Contact button is chosen
+else
+{
+	$module = $_REQUEST['source_module'];
+}
+
+if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] != "") $return_module = $_REQUEST['return_module'];
+else $return_module = "Emails";
+if(isset($_REQUEST['return_action']) && $_REQUEST['return_action'] != "") $return_action = $_REQUEST['return_action'];
+else $return_action = "DetailView";
+if(isset($_REQUEST['return_id']) && $_REQUEST['return_id'] != "") $return_id = $_REQUEST['return_id'];
+if(isset($_REQUEST['filename']) && $_REQUEST['filename'] != "") $filename = $_REQUEST['filename'];
 
 $local_log->debug("Saved record with id of ".$return_id);
 



From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 00:38:54 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 07:38:54 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231203=3A?=
 =?utf-8?q?_no_message_even_if_outgoing_mailserver_is_not_configured?=
In-Reply-To: <076.4a4c3a13204da7c369ab711a0ee59827@vtiger.fosslabs.com>
References: <076.4a4c3a13204da7c369ab711a0ee59827@vtiger.fosslabs.com>
Message-ID: <085.429d82c5ca80579b7407bbda937ff3f4@vtiger.fosslabs.com>

#1203: no message even if outgoing mailserver is not configured
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  jeri  
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by anonymous):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1203>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 19 23:26:14 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 20 Jun 2006 06:26:14 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7280 -
	/vtigercrm/trunk/modules/Users/CreateSharingRule.php
Message-ID: <20060620062614.836CC83F1E6@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 20 00:26:10 2006
New Revision: 7280

Log:
Updated the layer as fixed - ahmed

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

Modified: vtigercrm/trunk/modules/Users/CreateSharingRule.php
==============================================================================
--- vtigercrm/trunk/modules/Users/CreateSharingRule.php (original)
+++ vtigercrm/trunk/modules/Users/CreateSharingRule.php Tue Jun 20 00:26:10 2006
@@ -244,11 +244,11 @@
 <input type="hidden" name="shareId" value="'.$shareid.'">
 <input type="hidden" name="mode" value="'.$mode.'">
 
-<div id="orgLay" style="display:block;">
+<div id="sharingRule" class="fixedLay">
 <table width="100%" border="0" cellpadding="3" cellspacing="0">
 <tr>
 <td class="genHeaderSmall" align="left" style="border-bottom:1px solid #CCCCCC;" width="60%">'.$sharing_module.' - Add Custom Privilege Rule</td>
-<td align="right" style="border-bottom:1px solid #CCCCCC;" width="40%"><a href="javascript:onClick=hide(\'orgLay\')";>Close</a></td>
+<td align="right" style="border-bottom:1px solid #CCCCCC;" width="40%"><a href="javascript:onClick=hide(\'sharingRule\')";>Close</a></td>
 
 </tr>
 <tr><td colspan="2">&nbsp;</td></tr>
@@ -318,7 +318,7 @@
 </tr>
 <tr>
 <td colspan="2" align="center">
-<input type="submit" class="small" name="add" value="Add Rule" onClick="return validate()">&nbsp;&nbsp;
+<input type="submit" class="crmButton small save" name="add" value="Add Rule" onClick="return validate()">&nbsp;&nbsp;
 </td>
 </tr>
 </table>



From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 02:06:26 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 09:06:26 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=23735=3A_?=
	=?utf-8?q?Rss_UI_Issue?=
In-Reply-To: <076.edb4f5ce57d779b8540628d713305768@vtiger.fosslabs.com>
References: <076.edb4f5ce57d779b8540628d713305768@vtiger.fosslabs.com>
Message-ID: <085.5acd534c274c716531d7ed81fc36e308@vtiger.fosslabs.com>

#735: Rss UI Issue
---------------------------+------------------------------------------------
  Reporter:  jerrydgeorge  |       Owner:  ela  
      Type:  defect        |      Status:  new  
  Priority:  major         |   Milestone:       
 Component:  vtigercrm     |     Version:  5.0.0
Resolution:                |    Keywords:  UI   
---------------------------+------------------------------------------------
Changes (by jerrydgeorge):

  * owner:  jeri => ela

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/735>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 02:07:08 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 09:07:08 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=23734=3A_?=
	=?utf-8?q?Issue_in_Rss_UI?=
In-Reply-To: <076.e1e137b6d1056e18ee101a85754a710a@vtiger.fosslabs.com>
References: <076.e1e137b6d1056e18ee101a85754a710a@vtiger.fosslabs.com>
Message-ID: <085.eacbdc48d3ec79b1642a38d13566b15b@vtiger.fosslabs.com>

#734: Issue in Rss UI
---------------------------+------------------------------------------------
  Reporter:  jerrydgeorge  |       Owner:  ela  
      Type:  defect        |      Status:  new  
  Priority:  major         |   Milestone:       
 Component:  vtigercrm     |     Version:  5.0.0
Resolution:                |    Keywords:  UI   
---------------------------+------------------------------------------------
Changes (by jerrydgeorge):

  * owner:  jerrydgeorge => ela

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/734>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 02:08:02 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 09:08:02 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231290=3A?=
	=?utf-8?q?_Company_Information?=
In-Reply-To: <076.d72bc388560618f95d42b1de2961a633@vtiger.fosslabs.com>
References: <076.d72bc388560618f95d42b1de2961a633@vtiger.fosslabs.com>
Message-ID: <085.2716477c226a09a7854e9562a77c8eb5@vtiger.fosslabs.com>

#1290: Company Information
------------------------+---------------------------------------------------
  Reporter:  daneswood  |       Owner:  jeri               
      Type:  defect     |      Status:  closed             
  Priority:  minor      |   Milestone:                     
 Component:  vtigercrm  |     Version:  5.0.0              
Resolution:  fixed      |    Keywords:  company information
------------------------+---------------------------------------------------
Changes (by jerrydgeorge):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1290>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 02:27:11 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 09:27:11 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231344=3A?=
	=?utf-8?q?_database_not_created?=
Message-ID: <076.c1df5e53995fbd31873387aa402b9381@vtiger.fosslabs.com>

#1344: database not created
-----------------------+----------------------------------------------------
 Reporter:  anonymous  |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  major      |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 i installed vtigercrm4_2_4
 I put it in my /var/www/crm.vtiger.com
 i created user called vtiger and gave it granted on database
 vtigercrm4_2_4
 i go through all th steps in the browser succusfully
 I found that the database hasn't been created i don't know why

 also i don't like that i can just make installation once from the browser
 then i can't do it again as now i have to remove the whole folder of
 vtiger and untar it again so that i can try installation one more time

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1344>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 20 02:27:54 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 20 Jun 2006 09:27:54 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7293 -
 /vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
Message-ID: <20060620092754.E63D283F183@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 20 03:27:50 2006
New Revision: 7293

Log:
Activities and Leads added under Marketing

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

Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original)
+++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Tue Jun 20 03:27:50 2006
@@ -2152,6 +2152,8 @@
 	$this->db->query("insert into vtiger_parenttabrel values (2,4,3)");
 	$this->db->query("insert into vtiger_parenttabrel values (2,10,4)");
 	$this->db->query("insert into vtiger_parenttabrel values (4,10,7)");
+	$this->db->query("insert into vtiger_parenttabrel values (2,7,5)");
+	$this->db->query("insert into vtiger_parenttabrel values (4,9,6)");
 
 	//Added to populate the default inventory tax informations
 	$this->db->query("insert into vtiger_inventorytaxinfo values(".$this->db->getUniqueID("inventorytaxinfo").",'VAT','4.5')");



From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 02:30:19 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 09:30:19 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23945=3A_?=
 =?utf-8?q?Marketing_-_Acccounts_link_may_not_require?=
In-Reply-To: <076.b7fed829ea74af680063f59f27e9abdb@vtiger.fosslabs.com>
References: <076.b7fed829ea74af680063f59f27e9abdb@vtiger.fosslabs.com>
Message-ID: <085.c7986b6ed46c749971e3f9c3aa838b4a@vtiger.fosslabs.com>

#945: Marketing - Acccounts link may not require
--------------------------+-------------------------------------------------
  Reporter:  gopal        |       Owner:  jerrydgeorge
      Type:  enhancement  |      Status:  closed      
  Priority:  major        |   Milestone:  5.0.0       
 Component:  vtigercrm    |     Version:  5.0.0       
Resolution:  fixed        |    Keywords:              
--------------------------+-------------------------------------------------
Changes (by jerrydgeorge):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/945>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 02:31:42 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 09:31:42 -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.183e79324282d30b7428b3e26199b44b@vtiger.fosslabs.com>

#285: Usability issue in picklist edit
------------------------+---------------------------------------------------
  Reporter:  don        |       Owner:  minnie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by jerrydgeorge):

  * owner:  jerrydgeorge => minnie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/285>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 02:33:32 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 09:33:32 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=23781=3A_?=
	=?utf-8?q?My_Preferences?=
In-Reply-To: <076.de29f722ccd714a4c6614d03a0a6957f@vtiger.fosslabs.com>
References: <076.de29f722ccd714a4c6614d03a0a6957f@vtiger.fosslabs.com>
Message-ID: <085.2639eeb6a801ae971553e07d08423230@vtiger.fosslabs.com>

#781: My Preferences
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  Richie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by jerrydgeorge):

  * owner:  jerrydgeorge => Richie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/781>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 20 02:43:28 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 20 Jun 2006 09:43:28 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7294 -
	/vtigercrm/trunk/modules/Reports/Reports.php
Message-ID: <20060620094328.90BA983F193@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 20 03:43:24 2006
New Revision: 7294

Log:
security file included

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

Modified: vtigercrm/trunk/modules/Reports/Reports.php
==============================================================================
--- vtigercrm/trunk/modules/Reports/Reports.php (original)
+++ vtigercrm/trunk/modules/Reports/Reports.php Tue Jun 20 03:43:24 2006
@@ -307,6 +307,8 @@
 
 		$tabid = getTabid($module);
 
+		
+		require('user_privileges/user_privileges_'.$current_user->id.'.php');
 		//Security Check 
 		if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] ==0)
 		{



From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 03:26:17 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 10:26:17 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231088=3A?=
 =?utf-8?q?_Issue_in_Custom_view=2C_Reports=2C_Dashboard_Security_Implemen?=
 =?utf-8?q?tation?=
In-Reply-To: <076.80fe4e3b3d04da48f15c540f9a0bd179@vtiger.fosslabs.com>
References: <076.80fe4e3b3d04da48f15c540f9a0bd179@vtiger.fosslabs.com>
Message-ID: <085.1349cf220c8ad49ac1b6ab302d9cbc9c@vtiger.fosslabs.com>

#1088: Issue in Custom view, Reports, Dashboard Security Implementation
------------------------+---------------------------------------------------
  Reporter:  don        |       Owner:  philip  
      Type:  defect     |      Status:  reopened
  Priority:  critical   |   Milestone:          
 Component:  vtigercrm  |     Version:  5.0.0   
Resolution:             |    Keywords:          
------------------------+---------------------------------------------------
Changes (by don):

  * resolution:  fixed =>
  * status:  closed => reopened

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1088>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 03:41:54 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 10:41:54 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231144=3A?=
 =?utf-8?q?_Ajax_Quick_Edit_Fields_Retains_value_in_the_text_box_even_if_w?=
 =?utf-8?q?e_cancel_it=2E?=
In-Reply-To: <076.d0b610be5ddd2e2c4150bff5f9d0ced7@vtiger.fosslabs.com>
References: <076.d0b610be5ddd2e2c4150bff5f9d0ced7@vtiger.fosslabs.com>
Message-ID: <085.a0cb94f1391f98aad4455b432678e853@vtiger.fosslabs.com>

#1144: Ajax Quick Edit Fields Retains value in the text box even if we cancel it.
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  Jeri           
      Type:  defect     |      Status:  closed         
  Priority:  critical   |   Milestone:                 
 Component:  vtigercrm  |     Version:  5.0.0          
Resolution:  fixed      |    Keywords:  Quick Edit Ajax
------------------------+---------------------------------------------------
Changes (by richie):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1144>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 03:42:17 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 10:42:17 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231144=3A?=
 =?utf-8?q?_Ajax_Quick_Edit_Fields_Retains_value_in_the_text_box_even_if_w?=
 =?utf-8?q?e_cancel_it=2E?=
In-Reply-To: <076.d0b610be5ddd2e2c4150bff5f9d0ced7@vtiger.fosslabs.com>
References: <076.d0b610be5ddd2e2c4150bff5f9d0ced7@vtiger.fosslabs.com>
Message-ID: <085.9f3fc34fffd92298d78ec72a1e8dbb26@vtiger.fosslabs.com>

#1144: Ajax Quick Edit Fields Retains value in the text box even if we cancel it.
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  Jeri           
      Type:  defect     |      Status:  reopened       
  Priority:  critical   |   Milestone:                 
 Component:  vtigercrm  |     Version:  5.0.0          
Resolution:             |    Keywords:  Quick Edit Ajax
------------------------+---------------------------------------------------
Changes (by richie):

  * resolution:  fixed =>
  * status:  closed => reopened

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1144>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 04:22:53 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 11:22:53 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231293=3A?=
 =?utf-8?q?_Select_Products_missing_from_Activities_in_5=2E0?=
In-Reply-To: <076.0fa458c2ddcf4a4ee4262524258defbd@vtiger.fosslabs.com>
References: <076.0fa458c2ddcf4a4ee4262524258defbd@vtiger.fosslabs.com>
Message-ID: <085.e52ad900d1379daf681bded178d0e1e5@vtiger.fosslabs.com>

#1293: Select Products missing from Activities in 5.0
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  minnie
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  wontfix    |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mangai):

  * resolution:  => wontfix
  * status:  new => closed

Comment:

 If we relate a product with an activity, then the activity is specific to
 that product.
 So this relation will not be integrated.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1293>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 05:27:27 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 12:27:27 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23223=3A_?=
 =?utf-8?q?Issue_Entering_ticker_symbol?=
In-Reply-To: <076.77f0327f73033d13477d5b03eb082e2c@vtiger.fosslabs.com>
References: <076.77f0327f73033d13477d5b03eb082e2c@vtiger.fosslabs.com>
Message-ID: <085.6705236b56d375f88520683d747a2ccd@vtiger.fosslabs.com>

#223: Issue Entering ticker symbol
---------------------------+------------------------------------------------
  Reporter:  jerrydgeorge  |       Owner:  mangai       
      Type:  enhancement   |      Status:  new          
  Priority:  major         |   Milestone:               
 Component:  vtigercrm     |     Version:  5.0.0        
Resolution:                |    Keywords:  ticker symbol
---------------------------+------------------------------------------------
Changes (by mangai):

  * type:  defect => enhancement

Comment:

 This will be handled in proxy server settings.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/223>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 20 05:32:48 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 20 Jun 2006 12:32:48 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7295 -
 /vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
Message-ID: <20060620123248.54FF583F058@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 20 06:32:30 2006
New Revision: 7295

Log:
added proper default roles

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

Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original)
+++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Tue Jun 20 06:32:30 2006
@@ -31,6 +31,8 @@
 		$role1_id = $this->db->getUniqueID("role");
 		$role2_id = $this->db->getUniqueID("role");
 		$role3_id = $this->db->getUniqueID("role");
+		$role4_id = $this->db->getUniqueID("role");
+		$role5_id = $this->db->getUniqueID("role");
 
 		$profile1_id = $this->db->getUniqueID("profile");
 		$profile2_id = $this->db->getUniqueID("profile");
@@ -38,8 +40,10 @@
 		$profile4_id = $this->db->getUniqueID("profile");
 
                 $this->db->query("insert into vtiger_role values('H".$role1_id."','Organisation','H".$role1_id."',0)");
-                $this->db->query("insert into vtiger_role values('H".$role2_id."','administrator','H".$role1_id."::H".$role2_id."',1)");
-                $this->db->query("insert into vtiger_role values('H".$role3_id."','standard_user','H".$role1_id."::H".$role2_id."::H".$role3_id."',2)");
+                $this->db->query("insert into vtiger_role values('H".$role2_id."','CEO','H".$role1_id."::H".$role2_id."',1)");
+                $this->db->query("insert into vtiger_role values('H".$role3_id."','Vice President','H".$role1_id."::H".$role2_id."::H".$role3_id."',2)");
+                $this->db->query("insert into vtiger_role values('H".$role4_id."','Sales Manager','H".$role1_id."::H".$role2_id."::H".$role3_id."::H".$role4_id."',3)");
+                $this->db->query("insert into vtiger_role values('H".$role5_id."','Sales Man','H".$role1_id."::H".$role2_id."::H".$role3_id."::H".$role4_id."::H".$role5_id."',4)");
                 
 
  $this->db->query("INSERT INTO vtiger_tab VALUES (3,'Home',0,1,'Home',null,null,1)");



From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 05:42:02 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 12:42:02 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231296=3A?=
 =?utf-8?q?_Sort_order_hide_the_related_datas?=
In-Reply-To: <076.89346f6520426628c32e65be31646f8e@vtiger.fosslabs.com>
References: <076.89346f6520426628c32e65be31646f8e@vtiger.fosslabs.com>
Message-ID: <085.360e691bd16ab80dc371bfed9f3d3abb@vtiger.fosslabs.com>

#1296: Sort order hide the related datas
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  philip                      
      Type:  defect     |      Status:  closed                      
  Priority:  critical   |   Milestone:                              
 Component:  vtigercrm  |     Version:  5.0.0                       
Resolution:  fixed      |    Keywords:  related, data, sorder, order
------------------------+---------------------------------------------------
Changes (by saraj):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 (In [7296]) data disappears while sorting - issue fixed. Fixes #1296, and
 refs #1296

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1296>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 20 05:42:03 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 20 Jun 2006 12:42:03 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7296 -
	/vtigercrm/trunk/include/RelatedListView.php
Message-ID: <20060620124203.40F5C83F290@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 20 06:41:55 2006
New Revision: 7296

Log:
data disappears while sorting - issue fixed. Fixes #1296, and refs #1296

Modified:
    vtigercrm/trunk/include/RelatedListView.php

Modified: vtigercrm/trunk/include/RelatedListView.php
==============================================================================
--- vtigercrm/trunk/include/RelatedListView.php (original)
+++ vtigercrm/trunk/include/RelatedListView.php Tue Jun 20 06:41:55 2006
@@ -129,8 +129,8 @@
 	//Retreiving the no of rows
 	$noofrows = $adb->num_rows($list_result);
 	
-	//Storing Listview session object
-	if(isset($_REQUEST['relmodule']) && $_REQUEST['relmodule']!='')
+	//Setting Listview session object while sorting/pagination
+	if(isset($_REQUEST['relmodule']) && $_REQUEST['relmodule']!='' && $_REQUEST['relmodule'] == $relatedmodule)
 	{
 		$relmodule = $_REQUEST['relmodule'];
 		if($_SESSION['rlvs'][$module][$relmodule])



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 20 05:43:17 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 20 Jun 2006 12:43:17 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7297 -
	/vtigercrm/trunk/install/5createTables.inc.php
Message-ID: <20060620124318.19F3C83F293@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 20 06:43:04 2006
New Revision: 7297

Log:
populated valid roles

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 Tue Jun 20 06:43:04 2006
@@ -92,7 +92,7 @@
 	$admin_email ="admin at administrator.com";
         $user->column_fields["email"] = $admin_email;
 	//to get the role id for standard_user	
-	$role_query = "select roleid from vtiger_role where rolename='administrator'";
+	$role_query = "select roleid from vtiger_role where rolename='CEO'";
 	$db->database->SetFetchMode(ADODB_FETCH_ASSOC);
 	$role_result = $db->query($role_query);
 	$role_id = $db->query_result($role_result,0,"roleid");
@@ -134,7 +134,7 @@
 	$std_email ="standarduser at standarduser.com";
         $user->column_fields["email"] = $std_email;
 	//to get the role id for standard_user	
-	$role_query = "select roleid from vtiger_role where rolename='standard_user'";
+	$role_query = "select roleid from vtiger_role where rolename='Vice President'";
 	$db->database->SetFetchMode(ADODB_FETCH_ASSOC);
 	$role_result = $db->query($role_query);
 	$role_id = $db->query_result($role_result,0,"roleid");



From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 05:48:55 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 12:48:55 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231157=3A?=
 =?utf-8?q?_Wrong_display_of_Roles_in_Roles_Home?=
In-Reply-To: <076.0042ce49f00228b56312a0bfc5ea57d9@vtiger.fosslabs.com>
References: <076.0042ce49f00228b56312a0bfc5ea57d9@vtiger.fosslabs.com>
Message-ID: <085.20a7ca8fcf31c0ed620ff43556e56590@vtiger.fosslabs.com>

#1157: Wrong display of Roles in Roles Home
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  don   
      Type:  defect     |      Status:  closed
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by don):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1157>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 20 06:03:00 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 20 Jun 2006 13:03:00 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7298 -
	/vtigercrm/trunk/Popup.php
Message-ID: <20060620130300.C302183F2A0@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 20 07:02:55 2006
New Revision: 7298

Log:
changes made to have multiselect checkbox in users popup

Modified:
    vtigercrm/trunk/Popup.php

Modified: vtigercrm/trunk/Popup.php
==============================================================================
--- vtigercrm/trunk/Popup.php (original)
+++ vtigercrm/trunk/Popup.php Tue Jun 20 07:02:55 2006
@@ -22,10 +22,8 @@
 require_once('include/utils/utils.php');
 
 global $app_strings;
-global $current_language;
 global $currentModule;
 global $theme;
-$current_module_strings = return_module_language($current_language,$currentModule);
 $url_string = '';
 $smarty = new vtigerCRM_Smarty;
 if (!isset($where)) $where = "";
@@ -182,6 +180,7 @@
                 if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] !='')
                     $smarty->assign("RETURN_MODULE",$_REQUEST['return_module']);
                 $alphabetical = AlphabeticalSearch($currentModule,'Popup','user_name','true','basic',$popuptype,"","","");
+		if (isset($_REQUEST['select'])) $smarty->assign("SELECT",'enable');
                 break;	
 
 



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 20 06:08:06 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 20 Jun 2006 13:08:06 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7299 -
 /vtigercrm/trunk/modules/Activities/updateRelations.php
Message-ID: <20060620130806.A9BE883F2A0@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 20 07:08:02 2006
New Revision: 7299

Log:
changes made to have multiselect checkbox in users popup

Modified:
    vtigercrm/trunk/modules/Activities/updateRelations.php

Modified: vtigercrm/trunk/modules/Activities/updateRelations.php
==============================================================================
--- vtigercrm/trunk/modules/Activities/updateRelations.php (original)
+++ vtigercrm/trunk/modules/Activities/updateRelations.php Tue Jun 20 07:08:02 2006
@@ -13,7 +13,7 @@
 global $adb;
 $idlist = $_REQUEST['idlist'];
 
-if(isset($_REQUEST['idlist']) && $_REQUEST['idlist'] != '')
+if(isset($_REQUEST['idlist']) && $_REQUEST['idlist'] != '' && $_REQUEST['destination_module'] == 'Contacts')
 {
 	//split the string and store in an array
 	$storearray = explode (";",$idlist);
@@ -40,14 +40,29 @@
 
 
  
-//This if for adding the vtiger_users 
-if(isset($_REQUEST['user_id']) && $_REQUEST['user_id'] != '')
+//This if for adding the vtiger_users
+if(isset($_REQUEST['idlist']) && $_REQUEST['idlist'] != '' && $_REQUEST['destination_module'] == 'Users')
+{
+	//split the string and store in an array
+	$storearray = explode (";",$idlist);
+	foreach($storearray as $id)
+	{
+		if($id != '')
+		{
+			$record = $_REQUEST['parentid'];
+			$sql = "insert into vtiger_salesmanactivityrel values (".$id.",".$_REQUEST["parentid"].")";
+			$adb->query($sql);
+		}
+	}
+	header("Location: index.php?action=CallRelatedList&module=Activities&activity_mode=Events&record=".$record);
+}
+elseif(isset($_REQUEST['user_id']) && $_REQUEST['user_id'] != '')
 {
 	$record = $_REQUEST['record'];
 	$sql = "insert into vtiger_salesmanactivityrel values (". $_REQUEST["user_id"] .",".$_REQUEST["record"] .")";
 	$adb->query($sql);
 	header("Location: index.php?action=CallRelatedList&module=Activities&activity_mode=Events&record=".$record);
-
+	
 }
 
 



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 20 06:18:57 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 20 Jun 2006 13:18:57 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7300 -
	/vtigercrm/trunk/modules/Activities/Activity.php
Message-ID: <20060620131857.8A31C83F297@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 20 07:18:54 2006
New Revision: 7300

Log:
vtiger_ updended in activity owner query

Modified:
    vtigercrm/trunk/modules/Activities/Activity.php

Modified: vtigercrm/trunk/modules/Activities/Activity.php
==============================================================================
--- vtigercrm/trunk/modules/Activities/Activity.php (original)
+++ vtigercrm/trunk/modules/Activities/Activity.php Tue Jun 20 07:18:54 2006
@@ -154,7 +154,7 @@
 			$returnset = '&return_module=Activities&return_action=DetailView&activity_mode=Events&return_id='.$id;
 
 
-			$query = 'select vtiger_users.user_name,vtiger_contactdetails.accountid, vtiger_contactdetails.contactid, vtiger_contactdetails.firstname,vtiger_contactdetails.lastname, vtiger_contactdetails.department, vtiger_contactdetails.title, vtiger_contactdetails.email, vtiger_contactdetails.phone, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_contactdetails inner join vtiger_seactivityrel on vtiger_seactivityrel.crmid=vtiger_contactdetails.contactid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid left join vtiger_users on vtiger_users.id = vtiger_crmentity.smownerid where vtiger_seactivityrel.activityid='.$id.' and vtiger_crmentity.deleted=0';
+			$query = 'select vtiger_users.user_name,vtiger_contactdetails.accountid,vtiger_contactdetails.contactid, vtiger_contactdetails.firstname,vtiger_contactdetails.lastname, vtiger_contactdetails.department, vtiger_contactdetails.title, vtiger_contactdetails.email, vtiger_contactdetails.phone, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_contactdetails inner join vtiger_seactivityrel on vtiger_seactivityrel.crmid=vtiger_contactdetails.contactid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid left join vtiger_users on vtiger_users.id = vtiger_crmentity.smownerid where vtiger_seactivityrel.activityid='.$id.' and vtiger_crmentity.deleted=0';
 			$log->debug("Exiting get_contacts method ...");
 			return GetRelatedList('Activities','Contacts',$focus,$query,$button,$returnset);
         }
@@ -236,7 +236,7 @@
 				$activity_start_time=time_to_number($act_time_start);	
 				$activity_end_time=get_duration($act_time_start,$act_hour_dur,$act_mins_dur);	
 
-				$activity_owner_qry='select vtiger_users.user_name,vtiger_users.id AS userid from vtiger_users,crmentity where vtiger_users.id=vtiger_crmentity.smownerid and vtiger_crmentity.crmid='.$id;
+				$activity_owner_qry='select vtiger_users.user_name,vtiger_users.id AS userid from vtiger_users,vtiger_crmentity where vtiger_users.id=vtiger_crmentity.smownerid and vtiger_crmentity.crmid='.$id;
 				$result_owner=$adb->query($activity_owner_qry);
 
 				while($row_owner = $adb->fetch_array($result_owner))



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 20 06:53:55 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 20 Jun 2006 13:53:55 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7301 -
 /vtigercrm/trunk/Smarty/templates/RelatedListContents.tpl
Message-ID: <20060620135355.6C98883F2AC@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 20 07:53:51 2006
New Revision: 7301

Log:
related list buttons moved to RelatedListContents.tpl as it is creating problem while ajaxedit

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

Modified: vtigercrm/trunk/Smarty/templates/RelatedListContents.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/RelatedListContents.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/RelatedListContents.tpl Tue Jun 20 07:53:51 2006
@@ -12,6 +12,91 @@
 
 -->*}
 {foreach key=header item=detail from=$RELATEDLISTS}
+<table border=0 cellspacing=0 cellpadding=0 width=100% class="small" style="border-bottom:1px solid #999999;padding:5px;">
+        <tr>
+                <td  valign=bottom><b>{$APP.$header}</b></td>
+                {if $detail ne ''}
+                <td align=center>{$detail.navigation.0}</td>
+                {$detail.navigation.1}
+                {/if}
+                <td align=right>
+			{if $header eq 'Potentials'}
+                                <input title="{$APP.LBL_ADD_NEW} {$APP.Potential}" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='Potentials'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Potential}">
+                </td>
+                        {elseif $header eq 'PriceBooks'}
+                                {if $MODULE eq 'Products'}
+                                <input title="{$APP.LBL_ADD_TO} {$APP.PriceBook}" accessKey="" class="small" value="{$APP.LBL_ADD_TO} {$APP.PriceBook}" LANGUAGE=javascript onclick="this.form.action.value='AddProductToPriceBooks';this.form.module.value='Products'"  type="submit" name="button">
+                                {/if}
+                        {elseif $header eq 'Products'}
+                                {if $MODULE eq 'PriceBooks'}
+                                <input title="{$APP.LBL_SELECT_PRODUCT_BUTTON_LABEL}" accessKey="" class="small" value="{$APP.LBL_SELECT_PRODUCT_BUTTON_LABEL}" LANGUAGE=javascript onclick="this.form.action.value='AddProductsToPriceBook';this.form.module.value='Products';this.form.return_module.value='Products';this.form.return_action.value='PriceBookDetailView'"  type="submit" name="button"></td>
+                                {else}
+				<input title="{$APP.LBL_ADD_NEW} {$APP.Product}" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='Products';this.form.return_module.value='{$MODULE}';this.form.return_action.value='CallRelatedList'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Product}"></td>
+				{/if}
+			{elseif $header eq 'Leads'}
+				{if $MODULE eq 'Campaigns'}
+				<input title="Change" accessKey="" class="small" value="{$APP.LBL_SELECT_BUTTON_LABEL} {$APP.Lead}" LANGUAGE=javascript onclick='return window.open("index.php?module=Leads&return_module={$MODULE}&action=Popup&popuptype=detailview&select=enable&form=EditView&form_submit=false&recordid={$ID}","test","width=640,height=570,resizable=0,scrollbars=0");' type="button"  name="button">
+				{/if}
+				<input title="{$APP.LBL_ADD_NEW} {$APP.Lead}" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='Leads'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Lead}"></td>
+			{elseif $header eq 'Contacts' }
+				{if $MODULE eq 'Activities' || $MODULE eq 'Potentials' || $MODULE eq 'Vendors'}
+				<input title="Change" accessKey="" class="small" value="{$APP.LBL_SELECT_BUTTON_LABEL} {$APP.Contact}" LANGUAGE=javascript onclick='return window.open("index.php?module=Contacts&return_module={$MODULE}&action=Popup&popuptype=detailview&select=enable&form=EditView&form_submit=false&recordid={$ID}","test","width=640,height=570,resizable=0,scrollbars=0");' type="button"  name="button"></td>
+				{elseif $MODULE eq 'Emails'}
+				<input title="{$APP.LBL_BULK_MAILS}" accessykey="F" class="small" onclick="this.form.action.value='sendmail';this.form.return_action.value='DetailView';this.form.module.value='Emails';this.form.return_module.value='Emails';" name="button" value="{$APP.LBL_BULK_MAILS}" type="submit">&nbsp;
+				<input title="Change" accessKey="" class="small" value="{$APP.LBL_SELECT_BUTTON_LABEL} {$APP.Contact}" LANGUAGE=javascript onclick='return window.open("index.php?module=Contacts&return_module=Emails&action=Popup&popuptype=detailview&form=EditView&form_submit=false&recordid={$ID}","test","width=640,height=570,resizable=0,scrollbars=0");' type="button"  name="button"></td>
+				{elseif $MODULE eq 'Campaigns'}
+				<input title="Change" accessKey="" class="small" value="{$APP.LBL_SELECT_BUTTON_LABEL} {$APP.Contact}" LANGUAGE=javascript onclick='return window.open("index.php?module=Contacts&return_module={$MODULE}&action=Popup&popuptype=detailview&select=enable&form=EditView&form_submit=false&recordid={$ID}","test","width=640,height=570,resizable=0,scrollbars=0");' type="button"  name="button">
+				<input title="{$APP.LBL_ADD_NEW} {$APP.Contact}" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='Contacts'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Contact}"></td>
+				{else}
+				<input title="{$APP.LBL_ADD_NEW} {$APP.Contact}" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='Contacts'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Contact}"></td>
+				{/if}
+			{elseif $header eq 'Activities'}
+				{if $MODULE eq 'PurchaseOrder' || $MODULE eq 'Invoice' || $MODULE eq 'SalesOrder' || $MODULE eq 'Quotes' || $MODULE eq 'Campaigns'}
+				<input type="hidden" name="activity_mode">
+				<input title="{$APP.LBL_ADD_NEW} {$APP.Task}" accessyKey="F" class="small" onclick="this.form.action.value='EditView'; this.form.return_action.value='CallRelatedList'; this.form.module.value='Activities'; this.form.return_module.value='{$MODULE}'; this.form.activity_mode.value='Task'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Task}"></td>
+				{else}
+				<input type="hidden" name="activity_mode">
+				<input title="{$APP.LBL_ADD_NEW} {$APP.Task}" accessyKey="F" class="small" onclick="this.form.action.value='EditView'; this.form.return_action.value='CallRelatedList'; this.form.module.value='Activities'; this.form.return_module.value='{$MODULE}'; this.form.activity_mode.value='Task'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Task}">&nbsp;
+				<input title="{$APP.LBL_ADD_NEW} {$APP.Event}" accessyKey="F" class="small" onclick="this.form.action.value='EditView'; this.form.return_action.value='CallRelatedList'; this.form.module.value='Activities'; this.form.return_module.value='{$MODULE}'; this.form.activity_mode.value='Events'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Event}"></td>
+				{/if}
+			{elseif $header eq 'HelpDesk'}
+				<input title="{$APP.LBL_ADD_NEW} {$APP.Ticket}" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='HelpDesk'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Ticket}"></td>
+			{elseif $header eq 'Attachments'}
+				<input title="{$APP.LBL_ADD_NEW} {$APP.Note}" accessyKey="F" class="small" onclick="this.form.action.value='EditView'; this.form.return_action.value='CallRelatedList'; this.form.module.value='Notes'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Note}">&nbsp;
+				<input type="hidden" name="fileid">
+				<input title="{$APP.LBL_ADD_NEW} {$APP.LBL_ATTACHMENT}" accessyKey="F" class="small" onclick="OpenWindow('index.php?module=uploads&action=uploadsAjax&file=upload&return_action=CallRelatedList&return_module={$MODULE}&return_id={$id}');" type="button" name="button" value="{$APP.LBL_ADD_NEW} {$APP.LBL_ATTACHMENT}"></td>
+			{elseif $header eq 'Quotes'}
+				<input title="{$APP.LBL_ADD_NEW} {$APP.Quote}" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='Quotes'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Quote}"></td>
+			{elseif $header eq 'Invoice'}
+				{if $MODULE eq 'SalesOrder'}
+				<input type="hidden">
+				{else}
+				<input title="{$APP.LBL_ADD_NEW} {$APP.Invoice}" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='Invoice'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Invoice}"></td>
+				{/if}
+			{elseif $header eq 'Sales Order'}
+				{if $MODULE eq 'Quotes'}
+				<input type="hidden">
+				{else}
+				<input title="{$APP.LBL_ADD_NEW} {$APP.SalesOrder}" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='SalesOrder'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.SalesOrder}"></td>
+				{/if}
+			{elseif $header eq 'Purchase Order'}
+                                <input title="{$APP.LBL_ADD_NEW} {$APP.PurchaseOrder}" accessyKey="O" class="small" onclick="this.form.action.value='EditView'; this.form.module.value='PurchaseOrder'; this.form.return_module.value='{$MODULE}'; this.form.return_action.value='CallRelatedList'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.PurchaseOrder}"></td>
+                        {elseif $header eq 'Emails'}
+                                <input type="hidden" name="email_directing_module">
+                                <input type="hidden" name="record">
+                                <input title="{$APP.LBL_ADD_NEW} {$APP.Email}" accessyKey="F" class="small" onclick="fnvshobj(this,'sendmail_cont');sendmail('{$MODULE}',{$id});" type="button" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Email}"></td>
+			{elseif $header eq 'Users'}
+                                {if $MODULE eq 'Activities'}
+                                <input title="Change" accessKey="" tabindex="2" type="button" class="small" value="{$APP.LBL_SELECT_USER_BUTTON_LABEL}" name="button" LANGUAGE=javascript onclick='return window.open("index.php?module=Users&return_module=Activities&return_action=CallRelatedList&activity_mode=Events&action=Popup&popuptype=detailview&form=EditView&form_submit=true&select=enable&return_id={$id}&recordid={$ID}","test","width=640,height=525,resizable=0,scrollbars=0")';>
+                                {elseif $MODULE eq 'Emails'}
+                                <input title="{$APP.LBL_BULK_MAILS}" accessykey="F" class="small" onclick="this.form.action.value='sendmail';this.form.return_action.value='DetailView';this.form.module.value='Emails';this.form.return_module.value='Emails';" name="button" value="{$APP.LBL_BULK_MAILS}" type="submit">&nbsp;
+                                <input title="Change" accesskey="" tabindex="2" class="small" value="{$APP.LBL_SELECT_USER_BUTTON_LABEL}" name="Button" language="javascript" onclick='return window.open("index.php?module=Users&return_module=Emails&action=Popup&popuptype=detailview&select=enable&form=EditView&form_submit=true&return_id={$id}&recordid={$ID}","test","width=640,height=520,resizable=0,scrollbars=0");' type="button">&nbsp;</td>
+                                {/if}
+                        {elseif $header eq 'Activity History'}
+                                &nbsp;</td>
+                        {/if}
+        </tr>
+</table>
 {if $detail ne ''}
 	{foreach key=header item=detail from=$detail}
 		{if $header eq 'header'}
@@ -39,4 +124,5 @@
 		</tr>
 	</table>
 {/if}
+<br><br>
 {/foreach}



From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 06:58:34 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 13:58:34 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231080=3A?=
 =?utf-8?q?_Validation_to_be_done_for_installation_process?=
In-Reply-To: <076.3dd5e04163cef1f4be9c24ebc8011fad@vtiger.fosslabs.com>
References: <076.3dd5e04163cef1f4be9c24ebc8011fad@vtiger.fosslabs.com>
Message-ID: <085.115783aea885d9ed0df4d7de94d3f4a9@vtiger.fosslabs.com>

#1080: Validation to be done for installation process
---------------------------+------------------------------------------------
  Reporter:  jerrydgeorge  |       Owner:  Jerry 
      Type:  defect        |      Status:  closed
  Priority:  major         |   Milestone:        
 Component:  vtigercrm     |     Version:  5.0.0 
Resolution:  wontfix       |    Keywords:        
---------------------------+------------------------------------------------
Changes (by anonymous):

  * resolution:  => wontfix
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1080>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 20 07:05:34 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 20 Jun 2006 14:05:34 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7302 -
	/vtigercrm/trunk/Smarty/templates/RelatedLists.tpl
Message-ID: <20060620140534.523EA83F2B5@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 20 08:05:30 2006
New Revision: 7302

Log:
related list buttons moved to RelatedListContents.tpl as it is creating problem while ajaxedit

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

Modified: vtigercrm/trunk/Smarty/templates/RelatedLists.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/RelatedLists.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/RelatedLists.tpl Tue Jun 20 08:05:30 2006
@@ -61,175 +61,67 @@
 		<div class="small" style="padding:20px">
 		
 		
-		 <span class="lvtHeaderText"><font color="purple">[ {$ID} ] </font>{$NAME} -  {$SINGLE_MOD} {$APP.LBL_MORE} {$APP.LBL_INFORMATION}</span> <br>
-		 {$UPDATEINFO}
-		 <hr noshade size=1>
-		 <br> 
+			 <span class="lvtHeaderText"><font color="purple">[ {$ID} ] </font>{$NAME} -  {$SINGLE_MOD} {$APP.LBL_MORE} {$APP.LBL_INFORMATION}</span> <br>
+			 {$UPDATEINFO}
+			 <hr noshade size=1>
+			 <br> 
 		
-		<!-- Account details tabs -->
-		<table border=0 cellspacing=0 cellpadding=0 width=95% align=center>
-		<tr>
-			<td>
-				<table border=0 cellspacing=0 cellpadding=3 width=100% class="small">
-				<tr>
-					{if $OP_MODE eq 'edit_view'}
-                                                {assign var="action" value="EditView"}
-                                        {else}
-                                                {assign var="action" value="DetailView"}
-                                        {/if}
-					<td class="dvtTabCache" style="width:10px" nowrap>&nbsp;</td>
-					{if $MODULE eq 'Activities'}
-                                                <td class="dvtUnSelectedCell" align=center nowrap><a href="index.php?action={$action}&module={$MODULE}&record={$ID}&activity_mode={$ACTIVITY_MODE}&parenttab={$CATEGORY}">{$SINGLE_MOD} {$APP.LBL_INFORMATION}</a></td>
-                                        {else}
-                                        <td class="dvtUnSelectedCell" align=center nowrap><a href="index.php?action={$action}&module={$MODULE}&record={$ID}&parenttab={$CATEGORY}">{$SINGLE_MOD} {$APP.LBL_INFORMATION}</a></td>
-                                        {/if}
-					<td class="dvtTabCache" style="width:10px">&nbsp;</td>
-					<td class="dvtSelectedCell" align=center nowrap>{$APP.LBL_MORE} {$APP.LBL_INFORMATION}</td>
-					<td class="dvtTabCache" style="width:100%">&nbsp;</td>
-				</tr>
-				</table>
-			</td>
-		</tr>
-		<tr>
-			<td valign=top align=left >
-                           <table border=0 cellspacing=0 cellpadding=3 width=100% class="dvtContentSpace">
-				<tr>
-
-					<td align=left>
-					<!-- content cache -->
-					
-					<table border=0 cellspacing=0 cellpadding=0 width=100%>
-			                <tr>
-					<td style="padding:10px">
-					   <!-- General details -->
-				        <table border=0 cellspacing=0 cellpadding=0 width=100%>
-
-					{include file='RelatedListsHidden.tpl'}
-
-					  {foreach key=header item=detail from=$RELATEDLISTS}
-						<table border=0 cellspacing=0 cellpadding=0 width=100% class="small" style="border-bottom:1px solid #999999;padding:5px;">
-							<tr>
-							<td  valign=bottom><b>{$APP.$header}</b></td>
-							{if $detail ne ''}
-							<td align=center>{$detail.navigation.0}</td>
-							{$detail.navigation.1}
-							{/if}
-							<td align=right>
-							{if $header eq 'Potentials'}
-						
-							<input title="{$APP.LBL_ADD_NEW} {$APP.Potential}" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='Potentials'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Potential}"></td>
-							{elseif $header eq 'PriceBooks'}
-							{if $MODULE eq 'Products'}
-							<input title="{$APP.LBL_ADD_TO} {$APP.PriceBook}" accessKey="" class="small" value="{$APP.LBL_ADD_TO} {$APP.PriceBook}" LANGUAGE=javascript onclick="this.form.action.value='AddProductToPriceBooks';this.form.module.value='Products'"  type="submit" name="button">
-							{/if}
-							
-							{elseif $header eq 'Products'}
-							{if $MODULE eq 'PriceBooks'}
-							<input title="{$APP.LBL_SELECT_PRODUCT_BUTTON_LABEL}" accessKey="" class="small" value="{$APP.LBL_SELECT_PRODUCT_BUTTON_LABEL}" LANGUAGE=javascript onclick="this.form.action.value='AddProductsToPriceBook';this.form.module.value='Products';this.form.return_module.value='Products';this.form.return_action.value='PriceBookDetailView'"  type="submit" name="button"></td>
-
-							{else}
-							<input title="{$APP.LBL_ADD_NEW} {$APP.Product}" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='Products';this.form.return_module.value='{$MODULE}';this.form.return_action.value='CallRelatedList'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Product}"></td>				
-							{/if}	
-							{elseif $header eq 'Leads'}
-							{if $MODULE eq 'Campaigns'}
-                                                        <input title="Change" accessKey="" class="small" value="{$APP.LBL_SELECT_BUTTON_LABEL} {$APP.Lead}" LANGUAGE=javascript onclick='return window.open("index.php?module=Leads&return_module={$MODULE}&action=Popup&popuptype=detailview&select=enable&form=EditView&form_submit=false&recordid={$ID}","test","width=640,height=570,resizable=0,scrollbars=0");' type="button"  name="button">
-                                                        {/if}
-                                                        <input title="{$APP.LBL_ADD_NEW} {$APP.Lead}" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='Leads'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Lead}"></td>
-							{elseif $header eq 'Contacts' }
-							{if $MODULE eq 'Activities' || $MODULE eq 'Potentials' || $MODULE eq 'Vendors'}
-                                                        <input title="Change" accessKey="" class="small" value="{$APP.LBL_SELECT_BUTTON_LABEL} {$APP.Contact}" LANGUAGE=javascript onclick='return window.open("index.php?module=Contacts&return_module={$MODULE}&action=Popup&popuptype=detailview&select=enable&form=EditView&form_submit=false&recordid={$ID}","test","width=640,height=570,resizable=0,scrollbars=0");' type="button"  name="button"></td>
-							{elseif $MODULE eq 'Emails'}
-							<input title="{$APP.LBL_BULK_MAILS}" accessykey="F" class="small" onclick="this.form.action.value='sendmail';this.form.return_action.value='DetailView';this.form.module.value='Emails';this.form.return_module.value='Emails';" name="button" value="{$APP.LBL_BULK_MAILS}" type="submit">&nbsp;
-                                                        <input title="Change" accessKey="" class="small" value="{$APP.LBL_SELECT_BUTTON_LABEL} {$APP.Contact}" LANGUAGE=javascript onclick='return window.open("index.php?module=Contacts&return_module=Emails&action=Popup&popuptype=detailview&form=EditView&form_submit=false&recordid={$ID}","test","width=640,height=570,resizable=0,scrollbars=0");' type="button"  name="button"></td>
-							{elseif $MODULE eq 'Campaigns'}
-                                                        <input title="Change" accessKey="" class="small" value="{$APP.LBL_SELECT_BUTTON_LABEL} {$APP.Contact}" LANGUAGE=javascript onclick='return window.open("index.php?module=Contacts&return_module={$MODULE}&action=Popup&popuptype=detailview&select=enable&form=EditView&form_submit=false&recordid={$ID}","test","width=640,height=570,resizable=0,scrollbars=0");' type="button"  name="button">
-                                                        <input title="{$APP.LBL_ADD_NEW} {$APP.Contact}" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='Contacts'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Contact}"></td>
-							{else}
-                                                        <input title="{$APP.LBL_ADD_NEW} {$APP.Contact}" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='Contacts'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Contact}"></td>
-                                                        {/if}
-
-							{elseif $header eq 'Activities'}
-							{if $MODULE eq 'PurchaseOrder' || $MODULE eq 'Invoice' || $MODULE eq 'SalesOrder' || $MODULE eq 'Quotes' || $MODULE eq 'Campaigns'}	
-							<input type="hidden" name="activity_mode">
-							<input title="{$APP.LBL_ADD_NEW} {$APP.Task}" accessyKey="F" class="small" onclick="this.form.action.value='EditView'; this.form.return_action.value='CallRelatedList'; this.form.module.value='Activities'; this.form.return_module.value='{$MODULE}'; this.form.activity_mode.value='Task'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Task}"></td>
-							{else}
-							<input type="hidden" name="activity_mode">
-							<input title="{$APP.LBL_ADD_NEW} {$APP.Task}" accessyKey="F" class="small" onclick="this.form.action.value='EditView'; this.form.return_action.value='CallRelatedList'; this.form.module.value='Activities'; this.form.return_module.value='{$MODULE}'; this.form.activity_mode.value='Task'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Task}">&nbsp;
-							<input title="{$APP.LBL_ADD_NEW} {$APP.Event}" accessyKey="F" class="small" onclick="this.form.action.value='EditView'; this.form.return_action.value='CallRelatedList'; this.form.module.value='Activities'; this.form.return_module.value='{$MODULE}'; this.form.activity_mode.value='Events'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Event}"></td>
-							{/if}
-							{elseif $header eq 'HelpDesk'}
-							<input title="{$APP.LBL_ADD_NEW} {$APP.Ticket}" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='HelpDesk'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Ticket}"></td>
-							{elseif $header eq 'Attachments'}
-							<input title="{$APP.LBL_ADD_NEW} {$APP.Note}" accessyKey="F" class="small" onclick="this.form.action.value='EditView'; this.form.return_action.value='CallRelatedList'; this.form.module.value='Notes'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Note}">&nbsp;
-							<input type="hidden" name="fileid">
-							<input title="{$APP.LBL_ADD_NEW} {$APP.LBL_ATTACHMENT}" accessyKey="F" class="small" onclick="OpenWindow('index.php?module=uploads&action=uploadsAjax&file=upload&return_action=CallRelatedList&return_module={$MODULE}&return_id={$id}');" type="button" name="button" value="{$APP.LBL_ADD_NEW} {$APP.LBL_ATTACHMENT}"></td>
-							{elseif $header eq 'Quotes'}
-							<input title="{$APP.LBL_ADD_NEW} {$APP.Quote}" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='Quotes'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Quote}"></td>
-							
-							{elseif $header eq 'Invoice'}
-							{if $MODULE eq 'SalesOrder'}
-							<input type="hidden">
-							{else}
-							<input title="{$APP.LBL_ADD_NEW} {$APP.Invoice}" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='Invoice'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Invoice}"></td>
-							{/if}
-
-							{elseif $header eq 'Sales Order'}
-							{if $MODULE eq 'Quotes'}
-							<input type="hidden">
-							{else}
-							<input title="{$APP.LBL_ADD_NEW} {$APP.SalesOrder}" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='SalesOrder'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.SalesOrder}"></td>
-							{/if}
-
-							{elseif $header eq 'Purchase Order'}
-							<input title="{$APP.LBL_ADD_NEW} {$APP.PurchaseOrder}" accessyKey="O" class="small" onclick="this.form.action.value='EditView'; this.form.module.value='PurchaseOrder'; this.form.return_module.value='{$MODULE}'; this.form.return_action.value='CallRelatedList'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.PurchaseOrder}"></td>
-							
-							{elseif $header eq 'Emails'}
-							<input type="hidden" name="email_directing_module">
-							<input type="hidden" name="record">
-							<input title="{$APP.LBL_ADD_NEW} {$APP.Email}" accessyKey="F" class="small" onclick="fnvshobj(this,'sendmail_cont');sendmail('{$MODULE}',{$id});" type="button" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Email}"></td>
-							{elseif $header eq 'Users'}
-                                                                {if $MODULE eq 'Activities'}
-                                                                <input title="Change" accessKey="" tabindex="2" type="button" class="small" value="{$APP.LBL_SELECT_USER_BUTTON_LABEL}" name="button" LANGUAGE=javascript onclick='return window.open("index.php?module=Users&return_module=Activities&return_action=CallRelatedList&activity_mode=Events&action=Popup&popuptype=detailview&form=EditView&form_submit=true&return_id={$id}&recordid={$ID}","test","width=640,height=525,resizable=0,scrollbars=0")';>
-								{elseif $MODULE	eq 'Emails'}
-								<input title="{$APP.LBL_BULK_MAILS}" accessykey="F" class="small" onclick="this.form.action.value='sendmail';this.form.return_action.value='DetailView';this.form.module.value='Emails';this.form.return_module.value='Emails';" name="button" value="{$APP.LBL_BULK_MAILS}" type="submit">&nbsp;
-								<input title="Change" accesskey="" tabindex="2" class="small" value="{$APP.LBL_SELECT_USER_BUTTON_LABEL}" name="Button" language="javascript" onclick='return window.open("index.php?module=Users&return_module=Emails&action=Popup&popuptype=detailview&form=EditView&form_submit=true&return_id={$id}&recordid={$ID}","test","width=640,height=520,resizable=0,scrollbars=0");' type="button">&nbsp;</td>
-                                                                {/if}
-							{elseif $header eq 'Activity History'}
-                                                        &nbsp;</td>
-
-							{/if}
-							</tr>
-						</table>	
-						<div id="RLContents">
-                                                        {include file='RelatedListContents.tpl'}
-                                                </div>
-						<br><br>
-					{/foreach}
-						</form>
-				</table>			
-                    {*-- End of Blocks--*} 
-			</td>
-                </tr>
-		</table>
-		</td>
-				</tr>
-				</table>
-				
-			</td>
-		</tr>
-		</table>
-		
-			
-			
-		
+			<!-- Account details tabs -->
+			<table border=0 cellspacing=0 cellpadding=0 width=95% align=center>
+			<tr>
+				<td>
+					<table border=0 cellspacing=0 cellpadding=3 width=100% class="small">
+						<tr>
+							{if $OP_MODE eq 'edit_view'}
+		                                                {assign var="action" value="EditView"}
+                		                        {else}
+                                		                {assign var="action" value="DetailView"}
+		                                        {/if}
+							<td class="dvtTabCache" style="width:10px" nowrap>&nbsp;</td>
+							{if $MODULE eq 'Activities'}
+                                                	<td class="dvtUnSelectedCell" align=center nowrap><a href="index.php?action={$action}&module={$MODULE}&record={$ID}&activity_mode={$ACTIVITY_MODE}&parenttab={$CATEGORY}">{$SINGLE_MOD} {$APP.LBL_INFORMATION}</a></td>
+		                                        {else}
+                		                        <td class="dvtUnSelectedCell" align=center nowrap><a href="index.php?action={$action}&module={$MODULE}&record={$ID}&parenttab={$CATEGORY}">{$SINGLE_MOD} {$APP.LBL_INFORMATION}</a></td>
+                                		        {/if}
+							<td class="dvtTabCache" style="width:10px">&nbsp;</td>
+							<td class="dvtSelectedCell" align=center nowrap>{$APP.LBL_MORE} {$APP.LBL_INFORMATION}</td>
+							<td class="dvtTabCache" style="width:100%">&nbsp;</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+			<tr>
+				<td valign=top align=left >
+		                	<table border=0 cellspacing=0 cellpadding=3 width=100% class="dvtContentSpace">
+						<tr>
+							<td align=left>
+							<!-- content cache -->
+								<table border=0 cellspacing=0 cellpadding=0 width=100%>
+									<tr>
+										<td style="padding:10px">
+										   <!-- General details -->
+												{include file='RelatedListsHidden.tpl'}
+												<div id="RLContents">
+					                                                        {include file='RelatedListContents.tpl'}
+                                        						        </div>
+												</form>
+										  {*-- End of Blocks--*} 
+										</td>
+									</tr>
+								</table>
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+			</table>
 		</div>
-		<!-- PUBLIC CONTENTS STOPS-->
+	<!-- PUBLIC CONTENTS STOPS-->
 	</td>
 	<td align=right valign=top><img src="themes/blue/images/showPanelTopRight.gif"></td>
 </tr>
 </table>
 
-</td></tr></table>
 {if $MODULE eq 'Leads' or $MODULE eq 'Contacts' or $MODULE eq 'Accounts'}
 <div id="sendmail_cont" style="z-index:100001;position:absolute;width:310px;"></div>
 {/if}



From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 07:08:33 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 14:08:33 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231070=3A?=
	=?utf-8?q?_Quote_PDF_Output?=
In-Reply-To: <076.38772bdb8ba951744608d634ceddc572@vtiger.fosslabs.com>
References: <076.38772bdb8ba951744608d634ceddc572@vtiger.fosslabs.com>
Message-ID: <085.6cf140cb11256efeb74f9d71151bfd5f@vtiger.fosslabs.com>

#1070: Quote PDF Output
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  mickie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.1 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mickie):

  * version:  5.0.0 => 5.0.1

Comment:

 we should discuss about this and then take it in our future release.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1070>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 07:09:54 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 14:09:54 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231114=3A?=
 =?utf-8?q?_tax_split_up_shows_only_upon_clicking_on_button?=
In-Reply-To: <076.e0fc7e9f8cb228797d775f33694000ad@vtiger.fosslabs.com>
References: <076.e0fc7e9f8cb228797d775f33694000ad@vtiger.fosslabs.com>
Message-ID: <085.12c761aae3f73667b203bdc41979ac58@vtiger.fosslabs.com>

#1114: tax split up shows only upon clicking on button
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  mickie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.1 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mickie):

  * version:  5.0.0 => 5.0.1

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1114>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 07:11:05 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 14:11:05 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231139=3A?=
 =?utf-8?q?_could_be_made_more_usable2?=
In-Reply-To: <076.1772ef737aedfed24ad81cc9ac0c4e0f@vtiger.fosslabs.com>
References: <076.1772ef737aedfed24ad81cc9ac0c4e0f@vtiger.fosslabs.com>
Message-ID: <085.b428227030bc67a4c81191dcc08f73a3@vtiger.fosslabs.com>

#1139: could be made more usable2
--------------------------+-------------------------------------------------
  Reporter:  richie       |       Owner:  mickie
      Type:  enhancement  |      Status:  new   
  Priority:  major        |   Milestone:        
 Component:  vtigercrm    |     Version:  5.0.1 
Resolution:               |    Keywords:        
--------------------------+-------------------------------------------------
Changes (by mickie):

  * version:  5.0.0 => 5.0.1
  * type:  defect => enhancement

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1139>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 20 07:11:46 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 20 Jun 2006 14:11:46 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7304 -
 /vtigercrm/trunk/modules/Activities/RenderRelatedListUI.php
Message-ID: <20060620141146.26E7183F2C4@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 20 08:11:42 2006
New Revision: 7304

Log:
vtiger_ updated in the query

Modified:
    vtigercrm/trunk/modules/Activities/RenderRelatedListUI.php

Modified: vtigercrm/trunk/modules/Activities/RenderRelatedListUI.php
==============================================================================
--- vtigercrm/trunk/modules/Activities/RenderRelatedListUI.php (original)
+++ vtigercrm/trunk/modules/Activities/RenderRelatedListUI.php Tue Jun 20 08:11:42 2006
@@ -64,11 +64,11 @@
 		if( $owner != $userid)
 		{
 			
-			$usr_query="select activityid,vtiger_activity.date_start,vtiger_activity.due_date, vtiger_activity.time_start,vtiger_activity.duration_hours,vtiger_activity.duration_minutes,vtiger_crmentity.smownerid from vtiger_activity,crmentity where vtiger_crmentity.crmid=vtiger_activity.activityid and ('".$avail_date."' like date_start) and vtiger_crmentity.smownerid=".$userid." and vtiger_activity.activityid !=".$activity_id."  and vtiger_crmentity.deleted=0";
+			$usr_query="select activityid,vtiger_activity.date_start,vtiger_activity.due_date, vtiger_activity.time_start,vtiger_activity.duration_hours,vtiger_activity.duration_minutes,vtiger_crmentity.smownerid from vtiger_activity,vtiger_crmentity where vtiger_crmentity.crmid=vtiger_activity.activityid and ('".$avail_date."' like date_start) and vtiger_crmentity.smownerid=".$userid." and vtiger_activity.activityid !=".$activity_id."  and vtiger_crmentity.deleted=0";
 		}
 		else
 		{
-			$usr_query="select activityid,vtiger_activity.date_start,vtiger_activity.due_date, vtiger_activity.time_start,vtiger_activity.duration_hours,vtiger_activity.duration_minutes,vtiger_crmentity.smownerid from vtiger_activity,crmentity where vtiger_crmentity.crmid=vtiger_activity.activityid and ('".$avail_date."' like date_start) and vtiger_crmentity.smownerid=".$userid." and vtiger_activity.activityid !=".$activity_id." and vtiger_crmentity.deleted=0";
+			$usr_query="select activityid,vtiger_activity.date_start,vtiger_activity.due_date, vtiger_activity.time_start,vtiger_activity.duration_hours,vtiger_activity.duration_minutes,vtiger_crmentity.smownerid from vtiger_activity,vtiger_crmentity where vtiger_crmentity.crmid=vtiger_activity.activityid and ('".$avail_date."' like date_start) and vtiger_crmentity.smownerid=".$userid." and vtiger_activity.activityid !=".$activity_id." and vtiger_crmentity.deleted=0";
 		}
 		$result_cal=$adb->query($usr_query);   
 		$noofrows_cal = $adb->num_rows($result_cal);



From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 07:13:21 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 14:13:21 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231109=3A?=
 =?utf-8?q?_total_cost_calculation_in_quote_not_clear?=
In-Reply-To: <076.45e9bc14aab1f17446b516955f930775@vtiger.fosslabs.com>
References: <076.45e9bc14aab1f17446b516955f930775@vtiger.fosslabs.com>
Message-ID: <085.919aeeb60214bc77cab1a1b642019010@vtiger.fosslabs.com>

#1109: total cost calculation in quote not clear
--------------------------+-------------------------------------------------
  Reporter:  richie       |       Owner:  mickie
      Type:  enhancement  |      Status:  new   
  Priority:  critical     |   Milestone:        
 Component:  vtigercrm    |     Version:  5.0.0 
Resolution:               |    Keywords:  quote 
--------------------------+-------------------------------------------------
Changes (by mickie):

  * type:  defect => enhancement

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1109>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 20 07:35:20 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 20 Jun 2006 14:35:20 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7305 -
	/vtigercrm/trunk/include/utils/ListViewUtils.php
Message-ID: <20060620143521.407BB83F2C9@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 20 08:35:16 2006
New Revision: 7305

Log:
changes made to fix the issue 685 and 686

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 Jun 20 08:35:16 2006
@@ -1314,6 +1314,8 @@
 					$focus->record_id = $_REQUEST['recordid'];
 					if($module == 'Leads')
 						$value = '<a href="a" LANGUAGE=javascript onclick=\'add_leaddata_to_relatedlist("'.$entity_id.'","'.$focus->record_id.'"); window.close()\'>'.$temp_val.'</a>';
+					elseif($module == 'Users')
+						$value = '<a href="a" LANGUAGE=javascript onclick=\'add_userdata_to_relatedlist("'.$entity_id.'","'.$focus->record_id.'"); window.close()\'>'.$temp_val.'</a>';
 					else
 						$value = '<a href="a" LANGUAGE=javascript onclick=\'add_data_to_relatedlist("'.$entity_id.'","'.$focus->record_id.'"); window.close()\'>'.$temp_val.'</a>';
 				}
@@ -1690,7 +1692,7 @@
 			LEFT JOIN vtiger_users
 				ON vtiger_users.id = vtiger_crmentity.smownerid
 			WHERE vtiger_crmentity.deleted = 0
-			AND vtiger_leaddetails.converted = 0 ";
+			AND vtiger_leaddetails.converted = 0 ".$where;
                if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[$tab_id] == 3)
                 {
 			$sec_parameter=getListViewSecurityParameter($module);
@@ -2041,7 +2043,7 @@
 	}
 	if($module == "Users")
 	{
-		$query = "select id,user_name,roleid,first_name,last_name,email1,phone_mobile,phone_work,is_admin,status from vtiger_users inner join vtiger_user2role on vtiger_user2role.userid=vtiger_users.id where deleted=0";
+		$query = "select id,user_name,roleid,first_name,last_name,email1,phone_mobile,phone_work,is_admin,status from vtiger_users inner join vtiger_user2role on vtiger_user2role.userid=vtiger_users.id where deleted=0 ".$where ;
 	}
 	
 
@@ -2521,15 +2523,51 @@
 	global $adb;
 	$skip_id = Array();
 	$where_relquery = "";
-
 	if($currentmodule=="Contacts" && $returnmodule == "Potentials")
 	{
-		$query = "SELECT contactid FROM vtiger_contpotentialrel WHERE potentialid = ".$recordid;
+		$reltable = 'vtiger_contpotentialrel';
+		$condition = 'WHERE potentialid = '.$recordid;
+		$field = $selectfield = 'contactid';
+		$table = 'vtiger_contactdetails';
 	}
 	elseif($currentmodule=="Contacts" && $returnmodule == "Vendors")
 	{
-		$query = "SELECT contactid FROM vtiger_vendorcontactrel WHERE vendorid = ".$recordid;
-	}
+		$reltable = 'vtiger_vendorcontactrel';
+		$condition = 'WHERE vendorid = '.$recordid;
+		$field = $selectfield = 'contactid';
+		$table = 'vtiger_contactdetails';
+	}
+	elseif($currentmodule=="Contacts" && $returnmodule == "Campaigns")
+	{
+		$reltable = 'vtiger_campaigncontrel';
+		$condition = 'WHERE campaignid = '.$recordid;
+		$field = $selectfield = 'contactid';
+		$table = 'vtiger_contactdetails';
+	}
+	elseif($currentmodule=="Contacts" && $returnmodule == "Activities")
+	{
+		$reltable = 'vtiger_seactivityrel';
+		$condition = 'WHERE activityid = '.$recordid;
+		$selectfield = 'crmid';
+		$field = 'contactid';
+		$table = 'vtiger_contactdetails';
+	}
+	elseif($currentmodule=="Leads" && $returnmodule == "Campaigns")
+	{
+		$reltable = 'vtiger_campaignleadrel';
+		$condition = 'WHERE campaignid = '.$recordid;;
+		$field = $selectfield = 'leadid';
+		$table = 'vtiger_leaddetails';
+	}
+	elseif($currentmodule=="Users" && $returnmodule == "Activities")
+	{
+		$reltable = 'vtiger_salesmanactivityrel';
+		$condition = 'WHERE activityid = '.$recordid;;
+		$selectfield = 'smid';
+		$field = 'id';
+		$table = 'vtiger_users';
+	}
+	$query = "SELECT ".$selectfield." FROM ".$reltable." ".$condition;
 
 	if($query !='')
 	{
@@ -2538,10 +2576,10 @@
 		{
 			for($k=0;$k < $adb->num_rows($result);$k++)
 			{
-				$skip_id[]=$adb->query_result($result,$k,"contactid");
+				$skip_id[]=$adb->query_result($result,$k,$selectfield);
 			}
 			$skipids = constructList($skip_id,'INTEGER');
-			$where_relquery = "and vtiger_contactdetails.contactid not in ".$skipids;
+			$where_relquery = "and ".$table.".".$field." not in ".$skipids;
 		}
 	}
 	$log->debug("Exiting getRelCheckquery method ...");



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 20 07:37:50 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 20 Jun 2006 14:37:50 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7306 -
	/vtigercrm/trunk/Smarty/templates/Popup.tpl
Message-ID: <20060620143750.B596283F2C9@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 20 08:37:47 2006
New Revision: 7306

Log:
js function add_userdata_to_relatedlist has been included

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

Modified: vtigercrm/trunk/Smarty/templates/Popup.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Popup.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Popup.tpl Tue Jun 20 08:37:47 2006
@@ -24,6 +24,10 @@
 
 function add_leaddata_to_relatedlist(entity_id,recordid) {ldelim}
         opener.document.location.href="index.php?module={$RETURN_MODULE}&action=updateRelations&destination_module=Leads&entityid="+entity_id+"&parid="+recordid;
+{rdelim}
+
+function add_userdata_to_relatedlist(userid,recordid) {ldelim}
+        opener.document.location.href="index.php?module={$RETURN_MODULE}&action=updateRelations&destination_module=Users&user_id="+userid+"&record="+recordid;
 {rdelim}
 </script>
 <body class="small" marginwidth=0 marginheight=0 leftmargin=0 topmargin=0 bottommargin=0 rigthmargin=0>



From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 07:38:18 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 14:38:18 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23686=3A_?=
 =?utf-8?q?Issue_in_Event_Related_List?=
In-Reply-To: <076.27c045b660bb25d0ac07cff7335832fa@vtiger.fosslabs.com>
References: <076.27c045b660bb25d0ac07cff7335832fa@vtiger.fosslabs.com>
Message-ID: <085.b14cc6d1935f606071536b515de8ef5d@vtiger.fosslabs.com>

#686: Issue in Event Related List
------------------------+---------------------------------------------------
  Reporter:  don        |       Owner:  mangai
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Comment (by mangai):

 fixed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/686>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 07:38:28 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 14:38:28 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23686=3A_?=
 =?utf-8?q?Issue_in_Event_Related_List?=
In-Reply-To: <076.27c045b660bb25d0ac07cff7335832fa@vtiger.fosslabs.com>
References: <076.27c045b660bb25d0ac07cff7335832fa@vtiger.fosslabs.com>
Message-ID: <085.540677647bf7a1f98102a9d782f2536d@vtiger.fosslabs.com>

#686: Issue in Event Related List
------------------------+---------------------------------------------------
  Reporter:  don        |       Owner:  mangai
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mangai):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/686>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 07:39:18 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 14:39:18 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231249=3A?=
	=?utf-8?q?_Task_Information?=
In-Reply-To: <076.e46a01212fb9981d78bbf6e6e2673af6@vtiger.fosslabs.com>
References: <076.e46a01212fb9981d78bbf6e6e2673af6@vtiger.fosslabs.com>
Message-ID: <085.04820de44ddb653de32eddf90ecc57e8@vtiger.fosslabs.com>

#1249: Task Information
--------------------------+-------------------------------------------------
  Reporter:  anonymous    |       Owner:  minnie
      Type:  enhancement  |      Status:  new   
  Priority:  major        |   Milestone:        
 Component:  vtigercrm    |     Version:  5.0.0 
Resolution:               |    Keywords:        
--------------------------+-------------------------------------------------
Changes (by mangai):

  * type:  defect => enhancement

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1249>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 08:08:29 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 15:08:29 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231344=3A?=
	=?utf-8?q?_database_not_created?=
In-Reply-To: <076.c1df5e53995fbd31873387aa402b9381@vtiger.fosslabs.com>
References: <076.c1df5e53995fbd31873387aa402b9381@vtiger.fosslabs.com>
Message-ID: <085.a8e902c5bde5204cf192615fe92c68b0@vtiger.fosslabs.com>

#1344: database not created
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  developer
      Type:  defect     |      Status:  new      
  Priority:  major      |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:             |    Keywords:           
------------------------+---------------------------------------------------
Comment (by allanbush):

 Just trying to clarify a few points here.

 First are you using the 4.2.4 release or the 5.0 beta release?

 Second when you say the "database hasn't been created" do you mean that no
 tables were created within the database or that the database itself
 doesn't exist.  You'll have to create a database and a database user with
 full privileges on the database before installing vtigercrm and provide
 the installation process with those details.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1344>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 07:38:08 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 14:38:08 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23685=3A_?=
 =?utf-8?q?Issue_in_Event_Related_List?=
In-Reply-To: <076.280958420b347e62e2d9ab6619bf1962@vtiger.fosslabs.com>
References: <076.280958420b347e62e2d9ab6619bf1962@vtiger.fosslabs.com>
Message-ID: <085.9979a26323e0030fc55a7408d0a4f2cc@vtiger.fosslabs.com>

#685: Issue in Event Related List
------------------------+---------------------------------------------------
  Reporter:  don        |       Owner:  mangai
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mangai):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 fixed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/685>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 20 07:09:20 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 20 Jun 2006 14:09:20 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7303 -
	/vtigercrm/trunk/modules/Users/Users.js
Message-ID: <20060620140921.084C683F2BA@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 20 08:09:15 2006
New Revision: 7303

Log:
js function SelectAll has been included

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

Modified: vtigercrm/trunk/modules/Users/Users.js
==============================================================================
--- vtigercrm/trunk/modules/Users/Users.js (original)
+++ vtigercrm/trunk/modules/Users/Users.js Tue Jun 20 08:09:15 2006
@@ -16,3 +16,58 @@
 		window.opener.document.EditView.reports_to_id.value = user_id;
 }
 
+//Function added for Mass select in Popup - Philip
+function SelectAll()
+{
+
+        x = document.selectall.selected_id.length;
+        var entity_id = window.opener.document.getElementById('parent_id').value
+        var module = window.opener.document.getElementById('return_module').value
+        document.selectall.action.value='updateRelations'
+        idstring = "";
+
+        if ( x == undefined)
+        {
+
+                if (document.selectall.selected_id.checked)
+                {
+                        document.selectall.idlist.value=document.selectall.selected_id.value;
+                }
+                else
+                {
+                        alert("Please select atleast one entity");
+                        return false;
+                }
+        }
+        else
+        {
+                xx = 0;
+                for(i = 0; i < x ; i++)
+                {
+                        if(document.selectall.selected_id[i].checked)
+                        {
+                                idstring = document.selectall.selected_id[i].value +";"+idstring
+                        xx++
+                        }
+                }
+                if (xx != 0)
+                {
+                        document.selectall.idlist.value=idstring;
+                }
+                else
+                {
+			alert("Please select atleast one entity");
+	                return false;
+                }
+        }
+        if(confirm("Are you sure you want to add the selected "+xx+" records ?"))
+        {
+                opener.document.location.href="index.php?module="+module+"&parentid="+entity_id+"&action=updateRelations&destination_module=Users&idlist="+idstring;
+                self.close();
+        }
+        else
+        {
+        	return false;
+        }
+}
+



From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 08:09:50 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 15:09:50 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231217=3A?=
 =?utf-8?q?_issue_in_mysql_connection_parameters?=
In-Reply-To: <076.da1bfc197d7ae211c399f09a7c9dbece@vtiger.fosslabs.com>
References: <076.da1bfc197d7ae211c399f09a7c9dbece@vtiger.fosslabs.com>
Message-ID: <085.56f4b504eab8af77696b6b6669b60862@vtiger.fosslabs.com>

#1217: issue in mysql connection parameters
------------------------+---------------------------------------------------
  Reporter:  mangai     |       Owner:  jeri  
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * resolution:  => fixed
  * priority:  critical => major
  * status:  new => closed

Comment:

 A Unix socket file is used if you don't specify a hostname or if you
 specify the special hostname localhost.By default, while installing with
 installshield, localhost user is given all privileges. But in the other
 cases, the user needs to be given privileges to access the database.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1217>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 08:10:40 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 15:10:40 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231307=3A?=
 =?utf-8?q?_Print_function_missing_in_Beta?=
In-Reply-To: <076.d87e178fda241c6536574413a592943f@vtiger.fosslabs.com>
References: <076.d87e178fda241c6536574413a592943f@vtiger.fosslabs.com>
Message-ID: <085.bf61c3ae94c06030f965ed2e85d90879@vtiger.fosslabs.com>

#1307: Print function missing in Beta
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  philip
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.1 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by anonymous):

  * version:  5.0.0 => 5.0.1

Comment:

 UI team is working on the print page template without css.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1307>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 08:13:56 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 15:13:56 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231344=3A?=
	=?utf-8?q?_database_not_created?=
In-Reply-To: <076.c1df5e53995fbd31873387aa402b9381@vtiger.fosslabs.com>
References: <076.c1df5e53995fbd31873387aa402b9381@vtiger.fosslabs.com>
Message-ID: <085.a013ca32b7288361e6a1ec3f87d5556f@vtiger.fosslabs.com>

#1344: database not created
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  developer
      Type:  defect     |      Status:  new      
  Priority:  major      |   Milestone:           
 Component:  vtigercrm  |     Version:  4.2.4rc3 
Resolution:             |    Keywords:           
------------------------+---------------------------------------------------
Changes (by richie):

  * version:  5.0.0 => 4.2.4rc3

Comment:

 Hi Allan!

 I am changing the version to 4.2.4rc3.
 We need to change to proper version.

 Will post in mailing list.

 Richie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1344>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 20 08:31:42 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 20 Jun 2006 15:31:42 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7307 - in /vtigercrm/trunk:
 Smarty/templates/DisplayFields.tpl modules/SalesOrder/EditView.php
 modules/SalesOrder/Save.php
Message-ID: <20060620153142.A87EF83F2DD@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 20 09:31:33 2006
New Revision: 7307

Log:
* Modified to fix the quote value save in SalesOrder where as previously if we select the quote in SalesOrder creation then the quote did not saved

Modified:
    vtigercrm/trunk/Smarty/templates/DisplayFields.tpl
    vtigercrm/trunk/modules/SalesOrder/EditView.php
    vtigercrm/trunk/modules/SalesOrder/Save.php

Modified: vtigercrm/trunk/Smarty/templates/DisplayFields.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DisplayFields.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DisplayFields.tpl Tue Jun 20 09:31:33 2006
@@ -248,7 +248,7 @@
 				{$fldlabel}
 			</td>
 			<td width="30%" align=left class="dvtCellInfo">
-				<input name="quote_name" readonly type="text" style="border:1px solid #bababa;" value="{$fldvalue}"><input name="{$fldname}" type="hidden" value="{$ID}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Quotes&action=Popup&html=Popup_picker&popuptype=specific&form=EditView","test","width=640,height=565,resizable=0,scrollbars=0");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" tabindex="{$vt_tab}" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.quote_id.value=''; this.form.quote_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
+				<input name="quote_name" readonly type="text" style="border:1px solid #bababa;" value="{$fldvalue}"><input name="{$fldname}" type="hidden" value="{$QUOTE_ID}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Quotes&action=Popup&html=Popup_picker&popuptype=specific&form=EditView","test","width=640,height=565,resizable=0,scrollbars=0");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" tabindex="{$vt_tab}" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.quote_id.value=''; this.form.quote_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
 			</td>
 
 		{elseif $uitype eq 76}

Modified: vtigercrm/trunk/modules/SalesOrder/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/SalesOrder/EditView.php (original)
+++ vtigercrm/trunk/modules/SalesOrder/EditView.php Tue Jun 20 09:31:33 2006
@@ -80,6 +80,7 @@
 	}
 		
 	$quoteid = $focus->column_fields['quote_id'];
+	$smarty->assign("QUOTE_ID", $focus->column_fields['quote_id']);
 	$quote_focus = new Quote();
 	$quote_focus->id = $quoteid;
 	$quote_focus->retrieve_entity_info($quoteid,"Quotes");
@@ -129,6 +130,7 @@
 			$associated_prod = getAssociatedProducts("Quotes",$quote_focus,$focus->column_fields['quote_id']);
 		}
 
+		$smarty->assign("QUOTE_ID", $focus->column_fields['quote_id']);
 		$smarty->assign("ASSOCIATEDPRODUCTS", $associated_prod);
 		$smarty->assign("MODE", $quote_focus->mode);
 		$smarty->assign("TAXVALUE", $quote_focus->column_fields['txtTax']);

Modified: vtigercrm/trunk/modules/SalesOrder/Save.php
==============================================================================
--- vtigercrm/trunk/modules/SalesOrder/Save.php (original)
+++ vtigercrm/trunk/modules/SalesOrder/Save.php Tue Jun 20 09:31:33 2006
@@ -84,7 +84,7 @@
         if($prod_status != 'D')
         {
 
-                $query ="insert into vtiger_soproductrel values($focus->id, $prod_id , $qty, $listprice, $vat, $sales, $service)";
+                $query ="insert into vtiger_soproductrel values($focus->id, $prod_id , $qty, $listprice, \"$vat\", \"$sales\", \"$service\")";
                 $adb->query($query);
 		updateStk($prod_id,$qty,$focus->mode,$ext_prod_arr,'SalesOrder');
         }



From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 08:54:25 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 15:54:25 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23703=3A_?=
 =?utf-8?q?installation_issue_in_bin?=
In-Reply-To: <076.d5b75a39847faef3b46084de29b76436@vtiger.fosslabs.com>
References: <076.d5b75a39847faef3b46084de29b76436@vtiger.fosslabs.com>
Message-ID: <085.df658efddad3895e5b20a3ae373b1a86@vtiger.fosslabs.com>

#703: installation issue in bin
---------------------------+------------------------------------------------
  Reporter:  jerrydgeorge  |       Owner:  Richie      
      Type:  defect        |      Status:  closed      
  Priority:  major         |   Milestone:              
 Component:  vtigercrm     |     Version:  5.0.0       
Resolution:  fixed         |    Keywords:  installation
---------------------------+------------------------------------------------
Changes (by richie):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/703>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 09:03:55 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 16:03:55 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231169=3A?=
 =?utf-8?q?_unable_to_relate_Quote_to_SalesOrder?=
In-Reply-To: <076.bec9bdcd41de51d9a21b66c7a45dbe9a@vtiger.fosslabs.com>
References: <076.bec9bdcd41de51d9a21b66c7a45dbe9a@vtiger.fosslabs.com>
Message-ID: <085.c106fef810b7277367c89d54530687bb@vtiger.fosslabs.com>

#1169: unable to relate Quote to SalesOrder
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  mickie
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mickie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 This issue is fixed and previously quote is not saved in salesorder
 editview. now this issue also fixed.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1169>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 20 09:14:14 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 20 Jun 2006 16:14:14 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7309 -
	/vtigercrm/trunk/modules/Users/User.php
Message-ID: <20060620161414.A23C883F2F0@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 20 10:14:09 2006
New Revision: 7309

Log:
encrypt password added for user_password

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 Jun 20 10:14:09 2006
@@ -627,6 +627,10 @@
 					}
 					$fldvalue = $field_list;
 				}
+				elseif($uitype == 99)
+				{
+					$fldvalue = $this->encrypt_password($this->column_fields[$fieldname]);
+				}
 				else
 				{
 					$fldvalue = $this->column_fields[$fieldname]; 



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 20 09:14:15 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 20 Jun 2006 16:14:15 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7310 -
	/vtigercrm/trunk/include/utils/UserInfoUtil.php
Message-ID: <20060620161416.1A41C83F2AB@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 20 10:14:07 2006
New Revision: 7310

Log:
fixed the delete permission issue in security

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

Modified: vtigercrm/trunk/include/utils/UserInfoUtil.php
==============================================================================
--- vtigercrm/trunk/include/utils/UserInfoUtil.php (original)
+++ vtigercrm/trunk/include/utils/UserInfoUtil.php Tue Jun 20 10:14:07 2006
@@ -1355,6 +1355,7 @@
  */
 function isPermitted($module,$actionname,$record_id='')
 {
+
 	global $log;
 	$log->debug("Entering isPermitted(".$module.",".$actionname.",".$record_id.") method ...");
 
@@ -1576,6 +1577,11 @@
 			$log->debug("Exiting isPermitted method ...");
 			return $permission;	
 		}
+		elseif($actionid ==2)
+		{
+				$permission ="no";
+				return $permission;	
+		}		
 		else
 		{
 			$permission = "yes";
@@ -4209,9 +4215,9 @@
 
                         if(sizeof($current_user_groups) > 0)
                         {
-                              $sec_query .= "groups.groupid in".getCurrentUserGroupList()." or ";
+                              $sec_query .= "vtiger_groups.groupid in".getCurrentUserGroupList()." or ";
                         }
-                         $sec_query .= "groups.groupid in(select vtiger_tmp_read_group_sharing_per.sharedgroupid from vtiger_tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";	
+                         $sec_query .= "vtiger_groups.groupid in(select vtiger_tmp_read_group_sharing_per.sharedgroupid from vtiger_tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";	
 	}
 	elseif($module == 'Accounts')
 	{
@@ -4219,9 +4225,9 @@
 
                 if(sizeof($current_user_groups) > 0)
                 {
-                	$sec_query .= "groups.groupid in".getCurrentUserGroupList()." or ";
+                	$sec_query .= "vtiger_groups.groupid in".getCurrentUserGroupList()." or ";
                 }
-		$sec_query .= "groups.groupid in(select vtiger_tmp_read_group_sharing_per.sharedgroupid from vtiger_tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";			
+		$sec_query .= "vtiger_groups.groupid in(select vtiger_tmp_read_group_sharing_per.sharedgroupid from vtiger_tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";			
 	
 	}
 	elseif($module == 'Contacts')
@@ -4230,9 +4236,9 @@
 
                 if(sizeof($current_user_groups) > 0)
                 {
-                	$sec_query .= "groups.groupid in".getCurrentUserGroupList()." or ";
+                	$sec_query .= "vtiger_groups.groupid in".getCurrentUserGroupList()." or ";
                 }
-		$sec_query .= "groups.groupid in(select vtiger_tmp_read_group_sharing_per.sharedgroupid from vtiger_tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";			
+		$sec_query .= "vtiger_groups.groupid in(select vtiger_tmp_read_group_sharing_per.sharedgroupid from vtiger_tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";			
 	
 	}
 	elseif($module == 'Potentials')
@@ -4241,9 +4247,9 @@
 
                 if(sizeof($current_user_groups) > 0)
                 {
-                	$sec_query .= "groups.groupid in".getCurrentUserGroupList()." or ";
+                	$sec_query .= "vtiger_groups.groupid in".getCurrentUserGroupList()." or ";
                 }
-		$sec_query .= "groups.groupid in(select vtiger_tmp_read_group_sharing_per.sharedgroupid from vtiger_tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";			
+		$sec_query .= "vtiger_groups.groupid in(select vtiger_tmp_read_group_sharing_per.sharedgroupid from vtiger_tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";			
 	
 	}
 	elseif($module == 'HelpDesk')
@@ -4252,9 +4258,9 @@
 
                 if(sizeof($current_user_groups) > 0)
                 {
-                	$sec_query .= "groups.groupid in".getCurrentUserGroupList()." or ";
+                	$sec_query .= "vtiger_groups.groupid in".getCurrentUserGroupList()." or ";
                 }
-		$sec_query .= "groups.groupid in(select vtiger_tmp_read_group_sharing_per.sharedgroupid from vtiger_tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";			
+		$sec_query .= "vtiger_groups.groupid in(select vtiger_tmp_read_group_sharing_per.sharedgroupid from vtiger_tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";			
 	
 	}
 	elseif($module == 'Emails')
@@ -4273,9 +4279,9 @@
 
                 if(sizeof($current_user_groups) > 0)
                 {
-                	$sec_query .= "groups.groupid in".getCurrentUserGroupList()." or ";
+                	$sec_query .= "vtiger_groups.groupid in".getCurrentUserGroupList()." or ";
                 }
-		$sec_query .= "groups.groupid in(select vtiger_tmp_read_group_sharing_per.sharedgroupid from vtiger_tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";
+		$sec_query .= "vtiger_groups.groupid in(select vtiger_tmp_read_group_sharing_per.sharedgroupid from vtiger_tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";
 	
 	}
 	elseif($module == 'Activities')
@@ -4303,9 +4309,9 @@
 
                 if(sizeof($current_user_groups) > 0)
                 {
-                	$sec_query .= "groups.groupid in".getCurrentUserGroupList()." or ";
+                	$sec_query .= "vtiger_groups.groupid in".getCurrentUserGroupList()." or ";
                 }
-		$sec_query .= "groups.groupid in(select vtiger_tmp_read_group_sharing_per.sharedgroupid from vtiger_tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";			
+		$sec_query .= "vtiger_groups.groupid in(select vtiger_tmp_read_group_sharing_per.sharedgroupid from vtiger_tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";			
 	
 	}	
 	elseif($module == 'PurchaseOrder')
@@ -4314,9 +4320,9 @@
 
                 if(sizeof($current_user_groups) > 0)
                 {
-                	$sec_query .= "groups.groupid in".getCurrentUserGroupList()." or ";
+                	$sec_query .= "vtiger_groups.groupid in".getCurrentUserGroupList()." or ";
                 }
-		$sec_query .= "groups.groupid in(select vtiger_tmp_read_group_sharing_per.sharedgroupid from vtiger_tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";			
+		$sec_query .= "vtiger_groups.groupid in(select vtiger_tmp_read_group_sharing_per.sharedgroupid from vtiger_tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";			
 	
 	}
 	elseif($module == 'SalesOrder')
@@ -4336,9 +4342,9 @@
 
                 if(sizeof($current_user_groups) > 0)
                 {
-                	$sec_query .= "groups.groupid in".getCurrentUserGroupList()." or ";
+                	$sec_query .= "vtiger_groups.groupid in".getCurrentUserGroupList()." or ";
                 }
-		$sec_query .= "groups.groupid in(select vtiger_tmp_read_group_sharing_per.sharedgroupid from vtiger_tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";			
+		$sec_query .= "vtiger_groups.groupid in(select vtiger_tmp_read_group_sharing_per.sharedgroupid from vtiger_tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";			
 	
 	}
 	elseif($module == 'Invoice')
@@ -4356,9 +4362,9 @@
 
                 if(sizeof($current_user_groups) > 0)
                 {
-                	$sec_query .= "groups.groupid in".getCurrentUserGroupList()." or ";
+                	$sec_query .= "vtiger_groups.groupid in".getCurrentUserGroupList()." or ";
                 }
-		$sec_query .= "groups.groupid in(select vtiger_tmp_read_group_sharing_per.sharedgroupid from vtiger_tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";			
+		$sec_query .= "vtiger_groups.groupid in(select vtiger_tmp_read_group_sharing_per.sharedgroupid from vtiger_tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";			
 	
 	}
 	elseif($module == 'Campaigns')
@@ -4368,9 +4374,9 @@
 
 		if(sizeof($current_user_groups) > 0)
 		{
-			$sec_query .= "groups.groupid in".getCurrentUserGroupList()." or ";
+			$sec_query .= "vtiger_groups.groupid in".getCurrentUserGroupList()." or ";
 		}
-		$sec_query .= "groups.groupid in(select vtiger_tmp_read_group_sharing_per.sharedgroupid from vtiger_tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";
+		$sec_query .= "vtiger_groups.groupid in(select vtiger_tmp_read_group_sharing_per.sharedgroupid from vtiger_tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";
 
 			
 	}	



From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 09:20:58 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 16:20:58 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231128=3A?=
 =?utf-8?q?_too_high_reaction_time_in_using_inventory?=
In-Reply-To: <076.209b6cc7a2151c8fd5ca32cfa5df69e2@vtiger.fosslabs.com>
References: <076.209b6cc7a2151c8fd5ca32cfa5df69e2@vtiger.fosslabs.com>
Message-ID: <085.2b656cb7ce44320c44bae97b416efa81@vtiger.fosslabs.com>

#1128: too high reaction time in using inventory
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  don        
      Type:  defect     |      Status:  new        
  Priority:  major      |   Milestone:             
 Component:  vtigercrm  |     Version:  5.0.0      
Resolution:             |    Keywords:  performance
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  mickie => don

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1128>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 20 09:33:00 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 20 Jun 2006 16:33:00 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7311 -
	/vtigercrm/trunk/include/utils/ListViewUtils.php
Message-ID: <20060620163300.6334583F2E9@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 20 10:32:50 2006
New Revision: 7311

Log:
fixed query issue in getListQuery() for Accounts

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 Jun 20 10:32:50 2006
@@ -1620,13 +1620,13 @@
 
                         if(sizeof($current_user_groups) > 0)
                         {
-                              $query .= "accountgrouprelation.groupname IN (
+                              $query .= "vtiger_accountgrouprelation.groupname IN (
 				      		SELECT groupname
 						FROM vtiger_groups
 						WHERE groupid IN ".getCurrentUserGroupList().")
 					OR ";
                         }
-                         $query .= "accountgrouprelation.groupname IN (
+                         $query .= "vtiger_accountgrouprelation.groupname IN (
 				 	SELECT vtiger_groups.groupname
 					FROM vtiger_tmp_read_group_sharing_per
 					INNER JOIN vtiger_groups



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 20 09:43:49 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 20 Jun 2006 16:43:49 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7312 -
	/vtigercrm/trunk/modules/Reports/PopulateReports.php
Message-ID: <20060620164349.B121483F2CE@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 20 10:43:36 2006
New Revision: 7312

Log:
fixed the vtiger_ issues

Modified:
    vtigercrm/trunk/modules/Reports/PopulateReports.php

Modified: vtigercrm/trunk/modules/Reports/PopulateReports.php
==============================================================================
--- vtigercrm/trunk/modules/Reports/PopulateReports.php (original)
+++ vtigercrm/trunk/modules/Reports/PopulateReports.php Tue Jun 20 10:43:36 2006
@@ -44,142 +44,142 @@
 		       Array('primarymodule'=>'Invoice','secondarymodule'=>'')
 		      );
 
-$selectcolumns = Array(Array('contactdetails:firstname:Contacts_First_Name:firstname:V',
-                             'contactdetails:lastname:Contacts_Last_Name:lastname:V',
-                             'contactsubdetails:leadsource:Contacts_Lead_Source:leadsource:V',
-                             'accountContacts:accountname:Contacts_Account_Name:account_id:I',
-			     'account:industry:Accounts_industry:industry:V',
-			     'contactdetails:email:Contacts_Email:email:V'),
-
-		       Array('contactdetails:firstname:Contacts_First_Name:firstname:V',
-                             'contactdetails:lastname:Contacts_Last_Name:lastname:V',
-                             'contactsubdetails:leadsource:Contacts_Lead_Source:leadsource:V',
-                             'accountContacts:accountname:Contacts_Account_Name:account_id:I',
-                             'account:industry:Accounts_industry:industry:V',
-                             'contactdetails:email:Contacts_Email:email:V'),
-
-		       Array('contactdetails:firstname:Contacts_First_Name:firstname:V',
-                             'contactdetails:lastname:Contacts_Last_Name:lastname:V',
-                             'accountContacts:accountname:Contacts_Account_Name:account_id:I',
-                             'contactdetails:email:Contacts_Email:email:V',
-                             'potential:potentialname:Potentials_Potential_Name:potentialname:V',
-                             'potential:sales_stage:Potentials_Sales_Stage:sales_stage:V'),
-
-		       Array('leaddetails:firstname:Leads_First_Name:firstname:V',
-			     'leaddetails:lastname:Leads_Last_Name:lastname:V',
-			     'leaddetails:company:Leads_Company:company:V',
-			     'leaddetails:email:Leads_Email:email:V'),
-
-		       Array('leaddetails:firstname:Leads_First_Name:firstname:V',
-                             'leaddetails:lastname:Leads_Last_Name:lastname:V',
-                             'leaddetails:company:Leads_Company:company:V',
-                             'leaddetails:email:Leads_Email:email:V',
-			     'leaddetails:leadsource:Leads_Lead_Source:leadsource:V'),
-
-		       Array('potential:potentialname:Potentials_Potential_Name:potentialname:V',
-                             'potential:amount:Potentials_Amount:amount:N',
-                             'potential:potentialtype:Potentials_Type:opportunity_type:V',
-                             'potential:leadsource:Potentials_Lead_Source:leadsource:V',
-                             'potential:sales_stage:Potentials_Sales_Stage:sales_stage:V'),
+$selectcolumns = Array(Array('vtiger_contactdetails:firstname:Contacts_First_Name:firstname:V',
+                             'vtiger_contactdetails:lastname:Contacts_Last_Name:lastname:V',
+                             'vtiger_contactsubdetails:leadsource:Contacts_Lead_Source:leadsource:V',
+                             'vtiger_accountContacts:accountname:Contacts_Account_Name:account_id:I',
+			     'vtiger_account:industry:Accounts_industry:industry:V',
+			     'vtiger_contactdetails:email:Contacts_Email:email:V'),
+
+		       Array('vtiger_contactdetails:firstname:Contacts_First_Name:firstname:V',
+                             'vtiger_contactdetails:lastname:Contacts_Last_Name:lastname:V',
+                             'vtiger_contactsubdetails:leadsource:Contacts_Lead_Source:leadsource:V',
+                             'vtiger_accountContacts:accountname:Contacts_Account_Name:account_id:I',
+                             'vtiger_account:industry:Accounts_industry:industry:V',
+                             'vtiger_contactdetails:email:Contacts_Email:email:V'),
+
+		       Array('vtiger_contactdetails:firstname:Contacts_First_Name:firstname:V',
+                             'vtiger_contactdetails:lastname:Contacts_Last_Name:lastname:V',
+                             'vtiger_accountContacts:accountname:Contacts_Account_Name:account_id:I',
+                             'vtiger_contactdetails:email:Contacts_Email:email:V',
+                             'vtiger_potential:potentialname:Potentials_Potential_Name:potentialname:V',
+                             'vtiger_potential:sales_stage:Potentials_Sales_Stage:sales_stage:V'),
+
+		       Array('vtiger_leaddetails:firstname:Leads_First_Name:firstname:V',
+			     'vtiger_leaddetails:lastname:Leads_Last_Name:lastname:V',
+			     'vtiger_leaddetails:company:Leads_Company:company:V',
+			     'vtiger_leaddetails:email:Leads_Email:email:V'),
+
+		       Array('vtiger_leaddetails:firstname:Leads_First_Name:firstname:V',
+                             'vtiger_leaddetails:lastname:Leads_Last_Name:lastname:V',
+                             'vtiger_leaddetails:company:Leads_Company:company:V',
+                             'vtiger_leaddetails:email:Leads_Email:email:V',
+			     'vtiger_leaddetails:leadsource:Leads_Lead_Source:leadsource:V'),
+
+		       Array('vtiger_potential:potentialname:Potentials_Potential_Name:potentialname:V',
+                             'vtiger_potential:amount:Potentials_Amount:amount:N',
+                             'vtiger_potential:potentialtype:Potentials_Type:opportunity_type:V',
+                             'vtiger_potential:leadsource:Potentials_Lead_Source:leadsource:V',
+                             'vtiger_potential:sales_stage:Potentials_Sales_Stage:sales_stage:V'),
   
-		       Array('potential:potentialname:Potentials_Potential_Name:potentialname:V',
-                             'potential:amount:Potentials_Amount:amount:N',
-                             'potential:potentialtype:Potentials_Type:opportunity_type:V',
-                             'potential:leadsource:Potentials_Lead_Source:leadsource:V',
-			     'potential:sales_stage:Potentials_Sales_Stage:sales_stage:V'),
-
-		       Array('activity:subject:Activities_Subject:subject:V',
-			     'contactdetailsActivities:lastname:Activities_Contact_Name:contact_id:I',
-                             'activity:status:Activities_Status:taskstatus:V',
-                             'activity:priority:Activities_Priority:taskpriority:V',
-                             'usersActivities:user_name:Activities_Assigned_To:assigned_user_id:V'),
-
-		       Array('activity:subject:Activities_Subject:subject:V',
-                             'contactdetailsActivities:lastname:Activities_Contact_Name:contact_id:I',
-                             'activity:status:Activities_Status:taskstatus:V',
-                             'activity:priority:Activities_Priority:taskpriority:V',
-                             'usersActivities:user_name:Activities_Assigned_To:assigned_user_id:V'),
-
-        	       Array('troubletickets:title:HelpDesk_Title:ticket_title:V',
-                             'troubletickets:status:HelpDesk_Status:ticketstatus:V',
-                             'products:productname:Products_Product_Name:productname:V',
-                             'products:discontinued:Products_Product_Active:discontinued:V',
-                             'products:productcategory:Products_Product_Category:productcategory:V',
-			     'products:manufacturer:Products_Manufacturer:manufacturer:V',
-			     'contactdetailsProducts:lastname:Products_Contact_Name:contact_id:I'),
-
- 		       Array('troubletickets:title:HelpDesk_Title:ticket_title:V',
-                             'troubletickets:priority:HelpDesk_Priority:ticketpriorities:V',
-                             'troubletickets:severity:HelpDesk_Severity:ticketseverities:V',
-                             'troubletickets:status:HelpDesk_Status:ticketstatus:V',
-                             'troubletickets:category:HelpDesk_Category:ticketcategories:V',
-                             'usersHelpDesk:user_name:HelpDesk_Assigned_To:assigned_user_id:V'),
-
-		       Array('troubletickets:title:HelpDesk_Title:ticket_title:V',
-                             'troubletickets:priority:HelpDesk_Priority:ticketpriorities:V',
-                             'troubletickets:severity:HelpDesk_Severity:ticketseverities:V',
-                             'troubletickets:status:HelpDesk_Status:ticketstatus:V',
-                             'troubletickets:category:HelpDesk_Category:ticketcategories:V',
-                             'usersHelpDesk:user_name:HelpDesk_Assigned_To:assigned_user_id:V'),
+		       Array('vtiger_potential:potentialname:Potentials_Potential_Name:potentialname:V',
+                             'vtiger_potential:amount:Potentials_Amount:amount:N',
+                             'vtiger_potential:potentialtype:Potentials_Type:opportunity_type:V',
+                             'vtiger_potential:leadsource:Potentials_Lead_Source:leadsource:V',
+			     'vtiger_potential:sales_stage:Potentials_Sales_Stage:sales_stage:V'),
+
+		       Array('vtiger_activity:subject:Activities_Subject:subject:V',
+			     'vtiger_contactdetailsActivities:lastname:Activities_Contact_Name:contact_id:I',
+                             'vtiger_activity:status:Activities_Status:taskstatus:V',
+                             'vtiger_activity:priority:Activities_Priority:taskpriority:V',
+                             'vtiger_usersActivities:user_name:Activities_Assigned_To:assigned_user_id:V'),
+
+		       Array('vtiger_activity:subject:Activities_Subject:subject:V',
+                             'vtiger_contactdetailsActivities:lastname:Activities_Contact_Name:contact_id:I',
+                             'vtiger_activity:status:Activities_Status:taskstatus:V',
+                             'vtiger_activity:priority:Activities_Priority:taskpriority:V',
+                             'vtiger_usersActivities:user_name:Activities_Assigned_To:assigned_user_id:V'),
+
+        	       Array('vtiger_troubletickets:title:HelpDesk_Title:ticket_title:V',
+                             'vtiger_troubletickets:status:HelpDesk_Status:ticketstatus:V',
+                             'vtiger_products:productname:Products_Product_Name:productname:V',
+                             'vtiger_products:discontinued:Products_Product_Active:discontinued:V',
+                             'vtiger_products:productcategory:Products_Product_Category:productcategory:V',
+			     'vtiger_products:manufacturer:Products_Manufacturer:manufacturer:V',
+			     'vtiger_contactdetailsProducts:lastname:Products_Contact_Name:contact_id:I'),
+
+ 		       Array('vtiger_troubletickets:title:HelpDesk_Title:ticket_title:V',
+                             'vtiger_troubletickets:priority:HelpDesk_Priority:ticketpriorities:V',
+                             'vtiger_troubletickets:severity:HelpDesk_Severity:ticketseverities:V',
+                             'vtiger_troubletickets:status:HelpDesk_Status:ticketstatus:V',
+                             'vtiger_troubletickets:category:HelpDesk_Category:ticketcategories:V',
+                             'vtiger_usersHelpDesk:user_name:HelpDesk_Assigned_To:assigned_user_id:V'),
+
+		       Array('vtiger_troubletickets:title:HelpDesk_Title:ticket_title:V',
+                             'vtiger_troubletickets:priority:HelpDesk_Priority:ticketpriorities:V',
+                             'vtiger_troubletickets:severity:HelpDesk_Severity:ticketseverities:V',
+                             'vtiger_troubletickets:status:HelpDesk_Status:ticketstatus:V',
+                             'vtiger_troubletickets:category:HelpDesk_Category:ticketcategories:V',
+                             'vtiger_usersHelpDesk:user_name:HelpDesk_Assigned_To:assigned_user_id:V'),
 		      
- 		       Array('products:productname:Products_Product_Name:productname:V',
-                             'products:productcode:Products_Product_Code:productcode:V',
-                             'products:discontinued:Products_Product_Active:discontinued:V',
-                             'products:productcategory:Products_Product_Category:productcategory:V',
-                             'contactdetailsProducts:lastname:Products_Contact_Name:contact_id:I',
-                             'products:website:Products_Website:website:V',
-			     'vendorRel:vendorname:Products_Vendor_Name:vendor_id:I',
-			     'products:mfr_part_no:Products_Mfr_PartNo:mfr_part_no:V'),
-
-		       Array('products:productname:Products_Product_Name:productname:V',
-                             'products:manufacturer:Products_Manufacturer:manufacturer:V',
-                             'products:productcategory:Products_Product_Category:productcategory:V',
-                             'contactdetails:firstname:Contacts_First_Name:firstname:V',
-                             'contactdetails:lastname:Contacts_Last_Name:lastname:V',
-                             'contactsubdetails:leadsource:Contacts_Lead_Source:leadsource:V'),
-
-		       Array('quotes:subject:Quotes_Subject:subject:V',
-                             'potentialRel:potentialname:Quotes_Potential_Name:potential_id:I',
-                             'quotes:quotestage:Quotes_Quote_Stage:quotestage:V',
-                             'contactdetailsQuotes:lastname:Quotes_Contact_Name:contact_id:V',
-                             'usersRel1:user_name:Quotes_Inventory_Manager:assigned_user_id1:I',
-                             'accountQuotes:accountname:Quotes_Account_Name:account_id:I'),
-
-		       Array('quotes:subject:Quotes_Subject:subject:V',
-                             'potentialRel:potentialname:Quotes_Potential_Name:potential_id:I',
-                             'quotes:quotestage:Quotes_Quote_Stage:quotestage:V',
-                             'contactdetailsQuotes:lastname:Quotes_Contact_Name:contact_id:V',	
-                             'usersRel1:user_name:Quotes_Inventory_Manager:assigned_user_id1:I',
-                             'accountQuotes:accountname:Quotes_Account_Name:account_id:I',
-			     'quotes:carrier:Quotes_Carrier:carrier:V',
-			     'quotes:shipping:Quotes_Shipping:shipping:V'),
-
-		       Array('purchaseorder:subject:PurchaseOrder_Subject:subject:V',
-			     'vendorRel:vendorname:PurchaseOrder_Vendor_Name:vendor_id:I',
-			     'purchaseorder:tracking_no:PurchaseOrder_Tracking_Number:tracking_no:V',
-			     'contactdetails:firstname:Contacts_First_Name:firstname:V',
-			     'contactdetails:lastname:Contacts_Last_Name:lastname:V',
-			     'contactsubdetails:leadsource:Contacts_Lead_Source:leadsource:V',
-			     'contactdetails:email:Contacts_Email:email:V'),
-
-		       Array('purchaseorder:subject:PurchaseOrder_Subject:subject:V',
-			     'vendorRel:vendorname:PurchaseOrder_Vendor_Name:vendor_id:I',
-			     'purchaseorder:requisition_no:PurchaseOrder_Requisition_No:requisition_no:V',
-                             'purchaseorder:tracking_no:PurchaseOrder_Tracking_Number:tracking_no:V',
-			     'contactdetailsPurchaseOrder:lastname:PurchaseOrder_Contact_Name:contact_id:I',
-			     'purchaseorder:carrier:PurchaseOrder_Carrier:carrier:V',
-			     'purchaseorder:salescommission:PurchaseOrder_Sales_Commission:salescommission:N',
-			     'purchaseorder:exciseduty:PurchaseOrder_Excise_Duty:exciseduty:N',
-                             'usersPurchaseOrder:user_name:PurchaseOrder_Assigned_To:assigned_user_id:V'),
-
-		       Array('invoice:subject:Invoice_Subject:subject:V',
-			     'invoice:salesorderid:Invoice_Sales_Order:salesorder_id:I',
-			     'invoice:customerno:Invoice_Customer_No:customerno:V',
-                             'invoice:notes:Invoice_Notes:notes:V',
-			     'invoice:invoiceterms:Invoice_Invoice_Terms:invoiceterms:V',
-			     'invoice:exciseduty:Invoice_Excise_Duty:exciseduty:N',
-			     'invoice:salescommission:Invoice_Sales_Commission:salescommission:N',
-			     'accountInvoice:accountname:Invoice_Account_Name:account_id:I')
+ 		       Array('vtiger_products:productname:Products_Product_Name:productname:V',
+                             'vtiger_products:productcode:Products_Product_Code:productcode:V',
+                             'vtiger_products:discontinued:Products_Product_Active:discontinued:V',
+                             'vtiger_products:productcategory:Products_Product_Category:productcategory:V',
+                             'vtiger_contactdetailsProducts:lastname:Products_Contact_Name:contact_id:I',
+                             'vtiger_products:website:Products_Website:website:V',
+			     'vtiger_vendorRel:vendorname:Products_Vendor_Name:vendor_id:I',
+			     'vtiger_products:mfr_part_no:Products_Mfr_PartNo:mfr_part_no:V'),
+
+		       Array('vtiger_products:productname:Products_Product_Name:productname:V',
+                             'vtiger_products:manufacturer:Products_Manufacturer:manufacturer:V',
+                             'vtiger_products:productcategory:Products_Product_Category:productcategory:V',
+                             'vtiger_contactdetails:firstname:Contacts_First_Name:firstname:V',
+                             'vtiger_contactdetails:lastname:Contacts_Last_Name:lastname:V',
+                             'vtiger_contactsubdetails:leadsource:Contacts_Lead_Source:leadsource:V'),
+
+		       Array('vtiger_quotes:subject:Quotes_Subject:subject:V',
+                             'vtiger_potentialRel:potentialname:Quotes_Potential_Name:potential_id:I',
+                             'vtiger_quotes:quotestage:Quotes_Quote_Stage:quotestage:V',
+                             'vtiger_contactdetailsQuotes:lastname:Quotes_Contact_Name:contact_id:V',
+                             'vtiger_usersRel1:user_name:Quotes_Inventory_Manager:assigned_user_id1:I',
+                             'vtiger_accountQuotes:accountname:Quotes_Account_Name:account_id:I'),
+
+		       Array('vtiger_quotes:subject:Quotes_Subject:subject:V',
+                             'vtiger_potentialRel:potentialname:Quotes_Potential_Name:potential_id:I',
+                             'vtiger_quotes:quotestage:Quotes_Quote_Stage:quotestage:V',
+                             'vtiger_contactdetailsQuotes:lastname:Quotes_Contact_Name:contact_id:V',	
+                             'vtiger_usersRel1:user_name:Quotes_Inventory_Manager:assigned_user_id1:I',
+                             'vtiger_accountQuotes:accountname:Quotes_Account_Name:account_id:I',
+			     'vtiger_quotes:carrier:Quotes_Carrier:carrier:V',
+			     'vtiger_quotes:shipping:Quotes_Shipping:shipping:V'),
+
+		       Array('vtiger_purchaseorder:subject:PurchaseOrder_Subject:subject:V',
+			     'vtiger_vendorRel:vendorname:PurchaseOrder_Vendor_Name:vendor_id:I',
+			     'vtiger_purchaseorder:tracking_no:PurchaseOrder_Tracking_Number:tracking_no:V',
+			     'vtiger_contactdetails:firstname:Contacts_First_Name:firstname:V',
+			     'vtiger_contactdetails:lastname:Contacts_Last_Name:lastname:V',
+			     'vtiger_contactsubdetails:leadsource:Contacts_Lead_Source:leadsource:V',
+			     'vtiger_contactdetails:email:Contacts_Email:email:V'),
+
+		       Array('vtiger_purchaseorder:subject:PurchaseOrder_Subject:subject:V',
+			     'vtiger_vendorRel:vendorname:PurchaseOrder_Vendor_Name:vendor_id:I',
+			     'vtiger_purchaseorder:requisition_no:PurchaseOrder_Requisition_No:requisition_no:V',
+                             'vtiger_purchaseorder:tracking_no:PurchaseOrder_Tracking_Number:tracking_no:V',
+			     'vtiger_contactdetailsPurchaseOrder:lastname:PurchaseOrder_Contact_Name:contact_id:I',
+			     'vtiger_purchaseorder:carrier:PurchaseOrder_Carrier:carrier:V',
+			     'vtiger_purchaseorder:salescommission:PurchaseOrder_Sales_Commission:salescommission:N',
+			     'vtiger_purchaseorder:exciseduty:PurchaseOrder_Excise_Duty:exciseduty:N',
+                             'vtiger_usersPurchaseOrder:user_name:PurchaseOrder_Assigned_To:assigned_user_id:V'),
+
+		       Array('vtiger_invoice:subject:Invoice_Subject:subject:V',
+			     'vtiger_invoice:salesorderid:Invoice_Sales_Order:salesorder_id:I',
+			     'vtiger_invoice:customerno:Invoice_Customer_No:customerno:V',
+                             'vtiger_invoice:notes:Invoice_Notes:notes:V',
+			     'vtiger_invoice:invoiceterms:Invoice_Invoice_Terms:invoiceterms:V',
+			     'vtiger_invoice:exciseduty:Invoice_Excise_Duty:exciseduty:N',
+			     'vtiger_invoice:salescommission:Invoice_Sales_Commission:salescommission:N',
+			     'vtiger_accountInvoice:accountname:Invoice_Account_Name:account_id:I')
 			);
 
 $reports = Array(Array('reportname'=>'Contacts by Accounts',
@@ -274,7 +274,7 @@
 
 		 Array('reportname'=>'Quotes Detailed Report',
                        'reportfolder'=>'Quote Reports',
-                       'description'=>'Quotes detailed vtiger_report',
+                       'description'=>'Quotes detailed report',
                        'reporttype'=>'tabular',
                        'sortid'=>'','stdfilterid'=>'','advfilterid'=>''),
 
@@ -286,13 +286,13 @@
 
 		 Array('reportname'=>'PurchaseOrder Detailed Report',
                        'reportfolder'=>'PurchaseOrder Reports',
-                       'description'=>'PurchaseOrder detailed vtiger_report',
+                       'description'=>'PurchaseOrder detailed report',
                        'reporttype'=>'tabular',
                        'sortid'=>'','stdfilterid'=>'','advfilterid'=>''),
 
 		 Array('reportname'=>'Invoice Detailed Report',
                        'reportfolder'=>'Invoice Reports',
-                       'description'=>'Invoice detailed vtiger_report',
+                       'description'=>'Invoice detailed report',
                        'reporttype'=>'tabular',
                        'sortid'=>'','stdfilterid'=>'','advfilterid'=>'')
 
@@ -300,33 +300,33 @@
 
 $sortorder = Array(
                    Array(
-                         Array('columnname'=>'leaddetails:leadsource:Leads_Lead_Source:leadsource:V',
+                         Array('columnname'=>'vtiger_leaddetails:leadsource:Leads_Lead_Source:leadsource:V',
                                'sortorder'=>'Ascending'
                               )
 			),
 		   Array(
-                         Array('columnname'=>'leaddetails:leadstatus:Leads_Lead_Status:leadstatus:V',
+                         Array('columnname'=>'vtiger_leaddetails:leadstatus:Leads_Lead_Status:leadstatus:V',
                                'sortorder'=>'Ascending'
                               )
                         ),
 		   Array(
-                         Array('columnname'=>'potential:sales_stage:Potentials_Sales_Stage:sales_stage:V',
+                         Array('columnname'=>'vtiger_potential:sales_stage:Potentials_Sales_Stage:sales_stage:V',
                                'sortorder'=>'Ascending'
                               )
                         ),
 		   Array(
-                         Array('columnname'=>'troubletickets:priority:HelpDesk_Priority:ticketpriorities:V',
+                         Array('columnname'=>'vtiger_troubletickets:priority:HelpDesk_Priority:ticketpriorities:V',
                                'sortorder'=>'Ascending'
                               )
                         )
                   );
 
-$stdfilters = Array(Array('columnname'=>'crmentityActivities:modifiedtime:Activities_Modified_Time',
+$stdfilters = Array(Array('columnname'=>'vtiger_crmentityActivities:modifiedtime:Activities_Modified_Time',
 			  'datefilter'=>'lastmonth',
 			  'startdate'=>'2005-05-01',
 			  'enddate'=>'2005-05-31'),
 
-		    Array('columnname'=>'crmentityActivities:modifiedtime:Activities_Modified_Time',
+		    Array('columnname'=>'vtiger_crmentityActivities:modifiedtime:Activities_Modified_Time',
                           'datefilter'=>'thismonth',
                           'startdate'=>'2005-06-01',
                           'enddate'=>'2005-06-30')
@@ -334,41 +334,41 @@
 
 $advfilters = Array(
                       Array(
-                            Array('columnname'=>'accountContacts:accountname:Contacts_Account_Name:account_id:I',
+                            Array('columnname'=>'vtiger_accountContacts:accountname:Contacts_Account_Name:account_id:I',
                                   'comparator'=>'n',
                                   'value'=>''
                                  )
                            ),
 		      Array(
-                            Array('columnname'=>'accountContacts:accountname:Contacts_Account_Name:account_id:I',
+                            Array('columnname'=>'vtiger_accountContacts:accountname:Contacts_Account_Name:account_id:I',
                                   'comparator'=>'e',
                                   'value'=>''
                                  )
                            ),
 		      Array(
-                            Array('columnname'=>'potential:potentialname:Potentials_Potential_Name:potentialname:V',
+                            Array('columnname'=>'vtiger_potential:potentialname:Potentials_Potential_Name:potentialname:V',
                                   'comparator'=>'n',
                                   'value'=>''
                                  )
                            ),
 		      Array(
-                            Array('columnname'=>'potential:sales_stage:Potentials_Sales_Stage:sales_stage:V',
+                            Array('columnname'=>'vtiger_potential:sales_stage:Potentials_Sales_Stage:sales_stage:V',
                                   'comparator'=>'e',
                                   'value'=>'Closed Won'
                                  )
                            ),
 		      Array(
-                            Array('columnname'=>'troubletickets:status:HelpDesk_Status:ticketstatus:V',
+                            Array('columnname'=>'vtiger_troubletickets:status:HelpDesk_Status:ticketstatus:V',
                                   'comparator'=>'n',
                                   'value'=>'Closed'
                                  )
                            ),
 		      Array(
-                            Array('columnname'=>'quotes:quotestage:Quotes_Quote_Stage:quotestage:V',
+                            Array('columnname'=>'vtiger_quotes:quotestage:Quotes_Quote_Stage:quotestage:V',
                                   'comparator'=>'n',
                                   'value'=>'Accepted'
                                  ),
-			    Array('columnname'=>'quotes:quotestage:Quotes_Quote_Stage:quotestage:V',
+			    Array('columnname'=>'vtiger_quotes:quotestage:Quotes_Quote_Stage:quotestage:V',
                                   'comparator'=>'n',
                                   'value'=>'Rejected'
                                  )



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 20 09:46:43 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 20 Jun 2006 16:46:43 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7313 -
 /vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
Message-ID: <20060620164643.BAD4F83F2E7@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 20 10:46:40 2006
New Revision: 7313

Log:
Activities added for Support parenttab

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

Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original)
+++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Tue Jun 20 10:46:40 2006
@@ -2158,7 +2158,8 @@
 	$this->db->query("insert into vtiger_parenttabrel values (4,10,7)");
 	$this->db->query("insert into vtiger_parenttabrel values (2,7,5)");
 	$this->db->query("insert into vtiger_parenttabrel values (4,9,6)");
-
+	$this->db->query("insert into vtiger_parenttabrel values (4,9,8)");
+		
 	//Added to populate the default inventory tax informations
 	$this->db->query("insert into vtiger_inventorytaxinfo values(".$this->db->getUniqueID("inventorytaxinfo").",'VAT','4.5')");
 	$this->db->query("insert into vtiger_inventorytaxinfo values(".$this->db->getUniqueID("inventorytaxinfo").",'Sales','10')");



From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 17:51:33 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 00:51:33 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231316=3A?=
 =?utf-8?q?_Problem_in_VCRM_4=2E2=2E4?=
In-Reply-To: <076.bd13c28908a052328e19e2f345da9f18@vtiger.fosslabs.com>
References: <076.bd13c28908a052328e19e2f345da9f18@vtiger.fosslabs.com>
Message-ID: <085.31967f7be92d906f7d30c35febc09b3a@vtiger.fosslabs.com>

#1316: Problem in VCRM 4.2.4
------------------------+---------------------------------------------------
  Reporter:  Simon      |       Owner:  developer                
      Type:  defect     |      Status:  new                      
  Priority:  major      |   Milestone:  4.2.4                    
 Component:  vtigercrm  |     Version:                           
Resolution:             |    Keywords:  email, quote, sales order
------------------------+---------------------------------------------------
Comment (by Simon):

 Hello,
 i just found the solution for no.3, when i change the source code of
 ..\modules\Quotes\CreatePDF.php"

 from (in the bottom of CreatePDF.php),
  $pdf->setProductDetails($iHeadDtls,$iDataDtls);
  $pdf->setTotal($price_total,$conditions);
  $pdf->Output('Quotes.pdf','D');
  exit;
  ?>

 to,

  $pdf->setProductDetails($iHeadDtls,$iDataDtls);
  $pdf->setTotal($price_total,$conditions);
  $pdf->Output();
  exit;
  ?>

 then the pdf file will open in the same window and the problem for this
 question is solved. the solution also need to apply in
 ..\modules\Orders\CreateSOPDF.php" because it contains same problem in
 module Quotes.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1316>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 19:27:17 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 02:27:17 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231345=3A?=
 =?utf-8?q?_Error_saving_the_sales_order?=
Message-ID: <076.2d41a315f9cfd034311ac755935afb51@vtiger.fosslabs.com>

#1345: Error saving the sales order
---------------------------------+------------------------------------------
 Reporter:  Simon                |       Owner:  developer
     Type:  defect               |      Status:  new      
 Priority:  major                |   Milestone:  5.0.0    
Component:  vtigercrm            |     Version:  5.0.0    
 Keywords:  quotes, sales order  |  
---------------------------------+------------------------------------------
 when creating a sales order directly from a quote, it contains bug. if you
 follows below step to create a sales order:-
 -create a quote using [New Quote], and save it
 -then open [Export To PDF] to view the quote in pdf
 -then create sales order directly from quote using [Create Sales Order]
 above the detail view of that quote and save it
 -then the bug occur which is the detail view of sales order is empty after
 save.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1345>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 19:31:05 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 02:31:05 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231346=3A?=
 =?utf-8?q?_Bug_in_sales_stage_history_with_date_format?=
Message-ID: <076.bab2ea728a9018419ac1466eb7e6303a@vtiger.fosslabs.com>

#1346: Bug in sales stage history with date format
-----------------------+----------------------------------------------------
 Reporter:  gopal      |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  blocker    |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 If it is used date format dd-mm-yyyy (commonly used in Poland) instead
 yyyy-mm-dd, in the sales stage history we receive wrong close date for
 potentials. Perhaps in the code for setting history record it is used
 fixed date format that doesn?t consider user date format set in user?s
 configuration.

 When is chosen yyyy-mm-dd date format, close date is set properly.

 Reported by: Pfilipkowski -
 http://forums.vtiger.com/viewtopic.php?p=26274#26274

 Thanks,

 Gopal

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1346>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 20 21:24:09 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 04:24:09 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7314 - in
 /vtigercrm/branches/4.2: data/ include/ modules/Accounts/ modules/Orders/
 modules/Settings/language/ modules/Users/
Message-ID: <20060621042410.19B6483F33D@vtiger.fosslabs.com>

Author: jrydbeck
Date: Tue Jun 20 22:23:57 2006
New Revision: 7314

Log:
Finished php notices bug #748.  This changeset will close-out the bug. Some noticies still appear, but should be bugged individually

Modified:
    vtigercrm/branches/4.2/data/SugarBean.php
    vtigercrm/branches/4.2/include/RelatedListView.php
    vtigercrm/branches/4.2/include/uifromdbutil.php
    vtigercrm/branches/4.2/include/utils.php
    vtigercrm/branches/4.2/modules/Accounts/RenderRelatedListUI.php
    vtigercrm/branches/4.2/modules/Orders/RenderRelatedListUI.php
    vtigercrm/branches/4.2/modules/Orders/SalesOrderDetailView.php
    vtigercrm/branches/4.2/modules/Orders/SalesOrderListView.php
    vtigercrm/branches/4.2/modules/Settings/language/en_us.lang.php
    vtigercrm/branches/4.2/modules/Users/DetailView.php
    vtigercrm/branches/4.2/modules/Users/EditView.php
    vtigercrm/branches/4.2/modules/Users/User.php

Modified: vtigercrm/branches/4.2/data/SugarBean.php
==============================================================================
--- vtigercrm/branches/4.2/data/SugarBean.php (original)
+++ vtigercrm/branches/4.2/data/SugarBean.php Tue Jun 20 22:23:57 2006
@@ -289,25 +289,25 @@
 		$rows_found =  $this->db->getRowCount($result);
 
 		$this->log->debug("Found $rows_found ".$this->object_name."s");
-                
+
 		$previous_offset = $row_offset - $max_per_page;
 		$next_offset = $row_offset + $max_per_page;
 
 		if($rows_found != 0)
 		{
-
 			// We have some data.
-
-			for($index = $row_offset , $row = $this->db->fetchByAssoc($result, $index); $row && ($index < $row_offset + $max_per_page || $max_per_page == -99) ;$index++, $row = $this->db->fetchByAssoc($result, $index)){
+			for($index = $row_offset , $row = $this->db->fetchByAssoc($result, $index); $row && ($index < $row_offset + $max_per_page || $max_per_page == -99) ;$index++, $row = $this->db->fetchByAssoc($result, $index))
+			{
 				foreach($this->list_fields as $field)
 				{
-					if (isset($row[$field])) {
+					if (isset($row[$field]))
+					{
 						$this->$field = $row[$field];
-						
-						
-						$this->log->debug("$this->object_name({$row['id']}): ".$field." = ".$this->$field);
+						// this used to display {$row['id']}, but that was broken and I'm
+						// 		not certain what that was supposed to display
+						$this->log->debug("$this->object_name(): ".$field." = ".$this->$field);
 					}
-					else 
+					else
 					{
 						$this->$field = "";
 					}

Modified: vtigercrm/branches/4.2/include/RelatedListView.php
==============================================================================
--- vtigercrm/branches/4.2/include/RelatedListView.php (original)
+++ vtigercrm/branches/4.2/include/RelatedListView.php Tue Jun 20 22:23:57 2006
@@ -1,670 +1,673 @@
-<?php
-require_once('modules/Users/UserInfoUtil.php');
-require_once("include/utils.php");
-
-function GetRelatedList($module,$relatedmodule,$focus,$query,$button,$returnset,$edit_val='',$del_val='')
-{
-
-require_once('XTemplate/xtpl.php');
-require_once("data/Tracker.php");
-require_once('include/database/PearDatabase.php');
-
-global $adb;
-global $app_strings;
-global $current_language;
-
-$mod_dir=getModuleDirName($module);
-$current_module_strings = return_module_language($current_language, $mod_dir);
-
-global $list_max_entries_per_page;
-global $urlPrefix;
-
-$log = LoggerManager::getLogger('account_list');
-
-global $currentModule;
-global $theme;
-global $theme_path;
-global $theme_path;
-
-// focus_list is the means of passing data to a ListView.
-global $focus_list;
-
-if (!isset($where)) $where = "";
-
-if (isset($_REQUEST['order_by'])) $order_by = $_REQUEST['order_by'];
-
-//if($module == 'Potentials')
-//	$focus = new Potential();
-
-echo '<br><br>';
-
-$button = '<table cellspacing=0 cellpadding=2><tr><td>'.$button.'</td></tr></table>';
-
-// Added to have Purchase Order as form Title
-if($relatedmodule == 'Orders') 
-{
-	echo get_form_header($app_strings['PurchaseOrder'],$button, false);
-}
-else
-{
-	echo get_form_header($app_strings[$relatedmodule],$button, false);
-}
-
-$xtpl=new XTemplate ('include/RelatedListView.html');
-require_once('themes/'.$theme.'/layout_utils.php');
-$theme_path="themes/".$theme."/";
-$image_path=$theme_path."images/";
-$xtpl->assign("MOD", $mod_strings);
-$xtpl->assign("APP", $app_strings);
-$xtpl->assign("IMAGE_PATH",$image_path);
-
-//Retreive the list from Database
-//$query = getListQuery("Accounts");
-
-//Appending the security parameter
-global $others_permission_id;
-global $current_user;
-$rel_tab_id = getTabid($relatedmodule);
-$defSharingPermissionData = $_SESSION['defaultaction_sharing_permission_set'];
-$others_rel_permission_id = $defSharingPermissionData[$rel_tab_id];
-if($others_rel_permission_id == 3 && $relatedmodule != 'Notes' && $relatedmodule != 'Products' && $relatedmodule != 'Faq' && $relatedmodule != 'PriceBook') //Security fix by Don
-{
-	 $query .= " and crmentity.smownerid in(".$current_user->id .",0)";
-}
-
-if(isset($where) && $where != '')
-{
-        $query .= ' and '.$where;
-}
-
-//Appending the group by for Jaguar/Don
-// group by won't work this way in postgres
-if($relatedmodule == 'Activities' && !$adb->isPostgres())
-{
-	$query .= ' group by crmentity.crmid';
-}
-
-
-//$url_qry = getURLstring($focus);
-
-if(isset($order_by) && $order_by != '')
-{
-        $query .= ' ORDER BY '.$order_by;
-        $url_qry .="&order_by=".$order_by;
-}
-
-$list_result = $adb->query($query);
-//Retreiving the no of rows
-$noofrows = $adb->num_rows($list_result);
-        
-//Retreiving the start value from request
-$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 = getRelatedNavigationValues($start, $noofrows, $list_max_entries_per_page, $relatedmodule);
-
-//Retreive the List View Table Header
-if($noofrows == 0)
-{
-	echo $app_strings['LBL_NONE_SCHEDULED'];
-}
-else
-{
-	$listview_header = getListViewHeader($focus,$relatedmodule,'','','','relatedlist');//"Accounts");
-	if ($navigation_array[$relatedmodule.'end_val'] - $navigation_array[$relatedmodule.'start'] > 15)
-	{
-		$xtpl->assign('SCROLLSTART','<div style="overflow:auto;height:315px;width:100%;">');
-		$xtpl->assign('SCROLLSTOP','</div>');
-	}
-	$xtpl->assign("LISTHEADER", $listview_header);
-
-	if($module == 'PriceBook' && $relatedmodule == 'Products')
-	{
-		$listview_entries = getListViewEntries($focus,$relatedmodule,$list_result,$navigation_array,'relatedlist',$returnset,$edit_val,$del_val);
-	}
-	if($module == 'Products' && $relatedmodule == 'PriceBook')
-	{
-		$listview_entries = getListViewEntries($focus,$relatedmodule,$list_result,$navigation_array,'relatedlist',$returnset,'EditListPrice','DeletePriceBookProductRel');
-	}
-	elseif($relatedmodule == 'SalesOrder')
-	{
-		$listview_entries = getListViewEntries($focus,$relatedmodule,$list_result,$navigation_array,'relatedlist',$returnset,'SalesOrderEditView','DeleteSalesOrder');
-	}else
-	{
-		$listview_entries = getListViewEntries($focus,$relatedmodule,$list_result,$navigation_array,'relatedlist',$returnset);
-	}
-
-	//$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, 'DetailView', '');
-	//echo $navigationOutput;
-
-	$navigationOutput = '
-<table  cellpadding="0" cellspacing="0" width="100%" border="0" class="FormBorder">
-        <tr height="20">
-                <td class="listFormHeaderLinks">
-                        <table border="0" cellpadding="0" cellspacing="0" width="100%">
-                        <tr>'.$navigationOutput.'</tr>
-                        </table>
-                </td>
-        </tr>
-</table>';
-
-
-	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");
-}
-
-}
-
-function getAttachmentsAndNotes($parentmodule,$query,$id,$sid='')
-{
-	global $theme;
-
-	$list = '<script>
-                        function confirmdelete(url)
-                        {
-                                if(confirm("Are you sure?"))
-                                {
-                                        document.location.href=url;
-                                }
-                        }
-                </script>';
-
-	$theme_path="themes/".$theme."/";
-	$image_path=$theme_path."images/";
-	require_once ($theme_path."layout_utils.php");
-
-	global $adb;
-	global $mod_strings;
-	global $app_strings;
-
-	$result=$adb->query($query);
-	$noofrows = $adb->num_rows($result);
-	if($sid=='salesorderid')
-	{
-		$return_action = "SalesOrderDetailView";
-	}
-	else
-	{
-		$return_action = "DetailView";
-	}
-	$button .= '<table cellspacing=0 cellpadding=2><tr><td>';
-	$button .= '<input type="hidden" name="fileid">';
-	$button .= '<input title="New Attachment" accessyKey="F" class="button" onclick="this.form.action.value=\'upload\';this.form.module.value=\'uploads\'" type="submit" name="button" value="'.$app_strings['LBL_NEW_ATTACHMENT'].'">&nbsp;';
-
-        if(isPermitted("Notes",1,"") == 'yes')
-        {
-	
-		$button .= '<input title="New Notes" accessyKey="F" class="button" onclick="this.form.action.value=\'EditView\';this.form.return_action.value=\''.$return_action.'\';this.form.module.value=\'Notes\'" type="submit" name="button" value="'.$app_strings['LBL_NEW_NOTE'].'">&nbsp;';
-	}
-	$button .= '</td></tr></table>';
-	
-
-echo '<br><br>';
-echo get_form_header($app_strings['LBL_ATTACHMENT_AND_NOTES'],$button, false);
-
-if($noofrows == 0)
-{
-	echo $app_strings['LBL_NONE_SCHEDULED'];
-}
-else
-{
+<?php
+require_once('modules/Users/UserInfoUtil.php');
+require_once("include/utils.php");
+
+function GetRelatedList($module,$relatedmodule,$focus,$query,$button,$returnset,$edit_val='',$del_val='')
+{
+
+require_once('XTemplate/xtpl.php');
+require_once("data/Tracker.php");
+require_once('include/database/PearDatabase.php');
+
+global $adb;
+global $app_strings;
+global $mod_strings;
+global $current_language;
+
+$mod_dir=getModuleDirName($module);
+$current_module_strings = return_module_language($current_language, $mod_dir);
+
+global $list_max_entries_per_page;
+global $urlPrefix;
+
+$log = LoggerManager::getLogger('account_list');
+
+global $currentModule;
+global $theme;
+global $theme_path;
+global $theme_path;
+
+// focus_list is the means of passing data to a ListView.
+global $focus_list;
+
+if (!isset($where)) $where = "";
+
+if (isset($_REQUEST['order_by'])) $order_by = $_REQUEST['order_by'];
+
+//if($module == 'Potentials')
+//	$focus = new Potential();
+
+echo '<br><br>';
+
+$button = '<table cellspacing=0 cellpadding=2><tr><td>'.$button.'</td></tr></table>';
+
+// Added to have Purchase Order as form Title
+if($relatedmodule == 'Orders') 
+{
+	echo get_form_header($app_strings['PurchaseOrder'],$button, false);
+}
+else
+{
+	echo get_form_header($app_strings[$relatedmodule],$button, false);
+}
+
+$xtpl=new XTemplate ('include/RelatedListView.html');
+require_once('themes/'.$theme.'/layout_utils.php');
+$theme_path="themes/".$theme."/";
+$image_path=$theme_path."images/";
+$xtpl->assign("MOD", $mod_strings);
+$xtpl->assign("APP", $app_strings);
+$xtpl->assign("IMAGE_PATH",$image_path);
+
+//Retreive the list from Database
+//$query = getListQuery("Accounts");
+
+//Appending the security parameter
+global $others_permission_id;
+global $current_user;
+$rel_tab_id = getTabid($relatedmodule);
+$defSharingPermissionData = $_SESSION['defaultaction_sharing_permission_set'];
+$others_rel_permission_id = $defSharingPermissionData[$rel_tab_id];
+if($others_rel_permission_id == 3 && $relatedmodule != 'Notes' && $relatedmodule != 'Products' && $relatedmodule != 'Faq' && $relatedmodule != 'PriceBook') //Security fix by Don
+{
+	 $query .= " and crmentity.smownerid in(".$current_user->id .",0)";
+}
+
+if(isset($where) && $where != '')
+{
+        $query .= ' and '.$where;
+}
+
+//Appending the group by for Jaguar/Don
+// group by won't work this way in postgres
+if($relatedmodule == 'Activities' && !$adb->isPostgres())
+{
+	$query .= ' group by crmentity.crmid';
+}
+
+
+//$url_qry = getURLstring($focus);
+
+if(isset($order_by) && $order_by != '')
+{
+        $query .= ' ORDER BY '.$order_by;
+        $url_qry .="&order_by=".$order_by;
+}
+
+$list_result = $adb->query($query);
+//Retreiving the no of rows
+$noofrows = $adb->num_rows($list_result);
+        
+//Retreiving the start value from request
+$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 = getRelatedNavigationValues($start, $noofrows, $list_max_entries_per_page, $relatedmodule);
+
+//Retreive the List View Table Header
+if($noofrows == 0)
+{
+	echo $app_strings['LBL_NONE_SCHEDULED'];
+}
+else
+{
+	$listview_header = getListViewHeader($focus,$relatedmodule,'','','','relatedlist');//"Accounts");
+	if ($navigation_array[$relatedmodule.'end_val'] - $navigation_array[$relatedmodule.'start'] > 15)
+	{
+		$xtpl->assign('SCROLLSTART','<div style="overflow:auto;height:315px;width:100%;">');
+		$xtpl->assign('SCROLLSTOP','</div>');
+	}
+	$xtpl->assign("LISTHEADER", $listview_header);
+
+	if($module == 'PriceBook' && $relatedmodule == 'Products')
+	{
+		$listview_entries = getListViewEntries($focus,$relatedmodule,$list_result,$navigation_array,'relatedlist',$returnset,$edit_val,$del_val);
+	}
+	if($module == 'Products' && $relatedmodule == 'PriceBook')
+	{
+		$listview_entries = getListViewEntries($focus,$relatedmodule,$list_result,$navigation_array,'relatedlist',$returnset,'EditListPrice','DeletePriceBookProductRel');
+	}
+	elseif($relatedmodule == 'SalesOrder')
+	{
+		$listview_entries = getListViewEntries($focus,$relatedmodule,$list_result,$navigation_array,'relatedlist',$returnset,'SalesOrderEditView','DeleteSalesOrder');
+	}else
+	{
+		$listview_entries = getListViewEntries($focus,$relatedmodule,$list_result,$navigation_array,'relatedlist',$returnset);
+	}
+
+	//$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, 'DetailView', '');
+	//echo $navigationOutput;
+
+	$navigationOutput = '
+<table  cellpadding="0" cellspacing="0" width="100%" border="0" class="FormBorder">
+        <tr height="20">
+                <td class="listFormHeaderLinks">
+                        <table border="0" cellpadding="0" cellspacing="0" width="100%">
+                        <tr>'.$navigationOutput.'</tr>
+                        </table>
+                </td>
+        </tr>
+</table>';
+
+
+	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");
+}
+
+}
+
+function getAttachmentsAndNotes($parentmodule,$query,$id,$sid='')
+{
+	global $theme;
+
+	$list = '<script>
+                        function confirmdelete(url)
+                        {
+                                if(confirm("Are you sure?"))
+                                {
+                                        document.location.href=url;
+                                }
+                        }
+                </script>';
+
+	$theme_path="themes/".$theme."/";
+	$image_path=$theme_path."images/";
+	require_once ($theme_path."layout_utils.php");
+
+	global $adb;
+	global $mod_strings;
+	global $app_strings;
+
+	$result=$adb->query($query);
+	$noofrows = $adb->num_rows($result);
+	
+	if($sid=='salesorderid')
+	{
+		$return_action = "SalesOrderDetailView";
+	}
+	else
+	{
+		$return_action = "DetailView";
+	}
+	
+	$button = '<table cellspacing=0 cellpadding=2><tr><td>';
+	$button .= '<input type="hidden" name="fileid">';
+	$button .= '<input title="New Attachment" accessyKey="F" class="button" onclick="this.form.action.value=\'upload\';this.form.module.value=\'uploads\'" type="submit" name="button" value="'.$app_strings['LBL_NEW_ATTACHMENT'].'">&nbsp;';
+
+        if(isPermitted("Notes",1,"") == 'yes')
+        {
+	
+		$button .= '<input title="New Notes" accessyKey="F" class="button" onclick="this.form.action.value=\'EditView\';this.form.return_action.value=\''.$return_action.'\';this.form.module.value=\'Notes\'" type="submit" name="button" value="'.$app_strings['LBL_NEW_NOTE'].'">&nbsp;';
+	}
+	$button .= '</td></tr></table>';
+	
+
+echo '<br><br>';
+echo get_form_header($app_strings['LBL_ATTACHMENT_AND_NOTES'],$button, false);
+
+if($noofrows == 0)
+{
+	echo $app_strings['LBL_NONE_SCHEDULED'];
+}
+else
+{
 // begin: Armando L?scher 15.07.2005 -> ?scrollableTables
 // Desc: class="blackLine" deleted because of vertical line in title <tr>
-	$list .= '<table border="0" cellpadding="0" cellspacing="0" class="FormBorder" width="100%">';
-	$list .= '<tr class="ModuleListTitle" height=20>';
-
-	$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-	$list .= '<td width="30%" class="moduleListTitle">';
-
-	$class_black="";
-	if($noofrows<15)
-	{
-		$class_black='class="blackLine"';
-	}
-	$list .= $app_strings['LBL_TITLE_OR_DESCRIPTION'].'</td>';
-	$list .= '<td WIDTH="1" '.$class_black .'><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-	$list .= '<td width="10%" class="moduleListTitle">';
-
-	$list .= $app_strings['LBL_ENTITY_TYPE'].'</td>';
-	$list .= '<td WIDTH="1" '.$class_black .'><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-	$list .= '<td width="15%" class="moduleListTitle">';
-
-	$list .= $app_strings['LBL_FILENAME'].'</td>';
-	$list .= '<td WIDTH="1" '.$class_black .'><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-	$list .= '<td width="15%" class="moduleListTitle">';
-
-	$list .= $app_strings['LBL_TYPE'].'</td>';
-	$list .= '<td WIDTH="1" '.$class_black .'><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-	$list .= '<td width="20%" class="moduleListTitle">';
-
-	$list .= $app_strings['LBL_LAST_MODIFIED'].'</td>';
-	$list .= '<td WIDTH="1" '.$class_black .'><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-	$list .= '<td width="10%" class="moduleListTitle" height="21">';
-
-	$list .= $app_strings['LBL_ACTION'].'</td>';
-	$list .= '<td WIDTH="1" '.$class_black .'><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-	$list .= '<td class="moduleListTitle">';
-
-	$list .= '</td>';
-	if($noofrows>15)
-	{
-		$list .= '<td style="width:20px">&nbsp;&nbsp&nbsp;&nbsp;</td>';
-	}
-
-	$list .= '</tr>';
-	$list .= '<tr><td COLSPAN="12" class="blackLine"><IMG SRC="themes/'.$theme.'/images//blank.gif"></td></tr>';
-//	$list .= '</table>';
-// end: Armando L?scher 15.07.2005 -> scrollableTables
-
-// begin: Armando L?scher 14.07.2005 -> ?scrollableTables
-// Desc: 'Y'
-//			 Insert new table with 1 cell where all entries are in a new table.
-//			 This cell will be scrollable when too many entries exist
-	$list .= ($noofrows>15) ? '<tr><td colspan="20"><div style="overflow:auto;height:315px;width:100%;"><table cellspacing="0" cellpadding="0" border="0" width="100%">':'';
-// end: Armando L?scher 14.07.2005 -> ?scrollableTables
-
-	$i=1;
-	while($row = $adb->fetch_array($result))
-	{
-        	if($row[1] == 'Notes')
-	        {
-        	        $module = 'Notes';
-                	$editaction = 'EditView';
-	                $deleteaction = 'Delete';
-        	}
-	        elseif($row[1] == 'Attachments')
-	        {
-	                $module = 'uploads';
-	                $editaction = 'upload';
-	                $deleteaction = 'deleteattachments';
-	        }
-
-		if ($i%2==0)
-			$trowclass = 'evenListRow';
-		else
-			$trowclass = 'oddListRow';
-
-		$list .= '<tr class="'. $trowclass.'">';
-
-		$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-
-		if($module == 'Notes')
-			$list .= '<td width="30%"><a href="index.php?module='.$module.'&action=DetailView&return_module='.$returnmodule.'&return_action='.$returnaction.'&record='.$row["crmid"] .'&return_id='.$_REQUEST['record'].'">'.$row[0].'</td>';
-		elseif($module == 'uploads')
-			$list .= '<td width="30%">'.$row[0].'</td>';
-
-		$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-		$list .= '<td width="10%" height="21" style="padding:0px 3px 0px 3px;">';
-		$list .= $row[1];
-		$list .= '</td>';
-
-		$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-		$list .= '<td width="15%" height="21" style="padding:0px 3px 0px 3px;">';
-		$list .= '<a href = "index.php?module=uploads&action=downloadfile&return_module=Accounts&activity_type=' . $row[1] . '&fileid=' . $row[5] . '&filename=' . urlencode($row[2]) . '">' . $row[2] . '</a>';
-		$list .= '</td>';
-
-		$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-		$list .= '<td width="15%" height="21" style="padding:0px 3px 0px 3px;">';
-		$list .= $row[3];
-		$list .= '</td>';
-
-		$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-		$list .= '<td width="20%" height="21" style="padding:0px 3px 0px 3px;">';
-
-		if($row[4] != '0000-00-00 00:00:00')
-			$list .= $row[4];
-		else
-                        $list .= '';
-
-		$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-		$list .= '<td width="10%" height="21" style="padding:0px 3px 0px 3px;">';
-
-		if($row[1] == 'Notes')
-			$list .= '<a href="index.php?module='.$module.'&action='.$editaction.'&return_module='.$parentmodule.'&return_action='.$return_action.'&record='.$row["crmid"].'&filename='.$row[2].'&fileid='.$row['attachmentsid'].'&return_id='.$_REQUEST["record"].'">'.$app_strings['LNK_EDIT'].'</a>  |  ';
-//		$list .= '<a href="index.php?module='.$module.'&action='.$deleteaction.'&return_module='.$parentmodule.'&return_action=DetailView&record='.$row["crmid"].'&filename='.$row[2].'&return_id='.$_REQUEST["record"].'">'.$app_strings['LNK_DELETE'].'</a>';
-		$del_param = 'index.php?module='.$module.'&action='.$deleteaction.'&return_module='.$parentmodule.'&return_action='.$return_action.'&record='.$row["crmid"].'&filename='.$row[2].'&return_id='.$_REQUEST["record"];
-                $list .= '<a href="javascript:confirmdelete(\''.$del_param.'\')">'.$app_strings['LNK_DELETE'].'</a>';
-
-		$list .= '</td>';
-
-		$list .= '</tr>';
-		$i++;
-	}
-	
-// begin: Armando L?scher 14.07.2005 -> ?scrollableTables
-// Desc: Close table from 'Y'
-		$list .= ($noofrows>15) ? '</table></div></td></tr>':'';
-// end: Armando L?scher 14.07.2005 -> scrollableTables
-
-	$list .= '<tr><td COLSPAN="12" class="blackLine"><IMG SRC="themes/'.$theme.'/images//blank.gif"></td></tr>';
-	$list .= '</table>';
-	echo $list;
-
-}
-}
-
-function getHistory($parentmodule,$query,$id)
-{
-	$parentaction = $_REQUEST['action'];
-	global $theme;
-	$theme_path="themes/".$theme."/";
-	$image_path=$theme_path."images/";
-	require_once ($theme_path."layout_utils.php");
-
-	global $adb;
-	global $mod_strings;
-	global $app_strings;
-
-	//Appending the security parameter
-	global $others_permission_id;
-	global $current_user;
-	$rel_tab_id = getTabid("Activities");
-	$defSharingPermissionData = $_SESSION['defaultaction_sharing_permission_set'];
-	$others_rel_permission_id = $defSharingPermissionData[$rel_tab_id];
-	if($others_rel_permission_id == 3) //Security fix by Don
-	{
-         	$query .= " and crmentity.smownerid in(".$current_user->id .",0)";
-	}
-
-	$result=$adb->query($query);
-	$noofrows = $adb->num_rows($result);
-	
-	$button .= '<table cellspacing=0 cellpadding=2><tr><td>';
-	$button .= '</td></tr></table>';
-
-	echo '<br><br>';
-	echo get_form_header($app_strings['LBL_HISTORY'],'', false);
-
-	if($noofrows == 0)
-	{
-		echo $app_strings['LBL_NONE_SCHEDULED'];
-	}
-	else
-	{
-		$list .= '<table border="0" cellpadding="0" cellspacing="0" class="FormBorder" width="100%" >';
-		$list .= '<tr class="ModuleListTitle" height=20>';
-
-		$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-		$list .= '<td width="4%" class="moduleListTitle"></td>';
-
-// Armando L?scher 15.07.2005 -> ?scrollableTables
-// Desc: class="blackLine" deleted because of vertical line in title <tr>
-
-//		$list .= $app_strings['LBL_ICON'].'Icon</td>';
-		$class_black="";
-		if($noofrows<15)
-		{
-			$class_black='class="blackLine"';	
-		}
-
-		$list .= '<td WIDTH="1" '.$class_black.'><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-		$list .= '<td width="25%" class="moduleListTitle" style="padding:0px 3px 0px 3px;">';
-	
-		$list .= $app_strings['LBL_SUBJECT'].'</td>';
-		$list .= '<td WIDTH="1" '.$class_black.'><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-		$list .= '<td width="10%" class="moduleListTitle" style="padding:0px 3px 0px 3px;">';
-	
-		$list .= $app_strings['LBL_STATUS'].'</td>';
-		$list .= '<td WIDTH="1" '.$class_black.'><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-		$list .= '<td width="18%" class="moduleListTitle" style="padding:0px 3px 0px 3px;">';
-	
-		$list .= $app_strings['LBL_LIST_CONTACT_NAME'].'</td>';
-		$list .= '<td WIDTH="1" '.$class_black.'><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-		$list .= '<td width="18%" class="moduleListTitle" style="padding:0px 3px 0px 3px;">';
-
-		$list .= $app_strings['LBL_RELATED_TO'].'</td>';
-		$list .= '<td WIDTH="1" '.$class_black.'><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-		$list .= '<td width="15%" class="moduleListTitle" style="padding:0px 3px 0px 3px;">';
-	
-		$list .= $app_strings['LBL_LAST_MODIFIED'].'</td>';
-		$list .= '<td WIDTH="1" '.$class_black.'><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-		$list .= '<td width="10%" class="moduleListTitle" height="21" style="padding:0px 3px 0px 3px;">';
-
-		$list .= $app_strings['LBL_ACTION'].'</td>';
-		$list .= '<td WIDTH="1" '.$class_black.'><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-		$list .= '<td class="moduleListTitle">';
-
-		$list .= '</td>';
-		if($noofrows>15)
-		{
-			$list .= '<td style="width:20px">&nbsp;&nbsp&nbsp;&nbsp;</td>';
-		}
-		$list .= '</tr>';
-	
-		$list .= '<tr><td COLSPAN="14" class="blackLine"><IMG SRC="themes/'.$theme.'/images//blank.gif"></td></tr>';
-
-// begin: Armando L?scher 14.07.2005 -> ?scrollableTables
-// Desc: 'X'
-//			 Insert new table with 1 cell where all entries are in a new table.
-//			 This cell will be scrollable when too many entries exist
-		$list .= ($noofrows>15) ? '<tr><td colspan="21"><div style="overflow:auto;height:315px;width:100%;"><table cellspacing="0" cellpadding="0" border="0" width="100%">':'';
-// end: Armando L?scher 14.07.2005 -> ?scrollableTablEs
-
-		$i=1;
-		while($row = $adb->fetch_array($result))
-		{
-			if($row['activitytype'] == 'Task')
-			{
-				$activitymode = 'Task';
-				$icon = 'Tasks.gif';
-				$status = $row['status'];
-			}
-			elseif($row['activitytype'] == 'Call' || $row['activitytype'] == 'Meeting')
-			{
-				$activitymode = 'Events';
-				$icon = 'Activities.gif';
-				$status = $row['eventstatus'];
-			}
-			if ($i%2==0)
-				$trowclass = 'evenListRow';
-			else
-				$trowclass = 'oddListRow';
-	
-			$list .= '<tr class="'. $trowclass.'">';
-	
-			$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-			$list .= '<td width="4%"><IMG SRC="'.$image_path.'/'.$icon.'"></td>';
-
-			$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-			$list .= '<td width="25%" height="21" style="padding:0px 3px 0px 3px;">';
-			$list .= '<a href="index.php?module=Activities&action=DetailView&return_module='.$parentmodule.'&return_action=DetailView&record='.$row["activityid"] .'&activity_mode='.$activitymode.'&return_id='.$_REQUEST['record'].'" title="'.$row['description'].'">'.$row['subject'].'</a></td>';
-			$list .= '</td>';
-	
-			$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-			$list .= '<td width="10%" height="21" style="padding:0px 3px 0px 3px;">';
-			$list .= $status;
-			$list .= '</td>';
-
-			if($row['firstname'] != 'NULL')	
-				$contactname = $row['firstname'].' ';
-			if($ros['lastname'] != 'NULL')
-				$contactname .= $row['lastname'];
-
-			$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-			$list .= '<td width="18%" height="21" style="padding:0px 3px 0px 3px;">';
-			$list .= '<a href="index.php?module=Contacts&action=DetailView&return_module='.$parentmodule.'&return_action=DetailView&record='.$row["contactid"].'&return_id='.$_REQUEST['record'].'">'.$contactname;
-			$list .= '</td>';
-
-			$parentname = getRelatedTo('Activities',$result,$i-1);
-
-			$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-			$list .= '<td width="18%" height="21" style="padding:0px 3px 0px 3px;">';
-			$list .= $parentname;
-			$list .= '</td>';
-	
-			$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-			$list .= '<td width="15%" height="21" style="padding:0px 3px 0px 3px;">';
-			$modifiedtime = getDisplayDate($row['modifiedtime']);
-			$list .= $modifiedtime;
-	
-			$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-			$list .= '<td width="10%" height="21" style="padding:0px 3px 0px 3px;">';
-
-			if(isPermitted("Activities",1,$row["activityid"]) == 'yes')
-                	{
-	
-				$list .= '<a href="index.php?module=Activities&action=EditView&return_module='.$parentmodule.'&return_action='.$parentaction.'&activity_mode='.$activitymode.'&record='.$row["activityid"].'&return_id='.$_REQUEST["record"].'">'.$app_strings['LNK_EDIT'].'</a>  |  ';
-			}
-	
-			if(isPermitted("Activities",2,$row["activityid"]) == 'yes')
-                	{
-				$list .= '<a href="index.php?module=Activities&action=Delete&return_module='.$parentmodule.'&return_action='.$parentaction.'&record='.$row["activityid"].'&return_id='.$_REQUEST["record"].'">'.$app_strings['LNK_DELETE'].'</a>';
-			}
-	
-			$list .= '</td>';
-			
-			$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-
-			$list .= '</tr>';
-			$i++;
-		}
-
-// begin: Armando L?scher 14.07.2005 -> ?scrollableTables
-// Desc: Close table from 
-		$list .= ($noofrows>15) ? '</table></div></td></tr>':'';
-// end: Armando L?scher 14.07.2005 -> ?scrollableTables
-
-		$list .= '<tr><td colspan="14" class="blackLine"></td></tr>';
-
-		$list .= '</table>';
-		echo $list;
-	}
-}
-
-function getPriceBookRelatedProducts($query,$focus,$returnset='')
-{
-	global $adb;
-	global $app_strings;
-	global $mod_strings;
-	global $current_language;
-	$current_module_strings = return_module_language($current_language, 'Products');
-
-	global $list_max_entries_per_page;
-	global $urlPrefix;
-
-
-	global $theme;
-	$pricebook_id = $_REQUEST['record'];
-	$theme_path="themes/".$theme."/";
-	$image_path=$theme_path."images/";
-	require_once($theme_path.'layout_utils.php');
-	$list_result = 	$adb->query($query);
-	$num_rows = $adb->num_rows($list_result);
-	$xtpl=new XTemplate('include/RelatedListView.html');
-	$xtpl->assign("MOD", $mod_strings);
-	$xtpl->assign("APP", $app_strings);
-	$xtpl->assign("IMAGE_PATH",$image_path);
-	echo '<BR>';
-	$other_text = '<table width="100%" border="0" cellpadding="1" cellspacing="0">
-	<form name="selectproduct" method="POST">
-	<tr>
-	<input name="action" type="hidden" value="AddProductsToPriceBook">
-	<input name="module" type="hidden" value="Products">
-	<input name="return_module" type="hidden" value="Products">
-	<input name="return_action" type="hidden" value="PriceBookDetailView">
-	<input name="pricebook_id" type="hidden" value="'.$_REQUEST["record"].'">';
-
-        $other_text .='<td><input title="Select Products" accessyKey="F" class="button" onclick="this.form.action.value=\'AddProductsToPriceBook\';this.form.module.value=\'Products\';this.form.return_module.value=\'Products\';this.form.return_action.value=\'PriceBookDetailView\'" type="submit" name="button" value="'.$app_strings["LBL_SELECT_PRODUCT_BUTTON_LABEL"].'"></td>';
-		$other_text .='</tr></table>';
-
-//Retreive the list from Database
-echo get_form_header($current_module_strings['LBL_LIST_FORM_TITLE'], $other_text, false );
-
-
-//echo $list_query;
-$list_result = $adb->query($query);
-$num_rows = $adb->num_rows($list_result);
-
-//Retreive the List View Table Header
-
-// Armando L?scher 15.07.2005 -> ?scrollableTables
-// Desc: class="blackLine" deleted because of vertical line in title <tr>
-
-//		$list .= $app_strings['LBL_ICON'].'Icon</td>';
-		$class_black="";
-		if($num_rows<15)
-		{
-			$class_black='class="blackLine"';	
-		}
-
-$list_header = '';
-$list_header .= '<tr class="moduleListTitle" height=20>';
-$list_header .= '<td WIDTH="1" class="blackLine"><IMG SRC="'.$image_path.'blank.gif"></td>';
-$list_header .= '<td width="40%" class="moduleListTitle" height="21" style="padding:0px 3px 0px 3px;">'.$mod_strings['LBL_LIST_PRODUCT_NAME'].'</td>';
-$list_header .='<td WIDTH="1" '.$class_black.' NOWRAP><IMG SRC="{IMAGE_PATH}blank.gif"></td>';
-$list_header .= '<td width="15%" class="moduleListTitle" height="21" style="padding:0px 3px 0px 3px;">'.$mod_strings['LBL_PRODUCT_CODE'].'</td>';
-$list_header .='<td WIDTH="1" '.$class_black.' NOWRAP><IMG SRC="{IMAGE_PATH}blank.gif"></td>';
-$list_header .= '<td width="15%" class="moduleListTitle" height="21" style="padding:0px 3px 0px 3px;">'.$mod_strings['LBL_PRODUCT_UNIT_PRICE'].'</td>';
-$list_header .='<td WIDTH="1" '.$class_black.' NOWRAP><IMG SRC="{IMAGE_PATH}blank.gif"></td>';
-$list_header .= '<td width="15%" class="moduleListTitle" height="21" style="padding:0px 3px 0px 3px;">'.$mod_strings['LBL_PB_LIST_PRICE'].'</td>';
-$list_header .='<td WIDTH="1" '.$class_black.' NOWRAP><IMG SRC="{IMAGE_PATH}blank.gif"></td>';
-$list_header .= '<td width="15%" class="moduleListTitle" height="21" style="padding:0px 3px 0px 3px;">Edit|Del</td>';
-$list_header .='<td WIDTH="1" class="blackLine" NOWRAP><IMG SRC="{IMAGE_PATH}blank.gif"></td>';
-
-$list_header .= '</tr>';
-
-$xtpl->assign("LISTHEADER", $list_header);
-
-$list_body ='';
-// begin: Armando L?scher 14.07.2005 -> ?scrollableTables
-// Desc: 'X'
-//			 Insert new table with 1 cell where all entries are in a new table.
-//			 This cell will be scrollable when too many entries exist
-		$list_body .= ($num_rows>15) ? '<tr><td colspan="12"><div style="overflow:auto;height:315px;width:100%;"><table cellspacing="0" cellpadding="0" border="0" width="100%">':'';
-// end: Armando L?scher 14.07.2005 -> ?scrollableTablEs
-
-for($i=0; $i<$num_rows; $i++)
-{
-	$entity_id = $adb->query_result($list_result,$i,"crmid");
-		if (($i%2)==0)
-			$list_body .= '<tr height=20 class=evenListRow>';
-		else
-			$list_body .= '<tr height=20 class=oddListRow>';
-
-		$unit_price = 	$adb->query_result($list_result,$i,"unit_price");
-		$listprice = $adb->query_result($list_result,$i,"listprice");
-		$field_name=$entity_id."_listprice";
-
-		$list_body .= '<td WIDTH="1" class="blackLine"><IMG SRC="'.$image_path.'blank.gif"></td>';
-		$list_body .= '<td width="40%" height="21" style="padding:0px 3px 0px 3px;">'.$adb->query_result($list_result,$i,"productname").'</td>';
-		$list_body .='<td WIDTH="1" class="blackLine" NOWRAP><IMG SRC="'.$image_path.'blank.gif"></td>';
-		$list_body .= '<td width="15%" height="21" style="padding:0px 3px 0px 3px;">'.$adb->query_result($list_result,$i,"productcode").'</td>';
-		$list_body .='<td WIDTH="1" class="blackLine" NOWRAP><IMG SRC="'.$image_path.'blank.gif"></td>';
-		$list_body .= '<td width="15%" height="21" style="padding:0px 3px 0px 3px;">'.$unit_price.'</td>';
-		$list_body .='<td WIDTH="1" class="blackLine" NOWRAP><IMG SRC="'.$image_path.'blank.gif"></td>';
-		$list_body .= '<td width="15%" height="21" style="padding:0px 3px 0px 3px;">'.$listprice.'</td>';
-		$list_body .='<td WIDTH="1" class="blackLine" NOWRAP><IMG SRC="'.$image_path.'blank.gif"></td>';
-		$list_body .= '<td width="15%" height="21" style="padding:0px 3px 0px 3px;"><a href="index.php?module=Products&action=EditListPrice&record='.$entity_id.'&pricebook_id='.$pricebook_id.'&listprice='.$listprice.'">edit</a>&nbsp;|&nbsp;<a href="index.php?module=Products&action=DeletePriceBookProductRel'.$returnset.'&record='.$entity_id.'&pricebook_id='.$pricebook_id.'">del</a></td>';
-	$list_body .='<td WIDTH="1" class="blackLine" NOWRAP><IMG SRC="'.$image_path.'blank.gif"></td></tr>';
-	
-}
-// begin: Armando L?scher 14.07.2005 -> ?scrollableTables
-// Desc: Close table from 
-		$list_body .= ($num_rows>15) ? '</table></div></td></tr>':'';
-// end: Armando L?scher 14.07.2005 -> ?scrollableTables
-
-	$list_body .= '<tr><td COLSPAN="12" class="blackLine"><IMG SRC="themes/'.$theme.'/images//blank.gif"></td></tr>';
-
-//$listview_entries = getListViewEntries($focus,"Products",$list_result,$navigation_array);
-
-$xtpl->assign("LISTENTITY", $list_body);
-
-$xtpl->parse("main");
-$xtpl->out("main");	
-
-}
-
-//echo '</form>';
-?>
+	$list .= '<table border="0" cellpadding="0" cellspacing="0" class="FormBorder" width="100%">';
+	$list .= '<tr class="ModuleListTitle" height=20>';
+
+	$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
+	$list .= '<td width="30%" class="moduleListTitle">';
+
+	$class_black="";
+	if($noofrows<15)
+	{
+		$class_black='class="blackLine"';
+	}
+	$list .= $app_strings['LBL_TITLE_OR_DESCRIPTION'].'</td>';
+	$list .= '<td WIDTH="1" '.$class_black .'><IMG SRC="themes/'.$theme.'/images/blank.gif">';
+	$list .= '<td width="10%" class="moduleListTitle">';
+
+	$list .= $app_strings['LBL_ENTITY_TYPE'].'</td>';
+	$list .= '<td WIDTH="1" '.$class_black .'><IMG SRC="themes/'.$theme.'/images/blank.gif">';
+	$list .= '<td width="15%" class="moduleListTitle">';
+
+	$list .= $app_strings['LBL_FILENAME'].'</td>';
+	$list .= '<td WIDTH="1" '.$class_black .'><IMG SRC="themes/'.$theme.'/images/blank.gif">';
+	$list .= '<td width="15%" class="moduleListTitle">';
+
+	$list .= $app_strings['LBL_TYPE'].'</td>';
+	$list .= '<td WIDTH="1" '.$class_black .'><IMG SRC="themes/'.$theme.'/images/blank.gif">';
+	$list .= '<td width="20%" class="moduleListTitle">';
+
+	$list .= $app_strings['LBL_LAST_MODIFIED'].'</td>';
+	$list .= '<td WIDTH="1" '.$class_black .'><IMG SRC="themes/'.$theme.'/images/blank.gif">';
+	$list .= '<td width="10%" class="moduleListTitle" height="21">';
+
+	$list .= $app_strings['LBL_ACTION'].'</td>';
+	$list .= '<td WIDTH="1" '.$class_black .'><IMG SRC="themes/'.$theme.'/images/blank.gif">';
+	$list .= '<td class="moduleListTitle">';
+
+	$list .= '</td>';
+	if($noofrows>15)
+	{
+		$list .= '<td style="width:20px">&nbsp;&nbsp&nbsp;&nbsp;</td>';
+	}
+
+	$list .= '</tr>';
+	$list .= '<tr><td COLSPAN="12" class="blackLine"><IMG SRC="themes/'.$theme.'/images//blank.gif"></td></tr>';
+//	$list .= '</table>';
+// end: Armando L?scher 15.07.2005 -> scrollableTables
+
+// begin: Armando L?scher 14.07.2005 -> ?scrollableTables
+// Desc: 'Y'
+//			 Insert new table with 1 cell where all entries are in a new table.
+//			 This cell will be scrollable when too many entries exist
+	$list .= ($noofrows>15) ? '<tr><td colspan="20"><div style="overflow:auto;height:315px;width:100%;"><table cellspacing="0" cellpadding="0" border="0" width="100%">':'';
+// end: Armando L?scher 14.07.2005 -> ?scrollableTables
+
+	$i=1;
+	while($row = $adb->fetch_array($result))
+	{
+        	if($row[1] == 'Notes')
+	        {
+        	        $module = 'Notes';
+                	$editaction = 'EditView';
+	                $deleteaction = 'Delete';
+        	}
+	        elseif($row[1] == 'Attachments')
+	        {
+	                $module = 'uploads';
+	                $editaction = 'upload';
+	                $deleteaction = 'deleteattachments';
+	        }
+
+		if ($i%2==0)
+			$trowclass = 'evenListRow';
+		else
+			$trowclass = 'oddListRow';
+
+		$list .= '<tr class="'. $trowclass.'">';
+
+		$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
+
+		if($module == 'Notes')
+			$list .= '<td width="30%"><a href="index.php?module='.$module.'&action=DetailView&return_module='.$returnmodule.'&return_action='.$returnaction.'&record='.$row["crmid"] .'&return_id='.$_REQUEST['record'].'">'.$row[0].'</td>';
+		elseif($module == 'uploads')
+			$list .= '<td width="30%">'.$row[0].'</td>';
+
+		$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
+		$list .= '<td width="10%" height="21" style="padding:0px 3px 0px 3px;">';
+		$list .= $row[1];
+		$list .= '</td>';
+
+		$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
+		$list .= '<td width="15%" height="21" style="padding:0px 3px 0px 3px;">';
+		$list .= '<a href = "index.php?module=uploads&action=downloadfile&return_module=Accounts&activity_type=' . $row[1] . '&fileid=' . $row[5] . '&filename=' . urlencode($row[2]) . '">' . $row[2] . '</a>';
+		$list .= '</td>';
+
+		$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
+		$list .= '<td width="15%" height="21" style="padding:0px 3px 0px 3px;">';
+		$list .= $row[3];
+		$list .= '</td>';
+
+		$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
+		$list .= '<td width="20%" height="21" style="padding:0px 3px 0px 3px;">';
+
+		if($row[4] != '0000-00-00 00:00:00')
+			$list .= $row[4];
+		else
+                        $list .= '';
+
+		$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
+		$list .= '<td width="10%" height="21" style="padding:0px 3px 0px 3px;">';
+
+		if($row[1] == 'Notes')
+			$list .= '<a href="index.php?module='.$module.'&action='.$editaction.'&return_module='.$parentmodule.'&return_action='.$return_action.'&record='.$row["crmid"].'&filename='.$row[2].'&fileid='.$row['attachmentsid'].'&return_id='.$_REQUEST["record"].'">'.$app_strings['LNK_EDIT'].'</a>  |  ';
+//		$list .= '<a href="index.php?module='.$module.'&action='.$deleteaction.'&return_module='.$parentmodule.'&return_action=DetailView&record='.$row["crmid"].'&filename='.$row[2].'&return_id='.$_REQUEST["record"].'">'.$app_strings['LNK_DELETE'].'</a>';
+		$del_param = 'index.php?module='.$module.'&action='.$deleteaction.'&return_module='.$parentmodule.'&return_action='.$return_action.'&record='.$row["crmid"].'&filename='.$row[2].'&return_id='.$_REQUEST["record"];
+                $list .= '<a href="javascript:confirmdelete(\''.$del_param.'\')">'.$app_strings['LNK_DELETE'].'</a>';
+
+		$list .= '</td>';
+
+		$list .= '</tr>';
+		$i++;
+	}
+	
+// begin: Armando L?scher 14.07.2005 -> ?scrollableTables
+// Desc: Close table from 'Y'
+		$list .= ($noofrows>15) ? '</table></div></td></tr>':'';
+// end: Armando L?scher 14.07.2005 -> scrollableTables
+
+	$list .= '<tr><td COLSPAN="12" class="blackLine"><IMG SRC="themes/'.$theme.'/images//blank.gif"></td></tr>';
+	$list .= '</table>';
+	echo $list;
+
+}
+}
+
+function getHistory($parentmodule,$query,$id)
+{
+	$parentaction = $_REQUEST['action'];
+	global $theme;
+	$theme_path="themes/".$theme."/";
+	$image_path=$theme_path."images/";
+	require_once ($theme_path."layout_utils.php");
+
+	global $adb;
+	global $mod_strings;
+	global $app_strings;
+
+	//Appending the security parameter
+	global $others_permission_id;
+	global $current_user;
+	$rel_tab_id = getTabid("Activities");
+	$defSharingPermissionData = $_SESSION['defaultaction_sharing_permission_set'];
+	$others_rel_permission_id = $defSharingPermissionData[$rel_tab_id];
+	if($others_rel_permission_id == 3) //Security fix by Don
+	{
+         	$query .= " and crmentity.smownerid in(".$current_user->id .",0)";
+	}
+
+	$result=$adb->query($query);
+	$noofrows = $adb->num_rows($result);
+	
+	$button = '<table cellspacing=0 cellpadding=2><tr><td>';
+	$button .= '</td></tr></table>';
+
+	echo '<br><br>';
+	echo get_form_header($app_strings['LBL_HISTORY'],'', false);
+
+	if($noofrows == 0)
+	{
+		echo $app_strings['LBL_NONE_SCHEDULED'];
+	}
+	else
+	{
+		$list .= '<table border="0" cellpadding="0" cellspacing="0" class="FormBorder" width="100%" >';
+		$list .= '<tr class="ModuleListTitle" height=20>';
+
+		$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
+		$list .= '<td width="4%" class="moduleListTitle"></td>';
+
+// Armando L?scher 15.07.2005 -> ?scrollableTables
+// Desc: class="blackLine" deleted because of vertical line in title <tr>
+
+//		$list .= $app_strings['LBL_ICON'].'Icon</td>';
+		$class_black="";
+		if($noofrows<15)
+		{
+			$class_black='class="blackLine"';	
+		}
+
+		$list .= '<td WIDTH="1" '.$class_black.'><IMG SRC="themes/'.$theme.'/images/blank.gif">';
+		$list .= '<td width="25%" class="moduleListTitle" style="padding:0px 3px 0px 3px;">';
+	
+		$list .= $app_strings['LBL_SUBJECT'].'</td>';
+		$list .= '<td WIDTH="1" '.$class_black.'><IMG SRC="themes/'.$theme.'/images/blank.gif">';
+		$list .= '<td width="10%" class="moduleListTitle" style="padding:0px 3px 0px 3px;">';
+	
+		$list .= $app_strings['LBL_STATUS'].'</td>';
+		$list .= '<td WIDTH="1" '.$class_black.'><IMG SRC="themes/'.$theme.'/images/blank.gif">';
+		$list .= '<td width="18%" class="moduleListTitle" style="padding:0px 3px 0px 3px;">';
+	
+		$list .= $app_strings['LBL_LIST_CONTACT_NAME'].'</td>';
+		$list .= '<td WIDTH="1" '.$class_black.'><IMG SRC="themes/'.$theme.'/images/blank.gif">';
+		$list .= '<td width="18%" class="moduleListTitle" style="padding:0px 3px 0px 3px;">';
+
+		$list .= $app_strings['LBL_RELATED_TO'].'</td>';
+		$list .= '<td WIDTH="1" '.$class_black.'><IMG SRC="themes/'.$theme.'/images/blank.gif">';
+		$list .= '<td width="15%" class="moduleListTitle" style="padding:0px 3px 0px 3px;">';
+	
+		$list .= $app_strings['LBL_LAST_MODIFIED'].'</td>';
+		$list .= '<td WIDTH="1" '.$class_black.'><IMG SRC="themes/'.$theme.'/images/blank.gif">';
+		$list .= '<td width="10%" class="moduleListTitle" height="21" style="padding:0px 3px 0px 3px;">';
+
+		$list .= $app_strings['LBL_ACTION'].'</td>';
+		$list .= '<td WIDTH="1" '.$class_black.'><IMG SRC="themes/'.$theme.'/images/blank.gif">';
+		$list .= '<td class="moduleListTitle">';
+
+		$list .= '</td>';
+		if($noofrows>15)
+		{
+			$list .= '<td style="width:20px">&nbsp;&nbsp&nbsp;&nbsp;</td>';
+		}
+		$list .= '</tr>';
+	
+		$list .= '<tr><td COLSPAN="14" class="blackLine"><IMG SRC="themes/'.$theme.'/images//blank.gif"></td></tr>';
+
+// begin: Armando L?scher 14.07.2005 -> ?scrollableTables
+// Desc: 'X'
+//			 Insert new table with 1 cell where all entries are in a new table.
+//			 This cell will be scrollable when too many entries exist
+		$list .= ($noofrows>15) ? '<tr><td colspan="21"><div style="overflow:auto;height:315px;width:100%;"><table cellspacing="0" cellpadding="0" border="0" width="100%">':'';
+// end: Armando L?scher 14.07.2005 -> ?scrollableTablEs
+
+		$i=1;
+		while($row = $adb->fetch_array($result))
+		{
+			if($row['activitytype'] == 'Task')
+			{
+				$activitymode = 'Task';
+				$icon = 'Tasks.gif';
+				$status = $row['status'];
+			}
+			elseif($row['activitytype'] == 'Call' || $row['activitytype'] == 'Meeting')
+			{
+				$activitymode = 'Events';
+				$icon = 'Activities.gif';
+				$status = $row['eventstatus'];
+			}
+			if ($i%2==0)
+				$trowclass = 'evenListRow';
+			else
+				$trowclass = 'oddListRow';
+	
+			$list .= '<tr class="'. $trowclass.'">';
+	
+			$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
+			$list .= '<td width="4%"><IMG SRC="'.$image_path.'/'.$icon.'"></td>';
+
+			$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
+			$list .= '<td width="25%" height="21" style="padding:0px 3px 0px 3px;">';
+			$list .= '<a href="index.php?module=Activities&action=DetailView&return_module='.$parentmodule.'&return_action=DetailView&record='.$row["activityid"] .'&activity_mode='.$activitymode.'&return_id='.$_REQUEST['record'].'" title="'.$row['description'].'">'.$row['subject'].'</a></td>';
+			$list .= '</td>';
+	
+			$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
+			$list .= '<td width="10%" height="21" style="padding:0px 3px 0px 3px;">';
+			$list .= $status;
+			$list .= '</td>';
+
+			if($row['firstname'] != 'NULL')	
+				$contactname = $row['firstname'].' ';
+			if($ros['lastname'] != 'NULL')
+				$contactname .= $row['lastname'];
+
+			$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
+			$list .= '<td width="18%" height="21" style="padding:0px 3px 0px 3px;">';
+			$list .= '<a href="index.php?module=Contacts&action=DetailView&return_module='.$parentmodule.'&return_action=DetailView&record='.$row["contactid"].'&return_id='.$_REQUEST['record'].'">'.$contactname;
+			$list .= '</td>';
+
+			$parentname = getRelatedTo('Activities',$result,$i-1);
+
+			$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
+			$list .= '<td width="18%" height="21" style="padding:0px 3px 0px 3px;">';
+			$list .= $parentname;
+			$list .= '</td>';
+	
+			$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
+			$list .= '<td width="15%" height="21" style="padding:0px 3px 0px 3px;">';
+			$modifiedtime = getDisplayDate($row['modifiedtime']);
+			$list .= $modifiedtime;
+	
+			$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
+			$list .= '<td width="10%" height="21" style="padding:0px 3px 0px 3px;">';
+
+			if(isPermitted("Activities",1,$row["activityid"]) == 'yes')
+                	{
+	
+				$list .= '<a href="index.php?module=Activities&action=EditView&return_module='.$parentmodule.'&return_action='.$parentaction.'&activity_mode='.$activitymode.'&record='.$row["activityid"].'&return_id='.$_REQUEST["record"].'">'.$app_strings['LNK_EDIT'].'</a>  |  ';
+			}
+	
+			if(isPermitted("Activities",2,$row["activityid"]) == 'yes')
+                	{
+				$list .= '<a href="index.php?module=Activities&action=Delete&return_module='.$parentmodule.'&return_action='.$parentaction.'&record='.$row["activityid"].'&return_id='.$_REQUEST["record"].'">'.$app_strings['LNK_DELETE'].'</a>';
+			}
+	
+			$list .= '</td>';
+			
+			$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
+
+			$list .= '</tr>';
+			$i++;
+		}
+
+// begin: Armando L?scher 14.07.2005 -> ?scrollableTables
+// Desc: Close table from 
+		$list .= ($noofrows>15) ? '</table></div></td></tr>':'';
+// end: Armando L?scher 14.07.2005 -> ?scrollableTables
+
+		$list .= '<tr><td colspan="14" class="blackLine"></td></tr>';
+
+		$list .= '</table>';
+		echo $list;
+	}
+}
+
+function getPriceBookRelatedProducts($query,$focus,$returnset='')
+{
+	global $adb;
+	global $app_strings;
+	global $mod_strings;
+	global $current_language;
+	$current_module_strings = return_module_language($current_language, 'Products');
+
+	global $list_max_entries_per_page;
+	global $urlPrefix;
+
+
+	global $theme;
+	$pricebook_id = $_REQUEST['record'];
+	$theme_path="themes/".$theme."/";
+	$image_path=$theme_path."images/";
+	require_once($theme_path.'layout_utils.php');
+	$list_result = 	$adb->query($query);
+	$num_rows = $adb->num_rows($list_result);
+	$xtpl=new XTemplate('include/RelatedListView.html');
+	$xtpl->assign("MOD", $mod_strings);
+	$xtpl->assign("APP", $app_strings);
+	$xtpl->assign("IMAGE_PATH",$image_path);
+	echo '<BR>';
+	$other_text = '<table width="100%" border="0" cellpadding="1" cellspacing="0">
+	<form name="selectproduct" method="POST">
+	<tr>
+	<input name="action" type="hidden" value="AddProductsToPriceBook">
+	<input name="module" type="hidden" value="Products">
+	<input name="return_module" type="hidden" value="Products">
+	<input name="return_action" type="hidden" value="PriceBookDetailView">
+	<input name="pricebook_id" type="hidden" value="'.$_REQUEST["record"].'">';
+
+        $other_text .='<td><input title="Select Products" accessyKey="F" class="button" onclick="this.form.action.value=\'AddProductsToPriceBook\';this.form.module.value=\'Products\';this.form.return_module.value=\'Products\';this.form.return_action.value=\'PriceBookDetailView\'" type="submit" name="button" value="'.$app_strings["LBL_SELECT_PRODUCT_BUTTON_LABEL"].'"></td>';
+		$other_text .='</tr></table>';
+
+//Retreive the list from Database
+echo get_form_header($current_module_strings['LBL_LIST_FORM_TITLE'], $other_text, false );
+
+
+//echo $list_query;
+$list_result = $adb->query($query);
+$num_rows = $adb->num_rows($list_result);
+
+//Retreive the List View Table Header
+
+// Armando L?scher 15.07.2005 -> ?scrollableTables
+// Desc: class="blackLine" deleted because of vertical line in title <tr>
+
+//		$list .= $app_strings['LBL_ICON'].'Icon</td>';
+		$class_black="";
+		if($num_rows<15)
+		{
+			$class_black='class="blackLine"';	
+		}
+
+$list_header = '';
+$list_header .= '<tr class="moduleListTitle" height=20>';
+$list_header .= '<td WIDTH="1" class="blackLine"><IMG SRC="'.$image_path.'blank.gif"></td>';
+$list_header .= '<td width="40%" class="moduleListTitle" height="21" style="padding:0px 3px 0px 3px;">'.$mod_strings['LBL_LIST_PRODUCT_NAME'].'</td>';
+$list_header .='<td WIDTH="1" '.$class_black.' NOWRAP><IMG SRC="{IMAGE_PATH}blank.gif"></td>';
+$list_header .= '<td width="15%" class="moduleListTitle" height="21" style="padding:0px 3px 0px 3px;">'.$mod_strings['LBL_PRODUCT_CODE'].'</td>';
+$list_header .='<td WIDTH="1" '.$class_black.' NOWRAP><IMG SRC="{IMAGE_PATH}blank.gif"></td>';
+$list_header .= '<td width="15%" class="moduleListTitle" height="21" style="padding:0px 3px 0px 3px;">'.$mod_strings['LBL_PRODUCT_UNIT_PRICE'].'</td>';
+$list_header .='<td WIDTH="1" '.$class_black.' NOWRAP><IMG SRC="{IMAGE_PATH}blank.gif"></td>';
+$list_header .= '<td width="15%" class="moduleListTitle" height="21" style="padding:0px 3px 0px 3px;">'.$mod_strings['LBL_PB_LIST_PRICE'].'</td>';
+$list_header .='<td WIDTH="1" '.$class_black.' NOWRAP><IMG SRC="{IMAGE_PATH}blank.gif"></td>';
+$list_header .= '<td width="15%" class="moduleListTitle" height="21" style="padding:0px 3px 0px 3px;">Edit|Del</td>';
+$list_header .='<td WIDTH="1" class="blackLine" NOWRAP><IMG SRC="{IMAGE_PATH}blank.gif"></td>';
+
+$list_header .= '</tr>';
+
+$xtpl->assign("LISTHEADER", $list_header);
+
+$list_body ='';
+// begin: Armando L?scher 14.07.2005 -> ?scrollableTables
+// Desc: 'X'
+//			 Insert new table with 1 cell where all entries are in a new table.
+//			 This cell will be scrollable when too many entries exist
+		$list_body .= ($num_rows>15) ? '<tr><td colspan="12"><div style="overflow:auto;height:315px;width:100%;"><table cellspacing="0" cellpadding="0" border="0" width="100%">':'';
+// end: Armando L?scher 14.07.2005 -> ?scrollableTablEs
+
+for($i=0; $i<$num_rows; $i++)
+{
+	$entity_id = $adb->query_result($list_result,$i,"crmid");
+		if (($i%2)==0)
+			$list_body .= '<tr height=20 class=evenListRow>';
+		else
+			$list_body .= '<tr height=20 class=oddListRow>';
+
+		$unit_price = 	$adb->query_result($list_result,$i,"unit_price");
+		$listprice = $adb->query_result($list_result,$i,"listprice");
+		$field_name=$entity_id."_listprice";
+
+		$list_body .= '<td WIDTH="1" class="blackLine"><IMG SRC="'.$image_path.'blank.gif"></td>';
+		$list_body .= '<td width="40%" height="21" style="padding:0px 3px 0px 3px;">'.$adb->query_result($list_result,$i,"productname").'</td>';
+		$list_body .='<td WIDTH="1" class="blackLine" NOWRAP><IMG SRC="'.$image_path.'blank.gif"></td>';
+		$list_body .= '<td width="15%" height="21" style="padding:0px 3px 0px 3px;">'.$adb->query_result($list_result,$i,"productcode").'</td>';
+		$list_body .='<td WIDTH="1" class="blackLine" NOWRAP><IMG SRC="'.$image_path.'blank.gif"></td>';
+		$list_body .= '<td width="15%" height="21" style="padding:0px 3px 0px 3px;">'.$unit_price.'</td>';
+		$list_body .='<td WIDTH="1" class="blackLine" NOWRAP><IMG SRC="'.$image_path.'blank.gif"></td>';
+		$list_body .= '<td width="15%" height="21" style="padding:0px 3px 0px 3px;">'.$listprice.'</td>';
+		$list_body .='<td WIDTH="1" class="blackLine" NOWRAP><IMG SRC="'.$image_path.'blank.gif"></td>';
+		$list_body .= '<td width="15%" height="21" style="padding:0px 3px 0px 3px;"><a href="index.php?module=Products&action=EditListPrice&record='.$entity_id.'&pricebook_id='.$pricebook_id.'&listprice='.$listprice.'">edit</a>&nbsp;|&nbsp;<a href="index.php?module=Products&action=DeletePriceBookProductRel'.$returnset.'&record='.$entity_id.'&pricebook_id='.$pricebook_id.'">del</a></td>';
+	$list_body .='<td WIDTH="1" class="blackLine" NOWRAP><IMG SRC="'.$image_path.'blank.gif"></td></tr>';
+	
+}
+// begin: Armando L?scher 14.07.2005 -> ?scrollableTables
+// Desc: Close table from 
+		$list_body .= ($num_rows>15) ? '</table></div></td></tr>':'';
+// end: Armando L?scher 14.07.2005 -> ?scrollableTables
+
+	$list_body .= '<tr><td COLSPAN="12" class="blackLine"><IMG SRC="themes/'.$theme.'/images//blank.gif"></td></tr>';
+
+//$listview_entries = getListViewEntries($focus,"Products",$list_result,$navigation_array);
+
+$xtpl->assign("LISTENTITY", $list_body);
+
+$xtpl->parse("main");
+$xtpl->out("main");	
+
+}
+
+//echo '</form>';
+?>

Modified: vtigercrm/branches/4.2/include/uifromdbutil.php
==============================================================================
--- vtigercrm/branches/4.2/include/uifromdbutil.php (original)
+++ vtigercrm/branches/4.2/include/uifromdbutil.php Tue Jun 20 22:23:57 2006
@@ -145,8 +145,10 @@
 	$image_path=$theme_path."images/";
 
 	$record = isset($_REQUEST['record']) ? $_REQUEST['record'] : '';
-	$relmodule = $_REQUEST['module'] == $module ? '' : $module;
-	$start = $relmodule.'start';
+	
+//	$relmodule = $_REQUEST['module'] == $module ? '' : $module;
+	$relmodule = '';
+$start = $relmodule.'start';
 	$end_val = $relmodule.'end_val';
 	$first = $relmodule.'first';
 	$end = $relmodule.'end';
@@ -157,6 +159,9 @@
 	$prev = $relmodule.'prev';
 	$dir_name = $_REQUEST['module'];
 
+	
+	
+	
 	$output = '<td align="right">';
 	$output .= '<a href="index.php?module='.$dir_name.'&record='.$record.'&action='.$action_val.$url_qry.'&'.$start.'=1&viewname='.$viewid.'&'.$allflag.'='.$navigation_array[$allflag].'" >'.$navigation_array[$allflag].'</a>&nbsp;';
 	if(($navigation_array[$prev]) != 0) {

Modified: vtigercrm/branches/4.2/include/utils.php
==============================================================================
--- vtigercrm/branches/4.2/include/utils.php (original)
+++ vtigercrm/branches/4.2/include/utils.php Tue Jun 20 22:23:57 2006
@@ -879,19 +879,34 @@
 {
 	global $adb, $vtlog;
 	static $res = null;
-	$vtlog->logthis("module  is ".$module,'info');  
-        
-	if(!is_null($res)) return $res[$module];
-
+	$vtlog->logthis("module is ".$module,'info');
+
+	// if we've already built static variable $res, let's not do it again...
+	if(sizeof($res) > 0)
+	{
+		if(isset($res[$module]))
+		{
+			return $res[$module];
+		}
+		else
+		{
+			return 0;
+		}
+	}
+
+	// ok, we must not have built $res; so let's grab the db data for a
 	$sql = "select tabid, name from tab";
 	$result = $adb->query($sql);
 	$tab_count = $adb->num_rows($result);
-	for($i=0; $i<$tab_count; $i++) {
+
+	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];
+	
+	return isset($res[$module])? $res[$module] : 0;
 }
 
 function getOutputHtml($uitype, $fieldname, $fieldlabel, $maxlength, $col_fields,$generatedtype)
@@ -1316,33 +1331,29 @@
 	}
 	elseif($uitype == 57)
 	{
-		//if(isset($_REQUEST['contact_id']) && $_REQUEST['contact_id'] != '')
-		//	$value = $_REQUEST['contact_id'];
-
-	       if($value != '')
-               {
-                       $contact_name = getContactName($value);
-               }
-	       elseif(isset($_REQUEST['contact_id']) && $_REQUEST['contact_id'] != '')
-	       {
+		$contact_name = '';
+		
+		if($value != '')
+		{
+			$contact_name = getContactName($value);
+		}
+		elseif(isset($_REQUEST['contact_id']) && $_REQUEST['contact_id'] != '')
+		{
 			if($_REQUEST['module'] == 'Contacts' && $fieldname = 'contact_id')
 			{
-				$contact_name = '';	
+				$contact_name = '';
 			}
 			else
 			{
 				$value = $_REQUEST['contact_id'];
-				$contact_name = getContactName($value);		
+				$contact_name = getContactName($value);
 			}
-			
-	       }
-	
-		//Checking for contacts duplicate
-					 	
+		}
+
 		$custfld .= '<td width="20%" valign="center" class="dataLabel">'.$mod_strings[$fieldlabel].'</td>';
 		$custfld .= '<td width="30%"><input name="contact_name" readonly type="text" value="'.$contact_name.'"><input name="contact_id" type="hidden" value="'.$value.'">&nbsp;<img src="'.$image_path.'select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick=\'return window.open("index.php?module=Contacts&action=Popup&html=Popup_picker&popuptype=specific&form=EditView","test","width=600,height=400,resizable=1,scrollbars=1");\' align="absmiddle" style=\'cursor:hand;cursor:pointer\'>&nbsp;<input type="image" src="'.$image_path.'clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.contact_id.value=\'\';this.form.contact_name.value=\'\';return false;" align="absmiddle" style=\'cursor:hand;cursor:pointer\'></td>';
 	}
-        elseif($uitype == 61 || $uitype == 69)
+	elseif($uitype == 61 || $uitype == 69)
         {
                 global $current_user;
                 if($value != '')
@@ -1653,31 +1664,31 @@
 	}
 	elseif($uitype == 76)
 	{
-
+		$potential_name = '';
 		if($value != '')
-               {
-                       $potential_name = getPotentialName($value);
-               }
-	       elseif(isset($_REQUEST['potential_id']) && $_REQUEST['potential_id'] != '')
-	       {
+		{
+			$potential_name = getPotentialName($value);
+		}
+		elseif(isset($_REQUEST['potential_id']) && $_REQUEST['potential_id'] != '')
+		{
 			$value = $_REQUEST['potental_id'];
 			$potential_name = getPotentialName($value);
-	       }		 	
+		}
 		$custfld .= '<td width="20%" valign="center" class="dataLabel">'.$mod_strings[$fieldlabel].'</td>';
 		$custfld .= '<td width="30%"><input name="potential_name" readonly type="text" value="'.$potential_name.'"><input name="potential_id" type="hidden" value="'.$value.'">&nbsp;<img src="'.$image_path.'select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick=\'return window.open("index.php?module=Potentials&action=Popup&html=Popup_picker&popuptype=specific_potential_account_address&form=EditView","test","width=600,height=400,resizable=1,scrollbars=1");\' align="absmiddle" style=\'cursor:hand;cursor:pointer\'>&nbsp;<input type="image" src="'.$image_path.'clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.potential_id.value=\'\';this.form.potential_name.value=\'\';return false;" align="absmiddle" style=\'cursor:hand;cursor:pointer\'></td>';
 	}
 	elseif($uitype == 78)
 	{
-
+		$quote_name = '';
 		if($value != '')
-               {
-                       $quote_name = getQuoteName($value);
-               }
-	       elseif(isset($_REQUEST['quote_id']) && $_REQUEST['quote_id'] != '')
-	       {
+		{
+			$quote_name = getQuoteName($value);
+		}
+		elseif(isset($_REQUEST['quote_id']) && $_REQUEST['quote_id'] != '')
+		{
 			$value = $_REQUEST['quote_id'];
 			$potential_name = getQuoteName($value);
-	       }		 	
+		}
 		$custfld .= '<td width="20%" valign="center" class="dataLabel">'.$mod_strings[$fieldlabel].'</td>';
 		$custfld .= '<td width="30%"><input name="quote_name" readonly type="text" value="'.$quote_name.'"><input name="quote_id" type="hidden" value="'.$value.'">&nbsp;<img src="'.$image_path.'select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick=\'return window.open("index.php?module=Quotes&action=Popup&html=Popup_picker&popuptype=specific&form=EditView","test","width=600,height=400,resizable=1,scrollbars=1");\' align="absmiddle" style=\'cursor:hand;cursor:pointer\'>&nbsp;<input type="image" src="'.$image_path.'clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.quote_id.value=\'\';this.form.quote_name.value=\'\';return false;" align="absmiddle" style=\'cursor:hand;cursor:pointer\'></td>';
 	}
@@ -1778,7 +1789,13 @@
 	elseif($uitype == 19)
 	{
 		$col_fields[$fieldname]=html_entity_decode(nl2br($col_fields[$fieldname]));
-		$custfld .= '<td width="20%" class="dataLabel" valign="top">'.$mod_strings[$fieldlabel].':</td>';
+		$custfld .= '<td width="20%" class="dataLabel" valign="top">';
+		// not all fields (e.g. Terms & Conditions) have a field label
+		if(isset($mod_strings[$fieldlabel]))
+		{
+			$custfld .= $mod_strings[$fieldlabel].':';
+		}
+		$custfld .= '&nbsp;</td>';
 		$custfld .= '<td colspan="3" valign="top">'.$col_fields[$fieldname].'</td>'; // Armando LC<scher 10.08.2005 -> B'descriptionSpan -> Desc: inserted colspan="3"
 	}
 	elseif($uitype == 20 || $uitype == 21 || $uitype == 22 || $uitype == 24) // Armando LC<scher 11.08.2005 -> B'descriptionSpan -> Desc: removed $uitype == 19 and made an aditional elseif above
@@ -1877,6 +1894,7 @@
         {
                 $custfld .= '<td width="20%" class="dataLabel">'.$mod_strings[$fieldlabel].':</td>';
                 $contact_id = $col_fields[$fieldname];
+                $contact_name = '';
                 if($contact_id != '')
                 {
                         $contact_name = getContactName($contact_id);
@@ -2217,6 +2235,7 @@
         {
                 $custfld .= '<td width="20%" class="dataLabel">'.$mod_strings[$fieldlabel].':</td>';
                 $potential_id = $col_fields[$fieldname];
+				$potential_name = '';
                 if($potential_id != '')
                 {
                         $potential_name = getPotentialName($potential_id);
@@ -2228,6 +2247,7 @@
         {
                 $custfld .= '<td width="20%" class="dataLabel">'.$mod_strings[$fieldlabel].':</td>';
                 $quote_id = $col_fields[$fieldname];
+                $quote_name = '';
                 if($quote_id != '')
                 {
                         $quote_name = getQuoteName($quote_id);
@@ -3049,6 +3069,7 @@
 {
 	global $adb, $theme, $app_strings;
 	$filename = '';
+	$potential_name = '';
 	
 	$noofrows = $adb->num_rows($list_result);
 	$list_header = '<script>
@@ -4597,6 +4618,7 @@
 {
 	global $adb;
 	global $theme;
+	global $app_strings;
 	global $vtlog;
         $theme_path="themes/".$theme."/";
         $image_path=$theme_path."images/";

Modified: vtigercrm/branches/4.2/modules/Accounts/RenderRelatedListUI.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Accounts/RenderRelatedListUI.php (original)
+++ vtigercrm/branches/4.2/modules/Accounts/RenderRelatedListUI.php Tue Jun 20 22:23:57 2006
@@ -19,7 +19,7 @@
 //	$image_path=$theme_path."images/";
 //	require_once ($theme_path."layout_utils.php");
 
-	$hidden .= '<form border="0" action="index.php" method="post" name="form" id="form">';
+	$hidden = '<form border="0" action="index.php" method="post" name="form" id="form">';
 	$hidden .= '<input type="hidden" name="module">';
 	$hidden .= '<input type="hidden" name="mode">';
 	$hidden .= '<input type="hidden" name="account_id" value="'.$id.'">';

Modified: vtigercrm/branches/4.2/modules/Orders/RenderRelatedListUI.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Orders/RenderRelatedListUI.php (original)
+++ vtigercrm/branches/4.2/modules/Orders/RenderRelatedListUI.php Tue Jun 20 22:23:57 2006
@@ -16,7 +16,7 @@
 
 function getHiddenValues($id,$sid='purchaseorderid')
 {
-        $hidden .= '<form border="0" action="index.php" method="post" name="form" id="form">';
+        $hidden = '<form border="0" action="index.php" method="post" name="form" id="form">';
         $hidden .= '<input type="hidden" name="module">';
         $hidden .= '<input type="hidden" name="mode">';
         $hidden .= '<input type="hidden" name="'.$sid.'" value="'.$id.'">';

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 Tue Jun 20 22:23:57 2006
@@ -90,6 +90,7 @@
 $xtpl->assign("BLOCK4", $block_4);
 
 $block_5 = getDetailBlockInformation("SalesOrder",5,$focus->column_fields);
+$cust_fld = '';
 if(trim($block_5) != '')
 {
         $cust_fld = '<table width="100%" border="0" cellspacing="0" cellpadding="0" class="formOuterBorder">';

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 Tue Jun 20 22:23:57 2006
@@ -46,16 +46,17 @@
 $focus = new SalesOrder();
 
 $url_string = '&smodule=SO'; // assigning http url string
-
-if(isset($_REQUEST['query']) && $_REQUEST['query'] != '' && $_REQUEST['query'] == 'true')
+	
+$query = isset($_REQUEST['query'])? $_REQUEST['query'] : '';
+$subject = isset($_REQUEST['subject'])? $_REQUEST['subject'] : '';
+$accountname = isset($_REQUEST['accountname'])? $_REQUEST['accountname'] : '';
+$quotename = isset($_REQUEST['quotename'])? $_REQUEST['quotename'] : '';
+	
+if($query == 'true')
 {
 	$url_string .="&query=true";
-	if (isset($_REQUEST['subject'])) $subject = $_REQUEST['subject'];
-        if (isset($_REQUEST['accountname'])) $accountname = $_REQUEST['accountname'];
-        if (isset($_REQUEST['quotename'])) $quotename = $_REQUEST['quotename'];
 
 	$where_clauses = Array();
-	//$search_query='';
 
 	//Added for Custom Field Search
 	$sql="select * from field where tablename='salesordercf' order by fieldlabel";
@@ -211,7 +212,7 @@
 	<td>';
 if(isPermitted('SalesOrder',2,'') == 'yes')
 {
-	$other_text .=	'<input class="button" type="submit" value="'.$app_strings[LBL_MASS_DELETE].'" onclick="return massDelete()"/>&nbsp;';
+	$other_text .=	'<input class="button" type="submit" value="'.$app_strings['LBL_MASS_DELETE'].'" onclick="return massDelete()"/>&nbsp;';
 }
 
 if($viewid == 0)
@@ -228,9 +229,9 @@
 <span class="sep">|</span>
 <a href="index.php?module=Orders&action=CustomView&smodule=SO" class="link">'.$app_strings['LNK_CV_CREATEVIEW'].'</a>';
 }
-	$other_text .='<td align="right">'.$app_strings[LBL_VIEW].'
+	$other_text .='<td align="right">'.$app_strings['LBL_VIEW'].'
                         <SELECT NAME="view" onchange="showDefaultCustomView(this)">
-                                <OPTION VALUE="0">'.$mod_strings[LBL_ALL].'</option>
+                                <OPTION VALUE="0">'.$mod_strings['LBL_ALL'].'</option>
 				'.$customviewcombo_html.'
                         </SELECT>
 			'.$cvHTML.'
@@ -293,7 +294,7 @@
 $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;
+$record_string= $app_strings['LBL_SHOWING']." " .$start_rec." - ".$end_rec." " .$app_strings['LBL_LIST_OF'] ." ".$noofrows;
 
 //Retreive the List View Table Header
 if($viewid !='')

Modified: vtigercrm/branches/4.2/modules/Settings/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Settings/language/en_us.lang.php (original)
+++ vtigercrm/branches/4.2/modules/Settings/language/en_us.lang.php Tue Jun 20 22:23:57 2006
@@ -257,6 +257,8 @@
 //Added fields after RC1 - Release
 
 'LBL_MAIL_SERVER_INFO'=>'Mail Server Information',
+
+'LBL_MAIL_UNAME'=>'',
 
 'LBL_OUTGOING_MAIL_SERVER'=>'OutGoing Mail Server',
 

Modified: vtigercrm/branches/4.2/modules/Users/DetailView.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Users/DetailView.php (original)
+++ vtigercrm/branches/4.2/modules/Users/DetailView.php Tue Jun 20 22:23:57 2006
@@ -59,9 +59,11 @@
 $role = fetchUserRole($focus->id);
 $rolename =  getRoleName($role);
 //the user might belong to multiple groups
+$group = '';
+
 if($focus->id != 1)
 {
- $group = fetchUserGroups($focus->id);
+	$group = fetchUserGroups($focus->id);
 }
 $log->info("User detail view");
 
@@ -103,25 +105,22 @@
 	$buttons .= "<td><input title='".$app_strings['LBL_FORUM_SHOW_BUTTON_TITLE']."' accessKey='".$app_strings['LBL_FORUM_SHOW_BUTTON_KEY']."' class='button' onclick=\"this.form.module.value='Users'; this.form.forumDisplay.value='true'; this.form.action.value='DetailView'\" type='submit' name='Display' value=' ".$app_strings['LBL_FORUM_SHOW_BUTTON_LABEL']." '></td>\n";
 }
 */
-if (is_admin($current_user)) 
+if (is_admin($current_user))
 {
 	$buttons .= "<td><input title='".$app_strings['LBL_DUPLICATE_BUTTON_TITLE']."' accessKey='".$app_strings['LBL_DUPLICATE_BUTTON_KEY']."' class='button' onclick=\"this.form.return_module.value='Users'; this.form.return_action.value='DetailView'; this.form.isDuplicate.value=true; this.form.return_id.value='".$_REQUEST['record']."';this.form.action.value='EditView'\" type='submit' name='Duplicate' value=' ".$app_strings['LBL_DUPLICATE_BUTTON_LABEL']."'   >&nbsp; </td>\n";
+
 	//done so that only the admin user can see the customize tab button
 	if($_REQUEST['record'] == $current_user->id)
 	{
 		$buttons .= "<td><input title='".$app_strings['LBL_TABCUSTOMISE_BUTTON_TITLE']."' accessKey='".$app_strings['LBL_TABCUSTOMISE_BUTTON_KEY']."' class='button' onclick=\"this.form.return_module.value='Users'; this.form.return_action.value='TabCustomise'; this.form.action.value='TabCustomise'\" type='submit' name='Customise' value=' ".$app_strings['LBL_TABCUSTOMISE_BUTTON_LABEL']." '></td>\n";
 	}
+
 	if($_REQUEST['record'] != $current_user->id)
 	{
-	$buttons .= "<td><input title='".$app_strings['LBL_DELETE_BUTTON_TITLE']."' accessKey='".$app_strings['LBL_DELETE_BUTTON_KEY']."' class='button' onclick=\"this.form.return_module.value='Users'; this.form.return_action.value='DetailView'; this.form.return_id.value='$focus->id'; this.form.action.value='UserDeleteStep1'\" type='submit' name='Delete' value='  ".$app_strings['LBL_DELETE_BUTTON_LABEL']."  '></td>\n";
+		$buttons .= "<td><input title='".$app_strings['LBL_DELETE_BUTTON_TITLE']."' accessKey='".$app_strings['LBL_DELETE_BUTTON_KEY']."' class='button' onclick=\"this.form.return_module.value='Users'; this.form.return_action.value='DetailView'; this.form.return_id.value='$focus->id'; this.form.action.value='UserDeleteStep1'\" type='submit' name='Delete' value='  ".$app_strings['LBL_DELETE_BUTTON_LABEL']."  '></td>\n";
 	}
 
-        //$buttons .= "<td><input title='".$app_strings['LBL_ROLES_BUTTON_TITLE']."' accessKey='".$app_strings['LBL_ROLES_BUTTON_KEY']."' class='button' onclick=\"this.form.return_module.value='Users'; this.form.return_action.value='TabCustomise'; this.form.action.value='ListPermissions'\" type='submit' name='ListPermissions' value=' ".$app_strings['LBL_ROLES_BUTTON_LABEL']." '></td>\n";
-	if($_SESSION['authenticated_user_roleid'] == 'administrator')
-	{
-	 $buttons .= "<td><input title='".$app_strings['LBL_LISTROLES_BUTTON_TITLE']."' accessKey='".$app_strings['LBL_LISTROLES_BUTTON_KEY']."' class='button' onclick=\"this.form.return_module.value='Users'; this.form.return_action.value='TabCustomise'; this.form.action.value='listroles'; this.form.record.value= '". $current_user->id ."'\" type='submit' name='ListRoles' value=' ".$app_strings['LBL_LISTROLES_BUTTON_LABEL']." '></td>\n";
-	}
-
+	//$buttons .= "<td><input title='".$app_strings['LBL_LISTROLES_BUTTON_TITLE']."' accessKey='".$app_strings['LBL_LISTROLES_BUTTON_KEY']."' class='button' onclick=\"this.form.return_module.value='Users'; this.form.return_action.value='TabCustomise'; this.form.action.value='listroles'; this.form.record.value= '". $current_user->id ."'\" type='submit' name='ListRoles' value=' ".$app_strings['LBL_LISTROLES_BUTTON_LABEL']." '></td>\n";
 }
 
  // $buttons .="<td width='100%'></td><TD  align='right' nowrap='nowrap'><a href='".$_SERVER['PHP_SELF'] .'?'.$_SERVER['QUERY_STRING']."&reset_preferences=true' >". $mod_strings['LBL_RESET_PREFERENCES']. " </a></td>";
@@ -167,7 +166,8 @@
 $xtpl->assign("ADDRESS_STATE", $focus->address_state);
 $xtpl->assign("ADDRESS_POSTALCODE", $focus->address_postalcode);
 $xtpl->assign("ADDRESS_COUNTRY", $focus->address_country);
-$xtpl->assign("SIGNATURE", nl2br($focus->signature));
+// signature doesn't exist in the Users class definition
+//$xtpl->assign("SIGNATURE", nl2br($focus->signature));
 $xtpl->assign("MAP_START", nl2br($focus->map_source));
 $xtpl->parse("user_info");
 $xtpl->out("user_info");

Modified: vtigercrm/branches/4.2/modules/Users/EditView.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Users/EditView.php (original)
+++ vtigercrm/branches/4.2/modules/Users/EditView.php Tue Jun 20 22:23:57 2006
@@ -96,7 +96,7 @@
 $xtpl->assign("ADDRESS_STATE", $focus->address_state);
 $xtpl->assign("ADDRESS_POSTALCODE", $focus->address_postalcode);
 $xtpl->assign("ADDRESS_COUNTRY", $focus->address_country);
-$xtpl->assign("SIGNATURE", $focus->signature);
+//$xtpl->assign("SIGNATURE", $focus->signature);
 $xtpl->assign("DESCRIPTION", $focus->description);
 
 $map_options = array('--None--', 'Home', 'Work');
@@ -109,27 +109,13 @@
 $xtpl->assign("MAP_START_OPTIONS", $map_start_options);
 
 $DATE_FORMAT_SELECT_OPTION = '<select name="date_format">';
-		
-               
-if($focus->date_format == 'dd-mm-yyyy')
-{
-	$selected1 = 'selected';
-}
-elseif($focus->date_format == 'mm-dd-yyyy')
-{
-	$selected2 = 'selected';
-}
-elseif($focus->date_format == 'yyyy-mm-dd')
-{
-	$selected3 = 'selected';
-}
-$DATE_FORMAT_SELECT_OPTION .= '<option value="dd-mm-yyyy" '.$selected1.'>';
+$DATE_FORMAT_SELECT_OPTION .= '<option value="dd-mm-yyyy" '.($focus->date_format == 'dd-mm-yyyy'? 'selected' : '') .'>';
 $DATE_FORMAT_SELECT_OPTION .= 'dd-mm-yyyy';
 $DATE_FORMAT_SELECT_OPTION .= '</option>';
-$DATE_FORMAT_SELECT_OPTION .= '<option value="mm-dd-yyyy" '.$selected2.'>';
+$DATE_FORMAT_SELECT_OPTION .= '<option value="mm-dd-yyyy" '.($focus->date_format == 'mm-dd-yyyy'? 'selected' : '').'>';
 $DATE_FORMAT_SELECT_OPTION .= 'mm-dd-yyyy';
 $DATE_FORMAT_SELECT_OPTION .= '</option>';
-$DATE_FORMAT_SELECT_OPTION .= '<option value="yyyy-mm-dd" '.$selected3.'>';
+$DATE_FORMAT_SELECT_OPTION .= '<option value="yyyy-mm-dd" '.($focus->date_format == 'yyyy-mm-dd'? 'selected' : '').'>';
 $DATE_FORMAT_SELECT_OPTION .= 'yyyy-mm-dd';
 $DATE_FORMAT_SELECT_OPTION .= '</option>';	
 $DATE_FORMAT_SELECT_OPTION .= ' </select>';

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 Tue Jun 20 22:23:57 2006
@@ -53,6 +53,7 @@
 	var $address_country;
 	var $tz;
 	var $holidays;
+	var $map_source;
 	var $namedays;
 	var $workdays;
 	var $weekstart;



From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 21:28:13 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 04:28:13 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23748=3A_?=
 =?utf-8?q?Eliminate_php_notice_errors?=
In-Reply-To: <076.c75696aed703c24c8b151bd87264b9e6@vtiger.fosslabs.com>
References: <076.c75696aed703c24c8b151bd87264b9e6@vtiger.fosslabs.com>
Message-ID: <085.2227872900126c80fc2a8ed321530a94@vtiger.fosslabs.com>

#748: Eliminate php notice errors
------------------------+---------------------------------------------------
  Reporter:  allanbush  |       Owner:  jrydbeck
      Type:  task       |      Status:  closed  
  Priority:  minor      |   Milestone:  4.2.5   
 Component:  vtigercrm  |     Version:  4.2.4rc3
Resolution:  fixed      |    Keywords:          
------------------------+---------------------------------------------------
Changes (by anonymous):

  * resolution:  => fixed
  * status:  assigned => closed

Comment:

 The majority of the notices have been remedied; final changeset [7314].
 Additional notices should be bugged individually/specifically.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/748>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 20 21:51:36 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 04:51:36 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7315 -
	/vtigercrm/trunk/install/5createTables.inc.php
Message-ID: <20060621045136.851E183F345@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 20 22:51:33 2006
New Revision: 7315

Log:
encrypt password during installation removed as it is handled in Save function

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 Tue Jun 20 22:51:33 2006
@@ -71,7 +71,7 @@
         $user->column_fields["user_name"] = 'admin';
         $user->column_fields["status"] = 'Active';
         $user->column_fields["is_admin"] = 'on';
-        $user->column_fields["user_password"] = $user->encrypt_password($admin_password);
+        $user->column_fields["user_password"] = $admin_password;
         $user->column_fields["tz"] = 'Europe/Berlin';
         $user->column_fields["holidays"] = 'de,en_uk,fr,it,us,';
         $user->column_fields["workdays"] = '0,1,2,3,4,5,6,';
@@ -115,8 +115,9 @@
     	$user = new User();
         $user->column_fields["last_name"] = 'StandardUser';
         $user->column_fields["user_name"] = 'standarduser';
+        $user->column_fields["is_admin"] = 'off';
         $user->column_fields["status"] = 'Active';
-        $user->column_fields["user_password"] = $user->encrypt_password('standarduser');
+        $user->column_fields["user_password"] = 'standarduser';
         $user->column_fields["tz"] = 'Europe/Berlin';
         $user->column_fields["holidays"] = 'de,en_uk,fr,it,us,';
         $user->column_fields["workdays"] = '0,1,2,3,4,5,6,';
@@ -140,7 +141,7 @@
 	$role_id = $db->query_result($role_result,0,"roleid");
 	$user->column_fields["roleid"] = $role_id;
 
-        $user->save('Users');
+    $user->save('Users');
 
 	//Creating the flat vtiger_files
 	createUserPrivilegesfile($user->id);
@@ -170,12 +171,6 @@
 }
 			
 
-// populate vtiger_users vtiger_table
-//$uid = $db->getUniqueID("users");
-//$sql_stmt1 = "insert into vtiger_users(id,user_name,user_password,last_name,email1,date_format) values(".$uid.",'standarduser','stX/AHHNK/Gkw','standarduser','standarduser at standard.user.com','yyyy-mm-dd')";
-//$db->query($sql_stmt1) or die($app_strings['ERR_CREATING_TABLE'].mysql_error());
-
-
 // create and populate combo tables
 require_once('include/PopulateComboValues.php');
 $combo = new PopulateComboValues();



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 20 21:56:43 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 04:56:43 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7316 -
 /vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
Message-ID: <20060621045644.1CB8E83F345@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 20 22:56:40 2006
New Revision: 7316

Log:
vtiger_ updated for activity table

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

Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original)
+++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Tue Jun 20 22:56:40 2006
@@ -524,7 +524,7 @@
 $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,14,19,2,'T~O',1,null,'BAS')");
  $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,15,19,2,'T~O',1,null,'BAS')");
  $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'activitytype','vtiger_activity',1,'15','activitytype','Activity Type',1,0,0,100,16,19,3,'V~O',1,null,'BAS')");
- $this->db->query("Insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'visibility','activity',1,15,'visibility','Visibility',1,0,0,100,17,19,3,'V~O',1,null,'BAS')");
+ $this->db->query("Insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'visibility','vtiger_activity',1,15,'visibility','Visibility',1,0,0,100,17,19,3,'V~O',1,null,'BAS')");
 
  $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,20,1,'V~O',1,null,'BAS')");
 
@@ -560,9 +560,9 @@
  $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'location','vtiger_activity',1,'1','location','Location',1,0,0,100,14,41,1,'V~O',1,null,'BAS')");
  $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,15,41,2,'T~O',1,null,'BAS')");
  $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,16,41,2,'T~O',1,null,'BAS')");
- $this->db->query("Insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'priority','activity',1,15,'taskpriority','Priority',1,0,0,100,17,41,1,'V~O',1,null,'BAS')");
- $this->db->query("Insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'notime','activity',1,56,'notime','No Time',1,0,0,100,18,41,1,'C~O',1,null,'BAS')");
- $this->db->query("Insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'visibility','activity',1,15,'visibility','Visibility',1,0,0,100,19,41,1,'V~O',1,null,'BAS')");
+ $this->db->query("Insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'priority','vtiger_activity',1,15,'taskpriority','Priority',1,0,0,100,17,41,1,'V~O',1,null,'BAS')");
+ $this->db->query("Insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'notime','vtiger_activity',1,56,'notime','No Time',1,0,0,100,18,41,1,'C~O',1,null,'BAS')");
+ $this->db->query("Insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'visibility','vtiger_activity',1,15,'visibility','Visibility',1,0,0,100,19,41,1,'V~O',1,null,'BAS')");
  
  $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,43,1,'V~O',1,null,'BAS')");
  $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'reminder_time','vtiger_activity_reminder',1,'30','reminder_time','Send Reminder',1,0,0,100,1,42,1,'I~O',1,null,'BAS')");



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 20 22:03:30 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 05:03:30 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7317 -
	/vtigercrm/trunk/Smarty/templates/Header.tpl
Message-ID: <20060621050330.C21D283F34A@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 20 23:03:27 2006
New Revision: 7317

Log:
anchor tag <a name=top> closed

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 Tue Jun 20 23:03:27 2006
@@ -38,7 +38,7 @@
 	<style type="text/css">@import url("themes/{$THEME}/style.css");</style>
 </head>
 	<body leftmargin=0 topmargin=0 marginheight=0 marginwidth=0 class=small onLoad="Announcement_rss()">
-	<a name="top">
+	<a name="top"></a>
 	<!-- header -->
 	<!-- header-vtiger crm name & RSS -->
 	<script language="JavaScript" type="text/javascript" src="include/js/general.js"></script>



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 20 22:16:47 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 05:16:47 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7318 -
	/vtigercrm/trunk/modules/Settings/PickList.php
Message-ID: <20060621051647.A145883F34A@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 20 23:16:44 2006
New Revision: 7318

Log:
check added not to show user PickList Values

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

Modified: vtigercrm/trunk/modules/Settings/PickList.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/PickList.php (original)
+++ vtigercrm/trunk/modules/Settings/PickList.php Tue Jun 20 23:16:44 2006
@@ -115,7 +115,7 @@
 function getPickListModules()
 {
 	global $adb;
-	$query = 'select distinct vtiger_field.fieldname,vtiger_field.tabid,tablabel from vtiger_field inner join vtiger_tab on vtiger_tab.tabid=vtiger_field.tabid where uitype IN (15,16)';
+	$query = 'select distinct vtiger_field.fieldname,vtiger_field.tabid,tablabel from vtiger_field inner join vtiger_tab on vtiger_tab.tabid=vtiger_field.tabid where uitype IN (15,16) and vtiger_field.tabid != 29';
 	$result = $adb->query($query);
 	while($row = $adb->fetch_array($result))
 	{



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 20 22:37:39 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 05:37:39 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7319 - in /vtigercrm/trunk:
 Smarty/templates/Rss.tpl modules/Rss/Delete.php modules/Rss/Popup.php
 modules/Rss/Rss.php modules/Rss/RssAjax.php
Message-ID: <20060621053740.22C9683F342@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 20 23:37:32 2006
New Revision: 7319

Log:
category removed from rss

Modified:
    vtigercrm/trunk/Smarty/templates/Rss.tpl
    vtigercrm/trunk/modules/Rss/Delete.php
    vtigercrm/trunk/modules/Rss/Popup.php
    vtigercrm/trunk/modules/Rss/Rss.php
    vtigercrm/trunk/modules/Rss/RssAjax.php

Modified: vtigercrm/trunk/Smarty/templates/Rss.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Rss.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Rss.tpl Tue Jun 20 23:37:32 2006
@@ -22,7 +22,7 @@
                 'index.php',
                 {queue: {position: 'end', scope: 'command'},
                         method: 'post',
-                        postBody: 'module=Rss&action=RssAjax&vtigerfile=ListView&directmode=ajax&record='+id,
+                        postBody: 'module=Rss&action=RssAjax&file=ListView&directmode=ajax&record='+id,
                         onComplete: function(response) {
                                 $("status").style.display="none";
 				$("rssfeedscont").innerHTML=response.responseText;
@@ -44,7 +44,7 @@
                 	'index.php',
         	        {queue: {position: 'end', scope: 'command'},
                         	method: 'post',
-	                        postBody: 'module=Rss&return_module=Rss&action=RssAjax&vtigerfile=Delete&directmode=ajax&record='+id,
+	                        postBody: 'module=Rss&return_module=Rss&action=RssAjax&file=Delete&directmode=ajax&record='+id,
         	                onComplete: function(response) {
 	        	                $("status").style.display="none";
                                 	$("rssfeedscont").innerHTML=response.responseText;
@@ -59,12 +59,11 @@
 	$("status").style.display="inline";
 	rssurl = $('rssurl').value;
 	rssurl = rssurl.replace(/&/gi,"##amp##");
-	var category = $('rsscategory')[$('rsscategory').selectedIndex].value;
 	new Ajax.Request(
 		'index.php',
 		{queue: {position: 'end', scope: 'command'},
 			method: 'post',
-			postBody:'module=Rss&action=RssAjax&vtigerfile=Popup&directmode=ajax&rsscategory='+category+'&rssurl='+rssurl, 
+			postBody:'module=Rss&action=RssAjax&file=Popup&directmode=ajax&rssurl='+rssurl, 
 			onComplete: function(response) {
 	
                                         $("status").style.display="none";
@@ -177,10 +176,6 @@
 	<td align="left" width="70%"><input type="text" id="rssurl" class="txtBox" /></td>
 	</tr>
 	
-	<tr>
-	<td align="right"><b>{$MOD.LBL_CATEGORY}</b></td>
-	<td align="left"><select id="rsscategory" class="importBox" style="width:100%">{$RSSCATEG}</select></td>
-	</tr>
 	<tr><td colspan="2" style="border-bottom:1px dashed #CCCCCC;">&nbsp;</td></tr>
 	<tr>
 	<td	colspan="2" align="center">
@@ -192,18 +187,6 @@
 	</div>
 
 <script type="text/javascript" language="Javascript">
-function toggleRSSFolder(id) {ldelim}
-	if (document.getElementById(id+"_feeds").style.display=="none") {ldelim}
-		document.getElementById(id+"_feeds").style.display="block"
-		document.getElementById(id+"_folder").src="{$IMAGE_PATH}rss_folder_opn.gif"
-		document.getElementById(id+"_toggle").src="{$IMAGE_PATH}minus.gif"
-	{rdelim} else {ldelim}
-		document.getElementById(id+"_feeds").style.display="none"
-		document.getElementById(id+"_folder").src="{$IMAGE_PATH}rss_folder_cls.gif"
-		document.getElementById(id+"_toggle").src="{$IMAGE_PATH}plus.gif"
-	{rdelim}
-
-{rdelim}
 function makedefaultRss(id)
 {ldelim}
 	if(id != '')
@@ -213,7 +196,7 @@
                 	'index.php',
 	                {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
         	                method: 'post',
-                	        postBody:'module=Rss&action=RssAjax&vtigerfile=Popup&directmode=ajax&record='+id, 
+                	        postBody:'module=Rss&action=RssAjax&file=Popup&directmode=ajax&record='+id, 
                         	onComplete: function(response) {ldelim}
                                 	$("status").style.display="none";
         				getrssfolders();
@@ -228,7 +211,7 @@
         	'index.php',
                 {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
                 	method: 'post',
-                        postBody:'module=Rss&action=RssAjax&vtigerfile=ListView&folders=true',
+                        postBody:'module=Rss&action=RssAjax&file=ListView&folders=true',
 			onComplete: function(response) {ldelim}
                         		$("status").style.display="none";
 					$("rssfolders").innerHTML=response.responseText;

Modified: vtigercrm/trunk/modules/Rss/Delete.php
==============================================================================
--- vtigercrm/trunk/modules/Rss/Delete.php (original)
+++ vtigercrm/trunk/modules/Rss/Delete.php Tue Jun 20 23:37:32 2006
@@ -25,5 +25,5 @@
 DeleteEntity($_REQUEST['module'],$_REQUEST['return_module'],'',$_REQUEST['record'],'');
 
  //code added for returning back to the current view after delete from list view
-header("Location: index.php?module=".$_REQUEST['return_module']."&action=RssAjax&vtigerfile=ListView&directmode=ajax");
+header("Location: index.php?module=".$_REQUEST['return_module']."&action=RssAjax&file=ListView&directmode=ajax");
 ?>

Modified: vtigercrm/trunk/modules/Rss/Popup.php
==============================================================================
--- vtigercrm/trunk/modules/Rss/Popup.php (original)
+++ vtigercrm/trunk/modules/Rss/Popup.php Tue Jun 20 23:37:32 2006
@@ -21,7 +21,7 @@
 	global $adb;
 	$query = 'update vtiger_rss set starred=0';
 	$adb->query($query);
-	$query = 'update vtiger_rss set starred=1 where vtiger_rssid ='.$_REQUEST["record"]; 
+	$query = 'update vtiger_rss set starred=1 where rssid ='.$_REQUEST["record"]; 
 	$adb->query($query);
 	echo $_REQUEST["record"];
 }

Modified: vtigercrm/trunk/modules/Rss/Rss.php
==============================================================================
--- vtigercrm/trunk/modules/Rss/Rss.php (original)
+++ vtigercrm/trunk/modules/Rss/Rss.php Tue Jun 20 23:37:32 2006
@@ -136,7 +136,7 @@
 			}else
 			{
 				$shtml .= "<td width=\"15\">
-					<img src=\"".$image_path."offstar.gif\" align=\"absmiddle\" onMouseOver=\"this.style.cursor='pointer'\" id=\"star-$allrssrow[rssid]\"></td>";
+					<img src=\"".$image_path."offstar.gif\" align=\"absmiddle\" onMouseOver=\"this.style.cursor='pointer'\" id=\"star-$allrssrow[rssid]\" onClick=\"makedefaultRss($allrssrow[rssid])\"></td>";
 			}
 			$shtml .= "<td class=\"rssTitle\"><a href=\"index.php?module=Rss&action=ListView&record=$allrssrow[rssid]
 				\" class=\"rssTitle\">".$allrssrow[rsstitle]."</a></td>";
@@ -164,7 +164,7 @@
 			}else
 			{		
 				$shtml .= "<td width=\"15\">
-					<img src=\"".$image_path."offstar.gif\" align=\"absmiddle\" onMouseOver=\"this.style.cursor='pointer'\" id=\"star-$allrssrow[rssid]\"></td>";
+					<img src=\"".$image_path."offstar.gif\" align=\"absmiddle\" onMouseOver=\"this.style.cursor='pointer'\" id=\"star-$allrssrow[rssid]\" onClick=\"makedefaultRss($allrssrow[rssid])\"></td>";
 			}
 			$shtml .= "<td class=\"rssTitle\"><a href=\"index.php?module=Rss&action=ListView&record=$allrssrow[rssid]\" class=\"rssTitle\">".$allrssrow[rsstitle]."</a></td><td>&nbsp;</td>";
 			$shtml .= "</tr>";
@@ -378,7 +378,7 @@
 				 	   $shtml .= "<img src=\"".$image_path."onstar.gif\" align=\"absmiddle\" onMouseOver=\"this.style.cursor='pointer'\" id=\"star-$allrssrow[rssid]\">";
 			}else
 			{
-				 	   $shtml .= "<img src=\"".$image_path."offstar.gif\" align=\"absmiddle\" onMouseOver=\"this.style.cursor='pointer'\" id=\"star-$allrssrow[rssid]\">";
+				 	   $shtml .= "<img src=\"".$image_path."offstar.gif\" align=\"absmiddle\" onMouseOver=\"this.style.cursor='pointer'\" id=\"star-$allrssrow[rssid]\"  onClick=\"makedefaultRss($allrssrow[rssid])\">";
 			}
 					   $shtml .= "</td>";
 			$shtml .= "<td class=\"rssTitle\" width=\"10%\" nowrap><a href=\"javascript:GetRssFeedList('$allrssrow[rssid]')\" class=\"rssTitle\">".$allrssrow[rsstitle]."</a></td><td>&nbsp;</td>";

Modified: vtigercrm/trunk/modules/Rss/RssAjax.php
==============================================================================
--- vtigercrm/trunk/modules/Rss/RssAjax.php (original)
+++ vtigercrm/trunk/modules/Rss/RssAjax.php Tue Jun 20 23:37:32 2006
@@ -10,5 +10,5 @@
   ********************************************************************************/
 	
 
-	require_once('modules/'.$_REQUEST['module'].'/'.$_REQUEST['vtigerfile'].'.php');
+	require_once('modules/'.$_REQUEST['module'].'/'.$_REQUEST['file'].'.php');
 ?>



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 20 22:38:53 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 05:38:53 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7320 -
 /vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
Message-ID: <20060621053853.3D0E883F342@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 20 23:38:49 2006
New Revision: 7320

Log:
rss category removed

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

Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original)
+++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Tue Jun 20 23:38:49 2006
@@ -361,10 +361,6 @@
 //Potential Details -- END
 
 
-//Rss entries being added
- $this->db->query("insert into vtiger_field values (24,".$this->db->getUniqueID("field").",'rsscategory','vtiger_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 vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 20 22:40:40 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 05:40:40 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7321 -
 /vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
Message-ID: <20060621054040.01EB883F33D@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 20 23:40:37 2006
New Revision: 7321

Log:
vtiger_ updated for activity table

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

Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original)
+++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Tue Jun 20 23:40:37 2006
@@ -532,7 +532,7 @@
  
  $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'recurringtype','vtiger_recurringevents',1,'15','recurringtype','Recurrence',1,0,0,100,6,19,3,'O~O',1,null,'BAS')");
 
- $this->db->query("Insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'notime','activity',1,56,'notime','No Time',1,0,0,100,20,19,3,'C~O',1,null,'BAS')");
+ $this->db->query("Insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'notime','vtiger_activity',1,56,'notime','No Time',1,0,0,100,20,19,3,'C~O',1,null,'BAS')");
 //Block19 -- End
 //Task Details -- END
 



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 20 22:45:09 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 05:45:09 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7322 -
	/vtigercrm/trunk/modules/Rss/Rss.php
Message-ID: <20060621054509.1362383F33D@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 20 23:45:06 2006
New Revision: 7322

Log:
fns related to rss category has been removed

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

Modified: vtigercrm/trunk/modules/Rss/Rss.php
==============================================================================
--- vtigercrm/trunk/modules/Rss/Rss.php (original)
+++ vtigercrm/trunk/modules/Rss/Rss.php Tue Jun 20 23:45:06 2006
@@ -388,37 +388,6 @@
 
 	}
 
-	/** Function to get the vtiger_rsscategories   
-	* This Function accepts no argument and returns the categorylist as an array
-	*/
-
-	function getRsscategory()
-	{
-		global $adb;
-		global $image_path;
-		$sSQL = "select * from vtiger_rsscategory where presence = 1 order by sortorderid";
-		$result = $adb->query($sSQL);
-
-		while($categoryrow = $adb->fetch_array($result))
-		{
-			$rsscategories[] = $categoryrow["rsscategory"];
-		}
-
-		return $rsscategories;
-	}
-	
-	function getRsscategory_html()
-	{
-		$rsscategory = $this->getRsscategory();
-		if(isset($rsscategory)) 
-		{
-			for($i=0;$i<count($rsscategory);$i++)
-			{
-				$shtml .= "<option value=\"$rsscategory[$i]\">$rsscategory[$i]</option>";
-			}
-		}
-		return $shtml;
-	}
 }
 
 /** Function to get the vtiger_rsstitle for the given vtiger_rssid  



From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 22:49:11 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 05:49:11 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231347=3A?=
 =?utf-8?q?_Potential_Sales_Stage_history_is_not_displayed?=
Message-ID: <076.aea73b50aece6d481e52ebcf4c8ca579@vtiger.fosslabs.com>

#1347: Potential Sales Stage history is not displayed
-----------------------+----------------------------------------------------
 Reporter:  mickie     |       Owner:  mickie
     Type:  defect     |      Status:  new   
 Priority:  major      |   Milestone:        
Component:  vtigercrm  |     Version:  5.0.0 
 Keywords:             |  
-----------------------+----------------------------------------------------
 In potential relatedlist we have Sales Stage history which does not
 display anything even there are entries in potstagehistory

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1347>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 20 22:52:45 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 05:52:45 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7323 - in
 /vtigercrm/trunk/include: ComboStrings.php PopulateComboValues.php
Message-ID: <20060621055245.65CAE83F35A@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 20 23:52:40 2006
New Revision: 7323

Log:
Rss category removed

Modified:
    vtigercrm/trunk/include/ComboStrings.php
    vtigercrm/trunk/include/PopulateComboValues.php

Modified: vtigercrm/trunk/include/ComboStrings.php
==============================================================================
--- vtigercrm/trunk/include/ComboStrings.php (original)
+++ vtigercrm/trunk/include/ComboStrings.php Tue Jun 20 23:52:40 2006
@@ -188,10 +188,6 @@
                           'Public'=>'Public'
 			 ),
 				     
-'rsscategory_dom' => Array('vtiger Discussions'=>'vtiger Discussions',
-                       'vtiger Wiki'=>'vtiger Wiki'
-                      ),
-
 'usageunit_dom' => Array('Box'=>'Box',
                         'Carton'=>'Carton',
                         'Caton'=>'Caton',

Modified: vtigercrm/trunk/include/PopulateComboValues.php
==============================================================================
--- vtigercrm/trunk/include/PopulateComboValues.php (original)
+++ vtigercrm/trunk/include/PopulateComboValues.php Tue Jun 20 23:52:40 2006
@@ -60,7 +60,7 @@
 				
 		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','status','activity_view','lead_view','date_format');
+		$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','usageunit','glacct','quotestage','carrier','taxclass','recurringtype','faqstatus','invoicestatus','postatus','sostatus','visibility','campaigntype','campaignstatus','expectedresponse','status','activity_view','lead_view','date_format');
 
 		foreach ($comboTables as $comTab)
 		{



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 20 23:00:33 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 06:00:33 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7324 -
	/vtigercrm/trunk/include/utils/ListViewUtils.php
Message-ID: <20060621060033.D61A483F35D@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 00:00:29 2006
New Revision: 7324

Log:
parenttab has been parsed in activities subjectlink

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 Jun 21 00:00:29 2006
@@ -1483,11 +1483,11 @@
 					$actvity_type = $adb->query_result($list_result,$list_result_count,'activitytype');
 					if($actvity_type == "Task")
 					{
-						$value = '<a href="index.php?action=DetailView&module='.$module.'&record='.$entity_id.'&activity_mode=Task">'.$temp_val.'</a>';
+						$value = '<a href="index.php?action=DetailView&module='.$module.'&record='.$entity_id.'&activity_mode=Task&parenttab=My Home Page">'.$temp_val.'</a>';
 					}
 					else
 					{
-						$value = '<a href="index.php?action=DetailView&module='.$module.'&record='.$entity_id.'&activity_mode=Events">'.$temp_val.'</a>';
+						$value = '<a href="index.php?action=DetailView&module='.$module.'&record='.$entity_id.'&activity_mode=Events&parenttab=My Home Page">'.$temp_val.'</a>';
 					}
 				}
 				elseif($module == "Vendors")
@@ -2567,7 +2567,9 @@
 		$field = 'id';
 		$table = 'vtiger_users';
 	}
-	$query = "SELECT ".$selectfield." FROM ".$reltable." ".$condition;
+	
+	if($reltable != null)
+		$query = "SELECT ".$selectfield." FROM ".$reltable." ".$condition;
 
 	if($query !='')
 	{



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 20 23:07:14 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 06:07:14 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7325 -
	/vtigercrm/trunk/include/magpierss/rss_fetch.inc
Message-ID: <20060621060714.56FB083F361@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 00:07:09 2006
New Revision: 7325

Log:
error msg changed

Modified:
    vtigercrm/trunk/include/magpierss/rss_fetch.inc

Modified: vtigercrm/trunk/include/magpierss/rss_fetch.inc
==============================================================================
--- vtigercrm/trunk/include/magpierss/rss_fetch.inc (original)
+++ vtigercrm/trunk/include/magpierss/rss_fetch.inc Wed Jun 21 00:07:09 2006
@@ -235,7 +235,7 @@
         if ( $errormsg ) {
             $errormsg = "MagpieRSS: $errormsg";
             $MAGPIE_ERROR = $errormsg;
-            trigger_error( $errormsg, $lvl);                
+            //trigger_error( $errormsg, $lvl);                
         }
 }
 



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 20 23:07:59 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 06:07:59 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7326 -
	/vtigercrm/trunk/modules/Potentials/Opportunity.php
Message-ID: <20060621060759.3C6BA83F361@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 00:07:55 2006
New Revision: 7326

Log:
* Modified the function get_stage_history to display the sales stage history where as previously it was not displayed

Modified:
    vtigercrm/trunk/modules/Potentials/Opportunity.php

Modified: vtigercrm/trunk/modules/Potentials/Opportunity.php
==============================================================================
--- vtigercrm/trunk/modules/Potentials/Opportunity.php (original)
+++ vtigercrm/trunk/modules/Potentials/Opportunity.php Wed Jun 21 00:07:55 2006
@@ -283,126 +283,55 @@
 		$log->debug("Exiting get_products method ...");
 		return GetRelatedList('Potentials','Products',$focus,$query,$button,$returnset);
 	}
+
+	/**	Function used to get the Sales Stage history of the Potential
+	 *	@param $id - potentialid
+	 *	return $return_data - array with header and the entries in format Array('header'=>$header,'entries'=>$entries_list) where as $header and $entries_list are array which contains all the column values of an row
+	 */
 	function get_stage_history($id)
 	{	
-		 global $log;
+		global $log;
 		$log->debug("Entering get_stage_history(".$id.") method ...");
-		global $theme;
-		$theme_path="themes/".$theme."/";
-		$image_path=$theme_path."images/";
-		require_once ($theme_path."layout_utils.php");
 
 		global $adb;
 		global $mod_strings;
 		global $app_strings;
 
+		$query = 'select vtiger_potstagehistory.*, vtiger_potential.potentialname from vtiger_potstagehistory inner join vtiger_potential on vtiger_potential.potentialid = vtiger_potstagehistory.potentialid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_potential.potentialid where vtiger_crmentity.deleted = 0 and vtiger_potential.potentialid = '.$id;
 		$result=$adb->query($query);
 		$noofrows = $adb->num_rows($result);
 
-
-		if($noofrows == 0)
-		{
-		}
-		else
-		{	
-			if ($noofrows > 15)
-			{
-				$list .= '<div style="overflow:auto;height:315px;width:100%;">';
-			}
-
-			$list .= '<table border="0" cellpadding="0" cellspacing="0" class="FormBorder" width="100%">';
-			$list .= '<tr class="ModuleListTitle" height=20>';
-
-			$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-			$list .= '<td class="moduleListTitle" height="21">';
-
-			$list .= $app_strings['LBL_AMOUNT'].'</td>';
-			$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-			$list .= '<td class="moduleListTitle">';
-
-			$list .= $app_strings['LBL_SALES_STAGE'].'</td>';
-			$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-			$list .= '<td class="moduleListTitle">';
-
-			$list .= $app_strings['LBL_PROBABILITY'].'</td>';
-			$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-			$list .= '<td class="moduleListTitle">';
-
-			$list .= $app_strings['LBL_CLOSE_DATE'].'</td>';
-			$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-			$list .= '<td class="moduleListTitle">';
-
-			$list .= $app_strings['LBL_LAST_MODIFIED'].'</td>';
-			$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-			$list .= '<td class="moduleListTitle">';
-
-			$list .= '</td>';
-			$list .= '</tr>';
-
-			$list .= '<tr><td COLSPAN="12" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif"></td></tr>';
-
-			$i=1;
-			while($row = $adb->fetch_array($result))
-			{
-
-				if ($i%2==0)
-					$trowclass = 'evenListRow';
-				else
-					$trowclass = 'oddListRow';
-
-				$list .= '<tr class="'. $trowclass.'">';
-
-				$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-				$list .= '<td width="15%">'.$row['amount'].'</td>';
-
-				$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-				$list .= '<td width="25%" height="21" style="padding:0px 3px 0px 3px;">';
-				$list .= $row['stage'];
-				$list .= '</td>';
-
-				$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-				$list .= '<td width="15%" height="21" style="padding:0px 3px 0px 3px;">';
-				$list .= $row['probability'];
-				$list .= '</td>';
-
-				$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-				$list .= '<td width="25%" height="21" style="padding:0px 3px 0px 3px;">';
-				//changed to show the close date as user date format -- after 4.2 patch2
-				$closedate = getDisplayDate($row['closedate']);
-				$list .= $closedate;
-				$list .= '</td>';
-
-				$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-				$list .= '<td width="20%" height="21" style="padding:0px 3px 0px 3px;">';
-				//changed to show the last modified date as user date format -- after 4.2 patch2
-				$lastmodified = getDisplayDate($row['lastmodified']);
-				$list .= $lastmodified;
-				$list .= '</td>';
-
-				$list .= '</td>';
-
-				$list .= '</tr>';
-				$i++;
-			}
-
-			$list .= '<tr><td COLSPAN="12" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif"></td></tr>';
-			$list .= '</table>';
-			if ($noofrows > 15)
-			{
-				$list .= '</div>';
-			}
-
-		}
-
-		$query = 'select vtiger_potstagehistory.*, vtiger_potential.potentialname from vtiger_potstagehistory inner join vtiger_potential on vtiger_potential.potentialid = vtiger_potstagehistory.potentialid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_potential.potentialid where vtiger_crmentity.deleted = 0 and vtiger_potential.potentialid = '.$id;
-	 $log->debug("Exiting get_stage_history method ...");
-	}
-
-	function get_history($id)
-	{
-		 global $log;
-		$log->debug("Entering get_history(".$id.") method ...");
-		$query = "SELECT vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.status,
+		$header[] = $app_strings['LBL_AMOUNT'];
+		$header[] = $app_strings['LBL_SALES_STAGE'];
+		$header[] = $app_strings['LBL_PROBABILITY'];
+		$header[] = $app_strings['LBL_CLOSE_DATE'];
+		$header[] = $app_strings['LBL_LAST_MODIFIED'];
+
+		while($row = $adb->fetch_array($result))
+		{
+			$entries = Array();
+
+			$entries[] = $row['amount'];
+			$entries[] = $row['stage'];
+			$entries[] = $row['probability'];
+			$entries[] = getDisplayDate($row['closedate']);
+			$entries[] = getDisplayDate($row['lastmodified']);
+
+			$entries_list[] = $entries;
+		}
+
+		$return_data = Array('header'=>$header,'entries'=>$entries_list);
+
+	 	$log->debug("Exiting get_stage_history method ...");
+
+		return $return_data;
+	}
+
+		function get_history($id)
+		{
+			global $log;
+			$log->debug("Entering get_history(".$id.") method ...");
+			$query = "SELECT vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.status,
 		vtiger_activity.eventstatus, vtiger_activity.activitytype, vtiger_contactdetails.contactid,
 		vtiger_contactdetails.firstname, vtiger_contactdetails.lastname, vtiger_crmentity.modifiedtime,
 		vtiger_crmentity.createdtime, vtiger_crmentity.description, vtiger_users.user_name



From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 23:08:41 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 06:08:41 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231347=3A?=
 =?utf-8?q?_Potential_Sales_Stage_history_is_not_displayed?=
In-Reply-To: <076.aea73b50aece6d481e52ebcf4c8ca579@vtiger.fosslabs.com>
References: <076.aea73b50aece6d481e52ebcf4c8ca579@vtiger.fosslabs.com>
Message-ID: <085.f4c5c1a21e285de21dafc174a0245fc2@vtiger.fosslabs.com>

#1347: Potential Sales Stage history is not displayed
------------------------+---------------------------------------------------
  Reporter:  mickie     |       Owner:  mickie
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mickie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 This issue has been fixed.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1347>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 20 23:36:40 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 06:36:40 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7327 -
 /vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
Message-ID: <20060621063641.0F41B83F366@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 00:36:37 2006
New Revision: 7327

Log:
Activities added under marketing

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

Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original)
+++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Wed Jun 21 00:36:37 2006
@@ -2153,7 +2153,7 @@
 	$this->db->query("insert into vtiger_parenttabrel values (2,10,4)");
 	$this->db->query("insert into vtiger_parenttabrel values (4,10,7)");
 	$this->db->query("insert into vtiger_parenttabrel values (2,7,5)");
-	$this->db->query("insert into vtiger_parenttabrel values (4,9,6)");
+	$this->db->query("insert into vtiger_parenttabrel values (2,9,6)");
 	$this->db->query("insert into vtiger_parenttabrel values (4,9,8)");
 		
 	//Added to populate the default inventory tax informations



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 20 23:37:42 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 06:37:42 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7328 -
	/vtigercrm/trunk/include/utils/ListViewUtils.php
Message-ID: <20060621063743.17BCE83F365@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 00:37:39 2006
New Revision: 7328

Log:
parenttab has been parsed in activities subjectlink

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 Jun 21 00:37:39 2006
@@ -1483,11 +1483,11 @@
 					$actvity_type = $adb->query_result($list_result,$list_result_count,'activitytype');
 					if($actvity_type == "Task")
 					{
-						$value = '<a href="index.php?action=DetailView&module='.$module.'&record='.$entity_id.'&activity_mode=Task&parenttab=My Home Page">'.$temp_val.'</a>';
+						$value = '<a href="index.php?action=DetailView&module='.$module.'&record='.$entity_id.'&activity_mode=Task&parenttab='.$tabname.'">'.$temp_val.'</a>';
 					}
 					else
 					{
-						$value = '<a href="index.php?action=DetailView&module='.$module.'&record='.$entity_id.'&activity_mode=Events&parenttab=My Home Page">'.$temp_val.'</a>';
+						$value = '<a href="index.php?action=DetailView&module='.$module.'&record='.$entity_id.'&activity_mode=Events&parenttab='.$tabname.'">'.$temp_val.'</a>';
 					}
 				}
 				elseif($module == "Vendors")



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 20 23:53:21 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 06:53:21 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7329 - in /vtigercrm/trunk:
 Smarty/templates/Rss.tpl themes/blue/style.css
Message-ID: <20060621065321.767AA83F365@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 00:53:16 2006
New Revision: 7329

Log:
floating popup integrated

Modified:
    vtigercrm/trunk/Smarty/templates/Rss.tpl
    vtigercrm/trunk/themes/blue/style.css

Modified: vtigercrm/trunk/Smarty/templates/Rss.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Rss.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Rss.tpl Wed Jun 21 00:53:16 2006
@@ -112,7 +112,7 @@
 			<tr>
 			
 			<td style="padding:10px;vertical-align:middle;" width="28%">
-			<img src='{$IMAGE_PATH}rssroot.gif' align='absmiddle'/><a href="javascript:;" onClick="fnvshobj(this,'PopupLay');" title='{$APP.LBL_ADD_RSS_FEEDS}'>{$MOD.LBL_ADD_RSS_FEED}</a>
+			<img src='{$IMAGE_PATH}rssroot.gif' align='absmiddle'/><a href="javascript:;" onClick="fnvshobj(this,'PopupLay');$('rssurl').focus();" title='{$APP.LBL_ADD_RSS_FEEDS}'>{$MOD.LBL_ADD_RSS_FEED}</a>
 			</td>
 			<td width="2%">&nbsp;</td>
 			<td width="60%"><img src="{$IMAGE_PATH}rssimage.gif" width="176" height="44"  align="right"/></td>
@@ -164,7 +164,7 @@
 	<td>&nbsp;</td>
 	</tr>
 </table>
-	<div id="PopupLay">
+	<div id="PopupLay" class="fixedLay">
 	<table width="100%" border="0" cellpadding="5" cellspacing="0">
 	<tr>
 	<td class="genHeaderSmall" align="left"><img src="{$IMAGE_PATH}rssroot.gif" width="24" height="22" align="absmiddle" />&nbsp;{$MOD.LBL_ADD_RSS_FEED}</td>

Modified: vtigercrm/trunk/themes/blue/style.css
==============================================================================
--- vtigercrm/trunk/themes/blue/style.css (original)
+++ vtigercrm/trunk/themes/blue/style.css Wed Jun 21 00:53:16 2006
@@ -2369,7 +2369,6 @@
     background-color:#FFFFFF;
     padding:5px;
     display:none;
-    position:absolute;
     left:100px;
     top:100px;
 }



From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 23:57:42 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 06:57:42 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231348=3A?=
 =?utf-8?q?_deleted_records_displayed_in_global_search?=
Message-ID: <076.dd3d65454b07d2aac86bfb866aba2fa0@vtiger.fosslabs.com>

#1348: deleted records displayed in global search
-----------------------+----------------------------------------------------
 Reporter:  mickie     |       Owner:  mickie
     Type:  defect     |      Status:  new   
 Priority:  major      |   Milestone:        
Component:  vtigercrm  |     Version:  5.0.0 
 Keywords:             |  
-----------------------+----------------------------------------------------
 I am wondering why when doing a search it also include deleted records.
 Furthermore, when clicked on the searched record, it looks like it is
 still undeleted!!! Very confusing.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1348>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 00:05:54 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 07:05:54 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231308=3A?=
 =?utf-8?q?_Role_security_issue_=28cf_=23599=29?=
In-Reply-To: <076.c439add42e557216aac6af17846b79b5@vtiger.fosslabs.com>
References: <076.c439add42e557216aac6af17846b79b5@vtiger.fosslabs.com>
Message-ID: <085.47f84636802e19d00ae292bca849bb2d@vtiger.fosslabs.com>

#1308: Role security issue (cf #599)
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  don           
      Type:  defect     |      Status:  closed        
  Priority:  critical   |   Milestone:                
 Component:  vtigercrm  |     Version:  5.0.0         
Resolution:  fixed      |    Keywords:  security roles
------------------------+---------------------------------------------------
Changes (by anonymous):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1308>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 00:06:08 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 07:06:08 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7330 -
	/vtigercrm/trunk/modules/Home/UnifiedSearch.php
Message-ID: <20060621070608.3120B83F36C@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 01:06:04 2006
New Revision: 7330

Log:
* Modified to avoid the deleted records coming in the search result

Modified:
    vtigercrm/trunk/modules/Home/UnifiedSearch.php

Modified: vtigercrm/trunk/modules/Home/UnifiedSearch.php
==============================================================================
--- vtigercrm/trunk/modules/Home/UnifiedSearch.php (original)
+++ vtigercrm/trunk/modules/Home/UnifiedSearch.php Wed Jun 21 01:06:04 2006
@@ -117,7 +117,7 @@
 		}
 
 		if($where != '')
-			$listquery .= ' and '.$where;
+			$listquery .= ' and ('.$where.')';
 		
 		$list_result = $adb->query($listquery);
 		$noofrows = $adb->num_rows($list_result);



From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 00:11:27 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 07:11:27 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231348=3A?=
 =?utf-8?q?_deleted_records_displayed_in_global_search?=
In-Reply-To: <076.dd3d65454b07d2aac86bfb866aba2fa0@vtiger.fosslabs.com>
References: <076.dd3d65454b07d2aac86bfb866aba2fa0@vtiger.fosslabs.com>
Message-ID: <085.fb7471b1970b8558c7e15b19c06b6671@vtiger.fosslabs.com>

#1348: deleted records displayed in global search
------------------------+---------------------------------------------------
  Reporter:  mickie     |       Owner:  mickie
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mickie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 This issue has been fixed
 http://forums.vtiger.com/viewtopic.php?p=26326#26326

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1348>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 00:14:53 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 07:14:53 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231346=3A?=
 =?utf-8?q?_Bug_in_sales_stage_history_with_date_format?=
In-Reply-To: <076.bab2ea728a9018419ac1466eb7e6303a@vtiger.fosslabs.com>
References: <076.bab2ea728a9018419ac1466eb7e6303a@vtiger.fosslabs.com>
Message-ID: <085.c27c9478502c4926c427f2419299b150@vtiger.fosslabs.com>

#1346: Bug in sales stage history with date format
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  developer
      Type:  defect     |      Status:  new      
  Priority:  blocker    |   Milestone:           
 Component:  vtigercrm  |     Version:  4.2.4rc1 
Resolution:             |    Keywords:           
------------------------+---------------------------------------------------
Changes (by anonymous):

  * version:  5.0.0 => 4.2.4rc1

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1346>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 00:49:41 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 07:49:41 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7331 -
 /vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php
Message-ID: <20060621074942.2ECFA83F36F@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 01:49:37 2006
New Revision: 7331

Log:
* Added the db changes where as major part is users module fields are entered in field table

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 Jun 21 01:49:37 2006
@@ -3046,6 +3046,119 @@
 }
 
 
+//User fields added in field table
+$user_query_array = Array(
+
+"alter table vtiger_users add column confirm_password varchar(50)",
+"insert into vtiger_tab values (29,'Users',0,26,'Users',null,null,1)",
+
+"insert into vtiger_blocks values (79,29,'LBL_USERLOGIN_ROLE',1,0,0,0,0,0)",
+"insert into vtiger_blocks values (80,29,'LBL_MORE_INFORMATION',2,0,0,0,0,0)",
+"insert into vtiger_blocks values (81,29,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)",
+
+"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'user_name','vtiger_users',1,'106','user_name','User Name',1,0,0,11,1,79,1,'V~M',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'is_admin','vtiger_users',1,'156','is_admin','Admin',1,0,0,3,2,79,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'user_password','vtiger_users',1,'99','user_password','Password',1,0,0,30,3,79,4,'P~M',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'confirm_password','vtiger_users',1,'99','confirm_password','Confirm Password',1,0,0,30,4,79,4,'P~M',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'first_name','vtiger_users',1,'1','first_name','First Name',1,0,0,30,5,79,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'last_name','vtiger_users',1,'2','last_name','Last Name',1,0,0,30,6,79,1,'V~M',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'roleid','vtiger_user2role',1,'98','roleid','Role',1,0,0,200,7,79,1,'V~M',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'email1','vtiger_users',1,'104','email1','Email',1,0,0,100,9,79,1,'E~M',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'status','vtiger_users',1,'115','status','Status',1,0,0,100,10,79,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'activity_view','vtiger_users',1,'15','activity_view','Default Activity View',1,0,0,100,13,79,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'lead_view','vtiger_users',1,'15','lead_view','Default Lead View',1,0,0,100,12,79,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'currency_id','vtiger_users',1,'116','currency_id','Currency',1,0,0,100,11,79,1,'I~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'title','vtiger_users',1,'1','title','Title',1,0,0,50,1,80,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'phone_work','vtiger_users',1,'1','phone_work','Office Phone',1,0,0,50,2,80,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'department','vtiger_users',1,'1','department','Department',1,0,0,50,3,80,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'phone_mobile','vtiger_users',1,'1','phone_mobile','Mobile',1,0,0,50,4,80,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'reports_to_id','vtiger_users',1,'101','reports_to_id','Reports To',1,0,0,50,5,80,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'phone_other','vtiger_users',1,'1','phone_other','Other Phone',1,0,0,50,5,80,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'email2','vtiger_users',1,'13','email2','Other Email',1,0,0,100,6,80,1,'E~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'phone_fax','vtiger_users',1,'1','phone_fax','Fax',1,0,0,50,7,80,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'yahoo_id','vtiger_users',1,'13','yahoo_id','Yahoo id',1,0,0,100,7,80,1,'E~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'phone_home','vtiger_users',1,'1','phone_home','Home Phone',1,0,0,50,8,80,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'imagename','vtiger_users',1,'105','imagename','User Image',1,0,0,250,9,80,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'date_format','vtiger_users',1,'15','date_format','Date Format',1,0,0,30,10,80,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'tagcloud','vtiger_users',1,'103','tagcloud','Tag Cloud',1,0,0,250,13,80,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'signature','vtiger_users',1,'21','signature','Signature',1,0,0,250,11,80,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'description','vtiger_users',1,'21','description','Notes',1,0,0,250,12,80,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'address_street','vtiger_users',1,'21','address_street','Street Address',1,0,0,250,1,81,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'address_city','vtiger_users',1,'1','address_city','City',1,0,0,100,2,81,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'address_state','vtiger_users',1,'1','address_state','State',1,0,0,100,3,81,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'address_postalcode','vtiger_users',1,'1','address_postalcode','Postal Code',1,0,0,100,4,81,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'address_country','vtiger_users',1,'1','address_country','Country',1,0,0,100,5,81,1,'V~O',1,null,'BAS')",
+			 );
+foreach($user_query_array as $query)
+{
+	Execute($query);
+}
+
+$create_query29 = "CREATE TABLE vtiger_status (
+			`statusid` int(19) NOT NULL auto_increment,
+			`status` varchar(200) NOT NULL,
+			`sortorderid` int(19) NOT NULL default '0',
+			`presence` int(1) NOT NULL default '1',
+			PRIMARY KEY  (`statusid`)
+			)";
+Execute($create_query29);
+
+Execute("insert into vtiger_status values (1,'Active',0,1)");
+Execute("insert into vtiger_status values (2,'Inactive',1,1)");
+
+$create_query30 = "CREATE TABLE vtiger_activity_view (
+			`activity_viewid` int(19) NOT NULL auto_increment,
+			`activity_view` varchar(200) NOT NULL,
+			`sortorderid` int(19) NOT NULL default '0',
+			`presence` int(1) NOT NULL default '1',
+			PRIMARY KEY  (`activity_viewid`)
+			)";
+Execute($create_query30);
+
+Execute("insert into vtiger_activity_view values (1,'Today',0,1)");
+Execute("insert into vtiger_activity_view values (2,'This Week',1,1)");
+Execute("insert into vtiger_activity_view values (3,'This Month',2,1)");
+Execute("insert into vtiger_activity_view values (4,'This Year',3,1)");
+
+
+$create_query31 = "CREATE TABLE vtiger_lead_view (
+			`lead_viewid` int(19) NOT NULL auto_increment,
+			`lead_view` varchar(200) NOT NULL,
+			`sortorderid` int(19) NOT NULL default '0',
+			`presence` int(1) NOT NULL default '1',
+			PRIMARY KEY  (`lead_viewid`)
+			)";
+Execute($create_query31);
+
+Execute("insert into vtiger_lead_view values (1,'Today',0,1)");
+Execute("insert into vtiger_lead_view values (2,'Last 2 Days',1,1)");
+Execute("insert into vtiger_lead_view values (3,'Last Week',2,1)");
+
+
+$create_query32 = "CREATE TABLE vtiger_date_format (
+			`date_formatid` int(19) NOT NULL auto_increment,
+			`date_format` varchar(200) NOT NULL,
+			`sortorderid` int(19) NOT NULL default '0',
+			`presence` int(1) NOT NULL default '1',
+			PRIMARY KEY  (`date_formatid`)
+			)";
+Execute($create_query32);
+
+Execute("insert into vtiger_date_format values (1,'dd-mm-yyyy',0,1)");
+Execute("insert into vtiger_date_format values (2,'mm-dd-yyyy',1,1)");
+Execute("insert into vtiger_date_format values (3,'yyyy-mm-dd',2,1)");
+//end of User fields added in field table
+
+//Activities and Leads Added under Marketing
+Execute("insert into vtiger_parenttabrel values (2,7,5)");
+Execute("insert into vtiger_parenttabrel values (2,9,6)");
+Execute("insert into vtiger_parenttabrel values (4,9,8)");
+
+//Queries to remove the rss categories
+Execute("drop table vtiger_rsscategory");
+Execute("delete from vtiger_field where tabid=24");
+
+
 
 			     
 



From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 01:17:58 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 08:17:58 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231173=3A?=
	=?utf-8?q?_unable_to_veiw_pdf?=
In-Reply-To: <076.2f691fd08704f9500476c37cc5e5685c@vtiger.fosslabs.com>
References: <076.2f691fd08704f9500476c37cc5e5685c@vtiger.fosslabs.com>
Message-ID: <085.1f3359b110701a63b97b6960b1b62eb5@vtiger.fosslabs.com>

#1173: unable to veiw pdf
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  Richie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by anonymous):

  * owner:  jerrydgeorge => Richie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1173>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 01:18:23 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 08:18:23 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23440=3A_?=
 =?utf-8?q?not_able_to_delete_the_contact_image_from_contacts?=
In-Reply-To: <076.995242b6a5aeaa903d7e9a4ad6a99c1c@vtiger.fosslabs.com>
References: <076.995242b6a5aeaa903d7e9a4ad6a99c1c@vtiger.fosslabs.com>
Message-ID: <085.47f1aa71b92dd7b18aca9549b4959ff9@vtiger.fosslabs.com>

#440: not able to delete the contact image from contacts
------------------------+---------------------------------------------------
  Reporter:  don        |       Owner:  Richie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by anonymous):

  * owner:  jerrydgeorge => Richie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/440>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 01:41:20 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 08:41:20 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7332 -
	/vtigercrm/trunk/Smarty/templates/SetMenu.tpl
Message-ID: <20060621084120.CF76983F25B@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 02:41:16 2006
New Revision: 7332

Log:
Setting menu file updated - ahmed

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

Modified: vtigercrm/trunk/Smarty/templates/SetMenu.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/SetMenu.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/SetMenu.tpl Wed Jun 21 02:41:16 2006
@@ -7,34 +7,130 @@
 		<!--Left Side Navigation Table-->
 		<table border=0 cellspacing=0 cellpadding=0 width=100%>
 				<tr><td class="settingsTabHeader" nowrap>{$MOD.LBL_USER_MANAGEMENT}</td></tr>
-				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_USERS}</td></tr>
-				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=listroles&parenttab=Settings">{$MOD.LBL_ROLES}</a></td></tr>
-				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=ListProfiles&parenttab=Settings">{$MOD.LBL_PROFILES}</a></td></tr>
+				{if $smarty.request.action eq 'index' ||  $smarty.request.action eq 'DetailView' || $smarty.request.action eq 'EditView' }
+					<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_USERS}</td></tr>
+				{else}
+					<tr><td class="settingsTabList" nowrap><a href="index.php?module=Administration&action=index&parenttab=Settings">{$MOD.LBL_USERS}</a></td></tr>
+				{/if}
+
+				{if $smarty.request.action eq 'listroles' ||  $smarty.request.action eq 'RoleDetailView' ||  $smarty.request.action eq 'saverole' ||  $smarty.request.action eq 'createrole'} 		
+					<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_ROLES}</td></tr>
+				{else}	
+					<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=listroles&parenttab=Settings">{$MOD.LBL_ROLES}</a></td></tr>
+				{/if}
+
+				{if $smarty.request.action eq 'ListProfiles' || $smarty.request.action eq 'profilePrivileges' ||  $smarty.request.action eq 'CreateProfile' ||  $smarty.request.action eq 'SaveProfile' || $smarty.request.action eq 'UpdateProfileChanges' }
+					<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_PROFILES}</td></tr>
+				{else}
+					<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=ListProfiles&parenttab=Settings">{$MOD.LBL_PROFILES}</a></td></tr>
+				{/if}
+
+				{if $smarty.request.action eq 'listgroups' || $smarty.request.action eq 'GroupDetailView' || $smarty.request.action eq 'createnewgroup' || $smarty.request.action eq 'SaveGroup'}
+				<tr><td class="settingsTabSelected" nowrap>{$MOD.USERGROUPLIST}</td></tr>   	
+				{else}
 				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=listgroups&parenttab=Settings">{$MOD.USERGROUPLIST}</a></td></tr>
+				{/if}
+
+				{if  $smarty.request.action eq 'OrgSharingEditView' || $smarty.request.action eq 'OrgSharingDetailView' || $smarty.request.action eq 'SaveOrgSharing'}
+				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_SHARING_ACCESS}</td></tr>  	
+				{else}
 				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=OrgSharingDetailView&parenttab=Settings">{$MOD.LBL_SHARING_ACCESS}</a></td></tr>
+				{/if}
+
+				{if $smarty.request.action eq 'DefaultFieldPermissions' || $smarty.request.action eq 'UpdateDefaultFieldLevelAccess' || $smarty.request.action eq 'EditDefOrgFieldLevelAccess' }
+				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_FIELDS_ACCESS}</td></tr>
+				{else}
 				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=DefaultFieldPermissions&parenttab=Settings">{$MOD.LBL_FIELDS_ACCESS}</a></td></tr>
+				{/if}
+
+				{if $smarty.request.action eq 'ListModuleOwners' || $smarty.request.action eq 'SettingsAjax'}
+				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_MODULE_OWNERS}</td></tr>
+				{else}
 				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=ListModuleOwners&parenttab=Settings">{$MOD.LBL_MODULE_OWNERS}</a></td></tr>
+				{/if}
+
+				{if  $smarty.request.action eq 'Announcements' ||  $smarty.request.action eq 'UsersAjax' }
+				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_ANNOUNCEMENT}</td></tr>		
+				{else}
 				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=Announcements&parenttab=Settings">{$MOD.LBL_ANNOUNCEMENT}</a></td></tr>
+				{/if}
 	
 				<tr><td class="settingsTabHeader" nowrap>{$MOD.LBL_STUDIO}</td></tr>
 				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=SettingsSubMenu&type=CustomField&parenttab=Settings">{$MOD.LBL_CUSTOM_FIELDS}</a></td></tr>
+				
+				{if  $smarty.request.action eq 'PickList' ||  $smarty.request.action eq 'SettingsAjax'}
+				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_PICKLIST_EDITOR}</td></tr>						     {else}
 				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=PickList&parenttab=Settings">{$MOD.LBL_PICKLIST_EDITOR}</a></td></tr>
+				{/if}
 	
 				<tr><td class="settingsTabHeader" nowrap>{$MOD.LBL_COMMUNICATION_TEMPLATES}</td></tr>
+
+				{if $smarty.request.action eq 'listemailtemplates' || $smarty.request.action eq 'detailviewemailtemplate' || $smarty.request.action eq 'editemailtemplate' || $smarty.request.action eq 'saveemailtemplate' || $smarty.request.action eq 'deleteemailtemplate'}
+				<tr><td class="settingsTabSelected" nowrap>{$MOD.EMAILTEMPLATES}</td></tr>
+				{else}
 				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=listemailtemplates&parenttab=Settings">{$MOD.EMAILTEMPLATES}</a></td></tr>
+				{/if}
+
+				{if $smarty.request.action eq 'listwordtemplates' || $smarty.request.action eq 'add2db' || $smarty.request.action eq 'deletewordtemplate'}
+				<tr><td class="settingsTabSelected" nowrap>{$MOD.EMAILTEMPLATES}</td></tr>
+				
+				{else}	
 				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=listwordtemplates&parenttab=Settings">{$MOD.WORDINTEGRATION}</a></td></tr>
+				{/if}
+
+				{if $smarty.request.action eq 'listnotificationschedulers' || $smarty.request.action eq 'UsersAjax'}
+				<tr><td class="settingsTabSelected" nowrap>{$MOD.NOTIFICATIONSCHEDULERS}</td></tr>
+				{else}
 				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=listnotificationschedulers&parenttab=Settings">{$MOD.NOTIFICATIONSCHEDULERS}</a></td></tr>
+				{/if}
+				
+				{if $smarty.request.action eq 'listinventorynotifications' || $smarty.request.action eq 'UsersAjax'}
+				<tr><td class="settingsTabSelected" nowrap>{$MOD.INVENTORYNOTIFICATION}</td></tr>
+				{else}	
 				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=listinventorynotifications&parenttab=Settings">{$MOD.INVENTORYNOTIFICATION}</a></td></tr>
+				{/if} 	
+
+				{if $smarty.request.action eq 'OrganizationTermsandConditions' || $smarty.request.action eq 'savetermsandconditions'}
+				<tr><td class="settingsTabSelected" nowrap>{$MOD.INVENTORYNOTIFICATION}</td></tr>
+				{else}
 				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=OrganizationTermsandConditions&parenttab=Settings">{$MOD.INVENTORYTERMSANDCONDITIONS}</a></td></tr>
+				{/if}
+
 	
 				<tr><td class="settingsTabHeader" nowrap>{$MOD.LBL_OTHER_SETTINGS}</td></tr>
+				{if $smarty.request.action eq 'OrganizationConfig' || $smarty.request.action eq 'EditCompanyDetails' || $smarty.request.action eq 'add2db'}
+				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_COMPANY_DETAILS}</td></tr>
+				{else}	
 				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=OrganizationConfig&parenttab=Settings">{$MOD.LBL_COMPANY_DETAILS}</a></td></tr>
+				{/if}
+				
+				{if  $smarty.request.action eq 'EmailConfig' ||  $smarty.request.action eq 'Save' }
+				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_MAIL_SERVER_SETTINGS}</td></tr>
+				{else}
 				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=EmailConfig&parenttab=Settings">{$MOD.LBL_MAIL_SERVER_SETTINGS}</a></td></tr>
+				{/if}
+				
+				{if $smarty.request.action eq 'BackupServerConfig' || $smarty.request.action eq 'index' || $smarty.request.action eq 'Save'}
+				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_BACKUP_SERVER_SETTINGS}</td></tr>
+				{else}
 				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=BackupServerConfig&parenttab=Settings">{$MOD.LBL_BACKUP_SERVER_SETTINGS}</a></td></tr>
+				{/if}
+				
+				{if $smarty.request.action eq 'CurrencyListView' ||  $smarty.request.action eq 'CurrencyEditView' ||  $smarty.request.action eq 'index' ||  $smarty.request.action eq 'SaveCurrencyInfo'}
+				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_CURRENCY_SETTINGS}</td></tr>
+				{else}
 				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=CurrencyListView&parenttab=Settings">{$MOD.LBL_CURRENCY_SETTINGS}</a></td></tr>
+				{/if}
+				
+				{if $smarty.request.action eq 'TaxConfig'}
+				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_TAX_SETTINGS}</td></tr>
+				{else}
 				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=TaxConfig&parenttab=Settings">{$MOD.LBL_TAX_SETTINGS}</a></td></tr>
+				{/if}
 				</table>
 			</td>
 			<td width=90% class="small settingsSelectedUI" valign=top >
 
 
+
+



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 01:43:09 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 08:43:09 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7333 - in
 /vtigercrm/trunk/Smarty/templates: RoleDetailView.tpl RoleEditView.tpl
Message-ID: <20060621084309.0689983F261@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 02:43:05 2006
New Revision: 7333

Log:
Update role tpl file

Modified:
    vtigercrm/trunk/Smarty/templates/RoleDetailView.tpl
    vtigercrm/trunk/Smarty/templates/RoleEditView.tpl

Modified: vtigercrm/trunk/Smarty/templates/RoleDetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/RoleDetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/RoleDetailView.tpl Wed Jun 21 02:43:05 2006
@@ -9,117 +9,117 @@
   *
  ********************************************************************************/
 -->*}
-<script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
-<style type="text/css">@import url(themes/blue/style.css);</style>
+<script language="JAVASCRIPT" type="text/javascript" src="include/js/smoothscroll.js"></script>
 
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-<tr>
-	{include file='SettingsMenu.tpl'}
-<td width="75%" valign="top">
+<br>
+<table align="center" border="0" cellpadding="0" cellspacing="0" width="98%">
+<tbody><tr>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
+        <td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
+        <br>
 
-<form id="form" name="roleView" action="index.php" method="post">
-<input type="hidden" name="module" value="Users">
-<input type="hidden" name="action" value="createrole">
-<input type="hidden" name="parenttab" value="Settings">
-<input type="hidden" name="returnaction" value="RoleDetailView">
-<input type="hidden" name="roleid" value="{$ROLEID}">
-<input type="hidden" name="mode" value="edit">
+	<div align=center>
+			{include file='SetMenu.tpl'}
+				<!-- DISPLAY -->
+				<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
+				<form id="form" name="roleView" action="index.php" method="post">
+				<input type="hidden" name="module" value="Users">
+				<input type="hidden" name="action" value="createrole">
+				<input type="hidden" name="parenttab" value="Settings">
+				<input type="hidden" name="returnaction" value="RoleDetailView">
+				<input type="hidden" name="roleid" value="{$ROLEID}">
+				<input type="hidden" name="mode" value="edit">
+				<tr>
+					<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}ico-roles.gif" width="48" height="48" border=0 ></td>
+					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Users&action=listroles&parenttab=Settings">{$CMOD.LBL_ROLES}</a> &gt; {$CMOD.LBL_VIEWING} &quot;{$ROLE_NAME}&quot; </b></td>
+				</tr>
+				<tr>
+					<td valign=top class="small">{$CMOD.LBL_VIEWING} {$CMOD.LBL_PROPERTIES} &quot;{$ROLE_NAME}&quot; {$MOD.LBL_LIST_CONTACT_ROLE} </td>
+				</tr>
+				</table>
+				
+				<br>
+				<table border=0 cellspacing=0 cellpadding=10 width=100% >
+				<tr>
+				<td valign=top>
+					
+					<table border=0 cellspacing=0 cellpadding=5 width=100% class="tableHeading">
+					<tr>
+						<td class="big"><strong>{$CMOD.LBL_PROPERTIES} &quot;{$ROLE_NAME}&quot; </strong></td>
+						<td><div align="right">
+					 	    <input value="   {$APP.LBL_EDIT_BUTTON_LABEL}   " title="{$APP.LBL_EDIT_BUTTON_TITLE}" accessKey="{$APP.LBL_EDIT_BUTTON_KEY}" class="crmButton small edit" type="submit" name="Edit" >
+						</div></td>
+					  </tr>
+					</table>
+					<table width="100%"  border="0" cellspacing="0" cellpadding="5">
+                      <tr class="small">
+                        <td width="15%" class="small cellLabel"><strong>{$CMOD.LBL_ROLE_NAME}</strong></td>
+                        <td width="85%" class="cellText" >{$ROLE_NAME}</td>
+                      </tr>
+                      <tr class="small">
+                        <td class="small cellLabel"><strong>{$CMOD.LBL_REPORTS_TO}</strong></td>
+                        <td class="cellText">{$PARENTNAME}</td>
+                      </tr>
+                      <tr class="small">
+                        <td valign=top class="cellLabel"><strong>{$CMOD.LBL_MEMBER}</strong></td>
+                        <td class="cellText">
+						<table width="70%"  border="0" cellspacing="0" cellpadding="5">
+                          <tr class="small">
+                            		<td colspan="2" class="cellBottomDotLine">
+						<div align="left"><strong>{$CMOD.LBL_ASSOCIATED_PROFILES}</strong></div>
+					</td>
+                            </tr>
+			{foreach item=elements from=$ROLEINFO.profileinfo}
+                          <tr class="small">
 
-<table width="100%" border="0" cellpadding="0" cellspacing="0" height="100%">
-	<tr>
-		 <td class="showPanelBg" valign="top" width="95%"  style="padding-left:20px; "><br />
-        	        <span class="lvtHeaderText"><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS} </a> > {$MOD.LBL_USER_MANAGEMENT} > {$CMOD.LBL_USER_ROLE} of {$ROLE_NAME} </b></span>
-            	    <hr noshade="noshade" size="1" />
+                            <td width="16"><div align="center"></div></td>
+                            <td>
+										<a href="index.php?module=Users&action=profilePrivileges&parenttab=Settings&profileid={$elements.0}&mode=view">{$elements.1}</a><br>
+			    </td>  	 
+                          </tr>
+			{/foreach}
+   <tr class="small">
+                            		<td colspan="2" class="cellBottomDotLine">
+						<div align="left"><strong>{$CMOD.LBL_ASSOCIATED_USERS}</strong></div>
+					</td>
+                            </tr>
+				{if $ROLEINFO.userinfo.0 neq ''}
+			{foreach item=elements from=$ROLEINFO.userinfo}
+                          <tr class="small">
+
+                            <td width="16"><div align="center"></div></td>
+                            <td>
+				<a href="index.php?module=Users&action=DetailView&parenttab=Settings&record={$elements.0}">{$elements.1}</a><br>
+			    </td>  	 
+                          </tr>
+			{/foreach}	
+			{/if}
+                        </table></td>
+                      </tr>
+                    </table>
+					<br>
+					<table border=0 cellspacing=0 cellpadding=5 width=100% >
+					<tr><td class="small" nowrap align=right><a href="#top">{$MOD.LBL_SCROLL}</a></td></tr>
+					</table>
+					
+					
+				</td>
+				</tr>
+				</table>
+			
+			
+			
+			</td>
+			</tr>
+			</table>
 		</td>
 	</tr>
-	<tr><td>&nbsp;</td></tr>
-	<tr>
-		<td width="95%" style="padding-left:20px;" valign="top">	  <table width="95%" cellpadding="5" cellspacing="0" class="leadTable" align="center">
-          <tr>
-            <td style="padding:5px;border-bottom:2px dotted #CCCCCC;" width="5%" ><img src="{$IMAGE_PATH}roles.gif" align="absmiddle" /> </td>
-            <td style="padding:5px;border-bottom:2px dotted #AAAAAA;"><span class="genHeaderGrayBig">{$ROLE_NAME} {$CMOD.LBL_USER_ROLE}</span><br />
-                <span class="big">{$CMOD.LBL_DETAIL_VIEW} {$ROLE_NAME} {$CMOD.LBL_USER_ROLE}</span> </td>
-          </tr>
-          <tr><td colspan="2">&nbsp;</td></tr>
-           <tr>
-            <td colspan="2" >
-					<table width="100%" cellpadding="5" cellspacing="0" border="0" >
-							<tr>
-									<td colspan="4" class="detailedViewHeader"><b>{$CMOD.LBL_ROLE_DETAILS}</b></td>
-							</tr>
-							<tr>
-							  <td class="dvtCellLabel" width="5%">&nbsp;</td>
-							  <td class="dvtCellLabel" align="right" width="25%"><b>{$CMOD.LBL_ROLE_NAME} :</b></td>
-							  <td class="dvtCellInfo" align="left" width="25%">{$ROLE_NAME}</td>
-							  <td class="dvtCellInfo" width="45%">&nbsp;</td>
-					  </tr>
-					  <tr><td colspan="4"  class="dvtCellInfo">&nbsp;</td></tr>
-					   <tr>
-                  <td colspan="4"  class="detailedViewHeader"><b>{$CMOD.LBL_MEMBER_LIST}</b></td>
-                </tr>
-               
-				<tr>
-						<td class="dvtCellLabel" align="left"><img src="{$IMAGE_PATH}profile_icon.gif" align="top"></td>
-						<td class="dvtCellLabel" align="right" valign="top"><b>{$CMOD.LBL_ASSOCIATED_PROFILES}</b></td>
-						<td colspan="2" align="left" class="dvtCellInfo">
-								{foreach item=elements from=$ROLEINFO.profileinfo}
-										<a href="index.php?module=Users&action=profilePrivileges&parenttab=Settings&profileid={$elements.0}&mode=view">{$elements.1}</a><br>
-								{/foreach}	
-						</td>
-				</tr>
-				{if $ROLEINFO.userinfo.0 neq ''}
-				 <tr>
-						<td class="dvtCellLabel" align="left"><img src="{$IMAGE_PATH}user_icon.gif" align="top"></td>
-						<td class="dvtCellLabel" align="right" valign="top"><b>{$CMOD.LBL_ASSOCIATED_USERS}</b></td>
-						<td colspan="2" align="left" class="dvtCellInfo">
-								{foreach item=elements from=$ROLEINFO.userinfo}
-										<a href="index.php?module=Users&action=DetailView&parenttab=Settings&record={$elements.0}">{$elements.1}</a><br>
-								{/foreach}	
-						</td>
-				</tr>
-				{/if}
-				 <tr><td colspan="4"  class="dvtCellInfo">&nbsp;</td></tr>
-                 <tr>
-                  <td colspan="4"  class="dvtCellInfo" align="center">
-				  	<!-- <input title="Back" accessKey="C" class="classBtn" onclick="window.history.back();" type="button" name="New" value=" <  Back " > &nbsp; -->
-					 <input value="  {$APP.LBL_EDIT_BUTTON_LABEL}  " title="{$APP.LBL_EDIT_BUTTON_TITLE}" accessKey="{$APP.LBL_EDIT_BUTTON_KEY}" class="classBtn" type="submit" name="Edit" >
-                    &nbsp;
-					<input title="{$APP.LBL_DELETE_BUTTON_TITLE}" accessKey="{$APP.LBL_DELETE_BUTTON_KEY}" class="classBtn" onclick="DeleteRole()" type="button" name="Delete" value="{$APP.LBL_DELETE_BUTTON_LABEL}">
-				</td>
-                </tr>
-          <tr><td colspan="2">&nbsp;</td></tr>
-        </table></td>
+	</form>
+	</table>
 		
-	</tr>
+	</div>
+</td>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
+   </tr>
+</tbody>
 </table>
-</form>
-</td>
-
-</tr>
-</table>
-</td>
-<td width="1%" style="border-right:1px dotted #CCCCCC;">&nbsp;</td>
-</tr>
-</table>
-</td>
-</tr>
-</table>
-</td>
-</tr>
-</table>
-	
-	{include file='SettingsSubMenu.tpl'}
-<div id="tempdiv" style="display:block;position:absolute;left:350px;top:200px;"></div>
-<script>
-	function DeleteRole()
-	{ldelim}
-			document.roleView.action.value='RoleDeleteStep1';
-			document.roleView.submit();	
-	{rdelim}
-	
-	function ajaxSaveResponse(response)
-	{ldelim}
-   		document.getElementById("tempdiv").innerHTML=response.responseText;
-	{rdelim}
-</script>
-

Modified: vtigercrm/trunk/Smarty/templates/RoleEditView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/RoleEditView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/RoleEditView.tpl Wed Jun 21 02:43:05 2006
@@ -9,7 +9,7 @@
   *
  ********************************************************************************/
 -->*}
-<script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
+<script language="JAVASCRIPT" type="text/javascript" src="include/js/smoothscroll.js"></script>
 <script language="javascript">
 function dup_validation()
 {ldelim}
@@ -50,117 +50,148 @@
 	dup_validation();
 {rdelim}
 </script>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-		<tr>
-				{include file='SettingsMenu.tpl'}
-				<td width="75%" valign="top">
-						<form name="newRoleForm" action="index.php" method="post">
-						<input type="hidden" name="module" value="Users">
-						<input type="hidden" name="action" value="SaveRole">
-						<input type="hidden" name="parenttab" value="Settings">
-						<input type="hidden" name="returnaction" value="{$RETURN_ACTION}">
-						<input type="hidden" name="roleid" value="{$ROLEID}">
-						<input type="hidden" name="mode" value="{$MODE}">
-						<input type="hidden" name="parent" value="{$PARENT}">
-								<table width="100%" border="0" cellpadding="0" cellspacing="0" height="100%">
-										<tr>
-												<td class="showPanelBg" valign="top" width="100%" style="padding-left:20px; "><br />
-															<span class="lvtHeaderText"><b>
-															<a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS} </a>
-															 > {$MOD.LBL_USER_MANAGEMENT} > {$CMOD.LBL_CREATE_NEW_ROLE}</b></span>
-															<hr noshade="noshade" size="1"/>
-												</td>
-										</tr>
-																
-										<tr>
-												<td  valign="top" class="leadTable">
-														<table width="100%" cellpadding="0" cellspacing="0">
-																<tr>
-																		<td align="left" style="padding:10px;border-bottom:1px dashed #CCCCCC;">
-																				<img src="{$IMAGE_PATH}roles.gif" align="absmiddle">
-																				<span class="genHeaderGray">{$CMOD.LBL_CREATE_NEW_ROLE}</span>
-																		</td>
-																</tr>
-														</table>
-														<table align="center" border="0" cellpadding="5" cellspacing="0" width="95%">
-															<tbody>
-																<tr><td colspan="2">&nbsp;</td></tr>
-																<tr>
-																		<td class="genHeaderSmall" style="padding-right: 10px;" align="right" nowrap valign="top" width="15%">
-																				<img src="{$IMAGE_PATH}one.gif" align="absmiddle">
-																		 </td>
-																		<td align="left" nowrap="nowrap" width="85%"><b>{$CMOD.LBL_ROLE_NAME}</b><br>
-																					{$CMOD.LBL_SPECIFY_ROLE_NAME}&nbsp;
-																					<input type="text" id="rolename" name="roleName" class="importBox"  value="{$ROLENAME}">
-																		</td>
-																</tr>
-																<tr><td colspan="2">&nbsp;</td></tr>
-																<tr>
-																		<td class="genHeaderSmall" style="padding-right: 10px;" align="right" nowrap valign="top">
-																				<img src="{$IMAGE_PATH}two.gif" align="absmiddle">
-																		 </td>
-																		<td><b>{$CMOD.LBL_ASSIGN_PROFILE}</b><br>{$CMOD.LBL_PROFILE_SELECT_TEXT}</td>
-																</tr>
-																<tr>
-																		<td class="genHeaderSmall" style="padding-right: 10px;" align="right" valign="top">&nbsp;</td>
-																		<td>&nbsp;</td>
-																</tr>
-																<tr>
-																		<td class="genHeaderSmall" style="padding-right: 10px;" align="right" valign="top">&nbsp;</td>
-																		<td>
-																				<table align="center" border="0" cellpadding="0" cellspacing="0" width="75%">
-																					<tbody>
-																							<tr>
-																									<td align="center"><b>{$CMOD.LBL_PROFILES_AVLBL}</b><br>
-																												<select id="availList" name="availList" size="10" multiple style="width: 150px;">
-																												{foreach item=element from=$PROFILELISTS}
-																														<option value="{$element.0}">{$element.1}</option>
-																												{/foreach}
-																												</select>
-																									</td>
-																									<td align="center">
-																												<input type="hidden" name="selectedColumnsString"/>
-																												<input name="Button" value="&nbsp;&rsaquo;&rsaquo;&nbsp;" type="button" class="classBtn" onClick="addColumn()">
-																												<br><br>
-																												<input type="button" name="Button1" value="&nbsp;&lsaquo;&lsaquo;&nbsp;" class="classBtn" onClick="delColumn()">
-																									</td>
-																									<td align="center"><b>{$CMOD.LBL_ASSIGN_PROFILES}</b><br>
-																												<select id="selectedColumns" name="selectedColumns" multiple size="10" style="width: 150px;">
-																												{foreach item=element from=$SELPROFILELISTS}
-																													<option value="{$element.0}">{$element.1}</option>
-																												{/foreach}
-																												</select>
-																									</td>
-																							</tr>
-																					</tbody>
-																				</table>
-																			</td>
-																	</tr>
-																	<tr>
-																		<td class="genHeaderSmall" style="padding-right: 10px;" align="right" valign="top">&nbsp;</td>
-																		<td>&nbsp;</td>
-																</tr>
-																	<tr>
-																			<td align="right" nowrap><img src="{$IMAGE_PATH}three.gif" align="absmiddle"></td>
-																			<td><b>{$CMOD.LBL_REPORTS_TO_ROLE}</b><br>{$PARENTNAME}</td>
-																	</tr>
-																	<tr><td colspan="2" style="border-bottom: 1px dashed rgb(204, 204, 204);">&nbsp;</td></tr>
-																	<tr>
-																			<td colspan="2" align="center"> &nbsp;&nbsp;
-																						<input value=" {$APP.LBL_SAVE_BUTTON_LABEL} " name="Next" type="button" class="classBtn" onClick="return validate()" >&nbsp;&nbsp;
-																						<input value=" {$APP.LBL_CANCEL_BUTTON_LABEL} " name="Cancel" type="button" class="classBtn" onClick="window.history.back()">
-																			</td>
-																	</tr>
-																	
-																</tbody>
-															</table>
-														</td>
-												</tr>
-										</table>
-										</form>
-								</td>
-						</tr>
+<br>
+<table align="center" border="0" cellpadding="0" cellspacing="0" width="98%">
+<tbody><tr>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
+        <td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
+        <br>
+
+	<div align=center>
+			{include file='SetMenu.tpl'}
+				<!-- DISPLAY -->
+				<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
+				<form name="newRoleForm" action="index.php" method="post">
+				<input type="hidden" name="module" value="Users">
+				<input type="hidden" name="action" value="SaveRole">
+				<input type="hidden" name="parenttab" value="Settings">
+				<input type="hidden" name="returnaction" value="{$RETURN_ACTION}">
+				<input type="hidden" name="roleid" value="{$ROLEID}">
+				<input type="hidden" name="mode" value="{$MODE}">
+				<input type="hidden" name="parent" value="{$PARENT}">
+				<tr>
+					<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}ico-groups.gif" alt="Groups" width="48" height="48" border=0 title="Roles"></td>
+					{if $MODE eq 'edit'}
+					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Users&action=listroles&parenttab=Settings">{$CMOD.LBL_ROLES}</a> &gt; {$MOD.LBL_EDIT} &quot;{$ROLENAME}&quot; </b></td>
+					{else}	
+					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Users&action=listroles&parenttab=Settings">{$CMOD.LBL_ROLES}</a> &gt; {$CMOD.LBL_CREATE_NEW_ROLE}</b></td>
+					{/if}
+				</tr>
+				<tr>
+					{if $MODE eq 'edit'}
+					<td valign=top class="small">{$MOD.LBL_EDIT} {$CMOD.LBL_PROPERTIES} &quot;{$ROLENAME}&quot; {$MOD.LBL_LIST_CONTACT_ROLE}</td>
+					{else}
+					<td valign=top class="small">{$CMOD.LBL_NEW_ROLE}</td>
+					{/if}
+				</tr>
+				</table>
+				
+				<br>
+				<table border=0 cellspacing=0 cellpadding=10 width=100% >
+				<tr>
+				<td valign=top>
+					
+					<table border=0 cellspacing=0 cellpadding=5 width=100% class="tableHeading">
+					<tr>
+						{if $MODE eq 'edit'}
+						<td class="big"><strong>{$CMOD.LBL_PROPERTIES} &quot;{$ROLENAME}&quot; </strong></td>
+						{else}
+						<td class="big"><strong>{$CMOD.LBL_NEW_ROLE}</strong></td>
+						{/if}
+						<td><div align="right">
+							<input type="button" class="crmButton small save" name="add" value="  {$APP.LBL_SAVE_BUTTON_LABEL}  " onClick="return validate()">
+						
+						<input type="button" class="crmButton cancel small" name="cancel" value="{$APP.LBL_CANCEL_BUTTON_LABEL}" onClick="window.history.back()">
+						</div></td>
+					  </tr>
+					</table>
+					<table width="100%"  border="0" cellspacing="0" cellpadding="5">
+                      <tr class="small">
+                        <td width="15%" class="small cellLabel"><font color="red">*</font><strong>{$CMOD.LBL_ROLE_NAME}</strong></td>
+                        <td width="85%" class="cellText" ><input id="rolename" name="roleName" type="text" value="{$ROLENAME}" class="detailedViewTextBox"></td>
+                      </tr>
+                      <tr class="small">
+                        <td class="small cellLabel"><strong>{$CMOD.LBL_REPORTS_TO}</strong></td>
+                        <td class="cellText">{$PARENTNAME}</td>
+                      </tr>
+                      <tr class="small">
+                        <td colspan="2" valign=top class="cellLabel"><strong>{$CMOD.LBL_PROFILE_M}</strong>						</td>
+                      </tr>
+                      <tr class="small">
+                        <td colspan="2" valign=top class="cellText"> 
+						<br>
+						<table width="95%"  border="0" align="center" cellpadding="5" cellspacing="0">
+                          <tr>
+                            <td width="40%" valign=top class="cellBottomDotLinePlain small"><strong>{$CMOD.LBL_PROFILES_AVLBL}</strong></td>
+                            <td width="10%">&nbsp;</td>
+                            <td width="40%" class="cellBottomDotLinePlain small"><strong>{$CMOD.LBL_ASSIGN_PROFILES}</strong></td>
+                          </tr>
+
+			<tr class=small>
+	 	               <td valign=top>{$CMOD.LBL_PROFILES_M} {$CMOD.LBL_MEMBER} <br>
+				<select multiple id="availList" name="availList" class="small crmFormList" size=10 >
+																				{foreach item=element from=$PROFILELISTS}
+																					<option value="{$element.0}">{$element.1}</option>
+																				{/foreach}
+				</select>
+				</td>
+                        	<td width="50"><div align="center">
+																				<input type="hidden" name="selectedColumnsString"/>
+																					<input name="Button" value="&nbsp;&rsaquo;&rsaquo;&nbsp;" type="button" class="crmButton small" style="width:100%" onClick="addColumn()">
+                                  <br>
+                                  <br>
+																					<input type="button" name="Button1" value="&nbsp;&lsaquo;&lsaquo;&nbsp;" class="crmButton small" onClick="delColumn()" style="width:100%">
+				  <br>
+				  <br>
+                            	</div></td>
+                            <td class="small" style="background-color:#ddFFdd" valign=top>{$CMOD.LBL_MEMBER} of &quot;{$ROLENAME}&quot; <br>
+                             <select multiple id="selectedColumns" name="selectedColumns" class="small crmFormList" size=10 >
+																			{foreach item=element from=$SELPROFILELISTS}
+																				<option value="{$element.0}">{$element.1}</option>
+																			{/foreach}
+                	    </select></td>
+                       </tr>
+						  
+                        </table>
+						
+						</td>
+                      </tr>
+                        	 
+                        </table>
+						
+						</td>
+                      </tr>
+                    </table>
+					<br>
+					<table border=0 cellspacing=0 cellpadding=5 width=100% >
+					<tr><td class="small" nowrap align=right><a href="#top">{$MOD.LBL_SCROLL}</a></td></tr>
+					</table>
+					
+					
+				</td>
+				</tr>
+				<tr>
+				  <td valign=top>&nbsp;</td>
+				  </tr>
+				</table>
+			
+			
+			
+			</td>
+			</tr>
 			</table>
+		</td>
+	</tr>
+	</form>
+	</table>
+		
+	</div>
+
+</td>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
+   </tr>
+</tbody>
+</table>
 	
 <script language="JavaScript" type="text/JavaScript">    
         var moveupLinkObj,moveupDisabledObj,movedownLinkObj,movedownDisabledObj;
@@ -231,15 +262,3 @@
         {rdelim}
 	setObjects();			
 </script>	
-	
-</td>
-<td width="1%" style="border-right:1px dotted #CCCCCC;">&nbsp;</td>
-</tr>
-</table>
-</td>
-</tr>
-</table>
-</td>
-</tr>
-</table>
-	{include file='SettingsSubMenu.tpl'}



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 01:43:46 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 08:43:46 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7334 -
	/vtigercrm/trunk/Smarty/templates/ListRoles.tpl
Message-ID: <20060621084346.B13D983F261@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 02:43:42 2006
New Revision: 7334

Log:
Updated list roles file

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

Modified: vtigercrm/trunk/Smarty/templates/ListRoles.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ListRoles.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ListRoles.tpl Wed Jun 21 02:43:42 2006
@@ -9,6 +9,8 @@
   *
  ********************************************************************************/
 -->*}
+
+<script language="JAVASCRIPT" type="text/javascript" src="include/js/smoothscroll.js"></script>
 <style type="text/css">
 a.x {ldelim}
 		color:black;
@@ -82,57 +84,86 @@
 	{rdelim}
 
 </script>
-<table width="100%" border="0" cellpadding="0" cellspacing="0" onMouseMove="displayCoords(event)">
-		<tr>
-				{include file='SettingsMenu.tpl'}
-				<td width="75%" valign="top">
-					<table width="100%" border="0" cellpadding="0" cellspacing="0" height="100%">
-							<tr>
-									<td class="showPanelBg" valign="top" width="100%" style="padding-left:20px; "><br />
-															<span class="lvtHeaderText"><b>
-															<a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS} </a>
-															 > {$MOD.LBL_USER_MANAGEMENT} > {$CMOD.LBL_CREATE_NEW_ROLE}</b></span>
-															<hr noshade="noshade" size="1"/>
-									  </td>
-							 </tr>
-							 <tr>
-									<td  valign="top" class="leadTable">
-										<table width="100%" cellpadding="0" cellspacing="0">
-											 <tr>
-													<td align="left" style="padding:10px;border-bottom:1px dashed #CCCCCC;">
-																				<img src="{$IMAGE_PATH}roles.gif" align="absmiddle">
-																				<span class="genHeaderGray">Role List View</span>
-																		</td>
-																</tr>
-														</table>
-		<div id='RoleTreeFull'>
-			{include file='RoleTree.tpl'}
-		</div>
-
-		{*
-														<table width="100%" border="0" cellspacing="0" cellpadding="0" class="small">
-													   <tr>
-														    <td style="padding:10px;" valign="top">{$ROLETREE}</td>
-													  </tr>
-													</table> *}
-											  </td>
-											</tr>
-										</table>
-								</td>
-						</tr>
-		</table>
-	</td>
-<td width="1%" style="border-right:1px dotted #CCCCCC;">&nbsp;</td>
-</tr>
-</table>
+
+<br>
+<table align="center" border="0" cellpadding="0" cellspacing="0" width="98%">
+<tbody><tr>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
+        <td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
+	<div align=center>
+<br>
+	
+				{include file="SetMenu.tpl"}
+				<!-- DISPLAY -->
+				<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
+				<tr>
+					<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}ico-roles.gif" alt="Roles" width="48" height="48" border=0 title="Roles"></td>
+					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > {$MOD.LBL_ROLES}</b></td>
+				</tr>
+				<tr>
+					<td valign=top class="small">{$MOD.LBL_ROLE_DESCRIPTION}</td>
+				</tr>
+				</table>
+				
+				<br>
+				<table border=0 cellspacing=0 cellpadding=10 width=100% >
+				<tr>
+				<td>
+				
+					<table border=0 cellspacing=0 cellpadding=5 width=100% class="tableHeading">
+					<tr>
+						<td class="big"><strong>Roles & Hierarchy Tree</strong></td>
+						<td class="small" align=right>Total : 7 Roles </td>
+					</tr>
+					</table>
+
+					<div id='RoleTreeFull'>
+                			        {include file='RoleTree.tpl'}
+		                	</div>
+
+{*					<table border=0 cellspacing=0 cellpadding=20 width=100% >
+					<tr>
+						<td>
+							<!-- Home node -->
+							<table cellspacing=0 cellpadding=0 class="treeTable1"><tr><td><img src="images/treeHome.gif"></td><td class="small">&nbsp;<strong>Organization</strong></td><tr></table>
+							<table cellspacing=0 cellpadding=0 class="treeTable1"><tr><td><img src="images/treeExSubNode.gif"><img src="images/treePaper.gif"></td><td class="small">Administrator</td><tr></table>
+							<table cellspacing=0 cellpadding=0 class="treeTable1"><tr><td><img src="images/treeExSubNode.gif"><img src="images/treePaper.gif"></td><td class="small">CEO</td><tr></table>
+							<table cellspacing=0 cellpadding=0 class="treeTable1"><tr><td><img src="images/treeNorthSouth.gif"><img src="images/treeExSubNode.gif"><img src="images/treePaper.gif"></td><td class="small">Manager - Sales</td><tr></table>
+							<table cellspacing=0 cellpadding=0 class="treeTable1"><tr><td><img src="images/treeNorthSouth.gif"><img src="images/treeNorthSouth.gif"><img src="images/treeSubNode.gif"><img src="images/treePaper.gif"></td><td class="small">Asst Manager - Sales</td><tr></table>
+							<table cellspacing=0 cellpadding=0 class="treeTable1"><tr><td><img src="images/treeNorthSouth.gif"><img src="images/treeExSubNode.gif"><img src="images/treePaper.gif"></td><td class="small">Manager - Products</td><tr></table>
+							<table cellspacing=0 cellpadding=0 class="treeTable1"><tr><td><img src="images/treeNorthSouth.gif"><img src="images/treeNorthSouth.gif"><img src="images/treeSubNode.gif"><img src="images/treePaper.gif"></td><td class="small">Asst Manager - Products</td><tr></table>
+							<table cellspacing=0 cellpadding=0 class="treeTable1"><tr><td><img src="images/treeNorthSouth.gif"><img src="images/treeSubNode.gif"><img src="images/treePaper.gif"></td><td class="small">Manager - Office</td><tr></table>
+							<table cellspacing=0 cellpadding=0 class="treeTable1"><tr><td><img src="images/treeNorthSouth.gif"><img src="images/treeGap.gif"><img src="images/treeSubNode.gif"><img src="images/treePaper.gif"></td><td class="small">Asst Manager - Office</td><tr></table>
+							<table cellspacing=0 cellpadding=0 class="treeTable1"><tr><td><img src="images/treeSubNode.gif"><img src="images/treePaper.gif"></td><td class="small">CFO</td><tr></table>
+						</td>
+					</tr>
+					</table> *}
+					
+					
+					
+					
+					<table border=0 cellspacing=0 cellpadding=5 width=100% >
+					<tr><td class="small" nowrap align=right><a href="#top">Scroll to Top</a></td></tr>
+					</table>
+				</td>
+				</tr>
+				</table>
+			
+			
+			
+			</td>
+			</tr>
+			</table>
+		</td>
+	</tr>
+	</table>
+		
+	</div>
+
 </td>
-</tr>
-</table>
-</td>
-</tr>
-</table>
-	{include file='SettingsSubMenu.tpl'}
-	
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
+   </tr>
+</tbody>
 	<div id="Drag_content">&nbsp;</div>
 
 <script language="javascript" type="text/javascript">



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 01:44:40 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 08:44:40 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7335 - in
 /vtigercrm/trunk/Smarty/templates/Settings: EditPickList.tpl PickList.tpl
 PickListContents.tpl
Message-ID: <20060621084440.42E9083F25B@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 02:44:35 2006
New Revision: 7335

Log:
Updated Pick lIst files

Modified:
    vtigercrm/trunk/Smarty/templates/Settings/EditPickList.tpl
    vtigercrm/trunk/Smarty/templates/Settings/PickList.tpl
    vtigercrm/trunk/Smarty/templates/Settings/PickListContents.tpl

Modified: vtigercrm/trunk/Smarty/templates/Settings/EditPickList.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Settings/EditPickList.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Settings/EditPickList.tpl Wed Jun 21 02:44:35 2006
@@ -33,8 +33,8 @@
 	<tr><td style="border-bottom: 1px dashed rgb(204, 204, 204);" colspan="2">&nbsp;</td></tr>
 	<tr>
 	<td colspan="2" align="center">
-	<input name="save" value=" &nbsp;Save&nbsp; " class="classBtn" onClick="SavePickList('{$FIELDNAME}','{$MODULE}');" type="button">
-	<input name="cancel" value=" &nbsp;Cancel&nbsp; " class="classBtn" onClick="hide('editdiv');" type="button">
+	<input name="save" value=" &nbsp;Save&nbsp; " class="crmButton small save" onClick="SavePickList('{$FIELDNAME}','{$MODULE}');" type="button">
+	<input name="cancel" value=" &nbsp;Cancel&nbsp; " class="crmButton small cancel" onClick="hide('editdiv');" type="button">
 	</td>
 	</tr>
 	<tr><td colspan="2" style="border-top: 1px dashed rgb(204, 204, 204);">&nbsp;</td></tr>

Modified: vtigercrm/trunk/Smarty/templates/Settings/PickList.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Settings/PickList.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Settings/PickList.tpl Wed Jun 21 02:44:35 2006
@@ -1,212 +1,219 @@
-{*<!--
-/*********************************************************************************
-  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
-   * ("License"); You may not use this file except in compliance with the License
-   * The Original Code is:  vtiger CRM Open Source
-   * The Initial Developer of the Original Code is vtiger.
-   * Portions created by vtiger are Copyright (C) vtiger.
-   * All Rights Reserved.
-  *
- ********************************************************************************/
--->*}
-<script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
-<script src="include/scriptaculous/prototype.js" type="text/javascript"></script>
-<script src="include/scriptaculous/scriptaculous.js" type="text/javascript"></script>
-<script>
-{literal}
-function splitvalues() {
-	var picklistobj=getobj("listarea")
-	var picklistcontent=picklistobj.value
-	var picklistary=new array()
-	var i=0;
-	
-	//splitting up of values
-	if (picklistcontent.indexof("\n")!=-1) {
-		while(picklistcontent.indexof("\n")!=-1) {
-			if (picklistcontent.replace(/^\s+/g, '').replace(/\s+$/g, '').length>0) {
-				picklistary[i]=picklistcontent.substr(0,picklistcontent.indexof("\n")).replace(/^\s+/g, '').replace(/\s+$/g, '')
-				picklistcontent=picklistcontent.substr(picklistcontent.indexof("\n")+1,picklistcontent.length)
-				i++
-			} else break;
-		}
-	} else if (picklistcontent.replace(/^\s+/g, '').replace(/\s+$/g, '').length>0) {
-		picklistary[0]=picklistcontent.replace(/^\s+/g, '').replace(/\s+$/g, '')
-	}
-	
-	return picklistary;
-}
-function setdefaultlist() {
-	var picklistary=new array()
-	picklistary=splitvalues()
-	
-	getobj("defaultlist").innerhtml=""
-	
-	for (i=0;i<picklistary.length;i++) {
-		var objoption=document.createelement("option")
-		if (browser_ie) {
-			objoption.innertext=picklistary[i]
-			objoption.value=picklistary[i]
-		} else if (browser_nn4 || browser_nn6) {
-			objoption.text=picklistary[i]
-			objoption.setattribute("value",picklistary[i])
-		}
-	
-		getobj("defaultlist").appendchild(objoption)
-	}
-}
-function validate() {
-	if (emptycheck("listarea","picklist values"))	{
-		var picklistary=new array()
-		picklistary=splitvalues()
-		//empty check validation
-		for (i=0;i<picklistary.length;i++) {
-			if (picklistary[i]=="") {
-				alert("picklist value cannot be empty")
-				picklistobj.focus()
-				return false
-			}
-		}
-
-		//duplicate values' validation
-		for (i=0;i<picklistary.length;i++) {
-			for (j=i+1;j<picklistary.length;j++) {
-				if (picklistary[i]==picklistary[j]) {
-					alert("duplicate values found")
-					picklistobj.focus()
-					return false
-				}
-			}
-		}
-
-		return true;
-	}
-}
-
-{/literal}
-</script>
-<style type="text/css">@import url(themes/blue/style.css);</style>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-<tr>
-	{include file='SettingsMenu.tpl'}
-<td width="75%" valign="top">
-
-<table width="100%" border="0" cellpadding="0" cellspacing="0" height="100%">
-<td class="showPanelBg" valign="top" width="100%" colspan="3" style="padding-left:20px; "><br/>
-<span class="lvtHeaderText"><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS} </a> > {$MOD.LBL_STUDIO} > {$MOD.LBL_PICKLIST_SETTINGS}</b></span>
-<hr noshade="noshade" size="1" />
-</td>
-</tr>
-<tr>
-<td width="75%" style="padding-left:20px;" valign="top">
-	
-	<table class="leadTable" align="center" cellpadding="5" cellspacing="0" width="95%">
-	<tbody><tr>
-	<td style="border-bottom: 2px dotted rgb(204, 204, 204); padding: 5px;" width="5%">
-	<img src="{$IMAGE_PATH}picklistEditor.gif" align="left">
-	</td>
-	<td style="border-bottom: 2px dotted rgb(170, 170, 170); padding: 5px;">
-	<span class="genHeaderGrayBig">{$MOD.LBL_PICKLIST_EDITOR}</span><br>
-	
-	</td>
-	</tr>
-	<tr><td colspan="2">&nbsp;</td></tr>
-	<tr>
-	<td align="right"><img src="{$IMAGE_PATH}one.gif"></td>
-	<td><b class="lvtHeaderText">{$MOD.LBL_SELECT_MODULE}</b></td>
-	</tr>
-
-	<tr>
-	<td>&nbsp;</td>
-	<td>
-	{$MOD.LBL_SELECT_CRM_MODULE} :
-	<select name="pickmodule" class="importBox" onChange="changeModule(this);">
-	{foreach key=tabid item=module from=$MODULE_LISTS}
-	<option value="{$module}">{$module}</option>
-	{/foreach}
-	</select>
-	</td>
-	</tr>
-	<tr><td colspan="2">&nbsp;</td></tr>
-	<tr>
-
-	<td align="right" valign="top"><img src="{$IMAGE_PATH}two.gif" height="31" width="29"></td>
-	<td rowspan="2">
-	<div id="picklist_datas">	
-		{include file='Settings/PickListContents.tpl'}
-	</div>
-	</td>
-	</tr>
-	<tr>
-	<td>&nbsp;</td>
-	</tr>
-	<tr><td colspan="2">&nbsp;</td></tr>
-	</tbody>
-	</table>
-
-
-
-</td>
-<td width="1%" style="border-right:1px dotted #CCCCCC;">&nbsp;</td>
-</tr>
-</table>
-</td>
-</tr>
-</table>
-</td>
-</tr>
-</table>
-	{include file='SettingsSubMenu.tpl'}
-<div id="editdiv" style="display:block;position:absolute;width:510px;"></div>
-{literal}
-<script>
-function SavePickList(fieldname,module)
-{
-	$("status").style.display="inline";
-	Effect.Puff($('editdiv'),{duration:2});
-	var body = $("picklist_values").value;
-	new Ajax.Request(
-        	'index.php',
-	        {queue: {position: 'end', scope: 'command'},
-        		method: 'post',
-		        postBody: 'action=SettingsAjax&module=Settings&directmode=ajax&file=UpdateComboValues&table_name='+fieldname+'&fld_module='+module+'&listarea='+body,
-		        onComplete: function(response) {
-					$("status").style.display="none";
-        				$("picklist_datas").innerHTML=response.responseText;
-	                        }
-        	}
-	);
-}
-function changeModule(pickmodule)
-{
-	$("status").style.display="inline";
-	var module=pickmodule.options[pickmodule.options.selectedIndex].value;
-	new Ajax.Request(
-                'index.php',
-                {queue: {position: 'end', scope: 'command'},
-                        method: 'post',
-                        postBody: 'action=SettingsAjax&module=Settings&directmode=ajax&file=PickList&fld_module='+module,
-                        onComplete: function(response) {
-                                        $("status").style.display="none";
-                                        $("picklist_datas").innerHTML=response.responseText;
-                                }
-                }
-        );
-}
-function fetchEditPickList(module,fieldname)
-{
-	$("status").style.display="inline";
-	new Ajax.Request(
-                'index.php',
-                {queue: {position: 'end', scope: 'command'},
-                        method: 'post',
-                        postBody: 'action=SettingsAjax&module=Settings&mode=edit&file=EditComboField&fld_module='+module+'&fieldname='+fieldname,
-			onComplete: function(response) {
-                                        $("status").style.display="none";
-                                        $("editdiv").innerHTML=response.responseText;
-					Effect.Grow('editdiv');
-                	}
-                }
-        );
-}
-</script>
-{/literal}
+{*<!--
+/*********************************************************************************
+  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
+   * ("License"); You may not use this file except in compliance with the License
+   * The Original Code is:  vtiger CRM Open Source
+   * The Initial Developer of the Original Code is vtiger.
+   * Portions created by vtiger are Copyright (C) vtiger.
+   * All Rights Reserved.
+  *
+ ********************************************************************************/
+-->*}
+<script language="JAVASCRIPT" type="text/javascript" src="include/js/smoothscroll.js"></script>
+<script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
+<script src="include/scriptaculous/prototype.js" type="text/javascript"></script>
+<script src="include/scriptaculous/scriptaculous.js" type="text/javascript"></script>
+<script>
+{literal}
+function splitvalues() {
+	var picklistobj=getobj("listarea")
+	var picklistcontent=picklistobj.value
+	var picklistary=new array()
+	var i=0;
+	
+	//splitting up of values
+	if (picklistcontent.indexof("\n")!=-1) {
+		while(picklistcontent.indexof("\n")!=-1) {
+			if (picklistcontent.replace(/^\s+/g, '').replace(/\s+$/g, '').length>0) {
+				picklistary[i]=picklistcontent.substr(0,picklistcontent.indexof("\n")).replace(/^\s+/g, '').replace(/\s+$/g, '')
+				picklistcontent=picklistcontent.substr(picklistcontent.indexof("\n")+1,picklistcontent.length)
+				i++
+			} else break;
+		}
+	} else if (picklistcontent.replace(/^\s+/g, '').replace(/\s+$/g, '').length>0) {
+		picklistary[0]=picklistcontent.replace(/^\s+/g, '').replace(/\s+$/g, '')
+	}
+	
+	return picklistary;
+}
+function setdefaultlist() {
+	var picklistary=new array()
+	picklistary=splitvalues()
+	
+	getobj("defaultlist").innerhtml=""
+	
+	for (i=0;i<picklistary.length;i++) {
+		var objoption=document.createelement("option")
+		if (browser_ie) {
+			objoption.innertext=picklistary[i]
+			objoption.value=picklistary[i]
+		} else if (browser_nn4 || browser_nn6) {
+			objoption.text=picklistary[i]
+			objoption.setattribute("value",picklistary[i])
+		}
+	
+		getobj("defaultlist").appendchild(objoption)
+	}
+}
+function validate() {
+	if (emptycheck("listarea","picklist values"))	{
+		var picklistary=new array()
+		picklistary=splitvalues()
+		//empty check validation
+		for (i=0;i<picklistary.length;i++) {
+			if (picklistary[i]=="") {
+				alert("picklist value cannot be empty")
+				picklistobj.focus()
+				return false
+			}
+		}
+
+		//duplicate values' validation
+		for (i=0;i<picklistary.length;i++) {
+			for (j=i+1;j<picklistary.length;j++) {
+				if (picklistary[i]==picklistary[j]) {
+					alert("duplicate values found")
+					picklistobj.focus()
+					return false
+				}
+			}
+		}
+
+		return true;
+	}
+}
+
+{/literal}
+</script>
+<br>
+<table align="center" border="0" cellpadding="0" cellspacing="0" width="98%">
+<tbody><tr>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
+        <td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
+<br>
+	<div align=center>
+	
+			{include file='SetMenu.tpl'}
+				<!-- DISPLAY -->
+				<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
+				<tr>
+					<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}picklist.gif" width="48" height="48" border=0 ></td>
+					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > {$MOD.LBL_PICKLIST_EDITOR}</b></td>
+				</tr>
+				<tr>
+					<td valign=top class="small">{$MOD.LBL_PICKLIST_DESC}</td>
+				</tr>
+				</table>
+				
+				
+				<table border=0 cellspacing=0 cellpadding=10 width=100% >
+				<tr>
+				<td valign=top>
+				
+					<table border=0 cellspacing=0 cellpadding=5 width=100% class="tableHeading">
+					<tr>
+						<td class="big"><strong>1. {$MOD.LBL_SELECT_MODULE}</strong></td>
+						<td class="small" align=right>&nbsp;</td>
+					</tr>
+					</table>
+					<table width="100%" border="0" cellpadding="5" cellspacing="0" class="small">
+						<tr class="small">
+                        	<td width="35%" class="small cellLabel"><strong>{$MOD.LBL_SELECT_CRM_MODULE}</strong></td>
+	                        <td width="65%" class="cellText" >
+					<select name="pickmodule" class="detailedViewTextBox" onChange="changeModule(this);">
+					{foreach key=tabid item=module from=$MODULE_LISTS}
+						<option value="{$module}">{$APP.$module}</option>
+					{/foreach}
+					</select>
+				</td>
+                      </tr>
+					</table>
+					<br>
+				<table border=0 cellspacing=0 cellpadding=5 width=100% class="tableHeading">
+				<tr>
+				    <td class="big" rowspan="2">
+					<div id="picklist_datas">	
+						{include file='Settings/PickListContentsN.tpl'}
+					</div>
+				    </td>	
+				</td>
+				</tr>
+			    	</table>
+				<table border=0 cellspacing=0 cellpadding=5 width=100% >
+					<tr><td class="small" nowrap align=right><a href="#top">Scroll to Top</a></td></tr>
+				</table>
+				
+				</td>
+				</tr>
+				</table>
+			
+			
+			
+			</td>
+			</tr>
+			</table>
+		</td>
+	</tr>
+	</table>
+		
+	</div>
+
+</td>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
+   </tr>
+</tbody>
+</table>
+<div id="editdiv" style="display:block;position:absolute;width:510px;"></div>
+{literal}
+<script>
+function SavePickList(fieldname,module)
+{
+	$("status").style.display="inline";
+	Effect.Puff($('editdiv'),{duration:2});
+	var body = $("picklist_values").value;
+	new Ajax.Request(
+        	'index.php',
+	        {queue: {position: 'end', scope: 'command'},
+        		method: 'post',
+		        postBody: 'action=SettingsAjax&module=Settings&directmode=ajax&file=UpdateComboValues&table_name='+fieldname+'&fld_module='+module+'&listarea='+body,
+		        onComplete: function(response) {
+					$("status").style.display="none";
+        				$("picklist_datas").innerHTML=response.responseText;
+	                        }
+        	}
+	);
+}
+function changeModule(pickmodule)
+{
+	$("status").style.display="inline";
+	var module=pickmodule.options[pickmodule.options.selectedIndex].value;
+	new Ajax.Request(
+                'index.php',
+                {queue: {position: 'end', scope: 'command'},
+                        method: 'post',
+                        postBody: 'action=SettingsAjax&module=Settings&directmode=ajax&file=PickList&fld_module='+module,
+                        onComplete: function(response) {
+                                        $("status").style.display="none";
+                                        $("picklist_datas").innerHTML=response.responseText;
+                                }
+                }
+        );
+}
+function fetchEditPickList(module,fieldname)
+{
+	$("status").style.display="inline";
+	new Ajax.Request(
+                'index.php',
+                {queue: {position: 'end', scope: 'command'},
+                        method: 'post',
+                        postBody: 'action=SettingsAjax&module=Settings&mode=edit&file=EditComboField&fld_module='+module+'&fieldname='+fieldname,
+			onComplete: function(response) {
+                                        $("status").style.display="none";
+                                        $("editdiv").innerHTML=response.responseText;
+					Effect.Grow('editdiv');
+                	}
+                }
+        );
+}
+</script>
+{/literal}

Modified: vtigercrm/trunk/Smarty/templates/Settings/PickListContents.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Settings/PickListContents.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Settings/PickListContents.tpl Wed Jun 21 02:44:35 2006
@@ -1,46 +1,38 @@
-{*<!--
-/*********************************************************************************
-  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
-   * ("License"); You may not use this file except in compliance with the License
-   * The Original Code is:  vtiger CRM Open Source
-   * The Initial Developer of the Original Code is vtiger.
-   * Portions created by vtiger are Copyright (C) vtiger.
-   * All Rights Reserved.
-  *
- ********************************************************************************/
--->*}
-<b class="lvtHeaderText">{$MOD.LBL_PICKLIST_AVAIL} {$MODULE}</b><br>
-	{$MOD.LBL_PICKLIST_AVAILINFO1} {$MODULE} {$MOD.LBL_PICKLIST_AVAILINFO2}<br>
-	<table style="background-color: rgb(204, 204, 204);" class="small" border="0" cellpadding="5" cellspacing="1" width="90%"><tbody>
-		
-		{foreach item=picklists from=$PICKLIST_VALUES}
-		<tr>
-		{foreach item=picklistfields from=$picklists}
-		{if $picklistfields neq ''}
-		<td class="lvtCol" width="25%">{$picklistfields.fieldlabel}</td>
-		<td class="lvtCol" width="5%"><a href="javascript:;" onclick="fetchEditPickList('{$MODULE}','{$picklistfields.fieldname}');posLay(this,'editdiv');">{$MOD.LBL_EDIT}</a></td>
-		{else}
-		<td class="lvtCol" colspan="2">&nbsp;</td>
-		{/if}
-		{/foreach}
-		</tr>
-		
-		<tr bgcolor="#ffffff">
-		{foreach item=picklistelements from=$picklists}
-		{if $picklistelements neq ''}
-		<td colspan="2" valign="top">
-			<ul style="list-style-type: none;">
-			{foreach item=elements from=$picklistelements.value}
-			<li>{$elements}</li>
-			{/foreach}
-			</ul>		
-		</td>
-		{else}
-		<td colspan="2">&nbsp;</td>
-		{/if}
-		{/foreach}
-		</tr>
-		{/foreach}
-	
-	</tbody></table>
-
+	<strong>2. {$MOD.LBL_PICKLIST_AVAIL} {$MODULE} </strong></td>
+		<td class="small" align=right>&nbsp;</td>
+		</tr>
+	</table>
+	<table border=0 cellspacing=0 cellpadding=0 width=100% class="listTable">
+	<tr>
+		<td valign=top width="50%">
+		<table width="100%" class="listTable" cellpadding="5" cellspacing="0">
+		{foreach item=picklists from=$PICKLIST_VALUES}
+		<tr>
+		{foreach item=picklistfields from=$picklists}
+		{if $picklistfields neq ''}
+			<td class="listTableTopButtons small" valign="top" align="left"><b>{$picklistfields.fieldlabel}</b></td>
+			<td class="listTableTopButtons" valign="top" align="right">
+				<input type="button" value="Edit" class="crmButton small edit" onclick="fetchEditPickList('{$MODULE}','{$picklistfields.fieldname}');posLay(this,'editdiv');" > 
+			</td>
+		{else}
+			<td class="listTableTopButtons small" colspan="2">&nbsp;</td>
+		{/if}
+		{/foreach}
+		</tr>
+		<tr>
+		{foreach item=picklistelements from=$picklists}
+		{if $picklistelements neq ''}
+			<td colspan="2" valign="top">
+				<ul style="list-style-type: none;">
+					{foreach item=elements from=$picklistelements.value}
+						<li>{$elements}</li>
+					{/foreach}
+				</ul>	
+			</td>
+		{else}
+			<td colspan="2">&nbsp;</td>
+		{/if}
+		{/foreach}
+		</tr>
+		{/foreach}
+		</table> 



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 01:45:41 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 08:45:41 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7336 -
	/vtigercrm/trunk/modules/Users/RoleDetailView.php
Message-ID: <20060621084541.1D82183F261@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 02:45:37 2006
New Revision: 7336

Log:
Update role detail view

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

Modified: vtigercrm/trunk/modules/Users/RoleDetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Users/RoleDetailView.php (original)
+++ vtigercrm/trunk/modules/Users/RoleDetailView.php Wed Jun 21 02:45:37 2006
@@ -14,6 +14,7 @@
 require_once('include/database/PearDatabase.php');
 require_once('themes/'.$theme.'/layout_utils.php');
 require_once('include/utils/UserInfoUtil.php');
+require_once('include/utils/utils.php');
 
 global $mod_strings;
 global $app_strings;
@@ -26,7 +27,6 @@
 require_once($theme_path.'layout_utils.php');
 
 $smarty = new vtigerCRM_Smarty;
-
 $roleid= $_REQUEST['roleid'];
 
 //Standard PickList Fields
@@ -64,7 +64,19 @@
 	return $return_data;
 }
 
+if(isset($_REQUEST['roleid']) && $_REQUEST['roleid'] != '')
+{	
+	$roleid= $_REQUEST['roleid'];
+	$mode = $_REQUEST['mode'];
+	$roleInfo=getRoleInformation($roleid);
+	$thisRoleDet=$roleInfo[$roleid];
+	$rolename = $thisRoleDet[0]; 
+	$parent = $thisRoleDet[3]; 
+	//retreiving the vtiger_profileid
+	$roleRelatedProfiles=getRoleRelatedProfiles($roleid);
 
+}
+$parentname=getRoleName($parent);
 //Retreiving the Role Info
 $roleInfoArr=getRoleInformation($roleid);
 $rolename=$roleInfoArr[$roleid][0];
@@ -75,8 +87,9 @@
 $smarty->assign("APP", $app_strings);
 $smarty->assign("CMOD", $mod_strings);
 $smarty->assign("ROLEINFO",getStdOutput($roleid));
+$smarty->assign("PARENTNAME",$parentname);            
 
 
-$smarty->display("RoleDetailView.tpl");
+$smarty->display("RoleDetailViewN.tpl");
 
 ?>



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 02:22:54 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 09:22:54 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7337 -
	/vtigercrm/trunk/Smarty/templates/FieldAccess.tpl
Message-ID: <20060621092254.78FE45E4D10@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 03:22:50 2006
New Revision: 7337

Log:
Updated field access tpl file

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 Wed Jun 21 03:22:50 2006
@@ -1,159 +1,141 @@
-{*<!--
-/*********************************************************************************
-  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
-   * ("License"); You may not use this file except in compliance with the License
-   * The Original Code is:  vtiger CRM Open Source
-   * The Initial Developer of the Original Code is vtiger.
-   * Portions created by vtiger are Copyright (C) vtiger.
-   * All Rights Reserved.
-  *
- ********************************************************************************/
--->*}
-<script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
-<style type="text/css">@import url(themes/blue/style.css);</style>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-<tr>
-	{include file='SettingsMenu.tpl'}
-<td width="75%" valign="top">
-
-<table width="100%" border="0" cellpadding="0" cellspacing="0" height="100%">
-<tr>
-<td class="showPanelBg" valign="top" width="100%" colspan="3" style="padding-left:20px; "><br />
-<span class="lvtHeaderText"><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS} </a> > {$MOD.LBL_USER_MANAGEMENT} > {$MOD.LBL_DEFAULT_ORGANIZATION_FIELDS}</b></span>
-<hr noshade="noshade" size="1" />
-</td>
-</tr>
-<tr>
-<td width="75%" style="padding-left:20px;" valign="top">
-	
-		<table border="0" cellpadding="0" cellspacing="0" width="100%">
-		<form action="index.php" method="post" name="new" id="form">
-		<input type="hidden" name="module" value="Users">
-		<input type="hidden" name="parenttab" value="Settings">
-		<input type="hidden" name="fld_module" id="fld_module">
-		{if $MODE neq 'view'}
-		<input type="hidden" name="action" value="UpdateDefaultFieldLevelAccess">
-		{else}
-		<input type="hidden" name="action" value="EditDefOrgFieldLevelAccess">
-		{/if}	
-		<tbody><tr>
-		<td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif;" height="6" width="7"><img src="{$IMAGE_PATH}top_left.jpg" align="top"></td>
-		<td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif; height: 6px;" bgcolor="#ebebeb"></td>
-		<td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif;" height="6" width="8"><img src="{$IMAGE_PATH}top_right.jpg" align="top" height="6" width="8"></td>
-	 	</tr>
-		<tr>
-		<td bgcolor="#ebebeb" width="7"></td>
-		<td bgcolor="#ebebeb">	
-			<table border="0" cellpadding="3" cellspacing="0" width="100%">
-			<tbody><tr>
-			<td class="genHeaderSmall" height="25" valign="middle">{$CMOD.LBL_GLOBAL_FIELDS_MANAGER}</td>
-			<td align="right">&nbsp;</td>
-			</tr>
-			<tr><td colspan="2"></td></tr>
-		    <tr>
-			<td colspan="2" nowrap="nowrap">
-				
-				<table border="0" cellpadding="0" cellspacing="0" width="100%">
-				<tbody><tr bgcolor="#ffffff">
-				<td style="padding: 10px;" align="left">
-				<b>{$CMOD.LBL_SELECT_SCREEN}</b>
-				
-				<select name="selectmodule" style="width: 200px; font-size: 10px;" onChange="changemodules(this)">
-				{foreach item=module from=$FIELD_INFO}
-				{if $module == $DEF_MODULE}
-					<option selected value='{$module}'>{$APP.$module}</option>
-				{else}		
-					<option value='{$module}' >{$APP.$module}</option>
-				{/if}
-				{/foreach}
-				</select>
-				
-				</td>
-				<td style="padding-right: 10px;" align="right">&nbsp;
-				{if $MODE neq 'edit'}
-				<input title="Edit" accessKey="E" class="classBtn" type="submit" name="Edit" value="{$APP.LBL_EDIT_BUTTON}"></td>
-				{else}
-				<input title="save" accessKey="S" class="classBtn" type="submit" name="Save" value="{$APP.LBL_SAVE_LABEL}"></td>
-				{/if}
-			    </tr>
-				<tr><td colspan="2" height="7"></td></tr>
-				<tr bgcolor="#ffffff">
-				<td style="padding: 10px;" colspan="2">
-					
-					{foreach key=module item=info from=$FIELD_LISTS}
-					{if $module == $DEF_MODULE}
-					<div id="{$module}_fields" style="display:block">	
-					{else}
-					<div id="{$module}_fields" style="display:none">	
-					{/if}	
-					<table class="small" border="0" cellpadding="5" cellspacing="0" width="100%">
-	                <tbody><tr><td colspan="4" style="border-bottom: 1px dashed rgb(204, 204, 204);">
-					<b>{$CMOD.LBL_FIELDS_AVLBL} {$APP.$module} </b><br>
-	  				 {$CMOD.LBL_FIELDS_SELECT_DESELECT}
-				    </td></tr>
-					<tr><td colspan="4">&nbsp;</td></tr>
-					
-					{foreach item=elements from=$info}
-					<tr>
-					
-						{foreach item=elementinfo from=$elements}
-        	            <td width="5%">{$elementinfo.1}</td>
-						<td width="45%">{$elementinfo.0}</td>
-				   		{/foreach}
-						
-            	    </tr>
-					{/foreach}
-
-					<tr><td colspan="4">&nbsp;</td></tr>
-                	</tbody></table>
-					</div>
-					{/foreach}
-				
-				</td>
- 				</tr>
-				<tr><td colspan="2" style="border-top: 1px dashed rgb(204, 204, 204);padding:10px;" bgcolor="white" align="center">
-				<input name="Cancel" value=" {$APP.LBL_CANCEL_BUTTON_LABEL} " class="classBtn" type="button" onClick="window.history.back();">
-				</td></tr>
-				</tbody>
-				</table>
-
-			</td>
-		  	</tr>
-			</tbody></form></table>
-		 <!-- End of Module Display -->
-    </td>
-	<td bgcolor="#ebebeb" width="8"></td>
-    </tr>
- 	<tr>
-	<td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif;" height="8" width="7"><img src="{$IMAGE_PATH}bottom_left.jpg" align="bottom"></td>
-	<td style="font-size: 1px;" bgcolor="#ebebeb" height="8"></td>
-	<td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif;" height="8" width="8"><img src="{$IMAGE_PATH}bottom_right.jpg" align="bottom"></td>
-	</tr>
-	</tbody></table>
-		  
-	
-</td>
-<td width="1%" style="border-right:1px dotted #CCCCCC;">&nbsp;</td>
-</tr>
-</table>
-</td>
-</tr>
-</table>
-</td>
-</tr>
-</table>
-	{include file='SettingsSubMenu.tpl'}
-<script>
-var def_field='{$DEF_MODULE}_fields';
-{literal}
-function changemodules(selectmodule)
-{
-	hide(def_field);
-	module=selectmodule.options[selectmodule.options.selectedIndex].value;
-	document.getElementById('fld_module').value = module; 
-	def_field = module+"_fields";
-	show(def_field);
-}
-</script>
-{/literal}
-
+{*<!--
+/*********************************************************************************
+** The contents of this file are subject to the vtiger CRM Public License Version 1.0
+ * ("License"); You may not use this file except in compliance with the License
+ * The Original Code is:  vtiger CRM Open Source
+ * The Initial Developer of the Original Code is vtiger.
+ * Portions created by vtiger are Copyright (C) vtiger.
+ * All Rights Reserved.
+*
+ ********************************************************************************/
+-->*}
+<script language="JAVASCRIPT" type="text/javascript" src="include/js/smoothscroll.js"></script>
+<script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
+<br>
+<table align="center" border="0" cellpadding="0" cellspacing="0" width="98%">
+<tbody><tr>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
+        <td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
+<br>
+	<div align=center>
+	
+			{include file='SetMenu.tpl'}
+				<!-- DISPLAY -->
+				<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
+				<form action="index.php" method="post" name="new" id="form">
+				<input type="hidden" name="module" value="Users">
+				<input type="hidden" name="parenttab" value="Settings">
+				<input type="hidden" name="fld_module" id="fld_module">
+				{if $MODE neq 'view'}
+				<input type="hidden" name="action" value="UpdateDefaultFieldLevelAccess">
+				{else}
+				<input type="hidden" name="action" value="EditDefOrgFieldLevelAccess">
+				{/if}	
+				<tr>
+					<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}orgshar.gif" alt="Users" width="48" height="48" border=0 title="Users"></td>
+					<td colspan=2 class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > {$MOD.LBL_FIELDS_ACCESS} </b></td>
+					<td rowspan=2 class="small" align=right>&nbsp;</td>
+				</tr>
+				<tr>
+					<td valign=top class="small">{$MOD.LBL_SHARING_FIELDS_DESCRIPTION}</td>
+				</tr>
+				</table>
+				<br>
+				<table border=0 cellspacing=0 cellpadding=5 width=100% class="tableHeading">
+				<tr>
+					<td class="big"><strong>{$CMOD.LBL_GLOBAL_FIELDS_MANAGER}</strong></td>
+					<td class="small" align=right>
+					{if $MODE neq 'edit'}
+						<input name="Edit" type="submit" class="crmButton small edit" value="{$APP.LBL_EDIT_BUTTON}" >									
+					{else}
+						<input title="save" accessKey="S" class="crmButton small save" type="submit" name="Save" value="{$APP.LBL_SAVE_LABEL}">
+						<input name="Cancel" value=" {$APP.LBL_CANCEL_BUTTON_LABEL} " class="crmButton small cancel" type="button" onClick="window.history.back();">
+					{/if}
+					</td>
+				</tr>
+				</table>
+				<table width="100%" border="0" cellpadding="5" cellspacing="0" class="listTableTopButtons">
+                  <tr >
+                    <td  style="padding-left:5px;" class="big">{$CMOD.LBL_SELECT_SCREEN}&nbsp; 
+			<select name="Screen" class="detailedViewTextBox" style="width:30%;"  onChange="changemodules(this)">
+				{foreach item=module from=$FIELD_INFO}
+				{if $module == $DEF_MODULE}
+					<option selected value='{$module}'>{$APP.$module}</option>
+				{else}		
+					<option value='{$module}' >{$APP.$module}</option>
+				{/if}
+				{/foreach}
+			</select>
+		    </td>
+                    <td align="right">&nbsp;</td>
+                  </tr>
+		  </table>
+				{foreach key=module item=info name=allmodules from=$FIELD_LISTS}
+				{$module}      {$DEF_MODULE}
+				{if $module == $DEF_MODULE}
+				<div id="{$module}_fields" style="display:block">	
+				{else}
+				<div id="{$module}_fields" style="display:none">	
+				{/if}
+				 <table cellspacing=0 cellpadding=5 width=100% class="listTable small">
+                   <tr>
+				   			<td colspan="2" class="listRow" valign="top" nowrap>
+								<b>{$CMOD.LBL_FIELDS_AVLBL} {$APP.$module}</b>
+							</td>
+				   </tr>
+				   <tr>
+                     <td valign=top width="25%" >
+		     <table border=0 cellspacing=0 cellpadding=5 width=100% class=small>
+			{foreach item=elements name=groupfields from=$info}
+                         <tr>
+				{foreach item=elementinfo name=curvalue from=$elements}
+                           <td class="prvPrfTexture" style="width:20px">&nbsp;</td>
+                           <td width="5%" id="{$smarty.foreach.allmodules.iteration}_{$smarty.foreach.groupfields.iteration}_{$smarty.foreach.curvalue.iteration}">{$elementinfo.1}</td>
+                           <td width="25%" nowrap  onMouseOver="this.className='prvPrfHoverOn',$('{$smarty.foreach.allmodules.iteration}_{$smarty.foreach.groupfields.iteration}_{$smarty.foreach.curvalue.iteration}').className='prvPrfHoverOn'" onMouseOut="this.className='prvPrfHoverOff',$('{$smarty.foreach.allmodules.iteration}_{$smarty.foreach.groupfields.iteration}_{$smarty.foreach.curvalue.iteration}').className='prvPrfHoverOff'">{$elementinfo.0}</td>
+				{/foreach}
+                         </tr>
+                         	{/foreach}
+                     </table>
+				</div>
+			</td>
+                   </tr>
+				{/foreach}
+                 </table></td>
+			</tr>
+                </table>
+				<br>
+				<br>
+				<table border=0 cellspacing=0 cellpadding=5 width=100% >
+				<tr><td class="small" ><div align=right><a href="#top">{$MOD.LBL_SCROLL}</a></div></td></tr>				</table>
+				
+			
+			
+			
+			</td>
+			</tr>
+			</table>
+		</td>
+	</tr>
+	</form>
+	</table>
+		
+	</div>
+</td>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
+   </tr>
+</tbody>
+</table>
+<script>
+var def_field='{$DEF_MODULE}_fields';
+{literal}
+function changemodules(selectmodule)
+{
+	hide(def_field);
+	module=selectmodule.options[selectmodule.options.selectedIndex].value;
+	document.getElementById('fld_module').value = module; 
+	def_field = module+"_fields";
+	show(def_field);
+}
+</script>
+{/literal}
+



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 02:34:53 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 09:34:53 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7338 - in /vtigercrm/trunk:
 Smarty/templates/DetailViewHidden.tpl Smarty/templates/DetailViewUI.tpl
 Smarty/templates/Inventory/InventoryDetailView.tpl
 include/js/dtlviewajax.js
Message-ID: <20060621093454.2475B83870D@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 03:34:46 2006
New Revision: 7338

Log:
Ajax edit has been fixed to retain values

Modified:
    vtigercrm/trunk/Smarty/templates/DetailViewHidden.tpl
    vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl
    vtigercrm/trunk/Smarty/templates/Inventory/InventoryDetailView.tpl
    vtigercrm/trunk/include/js/dtlviewajax.js

Modified: vtigercrm/trunk/Smarty/templates/DetailViewHidden.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DetailViewHidden.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DetailViewHidden.tpl Wed Jun 21 03:34:46 2006
@@ -149,7 +149,6 @@
         <input type="hidden" name="return_module">
         <input type="hidden" name="return_action">
         <input type="hidden" name="return_id">
-        <input type="hidden" name="contact_id">
         <input type="hidden" name="member_id">
         <input type="hidden" name="opportunity_id">
         <input type="hidden" name="case_id">
@@ -168,7 +167,6 @@
         <input type="hidden" name="return_module">
         <input type="hidden" name="return_action">
         <input type="hidden" name="return_id">
-        <input type="hidden" name="contact_id">
         <input type="hidden" name="member_id">
         <input type="hidden" name="opportunity_id">
         <input type="hidden" name="case_id">

Modified: vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl Wed Jun 21 03:34:46 2006
@@ -22,7 +22,7 @@
                                                         {/if}
                                                        <span id="dtlview_{$label}">{$keyval}</span>
                                               		<div id="editarea_{$label}" style="display:none;">
-                                              		  <input class="detailedViewTextBox" onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" type="text" id="txtbox_{$label}" name="textbox_{$label}" maxlength='100' value="{$keyval}"></input>
+                                              		  <input class="detailedViewTextBox" onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" type="text" id="txtbox_{$label}" name="{$keyfldname}" maxlength='100' value="{$keyval}"></input>
                                               		  <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
                                               		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                                                        </div>
@@ -30,7 +30,7 @@
                                              {elseif $keyid eq '13'} <!--Email-->
                                                   <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}"><a href="mailto:{$keyval}" target="_blank">{$keyval}</a></span>
                                               		<div id="editarea_{$label}" style="display:none;">
-                                              		  <input class="detailedViewTextBox" onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" type="text" id="txtbox_{$label}" name="textbox_{$label}" maxlength='100' value="{$keyval}"></input>
+                                              		  <input class="detailedViewTextBox" onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" type="text" id="txtbox_{$label}" name="{$keyfldname}" maxlength='100' value="{$keyval}"></input>
                                               		  <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
                                               		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                                                        </div>
@@ -52,7 +52,7 @@
                                              {elseif $keyid eq '17'} <!--WebSite-->
                                                   <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}"><a href="http://{$keyval}" target="_blank">{$keyval}</a></span>
                                               		<div id="editarea_{$label}" style="display:none;">
-                                              		  <input class="detailedViewTextBox" onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" type="text" id="txtbox_{$label}" name="textbox_{$label}" maxlength='100' value="{$keyval}"></input>
+                                              		  <input class="detailedViewTextBox" onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" type="text" id="txtbox_{$label}" name="{$keyfldname}" maxlength='100' value="{$keyval}"></input>
                                               		  <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
                                               		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                                                        </div>
@@ -60,7 +60,7 @@
                                              {elseif $keyid eq '19' || $keyid eq '20'} <!--TextArea/Description-->
                                                   <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}">{$keyval}</span>
                                               		<div id="editarea_{$label}" style="display:none;">
-                                              		  <textarea id="txtbox_{$label}" name="txtbox_{$label}"  class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'"onBlur="this.className='detailedViewTextBox'" cols="90" rows="8">{$keyval}</textarea>                                            		  
+                                              		  <textarea id="txtbox_{$label}" name="{$keyfldname}"  class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'"onBlur="this.className='detailedViewTextBox'" cols="90" rows="8">{$keyval}</textarea>                                            		  
                                               		  <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
                                               		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                                                        </div>
@@ -68,7 +68,7 @@
                                              {elseif $keyid eq '21' || $keyid eq '24' || $keyid eq '22'} <!--TextArea/Street-->
                                                   <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}">{$keyval}</span>
                                               		<div id="editarea_{$label}" style="display:none;">
-                                              		  <textarea id="txtbox_{$label}" name="txtbox_{$label}"  class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'"onBlur="this.className='detailedViewTextBox'" rows=2>{$keyval}</textarea>                                            		  
+                                              		  <textarea id="txtbox_{$label}" name="{$keyfldname}"  class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'"onBlur="this.className='detailedViewTextBox'" rows=2>{$keyval}</textarea>                                            		  
                                               		  <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
                                               		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                                                        </div>
@@ -136,6 +136,7 @@
                                                   </td>
 					{elseif $keyid eq '53'} <!--Assigned To-->
                     <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">
+				
                     <span id="dtlview_{$label}">
                     {if $keyseclink eq ''}
                         {$keyval}
@@ -162,9 +163,9 @@
                       <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onMouseOver="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}">{$keyval}&nbsp;</span>
                     	<div id="editarea_{$label}" style="display:none;">
                         {if $keyval eq 'yes'}                                              		  
-                            <input id="txtbox_{$label}" type="checkbox" style="border:1px solid #bababa;" checked value="1">
+                            <input id="txtbox_{$label}" name="{$keyfldname}" type="checkbox" style="border:1px solid #bababa;" checked value="1">
                         {else}
-                          <input id="txtbox_{$label}" type="checkbox" style="border:1px solid #bababa;" value="0">
+                          <input id="txtbox_{$label}" type="checkbox" name="{$keyfldname}" style="border:1px solid #bababa;" value="0">
                        	{/if}
                          <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');"/> or
                           <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>

Modified: vtigercrm/trunk/Smarty/templates/Inventory/InventoryDetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Inventory/InventoryDetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Inventory/InventoryDetailView.tpl Wed Jun 21 03:34:46 2006
@@ -14,6 +14,9 @@
 <script type="text/javascript" src="modules/{$MODULE}/{$SINGLE_MOD}.js"></script>
 <script language="JavaScript" type="text/javascript" src="include/js/dtlviewajax.js"></script>
 <div id="convertleaddiv" style="display:block;position:absolute;left:225px;top:150px;"></div>
+<span id="crmspanid" style="display:none;position:absolute;"  onmouseover="show('crmspanid');">
+   <a class="link"  align="right" href="javascript:;">{$APP.LBL_EDIT_BUTTON}</a>
+</span>
 <script>
 function tagvalidate()
 {ldelim}

Modified: vtigercrm/trunk/include/js/dtlviewajax.js
==============================================================================
--- vtigercrm/trunk/include/js/dtlviewajax.js (original)
+++ vtigercrm/trunk/include/js/dtlviewajax.js Wed Jun 21 03:34:46 2006
@@ -11,7 +11,9 @@
 var globaleditareaspanid = ""; 
 var globaltxtboxid = "";
 var itsonview=false;
-
+// to retain the old value if we cancel the ajax edit
+var globaltempvalue = '';
+var globaluitype = '';
 function showHide(showId, hideId)
 {
 	show(showId);
@@ -22,6 +24,16 @@
 {
 
   showHide(valuespanid,textareapanid);
+  if(globaluitype == '56')
+  {	  
+	  if(globaltempvalue == 1)
+	  	getObj(globaltxtboxid).checked = true; 
+	  else		
+	  	getObj(globaltxtboxid).checked = false; 
+  }
+  else		  
+	  getObj(globaltxtboxid).value = globaltempvalue; 
+  globaltempvalue = '';
   itsonview=false;
   return false;
 }
@@ -37,6 +49,7 @@
       }
       
       show("crmspanid");
+	  globaluitype = uitype;
       globaldtlviewspanid= "dtlview_"+ fieldLabel;//valuespanid;
       globaleditareaspanid="editarea_"+ fieldLabel;//textareapanid;
       globaltxtboxid="txtbox_"+ fieldLabel;//textboxpanid;
@@ -59,6 +72,7 @@
 {
      show(globaleditareaspanid) ;
      fnhide(globaldtlviewspanid);
+	 globaltempvalue = getObj(globaltxtboxid).value;
      getObj(globaltxtboxid).focus();
      fnhide('crmspanid');
      itsonview=true;
@@ -87,6 +101,7 @@
 	}
 
 
+	$("vtbusy_info").style.display="inline";
 	var isAdmin = document.getElementById("hdtxt_IsAdmin").value; 
 
 	var tagValue = trim(document.getElementById(txtBox).value);
@@ -105,7 +120,6 @@
 
 	var data = "file=DetailViewAjax&module=" + module + "&action=" + module + "Ajax&recordid=" + crmId ;
 	data = data + "&fldName=" + fieldName + "&fieldValue=" + escape(tagValue) + "&ajxaction=DETAILVIEW";
-	$("vtbusy_info").style.display="inline";
 	new Ajax.Request(
 		'index.php',
                 {queue: {position: 'end', scope: 'command'},
@@ -116,12 +130,12 @@
 				{
 					alert("Error while Editing");
 				}
-				else if(item.indexOf(":#:SUCCESS")>-1)
-     				{
+				else if(response.responseText.indexOf(":#:SUCCESS")>-1)
+    			{
 					$("vtbusy_info").style.display="none";
-     				}
-                       	}
-                }
+    			}
+           	}
+        }
         );
 	if(uitype == '13')
 	{



From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 02:35:32 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 09:35:32 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=23955=3A_?=
	=?utf-8?q?Horizontal_Scrolling?=
In-Reply-To: <076.a9ffd2be9e68b865905be8a48c3dc0a1@vtiger.fosslabs.com>
References: <076.a9ffd2be9e68b865905be8a48c3dc0a1@vtiger.fosslabs.com>
Message-ID: <085.aa2cfcda99ba690ccce512bf1ecf3594@vtiger.fosslabs.com>

#955: Horizontal Scrolling
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  ela  
      Type:  defect     |      Status:  new  
  Priority:  minor      |   Milestone:  5.0.0
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by richie):

  * priority:  critical => minor

Comment:

 Downgrading to minor.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/955>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 02:42:02 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 09:42:02 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7339 -
	/vtigercrm/trunk/include/utils/DetailViewUtils.php
Message-ID: <20060621094202.C925F83F018@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 03:41:59 2006
New Revision: 7339

Log:
issue in user detail view for role link has been fixed

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

Modified: vtigercrm/trunk/include/utils/DetailViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/DetailViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/DetailViewUtils.php Wed Jun 21 03:41:59 2006
@@ -835,7 +835,7 @@
 	{
 	 	$label_fld[] =$mod_strings[$fieldlabel];
 		if(is_admin($current_user))
-			$label_fld[] = '<a href="index.php?module=Users&action=RoleDetailView&roldeid='.$col_fields[$fieldname].'">'.getRoleName($col_fields[$fieldname]).'</a>';
+			$label_fld[] = '<a href="index.php?module=Users&action=RoleDetailView&roleid='.$col_fields[$fieldname].'">'.getRoleName($col_fields[$fieldname]).'</a>';
 		else
 			$label_fld[] = getRoleName($col_fields[$fieldname]);
 	}



From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 02:47:15 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 09:47:15 -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.2caf4aa1603f05d7b40162962bfb467d@vtiger.fosslabs.com>

#99: validation is not working for Notes module
------------------------+---------------------------------------------------
  Reporter:  Minnie     |       Owner:  mangai
      Type:  defect     |      Status:  new   
  Priority:  critical   |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by ahmed):

  * status:  reopened => new
  * owner:  ahmed => mangai

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/99>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 02:57:29 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 09:57:29 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7340 -
	/vtigertoolbar/trunk/firefox/install.rdf
Message-ID: <20060621095729.CE4A583F261@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 21 03:57:11 2006
New Revision: 7340

Log:
removed external reference

Modified:
    vtigertoolbar/trunk/firefox/install.rdf

Modified: vtigertoolbar/trunk/firefox/install.rdf
==============================================================================
Binary files - no diff available.



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 02:58:07 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 09:58:07 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7341 -
	/thunderbirdextn/trunk/install.rdf
Message-ID: <20060621095807.0162083F261@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 21 03:58:04 2006
New Revision: 7341

Log:
removed external reference

Modified:
    thunderbirdextn/trunk/install.rdf

Modified: thunderbirdextn/trunk/install.rdf
==============================================================================
Binary files - no diff available.



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 02:58:31 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 09:58:31 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7342 -
	/thunderbirdextn/trunk/install.js
Message-ID: <20060621095832.092F183F261@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 21 03:58:28 2006
New Revision: 7342

Log:
removed external reference

Modified:
    thunderbirdextn/trunk/install.js

Modified: thunderbirdextn/trunk/install.js
==============================================================================
Binary files - no diff available.



From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 03:01:31 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 10:01:31 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=23813=3A_?=
	=?utf-8?q?New_Quote?=
In-Reply-To: <076.3772e0ff3b6afff03f74ea9a4892bb7f@vtiger.fosslabs.com>
References: <076.3772e0ff3b6afff03f74ea9a4892bb7f@vtiger.fosslabs.com>
Message-ID: <085.88935463c0c81613f31dbcf832bf0615@vtiger.fosslabs.com>

#813: New Quote
------------------------+---------------------------------------------------
  Reporter:  Balduin    |       Owner:  ela  
      Type:  defect     |      Status:  new  
  Priority:  trivial    |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by mickie):

  * owner:  mickie => ela

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/813>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 03:08:59 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 10:08:59 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7343 -
	/vtigercrm/trunk/modules/Reports/ChangeFolder.php
Message-ID: <20060621100859.ABCDB83F373@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 04:08:56 2006
New Revision: 7343

Log:
docs added and query error has been fixed

Modified:
    vtigercrm/trunk/modules/Reports/ChangeFolder.php

Modified: vtigercrm/trunk/modules/Reports/ChangeFolder.php
==============================================================================
--- vtigercrm/trunk/modules/Reports/ChangeFolder.php (original)
+++ vtigercrm/trunk/modules/Reports/ChangeFolder.php Wed Jun 21 04:08:56 2006
@@ -29,10 +29,16 @@
 	header("Location: index.php?action=ReportsAjax&file=ListView&mode=ajaxdelete&module=Reports");
 }
 
+
+/** To Change the Report to another folder
+  * @param $reportid -- The report id
+  * @param $folderid -- The folderid the which the report to be moved
+  * @returns nothing 
+ */
 function ChangeFolder($reportid,$folderid)
 {
 	global $adb;
-	$imovereportsql = "update vtiger_report set folderid=".$folderid." where vtiger_reportid=".$reportid;
+	$imovereportsql = "update vtiger_report set folderid=".$folderid." where reportid=".$reportid;
 	$imovereportsqlresult = $adb->query($imovereportsql);
 }
 ?>



From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 03:16:43 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 10:16:43 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23861=3A_?=
 =?utf-8?q?parenttab_not_parsed_in_email_templates?=
In-Reply-To: <076.46779dbf4a572a77673e0793d5da5040@vtiger.fosslabs.com>
References: <076.46779dbf4a572a77673e0793d5da5040@vtiger.fosslabs.com>
Message-ID: <085.f3e2193d612137137328d0e4bf85199a@vtiger.fosslabs.com>

#861: parenttab not parsed in email templates
------------------------+---------------------------------------------------
  Reporter:  mangai     |       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 - parenttab is getting highlighted now in email templates

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/861>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 03:16:56 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 10:16:56 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231134=3A?=
 =?utf-8?q?_unable_to_change_state_of_purchase_order_using_ajax_feature?=
In-Reply-To: <076.6b6e1bdd6d4cf54f7a2bce3761f03794@vtiger.fosslabs.com>
References: <076.6b6e1bdd6d4cf54f7a2bce3761f03794@vtiger.fosslabs.com>
Message-ID: <085.2e1e7c45397781e5dd74e08d81cd9ffa@vtiger.fosslabs.com>

#1134: unable to change state of purchase order using ajax feature
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  jerrydgeorge
      Type:  defect     |      Status:  closed      
  Priority:  major      |   Milestone:              
 Component:  vtigercrm  |     Version:  5.0.0       
Resolution:  fixed      |    Keywords:              
------------------------+---------------------------------------------------
Changes (by anonymous):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1134>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 03:17:55 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 10:17:55 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231065=3A?=
 =?utf-8?q?_Unable_to_delete_the_last_record_in_the_list_view_of_Mail_Merg?=
 =?utf-8?q?e_templates?=
In-Reply-To: <076.9cc7a4889ab639885225e947a8d13e1c@vtiger.fosslabs.com>
References: <076.9cc7a4889ab639885225e947a8d13e1c@vtiger.fosslabs.com>
Message-ID: <085.6f642ccebb99fd2e0f5b723d793d3a31@vtiger.fosslabs.com>

#1065: Unable to delete the last record in the list view of Mail Merge templates
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  ahmed 
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by ahmed):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 Issue Fixed - Last record is getting deleted now

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1065>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 03:18:05 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 10:18:05 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231163=3A?=
 =?utf-8?q?_unable_to_save_Ajaxified_Terms_and_Conditions_field_in_Invoice?=
In-Reply-To: <076.81406a0d124351606d1fccac357d6e5d@vtiger.fosslabs.com>
References: <076.81406a0d124351606d1fccac357d6e5d@vtiger.fosslabs.com>
Message-ID: <085.b7ad675df334e9e12d460b0e26fd01cf@vtiger.fosslabs.com>

#1163: unable to save Ajaxified Terms and Conditions field in Invoice
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  jerrydgeorge
      Type:  defect     |      Status:  closed      
  Priority:  major      |   Milestone:              
 Component:  vtigercrm  |     Version:  5.0.0       
Resolution:  fixed      |    Keywords:              
------------------------+---------------------------------------------------
Changes (by anonymous):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1163>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 03:18:22 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 10:18:22 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231164=3A?=
 =?utf-8?q?_unable_to_save_Ajaxified_Description_field_in_Invoice?=
In-Reply-To: <076.b0bc283a60909e304007e4b26726e2ef@vtiger.fosslabs.com>
References: <076.b0bc283a60909e304007e4b26726e2ef@vtiger.fosslabs.com>
Message-ID: <085.9f4e55f0c9052c07cf72f427d975469d@vtiger.fosslabs.com>

#1164: unable to save Ajaxified Description field in Invoice
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  jerrydgeorge
      Type:  defect     |      Status:  closed      
  Priority:  major      |   Milestone:              
 Component:  vtigercrm  |     Version:  5.0.0       
Resolution:  fixed      |    Keywords:              
------------------------+---------------------------------------------------
Changes (by anonymous):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1164>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 03:22:32 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 10:22:32 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7344 - in
 /vtigercrm/trunk/modules/Accounts: DetailView.php EditView.php
Message-ID: <20060621102232.6257283F383@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 04:22:27 2006
New Revision: 7344

Log:
changes made to get validationdata

Modified:
    vtigercrm/trunk/modules/Accounts/DetailView.php
    vtigercrm/trunk/modules/Accounts/EditView.php

Modified: vtigercrm/trunk/modules/Accounts/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Accounts/DetailView.php (original)
+++ vtigercrm/trunk/modules/Accounts/DetailView.php Wed Jun 21 04:22:27 2006
@@ -95,9 +95,8 @@
         $smarty->assign("TOPTIONS",$optionString);
 }
 
-$account_tables = Array('account','crmentity','accountbillads','accountshipads','accountscf');
 $tabid = getTabid("Accounts");
-$validationData = getDBValidationData($account_tables,$tabid);
+$validationData = getDBValidationData($focus->tab_name,$tabid);
 $data = split_validationdataArray($validationData);
 
 $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']);

Modified: vtigercrm/trunk/modules/Accounts/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/Accounts/EditView.php (original)
+++ vtigercrm/trunk/modules/Accounts/EditView.php Wed Jun 21 04:22:27 2006
@@ -23,7 +23,6 @@
 require_once('Smarty_setup.php');
 require_once('data/Tracker.php');
 require_once('modules/Accounts/Account.php');
-require_once('modules/Accounts/Forms.php');
 require_once('include/CustomFieldUtil.php');
 require_once('include/ComboUtil.php');
 require_once('include/utils/utils.php');
@@ -101,9 +100,8 @@
 $smarty->assign("CALENDAR_LANG", $app_strings['LBL_JSCALENDAR_LANG']);
 $smarty->assign("CALENDAR_DATEFORMAT", parse_calendardate($app_strings['NTC_DATE_FORMAT']));
 
-$account_tables = Array('account','crmentity','accountbillads','accountshipads','accountscf'); 
  $tabid = getTabid("Accounts");
- $validationData = getDBValidationData($account_tables,$tabid);
+ $validationData = getDBValidationData($focus->tab_name,$tabid);
  $data = split_validationdataArray($validationData);
 
  $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']);



From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 03:23:51 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 10:23:51 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231324=3A?=
 =?utf-8?q?_Fatal_error_orders=3Csales?=
In-Reply-To: <076.020fb265047737595a1c038934006563@vtiger.fosslabs.com>
References: <076.020fb265047737595a1c038934006563@vtiger.fosslabs.com>
Message-ID: <085.b20072d5385f2daf77379e8b07d4c262@vtiger.fosslabs.com>

#1324: Fatal error orders<sales
------------------------------------------+---------------------------------
  Reporter:  sansnailmail (at) xs4all.nl  |       Owner:  developer
      Type:  defect                       |      Status:  closed   
  Priority:  major                        |   Milestone:           
 Component:  vtigercrm                    |     Version:  4.2.4rc3 
Resolution:  fixed                        |    Keywords:           
------------------------------------------+---------------------------------
Changes (by anonymous):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 After building a new vtiger 4.2.4 with only changesets 5080 and 7200 the
 problem is fixed. I probably over-patched the tiger with some old patches.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1324>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 03:24:47 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 10:24:47 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7345 -
	/vtigercrm/trunk/modules/Accounts/ListViewTop.php
Message-ID: <20060621102447.184E283F37C@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 04:24:43 2006
New Revision: 7345

Log:
onMouseOver event has been removed

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 Wed Jun 21 04:24:43 2006
@@ -70,7 +70,7 @@
 				'AMOUNT' => ($account['amount']),
 				);
 
-		$value[]='<a href="index.php?action=DetailView&module=Accounts&record='.$account['accountid'].'" onMouseOver=getHeadLines("'.$account['tickersymbol'].'")>'.$account['accountname'].'</a>';
+		$value[]='<a href="index.php?action=DetailView&module=Accounts&record='.$account['accountid'].'">'.$account['accountname'].'</a>';
 		$value[]=convertFromDollar($account['amount'],$rate);
 		$entries[$account['accountid']]=$value;	
 	}



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 03:26:08 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 10:26:08 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7346 -
	/vtigercrm/trunk/modules/Accounts/Forms.php
Message-ID: <20060621102608.EC0F86AB216@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 04:26:03 2006
New Revision: 7346

Log:
Forms.php has been removed

Removed:
    vtigercrm/trunk/modules/Accounts/Forms.php



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 03:27:17 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 10:27:17 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7347 -
	/vtigercrm/trunk/modules/Contacts/Forms.php
Message-ID: <20060621102717.A49717E85B1@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 04:27:14 2006
New Revision: 7347

Log:
Forms.php has been removed

Removed:
    vtigercrm/trunk/modules/Contacts/Forms.php



From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 03:33:52 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 10:33:52 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23644=3A_?=
 =?utf-8?q?logs_in_notification_schedular?=
In-Reply-To: <076.c1cfccb88b72051f409d50fc0c74708c@vtiger.fosslabs.com>
References: <076.c1cfccb88b72051f409d50fc0c74708c@vtiger.fosslabs.com>
Message-ID: <085.538242b971b5622f86d9d5fec72ac8b9@vtiger.fosslabs.com>

#644: logs in notification schedular
--------------------------------+-------------------------------------------
  Reporter:  minnie at vtiger.com  |       Owner:  minnie
      Type:  defect             |      Status:  new   
  Priority:  major              |   Milestone:  5.0.0 
 Component:  vtigercrm          |     Version:  5.0.0 
Resolution:                     |    Keywords:        
--------------------------------+-------------------------------------------
Changes (by don):

  * owner:  don => minnie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/644>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 03:35:19 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 10:35:19 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7348 - in
 /vtigercrm/trunk/modules/Contacts: DetailView.php EditView.php
Message-ID: <20060621103519.B85F783F1A1@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 04:35:15 2006
New Revision: 7348

Log:
changes made to get validationdata

Modified:
    vtigercrm/trunk/modules/Contacts/DetailView.php
    vtigercrm/trunk/modules/Contacts/EditView.php

Modified: vtigercrm/trunk/modules/Contacts/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/DetailView.php (original)
+++ vtigercrm/trunk/modules/Contacts/DetailView.php Wed Jun 21 04:35:15 2006
@@ -23,7 +23,6 @@
 require_once('Smarty_setup.php');
 require_once('data/Tracker.php');
 require_once('modules/Contacts/Contact.php');
-require_once('modules/Contacts/Forms.php');
 require_once('include/CustomFieldUtil.php');
 require_once('include/database/PearDatabase.php');
 require_once('include/utils/utils.php');
@@ -111,10 +110,8 @@
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
 
-$contact_tables =Array('contactdetails','crmentity','contactsubdetails','contactscf','contactaddress','customerdetails');
-
 $tabid = getTabid("Contacts");
-$validationData = getDBValidationData($contact_tables,$tabid);
+$validationData = getDBValidationData($focus->tab_name,$tabid);
 $data = split_validationdataArray($validationData);
 
 $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']);

Modified: vtigercrm/trunk/modules/Contacts/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/EditView.php (original)
+++ vtigercrm/trunk/modules/Contacts/EditView.php Wed Jun 21 04:35:15 2006
@@ -23,7 +23,6 @@
 require_once('Smarty_setup.php');
 require_once('data/Tracker.php');
 require_once('modules/Contacts/Contact.php');
-require_once('modules/Contacts/Forms.php');
 require_once('include/CustomFieldUtil.php');
 require_once('include/ComboUtil.php');
 require_once('include/utils/utils.php');
@@ -129,7 +128,6 @@
 $smarty->assign("MOD", $mod_strings);
 $smarty->assign("APP", $app_strings);
 $smarty->assign("NAME",$focus->lastname." ".$focus->firstname);
-$smarty->assign("JAVASCRIPT", get_set_focus_js().get_validate_record_js());
 if(isset($cust_fld))
 {
         $smarty->assign("CUSTOMFIELD", $cust_fld);
@@ -165,11 +163,8 @@
 $smarty->assign("IMAGE_PATH", $image_path);
 $smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']);
 
-
-$contact_tables = Array('contactdetails','crmentity','contactsubdetails','contactscf','contactaddress','customerdetails'); 
-
  $tabid = getTabid("Contacts");
- $validationData = getDBValidationData($contact_tables,$tabid);
+ $validationData = getDBValidationData($focus->tab_name,$tabid);
  $data = split_validationdataArray($validationData);
 
  $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']);



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 03:36:29 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 10:36:29 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7349 -
	/vtigercrm/trunk/modules/Activities/Forms.php
Message-ID: <20060621103629.C3EBB83F39C@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 04:36:25 2006
New Revision: 7349

Log:
Forms.php has been removed

Removed:
    vtigercrm/trunk/modules/Activities/Forms.php



From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 03:41:08 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 10:41:08 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231277=3A?=
 =?utf-8?q?_Can=27t_translate_term_close_without_problem?=
In-Reply-To: <076.d518c5251779ede24caf171d8d809788@vtiger.fosslabs.com>
References: <076.d518c5251779ede24caf171d8d809788@vtiger.fosslabs.com>
Message-ID: <085.8980bdf72d39e35e945e3d8ef4c6129b@vtiger.fosslabs.com>

#1277: Can't translate term close without problem
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  richie
      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

Comment:

 (In [7350]) Fixes #1277

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1277>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 03:41:08 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 10:41:08 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7350 -
	/vtigercrm/trunk/include/utils/ListViewUtils.php
Message-ID: <20060621104109.0EF1583F39C@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 21 04:41:04 2006
New Revision: 7350

Log:
Fixes #1277

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 Jun 21 04:41:04 2006
@@ -192,7 +192,7 @@
 		}
 
 		//Added condition to hide the close column in Related Lists
-		if($name == 'Close' && $relatedlist != '')
+		if($name == $app_strings['Close'] && $relatedlist != '')
 		{
 			// $list_header[] = '';
 		}



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 03:41:34 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 10:41:34 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7351 - in
 /vtigercrm/trunk/modules/Activities: DetailView.php EditView.php
Message-ID: <20060621104134.5D58C83F00B@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 04:41:30 2006
New Revision: 7351

Log:
forms.php has been removed

Modified:
    vtigercrm/trunk/modules/Activities/DetailView.php
    vtigercrm/trunk/modules/Activities/EditView.php

Modified: vtigercrm/trunk/modules/Activities/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Activities/DetailView.php (original)
+++ vtigercrm/trunk/modules/Activities/DetailView.php Wed Jun 21 04:41:30 2006
@@ -23,7 +23,6 @@
 require_once('Smarty_setup.php');
 require_once('data/Tracker.php');
 require_once('modules/Activities/Activity.php');
-require_once('modules/Activities/Forms.php');
 require_once('include/CustomFieldUtil.php');
 require_once('include/database/PearDatabase.php');
 require_once('include/utils/utils.php');
@@ -116,7 +115,6 @@
 $smarty->assign("THEME", $theme);
 $smarty->assign("IMAGE_PATH", $image_path);
 $smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string'].'&activity_mode='.$activity_mode);
-$smarty->assign("JAVASCRIPT", get_set_focus_js().get_validate_record_js());
 $smarty->assign("ID", $focus->id);
 $smarty->assign("NAME", $focus->name);
 
@@ -139,9 +137,8 @@
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
 
- $activities_tables = Array('activity','crmentity');
  $tabid = getTabid($tab_type);
- $validationData = getDBValidationData($activities_tables,$tabid);
+ $validationData = getDBValidationData($focus->tab_name,$tabid);
  $data = split_validationdataArray($validationData);
 
  $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']);

Modified: vtigercrm/trunk/modules/Activities/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/Activities/EditView.php (original)
+++ vtigercrm/trunk/modules/Activities/EditView.php Wed Jun 21 04:41:30 2006
@@ -23,7 +23,6 @@
 require_once('Smarty_setup.php');
 require_once('data/Tracker.php');
 require_once('modules/Activities/Activity.php');
-require_once('modules/Activities/Forms.php');
 require_once('include/database/PearDatabase.php');
 require_once('include/CustomFieldUtil.php');
 require_once('include/ComboUtil.php');
@@ -117,12 +116,10 @@
 $smarty->assign("THEME", $theme);
 $smarty->assign("IMAGE_PATH", $image_path);
 $smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']);
-$smarty->assign("JAVASCRIPT", get_set_focus_js().get_validate_record_js());
 $smarty->assign("ID", $focus->id);
 
- $activities_tables = Array('activity','crmentity'); 
  $tabid = getTabid($tab_type);
- $validationData = getDBValidationData($activities_tables,$tabid);
+ $validationData = getDBValidationData($focus->tab_name,$tabid);
  $data = split_validationdataArray($validationData);
 
  $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']);



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 03:44:47 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 10:44:47 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7352 - in
 /vtigercrm/trunk/modules/Campaigns: DetailView.php EditView.php
Message-ID: <20060621104447.4E67E83F00B@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 04:44:43 2006
New Revision: 7352

Log:
changes made to get validationdata

Modified:
    vtigercrm/trunk/modules/Campaigns/DetailView.php
    vtigercrm/trunk/modules/Campaigns/EditView.php

Modified: vtigercrm/trunk/modules/Campaigns/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Campaigns/DetailView.php (original)
+++ vtigercrm/trunk/modules/Campaigns/DetailView.php Wed Jun 21 04:44:43 2006
@@ -56,9 +56,8 @@
 $smarty->assign("ID", $_REQUEST['record']);
 
 
-$campaign_tables = Array('campaign','crmentity','campaignscf');
 $tabid = getTabid("Campaigns");
-$validationData = getDBValidationData($campaign_tables,$tabid);
+$validationData = getDBValidationData($focus->tab_name,$tabid);
 $data = split_validationdataArray($validationData);
 
 $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']);

Modified: vtigercrm/trunk/modules/Campaigns/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/Campaigns/EditView.php (original)
+++ vtigercrm/trunk/modules/Campaigns/EditView.php Wed Jun 21 04:44:43 2006
@@ -88,9 +88,8 @@
 $smarty->assign("IMAGE_PATH", $image_path);
 $smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']);
 
-$campaign_tables = Array('campaign','crmentity','campaignscf');
 $tabid = getTabid("Campaigns");
-$validationData = getDBValidationData($campaign_tables,$tabid);
+$validationData = getDBValidationData($focus->tab_name,$tabid);
 $data = split_validationdataArray($validationData);
 
 $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']);



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 03:46:56 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 10:46:56 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7353 -
 /vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
Message-ID: <20060621104657.4C5AB83F00B@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 21 04:46:45 2006
New Revision: 7353

Log:
fixed the role issue 

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

Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original)
+++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Wed Jun 21 04:46:45 2006
@@ -1459,7 +1459,9 @@
 		//Insert into vtiger_role2profile
 		$this->db->query("insert into vtiger_role2profile values ('H".$role2_id."',".$profile1_id.")");
 		$this->db->query("insert into vtiger_role2profile values ('H".$role3_id."',".$profile2_id.")");
-	
+	  $this->db->query("insert into vtiger_role2profile values ('H".$role4_id."',".$profile2_id.")");
+		$this->db->query("insert into vtiger_role2profile values ('H".$role5_id."',".$profile2_id.")"); 
+	   
 		//Insert into vtiger_profile2field
 			
                 insertProfile2field($profile1_id);



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 03:49:46 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 10:49:46 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7354 -
	/vtigercrm/trunk/modules/Emails/Forms.php
Message-ID: <20060621104946.078FA83F00B@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 04:49:43 2006
New Revision: 7354

Log:
forms.php has been removed

Removed:
    vtigercrm/trunk/modules/Emails/Forms.php



From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 03:50:28 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 10:50:28 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=23781=3A_?=
	=?utf-8?q?My_Preferences?=
In-Reply-To: <076.de29f722ccd714a4c6614d03a0a6957f@vtiger.fosslabs.com>
References: <076.de29f722ccd714a4c6614d03a0a6957f@vtiger.fosslabs.com>
Message-ID: <085.46ab0116d3d7d7b9576042dde780edb4@vtiger.fosslabs.com>

#781: My Preferences
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  Richie
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 This will be solved in a different manner.
 We are introducing the User Related List where this info will be displayed
 in a list format instead of in a comma separated format.

 I am closing this ticket. In case, you feel there be any issues,
 do feel free to reopen it.

 Richie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/781>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 03:53:17 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 10:53:17 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7355 - in
 /vtigercrm/trunk/modules/Emails: DetailView.php EditView.php
Message-ID: <20060621105317.840B983F3A7@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 04:53:13 2006
New Revision: 7355

Log:
forms.php has been removed

Modified:
    vtigercrm/trunk/modules/Emails/DetailView.php
    vtigercrm/trunk/modules/Emails/EditView.php

Modified: vtigercrm/trunk/modules/Emails/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/DetailView.php (original)
+++ vtigercrm/trunk/modules/Emails/DetailView.php Wed Jun 21 04:53:13 2006
@@ -23,7 +23,6 @@
 require_once('Smarty_setup.php');
 require_once('data/Tracker.php');
 require_once('modules/Emails/Email.php');
-require_once('modules/Emails/Forms.php');
 require_once('include/upload_file.php');
 require_once('include/database/PearDatabase.php');
 require_once('include/utils/utils.php');
@@ -143,7 +142,6 @@
 $smarty->assign("SINGLE_MOD",$app_strings['Email']);
 
 $smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']);
-$smarty->assign("JAVASCRIPT", get_set_focus_js().get_validate_record_js());
 
 if(isPermitted("Emails","EditView",$_REQUEST['record']) == 'yes')
 	$smarty->assign("EDIT_DUPLICATE","permitted");

Modified: vtigercrm/trunk/modules/Emails/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/EditView.php (original)
+++ vtigercrm/trunk/modules/Emails/EditView.php Wed Jun 21 04:53:13 2006
@@ -23,7 +23,6 @@
 require_once('Smarty_setup.php');
 require_once('data/Tracker.php');
 require_once('modules/Emails/Email.php');
-require_once('modules/Emails/Forms.php');
 require_once('include/utils/utils.php');
 require_once('include/utils/UserInfoUtil.php');
 require_once('include/FormValidationUtil.php');
@@ -233,7 +232,6 @@
 $smarty->assign("THEME", $theme);
 $smarty->assign("IMAGE_PATH", $image_path);
 $smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']);
-$smarty->assign("JAVASCRIPT", get_set_focus_js().get_validate_record_js());
 $smarty->assign("ID", $focus->id);
 $smarty->assign("ENTITY_ID", $_REQUEST["record"]);
 $smarty->assign("ENTITY_TYPE",$_REQUEST["email_directing_module"]);
@@ -255,9 +253,6 @@
 	$change_parent_button = "<input title='".$app_strings['LBL_CHANGE_BUTTON_TITLE']."' tabindex='2' accessKey='".$app_strings['LBL_CHANGE_BUTTON_KEY']."' type='button' class='button' value='".$app_strings['LBL_CHANGE_BUTTON_LABEL']."' name='button' LANGUAGE=javascript onclick='return window.open(\"index.php?module=\"+ document.EditView.parent_type.value + \"&action=Popup&html=Popup_picker&form=TasksEditView\",\"test\",\"width=600,height=400,resizable=1,scrollbars=1\");'>";
 	$smarty->assign("CHANGE_PARENT_BUTTON", $change_parent_button);
 }
-
-$email_tables = Array('emails','crmentity','activity'); 
-$tabid = getTabid("Emails");
 
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 03:54:20 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 10:54:20 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7356 -
	/vtigercrm/trunk/modules/Faq/Forms.php
Message-ID: <20060621105420.47DEA83F00B@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 04:54:16 2006
New Revision: 7356

Log:
forms.php has been removed

Removed:
    vtigercrm/trunk/modules/Faq/Forms.php



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 03:57:20 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 10:57:20 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7357 - in
 /vtigercrm/trunk/modules/Faq: DetailView.php EditView.php
Message-ID: <20060621105721.0F80C83F3A7@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 04:57:16 2006
New Revision: 7357

Log:
changes made to get validationdata

Modified:
    vtigercrm/trunk/modules/Faq/DetailView.php
    vtigercrm/trunk/modules/Faq/EditView.php

Modified: vtigercrm/trunk/modules/Faq/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Faq/DetailView.php (original)
+++ vtigercrm/trunk/modules/Faq/DetailView.php Wed Jun 21 04:57:16 2006
@@ -82,9 +82,8 @@
 
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
-
-$faq_tables = Array('faq');
-$validationData = getDBValidationData($faq_tables);
+$tabid = getTabid("Faq");
+$validationData = getDBValidationData($focus->tab_name,$tabid);
 $data = split_validationdataArray($validationData);
 
 $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']);

Modified: vtigercrm/trunk/modules/Faq/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/Faq/EditView.php (original)
+++ vtigercrm/trunk/modules/Faq/EditView.php Wed Jun 21 04:57:16 2006
@@ -95,10 +95,9 @@
 $smarty->assign("CALENDAR_DATEFORMAT", parse_calendardate($app_strings['NTC_DATE_FORMAT']));
 
 
-$faq_tables = Array('faq'); 
-
-$validationData = getDBValidationData($faq_tables);
- $data = split_validationdataArray($validationData);
+$tabid = getTabid("Faq");
+$validationData = getDBValidationData($focus->tab_name,$tabid);
+$data = split_validationdataArray($validationData);
 
  $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']);
  $smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']);



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 03:58:18 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 10:58:18 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7358 -
	/vtigercrm/trunk/modules/HelpDesk/Forms.php
Message-ID: <20060621105818.0FF3383F3A7@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 04:58:14 2006
New Revision: 7358

Log:
forms.php has been removed

Removed:
    vtigercrm/trunk/modules/HelpDesk/Forms.php



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 04:02:52 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 11:02:52 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7359 -
	/vtigercrm/trunk/Smarty/templates/GroupEditView.tpl
Message-ID: <20060621110252.0A9D883F3B3@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 21 05:02:40 2006
New Revision: 7359

Log:
fixed the group name validation issue

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

Modified: vtigercrm/trunk/Smarty/templates/GroupEditView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/GroupEditView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/GroupEditView.tpl Wed Jun 21 05:02:40 2006
@@ -133,6 +133,12 @@
 	formSelectColumnString();
 	if( !emptyCheck( "groupName", "Group Name" ) )
 		return false;
+
+	if(trim(document.newGroupForm.groupName.value) == "")
+	{ldelim}	
+		alert('Group Name cannot be none');
+		return false;		
+	{rdelim}
 
 	//alert(document.newGroupForm.selectedColumnsString.value);
 	if(document.newGroupForm.selectedColumnsString.value.replace(/^\s+/g, '').replace(/\s+$/g, '').length==0)



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 04:11:14 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 11:11:14 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7360 - in
 /vtigercrm/trunk/modules/HelpDesk: DetailView.php EditView.php
Message-ID: <20060621111114.AF15283F015@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 05:11:10 2006
New Revision: 7360

Log:
changes made to get validationdata and forms.php removed

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

Modified: vtigercrm/trunk/modules/HelpDesk/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/DetailView.php (original)
+++ vtigercrm/trunk/modules/HelpDesk/DetailView.php Wed Jun 21 05:11:10 2006
@@ -11,7 +11,6 @@
 
 require_once('include/database/PearDatabase.php');
 require_once('Smarty_setup.php');
-require_once('include/utils/utils.php');
 require_once('modules/HelpDesk/HelpDesk.php');
 require_once('include/utils/utils.php');
 
@@ -91,9 +90,8 @@
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
 
-$ticket_tables = Array('troubletickets','crmentity','ticketcf');
 $tabid = getTabid("HelpDesk");
-$validationData = getDBValidationData($ticket_tables,$tabid);
+$validationData = getDBValidationData($focus->tab_name,$tabid);
 $data = split_validationdataArray($validationData);
 $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']);
 $smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']);

Modified: vtigercrm/trunk/modules/HelpDesk/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/EditView.php (original)
+++ vtigercrm/trunk/modules/HelpDesk/EditView.php Wed Jun 21 05:11:10 2006
@@ -12,7 +12,6 @@
 require_once('Smarty_setup.php');
 require_once('include/utils/utils.php');
 require_once('modules/HelpDesk/HelpDesk.php');
-require_once('modules/HelpDesk/Forms.php');
 require_once('include/FormValidationUtil.php');
 
 global $app_strings,$mod_strings,$theme,$currentModule;
@@ -90,9 +89,8 @@
 $smarty->assign("IMAGE_PATH", $image_path);
 $smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']);
 
-$ticket_tables = Array('troubletickets','crmentity','ticketcf');
 $tabid = getTabid("HelpDesk");
-$validationData = getDBValidationData($ticket_tables,$tabid);
+$validationData = getDBValidationData($focus->tab_name,$tabid);
 $data = split_validationdataArray($validationData);
 
 $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']);



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 04:12:04 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 11:12:04 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7361 -
	/vtigercrm/trunk/modules/Invoice/Forms.php
Message-ID: <20060621111204.AAF317E85B1@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 05:12:01 2006
New Revision: 7361

Log:
forms.php has been removed

Removed:
    vtigercrm/trunk/modules/Invoice/Forms.php



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 04:19:24 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 11:19:24 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7362 - in
 /vtigercrm/trunk/modules/Invoice: DetailView.php EditView.php
Message-ID: <20060621111925.1F65283F015@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 05:19:20 2006
New Revision: 7362

Log:
changes made to get validationdata and forms.php removed

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

Modified: vtigercrm/trunk/modules/Invoice/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Invoice/DetailView.php (original)
+++ vtigercrm/trunk/modules/Invoice/DetailView.php Wed Jun 21 05:19:20 2006
@@ -81,9 +81,8 @@
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
 
-$invoice_tables = Array('invoice','invoicebillads','invoiceshipads','invoicecf');
 $tabid = getTabid("Invoice");
-$validationData = getDBValidationData($invoice_tables,$tabid);
+$validationData = getDBValidationData($focus->tab_name,$tabid);
 $data = split_validationdataArray($validationData);
 $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']);
 $smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']);

Modified: vtigercrm/trunk/modules/Invoice/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/Invoice/EditView.php (original)
+++ vtigercrm/trunk/modules/Invoice/EditView.php Wed Jun 21 05:19:20 2006
@@ -25,7 +25,6 @@
 require_once('modules/Invoice/Invoice.php');
 require_once('modules/Quotes/Quote.php');
 require_once('modules/SalesOrder/SalesOrder.php');
-require_once('modules/Invoice/Forms.php');
 require_once('modules/Potentials/Opportunity.php');
 require_once('include/CustomFieldUtil.php');
 require_once('include/ComboUtil.php');
@@ -316,9 +315,8 @@
 
 
 
-$invoice_tables = Array('invoice','invoicebillads','invoiceshipads','invoicecf'); 
  $tabid = getTabid("Invoice");
- $validationData = getDBValidationData($invoice_tables,$tabid);
+ $validationData = getDBValidationData($focus->tab_name,$tabid);
  $data = split_validationdataArray($validationData);
 $category = getParentTab();
 $smarty->assign("CATEGORY",$category);



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 04:20:38 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 11:20:38 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7363 -
	/vtigercrm/trunk/modules/Leads/Forms.php
Message-ID: <20060621112038.BDD497E85B1@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 05:20:35 2006
New Revision: 7363

Log:
forms.php has been removed

Removed:
    vtigercrm/trunk/modules/Leads/Forms.php



From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 04:22:32 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 11:22:32 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23429=3A_?=
 =?utf-8?q?gave_spacebar_in_groupname_and_saved_with_no_exception?=
In-Reply-To: <076.719b3ac02cf0867c6d11c2368958a786@vtiger.fosslabs.com>
References: <076.719b3ac02cf0867c6d11c2368958a786@vtiger.fosslabs.com>
Message-ID: <085.c291942d296445506a81966a81d91cc3@vtiger.fosslabs.com>

#429: gave spacebar in groupname and saved with no exception
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  don   
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:  group 
------------------------+---------------------------------------------------
Changes (by don):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/429>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 04:24:09 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 11:24:09 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23846=3A_?=
 =?utf-8?q?Member_Of_Field_can_be_moved_to_Basic_Information_Tab?=
In-Reply-To: <076.76722003fcd7d8c307a684829482c1f2@vtiger.fosslabs.com>
References: <076.76722003fcd7d8c307a684829482c1f2@vtiger.fosslabs.com>
Message-ID: <085.a39245539c0547105e59cd866565e24d@vtiger.fosslabs.com>

#846: Member Of Field can be moved to Basic Information Tab
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  mangai
      Type:  defect     |      Status:  new   
  Priority:  minor      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  don => mangai

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/846>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 04:24:59 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 11:24:59 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7364 - in
 /vtigercrm/trunk/modules/Leads: DetailView.php EditView.php
Message-ID: <20060621112500.12C0183F3BA@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 05:24:55 2006
New Revision: 7364

Log:
changes made to get validationdata and forms.php removed

Modified:
    vtigercrm/trunk/modules/Leads/DetailView.php
    vtigercrm/trunk/modules/Leads/EditView.php

Modified: vtigercrm/trunk/modules/Leads/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/DetailView.php (original)
+++ vtigercrm/trunk/modules/Leads/DetailView.php Wed Jun 21 05:24:55 2006
@@ -15,7 +15,6 @@
 require_once('Smarty_setup.php');
 require_once('data/Tracker.php');
 require_once('modules/Leads/Lead.php');
-require_once('modules/Leads/Forms.php');
 require_once('include/database/PearDatabase.php');
 require_once('include/CustomFieldUtil.php');
 require_once('include/utils/utils.php');
@@ -110,9 +109,8 @@
         $smarty->assign("TOPTIONS",$optionString);
 }
 
-$lead_tables = Array('leaddetails','crmentity','leadsubdetails','leadaddress','leadscf');
 $tabid = getTabid("Leads");
-$validationData = getDBValidationData($lead_tables,$tabid);
+$validationData = getDBValidationData($focus->tab_name,$tabid);
 $data = split_validationdataArray($validationData);
 
 $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']);

Modified: vtigercrm/trunk/modules/Leads/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/EditView.php (original)
+++ vtigercrm/trunk/modules/Leads/EditView.php Wed Jun 21 05:24:55 2006
@@ -15,7 +15,6 @@
 require_once('Smarty_setup.php');
 require_once('data/Tracker.php');
 require_once('modules/Leads/Lead.php');
-require_once('modules/Leads/Forms.php');
 require_once('include/database/PearDatabase.php');
 require_once('include/CustomFieldUtil.php');
 require_once('include/ComboUtil.php');
@@ -88,7 +87,6 @@
 $smarty->assign("RETURN_VIEWNAME", $_REQUEST['return_viewname']);
 $smarty->assign("THEME", $theme);
 $smarty->assign("IMAGE_PATH", $image_path);$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id());
-$smarty->assign("JAVASCRIPT", get_set_focus_js().get_validate_record_js());
 $smarty->assign("ID", $focus->id);
 $smarty->assign("MODULE",$currentModule);
 $smarty->assign("SINGLE_MOD",$app_strings['Lead']);
@@ -100,9 +98,8 @@
 $smarty->assign("CALENDAR_DATEFORMAT", parse_calendardate($app_strings['NTC_DATE_FORMAT']));
 
 
- $lead_tables = Array('leaddetails','crmentity','leadsubdetails','leadaddress','leadscf'); 
  $tabid = getTabid("Leads");
- $validationData = getDBValidationData($lead_tables,$tabid);
+ $validationData = getDBValidationData($focus->tab_name,$tabid);
  $data = split_validationdataArray($validationData);
 
  $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']);



From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 04:25:03 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 11:25:03 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23969=3A_?=
 =?utf-8?q?message_under_Global_Privileges_=3E_Edit_all?=
In-Reply-To: <076.454c7d3f6ef703a2e33c86300e860846@vtiger.fosslabs.com>
References: <076.454c7d3f6ef703a2e33c86300e860846@vtiger.fosslabs.com>
Message-ID: <085.27cb5fec0ead1a2a2d1f38df84cc0820@vtiger.fosslabs.com>

#969: message under Global Privileges > Edit all
------------------------+---------------------------------------------------
  Reporter:  mangai     |       Owner:  don   
      Type:  defect     |      Status:  closed
  Priority:  minor      |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  invalid    |    Keywords:        
------------------------+---------------------------------------------------
Changes (by don):

  * resolution:  => invalid
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/969>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 04:26:51 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 11:26:51 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7365 -
	/vtigercrm/trunk/modules/Products/Forms.php
Message-ID: <20060621112651.87C3483F1B7@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 05:26:48 2006
New Revision: 7365

Log:
forms.php has been removed

Removed:
    vtigercrm/trunk/modules/Products/Forms.php



From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 04:27:15 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 11:27:15 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23925=3A_?=
 =?utf-8?q?User_=26_Access_Mangement_=3E_Users?=
In-Reply-To: <076.985552b2efff10758471252d4d2fc42c@vtiger.fosslabs.com>
References: <076.985552b2efff10758471252d4d2fc42c@vtiger.fosslabs.com>
Message-ID: <085.ec873872a022bb5ad3b7d156ae66f035@vtiger.fosslabs.com>

#925: User & Access Mangement > Users
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  don   
      Type:  defect     |      Status:  closed
  Priority:  minor      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by don):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/925>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 04:30:24 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 11:30:24 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23778=3A_?=
 =?utf-8?q?Update_Home_Page_Block_Order?=
In-Reply-To: <076.1fa487f17244c9f4a65d58c7d48e16d4@vtiger.fosslabs.com>
References: <076.1fa487f17244c9f4a65d58c7d48e16d4@vtiger.fosslabs.com>
Message-ID: <085.b4d39668972e833a82b7830bda384593@vtiger.fosslabs.com>

#778: Update Home Page Block Order
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  don   
      Type:  defect     |      Status:  closed
  Priority:  minor      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by don):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/778>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 04:32:30 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 11:32:30 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7366 - in
 /vtigercrm/trunk/modules/Products: DetailView.php EditView.php
Message-ID: <20060621113230.D26EF83F3BA@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 05:32:26 2006
New Revision: 7366

Log:
changes made to get validationdata and forms.php removed

Modified:
    vtigercrm/trunk/modules/Products/DetailView.php
    vtigercrm/trunk/modules/Products/EditView.php

Modified: vtigercrm/trunk/modules/Products/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Products/DetailView.php (original)
+++ vtigercrm/trunk/modules/Products/DetailView.php Wed Jun 21 05:32:26 2006
@@ -10,7 +10,6 @@
  ********************************************************************************/
 require_once('include/database/PearDatabase.php');
 require_once('Smarty_setup.php');
-require_once('include/utils/utils.php');
 require_once('modules/Products/Product.php');
 require_once('include/utils/utils.php');
 
@@ -79,8 +78,8 @@
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
 
- $product_tables = Array('products','productcf','productcollaterals');
- $validationData = getDBValidationData($product_tables);
+ $tabid = getTabid("Products");
+ $validationData = getDBValidationData($focus->tab_name,$tabid);
  $data = split_validationdataArray($validationData);
  $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']);
  $smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']);

Modified: vtigercrm/trunk/modules/Products/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/Products/EditView.php (original)
+++ vtigercrm/trunk/modules/Products/EditView.php Wed Jun 21 05:32:26 2006
@@ -164,9 +164,8 @@
 
 
 
-$product_tables = Array('products','productcf','productcollaterals'); 
-
- $validationData = getDBValidationData($product_tables);
+ $tabid = getTabid("Products");
+ $validationData = getDBValidationData($focus->tab_name,$tabid);
  $data = split_validationdataArray($validationData);
 if($errormessage==2)
 {



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 04:35:56 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 11:35:56 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7367 - in
 /vtigercrm/trunk/modules/PriceBooks: DetailView.php EditView.php
Message-ID: <20060621113556.4FF8E83F3BA@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 05:35:51 2006
New Revision: 7367

Log:
changes made to get validationdata and forms.php removed

Modified:
    vtigercrm/trunk/modules/PriceBooks/DetailView.php
    vtigercrm/trunk/modules/PriceBooks/EditView.php

Modified: vtigercrm/trunk/modules/PriceBooks/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/PriceBooks/DetailView.php (original)
+++ vtigercrm/trunk/modules/PriceBooks/DetailView.php Wed Jun 21 05:35:51 2006
@@ -60,9 +60,8 @@
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
 
-$pb_tables = Array('pricebook','pricebookcf');
-
-$validationData = getDBValidationData($pb_tables);
+$tabid = getTabid("PriceBooks");
+$validationData = getDBValidationData($focus->tab_name,$tabid);
 $data = split_validationdataArray($validationData);
 $category = getParentTab();
 $smarty->assign("CATEGORY",$category);

Modified: vtigercrm/trunk/modules/PriceBooks/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/PriceBooks/EditView.php (original)
+++ vtigercrm/trunk/modules/PriceBooks/EditView.php Wed Jun 21 05:35:51 2006
@@ -78,9 +78,8 @@
 $smarty->assign("IMAGE_PATH", $image_path);$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']);
 
 
-$pb_tables = Array('pricebook','pricebookcf'); 
-
-$validationData = getDBValidationData($pb_tables);
+$tabid = getTabid("PriceBooks");
+$validationData = getDBValidationData($focus->tab_name,$tabid);
 $data = split_validationdataArray($validationData);
 $category = getParentTab();
 $smarty->assign("CATEGORY",$category);



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 04:36:24 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 11:36:24 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7368 -
 /vtigercrm/trunk/modules/Home/language/en_us.lang.php
Message-ID: <20060621113624.3A88D83F3BA@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 05:36:20 2006
New Revision: 7368

Log:
Updated language file for homepage

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

Modified: vtigercrm/trunk/modules/Home/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Home/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Home/language/en_us.lang.php Wed Jun 21 05:36:20 2006
@@ -43,8 +43,8 @@
 'LBL_LEADS_BY_SOURCE'=>'Leads By Source',
 'LBL_LEADS_BY_STATUS'=>'Leads By Status',
 
-'LBL_UPCOMING_EVENTS'=>'Upcoming Events',
-'LBL_PENDING_EVENTS'=>'Pending Events',
+'lBL_UPCOMING_EVENTS'=>'Upcoming Activities',
+'LBL_PENDING_EVENTS'=>'Pending Activities',
 'LBL_TODAYEVENT'=>'Events for Last Ten days',
 
 



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 04:36:56 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 11:36:56 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7369 -
	/vtigercrm/trunk/modules/Notes/Forms.php
Message-ID: <20060621113656.9474783F3BA@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 05:36:53 2006
New Revision: 7369

Log:
forms.php has been removed

Removed:
    vtigercrm/trunk/modules/Notes/Forms.php



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 04:38:20 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 11:38:20 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7370 -
	/vtigercrm/trunk/modules/Contacts/DelImage.php
Message-ID: <20060621113820.4EEBA83F3C8@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 21 05:38:16 2006
New Revision: 7370

Log:
file to delete the contact related image, fixes #440

Added:
    vtigercrm/trunk/modules/Contacts/DelImage.php



From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 04:39:03 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 11:39:03 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23440=3A_?=
 =?utf-8?q?not_able_to_delete_the_contact_image_from_contacts?=
In-Reply-To: <076.995242b6a5aeaa903d7e9a4ad6a99c1c@vtiger.fosslabs.com>
References: <076.995242b6a5aeaa903d7e9a4ad6a99c1c@vtiger.fosslabs.com>
Message-ID: <085.c632ffff4d5a1c05073d6713790cad20@vtiger.fosslabs.com>

#440: not able to delete the contact image from contacts
------------------------+---------------------------------------------------
  Reporter:  don        |       Owner:  Richie
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Comment (by richie):

 (In [7371]) fixes #440

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/440>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 04:39:03 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 11:39:03 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7371 -
	/vtigercrm/trunk/Smarty/templates/DisplayFields.tpl
Message-ID: <20060621113903.7FFCC83F3CD@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 21 05:38:58 2006
New Revision: 7371

Log:
fixes #440

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

Modified: vtigercrm/trunk/Smarty/templates/DisplayFields.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DisplayFields.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DisplayFields.tpl Wed Jun 21 05:38:58 2006
@@ -450,7 +450,11 @@
 				{else}
 					<input name="{$fldname}"  type="file" value="{$maindata[3].0.name}" tabindex="{$vt_tab}" />
 					<input type="hidden" name="id" value=""/>
-					{$maindata[3].0.name}
+					{ if $maindata[3].0.name != "" }
+						
+				<div id="replaceimage">[{$maindata[3].0.name}] <a href="javascript:;" onClick="delimage({$ID})">Del</a></div>
+					{/if}
+					
 				{/if}
 			</td>
 
@@ -681,5 +685,21 @@
 				alert("Please enter Valid TAX value");
 	{rdelim}	
 
+function delimage(id)
+{ldelim}
+	new Ajax.Request(
+		'index.php',
+		{ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+			method: 'post',
+			postBody: 'module=Contacts&action=ContactsAjax&file=DelImage&recordid='+id,
+			onComplete: function(response)
+				    {ldelim}
+					$("replaceimage").innerHTML=response.responseText;
+				    {rdelim}
+		{rdelim}
+	);
+
+{rdelim}
+
 
 </script>



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 04:42:16 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 11:42:16 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7372 - in
 /vtigercrm/trunk/modules/Notes: DetailView.php EditView.php
Message-ID: <20060621114216.D640383F3CA@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 05:42:12 2006
New Revision: 7372

Log:
changes made to get validationdata and forms.php removed

Modified:
    vtigercrm/trunk/modules/Notes/DetailView.php
    vtigercrm/trunk/modules/Notes/EditView.php

Modified: vtigercrm/trunk/modules/Notes/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Notes/DetailView.php (original)
+++ vtigercrm/trunk/modules/Notes/DetailView.php Wed Jun 21 05:42:12 2006
@@ -23,7 +23,6 @@
 require_once('data/Tracker.php');
 require_once('Smarty_setup.php');
 require_once('modules/Notes/Note.php');
-require_once('modules/Notes/Forms.php');
 require_once('include/upload_file.php');
 require_once('include/utils/utils.php');
 global $app_strings;
@@ -84,7 +83,6 @@
 
 $smarty->assign("THEME", $theme);
 $smarty->assign("IMAGE_PATH", $image_path);$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']);
-$smarty->assign("JAVASCRIPT", get_set_focus_js().get_validate_record_js());
 $smarty->assign("ID", $focus->id);
 $category = getParentTab();
 $smarty->assign("CATEGORY",$category);
@@ -105,6 +103,13 @@
 
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
+$tabid = getTabid("Notes");
+ $validationData = getDBValidationData($focus->tab_name,$tabid);
+ $data = split_validationdataArray($validationData);
+
+ $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']);
+ $smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']);
+ $smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']);
 
 $smarty->assign("MODULE",$currentModule);
 $smarty->display("DetailView.tpl");

Modified: vtigercrm/trunk/modules/Notes/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/Notes/EditView.php (original)
+++ vtigercrm/trunk/modules/Notes/EditView.php Wed Jun 21 05:42:12 2006
@@ -23,7 +23,6 @@
 require_once('Smarty_setup.php');
 require_once('data/Tracker.php');
 require_once('modules/Notes/Note.php');
-require_once('modules/Notes/Forms.php');
 require_once('include/utils/utils.php');
 
 global $app_strings,$app_list_strings,$mod_strings,$theme,$currentModule;
@@ -154,7 +153,6 @@
 $smarty->assign("THEME", $theme);
 $smarty->assign("IMAGE_PATH", $image_path);
 $smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']);
-$smarty->assign("JAVASCRIPT", get_set_focus_js().get_validate_record_js());
 $smarty->assign("ID", $focus->id);
 $smarty->assign("OLD_ID", $old_id );
 
@@ -177,6 +175,13 @@
 
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
+$tabid = getTabid("Notes");
+ $validationData = getDBValidationData($focus->tab_name,$tabid);
+ $data = split_validationdataArray($validationData);
+
+ $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']);
+ $smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']);
+ $smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']);
 
 if($focus->mode == 'edit')
 	$smarty->display("salesEditView.tpl");



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 04:45:34 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 11:45:34 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7373 - in
 /vtigercrm/trunk/modules/Vendors: DetailView.php EditView.php
Message-ID: <20060621114534.9D99C83F3CA@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 05:45:30 2006
New Revision: 7373

Log:
changes made to get validationdata

Modified:
    vtigercrm/trunk/modules/Vendors/DetailView.php
    vtigercrm/trunk/modules/Vendors/EditView.php

Modified: vtigercrm/trunk/modules/Vendors/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Vendors/DetailView.php (original)
+++ vtigercrm/trunk/modules/Vendors/DetailView.php Wed Jun 21 05:45:30 2006
@@ -62,8 +62,8 @@
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
 
-$vendor_tables = Array('vendor','vendorcf');
-$validationData = getDBValidationData($vendor_tables);
+$tabid = getTabid("Vendors");
+$validationData = getDBValidationData($focus->tab_name,$tabid);
 $data = split_validationdataArray($validationData);
 $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']);
 $smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']);

Modified: vtigercrm/trunk/modules/Vendors/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/Vendors/EditView.php (original)
+++ vtigercrm/trunk/modules/Vendors/EditView.php Wed Jun 21 05:45:30 2006
@@ -83,10 +83,8 @@
 $smarty->assign("THEME", $theme);
 $smarty->assign("IMAGE_PATH", $image_path);$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']);
 
-
-$vendor_tables = Array('vendor','vendorcf'); 
-
-$validationData = getDBValidationData($vendor_tables);
+$tabid = getTabid("Vendors");
+$validationData = getDBValidationData($focus->tab_name,$tabid);
 $data = split_validationdataArray($validationData);
 $category = getParentTab();
 $smarty->assign("CATEGORY",$category);



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 04:46:27 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 11:46:27 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7374 -
	/vtigercrm/trunk/modules/Quotes/Forms.php
Message-ID: <20060621114627.6FA2183F3CA@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 05:46:24 2006
New Revision: 7374

Log:
forms.php has been removed

Removed:
    vtigercrm/trunk/modules/Quotes/Forms.php



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 04:50:32 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 11:50:32 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7375 - in
 /vtigercrm/trunk/modules/Quotes: DetailView.php EditView.php
Message-ID: <20060621115032.B949383F3CA@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 05:50:28 2006
New Revision: 7375

Log:
changes made to get validationdata

Modified:
    vtigercrm/trunk/modules/Quotes/DetailView.php
    vtigercrm/trunk/modules/Quotes/EditView.php

Modified: vtigercrm/trunk/modules/Quotes/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Quotes/DetailView.php (original)
+++ vtigercrm/trunk/modules/Quotes/DetailView.php Wed Jun 21 05:50:28 2006
@@ -91,49 +91,13 @@
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
 
- $quote_tables = Array('quotes','quotesbillads','quotesshipads','quotescf'); 
  $tabid = getTabid("Quotes");
- $validationData = getDBValidationData($quote_tables,$tabid);
- $fieldName = '';
- $fieldLabel = '';
- $fldDataType = '';
+ $validationData = getDBValidationData($focus->tab_name,$tabid);
+ $data = split_validationdataArray($validationData);
 
- $rows = count($validationData);
- foreach($validationData as $fldName => $fldLabel_array)
- {
-   if($fieldName == '')
-   {
-     $fieldName="'".$fldName."'";
-   }
-   else
-   {
-     $fieldName .= ",'".$fldName ."'";
-   }
-   foreach($fldLabel_array as $fldLabel => $datatype)
-   {
-	if($fieldLabel == '')
-	{
-			
-     		$fieldLabel = "'".$fldLabel ."'";
-	}		
-      else
-       {
-      $fieldLabel .= ",'".$fldLabel ."'";
-        }
- 	if($fldDataType == '')
-         {
-      		$fldDataType = "'".$datatype ."'";
-    	}
-	 else
-        {
-       		$fldDataType .= ",'".$datatype ."'";
-     	}
-   }
- }
-
-$smarty->assign("VALIDATION_DATA_FIELDNAME",$fieldName);
-$smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$fldDataType);
-$smarty->assign("VALIDATION_DATA_FIELDLABEL",$fieldLabel);$quote_tables = Array('quotes','quotesbillads','quotesshipads'); 
+$smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']);
+$smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']);
+$smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']);
 
 $smarty->display("Inventory/InventoryDetailView.tpl");
 

Modified: vtigercrm/trunk/modules/Quotes/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/Quotes/EditView.php (original)
+++ vtigercrm/trunk/modules/Quotes/EditView.php Wed Jun 21 05:50:28 2006
@@ -203,9 +203,8 @@
 
 
 
-$quote_tables = Array('quotes','quotesbillads','quotesshipads','quotescf'); 
  $tabid = getTabid("Quotes");
- $validationData = getDBValidationData($quote_tables,$tabid);
+ $validationData = getDBValidationData($focus->tab_name,$tabid);
  $data = split_validationdataArray($validationData);
  
  $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']);



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 04:51:26 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 11:51:26 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7376 -
	/vtigercrm/trunk/modules/SalesOrder/Forms.php
Message-ID: <20060621115126.9B8C683F3CA@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 05:51:23 2006
New Revision: 7376

Log:
forms.php has been removed

Removed:
    vtigercrm/trunk/modules/SalesOrder/Forms.php



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 04:55:17 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 11:55:17 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7377 - in
 /vtigercrm/trunk/modules/SalesOrder: DetailView.php EditView.php
Message-ID: <20060621115517.EE62683F3CA@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 05:55:13 2006
New Revision: 7377

Log:
changes made to get validationdata

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

Modified: vtigercrm/trunk/modules/SalesOrder/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/SalesOrder/DetailView.php (original)
+++ vtigercrm/trunk/modules/SalesOrder/DetailView.php Wed Jun 21 05:55:13 2006
@@ -85,9 +85,8 @@
 //Get the associated Products and then display above Terms and Conditions
 $smarty->assign("ASSOCIATED_PRODUCTS",getDetailAssociatedProducts('SalesOrder',$focus));
 
- $so_tables = Array('salesorder','sobillads','soshipads','salesordercf');
  $tabid = getTabid("SalesOrder");
- $validationData = getDBValidationData($so_tables,$tabid);
+ $validationData = getDBValidationData($focus->tab_name,$tabid);
  $data = split_validationdataArray($validationData);
 
  $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']);

Modified: vtigercrm/trunk/modules/SalesOrder/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/SalesOrder/EditView.php (original)
+++ vtigercrm/trunk/modules/SalesOrder/EditView.php Wed Jun 21 05:55:13 2006
@@ -319,9 +319,8 @@
 
 
 
-$so_tables = Array('salesorder','sobillads','soshipads','salesordercf'); 
  $tabid = getTabid("SalesOrder");
- $validationData = getDBValidationData($so_tables,$tabid);
+ $validationData = getDBValidationData($focus->tab_name,$tabid);
  $data = split_validationdataArray($validationData);
 
  $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']);



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 04:55:53 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 11:55:53 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7378 -
	/vtigercrm/trunk/modules/Potentials/Forms.php
Message-ID: <20060621115553.EB0F683F3D6@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 05:55:50 2006
New Revision: 7378

Log:
forms.php has been removed

Removed:
    vtigercrm/trunk/modules/Potentials/Forms.php



From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 04:38:19 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 11:38:19 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23440=3A_?=
 =?utf-8?q?not_able_to_delete_the_contact_image_from_contacts?=
In-Reply-To: <076.995242b6a5aeaa903d7e9a4ad6a99c1c@vtiger.fosslabs.com>
References: <076.995242b6a5aeaa903d7e9a4ad6a99c1c@vtiger.fosslabs.com>
Message-ID: <085.b3af1c15f8b9b9e33a8080b62de9aab1@vtiger.fosslabs.com>

#440: not able to delete the contact image from contacts
------------------------+---------------------------------------------------
  Reporter:  don        |       Owner:  Richie
      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

Comment:

 (In [7370]) file to delete the contact related image, fixes #440

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/440>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 04:59:38 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 11:59:38 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7379 - in
 /vtigercrm/trunk/modules/Potentials: DetailView.php EditView.php
Message-ID: <20060621115938.144A683F3BA@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 05:59:34 2006
New Revision: 7379

Log:
changes made to get validationdata and forms.php removed

Modified:
    vtigercrm/trunk/modules/Potentials/DetailView.php
    vtigercrm/trunk/modules/Potentials/EditView.php

Modified: vtigercrm/trunk/modules/Potentials/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Potentials/DetailView.php (original)
+++ vtigercrm/trunk/modules/Potentials/DetailView.php Wed Jun 21 05:59:34 2006
@@ -23,7 +23,6 @@
 require_once('Smarty_setup.php');
 require_once('data/Tracker.php');
 require_once('modules/Potentials/Opportunity.php');
-require_once('modules/Potentials/Forms.php');
 require_once('include/CustomFieldUtil.php');
 require_once('include/utils/utils.php');
 
@@ -78,9 +77,8 @@
 if(isPermitted("Potentials","Delete",$_REQUEST['record']) == 'yes')
 	$smarty->assign("DELETE","permitted");
 
-$potential_tables = Array('potential','crmentity','potentialscf');
 $tabid = getTabid("Potentials");
-$validationData = getDBValidationData($potential_tables,$tabid);
+$validationData = getDBValidationData($focus->tab_name,$tabid);
 $data = split_validationdataArray($validationData);
 
 $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']);

Modified: vtigercrm/trunk/modules/Potentials/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/Potentials/EditView.php (original)
+++ vtigercrm/trunk/modules/Potentials/EditView.php Wed Jun 21 05:59:34 2006
@@ -23,7 +23,6 @@
 require_once('Smarty_setup.php');
 require_once('data/Tracker.php');
 require_once('modules/Potentials/Opportunity.php');
-require_once('modules/Potentials/Forms.php');
 require_once('include/CustomFieldUtil.php');
 require_once('include/ComboUtil.php');
 require_once('include/utils/utils.php');
@@ -118,15 +117,13 @@
 $smarty->assign("RETURN_VIEWNAME", $_REQUEST['return_viewname']);
 $smarty->assign("THEME", $theme);
 $smarty->assign("IMAGE_PATH", $image_path);$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']);
-$smarty->assign("JAVASCRIPT", get_set_focus_js().get_validate_record_js());
 $smarty->assign("ID", $focus->id);
 $smarty->assign("MODULE",$currentModule);
 $smarty->assign("SINGLE_MOD",$app_strings['Potential']);
 
 
- $potential_tables = Array('potential','crmentity','potentialscf'); 
  $tabid = getTabid("Potentials");
- $validationData = getDBValidationData($potential_tables,$tabid);
+ $validationData = getDBValidationData($focus->tab_name,$tabid);
  $data = split_validationdataArray($validationData);
 
  $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']);



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 05:14:16 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 12:14:16 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7380 -
	/vtigercrm/trunk/include/js/general.js
Message-ID: <20060621121416.7DC7683F3E1@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 06:14:12 2006
New Revision: 7380

Log:
unwanted js function has been removed

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 Wed Jun 21 06:14:12 2006
@@ -1076,26 +1076,6 @@
                 getObj("assign_team").style.display="block"
         }
 }
-//to display type of address for google map
-function showLocateMapMenu()
-    {
-            getObj("dropDownMenu").style.display="block"
-            getObj("dropDownMenu").style.left=findPosX(getObj("locateMap"))
-            getObj("dropDownMenu").style.top=findPosY(getObj("locateMap"))+getObj("locateMap").offsetHeight
-    }
-
-
-function hideLocateMapMenu(ev)
-    {
-            if (browser_ie)
-                    currElement=window.event.srcElement
-            else if (browser_nn4 || browser_nn6)
-                    currElement=ev.target
-
-            if (currElement.id!="locateMap")
-                    if (getObj("dropDownMenu").style.display=="block")
-                            getObj("dropDownMenu").style.display="none"
-    }
 /*
 * javascript function to display the div tag
 * @param divId :: div tag ID



From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 05:16:25 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 12:16:25 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231349=3A?=
	=?utf-8?q?_Dash_Boards_not_working?=
Message-ID: <076.8be5cac7416faf4b2b970e60d7f3e2ae@vtiger.fosslabs.com>

#1349: Dash Boards not working
-----------------------+----------------------------------------------------
 Reporter:  anonymous  |       Owner:  jerrydgeorge
     Type:  defect     |      Status:  new         
 Priority:  blocker    |   Milestone:              
Component:  vtigercrm  |     Version:  5.0.0       
 Keywords:             |  
-----------------------+----------------------------------------------------


-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1349>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 05:18:13 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 12:18:13 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231172=3A?=
 =?utf-8?q?_unable_to_store_any_Ajax_edited_value?=
In-Reply-To: <076.626fce50467ea4fac0273a3fb6aad256@vtiger.fosslabs.com>
References: <076.626fce50467ea4fac0273a3fb6aad256@vtiger.fosslabs.com>
Message-ID: <085.7f7f1a7a707e94901e0b3939b5cf2ab0@vtiger.fosslabs.com>

#1172: unable to store any Ajax edited value
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  Richie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by anonymous):

  * owner:  jerrydgeorge => Richie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1172>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 05:18:21 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 12:18:21 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231132=3A?=
 =?utf-8?q?_creation_of_related_entities_ought_to_be_ajaxified?=
In-Reply-To: <076.343f75f8c959bb0da4c9f8e348afe0b2@vtiger.fosslabs.com>
References: <076.343f75f8c959bb0da4c9f8e348afe0b2@vtiger.fosslabs.com>
Message-ID: <085.d6860ea13618ab21225f4f1a98716999@vtiger.fosslabs.com>

#1132: creation of related entities ought to be ajaxified
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  Richie     
      Type:  defect     |      Status:  new        
  Priority:  major      |   Milestone:             
 Component:  vtigercrm  |     Version:  5.0.1      
Resolution:             |    Keywords:  performance
------------------------+---------------------------------------------------
Changes (by anonymous):

  * owner:  jerrydgeorge => Richie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1132>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 05:18:28 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 12:18:28 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231130=3A?=
 =?utf-8?q?_more_information_tab_ajaxified?=
In-Reply-To: <076.d1ddb83143327b9a11f01d548facd399@vtiger.fosslabs.com>
References: <076.d1ddb83143327b9a11f01d548facd399@vtiger.fosslabs.com>
Message-ID: <085.89a72f959f65cc982664dea5a7b33e7d@vtiger.fosslabs.com>

#1130: more information tab ajaxified
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  Richie     
      Type:  defect     |      Status:  new        
  Priority:  major      |   Milestone:             
 Component:  vtigercrm  |     Version:  5.0.1      
Resolution:             |    Keywords:  performance
------------------------+---------------------------------------------------
Changes (by anonymous):

  * owner:  jerrydgeorge => Richie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1130>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 05:18:35 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 12:18:35 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23968=3A_?=
 =?utf-8?q?Quick_Edit_of_Assigned_Group_not_functional?=
In-Reply-To: <076.66451d79109fe79c040c7aba7d66b2ee@vtiger.fosslabs.com>
References: <076.66451d79109fe79c040c7aba7d66b2ee@vtiger.fosslabs.com>
Message-ID: <085.26934636e1cee29668d3ee6bea0f28a2@vtiger.fosslabs.com>

#968: Quick Edit of Assigned Group not functional
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  Richie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by anonymous):

  * owner:  jerrydgeorge => Richie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/968>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 05:18:43 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 12:18:43 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23763=3A_?=
 =?utf-8?q?Inventory_Terms_=26_Conditions_can_be_moved_to_different_sectio?=
 =?utf-8?q?n?=
In-Reply-To: <076.afaed639175411364f6ac75d41b10dd1@vtiger.fosslabs.com>
References: <076.afaed639175411364f6ac75d41b10dd1@vtiger.fosslabs.com>
Message-ID: <085.8f685dece59e6ad5f584ef0d86c10cd8@vtiger.fosslabs.com>

#763: Inventory Terms & Conditions can be moved to different section
--------------------------+-------------------------------------------------
  Reporter:  gopal        |       Owner:  Richie
      Type:  enhancement  |      Status:  new   
  Priority:  major        |   Milestone:  5.0.0 
 Component:  vtigercrm    |     Version:  5.0.0 
Resolution:               |    Keywords:        
--------------------------+-------------------------------------------------
Changes (by anonymous):

  * owner:  jerrydgeorge => Richie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/763>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 05:19:20 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 12:19:20 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23512=3A_?=
 =?utf-8?q?UI_issue_in_Organisation_Sharing_Privileges?=
In-Reply-To: <076.94fe2310a682ae79f7fc33244bb4f97f@vtiger.fosslabs.com>
References: <076.94fe2310a682ae79f7fc33244bb4f97f@vtiger.fosslabs.com>
Message-ID: <085.bb11fea09ec12287969da93c9e1a7aca@vtiger.fosslabs.com>

#512: UI issue in Organisation Sharing Privileges
---------------------------+------------------------------------------------
  Reporter:  jerrydgeorge  |       Owner:  Richie
      Type:  defect        |      Status:  new   
  Priority:  major         |   Milestone:        
 Component:  vtigercrm     |     Version:  5.0.0 
Resolution:                |    Keywords:  UI    
---------------------------+------------------------------------------------
Changes (by anonymous):

  * owner:  jerrydgeorge => Richie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/512>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 05:19:28 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 12:19:28 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23623=3A_?=
 =?utf-8?q?Issue_in_Activity_Quick_Edit?=
In-Reply-To: <076.0386d0bd11848a433f30ada206c92aa2@vtiger.fosslabs.com>
References: <076.0386d0bd11848a433f30ada206c92aa2@vtiger.fosslabs.com>
Message-ID: <085.52ba33a1bc03e51003f8593d5f4d1729@vtiger.fosslabs.com>

#623: Issue in Activity Quick Edit
------------------------+---------------------------------------------------
  Reporter:  don        |       Owner:  Richie
      Type:  defect     |      Status:  new   
  Priority:  critical   |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by anonymous):

  * owner:  jerrydgeorge => Richie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/623>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 05:19:36 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 12:19:36 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=23599=3A_?=
	=?utf-8?q?Profile_Issue?=
In-Reply-To: <076.c417ec60abd87aee2cbcbf16610fb0d5@vtiger.fosslabs.com>
References: <076.c417ec60abd87aee2cbcbf16610fb0d5@vtiger.fosslabs.com>
Message-ID: <085.b0933c711ba76fb1ee0fdeee33d8adb2@vtiger.fosslabs.com>

#599: Profile Issue
---------------------------+------------------------------------------------
  Reporter:  jerrydgeorge  |       Owner:  Richie  
      Type:  defect        |      Status:  new     
  Priority:  critical      |   Milestone:          
 Component:  vtigercrm     |     Version:  5.0.0   
Resolution:                |    Keywords:  Security
---------------------------+------------------------------------------------
Changes (by anonymous):

  * owner:  jerrydgeorge => Richie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/599>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 05:19:43 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 12:19:43 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23424=3A_?=
 =?utf-8?q?even_without_tab_privileges_standard_privileges_can_be_given?=
In-Reply-To: <076.d6748e5d43374a30e7084a0e578e5c4a@vtiger.fosslabs.com>
References: <076.d6748e5d43374a30e7084a0e578e5c4a@vtiger.fosslabs.com>
Message-ID: <085.c880e586d79dd00ca27db7236091128b@vtiger.fosslabs.com>

#424: even without tab privileges standard privileges can be given
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  Richie 
      Type:  defect     |      Status:  new    
  Priority:  critical   |   Milestone:         
 Component:  vtigercrm  |     Version:  5.0.0  
Resolution:             |    Keywords:  profile
------------------------+---------------------------------------------------
Changes (by anonymous):

  * owner:  jerrydgeorge => Richie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/424>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 05:19:50 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 12:19:50 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=23260=3A_?=
	=?utf-8?q?Issue_in_Change_Owner?=
In-Reply-To: <076.a1fa6304362146237625bdb76ef761ce@vtiger.fosslabs.com>
References: <076.a1fa6304362146237625bdb76ef761ce@vtiger.fosslabs.com>
Message-ID: <085.b199696cec60ffd269f63278e0c3f082@vtiger.fosslabs.com>

#260: Issue in Change Owner
------------------------+---------------------------------------------------
  Reporter:  don        |       Owner:  Richie
      Type:  defect     |      Status:  new   
  Priority:  critical   |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by anonymous):

  * owner:  jerrydgeorge => Richie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/260>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 05:25:19 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 12:25:19 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7381 -
	/vtigercrm/trunk/Smarty/templates/DetailView.tpl
Message-ID: <20060621122519.430007FDA7C@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 06:25:09 2006
New Revision: 7381

Log:
style has been modified for locate map

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 Wed Jun 21 06:25:09 2006
@@ -70,6 +70,26 @@
         );
 {rdelim}
 </script>
+{if $MODULE eq 'Accounts' || $MODULE eq 'Contacts' || $MODULE eq 'Leads'}
+        {if $MODULE eq 'Accounts'}
+                {assign var=address1 value='Billing'}
+                {assign var=address2 value='Shipping'}
+        {/if}
+        {if $MODULE eq 'Contacts'}
+                {assign var=address1 value='Mailing'}
+                {assign var=address2 value='Other'}
+        {/if}
+        <div id="locateMap" style="width: 125px; right: 159px; top: 260px; display: none; z-index:50" onmouseout="fninvsh('locateMap')" onmouseover="fnvshNrm('locateMap')">
+                <table bgcolor="#ffffff" border="0" cellpadding="0" cellspacing="0" width="100%">
+                        <tr>
+                                <td>
+                                        <a href="javascript:;" onClick="fninvsh('locateMap'); searchMapLocation( 'Main' );" class="calMnu">{$address1} {$APP.LBL_ADDRESS}</a>
+                                        <a href="javascript:;" onClick="fninvsh('locateMap'); searchMapLocation( 'Other' );" class="calMnu">{$address2} {$APP.LBL_ADDRESS}</a>
+                                </td>
+                        </tr>
+                </table>
+        </div>
+{/if}
 
 <table width="100%" cellpadding="2" cellspacing="0" border="0">
 <form action="index.php" method="post" name="DetailView" id="form">
@@ -189,32 +209,11 @@
                                                         <td align=right>
 							{if $header eq 'Address Information' && ($MODULE eq 'Accounts' || $MODULE eq 'Contacts' || $MODULE eq 'Leads') }
                                                         {if $MODULE eq 'Leads'}
-                                                        <input id="locateMap" name="locateMap" value="{$APP.LBL_LOCATE_MAP}" class="small" type="button" onClick="searchMapLocation( 'Main' )" title="{$APP.LBL_LOCATE_MAP}">
+                                                        <input name="mapbutton" value="{$APP.LBL_LOCATE_MAP}" class="small" type="button" onClick="searchMapLocation( 'Main' )" title="{$APP.LBL_LOCATE_MAP}">
                                                         {else}
-                                                                {if $MODULE eq 'Accounts'}
-                                                                       {assign var=address1 value='Billing'}
-                                                                       {assign var=address2 value='Shipping'}
-                                                                {/if}
-                                                                {if $MODULE eq 'Contacts'}
-                                                                       {assign var=address1 value='Mailing'}
-                                                                       {assign var=address2 value='Other'}
-                                                                {/if}
-                                                                <input id="locateMap" name="locateMap" value="{$APP.LBL_LOCATE_MAP}" class="small" type="button" onClick="javascript:showLocateMapMenu()" title="{$APP.LBL_LOCATE_MAP}">
-                                                        <div id="dropDownMenu" style="position:absolute;display:none;z-index:60">
-							<table border="0" cellspacing="0" cellpadding="4">
-                                                <tr bgcolor=white class="lvtColData" onMouseOver="this.className='lvtColDataHover'" style="cursor:pointer;" onMouseOut="this.className='lvtColData'" onClick="searchMapLocation( 'Main' )">
-                                                <td>{$address1} {$APP.LBL_ADDRESS}</td>
-                                                </tr>
-                                                <tr bgcolor=white class="lvtColData" onMouseOver="this.className='lvtColDataHover'" style="cursor:pointer;" onMouseOut="this.className='lvtColData'"  onClick="searchMapLocation( 'Other' )">
-                                                <td>{$address2} {$APP.LBL_ADDRESS}</td>
-                                                </tr>
-                                                </table>
-                                                </div>
-                                                {/if}
-                                                <script>
-                                                        document.onclick=hideLocateMapMenu;
-                                                </script>
-                                               {/if}
+                                                        <input name="mapbutton" value="{$APP.LBL_LOCATE_MAP}" class="small" type="button" onClick="fnvshobj(this,'locateMap');" onmouseout="fninvsh('locateMap');" title="{$APP.LBL_LOCATE_MAP}">
+							{/if}
+                                                        {/if}
                                                         </td>
                                                         </tr>
 



From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 05:49:20 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 12:49:20 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231132=3A?=
 =?utf-8?q?_creation_of_related_entities_ought_to_be_ajaxified?=
In-Reply-To: <076.343f75f8c959bb0da4c9f8e348afe0b2@vtiger.fosslabs.com>
References: <076.343f75f8c959bb0da4c9f8e348afe0b2@vtiger.fosslabs.com>
Message-ID: <085.5c510290c1e80f2216a30b421ec02115@vtiger.fosslabs.com>

#1132: creation of related entities ought to be ajaxified
--------------------------+-------------------------------------------------
  Reporter:  richie       |       Owner:  Richie     
      Type:  enhancement  |      Status:  new        
  Priority:  major        |   Milestone:             
 Component:  vtigercrm    |     Version:  5.0.1      
Resolution:               |    Keywords:  performance
--------------------------+-------------------------------------------------
Changes (by anonymous):

  * type:  defect => enhancement

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1132>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 05:49:32 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 12:49:32 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231130=3A?=
 =?utf-8?q?_more_information_tab_ajaxified?=
In-Reply-To: <076.d1ddb83143327b9a11f01d548facd399@vtiger.fosslabs.com>
References: <076.d1ddb83143327b9a11f01d548facd399@vtiger.fosslabs.com>
Message-ID: <085.25e0975431628118b93444046ed54433@vtiger.fosslabs.com>

#1130: more information tab ajaxified
--------------------------+-------------------------------------------------
  Reporter:  richie       |       Owner:  Richie     
      Type:  enhancement  |      Status:  new        
  Priority:  major        |   Milestone:             
 Component:  vtigercrm    |     Version:  5.0.1      
Resolution:               |    Keywords:  performance
--------------------------+-------------------------------------------------
Changes (by anonymous):

  * type:  defect => enhancement

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1130>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 05:53:29 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 12:53:29 -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.b164f16b1d2e91ec130131ea9f4b9145@vtiger.fosslabs.com>

#82: Ticket-Activity-Relation
-------------------------------+--------------------------------------------
  Reporter:  eberle.d at 4net.ch  |       Owner:  minnie
      Type:  enhancement       |      Status:  closed
  Priority:  critical          |   Milestone:        
 Component:  vtigercrm         |     Version:  5.0.1 
Resolution:  duplicate         |    Keywords:        
-------------------------------+--------------------------------------------
Changes (by jerrydgeorge):

  * resolution:  => duplicate
  * status:  new => closed

Comment:

 1252

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/82>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 05:56:54 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 12:56:54 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231270=3A?=
 =?utf-8?q?_Picklist_editor_not_exist_for_invoices?=
In-Reply-To: <076.9bd0e7d72add51e29114ababf0f13b67@vtiger.fosslabs.com>
References: <076.9bd0e7d72add51e29114ababf0f13b67@vtiger.fosslabs.com>
Message-ID: <085.f1ed3f5b2dac67d41916d0bfd7b8b182@vtiger.fosslabs.com>

#1270: Picklist editor not exist for invoices
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  mangai            
      Type:  defect     |      Status:  closed            
  Priority:  major      |   Milestone:  5.0.0             
 Component:  vtigercrm  |     Version:  5.0.0             
Resolution:  fixed      |    Keywords:  invoices, picklist
------------------------+---------------------------------------------------
Changes (by anonymous):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1270>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 06:00:34 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 13:00:34 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23644=3A_?=
 =?utf-8?q?logs_in_notification_schedular?=
In-Reply-To: <076.c1cfccb88b72051f409d50fc0c74708c@vtiger.fosslabs.com>
References: <076.c1cfccb88b72051f409d50fc0c74708c@vtiger.fosslabs.com>
Message-ID: <085.2480501775b94cface74bf676db38655@vtiger.fosslabs.com>

#644: logs in notification schedular
--------------------------------+-------------------------------------------
  Reporter:  minnie at vtiger.com  |       Owner:  minnie
      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: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/644>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 06:01:33 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 13:01:33 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23644=3A_?=
 =?utf-8?q?logs_in_notification_schedular?=
In-Reply-To: <076.c1cfccb88b72051f409d50fc0c74708c@vtiger.fosslabs.com>
References: <076.c1cfccb88b72051f409d50fc0c74708c@vtiger.fosslabs.com>
Message-ID: <085.d11d82a6292309c670936172b2ddbeaa@vtiger.fosslabs.com>

#644: logs in notification schedular
--------------------------------+-------------------------------------------
  Reporter:  minnie at vtiger.com  |       Owner:  minnie  
      Type:  defect             |      Status:  reopened
  Priority:  major              |   Milestone:  5.0.0   
 Component:  vtigercrm          |     Version:  5.0.0   
Resolution:                     |    Keywords:          
--------------------------------+-------------------------------------------
Changes (by anonymous):

  * resolution:  invalid =>
  * status:  closed => reopened

Comment:

 Post 5.0.0

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/644>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 06:03:12 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 13:03:12 -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.7d9b4ab012516307581656c9eab06f4a@vtiger.fosslabs.com>

#285: Usability issue in picklist edit
------------------------+---------------------------------------------------
  Reporter:  don        |       Owner:  ela  
      Type:  defect     |      Status:  new  
  Priority:  major      |   Milestone:  5.0.0
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by jerrydgeorge):

  * owner:  minnie => ela

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/285>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 06:03:59 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 13:03:59 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23846=3A_?=
 =?utf-8?q?Member_Of_Field_can_be_moved_to_Basic_Information_Tab?=
In-Reply-To: <076.76722003fcd7d8c307a684829482c1f2@vtiger.fosslabs.com>
References: <076.76722003fcd7d8c307a684829482c1f2@vtiger.fosslabs.com>
Message-ID: <085.a57fb6c2fa58fa335bbdeec19ddd8798@vtiger.fosslabs.com>

#846: Member Of Field can be moved to Basic Information Tab
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  jerrydgeorge
      Type:  defect     |      Status:  new         
  Priority:  minor      |   Milestone:              
 Component:  vtigercrm  |     Version:  5.0.0       
Resolution:             |    Keywords:              
------------------------+---------------------------------------------------
Changes (by anonymous):

  * owner:  mangai => jerrydgeorge

Comment:

 Not take

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/846>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 06:06:12 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 13:06:12 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23846=3A_?=
 =?utf-8?q?Member_Of_Field_can_be_moved_to_Basic_Information_Tab?=
In-Reply-To: <076.76722003fcd7d8c307a684829482c1f2@vtiger.fosslabs.com>
References: <076.76722003fcd7d8c307a684829482c1f2@vtiger.fosslabs.com>
Message-ID: <085.f3917a26b6beec906a731dd245f8a96a@vtiger.fosslabs.com>

#846: Member Of Field can be moved to Basic Information Tab
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  jerrydgeorge
      Type:  defect     |      Status:  closed      
  Priority:  minor      |   Milestone:              
 Component:  vtigercrm  |     Version:  5.0.0       
Resolution:  fixed      |    Keywords:              
------------------------+---------------------------------------------------
Changes (by anonymous):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/846>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 06:15:11 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 13:15:11 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23808=3A_?=
 =?utf-8?q?Recently_Used_-_Contacts=2C_Leads=2C_Emails=2C_etc=2E?=
In-Reply-To: <076.732df8a9c67d4b57a254501f77c190bf@vtiger.fosslabs.com>
References: <076.732df8a9c67d4b57a254501f77c190bf@vtiger.fosslabs.com>
Message-ID: <085.e465bec63b285d008382947bc4056faf@vtiger.fosslabs.com>

#808: Recently Used - Contacts, Leads, Emails, etc.
--------------------------------+-------------------------------------------
  Reporter:  kenlyle at yahoo.com  |       Owner:  don                  
      Type:  enhancement        |      Status:  new                  
  Priority:  major              |   Milestone:                       
 Component:  vtigercrm          |     Version:  5.0.0                
Resolution:                     |    Keywords:  recent, recently used
--------------------------------+-------------------------------------------
Changes (by anonymous):

  * owner:  jerrydgeorge => don

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/808>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 06:43:51 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 13:43:51 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7382 - in /vtigercrm/trunk:
 data/CRMEntity.php include/utils/CommonUtils.php
 include/utils/InventoryUtils.php schema/DatabaseSchema.xml
Message-ID: <20060621134351.DAC8683F41C@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 07:43:44 2006
New Revision: 7382

Log:
* Modified to handle the history of PO, SO, Quotes and Invoice

Modified:
    vtigercrm/trunk/data/CRMEntity.php
    vtigercrm/trunk/include/utils/CommonUtils.php
    vtigercrm/trunk/include/utils/InventoryUtils.php
    vtigercrm/trunk/schema/DatabaseSchema.xml

Modified: vtigercrm/trunk/data/CRMEntity.php
==============================================================================
--- vtigercrm/trunk/data/CRMEntity.php (original)
+++ vtigercrm/trunk/data/CRMEntity.php Wed Jun 21 07:43:44 2006
@@ -704,7 +704,29 @@
 				  $adb->query($sql);
 			  }
 		  }
-		
+		  elseif($_REQUEST['module'] == 'PurchaseOrder' || $_REQUEST['module'] == 'SalesOrder' || $_REQUEST['module'] == 'Quotes' || $_REQUEST['module'] == 'Invoice')
+		  {
+			  //added to update the history for PO, SO, Quotes and Invoice
+			  $history_field_array = Array(
+				  			"PurchaseOrder"=>"postatus",
+							"SalesOrder"=>"sostatus",
+							"Quotes"=>"quotestage",
+							"Invoice"=>"invoicestatus"
+						      );
+
+			  $inventory_module = $_REQUEST['module'];
+			  if($inventory_module == "PurchaseOrder")
+			  	$relatedname = $_REQUEST["vendor_name"];
+			  else
+			  	$relatedname = $_REQUEST["account_name"];
+
+			  $oldvalue = getSingleFieldValue($this->table_name,$history_field_array[$inventory_module],$this->module_id,$this->id);
+			  if($oldvalue != $this->column_fields["$history_field_array[$inventory_module]"])
+			  {
+				  addInventoryHistory($inventory_module, $this->id,$relatedname,$_REQUEST['grandTotal'],$this->column_fields["$history_field_array[$inventory_module]"]);
+			  }
+		  }
+
 		  //Check done by Don. If update is empty the the query fails
 		  if(trim($update) != '')
         	  {

Modified: vtigercrm/trunk/include/utils/CommonUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/CommonUtils.php (original)
+++ vtigercrm/trunk/include/utils/CommonUtils.php Wed Jun 21 07:43:44 2006
@@ -2390,5 +2390,23 @@
 	return $description;
 }
 
+/**	Function used to retrieve a single field value from database
+ *	@param string $tablename - tablename from which we will retrieve the field value
+ *	@param string $fieldname - fieldname to which we want to get the value from database
+ *	@param string $idname	 - idname which is the name of the entity id in the table like, inoviceid, quoteid, etc.,
+ *	@param int    $id	 - entity id
+ *	return string $fieldval  - field value of the needed fieldname from database will be returned
+ */
+function getSingleFieldValue($tablename, $fieldname, $idname, $id)
+{
+	global $log, $adb;
+	$log->debug("Entering into function getSingleFieldValue($tablename, $fieldname, $idname, $id)");
+
+	$fieldval = $adb->query_result($adb->query("select $fieldname from $tablename where $idname = $id"),0,$fieldname);
+
+	$log->debug("Exit from function getSingleFieldValue. return value ==> \"$fieldval\"");
+
+	return $fieldval;
+}
 
 ?>

Modified: vtigercrm/trunk/include/utils/InventoryUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/InventoryUtils.php (original)
+++ vtigercrm/trunk/include/utils/InventoryUtils.php Wed Jun 21 07:43:44 2006
@@ -315,5 +315,30 @@
 	return $taxpercentage;
 }
 
+/**	Function used to add the history entry in the relevant tables for PO, SO, Quotes and Invoice modules
+ *	@param string 	$module		- current module name
+ *	@param int 	$id		- entity id
+ *	@param string 	$relatedname	- parent name of the entity ie, required field venor name for PO and account name for SO, Quotes and Invoice
+ *	@param float 	$total		- grand total value of the product details included tax
+ *	@param string 	$history_fldval	- history field value ie., quotestage for Quotes and status for PO, SO and Invoice
+ */
+function addInventoryHistory($module, $id, $relatedname, $total, $history_fldval)
+{
+	global $log, $adb;
+	$log->debug("Entering into function addInventoryHistory($module, $id, $relatedname, $total, $history_fieldvalue)");
+
+	$history_table_array = Array(
+					"PurchaseOrder"=>"vtiger_postatushistory",
+					"SalesOrder"=>"vtiger_sostatushistory",
+					"Quotes"=>"vtiger_quotestagehistory",
+					"Invoice"=>"vtiger_invoicestatushistory"
+				    );
+
+	$modifiedtime = date('YmdHis');
+	$query = "insert into $history_table_array[$module] values('',$id,\"$relatedname\",\"$total\",\"$history_fldval\",\"$modifiedtime\")";
+	$adb->query($query);
+
+	$log->debug("Exit from function addInventoryHistory");
+}
 
 ?>

Modified: vtigercrm/trunk/schema/DatabaseSchema.xml
==============================================================================
--- vtigercrm/trunk/schema/DatabaseSchema.xml (original)
+++ vtigercrm/trunk/schema/DatabaseSchema.xml Wed Jun 21 07:43:44 2006
@@ -5207,5 +5207,82 @@
 		</index>
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
-	
+
+	<table name="vtiger_postatushistory">
+		<field name="historyid" type="I" size="19">
+			<key />
+			<autoincrement />
+		</field>
+		<field name="purchaseorderid" type="I" size="19">
+			<notnull />
+			<constraint>REFERENCES vtiger_purchaseorder(purchaseorderid) ON DELETE CASCADE</constraint>
+		</field>
+		<field name="vendorname" type="C" size="100" />
+		<field name="total" type="N" />
+		<field name="postatus" type="C" size="200" />
+		<field name="lastmodified" type="T" />
+
+		<index name="postatushistory_purchaseorderid_idx">
+			<col>purchaseorderid</col>
+		</index>
+		<opt platform="mysql">Type=InnoDB</opt>
+	</table>
+	<table name="vtiger_sostatushistory">
+		<field name="historyid" type="I" size="19">
+			<key />
+			<autoincrement />
+		</field>
+		<field name="salesorderid" type="I" size="19">
+			<notnull />
+			<constraint>REFERENCES vtiger_salesorder(salesorderid) ON DELETE CASCADE</constraint>
+		</field>
+		<field name="accountname" type="C" size="100" />
+		<field name="total" type="N" />
+		<field name="sostatus" type="C" size="200" />
+		<field name="lastmodified" type="T" />
+
+		<index name="sostatushistory_salesorderid_idx">
+			<col>salesorderid</col>
+		</index>
+		<opt platform="mysql">Type=InnoDB</opt>
+	</table>
+	<table name="vtiger_quotestagehistory">
+		<field name="historyid" type="I" size="19">
+			<key />
+			<autoincrement />
+		</field>
+		<field name="quoteid" type="I" size="19">
+			<notnull />
+			<constraint>REFERENCES vtiger_quotes(quoteid) ON DELETE CASCADE</constraint>
+		</field>
+		<field name="accountname" type="C" size="100" />
+		<field name="total" type="N" />
+		<field name="quotestage" type="C" size="200" />
+		<field name="lastmodified" type="T" />
+
+		<index name="quotestagehistory_quoteid_idx">
+			<col>quoteid</col>
+		</index>
+		<opt platform="mysql">Type=InnoDB</opt>
+	</table>
+	<table name="vtiger_invoicestatushistory">
+		<field name="historyid" type="I" size="19">
+			<key />
+			<autoincrement />
+		</field>
+		<field name="invoiceid" type="I" size="19">
+			<notnull />
+			<constraint>REFERENCES vtiger_invoice(invoiceid) ON DELETE CASCADE</constraint>
+		</field>
+		<field name="accountname" type="C" size="100" />
+		<field name="total" type="N" />
+		<field name="invoicestatus" type="C" size="200" />
+		<field name="lastmodified" type="T" />
+
+		<index name="invoicestatushistory_invoiceid_idx">
+			<col>invoiceid</col>
+		</index>
+		<opt platform="mysql">Type=InnoDB</opt>
+	</table>
+
 </schema>



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 06:44:41 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 13:44:41 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7383 - in
 /vtigercrm/trunk/modules: PurchaseOrder/PurchaseOrder.php Quotes/Quote.php
Message-ID: <20060621134441.BFCFF83F41C@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 07:44:36 2006
New Revision: 7383

Log:
* Modified the table_name property to the new table name

Modified:
    vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php
    vtigercrm/trunk/modules/Quotes/Quote.php

Modified: vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php
==============================================================================
--- vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php (original)
+++ vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php Wed Jun 21 07:44:36 2006
@@ -33,7 +33,7 @@
 	var $log;
 	var $db;
 		
-	var $table_name = "purchaseorder";
+	var $table_name = "vtiger_purchaseorder";
 	var $tab_name = Array('vtiger_crmentity','vtiger_purchaseorder','vtiger_pobillads','vtiger_poshipads','vtiger_purchaseordercf');
 	var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_purchaseorder'=>'purchaseorderid','vtiger_pobillads'=>'pobilladdressid','vtiger_poshipads'=>'poshipaddressid','vtiger_purchaseordercf'=>'purchaseorderid');
 	

Modified: vtigercrm/trunk/modules/Quotes/Quote.php
==============================================================================
--- vtigercrm/trunk/modules/Quotes/Quote.php (original)
+++ vtigercrm/trunk/modules/Quotes/Quote.php Wed Jun 21 07:44:36 2006
@@ -33,7 +33,7 @@
 	var $log;
 	var $db;
 		
-	var $table_name = "quotes";
+	var $table_name = "vtiger_quotes";
 	var $tab_name = Array('vtiger_crmentity','vtiger_quotes','vtiger_quotesbillads','vtiger_quotesshipads','vtiger_quotescf');
 	var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_quotes'=>'quoteid','vtiger_quotesbillads'=>'quotebilladdressid','vtiger_quotesshipads'=>'quoteshipaddressid','vtiger_quotescf'=>'quoteid');
 	



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 07:27:14 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 14:27:14 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7384 -
	/vtigercrm/trunk/Smarty/templates/DisplayFields.tpl
Message-ID: <20060621142714.4E8E883F425@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 21 08:27:05 2006
New Revision: 7384

Log:
now the logged in admin user cannot change him as non admin

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

Modified: vtigercrm/trunk/Smarty/templates/DisplayFields.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DisplayFields.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DisplayFields.tpl Wed Jun 21 08:27:05 2006
@@ -470,7 +470,7 @@
 			<td width="20%" class="dvtCellLabel" align=right>
 				{$fldlabel}
 			</td>
-				{if $secondvalue eq 1}
+				{if ($secondvalue eq 1 && $CURRENT_USERID != $smarty.request.record) || ($MODE == 'create')}
 					{assign var="disable_status" value=""}
 				{else}
 					{assign var="disable_status" value="disabled"}



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 07:30:44 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 14:30:44 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7385 -
	/vtigercrm/trunk/modules/Users/EditView.php
Message-ID: <20060621143044.3D8F683F427@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 21 08:30:35 2006
New Revision: 7385

Log:
now the admin user cannot change him to non admin by him self

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 Wed Jun 21 08:30:35 2006
@@ -67,7 +67,7 @@
 global $current_language;
 $smod_strings = return_module_language($current_language,'Settings');
 $smarty->assign("MOD", $smod_strings);
-
+$smarty->assign("CURRENT_USERID", $current_user->id);
 $smarty->assign("APP", $app_strings);
 
 if (isset($_REQUEST['error_string'])) $smarty->assign("ERROR_STRING", "<font class='error'>Error: ".$_REQUEST['error_string']."</font>");



From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 08:33:41 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 15:33:41 -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.ae91ba6d93f3b5ae7dbc6457a7399dde@vtiger.fosslabs.com>

#678: Home Page Security Support is not proper
---------------------------+------------------------------------------------
  Reporter:  jerrydgeorge  |       Owner:  saraj   
      Type:  defect        |      Status:  closed  
  Priority:  critical      |   Milestone:          
 Component:  vtigercrm     |     Version:  5.0.0   
Resolution:  fixed         |    Keywords:  Security
---------------------------+------------------------------------------------
Changes (by saraj):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/678>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 08:43:06 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 15:43:06 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231323=3A?=
 =?utf-8?q?_Performance_Issue_in_ListView?=
In-Reply-To: <076.1ec7598e9f7965c44699ac918e5801a3@vtiger.fosslabs.com>
References: <076.1ec7598e9f7965c44699ac918e5801a3@vtiger.fosslabs.com>
Message-ID: <085.d4c4195faeb430093adb406cf6bac2db@vtiger.fosslabs.com>

#1323: Performance Issue in ListView
---------------------------+------------------------------------------------
  Reporter:  jerrydgeorge  |       Owner:  philip
      Type:  defect        |      Status:  closed
  Priority:  critical      |   Milestone:        
 Component:  vtigercrm     |     Version:  5.0.0 
Resolution:  invalid       |    Keywords:        
---------------------------+------------------------------------------------
Changes (by saraj):

  * resolution:  => invalid
  * status:  new => closed

Comment:

 Listview query optimisation has been done, using limit query for
 pagination was found to have no improvement on the performance.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1323>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 08:54:49 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 15:54:49 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7386 -
	/vtigercrm/trunk/include/js/dtlviewajax.js
Message-ID: <20060621155449.EDA6F83F43E@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 21 09:54:40 2006
New Revision: 7386

Log:
record parsed in Ajax URL. So now the detail view ajax security check is working
 

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

Modified: vtigercrm/trunk/include/js/dtlviewajax.js
==============================================================================
--- vtigercrm/trunk/include/js/dtlviewajax.js (original)
+++ vtigercrm/trunk/include/js/dtlviewajax.js Wed Jun 21 09:54:40 2006
@@ -118,7 +118,7 @@
 		}
 	}
 
-	var data = "file=DetailViewAjax&module=" + module + "&action=" + module + "Ajax&recordid=" + crmId ;
+	var data = "file=DetailViewAjax&module=" + module + "&action=" + module + "Ajax&record=" + crmId+"&recordid=" + crmId ;
 	data = data + "&fldName=" + fieldName + "&fieldValue=" + escape(tagValue) + "&ajxaction=DETAILVIEW";
 	new Ajax.Request(
 		'index.php',



From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 09:24:31 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 16:24:31 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231350=3A?=
 =?utf-8?q?_Mass_Delete_not_working_for_the_only_record_in_List_View?=
Message-ID: <076.52d2f3cf1c5fb831b08c5d544f32f873@vtiger.fosslabs.com>

#1350: Mass Delete not working for the only record in List View
-----------------------+----------------------------------------------------
 Reporter:  ahmed      |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  critical   |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------


-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1350>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 09:24:53 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 16:24:53 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231350=3A?=
 =?utf-8?q?_Mass_Delete_not_working_for_the_only_record_in_List_View?=
In-Reply-To: <076.52d2f3cf1c5fb831b08c5d544f32f873@vtiger.fosslabs.com>
References: <076.52d2f3cf1c5fb831b08c5d544f32f873@vtiger.fosslabs.com>
Message-ID: <085.91dcdef3c615273429ff3140491c52f3@vtiger.fosslabs.com>

#1350: Mass Delete not working for the only record in List View
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  jeri 
      Type:  defect     |      Status:  new  
  Priority:  critical   |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by anonymous):

  * owner:  developer => jeri

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1350>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 09:26:41 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 16:26:41 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231351=3A?=
 =?utf-8?q?_Editing_Activity_in_Leads_Related_List_Shows_Warning?=
Message-ID: <076.23a2cbc68532eb6ef08e3d5e59241e8c@vtiger.fosslabs.com>

#1351: Editing Activity in Leads Related List Shows Warning
-----------------------+----------------------------------------------------
 Reporter:  ahmed      |       Owner:  mickie
     Type:  defect     |      Status:  new   
 Priority:  blocker    |   Milestone:        
Component:  vtigercrm  |     Version:  5.0.0 
 Keywords:             |  
-----------------------+----------------------------------------------------


-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1351>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 09:44:32 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 16:44:32 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7387 - in
 /vtigercrm/trunk/Smarty/templates: DetailView.tpl DetailViewFields.tpl
Message-ID: <20060621164432.828C9839FAF@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 21 10:44:07 2006
New Revision: 7387

Log:
Security Check added for ajax Edit in deltailview

Added:
    vtigercrm/trunk/Smarty/templates/DetailViewFields.tpl
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 Wed Jun 21 10:44:07 2006
@@ -259,18 +259,19 @@
 							   {assign var=keycntimage value=$data.cntimage}
 							   {assign var=keyadmin value=$data.isadmin}
 							   
-							   <input type="hidden" id="hdtxt_IsAdmin" value={$keyadmin}></input>
+							   
 							   
                            {if $label ne ''}
 	                        {if $keycntimage ne ''}
-					<td class="dvtCellLabel" align=right width=25%>{$keycntimage}</td>
+					<td class="dvtCellLabel" align=right width=25%><input type="hidden" id="hdtxt_IsAdmin" value={$keyadmin}></input>{$keycntimage}</td>
 				{elseif $keyid eq '71' || $keyid eq '72'}<!-- Currency symbol -->
-					<td class="dvtCellLabel" align=right width=25%>{$label} ({$keycursymb})</td>
+					<td class="dvtCellLabel" align=right width=25%>{$label}<input type="hidden" id="hdtxt_IsAdmin" value={$keyadmin}></input> ({$keycursymb})</td>
 				{else}
-					<td class="dvtCellLabel" align=right width=25%>{$label}</td>
+					<td class="dvtCellLabel" align=right width=25%><input type="hidden" id="hdtxt_IsAdmin" value={$keyadmin}></input>{$label}</td>
 				{/if}  
-
-										{include file="DetailViewUI.tpl"}
+{if $EDIT_PERMISSION eq 'yes'}							{include file="DetailViewUI.tpl"}
+{else}										{include file="DetailViewFields.tpl"}
+{/if}
 						   {else} 
                                           <td class="dvtCellLabel" align=right>&nbsp;</td>
                                            <td class="dvtCellInfo" align=left >&nbsp;</td>



From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 09:29:10 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 16:29:10 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231351=3A?=
 =?utf-8?q?_Editing_Activity_in_Leads_Related_List_Shows_Warning?=
In-Reply-To: <076.23a2cbc68532eb6ef08e3d5e59241e8c@vtiger.fosslabs.com>
References: <076.23a2cbc68532eb6ef08e3d5e59241e8c@vtiger.fosslabs.com>
Message-ID: <085.f8b2ebea23da26de2ec4051d8944c943@vtiger.fosslabs.com>

#1351: Editing Activity in Leads Related List Shows Warning
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  mickie
      Type:  defect     |      Status:  new   
  Priority:  blocker    |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Comment (by ahmed):

 Warning: Invalid argument supplied for foreach() in C:\Program
 Files\vtigercrm-5.0.0-beta\apache\htdocs\vtigerCRM\jun21\include\utils\EditViewUtils.php
 on line 1507

 Warning: Invalid argument supplied for foreach() in C:\Program
 Files\vtigercrm-5.0.0-beta\apache\htdocs\vtigerCRM\jun21\include\utils\CommonUtils.php
 on line 997

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1351>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 09:48:27 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 16:48:27 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7388 -
	/vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl
Message-ID: <20060621164827.5002183F41C@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 21 10:48:05 2006
New Revision: 7388

Log:
&nbsp; added for all cells

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

Modified: vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl Wed Jun 21 10:48:05 2006
@@ -20,7 +20,7 @@
                                          		      {elseif $keyid eq '71' || $keyid eq '72'}  <!--CurrencySymbol-->
                                          		            {$keycursymb}
                                                         {/if}
-                                                       <span id="dtlview_{$label}">{$keyval}</span>
+                                                       &nbsp;&nbsp;<span id="dtlview_{$label}">{$keyval}</span>
                                               		<div id="editarea_{$label}" style="display:none;">
                                               		  <input class="detailedViewTextBox" onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" type="text" id="txtbox_{$label}" name="{$keyfldname}" maxlength='100' value="{$keyval}"></input>
                                               		  <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
@@ -28,7 +28,7 @@
                                                        </div>
                                                   </td>
                                              {elseif $keyid eq '13'} <!--Email-->
-                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}"><a href="mailto:{$keyval}" target="_blank">{$keyval}</a></span>
+                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}"><a href="mailto:{$keyval}" target="_blank">{$keyval}</a></span>
                                               		<div id="editarea_{$label}" style="display:none;">
                                               		  <input class="detailedViewTextBox" onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" type="text" id="txtbox_{$label}" name="{$keyfldname}" maxlength='100' value="{$keyval}"></input>
                                               		  <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
@@ -36,7 +36,7 @@
                                                        </div>
                                                   </td>
                                              {elseif $keyid eq '15' || $keyid eq '16'} <!--ComboBox-->
-               							<td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}">{$keyval}</span>
+               							<td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}">{$keyval}</span>
                                               		<div id="editarea_{$label}" style="display:none;">
                     							   <select id="txtbox_{$label}" name="{$keyfldname}">
                     								{foreach item=arr from=$keyoptions}
@@ -50,7 +50,7 @@
                     							</div>
                							</td>
                                              {elseif $keyid eq '17'} <!--WebSite-->
-                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}"><a href="http://{$keyval}" target="_blank">{$keyval}</a></span>
+                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}"><a href="http://{$keyval}" target="_blank">{$keyval}</a></span>
                                               		<div id="editarea_{$label}" style="display:none;">
                                               		  <input class="detailedViewTextBox" onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" type="text" id="txtbox_{$label}" name="{$keyfldname}" maxlength='100' value="{$keyval}"></input>
                                               		  <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
@@ -58,7 +58,7 @@
                                                        </div>
                                                   </td>
                                              {elseif $keyid eq '19' || $keyid eq '20'} <!--TextArea/Description-->
-                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}">{$keyval}</span>
+                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}">{$keyval}</span>
                                               		<div id="editarea_{$label}" style="display:none;">
                                               		  <textarea id="txtbox_{$label}" name="{$keyfldname}"  class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'"onBlur="this.className='detailedViewTextBox'" cols="90" rows="8">{$keyval}</textarea>                                            		  
                                               		  <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
@@ -66,7 +66,7 @@
                                                        </div>
                                                   </td>
                                              {elseif $keyid eq '21' || $keyid eq '24' || $keyid eq '22'} <!--TextArea/Street-->
-                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}">{$keyval}</span>
+                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}">{$keyval}</span>
                                               		<div id="editarea_{$label}" style="display:none;">
                                               		  <textarea id="txtbox_{$label}" name="{$keyfldname}"  class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'"onBlur="this.className='detailedViewTextBox'" rows=2>{$keyval}</textarea>                                            		  
                                               		  <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
@@ -74,7 +74,7 @@
                                                        </div>
                                                   </td>
                                              {elseif $keyid eq '50' || $keyid eq '73' || $keyid eq '51'} <!--AccountPopup-->
-                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}"><a href="{$keyseclink}">{$keyval}</a></span>
+                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}"><a href="{$keyseclink}">{$keyval}</a></span>
                                               		<div id="editarea_{$label}" style="display:none;">                                              		  
                                                          <input readonly id="popuptxt_{$label}" name="account_name" type="text" value="{$keyval}"><input id="txtbox_{$label}" name="{$keyfldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Accounts&action=Popup&popuptype=specific&form=TasksEditView&form_submit=false","test","width=600,height=400,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'>
                                                          <!--AccountPopup/WithClear-->{if $keyid eq '51'} &nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.account_id.value=''; this.form.account_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>{/if} 
@@ -83,7 +83,7 @@
                                                        </div>
                                                   </td>
                                              {elseif $keyid eq '57'} <!--ContactPopup-->
-                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}"><a href="{$keyseclink}">{$keyval}</a></span>
+                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}"><a href="{$keyseclink}">{$keyval}</a></span>
                                               		<div id="editarea_{$label}" style="display:none;">                                              		  
                                                          <input id="popuptxt_{$label}" name="contact_name" readonly type="text" style="border:1px solid #bababa;" value="{$keyval}"><input id="txtbox_{$label}" name="{$keyfldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Contacts&action=Popup&html=Popup_picker&popuptype=specific&form=EditView","test","width=600,height=400,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.contact_id.value=''; this.form.contact_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
                                                          <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
@@ -91,7 +91,7 @@
                                                        </div>
                                                   </td>                                                  
                                              {elseif $keyid eq '59'} <!--ProductPopup-->
-                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}"><a href="{$keyseclink}">{$keyval}</a></span>
+                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}"><a href="{$keyseclink}">{$keyval}</a></span>
                                               		<div id="editarea_{$label}" style="display:none;">                                              		  
                                                          <input id="popuptxt_{$label}" name="product_name" readonly type="text" value="{$keyval}"><input id="txtbox_{$label}" name="{$keyfldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Products&action=Popup&html=Popup_picker&form=HelpDeskEditView&popuptype=specific","test","width=600,height=400,resizable=1,scrollbars=1,top=150,left=200");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.product_id.value=''; this.form.product_name.value=''; return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
                                                          <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
@@ -99,7 +99,7 @@
                                                        </div>
                                                   </td>
                                              {elseif $keyid eq '75' || $keyid eq '81'} <!--VendorPopup-->
-                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}"><a href="{$keyseclink}">{$keyval}</a></span>
+                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}"><a href="{$keyseclink}">{$keyval}</a></span>
                                               		<div id="editarea_{$label}" style="display:none;">
                                                          <input id="popuptxt_{$label}" name="vendor_name" readonly type="text" style="border:1px solid #bababa;" value="{$keyval}"><input id="txtbox_{$label}" name="{$fldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Vendors&action=Popup&html=Popup_picker&popuptype=specific&form=EditView","test","width=600,height=400,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'>
                                                          {if $uitype eq 75}&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.vendor_id.value='';this.form.vendor_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>{/if}                                              		  
@@ -108,7 +108,7 @@
                                                        </div>
                                                   </td>
                                              {elseif $keyid eq 76} <!--PotentialPopup-->
-                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}"><a href="{$keyseclink}">{$keyval}</a></span>
+                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}"><a href="{$keyseclink}">{$keyval}</a></span>
                                               		<div id="editarea_{$label}" style="display:none;">                                              		  
                                                          <input id="popuptxt_{$label}" name="potential_name" readonly type="text" style="border:1px solid #bababa;" value="{$keyval}"><input id="txtbox_{$label}" name="{$keyfldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Potentials&action=Popup&html=Popup_picker&popuptype=specific_potential_account_address&form=EditView","test","width=600,height=400,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.potential_id.value=''; this.form.potential_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
                                                          <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
@@ -116,7 +116,7 @@
                                                        </div>
                                                   </td>
                                              {elseif $keyid eq 78} <!--QuotePopup-->
-                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}"><a href="{$keyseclink}">{$keyval}</a></span>
+                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}"><a href="{$keyseclink}">{$keyval}</a></span>
                                               		<div id="editarea_{$label}" style="display:none;">                                              		  
                                                          <input id="popuptxt_{$label}" name="quote_name" readonly type="text" style="border:1px solid #bababa;" value="{$keyval}"><input id="txtbox_{$label}" name="{$keyfldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Quotes&action=Popup&html=Popup_picker&popuptype=specific&form=EditView","test","width=600,height=400,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.quote_id.value=''; this.form.quote_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
                                                          <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
@@ -127,7 +127,7 @@
                                                   <td colspan="3" width=100% class="dvtCellInfo" align="left"><div id="dtlview_{$label}" style="width:100%;height:200px;overflow:hidden;border:1px solid gray" class="detailedViewTextBox" onmouseover="this.className='detailedViewTextBoxOn'" onmouseout="this.className='detailedViewTextBox'">{$keyval}</div>
                                                   </td>
                                              {elseif $keyid eq 80} <!--SalesOrderPopup-->
-                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}"><a href="{$keyseclink}">{$keyval}</a></span>
+                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}"><a href="{$keyseclink}">{$keyval}</a></span>
                                               		<div id="editarea_{$label}" style="display:none;">                                              		  
                                                          <input id="popuptxt_{$label}" name="salesorder_name" readonly type="text" style="border:1px solid #bababa;" value="{$keyval}"><input id="txtbox_{$label}" name="{$keyfldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=SalesOrder&action=Popup&html=Popup_picker&popuptype=specific&form=EditView","test","width=600,height=400,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.salesorder_id.value=''; this.form.salesorder_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
                                                          <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
@@ -137,7 +137,7 @@
 					{elseif $keyid eq '53'} <!--Assigned To-->
                     <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">
 				
-                    <span id="dtlview_{$label}">
+                    &nbsp;<span id="dtlview_{$label}">
                     {if $keyseclink eq ''}
                         {$keyval}
                     {else}
@@ -160,7 +160,7 @@
                     </div>
                     </td>
 					    {elseif $keyid eq '56'} <!--CheckBox--> 
-                      <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onMouseOver="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}">{$keyval}&nbsp;</span>
+                      <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onMouseOver="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}">{$keyval}&nbsp;</span>
                     	<div id="editarea_{$label}" style="display:none;">
                         {if $keyval eq 'yes'}                                              		  
                             <input id="txtbox_{$label}" name="{$keyfldname}" type="checkbox" style="border:1px solid #bababa;" checked value="1">



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 10:35:36 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 17:35:36 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7389 -
	/vtigercrm/trunk/modules/Leads/DetailView.php
Message-ID: <20060621173536.CD35983F434@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 21 11:35:28 2006
New Revision: 7389

Log:
security issue in detail view ajax fixed

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 Jun 21 11:35:28 2006
@@ -121,6 +121,7 @@
 $smarty->assign("CHECK", $check_button);
 
 $smarty->assign("MODULE", $currentModule);
+$smarty->assign("EDIT_PERMISSION",isPermitted($currentModule,'EditView',$_REQUEST[record]));
 $smarty->display("DetailView.tpl");
 
 ?>



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 10:37:09 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 17:37:09 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7390 -
	/vtigercrm/trunk/modules/Accounts/DetailView.php
Message-ID: <20060621173709.D35A283F434@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 21 11:37:01 2006
New Revision: 7390

Log:
fixed detail view ajax security issue

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

Modified: vtigercrm/trunk/modules/Accounts/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Accounts/DetailView.php (original)
+++ vtigercrm/trunk/modules/Accounts/DetailView.php Wed Jun 21 11:37:01 2006
@@ -108,5 +108,6 @@
 $smarty->assign("CHECK", $check_button);
 
 $smarty->assign("MODULE",$currentModule);
+$smarty->assign("EDIT_PERMISSION",isPermitted($currentModule,'EditView',$_REQUEST[record]));
 $smarty->display("DetailView.tpl");
 ?>



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 10:39:15 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 17:39:15 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7392 -
	/vtigercrm/trunk/modules/Campaigns/DetailView.php
Message-ID: <20060621173915.B8D8D64FD1A@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 21 11:39:07 2006
New Revision: 7392

Log:
fixed detail view ajax issue

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 Jun 21 11:39:07 2006
@@ -68,7 +68,9 @@
 $smarty->assign("CHECK", $check_button);
 
 $smarty->assign("MODULE",$currentModule);
+$smarty->assign("EDIT_PERMISSION",isPermitted($currentModule,'EditView',$_REQUEST[record]));
 $smarty->display("DetailView.tpl");
+
 $focus->id = $_REQUEST['record'];
 
 ?>



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 10:40:19 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 17:40:19 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7393 -
	/vtigercrm/trunk/modules/Contacts/DetailView.php
Message-ID: <20060621174019.7D98083F00B@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 21 11:40:11 2006
New Revision: 7393

Log:
fixed the detail view ajax issue

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

Modified: vtigercrm/trunk/modules/Contacts/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/DetailView.php (original)
+++ vtigercrm/trunk/modules/Contacts/DetailView.php Wed Jun 21 11:40:11 2006
@@ -119,6 +119,7 @@
 $smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']);
 
 $smarty->assign("MODULE",$currentModule);
+$smarty->assign("EDIT_PERMISSION",isPermitted($currentModule,'EditView',$_REQUEST[record]));
 $smarty->display("DetailView.tpl");
 ?>
 



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 10:43:06 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 17:43:06 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7394 -
	/vtigercrm/trunk/modules/Faq/DetailView.php
Message-ID: <20060621174306.8AB3683F3A7@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 21 11:42:58 2006
New Revision: 7394

Log:
fixed the detail view ajax issue

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

Modified: vtigercrm/trunk/modules/Faq/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Faq/DetailView.php (original)
+++ vtigercrm/trunk/modules/Faq/DetailView.php Wed Jun 21 11:42:58 2006
@@ -92,6 +92,6 @@
 
 //Added to display the Faq comments information
 $smarty->assign("COMMENT_BLOCK",$focus->getFAQComments($_REQUEST['record']));
-
+$smarty->assign("EDIT_PERMISSION",isPermitted($currentModule,'EditView',$_REQUEST[record]));
 $smarty->display("DetailView.tpl");
 ?>



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 10:44:04 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 17:44:04 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7395 -
	/vtigercrm/trunk/modules/HelpDesk/DetailView.php
Message-ID: <20060621174405.42A9D83F3A7@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 21 11:43:55 2006
New Revision: 7395

Log:
fixed the detail view ajax issue

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

Modified: vtigercrm/trunk/modules/HelpDesk/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/DetailView.php (original)
+++ vtigercrm/trunk/modules/HelpDesk/DetailView.php Wed Jun 21 11:43:55 2006
@@ -101,6 +101,7 @@
 $smarty->assign("COMMENT_BLOCK",$focus->getCommentInformation($_REQUEST['record']));
 
 $smarty->assign("MODULE",$currentModule);
+$smarty->assign("EDIT_PERMISSION",isPermitted($currentModule,'EditView',$_REQUEST[record]));
 $smarty->display("DetailView.tpl");
 $focus->id = $_REQUEST['record'];
 



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 10:56:15 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 17:56:15 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7396 -
 /vtigercrm/trunk/Smarty/templates/Inventory/InventoryDetailView.tpl
Message-ID: <20060621175615.DE8C783F462@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 21 11:56:06 2006
New Revision: 7396

Log:
fixed the detail view ajax edit issues

Modified:
    vtigercrm/trunk/Smarty/templates/Inventory/InventoryDetailView.tpl

Modified: vtigercrm/trunk/Smarty/templates/Inventory/InventoryDetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Inventory/InventoryDetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Inventory/InventoryDetailView.tpl Wed Jun 21 11:56:06 2006
@@ -185,7 +185,11 @@
 							<td class="dvtCellLabel" align=right width=25%>{$label}</td>
 						{/if}
 					{/if}  
-						{include file="DetailViewUI.tpl"}
+						{if $EDIT_PERMISSION eq 'yes'}
+							{include file="DetailViewUI.tpl"}
+						{else}
+							{include file="DetailViewFields.tpl"}
+						{/if}
 				{else} 
 					<td class="dvtCellLabel" align=right>&nbsp;</td>
 					<td class="dvtCellInfo" align=left >&nbsp;</td>



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 10:57:38 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 17:57:38 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7397 -
	/vtigercrm/trunk/modules/Invoice/DetailView.php
Message-ID: <20060621175738.0B23283F462@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 21 11:57:30 2006
New Revision: 7397

Log:
fixed the detail view ajax edit issues

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 Jun 21 11:57:30 2006
@@ -87,7 +87,7 @@
 $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']);
 $smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']);
 $smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']);
-
+$smarty->assign("EDIT_PERMISSION",isPermitted($currentModule,'EditView',$_REQUEST[record]));
 $smarty->display("Inventory/InventoryDetailView.tpl");
 
 ?>



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 11:00:03 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 18:00:03 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7399 -
	/vtigercrm/trunk/modules/Potentials/DetailView.php
Message-ID: <20060621180003.F2DAF83F462@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 21 11:59:53 2006
New Revision: 7399

Log:
fixed the detail view ajax edit issues

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

Modified: vtigercrm/trunk/modules/Potentials/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Potentials/DetailView.php (original)
+++ vtigercrm/trunk/modules/Potentials/DetailView.php Wed Jun 21 11:59:53 2006
@@ -90,5 +90,6 @@
 
 $smarty->assign("CONVERTMODE",'potentoinvoice');
 $smarty->assign("MODULE","Potentials");
+$smarty->assign("EDIT_PERMISSION",isPermitted($currentModule,'EditView',$_REQUEST[record]));
 $smarty->display("DetailView.tpl");
 ?>



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 11:00:39 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 18:00:39 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7400 -
	/vtigercrm/trunk/modules/PriceBooks/DetailView.php
Message-ID: <20060621180039.665B140A839@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 21 12:00:31 2006
New Revision: 7400

Log:
fixed the detail view ajax edit issues

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

Modified: vtigercrm/trunk/modules/PriceBooks/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/PriceBooks/DetailView.php (original)
+++ vtigercrm/trunk/modules/PriceBooks/DetailView.php Wed Jun 21 12:00:31 2006
@@ -72,5 +72,6 @@
 
 $smarty->assign("MODULE", $currentModule);
 $smarty->assign("SINGLE_MOD",$app_strings['PriceBook']);
+$smarty->assign("EDIT_PERMISSION",isPermitted($currentModule,'EditView',$_REQUEST[record]));
 $smarty->display("Inventory/InventoryDetailView.tpl");
 ?>



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 11:01:32 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 18:01:32 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7401 -
	/vtigercrm/trunk/modules/Products/DetailView.php
Message-ID: <20060621180132.8A03F40A839@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 21 12:01:24 2006
New Revision: 7401

Log:
fixed the detail view ajax edit issues

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 Jun 21 12:01:24 2006
@@ -87,6 +87,7 @@
 
 //Security check for related list
 $smarty->assign("MODULE", $currentModule);
+$smarty->assign("EDIT_PERMISSION",isPermitted($currentModule,'EditView',$_REQUEST[record]));
 $smarty->display("Inventory/InventoryDetailView.tpl");
 
 ?>



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 11:02:41 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 18:02:41 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7402 -
 /vtigercrm/trunk/modules/PurchaseOrder/DetailView.php
Message-ID: <20060621180242.1654883F46D@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 21 12:02:33 2006
New Revision: 7402

Log:
fixed the detail view ajax edit issues

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 Jun 21 12:02:33 2006
@@ -90,6 +90,7 @@
 
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
+$smarty->assign("EDIT_PERMISSION",isPermitted($currentModule,'EditView',$_REQUEST[record]));
 $smarty->display("Inventory/InventoryDetailView.tpl");
 
 



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 11:03:29 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 18:03:29 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7403 -
	/vtigercrm/trunk/modules/Quotes/DetailView.php
Message-ID: <20060621180329.A118283F46D@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 21 12:03:20 2006
New Revision: 7403

Log:
fixed the detail view ajax edit issues

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 Jun 21 12:03:20 2006
@@ -98,7 +98,7 @@
 $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']);
 $smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']);
 $smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']);
-
+$smarty->assign("EDIT_PERMISSION",isPermitted($currentModule,'EditView',$_REQUEST[record]));
 $smarty->display("Inventory/InventoryDetailView.tpl");
 
 ?>



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 11:05:35 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 18:05:35 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7405 -
	/vtigercrm/trunk/modules/Vendors/DetailView.php
Message-ID: <20060621180535.BC4B7298FA7@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 21 12:05:27 2006
New Revision: 7405

Log:
fixed the detail view ajax edit issues

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

Modified: vtigercrm/trunk/modules/Vendors/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Vendors/DetailView.php (original)
+++ vtigercrm/trunk/modules/Vendors/DetailView.php Wed Jun 21 12:05:27 2006
@@ -68,7 +68,7 @@
 $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']);
 $smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']);
 $smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']);
-
+$smarty->assign("EDIT_PERMISSION",isPermitted($currentModule,'EditView',$_REQUEST[record]));
 $smarty->display("Inventory/InventoryDetailView.tpl");
 
 ?>



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 10:38:11 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 17:38:11 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7391 -
	/vtigercrm/trunk/modules/Activities/DetailView.php
Message-ID: <20060621173811.29CD283F434@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 21 11:38:03 2006
New Revision: 7391

Log:
fixed detail view ajax issue

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

Modified: vtigercrm/trunk/modules/Activities/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Activities/DetailView.php (original)
+++ vtigercrm/trunk/modules/Activities/DetailView.php Wed Jun 21 11:38:03 2006
@@ -146,6 +146,7 @@
  $smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']);
 
 $smarty->assign("MODULE",$currentModule);
+$smarty->assign("EDIT_PERMISSION",isPermitted($currentModule,'EditView',$_REQUEST[record]));
 $smarty->display("DetailView.tpl");
 
 ?>



From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 12:33:01 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 19:33:01 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231352=3A?=
 =?utf-8?q?_integrate_source_code_of_self_update_functionality_get_form_ga?=
 =?utf-8?b?bGxlcnkuc2YubmV0ICh2Mik=?=
Message-ID: <076.c9c005c06f2e1cab9b816c461bc143a2@vtiger.fosslabs.com>

#1352: integrate source code of self update functionality get form gallery.sf.net
(v2)
---------------------------------------+------------------------------------
 Reporter:  shimon at schoolportal.co.il  |       Owner:  developer
     Type:  defect                     |      Status:  new      
 Priority:  minor                      |   Milestone:  5.0.0    
Component:  vtigercrm                  |     Version:  5.0.0    
 Keywords:  update,                    |  
---------------------------------------+------------------------------------
 i think gallery 2 is a php gallery, has good update functionality and may
 be ulilized
 http://gllery.sf.net

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1352>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 12:34:40 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 19:34:40 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231352=3A?=
 =?utf-8?q?_integrate_source_code_of_self_update_functionality_get_form_ga?=
 =?utf-8?b?bGxlcnkuc2YubmV0ICh2Mik=?=
In-Reply-To: <076.c9c005c06f2e1cab9b816c461bc143a2@vtiger.fosslabs.com>
References: <076.c9c005c06f2e1cab9b816c461bc143a2@vtiger.fosslabs.com>
Message-ID: <085.7d8cb0584ff2ad4f8efe45e7f7e134b9@vtiger.fosslabs.com>

#1352: integrate source code of self update functionality get form gallery.sf.net
(v2)
----------------------------------------+-----------------------------------
  Reporter:  shimon at schoolportal.co.il  |       Owner:  developer
      Type:  defect                     |      Status:  new      
  Priority:  minor                      |   Milestone:  5.0.0    
 Component:  vtigercrm                  |     Version:  5.0.0    
Resolution:                             |    Keywords:  update,  
----------------------------------------+-----------------------------------
Comment (by shimon):

 http://gallery.sf.net

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1352>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 13:09:44 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 20:09:44 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231353=3A?=
 =?utf-8?q?_Modifications_for_translation?=
Message-ID: <076.5f6b63545ffb289da25a5900a96337fe@vtiger.fosslabs.com>

#1353: Modifications for translation
------------------------------------+---------------------------------------
 Reporter:  william.maes at wandoo.fr  |       Owner:  developer
     Type:  enhancement             |      Status:  new      
 Priority:  minor                   |   Milestone:  5.0.0    
Component:  vtigercrm               |     Version:  5.0.0    
 Keywords:  search engine           |  
------------------------------------+---------------------------------------
 Modifications for the search engine

 /modules/Home/UnifiedSearch.php
 -------------------------------

 Line 260 :
 document.getElementById("global_search_total_count").innerHTML =
 "$mod_strings['LBL_TRESULTS'] : <b><?php echo $total_record_count;
 ?></b>";

 Line 264 :
 <td nowrap align="right">$mod_strings['LBL_SRESULTS'] &nbsp;


 /modules/Home/language/en_us.lang.php
 -------------------------------------
 Add :
 'LBL_SRESULTS' =>'Show Results in',
 'LBL_TRESULTS' =>'Total Records found',

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1353>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 13:12:43 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 20:12:43 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231353=3A?=
 =?utf-8?q?_Modifications_for_translation?=
In-Reply-To: <076.5f6b63545ffb289da25a5900a96337fe@vtiger.fosslabs.com>
References: <076.5f6b63545ffb289da25a5900a96337fe@vtiger.fosslabs.com>
Message-ID: <085.6f278dedcb852dc44320697d1d865432@vtiger.fosslabs.com>

#1353: Modifications for translation
-------------------------------------+--------------------------------------
  Reporter:  william.maes at wandoo.fr  |       Owner:  developer    
      Type:  enhancement             |      Status:  new          
  Priority:  minor                   |   Milestone:  5.0.0        
 Component:  vtigercrm               |     Version:  5.0.0        
Resolution:                          |    Keywords:  search engine
-------------------------------------+--------------------------------------
-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1353>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 13:13:02 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 20:13:02 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231353=3A?=
 =?utf-8?q?_Modifications_for_translation?=
In-Reply-To: <076.5f6b63545ffb289da25a5900a96337fe@vtiger.fosslabs.com>
References: <076.5f6b63545ffb289da25a5900a96337fe@vtiger.fosslabs.com>
Message-ID: <085.61c7295865d340718776e8a2da3f3e48@vtiger.fosslabs.com>

#1353: Modifications for translation
-------------------------------------+--------------------------------------
  Reporter:  william.maes at wandoo.fr  |       Owner:  anonymous    
      Type:  enhancement             |      Status:  assigned     
  Priority:  minor                   |   Milestone:  5.0.0        
 Component:  vtigercrm               |     Version:  5.0.0        
Resolution:                          |    Keywords:  search engine
-------------------------------------+--------------------------------------
Changes (by anonymous):

  * status:  new => assigned
  * owner:  developer => anonymous

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1353>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 20:51:26 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 22 Jun 2006 03:51:26 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7406 - in
 /vtigercrm/trunk/modules/PurchaseOrder: DetailView.php EditView.php
Message-ID: <20060622035127.506A583F4B1@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 21:51:21 2006
New Revision: 7406

Log:
changes made to get validationdata removed

Modified:
    vtigercrm/trunk/modules/PurchaseOrder/DetailView.php
    vtigercrm/trunk/modules/PurchaseOrder/EditView.php

Modified: vtigercrm/trunk/modules/PurchaseOrder/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/PurchaseOrder/DetailView.php (original)
+++ vtigercrm/trunk/modules/PurchaseOrder/DetailView.php Wed Jun 21 21:51:21 2006
@@ -79,9 +79,8 @@
 //Get the associated Products and then display above Terms and Conditions
 $smarty->assign("ASSOCIATED_PRODUCTS",getDetailAssociatedProducts('PurchaseOrder',$focus));
 
- $po_tables = Array('purchaseorder','pobillads','poshipads','purchaseordercf');
  $tabid = getTabid("PurchaseOrder");
- $validationData = getDBValidationData($po_tables,$tabid);
+ $validationData = getDBValidationData($focus->tab_name,$tabid);
  $data = split_validationdataArray($validationData);
 
  $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']);

Modified: vtigercrm/trunk/modules/PurchaseOrder/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/PurchaseOrder/EditView.php (original)
+++ vtigercrm/trunk/modules/PurchaseOrder/EditView.php Wed Jun 21 21:51:21 2006
@@ -193,9 +193,8 @@
 
 
 
-$po_tables = Array('purchaseorder','pobillads','poshipads','purchaseordercf'); 
  $tabid = getTabid("PurchaseOrder");
- $validationData = getDBValidationData($po_tables,$tabid);
+ $validationData = getDBValidationData($focus->tab_name,$tabid);
  $data = split_validationdataArray($validationData);
 
  $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']);



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 20:52:10 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 22 Jun 2006 03:52:10 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7407 -
	/vtigercrm/trunk/modules/PurchaseOrder/Forms.php
Message-ID: <20060622035210.B2F8683F4B1@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 21:52:07 2006
New Revision: 7407

Log:
forms.php has been removed

Removed:
    vtigercrm/trunk/modules/PurchaseOrder/Forms.php



From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 20:52:49 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 22 Jun 2006 03:52:49 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23644=3A_?=
 =?utf-8?q?logs_in_notification_schedular?=
In-Reply-To: <076.c1cfccb88b72051f409d50fc0c74708c@vtiger.fosslabs.com>
References: <076.c1cfccb88b72051f409d50fc0c74708c@vtiger.fosslabs.com>
Message-ID: <085.14800fd061834203b3b5b101923fb7bc@vtiger.fosslabs.com>

#644: logs in notification schedular
--------------------------------+-------------------------------------------
  Reporter:  minnie at vtiger.com  |       Owner:  minnie
      Type:  defect             |      Status:  closed
  Priority:  major              |   Milestone:  5.0.0 
 Component:  vtigercrm          |     Version:  5.0.0 
Resolution:  fixed              |    Keywords:        
--------------------------------+-------------------------------------------
Changes (by mangai):

  * resolution:  => fixed
  * status:  reopened => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/644>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 21:20:20 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 22 Jun 2006 04:20:20 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7408 -
 /vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
Message-ID: <20060622042020.A04F383F4B7@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 22:20:16 2006
New Revision: 7408

Log:
contact has been removed from event editview

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

Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original)
+++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Wed Jun 21 22:20:16 2006
@@ -549,16 +549,15 @@
  $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'duration_hours','vtiger_activity',1,'63','duration_hours','Duration',1,0,0,100,7,41,1,'I~M',0,5,'BAS')");
  $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'duration_minutes','vtiger_activity',1,'15','duration_minutes','Duration Minutes',1,0,0,100,8,41,3,'O~O',1,null,'BAS')");
  $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'crmid','vtiger_seactivityrel',1,'66','parent_id','Related To',1,0,0,100,9,41,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'contactid','vtiger_cntactivityrel',1,'57','contact_id','Contact Name',1,0,0,100,10,41,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'eventstatus','vtiger_activity',1,'15','eventstatus','Status',1,0,0,100,11,41,1,'V~O',0,3,'BAS')");
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'sendnotification','vtiger_activity',1,'56','sendnotification','Send Notification',1,0,0,100,12,41,1,'C~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'activitytype','vtiger_activity',1,'15','activitytype','Activity Type',1,0,0,100,13,41,1,'V~O',0,4,'BAS')");
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'location','vtiger_activity',1,'1','location','Location',1,0,0,100,14,41,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,15,41,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,16,41,2,'T~O',1,null,'BAS')");
- $this->db->query("Insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'priority','vtiger_activity',1,15,'taskpriority','Priority',1,0,0,100,17,41,1,'V~O',1,null,'BAS')");
- $this->db->query("Insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'notime','vtiger_activity',1,56,'notime','No Time',1,0,0,100,18,41,1,'C~O',1,null,'BAS')");
- $this->db->query("Insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'visibility','vtiger_activity',1,15,'visibility','Visibility',1,0,0,100,19,41,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'eventstatus','vtiger_activity',1,'15','eventstatus','Status',1,0,0,100,10,41,1,'V~O',0,3,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'sendnotification','vtiger_activity',1,'56','sendnotification','Send Notification',1,0,0,100,11,41,1,'C~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'activitytype','vtiger_activity',1,'15','activitytype','Activity Type',1,0,0,100,12,41,1,'V~O',0,4,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'location','vtiger_activity',1,'1','location','Location',1,0,0,100,13,41,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,14,41,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,15,41,2,'T~O',1,null,'BAS')");
+ $this->db->query("Insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'priority','vtiger_activity',1,15,'taskpriority','Priority',1,0,0,100,16,41,1,'V~O',1,null,'BAS')");
+ $this->db->query("Insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'notime','vtiger_activity',1,56,'notime','No Time',1,0,0,100,17,41,1,'C~O',1,null,'BAS')");
+ $this->db->query("Insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'visibility','vtiger_activity',1,15,'visibility','Visibility',1,0,0,100,18,41,1,'V~O',1,null,'BAS')");
  
  $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,43,1,'V~O',1,null,'BAS')");
  $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'reminder_time','vtiger_activity_reminder',1,'30','reminder_time','Send Reminder',1,0,0,100,1,42,1,'I~O',1,null,'BAS')");



From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 21:21:14 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 22 Jun 2006 04:21:14 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23940=3A_?=
 =?utf-8?q?contact_not_displayed_in_activity_relatedlit?=
In-Reply-To: <076.65ef01ee3bf555e0572b3067a1b9889c@vtiger.fosslabs.com>
References: <076.65ef01ee3bf555e0572b3067a1b9889c@vtiger.fosslabs.com>
Message-ID: <085.f29de87baf0454d45acc03b2c6f62b94@vtiger.fosslabs.com>

#940: contact not displayed in activity relatedlit
------------------------+---------------------------------------------------
  Reporter:  mickie     |       Owner:  minnie
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mangai):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/940>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 21:27:46 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 22 Jun 2006 04:27:46 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7409 - in
 /vtigercrm/trunk/Smarty/templates: DetailViewUI.tpl UserDetailView.tpl
Message-ID: <20060622042746.3719583F48D@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 21 22:27:35 2006
New Revision: 7409

Log:
Ajax edit added for UserDetailView

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

Modified: vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl Wed Jun 21 22:27:35 2006
@@ -13,7 +13,7 @@
 -->*}
 
 <!-- This file is used to display the fields based on the ui type in detailview -->
-		{if $keyid eq '1' || $keyid eq 2 || $keyid eq '11' || $keyid eq '7' || $keyid eq '9' || $keyid eq '55' || $keyid eq '71' || $keyid eq '72'} <!--TextBox-->
+		{if $keyid eq '1' || $keyid eq 2 || $keyid eq '11' || $keyid eq '7' || $keyid eq '9' || $keyid eq '55' || $keyid eq '71' || $keyid eq '72' || $keyid eq '103'} <!--TextBox-->
                                          		<td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">
                                          		      {if $keyid eq '55'}<!--SalutationSymbol-->
                                          		            {$keysalut}
@@ -27,7 +27,7 @@
                                               		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                                                        </div>
                                                   </td>
-                                             {elseif $keyid eq '13'} <!--Email-->
+                                             {elseif $keyid eq '13' || $keyid eq '104'} <!--Email-->
                                                   <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}"><a href="mailto:{$keyval}" target="_blank">{$keyval}</a></span>
                                               		<div id="editarea_{$label}" style="display:none;">
                                               		  <input class="detailedViewTextBox" onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" type="text" id="txtbox_{$label}" name="{$keyfldname}" maxlength='100' value="{$keyval}"></input>
@@ -48,6 +48,45 @@
                     							   <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
                                               		   <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                     							</div>
+               							</td>
+						{elseif $keyid eq '115'} <!--ComboBox Status edit only for admin Users-->
+								{if $keyadmin eq 1}
+               							<td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}">{$keyval}</span>
+                                              		<div id="editarea_{$label}" style="display:none;">
+                    							   <select id="txtbox_{$label}" name="{$keyfldname}">
+                    								{foreach item=arr from=$keyoptions}
+                    									{foreach key=sel_value item=value from=$arr}
+                    										<option value="{$sel_value}" {$value}>{$sel_value}</option>
+                    									{/foreach}
+                    								{/foreach}
+                    							   </select>
+                    							   <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                              		   <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
+                    							</div>
+								{else}
+               							<td width=25% class="dvtCellInfo" align="left">{$keyval}
+								{/if}	
+								
+               							</td>
+						{elseif $keyid eq '116'} <!--ComboBox currency id edit only for admin Users-->
+								{if $keyadmin eq 1}
+               							<td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}">{$keyval}</span>
+								<div id="editarea_{$label}" style="display:none;">
+                    							   <select id="txtbox_{$label}" name="{$keyfldname}">
+									{foreach item=arr key=uivalueid from=$keyoptions}
+									{foreach key=sel_value item=value from=$arr}
+										<option value="{$uivalueid}" {$value}>{$sel_value}</option>	
+									{/foreach}
+									{/foreach}
+                    							   </select>
+                    							   <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                              		   <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
+                    							</div>
+								{else}
+               							<td width=25% class="dvtCellInfo" align="left">{$keyval}
+								{/if}	
+
+                                        		
                							</td>
                                              {elseif $keyid eq '17'} <!--WebSite-->
                                                   <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}"><a href="http://{$keyval}" target="_blank">{$keyval}</a></span>
@@ -170,7 +209,24 @@
                          <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');"/> or
                           <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                         </div>
-                        </td>     
+                        </td>    
+			{elseif $keyid eq '156'} <!--CheckBox for is admin-->
+			{if $smarty.request.record neq $CURRENT_USERID && $keyadmin eq 1} 
+                      <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onMouseOver="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}">{$keyval}&nbsp;</span>
+                    	<div id="editarea_{$label}" style="display:none;">
+                        {if $keyval eq 'on'}                                              		  
+                            <input id="txtbox_{$label}" name="{$keyfldname}" type="checkbox" style="border:1px solid #bababa;" checked value="1">
+                        {else}
+                          <input id="txtbox_{$label}" type="checkbox" name="{$keyfldname}" style="border:1px solid #bababa;" value="0">
+                       	{/if}
+                         <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');"/> or
+                          <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
+                        </div>
+			{else}
+				 <td width=25% class="dvtCellInfo" align="left">{$keyval}
+			{/if}
+                        </td>    
+			 
 						{elseif $keyid eq 83}<!-- Handle the Tax in Inventory -->
 							<td align="right" class="dvtCellLabel">
 							{$APP.LBL_VAT} {$APP.COVERED_PERCENTAGE}

Modified: vtigercrm/trunk/Smarty/templates/UserDetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/UserDetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/UserDetailView.tpl Wed Jun 21 22:27:35 2006
@@ -1,174 +1,183 @@
-{*<!--
-/*********************************************************************************
-  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
-   * ("License"); You may not use this file except in compliance with the License
-   * The Original Code is:  vtiger CRM Open Source
-   * The Initial Developer of the Original Code is vtiger.
-   * Portions created by vtiger are Copyright (C) vtiger.
-   * All Rights Reserved.
-  *
- ********************************************************************************/
--->*}
-<script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
-<script language="JavaScript" type="text/javascript" src="include/js/ColorPicker2.js"></script>
-<script language="javascript" type="text/javascript" src="include/js/general.js"></script>
-<script language="JavaScript" type="text/javascript" src="include/js/dtlviewajax.js"></script>
-<span id="crmspanid" style="display:none;position:absolute;"  onmouseover="show('crmspanid');">
-   <a class="link"  align="right" href="javascript:;">Edit</a>
-</span>
-
-<style type="text/css">@import url(themes/blue/style.css);</style>
-
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-<tr>
-{if $CATEGORY eq 'Settings'}
-	{include file='SettingsMenu.tpl'}
-{/if}
-<td width="75%" valign="top">
-<table width="100%"  border="0" cellspacing="0" cellpadding="0">
-	<tr><td class="padTab" align="left">
-		<table width="100%" border="0" cellpadding="0" cellspacing="0">
-		<form name="DetailView" method="POST" action="index.php" ENCTYPE="multipart/form-data" id="form">
-			<input type="hidden" name="module" value="Users">
-			<input type="hidden" name="record" value="{$ID}">
-			<input type="hidden" name="isDuplicate" value=false>
-			<input type="hidden" name="action">
-
-{if $CATEGORY eq 'Settings'}
-			<input type="hidden" name="modechk" value="prefview">
-{/if}
-			<input type="hidden" name="user_name" value="{$USER_NAME}">
-			<input type="hidden" name="old_password">
-			<input type="hidden" name="new_password">
-			<input type="hidden" name="return_module">
-			<input type="hidden" name="return_action">
-			<input type="hidden" name="return_id">
-			<input type="hidden" name="forumDisplay">
-{if $CATEGORY eq 'Settings'}
-			<input type="hidden" name="parenttab" value="{$PARENTTAB}">
-{/if}	
-
-			<tr>
-				<td style="border-bottom:1px dashed #CCCCCC;">
-					<table width="100%" cellpadding="5" cellspacing="0" border="0">
-					<tr>
-						<td colspan="2" style="padding:5px;">
-						{if $CATEGORY eq 'Settings'}
-							<span class="lvtHeaderText">
-							<b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS} </a> > {$MOD.LBL_USER_MANAGEMENT} > {$MOD.LBL_USERS}</b></span>
-						{else}
-							<span class="lvtHeaderText">	
-							<b>{$APP.LBL_MY_PREFERENCES}</b>
-							</span>
-						{/if}
-											
-				<hr noshade="noshade" size="1" />
-											</td>
-									  </tr>
-									<tr>
-											<td width="5%"><img src="{$IMAGE_PATH}user.gif" align="absmiddle"></td>
-											<td width="95%"><span class="genHeaderGrayBig">{$USER_NAME}</span><br>
-												<b class="small">{$UMOD.LBL_DETAIL_VIEW} {$FIRST_NAME} {$LAST_NAME}</b>
-											</td>
-									</tr>
-							</table>
-					</td>
-			</tr>
-			<tr><td>&nbsp;</td></tr>
-			<tr valign="center">
-			        <td class="small" align="center">
-					{$EDIT_BUTTON}
-				{$CHANGE_PW_BUTTON}
-				{$LOGIN_HISTORY_BUTTON}
-			{if $CATEGORY eq 'Settings'}
-				{$DUPLICATE_BUTTON}
-			{/if}	
-				{$CHANGE_HOMEPAGE_BUTTON}	
-				{$LISTROLES_BUTTON}
-	</td></tr>
-
-		<tr><td colspan="2">&nbsp;</td></tr>
-		<tr><td colspan="2">
-		<table align="center" border="0" cellpadding="0" cellspacing="0" width="99%">
-		  
-		  <tr>
-			<td>
-			  <table class="small" border="0" cellpadding="3" cellspacing="0" width="100%">
-			  <tr >
-			        <td id="prof" width="25%" align="center" nowrap="nowrap" class="dvtSelectedCell" onClick="fnVis('prof')"><b>{$UMOD.LBL_USER_LOGIN_ROLE}</b></td>
-			     <td class="dvtTabCache" width="10" nowrap="nowrap">&nbsp;</td>
-				    <td class="dvtTabCache" nowrap="nowrap" width="10">&nbsp;</td>
-			  </tr>
-			  </table>
-			</td>
-		  </tr>
-		  <tr>
-		  	<td align="left" valign="top">
-				{foreach key=header item=detail from=$BLOCKS}
-				<table border=0 cellspacing=0 cellpadding=0 width=100% class="small">
-  		    	<tr>
-    	               <td>&nbsp;</td>
-        	           <td>&nbsp;</td>
-            	       <td>&nbsp;</td>
-                	   <td align=right>
-				</tr>  
-				<tr>
-						{strip}
-					     <td colspan=4 style="border-bottom:1px solid #999999;padding:5px;" bgcolor="#e5e5e5">
-							<b>	{$header}</b>
-						 </td>
-						 {/strip}
-			    </tr>
-					{foreach item=detail from=$detail}
-					<tr style="height:25px">
-							{foreach key=label item=data from=$detail}
-							   {assign var=keyid value=$data.ui}
-							   {assign var=keyval value=$data.value}
-							   {assign var=keytblname value=$data.tablename}
-							   {assign var=keyfldname value=$data.fldname}
-							   {assign var=keyoptions value=$data.options}
-							   {assign var=keysecid value=$data.secid}
-							   {assign var=keyseclink value=$data.link}
-							   {assign var=keycursymb value=$data.cursymb}
-							   {assign var=keysalut value=$data.salut}
-							   {assign var=keycntimage value=$data.cntimage}
-							   {assign var=keyadmin value=$data.isadmin}
-							   
-							   <input type="hidden" id="hdtxt_IsAdmin" value={$keyadmin}></input>
-							   	{if $label ne ''}
-									<td class="dvtCellLabel" align=right width=25%>{$label}</td>
-									{include file="DetailViewUI.tpl"}
-								{else}
-                                    <td class="dvtCellLabel" align=right>&nbsp;</td>
-                                    <td class="dvtCellInfo" align=left >&nbsp;</td>
-				{/if}	
-							{/foreach}
-			 	</tr>
-					{/foreach}
-					</table>
-				 {/foreach}
-
-			</td>
-			</tr>
-			
-	        <tr><td>&nbsp;</td></tr>
-			
-	  </table>
-
-
-
-</td></tr>
-</table>
-</form>
-</td></tr>
-</table>
-</td></tr>
-</table>
-</td>
-</tr>
-</table>
-
-{$JAVASCRIPT}
-{if $CATEGORY eq 'Settings'}
-	{include file='SettingsSubMenu.tpl'}
-{/if}
+{*<!--
+/*********************************************************************************
+  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
+   * ("License"); You may not use this file except in compliance with the License
+   * The Original Code is:  vtiger CRM Open Source
+   * The Initial Developer of the Original Code is vtiger.
+   * Portions created by vtiger are Copyright (C) vtiger.
+   * All Rights Reserved.
+  *
+ ********************************************************************************/
+-->*}
+<script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
+<script language="JavaScript" type="text/javascript" src="include/js/ColorPicker2.js"></script>
+<script language="javascript" type="text/javascript" src="include/js/general.js"></script>
+<script language="JavaScript" type="text/javascript" src="include/js/dtlviewajax.js"></script>
+<span id="crmspanid" style="display:none;position:absolute;"  onmouseover="show('crmspanid');">
+   <a class="link"  align="right" href="javascript:;">Edit</a>
+</span>
+
+<style type="text/css">@import url(themes/blue/style.css);</style>
+
+<table width="100%" border="0" cellpadding="0" cellspacing="0">
+<tr>
+{if $CATEGORY eq 'Settings'}
+	{include file='SettingsMenu.tpl'}
+{/if}
+<td width="75%" valign="top">
+
+<table width="100%"  border="0" cellspacing="0" cellpadding="0">
+	<tr><td class="padTab" align="left">
+		<table width="100%" border="0" cellpadding="0" cellspacing="0">
+		<form name="DetailView" method="POST" action="index.php" ENCTYPE="multipart/form-data" id="form">
+			<input type="hidden" name="module" value="Users">
+			<input type="hidden" name="record" value="{$ID}">
+			<input type="hidden" name="isDuplicate" value=false>
+			<input type="hidden" name="action">
+
+{if $CATEGORY eq 'Settings'}
+			<input type="hidden" name="modechk" value="prefview">
+{/if}
+			<input type="hidden" name="user_name" value="{$USER_NAME}">
+			<input type="hidden" name="old_password">
+			<input type="hidden" name="new_password">
+			<input type="hidden" name="return_module">
+			<input type="hidden" name="return_action">
+			<input type="hidden" name="return_id">
+			<input type="hidden" name="forumDisplay">
+{if $CATEGORY eq 'Settings'}
+			<input type="hidden" name="parenttab" value="{$PARENTTAB}">
+{/if}	
+
+			<tr>
+				<td style="border-bottom:1px dashed #CCCCCC;">
+					<table width="100%" cellpadding="5" cellspacing="0" border="0">
+					<tr>
+						<td colspan=2 style="padding:5px;">
+						{if $CATEGORY eq 'Settings'}
+							<span class="lvtHeaderText">
+							<b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS} </a> > {$MOD.LBL_USER_MANAGEMENT} > {$MOD.LBL_USERS}</b></span>
+						{else}
+							<span class="lvtHeaderText">	
+							<b>{$APP.LBL_MY_PREFERENCES}</b>
+							</span>
+						{/if}
+						<span id="vtbusy_info" style="display:none;" valign="bottom"><img src="{$IMAGE_PATH}vtbusy.gif" border="0"></span>					
+				<hr noshade="noshade" size="1" />
+						</td>
+						<td align="right"><hr noshade="noshade" size="1" /></td>
+									  </tr>
+									<tr>
+											<td width="5%"><img src="{$IMAGE_PATH}user.gif" align="absmiddle"></td>
+											<td width="95%"><span class="genHeaderGrayBig">{$USER_NAME}</span><br>
+												<b class="small">{$UMOD.LBL_DETAIL_VIEW} {$FIRST_NAME} {$LAST_NAME}</b>
+											</td>
+									</tr>
+							</table>
+					</td>
+			</tr>
+			<tr><td>&nbsp;</td></tr>
+			<tr valign="center">
+			        <td class="small" align="center">
+					{$EDIT_BUTTON}
+				{$CHANGE_PW_BUTTON}
+				{$LOGIN_HISTORY_BUTTON}
+			{if $CATEGORY eq 'Settings'}
+				{$DUPLICATE_BUTTON}
+			{/if}	
+				{$CHANGE_HOMEPAGE_BUTTON}	
+				{$LISTROLES_BUTTON}
+	</td></tr>
+
+		<tr><td colspan="2">&nbsp;</td></tr>
+		<tr><td colspan="2">
+		<table align="center" border="0" cellpadding="0" cellspacing="0" width="99%">
+		  
+		  <tr>
+			<td>
+			  <table class="small" border="0" cellpadding="3" cellspacing="0" width="100%">
+			  <tr >
+			        <td id="prof" width="25%" align="center" nowrap="nowrap" class="dvtSelectedCell" onClick="fnVis('prof')"><b>{$UMOD.LBL_USER_LOGIN_ROLE}</b></td>
+			     <td class="dvtTabCache" width="10" nowrap="nowrap">&nbsp;</td>
+				    <td class="dvtTabCache" nowrap="nowrap" width="10">&nbsp;</td>
+			  </tr>
+			  </table>
+			</td>
+		  </tr>
+		  <tr>
+		  	<td align="left" valign="top">
+				{foreach key=header item=detail from=$BLOCKS}
+				<table border=0 cellspacing=0 cellpadding=0 width=100% class="small">
+  		    	<tr>
+    	               <td>&nbsp;</td>
+        	           <td>&nbsp;</td>
+            	       <td>&nbsp;</td>
+                	   <td align=right>
+				</tr>  
+				<tr>
+						{strip}
+					     <td colspan=4 style="border-bottom:1px solid #999999;padding:5px;" bgcolor="#e5e5e5">
+							<b>	{$header}</b>
+						 </td>
+						 {/strip}
+			    </tr>
+					{foreach item=detail from=$detail}
+					<tr style="height:25px">
+							{foreach key=label item=data from=$detail}
+							   {assign var=keyid value=$data.ui}
+							   {assign var=keyval value=$data.value}
+							   {assign var=keytblname value=$data.tablename}
+							   {assign var=keyfldname value=$data.fldname}
+							   {assign var=keyoptions value=$data.options}
+							   {assign var=keysecid value=$data.secid}
+							   {assign var=keyseclink value=$data.link}
+							   {assign var=keycursymb value=$data.cursymb}
+							   {assign var=keysalut value=$data.salut}
+							   {assign var=keycntimage value=$data.cntimage}
+							   {assign var=keyadmin value=$data.isadmin}
+							   
+							   <input type="hidden" id="hdtxt_IsAdmin" value={$keyadmin}></input>
+							   	{if $label ne ''}
+									<td class="dvtCellLabel" align=right width=25%>{$label}</td>
+									{include file="DetailViewUI.tpl"}
+								{else}
+                                    <td class="dvtCellLabel" align=right>&nbsp;</td>
+                                    <td class="dvtCellInfo" align=left >&nbsp;</td>
+				{/if}	
+							{/foreach}
+			 	</tr>
+					{/foreach}
+					</table>
+				 {/foreach}
+
+			</td>
+			</tr>
+			
+	        <tr><td>&nbsp;</td></tr>
+			
+	  </table>
+
+
+
+</td></tr>
+</table>
+</form>
+</td></tr>
+</table>
+</td></tr>
+</table>
+</td>
+</tr>
+</table>
+
+{$JAVASCRIPT}
+{if $CATEGORY eq 'Settings'}
+	{include file='SettingsSubMenu.tpl'}
+{/if}
+
+<!-- added for validation -->
+<script language="javascript">
+  var fieldname = new Array({$VALIDATION_DATA_FIELDNAME});
+  var fieldlabel = new Array({$VALIDATION_DATA_FIELDLABEL});
+  var fielddatatype = new Array({$VALIDATION_DATA_FIELDDATATYPE});
+</script>



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 21:33:34 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 22 Jun 2006 04:33:34 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7410 - in
 /vtigercrm/trunk/include/js: dtlviewajax.js general.js
Message-ID: <20060622043334.98BDF83F48D@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 21 22:33:24 2006
New Revision: 7410

Log:
Ajax edit added for UserDetailView

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

Modified: vtigercrm/trunk/include/js/dtlviewajax.js
==============================================================================
--- vtigercrm/trunk/include/js/dtlviewajax.js (original)
+++ vtigercrm/trunk/include/js/dtlviewajax.js Wed Jun 21 22:33:24 2006
@@ -117,6 +117,17 @@
 			tagValue = "0";
 		}
 	}
+	if(uitype == '156')
+	{
+		if(document.getElementById(txtBox).checked == true)
+		{
+			tagValue = "on";
+		}else
+		{
+			tagValue = "off";
+		}
+	}
+
 
 	var data = "file=DetailViewAjax&module=" + module + "&action=" + module + "Ajax&record=" + crmId+"&recordid=" + crmId ;
 	data = data + "&fldName=" + fieldName + "&fieldValue=" + escape(tagValue) + "&ajxaction=DETAILVIEW";
@@ -131,13 +142,13 @@
 					alert("Error while Editing");
 				}
 				else if(response.responseText.indexOf(":#:SUCCESS")>-1)
-    			{
+     				{
 					$("vtbusy_info").style.display="none";
-    			}
-           	}
-        }
+     				}
+                       	}
+                }
         );
-	if(uitype == '13')
+	if(uitype == '13' || uitype == '104')
 	{
 		getObj(dtlView).innerHTML = "<a href=\"mailto:"+ tagValue+"\" target=\"_blank\">"+tagValue+"&nbsp;</a>";
 	}
@@ -166,8 +177,10 @@
 			getObj(dtlView).innerHTML = "";
 		}
 
-	}
-
+	}else if(uitype == 116)
+	{
+			getObj(dtlView).innerHTML = document.getElementById(txtBox).options[document.getElementById(txtBox).selectedIndex].text; 
+	}
 	else if(getObj(popupTxt))
 	{
 		var popObj = getObj(popupTxt);
@@ -226,8 +239,7 @@
 		{
 			getObj(dtlView).innerHTML = popObj.value;
 		}
-	}
-	else
+	}else
 	{
 		getObj(dtlView).innerHTML = tagValue;
 	}

Modified: vtigercrm/trunk/include/js/general.js
==============================================================================
--- vtigercrm/trunk/include/js/general.js (original)
+++ vtigercrm/trunk/include/js/general.js Wed Jun 21 22:33:24 2006
@@ -1076,6 +1076,26 @@
                 getObj("assign_team").style.display="block"
         }
 }
+//to display type of address for google map
+function showLocateMapMenu()
+    {
+            getObj("dropDownMenu").style.display="block"
+            getObj("dropDownMenu").style.left=findPosX(getObj("locateMap"))
+            getObj("dropDownMenu").style.top=findPosY(getObj("locateMap"))+getObj("locateMap").offsetHeight
+    }
+
+
+function hideLocateMapMenu(ev)
+    {
+            if (browser_ie)
+                    currElement=window.event.srcElement
+            else if (browser_nn4 || browser_nn6)
+                    currElement=ev.target
+
+            if (currElement.id!="locateMap")
+                    if (getObj("dropDownMenu").style.display=="block")
+                            getObj("dropDownMenu").style.display="none"
+    }
 /*
 * javascript function to display the div tag
 * @param divId :: div tag ID



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 21:35:21 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 22 Jun 2006 04:35:21 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7411 - in
 /vtigercrm/trunk/modules/Users: DetailView.php DetailViewAjax.php
Message-ID: <20060622043521.9528283F48D@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 21 22:35:07 2006
New Revision: 7411

Log:
Ajax edit added for UserDetailView

Added:
    vtigercrm/trunk/modules/Users/DetailViewAjax.php
Modified:
    vtigercrm/trunk/modules/Users/DetailView.php

Modified: vtigercrm/trunk/modules/Users/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DetailView.php (original)
+++ vtigercrm/trunk/modules/Users/DetailView.php Wed Jun 21 22:35:07 2006
@@ -1,183 +1,191 @@
-<?php
-/*********************************************************************************
- * The contents of this file are subject to the SugarCRM Public License Version 1.1.2
- * ("License"); You may not use this file except in compliance with the
- * License. You may obtain a copy of the License at http://www.sugarcrm.com/SPL
- * Software distributed under the License is distributed on an  "AS IS"  basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
- * the specific language governing rights and limitations under the License.
- * The Original Code is:  SugarCRM Open Source
- * The Initial Developer of the Original Code is SugarCRM, Inc.
- * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.;
- * All Rights Reserved.
- * Contributor(s): ______________________________________.
- ********************************************************************************/
-/*********************************************************************************
- * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Users/DetailView.php,v 1.21 2005/04/19 14:44:02 ray Exp $
- * Description:  TODO: To be written.
- * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
- * All Rights Reserved.
- * Contributor(s): ______________________________________..
- ********************************************************************************/
-
-require_once('Smarty_setup.php');
-require_once('data/Tracker.php');
-require_once('modules/Users/User.php');
-require_once('include/utils/utils.php');
-require_once('include/utils/CommonUtils.php');
-require_once('include/utils/UserInfoUtil.php');
-require_once('include/database/PearDatabase.php');
-
-global $current_user;
-global $theme;
-global $default_language;
-global $adb;
-global $currentModule;
-global $app_strings;
-global $mod_strings;
-
-$focus = new User();
-
-if(!empty($_REQUEST['record'])) {
-	$focus->retrieve_entity_info($_REQUEST['record'],'Users');
-	$focus->id = $_REQUEST['record'];	
-}
-else
-{
-
-    echo "
-        <script type='text/javascript'>
-            window.location = 'index.php?module=Users&action=ListView';
-        </script>
-        ";
-}
-
-if( $focus->user_name == "" )
-{  
-   
-    echo "
-            <table>
-                <tr>
-                    <td>
-                        <b>User does not exist.</b>
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <a href='index.php?module=Users&action=ListView'>List Users</a>
-                    </td>
-                </tr>
-            </table>
-        ";
-    exit;  
-}
-
-
-if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') {
-	$focus->id = "";
-}
-
-global $theme;
-$theme_path="themes/".$theme."/";
-$image_path=$theme_path."images/";
-require_once($theme_path.'layout_utils.php');
-
-//the user might belong to multiple groups
-if($focus->id != 1)
-{
- $groupids = fetchUserGroupids($focus->id);
-}
-$log->info("User detail view");
-
-$category = getParenttab();
-
-$smarty = new vtigerCRM_Smarty;
-
-$smarty->assign("UMOD", $mod_strings);
-global $current_language;
-$smod_strings = return_module_language($current_language, 'Settings');
-$smarty->assign("MOD", $smod_strings);
-
-$smarty->assign("APP", $app_strings);
-
-$smarty->assign("THEME", $theme);
-$smarty->assign("IMAGE_PATH", $image_path);$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']);
-$smarty->assign("ID", $focus->id);
-$smarty->assign("CATEGORY", $category);
-if(isset($focus->imagename) && $focus->imagename!='')
-{
-	$imagestring="<div id='track1' style='margin: 4px 0pt 0pt 10px; width: 200px; background-image: url(themes/images/scaler_slider_track.gif); background-repeat: repeat-x; background-position: left center; height: 18px;'>
-	<div class='selected' id='handle1' style='width: 18px; height: 18px; position: relative; left: 145px;cursor:pointer;'><img src='themes/images/scaler_slider.gif'></div>
-	</div><script language='JavaScript' type='text/javascript' src='include/js/prototype.js'></script>
-<script language='JavaScript' type='text/javascript' src='include/js/slider.js'></script>
-
-	<div class='scale-image' style='padding: 10px; float: left; width: 83.415px;'><img src='test/user/".$focus->imagename."' width='100%'</div>
-	<p><script type='text/javascript' src='include/js/scale_demo.js'></script></p>";
-	//$smarty->assign("USER_IMAGE",$imagestring);
-}
-				
-if(isset($_REQUEST['modechk']) && $_REQUEST['modechk'] != '' )
-{
-	$modepref = $_REQUEST['modechk'];
-}
-	if($_REQUEST['modechk'] == 'prefview')
-		$parenttab = '';
-	else
-		$parenttab = 'Settings';
-
-$smarty->assign("PARENTTAB", $parenttab);
-
-if ((is_admin($current_user) || $_REQUEST['record'] == $current_user->id)
-		&& isset($default_user_name)
-		&& $default_user_name == $focus->user_name
-		&& isset($lock_default_user_name)
-		&& $lock_default_user_name == true	) {
-	$buttons = "<input title='".$app_strings['LBL_EDIT_BUTTON_TITLE']."' accessKey='".$app_strings['LBL_EDIT_BUTTON_KEY']."' class='classBtn' onclick=\"this.form.return_module.value='Users'; this.form.return_action.value='DetailView'; this.form.return_id.value='$focus->id'; this.form.action.value='EditView'; this.form.parenttab.value='$parenttab'\" type='submit' name='Edit' value='  ".$app_strings['LBL_EDIT_BUTTON_LABEL']."  '>";
-	$smarty->assign('EDIT_BUTTON',$buttons);
-}
-elseif (is_admin($current_user) || $_REQUEST['record'] == $current_user->id) {
-	$buttons = "<input title='".$app_strings['LBL_EDIT_BUTTON_TITLE']."' accessKey='".$app_strings['LBL_EDIT_BUTTON_KEY']."' class='classBtn' onclick=\"this.form.return_module.value='Users'; this.form.return_action.value='DetailView'; this.form.return_id.value='$focus->id'; this.form.action.value='EditView'; this.form.parenttab.value='$parenttab'\" type='submit' name='Edit' value='  ".$app_strings['LBL_EDIT_BUTTON_LABEL']."  '>";
-	$smarty->assign('EDIT_BUTTON',$buttons);
-	
-		$buttons = "<input title='".$mod_strings['LBL_CHANGE_PASSWORD_BUTTON_TITLE']."' accessKey='".$mod_strings['LBL_CHANGE_PASSWORD_BUTTON_KEY']."' class='classBtn' LANGUAGE=javascript onclick='return window.open(\"index.php?module=Users&action=ChangePassword&form=DetailView\",\"test\",\"width=320,height=165,resizable=no,scrollbars=0, toolbar=no, titlebar=no, left=100, top=126, screenX=100, screenY=126\");' type='button' name='password' value='".$mod_strings['LBL_CHANGE_PASSWORD_BUTTON_LABEL']."'>";
-		$smarty->assign('CHANGE_PW_BUTTON',$buttons);
-	
-	$buttons = "<input title='".$mod_strings['LBL_LOGIN_HISTORY_BUTTON_TITLE']."' accessKey='".$mod_strings['LBL_LOGIN_HISTORY_BUTTON_KEY']."' class='classBtn' onclick=\"this.form.return_module.value='Users'; this.form.return_action.value='ShowHistory'; this.form.return_id.value='$focus->id'; this.form.action.value='ShowHistory'\" type='submit' name='LoginHistory' value=' ".$mod_strings['LBL_LOGIN_HISTORY_BUTTON_LABEL']." '>";	
-	$smarty->assign('LOGIN_HISTORY_BUTTON',$buttons);
-	$buttons = "<input title='".$mod_strings['LBL_LIST_MAILSERVER_BUTTON_TITLE']."' accessKey='".$mod_strings['LBL_LIST_MAILSERVER_BUTTON_KEY']."' class='classBtn' onclick=\"this.form.return_module.value='Users'; this.form.return_action.value='ListMailAccount'; this.form.return_id.value='$focus->id'; this.form.module.value='Settings' ;this.form.action.value='ListMailAccount'\" type='submit' name='ListMailServerAccount' value=' ".$mod_strings['LBL_LIST_MAILSERVER_BUTTON_LABEL']." '>";
-	$smarty->assign('LIST_MAILSERVER_BUTTON',$buttons);
-	$buttons = "<input title='".$mod_strings['LBL_CHANGE_HOMEPAGE_TITLE']."' class='classBtn' align='center' onclick=\"this.form.return_module.value='Users';  this.form.return_action.value='DetailView';  this.form.action.value='EditHomeOrder';  this.form.record.value='$focus->id';\"  type='submit' name='EditHomeOrder'  value='  ".$mod_strings['LBL_CHANGE_HOMEPAGE_LABEL']."  '>";
-	$smarty->assign('CHANGE_HOMEPAGE_BUTTON',$buttons);
-
-	
-}
-if (is_admin($current_user)) 
-{
-	$buttons = "<input title='".$app_strings['LBL_DUPLICATE_BUTTON_TITLE']."' accessKey='".$app_strings['LBL_DUPLICATE_BUTTON_KEY']."' class='classBtn' onclick=\"this.form.return_module.value='Users'; this.form.return_action.value='DetailView'; this.form.isDuplicate.value=true; this.form.return_id.value='".$_REQUEST['record']."';this.form.action.value='EditView'\" type='submit' name='Duplicate' value=' ".$app_strings['LBL_DUPLICATE_BUTTON_LABEL']."'   >";
-	$smarty->assign('DUPLICATE_BUTTON',$buttons);
-	
-	//done so that only the admin user can see the customize tab button
-	if($_REQUEST['record'] != $current_user->id)
-	{
-		$buttons = "<input title='".$app_strings['LBL_DELETE_BUTTON_TITLE']."' accessKey='".$app_strings['LBL_DELETE_BUTTON_KEY']."' class='classBtn' onclick=\"deleteUser('$focus->id')\" type='button' name='Delete' value='  ".$app_strings['LBL_DELETE_BUTTON_LABEL']."  '>";
-		$smarty->assign('DELETE_BUTTON',$buttons);
-	}
-
-	if($_SESSION['authenticated_user_roleid'] == 'administrator')
-	{
-		$buttons = "<input title='".$app_strings['LBL_LISTROLES_BUTTON_TITLE']."' accessKey='".$app_strings['LBL_LISTROLES_BUTTON_KEY']."' class='classBtn' onclick=\"this.form.return_module.value='Users'; this.form.return_action.value='TabCustomise'; this.form.action.value='listroles'; this.form.record.value= '". $current_user->id ."'\" type='submit' name='ListRoles' value=' ".$app_strings['LBL_LISTROLES_BUTTON_LABEL']." '>";
-		$smarty->assign('LISTROLES_BUTTON',$buttons);
-	}
-
-}
-
-
-
-$smarty->assign("MODULE", 'Settings');
-$smarty->assign("BLOCKS", getBlocks($currentModule,"detail_view",'',$focus->column_fields));
-
-
-        $smarty->display("UserDetailView.tpl");
-
-
-?>
+<?php
+/*********************************************************************************
+ * The contents of this file are subject to the SugarCRM Public License Version 1.1.2
+ * ("License"); You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at http://www.sugarcrm.com/SPL
+ * Software distributed under the License is distributed on an  "AS IS"  basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
+ * the specific language governing rights and limitations under the License.
+ * The Original Code is:  SugarCRM Open Source
+ * The Initial Developer of the Original Code is SugarCRM, Inc.
+ * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.;
+ * All Rights Reserved.
+ * Contributor(s): ______________________________________.
+ ********************************************************************************/
+/*********************************************************************************
+ * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Users/DetailView.php,v 1.21 2005/04/19 14:44:02 ray Exp $
+ * Description:  TODO: To be written.
+ * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
+ * All Rights Reserved.
+ * Contributor(s): ______________________________________..
+ ********************************************************************************/
+
+require_once('Smarty_setup.php');
+require_once('data/Tracker.php');
+require_once('modules/Users/User.php');
+require_once('include/utils/utils.php');
+require_once('include/utils/CommonUtils.php');
+require_once('include/utils/UserInfoUtil.php');
+require_once('include/database/PearDatabase.php');
+
+global $current_user;
+global $theme;
+global $default_language;
+global $adb;
+global $currentModule;
+global $app_strings;
+global $mod_strings;
+
+$focus = new User();
+
+if(!empty($_REQUEST['record'])) {
+	$focus->retrieve_entity_info($_REQUEST['record'],'Users');
+	$focus->id = $_REQUEST['record'];	
+}
+else
+{
+
+    echo "
+        <script type='text/javascript'>
+            window.location = 'index.php?module=Users&action=ListView';
+        </script>
+        ";
+}
+
+if( $focus->user_name == "" )
+{  
+   
+    echo "
+            <table>
+                <tr>
+                    <td>
+                        <b>User does not exist.</b>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <a href='index.php?module=Users&action=ListView'>List Users</a>
+                    </td>
+                </tr>
+            </table>
+        ";
+    exit;  
+}
+
+
+if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') {
+	$focus->id = "";
+}
+
+global $theme;
+$theme_path="themes/".$theme."/";
+$image_path=$theme_path."images/";
+require_once($theme_path.'layout_utils.php');
+
+//the user might belong to multiple groups
+if($focus->id != 1)
+{
+ $groupids = fetchUserGroupids($focus->id);
+}
+$log->info("User detail view");
+
+$category = getParenttab();
+
+$smarty = new vtigerCRM_Smarty;
+
+$smarty->assign("UMOD", $mod_strings);
+global $current_language;
+$smod_strings = return_module_language($current_language, 'Settings');
+$smarty->assign("MOD", $smod_strings);
+
+$smarty->assign("APP", $app_strings);
+
+$smarty->assign("THEME", $theme);
+$smarty->assign("IMAGE_PATH", $image_path);$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']);
+$smarty->assign("ID", $focus->id);
+$smarty->assign("CATEGORY", $category);
+if(isset($focus->imagename) && $focus->imagename!='')
+{
+	$imagestring="<div id='track1' style='margin: 4px 0pt 0pt 10px; width: 200px; background-image: url(themes/images/scaler_slider_track.gif); background-repeat: repeat-x; background-position: left center; height: 18px;'>
+	<div class='selected' id='handle1' style='width: 18px; height: 18px; position: relative; left: 145px;cursor:pointer;'><img src='themes/images/scaler_slider.gif'></div>
+	</div><script language='JavaScript' type='text/javascript' src='include/js/prototype.js'></script>
+<script language='JavaScript' type='text/javascript' src='include/js/slider.js'></script>
+
+	<div class='scale-image' style='padding: 10px; float: left; width: 83.415px;'><img src='test/user/".$focus->imagename."' width='100%'</div>
+	<p><script type='text/javascript' src='include/js/scale_demo.js'></script></p>";
+	//$smarty->assign("USER_IMAGE",$imagestring);
+}
+				
+if(isset($_REQUEST['modechk']) && $_REQUEST['modechk'] != '' )
+{
+	$modepref = $_REQUEST['modechk'];
+}
+	if($_REQUEST['modechk'] == 'prefview')
+		$parenttab = '';
+	else
+		$parenttab = 'Settings';
+
+$smarty->assign("PARENTTAB", $parenttab);
+
+if ((is_admin($current_user) || $_REQUEST['record'] == $current_user->id)
+		&& isset($default_user_name)
+		&& $default_user_name == $focus->user_name
+		&& isset($lock_default_user_name)
+		&& $lock_default_user_name == true	) {
+	$buttons = "<input title='".$app_strings['LBL_EDIT_BUTTON_TITLE']."' accessKey='".$app_strings['LBL_EDIT_BUTTON_KEY']."' class='classBtn' onclick=\"this.form.return_module.value='Users'; this.form.return_action.value='DetailView'; this.form.return_id.value='$focus->id'; this.form.action.value='EditView'; this.form.parenttab.value='$parenttab'\" type='submit' name='Edit' value='  ".$app_strings['LBL_EDIT_BUTTON_LABEL']."  '>";
+	$smarty->assign('EDIT_BUTTON',$buttons);
+}
+elseif (is_admin($current_user) || $_REQUEST['record'] == $current_user->id) {
+	$buttons = "<input title='".$app_strings['LBL_EDIT_BUTTON_TITLE']."' accessKey='".$app_strings['LBL_EDIT_BUTTON_KEY']."' class='classBtn' onclick=\"this.form.return_module.value='Users'; this.form.return_action.value='DetailView'; this.form.return_id.value='$focus->id'; this.form.action.value='EditView'; this.form.parenttab.value='$parenttab'\" type='submit' name='Edit' value='  ".$app_strings['LBL_EDIT_BUTTON_LABEL']."  '>";
+	$smarty->assign('EDIT_BUTTON',$buttons);
+	
+		$buttons = "<input title='".$mod_strings['LBL_CHANGE_PASSWORD_BUTTON_TITLE']."' accessKey='".$mod_strings['LBL_CHANGE_PASSWORD_BUTTON_KEY']."' class='classBtn' LANGUAGE=javascript onclick='return window.open(\"index.php?module=Users&action=ChangePassword&form=DetailView\",\"test\",\"width=320,height=165,resizable=no,scrollbars=0, toolbar=no, titlebar=no, left=100, top=126, screenX=100, screenY=126\");' type='button' name='password' value='".$mod_strings['LBL_CHANGE_PASSWORD_BUTTON_LABEL']."'>";
+		$smarty->assign('CHANGE_PW_BUTTON',$buttons);
+	
+	$buttons = "<input title='".$mod_strings['LBL_LOGIN_HISTORY_BUTTON_TITLE']."' accessKey='".$mod_strings['LBL_LOGIN_HISTORY_BUTTON_KEY']."' class='classBtn' onclick=\"this.form.return_module.value='Users'; this.form.return_action.value='ShowHistory'; this.form.return_id.value='$focus->id'; this.form.action.value='ShowHistory'\" type='submit' name='LoginHistory' value=' ".$mod_strings['LBL_LOGIN_HISTORY_BUTTON_LABEL']." '>";	
+	$smarty->assign('LOGIN_HISTORY_BUTTON',$buttons);
+	$buttons = "<input title='".$mod_strings['LBL_LIST_MAILSERVER_BUTTON_TITLE']."' accessKey='".$mod_strings['LBL_LIST_MAILSERVER_BUTTON_KEY']."' class='classBtn' onclick=\"this.form.return_module.value='Users'; this.form.return_action.value='ListMailAccount'; this.form.return_id.value='$focus->id'; this.form.module.value='Settings' ;this.form.action.value='ListMailAccount'\" type='submit' name='ListMailServerAccount' value=' ".$mod_strings['LBL_LIST_MAILSERVER_BUTTON_LABEL']." '>";
+	$smarty->assign('LIST_MAILSERVER_BUTTON',$buttons);
+	$buttons = "<input title='".$mod_strings['LBL_CHANGE_HOMEPAGE_TITLE']."' class='classBtn' align='center' onclick=\"this.form.return_module.value='Users';  this.form.return_action.value='DetailView';  this.form.action.value='EditHomeOrder';  this.form.record.value='$focus->id';\"  type='submit' name='EditHomeOrder'  value='  ".$mod_strings['LBL_CHANGE_HOMEPAGE_LABEL']."  '>";
+	$smarty->assign('CHANGE_HOMEPAGE_BUTTON',$buttons);
+
+	
+}
+if (is_admin($current_user)) 
+{
+	$buttons = "<input title='".$app_strings['LBL_DUPLICATE_BUTTON_TITLE']."' accessKey='".$app_strings['LBL_DUPLICATE_BUTTON_KEY']."' class='classBtn' onclick=\"this.form.return_module.value='Users'; this.form.return_action.value='DetailView'; this.form.isDuplicate.value=true; this.form.return_id.value='".$_REQUEST['record']."';this.form.action.value='EditView'\" type='submit' name='Duplicate' value=' ".$app_strings['LBL_DUPLICATE_BUTTON_LABEL']."'   >";
+	$smarty->assign('DUPLICATE_BUTTON',$buttons);
+	
+	//done so that only the admin user can see the customize tab button
+	if($_REQUEST['record'] != $current_user->id)
+	{
+		$buttons = "<input title='".$app_strings['LBL_DELETE_BUTTON_TITLE']."' accessKey='".$app_strings['LBL_DELETE_BUTTON_KEY']."' class='classBtn' onclick=\"deleteUser('$focus->id')\" type='button' name='Delete' value='  ".$app_strings['LBL_DELETE_BUTTON_LABEL']."  '>";
+		$smarty->assign('DELETE_BUTTON',$buttons);
+	}
+
+	if($_SESSION['authenticated_user_roleid'] == 'administrator')
+	{
+		$buttons = "<input title='".$app_strings['LBL_LISTROLES_BUTTON_TITLE']."' accessKey='".$app_strings['LBL_LISTROLES_BUTTON_KEY']."' class='classBtn' onclick=\"this.form.return_module.value='Users'; this.form.return_action.value='TabCustomise'; this.form.action.value='listroles'; this.form.record.value= '". $current_user->id ."'\" type='submit' name='ListRoles' value=' ".$app_strings['LBL_LISTROLES_BUTTON_LABEL']." '>";
+		$smarty->assign('LISTROLES_BUTTON',$buttons);
+	}
+
+}
+
+
+$lead_tables = Array('vtiger_users','vtiger_user2role');
+$tabid = getTabid("Users");
+$validationData = getDBValidationData($lead_tables,$tabid);
+$data = split_validationdataArray($validationData);
+
+$smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']);
+$smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']);
+$smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']);
+$smarty->assign("MODULE", 'Users');
+$smarty->assign("CURRENT_USERID", $current_user->id);
+$smarty->assign("BLOCKS", getBlocks($currentModule,"detail_view",'',$focus->column_fields));
+
+
+        $smarty->display("UserDetailView.tpl");
+
+
+?>



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 21:37:27 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 22 Jun 2006 04:37:27 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7412 -
	/vtigercrm/trunk/include/utils/DetailViewUtils.php
Message-ID: <20060622043727.352B883F4BC@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 21 22:37:18 2006
New Revision: 7412

Log:
Ajax edit added for UserDetailView

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 Wed Jun 21 22:37:18 2006
@@ -59,13 +59,36 @@
 	{
 		$label_fld[] = $mod_strings[$fieldlabel];
                 $label_fld[] = getCurrencyName($col_fields[$fieldname]);
+		$pick_query="select * from vtiger_currency_info";
+		$pickListResult = $adb->query($pick_query);
+		$noofpickrows = $adb->num_rows($pickListResult);
+
+		//Mikecrowe fix to correctly default for custom pick lists
+		$options = array();
+		$found = false;
+		for($j = 0; $j < $noofpickrows; $j++)
+		{
+			$pickListValue=$adb->query_result($pickListResult,$j,'currency_name');
+			$currency_id=$adb->query_result($pickListResult,$j,'id');
+			if($col_fields[$fieldname] == $pickListValue)
+			{
+				$chk_val = "selected";	
+				$found = true;
+			}
+			else
+			{	
+				$chk_val = '';
+			}
+			$options[$currency_id] = array($pickListValue=>$chk_val );	
+		}
+		$label_fld ["options"] = $options;	
 	}	
-	elseif($uitype == 13 || $uitype == 115)
+	elseif($uitype == 13)
 	{
 		$label_fld[] = $mod_strings[$fieldlabel];
 		$label_fld[] = $col_fields[$fieldname];
 	}
-	elseif($uitype == 15 || $uitype == 16)
+	elseif($uitype == 15 || $uitype == 16 || $uitype == 115)
 	{
 	     $label_fld[] = $mod_strings[$fieldlabel];
 	     $label_fld[] = $col_fields[$fieldname];



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 21:57:41 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 22 Jun 2006 04:57:41 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7413 -
	/vtigercrm/trunk/modules/Notes/DetailView.php
Message-ID: <20060622045741.2141183F4C6@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 22:57:37 2006
New Revision: 7413

Log:
title has been changed to notes_title

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

Modified: vtigercrm/trunk/modules/Notes/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Notes/DetailView.php (original)
+++ vtigercrm/trunk/modules/Notes/DetailView.php Wed Jun 21 22:57:37 2006
@@ -34,7 +34,7 @@
 if(isset($_REQUEST['record'])) {
    $focus->retrieve_entity_info($_REQUEST['record'],"Notes");
    $focus->id = $_REQUEST['record'];
-   $focus->name=$focus->column_fields['title'];
+   $focus->name=$focus->column_fields['notes_title'];
 }
 if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') {
 	$focus->id = "";



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 22:01:55 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 22 Jun 2006 05:01:55 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7415 -
	/vtigercrm/trunk/modules/Notes/ListView.php
Message-ID: <20060622050155.743F47E864C@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 23:01:51 2006
New Revision: 7415

Log:
title has been changed to notes_title

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 Wed Jun 21 23:01:51 2006
@@ -190,7 +190,7 @@
 $smarty->assign("SELECT_SCRIPT", $view_script);
 
 $navigationOutput = getTableHeaderNavigation($navigation_array, $url_string,"Notes","index",$viewid);
-$alphabetical = AlphabeticalSearch($currentModule,'index','title','true','basic',"","","","",$viewid);
+$alphabetical = AlphabeticalSearch($currentModule,'index','notes_title','true','basic',"","","","",$viewid);
 $fieldnames = getAdvSearchfields($module);
 $criteria = getcriteria_options();
 $smarty->assign("CRITERIA", $criteria);



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 22:02:31 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 22 Jun 2006 05:02:31 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7416 -
	/vtigercrm/trunk/data/CRMEntity.php
Message-ID: <20060622050232.6468083F4CD@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 21 23:02:18 2006
New Revision: 7416

Log:
function get_full_list moved from SugarBean to display Charts

Modified:
    vtigercrm/trunk/data/CRMEntity.php

Modified: vtigercrm/trunk/data/CRMEntity.php
==============================================================================
--- vtigercrm/trunk/data/CRMEntity.php (original)
+++ vtigercrm/trunk/data/CRMEntity.php Wed Jun 21 23:02:18 2006
@@ -1,1463 +1,1509 @@
-<?php
-/*********************************************************************************
- * The contents of this file are subject to the SugarCRM Public License Version 1.1.2
- * ("License"); You may not use this file except in compliance with the 
- * License. You may obtain a copy of the License at http://www.sugarcrm.com/SPL
- * Software distributed under the License is distributed on an  "AS IS"  basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
- * the specific language governing rights and limitations under the License.
- * The Original Code is:  SugarCRM Open Source
- * The Initial Developer of the Original Code is SugarCRM, Inc.
- * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.;
- * All Rights Reserved.
- * Contributor(s): ______________________________________.
- ********************************************************************************/
-/*********************************************************************************
- * $Header: /advent/projects/wesat/vtiger_crm/vtigercrm/data/CRMEntity.php,v 1.16 2005/04/29 04:21:31 mickie Exp $
- * Description:  Defines the base class for all data entities used throughout the 
- * application.  The base class including its methods and variables is designed to 
- * be overloaded with module-specific methods and variables particular to the 
- * module's base entity class. 
- ********************************************************************************/
-
-include_once('config.php');
-require_once('include/logging.php');
-require_once('data/Tracker.php');
-require_once('include/utils/utils.php');
-require_once('include/utils/UserInfoUtil.php');
-
-class CRMEntity
-{
-  /**
-   * This method implements a generic insert and update logic for any SugarBean
-   * This method only works for subclasses that implement the same variable names.
-   * This method uses the presence of an id vtiger_field that is not null to signify and update.
-   * The id vtiger_field should not be set otherwise.
-   * todo - Add support for vtiger_field type validation and encoding of parameters.
-   * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
-   * All Rights Reserved.
-   * Contributor(s): ______________________________________..
-   */
-
-	
-  function saveentity($module)
-  {
-	global $current_user, $adb;//$adb added by raju for mass mailing
-	$insertion_mode = $this->mode;
-
-	$this->db->println("TRANS saveentity starts $module");
-	$this->db->startTransaction();
-	
-	// Code included by Jaguar - starts    
-	if(isset($_REQUEST['recurringtype']) && $_REQUEST['recurringtype']!='')
-		$recur_type = trim($_REQUEST['recurringtype']);
-	else
-    		$recur_type='';	
-	// Code included by Jaguar - Ends
-
-	//Code included by Minnie - Starts
-	if(isset($_REQUEST['inviteesid']) && $_REQUEST['inviteesid']!='')
-	{
-		$selected_users_string =  $_REQUEST['inviteesid'];
-		$invitees_array = explode(';',$selected_users_string);
-
-	}
-	else
-		$invitees_array='';
-	//Code included by Minnie - Ends	
-
-	foreach($this->tab_name as $table_name)
-	{
-		if($table_name == "vtiger_crmentity")
-		{
-			$this->insertIntoCrmEntity($module);
-		}
-		elseif($table_name == "vtiger_salesmanactivityrel")
-		{
-			$this->insertIntoSmActivityRel($module);
-		}
-		//added by raju
-		elseif($table_name=="vtiger_seactivityrel" )
-		{
-			if($module=="Emails" && $_REQUEST['smodule']!='webmails')
-			//modified by Richie as raju's implementation broke the feature for addition of webmail to vtiger_crmentity.need to be more careful in future while integrating code
-			//if($_REQUEST['smodule']!='webmails' && $_REQUEST['smodule'] != '')
-			{
-				if($_REQUEST['currentid']!='')
-				{
-					$actid=$_REQUEST['currentid'];
-				}
-				else 
-				{
-					$actid=$_REQUEST['record'];
-				}
-				$parentid=$_REQUEST['parent_id'];
-				if($_REQUEST['module'] != 'Emails' && $_REQUEST['module'] != 'Webmails')
-				{
-					if(!$parentid) {
-						$parentid = $adb->getUniqueID('vtiger_seactivityrel');
-					}
-					$mysql='insert into vtiger_seactivityrel values('.$parentid.','.$actid.')';
-					$adb->query($mysql);
-				}
-				else
-				{	  
-					$myids=explode("|",$parentid);  //2 at 71|
-					for ($i=0;$i<(count($myids)-1);$i++)
-					{
-						$realid=explode("@",$myids[$i]);
-						$mycrmid=$realid[0];
-						//added to handle the relationship of emails with vtiger_users
-						if($realid[1] == -1)
-							$mysql='insert into vtiger_salesmanactivityrel values('.$mycrmid.','.$actid.')';
-						else	
-							$mysql='insert into vtiger_seactivityrel values('.$mycrmid.','.$actid.')';
-						$adb->query($mysql);
-					}
-				}
-			}
-			else
-			{
-				if(isset($this->column_fields['parent_id']) && $this->column_fields['parent_id'] != '')
-				{
-					$this->insertIntoEntityTable($table_name, $module);
-				}
-				elseif($this->column_fields['parent_id']=='' && $insertion_mode=="edit")
-				{
-					$this->deleteRelation($table_name);
-				}
-			}			
-		}
-		elseif($table_name == "vtiger_seticketsrel" || $table_name ==  "vtiger_seproductsrel" || $table_name ==  "vtiger_senotesrel")
-		{
-			if(isset($this->column_fields['parent_id']) && $this->column_fields['parent_id'] != '')//raju - mass mailing ends
-			{
-				$this->insertIntoEntityTable($table_name, $module);
-			}
-			elseif($this->column_fields['parent_id']=='' && $insertion_mode=="edit")
-			{
-				$this->deleteRelation($table_name);
-			}
-		}
-		elseif($table_name ==  "vtiger_cntactivityrel")
-		{
-			if(isset($this->column_fields['contact_id']) && $this->column_fields['contact_id'] != '')
-			{
-				$this->insertIntoEntityTable($table_name, $module);
-			}
-			elseif($this->column_fields['contact_id'] =='' && $insertion_mode=="edit")
-			{
-				$this->deleteRelation($table_name);
-			}
-
-		}
-		elseif($table_name ==  "vtiger_ticketcomments")
-		{
-                	$this->insertIntoTicketCommentTable($table_name, $module);
-		}
-		elseif($table_name ==  "vtiger_faqcomments")
-		{
-                	$this->insertIntoFAQCommentTable($table_name, $module);
-		}
-		elseif($table_name == "vtiger_activity_reminder")
-		{
-			if($recur_type == "--None--")
-			{
-				$this->insertIntoReminderTable($table_name,$module,"");
-			}
-		}
-		elseif($table_name == "vtiger_recurringevents") // Code included by Jaguar -  starts
-		{
-			$recur_type = trim($_REQUEST['recurringtype']);
-			if($recur_type != "--None--"  && $recur_type != '')
-		      	{		   
-	      			$this->insertIntoRecurringTable($table_name,$module);
-			}		
-		}// Code included by Jaguar - Ends
-		// Code included by Minnie  -  starts	
-		elseif($table_name == "vtiger_invitees") 
-		{
-			if($invitees_array != '')
-			{
-				$this->insertIntoInviteeTable($table_name,$module,$invitees_array);
-			}
-		}
-		// Code included by Minnie  -  Ends
-		elseif($table_name == 'vtiger_producttaxrel')
-		{
-			$this->insertTaxInformation($table_name, $module);
-		}
-		elseif($table_name == 'vtiger_attachments')
-		{
-			$this->insertIntoAttachment($this->id,$module);
-		}
-		else
-		{
-			$this->insertIntoEntityTable($table_name, $module);			
-		}
-	}
-
-	$this->db->completeTransaction();
-        $this->db->println("TRANS saveentity ends");
-  }
-
-
-	function insertIntoAttachment1($id,$module,$filedata,$filename,$filesize,$filetype,$user_id)
-	{
-		$date_var = date('YmdHis');
-		global $current_user;
-		global $adb;
-		//global $root_directory;
-		global $log;
-
-		$ownerid = $user_id;
-		
-		if($filesize != 0)
-		{
-			$data = base64_encode(fread(fopen($filedata, "r"), $filesize));
-		}
-		
-		$current_id = $adb->getUniqueID("vtiger_crmentity");
-
-		if($module=='Emails') 
-		{ 
-			$log->info("module is ".$module);
-			$idname='emailid';      $tablename='emails';    $descname='description';
-		}
-		else     
-		{ 
-			$idname='notesid';      $tablename='notes';     $descname='notecontent';
-		}
-
-		$sql="update ".$tablename." set filename='".$filename."' where ".$idname."=".$id;
-		$adb->query($sql);
-
-		$sql1 = "insert into vtiger_crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime,modifiedtime) values(".$current_id.",".$current_user->id.",".$ownerid.",'".$module." Attachment','"."',".$adb->formatString("vtiger_crmentity","createdtime",$date_var).",".$adb->formatString("vtiger_crmentity","modifiedtime",$date_var).")";
-		$adb->query($sql1);
-
-		$sql2="insert into vtiger_attachments(attachmentsid, name, description, type) values(".$current_id.",'".$filename."','"."','".$filetype."')";
-		$result=$adb->query($sql2);
-
-		//TODO -- instead of put contents in db now we should store the file in harddisk
-
-		$sql3='insert into vtiger_seattachmentsrel values('.$id.','.$current_id.')';
-		$adb->query($sql3);
-	}
-
-
-	/**
-	 *      This function is used to add the vtiger_attachments. This will call the function uploadAndSaveFile which will upload the attachment into the server and save that attachment information in the database.
-	 *      @param int $id  - entity id to which the vtiger_files to be uploaded
-	 *      @param string $module  - the current module name
-	*/
-	function insertIntoAttachment($id,$module)
-	{
-		global $log, $adb;
-		$log->debug("Entering into insertIntoAttachment($id,$module) method.");
-		
-		$file_saved = false;
-
-		//This is to added to store the existing attachment id of the contact where we should delete this when we give new image
-		if($module == 'Contacts')
-			$old_attachmentid = $adb->query_result($adb->query("select * from vtiger_seattachmentsrel where crmid=$id"),0,'attachmentsid');
-
-		foreach($_FILES as $fileindex => $files)
-		{
-			if($files['name'] != '' && $files['size'] > 0)
-			{
-				$file_saved = $this->uploadAndSaveFile($id,$module,$files);
-			}
-		}
-
-		//This is to handle the delete image for contacts
-		if($module == 'Contacts' && $file_saved)
-		{
-			$del_res1 = $adb->query("delete from vtiger_attachments where attachmentsid=$old_attachmentid");
-			$del_res2 = $adb->query("delete from vtiger_seattachmentsrel where attachmentsid=$old_attachmentid");
-		}
-
-
-		//Remove the deleted vtiger_attachments from db - Products
-		if($module == 'Products' && $_REQUEST['del_file_list'] != '')
-		{
-			$del_file_list = explode("###",trim($_REQUEST['del_file_list'],"###"));
-			foreach($del_file_list as $del_file_name)
-			{
-				$attach_res = $adb->query("select vtiger_attachments.attachmentsid from vtiger_attachments inner join vtiger_seattachmentsrel on vtiger_attachments.attachmentsid=vtiger_seattachmentsrel.attachmentsid where crmid=$id and name=\"$del_file_name\"");
-				$attachments_id = $adb->query_result($attach_res,0,'attachmentsid');
-				
-				$del_res1 = $adb->query("delete from vtiger_attachments where attachmentsid=$attachments_id");
-				$del_res2 = $adb->query("delete from vtiger_seattachmentsrel where attachmentsid=$attachments_id");
-			}
-		}
-
-		$log->debug("Exiting from insertIntoAttachment($id,$module) method.");
-	}
-
-	/**
-	 *      This function is used to upload the attachment in the server and save that attachment information in db.
-	 *      @param int $id  - entity id to which the file to be uploaded
-	 *      @param string $module  - the current module name
-	 *      @param array $file_details  - array which contains the file information(name, type, size, tmp_name and error)
-	 *      return void
-	*/
-	function uploadAndSaveFile($id,$module,$file_details)
-	{
-		global $log;
-		$log->debug("Entering into uploadAndSaveFile($id,$module,$file_details) method.");
-
-		global $adb, $current_user;
-		global $upload_badext;
-
-		$date_var = date('YmdHis');
-
-		//to get the owner id
-		$ownerid = $this->column_fields['assigned_user_id'];
-		if(!isset($ownerid) || $ownerid=='')
-			$ownerid = $current_user->id;
-
-	
-		// Arbitrary File Upload Vulnerability fix - Philip
-		$binFile = $file_details['name'];
-		$ext_pos = strrpos($binFile, ".");
-
-		$ext = substr($binFile, $ext_pos + 1);
-
-		if (in_array($ext, $upload_badext))
-		{
-			$binFile .= ".txt";
-		}
-		// Vulnerability fix ends
-
-		$current_id = $adb->getUniqueID("vtiger_crmentity");
-
-		$filename = basename($binFile);
-		$filetype= $file_details['type'];
-		$filesize = $file_details['size'];
-		$filetmp_name = $file_details['tmp_name'];
-
-		//get the file path inwhich folder we want to upload the file
-		$upload_file_path = decideFilePath();
-
-		//upload the file in server
-		$upload_status = move_uploaded_file($filetmp_name,$upload_file_path.$current_id."_".$binFile);
-
-		$save_file = 'true';
-		//only images are allowed for these modules
-		if($module == 'Contacts' || $module == 'Products')
-		{
-			$save_file = validateImageFile(&$file_details);
-		}
-
-		if($save_file == 'true' && $upload_status == 'true')
-		{
-			//This is only to update the attached filename in the vtiger_notes vtiger_table for the Notes module
-			if($module=='Notes')
-			{
-				$sql="update vtiger_notes set filename='".$filename."' where notesid = ".$id;
-				$adb->query($sql);
-			}
-
-			$sql1 = "insert into vtiger_crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime,modifiedtime) values(".$current_id.",".$current_user->id.",".$ownerid.",'".$module." Attachment','".$this->column_fields['description']."',".$adb->formatString("vtiger_crmentity","createdtime",$date_var).",".$adb->formatString("vtiger_crmentity","modifiedtime",$date_var).")";
-			$adb->query($sql1);
-
-			$sql2="insert into vtiger_attachments(attachmentsid, name, description, type, path) values(".$current_id.",'".$filename."','".$this->column_fields['description']."','".$filetype."','".$upload_file_path."')";
-			$result=$adb->query($sql2);
-
-			if($_REQUEST['mode'] == 'edit')
-			{
-				if($id != '' && $_REQUEST['fileid'] != '')
-				{
-					$delquery = 'delete from vtiger_seattachmentsrel where crmid = '.$id.' and attachmentsid = '.$_REQUEST['fileid'];
-					$adb->query($delquery);
-				}
-			}
-			if($module == 'Notes')
-			{
-				$query = "delete from vtiger_seattachmentsrel where crmid = ".$id;
-				$adb->query($query);
-			}
-			$sql3='insert into vtiger_seattachmentsrel values('.$id.','.$current_id.')';
-			$adb->query($sql3);
-
-			return true;
-		}
-		else
-		{
-			$log->debug("Skip the save attachment process.");
-			return false;
-		}
-	}
-
-
-
-  function insertIntoCrmEntity($module)
-  {
-	global $adb;
-	global $current_user;
-	global $log;
-                
-	$date_var = date('YmdHis');
-	if($_REQUEST['assigntype'] == 'T')
-	{
-		$ownerid= 0;
-	}
-	else
-	{
-		$ownerid = $this->column_fields['assigned_user_id'];
-	}
-                
-	if($module == 'Products' || $module == 'Notes' || $module =='Faq' || $module == 'Vendors' || $module == 'PriceBooks')
-	{
-		$log->info("module is =".$module);
-		$ownerid = $current_user->id;
-	}
-	if($module == 'Events')
-	{
-		$module = 'Activities';
-	}
-	if($this->mode == 'edit')
-	{
-		$description_val = from_html($adb->formatString("vtiger_crmentity","description",$this->column_fields['description']),($insertion_mode == 'edit')?true:false);
-		$sql = "update vtiger_crmentity set smownerid=".$ownerid.",modifiedby=".$current_user->id.",description=".$description_val.", modifiedtime=".$adb->formatString("vtiger_crmentity","modifiedtime",$date_var)." where crmid=".$this->id;
-
-		$adb->query($sql);
-		$sql1 ="delete from vtiger_ownernotify where crmid=".$this->id;
-		$adb->query($sql1);
-		if($ownerid != $current_user->id)
-		{
-			$sql1 = "insert into vtiger_ownernotify values(".$this->id.",".$ownerid.",null)";
-			$adb->query($sql1);
-		}
-	}
-	else
-	{
-		//if this is the create mode and the group allocation is chosen, then do the following
-		$current_id = $adb->getUniqueID("vtiger_crmentity");
-		$_REQUEST['currentid']=$current_id;
-
-		$description_val = from_html($adb->formatString("vtiger_crmentity","description",$this->column_fields['description']),($insertion_mode == 'edit')?true:false);
-		$sql = "insert into vtiger_crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime,modifiedtime) values('".$current_id."','".$current_user->id."','".$ownerid."','".$module."',".$description_val.",".$adb->formatDate($date_var).",".$adb->formatDate($date_var).")";
-		$adb->query($sql);
-		$this->id = $current_id;
-	}
-
-    }
-
-
-
-  function insertIntoSmActivityRel($module)
-  {
-    global $adb;
-    global $current_user;
-    if($this->mode == 'edit')
-    {
-
-      $sql = "delete from vtiger_salesmanactivityrel where activityid=".$this->id." and smid = ".$this->column_fields['assigned_user_id']."";
-      $adb->query($sql);
-
-    }
-	$sql_qry = "insert into vtiger_salesmanactivityrel (smid,activityid) values(".$this->column_fields['assigned_user_id'].",".$this->id.")";
-    $adb->query($sql_qry);
-
-  }
-  //code added by richie starts
-  function constructUpdateLog($id)
-  {
-    global $adb;
-    global $current_user;
-    $ticketid = $id;
-    //Updating History
-    $tktresult = $adb->query("select * from vtiger_troubletickets where ticketid='".$ticketid."'");
-    $crmresult = $adb->query("select * from vtiger_crmentity where crmid='".$ticketid."'");
-    $updatelog = $adb->query_result($tktresult,0,"update_log");
-    $old_user_id = $adb->query_result($crmresult,0,"smownerid");
-    $old_status = $adb->query_result($tktresult,0,"status");
-    $old_priority = $adb->query_result($tktresult,0,"priority");
-    $old_severity = $adb->query_result($tktresult,0,"severity");
-    $old_category = $adb->query_result($tktresult,0,"category");
-    if($_REQUEST['old_smownerid'] != $old_user_id && $old_user_id != 0)
-    {
-      $user_name = getUserName($this->column_fields['assigned_user_id']);
-      $updatelog .= ' Transferred to '.$user_name.'\.';
-    }
-    elseif($old_user_id == 0)
-    {
-	$group_info = getGroupName($ticketid,'HelpDesk');	
-	$group_name = $group_info[0];	
-	if($group_name != $_REQUEST['assigned_group_name'])
-		$updatelog .= ' Transferred to group '.$_REQUEST['assigned_group_name'].'\.';
-    }
-    if($old_status != $this->column_fields['ticketstatus'])
-    {
-      $updatelog .= ' Status Changed to '.$this->column_fields['ticketstatus'].'\.';
-    }
-    if($old_priority != $this->column_fields['ticketpriorities'])
-    {
-      $updatelog .= ' Priority Changed to '.$this->column_fields['ticketpriorities'].'\.';
-    }
-    if($old_severity != $this->column_fields['ticketseverities'])
-    {
-      $updatelog .= ' Severity Changed to '.$this->column_fields['ticketseverities'].'\.';
-    }
-    if($old_category != $this->column_fields['ticketcategories'])
-    {
-      $updatelog .= ' Category Changed to '.$this->column_fields['ticketcategories'].'\.';
-    }
-    if($_REQUEST['old_smownerid'] != $old_user_id || $old_status != $this->column_fields['ticketstatus'] || $old_priority != $this->column_fields['ticketpriorities'] || $old_severity != $this->column_fields['ticketseverities'] || $old_category != $this->column_fields['ticketcategories'] || $old_userid == 0)
-    {
-      $updatelog .= ' -- '.date("l dS F Y h:i:s A").' by '.$current_user->user_name.'--//--';
-    }
-    else
-    {
-        $update_log .= '--//--';
-    }
-
-    return $updatelog;
-  }
-  //code added by richie ends
-  function insertIntoEntityTable($table_name, $module)
-  {
-	  global $log;	
-	   $log->info("function insertIntoCrmEntity ".$module.' vtiger_table name ' .$table_name);
-	  global $adb;
-	  $insertion_mode = $this->mode;
-
-	  //Checkin whether an entry is already is present in the vtiger_table to update
-	  if($insertion_mode == 'edit')
-	  {
-		  $check_query = "select * from ".$table_name." where ".$this->tab_name_index[$table_name]."=".$this->id;
-		  $check_result=$adb->query($check_query);
-
-		  $num_rows = $adb->num_rows($check_result);
-
-		  if($num_rows <= 0)
-		  {
-			  $insertion_mode = '';
-		  }	 
-	  }
-
-	  if($insertion_mode == 'edit')
-	  {
-		  $update = '';
-		  $tabid= getTabid($module);	
-		  $sql = "select * from vtiger_field where tabid=".$tabid." and tablename='".$table_name."' and displaytype in (1,3)"; 
-	  }
-	  else
-	  {
-		  $column = $this->tab_name_index[$table_name];
-		  if($column == 'id' && $table_name == 'vtiger_users')
-		  {
-		 	$currentuser_id = $adb->getUniqueID("vtiger_users");
-			$this->id = $currentuser_id;
-		  }
-		  $value = $this->id;
-	  	  $tabid= getTabid($module);	
-		  $sql = "select * from vtiger_field where tabid=".$tabid." and tablename='".$table_name."' and displaytype in (1,3,4)"; 
-	  }
-
-	  $result = $adb->query($sql);
-	  $noofrows = $adb->num_rows($result);
-	  for($i=0; $i<$noofrows; $i++)
-	  {
-		  $fieldname=$adb->query_result($result,$i,"fieldname");
-		  $columname=$adb->query_result($result,$i,"columnname");
-		  $uitype=$adb->query_result($result,$i,"uitype");
-		  if(isset($this->column_fields[$fieldname]))
-		  {
-			  if($uitype == 56)
-			  {
-				  if($this->column_fields[$fieldname] == 'on' || $this->column_fields[$fieldname] == 1)
-				  {
-					  $fldvalue = 1;
-				  }
-				  else
-				  {
-					  $fldvalue = 0;
-				  }
-
-			  }
-			  elseif($uitype == 33)
-			  {
-				$j = 0;
-				$field_list = '';
-				if(is_array($this->column_fields[$fieldname]) && count($this->column_fields[$fieldname]) > 0)
-				{
-					foreach($this->column_fields[$fieldname] as $key=>$multivalue)
-					{
-						if($j != 0)
-						{
-							$field_list .= ' , ';
-						}
-						$field_list .= $multivalue;
-						$j++;
-					}
-				}
-				$fldvalue = $field_list;
-			  }
-			  elseif($uitype == 5 || $uitype == 6 || $uitype ==23)
-			  {
-				  if($_REQUEST['action'] == 'Import')
-				  {
-					  $fldvalue = $this->column_fields[$fieldname];
-				  }
-				  else
-				  {
-					  $fldvalue = getDBInsertDateValue($this->column_fields[$fieldname]);
-				  }
-			  }
-			  else
-			  {
-				  $fldvalue = $this->column_fields[$fieldname]; 
-				  $fldvalue = stripslashes($fldvalue);
-			  }
-			  $fldvalue = from_html($adb->formatString($table_name,$columname,$fldvalue),($insertion_mode == 'edit')?true:false);
-
-
-
-		  }
-		  else
-		  {
-			  $fldvalue = '';
-		  }
-		  if($fldvalue=='') $fldvalue ="NULL";
-		  if($insertion_mode == 'edit')
-		  {
-			  //code by richie starts
-			  if(($table_name == "vtiger_troubletickets") && ($columname == "update_log"))
-			  {
-				  $fldvalue = $this->constructUpdateLog($this->id);
-				  $fldvalue = from_html($adb->formatString($table_name,$columname,$fldvalue),($insertion_mode == 'edit')?true:false);
-			  }
-			  //code by richie ends
-
-			  if($table_name == 'vtiger_notes' && $columname == 'filename' && $_FILES['filename']['name'] == '')
-			  {
-				  $fldvalue = $this->getOldFileName($this->id);
-			  }
-			  if($table_name == 'vtiger_products' && $columname == 'imagename')
-			  {
-					  
-
-			  }
-			  if($table_name != 'vtiger_ticketcomments')
-			  {
-				  if($i == 0)
-				  {
-					  $update = $columname."=".$fldvalue."";
-				  }
-				  else
-				  {
-					  $update .= ', '.$columname."=".$fldvalue."";
-				  }
-			  }
-		  }
-		  else
-		  {
-			  //code by richie starts
-			  if(($table_name == "vtiger_troubletickets") && ($columname == "update_log"))
-			  {
-				  global $current_user;
-				  $fldvalue = date("l dS F Y h:i:s A").' by '.$current_user->user_name;
-				  if($_REQUEST['assigned_group_name'] != '' && $_REQUEST['assigntype'] == 'T')
-                                  {
-                                        $group_name = $_REQUEST['assigned_group_name'];
-                                  }
-				  elseif($this->column_fields['assigned_user_id'] != '')
-				  {
-					  $tkt_ownerid = $this->column_fields['assigned_user_id'];
-				  }
-				  else
-				  {
-					  $tkt_ownerid = $current_user->id;
-				  }
-				  if($group_name != '')
-					  $tkt_ownername = $group_name;
-				  else
-					  $tkt_ownername = getUserName($tkt_ownerid);	
-				  $fldvalue = " Ticket created. Assigned to ".$tkt_ownername." -- ".$fldvalue."--//--";
-				  $fldvalue = from_html($adb->formatString($table_name,$columname,$fldvalue),($insertion_mode == 'edit')?true:false);
-				  //echo ' updatevalue is ............. ' .$fldvalue;
-			  }
-			  //code by richie ends
-			  $column .= ", ".$columname;
-			  $value .= ", ".$fldvalue."";
-		  }
-
-	  }
-
-
-
-
-
-	  if($insertion_mode == 'edit')
-	  {
-		  if($_REQUEST['module'] == 'Potentials')
-		  {
-			  $dbquery = 'select sales_stage from vtiger_potential where potentialid = '.$this->id;
-			  $sales_stage = $adb->query_result($adb->query($dbquery),0,'sales_stage');
-			  if($sales_stage != $_REQUEST['sales_stage'])
-			  {
-				  $date_var = date('YmdHis');
-				  $closingdate = getDBInsertDateValue($_REQUEST['closingdate']);
-				  $sql = "insert into vtiger_potstagehistory values('',".$this->id.",'".$_REQUEST['amount']."','".$sales_stage."','".$_REQUEST['probability']."',0,".$adb->formatString("vtiger_potstagehistory","closedate",$closingdate).",".$adb->formatString("vtiger_potstagehistory","lastmodified",$date_var).")";
-				  $adb->query($sql);
-			  }
-		  }
-		  elseif($_REQUEST['module'] == 'PurchaseOrder' || $_REQUEST['module'] == 'SalesOrder' || $_REQUEST['module'] == 'Quotes' || $_REQUEST['module'] == 'Invoice')
-		  {
-			  //added to update the history for PO, SO, Quotes and Invoice
-			  $history_field_array = Array(
-				  			"PurchaseOrder"=>"postatus",
-							"SalesOrder"=>"sostatus",
-							"Quotes"=>"quotestage",
-							"Invoice"=>"invoicestatus"
-						      );
-
-			  $inventory_module = $_REQUEST['module'];
-			  if($inventory_module == "PurchaseOrder")
-			  	$relatedname = $_REQUEST["vendor_name"];
-			  else
-			  	$relatedname = $_REQUEST["account_name"];
-
-			  $oldvalue = getSingleFieldValue($this->table_name,$history_field_array[$inventory_module],$this->module_id,$this->id);
-			  if($oldvalue != $this->column_fields["$history_field_array[$inventory_module]"])
-			  {
-				  addInventoryHistory($inventory_module, $this->id,$relatedname,$_REQUEST['grandTotal'],$this->column_fields["$history_field_array[$inventory_module]"]);
-			  }
-		  }
-
-		  //Check done by Don. If update is empty the the query fails
-		  if(trim($update) != '')
-        	  {
-		  	$sql1 = "update ".$table_name." set ".$update." where ".$this->tab_name_index[$table_name]."=".$this->id;
-
-		  	$adb->query($sql1); 
-		  }
-
-		  if($_REQUEST['assigntype'] == 'T')
-		  {
-			  $groupname = $_REQUEST['assigned_group_name'];
-			  //echo 'about to update lead group relation';
-			  if($module == 'Leads' && $table_name == 'vtiger_leaddetails')
-			  {
-				  updateLeadGroupRelation($this->id,$groupname);
-			  }
-                          elseif($module == 'Accounts' && $table_name == 'vtiger_account')
-			  {
-				  updateAccountGroupRelation($this->id,$groupname);
-			  }
-			  elseif($module == 'Contacts' && $table_name == 'vtiger_contactdetails')
-			  {
-				  updateContactGroupRelation($this->id,$groupname);
-			  }
-			  elseif($module == 'Potentials' && $table_name == 'vtiger_potential')
-			  {
-				  updatePotentialGroupRelation($this->id,$groupname);
-			  }
-			  elseif($module == 'Quotes' && $table_name == 'vtiger_quotes')
-			  {
-				  updateQuoteGroupRelation($this->id,$groupname);
-			  }
-			  elseif($module == 'SalesOrder' && $table_name == 'vtiger_salesorder')
-			  {
-				  updateSoGroupRelation($this->id,$groupname);
-			  }
-			  elseif($module == 'Invoice' && $table_name == 'vtiger_invoice')
-			  {
-				  updateInvoiceGroupRelation($this->id,$groupname);
-			  }
-			  elseif($module == 'PurchaseOrder' && $table_name == 'vtiger_purchaseorder')
-			  {
-				  updatePoGroupRelation($this->id,$groupname);
-			  }
-			  elseif($module == 'HelpDesk' && $table_name == 'vtiger_troubletickets')
-			  {
-				  updateTicketGroupRelation($this->id,$groupname);
-			  }
-			  elseif($module == 'Campaigns' && $table_name == 'vtiger_campaign')
-			  {
-				  updateCampaignGroupRelation($this->id,$groupname);
-			  }
-			  elseif($module =='Activities' || $module =='Events' || $module == 'Emails')
-			  {
-				 if($table_name == 'vtiger_activity')
-				 {
-				   updateActivityGroupRelation($this->id,$groupname);
-				 }
-			  }
-			   	
-
-		  }
-		  else
-		  {
-			  //echo 'about to update lead group relation again!';
-			  if($module == 'Leads' && $table_name == 'vtiger_leaddetails')
-			  {
-				  updateLeadGroupRelation($this->id,'');
-			  }
-			  elseif($module == 'Accounts' && $table_name == 'vtiger_account')
-			  {
-				  updateAccountGroupRelation($this->id,'');
-			  }
-			  elseif($module == 'Contacts' && $table_name == 'vtiger_contactdetails')
-			  {
-				  updateContactGroupRelation($this->id,'');
-			  }
-			  elseif($module == 'Potentials' && $table_name == 'vtiger_potential')
-			  {
-				  updatePotentialGroupRelation($this->id,'');
-			  }
-			  elseif($module == 'Quotes' && $table_name == 'vtiger_quotes')
-			  {
-				  updateQuoteGroupRelation($this->id,'');
-			  }
-			  elseif($module == 'SalesOrder' && $table_name == 'vtiger_salesorder')
-			  {
-				  updateSoGroupRelation($this->id,'');
-			  }
-			  elseif($module == 'Invoice' && $table_name == 'vtiger_invoice')
-			  {
-				  updateInvoiceGroupRelation($this->id,'');
-			  }
-			  elseif($module == 'PurchaseOrder' && $table_name == 'vtiger_purchaseorder')
-			  {
-				  updatePoGroupRelation($this->id,'');
-			  }
-			  elseif($module == 'HelpDesk' && $table_name == 'vtiger_troubletickets')
-			  {
-				  updateTicketGroupRelation($this->id,'');
-			  }
-			  elseif($module == 'Campaigns' && $table_name == 'vtiger_campaign')
-			  {
-				  updateCampaignGroupRelation($this->id,$groupname);
-			  }
-			  elseif($module =='Activities' || $module =='Events' || $module == 'Emails')
-			  {
-				  if($table_name == 'vtiger_activity')
-                                  {
-			             updateActivityGroupRelation($this->id,$groupname);
-				  }
-			  }
-			  	
-
-		  }
-
-	  }
-	  else
-	  {	
-		  $sql1 = "insert into ".$table_name." (".$column.") values(".$value.")";
-		  $adb->query($sql1); 
-		  $groupname = $_REQUEST['assigned_group_name'];
-		  if($_REQUEST['assigntype'] == 'T' && $table_name == 'vitger_leaddetails')
-		  {
-			  insert2LeadGroupRelation($this->id,$groupname);
-		  }
-		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'vitger_account')
-		  {
-			  insert2AccountGroupRelation($this->id,$groupname);
-		  }
-		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'vitger_contactdetails')
-		  {
-			  insert2ContactGroupRelation($this->id,$groupname);
-		  }
-		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'vitger_potential')
-		  {
-			  insert2PotentialGroupRelation($this->id,$groupname);
-		  }
-		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'vitger_quotes')
-		  {
-			  insert2QuoteGroupRelation($this->id,$groupname);
-		  }
-		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'vitger_salesorder')
-		  {
-			  insert2SoGroupRelation($this->id,$groupname);
-		  }
-		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'vitger_invoice')
-		  {
-			  insert2InvoiceGroupRelation($this->id,$groupname);
-		  }
-		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'vitger_purchaseorder')
-		  {
-			  insert2PoGroupRelation($this->id,$groupname);
-		  }
-		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'vitger_activity') 
-		  {
-			  insert2ActivityGroupRelation($this->id,$groupname);
-		  }
-		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'vitger_troubletickets') 
-		  {
-			  insert2TicketGroupRelation($this->id,$groupname);
-		  }
-		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'vitger_campaign')
-		  {
-			  insert2CampaignGroupRelation($this->id,$groupname);
-		  }
-
-	  }
-
-  }
-function deleteRelation($table_name)
-{
-         global $adb;
-         $check_query = "select * from ".$table_name." where ".$this->tab_name_index[$table_name]."=".$this->id;
-         $check_result=$adb->query($check_query);
-         $num_rows = $adb->num_rows($check_result);
-
-         if($num_rows == 1)
-         {
-                $del_query = "DELETE from ".$table_name." where ".$this->tab_name_index[$table_name]."=".$this->id;
-                $adb->query($del_query);
-         }
-
-}
-function getOldFileName($notesid)
-{
-	   global $log;
-$log->info("in getOldFileName  ".$notesid);
-	global $adb;
-	$query1 = "select * from vtiger_seattachmentsrel where crmid=".$notesid;
-	$result = $adb->query($query1);
-	$noofrows = $adb->num_rows($result);
-	if($noofrows != 0)
-		$attachmentid = $adb->query_result($result,0,'attachmentsid');
-	if($attachmentid != '')
-	{
-		$query2 = "select * from vtiger_attachments where attachmentsid=".$attachmentid;
-		$filename = $adb->query_result($adb->query($query2),0,'name');
-	}
-	return "'".$filename."'";
-}
-function insertIntoTicketCommentTable($table_name, $module)
-{
-	global $log;
-	$log->info("in insertIntoTicketCommentTable  ".$table_name."    module is  ".$module);
-        global $adb;
-	global $current_user;
-
-        $current_time = date('Y-m-d H:i:s');
-	if($_REQUEST['assigned_user_id'] != '')
-		$ownertype = 'user';
-	else
-		$ownertype = 'customer';
-
-	if($this->column_fields['comments'] != '')
-		$comment = $this->column_fields['comments'];
-	else
-		$comment = $_REQUEST['comments'];
-
-	if($comment != '')
-	{
-		$comment = addslashes($comment);
-		$sql = "insert into vtiger_ticketcomments values('',".$this->id.",'".$comment."','".$current_user->id."','".$ownertype."','".$current_time."')";
-	        $adb->query($sql);
-	}
-}
-function insertIntoFAQCommentTable($table_name, $module)
-{
-	 global $log;
-	$log->info("in insertIntoFAQCommentTable  ".$table_name."    module is  ".$module);
-        global $adb;
-
-        $current_time = date('Y-m-d H:i:s');
-
-	if($_REQUEST['comments'] != '')
-	{
-		$comment = addslashes($_REQUEST['comments']);
-		$sql = "insert into vtiger_faqcomments values('',".$this->id.",'".$comment."','".$current_time."')";
-		$adb->query($sql);
-	}
-}
-function insertIntoReminderTable($table_name,$module,$recurid)
-{
-	 global $log;
-$log->info("in insertIntoReminderTable  ".$table_name."    module is  ".$module);
-	if($_REQUEST['set_reminder'] == 'Yes')
-	{
-$log->debug("set reminder is set");
-		$rem_days = $_REQUEST['remdays'];
-$log->debug("rem_days is ".$rem_days);
-		$rem_hrs = $_REQUEST['remhrs'];
-$log->debug("rem_hrs is ".$rem_hrs);
-		$rem_min = $_REQUEST['remmin'];
-$log->debug("rem_minutes is ".$rem_min);
-		$reminder_time = $rem_days * 24 * 60 + $rem_hrs * 60 + $rem_min;
-$log->debug("reminder_time is ".$reminder_time);
-		if ($recurid == "")
-		{
-			if($_REQUEST['mode'] == 'edit')
-			{
-				$this->activity_reminder($this->id,$reminder_time,0,$recurid,'edit');
-			}
-			else
-			{
-				$this->activity_reminder($this->id,$reminder_time,0,$recurid,'');
-			}
-		}
-		else
-		{
-			$this->activity_reminder($this->id,$reminder_time,0,$recurid,'');
-		}
-	}
-	elseif($_REQUEST['set_reminder'] == 'No')
-	{
-		$this->activity_reminder($this->id,'0',0,$recurid,'delete');
-	}
-}
-
-// Code included by Minnie - starts
-function insertIntoInviteeTable($table_name,$module,$invitees_array)
-{
-	global $log,$adb;
-	$log->debug("Entering insertIntoInviteeTable(".$table_name.",".$module.",".$invitees_array.") method ...");
-	foreach($invitees_array as $inviteeid)
-	{
-		if($inviteeid != '')
-		{
-			$query="insert into vtiger_invitees values(".$this->id.",".$inviteeid.")";
-			$adb->query($query);
-		}
-	}
-	$log->debug("Exiting insertIntoInviteeTable method ...");
-
-}
-// Code included by Minnie - Ends
-
-// Code included by Jaguar - starts 
-function insertIntoRecurringTable($table_name,$module)
-{
-	global $log;
-$log->info("in insertIntoRecurringTable  ".$table_name."    module is  ".$module);
-        global $adb;
-        $st_date = getDBInsertDateValue($_REQUEST["date_start"]);
-$log->debug("st_date ".$st_date);
-        $end_date = getDBInsertDateValue($_REQUEST["due_date"]);
-$log->debug("end_date is set ".$end_date);
-        $st=explode("-",$st_date);
-$log->debug("exploding string is ".$st);
-        $end=explode("-",$end_date);
-$log->debug("exploding string again is ".$end);
-        $type = trim($_REQUEST['recurringtype']);
-$log->debug("type is ".$type);
-        $flag="true";
-
-	if($_REQUEST['mode'] == 'edit')
-	{
-		$activity_id=$this->id;
-
-		$sql='select min(recurringdate) AS min_date,max(recurringdate) AS max_date, recurringtype, activityid from vtiger_recurringevents where activityid='. $activity_id.' group by activityid, recurringtype';
-		
-		$result = $adb->query($sql);
-		$noofrows = $adb->num_rows($result);
-		for($i=0; $i<$noofrows; $i++)
-		{
-			$recur_type_b4_edit = $adb->query_result($result,$i,"recurringtype");
-			$date_start_b4edit = $adb->query_result($result,$i,"min_date");
-			$end_date_b4edit = $adb->query_result($result,$i,"max_date");
-		}
-		if(($st_date == $date_start_b4edit) && ($end_date==$end_date_b4edit) && ($type == $recur_type_b4_edit))
-		{
-			if($_REQUEST['set_reminder'] == 'Yes')
-			{
-				$sql = 'delete from vtiger_activity_reminder where activity_id='.$activity_id;
-				$adb->query($sql);
-				$sql = 'delete  from vtiger_recurringevents where activityid='.$activity_id;
-				$adb->query($sql);
-				$flag="true";
-			}
-			elseif($_REQUEST['set_reminder'] == 'No')
-			{
-				$sql = 'delete  from vtiger_activity_reminder where activity_id='.$activity_id;
-				$adb->query($sql);
-				$flag="false";
-			}
-			else
-				$flag="false";
-		}
-		else
-		{
-			$sql = 'delete from vtiger_activity_reminder where activity_id='.$activity_id;
-			$adb->query($sql);
-			$sql = 'delete  from vtiger_recurringevents where activityid='.$activity_id;
-			$adb->query($sql);
-		}
-	}
-	if($flag=="true")
-	{
-		$date_val=$st_date;
-		$date_array[]=$st_date;
-		if($type !=  "--None--")
-		{
-			while($date_val <= $end_date)
-			{
-				if($type == 'Daily')
-				{
-					$date_val = date("Y-m-d",mktime(0,0,0,date("$st[1]"),(date("$st[2]")+(1)),date("$st[0]")));
-				}
-				elseif($type == 'Weekly')
-				{
-					$date_val = date("Y-m-d",mktime(0,0,0,date("$st[1]"),(date("$st[2]")+(7)),date("$st[0]")));
-				}
-				elseif($type == 'Monthly' )
-				{
-					$date_val = date("Y-m-d",mktime(0,0,0,(date("$st[1]")+1),date("$st[2]"),date("$st[0]")));
-				}
-				elseif($type == 'Yearly')
-				{
-					$date_val = date("Y-m-d",mktime(0,0,0,date("$st[1]"),date("$st[2]"),(date("$st[0]")+1)));
-				}
-				$date_array[]=$date_val;
-				$st=explode("-",$date_val);
-			}
-			for($k=0; $k< count($date_array); $k++)
-			{
-				$tdate=$date_array[$k];
-				if($tdate <= $end_date)
-				{
-					$max_recurid_qry = 'select max(recurringid) AS recurid from vtiger_recurringevents;';
-					$result = $adb->query($max_recurid_qry);
-					$noofrows = $adb->num_rows($result);
-					for($i=0; $i<$noofrows; $i++)
-					{
-						$recur_id = $adb->query_result($result,$i,"recurid");
-					}
-					$current_id =$recur_id+1;
-					$recurring_insert = "insert into vtiger_recurringevents values ('".$current_id."','".$this->id."','".$tdate."','".$type."')";
-					$adb->query($recurring_insert);
-					if($_REQUEST['set_reminder'] == 'Yes')
-					{
-						$this->insertIntoReminderTable("activity_reminder",$module,$current_id,'');
-					}
-				}
-			}
-		}
-	}
-}
-
-// Code included by Jaguar - Ends 
-
-	
-  function retrieve_entity_info($record, $module)
-  {
-    global $adb,$log;
-    $result = Array();
-    foreach($this->tab_name_index as $table_name=>$index)
-    {
-	    $result[$table_name] = $adb->query("select * from ".$table_name." where ".$index."=".$record);
-    }
-    $tabid = getTabid($module);
-    $sql1 =  "select * from vtiger_field where tabid=".$tabid;
-    $result1 = $adb->query($sql1);
-    $noofrows = $adb->num_rows($result1);
-    for($i=0; $i<$noofrows; $i++)
-    {
-      $fieldcolname = $adb->query_result($result1,$i,"columnname");
-      $tablename = $adb->query_result($result1,$i,"tablename");
-      $fieldname = $adb->query_result($result1,$i,"fieldname");
-
-      $fld_value = $adb->query_result($result[$tablename],0,$fieldcolname);
-      $this->column_fields[$fieldname] = $fld_value;
-				
-    }
-	if($module == 'Users')
-	{
-		for($i=0; $i<$noofrows; $i++)
-		{
-			$fieldcolname = $adb->query_result($result1,$i,"columnname");
-			$tablename = $adb->query_result($result1,$i,"tablename");
-			$fieldname = $adb->query_result($result1,$i,"fieldname");
-			$fld_value = $adb->query_result($result[$tablename],0,$fieldcolname);
-			$this->$fieldname = $fld_value;
-
-		}
-	}
-		
-    $this->column_fields["record_id"] = $record;
-    $this->column_fields["record_module"] = $module;
-  }
-
-	function save($module_name) 
-	{
-		global $log;
-	        $log->debug("module name is ".$module_name);
-		//GS Save entity being called with the modulename as parameter
-		$this->saveentity($module_name);
-	}
-  
-	function process_list_query($query, $row_offset, $limit= -1, $max_per_page = -1)
-	{
-		global $list_max_entries_per_page;
-		$this->log->debug("process_list_query: ".$query);
-		if(!empty($limit) && $limit != -1){
-			$result =& $this->db->limitQuery($query, $row_offset + 0, $limit,true,"Error retrieving $this->object_name list: ");
-		}else{
-			$result =& $this->db->query($query,true,"Error retrieving $this->object_name list: ");
-		}
-
-		$list = Array();
-		if($max_per_page == -1){
-			$max_per_page 	= $list_max_entries_per_page;
-		}
-		$rows_found =  $this->db->getRowCount($result);
-
-		$this->log->debug("Found $rows_found ".$this->object_name."s");
-                
-		$previous_offset = $row_offset - $max_per_page;
-		$next_offset = $row_offset + $max_per_page;
-
-		if($rows_found != 0)
-		{
-
-			// We have some data.
-
-			for($index = $row_offset , $row = $this->db->fetchByAssoc($result, $index); $row && ($index < $row_offset + $max_per_page || $max_per_page == -99) ;$index++, $row = $this->db->fetchByAssoc($result, $index)){
-
-				
-				foreach($this->list_fields as $entry)
-				{
-
-					foreach($entry as $key=>$field) // this will be cycled only once
-					{						
-						if (isset($row[$field])) {
-							$this->column_fields[$this->list_fields_names[$key]] = $row[$field];
-						
-						
-							$this->log->debug("$this->object_name({$row['id']}): ".$field." = ".$this->$field);
-						}
-						else 
-						{
-							$this->column_fields[$this->list_fields_names[$key]] = "";
-						}
-					}
-				}
-
-
-				//$this->db->println("here is the bug");
-				
-
-				$list[] = clone($this);//added by Richie to support PHP5
-			}
-		}
-
-		$response = Array();
-		$response['list'] = $list;
-		$response['row_count'] = $rows_found;
-		$response['next_offset'] = $next_offset;
-		$response['previous_offset'] = $previous_offset;
-
-		return $response;
-	}
-
-	function process_full_list_query($query)
-	{
-		$this->log->debug("CRMEntity:process_full_list_query");
-		$result =& $this->db->query($query, false);
-		$this->log->debug("CRMEntity:process_full_list_query: result is ".$result);
-
-
-		if($this->db->getRowCount($result) > 0){
-		
-		//	$this->db->println("process_full mid=".$this->module_id." mname=".$this->module_name);
-			// We have some data.
-			while ($row = $this->db->fetchByAssoc($result)) {				
-				$rowid=$row[$this->module_id];
-
-				if(isset($rowid))
-			       		$this->retrieve_entity_info($rowid,$this->module_name);
-				else
-					$this->db->println("rowid not set unable to retrieve");
-				 
-				 
-				
-		//clone function added to resolvoe PHP5 compatibility issue in Dashboards
-		//If we do not use clone, while using PHP5, the memory address remains fixed but the
-	//data gets overridden hence all the rows that come in bear the same value. This in turn
-//provides a wrong display of the Dashboard graphs. The data is erroneously shown for a specific month alone
-//Added by Richie
-				$list[] = clone($this);//added by Richie to support PHP5
-			}
-		}
-
-		if (isset($list)) return $list;
-		else return null;
-	}
-	
-	/** This function should be overridden in each module.  It marks an item as deleted.
-	* If it is not overridden, then marking this type of item is not allowed
-	 * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc..
-	 * All Rights Reserved..
-	 * Contributor(s): ______________________________________..
-	*/
-	function mark_deleted($id)
-	{
-		$query = "UPDATE vtiger_crmentity set deleted=1 where crmid='$id'";
-		$this->db->query($query, true,"Error marking record deleted: ");
-
-
-	}
-
-
-	function retrieve_by_string_fields($fields_array, $encode=true) 
-	{ 
-		$where_clause = $this->get_where($fields_array);
-		
-		$query = "SELECT * FROM $this->table_name $where_clause";
-		$this->log->debug("Retrieve $this->object_name: ".$query);
-		$result =& $this->db->requireSingleResult($query, true, "Retrieving record $where_clause:");
-		if( empty($result)) 
-		{ 
-		 	return null; 
-		} 
-
-		 $row = $this->db->fetchByAssoc($result,-1, $encode);
-
-		foreach($this->column_fields as $field) 
-		{ 
-			if(isset($row[$field])) 
-			{ 
-				$this->$field = $row[$field];
-			}
-		} 
-		return $this;
-	}
-
-	// this method is called during an import before inserting a bean
-	// define an associative array called $special_fields
-	// the keys are user defined, and don't directly map to the bean's vtiger_fields
-	// the value is the method name within that bean that will do extra
-	// processing for that vtiger_field. example: 'full_name'=>'get_names_from_full_name'
-
-	function process_special_fields() 
-	{ 
-		foreach ($this->special_functions as $func_name) 
-		{ 
-			if ( method_exists($this,$func_name) ) 
-			{ 
-				$this->$func_name(); 
-			} 
-		} 
-	}
-
-	/**
-         * Function to check if the custom vtiger_field vtiger_table exists
-         * return true or false
-         */
-        function checkIfCustomTableExists($tablename)
-        {
-                $query = "select * from ".$tablename;
-                $result = $this->db->query($query);
-                $testrow = $this->db->num_fields($result);
-                if($testrow > 1)
-                {
-                        $exists=true;
-                }
-                else
-                {
-                        $exists=false;
-                }
-                return $exists;
-        }
-
-	/**
-	 * function to construct the query to fetch the custom vtiger_fields
-	 * return the query to fetch the custom vtiger_fields
-         */
-        function constructCustomQueryAddendum($tablename,$module)
-        {
-                global $adb;
-		$tabid=getTabid($module);		
-                $sql1 = "select columnname,fieldlabel from vtiger_field where generatedtype=2 and tabid=".$tabid;
-                $result = $adb->query($sql1);
-                $numRows = $adb->num_rows($result);
-                $sql3 = "select ";
-                for($i=0; $i < $numRows;$i++)
-                {
-                        $columnName = $adb->query_result($result,$i,"columnname");
-                        $fieldlable = $adb->query_result($result,$i,"fieldlabel");
-                        //construct query as below
-                        if($i == 0)
-                        {
-                                $sql3 .= $tablename.".".$columnName. " '" .$fieldlable."'";
-                        }
-                        else
-                        {
-                                $sql3 .= ", ".$tablename.".".$columnName. " '" .$fieldlable."'";
-                        }
-
-                }
-                if($numRows>0)
-                {
-                        $sql3=$sql3.',';
-                }
-                return $sql3;
-
-        }
-
-
-	/**	function to save the product tax information in producttarel vtiger_table
-	 *	@param string $tablename - vtiger_tablename to save the product tax relationship (producttaxrel)
-	 *	@param string $module	 - current module name
-	 *	$return void
-	*/
-	function insertTaxInformation($tablename, $module)
-	{
-		global $adb, $log;
-		$log->debug("Entering into insertTaxInformation($tablename, $module) method ...");
-
-		$tax_per = '';
-		//Save the Product - VAT tax relationship if VAT tax check box is enabled
-		//Delete the existing tax if any
-		if($this->mode == 'edit')
-		{
-			$tax_array = Array('VAT','Sales','Service');
-			foreach($tax_array as $tax_type)
-			{
-				$taxid = getTaxId($tax_type);
-				$sql = "delete from vtiger_producttaxrel where productid=$this->id and taxid=$taxid";
-				$adb->query($sql);
-			}
-		}
-		if($_REQUEST['vat_check'] == 'on' || $_REQUEST['vat_check'] == 1)
-		{
-			$taxid = getTaxId('VAT');
-			$tax_per = $_REQUEST['vat_tax'];
-			if($tax_per == '')
-				$tax_per = getTaxPercentage('VAT');
-
-			$log->debug("Going to save the Product - VAT tax relationship");
-
-			$sql = "insert into vtiger_producttaxrel values($this->id,$taxid,$tax_per)";
-			$adb->query($sql);
-		}
-		//Save the Product - Sales tax relationship if Sales tax check box is enabled
-		if($_REQUEST['sales_check'] == 'on' || $_REQUEST['sales_check'] == 1)
-		{
-			$taxid = getTaxId('Sales');
-			$tax_per = $_REQUEST['sales_tax'];
-			if($tax_per == '')
-				$tax_per = getTaxPercentage('Sales');
-
-			$log->debug("Going to save the Product - Sales tax relationship");
-
-			$sql = "insert into vtiger_producttaxrel values($this->id,$taxid,$tax_per)";
-			$adb->query($sql);
-		}
-		//Save the Product - Service tax relationship if Service tax check box is enabled
-		if($_REQUEST['service_check'] == 'on' || $_REQUEST['service_check'] == 1)
-		{
-			$taxid = getTaxId('Service');
-			$tax_per = $_REQUEST['service_tax'];
-			if($tax_per == '')
-				$tax_per = getTaxPercentage('Service');
-
-			$log->debug("Going to save the Product - Service tax relationship");
-
-			$sql = "insert into vtiger_producttaxrel values($this->id,$taxid,$tax_per)";
-			$adb->query($sql);
-		}
-
-		$log->debug("Exiting from insertTaxInformation($tablename, $module) method ...");
-	}	
-
-}
-?>
+<?php
+/*********************************************************************************
+ * The contents of this file are subject to the SugarCRM Public License Version 1.1.2
+ * ("License"); You may not use this file except in compliance with the 
+ * License. You may obtain a copy of the License at http://www.sugarcrm.com/SPL
+ * Software distributed under the License is distributed on an  "AS IS"  basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
+ * the specific language governing rights and limitations under the License.
+ * The Original Code is:  SugarCRM Open Source
+ * The Initial Developer of the Original Code is SugarCRM, Inc.
+ * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.;
+ * All Rights Reserved.
+ * Contributor(s): ______________________________________.
+ ********************************************************************************/
+/*********************************************************************************
+ * $Header: /advent/projects/wesat/vtiger_crm/vtigercrm/data/CRMEntity.php,v 1.16 2005/04/29 04:21:31 mickie Exp $
+ * Description:  Defines the base class for all data entities used throughout the 
+ * application.  The base class including its methods and variables is designed to 
+ * be overloaded with module-specific methods and variables particular to the 
+ * module's base entity class. 
+ ********************************************************************************/
+
+include_once('config.php');
+require_once('include/logging.php');
+require_once('data/Tracker.php');
+require_once('include/utils/utils.php');
+require_once('include/utils/UserInfoUtil.php');
+
+class CRMEntity
+{
+  /**
+   * This method implements a generic insert and update logic for any SugarBean
+   * This method only works for subclasses that implement the same variable names.
+   * This method uses the presence of an id vtiger_field that is not null to signify and update.
+   * The id vtiger_field should not be set otherwise.
+   * todo - Add support for vtiger_field type validation and encoding of parameters.
+   * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
+   * All Rights Reserved.
+   * Contributor(s): ______________________________________..
+   */
+
+	
+  function saveentity($module)
+  {
+	global $current_user, $adb;//$adb added by raju for mass mailing
+	$insertion_mode = $this->mode;
+
+	$this->db->println("TRANS saveentity starts $module");
+	$this->db->startTransaction();
+	
+	// Code included by Jaguar - starts    
+	if(isset($_REQUEST['recurringtype']) && $_REQUEST['recurringtype']!='')
+		$recur_type = trim($_REQUEST['recurringtype']);
+	else
+    		$recur_type='';	
+	// Code included by Jaguar - Ends
+
+	//Code included by Minnie - Starts
+	if(isset($_REQUEST['inviteesid']) && $_REQUEST['inviteesid']!='')
+	{
+		$selected_users_string =  $_REQUEST['inviteesid'];
+		$invitees_array = explode(';',$selected_users_string);
+
+	}
+	else
+		$invitees_array='';
+	//Code included by Minnie - Ends	
+
+	foreach($this->tab_name as $table_name)
+	{
+		if($table_name == "vtiger_crmentity")
+		{
+			$this->insertIntoCrmEntity($module);
+		}
+		elseif($table_name == "vtiger_salesmanactivityrel")
+		{
+			$this->insertIntoSmActivityRel($module);
+		}
+		//added by raju
+		elseif($table_name=="vtiger_seactivityrel" )
+		{
+			if($module=="Emails" && $_REQUEST['smodule']!='webmails')
+			//modified by Richie as raju's implementation broke the feature for addition of webmail to vtiger_crmentity.need to be more careful in future while integrating code
+			//if($_REQUEST['smodule']!='webmails' && $_REQUEST['smodule'] != '')
+			{
+				if($_REQUEST['currentid']!='')
+				{
+					$actid=$_REQUEST['currentid'];
+				}
+				else 
+				{
+					$actid=$_REQUEST['record'];
+				}
+				$parentid=$_REQUEST['parent_id'];
+				if($_REQUEST['module'] != 'Emails' && $_REQUEST['module'] != 'Webmails')
+				{
+					if(!$parentid) {
+						$parentid = $adb->getUniqueID('vtiger_seactivityrel');
+					}
+					$mysql='insert into vtiger_seactivityrel values('.$parentid.','.$actid.')';
+					$adb->query($mysql);
+				}
+				else
+				{	  
+					$myids=explode("|",$parentid);  //2 at 71|
+					for ($i=0;$i<(count($myids)-1);$i++)
+					{
+						$realid=explode("@",$myids[$i]);
+						$mycrmid=$realid[0];
+						//added to handle the relationship of emails with vtiger_users
+						if($realid[1] == -1)
+							$mysql='insert into vtiger_salesmanactivityrel values('.$mycrmid.','.$actid.')';
+						else	
+							$mysql='insert into vtiger_seactivityrel values('.$mycrmid.','.$actid.')';
+						$adb->query($mysql);
+					}
+				}
+			}
+			else
+			{
+				if(isset($this->column_fields['parent_id']) && $this->column_fields['parent_id'] != '')
+				{
+					$this->insertIntoEntityTable($table_name, $module);
+				}
+				elseif($this->column_fields['parent_id']=='' && $insertion_mode=="edit")
+				{
+					$this->deleteRelation($table_name);
+				}
+			}			
+		}
+		elseif($table_name == "vtiger_seticketsrel" || $table_name ==  "vtiger_seproductsrel" || $table_name ==  "vtiger_senotesrel")
+		{
+			if(isset($this->column_fields['parent_id']) && $this->column_fields['parent_id'] != '')//raju - mass mailing ends
+			{
+				$this->insertIntoEntityTable($table_name, $module);
+			}
+			elseif($this->column_fields['parent_id']=='' && $insertion_mode=="edit")
+			{
+				$this->deleteRelation($table_name);
+			}
+		}
+		elseif($table_name ==  "vtiger_cntactivityrel")
+		{
+			if(isset($this->column_fields['contact_id']) && $this->column_fields['contact_id'] != '')
+			{
+				$this->insertIntoEntityTable($table_name, $module);
+			}
+			elseif($this->column_fields['contact_id'] =='' && $insertion_mode=="edit")
+			{
+				$this->deleteRelation($table_name);
+			}
+
+		}
+		elseif($table_name ==  "vtiger_ticketcomments")
+		{
+                	$this->insertIntoTicketCommentTable($table_name, $module);
+		}
+		elseif($table_name ==  "vtiger_faqcomments")
+		{
+                	$this->insertIntoFAQCommentTable($table_name, $module);
+		}
+		elseif($table_name == "vtiger_activity_reminder")
+		{
+			if($recur_type == "--None--")
+			{
+				$this->insertIntoReminderTable($table_name,$module,"");
+			}
+		}
+		elseif($table_name == "vtiger_recurringevents") // Code included by Jaguar -  starts
+		{
+			$recur_type = trim($_REQUEST['recurringtype']);
+			if($recur_type != "--None--"  && $recur_type != '')
+		      	{		   
+	      			$this->insertIntoRecurringTable($table_name,$module);
+			}		
+		}// Code included by Jaguar - Ends
+		// Code included by Minnie  -  starts	
+		elseif($table_name == "vtiger_invitees") 
+		{
+			if($invitees_array != '')
+			{
+				$this->insertIntoInviteeTable($table_name,$module,$invitees_array);
+			}
+		}
+		// Code included by Minnie  -  Ends
+		elseif($table_name == 'vtiger_producttaxrel')
+		{
+			$this->insertTaxInformation($table_name, $module);
+		}
+		elseif($table_name == 'vtiger_attachments')
+		{
+			$this->insertIntoAttachment($this->id,$module);
+		}
+		else
+		{
+			$this->insertIntoEntityTable($table_name, $module);			
+		}
+	}
+
+	$this->db->completeTransaction();
+        $this->db->println("TRANS saveentity ends");
+  }
+
+
+	function insertIntoAttachment1($id,$module,$filedata,$filename,$filesize,$filetype,$user_id)
+	{
+		$date_var = date('YmdHis');
+		global $current_user;
+		global $adb;
+		//global $root_directory;
+		global $log;
+
+		$ownerid = $user_id;
+		
+		if($filesize != 0)
+		{
+			$data = base64_encode(fread(fopen($filedata, "r"), $filesize));
+		}
+		
+		$current_id = $adb->getUniqueID("vtiger_crmentity");
+
+		if($module=='Emails') 
+		{ 
+			$log->info("module is ".$module);
+			$idname='emailid';      $tablename='emails';    $descname='description';
+		}
+		else     
+		{ 
+			$idname='notesid';      $tablename='notes';     $descname='notecontent';
+		}
+
+		$sql="update ".$tablename." set filename='".$filename."' where ".$idname."=".$id;
+		$adb->query($sql);
+
+		$sql1 = "insert into vtiger_crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime,modifiedtime) values(".$current_id.",".$current_user->id.",".$ownerid.",'".$module." Attachment','"."',".$adb->formatString("vtiger_crmentity","createdtime",$date_var).",".$adb->formatString("vtiger_crmentity","modifiedtime",$date_var).")";
+		$adb->query($sql1);
+
+		$sql2="insert into vtiger_attachments(attachmentsid, name, description, type) values(".$current_id.",'".$filename."','"."','".$filetype."')";
+		$result=$adb->query($sql2);
+
+		//TODO -- instead of put contents in db now we should store the file in harddisk
+
+		$sql3='insert into vtiger_seattachmentsrel values('.$id.','.$current_id.')';
+		$adb->query($sql3);
+	}
+
+
+	/**
+	 *      This function is used to add the vtiger_attachments. This will call the function uploadAndSaveFile which will upload the attachment into the server and save that attachment information in the database.
+	 *      @param int $id  - entity id to which the vtiger_files to be uploaded
+	 *      @param string $module  - the current module name
+	*/
+	function insertIntoAttachment($id,$module)
+	{
+		global $log, $adb;
+		$log->debug("Entering into insertIntoAttachment($id,$module) method.");
+		
+		$file_saved = false;
+
+		//This is to added to store the existing attachment id of the contact where we should delete this when we give new image
+		if($module == 'Contacts')
+			$old_attachmentid = $adb->query_result($adb->query("select * from vtiger_seattachmentsrel where crmid=$id"),0,'attachmentsid');
+
+		foreach($_FILES as $fileindex => $files)
+		{
+			if($files['name'] != '' && $files['size'] > 0)
+			{
+				$file_saved = $this->uploadAndSaveFile($id,$module,$files);
+			}
+		}
+
+		//This is to handle the delete image for contacts
+		if($module == 'Contacts' && $file_saved)
+		{
+			$del_res1 = $adb->query("delete from vtiger_attachments where attachmentsid=$old_attachmentid");
+			$del_res2 = $adb->query("delete from vtiger_seattachmentsrel where attachmentsid=$old_attachmentid");
+		}
+
+
+		//Remove the deleted vtiger_attachments from db - Products
+		if($module == 'Products' && $_REQUEST['del_file_list'] != '')
+		{
+			$del_file_list = explode("###",trim($_REQUEST['del_file_list'],"###"));
+			foreach($del_file_list as $del_file_name)
+			{
+				$attach_res = $adb->query("select vtiger_attachments.attachmentsid from vtiger_attachments inner join vtiger_seattachmentsrel on vtiger_attachments.attachmentsid=vtiger_seattachmentsrel.attachmentsid where crmid=$id and name=\"$del_file_name\"");
+				$attachments_id = $adb->query_result($attach_res,0,'attachmentsid');
+				
+				$del_res1 = $adb->query("delete from vtiger_attachments where attachmentsid=$attachments_id");
+				$del_res2 = $adb->query("delete from vtiger_seattachmentsrel where attachmentsid=$attachments_id");
+			}
+		}
+
+		$log->debug("Exiting from insertIntoAttachment($id,$module) method.");
+	}
+
+	/**
+	 *      This function is used to upload the attachment in the server and save that attachment information in db.
+	 *      @param int $id  - entity id to which the file to be uploaded
+	 *      @param string $module  - the current module name
+	 *      @param array $file_details  - array which contains the file information(name, type, size, tmp_name and error)
+	 *      return void
+	*/
+	function uploadAndSaveFile($id,$module,$file_details)
+	{
+		global $log;
+		$log->debug("Entering into uploadAndSaveFile($id,$module,$file_details) method.");
+
+		global $adb, $current_user;
+		global $upload_badext;
+
+		$date_var = date('YmdHis');
+
+		//to get the owner id
+		$ownerid = $this->column_fields['assigned_user_id'];
+		if(!isset($ownerid) || $ownerid=='')
+			$ownerid = $current_user->id;
+
+	
+		// Arbitrary File Upload Vulnerability fix - Philip
+		$binFile = $file_details['name'];
+		$ext_pos = strrpos($binFile, ".");
+
+		$ext = substr($binFile, $ext_pos + 1);
+
+		if (in_array($ext, $upload_badext))
+		{
+			$binFile .= ".txt";
+		}
+		// Vulnerability fix ends
+
+		$current_id = $adb->getUniqueID("vtiger_crmentity");
+
+		$filename = basename($binFile);
+		$filetype= $file_details['type'];
+		$filesize = $file_details['size'];
+		$filetmp_name = $file_details['tmp_name'];
+
+		//get the file path inwhich folder we want to upload the file
+		$upload_file_path = decideFilePath();
+
+		//upload the file in server
+		$upload_status = move_uploaded_file($filetmp_name,$upload_file_path.$current_id."_".$binFile);
+
+		$save_file = 'true';
+		//only images are allowed for these modules
+		if($module == 'Contacts' || $module == 'Products')
+		{
+			$save_file = validateImageFile(&$file_details);
+		}
+
+		if($save_file == 'true' && $upload_status == 'true')
+		{
+			//This is only to update the attached filename in the vtiger_notes vtiger_table for the Notes module
+			if($module=='Notes')
+			{
+				$sql="update vtiger_notes set filename='".$filename."' where notesid = ".$id;
+				$adb->query($sql);
+			}
+
+			$sql1 = "insert into vtiger_crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime,modifiedtime) values(".$current_id.",".$current_user->id.",".$ownerid.",'".$module." Attachment','".$this->column_fields['description']."',".$adb->formatString("vtiger_crmentity","createdtime",$date_var).",".$adb->formatString("vtiger_crmentity","modifiedtime",$date_var).")";
+			$adb->query($sql1);
+
+			$sql2="insert into vtiger_attachments(attachmentsid, name, description, type, path) values(".$current_id.",'".$filename."','".$this->column_fields['description']."','".$filetype."','".$upload_file_path."')";
+			$result=$adb->query($sql2);
+
+			if($_REQUEST['mode'] == 'edit')
+			{
+				if($id != '' && $_REQUEST['fileid'] != '')
+				{
+					$delquery = 'delete from vtiger_seattachmentsrel where crmid = '.$id.' and attachmentsid = '.$_REQUEST['fileid'];
+					$adb->query($delquery);
+				}
+			}
+			if($module == 'Notes')
+			{
+				$query = "delete from vtiger_seattachmentsrel where crmid = ".$id;
+				$adb->query($query);
+			}
+			$sql3='insert into vtiger_seattachmentsrel values('.$id.','.$current_id.')';
+			$adb->query($sql3);
+
+			return true;
+		}
+		else
+		{
+			$log->debug("Skip the save attachment process.");
+			return false;
+		}
+	}
+
+
+
+  function insertIntoCrmEntity($module)
+  {
+	global $adb;
+	global $current_user;
+	global $log;
+                
+	$date_var = date('YmdHis');
+	if($_REQUEST['assigntype'] == 'T')
+	{
+		$ownerid= 0;
+	}
+	else
+	{
+		$ownerid = $this->column_fields['assigned_user_id'];
+	}
+                
+	if($module == 'Products' || $module == 'Notes' || $module =='Faq' || $module == 'Vendors' || $module == 'PriceBooks')
+	{
+		$log->info("module is =".$module);
+		$ownerid = $current_user->id;
+	}
+	if($module == 'Events')
+	{
+		$module = 'Activities';
+	}
+	if($this->mode == 'edit')
+	{
+		$description_val = from_html($adb->formatString("vtiger_crmentity","description",$this->column_fields['description']),($insertion_mode == 'edit')?true:false);
+		$sql = "update vtiger_crmentity set smownerid=".$ownerid.",modifiedby=".$current_user->id.",description=".$description_val.", modifiedtime=".$adb->formatString("vtiger_crmentity","modifiedtime",$date_var)." where crmid=".$this->id;
+
+		$adb->query($sql);
+		$sql1 ="delete from vtiger_ownernotify where crmid=".$this->id;
+		$adb->query($sql1);
+		if($ownerid != $current_user->id)
+		{
+			$sql1 = "insert into vtiger_ownernotify values(".$this->id.",".$ownerid.",null)";
+			$adb->query($sql1);
+		}
+	}
+	else
+	{
+		//if this is the create mode and the group allocation is chosen, then do the following
+		$current_id = $adb->getUniqueID("vtiger_crmentity");
+		$_REQUEST['currentid']=$current_id;
+
+		$description_val = from_html($adb->formatString("vtiger_crmentity","description",$this->column_fields['description']),($insertion_mode == 'edit')?true:false);
+		$sql = "insert into vtiger_crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime,modifiedtime) values('".$current_id."','".$current_user->id."','".$ownerid."','".$module."',".$description_val.",".$adb->formatDate($date_var).",".$adb->formatDate($date_var).")";
+		$adb->query($sql);
+		$this->id = $current_id;
+	}
+
+    }
+
+
+
+  function insertIntoSmActivityRel($module)
+  {
+    global $adb;
+    global $current_user;
+    if($this->mode == 'edit')
+    {
+
+      $sql = "delete from vtiger_salesmanactivityrel where activityid=".$this->id." and smid = ".$this->column_fields['assigned_user_id']."";
+      $adb->query($sql);
+
+    }
+	$sql_qry = "insert into vtiger_salesmanactivityrel (smid,activityid) values(".$this->column_fields['assigned_user_id'].",".$this->id.")";
+    $adb->query($sql_qry);
+
+  }
+  //code added by richie starts
+  function constructUpdateLog($id)
+  {
+    global $adb;
+    global $current_user;
+    $ticketid = $id;
+    //Updating History
+    $tktresult = $adb->query("select * from vtiger_troubletickets where ticketid='".$ticketid."'");
+    $crmresult = $adb->query("select * from vtiger_crmentity where crmid='".$ticketid."'");
+    $updatelog = $adb->query_result($tktresult,0,"update_log");
+    $old_user_id = $adb->query_result($crmresult,0,"smownerid");
+    $old_status = $adb->query_result($tktresult,0,"status");
+    $old_priority = $adb->query_result($tktresult,0,"priority");
+    $old_severity = $adb->query_result($tktresult,0,"severity");
+    $old_category = $adb->query_result($tktresult,0,"category");
+    if($_REQUEST['old_smownerid'] != $old_user_id && $old_user_id != 0)
+    {
+      $user_name = getUserName($this->column_fields['assigned_user_id']);
+      $updatelog .= ' Transferred to '.$user_name.'\.';
+    }
+    elseif($old_user_id == 0)
+    {
+	$group_info = getGroupName($ticketid,'HelpDesk');	
+	$group_name = $group_info[0];	
+	if($group_name != $_REQUEST['assigned_group_name'])
+		$updatelog .= ' Transferred to group '.$_REQUEST['assigned_group_name'].'\.';
+    }
+    if($old_status != $this->column_fields['ticketstatus'])
+    {
+      $updatelog .= ' Status Changed to '.$this->column_fields['ticketstatus'].'\.';
+    }
+    if($old_priority != $this->column_fields['ticketpriorities'])
+    {
+      $updatelog .= ' Priority Changed to '.$this->column_fields['ticketpriorities'].'\.';
+    }
+    if($old_severity != $this->column_fields['ticketseverities'])
+    {
+      $updatelog .= ' Severity Changed to '.$this->column_fields['ticketseverities'].'\.';
+    }
+    if($old_category != $this->column_fields['ticketcategories'])
+    {
+      $updatelog .= ' Category Changed to '.$this->column_fields['ticketcategories'].'\.';
+    }
+    if($_REQUEST['old_smownerid'] != $old_user_id || $old_status != $this->column_fields['ticketstatus'] || $old_priority != $this->column_fields['ticketpriorities'] || $old_severity != $this->column_fields['ticketseverities'] || $old_category != $this->column_fields['ticketcategories'] || $old_userid == 0)
+    {
+      $updatelog .= ' -- '.date("l dS F Y h:i:s A").' by '.$current_user->user_name.'--//--';
+    }
+    else
+    {
+        $update_log .= '--//--';
+    }
+
+    return $updatelog;
+  }
+  //code added by richie ends
+  function insertIntoEntityTable($table_name, $module)
+  {
+	  global $log;	
+	   $log->info("function insertIntoCrmEntity ".$module.' vtiger_table name ' .$table_name);
+	  global $adb;
+	  $insertion_mode = $this->mode;
+
+	  //Checkin whether an entry is already is present in the vtiger_table to update
+	  if($insertion_mode == 'edit')
+	  {
+		  $check_query = "select * from ".$table_name." where ".$this->tab_name_index[$table_name]."=".$this->id;
+		  $check_result=$adb->query($check_query);
+
+		  $num_rows = $adb->num_rows($check_result);
+
+		  if($num_rows <= 0)
+		  {
+			  $insertion_mode = '';
+		  }	 
+	  }
+
+	  if($insertion_mode == 'edit')
+	  {
+		  $update = '';
+		  $tabid= getTabid($module);	
+		  $sql = "select * from vtiger_field where tabid=".$tabid." and tablename='".$table_name."' and displaytype in (1,3)"; 
+	  }
+	  else
+	  {
+		  $column = $this->tab_name_index[$table_name];
+		  if($column == 'id' && $table_name == 'vtiger_users')
+		  {
+		 	$currentuser_id = $adb->getUniqueID("vtiger_users");
+			$this->id = $currentuser_id;
+		  }
+		  $value = $this->id;
+	  	  $tabid= getTabid($module);	
+		  $sql = "select * from vtiger_field where tabid=".$tabid." and tablename='".$table_name."' and displaytype in (1,3,4)"; 
+	  }
+
+	  $result = $adb->query($sql);
+	  $noofrows = $adb->num_rows($result);
+	  for($i=0; $i<$noofrows; $i++)
+	  {
+		  $fieldname=$adb->query_result($result,$i,"fieldname");
+		  $columname=$adb->query_result($result,$i,"columnname");
+		  $uitype=$adb->query_result($result,$i,"uitype");
+		  if(isset($this->column_fields[$fieldname]))
+		  {
+			  if($uitype == 56)
+			  {
+				  if($this->column_fields[$fieldname] == 'on' || $this->column_fields[$fieldname] == 1)
+				  {
+					  $fldvalue = 1;
+				  }
+				  else
+				  {
+					  $fldvalue = 0;
+				  }
+
+			  }
+			  elseif($uitype == 33)
+			  {
+				$j = 0;
+				$field_list = '';
+				if(is_array($this->column_fields[$fieldname]) && count($this->column_fields[$fieldname]) > 0)
+				{
+					foreach($this->column_fields[$fieldname] as $key=>$multivalue)
+					{
+						if($j != 0)
+						{
+							$field_list .= ' , ';
+						}
+						$field_list .= $multivalue;
+						$j++;
+					}
+				}
+				$fldvalue = $field_list;
+			  }
+			  elseif($uitype == 5 || $uitype == 6 || $uitype ==23)
+			  {
+				  if($_REQUEST['action'] == 'Import')
+				  {
+					  $fldvalue = $this->column_fields[$fieldname];
+				  }
+				  else
+				  {
+					  $fldvalue = getDBInsertDateValue($this->column_fields[$fieldname]);
+				  }
+			  }
+			  else
+			  {
+				  $fldvalue = $this->column_fields[$fieldname]; 
+				  $fldvalue = stripslashes($fldvalue);
+			  }
+			  $fldvalue = from_html($adb->formatString($table_name,$columname,$fldvalue),($insertion_mode == 'edit')?true:false);
+
+
+
+		  }
+		  else
+		  {
+			  $fldvalue = '';
+		  }
+		  if($fldvalue=='') $fldvalue ="NULL";
+		  if($insertion_mode == 'edit')
+		  {
+			  //code by richie starts
+			  if(($table_name == "vtiger_troubletickets") && ($columname == "update_log"))
+			  {
+				  $fldvalue = $this->constructUpdateLog($this->id);
+				  $fldvalue = from_html($adb->formatString($table_name,$columname,$fldvalue),($insertion_mode == 'edit')?true:false);
+			  }
+			  //code by richie ends
+
+			  if($table_name == 'vtiger_notes' && $columname == 'filename' && $_FILES['filename']['name'] == '')
+			  {
+				  $fldvalue = $this->getOldFileName($this->id);
+			  }
+			  if($table_name == 'vtiger_products' && $columname == 'imagename')
+			  {
+					  
+
+			  }
+			  if($table_name != 'vtiger_ticketcomments')
+			  {
+				  if($i == 0)
+				  {
+					  $update = $columname."=".$fldvalue."";
+				  }
+				  else
+				  {
+					  $update .= ', '.$columname."=".$fldvalue."";
+				  }
+			  }
+		  }
+		  else
+		  {
+			  //code by richie starts
+			  if(($table_name == "vtiger_troubletickets") && ($columname == "update_log"))
+			  {
+				  global $current_user;
+				  $fldvalue = date("l dS F Y h:i:s A").' by '.$current_user->user_name;
+				  if($_REQUEST['assigned_group_name'] != '' && $_REQUEST['assigntype'] == 'T')
+                                  {
+                                        $group_name = $_REQUEST['assigned_group_name'];
+                                  }
+				  elseif($this->column_fields['assigned_user_id'] != '')
+				  {
+					  $tkt_ownerid = $this->column_fields['assigned_user_id'];
+				  }
+				  else
+				  {
+					  $tkt_ownerid = $current_user->id;
+				  }
+				  if($group_name != '')
+					  $tkt_ownername = $group_name;
+				  else
+					  $tkt_ownername = getUserName($tkt_ownerid);	
+				  $fldvalue = " Ticket created. Assigned to ".$tkt_ownername." -- ".$fldvalue."--//--";
+				  $fldvalue = from_html($adb->formatString($table_name,$columname,$fldvalue),($insertion_mode == 'edit')?true:false);
+				  //echo ' updatevalue is ............. ' .$fldvalue;
+			  }
+			  //code by richie ends
+			  $column .= ", ".$columname;
+			  $value .= ", ".$fldvalue."";
+		  }
+
+	  }
+
+
+
+
+
+	  if($insertion_mode == 'edit')
+	  {
+		  if($_REQUEST['module'] == 'Potentials')
+		  {
+			  $dbquery = 'select sales_stage from vtiger_potential where potentialid = '.$this->id;
+			  $sales_stage = $adb->query_result($adb->query($dbquery),0,'sales_stage');
+			  if($sales_stage != $_REQUEST['sales_stage'])
+			  {
+				  $date_var = date('YmdHis');
+				  $closingdate = getDBInsertDateValue($_REQUEST['closingdate']);
+				  $sql = "insert into vtiger_potstagehistory values('',".$this->id.",'".$_REQUEST['amount']."','".$sales_stage."','".$_REQUEST['probability']."',0,".$adb->formatString("vtiger_potstagehistory","closedate",$closingdate).",".$adb->formatString("vtiger_potstagehistory","lastmodified",$date_var).")";
+				  $adb->query($sql);
+			  }
+		  }
+		  elseif($_REQUEST['module'] == 'PurchaseOrder' || $_REQUEST['module'] == 'SalesOrder' || $_REQUEST['module'] == 'Quotes' || $_REQUEST['module'] == 'Invoice')
+		  {
+			  //added to update the history for PO, SO, Quotes and Invoice
+			  $history_field_array = Array(
+				  			"PurchaseOrder"=>"postatus",
+							"SalesOrder"=>"sostatus",
+							"Quotes"=>"quotestage",
+							"Invoice"=>"invoicestatus"
+						      );
+
+			  $inventory_module = $_REQUEST['module'];
+			  if($inventory_module == "PurchaseOrder")
+			  	$relatedname = $_REQUEST["vendor_name"];
+			  else
+			  	$relatedname = $_REQUEST["account_name"];
+
+			  $oldvalue = getSingleFieldValue($this->table_name,$history_field_array[$inventory_module],$this->module_id,$this->id);
+			  if($oldvalue != $this->column_fields["$history_field_array[$inventory_module]"])
+			  {
+				  addInventoryHistory($inventory_module, $this->id,$relatedname,$_REQUEST['grandTotal'],$this->column_fields["$history_field_array[$inventory_module]"]);
+			  }
+		  }
+
+		  //Check done by Don. If update is empty the the query fails
+		  if(trim($update) != '')
+        	  {
+		  	$sql1 = "update ".$table_name." set ".$update." where ".$this->tab_name_index[$table_name]."=".$this->id;
+
+		  	$adb->query($sql1); 
+		  }
+
+		  if($_REQUEST['assigntype'] == 'T')
+		  {
+			  $groupname = $_REQUEST['assigned_group_name'];
+			  //echo 'about to update lead group relation';
+			  if($module == 'Leads' && $table_name == 'vtiger_leaddetails')
+			  {
+				  updateLeadGroupRelation($this->id,$groupname);
+			  }
+                          elseif($module == 'Accounts' && $table_name == 'vtiger_account')
+			  {
+				  updateAccountGroupRelation($this->id,$groupname);
+			  }
+			  elseif($module == 'Contacts' && $table_name == 'vtiger_contactdetails')
+			  {
+				  updateContactGroupRelation($this->id,$groupname);
+			  }
+			  elseif($module == 'Potentials' && $table_name == 'vtiger_potential')
+			  {
+				  updatePotentialGroupRelation($this->id,$groupname);
+			  }
+			  elseif($module == 'Quotes' && $table_name == 'vtiger_quotes')
+			  {
+				  updateQuoteGroupRelation($this->id,$groupname);
+			  }
+			  elseif($module == 'SalesOrder' && $table_name == 'vtiger_salesorder')
+			  {
+				  updateSoGroupRelation($this->id,$groupname);
+			  }
+			  elseif($module == 'Invoice' && $table_name == 'vtiger_invoice')
+			  {
+				  updateInvoiceGroupRelation($this->id,$groupname);
+			  }
+			  elseif($module == 'PurchaseOrder' && $table_name == 'vtiger_purchaseorder')
+			  {
+				  updatePoGroupRelation($this->id,$groupname);
+			  }
+			  elseif($module == 'HelpDesk' && $table_name == 'vtiger_troubletickets')
+			  {
+				  updateTicketGroupRelation($this->id,$groupname);
+			  }
+			  elseif($module == 'Campaigns' && $table_name == 'vtiger_campaign')
+			  {
+				  updateCampaignGroupRelation($this->id,$groupname);
+			  }
+			  elseif($module =='Activities' || $module =='Events' || $module == 'Emails')
+			  {
+				 if($table_name == 'vtiger_activity')
+				 {
+				   updateActivityGroupRelation($this->id,$groupname);
+				 }
+			  }
+			   	
+
+		  }
+		  else
+		  {
+			  //echo 'about to update lead group relation again!';
+			  if($module == 'Leads' && $table_name == 'vtiger_leaddetails')
+			  {
+				  updateLeadGroupRelation($this->id,'');
+			  }
+			  elseif($module == 'Accounts' && $table_name == 'vtiger_account')
+			  {
+				  updateAccountGroupRelation($this->id,'');
+			  }
+			  elseif($module == 'Contacts' && $table_name == 'vtiger_contactdetails')
+			  {
+				  updateContactGroupRelation($this->id,'');
+			  }
+			  elseif($module == 'Potentials' && $table_name == 'vtiger_potential')
+			  {
+				  updatePotentialGroupRelation($this->id,'');
+			  }
+			  elseif($module == 'Quotes' && $table_name == 'vtiger_quotes')
+			  {
+				  updateQuoteGroupRelation($this->id,'');
+			  }
+			  elseif($module == 'SalesOrder' && $table_name == 'vtiger_salesorder')
+			  {
+				  updateSoGroupRelation($this->id,'');
+			  }
+			  elseif($module == 'Invoice' && $table_name == 'vtiger_invoice')
+			  {
+				  updateInvoiceGroupRelation($this->id,'');
+			  }
+			  elseif($module == 'PurchaseOrder' && $table_name == 'vtiger_purchaseorder')
+			  {
+				  updatePoGroupRelation($this->id,'');
+			  }
+			  elseif($module == 'HelpDesk' && $table_name == 'vtiger_troubletickets')
+			  {
+				  updateTicketGroupRelation($this->id,'');
+			  }
+			  elseif($module == 'Campaigns' && $table_name == 'vtiger_campaign')
+			  {
+				  updateCampaignGroupRelation($this->id,$groupname);
+			  }
+			  elseif($module =='Activities' || $module =='Events' || $module == 'Emails')
+			  {
+				  if($table_name == 'vtiger_activity')
+                                  {
+			             updateActivityGroupRelation($this->id,$groupname);
+				  }
+			  }
+			  	
+
+		  }
+
+	  }
+	  else
+	  {	
+		  $sql1 = "insert into ".$table_name." (".$column.") values(".$value.")";
+		  $adb->query($sql1); 
+		  $groupname = $_REQUEST['assigned_group_name'];
+		  if($_REQUEST['assigntype'] == 'T' && $table_name == 'vitger_leaddetails')
+		  {
+			  insert2LeadGroupRelation($this->id,$groupname);
+		  }
+		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'vitger_account')
+		  {
+			  insert2AccountGroupRelation($this->id,$groupname);
+		  }
+		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'vitger_contactdetails')
+		  {
+			  insert2ContactGroupRelation($this->id,$groupname);
+		  }
+		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'vitger_potential')
+		  {
+			  insert2PotentialGroupRelation($this->id,$groupname);
+		  }
+		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'vitger_quotes')
+		  {
+			  insert2QuoteGroupRelation($this->id,$groupname);
+		  }
+		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'vitger_salesorder')
+		  {
+			  insert2SoGroupRelation($this->id,$groupname);
+		  }
+		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'vitger_invoice')
+		  {
+			  insert2InvoiceGroupRelation($this->id,$groupname);
+		  }
+		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'vitger_purchaseorder')
+		  {
+			  insert2PoGroupRelation($this->id,$groupname);
+		  }
+		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'vitger_activity') 
+		  {
+			  insert2ActivityGroupRelation($this->id,$groupname);
+		  }
+		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'vitger_troubletickets') 
+		  {
+			  insert2TicketGroupRelation($this->id,$groupname);
+		  }
+		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'vitger_campaign')
+		  {
+			  insert2CampaignGroupRelation($this->id,$groupname);
+		  }
+
+	  }
+
+  }
+function deleteRelation($table_name)
+{
+         global $adb;
+         $check_query = "select * from ".$table_name." where ".$this->tab_name_index[$table_name]."=".$this->id;
+         $check_result=$adb->query($check_query);
+         $num_rows = $adb->num_rows($check_result);
+
+         if($num_rows == 1)
+         {
+                $del_query = "DELETE from ".$table_name." where ".$this->tab_name_index[$table_name]."=".$this->id;
+                $adb->query($del_query);
+         }
+
+}
+function getOldFileName($notesid)
+{
+	   global $log;
+$log->info("in getOldFileName  ".$notesid);
+	global $adb;
+	$query1 = "select * from vtiger_seattachmentsrel where crmid=".$notesid;
+	$result = $adb->query($query1);
+	$noofrows = $adb->num_rows($result);
+	if($noofrows != 0)
+		$attachmentid = $adb->query_result($result,0,'attachmentsid');
+	if($attachmentid != '')
+	{
+		$query2 = "select * from vtiger_attachments where attachmentsid=".$attachmentid;
+		$filename = $adb->query_result($adb->query($query2),0,'name');
+	}
+	return "'".$filename."'";
+}
+function insertIntoTicketCommentTable($table_name, $module)
+{
+	global $log;
+	$log->info("in insertIntoTicketCommentTable  ".$table_name."    module is  ".$module);
+        global $adb;
+	global $current_user;
+
+        $current_time = date('Y-m-d H:i:s');
+	if($_REQUEST['assigned_user_id'] != '')
+		$ownertype = 'user';
+	else
+		$ownertype = 'customer';
+
+	if($this->column_fields['comments'] != '')
+		$comment = $this->column_fields['comments'];
+	else
+		$comment = $_REQUEST['comments'];
+
+	if($comment != '')
+	{
+		$comment = addslashes($comment);
+		$sql = "insert into vtiger_ticketcomments values('',".$this->id.",'".$comment."','".$current_user->id."','".$ownertype."','".$current_time."')";
+	        $adb->query($sql);
+	}
+}
+function insertIntoFAQCommentTable($table_name, $module)
+{
+	 global $log;
+	$log->info("in insertIntoFAQCommentTable  ".$table_name."    module is  ".$module);
+        global $adb;
+
+        $current_time = date('Y-m-d H:i:s');
+
+	if($_REQUEST['comments'] != '')
+	{
+		$comment = addslashes($_REQUEST['comments']);
+		$sql = "insert into vtiger_faqcomments values('',".$this->id.",'".$comment."','".$current_time."')";
+		$adb->query($sql);
+	}
+}
+function insertIntoReminderTable($table_name,$module,$recurid)
+{
+	 global $log;
+$log->info("in insertIntoReminderTable  ".$table_name."    module is  ".$module);
+	if($_REQUEST['set_reminder'] == 'Yes')
+	{
+$log->debug("set reminder is set");
+		$rem_days = $_REQUEST['remdays'];
+$log->debug("rem_days is ".$rem_days);
+		$rem_hrs = $_REQUEST['remhrs'];
+$log->debug("rem_hrs is ".$rem_hrs);
+		$rem_min = $_REQUEST['remmin'];
+$log->debug("rem_minutes is ".$rem_min);
+		$reminder_time = $rem_days * 24 * 60 + $rem_hrs * 60 + $rem_min;
+$log->debug("reminder_time is ".$reminder_time);
+		if ($recurid == "")
+		{
+			if($_REQUEST['mode'] == 'edit')
+			{
+				$this->activity_reminder($this->id,$reminder_time,0,$recurid,'edit');
+			}
+			else
+			{
+				$this->activity_reminder($this->id,$reminder_time,0,$recurid,'');
+			}
+		}
+		else
+		{
+			$this->activity_reminder($this->id,$reminder_time,0,$recurid,'');
+		}
+	}
+	elseif($_REQUEST['set_reminder'] == 'No')
+	{
+		$this->activity_reminder($this->id,'0',0,$recurid,'delete');
+	}
+}
+
+// Code included by Minnie - starts
+function insertIntoInviteeTable($table_name,$module,$invitees_array)
+{
+	global $log,$adb;
+	$log->debug("Entering insertIntoInviteeTable(".$table_name.",".$module.",".$invitees_array.") method ...");
+	foreach($invitees_array as $inviteeid)
+	{
+		if($inviteeid != '')
+		{
+			$query="insert into vtiger_invitees values(".$this->id.",".$inviteeid.")";
+			$adb->query($query);
+		}
+	}
+	$log->debug("Exiting insertIntoInviteeTable method ...");
+
+}
+// Code included by Minnie - Ends
+
+// Code included by Jaguar - starts 
+function insertIntoRecurringTable($table_name,$module)
+{
+	global $log;
+$log->info("in insertIntoRecurringTable  ".$table_name."    module is  ".$module);
+        global $adb;
+        $st_date = getDBInsertDateValue($_REQUEST["date_start"]);
+$log->debug("st_date ".$st_date);
+        $end_date = getDBInsertDateValue($_REQUEST["due_date"]);
+$log->debug("end_date is set ".$end_date);
+        $st=explode("-",$st_date);
+$log->debug("exploding string is ".$st);
+        $end=explode("-",$end_date);
+$log->debug("exploding string again is ".$end);
+        $type = trim($_REQUEST['recurringtype']);
+$log->debug("type is ".$type);
+        $flag="true";
+
+	if($_REQUEST['mode'] == 'edit')
+	{
+		$activity_id=$this->id;
+
+		$sql='select min(recurringdate) AS min_date,max(recurringdate) AS max_date, recurringtype, activityid from vtiger_recurringevents where activityid='. $activity_id.' group by activityid, recurringtype';
+		
+		$result = $adb->query($sql);
+		$noofrows = $adb->num_rows($result);
+		for($i=0; $i<$noofrows; $i++)
+		{
+			$recur_type_b4_edit = $adb->query_result($result,$i,"recurringtype");
+			$date_start_b4edit = $adb->query_result($result,$i,"min_date");
+			$end_date_b4edit = $adb->query_result($result,$i,"max_date");
+		}
+		if(($st_date == $date_start_b4edit) && ($end_date==$end_date_b4edit) && ($type == $recur_type_b4_edit))
+		{
+			if($_REQUEST['set_reminder'] == 'Yes')
+			{
+				$sql = 'delete from vtiger_activity_reminder where activity_id='.$activity_id;
+				$adb->query($sql);
+				$sql = 'delete  from vtiger_recurringevents where activityid='.$activity_id;
+				$adb->query($sql);
+				$flag="true";
+			}
+			elseif($_REQUEST['set_reminder'] == 'No')
+			{
+				$sql = 'delete  from vtiger_activity_reminder where activity_id='.$activity_id;
+				$adb->query($sql);
+				$flag="false";
+			}
+			else
+				$flag="false";
+		}
+		else
+		{
+			$sql = 'delete from vtiger_activity_reminder where activity_id='.$activity_id;
+			$adb->query($sql);
+			$sql = 'delete  from vtiger_recurringevents where activityid='.$activity_id;
+			$adb->query($sql);
+		}
+	}
+	if($flag=="true")
+	{
+		$date_val=$st_date;
+		$date_array[]=$st_date;
+		if($type !=  "--None--")
+		{
+			while($date_val <= $end_date)
+			{
+				if($type == 'Daily')
+				{
+					$date_val = date("Y-m-d",mktime(0,0,0,date("$st[1]"),(date("$st[2]")+(1)),date("$st[0]")));
+				}
+				elseif($type == 'Weekly')
+				{
+					$date_val = date("Y-m-d",mktime(0,0,0,date("$st[1]"),(date("$st[2]")+(7)),date("$st[0]")));
+				}
+				elseif($type == 'Monthly' )
+				{
+					$date_val = date("Y-m-d",mktime(0,0,0,(date("$st[1]")+1),date("$st[2]"),date("$st[0]")));
+				}
+				elseif($type == 'Yearly')
+				{
+					$date_val = date("Y-m-d",mktime(0,0,0,date("$st[1]"),date("$st[2]"),(date("$st[0]")+1)));
+				}
+				$date_array[]=$date_val;
+				$st=explode("-",$date_val);
+			}
+			for($k=0; $k< count($date_array); $k++)
+			{
+				$tdate=$date_array[$k];
+				if($tdate <= $end_date)
+				{
+					$max_recurid_qry = 'select max(recurringid) AS recurid from vtiger_recurringevents;';
+					$result = $adb->query($max_recurid_qry);
+					$noofrows = $adb->num_rows($result);
+					for($i=0; $i<$noofrows; $i++)
+					{
+						$recur_id = $adb->query_result($result,$i,"recurid");
+					}
+					$current_id =$recur_id+1;
+					$recurring_insert = "insert into vtiger_recurringevents values ('".$current_id."','".$this->id."','".$tdate."','".$type."')";
+					$adb->query($recurring_insert);
+					if($_REQUEST['set_reminder'] == 'Yes')
+					{
+						$this->insertIntoReminderTable("activity_reminder",$module,$current_id,'');
+					}
+				}
+			}
+		}
+	}
+}
+
+// Code included by Jaguar - Ends 
+
+	
+  function retrieve_entity_info($record, $module)
+  {
+    global $adb,$log;
+    $result = Array();
+    foreach($this->tab_name_index as $table_name=>$index)
+    {
+	    $result[$table_name] = $adb->query("select * from ".$table_name." where ".$index."=".$record);
+    }
+    $tabid = getTabid($module);
+    $sql1 =  "select * from vtiger_field where tabid=".$tabid;
+    $result1 = $adb->query($sql1);
+    $noofrows = $adb->num_rows($result1);
+    for($i=0; $i<$noofrows; $i++)
+    {
+      $fieldcolname = $adb->query_result($result1,$i,"columnname");
+      $tablename = $adb->query_result($result1,$i,"tablename");
+      $fieldname = $adb->query_result($result1,$i,"fieldname");
+
+      $fld_value = $adb->query_result($result[$tablename],0,$fieldcolname);
+      $this->column_fields[$fieldname] = $fld_value;
+				
+    }
+	if($module == 'Users')
+	{
+		for($i=0; $i<$noofrows; $i++)
+		{
+			$fieldcolname = $adb->query_result($result1,$i,"columnname");
+			$tablename = $adb->query_result($result1,$i,"tablename");
+			$fieldname = $adb->query_result($result1,$i,"fieldname");
+			$fld_value = $adb->query_result($result[$tablename],0,$fieldcolname);
+			$this->$fieldname = $fld_value;
+
+		}
+	}
+		
+    $this->column_fields["record_id"] = $record;
+    $this->column_fields["record_module"] = $module;
+  }
+
+	function save($module_name) 
+	{
+		global $log;
+	        $log->debug("module name is ".$module_name);
+		//GS Save entity being called with the modulename as parameter
+		$this->saveentity($module_name);
+	}
+  
+	function process_list_query($query, $row_offset, $limit= -1, $max_per_page = -1)
+	{
+		global $list_max_entries_per_page;
+		$this->log->debug("process_list_query: ".$query);
+		if(!empty($limit) && $limit != -1){
+			$result =& $this->db->limitQuery($query, $row_offset + 0, $limit,true,"Error retrieving $this->object_name list: ");
+		}else{
+			$result =& $this->db->query($query,true,"Error retrieving $this->object_name list: ");
+		}
+
+		$list = Array();
+		if($max_per_page == -1){
+			$max_per_page 	= $list_max_entries_per_page;
+		}
+		$rows_found =  $this->db->getRowCount($result);
+
+		$this->log->debug("Found $rows_found ".$this->object_name."s");
+                
+		$previous_offset = $row_offset - $max_per_page;
+		$next_offset = $row_offset + $max_per_page;
+
+		if($rows_found != 0)
+		{
+
+			// We have some data.
+
+			for($index = $row_offset , $row = $this->db->fetchByAssoc($result, $index); $row && ($index < $row_offset + $max_per_page || $max_per_page == -99) ;$index++, $row = $this->db->fetchByAssoc($result, $index)){
+
+				
+				foreach($this->list_fields as $entry)
+				{
+
+					foreach($entry as $key=>$field) // this will be cycled only once
+					{						
+						if (isset($row[$field])) {
+							$this->column_fields[$this->list_fields_names[$key]] = $row[$field];
+						
+						
+							$this->log->debug("$this->object_name({$row['id']}): ".$field." = ".$this->$field);
+						}
+						else 
+						{
+							$this->column_fields[$this->list_fields_names[$key]] = "";
+						}
+					}
+				}
+
+
+				//$this->db->println("here is the bug");
+				
+
+				$list[] = clone($this);//added by Richie to support PHP5
+			}
+		}
+
+		$response = Array();
+		$response['list'] = $list;
+		$response['row_count'] = $rows_found;
+		$response['next_offset'] = $next_offset;
+		$response['previous_offset'] = $previous_offset;
+
+		return $response;
+	}
+
+	function process_full_list_query($query)
+	{
+		$this->log->debug("CRMEntity:process_full_list_query");
+		$result =& $this->db->query($query, false);
+		$this->log->debug("CRMEntity:process_full_list_query: result is ".$result);
+
+
+		if($this->db->getRowCount($result) > 0){
+		
+		//	$this->db->println("process_full mid=".$this->module_id." mname=".$this->module_name);
+			// We have some data.
+			while ($row = $this->db->fetchByAssoc($result)) {				
+				$rowid=$row[$this->module_id];
+
+				if(isset($rowid))
+			       		$this->retrieve_entity_info($rowid,$this->module_name);
+				else
+					$this->db->println("rowid not set unable to retrieve");
+				 
+				 
+				
+		//clone function added to resolvoe PHP5 compatibility issue in Dashboards
+		//If we do not use clone, while using PHP5, the memory address remains fixed but the
+	//data gets overridden hence all the rows that come in bear the same value. This in turn
+//provides a wrong display of the Dashboard graphs. The data is erroneously shown for a specific month alone
+//Added by Richie
+				$list[] = clone($this);//added by Richie to support PHP5
+			}
+		}
+
+		if (isset($list)) return $list;
+		else return null;
+	}
+	
+	/** This function should be overridden in each module.  It marks an item as deleted.
+	* If it is not overridden, then marking this type of item is not allowed
+	 * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc..
+	 * All Rights Reserved..
+	 * Contributor(s): ______________________________________..
+	*/
+	function mark_deleted($id)
+	{
+		$query = "UPDATE vtiger_crmentity set deleted=1 where crmid='$id'";
+		$this->db->query($query, true,"Error marking record deleted: ");
+
+
+	}
+
+
+	function retrieve_by_string_fields($fields_array, $encode=true) 
+	{ 
+		$where_clause = $this->get_where($fields_array);
+		
+		$query = "SELECT * FROM $this->table_name $where_clause";
+		$this->log->debug("Retrieve $this->object_name: ".$query);
+		$result =& $this->db->requireSingleResult($query, true, "Retrieving record $where_clause:");
+		if( empty($result)) 
+		{ 
+		 	return null; 
+		} 
+
+		 $row = $this->db->fetchByAssoc($result,-1, $encode);
+
+		foreach($this->column_fields as $field) 
+		{ 
+			if(isset($row[$field])) 
+			{ 
+				$this->$field = $row[$field];
+			}
+		} 
+		return $this;
+	}
+
+	// this method is called during an import before inserting a bean
+	// define an associative array called $special_fields
+	// the keys are user defined, and don't directly map to the bean's vtiger_fields
+	// the value is the method name within that bean that will do extra
+	// processing for that vtiger_field. example: 'full_name'=>'get_names_from_full_name'
+
+	function process_special_fields() 
+	{ 
+		foreach ($this->special_functions as $func_name) 
+		{ 
+			if ( method_exists($this,$func_name) ) 
+			{ 
+				$this->$func_name(); 
+			} 
+		} 
+	}
+
+	/**
+         * Function to check if the custom vtiger_field vtiger_table exists
+         * return true or false
+         */
+        function checkIfCustomTableExists($tablename)
+        {
+                $query = "select * from ".$tablename;
+                $result = $this->db->query($query);
+                $testrow = $this->db->num_fields($result);
+                if($testrow > 1)
+                {
+                        $exists=true;
+                }
+                else
+                {
+                        $exists=false;
+                }
+                return $exists;
+        }
+
+	/**
+	 * function to construct the query to fetch the custom vtiger_fields
+	 * return the query to fetch the custom vtiger_fields
+         */
+        function constructCustomQueryAddendum($tablename,$module)
+        {
+                global $adb;
+		$tabid=getTabid($module);		
+                $sql1 = "select columnname,fieldlabel from vtiger_field where generatedtype=2 and tabid=".$tabid;
+                $result = $adb->query($sql1);
+                $numRows = $adb->num_rows($result);
+                $sql3 = "select ";
+                for($i=0; $i < $numRows;$i++)
+                {
+                        $columnName = $adb->query_result($result,$i,"columnname");
+                        $fieldlable = $adb->query_result($result,$i,"fieldlabel");
+                        //construct query as below
+                        if($i == 0)
+                        {
+                                $sql3 .= $tablename.".".$columnName. " '" .$fieldlable."'";
+                        }
+                        else
+                        {
+                                $sql3 .= ", ".$tablename.".".$columnName. " '" .$fieldlable."'";
+                        }
+
+                }
+                if($numRows>0)
+                {
+                        $sql3=$sql3.',';
+                }
+                return $sql3;
+
+        }
+
+
+	/**	function to save the product tax information in producttarel vtiger_table
+	 *	@param string $tablename - vtiger_tablename to save the product tax relationship (producttaxrel)
+	 *	@param string $module	 - current module name
+	 *	$return void
+	*/
+	function insertTaxInformation($tablename, $module)
+	{
+		global $adb, $log;
+		$log->debug("Entering into insertTaxInformation($tablename, $module) method ...");
+
+		$tax_per = '';
+		//Save the Product - VAT tax relationship if VAT tax check box is enabled
+		//Delete the existing tax if any
+		if($this->mode == 'edit')
+		{
+			$tax_array = Array('VAT','Sales','Service');
+			foreach($tax_array as $tax_type)
+			{
+				$taxid = getTaxId($tax_type);
+				$sql = "delete from vtiger_producttaxrel where productid=$this->id and taxid=$taxid";
+				$adb->query($sql);
+			}
+		}
+		if($_REQUEST['vat_check'] == 'on' || $_REQUEST['vat_check'] == 1)
+		{
+			$taxid = getTaxId('VAT');
+			$tax_per = $_REQUEST['vat_tax'];
+			if($tax_per == '')
+				$tax_per = getTaxPercentage('VAT');
+
+			$log->debug("Going to save the Product - VAT tax relationship");
+
+			$sql = "insert into vtiger_producttaxrel values($this->id,$taxid,$tax_per)";
+			$adb->query($sql);
+		}
+		//Save the Product - Sales tax relationship if Sales tax check box is enabled
+		if($_REQUEST['sales_check'] == 'on' || $_REQUEST['sales_check'] == 1)
+		{
+			$taxid = getTaxId('Sales');
+			$tax_per = $_REQUEST['sales_tax'];
+			if($tax_per == '')
+				$tax_per = getTaxPercentage('Sales');
+
+			$log->debug("Going to save the Product - Sales tax relationship");
+
+			$sql = "insert into vtiger_producttaxrel values($this->id,$taxid,$tax_per)";
+			$adb->query($sql);
+		}
+		//Save the Product - Service tax relationship if Service tax check box is enabled
+		if($_REQUEST['service_check'] == 'on' || $_REQUEST['service_check'] == 1)
+		{
+			$taxid = getTaxId('Service');
+			$tax_per = $_REQUEST['service_tax'];
+			if($tax_per == '')
+				$tax_per = getTaxPercentage('Service');
+
+			$log->debug("Going to save the Product - Service tax relationship");
+
+			$sql = "insert into vtiger_producttaxrel values($this->id,$taxid,$tax_per)";
+			$adb->query($sql);
+		}
+
+		$log->debug("Exiting from insertTaxInformation($tablename, $module) method ...");
+	}	
+
+	/**
+	 * This function returns a full (ie non-paged) list of the current object type.  
+	 * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc..
+	 * All Rights Reserved..
+	 * Contributor(s): ______________________________________..
+	 */
+	function get_full_list($order_by = "", $where = "") {
+		$this->log->debug("get_full_list:  order_by = '$order_by' and where = '$where'");
+		$query = "SELECT * FROM $this->table_name ";
+		
+		if($where != "")
+			$query .= "where ($where) AND deleted=0";
+		else
+			$query .= "where deleted=0";
+
+		if(!empty($order_by))
+			$query .= " ORDER BY $order_by";
+
+		$result =& $this->db->query($query, false);
+
+		if($this->db->getRowCount($result) > 0){
+		
+			// We have some data.
+			while ($row = $this->db->fetchByAssoc($result)) {
+				foreach($this->list_fields as $field)
+				{
+					if (isset($row[$field])) {
+						$this->$field = $row[$field];
+						
+						$this->log->debug("process_full_list: $this->object_name({$row['id']}): ".$field." = ".$this->$field);
+					}
+					else {
+ 	                                                $this->$field = '';   
+					}
+				}
+
+
+				$list[] = clone($this);         //added clone tosupport PHP5
+			}
+		}
+
+		if (isset($list)) return $list;
+		else return null;
+
+	}
+
+}
+?>



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 22:03:47 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 22 Jun 2006 05:03:47 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7417 -
	/vtigercrm/trunk/modules/Notes/Note.php
Message-ID: <20060622050347.C056083F4CD@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 23:03:43 2006
New Revision: 7417

Log:
title has been changed to notes_title

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

Modified: vtigercrm/trunk/modules/Notes/Note.php
==============================================================================
--- vtigercrm/trunk/modules/Notes/Note.php (original)
+++ vtigercrm/trunk/modules/Notes/Note.php Wed Jun 21 23:03:43 2006
@@ -44,27 +44,27 @@
 
 	var $column_fields = Array();
 
-        var $sortby_fields = Array('title','modifiedtime','contact_id','filename');		  
+        var $sortby_fields = Array('notes_title','modifiedtime','contact_id','filename');		  
 
 	// This is used to retrieve related vtiger_fields from form posts.
 	var $additional_column_fields = Array('', '', '', '');
 
 	// This is the list of vtiger_fields that are in the lists.
 	var $list_fields = Array(
-				'Subject'=>Array('notes'=>'title'),
+				'Subject'=>Array('notes'=>'notes_title'),
 				'Contact Name'=>Array('notes'=>'contact_id'),
 				'Related to'=>Array('senotesrel'=>'crmid'),
 				'File'=>Array('notes'=>'filename'),
 				'Last Modified'=>Array('crmentity'=>'modifiedtime')
 				);
 	var $list_fields_name = Array(
-					'Subject'=>'title',
+					'Subject'=>'notes_title',
 					'Contact Name'=>'contact_id',
 					'Related to'=>'crmid',
 					'File'=>'filename',
 					'Last Modified'=>'modifiedtime'
 				     );	
-	var $list_link_field= 'title';
+	var $list_link_field= 'notes_title';
 
 	//Added these variables which are used as default order by and sortorder in ListView
 	var $default_order_by = 'modifiedtime';



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 22:05:19 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 22 Jun 2006 05:05:19 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7418 -
	/vtigercrm/trunk/install/populateSeedData.php
Message-ID: <20060622050519.83C1A83F4D9@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 23:05:15 2006
New Revision: 7418

Log:
title has been changed to notes_title

Modified:
    vtigercrm/trunk/install/populateSeedData.php

Modified: vtigercrm/trunk/install/populateSeedData.php
==============================================================================
--- vtigercrm/trunk/install/populateSeedData.php (original)
+++ vtigercrm/trunk/install/populateSeedData.php Wed Jun 21 23:05:15 2006
@@ -782,7 +782,7 @@
 	$rand = array_rand($num_array);
 	$contact_key = array_rand($contact_ids);
         $notes->column_fields["contact_id"] 	= 	$contact_ids[$contact_key];
-	$notes->column_fields["title"]		=	$notes_array[$i];
+	$notes->column_fields["notes_title"]		=	$notes_array[$i];
 
 	$notes->save("Notes");
 	$notes_ids[] = $notes ->id;



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 22:06:29 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 22 Jun 2006 05:06:29 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7419 -
 /vtigercrm/trunk/modules/CustomView/PopulateCustomView.php
Message-ID: <20060622050629.BBF3983F4DE@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 23:06:26 2006
New Revision: 7419

Log:
title has been changed to notes_title

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 Jun 21 23:06:26 2006
@@ -277,7 +277,7 @@
                          'vtiger_invoice:total:hdnGrandTotal:Invoice_Total:I',
                          'vtiger_crmentity:smownerid:assigned_user_id:Invoice_Assigned_To:V'),
 		
-		  Array('vtiger_notes:title:title:Notes_Title:V',
+		  Array('vtiger_notes:title:notes_title:Notes_Title:V',
                         'vtiger_notes:contact_id:contact_id:Notes_Contact_Name:I',
                         'vtiger_senotesrel:crmid:parent_id:Notes_Related_to:I',
                         'vtiger_notes:filename:filename:Notes_File:V',



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 22:07:57 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 22 Jun 2006 05:07:57 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7420 -
 /vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
Message-ID: <20060622050757.9D92983F4DE@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 23:07:53 2006
New Revision: 7420

Log:
title has been changed to notes_title

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

Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original)
+++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Wed Jun 21 23:07:53 2006
@@ -477,7 +477,7 @@
 
 $this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("field").",'contact_id','vtiger_notes',1,'57','contact_id','Contact Name',1,0,0,100,1,17,1,'V~O',1,null,'BAS')");
  $this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("field").",'crmid','vtiger_senotesrel',1,'62','parent_id','Related To',1,0,0,100,2,17,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("field").",'title','vtiger_notes',1,'2','title','Subject',1,0,0,100,3,17,1,'V~M',0,1,'BAS')");
+ $this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("field").",'title','vtiger_notes',1,'2','notes_title','Subject',1,0,0,100,3,17,1,'V~M',0,1,'BAS')");
 $this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,4,17,2,'T~O',1,null,'BAS')");
  $this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,5,17,2,'T~O',1,null,'BAS')");
  $this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("field").",'filename','vtiger_notes',1,'61','filename','Attachment',1,0,0,100,4,17,1,'V~O',1,null,'BAS')");



From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 22:09:26 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 22 Jun 2006 05:09:26 -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.94f275e341f02fc3a995bb67f48c5c77@vtiger.fosslabs.com>

#99: validation is not working for Notes module
------------------------+---------------------------------------------------
  Reporter:  Minnie     |       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:

 fixed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/99>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 22:25:35 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 22 Jun 2006 05:25:35 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231349=3A?=
 =?utf-8?q?_Dash_Boards_not_working?=
In-Reply-To: <076.8be5cac7416faf4b2b970e60d7f3e2ae@vtiger.fosslabs.com>
References: <076.8be5cac7416faf4b2b970e60d7f3e2ae@vtiger.fosslabs.com>
Message-ID: <085.b64bed2defa878f0bd34e3ea9da4a728@vtiger.fosslabs.com>

#1349: Dash Boards not working
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  jerrydgeorge
      Type:  defect     |      Status:  closed      
  Priority:  blocker    |   Milestone:              
 Component:  vtigercrm  |     Version:  5.0.0       
Resolution:  fixed      |    Keywords:              
------------------------+---------------------------------------------------
Changes (by jerrydgeorge):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1349>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 22:26:31 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 22 Jun 2006 05:26:31 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231091=3A?=
 =?utf-8?q?_My_Preferences_-_Photo_does_not_work?=
In-Reply-To: <076.0a340fe4771c5eb83733cd4065926089@vtiger.fosslabs.com>
References: <076.0a340fe4771c5eb83733cd4065926089@vtiger.fosslabs.com>
Message-ID: <085.804d725b91532c4870b96294a000a898@vtiger.fosslabs.com>

#1091: My Preferences - Photo does not work
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  Mickie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by jerrydgeorge):

  * owner:  jerrydgeorge => Mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1091>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 22:00:09 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 22 Jun 2006 05:00:09 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7414 -
	/vtigercrm/trunk/modules/Notes/EditView.php
Message-ID: <20060622050010.93CB883F4C6@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 23:00:05 2006
New Revision: 7414

Log:
title has been changed to notes_title

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

Modified: vtigercrm/trunk/modules/Notes/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/Notes/EditView.php (original)
+++ vtigercrm/trunk/modules/Notes/EditView.php Wed Jun 21 23:00:05 2006
@@ -40,7 +40,7 @@
 	$focus->id = $_REQUEST['record'];
 	$focus->mode = 'edit';
 	$focus->retrieve_entity_info($_REQUEST['record'],"Notes");
-        $focus->name=$focus->column_fields['title'];
+        $focus->name=$focus->column_fields['notes_title'];
 }
 if(isset($_REQUEST['parent_id']))
 {



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 22:45:16 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 22 Jun 2006 05:45:16 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7421 -
 /vtigercrm/trunk/modules/Settings/CurrencyEditView.php
Message-ID: <20060622054516.C26E883F4B0@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 23:45:12 2006
New Revision: 7421

Log:
Updated the currency editview file - ahmed

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

Modified: vtigercrm/trunk/modules/Settings/CurrencyEditView.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/CurrencyEditView.php (original)
+++ vtigercrm/trunk/modules/Settings/CurrencyEditView.php Wed Jun 21 23:45:12 2006
@@ -52,6 +52,6 @@
 if(isset($_REQUEST['detailview']) && $_REQUEST['detailview'] != '')
 	$smarty->display('CurrencyDetailView.tpl');
 else
-	$smarty->display("CurrencyEditViewN.tpl");
+	$smarty->display("CurrencyEditView.tpl");
 
 ?>



From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 22:19:05 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 22 Jun 2006 05:19:05 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231120=3A?=
 =?utf-8?q?_alignment_not_proper_in_Customfield_listview?=
In-Reply-To: <076.4b884f803d6e52a23bdf4c14044cef75@vtiger.fosslabs.com>
References: <076.4b884f803d6e52a23bdf4c14044cef75@vtiger.fosslabs.com>
Message-ID: <085.c1a61dddd469101232731e5393571b90@vtiger.fosslabs.com>

#1120: alignment not proper in Customfield listview
------------------------+---------------------------------------------------
  Reporter:  mangai     |       Owner:  jeri 
      Type:  defect     |      Status:  new  
  Priority:  minor      |   Milestone:  5.0.0
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by mangai):

  * owner:  mangai => jeri

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1120>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 23:33:31 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 22 Jun 2006 06:33:31 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7422 - in /vtigercrm/trunk:
 include/language/en_us.lang.php modules/Invoice/Invoice.php
 modules/PurchaseOrder/PurchaseOrder.php modules/Quotes/Quote.php
 modules/SalesOrder/SalesOrder.php modules/Users/DefaultDataPopulator.php
Message-ID: <20060622063332.771FD842BFC@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 22 00:33:19 2006
New Revision: 7422

Log:
* Modified to add the Status History for Po, SO and Invoice and Stage History for Quotes

Modified:
    vtigercrm/trunk/include/language/en_us.lang.php
    vtigercrm/trunk/modules/Invoice/Invoice.php
    vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php
    vtigercrm/trunk/modules/Quotes/Quote.php
    vtigercrm/trunk/modules/SalesOrder/SalesOrder.php
    vtigercrm/trunk/modules/Users/DefaultDataPopulator.php

Modified: vtigercrm/trunk/include/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/include/language/en_us.lang.php (original)
+++ vtigercrm/trunk/include/language/en_us.lang.php Thu Jun 22 00:33:19 2006
@@ -756,7 +756,10 @@
 'Purchase Order'=>'Purchase Order',
 'Sales Stage History'=>'Sales Stage History',
 'Users'=>'Users',
-
+'PurchaseOrder Status History'=>'PurchaseOrder Status History',
+'SalesOrder Status History'=>'SalesOrder Status History',
+'Quote Stage History'=>'Quote Stage History',
+'Invoice Status History'=>'Invoice Status History',
 
 
 //Added language for Parent Tab
@@ -908,6 +911,10 @@
 
 'LBL_TAG_CLOUD'=>'Tag Cloud',
 'LBL_FOR'=>'for',
+'LBL_PO_STATUS'=>'PurchaseOrder Status',
+'LBL_SO_STATUS'=>'SalesOrder Status',
+'LBL_INVOICE_STATUS'=>'Invoice Status',
+
 );
 
 

Modified: vtigercrm/trunk/modules/Invoice/Invoice.php
==============================================================================
--- vtigercrm/trunk/modules/Invoice/Invoice.php (original)
+++ vtigercrm/trunk/modules/Invoice/Invoice.php Thu Jun 22 00:33:19 2006
@@ -209,6 +209,48 @@
 		return getAttachmentsAndNotes('Invoice',$query,$id);
 	}
 
+	/**	Function used to get the Status history of the Invoice
+	 *	@param $id - invoice id
+	 *	return $return_data - array with header and the entries in format Array('header'=>$header,'entries'=>$entries_list) where as $header and $entries_list are array which contains all the column values of an row
+	 */
+	function get_invoicestatushistory($id)
+	{	
+		global $log;
+		$log->debug("Entering get_invoicestatushistory(".$id.") method ...");
+
+		global $adb;
+		global $mod_strings;
+		global $app_strings;
+
+		$query = 'select vtiger_invoicestatushistory.*, vtiger_invoice.subject from vtiger_invoicestatushistory inner join vtiger_invoice on vtiger_invoice.invoiceid = vtiger_invoicestatushistory.invoiceid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_invoice.invoiceid where vtiger_crmentity.deleted = 0 and vtiger_invoice.invoiceid = '.$id;
+		$result=$adb->query($query);
+		$noofrows = $adb->num_rows($result);
+
+		$header[] = $app_strings['Invoice Id'];
+		$header[] = $app_strings['LBL_ACCOUNT_NAME'];
+		$header[] = $app_strings['LBL_AMOUNT'];
+		$header[] = $app_strings['LBL_INVOICE_STATUS'];
+		$header[] = $app_strings['LBL_LAST_MODIFIED'];
+
+		while($row = $adb->fetch_array($result))
+		{
+			$entries = Array();
+
+			$entries[] = $row['invoiceid'];
+			$entries[] = $row['accountname'];
+			$entries[] = $row['total'];
+			$entries[] = $row['invoicestatus'];
+			$entries[] = getDisplayDate($row['lastmodified']);
+
+			$entries_list[] = $entries;
+		}
+
+		$return_data = Array('header'=>$header,'entries'=>$entries_list);
+
+	 	$log->debug("Exiting get_invoicestatushistory method ...");
+
+		return $return_data;
+	}
 
 
 }

Modified: vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php
==============================================================================
--- vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php (original)
+++ vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php Thu Jun 22 00:33:19 2006
@@ -216,6 +216,50 @@
 		return getAttachmentsAndNotes('PurchaseOrder',$query,$id,$sid='purchaseorderid');
 	}
 
+	/**	Function used to get the Status history of the Purchase Order
+	 *	@param $id - purchaseorder id
+	 *	return $return_data - array with header and the entries in format Array('header'=>$header,'entries'=>$entries_list) where as $header and $entries_list are array which contains all the column values of an row
+	 */
+	function get_postatushistory($id)
+	{	
+		global $log;
+		$log->debug("Entering get_postatushistory(".$id.") method ...");
+
+		global $adb;
+		global $mod_strings;
+		global $app_strings;
+
+		$query = 'select vtiger_postatushistory.*, vtiger_purchaseorder.subject from vtiger_postatushistory inner join vtiger_purchaseorder on vtiger_purchaseorder.purchaseorderid = vtiger_postatushistory.purchaseorderid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_purchaseorder.purchaseorderid where vtiger_crmentity.deleted = 0 and vtiger_purchaseorder.purchaseorderid = '.$id;
+		$result=$adb->query($query);
+		$noofrows = $adb->num_rows($result);
+
+		$header[] = $app_strings['Order Id'];
+		$header[] = $app_strings['Vendor Name'];
+		$header[] = $app_strings['LBL_AMOUNT'];
+		$header[] = $app_strings['LBL_PO_STATUS'];
+		$header[] = $app_strings['LBL_LAST_MODIFIED'];
+
+		while($row = $adb->fetch_array($result))
+		{
+			$entries = Array();
+
+			$entries[] = $row['purchaseorderid'];
+			$entries[] = $row['vendorname'];
+			$entries[] = $row['total'];
+			$entries[] = $row['postatus'];
+			$entries[] = getDisplayDate($row['lastmodified']);
+
+			$entries_list[] = $entries;
+		}
+
+		$return_data = Array('header'=>$header,'entries'=>$entries_list);
+
+	 	$log->debug("Exiting get_postatushistory method ...");
+
+		return $return_data;
+	}
+
+	
 }
 
 ?>

Modified: vtigercrm/trunk/modules/Quotes/Quote.php
==============================================================================
--- vtigercrm/trunk/modules/Quotes/Quote.php (original)
+++ vtigercrm/trunk/modules/Quotes/Quote.php Thu Jun 22 00:33:19 2006
@@ -185,6 +185,51 @@
 		$log->debug("Exiting get_history method ...");
 		return getHistory('Quotes',$query,$id);	
 	}
+
+
+	/**	Function used to get the Quote Stage history of the Quotes
+	 *	@param $id - quote id
+	 *	return $return_data - array with header and the entries in format Array('header'=>$header,'entries'=>$entries_list) where as $header and $entries_list are array which contains all the column values of an row
+	 */
+	function get_quotestagehistory($id)
+	{	
+		global $log;
+		$log->debug("Entering get_quotestagehistory(".$id.") method ...");
+
+		global $adb;
+		global $mod_strings;
+		global $app_strings;
+
+		$query = 'select vtiger_quotestagehistory.*, vtiger_quotes.subject from vtiger_quotestagehistory inner join vtiger_quotes on vtiger_quotes.quoteid = vtiger_quotestagehistory.quoteid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_quotes.quoteid where vtiger_crmentity.deleted = 0 and vtiger_quotes.quoteid = '.$id;
+		$result=$adb->query($query);
+		$noofrows = $adb->num_rows($result);
+
+		$header[] = $app_strings['Quote Id'];
+		$header[] = $app_strings['LBL_ACCOUNT_NAME'];
+		$header[] = $app_strings['LBL_AMOUNT'];
+		$header[] = $app_strings['Quote Stage'];
+		$header[] = $app_strings['LBL_LAST_MODIFIED'];
+
+		while($row = $adb->fetch_array($result))
+		{
+			$entries = Array();
+
+			$entries[] = $row['quoteid'];
+			$entries[] = $row['accountname'];
+			$entries[] = $row['total'];
+			$entries[] = $row['quotestage'];
+			$entries[] = getDisplayDate($row['lastmodified']);
+
+			$entries_list[] = $entries;
+		}
+
+		$return_data = Array('header'=>$header,'entries'=>$entries_list);
+
+	 	$log->debug("Exiting get_quotestagehistory method ...");
+
+		return $return_data;
+	}
+
 }
 
 ?>

Modified: vtigercrm/trunk/modules/SalesOrder/SalesOrder.php
==============================================================================
--- vtigercrm/trunk/modules/SalesOrder/SalesOrder.php (original)
+++ vtigercrm/trunk/modules/SalesOrder/SalesOrder.php Thu Jun 22 00:33:19 2006
@@ -245,6 +245,50 @@
 	
 	}
 
+	/**	Function used to get the Status history of the Sales Order
+	 *	@param $id - salesorder id
+	 *	return $return_data - array with header and the entries in format Array('header'=>$header,'entries'=>$entries_list) where as $header and $entries_list are array which contains all the column values of an row
+	 */
+	function get_sostatushistory($id)
+	{	
+		global $log;
+		$log->debug("Entering get_sostatushistory(".$id.") method ...");
+
+		global $adb;
+		global $mod_strings;
+		global $app_strings;
+
+		$query = 'select vtiger_sostatushistory.*, vtiger_salesorder.subject from vtiger_sostatushistory inner join vtiger_salesorder on vtiger_salesorder.salesorderid = vtiger_sostatushistory.salesorderid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_salesorder.salesorderid where vtiger_crmentity.deleted = 0 and vtiger_salesorder.salesorderid = '.$id;
+		$result=$adb->query($query);
+		$noofrows = $adb->num_rows($result);
+
+		$header[] = $app_strings['Order Id'];
+		$header[] = $app_strings['LBL_ACCOUNT_NAME'];
+		$header[] = $app_strings['LBL_AMOUNT'];
+		$header[] = $app_strings['LBL_SO_STATUS'];
+		$header[] = $app_strings['LBL_LAST_MODIFIED'];
+
+		while($row = $adb->fetch_array($result))
+		{
+			$entries = Array();
+
+			$entries[] = $row['salesorderid'];
+			$entries[] = $row['accountname'];
+			$entries[] = $row['total'];
+			$entries[] = $row['sostatus'];
+			$entries[] = getDisplayDate($row['lastmodified']);
+
+			$entries_list[] = $entries;
+		}
+
+		$return_data = Array('header'=>$header,'entries'=>$entries_list);
+
+	 	$log->debug("Exiting get_sostatushistory method ...");
+
+		return $return_data;
+	}
+
+	
 }
 
 ?>

Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original)
+++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Thu Jun 22 00:33:19 2006
@@ -1769,6 +1769,8 @@
 	
 	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Quotes").",9,'get_history',3,'Activity History',0)");
 
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Quotes").",0,'get_quotestagehistory',4,'Quote Stage History',0)");
+
 	// Inserting Purchase order Related Lists
 
 	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("PurchaseOrder").",9,'get_activities',1,'Activities',0)");
@@ -1777,6 +1779,8 @@
 	
 	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("PurchaseOrder").",".getTabid("Activities").",'get_history',3,'Activity History',0)");
 	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("PurchaseOrder").",0,'get_postatushistory',4,'PurchaseOrder Status History',0)");
+
 	// Inserting Sales order Related Lists
 
 	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("SalesOrder").",9,'get_activities',1,'Activities',0)");
@@ -1787,6 +1791,8 @@
 	
 	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("SalesOrder").",".getTabid("Activities").",'get_history',4,'Activity History',0)");
 	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("SalesOrder").",0,'get_sostatushistory',5,'SalesOrder Status History',0)");
+
 	// Inserting Invoice Related Lists
 
 	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Invoice").",9,'get_activities',1,'Activities',0)");
@@ -1794,6 +1800,8 @@
 	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Invoice").",0,'get_attachments',2,'Attachments',0)");
 
 	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Invoice").",".getTabid("Activities").",'get_history',3,'Activity History',0)");
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Invoice").",0,'get_invoicestatushistory',4,'Invoice Status History',0)");
 
 	// Inserting Activities Related Lists
 	



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 23:33:51 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 22 Jun 2006 06:33:51 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7423 -
 /vtigercrm/trunk/Smarty/templates/Settings/PickList.tpl
Message-ID: <20060622063351.508E9842BFC@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 22 00:33:47 2006
New Revision: 7423

Log:
updated picklist file

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 Thu Jun 22 00:33:47 2006
@@ -133,7 +133,7 @@
 				<tr>
 				    <td class="big" rowspan="2">
 					<div id="picklist_datas">	
-						{include file='Settings/PickListContentsN.tpl'}
+						{include file='Settings/PickListContents.tpl'}
 					</div>
 				    </td>	
 				</td>



From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 22 00:06:14 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 22 Jun 2006 07:06:14 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231330=3A?=
 =?utf-8?q?_Admin_changed_to_non-admin_throws_exception?=
In-Reply-To: <076.0c85df12391add0bf2240fd158a748fe@vtiger.fosslabs.com>
References: <076.0c85df12391add0bf2240fd158a748fe@vtiger.fosslabs.com>
Message-ID: <085.1003fad98503fcd89e584ebeee305a1d@vtiger.fosslabs.com>

#1330: Admin changed to non-admin throws exception
------------------------+---------------------------------------------------
  Reporter:  saraj      |       Owner:  don   
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by anonymous):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1330>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 22 00:08:08 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 22 Jun 2006 07:08:08 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231039=3A?=
 =?utf-8?q?_Read_only_data_can_be_able_to_edit_through_ajaxification?=
In-Reply-To: <076.1370d18e3a5ddade616d8ab946d7ce95@vtiger.fosslabs.com>
References: <076.1370d18e3a5ddade616d8ab946d7ce95@vtiger.fosslabs.com>
Message-ID: <085.880c9845c63d9ff36f1d70cca763c62e@vtiger.fosslabs.com>

#1039: Read only data can be able to edit through ajaxification
------------------------+---------------------------------------------------
  Reporter:  mangai     |       Owner:  don   
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by anonymous):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1039>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 22 00:19:15 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 22 Jun 2006 07:19:15 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231135=3A?=
 =?utf-8?q?_The_History_of_the_Purchase_Order_not_getting_displayed?=
In-Reply-To: <076.70a50c265764e891dd51a97dd8390af4@vtiger.fosslabs.com>
References: <076.70a50c265764e891dd51a97dd8390af4@vtiger.fosslabs.com>
Message-ID: <085.71edd5135ceaf4707011048b31d8ebd8@vtiger.fosslabs.com>

#1135: The History of the Purchase Order not getting displayed
--------------------------+-------------------------------------------------
  Reporter:  richie       |       Owner:  mickie
      Type:  enhancement  |      Status:  closed
  Priority:  major        |   Milestone:        
 Component:  vtigercrm    |     Version:  5.0.0 
Resolution:  fixed        |    Keywords:        
--------------------------+-------------------------------------------------
Changes (by mickie):

  * resolution:  => fixed
  * status:  new => closed
  * type:  defect => enhancement

Comment:

 Now we have provided PO Status History and also provided SalesOrder -
 Status History, Quotes - Stage History and Invoice - Status History

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1135>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 22 00:43:54 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 22 Jun 2006 07:43:54 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7424 - in
 /vtigercrm/trunk/modules/Dashboard: horizontal_bargraph.php pie_graph.php
 vertical_bargraph.php
Message-ID: <20060622074354.EF35F842A99@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 22 01:43:50 2006
New Revision: 7424

Log:
delimiter has been changed from , to :: as , causes issue in graph

Modified:
    vtigercrm/trunk/modules/Dashboard/horizontal_bargraph.php
    vtigercrm/trunk/modules/Dashboard/pie_graph.php
    vtigercrm/trunk/modules/Dashboard/vertical_bargraph.php

Modified: vtigercrm/trunk/modules/Dashboard/horizontal_bargraph.php
==============================================================================
--- vtigercrm/trunk/modules/Dashboard/horizontal_bargraph.php (original)
+++ vtigercrm/trunk/modules/Dashboard/horizontal_bargraph.php Thu Jun 22 01:43:50 2006
@@ -27,12 +27,12 @@
 
 	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  
+	$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);
+	$target=explode("::",$target_val);
 
 	$alts=array();
 	$temp=array();

Modified: vtigercrm/trunk/modules/Dashboard/pie_graph.php
==============================================================================
--- vtigercrm/trunk/modules/Dashboard/pie_graph.php (original)
+++ vtigercrm/trunk/modules/Dashboard/pie_graph.php Thu Jun 22 01:43:50 2006
@@ -27,11 +27,11 @@
 
 	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
+	$datay=explode("::",$referdata); // The datay values
+	$datax=explode("::",$refer_code); // The datax values
 
 	$target_val=urldecode($target_val);
-	$target=explode(",",$target_val);
+	$target=explode("::",$target_val);
 
 	$alts=array();
 	for($i=0;$i<count($datax); $i++)

Modified: vtigercrm/trunk/modules/Dashboard/vertical_bargraph.php
==============================================================================
--- vtigercrm/trunk/modules/Dashboard/vertical_bargraph.php (original)
+++ vtigercrm/trunk/modules/Dashboard/vertical_bargraph.php Thu Jun 22 01:43:50 2006
@@ -27,12 +27,12 @@
 
 	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  
+	$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);
+	$target=explode("::",$target_val);
 
 	$alts=array();
 	$temp=array();



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 22 00:44:40 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 22 Jun 2006 07:44:40 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7425 -
	/vtigercrm/trunk/modules/Dashboard/Entity_charts.php
Message-ID: <20060622074440.C0895842A99@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 22 01:44:37 2006
New Revision: 7425

Log:
delimiter has been changed from , to :: as , causes issue in graph

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 Thu Jun 22 01:44:37 2006
@@ -233,12 +233,12 @@
 						$name=$name_val;
 				}
 				//Passing name to graph
-				if($mod_name_val!="") $mod_name_val.=",$name";
+				if($mod_name_val!="") $mod_name_val.="::$name";
 				else $mod_name_val="$name";
 
 
 				//Passing count to graph
-				if($mod_cnt_val!="") $mod_cnt_val.=",$mod_count_val";
+				if($mod_cnt_val!="") $mod_cnt_val.="::$mod_count_val";
 				else $mod_cnt_val="$mod_count_val";	
 
 				if($module!="")
@@ -259,7 +259,7 @@
 					if($i==0)
 						$bar_target_val .=$link_val;
 					else
-						$bar_target_val .=",".$link_val;
+						$bar_target_val .="::".$link_val;
 				}
 				//The data as per given date
 				if($i==0)



From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 22 00:45:24 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 22 Jun 2006 07:45:24 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231282=3A?=
 =?utf-8?q?_Problems_with_graphs_-_Sales_Orders_by_Account?=
In-Reply-To: <076.9cc8264925ac84b43a6a0aafbcf08aae@vtiger.fosslabs.com>
References: <076.9cc8264925ac84b43a6a0aafbcf08aae@vtiger.fosslabs.com>
Message-ID: <085.46600dd267fdb20019882b9affe26a41@vtiger.fosslabs.com>

#1282: Problems with graphs - Sales Orders by Account
-------------------------+--------------------------------------------------
  Reporter:  arosewarne  |       Owner:  mangai         
      Type:  defect      |      Status:  closed         
  Priority:  major       |   Milestone:                 
 Component:  vtigercrm   |     Version:  5.0.0          
Resolution:  fixed       |    Keywords:  analytics graph
-------------------------+--------------------------------------------------
Changes (by mangai):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 fixed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1282>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 22 01:15:18 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 22 Jun 2006 08:15:18 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231354=3A?=
 =?utf-8?q?_Inconsistencies_in_List_View_Buttons_esp_Mass_Delete?=
Message-ID: <076.8202f24bc4ecea9fdc79cdca719ea624@vtiger.fosslabs.com>

#1354: Inconsistencies in List View Buttons esp Mass Delete
-----------------------+----------------------------------------------------
 Reporter:  ahmed      |       Owner:  jeri 
     Type:  defect     |      Status:  new  
 Priority:  blocker    |   Milestone:       
Component:  vtigercrm  |     Version:  5.0.0
 Keywords:             |  
-----------------------+----------------------------------------------------
 Sometimes the buttons in list view - Delete, Change Owner, Change Status,
 & Send Mail does not respond to Mouse Click & at other times it does when
 you perform some other operation or refresh the page.

 The assigned to Field also at times shows values and doesn't
 intermittently.

 Moreover the Mass Delete Button while deleting last record does not work
 and in Notes module it gave a javascript error as undefined.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1354>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 22 01:19:59 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 22 Jun 2006 08:19:59 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231355=3A?=
	=?utf-8?q?_Pricebook_value_is_readonly?=
Message-ID: <076.88e9291262713bf51b842aecd697a80a@vtiger.fosslabs.com>

#1355: Pricebook value is readonly
----------------------------------+-----------------------------------------
 Reporter:  cristian at nethesis.it  |       Owner:  developer
     Type:  defect                |      Status:  new      
 Priority:  major                 |   Milestone:           
Component:  vtigercrm             |     Version:  5.0.0    
 Keywords:                        |  
----------------------------------+-----------------------------------------
 Hi all
 when I insert a new product in a Sales Order, after selecting the product
 and the pricebook, I whould change the pricebook value (in 4.2.3 was
 passible)

 thanks
 cristian

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1355>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 22 02:11:27 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 22 Jun 2006 09:11:27 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23445=3A_?=
 =?utf-8?q?Improper_default_date_value?=
In-Reply-To: <076.94ebb94a2660abaa4c7dff766e8cb6c4@vtiger.fosslabs.com>
References: <076.94ebb94a2660abaa4c7dff766e8cb6c4@vtiger.fosslabs.com>
Message-ID: <085.9db8868be06485afde2962b1add51ee7@vtiger.fosslabs.com>

#445: Improper default date value
-------------------------+--------------------------------------------------
  Reporter:  don         |       Owner:  mangai
      Type:  defect      |      Status:  closed
  Priority:  major       |   Milestone:  5.0.0 
 Component:  vtigercrm   |     Version:  5.0.0 
Resolution:  worksforme  |    Keywords:        
-------------------------+--------------------------------------------------
Changes (by mangai):

  * resolution:  => worksforme
  * status:  new => closed

Comment:

 In latest build,current date is populated by default if date field is
 empty.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/445>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 22 02:23:01 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 22 Jun 2006 09:23:01 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231351=3A?=
 =?utf-8?q?_Editing_Activity_in_Leads_Related_List_Shows_Warning?=
In-Reply-To: <076.23a2cbc68532eb6ef08e3d5e59241e8c@vtiger.fosslabs.com>
References: <076.23a2cbc68532eb6ef08e3d5e59241e8c@vtiger.fosslabs.com>
Message-ID: <085.a2e2438b4b546fd2174f9ffd5dd5e9cc@vtiger.fosslabs.com>

#1351: Editing Activity in Leads Related List Shows Warning
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  mangai
      Type:  defect     |      Status:  new   
  Priority:  blocker    |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mickie):

  * owner:  mickie => mangai

Comment:

 This issue is in DetailView and EditView for Activities when we click on
 activity from Activity listivew.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1351>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 22 03:43:40 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 22 Jun 2006 10:43:40 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231356=3A?=
	=?utf-8?q?_Ajax_edit_issue?=
Message-ID: <076.f02a9fbd23d12bad75eedc90afaf903d@vtiger.fosslabs.com>

#1356: Ajax edit issue
--------------------------+-------------------------------------------------
 Reporter:  jerrydgeorge  |       Owner:  jerrydgeorge
     Type:  defect        |      Status:  new         
 Priority:  critical      |   Milestone:              
Component:  vtigercrm     |     Version:  5.0.0       
 Keywords:                |  
--------------------------+-------------------------------------------------
 During ajax edit in detail view if a entity is assigned to a group we cant
 edit it...

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1356>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 22 04:06:29 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 22 Jun 2006 11:06:29 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7426 -
	/vtigercrm/trunk/modules/Home/index.php
Message-ID: <20060622110629.D16D883F3A2@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 22 05:06:24 2006
New Revision: 7426

Log:
My group allocation - display fixed

Modified:
    vtigercrm/trunk/modules/Home/index.php

Modified: vtigercrm/trunk/modules/Home/index.php
==============================================================================
--- vtigercrm/trunk/modules/Home/index.php (original)
+++ vtigercrm/trunk/modules/Home/index.php Thu Jun 22 05:06:24 2006
@@ -57,6 +57,7 @@
 	$home_section_order = array("ALVT","PLVT","QLTQ","CVLVT","HLT","OLV","GRT","OLTSO","ILTI");
 }
 
+require('user_privileges/user_privileges_'.$current_user->id.'.php');
 foreach ( explode(",",$home_section_order) as $section )
 {
 	switch( $section )
@@ -102,7 +103,7 @@
 	{
 		$home_values['Activities']=getGroupTaskLists();	   
 	}
-   			break;
+   		break;
         case 'HLT':
         if(isPermitted('HelpDesk','index') == "yes")
         {
@@ -140,7 +141,7 @@
 function getActivityType($id)
 {
 	global $adb;
-	$quer = "select vtiger_activitytype from vtiger_activity where vtiger_activityid=".$id;
+	$quer = "select activitytype from vtiger_activity where activityid=".$id;
 	$res = $adb->query($quer);
 	$acti_type = $adb->query_result($res,0,"activitytype");
 	return $acti_type;
@@ -210,17 +211,28 @@
 	$groupids = fetchUserGroupids($userid);
 	if($groupids !='')
 	{
-		//code modified to list the vtiger_groups associates to a user om 21-11-05
-		//Get the leads assigned to group
-		$query = "select vtiger_leaddetails.leadid as id,vtiger_leaddetails.lastname as name,vtiger_leadgrouprelation.groupname as groupname, 'Leads     ' as Type from vtiger_leaddetails inner join vtiger_leadgrouprelation on vtiger_leaddetails.leadid=vtiger_leadgrouprelation.leadid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_leaddetails.leadid inner join vtiger_groups on vtiger_leadgrouprelation.groupname=vtiger_groups.groupname where  vtiger_crmentity.deleted=0  and vtiger_leadgrouprelation.groupname is not null and vtiger_groups.groupid in (".$groupids.")";
-		$query .= " union all ";
-		//Get the activities assigned to group
-		$query .= "select vtiger_activity.activityid id,vtiger_activity.subject,vtiger_activitygrouprelation.groupname,'Activities' as Type from vtiger_activity inner join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_activity.activityid inner join vtiger_groups on vtiger_activitygrouprelation.groupname=vtiger_groups.groupname where  vtiger_crmentity.deleted=0 and ((vtiger_activity.eventstatus !='held'and (vtiger_activity.status is null or vtiger_activity.status ='')) or (vtiger_activity.status !='completed' and (vtiger_activity.eventstatus is null or vtiger_activity.eventstatus=''))) and vtiger_activitygrouprelation.groupname is not null and vtiger_groups.groupid in (".$groupids.")";
-		$query .= " union all ";
-		//Get the tickets assigned to group (status not Closed -- hardcoded value)
-		$query .= "select vtiger_troubletickets.ticketid,vtiger_troubletickets.title,vtiger_ticketgrouprelation.groupname,'Tickets   ' as Type from vtiger_troubletickets inner join vtiger_ticketgrouprelation on vtiger_ticketgrouprelation.ticketid=vtiger_troubletickets.ticketid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_troubletickets.ticketid inner join vtiger_groups on vtiger_ticketgrouprelation.groupname=vtiger_groups.groupname where vtiger_crmentity.deleted=0 and vtiger_troubletickets.status != 'Closed' and vtiger_ticketgrouprelation.groupname is not null and vtiger_groups.groupid in (".$groupids.")";
-
-
+		$query = '';
+		if(isPermitted('Leads','index') == "yes")
+        	{
+			//code modified to list the vtiger_groups associates to a user om 21-11-05
+			//Get the leads assigned to group
+			$query = "select vtiger_leaddetails.leadid as id,vtiger_leaddetails.lastname as name,vtiger_leadgrouprelation.groupname as groupname, 'Leads     ' as Type from vtiger_leaddetails inner join vtiger_leadgrouprelation on vtiger_leaddetails.leadid=vtiger_leadgrouprelation.leadid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_leaddetails.leadid inner join vtiger_groups on vtiger_leadgrouprelation.groupname=vtiger_groups.groupname where  vtiger_crmentity.deleted=0  and vtiger_leadgrouprelation.groupname is not null and vtiger_groups.groupid in (".$groupids.")";
+		}
+		if(isPermitted('Activities','index') == "yes")
+        	{
+			if($query !='')
+			$query .= " union all ";
+			//Get the activities assigned to group
+			$query .= "select vtiger_activity.activityid id,vtiger_activity.subject,vtiger_activitygrouprelation.groupname,'Activities' as Type from vtiger_activity inner join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_activity.activityid inner join vtiger_groups on vtiger_activitygrouprelation.groupname=vtiger_groups.groupname where  vtiger_crmentity.deleted=0 and ((vtiger_activity.eventstatus !='held'and (vtiger_activity.status is null or vtiger_activity.status ='')) or (vtiger_activity.status !='completed' and (vtiger_activity.eventstatus is null or vtiger_activity.eventstatus=''))) and vtiger_activitygrouprelation.groupname is not null and vtiger_groups.groupid in (".$groupids.")";
+		}
+		if(isPermitted('HelpDesk','index') == "yes")
+                {
+			if($query !='')
+			$query .= " union all ";
+			//Get the tickets assigned to group (status not Closed -- hardcoded value)
+			$query .= "select vtiger_troubletickets.ticketid,vtiger_troubletickets.title,vtiger_ticketgrouprelation.groupname,'Tickets   ' as Type from vtiger_troubletickets inner join vtiger_ticketgrouprelation on vtiger_ticketgrouprelation.ticketid=vtiger_troubletickets.ticketid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_troubletickets.ticketid inner join vtiger_groups on vtiger_ticketgrouprelation.groupname=vtiger_groups.groupname where vtiger_crmentity.deleted=0 and vtiger_troubletickets.status != 'Closed' and vtiger_ticketgrouprelation.groupname is not null and vtiger_groups.groupid in (".$groupids.")";
+
+		}
 		$log->info("Here is the where clause for the list view: $query");
 		$result = $adb->limitquery($query,0,5) or die("Couldn't get the group listing");
 
@@ -245,6 +257,7 @@
 				if($row["type"] == "Tickets")
 				{	
 					$list = '<a href=index.php?module=HelpDesk';
+					$list .= '&action=DetailView&record='.$row["id"].'>'.$row["subject"].'</a>';
 				}
 				elseif($row["type"] == "Activities")
 				{
@@ -258,13 +271,14 @@
 					{
 						$list .= '&activity_mode=Events';
 					}
+					$list .= '&action=DetailView&record='.$row["id"].'>'.$row["subject"].'</a>';
 				}
 				else
 				{
 					$list = '<a href=index.php?module='.$row["type"];
+					$list .= '&action=DetailView&record='.$row["id"].'>'.$row["name"].'</a>';
 				}
 
-				$list .= '&action=DetailView&record='.$row["id"].'>'.$row["name"].'</a>';
 				$value[]=$list;	
 				$value[]= $row["groupname"];
 				$value[]= $row["type"];



From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 22 04:23:57 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 22 Jun 2006 11:23:57 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231353=3A?=
 =?utf-8?q?_Modifications_for_translation?=
In-Reply-To: <076.5f6b63545ffb289da25a5900a96337fe@vtiger.fosslabs.com>
References: <076.5f6b63545ffb289da25a5900a96337fe@vtiger.fosslabs.com>
Message-ID: <085.296a2f550455fd10c415e2161418c4a6@vtiger.fosslabs.com>

#1353: Modifications for translation
-------------------------------------+--------------------------------------
  Reporter:  william.maes at wandoo.fr  |       Owner:  developer    
      Type:  enhancement             |      Status:  new          
  Priority:  minor                   |   Milestone:  5.0.0        
 Component:  vtigercrm               |     Version:  5.0.0        
Resolution:                          |    Keywords:  search engine
-------------------------------------+--------------------------------------
Changes (by anonymous):

  * status:  assigned => new
  * owner:  anonymous => developer

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1353>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 22 04:55:31 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 22 Jun 2006 11:55:31 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7427 - in /vtigercrm/trunk:
 Smarty/templates/CreateProfile.tpl Smarty/templates/EditProfile.tpl
 Smarty/templates/ProfileDetailView.tpl modules/Users/CreateProfile.php
 modules/Users/profilePrivileges.php
Message-ID: <20060622115531.C25DC842C19@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 22 05:55:20 2006
New Revision: 7427

Log:
new UI integrated for profiles

Modified:
    vtigercrm/trunk/Smarty/templates/CreateProfile.tpl
    vtigercrm/trunk/Smarty/templates/EditProfile.tpl
    vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl
    vtigercrm/trunk/modules/Users/CreateProfile.php
    vtigercrm/trunk/modules/Users/profilePrivileges.php

Modified: vtigercrm/trunk/Smarty/templates/CreateProfile.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/CreateProfile.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/CreateProfile.tpl Thu Jun 22 05:55:20 2006
@@ -9,73 +9,169 @@
   *
  ********************************************************************************/
 -->*}
-<script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
-<style type="text/css">@import url(themes/blue/style.css);</style>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-		<tr>
-		{include file='SettingsMenu.tpl'}
-				<td width="75%" valign="top">
-						<form action="index.php" method="post" name="profileform" id="form">
-						<input type="hidden" name="module" value="Users">
-						<input type="hidden" name="mode" value="{$MODE}">
-						<input type="hidden" name="action" value="CreateProfile1">
-						<input type="hidden" name="parenttab" value="Settings">
-						<input type="hidden" name="parent_profile" value="{$PARENT_PROFILE}">
-						<input type="hidden" name="radio_button" value="{$RADIO_BUTTON}">
-						<input type="hidden" name="profile_name" value="{$PROFILE_NAME}">
-						<table width="95%" border="0" cellpadding="0" cellspacing="0"  align="center">
-							<tr>
-										<td class="showPanelBg" valign="top" width="100%" colspan="3" style="padding-left:20px; "><br />
-													<span class="lvtHeaderText">
-															<b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS} </a> > {$MOD.LBL_USER_MANAGEMENT} > {$MOD.LBL_PROFILES}</b></span>
-																<hr noshade="noshade" size="1" />
-										</td>
-							</tr>
-							<tr>
-										<td  valign="top" class="leadTable">
-													<table width="100%" border="0" cellpadding="5" cellspacing="0">
-														<tr>
-																<td width="5%" style="border-bottom:1px dashed #CCCCCC;">
-																		<img src="{$IMAGE_PATH}profile.gif" align="absmiddle">
-																</td>
-																<td style="border-bottom:1px dashed #CCCCCC;"> 
-																		<span class="genHeaderGrayBig">{$CMOD.LBL_BASIC_PROFILE_DETAILS}</span><br>
-																		<span	class="genHeaderSmall">{$CMOD.LBL_STEP_1_3}</span>
-
-																</td>
-														</tr>
-													</table>
-													<table width="95%" border="0" cellpadding="5" cellspacing="0" align="center">
-															<tr><td colspan="2">&nbsp;</td></tr>
-															<tr>
-																	<td align="right" width="25%" style="padding-right:10px;">
-																			<b style="color:#FF0000;font-size:16px;">{$APP.LBL_REQUIRED_SYMBOL}</b>&nbsp;<b>{$CMOD.LBL_NEW_PROFILE_NAME} : </b></td>
-																	<td width="75%" align="left" style="padding-left:10px;">
-																			<input type="text" name="profile_name" id="pobox" value="{$PROFILENAME}" class="txtBox" /></td>
-															</tr>
-															<tr><td colspan="2">&nbsp;</td></tr>
-															<tr>
-																	<td align="right" style="padding-right:10px;" valign="top"><b>{$CMOD.LBL_DESCRIPTION} : </b></td>
-																	<td align="left" style="padding-left:10px;"><textarea name="profile_description" class="txtBox">{$PROFILEDESC}</textarea></td>
-															</tr>
-															<tr><td colspan="2" style="border-bottom:1px dashed #CCCCCC;" height="75">&nbsp;</td></tr>
-															<tr>
-																	<td colspan="2" align="right">
-																					<input type="button" value=" &lsaquo; {$APP.LBL_BACK} " name="back" class="classBtnDisable" disabled />&nbsp;&nbsp;
-																					<input type="button" value=" {$APP.LNK_LIST_NEXT} &rsaquo; " class="classBtn" name="Next" onClick="rolevalidate();"/>&nbsp;&nbsp;
-																					<input type="button" value=" {$APP.LBL_CANCEL_BUTTON_LABEL} " title="{$APP.LBL_CANCEL_BUTTON_TITLE}" name="Cancel" onClick="window.history.back()"; class="classBtn"/>
-																	</td>
-															</tr>
-															
-												</table>
-										</td>
-									</tr>
-				</table></form>
-		</td>
-	</tr>
+
+<script language="JAVASCRIPT" type="text/javascript" src="include/js/smoothscroll.js"></script>
+
+<br>
+<table align="center" border="0" cellpadding="0" cellspacing="0" width="98%">
+<tbody><tr>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
+        <td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
+	<br>
+	<div align=center>
+				{include file='SetMenu.tpl'}
+				<form action="index.php" method="post" name="profileform" id="form">
+                                <input type="hidden" name="module" value="Users">
+                                <input type="hidden" name="mode" value="{$MODE}">
+                                <input type="hidden" name="action" value="profilePrivileges">
+                                <input type="hidden" name="parenttab" value="Settings">
+                                <input type="hidden" name="parent_profile" value="{$PARENT_PROFILE}">
+                                <input type="hidden" name="radio_button" value="{$RADIO_BUTTON}">
+	
+				<!-- DISPLAY -->
+				<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
+				<tr>
+					<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}ico-profile.gif" alt="{$MOD.LBL_PROFILES}" width="48" height="48" border=0 title="{$MOD.LBL_PROFILES}"></td>
+					<td class=heading2 valign=bottom><b> <a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Users&action=ListProfiles&parenttab=Settings">{$CMOD.LBL_PROFILE_PRIVILEGES}</a></b></td>
+				</tr>
+				<tr>
+					<td valign=top class="small">{$MOD.LBL_PROFILE_DESCRIPTION}</td>
+				</tr>
+				</table>
+				
+				
+				<table border=0 cellspacing=0 cellpadding=10 width=100% >
+				<tr>
+					<td valign="top">
+					<table border="0" cellpadding="0" cellspacing="0" width="100%">
+		                      	<tbody><tr>
+                			     <td>
+						<table border="0" cellpadding="0" cellspacing="0" width="100%">
+			                        <tbody><tr class="small">
+		                              <td><img src="{$IMAGE_PATH}prvPrfTopLeft.gif"></td>
+               			               <td class="prvPrfTopBg" width="100%"></td>
+		                              <td><img src="{$IMAGE_PATH}prvPrfTopRight.gif"></td>
+
+                	            </tr>
+                          </tbody></table>
+                            <table class="prvPrfOutline" border="0" cellpadding="0" cellspacing="0" width="100%">
+                              <tbody>
+				<tr>
+                                              <td><!-- Module name heading -->
+                                                  <table class="small" border="0" cellpadding="2" cellspacing="0">
+                                                    <tbody><tr>
+                                                      <td valign="top"><img src="{$IMAGE_PATH}prvPrfHdrArrow.gif"> </td>
+                                                      <td class="prvPrfBigText"><b> {$CMOD.LBL_STEP_1_2} : {$CMOD.LBL_WELCOME_PROFILE_CREATE} </b><br>
+                                                          <font class="small"> {$CMOD.LBL_SELECT_CHOICE_NEW_PROFILE} </font> </td>
+
+                                                      <td class="small" style="padding-left: 10px;" align="right"></td>
+                                                    </tr>
+                                                </tbody></table></td>
+                                              <td align="right" valign="bottom">&nbsp;											  </td>
+                                            </tr>
+				<tr>
+                                <td><!-- tabs -->
+					<table width="95%" border="0" cellpadding="5" cellspacing="0" align="center">
+					<tr><td colspan="2">&nbsp;</td></tr>
+					<tr>
+						<td align="right" width="25%" style="padding-right:10px;">
+						<b style="color:#FF0000;font-size:16px;">{$APP.LBL_REQUIRED_SYMBOL}</b>&nbsp;<b>{$CMOD.LBL_NEW_PROFILE_NAME} : </b></td>
+						<td width="75%" align="left" style="padding-left:10px;">
+						<input type="text" name="profile_name" id="pobox" value="{$PROFILENAME}" class="txtBox" /></td>
+					</tr>
+					<tr><td colspan="2">&nbsp;</td></tr>
+					<tr>
+						<td align="right" style="padding-right:10px;" valign="top"><b>{$CMOD.LBL_DESCRIPTION} : </b></td>
+						<td align="left" style="padding-left:10px;"><textarea name="profile_description" class="txtBox">{$PROFILEDESC}</textarea></td>
+					</tr>
+					<tr><td colspan="2" style="border-bottom:1px dashed #CCCCCC;" height="75">&nbsp;</td></tr>
+					<tr>
+						<td align="right" width="10%" style="padding-right:10px;">
+						{if  $RADIO_BUTTON neq 'newprofile'}
+						<input name="radiobutton" checked type="radio" value="baseprofile" />
+						{else}
+						<input name="radiobutton" type="radio"  value="baseprofile" />
+						{/if}
+						</td>
+						<td width="90%" align="left" style="padding-left:10px;">{$CMOD.LBL_BASE_PROFILE_MESG}</td>
+					</tr>
+					<tr>
+						<td align="right"  style="padding-right:10px;">&nbsp;</td>
+						<td align="left" style="padding-left:10px;">{$CMOD.LBL_BASE_PROFILE}
+						<select name="parentprofile" class="importBox">
+							{foreach item=combo from=$PROFILE_LISTS}
+							{if $PARENT_PROFILE eq $combo.1}
+								<option  selected value="{$combo.1}">{$combo.0}</option>
+							{else}
+								<option value="{$combo.1}">{$combo.0}</option>	
+							{/if}
+							{/foreach}
+						</select>
+						</td>
+					</tr>
+					<tr><td colspan="2">&nbsp;</td></tr>
+					<tr><td align="center" colspan="2"><b>(&nbsp;{$CMOD.LBL_OR}&nbsp;)</b></td></tr>
+					<tr><td colspan="2">&nbsp;</td></tr>
+					<tr>
+						<td align="right" style="padding-right:10px;">
+						{if  $RADIO_BUTTON eq 'newprofile'}
+						<input name="radiobutton" checked type="radio" value="newprofile" />
+						{else}
+						<input name="radiobutton" type="radio" value="newprofile" />
+						{/if}
+						</td>
+						<td  align="left" style="padding-left:10px;">{$CMOD.LBL_BASE_PROFILE_MESG_ADV}</td>
+					</tr>
+					<tr><td colspan="2" style="border-bottom:1px dashed #CCCCCC;" height="75">&nbsp;</td></tr>
+					<tr>
+						<td colspan="2" align="right">
+						<input type="button" value=" {$APP.LNK_LIST_NEXT} &rsaquo; " name="Next" class="crmButton small" onClick="rolevalidate();"/>&nbsp;&nbsp;
+						<input type="button" value=" {$APP.LBL_CANCEL_BUTTON_LABEL} " title="{$APP.LBL_CANCEL_BUTTON_TITLE}" name="Cancel" onClick="window.history.back();" class="crmButton small cancel"/>
+						</td>
+					</tr>
+					</table>
+
+                                </td></tr>  	  
+                            	<table class="small" border="0" cellpadding="0" cellspacing="0" width="100%">
+                              	<tbody><tr>
+                                <td><img src="{$IMAGE_PATH}prvPrfBottomLeft.gif"></td>
+                                <td class="prvPrfBottomBg" width="100%"></td>
+                                <td><img src="{$IMAGE_PATH}prvPrfBottomRight.gif"></td>
+                              </tr>
+                          </tbody></table></td>
+                      </tr>
+                    </tbody></table>
+
+					<p>&nbsp;</p>
+					<table border="0" cellpadding="5" cellspacing="0" width="100%">
+					<tbody><tr><td class="small" align="right" nowrap="nowrap"><a href="#top">Scroll to Top</a></td></tr>
+					</tbody></table>
+				
+				
+					
+					
+					
+					
+					
+				</td>
+				</table>
+
+
+
+				</td>
+				</tr>
+				</table>
+				</td>
+				</tr>
+				</table>
+
+				</div>
+				</td>
+				<td valign="top"><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
+				</form>
+   </tr>
+</tbody>
 </table>
-
-	{include file='SettingsSubMenu.tpl'}
 <script>
 function rolevalidate()
 {ldelim}
@@ -97,7 +193,7 @@
 		'index.php',
 		{ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
 			method: 'post',
-			postBody: 'module=Users&action=UsersAjax&file=CreateProfile1&ajax=true&dup_check=true&profile_name='+profilename,
+			postBody: 'module=Users&action=UsersAjax&file=CreateProfile&ajax=true&dup_check=true&profile_name='+profilename,
 			onComplete: function(response) {ldelim}
 					if(response.responseText == 'SUCESS')
 						document.profileform.submit();

Modified: vtigercrm/trunk/Smarty/templates/EditProfile.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/EditProfile.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/EditProfile.tpl Thu Jun 22 05:55:20 2006
@@ -9,509 +9,429 @@
   *
  ********************************************************************************/
 -->*}
-<script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
-<style type="text/css">@import url(themes/blue/style.css);</style>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-		<tr>
-				{include file='SettingsMenu.tpl'}
-				<td width="75%" valign="top">
-						<table width="100%" border="0" cellpadding="0" cellspacing="0" height="100%">
-								<tr>
-										<td class="showPanelBg" valign="top" width="100%" colspan="3" style="padding-left:20px; "><br />
-												<span class="lvtHeaderText"><b>
-														<a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS} </a> 
-														> {$MOD.LBL_USER_MANAGEMENT} > {$MOD.LBL_PROFILES}</b></span>
-														<hr noshade="noshade" size="1" />
-										</td>
-								</tr>
-								<tr>
-									{if $MODE neq "edit"}
-										<td  valign="top" class="leadTable" >
-												<table width="95%" border="0" cellpadding="5" cellspacing="0" align="center">
-												
-														<tr>
-															<td width="5%" style="border-bottom:1px dashed #CCCCCC;">
-																	<img src="{$IMAGE_PATH}profile.gif" align="absmiddle">
-															</td>
-															<td style="border-bottom:1px dashed #CCCCCC;"> 
-																	<span class="genHeaderGrayBig">{$CMOD.LBL_PROFILE_PRIVILEGES}</span><br>
-																	<span	class="genHeaderSmall">{$CMOD.LBL_STEP_3_3}</span>
-															</td>
-													</tr>
-													{else}
-															<td  valign="top" >
-												<table width="75%" border="0" cellpadding="5" cellspacing="0" align="center">
-												
-														<tr>
-															<td width="5%" style="border-bottom:1px dashed #CCCCCC;">
-																	<img src="{$IMAGE_PATH}profile.gif" align="absmiddle">
-															</td>
-															<td style="border-bottom:1px dashed #CCCCCC;"> 
-																	<span class="genHeaderGrayBig">{$CMOD.LBL_PROFILE_PRIVILEGES}</span><br>
-																	<span	class="genHeaderSmall">{$PROFILE_NAME}</span>
-															</td>
-													</tr>
-													{/if}
-																	<tr>
-																			<td colspan="2">
-																					<table border="0" cellspacing="0" cellpadding="0" width="100%">
-																							<tr>
-																								<td>
-																										<table border="0" cellspacing="0" cellpadding="0" width="100%">
-																												<tr class="small">
-																														<td><img src="{$IMAGE_PATH}prvPrfTopLeft.gif" /></td>
-																														<td class="prvPrfTopBg" width="100%" ></td>
-																														<td><img src="{$IMAGE_PATH}prvPrfTopRight.gif" /></td>
-																												</tr>
-																										</table>
-																										<form action="index.php" method="post" name="new" id="form">
-																										<input type="hidden" name="module" value="Users">		
-																										<input type="hidden" name="parenttab" value="Settings">
-																										<input type="hidden" name="action" value="{$ACTION}">		
-																										<input type="hidden" name="mode" value="{$MODE}">	
-																										<input type="hidden" name="profileid" value="{$PROFILEID}">
-																										<input type="hidden" name="profile_name" value="{$PROFILE_NAME}">
-																										<input type="hidden" name="profile_description" value="{$PROFILE_DESCRIPTION}">
-																										<input type="hidden" name="parent_profile" value="{$PARENTPROFILEID}">
-																										<input type="hidden" name="radio_button" value="{$RADIOBUTTON}">	
-																										<input type="hidden" name="return_action" value="{$RETURN_ACTION}">	
-																										<table border="0" cellspacing="0" cellpadding=	"0" width="100%" class="prvPrfOutline">
-																												<tr>
-																														<td>
-<!-- tabs -->
-																																<table border="0" cellspacing="0" cellpadding="5" width="100%" class="small">
-																																		<tr>
-																																				
-																																				<td width="20%" id="prvPrfTab1" class="prvPrfUnSelectedTab" align="center" style="height:31px;" onClick="toggleshowhide('global_privileges','prvPrfTab1');">{$CMOD.LBL_GLOBAL_PRIVILEGES}</td>
-																																				<td width="20%" id="prvPrfTab2" class="prvPrfUnSelectedTab" align="center" onClick="toggleshowhide('tab_privileges','prvPrfTab2');">{$CMOD.LBL_TAB_PRIVILEGES}</td>
-																																				<td width="20%" id="prvPrfTab3" class="prvPrfUnSelectedTab" align="center" onClick="toggleshowhide('standard_privileges','prvPrfTab3');">{$CMOD.LBL_STANDARD_PRIVILEGES}</td>
-																																				<td width="20%" id="prvPrfTab4" class="prvPrfUnSelectedTab" align="center" onClick="toggleshowhide('field_privileges','prvPrfTab4');">{$CMOD.LBL_FIELD_PRIVILEGES}</td>
-																																				<td width="20%" id="prvPrfTab5" class="prvPrfUnSelectedTab" align="center" onClick="toggleshowhide('utility_privileges','prvPrfTab5');">{$CMOD.LBL_UTILITIES}</td>
-																																		</tr>
-																																</table>
-																																<div id="global_privileges" style="display:none;">
-	<!-- Headers -->
-																																	<table border="0" cellspacing="0" cellpadding="5" width="100%" class="prvPrfBgImgGlobal">
-																																		<tr>
-																																				<td>
-																																						<table border="0" cellspacing="0" cellpadding="5" width="100%" class="small">
-																																							<tr>
-																																									<td><!-- Module name heading -->
-																																											<table border="0" cellspacing="0" cellpadding="2" class="small">
-																																													<tr>
-																																															<td valign="top"><img src="{$IMAGE_PATH}prvPrfHdrArrow.gif"/> </td>
-																																															<td class="prvPrfBigText"><b> {$CMOD.LBL_GLOBAL_PRIVILEGES} {$CMOD.LBL_FOR} "{$PROFILE_NAME}"</b> <br />
-																																																	<font class="small">{$CMOD.LBL_GLOBAL_MESG_OPTION} </font> </td>
-																																															<td class="small" style="padding-left:10px" align="right"></td>
-																																													</tr>
-																																											</table>
-																																									 </td>
-																																									<td align="right" valign="bottom">&nbsp;</td>
-																																							</tr>
-																																						</table>
-<!-- privilege lists -->
-																																						<table border="0" cellspacing="0" cellpadding="0" width="100%" >
-																																								<tr>
-																																										<td align="center" style="height:10px"><img src="{$IMAGE_PATH}prvPrfLine.gif" style="width:100%;height:1px" /></td>
-																																								</tr>
-																																						</table>
-																																						<table border="0" cellspacing="0" cellpadding="10" width="100%">
-																																							<tr>
-																																									<td >
-																																											<table border="0" cellspacing="0" cellpadding="5" width="90%" class="small" align="center">
-																																												<tr>
-																																													<td class="prvPrfTexture" style="width:20px">&nbsp;</td>
-																																													<td width="97%" valign="top">
-																																															<table border="0" cellspacing="0" cellpadding="2" width="100%" class="small">
-																																																	<tr id="gva">
-																																																			<td valign="top">{$GLOBAL_PRIV.0}</td>
-																																																					<td ><b>{$CMOD.LBL_VIEW_ALL}</b> </td>
-																																																	</tr>
-																																																	<tr >
-																																																			<td valign="top"></td>
-<td width="100%" >{$CMOD.LBL_ALLOW} "{$PROFILE_NAME}" {$CMOD.LBL_MESG_VIEW}</td>
-</tr>
-<tr>
-<td>&nbsp;</td>
-</tr>
-<tr>
-<td valign="top">{$GLOBAL_PRIV.1}</td>
-<td ><b>{$CMOD.LBL_EDIT_ALL}</b> </td>
-</tr>
-<tr>
-<td valign="top"></td>
-<td > {$CMOD.LBL_ALLOW} "{$PROFILE_NAME}" {$CMOD.LBL_MESG_EDIT}</td>
-</tr>
-</table>
-</td>
-</tr>	
-</table></td>
-</tr>
-</table></td>
-</tr>
-</table>
-</div>
-
-<div id="standard_privileges" style="display:none;">
-<table border=0 cellspacing=0 cellpadding=5 width=100% >
-<tr>
-<td>
-<table border=0 cellspacing=0 cellpadding=5 width=100% class=small>
-<tr>
-<td>
-<!-- Module name heading -->
-<table border=0 cellspacing=0 cellpadding=2 class=small>
-<tr>
-<td valign=top >
-<img src="{$IMAGE_PATH}prvPrfHdrArrow.gif">
-</td>
-<td class="prvPrfBigText">
-<b> {$CMOD.LBL_STANDARD_PRIVILEGES} {$CMOD.LBL_FOR} "{$PROFILE_NAME}"</b> <br>
-<font class=small>{$CMOD.LBL_STD_MESG_OPTION} </font> 
-</td>
-</tr>
-</table>
-</td>
-<td align=right valign=bottom>&nbsp;
-
-</td>
-</tr>
-</table>
-<!-- privilege lists -->
-<table border=0 cellspacing=0 cellpadding=0 width=100% >
-<tr>
-<td align=center style="height:10px"><img src="{$IMAGE_PATH}prvPrfLine.gif" style="width:100%;height:1px"></td>
-</tr>
-</table>
-<table border=0 cellspacing=0 cellpadding=10 width=100%>
-<tr>
-<td >
-<table border=0 cellspacing=0 cellpadding=5 width=90% class=small align=center >
-<tr>
-<td class="prvPrfTexture" style="width:20px">&nbsp;</td>
-<td width=97% valign=top onMouseOver="this.className='prvPrfHoverOn'" onMouseOut="this.className='prvPrfHoverOff'" >
-<table border=0 cellspacing=0 cellpadding=5 width=100% class=small>
-
-	<tr>
-	<td><b>{$CMOD.LBL_ENTITY}</b></td>
-	<td><b>{$CMOD.LBL_CREATE_EDIT}</b></td>
-	<td><b>{$CMOD.LBL_DELETE}</b></td>
-	<td><b>{$CMOD.LBL_VIEW}</b></td>
-	</tr>
-{foreach item=value from=$STANDARD_PRIV}
-<tr>
-<td>{$APP[$value.0]}</td>
-<td>{$value.1}</td>
-<td>{$value.2}</td>
-<td>{$value.3}</td>
-</tr>
-{/foreach}
-
-</table>
-</td>
-</tr>
-</table>
-</td>
-</tr>
-</table>
-</td>
-</tr>
-</table>
-</div>
-
-<div id="tab_privileges" style="display:none;">
-<table border=0 cellspacing=0 cellpadding=5 width=100% >
-<tr>
-<td>
-<table border=0 cellspacing=0 cellpadding=5 width=100% class=small>
-<tr>
-<td>
-<!-- Module name heading -->
-<table border=0 cellspacing=0 cellpadding=2 class=small>
-<tr>
-<td valign=top >
-<img src="{$IMAGE_PATH}prvPrfHdrArrow.gif">
-</td>
-<td class="prvPrfBigText">
-<b> {$CMOD.LBL_TAB_PRIVILEGES} {$CMOD.LBL_FOR} "{$PROFILE_NAME}"</b> <br>
-<font class=small>{$CMOD.LBL_TAB_MESG_OPTION}  </font> 
-</td>
-</tr>
-</table>
-</td>
-<td align=right valign=bottom>
-</td>
-</tr>
-</table>
-<!-- privilege lists -->
-<table border=0 cellspacing=0 cellpadding=0 width=100% >
-<tr>
-<td align=center style="height:10px"><img src="{$IMAGE_PATH}prvPrfLine.gif" style="width:100%;height:1px"></td>
-</tr>
-</table>
-<table border=0 cellspacing=0 cellpadding=10 width=100%>
-<tr>
-<td >
-<!-- Home tab -->
-<table border=0 cellspacing=0 cellpadding=5 width=90% class=small align=center >
-<tr>
-<td class="prvPrfTexture" style="width:20px">&nbsp;</td>
-<td width=97% valign=top onMouseOver="this.className='prvPrfHoverOn'" onMouseOut="this.className='prvPrfHoverOff'" >
-<table border=0 cellspacing=0 cellpadding=5 width=100% class=small>
-
-
-{foreach item=value from=$TAB_PRIV}
-<tr>
-{foreach item=element from=$value}
-<td width=35%>{$APP[$element.0]}</td>
-<td width=15%>{$element.1}</td>
-{/foreach}
-</tr>
-{/foreach}
-
-</table>
-</td>
-</tr>
-</table>
-</td>
-</tr>
-</table>
-</td>
-</tr>
-
-</table>
-</div>
-
-
-<div id="utility_privileges" style="display:none;">
-<table border=0 cellspacing=0 cellpadding=5 width=100% >
-<tr>
-<td>
-<table border=0 cellspacing=0 cellpadding=5 width=100% class=small>
-<tr>
-<td>
-<!-- Module name heading -->
-<table border=0 cellspacing=0 cellpadding=2 class=small>
-<tr>
-<td valign=top >
-<img src="{$IMAGE_PATH}prvPrfHdrArrow.gif">
-</td>
-<td class="prvPrfBigText">
-<b> {$CMOD.LBL_UTILITY_PRIVILEGES} {$CMOD.LBL_FOR} "{$PROFILE_NAME}"</b> <br>
-<font class=small>{$CMOD.LBL_UTILITY_MESG_OPTION} </font> 
-</td>
-</tr>
-</table>
-</td>
-<td align=right valign=bottom>&nbsp;
-
-</td>
-</tr>
-</table>
-<!-- privilege lists -->
-<table border=0 cellspacing=0 cellpadding=0 width=100% >
-<tr>
-<td align=center style="height:10px"><img src="{$IMAGE_PATH}prvPrfLine.gif" style="width:100%;height:1px"></td>
-</tr>
-</table>
-<table border=0 cellspacing=0 cellpadding=10 width=100%>
-<tr>
-<td >
-<!-- Home tab -->
-<table border="0" cellspacing="0" cellpadding="5" width="90%" class="small" align="center" >
-
-{foreach key=module item=value from=$UTILITIES_PRIV}
-<tr>
-<td colspan="4" style="border-bottom:1px solid #efefef"><b>{$APP.$module}</b></td>
-</tr>
-<tr>
-<td class="prvPrfTexture" style="width:20px">&nbsp;</td>
-<td width="97%" valign="top" onmouseover="this.className='prvPrfHoverOn'" onmouseout="this.className='prvPrfHoverOff'" >
-<table border="0" cellspacing="0" cellpadding="5" width="100%" class="small">
-{foreach item=element from=$value}
-<tr>
-<td width=25%>{$APP[$element.0.0]}</td>
-<td width=25%>{$element.0.1}</td>
-<td width=25%>{$APP[$element.1.0]}</td>
-<td width=25%>{$element.1.1}</td>
-{/foreach}
-</tr>
-</table>
-</td>
-</tr>
-
-{/foreach}
-</table>
-</td>
-</tr>
-</table>
-</td>
-</tr>
-
-</table>
-
-</div>
-
-
-<div id="field_privileges" style="display:none;">
-
-<table border="0" cellspacing="0" cellpadding="5" width="100%" >
-<tr>
-<td><table border="0" cellspacing="0" cellpadding="5" width="100%" class="small">
-<tr>
-<td><!-- Module name heading -->
-<table border="0" cellspacing="0" cellpadding="2" class="small">
-<tr>
-<td valign="top" ><img src="{$IMAGE_PATH}prvPrfHdrArrow.gif" /> </td>
-
-<td class="prvPrfBigText"><b> {$CMOD.LBL_FIELD_PRIVILEGES} {$CMOD.LBL_FOR} "{$PROFILE_NAME}"</b> <br />
-<font class="small">{$CMOD.LBL_FIELD_MESG_OPTION} </font> </td>
-</tr>
-</table></td>
-<td align="right" valign="bottom">
-</td>
-</tr>
-</table>
-<!-- privilege lists -->
-<table border="0" cellspacing="0" cellpadding="0" width="100%" >
-<tr>
-<td align="center" style="height:10px"><img src="{$IMAGE_PATH}prvPrfLine.gif" style="width:100%;height:1px" /></td>
-</tr>
-
-</table>
-<table border="0" cellspacing="0" cellpadding="10" width="100%">
-<tr>
-<td >
-<table border="0" cellspacing="0" cellpadding="5" width="100%" class="small">
-<tr>
-<td>
-<select id="module_list" name="module_list" onchange="showmoduleperm(this)">
-{foreach key=module item=label from=$PRI_FIELD_LIST}
-<option value="{$label}">{$APP.$label}</option>
-{/foreach}
-</td>
-<td width=50%>&nbsp;</td>
-</tr>
-<tr>
-<td colspan=2>
-
-{foreach key=module item=value from=$FIELD_PRIVILEGES}
-<div id="field_{$module}" style="display:none;">
-<table border="0" cellspacing="0" cellpadding="5" width="100%" class="small">
-{foreach item=row_value from=$value}
-<tr>
-{foreach item=element from=$row_value}
-<td>{$element.0}</td>
-<td>{$element.1}</td>
-{/foreach}
-</tr>
-{/foreach}
-</table>
-</div>
-{/foreach}
-
-</td>
-</tr>
-</table></td>
-</tr>
-</table></td>
-</tr>
-</table>
-</div>
-
-																														</td>
-																												</tr>
-																										</table>
-																										<table border="0" cellspacing="0" cellpadding="0" width="100%" class="small">
-																												<tr>
-																														<td><img src="{$IMAGE_PATH}prvPrfBottomLeft.gif" /></td>
-																														<td class="prvPrfBottomBg" width="100%"></td>
-																														<td><img src="{$IMAGE_PATH}prvPrfBottomRight.gif" /></td>
-																												</tr>
-																										</table>	
-																									</td>
-																								</tr>
-																						</table>
-																				</td>
-																			</tr>	
-																			<tr><td colspan="2" style="border-bottom:1px dashed #CCCCCC;">&nbsp;</td></tr>
-																			<tr>
-																				<td colspan="2" align="center">
-
-																					<input type="hidden" id="selected_tab" name="selected_tab" value="{$SELECTED_TAB}">		
-																					<input type="hidden" id="selected_module" name="selected_module" value="{$SELECTED_MODULE}">		
-																					{if $MODE neq "edit"}
-																					<input type="submit" value=" &lsaquo; {$APP.LBL_BACK} " name="back" onclick="this.form.action.value='CreateProfile1'" class="classBtn" />&nbsp;&nbsp;
-																					{/if}
-																					{if $ACTION eq 'SaveProfile'}
-																					<input type="submit" value=" {$CMOD.LBL_FINISH_BUTTON} " name="save" class="classBtn"/>&nbsp;&nbsp;
-																					{else}
-																					<input type="submit" value=" {$APP.LBL_SAVE_BUTTON_LABEL} " name="save" class="classBtn"/>&nbsp;&nbsp;
-																					{/if}
-																					<input type="button" value=" {$APP.LBL_CANCEL_BUTTON_LABEL} " name="Cancel" class="classBtn"onClick="window.history.back();" />
-																			</td>
-																	</tr>
-																	
-															</table></from>			
-														</td>
-												<td width="1%" style="border-right:1px dotted #CCCCCC;">&nbsp;</td>
-										</tr>
-								</table>
+{literal}
+<style>
+.showTable{
+	display:inline-table;
+}
+.hideTable{
+	display:none;
+}
+</style>
+{/literal}
+<script language="JAVASCRIPT" type="text/javascript" src="include/js/smoothscroll.js"></script>
+
+<br>
+<table align="center" border="0" cellpadding="0" cellspacing="0" width="98%">
+<tbody><tr>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
+        <td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
+        <br>
+	<div align=center>
+			{include file='SetMenu.tpl'}
+				<!-- DISPLAY -->
+				<form action="index.php" method="post" name="profileform" id="form">
+				<input type="hidden" name="module" value="Users">		
+				<input type="hidden" name="parenttab" value="Settings">
+				<input type="hidden" name="action" value="{$ACTION}">		
+				<input type="hidden" name="mode" value="{$MODE}">	
+				<input type="hidden" name="profileid" value="{$PROFILEID}">
+				<input type="hidden" name="profile_name" value="{$PROFILE_NAME}">
+				<input type="hidden" name="profile_description" value="{$PROFILE_DESCRIPTION}">
+				<input type="hidden" name="parent_profile" value="{$PARENTPROFILEID}">
+				<input type="hidden" name="radio_button" value="{$RADIOBUTTON}">	
+				<input type="hidden" name="return_action" value="{$RETURN_ACTION}">	
+
+				<table class="settingsSelUITopLine" border="0" cellpadding="5" cellspacing="0" width="100%">
+				<tbody><tr>
+					<td rowspan="2" valign="top" width="50"><img src="{$IMAGE_PATH}ico-profile.gif" alt="{$MOD.LBL_PROFILES}" title="{$MOD.LBL_PROFILES}" border="0" height="48" width="48"></td>
+					<td class="heading2" valign="bottom"><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Users&action=ListProfiles&parenttab=Settings">{$CMOD.LBL_PROFILE_PRIVILEGES}</a> &gt; {$CMOD.LBL_VIEWING} &quot;{$PROFILE_NAME}&quot;</b></td>
+				</tr>
+				<tr>
+					<td class="small" valign="top">{$CMOD.LBL_PROFILE_MESG} &quot;{$PROFILE_NAME}&quot; </td>
+				</tr>
+				</tbody></table>
+				
+				
+				<table border="0" cellpadding="10" cellspacing="0" width="100%">
+				<tbody><tr>
+				<td valign="top">
+					<table border="0" cellpadding="0" cellspacing="0" width="100%">
+                      <tbody><tr>
+                        <td><table border="0" cellpadding="0" cellspacing="0" width="100%">
+                            <tbody><tr class="small">
+                              <td><img src="{$IMAGE_PATH}prvPrfTopLeft.gif"></td>
+                              <td class="prvPrfTopBg" width="100%"></td>
+                              <td><img src="{$IMAGE_PATH}prvPrfTopRight.gif"></td>
+                            </tr>
+                          </tbody></table>
+                            <table class="prvPrfOutline" border="0" cellpadding="0" cellspacing="0" width="100%">
+                              <tbody><tr>
+                                <td><!-- tabs -->
+                                    
+                                    <!-- Headers -->
+                                    <table border="0" cellpadding="5" cellspacing="0" width="100%">
+                                      <tbody><tr>
+                                        <td><table class="small" border="0" cellpadding="5" cellspacing="0" width="100%">
+                                            <tbody><tr>
+                                              <td><!-- Module name heading -->
+                                                  <table class="small" border="0" cellpadding="2" cellspacing="0">
+                                                    <tbody><tr>
+                                                      <td valign="top"><img src="{$IMAGE_PATH}prvPrfHdrArrow.gif"> </td>
+                                                      <td class="prvPrfBigText"><b> {if $MODE eq 'create'}{$CMOD.LBL_STEP_2_2} : {/if}{$CMOD.LBL_DEFINE_PRIV_FOR} &lt;{$PROFILE_NAME}&gt; </b><br>
+                                                      <font class="small">{$CMOD.LBL_USE_OPTION_TO_SET_PRIV}</font> </td>
+                                                      <td class="small" style="padding-left: 10px;" align="right"></td>
+                                                    </tr>
+                                                </tbody></table></td>
+                                              <td align="right" valign="bottom">&nbsp;											 	{if $ACTION eq 'SaveProfile'}
+                                                <input type="submit" value=" {$CMOD.LBL_FINISH_BUTTON} " name="save" class="crmButton create small"/>&nbsp;&nbsp;
+                                                {else}
+                                                        <input type="submit" value=" {$APP.LBL_SAVE_BUTTON_LABEL} " name="save" class="crmButton small save"/>&nbsp;&nbsp;
+                                                {/if}
+                                                <input type="button" value=" {$APP.LBL_CANCEL_BUTTON_LABEL} " name="Cancel" class="crmButton cancel small"onClick="window.history.back();" /> 
 						</td>
-				</tr>
+                                            </tr>
+                                          </tbody></table>
+                                            <!-- privilege lists -->
+                                            <table border="0" cellpadding="0" cellspacing="0" width="100%">
+                                              <tbody><tr>
+                                                <td style="height: 10px;" align="center"><img src="{$IMAGE_PATH}prvPrfLine.gif" style="width: 100%; height: 1px;"></td>
+                                              </tr>
+                                            </tbody></table>
+                                            <table border="0" cellpadding="10" cellspacing="0" width="100%">
+                                              <tbody><tr>
+                                                <td>
+						<table border="0" cellpadding="5" cellspacing="0" width="100%">
+  						<tbody>
+							<tr>
+    							<td class="cellLabel big"> {$CMOD.LBL_SUPER_USER_PRIV} </td>
+						       </tr>
+						</tbody>
+						</table>
+						<table class="small" align="center" border="0" cellpadding="5" cellspacing="0" width="90%">
+                                                <tbody><tr>
+                                                    <td class="prvPrfTexture" style="width: 20px;">&nbsp;</td>
+                                                    <td valign="top" width="97%"><table class="small" border="0" cellpadding="2" cellspacing="0" width="100%">
+                                                      <tbody>
+				                         <tr id="gva">
+                                                          <td valign="top">{$GLOBAL_PRIV.0}</td>
+                                                          <td ><b>{$CMOD.LBL_VIEW_ALL}</b> </td>
+                                                        </tr>
+                                                        <tr>
+                                                          <td valign="top"></td>
+                                                          <td width="100%" >{$CMOD.LBL_ALLOW} "{$PROFILE_NAME}" {$CMOD.LBL_MESG_VIEW}</td>
+                                                        </tr>
+                                                        <tr>
+                                                          <td>&nbsp;</td>
+                                                        </tr>
+							<tr>
+							<td valign="top">{$GLOBAL_PRIV.1}</td>
+							<td ><b>{$CMOD.LBL_EDIT_ALL}</b> </td>
+							</tr>
+                                                        <tr>
+                                                          <td valign="top"></td>
+                                                          <td > {$CMOD.LBL_ALLOW} "{$PROFILE_NAME}" {$CMOD.LBL_MESG_EDIT}</td>
+                                                        </tr>
+
+                                                      </tbody></table>
+						</td>
+                                                  </tr>
+                                                </tbody></table>
+<br>
+
+			<table border="0" cellpadding="5" cellspacing="0" width="100%">
+			  <tbody><tr>
+			    <td class="cellLabel big"> {$CMOD.LBL_SET_PRIV_FOR_EACH_MODULE} </td>
+			  </tr>
+			</tbody></table>
+			<table class="small" align="center" border="0" cellpadding="5" cellspacing="0" width="90%">
+			  <tbody><tr>
+			    <td class="prvPrfTexture" style="width: 20px;">&nbsp;</td>
+			    <td valign="top" width="97%">
+				<table class="small listTable" border="0" cellpadding="5" cellspacing="0" width="100%">
+			        <tbody>
+				<tr id="gva">
+			          <td colspan="2" rowspan="2" class="small colHeader"><strong> {$CMOD.LBL_TAB_MESG_OPTION} </strong><strong></strong></td>
+			          <td colspan="3" class="small colHeader"><div align="center"><strong>{$CMOD.LBL_EDIT_PERMISSIONS}</strong></div></td>
+			          <td rowspan="2" class="small colHeader" nowrap="nowrap">{$CMOD.LBL_FIELDS_AND_TOOLS_SETTINGS}</td>
+			        </tr>
+			        <tr id="gva">
+			          <td class="small colHeader"><div align="center"><strong>
+		                Create/Edit
+			          </strong></div></td>
+			          <td class="small colHeader"> <div align="center"><strong>View </strong></div></td>
+			          <td class="small colHeader"> <div align="center"><strong>Delete</strong></div></td>
+			        </tr>
+					
+				<!-- module loops-->
+			        {foreach key=tabid item=elements from=$TAB_PRIV}	
+			        <tr>
+                                        {assign var=modulename value=$TAB_PRIV[$tabid][0]}
+			          <td class="small cellLabel" width="3%"><div align="right">
+					{$TAB_PRIV[$tabid][1]}
+			          </div></td>
+			          <td class="small cellLabel" width="40%"><p>{$APP[$modulename]}</p></td>
+			          <td class="small cellText" width="15%"><div align="center">
+					{$STANDARD_PRIV[$tabid][1]}
+			          </div></td>
+			          <td class="small cellText" width="15%"><div align="center">
+					{$STANDARD_PRIV[$tabid][3]}
+			          </div></td>
+			          <td class="small cellText" width="15%"><div align="center">
+					{$STANDARD_PRIV[$tabid][2]}
+        			  </div></td>
+			          <td class="small cellText" width="22%"><div align="center">
+				{if $FIELD_PRIVILEGES[$tabid] neq NULL}
+				<img src="{$IMAGE_PATH}showDown.gif" id="img_{$tabid}" alt="{$CMOD.LBL_SHOW_FIELDS}" onclick="fnToggleVIew('{$tabid}_view')" border="0" height="16" width="40" style="display:block;">
+				{/if}
+				</div></td>
+				  </tr>
+		                  <tr class="hideTable" id="{$tabid}_view" className="hideTable">
+				          <td colspan="6" class="small settingsSelectedUI">
+						<table class="small" border="0" cellpadding="2" cellspacing="0" width="100%">
+			        	    	<tbody>
+						<tr id="gva">
+				                	<td class="small colHeader" colspan="6" valign="top">{$CMOD.LBL_FIELDS_SELECT_DESELECT}</td>
+					        </tr>
+						{foreach item=row_values from=$FIELD_PRIVILEGES[$tabid]}
+				            	<tr id="gva">
+						      {foreach item=element from=$row_values}
+					              <td valign="top">{$element.1}</td>
+					              <td>{$element.0}</td>
+						      {/foreach}
+				                </tr>
+						{/foreach}
+					        <tr id="gva">
+					              <td colspan="6" class="small colHeader" valign="top">{$CMOD.LBL_TOOLS_TO_BE_SHOWN}</td>
+						</tr>
+							{foreach item=util_value from=$UTILITIES_PRIV[$tabid]}
+							<tr id="gva">
+							{foreach item=util_elements from=$util_value}
+					              		<td valign="top">{$util_elements.1}</td>
+						                <td>{$APP[$util_elements.0]}</td>
+							{/foreach}
+				                	</tr>
+							{/foreach}
+					        </tbody>
+						</table>
+					</td>
+			          </tr>
+				  {/foreach}	
+			    	  </tbody>
+				  </table>
+			  </td>
+			  </tr>
+                          </tbody>
 			</table>
 		</td>
+                </tr>
+		<tr>
+		<td style="border-top: 2px dotted rgb(204, 204, 204);" align="right">
+		<!-- wizard buttons -->
+		<table border="0" cellpadding="2" cellspacing="0">
+		<tbody>
+			<tr><td>
+				{if $ACTION eq 'SaveProfile'}
+					<input type="submit" value=" {$CMOD.LBL_FINISH_BUTTON} " name="save" class="crmButton create small"/>&nbsp;&nbsp;
+				{else}
+					<input type="submit" value=" {$APP.LBL_SAVE_BUTTON_LABEL} " name="save" class="crmButton small save"/>&nbsp;&nbsp;
+				{/if}
+				</td><td>
+					<input type="button" value=" {$APP.LBL_CANCEL_BUTTON_LABEL} " name="Cancel" class="crmButton cancel small"onClick="window.history.back();" /></td>
+
+				<td>&nbsp;</td>
+			</tr>
+		</tbody>
+		</table>
+		</td>
+		</tr>
+          </tbody>
+	  </table>
+	</td>
+        </tr>
+        </tbody>
+	</table>
+      </td>
+      </tr>
+      </tbody></table>
+      <table class="small" border="0" cellpadding="0" cellspacing="0" width="100%">
+           <tbody><tr>
+                <td><img src="{$IMAGE_PATH}prvPrfBottomLeft.gif"></td>
+                <td class="prvPrfBottomBg" width="100%"></td>
+                <td><img src="{$IMAGE_PATH}prvPrfBottomRight.gif"></td>
+                </tr>
+            </tbody>
+      </table></td>
+      </tr>
+      </tbody></table>
+	<p>&nbsp;</p>
+	<table border="0" cellpadding="5" cellspacing="0" width="100%">
+	<tbody><tr><td class="small" align="right" nowrap="nowrap"><a href="#top">{$MOD.LBL_SCROLL}</a></td></tr>
+	</tbody></table>
+					
+	</td>
 	</tr>
+	</tbody></table>
+	</form>	
+	<!-- End of Display -->
+	</td>
+	</tr>
+	</table>
+	</td>
+	</tr>
+	</table>
+	</div>
+
+	</td>
+	<td valign="top"><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
+	</tr>
+</tbody>
 </table>
-	{include file='SettingsSubMenu.tpl'}
-
 <script language="javascript" type="text/javascript">
-var Selected_div= '{$SELECTED_TAB}';
-divarray = new Array('global_privileges','tab_privileges','standard_privileges','field_privileges','utility_privileges'); 	
-tabarray = new Array('prvPrfTab1','prvPrfTab2','prvPrfTab3','prvPrfTab4','prvPrfTab5'); 	
-var defaultmodule = '{$SELECTED_MODULE}';
-function set_default()
-{ldelim}
-	show (Selected_div);
-	show (defaultmodule);
-	for(i = 0; i < divarray.length ;i++)
-	{ldelim}
-		if(divarray[i] == Selected_div)
-			break;	
-	{rdelim}
-	document.getElementById(tabarray[i]).className="prvPrfSelectedTab";
-	module_combo = document.getElementById('module_list');
-	module_combo_selected = defaultmodule.replace(/field_/gi,'')
-	for(i = 0; i < module_combo.length ;i++)
-	{ldelim}
-		if(module_combo.options[i].value == module_combo_selected)
-		{ldelim}	
-			module_combo.options[i].selected = true;	
-			break;	
-		{rdelim}	
-	{rdelim}
-{rdelim}
-set_default();
-function toggleshowhide(currentselecteddiv,currentselectedtab)
-{ldelim}
-	for(i = 0; i < divarray.length ;i++)
-	{ldelim}
-		if(Selected_div == divarray[i])
-			break;	
-	{rdelim}	
-	hide (Selected_div);
-	document.getElementById(tabarray[i]).className="prvPrfUnSelectedTab";
-	show (currentselecteddiv);
-	document.getElementById(currentselectedtab).className="prvPrfSelectedTab";
-	Selected_div = currentselecteddiv;
-	document.getElementById('selected_tab').value =	Selected_div; 	
-{rdelim}	
-function showmoduleperm(selectmodule_view)
-{ldelim}
-	hide(defaultmodule);
-	defaultmodule='field_'+selectmodule_view.options[selectmodule_view.options.selectedIndex].value;
-	show(defaultmodule);
-	document.getElementById('selected_module').value = defaultmodule;	
-{rdelim}	
-	
+{literal}
+var Imagid_array = new Array('img_2','img_4','img_6','img_7','img_8','img_9','img_10','img_13','img_14','img_18','img_19','img_20','img_21','img_22','img_23','img_26')
+function fnToggleVIew(obj){
+	var tagStyle = document.getElementById(obj).className;
+	if(tagStyle == 'hideTable' ){
+		document.getElementById(obj).className = 'showTable';
+	}
+	else
+		document.getElementById(obj).className = 'hideTable';
+}
+function invokeview_all()
+{
+	if($('view_all_chk').checked == true)
+	{
+		for(var i = 0;i < document.profileform.elements.length;i++)
+		{
+			if(document.profileform.elements[i].type == 'checkbox')
+			{
+				if(document.profileform.elements[i].id.indexOf('tab_chk_com_') != -1 || document.profileform.elements[i].id.indexOf('tab_chk_4') != -1 || document.profileform.elements[i].id.indexOf('_field_') != -1)
+					document.profileform.elements[i].checked = true; 
+			}
+		}	
+		showAllImages();
+	}
+}
+function showAllImages()
+{
+	for(var j=0;j < Imagid_array.length;j++)
+	{
+		$(Imagid_array[j]).style.display = 'block';	
+	}
+}
+function invokeedit_all()
+{
+	if($('edit_all_chk').checked == true)
+	{
+		$('view_all_chk').checked = true;
+		for(var i = 0;i < document.profileform.elements.length;i++)
+		{
+			if(document.profileform.elements[i].type == 'checkbox')
+			{
+				if(document.profileform.elements[i].id.indexOf('tab_chk_com_') != -1 || document.profileform.elements[i].id.indexOf('tab_chk_4') != -1 || document.profileform.elements[i].id.indexOf('tab_chk_1') != -1 || document.profileform.elements[i].id.indexOf('_field_') != -1)
+					document.profileform.elements[i].checked = true; 
+			}
+		}	
+		showAllImages();
+	}
+
+}
+function unselect_edit_all()
+{
+	$('edit_all_chk').checked = false;
+}
+function unselect_view_all()
+{
+	$('view_all_chk').checked = false;
+}
+function unSelectView(id)
+{
+	var createid = 'tab_chk_1_'+id;	
+	var deleteid = 'tab_chk_2_'+id;
+	if($('tab_chk_4_'+id).checked == false)
+	{
+		unselect_view_all();
+		unselect_edit_all();
+		$(createid).checked = false;
+		$(deleteid).checked = false;
+	}else
+	{
+		var imageid = 'img_'+id;
+		var viewid = 'tab_chk_4_'+id;	
+		$(imageid).style.display = 'block';
+		$('tab_chk_com_'+id).checked = true; 
+	}
+}
+function unSelectCreate(id)
+{
+	var viewid = 'tab_chk_4_'+id;	
+	if($('tab_chk_1_'+id).checked == false)
+	{
+		unselect_edit_all();
+	}else
+	{
+		var imageid = 'img_'+id;
+		var viewid = 'tab_chk_4_'+id;	
+		$(imageid).style.display = 'block';
+		$('tab_chk_com_'+id).checked = true;
+		$(viewid).checked = true;
+	}
+}
+function unSelectDelete(id)
+{	
+	var contid = id+'_view';
+	if($('tab_chk_2_'+id).checked == false)
+	{
+	}else
+	{
+		var imageid = 'img_'+id;
+		var viewid = 'tab_chk_4_'+id;	
+		$(imageid).style.display = 'block';
+		$('tab_chk_com_'+id).checked = true;
+		$(viewid).checked = true;
+	}
+
+}
+function hideTab(id)
+{
+	var createid = 'tab_chk_1_'+id;	
+	var viewid = 'tab_chk_4_'+id;	
+	var deleteid = 'tab_chk_2_'+id;
+	var imageid = 'img_'+id;
+	var contid = id+'_view';
+	if($('tab_chk_com_'+id).checked == false)
+	{
+		unselect_view_all();
+		unselect_edit_all();
+		$(imageid).style.display = 'none';
+		$(contid).className = 'hideTable';
+		$(createid).checked = false;
+		$(deleteid).checked = false;
+		$(viewid).checked = false;
+	}else
+	{
+		$(imageid).style.display = 'block';
+		$(createid).checked = true;
+		$(deleteid).checked = true;
+		$(viewid).checked = true;
+		var fieldid = id +'_field_';
+		for(var i = 0;i < document.profileform.elements.length;i++)
+                {
+                        if(document.profileform.elements[i].type == 'checkbox' && document.profileform.elements[i].id.indexOf(fieldid) != -1)
+                        {
+                                        document.profileform.elements[i].checked = true;
+                        }
+                }
+	}
+}
+function selectUnselect(oCheckbox)
+{
+	if(oCheckbox.checked == false)
+	{
+		unselect_view_all();
+		unselect_edit_all();
+	}
+}
+{/literal}
 </script>

Modified: vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl Thu Jun 22 05:55:20 2006
@@ -9,7 +9,16 @@
   *
  ********************************************************************************/
 -->*}
-
+{literal}
+<style>
+.showTable{
+	display:inline-table;
+}
+.hideTable{
+	display:none;
+}
+</style>
+{/literal}
 <script language="JAVASCRIPT" type="text/javascript" src="include/js/smoothscroll.js"></script>
 
 <br>
@@ -17,35 +26,9 @@
 <tbody><tr>
         <td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
         <td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
-<br>
+        <br>
 	<div align=center>
-		{include file="SetMenu.tpl"}	
-				<!-- DISPLAY -->
-				<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
-				<tr>
-					<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}ico-profile.gif" alt="{$MOD.LBL_PROFILES}" width="48" height="48" border=0 title="{$MOD.LBL_PROFILES}"></td>
-					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&
-parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Users&action=ListProfiles&parenttab=Settings">{$CMOD.LBL_PROFILE_PRIVILEGES}</a> &gt; {$CMOD.LBL_VIEWING} &quot;{$PROFILE_NAME}&quot; </b></td>
-				</tr>
-				<tr>
-					<td valign=top class="small">{$CMOD.LBL_PROFILE_MESG} &quot;{$PROFILE_NAME}&quot;</td>
-				</tr>
-				</table>
-				
-				
-				<table border=0 cellspacing=0 cellpadding=10 width=100% >
-				<tr>
-				<td valign=top>
-					<table border="0" cellspacing="0" cellpadding="0" width="100%">
-                      <tr>
-                        <td><table border="0" cellspacing="0" cellpadding="0" width="100%">
-                            <tr class="small">
-                              <td><img src="{$IMAGE_PATH}prvPrfTopLeft.gif"></td>
-
-                              <td class="prvPrfTopBg" width="100%" ></td>
-                              <td><img src="{$IMAGE_PATH}prvPrfTopRight.gif"></td>
-                            </tr>
-                          </table>
+			{include file='SetMenu.tpl'}
 				<form action="index.php" method="post" name="new" id="form">
 			        <input type="hidden" name="module" value="Users">
 			        <input type="hidden" name="action" value="profilePrivileges">
@@ -53,53 +36,74 @@
 			        <input type="hidden" name="return_action" value="profilePrivileges">
 			        <input type="hidden" name="mode" value="edit">
 			        <input type="hidden" name="profileid" value="{$PROFILEID}">
-	
-                            <table border="0" cellspacing="0" cellpadding="0" width="100%" class="prvPrfOutline">
-                              <tr>
+				<!-- DISPLAY -->
+				<table class="settingsSelUITopLine" border="0" cellpadding="5" cellspacing="0" width="100%">
+				<tbody><tr>
+					<td rowspan="2" valign="top" width="50"><img src="{$IMAGE_PATH}ico-profile.gif" alt="{$MOD.LBL_PROFILES}" title="{$MOD.LBL_PROFILES}" border="0" height="48" width="48"></td>
+					<td class="heading2" valign="bottom"><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Users&action=ListProfiles&parenttab=Settings">{$CMOD.LBL_PROFILE_PRIVILEGES}</a> &gt; {$CMOD.LBL_VIEWING} &quot;{$PROFILE_NAME}&quot;</b></td>
+				</tr>
+				<tr>
+					<td class="small" valign="top">{$CMOD.LBL_PROFILE_MESG} &quot;{$PROFILE_NAME}&quot; </td>
+				</tr>
+				</tbody></table>
+				
+				
+				<table border="0" cellpadding="10" cellspacing="0" width="100%">
+				<tbody><tr>
+				<td valign="top">
+					<table border="0" cellpadding="0" cellspacing="0" width="100%">
+                      <tbody><tr>
+                        <td><table border="0" cellpadding="0" cellspacing="0" width="100%">
+                            <tbody><tr class="small">
+                              <td><img src="{$IMAGE_PATH}prvPrfTopLeft.gif"></td>
+                              <td class="prvPrfTopBg" width="100%"></td>
+                              <td><img src="{$IMAGE_PATH}prvPrfTopRight.gif"></td>
+                            </tr>
+                          </tbody></table>
+                            <table class="prvPrfOutline" border="0" cellpadding="0" cellspacing="0" width="100%">
+                              <tbody><tr>
                                 <td><!-- tabs -->
-                                    <table border="0" cellspacing="0" cellpadding="5" width="100%" class="small">
-                                      <tr>
-                                        <td width="20%" id="prvPrfTab1" class="prvPrfSelectedTab" align="center" style="height:31px;" onClick="toggleshowhide('global_privileges','prvPrfTab1');"><a href="#">{$CMOD.LBL_GLOBAL_PRIVILEGES}</a></td>
-                                        <td width="20%" id="prvPrfTab2" class="prvPrfUnSelectedTab" align="center" onClick="toggleshowhide('tab_privileges','prvPrfTab2');"><a href="#">{$CMOD.LBL_TAB_PRIVILEGES}</a></td>
-                                        <td width="20%" id="prvPrfTab3" class="prvPrfUnSelectedTab" align="center" onClick="toggleshowhide('standard_privileges','prvPrfTab3');"><a href="#">{$CMOD.LBL_STANDARD_PRIVILEGES}</a></td>
-                                        <td width="20%" id="prvPrfTab4" class="prvPrfUnSelectedTab" align="center" onClick="toggleshowhide('field_privileges','prvPrfTab4');"><a href="#">{$CMOD.LBL_FIELD_PRIVILEGES}</a></td>
-                                        <td width="20%" id="prvPrfTab5" class="prvPrfUnSelectedTab" align="center" onClick="toggleshowhide('utility_privileges','prvPrfTab5');" ><a href="#">{$CMOD.LBL_UTILITIES}</a></td>
-                                      </tr>
-                                    </table>
-				   <div id="global_privileges" style="display:none;">
+                                    
                                     <!-- Headers -->
-                                    <table border="0" cellspacing="0" cellpadding="5" width="100%" class="prvPrfBgImgGlobal">
-                                      <tr>
-                                        <td><table border="0" cellspacing="0" cellpadding="5" width="100%" class="small">
-                                            <tr>
+                                    <table border="0" cellpadding="5" cellspacing="0" width="100%">
+                                      <tbody><tr>
+                                        <td><table class="small" border="0" cellpadding="5" cellspacing="0" width="100%">
+                                            <tbody><tr>
                                               <td><!-- Module name heading -->
-                                                  <table border="0" cellspacing="0" cellpadding="2" class="small">
-                                                    <tr>
-                                                      <td valign="top" ><img src="{$IMAGE_PATH}prvPrfHdrArrow.gif" /> </td>
-                                                      <td class="prvPrfBigText"><b> {$CMOD.LBL_GLOBAL_PRIVILEGES} {$CMOD.LBL_FOR} "{$PROFILE_NAME}"</b> <br />
-                                                          <font class="small">{$CMOD.LBL_GLOBAL_MESG_OPTION}</font></td>
-                                                      <td class="small" style="padding-left:10px" align="right"></td>
+                                                  <table class="small" border="0" cellpadding="2" cellspacing="0">
+                                                    <tbody><tr>
+                                                      <td valign="top"><img src="{$IMAGE_PATH}prvPrfHdrArrow.gif"> </td>
+                                                      <td class="prvPrfBigText"><b> {$CMOD.LBL_DEFINE_PRIV_FOR} &lt;{$PROFILE_NAME}&gt; </b><br>
+                                                      <font class="small">{$CMOD.LBL_USE_OPTION_TO_SET_PRIV}</font> </td>
+                                                      <td class="small" style="padding-left: 10px;" align="right"></td>
+
                                                     </tr>
-                                                </table></td>
-                                              <td align="right" valign="bottom">
-						<input type="hidden" id="selected_tab" name="selected_tab" value="{$SELECTED_TAB}">
-					        <input type="hidden" id="selected_module" name="selected_module" value="{$SELECTED_MODULE}">
-						<input type="submit" value="{$APP.LBL_EDIT_BUTTON_LABEL}" class="crmButton small edit" name="edit"></td>
+                                                </tbody></table></td>
+                                              <td align="right" valign="bottom">&nbsp;<input type="submit" value="{$APP.LBL_EDIT_BUTTON_LABEL}" class="crmButton small edit" name="edit">											  </td>
                                             </tr>
-                                          </table>
+                                          </tbody></table>
                                             <!-- privilege lists -->
-                                            <table border="0" cellspacing="0" cellpadding="0" width="100%" >
-                                              <tr>
-                                                <td align="center" style="height:10px"><img src="{$IMAGE_PATH}prvPrfLine.gif" style="width:100%;height:1px" /></td>
+                                            <table border="0" cellpadding="0" cellspacing="0" width="100%">
+                                              <tbody><tr>
+                                                <td style="height: 10px;" align="center"><img src="{$IMAGE_PATH}prvPrfLine.gif" style="width: 100%; height: 1px;"></td>
                                               </tr>
-                                            </table>
-                                            <table border="0" cellspacing="0" cellpadding="10" width="100%">
-                                              <tr>
-                                                <td ><table border="0" cellspacing="0" cellpadding="5" width="90%" class="small" align="center">
-                                                  <tr>
-                                                    <td class="prvPrfTexture" style="width:20px">&nbsp;</td>
-                                                    <td width="97%" valign="top"><table border="0" cellspacing="0" cellpadding="2" width="100%" class="small">
-                                                        <tr id="gva">
+                                            </tbody></table>
+                                            <table border="0" cellpadding="10" cellspacing="0" width="100%">
+                                              <tbody><tr>
+                                                <td>
+						<table border="0" cellpadding="5" cellspacing="0" width="100%">
+  						<tbody>
+							<tr>
+    							<td class="cellLabel big"> {$CMOD.LBL_SUPER_USER_PRIV} </td>
+						       </tr>
+						</tbody>
+						</table>
+						<table class="small" align="center" border="0" cellpadding="5" cellspacing="0" width="90%">
+                                                <tbody><tr>
+                                                    <td class="prvPrfTexture" style="width: 20px;">&nbsp;</td>
+                                                    <td valign="top" width="97%"><table class="small" border="0" cellpadding="2" cellspacing="0" width="100%">
+                                                      <tbody>
+				                         <tr id="gva">
                                                           <td valign="top">{$GLOBAL_PRIV.0}</td>
                                                           <td ><b>{$CMOD.LBL_VIEW_ALL}</b> </td>
                                                         </tr>
@@ -118,380 +122,161 @@
                                                           <td valign="top"></td>
                                                           <td > {$CMOD.LBL_ALLOW} "{$PROFILE_NAME}" {$CMOD.LBL_MESG_EDIT}</td>
                                                         </tr>
-                                                      </table>
-                                                     </td>
+
+                                                      </tbody></table>
+						</td>
                                                   </tr>
-                                                </table></td>
-                                              </tr>
-                                          </table></td>
-                                      </tr>
-                                  </table></td>
-                              </tr>
-                            </table>
-			    </div>		
-	
-		<div id="tab_privileges" style="display:none;">
-		<table border=0 cellspacing=0 cellpadding=5 width=100% >
+                                                </tbody></table>
+<br>
+
+			<table border="0" cellpadding="5" cellspacing="0" width="100%">
+			  <tbody><tr>
+			    <td class="cellLabel big"> {$CMOD.LBL_SET_PRIV_FOR_EACH_MODULE} </td>
+			  </tr>
+			</tbody></table>
+			<table class="small" align="center" border="0" cellpadding="5" cellspacing="0" width="90%">
+			  <tbody><tr>
+			    <td class="prvPrfTexture" style="width: 20px;">&nbsp;</td>
+			    <td valign="top" width="97%">
+				<table class="small listTable" border="0" cellpadding="5" cellspacing="0" width="100%">
+			        <tbody>
+				<tr id="gva">
+			          <td colspan="2" rowspan="2" class="small colHeader"><strong> {$CMOD.LBL_TAB_MESG_OPTION} </strong><strong></strong></td>
+			          <td colspan="3" class="small colHeader"><div align="center"><strong> {$CMOD.LBL_EDIT_PERMISSIONS} </strong></div></td>
+			          <td rowspan="2" class="small colHeader" nowrap="nowrap"> {$CMOD.LBL_FIELDS_AND_TOOLS_SETTINGS} </td>
+			        </tr>
+			        <tr id="gva">
+			          <td class="small colHeader"><div align="center"><strong>{$CMOD.LBL_CREATE_EDIT}
+			          </strong></div></td>
+			          <td class="small colHeader"> <div align="center"><strong>{$CMOD.LBL_VIEW} </strong></div></td>
+			          <td class="small colHeader"> <div align="center"><strong>{$CMOD.LBL_DELETE}</strong></div></td>
+			        </tr>
+					
+				<!-- module loops-->
+			        {foreach key=tabid item=elements from=$TAB_PRIV}	
+			        <tr>
+                                        {assign var=modulename value=$TAB_PRIV[$tabid][0]}
+			          <td class="small cellLabel" width="3%"><div align="right">
+					{$TAB_PRIV[$tabid][1]}
+			          </div></td>
+			          <td class="small cellLabel" width="40%"><p>{$APP[$modulename]}</p></td>
+			          <td class="small cellText" width="15%"><div align="center">
+					{$STANDARD_PRIV[$tabid][1]}
+			          </div></td>
+			          <td class="small cellText" width="15%"><div align="center">
+					{$STANDARD_PRIV[$tabid][3]}
+			          </div></td>
+			          <td class="small cellText" width="15%"><div align="center">
+					{$STANDARD_PRIV[$tabid][2]}
+        			  </div></td>
+			          <td class="small cellText" width="22%"><div align="center">
+				{if $FIELD_PRIVILEGES[$tabid] neq NULL}
+				<img src="{$IMAGE_PATH}showDown.gif" alt="{$CMOD.LBL_SHOW_FIELDS}" onclick="fnToggleVIew('{$modulename}_view')" border="0" height="16" width="40">
+				{/if}
+				</div></td>
+				  </tr>
+		                  <tr class="hideTable" id="{$modulename}_view" className="hideTable">
+				          <td colspan="6" class="small settingsSelectedUI">
+						<table class="small" border="0" cellpadding="2" cellspacing="0" width="100%">
+			        	    	<tbody>
+						<tr id="gva">
+				                	<td class="small colHeader" colspan="6" valign="top">{$CMOD.LBL_FIELDS_SELECT_DESELECT}</td>
+					        </tr>
+						{foreach item=row_values from=$FIELD_PRIVILEGES[$tabid]}
+				            	<tr id="gva">
+						      {foreach item=element from=$row_values}
+					              <td valign="top">{$element.1}</td>
+					              <td>{$element.0}</td>
+						      {/foreach}
+				                </tr>
+						{/foreach}
+					        <tr id="gva">
+					              <td colspan="6" class="small colHeader" valign="top">{$CMOD.LBL_TOOLS_TO_BE_SHOWN} </td>
+						</tr>
+							{foreach item=util_value from=$UTILITIES_PRIV[$tabid]}
+							<tr id="gva">
+							{foreach item=util_elements from=$util_value}
+					              		<td valign="top">{$util_elements.1}</td>
+						                <td>{$APP[$util_elements.0]}</td>
+							{/foreach}
+				                	</tr>
+							{/foreach}
+					        </tbody>
+						</table>
+					</td>
+			          </tr>
+				  {/foreach}	
+			    	  </tbody>
+				  </table>
+			  </td>
+			  </tr>
+                          </tbody>
+			</table>
+		</td>
+                </tr>
 		<tr>
-		<td>
-		<table border=0 cellspacing=0 cellpadding=5 width=100% class=small>
-		<tr>
-		<td>
-		<!-- Module name heading -->
-		<table border=0 cellspacing=0 cellpadding=2 class=small>
-		<tr>
-		<td valign=top >
-		<img src="{$IMAGE_PATH}prvPrfHdrArrow.gif"></td>
-		<td class="prvPrfBigText">
-		<b> {$CMOD.LBL_TAB_PRIVILEGES} {$CMOD.LBL_FOR} "{$PROFILE_NAME}"</b> <br>
-		<font class=small>{$CMOD.LBL_TAB_MESG_OPTION} </font> 
-		</td>
-		</tr>
-		</table>
-		</td>
-		<td align=right valign=bottom>
-			<input type="hidden" id="selected_tab" name="selected_tab" value="{$SELECTED_TAB}">
-			<input type="hidden" id="selected_module" name="selected_module" value="{$SELECTED_MODULE}">
-			<input type="submit" value="{$APP.LBL_EDIT_BUTTON_LABEL}" class="crmButton small edit" name="edit">
-		</td>
-		</tr>
-		</table>
-		<!-- privilege lists -->
-		<table border=0 cellspacing=0 cellpadding=0 width=100% >
-		<tr>
-		<td align=center style="height:10px"><img src="{$IMAGE_PATH}prvPrfLine.gif" style="width:100%;height:1px"></td>
-		</tr>
-		</table>
-		<table border=0 cellspacing=0 cellpadding=10 width=100%>
-		<tr>
-		<td >
-		<!-- Home tab -->
-		<table border=0 cellspacing=0 cellpadding=5 width=95% class=small align=center >
-		<tr>
-			<td valign=top width="25%" ><table border=0 cellspacing=0 cellpadding=5 width=100% class=small>
-		
-
-		{foreach item=value from=$TAB_PRIV}
-		<tr>
-		{foreach item=element from=$value}
-		<td class="prvPrfTexture" style="width:20px">&nbsp;</td>
-		<td width=5% id="perm{$element.0}">{$element.1}</td>
-		<td width=30% nowrap onMouseOver="this.className='prvPrfHoverOn',$('perm{$element.0}').className='prvPrfHoverOn'" onMouseOut="this.className='prvPrfHoverOff',$('perm{$element.0}').className='prvPrfHoverOff'">{$APP[$element.0]}</td>
-		{/foreach}
-		</tr>
-		{/foreach}
-	
+		<td style="border-top: 2px dotted rgb(204, 204, 204);" align="right">
+		<!-- wizard buttons -->
+		<table border="0" cellpadding="2" cellspacing="0">
+		<tbody>
+			<tr>
+				<td><input type="submit" value="{$APP.LBL_EDIT_BUTTON_LABEL}" class="crmButton small edit" name="edit"></td>
+				<td>&nbsp;</td>
+			</tr>
+		</tbody>
 		</table>
 		</td>
 		</tr>
-		</table>
-		</td>
-		</tr>
-		</table>
-		</td>
-		</tr>
-
-		</table>
-		</div>
-	
-		<div id="standard_privileges" style="display:none;">
-		<table border=0 cellspacing=0 cellpadding=5 width=100% >
-		<tr>
-		<td>
-		<table border=0 cellspacing=0 cellpadding=5 width=100% class=small>
-		<tr>
-		<td>
-		<!-- Module name heading -->
-		<table border=0 cellspacing=0 cellpadding=2 class=small>
-		<tr>
-		<td valign=top >
-		<img src="{$IMAGE_PATH}prvPrfHdrArrow.gif">
-		</td>
-		<td class="prvPrfBigText">
-		<b> {$CMOD.LBL_STANDARD_PRIVILEGES} {$CMOD.LBL_FOR} "{$PROFILE_NAME}"</b> <br>
-		<font class=small>{$CMOD.LBL_STD_MESG_OPTION} </font> 
-		</td>
-		</tr>
-		</table>
-		</td>
-		<td align=right valign=bottom>
-			<input type="hidden" id="selected_tab" name="selected_tab" value="{$SELECTED_TAB}">
-			<input type="hidden" id="selected_module" name="selected_module" value="{$SELECTED_MODULE}">
-			<input type="submit" value="{$APP.LBL_EDIT_BUTTON_LABEL}" class="crmButton small edit" name="edit">
-		</td>	
-
-		</tr>
-		</table>
-		<!-- privilege lists -->
-		<table border=0 cellspacing=0 cellpadding=0 width=100% >
-		<tr>
-		<td align=center style="height:10px"><img src="{$IMAGE_PATH}prvPrfLine.gif" style="width:100%;height:1px"></td>
-		</tr>
-		</table>
-		<table border=0 cellspacing=0 cellpadding=10 width=100%>
-		<tr>
-		<td >
-		<table border=0 cellspacing=0 cellpadding=5 width=90% class=small align=center >
-		<tr>
-		<td class="prvPrfTexture" style="width:20px">&nbsp;</td>
-		<td width=97% valign=top>
-		<table border=0 cellspacing=0 cellpadding=5 width=100% class=small>
-		
-		<tr onMouseOver="this.className='prvPrfHoverOn'" onMouseOut="this.className='prvPrfHoverOff'">
-		<td><b>{$CMOD.LBL_ENTITY}</b></td>
-		<td><b>{$CMOD.LBL_CREATE_EDIT}</b></td>
-		<td><b>{$CMOD.LBL_DELETE}</b></td>
-		<td><b>{$CMOD.LBL_VIEW}</b></td>
-		</tr>
-		
-		{foreach item=value from=$STANDARD_PRIV}
-		<tr onMouseOver="this.className='prvPrfHoverOn'" onMouseOut="this.className='prvPrfHoverOff'">
-		<td>{$APP[$value.0]}</td>
-		<td>{$value.1}</td>
-		<td>{$value.2}</td>
-		<td>{$value.3}</td>
-		</tr>
-		{/foreach}
-		
-		</table>
-		</td>
-		</tr>
-		</table>
-		</td>
-		</tr>
-		</table>
-		</td>
-		</tr>
-		</table>
-		</div>
-		
-		<div id="field_privileges" style="display:none;">
-		<table border="0" cellspacing="0" cellpadding="5" width="100%" >
-		<tr>
-		<td><table border="0" cellspacing="0" cellpadding="5" width="100%" class="small">
-		<tr>
-		<td><!-- Module name heading -->
-		<table border="0" cellspacing="0" cellpadding="2" class="small">
-		<tr>
-		<td valign="top" ><img src="{$IMAGE_PATH}prvPrfHdrArrow.gif" /> </td>
-
-		<td class="prvPrfBigText"><b> {$CMOD.LBL_FIELD_PRIVILEGES} {$CMOD.LBL_FOR} "{$PROFILE_NAME}"</b> <br />
-		<font class="small">{$CMOD.LBL_FIELD_MESG_OPTION} </font> </td>
-		</tr>
-		</table></td>
-		<td align="right" valign="bottom">
-			<input type="hidden" id="selected_tab" name="selected_tab" value="{$SELECTED_TAB}">
-			<input type="hidden" id="selected_module" name="selected_module" value="{$SELECTED_MODULE}">
-			<input type="submit" value="{$APP.LBL_EDIT_BUTTON_LABEL}" class="crmButton small edit" name="edit">
-		</td>	
-		</tr>
-		</table>
-		<!-- privilege lists -->
-		<table border="0" cellspacing="0" cellpadding="0" width="100%" >
-		<tr>
-		<td align="center" style="height:10px"><img src="{$IMAGE_PATH}prvPrfLine.gif" style="width:100%;height:1px" /></td>
-		</tr>
-
-		</table>
-		<table border="0" cellspacing="0" cellpadding="10" width="100%">
-		<tr>
-		<td >
-		<table border="0" cellspacing="0" cellpadding="5" width="100%" class="small">
-		<tr>
-		<td>
-		<select id="module_list" name="module_list" onchange="showmoduleperm(this)">
-		{foreach key=module item=label from=$PRI_FIELD_LIST}
-			<option value="{$label}">{$APP.$label}</option>
-		{/foreach}
-		</td>
-		<td width=50%>&nbsp;</td>
-		</tr>
-		<tr>
-		<td colspan=2>
-	
-		{foreach key=module item=value from=$FIELD_PRIVILEGES}
-		<div id="field_{$module}" style="display:none;">
-		<table border="0" cellspacing="0" cellpadding="5" width="100%" class="small">
-		{foreach item=row_value from=$value}
-		<tr>
-		{foreach item=element from=$row_value}
-		<td class="prvPrfTexture" style="width:5px">&nbsp;</td>
-		<td id="fldperm{$element.0}">{$element.1}</td>
-		<td onMouseOver="this.className='prvPrfHoverOn',$('fldperm{$element.0}').className='prvPrfHoverOn'" onMouseOut="this.className='prvPrfHoverOff',$('fldperm{$element.0}').className='prvPrfHoverOff' ">{$element.0}</td>
-		{/foreach}
-		</tr>
-		{/foreach}
-		</table>
-		</div>
-		{/foreach}
-		
-		</td>
-		</tr>
-		</table></td>
-		</tr>
-		</table></td>
-		</tr>
-		</table>
-		</div>
-	
-		<div id="utility_privileges" style="display:none;">
-		<table border=0 cellspacing=0 cellpadding=5 width=100% >
-		<tr>
-		<td>
-		<table border=0 cellspacing=0 cellpadding=5 width=100% class=small>
-		<tr>
-		<td>
-		<!-- Module name heading -->
-		<table border=0 cellspacing=0 cellpadding=2 class=small>
-		<tr>
-		<td valign=top >
-		<img src="{$IMAGE_PATH}prvPrfHdrArrow.gif">
-		</td>
-		<td class="prvPrfBigText">
-		<b> {$CMOD.LBL_UTILITY_PRIVILEGES} {$CMOD.LBL_FOR} "{$PROFILE_NAME}"</b> <br>
-		<font class=small>{$CMOD.LBL_UTILITY_MESG_OPTION}  </font> 
-		</td>
-		</tr>
-		</table>
-		</td>
-		<td align=right valign=bottom>
-			<input type="hidden" id="selected_tab" name="selected_tab" value="{$SELECTED_TAB}">
-		        <input type="hidden" id="selected_module" name="selected_module" value="{$SELECTED_MODULE}">
-			<input type="submit" value="{$APP.LBL_EDIT_BUTTON_LABEL}" class="crmButton small edit" name="edit"></td>
-		</tr>
-		</table>
-		<!-- privilege lists -->
-		<table border=0 cellspacing=0 cellpadding=0 width=100% >
-		<tr>
-		<td align=center style="height:10px"><img src="{$IMAGE_PATH}prvPrfLine.gif" style="width:100%;height:1px"></td>
-		</tr>
-		</table>
-		<table border=0 cellspacing=0 cellpadding=10 width=100%>
-		<tr>
-		<td >
-		<!-- Home tab -->
-		<table border="0" cellspacing="0" cellpadding="5" width="90%" class="small" align="center" >
-		
-		{foreach key=module item=value from=$UTILITIES_PRIV}
-		<tr>
-		<td colspan="4" style="border-bottom:1px solid #efefef"><b>{$APP.$module}</b></td>
-		</tr>
-		<tr>
-		<td class="prvPrfTexture" style="width:20px">&nbsp;</td>
-		<td width="97%" valign="top" onmouseover="this.className='prvPrfHoverOn'" onmouseout="this.className='prvPrfHoverOff'" >
-		<table border="0" cellspacing="0" cellpadding="5" width="100%" class="small">
-		{foreach item=element from=$value}
-		<tr>
-		<td width=25%>{$APP[$element.0.0]}</td>
-		<td width=25%>{$element.0.1}</td>
-		<td width=25%>{$APP[$element.1.0]}</td>
-		<td width=25%>{$element.1.1}</td>
-		{/foreach}
-		</tr>
-		</table>
-		</td>
-		</tr>
-		
-		{/foreach}
-		</table>
-		</td>
-		</tr>
-		</table>
-		</td>
-		</tr>
-
-		</table>
-
-		</div>
-
-	
-
-                            <table border="0" cellspacing="0" cellpadding="0" width="100%" class="small">
-                              <tr>
-                                <td><img src="{$IMAGE_PATH}prvPrfBottomLeft.gif" /></td>
-                                <td class="prvPrfBottomBg" width="100%"></td>
-                                <td><img src="{$IMAGE_PATH}prvPrfBottomRight.gif" /></td>
-                              </tr>
-                          </table>
-			
-			</td>
-                      </tr>
-                    </table>
-					<p>&nbsp;</p>
-					<table border=0 cellspacing=0 cellpadding=5 width=100% >
-					<tr><td class="small" nowrap align=right><a href="#top">{$MOD.LBL_SCROLL}</a></td></tr>
-					</table>
-				
+          </tbody>
+	  </table>
+	</td>
+        </tr>
+        </tbody>
+	</table>
+      </td>
+      </tr>
+      </tbody></table>
+      <table class="small" border="0" cellpadding="0" cellspacing="0" width="100%">
+           <tbody><tr>
+                <td><img src="{$IMAGE_PATH}prvPrfBottomLeft.gif"></td>
+                <td class="prvPrfBottomBg" width="100%"></td>
+                <td><img src="{$IMAGE_PATH}prvPrfBottomRight.gif"></td>
+                </tr>
+            </tbody>
+      </table></td>
+      </tr>
+      </tbody></table>
+	<p>&nbsp;</p>
+	<table border="0" cellpadding="5" cellspacing="0" width="100%">
+	<tbody><tr><td class="small" align="right" nowrap="nowrap"><a href="#top">{$MOD.LBL_SCROLL}</a></td></tr>
+	</tbody></table>
 					
-					
-				</td>
-				</tr>
-				</table>
-			
-			
-			
-			</td>
-			</tr>
-			</table>
-		</td>
+	</td>
+	</tr>
+	</tbody></table>
+	</form>	
+	<!-- End of Display -->
+	</td>
 	</tr>
 	</table>
-		
+	</td>
+	</tr>
+	</table>
 	</div>
 
-</td>
-        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
-   </tr>
+	</td>
+	<td valign="top"><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
+	</tr>
 </tbody>
 </table>
-
 <script language="javascript" type="text/javascript">
-var Selected_div= '{$SELECTED_TAB}';
-divarray = new Array('global_privileges','tab_privileges','standard_privileges','field_privileges','utility_privileges'); 	
-tabarray = new Array('prvPrfTab1','prvPrfTab2','prvPrfTab3','prvPrfTab4','prvPrfTab5'); 	
-var defaultmodule = '{$SELECTED_MODULE}';
-function set_default()
-{ldelim}
-	show (Selected_div);
-	show (defaultmodule);
-	for(i = 0; i < divarray.length ;i++)
-	{ldelim}
-		if(divarray[i] == Selected_div)
-			break;	
-	{rdelim}
-	document.getElementById(tabarray[i]).className="prvPrfSelectedTab";
-	module_combo = document.getElementById('module_list');
-	module_combo_selected = defaultmodule.replace(/field_/gi,'')
-	for(i = 0; i < module_combo.length;i++)
-	{ldelim}
-		if(module_combo.options[i].value == module_combo_selected)
-		{ldelim}	
-			module_combo.options[i].selected = true;	
-			break;	
-		{rdelim}	
-	{rdelim}
-{rdelim}
-set_default();
-function toggleshowhide(currentselecteddiv,currentselectedtab)
-{ldelim}
-	for(i = 0; i < divarray.length ;i++)
-	{ldelim}
-		if(Selected_div == divarray[i])
-			break;	
-	{rdelim}	
-	hide (Selected_div);
-	document.getElementById(tabarray[i]).className="prvPrfUnSelectedTab";
-	show (currentselecteddiv);
-	document.getElementById(currentselectedtab).className="prvPrfSelectedTab";
-	Selected_div = currentselecteddiv;
-	document.getElementById('selected_tab').value =	Selected_div; 	
-{rdelim}	
-function showmoduleperm(selectmodule_view)
-{ldelim}
-	hide(defaultmodule);
-	defaultmodule='field_'+selectmodule_view.options[selectmodule_view.options.selectedIndex].value;
-	show(defaultmodule);
-	document.getElementById('selected_module').value = defaultmodule;	
-{rdelim}	
-	
+{literal}
+function fnToggleVIew(obj){
+	var tagStyle = document.getElementById(obj).className;
+	if(tagStyle == 'hideTable')
+		document.getElementById(obj).className = 'showTable';
+	else
+		document.getElementById(obj).className = 'hideTable';
+}
+{/literal}
 </script>

Modified: vtigercrm/trunk/modules/Users/CreateProfile.php
==============================================================================
--- vtigercrm/trunk/modules/Users/CreateProfile.php (original)
+++ vtigercrm/trunk/modules/Users/CreateProfile.php Thu Jun 22 05:55:20 2006
@@ -14,36 +14,57 @@
 require_once('include/database/PearDatabase.php');
 require_once('include/utils/utils.php');
 
+$profilename=$_REQUEST['profile_name'];
+
+if(isset($_REQUEST['dup_check']) && $_REQUEST['dup_check']!='')
+{
+        $query = 'select profilename from vtiger_profile where profilename="'.$profilename.'"';
+        $result = $adb->query($query);
+
+        if($adb->num_rows($result) > 0)
+        {
+                echo 'A Profile in the specified name "'.$profilename.'" already exists';
+                die;
+        }else
+        {
+                echo 'SUCESS';
+                die;
+        }
+
+}
+
+
 global $theme;
 $theme_path="themes/".$theme."/";
 $image_path=$theme_path."images/";
 $smarty = new vtigerCRM_Smarty;
+
 if(isset($_REQUEST['parent_profile']) && $_REQUEST['parent_profile'] != '')
 	$smarty->assign("PARENT_PROFILE",$_REQUEST['parent_profile']);
 if(isset($_REQUEST['radio_button']) && $_REQUEST['radio_button'] != '')
 	$smarty->assign("RADIO_BUTTON",$_REQUEST['radio_button']);
 if(isset($_REQUEST['profile_name']) && $_REQUEST['profile_name'] != '')
 	$smarty->assign("PROFILE_NAME",$_REQUEST['profile_name']);
+if(isset($_REQUEST['profile_description']) && $_REQUEST['profile_description'] != '')
+	$smarty->assign("PROFILE_DESCRIPTION",$_REQUEST['profile_description']);
 if(isset($_REQUEST['mode']) && $_REQUEST['mode'] != '')
 	$smarty->assign("MODE",$_REQUEST['mode']);
-if(isset($_REQUEST['profile_name']) && $_REQUEST['profile_name'] != '')
-	$smarty->assign("PROFILENAME",$_REQUEST['profile_name']);
-if(isset($_REQUEST['profile_description']) && $_REQUEST['profile_description'] != '')	
-	$smarty->assign("PROFILEDESC",$_REQUEST['profile_description']);
-if(isset($_REQUEST['profileid']) && $_REQUEST['profileid'] != '')
-{
-	global $adb;	
-	$sql = "select * from vtiger_profile where profileid=".$_REQUEST['profileid'];
-	$profileResult = $adb->query($sql);
-	$profile_name = $adb->query_result($profileResult,0,"profilename");
-	$profile_description = $adb->query_result($profileResult,0,"description");
-	$smarty->assign("PROFILE_NAME",$profile_name);
-	$smarty->assign("PROFILE_DESCRIPTION",$profile_description);
-}
 
 $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);
+
+$sql = "select * from vtiger_profile";
+$result = $adb->query($sql);
+$profilelist = array();
+$temprow = $adb->fetch_array($result);
+do
+{
+	$name=$temprow["profilename"];
+	$profileid=$temprow["profileid"];
+	$profilelist[] = array($name,$profileid); 
+}while($temprow = $adb->fetch_array($result));
+$smarty->assign("PROFILE_LISTS", $profilelist);
                     
 $smarty->display("CreateProfile.tpl");

Modified: vtigercrm/trunk/modules/Users/profilePrivileges.php
==============================================================================
--- vtigercrm/trunk/modules/Users/profilePrivileges.php (original)
+++ vtigercrm/trunk/modules/Users/profilePrivileges.php Thu Jun 22 05:55:20 2006
@@ -143,7 +143,7 @@
 		$stand[]=$tab_create_per;
 		$stand[]=$tab_delete_per;
 		$stand[]=$tab_view_per;
-		$privileges_stand[]=$stand;
+		$privileges_stand[$tabid]=$stand;
 	}
 }
 if($mode == 'edit')
@@ -167,7 +167,7 @@
 		$stand[]=$tab_create_per;
 		$stand[]=$tab_delete_per;
 		$stand[]=$tab_view_per;
-		$privileges_stand[]=$stand;
+		$privileges_stand[$tabid]=$stand;
 	}
 }
 if($mode == 'create')
@@ -193,7 +193,7 @@
 			$stand[]=$tab_create_per;
 			$stand[]=$tab_delete_per;
 			$stand[]=$tab_view_per;
-			$privileges_stand[]=$stand;
+			$privileges_stand[$tabid]=$stand;
 		}	
 	}
 	else
@@ -217,7 +217,7 @@
 			$stand[]=$tab_create_per;
 			$stand[]=$tab_delete_per;
 			$stand[]=$tab_view_per;
-			$privileges_stand[]=$stand;
+			$privileges_stand[$tabid]=$stand;
 		}
 	}
 
@@ -238,7 +238,7 @@
 		$tab_allow_per = getDisplayValue($tab_allow_per_id,$tabid,'');	
 		$tab[]=$entity_name;
 		$tab[]=$tab_allow_per;
-		$privileges_tab[]=$tab;
+		$privileges_tab[$tabid]=$tab;
 	}
 }
 if($mode == 'edit')
@@ -253,7 +253,7 @@
 		$tab_allow_per = getDisplayOutput($tab_allow_per_id,$tabid,'');	
 		$tab[]=$entity_name;
 		$tab[]=$tab_allow_per;
-		$privileges_tab[]=$tab;
+		$privileges_tab[$tabid]=$tab;
 	}
 }
 if($mode == 'create')
@@ -270,7 +270,7 @@
 			$tab_allow_per = getDisplayOutput($tab_allow_per_id,$tabid,'');	
 			$tab[]=$entity_name;
 			$tab[]=$tab_allow_per;
-			$privileges_tab[]=$tab;
+			$privileges_tab[$tabid]=$tab;
 		}
 	}
 	else
@@ -285,12 +285,11 @@
 			$tab_allow_per = getDisplayOutput(0,$tabid,'');	
 			$tab[]=$entity_name;
 			$tab[]=$tab_allow_per;
-			$privileges_tab[]=$tab;
-		}
-	}
-
-}
-$privileges_tab = array_chunk($privileges_tab, 4);
+			$privileges_tab[$tabid]=$tab;
+		}
+	}
+
+}
 $smarty->assign("TAB_PRIV",$privileges_tab);			
 
 //utilities privileges
@@ -312,8 +311,8 @@
 			$util[]=$tab_util_per;
 		}
 		$util=array_chunk($util,2);
-		$util=array_chunk($util,2);
-		$privilege_util[$entity_name] = $util;
+		$util=array_chunk($util,3);
+		$privilege_util[$tabid] = $util;
 	}
 }
 elseif($mode == 'edit')
@@ -333,8 +332,8 @@
 			$util[]=$tab_util_per;
 		}
 		$util=array_chunk($util,2);
-		$util=array_chunk($util,2);
-		$privilege_util[$entity_name] = $util;
+		$util=array_chunk($util,3);
+		$privilege_util[$tabid] = $util;
 	}
 }
 elseif($mode == 'create')
@@ -356,8 +355,8 @@
 				$util[]=$tab_util_per;
 			}
 			$util=array_chunk($util,2);
-			$util=array_chunk($util,2);
-			$privilege_util[$entity_name] = $util;
+			$util=array_chunk($util,3);
+			$privilege_util[$tabid] = $util;
 		}
 	}
 	else
@@ -377,8 +376,8 @@
 				$util[]=$tab_util_per;
 			}
 			$util=array_chunk($util,2);
-			$util=array_chunk($util,2);
-			$privilege_util[$entity_name] = $util;
+			$util=array_chunk($util,3);
+			$privilege_util[$tabid] = $util;
 		}
 
 	}
@@ -407,6 +406,7 @@
 	{
 		$field_module=array();
 		$module_name=key($fieldListResult);
+		$module_id = getTabid($module_name);
 		for($j=0; $j<count($fieldListResult[$module_name]); $j++)
 		{
 			$field=array();
@@ -422,7 +422,7 @@
 			$field[]=$visible;
 			$field_module[]=$field;
 		}
-		$privilege_field[$module_name] = array_chunk($field_module,4);
+		$privilege_field[$module_id] = array_chunk($field_module,3);
 		next($fieldListResult);
 	}
 }
@@ -433,6 +433,7 @@
 	{
 		$field_module=array();
 		$module_name=key($fieldListResult);
+		$module_id = getTabid($module_name);
 		for($j=0; $j<count($fieldListResult[$module_name]); $j++)
 		{
 			$fldLabel= $fieldListResult[$module_name][$j][0];
@@ -455,10 +456,10 @@
 				$visible = "";
 			}
 			$field[]=$mandatory.' '.$fldLabel;
-			$field[]='<input type="checkbox" name="'.$fieldListResult[$module_name][$j][4].'" '.$visible.' '.$readonly.'>';
+			$field[]='<input id="'.$module_id.'_field_'.$fieldListResult[$module_name][$j][4].'" onClick="selectUnselect(this);" type="checkbox" name="'.$fieldListResult[$module_name][$j][4].'" '.$visible.' '.$readonly.'>';
 			$field_module[]=$field;
 		}
-		$privilege_field[$module_name] = array_chunk($field_module,4);
+		$privilege_field[$module_id] = array_chunk($field_module,3);
 		next($fieldListResult);
 	}
 }
@@ -471,6 +472,7 @@
 		{
 			$field_module=array();
 			$module_name=key($fieldListResult);
+			$module_id = getTabid($module_name);
 			for($j=0; $j<count($fieldListResult[$module_name]); $j++)
 			{
 				$fldLabel= $fieldListResult[$module_name][$j][0];
@@ -493,10 +495,10 @@
 					$visible = "";
 				}
 				$field[]=$mandatory.' '.$fldLabel;
-				$field[]='<input type="checkbox" name="'.$fieldListResult[$module_name][$j][4].'" '.$visible.' '.$readonly.'>';
+				$field[]='<input type="checkbox" id="'.$module_id.'_field_'.$fieldListResult[$module_name][$j][4].'" onClick="selectUnselect(this);" name="'.$fieldListResult[$module_name][$j][4].'" '.$visible.' '.$readonly.'>';
 				$field_module[]=$field;
 			}
-			$privilege_field[$module_name] = array_chunk($field_module,4);
+			$privilege_field[$module_id] = array_chunk($field_module,3);
 			next($fieldListResult);
 		}
 	}
@@ -507,6 +509,7 @@
 		{
 			$field_module=array();
 			$module_name=key($fieldListResult);
+			$module_id = getTabid($module_name);
 			for($j=0; $j<count($fieldListResult[$module_name]); $j++)
 			{
 				$fldLabel= $fieldListResult[$module_name][$j][0];
@@ -522,10 +525,10 @@
 				}	
 				$visible = "checked";
 				$field[]=$mandatory.' '.$fldLabel;
-				$field[]='<input type="checkbox" name="'.$fieldListResult[$module_name][$j][4].'" '.$visible.' '.$readonly.'>';
+				$field[]='<input type="checkbox" id="'.$module_id.'_field_'.$fieldListResult[$module_name][$j][4].'"  onClick="selectUnselect(this);" name="'.$fieldListResult[$module_name][$j][4].'" '.$visible.' '.$readonly.'>';
 				$field_module[]=$field;
 			}
-			$privilege_field[$module_name] = array_chunk($field_module,4);
+			$privilege_field[$module_id] = array_chunk($field_module,3);
 			next($fieldListResult);
 		}	
 	}
@@ -581,11 +584,11 @@
 	}
 	elseif($id == 0)
 	{
-		$value = '<input type="checkbox" name="'.$name.'" checked>';
+		$value = '<input type="checkbox" id="'.$name.'_chk" onClick="invoke'.$name.'();" name="'.$name.'" checked>';
 	}
 	elseif($id == 1)
 	{
-		$value = '<input type="checkbox" name="'.$name.'">';
+		$value = '<input type="checkbox" id="'.$name.'_chk" onClick="invoke'.$name.'();" name="'.$name.'">';
 	}
 	return $value;
 
@@ -620,11 +623,25 @@
 	if($actionid == '')
 	{
 		$name = $tabid.'_tab';
+		$ckbox_id = 'tab_chk_com_'.$tabid; 
+		$jsfn = 'hideTab('.$tabid.')';
 	}
 	else
 	{
 		$temp_name = getActionname($actionid);
 		$name = $tabid.'_'.$temp_name;
+		$ckbox_id = 'tab_chk_'.$actionid.'_'.$tabid; 
+		if($actionid == 1)	
+			$jsfn = 'unSelectCreate('.$tabid.')'; 
+		elseif($actionid == 4)	
+			$jsfn = 'unSelectView('.$tabid.')';
+		elseif($actionid == 2)	
+			$jsfn = 'unSelectDelete('.$tabid.')';
+		else
+		{
+			$ckbox_id = $tabid.'_field_util_'.$actionid; 
+			$jsfn = 'javascript:';
+		}	
 	}
 
 
@@ -635,11 +652,11 @@
 	}
 	elseif($id == 0)
 	{
-		$value = '<input type="checkbox" name="'.$name.'" checked>';
+		$value = '<input type="checkbox" onClick="'.$jsfn.';" id="'.$ckbox_id.'" name="'.$name.'" checked>';
 	}
 	elseif($id == 1)
 	{
-		$value = '<input type="checkbox" name="'.$name.'">';
+		$value = '<input type="checkbox" onClick="'.$jsfn.';" id="'.$ckbox_id.'" name="'.$name.'">';
 	}
 	return $value;
 



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 22 05:15:51 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 22 Jun 2006 12:15:51 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7428 -
 /vtigercrm/trunk/modules/Users/language/en_us.lang.php
Message-ID: <20060622121552.AC35683F3A2@vtiger.fosslabs.com>

Author: richie
Date: Thu Jun 22 06:15:32 2006
New Revision: 7428

Log:
New UI Integrated for Profiles

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

Modified: vtigercrm/trunk/modules/Users/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Users/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Users/language/en_us.lang.php Thu Jun 22 06:15:32 2006
@@ -271,9 +271,8 @@
 'LBL_NEW_PROFILE_NAME'=>'Profile Name',
 'LBL_PARENT_PROFILE'=>'Parent Profile',
 'LBL_BASIC_PROFILE_DETAILS'=>'Basic details of Profile',
-'LBL_STEP_1_3'=>'Step 1 of 3',
-'LBL_STEP_2_3'=>'Step 2 of 3',
-'LBL_STEP_3_3'=>'Step 3 of 3',
+'LBL_STEP_1_2'=>'Step 1 of 2',
+'LBL_STEP_2_2'=>'Step 2 of 2',
 'LBL_STEP'=>'Step',
 'LBL_SELECT_BASE_PROFILE'=>'Select Base Profile',
 'LBL_PROFILE_PRIVILEGES'=>'Profile Privileges',
@@ -295,14 +294,22 @@
 'LBL_MESG_VIEW'=>'to view all information / modules of vtiger CRM',
 'LBL_MESG_EDIT'=>'to edit all information / modules of vtiger CRM',
 'LBL_STD_MESG_OPTION'=>'Select the standard actions to be permitted',
-'LBL_TAB_MESG_OPTION'=>'Select the tabs / modules to be shown',
+'LBL_TAB_MESG_OPTION'=>'modules to be shown',
 'LBL_UTILITY_MESG_OPTION'=>'Select the utility actions to be permitted',
 'LBL_FIELD_MESG_OPTION'=>'Select the fields to be permitted',
 'LBL_FINISH_BUTTON'=>'Finish',
 'LBL_PROFILE_DETAIL_VIEW'=>'Detail View of Profile',
 'LBL_PROFILE_MESG'=>'Viewing access privileges for',
 'LBL_PROFILE_M'=>'Profile',
-
+'LBL_DEFINE_PRIV_FOR'=>' Define Privileges for ',
+'LBL_USE_OPTION_TO_SET_PRIV'=>'Use the options below to set privileges',
+'LBL_SUPER_USER_PRIV'=>'Super User Privileges',
+'LBL_SET_PRIV_FOR_EACH_MODULE'=>'Set Privileges for each Module ',
+'LBL_FIELDS_AND_TOOLS_SETTINGS'=>'Fields & Tools Settings',
+'LBL_SHOW_FIELDS'=>'Show Fields',
+'LBL_TOOLS_TO_BE_SHOWN'=>'Tools to be shown',
+'LBL_WELCOME_PROFILE_CREATE'=>'Welcome to Privilege Profile Creator ',
+'LBL_SELECT_CHOICE_NEW_PROFILE'=>'Select your choice of creating the new profile',
 
 //Added fields in createrole.php
 'LBL_HDR_ROLE_NAME'=>'Create New Role:',
@@ -509,7 +516,7 @@
 'LBL_CREATE_RULE_MESG'=>'to create a new Rule',
 'LBL_SELECT_SCREEN'=>'Select the Screen / Module :',
 'LBL_FIELDS_AVLBL'=>'Fields Available in',
-'LBL_FIELDS_SELECT_DESELECT'=>'Select or De-Select fields to be shown',
+'LBL_FIELDS_SELECT_DESELECT'=>'Fields to be shown',
 'LBL_ROLE_TO_BE_DELETED'=>'Role to be Deleted',
 'LBL_TRANSFER_USER_ROLE'=>'Transfer Users to Role',
 'LBL_DELETE_ROLE'=>'Delete Role',



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 22 06:16:03 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 22 Jun 2006 13:16:03 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7429 -
	/vtigercrm/trunk/themes/blue/images/showDown.gif
Message-ID: <20060622131604.586DF83F4F7@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 22 07:15:58 2006
New Revision: 7429

Log:
image for profile has been added

Added:
    vtigercrm/trunk/themes/blue/images/showDown.gif   (with props)



From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 22 06:21:50 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 22 Jun 2006 13:21:50 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231357=3A?=
 =?utf-8?q?_Activity_History_missing_in_Products_and_HelpDesk_Related_List?=
Message-ID: <076.c812704daaa1c7137cf696dc99c6d8cd@vtiger.fosslabs.com>

#1357: Activity History missing in Products and HelpDesk Related List
-----------------------+----------------------------------------------------
 Reporter:  ahmed      |       Owner:  philip
     Type:  defect     |      Status:  new   
 Priority:  critical   |   Milestone:        
Component:  vtigercrm  |     Version:  5.0.0 
 Keywords:             |  
-----------------------+----------------------------------------------------


-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1357>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 22 06:41:55 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 22 Jun 2006 13:41:55 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7430 -
	/vtigercrm/trunk/Smarty/templates/DisplayFields.tpl
Message-ID: <20060622134155.7B69883F513@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 22 07:41:51 2006
New Revision: 7430

Log:
rolename made readonly

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

Modified: vtigercrm/trunk/Smarty/templates/DisplayFields.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DisplayFields.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DisplayFields.tpl Thu Jun 22 07:41:51 2006
@@ -491,7 +491,7 @@
 			</td>
 			<td width="30%" align=left class="dvtCellInfo">
 			{if $thirdvalue eq 1}
-				<input name="role_name" id="role_name" class="txtBox" tabindex="{$vt_tab}" value="{$secondvalue}" type="text">&nbsp;
+				<input name="role_name" id="role_name" readonly class="txtBox" tabindex="{$vt_tab}" value="{$secondvalue}" type="text">&nbsp;
 				<a href="javascript:openPopup();"><img src="{$IMAGE_PATH}select.gif" align="absmiddle" border="0"></a>
 			{else}	
 				<input name="role_name" id="role_name" tabindex="{$vt_tab}" class="txtBox" readonly value="{$secondvalue}" type="text">&nbsp;



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 22 06:55:51 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 22 Jun 2006 13:55:51 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7431 - in /vtigercrm/trunk:
 Smarty/templates/UserDetailView.tpl include/utils/CommonUtils.php
Message-ID: <20060622135551.159AD83F523@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 22 07:55:45 2006
New Revision: 7431

Log:
Issue in non admin user detailview has been fixed

Modified:
    vtigercrm/trunk/Smarty/templates/UserDetailView.tpl
    vtigercrm/trunk/include/utils/CommonUtils.php

Modified: vtigercrm/trunk/Smarty/templates/UserDetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/UserDetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/UserDetailView.tpl Thu Jun 22 07:55:45 2006
@@ -38,7 +38,6 @@
 {if $CATEGORY eq 'Settings'}
 			<input type="hidden" name="modechk" value="prefview">
 {/if}
-			<input type="hidden" name="user_name" value="{$USER_NAME}">
 			<input type="hidden" name="old_password">
 			<input type="hidden" name="new_password">
 			<input type="hidden" name="return_module">

Modified: vtigercrm/trunk/include/utils/CommonUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/CommonUtils.php (original)
+++ vtigercrm/trunk/include/utils/CommonUtils.php Thu Jun 22 07:55:45 2006
@@ -950,7 +950,7 @@
 	require('user_privileges/user_privileges_'.$current_user->id.'.php');
 	if($disp_view == "detail_view")
 	{
-		if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0)
+		if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0 || $module == "Users")
 		{
 			$sql = "select vtiger_field.* from vtiger_field where vtiger_field.tabid=".$tabid." and vtiger_field.block in $blockid_list and vtiger_field.displaytype in (1,2) order by block,sequence";
 		}
@@ -966,7 +966,7 @@
 	{
 		if ($info_type != '')
 		{
-			if($is_admin==true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2]== 0)
+			if($is_admin==true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2]== 0 || $module == 'Users')
 			{
 				$sql = "select vtiger_field.* from vtiger_field where vtiger_field.tabid=".$tabid." and vtiger_field.block in ".$blockid_list ." and ".$display_type_check." and info_type = '".$info_type."' order by block,sequence";
 			}
@@ -978,7 +978,7 @@
 		}
 		else
 		{
-			if($is_admin==true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0)
+			if($is_admin==true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0 || $module == 'Users')
 			{
 				$sql = "select vtiger_field.* from vtiger_field where vtiger_field.tabid=".$tabid." and vtiger_field.block in ".$blockid_list." and ".$display_type_check." order by block,sequence";
 			}



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 22 07:22:12 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 22 Jun 2006 14:22:12 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7432 -
 /vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php
Message-ID: <20060622142213.3129A83F4F7@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 22 08:22:08 2006
New Revision: 7432

Log:
* Fixed the vtiger prefix issue for tables

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 Thu Jun 22 08:22:08 2006
@@ -36,8 +36,8 @@
 /****************** 5.0(Alpha) dev version 1 Database changes -- Starts*********************/
 
 
-//Added the vtiger_announcement vtiger_table creation to avoid the error
-$ann_query = "CREATE TABLE `announcement` (
+//Added the vtiger_announcement table creation to avoid the error
+$ann_query = "CREATE TABLE vtiger_announcement (
 	  `creatorid` int(19) NOT NULL,
 	    `announcement` text,
 	      `title` varchar(255) default NULL,
@@ -47,34 +47,34 @@
 	    ) ENGINE=InnoDB DEFAULT CHARSET=latin1";
 Execute($ann_query);
 
-//Added Primay Keys for the left out vtiger_tables
+//Added Primay Keys for the left out tables
 $alter_array1 = Array(
-		"alter vtiger_table vtiger_activity_reminder ADD PRIMARY KEY (activity_id,recurringid)",
-		"alter vtiger_table vtiger_activitygrouprelation ADD PRIMARY KEY (activityid)",
-		"alter vtiger_table vtiger_cvadvfilter ADD PRIMARY KEY (cvid,columnindex)",
-		"alter vtiger_table vtiger_cvcolumnlist ADD PRIMARY KEY (cvid,columnindex)",
-		"alter vtiger_table vtiger_cvstdfilter ADD PRIMARY KEY (cvid)",
-		"alter vtiger_table vtiger_def_org_field ADD PRIMARY KEY (fieldid)",
-		"alter vtiger_table vtiger_leadgrouprelation ADD PRIMARY KEY (leadid)",
-		"alter vtiger_table vtiger_leadgrouprelation drop key vtiger_leadgrouprelation_IDX0",
-		"alter vtiger_table vtiger_organizationdetails ADD PRIMARY KEY (organizationame)",
-		"alter vtiger_table vtiger_profile2field ADD PRIMARY KEY (profileid,fieldid)",
-		"alter vtiger_table vtiger_profile2standardpermissions ADD PRIMARY KEY (profileid,tabid,Operation)",
-		"alter vtiger_table vtiger_profile2standardpermissions drop index idx_prof2stad",
-		"alter vtiger_table vtiger_profile2utility ADD PRIMARY KEY (profileid,tabid,activityid)",
-		"alter vtiger_table vtiger_profile2utility drop index idx_prof2utility",
-		"alter vtiger_table vtiger_relcriteria ADD PRIMARY KEY (queryid,columnindex)",
-		"alter vtiger_table vtiger_reportdatefilter ADD PRIMARY KEY (datefilterid)",
-		"alter vtiger_table vtiger_reportdatefilter DROP INDEX vtiger_reportdatefilter_IDX0",
-		"alter vtiger_table vtiger_reportsortcol ADD PRIMARY KEY (sortcolid,reportid)",
-		"alter vtiger_table vtiger_reportsummary ADD PRIMARY KEY (reportsummaryid,summarytype,columnname)",
-		"drop vtiger_table vtiger_role2action",
-		"drop vtiger_table vtiger_role2tab",
-		"alter vtiger_table vtiger_selectcolumn ADD PRIMARY KEY (queryid,columnindex)",
-		"alter vtiger_table vtiger_ticketgrouprelation ADD PRIMARY KEY (ticketid)",
-		"alter vtiger_table vtiger_ticketstracktime ADD PRIMARY KEY (ticket_id)",
-		"alter vtiger_table vtiger_users2group ADD PRIMARY KEY (groupname,userid)",
-		"alter vtiger_table vtiger_users2group DROP INDEX idx_users2group",
+		"alter table vtiger_activity_reminder ADD PRIMARY KEY (activity_id,recurringid)",
+		"alter table vtiger_activitygrouprelation ADD PRIMARY KEY (activityid)",
+		"alter table vtiger_cvadvfilter ADD PRIMARY KEY (cvid,columnindex)",
+		"alter table vtiger_cvcolumnlist ADD PRIMARY KEY (cvid,columnindex)",
+		"alter table vtiger_cvstdfilter ADD PRIMARY KEY (cvid)",
+		"alter table vtiger_def_org_field ADD PRIMARY KEY (fieldid)",
+		"alter table vtiger_leadgrouprelation ADD PRIMARY KEY (leadid)",
+		"alter table vtiger_leadgrouprelation drop key vtiger_leadgrouprelation_IDX0",
+		"alter table vtiger_organizationdetails ADD PRIMARY KEY (organizationame)",
+		"alter table vtiger_profile2field ADD PRIMARY KEY (profileid,fieldid)",
+		"alter table vtiger_profile2standardpermissions ADD PRIMARY KEY (profileid,tabid,Operation)",
+		"alter table vtiger_profile2standardpermissions drop index idx_prof2stad",
+		"alter table vtiger_profile2utility ADD PRIMARY KEY (profileid,tabid,activityid)",
+		"alter table vtiger_profile2utility drop index idx_prof2utility",
+		"alter table vtiger_relcriteria ADD PRIMARY KEY (queryid,columnindex)",
+		"alter table vtiger_reportdatefilter ADD PRIMARY KEY (datefilterid)",
+		"alter table vtiger_reportdatefilter DROP INDEX vtiger_reportdatefilter_IDX0",
+		"alter table vtiger_reportsortcol ADD PRIMARY KEY (sortcolid,reportid)",
+		"alter table vtiger_reportsummary ADD PRIMARY KEY (reportsummaryid,summarytype,columnname)",
+		"drop table vtiger_role2action",
+		"drop table vtiger_role2tab",
+		"alter table vtiger_selectcolumn ADD PRIMARY KEY (queryid,columnindex)",
+		"alter table vtiger_ticketgrouprelation ADD PRIMARY KEY (ticketid)",
+		"alter table vtiger_ticketstracktime ADD PRIMARY KEY (ticket_id)",
+		"alter table vtiger_users2group ADD PRIMARY KEY (groupname,userid)",
+		"alter table vtiger_users2group DROP INDEX idx_users2group",
 		);
 foreach($alter_array1 as $query)
 {
@@ -83,11 +83,11 @@
 
 //Tables vtiger_profile2globalpermissions, vtiger_actionmapping creation
 
-$create_sql1 ="CREATE TABLE `profile2globalpermissions` (`profileid` int(19) NOT NULL, `globalactionid` int(19) NOT NULL, `globalactionpermission` int(19) default NULL, PRIMARY KEY  (`profileid`,`globalactionid`),  KEY `idx_profile2globalpermissions` (`profileid`,`globalactionid`)) ENGINE=InnoDB DEFAULT CHARSET=latin1";
+$create_sql1 ="CREATE TABLE vtiger_profile2globalpermissions (`profileid` int(19) NOT NULL, `globalactionid` int(19) NOT NULL, `globalactionpermission` int(19) default NULL, PRIMARY KEY  (`profileid`,`globalactionid`),  KEY `idx_profile2globalpermissions` (`profileid`,`globalactionid`)) ENGINE=InnoDB DEFAULT CHARSET=latin1";
 
 Execute($create_sql1);
 
-$create_sql2 = "CREATE TABLE `actionmapping` (
+$create_sql2 = "CREATE TABLE vtiger_actionmapping (
 	`actionid` int(19) NOT NULL default '0',
 	`actionname` varchar(200) NOT NULL default '',
 	`securitycheck` int(19) default NULL,
@@ -95,7 +95,7 @@
 	) TYPE=InnoDB";
 Execute($create_sql2);
 
-//For all Profiles, insert the following entries into vtiger_profile2global permissions vtiger_table:
+//For all Profiles, insert the following entries into vtiger_profile2global permissions table:
 $sql = 'select * from vtiger_profile';
 $res = $conn->query($sql);
 $noofprofiles = $conn->num_rows($res);
@@ -112,11 +112,11 @@
 }
 
 
-//Removing entries for Dashboard and Home module from vtiger_profile2standardpermissions vtiger_table
+//Removing entries for Dashboard and Home module from vtiger_profile2standardpermissions table
 $del_query1 = "delete from vtiger_profile2standardpermissions where vtiger_tabid in(1,3)";
 Execute($del_query1);
 
-//For all Profile do the following insert into vtiger_profile2utility vtiger_table:
+//For all Profile do the following insert into vtiger_profile2utility table:
 $sql = 'select * from vtiger_profile';
 $res = $conn->query($sql);
 $noofprofiles = $conn->num_rows($res);
@@ -134,7 +134,7 @@
 }
 */
 
-//Insert Values into action mapping vtiger_table:
+//Insert Values into action mapping table:
 $actionmapping_array = Array(
 		"insert into vtiger_actionmapping values(0,'Save',0)",
 		"insert into vtiger_actionmapping values(1,'EditView',0)",
@@ -167,7 +167,7 @@
 }
 
 
-//Added two columns in vtiger_field vtiger_table to construct the quickcreate form dynamically
+//Added two columns in vtiger_field table to construct the quickcreate form dynamically
 $alter_array2 = Array(
 		"ALTER TABLE vtiger_field ADD column quickcreate int(10) after typeofdata",
 		"ALTER TABLE vtiger_field ADD column quickcreatesequence int(19) after quickcreate",
@@ -180,48 +180,48 @@
 $update_array1 = Array(
 		"UPDATE vtiger_field SET quickcreate = 1,quickcreatesequence = 0",
 
-		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 1 WHERE vtiger_tabid = 2 and vtiger_fieldlabel = 'Potential Name'",
-		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 2 WHERE vtiger_tabid = 2 and vtiger_fieldlabel = 'Account Name'",
-		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 3 WHERE vtiger_tabid = 2 and vtiger_fieldlabel = 'Expected Close Date'",
-		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 4 WHERE vtiger_tabid = 2 and vtiger_fieldlabel = 'Sales Stage'",
-		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 5 WHERE vtiger_tabid = 2 and vtiger_fieldlabel = 'Amount'",
-
-		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 1 WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'First Name'",
-		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 2 WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'Last Name'",
-		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 3 WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'Account Name'",
-		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 4 WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'Office Phone'",
-		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 5 WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'Email'",
-
-		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 1 WHERE vtiger_tabid = 6 and vtiger_fieldlabel = 'Account Name'",
-		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 2 WHERE vtiger_tabid = 6 and vtiger_fieldlabel = 'Phone'",
-		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 3 WHERE vtiger_tabid = 6 and vtiger_fieldlabel = 'Website'",
-
-		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 1 WHERE vtiger_tabid = 7 and vtiger_fieldlabel = 'First Name'",
-		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 2 WHERE vtiger_tabid = 7 and vtiger_fieldlabel = 'Last Name'",
-		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 3 WHERE vtiger_tabid = 7 and vtiger_fieldlabel = 'Company'",
-		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 4 WHERE vtiger_tabid = 7 and vtiger_fieldlabel = 'Phone'",
-		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 5 WHERE vtiger_tabid = 7 and vtiger_fieldlabel = 'Email'",
-
-		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 1 WHERE vtiger_tabid = 8 and vtiger_fieldlabel = 'Subject'",
-
-		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 1 WHERE vtiger_tabid = 9 and vtiger_fieldlabel = 'Subject'",
-		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 2 WHERE vtiger_tabid = 9 and vtiger_fieldlabel = 'Start Date & Time'",
-
-		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 1 WHERE vtiger_tabid = 10 and vtiger_fieldlabel = 'Subject'",
-		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 2 WHERE vtiger_tabid = 10 and vtiger_fieldlabel = 'Date & Time Sent'",
-
-		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 1 WHERE vtiger_tabid = 13 and vtiger_fieldlabel = 'Title'",
-		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 2 WHERE vtiger_tabid = 13 and vtiger_fieldlabel = 'Description'",
-		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 3 WHERE vtiger_tabid = 13 and vtiger_fieldlabel = 'Priority'",
-
-		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 1 WHERE vtiger_tabid = 14 and vtiger_fieldlabel = 'Product Name'",
-		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 2 WHERE vtiger_tabid = 14 and vtiger_fieldlabel = 'Product Code'",
-		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 3 WHERE vtiger_tabid = 14 and vtiger_fieldlabel = 'Product Category'",
-
-		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 1 WHERE vtiger_tabid = 16 and vtiger_fieldlabel = 'Subject'",
-		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 2 WHERE vtiger_tabid = 16 and vtiger_fieldlabel = 'Start Date & Time'",
-		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 3 WHERE vtiger_tabid = 16 and vtiger_fieldlabel = 'Activity Type'",
-		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 4 WHERE vtiger_tabid = 16 and vtiger_fieldlabel = 'Duration'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 1 WHERE tabid = 2 and fieldlabel = 'Potential Name'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 2 WHERE tabid = 2 and fieldlabel = 'Account Name'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 3 WHERE tabid = 2 and fieldlabel = 'Expected Close Date'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 4 WHERE tabid = 2 and fieldlabel = 'Sales Stage'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 5 WHERE tabid = 2 and fieldlabel = 'Amount'",
+
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 1 WHERE tabid = 4 and fieldlabel = 'First Name'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 2 WHERE tabid = 4 and fieldlabel = 'Last Name'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 3 WHERE tabid = 4 and fieldlabel = 'Account Name'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 4 WHERE tabid = 4 and fieldlabel = 'Office Phone'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 5 WHERE tabid = 4 and fieldlabel = 'Email'",
+
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 1 WHERE tabid = 6 and fieldlabel = 'Account Name'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 2 WHERE tabid = 6 and fieldlabel = 'Phone'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 3 WHERE tabid = 6 and fieldlabel = 'Website'",
+
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 1 WHERE tabid = 7 and fieldlabel = 'First Name'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 2 WHERE tabid = 7 and fieldlabel = 'Last Name'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 3 WHERE tabid = 7 and fieldlabel = 'Company'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 4 WHERE tabid = 7 and fieldlabel = 'Phone'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 5 WHERE tabid = 7 and fieldlabel = 'Email'",
+
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 1 WHERE tabid = 8 and fieldlabel = 'Subject'",
+
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 1 WHERE tabid = 9 and fieldlabel = 'Subject'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 2 WHERE tabid = 9 and fieldlabel = 'Start Date & Time'",
+
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 1 WHERE tabid = 10 and fieldlabel = 'Subject'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 2 WHERE tabid = 10 and fieldlabel = 'Date & Time Sent'",
+
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 1 WHERE tabid = 13 and fieldlabel = 'Title'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 2 WHERE tabid = 13 and fieldlabel = 'Description'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 3 WHERE tabid = 13 and fieldlabel = 'Priority'",
+
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 1 WHERE tabid = 14 and fieldlabel = 'Product Name'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 2 WHERE tabid = 14 and fieldlabel = 'Product Code'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 3 WHERE tabid = 14 and fieldlabel = 'Product Category'",
+
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 1 WHERE tabid = 16 and fieldlabel = 'Subject'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 2 WHERE tabid = 16 and fieldlabel = 'Start Date & Time'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 3 WHERE tabid = 16 and fieldlabel = 'Activity Type'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 4 WHERE tabid = 16 and fieldlabel = 'Duration'",
 		);
 foreach($update_array1 as $query)
 {
@@ -239,7 +239,7 @@
 
 //Added on 23-12-2005 which is missed from Fredy's contribution for Color vtiger_priority
 populateFieldForSecurity('16',$newfieldid);
-$activity_alter_query = "alter vtiger_table vtiger_activity add column vtiger_priority varchar(150) default NULL";
+$activity_alter_query = "alter table vtiger_activity add column priority varchar(150) default NULL";
 Execute($activity_alter_query);
 
 //Code contributed by Raju for better emailing 
@@ -253,12 +253,12 @@
 */
 //commented the above array as that queries are wrong queries -- changed on 23-12-2005
 $insert_array1 = array(
-			"update vtiger_field set uitype='357' where vtiger_tabid=10 and vtiger_fieldname='parent_id' and vtiger_tablename='seactivityrel'",
-			"update vtiger_field set sequence=1 where vtiger_tabid=10 and vtiger_fieldname in ('parent_id','subject','filename','description')",
-			"update vtiger_field set block=2 where vtiger_tabid=10 and vtiger_fieldname='parent_id'",
-			"update vtiger_field set block=3 where vtiger_tabid=10 and vtiger_fieldname='subject'",
-			"update vtiger_field set block=4 where vtiger_tabid=10 and vtiger_fieldname='filename'",
-			"update vtiger_field set block=5 where vtiger_tabid=10 and vtiger_fieldname='description'",
+			"update vtiger_field set uitype='357' where tabid=10 and fieldname='parent_id' and tablename='seactivityrel'",
+			"update vtiger_field set sequence=1 where tabid=10 and fieldname in ('parent_id','subject','filename','description')",
+			"update vtiger_field set block=2 where tabid=10 and fieldname='parent_id'",
+			"update vtiger_field set block=3 where tabid=10 and fieldname='subject'",
+			"update vtiger_field set block=4 where tabid=10 and fieldname='filename'",
+			"update vtiger_field set block=5 where tabid=10 and fieldname='description'",
 		      );
 foreach($insert_array1 as $query)
 {
@@ -266,40 +266,40 @@
 }
 
 //code contributed by mike to rearrange the home page
-$alter_query2 = "alter vtiger_table vtiger_users add column homeorder varchar(255) default 'ALVT,PLVT,QLTQ,CVLVT,HLT,OLV,GRT,OLTSO,ILTI' after date_format";
+$alter_query2 = "alter table vtiger_users add column homeorder varchar(255) default 'ALVT,PLVT,QLTQ,CVLVT,HLT,OLV,GRT,OLTSO,ILTI' after date_format";
 Execute($alter_query2);
 
-//Added one column in vtiger_invoice vtiger_table to include 'Contact Name' vtiger_field in Invoice module
+//Added one column in vtiger_invoice table to include 'Contact Name' vtiger_field in Invoice module
 $alter_query3 = "ALTER TABLE vtiger_invoice ADD column contactid int(19) after customerno";
 Execute($alter_query3);
 
 $newfieldid = $conn->getUniqueID("field");
 $insert_query2 = "insert into vtiger_field values (23,".$newfieldid.",'contactid','invoice',1,'57','contact_id','Contact Name',1,0,0,100,4,1,1,'I~O',1,'')";
 Execute($insert_query2);
-//Added on 23-12-2005 because we must populate vtiger_field entries in vtiger_profile2field and vtiger_def_org_field if we add a vtiger_field in vtiger_field vtiger_table
+//Added on 23-12-2005 because we must populate vtiger_field entries in vtiger_profile2field and vtiger_def_org_field if we add a vtiger_field in vtiger_field table
 populateFieldForSecurity('23',$newfieldid);
 
 //changes made to fix the bug in Address Information block of Accounts and Contacs module
 $update_array2 = Array(
-		"UPDATE vtiger_field SET vtiger_fieldlabel='Billing City' WHERE vtiger_tabid=6 and vtiger_tablename='accountbillads' and vtiger_fieldname='bill_city'",
-		"UPDATE vtiger_field SET vtiger_fieldlabel='Billing State' WHERE vtiger_tabid=6 and vtiger_tablename='accountbillads' and vtiger_fieldname='bill_state'",
-		"UPDATE vtiger_field SET vtiger_fieldlabel='Billing Code' WHERE vtiger_tabid=6 and vtiger_tablename='accountbillads' and vtiger_fieldname='bill_code'",
-		"UPDATE vtiger_field SET vtiger_fieldlabel='Billing Country' WHERE vtiger_tabid=6 and vtiger_tablename='accountbillads' and vtiger_fieldname='bill_country'",
-
-		"UPDATE vtiger_field SET vtiger_fieldlabel='Shipping City' WHERE vtiger_tabid=6 and vtiger_tablename='accountshipads' and vtiger_fieldname='ship_city'",
-		"UPDATE vtiger_field SET vtiger_fieldlabel='Shipping Country' WHERE vtiger_tabid=6 and vtiger_tablename='accountshipads' and vtiger_fieldname='ship_country'",
-		"UPDATE vtiger_field SET vtiger_fieldlabel='Shipping State' WHERE vtiger_tabid=6 and vtiger_tablename='accountshipads' and vtiger_fieldname='ship_state'",
-		"UPDATE vtiger_field SET vtiger_fieldlabel='Shipping Code' WHERE vtiger_tabid=6 and vtiger_tablename='accountshipads' and vtiger_fieldname='ship_code'",
-
-		"UPDATE vtiger_field SET vtiger_fieldlabel='Mailing City' WHERE vtiger_tabid=4 and vtiger_tablename='contactaddress' and vtiger_fieldname='mailingcity'",
-		"UPDATE vtiger_field SET vtiger_fieldlabel='Mailing State' WHERE vtiger_tabid=4 and vtiger_tablename='contactaddress' and vtiger_fieldname='mailingstate'",
-		"UPDATE vtiger_field SET vtiger_fieldlabel='Mailing Zip' WHERE vtiger_tabid=4 and vtiger_tablename='contactaddress' and vtiger_fieldname='mailingzip'",
-		"UPDATE vtiger_field SET vtiger_fieldlabel='Mailing Country' WHERE vtiger_tabid=4 and vtiger_tablename='contactaddress' and vtiger_fieldname='mailingcountry'",
-
-		"UPDATE vtiger_field SET vtiger_fieldlabel='Other City' WHERE vtiger_tabid=4 and vtiger_tablename='contactaddress' and vtiger_fieldname='othercity'",
-		"UPDATE vtiger_field SET vtiger_fieldlabel='Other State' WHERE vtiger_tabid=4 and vtiger_tablename='contactaddress' and vtiger_fieldname='otherstate'",
-		"UPDATE vtiger_field SET vtiger_fieldlabel='Other Zip' WHERE vtiger_tabid=4 and vtiger_tablename='contactaddress' and vtiger_fieldname='otherzip'",
-		"UPDATE vtiger_field SET vtiger_fieldlabel='Other Country' WHERE vtiger_tabid=4 and vtiger_tablename='contactaddress' and vtiger_fieldname='othercountry'",
+		"UPDATE vtiger_field SET fieldlabel='Billing City' WHERE tabid=6 and tablename='accountbillads' and fieldname='bill_city'",
+		"UPDATE vtiger_field SET fieldlabel='Billing State' WHERE tabid=6 and tablename='accountbillads' and fieldname='bill_state'",
+		"UPDATE vtiger_field SET fieldlabel='Billing Code' WHERE tabid=6 and tablename='accountbillads' and fieldname='bill_code'",
+		"UPDATE vtiger_field SET fieldlabel='Billing Country' WHERE tabid=6 and tablename='accountbillads' and fieldname='bill_country'",
+
+		"UPDATE vtiger_field SET fieldlabel='Shipping City' WHERE tabid=6 and tablename='accountshipads' and fieldname='ship_city'",
+		"UPDATE vtiger_field SET fieldlabel='Shipping Country' WHERE tabid=6 and tablename='accountshipads' and fieldname='ship_country'",
+		"UPDATE vtiger_field SET fieldlabel='Shipping State' WHERE tabid=6 and tablename='accountshipads' and fieldname='ship_state'",
+		"UPDATE vtiger_field SET fieldlabel='Shipping Code' WHERE tabid=6 and tablename='accountshipads' and fieldname='ship_code'",
+
+		"UPDATE vtiger_field SET fieldlabel='Mailing City' WHERE tabid=4 and tablename='contactaddress' and fieldname='mailingcity'",
+		"UPDATE vtiger_field SET fieldlabel='Mailing State' WHERE tabid=4 and tablename='contactaddress' and fieldname='mailingstate'",
+		"UPDATE vtiger_field SET fieldlabel='Mailing Zip' WHERE tabid=4 and tablename='contactaddress' and fieldname='mailingzip'",
+		"UPDATE vtiger_field SET fieldlabel='Mailing Country' WHERE tabid=4 and tablename='contactaddress' and fieldname='mailingcountry'",
+
+		"UPDATE vtiger_field SET fieldlabel='Other City' WHERE tabid=4 and tablename='contactaddress' and fieldname='othercity'",
+		"UPDATE vtiger_field SET fieldlabel='Other State' WHERE tabid=4 and tablename='contactaddress' and fieldname='otherstate'",
+		"UPDATE vtiger_field SET fieldlabel='Other Zip' WHERE tabid=4 and tablename='contactaddress' and fieldname='otherzip'",
+		"UPDATE vtiger_field SET fieldlabel='Other Country' WHERE tabid=4 and tablename='contactaddress' and fieldname='othercountry'",
 		);
 foreach($update_array2 as $query)
 {
@@ -307,22 +307,22 @@
 }
 
 
-//Added vtiger_field emailoptout in vtiger_account vtiger_table
+//Added vtiger_field emailoptout in vtiger_account table
 $newfieldid = $conn->getUniqueID("field");
 $insert_query3 = "insert into vtiger_field values (6,".$newfieldid.",'emailoptout','account',1,'56','emailoptout','Email Opt Out',1,0,0,100,17,1,1,'C~O',1,'')";
 Execute($insert_query3);
 
-//Added on 23-12-2005 because we must populate vtiger_field entries in vtiger_profile2field and vtiger_def_org_field if we add a vtiger_field in vtiger_field vtiger_table
+//Added on 23-12-2005 because we must populate vtiger_field entries in vtiger_profile2field and vtiger_def_org_field if we add a vtiger_field in vtiger_field table
 populateFieldForSecurity('6',$newfieldid);
 
 //Added on 22-12-2005
-$alter_query4 = "alter vtiger_table vtiger_account add column emailoptout varchar(3) default 0";
+$alter_query4 = "alter table vtiger_account add column emailoptout varchar(3) default 0";
 Execute($alter_query4);
 
 $update_array3 = Array(
-		"update vtiger_field set sequence=18 where vtiger_tabid=6 and vtiger_fieldname ='assigned_user_id'",
-		"update vtiger_field set sequence=19 where vtiger_tabid=6 and vtiger_fieldname ='createdtime'",
-		"update vtiger_field set sequence=19 where vtiger_tabid=6 and vtiger_fieldname ='modifiedtime'",
+		"update vtiger_field set sequence=18 where tabid=6 and fieldname ='assigned_user_id'",
+		"update vtiger_field set sequence=19 where tabid=6 and fieldname ='createdtime'",
+		"update vtiger_field set sequence=19 where tabid=6 and fieldname ='modifiedtime'",
 		);
 foreach($update_array3 as $query)
 {
@@ -330,8 +330,8 @@
 }
 
 
-//create vtiger_table vtiger_moduleowners to assign the module and corresponding owners
-$create_query2 = "CREATE TABLE `moduleowners` (
+//create table vtiger_moduleowners to assign the module and corresponding owners
+$create_query2 = "CREATE TABLE vtiger_moduleowners (
 	  `tabid` int(19) NOT NULL default '0',
 	    `user_id` varchar(11) NOT NULL,
 	      PRIMARY KEY  (`tabid`),
@@ -339,7 +339,7 @@
 	) ENGINE=InnoDB";
 
 /*
-$create_query2 = "CREATE TABLE `moduleowners` 
+$create_query2 = "CREATE TABLE vtiger_moduleowners 
 (
  `tabid` int(19) NOT NULL default '0',
  `user_id` varchar(11) NOT NULL default '',
@@ -378,11 +378,11 @@
 
 //Changes made to include status vtiger_field in Activity Quickcreate Form
 $update_array4 = Array(
-		"UPDATE vtiger_field SET quickcreate=0,quickcreatesequence=3 WHERE vtiger_tabid=16 and vtiger_fieldname='eventstatus'",
-		"UPDATE vtiger_field SET quickcreate=0,quickcreatesequence=4 WHERE vtiger_tabid=16 and vtiger_fieldname='activitytype'",
-		"UPDATE vtiger_field SET quickcreate=0,quickcreatesequence=5 WHERE vtiger_tabid=16 and vtiger_fieldname='duration_hours'",
-
-		"UPDATE vtiger_field SET quickcreate=0,quickcreatesequence=3 WHERE vtiger_tabid=9 and vtiger_fieldname='taskstatus'",
+		"UPDATE vtiger_field SET quickcreate=0,quickcreatesequence=3 WHERE tabid=16 and fieldname='eventstatus'",
+		"UPDATE vtiger_field SET quickcreate=0,quickcreatesequence=4 WHERE tabid=16 and fieldname='activitytype'",
+		"UPDATE vtiger_field SET quickcreate=0,quickcreatesequence=5 WHERE tabid=16 and fieldname='duration_hours'",
+
+		"UPDATE vtiger_field SET quickcreate=0,quickcreatesequence=3 WHERE tabid=9 and fieldname='taskstatus'",
 		);
 foreach($update_array4 as $query)
 {
@@ -415,13 +415,13 @@
 Execute($query1);
 
 $rename_table_array1 = Array(
-		"update vtiger_field set vtiger_tablename='customerdetails' where vtiger_tabid=4 and vtiger_fieldname in ('portal','support_start_date','support_end_date')",
-		"alter vtiger_table PortalInfo drop foreign key fk_PortalInfo",
-		"rename vtiger_table PortalInfo to vtiger_portalinfo",
-		"alter vtiger_table vtiger_portalinfo add CONSTRAINT `fk_portalinfo` FOREIGN KEY (`id`) REFERENCES `contactdetails` (`contactid`) ON DELETE CASCADE",
-		"alter vtiger_table CustomerDetails drop foreign key fk_CustomerDetails",
-		"rename vtiger_table CustomerDetails to vtiger_customerdetails",
-		"alter vtiger_table vtiger_customerdetails add CONSTRAINT `fk_customerdetails` FOREIGN KEY (`customerid`) REFERENCES `contactdetails` (`contactid`) ON DELETE CASCADE"
+		"update vtiger_field set tablename='customerdetails' where tabid=4 and fieldname in ('portal','support_start_date','support_end_date')",
+		"alter table vtiger_PortalInfo drop foreign key fk_PortalInfo",
+		"rename table vtiger_PortalInfo to vtiger_portalinfo",
+		"alter table vtiger_portalinfo add CONSTRAINT `fk_portalinfo` FOREIGN KEY (`id`) REFERENCES `contactdetails` (`contactid`) ON DELETE CASCADE",
+		"alter table vtiger_CustomerDetails drop foreign key fk_CustomerDetails",
+		"rename table vtiger_CustomerDetails to vtiger_customerdetails",
+		"alter table vtiger_customerdetails add CONSTRAINT `fk_customerdetails` FOREIGN KEY (`customerid`) REFERENCES `contactdetails` (`contactid`) ON DELETE CASCADE"
 		);
 foreach($rename_table_array1 as $query)
 {
@@ -429,7 +429,7 @@
 }
 
 
-$query2 = "create vtiger_table vtiger_ownernotify(crmid int(19),smownerid int(19),flag int(3))";
+$query2 = "create table vtiger_ownernotify(crmid int(19),smownerid int(19),flag int(3))";
 Execute($query2);
 
 
@@ -445,7 +445,7 @@
 }
 //echo '<pre> List of vtiger_roles :';print_r($role_map_array);echo '</pre>';
 
-//Before delete the vtiger_role take a backup array for the vtiger_table vtiger_user2role
+//Before delete the vtiger_role take a backup array for the table vtiger_user2role
 $sql = "select * from vtiger_user2role";
 $res = $conn->query($sql);
 $user2role_array = array();
@@ -462,16 +462,16 @@
 Execute($sql);
 
 
-$query3 = "alter vtiger_table vtiger_user2role drop FOREIGN KEY fk_user2role2";
+$query3 = "alter table vtiger_user2role drop FOREIGN KEY fk_user2role2";
 Execute($query3);
 
 //4,5 th are the Extra added queries
 $alter_query_array1 = Array(
-		"alter vtiger_table vtiger_user2role change vtiger_roleid vtiger_roleid varchar(255)",
-		"alter vtiger_table vtiger_role2profile change vtiger_roleid vtiger_roleid varchar(255)",
-		"alter vtiger_table vtiger_role CHANGE vtiger_roleid vtiger_roleid varchar(255)",
-		"alter vtiger_table vtiger_role2profile drop PRIMARY KEY",
-		"alter vtiger_table vtiger_role2profile ADD PRIMARY KEY (roleid,profileid)"
+		"alter table vtiger_user2role change roleid roleid varchar(255)",
+		"alter table vtiger_role2profile change roleid roleid varchar(255)",
+		"alter table vtiger_role CHANGE roleid roleid varchar(255)",
+		"alter table vtiger_role2profile drop PRIMARY KEY",
+		"alter table vtiger_role2profile ADD PRIMARY KEY (roleid,profileid)"
 		);
 foreach($alter_query_array1 as $query)
 {
@@ -483,10 +483,10 @@
 Execute($query4);
 
 $alter_query_array2 = Array(
-		"alter vtiger_table vtiger_role CHANGE name vtiger_rolename varchar(200)",
-		"alter vtiger_table vtiger_role DROP description",
-		"alter vtiger_table vtiger_role add parentrole varchar(255)",
-		"alter vtiger_table vtiger_role add depth int(19)"
+		"alter table vtiger_role CHANGE name rolename varchar(200)",
+		"alter table vtiger_role DROP description",
+		"alter table vtiger_role add parentrole varchar(255)",
+		"alter table vtiger_role add depth int(19)"
 		);
 foreach($alter_query_array2 as $query)
 {
@@ -505,7 +505,7 @@
 	$parentRole = 'H1';
 	if($rolename == 'standard_user')
 	{
-		$rs = $conn->query("select * from vtiger_role where vtiger_rolename='administrator'");
+		$rs = $conn->query("select * from vtiger_role where rolename='administrator'");
 		$parentRole = $conn->query_result($rs,0,'roleid');
 	}
 	$empty_array = array(""=>"");
@@ -517,14 +517,14 @@
 $user2role_del = "truncate vtiger_user2role";
 Execute($user2role_del);
 
-//First we will insert the old values from vtiger_user2role_array to vtiger_user2role vtiger_table and then update the new vtiger_role id
+//First we will insert the old values from vtiger_user2role_array to vtiger_user2role table and then update the new vtiger_role id
 foreach($user2role_array as $userid => $roleid)
 {
-	$sql = "insert into vtiger_user2role (userid, vtiger_roleid) values(".$userid.",'".$new_role_map_array[$roleid]."')";
+	$sql = "insert into vtiger_user2role (userid, roleid) values(".$userid.",'".$new_role_map_array[$roleid]."')";
 	Execute($sql);
 }
 //Commented the following loop as we have backup the vtiger_user2role and insert the entries with the new rold id using new_role_map_array above
-//Update the vtiger_user2role vtiger_table with new vtiger_roleid
+//Update the vtiger_user2role table with new vtiger_roleid
 /*
    foreach($new_role_map_array as $old_roleid => $new_roleid)
    {
@@ -532,21 +532,21 @@
    Execute($update_user2role);
    }
  */
-//Update the vtiger_role2profile vtiger_table with new vtiger_roleid
+//Update the vtiger_role2profile table with new vtiger_roleid
 foreach($new_role_map_array as $old_roleid => $new_roleid)
 {
-	$update_role2profile = "update vtiger_role2profile set vtiger_roleid='".$new_roleid."' where vtiger_roleid=".$old_roleid;
+	$update_role2profile = "update vtiger_role2profile set roleid='".$new_roleid."' where roleid=".$old_roleid;
 	Execute($update_role2profile);
 }
 
 
 
 //Group Migration:
-//Step 1 :  form and group_map_array as groupname => description from vtiger_groups vtiger_table
-//Step 2 :  form an vtiger_users2group_map_array array as userid => groupname from vtiger_users2group vtiger_table
-//Step 3 :  delete all entries from vtiger_groups vtiger_table and enter new values from group_map_array
-//Step 4 :  drop the vtiger_table vtiger_users2group and create new vtiger_table
-//Step 5 :  put entries to vtiger_users2group vtiger_table based on vtiger_users2group_map_array. Here get the groupid from vtiger_groups vtiger_table based on groupname
+//Step 1 :  form and group_map_array as groupname => description from vtiger_groups table
+//Step 2 :  form an vtiger_users2group_map_array array as userid => groupname from vtiger_users2group table
+//Step 3 :  delete all entries from vtiger_groups table and enter new values from group_map_array
+//Step 4 :  drop the table vtiger_users2group and create new table
+//Step 5 :  put entries to vtiger_users2group table based on vtiger_users2group_map_array. Here get the groupid from vtiger_groups table based on groupname
 
 //Step 1 : Form the group_map_array as groupname => description
 $sql = "select * from vtiger_groups";
@@ -561,7 +561,7 @@
 //echo '<pre>List of Groups : ';print_r($group_map_array);echo '</pre>';
 
 
-//Step 2 : form an vtiger_users2group_map_array array as userid => groupname from vtiger_users2group vtiger_table
+//Step 2 : form an vtiger_users2group_map_array array as userid => groupname from vtiger_users2group table
 $sql = "select * from vtiger_users2group";
 $res = $conn->query($sql);
 $users2group_map_array = Array();
@@ -573,16 +573,16 @@
 }
 //echo '<pre>List of vtiger_users2group : ';print_r($users2group_map_array);echo '</pre>';
 
-//Step 3 : delete all entries from vtiger_groups vtiger_table
+//Step 3 : delete all entries from vtiger_groups table
 $sql = "truncate vtiger_groups";
 Execute($sql);
 
 $alter_query_array3 = Array(
-		"alter vtiger_table vtiger_users2group drop FOREIGN KEY fk_users2group",
-		"alter vtiger_table vtiger_leadgrouprelation drop FOREIGN KEY fk_leadgrouprelation2",
-		"alter vtiger_table vtiger_activitygrouprelation drop FOREIGN KEY fk_activitygrouprelation2",
-		"alter vtiger_table vtiger_ticketgrouprelation drop FOREIGN KEY fk_ticketgrouprelation2",
-		"alter vtiger_table vtiger_groups drop PRIMARY KEY"
+		"alter table vtiger_users2group drop FOREIGN KEY fk_users2group",
+		"alter table vtiger_leadgrouprelation drop FOREIGN KEY fk_leadgrouprelation2",
+		"alter table vtiger_activitygrouprelation drop FOREIGN KEY fk_activitygrouprelation2",
+		"alter table vtiger_ticketgrouprelation drop FOREIGN KEY fk_ticketgrouprelation2",
+		"alter table vtiger_groups drop PRIMARY KEY"
 		);
 foreach($alter_query_array3 as $query)
 {
@@ -590,12 +590,12 @@
 }
 
 //2 nd query is the Extra added query
-//Adding columns in group vtiger_table:
+//Adding columns in group table:
 $alter_query_array4 = Array(
-		"alter vtiger_table vtiger_groups add column groupid int(19) FIRST",
-		"alter vtiger_table vtiger_groups change name  groupname varchar(100)",
-		"alter vtiger_table vtiger_groups ADD PRIMARY KEY (groupid)",
-		"alter vtiger_table vtiger_groups add index (groupname)"
+		"alter table vtiger_groups add column groupid int(19) FIRST",
+		"alter table vtiger_groups change name  groupname varchar(100)",
+		"alter table vtiger_groups ADD PRIMARY KEY (groupid)",
+		"alter table vtiger_groups add index (groupname)"
 		);
 foreach($alter_query_array4 as $query)
 {
@@ -603,15 +603,15 @@
 }
 
 
-//Moved the create vtiger_table queries for vtiger_group2grouprel, vtiger_group2role, vtiger_group2rs from the end of this block
+//Moved the create table queries for vtiger_group2grouprel, vtiger_group2role, vtiger_group2rs from the end of this block
 //Added on 06-06-06
-$query8 = "CREATE TABLE `group2grouprel` (
+$query8 = "CREATE TABLE vtiger_group2grouprel (
 	  `groupid` int(19) NOT NULL,
 	    `containsgroupid` int(19) NOT NULL,
 	      PRIMARY KEY  (`groupid`,`containsgroupid`)
       ) ENGINE=InnoDB";
       /*
-$query8 = "CREATE TABLE `group2grouprel` 
+$query8 = "CREATE TABLE vtiger_group2grouprel 
 (
  `groupid` int(19) NOT NULL default '0',
  `containsgroupid` int(19) NOT NULL default '0',
@@ -622,13 +622,13 @@
 Execute($query8);
 
 //Added on 06-06-06
-$query9 = "CREATE TABLE `group2role` (
+$query9 = "CREATE TABLE vtiger_group2role (
 	  `groupid` int(19) NOT NULL,
 	    `roleid` varchar(255) NOT NULL,
 	      PRIMARY KEY  (`groupid`,`roleid`)
       ) ENGINE=InnoDB";
 /*
-$query9 = "CREATE TABLE `group2role` 
+$query9 = "CREATE TABLE vtiger_group2role 
 (
  `groupid` int(19) NOT NULL default '0',
  `roleid` varchar(255) NOT NULL default '',
@@ -639,13 +639,13 @@
 Execute($query9);
 
 //Added on 06-06-06
-$query10 = "CREATE TABLE `group2rs` (
+$query10 = "CREATE TABLE vtiger_group2rs (
 	  `groupid` int(19) NOT NULL,
 	    `roleandsubid` varchar(255) NOT NULL,
 	      PRIMARY KEY  (`groupid`,`roleandsubid`)
       ) ENGINE=InnoDB";
 /*
-$query10 = "CREATE TABLE `group2rs` 
+$query10 = "CREATE TABLE vtiger_group2rs 
 (
  `groupid` int(19) NOT NULL default '0',
  `roleandsubid` varchar(255) NOT NULL default '',
@@ -655,7 +655,7 @@
 */
 Execute($query10);
 
-//Insert all the retrieved old values to the new vtiger_groups vtiger_table ie., create new vtiger_groups
+//Insert all the retrieved old values to the new vtiger_groups table ie., create new vtiger_groups
 foreach($group_map_array as $groupname => $description)
 {
 	$empty_array = array(
@@ -669,21 +669,21 @@
 }
 
 
-//Copy all mappings in a user2grop vtiger_table in a array;
-
-//Step 4 : Drop and again create vtiger_users2group
-$query6 = "drop vtiger_table vtiger_users2group";
+//Copy all mappings in a user2grop table in a array;
+
+//Step 4 : Drop and again create users2group
+$query6 = "drop table vtiger_users2group";
 Execute($query6);
 
 //Added on 06-06-06
-$query7 = "CREATE TABLE `users2group` (
+$query7 = "CREATE TABLE vtiger_users2group (
 	  `groupid` int(19) NOT NULL,
 	    `userid` int(19) NOT NULL,
 	      PRIMARY KEY  (`groupid`,`userid`),
 	        KEY `users2group_groupname_uerid_idx` (`groupid`,`userid`)
 	) ENGINE=InnoDB";
 /*
-$query7 = "CREATE TABLE `users2group` 
+$query7 = "CREATE TABLE vtiger_users2group 
 (
  `groupid` int(19) NOT NULL default '0',
  `userid` int(19) NOT NULL default '0',
@@ -693,7 +693,7 @@
 */
 Execute($query7);
 
-//Step 5 : put entries to vtiger_users2group vtiger_table based on vtiger_users2group_map_array. Here get the groupid from vtiger_groups vtiger_table based on groupname
+//Step 5 : put entries to vtiger_users2group table based on vtiger_users2group_map_array. Here get the groupid from vtiger_groups table based on groupname
 foreach($users2group_map_array as $userid => $groupname)
 {
 	//$groupid = $conn->query_result($conn->query("select * from vtiger_groups where groupname='".$groupname."'"),0,'groupid');
@@ -703,7 +703,7 @@
 
 
 $alter_query_array5 = Array(
-		"alter vtiger_table vtiger_leadgrouprelation ADD CONSTRAINT fk_leadgrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE",
+		"alter table vtiger_leadgrouprelation ADD CONSTRAINT fk_leadgrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE",
 		"ALTER TABLE vtiger_activitygrouprelation ADD CONSTRAINT fk_activitygrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE",
 		"ALTER TABLE vtiger_ticketgrouprelation ADD CONSTRAINT fk_ticketgrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE"
 		);
@@ -711,10 +711,10 @@
 {
 	Execute($query);
 }
-//Moved the create vtiger_table queries for vtiger_group2grouprel, vtiger_group2role, vtiger_group2rs to before creatinf the Group ie., before call the createGroup
-
-
-/***Added to include decimal places for amount vtiger_field in vtiger_potential vtiger_table  --by Mangai 15-Nov-2005***/
+//Moved the create table queries for vtiger_group2grouprel, vtiger_group2role, vtiger_group2rs to before creatinf the Group ie., before call the createGroup
+
+
+/***Added to include decimal places for amount vtiger_field in vtiger_potential table  --by Mangai 15-Nov-2005***/
 
 $query11 = "ALTER TABLE vtiger_potential change amount amount decimal(10,2)";
 Execute($query11);
@@ -734,21 +734,21 @@
 
 /****************** 5.0(Alpha) dev version 3 Database changes -- Starts*********************/
 
-//Drop the column company_name from vtiger_vendor vtiger_table ---- modified by Mickie on 18-11-2005
-$altersql1 = "alter vtiger_table vtiger_vendor drop column company_name";
+//Drop the column company_name from vtiger_vendor table ---- modified by Mickie on 18-11-2005
+$altersql1 = "alter table vtiger_vendor drop column company_name";
 Execute($altersql1);
-//TODO (check): Remove this company_name entry from the vtiger_field vtiger_table if it already exists
+//TODO (check): Remove this company_name entry from the vtiger_field table if it already exists
 
 //Migration for Default Organisation Share -- Added by Don on 20-11-2005
 
-$query1 = "CREATE TABLE `org_share_action_mapping` (
+$query1 = "CREATE TABLE vtiger_org_share_action_mapping (
 `share_action_id` int(19) NOT NULL default '0',
 	`share_action_name` varchar(200) NOT NULL default '',
 PRIMARY KEY  (`share_action_id`,`share_action_name`)
 	) TYPE=InnoDB ";
 Execute($query1);
 
-$query2 = "CREATE TABLE `org_share_action2tab` (
+$query2 = "CREATE TABLE vtiger_org_share_action2tab (
 	`share_action_id` int(19) NOT NULL default '0',
 	`tabid` int(19) NOT NULL default '0',
 	PRIMARY KEY  (`share_action_id`,`tabid`),
@@ -757,10 +757,10 @@
 Execute($query2);
 
 
-$query3 = "alter vtiger_table vtiger_def_org_share add column editstatus int(19)";
+$query3 = "alter table vtiger_def_org_share add column editstatus int(19)";
 Execute($query3);
 
-$query4 = "delete from vtiger_def_org_share where vtiger_tabid in(8,14,15,18,19)";
+$query4 = "delete from vtiger_def_org_share where tabid in(8,14,15,18,19)";
 Execute($query4);
 
 
@@ -812,9 +812,9 @@
 $query_array1 = Array(
 		"insert into vtiger_def_org_share values(9,17,7,0)",
 		"update vtiger_def_org_share set editstatus=0",
-		"update vtiger_def_org_share set editstatus=2 where vtiger_tabid=4",
-		"update vtiger_def_org_share set editstatus=1 where vtiger_tabid=9",
-		"update vtiger_def_org_share set editstatus=2 where vtiger_tabid=16"
+		"update vtiger_def_org_share set editstatus=2 where tabid=4",
+		"update vtiger_def_org_share set editstatus=1 where tabid=9",
+		"update vtiger_def_org_share set editstatus=2 where tabid=16"
 		);
 foreach($query_array1 as $query)
 {
@@ -828,7 +828,7 @@
 $conn->println("Database Modifications for 5.0(Alpha) Dev 3 ==> 5.0 Alpha starts here.");
 //echo "<br><br><b>Database Modifications for 5.0(Alpha) Dev3 ==> 5.0 Alpha starts here.....</b><br>";
 $alter_query_array6 = Array(
-				"ALTER TABLE vtiger_users ADD column vtiger_activity_view VARCHAR(25) DEFAULT 'Today' AFTER homeorder",
+				"ALTER TABLE vtiger_users ADD column activity_view VARCHAR(25) DEFAULT 'Today' AFTER homeorder",
 				"ALTER TABLE vtiger_activity ADD column notime CHAR(3) DEFAULT '0' AFTER location"
 			   );
 foreach($alter_query_array6 as $query)
@@ -846,20 +846,20 @@
 }
 
 $alter_query_array7 = Array(
-				"alter vtiger_table vtiger_vendor add column pobox varchar(30) after state",
-				"alter vtiger_table vtiger_leadaddress add column pobox varchar(30) after state",
-				"alter vtiger_table vtiger_accountbillads add column pobox varchar(30) after state",
-				"alter vtiger_table vtiger_accountshipads add column pobox varchar(30) after state",
-				"alter vtiger_table vtiger_contactaddress add column mailingpobox varchar(30) after mailingstate",
-				"alter vtiger_table vtiger_contactaddress add column otherpobox varchar(30) after otherstate",
-				"alter vtiger_table vtiger_quotesbillads add column bill_pobox varchar(30) after bill_street",
-				"alter vtiger_table vtiger_quotesshipads add column ship_pobox varchar(30) after ship_street",
-				"alter vtiger_table vtiger_pobillads add column bill_pobox varchar(30) after bill_street",
-				"alter vtiger_table vtiger_poshipads add column ship_pobox varchar(30) after ship_street",
-				"alter vtiger_table vtiger_sobillads add column bill_pobox varchar(30) after bill_street",
-				"alter vtiger_table vtiger_soshipads add column ship_pobox varchar(30) after ship_street",
-				"alter vtiger_table vtiger_invoicebillads add column bill_pobox varchar(30) after bill_street",
-				"alter vtiger_table vtiger_invoiceshipads add column ship_pobox varchar(30) after ship_street"
+				"alter table vtiger_vendor add column pobox varchar(30) after state",
+				"alter table vtiger_leadaddress add column pobox varchar(30) after state",
+				"alter table vtiger_accountbillads add column pobox varchar(30) after state",
+				"alter table vtiger_accountshipads add column pobox varchar(30) after state",
+				"alter table vtiger_contactaddress add column mailingpobox varchar(30) after mailingstate",
+				"alter table vtiger_contactaddress add column otherpobox varchar(30) after otherstate",
+				"alter table vtiger_quotesbillads add column bill_pobox varchar(30) after bill_street",
+				"alter table vtiger_quotesshipads add column ship_pobox varchar(30) after ship_street",
+				"alter table vtiger_pobillads add column bill_pobox varchar(30) after bill_street",
+				"alter table vtiger_poshipads add column ship_pobox varchar(30) after ship_street",
+				"alter table vtiger_sobillads add column bill_pobox varchar(30) after bill_street",
+				"alter table vtiger_soshipads add column ship_pobox varchar(30) after ship_street",
+				"alter table vtiger_invoicebillads add column bill_pobox varchar(30) after bill_street",
+				"alter table vtiger_invoiceshipads add column ship_pobox varchar(30) after ship_street"
 			   );
 foreach($alter_query_array7 as $query)
 {
@@ -906,7 +906,7 @@
 	$n = $n+5;
 	for($i = 0;$i < 5;$i++)
 	{
-		$query1 = "update vtiger_field set sequence=".$sequence[$j]." where vtiger_tablename='".$tablename[$n+$i]."' && vtiger_fieldname='".$fieldname[$j]."'";
+		$query1 = "update vtiger_field set sequence=".$sequence[$j]." where tablename='".$tablename[$n+$i]."' && fieldname='".$fieldname[$j]."'";
 		Execute($query1);
 	}
 }
@@ -916,7 +916,7 @@
 $sequence = array(3,4,5,6);
 for($i = 0;$i < 4;$i++)
 {
-	$query2 = "update vtiger_field set sequence=".$sequence[$i]." where vtiger_tablename='".$tablename."' && vtiger_fieldname='".$fieldname[$i]."'";
+	$query2 = "update vtiger_field set sequence=".$sequence[$i]." where tablename='".$tablename."' && fieldname='".$fieldname[$i]."'";
 	Execute($query2);
 }
 
@@ -926,7 +926,7 @@
 
 for($i = 0;$i < 4;$i++)
 {
-	$query3 = "update vtiger_field set sequence=".$sequence[$i]." where vtiger_tablename='".$tablename."' && vtiger_fieldname='".$fieldname[$i]."'";
+	$query3 = "update vtiger_field set sequence=".$sequence[$i]." where tablename='".$tablename."' && fieldname='".$fieldname[$i]."'";
 	Execute($query3);
 }
 
@@ -936,20 +936,20 @@
 
 for($i = 0;$i < 8;$i++)
 {
-	$query = "update vtiger_field set sequence=".$sequence[$i]." where vtiger_tablename='".$tablename."' && vtiger_fieldname='".$fieldname[$i]."'";
+	$query = "update vtiger_field set sequence=".$sequence[$i]." where tablename='".$tablename."' && fieldname='".$fieldname[$i]."'";
 	Execute($query);
 }
 
 $query_array1 = Array(
-			"update vtiger_field set vtiger_tablename='crmentity' where vtiger_tabid=10 and vtiger_fieldname='description'",
-			"update vtiger_field set vtiger_tablename='attachments' where vtiger_tabid=10 and vtiger_fieldname='filename'",
-			"drop vtiger_table emails",
-
-			"alter vtiger_table vtiger_activity drop column description",
-			"update vtiger_field set vtiger_tablename='crmentity' where vtiger_tabid in (9,16) and vtiger_fieldname='description'",
-
-			"update vtiger_tab set name='PurchaseOrder',tablabel='PurchaseOrder' where vtiger_tabid=21",
-			"update vtiger_tab set presence=0 where vtiger_tabid=22 and name='SalesOrder'",
+			"update vtiger_field set tablename='crmentity' where tabid=10 and fieldname='description'",
+			"update vtiger_field set tablename='attachments' where tabid=10 and fieldname='filename'",
+			"drop table emails",
+
+			"alter table vtiger_activity drop column description",
+			"update vtiger_field set tablename='crmentity' where tabid in (9,16) and fieldname='description'",
+
+			"update vtiger_tab set name='PurchaseOrder',tablabel='PurchaseOrder' where tabid=21",
+			"update vtiger_tab set presence=0 where tabid=22 and name='SalesOrder'",
 
 			"delete from vtiger_actionmapping where actionname='SalesOrderDetailView'",
 			"delete from vtiger_actionmapping where actionname='SalesOrderEditView'",
@@ -958,16 +958,16 @@
 
 			"insert into vtiger_field values (13,".$conn->getUniqueID("field").",'filename','attachments',1,'61','filename','Attachment',1,0,0,100,12,2,1,'V~O',0,1)",
 
-			"alter vtiger_table vtiger_troubletickets add column filename varchar(50) default NULL after title"
+			"alter table vtiger_troubletickets add column filename varchar(50) default NULL after title"
 		     );
 foreach($query_array1 as $query)
 {
 	Execute($query);
 }
 
-$create_query3 = "create vtiger_table vtiger_parenttab(parenttabid int(19) not null, vtiger_parenttab_label varchar(100) not null, sequence int(10) not null, visible int(2) not null default '0', Primary Key(parenttabid))";
+$create_query3 = "create table vtiger_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 vtiger_table vtiger_parenttabrel(parenttabid int(3) not null, vtiger_tabid int(3) not null,sequence int(3) not null)";
+$create_query4 = "create table vtiger_parenttabrel(parenttabid int(3) not null, tabid int(3) not null,sequence int(3) not null)";
 Execute($create_query4);
 
 $insert_query_array4 = Array(
@@ -980,100 +980,100 @@
 }
 
 
-$create_query5 = "CREATE TABLE vtiger_blocks ( blockid int(19) NOT NULL, vtiger_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))";
+$create_query5 = "CREATE TABLE vtiger_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 vtiger_field set block=2 where vtiger_tabid=2 and block=5",
-				"update vtiger_field set block=3 where vtiger_tabid=2 and block=2",
-
-				//"update vtiger_field set block=4 where vtiger_tabid=4 and block=1",
-				"update vtiger_field set block=5 where vtiger_tabid=4 and block=5",
-				"update vtiger_field set block=6 where vtiger_tabid=4 and block=4",//Modified on 24-04-06
-				"update vtiger_field set block=4 where vtiger_tabid=4 and block=1",
-				"update vtiger_field set block=7 where vtiger_tabid=4 and block=2",
-				"update vtiger_field set block=8 where vtiger_tabid=4 and block=3",
-
-				"update vtiger_field set block=9 where vtiger_tabid=6 and block=1",
-				"update vtiger_field set block=10 where vtiger_tabid=6 and block=5",
-				"update vtiger_field set block=11 where vtiger_tabid=6 and block=2",
-				"update vtiger_field set block=12 where vtiger_tabid=6 and block=3",
-
-				"update vtiger_field set block=13 where vtiger_tabid=7 and block=1",
-				"update vtiger_field set block=14 where vtiger_tabid=7 and block=5",
-				"update vtiger_field set block=15 where vtiger_tabid=7 and block=2",
-				"update vtiger_field set block=16 where vtiger_tabid=7 and block=3",
-
-				"update vtiger_field set block=17 where vtiger_tabid=8 and block=1",
-				"update vtiger_field set block=17 where vtiger_tabid=8 and block=2",
-				"update vtiger_field set block=18 where vtiger_tabid=8 and block=3",
-
-				"update vtiger_field set block=19 where vtiger_tabid=9 and block=1",
-				"update vtiger_field set block=19 where vtiger_tabid=9 and block=7",
-				"update vtiger_field set block=20 where vtiger_tabid=9 and block=2",
-
-				"update vtiger_field set block=21 where vtiger_tabid=10 and block=1",
-				"update vtiger_field set block=22 where vtiger_tabid=10 and block=2",
-				"update vtiger_field set block=23 where vtiger_tabid=10 and block=3",
-				"update vtiger_field set block=23 where vtiger_tabid=10 and block=4",
-				"update vtiger_field set block=24 where vtiger_tabid=10 and block=5",
-
-				"update vtiger_field set block=25 where vtiger_tabid=13 and block=1",
-				"update vtiger_field set block=26 where vtiger_tabid=13 and block=2",
-				"update vtiger_field set block=27 where vtiger_tabid=13 and block=5",
-				"update vtiger_field set block=28 where vtiger_tabid=13 and block=3",
-				"update vtiger_field set block=29 where vtiger_tabid=13 and block=4",
-				"update vtiger_field set block=30 where vtiger_tabid=13 and block=6",
-
-				"update vtiger_field set block=31 where vtiger_tabid=14 and block=1",
-				"update vtiger_field set block=32 where vtiger_tabid=14 and block=2",
-				"update vtiger_field set block=33 where vtiger_tabid=14 and block=3",
-				"update vtiger_field set block=34 where vtiger_tabid=14 and block=5",
-				"update vtiger_field set block=35 where vtiger_tabid=14 and block=6",
-				"update vtiger_field set block=36 where vtiger_tabid=14 and block=4",
-
-				"update vtiger_field set block=37 where vtiger_tabid=15 and block=1",
-				"update vtiger_field set block=38 where vtiger_tabid=15 and block=2",
-				"update vtiger_field set block=39 where vtiger_tabid=15 and block=3",
-				"update vtiger_field set block=40 where vtiger_tabid=15 and block=4",
-
-				"update vtiger_field set block=41 where vtiger_tabid=16 and block=1",
-				"update vtiger_field set block=42 where vtiger_tabid=16 and block=7",
-				"update vtiger_field set block=43 where vtiger_tabid=16 and block=2",
-
-				"update vtiger_field set block=44 where vtiger_tabid=18 and block=1",
-				"update vtiger_field set block=45 where vtiger_tabid=18 and block=5",
-				"update vtiger_field set block=36 where vtiger_tabid=18 and block=2",
-				"update vtiger_field set block=47 where vtiger_tabid=18 and block=3",
-
-				"update vtiger_field set block=48 where vtiger_tabid=19 and block=1",
-				"update vtiger_field set block=49 where vtiger_tabid=19 and block=5",
-				"update vtiger_field set block=50 where vtiger_tabid=19 and block=2",
-
-				"update vtiger_field set block=51 where vtiger_tabid=20 and block=1",
-				"update vtiger_field set block=52 where vtiger_tabid=20 and block=5",
-				"update vtiger_field set block=53 where vtiger_tabid=20 and block=2",
-				"update vtiger_field set block=55 where vtiger_tabid=20 and block=6",
-				"update vtiger_field set block=56 where vtiger_tabid=20 and block=3",
-
-				"update vtiger_field set block=57 where vtiger_tabid=21 and block=1",
-				"update vtiger_field set block=58 where vtiger_tabid=21 and block=5",
-				"update vtiger_field set block=59 where vtiger_tabid=21 and block=2",
-				"update vtiger_field set block=61 where vtiger_tabid=21 and block=6",
-				"update vtiger_field set block=62 where vtiger_tabid=21 and block=3",
-
-				"update vtiger_field set block=63 where vtiger_tabid=22 and block=1",
-				"update vtiger_field set block=64 where vtiger_tabid=22 and block=5",
-				"update vtiger_field set block=65 where vtiger_tabid=22 and block=2",
-				"update vtiger_field set block=67 where vtiger_tabid=22 and block=6",
-				"update vtiger_field set block=68 where vtiger_tabid=22 and block=3",
-
-
-				"update vtiger_field set block=69 where vtiger_tabid=23 and block=1",
-				"update vtiger_field set block=70 where vtiger_tabid=23 and block=5",
-				"update vtiger_field set block=71 where vtiger_tabid=23 and block=2",
-				"update vtiger_field set block=73 where vtiger_tabid=23 and block=6",
-				"update vtiger_field set block=74 where vtiger_tabid=23 and block=3",
+				"update vtiger_field set block=2 where tabid=2 and block=5",
+				"update vtiger_field set block=3 where tabid=2 and block=2",
+
+				//"update vtiger_field set block=4 where tabid=4 and block=1",
+				"update vtiger_field set block=5 where tabid=4 and block=5",
+				"update vtiger_field set block=6 where tabid=4 and block=4",//Modified on 24-04-06
+				"update vtiger_field set block=4 where tabid=4 and block=1",
+				"update vtiger_field set block=7 where tabid=4 and block=2",
+				"update vtiger_field set block=8 where tabid=4 and block=3",
+
+				"update vtiger_field set block=9 where tabid=6 and block=1",
+				"update vtiger_field set block=10 where tabid=6 and block=5",
+				"update vtiger_field set block=11 where tabid=6 and block=2",
+				"update vtiger_field set block=12 where tabid=6 and block=3",
+
+				"update vtiger_field set block=13 where tabid=7 and block=1",
+				"update vtiger_field set block=14 where tabid=7 and block=5",
+				"update vtiger_field set block=15 where tabid=7 and block=2",
+				"update vtiger_field set block=16 where tabid=7 and block=3",
+
+				"update vtiger_field set block=17 where tabid=8 and block=1",
+				"update vtiger_field set block=17 where tabid=8 and block=2",
+				"update vtiger_field set block=18 where tabid=8 and block=3",
+
+				"update vtiger_field set block=19 where tabid=9 and block=1",
+				"update vtiger_field set block=19 where tabid=9 and block=7",
+				"update vtiger_field set block=20 where tabid=9 and block=2",
+
+				"update vtiger_field set block=21 where tabid=10 and block=1",
+				"update vtiger_field set block=22 where tabid=10 and block=2",
+				"update vtiger_field set block=23 where tabid=10 and block=3",
+				"update vtiger_field set block=23 where tabid=10 and block=4",
+				"update vtiger_field set block=24 where tabid=10 and block=5",
+
+				"update vtiger_field set block=25 where tabid=13 and block=1",
+				"update vtiger_field set block=26 where tabid=13 and block=2",
+				"update vtiger_field set block=27 where tabid=13 and block=5",
+				"update vtiger_field set block=28 where tabid=13 and block=3",
+				"update vtiger_field set block=29 where tabid=13 and block=4",
+				"update vtiger_field set block=30 where tabid=13 and block=6",
+
+				"update vtiger_field set block=31 where tabid=14 and block=1",
+				"update vtiger_field set block=32 where tabid=14 and block=2",
+				"update vtiger_field set block=33 where tabid=14 and block=3",
+				"update vtiger_field set block=34 where tabid=14 and block=5",
+				"update vtiger_field set block=35 where tabid=14 and block=6",
+				"update vtiger_field set block=36 where tabid=14 and block=4",
+
+				"update vtiger_field set block=37 where tabid=15 and block=1",
+				"update vtiger_field set block=38 where tabid=15 and block=2",
+				"update vtiger_field set block=39 where tabid=15 and block=3",
+				"update vtiger_field set block=40 where tabid=15 and block=4",
+
+				"update vtiger_field set block=41 where tabid=16 and block=1",
+				"update vtiger_field set block=42 where tabid=16 and block=7",
+				"update vtiger_field set block=43 where tabid=16 and block=2",
+
+				"update vtiger_field set block=44 where tabid=18 and block=1",
+				"update vtiger_field set block=45 where tabid=18 and block=5",
+				"update vtiger_field set block=36 where tabid=18 and block=2",
+				"update vtiger_field set block=47 where tabid=18 and block=3",
+
+				"update vtiger_field set block=48 where tabid=19 and block=1",
+				"update vtiger_field set block=49 where tabid=19 and block=5",
+				"update vtiger_field set block=50 where tabid=19 and block=2",
+
+				"update vtiger_field set block=51 where tabid=20 and block=1",
+				"update vtiger_field set block=52 where tabid=20 and block=5",
+				"update vtiger_field set block=53 where tabid=20 and block=2",
+				"update vtiger_field set block=55 where tabid=20 and block=6",
+				"update vtiger_field set block=56 where tabid=20 and block=3",
+
+				"update vtiger_field set block=57 where tabid=21 and block=1",
+				"update vtiger_field set block=58 where tabid=21 and block=5",
+				"update vtiger_field set block=59 where tabid=21 and block=2",
+				"update vtiger_field set block=61 where tabid=21 and block=6",
+				"update vtiger_field set block=62 where tabid=21 and block=3",
+
+				"update vtiger_field set block=63 where tabid=22 and block=1",
+				"update vtiger_field set block=64 where tabid=22 and block=5",
+				"update vtiger_field set block=65 where tabid=22 and block=2",
+				"update vtiger_field set block=67 where tabid=22 and block=6",
+				"update vtiger_field set block=68 where tabid=22 and block=3",
+
+
+				"update vtiger_field set block=69 where tabid=23 and block=1",
+				"update vtiger_field set block=70 where tabid=23 and block=5",
+				"update vtiger_field set block=71 where tabid=23 and block=2",
+				"update vtiger_field set block=73 where tabid=23 and block=6",
+				"update vtiger_field set block=74 where tabid=23 and block=3",
 			    );
 foreach($update_query_array1 as $query)
 {
@@ -1162,10 +1162,10 @@
 }
 
 $update_query_array2 = Array(
-				"update vtiger_tab set name='Vendors', vtiger_tablabel='Vendors' where vtiger_tabid=18",
-				"update vtiger_tab set name='PriceBooks', vtiger_tablabel='PriceBooks' where vtiger_tabid=19",
-				"update vtiger_tab set presence=0 where vtiger_tabid in(18,19)",
-				"update vtiger_relatedlists set label='PriceBooks' where vtiger_tabid=14 and related_tabid=19"
+				"update vtiger_tab set name='Vendors', tablabel='Vendors' where tabid=18",
+				"update vtiger_tab set name='PriceBooks', tablabel='PriceBooks' where tabid=19",
+				"update vtiger_tab set presence=0 where tabid in(18,19)",
+				"update vtiger_relatedlists set label='PriceBooks' where tabid=14 and related_tabid=19"
 			    );
 foreach($update_query_array2 as $query)
 {
@@ -1203,13 +1203,13 @@
 $cvid = $conn->query_result($res,0,"cvid");
 
 $insert_query_array7 = Array(
-			"insert into vtiger_cvcolumnlist values ($cvid,0,'leaddetails:lastname:lastname:Leads_Last_Name:V')",
-			"insert into vtiger_cvcolumnlist values ($cvid,1,'leaddetails:firstname:firstname:Leads_First_Name:V')",
-			"insert into vtiger_cvcolumnlist values ($cvid,2,'leaddetails:company:company:Leads_Company:V')",
-			"insert into vtiger_cvcolumnlist values ($cvid,3,'leadaddress:phone:phone:Leads_Phone:V')",
-			"insert into vtiger_cvcolumnlist values ($cvid,4,'leadsubdetails:website:website:Leads_Website:V')",
-			"insert into vtiger_cvcolumnlist values ($cvid,5,'leaddetails:email:email:Leads_Email:V')",
-			"insert into vtiger_cvcolumnlist values ($cvid,6,'crmentity:smownerid:assigned_user_id:Leads_Assigned_To:V')"
+			"insert into vtiger_cvcolumnlist values ($cvid,0,'vtiger_leaddetails:lastname:lastname:Leads_Last_Name:V')",
+			"insert into vtiger_cvcolumnlist values ($cvid,1,'vtiger_leaddetails:firstname:firstname:Leads_First_Name:V')",
+			"insert into vtiger_cvcolumnlist values ($cvid,2,'vtiger_leaddetails:company:company:Leads_Company:V')",
+			"insert into vtiger_cvcolumnlist values ($cvid,3,'vtiger_leadaddress:phone:phone:Leads_Phone:V')",
+			"insert into vtiger_cvcolumnlist values ($cvid,4,'vtiger_leadsubdetails:website:website:Leads_Website:V')",
+			"insert into vtiger_cvcolumnlist values ($cvid,5,'vtiger_leaddetails:email:email:Leads_Email:V')",
+			"insert into vtiger_cvcolumnlist values ($cvid,6,'vtiger_crmentity:smownerid:assigned_user_id:Leads_Assigned_To:V')"
 			    );
 foreach($insert_query_array7 as $query)
 {
@@ -1220,11 +1220,11 @@
 $cvid = $conn->query_result($res,0,"cvid");
 
 $insert_query_array8 = Array(
-		"insert into vtiger_cvcolumnlist values ($cvid,0,'account:accountname:accountname:Accounts_Account_Name:V')",
-		"insert into vtiger_cvcolumnlist values ($cvid,1,'accountbillads:city:bill_city:Accounts_City:V')",
-		"insert into vtiger_cvcolumnlist values ($cvid,2,'account:website:website:Accounts_Website:V')",
-		"insert into vtiger_cvcolumnlist values ($cvid,3,'account:phone:phone:Accounts_Phone:V')",
-		"insert into vtiger_cvcolumnlist values ($cvid,4,'crmentity:smownerid:assigned_user_id:Accounts_Assigned_To:V')"
+		"insert into vtiger_cvcolumnlist values ($cvid,0,'vtiger_account:accountname:accountname:Accounts_Account_Name:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,1,'vtiger_accountbillads:city:bill_city:Accounts_City:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,2,'vtiger_account:website:website:Accounts_Website:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,3,'vtiger_account:phone:phone:Accounts_Phone:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,4,'vtiger_crmentity:smownerid:assigned_user_id:Accounts_Assigned_To:V')"
 			    );
 foreach($insert_query_array8 as $query)
 {
@@ -1235,13 +1235,13 @@
 $cvid = $conn->query_result($res,0,"cvid");
 
 $insert_query_array9 = Array(
-		"insert into vtiger_cvcolumnlist values ($cvid,0,'contactdetails:firstname:firstname:Contacts_First_Name:V')",
-		"insert into vtiger_cvcolumnlist values ($cvid,1,'contactdetails:lastname:lastname:Contacts_Last_Name:V')",
-		"insert into vtiger_cvcolumnlist values ($cvid,2,'contactdetails:title:title:Contacts_Title:V')",
-		"insert into vtiger_cvcolumnlist values ($cvid,3,'account:accountname:accountname:Contacts_Account_Name:V')",
-		"insert into vtiger_cvcolumnlist values ($cvid,4,'contactdetails:email:email:Contacts_Email:V')",
-		"insert into vtiger_cvcolumnlist values ($cvid,5,'contactdetails:phone:phone:Contacts_Phone_Name:V')",
-		"insert into vtiger_cvcolumnlist values ($cvid,6,'crmentity:smownerid:assigned_user_id:Contacts_Assigned_To:V')"
+		"insert into vtiger_cvcolumnlist values ($cvid,0,'vtiger_contactdetails:firstname:firstname:Contacts_First_Name:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,1,'vtiger_contactdetails:lastname:lastname:Contacts_Last_Name:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,2,'vtiger_contactdetails:title:title:Contacts_Title:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,3,'vtiger_account:accountname:accountname:Contacts_Account_Name:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,4,'vtiger_contactdetails:email:email:Contacts_Email:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,5,'vtiger_contactdetails:phone:phone:Contacts_Phone_Name:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,6,'vtiger_crmentity:smownerid:assigned_user_id:Contacts_Assigned_To:V')"
 			    );
 foreach($insert_query_array9 as $query)
 {
@@ -1252,11 +1252,11 @@
 $cvid = $conn->query_result($res,0,"cvid");
 
 $insert_query_array10 = Array(
-	"insert into vtiger_cvcolumnlist values ($cvid,0,'potential:potentialname:potentialname:Potentials_Potential_Name:V')",
-	"insert into vtiger_cvcolumnlist values ($cvid,1,'potential:accountid:account_id:Potentials_Account_Name:V')",
-	"insert into vtiger_cvcolumnlist values ($cvid,2,'potential:amount:amount:Potentials_Amount:N')",
-	"insert into vtiger_cvcolumnlist values ($cvid,3,'potential:closingdate:closingdate:Potentials_Expected_Close_Date:D')",
-	"insert into vtiger_cvcolumnlist values ($cvid,4,'crmentity:smownerid:assigned_user_id:Potentials_Assigned_To:V')"
+	"insert into vtiger_cvcolumnlist values ($cvid,0,'vtiger_potential:potentialname:potentialname:Potentials_Potential_Name:V')",
+	"insert into vtiger_cvcolumnlist values ($cvid,1,'vtiger_potential:accountid:account_id:Potentials_Account_Name:V')",
+	"insert into vtiger_cvcolumnlist values ($cvid,2,'vtiger_potential:amount:amount:Potentials_Amount:N')",
+	"insert into vtiger_cvcolumnlist values ($cvid,3,'vtiger_potential:closingdate:closingdate:Potentials_Expected_Close_Date:D')",
+	"insert into vtiger_cvcolumnlist values ($cvid,4,'vtiger_crmentity:smownerid:assigned_user_id:Potentials_Assigned_To:V')"
 			     );
 foreach($insert_query_array10 as $query)
 {
@@ -1267,12 +1267,12 @@
 $cvid = $conn->query_result($res,0,"cvid");
 
 $insert_query_array11 = Array(
-		"insert into vtiger_cvcolumnlist values ($cvid,0,'crmentity:crmid::HelpDesk_Ticket_ID:I')",
-		"insert into vtiger_cvcolumnlist values ($cvid,1,'troubletickets:title:ticket_title:HelpDesk_Title:V')",
-		"insert into vtiger_cvcolumnlist values ($cvid,2,'troubletickets:parent_id:parent_id:HelpDesk_Related_to:I')",
-		"insert into vtiger_cvcolumnlist values ($cvid,3,'troubletickets:status:ticketstatus:HelpDesk_Status:V')",
-		"insert into vtiger_cvcolumnlist values ($cvid,4,'troubletickets:priority:ticketpriorities:HelpDesk_Priority:V')",
-		"insert into vtiger_cvcolumnlist values ($cvid,5,'crmentity:smownerid:assigned_user_id:HelpDesk_Assigned_To:V')"
+		"insert into vtiger_cvcolumnlist values ($cvid,0,'vtiger_crmentity:crmid::HelpDesk_Ticket_ID:I')",
+		"insert into vtiger_cvcolumnlist values ($cvid,1,'vtiger_troubletickets:title:ticket_title:HelpDesk_Title:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,2,'vtiger_troubletickets:parent_id:parent_id:HelpDesk_Related_to:I')",
+		"insert into vtiger_cvcolumnlist values ($cvid,3,'vtiger_troubletickets:status:ticketstatus:HelpDesk_Status:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,4,'vtiger_troubletickets:priority:ticketpriorities:HelpDesk_Priority:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,5,'vtiger_crmentity:smownerid:assigned_user_id:HelpDesk_Assigned_To:V')"
 			     );
 foreach($insert_query_array11 as $query)
 {
@@ -1284,13 +1284,13 @@
 $cvid = $conn->query_result($res,0,"cvid");
 
 $insert_query_array12 = Array(
-		"insert into vtiger_cvcolumnlist values ($cvid,0,'crmentity:crmid::Quotes_Quote_ID:I')",
-		"insert into vtiger_cvcolumnlist values ($cvid,1,'quotes:subject:subject:Quotes_Subject:V')",
-		"insert into vtiger_cvcolumnlist values ($cvid,2,'quotes:quotestage:quotestage:Quotes_Quote_Stage:V')",
-		"insert into vtiger_cvcolumnlist values ($cvid,3,'quotes:potentialid:potential_id:Quotes_Potential_Name:I')",
-		"insert into vtiger_cvcolumnlist values ($cvid,4,'quotes:accountid:account_id:Quotes_Account_Name:I')",
-		"insert into vtiger_cvcolumnlist values ($cvid,5,'quotes:total:hdnGrandTotal:Quotes_Total:I')",
-		"insert into vtiger_cvcolumnlist values ($cvid,6,'crmentity:smownerid:assigned_user_id:Quotes_Assigned_To:V')"
+		"insert into vtiger_cvcolumnlist values ($cvid,0,'vtiger_crmentity:crmid::Quotes_Quote_ID:I')",
+		"insert into vtiger_cvcolumnlist values ($cvid,1,'vtiger_quotes:subject:subject:Quotes_Subject:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,2,'vtiger_quotes:quotestage:quotestage:Quotes_Quote_Stage:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,3,'vtiger_quotes:potentialid:potential_id:Quotes_Potential_Name:I')",
+		"insert into vtiger_cvcolumnlist values ($cvid,4,'vtiger_quotes:accountid:account_id:Quotes_Account_Name:I')",
+		"insert into vtiger_cvcolumnlist values ($cvid,5,'vtiger_quotes:total:hdnGrandTotal:Quotes_Total:I')",
+		"insert into vtiger_cvcolumnlist values ($cvid,6,'vtiger_crmentity:smownerid:assigned_user_id:Quotes_Assigned_To:V')"
 			     );
 foreach($insert_query_array12 as $query)
 {
@@ -1301,14 +1301,14 @@
 $cvid = $conn->query_result($res,0,"cvid");
 
 $insert_query_array13 = Array(
-		"insert into vtiger_cvcolumnlist values ($cvid,0,'activity:status:taskstatus:Activities_Status:V')",
-		"insert into vtiger_cvcolumnlist values ($cvid,1,'activity:activitytype:activitytype:Activities_Type:V')",
-		"insert into vtiger_cvcolumnlist values ($cvid,2,'activity:subject:subject:Activities_Subject:V')",
-		"insert into vtiger_cvcolumnlist values ($cvid,3,'contactdetails:lastname:lastname:Activities_Contact_Name:V')",
-		"insert into vtiger_cvcolumnlist values ($cvid,4,'seactivityrel:crmid:parent_id:Activities_Related_To:V')",
-		"insert into vtiger_cvcolumnlist values ($cvid,5,'activity:date_start:date_start:Activities_Start_Date:D')",
-		"insert into vtiger_cvcolumnlist values ($cvid,6,'activity:due_date:due_date:Activities_End_Date:D')",
-		"insert into vtiger_cvcolumnlist values ($cvid,7,'crmentity:smownerid:assigned_user_id:Activities_Assigned_To:V')"
+		"insert into vtiger_cvcolumnlist values ($cvid,0,'vtiger_activity:status:taskstatus:Activities_Status:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,1,'vtiger_activity:activitytype:activitytype:Activities_Type:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,2,'vtiger_activity:subject:subject:Activities_Subject:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,3,'vtiger_contactdetails:lastname:lastname:Activities_Contact_Name:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,4,'vtiger_seactivityrel:crmid:parent_id:Activities_Related_To:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,5,'vtiger_activity:date_start:date_start:Activities_Start_Date:D')",
+		"insert into vtiger_cvcolumnlist values ($cvid,6,'vtiger_activity:due_date:due_date:Activities_End_Date:D')",
+		"insert into vtiger_cvcolumnlist values ($cvid,7,'vtiger_crmentity:smownerid:assigned_user_id:Activities_Assigned_To:V')"
 			     );
 foreach($insert_query_array13 as $query)
 {
@@ -1320,10 +1320,10 @@
 $cvid = $conn->query_result($res,0,"cvid");
 
 $insert_query_array14 = Array(
-		"insert into vtiger_cvcolumnlist values ($cvid,0,'activity:subject:subject:Emails_Subject:V')",
-		"insert into vtiger_cvcolumnlist values ($cvid,1,'seactivityrel:crmid:parent_id:Emails_Related_To:I')",
-		"insert into vtiger_cvcolumnlist values ($cvid,2,'activity:date_start:date_start:Emails_Date_Sent:D')",
-		"insert into vtiger_cvcolumnlist values ($cvid,3,'crmentity:smownerid:assigned_user_id:Emails_Assigned_To:V')"
+		"insert into vtiger_cvcolumnlist values ($cvid,0,'vtiger_activity:subject:subject:Emails_Subject:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,1,'vtiger_seactivityrel:crmid:parent_id:Emails_Related_To:I')",
+		"insert into vtiger_cvcolumnlist values ($cvid,2,'vtiger_activity:date_start:date_start:Emails_Date_Sent:D')",
+		"insert into vtiger_cvcolumnlist values ($cvid,3,'vtiger_crmentity:smownerid:assigned_user_id:Emails_Assigned_To:V')"
 			     );
 foreach($insert_query_array14 as $query)
 {
@@ -1334,12 +1334,12 @@
 $cvid = $conn->query_result($res,0,"cvid");
 
 $insert_query_array15 = Array(
-		"insert into vtiger_cvcolumnlist values ($cvid,0,'crmentity:crmid::Invoice_Invoice_Id:I')",
-		"insert into vtiger_cvcolumnlist values ($cvid,1,'invoice:subject:subject:Invoice_Subject:V')",
-		"insert into vtiger_cvcolumnlist values ($cvid,2,'invoice:salesorderid:salesorder_id:Invoice_Sales_Order:V')",
-		"insert into vtiger_cvcolumnlist values ($cvid,3,'invoice:invoicestatus:invoicestatus:Invoice_Status:V')",
-		"insert into vtiger_cvcolumnlist values ($cvid,4,'invoice:total:hdnGrandTotal:Invoice_Total:I')",
-		"insert into vtiger_cvcolumnlist values ($cvid,5,'crmentity:smownerid:assigned_user_id:Invoice_Assigned_To:V')"
+	"insert into vtiger_cvcolumnlist values ($cvid,0,'vtiger_crmentity:crmid::Invoice_Invoice_Id:I')",
+	"insert into vtiger_cvcolumnlist values ($cvid,1,'vtiger_invoice:subject:subject:Invoice_Subject:V')",
+	"insert into vtiger_cvcolumnlist values ($cvid,2,'vtiger_invoice:salesorderid:salesorder_id:Invoice_Sales_Order:V')",
+	"insert into vtiger_cvcolumnlist values ($cvid,3,'vtiger_invoice:invoicestatus:invoicestatus:Invoice_Status:V')",
+	"insert into vtiger_cvcolumnlist values ($cvid,4,'vtiger_invoice:total:hdnGrandTotal:Invoice_Total:I')",
+	"insert into vtiger_cvcolumnlist values ($cvid,5,'vtiger_crmentity:smownerid:assigned_user_id:Invoice_Assigned_To:V')"
 			     );
 foreach($insert_query_array15 as $query)
 {
@@ -1351,11 +1351,11 @@
 $cvid = $conn->query_result($res,0,"cvid");
 
 $insert_query_array16 = Array(
-		"insert into vtiger_cvcolumnlist values ($cvid,0,'notes:title:title:Notes_Title:V')",
-		"insert into vtiger_cvcolumnlist values ($cvid,1,'notes:contact_id:contact_id:Notes_Contact_Name:I')",
-		"insert into vtiger_cvcolumnlist values ($cvid,2,'senotesrel:crmid:parent_id:Notes_Related_to:I')",
-		"insert into vtiger_cvcolumnlist values ($cvid,3,'notes:filename:filename:Notes_File:V')",
-		"insert into vtiger_cvcolumnlist values ($cvid,4,'crmentity:modifiedtime:modifiedtime:Notes_Modified_Time:V')"
+		"insert into vtiger_cvcolumnlist values ($cvid,0,'vtiger_notes:title:title:Notes_Title:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,1,'vtiger_notes:contact_id:contact_id:Notes_Contact_Name:I')",
+		"insert into vtiger_cvcolumnlist values ($cvid,2,'vtiger_senotesrel:crmid:parent_id:Notes_Related_to:I')",
+		"insert into vtiger_cvcolumnlist values ($cvid,3,'vtiger_notes:filename:filename:Notes_File:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,4,'vtiger_crmentity:modifiedtime:modifiedtime:Notes_Modified_Time:V')"
 			     );
 foreach($insert_query_array16 as $query)
 {
@@ -1366,8 +1366,8 @@
 $cvid = $conn->query_result($res,0,"cvid");
 
 $insert_query_array17 = Array(
-		"insert into vtiger_cvcolumnlist values ($cvid,1,'pricebook:bookname:bookname:PriceBooks_Price_Book_Name:V')",
-		"insert into vtiger_cvcolumnlist values ($cvid,2,'pricebook:active:active:PriceBooks_Active:V')"
+		"insert into vtiger_cvcolumnlist values ($cvid,1,'vtiger_pricebook:bookname:bookname:PriceBooks_Price_Book_Name:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,2,'vtiger_pricebook:active:active:PriceBooks_Active:V')"
 			     );
 foreach($insert_query_array17 as $query)
 {
@@ -1379,11 +1379,11 @@
 $cvid = $conn->query_result($res,0,"cvid");
 
 $insert_query_array18 = Array(
-	"insert into vtiger_cvcolumnlist values ($cvid,0,'products:productname:productname:Products_Product_Name:V')",
-	"insert into vtiger_cvcolumnlist values ($cvid,1,'products:productcode:productcode:Products_Product_Code:V')",
-	"insert into vtiger_cvcolumnlist values ($cvid,2,'products:commissionrate:commissionrate:Products_Commission_Rate:V')",
-	"insert into vtiger_cvcolumnlist values ($cvid,3,'products:qty_per_unit:qty_per_unit:Products_Qty/Unit:V')",
-	"insert into vtiger_cvcolumnlist values ($cvid,4,'products:unit_price:unit_price:Products_Unit_Price:V')"
+	"insert into vtiger_cvcolumnlist values ($cvid,0,'vtiger_products:productname:productname:Products_Product_Name:V')",
+	"insert into vtiger_cvcolumnlist values ($cvid,1,'vtiger_products:productcode:productcode:Products_Product_Code:V')",
+	"insert into vtiger_cvcolumnlist values ($cvid,2,'vtiger_products:commissionrate:commissionrate:Products_Commission_Rate:V')",
+	"insert into vtiger_cvcolumnlist values ($cvid,3,'vtiger_products:qty_per_unit:qty_per_unit:Products_Qty/Unit:V')",
+	"insert into vtiger_cvcolumnlist values ($cvid,4,'vtiger_products:unit_price:unit_price:Products_Unit_Price:V')"
 			     );
 foreach($insert_query_array18 as $query)
 {
@@ -1394,11 +1394,11 @@
 $cvid = $conn->query_result($res,0,"cvid");
 
 $insert_query_array19 = Array(
-	"insert into vtiger_cvcolumnlist values($cvid,0,'crmentity:crmid::PurchaseOrder_Order_Id:I')",
-	"insert into vtiger_cvcolumnlist values($cvid,1,'purchaseorder:subject:subject:PurchaseOrder_Subject:V')",
-	"insert into vtiger_cvcolumnlist values($cvid,2,'purchaseorder:vendorid:vendor_id:PurchaseOrder_Vendor_Name:I')",
-	"insert into vtiger_cvcolumnlist values($cvid,3,'purchaseorder:tracking_no:tracking_no:PurchaseOrder_Tracking_Number:V')",
-	"insert into vtiger_cvcolumnlist values($cvid,4,'crmentity:smownerid:assigned_user_id:PurchaseOrder_Assigned_To:V')"
+	"insert into vtiger_cvcolumnlist values($cvid,0,'vtiger_crmentity:crmid::PurchaseOrder_Order_Id:I')",
+	"insert into vtiger_cvcolumnlist values($cvid,1,'vtiger_purchaseorder:subject:subject:PurchaseOrder_Subject:V')",
+	"insert into vtiger_cvcolumnlist values($cvid,2,'vtiger_purchaseorder:vendorid:vendor_id:PurchaseOrder_Vendor_Name:I')",
+	"insert into vtiger_cvcolumnlist values($cvid,3,'vtiger_purchaseorder:tracking_no:tracking_no:PurchaseOrder_Tracking_Number:V')",
+	"insert into vtiger_cvcolumnlist values($cvid,4,'vtiger_crmentity:smownerid:assigned_user_id:PurchaseOrder_Assigned_To:V')"
 			     );
 foreach($insert_query_array19 as $query)
 {
@@ -1409,12 +1409,12 @@
 $cvid = $conn->query_result($res,0,"cvid");
 
 $insert_query_array20 = Array(
-		"insert into vtiger_cvcolumnlist values ($cvid,0,'crmentity:crmid::SalesOrder_Order_Id:I')",
-		"insert into vtiger_cvcolumnlist values ($cvid,1,'salesorder:subject:subject:SalesOrder_Subject:V')",
-		"insert into vtiger_cvcolumnlist values ($cvid,2,'account:accountid:account_id:SalesOrder_Account_Name:V')",
-		"insert into vtiger_cvcolumnlist values ($cvid,3,'quotes:quoteid:quote_id:SalesOrder_Quote_Name:I')",
-		"insert into vtiger_cvcolumnlist values ($cvid,4,'salesorder:total:hdnGrandTotal:SalesOrder_Total:V')",
-		"insert into vtiger_cvcolumnlist values ($cvid,5,'crmentity:smownerid:assigned_user_id:SalesOrder_Assigned_To:V')"
+	"insert into vtiger_cvcolumnlist values ($cvid,0,'vtiger_crmentity:crmid::SalesOrder_Order_Id:I')",
+	"insert into vtiger_cvcolumnlist values ($cvid,1,'vtiger_salesorder:subject:subject:SalesOrder_Subject:V')",
+	"insert into vtiger_cvcolumnlist values ($cvid,2,'vtiger_account:accountid:account_id:SalesOrder_Account_Name:V')",
+	"insert into vtiger_cvcolumnlist values ($cvid,3,'vtiger_quotes:quoteid:quote_id:SalesOrder_Quote_Name:I')",
+	"insert into vtiger_cvcolumnlist values ($cvid,4,'vtiger_salesorder:total:hdnGrandTotal:SalesOrder_Total:V')",
+	"insert into vtiger_cvcolumnlist values ($cvid,5,'vtiger_crmentity:smownerid:assigned_user_id:SalesOrder_Assigned_To:V')"
 			     );
 foreach($insert_query_array20 as $query)
 {
@@ -1425,10 +1425,10 @@
 $cvid = $conn->query_result($res,0,"cvid");
 
 $insert_query_array21 = Array(
-			"insert into vtiger_cvcolumnlist values ($cvid,0,'vendor:vendorname:vendorname:Vendors_Vendor_Name:V')",
-			"insert into vtiger_cvcolumnlist values ($cvid,1,'vendor:phone:phone:Vendors_Phone:V')",
-			"insert into vtiger_cvcolumnlist values ($cvid,2,'vendor:email:email:Vendors_Email:V')",
-			"insert into vtiger_cvcolumnlist values ($cvid,3,'vendor:category:category:Vendors_Category:V')"
+	"insert into vtiger_cvcolumnlist values ($cvid,0,'vtiger_vendor:vendorname:vendorname:Vendors_Vendor_Name:V')",
+	"insert into vtiger_cvcolumnlist values ($cvid,1,'vtiger_vendor:phone:phone:Vendors_Phone:V')",
+	"insert into vtiger_cvcolumnlist values ($cvid,2,'vtiger_vendor:email:email:Vendors_Email:V')",
+	"insert into vtiger_cvcolumnlist values ($cvid,3,'vtiger_vendor:category:category:Vendors_Category:V')"
 			     );
 foreach($insert_query_array21 as $query)
 {
@@ -1439,12 +1439,12 @@
 $cvid = $conn->query_result($res,0,"cvid");
 
 $insert_query_array22 = Array(
-		"insert into vtiger_cvcolumnlist values ($cvid,0,'faq:id::Faq_FAQ_Id:I')",
-		"insert into vtiger_cvcolumnlist values ($cvid,1,'faq:question:question:Faq_Question:V')",
-		"insert into vtiger_cvcolumnlist values ($cvid,2,'faq:category:faqcategories:Faq_Category:V')",
-		"insert into vtiger_cvcolumnlist values ($cvid,3,'faq:product_id:product_id:Faq_Product_Name:I')",
-		"insert into vtiger_cvcolumnlist values ($cvid,4,'crmentity:createdtime:createdtime:Faq_Created_Time:D')",
-		"insert into vtiger_cvcolumnlist values ($cvid,5,'crmentity:modifiedtime:modifiedtime:Faq_Modified_Time:D')"
+	"insert into vtiger_cvcolumnlist values ($cvid,0,'vtiger_faq:id::Faq_FAQ_Id:I')",
+	"insert into vtiger_cvcolumnlist values ($cvid,1,'vtiger_faq:question:question:Faq_Question:V')",
+	"insert into vtiger_cvcolumnlist values ($cvid,2,'vtiger_faq:category:faqcategories:Faq_Category:V')",
+	"insert into vtiger_cvcolumnlist values ($cvid,3,'vtiger_faq:product_id:product_id:Faq_Product_Name:I')",
+	"insert into vtiger_cvcolumnlist values ($cvid,4,'vtiger_crmentity:createdtime:createdtime:Faq_Created_Time:D')",
+	"insert into vtiger_cvcolumnlist values ($cvid,5,'vtiger_crmentity:modifiedtime:modifiedtime:Faq_Modified_Time:D')"
 			     );
 foreach($insert_query_array22 as $query)
 {
@@ -1453,23 +1453,23 @@
 
 
 $update_query_array3 = Array(
-				"update vtiger_field set uitype=53 where vtiger_tabid=2 and columnname='smownerid'",
-				"update vtiger_field set uitype=53 where vtiger_tabid=4 and columnname='smownerid'",
-				"update vtiger_field set uitype=53 where vtiger_tabid=20 and columnname='smownerid'",
-				"update vtiger_field set uitype=53 where vtiger_tabid=22 and columnname='smownerid'",
-				"update vtiger_field set uitype=53 where vtiger_tabid=23 and columnname='smownerid'"
+				"update vtiger_field set uitype=53 where tabid=2 and columnname='smownerid'",
+				"update vtiger_field set uitype=53 where tabid=4 and columnname='smownerid'",
+				"update vtiger_field set uitype=53 where tabid=20 and columnname='smownerid'",
+				"update vtiger_field set uitype=53 where tabid=22 and columnname='smownerid'",
+				"update vtiger_field set uitype=53 where tabid=23 and columnname='smownerid'"
 			    );
 foreach($update_query_array3 as $query)
 {
 	Execute($query);
 }
 
-$create_query6 = "CREATE TABLE vtiger_accountgrouprelation ( vtiger_accountid int(19) NOT NULL default '0', groupname varchar(100) default NULL, PRIMARY KEY  (`accountid`))";
+$create_query6 = "CREATE TABLE vtiger_accountgrouprelation ( accountid int(19) NOT NULL default '0', groupname varchar(100) default NULL, PRIMARY KEY  (`accountid`))";
 Execute($create_query6);
 
 $alter_query_array8 = Array(
-				"alter vtiger_table vtiger_accountgrouprelation ADD CONSTRAINT fk_accountgrouprelation FOREIGN KEY (accountid) REFERENCES vtiger_account(accountid) ON DELETE CASCADE",
-				"alter vtiger_table vtiger_accountgrouprelation ADD CONSTRAINT fk_accountgrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_groups(name) ON DELETE CASCADE"
+				"alter table vtiger_accountgrouprelation ADD CONSTRAINT fk_accountgrouprelation FOREIGN KEY (accountid) REFERENCES vtiger_account(accountid) ON DELETE CASCADE",
+				"alter table vtiger_accountgrouprelation ADD CONSTRAINT fk_accountgrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_groups(name) ON DELETE CASCADE"
 			   );
 foreach($alter_query_array8 as $query)
 {
@@ -1480,8 +1480,8 @@
 Execute($create_query7);
 
 $alter_query_array9 = Array(
-				"alter vtiger_table vtiger_contactgrouprelation ADD CONSTRAINT fk_contactgrouprelation FOREIGN KEY (contactid) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE",
-				"alter vtiger_table vtiger_contactgrouprelation ADD CONSTRAINT fk_contactgrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_groups(name) ON DELETE CASCADE"
+				"alter table vtiger_contactgrouprelation ADD CONSTRAINT fk_contactgrouprelation FOREIGN KEY (contactid) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE",
+				"alter table vtiger_contactgrouprelation ADD CONSTRAINT fk_contactgrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_groups(name) ON DELETE CASCADE"
 			   );
 foreach($alter_query_array9 as $query)
 {
@@ -1489,12 +1489,12 @@
 }
 
 
-$create_query10 = "CREATE TABLE vtiger_potentialgrouprelation ( vtiger_potentialid int(19) NOT NULL default '0', groupname varchar(100) default NULL, PRIMARY KEY  (`potentialid`))";
+$create_query10 = "CREATE TABLE vtiger_potentialgrouprelation ( potentialid int(19) NOT NULL default '0', groupname varchar(100) default NULL, PRIMARY KEY  (`potentialid`))";
 Execute($create_query10);
 
 $alter_query_array10 = Array(
-				"alter vtiger_table vtiger_potentialgrouprelation ADD CONSTRAINT fk_potentialgrouprelation FOREIGN KEY (potentialid) REFERENCES vtiger_potential(potentialid) ON DELETE CASCADE",
-				"alter vtiger_table vtiger_potentialgrouprelation ADD CONSTRAINT fk_potentialgrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_groups(name) ON DELETE CASCADE"
+				"alter table vtiger_potentialgrouprelation ADD CONSTRAINT fk_potentialgrouprelation FOREIGN KEY (potentialid) REFERENCES vtiger_potential(potentialid) ON DELETE CASCADE",
+				"alter table vtiger_potentialgrouprelation ADD CONSTRAINT fk_potentialgrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_groups(name) ON DELETE CASCADE"
 			    );
 foreach($alter_query_array10 as $query)
 {
@@ -1505,44 +1505,44 @@
 Execute($create_query11);
 
 $alter_query_array11 = Array(
-				"alter vtiger_table vtiger_quotegrouprelation ADD CONSTRAINT fk_quotegrouprelation FOREIGN KEY (quoteid) REFERENCES vtiger_quotes(quoteid) ON DELETE CASCADE",
-				"alter vtiger_table vtiger_quotegrouprelation ADD CONSTRAINT fk_quotegrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_groups(name) ON DELETE CASCADE"
+				"alter table vtiger_quotegrouprelation ADD CONSTRAINT fk_quotegrouprelation FOREIGN KEY (quoteid) REFERENCES vtiger_quotes(quoteid) ON DELETE CASCADE",
+				"alter table vtiger_quotegrouprelation ADD CONSTRAINT fk_quotegrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_groups(name) ON DELETE CASCADE"
 			    );
 foreach($alter_query_array11 as $query)
 {
 	Execute($query);
 }
 
-$create_query12 = "CREATE TABLE vtiger_sogrouprelation ( vtiger_salesorderid int(19) NOT NULL default '0', groupname varchar(100) default NULL, PRIMARY KEY  (`salesorderid`) )";
+$create_query12 = "CREATE TABLE vtiger_sogrouprelation ( salesorderid int(19) NOT NULL default '0', groupname varchar(100) default NULL, PRIMARY KEY  (`salesorderid`) )";
 Execute($create_query12);
 
 $alter_query_array12 = Array(
-				"alter vtiger_table vtiger_sogrouprelation ADD CONSTRAINT fk_sogrouprelation FOREIGN KEY (salesorderid) REFERENCES vtiger_salesorder(salesorderid) ON DELETE CASCADE",
-				"alter vtiger_table vtiger_sogrouprelation ADD CONSTRAINT fk_sogrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_groups(name) ON DELETE CASCADE"
+				"alter table vtiger_sogrouprelation ADD CONSTRAINT fk_sogrouprelation FOREIGN KEY (salesorderid) REFERENCES vtiger_salesorder(salesorderid) ON DELETE CASCADE",
+				"alter table vtiger_sogrouprelation ADD CONSTRAINT fk_sogrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_groups(name) ON DELETE CASCADE"
 			    );
 foreach($alter_query_array12 as $query)
 {
 	Execute($query);
 }
 
-$create_query13 = "CREATE TABLE vtiger_invoicegrouprelation ( vtiger_invoiceid int(19) NOT NULL default '0',  groupname varchar(100) default NULL,  PRIMARY KEY  (`invoiceid`))";
+$create_query13 = "CREATE TABLE vtiger_invoicegrouprelation ( invoiceid int(19) NOT NULL default '0',  groupname varchar(100) default NULL,  PRIMARY KEY  (`invoiceid`))";
 Execute($create_query13);
 
 $alter_query_array13 = Array(
-				"alter vtiger_table vtiger_invoicegrouprelation ADD CONSTRAINT fk_invoicegrouprelation FOREIGN KEY (invoiceid) REFERENCES vtiger_invoice(invoiceid) ON DELETE CASCADE",
-				"alter vtiger_table vtiger_invoicegrouprelation ADD CONSTRAINT fk_invoicegrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_groups(name) ON DELETE CASCADE"
+				"alter table vtiger_invoicegrouprelation ADD CONSTRAINT fk_invoicegrouprelation FOREIGN KEY (invoiceid) REFERENCES vtiger_invoice(invoiceid) ON DELETE CASCADE",
+				"alter table vtiger_invoicegrouprelation ADD CONSTRAINT fk_invoicegrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_groups(name) ON DELETE CASCADE"
 			    );
 foreach($alter_query_array13 as $query)
 {
 	Execute($query);
 }
 
-$create_query14 = "CREATE TABLE vtiger_pogrouprelation ( vtiger_purchaseorderid int(19) NOT NULL default '0', groupname varchar(100) default NULL, PRIMARY KEY  (`purchaseorderid`))";
+$create_query14 = "CREATE TABLE vtiger_pogrouprelation ( purchaseorderid int(19) NOT NULL default '0', groupname varchar(100) default NULL, PRIMARY KEY  (`purchaseorderid`))";
 Execute($create_query14);
 
 $alter_query_array14 = Array(
-				"alter vtiger_table vtiger_pogrouprelation ADD CONSTRAINT fk_pogrouprelation FOREIGN KEY (purchaseorderid) REFERENCES vtiger_purchaseorder(purchaseorderid) ON DELETE CASCADE",
-				"alter vtiger_table vtiger_pogrouprelation ADD CONSTRAINT fk_productgrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_groups(name) ON DELETE CASCADE"
+				"alter table vtiger_pogrouprelation ADD CONSTRAINT fk_pogrouprelation FOREIGN KEY (purchaseorderid) REFERENCES vtiger_purchaseorder(purchaseorderid) ON DELETE CASCADE",
+				"alter table vtiger_pogrouprelation ADD CONSTRAINT fk_productgrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_groups(name) ON DELETE CASCADE"
 			    );
 foreach($alter_query_array14 as $query)
 {
@@ -1558,12 +1558,12 @@
 $alter_query2 = "ALTER TABLE vtiger_products change column imagename imagename text";
 Execute($alter_query2);
 
-$alter_query3 = "alter vtiger_table vtiger_systems modify server varchar(50), modify server_username varchar(50), modify server_password varchar(50), add column smtp_auth char(5)";
+$alter_query3 = "alter table vtiger_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 vtiger_table vtiger_users add column imagename varchar(250)",
-				"alter vtiger_table vtiger_users add column tagcloud varchar(250)"
+				"alter table vtiger_users add column imagename varchar(250)",
+				"alter table vtiger_users add column tagcloud varchar(250)"
 			    );
 foreach($alter_query_array15 as $query)
 {
@@ -1571,8 +1571,8 @@
 }
 
 $alter_query_array16 = Array(
-			"alter vtiger_table vtiger_systems change column server server varchar(80) default NULL",
-			"alter vtiger_table vtiger_systems change column server_username server_username varchar(80) default NULL"
+			"alter table vtiger_systems change column server server varchar(80) default NULL",
+			"alter table vtiger_systems change column server_username server_username varchar(80) default NULL"
 			    );
 foreach($alter_query_array16 as $query)
 {
@@ -1580,62 +1580,62 @@
 }
 
 
-$create_query15 = "create vtiger_table vtiger_portal(portalid int(19), vtiger_portalname varchar(255) NOT NULL, vtiger_portalurl varchar(255) NOT NULL,sequence int(3) NOT NULL, PRIMARY KEY (portalid))";
+$create_query15 = "create table vtiger_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 = "ALTER TABLE vtiger_field ADD column info_type varchar(20) default NULL after quickcreatesequence";
 Execute($alter_query);
 
-//$update_query2 = "UPDATE vtiger_field SET vtiger_fieldlabel = 'Reference' WHERE vtiger_tabid = 4 and vtiger_tablename = 'contactdetails' and vtiger_fieldname='reference'";
-//changed in 24-04-06 because the reference has not been entered into the vtiger_field vtiger_table. 
+//$update_query2 = "UPDATE vtiger_field SET fieldlabel = 'Reference' WHERE tabid = 4 and tablename = 'contactdetails' and fieldname='reference'";
+//changed in 24-04-06 because the reference has not been entered into the vtiger_field table. 
 $update_query2 = "insert into vtiger_field values (4,".$conn->getUniqueID("field").",'reference','contactdetails',1,'56','reference','Reference',1,0,0,10,23,4,1,'C~O',1,null,'ADV')";
 Execute($update_query2);
 
 $update_query_array4 = Array(
 				"UPDATE vtiger_field SET info_type = 'BAS'",
 
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 7 and vtiger_fieldlabel = 'Website'",
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 7 and vtiger_fieldlabel = 'Industry'",
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 7 and vtiger_fieldlabel = 'Annual Revenue'",
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 7 and vtiger_fieldlabel = 'No Of Employees'",
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 7 and vtiger_fieldlabel = 'Yahoo Id'",
-
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 6 and vtiger_fieldlabel = 'Ticker Symbol'",
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 6 and vtiger_fieldlabel = 'Other Phone'",
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 6 and vtiger_fieldlabel = 'Member Of'",
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 6 and vtiger_fieldlabel = 'Employees'",
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 6 and vtiger_fieldlabel = 'Other Email'",
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 6 and vtiger_fieldlabel = 'Ownership'",
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 6 and vtiger_fieldlabel = 'Rating'",
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 6 and vtiger_fieldlabel = 'industry'",
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 6 and vtiger_fieldlabel = 'SIC Code'",
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 6 and vtiger_fieldlabel = 'Type'",
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 6 and vtiger_fieldlabel = 'Annual Revenue'",
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 6 and vtiger_fieldlabel = 'Email Opt Out'",
-
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'Home Phone'",
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'Department'",
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'Birthdate'",
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'Email'",
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'Reports To'",
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'Assistant'",
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'Yahoo Id'",
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'Assistant Phone'",
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'Do Not Call'",
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'Email Opt Out'",
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'Reference'",
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'Portal User'",
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'Support Start Date'",
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'Support End Date'",
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'Contact Image'",
-
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 14 and vtiger_fieldlabel = 'Usage Unit'",
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 14 and vtiger_fieldlabel = 'Qty/Unit'",
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 14 and vtiger_fieldlabel = 'Qty In Stock'",
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 14 and vtiger_fieldlabel = 'Reorder Level'",
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 14 and vtiger_fieldlabel = 'Handler'",
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 14 and vtiger_fieldlabel = 'Qty In Demand'",
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 14 and vtiger_fieldlabel = 'Product Image'"
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 7 and fieldlabel = 'Website'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 7 and fieldlabel = 'Industry'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 7 and fieldlabel = 'Annual Revenue'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 7 and fieldlabel = 'No Of Employees'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 7 and fieldlabel = 'Yahoo Id'",
+
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 6 and fieldlabel = 'Ticker Symbol'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 6 and fieldlabel = 'Other Phone'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 6 and fieldlabel = 'Member Of'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 6 and fieldlabel = 'Employees'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 6 and fieldlabel = 'Other Email'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 6 and fieldlabel = 'Ownership'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 6 and fieldlabel = 'Rating'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 6 and fieldlabel = 'industry'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 6 and fieldlabel = 'SIC Code'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 6 and fieldlabel = 'Type'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 6 and fieldlabel = 'Annual Revenue'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 6 and fieldlabel = 'Email Opt Out'",
+
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 4 and fieldlabel = 'Home Phone'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 4 and fieldlabel = 'Department'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 4 and fieldlabel = 'Birthdate'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 4 and fieldlabel = 'Email'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 4 and fieldlabel = 'Reports To'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 4 and fieldlabel = 'Assistant'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 4 and fieldlabel = 'Yahoo Id'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 4 and fieldlabel = 'Assistant Phone'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 4 and fieldlabel = 'Do Not Call'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 4 and fieldlabel = 'Email Opt Out'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 4 and fieldlabel = 'Reference'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 4 and fieldlabel = 'Portal User'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 4 and fieldlabel = 'Support Start Date'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 4 and fieldlabel = 'Support End Date'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 4 and fieldlabel = 'Contact Image'",
+
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 14 and fieldlabel = 'Usage Unit'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 14 and fieldlabel = 'Qty/Unit'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 14 and fieldlabel = 'Qty In Stock'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 14 and fieldlabel = 'Reorder Level'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 14 and fieldlabel = 'Handler'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 14 and fieldlabel = 'Qty In Demand'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 14 and fieldlabel = 'Product Image'"
 			    );
 foreach($update_query_array4 as $query)
 {
@@ -1643,15 +1643,15 @@
 }
 
 
-$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";
+$create_query16 = "CREATE TABLE vtiger_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";
+$create_query17 = "CREATE TABLE vtiger_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";
+$create_query18 = "CREATE TABLE vtiger_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";
+$create_query19 = "CREATE TABLE vtiger_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(
@@ -1673,10 +1673,10 @@
 ) TYPE=MyISAM";
 Execute($create_query21);
   
-$alter_query4 = "alter vtiger_table vtiger_profile add column description text";
+$alter_query4 = "alter table vtiger_profile add column description text";
 Execute($alter_query4);
 
-$alter_query5 = "alter vtiger_table vtiger_contactdetails add column imagename varchar(250) after vtiger_currency";
+$alter_query5 = "alter table vtiger_contactdetails add column imagename varchar(250) after currency";
 Execute($alter_query5);
 
 $alter_query = "ALTER TABLE vtiger_contactdetails ADD column reference varchar(3) default NULL after imagename";
@@ -1694,14 +1694,14 @@
 	Execute($query);
 }
 
-$alter_query6 = "alter vtiger_table vtiger_activity add column vtiger_visibility varchar(50) NOT NULL after notime";
+$alter_query6 = "alter table vtiger_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";
+$create_query22 = "CREATE TABLE vtiger_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";
+$create_query23 = "CREATE TABLE vtiger_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 vtiger_tab VALUES(26,'Campaigns',0,23,'Campaigns',null,null,1)";
@@ -1766,7 +1766,7 @@
 }
 
 $create_query24 = "
-CREATE TABLE `campaign` (
+CREATE TABLE vtiger_campaign (
    `campaignname` varchar(255) default NULL,
    `campaigntype` varchar(255) default NULL,
    `campaignstatus` varchar(255) default NULL,
@@ -1797,14 +1797,14 @@
 
 
 //Added on 06-06-06
-$create_query25 = "CREATE TABLE `campaigncontrel` (
+$create_query25 = "CREATE TABLE vtiger_campaigncontrel (
 	  `campaignid` int(19) NOT NULL default '0',
 	    `contactid` int(19) NOT NULL default '0',
 	      PRIMARY KEY  (`campaignid`),
 	        KEY `campaigncontrel_contractid_idx` (`contactid`)
 	) ENGINE=InnoDB";
 /*
-$create_query25 = "CREATE TABLE `campaigncontrel` (
+$create_query25 = "CREATE TABLE vtiger_campaigncontrel (
   `campaignid` int(19) NOT NULL default '0',
   `contactid` int(19) NOT NULL default '0',
   PRIMARY KEY  (`campaignid`),
@@ -1816,7 +1816,7 @@
 Execute($create_query25);
 
 //Added on 06-06-06
-$create_table_query = "CREATE TABLE `campaigngrouprelation` (
+$create_table_query = "CREATE TABLE vtiger_campaigngrouprelation (
 	  `campaignid` int(19) NOT NULL,
 	    `groupname` varchar(100) default NULL,
 	      PRIMARY KEY  (`campaignid`),
@@ -1824,7 +1824,7 @@
 	) ENGINE=InnoDB";
 /*
 $create_table_query = "
-CREATE TABLE `campaigngrouprelation` (
+CREATE TABLE vtiger_campaigngrouprelation (
        `campaignid` int(19) NOT NULL,
        `groupname` varchar(100) default NULL,
 	PRIMARY KEY  (`campaignid`),
@@ -1837,14 +1837,14 @@
 
 
 //Added on 06-06-06
-$create_query26 = "CREATE TABLE `campaignleadrel` (
+$create_query26 = "CREATE TABLE vtiger_campaignleadrel (
 			`campaignid` int(19) NOT NULL default '0',
 			`leadid` int(19) NOT NULL default '0',
 			PRIMARY KEY  (`campaignid`),
 			KEY `campaignleadrel_leadid_campaignid_idx` (`leadid`,`campaignid`)
 		   ) ENGINE=InnoDB";
 /*
-$create_query26 = "CREATE TABLE `campaignleadrel` (
+$create_query26 = "CREATE TABLE vtiger_campaignleadrel (
   `campaignid` int(19) NOT NULL default '0',
   `leadid` int(19) NOT NULL default '0',
   PRIMARY KEY  (`campaignid`),
@@ -1855,7 +1855,7 @@
 */
 Execute($create_query26);
 
-$create_table_query1 = "CREATE TABLE `campaignscf` (
+$create_table_query1 = "CREATE TABLE vtiger_campaignscf (
   `campaignid` int(19) NOT NULL default '0',
    PRIMARY KEY  (`campaignid`),
    CONSTRAINT `fk_CampaignsCF` FOREIGN KEY (`campaignid`) REFERENCES `campaign` (`campaignid`) ON DELETE CASCADE
@@ -1863,11 +1863,11 @@
 Execute($create_table_query1);
 
 $alter_query_array18 = Array(
-				"alter vtiger_table vtiger_leaddetails add column vtiger_campaignid int(19) default NULL after leadid",
-				"alter vtiger_table vtiger_contactdetails add column  vtiger_campaignid int(19) default NULL after vtiger_accountid",
-				//"alter vtiger_table vtiger_notes drop PRIMARY KEY contact_id",
-				"alter vtiger_table vtiger_notes drop PRIMARY KEY , add primary key(notesid)",
-				"update vtiger_field set uitype=99 where vtiger_fieldname='update_log' and vtiger_tabid=13"
+			"alter table vtiger_leaddetails add column campaignid int(19) default NULL after leadid",
+			"alter table vtiger_contactdetails add column  campaignid int(19) default NULL after accountid",
+			//"alter table vtiger_notes drop PRIMARY KEY contact_id",
+			"alter table vtiger_notes drop PRIMARY KEY , add primary key(notesid)",
+			"update vtiger_field set uitype=99 where fieldname='update_log' and tabid=13"
 			    );
 foreach($alter_query_array18 as $query)
 {
@@ -1876,8 +1876,8 @@
 
 
 
-//echo "<br><br><b>Database Modifications for Indexing and some missded vtiger_tables starts here.....</b><br>";
-//Added queries which are for indexing and the missing vtiger_tables - Mickie - on 06-04-2006
+//echo "<br><br><b>Database Modifications for Indexing and some missded tables starts here.....</b><br>";
+//Added queries which are for indexing and the missing tables - Mickie - on 06-04-2006
 
 $query_array = Array(
 
@@ -1989,7 +1989,7 @@
 "ALTER TABLE `users_seq` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED",
 "ALTER TABLE `wordtemplates` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC",
 
-"CREATE TABLE `actualcost` (
+"CREATE TABLE vtiger_actualcost (
   `actualcostid` int(19) NOT NULL auto_increment,
   `actualcost` varchar(200) NOT NULL,
   `sortorderid` int(19) NOT NULL default '0',
@@ -1998,7 +1998,7 @@
   UNIQUE KEY `CampaignActCst_UK01` (`actualcost`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1",
 
-"CREATE TABLE `campaignstatus` (
+"CREATE TABLE vtiger_campaignstatus (
   `campaignstatusid` int(19) NOT NULL auto_increment,
   `campaignstatus` varchar(200) NOT NULL,
   `sortorderid` int(19) NOT NULL default '0',
@@ -2007,7 +2007,7 @@
   KEY `Campaignstatus_UK01` (`campaignstatus`)
 ) ENGINE=InnoDB",
 
-"CREATE TABLE `campaigntype` (
+"CREATE TABLE vtiger_campaigntype (
   `campaigntypeid` int(19) NOT NULL auto_increment,
   `campaigntype` varchar(200) NOT NULL,
   `sortorderid` int(19) NOT NULL default '0',
@@ -2016,11 +2016,11 @@
   UNIQUE KEY `Campaigntype_UK01` (`campaigntype`)
 ) ENGINE=InnoDB",
 
-"CREATE TABLE `currency_info_seq` (
+"CREATE TABLE vtiger_currency_info_seq (
   `id` int(11) NOT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1",
 
-"CREATE TABLE `datashare_module_rel` (
+"CREATE TABLE vtiger_datashare_module_rel (
   `shareid` int(19) NOT NULL,
   `tabid` int(19) NOT NULL,
   `relationtype` varchar(200) default NULL,
@@ -2029,7 +2029,7 @@
 ) ENGINE=InnoDB",
 
 //Added on 06-06-06
-"CREATE TABLE `datashare_grp2grp` (
+"CREATE TABLE vtiger_datashare_grp2grp (
 	  `shareid` int(19) NOT NULL,
 	    `share_groupid` int(19) default NULL,
 	      `to_groupid` int(19) default NULL,
@@ -2039,7 +2039,7 @@
 		      KEY `datashare_grp2grp_to_groupid_idx` (`to_groupid`)
 	      ) ENGINE=InnoDB",
 /*
-"CREATE TABLE `datashare_grp2grp` (
+"CREATE TABLE vtiger_datashare_grp2grp (
   `shareid` int(19) NOT NULL,
   `share_groupid` int(19) default NULL,
   `to_groupid` int(19) default NULL,
@@ -2053,7 +2053,7 @@
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1",
 */
 
-"CREATE TABLE `datashare_grp2role` (
+"CREATE TABLE vtiger_datashare_grp2role (
 	  `shareid` int(19) NOT NULL,
 	    `share_groupid` int(19) default NULL,
 	      `to_roleid` varchar(255) default NULL,
@@ -2063,7 +2063,7 @@
 		      KEY `idx_datashare_grp2role_to_roleid` (`to_roleid`)
 	      ) ENGINE=InnoDB",
 /*
-"CREATE TABLE `datashare_grp2role` (
+"CREATE TABLE vtiger_datashare_grp2role (
   `shareid` int(19) NOT NULL,
   `share_groupid` int(19) default NULL,
   `to_roleid` varchar(255) default NULL,
@@ -2078,7 +2078,7 @@
 */
 
 //Added on 06-06-06
-"CREATE TABLE `datashare_grp2rs` (
+"CREATE TABLE vtiger_datashare_grp2rs (
 	  `shareid` int(19) NOT NULL,
 	    `share_groupid` int(19) default NULL,
 	      `to_roleandsubid` varchar(255) default NULL,
@@ -2088,7 +2088,7 @@
 		      KEY `datashare_grp2rs_to_roleandsubid_idx` (`to_roleandsubid`)
 	      ) ENGINE=InnoDB",
 /*
-"CREATE TABLE `datashare_grp2rs` (
+"CREATE TABLE vtiger_datashare_grp2rs (
   `shareid` int(19) NOT NULL,
   `share_groupid` int(19) default NULL,
   `to_roleandsubid` varchar(255) default NULL,
@@ -2102,7 +2102,7 @@
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1",
 */
 
-"CREATE TABLE `datashare_relatedmodule_permission` (
+"CREATE TABLE vtiger_datashare_relatedmodule_permission (
   `shareid` int(19) NOT NULL,
   `datashare_relatedmodule_id` int(19) NOT NULL,
   `permission` int(19) default NULL,
@@ -2111,7 +2111,7 @@
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1",
 
 //Added on 06-06-06
-"CREATE TABLE `datashare_relatedmodules` (
+"CREATE TABLE vtiger_datashare_relatedmodules (
 	  `datashare_relatedmodule_id` int(19) NOT NULL,
 	    `tabid` int(19) default NULL,
 	      `relatedto_tabid` int(19) default NULL,
@@ -2120,7 +2120,7 @@
 		    KEY `datashare_relatedmodules_relatedto_tabid_idx` (`relatedto_tabid`)
 	    ) ENGINE=InnoDB",
 /*
-"CREATE TABLE `datashare_relatedmodules` (
+"CREATE TABLE vtiger_datashare_relatedmodules (
   `datashare_relatedmodule_id` int(19) NOT NULL,
   `tabid` int(19) default NULL,
   `relatedto_tabid` int(19) default NULL,
@@ -2132,12 +2132,12 @@
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1",
 */
 
-"CREATE TABLE `datashare_relatedmodules_seq` (
+"CREATE TABLE vtiger_datashare_relatedmodules_seq (
   `id` int(11) NOT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1",
 
 //Added on 06-06-06
-"CREATE TABLE `datashare_role2group` (
+"CREATE TABLE vtiger_datashare_role2group (
 	  `shareid` int(19) NOT NULL,
 	    `share_roleid` varchar(255) default NULL,
 	      `to_groupid` int(19) default NULL,
@@ -2147,7 +2147,7 @@
 		      KEY `idx_datashare_role2group_to_groupid` (`to_groupid`)
 	      ) ENGINE=InnoDB",
 /*
-"CREATE TABLE `datashare_role2group` (
+"CREATE TABLE vtiger_datashare_role2group (
   `shareid` int(19) NOT NULL,
   `share_roleid` varchar(255) default NULL,
   `to_groupid` int(19) default NULL,
@@ -2162,7 +2162,7 @@
 */
 
 //Added on 06-06-06
-"CREATE TABLE `datashare_role2role` (
+"CREATE TABLE vtiger_datashare_role2role (
 	  `shareid` int(19) NOT NULL,
 	    `share_roleid` varchar(255) default NULL,
 	      `to_roleid` varchar(255) default NULL,
@@ -2172,7 +2172,7 @@
 		      KEY `datashare_role2role_to_roleid_idx` (`to_roleid`)
 	      ) ENGINE=InnoDB",
 /*
-"CREATE TABLE `datashare_role2role` (
+"CREATE TABLE vtiger_datashare_role2role (
   `shareid` int(19) NOT NULL,
   `share_roleid` varchar(255) default NULL,
   `to_roleid` varchar(255) default NULL,
@@ -2187,7 +2187,7 @@
 */
 
 //Added on 06-06-06
-"CREATE TABLE `datashare_role2rs` (
+"CREATE TABLE vtiger_datashare_role2rs (
 	  `shareid` int(19) NOT NULL,
 	    `share_roleid` varchar(255) default NULL,
 	      `to_roleandsubid` varchar(255) default NULL,
@@ -2197,7 +2197,7 @@
 		      KEY `datashare_role2s_to_roleandsubid_idx` (`to_roleandsubid`)
 	      ) ENGINE=InnoDB",
 /*
-"CREATE TABLE `datashare_role2rs` (
+"CREATE TABLE vtiger_datashare_role2rs (
   `shareid` int(19) NOT NULL,
   `share_roleid` varchar(255) default NULL,
   `to_roleandsubid` varchar(255) default NULL,
@@ -2211,7 +2211,7 @@
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1",
 */
 
-"CREATE TABLE `datashare_rs2grp` (
+"CREATE TABLE vtiger_datashare_rs2grp (
   `shareid` int(19) NOT NULL,
   `share_roleandsubid` varchar(255) default NULL,
   `to_groupid` int(19) default NULL,
@@ -2221,7 +2221,7 @@
   KEY `datashare_rs2grp_to_groupid_idx` (`to_groupid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1",
 
-"CREATE TABLE `datashare_rs2role` (
+"CREATE TABLE vtiger_datashare_rs2role (
   `shareid` int(19) NOT NULL,
   `share_roleandsubid` varchar(255) default NULL,
   `to_roleid` varchar(255) default NULL,
@@ -2231,7 +2231,7 @@
   KEY `datashare_rs2role_to_roleid_idx` (`to_roleid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1",
 
-"CREATE TABLE `datashare_rs2rs` (
+"CREATE TABLE vtiger_datashare_rs2rs (
   `shareid` int(19) NOT NULL,
   `share_roleandsubid` varchar(255) default NULL,
   `to_roleandsubid` varchar(255) default NULL,
@@ -2241,7 +2241,7 @@
   KEY `idx_datashare_rs2rs_to_roleandsubid_idx` (`to_roleandsubid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1",
 
-"CREATE TABLE `expectedresponse` (
+"CREATE TABLE vtiger_expectedresponse (
   `expectedresponseid` int(19) NOT NULL auto_increment,
   `expectedresponse` varchar(200) NOT NULL,
   `sortorderid` int(19) NOT NULL default '0',
@@ -2250,7 +2250,7 @@
   UNIQUE KEY `CampaignExpRes_UK01` (`expectedresponse`)
 ) ENGINE=InnoDB",
 
-"CREATE TABLE `expectedrevenue` (
+"CREATE TABLE vtiger_expectedrevenue (
   `expectedrevenueid` int(19) NOT NULL auto_increment,
   `expectedrevenue` varchar(200) NOT NULL,
   `sortorderid` int(19) NOT NULL default '0',
@@ -2259,7 +2259,7 @@
   UNIQUE KEY `CampaignExpRev_UK01` (`expectedrevenue`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1",
 
-"CREATE TABLE `tmp_read_group_rel_sharing_per` (
+"CREATE TABLE vtiger_tmp_read_group_rel_sharing_per (
   `userid` int(11) NOT NULL,
   `tabid` int(11) NOT NULL,
   `relatedtabid` int(11) NOT NULL,
@@ -2268,7 +2268,7 @@
   KEY `tmp_read_group_rel_sharing_per_userid_sharedgroupid_tabid` (`userid`,`sharedgroupid`,`tabid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1",
 
-"CREATE TABLE `tmp_read_group_sharing_per` (
+"CREATE TABLE vtiger_tmp_read_group_sharing_per (
   `userid` int(11) NOT NULL,
   `tabid` int(11) NOT NULL,
   `sharedgroupid` int(11) NOT NULL,
@@ -2276,7 +2276,7 @@
   KEY `tmp_read_group_sharing_per_userid_sharedgroupid_idx` (`userid`,`sharedgroupid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1",
 
-"CREATE TABLE `tmp_read_user_rel_sharing_per` (
+"CREATE TABLE vtiger_tmp_read_user_rel_sharing_per (
   `userid` int(11) NOT NULL,
   `tabid` int(11) NOT NULL,
   `relatedtabid` int(11) NOT NULL,
@@ -2285,7 +2285,7 @@
   KEY `tmp_read_user_rel_sharing_per_userid_shared_reltabid_idx` (`userid`,`shareduserid`,`relatedtabid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1",
 
-"CREATE TABLE `tmp_read_user_sharing_per` (
+"CREATE TABLE vtiger_tmp_read_user_sharing_per (
   `userid` int(11) NOT NULL,
   `tabid` int(11) NOT NULL,
   `shareduserid` int(11) NOT NULL,
@@ -2293,7 +2293,7 @@
   KEY `tmp_read_user_sharing_per_userid_shareduserid_idx` (`userid`,`shareduserid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1",
 
-"CREATE TABLE `tmp_write_group_rel_sharing_per` (
+"CREATE TABLE vtiger_tmp_write_group_rel_sharing_per (
   `userid` int(11) NOT NULL,
   `tabid` int(11) NOT NULL,
   `relatedtabid` int(11) NOT NULL,
@@ -2302,7 +2302,7 @@
   KEY `tmp_write_group_rel_sharing_per_userid_sharedgroupid_tabid_idx` (`userid`,`sharedgroupid`,`tabid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1",
 
-"CREATE TABLE `tmp_write_group_sharing_per` (
+"CREATE TABLE vtiger_tmp_write_group_sharing_per (
   `userid` int(11) NOT NULL,
   `tabid` int(11) NOT NULL,
   `sharedgroupid` int(11) NOT NULL,
@@ -2310,7 +2310,7 @@
   KEY `tmp_write_group_sharing_per_UK1` (`userid`,`sharedgroupid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1",
 
-"CREATE TABLE `tmp_write_user_rel_sharing_per` (
+"CREATE TABLE vtiger_tmp_write_user_rel_sharing_per (
   `userid` int(11) NOT NULL,
   `tabid` int(11) NOT NULL,
   `relatedtabid` int(11) NOT NULL,
@@ -2319,7 +2319,7 @@
   KEY `tmp_write_user_rel_sharing_per_userid_sharduserid_tabid_idx` (`userid`,`shareduserid`,`tabid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1",
 
-"CREATE TABLE `tmp_write_user_sharing_per` (
+"CREATE TABLE vtiger_tmp_write_user_sharing_per (
   `userid` int(11) NOT NULL,
   `tabid` int(11) NOT NULL,
   `shareduserid` int(11) NOT NULL,
@@ -2669,18 +2669,18 @@
 
 //Added on 22-04-06 - to add the Notify Owner vtiger_field in Contacts and Accounts
 $notify_owner_array = Array(
-	"update vtiger_field set sequence=26 where vtiger_tabid=4 and vtiger_fieldname='modifiedtime'",
-	"update vtiger_field set sequence=25 where vtiger_tabid=4 and vtiger_fieldname='createdtime'",
+	"update vtiger_field set sequence=26 where tabid=4 and fieldname='modifiedtime'",
+	"update vtiger_field set sequence=25 where tabid=4 and fieldname='createdtime'",
 	
 	"insert into vtiger_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 vtiger_table vtiger_contactdetails add column notify_owner varchar(3) default 0 after reference",
-
-	"update vtiger_field set sequence=21 where vtiger_tabid=6 and vtiger_fieldname='modifiedtime'",
-	"update vtiger_field set sequence=20 where vtiger_tabid=6 and vtiger_fieldname='createdtime'",
-	"update vtiger_field set sequence=19 where vtiger_tabid=6 and vtiger_fieldname='assigned_user_id'",
+	"alter table vtiger_contactdetails add column notify_owner varchar(3) default 0 after reference",
+
+	"update vtiger_field set sequence=21 where tabid=6 and fieldname='modifiedtime'",
+	"update vtiger_field set sequence=20 where tabid=6 and fieldname='createdtime'",
+	"update vtiger_field set sequence=19 where tabid=6 and fieldname='assigned_user_id'",
 	
 	"insert into vtiger_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 vtiger_table vtiger_account add column notify_owner varchar(3) default 0 after emailoptout"
+	"alter table vtiger_account add column notify_owner varchar(3) default 0 after emailoptout"
 			   );
 foreach($notify_owner_array as $query)
 {
@@ -2693,12 +2693,12 @@
 
 //Quick Create Feature added for Vendor & PriceBook
 $quickcreate_query = Array(
-	"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 1 WHERE vtiger_tabid = 18 and vtiger_fieldname = 'vendorname'",
-	"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 2 WHERE vtiger_tabid = 18 and vtiger_fieldname = 'phone'",
-	"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 3 WHERE vtiger_tabid = 18 and vtiger_fieldname = 'email'",
-
-	"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 1 WHERE vtiger_tabid = 19 and vtiger_fieldname = 'bookname'",
-	"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 2 WHERE vtiger_tabid = 19 and vtiger_fieldname = 'active'"
+	"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 1 WHERE tabid = 18 and fieldname = 'vendorname'",
+	"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 2 WHERE tabid = 18 and fieldname = 'phone'",
+	"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 3 WHERE tabid = 18 and fieldname = 'email'",
+
+	"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 1 WHERE tabid = 19 and fieldname = 'bookname'",
+	"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 2 WHERE tabid = 19 and fieldname = 'active'"
 			  );
 foreach($quickcreate_query as $query)
 {
@@ -2711,12 +2711,12 @@
 $cvid2 = $conn->getUniqueID("customview");
 $customview_query_array = Array(
 	"insert into vtiger_customview(cvid,viewname,setdefault,setmetrics,entitytype) values(".$cvid1.",'All',1,0,'Campaigns')",
-	"insert into vtiger_cvcolumnlist (cvid,columnindex,columnname) values (".$cvid1.",0,'campaign:campaignname:campaignname:Campaigns_Campaign_Name:V')",
-	"insert into vtiger_cvcolumnlist (cvid,columnindex,columnname) values (".$cvid1.",1,'campaign:campaigntype:campaigntype:Campaigns_Campaign_Type:N')",
-	"insert into vtiger_cvcolumnlist (cvid,columnindex,columnname) values (".$cvid1.",2,'campaign:campaignstatus:campaignstatus:Campaigns_Campaign_Status:N')",
-	"insert into vtiger_cvcolumnlist (cvid,columnindex,columnname) values (".$cvid1.",3,'campaign:expectedrevenue:expectedrevenue:Campaigns_Expected_Revenue:V')",
-	"insert into vtiger_cvcolumnlist (cvid,columnindex,columnname) values (".$cvid1.",4,'campaign:closingdate:closingdate:Campaigns_Expected_Close_Date:D')",
-	"insert into vtiger_cvcolumnlist (cvid,columnindex,columnname) values (".$cvid1.",5,'crmentity:smownerid:assigned_user_id:Campaigns_Assigned_To:V')",
+	"insert into vtiger_cvcolumnlist (cvid,columnindex,columnname) values (".$cvid1.",0,'vtiger_campaign:campaignname:campaignname:Campaigns_Campaign_Name:V')",
+	"insert into vtiger_cvcolumnlist (cvid,columnindex,columnname) values (".$cvid1.",1,'vtiger_campaign:campaigntype:campaigntype:Campaigns_Campaign_Type:N')",
+	"insert into vtiger_cvcolumnlist (cvid,columnindex,columnname) values (".$cvid1.",2,'vtiger_campaign:campaignstatus:campaignstatus:Campaigns_Campaign_Status:N')",
+	"insert into vtiger_cvcolumnlist (cvid,columnindex,columnname) values (".$cvid1.",3,'vtiger_campaign:expectedrevenue:expectedrevenue:Campaigns_Expected_Revenue:V')",
+	"insert into vtiger_cvcolumnlist (cvid,columnindex,columnname) values (".$cvid1.",4,'vtiger_campaign:closingdate:closingdate:Campaigns_Expected_Close_Date:D')",
+	"insert into vtiger_cvcolumnlist (cvid,columnindex,columnname) values (".$cvid1.",5,'vtiger_crmentity:smownerid:assigned_user_id:Campaigns_Assigned_To:V')",
 
 
 	"insert into vtiger_customview(cvid,viewname,setdefault,setmetrics,entitytype) values(".$cvid2.",'All',1,0,'Webmails')",
@@ -2735,20 +2735,20 @@
 $query_array2 = Array(
 				"INSERT INTO vtiger_parenttabrel VALUES(2,4,2)",
 				"INSERT INTO vtiger_parenttabrel VALUES(2,6,3)",
-				"update vtiger_cvcolumnlist set columnname ='crmentity:smownerid:assigned_user_id:Emails_Sender:V' where cvid=20 and columnindex=3",
-				"update vtiger_field set sequence = 2 where columnname='filename' and vtiger_tablename = 'attachments'",
-				"delete from vtiger_cvcolumnlist where columnname = 'seactivityrel:crmid:parent_id:Emails_Related_To:I'",
+				"update vtiger_cvcolumnlist set columnname ='vtiger_crmentity:smownerid:assigned_user_id:Emails_Sender:V' where cvid=20 and columnindex=3",
+				"update vtiger_field set sequence = 2 where columnname='filename' and tablename = 'vtiger_attachments'",
+				"delete from vtiger_cvcolumnlist where columnname = 'vtiger_seactivityrel:crmid:parent_id:Emails_Related_To:I'",
 				"update vtiger_cvcolumnlist set columnindex = 1 where cvid=3 and columnindex=3",
-				"update vtiger_field set info_type='ADV' where vtiger_tabid=18 and columnname in ('street','pobox','city','state','postalcode','country','description')",
-				"update vtiger_field set info_type='ADV' where vtiger_tabid in (20,21,22,23) and columnname in ('description','terms_conditions')",
-
-				"create vtiger_table vtiger_inventorytaxinfo (taxid int(3) NOT NULL auto_increment, taxname varchar(50) default NULL, percentage decimal(7,3) default NULL,  PRIMARY KEY  (taxid), KEY vtiger_inventorytaxinfo_taxname_idx (taxname))",
-				"create vtiger_table vtiger_producttaxrel ( productid int(11) NOT NULL, taxid int(3) NOT NULL, taxpercentage decimal(7,3) default NULL, KEY vtiger_producttaxrel_productid_idx (productid), KEY vtiger_producttaxrel_taxid_idx (taxid))",
+				"update vtiger_field set info_type='ADV' where tabid=18 and columnname in ('street','pobox','city','state','postalcode','country','description')",
+				"update vtiger_field set info_type='ADV' where tabid in (20,21,22,23) and columnname in ('description','terms_conditions')",
+
+				"create table vtiger_inventorytaxinfo (taxid int(3) NOT NULL auto_increment, taxname varchar(50) default NULL, percentage decimal(7,3) default NULL,  PRIMARY KEY  (taxid), KEY vtiger_inventorytaxinfo_taxname_idx (taxname))",
+				"create table vtiger_producttaxrel ( productid int(11) NOT NULL, taxid int(3) NOT NULL, taxpercentage decimal(7,3) default NULL, KEY vtiger_producttaxrel_productid_idx (productid), KEY vtiger_producttaxrel_taxid_idx (taxid))",
 
 				"insert into vtiger_inventorytaxinfo values(".$conn->getUniqueID("inventorytaxinfo").",'VAT','4.5')",
 				"insert into vtiger_inventorytaxinfo values(".$conn->getUniqueID("inventorytaxinfo").",'Sales','10')",
 				"insert into vtiger_inventorytaxinfo values(".$conn->getUniqueID("inventorytaxinfo").",'Service','12.5')",
-				"update vtiger_field set uitype=83, vtiger_tablename='producttaxrel' where vtiger_tabid=14 and vtiger_fieldname='taxclass'",
+				"update vtiger_field set uitype=83, tablename='producttaxrel' where tabid=14 and fieldname='taxclass'",
 				"insert into vtiger_moduleowners values(".$this->localGetTabID('Campaigns').",1)",
 
 				"alter table vtiger_attachments add column path varchar(255) default NULL"
@@ -2842,10 +2842,10 @@
 
 }
 
-$update_query3 = "update vtiger_currency_info set conversion_rate=1, vtiger_currency_status='Active', defaultid='-11' where id=1";
+$update_query3 = "update vtiger_currency_info set conversion_rate=1, currency_status='Active', defaultid='-11' where id=1";
 Execute($update_query3);
 
-$update_query4 = "update vtiger_relatedlists set label='Purchase Order' where vtiger_tabid=18 and name='get_purchase_orders'";
+$update_query4 = "update vtiger_relatedlists set label='Purchase Order' where tabid=18 and name='get_purchase_orders'";
 Execute($update_query4);
 
 
@@ -2880,12 +2880,12 @@
 
 
 $obj_array = Array('Leads'=>'leaddetails','Contacts'=>'contactdetails');
-$leadfieldid = $conn->query_result($conn->query("select vtiger_fieldid from vtiger_field where vtiger_tabid=7 and vtiger_fieldname='email'"),0,'fieldid');
-$contactfieldid = $conn->query_result($conn->query("select vtiger_fieldid from vtiger_field where vtiger_tabid=4 and vtiger_fieldname='email'"),0,'fieldid');
+$leadfieldid = $conn->query_result($conn->query("select fieldid from vtiger_field where tabid=7 and fieldname='email'"),0,'fieldid');
+$contactfieldid = $conn->query_result($conn->query("select fieldid from vtiger_field where tabid=4 and fieldname='email'"),0,'fieldid');
 $fieldid_array = Array("Leads"=>"$leadfieldid","Contacts"=>"$contactfieldid");
 $idname_array = Array("Leads"=>"leadid","Contacts"=>"contactid");
 
-$query = 'select * from vtiger_seactivityrel where vtiger_activityid in (select vtiger_activityid from vtiger_activity where vtiger_activitytype="Emails")';
+$query = 'select * from vtiger_seactivityrel where activityid in (select activityid from vtiger_activity where activitytype="Emails")';
 $result = $conn->query($query);
 $numofrows = $conn->num_rows($result);
 
@@ -2907,7 +2907,7 @@
 		$result2 = $conn->query("select lastname, firstname, email from $obj_array[$module] where $idname_array[$module] = $parentid");
 		$toemail = $conn->query_result($result2,0,'lastname').' '.$conn->query_result($result2,0,'firstname').'<'.$conn->query_result($result2,0,'email').'>###';
 
-		//insert this idlists and toemail values in vtiger_emaildetails vtiger_table
+		//insert this idlists and toemail values in vtiger_emaildetails table
 		$sql = "insert into vtiger_emaildetails values ($emailid,'',\"$toemail\",'','','',\"$idlists\",'SAVE')";
 		Execute($sql);
 	}
@@ -2917,25 +2917,25 @@
 	}
 }
 
-$update_query5 = "update vtiger_field set quickcreate=1, quickcreatesequence=NULL where vtiger_tabid in (10,14)";
+$update_query5 = "update vtiger_field set quickcreate=1, quickcreatesequence=NULL where tabid in (10,14)";
 Execute($update_query5);
 
 $alter_query_array18 = Array(
-				"alter vtiger_table vtiger_soproductrel add column vattax decimal(7,3) default NULL",
-				"alter vtiger_table vtiger_soproductrel add column salestax decimal(7,3) default NULL",
-				"alter vtiger_table vtiger_soproductrel add column servicetax decimal(7,3) default NULL",
+				"alter table vtiger_soproductrel add column vattax decimal(7,3) default NULL",
+				"alter table vtiger_soproductrel add column salestax decimal(7,3) default NULL",
+				"alter table vtiger_soproductrel add column servicetax decimal(7,3) default NULL",
 				
-				"alter vtiger_table vtiger_poproductrel add column vattax decimal(7,3) default NULL",
-				"alter vtiger_table vtiger_poproductrel add column salestax decimal(7,3) default NULL",
-				"alter vtiger_table vtiger_poproductrel add column servicetax decimal(7,3) default NULL",
+				"alter table vtiger_poproductrel add column vattax decimal(7,3) default NULL",
+				"alter table vtiger_poproductrel add column salestax decimal(7,3) default NULL",
+				"alter table vtiger_poproductrel add column servicetax decimal(7,3) default NULL",
 				
-				"alter vtiger_table vtiger_quotesproductrel add column vattax decimal(7,3) default NULL",
-				"alter vtiger_table vtiger_quotesproductrel add column salestax decimal(7,3) default NULL",
-				"alter vtiger_table vtiger_quotesproductrel add column servicetax decimal(7,3) default NULL",
+				"alter table vtiger_quotesproductrel add column vattax decimal(7,3) default NULL",
+				"alter table vtiger_quotesproductrel add column salestax decimal(7,3) default NULL",
+				"alter table vtiger_quotesproductrel add column servicetax decimal(7,3) default NULL",
 				
-				"alter vtiger_table vtiger_invoiceproductrel add column vattax decimal(7,3) default NULL",
-				"alter vtiger_table vtiger_invoiceproductrel add column salestax decimal(7,3) default NULL",
-				"alter vtiger_table vtiger_invoiceproductrel add column servicetax decimal(7,3) default NULL",
+				"alter table vtiger_invoiceproductrel add column vattax decimal(7,3) default NULL",
+				"alter table vtiger_invoiceproductrel add column salestax decimal(7,3) default NULL",
+				"alter table vtiger_invoiceproductrel add column servicetax decimal(7,3) default NULL",
 			    );
 foreach($alter_query_array18 as $query)
 {
@@ -2944,8 +2944,8 @@
 
 
 
-//Security vtiger_profile and vtiger_tab vtiger_table handling by DON starts
-$sql_sec="select vtiger_profileid from  vtiger_profile";
+//Security vtiger_profile and vtiger_tab table handling by DON starts
+$sql_sec="select profileid from  vtiger_profile";
 $result_sec=$conn->query($sql_sec);
 $num_rows=$conn->num_rows($result_sec);
 for($i=0;$i<$num_row;$i++)
@@ -2980,18 +2980,18 @@
 
 }
 
-//Inserting into vtiger_tab vtiger_tables
+//Inserting into vtiger_tab tables
 $sec2="INSERT INTO vtiger_tab VALUES (27,'Portal',0,24,'Portal',null,null,1)";
 $sec3="INSERT INTO vtiger_tab VALUES (28,'Webmails',0,25,'Webmails',null,null,1)";
 
-//Insert into vtiger_def_org_share vtiger_tables
+//Insert into vtiger_def_org_share tables
 $sec4="insert into vtiger_def_org_share values (".$conn->getUniqueID('def_org_share').",26,2,0)";	
 
 Execute($sec2);
 Execute($sec3);
 Execute($sec4);
 
-//Inserting into datashare related modules vtiger_table
+//Inserting into datashare related modules table
 
 Execute("insert into vtiger_datashare_relatedmodules_seq values(1)");
 	
@@ -3021,14 +3021,14 @@
 //By Don Ends
 
 //Added the vtiger_tabel vtiger_mail_accounts which has been added by mmbrich
-$alter_query18 = "alter vtiger_table vtiger_mail_accounts add column int_mailer int(1) default '0'";
+$alter_query18 = "alter table vtiger_mail_accounts add column int_mailer int(1) default '0'";
 Execute($alter_query18);
 
 $update_query_array5 = Array(
-	"update vtiger_field set info_type='BAS' where vtiger_tabid=6 and vtiger_fieldname in ('tickersymbol','account_id')",
-	"update vtiger_relatedlists set label = 'Activity History' where vtiger_tabid in (4,6,7,20,21,22,23) and label = 'History'",
-	"update vtiger_relatedlists set label = 'Products' where vtiger_tabid=2 and name='get_products' and label='History'",
-	"update vtiger_relatedlists set label = 'Activity History' where vtiger_tabid=2 and name='get_history' and label='History'"
+	"update vtiger_field set info_type='BAS' where tabid=6 and fieldname in ('tickersymbol','account_id')",
+	"update vtiger_relatedlists set label = 'Activity History' where tabid in (4,6,7,20,21,22,23) and label = 'History'",
+	"update vtiger_relatedlists set label = 'Products' where tabid=2 and name='get_products' and label='History'",
+	"update vtiger_relatedlists set label = 'Activity History' where tabid=2 and name='get_history' and label='History'"
 			    );
 foreach($update_query_array5 as $query)
 {
@@ -3172,14 +3172,14 @@
 		alert("Currency Changes has been made Successfully");
 	}
 
-	if(!confirm("Are you using Dollar $ as Currency? \n Click OK to remain as $, Cancel to change the vtiger_currency conversion rate."))
+	if(!confirm("Are you using Dollar $ as Currency? \n Click OK to remain as $, Cancel to change the currency conversion rate."))
 	{
 		getConversionRate('');
 	}
 
 	function getConversionRate(err)
 	{
-		var crate = prompt(err+"\nPlease enter the conversion rate of your vtiger_currency");
+		var crate = prompt(err+"\nPlease enter the conversion rate of your currency");
 
 		if(crate != 0 && crate > 0)
 		{
@@ -3227,8 +3227,8 @@
 	}
 }
 
-//Added on 23-12-2005 which is used to populate the vtiger_profile2field and vtiger_def_org_field vtiger_table entries for the vtiger_field per vtiger_tab
-//if we enter a vtiger_field in vtiger_field vtiger_table then we must populate that vtiger_field in these vtiger_table for security access
+//Added on 23-12-2005 which is used to populate the vtiger_profile2field and vtiger_def_org_field table entries for the field per tab
+//if we enter a vtiger_field in vtiger_field table then we must populate that vtiger_field in these table for security access
 function populateFieldForSecurity($tabid,$fieldid)
 {
 	global $conn;



From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 22 07:26:44 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 22 Jun 2006 14:26:44 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231316=3A?=
 =?utf-8?q?_Problem_in_VCRM_4=2E2=2E4?=
In-Reply-To: <076.bd13c28908a052328e19e2f345da9f18@vtiger.fosslabs.com>
References: <076.bd13c28908a052328e19e2f345da9f18@vtiger.fosslabs.com>
Message-ID: <085.3c3909efe6c8b8e4a44c193bee04fc64@vtiger.fosslabs.com>

#1316: Problem in VCRM 4.2.4
------------------------+---------------------------------------------------
  Reporter:  Simon      |       Owner:  developer                
      Type:  defect     |      Status:  new                      
  Priority:  major      |   Milestone:  4.2.4                    
 Component:  vtigercrm  |     Version:                           
Resolution:             |    Keywords:  email, quote, sales order
------------------------+---------------------------------------------------
Comment (by machaven at gmail.com):

 Found same problem in vtiger 5 beta.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1316>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 22 08:28:09 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 22 Jun 2006 15:28:09 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7433 - in /vtigercrm/trunk:
 Smarty/templates/FieldAccess.tpl
 Smarty/templates/Settings/PickListContents.tpl
 modules/Users/DefaultFieldPermissions.php
Message-ID: <20060622152809.6EF2883F52D@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 22 09:28:02 2006
New Revision: 7433

Log:
issue in field access and PickList has been fixed

Modified:
    vtigercrm/trunk/Smarty/templates/FieldAccess.tpl
    vtigercrm/trunk/Smarty/templates/Settings/PickListContents.tpl
    vtigercrm/trunk/modules/Users/DefaultFieldPermissions.php

Modified: vtigercrm/trunk/Smarty/templates/FieldAccess.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/FieldAccess.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/FieldAccess.tpl Thu Jun 22 09:28:02 2006
@@ -16,110 +16,106 @@
 <tbody><tr>
         <td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
         <td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
-<br>
+	<br>
 	<div align=center>
 	
-			{include file='SetMenu.tpl'}
-				<!-- DISPLAY -->
-				<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
-				<form action="index.php" method="post" name="new" id="form">
-				<input type="hidden" name="module" value="Users">
-				<input type="hidden" name="parenttab" value="Settings">
-				<input type="hidden" name="fld_module" id="fld_module">
-				{if $MODE neq 'view'}
-				<input type="hidden" name="action" value="UpdateDefaultFieldLevelAccess">
-				{else}
-				<input type="hidden" name="action" value="EditDefOrgFieldLevelAccess">
-				{/if}	
-				<tr>
-					<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}orgshar.gif" alt="Users" width="48" height="48" border=0 title="Users"></td>
-					<td colspan=2 class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > {$MOD.LBL_FIELDS_ACCESS} </b></td>
-					<td rowspan=2 class="small" align=right>&nbsp;</td>
-				</tr>
-				<tr>
-					<td valign=top class="small">{$MOD.LBL_SHARING_FIELDS_DESCRIPTION}</td>
-				</tr>
-				</table>
-				<br>
-				<table border=0 cellspacing=0 cellpadding=5 width=100% class="tableHeading">
-				<tr>
-					<td class="big"><strong>{$CMOD.LBL_GLOBAL_FIELDS_MANAGER}</strong></td>
-					<td class="small" align=right>
-					{if $MODE neq 'edit'}
-						<input name="Edit" type="submit" class="crmButton small edit" value="{$APP.LBL_EDIT_BUTTON}" >									
-					{else}
-						<input title="save" accessKey="S" class="crmButton small save" type="submit" name="Save" value="{$APP.LBL_SAVE_LABEL}">
-						<input name="Cancel" value=" {$APP.LBL_CANCEL_BUTTON_LABEL} " class="crmButton small cancel" type="button" onClick="window.history.back();">
-					{/if}
-					</td>
-				</tr>
-				</table>
-				<table width="100%" border="0" cellpadding="5" cellspacing="0" class="listTableTopButtons">
-                  <tr >
-                    <td  style="padding-left:5px;" class="big">{$CMOD.LBL_SELECT_SCREEN}&nbsp; 
+	{include file='SetMenu.tpl'}
+		<!-- DISPLAY -->
+		<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
+		<form action="index.php" method="post" name="new" id="form">
+		<input type="hidden" name="module" value="Users">
+		<input type="hidden" name="parenttab" value="Settings">
+		<input type="hidden" name="fld_module" id="fld_module" value="{$DEF_MODULE}">
+		{if $MODE neq 'view'}
+			<input type="hidden" name="action" value="UpdateDefaultFieldLevelAccess">
+		{else}
+			<input type="hidden" name="action" value="EditDefOrgFieldLevelAccess">
+		{/if}	
+		<tr>
+			<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}orgshar.gif" alt="Users" width="48" height="48" border=0 title="Users"></td>
+			<td colspan=2 class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > {$MOD.LBL_FIELDS_ACCESS} </b></td>
+			<td rowspan=2 class="small" align=right>&nbsp;</td>
+		</tr>
+		<tr>
+			<td valign=top class="small">{$MOD.LBL_SHARING_FIELDS_DESCRIPTION}</td>
+		</tr>
+		</table>
+		<br>
+		<table border=0 cellspacing=0 cellpadding=5 width=100% class="tableHeading">
+		<tr>
+			<td class="big"><strong>{$CMOD.LBL_GLOBAL_FIELDS_MANAGER}</strong></td>
+			<td class="small" align=right>
+			{if $MODE neq 'edit'}
+				<input name="Edit" type="submit" class="crmButton small edit" value="{$APP.LBL_EDIT_BUTTON}" >									
+			{else}
+				<input title="save" accessKey="S" class="crmButton small save" type="submit" name="Save" value="{$APP.LBL_SAVE_LABEL}">
+				<input name="Cancel" value=" {$APP.LBL_CANCEL_BUTTON_LABEL} " class="crmButton small cancel" type="button" onClick="window.history.back();">
+			{/if}
+			</td>
+		</tr>
+		</table>
+		<table width="100%" border="0" cellpadding="5" cellspacing="0" class="listTableTopButtons">
+                <tr>
+        		<td  style="padding-left:5px;" class="big">{$CMOD.LBL_SELECT_SCREEN}&nbsp; 
 			<select name="Screen" class="detailedViewTextBox" style="width:30%;"  onChange="changemodules(this)">
-				{foreach item=module from=$FIELD_INFO}
+			{foreach item=module from=$FIELD_INFO}
 				{if $module == $DEF_MODULE}
 					<option selected value='{$module}'>{$APP.$module}</option>
 				{else}		
 					<option value='{$module}' >{$APP.$module}</option>
 				{/if}
-				{/foreach}
+			{/foreach}
 			</select>
-		    </td>
-                    <td align="right">&nbsp;</td>
-                  </tr>
-		  </table>
-				{foreach key=module item=info name=allmodules from=$FIELD_LISTS}
-				{$module}      {$DEF_MODULE}
-				{if $module == $DEF_MODULE}
-				<div id="{$module}_fields" style="display:block">	
-				{else}
-				<div id="{$module}_fields" style="display:none">	
-				{/if}
-				 <table cellspacing=0 cellpadding=5 width=100% class="listTable small">
-                   <tr>
-				   			<td colspan="2" class="listRow" valign="top" nowrap>
-								<b>{$CMOD.LBL_FIELDS_AVLBL} {$APP.$module}</b>
-							</td>
-				   </tr>
-				   <tr>
-                     <td valign=top width="25%" >
-		     <table border=0 cellspacing=0 cellpadding=5 width=100% class=small>
-			{foreach item=elements name=groupfields from=$info}
-                         <tr>
-				{foreach item=elementinfo name=curvalue from=$elements}
-                           <td class="prvPrfTexture" style="width:20px">&nbsp;</td>
-                           <td width="5%" id="{$smarty.foreach.allmodules.iteration}_{$smarty.foreach.groupfields.iteration}_{$smarty.foreach.curvalue.iteration}">{$elementinfo.1}</td>
-                           <td width="25%" nowrap  onMouseOver="this.className='prvPrfHoverOn',$('{$smarty.foreach.allmodules.iteration}_{$smarty.foreach.groupfields.iteration}_{$smarty.foreach.curvalue.iteration}').className='prvPrfHoverOn'" onMouseOut="this.className='prvPrfHoverOff',$('{$smarty.foreach.allmodules.iteration}_{$smarty.foreach.groupfields.iteration}_{$smarty.foreach.curvalue.iteration}').className='prvPrfHoverOff'">{$elementinfo.0}</td>
-				{/foreach}
-                         </tr>
+		    	</td>
+	                <td align="right">&nbsp;</td>
+                </tr>
+		</table>
+		{foreach key=module item=info name=allmodules from=$FIELD_LISTS}
+		{if $module eq $DEF_MODULE}
+			<div id="{$module}_fields" style="display:block">	
+		{else}
+			<div id="{$module}_fields" style="display:none">	
+		{/if}
+	 	<table cellspacing=0 cellpadding=5 width=100% class="listTable small">
+       		<tr>
+			<td colspan="2" class="listRow" valign="top" nowrap>
+			<b>{$CMOD.LBL_FIELDS_AVLBL} {$APP.$module}</b>
+			</td>
+		</tr>
+		<tr>
+                	<td valign=top width="25%" >
+		     	<table border=0 cellspacing=0 cellpadding=5 width=100% class=small>
+				{foreach item=elements name=groupfields from=$info}
+                        	<tr>
+					{foreach item=elementinfo name=curvalue from=$elements}
+                           		<td class="prvPrfTexture" style="width:20px">&nbsp;</td>
+                           		<td width="5%" id="{$smarty.foreach.allmodules.iteration}_{$smarty.foreach.groupfields.iteration}_{$smarty.foreach.curvalue.iteration}">{$elementinfo.1}</td>
+                           		<td width="25%" nowrap  onMouseOver="this.className='prvPrfHoverOn',$('{$smarty.foreach.allmodules.iteration}_{$smarty.foreach.groupfields.iteration}_{$smarty.foreach.curvalue.iteration}').className='prvPrfHoverOn'" onMouseOut="this.className='prvPrfHoverOff',$('{$smarty.foreach.allmodules.iteration}_{$smarty.foreach.groupfields.iteration}_{$smarty.foreach.curvalue.iteration}').className='prvPrfHoverOff'">{$elementinfo.0}</td>
+					{/foreach}
+                         	</tr>
                          	{/foreach}
-                     </table>
-				</div>
+                     	</table>
 			</td>
-                   </tr>
-				{/foreach}
-                 </table></td>
-			</tr>
+                </tr>
                 </table>
-				<br>
-				<br>
-				<table border=0 cellspacing=0 cellpadding=5 width=100% >
-				<tr><td class="small" ><div align=right><a href="#top">{$MOD.LBL_SCROLL}</a></div></td></tr>				</table>
-				
-			
-			
-			
-			</td>
-			</tr>
-			</table>
-		</td>
+		</div>
+		{/foreach}
+	</td>
 	</tr>
-	</form>
+        </table>
+	<br>
+	<br>
+	<table border=0 cellspacing=0 cellpadding=5 width=100% >
+		<tr><td class="small" ><div align=right><a href="#top">{$MOD.LBL_SCROLL}</a></div></td></tr>
 	</table>
-		
-	</div>
+</td>
+</tr>
+</table>
+</td>
+</tr>
+</form>
+</table>
+</div>
 </td>
         <td valign="top"><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
    </tr>

Modified: vtigercrm/trunk/Smarty/templates/Settings/PickListContents.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Settings/PickListContents.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Settings/PickListContents.tpl Thu Jun 22 09:28:02 2006
@@ -1,38 +1,40 @@
-	<strong>2. {$MOD.LBL_PICKLIST_AVAIL} {$MODULE} </strong></td>
+	<table  class="tableHeading" border="0" cellpadding="5" cellspacing="0" width="100%"><tr><td><strong>2. {$MOD.LBL_PICKLIST_AVAIL} {$MODULE} </strong></td>
 		<td class="small" align=right>&nbsp;</td>
 		</tr>
 	</table>
 	<table border=0 cellspacing=0 cellpadding=0 width=100% class="listTable">
 	<tr>
 		<td valign=top width="50%">
-		<table width="100%" class="listTable" cellpadding="5" cellspacing="0">
-		{foreach item=picklists from=$PICKLIST_VALUES}
-		<tr>
-		{foreach item=picklistfields from=$picklists}
-		{if $picklistfields neq ''}
-			<td class="listTableTopButtons small" valign="top" align="left"><b>{$picklistfields.fieldlabel}</b></td>
-			<td class="listTableTopButtons" valign="top" align="right">
-				<input type="button" value="Edit" class="crmButton small edit" onclick="fetchEditPickList('{$MODULE}','{$picklistfields.fieldname}');posLay(this,'editdiv');" > 
-			</td>
-		{else}
-			<td class="listTableTopButtons small" colspan="2">&nbsp;</td>
-		{/if}
-		{/foreach}
-		</tr>
-		<tr>
-		{foreach item=picklistelements from=$picklists}
-		{if $picklistelements neq ''}
-			<td colspan="2" valign="top">
-				<ul style="list-style-type: none;">
-					{foreach item=elements from=$picklistelements.value}
-						<li>{$elements}</li>
-					{/foreach}
-				</ul>	
-			</td>
-		{else}
-			<td colspan="2">&nbsp;</td>
-		{/if}
-		{/foreach}
-		</tr>
+			<table width="100%" class="listTable" cellpadding="5" cellspacing="0">
+			{foreach item=picklists from=$PICKLIST_VALUES}
+			<tr>
+				{foreach item=picklistfields from=$picklists}
+				{if $picklistfields neq ''}
+					<td class="listTableTopButtons small" valign="top" align="left"><b>{$picklistfields.fieldlabel}</b></td>
+					<td class="listTableTopButtons" valign="top" align="right">
+					<input type="button" value="Edit" class="crmButton small edit" onclick="fetchEditPickList('{$MODULE}','{$picklistfields.fieldname}');posLay(this,'editdiv');" > 
+					</td>
+				{else}
+					<td class="listTableTopButtons small" colspan="2">&nbsp;</td>
+				{/if}
+				{/foreach}
+			</tr>
+			<tr>
+				{foreach item=picklistelements from=$picklists}
+				{if $picklistelements neq ''}
+					<td colspan="2" valign="top">
+					<ul style="list-style-type: none;">
+						{foreach item=elements from=$picklistelements.value}
+							<li>{$elements}</li>
+						{/foreach}
+					</ul>	
+					</td>
+				{else}
+					<td colspan="2">&nbsp;</td>
+			{/if}
+			{/foreach}
+			</tr>
 		{/foreach}
 		</table> 
+		</td></tr>
+		</table>

Modified: vtigercrm/trunk/modules/Users/DefaultFieldPermissions.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DefaultFieldPermissions.php (original)
+++ vtigercrm/trunk/modules/Users/DefaultFieldPermissions.php Thu Jun 22 09:28:02 2006
@@ -58,7 +58,7 @@
 		
 		if($adb->query_result($fieldListResult,$i,"visible") == 0)
 		{
-			$visible = "<img src=".$image_path."/yes.gif>";
+			$visible = "<img src=".$image_path."/prvPrfSelectedTick.gif>";
 		}
 		else
 		{
@@ -67,7 +67,7 @@
 		$standCustFld []= $visible;
 	}
 	$standCustFld=array_chunk($standCustFld,2);	
-	$standCustFld=array_chunk($standCustFld,2);	
+	$standCustFld=array_chunk($standCustFld,4);	
 	return $standCustFld;
 }
 



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 22 20:48:44 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 03:48:44 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7434 -
 /vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
Message-ID: <20060623034845.C31DE7E8A2C@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 22 21:48:40 2006
New Revision: 7434

Log:
campaign added as relatedlist for contact and lead

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

Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original)
+++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Thu Jun 22 21:48:40 2006
@@ -240,7 +240,6 @@
  $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'rating','vtiger_leaddetails',1,'15','rating','Rating',1,0,0,100,15,13,1,'V~O',1,null,'ADV')");
  $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'noofemployees','vtiger_leaddetails',1,'1','noofemployees','No Of Employees',1,0,0,100,16,13,1,'V~O',1,null,'ADV')");
  $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,17,13,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'campaignid','vtiger_leaddetails',1,'58','campaignid','Campaign Source',1,0,0,100,18,13,1,'I~O',1,null,'BAS')");
  $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'yahooid','vtiger_leaddetails',1,'13','yahooid','Yahoo Id',1,0,0,100,18,13,1,'V~O',1,null,'ADV')");
 $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,19,13,2,'T~O',1,null,'BAS')");
  $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,20,13,2,'T~O',1,null,'BAS')");
@@ -277,7 +276,6 @@
  $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'lastname','vtiger_contactdetails',1,'2','lastname','Last Name',1,0,0,100,4,4,1,'V~M',0,2,'BAS')");	
  $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'mobile','vtiger_contactdetails',1,'1','mobile','Mobile',1,0,0,100,5,4,1,'V~O',1,null,'BAS')");	
  $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'accountid','vtiger_contactdetails',1,'51','account_id','Account Name',1,0,0,100,6,4,1,'I~O',0,3,'BAS')");	
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'campaignid','vtiger_contactdetails',1,'58','campaignid','Campaign Source',1,0,0,100,6,4,1,'I~O',1,null,'BAS')");
  $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'homephone','vtiger_contactsubdetails',1,'11','homephone','Home Phone',1,0,0,100,7,4,1,'V~O',1,null,'ADV')");	
  $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'leadsource','vtiger_contactsubdetails',1,'15','leadsource','Lead Source',1,0,0,100,8,4,1,'V~O',1,null,'BAS')");	
  $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'otherphone','vtiger_contactsubdetails',1,'11','otherphone','Phone',1,0,0,100,9,4,1,'V~O',1,null,'BAS')");
@@ -1670,6 +1668,8 @@
 	
 	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Leads").",".getTabid("Products").",'get_products',5,'Products',0)");
 
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Leads").",".getTabid("Campaigns").",'get_campaigns',6,'Campaigns',0)");
+
 	//Inserting for contact related lists
 	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Potentials").",'get_opportunities',1,'Potentials',0)");	
 		
@@ -1692,6 +1692,8 @@
 	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Activities").",'get_history',9,'Activity History',0)");
 
 	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",0,'get_attachments',10,'Attachments',0)");
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Campaigns").",'get_campaigns',11,'Campaigns',0)");
 
 	//Inserting Potential Related Lists	
 



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 22 20:51:12 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 03:51:12 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7435 -
	/vtigercrm/trunk/schema/DatabaseSchema.xml
Message-ID: <20060623035112.CF34E7E8A2C@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 22 21:51:08 2006
New Revision: 7435

Log:
campaignid has been removed from vtiger_contactdetails and vtiger_leaddetails tables

Modified:
    vtigercrm/trunk/schema/DatabaseSchema.xml

Modified: vtigercrm/trunk/schema/DatabaseSchema.xml
==============================================================================
--- vtigercrm/trunk/schema/DatabaseSchema.xml (original)
+++ vtigercrm/trunk/schema/DatabaseSchema.xml Thu Jun 22 21:51:08 2006
@@ -392,7 +392,6 @@
 			<constraint>REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="accountid" type="I" size="19" />
-		<field name="campaignid" type="I" size="19" />
 		<field name="salutation" type="C" size="50">
 			<default value="Mr" />
 		</field>
@@ -520,7 +519,6 @@
 			<key />
 			<constraint>REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE</constraint>
 		</field>
-		<field name="campaignid" type="I" size="19" />
 		<field name="email" type="C" size="100" />
 		<field name="interest" type="C" size="50" />
 		<field name="firstname" type="C" size="40" />



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 22 20:58:27 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 03:58:27 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7436 -
	/vtigercrm/trunk/modules/Leads/Lead.php
Message-ID: <20060623035827.09E2E83F725@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 22 21:58:24 2006
New Revision: 7436

Log:
changes made to include campaign as lead related list

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

Modified: vtigercrm/trunk/modules/Leads/Lead.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/Lead.php (original)
+++ vtigercrm/trunk/modules/Leads/Lead.php Thu Jun 22 21:58:24 2006
@@ -19,6 +19,7 @@
 require_once('data/SugarBean.php');
 require_once('data/CRMEntity.php');
 require_once('modules/Activities/Activity.php');
+require_once('modules/Campaigns/Campaign.php');
 require_once('modules/Notes/Note.php');
 require_once('modules/Emails/Email.php');
 require_once('include/ComboUtil.php');
@@ -197,6 +198,28 @@
 	$log->debug("Exiting get_activities method ...");
 	return  GetRelatedList('Leads','Activities',$focus,$query,$button,$returnset);
 }
+
+/** Returns a list of the associated Campaigns
+  * @param $id -- campaign id :: Type Integer
+  * @returns list of campaigns in array format
+  */
+function get_campaigns($id)
+{
+	global $log;
+	$log->debug("Entering get_campaigns(".$id.") method ...");
+	global $mod_strings;
+	$focus = new Campaign();
+	$button = '';
+
+	$returnset = '';
+	$log->info("Campaign Related List for Lead Displayed");
+	$query = "SELECT vtiger_users.user_name, vtiger_campaign.campaignid, vtiger_campaign.campaignname, vtiger_campaign.campaigntype, vtiger_campaign.campaignstatus, vtiger_campaign.expectedrevenue, vtiger_campaign.closingdate, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_campaign inner join vtiger_campaignleadrel on vtiger_campaignleadrel.campaignid=vtiger_campaign.campaignid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_campaign.campaignid left join vtiger_campaigngrouprelation on vtiger_campaign.campaignid=vtiger_campaigngrouprelation.campaignid left join vtiger_groups on vtiger_groups.groupname=vtiger_campaigngrouprelation.groupname left join vtiger_users on vtiger_users.id = vtiger_crmentity.smownerid where vtiger_campaignleadrel.leadid=".$id." and vtiger_crmentity.deleted=0";
+
+	$log->debug("Exiting get_emails method ...");
+	return GetRelatedList('Contacts','Campaigns',$focus,$query,$button,$returnset);
+
+}
+
 
 	/** Returns a list of the associated emails
 	*/



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 22 21:08:06 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 04:08:06 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7437 - in
 /vtigercrm/trunk/modules: Contacts/Contact.php Leads/Lead.php
Message-ID: <20060623040806.8B96183F72C@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 22 22:08:01 2006
New Revision: 7437

Log:
changes made to include campaign as lead related list

Modified:
    vtigercrm/trunk/modules/Contacts/Contact.php
    vtigercrm/trunk/modules/Leads/Lead.php

Modified: vtigercrm/trunk/modules/Contacts/Contact.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/Contact.php (original)
+++ vtigercrm/trunk/modules/Contacts/Contact.php Thu Jun 22 22:08:01 2006
@@ -27,6 +27,7 @@
 require_once('include/utils/utils.php');
 require_once('modules/Potentials/Opportunity.php');
 require_once('modules/Activities/Activity.php');
+require_once('modules/Campaigns/Campaign.php');
 require_once('modules/Notes/Note.php');
 require_once('modules/Emails/Email.php');
 require_once('modules/HelpDesk/HelpDesk.php');
@@ -476,12 +477,34 @@
 
 		$log->info("Email Related List for Contact Displayed");
 
-		$query = "select vtiger_activity.activityid, vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.activitytype, vtiger_users.user_name, vtiger_crmentity.modifiedtime, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_activity.date_start from vtiger_activity, vtiger_seactivityrel, vtiger_contactdetails, vtiger_users, vtiger_crmentity left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.activityid = vtiger_activity.activityid and vtiger_contactdetails.contactid = vtiger_seactivityrel.crmid and vtiger_users.id=vtiger_crmentity.smownerid and vtiger_crmentity.crmid = vtiger_activity.activityid  and vtiger_contactdetails.contactid = ".$id." and vtiger_activity.activitytype='Emails' and vtiger_crmentity.deleted = 0";
+		$query = "select vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.activitytype, vtiger_users.user_name, vtiger_crmentity.modifiedtime, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_activity.date_start from vtiger_activity, vtiger_seactivityrel, vtiger_contactdetails, vtiger_users, vtiger_crmentity left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.activityid = vtiger_activity.activityid and vtiger_contactdetails.contactid = vtiger_seactivityrel.crmid and vtiger_users.id=vtiger_crmentity.smownerid and vtiger_crmentity.crmid = vtiger_activity.activityid  and vtiger_contactdetails.contactid = ".$id." and vtiger_activity.activitytype='Emails' and vtiger_crmentity.deleted = 0";
 		$log->debug("Exiting get_emails method ...");
 		return GetRelatedList('Contacts','Emails',$focus,$query,$button,$returnset);
 	}
 
-	
+	/** Returns a list of the associated Campaigns
+	  * @param $id -- campaign id :: Type Integer
+	  * @returns list of campaigns in array format
+	  */
+	      
+	function get_campaigns($id)
+	{
+		global $log;
+		$log->debug("Entering get_campaigns(".$id.") method ...");
+		global $mod_strings;
+
+		$focus = new Campaign();
+		$button = '';
+
+		$returnset = '';
+		$log->info("Campaign Related List for Contact Displayed");
+		$query = "SELECT vtiger_users.user_name, vtiger_campaign.campaignid, vtiger_campaign.campaignname, vtiger_campaign.campaigntype, vtiger_campaign.campaignstatus, vtiger_campaign.expectedrevenue, vtiger_campaign.closingdate, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_campaign inner join vtiger_campaigncontrel on vtiger_campaigncontrel.campaignid=vtiger_campaign.campaignid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_campaign.campaignid left join vtiger_campaigngrouprelation on vtiger_campaign.campaignid=vtiger_campaigngrouprelation.campaignid left join vtiger_groups on vtiger_groups.groupname=vtiger_campaigngrouprelation.groupname left join vtiger_users on vtiger_users.id = vtiger_crmentity.smownerid where vtiger_campaigncontrel.contactid=".$id." and vtiger_crmentity.deleted=0";
+
+		$log->debug("Exiting get_campaigns method ...");
+		return GetRelatedList('Contacts','Campaigns',$focus,$query,$button,$returnset);
+
+	}
+
 
 
 

Modified: vtigercrm/trunk/modules/Leads/Lead.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/Lead.php (original)
+++ vtigercrm/trunk/modules/Leads/Lead.php Thu Jun 22 22:08:01 2006
@@ -215,7 +215,7 @@
 	$log->info("Campaign Related List for Lead Displayed");
 	$query = "SELECT vtiger_users.user_name, vtiger_campaign.campaignid, vtiger_campaign.campaignname, vtiger_campaign.campaigntype, vtiger_campaign.campaignstatus, vtiger_campaign.expectedrevenue, vtiger_campaign.closingdate, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_campaign inner join vtiger_campaignleadrel on vtiger_campaignleadrel.campaignid=vtiger_campaign.campaignid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_campaign.campaignid left join vtiger_campaigngrouprelation on vtiger_campaign.campaignid=vtiger_campaigngrouprelation.campaignid left join vtiger_groups on vtiger_groups.groupname=vtiger_campaigngrouprelation.groupname left join vtiger_users on vtiger_users.id = vtiger_crmentity.smownerid where vtiger_campaignleadrel.leadid=".$id." and vtiger_crmentity.deleted=0";
 
-	$log->debug("Exiting get_emails method ...");
+	$log->debug("Exiting get_campaigns method ...");
 	return GetRelatedList('Contacts','Campaigns',$focus,$query,$button,$returnset);
 
 }



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 22 21:15:34 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 04:15:34 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7438 -
	/vtigercrm/trunk/include/language/en_us.lang.php
Message-ID: <20060623041534.655AA83F72A@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 22 22:15:30 2006
New Revision: 7438

Log:
label included for campaign

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

Modified: vtigercrm/trunk/include/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/include/language/en_us.lang.php (original)
+++ vtigercrm/trunk/include/language/en_us.lang.php Thu Jun 22 22:15:30 2006
@@ -189,6 +189,8 @@
 'LBL_SELECT_CONTACT_BUTTON_KEY'=>'T',
 
 'LBL_SELECT_CONTACT_BUTTON_LABEL'=>'Select Contact',
+
+'LBL_SELECT_CAMPAIGN_BUTTON_LABEL'=>'Select Campaign',
 
 'LBL_SELECT_USER_BUTTON_TITLE'=>'Select User [Alt+U]',
 
@@ -900,6 +902,7 @@
 
 //Added after 5.0 Alpha5
 'Campaign Name'=>'Campaign Name',
+'Campaign Type'=>'Campaign Type',
 'LBL_ACTIONS'=>'Actions',
 'LBL_SEND'=>'Send',
 'LBL_VAT'=>'VAT',



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 22 21:18:47 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 04:18:47 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7439 - in
 /vtigercrm/trunk/modules: Contacts/CallRelatedList.php
 Leads/CallRelatedList.php
Message-ID: <20060623041847.276F883F72A@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 22 22:18:42 2006
New Revision: 7439

Log:
unwanted code has been removed

Modified:
    vtigercrm/trunk/modules/Contacts/CallRelatedList.php
    vtigercrm/trunk/modules/Leads/CallRelatedList.php

Modified: vtigercrm/trunk/modules/Contacts/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/Contacts/CallRelatedList.php Thu Jun 22 22:18:42 2006
@@ -33,10 +33,6 @@
 $accountid = $adb->query_result($sql,0,'accountid');
 if($accountid == 0) $accountid='';
 
-$sql1 = $adb->query('select campaignid from vtiger_contactdetails where contactid='.$focus->id);
-$campaignid = $adb->query_result($sql1,0,'campaignid');
-if($campaignid == 0) $campaignid='';
-
 global $mod_strings;
 global $app_strings;
 global $theme;
@@ -47,7 +43,6 @@
 
 $smarty = new vtigerCRM_Smarty;
 $smarty->assign("accountid",$accountid);
-$smarty->assign("campaignid",$campaignid);
 	
 
 if(isset($_request['isduplicate']) && $_request['isduplicate'] == 'true') {

Modified: vtigercrm/trunk/modules/Leads/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/Leads/CallRelatedList.php Thu Jun 22 22:18:42 2006
@@ -50,11 +50,6 @@
        unset($_SESSION['rlvs']);
  }
 	
-$sql1 = $adb->query('select campaignid from vtiger_leaddetails where leadid='.$focus->id);
-$campaignid = $adb->query_result($sql1,0,'campaignid');
-if($campaignid == 0) $campaignid='';
-$smarty->assign("campaignid",$campaignid);
-
 $category = getParentTab();
 $smarty->assign("CATEGORY",$category);
 $parent_email = getEmailParentsList('Leads',$focus->id);



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 22 21:22:07 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 04:22:07 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7440 -
	/vtigercrm/trunk/Popup.php
Message-ID: <20060623042208.1415583F72A@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 22 22:22:04 2006
New Revision: 7440

Log:
multiselect enabled in campaign popup

Modified:
    vtigercrm/trunk/Popup.php

Modified: vtigercrm/trunk/Popup.php
==============================================================================
--- vtigercrm/trunk/Popup.php (original)
+++ vtigercrm/trunk/Popup.php Thu Jun 22 22:22:04 2006
@@ -56,6 +56,7 @@
 		$smarty->assign("SINGLE_MOD",'Campaign');
 		if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] !='')
 			$smarty->assign("RETURN_MODULE",$_REQUEST['return_module']);
+		if (isset($_REQUEST['select'])) $smarty->assign("SELECT",'enable');
 		$alphabetical = AlphabeticalSearch($currentModule,'Popup','campaignname','true','basic',$popuptype,"","","");
 		break;
 	case 'Accounts':



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 22 21:40:35 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 04:40:35 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7441 -
	/vtigercrm/trunk/include/utils/ListViewUtils.php
Message-ID: <20060623044036.0DC1F83F723@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 22 22:40:32 2006
New Revision: 7441

Log:
changes made to get unselected campaigns in campaign popup

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 Thu Jun 22 22:40:32 2006
@@ -1312,12 +1312,7 @@
 					$temp_val =$temp_val.' '.$firstname;
 
 					$focus->record_id = $_REQUEST['recordid'];
-					if($module == 'Leads')
-						$value = '<a href="a" LANGUAGE=javascript onclick=\'add_leaddata_to_relatedlist("'.$entity_id.'","'.$focus->record_id.'"); window.close()\'>'.$temp_val.'</a>';
-					elseif($module == 'Users')
-						$value = '<a href="a" LANGUAGE=javascript onclick=\'add_userdata_to_relatedlist("'.$entity_id.'","'.$focus->record_id.'"); window.close()\'>'.$temp_val.'</a>';
-					else
-						$value = '<a href="a" LANGUAGE=javascript onclick=\'add_data_to_relatedlist("'.$entity_id.'","'.$focus->record_id.'"); window.close()\'>'.$temp_val.'</a>';
+					$value = '<a href="a" LANGUAGE=javascript onclick=\'add_data_to_relatedlist("'.$entity_id.'","'.$focus->record_id.'","'.$module.'"); window.close()\'>'.$temp_val.'</a>';
 				}
 				elseif($popuptype == "formname_specific")
 				{
@@ -2567,7 +2562,21 @@
 		$field = 'id';
 		$table = 'vtiger_users';
 	}
-	
+	elseif($currentmodule=="Campaigns" && $returnmodule == "Leads")
+	{
+		$reltable = 'vtiger_campaignleadrel';
+		$condition = 'WHERE leadid = '.$recordid;;
+		$field = $selectfield = 'campaignid';
+		$table = 'vtiger_campaign';
+	}
+	elseif($currentmodule=="Campaigns" && $returnmodule == "Contacts")
+	{
+		$reltable = 'vtiger_campaigncontrel';
+		$condition = 'WHERE contactid = '.$recordid;;
+		$field = $selectfield = 'campaignid';
+		$table = 'vtiger_campaign';
+	}
+
 	if($reltable != null)
 		$query = "SELECT ".$selectfield." FROM ".$reltable." ".$condition;
 



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 22 21:46:19 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 04:46:19 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7442 -
	/vtigercrm/trunk/modules/Campaigns/Campaign.php
Message-ID: <20060623044619.00A2283F749@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 22 22:46:15 2006
New Revision: 7442

Log:
query has been modified

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 Jun 22 22:46:15 2006
@@ -33,15 +33,21 @@
 	var $sortby_fields = Array('campaignname','smownerid','expectedcost');
 
 	var $list_fields = Array(
-					'Campaign ID'=>Array('crmentity'=>'crmid'),
 					'Campaign Name'=>Array('campaign'=>'campaignname'),
 					'Campaign Type'=>Array('campaign'=>'campaigntype'),
 					'Campaign Status'=>Array('campaign'=>'campaignstatus'),
+					'Expected Revenue'=>Array('campaign'=>'expectedrevenue'),
+					'Expected Close Date'=>Array('campaign'=>'closingdate'),
+					'Assigned To' => Array('crmentity'=>'smownerid')
 				);
 
 	var $list_fields_name = Array(
-					'Campaign ID'=>'',
 					'Campaign Name'=>'campaignname',
+					'Campaign Type'=>'campaigntype',
+					'Campaign Status'=>'campaignstatus',
+					'Expected Revenue'=>'expectedrevenue',
+					'Expected Close Date'=>'closingdate',
+					'Assigned To'=>'assigned_user_id'
 				     );	  			
 
 	var $list_link_field= 'campaignname';
@@ -75,9 +81,8 @@
                 $focus = new Contact();
                 $button = '';
                 $returnset = '&return_module=Campaigns&return_action=CallRelatedList&return_id='.$id;
-		//$query = 'select vtiger_contactdetails.accountid, vtiger_users.user_name,vtiger_groups.groupname,vtiger_campaign.campaignid, vtiger_campaign.campaignname, vtiger_contactdetails.contactid, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.title, vtiger_contactdetails.department, vtiger_contactdetails.email, vtiger_contactdetails.phone, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_campaign inner join vtiger_campaigncontrel on vtiger_campaigncontrel.campaignid = vtiger_campaign.campaignid inner join vtiger_contactdetails on vtiger_campaigncontrel.contactid = vtiger_contactdetails.contactid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid left join vtiger_groups on vtiger_groups.groupname=vtiger_contactgrouprelation.groupname left join vtiger_users on vtiger_crmentity.smownerid=vtiger_users.id where vtiger_campaign.campaignid = '.$id.' and vtiger_crmentity.deleted=0';
-
-		$query = 'SELECT vtiger_contactdetails.*, vtiger_crmentity.crmid, vtiger_users.user_name, vtiger_groups.groupname, vtiger_crmentity.smownerid from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid left join vtiger_users on vtiger_crmentity.smownerid = vtiger_users.id left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid left join vtiger_groups on vtiger_groups.groupname=vtiger_contactgrouprelation.groupname  where vtiger_crmentity.deleted=0 and vtiger_contactdetails.campaignid = '.$id;
+		$query = 'select vtiger_contactdetails.accountid, vtiger_users.user_name,vtiger_groups.groupname, vtiger_contactdetails.contactid, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.title, vtiger_contactdetails.department, vtiger_contactdetails.email, vtiger_contactdetails.phone, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_contactdetails inner join vtiger_campaigncontrel on vtiger_campaigncontrel.contactid = vtiger_contactdetails.contactid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid left join vtiger_groups on vtiger_groups.groupname=vtiger_contactgrouprelation.groupname left join vtiger_users on vtiger_crmentity.smownerid=vtiger_users.id where vtiger_campaigncontrel.campaignid = '.$id.' and vtiger_crmentity.deleted=0';
+		
 		$log->debug("Exiting get_contacts method ...");
                 return GetRelatedList('Campaigns','Contacts',$focus,$query,$button,$returnset);
         }
@@ -92,7 +97,7 @@
                 $button = '';
                 $returnset = '&return_module=Campaigns&return_action=CallRelatedList&return_id='.$id;
 
-		$query = 'SELECT vtiger_leaddetails.*, vtiger_crmentity.crmid, vtiger_users.user_name, vtiger_groups.groupname, vtiger_crmentity.smownerid from vtiger_leaddetails inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_leaddetails.leadid left join vtiger_users on vtiger_crmentity.smownerid = vtiger_users.id left join vtiger_leadgrouprelation on vtiger_leaddetails.leadid=vtiger_leadgrouprelation.leadid left join vtiger_groups on vtiger_groups.groupname=vtiger_leadgrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_leaddetails.campaignid = '.$id;
+		$query = 'SELECT vtiger_leaddetails.*, vtiger_crmentity.crmid, vtiger_users.user_name, vtiger_groups.groupname, vtiger_crmentity.smownerid from vtiger_leaddetails inner join vtiger_campaignleadrel on vtiger_campaignleadrel.leadid=vtiger_leaddetails.leadid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_leaddetails.leadid left join vtiger_users on vtiger_crmentity.smownerid = vtiger_users.id left join vtiger_leadgrouprelation on vtiger_leaddetails.leadid=vtiger_leadgrouprelation.leadid left join vtiger_groups on vtiger_groups.groupname=vtiger_leadgrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_campaignleadrel.campaignid = '.$id;
 		$log->debug("Exiting get_leads method ...");
                 return GetRelatedList('Campaigns','Leads',$focus,$query,$button,$returnset);
         }



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 22 21:50:12 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 04:50:12 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7443 - in
 /vtigercrm/trunk/modules: Contacts/updateRelations.php
 Leads/updateRelations.php
Message-ID: <20060623045012.2D0E329908F@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 22 22:50:06 2006
New Revision: 7443

Log:
file added to update the relation between lead/contact and campaign

Added:
    vtigercrm/trunk/modules/Contacts/updateRelations.php
    vtigercrm/trunk/modules/Leads/updateRelations.php



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 22 21:54:25 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 04:54:25 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7444 -
 /vtigercrm/trunk/Smarty/templates/RelatedListContents.tpl
Message-ID: <20060623045425.DF96B299091@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 22 22:54:22 2006
New Revision: 7444

Log:
select campaign button has been included

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

Modified: vtigercrm/trunk/Smarty/templates/RelatedListContents.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/RelatedListContents.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/RelatedListContents.tpl Thu Jun 22 22:54:22 2006
@@ -61,6 +61,8 @@
 				{/if}
 			{elseif $header eq 'HelpDesk'}
 				<input title="{$APP.LBL_ADD_NEW} {$APP.Ticket}" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='HelpDesk'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Ticket}"></td>
+			{elseif $header eq 'Campaigns'}
+                                <input title="Change" accessKey="" class="small" value="{$APP.LBL_SELECT_BUTTON_LABEL} {$APP.Campaign}" LANGUAGE=javascript onclick='return window.open("index.php?module=Campaigns&return_module={$MODULE}&action=Popup&popuptype=detailview&select=enable&form=EditView&form_submit=false&recordid={$ID}","test","width=640,height=570,resizable=0,scrollbars=0");' type="button"  name="button"></td>
 			{elseif $header eq 'Attachments'}
 				<input title="{$APP.LBL_ADD_NEW} {$APP.Note}" accessyKey="F" class="small" onclick="this.form.action.value='EditView'; this.form.return_action.value='CallRelatedList'; this.form.module.value='Notes'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Note}">&nbsp;
 				<input type="hidden" name="fileid">



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 22 21:57:06 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 04:57:06 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7445 -
	/vtigercrm/trunk/Smarty/templates/Popup.tpl
Message-ID: <20060623045706.A7A7C299091@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 22 22:57:00 2006
New Revision: 7445

Log:
unwanted js function has been removed

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

Modified: vtigercrm/trunk/Smarty/templates/Popup.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Popup.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Popup.tpl Thu Jun 22 22:57:00 2006
@@ -17,18 +17,11 @@
 <script language="JavaScript" type="text/javascript" src="modules/{$MODULE}/{$SINGLE_MOD}.js"></script>
 <script language="javascript" type="text/javascript" src="include/scriptaculous/prototype.js"></script>
 <script type="text/javascript">
-function add_data_to_relatedlist(entity_id,recordid) {ldelim}
+function add_data_to_relatedlist(entity_id,recordid,mod) {ldelim}
 
-        opener.document.location.href="index.php?module={$RETURN_MODULE}&action=updateRelations&destination_module=Contacts&entityid="+entity_id+"&parid="+recordid;
+        opener.document.location.href="index.php?module={$RETURN_MODULE}&action=updateRelations&destination_module="+mod+"&entityid="+entity_id+"&parid="+recordid;
 {rdelim}
 
-function add_leaddata_to_relatedlist(entity_id,recordid) {ldelim}
-        opener.document.location.href="index.php?module={$RETURN_MODULE}&action=updateRelations&destination_module=Leads&entityid="+entity_id+"&parid="+recordid;
-{rdelim}
-
-function add_userdata_to_relatedlist(userid,recordid) {ldelim}
-        opener.document.location.href="index.php?module={$RETURN_MODULE}&action=updateRelations&destination_module=Users&user_id="+userid+"&record="+recordid;
-{rdelim}
 </script>
 <body class="small" marginwidth=0 marginheight=0 leftmargin=0 topmargin=0 bottommargin=0 rigthmargin=0>
 <table width="100%" border="0" cellspacing="0" cellpadding="0" class="small">



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 22 22:19:27 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 05:19:27 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7446 - in
 /vtigercrm/trunk/Smarty/templates: DetailViewFields.tpl DetailViewUI.tpl
Message-ID: <20060623051927.45FA683F750@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 22 23:19:22 2006
New Revision: 7446

Log:
currency symbol has been removed fieldvalue as it is uppended in field label

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

Modified: vtigercrm/trunk/Smarty/templates/DetailViewFields.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DetailViewFields.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DetailViewFields.tpl Thu Jun 22 23:19:22 2006
@@ -17,8 +17,8 @@
                                          		<td width=25% class="dvtCellInfo" align="left">&nbsp;
                                          		      {if $keyid eq '55'}<!--SalutationSymbol-->
                                          		            {$keysalut}
-                                         		      {elseif $keyid eq '71' || $keyid eq '72'}  <!--CurrencySymbol-->
-                                         		            {$keycursymb}
+                                         		      {*elseif $keyid eq '71' || $keyid eq '72'}  <!--CurrencySymbol-->
+                                         		            {$keycursymb*}
                                                         	{/if}
                                                        {$keyval}
                                                   </td>

Modified: vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl Thu Jun 22 23:19:22 2006
@@ -17,8 +17,8 @@
                                          		<td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">
                                          		      {if $keyid eq '55'}<!--SalutationSymbol-->
                                          		            {$keysalut}
-                                         		      {elseif $keyid eq '71' || $keyid eq '72'}  <!--CurrencySymbol-->
-                                         		            {$keycursymb}
+                                         		      {*elseif $keyid eq '71' || $keyid eq '72'}  <!--CurrencySymbol-->
+                                         		            {$keycursymb*}
                                                         {/if}
                                                        &nbsp;&nbsp;<span id="dtlview_{$label}">{$keyval}</span>
                                               		<div id="editarea_{$label}" style="display:none;">



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 22 22:34:50 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 05:34:50 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7447 -
	/vtigercrm/trunk/include/utils/DetailViewUtils.php
Message-ID: <20060623053451.221A883F746@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 22 23:34:46 2006
New Revision: 7447

Log:
changes made to get currency symbol when no value is set

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 Thu Jun 22 23:34:46 2006
@@ -765,12 +765,12 @@
 	{
 		$label_fld[] =$mod_strings[$fieldlabel];
 		$display_val = '';
-		if($col_fields[$fieldname] != '' && $col_fields[$fieldname] != 0)
-		{
-		    $currencyid=fetchCurrency($current_user->id);
-		    $rate_symbol = getCurrencySymbolandCRate($currencyid);
-		    $rate = $rate_symbol['rate'];
-		    $curr_symbol = $rate_symbol['symbol'];
+		$currencyid=fetchCurrency($current_user->id);
+		$rate_symbol = getCurrencySymbolandCRate($currencyid);
+		$rate = $rate_symbol['rate'];
+		$curr_symbol = $rate_symbol['symbol'];
+	        if($col_fields[$fieldname] != '' && $col_fields[$fieldname] != 0)
+		{
 	 	    $amount_user_specific=convertFromDollar($col_fields[$fieldname],$rate);
                     $display_val = $amount_user_specific;	
 		}



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 22 22:52:12 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 05:52:12 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7448 -
	/vtigercrm/trunk/modules/Dashboard/index.php
Message-ID: <20060623055212.B9D7C83F745@vtiger.fosslabs.com>

Author: richie
Date: Thu Jun 22 23:52:09 2006
New Revision: 7448

Log:
added 3 additional dashboards

Modified:
    vtigercrm/trunk/modules/Dashboard/index.php

Modified: vtigercrm/trunk/modules/Dashboard/index.php
==============================================================================
--- vtigercrm/trunk/modules/Dashboard/index.php (original)
+++ vtigercrm/trunk/modules/Dashboard/index.php Thu Jun 22 23:52:09 2006
@@ -58,6 +58,9 @@
 	  "ticketsbyuser" => $mod_strings['ticketsbyuser'],
 	  "ticketsbyteam" => $mod_strings['ticketsbyteam'],
 	  "ticketsbyproduct"=> $mod_strings['ticketsbyproduct'],
+	  "contactbycampaign"=> $mod_strings['contactbycampaign'],
+	  "ticketsbyaccount"=> $mod_strings['ticketsbyaccount'],
+	  "ticketsbycontact"=> $mod_strings['ticketsbycontact'],
           );
           
 $log = LoggerManager::getLogger('dashboard');



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 22 22:55:30 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 05:55:30 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7449 -
 /vtigercrm/trunk/modules/Dashboard/display_charts.php
Message-ID: <20060623055530.7131583F750@vtiger.fosslabs.com>

Author: richie
Date: Thu Jun 22 23:55:26 2006
New Revision: 7449

Log:
added 3 additional dashboard related queries

Modified:
    vtigercrm/trunk/modules/Dashboard/display_charts.php

Modified: vtigercrm/trunk/modules/Dashboard/display_charts.php
==============================================================================
--- vtigercrm/trunk/modules/Dashboard/display_charts.php (original)
+++ vtigercrm/trunk/modules/Dashboard/display_charts.php Thu Jun 22 23:55:26 2006
@@ -65,7 +65,17 @@
 //Query for tickets
 $helpdesk_query=" select vtiger_troubletickets.status AS ticketstatus, vtiger_ticketgrouprelation.groupname AS ticketgroupname, vtiger_troubletickets.*,vtiger_crmentity.* from vtiger_troubletickets inner join vtiger_ticketcf on vtiger_ticketcf.ticketid = vtiger_troubletickets.ticketid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_troubletickets.ticketid left join vtiger_ticketgrouprelation on vtiger_troubletickets.ticketid=vtiger_ticketgrouprelation.ticketid left join vtiger_groups on vtiger_groups.groupname=vtiger_ticketgrouprelation.groupname left join vtiger_contactdetails on vtiger_troubletickets.parent_id=vtiger_contactdetails.contactid left join vtiger_account on vtiger_account.accountid=vtiger_troubletickets.parent_id left join vtiger_users on vtiger_crmentity.smownerid=vtiger_users.id and vtiger_troubletickets.ticketid = vtiger_ticketcf.ticketid where vtiger_crmentity.deleted=0";
 
- /**  This function returns  the values for the graph, for any type of graph needed	 
+//Query for campaigns
+$campaign_query=" select vtiger_campaign.*,vtiger_crmentity.* from vtiger_campaign inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_campaign.campaignid inner join vtiger_campaigncontrel where vtiger_campaigncontrel.campaignid=vtiger_campaign.campaignid and vtiger_crmentity.deleted=0";
+
+
+//Query for tickets by account
+$tickets_by_account="select vtiger_troubletickets.*, vtiger_account.* from vtiger_troubletickets inner join vtiger_account on vtiger_account.accountid=vtiger_troubletickets.parent_id";
+ 
+//Query for tickets by contact
+$tickets_by_contact="select vtiger_troubletickets.*, vtiger_contactdetails.* from vtiger_troubletickets inner join vtiger_contactdetails on vtiger_contactdetails.contactid=vtiger_troubletickets.parent_id";
+
+/**  This function returns  the values for the graph, for any type of graph needed	 
         * Portions created by vtiger are Copyright (C) vtiger.
         * All Rights Reserved.
         * Contributor(s): ______________________________________..
@@ -97,6 +107,9 @@
 	  "ticketsbyuser" => $mod_strings['ticketsbyuser'],
 	  "ticketsbyteam" => $mod_strings['ticketsbyteam'],
 	  "ticketsbyproduct"=> $mod_strings['ticketsbyproduct'],
+	  "contactbycampaign"=> $mod_strings['contactbycampaign'],
+	  "ticketsbyaccount"=> $mod_strings['ticketsbyaccount'],
+	  "ticketsbycontact"=> $mod_strings['ticketsbycontact'],
           );
 function get_graph_by_type($graph_by,$graph_title,$module,$where,$query)
 {
@@ -643,6 +656,36 @@
 			    $query=$helpdesk_query;
 			    echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
 		    }
+		    //Campaigns by Contact
+		    elseif (($type == "contactbycampaign") && (getFieldVisibilityPermission('Campaigns',$user_id,'campaignid') == "0"))
+		    {
+			    $graph_by="campaignid";
+			    $graph_title=$mod_strings['ticketsbycampaign'];
+			    $module="Campaigns";
+			    $where="";
+			    $query=$campaign_query;
+			    echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
+		    }
+		    //Tickets by Account
+		    elseif (($type == "ticketsbyaccount") && (getFieldVisibilityPermission('HelpDesk',$user_id,'accountid') == "0"))
+		    {
+			    $graph_by="accountid";
+			    $graph_title=$mod_strings['ticketsbyaccount'];
+			    $module="HelpDesk";
+			    $where="";
+			    $query=$tickets_by_account;
+			    echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
+		    }
+			    //Tickets by Contact
+			    elseif (($type == "ticketsbycontact") && (getFieldVisibilityPermission('HelpDesk',$user_id,'contactid') == "0"))
+			    {
+				    $graph_by="contactid";
+				    $graph_title=$mod_strings['ticketsbycontact'];
+				    $module="HelpDesk";
+				    $where="";
+				    $query=$tickets_by_contact;
+				    echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
+				    }
 		    else
                     {
                         echo $mod_strings['LBL_NO_PERMISSION_FIELD'];



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 22 22:56:07 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 05:56:07 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7450 -
 /vtigercrm/trunk/modules/Dashboard/language/en_us.lang.php
Message-ID: <20060623055607.3B90983F750@vtiger.fosslabs.com>

Author: richie
Date: Thu Jun 22 23:56:03 2006
New Revision: 7450

Log:
added 3 additional dashboard related entries

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

Modified: vtigercrm/trunk/modules/Dashboard/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Dashboard/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Dashboard/language/en_us.lang.php Thu Jun 22 23:56:03 2006
@@ -80,6 +80,9 @@
 "ticketsbyuser"=>"Tickets by User",
 "ticketsbyteam"=>"Tickets by Team",
 "ticketsbyproduct"=>"Tickets by Product",
+"contactbycampaign"=>"Contacts by Campaign",
+"ticketsbyaccount"=>"Tickets by Account",
+"ticketsbycontact"=>"Tickets by Contact",
 
 'LBL_DASHBRD_HOME'=>'Dashboard Home',
 'LBL_HORZ_BAR_CHART'=>'Horizontal Bar Chart',



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 22 22:58:00 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 05:58:00 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7451 -
 /vtigercrm/trunk/modules/Dashboard/horizontal_bargraph.php
Message-ID: <20060623055800.E957A83F750@vtiger.fosslabs.com>

Author: richie
Date: Thu Jun 22 23:57:57 2006
New Revision: 7451

Log:
14 changed to 44 to accomodate bigger names

Modified:
    vtigercrm/trunk/modules/Dashboard/horizontal_bargraph.php

Modified: vtigercrm/trunk/modules/Dashboard/horizontal_bargraph.php
==============================================================================
--- vtigercrm/trunk/modules/Dashboard/horizontal_bargraph.php (original)
+++ vtigercrm/trunk/modules/Dashboard/horizontal_bargraph.php Thu Jun 22 23:57:57 2006
@@ -43,7 +43,7 @@
 		$alts[]=$name."=%d";
 //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);
+                        $name=substr($name, 0, 44);
 		if($pos>=2)
 		{
 			$val=explode(" ",$name);



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 22 23:04:54 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 06:04:54 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7452 -
	/vtigercrm/trunk/modules/Dashboard/Entity_charts.php
Message-ID: <20060623060454.74D0D83F75F@vtiger.fosslabs.com>

Author: richie
Date: Fri Jun 23 00:04:50 2006
New Revision: 7452

Log:
additional 2 conditions added

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 Fri Jun 23 00:04:50 2006
@@ -232,6 +232,38 @@
 					if($name_val!="")
 						$name=$name_val;
 				}
+	if($graph_for =="campaignid")
+				{
+					//this will return the list of the names of the campaign``:w for the y-axis
+					$query = "SELECT campaignname FROM vtiger_campaign WHERE campaignid='".$name."'";
+					$result = $adb->query($query);
+					$name_val = $adb->query_result($result,0,"campaignname");
+					if($name_val!="")
+						$name=$name_val;
+				}
+			if($graph_for =="contactid")
+				{
+					$query = "SELECT lastname FROM vtiger_contactdetails WHERE contactid='".$name."'";
+					echo '>>>>>>>>>. '.$query;
+					$result = $adb->query($query);
+					$name_val = $adb->query_result($result,0,"lastname");
+					if($name_val!="")
+						$name=$name_val;
+				}
+
+
+
+
+
+
+
+
+
+
+
+
+
+				
 				//Passing name to graph
 				if($mod_name_val!="") $mod_name_val.="::$name";
 				else $mod_name_val="$name";



From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 22 23:09:11 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 06:09:11 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231358=3A?=
	=?utf-8?q?_uslmw_ifadpeny?=
Message-ID: <076.7fc082f0f31c48e750627c13eadbd4fd@vtiger.fosslabs.com>

#1358: uslmw ifadpeny
--------------------------+-------------------------------------------------
Reporter:  test at test.com  |       Owner:  uslmw ifadpeny
    Type:  defect         |      Status:  new           
Priority:  major          |   Component:  vtigercrm     
 Version:  5.0.0          |    Keywords:  uslmw ifadpeny
--------------------------+-------------------------------------------------
 hzdqb bman arskxj ienoxgqbh utcd uqkj fzvctp

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1358>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 22 23:09:21 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 06:09:21 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231359=3A?=
	=?utf-8?q?_nkmvswao_hrgxpcnj?=
Message-ID: <076.231caceb8d206fe629ab31edf63bacab@vtiger.fosslabs.com>

#1359: nkmvswao hrgxpcnj
--------------------------+-------------------------------------------------
Reporter:  test at test.com  |       Owner:  nkmvswao hrgxpcnj
    Type:  defect         |      Status:  new              
Priority:  major          |   Component:  vtigercrm        
 Version:  5.0.0          |    Keywords:  nkmvswao hrgxpcnj
--------------------------+-------------------------------------------------
 phqvesxdn otdsnk xzgw qxpzceb aysqdwj gremhpd cusdja
 http://www.esifukz.zsdlyxw.com

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1359>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 22 23:09:29 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 06:09:29 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231360=3A?=
	=?utf-8?q?_phajzen_gesf?=
Message-ID: <076.b8badd1330313fb32e243bd826d1a92f@vtiger.fosslabs.com>

#1360: phajzen gesf
--------------------------+-------------------------------------------------
Reporter:  test at test.com  |       Owner:  phajzen gesf
    Type:  defect         |      Status:  new         
Priority:  major          |   Component:  vtigercrm   
 Version:  5.0.0          |    Keywords:  phajzen gesf
--------------------------+-------------------------------------------------
 kfaldureq jtewkqcsd aoexzn vhuntfjl npgcw iuvafe cdwez <A
 href="http://www.gctau.pafhbq.com">lhiwfbxdg hcwuaqb</A>

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1360>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 22 23:09:38 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 06:09:38 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231361=3A?=
	=?utf-8?q?_kwxu_dgsbwtae?=
Message-ID: <076.1b75ad68cf558361fc44b91309481d8d@vtiger.fosslabs.com>

#1361: kwxu dgsbwtae
--------------------------+-------------------------------------------------
Reporter:  test at test.com  |       Owner:  kwxu dgsbwtae
    Type:  defect         |      Status:  new          
Priority:  major          |   Component:  vtigercrm    
 Version:  5.0.0          |    Keywords:  kwxu dgsbwtae
--------------------------+-------------------------------------------------
 sxguapml cjwlifq kudnr rlvnm cjfpny hwkjavpqg bhxc
 [URL=http://www.zvctprsn.qoyiau.com]bnsacfrdz yzdhvmo[/URL]

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1361>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 22 23:09:46 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 06:09:46 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231362=3A?=
	=?utf-8?q?_alrf_lmgo?=
Message-ID: <076.198951aac88d3004380ae68299abd85f@vtiger.fosslabs.com>

#1362: alrf lmgo
--------------------------+-------------------------------------------------
Reporter:  test at test.com  |       Owner:  alrf lmgo
    Type:  defect         |      Status:  new      
Priority:  major          |   Component:  vtigercrm
 Version:  5.0.0          |    Keywords:  alrf lmgo
--------------------------+-------------------------------------------------
 zxhd yweiqhb juynchvq aobml oeyqnvmw krvabso onklhw
 [URL]http://www.xlnymvwu.xvoe.com[/URL] yidnt mdhr

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1362>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 22 23:29:54 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 06:29:54 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7453 -
	/vtigercrm/trunk/modules/Users/RoleDetailView.php
Message-ID: <20060623062954.4A21C83F768@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 23 00:29:50 2006
New Revision: 7453

Log:
Updated roledetailview.php - ahmed

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

Modified: vtigercrm/trunk/modules/Users/RoleDetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Users/RoleDetailView.php (original)
+++ vtigercrm/trunk/modules/Users/RoleDetailView.php Fri Jun 23 00:29:50 2006
@@ -90,6 +90,6 @@
 $smarty->assign("PARENTNAME",$parentname);            
 
 
-$smarty->display("RoleDetailViewN.tpl");
+$smarty->display("RoleDetailView.tpl");
 
 ?>



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 22 23:30:02 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 06:30:02 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7454 -
	/vtigercrm/trunk/index.php
Message-ID: <20060623063002.55A552990A2@vtiger.fosslabs.com>

Author: richie
Date: Fri Jun 23 00:29:46 2006
New Revision: 7454

Log:
audit entry added

Modified:
    vtigercrm/trunk/index.php

Modified: vtigercrm/trunk/index.php
==============================================================================
--- vtigercrm/trunk/index.php (original)
+++ vtigercrm/trunk/index.php Fri Jun 23 00:29:46 2006
@@ -24,6 +24,7 @@
 global $category;
 require_once('include/utils/utils.php');
 
+
 if (version_compare(phpversion(), '5.0') < 0) {
     eval('
     function clone($object) {
@@ -189,6 +190,7 @@
 $skipSecurityCheck= false;
 //echo $module;
 // echo $action;
+
 if(isset($action) && isset($module))
 {
 	$log->info("About to take action ".$action);
@@ -311,16 +313,19 @@
 
 	$currentModuleFile = 'modules/'.$module.'/'.$action.'.php';
 	$currentModule = $module;
+	
+      	
 }
 elseif(isset($module))
 {
+	
 	$currentModule = $module;
 	$currentModuleFile = $moduleDefaultFile[$currentModule];
 }
 else {
     // use $default_module and $default_action as set in config.php
     // Redirect to the correct module with the correct action.  We need the URI to include these fields.
-  
+	  
 
         header("Location: index.php?action=$default_action&module=$default_module");
     exit();
@@ -547,6 +552,14 @@
 	$theme = $default_theme;
 }
 
+	
+
+//auditing
+$date_var = date('YmdHis');
+$query = "insert into vtiger_audit_trial values(".$adb->getUniqueID('vtiger_audit_trial').",".$current_user->id.",'".$module."','".$action."',$date_var)";
+$adb->query($query);
+
+
 //logging the security Information
 $seclog->debug('########  Module -->  '.$module.'  :: Action --> '.$action.' ::  UserID --> '.$current_user->id.'  #######');
 
@@ -555,8 +568,7 @@
 
 
 	require_once('include/utils/UserInfoUtil.php');
-
-        if(ereg('Ajax',$action))
+	if(ereg('Ajax',$action))
         {
                 $now_action=$_REQUEST['file'];
         }
@@ -564,6 +576,7 @@
         {
                 $now_action=$action;
         }
+        
 
         if(isset($_REQUEST['record']) && $_REQUEST['record'] != '')
         {



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 22 23:32:20 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 06:32:20 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7455 -
	/vtigercrm/trunk/modules/Users/Authenticate.php
Message-ID: <20060623063220.357C42990B4@vtiger.fosslabs.com>

Author: richie
Date: Fri Jun 23 00:32:03 2006
New Revision: 7455

Log:
insert into audit trial table done

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

Modified: vtigercrm/trunk/modules/Users/Authenticate.php
==============================================================================
--- vtigercrm/trunk/modules/Users/Authenticate.php (original)
+++ vtigercrm/trunk/modules/Users/Authenticate.php Fri Jun 23 00:32:03 2006
@@ -23,7 +23,7 @@
 require_once('modules/Users/User.php');
 require_once('modules/Users/CreateUserPrivilegeFile.php');
 require_once('include/logging.php');
-//require_once('modules/Users/AccessControl.php');
+
 
 global $mod_strings;
 
@@ -38,6 +38,13 @@
 
 if($focus->is_authenticated())
 {
+
+	$date_var = date('YmdHis');
+	$query = "insert into vtiger_audit_trial values(".$adb->getUniqueID('vtiger_audit_trial').",".$focus->id.",'Users','Authenticate',$date_var)";
+	$adb->query($query);
+
+
+	
 	// Recording the login info
         $usip=$_SERVER['REMOTE_ADDR'];
         $intime=date("Y/m/d H:i:s");



From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 23 00:23:27 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 07:23:27 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7456 -
	/vtigercrm/trunk/schema/DatabaseSchema.xml
Message-ID: <20060623072328.2E2752990B9@vtiger.fosslabs.com>

Author: richie
Date: Fri Jun 23 01:23:09 2006
New Revision: 7456

Log:
add table vtiger_audit_trial

Modified:
    vtigercrm/trunk/schema/DatabaseSchema.xml

Modified: vtigercrm/trunk/schema/DatabaseSchema.xml
==============================================================================
--- vtigercrm/trunk/schema/DatabaseSchema.xml (original)
+++ vtigercrm/trunk/schema/DatabaseSchema.xml Fri Jun 23 01:23:09 2006
@@ -5283,4 +5283,15 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
+	<table name="vtiger_audit_trial">
+		<field name="auditid" type="I" size="19">
+			<key />
+		</field>
+		<field name="userid" type="I" size="19" />
+		<field name="module" type="C" size="255" />
+		<field name="action" type="C" size="255" />
+		<field name="actiondate" type="T"/>
+		<opt platform="mysql">Type=InnoDB</opt>
+	</table>
+
 </schema>



From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 23 02:39:13 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 09:39:13 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7457 -
	/vtigercrm/trunk/modules/Reports/Reports.php
Message-ID: <20060623093913.9849F83F770@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 23 03:39:09 2006
New Revision: 7457

Log:
Added Profile check in query

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

Modified: vtigercrm/trunk/modules/Reports/Reports.php
==============================================================================
--- vtigercrm/trunk/modules/Reports/Reports.php (original)
+++ vtigercrm/trunk/modules/Reports/Reports.php Fri Jun 23 03:39:09 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",
@@ -316,7 +316,7 @@
 		}
 		else
 		{
-
+			
 			$sql = "select * from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.uitype != 50 and vtiger_field.tabid=".$tabid." and vtiger_field.block in (".$block .") and vtiger_field.displaytype in (1,2) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList." group by vtiger_field.fieldid order by sequence";
 		}
 		$result = $adb->query($sql);
@@ -458,6 +458,7 @@
 		global $adb;
 		global $log;
 		global $current_user;
+		global $profileList;
 		require('user_privileges/user_privileges_'.$current_user->id.'.php');		
 
 		$tabid = getTabid($module);
@@ -473,7 +474,6 @@
 		}
 		else
 		{
-			$profileList = getCurrentUserProfileList();			
 			$sql = "select * from vtiger_field inner join vtiger_tab on vtiger_tab.tabid = vtiger_field.tabid inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid  where vtiger_field.tabid=".$tabid." and (vtiger_field.uitype =5 or vtiger_field.displaytype=2) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_field.block in (".$blockids.") and vtiger_profile2field.profileid in ".$profileList." order by vtiger_field.sequence";
 
 		}
@@ -925,6 +925,7 @@
 		global $adb;
 		global $log;
 		global $current_user;
+		global $profileList;
 		require('user_privileges/user_privileges_'.$current_user->id.'.php');
 		$tabid = getTabid($module);
 		$escapedchars = Array('_SUM','_AVG','_MIN','_MAX');
@@ -934,7 +935,6 @@
 		}
 		else
 		{
-			$profileList = getCurrentUserProfileList();
 			$ssql = "select * from vtiger_field inner join vtiger_tab on vtiger_tab.tabid = vtiger_field.tabid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid  where vtiger_field.uitype != 50 and vtiger_field.tabid=".$tabid." and vtiger_field.displaytype = 1 and vtiger_def_org_field.visible=0 and vtiger_profile2field.visible=0 and vtiger_profile2field.profileid in ".$profileList." order by sequence";
 		}
 		$result = $adb->query($ssql);



From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 23 03:00:15 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 10:00:15 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7458 -
	/vtigercrm/trunk/include/language/en_us.lang.php
Message-ID: <20060623100015.5276B83F796@vtiger.fosslabs.com>

Author: richie
Date: Fri Jun 23 03:59:52 2006
New Revision: 7458

Log:
New UI for Custom Field has been integrated

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

Modified: vtigercrm/trunk/include/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/include/language/en_us.lang.php (original)
+++ vtigercrm/trunk/include/language/en_us.lang.php Fri Jun 23 03:59:52 2006
@@ -917,7 +917,8 @@
 'LBL_PO_STATUS'=>'PurchaseOrder Status',
 'LBL_SO_STATUS'=>'SalesOrder Status',
 'LBL_INVOICE_STATUS'=>'Invoice Status',
-
+'LBL_NOTE'=>'Note',
+'LBL_MODULE'=>'Module',
 );
 
 



From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 23 03:01:08 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 10:01:08 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7459 -
 /vtigercrm/trunk/modules/Settings/language/en_us.lang.php
Message-ID: <20060623100108.BB8C383F79D@vtiger.fosslabs.com>

Author: richie
Date: Fri Jun 23 04:00:47 2006
New Revision: 7459

Log:
Language strings added as New UI integrated for CustomField

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 Fri Jun 23 04:00:47 2006
@@ -408,11 +408,11 @@
 
 'LBL_CUSTOM_FIELD_SETTINGS'=>'Custom Field Settings',
 
-'LBL_CREATE_AND_MANAGE_USER_DEFINED_FIELDS'=>'Create and Manage user defined fields...',
+'LBL_CREATE_AND_MANAGE_USER_DEFINED_FIELDS'=>'Manage user defined fields...',
 
 'LBL_SELECT_MODULE'=>'Select Module',
 
-'LBL_SELECT_CF_TEXT'=>'Select the CRM module to show CustomFields :',
+'LBL_SELECT_CF_TEXT'=>'Select the CRM module:',
 
 
 
@@ -666,6 +666,10 @@
 'LBL_SELECT_CRM_MODULE'=>'Select crm module',
 'LBL_TAX_SETTINGS'=>'Tax Settings',
 'LBL_INVENTORY_TAX_CONFIG'=>'Inventory Tax Configuration',
+'LBL_CUSTOM_MAPP_INFO'=>'Only Leads module support mapping of fields with other modules.',
+'LBL_MAPPING_OTHER_MODULES'=>'Mapping with other Modules',
+'LBL_CUSTOM_FILED_IN'=>'Custom Fields in ',
+'LBL_EDIT_FIELD_MAPPING'=>'Editing Field Mapping',
 );
 
 



From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 23 03:02:37 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 10:02:37 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7460 - in /vtigercrm/trunk:
 Smarty/templates/ modules/Settings/
Message-ID: <20060623100237.A574683F778@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 23 04:02:27 2006
New Revision: 7460

Log:
New UI Integrated for Custom Field

Modified:
    vtigercrm/trunk/Smarty/templates/CustomFieldEntries.tpl
    vtigercrm/trunk/Smarty/templates/CustomFieldList.tpl
    vtigercrm/trunk/Smarty/templates/CustomFieldMapping.tpl
    vtigercrm/trunk/Smarty/templates/SetMenu.tpl
    vtigercrm/trunk/Smarty/templates/Settings.tpl
    vtigercrm/trunk/modules/Settings/CustomFieldList.php
    vtigercrm/trunk/modules/Settings/LeadCustomFieldMapping.php
    vtigercrm/trunk/modules/Settings/SaveConvertLead.php

Modified: vtigercrm/trunk/Smarty/templates/CustomFieldEntries.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/CustomFieldEntries.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/CustomFieldEntries.tpl Fri Jun 23 04:02:27 2006
@@ -8,52 +8,53 @@
  * All Rights Reserved.
 *
  ********************************************************************************/ *}
-				<table width="100%"><tr>
-					<td align="right" valign="top" width="5%" rowspan="2"><img src="{$IMAGE_PATH}two.gif" width="29" height="31" /></td>
-					<td>
-						<b class="lvtHeaderText">{$MOD.CustomFields} in {$MODULE}</b>
-					</td>
+				<form action="index.php" method="post" name="form">
+				<input type="hidden" name="fld_module" value="{$MODULE}">
+				<input type="hidden" name="module" value="Settings">
+				<input type="hidden" name="parenttab" value="Settings">
+				<input type="hidden" name="mode">
+				<table class="listTableTopButtons" border="0" cellpadding="5" cellspacing="0" width="100%">
+				<tr>
+					<td class="small">&nbsp;</td>
+					<td class="small" align="right">&nbsp;&nbsp;
+					{if $MODULE eq 'Leads'}
+					&nbsp;&nbsp;<input input title="{$MOD.CUSTOMFIELDMAPPING}"  class="crmButton edit small" onclick="CustomFieldMapping();" type="button" name="ListLeadCustomFieldMapping" value="{$MOD.CUSTOMFIELDMAPPING}">
+					{/if}
+					<input type="button" value=" {$MOD.NewCustomField} " onClick="getCreateCustomFieldForm('{$MODULE}','','','')" class="crmButton create small"/>
 				</tr>
-				<tr>
-					<td>
-						<form action="index.php" method="post" name="form">
-						<input type="hidden" name="fld_module" value="{$MODULE}">
-						<input type="hidden" name="module" value="Settings">
-						<input type="hidden" name="parenttab" value="Settings">
-						<input type="hidden" name="mode">
-						<table width="95%" border="0" cellpadding="5" cellspacing="0">
-							<tr><td align="right"><input type="button" value=" {$MOD.NewCustomField} " onClick="getCreateCustomFieldForm('{$MODULE}','','','')" class="classBtn"/></td></tr>
-						</table>
-						<table style="background-color: rgb(204, 204, 204);" class="small" border="0" cellpadding="5" cellspacing="1" width="95%">
-						<tbody>
-							<tr>
-								<td class="lvtCol" width="5%">#</td>
-							        <td class="lvtCol" width="35%">{$MOD.FieldLabel}</td>
-							        <td class="lvtCol" width="50%">{$MOD.FieldType}</td>
-								<td class="lvtCol" width="10%">{$MOD.LBL_CURRENCY_TOOL}</td>
-							</tr>
-							{foreach item=entries key=id from=$CFENTRIES}
-							<tr class="lvtColData" onmouseover="this.className='lvtColDataHover'" onmouseout="this.className='lvtColData'" bgcolor="white">
-								{foreach item=value from=$entries}
-									<td nowrap>{$value}</td>
-								{/foreach}
-							</tr>
-							{/foreach}
-						</tbody>
-						</table><br />
-						{if $MODULE eq 'Leads'}
-						<table width="35%" style="border:1px dashed #CCCCCC;background-color:#FFFFEC;" cellpadding="5" cellspacing="0">
-							<tr>
-								<td style="padding:5px;" width="5%" >
-								<img src="{$IMAGE_PATH}mapping.gif" align="absmiddle" /> </td>
-								<td><span  class="genHeaderSmall">{$MOD.LBL_FIELD_MAPPING}</span><br />
-								{$MOD.LBL_FIELD_MAPPING} {$MOD.LBL_CUSTM_MSG} 
-								</td>
-							</tr>
-							<tr><td colspan="2" align="right"><input input title="{$MOD.CUSTOMFIELDMAPPING}"  class="classBtn" onclick="CustomFieldMapping();" type="button" name="ListLeadCustomFieldMapping" value="{$MOD.CUSTOMFIELDMAPPING}"></td></tr>
-						</table> 
-						{/if}
-					</form>
-					</td>
-				</tr></table>
+				</table>
 
+				<table class="listTable" border="0" cellpadding="5" cellspacing="0" width="100%">
+					{if $MODULE eq 'Leads'}
+					<tr>
+						<td rowspan="2" class="colHeader small" width="5%">#</td>
+					        <td rowspan="2" class="colHeader small" width="20%">{$MOD.FieldLabel}</td>
+					        <td rowspan="2" class="colHeader small" width="20%">{$MOD.FieldType}</td>
+							<td colspan="3" class="colHeader small" valign="top"><div align="center">{$MOD.LBL_MAPPING_OTHER_MODULES}</div></td>
+					        <td rowspan="2" class="colHeader small" width="20%">{$MOD.LBL_CURRENCY_TOOL}</td>
+				      </tr>
+
+					<tr>
+					  <td class="colHeader small" valign="top" width="18%">Accounts</td>
+					  <td class="colHeader small" valign="top" width="18%">Contacts</td>
+					  <td class="colHeader small" valign="top" width="19%">Potentials</td>
+					</tr>
+					{else}
+					<tr>
+                      	<td class="colHeader small" width="5%">#</td>
+                      	<td class="colHeader small" width="20%">{$MOD.FieldLabel}</td>
+                      	<td class="colHeader small" width="20%">{$MOD.FieldType}</td>
+                     	<td class="colHeader small" width="20%">{$MOD.LBL_CURRENCY_TOOL}</td>
+					</tr>
+					{/if}
+					{foreach item=entries key=id from=$CFENTRIES}
+					<tr>
+						{foreach item=value from=$entries}
+							<td class="listTableRow small" valign="top" nowrap>{$value}</td>
+						{/foreach}
+					</tr>
+					{/foreach}
+		</table>
+		</form>
+		<br>
+		<strong>{$APP.LBL_NOTE}: </strong> {$MOD.LBL_CUSTOM_MAPP_INFO}

Modified: vtigercrm/trunk/Smarty/templates/CustomFieldList.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/CustomFieldList.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/CustomFieldList.tpl Fri Jun 23 04:02:27 2006
@@ -10,23 +10,23 @@
  ********************************************************************************/ *}
 <script language="JavaScript" type="text/javascript" src="include/js/customview.js"></script>
 <script language="javascript">
-{literal}
-
 function getCustomFieldList(customField)
-{
+{ldelim}
 	var modulename = customField.options[customField.options.selectedIndex].value;
+	$('module_info').innerHTML = '{$MOD.LBL_CUSTOM_FILED_IN} "'+modulename+'" {$APP.LBL_MODULE}';
 	new Ajax.Request(
 		'index.php',
-		{queue: {position: 'end', scope: 'command'},
+		{ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
 			method: 'post',
 			postBody: 'module=Settings&action=SettingsAjax&file=CustomFieldList&fld_module='+modulename+'&parenttab=Settings&ajax=true',
-			onComplete: function(response) {
+			onComplete: function(response) {ldelim}
 				$("cfList").innerHTML=response.responseText;
-			}
-		}
+			{rdelim}
+		{rdelim}
 	);	
-}
+{rdelim}
 
+{literal}
 function deleteCustomField(id, fld_module, colName, uitype)
 {
         if(confirm("Are you sure?"))
@@ -60,49 +60,78 @@
 {/literal}
 </script>
 <div id="createcf" style="display:block;position:absolute;top:175px;left:275px;"></div>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-<tr>
-        {include file='SettingsMenu.tpl'}
-<td width="75%" valign="top">
-<b><font color=red>{$DUPLICATE_ERROR} </font></b>
-<table width="99%" border="0" cellpadding="0" cellspacing="0" align="center">
-	<tr>
-		<td class="showPanelBg" valign="top" style="padding-left:20px; "><br />
-	       	        <span class="lvtHeaderText">{$MOD.LBL_SETTINGS} &gt; {$MOD.LBL_STUDIO} &gt; {$MOD.LBL_CUSTOM_FIELD_SETTINGS} </span>
-        	        <hr noshade="noshade" size="1" />
+<br>
+<table align="center" border="0" cellpadding="0" cellspacing="0" width="98%">
+<tbody><tr>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
+        <td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
+        <br>
+
+	<div align=center>
+			{include file='SetMenu.tpl'}
+			<!-- DISPLAY -->
+			<b><font color=red>{$DUPLICATE_ERROR} </font></b>
+			
+				<table class="settingsSelUITopLine" border="0" cellpadding="5" cellspacing="0" width="100%">
+				<tbody><tr>
+					<td rowspan="2" valign="top" width="50"><img src="{$IMAGE_PATH}custom.gif" alt="Users" title="Users" border="0" height="48" width="48"></td>
+					<td class="heading2" valign="bottom"><b>{$MOD.LBL_SETTINGS} &gt; {$MOD.LBL_STUDIO} &gt; {$MOD.LBL_CUSTOM_FIELD_SETTINGS}</b></td>
+				</tr>
+
+				<tr>
+					<td class="small" valign="top">{$MOD.LBL_CREATE_AND_MANAGE_USER_DEFINED_FIELDS}</td>
+				</tr>
+				</tbody></table>
+				
+				<br>
+				<table border="0" cellpadding="10" cellspacing="0" width="100%">
+				<tbody><tr>
+				<td>
+
+				<table class="tableHeading" border="0" cellpadding="5" cellspacing="0" width="100%">
+				<tbody><tr>
+					<td class="big" nowrap><strong><span id="module_info">{$MOD.LBL_CUSTOM_FILED_IN} "{$APP.$MODULE}" {$APP.LBL_MODULE}</span></strong> </td>
+					<td class="small" align="right">
+					{$MOD.LBL_SELECT_CF_TEXT}
+		                	<select name="pick_module" class="importBox" onChange="getCustomFieldList(this)">
+                		        {foreach key=sel_value item=value from=$MODULES}
+		                        {if $MODULE eq $sel_value}
+                	                       	{assign var = "selected_val" value="selected"}
+		                        {else}
+                        	                {assign var = "selected_val" value=""}
+                                	{/if}
+	                                <option value="{$sel_value}" {$selected_val}>{$APP.$value}</option>
+        		                {/foreach}
+			                </select>
+					</td>
+					</tr>
+				</tbody>
+				</table>
+				<div id="cfList">
+                                {include file="CustomFieldEntries.tpl"}
+                </div>	
+			<table border="0" cellpadding="5" cellspacing="0" width="100%">
+			<tr>
+
+		  	<td class="small" align="right" nowrap="nowrap"><a href="#top">[Scroll to Top]</a></td>
+			</tr>
+			</table>
+			</td>
+			</tr>
+			</table>
+		<!-- End of Display -->
+		
 		</td>
-	</tr>
-	
-	<tr><td>&nbsp;</td></tr>
-	<tr>
-		<td>
-			<table width="95%" cellpadding="5" cellspacing="0" class="leadTable" align="center">
-				<tr>
-					<td style="padding:5px;border-bottom:2px dotted #CCCCCC;" width="5%" >
-						<img src="{$IMAGE_PATH}mapping.gif" align="left" />
-					</td>
-					<td style="padding:5px;border-bottom:2px dotted #AAAAAA;">
-						<span class="genHeaderGrayBig">{$MOD.LBL_CUSTOM_FIELD_SETTINGS}</span>
-						<br />
-						<span class="big">{$MOD.LBL_CREATE_AND_MANAGE_USER_DEFINED_FIELDS}</span>
-					</td>
-				</tr>
-				<tr><td colspan="2">&nbsp;</td></tr>
-				{include file="CustomFieldCombo.tpl"}
-				<tr><td colspan="2">&nbsp;</td></tr>
-				<tr><td colspan ="2">
-				
-						<div id="cfList">
-				{include file="CustomFieldEntries.tpl"}					
-						</div>
+        </tr>
+        </table>
+        </td>
+        </tr>
+        </table>
+        </div>
 
-				</td></tr>
-				<tr><td colspan="2">&nbsp;</td></tr>
-			</table>
-		</td>
-	</tr>
+        </td>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
+        </tr>
+</tbody>
 </table>
-</td>
-</tr>
-</table>
-        {include file='SettingsSubMenu.tpl'}
+<br>

Modified: vtigercrm/trunk/Smarty/templates/CustomFieldMapping.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/CustomFieldMapping.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/CustomFieldMapping.tpl Fri Jun 23 04:02:27 2006
@@ -9,100 +9,119 @@
 *
  ********************************************************************************/ *}
 <script language="JavaScript" type="text/javascript" src="include/js/customview.js"></script>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-	<tr>
-		{include file='SettingsMenu.tpl'}
-		<td width="75%" valign="top">
-		<table width="99%" border="0" cellpadding="0" cellspacing="0" align="center">
-			<tr>
-				<td class="showPanelBg" valign="top" style="padding-left:20px; "><br />
-				<span class="lvtHeaderText">{$MOD.LBL_SETTINGS} &gt; {$MOD.LBL_STUDIO} &gt; {$MOD.LBL_CUSTOM_FIELD_SETTINGS} </span>
-				<hr noshade="noshade" size="1" />
-				</td>
-			</tr>
-			<tr><td>&nbsp;</td></tr>
-			<tr>
-				</td>
+<br>
+<table align="center" border="0" cellpadding="0" cellspacing="0" width="98%">
+<tbody><tr>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
+        <td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
+        <br>
+
+		<div align=center>
+			{include file='SetMenu.tpl'}
+			<!-- DISPLAY -->
+				<table class="settingsSelUITopLine" border="0" cellpadding="5" cellspacing="0" width="100%">
+				<tr>
+					<td rowspan="2" valign="top" width="50"><img src="{$IMAGE_PATH}custom.gif" alt="Users" title="Users" border="0" height="48" width="48"></td>
+					<td class="heading2" valign="bottom"><b>{$MOD.LBL_SETTINGS} &gt; {$MOD.LBL_STUDIO} &gt; {$MOD.LBL_CUSTOM_FIELD_SETTINGS}</b></td>
+				</tr>
+
+				<tr>
+					<td class="small" valign="top">{$MOD.LBL_CREATE_AND_MANAGE_USER_DEFINED_FIELDS}</td>
+				</tr>
+				</table>
+				
+				<br>
 				<form action="index.php?module=Settings&action=SaveConvertLead" method="post" name="index">
-				<table class="leadTable" align="center" cellpadding="5" cellspacing="0" width="95%">
-					<tr>
-						<td style="border-bottom: 2px dotted rgb(204, 204, 204); padding: 5px;" width="5%">
-						<img src="{$IMAGE_PATH}mapping.gif" align="middle" height="48" width="48">
-						</td>
-						<td style="border-bottom: 2px dotted rgb(170, 170, 170); padding: 5px;">
-						<span class="genHeaderGrayBig">{$MOD.LBL_LEAD_MAP_CUSTOM_FIELD}</span><br>
-						<span>{$MOD.leadCustomFieldDescription}</span>
-						</td>
-					</tr>
-					<tr><td colspan="2">&nbsp;</td></tr>
-					<tr>
-						<td align="right">&nbsp;</td>
-						<td><b class="lvtHeaderText">{$MOD.LBL_MAPPING_INFO}</b></td>
-					</tr>
-					<tr>
-						<td>&nbsp;</td>
-						<td>
-							<table style="background-color: rgb(204, 204, 204);" class="small" border="0" cellpadding="5" cellspacing="1" width="95%">
-								<tr>
-									<td class="lvtCol" width="25%">{$MOD.LBL_LEAD_FIELD}</td>
-									<td class="lvtCol" width="25%">{$MOD.LBL_ACCOUNT_FIELD}</td>
-									<td class="lvtCol" width="25%">{$MOD.LBL_CONTACT_FIELD}</td>
-									<td class="lvtCol" width="25%">{$MOD.LBL_POTENTIAL_FIELD}</td>	
-								<tr>
-								{foreach key=leadcf item=cfarray from=$CUSTOMFIELDMAPPING}
-									<tr class="lvtColData" bgcolor="white">
-									<td bgcolor="#e1e1e1">{$leadcf}</td>
-									{foreach item=acc_cf key=fldnameacc from=$cfarray.account}
-										<td>
-										<select name='{$fldnameacc}'>
-										<option value='None'>{$APP.LBL_NONE}</option>
-										{foreach item=element from=$acc_cf}
-										<option value="{$element.fieldid}" {$element.selected}>{$element.fieldlabel}</option>
-										{/foreach}
-										</td>
-										</select>
-									{/foreach}
-									{foreach item=con_cf key=fldnamecon from=$cfarray.contact}
-                                                                                <td>
-                                                                                <select name='{$fldnamecon}'>
-										<option value='None'>{$APP.LBL_NONE}</option>
-										{foreach item=element from=$con_cf}
-										<option value="{$element.fieldid}" {$element.selected}>{$element.fieldlabel}</option>
-										{/foreach}
-										</td>
-                                                                                </select>                                                                                             {/foreach}
-									{foreach item=pot_cf key=fldnamepot from=$cfarray.potential}
-										<td>
-										<select name='{$fldnamepot}'>
-										<option value='None'>{$APP.LBL_NONE}</option>
-										{foreach item=element from=$pot_cf}
-										<option value="{$element.fieldid}" {$element.selected}>{$element.fieldlabel}</option>
-										{/foreach}
-										</td>
-                                                                                </select>                                                                                             {/foreach}
-									</tr>
-								{/foreach}
-							</table>
-						</td>
-					</tr>
-					<tr>
-						<td colspan="2" style="border-bottom: 2px dotted rgb(170, 170, 170); padding: 5px;">&nbsp;</td>
-					</tr>
-					<tr>
-						<td colspan="2" style="border-bottom: 2px dotted rgb(170, 170, 170); padding: 5px;" align="center">
-							<input title="{$APP.LBL_SAVE_BUTTON_LABEL}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" name="save" value=" &nbsp;{$APP.LBL_SAVE_BUTTON_LABEL}&nbsp; " class="classBtn" type="submit" onclick ="return validateCustomFieldAccounts();">&nbsp;
-							<input title="{$APP.LBL_CANCEL_BUTTON_LABEL}>" accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" name="cancel" value=" {$APP.LBL_CANCEL_BUTTON_LABEL} " onclick = "gotourl('index.php?action=CustomFieldList&module=Settings&fld_module=Leads&parenttab=Settings')"  class="classBtn" type="button">
-					  	</td>
-					</tr>
-					<tr>
-						<td colspan="2">&nbsp;</td>
-					</tr>
+				<table class="tableHeading" border="0" cellpadding="5" cellspacing="0" width="100%">
+				<tr>
+					<td class="big"><strong>{$MOD.LBL_EDIT_FIELD_MAPPING}</strong> </td>
+					<td class="small" align="right">&nbsp;
+					</td>
+				</tr>
+				</table>
+
+				<table class="listTableTopButtons" border="0" cellpadding="5" cellspacing="0" width="100%">
+				<tr>
+					<td class="small">&nbsp;</td>
+					<td class="small" align="right">&nbsp;&nbsp;
+					<input title="{$APP.LBL_SAVE_BUTTON_LABEL}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" name="save" value=" &nbsp;{$APP.LBL_SAVE_BUTTON_LABEL}&nbsp; " class="crmButton small save" type="submit" onclick ="return validateCustomFieldAccounts();">&nbsp;
+                     <input title="{$APP.LBL_CANCEL_BUTTON_LABEL}>" accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" name="cancel" value=" {$APP.LBL_CANCEL_BUTTON_LABEL} " onclick = "gotourl('index.php?action=CustomFieldList&module=Settings&fld_module=Leads&parenttab=Settings')"  class="crmButton small cancel" type="button">
+				</tr>
+				</table>
+				<table class="listTable" border="0" cellpadding="5" cellspacing="0" width="100%">
+				<tr>
+					<td rowspan="2" class="colHeader small" width="2%">#</td>
+					<td rowspan="2" class="colHeader small" width="15%">Field Label</td>
+					<td rowspan="2" class="colHeader small" width="15%">Field Type </td>
+					<td colspan="3" class="colHeader small" valign="top"><div align="center">{$MOD.LBL_MAPPING_OTHER_MODULES}</div></td>
+				</tr>
+				<tr>
+					<td class="colHeader small" valign="top" width="23%">{$APP.Accounts}</td>
+					<td class="colHeader small" valign="top" width="23%">{$APP.Contacts}</td>
+					<td class="colHeader small" valign="top" width="24%">{$APP.Potentials}</td>
+				</tr>
+				{foreach key=leadcf item=cfarray from=$CUSTOMFIELDMAPPING}
+				<tr>
+					<td class="listTableRow small">{$cfarray.sno}</td>
+					<td class="listTableRow small">{$cfarray.leadid}</td>
+					<td class="listTableRow small">{$cfarray.fieldtype}</td>
+					{foreach item=acc_cf key=fldnameacc from=$cfarray.account}
+					<td class="listTableRow small">
+						<select name='{$fldnameacc}'>
+						<option value='None'>{$APP.LBL_NONE}</option>
+						{foreach item=element from=$acc_cf}
+							<option value="{$element.fieldid}" {$element.selected}>{$element.fieldlabel}</option>
+						{/foreach}
+						</select>
+					</td>
+					{/foreach}
+					{foreach item=con_cf key=fldnamecon from=$cfarray.contact}
+                    <td class="listTableRow small">
+                        <select name='{$fldnamecon}'>
+						<option value='None'>{$APP.LBL_NONE}</option>
+						{foreach item=element from=$con_cf}
+							<option value="{$element.fieldid}" {$element.selected}>{$element.fieldlabel}</option>
+						{/foreach}
+                        </select>
+					</td>
+				  	{/foreach}
+					{foreach item=pot_cf key=fldnamepot from=$cfarray.potential}
+					<td class="listTableRow small">
+						<select name='{$fldnamepot}'>
+						<option value='None'>{$APP.LBL_NONE}</option>
+						{foreach item=element from=$pot_cf}
+							<option value="{$element.fieldid}" {$element.selected}>{$element.fieldlabel}</option>
+						{/foreach}
+                        </select>
+					</td>
+				    {/foreach}
+				</tr>
+				{/foreach}
+				</table>
+				<table border="0" cellpadding="5" cellspacing="0" width="100%">
+				<tr>
+					<td class="small">
+		        	<strong>{$APP.LBL_NOTE}: </strong> {$MOD.LBL_CUSTOM_MAPP_INFO}
+					</td>
+				</tr>
+				</table>
+				<table border="0" cellpadding="5" cellspacing="0" width="100%">
+				<tr>
+		  			<td class="small" align="right" nowrap="nowrap"><a href="#top">[Scroll to Top]</a></td>
+				</tr>
 				</table>
 				</form>
-			</td>
+				<br>
+		</td>
 		</tr>
-	</td>
-</tr></table>
-{include file='SettingsSubMenu.tpl'}			
-</td></tr></table>
-			
+		</table>
+        </td>
+        </tr>
+        </table>
+        </div>
+
+        </td>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
+        </tr>
+</tbody>
+</table>

Modified: vtigercrm/trunk/Smarty/templates/SetMenu.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/SetMenu.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/SetMenu.tpl Fri Jun 23 04:02:27 2006
@@ -56,7 +56,11 @@
 				{/if}
 	
 				<tr><td class="settingsTabHeader" nowrap>{$MOD.LBL_STUDIO}</td></tr>
-				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=SettingsSubMenu&type=CustomField&parenttab=Settings">{$MOD.LBL_CUSTOM_FIELDS}</a></td></tr>
+				{if  $smarty.request.action eq 'CustomFieldList' || $smarty.request.action eq 'LeadCustomFieldMapping'}
+				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_CUSTOM_FIELDS}</td></tr>
+				{else}
+				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=CustomFieldList&parenttab=Settings">{$MOD.LBL_CUSTOM_FIELDS}</a></td></tr>
+				{/if}
 				
 				{if  $smarty.request.action eq 'PickList' ||  $smarty.request.action eq 'SettingsAjax'}
 				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_PICKLIST_EDITOR}</td></tr>						     {else}
@@ -65,7 +69,7 @@
 	
 				<tr><td class="settingsTabHeader" nowrap>{$MOD.LBL_COMMUNICATION_TEMPLATES}</td></tr>
 
-				{if $smarty.request.action eq 'listemailtemplates' || $smarty.request.action eq 'detailviewemailtemplate' || $smarty.request.action eq 'editemailtemplate' || $smarty.request.action eq 'saveemailtemplate' || $smarty.request.action eq 'deleteemailtemplate'}
+				{if $smarty.request.action eq 'listemailtemplates' || $smarty.request.action eq 'detailviewemailtemplate' || $smarty.request.action eq 'editemailtemplate' || $smarty.request.action eq 'saveemailtemplate' || $smarty.request.action eq 'deleteemailtemplate' || $smarty.request.action eq 'createemailtemplate'}
 				<tr><td class="settingsTabSelected" nowrap>{$MOD.EMAILTEMPLATES}</td></tr>
 				{else}
 				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=listemailtemplates&parenttab=Settings">{$MOD.EMAILTEMPLATES}</a></td></tr>

Modified: vtigercrm/trunk/Smarty/templates/Settings.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Settings.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Settings.tpl Fri Jun 23 04:02:27 2006
@@ -182,8 +182,8 @@
 					<!-- icon 9-->
 						<table border=0 cellspacing=0 cellpadding=5 width=100%>
 						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=SettingsSubMenu&type=CustomField&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}custom.gif" alt="{$MOD.LBL_CUSTOM_FIELDS}" title="{$MOD.LBL_CUSTOM_FIELDS}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Settings&action=SettingsSubMenu&type=CustomField&parenttab=Settings">{$MOD.LBL_CUSTOM_FIELDS}</a></td>
+							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=CustomFieldList&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}custom.gif" alt="{$MOD.LBL_CUSTOM_FIELDS}" title="{$MOD.LBL_CUSTOM_FIELDS}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Settings&action=CustomFieldList&parenttab=Settings">{$MOD.LBL_CUSTOM_FIELDS}</a></td>
 						</tr>
 						<tr>
 

Modified: vtigercrm/trunk/modules/Settings/CustomFieldList.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/CustomFieldList.php (original)
+++ vtigercrm/trunk/modules/Settings/CustomFieldList.php Fri Jun 23 04:02:27 2006
@@ -9,15 +9,14 @@
 *
  ********************************************************************************/
 require_once('Smarty_setup.php');
-require_once('modules/Settings/SettingsSubMenu.php');
 require_once('include/database/PearDatabase.php');
 require_once('include/CustomFieldUtil.php');
+
 global $mod_strings;
+global $app_strings;
 $smarty=new vtigerCRM_Smarty;
-$fld_module = $_REQUEST['fld_module'];
-$smarty->assign("MODULE",$fld_module);
-$smarty->assign("CFENTRIES",getCFListEntries($fld_module));
 $smarty->assign("MOD",$mod_strings);
+$smarty->assign("APP",$app_strings);
 global $theme;
 $theme_path="themes/".$theme."/";
 $image_path=$theme_path."images/";
@@ -35,9 +34,45 @@
                         'SalesOrder'=>'SalesOrder',
                         'Quotes'=>'Quotes',
                         'Invoice'=>'Invoice',
-			'Campaigns'=>'Campaigns'
+						'Campaigns'=>'Campaigns'
                         );
+$cfimagecombo = Array($image_path."text.gif",
+$image_path."number.gif",
+$image_path."percent.gif",
+$image_path."currency.gif",
+$image_path."date.gif",
+$image_path."email.gif",
+$image_path."phone.gif",
+$image_path."picklist.gif",
+$image_path."url.gif",
+$image_path."checkbox.gif",
+$image_path."text.gif",
+$image_path."picklist.gif");
+
+$cftextcombo = Array($mod_strings['Text'],
+$mod_strings['Number'],
+$mod_strings['Percent'],
+$mod_strings['Currency'],
+$mod_strings['Date'],
+$mod_strings['Email'],
+$mod_strings['Phone'],
+$mod_strings['PickList'],
+$mod_strings['LBL_URL'],
+$mod_strings['LBL_CHECK_BOX'],
+$mod_strings['LBL_TEXT_AREA'],
+$mod_strings['LBL_MULTISELECT_COMBO']
+);
+
+
 $smarty->assign("MODULES",$module_array);
+$smarty->assign("CFTEXTCOMBO",$cftextcombo);
+$smarty->assign("CFIMAGECOMBO",$cfimagecombo);
+if($_REQUEST['fld_module'] !='')
+	$fld_module = $_REQUEST['fld_module'];
+else
+	$fld_module = 'Leads';
+$smarty->assign("MODULE",$fld_module);
+$smarty->assign("CFENTRIES",getCFListEntries($fld_module));
 if(isset($_REQUEST["duplicate"]) && $_REQUEST["duplicate"] == "yes")
 {
 	$error='Custom Field in the Name '.$_REQUEST["fldlabel"].' already exists. Please specify a different Label';
@@ -48,4 +83,71 @@
 else
 	$smarty->display('CustomFieldEntries.tpl');
 
+function getCFListEntries($module)
+{
+	$tabid = getTabid($module);
+	global $adb;
+	global $theme;
+	$theme_path="themes/".$theme."/";
+	$image_path=$theme_path."images/";
+	$dbQuery = "select fieldid,columnname,fieldlabel,uitype,displaytype,vtiger_convertleadmapping.cfmid from vtiger_field left join vtiger_convertleadmapping on  vtiger_convertleadmapping.leadfid = vtiger_field.fieldid where tabid=".$tabid." and generatedtype=2 order by sequence";
+	$result = $adb->query($dbQuery);
+	$row = $adb->fetch_array($result);
+	$count=1;
+	$cflist=Array();
+	if($row!='')
+	{
+		do
+		{
+			$cf_element=Array();
+			$cf_element['no']=$count;
+			$cf_element['label']=$row["fieldlabel"];
+			$fld_type_name = getCustomFieldTypeName($row["uitype"]);
+			$cf_element['type']=$fld_type_name;
+			if($module == 'Leads')
+			{
+				$mapping_details = getListLeadMapping($row["cfmid"]);
+				$cf_element[]= $mapping_details['accountlabel'];
+				$cf_element[]= $mapping_details['contactlabel'];
+				$cf_element[]= $mapping_details['potentiallabel'];
+			}
+			$cf_element['tool']='<img src="'.$image_path.'editfield.gif" border="0" onClick="getCreateCustomFieldForm(\''.$module.'\',\''.$row["fieldid"].'\',\''.$tabid.'\',\''.$row["uitype"].'\')" alt="Edit" title="Edit"/>&nbsp;|&nbsp;<a href="javascript:deleteCustomField('.$row["fieldid"].',\''.$module.'\', \''.$row["columnname"].'\', \''.$row["uitype"].'\')"><img src="'.$image_path.'delete.gif" border="0"  alt="Delete" title="Delete"/></a>';
+
+			$cflist[] = $cf_element;
+			$count++;
+		}while($row = $adb->fetch_array($result));
+	}
+	return $cflist;
+}
+function getListLeadMapping($cfid)
+{
+	global $adb;
+	$sql="select * from vtiger_convertleadmapping where cfmid =".$cfid;
+	$result = $adb->query($sql);
+	$noofrows = $adb->num_rows($result);
+	for($i =0;$i <$noofrows;$i++)
+	{
+		$leadid = $adb->query_result($result,$i,'leadfid');
+		$accountid = $adb->query_result($result,$i,'accountfid');
+		$contactid = $adb->query_result($result,$i,'contactfid');
+		$potentialid = $adb->query_result($result,$i,'potentialfid');
+		$cfmid = $adb->query_result($result,$i,'cfmid');
+
+		$sql2="select fieldlabel from vtiger_field where fieldid ='".$accountid."'";
+		$result2 = $adb->query($sql2);
+		$accountfield = $adb->query_result($result2,0,'fieldlabel');
+		$label['accountlabel'] = $accountfield;
+		
+		$sql3="select fieldlabel from vtiger_field where fieldid ='".$contactid."'";
+		$result3 = $adb->query($sql3);
+		$contactfield = $adb->query_result($result3,0,'fieldlabel');
+		$label['contactlabel'] = $contactfield;
+		$sql4="select fieldlabel from vtiger_field where fieldid ='".$potentialid."'";
+		$result4 = $adb->query($sql4);
+		$potentialfield = $adb->query_result($result4,0,'fieldlabel');
+		$label['potentiallabel'] = $potentialfield;
+	}
+	return $label;
+}
+
 ?>

Modified: vtigercrm/trunk/modules/Settings/LeadCustomFieldMapping.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/LeadCustomFieldMapping.php (original)
+++ vtigercrm/trunk/modules/Settings/LeadCustomFieldMapping.php Fri Jun 23 04:02:27 2006
@@ -8,24 +8,18 @@
 * All Rights Reserved.
 *
 ********************************************************************************/
-
-require_once('Smarty_setup.php');	
+require_once('Smarty_setup.php');
+require_once('include/database/PearDatabase.php');
+require_once('include/CustomFieldUtil.php');
 global $mod_strings;
 global $app_strings;
-global $app_list_strings;
-global $adb;
+
+$smarty=new vtigerCRM_Smarty;
 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", $mod_strings);
-$smarty->assign("APP", $app_strings);
 $smarty->assign("IMAGE_PATH", $image_path);
-
-$smarty->assign("RETURN_MODULE","Settings");
-$smarty->assign("RETURN_ACTION","");
 
 function getAccountCustomValues($leadid,$accountid)
 {
@@ -93,34 +87,36 @@
 	$potentialcf[$leadid.'_potential']=$potential_cfelement;
         return $potentialcf;
 }
-$lead_sql="select fieldid,fieldlabel from vtiger_field,vtiger_tab where vtiger_field.tabid=vtiger_tab.tabid and generatedtype=2 and vtiger_tab.name='Leads'";
-$result = $adb->query($lead_sql);
-$noofrows = $adb->num_rows($result);
 
-$display_val="<table border=0 cellspacing=1 cellpadding=2 width=75%>";
-$leadcf=Array();
-for($i=0; $i<$noofrows; $i++)
+function customFieldMappings()
 {
-	$lead_field['fieldid']=$adb->query_result($result,$i,"fieldid");
-	$lead_field['fieldlabel']=$adb->query_result($result,$i,"fieldlabel");
-	$convert_sql="select * from vtiger_convertleadmapping where leadfid=".$lead_field['fieldid'];
+	global $adb;
+
+	$convert_sql="select vtiger_convertleadmapping.*,uitype,fieldlabel from vtiger_convertleadmapping left join vtiger_field on vtiger_field.fieldid = vtiger_convertleadmapping.leadfid";
 	$convert_result = $adb->query($convert_sql);
 
 	$no_rows = $adb->num_rows($convert_result);
 	for($j=0; $j<$no_rows; $j++)
 	{
+		$leadid = $adb->query_result($convert_result,$j,"leadfid");
 		$accountid=$adb->query_result($convert_result,$j,"accountfid");
 		$contactid=$adb->query_result($convert_result,$j,"contactfid");
 		$potentialid=$adb->query_result($convert_result,$j,"potentialfid");
-	
-		
+		$lead_field['sno'] = $j+1;
+		$lead_field['leadid'] = $adb->query_result($convert_result,$j,"fieldlabel"); 
+		$lead_field['fieldtype'] = getCustomFieldTypeName($adb->query_result($convert_result,$j,"uitype"));; 
+		$lead_field['account'] = getAccountCustomValues($leadid,$accountid);
+		$lead_field['contact'] = getContactCustomValues($leadid,$contactid);
+		$lead_field['potential'] = getPotentialCustomValues($leadid,$potentialid);
+		$leadcf[]= $lead_field;
 	}
-	$lead_field['account']=getAccountCustomValues($lead_field['fieldid'],$accountid);
-	$lead_field['contact']=getContactCustomValues($lead_field['fieldid'],$contactid);
-	$lead_field['potential']=getPotentialCustomValues($lead_field['fieldid'],$potentialid);
-	$leadcf[$lead_field['fieldlabel']]= $lead_field;
+
+	return $leadcf;
 }
-$smarty->assign("CUSTOMFIELDMAPPING",$leadcf);
+
+$smarty->assign("MOD",$mod_strings);
+$smarty->assign("APP",$app_strings);
+$smarty->assign("CUSTOMFIELDMAPPING",customFieldMappings());
 
 $smarty->display("CustomFieldMapping.tpl");
 

Modified: vtigercrm/trunk/modules/Settings/SaveConvertLead.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/SaveConvertLead.php (original)
+++ vtigercrm/trunk/modules/Settings/SaveConvertLead.php Fri Jun 23 04:02:27 2006
@@ -13,10 +13,8 @@
 require_once('include/database/PearDatabase.php');
 require_once('include/utils/utils.php');
 
-//echo"<h3> In Save</h3>";
 	
 	$sql="select fieldid from vtiger_field, vtiger_tab where vtiger_field.tabid=vtiger_tab.tabid and generatedtype=2 and vtiger_tab.name='Leads';";	
-//	echo $sql;	
 	$result = $adb->query($sql);
 	$noofrows = $adb->num_rows($result);
 	
@@ -47,6 +45,6 @@
 
 		$adb->query($update_sql);
 	}
-	 header("Location: index.php?action=ListLeadCustomFieldMapping&module=Settings&parenttab=Settings");
+	 header("Location: index.php?action=CustomFieldList&module=Settings&parenttab=Settings");
 	
 ?>



From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 23 03:04:39 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 10:04:39 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7461 - in /vtigercrm/trunk:
 Smarty/templates/ modules/Settings/ modules/Users/
Message-ID: <20060623100439.9BBA483F7AA@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 23 04:04:31 2006
New Revision: 7461

Log:
unwanted files deleted

Removed:
    vtigercrm/trunk/Smarty/templates/CreateProfile1.tpl
    vtigercrm/trunk/Smarty/templates/CustomFieldCombo.tpl
    vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl
    vtigercrm/trunk/Smarty/templates/SettingsSubMenu.tpl
    vtigercrm/trunk/modules/Settings/ListLeadCustomFieldMapping.php
    vtigercrm/trunk/modules/Settings/SettingsSubMenu.php
    vtigercrm/trunk/modules/Users/CreateProfile1.php



From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 23 03:57:26 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 10:57:26 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7462 -
	/vtigercrm/trunk/include/language/en_us.lang.php
Message-ID: <20060623105726.8201983F776@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 23 04:57:22 2006
New Revision: 7462

Log:
Updated Add New with Add - ahmed

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

Modified: vtigercrm/trunk/include/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/include/language/en_us.lang.php (original)
+++ vtigercrm/trunk/include/language/en_us.lang.php Fri Jun 23 04:57:22 2006
@@ -441,8 +441,7 @@
 
 'LBL_ADD_ITEM'=>'Add',
 
-'LBL_ADD_NEW'=>'Add new',
-
+'LBL_ADD_NEW'=>'Add',
 //Added for version 5
 
 'LBL_CALENDAR_TITLE'=>'Open Calendar...',



From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 23 04:03:47 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 11:03:47 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7463 -
	/vtigercrm/trunk/modules/Users/User.php
Message-ID: <20060623110348.CCA1083F7AA@vtiger.fosslabs.com>

Author: richie
Date: Fri Jun 23 05:03:43 2006
New Revision: 7463

Log:
added 3 functions to support user related list

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 Fri Jun 23 05:03:43 2006
@@ -32,6 +32,8 @@
 require_once('include/database/PearDatabase.php');
 require_once('data/CRMEntity.php');
 require_once('include/utils/UserInfoUtil.php');
+require_once('modules/Activities/Activity.php');
+require_once('modules/Contacts/Contact.php');
 
 // User is used to store customer information.
 class User {
@@ -802,6 +804,63 @@
 
 		return;
 	}
+
+
+
+
+
+
+
+
+//Function Call for Related List -- Start
+        function get_contacts($id)
+	{
+			global $log;
+                        $log->debug("Entering get_contacts(".$id.") method ...");
+			global $app_strings;
+
+			$focus = new Contact();
+
+			
+			
+			$button = '';
+			$query = 'select vtiger_contactdetails.*, vtiger_crmentity.* from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_contactdetails.contactid where vtiger_crmentity.smownerid='.$id.' and vtiger_crmentity.deleted=0';
+			$log->debug("Exiting get_contacts method ...");
+			return GetRelatedList('Users','Contacts',$focus,$query,$button,$returnset);
+        }
+
+
+
+
+//Function Call for Related List -- Start
+        function get_activities($id)
+	{
+			global $log;
+                        $log->debug("Entering get_contacts(".$id.") method ...");
+			global $app_strings;
+
+			$focus = new Activity();
+			
+			$button = '';
+			$query = 'select vtiger_activity.* from vtiger_activity inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid where vtiger_crmentity.smownerid='.$id.' and (vtiger_activity.activitytype="Meeting" || vtiger_activity.activitytype="Task" || vtiger_activity.activitytype="Call" ) and vtiger_crmentity.deleted=0';
+			$log->debug("Exiting get_contacts method ...");
+			return GetRelatedList('Users','Activities',$focus,$query,$button,$returnset);
+        }
+
+function get_user_groups($id)
+{
+		global $log;
+                        $log->debug("Entering get_contacts(".$id.") method ...");
+			global $app_strings;
+			$button = '';
+			$query = 'select vtiger_users.*,vtiger_groups.* from vtiger_users inner join vtiger_users2group on vtiger_users.id=vtiger_users2group.userid left join vtiger_groups on vtiger_groups.groupid=vtiger_users2group.groupid where vtiger_users.id='.$id;
+			$log->debug("Exiting get_contacts method ...");
+			echo '<pre>';print_r(getAllGroupInfo($query));echo '</pre>';
+			return getAllGroupInfo($query);
+			}
+
+
+	
 	function save($module_name) 
 	{
 		global $log;



From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 23 04:04:49 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 11:04:49 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7464 -
	/vtigercrm/trunk/modules/Users/CallRelatedList.php
Message-ID: <20060623110449.8661583F7B5@vtiger.fosslabs.com>

Author: richie
Date: Fri Jun 23 05:04:44 2006
New Revision: 7464

Log:
init version

Added:
    vtigercrm/trunk/modules/Users/CallRelatedList.php   (with props)



From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 23 04:16:59 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 11:16:59 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7465 -
	/vtigercrm/trunk/Smarty/templates/UserDetailView.tpl
Message-ID: <20060623111700.6694683F7B5@vtiger.fosslabs.com>

Author: richie
Date: Fri Jun 23 05:16:55 2006
New Revision: 7465

Log:
More Info Tab added

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

Modified: vtigercrm/trunk/Smarty/templates/UserDetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/UserDetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/UserDetailView.tpl Fri Jun 23 05:16:55 2006
@@ -98,6 +98,8 @@
 			  <tr >
 			        <td id="prof" width="25%" align="center" nowrap="nowrap" class="dvtSelectedCell" onClick="fnVis('prof')"><b>{$UMOD.LBL_USER_LOGIN_ROLE}</b></td>
 			     <td class="dvtTabCache" width="10" nowrap="nowrap">&nbsp;</td>
+
+			     <td class="dvtUnSelectedCell" align=center nowrap><a href="index.php?action=CallRelatedList&module={$MODULE}&record={$ID}&parenttab={$CATEGORY}">{$APP.LBL_MORE} {$APP.LBL_INFORMATION}</a></td>
 				    <td class="dvtTabCache" nowrap="nowrap" width="10">&nbsp;</td>
 			  </tr>
 			  </table>



From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 23 04:19:39 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 11:19:39 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7466 -
 /vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
Message-ID: <20060623111939.D796583F7B5@vtiger.fosslabs.com>

Author: richie
Date: Fri Jun 23 05:19:35 2006
New Revision: 7466

Log:
Related List entries for User added

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

Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original)
+++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Fri Jun 23 05:19:35 2006
@@ -1817,6 +1817,15 @@
 	 $this->db->query("insert into vtiger_relatedlists values (".$this->db->getUniqueID('relatedlists').",".getTabid("Campaigns").",".getTabid("Potentials").",'get_opportunities',3,'Potentials',0)");
 	 $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Campaigns").",9,'get_activities',4,'Activities',0)");
 
+ //Inserting User Related Lists
+ 
+        $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Users").",".getTabid("Activities").",'get_activities',1,'Activities',0)");
+ 
+        $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Users").",".getTabid("Contacts").",'get_contacts',2,'Contacts',0)");
+ 
+        $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Users").",".getTabid("Users").",'get_user_groups',3,'Groups',0)");
+
+	 
                $this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("notificationscheduler").",'LBL_TASK_NOTIFICATION_DESCRITPION',1,'Task Delay Notification','Tasks delayed beyond 24 hrs ','LBL_TASK_NOTIFICATION')");
 
 



From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 23 04:49:59 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 11:49:59 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7467 -
	/vtigercrm/trunk/modules/Users/listwordtemplates.php
Message-ID: <20060623114959.D067483F7C0@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 23 05:49:55 2006
New Revision: 7467

Log:
update listmail merge file

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 Fri Jun 23 05:49:55 2006
@@ -13,7 +13,7 @@
 require_once('include/database/PearDatabase.php');
 
    global $adb;
-   $sql = "select templateid, module, description, filename, vtiger_filesize, filetype from vtiger_wordtemplates order by filename ASC";
+   $sql = "select templateid, module, description, filename, filesize, filetype from vtiger_wordtemplates order by filename ASC";
    $result = $adb->query($sql);
 
 $edit="Edit  ";



From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 23 05:01:56 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 12:01:56 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7468 -
	/vtigercrm/trunk/Smarty/templates/SetMenu.tpl
Message-ID: <20060623120156.0DEDC83F7C2@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 23 06:01:52 2006
New Revision: 7468

Log:
updated set menu tabs

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

Modified: vtigercrm/trunk/Smarty/templates/SetMenu.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/SetMenu.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/SetMenu.tpl Fri Jun 23 06:01:52 2006
@@ -76,7 +76,7 @@
 				{/if}
 
 				{if $smarty.request.action eq 'listwordtemplates' || $smarty.request.action eq 'add2db' || $smarty.request.action eq 'deletewordtemplate'}
-				<tr><td class="settingsTabSelected" nowrap>{$MOD.EMAILTEMPLATES}</td></tr>
+				<tr><td class="settingsTabSelected" nowrap>{$MOD.WORDINTEGRATION}</td></tr>
 				
 				{else}	
 				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=listwordtemplates&parenttab=Settings">{$MOD.WORDINTEGRATION}</a></td></tr>



From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 05:38:05 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 12:38:05 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231128=3A?=
 =?utf-8?q?_too_high_reaction_time_in_using_inventory?=
In-Reply-To: <076.209b6cc7a2151c8fd5ca32cfa5df69e2@vtiger.fosslabs.com>
References: <076.209b6cc7a2151c8fd5ca32cfa5df69e2@vtiger.fosslabs.com>
Message-ID: <085.0cc6976dc146a11020ced3365b2ee125@vtiger.fosslabs.com>

#1128: too high reaction time in using inventory
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  don        
      Type:  defect     |      Status:  new        
  Priority:  major      |   Milestone:             
 Component:  vtigercrm  |     Version:  5.0.1      
Resolution:             |    Keywords:  performance
------------------------+---------------------------------------------------
Changes (by don):

  * version:  5.0.0 => 5.0.1

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1128>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 05:38:05 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 12:38:05 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231120=3A?=
 =?utf-8?q?_alignment_not_proper_in_Customfield_listview?=
In-Reply-To: <076.4b884f803d6e52a23bdf4c14044cef75@vtiger.fosslabs.com>
References: <076.4b884f803d6e52a23bdf4c14044cef75@vtiger.fosslabs.com>
Message-ID: <085.48577f1bf0f56b9b36c659dde888d072@vtiger.fosslabs.com>

#1120: alignment not proper in Customfield listview
------------------------+---------------------------------------------------
  Reporter:  mangai     |       Owner:  jeri  
      Type:  defect     |      Status:  closed
  Priority:  minor      |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by anonymous):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1120>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 05:38:09 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 12:38:09 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231144=3A?=
 =?utf-8?q?_Ajax_Quick_Edit_Fields_Retains_value_in_the_text_box_even_if_w?=
 =?utf-8?q?e_cancel_it=2E?=
In-Reply-To: <076.d0b610be5ddd2e2c4150bff5f9d0ced7@vtiger.fosslabs.com>
References: <076.d0b610be5ddd2e2c4150bff5f9d0ced7@vtiger.fosslabs.com>
Message-ID: <085.f58cdc65a14b37db44c283df585cb241@vtiger.fosslabs.com>

#1144: Ajax Quick Edit Fields Retains value in the text box even if we cancel it.
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  Jeri           
      Type:  defect     |      Status:  closed         
  Priority:  critical   |   Milestone:                 
 Component:  vtigercrm  |     Version:  5.0.0          
Resolution:  fixed      |    Keywords:  Quick Edit Ajax
------------------------+---------------------------------------------------
Changes (by anonymous):

  * resolution:  => fixed
  * status:  reopened => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1144>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 05:38:58 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 12:38:58 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23779=3A_?=
 =?utf-8?q?Update_Home_Page_Block_Order_Terms?=
In-Reply-To: <076.211ee58adeeafe8bd16e6d4f4857e285@vtiger.fosslabs.com>
References: <076.211ee58adeeafe8bd16e6d4f4857e285@vtiger.fosslabs.com>
Message-ID: <085.f0fd0867a13472252fdcf5ba0e02b215@vtiger.fosslabs.com>

#779: Update Home Page Block Order Terms
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  jerrydgeorge
      Type:  defect     |      Status:  new         
  Priority:  trivial    |   Milestone:              
 Component:  vtigercrm  |     Version:  5.0.0       
Resolution:             |    Keywords:              
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  don => jerrydgeorge

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/779>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 05:39:41 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 12:39:41 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231231=3A?=
 =?utf-8?q?_Back-Up_image_need_to_be_changed_to_Backup?=
In-Reply-To: <076.c2941e2d8fa4d0dfe3444a70c45ff67b@vtiger.fosslabs.com>
References: <076.c2941e2d8fa4d0dfe3444a70c45ff67b@vtiger.fosslabs.com>
Message-ID: <085.d4e34ab8cd9e00122b366a5ddb942e7e@vtiger.fosslabs.com>

#1231: Back-Up image need to be changed to Backup
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  ela  
      Type:  defect     |      Status:  new  
  Priority:  minor      |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  don => ela

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1231>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 05:44:35 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 12:44:35 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231008=3A?=
 =?utf-8?q?_assigned_to_group_is_not_coming_properly_in_ajax_edit?=
In-Reply-To: <076.6de5891dfeb7d1d2214d1225f8d87438@vtiger.fosslabs.com>
References: <076.6de5891dfeb7d1d2214d1225f8d87438@vtiger.fosslabs.com>
Message-ID: <085.16c2e2f35197304f89382fd6bf605609@vtiger.fosslabs.com>

#1008: assigned to group is not coming properly in ajax edit
------------------------+---------------------------------------------------
  Reporter:  mangai     |       Owner:  jeri 
      Type:  defect     |      Status:  new  
  Priority:  major      |   Milestone:  5.0.0
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  suman => jeri

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1008>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 23 05:50:58 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 12:50:58 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7469 -
	/vtigercrm/trunk/include/js/ListView.js
Message-ID: <20060623125058.786A07D809C@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 23 06:50:54 2006
New Revision: 7469

Log:
#Fixes 1350

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

Modified: vtigercrm/trunk/include/js/ListView.js
==============================================================================
--- vtigercrm/trunk/include/js/ListView.js (original)
+++ vtigercrm/trunk/include/js/ListView.js Fri Jun 23 06:50:54 2006
@@ -18,7 +18,7 @@
 	
 		if (document.massdelete.selected_id.checked)
 		{
-			document.massdelete.idlist.value=document.massdelete.selected_id.value;
+			document.massdelete.idlist.value=document.massdelete.selected_id.value +";";
 		}
 		else 
 		{
@@ -60,7 +60,7 @@
 
                 if (document.massdelete.selected_id.checked)
                 {
-                        idstring = document.massdelete.selected_id.value+':';
+                        idstring = document.massdelete.selected_id.value+';';
                 		xx = 1;
                 }
                 else



From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 05:52:50 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 12:52:50 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231362=3A?=
	=?utf-8?q?_alrf_lmgo?=
In-Reply-To: <076.198951aac88d3004380ae68299abd85f@vtiger.fosslabs.com>
References: <076.198951aac88d3004380ae68299abd85f@vtiger.fosslabs.com>
Message-ID: <085.3a81271e1c25c30bf4ef20663dceaf4d@vtiger.fosslabs.com>

#1362: alrf lmgo
----------------------------+-----------------------------------------------
  Reporter:  test at test.com  |       Owner:  alrf lmgo
      Type:  defect         |      Status:  closed   
  Priority:  major          |   Milestone:           
 Component:  vtigercrm      |     Version:  5.0.0    
Resolution:  invalid        |    Keywords:  alrf lmgo
----------------------------+-----------------------------------------------
Changes (by anonymous):

  * resolution:  => invalid
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1362>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 05:53:05 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 12:53:05 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231361=3A?=
	=?utf-8?q?_kwxu_dgsbwtae?=
In-Reply-To: <076.1b75ad68cf558361fc44b91309481d8d@vtiger.fosslabs.com>
References: <076.1b75ad68cf558361fc44b91309481d8d@vtiger.fosslabs.com>
Message-ID: <085.fdaf747718ababe4e796407c1ba2c010@vtiger.fosslabs.com>

#1361: kwxu dgsbwtae
----------------------------+-----------------------------------------------
  Reporter:  test at test.com  |       Owner:  kwxu dgsbwtae
      Type:  defect         |      Status:  closed       
  Priority:  major          |   Milestone:               
 Component:  vtigercrm      |     Version:  5.0.0        
Resolution:  invalid        |    Keywords:  kwxu dgsbwtae
----------------------------+-----------------------------------------------
Changes (by anonymous):

  * resolution:  => invalid
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1361>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 05:53:16 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 12:53:16 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231360=3A?=
	=?utf-8?q?_phajzen_gesf?=
In-Reply-To: <076.b8badd1330313fb32e243bd826d1a92f@vtiger.fosslabs.com>
References: <076.b8badd1330313fb32e243bd826d1a92f@vtiger.fosslabs.com>
Message-ID: <085.cbb8b79761adb7814a24605aeae886b4@vtiger.fosslabs.com>

#1360: phajzen gesf
----------------------------+-----------------------------------------------
  Reporter:  test at test.com  |       Owner:  phajzen gesf
      Type:  defect         |      Status:  closed      
  Priority:  major          |   Milestone:              
 Component:  vtigercrm      |     Version:  5.0.0       
Resolution:  invalid        |    Keywords:  phajzen gesf
----------------------------+-----------------------------------------------
Changes (by anonymous):

  * resolution:  => invalid
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1360>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 06:02:53 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 13:02:53 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231338=3A?=
 =?utf-8?q?_Merging_duplicate_accounts_while_importing_contacts?=
In-Reply-To: <076.696913d7878e2f3bc89c15f694a0683e@vtiger.fosslabs.com>
References: <076.696913d7878e2f3bc89c15f694a0683e@vtiger.fosslabs.com>
Message-ID: <085.56b060c05b3e4929eb0faa22867a8799@vtiger.fosslabs.com>

#1338: Merging duplicate accounts while importing contacts
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  developer
      Type:  defect     |      Status:  new      
  Priority:  critical   |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.1    
Resolution:             |    Keywords:           
------------------------+---------------------------------------------------
Changes (by anonymous):

  * version:  5.0.0 => 5.0.1

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1338>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 06:06:50 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 13:06:50 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231313=3A?=
	=?utf-8?q?_Pop_up_size?=
In-Reply-To: <076.d5cfe0f287242a74ba422f819314f615@vtiger.fosslabs.com>
References: <076.d5cfe0f287242a74ba422f819314f615@vtiger.fosslabs.com>
Message-ID: <085.619433b87352233d90adeecf6a80543c@vtiger.fosslabs.com>

#1313: Pop up size
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  ela                  
      Type:  defect     |      Status:  closed               
  Priority:  major      |   Milestone:                       
 Component:  vtigercrm  |     Version:  5.0.0                
Resolution:  duplicate  |    Keywords:  email, report, pop up
------------------------+---------------------------------------------------
Changes (by anonymous):

  * resolution:  => duplicate
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1313>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 06:07:06 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 13:07:06 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231331=3A?=
 =?utf-8?q?_rename_PearDatabase_to_signify_adodb_wrapper=2C_update_source?=
In-Reply-To: <076.b5a070e4cc46d3aaf4b69d4eea42547e@vtiger.fosslabs.com>
References: <076.b5a070e4cc46d3aaf4b69d4eea42547e@vtiger.fosslabs.com>
Message-ID: <085.224122ce075c9b932a2d724ff8c98592@vtiger.fosslabs.com>

#1331: rename PearDatabase to signify adodb wrapper, update source
------------------------+---------------------------------------------------
  Reporter:  jeffk      |       Owner:  developer          
      Type:  defect     |      Status:  new                
  Priority:  major      |   Milestone:  5.0.0              
 Component:  vtigercrm  |     Version:  5.0.1              
Resolution:             |    Keywords:  database adodb pear
------------------------+---------------------------------------------------
Changes (by anonymous):

  * version:  5.0.0 => 5.0.1

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1331>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 06:07:14 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 13:07:14 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231333=3A?=
 =?utf-8?q?_Avoid_Usage_of_Plural_forms_for_Create_Record?=
In-Reply-To: <076.18d7de57d208fc4aee376b0dac1a75a7@vtiger.fosslabs.com>
References: <076.18d7de57d208fc4aee376b0dac1a75a7@vtiger.fosslabs.com>
Message-ID: <085.fa0ddf5e2d25680bfda5b2371c63b02d@vtiger.fosslabs.com>

#1333: Avoid Usage of Plural forms for Create Record
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  developer
      Type:  defect     |      Status:  new      
  Priority:  major      |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.1    
Resolution:             |    Keywords:           
------------------------+---------------------------------------------------
Changes (by anonymous):

  * version:  5.0.0 => 5.0.1

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1333>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 06:07:23 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 13:07:23 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231359=3A?=
	=?utf-8?q?_nkmvswao_hrgxpcnj?=
In-Reply-To: <076.231caceb8d206fe629ab31edf63bacab@vtiger.fosslabs.com>
References: <076.231caceb8d206fe629ab31edf63bacab@vtiger.fosslabs.com>
Message-ID: <085.31aa57d165d00bddb8535e128acbe083@vtiger.fosslabs.com>

#1359: nkmvswao hrgxpcnj
----------------------------+-----------------------------------------------
  Reporter:  test at test.com  |       Owner:  nkmvswao hrgxpcnj
      Type:  defect         |      Status:  closed           
  Priority:  major          |   Milestone:                   
 Component:  vtigercrm      |     Version:  5.0.0            
Resolution:  invalid        |    Keywords:  nkmvswao hrgxpcnj
----------------------------+-----------------------------------------------
Changes (by anonymous):

  * resolution:  => invalid
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1359>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 06:07:32 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 13:07:32 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231352=3A?=
 =?utf-8?q?_integrate_source_code_of_self_update_functionality_get_form_ga?=
 =?utf-8?b?bGxlcnkuc2YubmV0ICh2Mik=?=
In-Reply-To: <076.c9c005c06f2e1cab9b816c461bc143a2@vtiger.fosslabs.com>
References: <076.c9c005c06f2e1cab9b816c461bc143a2@vtiger.fosslabs.com>
Message-ID: <085.1c54e7c712a37cdf7e9d11e7f144f488@vtiger.fosslabs.com>

#1352: integrate source code of self update functionality get form gallery.sf.net
(v2)
----------------------------------------+-----------------------------------
  Reporter:  shimon at schoolportal.co.il  |       Owner:  developer
      Type:  defect                     |      Status:  new      
  Priority:  minor                      |   Milestone:  5.0.0    
 Component:  vtigercrm                  |     Version:  5.0.1    
Resolution:                             |    Keywords:  update,  
----------------------------------------+-----------------------------------
Changes (by anonymous):

  * version:  5.0.0 => 5.0.1

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1352>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 06:10:55 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 13:10:55 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231358=3A?=
	=?utf-8?q?_uslmw_ifadpeny?=
In-Reply-To: <076.7fc082f0f31c48e750627c13eadbd4fd@vtiger.fosslabs.com>
References: <076.7fc082f0f31c48e750627c13eadbd4fd@vtiger.fosslabs.com>
Message-ID: <085.e76398820938e4354f44543e1a97e25e@vtiger.fosslabs.com>

#1358: uslmw ifadpeny
----------------------------+-----------------------------------------------
  Reporter:  test at test.com  |       Owner:  uslmw ifadpeny
      Type:  defect         |      Status:  closed        
  Priority:  major          |   Milestone:                
 Component:  vtigercrm      |     Version:  5.0.0         
Resolution:  invalid        |    Keywords:  uslmw ifadpeny
----------------------------+-----------------------------------------------
Changes (by anonymous):

  * resolution:  => invalid
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1358>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 06:12:32 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 13:12:32 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231094=3A?=
 =?utf-8?q?_dvtCellLabel_-_Change_font_color=3A=23737373_to_=3A=23000000?=
In-Reply-To: <076.2a146cfd18ac3bf1c71688b22c5a081d@vtiger.fosslabs.com>
References: <076.2a146cfd18ac3bf1c71688b22c5a081d@vtiger.fosslabs.com>
Message-ID: <085.43622d9e421d156fa2bd8b1d8962f4f9@vtiger.fosslabs.com>

#1094: dvtCellLabel - Change font color:#737373 to :#000000
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  ela   
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  invalid    |    Keywords:        
------------------------+---------------------------------------------------
Changes (by anonymous):

  * resolution:  => invalid
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1094>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 23 06:23:58 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 13:23:58 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7470 -
	/vtigercrm/trunk/modules/Contacts/Contact.js
Message-ID: <20060623132358.0EA4483F7E9@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 23 07:23:55 2006
New Revision: 7470

Log:
SelectAll js function has been moved to general.js

Modified:
    vtigercrm/trunk/modules/Contacts/Contact.js

Modified: vtigercrm/trunk/modules/Contacts/Contact.js
==============================================================================
--- vtigercrm/trunk/modules/Contacts/Contact.js (original)
+++ vtigercrm/trunk/modules/Contacts/Contact.js Fri Jun 23 07:23:55 2006
@@ -60,62 +60,6 @@
 	}
 }
 
-//Function added for Mass select in Popup - Philip
-function SelectAll()
-{
-
-        x = document.selectall.selected_id.length;
-	var entity_id = window.opener.document.getElementById('parent_id').value
-	var module = window.opener.document.getElementById('return_module').value
-	document.selectall.action.value='updateRelations'
-        idstring = "";
-
-        if ( x == undefined)
-        {
-
-                if (document.selectall.selected_id.checked)
-                {
-                        document.selectall.idlist.value=document.selectall.selected_id.value;
-                }
-                else
-                {
-                        alert("Please select atleast one entity");
-                        return false;
-                }
-        }
-        else
-        {
-                xx = 0;
-                for(i = 0; i < x ; i++)
-                {
-                        if(document.selectall.selected_id[i].checked)
-                        {
-                                idstring = document.selectall.selected_id[i].value +";"+idstring
-                        xx++
-                        }
-                }
-                if (xx != 0)
-                {
-                        document.selectall.idlist.value=idstring;
-                }
-                else
-                {
-                        alert("Please select atleast one entity");
-                        return false;
-                }
-	}
-		if(confirm("Are you sure you want to add the selected "+xx+" records ?"))
-		{
-		opener.document.location.href="index.php?module="+module+"&parentid="+entity_id+"&action=updateRelations&destination_module=Contacts&idlist="+idstring;
-		self.close();
-		}
-		else
-		{
-			return false;
-		}
-}
-
-
 function set_return(product_id, product_name) {
         window.opener.document.EditView.parent_name.value = product_name;
         window.opener.document.EditView.parent_id.value = product_id;



From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 23 06:25:16 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 13:25:16 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7471 -
	/vtigercrm/trunk/modules/Leads/Lead.js
Message-ID: <20060623132516.31D5A83F771@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 23 07:25:12 2006
New Revision: 7471

Log:
SelectAll js function has been moved to general.js

Modified:
    vtigercrm/trunk/modules/Leads/Lead.js

Modified: vtigercrm/trunk/modules/Leads/Lead.js
==============================================================================
--- vtigercrm/trunk/modules/Leads/Lead.js (original)
+++ vtigercrm/trunk/modules/Leads/Lead.js Fri Jun 23 07:25:12 2006
@@ -65,60 +65,6 @@
 
 }
 
-//Function added for Mass select in Popup - Philip
-function SelectAll()
-{
-
-        x = document.selectall.selected_id.length;
-        var entity_id = window.opener.document.getElementById('parent_id').value
-        var module = window.opener.document.getElementById('return_module').value
-        document.selectall.action.value='updateRelations'
-        idstring = "";
-
-        if ( x == undefined)
-        {
-
-                if (document.selectall.selected_id.checked)
-                {
-                        document.selectall.idlist.value=document.selectall.selected_id.value;
-                }
-                else
-                {
-                        alert("Please select atleast one entity");
-                        return false;
-                }
-        }
-        else
-        {
-                xx = 0;
-                for(i = 0; i < x ; i++)
-                {
-                        if(document.selectall.selected_id[i].checked)
-                        {
-                                idstring = document.selectall.selected_id[i].value +";"+idstring
-                        xx++
-                        }
-                }
-                if (xx != 0)
-                {
-                        document.selectall.idlist.value=idstring;
-                }
-		else
-                {
-                        alert("Please select atleast one entity");
-                        return false;
-                }
-        }
-        if(confirm("Are you sure you want to add the selected "+xx+" records ?"))
-        {
-                opener.document.location.href="index.php?module="+module+"&parentid="+entity_id+"&action=updateRelations&destination_module=Leads&idlist="+idstring;
-                self.close();
-        }
-        else
-        {
-                return false;
-        }
-}
 
 function set_return(product_id, product_name) {
         window.opener.document.EditView.parent_name.value = product_name;



From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 23 06:29:58 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 13:29:58 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7472 -
	/vtigercrm/trunk/include/js/general.js
Message-ID: <20060623132958.9BDC683F7F0@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 23 07:29:54 2006
New Revision: 7472

Log:
SelectAll js function has been moved to general.js

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 Fri Jun 23 07:29:54 2006
@@ -1630,3 +1630,58 @@
 	openPopUp('xComposeEmail',this,url,'createemailWin',820,652,'menubar=no,toolbar=no,location=no,status=no,resizable=no');
 }
 
+//Function added for Mass select in Popup - Philip
+function SelectAll(mod)
+{
+
+        x = document.selectall.selected_id.length;
+        var entity_id = window.opener.document.getElementById('parent_id').value
+        var module = window.opener.document.getElementById('return_module').value
+        document.selectall.action.value='updateRelations'
+        idstring = "";
+
+        if ( x == undefined)
+        {
+
+                if (document.selectall.selected_id.checked)
+                {
+                        document.selectall.idlist.value=document.selectall.selected_id.value;
+                }
+                else
+		{
+                        alert("Please select atleast one entity");
+                        return false;
+                }
+        }
+        else
+        {
+                xx = 0;
+                for(i = 0; i < x ; i++)
+                {
+                        if(document.selectall.selected_id[i].checked)
+                        {
+                                idstring = document.selectall.selected_id[i].value +";"+idstring
+                        xx++
+                        }
+                }
+                if (xx != 0)
+                {
+                        document.selectall.idlist.value=idstring;
+                }
+                 else
+                {
+                        alert("Please select atleast one entity");
+                        return false;
+                }
+        }
+                if(confirm("Are you sure you want to add the selected "+xx+" records ?"))
+                {
+                        opener.document.location.href="index.php?module="+module+"&parentid="+entity_id+"&action=updateRelations&destination_module="+mod+"&idlist="+idstring;
+                self.close();
+                }
+		else
+                {
+                        return false;
+                }
+}
+



From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 23 06:32:33 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 13:32:33 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7473 -
	/vtigercrm/trunk/Smarty/templates/PopupContents.tpl
Message-ID: <20060623133233.9E91E83F7F5@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 23 07:32:28 2006
New Revision: 7473

Log:
module has been passed to SelectAll js function

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

Modified: vtigercrm/trunk/Smarty/templates/PopupContents.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/PopupContents.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/PopupContents.tpl Fri Jun 23 07:32:28 2006
@@ -14,7 +14,7 @@
 <table width="100%" border="0" cellspacing="0" cellpadding="0" class="small">
 	<tr>
 	{if $SELECT eq 'enable'}
-		<td style="padding-left:10px;" align="left"><input class="small" type="button" value="Add {$MODULE}" onclick="if(SelectAll()) window.close();"/></td>
+		<td style="padding-left:10px;" align="left"><input class="small" type="button" value="Add {$MODULE}" onclick="if(SelectAll('{$MODULE}')) window.close();"/></td>
 	{else}		
 		<td>&nbsp;</td>	
 	{/if}



From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 23 06:36:03 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 13:36:03 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7474 -
 /vtigercrm/trunk/modules/Users/language/en_us.lang.php
Message-ID: <20060623133603.4678983F7F5@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 23 07:35:58 2006
New Revision: 7474

Log:
#Fixes 779

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

Modified: vtigercrm/trunk/modules/Users/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Users/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Users/language/en_us.lang.php Fri Jun 23 07:35:58 2006
@@ -474,7 +474,7 @@
 'CVLVT'=>'Key Metrics',
 'HLT'=>'HelpDesk Top Tickets',
 'OLV'=>'Top Open Activities',
-'GRT'=>'Top Group Tasks',
+'GRT'=>'My Group Allocation',
 'OLTSO'=>'Top Sales Orders',
 'ILTI'=>'Top Invoices',
 //Added for 5.0 alpha



From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 06:36:20 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 13:36:20 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231350=3A?=
 =?utf-8?q?_Mass_Delete_not_working_for_the_only_record_in_List_View?=
In-Reply-To: <076.52d2f3cf1c5fb831b08c5d544f32f873@vtiger.fosslabs.com>
References: <076.52d2f3cf1c5fb831b08c5d544f32f873@vtiger.fosslabs.com>
Message-ID: <085.5c78f6dd9b134cd20e6ce539600b8742@vtiger.fosslabs.com>

#1350: Mass Delete not working for the only record in List View
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  jeri  
      Type:  defect     |      Status:  closed
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by anonymous):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1350>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 23 06:36:50 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 13:36:50 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7475 -
 /vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php
Message-ID: <20060623133650.265CF83F7F5@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 23 07:36:46 2006
New Revision: 7475

Log:
campaignid has been removed

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

Modified: vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php (original)
+++ vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php Fri Jun 23 07:36:46 2006
@@ -290,7 +290,7 @@
 $contact_id = $crmcontactid;
 $log->debug("contact id is ".$contact_id);
 
-$sql_insert_contact = "INSERT INTO vtiger_contactdetails (contactid,accountid,campaignid,salutation,firstname,lastname,email,phone,mobile,title,fax,yahooid) VALUES (".$contact_id.",".$crmid.",'".$row["campaignid"]. "','".$row["salutationtype"] ."','" .$row["firstname"] ."','" .$row["lastname"] ."','" .$row["email"] ."','" .$row["phone"]. "','" .$row["mobile"] ."','" .$row["designation"] ."','".$row["fax"] ."','".$row['yahooid']."')";
+$sql_insert_contact = "INSERT INTO vtiger_contactdetails (contactid,accountid,salutation,firstname,lastname,email,phone,mobile,title,fax,yahooid) VALUES (".$contact_id.",".$crmid.",'".$row["salutationtype"] ."','" .$row["firstname"] ."','" .$row["lastname"] ."','" .$row["email"] ."','" .$row["phone"]. "','" .$row["mobile"] ."','" .$row["designation"] ."','".$row["fax"] ."','".$row['yahooid']."')";
 
 $adb->query($sql_insert_contact);
 
@@ -351,7 +351,7 @@
 		$potential_amount=0;
         }
 
-	$sql_insert_opp = "INSERT INTO vtiger_potential (potentialid,accountid,campaignid,potentialname,leadsource,closingdate,sales_stage,amount) VALUES (".$oppid.",".$crmid .",'".$row["campaignid"]. "','".addslashes($potential_name)."','".$row['leadsource']."','".$close_date."','".$potential_sales_stage."',".$potential_amount.")";
+	$sql_insert_opp = "INSERT INTO vtiger_potential (potentialid,accountid,potentialname,leadsource,closingdate,sales_stage,amount) VALUES (".$oppid.",".$crmid .",'".addslashes($potential_name)."','".$row['leadsource']."','".$close_date."','".$potential_sales_stage."',".$potential_amount.")";
 
 	$adb->query($sql_insert_opp);
 



From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 23 06:41:46 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 13:41:46 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7476 - in
 /vtigercrm/trunk/modules: Contacts/Contact.php Leads/Lead.php
Message-ID: <20060623134146.79B90786347@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 23 07:41:41 2006
New Revision: 7476

Log:
returnset has been set

Modified:
    vtigercrm/trunk/modules/Contacts/Contact.php
    vtigercrm/trunk/modules/Leads/Lead.php

Modified: vtigercrm/trunk/modules/Contacts/Contact.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/Contact.php (original)
+++ vtigercrm/trunk/modules/Contacts/Contact.php Fri Jun 23 07:41:41 2006
@@ -494,6 +494,7 @@
 		global $mod_strings;
 
 		$focus = new Campaign();
+		$returnset = '&return_module=Contacts&return_action=CallRelatedList&return_id='.$id;
 		$button = '';
 
 		$returnset = '';

Modified: vtigercrm/trunk/modules/Leads/Lead.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/Lead.php (original)
+++ vtigercrm/trunk/modules/Leads/Lead.php Fri Jun 23 07:41:41 2006
@@ -211,7 +211,7 @@
 	$focus = new Campaign();
 	$button = '';
 
-	$returnset = '';
+	$returnset = '&return_module=Leads&return_action=CallRelatedList&return_id='.$id;
 	$log->info("Campaign Related List for Lead Displayed");
 	$query = "SELECT vtiger_users.user_name, vtiger_campaign.campaignid, vtiger_campaign.campaignname, vtiger_campaign.campaigntype, vtiger_campaign.campaignstatus, vtiger_campaign.expectedrevenue, vtiger_campaign.closingdate, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_campaign inner join vtiger_campaignleadrel on vtiger_campaignleadrel.campaignid=vtiger_campaign.campaignid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_campaign.campaignid left join vtiger_campaigngrouprelation on vtiger_campaign.campaignid=vtiger_campaigngrouprelation.campaignid left join vtiger_groups on vtiger_groups.groupname=vtiger_campaigngrouprelation.groupname left join vtiger_users on vtiger_users.id = vtiger_crmentity.smownerid where vtiger_campaignleadrel.leadid=".$id." and vtiger_crmentity.deleted=0";
 



From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 06:46:41 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 13:46:41 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231363=3A?=
 =?utf-8?q?_UI_for_add_Rss_is_not_proper?=
Message-ID: <076.6ee9312956ea784d7fa3bb9c14cb5dea@vtiger.fosslabs.com>

#1363: UI for add Rss is not proper
--------------------------+-------------------------------------------------
 Reporter:  jerrydgeorge  |       Owner:  ela  
     Type:  defect        |      Status:  new  
 Priority:  major         |   Milestone:       
Component:  vtigercrm     |     Version:  5.0.0
 Keywords:                |  
--------------------------+-------------------------------------------------


-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1363>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 06:46:52 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 13:46:52 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23779=3A_?=
 =?utf-8?q?Update_Home_Page_Block_Order_Terms?=
In-Reply-To: <076.211ee58adeeafe8bd16e6d4f4857e285@vtiger.fosslabs.com>
References: <076.211ee58adeeafe8bd16e6d4f4857e285@vtiger.fosslabs.com>
Message-ID: <085.9fffce71d36d250f069763fd9e5817e0@vtiger.fosslabs.com>

#779: Update Home Page Block Order Terms
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  jerrydgeorge
      Type:  defect     |      Status:  closed      
  Priority:  trivial    |   Milestone:              
 Component:  vtigercrm  |     Version:  5.0.0       
Resolution:  fixed      |    Keywords:              
------------------------+---------------------------------------------------
Changes (by anonymous):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/779>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 23 06:51:02 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 13:51:02 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7477 -
	/vtigercrm/trunk/include/utils/ListViewUtils.php
Message-ID: <20060623135103.3854483F803@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 23 07:50:58 2006
New Revision: 7477

Log:
changes made to fix the issue 1351

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 Fri Jun 23 07:50:58 2006
@@ -738,12 +738,12 @@
 		}
 
 		//Added for Actions ie., edit and delete links in listview 
-		$edit_link = getListViewEditLink($module,$entity_id,$relatedlist,$returnset);
-		$del_link = getListViewDeleteLink($module,$entity_id,$relatedlist,$returnset);
+		$edit_link = getListViewEditLink($module,$entity_id,$relatedlist,$varreturnset,$list_result,$list_result_count);
+		$del_link = getListViewDeleteLink($module,$entity_id,$relatedlist,$varreturnset);
 
 		$links_info = "<a href=\"$edit_link\"> &nbsp;".$app_strings["LNK_EDIT"]." </a> ";
 		if($del_link != '')
-			$links_info .=	" | <a href=\"javascript:;\" onclick=confirmdelete(\"$del_link\")> ".$app_strings["LNK_DELETE"]." </a>";
+			$links_info .=	" | <a href=\"javascript:;\" onclick='confirmdelete(\"$del_link\")'> ".$app_strings["LNK_DELETE"]." </a>";
 
 		$list_header[] = $links_info;
 
@@ -2690,8 +2690,9 @@
  *	@param string 	$returnset 	- may be empty in case of ListView. For relatedlists, return_module, return_action and return_id values will be passed like &return_module=Accounts&return_action=CallRelatedList&return_id=10
  *	return string	$edit_link	- url string which cotains the editlink details (module, action, record, etc.,) like index.php?module=Accounts&action=EditView&record=10
  */
-function getListViewEditLink($module,$entity_id,$relatedlist,$returnset)
+function getListViewEditLink($module,$entity_id,$relatedlist,$returnset,$result,$count)
 {
+	global $adb;
 	$edit_link = "index.php?module=$module&action=EditView&record=$entity_id";
 
 	//This is relatedlist listview
@@ -2701,6 +2702,14 @@
 	}
 	else
 	{
+		if($module == 'Activities')
+		{
+			$actvity_type = $adb->query_result($result,$count,'activitytype');
+			if($actvity_type == 'Task')
+				$edit_link .= '&activity_mode=Task';
+			else
+				$edit_link .= '&activity_mode=Events';
+		}
 		$edit_link .= "&return_module=$module&return_action=index";
 	}
 



From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 06:51:20 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 13:51:20 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231351=3A?=
 =?utf-8?q?_Editing_Activity_in_Leads_Related_List_Shows_Warning?=
In-Reply-To: <076.23a2cbc68532eb6ef08e3d5e59241e8c@vtiger.fosslabs.com>
References: <076.23a2cbc68532eb6ef08e3d5e59241e8c@vtiger.fosslabs.com>
Message-ID: <085.1bed0cfef798ea1fdb6a12da837a8041@vtiger.fosslabs.com>

#1351: Editing Activity in Leads Related List Shows Warning
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  mangai
      Type:  defect     |      Status:  closed
  Priority:  blocker    |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mangai):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 fixed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1351>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 06:57:39 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 13:57:39 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231317=3A?=
 =?utf-8?q?_Compose_Email_Page_Issue?=
In-Reply-To: <076.a9eeeed40174d2838271904b6989fe27@vtiger.fosslabs.com>
References: <076.a9eeeed40174d2838271904b6989fe27@vtiger.fosslabs.com>
Message-ID: <085.39491ddddd9aaf1177e01360ea6118f8@vtiger.fosslabs.com>

#1317: Compose Email Page Issue
---------------------------+------------------------------------------------
  Reporter:  jerrydgeorge  |       Owner:  Ela   
      Type:  defect        |      Status:  closed
  Priority:  blocker       |   Milestone:        
 Component:  vtigercrm     |     Version:  5.0.0 
Resolution:  duplicate     |    Keywords:        
---------------------------+------------------------------------------------
Changes (by richie):

  * resolution:  => duplicate
  * status:  new => closed

Comment:

 Duplicate 1343

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1317>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 06:59:25 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 13:59:25 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=23734=3A_?=
	=?utf-8?q?Issue_in_Rss_UI?=
In-Reply-To: <076.e1e137b6d1056e18ee101a85754a710a@vtiger.fosslabs.com>
References: <076.e1e137b6d1056e18ee101a85754a710a@vtiger.fosslabs.com>
Message-ID: <085.70fca018ffb9c2639a23f640c1397ccf@vtiger.fosslabs.com>

#734: Issue in Rss UI
---------------------------+------------------------------------------------
  Reporter:  jerrydgeorge  |       Owner:  ela   
      Type:  defect        |      Status:  closed
  Priority:  major         |   Milestone:        
 Component:  vtigercrm     |     Version:  5.0.0 
Resolution:  fixed         |    Keywords:  UI    
---------------------------+------------------------------------------------
Changes (by anonymous):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/734>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 06:59:29 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 13:59:29 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231274=3A?=
 =?utf-8?q?_customer_portal_5=2E0_missing?=
In-Reply-To: <076.709d4c1791ce9aaefba03d131eecd0c0@vtiger.fosslabs.com>
References: <076.709d4c1791ce9aaefba03d131eecd0c0@vtiger.fosslabs.com>
Message-ID: <085.7543921603d3482d28e5c49ff59a3c41@vtiger.fosslabs.com>

#1274: customer portal 5.0 missing
-----------------------------+----------------------------------------------
  Reporter:  anonymous       |       Owner:  mickie
      Type:  defect          |      Status:  closed
  Priority:  blocker         |   Milestone:        
 Component:  customerportal  |     Version:  5.0.0 
Resolution:  fixed           |    Keywords:        
-----------------------------+----------------------------------------------
Changes (by richie):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1274>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 06:59:57 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 13:59:57 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=23735=3A_?=
	=?utf-8?q?Rss_UI_Issue?=
In-Reply-To: <076.edb4f5ce57d779b8540628d713305768@vtiger.fosslabs.com>
References: <076.edb4f5ce57d779b8540628d713305768@vtiger.fosslabs.com>
Message-ID: <085.5793df84d10a491dd3c2b2ddaf6050a2@vtiger.fosslabs.com>

#735: Rss UI Issue
---------------------------+------------------------------------------------
  Reporter:  jerrydgeorge  |       Owner:  ela   
      Type:  defect        |      Status:  closed
  Priority:  major         |   Milestone:        
 Component:  vtigercrm     |     Version:  5.0.0 
Resolution:  fixed         |    Keywords:  UI    
---------------------------+------------------------------------------------
Changes (by anonymous):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/735>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 07:00:46 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 14:00:46 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231230=3A?=
 =?utf-8?q?_need_to_have_user_related_list?=
In-Reply-To: <076.425eb57365ab50184f38cc4f63b6a400@vtiger.fosslabs.com>
References: <076.425eb57365ab50184f38cc4f63b6a400@vtiger.fosslabs.com>
Message-ID: <085.b00b74a304fa0d050e6b097bf215f36c@vtiger.fosslabs.com>

#1230: need to have user related list
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  developer
      Type:  defect     |      Status:  closed   
  Priority:  major      |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.1    
Resolution:  fixed      |    Keywords:           
------------------------+---------------------------------------------------
Changes (by anonymous):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1230>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 07:01:36 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 14:01:36 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23486=3A_?=
 =?utf-8?q?table_indexing_is_not_proper_in_some_tables?=
In-Reply-To: <076.54bbc5aa9fb5a6e3cd2310cbda7781d8@vtiger.fosslabs.com>
References: <076.54bbc5aa9fb5a6e3cd2310cbda7781d8@vtiger.fosslabs.com>
Message-ID: <085.bc60409e4177d16605e9e89f92846fb6@vtiger.fosslabs.com>

#486: table indexing is not proper in some tables
------------------------+---------------------------------------------------
  Reporter:  don        |       Owner:  don  
      Type:  defect     |      Status:  new  
  Priority:  major      |   Milestone:  5.0.0
 Component:  vtigercrm  |     Version:  5.0.1
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by anonymous):

  * version:  5.0.0 => 5.0.1

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/486>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 07:02:25 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 14:02:25 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231116=3A?=
 =?utf-8?q?_FCKeditor=3A_document_version_used=2C_merge_new_versions_as_re?=
 =?utf-8?q?leased?=
In-Reply-To: <076.23b59aa20444402e3e3f439012465746@vtiger.fosslabs.com>
References: <076.23b59aa20444402e3e3f439012465746@vtiger.fosslabs.com>
Message-ID: <085.099dcf43fff40c9956d54950c6c4a57d@vtiger.fosslabs.com>

#1116: FCKeditor: document version used, merge new versions as released
------------------------+---------------------------------------------------
  Reporter:  jeffk      |       Owner:  gopal                    
      Type:  defect     |      Status:  assigned                 
  Priority:  major      |   Milestone:  5.0.0                    
 Component:  vtigercrm  |     Version:  5.0.1                    
Resolution:             |    Keywords:  editor packaging snapshot
------------------------+---------------------------------------------------
Changes (by gopal):

  * version:  5.0.0 => 5.0.1
  * status:  new => assigned
  * owner:  jeffk => gopal

Comment:

 Dear Jeff,

 I have tested the FCKEditor 2.3. I didn't noticied any significant
 difference. Hence we can wait for some more time upgrading to the latest
 version. BTW, our usage of editor is very limited.

 Thanks,
 Gopal

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1116>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 07:02:36 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 14:02:36 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23355=3A_?=
 =?utf-8?q?Option_can_be_provided_to_convert_a_lead_from_leads_list_view_i?=
 =?utf-8?q?tself?=
In-Reply-To: <076.723759bda055b76b6a827d918860919f@vtiger.fosslabs.com>
References: <076.723759bda055b76b6a827d918860919f@vtiger.fosslabs.com>
Message-ID: <085.cad5c979fddaafce5acac9f40558c620@vtiger.fosslabs.com>

#355: Option can be provided to convert a lead from leads list view itself
--------------------------+-------------------------------------------------
  Reporter:  don          |       Owner:  saint
      Type:  enhancement  |      Status:  new  
  Priority:  major        |   Milestone:       
 Component:  vtigercrm    |     Version:  5.0.1
Resolution:               |    Keywords:       
--------------------------+-------------------------------------------------
Changes (by anonymous):

  * version:  5.0.0 => 5.0.1

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/355>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 07:03:14 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 14:03:14 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231116=3A?=
 =?utf-8?q?_FCKeditor=3A_document_version_used=2C_merge_new_versions_as_re?=
 =?utf-8?q?leased?=
In-Reply-To: <076.23b59aa20444402e3e3f439012465746@vtiger.fosslabs.com>
References: <076.23b59aa20444402e3e3f439012465746@vtiger.fosslabs.com>
Message-ID: <085.797a6d72295c9b2973fbdfd509b8faa3@vtiger.fosslabs.com>

#1116: FCKeditor: document version used, merge new versions as released
------------------------+---------------------------------------------------
  Reporter:  jeffk      |       Owner:  jeffk                    
      Type:  defect     |      Status:  new                      
  Priority:  major      |   Milestone:  5.0.0                    
 Component:  vtigercrm  |     Version:  5.0.1                    
Resolution:             |    Keywords:  editor packaging snapshot
------------------------+---------------------------------------------------
Changes (by gopal):

  * status:  assigned => new
  * owner:  gopal => jeffk

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1116>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 07:06:52 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 14:06:52 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231319=3A?=
 =?utf-8?q?_Thunderbird_Connector_Bugs?=
In-Reply-To: <076.6c811b9cd61da3ae39b454241d719204@vtiger.fosslabs.com>
References: <076.6c811b9cd61da3ae39b454241d719204@vtiger.fosslabs.com>
Message-ID: <085.2fa59af313f83f935a5fb6e3398aef2b@vtiger.fosslabs.com>

#1319: Thunderbird Connector Bugs
------------------------------+---------------------------------------------
  Reporter:  anonymous        |       Owner:  mangai
      Type:  defect           |      Status:  new   
  Priority:  major            |   Milestone:        
 Component:  thunderbirdextn  |     Version:  5.0.1 
Resolution:                   |    Keywords:        
------------------------------+---------------------------------------------
Changes (by richie):

  * version:  5.0.0 => 5.0.1

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1319>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 07:10:12 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 14:10:12 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=23260=3A_?=
	=?utf-8?q?Issue_in_Change_Owner?=
In-Reply-To: <076.a1fa6304362146237625bdb76ef761ce@vtiger.fosslabs.com>
References: <076.a1fa6304362146237625bdb76ef761ce@vtiger.fosslabs.com>
Message-ID: <085.3c877bda3f80e8a84fa8c656da452f49@vtiger.fosslabs.com>

#260: Issue in Change Owner
------------------------+---------------------------------------------------
  Reporter:  don        |       Owner:  Richie
      Type:  defect     |      Status:  new   
  Priority:  critical   |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.1 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * version:  5.0.0 => 5.0.1

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/260>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 07:26:41 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 14:26:41 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23729=3A_?=
 =?utf-8?q?Need_appropriate_dashboard_for_sales_or_customer_service?=
In-Reply-To: <076.9c59a58160b093b88ed4ee9faba261b3@vtiger.fosslabs.com>
References: <076.9c59a58160b093b88ed4ee9faba261b3@vtiger.fosslabs.com>
Message-ID: <085.915216a1b0bd9e345e10984ce0ef8c77@vtiger.fosslabs.com>

#729: Need appropriate dashboard for sales or customer service
--------------------------+-------------------------------------------------
  Reporter:  OnwealdTim   |       Owner:  richie
      Type:  enhancement  |      Status:  new   
  Priority:  major        |   Milestone:        
 Component:  vtigercrm    |     Version:  5.0.0 
Resolution:               |    Keywords:        
--------------------------+-------------------------------------------------
Changes (by mangai):

  * owner:  mangai => richie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/729>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 07:31:09 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 14:31:09 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231356=3A?=
	=?utf-8?q?_Ajax_edit_issue?=
In-Reply-To: <076.f02a9fbd23d12bad75eedc90afaf903d@vtiger.fosslabs.com>
References: <076.f02a9fbd23d12bad75eedc90afaf903d@vtiger.fosslabs.com>
Message-ID: <085.e1ea8cd2d7f7669563d4cd6a45436f46@vtiger.fosslabs.com>

#1356: Ajax edit issue
---------------------------+------------------------------------------------
  Reporter:  jerrydgeorge  |       Owner:  jerrydgeorge
      Type:  defect        |      Status:  new         
  Priority:  critical      |   Milestone:              
 Component:  vtigercrm     |     Version:  5.0.1       
Resolution:                |    Keywords:              
---------------------------+------------------------------------------------
Changes (by richie):

  * version:  5.0.0 => 5.0.1

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1356>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 07:38:39 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 14:38:39 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23623=3A_?=
 =?utf-8?q?Issue_in_Activity_Quick_Edit?=
In-Reply-To: <076.0386d0bd11848a433f30ada206c92aa2@vtiger.fosslabs.com>
References: <076.0386d0bd11848a433f30ada206c92aa2@vtiger.fosslabs.com>
Message-ID: <085.fe04e5ef781b8b77c4d3dcb526b31b60@vtiger.fosslabs.com>

#623: Issue in Activity Quick Edit
------------------------+---------------------------------------------------
  Reporter:  don        |       Owner:  Richie
      Type:  defect     |      Status:  new   
  Priority:  critical   |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.1 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * version:  5.0.0 => 5.0.1

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/623>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 23 07:52:50 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 14:52:50 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7478 -
	/vtigercrm/trunk/Smarty/templates/ListView.tpl
Message-ID: <20060623145250.DB5B883F81E@vtiger.fosslabs.com>

Author: richie
Date: Fri Jun 23 08:52:45 2006
New Revision: 7478

Log:
Close button added for Search

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 Fri Jun 23 08:52:45 2006
@@ -127,7 +127,6 @@
         </td>
 </tr>
 </table>
-</div>
 
 {*<!-- Contents -->*}
 <form name="basicSearch" action="index.php">
@@ -156,10 +155,11 @@
 		<td width="35%" class="dvtCellLabel">
 			  <input name="submit" type="button" class="classBtn" onClick="callSearch('Basic');" value=" {$APP.LBL_SEARCH_NOW_BUTTON} ">&nbsp;
 			   <span class="hiliteBtn4Search"><a href="#" onClick="fnhide('searchAcc');show('advSearch');document.basicSearch.searchtype.value='advance';">{$APP.LBL_GO_TO} {$APP.LNK_ADVANCED_SEARCH}</a></span>	
-							</td>
+		</td>
+		<td valign="top" onMouseOver="this.style.cursor='pointer';" onclick="moveMe('searchAcc');searchshowhide('searchAcc','advSearch')">[x]</td>
 	</tr>
 	<tr>
-		<td colspan="4" align="center" class="dvtCellLabel">
+		<td colspan="5" align="center" class="dvtCellLabel">
 			<table border=0 cellspacing=0 cellpadding=0 width=100%>
 				<tr>
                                                 {$ALPHABETICAL}
@@ -177,6 +177,7 @@
 					<td nowrap width="30%" class="dvtCellLabel"><b><input name="matchtype" type="radio" value="all">&nbsp;{$APP.LBL_ADV_SEARCH_MSG_ALL}</b></td>
 					<td nowrap class="dvtCellLabel" width="30%"><b><input name="matchtype" type="radio" value="any" checked>&nbsp;{$APP.LBL_ADV_SEARCH_MSG_ANY}</b></td>
 					<td width="35%" class="dvtCellLabel"><span class="hiliteBtn4Search"><a href="#" onClick="show('searchAcc');fnhide('advSearch')">{$APP.LBL_GO_TO} {$APP.LNK_BASIC_SEARCH}</a></span></td>
+					<td valign="top" onMouseOver="this.style.cursor='pointer';" onclick="moveMe('searchAcc');searchshowhide('searchAcc','advSearch')">[x]</td>
 			</tr>
 		</table>
 		<table style="border-left:1px dashed #CCCCCC;border-right:1px dashed #CCCCCC;" cellpadding="2" cellspacing="0" width="80%" align="center" class="small">



From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 07:53:09 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 14:53:09 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=23877=3A_?=
	=?utf-8?q?Issue_in_Search_Window?=
In-Reply-To: <076.c156793a1b1426be51ed9260e43ba7b7@vtiger.fosslabs.com>
References: <076.c156793a1b1426be51ed9260e43ba7b7@vtiger.fosslabs.com>
Message-ID: <085.2bfd3c7fdf65c6dd5ca5594f4cd1ac7f@vtiger.fosslabs.com>

#877: Issue in Search Window
------------------------+---------------------------------------------------
  Reporter:  don        |       Owner:  ela   
      Type:  defect     |      Status:  closed
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by anonymous):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/877>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 07:53:54 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 14:53:54 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231008=3A?=
 =?utf-8?q?_assigned_to_group_is_not_coming_properly_in_ajax_edit?=
In-Reply-To: <076.6de5891dfeb7d1d2214d1225f8d87438@vtiger.fosslabs.com>
References: <076.6de5891dfeb7d1d2214d1225f8d87438@vtiger.fosslabs.com>
Message-ID: <085.bc29c6a64d4c71653411e29aa789bfd5@vtiger.fosslabs.com>

#1008: assigned to group is not coming properly in ajax edit
------------------------+---------------------------------------------------
  Reporter:  mangai     |       Owner:  jeri 
      Type:  defect     |      Status:  new  
  Priority:  major      |   Milestone:  5.0.0
 Component:  vtigercrm  |     Version:  5.0.1
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by anonymous):

  * version:  5.0.0 => 5.0.1

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1008>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 07:59:22 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 14:59:22 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=23923=3A_?=
	=?utf-8?q?Studio_=3E_Picklist?=
In-Reply-To: <076.b4e0e1396a2feb913df180b7b4a56c2c@vtiger.fosslabs.com>
References: <076.b4e0e1396a2feb913df180b7b4a56c2c@vtiger.fosslabs.com>
Message-ID: <085.418f9da5aced9e69f64820f04d8fef95@vtiger.fosslabs.com>

#923: Studio > Picklist
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  ela   
      Type:  defect     |      Status:  closed
  Priority:  trivial    |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by ela):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/923>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 08:01:20 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 15:01:20 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23839=3A_?=
 =?utf-8?q?Settings_=3E_CommunicationsTemplates_=3E_Mail_Merge_Template=2C?=
 =?utf-8?q?_Edit?=
In-Reply-To: <076.0201dd774bc7d66d5dc9d197e1979c28@vtiger.fosslabs.com>
References: <076.0201dd774bc7d66d5dc9d197e1979c28@vtiger.fosslabs.com>
Message-ID: <085.1d26d244127d63912e1ec129acf2d615@vtiger.fosslabs.com>

#839: Settings > CommunicationsTemplates > Mail Merge Template, Edit
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  ela   
      Type:  defect     |      Status:  closed
  Priority:  trivial    |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by ahmed):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/839>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 08:07:47 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 15:07:47 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23968=3A_?=
 =?utf-8?q?Quick_Edit_of_Assigned_Group_not_functional?=
In-Reply-To: <076.66451d79109fe79c040c7aba7d66b2ee@vtiger.fosslabs.com>
References: <076.66451d79109fe79c040c7aba7d66b2ee@vtiger.fosslabs.com>
Message-ID: <085.04dd6e9b35c21f8b8fcc2c409a5ca88a@vtiger.fosslabs.com>

#968: Quick Edit of Assigned Group not functional
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  Richie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.1 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * version:  5.0.0 => 5.0.1

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/968>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 08:10:31 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 15:10:31 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=23599=3A_?=
	=?utf-8?q?Profile_Issue?=
In-Reply-To: <076.c417ec60abd87aee2cbcbf16610fb0d5@vtiger.fosslabs.com>
References: <076.c417ec60abd87aee2cbcbf16610fb0d5@vtiger.fosslabs.com>
Message-ID: <085.e493f1524db0f119831c09491011009d@vtiger.fosslabs.com>

#599: Profile Issue
---------------------------+------------------------------------------------
  Reporter:  jerrydgeorge  |       Owner:  Richie  
      Type:  defect        |      Status:  closed  
  Priority:  critical      |   Milestone:          
 Component:  vtigercrm     |     Version:  5.0.0   
Resolution:  fixed         |    Keywords:  Security
---------------------------+------------------------------------------------
Changes (by richie):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/599>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 08:11:19 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 15:11:19 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23424=3A_?=
 =?utf-8?q?even_without_tab_privileges_standard_privileges_can_be_given?=
In-Reply-To: <076.d6748e5d43374a30e7084a0e578e5c4a@vtiger.fosslabs.com>
References: <076.d6748e5d43374a30e7084a0e578e5c4a@vtiger.fosslabs.com>
Message-ID: <085.3b8a5361d0fc0fc6b465b263c29ce344@vtiger.fosslabs.com>

#424: even without tab privileges standard privileges can be given
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  Richie 
      Type:  defect     |      Status:  closed 
  Priority:  critical   |   Milestone:         
 Component:  vtigercrm  |     Version:  5.0.0  
Resolution:  fixed      |    Keywords:  profile
------------------------+---------------------------------------------------
Changes (by richie):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/424>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 23 08:26:30 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 15:26:30 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7479 -
	/vtigercrm/trunk/Smarty/templates/DisplayFields.tpl
Message-ID: <20060623152630.E9BE77FDA81@vtiger.fosslabs.com>

Author: richie
Date: Fri Jun 23 09:26:27 2006
New Revision: 7479

Log:
picklist values obtained from language files if exists

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

Modified: vtigercrm/trunk/Smarty/templates/DisplayFields.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DisplayFields.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DisplayFields.tpl Fri Jun 23 09:26:27 2006
@@ -84,7 +84,13 @@
 			   <select name="{$fldname}" tabindex="{$vt_tab}" >
 				{foreach item=arr from=$fldvalue}
 					{foreach key=sel_value item=value from=$arr}
-						<option value="{$sel_value}" {$value}>{$sel_value}</option>
+						<option value="{$sel_value}" {$value}>
+                                                {if $APP[$sel_value] neq ''}
+                                                        {$APP[$sel_value]}
+                                                {else}
+                                                        {$sel_value}
+                                                {/if}
+                                                </option>
 					{/foreach}
 				{/foreach}
 			   </select>



From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 23 08:30:45 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 15:30:45 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7480 -
	/vtigercrm/trunk/include/language/en_us.lang.php
Message-ID: <20060623153045.07CA87FDA81@vtiger.fosslabs.com>

Author: richie
Date: Fri Jun 23 09:30:42 2006
New Revision: 7480

Log:
language strings added for users PickList

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

Modified: vtigercrm/trunk/include/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/include/language/en_us.lang.php (original)
+++ vtigercrm/trunk/include/language/en_us.lang.php Fri Jun 23 09:30:42 2006
@@ -918,6 +918,15 @@
 'LBL_INVOICE_STATUS'=>'Invoice Status',
 'LBL_NOTE'=>'Note',
 'LBL_MODULE'=>'Module',
+'Active'=>'Active',
+'Inactive'=>'Inactive',
+'Today'=>'Today',
+'Last 2 Days'=>'Last 2 Days',
+'Last Week'=>'Last Week',
+'This Week'=>'This Week',
+'This Month'=>'This Month',
+'This Year'=>'This Year',
+
 );
 
 



From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 23 08:31:31 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 15:31:31 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7481 -
	/vtigercrm/trunk/modules/Migration/Migration.php
Message-ID: <20060623153131.91E2C7FDA81@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 23 09:31:27 2006
New Revision: 7481

Log:
* changed the vtiger_prefix

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

Modified: vtigercrm/trunk/modules/Migration/Migration.php
==============================================================================
--- vtigercrm/trunk/modules/Migration/Migration.php (original)
+++ vtigercrm/trunk/modules/Migration/Migration.php Fri Jun 23 09:31:27 2006
@@ -165,7 +165,7 @@
 	{
 		global $conn;
 
-		$sql = "select vtiger_tabid from vtiger_tab where name='".$module."'";
+		$sql = "select tabid from vtiger_tab where name='".$module."'";
 		$result = $conn->query($sql);
 		$tabid=  $conn->query_result($result,0,"tabid");
 
@@ -207,7 +207,7 @@
 		$failure_query_array = Array();
 
 		//To handle the file includes for each and every version
-		//Here we have to decide which vtiger_files should be included, where the vtiger_files will be added newly for every public release
+		//Here we have to decide which files should be included, where the files will be added newly for every public release
 		//Handle Here -- Mickie
 		include("modules/Migration/ModifyDatabase/MigrationInfo.php");
 
@@ -289,16 +289,16 @@
 			$this->conn->println("Going to apply the old database dump to the new database.");
 			$this->applyDumpData($new_host_name,$new_mysql_port,$new_mysql_username,$new_mysql_password,$new_dbname,$dump_file);
 
-			//get the number of vtiger_tables in new database 
+			//get the number of tables in new database 
 			$new_tables_count = $this->getTablesCountInNewDatabase();
 
-			//get the number of vtiger_tables in old database 
+			//get the number of tables in old database 
 			$old_tables_count = $this->getTablesCountInOldDatabase();
 
-			//if vtiger_tables are missing after apply the dump, then alert the user and quit
+			//if tables are missing after apply the dump, then alert the user and quit
 			if(($new_tables_count != $old_tables_count && $option == 'dbsource') || ($new_tables_count < 180 && $option == 'dumpsource'))
 			{
-				$this->conn->println("New Database vtiger_tables not equal to Old Database vtiger_tables count. Reload the current database again and quit.");
+				$this->conn->println("New Database tables not equal to Old Database tables count. Reload the current database again and quit.");
 				
 				$continue_process = 0;
 				$msg = "The dump may not be applied correctly. Tables exist in 4.2.3 database : $old_tables_count. Tables exist in current database after apply the dump : $new_tables_count";



From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 23 08:32:11 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 15:32:11 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7482 -
 /vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php
Message-ID: <20060623153211.07A177FDA81@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 23 09:32:07 2006
New Revision: 7482

Log:
* changed the vtiger_prefix and modified the queries which were failed

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 Jun 23 09:32:07 2006
@@ -16,19 +16,30 @@
 global $query_count, $success_query_count, $failure_query_count;
 global $success_query_array, $failure_query_array;
 
+//Added to put prefix vtiger_ in some of the columns in tables which are used for CV and Reports and field -- 23-06-06
+$conn->println("First we will rename the existing tables with prefix vtiger_");
+include("modules/Migration/ModifyDatabase/rename_tables.php");
+$conn->println("Renaming the existing tables with prefix vtiger_ has been finished");
+
+
+
+
+
+
 $conn->println("Database Modifications for 4.2 Patch2 ==> 5.0(Alpha) Dev 3 Starts here.");
 
 
 
 //These changes have been made in 4.2.3. The following queries have been included who has run the migration from 4.2 Patch2
-$wordtemplate_query1 = "alter table wordtemplates DROP PRIMARY KEY";
-Execute($wordtemplate_query1);
-
-$wordtemplate_query2 = "alter table wordtemplates DROP templateid";//this will fail if 4.2 Patch 2.
-$conn->query($wordtemplate_query2);
-
-$wordtemplate_query3 = "alter table wordtemplates add column templateid integer(19) unsigned auto_increment primary key FIRST";
-Execute($wordtemplate_query3);
+$wordtemp = $conn->getColumnNames("vtiger_wordtemplates");
+if(is_array($wordtemp) && !in_array("templateid",$wordtemp))
+{
+	$wordtemplate_query1 = "alter table vtiger_wordtemplates DROP PRIMARY KEY";
+	Execute($wordtemplate_query1);
+
+	$wordtemplate_query3 = "alter table vtiger_wordtemplates add column templateid integer(19) unsigned auto_increment primary key FIRST";
+	Execute($wordtemplate_query3);
+}
 //upto this added to modify the wordtemplates table which will be in the case of migrate from 4.2 Path2.
 
 
@@ -56,7 +67,7 @@
 		"alter table vtiger_cvstdfilter ADD PRIMARY KEY (cvid)",
 		"alter table vtiger_def_org_field ADD PRIMARY KEY (fieldid)",
 		"alter table vtiger_leadgrouprelation ADD PRIMARY KEY (leadid)",
-		"alter table vtiger_leadgrouprelation drop key vtiger_leadgrouprelation_IDX0",
+		"alter table vtiger_leadgrouprelation drop key leadgrouprelation_IDX0",
 		"alter table vtiger_organizationdetails ADD PRIMARY KEY (organizationame)",
 		"alter table vtiger_profile2field ADD PRIMARY KEY (profileid,fieldid)",
 		"alter table vtiger_profile2standardpermissions ADD PRIMARY KEY (profileid,tabid,Operation)",
@@ -65,7 +76,7 @@
 		"alter table vtiger_profile2utility drop index idx_prof2utility",
 		"alter table vtiger_relcriteria ADD PRIMARY KEY (queryid,columnindex)",
 		"alter table vtiger_reportdatefilter ADD PRIMARY KEY (datefilterid)",
-		"alter table vtiger_reportdatefilter DROP INDEX vtiger_reportdatefilter_IDX0",
+		"alter table vtiger_reportdatefilter DROP INDEX reportdatefilter_IDX0",
 		"alter table vtiger_reportsortcol ADD PRIMARY KEY (sortcolid,reportid)",
 		"alter table vtiger_reportsummary ADD PRIMARY KEY (reportsummaryid,summarytype,columnname)",
 		"drop table vtiger_role2action",
@@ -113,7 +124,7 @@
 
 
 //Removing entries for Dashboard and Home module from vtiger_profile2standardpermissions table
-$del_query1 = "delete from vtiger_profile2standardpermissions where vtiger_tabid in(1,3)";
+$del_query1 = "delete from vtiger_profile2standardpermissions where tabid in(1,3)";
 Execute($del_query1);
 
 //For all Profile do the following insert into vtiger_profile2utility table:
@@ -229,26 +240,29 @@
 }
 
 //Added for the "Color By User in Calendar " which has been contributed by Cesar
-$alter_query1 = "ALTER TABLE `users` ADD `cal_color` VARCHAR(25) DEFAULT '#E6FAD8' AFTER `user_hash`";
+$alter_query1 = "ALTER TABLE vtiger_users ADD cal_color VARCHAR(25) DEFAULT '#E6FAD8' AFTER user_hash";
 Execute($alter_query1);
 
 //code contributed by Fredy for color vtiger_priority
-$newfieldid = $conn->getUniqueID("field");
+$newfieldid = $conn->getUniqueID("vtiger_field");
 $insert_query1 = "insert into vtiger_field values (16,".$newfieldid.",'priority','activity',1,15,'taskpriority','Priority',1,0,0,100,17,1,1,'V~O',1,'')";
 Execute($insert_query1);
 
 //Added on 23-12-2005 which is missed from Fredy's contribution for Color vtiger_priority
 populateFieldForSecurity('16',$newfieldid);
-$activity_alter_query = "alter table vtiger_activity add column priority varchar(150) default NULL";
-Execute($activity_alter_query);
-
+$activity_cols = $conn->getColumnNames("vtiger_activity");
+if(is_array($activity_cols) && !in_array("priority",$activity_cols))
+{
+	$activity_alter_query = "alter table vtiger_activity add column priority varchar(150) default NULL";
+	Execute($activity_alter_query);
+}
 //Code contributed by Raju for better emailing 
 /*
 $insert_array1 = Array(
-		"insert into vtiger_field values (10,".$conn->getUniqueID("field").",'crmid','seactivityrel',1,'357','parent_id','Related To',1,0,0,100,1,2,1,'I~O',1,'')",
-		"insert into vtiger_field values (10,".$conn->getUniqueID("field").",'subject','activity',1,'2','subject','Subject',1,0,0,100,1,3,1,'V~M',0,1)",
-		"insert into vtiger_field values (10,".$conn->getUniqueID("field").",'filename','emails',1,'61','filename','Attachment',1,0,0,100,1,4,1,'V~O',1,'')",
-		"insert into vtiger_field values (10,".$conn->getUniqueID("field").",'description','emails',1,'19','description','Description',1,0,0,100,1,5,1,'V~O',1,'')",
+		"insert into vtiger_field values (10,".$conn->getUniqueID("vtiger_field").",'crmid','seactivityrel',1,'357','parent_id','Related To',1,0,0,100,1,2,1,'I~O',1,'')",
+		"insert into vtiger_field values (10,".$conn->getUniqueID("vtiger_field").",'subject','activity',1,'2','subject','Subject',1,0,0,100,1,3,1,'V~M',0,1)",
+		"insert into vtiger_field values (10,".$conn->getUniqueID("vtiger_field").",'filename','emails',1,'61','filename','Attachment',1,0,0,100,1,4,1,'V~O',1,'')",
+		"insert into vtiger_field values (10,".$conn->getUniqueID("vtiger_field").",'description','emails',1,'19','description','Description',1,0,0,100,1,5,1,'V~O',1,'')",
 		);
 */
 //commented the above array as that queries are wrong queries -- changed on 23-12-2005
@@ -273,7 +287,7 @@
 $alter_query3 = "ALTER TABLE vtiger_invoice ADD column contactid int(19) after customerno";
 Execute($alter_query3);
 
-$newfieldid = $conn->getUniqueID("field");
+$newfieldid = $conn->getUniqueID("vtiger_field");
 $insert_query2 = "insert into vtiger_field values (23,".$newfieldid.",'contactid','invoice',1,'57','contact_id','Contact Name',1,0,0,100,4,1,1,'I~O',1,'')";
 Execute($insert_query2);
 //Added on 23-12-2005 because we must populate vtiger_field entries in vtiger_profile2field and vtiger_def_org_field if we add a vtiger_field in vtiger_field table
@@ -308,7 +322,7 @@
 
 
 //Added vtiger_field emailoptout in vtiger_account table
-$newfieldid = $conn->getUniqueID("field");
+$newfieldid = $conn->getUniqueID("vtiger_field");
 $insert_query3 = "insert into vtiger_field values (6,".$newfieldid.",'emailoptout','account',1,'56','emailoptout','Email Opt Out',1,0,0,100,17,1,1,'C~O',1,'')";
 Execute($insert_query3);
 
@@ -395,7 +409,7 @@
 $create_query1 = "CREATE TABLE  vtiger_inventory_tandc(id INT(19),type VARCHAR(30) NOT NULL,tandc LONGTEXT default NULL,PRIMARY KEY(id))";
 Execute($create_query1);
 
-$insert_query4 = "insert into vtiger_inventory_tandc values('".$conn->getUniqueID('inventory_tandc')."','Inventory','  ')";
+$insert_query4 = "insert into vtiger_inventory_tandc values('".$conn->getUniqueID('vtiger_inventory_tandc')."','Inventory','  ')";
 Execute($insert_query4);
 
 /****************** 5.0(Alpha) dev version 1 Database changes -- Ends*********************/
@@ -837,8 +851,8 @@
 }
 
 $insert_field_array1 = Array(
-				"Insert into vtiger_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 vtiger_field values (16,".$conn->getUniqueID("field").",'notime','activity',1,56,'notime','No Time',1,0,0,100,18,1,1,'C~O',1,'')"
+				"Insert into vtiger_field values (9,".$conn->getUniqueID("vtiger_field").",'notime','activity',1,56,'notime','No Time',1,0,0,100,20,1,3,'C~O',1,'')",
+				"Insert into vtiger_field values (16,".$conn->getUniqueID("vtiger_field").",'notime','activity',1,56,'notime','No Time',1,0,0,100,18,1,1,'C~O',1,'')"
 			    );
 foreach($insert_field_array1 as $query)
 {
@@ -867,27 +881,27 @@
 }
 
 $insert_field_array2 = Array(
-				"insert into vtiger_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 vtiger_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 vtiger_field values (23,".$conn->getUniqueID("vtiger_field").",'bill_pobox','invoicebillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,2,1,'V~O',1,'')",
+				"insert into vtiger_field values (23,".$conn->getUniqueID("vtiger_field").",'ship_pobox','invoiceshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,2,1,'V~O',1,'')",
 				
-				"insert into vtiger_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 vtiger_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 vtiger_field values (6,".$conn->getUniqueID("vtiger_field").",'pobox','accountbillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,2,1,'V~O',1,'')",
+				"insert into vtiger_field values (6,".$conn->getUniqueID("vtiger_field").",'pobox','accountshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,2,1,'V~O',1,'')",
 				
-				"insert into vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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,'')"
+				"insert into vtiger_field values (7,".$conn->getUniqueID("vtiger_field").",'pobox','leadaddress',1,'1','pobox','Po Box',1,0,0,100,2,2,1,'V~O',1,'')",
+
+				"insert into vtiger_field values (4,".$conn->getUniqueID("vtiger_field").",'mailingpobox','contactaddress',1,'1','mailingpobox','Mailing Po Box',1,0,0,100,3,2,1,'V~O',1,'')",
+				"insert into vtiger_field values (4,".$conn->getUniqueID("vtiger_field").",'otherpobox','contactaddress',1,'1','otherpobox','Other Po Box',1,0,0,100,4,2,1,'V~O',1,'')",
+
+				"insert into vtiger_field values (18,".$conn->getUniqueID("vtiger_field").",'pobox','vendor',1,'1','pobox','Po Box',1,0,0,100,2,2,1,'V~O',1,'')",
+
+				"insert into vtiger_field values (20,".$conn->getUniqueID("vtiger_field").",'bill_pobox','quotesbillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,2,1,'V~O',1,'')",
+				"insert into vtiger_field values (20,".$conn->getUniqueID("vtiger_field").",'ship_pobox','quotesshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,2,1,'V~O',1,'')",
+
+				"insert into vtiger_field values (21,".$conn->getUniqueID("vtiger_field").",'bill_pobox','pobillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,2,1,'V~O',1,'')",
+				"insert into vtiger_field values (21,".$conn->getUniqueID("vtiger_field").",'ship_pobox','poshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,2,1,'V~O',1,'')",
+
+				"insert into vtiger_field values (22,".$conn->getUniqueID("vtiger_field").",'bill_pobox','sobillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,2,1,'V~O',1,'')",
+				"insert into vtiger_field values (22,".$conn->getUniqueID("vtiger_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)
 {
@@ -941,12 +955,12 @@
 }
 
 $query_array1 = Array(
-			"update vtiger_field set tablename='crmentity' where tabid=10 and fieldname='description'",
-			"update vtiger_field set tablename='attachments' where tabid=10 and fieldname='filename'",
-			"drop table emails",
+			"update vtiger_field set tablename='vtiger_crmentity' where tabid=10 and fieldname='description'",
+			"update vtiger_field set tablename='vtiger_attachments' where tabid=10 and fieldname='filename'",
+			"drop table vtiger_emails",
 
 			"alter table vtiger_activity drop column description",
-			"update vtiger_field set tablename='crmentity' where tabid in (9,16) and fieldname='description'",
+			"update vtiger_field set tablename='vtiger_crmentity' where tabid in (9,16) and fieldname='description'",
 
 			"update vtiger_tab set name='PurchaseOrder',tablabel='PurchaseOrder' where tabid=21",
 			"update vtiger_tab set presence=0 where tabid=22 and name='SalesOrder'",
@@ -956,7 +970,7 @@
 			"delete from vtiger_actionmapping where actionname='SaveSalesOrder'",
 			"delete from vtiger_actionmapping where actionname='DeleteSalesOrder'",
 
-			"insert into vtiger_field values (13,".$conn->getUniqueID("field").",'filename','attachments',1,'61','filename','Attachment',1,0,0,100,12,2,1,'V~O',0,1)",
+			"insert into vtiger_field values (13,".$conn->getUniqueID("vtiger_field").",'filename','vtiger_attachments',1,'61','filename','Attachment',1,0,0,100,12,2,1,'V~O',0,1)",
 
 			"alter table vtiger_troubletickets add column filename varchar(50) default NULL after title"
 		     );
@@ -1176,23 +1190,23 @@
 Execute($query);
 
 $insert_query_array6 = Array(
-			"insert into vtiger_customview values(".$conn->getUniqueID('customview').",'All',1,0,'Leads')",
-			"insert into vtiger_customview values(".$conn->getUniqueID('customview').",'All',1,0,'Accounts')",
-			"insert into vtiger_customview values(".$conn->getUniqueID('customview').",'All',1,0,'Contacts')",
-			"insert into vtiger_customview values(".$conn->getUniqueID('customview').",'All',1,0,'Potentials')",
-			"insert into vtiger_customview values(".$conn->getUniqueID('customview').",'All',1,0,'HelpDesk')",
-			"insert into vtiger_customview values(".$conn->getUniqueID('customview').",'All',1,0,'Quotes')",
-			"insert into vtiger_customview values(".$conn->getUniqueID('customview').",'All',1,0,'Activities')",
-			"insert into vtiger_customview values(".$conn->getUniqueID('customview').",'All',1,0,'Emails')",
-			"insert into vtiger_customview values(".$conn->getUniqueID('customview').",'All',1,0,'Invoice')",
-			"insert into vtiger_customview values(".$conn->getUniqueID('customview').",'All',1,0,'Notes')",
-			"insert into vtiger_customview values(".$conn->getUniqueID('customview').",'All',1,0,'PriceBooks')",
-			"insert into vtiger_customview values(".$conn->getUniqueID('customview').",'All',1,0,'Products')",
-			"insert into vtiger_customview values(".$conn->getUniqueID('customview').",'All',1,0,'PurchaseOrder')",
+			"insert into vtiger_customview values(".$conn->getUniqueID('vtiger_customview').",'All',1,0,'Leads')",
+			"insert into vtiger_customview values(".$conn->getUniqueID('vtiger_customview').",'All',1,0,'Accounts')",
+			"insert into vtiger_customview values(".$conn->getUniqueID('vtiger_customview').",'All',1,0,'Contacts')",
+			"insert into vtiger_customview values(".$conn->getUniqueID('vtiger_customview').",'All',1,0,'Potentials')",
+			"insert into vtiger_customview values(".$conn->getUniqueID('vtiger_customview').",'All',1,0,'HelpDesk')",
+			"insert into vtiger_customview values(".$conn->getUniqueID('vtiger_customview').",'All',1,0,'Quotes')",
+			"insert into vtiger_customview values(".$conn->getUniqueID('vtiger_customview').",'All',1,0,'Activities')",
+			"insert into vtiger_customview values(".$conn->getUniqueID('vtiger_customview').",'All',1,0,'Emails')",
+			"insert into vtiger_customview values(".$conn->getUniqueID('vtiger_customview').",'All',1,0,'Invoice')",
+			"insert into vtiger_customview values(".$conn->getUniqueID('vtiger_customview').",'All',1,0,'Notes')",
+			"insert into vtiger_customview values(".$conn->getUniqueID('vtiger_customview').",'All',1,0,'PriceBooks')",
+			"insert into vtiger_customview values(".$conn->getUniqueID('vtiger_customview').",'All',1,0,'Products')",
+			"insert into vtiger_customview values(".$conn->getUniqueID('vtiger_customview').",'All',1,0,'PurchaseOrder')",
 				
-			"insert into vtiger_customview values(".$conn->getUniqueID('customview').",'All',1,0,'SalesOrder')",
-			"insert into vtiger_customview values(".$conn->getUniqueID('customview').",'All',1,0,'Vendors')",
-			"insert into vtiger_customview values(".$conn->getUniqueID('customview').",'All',1,0,'Faq')"
+			"insert into vtiger_customview values(".$conn->getUniqueID('vtiger_customview').",'All',1,0,'SalesOrder')",
+			"insert into vtiger_customview values(".$conn->getUniqueID('vtiger_customview').",'All',1,0,'Vendors')",
+			"insert into vtiger_customview values(".$conn->getUniqueID('vtiger_customview').",'All',1,0,'Faq')"
 			    );
 foreach($insert_query_array6 as $query)
 {
@@ -1588,7 +1602,7 @@
 
 //$update_query2 = "UPDATE vtiger_field SET fieldlabel = 'Reference' WHERE tabid = 4 and tablename = 'contactdetails' and fieldname='reference'";
 //changed in 24-04-06 because the reference has not been entered into the vtiger_field table. 
-$update_query2 = "insert into vtiger_field values (4,".$conn->getUniqueID("field").",'reference','contactdetails',1,'56','reference','Reference',1,0,0,10,23,4,1,'C~O',1,null,'ADV')";
+$update_query2 = "insert into vtiger_field values (4,".$conn->getUniqueID("vtiger_field").",'reference','contactdetails',1,'56','reference','Reference',1,0,0,10,23,4,1,'C~O',1,null,'ADV')";
 Execute($update_query2);
 
 $update_query_array4 = Array(
@@ -1655,11 +1669,11 @@
 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"
+				"ALTER TABLE `vtiger_chat_msg`  ADD CONSTRAINT `chat_msg_ibfk_1` FOREIGN KEY (`chat_from`) REFERENCES `chat_users` (`id`) ON DELETE CASCADE",
+
+				"ALTER TABLE `vtiger_chat_pchat`  ADD CONSTRAINT `chat_pchat_ibfk_1` FOREIGN KEY (`msg`) REFERENCES `chat_msg` (`id`) ON DELETE CASCADE",
+
+				"ALTER TABLE `vtiger_chat_pvchat`  ADD CONSTRAINT `chat_pvchat_ibfk_1` FOREIGN KEY (`msg`) REFERENCES `chat_msg` (`id`) ON DELETE CASCADE"
 			    );
 foreach($alter_query_array17 as $query)
 {
@@ -1684,10 +1698,10 @@
 
 $insert_query_array23 = Array(
 				"insert into vtiger_blocks values(75,4,'LBL_IMAGE_INFORMATION',5,0,0,0,0,0)",
-				"insert into vtiger_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 vtiger_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 vtiger_field values(16,".$conn->getUniqueID("field").",'visibility','activity',1,15,'visibility','Visibility',1,0,0,100,19,41,1,'V~O',1,null,'BAS')"
+				"insert into vtiger_field values(4,".$conn->getUniqueID("vtiger_field").",'imagename','contactdetails',1,'69','imagename','Contact Image',1,0,0,100,1,75,1,'V~O',1,null,'ADV')",
+
+				"Insert into vtiger_field values(9,".$conn->getUniqueID("vtiger_field").",'visibility','activity',1,15,'visibility','Visibility',1,0,0,100,17,19,3,'V~O',1,null,'BAS')",
+				"Insert into vtiger_field values(16,".$conn->getUniqueID("vtiger_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)
 {
@@ -1717,29 +1731,29 @@
 Execute($insert_query9);
 
 $insert_query_array24 = Array(
-	"insert into vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_field values (26,".$conn->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,78,1,'V~O',1,null,'BAS')"
+	"insert into vtiger_field values (26,".$conn->getUniqueID("vtiger_field").",'campaignname','campaign',1,'2','campaignname','Campaign Name',1,0,0,100,1,76,1,'V~M',0,1,'BAS')",
+	"insert into vtiger_field values (26,".$conn->getUniqueID("vtiger_field").",'campaigntype','campaign',1,15,'campaigntype','Campaign Type',1,0,0,100,2,76,1,'V~O',0,5,'BAS')",
+	"insert into vtiger_field values (26,".$conn->getUniqueID("vtiger_field").",'product_id','campaign',1,59,'product_id','Product',1,0,0,100,3,76,1,'I~O',0,5,'BAS')",
+	"insert into vtiger_field values (26,".$conn->getUniqueID("vtiger_field").",'campaignstatus','campaign',1,15,'campaignstatus','Campaign Status',1,0,0,100,4,76,1,'V~O',0,5,'BAS')",
+	"insert into vtiger_field values (26,".$conn->getUniqueID("vtiger_field").",'closingdate','campaign',1,'23','closingdate','Expected Close Date',1,0,0,100,5,76,1,'D~M',0,3,'BAS')",
+	"insert into vtiger_field values (26,".$conn->getUniqueID("vtiger_field").",'expectedrevenue','campaign',1,'1','expectedrevenue','Expected Revenue',1,0,0,100,6,76,1,'I~O',1,null,'BAS')",
+	"insert into vtiger_field values (26,".$conn->getUniqueID("vtiger_field").",'budgetcost','campaign',1,'1','budgetcost','Budget Cost',1,0,0,100,7,76,1,'I~O',1,null,'BAS')",
+	"insert into vtiger_field values (26,".$conn->getUniqueID("vtiger_field").",'actualcost','campaign',1,'1','actualcost','Actual Cost',1,0,0,100,8,76,1,'I~O',1,null,'BAS')",
+	"insert into vtiger_field values (26,".$conn->getUniqueID("vtiger_field").",'expectedresponse','campaign',1,'15','expectedresponse','Expected Response',1,0,0,100,9,76,1,'V~O',0,4,'BAS')",
+	"insert into vtiger_field values (26,".$conn->getUniqueID("vtiger_field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,10,76,1,'V~M',1,null,'BAS')",
+	"insert into vtiger_field values (26,".$conn->getUniqueID("vtiger_field").",'numsent','campaign',1,'9','numsent','Num Sent',1,0,0,100,11,76,1,'N~O',1,null,'BAS')",
+	"insert into vtiger_field values (26,".$conn->getUniqueID("vtiger_field").",'sponsor','campaign',1,'1','sponsor','Sponsor',1,0,0,100,12,76,1,'V~O',1,null,'BAS')",
+	"insert into vtiger_field values (26,".$conn->getUniqueID("vtiger_field").",'targetaudience','campaign',1,'1','targetaudience','Target Audience',1,0,0,100,13,76,1,'V~O',1,null,'BAS')",
+	"insert into vtiger_field values (26,".$conn->getUniqueID("vtiger_field").",'targetsize','campaign',1,'1','targetsize','TargetSize',1,0,0,100,14,76,1,'N~O',1,null,'BAS')",
+	"insert into vtiger_field values (26,".$conn->getUniqueID("vtiger_field").",'expectedresponsecount','campaign',1,'1','expectedresponsecount','Expected Response Count',1,0,0,100,17,76,1,'N~O',1,null,'BAS')",
+	"insert into vtiger_field values (26,".$conn->getUniqueID("vtiger_field").",'expectedsalescount','campaign',1,'1','expectedsalescount','Expected Sales Count',1,0,0,100,15,76,1,'N~O',1,null,'BAS')",
+	"insert into vtiger_field values (26,".$conn->getUniqueID("vtiger_field").",'expectedroi','campaign',1,'1','expectedroi','Expected ROI',1,0,0,100,19,76,1,'N~O',1,null,'BAS')",
+	"insert into vtiger_field values (26,".$conn->getUniqueID("vtiger_field").",'actualresponsecount','campaign',1,'1','actualresponsecount','Actual Response Count',1,0,0,100,18,76,1,'N~O',1,null,'BAS')",
+	"insert into vtiger_field values (26,".$conn->getUniqueID("vtiger_field").",'actualsalescount','campaign',1,'1','actualsalescount','Actual Sales Count',1,0,0,100,16,76,1,'N~O',1,null,'BAS')",
+	"insert into vtiger_field values (26,".$conn->getUniqueID("vtiger_field").",'actualroi','campaign',1,'1','actualroi','Actual ROI',1,0,0,100,20,76,1,'N~O',1,null,'BAS')",
+	"insert into vtiger_field values (26,".$conn->getUniqueID("vtiger_field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,15,76,2,'T~O',1,null,'BAS')",
+	"insert into vtiger_field values (26,".$conn->getUniqueID("vtiger_field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,16,76,2,'T~O',1,null,'BAS')",
+	"insert into vtiger_field values (26,".$conn->getUniqueID("vtiger_field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,78,1,'V~O',1,null,'BAS')"
 			     );
 foreach($insert_query_array24 as $query)
 {
@@ -1747,8 +1761,8 @@
 }
 
 $insert_query_array25 = Array(
-	"insert into vtiger_relatedlists values (".$conn->getUniqueID('relatedlists').",".getTabid("Campaigns").",".getTabid("Contacts").",'get_contacts',1,'Contacts',0)",
-	"insert into vtiger_relatedlists values (".$conn->getUniqueID('relatedlists').",".getTabid("Campaigns").",".getTabid("Leads").",'get_leads',2,'Leads',0)"
+	"insert into vtiger_relatedlists values (".$conn->getUniqueID('vtiger_relatedlists').",".getTabid("Campaigns").",".getTabid("Contacts").",'get_contacts',1,'Contacts',0)",
+	"insert into vtiger_relatedlists values (".$conn->getUniqueID('vtiger_relatedlists').",".getTabid("Campaigns").",".getTabid("Leads").",'get_leads',2,'Leads',0)"
 			     );
 foreach($insert_query_array25 as $query)
 {
@@ -1757,8 +1771,8 @@
 
 
 $insert_query_array26 = Array(
-	"insert into vtiger_field values (7,".$conn->getUniqueID("field").",'campaignid','leaddetails',1,'51','campaignid','Campaign Name',1,0,0,100,6,13,3,'I~O',1,null,'BAS')",
-	"insert into vtiger_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')"
+	"insert into vtiger_field values (7,".$conn->getUniqueID("vtiger_field").",'campaignid','leaddetails',1,'51','campaignid','Campaign Name',1,0,0,100,6,13,3,'I~O',1,null,'BAS')",
+	"insert into vtiger_field values (4,".$conn->getUniqueID("vtiger_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)
 {
@@ -1881,113 +1895,110 @@
 
 $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",
+//"ALTER TABLE `vtiger_accountgrouprelation` DROP INDEX `fk_accountgrouprelation2`",
+//"ALTER TABLE `vtiger_activity` DROP INDEX `status`",
+"ALTER TABLE `vtiger_carrier` DROP INDEX `carrier_UK0`",
+"ALTER TABLE `vtiger_chat_msg` DROP INDEX `chat_to`",
+"ALTER TABLE `vtiger_chat_msg` DROP INDEX `chat_from`",
+"ALTER TABLE `vtiger_chat_msg` DROP INDEX `born`",
+"ALTER TABLE `vtiger_chat_pchat` DROP INDEX `msg`",
+"ALTER TABLE `vtiger_chat_pvchat` DROP INDEX `msg`",
+"ALTER TABLE `vtiger_chat_users` DROP INDEX `session`",
+"ALTER TABLE `vtiger_chat_users` DROP INDEX `nick`",
+"ALTER TABLE `vtiger_chat_users` DROP INDEX `ping`",
+//"ALTER TABLE `vtiger_contactgrouprelation` DROP INDEX `fk_contactgrouprelation2`",
+//"ALTER TABLE `vtiger_customview` DROP INDEX `customview`",
+//"ALTER TABLE `vtiger_def_org_field` DROP INDEX `tabid`",
+//"ALTER TABLE `vtiger_field` DROP INDEX `tabid`",
+"ALTER TABLE `vtiger_freetagged_objects` DROP INDEX `tagger_id_index`",
+"ALTER TABLE `vtiger_freetagged_objects` DROP INDEX `object_id_index`",
+"ALTER TABLE `vtiger_groups` DROP INDEX `groupname`",
+//"ALTER TABLE `vtiger_invoicegrouprelation` DROP INDEX `fk_invoicegrouprelation2`",
+//"ALTER TABLE `vtiger_leadscf` DROP COLUMN `cf_354`",
+//"ALTER TABLE `vtiger_leadscf` DROP COLUMN `cf_358`",
+//"ALTER TABLE `vtiger_leadscf` DROP COLUMN `cf_360`",
+//"ALTER TABLE `vtiger_pogrouprelation` DROP INDEX `fk_productgrouprelation2`",
+//"ALTER TABLE `vtiger_potential` DROP INDEX `potentialid`",
+//"ALTER TABLE `vtiger_potentialgrouprelation` DROP INDEX `fk_potentialgrouprelation2`",
+//"ALTER TABLE `vtiger_profile2field` DROP INDEX `tabid`",
+"ALTER TABLE `vtiger_profile2tab` DROP INDEX `idx_profile2tab`",
+//"ALTER TABLE `vtiger_quotegrouprelation` DROP INDEX `fk_quotegrouprelation2`",
+"ALTER TABLE `vtiger_reportmodules` DROP INDEX `reportmodules_IDX0`",
+"ALTER TABLE `vtiger_reportsortcol` DROP INDEX `reportsortcol_IDX0`",
+"ALTER TABLE `vtiger_reportsummary` DROP INDEX `reportsummary_IDX0`",
+//"ALTER TABLE `vtiger_seattachmentsrel` DROP INDEX `attachmentsid`",
+//"ALTER TABLE `vtiger_sogrouprelation` DROP INDEX `fk_sogrouprelation2`",
+//"ALTER TABLE `vtiger_soproductrel` DROP COLUMN `shortdescription`",
+//"ALTER TABLE `vtiger_tab` DROP INDEX `tabid`",
+//"ALTER TABLE `vtiger_troubletickets` DROP INDEX `status`",
+"ALTER TABLE `vtiger_accountgrouprelation` TYPE=InnoDB, COMMENT='', ROW_FORMAT=COMPACT",
+"ALTER TABLE `vtiger_activity_reminder` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED",
+"ALTER TABLE `vtiger_activsubtype` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC",
+"ALTER TABLE `vtiger_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",
+"ALTER TABLE `vtiger_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",
+"ALTER TABLE `vtiger_customview_seq` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED",
+"ALTER TABLE `vtiger_def_org_field` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED",
+"ALTER TABLE `vtiger_def_org_share` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED",
+"ALTER TABLE `vtiger_def_org_share_seq` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED",
+"ALTER TABLE `vtiger_defaultcv` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC",
+"ALTER TABLE `vtiger_durationhrs` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC",
+"ALTER TABLE `vtiger_durationmins` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC",
+"ALTER TABLE `vtiger_emailtemplates` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC",
+"ALTER TABLE `vtiger_emailtemplates_seq` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED",
+"ALTER TABLE `vtiger_faqcategories` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC",
+"ALTER TABLE `vtiger_faqstatus` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC",
+"ALTER TABLE `vtiger_field_seq` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED",
+"ALTER TABLE `vtiger_files` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC",
+"ALTER TABLE `vtiger_freetagged_objects` TYPE=InnoDB, COMMENT='', ROW_FORMAT=COMPACT",
+"ALTER TABLE `vtiger_group2grouprel` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED",
+"ALTER TABLE `vtiger_group2role` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC",
+"ALTER TABLE `vtiger_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",
+"ALTER TABLE `vtiger_headers` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC",
+"ALTER TABLE `vtiger_import_maps` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC",
+"ALTER TABLE `vtiger_inventorynotification_seq` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED",
+"ALTER TABLE `vtiger_invoicegrouprelation` TYPE=InnoDB, COMMENT='', ROW_FORMAT=COMPACT",
+"ALTER TABLE `vtiger_loginhistory` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC",
+"ALTER TABLE `vtiger_mail_accounts` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC",
+"ALTER TABLE `vtiger_notificationscheduler_seq` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED",
+"ALTER TABLE `vtiger_ownernotify` TYPE=InnoDB, COMMENT='', ROW_FORMAT=COMPACT",
+"ALTER TABLE `vtiger_parenttabrel` TYPE=InnoDB, COMMENT='', ROW_FORMAT=COMPACT",
+"ALTER TABLE `vtiger_pogrouprelation` TYPE=InnoDB, COMMENT='', ROW_FORMAT=COMPACT",
+"ALTER TABLE `vtiger_portal` TYPE=InnoDB, COMMENT='', ROW_FORMAT=COMPACT",
+"ALTER TABLE `vtiger_portalinfo` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC",
+"ALTER TABLE `vtiger_potentialgrouprelation` TYPE=InnoDB, COMMENT='', ROW_FORMAT=COMPACT",
+"ALTER TABLE `vtiger_profile2field` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED",
+"ALTER TABLE `vtiger_profile2globalpermissions` TYPE=InnoDB, COMMENT='', ROW_FORMAT=COMPACT",
+"ALTER TABLE `vtiger_profile2standardpermissions` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED",
+"ALTER TABLE `vtiger_profile2tab` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED",
+"ALTER TABLE `vtiger_profile2utility` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED",
+"ALTER TABLE `vtiger_profile_seq` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED",
+"ALTER TABLE `vtiger_quotegrouprelation` TYPE=InnoDB, COMMENT='', ROW_FORMAT=COMPACT",
+"ALTER TABLE `vtiger_rating` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC",
+"ALTER TABLE `vtiger_relatedlists` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC",
+"ALTER TABLE `vtiger_relatedlists_seq` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED",
+"ALTER TABLE `vtiger_role2profile` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC",
+"ALTER TABLE `vtiger_role_seq` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED",
+"ALTER TABLE `vtiger_rss` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC",
+"ALTER TABLE `vtiger_sales_stage` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC",
+"ALTER TABLE `vtiger_salutationtype` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC",
+"ALTER TABLE `vtiger_selectquery_seq` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED",
+"ALTER TABLE `vtiger_sogrouprelation` TYPE=InnoDB, COMMENT='', ROW_FORMAT=COMPACT",
+"ALTER TABLE `vtiger_systems` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC",
+"ALTER TABLE `vtiger_taskpriority` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC",
+"ALTER TABLE `vtiger_taskstatus` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC",
+"ALTER TABLE `vtiger_ticketcategories` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC",
+"ALTER TABLE `vtiger_ticketpriorities` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC",
+"ALTER TABLE `vtiger_ticketseverities` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC",
+"ALTER TABLE `vtiger_ticketstatus` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC",
+"ALTER TABLE `vtiger_ticketstracktime` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED",
+"ALTER TABLE `vtiger_tracker` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC",
+"ALTER TABLE `vtiger_users2group` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED",
+"ALTER TABLE `vtiger_users_last_import` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC",
+"ALTER TABLE `vtiger_users_seq` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED",
+//"ALTER TABLE `vtiger_wordtemplates` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC",
 
 "CREATE TABLE vtiger_actualcost (
   `actualcostid` int(19) NOT NULL auto_increment,
@@ -2016,16 +2027,12 @@
   UNIQUE KEY `Campaigntype_UK01` (`campaigntype`)
 ) ENGINE=InnoDB",
 
-"CREATE TABLE vtiger_currency_info_seq (
-  `id` int(11) NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1",
-
 "CREATE TABLE vtiger_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`),
+  KEY `idx_datashare_module_rel_tabid` (`tabid`)
 ) ENGINE=InnoDB",
 
 //Added on 06-06-06
@@ -2327,338 +2334,361 @@
   KEY `tmp_write_user_sharing_per_userid_shareduserid_idx` (`userid`,`shareduserid`)
 ) 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 `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 `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) DEFAULT NULL",
-"ALTER TABLE `mail_accounts` ADD COLUMN `sslmeth` VARCHAR(50) DEFAULT NULL",
-"ALTER TABLE `mail_accounts` ADD COLUMN `showbody` VARCHAR(10) 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 'home_metrics'",
-"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 `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` 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(10,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`)",
-"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 vtiger_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 `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"
+"ALTER TABLE `vtiger_account` MODIFY COLUMN `website` VARCHAR(100) COLLATE latin1_swedish_ci DEFAULT NULL",
+"ALTER TABLE `vtiger_account` MODIFY COLUMN `emailoptout` VARCHAR(3) COLLATE latin1_swedish_ci DEFAULT '0'",
+//"ALTER TABLE `vtiger_accountgrouprelation` MODIFY COLUMN `accountid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_actionmapping` MODIFY COLUMN `actionid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_activity` MODIFY COLUMN `date_start` DATE NOT NULL UNIQUE",
+"ALTER TABLE `vtiger_activity` MODIFY COLUMN `sendnotification` VARCHAR(3) COLLATE latin1_swedish_ci NOT NULL DEFAULT '0'",
+"ALTER TABLE `vtiger_activity` MODIFY COLUMN `duration_hours` VARCHAR(2) COLLATE latin1_swedish_ci DEFAULT NULL",
+"ALTER TABLE `vtiger_activity` MODIFY COLUMN `duration_minutes` VARCHAR(2) COLLATE latin1_swedish_ci DEFAULT NULL",
+"ALTER TABLE `vtiger_activity` MODIFY COLUMN `notime` VARCHAR(3) COLLATE latin1_swedish_ci NOT NULL DEFAULT '0'",
+//"ALTER TABLE `vtiger_activity_reminder` MODIFY COLUMN `activity_id` INTEGER(11) NOT NULL PRIMARY KEY",
+"ALTER TABLE `vtiger_activity_reminder` MODIFY COLUMN `reminder_time` INTEGER(11) NOT NULL",
+"ALTER TABLE `vtiger_activity_reminder` MODIFY COLUMN `reminder_sent` INTEGER(2) NOT NULL",
+//"ALTER TABLE `vtiger_activity_reminder` MODIFY COLUMN `recurringid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_activitygrouprelation` MODIFY COLUMN `activityid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_announcement` MODIFY COLUMN `creatorid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_attachments` MODIFY COLUMN `attachmentsid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_blocks` MODIFY COLUMN `blockid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_blocks` MODIFY COLUMN `tabid` INTEGER(19) NOT NULL UNIQUE",
+"ALTER TABLE `vtiger_blocks` MODIFY COLUMN `sequence` INTEGER(10) DEFAULT NULL",
+"ALTER TABLE `vtiger_blocks` MODIFY COLUMN `show_title` INTEGER(2) DEFAULT NULL",
+//"ALTER TABLE `vtiger_chat_msg` MODIFY COLUMN `id` INTEGER(20) NOT NULL AUTO_INCREMENT PRIMARY KEY",
+"ALTER TABLE `vtiger_chat_msg` MODIFY COLUMN `chat_from` INTEGER(20) NOT NULL DEFAULT '0' UNIQUE",
+"ALTER TABLE `vtiger_chat_msg` MODIFY COLUMN `chat_to` INTEGER(20) NOT NULL DEFAULT '0' UNIQUE",
+"ALTER TABLE `vtiger_chat_msg` MODIFY COLUMN `born` DATETIME DEFAULT '0000-00-00 00:00:00' UNIQUE",
+//"ALTER TABLE `vtiger_chat_pchat` MODIFY COLUMN `id` INTEGER(20) NOT NULL AUTO_INCREMENT PRIMARY KEY",
+"ALTER TABLE `vtiger_chat_pchat` MODIFY COLUMN `msg` INTEGER(20) DEFAULT '0'",
+//"ALTER TABLE `vtiger_chat_pvchat` MODIFY COLUMN `id` INTEGER(20) NOT NULL AUTO_INCREMENT PRIMARY KEY",
+"ALTER TABLE `vtiger_chat_pvchat` MODIFY COLUMN `msg` INTEGER(20) DEFAULT '0'",
+//"ALTER TABLE `vtiger_chat_users` MODIFY COLUMN `id` INTEGER(20) NOT NULL AUTO_INCREMENT PRIMARY KEY",
+"ALTER TABLE `vtiger_chat_users` MODIFY COLUMN `nick` VARCHAR(50) COLLATE latin1_swedish_ci NOT NULL UNIQUE",
+"ALTER TABLE `vtiger_chat_users` MODIFY COLUMN `session` VARCHAR(50) COLLATE latin1_swedish_ci NOT NULL UNIQUE",
+"ALTER TABLE `vtiger_chat_users` MODIFY COLUMN `ping` DATETIME DEFAULT '0000-00-00 00:00:00' UNIQUE",
+//"ALTER TABLE `vtiger_competitor` MODIFY COLUMN `competitorid` INTEGER(19) NOT NULL PRIMARY KEY",
+"ALTER TABLE `vtiger_contactdetails` MODIFY COLUMN `donotcall` VARCHAR(3) COLLATE latin1_swedish_ci DEFAULT NULL",
+"ALTER TABLE `vtiger_contactdetails` MODIFY COLUMN `emailoptout` VARCHAR(3) COLLATE latin1_swedish_ci DEFAULT '0'",
+"ALTER TABLE `vtiger_contactdetails` MODIFY COLUMN `imagename` VARCHAR(150) COLLATE latin1_swedish_ci DEFAULT NULL",
+"ALTER TABLE `vtiger_contactdetails` MODIFY COLUMN `reference` VARCHAR(3) COLLATE latin1_swedish_ci DEFAULT NULL",
+//"ALTER TABLE `vtiger_contactgrouprelation` MODIFY COLUMN `contactid` INTEGER(19) NOT NULL PRIMARY KEY",
+"ALTER TABLE `vtiger_convertleadmapping` MODIFY COLUMN `leadfid` INTEGER(19) NOT NULL",
+//"ALTER TABLE `vtiger_crmentity` MODIFY COLUMN `crmid` INTEGER(19) NOT NULL PRIMARY KEY",
+"ALTER TABLE `vtiger_crmentity` MODIFY COLUMN `description` TEXT COLLATE latin1_swedish_ci",
+"ALTER TABLE `vtiger_crmentity` MODIFY COLUMN `createdtime` DATETIME NOT NULL",
+"ALTER TABLE `vtiger_crmentity` MODIFY COLUMN `modifiedtime` DATETIME NOT NULL",
+"ALTER TABLE `vtiger_customaction` MODIFY COLUMN `cvid` INTEGER(19) NOT NULL UNIQUE",
+"ALTER TABLE `vtiger_customaction` MODIFY COLUMN `content` TEXT COLLATE latin1_swedish_ci",
+//"ALTER TABLE `vtiger_customerdetails` MODIFY COLUMN `customerid` INTEGER(19) NOT NULL PRIMARY KEY",
+"ALTER TABLE `vtiger_customerdetails` MODIFY COLUMN `portal` VARCHAR(3) COLLATE latin1_swedish_ci DEFAULT NULL",
+//"ALTER TABLE `vtiger_customview` MODIFY COLUMN `cvid` INTEGER(19) NOT NULL PRIMARY KEY",
+"ALTER TABLE `vtiger_customview_seq` MODIFY COLUMN `id` INTEGER(11) NOT NULL",
+//"ALTER TABLE `vtiger_cvadvfilter` MODIFY COLUMN `cvid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_cvadvfilter` MODIFY COLUMN `columnindex` INTEGER(11) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_cvcolumnlist` MODIFY COLUMN `cvid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_cvcolumnlist` MODIFY COLUMN `columnindex` INTEGER(11) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_cvstdfilter` MODIFY COLUMN `cvid` INTEGER(19) NOT NULL PRIMARY KEY",
+"ALTER TABLE `vtiger_dealintimation` MODIFY COLUMN `dealprobability` DECIMAL(3,2) NOT NULL DEFAULT '0.00'",
+//"ALTER TABLE `vtiger_def_org_field` MODIFY COLUMN `fieldid` INTEGER(19) NOT NULL PRIMARY KEY",
+"ALTER TABLE `vtiger_def_org_share` MODIFY COLUMN `tabid` INTEGER(11) NOT NULL",
+//"ALTER TABLE `vtiger_def_org_share` MODIFY COLUMN `permission` INTEGER(19) DEFAULT NULL UNIQUE",
+"ALTER TABLE `vtiger_def_org_share_seq` MODIFY COLUMN `id` INTEGER(11) NOT NULL",
+//"ALTER TABLE `vtiger_defaultcv` MODIFY COLUMN `tabid` INTEGER(19) NOT NULL PRIMARY KEY",
+"ALTER TABLE `vtiger_defaultcv` MODIFY COLUMN `query` TEXT COLLATE latin1_swedish_ci",
+"ALTER TABLE `vtiger_emailtemplates` MODIFY COLUMN `description` TEXT COLLATE latin1_swedish_ci",
+"ALTER TABLE `vtiger_emailtemplates` MODIFY COLUMN `body` TEXT COLLATE latin1_swedish_ci",
+"ALTER TABLE `vtiger_emailtemplates_seq` MODIFY COLUMN `id` INTEGER(11) NOT NULL",
+"ALTER TABLE `vtiger_faq` MODIFY COLUMN `question` TEXT COLLATE latin1_swedish_ci",
+"ALTER TABLE `vtiger_faq` MODIFY COLUMN `answer` TEXT COLLATE latin1_swedish_ci",
+"ALTER TABLE `vtiger_faqcomments` MODIFY COLUMN `comments` TEXT COLLATE latin1_swedish_ci",
+"ALTER TABLE `vtiger_faqcomments` MODIFY COLUMN `createdtime` DATETIME NOT NULL",
+//"ALTER TABLE `vtiger_field` MODIFY COLUMN `tabid` INTEGER(19) NOT NULL UNIQUE",
+"ALTER TABLE `vtiger_field` MODIFY COLUMN `readonly` INTEGER(1) NOT NULL",
+"ALTER TABLE `vtiger_field` MODIFY COLUMN `selected` INTEGER(1) NOT NULL",
+//"ALTER TABLE `vtiger_field` MODIFY COLUMN `block` INTEGER(19) DEFAULT NULL UNIQUE",
+//"ALTER TABLE `vtiger_field` MODIFY COLUMN `displaytype` INTEGER(19) DEFAULT NULL UNIQUE",
+"ALTER TABLE `vtiger_field` MODIFY COLUMN `quickcreate` INTEGER(10) NOT NULL DEFAULT '1'",
+"ALTER TABLE `vtiger_field_seq` MODIFY COLUMN `id` INTEGER(11) NOT NULL",
+//"ALTER TABLE `vtiger_freetagged_objects` MODIFY COLUMN `tag_id` INTEGER(20) NOT NULL DEFAULT '0' PRIMARY KEY",
+//"ALTER TABLE `vtiger_freetagged_objects` MODIFY COLUMN `tagger_id` INTEGER(20) NOT NULL DEFAULT '0' PRIMARY KEY",
+//"ALTER TABLE `vtiger_freetagged_objects` MODIFY COLUMN `object_id` INTEGER(20) NOT NULL DEFAULT '0' PRIMARY KEY",
+//"ALTER TABLE `vtiger_freetags` MODIFY COLUMN `id` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_group2grouprel` MODIFY COLUMN `groupid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_group2grouprel` MODIFY COLUMN `containsgroupid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_group2role` MODIFY COLUMN `groupid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_group2rs` MODIFY COLUMN `groupid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_groups` MODIFY COLUMN `groupid` INTEGER(19) NOT NULL PRIMARY KEY",
+"ALTER TABLE `vtiger_groups` MODIFY COLUMN `description` TEXT COLLATE latin1_swedish_ci",
+"ALTER TABLE `vtiger_import_maps` MODIFY COLUMN `is_published` VARCHAR(3) COLLATE latin1_swedish_ci NOT NULL DEFAULT 'no'",
+//"ALTER TABLE `vtiger_inventory_tandc` MODIFY COLUMN `id` INTEGER(19) NOT NULL PRIMARY KEY",
+"ALTER TABLE `vtiger_inventory_tandc` MODIFY COLUMN `tandc` TEXT COLLATE latin1_swedish_ci",
+"ALTER TABLE `vtiger_inventory_tandc_seq` MODIFY COLUMN `id` INTEGER(11) NOT NULL",
+"ALTER TABLE `vtiger_inventorynotification` MODIFY COLUMN `notificationbody` TEXT COLLATE latin1_swedish_ci",
+"ALTER TABLE `vtiger_inventorynotification_seq` MODIFY COLUMN `id` INTEGER(11) NOT NULL",
+//"ALTER TABLE `vtiger_invoice` MODIFY COLUMN `salesorderid` INTEGER(19) DEFAULT NULL UNIQUE",
+"ALTER TABLE `vtiger_invoice` MODIFY COLUMN `terms_conditions` TEXT COLLATE latin1_swedish_ci",
+//"ALTER TABLE `vtiger_invoicegrouprelation` MODIFY COLUMN `invoiceid` INTEGER(19) NOT NULL PRIMARY KEY",
+"ALTER TABLE `vtiger_invoiceproductrel` MODIFY COLUMN `invoiceid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_invoiceproductrel` MODIFY COLUMN `productid` INTEGER(19) NOT NULL PRIMARY KEY",
+"ALTER TABLE `vtiger_lar` MODIFY COLUMN `createdon` DATE NOT NULL",
+//"ALTER TABLE `vtiger_leaddetails` MODIFY COLUMN `leadid` INTEGER(19) NOT NULL PRIMARY KEY",
+"ALTER TABLE `vtiger_leaddetails` MODIFY COLUMN `comments` TEXT COLLATE latin1_swedish_ci",
+//"ALTER TABLE `vtiger_leadgrouprelation` MODIFY COLUMN `leadid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_mail_accounts` MODIFY COLUMN `account_id` INTEGER(11) NOT NULL PRIMARY KEY",
+"ALTER TABLE `vtiger_mail_accounts` MODIFY COLUMN `user_id` INTEGER(11) NOT NULL",
+"ALTER TABLE `vtiger_mail_accounts` ADD COLUMN `box_refresh` INTEGER(10) DEFAULT NULL",
+"ALTER TABLE `vtiger_mail_accounts` ADD COLUMN `mails_per_page` INTEGER(10) DEFAULT NULL",
+"ALTER TABLE `vtiger_mail_accounts` ADD COLUMN `ssltype` VARCHAR(50) DEFAULT NULL",
+"ALTER TABLE `vtiger_mail_accounts` ADD COLUMN `sslmeth` VARCHAR(50) DEFAULT NULL",
+"ALTER TABLE `vtiger_mail_accounts` ADD COLUMN `showbody` VARCHAR(10) DEFAULT NULL",
+"ALTER TABLE `vtiger_notes` MODIFY COLUMN `contact_id` INTEGER(19) DEFAULT '0'",
+"ALTER TABLE `vtiger_notes` MODIFY COLUMN `notecontent` TEXT COLLATE latin1_swedish_ci",
+"ALTER TABLE `vtiger_notificationscheduler` MODIFY COLUMN `notificationbody` TEXT COLLATE latin1_swedish_ci",
+"ALTER TABLE `vtiger_notificationscheduler_seq` MODIFY COLUMN `id` INTEGER(11) NOT NULL",
+"ALTER TABLE `vtiger_opportunitystage` MODIFY COLUMN `probability` DECIMAL(3,2) DEFAULT '0.00'",
+"ALTER TABLE `vtiger_org_share_action2tab` MODIFY COLUMN `share_action_id` INTEGER(19) NOT NULL PRIMARY KEY",
+"ALTER TABLE `vtiger_org_share_action2tab` MODIFY COLUMN `tabid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_org_share_action_mapping` MODIFY COLUMN `share_action_id` INTEGER(19) NOT NULL PRIMARY KEY",
+"ALTER TABLE `vtiger_organizationdetails` MODIFY COLUMN `website` VARCHAR(100) COLLATE latin1_swedish_ci DEFAULT NULL",
+"ALTER TABLE `vtiger_organizationdetails` MODIFY COLUMN `logo` TEXT COLLATE latin1_swedish_ci",
+"ALTER TABLE `vtiger_ownernotify` MODIFY COLUMN `crmid` INTEGER(19) DEFAULT NULL UNIQUE",
+//"ALTER TABLE `vtiger_parenttab` MODIFY COLUMN `parenttabid` INTEGER(19) NOT NULL PRIMARY KEY",
+"ALTER TABLE `vtiger_parenttab` MODIFY COLUMN `sequence` INTEGER(10) NOT NULL",
+"ALTER TABLE `vtiger_parenttabrel` MODIFY COLUMN `parenttabid` INTEGER(3) NOT NULL",
+//"ALTER TABLE `vtiger_parenttabrel` MODIFY COLUMN `tabid` INTEGER(3) NOT NULL UNIQUE",
+"ALTER TABLE `vtiger_parenttabrel` MODIFY COLUMN `sequence` INTEGER(3) NOT NULL",
+//"ALTER TABLE `vtiger_pogrouprelation` MODIFY COLUMN `purchaseorderid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_poproductrel` MODIFY COLUMN `purchaseorderid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_poproductrel` MODIFY COLUMN `productid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_portal` MODIFY COLUMN `portalid` INTEGER(19) NOT NULL PRIMARY KEY",
+"ALTER TABLE `vtiger_portal` MODIFY COLUMN `portalname` VARCHAR(200) COLLATE latin1_swedish_ci NOT NULL UNIQUE",
+"ALTER TABLE `vtiger_portal` MODIFY COLUMN `sequence` INTEGER(3) NOT NULL",
+//"ALTER TABLE `vtiger_portalinfo` MODIFY COLUMN `id` INTEGER(11) NOT NULL PRIMARY KEY",
+"ALTER TABLE `vtiger_portalinfo` MODIFY COLUMN `last_login_time` DATETIME NOT NULL",
+"ALTER TABLE `vtiger_portalinfo` MODIFY COLUMN `login_time` DATETIME NOT NULL",
+"ALTER TABLE `vtiger_portalinfo` MODIFY COLUMN `logout_time` DATETIME NOT NULL",
+//"ALTER TABLE `vtiger_potcompetitorrel` MODIFY COLUMN `potentialid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_potcompetitorrel` MODIFY COLUMN `competitorid` INTEGER(19) NOT NULL PRIMARY KEY",
+"ALTER TABLE `vtiger_potential` MODIFY COLUMN `amount` DECIMAL(10,2) DEFAULT '0.00'",
+"ALTER TABLE `vtiger_potential` MODIFY COLUMN `description` TEXT COLLATE latin1_swedish_ci",
+//"ALTER TABLE `vtiger_potentialgrouprelation` MODIFY COLUMN `potentialid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_potstagehistory` MODIFY COLUMN `potentialid` INTEGER(19) NOT NULL UNIQUE",
+"ALTER TABLE `vtiger_potstagehistory` MODIFY COLUMN `probability` DECIMAL(3,2) DEFAULT NULL",
+"ALTER TABLE `vtiger_potstagehistory` MODIFY COLUMN `lastmodified` DATETIME NOT NULL",
+"ALTER TABLE `vtiger_pricebook` MODIFY COLUMN `description` TEXT COLLATE latin1_swedish_ci",
+//"ALTER TABLE `vtiger_pricebookproductrel` MODIFY COLUMN `pricebookid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_pricebookproductrel` MODIFY COLUMN `productid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_productcollaterals` MODIFY COLUMN `productid` INTEGER(11) NOT NULL PRIMARY KEY",
+"ALTER TABLE `vtiger_productcollaterals` MODIFY COLUMN `description` TEXT COLLATE latin1_swedish_ci",
+//"ALTER TABLE `vtiger_products` MODIFY COLUMN `productid` INTEGER(11) NOT NULL PRIMARY KEY",
+"ALTER TABLE `vtiger_products` MODIFY COLUMN `product_description` TEXT COLLATE latin1_swedish_ci",
+"ALTER TABLE `vtiger_products` MODIFY COLUMN `commissionrate` DECIMAL(3,3) DEFAULT NULL",
+//"ALTER TABLE `vtiger_profile2field` MODIFY COLUMN `profileid` INTEGER(11) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_profile2field` MODIFY COLUMN `fieldid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_profile2globalpermissions` MODIFY COLUMN `profileid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_profile2globalpermissions` MODIFY COLUMN `globalactionid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_profile2standardpermissions` MODIFY COLUMN `profileid` INTEGER(11) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_profile2standardpermissions` MODIFY COLUMN `tabid` INTEGER(10) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_profile2standardpermissions` MODIFY COLUMN `Operation` INTEGER(10) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_profile2utility` MODIFY COLUMN `profileid` INTEGER(11) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_profile2utility` MODIFY COLUMN `tabid` INTEGER(11) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_profile2utility` MODIFY COLUMN `activityid` INTEGER(11) NOT NULL PRIMARY KEY",
+"ALTER TABLE `vtiger_profile_seq` MODIFY COLUMN `id` INTEGER(11) NOT NULL",
+//"ALTER TABLE `vtiger_purchaseorder` MODIFY COLUMN `quoteid` INTEGER(19) DEFAULT NULL UNIQUE",
+//"ALTER TABLE `vtiger_purchaseorder` MODIFY COLUMN `vendorid` INTEGER(19) DEFAULT NULL UNIQUE",
+//"ALTER TABLE `vtiger_purchaseorder` MODIFY COLUMN `contactid` INTEGER(19) DEFAULT NULL UNIQUE",
+"ALTER TABLE `vtiger_purchaseorder` MODIFY COLUMN `terms_conditions` TEXT COLLATE latin1_swedish_ci",
+//"ALTER TABLE `vtiger_quotegrouprelation` MODIFY COLUMN `quoteid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_quotes` MODIFY COLUMN `potentialid` INTEGER(19) DEFAULT NULL UNIQUE",
+"ALTER TABLE `vtiger_quotes` MODIFY COLUMN `quotestage` VARCHAR(200) COLLATE latin1_swedish_ci DEFAULT NULL",
+//"ALTER TABLE `vtiger_quotes` MODIFY COLUMN `contactid` INTEGER(19) DEFAULT NULL UNIQUE",
+"ALTER TABLE `vtiger_quotes` MODIFY COLUMN `terms_conditions` TEXT COLLATE latin1_swedish_ci",
+//"ALTER TABLE `vtiger_quotesproductrel` MODIFY COLUMN `quoteid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_quotesproductrel` MODIFY COLUMN `productid` INTEGER(19) NOT NULL PRIMARY KEY",
+"ALTER TABLE `vtiger_recurringevents` MODIFY COLUMN `activityid` INTEGER(19) NOT NULL",
+//"ALTER TABLE `vtiger_relatedlists` MODIFY COLUMN `relation_id` INTEGER(19) NOT NULL PRIMARY KEY",
+"ALTER TABLE `vtiger_relatedlists_seq` MODIFY COLUMN `id` INTEGER(11) NOT NULL",
+//"ALTER TABLE `vtiger_relcriteria` MODIFY COLUMN `queryid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_relcriteria` MODIFY COLUMN `columnindex` INTEGER(11) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_report` MODIFY COLUMN `reportid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_report` MODIFY COLUMN `folderid` INTEGER(19) NOT NULL UNIQUE",
+//"ALTER TABLE `vtiger_reportdatefilter` MODIFY COLUMN `datefilterid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_reportmodules` MODIFY COLUMN `reportmodulesid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_reportsortcol` MODIFY COLUMN `sortcolid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_reportsortcol` MODIFY COLUMN `reportid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_reportsummary` MODIFY COLUMN `reportsummaryid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_reportsummary` MODIFY COLUMN `summarytype` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_role2profile` MODIFY COLUMN `profileid` INTEGER(11) NOT NULL PRIMARY KEY",
+"ALTER TABLE `vtiger_role_seq` MODIFY COLUMN `id` INTEGER(11) NOT NULL",
+//"ALTER TABLE `vtiger_rss` MODIFY COLUMN `rssid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_salesorder` MODIFY COLUMN `contactid` INTEGER(19) DEFAULT NULL UNIQUE",
+"ALTER TABLE `vtiger_salesorder` MODIFY COLUMN `vendorid` INTEGER(19) DEFAULT NULL UNIQUE",
+"ALTER TABLE `vtiger_salesorder` MODIFY COLUMN `terms_conditions` TEXT COLLATE latin1_swedish_ci",
+//"ALTER TABLE `vtiger_seactivityrel` MODIFY COLUMN `crmid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_seactivityrel` MODIFY COLUMN `activityid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_selectcolumn` MODIFY COLUMN `queryid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_selectquery` MODIFY COLUMN `queryid` INTEGER(19) NOT NULL PRIMARY KEY",
+"ALTER TABLE `vtiger_selectquery_seq` MODIFY COLUMN `id` INTEGER(11) NOT NULL",
+//"ALTER TABLE `vtiger_sharedcalendar` MODIFY COLUMN `userid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_sharedcalendar` MODIFY COLUMN `sharedid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_sogrouprelation` MODIFY COLUMN `salesorderid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_soproductrel` MODIFY COLUMN `salesorderid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_soproductrel` MODIFY COLUMN `productid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_systems` MODIFY COLUMN `id` INTEGER(19) NOT NULL PRIMARY KEY",
+"ALTER TABLE `vtiger_systems` MODIFY COLUMN `server` VARCHAR(30) COLLATE latin1_swedish_ci DEFAULT NULL",
+"ALTER TABLE `vtiger_systems` MODIFY COLUMN `server_username` VARCHAR(30) COLLATE latin1_swedish_ci DEFAULT NULL",
+"ALTER TABLE `vtiger_systems` MODIFY COLUMN `server_password` VARCHAR(30) COLLATE latin1_swedish_ci DEFAULT NULL",
+"ALTER TABLE `vtiger_ticketcomments` MODIFY COLUMN `comments` TEXT COLLATE latin1_swedish_ci",
+"ALTER TABLE `vtiger_ticketcomments` MODIFY COLUMN `createdtime` DATETIME NOT NULL",
+//"ALTER TABLE `vtiger_ticketgrouprelation` MODIFY COLUMN `ticketid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_troubletickets` MODIFY COLUMN `ticketid` INTEGER(19) NOT NULL PRIMARY KEY",
+"ALTER TABLE `vtiger_troubletickets` MODIFY COLUMN `description` TEXT COLLATE latin1_swedish_ci",
+"ALTER TABLE `vtiger_troubletickets` MODIFY COLUMN `solution` TEXT COLLATE latin1_swedish_ci",
+"ALTER TABLE `vtiger_troubletickets` MODIFY COLUMN `update_log` TEXT COLLATE latin1_swedish_ci",
+//"ALTER TABLE `vtiger_user2role` MODIFY COLUMN `userid` INTEGER(11) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_user2role` MODIFY COLUMN `roleid` VARCHAR(255) COLLATE latin1_swedish_ci NOT NULL UNIQUE",
+"ALTER TABLE `vtiger_users` MODIFY COLUMN `is_admin` VARCHAR(3) COLLATE latin1_swedish_ci DEFAULT '0'",
+"ALTER TABLE `vtiger_users` MODIFY COLUMN `description` TEXT COLLATE latin1_swedish_ci",
+"ALTER TABLE `vtiger_users` MODIFY COLUMN `user_preferences` TEXT COLLATE latin1_swedish_ci",
+"ALTER TABLE `vtiger_users` MODIFY COLUMN `homeorder` VARCHAR(255) COLLATE latin1_swedish_ci DEFAULT 'ALVT,PLVT,QLTQ,CVLVT,HLT,OLV,GRT,OLTSO,ILTI,MNL'",
+"ALTER TABLE `vtiger_users` ADD COLUMN `currency_id` INTEGER(19) NOT NULL DEFAULT '1'",
+"ALTER TABLE `vtiger_users` ADD COLUMN `defhomeview` VARCHAR(100) COLLATE latin1_swedish_ci DEFAULT 'home_metrics'",
+//"ALTER TABLE `vtiger_users2group` MODIFY COLUMN `groupid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_users2group` MODIFY COLUMN `userid` INTEGER(19) NOT NULL PRIMARY KEY",
+"ALTER TABLE `vtiger_users_seq` MODIFY COLUMN `id` INTEGER(11) NOT NULL",
+"ALTER TABLE `vtiger_vendor` MODIFY COLUMN `street` TEXT COLLATE latin1_swedish_ci",
+"ALTER TABLE `vtiger_vendor` MODIFY COLUMN `description` TEXT COLLATE latin1_swedish_ci",
+//"ALTER TABLE `vtiger_wordtemplates` MODIFY COLUMN `templateid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_wordtemplates` MODIFY COLUMN `description` TEXT COLLATE latin1_swedish_ci",
+"ALTER TABLE `vtiger_accountgrouprelation` ADD KEY `accountgrouprelation_IDX1` (`groupname`)",
+"ALTER TABLE `vtiger_activity` ADD KEY `status1` (`status`, `eventstatus`)",
+"ALTER TABLE `vtiger_attachments` ADD KEY `attachmentsid1` (`attachmentsid`)",
+"ALTER TABLE `vtiger_blocks` ADD KEY `block_tabid` (`tabid`)",
+"ALTER TABLE `vtiger_carrier` ADD UNIQUE KEY `carrier_UK01` (`carrier`)",
+"ALTER TABLE `vtiger_chat_msg` ADD KEY `chat_msg_IDX0` (`chat_from`)",
+"ALTER TABLE `vtiger_chat_msg` ADD KEY `chat_msg_IDX1` (`chat_to`)",
+"ALTER TABLE `vtiger_chat_msg` ADD KEY `chat_msg_IDX2` (`born`)",
+"ALTER TABLE `vtiger_chat_pchat` ADD UNIQUE KEY `chat_pchat_UK0` (`msg`)",
+"ALTER TABLE `vtiger_chat_pvchat` ADD UNIQUE KEY `chat_pvchat_UK0` (`msg`)",
+"ALTER TABLE `vtiger_chat_users` ADD KEY `chat_users_IDX0` (`nick`)",
+"ALTER TABLE `vtiger_chat_users` ADD KEY `chat_users_IDX1` (`session`)",
+"ALTER TABLE `vtiger_chat_users` ADD KEY `chat_users_IDX2` (`ping`)",
+"ALTER TABLE `vtiger_contactgrouprelation` ADD KEY `contactgrouprelation_IDX1` (`groupname`)",
+"ALTER TABLE `vtiger_def_org_field` ADD KEY `tabid4` (`tabid`)",
+"ALTER TABLE `vtiger_def_org_share` ADD KEY `fk_def_org_share23` (`permission`)",
+"ALTER TABLE `vtiger_field` ADD KEY `tabid2` (`tabid`)",
+"ALTER TABLE `vtiger_field` ADD KEY `blockid` (`block`)",
+"ALTER TABLE `vtiger_field` ADD KEY `displaytypeid` (`displaytype`)",
+"ALTER TABLE `vtiger_freetagged_objects` DROP INDEX tag_id_index",
+"ALTER TABLE `vtiger_freetagged_objects` ADD INDEX `tag_id_index` (`tag_id`, `tagger_id`, `object_id`)",
+"ALTER TABLE `vtiger_group2grouprel` ADD KEY `fk_group2grouprel2` (`containsgroupid`)",
+"ALTER TABLE `vtiger_group2role` ADD KEY `fk_group2role2` (`roleid`)",
+"ALTER TABLE `vtiger_group2rs` ADD KEY `fk_group2rs2` (`roleandsubid`)",
+"ALTER TABLE `vtiger_groups` ADD KEY `idx_groups_123group` (`groupname`)",
+"ALTER TABLE `vtiger_invoice` ADD KEY `SoPo_IDX` (`invoiceid`)",
+"ALTER TABLE `vtiger_invoice` ADD KEY `fk_Invoice2` (`salesorderid`)",
+"ALTER TABLE `vtiger_invoicegrouprelation` ADD KEY `invoicegrouprelation_IDX1` (`groupname`, `invoiceid`)",
+"ALTER TABLE `vtiger_leadgrouprelation` ADD KEY `leadgrouprelation_IDX0` (`leadid`)",
+"ALTER TABLE `vtiger_moduleowners` ADD KEY `moduleowners_UK11` (`tabid`, `user_id`)",
+//"ALTER TABLE `vtiger_org_share_action2tab` ADD KEY `fk_org_share_action2tab12345` (`tabid`)",
+"ALTER TABLE `vtiger_ownernotify` ADD KEY `ownernotify_UK1` (`crmid`, `flag`)",
+"ALTER TABLE `vtiger_parenttab` ADD KEY `parenttab_UK1` (`parenttabid`, `parenttab_label`, `visible`)",
+"ALTER TABLE `vtiger_parenttabrel` ADD KEY `parenttabrelUK01` (`tabid`, `parenttabid`)",
+"ALTER TABLE `vtiger_pogrouprelation` ADD KEY `pogrouprelation_IDX1` (`groupname`, `purchaseorderid`)",
+"ALTER TABLE `vtiger_portal` ADD KEY `portal_UK01` (`portalname`)",
+"ALTER TABLE `vtiger_potential` ADD KEY `potentialid1` (`potentialid`)",
+"ALTER TABLE `vtiger_potentialgrouprelation` ADD KEY `potentialgrouprelation_IDX1` (`groupname`)",
+"ALTER TABLE `vtiger_potstagehistory` DROP INDEX PotStageHistory_IDX1",
+"ALTER TABLE `vtiger_potstagehistory` ADD INDEX `PotStageHistory_IDX1` (`historyid`)",
+"ALTER TABLE `vtiger_potstagehistory` ADD KEY `fk_PotStageHistory` (`potentialid`)",
+"ALTER TABLE `vtiger_profile2field` ADD KEY `tabid3` (`tabid`, `profileid`)",
+//"ALTER TABLE `vtiger_profile2globalpermissions` ADD KEY `idx_profile2globalpermissions` (`profileid`, `globalactionid`)",
+"ALTER TABLE `vtiger_profile2standardpermissions` ADD KEY `idx_prof2stad` (`profileid`, `tabid`, `Operation`)",
+"ALTER TABLE `vtiger_profile2tab` ADD KEY `idx_profile2tab1` (`profileid`, `tabid`)",
+"ALTER TABLE `vtiger_profile2utility` ADD KEY `idx_prof2utility` (`profileid`, `tabid`, `activityid`)",
+"ALTER TABLE `vtiger_purchaseorder` ADD KEY `PO_Vend_IDX` (`vendorid`)",
+"ALTER TABLE `vtiger_purchaseorder` ADD KEY `PO_Quote_IDX` (`quoteid`)",
+"ALTER TABLE `vtiger_purchaseorder` ADD KEY `PO_Contact_IDX` (`contactid`)",
+"ALTER TABLE `vtiger_quotegrouprelation` ADD KEY `quotegrouprelation_IDX1` (`groupname`)",
+//"ALTER TABLE `vtiger_quotes` DROP INDEX vtiger_quotestage",
+"ALTER TABLE `vtiger_quotes` ADD INDEX `quotestage` (`quoteid`)",
+"ALTER TABLE `vtiger_quotes` ADD KEY `potentialid2` (`potentialid`)",
+"ALTER TABLE `vtiger_quotes` ADD KEY `contactid` (`contactid`)",
+"ALTER TABLE `vtiger_recurringtype` ADD UNIQUE KEY `RecurringEvent_UK0` (`recurringtype`)",
+"ALTER TABLE `vtiger_reportsortcol` ADD KEY `FK1_reportsortcol` (`reportid`)",
+"ALTER TABLE `vtiger_role2profile` ADD KEY `idx_role2profileid1` (`roleid`, `profileid`)",
+"ALTER TABLE `vtiger_salesorder` ADD KEY `SoVend_IDX` (`vendorid`)",
+"ALTER TABLE `vtiger_salesorder` ADD KEY `SoContact_IDX` (`contactid`)",
+"ALTER TABLE `vtiger_seattachmentsrel` ADD KEY `attachmentsid2` (`attachmentsid`, `crmid`)",
+"ALTER TABLE `vtiger_selectquery` ADD KEY `selectquery_IDX0` (`queryid`)",
+"ALTER TABLE `vtiger_sogrouprelation` ADD KEY `sogrouprelation_IDX1` (`groupname`)",
+"ALTER TABLE `vtiger_tab` ADD KEY `tabid1` (`tabid`)",
+"ALTER TABLE `vtiger_taxclass` ADD UNIQUE KEY `carrier_UK02` (`taxclass`)",
+"ALTER TABLE `vtiger_troubletickets` ADD KEY `status2` (`status`)",
+"ALTER TABLE `vtiger_users2group` ADD KEY `idx_users2group` (`groupid`, `userid`)",
+"ALTER TABLE `vtiger_users2group` ADD KEY `fk_users2group2` (`userid`)",
+//"ALTER TABLE `vtiger_accountgrouprelation` ADD CONSTRAINT `fk_accountgrouprelation2` FOREIGN KEY (`groupname`) REFERENCES `groups` (`groupname`) ON DELETE CASCADE",
+//"ALTER TABLE `vtiger_accountgrouprelation` ADD CONSTRAINT `fk_accountgrouprelation123` FOREIGN KEY (`accountid`) REFERENCES `account` (`accountid`) ON DELETE CASCADE",
+//"ALTER TABLE `vtiger_contactgrouprelation` ADD CONSTRAINT `fk_contactgrouprelation2` FOREIGN KEY (`groupname`) REFERENCES `groups` (`groupname`) ON DELETE CASCADE",
+//"ALTER TABLE `vtiger_contactgrouprelation` ADD CONSTRAINT `fk_contactgrouprelation123` FOREIGN KEY (`contactid`) REFERENCES `contactdetails` (`contactid`) ON DELETE CASCADE",
+"ALTER TABLE `vtiger_customaction` ADD CONSTRAINT `customaction_FK1` FOREIGN KEY (`cvid`) REFERENCES `customview` (`cvid`) ON DELETE CASCADE",
+"ALTER TABLE `vtiger_invoice` ADD CONSTRAINT `fk_Invoice2` FOREIGN KEY (`salesorderid`) REFERENCES `salesorder` (`salesorderid`) ON DELETE CASCADE",
+//"ALTER TABLE `vtiger_invoicegrouprelation` ADD CONSTRAINT `fk_invoicegrouprelation234` FOREIGN KEY (`invoiceid`) REFERENCES `invoice` (`invoiceid`) ON DELETE CASCADE",
+//"ALTER TABLE `vtiger_invoicegrouprelation` ADD CONSTRAINT `fk_invoicegrouprelation2` FOREIGN KEY (`groupname`) REFERENCES `groups` (`groupname`) ON DELETE CASCADE",
+//"ALTER TABLE `vtiger_org_share_action2tab` ADD CONSTRAINT `fk_org_share_action2tab12345` FOREIGN KEY (`tabid`) REFERENCES `tab` (`tabid`) ON DELETE CASCADE",
+//"ALTER TABLE `vtiger_pogrouprelation` ADD CONSTRAINT `fk_pogrouprelation2` FOREIGN KEY (`groupname`) REFERENCES `groups` (`groupname`) ON DELETE CASCADE",
+//"ALTER TABLE `vtiger_pogrouprelation` ADD CONSTRAINT `fk_pogrouprelation123` FOREIGN KEY (`purchaseorderid`) REFERENCES `purchaseorder` (`purchaseorderid`) ON DELETE CASCADE",
+//"ALTER TABLE `vtiger_potentialgrouprelation` ADD CONSTRAINT `fk_potentialgrouprelation2` FOREIGN KEY (`groupname`) REFERENCES `groups` (`groupname`) ON DELETE CASCADE",
+//"ALTER TABLE `vtiger_potentialgrouprelation` ADD CONSTRAINT `fk_potentialgrouprelation67` FOREIGN KEY (`potentialid`) REFERENCES `potential` (`potentialid`) ON DELETE CASCADE",
+//"ALTER TABLE `vtiger_profile2globalpermissions` ADD CONSTRAINT `fk_profile2globalpermissions57` FOREIGN KEY (`profileid`) REFERENCES `profile` (`profileid`) ON DELETE CASCADE",
+"ALTER TABLE `vtiger_purchaseorder` ADD CONSTRAINT `fk_PO3` FOREIGN KEY (`contactid`) REFERENCES `contactdetails` (`contactid`) ON DELETE CASCADE",
+"ALTER TABLE `vtiger_purchaseorder` ADD CONSTRAINT `fk_PO2` FOREIGN KEY (`vendorid`) REFERENCES `vendor` (`vendorid`) ON DELETE CASCADE",
+"ALTER TABLE `vtiger_purchaseorder` ADD CONSTRAINT `fk_PO2345` FOREIGN KEY (`quoteid`) REFERENCES `quotes` (`quoteid`) ON DELETE CASCADE",
+//"ALTER TABLE `vtiger_quotegrouprelation` ADD CONSTRAINT `fk_quotegrouprelation2` FOREIGN KEY (`groupname`) REFERENCES `groups` (`groupname`) ON DELETE CASCADE",
+//"ALTER TABLE `vtiger_quotegrouprelation` ADD CONSTRAINT `fk_quotegrouprelation132` FOREIGN KEY (`quoteid`) REFERENCES `quotes` (`quoteid`) ON DELETE CASCADE",
+"ALTER TABLE `vtiger_quotes` ADD CONSTRAINT `fk_Quotes3` FOREIGN KEY (`contactid`) REFERENCES `contactdetails` (`contactid`) ON DELETE CASCADE",
+"ALTER TABLE `vtiger_quotes` ADD CONSTRAINT `fk_Quotes2` FOREIGN KEY (`potentialid`) REFERENCES `potential` (`potentialid`) ON DELETE CASCADE",
+"ALTER TABLE `vtiger_salesorder` ADD CONSTRAINT `fk_SO4` FOREIGN KEY (`contactid`) REFERENCES `contactdetails` (`contactid`) ON DELETE CASCADE",
+"ALTER TABLE `vtiger_salesorder` ADD CONSTRAINT `fk_SO2` FOREIGN KEY (`vendorid`) REFERENCES `vendor` (`vendorid`) ON DELETE CASCADE",
+//"ALTER TABLE `vtiger_sogrouprelation` ADD CONSTRAINT `fk_sogrouprelation2` FOREIGN KEY (`groupname`) REFERENCES `groups` (`groupname`) ON DELETE CASCADE",
+//"ALTER TABLE `vtiger_sogrouprelation` ADD CONSTRAINT `fk_sogrouprelation78` FOREIGN KEY (`salesorderid`) REFERENCES `salesorder` (`salesorderid`) ON DELETE CASCADE",
+"ALTER TABLE `vtiger_vendorcontactrel` ADD CONSTRAINT `fk_VendorContactRel45` FOREIGN KEY (`vendorid`) REFERENCES `vendor` (`vendorid`) ON DELETE CASCADE"
 		    );
 foreach($query_array as $query)
 {
 	Execute($query);
 }
 
+//First check whether this table is exist and the proceed
+$currency_columns = $conn->getColumnNames("vtiger_currency_info");
+if(!is_array($currency_columns))
+{
+	$currency_query = "CREATE TABLE `vtiger_currency_info` (
+	  `id` int(11) NOT NULL auto_increment,
+	  `currency_name` varchar(100) default NULL,
+	  `currency_code` varchar(100) default NULL,
+	  `currency_symbol` varchar(30) default NULL,
+	  `conversion_rate` decimal(10,3) default NULL,
+	  `currency_status` varchar(25) default NULL,
+	  `defaultid` varchar(10) NOT NULL default '0',
+	   PRIMARY KEY  (`id`)
+	) ENGINE=InnoDB";
+	Execute($currency_query);
+}
+elseif(!in_array("id",$currency_columns))
+{
+	$currency_query_array = Array(
+		"alter table vtiger_currency_info drop primary key",
+		"alter table vtiger_currency_info add column id int(11) NOT NULL auto_increment primary key FIRST",
+		"alter table vtiger_currency_info add column conversion_rate decimal(10,3) default NULL",
+		"alter table vtiger_currency_info add column currency_status varchar(25) default NULL",
+		"alter table vtiger_currency_info add column defaultid varchar(10) NOT NULL default '0'",
+				     );
+	foreach($currency_query_array as $query)
+	{
+		Execute($query);
+	}
+}
 
 $conn->println("Database Modifications for 5.0(Alpha) Dev 3 ==> 5.0 Alpha (5) ends here.");
 
@@ -2672,14 +2702,14 @@
 	"update vtiger_field set sequence=26 where tabid=4 and fieldname='modifiedtime'",
 	"update vtiger_field set sequence=25 where tabid=4 and fieldname='createdtime'",
 	
-	"insert into vtiger_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')",
+	"insert into vtiger_field values(4,".$conn->getUniqueID("vtiger_field").",'notify_owner','contactdetails',1,56,'notify_owner','Notify Owner',1,0,0,10,24,4,1,'C~O',1,NULL,'ADV')",
 	"alter table vtiger_contactdetails add column notify_owner varchar(3) default 0 after reference",
 
 	"update vtiger_field set sequence=21 where tabid=6 and fieldname='modifiedtime'",
 	"update vtiger_field set sequence=20 where tabid=6 and fieldname='createdtime'",
 	"update vtiger_field set sequence=19 where tabid=6 and fieldname='assigned_user_id'",
 	
-	"insert into vtiger_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')",
+	"insert into vtiger_field values(6,".$conn->getUniqueID("vtiger_field").",'notify_owner','account',1,56,'notify_owner','Notify Owner',1,0,0,10,18,9,1,'C~O',1,NULL,'ADV')",
 	"alter table vtiger_account add column notify_owner varchar(3) default 0 after emailoptout"
 			   );
 foreach($notify_owner_array as $query)
@@ -2688,7 +2718,7 @@
 }
 
 //Added for RSS entries
-$rss_insert_query = "insert into vtiger_field values (24,".$conn->getUniqueID("field").",'rsscategory','rss',1,'15','rsscategory','rsscategory',1,0,0,255,13,null,1,'V~O',1,null,'BAS')";
+$rss_insert_query = "insert into vtiger_field values (24,".$conn->getUniqueID("vtiger_field").",'rsscategory','rss',1,'15','rsscategory','rsscategory',1,0,0,255,13,null,1,'V~O',1,null,'BAS')";
 Execute($rss_insert_query);
 
 //Quick Create Feature added for Vendor & PriceBook
@@ -2707,8 +2737,8 @@
 
 
 //Added on 24-04-06 to populate vtiger_customview All for Campaign and webmails modules
-$cvid1 = $conn->getUniqueID("customview");
-$cvid2 = $conn->getUniqueID("customview");
+$cvid1 = $conn->getUniqueID("vtiger_customview");
+$cvid2 = $conn->getUniqueID("vtiger_customview");
 $customview_query_array = Array(
 	"insert into vtiger_customview(cvid,viewname,setdefault,setmetrics,entitytype) values(".$cvid1.",'All',1,0,'Campaigns')",
 	"insert into vtiger_cvcolumnlist (cvid,columnindex,columnname) values (".$cvid1.",0,'vtiger_campaign:campaignname:campaignname:Campaigns_Campaign_Name:V')",
@@ -2745,9 +2775,9 @@
 				"create table vtiger_inventorytaxinfo (taxid int(3) NOT NULL auto_increment, taxname varchar(50) default NULL, percentage decimal(7,3) default NULL,  PRIMARY KEY  (taxid), KEY vtiger_inventorytaxinfo_taxname_idx (taxname))",
 				"create table vtiger_producttaxrel ( productid int(11) NOT NULL, taxid int(3) NOT NULL, taxpercentage decimal(7,3) default NULL, KEY vtiger_producttaxrel_productid_idx (productid), KEY vtiger_producttaxrel_taxid_idx (taxid))",
 
-				"insert into vtiger_inventorytaxinfo values(".$conn->getUniqueID("inventorytaxinfo").",'VAT','4.5')",
-				"insert into vtiger_inventorytaxinfo values(".$conn->getUniqueID("inventorytaxinfo").",'Sales','10')",
-				"insert into vtiger_inventorytaxinfo values(".$conn->getUniqueID("inventorytaxinfo").",'Service','12.5')",
+				"insert into vtiger_inventorytaxinfo values(".$conn->getUniqueID("vtiger_inventorytaxinfo").",'VAT','4.5')",
+				"insert into vtiger_inventorytaxinfo values(".$conn->getUniqueID("vtiger_inventorytaxinfo").",'Sales','10')",
+				"insert into vtiger_inventorytaxinfo values(".$conn->getUniqueID("vtiger_inventorytaxinfo").",'Service','12.5')",
 				"update vtiger_field set uitype=83, tablename='producttaxrel' where tabid=14 and fieldname='taxclass'",
 				"insert into vtiger_moduleowners values(".$this->localGetTabID('Campaigns').",1)",
 
@@ -2798,8 +2828,10 @@
 	$conn->println("File Path = $filepath");
 	//upto this added to set the file path based on attachment created time
 
+	//In this file name (attachmentid_filename) the file will be stored in the harddisk
+	$moved_filename = $attach_id."_".$attach_name;
 	//write the contents in the file
-	$handle = @fopen($filepath.$attach_name,'w');
+	$handle = @fopen($filepath.$moved_filename,'w');
 	fputs($handle, base64_decode($attach_data));
 	fclose($handle);
 
@@ -2831,11 +2863,11 @@
 	{
 		if($val != '')
 		{
-			$conn->query("insert into ".$tablename. " values(null,'".$val."',".$i.",1)");
+			$conn->query("insert into vtiger_".$tablename. " values(null,'".$val."',".$i.",1)");
 		}
 		else
 		{
-			$conn->query("insert into ".$tablename. " values(null,'--None--',".$i.",1)");
+			$conn->query("insert into vtiger_".$tablename. " values(null,'--None--',".$i.",1)");
 		}
 		$i++;
 	}
@@ -2879,7 +2911,7 @@
 Execute($create_query28);
 
 
-$obj_array = Array('Leads'=>'leaddetails','Contacts'=>'contactdetails');
+$obj_array = Array('Leads'=>'vtiger_leaddetails','Contacts'=>'vtiger_contactdetails');
 $leadfieldid = $conn->query_result($conn->query("select fieldid from vtiger_field where tabid=7 and fieldname='email'"),0,'fieldid');
 $contactfieldid = $conn->query_result($conn->query("select fieldid from vtiger_field where tabid=4 and fieldname='email'"),0,'fieldid');
 $fieldid_array = Array("Leads"=>"$leadfieldid","Contacts"=>"$contactfieldid");
@@ -2985,7 +3017,7 @@
 $sec3="INSERT INTO vtiger_tab VALUES (28,'Webmails',0,25,'Webmails',null,null,1)";
 
 //Insert into vtiger_def_org_share tables
-$sec4="insert into vtiger_def_org_share values (".$conn->getUniqueID('def_org_share').",26,2,0)";	
+$sec4="insert into vtiger_def_org_share values (".$conn->getUniqueID('vtiger_def_org_share').",26,2,0)";	
 
 Execute($sec2);
 Execute($sec3);
@@ -2996,26 +3028,26 @@
 Execute("insert into vtiger_datashare_relatedmodules_seq values(1)");
 	
 //Lead Related Module
-Execute("insert into vtiger_datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",7,10)");
+Execute("insert into vtiger_datashare_relatedmodules values (".$conn->getUniqueID('vtiger_datashare_relatedmodules').",7,10)");
 
 //Account Related Module
-Execute("insert into vtiger_datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",6,2)");
-Execute("insert into vtiger_datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",6,13)");
-Execute("insert into vtiger_datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",6,20)");
-Execute("insert into vtiger_datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",6,22)");
-Execute("insert into vtiger_datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",6,23)");
-Execute("insert into vtiger_datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",6,10)");
+Execute("insert into vtiger_datashare_relatedmodules values (".$conn->getUniqueID('vtiger_datashare_relatedmodules').",6,2)");
+Execute("insert into vtiger_datashare_relatedmodules values (".$conn->getUniqueID('vtiger_datashare_relatedmodules').",6,13)");
+Execute("insert into vtiger_datashare_relatedmodules values (".$conn->getUniqueID('vtiger_datashare_relatedmodules').",6,20)");
+Execute("insert into vtiger_datashare_relatedmodules values (".$conn->getUniqueID('vtiger_datashare_relatedmodules').",6,22)");
+Execute("insert into vtiger_datashare_relatedmodules values (".$conn->getUniqueID('vtiger_datashare_relatedmodules').",6,23)");
+Execute("insert into vtiger_datashare_relatedmodules values (".$conn->getUniqueID('vtiger_datashare_relatedmodules').",6,10)");
 
 
 //Potential Related Module
-Execute("insert into vtiger_datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",2,20)");
-Execute("insert into vtiger_datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",2,22)");
+Execute("insert into vtiger_datashare_relatedmodules values (".$conn->getUniqueID('vtiger_datashare_relatedmodules').",2,20)");
+Execute("insert into vtiger_datashare_relatedmodules values (".$conn->getUniqueID('vtiger_datashare_relatedmodules').",2,22)");
 
 //Quote Related Module
-Execute("insert into vtiger_datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",20,22)");
+Execute("insert into vtiger_datashare_relatedmodules values (".$conn->getUniqueID('vtiger_datashare_relatedmodules').",20,22)");
 
 //SO Related Module
-Execute("insert into vtiger_datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",22,23)");
+Execute("insert into vtiger_datashare_relatedmodules values (".$conn->getUniqueID('vtiger_datashare_relatedmodules').",22,23)");
 	
 
 //By Don Ends
@@ -3036,7 +3068,7 @@
 }
 
 $insert_query_array27 = Array(
-	"insert into vtiger_relatedlists values(".$conn->getUniqueID('relatedlists').",13,0,'get_ticket_history',3,'Ticket History',0)",
+	"insert into vtiger_relatedlists values(".$conn->getUniqueID('vtiger_relatedlists').",13,0,'get_ticket_history',3,'Ticket History',0)",
 	"insert into vtiger_parenttabrel values (2,10,4)",
 	"insert into vtiger_parenttabrel values (4,10,7)"
 			     );
@@ -3056,38 +3088,38 @@
 "insert into vtiger_blocks values (80,29,'LBL_MORE_INFORMATION',2,0,0,0,0,0)",
 "insert into vtiger_blocks values (81,29,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)",
 
-"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'user_name','vtiger_users',1,'106','user_name','User Name',1,0,0,11,1,79,1,'V~M',1,null,'BAS')",
-"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'is_admin','vtiger_users',1,'156','is_admin','Admin',1,0,0,3,2,79,1,'V~O',1,null,'BAS')",
-"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'user_password','vtiger_users',1,'99','user_password','Password',1,0,0,30,3,79,4,'P~M',1,null,'BAS')",
-"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'confirm_password','vtiger_users',1,'99','confirm_password','Confirm Password',1,0,0,30,4,79,4,'P~M',1,null,'BAS')",
-"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'first_name','vtiger_users',1,'1','first_name','First Name',1,0,0,30,5,79,1,'V~O',1,null,'BAS')",
-"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'last_name','vtiger_users',1,'2','last_name','Last Name',1,0,0,30,6,79,1,'V~M',1,null,'BAS')",
-"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'roleid','vtiger_user2role',1,'98','roleid','Role',1,0,0,200,7,79,1,'V~M',1,null,'BAS')",
-"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'email1','vtiger_users',1,'104','email1','Email',1,0,0,100,9,79,1,'E~M',1,null,'BAS')",
-"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'status','vtiger_users',1,'115','status','Status',1,0,0,100,10,79,1,'V~O',1,null,'BAS')",
-"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'activity_view','vtiger_users',1,'15','activity_view','Default Activity View',1,0,0,100,13,79,1,'V~O',1,null,'BAS')",
-"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'lead_view','vtiger_users',1,'15','lead_view','Default Lead View',1,0,0,100,12,79,1,'V~O',1,null,'BAS')",
-"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'currency_id','vtiger_users',1,'116','currency_id','Currency',1,0,0,100,11,79,1,'I~O',1,null,'BAS')",
-"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'title','vtiger_users',1,'1','title','Title',1,0,0,50,1,80,1,'V~O',1,null,'BAS')",
-"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'phone_work','vtiger_users',1,'1','phone_work','Office Phone',1,0,0,50,2,80,1,'V~O',1,null,'BAS')",
-"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'department','vtiger_users',1,'1','department','Department',1,0,0,50,3,80,1,'V~O',1,null,'BAS')",
-"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'phone_mobile','vtiger_users',1,'1','phone_mobile','Mobile',1,0,0,50,4,80,1,'V~O',1,null,'BAS')",
-"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'reports_to_id','vtiger_users',1,'101','reports_to_id','Reports To',1,0,0,50,5,80,1,'V~O',1,null,'BAS')",
-"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'phone_other','vtiger_users',1,'1','phone_other','Other Phone',1,0,0,50,5,80,1,'V~O',1,null,'BAS')",
-"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'email2','vtiger_users',1,'13','email2','Other Email',1,0,0,100,6,80,1,'E~O',1,null,'BAS')",
-"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'phone_fax','vtiger_users',1,'1','phone_fax','Fax',1,0,0,50,7,80,1,'V~O',1,null,'BAS')",
-"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'yahoo_id','vtiger_users',1,'13','yahoo_id','Yahoo id',1,0,0,100,7,80,1,'E~O',1,null,'BAS')",
-"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'phone_home','vtiger_users',1,'1','phone_home','Home Phone',1,0,0,50,8,80,1,'V~O',1,null,'BAS')",
-"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'imagename','vtiger_users',1,'105','imagename','User Image',1,0,0,250,9,80,1,'V~O',1,null,'BAS')",
-"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'date_format','vtiger_users',1,'15','date_format','Date Format',1,0,0,30,10,80,1,'V~O',1,null,'BAS')",
-"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'tagcloud','vtiger_users',1,'103','tagcloud','Tag Cloud',1,0,0,250,13,80,1,'V~O',1,null,'BAS')",
-"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'signature','vtiger_users',1,'21','signature','Signature',1,0,0,250,11,80,1,'V~O',1,null,'BAS')",
-"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'description','vtiger_users',1,'21','description','Notes',1,0,0,250,12,80,1,'V~O',1,null,'BAS')",
-"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'address_street','vtiger_users',1,'21','address_street','Street Address',1,0,0,250,1,81,1,'V~O',1,null,'BAS')",
-"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'address_city','vtiger_users',1,'1','address_city','City',1,0,0,100,2,81,1,'V~O',1,null,'BAS')",
-"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'address_state','vtiger_users',1,'1','address_state','State',1,0,0,100,3,81,1,'V~O',1,null,'BAS')",
-"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'address_postalcode','vtiger_users',1,'1','address_postalcode','Postal Code',1,0,0,100,4,81,1,'V~O',1,null,'BAS')",
-"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'address_country','vtiger_users',1,'1','address_country','Country',1,0,0,100,5,81,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("vtiger_field").",'user_name','vtiger_users',1,'106','user_name','User Name',1,0,0,11,1,79,1,'V~M',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("vtiger_field").",'is_admin','vtiger_users',1,'156','is_admin','Admin',1,0,0,3,2,79,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("vtiger_field").",'user_password','vtiger_users',1,'99','user_password','Password',1,0,0,30,3,79,4,'P~M',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("vtiger_field").",'confirm_password','vtiger_users',1,'99','confirm_password','Confirm Password',1,0,0,30,4,79,4,'P~M',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("vtiger_field").",'first_name','vtiger_users',1,'1','first_name','First Name',1,0,0,30,5,79,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("vtiger_field").",'last_name','vtiger_users',1,'2','last_name','Last Name',1,0,0,30,6,79,1,'V~M',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("vtiger_field").",'roleid','vtiger_user2role',1,'98','roleid','Role',1,0,0,200,7,79,1,'V~M',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("vtiger_field").",'email1','vtiger_users',1,'104','email1','Email',1,0,0,100,9,79,1,'E~M',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("vtiger_field").",'status','vtiger_users',1,'115','status','Status',1,0,0,100,10,79,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("vtiger_field").",'activity_view','vtiger_users',1,'15','activity_view','Default Activity View',1,0,0,100,13,79,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("vtiger_field").",'lead_view','vtiger_users',1,'15','lead_view','Default Lead View',1,0,0,100,12,79,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("vtiger_field").",'currency_id','vtiger_users',1,'116','currency_id','Currency',1,0,0,100,11,79,1,'I~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("vtiger_field").",'title','vtiger_users',1,'1','title','Title',1,0,0,50,1,80,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("vtiger_field").",'phone_work','vtiger_users',1,'1','phone_work','Office Phone',1,0,0,50,2,80,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("vtiger_field").",'department','vtiger_users',1,'1','department','Department',1,0,0,50,3,80,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("vtiger_field").",'phone_mobile','vtiger_users',1,'1','phone_mobile','Mobile',1,0,0,50,4,80,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("vtiger_field").",'reports_to_id','vtiger_users',1,'101','reports_to_id','Reports To',1,0,0,50,5,80,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("vtiger_field").",'phone_other','vtiger_users',1,'1','phone_other','Other Phone',1,0,0,50,5,80,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("vtiger_field").",'email2','vtiger_users',1,'13','email2','Other Email',1,0,0,100,6,80,1,'E~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("vtiger_field").",'phone_fax','vtiger_users',1,'1','phone_fax','Fax',1,0,0,50,7,80,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("vtiger_field").",'yahoo_id','vtiger_users',1,'13','yahoo_id','Yahoo id',1,0,0,100,7,80,1,'E~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("vtiger_field").",'phone_home','vtiger_users',1,'1','phone_home','Home Phone',1,0,0,50,8,80,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("vtiger_field").",'imagename','vtiger_users',1,'105','imagename','User Image',1,0,0,250,9,80,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("vtiger_field").",'date_format','vtiger_users',1,'15','date_format','Date Format',1,0,0,30,10,80,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("vtiger_field").",'tagcloud','vtiger_users',1,'103','tagcloud','Tag Cloud',1,0,0,250,13,80,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("vtiger_field").",'signature','vtiger_users',1,'21','signature','Signature',1,0,0,250,11,80,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("vtiger_field").",'description','vtiger_users',1,'21','description','Notes',1,0,0,250,12,80,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("vtiger_field").",'address_street','vtiger_users',1,'21','address_street','Street Address',1,0,0,250,1,81,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("vtiger_field").",'address_city','vtiger_users',1,'1','address_city','City',1,0,0,100,2,81,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("vtiger_field").",'address_state','vtiger_users',1,'1','address_state','State',1,0,0,100,3,81,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("vtiger_field").",'address_postalcode','vtiger_users',1,'1','address_postalcode','Postal Code',1,0,0,100,4,81,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("vtiger_field").",'address_country','vtiger_users',1,'1','address_country','Country',1,0,0,100,5,81,1,'V~O',1,null,'BAS')",
 			 );
 foreach($user_query_array as $query)
 {
@@ -3157,6 +3189,20 @@
 //Queries to remove the rss categories
 Execute("drop table vtiger_rsscategory");
 Execute("delete from vtiger_field where tabid=24");
+
+//Added on 23-06-06
+Execute("insert into vtiger_field values (29,".$conn->getUniqueID("vtiger_field").",'hour_format','vtiger_users',1,'116','hour_format','Calendar Hour Format',1,0,0,100,13,79,3,'I~O',1,null,'BAS')");
+Execute("insert into vtiger_field values (29,".$conn->getUniqueID("vtiger_field").",'end_hour','vtiger_users',1,'116','end_hour','Day ends at',1,0,0,100,15,79,3,'I~O',1,null,'BAS')");
+Execute("insert into vtiger_field values (29,".$conn->getUniqueID("vtiger_field").",'start_hour','vtiger_users',1,'116','start_hour','Day starts at',1,0,0,100,14,79,3,'I~O',1,null,'BAS')");
+
+Execute("insert into vtiger_relatedlists values (".$conn->getUniqueID('vtiger_relatedlists').",".getTabid("Campaigns").",".getTabid("Potentials").",'get_opportunities',3,'Potentials',0)");
+Execute("insert into vtiger_relatedlists values(".$conn->getUniqueID('vtiger_relatedlists').",".getTabid("Campaigns").",9,'get_activities',4,'Activities',0)");
+
+Execute("insert into vtiger_field values (2,".$conn->getUniqueID("vtiger_field").",'campaignid','vtiger_potential',1,'58','campaignid','Campaign Source',1,0,0,100,12,1,1,'N~O',1,null,'BAS')");
+
+
+
+
 
 
 



From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 23 08:34:40 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 15:34:40 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7483 -
	/vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl
Message-ID: <20060623153440.CA29B7FDA81@vtiger.fosslabs.com>

Author: richie
Date: Fri Jun 23 09:34:37 2006
New Revision: 7483

Log:
picklist values come from language files if exists

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

Modified: vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl Fri Jun 23 09:34:37 2006
@@ -41,7 +41,14 @@
                     							   <select id="txtbox_{$label}" name="{$keyfldname}">
                     								{foreach item=arr from=$keyoptions}
                     									{foreach key=sel_value item=value from=$arr}
-                    										<option value="{$sel_value}" {$value}>{$sel_value}</option>
+												 <option value="{$sel_value}" {$value}>
+                                                {if $APP[$sel_value] neq ''}
+                                                        {$APP[$sel_value]}
+                                                {else}
+                                                        {$sel_value}
+                                                {/if}
+                                                </option>
+	
                     									{/foreach}
                     								{/foreach}
                     							   </select>



From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 11:33:07 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 18:33:07 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231364=3A?=
 =?utf-8?q?_Non_admin_user_can_jump_to_user_settings_by_point_to_url?=
Message-ID: <076.ff7d1fb05c8daa4389a7c4cc4877a33d@vtiger.fosslabs.com>

#1364: Non admin user can jump to user settings by point to url
----------------------------------------------+-----------------------------
 Reporter:  Brian Laughlin <brian at awnow.com>  |       Owner:  developer
     Type:  defect                            |      Status:  new      
 Priority:  critical                          |   Milestone:  5.0.0    
Component:  vtigercrm                         |     Version:  5.0.0    
 Keywords:  security                          |  
----------------------------------------------+-----------------------------
 /index.php?module=Administration&action=index

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1364>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 12:06:42 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 19:06:42 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231365=3A?=
	=?utf-8?q?_i18n_issue_at_tickets?=
Message-ID: <076.d396dbfd58922ae6f8f333a2a453043b@vtiger.fosslabs.com>

#1365: i18n issue at tickets
-----------------------+----------------------------------------------------
 Reporter:  anonymous  |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  major      |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 see screenshot attached; when editing at the detailview "or" is not
 translated

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1365>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 23 22:55:47 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 24 Jun 2006 05:55:47 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7484 - in /vtigercrm/trunk:
 Smarty/templates/RelatedListContents.tpl Smarty/templates/RelatedLists.tpl
 modules/Campaigns/CallRelatedList.php modules/Campaigns/LoadList.php
Message-ID: <20060624055547.D985683FABC@vtiger.fosslabs.com>

Author: mmbrich
Date: Fri Jun 23 23:55:34 2006
New Revision: 7484

Log:
ability to load lists from custom view

Added:
    vtigercrm/trunk/modules/Campaigns/LoadList.php
Modified:
    vtigercrm/trunk/Smarty/templates/RelatedListContents.tpl
    vtigercrm/trunk/Smarty/templates/RelatedLists.tpl
    vtigercrm/trunk/modules/Campaigns/CallRelatedList.php

Modified: vtigercrm/trunk/Smarty/templates/RelatedListContents.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/RelatedListContents.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/RelatedListContents.tpl Fri Jun 23 23:55:34 2006
@@ -35,6 +35,7 @@
 				{/if}
 			{elseif $header eq 'Leads'}
 				{if $MODULE eq 'Campaigns'}
+				{$LEADCVCOMBO} <span id="lead_list_button"><input title="Change" accessKey="" class="small" value="Load List" type="button"  name="button"></span>
 				<input title="Change" accessKey="" class="small" value="{$APP.LBL_SELECT_BUTTON_LABEL} {$APP.Lead}" LANGUAGE=javascript onclick='return window.open("index.php?module=Leads&return_module={$MODULE}&action=Popup&popuptype=detailview&select=enable&form=EditView&form_submit=false&recordid={$ID}","test","width=640,height=570,resizable=0,scrollbars=0");' type="button"  name="button">
 				{/if}
 				<input title="{$APP.LBL_ADD_NEW} {$APP.Lead}" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='Leads'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Lead}"></td>
@@ -45,6 +46,7 @@
 				<input title="{$APP.LBL_BULK_MAILS}" accessykey="F" class="small" onclick="this.form.action.value='sendmail';this.form.return_action.value='DetailView';this.form.module.value='Emails';this.form.return_module.value='Emails';" name="button" value="{$APP.LBL_BULK_MAILS}" type="submit">&nbsp;
 				<input title="Change" accessKey="" class="small" value="{$APP.LBL_SELECT_BUTTON_LABEL} {$APP.Contact}" LANGUAGE=javascript onclick='return window.open("index.php?module=Contacts&return_module=Emails&action=Popup&popuptype=detailview&form=EditView&form_submit=false&recordid={$ID}","test","width=640,height=570,resizable=0,scrollbars=0");' type="button"  name="button"></td>
 				{elseif $MODULE eq 'Campaigns'}
+				{$CONTCVCOMBO}  <span id="contact_list_button"><input title="Change" accessKey="" class="small" value="Load List" type="button"  name="button"></span>
 				<input title="Change" accessKey="" class="small" value="{$APP.LBL_SELECT_BUTTON_LABEL} {$APP.Contact}" LANGUAGE=javascript onclick='return window.open("index.php?module=Contacts&return_module={$MODULE}&action=Popup&popuptype=detailview&select=enable&form=EditView&form_submit=false&recordid={$ID}","test","width=640,height=570,resizable=0,scrollbars=0");' type="button"  name="button">
 				<input title="{$APP.LBL_ADD_NEW} {$APP.Contact}" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='Contacts'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Contact}"></td>
 				{else}

Modified: vtigercrm/trunk/Smarty/templates/RelatedLists.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/RelatedLists.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/RelatedLists.tpl Fri Jun 23 23:55:34 2006
@@ -47,6 +47,14 @@
                                 }
                         }
                 );
+}
+
+function loadCvList(type,id) {
+	if(type === 'Leads')
+		$("lead_list_button").innerHTML = '<input title="Change" accessKey="" class="small" value="Load List" type="button"  name="button" onclick="window.location.href=\'index.php?action=LoadList&module=Campaigns&return_id='+id+'&list_type='+type+'&cvid='+$("lead_cv_list").value+'\'">';
+
+	if(type === 'Contacts')
+		$("contact_list_button").innerHTML = '<input title="Change" accessKey="" class="small" value="Load List" type="button"  name="button" onclick="window.location.href=\'index.php?action=LoadList&module=Campaigns&return_id='+id+'&list_type='+type+'&cvid='+$("cont_cv_list").value+'\'">';
 }
 </script>
 {/literal}

Modified: vtigercrm/trunk/modules/Campaigns/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/Campaigns/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/Campaigns/CallRelatedList.php Fri Jun 23 23:55:34 2006
@@ -12,6 +12,7 @@
 
 require_once('Smarty_setup.php');
 require_once('modules/Campaigns/Campaign.php');
+require_once('modules/CustomView/CustomView.php');
 require_once('include/utils/utils.php');
 
 $focus = new Campaign();
@@ -47,6 +48,15 @@
 if (isset($focus->name)) $smarty->assign("NAME", $focus->name);
 $related_array=getRelatedLists($currentModule,$focus);
 $smarty->assign("RELATEDLISTS", $related_array);
+
+$cvObj = new CustomView("Contacts");
+$cvcombo = $cvObj->getCustomViewCombo();
+$smarty->assign("CONTCVCOMBO","<select id='cont_cv_list' onchange='loadCvList(\"Contacts\",".$_REQUEST["record"].");'><option>-- Select One --</option>".$cvcombo."</select>");
+
+$cvObj = new CustomView("Leads");
+$cvcombo = $cvObj->getCustomViewCombo();
+$smarty->assign("LEADCVCOMBO","<select id='lead_cv_list' onchange='loadCvList(\"Leads\",".$_REQUEST["record"].");'> <option>-- Select One --</option>".$cvcombo."</select>");
+
 $category = getParentTab();
 $smarty->assign("CATEGORY",$category);
 $smarty->assign("UPDATEINFO",updateInfo($focus->id));



From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 23 23:08:55 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 24 Jun 2006 06:08:55 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7485 -
	/vtigercrm/trunk/include/utils/DeleteUtils.php
Message-ID: <20060624060855.B6E4283FACB@vtiger.fosslabs.com>

Author: mmbrich
Date: Sat Jun 24 00:08:54 2006
New Revision: 7485

Log:
fix to remove entities from campaign related lists

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

Modified: vtigercrm/trunk/include/utils/DeleteUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/DeleteUtils.php (original)
+++ vtigercrm/trunk/include/utils/DeleteUtils.php Sat Jun 24 00:08:54 2006
@@ -27,8 +27,13 @@
 
 	switch($module):
 	case Leads:
-		$sql = 'delete from vtiger_seactivityrel where crmid = '.$record.' and activityid = '.$return_id;
-		$adb->query($sql);
+		if($return_module == "Campaigns") {
+			$sql = 'delete from vtiger_campaignleadrel where leadid='.$record.' and campaignid='.$return_id;
+			$adb->query($sql);
+		} else {
+			$sql = 'delete from vtiger_seactivityrel where crmid = '.$record.' and activityid = '.$return_id;
+			$adb->query($sql);
+		}
 	break;
 	case Accounts:
 		if($return_id!='')
@@ -46,6 +51,10 @@
 		if($return_module == 'Potentials' && $record != '' && $return_id != '')
 		{
 			$sql = 'delete from vtiger_contpotentialrel where contactid='.$record.' and potentialid='.$return_id;
+			$adb->query($sql);
+		}
+		if($return_module == "Campaigns") {
+			$sql = 'delete from vtiger_campaigncontrel where contactid='.$record.' and campaignid='.$return_id;
 			$adb->query($sql);
 		}
 		if($record != '' && $return_id != '')



From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 24 00:26:11 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 24 Jun 2006 07:26:11 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7486 -
	/vtigercrm/trunk/modules/Webmails/Save.php
Message-ID: <20060624072611.4D13183FAB9@vtiger.fosslabs.com>

Author: mmbrich
Date: Sat Jun 24 01:26:10 2006
New Revision: 7486

Log:
fix for Qualify action

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

Modified: vtigercrm/trunk/modules/Webmails/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Webmails/Save.php (original)
+++ vtigercrm/trunk/modules/Webmails/Save.php Sat Jun 24 01:26:10 2006
@@ -77,7 +77,8 @@
 
 
 //to save the email details in vtiger_emaildetails vtiger_tables
-$fieldid = $adb->query_result($adb->query('select vtiger_fieldid from vtiger_field where vtiger_tablename="contactdetails" and vtiger_fieldname="email" and columnname="email"'),0,'fieldid');
+$fieldid = $adb->query_result($adb->query('select fieldid from vtiger_field where tablename="contactdetails" and fieldname="email" and columnname="email"'),0,'fieldid');
+
 if($email->relationship != 0) {
 	$focus->column_fields['parent_id']=$email->relationship["id"].'@'.$fieldid.'|';
 



From vtiger-tickets at vtiger.fosslabs.com  Sat Jun 24 07:59:08 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sat, 24 Jun 2006 14:59:08 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231366=3A?=
 =?utf-8?q?_Regression_from_checkin=3A_r7242?=
Message-ID: <076.e82045fa698e99f442e05495b3973c2a@vtiger.fosslabs.com>

#1366: Regression from checkin: r7242
-----------------------+----------------------------------------------------
 Reporter:  briand     |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  major      |   Milestone:  4.2.5    
Component:  vtigercrm  |     Version:  4.2.4rc3 
 Keywords:             |  
-----------------------+----------------------------------------------------
 One of the changes in r7242 caused most of the language files to not load
 for the Home module. I was able to resolve the error by reinserting a line
 into include/utils.php. I reinserted line #272 from r7202 between lines
 #277 & #278 in r7242. I expect this only to impact modules that contain
 sub-sections from other modules.

 The impact of this regression is the loss of titles for all of the
 sections in the Home module. Patch to remediate is attached.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1366>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 24 12:45:11 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 24 Jun 2006 19:45:11 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7487 -
	/vtigercrm/trunk/soap/webforms.php
Message-ID: <20060624194511.025BA83FB47@vtiger.fosslabs.com>

Author: mmbrich
Date: Sat Jun 24 13:45:10 2006
New Revision: 7487

Log:
fix for broken include_path in new soap/ directory


Modified:
    vtigercrm/trunk/soap/webforms.php

Modified: vtigercrm/trunk/soap/webforms.php
==============================================================================
--- vtigercrm/trunk/soap/webforms.php (original)
+++ vtigercrm/trunk/soap/webforms.php Sat Jun 24 13:45:10 2006
@@ -9,6 +9,7 @@
 *
  ********************************************************************************/
 
+ini_set("include_path","../");
 require_once("config.php");
 require_once('include/logging.php');
 require_once('include/nusoap/nusoap.php');
@@ -18,7 +19,7 @@
 $log = &LoggerManager::getLogger('webforms');
 
 //$serializer = new XML_Serializer();
-$NAMESPACE = 'http://www.vtigercrm.com/vtigercrm';
+$NAMESPACE = 'http://www.vtiger.com/vtigercrm/';
 $server = new soap_server;
 
 $server->configureWSDL('vtigersoap');



From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 24 12:45:46 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 24 Jun 2006 19:45:46 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7488 -
	/vtigercrm/trunk/include/nusoap/nusoap.php
Message-ID: <20060624194546.E09D683FB4E@vtiger.fosslabs.com>

Author: mmbrich
Date: Sat Jun 24 13:45:44 2006
New Revision: 7488

Log:
in php5 soapclient is already declared, changed nusoap soapclient class to soapclient2

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

Modified: vtigercrm/trunk/include/nusoap/nusoap.php
==============================================================================
--- vtigercrm/trunk/include/nusoap/nusoap.php (original)
+++ vtigercrm/trunk/include/nusoap/nusoap.php Sat Jun 24 13:45:44 2006
@@ -35,7 +35,7 @@
 /* load classes
 
 // necessary classes
-require_once('class.soapclient.php');
+require_once('class.soapclient2.php');
 require_once('class.soap_val.php');
 require_once('class.soap_parser.php');
 require_once('class.soap_fault.php');
@@ -2824,7 +2824,7 @@
 			($http_status >= 400 && $http_status <= 417) ||
 			($http_status >= 501 && $http_status <= 505)
 		   ) {
-			$this->setError("Unsupported HTTP response status $http_status $http_reason (soapclient->response has contents of the response)");
+			$this->setError("Unsupported HTTP response status $http_status $http_reason (soapclient2->response has contents of the response)");
 			return false;
 		}
 
@@ -6387,24 +6387,24 @@
 
 /**
 *
-* soapclient higher level class for easy usage.
+* soapclient2 higher level class for easy usage.
 *
 * usage:
 *
 * // instantiate client with server info
-* $soapclient = new soapclient( string path [ ,boolean wsdl] );
+* $soapclient2 = new soapclient2( string path [ ,boolean wsdl] );
 *
 * // call method, get results
-* echo $soapclient->call( string methodname [ ,array parameters] );
+* echo $soapclient2->call( string methodname [ ,array parameters] );
 *
 * // bye bye client
-* unset($soapclient);
+* unset($soapclient2);
 *
 * @author   Dietrich Ayala <dietrich at ganx4.com>
 * @version  $Id: nusoap.php,v 1.94 2005/08/04 01:27:42 snichol Exp $
 * @access   public
 */
-class soapclient extends nusoap_base  {
+class soapclient2 extends nusoap_base  {
 
 	var $username = '';
 	var $password = '';
@@ -6471,7 +6471,7 @@
 	* @param	integer $response_timeout set the response timeout
 	* @access   public
 	*/
-	function soapclient($endpoint,$wsdl = false,$proxyhost = false,$proxyport = false,$proxyusername = false, $proxypassword = false, $timeout = 0, $response_timeout = 30){
+	function soapclient2($endpoint,$wsdl = false,$proxyhost = false,$proxyport = false,$proxyusername = false, $proxypassword = false, $timeout = 0, $response_timeout = 30){
 		parent::nusoap_base();
 		$this->endpoint = $endpoint;
 		$this->proxyhost = $proxyhost;
@@ -7051,7 +7051,7 @@
 				unset($paramCommentStr);
 			}
 		}
-		$evalStr = 'class soap_proxy_'.$r.' extends soapclient {
+		$evalStr = 'class soap_proxy_'.$r.' extends soapclient2 {
 	'.$evalStr.'
 }';
 		return $evalStr;



From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 24 12:48:22 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 24 Jun 2006 19:48:22 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7489 - in
 /vtigercrm/trunk/include/nusoap: class.nusoap_base.php class.soapclient.php
 nusoap.php
Message-ID: <20060624194823.39E8383FB52@vtiger.fosslabs.com>

Author: mmbrich
Date: Sat Jun 24 13:48:21 2006
New Revision: 7489

Log:
more soap fixes

Modified:
    vtigercrm/trunk/include/nusoap/class.nusoap_base.php
    vtigercrm/trunk/include/nusoap/class.soapclient.php
    vtigercrm/trunk/include/nusoap/nusoap.php

Modified: vtigercrm/trunk/include/nusoap/class.nusoap_base.php
==============================================================================
--- vtigercrm/trunk/include/nusoap/class.nusoap_base.php (original)
+++ vtigercrm/trunk/include/nusoap/class.nusoap_base.php Sat Jun 24 13:48:21 2006
@@ -902,4 +902,4 @@
 }
 
 
-?>
+?>

Modified: vtigercrm/trunk/include/nusoap/class.soapclient.php
==============================================================================
--- vtigercrm/trunk/include/nusoap/class.soapclient.php (original)
+++ vtigercrm/trunk/include/nusoap/class.soapclient.php Sat Jun 24 13:48:21 2006
@@ -5,24 +5,24 @@
 
 /**
 *
-* soapclient higher level class for easy usage.
+* soapclient2 higher level class for easy usage.
 *
 * usage:
 *
 * // instantiate client with server info
-* $soapclient = new soapclient( string path [ ,boolean wsdl] );
+* $soapclient2 = new soapclient2( string path [ ,boolean wsdl] );
 *
 * // call method, get results
-* echo $soapclient->call( string methodname [ ,array parameters] );
+* echo $soapclient2->call( string methodname [ ,array parameters] );
 *
 * // bye bye client
-* unset($soapclient);
+* unset($soapclient2);
 *
 * @author   Dietrich Ayala <dietrich at ganx4.com>
-* @version  $Id: class.soapclient.php,v 1.52 2005/07/27 19:24:42 snichol Exp $
+* @version  $Id: class.soapclient2.php,v 1.52 2005/07/27 19:24:42 snichol Exp $
 * @access   public
 */
-class soapclient extends nusoap_base  {
+class soapclient2 extends nusoap_base  {
 
 	var $username = '';
 	var $password = '';
@@ -89,7 +89,7 @@
 	* @param	integer $response_timeout set the response timeout
 	* @access   public
 	*/
-	function soapclient($endpoint,$wsdl = false,$proxyhost = false,$proxyport = false,$proxyusername = false, $proxypassword = false, $timeout = 0, $response_timeout = 30){
+	function soapclient2($endpoint,$wsdl = false,$proxyhost = false,$proxyport = false,$proxyusername = false, $proxypassword = false, $timeout = 0, $response_timeout = 30){
 		parent::nusoap_base();
 		$this->endpoint = $endpoint;
 		$this->proxyhost = $proxyhost;
@@ -669,7 +669,7 @@
 				unset($paramCommentStr);
 			}
 		}
-		$evalStr = 'class soap_proxy_'.$r.' extends soapclient {
+		$evalStr = 'class soap_proxy_'.$r.' extends soapclient2 {
 	'.$evalStr.'
 }';
 		return $evalStr;

Modified: vtigercrm/trunk/include/nusoap/nusoap.php
==============================================================================
--- vtigercrm/trunk/include/nusoap/nusoap.php (original)
+++ vtigercrm/trunk/include/nusoap/nusoap.php Sat Jun 24 13:48:21 2006
@@ -35,7 +35,7 @@
 /* load classes
 
 // necessary classes
-require_once('class.soapclient2.php');
+require_once('class.soapclient.php');
 require_once('class.soap_val.php');
 require_once('class.soap_parser.php');
 require_once('class.soap_fault.php');



From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 24 12:50:13 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 24 Jun 2006 19:50:13 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7490 - in
 /vtigercrm/trunk/include/nusoap: class.soap_transport_http.php
 nusoapmime.php
Message-ID: <20060624195014.22A9E83FB52@vtiger.fosslabs.com>

Author: mmbrich
Date: Sat Jun 24 13:50:12 2006
New Revision: 7490

Log:
hopefully the last SOAP fix

Modified:
    vtigercrm/trunk/include/nusoap/class.soap_transport_http.php
    vtigercrm/trunk/include/nusoap/nusoapmime.php

Modified: vtigercrm/trunk/include/nusoap/class.soap_transport_http.php
==============================================================================
--- vtigercrm/trunk/include/nusoap/class.soap_transport_http.php (original)
+++ vtigercrm/trunk/include/nusoap/class.soap_transport_http.php Sat Jun 24 13:50:12 2006
@@ -832,7 +832,7 @@
 			($http_status >= 400 && $http_status <= 417) ||
 			($http_status >= 501 && $http_status <= 505)
 		   ) {
-			$this->setError("Unsupported HTTP response status $http_status $http_reason (soapclient->response has contents of the response)");
+			$this->setError("Unsupported HTTP response status $http_status $http_reason (soapclient2->response has contents of the response)");
 			return false;
 		}
 
@@ -1035,4 +1035,4 @@
 }
 
 
-?>
+?>

Modified: vtigercrm/trunk/include/nusoap/nusoapmime.php
==============================================================================
--- vtigercrm/trunk/include/nusoap/nusoapmime.php (original)
+++ vtigercrm/trunk/include/nusoap/nusoapmime.php Sat Jun 24 13:50:12 2006
@@ -37,7 +37,7 @@
 require_once('Mail/mimePart.php');
 
 /**
-* soapclientmime client supporting MIME attachments defined at
+* soapclient2mime client supporting MIME attachments defined at
 * http://www.w3.org/TR/SOAP-attachments.  It depends on the PEAR Mail_MIME library.
 *
 * @author   Scott Nichol <snichol at sourceforge.net>
@@ -45,7 +45,7 @@
 * @version  $Id: nusoapmime.php,v 1.7 2005/07/27 19:24:42 snichol Exp $
 * @access   public
 */
-class soapclientmime extends soapclient {
+class soapclient2mime extends soapclient2 {
 	/**
 	 * @var array Each array element in the return is an associative array with keys
 	 * data, filename, contenttype, cid



From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 24 13:41:09 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 24 Jun 2006 20:41:09 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7491 - in
 /customerportal/trunk: include.php nusoap/lib/nusoap.php
Message-ID: <20060624204110.185CC3D178D@vtiger.fosslabs.com>

Author: mmbrich
Date: Sat Jun 24 14:41:08 2006
New Revision: 7491

Log:
fixes for soapclient already declared in php5

Modified:
    customerportal/trunk/include.php
    customerportal/trunk/nusoap/lib/nusoap.php

Modified: customerportal/trunk/include.php
==============================================================================
--- customerportal/trunk/include.php (original)
+++ customerportal/trunk/include.php Sat Jun 24 14:41:08 2006
@@ -15,7 +15,7 @@
 global $Server_Path;
 global $client;
 
-$client = new soapclient($Server_Path."/vtigerservice.php?service=customerportal", false, $proxy_host, $proxy_port, $proxy_username, $proxy_password);
+$client = new soapclient2($Server_Path."/vtigerservice.php?service=customerportal", false, $proxy_host, $proxy_port, $proxy_username, $proxy_password);
 
 
 ?>

Modified: customerportal/trunk/nusoap/lib/nusoap.php
==============================================================================
--- customerportal/trunk/nusoap/lib/nusoap.php (original)
+++ customerportal/trunk/nusoap/lib/nusoap.php Sat Jun 24 14:41:08 2006
@@ -4952,24 +4952,24 @@
 
 /**
 *
-* soapclient higher level class for easy usage.
+* soapclient2 higher level class for easy usage.
 *
 * usage:
 *
 * // instantiate client with server info
-* $soapclient = new soapclient( string path [ ,boolean wsdl] );
+* $soapclient2 = new soapclient2( string path [ ,boolean wsdl] );
 *
 * // call method, get results
-* echo $soapclient->call( string methodname [ ,array parameters] );
+* echo $soapclient2->call( string methodname [ ,array parameters] );
 *
 * // bye bye client
-* unset($soapclient);
+* unset($soapclient2);
 *
 * @author   Dietrich Ayala <dietrich at ganx4.com>
 * @version  $Id: nusoap.php,v 1.1 2005/04/29 05:09:16 sarajkumar Exp $
 * @access   public
 */
-class soapclient extends nusoap_base  {
+class soapclient2 extends nusoap_base  {
 
 	var $username = '';
 	var $password = '';
@@ -5021,7 +5021,7 @@
 	* @param	integer $response_timeout set the response timeout
 	* @access   public
 	*/
-	function soapclient($endpoint,$wsdl = false,$proxyhost = false,$proxyport = false,$proxyusername = false, $proxypassword = false, $timeout = 0, $response_timeout = 30){
+	function soapclient2($endpoint,$wsdl = false,$proxyhost = false,$proxyport = false,$proxyusername = false, $proxypassword = false, $timeout = 0, $response_timeout = 30){
 		$this->endpoint = $endpoint;
 		$this->proxyhost = $proxyhost;
 		$this->proxyport = $proxyport;
@@ -5506,7 +5506,7 @@
 			}
 		}
 		$r = rand();
-		$evalStr = 'class soap_proxy_'.$r.' extends soapclient {
+		$evalStr = 'class soap_proxy_'.$r.' extends soapclient2 {
 				'.$evalStr.'
 			}';
 		//print "proxy class:<pre>$evalStr</pre>";



From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 24 14:26:09 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 24 Jun 2006 21:26:09 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7492 - in
 /vtigercrm/trunk/soap: customerportal.php webforms.php
Message-ID: <20060624212609.DD8A383FB57@vtiger.fosslabs.com>

Author: mmbrich
Date: Sat Jun 24 15:26:08 2006
New Revision: 7492

Log:
changed back since I should be using vtigerservice.php to initiate

Modified:
    vtigercrm/trunk/soap/customerportal.php
    vtigercrm/trunk/soap/webforms.php

Modified: vtigercrm/trunk/soap/customerportal.php
==============================================================================
--- vtigercrm/trunk/soap/customerportal.php (original)
+++ vtigercrm/trunk/soap/customerportal.php Sat Jun 24 15:26:08 2006
@@ -9,6 +9,7 @@
 *
  ********************************************************************************/
 
+ini_set("include_path","../");
 require_once("config.php");
 require_once('include/logging.php');
 require_once('include/nusoap/nusoap.php');

Modified: vtigercrm/trunk/soap/webforms.php
==============================================================================
--- vtigercrm/trunk/soap/webforms.php (original)
+++ vtigercrm/trunk/soap/webforms.php Sat Jun 24 15:26:08 2006
@@ -9,7 +9,6 @@
 *
  ********************************************************************************/
 
-ini_set("include_path","../");
 require_once("config.php");
 require_once('include/logging.php');
 require_once('include/nusoap/nusoap.php');



From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 24 14:26:17 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 24 Jun 2006 21:26:17 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7493 -
	/vtigercrm/trunk/soap/customerportal.php
Message-ID: <20060624212617.6931783FB57@vtiger.fosslabs.com>

Author: mmbrich
Date: Sat Jun 24 15:26:16 2006
New Revision: 7493

Log:
changed back since I should be using vtigerservice.php to initiate

Modified:
    vtigercrm/trunk/soap/customerportal.php

Modified: vtigercrm/trunk/soap/customerportal.php
==============================================================================
--- vtigercrm/trunk/soap/customerportal.php (original)
+++ vtigercrm/trunk/soap/customerportal.php Sat Jun 24 15:26:16 2006
@@ -9,7 +9,6 @@
 *
  ********************************************************************************/
 
-ini_set("include_path","../");
 require_once("config.php");
 require_once('include/logging.php');
 require_once('include/nusoap/nusoap.php');



From vtiger-tickets at vtiger.fosslabs.com  Sat Jun 24 15:08:39 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sat, 24 Jun 2006 22:08:39 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231366=3A?=
 =?utf-8?q?_Regression_from_checkin=3A_r7242?=
In-Reply-To: <076.e82045fa698e99f442e05495b3973c2a@vtiger.fosslabs.com>
References: <076.e82045fa698e99f442e05495b3973c2a@vtiger.fosslabs.com>
Message-ID: <085.271cd36aebdee71440613029ad07aa56@vtiger.fosslabs.com>

#1366: Regression from checkin: r7242
------------------------+---------------------------------------------------
  Reporter:  briand     |       Owner:  developer
      Type:  defect     |      Status:  closed   
  Priority:  major      |   Milestone:  4.2.5    
 Component:  vtigercrm  |     Version:  4.2.4rc3 
Resolution:  fixed      |    Keywords:           
------------------------+---------------------------------------------------
Changes (by allanbush):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 (In [7494]) Including language files from sub modules when needed and
 avaiable.  Closes #1366.

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1366>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 24 15:08:39 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 24 Jun 2006 22:08:39 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7494 -
	/vtigercrm/branches/4.2/include/utils.php
Message-ID: <20060624220840.1F86083FB66@vtiger.fosslabs.com>

Author: allanbush
Date: Sat Jun 24 16:08:34 2006
New Revision: 7494

Log:
Including language files from sub modules when needed and avaiable.  Closes #1366.

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 Sat Jun 24 16:08:34 2006
@@ -274,6 +274,10 @@
 
 	$temp_mod_strings = $mod_strings;
 	$language_used = $language;
+
+	if(file_exists("modules/$module/language/$language.lang.php")) {
+		include("modules/$module/language/$language.lang.php");
+	}
 
 	if(!isset($mod_strings))
 	{



From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 24 20:35:37 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sun, 25 Jun 2006 03:35:37 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7495 -
	/vtigercrm/trunk/modules/Webmails/ListView.php
Message-ID: <20060625033537.5314283FBA0@vtiger.fosslabs.com>

Author: mmbrich
Date: Sat Jun 24 21:35:36 2006
New Revision: 7495

Log:
fix for msg counts

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

Modified: vtigercrm/trunk/modules/Webmails/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Webmails/ListView.php (original)
+++ vtigercrm/trunk/modules/Webmails/ListView.php Sat Jun 24 21:35:36 2006
@@ -285,13 +285,15 @@
                         $boxes .= '<option value="'.$tmpval.'" SELECTED>'.$tmpval;
 			$_SESSION["mailboxes"][$tmpval] = $new_msgs;
 
-			$folders .= '<li><img src="'.$image_path.'/'.$img.'" align="absmiddle" />&nbsp;&nbsp;<a href="javascript:changeMbox(\''.$tmpval.'\');" class="webMnu" onmouseover="show_remfolder(\''.$tmpval.'\');" onmouseout="show_remfolder(\''.$tmpval.'\');">'.$tmpval.'</a>&nbsp;&nbsp;<span id="'.$tmpval.'_count" style="font-weight:bold">(<span id="'.$tmpval.'_unread">'.$new_msgs.'</span> of <span id="'.$tmpval.'_read">'.$numEmails.'</span>)</span>&nbsp;&nbsp;<span id="remove_'.$tmpval.'" style="position:relative;display:none">Remove</span></li>';
+			if($numEmails==0) {$num=$numEmails;} else {$num=($numEmails-1);}
+			$folders .= '<li><img src="'.$image_path.'/'.$img.'" align="absmiddle" />&nbsp;&nbsp;<a href="javascript:changeMbox(\''.$tmpval.'\');" class="webMnu" onmouseover="show_remfolder(\''.$tmpval.'\');" onmouseout="show_remfolder(\''.$tmpval.'\');">'.$tmpval.'</a>&nbsp;&nbsp;<span id="'.$tmpval.'_count" style="font-weight:bold">(<span id="'.$tmpval.'_unread">'.$new_msgs.'</span> of <span id="'.$tmpval.'_read">'.$num.'</span>)</span>&nbsp;&nbsp;<span id="remove_'.$tmpval.'" style="position:relative;display:none">Remove</span></li>';
 		} else {
 			$box = imap_status($mbox, "{".$imapServerAddress."}".$tmpval, SA_ALL);
 			$_SESSION["mailboxes"][$tmpval] = $box->unseen;
 
+			if($box->messages==0) {$num=$box->messages;} else {$num=($box->messages-1);}
                       	$boxes .= '<option value="'.$tmpval.'">'.$tmpval;
-			$folders .= '<li><img src="'.$image_path.'/'.$img.'" align="absmiddle" />&nbsp;&nbsp;<a href="javascript:changeMbox(\''.$tmpval.'\');" class="webMnu">'.$tmpval.'</a>&nbsp;<span id="'.$tmpval.'_count" style="font-weight:bold">(<span id="'.$tmpval.'_unread">'.$box->unseen.'</span> of <span id="'.$tmpval.'_read">'.$box->messages.'</span>)</span></li>';
+			$folders .= '<li><img src="'.$image_path.'/'.$img.'" align="absmiddle" />&nbsp;&nbsp;<a href="javascript:changeMbox(\''.$tmpval.'\');" class="webMnu">'.$tmpval.'</a>&nbsp;<span id="'.$tmpval.'_count" style="font-weight:bold">(<span id="'.$tmpval.'_unread">'.$box->unseen.'</span> of <span id="'.$tmpval.'_read">'.$num.'</span>)</span></li>';
 		}
  	}
         $boxes .= '</select>';



From vtiger-tickets at vtiger.fosslabs.com  Sat Jun 24 20:48:36 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sun, 25 Jun 2006 03:48:36 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23771=3A_?=
 =?utf-8?q?Decouple_mandatory_field_company_from_new_lead_entry?=
In-Reply-To: <076.9c081c8880db9c6491564f6430caf363@vtiger.fosslabs.com>
References: <076.9c081c8880db9c6491564f6430caf363@vtiger.fosslabs.com>
Message-ID: <085.5021696e0c570f707295da54f444f058@vtiger.fosslabs.com>

#771: Decouple mandatory field company from new lead entry
------------------------------+---------------------------------------------
  Reporter:  brian at awnow.com  |       Owner:  developer                  
      Type:  enhancement      |      Status:  new                        
  Priority:  minor            |   Milestone:  5.0.0                      
 Component:  vtigercrm        |     Version:  5.0.1                      
Resolution:                   |    Keywords:  b2c workflow leads accounts
------------------------------+---------------------------------------------
Changes (by mmbrich):

  * priority:  major => minor
  * type:  defect => enhancement

Comment:

 This is a feature request, updated to reflect this.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/771>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Sun Jun 25 03:43:15 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sun, 25 Jun 2006 10:43:15 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7496 -
 /vtigercrm/trunk/modules/Calendar/language/en_us.lang.php
Message-ID: <20060625104315.88BF583FB0C@vtiger.fosslabs.com>

Author: saraj
Date: Sun Jun 25 04:43:11 2006
New Revision: 7496

Log:
Added consistent to do - ahmed

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

Modified: vtigercrm/trunk/modules/Calendar/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Calendar/language/en_us.lang.php Sun Jun 25 04:43:11 2006
@@ -174,13 +174,13 @@
 ),
 
 'LBL_EVENTS'=>'Events',
-'LBL_TODOS'=>'Todos',
+'LBL_TODOS'=>'To Dos',
 'LBL_TODO'=>'To Do',
 'LBL_TIME'=>'Time',
 'LBL_ADD_EVENT'=>'Add Event',
 'LBL_ADDCALL'=>'Add Call',
 'LBL_ADDMEETING'=>'Add Meeting',
-'LBL_ADDTODO'=>'Add Todo',
+'LBL_ADDTODO'=>'Add To Do',
 'LBL_INVITE'=>'Invite',
 'LBL_REMINDER'=>'Reminder',
 'LBL_SENDREMINDER'=>'Send Reminder',
@@ -194,7 +194,7 @@
 'LBL_HRVIEW'=>'Hour View',
 'LBL_LISTVIEW'=>'List View',
 'LBL_TOTALEVENTS'=>'Total Events :',
-'LBL_TOTALTODOS'=>'Total Todos :',
+'LBL_TOTALTODOS'=>'Total To Dos :',
 'LBL_EVTDTL'=>'Event Details',
 'LBL_ACTION'=>'Actions',
 'LBL_CURSTATUS'=>'Current Status',
@@ -221,7 +221,7 @@
 'LBL_SDRMD'=>'Send Reminder to',
 'LBL_ENABLE_REPEAT'=>'Enable Repeat',
 'LBL_REPEAT_ONCE'=>'Repeat once in every',
-'LBL_ADD_TODO'=>'Create Todo',
+'LBL_ADD_TODO'=>'Create To Do',
 'LBL_TODONAME'=>'To Do',
 'LBL_TODODATETIME'=>'Time & Date',
 



From vtigercrm-commits at vtiger.fosslabs.com  Sun Jun 25 04:14:12 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sun, 25 Jun 2006 11:14:12 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7497 -
 /vtigercrm/trunk/modules/System/templates/classic/classic.css
Message-ID: <20060625111412.CCD7883FB63@vtiger.fosslabs.com>

Author: saraj
Date: Sun Jun 25 05:14:09 2006
New Revision: 7497

Log:
Updated the system config css - ahmed

Modified:
    vtigercrm/trunk/modules/System/templates/classic/classic.css

Modified: vtigercrm/trunk/modules/System/templates/classic/classic.css
==============================================================================
--- vtigercrm/trunk/modules/System/templates/classic/classic.css (original)
+++ vtigercrm/trunk/modules/System/templates/classic/classic.css Sun Jun 25 05:14:09 2006
@@ -1,12 +1,9 @@
 A {
   text-decoration: none;
+	color:#003399;
 }
 A:link {
-  color: #486591;
-  background-color: transparent;
-}
-A:visited {
-  color: #6f6c81;
+	color:#003399;
   background-color: transparent;
 }
 A:active {



From vtigercrm-commits at vtiger.fosslabs.com  Sun Jun 25 04:17:26 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sun, 25 Jun 2006 11:17:26 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7498 - in
 /vtigercrm/trunk/Smarty/templates: SetMenu.tpl Settings.tpl
Message-ID: <20060625111726.89B9483FB63@vtiger.fosslabs.com>

Author: saraj
Date: Sun Jun 25 05:17:21 2006
New Revision: 7498

Log:
updates system info link

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

Modified: vtigercrm/trunk/Smarty/templates/SetMenu.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/SetMenu.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/SetMenu.tpl Sun Jun 25 05:17:21 2006
@@ -1,140 +1,145 @@
-<table border=0 cellspacing=0 cellpadding=20 width=90% class="settingsUI">
-<tr>
-<td valign=top>
-	<table border=0 cellspacing=0 cellpadding=0 width=100%>
-	<tr>
-	<td valign=top>
-		<!--Left Side Navigation Table-->
-		<table border=0 cellspacing=0 cellpadding=0 width=100%>
-				<tr><td class="settingsTabHeader" nowrap>{$MOD.LBL_USER_MANAGEMENT}</td></tr>
-				{if $smarty.request.action eq 'index' ||  $smarty.request.action eq 'DetailView' || $smarty.request.action eq 'EditView' }
-					<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_USERS}</td></tr>
-				{else}
-					<tr><td class="settingsTabList" nowrap><a href="index.php?module=Administration&action=index&parenttab=Settings">{$MOD.LBL_USERS}</a></td></tr>
-				{/if}
-
-				{if $smarty.request.action eq 'listroles' ||  $smarty.request.action eq 'RoleDetailView' ||  $smarty.request.action eq 'saverole' ||  $smarty.request.action eq 'createrole'} 		
-					<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_ROLES}</td></tr>
-				{else}	
-					<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=listroles&parenttab=Settings">{$MOD.LBL_ROLES}</a></td></tr>
-				{/if}
-
-				{if $smarty.request.action eq 'ListProfiles' || $smarty.request.action eq 'profilePrivileges' ||  $smarty.request.action eq 'CreateProfile' ||  $smarty.request.action eq 'SaveProfile' || $smarty.request.action eq 'UpdateProfileChanges' }
-					<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_PROFILES}</td></tr>
-				{else}
-					<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=ListProfiles&parenttab=Settings">{$MOD.LBL_PROFILES}</a></td></tr>
-				{/if}
-
-				{if $smarty.request.action eq 'listgroups' || $smarty.request.action eq 'GroupDetailView' || $smarty.request.action eq 'createnewgroup' || $smarty.request.action eq 'SaveGroup'}
-				<tr><td class="settingsTabSelected" nowrap>{$MOD.USERGROUPLIST}</td></tr>   	
-				{else}
-				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=listgroups&parenttab=Settings">{$MOD.USERGROUPLIST}</a></td></tr>
-				{/if}
-
-				{if  $smarty.request.action eq 'OrgSharingEditView' || $smarty.request.action eq 'OrgSharingDetailView' || $smarty.request.action eq 'SaveOrgSharing'}
-				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_SHARING_ACCESS}</td></tr>  	
-				{else}
-				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=OrgSharingDetailView&parenttab=Settings">{$MOD.LBL_SHARING_ACCESS}</a></td></tr>
-				{/if}
-
-				{if $smarty.request.action eq 'DefaultFieldPermissions' || $smarty.request.action eq 'UpdateDefaultFieldLevelAccess' || $smarty.request.action eq 'EditDefOrgFieldLevelAccess' }
-				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_FIELDS_ACCESS}</td></tr>
-				{else}
-				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=DefaultFieldPermissions&parenttab=Settings">{$MOD.LBL_FIELDS_ACCESS}</a></td></tr>
-				{/if}
-
-				{if $smarty.request.action eq 'ListModuleOwners' || $smarty.request.action eq 'SettingsAjax'}
-				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_MODULE_OWNERS}</td></tr>
-				{else}
-				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=ListModuleOwners&parenttab=Settings">{$MOD.LBL_MODULE_OWNERS}</a></td></tr>
-				{/if}
-
-				{if  $smarty.request.action eq 'Announcements' ||  $smarty.request.action eq 'UsersAjax' }
-				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_ANNOUNCEMENT}</td></tr>		
-				{else}
-				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=Announcements&parenttab=Settings">{$MOD.LBL_ANNOUNCEMENT}</a></td></tr>
-				{/if}
-	
-				<tr><td class="settingsTabHeader" nowrap>{$MOD.LBL_STUDIO}</td></tr>
-				{if  $smarty.request.action eq 'CustomFieldList' || $smarty.request.action eq 'LeadCustomFieldMapping'}
-				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_CUSTOM_FIELDS}</td></tr>
-				{else}
-				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=CustomFieldList&parenttab=Settings">{$MOD.LBL_CUSTOM_FIELDS}</a></td></tr>
-				{/if}
-				
-				{if  $smarty.request.action eq 'PickList' ||  $smarty.request.action eq 'SettingsAjax'}
-				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_PICKLIST_EDITOR}</td></tr>						     {else}
-				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=PickList&parenttab=Settings">{$MOD.LBL_PICKLIST_EDITOR}</a></td></tr>
-				{/if}
-	
-				<tr><td class="settingsTabHeader" nowrap>{$MOD.LBL_COMMUNICATION_TEMPLATES}</td></tr>
-
-				{if $smarty.request.action eq 'listemailtemplates' || $smarty.request.action eq 'detailviewemailtemplate' || $smarty.request.action eq 'editemailtemplate' || $smarty.request.action eq 'saveemailtemplate' || $smarty.request.action eq 'deleteemailtemplate' || $smarty.request.action eq 'createemailtemplate'}
-				<tr><td class="settingsTabSelected" nowrap>{$MOD.EMAILTEMPLATES}</td></tr>
-				{else}
-				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=listemailtemplates&parenttab=Settings">{$MOD.EMAILTEMPLATES}</a></td></tr>
-				{/if}
-
-				{if $smarty.request.action eq 'listwordtemplates' || $smarty.request.action eq 'add2db' || $smarty.request.action eq 'deletewordtemplate'}
-				<tr><td class="settingsTabSelected" nowrap>{$MOD.WORDINTEGRATION}</td></tr>
-				
-				{else}	
-				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=listwordtemplates&parenttab=Settings">{$MOD.WORDINTEGRATION}</a></td></tr>
-				{/if}
-
-				{if $smarty.request.action eq 'listnotificationschedulers' || $smarty.request.action eq 'UsersAjax'}
-				<tr><td class="settingsTabSelected" nowrap>{$MOD.NOTIFICATIONSCHEDULERS}</td></tr>
-				{else}
-				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=listnotificationschedulers&parenttab=Settings">{$MOD.NOTIFICATIONSCHEDULERS}</a></td></tr>
-				{/if}
-				
-				{if $smarty.request.action eq 'listinventorynotifications' || $smarty.request.action eq 'UsersAjax'}
-				<tr><td class="settingsTabSelected" nowrap>{$MOD.INVENTORYNOTIFICATION}</td></tr>
-				{else}	
-				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=listinventorynotifications&parenttab=Settings">{$MOD.INVENTORYNOTIFICATION}</a></td></tr>
-				{/if} 	
-
-				{if $smarty.request.action eq 'OrganizationTermsandConditions' || $smarty.request.action eq 'savetermsandconditions'}
-				<tr><td class="settingsTabSelected" nowrap>{$MOD.INVENTORYNOTIFICATION}</td></tr>
-				{else}
-				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=OrganizationTermsandConditions&parenttab=Settings">{$MOD.INVENTORYTERMSANDCONDITIONS}</a></td></tr>
-				{/if}
-
-	
-				<tr><td class="settingsTabHeader" nowrap>{$MOD.LBL_OTHER_SETTINGS}</td></tr>
-				{if $smarty.request.action eq 'OrganizationConfig' || $smarty.request.action eq 'EditCompanyDetails' || $smarty.request.action eq 'add2db'}
-				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_COMPANY_DETAILS}</td></tr>
-				{else}	
-				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=OrganizationConfig&parenttab=Settings">{$MOD.LBL_COMPANY_DETAILS}</a></td></tr>
-				{/if}
-				
-				{if  $smarty.request.action eq 'EmailConfig' ||  $smarty.request.action eq 'Save' }
-				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_MAIL_SERVER_SETTINGS}</td></tr>
-				{else}
-				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=EmailConfig&parenttab=Settings">{$MOD.LBL_MAIL_SERVER_SETTINGS}</a></td></tr>
-				{/if}
-				
-				{if $smarty.request.action eq 'BackupServerConfig' || $smarty.request.action eq 'index' || $smarty.request.action eq 'Save'}
-				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_BACKUP_SERVER_SETTINGS}</td></tr>
-				{else}
-				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=BackupServerConfig&parenttab=Settings">{$MOD.LBL_BACKUP_SERVER_SETTINGS}</a></td></tr>
-				{/if}
-				
-				{if $smarty.request.action eq 'CurrencyListView' ||  $smarty.request.action eq 'CurrencyEditView' ||  $smarty.request.action eq 'index' ||  $smarty.request.action eq 'SaveCurrencyInfo'}
-				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_CURRENCY_SETTINGS}</td></tr>
-				{else}
-				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=CurrencyListView&parenttab=Settings">{$MOD.LBL_CURRENCY_SETTINGS}</a></td></tr>
-				{/if}
-				
-				{if $smarty.request.action eq 'TaxConfig'}
-				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_TAX_SETTINGS}</td></tr>
-				{else}
-				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=TaxConfig&parenttab=Settings">{$MOD.LBL_TAX_SETTINGS}</a></td></tr>
-				{/if}
-				</table>
-			</td>
-			<td width=90% class="small settingsSelectedUI" valign=top >
-
-
-
-
+<table border=0 cellspacing=0 cellpadding=20 width=90% class="settingsUI">
+<tr>
+<td valign=top>
+	<table border=0 cellspacing=0 cellpadding=0 width=100%>
+	<tr>
+	<td valign=top>
+		<!--Left Side Navigation Table-->
+		<table border=0 cellspacing=0 cellpadding=0 width=100%>
+				<tr><td class="settingsTabHeader" nowrap>{$MOD.LBL_USER_MANAGEMENT}</td></tr>
+				{if $smarty.request.action eq 'index' ||  $smarty.request.action eq 'DetailView' || $smarty.request.action eq 'EditView' }
+					<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_USERS}</td></tr>
+				{else}
+					<tr><td class="settingsTabList" nowrap><a href="index.php?module=Administration&action=index&parenttab=Settings">{$MOD.LBL_USERS}</a></td></tr>
+				{/if}
+
+				{if $smarty.request.action eq 'listroles' ||  $smarty.request.action eq 'RoleDetailView' ||  $smarty.request.action eq 'saverole' ||  $smarty.request.action eq 'createrole'} 		
+					<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_ROLES}</td></tr>
+				{else}	
+					<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=listroles&parenttab=Settings">{$MOD.LBL_ROLES}</a></td></tr>
+				{/if}
+
+				{if $smarty.request.action eq 'ListProfiles' || $smarty.request.action eq 'profilePrivileges' ||  $smarty.request.action eq 'CreateProfile' ||  $smarty.request.action eq 'SaveProfile' || $smarty.request.action eq 'UpdateProfileChanges' }
+					<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_PROFILES}</td></tr>
+				{else}
+					<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=ListProfiles&parenttab=Settings">{$MOD.LBL_PROFILES}</a></td></tr>
+				{/if}
+
+				{if $smarty.request.action eq 'listgroups' || $smarty.request.action eq 'GroupDetailView' || $smarty.request.action eq 'createnewgroup' || $smarty.request.action eq 'SaveGroup'}
+				<tr><td class="settingsTabSelected" nowrap>{$MOD.USERGROUPLIST}</td></tr>   	
+				{else}
+				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=listgroups&parenttab=Settings">{$MOD.USERGROUPLIST}</a></td></tr>
+				{/if}
+
+				{if  $smarty.request.action eq 'OrgSharingEditView' || $smarty.request.action eq 'OrgSharingDetailView' || $smarty.request.action eq 'SaveOrgSharing'}
+				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_SHARING_ACCESS}</td></tr>  	
+				{else}
+				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=OrgSharingDetailView&parenttab=Settings">{$MOD.LBL_SHARING_ACCESS}</a></td></tr>
+				{/if}
+
+				{if $smarty.request.action eq 'DefaultFieldPermissions' || $smarty.request.action eq 'UpdateDefaultFieldLevelAccess' || $smarty.request.action eq 'EditDefOrgFieldLevelAccess' }
+				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_FIELDS_ACCESS}</td></tr>
+				{else}
+				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=DefaultFieldPermissions&parenttab=Settings">{$MOD.LBL_FIELDS_ACCESS}</a></td></tr>
+				{/if}
+
+				{if $smarty.request.action eq 'ListModuleOwners' || $smarty.request.action eq 'SettingsAjax'}
+				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_MODULE_OWNERS}</td></tr>
+				{else}
+				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=ListModuleOwners&parenttab=Settings">{$MOD.LBL_MODULE_OWNERS}</a></td></tr>
+				{/if}
+
+				{if  $smarty.request.action eq 'Announcements' ||  $smarty.request.action eq 'UsersAjax' }
+				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_ANNOUNCEMENT}</td></tr>		
+				{else}
+				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=Announcements&parenttab=Settings">{$MOD.LBL_ANNOUNCEMENT}</a></td></tr>
+				{/if}
+	
+				<tr><td class="settingsTabHeader" nowrap>{$MOD.LBL_STUDIO}</td></tr>
+				{if  $smarty.request.action eq 'CustomFieldList' || $smarty.request.action eq 'LeadCustomFieldMapping'}
+				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_CUSTOM_FIELDS}</td></tr>
+				{else}
+				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=CustomFieldList&parenttab=Settings">{$MOD.LBL_CUSTOM_FIELDS}</a></td></tr>
+				{/if}
+				
+				{if  $smarty.request.action eq 'PickList' ||  $smarty.request.action eq 'SettingsAjax'}
+				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_PICKLIST_EDITOR}</td></tr>						     {else}
+				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=PickList&parenttab=Settings">{$MOD.LBL_PICKLIST_EDITOR}</a></td></tr>
+				{/if}
+	
+				<tr><td class="settingsTabHeader" nowrap>{$MOD.LBL_COMMUNICATION_TEMPLATES}</td></tr>
+
+				{if $smarty.request.action eq 'listemailtemplates' || $smarty.request.action eq 'detailviewemailtemplate' || $smarty.request.action eq 'editemailtemplate' || $smarty.request.action eq 'saveemailtemplate' || $smarty.request.action eq 'deleteemailtemplate' || $smarty.request.action eq 'createemailtemplate'}
+				<tr><td class="settingsTabSelected" nowrap>{$MOD.EMAILTEMPLATES}</td></tr>
+				{else}
+				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=listemailtemplates&parenttab=Settings">{$MOD.EMAILTEMPLATES}</a></td></tr>
+				{/if}
+
+				{if $smarty.request.action eq 'listwordtemplates' || $smarty.request.action eq 'add2db' || $smarty.request.action eq 'deletewordtemplate'}
+				<tr><td class="settingsTabSelected" nowrap>{$MOD.EMAILTEMPLATES}</td></tr>
+				
+				{else}	
+				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=listwordtemplates&parenttab=Settings">{$MOD.WORDINTEGRATION}</a></td></tr>
+				{/if}
+
+				{if $smarty.request.action eq 'listnotificationschedulers' || $smarty.request.action eq 'UsersAjax'}
+				<tr><td class="settingsTabSelected" nowrap>{$MOD.NOTIFICATIONSCHEDULERS}</td></tr>
+				{else}
+				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=listnotificationschedulers&parenttab=Settings">{$MOD.NOTIFICATIONSCHEDULERS}</a></td></tr>
+				{/if}
+				
+				{if $smarty.request.action eq 'listinventorynotifications' || $smarty.request.action eq 'UsersAjax'}
+				<tr><td class="settingsTabSelected" nowrap>{$MOD.INVENTORYNOTIFICATION}</td></tr>
+				{else}	
+				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=listinventorynotifications&parenttab=Settings">{$MOD.INVENTORYNOTIFICATION}</a></td></tr>
+				{/if} 	
+
+				{if $smarty.request.action eq 'OrganizationTermsandConditions' || $smarty.request.action eq 'savetermsandconditions'}
+				<tr><td class="settingsTabSelected" nowrap>{$MOD.INVENTORYNOTIFICATION}</td></tr>
+				{else}
+				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=OrganizationTermsandConditions&parenttab=Settings">{$MOD.INVENTORYTERMSANDCONDITIONS}</a></td></tr>
+				{/if}
+
+	
+				<tr><td class="settingsTabHeader" nowrap>{$MOD.LBL_OTHER_SETTINGS}</td></tr>
+				{if $smarty.request.action eq 'OrganizationConfig' || $smarty.request.action eq 'EditCompanyDetails' || $smarty.request.action eq 'add2db'}
+				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_COMPANY_DETAILS}</td></tr>
+				{else}	
+				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=OrganizationConfig&parenttab=Settings">{$MOD.LBL_COMPANY_DETAILS}</a></td></tr>
+				{/if}
+				
+				{if  $smarty.request.action eq 'EmailConfig' ||  $smarty.request.action eq 'Save' }
+				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_MAIL_SERVER_SETTINGS}</td></tr>
+				{else}
+				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=EmailConfig&parenttab=Settings">{$MOD.LBL_MAIL_SERVER_SETTINGS}</a></td></tr>
+				{/if}
+				
+				{if $smarty.request.action eq 'BackupServerConfig' || $smarty.request.action eq 'index' || $smarty.request.action eq 'Save'}
+				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_BACKUP_SERVER_SETTINGS}</td></tr>
+				{else}
+				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=BackupServerConfig&parenttab=Settings">{$MOD.LBL_BACKUP_SERVER_SETTINGS}</a></td></tr>
+				{/if}
+				
+				{if $smarty.request.action eq 'CurrencyListView' ||  $smarty.request.action eq 'CurrencyEditView' ||  $smarty.request.action eq 'index' ||  $smarty.request.action eq 'SaveCurrencyInfo'}
+				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_CURRENCY_SETTINGS}</td></tr>
+				{else}
+				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=CurrencyListView&parenttab=Settings">{$MOD.LBL_CURRENCY_SETTINGS}</a></td></tr>
+				{/if}
+				
+				{if $smarty.request.action eq 'TaxConfig'}
+				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_TAX_SETTINGS}</td></tr>
+				{else}
+				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=TaxConfig&parenttab=Settings">{$MOD.LBL_TAX_SETTINGS}</a></td></tr>
+				{/if}
+				{if $smarty.request.action eq 'systemconfig'}
+				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_SYSTEM_INFO}</td></tr>
+				{else}
+				<tr><td class="settingsTabList" nowrap><a href="index.php?module=System&action=systemconfig&parenttab=Settings">{$MOD.LBL_SYSTEM_INFO}</a></td></tr>
+				{/if}
+				</table>
+			</td>
+			<td width=90% class="small settingsSelectedUI" valign=top >
+
+
+
+

Modified: vtigercrm/trunk/Smarty/templates/Settings.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Settings.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Settings.tpl Sun Jun 25 05:17:21 2006
@@ -1,519 +1,519 @@
-{*<!--
-/*********************************************************************************
-  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
-   * ("License"); You may not use this file except in compliance with the License
-   * The Original Code is:  vtiger CRM Open Source
-   * The Initial Developer of the Original Code is vtiger.
-   * Portions created by vtiger are Copyright (C) vtiger.
-   * All Rights Reserved.
-  *
- ********************************************************************************/
--->*}
-
-<style type="text/css">@import url(themes/blue/style.css);</style>
-<body class=small>
-<br>
-<table align="center" border="0" cellpadding="0" cellspacing="0" width="98%">
-<tbody><tr>
-        <td valign="top"><img src="themes/blue/images/showPanelTopLeft.gif"></td>
-	<td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
-	<br>
-	<div align=center>
-	<table border=0 cellspacing=0 cellpadding=10 width=90% class="settingsUI">
-	<tr>
-		<td>
-		<!-- heading -->
-
-		<span class="heading2">{$MOD.LBL_SETTINGS}</span>
-		</td>
-	</tr>
-	<tr>
-		<td>
-			<!--All Icons table -->
-			<table border=0 cellspacing=0 cellpadding=0 width=100%>
-			<tr>
-
-				<td class="settingsTabHeader">
-				<!-- Users & Access Management -->
-					{$MOD.LBL_USER_MANAGEMENT}	
-				</td>
-			</tr>
-			<tr>
-				<td class="settingsIconDisplay small">
-				<!-- Icons for Users & Access Management -->
-				
-				<table border=0 cellspacing=0 cellpadding=10 width=100%>
-
-				<tr>
-					<td width=25% valign=top>
-					<!-- icon 1-->
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=Administration&action=index&parenttab=Settings"><img src="{$IMAGE_PATH}ico-users.gif" alt="{$MOD.LBL_USERS}" width="48" height="48" border=0 title="{$MOD.LBL_USERS}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Administration&action=index&parenttab=Settings">{$MOD.LBL_USERS}</a></td>
-						</tr>
-
-						<tr>
-							<td class="small" valign=top>{$MOD.LBL_USER_DESCRIPTION}</td>
-						</tr>
-						</table>
-					</td>
-					<td width=25% valign=top>
-					<!-- icon 2-->
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-
-						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=Users&action=listroles&parenttab=Settings"><img src="{$IMAGE_PATH}ico-roles.gif" alt="{$MOD.LBL_ROLES}" width="48" height="48" border=0 title="{$MOD.LBL_ROLES}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Users&action=listroles&parenttab=Settings">{$MOD.LBL_ROLES}</a></td>
-						</tr>
-						<tr>
-							<td class="small" valign=top>{$MOD.LBL_ROLE_DESCRIPTION}</td>
-						</tr>
-						</table>
-
-					</td>
-					<td width=25% valign=top>
-					<!-- icon 3-->
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=Users&action=ListProfiles&parenttab=Settings"><img src="{$IMAGE_PATH}ico-profile.gif" alt="{$MOD.LBL_PROFILES}" width="48" height="48" border=0 title="{$MOD.LBL_PROFILES}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Users&action=ListProfiles&parenttab=Settings">{$MOD.LBL_PROFILES}</a></td>
-						</tr>
-
-						<tr>
-							<td class="small" valign=top>{$MOD.LBL_PROFILE_DESCRIPTION}</td>
-						</tr>
-						</table>
-					</td>
-					<td width=25% valign=top>
-					<!-- icon 4-->
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-
-						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=Users&action=listgroups&parenttab=Settings"><img src="{$IMAGE_PATH}ico-groups.gif" alt="{$MOD.USERGROUPLIST}" width="48" height="48" border=0 title="{$MOD.USERGROUPLIST}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Users&action=listgroups&parenttab=Settings">{$MOD.USERGROUPLIST}</a></td>
-						</tr>
-						<tr>
-							<td class="small" valign=top>{$MOD.LBL_GROUP_DESCRIPTION}</td>
-						</tr>
-						</table>
-
-					</td>
-				</tr>
-				<!-- Row 2 -->
-				<tr>
-					<td width=25% valign=top>
-					<!-- icon 5-->
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=Users&action=OrgSharingDetailView&parenttab=Settings"><img src="{$IMAGE_PATH}shareaccess.gif" alt="{$MOD.LBL_SHARING_ACCESS}" width="48" height="48" border=0 title="{$MOD.LBL_SHARING_ACCESS}"></a></td>
-
-							<td class=big valign=top><a href="index.php?module=Users&action=OrgSharingDetailView&parenttab=Settings">{$MOD.LBL_SHARING_ACCESS}</a></td>
-						</tr>
-						<tr>
-							<td class="small" valign=top>{$MOD.LBL_SHARING_ACCESS_DESCRIPTION}</td>
-						</tr>
-						</table>
-					</td>
-					<td width=25% valign=top>
-
-					<!-- icon 6 -->
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=Users&action=DefaultFieldPermissions&parenttab=Settings"><img src="{$IMAGE_PATH}orgshar.gif" alt="Fields to be shown" width="48" height="48" border=0 title="Fields to be shown"></a></td>
-							<td class=big valign=top><a href="index.php?module=Users&action=DefaultFieldPermissions&parenttab=Settings">{$MOD.LBL_FIELDS_ACCESS}</a></td>
-						</tr>
-						<tr>
-							<td class="small" valign=top>{$MOD.LBL_SHARING_FIELDS_DESCRIPTION}</td>
-
-						</tr>
-						</table>
-					</td>
-					<td width=25% valign=top>
-					<!-- icon 7-->
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=ListModuleOwners&parenttab=Settings"><img src="{$IMAGE_PATH}assign.gif" alt="{$MOD.LBL_ASSIGN_MODULE_OWNERS}" width="48" height="48" border=0 title="{$MOD.LBL_ASSIGN_MODULE_OWNERS}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Settings&action=ListModuleOwners&parenttab=Settings">{$MOD.LBL_MODULE_OWNERS}</a></td>
-
-						</tr>
-						<tr>
-							<td class="small" valign=top>{$MOD.LBL_MODULE_OWNERS_DESCRIPTION}</td>
-						</tr>
-						</table>
-					</td>
-					<td width=25% valign=top>
-					<!-- icon 8-->
-
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=Users&action=Announcements&parenttab=Settings"><img src="{$IMAGE_PATH}announ.gif" alt="{$MOD.LBL_ANNOUNCEMENT}" width="48" height="48" border=0 title="{$MOD.LBL_ANNOUNCEMENT}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Users&action=Announcements&parenttab=Settings">{$MOD.LBL_ANNOUNCEMENT}</a></td>
-						</tr>
-						<tr>
-							<td class="small" valign=top>{$MOD.LBL_ANNOUNCEMENT_DESCRIPTION}</td>
-						</tr>
-
-						</table>
-					</td>
-				</tr>
-				</table>
-				
-				
-				</td>
-			</tr>
-
-
-			<tr>
-				<td class="settingsTabHeader">
-
-				<!-- Studio  -->
-					{$MOD.LBL_STUDIO}	
-				</td>
-			</tr>
-			<tr>
-				<td class="settingsIconDisplay small">
-				<!-- Icons for Users & Access Management -->
-				
-				<table border=0 cellspacing=0 cellpadding=10 width=100%>
-				<tr>
-
-					<td width=25% valign=top>
-					<!-- icon 9-->
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=CustomFieldList&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}custom.gif" alt="{$MOD.LBL_CUSTOM_FIELDS}" title="{$MOD.LBL_CUSTOM_FIELDS}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Settings&action=CustomFieldList&parenttab=Settings">{$MOD.LBL_CUSTOM_FIELDS}</a></td>
-						</tr>
-						<tr>
-
-							<td class="small" valign=top>{$MOD.LBL_CUSTOM_FIELDS_DESCRIPTION}</td>
-						</tr>
-						</table>
-					</td>
-					<td width=25% valign=top>
-					<!-- icon 10-->
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-						<tr>
-
-							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=PickList&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}picklist.gif" alt="{$MOD.LBL_PICKLIST_EDITOR}" title="{$MOD.LBL_PICKLIST_EDITOR}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Settings&action=PickList&parenttab=Settings">{$MOD.LBL_PICKLIST_EDITOR}</a></td>
-						</tr>
-						<tr>
-							<td class="small" valign=top>{$MOD.LBL_PICKLIST_DESCRIPTION}</td>	
-						</tr>
-						</table>
-					</td>
-
-					<td width=25% valign=top>
-					<!-- empty-->
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-						<tr>
-							<td rowspan=2 valign=top>&nbsp;</td>
-							<td class=big valign=top>&nbsp;</td>
-						</tr>
-						<tr>
-							<td class="small" valign=top>&nbsp;</td>
-
-						</tr>
-						</table>
-					</td>
-					<td width=25% valign=top>
-					<!-- empty-->
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-						<tr>
-							<td rowspan=2 valign=top>&nbsp;</td>
-							<td class=big valign=top>&nbsp;</td>
-
-						</tr>
-						<tr>
-							<td class="small" valign=top>&nbsp;</td>
-						</tr>
-						</table>
-					</td>
-				</tr>
-				</table>
-				
-				
-				</td>
-
-			</tr>
-			
-			
-			
-			<tr>
-				<td class="settingsTabHeader">
-				<!-- Communication Templates -->
-					{$MOD.LBL_COMMUNICATION_TEMPLATES}
-				</td>
-			</tr>
-			<tr>
-				<td class="settingsIconDisplay small">
-
-				<!-- Icons for Communication Templates -->
-				
-				<table border=0 cellspacing=0 cellpadding=10 width=100%>
-				<tr>
-					<td width=25% valign=top>
-					<!-- icon 11-->
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=Users&action=listemailtemplates&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}ViewTemplate.gif" alt="{$MOD.EMAILTEMPLATES}" title="{$MOD.EMAILTEMPLATES}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Users&action=listemailtemplates&parenttab=Settings">{$MOD.EMAILTEMPLATES}</a></td>
-
-						</tr>
-						<tr>
-							<td class="small" valign=top>{$MOD.LBL_EMAIL_TEMPLATE_DESCRIPTION}</td>
-						</tr>
-						</table>
-					</td>
-					<td width=25% valign=top>
-					<!-- icon 12-->
-
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=Users&action=listwordtemplates&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}mailmarge.gif" alt="{$MOD.LBL_MAIL_MERGE}" title="{$MOD.LBL_MAIL_MERGE}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Users&action=listwordtemplates&parenttab=Settings">{$MOD.WORDINTEGRATION}</a></td>
-						</tr>
-						<tr>
-							<td class="small" valign=top>{$MOD.LBL_MAIL_MERGE_DESCRIPTION}</td>
-						</tr>
-
-						</table>
-					</td>
-					<td width=25% valign=top>
-					<!-- icon 13-->
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=Users&action=listnotificationschedulers&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}notification.gif" alt="{$MOD.NOTIFICATIONSCHEDULERS}" title="{$MOD.NOTIFICATIONSCHEDULERS}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Users&action=listnotificationschedulers&parenttab=Settings">{$MOD.NOTIFICATIONSCHEDULERS}</a></td>
-
-						</tr>
-						<tr>
-							<td class="small" valign=top>{$MOD.LBL_NOTIF_SCHED_DESCRIPTION}</td>
-						</tr>
-						</table>
-					</td>
-					<td width=25% valign=top>
-					<!-- icon 14-->
-
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=Users&action=listinventorynotifications&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}/inventory.gif" alt="{$MOD.INVENTORYNOTIFICATION}" title="{$MOD.INVENTORYNOTIFICATION}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Users&action=listinventorynotifications&parenttab=Settings">{$MOD.INVENTORYNOTIFICATION}</a></td>
-						</tr>
-						<tr>
-							<td class="small" valign=top>{$MOD.LBL_INV_NOTIF_DESCRIPTION}</td>
-						</tr>
-
-						</table>
-					</td>
-				</tr>
-				<!-- Row 2 -->
-				<tr>
-					<td width=25% valign=top>
-					<!-- icon 15-->
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-						<tr>
-
-							<td rowspan=2 valign=top><a href="index.php?module=Users&action=OrganizationTermsandConditions&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}terms.gif" alt="{$MOD.INVENTORYTERMSANDCONDITIONS}" title="{$MOD.INVENTORYTERMSANDCONDITIONS}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Users&action=OrganizationTermsandConditions&parenttab=Settings">{$MOD.INVENTORYTERMSANDCONDITIONS}</a></td>
-						</tr>
-						<tr>
-							<td class="small" valign=top>{$MOD.LBL_INV_TANDC_DESCRIPTION}</td>
-						</tr>
-						</table>
-
-					</td>
-					<td width=25% valign=top>
-					<!-- empty -->
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-						<tr>
-							<td rowspan=2 valign=top>&nbsp;</td>
-							<td class=big valign=top>&nbsp;</td>
-						</tr>
-						<tr>
-
-							<td class="small" valign=top>&nbsp;</td>
-						</tr>
-						</table>
-					</td>
-					<td width=25% valign=top>
-					<!-- empty-->
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-						<tr>
-							<td rowspan=2 valign=top>&nbsp;</td>
-
-							<td class=big valign=top>&nbsp;</td>
-						</tr>
-						<tr>
-							<td class="small" valign=top>&nbsp;</td>
-						</tr>
-						</table>
-					</td>
-					<td width=25% valign=top>
-					<!-- empty-->
-
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-						<tr>
-							<td rowspan=2 valign=top>&nbsp;</td>
-							<td class=big valign=top>&nbsp;</td>
-						</tr>
-						<tr>
-							<td class="small" valign=top>&nbsp;</td>
-						</tr>
-						</table>
-
-					</td>
-				</tr>
-				</table>
-				
-				
-				</td>
-			</tr>
-			<tr>
-				<td class="settingsTabHeader">
-				<!-- Other settings -->
-					{$MOD.LBL_OTHER_SETTINGS}
-				</td>
-
-			</tr>
-			<tr>
-				<td class="settingsIconDisplay small">
-				<!-- Icons for Other Settings-->
-				
-				<table border=0 cellspacing=0 cellpadding=10 width=100%>
-				<tr>
-					<td width=25% valign=top>
-					<!-- icon 16-->
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-
-						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=OrganizationConfig&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}company.gif" alt="{$MOD.LBL_COMPANY_DETAILS}" title="{$MOD.LBL_COMPANY_DETAILS}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Settings&action=OrganizationConfig&parenttab=Settings">{$MOD.LBL_COMPANY_DETAILS}</a></td>
-						</tr>
-						<tr>
-							<td class="small" valign=top>{$MOD.LBL_COMPANY_DESCRIPTION}</td>
-						</tr>
-						</table>
-
-					</td>
-					<td width=25% valign=top>
-					<!-- icon 17-->
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=EmailConfig&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}ogmailserver.gif" alt="{$MOD.LBL_MAIL_SERVER_SETTINGS}" title="{$MOD.LBL_MAIL_SERVER_SETTINGS}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Settings&action=EmailConfig&parenttab=Settings">{$MOD.LBL_MAIL_SERVER_SETTINGS}</a></td>
-						</tr>
-
-						<tr>
-							<td class="small" valign=top>{$MOD.LBL_MAIL_SERVER_DESCRIPTION}</td>
-						</tr>
-						</table>
-					</td>
-					<td width=25% valign=top>
-					<!-- icon 18-->
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-
-						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=BackupServerConfig&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}backupserver.gif" alt="{$MOD.LBL_BACKUP_SERVER_SETTINGS}" title="{$MOD.LBL_BACKUP_SERVER_SETTINGS}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Settings&action=BackupServerConfig&parenttab=Settings">{$MOD.LBL_BACKUP_SERVER_SETTINGS}</a></td>
-						</tr>
-						<tr>
-							<td class="small" valign=top>{$MOD.LBL_BACKUP_SERVER_DESCRIPTION}</td>
-						</tr>
-						</table>
-
-					</td>
-					<td width=25% valign=top>
-					<!-- icon 19-->
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=CurrencyListView&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}currency.gif" alt="{$MOD.LBL_CURRENCY_SETTINGS}" title="{$MOD.LBL_CURRENCY_SETTINGS}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Settings&action=CurrencyListView&parenttab=Settings">{$MOD.LBL_CURRENCY_SETTINGS}</a></td>
-						</tr>
-
-						<tr>
-							<td class="small" valign=top>{$MOD.LBL_CURRENCY_DESCRIPTION}</td>
-						</tr>
-						</table>
-					</td>
-				</tr>
-				<!-- Row 2 -->
-				<tr>
-
-					<td width=25% valign=top>
-					<!-- icon 20-->
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=TaxConfig&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}taxConfiguration.gif" alt="{$MOD.LBL_TAX_SETTINGS}" title="{$MOD.LBL_TAX_SETTINGS}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Settings&action=TaxConfig&parenttab=Settings">{$MOD.LBL_TAX_SETTINGS}</a></td>
-						</tr>
-						<tr>
-
-							<td class="small" valign=top>{$MOD.LBL_TAX_DESCRIPTION}</td>
-						</tr>
-						</table>
-					</td>
-					<td width=25% valign=top>
-					<!-- empty -->
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-						<tr>
-
-							<td rowspan=2 valign=top>&nbsp;</td>
-							<td class=big valign=top>&nbsp;</td>
-						</tr>
-						<tr>
-							<td class="small" valign=top>&nbsp;</td>
-						</tr>
-						</table>
-					</td>
-					<td width=25% valign=top>
-
-					<!-- empty-->
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-						<tr>
-							<td rowspan=2 valign=top>&nbsp;</td>
-							<td class=big valign=top>&nbsp;</td>
-						</tr>
-						<tr>
-							<td class="small" valign=top>&nbsp;</td>
-						</tr>
-
-						</table>
-					</td>
-					<td width=25% valign=top>
-					<!-- empty-->
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-						<tr>
-							<td rowspan=2 valign=top>&nbsp;</td>
-							<td class=big valign=top>&nbsp;</td>
-						</tr>
-
-						<tr>
-							<td class="small" valign=top>&nbsp;</td>
-						</tr>
-						</table>
-					</td>
-				</tr>
-				</table>
-				
-				
-				</td>
-			</tr>
-
-			</table>
-		
-		</td>
-	</tr>
-	</table>
-		
-	</div>
-
-	</td>
-        <td valign="top"><img src="themes/blue/images/showPanelTopRight.gif"></td>
-   </tr>
-</tbody></table>
-
-
-</body>
+{*<!--
+/*********************************************************************************
+  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
+   * ("License"); You may not use this file except in compliance with the License
+   * The Original Code is:  vtiger CRM Open Source
+   * The Initial Developer of the Original Code is vtiger.
+   * Portions created by vtiger are Copyright (C) vtiger.
+   * All Rights Reserved.
+  *
+ ********************************************************************************/
+-->*}
+
+<style type="text/css">@import url(themes/blue/style.css);</style>
+<body class=small>
+<br>
+<table align="center" border="0" cellpadding="0" cellspacing="0" width="98%">
+<tbody><tr>
+        <td valign="top"><img src="themes/blue/images/showPanelTopLeft.gif"></td>
+	<td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
+	<br>
+	<div align=center>
+	<table border=0 cellspacing=0 cellpadding=10 width=90% class="settingsUI">
+	<tr>
+		<td>
+		<!-- heading -->
+
+		<span class="heading2">{$MOD.LBL_SETTINGS}</span>
+		</td>
+	</tr>
+	<tr>
+		<td>
+			<!--All Icons table -->
+			<table border=0 cellspacing=0 cellpadding=0 width=100%>
+			<tr>
+
+				<td class="settingsTabHeader">
+				<!-- Users & Access Management -->
+					{$MOD.LBL_USER_MANAGEMENT}	
+				</td>
+			</tr>
+			<tr>
+				<td class="settingsIconDisplay small">
+				<!-- Icons for Users & Access Management -->
+				
+				<table border=0 cellspacing=0 cellpadding=10 width=100%>
+
+				<tr>
+					<td width=25% valign=top>
+					<!-- icon 1-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Administration&action=index&parenttab=Settings"><img src="{$IMAGE_PATH}ico-users.gif" alt="{$MOD.LBL_USERS}" width="48" height="48" border=0 title="{$MOD.LBL_USERS}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Administration&action=index&parenttab=Settings">{$MOD.LBL_USERS}</a></td>
+						</tr>
+
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_USER_DESCRIPTION}</td>
+						</tr>
+						</table>
+					</td>
+					<td width=25% valign=top>
+					<!-- icon 2-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Users&action=listroles&parenttab=Settings"><img src="{$IMAGE_PATH}ico-roles.gif" alt="{$MOD.LBL_ROLES}" width="48" height="48" border=0 title="{$MOD.LBL_ROLES}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Users&action=listroles&parenttab=Settings">{$MOD.LBL_ROLES}</a></td>
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_ROLE_DESCRIPTION}</td>
+						</tr>
+						</table>
+
+					</td>
+					<td width=25% valign=top>
+					<!-- icon 3-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Users&action=ListProfiles&parenttab=Settings"><img src="{$IMAGE_PATH}ico-profile.gif" alt="{$MOD.LBL_PROFILES}" width="48" height="48" border=0 title="{$MOD.LBL_PROFILES}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Users&action=ListProfiles&parenttab=Settings">{$MOD.LBL_PROFILES}</a></td>
+						</tr>
+
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_PROFILE_DESCRIPTION}</td>
+						</tr>
+						</table>
+					</td>
+					<td width=25% valign=top>
+					<!-- icon 4-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Users&action=listgroups&parenttab=Settings"><img src="{$IMAGE_PATH}ico-groups.gif" alt="{$MOD.USERGROUPLIST}" width="48" height="48" border=0 title="{$MOD.USERGROUPLIST}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Users&action=listgroups&parenttab=Settings">{$MOD.USERGROUPLIST}</a></td>
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_GROUP_DESCRIPTION}</td>
+						</tr>
+						</table>
+
+					</td>
+				</tr>
+				<!-- Row 2 -->
+				<tr>
+					<td width=25% valign=top>
+					<!-- icon 5-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Users&action=OrgSharingDetailView&parenttab=Settings"><img src="{$IMAGE_PATH}shareaccess.gif" alt="{$MOD.LBL_SHARING_ACCESS}" width="48" height="48" border=0 title="{$MOD.LBL_SHARING_ACCESS}"></a></td>
+
+							<td class=big valign=top><a href="index.php?module=Users&action=OrgSharingDetailView&parenttab=Settings">{$MOD.LBL_SHARING_ACCESS}</a></td>
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_SHARING_ACCESS_DESCRIPTION}</td>
+						</tr>
+						</table>
+					</td>
+					<td width=25% valign=top>
+
+					<!-- icon 6 -->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Users&action=DefaultFieldPermissions&parenttab=Settings"><img src="{$IMAGE_PATH}orgshar.gif" alt="Fields to be shown" width="48" height="48" border=0 title="Fields to be shown"></a></td>
+							<td class=big valign=top><a href="index.php?module=Users&action=DefaultFieldPermissions&parenttab=Settings">{$MOD.LBL_FIELDS_ACCESS}</a></td>
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_SHARING_FIELDS_DESCRIPTION}</td>
+
+						</tr>
+						</table>
+					</td>
+					<td width=25% valign=top>
+					<!-- icon 7-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=ListModuleOwners&parenttab=Settings"><img src="{$IMAGE_PATH}assign.gif" alt="{$MOD.LBL_ASSIGN_MODULE_OWNERS}" width="48" height="48" border=0 title="{$MOD.LBL_ASSIGN_MODULE_OWNERS}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Settings&action=ListModuleOwners&parenttab=Settings">{$MOD.LBL_MODULE_OWNERS}</a></td>
+
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_MODULE_OWNERS_DESCRIPTION}</td>
+						</tr>
+						</table>
+					</td>
+					<td width=25% valign=top>
+					<!-- icon 8-->
+
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Users&action=Announcements&parenttab=Settings"><img src="{$IMAGE_PATH}announ.gif" alt="{$MOD.LBL_ANNOUNCEMENT}" width="48" height="48" border=0 title="{$MOD.LBL_ANNOUNCEMENT}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Users&action=Announcements&parenttab=Settings">{$MOD.LBL_ANNOUNCEMENT}</a></td>
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_ANNOUNCEMENT_DESCRIPTION}</td>
+						</tr>
+
+						</table>
+					</td>
+				</tr>
+				</table>
+				
+				
+				</td>
+			</tr>
+
+
+			<tr>
+				<td class="settingsTabHeader">
+
+				<!-- Studio  -->
+					{$MOD.LBL_STUDIO}	
+				</td>
+			</tr>
+			<tr>
+				<td class="settingsIconDisplay small">
+				<!-- Icons for Users & Access Management -->
+				
+				<table border=0 cellspacing=0 cellpadding=10 width=100%>
+				<tr>
+
+					<td width=25% valign=top>
+					<!-- icon 9-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=CustomFieldList&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}custom.gif" alt="{$MOD.LBL_CUSTOM_FIELDS}" title="{$MOD.LBL_CUSTOM_FIELDS}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Settings&action=CustomFieldList&parenttab=Settings">{$MOD.LBL_CUSTOM_FIELDS}</a></td>
+						</tr>
+						<tr>
+
+							<td class="small" valign=top>{$MOD.LBL_CUSTOM_FIELDS_DESCRIPTION}</td>
+						</tr>
+						</table>
+					</td>
+					<td width=25% valign=top>
+					<!-- icon 10-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+
+							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=PickList&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}picklist.gif" alt="{$MOD.LBL_PICKLIST_EDITOR}" title="{$MOD.LBL_PICKLIST_EDITOR}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Settings&action=PickList&parenttab=Settings">{$MOD.LBL_PICKLIST_EDITOR}</a></td>
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_PICKLIST_DESCRIPTION}</td>	
+						</tr>
+						</table>
+					</td>
+
+					<td width=25% valign=top>
+					<!-- empty-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top>&nbsp;</td>
+							<td class=big valign=top>&nbsp;</td>
+						</tr>
+						<tr>
+							<td class="small" valign=top>&nbsp;</td>
+
+						</tr>
+						</table>
+					</td>
+					<td width=25% valign=top>
+					<!-- empty-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top>&nbsp;</td>
+							<td class=big valign=top>&nbsp;</td>
+
+						</tr>
+						<tr>
+							<td class="small" valign=top>&nbsp;</td>
+						</tr>
+						</table>
+					</td>
+				</tr>
+				</table>
+				
+				
+				</td>
+
+			</tr>
+			
+			
+			
+			<tr>
+				<td class="settingsTabHeader">
+				<!-- Communication Templates -->
+					{$MOD.LBL_COMMUNICATION_TEMPLATES}
+				</td>
+			</tr>
+			<tr>
+				<td class="settingsIconDisplay small">
+
+				<!-- Icons for Communication Templates -->
+				
+				<table border=0 cellspacing=0 cellpadding=10 width=100%>
+				<tr>
+					<td width=25% valign=top>
+					<!-- icon 11-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Users&action=listemailtemplates&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}ViewTemplate.gif" alt="{$MOD.EMAILTEMPLATES}" title="{$MOD.EMAILTEMPLATES}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Users&action=listemailtemplates&parenttab=Settings">{$MOD.EMAILTEMPLATES}</a></td>
+
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_EMAIL_TEMPLATE_DESCRIPTION}</td>
+						</tr>
+						</table>
+					</td>
+					<td width=25% valign=top>
+					<!-- icon 12-->
+
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Users&action=listwordtemplates&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}mailmarge.gif" alt="{$MOD.LBL_MAIL_MERGE}" title="{$MOD.LBL_MAIL_MERGE}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Users&action=listwordtemplates&parenttab=Settings">{$MOD.WORDINTEGRATION}</a></td>
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_MAIL_MERGE_DESCRIPTION}</td>
+						</tr>
+
+						</table>
+					</td>
+					<td width=25% valign=top>
+					<!-- icon 13-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Users&action=listnotificationschedulers&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}notification.gif" alt="{$MOD.NOTIFICATIONSCHEDULERS}" title="{$MOD.NOTIFICATIONSCHEDULERS}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Users&action=listnotificationschedulers&parenttab=Settings">{$MOD.NOTIFICATIONSCHEDULERS}</a></td>
+
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_NOTIF_SCHED_DESCRIPTION}</td>
+						</tr>
+						</table>
+					</td>
+					<td width=25% valign=top>
+					<!-- icon 14-->
+
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Users&action=listinventorynotifications&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}/inventory.gif" alt="{$MOD.INVENTORYNOTIFICATION}" title="{$MOD.INVENTORYNOTIFICATION}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Users&action=listinventorynotifications&parenttab=Settings">{$MOD.INVENTORYNOTIFICATION}</a></td>
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_INV_NOTIF_DESCRIPTION}</td>
+						</tr>
+
+						</table>
+					</td>
+				</tr>
+				<!-- Row 2 -->
+				<tr>
+					<td width=25% valign=top>
+					<!-- icon 15-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+
+							<td rowspan=2 valign=top><a href="index.php?module=Users&action=OrganizationTermsandConditions&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}terms.gif" alt="{$MOD.INVENTORYTERMSANDCONDITIONS}" title="{$MOD.INVENTORYTERMSANDCONDITIONS}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Users&action=OrganizationTermsandConditions&parenttab=Settings">{$MOD.INVENTORYTERMSANDCONDITIONS}</a></td>
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_INV_TANDC_DESCRIPTION}</td>
+						</tr>
+						</table>
+
+					</td>
+					<td width=25% valign=top>
+					<!-- empty -->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top>&nbsp;</td>
+							<td class=big valign=top>&nbsp;</td>
+						</tr>
+						<tr>
+
+							<td class="small" valign=top>&nbsp;</td>
+						</tr>
+						</table>
+					</td>
+					<td width=25% valign=top>
+					<!-- empty-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top>&nbsp;</td>
+
+							<td class=big valign=top>&nbsp;</td>
+						</tr>
+						<tr>
+							<td class="small" valign=top>&nbsp;</td>
+						</tr>
+						</table>
+					</td>
+					<td width=25% valign=top>
+					<!-- empty-->
+
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top>&nbsp;</td>
+							<td class=big valign=top>&nbsp;</td>
+						</tr>
+						<tr>
+							<td class="small" valign=top>&nbsp;</td>
+						</tr>
+						</table>
+
+					</td>
+				</tr>
+				</table>
+				
+				
+				</td>
+			</tr>
+			<tr>
+				<td class="settingsTabHeader">
+				<!-- Other settings -->
+					{$MOD.LBL_OTHER_SETTINGS}
+				</td>
+
+			</tr>
+			<tr>
+				<td class="settingsIconDisplay small">
+				<!-- Icons for Other Settings-->
+				
+				<table border=0 cellspacing=0 cellpadding=10 width=100%>
+				<tr>
+					<td width=25% valign=top>
+					<!-- icon 16-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=OrganizationConfig&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}company.gif" alt="{$MOD.LBL_COMPANY_DETAILS}" title="{$MOD.LBL_COMPANY_DETAILS}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Settings&action=OrganizationConfig&parenttab=Settings">{$MOD.LBL_COMPANY_DETAILS}</a></td>
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_COMPANY_DESCRIPTION}</td>
+						</tr>
+						</table>
+
+					</td>
+					<td width=25% valign=top>
+					<!-- icon 17-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=EmailConfig&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}ogmailserver.gif" alt="{$MOD.LBL_MAIL_SERVER_SETTINGS}" title="{$MOD.LBL_MAIL_SERVER_SETTINGS}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Settings&action=EmailConfig&parenttab=Settings">{$MOD.LBL_MAIL_SERVER_SETTINGS}</a></td>
+						</tr>
+
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_MAIL_SERVER_DESCRIPTION}</td>
+						</tr>
+						</table>
+					</td>
+					<td width=25% valign=top>
+					<!-- icon 18-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=BackupServerConfig&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}backupserver.gif" alt="{$MOD.LBL_BACKUP_SERVER_SETTINGS}" title="{$MOD.LBL_BACKUP_SERVER_SETTINGS}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Settings&action=BackupServerConfig&parenttab=Settings">{$MOD.LBL_BACKUP_SERVER_SETTINGS}</a></td>
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_BACKUP_SERVER_DESCRIPTION}</td>
+						</tr>
+						</table>
+
+					</td>
+					<td width=25% valign=top>
+					<!-- icon 19-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=CurrencyListView&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}currency.gif" alt="{$MOD.LBL_CURRENCY_SETTINGS}" title="{$MOD.LBL_CURRENCY_SETTINGS}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Settings&action=CurrencyListView&parenttab=Settings">{$MOD.LBL_CURRENCY_SETTINGS}</a></td>
+						</tr>
+
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_CURRENCY_DESCRIPTION}</td>
+						</tr>
+						</table>
+					</td>
+				</tr>
+				<!-- Row 2 -->
+				<tr>
+
+					<td width=25% valign=top>
+					<!-- icon 20-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=TaxConfig&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}taxConfiguration.gif" alt="{$MOD.LBL_TAX_SETTINGS}" title="{$MOD.LBL_TAX_SETTINGS}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Settings&action=TaxConfig&parenttab=Settings">{$MOD.LBL_TAX_SETTINGS}</a></td>
+						</tr>
+						<tr>
+
+							<td class="small" valign=top>{$MOD.LBL_TAX_DESCRIPTION}</td>
+						</tr>
+						</table>
+					</td>
+					<td width=25% valign=top>
+					<!-- empty -->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=System&action=systemconfig&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}system.gif" alt="{$MOD.LBL_SYSTEM_INFO}" title="{$MOD.LBL_SYSTEM_INFO}"></a></td>
+							<td class=big valign=top><a href="index.php?module=System&action=systemconfig&parenttab=Settings">{$MOD.LBL_SYSTEM_INFO}</a></td>
+
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_SYSTEM_DESCRIPTION}</td>
+						</tr>
+						</table>
+					</td>
+					<td width=25% valign=top>
+
+					<!-- empty-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top>&nbsp;</td>
+							<td class=big valign=top>&nbsp;</td>
+						</tr>
+						<tr>
+							<td class="small" valign=top>&nbsp;</td>
+						</tr>
+
+						</table>
+					</td>
+					<td width=25% valign=top>
+					<!-- empty-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top>&nbsp;</td>
+							<td class=big valign=top>&nbsp;</td>
+						</tr>
+
+						<tr>
+							<td class="small" valign=top>&nbsp;</td>
+						</tr>
+						</table>
+					</td>
+				</tr>
+				</table>
+				
+				
+				</td>
+			</tr>
+
+			</table>
+		
+		</td>
+	</tr>
+	</table>
+		
+	</div>
+
+	</td>
+        <td valign="top"><img src="themes/blue/images/showPanelTopRight.gif"></td>
+   </tr>
+</tbody></table>
+
+
+</body>



From vtigercrm-commits at vtiger.fosslabs.com  Sun Jun 25 04:19:39 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sun, 25 Jun 2006 11:19:39 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7499 -
 /vtigercrm/trunk/modules/Settings/language/en_us.lang.php
Message-ID: <20060625111939.0C7C283FB11@vtiger.fosslabs.com>

Author: saraj
Date: Sun Jun 25 05:19:36 2006
New Revision: 7499

Log:
Updated lang file

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 Sun Jun 25 05:19:36 2006
@@ -319,6 +319,7 @@
 'LBL_FTP'=>'FTP',
 
 'LBL_SYSTEM_CONFIG'=>'System Configuration',
+'LBL_SYSTEM_INFO'=>'System Information',
 
 'LBL_CURRENCY_CONFIGURATION'=>'- Currency Information',
 
@@ -635,6 +636,7 @@
 'LBL_BACKUP_SERVER_DESCRIPTION'=>'Edit settings of Backup Server',
 'LBL_CURRENCY_DESCRIPTION'=>'Manage Currencies and Exchange Rates',
 'LBL_TAX_DESCRIPTION'=>'Manage values for Sales tax, VAT etc',
+'LBL_SYSTEM_DESCRIPTION'=>'Display System Settings',
 'LBL_TAX_DESC'=>'Manage VAT and other tax settings',
 'LBL_COMPANY_DESC'=>'Information & Contact details of your company',
 'LBL_SELECT_LOGO'=>'Select new logo :',



From vtigercrm-commits at vtiger.fosslabs.com  Sun Jun 25 05:09:53 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sun, 25 Jun 2006 12:09:53 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7500 -
	/vtigercrm/trunk/Smarty/templates/SetMenu.tpl
Message-ID: <20060625120953.3F0E583FBD2@vtiger.fosslabs.com>

Author: saraj
Date: Sun Jun 25 06:09:49 2006
New Revision: 7500

Log:
update setmenu file

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

Modified: vtigercrm/trunk/Smarty/templates/SetMenu.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/SetMenu.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/SetMenu.tpl Sun Jun 25 06:09:49 2006
@@ -76,7 +76,7 @@
 				{/if}
 
 				{if $smarty.request.action eq 'listwordtemplates' || $smarty.request.action eq 'add2db' || $smarty.request.action eq 'deletewordtemplate'}
-				<tr><td class="settingsTabSelected" nowrap>{$MOD.EMAILTEMPLATES}</td></tr>
+				<tr><td class="settingsTabSelected" nowrap>{$MOD.WORDINTEGRATION}</td></tr>
 				
 				{else}	
 				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=listwordtemplates&parenttab=Settings">{$MOD.WORDINTEGRATION}</a></td></tr>



From vtigercrm-commits at vtiger.fosslabs.com  Sun Jun 25 08:56:57 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sun, 25 Jun 2006 15:56:57 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7501 -
	/vtigercrm/trunk/include/js/dtlviewajax.js
Message-ID: <20060625155657.49C7183FC35@vtiger.fosslabs.com>

Author: richie
Date: Sun Jun 25 09:56:53 2006
New Revision: 7501

Log:
Ajax edit added for assigned to field

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

Modified: vtigercrm/trunk/include/js/dtlviewajax.js
==============================================================================
--- vtigercrm/trunk/include/js/dtlviewajax.js (original)
+++ vtigercrm/trunk/include/js/dtlviewajax.js Sun Jun 25 09:56:53 2006
@@ -31,7 +31,7 @@
 	  else		
 	  	getObj(globaltxtboxid).checked = false; 
   }
-  else		  
+  else if(globaluitype != '53')	  
 	  getObj(globaltxtboxid).value = globaltempvalue; 
   globaltempvalue = '';
   itsonview=false;
@@ -42,7 +42,6 @@
 {
       var mouseArea="";
       mouseArea="mouseArea_"+ fieldLabel;
-      
       if(itsonview)
       {
             return;
@@ -52,7 +51,19 @@
 	  globaluitype = uitype;
       globaldtlviewspanid= "dtlview_"+ fieldLabel;//valuespanid;
       globaleditareaspanid="editarea_"+ fieldLabel;//textareapanid;
-      globaltxtboxid="txtbox_"+ fieldLabel;//textboxpanid;
+	  globalfieldlabel = fieldLabel;
+	  if(globaluitype == 53)
+	  {
+		  var assign_type_U = document.DetailView.assigntype[0].checked;
+		  var assign_type_G = document.DetailView.assigntype[1].checked;
+		  if(assign_type_U == true)
+			  globaltxtboxid= 'txtbox_U'+fieldLabel;
+		  else if(assign_type_G == true)
+			  globaltxtboxid= 'txtbox_G'+fieldLabel;
+	  }else
+	  {
+      	  globaltxtboxid="txtbox_"+ fieldLabel;//textboxpanid;
+	  }
       divObj = getObj('crmspanid'); 
       crmy = findPosY(getObj(mouseArea));
       crmx = findPosX(getObj(mouseArea));
@@ -72,8 +83,11 @@
 {
      show(globaleditareaspanid) ;
      fnhide(globaldtlviewspanid);
-	 globaltempvalue = getObj(globaltxtboxid).value;
-     getObj(globaltxtboxid).focus();
+	 if(globaluitype != 53)
+	 {
+		 globaltempvalue = getObj(globaltxtboxid).value;
+     	 getObj(globaltxtboxid).focus();
+	 }
      fnhide('crmspanid');
      itsonview=true;
      return false;
@@ -91,7 +105,26 @@
 {
 	var dtlView = "dtlview_"+ fieldLabel;
 	var editArea = "editarea_"+ fieldLabel;
-	var txtBox= "txtbox_"+ fieldLabel;
+	var groupurl = "";
+	if(globaluitype == 53)
+	{
+		var assign_type_U = document.DetailView.assigntype[0].checked;
+		var assign_type_G = document.DetailView.assigntype[1].checked;
+		if(assign_type_U == true)
+		{
+			var txtBox= 'txtbox_U'+fieldLabel;
+		}
+		else if(assign_type_G == true)
+		{
+			var txtBox= 'txtbox_G'+fieldLabel;
+			var group_name = $(txtBox).options[$(txtBox).selectedIndex].text; 
+			var groupurl = "&assigned_group_name="+group_name+"&assigntype=T"
+		}
+
+	}else
+	{
+		var txtBox= "txtbox_"+ fieldLabel;
+	}
 	var popupTxt= "popuptxt_"+ fieldLabel;      
 	var hdTxt = "hdtxt_"+ fieldLabel;
 
@@ -130,7 +163,7 @@
 
 
 	var data = "file=DetailViewAjax&module=" + module + "&action=" + module + "Ajax&record=" + crmId+"&recordid=" + crmId ;
-	data = data + "&fldName=" + fieldName + "&fieldValue=" + escape(tagValue) + "&ajxaction=DETAILVIEW";
+	data = data + "&fldName=" + fieldName + "&fieldValue=" + escape(tagValue) + "&ajxaction=DETAILVIEW"+groupurl;
 	new Ajax.Request(
 		'index.php',
                 {queue: {position: 'end', scope: 'command'},
@@ -159,13 +192,18 @@
 	else if(uitype == '53')
 	{
 		var hdObj = getObj(hdTxt);
-			if(isAdmin == "0")
-			{
-				getObj(dtlView).innerHTML = hdObj.value;
-			}else if(isAdmin == "1")
-			{
-				getObj(dtlView).innerHTML = "<a href=\"index.php?module=Users&action=DetailView&record="+tagValue+"\">"+hdObj.value+"&nbsp;</a>";;
-			}
+		var assign_type_U = document.DetailView.assigntype[0].checked;
+		var assign_type_G = document.DetailView.assigntype[1].checked;
+		if(isAdmin == "0")
+		{
+			getObj(dtlView).innerHTML = hdObj.value;
+		}else if(isAdmin == "1" && assign_type_U == true)
+		{
+			getObj(dtlView).innerHTML = "<a href=\"index.php?module=Users&action=DetailView&record="+tagValue+"\">"+hdObj.value+"&nbsp;</a>";
+		}else if(isAdmin == "1" && assign_type_G == true)
+		{
+			getObj(dtlView).innerHTML = "<a href=\"index.php?module=Users&action=GroupDetailView&groupId="+tagValue+"\">"+hdObj.value+"&nbsp;</a>";
+		}
 	}
 	else if(uitype == '56')
 	{
@@ -267,8 +305,19 @@
 }
 function setSelectValue(fieldLabel)
 {
+	if(globaluitype == 53)
+	{
+		var assign_type_U = document.DetailView.assigntype[0].checked;
+        var assign_type_G = document.DetailView.assigntype[1].checked;
+		if(assign_type_U == true)
+			var selCombo= 'txtbox_U'+fieldLabel;
+		else if(assign_type_G == true)	
+			var selCombo= 'txtbox_G'+fieldLabel;
+	}else
+	{
+			var selCombo= 'txtbox_'+fieldLabel;
+	}
 	var hdTxtBox = 'hdtxt_'+fieldLabel;
-	var selCombo= 'txtbox_'+fieldLabel;
 	var oHdTxtBox = document.getElementById(hdTxtBox);
 	var oSelCombo = document.getElementById(selCombo);
 



From vtigercrm-commits at vtiger.fosslabs.com  Sun Jun 25 08:59:03 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sun, 25 Jun 2006 15:59:03 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7502 -
	/vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl
Message-ID: <20060625155903.37D7383FC35@vtiger.fosslabs.com>

Author: richie
Date: Sun Jun 25 09:58:59 2006
New Revision: 7502

Log:
Ajax edit added for assigned to field

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

Modified: vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl Sun Jun 25 09:58:59 2006
@@ -41,14 +41,7 @@
                     							   <select id="txtbox_{$label}" name="{$keyfldname}">
                     								{foreach item=arr from=$keyoptions}
                     									{foreach key=sel_value item=value from=$arr}
-												 <option value="{$sel_value}" {$value}>
-                                                {if $APP[$sel_value] neq ''}
-                                                        {$APP[$sel_value]}
-                                                {else}
-                                                        {$sel_value}
-                                                {/if}
-                                                </option>
-	
+                    										<option value="{$sel_value}" {$value}>{$sel_value}</option>
                     									{/foreach}
                     								{/foreach}
                     							   </select>
@@ -184,22 +177,48 @@
                     <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">
 				
                     &nbsp;<span id="dtlview_{$label}">
-                    {if $keyseclink eq ''}
+                    {if $keyoptions.0 eq 'User' && $keyadmin eq 1}
+                        <a href="{$keyseclink.0}">{$keyval}</a>         
+                    {elseif $keyoptions.0 eq 'Group' && $keyadmin eq 1}
+                        <a href="{$keyseclink.1}">{$keyval}</a>         
+					{else}	
                         {$keyval}
-                    {else}
-                        <a href="{$keyseclink}">{$keyval}</a>         
                     {/if}
 					&nbsp;
                     </span>
                     <div id="editarea_{$label}" style="display:none;">
                    	<input type="hidden" id="hdtxt_{$label}" value="{$keyval}"></input>
-                   	<select id="txtbox_{$label}" onchange="setSelectValue('{$label}')" name="{$keyfldname}">
-                    {foreach item=arr key=id from=$keyoptions}
+					{if $keyoptions.0 eq 'User'}
+						<input name="assigntype" id="assigntype" checked="checked" value="U" onclick="toggleAssignType(this.value),setSelectValue('{$label}');" type="radio">&nbsp;User
+						<input name="assigntype" id="assigntype" value="T" onclick="toggleAssignType(this.value),setSelectValue('{$label}');" type="radio">&nbsp;Group
+						<span id="assign_user" style="display: block;">
+					{else}
+						<input name="assigntype" id="assigntype" value="U" onclick="toggleAssignType(this.value),setSelectValue('{$label}');" type="radio">&nbsp;User
+						<input name="assigntype" checked="checked" id="assigntype" value="T" onclick="toggleAssignType(this.value),setSelectValue('{$label}');" type="radio">&nbsp;Group
+						<span id="assign_user" style="display: none;">
+					{/if}
+                   	<select id="txtbox_U{$label}" onchange="setSelectValue('{$label}')" name="{$keyfldname}">
+                    {foreach item=arr key=id from=$keyoptions.1}
                     	{foreach key=sel_value item=value from=$arr}
                        		 <option value="{$id}" {$value}>{$sel_value}</option>
                         {/foreach}
                     {/foreach}
                     </select>
+					</span>
+					{if $keyoptions.0 eq 'Group'}
+						<span id="assign_team" style="display: block;">
+					{else}
+						<span id="assign_team" style="display: none;">
+					{/if}
+                   	<select id="txtbox_G{$label}" onchange="setSelectValue('{$label}')" name="{$keyfldname}">
+                    {foreach item=arr key=id from=$keyoptions.2}
+                    	{foreach key=sel_value item=value from=$arr}
+                       		 <option value="{$id}" {$value}>{$sel_value}</option>
+                        {/foreach}
+                    {/foreach}
+                    </select>
+					</span>
+
                     <br>
                     <input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');"/> or
                     <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>



From vtigercrm-commits at vtiger.fosslabs.com  Sun Jun 25 08:59:13 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sun, 25 Jun 2006 15:59:13 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7503 -
	/vtigercrm/trunk/include/utils/DetailViewUtils.php
Message-ID: <20060625155913.4F9B483FC35@vtiger.fosslabs.com>

Author: richie
Date: Sun Jun 25 09:59:09 2006
New Revision: 7503

Log:
Ajax edit added for assigned to field

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 Sun Jun 25 09:59:09 2006
@@ -165,43 +165,31 @@
 	elseif($uitype == 53)
 	{
 		$user_id = $col_fields[$fieldname];
+		$user_name = getUserName($user_id);
+		$id = $col_fields["record_id"];	
+		$module = $col_fields["record_module"];
+		$group_info = getGroupName($id, $module);
+		$groupname = $group_info[0];
+		$groupid = $group_info[1];
 		if($user_id != 0)
-		{
+		{	
 			$label_fld[] =$mod_strings[$fieldlabel].' '.$app_strings['LBL_USER'];
-			$user_name = getUserName($user_id);
-			if(is_admin($current_user))
-			{
-				$label_fld[] =$user_name;
-        $label_fld["secid"] = $user_id;
-		    $label_fld["link"] = "index.php?module=Users&action=DetailView&record=".$user_id;
-			}
-			else
-			{
-				$label_fld[] =$user_name;
-			}
-		}
-		elseif($user_id == 0)
-		{
+			$label_fld[] =$user_name;
+			$label_fld ["options"][] = 'User';
+		}else
+		{
+			
 			$label_fld[] =$mod_strings[$fieldlabel].' '.$app_strings['LBL_GROUP'];
-
-			$id = $col_fields["record_id"];	
-			$module = $col_fields["record_module"];
-			$group_info = getGroupName($id, $module);
-			$groupname = $group_info[0];
-			$groupid = $group_info[1];
-			if(is_admin($current_user))
-      {
-				$label_fld[] =$groupname;
-        $label_fld["secid"] = $groupid;
-        $label_fld["link"] = "index.php?module=Users&action=GroupDetailView&groupId=".$groupid;
-        //$label_fld[] ='<a href="index.php?module=Users&action=GroupDetailView&groupId='.$groupid.'">'.$groupname.'</a>';
-			}
-			else
-			{
-				$label_fld[] =$groupname;
-			}			
-		}
-		
+			$label_fld[] =$groupname;
+			$label_fld ["options"][] = 'Group';
+		}
+		if(is_admin($current_user))
+		{
+			$label_fld["secid"][] = $user_id;
+			$label_fld["link"][] = "index.php?module=Users&action=DetailView&record=".$user_id;
+			$label_fld["secid"][] = $groupid;
+			$label_fld["link"][] = "index.php?module=Users&action=GroupDetailView&groupId=".$groupid;
+		}
 		//Security Checks
 		if($fieldlabel == 'Assigned To' && $is_admin==false && $profileGlobalPermission[2] == 1 && ($defaultOrgSharingPermission[getTabid($module_name)] == 3 or $defaultOrgSharingPermission[getTabid($module_name)] == 0))
 		{
@@ -246,7 +234,7 @@
 				$team_style='display:none';
 			}	
 		}
-		
+
 		if($fieldlabel == 'Assigned To' && $is_admin==false && $profileGlobalPermission[2] == 1 && ($defaultOrgSharingPermission[getTabid($module_name)] == 3 or $defaultOrgSharingPermission[getTabid($module_name)] == 0))
 		{
 			$users_combo = get_select_options_array(get_user_array(FALSE, "Active", $assigned_user_id,'private'), $assigned_user_id);
@@ -255,9 +243,6 @@
 		{
 			$users_combo = get_select_options_array(get_user_array(FALSE, "Active", $assigned_user_id), $assigned_user_id);
 		}
-	
-    if($noof_group_rows != 0)
-		{
 			do
 			{
 				$groupname=$nameArray["groupname"];
@@ -269,18 +254,10 @@
 				$group_option[] = array($groupname=>$selected);
 
 			}while($nameArray = $adb->fetch_array($result));
-      
-		}
-		
-		if($user_id == 0)
-		{
-      $label_fld ["options"] = $group_option; 
-    }else
-    {
-      $label_fld ["options"] = $users_combo;
-    }
-    //print_r($users_combo);
-		
+
+
+			$label_fld ["options"][] = $users_combo;
+			$label_fld ["options"][] = $group_option; 
 	}
 	elseif($uitype == 55)
         {



From vtiger-tickets at vtiger.fosslabs.com  Sun Jun 25 09:00:27 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sun, 25 Jun 2006 16:00:27 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231356=3A?=
	=?utf-8?q?_Ajax_edit_issue?=
In-Reply-To: <076.f02a9fbd23d12bad75eedc90afaf903d@vtiger.fosslabs.com>
References: <076.f02a9fbd23d12bad75eedc90afaf903d@vtiger.fosslabs.com>
Message-ID: <085.7964693946e7638cc8b3eda157b92888@vtiger.fosslabs.com>

#1356: Ajax edit issue
---------------------------+------------------------------------------------
  Reporter:  jerrydgeorge  |       Owner:  jerrydgeorge
      Type:  defect        |      Status:  closed      
  Priority:  critical      |   Milestone:              
 Component:  vtigercrm     |     Version:  5.0.0       
Resolution:  fixed         |    Keywords:              
---------------------------+------------------------------------------------
Changes (by jerrydgeorge):

  * resolution:  => fixed
  * version:  5.0.1 => 5.0.0
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1356>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Sun Jun 25 09:00:38 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sun, 25 Jun 2006 16:00:38 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231008=3A?=
 =?utf-8?q?_assigned_to_group_is_not_coming_properly_in_ajax_edit?=
In-Reply-To: <076.6de5891dfeb7d1d2214d1225f8d87438@vtiger.fosslabs.com>
References: <076.6de5891dfeb7d1d2214d1225f8d87438@vtiger.fosslabs.com>
Message-ID: <085.7d0c5196d1461dc8da0f18c438050dd7@vtiger.fosslabs.com>

#1008: assigned to group is not coming properly in ajax edit
------------------------+---------------------------------------------------
  Reporter:  mangai     |       Owner:  jeri  
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by jerrydgeorge):

  * resolution:  => fixed
  * version:  5.0.1 => 5.0.0
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1008>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Sun Jun 25 09:02:26 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sun, 25 Jun 2006 16:02:26 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23968=3A_?=
 =?utf-8?q?Quick_Edit_of_Assigned_Group_not_functional?=
In-Reply-To: <076.66451d79109fe79c040c7aba7d66b2ee@vtiger.fosslabs.com>
References: <076.66451d79109fe79c040c7aba7d66b2ee@vtiger.fosslabs.com>
Message-ID: <085.e74ba670c04c276b4135f7b803d79c39@vtiger.fosslabs.com>

#968: Quick Edit of Assigned Group not functional
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  Richie
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by jerrydgeorge):

  * resolution:  => fixed
  * version:  5.0.1 => 5.0.0
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/968>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Sun Jun 25 22:39:18 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 26 Jun 2006 05:39:18 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231310=3A?=
 =?utf-8?q?_Translation_for_=22my_preference=22_=26_home_page?=
In-Reply-To: <076.a6a7ecaca440fce3cdf9dde7ec76ec0a@vtiger.fosslabs.com>
References: <076.a6a7ecaca440fce3cdf9dde7ec76ec0a@vtiger.fosslabs.com>
Message-ID: <085.3cfde6d83171073bd01441452dafabe5@vtiger.fosslabs.com>

#1310: Translation for "my preference" & home page
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  ahmed                                
      Type:  defect     |      Status:  closed                               
  Priority:  minor      |   Milestone:                                       
 Component:  vtigercrm  |     Version:  5.0.0                                
Resolution:  fixed      |    Keywords:  translation, homepage, my preferences
------------------------+---------------------------------------------------
Changes (by ahmed):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 Issue fixed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1310>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Sun Jun 25 22:40:01 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 26 Jun 2006 05:40:01 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231237=3A?=
 =?utf-8?q?_Usage_of_todos=2C_to-do=2C_To_Do?=
In-Reply-To: <076.cd52e3648a156e2549605fdddbbfdc7b@vtiger.fosslabs.com>
References: <076.cd52e3648a156e2549605fdddbbfdc7b@vtiger.fosslabs.com>
Message-ID: <085.6b305841770fc56a541dc6f694842179@vtiger.fosslabs.com>

#1237: Usage of todos, to-do, To Do
------------------------+---------------------------------------------------
  Reporter:  gopal      |       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 - Todos made consistent across the calendar module

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1237>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Sun Jun 25 22:42:33 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 05:42:33 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7504 -
	/vtigercrm/trunk/include/utils/CommonUtils.php
Message-ID: <20060626054233.F076583FC85@vtiger.fosslabs.com>

Author: richie
Date: Sun Jun 25 23:42:29 2006
New Revision: 7504

Log:
groupid added in get_group_options function

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 Jun 25 23:42:29 2006
@@ -265,7 +265,7 @@
 	global $log;
 	$log->debug("Entering get_group_options() method ...");
 	global $adb,$noof_group_rows;;
-	$sql = "select groupname from vtiger_groups";
+	$sql = "select groupname,groupid from vtiger_groups";
 	$result = $adb->query($sql);
 	$noof_group_rows=$adb->num_rows($result);
 	$log->debug("Exiting get_group_options method ...");



From vtigercrm-commits at vtiger.fosslabs.com  Sun Jun 25 22:42:58 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 05:42:58 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7505 -
	/vtigercrm/trunk/include/utils/UserInfoUtil.php
Message-ID: <20060626054258.C54C083FC95@vtiger.fosslabs.com>

Author: richie
Date: Sun Jun 25 23:42:54 2006
New Revision: 7505

Log:
groupid added in get_current_user_access_groups function 

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 Sun Jun 25 23:42:54 2006
@@ -4433,7 +4433,7 @@
 	global $adb,$noof_group_rows;
 	$current_user_group_list=getCurrentUserGroupList();
 	$sharing_write_group_list=getWriteSharingGroupsList($module);
-	$query ="select groupname from vtiger_groups";
+	$query ="select groupname,groupid from vtiger_groups";
 	if($current_user_group_list != '' && $sharing_write_group_list != '')
 	{
 		$query .= " where (groupid in".$current_user_group_list." or groupid in".$sharing_write_group_list.")";



From vtiger-tickets at vtiger.fosslabs.com  Sun Jun 25 22:46:01 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 26 Jun 2006 05:46:01 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231306=3A?=
 =?utf-8?q?_Missing_fields_in_detailview_for_other_langs?=
In-Reply-To: <076.9fc5d3aab2b86e9e74117e8341c6ee53@vtiger.fosslabs.com>
References: <076.9fc5d3aab2b86e9e74117e8341c6ee53@vtiger.fosslabs.com>
Message-ID: <085.0fa29f8e5d65d56e5672c4f60a8dec10@vtiger.fosslabs.com>

#1306: Missing fields in detailview for other langs
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  ahmed                 
      Type:  defect     |      Status:  new                   
  Priority:  minor      |   Milestone:                        
 Component:  vtigercrm  |     Version:  5.0.0                 
Resolution:             |    Keywords:  detailview, tranlation
------------------------+---------------------------------------------------
Comment (by ahmed):

 It is working fine in our setup, as the texts of detail view are all
 coming from the language file.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1306>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Sun Jun 25 22:49:43 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 05:49:43 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7506 - in /vtigercrm/trunk:
 Smarty/templates/DetailViewUI.tpl include/js/dtlviewajax.js
 include/utils/DetailViewUtils.php
Message-ID: <20060626054944.2DA0A83FC95@vtiger.fosslabs.com>

Author: richie
Date: Sun Jun 25 23:49:37 2006
New Revision: 7506

Log:
issue in ajax edit for assigned user

Modified:
    vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl
    vtigercrm/trunk/include/js/dtlviewajax.js
    vtigercrm/trunk/include/utils/DetailViewUtils.php

Modified: vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl Sun Jun 25 23:49:37 2006
@@ -190,7 +190,9 @@
                    	<input type="hidden" id="hdtxt_{$label}" value="{$keyval}"></input>
 					{if $keyoptions.0 eq 'User'}
 						<input name="assigntype" id="assigntype" checked="checked" value="U" onclick="toggleAssignType(this.value),setSelectValue('{$label}');" type="radio">&nbsp;User
-						<input name="assigntype" id="assigntype" value="T" onclick="toggleAssignType(this.value),setSelectValue('{$label}');" type="radio">&nbsp;Group
+						{if $keyoptions.2 neq ''}
+							<input name="assigntype" id="assigntype" value="T" onclick="toggleAssignType(this.value),setSelectValue('{$label}');" type="radio">&nbsp;Group
+						{/if}
 						<span id="assign_user" style="display: block;">
 					{else}
 						<input name="assigntype" id="assigntype" value="U" onclick="toggleAssignType(this.value),setSelectValue('{$label}');" type="radio">&nbsp;User

Modified: vtigercrm/trunk/include/js/dtlviewajax.js
==============================================================================
--- vtigercrm/trunk/include/js/dtlviewajax.js (original)
+++ vtigercrm/trunk/include/js/dtlviewajax.js Sun Jun 25 23:49:37 2006
@@ -54,12 +54,18 @@
 	  globalfieldlabel = fieldLabel;
 	  if(globaluitype == 53)
 	  {
-		  var assign_type_U = document.DetailView.assigntype[0].checked;
-		  var assign_type_G = document.DetailView.assigntype[1].checked;
-		  if(assign_type_U == true)
+		  if(typeof(document.DetailView.assigntype[0]) != 'undefined')
+		  {
+			  var assign_type_U = document.DetailView.assigntype[0].checked;
+			  var assign_type_G = document.DetailView.assigntype[1].checked;
+			  if(assign_type_U == true)
+				  globaltxtboxid= 'txtbox_U'+fieldLabel;
+			  else if(assign_type_G == true)
+				  globaltxtboxid= 'txtbox_G'+fieldLabel;
+		  }else
+		  {
 			  globaltxtboxid= 'txtbox_U'+fieldLabel;
-		  else if(assign_type_G == true)
-			  globaltxtboxid= 'txtbox_G'+fieldLabel;
+		  }
 	  }else
 	  {
       	  globaltxtboxid="txtbox_"+ fieldLabel;//textboxpanid;
@@ -108,8 +114,14 @@
 	var groupurl = "";
 	if(globaluitype == 53)
 	{
-		var assign_type_U = document.DetailView.assigntype[0].checked;
-		var assign_type_G = document.DetailView.assigntype[1].checked;
+		if(typeof(document.DetailView.assigntype[0]) != 'undefined')
+		{
+			var assign_type_U = document.DetailView.assigntype[0].checked;
+			var assign_type_G = document.DetailView.assigntype[1].checked;
+		}else
+		{
+			var assign_type_U = document.DetailView.assigntype.checked;
+		}
 		if(assign_type_U == true)
 		{
 			var txtBox= 'txtbox_U'+fieldLabel;
@@ -192,8 +204,14 @@
 	else if(uitype == '53')
 	{
 		var hdObj = getObj(hdTxt);
-		var assign_type_U = document.DetailView.assigntype[0].checked;
-		var assign_type_G = document.DetailView.assigntype[1].checked;
+		if(typeof(document.DetailView.assigntype[0]) != 'undefined')
+        {
+			var assign_type_U = document.DetailView.assigntype[0].checked;
+			var assign_type_G = document.DetailView.assigntype[1].checked;
+		}else
+		{
+			var assign_type_U = document.DetailView.assigntype.checked;
+		}
 		if(isAdmin == "0")
 		{
 			getObj(dtlView).innerHTML = hdObj.value;
@@ -307,12 +325,18 @@
 {
 	if(globaluitype == 53)
 	{
-		var assign_type_U = document.DetailView.assigntype[0].checked;
-        var assign_type_G = document.DetailView.assigntype[1].checked;
-		if(assign_type_U == true)
+		if(typeof(document.DetailView.assigntype[0]) != 'undefined')
+		{
+			var assign_type_U = document.DetailView.assigntype[0].checked;
+			var assign_type_G = document.DetailView.assigntype[1].checked;
+			if(assign_type_U == true)
+				var selCombo= 'txtbox_U'+fieldLabel;
+			else if(assign_type_G == true)	
+				var selCombo= 'txtbox_G'+fieldLabel;
+		}else
+		{
 			var selCombo= 'txtbox_U'+fieldLabel;
-		else if(assign_type_G == true)	
-			var selCombo= 'txtbox_G'+fieldLabel;
+		}
 	}else
 	{
 			var selCombo= 'txtbox_'+fieldLabel;

Modified: vtigercrm/trunk/include/utils/DetailViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/DetailViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/DetailViewUtils.php Sun Jun 25 23:49:37 2006
@@ -243,21 +243,21 @@
 		{
 			$users_combo = get_select_options_array(get_user_array(FALSE, "Active", $assigned_user_id), $assigned_user_id);
 		}
-			do
-			{
+			do{
 				$groupname=$nameArray["groupname"];
+				$group_id=$nameArray["groupid"];
 				$selected = '';	
 				if($groupname == $selected_groupname[0])
 				{
 					$selected = "selected";
 				}	
-				$group_option[] = array($groupname=>$selected);
-
+				if($groupname != '')
+					$group_option[$group_id] = array($groupname=>$selected);
 			}while($nameArray = $adb->fetch_array($result));
-
-
+			
 			$label_fld ["options"][] = $users_combo;
-			$label_fld ["options"][] = $group_option; 
+			if(count($group_option) >0)
+				$label_fld ["options"][] = $group_option; 
 	}
 	elseif($uitype == 55)
         {



From vtiger-tickets at vtiger.fosslabs.com  Sun Jun 25 23:27:32 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 26 Jun 2006 06:27:32 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231240=3A?=
 =?utf-8?q?_Office_Plugin_-_Change_Splash_screen?=
In-Reply-To: <076.25c934e0f37ff93790a99a1672638afb@vtiger.fosslabs.com>
References: <076.25c934e0f37ff93790a99a1672638afb@vtiger.fosslabs.com>
Message-ID: <085.7fb59119c19e422e926f51f48b630580@vtiger.fosslabs.com>

#1240: Office Plugin - Change Splash screen
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  ela  
      Type:  defect     |      Status:  new  
  Priority:  major      |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by jerrydgeorge):

  * owner:  jerrydgeorge => ela

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1240>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Sun Jun 25 23:36:16 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 26 Jun 2006 06:36:16 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231329=3A?=
	=?utf-8?q?_List_custom_view?=
In-Reply-To: <076.5bc833f86fff73d192c1a72d505bd83a@vtiger.fosslabs.com>
References: <076.5bc833f86fff73d192c1a72d505bd83a@vtiger.fosslabs.com>
Message-ID: <085.2fe98fe0898f7c1d53a933f7bc80d8ef@vtiger.fosslabs.com>

#1329: List custom view
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  jerrydgeorge
      Type:  defect     |      Status:  new         
  Priority:  critical   |   Milestone:              
 Component:  vtigercrm  |     Version:  5.0.0       
Resolution:             |    Keywords:              
------------------------+---------------------------------------------------
Changes (by jerrydgeorge):

  * owner:  developer => jerrydgeorge

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1329>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Sun Jun 25 23:37:00 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 26 Jun 2006 06:37:00 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231340=3A?=
 =?utf-8?q?_Firefox_extension=3A_Uninstall_not_working?=
In-Reply-To: <076.9c4f4fefce1fedb98255e8bbe4dd1210@vtiger.fosslabs.com>
References: <076.9c4f4fefce1fedb98255e8bbe4dd1210@vtiger.fosslabs.com>
Message-ID: <085.c7ca4dde0dec50a031c143b19127f7e6@vtiger.fosslabs.com>

#1340: Firefox extension: Uninstall not working
----------------------------+-----------------------------------------------
  Reporter:  gopal          |       Owner:  jerrydgeorge
      Type:  defect         |      Status:  new         
  Priority:  critical       |   Milestone:              
 Component:  vtigertoolbar  |     Version:  5.0.0       
Resolution:                 |    Keywords:              
----------------------------+-----------------------------------------------
Changes (by jerrydgeorge):

  * owner:  developer => jerrydgeorge

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1340>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Sun Jun 25 23:37:13 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 26 Jun 2006 06:37:13 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231364=3A?=
 =?utf-8?q?_Non_admin_user_can_jump_to_user_settings_by_point_to_url?=
In-Reply-To: <076.ff7d1fb05c8daa4389a7c4cc4877a33d@vtiger.fosslabs.com>
References: <076.ff7d1fb05c8daa4389a7c4cc4877a33d@vtiger.fosslabs.com>
Message-ID: <085.020f2e5d7a86826ee7438e6903663573@vtiger.fosslabs.com>

#1364: Non admin user can jump to user settings by point to url
-----------------------------------------------+----------------------------
  Reporter:  Brian Laughlin <brian at awnow.com>  |       Owner:  don     
      Type:  defect                            |      Status:  new     
  Priority:  critical                          |   Milestone:  5.0.0   
 Component:  vtigercrm                         |     Version:  5.0.0   
Resolution:                                    |    Keywords:  security
-----------------------------------------------+----------------------------
Changes (by jerrydgeorge):

  * owner:  developer => don

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1364>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Sun Jun 25 23:38:20 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 26 Jun 2006 06:38:20 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231326=3A?=
 =?utf-8?q?_Auto_Tax_and_quote_workflow_improvement?=
In-Reply-To: <076.151dc33d86c777ebfd974d4b1529c9ea@vtiger.fosslabs.com>
References: <076.151dc33d86c777ebfd974d4b1529c9ea@vtiger.fosslabs.com>
Message-ID: <085.be6f0c4d3a63446380dbf00497833589@vtiger.fosslabs.com>

#1326: Auto Tax and quote workflow improvement
------------------------+---------------------------------------------------
  Reporter:  mvhman     |       Owner:  mickie                  
      Type:  defect     |      Status:  new                     
  Priority:  major      |   Milestone:  5.0.0                   
 Component:  vtigercrm  |     Version:  5.0.0                   
Resolution:             |    Keywords:  auto tax improved quotes
------------------------+---------------------------------------------------
Changes (by jerrydgeorge):

  * owner:  developer => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1326>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Sun Jun 25 23:38:26 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 26 Jun 2006 06:38:26 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231328=3A?=
 =?utf-8?q?_Custom_picklist_sort_order?=
In-Reply-To: <076.4247da71e86ed63e936e2988bd008654@vtiger.fosslabs.com>
References: <076.4247da71e86ed63e936e2988bd008654@vtiger.fosslabs.com>
Message-ID: <085.e6c8fad7d85f5803b6168f231394472b@vtiger.fosslabs.com>

#1328: Custom picklist sort order
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  jerrydgeorge    
      Type:  defect     |      Status:  new             
  Priority:  major      |   Milestone:                  
 Component:  vtigercrm  |     Version:  5.0.0           
Resolution:             |    Keywords:  picklist, custom
------------------------+---------------------------------------------------
Changes (by jerrydgeorge):

  * owner:  developer => jerrydgeorge

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1328>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Sun Jun 25 23:38:51 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 26 Jun 2006 06:38:51 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231339=3A?=
 =?utf-8?q?_Missing_translation_for_search_results?=
In-Reply-To: <076.612780845c117cf5a7ac9d62d25b957d@vtiger.fosslabs.com>
References: <076.612780845c117cf5a7ac9d62d25b957d@vtiger.fosslabs.com>
Message-ID: <085.ba8f6e596abb3e576c2eccd27c87caf2@vtiger.fosslabs.com>

#1339: Missing translation for search results
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  ahmed
      Type:  defect     |      Status:  new  
  Priority:  major      |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by jerrydgeorge):

  * owner:  developer => ahmed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1339>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Sun Jun 25 23:39:25 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 26 Jun 2006 06:39:25 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231345=3A?=
 =?utf-8?q?_Error_saving_the_sales_order?=
In-Reply-To: <076.2d41a315f9cfd034311ac755935afb51@vtiger.fosslabs.com>
References: <076.2d41a315f9cfd034311ac755935afb51@vtiger.fosslabs.com>
Message-ID: <085.b1639d6f3be53174703bbab95552021f@vtiger.fosslabs.com>

#1345: Error saving the sales order
------------------------+---------------------------------------------------
  Reporter:  Simon      |       Owner:  mickie             
      Type:  defect     |      Status:  new                
  Priority:  major      |   Milestone:  5.0.0              
 Component:  vtigercrm  |     Version:  5.0.0              
Resolution:             |    Keywords:  quotes, sales order
------------------------+---------------------------------------------------
Changes (by jerrydgeorge):

  * owner:  developer => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1345>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Sun Jun 25 23:39:51 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 26 Jun 2006 06:39:51 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231355=3A?=
 =?utf-8?q?_Pricebook_value_is_readonly?=
In-Reply-To: <076.88e9291262713bf51b842aecd697a80a@vtiger.fosslabs.com>
References: <076.88e9291262713bf51b842aecd697a80a@vtiger.fosslabs.com>
Message-ID: <085.9d63308fffcf8910b506fc43b1146715@vtiger.fosslabs.com>

#1355: Pricebook value is readonly
-----------------------------------+----------------------------------------
  Reporter:  cristian at nethesis.it  |       Owner:  mickie
      Type:  defect                |      Status:  new   
  Priority:  major                 |   Milestone:        
 Component:  vtigercrm             |     Version:  5.0.0 
Resolution:                        |    Keywords:        
-----------------------------------+----------------------------------------
Changes (by jerrydgeorge):

  * owner:  developer => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1355>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Sun Jun 25 23:39:59 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 26 Jun 2006 06:39:59 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231365=3A?=
	=?utf-8?q?_i18n_issue_at_tickets?=
In-Reply-To: <076.d396dbfd58922ae6f8f333a2a453043b@vtiger.fosslabs.com>
References: <076.d396dbfd58922ae6f8f333a2a453043b@vtiger.fosslabs.com>
Message-ID: <085.fe4da539a58643857d2ef13261bcd7c4@vtiger.fosslabs.com>

#1365: i18n issue at tickets
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  mickie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by jerrydgeorge):

  * owner:  developer => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1365>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Sun Jun 25 23:40:08 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 26 Jun 2006 06:40:08 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231334=3A?=
	=?utf-8?q?_Calendar_translation?=
In-Reply-To: <076.9648d4b16d7e7ade09293afbcbfcb43e@vtiger.fosslabs.com>
References: <076.9648d4b16d7e7ade09293afbcbfcb43e@vtiger.fosslabs.com>
Message-ID: <085.b3dc308dfef0cb9be618d5308f66aa7d@vtiger.fosslabs.com>

#1334: Calendar translation
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  ahmed                
      Type:  defect     |      Status:  new                  
  Priority:  minor      |   Milestone:                       
 Component:  vtigercrm  |     Version:  5.0.0                
Resolution:             |    Keywords:  calendar, translation
------------------------+---------------------------------------------------
Changes (by jerrydgeorge):

  * owner:  developer => ahmed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1334>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Sun Jun 25 23:40:16 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 26 Jun 2006 06:40:16 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231365=3A?=
	=?utf-8?q?_i18n_issue_at_tickets?=
In-Reply-To: <076.d396dbfd58922ae6f8f333a2a453043b@vtiger.fosslabs.com>
References: <076.d396dbfd58922ae6f8f333a2a453043b@vtiger.fosslabs.com>
Message-ID: <085.4b28027bee7ab7a2816aed494d024c30@vtiger.fosslabs.com>

#1365: i18n issue at tickets
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  ahmed
      Type:  defect     |      Status:  new  
  Priority:  major      |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by jerrydgeorge):

  * owner:  mickie => ahmed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1365>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 00:12:50 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 07:12:50 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7507 -
	/vtigercrm/trunk/getCompanyProfile.php
Message-ID: <20060626071250.1E76B83FCC1@vtiger.fosslabs.com>

Author: richie
Date: Mon Jun 26 01:12:46 2006
New Revision: 7507

Log:
test checkin

Modified:
    vtigercrm/trunk/getCompanyProfile.php

Modified: vtigercrm/trunk/getCompanyProfile.php
==============================================================================
--- vtigercrm/trunk/getCompanyProfile.php (original)
+++ vtigercrm/trunk/getCompanyProfile.php Mon Jun 26 01:12:46 2006
@@ -18,6 +18,7 @@
  */
 function getComdata($url,$variable="")
 {
+
 	$h = new http();
 	$desc = array();
 	$h->dir = "class_http_dir/";



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 00:17:51 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 07:17:51 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7508 -
	/vtigercrm/trunk/modules/Contacts/chat.php
Message-ID: <20060626071751.21EA283FCC1@vtiger.fosslabs.com>

Author: richie
Date: Mon Jun 26 01:17:47 2006
New Revision: 7508

Log:
Issue in chat has been fixed,#Fixes 549

Modified:
    vtigercrm/trunk/modules/Contacts/chat.php

Modified: vtigercrm/trunk/modules/Contacts/chat.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/chat.php (original)
+++ vtigercrm/trunk/modules/Contacts/chat.php Mon Jun 26 01:17:47 2006
@@ -354,7 +354,7 @@
     if($to != 0)
       $chat .= "v";
     
-      $res = $adb->query("INSERT INTO chat_".$chat."chat (msg) VALUES (".$id.")");
+      $res = $adb->query("INSERT INTO vtiger_chat_".$chat."chat (msg) VALUES (".$id.")");
   }
 
   /**



From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 26 00:18:11 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 26 Jun 2006 07:18:11 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=23549=3A_?=
	=?utf-8?q?issue_in_chat?=
In-Reply-To: <076.d715dbdac6967364026532cc12048b17@vtiger.fosslabs.com>
References: <076.d715dbdac6967364026532cc12048b17@vtiger.fosslabs.com>
Message-ID: <085.b82a0d01c04717bdf97d1fe7d5dd219c@vtiger.fosslabs.com>

#549: issue in chat
---------------------------+------------------------------------------------
  Reporter:  jerrydgeorge  |       Owner:  jerrydgeorge
      Type:  defect        |      Status:  closed      
  Priority:  major         |   Milestone:              
 Component:  vtigercrm     |     Version:  5.0.0       
Resolution:  fixed         |    Keywords:  Chat        
---------------------------+------------------------------------------------
Changes (by jerrydgeorge):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/549>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 26 00:18:45 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 26 Jun 2006 07:18:45 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231340=3A?=
 =?utf-8?q?_Firefox_extension=3A_Uninstall_not_working?=
In-Reply-To: <076.9c4f4fefce1fedb98255e8bbe4dd1210@vtiger.fosslabs.com>
References: <076.9c4f4fefce1fedb98255e8bbe4dd1210@vtiger.fosslabs.com>
Message-ID: <085.19441313515d6fdb0cde69242379b300@vtiger.fosslabs.com>

#1340: Firefox extension: Uninstall not working
----------------------------+-----------------------------------------------
  Reporter:  gopal          |       Owner:  minnie
      Type:  defect         |      Status:  new   
  Priority:  critical       |   Milestone:        
 Component:  vtigertoolbar  |     Version:  5.0.0 
Resolution:                 |    Keywords:        
----------------------------+-----------------------------------------------
Changes (by jerrydgeorge):

  * owner:  jerrydgeorge => minnie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1340>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 00:26:17 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 07:26:17 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7509 -
	/vtigercrm/trunk/include/language/en_us.lang.php
Message-ID: <20060626072617.A2B6D83FCC4@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 26 01:26:13 2006
New Revision: 7509

Log:
lang file updated

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

Modified: vtigercrm/trunk/include/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/include/language/en_us.lang.php (original)
+++ vtigercrm/trunk/include/language/en_us.lang.php Mon Jun 26 01:26:13 2006
@@ -67,6 +67,8 @@
 'NTC_WELCOME'=>'Welcome',
 
 'NTC_NO_ITEMS_DISPLAY'=>'none',
+
+'LBL_OR'=>'or',
 
 'LBL_ALT_HOT_KEY'=>'Alt+',
 //added for 4.2



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 00:33:37 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 07:33:37 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7510 -
	/vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl
Message-ID: <20060626073337.3C16583FCC8@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 26 01:33:33 2006
New Revision: 7510

Log:
i18n issues for quick edit of all modules fixed - ahmed.

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

Modified: vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl Mon Jun 26 01:33:33 2006
@@ -23,7 +23,7 @@
                                                        &nbsp;&nbsp;<span id="dtlview_{$label}">{$keyval}</span>
                                               		<div id="editarea_{$label}" style="display:none;">
                                               		  <input class="detailedViewTextBox" onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" type="text" id="txtbox_{$label}" name="{$keyfldname}" maxlength='100' value="{$keyval}"></input>
-                                              		  <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                              		  <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
                                               		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                                                        </div>
                                                   </td>
@@ -31,7 +31,7 @@
                                                   <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}"><a href="mailto:{$keyval}" target="_blank">{$keyval}</a></span>
                                               		<div id="editarea_{$label}" style="display:none;">
                                               		  <input class="detailedViewTextBox" onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" type="text" id="txtbox_{$label}" name="{$keyfldname}" maxlength='100' value="{$keyval}"></input>
-                                              		  <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                              		  <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
                                               		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                                                        </div>
                                                   </td>
@@ -45,7 +45,7 @@
                     									{/foreach}
                     								{/foreach}
                     							   </select>
-                    							   <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                    							   <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
                                               		   <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                     							</div>
                							</td>
@@ -60,7 +60,7 @@
                     									{/foreach}
                     								{/foreach}
                     							   </select>
-                    							   <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                    							   <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
                                               		   <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                     							</div>
 								{else}
@@ -79,7 +79,7 @@
 									{/foreach}
 									{/foreach}
                     							   </select>
-                    							   <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                    							   <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
                                               		   <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                     							</div>
 								{else}
@@ -92,7 +92,7 @@
                                                   <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}"><a href="http://{$keyval}" target="_blank">{$keyval}</a></span>
                                               		<div id="editarea_{$label}" style="display:none;">
                                               		  <input class="detailedViewTextBox" onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" type="text" id="txtbox_{$label}" name="{$keyfldname}" maxlength='100' value="{$keyval}"></input>
-                                              		  <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                              		  <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
                                               		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                                                        </div>
                                                   </td>
@@ -100,7 +100,7 @@
                                                   <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}">{$keyval}</span>
                                               		<div id="editarea_{$label}" style="display:none;">
                                               		  <textarea id="txtbox_{$label}" name="{$keyfldname}"  class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'"onBlur="this.className='detailedViewTextBox'" cols="90" rows="8">{$keyval}</textarea>                                            		  
-                                              		  <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                              		  <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
                                               		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                                                        </div>
                                                   </td>
@@ -108,7 +108,7 @@
                                                   <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}">{$keyval}</span>
                                               		<div id="editarea_{$label}" style="display:none;">
                                               		  <textarea id="txtbox_{$label}" name="{$keyfldname}"  class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'"onBlur="this.className='detailedViewTextBox'" rows=2>{$keyval}</textarea>                                            		  
-                                              		  <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                              		  <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
                                               		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                                                        </div>
                                                   </td>
@@ -117,7 +117,7 @@
                                               		<div id="editarea_{$label}" style="display:none;">                                              		  
                                                          <input readonly id="popuptxt_{$label}" name="account_name" type="text" value="{$keyval}"><input id="txtbox_{$label}" name="{$keyfldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Accounts&action=Popup&popuptype=specific&form=TasksEditView&form_submit=false","test","width=600,height=400,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'>
                                                          <!--AccountPopup/WithClear-->{if $keyid eq '51'} &nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.account_id.value=''; this.form.account_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>{/if} 
-                                              		  <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                              		  <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
                                               		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                                                        </div>
                                                   </td>
@@ -125,7 +125,7 @@
                                                   <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}"><a href="{$keyseclink}">{$keyval}</a></span>
                                               		<div id="editarea_{$label}" style="display:none;">                                              		  
                                                          <input id="popuptxt_{$label}" name="contact_name" readonly type="text" style="border:1px solid #bababa;" value="{$keyval}"><input id="txtbox_{$label}" name="{$keyfldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Contacts&action=Popup&html=Popup_picker&popuptype=specific&form=EditView","test","width=600,height=400,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.contact_id.value=''; this.form.contact_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
-                                                         <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                                         <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
                                               		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                                                        </div>
                                                   </td>                                                  
@@ -133,7 +133,7 @@
                                                   <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}"><a href="{$keyseclink}">{$keyval}</a></span>
                                               		<div id="editarea_{$label}" style="display:none;">                                              		  
                                                          <input id="popuptxt_{$label}" name="product_name" readonly type="text" value="{$keyval}"><input id="txtbox_{$label}" name="{$keyfldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Products&action=Popup&html=Popup_picker&form=HelpDeskEditView&popuptype=specific","test","width=600,height=400,resizable=1,scrollbars=1,top=150,left=200");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.product_id.value=''; this.form.product_name.value=''; return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
-                                                         <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                                         <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
                                               		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                                                        </div>
                                                   </td>
@@ -142,7 +142,7 @@
                                               		<div id="editarea_{$label}" style="display:none;">
                                                          <input id="popuptxt_{$label}" name="vendor_name" readonly type="text" style="border:1px solid #bababa;" value="{$keyval}"><input id="txtbox_{$label}" name="{$fldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Vendors&action=Popup&html=Popup_picker&popuptype=specific&form=EditView","test","width=600,height=400,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'>
                                                          {if $uitype eq 75}&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.vendor_id.value='';this.form.vendor_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>{/if}                                              		  
-                                                         <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                                         <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
                                               		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                                                        </div>
                                                   </td>
@@ -150,7 +150,7 @@
                                                   <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}"><a href="{$keyseclink}">{$keyval}</a></span>
                                               		<div id="editarea_{$label}" style="display:none;">                                              		  
                                                          <input id="popuptxt_{$label}" name="potential_name" readonly type="text" style="border:1px solid #bababa;" value="{$keyval}"><input id="txtbox_{$label}" name="{$keyfldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Potentials&action=Popup&html=Popup_picker&popuptype=specific_potential_account_address&form=EditView","test","width=600,height=400,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.potential_id.value=''; this.form.potential_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
-                                                         <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                                         <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
                                               		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                                                        </div>
                                                   </td>
@@ -158,7 +158,7 @@
                                                   <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}"><a href="{$keyseclink}">{$keyval}</a></span>
                                               		<div id="editarea_{$label}" style="display:none;">                                              		  
                                                          <input id="popuptxt_{$label}" name="quote_name" readonly type="text" style="border:1px solid #bababa;" value="{$keyval}"><input id="txtbox_{$label}" name="{$keyfldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Quotes&action=Popup&html=Popup_picker&popuptype=specific&form=EditView","test","width=600,height=400,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.quote_id.value=''; this.form.quote_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
-                                                         <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                                         <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
                                               		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                                                        </div>
                                                   </td>
@@ -169,7 +169,7 @@
                                                   <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}"><a href="{$keyseclink}">{$keyval}</a></span>
                                               		<div id="editarea_{$label}" style="display:none;">                                              		  
                                                          <input id="popuptxt_{$label}" name="salesorder_name" readonly type="text" style="border:1px solid #bababa;" value="{$keyval}"><input id="txtbox_{$label}" name="{$keyfldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=SalesOrder&action=Popup&html=Popup_picker&popuptype=specific&form=EditView","test","width=600,height=400,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.salesorder_id.value=''; this.form.salesorder_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
-                                                         <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                                         <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
                                               		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                                                        </div>
                                                   </td>
@@ -189,14 +189,14 @@
                     <div id="editarea_{$label}" style="display:none;">
                    	<input type="hidden" id="hdtxt_{$label}" value="{$keyval}"></input>
 					{if $keyoptions.0 eq 'User'}
-						<input name="assigntype" id="assigntype" checked="checked" value="U" onclick="toggleAssignType(this.value),setSelectValue('{$label}');" type="radio">&nbsp;User
+						<input name="aSsigntype" id="assigntype" checked="checked" value="U" onclick="toggleAssignType(this.value),setSelectValue('{$label}');" type="radio">&nbsp;{$APP.LBL_USER}
 						{if $keyoptions.2 neq ''}
-							<input name="assigntype" id="assigntype" value="T" onclick="toggleAssignType(this.value),setSelectValue('{$label}');" type="radio">&nbsp;Group
+							<input name="assigntype" id="assigntype" value="T" onclick="toggleAssignType(this.value),setSelectValue('{$label}');" type="radio">&nbsp;{$APP.LBL_GROUP_NAME}
 						{/if}
 						<span id="assign_user" style="display: block;">
 					{else}
-						<input name="assigntype" id="assigntype" value="U" onclick="toggleAssignType(this.value),setSelectValue('{$label}');" type="radio">&nbsp;User
-						<input name="assigntype" checked="checked" id="assigntype" value="T" onclick="toggleAssignType(this.value),setSelectValue('{$label}');" type="radio">&nbsp;Group
+						<input name="assigntype" id="assigntype" value="U" onclick="toggleAssignType(this.value),setSelectValue('{$label}');" type="radio">&nbsp;{$APP.LBL_USER}
+						<input name="assigntype" checked="checked" id="assigntype" value="T" onclick="toggleAssignType(this.value),setSelectValue('{$label}');" type="radio">&nbsp;{$APP.LBL_GROUP_NAME}
 						<span id="assign_user" style="display: none;">
 					{/if}
                    	<select id="txtbox_U{$label}" onchange="setSelectValue('{$label}')" name="{$keyfldname}">
@@ -222,7 +222,7 @@
 					</span>
 
                     <br>
-                    <input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');"/> or
+                    <input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');"/> {$APP.LBL_OR}
                     <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                     </div>
                     </td>
@@ -234,7 +234,7 @@
                         {else}
                           <input id="txtbox_{$label}" type="checkbox" name="{$keyfldname}" style="border:1px solid #bababa;" value="0">
                        	{/if}
-                         <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');"/> or
+                         <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');"/> {$APP.LBL_OR}
                           <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                         </div>
                         </td>    
@@ -247,7 +247,7 @@
                         {else}
                           <input id="txtbox_{$label}" type="checkbox" name="{$keyfldname}" style="border:1px solid #bababa;" value="0">
                        	{/if}
-                         <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');"/> or
+                         <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');"/> {$APP.LBL_OR}
                           <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                         </div>
 			{else}



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 00:51:04 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 07:51:04 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7511 -
 /vtigercrm/trunk/modules/Calendar/language/en_us.lang.php
Message-ID: <20060626075104.597F983FCD3@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 26 01:50:58 2006
New Revision: 7511

Log:
updated calendar lang file - ahmed

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

Modified: vtigercrm/trunk/modules/Calendar/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Calendar/language/en_us.lang.php Mon Jun 26 01:50:58 2006
@@ -207,6 +207,7 @@
 'LBL_EVERYWEEK'=>'Every Week',
 'LBL_EVERYMON'=>'Every Month',
 'LBL_REPEATEVENT'=>'Repeat Event',
+'LBL_NONE_SCHEDULED'=>'None Scheduled',
 
 'LBL_INVITE_INST1'=>'To invite, select the vtiger_users from the "Available Users" list and click the "Add" button.',
 'LBL_INVITE_INST2'=>'To remove, select the vtiger_users in the "Selected Users" list and the click "Remove" button.',



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 00:55:46 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 07:55:46 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7512 -
	/vtigercrm/trunk/modules/Calendar/calendarLayout.php
Message-ID: <20060626075546.47D1283FCDA@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 26 01:55:42 2006
New Revision: 7512

Log:
Updated i18n for calendar

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

Modified: vtigercrm/trunk/modules/Calendar/calendarLayout.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/calendarLayout.php (original)
+++ vtigercrm/trunk/modules/Calendar/calendarLayout.php Mon Jun 26 01:55:42 2006
@@ -221,7 +221,7 @@
 				<td align='center' width='65%'>";
 	$headerdata .= getEventTodoInfo($cal_arr,'listcnt'); 
 	$headerdata .= "	</td>
-				<td align='right' width='25%'><b>View : </b>";
+				<td align='right' width='25%'><b>".$mod_strings['LBL_VIEW']." : </b>";
 	$view_options = getEventViewOption($cal_arr);
 	$headerdata .=$view_options."
 				</td>
@@ -1204,7 +1204,7 @@
 	else
 	{
 		$list_view .="<tr style='height: 25px;' bgcolor='white'>";
-                	$list_view .="<td colspan='".$header_rows."'><i>None Scheduled</i></td>";
+                	$list_view .="<td colspan='".$header_rows."'><i>".$mod_strings['LBL_NONE_SCHEDULED']."</i></td>";
                 $list_view .="</tr>";
 	}
 	$list_view .="</table>";
@@ -1277,7 +1277,7 @@
         else
         {
                 $list_view .="<tr style='height: 25px;' bgcolor='white'>";
-                        $list_view .="<td colspan='".$header_rows."'><i>None Scheduled</i></td>";
+                        $list_view .="<td colspan='".$header_rows."'><i>".$mod_strings['LBL_NONE_SCHEDULED']."</i></td>";
                 $list_view .="</tr>";
         }
         $list_view .="</table><br></div>";



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 01:11:28 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 08:11:28 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7513 -
	/vtigercrm/trunk/Smarty/templates/CustomView.tpl
Message-ID: <20060626081128.C582C83FB0F@vtiger.fosslabs.com>

Author: richie
Date: Mon Jun 26 02:11:24 2006
New Revision: 7513

Log:
#Fixes 1329

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 Mon Jun 26 02:11:24 2006
@@ -141,17 +141,17 @@
 		 </td>
 		</tr>
 		<tr class="dvtCellLabel">
-		  <td><select name="column1" id="column1">
+		  <td><select name="column1" id="column1" onChange="checkDuplicate();">
 	                <option value="">{$MOD.LBL_NONE}</option>
 			{foreach item=filteroption key=label from=$CHOOSECOLUMN1}
 				<optgroup label="{$label}" class=\"select\" style=\"border:none\">
-				{foreach item=text from=$filteroption}
-		                     <option {$text.selected} value={$text.value}>{$text.text}</option>
-                	        {/foreach}
+					{foreach item=text from=$filteroption}
+		   		         <option {$text.selected} value={$text.value}>{$text.text}</option>
+                    {/foreach}
 			{/foreach}
           	        {$CHOOSECOLUMN1}
 	              </select></td>
-		   <td><select name="column2" id="column2">
+		   <td><select name="column2" id="column2" onChange="checkDuplicate();">
                         <option value="">{$MOD.LBL_NONE}</option>
                         {foreach item=filteroption key=label from=$CHOOSECOLUMN2}
                                 <optgroup label="{$label}" class=\"select\" style=\"border:none\">
@@ -161,7 +161,7 @@
                         {/foreach}
                         {$CHOOSECOLUMN2}
                       </select></td>
-		   <td><select name="column3" id="column3">
+		   <td><select name="column3" id="column3" onChange="checkDuplicate();">
                         <option value="">{$MOD.LBL_NONE}</option>
                         {foreach item=filteroption key=label from=$CHOOSECOLUMN3}
                                 <optgroup label="{$label}" class=\"select\" style=\"border:none\">
@@ -171,7 +171,7 @@
                         {/foreach}
                         {$CHOOSECOLUMN3}
                       </select></td>
-		   <td><select name="column4" id="column4">
+		   <td><select name="column4" id="column4" onChange="checkDuplicate();">
                         <option value="">{$MOD.LBL_NONE}</option>
                         {foreach item=filteroption key=label from=$CHOOSECOLUMN4}
                                 <optgroup label="{$label}" class=\"select\" style=\"border:none\">
@@ -184,7 +184,7 @@
 			
 		</tr>
 		<tr class="dvtCellInfo">
-		   <td><select name="column5" id="column5">
+		   <td><select name="column5" id="column5" onChange="checkDuplicate();">
                         <option value="">{$MOD.LBL_NONE}</option>
                         {foreach item=filteroption key=label from=$CHOOSECOLUMN5}
                                 <optgroup label="{$label}" class=\"select\" style=\"border:none\">
@@ -194,7 +194,7 @@
                         {/foreach}
                         {$CHOOSECOLUMN5}
                       </select></td>
-                   <td><select name="column6" id="column6">
+                   <td><select name="column6" id="column6" onChange="checkDuplicate();">
                         <option value="">{$MOD.LBL_NONE}</option>
                         {foreach item=filteroption key=label from=$CHOOSECOLUMN6}
                                 <optgroup label="{$label}" class=\"select\" style=\"border:none\">
@@ -204,7 +204,7 @@
                         {/foreach}
                         {$CHOOSECOLUMN6}
                       </select></td>
-                   <td><select name="column7" id="column7">
+                   <td><select name="column7" id="column7" onChange="checkDuplicate();">
                         <option value="">{$MOD.LBL_NONE}</option>
                         {foreach item=filteroption key=label from=$CHOOSECOLUMN7}
                                 <optgroup label="{$label}" class=\"select\" style=\"border:none\">
@@ -214,7 +214,7 @@
                         {/foreach}
                         {$CHOOSECOLUMN7}
                       </select></td>
-                   <td><select name="column8" id="column8">
+                   <td><select name="column8" id="column8" onChange="checkDuplicate();">
                         <option value="">{$MOD.LBL_NONE}</option>
                         {foreach item=filteroption key=label from=$CHOOSECOLUMN8}
                                 <optgroup label="{$label}" class=\"select\" style=\"border:none\">
@@ -226,7 +226,7 @@
 			</select></td>
 		</tr>
 		<tr class="dvtCellLabel">
-		   <td><select name="column9" id="column9">
+		   <td><select name="column9" id="column9" onChange="checkDuplicate();">
                         <option value="">{$MOD.LBL_NONE}</option>
                         {foreach item=filteroption key=label from=$CHOOSECOLUMN9}
                                 <optgroup label="{$label}" class=\"select\" style=\"border:none\">
@@ -463,7 +463,7 @@
   <tr><td colspan="4">&nbsp;</td></tr>
   <tr><td colspan="4" style="padding: 5px;">
 	<div align="center">
-	  <input title="Save [Alt+S]" accesskey="S" class="small"  name="button2" value="{$APP.LBL_SAVE_BUTTON_LABEL}" style="width: 70px;" type="submit" />
+	  <input title="Save [Alt+S]" accesskey="S" class="small"  name="button2" value="{$APP.LBL_SAVE_BUTTON_LABEL}" style="width: 70px;" type="submit" onClick="return checkDuplicate();"/>
 	  <input title="Cancel [Alt+X]" accesskey="X" class="small" name="button2" onclick='window.history.back()' value="{$APP.LBL_CANCEL_BUTTON_LABEL}" style="width: 70px;" type="button" />
 	</div>
   </td></tr>
@@ -476,19 +476,47 @@
 var k;
 var colOpts;
 var manCheck = new Array({$MANDATORYCHECK});
+{literal}
 if(document.CustomView.record.value == '')
-{ldelim}
+{
   for(k=0;k<manCheck.length;k++)
-  {ldelim}
+  {
       selname = "column"+(k+1);
       colOpts = document.getElementById(selname).options;
       for (l=0;l<colOpts.length;l++)
-      {ldelim}
+      {
         if(colOpts[l].value == manCheck[k])
-        {ldelim}
+        {
           colOpts[l].selected = true;
-        {rdelim}
-      {rdelim}
-  {rdelim}
-{rdelim}
+        }
+      }
+  }
+}
+function checkDuplicate()
+{
+	var cvselect_array = new Array('column1','column2','column3','column4','column5','column6','column7','column8','column9')
+		for(var loop=0;loop < cvselect_array.length-1;loop++)
+		{
+			selected_cv_columnvalue = $(cvselect_array[loop]).options[$(cvselect_array[loop]).selectedIndex].value;
+			if(selected_cv_columnvalue != '')
+			{	
+				for(var iloop=0;iloop < cvselect_array.length;iloop++)
+				{
+					if(iloop == loop)
+						iloop++;
+					selected_cv_icolumnvalue = $(cvselect_array[iloop]).options[$(cvselect_array[iloop]).selectedIndex].value;	
+					if(selected_cv_columnvalue == selected_cv_icolumnvalue)
+					{
+						alert('Columns cannot be duplicated');
+						$(cvselect_array[iloop]).selectedIndex = 0;
+						return false;
+					}
+
+				}
+			}
+		}
+		return true;
+}
+checkDuplicate();
+{/literal}
 </script>



From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 26 01:11:55 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 26 Jun 2006 08:11:55 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231329=3A?=
	=?utf-8?q?_List_custom_view?=
In-Reply-To: <076.5bc833f86fff73d192c1a72d505bd83a@vtiger.fosslabs.com>
References: <076.5bc833f86fff73d192c1a72d505bd83a@vtiger.fosslabs.com>
Message-ID: <085.431f42a9080cdf51f04960f8052be925@vtiger.fosslabs.com>

#1329: List custom view
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  jerrydgeorge
      Type:  defect     |      Status:  closed      
  Priority:  critical   |   Milestone:              
 Component:  vtigercrm  |     Version:  5.0.0       
Resolution:  fixed      |    Keywords:              
------------------------+---------------------------------------------------
Changes (by jerrydgeorge):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1329>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 26 02:27:50 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 26 Jun 2006 09:27:50 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231328=3A?=
 =?utf-8?q?_Custom_picklist_sort_order?=
In-Reply-To: <076.4247da71e86ed63e936e2988bd008654@vtiger.fosslabs.com>
References: <076.4247da71e86ed63e936e2988bd008654@vtiger.fosslabs.com>
Message-ID: <085.19bc1c9362e7594892991bb4361b1af3@vtiger.fosslabs.com>

#1328: Custom picklist sort order
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  jerrydgeorge    
      Type:  defect     |      Status:  closed          
  Priority:  major      |   Milestone:                  
 Component:  vtigercrm  |     Version:  5.0.0           
Resolution:  fixed      |    Keywords:  picklist, custom
------------------------+---------------------------------------------------
Changes (by jerrydgeorge):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1328>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 03:00:25 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 10:00:25 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7514 - in /vtigercrm/trunk:
 Smarty/templates/Header.tpl themes/blue/images/status.gif
Message-ID: <20060626100025.E189583FBE3@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 26 04:00:17 2006
New Revision: 7514

Log:
status image and and its position modified

Modified:
    vtigercrm/trunk/Smarty/templates/Header.tpl
    vtigercrm/trunk/themes/blue/images/status.gif

Modified: vtigercrm/trunk/Smarty/templates/Header.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Header.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Header.tpl Mon Jun 26 04:00:17 2006
@@ -464,7 +464,7 @@
 </div>
 
 
-<div id="status" class="fixedLay" style="display:none;left:930px;top:88px;height:27px;white-space:nowrap;"><img src="{$IMAGEPATH}status.gif"></div>
+<div id="status" class="fixedLay" style="display:none;left:930px;top:95px;height:27px;white-space:nowrap;"><img src="{$IMAGEPATH}status.gif"></div>
 <script>
 function openwin()
 {ldelim}

Modified: vtigercrm/trunk/themes/blue/images/status.gif
==============================================================================
Binary files - no diff available.



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 03:38:16 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 10:38:16 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7515 -
	/vtigercrm/trunk/include/utils/ListViewUtils.php
Message-ID: <20060626103817.C5C5E83FB24@vtiger.fosslabs.com>

Author: richie
Date: Mon Jun 26 04:38:12 2006
New Revision: 7515

Log:
Email Edit from related list has been integrated

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 Jun 26 04:38:12 2006
@@ -2714,7 +2714,8 @@
 	}
 
 	$edit_link .= "&parenttab=".$_REQUEST["parenttab"];
-
+	if($module == 'Emails')
+	        $edit_link = 'javascript:;" onclick="OpenCompose(\'123\',\'edit\');';
 	return $edit_link;
 }
 



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 03:58:20 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 10:58:20 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7516 -
	/vtigercrm/trunk/include/language/en_us.lang.php
Message-ID: <20060626105820.6B83983FCBE@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 26 04:58:16 2006
New Revision: 7516

Log:
Updated lang file - ahmed

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

Modified: vtigercrm/trunk/include/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/include/language/en_us.lang.php (original)
+++ vtigercrm/trunk/include/language/en_us.lang.php Mon Jun 26 04:58:16 2006
@@ -371,6 +371,14 @@
 'Import'=>'Import',
 'Merge'=>'Merge',
 'ConvertLead'=>'ConvertLead',
+
+
+'LBL_SHOW_RESULTS'=>'Show Results in',
+'LBL_TOTAL_RECORDS_FOUND'=>'Total Records found :',
+'LBL_SEARCH_RESULTS_FOR'=>' -- Search results for ',
+'LBL_TAG_SEARCH'=>' -- Tag search for ',
+'LBL_NO_DATA'=>'No Data Found',
+
 
 //3.2 release
 



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 04:11:40 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 11:11:40 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7518 -
	/vtigercrm/trunk/modules/Home/UnifiedSearch.php
Message-ID: <20060626111140.E3CA783FCC4@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 26 05:11:36 2006
New Revision: 7518

Log:
updated global search

Modified:
    vtigercrm/trunk/modules/Home/UnifiedSearch.php

Modified: vtigercrm/trunk/modules/Home/UnifiedSearch.php
==============================================================================
--- vtigercrm/trunk/modules/Home/UnifiedSearch.php (original)
+++ vtigercrm/trunk/modules/Home/UnifiedSearch.php Mon Jun 26 05:11:36 2006
@@ -84,6 +84,7 @@
 
 		require_once("modules/$module/language/en_us.lang.php");
 		global $mod_strings;
+		global $app_strings;
 
 		$smarty->assign("MOD", $mod_strings);
 		$smarty->assign("APP", $app_strings);
@@ -107,13 +108,15 @@
 		
 		if($search_module != '')//This is for Tag search
 		{
-			$where = getTagWhere($search_val,$current_user->id);
-			$search_msg = " -- Tag search for <b>".$search_val."</b>";
+		
+			$Where = getTagWhere($search_val,$current_user->id);
+			$search_msg =  $app_strings['LBL_TAG_SEARCH'];				       	$search_msg .=	"<b>".$search_val."</b>";
 		}
 		else			//This is for Global search
 		{
 			$where = getUnifiedWhere($listquery,$module,$search_val);
-			$search_msg = " -- Search results for <b>".$search_val."</b>";
+			$search_msg = $app_strings['LBL_SEARCH_RESULTS_FOR'];
+			$search_msg .=	"<b>".$search_val."</b>";
 		}
 
 		if($where != '')
@@ -157,7 +160,7 @@
 	//Added to display the Total record count
 ?>
 	<script>
-		document.getElementById("global_search_total_count").innerHTML = "Total Records found : <b><?php echo $total_record_count; ?></b>";
+document.getElementById("global_search_total_count").innerHTML = " <? echo $app_strings['LBL_TOTAL_RECORDS_FOUND'] ?><b><?php echo $total_record_count; ?></b>";
 	</script>
 <?php
 
@@ -232,7 +235,9 @@
 function getSearchModulesComboList($search_module)
 {
 	global $object_array;
-
+	global $app_strings;
+	global $mod_strings;
+	
 	?>
 		<script language="JavaScript" type="text/javascript" src="include/js/general.js"></script>
 		<script>
@@ -261,9 +266,9 @@
 		 <table border=0 cellspacing=0 cellpadding=0 width=98% align=center>
 		     <tr>
 		        <td colspan="3" id="global_search_total_count" style="padding-left:30px">&nbsp;</td>
-		        <td nowrap align="right">Show Results in &nbsp;
+		<td nowrap align="right"><? echo $app_strings['LBL_SHOW_RESULTS'] ?>&nbsp;
 		                <select id="global_search_module" name="global_search_module" onChange="displayModuleList(this);">
-		                        <option value="All">All</option>
+			<option value="All"><? echo $app_strings['COMBO_ALL'] ?></option>
 						<?php
 						foreach($object_array as $module => $object_name)
 						{
@@ -273,7 +278,7 @@
 							if($search_module == '' && $module == 'All')
 								$selected = 'selected';
 							?>
-							<option value="<?php echo $module; ?>" <?php echo $selected; ?> ><?php echo $module; ?></option>
+							<option value="<?php echo $module; ?>" <?php echo $selected; ?> ><?php echo $app_strings[$module]; ?></option>
 							<?php
 						}
 						?>



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 04:37:25 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 11:37:25 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7520 -
	/vtigercrm/trunk/Smarty/templates/UserDetailView.tpl
Message-ID: <20060626113725.300CB83FBDC@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 26 05:37:21 2006
New Revision: 7520

Log:
Updated i18n for quick edit of user Detail View - ahmed

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

Modified: vtigercrm/trunk/Smarty/templates/UserDetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/UserDetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/UserDetailView.tpl Mon Jun 26 05:37:21 2006
@@ -14,7 +14,7 @@
 <script language="javascript" type="text/javascript" src="include/js/general.js"></script>
 <script language="JavaScript" type="text/javascript" src="include/js/dtlviewajax.js"></script>
 <span id="crmspanid" style="display:none;position:absolute;"  onmouseover="show('crmspanid');">
-   <a class="link"  align="right" href="javascript:;">Edit</a>
+   <a class="link"  align="right" href="javascript:;">{$APP.LBL_EDIT_BUTTON}</a>
 </span>
 
 <style type="text/css">@import url(themes/blue/style.css);</style>



From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 26 04:37:36 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 26 Jun 2006 11:37:36 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231365=3A?=
	=?utf-8?q?_i18n_issue_at_tickets?=
In-Reply-To: <076.d396dbfd58922ae6f8f333a2a453043b@vtiger.fosslabs.com>
References: <076.d396dbfd58922ae6f8f333a2a453043b@vtiger.fosslabs.com>
Message-ID: <085.2ddb8f8121ca9bdb72c0e6da3c4c8d12@vtiger.fosslabs.com>

#1365: i18n issue at tickets
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  ahmed 
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by ahmed):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 Issue Fixed - i18n updated for detailview quick edit

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1365>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 26 04:38:34 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 26 Jun 2006 11:38:34 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231334=3A?=
	=?utf-8?q?_Calendar_translation?=
In-Reply-To: <076.9648d4b16d7e7ade09293afbcbfcb43e@vtiger.fosslabs.com>
References: <076.9648d4b16d7e7ade09293afbcbfcb43e@vtiger.fosslabs.com>
Message-ID: <085.65ac2f5811f94ba69ecb2f67f3af67bb@vtiger.fosslabs.com>

#1334: Calendar translation
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  ahmed                
      Type:  defect     |      Status:  closed               
  Priority:  minor      |   Milestone:                       
 Component:  vtigercrm  |     Version:  5.0.0                
Resolution:  fixed      |    Keywords:  calendar, translation
------------------------+---------------------------------------------------
Changes (by ahmed):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 Issue fixed - lang file updated for calendar module

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1334>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 26 04:39:07 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 26 Jun 2006 11:39:07 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231339=3A?=
 =?utf-8?q?_Missing_translation_for_search_results?=
In-Reply-To: <076.612780845c117cf5a7ac9d62d25b957d@vtiger.fosslabs.com>
References: <076.612780845c117cf5a7ac9d62d25b957d@vtiger.fosslabs.com>
Message-ID: <085.b0eff5cc734d4aae6ed53d16c76c3720@vtiger.fosslabs.com>

#1339: Missing translation for search results
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  ahmed 
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by ahmed):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 Translated for global search done

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1339>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 26 04:40:41 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 26 Jun 2006 11:40:41 -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.228975c4bde585d34a96fac37049e322@vtiger.fosslabs.com>

#330: Existing image name should be displayed in the field
------------------------+---------------------------------------------------
  Reporter:  saraj      |       Owner:  mickie     
      Type:  defect     |      Status:  new        
  Priority:  major      |   Milestone:             
 Component:  vtigercrm  |     Version:  5.0.0      
Resolution:             |    Keywords:  Create User
------------------------+---------------------------------------------------
Changes (by ahmed):

  * owner:  ahmed => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/330>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 04:12:23 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 11:12:23 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7519 -
	/vtigercrm/trunk/modules/Home/UnifiedSearch.php
Message-ID: <20060626111223.C35B183FCD9@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 26 05:12:20 2006
New Revision: 7519

Log:
updated global search

Modified:
    vtigercrm/trunk/modules/Home/UnifiedSearch.php

Modified: vtigercrm/trunk/modules/Home/UnifiedSearch.php
==============================================================================
--- vtigercrm/trunk/modules/Home/UnifiedSearch.php (original)
+++ vtigercrm/trunk/modules/Home/UnifiedSearch.php Mon Jun 26 05:12:20 2006
@@ -109,7 +109,7 @@
 		if($search_module != '')//This is for Tag search
 		{
 		
-			$Where = getTagWhere($search_val,$current_user->id);
+			$where = getTagWhere($search_val,$current_user->id);
 			$search_msg =  $app_strings['LBL_TAG_SEARCH'];				       	$search_msg .=	"<b>".$search_val."</b>";
 		}
 		else			//This is for Global search



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 05:14:27 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 12:14:27 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7521 - in /vtigercrm/trunk:
 Smarty/templates/Emails.tpl include/language/en_us.lang.php
 modules/Emails/language/en_us.lang.php modules/Webmails/WebmailsAjax.php
Message-ID: <20060626121427.ACC3F83FD1D@vtiger.fosslabs.com>

Author: richie
Date: Mon Jun 26 06:14:19 2006
New Revision: 7521

Log:
Mail Server check done through Ajaz

Modified:
    vtigercrm/trunk/Smarty/templates/Emails.tpl
    vtigercrm/trunk/include/language/en_us.lang.php
    vtigercrm/trunk/modules/Emails/language/en_us.lang.php
    vtigercrm/trunk/modules/Webmails/WebmailsAjax.php

Modified: vtigercrm/trunk/Smarty/templates/Emails.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Emails.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Emails.tpl Mon Jun 26 06:14:19 2006
@@ -11,6 +11,23 @@
 -->*}
 <!--  USER  SETTINGS PAGE STARTS HERE -->
 <script language="javascript">
+function gotoWebmail()
+{ldelim}
+	new Ajax.Request(
+		'index.php',
+		{ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+                	method: 'post',
+			postBody: "module=Webmails&action=WebmailsAjax&file=ListView&config_chk=true",
+			onComplete: function(response) {ldelim}
+				if(response.responseText != 'SUCESS')
+					$('mailconfchk').style.display = 'block';
+				else
+					window.location.href = "index.php?module=Webmails&action=index&parenttab=My Home Page";
+			{rdelim}
+		{rdelim}
+	);
+
+{rdelim}
 
 function setSubject(subject)
 {ldelim}
@@ -112,7 +129,7 @@
 </script>
 		{include file='Buttons_List.tpl'}
 <script language="JavaScript" type="text/javascript" src="modules/Emails/Email.js"></script>
-
+<div class="fixedLay" id="mailconfchk" style="display:none;left:350px;top:160px;height:27px;white-space:nowrap;z-index:10000007px;"><font color='red'><h3>{$MOD.LBL_CONFIGURE_MAIL_SETTINGS}.<br> {$APP.LBL_PLEASE_CLICK} <a href="index.php?module=Settings&action=AddMailAccount&record={$USERID}">{$APP.LBL_HERE}</a> {$APP.LBL_TO_CONFIGURE}</h3></font></div>
 <!-- Shadow starts here -->
 <table width="100%" border="0" cellpadding="0" cellspacing="0" height="100%">
 	<tr>
@@ -169,7 +186,7 @@
 										<a href="javascript:;" onClick="ShowFolders(6)" class="webMnu">{$MOD.LBL_QUAL_CONTACT}</a>&nbsp;<b></b>
 									</li>
 									<li><img src="{$IMAGE_PATH}webmail_downarrow.gif" align="absmiddle" />&nbsp;&nbsp;
-									<a href="index.php?module=Webmails&action=index&parenttab=My Home Page" class="webMnu">{$MOD.LBL_MY_MAILS}</a>&nbsp;<b></b>
+									<a href="javascript:;" onClick="gotoWebmail();" class="webMnu">{$MOD.LBL_MY_MAILS}</a>&nbsp;<b></b>
 									</li>
 								</ul>
 								<!-- Sent mail -->

Modified: vtigercrm/trunk/include/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/include/language/en_us.lang.php (original)
+++ vtigercrm/trunk/include/language/en_us.lang.php Mon Jun 26 06:14:19 2006
@@ -936,7 +936,9 @@
 'This Week'=>'This Week',
 'This Month'=>'This Month',
 'This Year'=>'This Year',
-
+'LBL_PLEASE_CLICK'=>'Please Click',
+'LBL_TO_CONFIGURE'=>'to Configure',
+'LBL_HERE'=>'here',
 );
 
 

Modified: vtigercrm/trunk/modules/Emails/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Emails/language/en_us.lang.php Mon Jun 26 06:14:19 2006
@@ -142,6 +142,7 @@
 'LBL_IN_SUBJECT_OR_SENDER'=>'in Subject or Sender',
 'CHOSE_EMAIL'=>'Choose Email ID',
 'Sender'=>'Sender',
+'LBL_CONFIGURE_MAIL_SETTINGS'=>'Your Incoming Mail Server is not configured',
 );
 
 ?>

Modified: vtigercrm/trunk/modules/Webmails/WebmailsAjax.php
==============================================================================
--- vtigercrm/trunk/modules/Webmails/WebmailsAjax.php (original)
+++ vtigercrm/trunk/modules/Webmails/WebmailsAjax.php Mon Jun 26 06:14:19 2006
@@ -16,6 +16,17 @@
 
 global $adb,$mbox,$current_user;
 $mailInfo = getMailServerInfo($current_user);
+if($_REQUEST['config_chk'] == 'true')
+{
+	if($adb->num_rows($mailInfo) < 1) {
+		echo 'FAILED';
+		exit();
+	}else
+	{
+		echo 'SUCESS';
+		exit();
+	}
+}
 if($adb->num_rows($mailInfo) < 1) {
         echo "<center><font color='red'><h3>Please configure your mail settings</h3></font></center>";
         exit();



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 05:30:39 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 12:30:39 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7522 -
 /vtigercrm/trunk/modules/Settings/language/en_us.lang.php
Message-ID: <20060626123040.9DE4264FC43@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 26 06:30:34 2006
New Revision: 7522

Log:
updated settingslang file

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 Jun 26 06:30:34 2006
@@ -574,6 +574,7 @@
 'INVENTORYTERMSANDCONDITIONS'=>'Inventory : Terms & Conditions',//newly added for Inventory terms and conditions
 'LBL_INVENTORY_TERMSANDCONDITIONS'=>' - Edit Inventory Terms & Conditions',//newly added
 'LBL_TANDC_TEXT'=>'Terms & Conditions Text',
+'LBL_INVENTORY_TANDC'=>'Inventory Terms & Conditions',
 
 'LBL_OTHER_SETTINGS'=>'Other Settings',
 'LBL_SCROLL'=>'[Scroll to Top]',



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 05:32:03 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 12:32:03 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7523 -
	/vtigercrm/trunk/Smarty/templates/Settings.tpl
Message-ID: <20060626123204.219A164FC43@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 26 06:32:00 2006
New Revision: 7523

Log:
Updated Settings tpl file - ahmed

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 Mon Jun 26 06:32:00 2006
@@ -317,7 +317,7 @@
 						<tr>
 
 							<td rowspan=2 valign=top><a href="index.php?module=Users&action=OrganizationTermsandConditions&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}terms.gif" alt="{$MOD.INVENTORYTERMSANDCONDITIONS}" title="{$MOD.INVENTORYTERMSANDCONDITIONS}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Users&action=OrganizationTermsandConditions&parenttab=Settings">{$MOD.INVENTORYTERMSANDCONDITIONS}</a></td>
+							<td class=big valign=top><a href="index.php?module=Users&action=OrganizationTermsandConditions&parenttab=Settings">{$MOD.LBL_INVENTORY_TANDC}</a></td>
 						</tr>
 						<tr>
 							<td class="small" valign=top>{$MOD.LBL_INV_TANDC_DESCRIPTION}</td>



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 05:35:21 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 12:35:21 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7524 -
	/vtigercrm/trunk/Smarty/templates/SetMenu.tpl
Message-ID: <20060626123522.6F6E564FD66@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 26 06:35:16 2006
New Revision: 7524

Log:
Update Settings menu - ahmed

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

Modified: vtigercrm/trunk/Smarty/templates/SetMenu.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/SetMenu.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/SetMenu.tpl Mon Jun 26 06:35:16 2006
@@ -75,7 +75,7 @@
 				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=listemailtemplates&parenttab=Settings">{$MOD.EMAILTEMPLATES}</a></td></tr>
 				{/if}
 
-				{if $smarty.request.action eq 'listwordtemplates' || $smarty.request.action eq 'add2db' || $smarty.request.action eq 'deletewordtemplate'}
+				{if $smarty.request.action eq 'listwordtemplates' || $smarty.request.action eq 'add2db' || $smarty.request.action eq 'deletewordtemplate' || $smarty.request.action eq 'upload'}
 				<tr><td class="settingsTabSelected" nowrap>{$MOD.WORDINTEGRATION}</td></tr>
 				
 				{else}	
@@ -95,7 +95,7 @@
 				{/if} 	
 
 				{if $smarty.request.action eq 'OrganizationTermsandConditions' || $smarty.request.action eq 'savetermsandconditions'}
-				<tr><td class="settingsTabSelected" nowrap>{$MOD.INVENTORYNOTIFICATION}</td></tr>
+				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_INVENTORY_TANDC}</td></tr>
 				{else}
 				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=OrganizationTermsandConditions&parenttab=Settings">{$MOD.INVENTORYTERMSANDCONDITIONS}</a></td></tr>
 				{/if}
@@ -114,13 +114,13 @@
 				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=EmailConfig&parenttab=Settings">{$MOD.LBL_MAIL_SERVER_SETTINGS}</a></td></tr>
 				{/if}
 				
-				{if $smarty.request.action eq 'BackupServerConfig' || $smarty.request.action eq 'index' || $smarty.request.action eq 'Save'}
+				{if $smarty.request.action eq 'BackupServerConfig' || $smarty.request.action eq 'Save'}
 				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_BACKUP_SERVER_SETTINGS}</td></tr>
 				{else}
 				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=BackupServerConfig&parenttab=Settings">{$MOD.LBL_BACKUP_SERVER_SETTINGS}</a></td></tr>
 				{/if}
 				
-				{if $smarty.request.action eq 'CurrencyListView' ||  $smarty.request.action eq 'CurrencyEditView' ||  $smarty.request.action eq 'index' ||  $smarty.request.action eq 'SaveCurrencyInfo'}
+				{if $smarty.request.action eq 'CurrencyListView' ||  $smarty.request.action eq 'CurrencyEditView' ||  $smarty.request.action eq 'SaveCurrencyInfo'}
 				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_CURRENCY_SETTINGS}</td></tr>
 				{else}
 				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=CurrencyListView&parenttab=Settings">{$MOD.LBL_CURRENCY_SETTINGS}</a></td></tr>



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 05:38:14 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 12:38:14 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7525 -
 /vtigercrm/trunk/modules/Settings/ProxyServerConfig.php
Message-ID: <20060626123814.045AB83FD32@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 26 06:38:09 2006
New Revision: 7525

Log:
file added for proxy server settings

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



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 05:39:47 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 12:39:47 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7526 - in
 /vtigercrm/trunk/soap: firefoxtoolbar.php thunderbirdplugin.php
Message-ID: <20060626123947.DA48E83FD40@vtiger.fosslabs.com>

Author: richie
Date: Mon Jun 26 06:39:39 2006
New Revision: 7526

Log:
split contactserialize.php to individual files

Added:
    vtigercrm/trunk/soap/firefoxtoolbar.php
    vtigercrm/trunk/soap/thunderbirdplugin.php



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 05:40:44 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 12:40:44 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7527 -
 /vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php
Message-ID: <20060626124045.3CD5183FD40@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 26 06:40:41 2006
New Revision: 7527

Log:
* Modified to add vtiger_ as prefix for tables and fix the failed queries and removed some unwanted 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 Mon Jun 26 06:40:41 2006
@@ -17,9 +17,9 @@
 global $success_query_array, $failure_query_array;
 
 //Added to put prefix vtiger_ in some of the columns in tables which are used for CV and Reports and field -- 23-06-06
-$conn->println("First we will rename the existing tables with prefix vtiger_");
+$conn->println("Going to rename the table names with prefix vtiger_");
 include("modules/Migration/ModifyDatabase/rename_tables.php");
-$conn->println("Renaming the existing tables with prefix vtiger_ has been finished");
+$conn->println("Renaming the table names with prefix vtiger_ has been finished");
 
 
 
@@ -358,7 +358,7 @@
  `tabid` int(19) NOT NULL default '0',
  `user_id` varchar(11) NOT NULL default '',
  PRIMARY KEY  (`tabid`),
- CONSTRAINT `fk_ModuleOwners` FOREIGN KEY (`tabid`) REFERENCES `tab` (`tabid`) ON DELETE CASCADE
+ CONSTRAINT `fk_ModuleOwners` FOREIGN KEY (`tabid`) REFERENCES `vtiger_tab` (`tabid`) ON DELETE CASCADE
 ) TYPE=InnoDB";
 */
 Execute($create_query2);
@@ -432,10 +432,10 @@
 		"update vtiger_field set tablename='customerdetails' where tabid=4 and fieldname in ('portal','support_start_date','support_end_date')",
 		"alter table vtiger_PortalInfo drop foreign key fk_PortalInfo",
 		"rename table vtiger_PortalInfo to vtiger_portalinfo",
-		"alter table vtiger_portalinfo add CONSTRAINT `fk_portalinfo` FOREIGN KEY (`id`) REFERENCES `contactdetails` (`contactid`) ON DELETE CASCADE",
+		"alter table vtiger_portalinfo add CONSTRAINT `fk_portalinfo` FOREIGN KEY (`id`) REFERENCES `vtiger_contactdetails` (`contactid`) ON DELETE CASCADE",
 		"alter table vtiger_CustomerDetails drop foreign key fk_CustomerDetails",
 		"rename table vtiger_CustomerDetails to vtiger_customerdetails",
-		"alter table vtiger_customerdetails add CONSTRAINT `fk_customerdetails` FOREIGN KEY (`customerid`) REFERENCES `contactdetails` (`contactid`) ON DELETE CASCADE"
+		"alter table vtiger_customerdetails add CONSTRAINT `fk_customerdetails` FOREIGN KEY (`customerid`) REFERENCES `vtiger_contactdetails` (`contactid`) ON DELETE CASCADE"
 		);
 foreach($rename_table_array1 as $query)
 {
@@ -630,7 +630,7 @@
  `groupid` int(19) NOT NULL default '0',
  `containsgroupid` int(19) NOT NULL default '0',
  PRIMARY KEY (`groupid`,`containsgroupid`),
- CONSTRAINT `fk_group2grouprel1` FOREIGN KEY (`groupid`) REFERENCES `groups` (`groupid`) ON DELETE CASCADE
+ CONSTRAINT `fk_group2grouprel1` FOREIGN KEY (`groupid`) REFERENCES `vtiger_groups` (`groupid`) ON DELETE CASCADE
 ) TYPE=InnoDB";
 */
 Execute($query8);
@@ -647,7 +647,7 @@
  `groupid` int(19) NOT NULL default '0',
  `roleid` varchar(255) NOT NULL default '',
  PRIMARY KEY (`groupid`,`roleid`),
- CONSTRAINT `fk_group2role1` FOREIGN KEY (`groupid`) REFERENCES `groups` (`groupid`) ON DELETE CASCADE
+ CONSTRAINT `fk_group2role1` FOREIGN KEY (`groupid`) REFERENCES `vtiger_groups` (`groupid`) ON DELETE CASCADE
 ) TYPE=InnoDB";
 */
 Execute($query9);
@@ -664,7 +664,7 @@
  `groupid` int(19) NOT NULL default '0',
  `roleandsubid` varchar(255) NOT NULL default '',
  PRIMARY KEY (`groupid`,`roleandsubid`),
- CONSTRAINT `fk_group2rs1` FOREIGN KEY (`groupid`) REFERENCES `groups` (`groupid`) ON DELETE CASCADE
+ CONSTRAINT `fk_group2rs1` FOREIGN KEY (`groupid`) REFERENCES `vtiger_groups` (`groupid`) ON DELETE CASCADE
 ) TYPE=InnoDB";
 */
 Execute($query10);
@@ -766,7 +766,7 @@
 	`share_action_id` int(19) NOT NULL default '0',
 	`tabid` int(19) NOT NULL default '0',
 	PRIMARY KEY  (`share_action_id`,`tabid`),
-	CONSTRAINT `fk_org_share_action2tab` FOREIGN KEY (`share_action_id`) REFERENCES `org_share_action_mapping` (`share_action_id`) ON DELETE CASCADE
+	CONSTRAINT `fk_org_share_action2tab` FOREIGN KEY (`share_action_id`) REFERENCES `vtiger_org_share_action_mapping` (`share_action_id`) ON DELETE CASCADE
 	) TYPE=InnoDB";
 Execute($query2);
 
@@ -1478,12 +1478,20 @@
 	Execute($query);
 }
 
+//Added on 26-06-06 - we cannot add foreign key in type MyISAM, so we have to change the type to InnoDB
+$alter_tables_array = Array("vtiger_groups","vtiger_potential","vtiger_quotes","vtiger_salesorder","vtiger_invoice","vtiger_purchaseorder");
+foreach($alter_tables_array as $tablename)
+{
+	Execute("alter table $tablename type=InnoDB");
+}
+
+
 $create_query6 = "CREATE TABLE vtiger_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 vtiger_accountgrouprelation ADD CONSTRAINT fk_accountgrouprelation FOREIGN KEY (accountid) REFERENCES vtiger_account(accountid) ON DELETE CASCADE",
-				"alter table vtiger_accountgrouprelation ADD CONSTRAINT fk_accountgrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_groups(name) ON DELETE CASCADE"
+				"alter table vtiger_accountgrouprelation ADD CONSTRAINT fk_accountgrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE"
 			   );
 foreach($alter_query_array8 as $query)
 {
@@ -1495,7 +1503,7 @@
 
 $alter_query_array9 = Array(
 				"alter table vtiger_contactgrouprelation ADD CONSTRAINT fk_contactgrouprelation FOREIGN KEY (contactid) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE",
-				"alter table vtiger_contactgrouprelation ADD CONSTRAINT fk_contactgrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_groups(name) ON DELETE CASCADE"
+				"alter table vtiger_contactgrouprelation ADD CONSTRAINT fk_contactgrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE"
 			   );
 foreach($alter_query_array9 as $query)
 {
@@ -1508,7 +1516,7 @@
 
 $alter_query_array10 = Array(
 				"alter table vtiger_potentialgrouprelation ADD CONSTRAINT fk_potentialgrouprelation FOREIGN KEY (potentialid) REFERENCES vtiger_potential(potentialid) ON DELETE CASCADE",
-				"alter table vtiger_potentialgrouprelation ADD CONSTRAINT fk_potentialgrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_groups(name) ON DELETE CASCADE"
+				"alter table vtiger_potentialgrouprelation ADD CONSTRAINT fk_potentialgrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE"
 			    );
 foreach($alter_query_array10 as $query)
 {
@@ -1520,7 +1528,7 @@
 
 $alter_query_array11 = Array(
 				"alter table vtiger_quotegrouprelation ADD CONSTRAINT fk_quotegrouprelation FOREIGN KEY (quoteid) REFERENCES vtiger_quotes(quoteid) ON DELETE CASCADE",
-				"alter table vtiger_quotegrouprelation ADD CONSTRAINT fk_quotegrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_groups(name) ON DELETE CASCADE"
+				"alter table vtiger_quotegrouprelation ADD CONSTRAINT fk_quotegrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE"
 			    );
 foreach($alter_query_array11 as $query)
 {
@@ -1532,7 +1540,7 @@
 
 $alter_query_array12 = Array(
 				"alter table vtiger_sogrouprelation ADD CONSTRAINT fk_sogrouprelation FOREIGN KEY (salesorderid) REFERENCES vtiger_salesorder(salesorderid) ON DELETE CASCADE",
-				"alter table vtiger_sogrouprelation ADD CONSTRAINT fk_sogrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_groups(name) ON DELETE CASCADE"
+				"alter table vtiger_sogrouprelation ADD CONSTRAINT fk_sogrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE"
 			    );
 foreach($alter_query_array12 as $query)
 {
@@ -1544,7 +1552,7 @@
 
 $alter_query_array13 = Array(
 				"alter table vtiger_invoicegrouprelation ADD CONSTRAINT fk_invoicegrouprelation FOREIGN KEY (invoiceid) REFERENCES vtiger_invoice(invoiceid) ON DELETE CASCADE",
-				"alter table vtiger_invoicegrouprelation ADD CONSTRAINT fk_invoicegrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_groups(name) ON DELETE CASCADE"
+				"alter table vtiger_invoicegrouprelation ADD CONSTRAINT fk_invoicegrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE"
 			    );
 foreach($alter_query_array13 as $query)
 {
@@ -1556,7 +1564,7 @@
 
 $alter_query_array14 = Array(
 				"alter table vtiger_pogrouprelation ADD CONSTRAINT fk_pogrouprelation FOREIGN KEY (purchaseorderid) REFERENCES vtiger_purchaseorder(purchaseorderid) ON DELETE CASCADE",
-				"alter table vtiger_pogrouprelation ADD CONSTRAINT fk_productgrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_groups(name) ON DELETE CASCADE"
+				"alter table vtiger_pogrouprelation ADD CONSTRAINT fk_productgrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE"
 			    );
 foreach($alter_query_array14 as $query)
 {
@@ -1669,11 +1677,11 @@
 Execute($create_query19);
 
 $alter_query_array17 = Array(
-				"ALTER TABLE `vtiger_chat_msg`  ADD CONSTRAINT `chat_msg_ibfk_1` FOREIGN KEY (`chat_from`) REFERENCES `chat_users` (`id`) ON DELETE CASCADE",
-
-				"ALTER TABLE `vtiger_chat_pchat`  ADD CONSTRAINT `chat_pchat_ibfk_1` FOREIGN KEY (`msg`) REFERENCES `chat_msg` (`id`) ON DELETE CASCADE",
-
-				"ALTER TABLE `vtiger_chat_pvchat`  ADD CONSTRAINT `chat_pvchat_ibfk_1` FOREIGN KEY (`msg`) REFERENCES `chat_msg` (`id`) ON DELETE CASCADE"
+				"ALTER TABLE `vtiger_chat_msg`  ADD CONSTRAINT `chat_msg_ibfk_1` FOREIGN KEY (`chat_from`) REFERENCES `vtiger_chat_users` (`id`) ON DELETE CASCADE",
+
+				"ALTER TABLE `vtiger_chat_pchat`  ADD CONSTRAINT `chat_pchat_ibfk_1` FOREIGN KEY (`msg`) REFERENCES `vtiger_chat_msg` (`id`) ON DELETE CASCADE",
+
+				"ALTER TABLE `vtiger_chat_pvchat`  ADD CONSTRAINT `chat_pvchat_ibfk_1` FOREIGN KEY (`msg`) REFERENCES `vtiger_chat_msg` (`id`) ON DELETE CASCADE"
 			    );
 foreach($alter_query_array17 as $query)
 {
@@ -1823,8 +1831,8 @@
   `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_CampaignContRel1` FOREIGN KEY (`campaignid`) REFERENCES `campaign` (`campaignid`) ON DELETE CASCADE
+  CONSTRAINT `fk_CampaignContRel2` FOREIGN KEY (`contactid`) REFERENCES `vtiger_contactdetails` (`contactid`) ON DELETE CASCADE,
+  CONSTRAINT `fk_CampaignContRel1` FOREIGN KEY (`campaignid`) REFERENCES `vtiger_campaign` (`campaignid`) ON DELETE CASCADE
 ) ENGINE=InnoDB";
 */
 Execute($create_query25);
@@ -1843,8 +1851,8 @@
        `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
+	CONSTRAINT `fk_campaigngrouprelation2` FOREIGN KEY (`groupname`) REFERENCES `vtiger_groups` (`groupname`) ON DELETE CASCADE,
+	CONSTRAINT `fk_campaigngrouprelation1` FOREIGN KEY (`campaignid`) REFERENCES `vtiger_campaign` (`campaignid`) ON DELETE CASCADE
 ) ENGINE=InnoDB";
 */
 Execute($create_table_query);
@@ -1863,8 +1871,8 @@
   `leadid` int(19) NOT NULL default '0',
   PRIMARY KEY  (`campaignid`),
   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
+  CONSTRAINT `fk_CampaignLeadRel1234` FOREIGN KEY (`campaignid`) REFERENCES `vtiger_campaign` (`campaignid`) ON DELETE CASCADE,
+  CONSTRAINT `fk_CampaignLeadRel2423` FOREIGN KEY (`leadid`) REFERENCES `vtiger_leaddetails` (`leadid`) ON DELETE CASCADE
 ) ENGINE=InnoDB";
 */
 Execute($create_query26);
@@ -1872,7 +1880,7 @@
 $create_table_query1 = "CREATE TABLE vtiger_campaignscf (
   `campaignid` int(19) NOT NULL default '0',
    PRIMARY KEY  (`campaignid`),
-   CONSTRAINT `fk_CampaignsCF` FOREIGN KEY (`campaignid`) REFERENCES `campaign` (`campaignid`) ON DELETE CASCADE
+   CONSTRAINT `fk_CampaignsCF` FOREIGN KEY (`campaignid`) REFERENCES `vtiger_campaign` (`campaignid`) ON DELETE CASCADE
 ) ENGINE=InnoDB";
 Execute($create_table_query1);
 
@@ -1912,7 +1920,7 @@
 //"ALTER TABLE `vtiger_field` DROP INDEX `tabid`",
 "ALTER TABLE `vtiger_freetagged_objects` DROP INDEX `tagger_id_index`",
 "ALTER TABLE `vtiger_freetagged_objects` DROP INDEX `object_id_index`",
-"ALTER TABLE `vtiger_groups` DROP INDEX `groupname`",
+//"ALTER TABLE `vtiger_groups` DROP INDEX `groupname`",
 //"ALTER TABLE `vtiger_invoicegrouprelation` DROP INDEX `fk_invoicegrouprelation2`",
 //"ALTER TABLE `vtiger_leadscf` DROP COLUMN `cf_354`",
 //"ALTER TABLE `vtiger_leadscf` DROP COLUMN `cf_358`",
@@ -2054,9 +2062,9 @@
   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
+  CONSTRAINT `fk_datashare_grp2grp2` FOREIGN KEY (`to_groupid`) REFERENCES `vtiger_groups` (`groupid`) ON DELETE CASCADE,
+  CONSTRAINT `fk_datashare_grp2grp1` FOREIGN KEY (`share_groupid`) REFERENCES `vtiger_groups` (`groupid`) ON DELETE CASCADE,
+  CONSTRAINT `fk_datashare_grp2grp789` FOREIGN KEY (`shareid`) REFERENCES `vtiger_datashare_module_rel` (`shareid`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1",
 */
 
@@ -2078,9 +2086,9 @@
   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
+  CONSTRAINT `fk_datashare_grp2role2` FOREIGN KEY (`to_roleid`) REFERENCES `vtiger_role` (`roleid`) ON DELETE CASCADE,
+  CONSTRAINT `fk_datashare_grp2role1` FOREIGN KEY (`share_groupid`) REFERENCES `vtiger_groups` (`groupid`) ON DELETE CASCADE,
+  CONSTRAINT `fk_datashare_grp2role345` FOREIGN KEY (`shareid`) REFERENCES `vtiger_datashare_module_rel` (`shareid`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1",
 */
 
@@ -2103,9 +2111,9 @@
   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
+  CONSTRAINT `fk_datashare_grp2rs3` FOREIGN KEY (`to_roleandsubid`) REFERENCES `vtiger_role` (`roleid`) ON DELETE CASCADE,
+  CONSTRAINT `fk_datashare_grp2rs1` FOREIGN KEY (`share_groupid`) REFERENCES `vtiger_groups` (`groupid`) ON DELETE CASCADE,
+  CONSTRAINT `fk_datashare_grp2rs36` FOREIGN KEY (`shareid`) REFERENCES `vtiger_datashare_module_rel` (`shareid`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1",
 */
 
@@ -2134,8 +2142,8 @@
   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
+  CONSTRAINT `fk_datashare_relatedmodules1` FOREIGN KEY (`relatedto_tabid`) REFERENCES `vtiger_tab` (`tabid`) ON DELETE CASCADE,
+  CONSTRAINT `fk_datashare_relatedmodules123` FOREIGN KEY (`tabid`) REFERENCES `vtiger_tab` (`tabid`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1",
 */
 
@@ -2162,9 +2170,9 @@
   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
+  CONSTRAINT `fk_datashare_role2group3` FOREIGN KEY (`to_groupid`) REFERENCES `vtiger_groups` (`groupid`) ON DELETE CASCADE,
+  CONSTRAINT `fk_datashare_role2group1` FOREIGN KEY (`share_roleid`) REFERENCES `vtiger_role` (`roleid`) ON DELETE CASCADE,
+  CONSTRAINT `fk_datashare_role2group568` FOREIGN KEY (`shareid`) REFERENCES `vtiger_datashare_module_rel` (`shareid`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1",
 */
 
@@ -2187,9 +2195,9 @@
   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
+  CONSTRAINT `fk_datashare_role2role3` FOREIGN KEY (`to_roleid`) REFERENCES `vtiger_role` (`roleid`) ON DELETE CASCADE,
+  CONSTRAINT `fk_datashare_role2role1` FOREIGN KEY (`share_roleid`) REFERENCES `vtiger_role` (`roleid`) ON DELETE CASCADE,
+  CONSTRAINT `fk_datashare_role2role345` FOREIGN KEY (`shareid`) REFERENCES `vtiger_datashare_module_rel` (`shareid`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1",
 */
 
@@ -2212,9 +2220,9 @@
   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
+  CONSTRAINT `fk_datashare_role2rs3` FOREIGN KEY (`to_roleandsubid`) REFERENCES `vtiger_role` (`roleid`) ON DELETE CASCADE,
+  CONSTRAINT `fk_datashare_role2rs1` FOREIGN KEY (`share_roleid`) REFERENCES `vtiger_role` (`roleid`) ON DELETE CASCADE,
+  CONSTRAINT `fk_datashare_role2rs987` FOREIGN KEY (`shareid`) REFERENCES `vtiger_datashare_module_rel` (`shareid`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1",
 */
 
@@ -2428,7 +2436,7 @@
 //"ALTER TABLE `vtiger_invoice` MODIFY COLUMN `salesorderid` INTEGER(19) DEFAULT NULL UNIQUE",
 "ALTER TABLE `vtiger_invoice` MODIFY COLUMN `terms_conditions` TEXT COLLATE latin1_swedish_ci",
 //"ALTER TABLE `vtiger_invoicegrouprelation` MODIFY COLUMN `invoiceid` INTEGER(19) NOT NULL PRIMARY KEY",
-"ALTER TABLE `vtiger_invoiceproductrel` MODIFY COLUMN `invoiceid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_invoiceproductrel` MODIFY COLUMN `invoiceid` INTEGER(19) NOT NULL PRIMARY KEY",
 //"ALTER TABLE `vtiger_invoiceproductrel` MODIFY COLUMN `productid` INTEGER(19) NOT NULL PRIMARY KEY",
 "ALTER TABLE `vtiger_lar` MODIFY COLUMN `createdon` DATE NOT NULL",
 //"ALTER TABLE `vtiger_leaddetails` MODIFY COLUMN `leadid` INTEGER(19) NOT NULL PRIMARY KEY",
@@ -2446,8 +2454,8 @@
 "ALTER TABLE `vtiger_notificationscheduler` MODIFY COLUMN `notificationbody` TEXT COLLATE latin1_swedish_ci",
 "ALTER TABLE `vtiger_notificationscheduler_seq` MODIFY COLUMN `id` INTEGER(11) NOT NULL",
 "ALTER TABLE `vtiger_opportunitystage` MODIFY COLUMN `probability` DECIMAL(3,2) DEFAULT '0.00'",
-"ALTER TABLE `vtiger_org_share_action2tab` MODIFY COLUMN `share_action_id` INTEGER(19) NOT NULL PRIMARY KEY",
-"ALTER TABLE `vtiger_org_share_action2tab` MODIFY COLUMN `tabid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_org_share_action2tab` MODIFY COLUMN `share_action_id` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_org_share_action2tab` MODIFY COLUMN `tabid` INTEGER(19) NOT NULL PRIMARY KEY",
 //"ALTER TABLE `vtiger_org_share_action_mapping` MODIFY COLUMN `share_action_id` INTEGER(19) NOT NULL PRIMARY KEY",
 "ALTER TABLE `vtiger_organizationdetails` MODIFY COLUMN `website` VARCHAR(100) COLLATE latin1_swedish_ci DEFAULT NULL",
 "ALTER TABLE `vtiger_organizationdetails` MODIFY COLUMN `logo` TEXT COLLATE latin1_swedish_ci",
@@ -2627,32 +2635,17 @@
 "ALTER TABLE `vtiger_troubletickets` ADD KEY `status2` (`status`)",
 "ALTER TABLE `vtiger_users2group` ADD KEY `idx_users2group` (`groupid`, `userid`)",
 "ALTER TABLE `vtiger_users2group` ADD KEY `fk_users2group2` (`userid`)",
-//"ALTER TABLE `vtiger_accountgrouprelation` ADD CONSTRAINT `fk_accountgrouprelation2` FOREIGN KEY (`groupname`) REFERENCES `groups` (`groupname`) ON DELETE CASCADE",
-//"ALTER TABLE `vtiger_accountgrouprelation` ADD CONSTRAINT `fk_accountgrouprelation123` FOREIGN KEY (`accountid`) REFERENCES `account` (`accountid`) ON DELETE CASCADE",
-//"ALTER TABLE `vtiger_contactgrouprelation` ADD CONSTRAINT `fk_contactgrouprelation2` FOREIGN KEY (`groupname`) REFERENCES `groups` (`groupname`) ON DELETE CASCADE",
-//"ALTER TABLE `vtiger_contactgrouprelation` ADD CONSTRAINT `fk_contactgrouprelation123` FOREIGN KEY (`contactid`) REFERENCES `contactdetails` (`contactid`) ON DELETE CASCADE",
-"ALTER TABLE `vtiger_customaction` ADD CONSTRAINT `customaction_FK1` FOREIGN KEY (`cvid`) REFERENCES `customview` (`cvid`) ON DELETE CASCADE",
-"ALTER TABLE `vtiger_invoice` ADD CONSTRAINT `fk_Invoice2` FOREIGN KEY (`salesorderid`) REFERENCES `salesorder` (`salesorderid`) ON DELETE CASCADE",
-//"ALTER TABLE `vtiger_invoicegrouprelation` ADD CONSTRAINT `fk_invoicegrouprelation234` FOREIGN KEY (`invoiceid`) REFERENCES `invoice` (`invoiceid`) ON DELETE CASCADE",
-//"ALTER TABLE `vtiger_invoicegrouprelation` ADD CONSTRAINT `fk_invoicegrouprelation2` FOREIGN KEY (`groupname`) REFERENCES `groups` (`groupname`) ON DELETE CASCADE",
-//"ALTER TABLE `vtiger_org_share_action2tab` ADD CONSTRAINT `fk_org_share_action2tab12345` FOREIGN KEY (`tabid`) REFERENCES `tab` (`tabid`) ON DELETE CASCADE",
-//"ALTER TABLE `vtiger_pogrouprelation` ADD CONSTRAINT `fk_pogrouprelation2` FOREIGN KEY (`groupname`) REFERENCES `groups` (`groupname`) ON DELETE CASCADE",
-//"ALTER TABLE `vtiger_pogrouprelation` ADD CONSTRAINT `fk_pogrouprelation123` FOREIGN KEY (`purchaseorderid`) REFERENCES `purchaseorder` (`purchaseorderid`) ON DELETE CASCADE",
-//"ALTER TABLE `vtiger_potentialgrouprelation` ADD CONSTRAINT `fk_potentialgrouprelation2` FOREIGN KEY (`groupname`) REFERENCES `groups` (`groupname`) ON DELETE CASCADE",
-//"ALTER TABLE `vtiger_potentialgrouprelation` ADD CONSTRAINT `fk_potentialgrouprelation67` FOREIGN KEY (`potentialid`) REFERENCES `potential` (`potentialid`) ON DELETE CASCADE",
-//"ALTER TABLE `vtiger_profile2globalpermissions` ADD CONSTRAINT `fk_profile2globalpermissions57` FOREIGN KEY (`profileid`) REFERENCES `profile` (`profileid`) ON DELETE CASCADE",
-"ALTER TABLE `vtiger_purchaseorder` ADD CONSTRAINT `fk_PO3` FOREIGN KEY (`contactid`) REFERENCES `contactdetails` (`contactid`) ON DELETE CASCADE",
-"ALTER TABLE `vtiger_purchaseorder` ADD CONSTRAINT `fk_PO2` FOREIGN KEY (`vendorid`) REFERENCES `vendor` (`vendorid`) ON DELETE CASCADE",
-"ALTER TABLE `vtiger_purchaseorder` ADD CONSTRAINT `fk_PO2345` FOREIGN KEY (`quoteid`) REFERENCES `quotes` (`quoteid`) ON DELETE CASCADE",
-//"ALTER TABLE `vtiger_quotegrouprelation` ADD CONSTRAINT `fk_quotegrouprelation2` FOREIGN KEY (`groupname`) REFERENCES `groups` (`groupname`) ON DELETE CASCADE",
-//"ALTER TABLE `vtiger_quotegrouprelation` ADD CONSTRAINT `fk_quotegrouprelation132` FOREIGN KEY (`quoteid`) REFERENCES `quotes` (`quoteid`) ON DELETE CASCADE",
-"ALTER TABLE `vtiger_quotes` ADD CONSTRAINT `fk_Quotes3` FOREIGN KEY (`contactid`) REFERENCES `contactdetails` (`contactid`) ON DELETE CASCADE",
-"ALTER TABLE `vtiger_quotes` ADD CONSTRAINT `fk_Quotes2` FOREIGN KEY (`potentialid`) REFERENCES `potential` (`potentialid`) ON DELETE CASCADE",
-"ALTER TABLE `vtiger_salesorder` ADD CONSTRAINT `fk_SO4` FOREIGN KEY (`contactid`) REFERENCES `contactdetails` (`contactid`) ON DELETE CASCADE",
-"ALTER TABLE `vtiger_salesorder` ADD CONSTRAINT `fk_SO2` FOREIGN KEY (`vendorid`) REFERENCES `vendor` (`vendorid`) ON DELETE CASCADE",
-//"ALTER TABLE `vtiger_sogrouprelation` ADD CONSTRAINT `fk_sogrouprelation2` FOREIGN KEY (`groupname`) REFERENCES `groups` (`groupname`) ON DELETE CASCADE",
-//"ALTER TABLE `vtiger_sogrouprelation` ADD CONSTRAINT `fk_sogrouprelation78` FOREIGN KEY (`salesorderid`) REFERENCES `salesorder` (`salesorderid`) ON DELETE CASCADE",
-"ALTER TABLE `vtiger_vendorcontactrel` ADD CONSTRAINT `fk_VendorContactRel45` FOREIGN KEY (`vendorid`) REFERENCES `vendor` (`vendorid`) ON DELETE CASCADE"
+"ALTER TABLE `vtiger_customaction` ADD CONSTRAINT `customaction_FK1` FOREIGN KEY (`cvid`) REFERENCES `vtiger_customview` (`cvid`) ON DELETE CASCADE",
+"ALTER TABLE `vtiger_invoice` ADD CONSTRAINT `fk_Invoice2` FOREIGN KEY (`salesorderid`) REFERENCES `vtiger_salesorder` (`salesorderid`) ON DELETE CASCADE",
+//"ALTER TABLE `vtiger_profile2globalpermissions` ADD CONSTRAINT `fk_profile2globalpermissions57` FOREIGN KEY (`profileid`) REFERENCES `vtiger_profile` (`profileid`) ON DELETE CASCADE",
+"ALTER TABLE `vtiger_purchaseorder` ADD CONSTRAINT `fk_PO3` FOREIGN KEY (`contactid`) REFERENCES `vtiger_contactdetails` (`contactid`) ON DELETE CASCADE",
+"ALTER TABLE `vtiger_purchaseorder` ADD CONSTRAINT `fk_PO2` FOREIGN KEY (`vendorid`) REFERENCES `vtiger_vendor` (`vendorid`) ON DELETE CASCADE",
+"ALTER TABLE `vtiger_purchaseorder` ADD CONSTRAINT `fk_PO2345` FOREIGN KEY (`quoteid`) REFERENCES `vtiger_quotes` (`quoteid`) ON DELETE CASCADE",
+"ALTER TABLE `vtiger_quotes` ADD CONSTRAINT `fk_Quotes3` FOREIGN KEY (`contactid`) REFERENCES `vtiger_contactdetails` (`contactid`) ON DELETE CASCADE",
+"ALTER TABLE `vtiger_quotes` ADD CONSTRAINT `fk_Quotes2` FOREIGN KEY (`potentialid`) REFERENCES `vtiger_potential` (`potentialid`) ON DELETE CASCADE",
+"ALTER TABLE `vtiger_salesorder` ADD CONSTRAINT `fk_SO4` FOREIGN KEY (`contactid`) REFERENCES `vtiger_contactdetails` (`contactid`) ON DELETE CASCADE",
+"ALTER TABLE `vtiger_salesorder` ADD CONSTRAINT `fk_SO2` FOREIGN KEY (`vendorid`) REFERENCES `vtiger_vendor` (`vendorid`) ON DELETE CASCADE",
+"ALTER TABLE `vtiger_vendorcontactrel` ADD CONSTRAINT `fk_VendorContactRel45` FOREIGN KEY (`vendorid`) REFERENCES `vtiger_vendor` (`vendorid`) ON DELETE CASCADE"
 		    );
 foreach($query_array as $query)
 {



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 05:41:38 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 12:41:38 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7529 -
 /vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl
Message-ID: <20060626124138.B1D5583FD3A@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 26 06:41:34 2006
New Revision: 7529

Log:
update sharing access tpl file

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

Modified: vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl Mon Jun 26 06:41:34 2006
@@ -18,7 +18,7 @@
 	width:500px;
 	position:fixed;
 	left:250px;
-	top:200px;
+	top:98px;
 	display:block;
 }
 </style>



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 05:42:53 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 12:42:53 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7530 -
 /vtigercrm/trunk/modules/Migration/ModifyDatabase/rename_tables.php
Message-ID: <20060626124253.7A69783FD3A@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 26 06:42:49 2006
New Revision: 7530

Log:
* Added newly which will be used to rename all the tables with prefix vtiger_ and update some table columns with prefix which have the tablename in its colum values

Added:
    vtigercrm/trunk/modules/Migration/ModifyDatabase/rename_tables.php



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 05:43:19 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 12:43:19 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7531 -
 /vtigercrm/trunk/modules/Settings/language/en_us.lang.php
Message-ID: <20060626124319.4114183FD3A@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 26 06:43:15 2006
New Revision: 7531

Log:
labels added for proxy server settings

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 Jun 26 06:43:15 2006
@@ -320,6 +320,7 @@
 
 'LBL_SYSTEM_CONFIG'=>'System Configuration',
 'LBL_SYSTEM_INFO'=>'System Information',
+'LBL_PROXY_SETTINGS'=>'Proxy Server Settings',
 
 'LBL_CURRENCY_CONFIGURATION'=>'- Currency Information',
 
@@ -446,6 +447,16 @@
 'LBL_CONFIGURE_BACKUP_SERVER'=>' - Configure Backup Server',
 
 'LBL_SYSTEM_CONFIGURATION'=>' - System Configuration',
+
+'LBL_PROXY_SERVER_CONFIGURATION'=>'Proxy Server Configuration',
+
+'LBL_PROXY_SERVER_INFO'=>'Proxy Server Information',
+
+'LBL_PROXY_SERVER_SETTINGS'=>'Proxy Server Settings',
+
+'LBL_CONFIGURE_PROXY_SERVER'=>' - Configure Proxy Server',
+
+'LBL_PROXY_PORT'=>'Port Number',
 
 
 



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 05:48:18 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 12:48:18 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7532 -
	/vtigercrm/trunk/Smarty/templates/Settings.tpl
Message-ID: <20060626124818.DE05983FD4A@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 26 06:48:15 2006
New Revision: 7532

Log:
changes made for proxy server 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 Mon Jun 26 06:48:15 2006
@@ -474,7 +474,7 @@
 						<table border=0 cellspacing=0 cellpadding=5 width=100%>
 						<tr>
 							<td rowspan=2 valign=top>&nbsp;</td>
-							<td class=big valign=top>&nbsp;</td>
+							<td class=big valign=top><a href="index.php?module=Settings&action=ProxyServerConfig&parenttab=Settings">{$MOD.LBL_PROXY_SETTINGS}</a></td>
 						</tr>
 						<tr>
 							<td class="small" valign=top>&nbsp;</td>



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 05:51:38 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 12:51:38 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7533 -
	/vtigercrm/trunk/Smarty/templates/SetMenu.tpl
Message-ID: <20060626125138.8529683FD4A@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 26 06:51:34 2006
New Revision: 7533

Log:
changes made for proxy server settings

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

Modified: vtigercrm/trunk/Smarty/templates/SetMenu.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/SetMenu.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/SetMenu.tpl Mon Jun 26 06:51:34 2006
@@ -136,6 +136,11 @@
 				{else}
 				<tr><td class="settingsTabList" nowrap><a href="index.php?module=System&action=systemconfig&parenttab=Settings">{$MOD.LBL_SYSTEM_INFO}</a></td></tr>
 				{/if}
+				{if $smarty.request.action eq 'ProxyServerConfig'}
+                                <tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_PROXY_SETTINGS}</td></tr>
+                                {else}
+                                <tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=ProxyServerConfig&parenttab=Settings">{$MOD.LBL_PROXY_SETTINGS}</a></td></tr>
+                                {/if}
 				</table>
 			</td>
 			<td width=90% class="small settingsSelectedUI" valign=top >



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 05:53:59 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 12:53:59 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7534 -
 /vtigercrm/trunk/Smarty/templates/Settings/ProxyServer.tpl
Message-ID: <20060626125359.C026D83FD50@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 26 06:53:55 2006
New Revision: 7534

Log:
file added for proxy server settings

Added:
    vtigercrm/trunk/Smarty/templates/Settings/ProxyServer.tpl



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 05:41:13 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 12:41:13 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7528 -
	/vtigercrm/trunk/vtigerservice.php
Message-ID: <20060626124113.311C183FD2F@vtiger.fosslabs.com>

Author: richie
Date: Mon Jun 26 06:41:09 2006
New Revision: 7528

Log:
changed reference to firefox and thunderbird rel files

Modified:
    vtigercrm/trunk/vtigerservice.php

Modified: vtigercrm/trunk/vtigerservice.php
==============================================================================
--- vtigercrm/trunk/vtigerservice.php (original)
+++ vtigercrm/trunk/vtigerservice.php Mon Jun 26 06:41:09 2006
@@ -25,7 +25,7 @@
 	}
 	elseif($_REQUEST['service'] == "firefox")
 	{
-		include("soap/contactserialize.php");
+		include("soap/firefoxtoolbar.php");
 	}
 	elseif($_REQUEST['service'] == "wordplugin")
 	{
@@ -33,7 +33,7 @@
 	}
 	elseif($_REQUEST['service'] == "thunderbird")
 	{
-		include("soap/contactserialize.php");
+		include("soap/thunderbirdplugin.php");
 	}
 	else
 	{



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 07:05:37 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 14:05:37 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7535 - in
 /vtigercrm/trunk/modules/Dashboard: Entity_charts.php display_charts.php
Message-ID: <20060626140537.E50C083FD23@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 26 08:05:33 2006
New Revision: 7535

Log:
Changes made for product quantity stock graph

Modified:
    vtigercrm/trunk/modules/Dashboard/Entity_charts.php
    vtigercrm/trunk/modules/Dashboard/display_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 Mon Jun 26 08:05:33 2006
@@ -98,9 +98,20 @@
 			}
 
 			//Counting the number of values for a type of graph
-			if(!isset($mod_count_array[$mod_name]))
-				$mod_count_array[$mod_name]=0;
-			$mod_count_array[$mod_name]++;
+			if($graph_for == "productid")
+			{
+				if($row['qtyinstock'] =='')
+					$mod_count_array[$mod_name] = 0;
+				else
+					$mod_count_array[$mod_name]=$row['qtyinstock'];
+
+			}
+			else
+			{
+				if(!isset($mod_count_array[$mod_name]))
+					$mod_count_array[$mod_name]=0;
+				$mod_count_array[$mod_name]++;
+			}
 
 			//Counting the number of values for a type of graph for a particular date
 			if(!isset($count_by_date[$mod_name][$crtd_date]))
@@ -200,7 +211,7 @@
 					if($name_val!="")
 						$name=$name_val;
 				}
-				if($graph_for =="product_id")
+				if($graph_for =="product_id" || $graph_for =="productid")
 				{
 					$query = "SELECT productname FROM vtiger_products WHERE productid='".$name."'";
 					$result = $adb->query($query);
@@ -241,29 +252,15 @@
 					if($name_val!="")
 						$name=$name_val;
 				}
-			if($graph_for =="contactid")
+				if($graph_for =="contactid")
 				{
 					$query = "SELECT lastname FROM vtiger_contactdetails WHERE contactid='".$name."'";
-					echo '>>>>>>>>>. '.$query;
 					$result = $adb->query($query);
 					$name_val = $adb->query_result($result,0,"lastname");
 					if($name_val!="")
 						$name=$name_val;
 				}
 
-
-
-
-
-
-
-
-
-
-
-
-
-				
 				//Passing name to graph
 				if($mod_name_val!="") $mod_name_val.="::$name";
 				else $mod_name_val="$name";
@@ -315,7 +312,15 @@
 				if($period_type!="yday")
 					$mod_cnt_table.="<td>$tot</td>";
 			}
-			$cnt_total=array_sum($mod_tot_cnt_array);
+			if($graph_for == "productid")
+			{
+				$cnt_total=array_sum($mod_count_array);
+			}
+			else
+			{
+				$cnt_total=array_sum($mod_tot_cnt_array);
+			}
+
 			$mod_cnt_table.="<td align=\"center\" class=\"$class\">$cnt_total</td></tr></table>";
 			$mod_cnt_table.="</table>";
 			$title_of_graph="$title : $cnt_total";

Modified: vtigercrm/trunk/modules/Dashboard/display_charts.php
==============================================================================
--- vtigercrm/trunk/modules/Dashboard/display_charts.php (original)
+++ vtigercrm/trunk/modules/Dashboard/display_charts.php Mon Jun 26 08:05:33 2006
@@ -486,9 +486,9 @@
                             echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
                     }
 		    //Charts for Products by Quantity in stock
-		    elseif (($type == "productbyqtyinstock") && (getFieldVisibilityPermission('Products',$user_id,'productqtyinstock') == "0"))
-		    {
-			$graph_by="qtyinstock";
+		    elseif (($type == "productbyqtyinstock") && (getFieldVisibilityPermission('Products',$user_id,'qtyinstock') == "0"))
+		    {
+			$graph_by="productid";
 			    $graph_title=$mod_strings['productbyqtyinstock'];
 			    $module="Products";
 			    $where="";



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 07:23:27 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 14:23:27 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7536 -
	/vtigercrm/trunk/include/utils/ListViewUtils.php
Message-ID: <20060626142328.1588483FD23@vtiger.fosslabs.com>

Author: richie
Date: Mon Jun 26 08:23:17 2006
New Revision: 7536

Log:
Security support for Emails done

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 Jun 26 08:23:17 2006
@@ -1841,7 +1841,7 @@
 				ON vtiger_emaildetails.emailid = vtiger_activity.activityid
 			WHERE vtiger_activity.activitytype = 'Emails'
 			AND vtiger_crmentity.deleted = 0 ";
-		if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[$tab_id] == 3)
+		if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1)
 		{
 			$sec_parameter=getListViewSecurityParameter($module);
 			$query .= $sec_parameter;	



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 07:28:38 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 14:28:38 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7537 -
 /vtigercrm/trunk/Smarty/templates/CreateWordTemplate.tpl
Message-ID: <20060626142838.5B89983FD19@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 26 08:28:34 2006
New Revision: 7537

Log:
update createwordtemplate tpl file

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 Mon Jun 26 08:28:34 2006
@@ -43,7 +43,7 @@
 				
 					<table border=0 cellspacing=0 cellpadding=5 width=100% class="tableHeading">
 					<tr>
-						<td class="big"><strong>{$UMOD.LBL_NEW_TEMPLATE}</strong></td>
+						<td class="big"><strong>{$UMOD.LBL_NEW_TEMPLATE}</strong><br>{$ERRORFLAG}</br></td>
 						<td class="small" align=right>
 							<input title="{$APP.LBL_SAVE_BUTTON_LABEL}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" type="submit" tabindex="4" name="button" value="{$APP.LBL_SAVE_BUTTON_LABEL}" onclick="this.form.action.value='add2db'; this.form.parenttab.value='Settings'" class="crmButton small save" />&nbsp;
 							&nbsp;<input title="{$APP.LBL_CANCEL_BUTTON_LABEL}" accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" tabindex="5"  onclick="window.history.back()" type="button" name="button" value="{$APP.LBL_CANCEL_BUTTON_LABEL}" class="crmButton small cancel" />



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 07:29:23 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 14:29:23 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7538 -
	/vtigercrm/trunk/include/utils/UserInfoUtil.php
Message-ID: <20060626142923.B26CE83FD19@vtiger.fosslabs.com>

Author: richie
Date: Mon Jun 26 08:29:11 2006
New Revision: 7538

Log:
Security support for Emails done

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

Modified: vtigercrm/trunk/include/utils/UserInfoUtil.php
==============================================================================
--- vtigercrm/trunk/include/utils/UserInfoUtil.php (original)
+++ vtigercrm/trunk/include/utils/UserInfoUtil.php Mon Jun 26 08:29:11 2006
@@ -4265,23 +4265,7 @@
 	}
 	elseif($module == 'Emails')
 	{
-		echo '<BR>now<BR>'; 
-		$sec_query .= "and (vtiger_crmentity.smownerid in($current_user->id) or vtiger_crmentity.smownerid in(select vtiger_user2role.userid from vtiger_user2role inner join vtiger_users on vtiger_users.id=vtiger_user2role.userid inner join vtiger_role on vtiger_role.roleid=vtiger_user2role.roleid where vtiger_role.parentrole like '".$current_user_parent_role_seq."::%') or vtiger_crmentity.smownerid in(select shareduserid from vtiger_tmp_read_user_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")";
-
-		//Adding crterial for vtiger_account related emails sharing
-		 $sec_query .= "or vtiger_seactivityrel.crmid in (select crmid from vtiger_crmentity where setype='Accounts' and vtiger_crmentity.smownerid in(select shareduserid from vtiger_tmp_read_user_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Accounts')." and relatedtabid=".$tabid.")) or vtiger_seactivityrel.crmid in (select crmid from vtiger_crmentity left join vtiger_accountgrouprelation on vtiger_accountgrouprelation.accountid=vtiger_crmentity.crmid inner join vtiger_groups on vtiger_groups.groupname=vtiger_accountgrouprelation.groupname where setype='Accounts' and vtiger_crmentity.smownerid=0 and vtiger_groups.groupid in(select vtiger_tmp_read_group_rel_sharing_per.sharedgroupid from vtiger_tmp_read_group_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Accounts')." and relatedtabid=".$tabid."))";
-		//Adding crterial for lead related emails sharing
-		 $sec_query .= " or vtiger_seactivityrel.crmid in (select crmid from vtiger_crmentity where setype='Leads' and vtiger_crmentity.smownerid in(select shareduserid from vtiger_tmp_read_user_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Leads')." and relatedtabid=".$tabid.")) or vtiger_seactivityrel.crmid in (select crmid from vtiger_crmentity left join vtiger_leadgrouprelation on vtiger_leadgrouprelation.leadid=vtiger_crmentity.crmid inner join vtiger_groups on vtiger_groups.groupname=vtiger_leadgrouprelation.groupname where setype='Leads' and vtiger_crmentity.smownerid=0 and vtiger_groups.groupid in(select vtiger_tmp_read_group_rel_sharing_per.sharedgroupid from vtiger_tmp_read_group_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Leads')." and relatedtabid=".$tabid."))";
-	
-
-		//Adding crteria for group sharing
-		 $sec_query .= " or (vtiger_crmentity.smownerid in (0) and (";
-
-                if(sizeof($current_user_groups) > 0)
-                {
-                	$sec_query .= "vtiger_groups.groupid in".getCurrentUserGroupList()." or ";
-                }
-		$sec_query .= "vtiger_groups.groupid in(select vtiger_tmp_read_group_sharing_per.sharedgroupid from vtiger_tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";
+		$sec_query .= "and vtiger_crmentity.smownerid=".$current_user->id." "; 
 	
 	}
 	elseif($module == 'Activities')
@@ -4523,7 +4507,6 @@
                 'HelpDesk'=>'LBL_HELPDESK_FIELD_ACCESS',
                 'Products'=>'LBL_PRODUCT_FIELD_ACCESS',
                 'Notes'=>'LBL_NOTE_FIELD_ACCESS',
-                'Emails'=>'LBL_EMAIL_FIELD_ACCESS',
                 'Activities'=>'LBL_TASK_FIELD_ACCESS',
                 'Events'=>'LBL_EVENT_FIELD_ACCESS',
                 'Vendors'=>'LBL_VENDOR_FIELD_ACCESS',



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 07:32:22 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 14:32:22 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7539 -
	/vtigercrm/trunk/soap/firefoxtoolbar.php
Message-ID: <20060626143222.9563F83FD4A@vtiger.fosslabs.com>

Author: richie
Date: Mon Jun 26 08:32:19 2006
New Revision: 7539

Log:
changed logger name

Modified:
    vtigercrm/trunk/soap/firefoxtoolbar.php

Modified: vtigercrm/trunk/soap/firefoxtoolbar.php
==============================================================================
--- vtigercrm/trunk/soap/firefoxtoolbar.php (original)
+++ vtigercrm/trunk/soap/firefoxtoolbar.php Mon Jun 26 08:32:19 2006
@@ -15,7 +15,7 @@
 require_once('include/database/PearDatabase.php');
 require_once('modules/HelpDesk/HelpDesk.php');
 
-$log = &LoggerManager::getLogger('webforms');
+$log = &LoggerManager::getLogger('firefoxlog');
 
 $NAMESPACE = 'http://www.vtiger.com/vtigercrm/';
 $server = new soap_server;



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 07:32:48 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 14:32:48 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7540 -
	/vtigercrm/trunk/soap/wordplugin.php
Message-ID: <20060626143248.84D4483FD6B@vtiger.fosslabs.com>

Author: richie
Date: Mon Jun 26 08:32:44 2006
New Revision: 7540

Log:
split to respective wordplugin file from contactserialize.php

Added:
    vtigercrm/trunk/soap/wordplugin.php



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 07:32:52 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 14:32:52 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7541 - in
 /vtigercrm/trunk/modules/Users: add2db.php upload.php
Message-ID: <20060626143252.A7BD083FD19@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 26 08:32:48 2006
New Revision: 7541

Log:
put a check to upload only doc file in the mail merge file  - ahmed

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

Modified: vtigercrm/trunk/modules/Users/add2db.php
==============================================================================
--- vtigercrm/trunk/modules/Users/add2db.php (original)
+++ vtigercrm/trunk/modules/Users/add2db.php Mon Jun 26 08:32:48 2006
@@ -33,13 +33,31 @@
   $binFile = $_FILES['binFile']['name'];
   $filename = basename($binFile);
   $filetype= $_FILES['binFile']['type'];
+  $filesize = $_FILES['binFile']['size'];
 
-    $filesize = $_FILES['binFile']['size'];
+  $error_flag ="";
+  $filetype_array = explode("/",$filetype);
+
+  $file_type_value = strtolower($filetype_array[1]);
+  
     if($filesize != 0)	
     {
-		$data = base64_encode(fread(fopen($uploaddir.$binFile, "r"), $filesize));
+	    if($file_type_value == "msword" || $file_type_value == "doc" || $file_type_value == "document")
+	    {
+		    if($result!=false)
+	    	    {
+			 $savefile="true";	
+		    }			 
+	    }
+	    else
+	    {
+		    $savefile="false";
+		    $error_flag="1";
+	    }		    
+	    
+ 		$data = base64_encode(fread(fopen($uploaddir.$binFile, "r"), $filesize));
 		//$data = addslashes(fread(fopen($uploaddir.$binFile, "r"), $filesize));
-	   $textDesc = $_REQUEST['txtDescription'];	
+	        $textDesc = $_REQUEST['txtDescription'];	
 		$strDescription = addslashes($textDesc);
 	//    $fileid = create_guid();
 		$date_entered = date('YmdHis');
@@ -66,6 +84,8 @@
 		$genQueryId = $adb->getUniqueID("wordtemplates");
 		if($genQueryId != '')
 		{
+			if($result!=false && $savefile=="true")
+			{
 			$module = $_REQUEST['target_module'];
 			$sql = "INSERT INTO vtiger_wordtemplates ";
 			$sql .= "(templateid,module,date_entered,parent_type,data,description,filename,filesize,filetype) ";
@@ -73,12 +93,15 @@
 			$sql .= "'$filename', '$filesize', '$filetype')";
 
 			$result = $adb->query($sql);
-			if($result!=false)
-			{
 			   $result = $adb->updateBlob('vtiger_wordtemplates','data'," filename='".$filename."'",$data);
 			   deleteFile($uploaddir,$filename);
-			   header("Location: index.php?action=listwordtemplates&module=Users&parenttab=Settings");	
+			   	header("Location: index.php?action=listwordtemplates&module=Users&parenttab=Settings");	
 			}
+		   	   elseif($savefile=="false")
+	                   {
+			   	header("Location: index.php?action=upload&module=Users&parenttab=Settings&flag=".$error_flag);	
+				   
+			   }  			   
 			else
 			{
 				include('themes/'.$theme.'/header.php');

Modified: vtigercrm/trunk/modules/Users/upload.php
==============================================================================
--- vtigercrm/trunk/modules/Users/upload.php (original)
+++ vtigercrm/trunk/modules/Users/upload.php Mon Jun 26 08:32:48 2006
@@ -25,7 +25,19 @@
 require_once($theme_path.'layout_utils.php');
 
 $smarty = new vtigerCRM_Smarty;
-
+//error handling
+if(isset($_REQUEST['flag']) && $_REQUEST['flag'] != '')
+{
+	$flag = $_REQUEST['flag'];
+	switch($flag)
+	{
+		case 1:
+			$smarty->assign("ERRORFLAG","<font color='red'><B>File has to be a Document of type doc/msword</B></font>");
+			break;
+		default:
+			$smarty->assign("ERRORFLAG","");
+	}		
+}
 
 $smarty->assign("MOD", return_module_language($current_language,'Settings'));
 $smarty->assign("IMAGE_PATH",$image_path);



From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 26 07:33:33 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 26 Jun 2006 14:33:33 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23559=3A_?=
 =?utf-8?q?issue_in_file_attachment?=
In-Reply-To: <076.6d136b84657eebb4403a3defb9c4a324@vtiger.fosslabs.com>
References: <076.6d136b84657eebb4403a3defb9c4a324@vtiger.fosslabs.com>
Message-ID: <085.6c24638c8dd331131194713b4ee1b893@vtiger.fosslabs.com>

#559: issue in file attachment
--------------------------------+-------------------------------------------
  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 - File type validation is done.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/559>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 07:33:59 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 14:33:59 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7542 -
	/vtigercrm/trunk/vtigerservice.php
Message-ID: <20060626143359.194E583FD4A@vtiger.fosslabs.com>

Author: richie
Date: Mon Jun 26 08:33:55 2006
New Revision: 7542

Log:
changed reference to contactserialize for the wordplugin

Modified:
    vtigercrm/trunk/vtigerservice.php

Modified: vtigercrm/trunk/vtigerservice.php
==============================================================================
--- vtigercrm/trunk/vtigerservice.php (original)
+++ vtigercrm/trunk/vtigerservice.php Mon Jun 26 08:33:55 2006
@@ -29,7 +29,7 @@
 	}
 	elseif($_REQUEST['service'] == "wordplugin")
 	{
-		include("soap/contactserialize.php");
+		include("soap/wordplugin.php");
 	}
 	elseif($_REQUEST['service'] == "thunderbird")
 	{



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 07:35:13 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 14:35:13 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7543 -
	/vtigercrm/trunk/soap/contactserialize.php
Message-ID: <20060626143513.DB22083FD66@vtiger.fosslabs.com>

Author: richie
Date: Mon Jun 26 08:35:10 2006
New Revision: 7543

Log:
removed as file split into respective modules

Removed:
    vtigercrm/trunk/soap/contactserialize.php



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 07:38:16 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 14:38:16 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7544 -
	/vtigercrm/trunk/Smarty/templates/RoleEditView.tpl
Message-ID: <20060626143816.870D783FD6B@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 26 08:38:12 2006
New Revision: 7544

Log:
updated the roles image in edit view

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 Mon Jun 26 08:38:12 2006
@@ -70,7 +70,7 @@
 				<input type="hidden" name="mode" value="{$MODE}">
 				<input type="hidden" name="parent" value="{$PARENT}">
 				<tr>
-					<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}ico-groups.gif" alt="Groups" width="48" height="48" border=0 title="Roles"></td>
+					<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}ico-roles.gif" alt="Roles" width="48" height="48" border=0 title="Roles"></td>
 					{if $MODE eq 'edit'}
 					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Users&action=listroles&parenttab=Settings">{$CMOD.LBL_ROLES}</a> &gt; {$MOD.LBL_EDIT} &quot;{$ROLENAME}&quot; </b></td>
 					{else}	



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 09:39:09 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 16:39:09 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7545 -
 /vtigercrm/trunk/modules/Users/OrgSharingDetailView.php
Message-ID: <20060626163909.496D083FBD8@vtiger.fosslabs.com>

Author: richie
Date: Mon Jun 26 10:39:00 2006
New Revision: 7545

Log:
Security support for Emails done

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

Modified: vtigercrm/trunk/modules/Users/OrgSharingDetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Users/OrgSharingDetailView.php (original)
+++ vtigercrm/trunk/modules/Users/OrgSharingDetailView.php Mon Jun 26 10:39:00 2006
@@ -61,7 +61,7 @@
 $custom_access['HelpDesk'] = getSharingRuleList('HelpDesk');
 
 //Email Sharing
-$custom_access['Emails'] = getSharingRuleList('Emails');
+//$custom_access['Emails'] = getSharingRuleList('Emails');
 
 //Campaign Sharing
 $custom_access['Campaigns'] = getSharingRuleList('Campaigns');



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 09:39:55 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 16:39:55 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7546 -
 /vtigercrm/trunk/modules/Users/DefaultFieldPermissions.php
Message-ID: <20060626163955.A040B83FC85@vtiger.fosslabs.com>

Author: richie
Date: Mon Jun 26 10:39:47 2006
New Revision: 7546

Log:
Security support for Emails done

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

Modified: vtigercrm/trunk/modules/Users/DefaultFieldPermissions.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DefaultFieldPermissions.php (original)
+++ vtigercrm/trunk/modules/Users/DefaultFieldPermissions.php Mon Jun 26 10:39:47 2006
@@ -31,7 +31,7 @@
 $image_path=$theme_path."images/";
 require_once($theme_path.'layout_utils.php');
 
-$field_module = Array('Leads','Accounts','Contacts','Potentials','HelpDesk','Products','Notes','Emails','Activities','Events','Vendors','PriceBooks','Quotes','PurchaseOrder','SalesOrder','Invoice','Campaigns');
+$field_module = Array('Leads','Accounts','Contacts','Potentials','HelpDesk','Products','Notes','Activities','Events','Vendors','PriceBooks','Quotes','PurchaseOrder','SalesOrder','Invoice','Campaigns');
 $allfields=Array();
 foreach($field_module as $fld_module)
 {



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 09:51:36 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 16:51:36 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7547 -
 /vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
Message-ID: <20060626165137.9A81583FC85@vtiger.fosslabs.com>

Author: richie
Date: Mon Jun 26 10:51:22 2006
New Revision: 7547

Log:
Security support for Emails done

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

Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original)
+++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Mon Jun 26 10:51:22 2006
@@ -1,2186 +1,2176 @@
-<?php
-
-/*********************************************************************************
-** The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is:  vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
- ********************************************************************************/
-
-include_once('config.php');
-require_once('include/logging.php');
-require_once('include/database/PearDatabase.php');
-require_once('data/SugarBean.php');
-require_once('data/CRMEntity.php');
-require_once('include/utils/utils.php');
-
-class DefaultDataPopulator extends CRMEntity {
-		
-	function DefaultDataPopulator() {
-		$this->log = LoggerManager::getLogger('DefaultDataPopulator');
-		$this->db = new PearDatabase();
-	}
-
-	var $new_schema = true;
-
-	function create_tables () {
-		global $app_strings;
-
-		$role1_id = $this->db->getUniqueID("role");
-		$role2_id = $this->db->getUniqueID("role");
-		$role3_id = $this->db->getUniqueID("role");
-		$role4_id = $this->db->getUniqueID("role");
-		$role5_id = $this->db->getUniqueID("role");
-
-		$profile1_id = $this->db->getUniqueID("profile");
-		$profile2_id = $this->db->getUniqueID("profile");
-		$profile3_id = $this->db->getUniqueID("profile");
-		$profile4_id = $this->db->getUniqueID("profile");
-
-                $this->db->query("insert into vtiger_role values('H".$role1_id."','Organisation','H".$role1_id."',0)");
-                $this->db->query("insert into vtiger_role values('H".$role2_id."','CEO','H".$role1_id."::H".$role2_id."',1)");
-                $this->db->query("insert into vtiger_role values('H".$role3_id."','Vice President','H".$role1_id."::H".$role2_id."::H".$role3_id."',2)");
-                $this->db->query("insert into vtiger_role values('H".$role4_id."','Sales Manager','H".$role1_id."::H".$role2_id."::H".$role3_id."::H".$role4_id."',3)");
-                $this->db->query("insert into vtiger_role values('H".$role5_id."','Sales Man','H".$role1_id."::H".$role2_id."::H".$role3_id."::H".$role4_id."::H".$role5_id."',4)");
-                
-
- $this->db->query("INSERT INTO vtiger_tab VALUES (3,'Home',0,1,'Home',null,null,1)");
- $this->db->query("INSERT INTO vtiger_tab VALUES (7,'Leads',0,4,'Leads',null,null,1)");
- $this->db->query("INSERT INTO vtiger_tab VALUES (6,'Accounts',0,5,'Accounts',null,null,1)");
- $this->db->query("INSERT INTO vtiger_tab VALUES (4,'Contacts',0,6,'Contacts',null,null,1)");
- $this->db->query("INSERT INTO vtiger_tab VALUES (2,'Potentials',0,7,'Potentials',null,null,1)");
- $this->db->query("INSERT INTO vtiger_tab VALUES (8,'Notes',0,9,'Notes',null,null,1)");
- $this->db->query("INSERT INTO vtiger_tab VALUES (9,'Activities',0,3,'Activities',null,null,1)");
- $this->db->query("INSERT INTO vtiger_tab VALUES (10,'Emails',0,10,'Emails',null,null,1)");
- $this->db->query("INSERT INTO vtiger_tab VALUES (13,'HelpDesk',0,11,'HelpDesk',null,null,1)");
- $this->db->query("INSERT INTO vtiger_tab VALUES (14,'Products',0,8,'Products',null,null,1)");
- $this->db->query("INSERT INTO vtiger_tab VALUES (1,'Dashboard',0,12,'Dashboards',null,null,1)");
- $this->db->query("INSERT INTO vtiger_tab VALUES (15,'Faq',0,14,'Faq',null,null,1)");
- $this->db->query("INSERT INTO vtiger_tab VALUES (16,'Events',2,13,'Events',null,null,1)");
- $this->db->query("INSERT INTO vtiger_tab VALUES (17,'Calendar',0,2,'Calendar',null,null,1)");
- $this->db->query("INSERT INTO vtiger_tab VALUES (18,'Vendors',0,15,'Vendors',null,null,1)");
- $this->db->query("INSERT INTO vtiger_tab VALUES (19,'PriceBooks',0,16,'PriceBooks',null,null,1)");
- $this->db->query("INSERT INTO vtiger_tab VALUES (20,'Quotes',0,17,'Quotes',null,null,1)");
- $this->db->query("INSERT INTO vtiger_tab VALUES (21,'PurchaseOrder',0,18,'PurchaseOrder',null,null,1)");
- $this->db->query("INSERT INTO vtiger_tab VALUES (22,'SalesOrder',0,19,'SalesOrder',null,null,1)");
- $this->db->query("INSERT INTO vtiger_tab VALUES (23,'Invoice',0,20,'Invoice',null,null,1)");
- $this->db->query("INSERT INTO vtiger_tab VALUES (24,'Rss',0,21,'Rss',null,null,1)");
- $this->db->query("INSERT INTO vtiger_tab VALUES (25,'Reports',0,22,'Reports',null,null,1)");
- $this->db->query("INSERT INTO vtiger_tab VALUES (26,'Campaigns',0,23,'Campaigns',null,null,1)");
- $this->db->query("INSERT INTO vtiger_tab VALUES (27,'Portal',0,24,'Portal',null,null,1)");
- $this->db->query("INSERT INTO vtiger_tab VALUES (28,'Webmails',0,25,'Webmails',null,null,1)");
- $this->db->query("insert into vtiger_tab values (29,'Users',0,26,'Users',null,null,1)");
-
-// Populate the vtiger_blocks vtiger_table
-$this->db->query("insert into vtiger_blocks values (1,2,'LBL_OPPORTUNITY_INFORMATION',1,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (2,2,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (3,2,'LBL_DESCRIPTION_INFORMATION',3,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (4,4,'LBL_CONTACT_INFORMATION',1,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (5,4,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (6,4,'LBL_CUSTOMER_PORTAL_INFORMATION',3,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (7,4,'LBL_ADDRESS_INFORMATION',4,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (8,4,'LBL_DESCRIPTION_INFORMATION',6,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (9,6,'LBL_ACCOUNT_INFORMATION',1,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (10,6,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (11,6,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (12,6,'LBL_DESCRIPTION_INFORMATION',4,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (13,7,'LBL_LEAD_INFORMATION',1,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (14,7,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (15,7,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (16,7,'LBL_DESCRIPTION_INFORMATION',4,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (17,8,'LBL_NOTE_INFORMATION',1,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (18,8,'',2,1,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (19,9,'LBL_TASK_INFORMATION',1,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (20,9,'',2,1,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (21,10,'LBL_EMAIL_INFORMATION',1,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (22,10,'',2,1,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (23,10,'',3,1,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (24,10,'',4,1,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (25,13,'LBL_TICKET_INFORMATION',1,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (26,13,'',2,1,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (27,13,'LBL_CUSTOM_INFORMATION',3,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (28,13,'LBL_DESCRIPTION_INFORMATION',4,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (29,13,'LBL_TICKET_RESOLUTION',5,0,0,1,0,0)");
-$this->db->query("insert into vtiger_blocks values (30,13,'LBL_COMMENTS',6,0,0,1,0,0)");
-$this->db->query("insert into vtiger_blocks values (31,14,'LBL_PRODUCT_INFORMATION',1,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (32,14,'LBL_PRICING_INFORMATION',2,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (33,14,'LBL_STOCK_INFORMATION',3,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (34,14,'LBL_CUSTOM_INFORMATION',4,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (35,14,'LBL_IMAGE_INFORMATION',5,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (36,14,'LBL_DESCRIPTION_INFORMATION',6,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (37,15,'LBL_FAQ_INFORMATION',1,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (38,15,'',2,1,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (39,15,'',3,1,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (40,15,'LBL_COMMENT_INFORMATION',4,0,0,1,0,0)");
-$this->db->query("insert into vtiger_blocks values (41,16,'LBL_EVENT_INFORMATION',1,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (42,16,'',2,1,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (43,16,'',3,1,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (44,18,'LBL_VENDOR_INFORMATION',1,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (45,18,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (46,18,'LBL_VENDOR_ADDRESS_INFORMATION',3,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (47,18,'LBL_DESCRIPTION_INFORMATION',4,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (48,19,'LBL_PRICEBOOK_INFORMATION',1,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (49,19,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (50,19,'LBL_DESCRIPTION_INFORMATION',3,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (51,20,'LBL_QUOTE_INFORMATION',1,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (52,20,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (53,20,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (54,20,'LBL_RELATED_PRODUCTS',4,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (55,20,'LBL_TERMS_INFORMATION',5,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (56,20,'LBL_DESCRIPTION_INFORMATION',6,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (57,21,'LBL_PO_INFORMATION',1,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (58,21,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (59,21,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (60,21,'LBL_RELATED_PRODUCTS',4,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (61,21,'LBL_TERMS_INFORMATION',5,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (62,21,'LBL_DESCRIPTION_INFORMATION',6,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (63,22,'LBL_SO_INFORMATION',1,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (64,22,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (65,22,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (66,22,'LBL_RELATED_PRODUCTS',4,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (67,22,'LBL_TERMS_INFORMATION',5,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (68,22,'LBL_DESCRIPTION_INFORMATION',6,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (69,23,'LBL_INVOICE_INFORMATION',1,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (70,23,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (71,23,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (72,23,'LBL_RELATED_PRODUCTS',4,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (73,23,'LBL_TERMS_INFORMATION',5,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (74,23,'LBL_DESCRIPTION_INFORMATION',6,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (75,4,'LBL_IMAGE_INFORMATION',5,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (76,26,'LBL_CAMPAIGN_INFORMATION',1,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (77,26,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (78,26,'LBL_DESCRIPTION_INFORMATION',3,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (79,29,'LBL_USERLOGIN_ROLE',1,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (80,29,'LBL_MORE_INFORMATION',2,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (81,29,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)");
-
-//
-
-//Account Details -- START
- //Block9
-
-$this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'accountname','vtiger_account',1,'2','accountname','Account Name',1,0,0,100,1,9,1,'V~M',0,1,'BAS')");	
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'phone','vtiger_account',1,'11','phone','Phone',1,0,0,100,2,9,1,'V~O',0,2,'BAS')");	
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'website','vtiger_account',1,'17','website','Website',1,0,0,100,3,9,1,'V~O',0,3,'BAS')");	
-
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'fax','vtiger_account',1,'1','fax','Fax',1,0,0,100,4,9,1,'V~O',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'tickersymbol','vtiger_account',1,'1','tickersymbol','Ticker Symbol',1,0,0,100,5,9,1,'V~O',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'otherphone','vtiger_account',1,'11','otherphone','Other Phone',1,0,0,100,6,9,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'parentid','vtiger_account',1,'51','account_id','Member Of',1,0,0,100,7,9,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'email1','vtiger_account',1,'13','email1','Email',1,0,0,100,8,9,1,'E~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'employees','vtiger_account',1,'7','employees','Employees',1,0,0,100,9,9,1,'I~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'email2','vtiger_account',1,'13','email2','Other Email',1,0,0,100,10,9,1,'E~O',1,null,'ADV')");
-
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'ownership','vtiger_account',1,'1','ownership','Ownership',1,0,0,100,11,9,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'rating','vtiger_account',1,'1','rating','Rating',1,0,0,100,12,9,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'industry','vtiger_account',1,'15','industry','industry',1,0,0,100,13,9,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'siccode','vtiger_account',1,'1','siccode','SIC Code',1,0,0,100,14,9,1,'I~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'account_type','vtiger_account',1,'15','accounttype','Type',1,0,0,100,15,9,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'annualrevenue','vtiger_account',1,'71','annual_revenue','Annual Revenue',1,0,0,100,16,9,1,'I~O',1,null,'ADV')");
- //Added vtiger_field emailoptout for vtiger_accounts -- after 4.2 patch2
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'emailoptout','vtiger_account',1,'56','emailoptout','Email Opt Out',1,0,0,100,17,9,1,'C~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'notify_owner','vtiger_account',1,56,'notify_owner','Notify Owner',1,0,0,10,18,9,1,'C~O',1,NULL,'ADV')");
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,19,9,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,20,9,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,21,9,2,'T~O',1,null,'BAS')");
-
-
-
-
- //Block 11
-$this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'street','vtiger_accountbillads',1,'21','bill_street','Billing Address',1,0,0,100,1,11,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'street','vtiger_accountshipads',1,'21','ship_street','Shipping Address',1,0,0,100,2,11,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'city','vtiger_accountbillads',1,'1','bill_city','Billing City',1,0,0,100,5,11,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'city','vtiger_accountshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,11,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'state','vtiger_accountbillads',1,'1','bill_state','Billing State',1,0,0,100,7,11,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'state','vtiger_accountshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,11,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'code','vtiger_accountbillads',1,'1','bill_code','Billing Code',1,0,0,100,9,11,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'code','vtiger_accountshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,11,1,'V~O',1,null,'BAS')");
-
-
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'country','vtiger_accountbillads',1,'1','bill_country','Billing Country',1,0,0,100,11,11,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'country','vtiger_accountshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,11,1,'V~O',1,null,'BAS')");
-
-$this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'pobox','vtiger_accountbillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,11,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'pobox','vtiger_accountshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,11,1,'V~O',1,null,'BAS')");
-
-
- //Block12
-$this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,12,1,'V~O',1,null,'BAS')");
- 
-
-
-//Account Details -- END
-
-			
-//Lead Details --- START
-
-//Block13 -- Start
-
-$this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'salutation','vtiger_leaddetails',1,'55','salutationtype','Salutation',1,0,0,100,1,13,3,'V~O',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'firstname','vtiger_leaddetails',1,'55','firstname','First Name',1,0,0,100,2,13,1,'V~O',0,1,'BAS')");	
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'phone','vtiger_leadaddress',1,'11','phone','Phone',1,0,0,100,3,13,1,'V~O',0,4,'BAS')");	
-
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'lastname','vtiger_leaddetails',1,'2','lastname','Last Name',1,0,0,100,4,13,1,'V~M',0,2,'BAS')");	
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'mobile','vtiger_leadaddress',1,'1','mobile','Mobile',1,0,0,100,5,13,1,'V~O',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'company','vtiger_leaddetails',1,'2','company','Company',1,0,0,100,6,13,1,'V~M',0,3,'BAS')");
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'fax','vtiger_leadaddress',1,'1','fax','Fax',1,0,0,100,7,13,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'designation','vtiger_leaddetails',1,'1','designation','Designation',1,0,0,100,8,13,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'email','vtiger_leaddetails',1,'13','email','Email',1,0,0,100,9,13,1,'E~O',0,5,'BAS')");
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'leadsource','vtiger_leaddetails',1,'15','leadsource','Lead Source',1,0,0,100,10,13,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'website','vtiger_leadsubdetails',1,'17','website','Website',1,0,0,100,11,13,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'industry','vtiger_leaddetails',1,'15','industry','Industry',1,0,0,100,12,13,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'leadstatus','vtiger_leaddetails',1,'15','leadstatus','Lead Status',1,0,0,100,13,13,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'annualrevenue','vtiger_leaddetails',1,'71','annualrevenue','Annual Revenue',1,0,0,100,14,13,1,'I~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'rating','vtiger_leaddetails',1,'15','rating','Rating',1,0,0,100,15,13,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'noofemployees','vtiger_leaddetails',1,'1','noofemployees','No Of Employees',1,0,0,100,16,13,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,17,13,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'yahooid','vtiger_leaddetails',1,'13','yahooid','Yahoo Id',1,0,0,100,18,13,1,'V~O',1,null,'ADV')");
-$this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,19,13,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,20,13,2,'T~O',1,null,'BAS')");
-
-//Block13 -- End
-
-
-//Block15 -- Start
-
-$this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'lane','vtiger_leadaddress',1,'21','lane','Street',1,0,0,100,1,15,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'code','vtiger_leadaddress',1,'1','code','Postal Code',1,0,0,100,3,15,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'city','vtiger_leadaddress',1,'1','city','City',1,0,0,100,4,15,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'country','vtiger_leadaddress',1,'1','country','Country',1,0,0,100,5,15,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'state','vtiger_leadaddress',1,'1','state','State',1,0,0,100,6,15,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'pobox','vtiger_leadaddress',1,'1','pobox','Po Box',1,0,0,100,2,15,1,'V~O',1,null,'BAS')");
-
-//Block15 --End
-
-//Block16 -- Start
-
-$this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,16,1,'V~O',1,null,'BAS')");
-
-//Block16 -- End
-
-//Lead Details -- END
-
-
-//Contact Details -- START
-//Block4 -- Start
-
-$this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'salutation','vtiger_contactdetails',1,'55','salutationtype','Salutation',1,0,0,100,1,4,3,'V~O',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'firstname','vtiger_contactdetails',1,'55','firstname','First Name',1,0,0,100,2,4,1,'V~O',0,1,'BAS')");	
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'phone','vtiger_contactdetails',1,'11','phone','Office Phone',1,0,0,100,3,4,1,'V~O',0,4,'BAS')");	
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'lastname','vtiger_contactdetails',1,'2','lastname','Last Name',1,0,0,100,4,4,1,'V~M',0,2,'BAS')");	
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'mobile','vtiger_contactdetails',1,'1','mobile','Mobile',1,0,0,100,5,4,1,'V~O',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'accountid','vtiger_contactdetails',1,'51','account_id','Account Name',1,0,0,100,6,4,1,'I~O',0,3,'BAS')");	
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'homephone','vtiger_contactsubdetails',1,'11','homephone','Home Phone',1,0,0,100,7,4,1,'V~O',1,null,'ADV')");	
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'leadsource','vtiger_contactsubdetails',1,'15','leadsource','Lead Source',1,0,0,100,8,4,1,'V~O',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'otherphone','vtiger_contactsubdetails',1,'11','otherphone','Phone',1,0,0,100,9,4,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'title','vtiger_contactdetails',1,'1','title','Title',1,0,0,100,10,4,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'fax','vtiger_contactdetails',1,'1','fax','Fax',1,0,0,100,11,4,1,'V~O',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'department','vtiger_contactdetails',1,'1','department','Department',1,0,0,100,12,4,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'birthday','vtiger_contactsubdetails',1,'5','birthday','Birthdate',1,0,0,100,14,4,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'email','vtiger_contactdetails',1,'13','email','Email',1,0,0,100,15,4,1,'E~O',0,5,'ADV')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'reportsto','vtiger_contactdetails',1,'57','contact_id','Reports To',1,0,0,100,16,4,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'assistant','vtiger_contactsubdetails',1,'1','assistant','Assistant',1,0,0,100,17,4,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'yahooid','vtiger_contactdetails',1,'13','yahooid','Yahoo Id',1,0,0,100,18,4,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'assistantphone','vtiger_contactsubdetails',1,'11','assistantphone','Assistant Phone',1,0,0,100,19,4,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'donotcall','vtiger_contactdetails',1,'56','donotcall','Do Not Call',1,0,0,100,20,4,1,'C~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'emailoptout','vtiger_contactdetails',1,'56','emailoptout','Email Opt Out',1,0,0,100,21,4,1,'C~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,22,4,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'reference','vtiger_contactdetails',1,'56','reference','Reference',1,0,0,10,23,4,1,'C~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'notify_owner','vtiger_contactdetails',1,'56','notify_owner','Notify Owner',1,0,0,10,24,4,1,'C~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,25,4,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,26,4,2,'T~O',1,null,'BAS')");
-
-//Block4 -- End
-
-//Block6 - Begin Customer Portal
-
-$this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'portal','vtiger_customerdetails',1,'56','portal','Portal User',1,0,0,100,1,6,1,'C~O',1,null,'ADV')");
-$this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'support_start_date','vtiger_customerdetails',1,'5','support_start_date','Support Start Date',1,0,0,100,2,6,1,'D~O',1,null,'ADV')");
-$this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'support_end_date','vtiger_customerdetails',1,'5','support_end_date','Support End Date',1,0,0,100,3,6,1,'D~O~OTH~GE~support_start_date~Support Start Date',1,null,'ADV')");
-
-//Block6 - End Customer Portal
-
-//Block 7 -- Start
-
-$this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'mailingstreet','vtiger_contactaddress',1,'21','mailingstreet','Mailing Street',1,0,0,100,1,7,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'otherstreet','vtiger_contactaddress',1,'21','otherstreet','Other Street',1,0,0,100,2,7,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'mailingcity','vtiger_contactaddress',1,'1','mailingcity','Mailing City',1,0,0,100,5,7,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'othercity','vtiger_contactaddress',1,'1','othercity','Other City',1,0,0,100,6,7,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'mailingstate','vtiger_contactaddress',1,'1','mailingstate','Mailing State',1,0,0,100,7,7,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'otherstate','vtiger_contactaddress',1,'1','otherstate','Other State',1,0,0,100,8,7,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'mailingzip','vtiger_contactaddress',1,'1','mailingzip','Mailing Zip',1,0,0,100,9,7,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'otherzip','vtiger_contactaddress',1,'1','otherzip','Other Zip',1,0,0,100,10,7,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'mailingcountry','vtiger_contactaddress',1,'1','mailingcountry','Mailing Country',1,0,0,100,11,7,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'othercountry','vtiger_contactaddress',1,'1','othercountry','Other Country',1,0,0,100,12,7,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'mailingpobox','vtiger_contactaddress',1,'1','mailingpobox','Mailing Po Box',1,0,0,100,3,7,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'otherpobox','vtiger_contactaddress',1,'1','otherpobox','Other Po Box',1,0,0,100,4,7,1,'V~O',1,null,'BAS')");
-//Block7 -- End
-
-//ContactImageInformation
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'imagename','vtiger_contactdetails',1,'69','imagename','Contact Image',1,0,0,100,1,75,1,'V~O',1,null,'ADV')");
-
-
-//Block8 -- Start
-$this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,8,1,'V~O',1,null,'BAS')");
-//Block8 -- End
-//Contact Details -- END
-
-
-//Potential Details -- START
-//Block1 -- Start
-
-$this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'potentialname','vtiger_potential',1,'2','potentialname','Potential Name',1,0,0,100,1,1,1,'V~M',0,1,'BAS')");	
- $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'amount','vtiger_potential',1,71,'amount','Amount',1,0,0,100,2,1,1,'N~O',0,5,'BAS')");	
- $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'accountid','vtiger_potential',1,'50','account_id','Account Name',1,0,0,100,3,1,1,'V~M',0,2,'BAS')");	
- $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'closingdate','vtiger_potential',1,'23','closingdate','Expected Close Date',1,0,0,100,5,1,1,'D~M',0,3,'BAS')");	
- $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'potentialtype','vtiger_potential',1,'15','opportunity_type','Type',1,0,0,100,6,1,1,'V~O',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'nextstep','vtiger_potential',1,'1','nextstep','Next Step',1,0,0,100,7,1,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'leadsource','vtiger_potential',1,'15','leadsource','Lead Source',1,0,0,100,8,1,1,'V~O',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'sales_stage','vtiger_potential',1,'16','sales_stage','Sales Stage',1,0,0,100,9,1,1,'V~O',0,4,'BAS')");
- $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,10,1,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'probability','vtiger_potential',1,'9','probability','Probability',1,0,0,100,11,1,1,'N~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'campaignid','vtiger_potential',1,'58','campaignid','Campaign Source',1,0,0,100,12,1,1,'N~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,13,1,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,14,1,2,'T~O',1,null,'BAS')");
-
-//Block1 -- End
-
-//Block3 -- Start
-
- $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,3,1,'V~O',1,null,'BAS')");
-
-//Block3 -- End
-//Potential Details -- END
-
-
-//campaign entries being added
-
-
- $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'campaignname','vtiger_campaign',1,'2','campaignname','Campaign Name',1,0,0,100,1,76,1,'V~M',0,1,'BAS')");
- $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'campaigntype','vtiger_campaign',1,15,'campaigntype','Campaign Type',1,0,0,100,2,76,1,'V~O',0,5,'BAS')");
- $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'product_id','vtiger_campaign',1,59,'product_id','Product',1,0,0,100,3,76,1,'I~O',0,5,'BAS')");
- $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'campaignstatus','vtiger_campaign',1,15,'campaignstatus','Campaign Status',1,0,0,100,4,76,1,'V~O',0,5,'BAS')");
- $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'closingdate','vtiger_campaign',1,'23','closingdate','Expected Close Date',1,0,0,100,5,76,1,'D~M',0,3,'BAS')");
- $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'expectedrevenue','vtiger_campaign',1,'1','expectedrevenue','Expected Revenue',1,0,0,100,6,76,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'budgetcost','vtiger_campaign',1,'1','budgetcost','Budget Cost',1,0,0,100,7,76,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'actualcost','vtiger_campaign',1,'1','actualcost','Actual Cost',1,0,0,100,8,76,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'expectedresponse','vtiger_campaign',1,'15','expectedresponse','Expected Response',1,0,0,100,9,76,1,'V~O',0,4,'BAS')");
- $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'smownerid','vtiger_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 vtiger_field values (26,".$this->db->getUniqueID("field").",'numsent','vtiger_campaign',1,'9','numsent','Num Sent',1,0,0,100,11,76,1,'N~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'sponsor','vtiger_campaign',1,'1','sponsor','Sponsor',1,0,0,100,12,76,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'targetaudience','vtiger_campaign',1,'1','targetaudience','Target Audience',1,0,0,100,13,76,1,'V~O',1,null,'BAS')");
-
-$this->db->query("insert into vtiger_field values(26,".$this->db->getUniqueID("field").",'targetsize','vtiger_campaign',1,'1','targetsize','TargetSize',1,0,0,100,14,76,1,'N~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values(26,".$this->db->getUniqueID("field").",'expectedresponsecount','vtiger_campaign',1,'1','expectedresponsecount','Expected Response Count',1,0,0,100,17,76,1,'N~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values(26,".$this->db->getUniqueID("field").",'expectedsalescount','vtiger_campaign',1,'1','expectedsalescount','Expected Sales Count',1,0,0,100,15,76,1,'N~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values(26,".$this->db->getUniqueID("field").",'expectedroi','vtiger_campaign',1,'1','expectedroi','Expected ROI',1,0,0,100,19,76,1,'N~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values(26,".$this->db->getUniqueID("field").",'actualresponsecount','vtiger_campaign',1,'1','actualresponsecount','Actual Response Count',1,0,0,100,18,76,1,'N~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values(26,".$this->db->getUniqueID("field").",'actualsalescount','vtiger_campaign',1,'1','actualsalescount','Actual Sales Count',1,0,0,100,16,76,1,'N~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values(26,".$this->db->getUniqueID("field").",'actualroi','vtiger_campaign',1,'1','actualroi','Actual ROI',1,0,0,100,20,76,1,'N~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,15,76,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,16,76,2,'T~O',1,null,'BAS')");
-
-$this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,78,1,'V~O',1,null,'BAS')");
-
-//Campaign entries end
-
-
-//Ticket Details -- START
-//Block25 -- Start
-
- $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,2,25,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'parent_id','vtiger_troubletickets',1,'68','parent_id','Related To',1,0,0,100,4,25,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'priority','vtiger_troubletickets',1,'15','ticketpriorities','Priority',1,0,0,100,5,25,1,'V~O',0,3,'BAS')");
- $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'product_id','vtiger_troubletickets',1,'59','product_id','Product Name',1,0,0,100,6,25,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'severity','vtiger_troubletickets',1,'15','ticketseverities','Severity',1,0,0,100,7,25,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'status','vtiger_troubletickets',1,'15','ticketstatus','Status',1,0,0,100,8,25,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'category','vtiger_troubletickets',1,'15','ticketcategories','Category',1,0,0,100,9,25,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'update_log','vtiger_troubletickets',1,'15','update_log','Update History',1,0,0,100,9,25,3,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,10,25,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,11,25,2,'T~O',1,null,'BAS')");
- //Added on 26-12-2005 to add attachment in ticket editview
- $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'filename','vtiger_attachments',1,'61','filename','Attachment',1,0,0,100,12,26,1,'V~O',0,1,'BAS')");
-
- $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'title','vtiger_troubletickets',1,'22','ticket_title','Title',1,0,0,100,1,26,1,'V~M',0,1,'BAS')");
- $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'description','vtiger_troubletickets',1,'19','description','Description',1,0,0,100,1,28,1,'V~O',0,2,'BAS')");
- $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'solution','vtiger_troubletickets',1,'19','solution','Solution',1,0,0,100,1,29,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'comments','vtiger_ticketcomments',1,'19','comments','Add Comment',1,0,0,100,1,30,1,'V~O',1,null,'BAS')");
-
-//Block25-30 -- End
-//Ticket Details -- END
-
-//Product Details -- START
-//Block31-36 -- Start
-
-$this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'productname','vtiger_products',1,'2','productname','Product Name',1,0,0,100,1,31,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'productcode','vtiger_products',1,'1','productcode','Product Code',1,0,0,100,2,31,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'discontinued','vtiger_products',1,'56','discontinued','Product Active',1,0,0,100,3,31,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'manufacturer','vtiger_products',1,'15','manufacturer','Manufacturer',1,0,0,100,4,1,31,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'productcategory','vtiger_products',1,'15','productcategory','Product Category',1,0,0,100,4,31,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'sales_start_date','vtiger_products',1,'5','sales_start_date','Sales Start Date',1,0,0,100,5,31,1,'D~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'sales_end_date','vtiger_products',1,'5','sales_end_date','Sales End Date',1,0,0,100,6,31,1,'D~O~OTH~GE~sales_start_date~Sales Start Date',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'start_date','vtiger_products',1,'5','start_date','Support Start Date',1,0,0,100,7,31,1,'D~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'expiry_date','vtiger_products',1,'5','expiry_date','Support Expiry Date',1,0,0,100,8,31,1,'D~O~OTH~GE~start_date~Start Date',1,null,'BAS')");
- 
-
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'crmid','vtiger_seproductsrel',1,'66','parent_id','Related To',1,0,0,100,10,31,1,'I~O',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'contactid','vtiger_products',1,'57','contact_id','Contact Name',1,0,0,100,11,31,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'website','vtiger_products',1,'17','website','Website',1,0,0,100,12,31,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'vendor_id','vtiger_products',1,'75','vendor_id','Vendor Name',1,0,0,100,13,31,1,'I~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'mfr_part_no','vtiger_products',1,'1','mfr_part_no','Mfr PartNo',1,0,0,100,14,31,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'vendor_part_no','vtiger_products',1,'1','vendor_part_no','Vendor PartNo',1,0,0,100,15,31,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'serialno','vtiger_products',1,'1','serial_no','Serial No',1,0,0,100,16,31,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'productsheet','vtiger_products',1,'1','productsheet','Product Sheet',1,0,0,100,17,31,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'glacct','vtiger_products',1,'15','glacct','GL Account',1,0,0,100,18,31,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,19,31,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,20,31,2,'T~O',1,null,'BAS')");
-
-
-//Block32 Pricing Information
-
-$this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'unit_price','vtiger_products',1,'71','unit_price','Unit Price',1,0,0,100,1,32,1,'N~O',1,null,'BAS')"); 
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'commissionrate','vtiger_products',1,'9','commissionrate','Commission Rate',1,0,0,100,2,32,1,'N~O',1,null,'BAS')"); 
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'taxclass','vtiger_producttaxrel',1,'83','taxclass','Tax Class',1,0,0,100,4,32,1,'V~O',1,null,'BAS')");
-
-
-//Block 33 stock info
-
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'usageunit','vtiger_products',1,'15','usageunit','Usage Unit',1,0,0,100,1,33,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'qty_per_unit','vtiger_products',1,'1','qty_per_unit','Qty/Unit',1,0,0,100,2,33,1,'N~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'qtyinstock','vtiger_products',1,'1','qtyinstock','Qty In Stock',1,0,0,100,3,33,1,'I~O',1,null,'ADV')");
-$this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'reorderlevel','vtiger_products',1,'1','reorderlevel','Reorder Level',1,0,0,100,4,33,1,'I~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'handler','vtiger_products',1,'52','assigned_user_id','Handler',1,0,0,100,5,33,1,'I~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'qtyindemand','vtiger_products',1,'1','qtyindemand','Qty In Demand',1,0,0,100,6,33,1,'I~O',1,null,'ADV')");
-
-
-//ProductImageInformation
-
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'imagename','vtiger_products',1,'69','imagename','Product Image',1,0,0,100,1,35,1,'V~O',1,null,'ADV')");
-
-
-//Block 36 Description Info
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'product_description','vtiger_products',1,'19','product_description','Description',1,0,0,100,1,36,1,'V~O',1,null,'BAS')");
-
-//Product Details -- END
-
-//Note Details -- START
-//Block17 -- Start
-
-$this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("field").",'contact_id','vtiger_notes',1,'57','contact_id','Contact Name',1,0,0,100,1,17,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("field").",'crmid','vtiger_senotesrel',1,'62','parent_id','Related To',1,0,0,100,2,17,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("field").",'title','vtiger_notes',1,'2','notes_title','Subject',1,0,0,100,3,17,1,'V~M',0,1,'BAS')");
-$this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,4,17,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,5,17,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("field").",'filename','vtiger_notes',1,'61','filename','Attachment',1,0,0,100,4,17,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("field").",'notecontent','vtiger_notes',1,'19','notecontent','Note',1,0,0,100,5,18,1,'V~O',1,null,'BAS')");
-
-//Block17 -- End
-//Note Details -- END
-
-//Email Details -- START
-//Block21 -- Start
-
-	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'date_start','vtiger_activity',1,'6','date_start','Date & Time Sent',1,0,0,100,1,21,1,'DT~M~time_start~Time Start',1,null,'BAS')");
-	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'semodule','vtiger_activity',1,'2','parent_type','Sales Enity Module',1,0,0,100,2,21,3,'',1,null,'BAS')");
-	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'activitytype','vtiger_activity',1,'2','activitytype','Activtiy Type',1,0,0,100,3,21,3,'V~O',1,null,'BAS')");
-	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'crmid','vtiger_seactivityrel',1,'357','parent_id','Related To',1,0,0,100,1,22,1,'I~O',1,null,'BAS')");
-	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,5,21,1,'V~M',1,null,'BAS')");
-	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'subject','vtiger_activity',1,'2','subject','Subject',1,0,0,100,1,23,1,'V~M',1,null,'BAS')");
-	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'filename','vtiger_attachments',1,'61','filename','Attachment',1,0,0,100,2,23,1,'V~O',1,null,'BAS')");
-	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,24,1,'V~O',1,null,'BAS')");
-	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'time_start','vtiger_activity',1,'2','time_start','Time Start',1,0,0,100,9,1,23,'T~O',1,null,'BAS')");
-	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,10,1,22,'T~O',1,null,'BAS')");
- 	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,11,21,2,'T~O',1,null,'BAS')");
-
-//Block21 -- End
-//Email Details -- END
-
-//Task Details --START
-//Block19 -- Start
-$this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'subject','vtiger_activity',1,'2','subject','Subject',1,0,0,100,1,19,1,'V~M',0,1,'BAS')");
- $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,2,19,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'date_start','vtiger_activity',1,'6','date_start','Start Date & Time',1,0,0,100,3,19,1,'DT~M~time_start',0,2,'BAS')");
- $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'time_start','vtiger_activity',1,'2','time_start','Time Start',1,0,0,100,4,19,3,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'due_date','vtiger_activity',1,'23','due_date','Due Date',1,0,0,100,5,19,1,'D~M~OTH~GE~date_start~Start Date & Time',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'crmid','vtiger_seactivityrel',1,'66','parent_id','Related To',1,0,0,100,7,19,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'contactid','vtiger_cntactivityrel',1,'57','contact_id','Contact Name',1,0,0,100,8,19,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'status','vtiger_activity',1,'15','taskstatus','Status',1,0,0,100,9,19,1,'V~O',0,3,'BAS')");
- $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'eventstatus','vtiger_activity',1,'15','eventstatus','Status',1,0,0,100,9,19,3,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'priority','vtiger_activity',1,'15','taskpriority','Priority',1,0,0,100,10,19,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'sendnotification','vtiger_activity',1,'56','sendnotification','Send Notification',1,0,0,100,11,19,1,'C~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,14,19,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,15,19,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'activitytype','vtiger_activity',1,'15','activitytype','Activity Type',1,0,0,100,16,19,3,'V~O',1,null,'BAS')");
- $this->db->query("Insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'visibility','vtiger_activity',1,15,'visibility','Visibility',1,0,0,100,17,19,3,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,20,1,'V~O',1,null,'BAS')");
-
-
-$this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'duration_hours','vtiger_activity',1,'63','duration_hours','Duration',1,0,0,100,17,19,3,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'duration_minutes','vtiger_activity',1,'15','duration_minutes','Duration Minutes',1,0,0,100,18,19,3,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'location','vtiger_activity',1,'1','location','Location',1,0,0,100,19,19,3,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'reminder_time','vtiger_activity_reminder',1,'30','reminder_time','Send Reminder',1,0,0,100,1,19,3,'I~O',1,null,'BAS')");
- 
- $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'recurringtype','vtiger_recurringevents',1,'15','recurringtype','Recurrence',1,0,0,100,6,19,3,'O~O',1,null,'BAS')");
-
- $this->db->query("Insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'notime','vtiger_activity',1,56,'notime','No Time',1,0,0,100,20,19,3,'C~O',1,null,'BAS')");
-//Block19 -- End
-//Task Details -- END
-
-//Event Details --START
-//Block41-43-- Start
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'subject','vtiger_activity',1,'2','subject','Subject',1,0,0,100,1,41,1,'V~M',0,1,'BAS')");
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,2,41,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'date_start','vtiger_activity',1,'6','date_start','Start Date & Time',1,0,0,100,3,41,1,'DT~M~time_start',0,2,'BAS')");
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'time_start','vtiger_activity',1,'2','time_start','Time Start',1,0,0,100,4,41,3,'T~M',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'due_date','vtiger_activity',1,'23','due_date','End Date',1,0,0,100,5,41,1,'D~M~OTH~GE~date_start~Start Date & Time',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'recurringtype','vtiger_recurringevents',1,'15','recurringtype','Recurrence',1,0,0,100,6,41,1,'O~O',1,null,'BAS')");
-  
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'duration_hours','vtiger_activity',1,'63','duration_hours','Duration',1,0,0,100,7,41,1,'I~M',0,5,'BAS')");
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'duration_minutes','vtiger_activity',1,'15','duration_minutes','Duration Minutes',1,0,0,100,8,41,3,'O~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'crmid','vtiger_seactivityrel',1,'66','parent_id','Related To',1,0,0,100,9,41,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'eventstatus','vtiger_activity',1,'15','eventstatus','Status',1,0,0,100,10,41,1,'V~O',0,3,'BAS')");
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'sendnotification','vtiger_activity',1,'56','sendnotification','Send Notification',1,0,0,100,11,41,1,'C~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'activitytype','vtiger_activity',1,'15','activitytype','Activity Type',1,0,0,100,12,41,1,'V~O',0,4,'BAS')");
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'location','vtiger_activity',1,'1','location','Location',1,0,0,100,13,41,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,14,41,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,15,41,2,'T~O',1,null,'BAS')");
- $this->db->query("Insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'priority','vtiger_activity',1,15,'taskpriority','Priority',1,0,0,100,16,41,1,'V~O',1,null,'BAS')");
- $this->db->query("Insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'notime','vtiger_activity',1,56,'notime','No Time',1,0,0,100,17,41,1,'C~O',1,null,'BAS')");
- $this->db->query("Insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'visibility','vtiger_activity',1,15,'visibility','Visibility',1,0,0,100,18,41,1,'V~O',1,null,'BAS')");
- 
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,43,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'reminder_time','vtiger_activity_reminder',1,'30','reminder_time','Send Reminder',1,0,0,100,1,42,1,'I~O',1,null,'BAS')");
-//Block41-43 -- End
-//Event Details -- END
-
-//Faq Details -- START
-//Block37-40 -- Start
-
-$this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("field").",'product_id','vtiger_faq',1,'59','product_id','Product Name',1,0,0,100,1,37,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("field").",'category','vtiger_faq',1,'15','faqcategories','Category',1,0,0,100,2,37,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("field").",'status','vtiger_faq',1,'15','faqstatus','Status',1,0,0,100,3,37,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("field").",'question','vtiger_faq',1,'20','question','Question',1,0,0,100,1,38,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("field").",'answer','vtiger_faq',1,'20','faq_answer','Answer',1,0,0,100,1,39,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("field").",'comments','vtiger_faqcomments',1,'19','comments','Add Comment',1,0,0,100,1,40,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,3,37,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,4,37,2,'T~O',1,null,'BAS')");
-
-
-//Block37-40 -- End
-//Ticket Details -- END
-
-//Vendor Details --START
-//Block44-47
-
-$this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'vendorname','vtiger_vendor',1,'2','vendorname','Vendor Name',1,0,0,100,1,44,1,'V~M',0,1,'BAS')");
- $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'phone','vtiger_vendor',1,'1','phone','Phone',1,0,0,100,3,44,1,'V~O',0,2,'BAS')");
- $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'email','vtiger_vendor',1,'13','email','Email',1,0,0,100,4,44,1,'E~O',0,3,'BAS')");
- $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'website','vtiger_vendor',1,'17','website','Website',1,0,0,100,5,44,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'glacct','vtiger_vendor',1,'15','glacct','GL Account',1,0,0,100,6,44,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'category','vtiger_vendor',1,'1','category','Category',1,0,0,100,7,44,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,8,44,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,9,44,2,'T~O',1,null,'BAS')");
-
-//Block 46
-
-$this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'street','vtiger_vendor',1,'21','street','Street',1,0,0,100,1,46,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'pobox','vtiger_vendor',1,'1','pobox','Po Box',1,0,0,100,2,46,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'city','vtiger_vendor',1,'1','city','City',1,0,0,100,3,46,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'state','vtiger_vendor',1,'1','state','State',1,0,0,100,4,46,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'postalcode','vtiger_vendor',1,'1','postalcode','Postal Code',1,0,0,100,5,46,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'country','vtiger_vendor',1,'1','country','Country',1,0,0,100,6,46,1,'V~O',1,null,'ADV')");
-
-//Block 47
-
-$this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,47,1,'V~O',1,null,'ADV')");
-
-//Vendor Details -- END
-
-//PriceBook Details Start
-//Block48
-
-$this->db->query("insert into vtiger_field values (19,".$this->db->getUniqueID("field").",'bookname','vtiger_pricebook',1,'2','bookname','Price Book Name',1,0,0,100,1,48,1,'V~M',0,1,'BAS')");
- $this->db->query("insert into vtiger_field values (19,".$this->db->getUniqueID("field").",'active','vtiger_pricebook',1,'56','active','Active',1,0,0,100,3,48,1,'V~O',0,2,'BAS')");
-$this->db->query("insert into vtiger_field values (19,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,4,48,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (19,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,5,48,2,'T~O',1,null,'BAS')");
-
-//Block50
-
-$this->db->query("insert into vtiger_field values (19,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,50,1,'V~O',1,null,'BAS')");
-
-//PriceBook Details End
-
-
-//Quote Details -- START
- //Block51
-
-$this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'subject','vtiger_quotes',1,'2','subject','Subject',1,0,0,100,1,51,1,'V~M',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'potentialid','vtiger_quotes',1,'76','potential_id','Potential Name',1,0,0,100,2,51,1,'I~O',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'quotestage','vtiger_quotes',1,'15','quotestage','Quote Stage',1,0,0,100,3,51,1,'V~O',1,null,'BAS')");	
-
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'validtill','vtiger_quotes',1,'5','validtill','Valid Till',1,0,0,100,4,51,1,'D~O',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'team','vtiger_quotes',1,'1','team','Team',1,0,0,100,5,51,1,'V~O',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'contactid','vtiger_quotes',1,'57','contact_id','Contact Name',1,0,0,100,6,51,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'carrier','vtiger_quotes',1,'15','carrier','Carrier',1,0,0,100,8,51,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'subtotal','vtiger_quotes',1,'1','hdnSubTotal','Sub Total',1,0,0,100,9,51,3,'N~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'shipping','vtiger_quotes',1,'1','shipping','Shipping',1,0,0,100,10,51,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'inventorymanager','vtiger_quotes',1,'77','assigned_user_id1','Inventory Manager',1,0,0,100,11,51,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'tax','vtiger_quotes',1,'1','txtTax','Tax',1,0,0,100,13,51,3,'N~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'adjustment','vtiger_quotes',1,'1','txtAdjustment','Adjustment',1,0,0,100,20,51,3,'NN~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'total','vtiger_quotes',1,'1','hdnGrandTotal','Total',1,0,0,100,14,51,3,'N~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'accountid','vtiger_quotes',1,'73','account_id','Account Name',1,0,0,100,16,51,1,'I~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,17,51,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,18,51,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,19,51,2,'T~O',1,null,'BAS')");
-
-
- //Block 53
-
-$this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'bill_street','vtiger_quotesbillads',1,'24','bill_street','Billing Address',1,0,0,100,1,53,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'ship_street','vtiger_quotesshipads',1,'24','ship_street','Shipping Address',1,0,0,100,2,53,1,'V~M',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'bill_city','vtiger_quotesbillads',1,'1','bill_city','Billing City',1,0,0,100,5,53,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'ship_city','vtiger_quotesshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,53,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'bill_state','vtiger_quotesbillads',1,'1','bill_state','Billing State',1,0,0,100,7,53,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'ship_state','vtiger_quotesshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,53,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'bill_code','vtiger_quotesbillads',1,'1','bill_code','Billing Code',1,0,0,100,9,53,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'ship_code','vtiger_quotesshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,53,1,'V~O',1,null,'BAS')");
-
-
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'bill_country','vtiger_quotesbillads',1,'1','bill_country','Billing Country',1,0,0,100,11,53,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'ship_country','vtiger_quotesshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,53,1,'V~O',1,null,'BAS')");
-
-$this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'bill_pobox','vtiger_quotesbillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,53,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'ship_pobox','vtiger_quotesshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,53,1,'V~O',1,null,'BAS')");
- //Block55
-
-$this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,56,1,'V~O',1,null,'ADV')");
-
-//Block 56
-$this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'terms_conditions','vtiger_quotes',1,'19','terms_conditions','Terms & Conditions',1,0,0,100,1,55,1,'V~O',1,null,'ADV')");
-
-
-//Quote Details -- END
-
-//Purchase Order Details -- START
- //Block57
- 
-$this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'subject','vtiger_purchaseorder',1,'2','subject','Subject',1,0,0,100,1,57,1,'V~M',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'vendorid','vtiger_purchaseorder',1,'81','vendor_id','Vendor Name',1,0,0,100,3,57,1,'I~M',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'requisition_no','vtiger_purchaseorder',1,'1','requisition_no','Requisition No',1,0,0,100,4,57,1,'V~O',1,null,'BAS')");	
-
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'tracking_no','vtiger_purchaseorder',1,'1','tracking_no','Tracking Number',1,0,0,100,5,57,1,'V~O',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'contactid','vtiger_purchaseorder',1,'57','contact_id','Contact Name',1,0,0,100,6,57,1,'I~O',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'duedate','vtiger_purchaseorder',1,'5','duedate','Due Date',1,0,0,100,7,57,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'carrier','vtiger_purchaseorder',1,'15','carrier','Carrier',1,0,0,100,8,57,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'salestax','vtiger_purchaseorder',1,'1','txtTax','Sales Tax',1,0,0,100,10,57,3,'N~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'adjustment','vtiger_purchaseorder',1,'1','txtAdjustment','Adjustment',1,0,0,100,10,57,3,'NN~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'salescommission','vtiger_purchaseorder',1,'1','salescommission','Sales Commission',1,0,0,100,11,57,1,'N~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'exciseduty','vtiger_purchaseorder',1,'1','exciseduty','Excise Duty',1,0,0,100,12,57,1,'N~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'total','vtiger_purchaseorder',1,'1','hdnGrandTotal','Total',1,0,0,100,13,57,3,'N~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'subtotal','vtiger_purchaseorder',1,'1','hdnSubTotal','Sub Total',1,0,0,100,14,57,3,'N~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'postatus','vtiger_purchaseorder',1,'15','postatus','Status',1,0,0,100,15,57,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,16,57,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,17,57,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,18,57,2,'T~O',1,null,'BAS')");
-
-
-
- //Block 59
-
-$this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'bill_street','vtiger_pobillads',1,'24','bill_street','Billing Address',1,0,0,100,1,59,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'ship_street','vtiger_poshipads',1,'24','ship_street','Shipping Address',1,0,0,100,2,59,1,'V~M',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'bill_city','vtiger_pobillads',1,'1','bill_city','Billing City',1,0,0,100,5,59,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'ship_city','vtiger_poshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,59,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'bill_state','vtiger_pobillads',1,'1','bill_state','Billing State',1,0,0,100,7,59,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'ship_state','vtiger_poshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,59,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'bill_code','vtiger_pobillads',1,'1','bill_code','Billing Code',1,0,0,100,9,59,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'ship_code','vtiger_poshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,59,1,'V~O',1,null,'BAS')");
-
-
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'bill_country','vtiger_pobillads',1,'1','bill_country','Billing Country',1,0,0,100,11,59,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'ship_country','vtiger_poshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,59,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'bill_pobox','vtiger_pobillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,59,1,'V~O',1,null,'BAS')");
-  $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'ship_pobox','vtiger_poshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,59,1,'V~O',1,null,'BAS')");
-  
- //Block61
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,62,1,'V~O',1,null,'ADV')");
-
- //Block62
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'terms_conditions','vtiger_purchaseorder',1,'19','terms_conditions','Terms & Conditions',1,0,0,100,1,61,1,'V~O',1,null,'ADV')");
-
-//Purchase Order Details -- END
-
-//Sales Order Details -- START
- //Block63
- 
-$this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'subject','vtiger_salesorder',1,'2','subject','Subject',1,0,0,100,1,63,1,'V~M',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'potentialid','vtiger_salesorder',1,'76','potential_id','Potential Name',1,0,0,100,2,63,1,'I~O',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'customerno','vtiger_salesorder',1,'1','customerno','Customer No',1,0,0,100,3,63,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'quoteid','vtiger_salesorder',1,'78','quote_id','Quote Name',1,0,0,100,4,63,1,'I~O',1,null,'BAS')");	
-$this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'purchaseorder','vtiger_salesorder',1,'1','vtiger_purchaseorder','Purchase Order',1,0,0,100,4,63,1,'V~O',1,null,'BAS')");	
-
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'contactid','vtiger_salesorder',1,'57','contact_id','Contact Name',1,0,0,100,6,63,1,'I~O',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'duedate','vtiger_salesorder',1,'5','duedate','Due Date',1,0,0,100,8,63,1,'D~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'carrier','vtiger_salesorder',1,'15','carrier','Carrier',1,0,0,100,9,63,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'pending','vtiger_salesorder',1,'1','pending','Pending',1,0,0,100,10,63,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'sostatus','vtiger_salesorder',1,'15','sostatus','Status',1,0,0,100,11,63,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'salestax','vtiger_salesorder',1,'1','txtTax','Sales Tax',1,0,0,100,12,63,3,'N~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'adjustment','vtiger_salesorder',1,'1','txtAdjustment','Sales Tax',1,0,0,100,12,63,3,'NN~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'salescommission','vtiger_salesorder',1,'1','salescommission','Sales Commission',1,0,0,100,13,63,1,'N~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'exciseduty','vtiger_salesorder',1,'1','exciseduty','Excise Duty',1,0,0,100,13,63,1,'N~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'total','vtiger_salesorder',1,'1','hdnGrandTotal','Total',1,0,0,100,14,63,3,'N~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'subtotal','vtiger_salesorder',1,'1','hdnSubTotal','Total',1,0,0,100,15,63,3,'N~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'accountid','vtiger_salesorder',1,'73','account_id','Account Name',1,0,0,100,16,63,1,'I~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,17,63,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,18,63,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,19,63,2,'T~O',1,null,'BAS')");
-
-
-
- //Block 65
-
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'bill_street','vtiger_sobillads',1,'24','bill_street','Billing Address',1,0,0,100,1,65,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'ship_street','vtiger_soshipads',1,'24','ship_street','Shipping Address',1,0,0,100,2,65,1,'V~M',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'bill_city','vtiger_sobillads',1,'1','bill_city','Billing City',1,0,0,100,5,65,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'ship_city','vtiger_soshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,65,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'bill_state','vtiger_sobillads',1,'1','bill_state','Billing State',1,0,0,100,7,65,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'ship_state','vtiger_soshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,65,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'bill_code','vtiger_sobillads',1,'1','bill_code','Billing Code',1,0,0,100,9,65,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'ship_code','vtiger_soshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,65,1,'V~O',1,null,'BAS')");
-
-
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'bill_country','vtiger_sobillads',1,'1','bill_country','Billing Country',1,0,0,100,11,65,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'ship_country','vtiger_soshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,65,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'bill_pobox','vtiger_sobillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,65,1,'V~O',1,null,'BAS')");
-  $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'ship_pobox','vtiger_soshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,65,1,'V~O',1,null,'BAS')");
-  
-//Block67
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,68,1,'V~O',1,null,'ADV')");
-
- //Block68
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'terms_conditions','vtiger_salesorder',1,'19','terms_conditions','Terms & Conditions',1,0,0,100,1,67,1,'V~O',1,null,'ADV')");
-
-
-//Sales Order Details -- END
-
-//Invoice Details -- START
- //Block69
-
-$this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'subject','vtiger_invoice',1,'2','subject','Subject',1,0,0,100,1,69,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'salesorderid','vtiger_invoice',1,'80','salesorder_id','Sales Order',1,0,0,100,2,69,1,'I~O',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'customerno','vtiger_invoice',1,'1','customerno','Customer No',1,0,0,100,3,69,1,'V~O',1,null,'BAS')");	
-
- 
-//to include contact name vtiger_field in Invoice-start
-$this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'contactid','vtiger_invoice',1,'57','contact_id','Contact Name',1,0,0,100,4,69,1,'I~O',1,null,'BAS')");
-//end
-
-$this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'invoicedate','vtiger_invoice',1,'5','invoicedate','Invoice Date',1,0,0,100,5,69,1,'D~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'duedate','vtiger_invoice',1,'5','duedate','Due Date',1,0,0,100,6,69,1,'D~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'purchaseorder','vtiger_invoice',1,'1','vtiger_purchaseorder','Purchase Order',1,0,0,100,8,69,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'salestax','vtiger_invoice',1,'1','txtTax','Sales Tax',1,0,0,100,9,69,3,'N~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'adjustment','vtiger_invoice',1,'1','txtAdjustment','Sales Tax',1,0,0,100,9,69,3,'NN~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'salescommission','vtiger_invoice',1,'1','salescommission','Sales Commission',1,0,0,10,13,69,1,'N~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'exciseduty','vtiger_invoice',1,'1','exciseduty','Excise Duty',1,0,0,100,11,69,1,'N~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'subtotal','vtiger_invoice',1,'1','hdnSubTotal','Sub Total',1,0,0,100,12,69,3,'N~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'total','vtiger_invoice',1,'1','hdnGrandTotal','Total',1,0,0,100,13,69,3,'N~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'accountid','vtiger_invoice',1,'73','account_id','Account Name',1,0,0,100,14,69,1,'I~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'invoicestatus','vtiger_invoice',1,'15','invoicestatus','Status',1,0,0,100,15,69,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,16,69,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,17,69,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,18,69,2,'T~O',1,null,'BAS')"); 
-
- //Block 71
-
-$this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'bill_street','vtiger_invoicebillads',1,'24','bill_street','Billing Address',1,0,0,100,1,71,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'ship_street','vtiger_invoiceshipads',1,'24','ship_street','Shipping Address',1,0,0,100,2,71,1,'V~M',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'bill_city','vtiger_invoicebillads',1,'1','bill_city','Billing City',1,0,0,100,5,71,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'ship_city','vtiger_invoiceshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,71,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'bill_state','vtiger_invoicebillads',1,'1','bill_state','Billing State',1,0,0,100,7,71,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'ship_state','vtiger_invoiceshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,71,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'bill_code','vtiger_invoicebillads',1,'1','bill_code','Billing Code',1,0,0,100,9,71,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'ship_code','vtiger_invoiceshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,71,1,'V~O',1,null,'BAS')");
-
-
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'bill_country','vtiger_invoicebillads',1,'1','bill_country','Billing Country',1,0,0,100,11,71,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'ship_country','vtiger_invoiceshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,71,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'bill_pobox','vtiger_invoicebillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,71,1,'V~O',1,null,'BAS')");
-  $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'ship_pobox','vtiger_invoiceshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,71,1,'V~O',1,null,'BAS')");
-
-//Block73
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,74,1,'V~O',1,null,'ADV')");
- //Block74
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'terms_conditions','vtiger_invoice',1,'19','terms_conditions','Terms & Conditions',1,0,0,100,1,73,1,'V~O',1,null,'ADV')");
-
-
-//Invoice Details -- END
- //users Details Starts Block 79,80,81
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'user_name','vtiger_users',1,'106','user_name','User Name',1,0,0,11,1,79,1,'V~M',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'is_admin','vtiger_users',1,'156','is_admin','Admin',1,0,0,3,2,79,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'user_password','vtiger_users',1,'99','user_password','Password',1,0,0,30,3,79,4,'P~M',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'confirm_password','vtiger_users',1,'99','confirm_password','Confirm Password',1,0,0,30,4,79,4,'P~M',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'first_name','vtiger_users',1,'1','first_name','First Name',1,0,0,30,5,79,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'last_name','vtiger_users',1,'2','last_name','Last Name',1,0,0,30,6,79,1,'V~M',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'roleid','vtiger_user2role',1,'98','roleid','Role',1,0,0,200,7,79,1,'V~M',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'email1','vtiger_users',1,'104','email1','Email',1,0,0,100,9,79,1,'E~M',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'status','vtiger_users',1,'115','status','Status',1,0,0,100,10,79,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'activity_view','vtiger_users',1,'15','activity_view','Default Activity View',1,0,0,100,13,79,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'lead_view','vtiger_users',1,'15','lead_view','Default Lead View',1,0,0,100,12,79,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'currency_id','vtiger_users',1,'116','currency_id','Currency',1,0,0,100,11,79,1,'I~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'hour_format','vtiger_users',1,'116','hour_format','Calendar Hour Format',1,0,0,100,13,79,3,'I~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'end_hour','vtiger_users',1,'116','end_hour','Day ends at',1,0,0,100,15,79,3,'I~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'start_hour','vtiger_users',1,'116','start_hour','Day starts at',1,0,0,100,14,79,3,'I~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'title','vtiger_users',1,'1','title','Title',1,0,0,50,1,80,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'phone_work','vtiger_users',1,'1','phone_work','Office Phone',1,0,0,50,2,80,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'department','vtiger_users',1,'1','department','Department',1,0,0,50,3,80,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'phone_mobile','vtiger_users',1,'1','phone_mobile','Mobile',1,0,0,50,4,80,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'reports_to_id','vtiger_users',1,'101','reports_to_id','Reports To',1,0,0,50,5,80,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'phone_other','vtiger_users',1,'1','phone_other','Other Phone',1,0,0,50,5,80,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'email2','vtiger_users',1,'13','email2','Other Email',1,0,0,100,6,80,1,'E~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'phone_fax','vtiger_users',1,'1','phone_fax','Fax',1,0,0,50,7,80,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'yahoo_id','vtiger_users',1,'13','yahoo_id','Yahoo id',1,0,0,100,7,80,1,'E~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'phone_home','vtiger_users',1,'1','phone_home','Home Phone',1,0,0,50,8,80,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'imagename','vtiger_users',1,'105','imagename','User Image',1,0,0,250,9,80,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'date_format','vtiger_users',1,'15','date_format','Date Format',1,0,0,30,10,80,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'tagcloud','vtiger_users',1,'103','tagcloud','Tag Cloud',1,0,0,250,13,80,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'signature','vtiger_users',1,'21','signature','Signature',1,0,0,250,11,80,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'description','vtiger_users',1,'21','description','Notes',1,0,0,250,12,80,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'address_street','vtiger_users',1,'21','address_street','Street Address',1,0,0,250,1,81,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'address_city','vtiger_users',1,'1','address_city','City',1,0,0,100,2,81,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'address_state','vtiger_users',1,'1','address_state','State',1,0,0,100,3,81,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'address_postalcode','vtiger_users',1,'1','address_postalcode','Postal Code',1,0,0,100,4,81,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'address_country','vtiger_users',1,'1','address_country','Country',1,0,0,100,5,81,1,'V~O',1,null,'BAS')");
-
- //user Details End
-
-
-
-                // Insert End
-                
-
-		//New Security Start
-		//Inserting into vtiger_profile vtiger_table
-		$this->db->query("insert into vtiger_profile values ('".$profile1_id."','Administrator',null)");	
-		$this->db->query("insert into vtiger_profile values ('".$profile2_id."','Sales Profile',null)");
-		$this->db->query("insert into vtiger_profile values ('".$profile3_id."','Support Profile',null)");
-		$this->db->query("insert into vtiger_profile values ('".$profile4_id."','Guest Profile',null)");
-		
-		//Inserting into vtiger_profile2gloabal permissions
-		$this->db->query("insert into vtiger_profile2globalpermissions values ('".$profile1_id."',1,0)");
-		$this->db->query("insert into vtiger_profile2globalpermissions values ('".$profile1_id."',2,0)");
-		$this->db->query("insert into vtiger_profile2globalpermissions values ('".$profile2_id."',1,1)");
-		$this->db->query("insert into vtiger_profile2globalpermissions values ('".$profile2_id."',2,1)");
-		$this->db->query("insert into vtiger_profile2globalpermissions values ('".$profile3_id."',1,1)");
-		$this->db->query("insert into vtiger_profile2globalpermissions values ('".$profile3_id."',2,1)");
-		$this->db->query("insert into vtiger_profile2globalpermissions values ('".$profile4_id."',1,1)");
-		$this->db->query("insert into vtiger_profile2globalpermissions values ('".$profile4_id."',2,1)");
-
-		//Inserting into vtiger_profile2tab
-		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",1,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",2,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",3,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",4,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",6,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",7,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",8,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",9,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",10,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",13,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",14,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",15,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",16,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",17,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",18,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",19,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",20,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",21,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",22,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",23,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",24,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",25,0)");
-       		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",26,0)");
-       		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",27,0)");
-
-		//Inserting into vtiger_profile2tab
-		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",1,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",2,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",3,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",4,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",6,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",7,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",8,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",9,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",10,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",13,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",14,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",15,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",16,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",17,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",18,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",19,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",20,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",21,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",22,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",23,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",24,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",25,0)");
-        	$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",26,0)");
-       		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",27,0)");
-
-		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",1,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",2,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",3,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",4,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",6,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",7,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",8,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",9,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",10,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",13,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",14,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",15,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",16,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",17,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",18,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",19,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",20,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",21,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",22,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",23,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",24,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",25,0)");
-        	$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",26,0)");
-       		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",27,0)");
-        
-
-		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",1,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",2,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",3,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",4,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",6,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",7,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",8,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",9,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",10,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",13,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",14,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",15,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",16,0)");	
-		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",17,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",18,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",19,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",20,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",21,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",22,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",23,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",24,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",25,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",26,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",27,0)");
-		//Inserting into vtiger_profile2standardpermissions  Adminsitrator
-		
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",2,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",2,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",2,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",2,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",2,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",4,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",4,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",4,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",4,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",4,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",6,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",6,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",6,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",6,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",6,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",7,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",7,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",7,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",7,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",7,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",8,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",8,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",8,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",8,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",8,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",9,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",9,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",9,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",9,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",9,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",10,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",10,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",10,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",10,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",10,4,0)");
-
-		
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",13,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",13,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",13,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",13,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",13,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",14,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",14,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",14,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",14,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",14,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",15,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",15,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",15,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",15,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",15,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",16,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",16,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",16,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",16,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",16,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",18,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",18,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",18,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",18,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",18,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",19,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",19,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",19,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",19,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",19,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",20,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",20,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",20,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",20,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",20,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",21,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",21,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",21,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",21,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",21,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",22,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",22,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",22,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",22,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",22,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",23,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",23,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",23,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",23,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",23,4,0)");
-
-
-
-        	$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",26,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",26,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",26,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",26,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",26,4,0)");
-
-
-		//Insert into Profile 2 std permissions for Sales User  
-		//Help Desk Create/Delete not allowed. Read-Only	
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",2,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",2,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",2,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",2,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",2,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",4,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",4,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",4,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",4,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",4,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",6,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",6,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",6,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",6,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",6,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",7,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",7,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",7,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",7,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",7,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",8,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",8,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",8,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",8,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",8,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",9,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",9,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",9,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",9,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",9,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",10,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",10,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",10,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",10,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",10,4,0)");
-
-		
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",13,0,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",13,1,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",13,2,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",13,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",13,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",14,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",14,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",14,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",14,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",14,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",15,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",15,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",15,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",15,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",15,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",16,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",16,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",16,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",16,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",16,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",18,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",18,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",18,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",18,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",18,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",19,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",19,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",19,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",19,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",19,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",20,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",20,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",20,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",20,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",20,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",21,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",21,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",21,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",21,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",21,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",22,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",22,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",22,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",22,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",22,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",23,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",23,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",23,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",23,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",23,4,0)");
-
-
-        	$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",26,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",26,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",26,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",26,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",26,4,0)");
-
-		//Inserting into vtiger_profile2std for Support Profile
-		// Potential is read-only
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",2,0,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",2,1,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",2,2,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",2,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",2,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",4,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",4,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",4,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",4,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",4,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",6,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",6,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",6,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",6,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",6,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",7,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",7,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",7,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",7,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",7,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",8,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",8,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",8,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",8,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",8,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",9,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",9,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",9,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",9,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",9,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",10,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",10,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",10,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",10,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",10,4,0)");
-
-		
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",13,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",13,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",13,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",13,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",13,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",14,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",14,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",14,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",14,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",14,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",15,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",15,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",15,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",15,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",15,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",16,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",16,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",16,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",16,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",16,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",18,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",18,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",18,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",18,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",18,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",19,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",19,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",19,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",19,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",19,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",20,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",20,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",20,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",20,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",20,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",21,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",21,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",21,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",21,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",21,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",22,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",22,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",22,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",22,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",22,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",23,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",23,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",23,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",23,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",23,4,0)");
-
-
-        	$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",26,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",26,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",26,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",26,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",26,4,0)");
-        
-		//Inserting into vtiger_profile2stdper for Profile Guest Profile
-		//All Read-Only
-		
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",2,0,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",2,1,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",2,2,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",2,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",2,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",4,0,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",4,1,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",4,2,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",4,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",4,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",6,0,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",6,1,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",6,2,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",6,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",6,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",7,0,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",7,1,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",7,2,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",7,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",7,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",8,0,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",8,1,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",8,2,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",8,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",8,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",9,0,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",9,1,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",9,2,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",9,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",9,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",10,0,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",10,1,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",10,2,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",10,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",10,4,0)");
-
-		
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",13,0,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",13,1,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",13,2,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",13,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",13,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",14,0,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",14,1,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",14,2,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",14,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",14,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",15,0,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",15,1,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",15,2,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",15,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",15,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",16,0,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",16,1,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",16,2,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",16,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",16,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",18,0,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",18,1,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",18,2,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",18,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",18,4,0)");	
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",19,0,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",19,1,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",19,2,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",19,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",19,4,0)");	
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",20,0,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",20,1,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",20,2,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",20,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",20,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",21,0,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",21,1,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",21,2,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",21,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",21,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",22,0,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",22,1,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",22,2,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",22,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",22,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",23,0,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",23,1,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",23,2,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",23,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",23,4,0)");	
-
-
-        $this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",26,0,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",26,1,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",26,2,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",26,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",26,4,0)");
-
-		//Insert into vtiger_role2profile
-		$this->db->query("insert into vtiger_role2profile values ('H".$role2_id."',".$profile1_id.")");
-		$this->db->query("insert into vtiger_role2profile values ('H".$role3_id."',".$profile2_id.")");
-	  $this->db->query("insert into vtiger_role2profile values ('H".$role4_id."',".$profile2_id.")");
-		$this->db->query("insert into vtiger_role2profile values ('H".$role5_id."',".$profile2_id.")"); 
-	   
-		//Insert into vtiger_profile2field
-			
-                insertProfile2field($profile1_id);
-                insertProfile2field($profile2_id);	
-                insertProfile2field($profile3_id);	
-                insertProfile2field($profile4_id);
-
-		insert_def_org_field();	
-		
-
-		//Inserting into vtiger_profile 2 utility Admin
-                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",2,5,0)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",2,6,0)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",4,5,0)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",4,6,0)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",6,5,0)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",6,6,0)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",7,5,0)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",7,6,0)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",8,6,0)");
-                //$this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",9,6,0)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",10,6,0)");
-		$this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",7,8,0)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",6,8,0)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",4,8,0)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",13,8,0)");
-		$this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",14,5,0)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",14,6,0)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",7,9,0)");
-
-		//Inserting into vtiger_profile2utility Sales Profile
-		//Import Export Not Allowed.	
-		$this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",2,5,1)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",2,6,1)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",4,5,1)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",4,6,1)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",6,5,1)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",6,6,1)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",7,5,1)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",7,6,1)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",8,6,1)");
-                //$this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",9,6,1)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",10,6,1)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",7,8,0)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",6,8,0)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",4,8,0)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",13,8,0)");
-		$this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",14,5,1)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",14,6,1)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",7,9,0)");
-
-		//Inserting into vtiger_profile2utility Support Profile
-		//Import Export Not Allowed.	
-		$this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",2,5,1)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",2,6,1)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",4,5,1)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",4,6,1)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",6,5,1)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",6,6,1)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",7,5,1)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",7,6,1)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",8,6,1)");
-                //$this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",9,6,1)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",10,6,1)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",7,8,0)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",6,8,0)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",4,8,0)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",13,8,0)");
-		$this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",14,5,1)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",14,6,1)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",7,9,0)");
-
-		//Inserting into vtiger_profile2utility Guest Profile Read-Only
-		//Import Export BusinessCar Not Allowed.	
-		$this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",2,5,1)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",2,6,1)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",4,5,1)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",4,6,1)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",6,5,1)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",6,6,1)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",7,5,1)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",7,6,1)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",8,6,1)");
-                //$this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",9,6,1)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",10,6,1)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",7,8,1)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",6,8,1)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",4,8,1)");		
-                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",13,8,1)");		
-		$this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",14,5,1)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",14,6,1)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",7,9,0)");
-
-		//Inserting values into org share action mapping
-                $this->db->query("insert into vtiger_org_share_action_mapping values(0,'Public: Read Only')");
-                $this->db->query("insert into vtiger_org_share_action_mapping values(1,'Public: Read, Create/Edit')");
-                $this->db->query("insert into vtiger_org_share_action_mapping values(2,'Public: Read, Create/Edit, Delete')");
-                $this->db->query("insert into vtiger_org_share_action_mapping values(3,'Private')");
-
-                $this->db->query("insert into vtiger_org_share_action_mapping values(4,'Hide Details')");
-                $this->db->query("insert into vtiger_org_share_action_mapping values(5,'Hide Details and Add Events')");
-                $this->db->query("insert into vtiger_org_share_action_mapping values(6,'Show Details')");
-                $this->db->query("insert into vtiger_org_share_action_mapping values(7,'Show Details and Add Events')");
-
-
-		//Inserting for all vtiger_tabs
-                $def_org_tabid= Array(2,4,6,7,9,10,13,16,20,21,22,23,26);
-
-                foreach($def_org_tabid as $def_tabid)
-                {
-                        $this->db->query("insert into vtiger_org_share_action2tab values(0,".$def_tabid.")");
-                        $this->db->query("insert into vtiger_org_share_action2tab values(1,".$def_tabid.")");
-                        $this->db->query("insert into vtiger_org_share_action2tab values(2,".$def_tabid.")");
-                        $this->db->query("insert into vtiger_org_share_action2tab values(3,".$def_tabid.")");
-                }
-
-                $this->db->query("insert into vtiger_org_share_action2tab values(4,17)");
-                $this->db->query("insert into vtiger_org_share_action2tab values(5,17)");
-                $this->db->query("insert into vtiger_org_share_action2tab values(6,17)");
-                $this->db->query("insert into vtiger_org_share_action2tab values(7,17)");
-
-		//Insert into default_org_sharingrule
-               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",2,2,0)");
-
-               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",4,2,2)");
-
-               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",6,2,0)");
-
-               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",7,2,0)");
-
-               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",9,3,1)");
-               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",10,2,0)");
-               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",13,2,0)");
-               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",16,3,2)");
-               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",17,7,0)");
-               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",20,2,0)");
-               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",21,2,0)");
-               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",22,2,0)");
-               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",23,2,0)");
-               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",26,2,0)");
-
-		//Populating the DataShare Related Modules
-
-		//Lead Related Module
-		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",7,10)");
-
-		//Account Related Module
-		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",6,2)");
-		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",6,13)");
-		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",6,20)");
-		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",6,22)");
-		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",6,23)");
-		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",6,10)");
-
-		//Potential Related Module
-		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",2,20)");
-		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",2,22)");
-
-		//Quote Related Module
-		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",20,22)");
-
-		//SO Related Module
-		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",22,23)");	
-
-
-			
-					
-  // New Secutity End
-
-
-         //insert into the vtiger_notificationscheduler vtiger_table
-
-	//insert into related list vtiger_table
-	//Inserting for vtiger_account related lists
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("Potentials").",'get_opportunities',1,'Potentials',0)");	
-		
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("Contacts").",'get_contacts',2,'Contacts',0)");
-
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("Activities").",'get_activities',3,'Activities',0)");
-
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("HelpDesk").",'get_tickets',4,'HelpDesk',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("Activities").",'get_history',5,'Activity History',0)");
-
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",0,'get_attachments',6,'Attachments',0)");
-
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("Quotes").",'get_quotes',7,'Quotes',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("Invoice").",'get_invoices',8,'Invoice',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("SalesOrder").",'get_salesorder',9,'Sales Order',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("Products").",'get_products',10,'Products',0)");
-
-	//Inserting Lead Related Lists	
-
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Leads").",".getTabid("Activities").",'get_activities',1,'Activities',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Leads").",".getTabid("Emails").",'get_emails',2,'Emails',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Leads").",".getTabid("Activities").",'get_history',3,'Activity History',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Leads").",0,'get_attachments',4,'Attachments',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Leads").",".getTabid("Products").",'get_products',5,'Products',0)");
-
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Leads").",".getTabid("Campaigns").",'get_campaigns',6,'Campaigns',0)");
-
-	//Inserting for contact related lists
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Potentials").",'get_opportunities',1,'Potentials',0)");	
-		
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Activities").",'get_activities',2,'Activities',0)");
-
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Emails").",'get_emails',3,'Emails',0)");
-
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("HelpDesk").",'get_tickets',4,'HelpDesk',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Quotes").",'get_quotes',5,'Quotes',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("PurchaseOrder").",'get_purchase_orders',6,'Purchase Order',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("SalesOrder").",'get_salesorder',7,'Sales Order',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Products").",'get_products',8,'Products',0)");
-
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Activities").",'get_history',9,'Activity History',0)");
-
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",0,'get_attachments',10,'Attachments',0)");
-
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Campaigns").",'get_campaigns',11,'Campaigns',0)");
-
-	//Inserting Potential Related Lists	
-
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",".getTabid("Activities").",'get_activities',1,'Activities',0)");
-
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",".getTabid("Contacts").",'get_contacts',2,'Contacts',0)");
-
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",".getTabid("Products").",'get_products',3,'Products',0)");
-
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",0,'get_stage_history',4,'Sales Stage History',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",0,'get_attachments',5,'Attachments',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",".getTabid("Quotes").",'get_Quotes',6,'Quotes',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",".getTabid("SalesOrder").",'get_salesorder',7,'Sales Order',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",".getTabid("Activities").",'get_history',8,'Activity History',0)");
-
-		//Inserting Product Related Lists	
-
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",".getTabid("HelpDesk").",'get_tickets',1,'HelpDesk',0)");
-
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",".getTabid("Activities").",'get_activities',2,'Activities',0)");
-
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",0,'get_attachments',3,'Attachments',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",".getTabid("Quotes").",'get_quotes',4,'Quotes',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",".getTabid("PurchaseOrder").",'get_purchase_orders',5,'Purchase Order',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",".getTabid("SalesOrder").",'get_salesorder',6,'Sales Order',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",".getTabid("Invoice").",'get_invoices',7,'Invoice',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",".getTabid("PriceBooks").",'get_product_pricebooks',8,'PriceBooks',0)");
-	
-		//Inserting Emails Related Lists	
-
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Emails").",".getTabid("Contacts").",'get_contacts',1,'Contacts',0)");
-
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Emails").",0,'get_users',2,'Users',0)");
-
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Emails").",0,'get_attachments',3,'Attachments',0)");
-
-		//Inserting HelpDesk Related Lists
-		
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("HelpDesk").",".getTabid("Activities").",'get_activities',1,'Activities',0)");
-
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("HelpDesk").",0,'get_attachments',2,'Attachments',0)");
-
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("HelpDesk").",0,'get_ticket_history',3,'Ticket History',0)");
-
-	//Inserting PriceBook Related Lists
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("PriceBooks").",14,'get_pricebook_products',2,'Products',0)");
-
-        // Inserting Vendor Related Lists
-        $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Vendors").",14,'get_products',1,'Products',0)");
-
-        $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Vendors").",21,'get_purchase_orders',2,'Purchase Order',0)");
-
-        $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Vendors").",4,'get_contacts',3,'Contacts',0)");
-
-	// Inserting Quotes Related Lists
-	
-        $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Quotes").",".getTabid("Invoice").",'get_salesorder',1,'Sales Order',0)");
-        
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Quotes").",9,'get_activities',2,'Activities',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Quotes").",9,'get_history',3,'Activity History',0)");
-
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Quotes").",0,'get_quotestagehistory',4,'Quote Stage History',0)");
-
-	// Inserting Purchase order Related Lists
-
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("PurchaseOrder").",9,'get_activities',1,'Activities',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("PurchaseOrder").",0,'get_attachments',2,'Attachments',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("PurchaseOrder").",".getTabid("Activities").",'get_history',3,'Activity History',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("PurchaseOrder").",0,'get_postatushistory',4,'PurchaseOrder Status History',0)");
-
-	// Inserting Sales order Related Lists
-
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("SalesOrder").",9,'get_activities',1,'Activities',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("SalesOrder").",0,'get_attachments',2,'Attachments',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("SalesOrder").",".getTabid("Invoice").",'get_invoices',3,'Invoice',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("SalesOrder").",".getTabid("Activities").",'get_history',4,'Activity History',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("SalesOrder").",0,'get_sostatushistory',5,'SalesOrder Status History',0)");
-
-	// Inserting Invoice Related Lists
-
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Invoice").",9,'get_activities',1,'Activities',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Invoice").",0,'get_attachments',2,'Attachments',0)");
-
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Invoice").",".getTabid("Activities").",'get_history',3,'Activity History',0)");
-
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Invoice").",0,'get_invoicestatushistory',4,'Invoice Status History',0)");
-
-	// Inserting Activities Related Lists
-	
-	$this->db->query("insert into vtiger_relatedlists values (".$this->db->getUniqueID('relatedlists').",".getTabid("Activities").",0,'get_users',1,'Users',0)");
-	$this->db->query("insert into vtiger_relatedlists values (".$this->db->getUniqueID('relatedlists').",".getTabid("Activities").",4,'get_contacts',2,'Contacts',0)");
-
-	// Inserting Campaigns Related Lists
-
-         $this->db->query("insert into vtiger_relatedlists values (".$this->db->getUniqueID('relatedlists').",".getTabid("Campaigns").",".getTabid("Contacts").",'get_contacts',1,'Contacts',0)");
-         $this->db->query("insert into vtiger_relatedlists values (".$this->db->getUniqueID('relatedlists').",".getTabid("Campaigns").",".getTabid("Leads").",'get_leads',2,'Leads',0)");
-	 $this->db->query("insert into vtiger_relatedlists values (".$this->db->getUniqueID('relatedlists').",".getTabid("Campaigns").",".getTabid("Potentials").",'get_opportunities',3,'Potentials',0)");
-	 $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Campaigns").",9,'get_activities',4,'Activities',0)");
-
- //Inserting User Related Lists
- 
-        $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Users").",".getTabid("Activities").",'get_activities',1,'Activities',0)");
- 
-        $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Users").",".getTabid("Contacts").",'get_contacts',2,'Contacts',0)");
- 
-        $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Users").",".getTabid("Users").",'get_user_groups',3,'Groups',0)");
-
-	 
-               $this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("notificationscheduler").",'LBL_TASK_NOTIFICATION_DESCRITPION',1,'Task Delay Notification','Tasks delayed beyond 24 hrs ','LBL_TASK_NOTIFICATION')");
-
-
-                $this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("notificationscheduler").",'LBL_BIG_DEAL_DESCRIPTION' ,1,'Big Deal notification','Success! A big deal has been won! ','LBL_BIG_DEAL')");
-
-
-                $this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("notificationscheduler").",'LBL_TICKETS_DESCRIPTION',1,'Pending Tickets notification','Ticket pending please ','LBL_PENDING_TICKETS')");
-
-
-                $this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("notificationscheduler").",'LBL_MANY_TICKETS_DESCRIPTION',1,'Too many tickets Notification','Too many tickets pending against this entity ','LBL_MANY_TICKETS')");
-
-
-                $this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("notificationscheduler").",'LBL_START_DESCRIPTION' ,1,'Support Start Notification','Support starts please ','LBL_START_NOTIFICATION')");
-
-                $this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("notificationscheduler").",'LBL_SUPPORT_DESCRIPTION',1,'Support ending please','Support Ending Notification','LBL_SUPPORT_NOTICIATION')");
-		
- 		$this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("notificationscheduler").",'LBL_ACTIVITY_REMINDER_DESCRIPTION' ,1,'Activity Reminder Notication','This is a reminder notification for the Activity','LBL_ACTIVITY_NOTIFICATION')");
-
-		//Inserting Inventory Notifications
-	$invoice_body = 'Dear {HANDLER},
-
-The current stock of {PRODUCTNAME} in our warehouse is {CURRENTSTOCK}. Kindly procure required number of units as the stock level is below reorder level {REORDERLEVELVALUE}.
-
-Please treat this information as Urgent as the vtiger_invoice is already sent  to the customer.
-
-Severity: Critical
-
-Thanks,
-{CURRENTUSER}';
-
-		
-               $this->db->query("insert into vtiger_inventorynotification(notificationid,notificationname,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("inventorynotification").",'InvoiceNotification','{PRODUCTNAME} Stock Level is Low','".$invoice_body." ','InvoiceNotificationDescription')");
-
-		$quote_body = 'Dear {HANDLER},
-
-Quote is generated for {QUOTEQUANTITY} units of {PRODUCTNAME}. The current stock of {PRODUCTNAME} in our warehouse is {CURRENTSTOCK}. 
-
-Severity: Minor
-
-Thanks,
-{CURRENTUSER}';	
-		
-		
-               $this->db->query("insert into vtiger_inventorynotification(notificationid,notificationname,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("inventorynotification").",'QuoteNotification','Quote given for {PRODUCTNAME}','".$quote_body." ','QuoteNotificationDescription')");
-
-		$so_body = 'Dear {HANDLER},
-
-SalesOrder is generated for {SOQUANTITY} units of {PRODUCTNAME}. The current stock of {PRODUCTNAME} in our warehouse is {CURRENTSTOCK}. 
-
-Please treat this information  with vtiger_priority as the sales order is already generated.
-
-Severity: Major
-
-Thanks,
-{CURRENTUSER}';
-
-		
-               $this->db->query("insert into vtiger_inventorynotification(notificationid,notificationname,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("inventorynotification").",'SalesOrderNotification','Sales Order generated for {PRODUCTNAME}','".$so_body." ','SalesOrderNotificationDescription')");
-
-		//Insert into vtiger_currency vtiger_table
-		$this->db->query("insert into vtiger_currency_info values(".$this->db->getUniqueID("currency_info").",'U.S Dollar','USD','$',1,'Active','-11')");
-                
-
-
-
-//insert into email template vtiger_table
-
-	$body='
-	Hello!
-
-	On behalf of the vtiger team,  I am pleased to announce the release of vtiger crm4.2 . This is a feature packed release including the mass email template handling, custom view feature, vtiger_reports feature and a host of other utilities. vtiger runs on all platforms.
-
-	Notable Features of vtiger are :
-	-Email Client Integration
-	-Trouble Ticket Integration
-	-Invoice Management Integration
-	-Reports Integration
-	-Portal Integration
-	-Enhanced Word Plugin Support
-	-Custom View Integration
-
-	Known Issues:
-	-ABCD
-	-EFGH
-	-IJKL
-	-MNOP
-	-QRST';
-
-          $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Announcement for Release','Announcement for Release','Announcement of a release','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
-	
-
-
-$body='name
-street,
-city,
-state,
- zip)
- 
- Dear
- 
- Please check the following vtiger_invoices that are yet to be paid by you:
- 
- No. Date      Amount
- 1   1/1/01    $4000
- 2   2/2//01   $5000
- 3   3/3/01    $10000
- 4   7/4/01    $23560
- 
- Kindly let us know if there are any issues that you feel are pending to be discussed.
- We will be more than happy to give you a call.
- We would like to continue our business with you.
- 
- Sincerely,
- name
- title';
-
-
-               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Pending Invoices','Invoices Pending','Payment Due','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
-
-
-
-
-
-$body=' Dear
-
-Your proposal on the project XYZW has been reviewed by us
-and is acceptable in its entirety.
-
-We are eagerly looking forward to this project
-and are pleased about having the opportunity to work
-together. We look forward to a long standing relationship
-with your esteemed firm.
-
-I would like to take this opportunity to invite you
-to a game of golf on Wednesday morning 9am at the
-Cuff Links Ground. We will be waiting for you in the
-Executive Lounge.
-
-Looking forward to seeing you there.
-
-Sincerely,
-name
-title';
-	       
-               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Acceptance Proposal','Acceptance Proposal','Acceptance of Proposal','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
-
-
-$body= ' The undersigned hereby acknowledges receipt and delivery
-of the goods.
-The undersigned will release the payment subject to the goods being discovered not satisfactory.
-
-Signed under seal this <date>
-
-Sincerely,
-name
-title';
-	       
-               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Goods received acknowledgement','Goods received acknowledgement','Acknowledged Receipt of Goods','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
-
-
-	       $body= ' Dear
-	 We are in receipt of your order as contained in the
-   purchase order form.We consider this to be final and binding on both sides.
-If there be any exceptions noted, we shall consider them
-only if the objection is received within ten days of receipt of
-this notice.
-
-Thank you for your patronage.
-Sincerely,
-name
-title';
-
-
-	       
-               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Accept Order','Accept Order','Acknowledgement/Acceptance of Order','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
-
-
-
-
-$body='Dear
-
-We are relocating our office to
-11111,XYZDEF Cross,
-UVWWX Circle
-The telephone number for this new location is (101) 1212-1328.
-
-Our Manufacturing Division will continue operations
-at 3250 Lovedale Square Avenue, in Frankfurt.
-
-We hope to keep in touch with you all.
-Please update your addressbooks.
-
-
-Thank You,
-name
-title';
-	       
-               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Address Change','Change of Address','Address Change','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
-
-
-
-$body='Dear
-
-Thank you for extending us the opportunity to meet with
-you and members of your staff.
-
-I know that John Doe serviced your vtiger_account
-for many years and made many friends at your firm. He has personally
-discussed with me the deep relationship that he had with your firm.
-While his presence will be missed, I can promise that we will
-continue to provide the fine service that was accorded by
-John to your firm.
-
-I was genuinely touched to receive such fine hospitality.
-
-Thank you once again.
-
-Sincerely,
-name
-title';
-
-
-	       
-               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Follow Up','Follow Up','Follow Up of meeting','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
-
-
-
-$body='Congratulations!
-
-The numbers are in and I am proud to inform you that our
-total sales for the previous quarter
-amounts to $100,000,00.00!. This is the first time
-we have exceeded the target by almost 30%.
-We have also beat the previous quarter record by a
-whopping 75%!
-
-Let us meet at Smoking Joe for a drink in the evening!
-
-C you all there guys!
-
-Sincerely,
-name
-title';
-
-	       
-               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Target Crossed!','Target Crossed!','Fantastic Sales Spree!','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
-
-$body='
-Dear
-
-Thank you for your confidence in our ability to serve you.
-We are glad to be given the chance to serve you.I look
-forward to establishing a long term partnership with you.
-Consider me as a friend.
-Should any need arise,please do give us a call.
-
-Sincerely,
-name
-title';
-
-	       
-               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Thanks Note','Thanks Note','Note of thanks','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
-
-		
-	       //Insert into vtiger_organizationdetails vtiger_table 
-	       $this->db->query("insert into vtiger_organizationdetails(organizationame,address,city,state,country,code,phone,fax,website,logoname) values ('vtiger',' 40-41-42, Sivasundar Apartments, Flat D-II, Shastri Street, Velachery','Chennai','Tamil Nadu','India','600 042','+91-44-5202-1990','+91-44-5202-1990','www.vtiger.com','vtiger-crm-logo.jpg')");
-
-  //Insert into vtiger_inventory_tandc vtiger_table
-               $this->db->query("insert into vtiger_inventory_tandc values('".$this->db->getUniqueID('inventory_tandc')."','Inventory','')");
-
-	$this->db->query("insert into vtiger_actionmapping values(0,'Save',0)");
-	$this->db->query("insert into vtiger_actionmapping values(1,'EditView',0)");
-	$this->db->query("insert into vtiger_actionmapping values(2,'Delete',0)");
-	$this->db->query("insert into vtiger_actionmapping values(3,'index',0)");
-	$this->db->query("insert into vtiger_actionmapping values(4,'DetailView',0)");
-	$this->db->query("insert into vtiger_actionmapping values(5,'Import',0)");
-	$this->db->query("insert into vtiger_actionmapping values(6,'Export',0)");
-	//$this->db->query("insert into vtiger_actionmapping values(7,'AddBusinessCard',0)");
-	$this->db->query("insert into vtiger_actionmapping values(8,'Merge',0)");
-	$this->db->query("insert into vtiger_actionmapping values(1,'VendorEditView',1)");
-	$this->db->query("insert into vtiger_actionmapping values(4,'VendorDetailView',1)");
-	$this->db->query("insert into vtiger_actionmapping values(0,'SaveVendor',1)");
-	$this->db->query("insert into vtiger_actionmapping values(2,'DeleteVendor',1)");
-	$this->db->query("insert into vtiger_actionmapping values(1,'PriceBookEditView',1)");
-	$this->db->query("insert into vtiger_actionmapping values(4,'PriceBookDetailView',1)");
-	$this->db->query("insert into vtiger_actionmapping values(0,'SavePriceBook',1)");
-	$this->db->query("insert into vtiger_actionmapping values(2,'DeletePriceBook',1)");
-	$this->db->query("insert into vtiger_actionmapping values(9,'ConvertLead',0)");
-	$this->db->query("insert into vtiger_actionmapping values(1,'DetailViewAjax',1)");
-	$this->db->query("insert into vtiger_actionmapping values(4,'TagCloud',1)");
-	$this->db->query("insert into vtiger_actionmapping values(1,'QuickCreate',1)");
-	$this->db->query("insert into vtiger_actionmapping values(3,'Popup',1)");
-
-	//Insert values for vtiger_moduleowners vtiger_table which contains the modules and their vtiger_users. default user id admin - after 4.2 patch 2
-	$module_array = Array('Potentials','Contacts','Accounts','Leads','Notes','Activities','Emails','HelpDesk','Products','Faq','Vendors','PriceBooks','Quotes','PurchaseOrder','SalesOrder','Invoice','Reports','Campaigns');
-	foreach($module_array as $mod)
-	{
-		$this->db->query("insert into vtiger_moduleowners values(".getTabid($mod).",1)");
-	}
-	//added by jeri for category view from db
-	$this->db->query("insert into vtiger_parenttab values (1,'My Home Page',1,0)");
-	$this->db->query("insert into vtiger_parenttab values (2,'Marketing',2,0)");
-	$this->db->query("insert into vtiger_parenttab values (3,'Sales',3,0)");
-	$this->db->query("insert into vtiger_parenttab values (4,'Support',4,0)");
-	$this->db->query("insert into vtiger_parenttab values (5,'Analytics',5,0)");
-	$this->db->query("insert into vtiger_parenttab values (6,'Inventory',6,0)");
-	$this->db->query("insert into vtiger_parenttab values (7,'Tools',7,0)");
-	$this->db->query("insert into vtiger_parenttab values (8,'Settings',8,0)");
-
-	$this->db->query("insert into vtiger_parenttabrel values (1,9,2)");
-	$this->db->query("insert into vtiger_parenttabrel values (1,17,3)");
-	$this->db->query("insert into vtiger_parenttabrel values (1,10,4)");
-	$this->db->query("insert into vtiger_parenttabrel values (1,3,1)");
-	$this->db->query("insert into vtiger_parenttabrel values (3,7,1)");
-	$this->db->query("insert into vtiger_parenttabrel values (3,6,2)");
-	$this->db->query("insert into vtiger_parenttabrel values (3,4,3)");
-	$this->db->query("insert into vtiger_parenttabrel values (3,2,4)");
-	$this->db->query("insert into vtiger_parenttabrel values (3,20,5)");
-	$this->db->query("insert into vtiger_parenttabrel values (3,22,6)");
-	$this->db->query("insert into vtiger_parenttabrel values (3,23,7)");
-	$this->db->query("insert into vtiger_parenttabrel values (3,14,8)");
-	$this->db->query("insert into vtiger_parenttabrel values (3,19,9)");
-	$this->db->query("insert into vtiger_parenttabrel values (3,8,10)");
-	$this->db->query("insert into vtiger_parenttabrel values (4,13,1)");
-	$this->db->query("insert into vtiger_parenttabrel values (4,15,2)");
-	$this->db->query("insert into vtiger_parenttabrel values (4,6,3)");
-	$this->db->query("insert into vtiger_parenttabrel values (4,4,4)");
-	$this->db->query("insert into vtiger_parenttabrel values (4,14,5)");
-	$this->db->query("insert into vtiger_parenttabrel values (4,8,6)");
-	$this->db->query("insert into vtiger_parenttabrel values (5,1,1)");
-	$this->db->query("insert into vtiger_parenttabrel values (5,25,2)");
-	$this->db->query("insert into vtiger_parenttabrel values (6,14,1)");
-	$this->db->query("insert into vtiger_parenttabrel values (6,18,2)");
-	$this->db->query("insert into vtiger_parenttabrel values (6,19,3)");
-	$this->db->query("insert into vtiger_parenttabrel values (6,21,4)");
-	$this->db->query("insert into vtiger_parenttabrel values (6,22,5)");
-	$this->db->query("insert into vtiger_parenttabrel values (6,20,6)");
-	$this->db->query("insert into vtiger_parenttabrel values (6,23,7)");
-	$this->db->query("insert into vtiger_parenttabrel values (7,24,1)");
-	$this->db->query("insert into vtiger_parenttabrel values (7,27,2)");
-	$this->db->query("insert into vtiger_parenttabrel values (7,8,3)");
-	$this->db->query("insert into vtiger_parenttabrel values (2,26,1)");
-	$this->db->query("insert into vtiger_parenttabrel values (2,6,2)");
-	$this->db->query("insert into vtiger_parenttabrel values (2,4,3)");
-	$this->db->query("insert into vtiger_parenttabrel values (2,10,4)");
-	$this->db->query("insert into vtiger_parenttabrel values (4,10,7)");
-	$this->db->query("insert into vtiger_parenttabrel values (2,7,5)");
-	$this->db->query("insert into vtiger_parenttabrel values (2,9,6)");
-	$this->db->query("insert into vtiger_parenttabrel values (4,9,8)");
-		
-	//Added to populate the default inventory tax informations
-	$this->db->query("insert into vtiger_inventorytaxinfo values(".$this->db->getUniqueID("inventorytaxinfo").",'VAT','4.5')");
-	$this->db->query("insert into vtiger_inventorytaxinfo values(".$this->db->getUniqueID("inventorytaxinfo").",'Sales','10')");
-	$this->db->query("insert into vtiger_inventorytaxinfo values(".$this->db->getUniqueID("inventorytaxinfo").",'Service','12.5')");
-	
-	}
-}
-?>
+<?php
+
+/*********************************************************************************
+** The contents of this file are subject to the vtiger CRM Public License Version 1.0
+ * ("License"); You may not use this file except in compliance with the License
+ * The Original Code is:  vtiger CRM Open Source
+ * The Initial Developer of the Original Code is vtiger.
+ * Portions created by vtiger are Copyright (C) vtiger.
+ * All Rights Reserved.
+ ********************************************************************************/
+
+include_once('config.php');
+require_once('include/logging.php');
+require_once('include/database/PearDatabase.php');
+require_once('data/SugarBean.php');
+require_once('data/CRMEntity.php');
+require_once('include/utils/utils.php');
+
+class DefaultDataPopulator extends CRMEntity {
+		
+	function DefaultDataPopulator() {
+		$this->log = LoggerManager::getLogger('DefaultDataPopulator');
+		$this->db = new PearDatabase();
+	}
+
+	var $new_schema = true;
+
+	function create_tables () {
+		global $app_strings;
+
+		$role1_id = $this->db->getUniqueID("role");
+		$role2_id = $this->db->getUniqueID("role");
+		$role3_id = $this->db->getUniqueID("role");
+		$role4_id = $this->db->getUniqueID("role");
+		$role5_id = $this->db->getUniqueID("role");
+
+		$profile1_id = $this->db->getUniqueID("profile");
+		$profile2_id = $this->db->getUniqueID("profile");
+		$profile3_id = $this->db->getUniqueID("profile");
+		$profile4_id = $this->db->getUniqueID("profile");
+
+                $this->db->query("insert into vtiger_role values('H".$role1_id."','Organisation','H".$role1_id."',0)");
+                $this->db->query("insert into vtiger_role values('H".$role2_id."','CEO','H".$role1_id."::H".$role2_id."',1)");
+                $this->db->query("insert into vtiger_role values('H".$role3_id."','Vice President','H".$role1_id."::H".$role2_id."::H".$role3_id."',2)");
+                $this->db->query("insert into vtiger_role values('H".$role4_id."','Sales Manager','H".$role1_id."::H".$role2_id."::H".$role3_id."::H".$role4_id."',3)");
+                $this->db->query("insert into vtiger_role values('H".$role5_id."','Sales Man','H".$role1_id."::H".$role2_id."::H".$role3_id."::H".$role4_id."::H".$role5_id."',4)");
+                
+
+ $this->db->query("INSERT INTO vtiger_tab VALUES (3,'Home',0,1,'Home',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (7,'Leads',0,4,'Leads',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (6,'Accounts',0,5,'Accounts',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (4,'Contacts',0,6,'Contacts',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (2,'Potentials',0,7,'Potentials',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (8,'Notes',0,9,'Notes',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (9,'Activities',0,3,'Activities',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (10,'Emails',0,10,'Emails',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (13,'HelpDesk',0,11,'HelpDesk',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (14,'Products',0,8,'Products',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (1,'Dashboard',0,12,'Dashboards',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (15,'Faq',0,14,'Faq',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (16,'Events',2,13,'Events',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (17,'Calendar',0,2,'Calendar',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (18,'Vendors',0,15,'Vendors',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (19,'PriceBooks',0,16,'PriceBooks',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (20,'Quotes',0,17,'Quotes',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (21,'PurchaseOrder',0,18,'PurchaseOrder',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (22,'SalesOrder',0,19,'SalesOrder',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (23,'Invoice',0,20,'Invoice',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (24,'Rss',0,21,'Rss',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (25,'Reports',0,22,'Reports',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (26,'Campaigns',0,23,'Campaigns',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (27,'Portal',0,24,'Portal',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (28,'Webmails',0,25,'Webmails',null,null,1)");
+ $this->db->query("insert into vtiger_tab values (29,'Users',0,26,'Users',null,null,1)");
+
+// Populate the vtiger_blocks vtiger_table
+$this->db->query("insert into vtiger_blocks values (1,2,'LBL_OPPORTUNITY_INFORMATION',1,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (2,2,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (3,2,'LBL_DESCRIPTION_INFORMATION',3,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (4,4,'LBL_CONTACT_INFORMATION',1,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (5,4,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (6,4,'LBL_CUSTOMER_PORTAL_INFORMATION',3,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (7,4,'LBL_ADDRESS_INFORMATION',4,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (8,4,'LBL_DESCRIPTION_INFORMATION',6,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (9,6,'LBL_ACCOUNT_INFORMATION',1,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (10,6,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (11,6,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (12,6,'LBL_DESCRIPTION_INFORMATION',4,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (13,7,'LBL_LEAD_INFORMATION',1,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (14,7,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (15,7,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (16,7,'LBL_DESCRIPTION_INFORMATION',4,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (17,8,'LBL_NOTE_INFORMATION',1,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (18,8,'',2,1,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (19,9,'LBL_TASK_INFORMATION',1,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (20,9,'',2,1,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (21,10,'LBL_EMAIL_INFORMATION',1,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (22,10,'',2,1,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (23,10,'',3,1,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (24,10,'',4,1,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (25,13,'LBL_TICKET_INFORMATION',1,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (26,13,'',2,1,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (27,13,'LBL_CUSTOM_INFORMATION',3,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (28,13,'LBL_DESCRIPTION_INFORMATION',4,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (29,13,'LBL_TICKET_RESOLUTION',5,0,0,1,0,0)");
+$this->db->query("insert into vtiger_blocks values (30,13,'LBL_COMMENTS',6,0,0,1,0,0)");
+$this->db->query("insert into vtiger_blocks values (31,14,'LBL_PRODUCT_INFORMATION',1,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (32,14,'LBL_PRICING_INFORMATION',2,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (33,14,'LBL_STOCK_INFORMATION',3,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (34,14,'LBL_CUSTOM_INFORMATION',4,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (35,14,'LBL_IMAGE_INFORMATION',5,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (36,14,'LBL_DESCRIPTION_INFORMATION',6,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (37,15,'LBL_FAQ_INFORMATION',1,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (38,15,'',2,1,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (39,15,'',3,1,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (40,15,'LBL_COMMENT_INFORMATION',4,0,0,1,0,0)");
+$this->db->query("insert into vtiger_blocks values (41,16,'LBL_EVENT_INFORMATION',1,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (42,16,'',2,1,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (43,16,'',3,1,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (44,18,'LBL_VENDOR_INFORMATION',1,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (45,18,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (46,18,'LBL_VENDOR_ADDRESS_INFORMATION',3,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (47,18,'LBL_DESCRIPTION_INFORMATION',4,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (48,19,'LBL_PRICEBOOK_INFORMATION',1,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (49,19,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (50,19,'LBL_DESCRIPTION_INFORMATION',3,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (51,20,'LBL_QUOTE_INFORMATION',1,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (52,20,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (53,20,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (54,20,'LBL_RELATED_PRODUCTS',4,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (55,20,'LBL_TERMS_INFORMATION',5,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (56,20,'LBL_DESCRIPTION_INFORMATION',6,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (57,21,'LBL_PO_INFORMATION',1,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (58,21,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (59,21,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (60,21,'LBL_RELATED_PRODUCTS',4,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (61,21,'LBL_TERMS_INFORMATION',5,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (62,21,'LBL_DESCRIPTION_INFORMATION',6,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (63,22,'LBL_SO_INFORMATION',1,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (64,22,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (65,22,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (66,22,'LBL_RELATED_PRODUCTS',4,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (67,22,'LBL_TERMS_INFORMATION',5,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (68,22,'LBL_DESCRIPTION_INFORMATION',6,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (69,23,'LBL_INVOICE_INFORMATION',1,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (70,23,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (71,23,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (72,23,'LBL_RELATED_PRODUCTS',4,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (73,23,'LBL_TERMS_INFORMATION',5,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (74,23,'LBL_DESCRIPTION_INFORMATION',6,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (75,4,'LBL_IMAGE_INFORMATION',5,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (76,26,'LBL_CAMPAIGN_INFORMATION',1,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (77,26,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (78,26,'LBL_DESCRIPTION_INFORMATION',3,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (79,29,'LBL_USERLOGIN_ROLE',1,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (80,29,'LBL_MORE_INFORMATION',2,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (81,29,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)");
+
+//
+
+//Account Details -- START
+ //Block9
+
+$this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'accountname','vtiger_account',1,'2','accountname','Account Name',1,0,0,100,1,9,1,'V~M',0,1,'BAS')");	
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'phone','vtiger_account',1,'11','phone','Phone',1,0,0,100,2,9,1,'V~O',0,2,'BAS')");	
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'website','vtiger_account',1,'17','website','Website',1,0,0,100,3,9,1,'V~O',0,3,'BAS')");	
+
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'fax','vtiger_account',1,'1','fax','Fax',1,0,0,100,4,9,1,'V~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'tickersymbol','vtiger_account',1,'1','tickersymbol','Ticker Symbol',1,0,0,100,5,9,1,'V~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'otherphone','vtiger_account',1,'11','otherphone','Other Phone',1,0,0,100,6,9,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'parentid','vtiger_account',1,'51','account_id','Member Of',1,0,0,100,7,9,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'email1','vtiger_account',1,'13','email1','Email',1,0,0,100,8,9,1,'E~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'employees','vtiger_account',1,'7','employees','Employees',1,0,0,100,9,9,1,'I~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'email2','vtiger_account',1,'13','email2','Other Email',1,0,0,100,10,9,1,'E~O',1,null,'ADV')");
+
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'ownership','vtiger_account',1,'1','ownership','Ownership',1,0,0,100,11,9,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'rating','vtiger_account',1,'1','rating','Rating',1,0,0,100,12,9,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'industry','vtiger_account',1,'15','industry','industry',1,0,0,100,13,9,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'siccode','vtiger_account',1,'1','siccode','SIC Code',1,0,0,100,14,9,1,'I~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'account_type','vtiger_account',1,'15','accounttype','Type',1,0,0,100,15,9,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'annualrevenue','vtiger_account',1,'71','annual_revenue','Annual Revenue',1,0,0,100,16,9,1,'I~O',1,null,'ADV')");
+ //Added vtiger_field emailoptout for vtiger_accounts -- after 4.2 patch2
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'emailoptout','vtiger_account',1,'56','emailoptout','Email Opt Out',1,0,0,100,17,9,1,'C~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'notify_owner','vtiger_account',1,56,'notify_owner','Notify Owner',1,0,0,10,18,9,1,'C~O',1,NULL,'ADV')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,19,9,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,20,9,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,21,9,2,'T~O',1,null,'BAS')");
+
+
+
+
+ //Block 11
+$this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'street','vtiger_accountbillads',1,'21','bill_street','Billing Address',1,0,0,100,1,11,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'street','vtiger_accountshipads',1,'21','ship_street','Shipping Address',1,0,0,100,2,11,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'city','vtiger_accountbillads',1,'1','bill_city','Billing City',1,0,0,100,5,11,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'city','vtiger_accountshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,11,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'state','vtiger_accountbillads',1,'1','bill_state','Billing State',1,0,0,100,7,11,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'state','vtiger_accountshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,11,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'code','vtiger_accountbillads',1,'1','bill_code','Billing Code',1,0,0,100,9,11,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'code','vtiger_accountshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,11,1,'V~O',1,null,'BAS')");
+
+
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'country','vtiger_accountbillads',1,'1','bill_country','Billing Country',1,0,0,100,11,11,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'country','vtiger_accountshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,11,1,'V~O',1,null,'BAS')");
+
+$this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'pobox','vtiger_accountbillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,11,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'pobox','vtiger_accountshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,11,1,'V~O',1,null,'BAS')");
+
+
+ //Block12
+$this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,12,1,'V~O',1,null,'BAS')");
+ 
+
+
+//Account Details -- END
+
+			
+//Lead Details --- START
+
+//Block13 -- Start
+
+$this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'salutation','vtiger_leaddetails',1,'55','salutationtype','Salutation',1,0,0,100,1,13,3,'V~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'firstname','vtiger_leaddetails',1,'55','firstname','First Name',1,0,0,100,2,13,1,'V~O',0,1,'BAS')");	
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'phone','vtiger_leadaddress',1,'11','phone','Phone',1,0,0,100,3,13,1,'V~O',0,4,'BAS')");	
+
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'lastname','vtiger_leaddetails',1,'2','lastname','Last Name',1,0,0,100,4,13,1,'V~M',0,2,'BAS')");	
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'mobile','vtiger_leadaddress',1,'1','mobile','Mobile',1,0,0,100,5,13,1,'V~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'company','vtiger_leaddetails',1,'2','company','Company',1,0,0,100,6,13,1,'V~M',0,3,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'fax','vtiger_leadaddress',1,'1','fax','Fax',1,0,0,100,7,13,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'designation','vtiger_leaddetails',1,'1','designation','Designation',1,0,0,100,8,13,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'email','vtiger_leaddetails',1,'13','email','Email',1,0,0,100,9,13,1,'E~O',0,5,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'leadsource','vtiger_leaddetails',1,'15','leadsource','Lead Source',1,0,0,100,10,13,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'website','vtiger_leadsubdetails',1,'17','website','Website',1,0,0,100,11,13,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'industry','vtiger_leaddetails',1,'15','industry','Industry',1,0,0,100,12,13,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'leadstatus','vtiger_leaddetails',1,'15','leadstatus','Lead Status',1,0,0,100,13,13,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'annualrevenue','vtiger_leaddetails',1,'71','annualrevenue','Annual Revenue',1,0,0,100,14,13,1,'I~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'rating','vtiger_leaddetails',1,'15','rating','Rating',1,0,0,100,15,13,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'noofemployees','vtiger_leaddetails',1,'1','noofemployees','No Of Employees',1,0,0,100,16,13,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,17,13,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'yahooid','vtiger_leaddetails',1,'13','yahooid','Yahoo Id',1,0,0,100,18,13,1,'V~O',1,null,'ADV')");
+$this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,19,13,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,20,13,2,'T~O',1,null,'BAS')");
+
+//Block13 -- End
+
+
+//Block15 -- Start
+
+$this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'lane','vtiger_leadaddress',1,'21','lane','Street',1,0,0,100,1,15,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'code','vtiger_leadaddress',1,'1','code','Postal Code',1,0,0,100,3,15,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'city','vtiger_leadaddress',1,'1','city','City',1,0,0,100,4,15,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'country','vtiger_leadaddress',1,'1','country','Country',1,0,0,100,5,15,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'state','vtiger_leadaddress',1,'1','state','State',1,0,0,100,6,15,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'pobox','vtiger_leadaddress',1,'1','pobox','Po Box',1,0,0,100,2,15,1,'V~O',1,null,'BAS')");
+
+//Block15 --End
+
+//Block16 -- Start
+
+$this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,16,1,'V~O',1,null,'BAS')");
+
+//Block16 -- End
+
+//Lead Details -- END
+
+
+//Contact Details -- START
+//Block4 -- Start
+
+$this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'salutation','vtiger_contactdetails',1,'55','salutationtype','Salutation',1,0,0,100,1,4,3,'V~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'firstname','vtiger_contactdetails',1,'55','firstname','First Name',1,0,0,100,2,4,1,'V~O',0,1,'BAS')");	
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'phone','vtiger_contactdetails',1,'11','phone','Office Phone',1,0,0,100,3,4,1,'V~O',0,4,'BAS')");	
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'lastname','vtiger_contactdetails',1,'2','lastname','Last Name',1,0,0,100,4,4,1,'V~M',0,2,'BAS')");	
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'mobile','vtiger_contactdetails',1,'1','mobile','Mobile',1,0,0,100,5,4,1,'V~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'accountid','vtiger_contactdetails',1,'51','account_id','Account Name',1,0,0,100,6,4,1,'I~O',0,3,'BAS')");	
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'homephone','vtiger_contactsubdetails',1,'11','homephone','Home Phone',1,0,0,100,7,4,1,'V~O',1,null,'ADV')");	
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'leadsource','vtiger_contactsubdetails',1,'15','leadsource','Lead Source',1,0,0,100,8,4,1,'V~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'otherphone','vtiger_contactsubdetails',1,'11','otherphone','Phone',1,0,0,100,9,4,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'title','vtiger_contactdetails',1,'1','title','Title',1,0,0,100,10,4,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'fax','vtiger_contactdetails',1,'1','fax','Fax',1,0,0,100,11,4,1,'V~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'department','vtiger_contactdetails',1,'1','department','Department',1,0,0,100,12,4,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'birthday','vtiger_contactsubdetails',1,'5','birthday','Birthdate',1,0,0,100,14,4,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'email','vtiger_contactdetails',1,'13','email','Email',1,0,0,100,15,4,1,'E~O',0,5,'ADV')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'reportsto','vtiger_contactdetails',1,'57','contact_id','Reports To',1,0,0,100,16,4,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'assistant','vtiger_contactsubdetails',1,'1','assistant','Assistant',1,0,0,100,17,4,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'yahooid','vtiger_contactdetails',1,'13','yahooid','Yahoo Id',1,0,0,100,18,4,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'assistantphone','vtiger_contactsubdetails',1,'11','assistantphone','Assistant Phone',1,0,0,100,19,4,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'donotcall','vtiger_contactdetails',1,'56','donotcall','Do Not Call',1,0,0,100,20,4,1,'C~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'emailoptout','vtiger_contactdetails',1,'56','emailoptout','Email Opt Out',1,0,0,100,21,4,1,'C~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,22,4,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'reference','vtiger_contactdetails',1,'56','reference','Reference',1,0,0,10,23,4,1,'C~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'notify_owner','vtiger_contactdetails',1,'56','notify_owner','Notify Owner',1,0,0,10,24,4,1,'C~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,25,4,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,26,4,2,'T~O',1,null,'BAS')");
+
+//Block4 -- End
+
+//Block6 - Begin Customer Portal
+
+$this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'portal','vtiger_customerdetails',1,'56','portal','Portal User',1,0,0,100,1,6,1,'C~O',1,null,'ADV')");
+$this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'support_start_date','vtiger_customerdetails',1,'5','support_start_date','Support Start Date',1,0,0,100,2,6,1,'D~O',1,null,'ADV')");
+$this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'support_end_date','vtiger_customerdetails',1,'5','support_end_date','Support End Date',1,0,0,100,3,6,1,'D~O~OTH~GE~support_start_date~Support Start Date',1,null,'ADV')");
+
+//Block6 - End Customer Portal
+
+//Block 7 -- Start
+
+$this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'mailingstreet','vtiger_contactaddress',1,'21','mailingstreet','Mailing Street',1,0,0,100,1,7,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'otherstreet','vtiger_contactaddress',1,'21','otherstreet','Other Street',1,0,0,100,2,7,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'mailingcity','vtiger_contactaddress',1,'1','mailingcity','Mailing City',1,0,0,100,5,7,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'othercity','vtiger_contactaddress',1,'1','othercity','Other City',1,0,0,100,6,7,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'mailingstate','vtiger_contactaddress',1,'1','mailingstate','Mailing State',1,0,0,100,7,7,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'otherstate','vtiger_contactaddress',1,'1','otherstate','Other State',1,0,0,100,8,7,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'mailingzip','vtiger_contactaddress',1,'1','mailingzip','Mailing Zip',1,0,0,100,9,7,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'otherzip','vtiger_contactaddress',1,'1','otherzip','Other Zip',1,0,0,100,10,7,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'mailingcountry','vtiger_contactaddress',1,'1','mailingcountry','Mailing Country',1,0,0,100,11,7,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'othercountry','vtiger_contactaddress',1,'1','othercountry','Other Country',1,0,0,100,12,7,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'mailingpobox','vtiger_contactaddress',1,'1','mailingpobox','Mailing Po Box',1,0,0,100,3,7,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'otherpobox','vtiger_contactaddress',1,'1','otherpobox','Other Po Box',1,0,0,100,4,7,1,'V~O',1,null,'BAS')");
+//Block7 -- End
+
+//ContactImageInformation
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'imagename','vtiger_contactdetails',1,'69','imagename','Contact Image',1,0,0,100,1,75,1,'V~O',1,null,'ADV')");
+
+
+//Block8 -- Start
+$this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,8,1,'V~O',1,null,'BAS')");
+//Block8 -- End
+//Contact Details -- END
+
+
+//Potential Details -- START
+//Block1 -- Start
+
+$this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'potentialname','vtiger_potential',1,'2','potentialname','Potential Name',1,0,0,100,1,1,1,'V~M',0,1,'BAS')");	
+ $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'amount','vtiger_potential',1,71,'amount','Amount',1,0,0,100,2,1,1,'N~O',0,5,'BAS')");	
+ $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'accountid','vtiger_potential',1,'50','account_id','Account Name',1,0,0,100,3,1,1,'V~M',0,2,'BAS')");	
+ $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'closingdate','vtiger_potential',1,'23','closingdate','Expected Close Date',1,0,0,100,5,1,1,'D~M',0,3,'BAS')");	
+ $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'potentialtype','vtiger_potential',1,'15','opportunity_type','Type',1,0,0,100,6,1,1,'V~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'nextstep','vtiger_potential',1,'1','nextstep','Next Step',1,0,0,100,7,1,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'leadsource','vtiger_potential',1,'15','leadsource','Lead Source',1,0,0,100,8,1,1,'V~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'sales_stage','vtiger_potential',1,'16','sales_stage','Sales Stage',1,0,0,100,9,1,1,'V~O',0,4,'BAS')");
+ $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,10,1,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'probability','vtiger_potential',1,'9','probability','Probability',1,0,0,100,11,1,1,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'campaignid','vtiger_potential',1,'58','campaignid','Campaign Source',1,0,0,100,12,1,1,'N~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,13,1,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,14,1,2,'T~O',1,null,'BAS')");
+
+//Block1 -- End
+
+//Block3 -- Start
+
+ $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,3,1,'V~O',1,null,'BAS')");
+
+//Block3 -- End
+//Potential Details -- END
+
+
+//campaign entries being added
+
+
+ $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'campaignname','vtiger_campaign',1,'2','campaignname','Campaign Name',1,0,0,100,1,76,1,'V~M',0,1,'BAS')");
+ $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'campaigntype','vtiger_campaign',1,15,'campaigntype','Campaign Type',1,0,0,100,2,76,1,'V~O',0,5,'BAS')");
+ $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'product_id','vtiger_campaign',1,59,'product_id','Product',1,0,0,100,3,76,1,'I~O',0,5,'BAS')");
+ $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'campaignstatus','vtiger_campaign',1,15,'campaignstatus','Campaign Status',1,0,0,100,4,76,1,'V~O',0,5,'BAS')");
+ $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'closingdate','vtiger_campaign',1,'23','closingdate','Expected Close Date',1,0,0,100,5,76,1,'D~M',0,3,'BAS')");
+ $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'expectedrevenue','vtiger_campaign',1,'1','expectedrevenue','Expected Revenue',1,0,0,100,6,76,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'budgetcost','vtiger_campaign',1,'1','budgetcost','Budget Cost',1,0,0,100,7,76,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'actualcost','vtiger_campaign',1,'1','actualcost','Actual Cost',1,0,0,100,8,76,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'expectedresponse','vtiger_campaign',1,'15','expectedresponse','Expected Response',1,0,0,100,9,76,1,'V~O',0,4,'BAS')");
+ $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'smownerid','vtiger_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 vtiger_field values (26,".$this->db->getUniqueID("field").",'numsent','vtiger_campaign',1,'9','numsent','Num Sent',1,0,0,100,11,76,1,'N~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'sponsor','vtiger_campaign',1,'1','sponsor','Sponsor',1,0,0,100,12,76,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'targetaudience','vtiger_campaign',1,'1','targetaudience','Target Audience',1,0,0,100,13,76,1,'V~O',1,null,'BAS')");
+
+$this->db->query("insert into vtiger_field values(26,".$this->db->getUniqueID("field").",'targetsize','vtiger_campaign',1,'1','targetsize','TargetSize',1,0,0,100,14,76,1,'N~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values(26,".$this->db->getUniqueID("field").",'expectedresponsecount','vtiger_campaign',1,'1','expectedresponsecount','Expected Response Count',1,0,0,100,17,76,1,'N~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values(26,".$this->db->getUniqueID("field").",'expectedsalescount','vtiger_campaign',1,'1','expectedsalescount','Expected Sales Count',1,0,0,100,15,76,1,'N~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values(26,".$this->db->getUniqueID("field").",'expectedroi','vtiger_campaign',1,'1','expectedroi','Expected ROI',1,0,0,100,19,76,1,'N~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values(26,".$this->db->getUniqueID("field").",'actualresponsecount','vtiger_campaign',1,'1','actualresponsecount','Actual Response Count',1,0,0,100,18,76,1,'N~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values(26,".$this->db->getUniqueID("field").",'actualsalescount','vtiger_campaign',1,'1','actualsalescount','Actual Sales Count',1,0,0,100,16,76,1,'N~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values(26,".$this->db->getUniqueID("field").",'actualroi','vtiger_campaign',1,'1','actualroi','Actual ROI',1,0,0,100,20,76,1,'N~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,15,76,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,16,76,2,'T~O',1,null,'BAS')");
+
+$this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,78,1,'V~O',1,null,'BAS')");
+
+//Campaign entries end
+
+
+//Ticket Details -- START
+//Block25 -- Start
+
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,2,25,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'parent_id','vtiger_troubletickets',1,'68','parent_id','Related To',1,0,0,100,4,25,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'priority','vtiger_troubletickets',1,'15','ticketpriorities','Priority',1,0,0,100,5,25,1,'V~O',0,3,'BAS')");
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'product_id','vtiger_troubletickets',1,'59','product_id','Product Name',1,0,0,100,6,25,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'severity','vtiger_troubletickets',1,'15','ticketseverities','Severity',1,0,0,100,7,25,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'status','vtiger_troubletickets',1,'15','ticketstatus','Status',1,0,0,100,8,25,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'category','vtiger_troubletickets',1,'15','ticketcategories','Category',1,0,0,100,9,25,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'update_log','vtiger_troubletickets',1,'15','update_log','Update History',1,0,0,100,9,25,3,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,10,25,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,11,25,2,'T~O',1,null,'BAS')");
+ //Added on 26-12-2005 to add attachment in ticket editview
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'filename','vtiger_attachments',1,'61','filename','Attachment',1,0,0,100,12,26,1,'V~O',0,1,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'title','vtiger_troubletickets',1,'22','ticket_title','Title',1,0,0,100,1,26,1,'V~M',0,1,'BAS')");
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'description','vtiger_troubletickets',1,'19','description','Description',1,0,0,100,1,28,1,'V~O',0,2,'BAS')");
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'solution','vtiger_troubletickets',1,'19','solution','Solution',1,0,0,100,1,29,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'comments','vtiger_ticketcomments',1,'19','comments','Add Comment',1,0,0,100,1,30,1,'V~O',1,null,'BAS')");
+
+//Block25-30 -- End
+//Ticket Details -- END
+
+//Product Details -- START
+//Block31-36 -- Start
+
+$this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'productname','vtiger_products',1,'2','productname','Product Name',1,0,0,100,1,31,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'productcode','vtiger_products',1,'1','productcode','Product Code',1,0,0,100,2,31,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'discontinued','vtiger_products',1,'56','discontinued','Product Active',1,0,0,100,3,31,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'manufacturer','vtiger_products',1,'15','manufacturer','Manufacturer',1,0,0,100,4,1,31,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'productcategory','vtiger_products',1,'15','productcategory','Product Category',1,0,0,100,4,31,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'sales_start_date','vtiger_products',1,'5','sales_start_date','Sales Start Date',1,0,0,100,5,31,1,'D~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'sales_end_date','vtiger_products',1,'5','sales_end_date','Sales End Date',1,0,0,100,6,31,1,'D~O~OTH~GE~sales_start_date~Sales Start Date',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'start_date','vtiger_products',1,'5','start_date','Support Start Date',1,0,0,100,7,31,1,'D~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'expiry_date','vtiger_products',1,'5','expiry_date','Support Expiry Date',1,0,0,100,8,31,1,'D~O~OTH~GE~start_date~Start Date',1,null,'BAS')");
+ 
+
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'crmid','vtiger_seproductsrel',1,'66','parent_id','Related To',1,0,0,100,10,31,1,'I~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'contactid','vtiger_products',1,'57','contact_id','Contact Name',1,0,0,100,11,31,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'website','vtiger_products',1,'17','website','Website',1,0,0,100,12,31,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'vendor_id','vtiger_products',1,'75','vendor_id','Vendor Name',1,0,0,100,13,31,1,'I~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'mfr_part_no','vtiger_products',1,'1','mfr_part_no','Mfr PartNo',1,0,0,100,14,31,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'vendor_part_no','vtiger_products',1,'1','vendor_part_no','Vendor PartNo',1,0,0,100,15,31,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'serialno','vtiger_products',1,'1','serial_no','Serial No',1,0,0,100,16,31,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'productsheet','vtiger_products',1,'1','productsheet','Product Sheet',1,0,0,100,17,31,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'glacct','vtiger_products',1,'15','glacct','GL Account',1,0,0,100,18,31,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,19,31,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,20,31,2,'T~O',1,null,'BAS')");
+
+
+//Block32 Pricing Information
+
+$this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'unit_price','vtiger_products',1,'71','unit_price','Unit Price',1,0,0,100,1,32,1,'N~O',1,null,'BAS')"); 
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'commissionrate','vtiger_products',1,'9','commissionrate','Commission Rate',1,0,0,100,2,32,1,'N~O',1,null,'BAS')"); 
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'taxclass','vtiger_producttaxrel',1,'83','taxclass','Tax Class',1,0,0,100,4,32,1,'V~O',1,null,'BAS')");
+
+
+//Block 33 stock info
+
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'usageunit','vtiger_products',1,'15','usageunit','Usage Unit',1,0,0,100,1,33,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'qty_per_unit','vtiger_products',1,'1','qty_per_unit','Qty/Unit',1,0,0,100,2,33,1,'N~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'qtyinstock','vtiger_products',1,'1','qtyinstock','Qty In Stock',1,0,0,100,3,33,1,'I~O',1,null,'ADV')");
+$this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'reorderlevel','vtiger_products',1,'1','reorderlevel','Reorder Level',1,0,0,100,4,33,1,'I~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'handler','vtiger_products',1,'52','assigned_user_id','Handler',1,0,0,100,5,33,1,'I~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'qtyindemand','vtiger_products',1,'1','qtyindemand','Qty In Demand',1,0,0,100,6,33,1,'I~O',1,null,'ADV')");
+
+
+//ProductImageInformation
+
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'imagename','vtiger_products',1,'69','imagename','Product Image',1,0,0,100,1,35,1,'V~O',1,null,'ADV')");
+
+
+//Block 36 Description Info
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'product_description','vtiger_products',1,'19','product_description','Description',1,0,0,100,1,36,1,'V~O',1,null,'BAS')");
+
+//Product Details -- END
+
+//Note Details -- START
+//Block17 -- Start
+
+$this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("field").",'contact_id','vtiger_notes',1,'57','contact_id','Contact Name',1,0,0,100,1,17,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("field").",'crmid','vtiger_senotesrel',1,'62','parent_id','Related To',1,0,0,100,2,17,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("field").",'title','vtiger_notes',1,'2','notes_title','Subject',1,0,0,100,3,17,1,'V~M',0,1,'BAS')");
+$this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,4,17,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,5,17,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("field").",'filename','vtiger_notes',1,'61','filename','Attachment',1,0,0,100,4,17,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("field").",'notecontent','vtiger_notes',1,'19','notecontent','Note',1,0,0,100,5,18,1,'V~O',1,null,'BAS')");
+
+//Block17 -- End
+//Note Details -- END
+
+//Email Details -- START
+//Block21 -- Start
+
+	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'date_start','vtiger_activity',1,'6','date_start','Date & Time Sent',1,0,0,100,1,21,1,'DT~M~time_start~Time Start',1,null,'BAS')");
+	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'semodule','vtiger_activity',1,'2','parent_type','Sales Enity Module',1,0,0,100,2,21,3,'',1,null,'BAS')");
+	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'activitytype','vtiger_activity',1,'2','activitytype','Activtiy Type',1,0,0,100,3,21,3,'V~O',1,null,'BAS')");
+	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'crmid','vtiger_seactivityrel',1,'357','parent_id','Related To',1,0,0,100,1,22,1,'I~O',1,null,'BAS')");
+	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,5,21,1,'V~M',1,null,'BAS')");
+	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'subject','vtiger_activity',1,'2','subject','Subject',1,0,0,100,1,23,1,'V~M',1,null,'BAS')");
+	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'filename','vtiger_attachments',1,'61','filename','Attachment',1,0,0,100,2,23,1,'V~O',1,null,'BAS')");
+	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,24,1,'V~O',1,null,'BAS')");
+	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'time_start','vtiger_activity',1,'2','time_start','Time Start',1,0,0,100,9,1,23,'T~O',1,null,'BAS')");
+	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,10,1,22,'T~O',1,null,'BAS')");
+ 	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,11,21,2,'T~O',1,null,'BAS')");
+
+//Block21 -- End
+//Email Details -- END
+
+//Task Details --START
+//Block19 -- Start
+$this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'subject','vtiger_activity',1,'2','subject','Subject',1,0,0,100,1,19,1,'V~M',0,1,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,2,19,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'date_start','vtiger_activity',1,'6','date_start','Start Date & Time',1,0,0,100,3,19,1,'DT~M~time_start',0,2,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'time_start','vtiger_activity',1,'2','time_start','Time Start',1,0,0,100,4,19,3,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'due_date','vtiger_activity',1,'23','due_date','Due Date',1,0,0,100,5,19,1,'D~M~OTH~GE~date_start~Start Date & Time',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'crmid','vtiger_seactivityrel',1,'66','parent_id','Related To',1,0,0,100,7,19,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'contactid','vtiger_cntactivityrel',1,'57','contact_id','Contact Name',1,0,0,100,8,19,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'status','vtiger_activity',1,'15','taskstatus','Status',1,0,0,100,9,19,1,'V~O',0,3,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'eventstatus','vtiger_activity',1,'15','eventstatus','Status',1,0,0,100,9,19,3,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'priority','vtiger_activity',1,'15','taskpriority','Priority',1,0,0,100,10,19,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'sendnotification','vtiger_activity',1,'56','sendnotification','Send Notification',1,0,0,100,11,19,1,'C~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,14,19,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,15,19,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'activitytype','vtiger_activity',1,'15','activitytype','Activity Type',1,0,0,100,16,19,3,'V~O',1,null,'BAS')");
+ $this->db->query("Insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'visibility','vtiger_activity',1,15,'visibility','Visibility',1,0,0,100,17,19,3,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,20,1,'V~O',1,null,'BAS')");
+
+
+$this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'duration_hours','vtiger_activity',1,'63','duration_hours','Duration',1,0,0,100,17,19,3,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'duration_minutes','vtiger_activity',1,'15','duration_minutes','Duration Minutes',1,0,0,100,18,19,3,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'location','vtiger_activity',1,'1','location','Location',1,0,0,100,19,19,3,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'reminder_time','vtiger_activity_reminder',1,'30','reminder_time','Send Reminder',1,0,0,100,1,19,3,'I~O',1,null,'BAS')");
+ 
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'recurringtype','vtiger_recurringevents',1,'15','recurringtype','Recurrence',1,0,0,100,6,19,3,'O~O',1,null,'BAS')");
+
+ $this->db->query("Insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'notime','vtiger_activity',1,56,'notime','No Time',1,0,0,100,20,19,3,'C~O',1,null,'BAS')");
+//Block19 -- End
+//Task Details -- END
+
+//Event Details --START
+//Block41-43-- Start
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'subject','vtiger_activity',1,'2','subject','Subject',1,0,0,100,1,41,1,'V~M',0,1,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,2,41,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'date_start','vtiger_activity',1,'6','date_start','Start Date & Time',1,0,0,100,3,41,1,'DT~M~time_start',0,2,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'time_start','vtiger_activity',1,'2','time_start','Time Start',1,0,0,100,4,41,3,'T~M',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'due_date','vtiger_activity',1,'23','due_date','End Date',1,0,0,100,5,41,1,'D~M~OTH~GE~date_start~Start Date & Time',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'recurringtype','vtiger_recurringevents',1,'15','recurringtype','Recurrence',1,0,0,100,6,41,1,'O~O',1,null,'BAS')");
+  
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'duration_hours','vtiger_activity',1,'63','duration_hours','Duration',1,0,0,100,7,41,1,'I~M',0,5,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'duration_minutes','vtiger_activity',1,'15','duration_minutes','Duration Minutes',1,0,0,100,8,41,3,'O~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'crmid','vtiger_seactivityrel',1,'66','parent_id','Related To',1,0,0,100,9,41,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'eventstatus','vtiger_activity',1,'15','eventstatus','Status',1,0,0,100,10,41,1,'V~O',0,3,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'sendnotification','vtiger_activity',1,'56','sendnotification','Send Notification',1,0,0,100,11,41,1,'C~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'activitytype','vtiger_activity',1,'15','activitytype','Activity Type',1,0,0,100,12,41,1,'V~O',0,4,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'location','vtiger_activity',1,'1','location','Location',1,0,0,100,13,41,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,14,41,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,15,41,2,'T~O',1,null,'BAS')");
+ $this->db->query("Insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'priority','vtiger_activity',1,15,'taskpriority','Priority',1,0,0,100,16,41,1,'V~O',1,null,'BAS')");
+ $this->db->query("Insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'notime','vtiger_activity',1,56,'notime','No Time',1,0,0,100,17,41,1,'C~O',1,null,'BAS')");
+ $this->db->query("Insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'visibility','vtiger_activity',1,15,'visibility','Visibility',1,0,0,100,18,41,1,'V~O',1,null,'BAS')");
+ 
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,43,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'reminder_time','vtiger_activity_reminder',1,'30','reminder_time','Send Reminder',1,0,0,100,1,42,1,'I~O',1,null,'BAS')");
+//Block41-43 -- End
+//Event Details -- END
+
+//Faq Details -- START
+//Block37-40 -- Start
+
+$this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("field").",'product_id','vtiger_faq',1,'59','product_id','Product Name',1,0,0,100,1,37,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("field").",'category','vtiger_faq',1,'15','faqcategories','Category',1,0,0,100,2,37,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("field").",'status','vtiger_faq',1,'15','faqstatus','Status',1,0,0,100,3,37,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("field").",'question','vtiger_faq',1,'20','question','Question',1,0,0,100,1,38,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("field").",'answer','vtiger_faq',1,'20','faq_answer','Answer',1,0,0,100,1,39,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("field").",'comments','vtiger_faqcomments',1,'19','comments','Add Comment',1,0,0,100,1,40,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,3,37,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,4,37,2,'T~O',1,null,'BAS')");
+
+
+//Block37-40 -- End
+//Ticket Details -- END
+
+//Vendor Details --START
+//Block44-47
+
+$this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'vendorname','vtiger_vendor',1,'2','vendorname','Vendor Name',1,0,0,100,1,44,1,'V~M',0,1,'BAS')");
+ $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'phone','vtiger_vendor',1,'1','phone','Phone',1,0,0,100,3,44,1,'V~O',0,2,'BAS')");
+ $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'email','vtiger_vendor',1,'13','email','Email',1,0,0,100,4,44,1,'E~O',0,3,'BAS')");
+ $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'website','vtiger_vendor',1,'17','website','Website',1,0,0,100,5,44,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'glacct','vtiger_vendor',1,'15','glacct','GL Account',1,0,0,100,6,44,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'category','vtiger_vendor',1,'1','category','Category',1,0,0,100,7,44,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,8,44,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,9,44,2,'T~O',1,null,'BAS')");
+
+//Block 46
+
+$this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'street','vtiger_vendor',1,'21','street','Street',1,0,0,100,1,46,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'pobox','vtiger_vendor',1,'1','pobox','Po Box',1,0,0,100,2,46,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'city','vtiger_vendor',1,'1','city','City',1,0,0,100,3,46,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'state','vtiger_vendor',1,'1','state','State',1,0,0,100,4,46,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'postalcode','vtiger_vendor',1,'1','postalcode','Postal Code',1,0,0,100,5,46,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'country','vtiger_vendor',1,'1','country','Country',1,0,0,100,6,46,1,'V~O',1,null,'ADV')");
+
+//Block 47
+
+$this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,47,1,'V~O',1,null,'ADV')");
+
+//Vendor Details -- END
+
+//PriceBook Details Start
+//Block48
+
+$this->db->query("insert into vtiger_field values (19,".$this->db->getUniqueID("field").",'bookname','vtiger_pricebook',1,'2','bookname','Price Book Name',1,0,0,100,1,48,1,'V~M',0,1,'BAS')");
+ $this->db->query("insert into vtiger_field values (19,".$this->db->getUniqueID("field").",'active','vtiger_pricebook',1,'56','active','Active',1,0,0,100,3,48,1,'V~O',0,2,'BAS')");
+$this->db->query("insert into vtiger_field values (19,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,4,48,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (19,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,5,48,2,'T~O',1,null,'BAS')");
+
+//Block50
+
+$this->db->query("insert into vtiger_field values (19,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,50,1,'V~O',1,null,'BAS')");
+
+//PriceBook Details End
+
+
+//Quote Details -- START
+ //Block51
+
+$this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'subject','vtiger_quotes',1,'2','subject','Subject',1,0,0,100,1,51,1,'V~M',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'potentialid','vtiger_quotes',1,'76','potential_id','Potential Name',1,0,0,100,2,51,1,'I~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'quotestage','vtiger_quotes',1,'15','quotestage','Quote Stage',1,0,0,100,3,51,1,'V~O',1,null,'BAS')");	
+
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'validtill','vtiger_quotes',1,'5','validtill','Valid Till',1,0,0,100,4,51,1,'D~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'team','vtiger_quotes',1,'1','team','Team',1,0,0,100,5,51,1,'V~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'contactid','vtiger_quotes',1,'57','contact_id','Contact Name',1,0,0,100,6,51,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'carrier','vtiger_quotes',1,'15','carrier','Carrier',1,0,0,100,8,51,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'subtotal','vtiger_quotes',1,'1','hdnSubTotal','Sub Total',1,0,0,100,9,51,3,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'shipping','vtiger_quotes',1,'1','shipping','Shipping',1,0,0,100,10,51,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'inventorymanager','vtiger_quotes',1,'77','assigned_user_id1','Inventory Manager',1,0,0,100,11,51,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'tax','vtiger_quotes',1,'1','txtTax','Tax',1,0,0,100,13,51,3,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'adjustment','vtiger_quotes',1,'1','txtAdjustment','Adjustment',1,0,0,100,20,51,3,'NN~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'total','vtiger_quotes',1,'1','hdnGrandTotal','Total',1,0,0,100,14,51,3,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'accountid','vtiger_quotes',1,'73','account_id','Account Name',1,0,0,100,16,51,1,'I~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,17,51,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,18,51,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,19,51,2,'T~O',1,null,'BAS')");
+
+
+ //Block 53
+
+$this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'bill_street','vtiger_quotesbillads',1,'24','bill_street','Billing Address',1,0,0,100,1,53,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'ship_street','vtiger_quotesshipads',1,'24','ship_street','Shipping Address',1,0,0,100,2,53,1,'V~M',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'bill_city','vtiger_quotesbillads',1,'1','bill_city','Billing City',1,0,0,100,5,53,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'ship_city','vtiger_quotesshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,53,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'bill_state','vtiger_quotesbillads',1,'1','bill_state','Billing State',1,0,0,100,7,53,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'ship_state','vtiger_quotesshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,53,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'bill_code','vtiger_quotesbillads',1,'1','bill_code','Billing Code',1,0,0,100,9,53,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'ship_code','vtiger_quotesshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,53,1,'V~O',1,null,'BAS')");
+
+
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'bill_country','vtiger_quotesbillads',1,'1','bill_country','Billing Country',1,0,0,100,11,53,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'ship_country','vtiger_quotesshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,53,1,'V~O',1,null,'BAS')");
+
+$this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'bill_pobox','vtiger_quotesbillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,53,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'ship_pobox','vtiger_quotesshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,53,1,'V~O',1,null,'BAS')");
+ //Block55
+
+$this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,56,1,'V~O',1,null,'ADV')");
+
+//Block 56
+$this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'terms_conditions','vtiger_quotes',1,'19','terms_conditions','Terms & Conditions',1,0,0,100,1,55,1,'V~O',1,null,'ADV')");
+
+
+//Quote Details -- END
+
+//Purchase Order Details -- START
+ //Block57
+ 
+$this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'subject','vtiger_purchaseorder',1,'2','subject','Subject',1,0,0,100,1,57,1,'V~M',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'vendorid','vtiger_purchaseorder',1,'81','vendor_id','Vendor Name',1,0,0,100,3,57,1,'I~M',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'requisition_no','vtiger_purchaseorder',1,'1','requisition_no','Requisition No',1,0,0,100,4,57,1,'V~O',1,null,'BAS')");	
+
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'tracking_no','vtiger_purchaseorder',1,'1','tracking_no','Tracking Number',1,0,0,100,5,57,1,'V~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'contactid','vtiger_purchaseorder',1,'57','contact_id','Contact Name',1,0,0,100,6,57,1,'I~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'duedate','vtiger_purchaseorder',1,'5','duedate','Due Date',1,0,0,100,7,57,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'carrier','vtiger_purchaseorder',1,'15','carrier','Carrier',1,0,0,100,8,57,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'salestax','vtiger_purchaseorder',1,'1','txtTax','Sales Tax',1,0,0,100,10,57,3,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'adjustment','vtiger_purchaseorder',1,'1','txtAdjustment','Adjustment',1,0,0,100,10,57,3,'NN~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'salescommission','vtiger_purchaseorder',1,'1','salescommission','Sales Commission',1,0,0,100,11,57,1,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'exciseduty','vtiger_purchaseorder',1,'1','exciseduty','Excise Duty',1,0,0,100,12,57,1,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'total','vtiger_purchaseorder',1,'1','hdnGrandTotal','Total',1,0,0,100,13,57,3,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'subtotal','vtiger_purchaseorder',1,'1','hdnSubTotal','Sub Total',1,0,0,100,14,57,3,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'postatus','vtiger_purchaseorder',1,'15','postatus','Status',1,0,0,100,15,57,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,16,57,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,17,57,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,18,57,2,'T~O',1,null,'BAS')");
+
+
+
+ //Block 59
+
+$this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'bill_street','vtiger_pobillads',1,'24','bill_street','Billing Address',1,0,0,100,1,59,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'ship_street','vtiger_poshipads',1,'24','ship_street','Shipping Address',1,0,0,100,2,59,1,'V~M',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'bill_city','vtiger_pobillads',1,'1','bill_city','Billing City',1,0,0,100,5,59,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'ship_city','vtiger_poshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,59,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'bill_state','vtiger_pobillads',1,'1','bill_state','Billing State',1,0,0,100,7,59,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'ship_state','vtiger_poshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,59,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'bill_code','vtiger_pobillads',1,'1','bill_code','Billing Code',1,0,0,100,9,59,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'ship_code','vtiger_poshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,59,1,'V~O',1,null,'BAS')");
+
+
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'bill_country','vtiger_pobillads',1,'1','bill_country','Billing Country',1,0,0,100,11,59,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'ship_country','vtiger_poshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,59,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'bill_pobox','vtiger_pobillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,59,1,'V~O',1,null,'BAS')");
+  $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'ship_pobox','vtiger_poshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,59,1,'V~O',1,null,'BAS')");
+  
+ //Block61
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,62,1,'V~O',1,null,'ADV')");
+
+ //Block62
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'terms_conditions','vtiger_purchaseorder',1,'19','terms_conditions','Terms & Conditions',1,0,0,100,1,61,1,'V~O',1,null,'ADV')");
+
+//Purchase Order Details -- END
+
+//Sales Order Details -- START
+ //Block63
+ 
+$this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'subject','vtiger_salesorder',1,'2','subject','Subject',1,0,0,100,1,63,1,'V~M',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'potentialid','vtiger_salesorder',1,'76','potential_id','Potential Name',1,0,0,100,2,63,1,'I~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'customerno','vtiger_salesorder',1,'1','customerno','Customer No',1,0,0,100,3,63,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'quoteid','vtiger_salesorder',1,'78','quote_id','Quote Name',1,0,0,100,4,63,1,'I~O',1,null,'BAS')");	
+$this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'purchaseorder','vtiger_salesorder',1,'1','vtiger_purchaseorder','Purchase Order',1,0,0,100,4,63,1,'V~O',1,null,'BAS')");	
+
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'contactid','vtiger_salesorder',1,'57','contact_id','Contact Name',1,0,0,100,6,63,1,'I~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'duedate','vtiger_salesorder',1,'5','duedate','Due Date',1,0,0,100,8,63,1,'D~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'carrier','vtiger_salesorder',1,'15','carrier','Carrier',1,0,0,100,9,63,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'pending','vtiger_salesorder',1,'1','pending','Pending',1,0,0,100,10,63,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'sostatus','vtiger_salesorder',1,'15','sostatus','Status',1,0,0,100,11,63,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'salestax','vtiger_salesorder',1,'1','txtTax','Sales Tax',1,0,0,100,12,63,3,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'adjustment','vtiger_salesorder',1,'1','txtAdjustment','Sales Tax',1,0,0,100,12,63,3,'NN~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'salescommission','vtiger_salesorder',1,'1','salescommission','Sales Commission',1,0,0,100,13,63,1,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'exciseduty','vtiger_salesorder',1,'1','exciseduty','Excise Duty',1,0,0,100,13,63,1,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'total','vtiger_salesorder',1,'1','hdnGrandTotal','Total',1,0,0,100,14,63,3,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'subtotal','vtiger_salesorder',1,'1','hdnSubTotal','Total',1,0,0,100,15,63,3,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'accountid','vtiger_salesorder',1,'73','account_id','Account Name',1,0,0,100,16,63,1,'I~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,17,63,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,18,63,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,19,63,2,'T~O',1,null,'BAS')");
+
+
+
+ //Block 65
+
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'bill_street','vtiger_sobillads',1,'24','bill_street','Billing Address',1,0,0,100,1,65,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'ship_street','vtiger_soshipads',1,'24','ship_street','Shipping Address',1,0,0,100,2,65,1,'V~M',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'bill_city','vtiger_sobillads',1,'1','bill_city','Billing City',1,0,0,100,5,65,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'ship_city','vtiger_soshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,65,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'bill_state','vtiger_sobillads',1,'1','bill_state','Billing State',1,0,0,100,7,65,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'ship_state','vtiger_soshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,65,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'bill_code','vtiger_sobillads',1,'1','bill_code','Billing Code',1,0,0,100,9,65,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'ship_code','vtiger_soshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,65,1,'V~O',1,null,'BAS')");
+
+
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'bill_country','vtiger_sobillads',1,'1','bill_country','Billing Country',1,0,0,100,11,65,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'ship_country','vtiger_soshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,65,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'bill_pobox','vtiger_sobillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,65,1,'V~O',1,null,'BAS')");
+  $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'ship_pobox','vtiger_soshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,65,1,'V~O',1,null,'BAS')");
+  
+//Block67
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,68,1,'V~O',1,null,'ADV')");
+
+ //Block68
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'terms_conditions','vtiger_salesorder',1,'19','terms_conditions','Terms & Conditions',1,0,0,100,1,67,1,'V~O',1,null,'ADV')");
+
+
+//Sales Order Details -- END
+
+//Invoice Details -- START
+ //Block69
+
+$this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'subject','vtiger_invoice',1,'2','subject','Subject',1,0,0,100,1,69,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'salesorderid','vtiger_invoice',1,'80','salesorder_id','Sales Order',1,0,0,100,2,69,1,'I~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'customerno','vtiger_invoice',1,'1','customerno','Customer No',1,0,0,100,3,69,1,'V~O',1,null,'BAS')");	
+
+ 
+//to include contact name vtiger_field in Invoice-start
+$this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'contactid','vtiger_invoice',1,'57','contact_id','Contact Name',1,0,0,100,4,69,1,'I~O',1,null,'BAS')");
+//end
+
+$this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'invoicedate','vtiger_invoice',1,'5','invoicedate','Invoice Date',1,0,0,100,5,69,1,'D~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'duedate','vtiger_invoice',1,'5','duedate','Due Date',1,0,0,100,6,69,1,'D~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'purchaseorder','vtiger_invoice',1,'1','vtiger_purchaseorder','Purchase Order',1,0,0,100,8,69,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'salestax','vtiger_invoice',1,'1','txtTax','Sales Tax',1,0,0,100,9,69,3,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'adjustment','vtiger_invoice',1,'1','txtAdjustment','Sales Tax',1,0,0,100,9,69,3,'NN~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'salescommission','vtiger_invoice',1,'1','salescommission','Sales Commission',1,0,0,10,13,69,1,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'exciseduty','vtiger_invoice',1,'1','exciseduty','Excise Duty',1,0,0,100,11,69,1,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'subtotal','vtiger_invoice',1,'1','hdnSubTotal','Sub Total',1,0,0,100,12,69,3,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'total','vtiger_invoice',1,'1','hdnGrandTotal','Total',1,0,0,100,13,69,3,'N~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'accountid','vtiger_invoice',1,'73','account_id','Account Name',1,0,0,100,14,69,1,'I~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'invoicestatus','vtiger_invoice',1,'15','invoicestatus','Status',1,0,0,100,15,69,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,16,69,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,17,69,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,18,69,2,'T~O',1,null,'BAS')"); 
+
+ //Block 71
+
+$this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'bill_street','vtiger_invoicebillads',1,'24','bill_street','Billing Address',1,0,0,100,1,71,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'ship_street','vtiger_invoiceshipads',1,'24','ship_street','Shipping Address',1,0,0,100,2,71,1,'V~M',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'bill_city','vtiger_invoicebillads',1,'1','bill_city','Billing City',1,0,0,100,5,71,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'ship_city','vtiger_invoiceshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,71,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'bill_state','vtiger_invoicebillads',1,'1','bill_state','Billing State',1,0,0,100,7,71,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'ship_state','vtiger_invoiceshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,71,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'bill_code','vtiger_invoicebillads',1,'1','bill_code','Billing Code',1,0,0,100,9,71,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'ship_code','vtiger_invoiceshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,71,1,'V~O',1,null,'BAS')");
+
+
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'bill_country','vtiger_invoicebillads',1,'1','bill_country','Billing Country',1,0,0,100,11,71,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'ship_country','vtiger_invoiceshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,71,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'bill_pobox','vtiger_invoicebillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,71,1,'V~O',1,null,'BAS')");
+  $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'ship_pobox','vtiger_invoiceshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,71,1,'V~O',1,null,'BAS')");
+
+//Block73
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,74,1,'V~O',1,null,'ADV')");
+ //Block74
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'terms_conditions','vtiger_invoice',1,'19','terms_conditions','Terms & Conditions',1,0,0,100,1,73,1,'V~O',1,null,'ADV')");
+
+
+//Invoice Details -- END
+ //users Details Starts Block 79,80,81
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'user_name','vtiger_users',1,'106','user_name','User Name',1,0,0,11,1,79,1,'V~M',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'is_admin','vtiger_users',1,'156','is_admin','Admin',1,0,0,3,2,79,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'user_password','vtiger_users',1,'99','user_password','Password',1,0,0,30,3,79,4,'P~M',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'confirm_password','vtiger_users',1,'99','confirm_password','Confirm Password',1,0,0,30,4,79,4,'P~M',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'first_name','vtiger_users',1,'1','first_name','First Name',1,0,0,30,5,79,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'last_name','vtiger_users',1,'2','last_name','Last Name',1,0,0,30,6,79,1,'V~M',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'roleid','vtiger_user2role',1,'98','roleid','Role',1,0,0,200,7,79,1,'V~M',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'email1','vtiger_users',1,'104','email1','Email',1,0,0,100,9,79,1,'E~M',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'status','vtiger_users',1,'115','status','Status',1,0,0,100,10,79,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'activity_view','vtiger_users',1,'15','activity_view','Default Activity View',1,0,0,100,13,79,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'lead_view','vtiger_users',1,'15','lead_view','Default Lead View',1,0,0,100,12,79,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'currency_id','vtiger_users',1,'116','currency_id','Currency',1,0,0,100,11,79,1,'I~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'hour_format','vtiger_users',1,'116','hour_format','Calendar Hour Format',1,0,0,100,13,79,3,'I~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'end_hour','vtiger_users',1,'116','end_hour','Day ends at',1,0,0,100,15,79,3,'I~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'start_hour','vtiger_users',1,'116','start_hour','Day starts at',1,0,0,100,14,79,3,'I~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'title','vtiger_users',1,'1','title','Title',1,0,0,50,1,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'phone_work','vtiger_users',1,'1','phone_work','Office Phone',1,0,0,50,2,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'department','vtiger_users',1,'1','department','Department',1,0,0,50,3,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'phone_mobile','vtiger_users',1,'1','phone_mobile','Mobile',1,0,0,50,4,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'reports_to_id','vtiger_users',1,'101','reports_to_id','Reports To',1,0,0,50,5,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'phone_other','vtiger_users',1,'1','phone_other','Other Phone',1,0,0,50,5,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'email2','vtiger_users',1,'13','email2','Other Email',1,0,0,100,6,80,1,'E~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'phone_fax','vtiger_users',1,'1','phone_fax','Fax',1,0,0,50,7,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'yahoo_id','vtiger_users',1,'13','yahoo_id','Yahoo id',1,0,0,100,7,80,1,'E~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'phone_home','vtiger_users',1,'1','phone_home','Home Phone',1,0,0,50,8,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'imagename','vtiger_users',1,'105','imagename','User Image',1,0,0,250,9,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'date_format','vtiger_users',1,'15','date_format','Date Format',1,0,0,30,10,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'tagcloud','vtiger_users',1,'103','tagcloud','Tag Cloud',1,0,0,250,13,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'signature','vtiger_users',1,'21','signature','Signature',1,0,0,250,11,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'description','vtiger_users',1,'21','description','Notes',1,0,0,250,12,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'address_street','vtiger_users',1,'21','address_street','Street Address',1,0,0,250,1,81,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'address_city','vtiger_users',1,'1','address_city','City',1,0,0,100,2,81,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'address_state','vtiger_users',1,'1','address_state','State',1,0,0,100,3,81,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'address_postalcode','vtiger_users',1,'1','address_postalcode','Postal Code',1,0,0,100,4,81,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'address_country','vtiger_users',1,'1','address_country','Country',1,0,0,100,5,81,1,'V~O',1,null,'BAS')");
+
+ //user Details End
+
+
+
+                // Insert End
+                
+
+		//New Security Start
+		//Inserting into vtiger_profile vtiger_table
+		$this->db->query("insert into vtiger_profile values ('".$profile1_id."','Administrator',null)");	
+		$this->db->query("insert into vtiger_profile values ('".$profile2_id."','Sales Profile',null)");
+		$this->db->query("insert into vtiger_profile values ('".$profile3_id."','Support Profile',null)");
+		$this->db->query("insert into vtiger_profile values ('".$profile4_id."','Guest Profile',null)");
+		
+		//Inserting into vtiger_profile2gloabal permissions
+		$this->db->query("insert into vtiger_profile2globalpermissions values ('".$profile1_id."',1,0)");
+		$this->db->query("insert into vtiger_profile2globalpermissions values ('".$profile1_id."',2,0)");
+		$this->db->query("insert into vtiger_profile2globalpermissions values ('".$profile2_id."',1,1)");
+		$this->db->query("insert into vtiger_profile2globalpermissions values ('".$profile2_id."',2,1)");
+		$this->db->query("insert into vtiger_profile2globalpermissions values ('".$profile3_id."',1,1)");
+		$this->db->query("insert into vtiger_profile2globalpermissions values ('".$profile3_id."',2,1)");
+		$this->db->query("insert into vtiger_profile2globalpermissions values ('".$profile4_id."',1,1)");
+		$this->db->query("insert into vtiger_profile2globalpermissions values ('".$profile4_id."',2,1)");
+
+		//Inserting into vtiger_profile2tab
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",1,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",2,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",3,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",4,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",6,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",7,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",8,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",9,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",10,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",13,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",14,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",15,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",16,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",17,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",18,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",19,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",20,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",21,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",22,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",23,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",24,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",25,0)");
+       		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",26,0)");
+       		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",27,0)");
+
+		//Inserting into vtiger_profile2tab
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",1,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",2,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",3,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",4,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",6,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",7,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",8,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",9,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",10,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",13,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",14,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",15,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",16,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",17,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",18,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",19,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",20,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",21,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",22,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",23,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",24,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",25,0)");
+        	$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",26,0)");
+       		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",27,0)");
+
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",1,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",2,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",3,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",4,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",6,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",7,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",8,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",9,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",10,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",13,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",14,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",15,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",16,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",17,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",18,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",19,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",20,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",21,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",22,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",23,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",24,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",25,0)");
+        	$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",26,0)");
+       		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",27,0)");
+        
+
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",1,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",2,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",3,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",4,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",6,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",7,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",8,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",9,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",10,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",13,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",14,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",15,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",16,0)");	
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",17,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",18,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",19,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",20,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",21,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",22,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",23,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",24,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",25,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",26,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",27,0)");
+		//Inserting into vtiger_profile2standardpermissions  Adminsitrator
+		
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",2,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",2,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",2,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",2,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",2,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",4,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",4,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",4,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",4,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",4,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",6,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",6,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",6,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",6,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",6,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",7,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",7,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",7,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",7,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",7,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",8,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",8,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",8,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",8,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",8,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",9,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",9,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",9,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",9,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",9,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",10,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",10,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",10,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",10,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",10,4,0)");
+
+		
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",13,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",13,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",13,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",13,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",13,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",14,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",14,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",14,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",14,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",14,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",15,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",15,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",15,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",15,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",15,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",16,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",16,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",16,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",16,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",16,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",18,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",18,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",18,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",18,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",18,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",19,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",19,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",19,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",19,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",19,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",20,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",20,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",20,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",20,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",20,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",21,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",21,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",21,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",21,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",21,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",22,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",22,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",22,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",22,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",22,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",23,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",23,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",23,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",23,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",23,4,0)");
+
+
+
+        	$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",26,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",26,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",26,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",26,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",26,4,0)");
+
+
+		//Insert into Profile 2 std permissions for Sales User  
+		//Help Desk Create/Delete not allowed. Read-Only	
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",2,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",2,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",2,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",2,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",2,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",4,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",4,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",4,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",4,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",4,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",6,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",6,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",6,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",6,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",6,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",7,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",7,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",7,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",7,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",7,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",8,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",8,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",8,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",8,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",8,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",9,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",9,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",9,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",9,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",9,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",10,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",10,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",10,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",10,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",10,4,0)");
+
+		
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",13,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",13,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",13,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",13,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",13,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",14,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",14,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",14,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",14,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",14,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",15,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",15,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",15,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",15,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",15,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",16,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",16,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",16,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",16,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",16,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",18,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",18,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",18,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",18,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",18,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",19,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",19,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",19,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",19,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",19,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",20,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",20,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",20,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",20,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",20,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",21,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",21,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",21,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",21,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",21,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",22,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",22,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",22,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",22,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",22,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",23,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",23,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",23,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",23,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",23,4,0)");
+
+
+        	$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",26,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",26,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",26,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",26,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",26,4,0)");
+
+		//Inserting into vtiger_profile2std for Support Profile
+		// Potential is read-only
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",2,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",2,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",2,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",2,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",2,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",4,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",4,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",4,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",4,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",4,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",6,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",6,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",6,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",6,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",6,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",7,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",7,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",7,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",7,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",7,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",8,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",8,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",8,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",8,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",8,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",9,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",9,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",9,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",9,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",9,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",10,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",10,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",10,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",10,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",10,4,0)");
+
+		
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",13,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",13,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",13,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",13,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",13,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",14,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",14,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",14,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",14,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",14,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",15,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",15,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",15,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",15,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",15,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",16,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",16,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",16,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",16,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",16,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",18,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",18,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",18,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",18,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",18,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",19,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",19,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",19,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",19,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",19,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",20,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",20,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",20,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",20,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",20,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",21,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",21,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",21,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",21,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",21,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",22,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",22,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",22,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",22,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",22,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",23,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",23,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",23,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",23,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",23,4,0)");
+
+
+        	$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",26,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",26,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",26,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",26,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",26,4,0)");
+        
+		//Inserting into vtiger_profile2stdper for Profile Guest Profile
+		//All Read-Only
+		
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",2,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",2,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",2,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",2,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",2,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",4,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",4,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",4,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",4,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",4,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",6,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",6,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",6,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",6,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",6,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",7,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",7,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",7,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",7,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",7,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",8,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",8,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",8,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",8,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",8,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",9,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",9,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",9,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",9,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",9,4,0)");
+
+		
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",13,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",13,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",13,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",13,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",13,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",14,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",14,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",14,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",14,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",14,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",15,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",15,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",15,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",15,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",15,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",16,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",16,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",16,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",16,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",16,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",18,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",18,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",18,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",18,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",18,4,0)");	
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",19,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",19,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",19,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",19,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",19,4,0)");	
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",20,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",20,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",20,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",20,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",20,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",21,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",21,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",21,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",21,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",21,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",22,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",22,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",22,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",22,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",22,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",23,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",23,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",23,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",23,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",23,4,0)");	
+
+
+        $this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",26,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",26,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",26,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",26,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",26,4,0)");
+
+		//Insert into vtiger_role2profile
+		$this->db->query("insert into vtiger_role2profile values ('H".$role2_id."',".$profile1_id.")");
+		$this->db->query("insert into vtiger_role2profile values ('H".$role3_id."',".$profile2_id.")");
+	  $this->db->query("insert into vtiger_role2profile values ('H".$role4_id."',".$profile2_id.")");
+		$this->db->query("insert into vtiger_role2profile values ('H".$role5_id."',".$profile2_id.")"); 
+	   
+		//Insert into vtiger_profile2field
+			
+                insertProfile2field($profile1_id);
+                insertProfile2field($profile2_id);	
+                insertProfile2field($profile3_id);	
+                insertProfile2field($profile4_id);
+
+		insert_def_org_field();	
+		
+
+		//Inserting into vtiger_profile 2 utility Admin
+                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",2,5,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",2,6,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",4,5,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",4,6,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",6,5,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",6,6,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",7,5,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",7,6,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",8,6,0)");
+                //$this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",9,6,0)");
+		$this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",7,8,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",6,8,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",4,8,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",13,8,0)");
+		$this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",14,5,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",14,6,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",7,9,0)");
+
+		//Inserting into vtiger_profile2utility Sales Profile
+		//Import Export Not Allowed.	
+		$this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",2,5,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",2,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",4,5,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",4,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",6,5,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",6,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",7,5,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",7,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",8,6,1)");
+                //$this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",9,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",10,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",7,8,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",6,8,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",4,8,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",13,8,0)");
+		$this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",14,5,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",14,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",7,9,0)");
+
+		//Inserting into vtiger_profile2utility Support Profile
+		//Import Export Not Allowed.	
+		$this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",2,5,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",2,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",4,5,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",4,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",6,5,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",6,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",7,5,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",7,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",8,6,1)");
+                //$this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",9,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",10,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",7,8,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",6,8,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",4,8,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",13,8,0)");
+		$this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",14,5,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",14,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",7,9,0)");
+
+		//Inserting into vtiger_profile2utility Guest Profile Read-Only
+		//Import Export BusinessCar Not Allowed.	
+		$this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",2,5,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",2,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",4,5,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",4,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",6,5,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",6,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",7,5,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",7,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",8,6,1)");
+                //$this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",9,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",10,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",7,8,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",6,8,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",4,8,1)");		
+                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",13,8,1)");		
+		$this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",14,5,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",14,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",7,9,0)");
+
+		//Inserting values into org share action mapping
+                $this->db->query("insert into vtiger_org_share_action_mapping values(0,'Public: Read Only')");
+                $this->db->query("insert into vtiger_org_share_action_mapping values(1,'Public: Read, Create/Edit')");
+                $this->db->query("insert into vtiger_org_share_action_mapping values(2,'Public: Read, Create/Edit, Delete')");
+                $this->db->query("insert into vtiger_org_share_action_mapping values(3,'Private')");
+
+                $this->db->query("insert into vtiger_org_share_action_mapping values(4,'Hide Details')");
+                $this->db->query("insert into vtiger_org_share_action_mapping values(5,'Hide Details and Add Events')");
+                $this->db->query("insert into vtiger_org_share_action_mapping values(6,'Show Details')");
+                $this->db->query("insert into vtiger_org_share_action_mapping values(7,'Show Details and Add Events')");
+
+
+		//Inserting for all vtiger_tabs
+                $def_org_tabid= Array(2,4,6,7,9,10,13,16,20,21,22,23,26);
+
+                foreach($def_org_tabid as $def_tabid)
+                {
+                        $this->db->query("insert into vtiger_org_share_action2tab values(0,".$def_tabid.")");
+                        $this->db->query("insert into vtiger_org_share_action2tab values(1,".$def_tabid.")");
+                        $this->db->query("insert into vtiger_org_share_action2tab values(2,".$def_tabid.")");
+                        $this->db->query("insert into vtiger_org_share_action2tab values(3,".$def_tabid.")");
+                }
+
+                $this->db->query("insert into vtiger_org_share_action2tab values(4,17)");
+                $this->db->query("insert into vtiger_org_share_action2tab values(5,17)");
+                $this->db->query("insert into vtiger_org_share_action2tab values(6,17)");
+                $this->db->query("insert into vtiger_org_share_action2tab values(7,17)");
+
+		//Insert into default_org_sharingrule
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",2,2,0)");
+
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",4,2,2)");
+
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",6,2,0)");
+
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",7,2,0)");
+
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",9,3,1)");
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",13,2,0)");
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",16,3,2)");
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",17,7,0)");
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",20,2,0)");
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",21,2,0)");
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",22,2,0)");
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",23,2,0)");
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",26,2,0)");
+
+		//Populating the DataShare Related Modules
+
+		//Lead Related Module
+
+		//Account Related Module
+		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",6,2)");
+		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",6,13)");
+		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",6,20)");
+		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",6,22)");
+		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",6,23)");
+
+		//Potential Related Module
+		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",2,20)");
+		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",2,22)");
+
+		//Quote Related Module
+		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",20,22)");
+
+		//SO Related Module
+		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",22,23)");	
+
+
+			
+					
+  // New Secutity End
+
+
+         //insert into the vtiger_notificationscheduler vtiger_table
+
+	//insert into related list vtiger_table
+	//Inserting for vtiger_account related lists
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("Potentials").",'get_opportunities',1,'Potentials',0)");	
+		
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("Contacts").",'get_contacts',2,'Contacts',0)");
+
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("Activities").",'get_activities',3,'Activities',0)");
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("HelpDesk").",'get_tickets',4,'HelpDesk',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("Activities").",'get_history',5,'Activity History',0)");
+
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",0,'get_attachments',6,'Attachments',0)");
+
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("Quotes").",'get_quotes',7,'Quotes',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("Invoice").",'get_invoices',8,'Invoice',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("SalesOrder").",'get_salesorder',9,'Sales Order',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("Products").",'get_products',10,'Products',0)");
+
+	//Inserting Lead Related Lists	
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Leads").",".getTabid("Activities").",'get_activities',1,'Activities',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Leads").",".getTabid("Emails").",'get_emails',2,'Emails',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Leads").",".getTabid("Activities").",'get_history',3,'Activity History',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Leads").",0,'get_attachments',4,'Attachments',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Leads").",".getTabid("Products").",'get_products',5,'Products',0)");
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Leads").",".getTabid("Campaigns").",'get_campaigns',6,'Campaigns',0)");
+
+	//Inserting for contact related lists
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Potentials").",'get_opportunities',1,'Potentials',0)");	
+		
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Activities").",'get_activities',2,'Activities',0)");
+
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Emails").",'get_emails',3,'Emails',0)");
+
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("HelpDesk").",'get_tickets',4,'HelpDesk',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Quotes").",'get_quotes',5,'Quotes',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("PurchaseOrder").",'get_purchase_orders',6,'Purchase Order',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("SalesOrder").",'get_salesorder',7,'Sales Order',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Products").",'get_products',8,'Products',0)");
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Activities").",'get_history',9,'Activity History',0)");
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",0,'get_attachments',10,'Attachments',0)");
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Campaigns").",'get_campaigns',11,'Campaigns',0)");
+
+	//Inserting Potential Related Lists	
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",".getTabid("Activities").",'get_activities',1,'Activities',0)");
+
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",".getTabid("Contacts").",'get_contacts',2,'Contacts',0)");
+
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",".getTabid("Products").",'get_products',3,'Products',0)");
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",0,'get_stage_history',4,'Sales Stage History',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",0,'get_attachments',5,'Attachments',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",".getTabid("Quotes").",'get_Quotes',6,'Quotes',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",".getTabid("SalesOrder").",'get_salesorder',7,'Sales Order',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",".getTabid("Activities").",'get_history',8,'Activity History',0)");
+
+		//Inserting Product Related Lists	
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",".getTabid("HelpDesk").",'get_tickets',1,'HelpDesk',0)");
+
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",".getTabid("Activities").",'get_activities',2,'Activities',0)");
+
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",0,'get_attachments',3,'Attachments',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",".getTabid("Quotes").",'get_quotes',4,'Quotes',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",".getTabid("PurchaseOrder").",'get_purchase_orders',5,'Purchase Order',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",".getTabid("SalesOrder").",'get_salesorder',6,'Sales Order',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",".getTabid("Invoice").",'get_invoices',7,'Invoice',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",".getTabid("PriceBooks").",'get_product_pricebooks',8,'PriceBooks',0)");
+	
+		//Inserting Emails Related Lists	
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Emails").",".getTabid("Contacts").",'get_contacts',1,'Contacts',0)");
+
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Emails").",0,'get_users',2,'Users',0)");
+
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Emails").",0,'get_attachments',3,'Attachments',0)");
+
+		//Inserting HelpDesk Related Lists
+		
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("HelpDesk").",".getTabid("Activities").",'get_activities',1,'Activities',0)");
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("HelpDesk").",0,'get_attachments',2,'Attachments',0)");
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("HelpDesk").",0,'get_ticket_history',3,'Ticket History',0)");
+
+	//Inserting PriceBook Related Lists
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("PriceBooks").",14,'get_pricebook_products',2,'Products',0)");
+
+        // Inserting Vendor Related Lists
+        $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Vendors").",14,'get_products',1,'Products',0)");
+
+        $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Vendors").",21,'get_purchase_orders',2,'Purchase Order',0)");
+
+        $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Vendors").",4,'get_contacts',3,'Contacts',0)");
+
+	// Inserting Quotes Related Lists
+	
+        $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Quotes").",".getTabid("Invoice").",'get_salesorder',1,'Sales Order',0)");
+        
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Quotes").",9,'get_activities',2,'Activities',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Quotes").",9,'get_history',3,'Activity History',0)");
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Quotes").",0,'get_quotestagehistory',4,'Quote Stage History',0)");
+
+	// Inserting Purchase order Related Lists
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("PurchaseOrder").",9,'get_activities',1,'Activities',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("PurchaseOrder").",0,'get_attachments',2,'Attachments',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("PurchaseOrder").",".getTabid("Activities").",'get_history',3,'Activity History',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("PurchaseOrder").",0,'get_postatushistory',4,'PurchaseOrder Status History',0)");
+
+	// Inserting Sales order Related Lists
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("SalesOrder").",9,'get_activities',1,'Activities',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("SalesOrder").",0,'get_attachments',2,'Attachments',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("SalesOrder").",".getTabid("Invoice").",'get_invoices',3,'Invoice',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("SalesOrder").",".getTabid("Activities").",'get_history',4,'Activity History',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("SalesOrder").",0,'get_sostatushistory',5,'SalesOrder Status History',0)");
+
+	// Inserting Invoice Related Lists
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Invoice").",9,'get_activities',1,'Activities',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Invoice").",0,'get_attachments',2,'Attachments',0)");
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Invoice").",".getTabid("Activities").",'get_history',3,'Activity History',0)");
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Invoice").",0,'get_invoicestatushistory',4,'Invoice Status History',0)");
+
+	// Inserting Activities Related Lists
+	
+	$this->db->query("insert into vtiger_relatedlists values (".$this->db->getUniqueID('relatedlists').",".getTabid("Activities").",0,'get_users',1,'Users',0)");
+	$this->db->query("insert into vtiger_relatedlists values (".$this->db->getUniqueID('relatedlists').",".getTabid("Activities").",4,'get_contacts',2,'Contacts',0)");
+
+	// Inserting Campaigns Related Lists
+
+         $this->db->query("insert into vtiger_relatedlists values (".$this->db->getUniqueID('relatedlists').",".getTabid("Campaigns").",".getTabid("Contacts").",'get_contacts',1,'Contacts',0)");
+         $this->db->query("insert into vtiger_relatedlists values (".$this->db->getUniqueID('relatedlists').",".getTabid("Campaigns").",".getTabid("Leads").",'get_leads',2,'Leads',0)");
+	 $this->db->query("insert into vtiger_relatedlists values (".$this->db->getUniqueID('relatedlists').",".getTabid("Campaigns").",".getTabid("Potentials").",'get_opportunities',3,'Potentials',0)");
+	 $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Campaigns").",9,'get_activities',4,'Activities',0)");
+
+ //Inserting User Related Lists
+ 
+        $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Users").",".getTabid("Activities").",'get_activities',1,'Activities',0)");
+ 
+        $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Users").",".getTabid("Contacts").",'get_contacts',2,'Contacts',0)");
+ 
+        $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Users").",".getTabid("Users").",'get_user_groups',3,'Groups',0)");
+
+	 
+               $this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("notificationscheduler").",'LBL_TASK_NOTIFICATION_DESCRITPION',1,'Task Delay Notification','Tasks delayed beyond 24 hrs ','LBL_TASK_NOTIFICATION')");
+
+
+                $this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("notificationscheduler").",'LBL_BIG_DEAL_DESCRIPTION' ,1,'Big Deal notification','Success! A big deal has been won! ','LBL_BIG_DEAL')");
+
+
+                $this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("notificationscheduler").",'LBL_TICKETS_DESCRIPTION',1,'Pending Tickets notification','Ticket pending please ','LBL_PENDING_TICKETS')");
+
+
+                $this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("notificationscheduler").",'LBL_MANY_TICKETS_DESCRIPTION',1,'Too many tickets Notification','Too many tickets pending against this entity ','LBL_MANY_TICKETS')");
+
+
+                $this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("notificationscheduler").",'LBL_START_DESCRIPTION' ,1,'Support Start Notification','Support starts please ','LBL_START_NOTIFICATION')");
+
+                $this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("notificationscheduler").",'LBL_SUPPORT_DESCRIPTION',1,'Support ending please','Support Ending Notification','LBL_SUPPORT_NOTICIATION')");
+		
+ 		$this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("notificationscheduler").",'LBL_ACTIVITY_REMINDER_DESCRIPTION' ,1,'Activity Reminder Notication','This is a reminder notification for the Activity','LBL_ACTIVITY_NOTIFICATION')");
+
+		//Inserting Inventory Notifications
+	$invoice_body = 'Dear {HANDLER},
+
+The current stock of {PRODUCTNAME} in our warehouse is {CURRENTSTOCK}. Kindly procure required number of units as the stock level is below reorder level {REORDERLEVELVALUE}.
+
+Please treat this information as Urgent as the vtiger_invoice is already sent  to the customer.
+
+Severity: Critical
+
+Thanks,
+{CURRENTUSER}';
+
+		
+               $this->db->query("insert into vtiger_inventorynotification(notificationid,notificationname,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("inventorynotification").",'InvoiceNotification','{PRODUCTNAME} Stock Level is Low','".$invoice_body." ','InvoiceNotificationDescription')");
+
+		$quote_body = 'Dear {HANDLER},
+
+Quote is generated for {QUOTEQUANTITY} units of {PRODUCTNAME}. The current stock of {PRODUCTNAME} in our warehouse is {CURRENTSTOCK}. 
+
+Severity: Minor
+
+Thanks,
+{CURRENTUSER}';	
+		
+		
+               $this->db->query("insert into vtiger_inventorynotification(notificationid,notificationname,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("inventorynotification").",'QuoteNotification','Quote given for {PRODUCTNAME}','".$quote_body." ','QuoteNotificationDescription')");
+
+		$so_body = 'Dear {HANDLER},
+
+SalesOrder is generated for {SOQUANTITY} units of {PRODUCTNAME}. The current stock of {PRODUCTNAME} in our warehouse is {CURRENTSTOCK}. 
+
+Please treat this information  with vtiger_priority as the sales order is already generated.
+
+Severity: Major
+
+Thanks,
+{CURRENTUSER}';
+
+		
+               $this->db->query("insert into vtiger_inventorynotification(notificationid,notificationname,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("inventorynotification").",'SalesOrderNotification','Sales Order generated for {PRODUCTNAME}','".$so_body." ','SalesOrderNotificationDescription')");
+
+		//Insert into vtiger_currency vtiger_table
+		$this->db->query("insert into vtiger_currency_info values(".$this->db->getUniqueID("currency_info").",'U.S Dollar','USD','$',1,'Active','-11')");
+                
+
+
+
+//insert into email template vtiger_table
+
+	$body='
+	Hello!
+
+	On behalf of the vtiger team,  I am pleased to announce the release of vtiger crm4.2 . This is a feature packed release including the mass email template handling, custom view feature, vtiger_reports feature and a host of other utilities. vtiger runs on all platforms.
+
+	Notable Features of vtiger are :
+	-Email Client Integration
+	-Trouble Ticket Integration
+	-Invoice Management Integration
+	-Reports Integration
+	-Portal Integration
+	-Enhanced Word Plugin Support
+	-Custom View Integration
+
+	Known Issues:
+	-ABCD
+	-EFGH
+	-IJKL
+	-MNOP
+	-QRST';
+
+          $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Announcement for Release','Announcement for Release','Announcement of a release','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
+	
+
+
+$body='name
+street,
+city,
+state,
+ zip)
+ 
+ Dear
+ 
+ Please check the following vtiger_invoices that are yet to be paid by you:
+ 
+ No. Date      Amount
+ 1   1/1/01    $4000
+ 2   2/2//01   $5000
+ 3   3/3/01    $10000
+ 4   7/4/01    $23560
+ 
+ Kindly let us know if there are any issues that you feel are pending to be discussed.
+ We will be more than happy to give you a call.
+ We would like to continue our business with you.
+ 
+ Sincerely,
+ name
+ title';
+
+
+               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Pending Invoices','Invoices Pending','Payment Due','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
+
+
+
+
+
+$body=' Dear
+
+Your proposal on the project XYZW has been reviewed by us
+and is acceptable in its entirety.
+
+We are eagerly looking forward to this project
+and are pleased about having the opportunity to work
+together. We look forward to a long standing relationship
+with your esteemed firm.
+
+I would like to take this opportunity to invite you
+to a game of golf on Wednesday morning 9am at the
+Cuff Links Ground. We will be waiting for you in the
+Executive Lounge.
+
+Looking forward to seeing you there.
+
+Sincerely,
+name
+title';
+	       
+               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Acceptance Proposal','Acceptance Proposal','Acceptance of Proposal','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
+
+
+$body= ' The undersigned hereby acknowledges receipt and delivery
+of the goods.
+The undersigned will release the payment subject to the goods being discovered not satisfactory.
+
+Signed under seal this <date>
+
+Sincerely,
+name
+title';
+	       
+               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Goods received acknowledgement','Goods received acknowledgement','Acknowledged Receipt of Goods','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
+
+
+	       $body= ' Dear
+	 We are in receipt of your order as contained in the
+   purchase order form.We consider this to be final and binding on both sides.
+If there be any exceptions noted, we shall consider them
+only if the objection is received within ten days of receipt of
+this notice.
+
+Thank you for your patronage.
+Sincerely,
+name
+title';
+
+
+	       
+               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Accept Order','Accept Order','Acknowledgement/Acceptance of Order','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
+
+
+
+
+$body='Dear
+
+We are relocating our office to
+11111,XYZDEF Cross,
+UVWWX Circle
+The telephone number for this new location is (101) 1212-1328.
+
+Our Manufacturing Division will continue operations
+at 3250 Lovedale Square Avenue, in Frankfurt.
+
+We hope to keep in touch with you all.
+Please update your addressbooks.
+
+
+Thank You,
+name
+title';
+	       
+               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Address Change','Change of Address','Address Change','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
+
+
+
+$body='Dear
+
+Thank you for extending us the opportunity to meet with
+you and members of your staff.
+
+I know that John Doe serviced your vtiger_account
+for many years and made many friends at your firm. He has personally
+discussed with me the deep relationship that he had with your firm.
+While his presence will be missed, I can promise that we will
+continue to provide the fine service that was accorded by
+John to your firm.
+
+I was genuinely touched to receive such fine hospitality.
+
+Thank you once again.
+
+Sincerely,
+name
+title';
+
+
+	       
+               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Follow Up','Follow Up','Follow Up of meeting','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
+
+
+
+$body='Congratulations!
+
+The numbers are in and I am proud to inform you that our
+total sales for the previous quarter
+amounts to $100,000,00.00!. This is the first time
+we have exceeded the target by almost 30%.
+We have also beat the previous quarter record by a
+whopping 75%!
+
+Let us meet at Smoking Joe for a drink in the evening!
+
+C you all there guys!
+
+Sincerely,
+name
+title';
+
+	       
+               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Target Crossed!','Target Crossed!','Fantastic Sales Spree!','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
+
+$body='
+Dear
+
+Thank you for your confidence in our ability to serve you.
+We are glad to be given the chance to serve you.I look
+forward to establishing a long term partnership with you.
+Consider me as a friend.
+Should any need arise,please do give us a call.
+
+Sincerely,
+name
+title';
+
+	       
+               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Thanks Note','Thanks Note','Note of thanks','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
+
+		
+	       //Insert into vtiger_organizationdetails vtiger_table 
+	       $this->db->query("insert into vtiger_organizationdetails(organizationame,address,city,state,country,code,phone,fax,website,logoname) values ('vtiger',' 40-41-42, Sivasundar Apartments, Flat D-II, Shastri Street, Velachery','Chennai','Tamil Nadu','India','600 042','+91-44-5202-1990','+91-44-5202-1990','www.vtiger.com','vtiger-crm-logo.jpg')");
+
+  //Insert into vtiger_inventory_tandc vtiger_table
+               $this->db->query("insert into vtiger_inventory_tandc values('".$this->db->getUniqueID('inventory_tandc')."','Inventory','')");
+
+	$this->db->query("insert into vtiger_actionmapping values(0,'Save',0)");
+	$this->db->query("insert into vtiger_actionmapping values(1,'EditView',0)");
+	$this->db->query("insert into vtiger_actionmapping values(2,'Delete',0)");
+	$this->db->query("insert into vtiger_actionmapping values(3,'index',0)");
+	$this->db->query("insert into vtiger_actionmapping values(4,'DetailView',0)");
+	$this->db->query("insert into vtiger_actionmapping values(5,'Import',0)");
+	$this->db->query("insert into vtiger_actionmapping values(6,'Export',0)");
+	//$this->db->query("insert into vtiger_actionmapping values(7,'AddBusinessCard',0)");
+	$this->db->query("insert into vtiger_actionmapping values(8,'Merge',0)");
+	$this->db->query("insert into vtiger_actionmapping values(1,'VendorEditView',1)");
+	$this->db->query("insert into vtiger_actionmapping values(4,'VendorDetailView',1)");
+	$this->db->query("insert into vtiger_actionmapping values(0,'SaveVendor',1)");
+	$this->db->query("insert into vtiger_actionmapping values(2,'DeleteVendor',1)");
+	$this->db->query("insert into vtiger_actionmapping values(1,'PriceBookEditView',1)");
+	$this->db->query("insert into vtiger_actionmapping values(4,'PriceBookDetailView',1)");
+	$this->db->query("insert into vtiger_actionmapping values(0,'SavePriceBook',1)");
+	$this->db->query("insert into vtiger_actionmapping values(2,'DeletePriceBook',1)");
+	$this->db->query("insert into vtiger_actionmapping values(9,'ConvertLead',0)");
+	$this->db->query("insert into vtiger_actionmapping values(1,'DetailViewAjax',1)");
+	$this->db->query("insert into vtiger_actionmapping values(4,'TagCloud',1)");
+	$this->db->query("insert into vtiger_actionmapping values(1,'QuickCreate',1)");
+	$this->db->query("insert into vtiger_actionmapping values(3,'Popup',1)");
+
+	//Insert values for vtiger_moduleowners vtiger_table which contains the modules and their vtiger_users. default user id admin - after 4.2 patch 2
+	$module_array = Array('Potentials','Contacts','Accounts','Leads','Notes','Activities','Emails','HelpDesk','Products','Faq','Vendors','PriceBooks','Quotes','PurchaseOrder','SalesOrder','Invoice','Reports','Campaigns');
+	foreach($module_array as $mod)
+	{
+		$this->db->query("insert into vtiger_moduleowners values(".getTabid($mod).",1)");
+	}
+	//added by jeri for category view from db
+	$this->db->query("insert into vtiger_parenttab values (1,'My Home Page',1,0)");
+	$this->db->query("insert into vtiger_parenttab values (2,'Marketing',2,0)");
+	$this->db->query("insert into vtiger_parenttab values (3,'Sales',3,0)");
+	$this->db->query("insert into vtiger_parenttab values (4,'Support',4,0)");
+	$this->db->query("insert into vtiger_parenttab values (5,'Analytics',5,0)");
+	$this->db->query("insert into vtiger_parenttab values (6,'Inventory',6,0)");
+	$this->db->query("insert into vtiger_parenttab values (7,'Tools',7,0)");
+	$this->db->query("insert into vtiger_parenttab values (8,'Settings',8,0)");
+
+	$this->db->query("insert into vtiger_parenttabrel values (1,9,2)");
+	$this->db->query("insert into vtiger_parenttabrel values (1,17,3)");
+	$this->db->query("insert into vtiger_parenttabrel values (1,10,4)");
+	$this->db->query("insert into vtiger_parenttabrel values (1,3,1)");
+	$this->db->query("insert into vtiger_parenttabrel values (3,7,1)");
+	$this->db->query("insert into vtiger_parenttabrel values (3,6,2)");
+	$this->db->query("insert into vtiger_parenttabrel values (3,4,3)");
+	$this->db->query("insert into vtiger_parenttabrel values (3,2,4)");
+	$this->db->query("insert into vtiger_parenttabrel values (3,20,5)");
+	$this->db->query("insert into vtiger_parenttabrel values (3,22,6)");
+	$this->db->query("insert into vtiger_parenttabrel values (3,23,7)");
+	$this->db->query("insert into vtiger_parenttabrel values (3,14,8)");
+	$this->db->query("insert into vtiger_parenttabrel values (3,19,9)");
+	$this->db->query("insert into vtiger_parenttabrel values (3,8,10)");
+	$this->db->query("insert into vtiger_parenttabrel values (4,13,1)");
+	$this->db->query("insert into vtiger_parenttabrel values (4,15,2)");
+	$this->db->query("insert into vtiger_parenttabrel values (4,6,3)");
+	$this->db->query("insert into vtiger_parenttabrel values (4,4,4)");
+	$this->db->query("insert into vtiger_parenttabrel values (4,14,5)");
+	$this->db->query("insert into vtiger_parenttabrel values (4,8,6)");
+	$this->db->query("insert into vtiger_parenttabrel values (5,1,1)");
+	$this->db->query("insert into vtiger_parenttabrel values (5,25,2)");
+	$this->db->query("insert into vtiger_parenttabrel values (6,14,1)");
+	$this->db->query("insert into vtiger_parenttabrel values (6,18,2)");
+	$this->db->query("insert into vtiger_parenttabrel values (6,19,3)");
+	$this->db->query("insert into vtiger_parenttabrel values (6,21,4)");
+	$this->db->query("insert into vtiger_parenttabrel values (6,22,5)");
+	$this->db->query("insert into vtiger_parenttabrel values (6,20,6)");
+	$this->db->query("insert into vtiger_parenttabrel values (6,23,7)");
+	$this->db->query("insert into vtiger_parenttabrel values (7,24,1)");
+	$this->db->query("insert into vtiger_parenttabrel values (7,27,2)");
+	$this->db->query("insert into vtiger_parenttabrel values (7,8,3)");
+	$this->db->query("insert into vtiger_parenttabrel values (2,26,1)");
+	$this->db->query("insert into vtiger_parenttabrel values (2,6,2)");
+	$this->db->query("insert into vtiger_parenttabrel values (2,4,3)");
+	$this->db->query("insert into vtiger_parenttabrel values (2,10,4)");
+	$this->db->query("insert into vtiger_parenttabrel values (4,10,7)");
+	$this->db->query("insert into vtiger_parenttabrel values (2,7,5)");
+	$this->db->query("insert into vtiger_parenttabrel values (2,9,6)");
+	$this->db->query("insert into vtiger_parenttabrel values (4,9,8)");
+		
+	//Added to populate the default inventory tax informations
+	$this->db->query("insert into vtiger_inventorytaxinfo values(".$this->db->getUniqueID("inventorytaxinfo").",'VAT','4.5')");
+	$this->db->query("insert into vtiger_inventorytaxinfo values(".$this->db->getUniqueID("inventorytaxinfo").",'Sales','10')");
+	$this->db->query("insert into vtiger_inventorytaxinfo values(".$this->db->getUniqueID("inventorytaxinfo").",'Service','12.5')");
+	
+	}
+}
+?>



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 09:52:28 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 16:52:28 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7548 -
	/vtigercrm/trunk/modules/Emails/mailsend.php
Message-ID: <20060626165228.2B3DE83FC85@vtiger.fosslabs.com>

Author: richie
Date: Mon Jun 26 10:52:19 2006
New Revision: 7548

Log:
Security support for Emails done

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

Modified: vtigercrm/trunk/modules/Emails/mailsend.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/mailsend.php (original)
+++ vtigercrm/trunk/modules/Emails/mailsend.php Mon Jun 26 10:52:19 2006
@@ -146,7 +146,10 @@
 			if($emailadd != '')
 			{
 				$description = getMergedDescription($focus->column_fields['description'],$mycrmid,$pmodule);
-				$mail_status = send_mail('Emails',$emailadd,$current_user->user_name,'',$focus->column_fields['subject'],$description,'','','all',$focus->id);
+				if(isPermitted($pmodule,'DetailView',$mycrmid) == 'yes')
+				{
+					$mail_status = send_mail('Emails',$emailadd,$current_user->user_name,'',$focus->column_fields['subject'],$description,'','','all',$focus->id);
+				}	
 
 				$all_to_emailids []= $emailadd;
 				$mail_status_str .= $emailadd."=".$mail_status."&&&";



From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 23:42:23 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 06:42:23 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7549 -
 /vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
Message-ID: <20060627064223.8180E83FDC2@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 27 00:42:17 2006
New Revision: 7549

Log:
Calendar added for Marketing and support Tab

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

Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original)
+++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Tue Jun 27 00:42:17 2006
@@ -2165,6 +2165,8 @@
 	$this->db->query("insert into vtiger_parenttabrel values (2,7,5)");
 	$this->db->query("insert into vtiger_parenttabrel values (2,9,6)");
 	$this->db->query("insert into vtiger_parenttabrel values (4,9,8)");
+	$this->db->query("insert into vtiger_parenttabrel values (2,17,7)");
+        $this->db->query("insert into vtiger_parenttabrel values (4,17,9)");
 		
 	//Added to populate the default inventory tax informations
 	$this->db->query("insert into vtiger_inventorytaxinfo values(".$this->db->getUniqueID("inventorytaxinfo").",'VAT','4.5')");



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 00:02:24 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 07:02:24 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7550 -
	/vtigercrm/trunk/Smarty/templates/DisplayFields.tpl
Message-ID: <20060627070224.7973283FDC3@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 27 01:02:20 2006
New Revision: 7550

Log:
Issue in User Save has been fixed

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

Modified: vtigercrm/trunk/Smarty/templates/DisplayFields.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DisplayFields.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DisplayFields.tpl Tue Jun 27 01:02:20 2006
@@ -484,10 +484,12 @@
 				{if $fldvalue eq 'on'}
 					<td width="30%" align=left class="dvtCellInfo">
 						<input name="{$fldname}" {$disable_status} tabindex="{$vt_tab}" type="checkbox"  checked>
+						<input name="{$fldname}" type="hidden" value="{$fldvalue}">
 					</td>
 				{else}
 					<td width="30%" align=left class="dvtCellInfo">
 						<input name="{$fldname}" {$disable_status} tabindex="{$vt_tab}" type="checkbox">
+						<input name="{$fldname}" type="hidden" value="{$fldvalue}">
 					</td>
 				{/if}
 		{elseif $uitype eq 98}<!-- Role Selection Popup -->		



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 00:26:42 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 07:26:42 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7551 -
	/vtigertoolbar/trunk/firefox/install.rdf
Message-ID: <20060627072642.3190283FDCB@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 27 01:26:38 2006
New Revision: 7551

Log:
changed the label

Modified:
    vtigertoolbar/trunk/firefox/install.rdf

Modified: vtigertoolbar/trunk/firefox/install.rdf
==============================================================================
Binary files - no diff available.



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 01:08:24 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 08:08:24 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7552 -
	/vtigercrm/trunk/include/js/ListView.js
Message-ID: <20060627080824.0954783FC00@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 27 02:08:21 2006
New Revision: 7552

Log:
issue in massdelete has been fixed ,#fixes 1354

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

Modified: vtigercrm/trunk/include/js/ListView.js
==============================================================================
--- vtigercrm/trunk/include/js/ListView.js (original)
+++ vtigercrm/trunk/include/js/ListView.js Tue Jun 27 02:08:21 2006
@@ -1,162 +1,133 @@
-/*********************************************************************************
-
-** The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is:  vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
- ********************************************************************************/
-function change(obj,divid)
-{
-	x = document.massdelete.selected_id.length;
-	var viewid = document.massdelete.viewname.value;
-
-	idstring = "";
-	if ( x == undefined)
-	{
-	
-		if (document.massdelete.selected_id.checked)
-		{
-			document.massdelete.idlist.value=document.massdelete.selected_id.value +";";
-		}
-		else 
-		{
-			alert("Please select atleast one entity ");
-			return false;
-		}
-	}
-	else
-	{
-		xx = 0;
-		for(i = 0; i < x ; i++)
-		{
-			if(document.massdelete.selected_id[i].checked)
-			{
-				idstring = document.massdelete.selected_id[i].value +";"+idstring
-			xx++	
-			}
-		}
-		if (xx != 0)
-		{
-			document.massdelete.idlist.value=idstring;
-		}
-		else
-		{
-			alert("Please select atleast one entity");
-			return false;
-		}
-	}
-	fnvshobj(obj,divid);
-}
-function massDelete(module)
-{
-        x = document.massdelete.selected_id.length;
-		var viewid = document.massdelete.viewname.value;
-        idstring = "";
-
-        if ( x == undefined)
-        {
-
-                if (document.massdelete.selected_id.checked)
-                {
-                        idstring = document.massdelete.selected_id.value+';';
-                		xx = 1;
-                }
-                else
-                {
-                        alert("Please select atleast one entity");
-                        return false;
-                }
-        }
-        else
-        {
-                xx = 0;
-                for(i = 0; i < x ; i++)
-                {
-                        if(document.massdelete.selected_id[i].checked)
-                        {
-                                idstring = document.massdelete.selected_id[i].value +";"+idstring
-                        xx++
-                        }
-                }
-                if (xx != 0)
-                {
-                        document.massdelete.idlist.value=idstring;
-                }
-               else
-                {
-                        alert("Please select atleast one entity");
-                        return false;
-                }
-        }
-		if(confirm("Are you sure you want to delete the selected "+xx+" records ?"))
-		{
-			
-			$("status").style.display="inline";
-			new Ajax.Request(
-          	  	      'index.php',
-			      	{queue: {position: 'end', scope: 'command'},
-		                        method: 'post',
-                		        postBody:"module=Users&action=massdelete&return_module="+module+"&viewname="+viewid+"&idlist="+idstring,
-		                        onComplete: function(response) {
-        	        	                $("status").style.display="none";
-                	        	        result = response.responseText.split('&#&#&#');
-                        	        	$("ListViewContents").innerHTML= result[2];
-	                        	        if(result[1] != '')
-                                        		alert(result[1]);
-		                        }
-              			 }
-       			);
-		}
-		else
-		{
-			return false;
-		}
-
-}
-
-function showDefaultCustomView(selectView,module)
-{
-	$("status").style.display="inline";
-	var viewName = selectView.options[selectView.options.selectedIndex].value;
-	new Ajax.Request(
-               	'index.php',
-                {queue: {position: 'end', scope: 'command'},
-                       	method: 'post',
-                        postBody:"module="+module+"&action="+module+"Ajax&file=ListView&ajax=true&start=1&viewname="+viewName,
-                        onComplete: function(response) {
-                        $("status").style.display="none";
-                        result = response.responseText.split('&#&#&#');
-                        $("ListViewContents").innerHTML= result[2];
-                        if(result[1] != '')
-                               	alert(result[1]);
-                        }
-                }
-	);
-}
-
-
-function getListViewEntries_js(module,url)
-{
-	$("status").style.display="inline";
-	if($('search_url').value!='')
-                urlstring = $('search_url').value;
-	else
-		urlstring = '';
-        new Ajax.Request(
-        	'index.php',
-                {queue: {position: 'end', scope: 'command'},
-                	method: 'post',
-                        postBody:"module="+module+"&action="+module+"Ajax&file=index&ajax=true&"+url+urlstring,
-			onComplete: function(response) {
-                        	$("status").style.display="none";
-                                result = response.responseText.split('&#&#&#');
-                                $("ListViewContents").innerHTML= result[2];
-                                if(result[1] != '')
-                                        alert(result[1]);
-                  	}
-                }
-        );
-}
-
+/*********************************************************************************
+
+** The contents of this file are subject to the vtiger CRM Public License Version 1.0
+ * ("License"); You may not use this file except in compliance with the License
+ * The Original Code is:  vtiger CRM Open Source
+ * The Initial Developer of the Original Code is vtiger.
+ * Portions created by vtiger are Copyright (C) vtiger.
+ * All Rights Reserved.
+ ********************************************************************************/
+function change(obj,divid)
+{
+	var select_options  =  document.getElementsByName('selected_id');
+	var x = select_options.length;
+	var viewid = document.massdelete.viewname.value;
+	idstring = "";
+
+	xx = 0;
+	for(i = 0; i < x ; i++)
+	{
+		if(select_options[i].checked)
+		{
+			idstring = select_options[i].value +";"+idstring
+				xx++
+		}
+	}
+	if (xx != 0)
+	{
+		document.massdelete.idlist.value=idstring;
+	}
+	else
+	{
+		alert("Please select atleast one entity");
+		return false;
+	}
+	alert(document.massdelete.idlist.value)
+	fnvshobj(obj,divid);
+}
+function massDelete(module)
+{
+		var select_options  =  document.getElementsByName('selected_id');
+		var x = select_options.length;
+		var viewid = document.massdelete.viewname.value;
+        idstring = "";
+
+        xx = 0;
+        for(i = 0; i < x ; i++)
+        {
+        	if(select_options[i].checked)
+            {
+            	idstring = select_options[i].value +";"+idstring
+                xx++
+            }
+        }
+        if (xx != 0)
+        {
+            document.massdelete.idlist.value=idstring;
+        }
+        else
+        {
+            alert("Please select atleast one entity");
+            return false;
+        }
+		if(confirm("Are you sure you want to delete the selected "+xx+" records ?"))
+		{
+			
+			$("status").style.display="inline";
+			alert("module=Users&action=massdelete&return_module="+module+"&viewname="+viewid+"&idlist="+idstring)
+			new Ajax.Request(
+          	  	      'index.php',
+			      	{queue: {position: 'end', scope: 'command'},
+		                        method: 'post',
+                		        postBody:"module=Users&action=massdelete&return_module="+module+"&viewname="+viewid+"&idlist="+idstring,
+		                        onComplete: function(response) {
+        	        	                $("status").style.display="none";
+                	        	        result = response.responseText.split('&#&#&#');
+                        	        	$("ListViewContents").innerHTML= result[2];
+	                        	        if(result[1] != '')
+                                        		alert(result[1]);
+		                        }
+              			 }
+       			);
+		}
+		else
+		{
+			return false;
+		}
+
+}
+
+function showDefaultCustomView(selectView,module)
+{
+	$("status").style.display="inline";
+	var viewName = selectView.options[selectView.options.selectedIndex].value;
+	new Ajax.Request(
+               	'index.php',
+                {queue: {position: 'end', scope: 'command'},
+                       	method: 'post',
+                        postBody:"module="+module+"&action="+module+"Ajax&file=ListView&ajax=true&start=1&viewname="+viewName,
+                        onComplete: function(response) {
+                        $("status").style.display="none";
+                        result = response.responseText.split('&#&#&#');
+                        $("ListViewContents").innerHTML= result[2];
+                        if(result[1] != '')
+                               	alert(result[1]);
+                        }
+                }
+	);
+}
+
+
+function getListViewEntries_js(module,url)
+{
+	$("status").style.display="inline";
+	if($('search_url').value!='')
+                urlstring = $('search_url').value;
+	else
+		urlstring = '';
+        new Ajax.Request(
+        	'index.php',
+                {queue: {position: 'end', scope: 'command'},
+                	method: 'post',
+                        postBody:"module="+module+"&action="+module+"Ajax&file=index&ajax=true&"+url+urlstring,
+			onComplete: function(response) {
+                        	$("status").style.display="none";
+                                result = response.responseText.split('&#&#&#');
+                                $("ListViewContents").innerHTML= result[2];
+                                if(result[1] != '')
+                                        alert(result[1]);
+                  	}
+                }
+        );
+}
+



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 01:11:12 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 08:11:12 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7553 -
 /vtigercrm/trunk/modules/Users/language/en_us.lang.php
Message-ID: <20060627081112.CEB7583FC00@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 27 02:11:08 2006
New Revision: 7553

Log:
Updated lang file

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

Modified: vtigercrm/trunk/modules/Users/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Users/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Users/language/en_us.lang.php Tue Jun 27 02:11:08 2006
@@ -1,562 +1,572 @@
-<?php
-/*********************************************************************************
- * The contents of this file are subject to the SugarCRM Public License Version 1.1.2
- * ("License"); You may not use this file except in compliance with the
- * License. You may obtain a copy of the License at http://www.sugarcrm.com/SPL
- * Software distributed under the License is distributed on an  "AS IS"  basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
- * the specific language governing rights and limitations under the License.
- * The Original Code is:  SugarCRM Open Source
- * The Initial Developer of the Original Code is SugarCRM, Inc.
- * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.;
- * All Rights Reserved.
- * Contributor(s): ______________________________________.
- ********************************************************************************/
-/*********************************************************************************
- * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Users/language/en_us.lang.php,v 1.18 2005/04/19 14:45:38 ray Exp $
- * Description:  Defines the English language pack for the Account module.
- ********************************************************************************/
- 
-$mod_strings = Array(
-'LBL_MODULE_NAME'=>'Users',
-'LBL_MODULE_TITLE'=>'Users: Home',
-'LBL_SEARCH_FORM_TITLE'=>'User Search',
-'LBL_LIST_FORM_TITLE'=>'User List',
-'LBL_NEW_FORM_TITLE'=>'New User',
-'LBL_CREATE_NEW_USER'=>'Create New User',
-'LBL_USER'=>'Users:',
-'LBL_LOGIN'=>'Login',
-'LBL_USER_ROLE'=>'Role',
-'LBL_LIST_NAME'=>'Name',
-'LBL_LIST_LAST_NAME'=>'Last Name',
-'LBL_LIST_USER_NAME'=>'UserName',
-'LBL_LIST_DEPARTMENT'=>'Department',
-'LBL_LIST_EMAIL'=>'E-Mail',
-'LBL_LIST_PRIMARY_PHONE'=>'Primary Phone',
-'LBL_LIST_ADMIN'=>'Admin',
-'LBL_LIST_PASSWORD'=>'Password',
-'LBL_LIST_CONFIRM_PASSWORD'=>'Confirm Password',
-'LBL_LIST_USER_NAME_ROLE'=>'User ID , Name & Role',
-'LBL_LIST_SELECT'=>'Select',
-'LBL_LIST_PHONE'=>'Phone',
-'LBL_LIST_NO'=>'#',
-
-'LBL_ADMINS'=>'Admins',
-'LBL_STD_USERS'=>'Standard Users',
-
-'UserName'=>'UserName',
-'Role'=>'Role',
-'Email'=>'Email',
-'Name'=>'Name',
-'Admin'=>'Admin',
-'Tools'=>'Tools',
-
-
-//added for patch2
-'LBL_GROUP'=>'Group',
-'LBL_CURRENCY_NAME'=>'Currency',
-
-'LBL_NEW_USER_BUTTON_TITLE'=>'New User [Alt+N]',
-'LBL_NEW_USER_BUTTON_LABEL'=>'New User',
-'LBL_NEW_USER_BUTTON_KEY'=>'N',
-'LBL_DATE_FORMAT'=>'Date Format',
-
-'LBL_ERROR'=>'Error:',
-'LBL_PASSWORD'=>'Password:',
-'LBL_USER_NAME'=>'User Name',
-'LBL_CRM_ID'=>'CRM ID',
-'LBL_FIRST_NAME'=>'First Name',
-'LBL_LAST_NAME'=>'Last Name',
-'LBL_YAHOO_ID'=>'Yahoo ID',
-'LBL_USER_SETTINGS'=>'User Settings',
-'LBL_THEME'=>'Theme:',
-'LBL_LANGUAGE'=>'Language:',
-'LBL_ADMIN'=>'Admin',
-'LBL_USER_INFORMATION'=>'User Information',
-'LBL_OFFICE_PHONE'=>'Office Phone',
-'LBL_REPORTS_TO'=>'Reports to',
-'LBL_OTHER_PHONE'=>'Other Phone',
-'LBL_OTHER_EMAIL'=>'Other Email',
-'LBL_NOTES'=>'Notes',
-'LBL_DEPARTMENT'=>'Department',
-'LBL_STATUS'=>'Status',
-'LBL_TITLE'=>'Title',
-'LBL_ANY_PHONE'=>'Any Phone:',
-'LBL_ANY_EMAIL'=>'Any Email:',
-'LBL_ADDRESS'=>'Street Address',
-'LBL_CITY'=>'City',
-'LBL_STATE'=>'State',
-'LBL_POSTAL_CODE'=>'Postal Code',
-'LBL_COUNTRY'=>'Country',
-'LBL_NAME'=>'Name:',
-'LBL_USER_SETTINGS'=>'User Settings',
-'LBL_USER_INFORMATION'=>'User Information',
-'LBL_MOBILE_PHONE'=>'Mobile',
-'LBL_OTHER'=>'Other',
-'LBL_FAX'=>'Fax',
-'LBL_EMAIL'=>'E-Mail Id',
-'LBL_HOME_PHONE'=>'Home Phone',
-'LBL_ADDRESS_INFORMATION'=>'Address Information',
-'LBL_CAL_HRFORMAT'=>'Calendar Time Format',
-'LBL_CAL_DURATION'=>'Day starts at',
-'LBL_PRIMARY_ADDRESS'=>'Primary Address:',
-
-'LBL_CHANGE_PASSWORD_BUTTON_TITLE'=>'Change Password [Alt+P]',
-'LBL_CHANGE_PASSWORD_BUTTON_KEY'=>'P',
-'LBL_CHANGE_PASSWORD_BUTTON_LABEL'=>'Change Password',
-'LBL_LOGIN_BUTTON_TITLE'=>'Login [Alt+L]',
-'LBL_LOGIN_BUTTON_KEY'=>'L',
-'LBL_LOGIN_BUTTON_LABEL'=>'Login',
-'LBL_LOGIN_HISTORY_BUTTON_TITLE'=>'Login History [Alt+H]',
-'LBL_LOGIN_HISTORY_BUTTON_KEY'=>'H',
-'LBL_LOGIN_HISTORY_BUTTON_LABEL'=>'Login History',
-'LBL_LOGIN_HISTORY_TITLE'=>'Users: Login History',
-'LBL_RESET_PREFERENCES'=>'Reset To Default Preferences',
-
-'LBL_CHANGE_PASSWORD'=>'Change Password',
-'LBL_OLD_PASSWORD'=>'Old Password:',
-'LBL_NEW_PASSWORD'=>'New Password:',
-'LBL_CONFIRM_PASSWORD'=>'Confirm Password:',
-'ERR_ENTER_OLD_PASSWORD'=>'Please enter your old password.',
-'ERR_ENTER_NEW_PASSWORD'=>'Please enter your new password.',
-'ERR_ENTER_CONFIRMATION_PASSWORD'=>'Please enter your password confirmation.',
-'ERR_REENTER_PASSWORDS'=>'Please re-enter passwords.  The \"new password\" and \"confirm password\" values do not match.',
-'ERR_INVALID_PASSWORD'=>'You must specify a valid username and password.',
-'ERR_PASSWORD_CHANGE_FAILED_1'=>'User password change failed for ',
-'ERR_PASSWORD_CHANGE_FAILED_2'=>' failed.  The new password must be set.',
-'ERR_PASSWORD_INCORRECT_OLD'=>'Incorrect old password for user $this->user_name. Re-enter password information.',
-'ERR_USER_NAME_EXISTS_1'=>'The user name ',
-'ERR_USER_NAME_EXISTS_2'=>' already exists.  Duplicate user names are not allowed.<br>Change the user name to be unique.',
-'ERR_LAST_ADMIN_1'=>'The user name ',
-'ERR_LAST_ADMIN_2'=>' is the last Admin user.  At least one user must be an Admin user.<br>Check the Admin user setting.',
-
-'ERR_DELETE_RECORD'=>"A record number must be specified to delete the account.",
-
-// Additional Fields for i18n --- Release vtigerCRM 3.2 Patch 2
-// Users--listroles.php , createrole.php , ListPermissions.php , editpermissions.php
-
-'LBL_ROLES'=>'Roles',
-'LBL_ROLES_SUBORDINATES'=>'Roles and Subordinates',
-'LBL_ROLE_NAME'=>'Role Name',
-'LBL_CREATE_NEW_ROLE'=>'Create New Role',
-
-'LBL_CREATE_NEW_ROLE'=>'Create New Role',
-'LBL_INDICATES_REQUIRED_FIELD'=>'Indicates Required Field',
-'LBL_NEW_ROLE'=>'New Role',
-'LBL_PARENT_ROLE'=>'Parent Role',
-
-'LBL_LIST_ROLES'=>'List Roles',
-'LBL_ENTITY_LEVEL_PERMISSIONS'=>'Entity Level Permissions',
-'LBL_ENTITY'=>'Entity',
-'LBL_CREATE_EDIT'=>'Create/Edit',
-'LBL_DELETE'=>'Delete',
-'LBL_VIEW'=>'View',
-'LBL_LEADS'=>'Leads',
-'LBL_ACCOUNTS'=>'Accounts',
-'LBL_CONTACTS'=>'Contacts',
-'LBL_OPPURTUNITIES'=>'Opportunities',
-'LBL_TASKS'=>'Tasks',
-'LBL_CASES'=>'Cases',
-'LBL_EMAILS'=>'Emails',
-'LBL_NOTES'=>'Notes',
-'LBL_MEETINGS'=>'Meetings',
-'LBL_CALLS'=>'Calls',
-'LBL_IMPORT_PERMISSIONS'=>'Import Permissions',
-'LBL_IMPORT_LEADS'=>'Import Leads',
-'LBL_IMPORT_ACCOUNTS'=>'Import Accounts',
-'LBL_IMPORT_CONTACTS'=>'Import Contacts',
-'LBL_IMPORT_OPPURTUNITIES'=>'Import Opportunities',
-
-'LBL_ROLE_DETAILS'=>'Role Details',
-//added for vtigercrm4 rc
-'LBL_FILE'=> 'File Name',
-'LBL_FILE_TYPE'=>'File Type',
-'LBL_UPLOAD'=>'Upload File',
-'LBL_ATTACH_FILE'=>'Attach Mail Merge Template',
-'LBL_EMAIL_TEMPLATES'=>'Email Templates',
-'LBL_TEMPLATE_NAME'=>'Template Name',
-'LBL_TEMPLATE_HEADER'=>'Template',
-'LBL_TEMPLATE_DETAILS'=>'Template Details',
-'LBL_EDIT_TEMPLATE'=>'Edit Template',
-'LBL_TEMPLATE_FILE'=>'Template File',
-'LBL_DESCRIPTION'=>'Description',
-'LBL_EMAIL_TEMPLATES_LIST'=>'Communication Templates > Email Templates',
-'LBL_MAILMERGE_TEMPLATES_LIST'=>' > Communication Templates > Mail Merge Templates',
-'LBL_MAILMERGE_TEMPLATES_ATTACHMENT' => '> Communication Templates > Attach Mail Merge Template',
-'LBL_DOWNLOAD_NOW'=>'Download Now',
-'LBL_DOWNLOAD'=>'Download',
-'LBL_SELECT_MODULE'=>'Select Module',
-'LBL_MERGE_FILE'=>'File : ',
-'LBL_MERGE_MSG'=>'Select a module to assign this Template',
-'LBL_MERGE_FIELDS'=>'Merge Fields',
-'LBL_COPY_PASTE'=>'Copy & Paste',
-'LNK_GO_TO_TOP'=>'Go to Page Top',
-'LNK_SAMPLE_EMAIL'=>'View Sample Email',
-'LBL_COLON'=>':',
-'LBL_EMAIL_TEMPLATE'=>'Email Template',
-'LBL_NEW_TEMPLATE'=>'New Template',
-'LBL_ADD_TEMPLATE'=>'Add Template',
-'LBL_USE_MERGE_FIELDS_TO_EMAIL_CONTENT'=>'Use merge fields to personalize your email content.',
-'LBL_AVAILABLE_MERGE_FIELDS'=>'Available Merge Fields',
-'LBL_SELECT_FIELD_TYPE'=>'Select Field Type',
-'LBL_SELECT_FIELD'=>'Select Field :',
-'LBL_MERGE_FIELD_VALUE'=>'Copy Merge Field Value :',
-'LBL_ACCOUNT_FIELDS'=>'Account Fields',
-'LBL_CONTACT_FIELDS'=>'Contact Fields',
-'LBL_LEAD_FIELDS'=>'Lead Fields',
-'LBL_COPY_AND_PASTE_MERGE_FIELD'=>'Copy and paste the merge field value into your template below.',
-'LBL_EMAIL_TEMPLATE_INFORMATION'=>'Communication Templates > Email Templates > Viewing',
-'LBL_FOLDER'=>'Folder',
-'LBL_PERSONAL'=>'Personal',
-'LBL_PUBLIC'=>'Public',
-'LBL_TEMPLATE_NAME'=>'Template Name:',
-'LBL_SUBJECT'=>'Subject',
-'LBL_BODY'=>'Email Body',
-'LBL_TEMPLATE_TOOLS'=>'Tools',
-'LBL_TEMPLATE_PUBLIC'=>'Public Access',
-'LBL_TEMPLATE_PRIVATE'=>'Private Access',
-'LBL_TEMPLATE_SUBJECT'=>'Email Subject',
-'LBL_TEMPLATE_MESSAGE'=>'Email Message',
-'LBL_VIEWING'=>'Viewing',
-'LBL_PROPERTIES'=>'Properties of',
-
-
-
-// Added fields in createnewgroup.php
-'LBL_CREATE_NEW_GROUP'=>'Create New Group',
-'LBL_NEW_GROUP'=>'New Group',
-'LBL_EDIT_GROUP'=>'Edit Group',
-'LBL_GROUP_NAME'=>'Group Name',
-'LBL_GROUP_DETAILS'=>'Group Details',
-'LBL_MEMBER'=>'Members',
-'LBL_MEMBER_AVLBL'=>'Available Entities & Members',
-'LBL_MEMBER_SELECTED'=>'Selected Members',
-'LBL_DESCRIPTION'=>'Description',
-'LBL_GROUP_MESG1'=>'Groups are a flexible way to assign access rights, when complex access rights has to be defined. You can combine multiple entities like Roles, Users, profiles etc into a single group.',
-'LBL_GROUP_MESG2'=>'To add, select the Entity members from left and click the ">>" button.',
-'LBL_GROUP_MESG3'=>'To remove, select the group members from the right and click the "<<" button.',
-
-
-// Added fields in detailViewmailtemplate.html,listgroupmembers.php,listgroups.php
-'LBL_DETAIL_VIEW_OF_EMAIL_TEMPLATE'=>'Detail View of Email Template',
-'LBL_DETAIL_VIEW'=>'Detail View of',
-'LBL_EDIT_VIEW'=>'Edit View of',
-'LBL_GROUP_MEMBERS_LIST'=>'Group members list',
-'LBL_GROUPS'=>'Groups',
-'LBL_ADD_GROUP_BUTTON'=>'Add Group',
-'LBL_WORD_TEMPLATES'=>'Mail Merge Templates',
-'LBL_NEW_WORD_TEMPLATE'=>'New Template',
-'LBL_EMAIL_TEMPLATE_DESC'=>'Manage email templates used for Campaigns and Mass mailing',
-'LBL_NAME'=>'Name',
-
-// Added fields in TabCustomise.php,html and UpdateTab.php,html
-'LBL_CUSTOMISE_TABS'=>'Customize Tabs',
-'LBL_CHOOSE_TABS'=>'Choose Tabs',
-'LBL_AVAILABLE_TABS'=>'Available Tabs',
-'LBL_SELECTED_TABS'=>'Selected Tabs',
-'LBL_USER'=>'User',
-'LBL_TAB_MENU_UPDATED'=>'Tab Menu Updated! kindly go to ',
-'LBL_TO_VIEW_CHANGES'=>' to view the changes',
-
-// Added to change homepage order
-'LBL_CHANGE_HOMEPAGE_LABEL'=>'Homepage Order',
-'LBL_CHANGE_HOMEPAGE_TITLE'=>'Homepage',
-
-// Added fields in binaryfilelist.php
-'LBL_OERATION'=>'Operation',
-
-// Added fields in CreateProfile.php
-'LBL_PROFILE_NAME'=>'Create New Profile:',
-'LBL_NEW_PROFILE'=>'New Profile',
-'LBL_NEW_PROFILE_NAME'=>'Profile Name',
-'LBL_PARENT_PROFILE'=>'Parent Profile',
-'LBL_BASIC_PROFILE_DETAILS'=>'Basic details of Profile',
-'LBL_STEP_1_2'=>'Step 1 of 2',
-'LBL_STEP_2_2'=>'Step 2 of 2',
-'LBL_STEP'=>'Step',
-'LBL_SELECT_BASE_PROFILE'=>'Select Base Profile',
-'LBL_PROFILE_PRIVILEGES'=>'Profile Privileges',
-'LBL_GLOBAL_PRIVILEGES'=>'Global Privileges',
-'LBL_TAB_PRIVILEGES'=>'Tab Privileges',
-'LBL_FIELD_PRIVILEGES'=>'Field Privileges',
-'LBL_STANDARD_PRIVILEGES'=>'Standard Privileges',
-'LBL_UTILITY_PRIVILEGES'=>'Utility Privileges',
-'LBL_UTILITIES'=>'Utilities',
-'LBL_BASE_PROFILE_MESG'=>'I would like to setup a base profile and edit privileges <b>(Recommended)</b>',
-'LBL_BASE_PROFILE'=>'Base Profile:',
-'LBL_OR'=>'OR',
-'LBL_BASE_PROFILE_MESG_ADV'=>'I will choose the privileges from scratch <b>(Advanced Users)</b>',
-'LBL_FOR'=>'for',
-'LBL_GLOBAL_MESG_OPTION'=>'Select the options below to change global privileges',
-'LBL_VIEW_ALL'=>'View all',
-'LBL_EDIT_ALL'=>'Edit all',
-'LBL_ALLOW'=>'Allows',
-'LBL_MESG_VIEW'=>'to view all information / modules of vtiger CRM',
-'LBL_MESG_EDIT'=>'to edit all information / modules of vtiger CRM',
-'LBL_STD_MESG_OPTION'=>'Select the standard actions to be permitted',
-'LBL_TAB_MESG_OPTION'=>'modules to be shown',
-'LBL_UTILITY_MESG_OPTION'=>'Select the utility actions to be permitted',
-'LBL_FIELD_MESG_OPTION'=>'Select the fields to be permitted',
-'LBL_FINISH_BUTTON'=>'Finish',
-'LBL_PROFILE_DETAIL_VIEW'=>'Detail View of Profile',
-'LBL_PROFILE_MESG'=>'Viewing access privileges for',
-'LBL_PROFILE_M'=>'Profile',
-'LBL_DEFINE_PRIV_FOR'=>' Define Privileges for ',
-'LBL_USE_OPTION_TO_SET_PRIV'=>'Use the options below to set privileges',
-'LBL_SUPER_USER_PRIV'=>'Super User Privileges',
-'LBL_SET_PRIV_FOR_EACH_MODULE'=>'Set Privileges for each Module ',
-'LBL_FIELDS_AND_TOOLS_SETTINGS'=>'Fields & Tools Settings',
-'LBL_SHOW_FIELDS'=>'Show Fields',
-'LBL_TOOLS_TO_BE_SHOWN'=>'Tools to be shown',
-'LBL_WELCOME_PROFILE_CREATE'=>'Welcome to Privilege Profile Creator ',
-'LBL_SELECT_CHOICE_NEW_PROFILE'=>'Select your choice of creating the new profile',
-
-//Added fields in createrole.php
-'LBL_HDR_ROLE_NAME'=>'Create New Role:',
-'LBL_TITLE_ROLE_NAME'=>'New Role',
-'LBL_ROLE_NAME'=>'Role Name',
-'LBL_ROLE_PROFILE_NAME'=>'Associate With Profile',
-'LBL_SPECIFY_ROLE_NAME'=>'Specify a name for new role :',
-'LBL_ASSIGN_PROFILE'=>'Assign Profile(s)',
-'LBL_PROFILE_SELECT_TEXT'=>'Select the Profiles below and click on assign button',
-'LBL_PROFILES_AVLBL'=>'Profiles Available',
-'LBL_ASSIGN_PROFILES'=>'Assigned Profiles',
-'LBL_REPORTS_TO_ROLE'=>'Reports to Role',
-'LBL_ASSOCIATED_PROFILES'=>'Associated Profiles :',
-'LBL_ASSOCIATED_USERS'=>'Associated Users :',
-
-
-//Added fields in OrgSharingDetailsView.php
-'LBL_ORG_SHARING_PRIVILEGES'=>'Organisation Sharing  Privileges',
-'LBL_EDIT_PERMISSIONS'=>'Edit Permissions',
-'LBL_SAVE_PERMISSIONS'=>'Save Permissions',
-'LBL_READ_ONLY'=>'Public: Read Only',
-'LBL_EDIT_CREATE_ONLY'=>'Public: Read, Create/Edit',
-'LBL_READ_CREATE_EDIT_DEL'=>'Public: Read, Create/Edit, Delete',
-'LBL_PRIVATE'=>'Private',
-
-//Added fields in listnotificationschedulers.php
-'LBL_HDR_EMAIL_SCHDS'=>'Users : Email Notifications',
-'LBL_EMAIL_SCHDS_DESC'=>'The following is the list of notifications that are activated automatically when the corresponding event has happened.',
-'LBL_ACTIVE'=>'Active',
-'LBL_INACTIVE'=>'Inactive',
-'LBL_NOTIFICATION'=>'Notification',
-'LBL_DESCRIPTION'=>'Description',
-'LBL_TASK_NOTIFICATION'=>'Delayed Task Notification',
-'LBL_TASK_NOTIFICATION_DESCRITPION'=>'Notify when a task is delayed beyond 24 hrs',
-'LBL_MANY_TICKETS'=>'Too many tickets  Notification',
-'LBL_MANY_TICKETS_DESCRIPTION'=>'Notify when a particular entity is allocated too many tickets, might reflect Service Level commitments',
-'LBL_PENDING_TICKETS'=>'Pending Tickets Notification',
-'LBL_TICKETS_DESCRIPTION'=>'Notify for getting attention to status of tickets which are pending',
-'LBL_START_NOTIFICATION'=>'Support Start Notification',
-'LBL_START_DESCRIPTION'=>'Notifiy stating the start of support/service',
-'LBL_BIG_DEAL'=>'Big Deal Notification',
-'LBL_BIG_DEAL_DESCRIPTION'=>'Notify on completion of big deal',
-'LBL_SUPPORT_NOTICIATION'=>'Support End Notification',
-'LBL_SUPPORT_DESCRIPTION'=>'Notify when support is about to end',
-'LBL_BUTTON_UPDATE'=>'Update',
-'LBL_MODULENAMES'=>'Module',
-
-//Added fields in ListFieldPermissions.html
-'LBL_FIELD_PERMISSION_FIELD_NAME'=>'Field Name',
-'LBL_FIELD_PERMISSION_VISIBLE'=>'Visible',
-'LBL_FIELD_PERMISSIOM_TABLE_HEADER'=>'Standard Fields',
-'LBL_FIELD_LEVEL_ACCESS'=>'Field Level Access',
-
-//Added fields after 4.0.1
-'LBL_SIGNATURE'=>'Signature',
-
-//Added for Event Reminder 4.2 Alpha release
-'LBL_ACTIVITY_NOTIFICATION'=>'Event Reminder Notification',
-'LBL_ACTIVITY_REMINDER_DESCRIPTION'=>'Notify before an event to occur based on the reminder set',
-'LBL_MESSAGE'=>'Message',
-
-//Added for Global Privileges
-
-'Public: Read Only'=>'Public: Read Only',
-'Public: Read, Create/Edit'=>'Public: Read, Create/Edit',
-'Public: Read, Create/Edit, Delete'=>'Public: Read, Create/Edit, Delete',
-'Private'=>'Private',
-'Hide Details'=>'Hide Details',
-'Hide Details and Add Events'=>'Hide Details and Add Events',
-'Show Details'=>'Show Details',
-'Show Details and Add Events'=>'Show Details and Add Events',
-
-'LBL_USR_CANNOT_ACCESS'=>'Users cannot access other users ',
-'LBL_USR_CAN_ACCESS'=>'Users can ',
-'LBL_USR_OTHERS'=>' other users ',
-
-'Read Only '=>'Read Only ',
-'Read, Create/Edit, Delete '=>'Read, Create/Edit, Delete ',
-'Read, Create/Edit '=>'Read, Create/Edit ',
-'Read/Write'=>'Read/Write',
-'LBL_GO_TO_TOP'=>'Go to Top',
-'LNK_CLICK_HERE'=>'Click here',
-'LBL_RULE_NO'=>'Rule No.',
-'LBL_CAN_BE_ACCESSED'=>'can be accessed by',
-'LBL_PRIVILEGES'=>'Privileges',
-'LBL_OF'=>'of',
-
-
-
-//Added for 4.2GA support for mail server integration
-'LBL_ADD_MAILSERVER_BUTTON_TITLE'=>'Add Mail Server',
-'LBL_ADD_MAILSERVER_BUTTON_KEY'=>'M',
-'LBL_ADD_MAILSERVER_BUTTON_LABEL'=>'Add Mail Server',
-
-'LBL_LIST_MAILSERVER_BUTTON_TITLE'=>'List Mail Server',
-'LBL_LIST_MAILSERVER_BUTTON_KEY'=>'L',
-'LBL_LIST_MAILSERVER_BUTTON_LABEL'=>'List Mail Server',
-//added for inventory terms and conditions
-'INV_TANDC'=>'Terms & Coditions',
-'INV_TERMSANDCONDITIONS'=>'Inventory Terms & Coditions',
-'LBL_INV_TERMSANDCONDITIONS'=>'Inventory Management', 
-
-
-'INVENTORYNOTIFICATION'=>'Inventory Notifications',
-'LBL_INVENTORY_NOTIFICATIONS'=>'Edit Inventory Email Notifications',
-'LBL_INV_NOT_DESC'=>'The following are the list of notifications that are sent to the product handler regarding the demand and the current quantity in hand during the creation of a Quote, SalesOrder and Invoice.',
-
-'InvoiceNotification'=>'Product Stock Notification during Invoice Generation',
-'InvoiceNotificationDescription'=>'When the product stock level goes below the re-order level, notification will be sent to the product handler',
-
-'QuoteNotification'=>'Product Stock Notification during Quote Generation',
-'QuoteNotificationDescription'=>'During quote generation if the product stock in warehouse is lesser than the  quantity mentioned in quote then this notification will be sent to the product handler',
-
-'SalesOrderNotification'=>'Product Stock Notification during Sales Order Generation',
-'SalesOrderNotificationDescription'=>'During sales order generation if the product stock in warehouse is lesser than the quantity mentioned in sales order then this notification will be sent to the product handler',
-
-//New addition for 4.2 GA
-'LBL_USER_FIELDS'=>'User Fields',
-'LBL_NOTE_DO_NOT_REMOVE_INFO'=>'Note: Donot remove or alter the values within {  }',
-
-//Added for patch2
-'LBL_FILE_INFORMATION'=>'File Information',
-
-//Added after pathc2
-'LBL_LEAD_FIELD_ACCESS'=>'Lead Field Access',
-
-'LBL_ACCOUNT_FIELD_ACCESS'=>'Account Field Access',
-
-'LBL_CONTACT_FIELD_ACCESS'=>'Contact Field Access',
-
-'LBL_OPPORTUNITY_FIELD_ACCESS'=>'Potential Field Access',
-
-'LBL_HELPDESK_FIELD_ACCESS'=>'HelpDesk Field Access',
-
-'LBL_PRODUCT_FIELD_ACCESS'=>'Product Field Access',
-
-'LBL_NOTE_FIELD_ACCESS'=>'Note Field Access',
-
-'LBL_EMAIL_FIELD_ACCESS'=>'Email Field Access',
-
-'LBL_TASK_FIELD_ACCESS'=>'Task Field Access',
-
-'LBL_EVENT_FIELD_ACCESS'=>'Event Field Access',
-'LBL_VENDOR_FIELD_ACCESS'=>'Vendor Field Access',
-'LBL_PB_FIELD_ACCESS'=>'PriceBook Field Access',
-'LBL_QUOTE_FIELD_ACCESS'=>'Quote Field Access',
-'LBL_PO_FIELD_ACCESS'=>'Purchase Order Field Access',
-'LBL_SO_FIELD_ACCESS'=>'Sales Order Access',
-'LBL_INVOICE_FIELD_ACCESS'=>'Invoice Field Access',
-
-//given for calendar color for an user user
-'LBL_COLOR'=>'Color in Calendar',
-//added for activity view in home page
-'LBL_ACTIVITY_VIEW'=>'Default Activity View',
-//Added to change Home page order
-'LBL_HOMEPAGE_ORDER_UPDATE'=>'Update Home Page Block Order',
-'LBL_HOMEPAGE_ID'=>'Block Order',
-'ERR_INVALID_USER'=>'Invalid access--Please call from My Accounts',
-'ALVT'=>'Top Accounts',
-'PLVT'=>'Top Potentials',
-'QLTQ'=>'Top Quotes',
-'CVLVT'=>'Key Metrics',
-'HLT'=>'HelpDesk Top Tickets',
-'OLV'=>'Top Open Activities',
-'GRT'=>'My Group Allocation',
-'OLTSO'=>'Top Sales Orders',
-'ILTI'=>'Top Invoices',
-//Added for 5.0 alpha
-'LBL_GROUP_NAME_ERROR'=>'Group Name already exists!',
-'MNL'=>'My New Leads',
-'LBL_LEAD_VIEW'=>'Default Lead View',
-'LBL_TAG_CLOUD'=>'Tag Cloud',
-'LBL_LIST_TOOLS'=>'Tools',
-'LBL_STATISTICS'=>'Statistics',
-'LBL_TOTAL'=>'Total :',
-'LBL_OTHERS'=>'Others :',
-'LBL_USERS'=>'User(s)',
-'LBL_USER_LOGIN_ROLE'=>'User Login & Role',
-'LBL_USER_MORE_INFN'=>'More Information',
-'LBL_USER_ADDR_INFN'=>'Address Information',
-'LBL_USER_IMAGE'=>'User Image',
-'LBL_USR'=>'Users',
-
-'LBL_MY'=>'My',
-'LBL_MY_DEFAULTS'=>'My Defaults',
-'LBL_MY_DESG'=>'My Designation & Contact Details',
-'LBL_MY_ADDR'=>'My Postal Address',
-'LBL_MY_DETAILS'=>'My Details',
-'LBL_MY_PHOTO'=>'My Photo',
-'LBL_CHANGE_PHOTO'=>'Change Photo...',
-'LBL_CHANGE'=>'Change',
-
-
-//Added for Access Privileges
-
-'LBL_GLOBAL_FIELDS_MANAGER'=>'Global Fields Manager',
-'LBL_GLOBAL_ACCESS_PRIVILEGES'=>'Global Access Privileges',
-'LBL_CUSTOM_ACCESS_PRIVILEGES'=>'Custom Access Privileges',
-'LBL_BOTH'=>'Both',
-'LBL_VIEW'=>'View',
-'LBL_RECALCULATE_BUTTON'=>'Recalculate',
-'LBL_ADD_PRIVILEGES_BUTTON'=>'Add Privileges',
-'LBL_CUSTOM_ACCESS_MESG'=>'No Custom Access Rules defined .',
-'LBL_CREATE_RULE_MESG'=>'to create a new Rule',
-'LBL_SELECT_SCREEN'=>'Select the Screen / Module :',
-'LBL_FIELDS_AVLBL'=>'Fields Available in',
-'LBL_FIELDS_SELECT_DESELECT'=>'Fields to be shown',
-'LBL_ROLE_TO_BE_DELETED'=>'Role to be Deleted',
-'LBL_TRANSFER_USER_ROLE'=>'Transfer Users to Role',
-'LBL_DELETE_ROLE'=>'Delete Role',
-'LBL_MORE_INFORMATION'=>'More Information',
-'LBL_USERLOGIN_ROLE'=>'User Login & Role',
-
-//Added for 5.0 for all fields
-'Role'=>'Role',
-'Email'=>'Email',
-'Admin'=>'Admin',
-'User Name'=>'User Name',
-'First Name'=>'First Name',
-'Last Name'=>'Last Name',
-'Status'=>'Status',
-'Default Activity View'=>'Default Activity View',
-'Default Lead View'=>'Default Lead View',
-'Currency'=>'Currency',
-'Title'=>'Title',
-'Office Phone'=>'Office Phone',
-'Department'=>'Department',
-'Mobile'=>'Mobile',
-'Reports To'=>'Reports To',
-'Other Phone'=>'Other Phone',
-'Other Email'=>'Other Email',
-'Fax'=>'Fax',
-'Yahoo id'=>'Yahoo id',
-'Home Phone'=>'Home Phone',
-'User Image'=>'User Image',
-'Date Format'=>'Date Format',
-'Tag Cloud'=>'Tag Cloud',
-'Signature'=>'Signature',
-'Notes'=>'Notes',
-'Street Address'=>'Street Address',
-'City'=>'City',
-'State'=>'State',
-'Postal Code'=>'Postal Code',
-'Country'=>'Country',
-'Password'=>'Password',
-'Confirm Password'=>'Confirm Password',
-
-);
-
-?>
+<?php
+/*********************************************************************************
+ * The contents of this file are subject to the SugarCRM Public License Version 1.1.2
+ * ("License"); You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at http://www.sugarcrm.com/SPL
+ * Software distributed under the License is distributed on an  "AS IS"  basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
+ * the specific language governing rights and limitations under the License.
+ * The Original Code is:  SugarCRM Open Source
+ * The Initial Developer of the Original Code is SugarCRM, Inc.
+ * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.;
+ * All Rights Reserved.
+ * Contributor(s): ______________________________________.
+ ********************************************************************************/
+/*********************************************************************************
+ * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Users/language/en_us.lang.php,v 1.18 2005/04/19 14:45:38 ray Exp $
+ * Description:  Defines the English language pack for the Account module.
+ ********************************************************************************/
+ 
+$mod_strings = Array(
+'LBL_MODULE_NAME'=>'Users',
+'LBL_MODULE_TITLE'=>'Users: Home',
+'LBL_SEARCH_FORM_TITLE'=>'User Search',
+'LBL_LIST_FORM_TITLE'=>'User List',
+'LBL_NEW_FORM_TITLE'=>'New User',
+'LBL_CREATE_NEW_USER'=>'Create New User',
+'LBL_USER'=>'Users:',
+'LBL_LOGIN'=>'Login',
+'LBL_USER_ROLE'=>'Role',
+'LBL_LIST_NAME'=>'Name',
+'LBL_LIST_LAST_NAME'=>'Last Name',
+'LBL_LIST_USER_NAME'=>'UserName',
+'LBL_LIST_DEPARTMENT'=>'Department',
+'LBL_LIST_EMAIL'=>'E-Mail',
+'LBL_LIST_PRIMARY_PHONE'=>'Primary Phone',
+'LBL_LIST_ADMIN'=>'Admin',
+'LBL_LIST_PASSWORD'=>'Password',
+'LBL_LIST_CONFIRM_PASSWORD'=>'Confirm Password',
+'LBL_LIST_USER_NAME_ROLE'=>'User ID , Name & Role',
+'LBL_LIST_SELECT'=>'Select',
+'LBL_LIST_PHONE'=>'Phone',
+'LBL_LIST_NO'=>'#',
+
+'LBL_ADMINS'=>'Admins',
+'LBL_STD_USERS'=>'Standard Users',
+
+'UserName'=>'UserName',
+'Role'=>'Role',
+'Email'=>'Email',
+'Name'=>'Name',
+'Admin'=>'Admin',
+'Tools'=>'Tools',
+
+
+//added for patch2
+'LBL_GROUP'=>'Group',
+'LBL_CURRENCY_NAME'=>'Currency',
+
+'LBL_NEW_USER_BUTTON_TITLE'=>'New User [Alt+N]',
+'LBL_NEW_USER_BUTTON_LABEL'=>'New User',
+'LBL_NEW_USER_BUTTON_KEY'=>'N',
+'LBL_DATE_FORMAT'=>'Date Format',
+
+'LBL_ERROR'=>'Error:',
+'LBL_PASSWORD'=>'Password:',
+'LBL_USER_NAME'=>'User Name',
+'LBL_CRM_ID'=>'CRM ID',
+'LBL_FIRST_NAME'=>'First Name',
+'LBL_LAST_NAME'=>'Last Name',
+'LBL_YAHOO_ID'=>'Yahoo ID',
+'LBL_USER_SETTINGS'=>'User Settings',
+'LBL_THEME'=>'Theme:',
+'LBL_LANGUAGE'=>'Language:',
+'LBL_ADMIN'=>'Admin',
+'LBL_USER_INFORMATION'=>'User Information',
+'LBL_OFFICE_PHONE'=>'Office Phone',
+'LBL_REPORTS_TO'=>'Reports to',
+'LBL_OTHER_PHONE'=>'Other Phone',
+'LBL_OTHER_EMAIL'=>'Other Email',
+'LBL_NOTES'=>'Notes',
+'LBL_DEPARTMENT'=>'Department',
+'LBL_STATUS'=>'Status',
+'LBL_TITLE'=>'Title',
+'LBL_ANY_PHONE'=>'Any Phone:',
+'LBL_ANY_EMAIL'=>'Any Email:',
+'LBL_ADDRESS'=>'Street Address',
+'LBL_CITY'=>'City',
+'LBL_STATE'=>'State',
+'LBL_POSTAL_CODE'=>'Postal Code',
+'LBL_COUNTRY'=>'Country',
+'LBL_NAME'=>'Name:',
+'LBL_USER_SETTINGS'=>'User Settings',
+'LBL_USER_INFORMATION'=>'User Information',
+'LBL_MOBILE_PHONE'=>'Mobile',
+'LBL_OTHER'=>'Other',
+'LBL_FAX'=>'Fax',
+'LBL_EMAIL'=>'E-Mail Id',
+'LBL_HOME_PHONE'=>'Home Phone',
+'LBL_ADDRESS_INFORMATION'=>'Address Information',
+'LBL_CAL_HRFORMAT'=>'Calendar Time Format',
+'LBL_CAL_DURATION'=>'Day starts at',
+'LBL_PRIMARY_ADDRESS'=>'Primary Address:',
+
+'LBL_CHANGE_PASSWORD_BUTTON_TITLE'=>'Change Password [Alt+P]',
+'LBL_CHANGE_PASSWORD_BUTTON_KEY'=>'P',
+'LBL_CHANGE_PASSWORD_BUTTON_LABEL'=>'Change Password',
+'LBL_LOGIN_BUTTON_TITLE'=>'Login [Alt+L]',
+'LBL_LOGIN_BUTTON_KEY'=>'L',
+'LBL_LOGIN_BUTTON_LABEL'=>'Login',
+'LBL_LOGIN_HISTORY_BUTTON_TITLE'=>'Login History [Alt+H]',
+'LBL_LOGIN_HISTORY_BUTTON_KEY'=>'H',
+'LBL_LOGIN_HISTORY_BUTTON_LABEL'=>'Login History',
+'LBL_LOGIN_HISTORY_TITLE'=>'Users: Login History',
+'LBL_RESET_PREFERENCES'=>'Reset To Default Preferences',
+
+'LBL_CHANGE_PASSWORD'=>'Change Password',
+'LBL_OLD_PASSWORD'=>'Old Password:',
+'LBL_NEW_PASSWORD'=>'New Password:',
+'LBL_CONFIRM_PASSWORD'=>'Confirm Password:',
+'ERR_ENTER_OLD_PASSWORD'=>'Please enter your old password.',
+'ERR_ENTER_NEW_PASSWORD'=>'Please enter your new password.',
+'ERR_ENTER_CONFIRMATION_PASSWORD'=>'Please enter your password confirmation.',
+'ERR_REENTER_PASSWORDS'=>'Please re-enter passwords.  The \"new password\" and \"confirm password\" values do not match.',
+'ERR_INVALID_PASSWORD'=>'You must specify a valid username and password.',
+'ERR_PASSWORD_CHANGE_FAILED_1'=>'User password change failed for ',
+'ERR_PASSWORD_CHANGE_FAILED_2'=>' failed.  The new password must be set.',
+'ERR_PASSWORD_INCORRECT_OLD'=>'Incorrect old password for user $this->user_name. Re-enter password information.',
+'ERR_USER_NAME_EXISTS_1'=>'The user name ',
+'ERR_USER_NAME_EXISTS_2'=>' already exists.  Duplicate user names are not allowed.<br>Change the user name to be unique.',
+'ERR_LAST_ADMIN_1'=>'The user name ',
+'ERR_LAST_ADMIN_2'=>' is the last Admin user.  At least one user must be an Admin user.<br>Check the Admin user setting.',
+
+'ERR_DELETE_RECORD'=>"A record number must be specified to delete the account.",
+
+// Additional Fields for i18n --- Release vtigerCRM 3.2 Patch 2
+// Users--listroles.php , createrole.php , ListPermissions.php , editpermissions.php
+
+'LBL_ROLES'=>'Roles',
+'LBL_ROLES_SUBORDINATES'=>'Roles and Subordinates',
+'LBL_ROLE_NAME'=>'Role Name',
+'LBL_CREATE_NEW_ROLE'=>'Create New Role',
+
+'LBL_CREATE_NEW_ROLE'=>'Create New Role',
+'LBL_INDICATES_REQUIRED_FIELD'=>'Indicates Required Field',
+'LBL_NEW_ROLE'=>'New Role',
+'LBL_PARENT_ROLE'=>'Parent Role',
+
+'LBL_LIST_ROLES'=>'List Roles',
+'LBL_ENTITY_LEVEL_PERMISSIONS'=>'Entity Level Permissions',
+'LBL_ENTITY'=>'Entity',
+'LBL_CREATE_EDIT'=>'Create/Edit',
+'LBL_DELETE'=>'Delete',
+'LBL_VIEW'=>'View',
+'LBL_LEADS'=>'Leads',
+'LBL_ACCOUNTS'=>'Accounts',
+'LBL_CONTACTS'=>'Contacts',
+'LBL_OPPURTUNITIES'=>'Opportunities',
+'LBL_TASKS'=>'Tasks',
+'LBL_CASES'=>'Cases',
+'LBL_EMAILS'=>'Emails',
+'LBL_NOTES'=>'Notes',
+'LBL_MEETINGS'=>'Meetings',
+'LBL_CALLS'=>'Calls',
+'LBL_IMPORT_PERMISSIONS'=>'Import Permissions',
+'LBL_IMPORT_LEADS'=>'Import Leads',
+'LBL_IMPORT_ACCOUNTS'=>'Import Accounts',
+'LBL_IMPORT_CONTACTS'=>'Import Contacts',
+'LBL_IMPORT_OPPURTUNITIES'=>'Import Opportunities',
+
+'LBL_ROLE_DETAILS'=>'Role Details',
+//added for vtigercrm4 rc
+'LBL_FILE'=> 'File Name',
+'LBL_FILE_TYPE'=>'File Type',
+'LBL_UPLOAD'=>'Upload File',
+'LBL_ATTACH_FILE'=>'Attach Mail Merge Template',
+'LBL_EMAIL_TEMPLATES'=>'Email Templates',
+'LBL_TEMPLATE_NAME'=>'Template Name',
+'LBL_TEMPLATE_HEADER'=>'Template',
+'LBL_TEMPLATE_DETAILS'=>'Template Details',
+'LBL_EDIT_TEMPLATE'=>'Edit Template',
+'LBL_TEMPLATE_FILE'=>'Template File',
+'LBL_DESCRIPTION'=>'Description',
+'LBL_EMAIL_TEMPLATES_LIST'=>'Communication Templates > Email Templates',
+'LBL_MAILMERGE_TEMPLATES_LIST'=>' > Communication Templates > Mail Merge Templates',
+'LBL_MAILMERGE_TEMPLATES_ATTACHMENT' => '> Communication Templates > Attach Mail Merge Template',
+'LBL_DOWNLOAD_NOW'=>'Download Now',
+'LBL_DOWNLOAD'=>'Download',
+'LBL_SELECT_MODULE'=>'Select Module',
+'LBL_MERGE_FILE'=>'File : ',
+'LBL_MERGE_MSG'=>'Select a module to assign this Template',
+'LBL_MERGE_FIELDS'=>'Merge Fields',
+'LBL_COPY_PASTE'=>'Copy & Paste',
+'LNK_GO_TO_TOP'=>'Go to Page Top',
+'LNK_SAMPLE_EMAIL'=>'View Sample Email',
+'LBL_COLON'=>':',
+'LBL_EMAIL_TEMPLATE'=>'Email Template',
+'LBL_NEW_TEMPLATE'=>'New Template',
+'LBL_ADD_TEMPLATE'=>'Add Template',
+'LBL_USE_MERGE_FIELDS_TO_EMAIL_CONTENT'=>'Use merge fields to personalize your email content.',
+'LBL_AVAILABLE_MERGE_FIELDS'=>'Available Merge Fields',
+'LBL_SELECT_FIELD_TYPE'=>'Select Field Type',
+'LBL_SELECT_FIELD'=>'Select Field :',
+'LBL_MERGE_FIELD_VALUE'=>'Copy Merge Field Value :',
+'LBL_ACCOUNT_FIELDS'=>'Account Fields',
+'LBL_CONTACT_FIELDS'=>'Contact Fields',
+'LBL_LEAD_FIELDS'=>'Lead Fields',
+'LBL_COPY_AND_PASTE_MERGE_FIELD'=>'Copy and paste the merge field value into your template below.',
+'LBL_EMAIL_TEMPLATE_INFORMATION'=>'Communication Templates > Email Templates > Viewing',
+'LBL_FOLDER'=>'Folder',
+'LBL_PERSONAL'=>'Personal',
+'LBL_PUBLIC'=>'Public',
+'LBL_TEMPLATE_NAME'=>'Template Name:',
+'LBL_SUBJECT'=>'Subject',
+'LBL_BODY'=>'Email Body',
+'LBL_TEMPLATE_TOOLS'=>'Tools',
+'LBL_TEMPLATE_PUBLIC'=>'Public Access',
+'LBL_TEMPLATE_PRIVATE'=>'Private Access',
+'LBL_TEMPLATE_SUBJECT'=>'Email Subject',
+'LBL_TEMPLATE_MESSAGE'=>'Email Message',
+'LBL_VIEWING'=>'Viewing',
+'LBL_PROPERTIES'=>'Properties of',
+
+
+
+// Added fields in createnewgroup.php
+'LBL_CREATE_NEW_GROUP'=>'Create New Group',
+'LBL_NEW_GROUP'=>'New Group',
+'LBL_EDIT_GROUP'=>'Edit Group',
+'LBL_GROUP_NAME'=>'Group Name',
+'LBL_GROUP_DETAILS'=>'Group Details',
+'LBL_MEMBER'=>'Members',
+'LBL_MEMBER_AVLBL'=>'Available Entities & Members',
+'LBL_MEMBER_SELECTED'=>'Selected Members',
+'LBL_DESCRIPTION'=>'Description',
+'LBL_GROUP_MESG1'=>'Groups are a flexible way to assign access rights, when complex access rights has to be defined. You can combine multiple entities like Roles, Users, profiles etc into a single group.',
+'LBL_GROUP_MESG2'=>'To add, select the Entity members from left and click the ">>" button.',
+'LBL_GROUP_MESG3'=>'To remove, select the group members from the right and click the "<<" button.',
+
+
+// Added fields in detailViewmailtemplate.html,listgroupmembers.php,listgroups.php
+'LBL_DETAIL_VIEW_OF_EMAIL_TEMPLATE'=>'Detail View of Email Template',
+'LBL_DETAIL_VIEW'=>'Detail View of',
+'LBL_EDIT_VIEW'=>'Edit View of',
+'LBL_GROUP_MEMBERS_LIST'=>'Group members list',
+'LBL_GROUPS'=>'Groups',
+'LBL_ADD_GROUP_BUTTON'=>'Add Group',
+'LBL_WORD_TEMPLATES'=>'Mail Merge Templates',
+'LBL_NEW_WORD_TEMPLATE'=>'New Template',
+'LBL_EMAIL_TEMPLATE_DESC'=>'Manage email templates used for Campaigns and Mass mailing',
+'LBL_NAME'=>'Name',
+
+// Added fields in TabCustomise.php,html and UpdateTab.php,html
+'LBL_CUSTOMISE_TABS'=>'Customize Tabs',
+'LBL_CHOOSE_TABS'=>'Choose Tabs',
+'LBL_AVAILABLE_TABS'=>'Available Tabs',
+'LBL_SELECTED_TABS'=>'Selected Tabs',
+'LBL_USER'=>'User',
+'LBL_TAB_MENU_UPDATED'=>'Tab Menu Updated! kindly go to ',
+'LBL_TO_VIEW_CHANGES'=>' to view the changes',
+
+// Added to change homepage order
+'LBL_CHANGE_HOMEPAGE_LABEL'=>'Homepage Order',
+'LBL_CHANGE_HOMEPAGE_TITLE'=>'Homepage',
+
+// Added fields in binaryfilelist.php
+'LBL_OERATION'=>'Operation',
+
+// Added fields in CreateProfile.php
+'LBL_PROFILE_NAME'=>'Create New Profile:',
+'LBL_NEW_PROFILE'=>'New Profile',
+'LBL_NEW_PROFILE_NAME'=>'Profile Name',
+'LBL_PARENT_PROFILE'=>'Parent Profile',
+'LBL_BASIC_PROFILE_DETAILS'=>'Basic details of Profile',
+'LBL_STEP_1_2'=>'Step 1 of 2',
+'LBL_STEP_2_2'=>'Step 2 of 2',
+'LBL_STEP'=>'Step',
+'LBL_SELECT_BASE_PROFILE'=>'Select Base Profile',
+'LBL_PROFILE_PRIVILEGES'=>'Profile Privileges',
+'LBL_GLOBAL_PRIVILEGES'=>'Global Privileges',
+'LBL_TAB_PRIVILEGES'=>'Tab Privileges',
+'LBL_FIELD_PRIVILEGES'=>'Field Privileges',
+'LBL_STANDARD_PRIVILEGES'=>'Standard Privileges',
+'LBL_UTILITY_PRIVILEGES'=>'Utility Privileges',
+'LBL_UTILITIES'=>'Utilities',
+'LBL_BASE_PROFILE_MESG'=>'I would like to setup a base profile and edit privileges <b>(Recommended)</b>',
+'LBL_BASE_PROFILE'=>'Base Profile:',
+'LBL_OR'=>'OR',
+'LBL_BASE_PROFILE_MESG_ADV'=>'I will choose the privileges from scratch <b>(Advanced Users)</b>',
+'LBL_FOR'=>'for',
+'LBL_GLOBAL_MESG_OPTION'=>'Select the options below to change global privileges',
+'LBL_VIEW_ALL'=>'View all',
+'LBL_EDIT_ALL'=>'Edit all',
+'LBL_ALLOW'=>'Allows',
+'LBL_MESG_VIEW'=>'to view all information / modules of vtiger CRM',
+'LBL_MESG_EDIT'=>'to edit all information / modules of vtiger CRM',
+'LBL_STD_MESG_OPTION'=>'Select the standard actions to be permitted',
+'LBL_TAB_MESG_OPTION'=>'modules to be shown',
+'LBL_UTILITY_MESG_OPTION'=>'Select the utility actions to be permitted',
+'LBL_FIELD_MESG_OPTION'=>'Select the fields to be permitted',
+'LBL_FINISH_BUTTON'=>'Finish',
+'LBL_PROFILE_DETAIL_VIEW'=>'Detail View of Profile',
+'LBL_PROFILE_MESG'=>'Viewing access privileges for',
+'LBL_PROFILE_M'=>'Profile',
+'LBL_DEFINE_PRIV_FOR'=>' Define Privileges for ',
+'LBL_USE_OPTION_TO_SET_PRIV'=>'Use the options below to set privileges',
+'LBL_SUPER_USER_PRIV'=>'Super User Privileges',
+'LBL_SET_PRIV_FOR_EACH_MODULE'=>'Set Privileges for each Module ',
+'LBL_FIELDS_AND_TOOLS_SETTINGS'=>'Fields & Tools Settings',
+'LBL_SHOW_FIELDS'=>'Show Fields',
+'LBL_TOOLS_TO_BE_SHOWN'=>'Tools to be shown',
+'LBL_WELCOME_PROFILE_CREATE'=>'Welcome to Privilege Profile Creator ',
+'LBL_SELECT_CHOICE_NEW_PROFILE'=>'Select your choice of creating the new profile',
+'LBL_ADD_CUSTOM_RULE'=>'Add Custom Privilege Rule',
+'LBL_CLOSE'=>'Close',
+'LBL_SELECT_ENTITY'=>'Select an entity below',
+'LBL_CAN_BE_ACCESSED_BY'=>'Can be accessed by',
+'LBL_PERMISSIONS'=>'Permissions',
+'LBL_ACCESS_RIGHTS_FOR_MODULES'=>'Access rights for relative modules',
+'LBL_RULE_CONSTRUCTION'=>'Rule Construction Display',
+'LBL_ADD_RULE'=>'Add Rule',
+'LBL_RELATED_MODULE_RIGHTS'=>'Related Module Rights',
+'LBL_IN_PERMISSION'=>'in the permission',
+
+//Added fields in createrole.php
+'LBL_HDR_ROLE_NAME'=>'Create New Role:',
+'LBL_TITLE_ROLE_NAME'=>'New Role',
+'LBL_ROLE_NAME'=>'Role Name',
+'LBL_ROLE_PROFILE_NAME'=>'Associate With Profile',
+'LBL_SPECIFY_ROLE_NAME'=>'Specify a name for new role :',
+'LBL_ASSIGN_PROFILE'=>'Assign Profile(s)',
+'LBL_PROFILE_SELECT_TEXT'=>'Select the Profiles below and click on assign button',
+'LBL_PROFILES_AVLBL'=>'Profiles Available',
+'LBL_ASSIGN_PROFILES'=>'Assigned Profiles',
+'LBL_REPORTS_TO_ROLE'=>'Reports to Role',
+'LBL_ASSOCIATED_PROFILES'=>'Associated Profiles :',
+'LBL_ASSOCIATED_USERS'=>'Associated Users :',
+
+
+//Added fields in OrgSharingDetailsView.php
+'LBL_ORG_SHARING_PRIVILEGES'=>'Organisation Sharing  Privileges',
+'LBL_EDIT_PERMISSIONS'=>'Edit Permissions',
+'LBL_SAVE_PERMISSIONS'=>'Save Permissions',
+'LBL_READ_ONLY'=>'Public: Read Only',
+'LBL_EDIT_CREATE_ONLY'=>'Public: Read, Create/Edit',
+'LBL_READ_CREATE_EDIT_DEL'=>'Public: Read, Create/Edit, Delete',
+'LBL_PRIVATE'=>'Private',
+
+//Added fields in listnotificationschedulers.php
+'LBL_HDR_EMAIL_SCHDS'=>'Users : Email Notifications',
+'LBL_EMAIL_SCHDS_DESC'=>'The following is the list of notifications that are activated automatically when the corresponding event has happened.',
+'LBL_ACTIVE'=>'Active',
+'LBL_INACTIVE'=>'Inactive',
+'LBL_NOTIFICATION'=>'Notification',
+'LBL_DESCRIPTION'=>'Description',
+'LBL_TASK_NOTIFICATION'=>'Delayed Task Notification',
+'LBL_TASK_NOTIFICATION_DESCRITPION'=>'Notify when a task is delayed beyond 24 hrs',
+'LBL_MANY_TICKETS'=>'Too many tickets  Notification',
+'LBL_MANY_TICKETS_DESCRIPTION'=>'Notify when a particular entity is allocated too many tickets, might reflect Service Level commitments',
+'LBL_PENDING_TICKETS'=>'Pending Tickets Notification',
+'LBL_TICKETS_DESCRIPTION'=>'Notify for getting attention to status of tickets which are pending',
+'LBL_START_NOTIFICATION'=>'Support Start Notification',
+'LBL_START_DESCRIPTION'=>'Notifiy stating the start of support/service',
+'LBL_BIG_DEAL'=>'Big Deal Notification',
+'LBL_BIG_DEAL_DESCRIPTION'=>'Notify on completion of big deal',
+'LBL_SUPPORT_NOTICIATION'=>'Support End Notification',
+'LBL_SUPPORT_DESCRIPTION'=>'Notify when support is about to end',
+'LBL_BUTTON_UPDATE'=>'Update',
+'LBL_MODULENAMES'=>'Module',
+
+//Added fields in ListFieldPermissions.html
+'LBL_FIELD_PERMISSION_FIELD_NAME'=>'Field Name',
+'LBL_FIELD_PERMISSION_VISIBLE'=>'Visible',
+'LBL_FIELD_PERMISSIOM_TABLE_HEADER'=>'Standard Fields',
+'LBL_FIELD_LEVEL_ACCESS'=>'Field Level Access',
+
+//Added fields after 4.0.1
+'LBL_SIGNATURE'=>'Signature',
+
+//Added for Event Reminder 4.2 Alpha release
+'LBL_ACTIVITY_NOTIFICATION'=>'Event Reminder Notification',
+'LBL_ACTIVITY_REMINDER_DESCRIPTION'=>'Notify before an event to occur based on the reminder set',
+'LBL_MESSAGE'=>'Message',
+
+//Added for Global Privileges
+
+'Public: Read Only'=>'Public: Read Only',
+'Public: Read, Create/Edit'=>'Public: Read, Create/Edit',
+'Public: Read, Create/Edit, Delete'=>'Public: Read, Create/Edit, Delete',
+'Private'=>'Private',
+'Hide Details'=>'Hide Details',
+'Hide Details and Add Events'=>'Hide Details and Add Events',
+'Show Details'=>'Show Details',
+'Show Details and Add Events'=>'Show Details and Add Events',
+
+'LBL_USR_CANNOT_ACCESS'=>'Users cannot access other users ',
+'LBL_USR_CAN_ACCESS'=>'Users can ',
+'LBL_USR_OTHERS'=>' other users ',
+
+'Read Only '=>'Read Only ',
+'Read, Create/Edit, Delete '=>'Read, Create/Edit, Delete ',
+'Read, Create/Edit '=>'Read, Create/Edit ',
+'Read/Write'=>'Read/Write',
+'LBL_GO_TO_TOP'=>'Go to Top',
+'LNK_CLICK_HERE'=>'Click here',
+'LBL_RULE_NO'=>'Rule No.',
+'LBL_CAN_BE_ACCESSED'=>'can be accessed by',
+'LBL_PRIVILEGES'=>'Privileges',
+'LBL_OF'=>'of',
+
+
+
+//Added for 4.2GA support for mail server integration
+'LBL_ADD_MAILSERVER_BUTTON_TITLE'=>'Add Mail Server',
+'LBL_ADD_MAILSERVER_BUTTON_KEY'=>'M',
+'LBL_ADD_MAILSERVER_BUTTON_LABEL'=>'Add Mail Server',
+
+'LBL_LIST_MAILSERVER_BUTTON_TITLE'=>'List Mail Server',
+'LBL_LIST_MAILSERVER_BUTTON_KEY'=>'L',
+'LBL_LIST_MAILSERVER_BUTTON_LABEL'=>'List Mail Server',
+//added for inventory terms and conditions
+'INV_TANDC'=>'Terms & Coditions',
+'INV_TERMSANDCONDITIONS'=>'Inventory Terms & Coditions',
+'LBL_INV_TERMSANDCONDITIONS'=>'Inventory Management', 
+
+
+'INVENTORYNOTIFICATION'=>'Inventory Notifications',
+'LBL_INVENTORY_NOTIFICATIONS'=>'Edit Inventory Email Notifications',
+'LBL_INV_NOT_DESC'=>'The following are the list of notifications that are sent to the product handler regarding the demand and the current quantity in hand during the creation of a Quote, SalesOrder and Invoice.',
+
+'InvoiceNotification'=>'Product Stock Notification during Invoice Generation',
+'InvoiceNotificationDescription'=>'When the product stock level goes below the re-order level, notification will be sent to the product handler',
+
+'QuoteNotification'=>'Product Stock Notification during Quote Generation',
+'QuoteNotificationDescription'=>'During quote generation if the product stock in warehouse is lesser than the  quantity mentioned in quote then this notification will be sent to the product handler',
+
+'SalesOrderNotification'=>'Product Stock Notification during Sales Order Generation',
+'SalesOrderNotificationDescription'=>'During sales order generation if the product stock in warehouse is lesser than the quantity mentioned in sales order then this notification will be sent to the product handler',
+
+//New addition for 4.2 GA
+'LBL_USER_FIELDS'=>'User Fields',
+'LBL_NOTE_DO_NOT_REMOVE_INFO'=>'Note: Donot remove or alter the values within {  }',
+
+//Added for patch2
+'LBL_FILE_INFORMATION'=>'File Information',
+
+//Added after pathc2
+'LBL_LEAD_FIELD_ACCESS'=>'Lead Field Access',
+
+'LBL_ACCOUNT_FIELD_ACCESS'=>'Account Field Access',
+
+'LBL_CONTACT_FIELD_ACCESS'=>'Contact Field Access',
+
+'LBL_OPPORTUNITY_FIELD_ACCESS'=>'Potential Field Access',
+
+'LBL_HELPDESK_FIELD_ACCESS'=>'HelpDesk Field Access',
+
+'LBL_PRODUCT_FIELD_ACCESS'=>'Product Field Access',
+
+'LBL_NOTE_FIELD_ACCESS'=>'Note Field Access',
+
+'LBL_EMAIL_FIELD_ACCESS'=>'Email Field Access',
+
+'LBL_TASK_FIELD_ACCESS'=>'Task Field Access',
+
+'LBL_EVENT_FIELD_ACCESS'=>'Event Field Access',
+'LBL_VENDOR_FIELD_ACCESS'=>'Vendor Field Access',
+'LBL_PB_FIELD_ACCESS'=>'PriceBook Field Access',
+'LBL_QUOTE_FIELD_ACCESS'=>'Quote Field Access',
+'LBL_PO_FIELD_ACCESS'=>'Purchase Order Field Access',
+'LBL_SO_FIELD_ACCESS'=>'Sales Order Access',
+'LBL_INVOICE_FIELD_ACCESS'=>'Invoice Field Access',
+
+//given for calendar color for an user user
+'LBL_COLOR'=>'Color in Calendar',
+//added for activity view in home page
+'LBL_ACTIVITY_VIEW'=>'Default Activity View',
+//Added to change Home page order
+'LBL_HOMEPAGE_ORDER_UPDATE'=>'Update Home Page Block Order',
+'LBL_HOMEPAGE_ID'=>'Block Order',
+'ERR_INVALID_USER'=>'Invalid access--Please call from My Accounts',
+'ALVT'=>'Top Accounts',
+'PLVT'=>'Top Potentials',
+'QLTQ'=>'Top Quotes',
+'CVLVT'=>'Key Metrics',
+'HLT'=>'HelpDesk Top Tickets',
+'OLV'=>'Top Open Activities',
+'GRT'=>'My Group Allocation',
+'OLTSO'=>'Top Sales Orders',
+'ILTI'=>'Top Invoices',
+//Added for 5.0 alpha
+'LBL_GROUP_NAME_ERROR'=>'Group Name already exists!',
+'MNL'=>'My New Leads',
+'LBL_LEAD_VIEW'=>'Default Lead View',
+'LBL_TAG_CLOUD'=>'Tag Cloud',
+'LBL_LIST_TOOLS'=>'Tools',
+'LBL_STATISTICS'=>'Statistics',
+'LBL_TOTAL'=>'Total :',
+'LBL_OTHERS'=>'Others :',
+'LBL_USERS'=>'User(s)',
+'LBL_USER_LOGIN_ROLE'=>'User Login & Role',
+'LBL_USER_MORE_INFN'=>'More Information',
+'LBL_USER_ADDR_INFN'=>'Address Information',
+'LBL_USER_IMAGE'=>'User Image',
+'LBL_USR'=>'Users',
+
+'LBL_MY'=>'My',
+'LBL_MY_DEFAULTS'=>'My Defaults',
+'LBL_MY_DESG'=>'My Designation & Contact Details',
+'LBL_MY_ADDR'=>'My Postal Address',
+'LBL_MY_DETAILS'=>'My Details',
+'LBL_MY_PHOTO'=>'My Photo',
+'LBL_CHANGE_PHOTO'=>'Change Photo...',
+'LBL_CHANGE'=>'Change',
+
+
+//Added for Access Privileges
+
+'LBL_GLOBAL_FIELDS_MANAGER'=>'Global Fields Manager',
+'LBL_GLOBAL_ACCESS_PRIVILEGES'=>'Global Access Privileges',
+'LBL_CUSTOM_ACCESS_PRIVILEGES'=>'Custom Access Privileges',
+'LBL_BOTH'=>'Both',
+'LBL_VIEW'=>'View',
+'LBL_RECALCULATE_BUTTON'=>'Recalculate',
+'LBL_ADD_PRIVILEGES_BUTTON'=>'Add Privileges',
+'LBL_CUSTOM_ACCESS_MESG'=>'No Custom Access Rules defined .',
+'LBL_CREATE_RULE_MESG'=>'to create a new Rule',
+'LBL_SELECT_SCREEN'=>'Select the Screen / Module :',
+'LBL_FIELDS_AVLBL'=>'Fields Available in',
+'LBL_FIELDS_SELECT_DESELECT'=>'Fields to be shown',
+'LBL_ROLE_TO_BE_DELETED'=>'Role to be Deleted',
+'LBL_TRANSFER_USER_ROLE'=>'Transfer Users to Role',
+'LBL_DELETE_ROLE'=>'Delete Role',
+'LBL_MORE_INFORMATION'=>'More Information',
+'LBL_USERLOGIN_ROLE'=>'User Login & Role',
+
+//Added for 5.0 for all fields
+'Role'=>'Role',
+'Email'=>'Email',
+'Admin'=>'Admin',
+'User Name'=>'User Name',
+'First Name'=>'First Name',
+'Last Name'=>'Last Name',
+'Status'=>'Status',
+'Default Activity View'=>'Default Activity View',
+'Default Lead View'=>'Default Lead View',
+'Currency'=>'Currency',
+'Title'=>'Title',
+'Office Phone'=>'Office Phone',
+'Department'=>'Department',
+'Mobile'=>'Mobile',
+'Reports To'=>'Reports To',
+'Other Phone'=>'Other Phone',
+'Other Email'=>'Other Email',
+'Fax'=>'Fax',
+'Yahoo id'=>'Yahoo id',
+'Home Phone'=>'Home Phone',
+'User Image'=>'User Image',
+'Date Format'=>'Date Format',
+'Tag Cloud'=>'Tag Cloud',
+'Signature'=>'Signature',
+'Notes'=>'Notes',
+'Street Address'=>'Street Address',
+'City'=>'City',
+'State'=>'State',
+'Postal Code'=>'Postal Code',
+'Country'=>'Country',
+'Password'=>'Password',
+'Confirm Password'=>'Confirm Password',
+
+);
+
+?>



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 01:13:26 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 08:13:26 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7554 -
	/vtigercrm/trunk/modules/Users/CreateSharingRule.php
Message-ID: <20060627081326.E989B83FC00@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 27 02:13:23 2006
New Revision: 7554

Log:
i18n for sharing access done -ahmed

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

Modified: vtigercrm/trunk/modules/Users/CreateSharingRule.php
==============================================================================
--- vtigercrm/trunk/modules/Users/CreateSharingRule.php (original)
+++ vtigercrm/trunk/modules/Users/CreateSharingRule.php Tue Jun 27 02:13:23 2006
@@ -21,7 +21,10 @@
 $grpDetails=getAllGroupName();
 $combovalues='';
 
+global $mod_strings;
+global $app_strings;
 global $adb;
+
 $mode = $_REQUEST['mode'];
 if(isset($_REQUEST['shareid']) && $_REQUEST['shareid'] != '')
 {	
@@ -41,17 +44,17 @@
 {
 	foreach($roleDetails as $roleid=>$rolename)
 	{
-		$combovalues .='<option value="roles::'.$roleid.'">Roles::'.$rolename[0].'</option>';
-	}
-
-	foreach($roleDetails as $roleid=>$rolename)
-	{
-		$combovalues .='<option value="rs::'.$roleid.'">Roles and Subordinates::'.$rolename[0].'</option>';
+		$combovalues .='<option value="roles::'.$roleid.'">'.$mod_strings[LBL_ROLES].'::'.$rolename[0].'</option>';
+	}
+
+	foreach($roleDetails as $roleid=>$rolename)
+	{
+		$combovalues .='<option value="rs::'.$roleid.'">'.$mod_strings[LBL_ROLES_SUBORDINATES].'::'.$rolename[0].'</option>';
 	}
 
 	foreach($grpDetails as $groupid=>$groupname)
 	{
-		$combovalues .='<option value="groups::'.$groupid.'">Group::'.$groupname.'</option>';
+		$combovalues .='<option value="groups::'.$groupid.'">'.$mod_strings[LBL_GROUP].'::'.$groupname.'</option>';
 	}
 
 	$fromComboValues=$combovalues;
@@ -78,7 +81,7 @@
 				$selected='selected';	
 			}	
 		}
-		$fromComboValues .='<option value="roles::'.$roleid.'" '.$selected.'>Roles::'.$rolename[0].'</option>';
+		$fromComboValues .='<option value="roles::'.$roleid.'" '.$selected.'>'.$mod_strings[LBL_ROLES].'::'.$rolename[0].'</option>';
 	}
 
 	foreach($roleDetails as $roleid=>$rolename)
@@ -93,7 +96,7 @@
 			}	
 		}	
 	
-		$fromComboValues .='<option value="rs::'.$roleid.'" '.$selected.'>Roles and Subordinates::'.$rolename[0].'</option>';
+		$fromComboValues .='<option value="rs::'.$roleid.'" '.$selected.'>'.$mod_strings[LBL_ROLES_SUBORDINATES].'::'.$rolename[0].'</option>';
 	}
 
 	foreach($grpDetails as $groupid=>$groupname)
@@ -108,7 +111,7 @@
 		}	
 		
 
-		$fromComboValues .='<option value="groups::'.$groupid.'" '.$selected.'>Group::'.$groupname.'</option>';
+		$fromComboValues .='<option value="groups::'.$groupid.'" '.$selected.'>'.$mod_strings[LBL_GROUP].'::'.$groupname.'</option>';
 	}
 
 	//constructing the to combo values
@@ -127,7 +130,7 @@
 				$selected='selected';	
 			}	
 		}
-		$toComboValues .='<option value="roles::'.$roleid.'" '.$selected.'>Roles::'.$rolename[0].'</option>';
+		$toComboValues .='<option value="roles::'.$roleid.'" '.$selected.'>'.$mod_strings[LBL_ROLES].'::'.$rolename[0].'</option>';
 	}
 
 	foreach($roleDetails as $roleid=>$rolename)
@@ -142,7 +145,7 @@
 			}	
 		}	
 	
-		$toComboValues .='<option value="rs::'.$roleid.'" '.$selected.'>Roles and Subordinates::'.$rolename[0].'</option>';
+		$toComboValues .='<option value="rs::'.$roleid.'" '.$selected.'>'.$mod_strings[LBL_ROLES_SUBORDINATES].'::'.$rolename[0].'</option>';
 	}
 
 	foreach($grpDetails as $groupid=>$groupname)
@@ -157,7 +160,7 @@
 		}	
 		
 
-		$toComboValues .='<option value="groups::'.$groupid.'" '.$selected.'>Group::'.$groupname.'</option>';
+		$toComboValues .='<option value="groups::'.$groupid.'" '.$selected.'>'.$mod_strings[LBL_GROUP].'::'.$groupname.'</option>';
 	}
 
 }
@@ -201,11 +204,11 @@
 			}
 		}	
 
-		$relatedlistscombo.='<tr><td align="right" nowrap style="padding-right:10px;"><b>'.$rel_module.' :</b></td>
+		$relatedlistscombo.='<tr><td align="right" nowrap style="padding-right:10px;"><b>'.$app_strings[$rel_module].' :</b></td>
 			<td width="70%">';
-		$relatedlistscombo.='<select id="'.$rel_module.'_accessopt" name="'.$rel_module.'_accessopt" onChange=fnwriteRules("'.$sharing_module.'","'.$relatedmodule.'")>
-			<option value="0" '.$ro_selected.' >Read Only</option>
-			<option value="1" '.$rw_selected.' >Read/Write</option>
+		$relatedlistscombo.='<select id="'.$rel_module.'_accessopt" name="'.$rel_module.'_accessopt" onChange=fnwriteRules("'.$app_strings[$sharing_module].'","'.$relatedmodule.'")>
+			<option value="0" '.$ro_selected.' >'.$mod_strings["Read Only "].'</option>
+			<option value="1" '.$rw_selected.' >'.$mod_strings["Read/Write"].'</option>
 			</select></td></tr>';
 
 
@@ -215,8 +218,8 @@
 
 if($mode == 'create')
 {
-	$sharPerCombo = '<option value="0" selected>Read Only</option>';
-        $sharPerCombo .= '<option value="1">Read/Write</option>';
+	$sharPerCombo = '<option value="0" selected>'.$mod_strings["Read Only "].'</option>';
+        $sharPerCombo .= '<option value="1">'.$mod_strings["Read/Write"].'</option>';
 }
 elseif($mode == 'edit')
 {
@@ -231,8 +234,8 @@
 		$selected2='selected';
 	}
 
-	$sharPerCombo = '<option value="0" '.$selected1.'>Read Only</option>';
-        $sharPerCombo .= '<option value="1" '.$selected2.'>Read/Write</option>';	
+	$sharPerCombo = '<option value="0" '.$selected1.'>'.$mod_strings["Read Only "].'</option>';
+        $sharPerCombo .= '<option value="1" '.$selected2.'>'.$mod_strings["Read/Write"].'</option>';	
 }
 
 	
@@ -247,13 +250,13 @@
 <div id="sharingRule" class="fixedLay">
 <table width="100%" border="0" cellpadding="3" cellspacing="0">
 <tr>
-<td class="genHeaderSmall" align="left" style="border-bottom:1px solid #CCCCCC;" width="60%">'.$sharing_module.' - Add Custom Privilege Rule</td>
-<td align="right" style="border-bottom:1px solid #CCCCCC;" width="40%"><a href="javascript:onClick=hide(\'sharingRule\')";>Close</a></td>
+<td class="genHeaderSmall" align="left" style="border-bottom:1px solid #CCCCCC;" width="60%">'.$app_strings[$sharing_module].' - '.$mod_strings[LBL_ADD_CUSTOM_RULE].'</td>
+<td align="right" style="border-bottom:1px solid #CCCCCC;" width="40%"><a href="javascript:onClick=hide(\'sharingRule\')";>'.$mod_strings[LBL_CLOSE].'</a></td>
 
 </tr>
 <tr><td colspan="2">&nbsp;</td></tr>
 <tr>
-<td><b>Step 1 :'.$sharing_module.'  of </b>(Select an entity below)</td>
+<td><b>'.$mod_strings[LBL_STEP].' 1 : '.$app_strings[$sharing_module].' '.$app_strings[LBL_LIST_OF].' </b>('.$mod_strings[LBL_SELECT_ENTITY].')</td>
 <td>&nbsp;</td>
 
 </tr>
@@ -261,7 +264,7 @@
 <td style="padding-left:20px;text-align:left;">';
 //combovalues
 
-$output.='<select id="'.$sharing_module.'_share" name="'.$sharing_module.'_share" onChange=fnwriteRules("'.$sharing_module.'","'.$relatedmodule.'")>'.$fromComboValues.'</select>';	
+$output.='<select id="'.$sharing_module.'_share" name="'.$sharing_module.'_share" onChange=fnwriteRules("'.$app_strings[$sharing_module].'","'.$relatedmodule.'")>'.$fromComboValues.'</select>';	
 $output.='</td>
 
 <td>&nbsp;</td>
@@ -269,19 +272,19 @@
 <tr><td colspan="2">&nbsp;</td></tr>
 <tr>
 
-<td style="text-align:left;"><b>Step 2 : Can be accessed by</b>(Select an entity below)</td>
-<td align="left"><b>Permissions</b></td>
+<td style="text-align:left;"><b>'.$mod_strings[LBL_STEP].' 2 : '.$mod_strings[LBL_CAN_BE_ACCESSED_BY].' </b>('.$mod_strings[LBL_SELECT_ENTITY].')</td>
+<td align="left"><b>'.$mod_strings[LBL_PERMISSIONS].'</b></td>
 </tr>
 <tr>
 <td style="padding-left:20px;text-align:left;">
 
-<select id="'.$sharing_module.'_access" name="'.$sharing_module.'_access" onChange=fnwriteRules("'.$sharing_module.'","'.$relatedmodule.'")>';
+<select id="'.$sharing_module.'_access" name="'.$sharing_module.'_access" onChange=fnwriteRules("'.$app_strings[$sharing_module].'","'.$relatedmodule.'")>';
 
 $output.=$toComboValues.'</select>
 
 </td><td>
 
-<select	id="share_memberType" name="share_memberType" onChange=fnwriteRules("'.$sharing_module.'","'.$relatedmodule.'")>';
+<select	id="share_memberType" name="share_memberType" onChange=fnwriteRules("'.$app_strings[$sharing_module].'","'.$relatedmodule.'")>';
 $output .= $sharPerCombo;
 $output .= '</select>
 
@@ -289,7 +292,7 @@
 </tr>
 <tr><td colspan="2">&nbsp;</td></tr>
 <tr>
-<td style="text-align:left;"><b>Step 3 : Access rights for relative modules </b></td>
+<td style="text-align:left;"><b>'.$mod_strings[LBL_STEP].' 3 : '.$mod_strings[LBL_ACCESS_RIGHTS_FOR_MODULES].' </b></td>
 <td>&nbsp;</td>
 
 </tr>
@@ -305,7 +308,7 @@
 </tr>
 <tr><td colspan="2" align="left">&nbsp;</td></tr>
 <tr>
-<td colspan="2" class="detailedViewHeader"><b>Rule Construction Display</b></td>
+<td colspan="2" class="detailedViewHeader"><b>'.$mod_strings[LBL_RULE_CONSTRUCTION].'</b></td>
 
 </tr>
 <tr>
@@ -318,7 +321,7 @@
 </tr>
 <tr>
 <td colspan="2" align="center">
-<input type="submit" class="crmButton small save" name="add" value="Add Rule" onClick="return validate()">&nbsp;&nbsp;
+<input type="submit" class="crmButton small save" name="add" value="'.$mod_strings[LBL_ADD_RULE].'" onClick="return validate()">&nbsp;&nbsp;
 </td>
 </tr>
 </table>



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 01:14:30 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 08:14:30 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7555 - in /vtigercrm/trunk:
 Smarty/templates/ComposeEmail.tpl include/fckeditor/fckeditor.js
 modules/Emails/EditView.php modules/Users/TemplateMerge.php
 modules/Users/lookupemailtemplates.php
Message-ID: <20060627081430.44ED483FC00@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 27 02:14:22 2006
New Revision: 7555

Log:
Template Merge Integrated

Modified:
    vtigercrm/trunk/Smarty/templates/ComposeEmail.tpl
    vtigercrm/trunk/include/fckeditor/fckeditor.js
    vtigercrm/trunk/modules/Emails/EditView.php
    vtigercrm/trunk/modules/Users/TemplateMerge.php
    vtigercrm/trunk/modules/Users/lookupemailtemplates.php

Modified: vtigercrm/trunk/Smarty/templates/ComposeEmail.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ComposeEmail.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ComposeEmail.tpl Tue Jun 27 02:14:22 2006
@@ -20,6 +20,7 @@
 <link REL="SHORTCUT ICON" HREF="include/images/vtigercrm_icon.ico">	
 <style type="text/css">@import url("themes/{$THEME}/style.css");</style>
 <script language="javascript" type="text/javascript" src="include/scriptaculous/prototype.js"></script>
+<script type="text/javascript" src="include/fckeditor/fckeditor.js"></script>
 </head>
 <body marginheight="0" marginwidth="0" topmargin="0" bottommargin="0" leftmargin="0" rightmargin="0">
 <form name="EditView" method="POST" ENCTYPE="multipart/form-data" action="index.php">
@@ -107,12 +108,11 @@
    </tr>
 	{elseif $elements.2.0 eq 'description'}
    <tr>
-	<td colspan="3" align="center" height="320">
-        <input id="description___Config" value="" style="display: none;" type="hidden"><iframe id="description___Frame" src="include/fckeditor/editor/fckeditor.html?InstanceName=description&amp;Toolbar=Default" frameborder="no" height="370" scrolling="no" width="100%"></iframe>
+	<td colspan="3" align="center" valign="top" height="320">
         {if $WEBMAIL eq 'true'}
                 <textarea style="display: none;" class="detailedViewTextBox" name="description" cols="90" rows="8">{$DESCRIPTION}</textarea>
         {else}
-                <textarea style="display: none;" class="detailedViewTextBox" name="description" cols="90" rows="8">{$elements.3.0}</textarea>        {/if}
+                <textarea style="display: none;" class="detailedViewTextBox" id="description" name="description" cols="90" rows="16">{$elements.3.0}</textarea>        {/if}
 	</td>
    </tr>
 	{/if}
@@ -182,6 +182,13 @@
                 }
         );
 }
+
+</script>
+<script type="text/javascript" defer="1">
+var oFCKeditor = null;
+oFCKeditor = new FCKeditor( "description" ,"100%","370") ;
+oFCKeditor.BasePath   = "include/fckeditor/" ;
+oFCKeditor.ReplaceTextarea();
 </script>
 {/literal}
 </html>

Modified: vtigercrm/trunk/include/fckeditor/fckeditor.js
==============================================================================
--- vtigercrm/trunk/include/fckeditor/fckeditor.js (original)
+++ vtigercrm/trunk/include/fckeditor/fckeditor.js Tue Jun 27 02:14:22 2006
@@ -27,7 +27,7 @@
 	// Properties
 	this.InstanceName	= instanceName ;
 	this.Width			= width			|| '100%' ;
-	this.Height			= height		|| '200' ;
+	this.Height			= height		|| '370' ;
 	this.ToolbarSet		= toolbarSet	|| 'Default' ;
 	this.Value			= value			|| '' ;
 	this.BasePath		= '/fckeditor/' ;
@@ -71,6 +71,11 @@
 
 FCKeditor.prototype.ReplaceTextarea = function()
 {
+	if(document.getElementById('description___Config') != null)	
+	{
+		document.getElementById('description___Config').parentNode.removeChild(document.getElementById('description___Config'));
+		document.getElementById('description___Frame').parentNode.removeChild(document.getElementById('description___Frame'));
+	}
 	if ( !this.CheckBrowser || this._IsCompatibleBrowser() )
 	{
 		// We must check the elements firstly using the Id and then the name.
@@ -189,4 +194,4 @@
 	text = text.replace(/'/g, "&#39;") ;
 
 	return text ;
-}
+}

Modified: vtigercrm/trunk/modules/Emails/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/EditView.php (original)
+++ vtigercrm/trunk/modules/Emails/EditView.php Tue Jun 27 02:14:22 2006
@@ -153,17 +153,9 @@
 
 $disp_view = getView($focus->mode);
 $details = getBlocks($currentModule,$disp_view,$mode,$focus->column_fields);
-if(isset($_REQUEST['templateid']) && $_REQUEST['templateid'] !='')
-{
-	$templatedetails = getTemplateDetails($_REQUEST['templateid']);
-	$details['Email Information'][2][0][3][0] = $templatedetails[2]; //Subject	
-	$details['Email Information'][3][0][3][0] = nl2br($templatedetails[1]);	//Body
-}
 $smarty->assign("BLOCKS",$details['Email Information']);
 $smarty->assign("MODULE",$currentModule);
 $smarty->assign("SINGLE_MOD",$app_strings['Email']);
-//Display the FCKEditor or not? -- configure $FCKEDITOR_DISPLAY in config.php 
-$smarty->assign("FCKEDITOR_DISPLAY",$FCKEDITOR_DISPLAY);
 
 
 //needed when creating a new email with default values passed in
@@ -248,24 +240,9 @@
         $smarty->assign("FILENAME", $focus->filename);
 }
 
-if(isset($focus->parent_type) && $focus->parent_type != "") 
-{
-	$change_parent_button = "<input title='".$app_strings['LBL_CHANGE_BUTTON_TITLE']."' tabindex='2' accessKey='".$app_strings['LBL_CHANGE_BUTTON_KEY']."' type='button' class='button' value='".$app_strings['LBL_CHANGE_BUTTON_LABEL']."' name='button' LANGUAGE=javascript onclick='return window.open(\"index.php?module=\"+ document.EditView.parent_type.value + \"&action=Popup&html=Popup_picker&form=TasksEditView\",\"test\",\"width=600,height=400,resizable=1,scrollbars=1\");'>";
-	$smarty->assign("CHANGE_PARENT_BUTTON", $change_parent_button);
-}
-
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
 
 $smarty->display("ComposeEmail.tpl");
 ?>
-<script type="text/javascript" defer="1">
-addOnloadEvent(function () {
-	var oFCKeditor = null;
-	oFCKeditor = new FCKeditor("description") ;
-	oFCKeditor.BasePath  = "include/fckeditor/" ;
-	oFCKeditor.Height = 500;
-	oFCKeditor.Width = "100%";
-	oFCKeditor.ReplaceTextarea();
-});
-</script>
+

Modified: vtigercrm/trunk/modules/Users/TemplateMerge.php
==============================================================================
--- vtigercrm/trunk/modules/Users/TemplateMerge.php (original)
+++ vtigercrm/trunk/modules/Users/TemplateMerge.php Tue Jun 27 02:14:22 2006
@@ -8,18 +8,23 @@
  * All Rights Reserved.
 *
  ********************************************************************************/
-require_once('include/utils/UserInfoUtil.php');
-require_once('modules/Emails/templates/testemailtemplateusage.php');
-$replacedString = substituteTokens("".$_REQUEST["templatename"],$globals);
+require_once('include/utils/CommonUtils.php');
+if(isset($_REQUEST['templateid']) && $_REQUEST['templateid'] !='')
+{
+	$templatedetails = getTemplateDetails($_REQUEST['templateid']);
+	//$details['Email Information'][2][0][3][0] = $templatedetails[2]; //Subject
+	//$details['Email Information'][3][0][3][0] = nl2br($templatedetails[1]); //Body
+}
 ?>
 <form name="frmrepstr">
+<input type="hidden" name="subject" value="<?echo $templatedetails[2];?>"></input>
 <textarea name="repstr" style="visibility:hidden">
-<?php echo chop($replacedString); ?>
+<?php echo nl2br($templatedetails[1]); ?>
 </textarea>
 </form>
 <script language="javascript">
-opener.document.EditView.description.value=document.frmrepstr.repstr.value
-//opener.oFCKeditor.ReplaceTextarea() ;
-window.close()
+window.opener.document.getElementById('subject').value = window.document.frmrepstr.subject.value
+window.opener.document.getElementById('description').value = window.document.frmrepstr.repstr.value
+opener.oFCKeditor.ReplaceTextarea();
+window.close();
 </script>
-

Modified: vtigercrm/trunk/modules/Users/lookupemailtemplates.php
==============================================================================
--- vtigercrm/trunk/modules/Users/lookupemailtemplates.php (original)
+++ vtigercrm/trunk/modules/Users/lookupemailtemplates.php Tue Jun 27 02:14:22 2006
@@ -56,8 +56,7 @@
 <script>
 function submittemplate(templateid)
 {
-	window.opener.location.href = window.opener.location.href +'&templateid='+templateid;
-	self.close();
+	window.document.location.href = 'index.php?module=Users&action=UsersAjax&file=TemplateMerge&templateid='+templateid;
 }
 </script>
 </html>



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 01:18:33 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 08:18:33 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7556 -
 /vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl
Message-ID: <20060627081833.1FB1E83FC2F@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 27 02:18:29 2006
New Revision: 7556

Log:
update org sharing tpl file

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

Modified: vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl Tue Jun 27 02:18:29 2006
@@ -225,8 +225,8 @@
 		var select1 = tagName.options[tagName.selectedIndex].text;
 		var select2 = tagName2.options[tagName2.selectedIndex].text;
 		var select3 = tagName3.options[tagName3.selectedIndex].text;
-		soucre.innerHTML = module +" of <b>\"" + select1 + "\"</b> can be accessed by <b>\"" +select2 + "\"</b> in the permission "+select3;
-		soucre1.innerHTML = "<b>Related Module Rights</b> "+ relatedstring;
+		soucre.innerHTML = module +" {$APP.LBL_LIST_OF} <b>\"" + select1 + "\"</b> {$CMOD.LBL_CAN_BE_ACCESSED} <b>\"" +select2 + "\"</b> {$CMOD.LBL_IN_PERMISSION} "+select3;
+		soucre1.innerHTML = "<b>{$CMOD.LBL_RELATED_MODULE_RIGHTS}</b> " + relatedstring;
 {rdelim}
 
 </script>



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 01:20:34 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 08:20:34 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7557 -
	/vtigercrm/trunk/Smarty/templates/SetMenu.tpl
Message-ID: <20060627082034.DC7F083FC00@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 27 02:20:31 2006
New Revision: 7557

Log:
updated setmenufile

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

Modified: vtigercrm/trunk/Smarty/templates/SetMenu.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/SetMenu.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/SetMenu.tpl Tue Jun 27 02:20:31 2006
@@ -97,7 +97,7 @@
 				{if $smarty.request.action eq 'OrganizationTermsandConditions' || $smarty.request.action eq 'savetermsandconditions'}
 				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_INVENTORY_TANDC}</td></tr>
 				{else}
-				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=OrganizationTermsandConditions&parenttab=Settings">{$MOD.INVENTORYTERMSANDCONDITIONS}</a></td></tr>
+				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=OrganizationTermsandConditions&parenttab=Settings">{$MOD.INVENTORY_TANDC}</a></td></tr>
 				{/if}
 
 	



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 01:55:55 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 08:55:55 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7558 - in
 /vtigertoolbar/trunk/firefox/chrome/content: create_note.xul
 create_product.xul create_rss.xul create_site.xul create_vendor.xul
Message-ID: <20060627085555.B098083FD05@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 27 02:55:49 2006
New Revision: 7558

Log:
init version

Added:
    vtigertoolbar/trunk/firefox/chrome/content/create_note.xul
    vtigertoolbar/trunk/firefox/chrome/content/create_product.xul
    vtigertoolbar/trunk/firefox/chrome/content/create_rss.xul
    vtigertoolbar/trunk/firefox/chrome/content/create_site.xul
    vtigertoolbar/trunk/firefox/chrome/content/create_vendor.xul



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 02:03:45 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 09:03:45 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7559 -
	/vtigercrm/trunk/soap/firefoxtoolbar.php
Message-ID: <20060627090345.07F2F83FD08@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 27 03:03:42 2006
New Revision: 7559

Log:
proper formatting and access denial message

Modified:
    vtigercrm/trunk/soap/firefoxtoolbar.php

Modified: vtigercrm/trunk/soap/firefoxtoolbar.php
==============================================================================
--- vtigercrm/trunk/soap/firefoxtoolbar.php (original)
+++ vtigercrm/trunk/soap/firefoxtoolbar.php Tue Jun 27 03:03:42 2006
@@ -19,7 +19,7 @@
 
 $NAMESPACE = 'http://www.vtiger.com/vtigercrm/';
 $server = new soap_server;
-
+$accessDenied = "You are not authorized for performing this action";
 $server->configureWSDL('vtigersoap');
 
 $server->register(
@@ -134,7 +134,11 @@
 		return 'Thank you for your interest. Information has been successfully added as Portal';
 		else
 		return "Portal creation failed. Try again";
-		}
+	}
+	else
+	{
+		return $accessDenied;
+	}
 }
 
 
@@ -147,19 +151,24 @@
 	$oRss = new vtigerRSS();
 	if(isPermitted("RSS","EditView") == "yes")
 	{
-	if($oRss->setRSSUrl($url))
-	{
-		if($oRss->saveRSSUrl($url) == false)
+		if($oRss->setRSSUrl($url))
 		{
-			return "RSS creation failed. Try again";
-		}
-		else
-		{
-			return 'Thank you for your interest. Information has been successfully added as RSS.';
-        	}
-
-	}
-	}
+			if($oRss->saveRSSUrl($url) == false)
+			{
+				return "RSS creation failed. Try again";
+			}
+			else
+			{
+					return 'Thank you for your interest. Information has been successfully added as RSS.';
+			}
+
+	       }
+	}
+	else
+	{
+		return $accessDenied;
+	}
+
 }
 
 
@@ -172,20 +181,25 @@
 	$focus = new Note();
 	if(isPermitted("Notes","EditView") == "yes")
 	{
-	$focus->column_fields['title'] = $subject;
-	$focus->column_fields['notecontent'] = $desc;
-
-	$focus->save("Notes");
-	
-	$focus->retrieve_entity_info($focus->id,"Notes");
-
-	$adb->println("Create New Note from Web Form - Ends");
-
-	if($focus->id != '')
+		$focus->column_fields['title'] = $subject;
+		$focus->column_fields['notecontent'] = $desc;
+
+		$focus->save("Notes");
+
+		$focus->retrieve_entity_info($focus->id,"Notes");
+
+		$adb->println("Create New Note from Web Form - Ends");
+
+		if($focus->id != '')
 		return 'Thank you for your interest. Information has been successfully added as Note.';
-	else
+		else
 		return "Note creation failed. Try again";
-		}
+	}
+	else
+	{
+		return $accessDenied;
+	}
+
 }
 
 
@@ -214,7 +228,13 @@
 		return 'Thank you for your interest. Information has been successfully added as Product.';
 		else
 		return "Product creation failed. Try again";
-		}
+	}
+	else
+	{
+		return $accessDenied;
+	}
+
+	
 }
 
 
@@ -243,7 +263,13 @@
 		return 'Thank you for your interest. Information has been successfully added as Vendor.';
 		else
 		return "Vendor creation failed. Try again";
-		}
+       }		
+       else
+	{
+		return $accessDenied;
+	}
+
+	
 }
 
 
@@ -277,7 +303,13 @@
 		$ticket->save("HelpDesk");
 
 		return $ticket->id;
-		}
+	}
+	else
+	{
+		return $accessDenied;
+	}
+
+
 }
 
 function create_account($username,$accountname,$email,$phone,$primary_address_street,$primary_address_city,$primary_address_state,$primary_address_postalcode,$primary_address_country)
@@ -304,6 +336,12 @@
 		$account->save('Accounts');
 		return $account->id;
 	}
+	else
+	{
+		return $accessDenied;
+	}
+
+
 }
 
 
@@ -322,22 +360,28 @@
 	require_once("modules/Leads/Lead.php");
 
 	$focus = new Lead();
-	 if(isPermitted("Leads","EditView") == "yes")
-	     {
-	$focus->column_fields['lastname'] = $lastname;
-	$focus->column_fields['email'] = $email;
-	$focus->column_fields['phone'] = $phone;
-	$focus->column_fields['company'] = $company;
-	$focus->column_fields['country'] = $country;
-	$focus->column_fields['description'] = $description;
-	$focus->save("Leads");
-	$focus->retrieve_entity_info($focus->id,"Leads");
-	$adb->println("Create New Lead from Web Form - Ends");
-	     }
-	if($focus->id != '')
+	if(isPermitted("Leads","EditView") == "yes")
+	{
+		$focus->column_fields['lastname'] = $lastname;
+		$focus->column_fields['email'] = $email;
+		$focus->column_fields['phone'] = $phone;
+		$focus->column_fields['company'] = $company;
+		$focus->column_fields['country'] = $country;
+		$focus->column_fields['description'] = $description;
+		$focus->save("Leads");
+		$focus->retrieve_entity_info($focus->id,"Leads");
+		$adb->println("Create New Lead from Web Form - Ends");
+		if($focus->id != '')
 		return 'Thank you for your interest. Information has been successfully added as Lead.';
-	else
+		else
 		return "Lead creation failed. Try again";
+     }
+	else
+	{
+		return $accessDenied;
+	}
+
+
 }
 
 function create_contacts($user_name,$output_list)
@@ -370,54 +414,60 @@
 	$adb->println("OUTLOOK: The user id is ".$current_user->id);
 	
 	require_once('modules/Contacts/Contact.php');
-	 if(isPermitted("Contacts","EditView") == "yes")
+     if(isPermitted("Contacts","EditView") == "yes")
      {
 
-	$contact = new Contact();
-
-	$contact->column_fields[firstname]=$first_name;
-	$contact->column_fields[lastname]=$last_name;
-		
-	$contact->column_fields[account_id]=retrieve_account_id($account_name,$user_id);// NULL value is not supported NEED TO FIX
-	
-	$contact->column_fields[salutation]=$salutation;
-	// EMAIL IS NOT ADDED
-	$contact->column_fields[title]=$title;
-	$contact->column_fields[email]=$email_address;
-	
-	
-	$contact->column_fields[mobile]=$phone_mobile;
-	$contact->column_fields[reports_to_id] =retrievereportsto($reports_to,$user_id,$account_id);// NOT FIXED IN SAVEENTITY.PHP
-	$contact->column_fields[mailingstreet]=$primary_address_street;
-	$contact->column_fields[mailingcity]=$primary_address_city;
-	$contact->column_fields[mailingcountry]=$primary_address_country;
-	$contact->column_fields[mailingstate]=$primary_address_state;
-	$contact->column_fields[mailingzip]=$primary_address_postalcode;
-
-	$contact->column_fields[otherstreet]=$alt_address_street;
-	$contact->column_fields[othercity]=$alt_address_city;
-	$contact->column_fields[othercountry]=$alt_address_country;
-	$contact->column_fields[otherstate]=$alt_address_state;
-	$contact->column_fields[otherzip]=$alt_address_postalcode;
-
-	$contact->column_fields[assigned_user_id]=$user_id;
-
-    // new Fields
-    $contact->column_fields[phone]= $office_phone;
-    $contact->column_fields[homephone]= $home_phone;
-    $contact->column_fields[otherphone]= $other_phone;
-    $contact->column_fields[fax]= $fax;
-    $contact->column_fields[department]=$department;
-    $contact->column_fields[birthday]= getDisplayDate($birthdate);
-    $contact->column_fields[assistant]= $assistant_name;
-    $contact->column_fields[assistantphone]= $assistant_phone;
-    $contact->column_fields[description]= $description;
-
-	//$contact->saveentity("Contacts");
-	$contact->save("Contacts");
-
-	return $contact->id;
-	}
+	     $contact = new Contact();
+
+	     $contact->column_fields[firstname]=$first_name;
+	     $contact->column_fields[lastname]=$last_name;
+
+	     $contact->column_fields[account_id]=retrieve_account_id($account_name,$user_id);// NULL value is not supported NEED TO FIX
+
+	     $contact->column_fields[salutation]=$salutation;
+	     // EMAIL IS NOT ADDED
+	     $contact->column_fields[title]=$title;
+	     $contact->column_fields[email]=$email_address;
+
+
+	     $contact->column_fields[mobile]=$phone_mobile;
+	     $contact->column_fields[reports_to_id] =retrievereportsto($reports_to,$user_id,$account_id);// NOT FIXED IN SAVEENTITY.PHP
+	     $contact->column_fields[mailingstreet]=$primary_address_street;
+	     $contact->column_fields[mailingcity]=$primary_address_city;
+	     $contact->column_fields[mailingcountry]=$primary_address_country;
+	     $contact->column_fields[mailingstate]=$primary_address_state;
+	     $contact->column_fields[mailingzip]=$primary_address_postalcode;
+
+	     $contact->column_fields[otherstreet]=$alt_address_street;
+	     $contact->column_fields[othercity]=$alt_address_city;
+	     $contact->column_fields[othercountry]=$alt_address_country;
+	     $contact->column_fields[otherstate]=$alt_address_state;
+	     $contact->column_fields[otherzip]=$alt_address_postalcode;
+
+	     $contact->column_fields[assigned_user_id]=$user_id;
+
+	     // new Fields
+	     $contact->column_fields[phone]= $office_phone;
+	     $contact->column_fields[homephone]= $home_phone;
+	     $contact->column_fields[otherphone]= $other_phone;
+	     $contact->column_fields[fax]= $fax;
+	     $contact->column_fields[department]=$department;
+	     $contact->column_fields[birthday]= getDisplayDate($birthdate);
+	     $contact->column_fields[assistant]= $assistant_name;
+	     $contact->column_fields[assistantphone]= $assistant_phone;
+	     $contact->column_fields[description]= $description;
+
+	     //$contact->saveentity("Contacts");
+	     $contact->save("Contacts");
+
+	     return $contact->id;
+     }
+	else
+	{
+		return $accessDenied;
+	}
+
+
 }
 
 



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 02:04:31 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 09:04:31 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7560 -
	/vtigercrm/trunk/soap/firefoxtoolbar.php
Message-ID: <20060627090431.C425483FD08@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 27 03:04:27 2006
New Revision: 7560

Log:
removed unwanted import

Modified:
    vtigercrm/trunk/soap/firefoxtoolbar.php

Modified: vtigercrm/trunk/soap/firefoxtoolbar.php
==============================================================================
--- vtigercrm/trunk/soap/firefoxtoolbar.php (original)
+++ vtigercrm/trunk/soap/firefoxtoolbar.php Tue Jun 27 03:04:27 2006
@@ -13,7 +13,6 @@
 require_once('include/logging.php');
 require_once('include/nusoap/nusoap.php');
 require_once('include/database/PearDatabase.php');
-require_once('modules/HelpDesk/HelpDesk.php');
 
 $log = &LoggerManager::getLogger('firefoxlog');
 



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 02:07:48 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 09:07:48 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7561 -
	/vtigercrm/trunk/soap/thunderbirdplugin.php
Message-ID: <20060627090748.59BF683FD08@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 27 03:07:44 2006
New Revision: 7561

Log:
added security check to 1 method alone

Modified:
    vtigercrm/trunk/soap/thunderbirdplugin.php

Modified: vtigercrm/trunk/soap/thunderbirdplugin.php
==============================================================================
--- vtigercrm/trunk/soap/thunderbirdplugin.php (original)
+++ vtigercrm/trunk/soap/thunderbirdplugin.php Tue Jun 27 03:07:44 2006
@@ -16,6 +16,7 @@
 
 $log = &LoggerManager::getLogger('thunderbirdplugin');
 
+$accessDenied = "You are not authorized for performing this action";
 $NAMESPACE = 'http://www.vtiger.com/vtigercrm/';
 $server = new soap_server;
 
@@ -50,38 +51,46 @@
 	
 	$date_sent = getDisplayDate($date_sent);
 
-	require_once('modules/Emails/Email.php');
-	
-	$email = new Email();
+	if(isPermitted("Emails","EditView") == "yes")
+	{
+		require_once('modules/Emails/Email.php');
 
-	$email_body = str_replace("'", "''", $email_body);
-	$email_subject = str_replace("'", "''", $email_subject);
-	
-	//fixed subject issue 9/6/05
-	$email->column_fields[activitytype]='Emails';
-	$email->column_fields[subject]=$email_subject;
-	$email->column_fields[assigned_user_id] = $user_id;
-	$email->column_fields[date_start] = $date_sent;
-	$email->column_fields[description]  = $email_body;
+		$email = new Email();
 
-	
-	// Save one copy of the email message
-	//$email->saveentity("Emails");
-	$email->save("Emails");
+		$email_body = str_replace("'", "''", $email_body);
+		$email_subject = str_replace("'", "''", $email_subject);
+
+		//fixed subject issue 9/6/05
+		$email->column_fields[activitytype]='Emails';
+		$email->column_fields[subject]=$email_subject;
+		$email->column_fields[assigned_user_id] = $user_id;
+		$email->column_fields[date_start] = $date_sent;
+		$email->column_fields[description]  = $email_body;
 
 
-	
-	// for each contact, add a link between the contact and the email message
-	$contact_id_list = explode(";", $contact_ids);
+		// Save one copy of the email message
+		//$email->saveentity("Emails");
+		$email->save("Emails");
 
-	foreach( $contact_id_list as $contact_id)
+
+
+		// for each contact, add a link between the contact and the email message
+		$contact_id_list = explode(";", $contact_ids);
+
+		foreach( $contact_id_list as $contact_id)
+		{
+			$email->set_emails_contact_invitee_relationship($email->id, $contact_id);
+			$email->set_emails_se_invitee_relationship($email->id,$contact_id);
+			}
+			$email->set_emails_user_invitee_relationship($email->id, $user_id);
+
+			return $email->id;
+	}
+	else
 	{
-		$email->set_emails_contact_invitee_relationship($email->id, $contact_id);
-		$email->set_emails_se_invitee_relationship($email->id,$contact_id);
+		return $accessDenied;
 	}
-	$email->set_emails_user_invitee_relationship($email->id, $user_id);
-	
-	return $email->id;
+
 }
 
 



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 02:09:30 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 09:09:30 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7562 -
	/vtigercrm/trunk/soap/wordplugin.php
Message-ID: <20060627090930.B71AD83FD03@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 27 03:09:27 2006
New Revision: 7562

Log:
added security checks

Modified:
    vtigercrm/trunk/soap/wordplugin.php

Modified: vtigercrm/trunk/soap/wordplugin.php
==============================================================================
--- vtigercrm/trunk/soap/wordplugin.php (original)
+++ vtigercrm/trunk/soap/wordplugin.php Tue Jun 27 03:09:27 2006
@@ -18,7 +18,7 @@
 
 $NAMESPACE = 'http://www.vtiger.com/vtigercrm/';
 $server = new soap_server;
-
+$accessDenied = "You are not permitted to perform this action";
 $server->configureWSDL('vtigersoap');
 
 $server->register(
@@ -89,6 +89,9 @@
 	    $contact = new Contact();
 	    return $contact->getColumnNames();	   
     }
+ else
+    return null;
+
 }
 
 
@@ -100,6 +103,9 @@
 	    $account = new Account();
 	    return $account->getColumnNames_Acnt();
     }
+ else
+    return null;
+
 }
 
 
@@ -111,6 +117,9 @@
     $lead = new Lead();
     return $lead->getColumnNames_Lead();
     }
+ else
+    return null;
+
 }
 
 function get_user_columns($user_name, $password)
@@ -122,6 +131,9 @@
     $user = new User();
     return $user->getColumnNames_User();
     }
+ else
+    return null;
+
 }
 
 



From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 27 02:25:27 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 27 Jun 2006 09:25:27 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231098=3A?=
 =?utf-8?q?_Security_is_not_implemented_for_New_Emails?=
In-Reply-To: <076.9338ecb11bbd664fc8df6eb42c9a07c1@vtiger.fosslabs.com>
References: <076.9338ecb11bbd664fc8df6eb42c9a07c1@vtiger.fosslabs.com>
Message-ID: <085.e69e05941229b566b9e037999c47154e@vtiger.fosslabs.com>

#1098: Security is not implemented for New Emails
---------------------------+------------------------------------------------
  Reporter:  jerrydgeorge  |       Owner:  don   
      Type:  defect        |      Status:  closed
  Priority:  critical      |   Milestone:        
 Component:  vtigercrm     |     Version:  5.0.0 
Resolution:  fixed         |    Keywords:        
---------------------------+------------------------------------------------
Changes (by don):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1098>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 02:27:38 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 09:27:38 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7563 -
 /vtigercrm/trunk/modules/Home/language/en_us.lang.php
Message-ID: <20060627092738.BAA8483FD03@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 27 03:27:35 2006
New Revision: 7563

Log:
Updated lang file

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

Modified: vtigercrm/trunk/modules/Home/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Home/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Home/language/en_us.lang.php Tue Jun 27 03:27:35 2006
@@ -43,7 +43,7 @@
 'LBL_LEADS_BY_SOURCE'=>'Leads By Source',
 'LBL_LEADS_BY_STATUS'=>'Leads By Status',
 
-'lBL_UPCOMING_EVENTS'=>'Upcoming Activities',
+'LBL_UPCOMING_EVENTS'=>'Upcoming Activities',
 'LBL_PENDING_EVENTS'=>'Pending Activities',
 'LBL_TODAYEVENT'=>'Events for Last Ten days',
 



From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 27 02:28:58 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 27 Jun 2006 09:28:58 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231298=3A?=
 =?utf-8?q?_revert_r7003=3A7004_prefix_vtiger=5F_to_all_tablenames?=
In-Reply-To: <076.32456f312efcd1431e178d7f1df1ccb0@vtiger.fosslabs.com>
References: <076.32456f312efcd1431e178d7f1df1ccb0@vtiger.fosslabs.com>
Message-ID: <085.e106626b00dd117c9bb2b9a06231d9ec@vtiger.fosslabs.com>

#1298: revert r7003:7004 prefix vtiger_ to all tablenames
------------------------+---------------------------------------------------
  Reporter:  jeffk      |       Owner:  don     
      Type:  defect     |      Status:  closed  
  Priority:  major      |   Milestone:  5.0.0   
 Component:  vtigercrm  |     Version:  5.0.0   
Resolution:  fixed      |    Keywords:  database
------------------------+---------------------------------------------------
Changes (by don):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1298>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 02:29:21 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 09:29:21 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7564 -
 /vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php
Message-ID: <20060627092922.2252B83FD03@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 27 03:29:18 2006
New Revision: 7564

Log:
* Fixed the insert queries for emaildetails table

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 Jun 27 03:29:18 2006
@@ -2910,37 +2910,41 @@
 $fieldid_array = Array("Leads"=>"$leadfieldid","Contacts"=>"$contactfieldid");
 $idname_array = Array("Leads"=>"leadid","Contacts"=>"contactid");
 
-$query = 'select * from vtiger_seactivityrel where activityid in (select activityid from vtiger_activity where activitytype="Emails")';
+$query = 'select * from vtiger_seactivityrel where activityid in (select activityid from vtiger_activity where activitytype="Emails") group by activityid';
 $result = $conn->query($query);
 $numofrows = $conn->num_rows($result);
 
-$islists = '';
-$toemail = '';
 for($i=0;$i<$numofrows;$i++)
 {
-	$parentid = $conn->query_result($result,$i,'crmid');
+	$toemail = "";
+	$idlists = '';
+
 	$emailid = $conn->query_result($result,$i,'activityid');
 
-	$query = 'select setype from vtiger_crmentity where crmid='.$parentid;
-	$result1 = $conn->query($query);
-	$module = $conn->query_result($result1,0,'setype');
-
-	$idlists = "$parentid@$fieldid_array[$module]|";
-
-	if($module == 'Leads' || $module == 'Contacts')
+	$result1 = $conn->query("select * from vtiger_seactivityrel where activityid = $emailid");
+	while($row = $conn->fetch_array($result1))
 	{
-		$result2 = $conn->query("select lastname, firstname, email from $obj_array[$module] where $idname_array[$module] = $parentid");
-		$toemail = $conn->query_result($result2,0,'lastname').' '.$conn->query_result($result2,0,'firstname').'<'.$conn->query_result($result2,0,'email').'>###';
-
-		//insert this idlists and toemail values in vtiger_emaildetails table
-		$sql = "insert into vtiger_emaildetails values ($emailid,'',\"$toemail\",'','','',\"$idlists\",'SAVE')";
-		Execute($sql);
+		$result2 = $conn->query("select setype from vtiger_crmentity where crmid=".$row['crmid']);
+		$module = $conn->query_result($result2,0,'setype');
+		$idlists .= $row['crmid']."@$fieldid_array[$module]|";
+
+		if($module == 'Leads' || $module == 'Contacts')
+		{
+			$result3 = $conn->query("select lastname, firstname, email from $obj_array[$module] where $idname_array[$module] = ".$row['crmid']);
+
+			$toemail .= $conn->query_result($result3,0,'lastname')." ".$conn->query_result($result3,0,'firstname')."<".$conn->query_result($result3,0,'email').">###";
+		}
+		else
+		{
+			//the parent is not a Lead or Contact. so we have avoided the insert query
+		}
 	}
-	else
-	{
-		//the parent is not a Lead or Contact. so we have avoided the insert query
-	}
-}
+
+	//insert this idlists and toemail values in vtiger_emaildetails table
+	$sql = "insert into vtiger_emaildetails values ($emailid,'',\"$toemail\",'','','',\"$idlists\",'SAVE')";
+	Execute($sql);
+}
+
 
 $update_query5 = "update vtiger_field set quickcreate=1, quickcreatesequence=NULL where tabid in (10,14)";
 Execute($update_query5);



From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 27 02:35:13 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 27 Jun 2006 09:35:13 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231325=3A?=
 =?utf-8?q?_reference_all_clanups_of_vtiger=5F_table_prefix_to_trac_ticket?=
In-Reply-To: <076.dc2b0777399119340aa2cb60903488d4@vtiger.fosslabs.com>
References: <076.dc2b0777399119340aa2cb60903488d4@vtiger.fosslabs.com>
Message-ID: <085.8e61d51278995a1193853c8b054fc0f5@vtiger.fosslabs.com>

#1325: reference all clanups of vtiger_ table prefix to trac ticket
------------------------+---------------------------------------------------
  Reporter:  jeffk      |       Owner:  don     
      Type:  defect     |      Status:  closed  
  Priority:  major      |   Milestone:  5.0.0   
 Component:  vtigercrm  |     Version:  5.0.0   
Resolution:  fixed      |    Keywords:  database
------------------------+---------------------------------------------------
Changes (by don):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1325>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 27 02:37:52 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 27 Jun 2006 09:37:52 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231367=3A?=
 =?utf-8?q?_In_getUniqueID_function_vtiger=5F_should_be_appended__in_table?=
 =?utf-8?q?_names?=
Message-ID: <076.a03a6cfe902917face7168be0a2a104c@vtiger.fosslabs.com>

#1367: In getUniqueID function vtiger_ should be appended  in table names
-----------------------+----------------------------------------------------
 Reporter:  don        |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  major      |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 In getUniqueID function vtiger_ should be appended in table names

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1367>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 27 02:39:10 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 27 Jun 2006 09:39:10 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231367=3A?=
 =?utf-8?q?_In_getUniqueID_function_vtiger=5F_should_be_appended__in_table?=
 =?utf-8?q?_names?=
In-Reply-To: <076.a03a6cfe902917face7168be0a2a104c@vtiger.fosslabs.com>
References: <076.a03a6cfe902917face7168be0a2a104c@vtiger.fosslabs.com>
Message-ID: <085.59f67db19c0d514516491b559add69c2@vtiger.fosslabs.com>

#1367: In getUniqueID function vtiger_ should be appended  in table names
------------------------+---------------------------------------------------
  Reporter:  don        |       Owner:  don  
      Type:  defect     |      Status:  new  
  Priority:  major      |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => don

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1367>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 27 02:39:19 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 27 Jun 2006 09:39:19 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231182=3A?=
 =?utf-8?q?_Issue_in_email_templates?=
In-Reply-To: <076.ac60ce16b49a2b500206812cfdc53853@vtiger.fosslabs.com>
References: <076.ac60ce16b49a2b500206812cfdc53853@vtiger.fosslabs.com>
Message-ID: <085.ae802ed1841a53d86d49ebd4831b7e68@vtiger.fosslabs.com>

#1182: Issue in email templates
------------------------+---------------------------------------------------
  Reporter:  don        |       Owner:  ahmed 
      Type:  defect     |      Status:  closed
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by ahmed):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 Issue fixed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1182>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 02:44:45 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 09:44:45 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7565 -
 /vtigertoolbar/trunk/firefox/chrome/content/vtigertoolbar.xul
Message-ID: <20060627094445.91A8683FDCA@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 27 03:44:41 2006
New Revision: 7565

Log:
commented out the uninstall option

Modified:
    vtigertoolbar/trunk/firefox/chrome/content/vtigertoolbar.xul

Modified: vtigertoolbar/trunk/firefox/chrome/content/vtigertoolbar.xul
==============================================================================
Binary files - no diff available.



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 02:47:47 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 09:47:47 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7566 -
	/vtigercrm/trunk/include/js/ListView.js
Message-ID: <20060627094747.F040283FDCA@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 27 03:47:44 2006
New Revision: 7566

Log:
alert statement removed

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

Modified: vtigercrm/trunk/include/js/ListView.js
==============================================================================
--- vtigercrm/trunk/include/js/ListView.js (original)
+++ vtigercrm/trunk/include/js/ListView.js Tue Jun 27 03:47:44 2006
@@ -32,7 +32,6 @@
 		alert("Please select atleast one entity");
 		return false;
 	}
-	alert(document.massdelete.idlist.value)
 	fnvshobj(obj,divid);
 }
 function massDelete(module)
@@ -64,7 +63,6 @@
 		{
 			
 			$("status").style.display="inline";
-			alert("module=Users&action=massdelete&return_module="+module+"&viewname="+viewid+"&idlist="+idstring)
 			new Ajax.Request(
           	  	      'index.php',
 			      	{queue: {position: 'end', scope: 'command'},



From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 27 02:50:58 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 27 Jun 2006 09:50:58 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231340=3A?=
 =?utf-8?q?_Firefox_extension=3A_Uninstall_not_working?=
In-Reply-To: <076.9c4f4fefce1fedb98255e8bbe4dd1210@vtiger.fosslabs.com>
References: <076.9c4f4fefce1fedb98255e8bbe4dd1210@vtiger.fosslabs.com>
Message-ID: <085.638210577a6afb9f2096d38ff34f2527@vtiger.fosslabs.com>

#1340: Firefox extension: Uninstall not working
----------------------------+-----------------------------------------------
  Reporter:  gopal          |       Owner:  minnie
      Type:  defect         |      Status:  closed
  Priority:  critical       |   Milestone:        
 Component:  vtigertoolbar  |     Version:  5.0.0 
Resolution:  fixed          |    Keywords:        
----------------------------+-----------------------------------------------
Changes (by mangai):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1340>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 02:58:33 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 09:58:33 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7567 -
	/vtigercrm/trunk/include/js/Mail.js
Message-ID: <20060627095833.2F43283FDF3@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 27 03:58:30 2006
New Revision: 7567

Log:
inconsistance in Send Mail button has been fixed

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

Modified: vtigercrm/trunk/include/js/Mail.js
==============================================================================
--- vtigercrm/trunk/include/js/Mail.js (original)
+++ vtigercrm/trunk/include/js/Mail.js Tue Jun 27 03:58:30 2006
@@ -11,44 +11,29 @@
 
 function eMail(module,oButton)
 {
-    x = document.massdelete.selected_id.length;
+	var select_options  =  document.getElementsByName('selected_id');
+	var x = select_options.length;
 	var viewid = document.massdelete.viewname.value;
+	var idstring= new Array();
 
-        if ( x == undefined)
-        {
-
-                if (document.massdelete.selected_id.checked)
-                {
-                        document.massdelete.idlist.value=document.massdelete.selected_id.value;
-                }
-                else
-                {
-                        alert("Please select atleast one entity");
-                        return false;
-                }
-        }
-        else
-        {
-				var idstring= new Array();
-                xx = 0;
-                for(i = 0; i < x ; i++)
-                {
-                        if(document.massdelete.selected_id[i].checked)
-                        {
-                                idstring[xx]= document.massdelete.selected_id[i].value;
-                                xx++
-                        }
-                }
-                if (xx != 0)
-                {
-                        document.massdelete.idlist.value=idstring.join(':');
-                }
-                else
-                {
-                        alert("Please select atleast one entity");
-                        return false;
-                }
-        }
+	xx = 0;
+	for(i = 0; i < x ; i++)
+	{
+		if(select_options[i].checked)
+		{
+			idstring[xx] = select_options[i].value;
+				xx++
+		}
+	}
+	if (xx != 0)
+	{
+                document.massdelete.idlist.value=idstring.join(':');
+	}
+	else
+	{
+		alert("Please select atleast one entity");
+		return false;
+	}
 	allids = document.massdelete.idlist.value;	
 	fnvshobj(oButton,'sendmail_cont');
 	sendmail(module,allids);



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 03:02:47 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 10:02:47 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7568 - in
 /vtigercrm/trunk/Smarty/templates: DetailView.tpl ListView.tpl
 RelatedLists.tpl SelectEmail.tpl
Message-ID: <20060627100248.26AF183FDF9@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 27 04:02:41 2006
New Revision: 7568

Log:
inconsistance in select Emails has been fixed

Modified:
    vtigercrm/trunk/Smarty/templates/DetailView.tpl
    vtigercrm/trunk/Smarty/templates/ListView.tpl
    vtigercrm/trunk/Smarty/templates/RelatedLists.tpl
    vtigercrm/trunk/Smarty/templates/SelectEmail.tpl

Modified: vtigercrm/trunk/Smarty/templates/DetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DetailView.tpl Tue Jun 27 04:02:41 2006
@@ -21,7 +21,7 @@
 </span>
 
 {if $MODULE eq 'Leads' or $MODULE eq 'Contacts' or $MODULE eq 'Accounts'}
-<div id="sendmail_cont" style="z-index:100001;position:absolute;"></div>
+<form name="SendMail"><div id="sendmail_cont" style="z-index:100001;position:absolute;"></div></form>
 {/if}
 
 <div id="convertleaddiv" style="display:block;position:absolute;left:225px;top:150px;"></div>

Modified: vtigercrm/trunk/Smarty/templates/ListView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ListView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ListView.tpl Tue Jun 27 04:02:41 2006
@@ -407,8 +407,7 @@
 </div>
 {/if}
 {if $MODULE eq 'Leads' or $MODULE eq 'Contacts' or $MODULE eq 'Accounts'}
-<div id="sendmail_cont" style="z-index:100001;position:absolute;"></div>
-
+<form name="SendMail"><div id="sendmail_cont" style="z-index:100001;position:absolute;"></div></form>
 {/if}
 <script>
 {literal}

Modified: vtigercrm/trunk/Smarty/templates/RelatedLists.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/RelatedLists.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/RelatedLists.tpl Tue Jun 27 04:02:41 2006
@@ -131,7 +131,7 @@
 </table>
 
 {if $MODULE eq 'Leads' or $MODULE eq 'Contacts' or $MODULE eq 'Accounts'}
-<div id="sendmail_cont" style="z-index:100001;position:absolute;width:310px;"></div>
+<form name="SendMail"><div id="sendmail_cont" style="z-index:100001;position:absolute;"></div></form>
 {/if}
 
 <script>

Modified: vtigercrm/trunk/Smarty/templates/SelectEmail.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/SelectEmail.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/SelectEmail.tpl Tue Jun 27 04:02:41 2006
@@ -11,7 +11,6 @@
 -->*}
 <!-- BEGIN: main -->
 <div id="roleLay" style="z-index:12;display:block;">
-	<form name="SendMail">
 	<table width="100%" border="0" cellpadding="5" cellspacing="0" class="small">
 		<tr>
 			<td width="50%" align="left" class="genHeaderSmall">{$MOD.CHOSE_EMAIL}</td>
@@ -34,6 +33,5 @@
 		</tr>
 		<tr><td colspan="2" style="border-top:1px dashed #CCCCCC;">&nbsp;</td></tr>
 	</table>
-	</form>
 </div> 
 



From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 27 03:03:57 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 27 Jun 2006 10:03:57 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231354=3A?=
 =?utf-8?q?_Inconsistencies_in_List_View_Buttons_esp_Mass_Delete?=
In-Reply-To: <076.8202f24bc4ecea9fdc79cdca719ea624@vtiger.fosslabs.com>
References: <076.8202f24bc4ecea9fdc79cdca719ea624@vtiger.fosslabs.com>
Message-ID: <085.6319239b4d07bfdeacfabd7c517fcd03@vtiger.fosslabs.com>

#1354: Inconsistencies in List View Buttons esp Mass Delete
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  jerrydgeorge
      Type:  defect     |      Status:  new         
  Priority:  blocker    |   Milestone:              
 Component:  vtigercrm  |     Version:  5.0.0       
Resolution:             |    Keywords:              
------------------------+---------------------------------------------------
Changes (by jerrydgeorge):

  * owner:  jeri => jerrydgeorge

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1354>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 27 03:04:05 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 27 Jun 2006 10:04:05 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231354=3A?=
 =?utf-8?q?_Inconsistencies_in_List_View_Buttons_esp_Mass_Delete?=
In-Reply-To: <076.8202f24bc4ecea9fdc79cdca719ea624@vtiger.fosslabs.com>
References: <076.8202f24bc4ecea9fdc79cdca719ea624@vtiger.fosslabs.com>
Message-ID: <085.faf460a62be7e62c4356a555f9d09586@vtiger.fosslabs.com>

#1354: Inconsistencies in List View Buttons esp Mass Delete
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  jerrydgeorge
      Type:  defect     |      Status:  closed      
  Priority:  blocker    |   Milestone:              
 Component:  vtigercrm  |     Version:  5.0.0       
Resolution:  fixed      |    Keywords:              
------------------------+---------------------------------------------------
Changes (by jerrydgeorge):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1354>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 27 03:08:24 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 27 Jun 2006 10:08:24 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231172=3A?=
 =?utf-8?q?_unable_to_store_any_Ajax_edited_value?=
In-Reply-To: <076.626fce50467ea4fac0273a3fb6aad256@vtiger.fosslabs.com>
References: <076.626fce50467ea4fac0273a3fb6aad256@vtiger.fosslabs.com>
Message-ID: <085.759fdaccf8c54f59aff259a6537f04bc@vtiger.fosslabs.com>

#1172: unable to store any Ajax edited value
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  Richie
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by jerrydgeorge):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1172>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 04:02:54 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 11:02:54 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7569 -
	/vtigercrm/trunk/adodb/drivers/adodb-mysql.inc.php
Message-ID: <20060627110254.577B683FE01@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 27 05:02:49 2006
New Revision: 7569

Log:
appened @ to suppress the exception when giving wrong username,password for db connection, fixes #1151

Modified:
    vtigercrm/trunk/adodb/drivers/adodb-mysql.inc.php

Modified: vtigercrm/trunk/adodb/drivers/adodb-mysql.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-mysql.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-mysql.inc.php Tue Jun 27 05:02:49 2006
@@ -351,11 +351,9 @@
 		if (!empty($this->port)) $argHostname .= ":".$this->port;
 		
 		if (ADODB_PHPVER >= 0x4300)
-			$this->_connectionID = mysql_connect($argHostname,$argUsername,$argPassword,
-												$this->forceNewConnect,$this->clientFlags);
+		$this->_connectionID = @mysql_connect($argHostname,$argUsername,$argPassword,$this->forceNewConnect,$this->clientFlags);
 		else if (ADODB_PHPVER >= 0x4200)
-			$this->_connectionID = mysql_connect($argHostname,$argUsername,$argPassword,
-												$this->forceNewConnect);
+			$this->_connectionID = mysql_connect($argHostname,$argUsername,$argPassword,$this->forceNewConnect);
 		else
 			$this->_connectionID = mysql_connect($argHostname,$argUsername,$argPassword);
 	
@@ -776,4 +774,4 @@
 
 
 }
-?>
+?>



From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 27 04:02:53 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 27 Jun 2006 11:02:53 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231151=3A?=
 =?utf-8?q?_Error_message_in_Installer=2E=2E?=
In-Reply-To: <076.5644658cbeac029416aebb3b898c0527@vtiger.fosslabs.com>
References: <076.5644658cbeac029416aebb3b898c0527@vtiger.fosslabs.com>
Message-ID: <085.1f9079b5b9ef5f62d663c21387ce6ef5@vtiger.fosslabs.com>

#1151: Error message in Installer..
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  Richie
      Type:  defect     |      Status:  closed
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 (In [7569]) appened @ to suppress the exception when giving wrong
 username,password for db connection, fixes #1151

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1151>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 04:28:28 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 11:28:28 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7570 - in /vtigercrm/trunk:
 Smarty/templates/EmailDetails.tpl include/utils/DetailViewUtils.php
Message-ID: <20060627112828.9FA3483FD03@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 27 05:28:23 2006
New Revision: 7570

Log:
multiple attachments shown in Emails detailview

Modified:
    vtigercrm/trunk/Smarty/templates/EmailDetails.tpl
    vtigercrm/trunk/include/utils/DetailViewUtils.php

Modified: vtigercrm/trunk/Smarty/templates/EmailDetails.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/EmailDetails.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/EmailDetails.tpl Tue Jun 27 05:28:23 2006
@@ -67,14 +67,15 @@
 {foreach item=row from=$BLOCKS}	
 	{foreach item=elements key=title from=$row}	
 	{if $title eq 'Attachment'}
-	<div id="reportLay" onmouseout="fninvsh('reportLay')" onmouseover="fnvshNrm('reportLay')">
+	<div id="reportLay" style="width:130px;" onmouseout="fninvsh('reportLay')" onmouseover="fnvshNrm('reportLay')">
 		<table width="100%" cellpadding="0" cellspacing="0" border="0" bgcolor="#FFFFFF">
+		{foreach item=attachments from=$elements.options}
 		<tr>
-			<td>
-				{$elements.value}
+			<td style="border-bottom: 1px solid rgb(204, 204, 204); padding: 5px;">
+				{$attachments}
 			</td>
 		</tr>
-		<tr><td style="padding:5px;">&nbsp;</td></tr>
+		{/foreach}
 		</table>
 	</div>
 	{/if}

Modified: vtigercrm/trunk/include/utils/DetailViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/DetailViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/DetailViewUtils.php Tue Jun 27 05:28:23 2006
@@ -346,26 +346,45 @@
 		
 	}
         elseif($uitype == 61)
-        {
-                global $adb;
-
-                $attachmentid=$adb->query_result($adb->query("select * from vtiger_seattachmentsrel where crmid = ".$col_fields['record_id']),0,'attachmentsid');
-		if($col_fields[$fieldname] == '' && $attachmentid != '')
-		{
-				$attachquery = "select * from vtiger_attachments where attachmentsid=".$attachmentid;
-        		        $col_fields[$fieldname] = $adb->query_result($adb->query($attachquery),0,'name');
-		}
-
-		//This is added to strip the crmid and _ from the file name and show the original filename
-		$org_filename = ltrim($col_fields[$fieldname],$col_fields['record_id'].'_');
-		if($org_filename != '')
-        	$custfldval = '<a href = "index.php?module=uploads&action=downloadfile&return_module='.$col_fields['record_module'].'&fileid='.$attachmentid.'&entityid='.$col_fields['record_id'].'">'.$org_filename.'</a>';
-		else
-			$custfldval = '';
-		$label_fld[] =$mod_strings[$fieldlabel];
-
-		$label_fld[] =$custfldval;
-        }
+		{
+			global $adb;
+			$label_fld[] =$mod_strings[$fieldlabel];
+
+			if($tabid ==10)
+			{
+				$attach_result = $adb->query("select * from vtiger_seattachmentsrel where crmid = ".$col_fields['record_id']);
+				for($ii=0;$ii < $adb->num_rows($attach_result);$ii++)
+				{
+					$attachmentid = $adb->query_result($attach_result,0,'attachmentsid');
+					if($attachmentid != '')
+					{
+						$attachquery = "select * from vtiger_attachments where attachmentsid=".$attachmentid;
+						$attachmentsname = $adb->query_result($adb->query($attachquery),0,'name');
+						if($attachmentsname != '')	
+							$custfldval = '<a href = "index.php?module=uploads&action=downloadfile&return_module='.$col_fields['record_module'].'&fileid='.$attachmentid.'&entityid='.$col_fields['record_id'].'">'.$attachmentsname.'</a>';
+						else
+							$custfldval = '';
+					}
+					$label_fld['options'][] = $custfldval;
+				}
+			}else
+			{
+				$attachmentid=$adb->query_result($adb->query("select * from vtiger_seattachmentsrel where crmid = ".$col_fields['record_id']),0,'attachmentsid');
+				if($col_fields[$fieldname] == '' && $attachmentid != '')
+				{
+					$attachquery = "select * from vtiger_attachments where attachmentsid=".$attachmentid;
+					$col_fields[$fieldname] = $adb->query_result($adb->query($attachquery),0,'name');
+				}
+
+				//This is added to strip the crmid and _ from the file name and show the original filename
+				$org_filename = ltrim($col_fields[$fieldname],$col_fields['record_id'].'_');
+				if($org_filename != '')
+					$custfldval = '<a href = "index.php?module=uploads&action=downloadfile&return_module='.$col_fields['record_module'].'&fileid='.$attachmentid.'&entityid='.$col_fields['record_id'].'">'.$org_filename.'</a>';
+				else
+					$custfldval = '';
+			}
+			$label_fld[] =$custfldval;
+		}
 	elseif($uitype == 69)
 	{
 		$label_fld[] =$mod_strings[$fieldlabel];



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 04:38:30 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 11:38:30 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7571 -
	/vtigercrm/trunk/modules/Reports/Reports.php
Message-ID: <20060627113830.CA31983FE00@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 27 05:38:27 2006
New Revision: 7571

Log:
issue in reports has been fixed

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

Modified: vtigercrm/trunk/modules/Reports/Reports.php
==============================================================================
--- vtigercrm/trunk/modules/Reports/Reports.php (original)
+++ vtigercrm/trunk/modules/Reports/Reports.php Tue Jun 27 05:38:27 2006
@@ -21,9 +21,7 @@
 
 global $report_modules;
 global $related_modules;
-global $profileList;
-
-$profileList = getCurrentUserProfileList();
+
 $adv_filter_options = array("e"=>"equals",
 		            "n"=>"not equal to",
 			    "s"=>"starts with",
@@ -301,7 +299,6 @@
 	{
 		global $adb;
 		global $log;
-		global $profileList;
 		global $current_user;
 
 
@@ -317,6 +314,7 @@
 		else
 		{
 			
+			$profileList = getCurrentUserProfileList();
 			$sql = "select * from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.uitype != 50 and vtiger_field.tabid=".$tabid." and vtiger_field.block in (".$block .") and vtiger_field.displaytype in (1,2) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList." group by vtiger_field.fieldid order by sequence";
 		}
 		$result = $adb->query($sql);
@@ -458,7 +456,6 @@
 		global $adb;
 		global $log;
 		global $current_user;
-		global $profileList;
 		require('user_privileges/user_privileges_'.$current_user->id.'.php');		
 
 		$tabid = getTabid($module);
@@ -474,6 +471,8 @@
 		}
 		else
 		{
+
+			$profileList = getCurrentUserProfileList();
 			$sql = "select * from vtiger_field inner join vtiger_tab on vtiger_tab.tabid = vtiger_field.tabid inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid  where vtiger_field.tabid=".$tabid." and (vtiger_field.uitype =5 or vtiger_field.displaytype=2) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_field.block in (".$blockids.") and vtiger_profile2field.profileid in ".$profileList." order by vtiger_field.sequence";
 
 		}
@@ -925,7 +924,6 @@
 		global $adb;
 		global $log;
 		global $current_user;
-		global $profileList;
 		require('user_privileges/user_privileges_'.$current_user->id.'.php');
 		$tabid = getTabid($module);
 		$escapedchars = Array('_SUM','_AVG','_MIN','_MAX');
@@ -935,6 +933,7 @@
 		}
 		else
 		{
+			$profileList = getCurrentUserProfileList();
 			$ssql = "select * from vtiger_field inner join vtiger_tab on vtiger_tab.tabid = vtiger_field.tabid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid  where vtiger_field.uitype != 50 and vtiger_field.tabid=".$tabid." and vtiger_field.displaytype = 1 and vtiger_def_org_field.visible=0 and vtiger_profile2field.visible=0 and vtiger_profile2field.profileid in ".$profileList." order by sequence";
 		}
 		$result = $adb->query($ssql);



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 05:31:54 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 12:31:54 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7572 - in
 /vtigercrm/trunk/modules/Home: index.php language/en_us.lang.php
Message-ID: <20060627123154.4DE6783FE11@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 27 06:31:44 2006
New Revision: 7572

Log:
changes made to integrate home page dashboard

Modified:
    vtigercrm/trunk/modules/Home/index.php
    vtigercrm/trunk/modules/Home/language/en_us.lang.php

Modified: vtigercrm/trunk/modules/Home/index.php
==============================================================================
--- vtigercrm/trunk/modules/Home/index.php (original)
+++ vtigercrm/trunk/modules/Home/index.php Tue Jun 27 06:31:44 2006
@@ -54,7 +54,7 @@
 }
 if( count($home_section_order) < 1 )
 {
-	$home_section_order = array("ALVT","PLVT","QLTQ","CVLVT","HLT","OLV","GRT","OLTSO","ILTI");
+	$home_section_order = array("ALVT","PLVT","QLTQ","CVLVT","HLT","OLV","GRT","OLTSO","ILTI","HDB");
 }
 
 require('user_privileges/user_privileges_'.$current_user->id.'.php');
@@ -136,6 +136,13 @@
 		$home_values['Invoice']=getTopInvoice();
 	}
         	break;
+	case 'HDB':
+	if(isPermitted('Dashboard','index') == "yes")
+	{
+		require_once('modules/Dashboard/HomepageDB.php');
+		$home_values['Dashboard']=getHomepageDB();
+	}
+	        break;
     }
 }
 function getActivityType($id)

Modified: vtigercrm/trunk/modules/Home/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Home/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Home/language/en_us.lang.php Tue Jun 27 06:31:44 2006
@@ -46,6 +46,7 @@
 'LBL_UPCOMING_EVENTS'=>'Upcoming Activities',
 'LBL_PENDING_EVENTS'=>'Pending Activities',
 'LBL_TODAYEVENT'=>'Events for Last Ten days',
+'recordsforuser'=>'Records for',
 
 
 );



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 05:47:14 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 12:47:14 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7573 -
	/vtigercrm/trunk/modules/Dashboard/HomepageDB.php
Message-ID: <20060627124714.AD98B83FDCA@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 27 06:47:10 2006
New Revision: 7573

Log:
file added to integrate home page dashboard

Added:
    vtigercrm/trunk/modules/Dashboard/HomepageDB.php



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 06:08:01 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 13:08:01 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7574 -
	/vtigercrm/trunk/modules/Dashboard/Entity_charts.php
Message-ID: <20060627130802.3201183FE1E@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 27 07:07:57 2006
New Revision: 7574

Log:
changes made to integrate home page dashboard

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 Tue Jun 27 07:07:57 2006
@@ -14,6 +14,9 @@
 require_once('include/utils/utils.php');
 require_once('include/database/PearDatabase.php');
 require_once('include/utils/CommonUtils.php');
+include("modules/Dashboard/horizontal_bargraph.php");
+//include("modules/Dashboard/vertical_bargraph.php");
+include("modules/Dashboard/pie_graph.php");
 
 //To get the vtiger_account names
 
@@ -279,8 +282,10 @@
 					}
 
 					if($graph_for == "accountid") $graph_for = "account_id";
-					
-					$link_val="index.php?module=".$module."&action=index&search_text=".$name."&search_field=".$graph_for."&searchtype=BasicSearch&query=true&type=entchar";
+					if($module == "Home")
+						$link_val="index.php?module=".$name."&action=index";
+					else
+						$link_val="index.php?module=".$module."&action=index&search_text=".$name."&search_field=".$graph_for."&searchtype=BasicSearch&query=true&type=entchar";
 
 					if($graph_for == "account_id") $graph_for = "accountid";
 
@@ -376,4 +381,184 @@
 	return true;
 }
 
+function get_graph_by_type($graph_by,$graph_title,$module,$where,$query)
+{
+	global $user_id,$date_start,$end_date,$type;
+
+	//Giving the Cached image name
+	$cache_file_name=abs(crc32($user_id))."_".$type."_".crc32($date_start.$end_date).".png";
+	$html_imagename=$graph_by; //Html image name for the graph
+
+	$graph_details=module_Chart($user_id,$date_start,$end_date,$query,$graph_by,$graph_title,$where,$module,$type);
+
+	if($graph_details!=0)
+	{
+		$name_val=$graph_details[0];
+		$cnt_val=$graph_details[1];
+		$graph_title=$graph_details[2];
+		$target_val=$graph_details[3];
+		$graph_date=$graph_details[4];
+		$urlstring=$graph_details[5];
+		$cnt_table=$graph_details[6];
+		$test_target_val=$graph_details[7];
+
+
+		$width=600;
+		$height=400;
+		$top=30;
+		$left=140;
+		$bottom=120;
+		$title=$graph_title;
+
+		return get_graph($cache_file_name,$html_imagename,$cnt_val,$name_val,$width,$height,$left,$right,$top,$bottom,$title,$target_val,$graph_date,$urlstring,$test_target_val,$date_start,$end_date);
+	}
+	else
+	{
+		
+	}
+	
+}
+
+/** Returns  the Horizontal,vertical, pie graphs and Accumulated Graphs
+for the details
+* Portions created by vtiger are Copyright (C) vtiger.
+* All Rights Reserved.
+* Contributor(s): ______________________________________..
+*/
+
+
+// Function for get graphs
+function get_graph($cache_file_name,$html_imagename,$cnt_val,$name_val,$width,$height,$left,$right,$top,$bottom,$title,$target_val,$graph_date,$urlstring,$test_target_val,$date_start,$end_date)
+{
+
+	global $tmp_dir;
+	global $graph_title, $mod_strings;
+	$val=explode(":",$title);
+	$display_title=$val[0];
+
+
+$sHTML .= "<tr>
+	   <td><table width=20%  border=0 cellspacing=0 cellpadding=0 align=left>
+	         <tr>
+	    	   <td rowspan=2 valign=top><span class=dashSerial>1</span></td>
+	           <td nowrap><span class=genHeaderSmall>".$graph_title."</span></td>
+		 </tr>
+		 <tr>
+		   <td nowrap><span class=big>".$mod_strings['LBL_HORZ_BAR_CHART']."</span> </td>
+		 </tr>
+		</table>
+	   </td>
+	</tr>
+	<tr>
+           <td height=200>";
+
+	   $sHTML .= render_graph($tmp_dir."hor_".$cache_file_name,$html_imagename."_hor",$cnt_val,$name_val,$width,$height,$left,$right,$top,$bottom,$title,$target_val,"horizontal");
+//Commented by Minnie -- same content displayed in to graphs
+/*$sHTML .= "</td>
+	</tr>
+	<tr>
+	   <td><hr noshade='noshade' size='1' /></td>
+	</tr>";
+
+$sHTML .= "<tr>
+	   <td><table width=20%  border=0 cellspacing=0 cellpadding=0 align=left>
+	   	 <tr>
+		   <td rowspan=2 valign=top><span class=dashSerial>2</span></td>
+		   <td nowrap><span class=genHeaderSmall>".$graph_title."</span></td>
+		 </tr>
+		 <tr>
+		   <td><span class=big>Vertical Bar Chart</span> </td>
+		 </tr>
+	        </table>
+	   </td>
+	</tr>
+	<tr>
+	   <td height=200>";
+
+	   $sHTML .= render_graph($tmp_dir."vert_".$cache_file_name,$html_imagename."_vert",$cnt_val,$name_val,$width,$height,$left,$right,$top,$bottom,$title,$target_val,"vertical");*/
+
+$sHTML .= "</td>
+	</tr>
+	<tr>
+	   <td><hr noshade='noshade' size='1' /></td>
+	</tr>";
+
+$sHTML .= "<tr>
+	   <td><table width=20%  border=0 cellspacing=0 cellpadding=0 align=left>
+           	 <tr>
+	           <td rowspan=2 valign=top><span class=dashSerial>2</span></td>
+	           <td nowrap><span class=genHeaderSmall>".$graph_title."</span></td>
+	         </tr>
+	         <tr>
+	           <td><span class=big>".$mod_strings['LBL_PIE_CHART']."</span> </td>
+	         </tr>
+	        </table>
+	   </td>
+	</tr>
+	<tr>
+	   <td height=200>";
+
+	   $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 .= "</td>
+	</tr>
+	<tr>
+	   <td><hr noshade='noshade' size='1' /></td>
+	</tr>";
+
+	return $sHTML;
+}
+
+/** Returns graph, if the cached image is present it'll display that image,
+otherwise it will render the graph with the given details
+* Portions created by vtiger are Copyright (C) vtiger.
+* All Rights Reserved.
+* Contributor(s): ______________________________________..
+*/
+
+// Function to get the chached image if exists
+function render_graph($cache_file_name,$html_imagename,$cnt_val,$name_val,$width,$height,$left,$right,$top,$bottom,$title,$target_val,$graph_type)
+{
+
+	//Checks whether the cached image is present or not
+	if(file_exists($cache_file_name))
+	{
+		unlink($cache_file_name);
+	}
+	if(file_exists($cache_file_name.'.map'))
+	{
+		unlink($cache_file_name.'.map');
+	}
+	if (!file_exists($cache_file_name) || !file_exists($cache_file_name.'.map'))
+	{
+		//If the Cached image is not present
+		if($graph_type=="horizontal")
+		{
+			return horizontal_graph($cnt_val,$name_val,$width,$height,$left,$right,$top,$bottom,$title,$target_val,$cache_file_name,$html_imagename);
+		}
+		else if($graph_type=="vertical")
+		{
+			return vertical_graph($cnt_val,$name_val,$width,$height,$left,$right,$top,$bottom,$title,$target_val,$cache_file_name,$html_imagename);
+		}
+		else if($graph_type=="pie")
+		{
+			return pie_chart($cnt_val,$name_val,$width,$height,$left,$right,$top,$bottom,$title,$target_val,$cache_file_name,$html_imagename);
+
+		}
+	}
+	else
+	{
+		//Getting the cached image
+		$imgMap_fp = fopen($cache_file_name.'.map', "rb");
+		$imgMap = fread($imgMap_fp, vtiger_filesize($cache_file_name.'.map'));
+		fclose($imgMap_fp);
+		$base_name_cache_file=basename($cache_file_name);
+		$ccc="cache/images/".$base_name_cache_file;
+		$return = "\n$imgMap\n";
+		$return .= "<img src=$ccc ismap usemap=#$html_imagename border='0'>";
+		return $return;
+	}
+}
+
+
 ?>



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 06:10:24 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 13:10:24 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7575 -
 /vtigercrm/trunk/modules/Dashboard/display_charts.php
Message-ID: <20060627131024.DDDB983FE21@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 27 07:10:21 2006
New Revision: 7575

Log:
changes made to integrate home page dashboard

Modified:
    vtigercrm/trunk/modules/Dashboard/display_charts.php

Modified: vtigercrm/trunk/modules/Dashboard/display_charts.php
==============================================================================
--- vtigercrm/trunk/modules/Dashboard/display_charts.php (original)
+++ vtigercrm/trunk/modules/Dashboard/display_charts.php Tue Jun 27 07:10:21 2006
@@ -11,10 +11,7 @@
  ********************************************************************************/
 
 
-	include("modules/Dashboard/Entity_charts.php");
-        include("modules/Dashboard/horizontal_bargraph.php");
-        //include("modules/Dashboard/vertical_bargraph.php");
-        include("modules/Dashboard/pie_graph.php");
+	require_once("modules/Dashboard/Entity_charts.php");
 	
 global $tmp_dir;
 global $mod_strings,$app_strings;
@@ -111,184 +108,7 @@
 	  "ticketsbyaccount"=> $mod_strings['ticketsbyaccount'],
 	  "ticketsbycontact"=> $mod_strings['ticketsbycontact'],
           );
-function get_graph_by_type($graph_by,$graph_title,$module,$where,$query)
-{
-	global $user_id,$date_start,$end_date,$type;
-
-	//Giving the Cached image name	
-	$cache_file_name=abs(crc32($user_id))."_".$type."_".crc32($date_start.$end_date).".png";
-        $html_imagename=$graph_by; //Html image name for the graph
-
-        $graph_details=module_Chart($user_id,$date_start,$end_date,$query,$graph_by,$graph_title,$where,$module,$type);
-
-        if($graph_details!=0)
-        {
-                $name_val=$graph_details[0];
-                $cnt_val=$graph_details[1];
-                $graph_title=$graph_details[2];
-                $target_val=$graph_details[3];
-                $graph_date=$graph_details[4];
-                $urlstring=$graph_details[5];
-                $cnt_table=$graph_details[6];
-	       	$test_target_val=$graph_details[7];
-
-
-                $width=600;
-                $height=400;
-                $top=30;
-                $left=140;
-                $bottom=120;
-                $title=$graph_title;
-
-                return get_graph($cache_file_name,$html_imagename,$cnt_val,$name_val,$width,$height,$left,$right,$top,$bottom,$title,$target_val,$graph_date,$urlstring,$test_target_val,$date_start,$end_date);
-        }
-	else
-	{
-	
-	}
- 
-}
-
-/** Returns  the Horizontal,vertical, pie graphs and Accumulated Graphs 
-for the details
-* Portions created by vtiger are Copyright (C) vtiger.
-* All Rights Reserved.
-* Contributor(s): ______________________________________..
-*/
-
-
-// Function for get graphs
-function get_graph($cache_file_name,$html_imagename,$cnt_val,$name_val,$width,$height,$left,$right,$top,$bottom,$title,$target_val,$graph_date,$urlstring,$test_target_val,$date_start,$end_date)
-{
-
-	global $tmp_dir;
-     global $graph_title, $mod_strings;
-	$val=explode(":",$title); 		
-	$display_title=$val[0];	
-			
-	
-$sHTML .= "<tr>
-	   <td><table width=20%  border=0 cellspacing=0 cellpadding=0 align=left>
-	  	 <tr>
-		   <td rowspan=2 valign=top><span class=dashSerial>1</span></td>
- 		   <td nowrap><span class=genHeaderSmall>".$graph_title."</span></td>
- 		 </tr>
-   		 <tr>
-		   <td nowrap><span class=big>".$mod_strings['LBL_HORZ_BAR_CHART']."</span> </td>
-		 </tr>
-		</table>
-  	   </td>
-	</tr>
-	<tr>
-	   <td height=200>"; 
-
-	   $sHTML .= render_graph($tmp_dir."hor_".$cache_file_name,$html_imagename."_hor",$cnt_val,$name_val,$width,$height,$left,$right,$top,$bottom,$title,$target_val,"horizontal");
-//Commented by Minnie -- same content displayed in to graphs
-/*$sHTML .= "</td>
-	</tr>
-	<tr>
-	   <td><hr noshade='noshade' size='1' /></td>
-	</tr>";
-	
-$sHTML .= "<tr>
-	   <td><table width=20%  border=0 cellspacing=0 cellpadding=0 align=left>
-	  	 <tr>
-		   <td rowspan=2 valign=top><span class=dashSerial>2</span></td>
- 		   <td nowrap><span class=genHeaderSmall>".$graph_title."</span></td>
- 		 </tr>
-   		 <tr>
-		   <td><span class=big>Vertical Bar Chart</span> </td>
-		 </tr>
-		</table>
-  	   </td>
-	</tr>
-	<tr>
-	   <td height=200>"; 
-
-	   $sHTML .= render_graph($tmp_dir."vert_".$cache_file_name,$html_imagename."_vert",$cnt_val,$name_val,$width,$height,$left,$right,$top,$bottom,$title,$target_val,"vertical");*/
-
-$sHTML .= "</td>
-	</tr>
-	<tr>
-	   <td><hr noshade='noshade' size='1' /></td>
-	</tr>";
-
-$sHTML .= "<tr>
-	   <td><table width=20%  border=0 cellspacing=0 cellpadding=0 align=left>
-	  	 <tr>
-		   <td rowspan=2 valign=top><span class=dashSerial>2</span></td>
- 		   <td nowrap><span class=genHeaderSmall>".$graph_title."</span></td>
- 		 </tr>
-   		 <tr>
-		   <td><span class=big>".$mod_strings['LBL_PIE_CHART']."</span> </td>
-		 </tr>
-		</table>
-  	   </td>
-	</tr>
-	<tr>
-	   <td height=200>"; 
-
-	   $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 .= "</td>
-	</tr>
-	<tr>
-	   <td><hr noshade='noshade' size='1' /></td>
-	</tr>";
-
-	return $sHTML;
-}
-
-/** Returns graph, if the cached image is present it'll display that image,
-otherwise it will render the graph with the given details	
-* Portions created by vtiger are Copyright (C) vtiger.
-* All Rights Reserved.
-* Contributor(s): ______________________________________..
-*/
-
-// Function to get the chached image if exists
-function render_graph($cache_file_name,$html_imagename,$cnt_val,$name_val,$width,$height,$left,$right,$top,$bottom,$title,$target_val,$graph_type)
-{
-
-	//Checks whether the cached image is present or not
-	if(file_exists($cahce_file_name))
-	{
-		unlink($cache_file_name);
-	}
-	if(file_exists($cache_file_name.'.map'))
-	{
-		unlink($cache_file_name.'.map');
-	}	
-	if (!file_exists($cache_file_name) || !file_exists($cache_file_name.'.map')) 
-	{
-		//If the Cached image is not present
-		if($graph_type=="horizontal")
-		{
-		 	return horizontal_graph($cnt_val,$name_val,$width,$height,$left,$right,$top,$bottom,$title,$target_val,$cache_file_name,$html_imagename);
-		}
-		else if($graph_type=="vertical")	
-		{
-			return vertical_graph($cnt_val,$name_val,$width,$height,$left,$right,$top,$bottom,$title,$target_val,$cache_file_name,$html_imagename);
-		}
-		else if($graph_type=="pie")
-		{
-			return pie_chart($cnt_val,$name_val,$width,$height,$left,$right,$top,$bottom,$title,$target_val,$cache_file_name,$html_imagename);
-			
-		}
-	}
-	else
-	{
-		//Getting the cached image
-		$imgMap_fp = fopen($cache_file_name.'.map', "rb");
-		$imgMap = fread($imgMap_fp, vtiger_filesize($cache_file_name.'.map'));
-		fclose($imgMap_fp);
-		$base_name_cache_file=basename($cache_file_name);
-		$ccc="cache/images/".$base_name_cache_file;
-		$return = "\n$imgMap\n";
-		$return .= "<img src=$ccc ismap usemap=#$html_imagename border='0'>";
-		return $return;
-	}
-}
+
 
 ?>
 



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 06:12:59 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 13:12:59 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7576 -
	/vtigercrm/trunk/modules/Potentials/Charts.php
Message-ID: <20060627131259.74D942990E0@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 27 07:12:55 2006
New Revision: 7576

Log:
vtiger_ uppended in query

Modified:
    vtigercrm/trunk/modules/Potentials/Charts.php

Modified: vtigercrm/trunk/modules/Potentials/Charts.php
==============================================================================
--- vtigercrm/trunk/modules/Potentials/Charts.php (original)
+++ vtigercrm/trunk/modules/Potentials/Charts.php Tue Jun 27 07:12:55 2006
@@ -96,7 +96,7 @@
 			foreach ($user_id as $the_id) {
 				if (!$first) $where .= "OR ";
 				$first = false;
-				$where .= "crmentity.smcreatorid='$the_id' ";
+				$where .= "vtiger_crmentity.smcreatorid='$the_id' ";
 			}
 			$where .= ") ";
 
@@ -428,7 +428,7 @@
 				foreach ($user_id as $the_id) {
 					if (!$first) $where .= "OR ";
 					$first = false;
-					$where .= "crmentity.smcreatorid='$the_id' ";
+					$where .= "vtiger_crmentity.smcreatorid='$the_id' ";
 				}
 				$where .= ") ";
 			}
@@ -765,7 +765,7 @@
 					//reference post
 					//if I change the owner of a opportunity, the graph shown on Home does not update correctly, this is because the graph is looking for the creatorid and not for the ownerid
 					//fix incorporated based on /sak's feedback
-					$where .= "crmentity.smownerid='$the_id' ";
+					$where .= "vtiger_crmentity.smownerid='$the_id' ";
 				}
 				$where .= ") ";
 			}
@@ -1050,7 +1050,7 @@
 				foreach ($user_id as $the_id) {
 					if (!$first) $where .= "OR ";
 					$first = false;
-					$where .= "crmentity.smcreatorid='$the_id' ";
+					$where .= "vtiger_crmentity.smcreatorid='$the_id' ";
 				}
 				$where .= ") ";
 			}



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 06:20:15 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 13:20:15 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7577 -
	/vtigercrm/trunk/Smarty/templates/HomePage.tpl
Message-ID: <20060627132015.90B645E3879@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 27 07:20:12 2006
New Revision: 7577

Log:
changes made to integrate home page dashboard

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 Tue Jun 27 07:20:12 2006
@@ -146,6 +146,7 @@
 
 	<div id="MainMatrix">
 				{foreach key=modulename item=tabledetail from=$HOMEDETAILS}
+				{if $modulename neq 'Dashboard'}
 				{if $tabledetail neq ''}
 				
 					<div class="MatrixLayer" style="float:left;" id="{$tabledetail.Title.2}">
@@ -164,6 +165,7 @@
 		{else}	
 		<td colspan="2"><img src="{$IMAGE_PATH}bookMark.gif" align="absmiddle" /> {$elements.1}</td>
 		{/if}
+
            </tr>
 {/foreach}
 	<tr><td colspan="2" align="right" valign="bottom"><a href="index.php?module={$modulename}&action=index">{$APP.LBL_MORE}..</a></td></tr>
@@ -171,6 +173,14 @@
 				
 			</div>
 			{/if}	
+		{else}
+                        <div class="MatrixLayer" style="float:left;width:63%;" id="homepagedb">
+                        <table width="100%" height="100%" border="0" cellpadding="5" cellspacing="0" class="small">
+                          <tr><td>
+                                {$tabledetail}
+                          </td></tr>
+                        </table>
+                {/if}
 {/foreach}
 </div>
 </td>



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 06:46:58 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 13:46:58 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7578 - in /vtigercrm/trunk:
 Smarty/templates/ComposeEmail.tpl include/utils/EditViewUtils.php
 modules/Contacts/DelImage.php
Message-ID: <20060627134658.8671F7FDA78@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 27 07:46:51 2006
New Revision: 7578

Log:
Attachment delete has been added to email modules

Modified:
    vtigercrm/trunk/Smarty/templates/ComposeEmail.tpl
    vtigercrm/trunk/include/utils/EditViewUtils.php
    vtigercrm/trunk/modules/Contacts/DelImage.php

Modified: vtigercrm/trunk/Smarty/templates/ComposeEmail.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ComposeEmail.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ComposeEmail.tpl Tue Jun 27 07:46:51 2006
@@ -20,6 +20,7 @@
 <link REL="SHORTCUT ICON" HREF="include/images/vtigercrm_icon.ico">	
 <style type="text/css">@import url("themes/{$THEME}/style.css");</style>
 <script language="javascript" type="text/javascript" src="include/scriptaculous/prototype.js"></script>
+<script src="include/scriptaculous/scriptaculous.js" type="text/javascript"></script>
 <script type="text/javascript" src="include/fckeditor/fckeditor.js"></script>
 </head>
 <body marginheight="0" marginwidth="0" topmargin="0" bottommargin="0" leftmargin="0" rightmargin="0">
@@ -77,14 +78,13 @@
 	<td class="dvtCellLabel" style="padding: 5px;">
 		<input name="ccmail" class="txtBox" type="text" value="{$CC_MAIL}" style="width:99%">&nbsp;
 	</td>	
-	<td class="dvtCellLabel">&nbsp;</td>
+	<td valign="top" class="dvtCellLabel" rowspan="4"><div id="attach_cont" class="addEventInnerBox" style="overflow:auto;height:110px;width:100%;position:relative;left:0px;top:0px;"></div>
    </tr>
    <tr>
 	<td class="lvtCol" style="padding: 5px;" align="right">{$MOD.LBL_BCC}</td>
 	<td class="dvtCellLabel" style="padding: 5px;">
 		<input name="bccmail" class="txtBox" type="text" value="{$BCC_MAIL}" style="width:99%">&nbsp;
 	</td>
-	<td class="dvtCellLabel">&nbsp;</td>
    </tr>
 	{elseif $elements.2.0 eq 'subject'}
    <tr>
@@ -94,17 +94,22 @@
         {else}
                 <td class="dvtCellLabel" style="padding: 5px;"><input type="text" class="txtBox" name="{$elements.2.0}" value="{$elements.3.0}" id="{$elements.2.0}" style="width:99%"></td>
         {/if}
-	<td class="dvtCellLabel">&nbsp;</td>
    </tr>
 	{elseif $elements.2.0 eq 'filename'}
 
    <tr>
 	<td class="lvtCol" style="padding: 5px;" align="right" nowrap>{$elements.1.0}  :</td>
 	<td class="dvtCellLabel" style="padding: 5px;">
-		<input name="{$elements.2.0}"  type="file" class="small" value="{$elements.3.1}" size="78"/>
-		<input type="hidden" name="id" value=""/>{$elements.3.0}
-	</td>
-	<td class="dvtCellLabel">&nbsp;</td>
+		<input name="{$elements.2.0}"  type="file" class="small" value="" size="78"/>
+		<div id="attach_temp_cont" style="display:none;">
+		<table class="small" width="100% ">
+		{foreach item="attach_files" key="attach_id" from=$elements.3}	
+			<tr id="row_{$attach_id}"><td width="90%">{$attach_files}</td><td><img src="{$IMAGE_PATH}no.gif" onClick="delAttachments({$attach_id})" alt="{$APP.LBL_DELETE_BUTTON}" title="{$APP.LBL_DELETE_BUTTON}" style="cursor:pointer;"></td></tr>	
+		{/foreach}	
+		</table>	
+		</div>	
+		{$elements.3.0}
+	</td>
    </tr>
 	{elseif $elements.2.0 eq 'description'}
    <tr>
@@ -182,7 +187,22 @@
                 }
         );
 }
-
+$('attach_cont').innerHTML = $('attach_temp_cont').innerHTML;
+function delAttachments(id)
+{
+    new Ajax.Request(
+        'index.php',
+        {queue: {position: 'end', scope: 'command'},
+            method: 'post',
+            postBody: 'module=Contacts&action=ContactsAjax&file=DelImage&attachmodule=Emails&recordid='+id,
+            onComplete: function(response)
+            {
+		Effect.Fade('row_'+id);	                
+            }
+        }
+    );
+
+}
 </script>
 <script type="text/javascript" defer="1">
 var oFCKeditor = null;

Modified: vtigercrm/trunk/include/utils/EditViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/EditViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/EditViewUtils.php Tue Jun 27 07:46:51 2006
@@ -511,20 +511,38 @@
 		{
 			$assigned_user_id = $current_user->id;
 		}
-		if($col_fields['record_id'] != '')
-		{
-			$attachmentid=$adb->query_result($adb->query("select * from vtiger_seattachmentsrel where crmid = ".$col_fields['record_id']),0,'attachmentsid');
-			if($col_fields[$fieldname] == '' && $attachmentid != '')
-			{
-				$attachquery = "select * from vtiger_attachments where attachmentsid=".$attachmentid;
-				$value = $adb->query_result($adb->query($attachquery),0,'name');
-			}
-		}
-		if($value!='')
-			$filename=' [ '.$value. ' ]';
-		$editview_label[]=$mod_strings[$fieldlabel];
-		$fieldvalue[] = $filename;
-		$fieldvalue[] = $value;
+		if($module_name == 'Emails')
+		{
+			$attach_result = $adb->query("select * from vtiger_seattachmentsrel where crmid = ".$col_fields['record_id']);
+			for($ii=0;$ii < $adb->num_rows($attach_result);$ii++)
+			{
+				$attachmentid = $adb->query_result($attach_result,$ii,'attachmentsid');
+				if($attachmentid != '')
+				{
+					$attachquery = "select * from vtiger_attachments where attachmentsid=".$attachmentid;
+					$attachmentsname = $adb->query_result($adb->query($attachquery),0,'name');
+					if($attachmentsname != '')	
+						$fieldvalue[$attachmentid] = '[ '.$attachmentsname.' ]';
+				}
+
+			}
+		}else
+		{
+			if($col_fields['record_id'] != '')
+			{
+				$attachmentid=$adb->query_result($adb->query("select * from vtiger_seattachmentsrel where crmid = ".$col_fields['record_id']),0,'attachmentsid');
+				if($col_fields[$fieldname] == '' && $attachmentid != '')
+				{
+					$attachquery = "select * from vtiger_attachments where attachmentsid=".$attachmentid;
+					$value = $adb->query_result($adb->query($attachquery),0,'name');
+				}
+			}
+			if($value!='')
+				$filename=' [ '.$value. ' ]';
+			$fieldvalue[] = $filename;
+			$fieldvalue[] = $value;
+		}
+		$editview_label[]=$mod_strings[$fieldlabel];
 	}
 	elseif($uitype == 69)
 	{

Modified: vtigercrm/trunk/modules/Contacts/DelImage.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/DelImage.php (original)
+++ vtigercrm/trunk/modules/Contacts/DelImage.php Tue Jun 27 07:46:51 2006
@@ -1,32 +1,43 @@
 <?php
-
-	function DelImage($id)
-	{
-		global $adb;
-		$query="delete from vtiger_attachments where attachmentsid=(select attachmentsid from seattachmentsrel where crmid=".$id.")";
-		$adb->query($query);
-
-		$query="delete from vtiger_seattachmentsrel where crmid=".$id;
-		$adb->query($query);
-	}
-
-$id = $_REQUEST["recordid"];
-
-DelImage($id);
-echo '';
+/*********************************************************************************
+** The contents of this file are subject to the vtiger CRM Public License Version 1.0
+ * ("License"); You may not use this file except in compliance with the License
+ * The Original Code is:  vtiger CRM Open Source
+ * The Initial Developer of the Original Code is vtiger.
+ * Portions created by vtiger are Copyright (C) vtiger.
+ * All Rights Reserved.
+ *
+ ********************************************************************************/
 
 
 
+function DelImage($id)
+{
+	global $adb;
+	$query="delete from vtiger_attachments where attachmentsid=(select attachmentsid from vtiger_seattachmentsrel where crmid=".$id.")";
+	$adb->query($query);
 
+	$query="delete from vtiger_seattachmentsrel where crmid=".$id;
+	$adb->query($query);
+}
 
+function DelAttachment($id)
+{
+	global $adb;
+	$query="delete from vtiger_seattachmentsrel where attachmentsid=".$id;
+	$adb->query($query);
+	$query="delete from vtiger_attachments where attachmentsid=".$id.")";
+	$adb->query($query);
 
-
-
-
-
-
-
-
-
-
+}
+$id = $_REQUEST["recordid"];
+if(isset($_REQUEST["attachmodule"]) && $_REQUEST["attachmodule"]=='Emails')
+{
+	DelAttachment($id);
+}
+else
+{
+	DelImage($id);
+}
+echo 'SUCESS';
 ?>



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 06:52:49 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 13:52:49 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7579 -
	/vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl
Message-ID: <20060627135249.26B8083871D@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 27 07:52:45 2006
New Revision: 7579

Log:
issue in assigntype name has been changed

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

Modified: vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl Tue Jun 27 07:52:45 2006
@@ -189,7 +189,7 @@
                     <div id="editarea_{$label}" style="display:none;">
                    	<input type="hidden" id="hdtxt_{$label}" value="{$keyval}"></input>
 					{if $keyoptions.0 eq 'User'}
-						<input name="aSsigntype" id="assigntype" checked="checked" value="U" onclick="toggleAssignType(this.value),setSelectValue('{$label}');" type="radio">&nbsp;{$APP.LBL_USER}
+						<input name="assigntype" id="assigntype" checked="checked" value="U" onclick="toggleAssignType(this.value),setSelectValue('{$label}');" type="radio">&nbsp;{$APP.LBL_USER}
 						{if $keyoptions.2 neq ''}
 							<input name="assigntype" id="assigntype" value="T" onclick="toggleAssignType(this.value),setSelectValue('{$label}');" type="radio">&nbsp;{$APP.LBL_GROUP_NAME}
 						{/if}



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 07:08:23 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 14:08:23 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7580 - in /vtigercrm/trunk:
 Smarty/templates/ReportRunContents.tpl include/language/en_us.lang.php
Message-ID: <20060627140823.8788883F6D1@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 27 08:08:17 2006
New Revision: 7580

Log:
language strings added for displaying Total records

Modified:
    vtigercrm/trunk/Smarty/templates/ReportRunContents.tpl
    vtigercrm/trunk/include/language/en_us.lang.php

Modified: vtigercrm/trunk/Smarty/templates/ReportRunContents.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ReportRunContents.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ReportRunContents.tpl Tue Jun 27 08:08:17 2006
@@ -29,7 +29,7 @@
 		<span class="genHeaderGray">{$REPORTNAME}</span><br>
 		</td>
 		<td align="right" width="25%">
-		<span class="genHeaderGray">Total : {$REPORTHTML.1}  Records</span>
+		<span class="genHeaderGray">{$APP.LBL_TOTAL} : {$REPORTHTML.1}  {$APP.LBL_RECORDS}</span>
 		</td>
 		</tr>
 		<tr><td id="report_info" align="left" colspan="2">&nbsp;</td></tr>

Modified: vtigercrm/trunk/include/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/include/language/en_us.lang.php (original)
+++ vtigercrm/trunk/include/language/en_us.lang.php Tue Jun 27 08:08:17 2006
@@ -939,6 +939,7 @@
 'LBL_PLEASE_CLICK'=>'Please Click',
 'LBL_TO_CONFIGURE'=>'to Configure',
 'LBL_HERE'=>'here',
+'LBL_RECORDS'=>'Records',
 );
 
 



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 07:37:03 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 14:37:03 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7581 -
	/vtigercrm/trunk/include/utils/DetailViewUtils.php
Message-ID: <20060627143703.552BB7FDA84@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 27 08:37:00 2006
New Revision: 7581

Log:
issue in Emails detailview attachments has been fixed

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

Modified: vtigercrm/trunk/include/utils/DetailViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/DetailViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/DetailViewUtils.php Tue Jun 27 08:37:00 2006
@@ -355,7 +355,7 @@
 				$attach_result = $adb->query("select * from vtiger_seattachmentsrel where crmid = ".$col_fields['record_id']);
 				for($ii=0;$ii < $adb->num_rows($attach_result);$ii++)
 				{
-					$attachmentid = $adb->query_result($attach_result,0,'attachmentsid');
+					$attachmentid = $adb->query_result($attach_result,$ii,'attachmentsid');
 					if($attachmentid != '')
 					{
 						$attachquery = "select * from vtiger_attachments where attachmentsid=".$attachmentid;



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 07:41:11 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 14:41:11 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7582 -
	/vtigercrm/trunk/modules/Contacts/DelImage.php
Message-ID: <20060627144111.6E92A7D802A@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 27 08:41:07 2006
New Revision: 7582

Log:
delete email attachments from hard disk

Modified:
    vtigercrm/trunk/modules/Contacts/DelImage.php

Modified: vtigercrm/trunk/modules/Contacts/DelImage.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/DelImage.php (original)
+++ vtigercrm/trunk/modules/Contacts/DelImage.php Tue Jun 27 08:41:07 2006
@@ -13,6 +13,7 @@
 
 function DelImage($id)
 {
+		
 	global $adb;
 	$query="delete from vtiger_attachments where attachmentsid=(select attachmentsid from vtiger_seattachmentsrel where crmid=".$id.")";
 	$adb->query($query);
@@ -24,6 +25,8 @@
 function DelAttachment($id)
 {
 	global $adb;
+	$selresult = $adb->query("select name,path from vtiger_attachments where attachmentsid=$id");
+	unlink($adb->query_result($selresult,0,'path').$id."_".$adb->query_result($selresult,0,'name'));
 	$query="delete from vtiger_seattachmentsrel where attachmentsid=".$id;
 	$adb->query($query);
 	$query="delete from vtiger_attachments where attachmentsid=".$id.")";



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 07:48:02 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 14:48:02 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7583 -
	/vtigercrm/trunk/modules/Invoice/CreatePDF.php
Message-ID: <20060627144802.020C27D802A@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 27 08:47:59 2006
New Revision: 7583

Log:
fixed query for pdf generation

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

Modified: vtigercrm/trunk/modules/Invoice/CreatePDF.php
==============================================================================
--- vtigercrm/trunk/modules/Invoice/CreatePDF.php (original)
+++ vtigercrm/trunk/modules/Invoice/CreatePDF.php Tue Jun 27 08:47:59 2006
@@ -85,7 +85,7 @@
 $price_total = $currency_symbol.number_format(StripLastZero($focus->column_fields["hdnGrandTotal"]),2,'.',',');
 
 //getting the Product Data
-$query="select vtiger_products.productname,vtiger_products.unit_price,vtiger_products.product_description,vtiger_invoiceproductrel.* from vtiger_invoiceproductrel inner join vtiger_products on vtiger_products.productid=vtiger_invoiceproductrel.productid where vtiger_invoiceid=".$id;
+$query="select vtiger_products.productname,vtiger_products.unit_price,vtiger_products.product_description,vtiger_invoiceproductrel.* from vtiger_invoiceproductrel inner join vtiger_products on vtiger_products.productid=vtiger_invoiceproductrel.productid where invoiceid=".$id;
 
 global $result;
 $result = $adb->query($query);



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 07:48:37 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 14:48:37 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7584 -
	/vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php
Message-ID: <20060627144837.CD4FB7D802A@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 27 08:48:34 2006
New Revision: 7584

Log:
fixed query for pdf generation

Modified:
    vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php

Modified: vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php
==============================================================================
--- vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php (original)
+++ vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php Tue Jun 27 08:48:34 2006
@@ -82,7 +82,7 @@
 $price_total = $currency_symbol.number_format(StripLastZero($focus->column_fields["hdnGrandTotal"]),2,'.',',');
 
 //getting the Product Data
-$query="select vtiger_products.productname,vtiger_products.unit_price,vtiger_products.product_description,vtiger_poproductrel.* from vtiger_poproductrel inner join vtiger_products on vtiger_products.productid=vtiger_poproductrel.productid where vtiger_purchaseorderid=".$id;
+$query="select vtiger_products.productname,vtiger_products.unit_price,vtiger_products.product_description,vtiger_poproductrel.* from vtiger_poproductrel inner join vtiger_products on vtiger_products.productid=vtiger_poproductrel.productid where purchaseorderid=".$id;
 
 global $result;
 $result = $adb->query($query);



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 07:49:55 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 14:49:55 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7585 -
	/vtigercrm/trunk/modules/SalesOrder/CreateSOPDF.php
Message-ID: <20060627144955.E83827D802A@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 27 08:49:52 2006
New Revision: 7585

Log:
fixed query for pdf generation

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

Modified: vtigercrm/trunk/modules/SalesOrder/CreateSOPDF.php
==============================================================================
--- vtigercrm/trunk/modules/SalesOrder/CreateSOPDF.php (original)
+++ vtigercrm/trunk/modules/SalesOrder/CreateSOPDF.php Tue Jun 27 08:49:52 2006
@@ -85,7 +85,7 @@
 $price_total = $currency_symbol.number_format(StripLastZero($focus->column_fields["hdnGrandTotal"]),2,'.',',');
 
 //getting the Product Data
-$query="select vtiger_products.productname,vtiger_products.unit_price,vtiger_products.product_description,vtiger_soproductrel.* from vtiger_soproductrel inner join vtiger_products on vtiger_products.productid=vtiger_soproductrel.productid where vtiger_salesorderid=".$id;
+$query="select vtiger_products.productname,vtiger_products.unit_price,vtiger_products.product_description,vtiger_soproductrel.* from vtiger_soproductrel inner join vtiger_products on vtiger_products.productid=vtiger_soproductrel.productid where salesorderid=".$id;
 
 global $result;
 $result = $adb->query($query);



From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 27 08:18:23 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 27 Jun 2006 15:18:23 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231151=3A?=
 =?utf-8?q?_Error_message_in_Installer=2E=2E?=
In-Reply-To: <076.5644658cbeac029416aebb3b898c0527@vtiger.fosslabs.com>
References: <076.5644658cbeac029416aebb3b898c0527@vtiger.fosslabs.com>
Message-ID: <085.78a52b469b3071a089d48024dff45839@vtiger.fosslabs.com>

#1151: Error message in Installer..
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  Richie  
      Type:  defect     |      Status:  reopened
  Priority:  critical   |   Milestone:          
 Component:  vtigercrm  |     Version:  5.0.0   
Resolution:             |    Keywords:          
------------------------+---------------------------------------------------
Changes (by jeffk):

  * resolution:  fixed =>
  * status:  closed => reopened

Comment:

 Why wouldn't vtigercrm's installer catch an exception that indicates an
 incorrect password, and handle the readable error message in the catch
 block?

 Please reconsider whether patching the adodb source to suppress a
 legitimate error condition is what we want to do here.

 Any patch to adodb or any of the other snapshotted libraries will prevent
 distros from managing them as external dependencies.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1151>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 27 08:28:45 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 27 Jun 2006 15:28:45 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23512=3A_?=
 =?utf-8?q?UI_issue_in_Organisation_Sharing_Privileges?=
In-Reply-To: <076.94fe2310a682ae79f7fc33244bb4f97f@vtiger.fosslabs.com>
References: <076.94fe2310a682ae79f7fc33244bb4f97f@vtiger.fosslabs.com>
Message-ID: <085.5a441c86777380a0586a16b3931aedbb@vtiger.fosslabs.com>

#512: UI issue in Organisation Sharing Privileges
---------------------------+------------------------------------------------
  Reporter:  jerrydgeorge  |       Owner:  jerrydgeorge
      Type:  defect        |      Status:  new         
  Priority:  major         |   Milestone:              
 Component:  vtigercrm     |     Version:  5.0.0       
Resolution:                |    Keywords:  UI          
---------------------------+------------------------------------------------
Changes (by jerrydgeorge):

  * owner:  Richie => jerrydgeorge

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/512>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 08:29:49 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 15:29:49 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7586 - in /vtigercrm/trunk:
 Smarty/templates/OrgSharingDetailView.tpl
 modules/Users/CreateSharingRule.php
Message-ID: <20060627152949.7782583871D@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 27 09:29:44 2006
New Revision: 7586

Log:
rule constructed during Edit mode

Modified:
    vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl
    vtigercrm/trunk/modules/Users/CreateSharingRule.php

Modified: vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl Tue Jun 27 09:29:44 2006
@@ -185,21 +185,27 @@
 </table>
 <div id="tempdiv" style="display:block;position:absolute;left:225px;top:150px;"></div>
 <script>
-
 function callEditDiv(modulename,mode,id)
 {ldelim}
-	$("status").style.display="inline";
-	new Ajax.Request(
-		'index.php',
-		{ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
-			method: 'post',
-			postBody: 'module=Users&action=UsersAjax&orgajax=true&mode='+mode+'&sharing_module='+modulename+'&shareid='+id,
-			onComplete: function(response) {ldelim}
-				$("status").style.display="none";
-				$("tempdiv").innerHTML=response.responseText;
-			{rdelim}
-		{rdelim}
-	);
+        $("status").style.display="inline";
+        new Ajax.Request(
+                'index.php',
+                {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+                        method: 'post',
+                        postBody: 'module=Users&action=UsersAjax&orgajax=true&mode='+mode+'&sharing_module='+modulename+'&sh
+areid='+id,
+                        onComplete: function(response) {ldelim}
+                                $("status").style.display="none";
+                                $("tempdiv").innerHTML=response.responseText;
+                                if(mode == 'edit')
+                                {ldelim}
+                                        setTimeout("",10000);
+                                        var related = $('rel_module_lists').value;
+                                        fnwriteRules(modulename,related);
+                                {rdelim}
+                        {rdelim}
+                {rdelim}
+        );
 {rdelim}
 
 function fnwriteRules(module,related)

Modified: vtigercrm/trunk/modules/Users/CreateSharingRule.php
==============================================================================
--- vtigercrm/trunk/modules/Users/CreateSharingRule.php (original)
+++ vtigercrm/trunk/modules/Users/CreateSharingRule.php Tue Jun 27 09:29:44 2006
@@ -246,7 +246,7 @@
 <input type="hidden" name="sharing_module" value="'.$sharing_module.'">
 <input type="hidden" name="shareId" value="'.$shareid.'">
 <input type="hidden" name="mode" value="'.$mode.'">
-
+<input type="hidden" id="rel_module_lists" name="rel_module_lists" value="'.$relatedmodule.'">
 <div id="sharingRule" class="fixedLay">
 <table width="100%" border="0" cellpadding="3" cellspacing="0">
 <tr>



From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 27 08:29:51 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 27 Jun 2006 15:29:51 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23512=3A_?=
 =?utf-8?q?UI_issue_in_Organisation_Sharing_Privileges?=
In-Reply-To: <076.94fe2310a682ae79f7fc33244bb4f97f@vtiger.fosslabs.com>
References: <076.94fe2310a682ae79f7fc33244bb4f97f@vtiger.fosslabs.com>
Message-ID: <085.b15a9c2180ca7dc9e7877f2201ac85fa@vtiger.fosslabs.com>

#512: UI issue in Organisation Sharing Privileges
---------------------------+------------------------------------------------
  Reporter:  jerrydgeorge  |       Owner:  jerrydgeorge
      Type:  defect        |      Status:  closed      
  Priority:  major         |   Milestone:              
 Component:  vtigercrm     |     Version:  5.0.0       
Resolution:  fixed         |    Keywords:  UI          
---------------------------+------------------------------------------------
Changes (by jerrydgeorge):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/512>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 09:36:24 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 16:36:24 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7587 - in /vtigercrm/trunk:
 Smarty/templates/Inventory/ProductDetails.tpl
 Smarty/templates/Inventory/ProductDetailsEditView.tpl include/js/general.js
Message-ID: <20060627163624.54F2D83F723@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 27 10:36:17 2006
New Revision: 7587

Log:
* Removed the readonly for the ListPrice field where as now we can change the ListPrice value

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

Modified: vtigercrm/trunk/Smarty/templates/Inventory/ProductDetails.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Inventory/ProductDetails.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Inventory/ProductDetails.tpl Tue Jun 27 10:36:17 2006
@@ -56,7 +56,7 @@
 				
 			</td>
 			<td nowrap valign="top">
-				<input type="text" id="txtListPrice1" name="txtListPrice1" value="{$UNIT_PRICE}" class="txtBox" readonly onBlur="FindDuplicate(); settotalnoofrows(); calcTotal(this)"/>&nbsp;<img src="themes/blue/images/pricebook.gif" onclick="priceBookPickList(this)" style="cursor: pointer;" title="Price Book" align="absmiddle" />
+				<input type="text" id="txtListPrice1" name="txtListPrice1" value="{$UNIT_PRICE}" class="txtBox" onBlur="FindDuplicate(); settotalnoofrows(); calcTotal(this)"/>&nbsp;<img src="themes/blue/images/pricebook.gif" onclick="priceBookPickList(this)" style="cursor: pointer;" title="Price Book" align="absmiddle" />
 			</td>
 			<!-- Added for Tax calculation-->
 			<td valign="top" style="padding-bottom:5px;">

Modified: vtigercrm/trunk/Smarty/templates/Inventory/ProductDetailsEditView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Inventory/ProductDetailsEditView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Inventory/ProductDetailsEditView.tpl Tue Jun 27 10:36:17 2006
@@ -71,7 +71,7 @@
 				{$data.$unitPrice}&nbsp;
 			</td>
 			<td nowrap valign="top">
-				<input type="text" name="{$txtListPrice}" value="{$data.$txtListPrice}" class="txtBox" readonly onBlur="FindDuplicate(); settotalnoofrows(); calcTotal(this)"/>&nbsp;
+				<input type="text" name="{$txtListPrice}" value="{$data.$txtListPrice}" class="txtBox" onBlur="FindDuplicate(); settotalnoofrows(); calcTotal(this)"/>&nbsp;
 				<img src="themes/blue/images/pricebook.gif" onclick="priceBookPickList(this)" style="cursor: pointer;" title="Price Book" align="absmiddle" />
 			</td>
 			<!-- Added for Tax calculation-->

Modified: vtigercrm/trunk/include/js/general.js
==============================================================================
--- vtigercrm/trunk/include/js/general.js (original)
+++ vtigercrm/trunk/include/js/general.js Tue Jun 27 10:36:17 2006
@@ -1443,7 +1443,7 @@
 	coltwo.innerHTML="<div id='qtyInStock"+count+"'>";	
 	colthree.innerHTML="<input type='text' id='txtQty"+count+"' name='txtQty"+count+"' class='detailedViewTextBox' onfocus='this.className=\"detailedViewTextBoxOn\"' onBlur='this.className=\"detailedViewTextBox\"; FindDuplicate(); settotalnoofrows(); calcTotal(this);' /> ";
 	colfour.innerHTML="&nbsp;</div><div id='unitPrice"+count+"'></div>";
-	colfive.innerHTML="<input type='text' id='txtListPrice"+count+"' name='txtListPrice"+count+"' class='txtBox' readonly onBlur='FindDuplicate(); settotalnoofrows(); calcTotal(this)'>&nbsp;<img src='themes/blue/images/pricebook.gif' onClick='priceBookPickList(this)' align='absmiddle' style='cursor:hand;cursor:pointer' title='Price Book' /> ";
+	colfive.innerHTML="<input type='text' id='txtListPrice"+count+"' name='txtListPrice"+count+"' class='txtBox' onBlur='FindDuplicate(); settotalnoofrows(); calcTotal(this)'>&nbsp;<img src='themes/blue/images/pricebook.gif' onClick='priceBookPickList(this)' align='absmiddle' style='cursor:hand;cursor:pointer' title='Price Book' /> ";
 	//Added for tax calculation
 	colsix.innerHTML="<input type='text' id='txtTaxTotal"+count+"' name='txtTaxTotal"+count+"' value='' class='detailedViewTextBox' style='width:65%;'><input type='hidden' id='hdnTaxTotal"+count+"' name='hdnTaxTotal"+count+"'>&nbsp;<input type='button' name='showTax' value=' ... '  class='classBtnSmall'  onclick='fnshow_Hide(\"tax_Lay"+count+"\");'><div id='tax_Lay"+count+"' style='width:93%;position:relative;border:1px dotted #CCCCCC;display:none;background-color:#FFFFCC;top:5px;padding:5px;'><table width='100%' border='0' cellpadding='0' cellspacing='0' class='small'><tr id='vatrow"+count+"'><td align='left' width='40%' style='border:0px solid red;'><input type='text' id='txtVATTax"+count+"' name='txtVATTax"+count+"' class='txtBox' onBlur='ValidateTax(\"txtVATTax"+count+"\"); calcTotal(this);'/>%&nbsp;</td><td width='20%' align='right' style='border:0px solid red;'>&nbsp;VAT</td><td align='left' width='40%' style='border:0px solid red;'><input type='text' id='txtVATTaxTotal"+count+"' name='txtVATTaxTotal"+count+"' class='txtBox' onBlur='ValidateTax(\"txtVATTaxTotal"+count+"\"); calcTotal(this);'/></td></tr><tr id='salesrow"+count+"'><td align='left' style='border:0px solid red;'><input type='text' id='txtSalesTax"+count+"' name='txtSalesTax"+count+"' class='txtBox' onBlur='ValidateTax(\"txtSalesTax"+count+"\"); calcTotal(this);'/>%&nbsp;</td><td align='right' style='border:0px solid red;'>&nbsp;Sales</td><td align='left' style='border:0px solid red;'><input type='text' id='txtSalesTaxTotal"+count+"' name='txtSalesTaxTotal"+count+"' class='txtBox' onBlur='ValidateTax(\"txtSalesTaxTotal"+count+"\"); calcTotal(this);'/></td></tr><tr id='servicerow"+count+"'><td align='left' style='border:0px solid red;'><input type='text' id='txtServiceTax"+count+"' name='txtServiceTax"+count+"' class='txtBox' onBlur='ValidateTax(\"txtServiceTax"+count+"\"); calcTotal(this);'/>%&nbsp;</td><td align='right' style='border:0px solid red;'>&nbsp;Service</td><td align='left' style='border:0px solid red;'><input type='text' id='txtServiceTaxTotal"+count+"' name='txtServiceTaxTotal"+count+"' class='txtBox' onBlur='ValidateTax(\"txtServiceTaxTotal"+count+"\"); calcTotal(this);'/></td></tr></table></div>";
 
@@ -1482,7 +1482,7 @@
 	colone.innerHTML="<input type='text'id='txtProduct"+count+"' name='txtProduct"+count+"' class='txtBox' readonly/>&nbsp;<img src='themes/blue/images/search.gif' onclick='productPickList(this,\""+module+"\")' align='absmiddle' /><input type='hidden' id='hdnProductId"+count+"' name='hdnProductId"+count+"'>";
 	coltwo.innerHTML="<input type='text'id='txtQty"+count+"' name='txtQty"+count+"' class='detailedViewTextBox' onfocus='this.className=\"detailedViewTextBoxOn\"' onBlur='this.className=\"detailedViewTextBox\"; FindDuplicate(); settotalnoofrows(); calcTotal(this);' /> ";
 	colthree.innerHTML="&nbsp;<div id='unitPrice"+count+"'></div>";
-	colfour.innerHTML="<input type='text' id='txtListPrice"+count+"' name='txtListPrice"+count+"' class='txtBox' readonly onBlur='FindDuplicate(); settotalnoofrows(); calcTotal(this)'>&nbsp;<img src='themes/blue/images/pricebook.gif' onClick='priceBookPickList(this)' align='absmiddle' style='cursor:hand;cursor:pointer' title='Price Book' /> ";
+	colfour.innerHTML="<input type='text' id='txtListPrice"+count+"' name='txtListPrice"+count+"' class='txtBox' onBlur='FindDuplicate(); settotalnoofrows(); calcTotal(this)'>&nbsp;<img src='themes/blue/images/pricebook.gif' onClick='priceBookPickList(this)' align='absmiddle' style='cursor:hand;cursor:pointer' title='Price Book' /> ";
 
 	//Added for tax calculation
 	colfive.innerHTML="<input type='text' id='txtTaxTotal"+count+"' name='txtTaxTotal"+count+"' value='' class='detailedViewTextBox' style='width:65%;'><input type='hidden' id='hdnTaxTotal"+count+"' name='hdnTaxTotal"+count+"'>&nbsp;<input type='button' name='showTax' value=' ... '  class='classBtnSmall'  onclick='fnshow_Hide(\"tax_Lay"+count+"\");'><div id='tax_Lay"+count+"' style='width:93%;position:relative;border:1px dotted #CCCCCC;display:none;background-color:#FFFFCC;top:5px;padding:5px;'><table width='100%' border='0' cellpadding='0' cellspacing='0' class='small'><tr id='vatrow"+count+"'><td align='left' width='40%' style='border:0px solid red;'><input type='text' id='txtVATTax"+count+"' name='txtVATTax"+count+"' class='txtBox' onBlur='ValidateTax(\"txtVATTax"+count+"\"); calcTotal(this);'/>%&nbsp;</td><td width='20%' align='right' style='border:0px solid red;'>&nbsp;VAT</td><td align='left' width='40%' style='border:0px solid red;'><input type='text' id='txtVATTaxTotal"+count+"' name='txtVATTaxTotal"+count+"' class='txtBox' onBlur='ValidateTax(\"txtVATTaxTotal"+count+"\"); calcTotal(this);'/></td></tr><tr id='salesrow"+count+"'><td align='left' style='border:0px solid red;'><input type='text' id='txtSalesTax"+count+"' name='txtSalesTax"+count+"' class='txtBox' onBlur='ValidateTax(\"txtSalesTax"+count+"\"); calcTotal(this);'/>%&nbsp;</td><td align='right' style='border:0px solid red;'>&nbsp;Sales</td><td align='left' style='border:0px solid red;'><input type='text' id='txtSalesTaxTotal"+count+"' name='txtSalesTaxTotal"+count+"' class='txtBox' onBlur='ValidateTax(\"txtSalesTaxTotal"+count+"\"); calcTotal(this);'/></td></tr><tr id='servicerow"+count+"'><td align='left' style='border:0px solid red;'><input type='text' id='txtServiceTax"+count+"' name='txtServiceTax"+count+"' class='txtBox' onBlur='ValidateTax(\"txtServiceTax"+count+"\"); calcTotal(this);'/>%&nbsp;</td><td align='right' style='border:0px solid red;'>&nbsp;Service</td><td align='left' style='border:0px solid red;'><input type='text' id='txtServiceTaxTotal"+count+"' name='txtServiceTaxTotal"+count+"' class='txtBox' onBlur='ValidateTax(\"txtServiceTaxTotal"+count+"\"); calcTotal(this);'/></td></tr></table></div>";



From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 27 09:41:03 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 27 Jun 2006 16:41:03 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231355=3A?=
 =?utf-8?q?_Pricebook_value_is_readonly?=
In-Reply-To: <076.88e9291262713bf51b842aecd697a80a@vtiger.fosslabs.com>
References: <076.88e9291262713bf51b842aecd697a80a@vtiger.fosslabs.com>
Message-ID: <085.a093e5cbbe297d3ca53103065242eea1@vtiger.fosslabs.com>

#1355: Pricebook value is readonly
-----------------------------------+----------------------------------------
  Reporter:  cristian at nethesis.it  |       Owner:  mickie
      Type:  defect                |      Status:  closed
  Priority:  major                 |   Milestone:        
 Component:  vtigercrm             |     Version:  5.0.0 
Resolution:  fixed                 |    Keywords:        
-----------------------------------+----------------------------------------
Changes (by mickie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 Dear cristian,

 Thanks for notifying the missed feature. now we have changed this
 ListPrice as editable and the user can change the ListPrice value
 manually. The files have been checkedin in the svn and will be available
 in our coming release.

 Thanks
 Mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1355>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 09:51:40 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 16:51:40 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7588 -
 /vtigercrm/trunk/Smarty/templates/Inventory/InventoryActions.tpl
Message-ID: <20060627165140.D2C9E83F720@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 27 10:51:36 2006
New Revision: 7588

Log:
* Modified to fix the return module ticket - 1345 in trac

Modified:
    vtigercrm/trunk/Smarty/templates/Inventory/InventoryActions.tpl

Modified: vtigercrm/trunk/Smarty/templates/Inventory/InventoryActions.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Inventory/InventoryActions.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Inventory/InventoryActions.tpl Tue Jun 27 10:51:36 2006
@@ -141,7 +141,7 @@
 	   <!-- SO Actions ends -->
 
 	{elseif $MODULE eq 'Quotes'}
-	   <!-- Vendors Actions starts -->
+	   <!-- Quotes Actions starts -->
 	   <tr>
 		<td align="left" style="padding-left:10px;">
 			<img src="{$IMAGE_PATH}pointer.gif" hspace="5" align="absmiddle"/> 
@@ -151,10 +151,10 @@
 	   <tr>
 		<td align="left" style="padding-left:10px;border-bottom:1px dotted #CCCCCC;">
 			<img src="{$IMAGE_PATH}pointer.gif" hspace="5" align="absmiddle"/>
-			<a href="javascript: document.DetailView.return_module.value='SalesOrder'; document.DetailView.return_action.value='DetailView'; document.DetailView.convertmode.value='quotetoso'; document.DetailView.module.value='SalesOrder'; document.DetailView.action.value='EditView'; document.DetailView.submit();" class="webMnu">{$APP.LBL_GENERATE} {$APP.SalesOrder}</a> 
-		</td>
-	   </tr>
-	   <!-- Vendors Actions ends -->
+			<a href="javascript: document.DetailView.return_module.value='{$MODULE}'; document.DetailView.return_action.value='DetailView'; document.DetailView.convertmode.value='quotetoso'; document.DetailView.module.value='SalesOrder'; document.DetailView.action.value='EditView'; document.DetailView.submit();" class="webMnu">{$APP.LBL_GENERATE} {$APP.SalesOrder}</a> 
+		</td>
+	   </tr>
+	   <!-- Quotes Actions ends -->
 
 	{elseif $MODULE eq 'Invoice'}
 	   <!-- Invoice Actions starts -->



From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 27 09:52:19 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 27 Jun 2006 16:52:19 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231345=3A?=
 =?utf-8?q?_Error_saving_the_sales_order?=
In-Reply-To: <076.2d41a315f9cfd034311ac755935afb51@vtiger.fosslabs.com>
References: <076.2d41a315f9cfd034311ac755935afb51@vtiger.fosslabs.com>
Message-ID: <085.8d50b6f69593d4f648834f4e2d8600d0@vtiger.fosslabs.com>

#1345: Error saving the sales order
------------------------+---------------------------------------------------
  Reporter:  Simon      |       Owner:  mickie             
      Type:  defect     |      Status:  closed             
  Priority:  major      |   Milestone:  5.0.0              
 Component:  vtigercrm  |     Version:  5.0.0              
Resolution:  fixed      |    Keywords:  quotes, sales order
------------------------+---------------------------------------------------
Changes (by mickie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 This issue has been fixed and will be available in our coming release.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1345>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 27 09:56:00 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 27 Jun 2006 16:56:00 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231252=3A?=
 =?utf-8?q?_Ticket_-_Activity_-_Relation?=
In-Reply-To: <076.f54f7a210a2bc06ab7c96747af544498@vtiger.fosslabs.com>
References: <076.f54f7a210a2bc06ab7c96747af544498@vtiger.fosslabs.com>
Message-ID: <085.bbd01062570e59347e66ddec6d53d04f@vtiger.fosslabs.com>

#1252: Ticket - Activity - Relation
------------------------+---------------------------------------------------
  Reporter:  eberled    |       Owner:  mickie
      Type:  defect     |      Status:  new   
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.1 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mickie):

  * version:  5.0.0 => 5.0.1

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1252>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 27 09:56:10 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 27 Jun 2006 16:56:10 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231326=3A?=
 =?utf-8?q?_Auto_Tax_and_quote_workflow_improvement?=
In-Reply-To: <076.151dc33d86c777ebfd974d4b1529c9ea@vtiger.fosslabs.com>
References: <076.151dc33d86c777ebfd974d4b1529c9ea@vtiger.fosslabs.com>
Message-ID: <085.30eb5690279fa6f639563a88ba47a60b@vtiger.fosslabs.com>

#1326: Auto Tax and quote workflow improvement
--------------------------+-------------------------------------------------
  Reporter:  mvhman       |       Owner:  mickie                  
      Type:  enhancement  |      Status:  new                     
  Priority:  major        |   Milestone:  5.0.0                   
 Component:  vtigercrm    |     Version:  5.0.0                   
Resolution:               |    Keywords:  auto tax improved quotes
--------------------------+-------------------------------------------------
Changes (by mickie):

  * type:  defect => enhancement

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1326>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 10:01:57 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 17:01:57 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7589 -
	/vtigercrm/trunk/index.php
Message-ID: <20060627170157.2EBC283F720@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 27 11:01:32 2006
New Revision: 7589

Log:
Security check for Administration module done

Modified:
    vtigercrm/trunk/index.php

Modified: vtigercrm/trunk/index.php
==============================================================================
--- vtigercrm/trunk/index.php (original)
+++ vtigercrm/trunk/index.php Tue Jun 27 11:01:32 2006
@@ -306,7 +306,7 @@
  	         header( "Pragma: no-cache" );        
  	}
 
-        if($module == 'Users' || $module == 'Home' || $module == 'Administration' || $module == 'uploads' || $module == 'Calendar')
+        if($module == 'Users' || $module == 'Home' || $module == 'uploads' || $module == 'Calendar')
         {
           $skipSecurityCheck=true;
         }



From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 10:04:00 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 17:04:00 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7590 -
	/vtigercrm/trunk/include/utils/UserInfoUtil.php
Message-ID: <20060627170400.B945783F73D@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 27 11:03:51 2006
New Revision: 7590

Log:
Security check for Administration module done

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

Modified: vtigercrm/trunk/include/utils/UserInfoUtil.php
==============================================================================
--- vtigercrm/trunk/include/utils/UserInfoUtil.php (original)
+++ vtigercrm/trunk/include/utils/UserInfoUtil.php Tue Jun 27 11:03:51 2006
@@ -1365,7 +1365,7 @@
 	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 == 'Calendar')
+	if($module == 'Users' || $module == 'Home' || $module == 'uploads' || $module == 'Calendar')
 	{
 		//These modules dont have security right now
 		$permission = "yes";
@@ -1375,7 +1375,7 @@
 	}
 	
 	//Checking the Access for the Settings Module
-	if($module == 'Settings')
+	if($module == 'Settings' || $module == 'Administration')
 	{
 		if(! $is_admin)
 		{



From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 27 11:03:43 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 27 Jun 2006 18:03:43 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231368=3A?=
 =?utf-8?q?_Inactive_Import/Export_button_in_Campaigns_module?=
Message-ID: <076.e9c23975424fab1b5c70a96fbb22a0fb@vtiger.fosslabs.com>

#1368: Inactive Import/Export button in Campaigns module
-----------------------+----------------------------------------------------
 Reporter:  gopal      |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  major      |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 We have an Import/Export button in Campaigns module, which doesn't work.
 But the inactive state ALT tag says Import Campaigns, which is a
 misleading. BTW, end-user may think this option is disabled for their user
 profile. But the fact is this feature is not available for anyone. Then it
 is better we either we don't show any ALT text or Icon itself.

 We may need to address these icons in a better way.

 Thanks,

 Gopal
 (vtiger CRM)

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1368>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 27 11:11:04 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 27 Jun 2006 18:11:04 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231369=3A?=
 =?utf-8?q?_Campaigns=3A_Column_Sorting_is_missing?=
Message-ID: <076.905324df51cc4ae1000ffb348c83fce2@vtiger.fosslabs.com>

#1369: Campaigns: Column Sorting is missing
-----------------------+----------------------------------------------------
 Reporter:  gopal      |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  critical   |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 In Campaigns, Only Campaign Name and Assiged To has sorting. For all other
 columns SOrting is not available.

 Thanks,

 Gopal

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1369>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 27 11:16:42 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 27 Jun 2006 18:16:42 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231370=3A?=
 =?utf-8?q?_Campaigns=3A_Disconnected_Simple_Time_Filter?=
Message-ID: <076.ba40063443d1d72768187489cd3eea9d@vtiger.fosslabs.com>

#1370: Campaigns: Disconnected Simple Time Filter
-----------------------+----------------------------------------------------
 Reporter:  gopal      |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  critical   |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 While scrolling verticlly, Simple Time Filter is disconnected from Filters
 tab. BTW, the one tab name is single line whare as other one in two lines.

 Issue in IE 6.

 Gopal
 vtiger CRM

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1370>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 11:29:08 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 18:29:08 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7591 -
	/vtigercrm/trunk/data/CRMEntity.php
Message-ID: <20060627182908.C717483F795@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 27 12:29:05 2006
New Revision: 7591

Log:
changes made to update only permitted fields

Modified:
    vtigercrm/trunk/data/CRMEntity.php

Modified: vtigercrm/trunk/data/CRMEntity.php
==============================================================================
--- vtigercrm/trunk/data/CRMEntity.php (original)
+++ vtigercrm/trunk/data/CRMEntity.php Tue Jun 27 12:29:05 2006
@@ -419,8 +419,32 @@
 	if($this->mode == 'edit')
 	{
 		$description_val = from_html($adb->formatString("vtiger_crmentity","description",$this->column_fields['description']),($insertion_mode == 'edit')?true:false);
-		$sql = "update vtiger_crmentity set smownerid=".$ownerid.",modifiedby=".$current_user->id.",description=".$description_val.", modifiedtime=".$adb->formatString("vtiger_crmentity","modifiedtime",$date_var)." where crmid=".$this->id;
-
+
+		require('user_privileges/user_privileges_'.$current_user->id.'.php');
+		$tabid = getTabid($module);
+		if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] ==0)
+		{
+			$sql = "update vtiger_crmentity set smownerid=".$ownerid.",modifiedby=".$current_user->id.",description=".$description_val.", modifiedtime=".$adb->formatString("vtiger_crmentity","modifiedtime",$date_var)." where crmid=".$this->id;
+		}
+		else
+		{
+			$profileList = getCurrentUserProfileList();
+			$perm_qry = "SELECT columnname FROM vtiger_field INNER JOIN vtiger_profile2field ON vtiger_profile2field.fieldid = vtiger_field.fieldid INNER JOIN vtiger_def_org_field ON vtiger_def_org_field.fieldid = vtiger_field.fieldid WHERE vtiger_field.tabid = ".$tabid." AND vtiger_profile2field.visible = 0 AND vtiger_profile2field.profileid IN ".$profileList." AND vtiger_def_org_field.visible = 0 and vtiger_field.tablename='vtiger_crmentity' and vtiger_field.displaytype in (1,3);";
+			$perm_result = $adb->query($perm_qry);
+			$perm_rows = $adb->num_rows($perm_result);
+			for($i=0; $i<$perm_rows; $i++)
+			{
+				$columname[]=$adb->query_result($perm_result,$i,"columnname");
+			}
+			if(is_array($columname) && in_array("description",$columname))
+			{
+				$sql = "update vtiger_crmentity set smownerid=".$ownerid.",modifiedby=".$current_user->id.",description=".$description_val.", modifiedtime=".$adb->formatString("vtiger_crmentity","modifiedtime",$date_var)." where crmid=".$this->id;
+			}
+			else
+			{
+				$sql = "update vtiger_crmentity set smownerid=".$ownerid.",modifiedby=".$current_user->id.", modifiedtime=".$adb->formatString("vtiger_crmentity","modifiedtime",$date_var)." where crmid=".$this->id;
+			}
+		}
 		$adb->query($sql);
 		$sql1 ="delete from vtiger_ownernotify where crmid=".$this->id;
 		$adb->query($sql1);
@@ -541,7 +565,27 @@
 	  {
 		  $update = '';
 		  $tabid= getTabid($module);	
-		  $sql = "select * from vtiger_field where tabid=".$tabid." and tablename='".$table_name."' and displaytype in (1,3)"; 
+		  require('user_privileges/user_privileges_'.$current_user->id.'.php');
+		  if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] ==0)
+		  {
+
+			  $sql = "select * from vtiger_field where tabid=".$tabid." and tablename='".$table_name."' and displaytype in (1,3)"; 
+		  }
+		  else
+		  {
+			  $profileList = getCurrentUserProfileList();
+			  $sql = "SELECT *
+			  FROM vtiger_field
+			  INNER JOIN vtiger_profile2field
+			  ON vtiger_profile2field.fieldid = vtiger_field.fieldid
+			  INNER JOIN vtiger_def_org_field
+			  ON vtiger_def_org_field.fieldid = vtiger_field.fieldid
+			  WHERE vtiger_field.tabid = ".$tabid."
+			  AND vtiger_profile2field.visible = 0 
+			  AND vtiger_profile2field.profileid IN ".$profileList."
+			  AND vtiger_def_org_field.visible = 0 and vtiger_field.tablename='".$table_name."' and vtiger_field.displaytype in (1,3)";
+		  }	   
+
 	  }
 	  else
 	  {



From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 27 11:33:13 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 27 Jun 2006 18:33:13 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231371=3A?=
 =?utf-8?q?_Campaigns_Custom_View=3A_Double_Veritcal_scrolling?=
Message-ID: <076.95f3ca699904fad0d589b89d3722d2c1@vtiger.fosslabs.com>

#1371: Campaigns Custom View: Double Veritcal scrolling
-----------------------+----------------------------------------------------
 Reporter:  gopal      |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  critical   |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 There are two vertcal scroll bars in Campaigns Custom View. And there is
 no SAVE CANCEL Buttons.

 Browser: IE 6.

 It is very crusial we support vtiger in IE as well. There are more users
 using IE in the World particulary Businesses than any other Browsers.

 Thanks,

 Gopal

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1371>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 27 12:25:06 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 27 Jun 2006 19:25:06 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231372=3A?=
 =?utf-8?q?_Custom_Veiw=3A_List_in_Metrics_option_is_wrong_function?=
Message-ID: <076.4043c7ad57292395a7049af96923eab8@vtiger.fosslabs.com>

#1372: Custom Veiw: List in Metrics option is wrong function
-----------------------+----------------------------------------------------
 Reporter:  gopal      |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  critical   |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 I think "List in Metrics" feature can be part of the Reports rather Custom
 Views. Functionally, from the Reports module you can pull the data and
 aggregate it based on the required functions. I am not clear, how a custom
 view can become a  Key Metric.

 Please contact me if you need any clarifications.

 Thanks,
 Gopal

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1372>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 27 12:26:56 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 27 Jun 2006 19:26:56 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231373=3A?=
 =?utf-8?q?_Accounts_=3E_New_Custom_view_=3A_No_navigation_link?=
Message-ID: <076.89b574125c4524982f3f9b818aabf9f7@vtiger.fosslabs.com>

#1373: Accounts > New Custom view : No navigation link
-----------------------+----------------------------------------------------
 Reporter:  gopal      |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  major      |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 There is no navigation link to access Accounts from:

 Accounts > New Custom view

 Applicable for all modules.

 Thanks,

 Gopal

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1373>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 27 12:34:14 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 27 Jun 2006 19:34:14 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231374=3A?=
	=?utf-8?q?_Home_Page_-_Fully_collapsed?=
Message-ID: <076.5909c15d740b3c4920a3ae718e2cea9e@vtiger.fosslabs.com>

#1374: Home Page - Fully collapsed
-----------------------+----------------------------------------------------
 Reporter:  gopal      |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  critical   |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 Demo: Bleeding Edge.

 Browser: IE 6

 Home page need to be rebuilt properly. All the boxes need to formatted
 properly.

 We need to provide a useful data in two dimensional matrix similar to
 previous version otherwise it will become just a Site map in a Website.
 Except Key Metrics all other boxes are not formatted. BTW, the page icon
 for before links doesn't convey any meaning to me, instead we can use some
 arrow or bullet.

 Thanks,

 Gopal

 Thanks,

 Gopal

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1374>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 27 12:38:21 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 27 Jun 2006 19:38:21 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231375=3A?=
 =?utf-8?q?_Ajax_Chat_window_need_to_be_improved?=
Message-ID: <076.9a61ff39258b85bdf4e662518c1eefac@vtiger.fosslabs.com>

#1375: Ajax Chat window need to be improved
-----------------------+----------------------------------------------------
 Reporter:  gopal      |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  blocker    |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 Ajax Chat Window need to be improved. Currently the Public Chat junction
 is splitted into two slices and it shows as given below:

 admin
 admin
 admin
 admin
 admin
 admin
 admin
 admin
 admin

 Chat Window.

 Consider this issue as a show stopper in IE 6.

 Thanks,

 Gopal

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1375>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 27 12:40:31 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 27 Jun 2006 19:40:31 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231376=3A?=
 =?utf-8?q?_Error_message=3A_Please_select_atleast_one_record?=
Message-ID: <076.41781f98ac9f5dfb9527fcc3083cd3c1@vtiger.fosslabs.com>

#1376: Error message: Please select atleast one record
-----------------------+----------------------------------------------------
 Reporter:  gopal      |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  minor      |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 Change Please select atleast one record

 to Please select '''at least''' one record.

 Since '''atleast''' is not a single word.

 Thanks,
 Gopal

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1376>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 27 12:41:58 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 27 Jun 2006 19:41:58 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231377=3A?=
 =?utf-8?q?_Error_Message_in_Emails_module?=
Message-ID: <076.f36d424ef8cb55fbe8cd894d788526eb@vtiger.fosslabs.com>

#1377: Error Message in Emails module
-----------------------+----------------------------------------------------
 Reporter:  gopal      |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  blocker    |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 Following error message is displayed in Emails list view:

 Warning: Division by zero in /usr/local/share/vtiger-
 demo/include/utils/ListViewUtils.php on line 371

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1377>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 27 12:44:17 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 27 Jun 2006 19:44:17 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231378=3A?=
 =?utf-8?q?_Emails=3A_Improper_Export_link?=
Message-ID: <076.70d0318c40a5216b6e6108b9de7b7e0f@vtiger.fosslabs.com>

#1378: Emails: Improper Export link
-----------------------+----------------------------------------------------
 Reporter:  gopal      |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  blocker    |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 In Email Module if I click Export icon, it shows the Login page. I think
 noone is going to export emails into CSV file format or any other format
 similar to Mozilla or Outlook. Please correct me if I am wrong.

 Thanks,

 Gopal

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1378>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 27 12:49:14 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 27 Jun 2006 19:49:14 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231379=3A?=
	=?utf-8?q?_Calendar=3A_+_icon_position?=
Message-ID: <076.0c79d92ae6c8bcb494ec7242b613447b@vtiger.fosslabs.com>

#1379: Calendar: + icon position
-----------------------+----------------------------------------------------
 Reporter:  gopal      |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  critical   |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 Curently the + icon on date, hour view is on top right hand side of the
 cell. Due to this the row jumps. It is better have + icon at lower rhs
 corner.

 Please get back to me for clarifications.

 Thanks,

 Gopal

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1379>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 27 12:52:27 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 27 Jun 2006 19:52:27 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231380=3A?=
 =?utf-8?q?_Calendar=3A_Add_event_page_need_improvement?=
Message-ID: <076.cfb74cfa6ccd0580016cef47d94dfed2@vtiger.fosslabs.com>

#1380: Calendar: Add event page need improvement
-----------------------+----------------------------------------------------
 Reporter:  gopal      |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  major      |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 Currently the Add new Evnet Page is not exactly displayed at center of the
 screen and the buttons are hidden. Only part of the screen is visible. It
 is better to have:

 Buttons on top as well.

 Provide option to move the pop-up page so that I can move uo if it scroll
 down.

 Please get back to me for clarifications.

 Gopal

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1380>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 27 12:56:35 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 27 Jun 2006 19:56:35 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231381=3A?=
	=?utf-8?q?_To_Do_-_Wrong_grouping?=
Message-ID: <076.badf11791e67728b99c8aecc440697a7@vtiger.fosslabs.com>

#1381: To Do - Wrong grouping
-----------------------+----------------------------------------------------
 Reporter:  gopal      |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  critical   |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 Todo is grouped under Add Event group. In fact To do is a task rather
 Event.

 Call and Meeting under Add Event is OK but To DO cannot be displayed under
 Add Event.

 It is better call Add Event menu as Add Activity so the you can
 accommodate both Events as well as Tasks. By the way, it is better to
 retain Task or To Do. Donot use Task at one place and To Do at other
 place.

 Thanks,
 Gopal

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1381>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 27 13:10:50 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 27 Jun 2006 20:10:50 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231382=3A?=
 =?utf-8?q?_Calendar=3A_Start_My_Calendar_Time_=2E=2E?=
Message-ID: <076.c0c6252fbd0b46e64e1992decb196d6d@vtiger.fosslabs.com>

#1382: Calendar: Start My Calendar Time ..
-----------------------+----------------------------------------------------
 Reporter:  gopal      |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  critical   |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 We have time starting from 6 AM to 4 PM. I think there are many people
 work on the night shifts or evening shifts. Their calendar starts at any
 time.

 It is better to have 12.00 AM to 11.00 PM drop down list.

 By the way, we need to provide a start time and end time for setting
 Working Hours.

 Please get back to me if you need any clarifications.

 Regards,
 Gopal

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1382>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 27 13:15:14 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 27 Jun 2006 20:15:14 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231383=3A?=
 =?utf-8?q?_Usage_of_=22Faq=22_module_name?=
Message-ID: <076.2e1bf80fcff6a7f829a7cb26e55a7836@vtiger.fosslabs.com>

#1383: Usage of "Faq" module name
-----------------------+----------------------------------------------------
 Reporter:  gopal      |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  major      |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 Kindly change the module name '''Faq''' to '''FAQ''' as it is Acronym for
 "Frequesntly Asked Questions".

 Please get back to me if you need any carifications.

 Regards,
 Gopal

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1383>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 27 13:17:39 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 27 Jun 2006 20:17:39 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231384=3A?=
	=?utf-8?q?_RSS_-_RHS_Image?=
Message-ID: <076.6dc4261cd0c8a5800f9a2fc04552b1d0@vtiger.fosslabs.com>

#1384: RSS - RHS Image
-----------------------+----------------------------------------------------
 Reporter:  gopal      |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  major      |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 In most of the modules we have the RHS image in All upper case. But in RSS
 it looks differently. It is better to consistently use the same case in
 all the modules.

 Thanks,
 Gopal

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1384>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 27 13:19:58 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 27 Jun 2006 20:19:58 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231385=3A?=
 =?utf-8?q?_Tool_bar_icons_-_Page_opens_at_different_palces?=
Message-ID: <076.a97c3862753f2ecb63d9e35d91c10490@vtiger.fosslabs.com>

#1385: Tool bar icons - Page opens at different palces
-----------------------+----------------------------------------------------
 Reporter:  gopal      |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  major      |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 Upon clciking the tool bar icons, pages are opening at different places.
 It is better to have some consistency.

 Gopal

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1385>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 27 23:14:03 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 28 Jun 2006 06:14:03 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231364=3A?=
 =?utf-8?q?_Non_admin_user_can_jump_to_user_settings_by_point_to_url?=
In-Reply-To: <076.ff7d1fb05c8daa4389a7c4cc4877a33d@vtiger.fosslabs.com>
References: <076.ff7d1fb05c8daa4389a7c4cc4877a33d@vtiger.fosslabs.com>
Message-ID: <085.71d9e71dfd39491d1a1b07fa55fe6ba0@vtiger.fosslabs.com>

#1364: Non admin user can jump to user settings by point to url
-----------------------------------------------+----------------------------
  Reporter:  Brian Laughlin <brian at awnow.com>  |       Owner:  don     
      Type:  defect                            |      Status:  closed  
  Priority:  critical                          |   Milestone:  5.0.0   
 Component:  vtigercrm                         |     Version:  5.0.0   
Resolution:  fixed                             |    Keywords:  security
-----------------------------------------------+----------------------------
Changes (by don):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1364>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 27 23:19:02 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 28 Jun 2006 06:19:02 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231151=3A?=
 =?utf-8?q?_Error_message_in_Installer=2E=2E?=
In-Reply-To: <076.5644658cbeac029416aebb3b898c0527@vtiger.fosslabs.com>
References: <076.5644658cbeac029416aebb3b898c0527@vtiger.fosslabs.com>
Message-ID: <085.bdab3556f8df9d8308cc9d58361fdd48@vtiger.fosslabs.com>

#1151: Error message in Installer..
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  Richie  
      Type:  defect     |      Status:  reopened
  Priority:  critical   |   Milestone:          
 Component:  vtigercrm  |     Version:  5.0.0   
Resolution:             |    Keywords:          
------------------------+---------------------------------------------------
Comment (by richie):

 Why wouldn't vtigercrm's installer catch an exception that indicates an
 incorrect password, and handle the readable error message in the catch
 block? >> It is currently doing that. The message was redundant hence the
 action.

 Please reconsider whether patching the adodb source to suppress a
 legitimate error condition is what we want to do here.
 Any patch to adodb or any of the other snapshotted libraries will prevent
 distros from managing them as external dependencies.

 I stand corrected. Will see what can be done. Thanks for highlighting
 this. I did not consider this aspect at all.
 Appreciate this.

 Richie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1151>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 27 23:31:09 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 28 Jun 2006 06:31:09 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231151=3A?=
 =?utf-8?q?_Error_message_in_Installer=2E=2E?=
In-Reply-To: <076.5644658cbeac029416aebb3b898c0527@vtiger.fosslabs.com>
References: <076.5644658cbeac029416aebb3b898c0527@vtiger.fosslabs.com>
Message-ID: <085.8bc07dd661159d0eabbe481da4d8bf07@vtiger.fosslabs.com>

#1151: Error message in Installer..
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  Richie  
      Type:  defect     |      Status:  reopened
  Priority:  critical   |   Milestone:          
 Component:  vtigercrm  |     Version:  5.0.0   
Resolution:             |    Keywords:          
------------------------+---------------------------------------------------
Comment (by mmbrich):

 (In [7592]) Jeff is right, we really should never change these distributed
 libs, and with a good lib you should never have to.
 refs #1151
 refs #7569

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1151>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 23:31:11 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 06:31:11 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7592 - in /vtigercrm/trunk:
 adodb/drivers/adodb-mysql.inc.php install/3confirmConfig.php
Message-ID: <20060628063111.6B3AB7726CA@vtiger.fosslabs.com>

Author: mmbrich
Date: Wed Jun 28 00:31:07 2006
New Revision: 7592

Log:
Jeff is right, we really should never change these distributed libs, and with a good lib you should never have to.
refs #1151
refs #7569


Modified:
    vtigercrm/trunk/adodb/drivers/adodb-mysql.inc.php
    vtigercrm/trunk/install/3confirmConfig.php

Modified: vtigercrm/trunk/adodb/drivers/adodb-mysql.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-mysql.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-mysql.inc.php Wed Jun 28 00:31:07 2006
@@ -351,9 +351,11 @@
 		if (!empty($this->port)) $argHostname .= ":".$this->port;
 		
 		if (ADODB_PHPVER >= 0x4300)
-		$this->_connectionID = @mysql_connect($argHostname,$argUsername,$argPassword,$this->forceNewConnect,$this->clientFlags);
+			$this->_connectionID = mysql_connect($argHostname,$argUsername,$argPassword,
+												$this->forceNewConnect,$this->clientFlags);
 		else if (ADODB_PHPVER >= 0x4200)
-			$this->_connectionID = mysql_connect($argHostname,$argUsername,$argPassword,$this->forceNewConnect);
+			$this->_connectionID = mysql_connect($argHostname,$argUsername,$argPassword,
+												$this->forceNewConnect);
 		else
 			$this->_connectionID = mysql_connect($argHostname,$argUsername,$argPassword);
 	

Modified: vtigercrm/trunk/install/3confirmConfig.php
==============================================================================
--- vtigercrm/trunk/install/3confirmConfig.php (original)
+++ vtigercrm/trunk/install/3confirmConfig.php Wed Jun 28 00:31:07 2006
@@ -44,11 +44,11 @@
 //Checking for database connection parameters
 if($db_type)
 {
-	include('adodb/adodb.inc.php');
-	$conn = &NewADOConnection($db_type);
-	$db_type_status = true;
-	if($conn->Connect($db_hostname,$db_username,$db_password))
-	{
+	include('adodb/adodb.inc.php');
+	$conn = &NewADOConnection($db_type);
+	$db_type_status = true;
+	if(@$conn->Connect($db_hostname,$db_username,$db_password))
+	{
 		$db_server_status = true;
 		if($db_type=='mysql')
 		{



From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 27 23:34:43 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 28 Jun 2006 06:34:43 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231151=3A?=
 =?utf-8?q?_Error_message_in_Installer=2E=2E?=
In-Reply-To: <076.5644658cbeac029416aebb3b898c0527@vtiger.fosslabs.com>
References: <076.5644658cbeac029416aebb3b898c0527@vtiger.fosslabs.com>
Message-ID: <085.94a579928093323ffa7879ecb0443dad@vtiger.fosslabs.com>

#1151: Error message in Installer..
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  Richie
      Type:  defect     |      Status:  closed
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mmbrich):

  * resolution:  => fixed
  * status:  reopened => closed

Comment:

 Fixed in #7592, wasn't re-opened when I started :).

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1151>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 27 23:41:57 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 28 Jun 2006 06:41:57 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231377=3A?=
 =?utf-8?q?_Error_Message_in_Emails_module?=
In-Reply-To: <076.f36d424ef8cb55fbe8cd894d788526eb@vtiger.fosslabs.com>
References: <076.f36d424ef8cb55fbe8cd894d788526eb@vtiger.fosslabs.com>
Message-ID: <085.0b8f8c4b21a6f4ae9f72d80b1c074cac@vtiger.fosslabs.com>

#1377: Error Message in Emails module
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  developer
      Type:  defect     |      Status:  closed   
  Priority:  blocker    |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:  fixed      |    Keywords:           
------------------------+---------------------------------------------------
Changes (by mmbrich):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 (In [7593]) fixes #1377

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1377>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 23:41:57 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 06:41:57 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7593 -
	/vtigercrm/trunk/include/utils/ListViewUtils.php
Message-ID: <20060628064157.DECF17726CA@vtiger.fosslabs.com>

Author: mmbrich
Date: Wed Jun 28 00:41:56 2006
New Revision: 7593

Log:
fixes #1377


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 Jun 28 00:41:56 2006
@@ -368,7 +368,7 @@
 	{
 		$end = $noofrows;
 	}
-	$paging = ceil ($noofrows / $limit);
+	if($paging != 0) {$paging = ceil ($noofrows / $limit);}
 	// Display the navigation
 	if ($display > 1) {
 		$previous = $display - 1;



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 00:08:37 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 07:08:37 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7594 -
	/vtigercrm/trunk/data/SugarBean.php
Message-ID: <20060628070837.E36847726D9@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 28 01:07:39 2006
New Revision: 7594

Log:
Added vtiger_ in getUniqueID function parameter

Modified:
    vtigercrm/trunk/data/SugarBean.php

Modified: vtigercrm/trunk/data/SugarBean.php
==============================================================================
--- vtigercrm/trunk/data/SugarBean.php (original)
+++ vtigercrm/trunk/data/SugarBean.php Wed Jun 28 01:07:39 2006
@@ -73,7 +73,7 @@
 			if($this->new_schema && 
 				$this->new_with_id == false)
 			{
-                          $this->id = $adb->getUniqueID("users");
+                          $this->id = $adb->getUniqueID("vtiger_users");
 			}
                         
 			$query = "INSERT into ".$this->table_name;



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 00:11:40 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 07:11:40 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7595 -
	/vtigercrm/trunk/include/freetag/freetag.class.php
Message-ID: <20060628071140.10F147726CD@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 28 01:10:39 2006
New Revision: 7595

Log:
Added vtiger_ in getUniqueID function parameter

Modified:
    vtigercrm/trunk/include/freetag/freetag.class.php

Modified: vtigercrm/trunk/include/freetag/freetag.class.php
==============================================================================
--- vtigercrm/trunk/include/freetag/freetag.class.php (original)
+++ vtigercrm/trunk/include/freetag/freetag.class.php Wed Jun 28 01:10:39 2006
@@ -456,7 +456,7 @@
 			$tag_id = $rs->fields['id'];
 		} else {
 			// Add new tag! 
-			$tag_id = $adb->getUniqueId('freetags');
+			$tag_id = $adb->getUniqueId('vtiger_freetags');
 			$sql = "INSERT INTO ${prefix}freetags (id,tag, raw_tag) VALUES ($tag_id,$normalized_tag, $tag)";
 			$rs = $adb->query($sql) or die("Syntax Error: $sql");
 			



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 00:14:07 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 07:14:07 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7596 -
	/vtigercrm/trunk/include/PopulateComboValues.php
Message-ID: <20060628071407.A322A7725A7@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 28 01:13:30 2006
New Revision: 7596

Log:
Added vtiger_ in getUniqueID function parameter

Modified:
    vtigercrm/trunk/include/PopulateComboValues.php

Modified: vtigercrm/trunk/include/PopulateComboValues.php
==============================================================================
--- vtigercrm/trunk/include/PopulateComboValues.php (original)
+++ vtigercrm/trunk/include/PopulateComboValues.php Wed Jun 28 01:13:30 2006
@@ -34,7 +34,7 @@
 		$i=0;
 		foreach ($values as $val => $cal)
 		{
-			$id = $adb->getUniqueID($tableName);
+			$id = $adb->getUniqueID('vtiger_'.$tableName);
 			if($val != '')
 			{
 				$adb->query("insert into vtiger_".$tableName. " values(".$id.",'".$val."',".$i.",1)");



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 00:15:30 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 07:15:30 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7597 -
	/vtigercrm/trunk/include/utils/UserInfoUtil.php
Message-ID: <20060628071531.3B49A772524@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 28 01:14:53 2006
New Revision: 7597

Log:
Added vtiger_ in getUniqueID function parameter

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

Modified: vtigercrm/trunk/include/utils/UserInfoUtil.php
==============================================================================
--- vtigercrm/trunk/include/utils/UserInfoUtil.php (original)
+++ vtigercrm/trunk/include/utils/UserInfoUtil.php Wed Jun 28 01:14:53 2006
@@ -529,7 +529,7 @@
 	global $adb;
 	$parentRoleDetails=getRoleInformation($parentRoleId);
 	$parentRoleInfo=$parentRoleDetails[$parentRoleId];
-	$roleid_no=$adb->getUniqueId("role");
+	$roleid_no=$adb->getUniqueId("vtiger_role");
         $roleId='H'.$roleid_no;
         $parentRoleHr=$parentRoleInfo[1];
         $parentRoleDepth=$parentRoleInfo[2];
@@ -2803,7 +2803,7 @@
 	global $log;
 	$log->debug("Entering createGroup(".$groupName.",".$groupMemberArray.",".$description.") method ...");
 	global $adb;
-	$groupId=$adb->getUniqueId("groups");
+	$groupId=$adb->getUniqueId("vtiger_groups");
 	//Insert into group vtiger_table
 	$query = "insert into vtiger_groups values(".$groupId.",'".$groupName."','".$description."')";
 	$adb->query($query);
@@ -3266,7 +3266,7 @@
 	$log->debug("Entering addSharingRule(".$tabid.",".$shareEntityType.",".$toEntityType.",".$shareEntityId.",".$toEntityId.",".$sharePermission.") method ...");
 	
 	global $adb;
-	$shareid=$adb->getUniqueId("datashare_module_rel");
+	$shareid=$adb->getUniqueId("vtiger_datashare_module_rel");
 	
 
 	if($shareEntityType == 'groups' && $toEntityType == 'groups')



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 00:32:50 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 07:32:50 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7598 -
	/vtigercrm/trunk/install/populateSeedData.php
Message-ID: <20060628073251.102FB772524@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 28 01:32:19 2006
New Revision: 7598

Log:
Added vtiger_ in getUniqueID function parameter

Modified:
    vtigercrm/trunk/install/populateSeedData.php

Modified: vtigercrm/trunk/install/populateSeedData.php
==============================================================================
--- vtigercrm/trunk/install/populateSeedData.php (original)
+++ vtigercrm/trunk/install/populateSeedData.php Wed Jun 28 01:32:19 2006
@@ -181,7 +181,7 @@
 	
 	if ($i > 3)
 	{
-		$freetag = $adb->getUniqueId('freetags');
+		$freetag = $adb->getUniqueId('vtiger_freetags');
 		$query = "insert into vtiger_freetags values ($freetag, '$cloudtag[1]', '$cloudtag[1]')";
 		$res = $adb->query($query);
 
@@ -284,7 +284,7 @@
 	
 	if ($i > 8)
 	{
-		$freetag = $adb->getUniqueId('freetags');
+		$freetag = $adb->getUniqueId('vtiger_freetags');
 		$query = "insert into vtiger_freetags values ($freetag, '$cloudtag[2]', '$cloudtag[2]')";
 		$res1 = $adb->query($query);
 
@@ -700,7 +700,7 @@
 	$invoice_ids[] = $invoice->id;
 	if ($i > 3)
 	{
-		$freetag = $adb->getUniqueId('freetags');
+		$freetag = $adb->getUniqueId('vtiger_freetags');
 		$query = "insert into vtiger_freetags values ($freetag, '$cloudtag[0]', '$cloudtag[0]')";
 		$res_inv = $adb->query($query);
 
@@ -829,7 +829,7 @@
 	
 	if ($i > 3)
 	{
-		$freetag = $adb->getUniqueId('freetags');
+		$freetag = $adb->getUniqueId('vtiger_freetags');
 		$query = "insert into vtiger_freetags values ($freetag, '$cloudtag[3]', '$cloudtag[3]')";
 		$res_tkt = $adb->query($query);
 



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 00:56:46 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 07:56:46 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7599 -
	/vtigercrm/trunk/modules/Products/Save.php
Message-ID: <20060628075646.53B0D7726B2@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 28 01:56:42 2006
New Revision: 7599

Log:
changes made to fix the issue in trac id:1142

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

Modified: vtigercrm/trunk/modules/Products/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Products/Save.php (original)
+++ vtigercrm/trunk/modules/Products/Save.php Wed Jun 28 01:56:42 2006
@@ -24,8 +24,10 @@
 require_once('modules/Products/Product.php');
 require_once('include/logging.php');
 require_once('include/database/PearDatabase.php');
-global $log;
-
+global $log,$current_user;
+$currencyid=fetchCurrency($current_user->id);
+$rate_symbol = getCurrencySymbolandCRate($currencyid);
+$rate = $rate_symbol['rate'];
 $focus = new Product();
 if(isset($_REQUEST['record']))
 {
@@ -45,6 +47,11 @@
 	{
 		$value = $_REQUEST[$fieldname];
 		$focus->column_fields[$fieldname] = $value;
+	}
+	if(isset($_REQUEST['unit_price']))
+	{
+		$value = convertToDollar($_REQUEST['unit_price'],$rate);
+		$focus->column_fields['unit_price'] = $value;
 	}
 }
 



From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 28 00:58:29 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 28 Jun 2006 07:58:29 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231386=3A?=
 =?utf-8?q?_Attachment_is_not_Saved_while_duplicating_Notes?=
Message-ID: <076.23ff7f44f849d0ff988e6bfb215ede83@vtiger.fosslabs.com>

#1386: Attachment is not Saved while duplicating Notes
-----------------------+----------------------------------------------------
 Reporter:  ahmed      |       Owner:  mickie
     Type:  defect     |      Status:  new   
 Priority:  major      |   Milestone:        
Component:  vtigercrm  |     Version:  5.0.0 
 Keywords:             |  
-----------------------+----------------------------------------------------


-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1386>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 01:03:08 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 08:03:08 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7600 -
	/vtigercrm/trunk/modules/Notes/Save.php
Message-ID: <20060628080308.219057726E3@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 28 02:03:04 2006
New Revision: 7600

Log:
updated the notes save file removing vtiger_ prefix from field name  - ahmed

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

Modified: vtigercrm/trunk/modules/Notes/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Notes/Save.php (original)
+++ vtigercrm/trunk/modules/Notes/Save.php Wed Jun 28 02:03:04 2006
@@ -49,7 +49,7 @@
                 $attachmentid = $adb->query_result($result,0,'attachmentsid');
 	        if($attachmentid != '')
 	        {
-	                $attachquery = "select * from vtiger_attachments where vtiger_attachmentsid = ".$attachmentid;
+	                $attachquery = "select * from vtiger_attachments where attachmentsid = ".$attachmentid;
 	                $result = $adb->query($attachquery);
 	                $filename = $adb->query_result($result,0,'name');
 	                $filetype = $adb->query_result($result,0,'type');
@@ -59,7 +59,7 @@
 	                $_FILES['filename']['type'] = $filetype;
 
 			//we should read the file and calculate the size, without setting vtiger_filesize, attachment will not save
-	                $filesize = vtiger_filesize($filepath.$filename);
+	                $filesize = filesize($filepath.$filename);
 	                $_FILES['filename']['size'] = $filesize;
 	        }
 }



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 01:15:09 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 08:15:09 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7601 - in /vtigercrm/trunk:
 Smarty/templates/Emails.tpl include/js/general.js modules/Emails/Email.js
Message-ID: <20060628081510.2EBF1772713@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 28 02:15:02 2006
New Revision: 7601

Log:
issue in email massdelete has been fixed

Modified:
    vtigercrm/trunk/Smarty/templates/Emails.tpl
    vtigercrm/trunk/include/js/general.js
    vtigercrm/trunk/modules/Emails/Email.js

Modified: vtigercrm/trunk/Smarty/templates/Emails.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Emails.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Emails.tpl Wed Jun 28 02:15:02 2006
@@ -11,53 +11,6 @@
 -->*}
 <!--  USER  SETTINGS PAGE STARTS HERE -->
 <script language="javascript">
-function gotoWebmail()
-{ldelim}
-	new Ajax.Request(
-		'index.php',
-		{ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
-                	method: 'post',
-			postBody: "module=Webmails&action=WebmailsAjax&file=ListView&config_chk=true",
-			onComplete: function(response) {ldelim}
-				if(response.responseText != 'SUCESS')
-					$('mailconfchk').style.display = 'block';
-				else
-					window.location.href = "index.php?module=Webmails&action=index&parenttab=My Home Page";
-			{rdelim}
-		{rdelim}
-	);
-
-{rdelim}
-
-function setSubject(subject)
-{ldelim}
-	document.getElementById("subjectsetter").innerHTML=subject
-{rdelim}
-
-function getEmailContents(id)
-{ldelim}
-	$("status").style.display="inline";
-	var rowid = 'row_'+id;
-	getObj(rowid).className = 'prvPrfHoverOn';
-	if(gselectedrowid != 0 && gselectedrowid != id)
-	{ldelim}
-		var prev_selected_rowid = 'row_'+gselectedrowid;
-		getObj(prev_selected_rowid).className = 'prvPrfHoverOff';
-	{rdelim}
-	gselectedrowid = id;
-	new Ajax.Request(
-		'index.php',
-		{ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
-			method: 'post',
-			postBody: 'module=Emails&action=EmailsAjax&file=DetailView&mode=ajax&record='+id,
-			onComplete: function(response) {ldelim}
-						$("status").style.display="none";
-						$("EmailDetails").innerHTML = response.responseText;
-					{rdelim}
-			{rdelim}
-		);
-{rdelim}
-
 function ShowFolders(folderid)
 {ldelim}
 	$("status").style.display="inline";
@@ -109,23 +62,6 @@
 	);
 
 {rdelim}
-function getListViewEntries_js(module,url)
-{ldelim}
-	$("status").style.display="inline";
-	new Ajax.Request(
-		'index.php',
-		{ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
-                	method: 'post',
-			postBody: "module="+module+"&action="+module+"Ajax&file=ListView&ajax=true&"+url,
-			onComplete: function(response) {ldelim}
-				$("status").style.display="none";
-				$("email_con").innerHTML=response.responseText;
-				execJS(document.getElementById('email_con'));
-			{rdelim}
-		{rdelim}
-	);
-
-{rdelim}
 </script>
 		{include file='Buttons_List.tpl'}
 <script language="JavaScript" type="text/javascript" src="modules/Emails/Email.js"></script>

Modified: vtigercrm/trunk/include/js/general.js
==============================================================================
--- vtigercrm/trunk/include/js/general.js (original)
+++ vtigercrm/trunk/include/js/general.js Wed Jun 28 02:15:02 2006
@@ -1685,3 +1685,30 @@
                 }
 }
 
+var bSaf = (navigator.userAgent.indexOf('Safari') != -1);
+var bOpera = (navigator.userAgent.indexOf('Opera') != -1);
+var bMoz = (navigator.appName == 'Netscape');
+function execJS(node) {
+    var st = node.getElementsByTagName('SCRIPT');
+    var strExec;
+    for(var i=0;i<st.length; i++) {
+      if (bSaf) {
+        strExec = st[i].innerHTML;
+      }
+      else if (bOpera) {
+        strExec = st[i].text;
+      }
+      else if (bMoz) {
+        strExec = st[i].textContent;
+      }
+      else {
+        strExec = st[i].text;
+      }
+      try {
+        eval(strExec);
+      } catch(e) {
+        alert(e);
+      }
+    }
+}
+

Modified: vtigercrm/trunk/modules/Emails/Email.js
==============================================================================
--- vtigercrm/trunk/modules/Emails/Email.js (original)
+++ vtigercrm/trunk/modules/Emails/Email.js Wed Jun 28 02:15:02 2006
@@ -10,6 +10,164 @@
 
 var gFolderid = 1;
 var gselectedrowid = 0;
+function gotoWebmail()
+{
+	new Ajax.Request(
+		'index.php',
+		{queue: {position: 'end', scope: 'command'},
+                	method: 'post',
+			postBody: "module=Webmails&action=WebmailsAjax&file=ListView&config_chk=true",
+			onComplete: function(response) {
+				if(response.responseText != 'SUCESS')
+					$('mailconfchk').style.display = 'block';
+				else
+					window.location.href = "index.php?module=Webmails&action=index&parenttab=My Home Page";
+			}
+		}
+	);
+
+}
+
+function setSubject(subject)
+{
+	document.getElementById("subjectsetter").innerHTML=subject
+}
+
+function getEmailContents(id)
+{
+	$("status").style.display="inline";
+	var rowid = 'row_'+id;
+	getObj(rowid).className = 'prvPrfHoverOn';
+	if(gselectedrowid != 0 && gselectedrowid != id)
+	{
+		var prev_selected_rowid = 'row_'+gselectedrowid;
+		getObj(prev_selected_rowid).className = 'prvPrfHoverOff';
+	}
+	gselectedrowid = id;
+	new Ajax.Request(
+		'index.php',
+		{queue: {position: 'end', scope: 'command'},
+			method: 'post',
+			postBody: 'module=Emails&action=EmailsAjax&file=DetailView&mode=ajax&record='+id,
+			onComplete: function(response) {
+						$("status").style.display="none";
+						$("EmailDetails").innerHTML = response.responseText;
+					}
+			}
+		);
+}
+
+function getListViewEntries_js(module,url)
+{
+	$("status").style.display="inline";
+	new Ajax.Request(
+		'index.php',
+		{queue: {position: 'end', scope: 'command'},
+                	method: 'post',
+			postBody: "module="+module+"&action="+module+"Ajax&file=ListView&ajax=true&"+url,
+			onComplete: function(response) {
+				$("status").style.display="none";
+				$("email_con").innerHTML=response.responseText;
+				execJS(document.getElementById('email_con'));
+			}
+		}
+	);
+
+}
+
+function massDelete()
+{
+		var delete_selected_row = false;
+        x = document.massdelete.selected_id.length;
+        idstring = "";
+        if ( x == undefined)
+        {
+
+                if (document.massdelete.selected_id.checked)
+                {
+					if(document.massdelete.selected_id.value == gselectedrowid)
+					{
+						gselectedrowid = 0;
+						delete_selected_row = true;						
+					}
+                        idstring = document.massdelete.selected_id.value;
+						xx = 1;
+                }
+                else
+                {
+                        alert("Please select atleast one entity");
+                        return false;
+                }
+        }
+        else
+        {
+                xx = 0;
+                for(i = 0; i < x ; i++)
+                {
+                        if(document.massdelete.selected_id[i].checked)
+						{
+							if(document.massdelete.selected_id[i].value == gselectedrowid)
+							{
+								gselectedrowid = 0;
+								delete_selected_row = true;						
+							}
+							idstring = document.massdelete.selected_id[i].value +";"+idstring
+							xx++
+						}
+                }
+                if (xx != 0)
+                {
+                        document.massdelete.idlist.value=idstring;
+                }
+                else
+                {
+                        alert("Please select atleast one entity");
+                        return false;
+                }
+        }
+		if(confirm("Are you sure you want to delete the selected "+xx+" records ?"))
+		{	
+			getObj('search_text').value = '';
+			show("status");
+			if(!delete_selected_row)
+			{
+				new Ajax.Request(
+						'index.php',
+						{queue: {position: 'end', scope: 'command'},
+						method: 'post',
+						postBody: "module=Users&action=massdelete&folderid="+gFolderid+"&return_module=Emails&idlist="+idstring,
+						onComplete: function(response) {
+						$("status").style.display="none";
+						$("email_con").innerHTML=response.responseText;
+						execJS(document.getElementById('email_con'));
+						}
+						}
+						);
+			}
+			else	
+			{
+				new Ajax.Request(
+                        'index.php',
+                        {queue: {position: 'end', scope: 'command'},
+                                method: 'post',
+                                postBody: "module=Users&action=massdelete&folderid="+gFolderid+"&return_module=Emails&idlist="+idstring,
+                                onComplete: function(response) {
+                                                $("status").style.display="none";
+                                                $('EmailDetails').innerHTML = '<table valign="top" border="0" cellpadding="0" cellspacing="0" width="100%"><tbody><tr><td class="forwardBg"><table border="0" cellpadding="0" cellspacing="0" width="100%"><tbody><tr><td colspan="2">&nbsp;</td></tr></tbody></table></td></tr><tr><td style="padding-top: 10px;" bgcolor="#ffffff" height="300" valign="top"></td></tr></tbody></table>';
+                                                $("subjectsetter").innerHTML='';
+                                                $("email_con").innerHTML=response.responseText;
+                                                execJS($('email_con'));
+                                }
+                        }
+                );
+			}
+		}
+		else
+		{
+			return false;
+		}
+}
+
 function DeleteEmail(id)
 {
 	if(confirm("Are you sure you want to delete ?"))



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 02:17:14 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 09:17:14 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7602 -
	/vtigercrm/trunk/include/utils/ListViewUtils.php
Message-ID: <20060628091715.2ECF27727F3@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 28 03:17:11 2006
New Revision: 7602

Log:
changes made to fix the issue in trac id:1142

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 Jun 28 03:17:11 2006
@@ -973,7 +973,10 @@
 {
 	global $log;
 	$log->debug("Entering getValue(".$field_result.",". $list_result.",".$fieldname.",".$focus.",".$module.",".$entity_id.",".$list_result_count.",".$mode.",".$popuptype.",".$returnset.",".$viewid.") method ...");
-	global $adb;
+	global $adb,$current_user;
+	$currencyid=fetchCurrency($current_user->id);
+	$rate_symbol=getCurrencySymbolandCRate($currencyid);
+	$rate = $rate_symbol['rate'];
 	$tabname = getParentTab();
 	$uicolarr=$field_result[$fieldname];
 	foreach($uicolarr as $key=>$value)
@@ -1016,7 +1019,7 @@
 	{
 		if($temp_val != '' && $temp_val != 0)
 		{       //changes made to remove vtiger_currency symbol infront of each vtiger_potential amount
-                        $value = $temp_val;
+                        $value = convertFromDollar($temp_val,$rate);
 		}
 		else
 		{
@@ -1327,6 +1330,7 @@
 					$servicetax = getProductTaxPercentage('Service',$entity_id,'default');
 
 					$unitprice=$adb->query_result($list_result,$list_result_count,'unit_price');
+					$unitprice = convertFromDollar($unitprice,$rate);
 					$qty_stock=$adb->query_result($list_result,$list_result_count,'qtyinstock');
 					$value = '<a href="a" LANGUAGE=javascript onclick=\'set_return_inventory("'.$entity_id.'", "'.br2nl($temp_val).'", "'.$unitprice.'", "'.$qty_stock.'", "'.$vattax.'","'.$salestax.'","'.$servicetax.'","'.$row_id.'"); window.close()\'>'.$temp_val.'</a>';
 				}
@@ -1339,6 +1343,7 @@
 					$servicetax = getProductTaxPercentage('Service',$entity_id,'default');
 
 					$unitprice=$adb->query_result($list_result,$list_result_count,'unit_price');
+					$unitprice = convertFromDollar($unitprice,$rate);
 					$value = '<a href="a" LANGUAGE=javascript onclick=\'set_return_inventory_po("'.$entity_id.'", "'.br2nl($temp_val).'", "'.$unitprice.'", "'.$vattax.'","'.$salestax.'","'.$servicetax.'","'.$row_id.'"); window.close()\'>'.$temp_val.'</a>';
 				}
 				elseif($popuptype == "inventory_pb")
@@ -1509,6 +1514,10 @@
 					$value = '<a href="index.php?action=DetailView&module='.$module.'&record='.$entity_id.'&parenttab='.$tabname.'">'.$temp_val.'</a>';
 				}
 			}
+		}
+		elseif($fieldname == 'hdnGrandTotal' || $fieldname == 'expectedroi' || $fieldname == 'actualroi' || $fieldname == 'actualcost' || $fieldname == 'budgetcost' || $fieldname == 'expectedrevenue')
+		{
+			$value = convertFromDollar($temp_val,$rate);
 		}
 		else
 		{



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 02:17:41 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 09:17:41 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7603 -
	/vtigercrm/trunk/data/CRMEntity.php
Message-ID: <20060628091741.A8F057727F3@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 28 03:17:38 2006
New Revision: 7603

Log:
added the global var current_user - ahmed

Modified:
    vtigercrm/trunk/data/CRMEntity.php

Modified: vtigercrm/trunk/data/CRMEntity.php
==============================================================================
--- vtigercrm/trunk/data/CRMEntity.php (original)
+++ vtigercrm/trunk/data/CRMEntity.php Wed Jun 28 03:17:38 2006
@@ -542,7 +542,8 @@
   //code added by richie ends
   function insertIntoEntityTable($table_name, $module)
   {
-	  global $log;	
+	  global $log;
+  	  global $current_user;	  
 	   $log->info("function insertIntoCrmEntity ".$module.' vtiger_table name ' .$table_name);
 	  global $adb;
 	  $insertion_mode = $this->mode;



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 02:20:13 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 09:20:13 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7604 -
	/vtigercrm/trunk/modules/PurchaseOrder/Save.php
Message-ID: <20060628092013.6F23A7727F3@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 28 03:20:09 2006
New Revision: 7604

Log:
changes made to fix the issue in trac id:1142

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

Modified: vtigercrm/trunk/modules/PurchaseOrder/Save.php
==============================================================================
--- vtigercrm/trunk/modules/PurchaseOrder/Save.php (original)
+++ vtigercrm/trunk/modules/PurchaseOrder/Save.php Wed Jun 28 03:20:09 2006
@@ -28,7 +28,10 @@
 $local_log =& LoggerManager::getLogger('index');
 
 $focus = new Order();
-
+global $current_user;
+$currencyid=fetchCurrency($current_user->id);
+$rate_symbol = getCurrencySymbolandCRate($currencyid);
+$rate = $rate_symbol['rate'];
 setObjectValuesFromRequest(&$focus);
 
 //Added code for auto product stock updation on receiving goods
@@ -67,6 +70,7 @@
         $prod_status = $_REQUEST[$status_var];
         $qty = $_REQUEST[$qty_var];
         $listprice = $_REQUEST[$list_price_var];
+	$listprice = convertToDollar($listprice,$rate);
 	$vat = $_REQUEST[$vat_var];
 	$sales = $_REQUEST[$sales_var];
 	$service = $_REQUEST[$service_var];



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 02:28:30 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 09:28:30 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7605 - in /vtigercrm/trunk:
 include/utils/ListViewUtils.php modules/Activities/Save.php
Message-ID: <20060628092831.20C34772384@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 28 03:28:25 2006
New Revision: 7605

Log:
Issue in Emails list view has been fixed

Modified:
    vtigercrm/trunk/include/utils/ListViewUtils.php
    vtigercrm/trunk/modules/Activities/Save.php

Modified: vtigercrm/trunk/include/utils/ListViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/ListViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/ListViewUtils.php Wed Jun 28 03:28:25 2006
@@ -345,7 +345,7 @@
 	$log->debug("Entering getNavigationValues(".$display.",".$noofrows.",".$limit.") method ...");
 	$navigation_array = Array();   
 	global $limitpage_navigation;
-/*	if(isset($_REQUEST['allflag']) && $_REQUEST['allflag'] == 'All'){
+	if(isset($_REQUEST['allflag']) && $_REQUEST['allflag'] == 'All'){
 		$navigation_array['start'] =1;
 		$navigation_array['first'] = 1;
 		$navigation_array['end'] = 1;
@@ -357,7 +357,7 @@
 		$navigation_array['verylast'] =1;
 		$log->debug("Exiting getNavigationValues method ...");
 		return $navigation_array;
-	}*/
+	}
 	if($noofrows != 0)
 	$start = ((($display * $limit) - $limit)+1);
 	else
@@ -633,7 +633,7 @@
 								if(isPermitted("Activities",'EditView',$activityid) == 'yes')
 								{
 									// Fredy Klammsteiner, 4.8.2005: changes from 4.0.1 migrated to 4.2
-									$value = "<a href='index.php?return_module=Activities&return_action=index&return_id=".$activityid."&return_viewname=".$oCv->setdefaultviewid."&action=Save&module=Activities&record=".$activityid."&change_status=true".$evt_status."&start=".$navigation_array['current']."&allflag=".$navigation_array['allflag']."' style='".$P_FONT_COLOR."'>X</a>"; // Armando L??scher 05.07.2005 -> ??priority -> Desc: inserted style="$P_FONT_COLOR"
+									$value = "<a href='index.php?return_module=Activities&return_action=index&return_id=".$activityid."&return_viewname=".$oCv->setdefaultviewid."&action=Save&module=Activities&record=".$activityid."&change_status=true".$evt_status."&start=".$navigation_array['current']."' style='".$P_FONT_COLOR."'>X</a>"; // Armando L??scher 05.07.2005 -> ??priority -> Desc: inserted style="$P_FONT_COLOR"
 								}
 								else
 								{

Modified: vtigercrm/trunk/modules/Activities/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Activities/Save.php (original)
+++ vtigercrm/trunk/modules/Activities/Save.php Wed Jun 28 03:28:25 2006
@@ -157,10 +157,6 @@
 if($_REQUEST['return_viewname'] == '') $return_viewname='0';
 if($_REQUEST['return_viewname'] != '')$return_viewname=$_REQUEST['return_viewname'];
 if($_REQUEST['start'] !='')$page='&start='.$_REQUEST['start'];
-if($_REQUEST['allflag'] !='All')
-	$page.='&allflag=All';	
-else
-	$page.='&allflag=Normal';
 header("Location: index.php?action=$return_action&module=$return_module$view$hour$day$month$year&record=$return_id$activemode&viewname=$return_viewname$page");
 
 //Function to get the vtiger_activity details for mail body



From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 28 02:31:39 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 28 Jun 2006 09:31:39 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231378=3A?=
 =?utf-8?q?_Emails=3A_Improper_Export_link?=
In-Reply-To: <076.70d0318c40a5216b6e6108b9de7b7e0f@vtiger.fosslabs.com>
References: <076.70d0318c40a5216b6e6108b9de7b7e0f@vtiger.fosslabs.com>
Message-ID: <085.99b1b7b0a665cbe54d209e305cd0efee@vtiger.fosslabs.com>

#1378: Emails: Improper Export link
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  mickie
      Type:  defect     |      Status:  new   
  Priority:  blocker    |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by jerrydgeorge):

  * owner:  developer => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1378>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 02:34:28 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 09:34:28 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7606 -
	/vtigercrm/trunk/include/utils/CommonUtils.php
Message-ID: <20060628093428.74506772384@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 28 03:34:24 2006
New Revision: 7606

Log:
changes made to fix the issue in trac id:1142

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 Jun 28 03:34:24 2006
@@ -1504,6 +1504,10 @@
 {
 	global $log;
 	$log->debug("Entering setObjectValuesFromRequest(".$focus.") method ...");
+	global $current_user;
+	$currencyid=fetchCurrency($current_user->id);
+	$rate_symbol = getCurrencySymbolandCRate($currencyid);
+	$rate = $rate_symbol['rate'];
 	if(isset($_REQUEST['record']))
 	{
 		$focus->id = $_REQUEST['record'];
@@ -1519,6 +1523,27 @@
 			$value = $_REQUEST[$fieldname];
 			$focus->column_fields[$fieldname] = $value;
 		}
+		if(isset($_REQUEST['txtTax']))
+		{
+			$value = convertToDollar($_REQUEST['txtTax'],$rate);
+			$focus->column_fields['txtTax'] = $value;
+		}
+		if(isset($_REQUEST['txtAdjustment']))
+		{
+			$value = convertToDollar($_REQUEST['txtAdjustment'],$rate);
+			$focus->column_fields['txtAdjustment'] = $value;
+		}
+		if(isset($_REQUEST['hdnSubTotal']))
+		{
+			$value = convertToDollar($_REQUEST['hdnSubTotal'],$rate);
+			$focus->column_fields['hdnSubTotal'] = $value;
+		}
+		if(isset($_REQUEST['hdnGrandTotal']))
+		{
+			$value = convertToDollar($_REQUEST['hdnGrandTotal'],$rate);
+			$focus->column_fields['hdnGrandTotal'] = $value;
+		}
+
 	}
 	$log->debug("Exiting setObjectValuesFromRequest method ...");
 }



From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 28 02:38:38 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 28 Jun 2006 09:38:38 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231374=3A?=
 =?utf-8?q?_Home_Page_-_Fully_collapsed?=
In-Reply-To: <076.5909c15d740b3c4920a3ae718e2cea9e@vtiger.fosslabs.com>
References: <076.5909c15d740b3c4920a3ae718e2cea9e@vtiger.fosslabs.com>
Message-ID: <085.6e41ab094f78351a862c0639ccb79b02@vtiger.fosslabs.com>

#1374: Home Page - Fully collapsed
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  ela  
      Type:  defect     |      Status:  new  
  Priority:  critical   |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by jerrydgeorge):

  * owner:  developer => ela

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1374>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 02:43:17 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 09:43:17 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7607 -
	/vtigercrm/trunk/modules/PurchaseOrder/EditView.php
Message-ID: <20060628094317.083AC839A1F@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 28 03:43:14 2006
New Revision: 7607

Log:
changes made to fix the issue in trac id:1142

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

Modified: vtigercrm/trunk/modules/PurchaseOrder/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/PurchaseOrder/EditView.php (original)
+++ vtigercrm/trunk/modules/PurchaseOrder/EditView.php Wed Jun 28 03:43:14 2006
@@ -33,7 +33,10 @@
 
 $focus = new Order();
 $smarty = new vtigerCRM_Smarty();
-
+global $current_user;
+$currencyid=fetchCurrency($current_user->id);
+$rate_symbol = getCurrencySymbolandCRate($currencyid);
+$rate = $rate_symbol['rate'];
 if(isset($_REQUEST['record']) && $_REQUEST['record'] != '') 
 {
     $focus->id = $_REQUEST['record'];
@@ -121,26 +124,27 @@
 	$associated_prod = getAssociatedProducts("PurchaseOrder",$focus);
 	$smarty->assign("ASSOCIATEDPRODUCTS", $associated_prod);
 	$smarty->assign("MODE", $focus->mode);
-	$smarty->assign("TAXVALUE", $focus->column_fields['txtTax']);
-	$smarty->assign("ADJUSTMENTVALUE", $focus->column_fields['txtAdjustment']);
-	$smarty->assign("SUBTOTAL", $focus->column_fields['hdnSubTotal']);
-	$smarty->assign("GRANDTOTAL", $focus->column_fields['hdnGrandTotal']);
+	$smarty->assign("TAXVALUE", convertFromDollar($focus->column_fields['txtTax'],$rate));
+	$smarty->assign("ADJUSTMENTVALUE", convertFromDollar($focus->column_fields['txtAdjustment'],$rate));
+	$smarty->assign("SUBTOTAL", convertFromDollar($focus->column_fields['hdnSubTotal'],$rate));
+	$smarty->assign("GRANDTOTAL", convertFromDollar($focus->column_fields['hdnGrandTotal'],$rate));
 }
 elseif(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true')
 {
 	$smarty->assign("ROWCOUNT", $num_of_products);
 	$smarty->assign("ASSOCIATEDPRODUCTS", $associated_prod);
 	$smarty->assign("MODE", $focus->mode);
-	$smarty->assign("TAXVALUE", $focus->column_fields['txtTax']);
-	$smarty->assign("ADJUSTMENTVALUE", $focus->column_fields['txtAdjustment']);
-	$smarty->assign("SUBTOTAL", $focus->column_fields['hdnSubTotal']);
-	$smarty->assign("GRANDTOTAL", $focus->column_fields['hdnGrandTotal']);
+	$smarty->assign("TAXVALUE", convertFromDollar($focus->column_fields['txtTax'],$rate));
+	$smarty->assign("ADJUSTMENTVALUE", convertFromDollar($focus->column_fields['txtAdjustment'],$rate));
+	$smarty->assign("SUBTOTAL", convertFromDollar($focus->column_fields['hdnSubTotal'],$rate));
+	$smarty->assign("GRANDTOTAL", convertFromDollar($focus->column_fields['hdnGrandTotal'],$rate));
 
 }
 elseif((isset($_REQUEST['product_id']) && $_REQUEST['product_id'] != '')) {
         $smarty->assign("ROWCOUNT", $num_of_products);
         $smarty->assign("ASSOCIATEDPRODUCTS", $associated_prod);
 	$InvTotal = getInventoryTotal($_REQUEST['return_module'],$_REQUEST['return_id']);
+	$InvTotal = convertFromDollar($InvTotal,$rate);
         $smarty->assign("MODE", $focus->mode);
         $smarty->assign("TAXVALUE", "0.000");
         $smarty->assign("ADJUSTMENTVALUE", "0.000");



From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 28 02:45:37 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 28 Jun 2006 09:45:37 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231387=3A?=
 =?utf-8?q?_ALL_Menu_layer_showing_inconsistent_border_lines=2E?=
Message-ID: <076.d418171c6cb5f98dec1db7b9af0277d5@vtiger.fosslabs.com>

#1387: ALL Menu layer showing inconsistent border lines.
-----------------------+----------------------------------------------------
 Reporter:  ahmed      |       Owner:  ela  
     Type:  defect     |      Status:  new  
 Priority:  major      |   Milestone:       
Component:  vtigercrm  |     Version:  5.0.0
 Keywords:             |  
-----------------------+----------------------------------------------------


-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1387>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 28 02:46:38 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 28 Jun 2006 09:46:38 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231373=3A?=
 =?utf-8?q?_Accounts_=3E_New_Custom_view_=3A_No_navigation_link?=
In-Reply-To: <076.89b574125c4524982f3f9b818aabf9f7@vtiger.fosslabs.com>
References: <076.89b574125c4524982f3f9b818aabf9f7@vtiger.fosslabs.com>
Message-ID: <085.8e0fff1471736c0992d112162cc8bac2@vtiger.fosslabs.com>

#1373: Accounts > New Custom view : No navigation link
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  jerrydgeorge
      Type:  defect     |      Status:  new         
  Priority:  major      |   Milestone:              
 Component:  vtigercrm  |     Version:  5.0.0       
Resolution:             |    Keywords:              
------------------------+---------------------------------------------------
Changes (by jerrydgeorge):

  * owner:  developer => jerrydgeorge

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1373>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 02:46:50 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 09:46:50 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7608 -
	/vtigercrm/trunk/Smarty/templates/CustomView.tpl
Message-ID: <20060628094650.D3545839AB4@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 28 03:46:46 2006
New Revision: 7608

Log:
#Fixes 1373

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 Wed Jun 28 03:46:46 2006
@@ -104,7 +104,7 @@
   <td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
   <td class="showPanelBg" valign="top" width="100%">
    <div class="small" style="padding: 20px;">
-      <span class="lvtHeaderText">{$APP.$MODULE} &gt; {$MOD.New_Custom_View}</span> <br>
+	<span class="lvtHeaderText"><a class="hdrLink" href="index.php?action=ListView&module={$MODULE}&parenttab={$CATEGORY}">{$APP.$MODULE}</a> &gt; {$MOD.New_Custom_View}</span> <br>
       <hr noshade="noshade" size="1">
       <form name="EditView" method="post" enctype="multipart/form-data" action="index.php">
             <table align="center" border="0" cellpadding="0" cellspacing="0" width="95%">



From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 28 02:49:01 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 28 Jun 2006 09:49:01 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231373=3A?=
 =?utf-8?q?_Accounts_=3E_New_Custom_view_=3A_No_navigation_link?=
In-Reply-To: <076.89b574125c4524982f3f9b818aabf9f7@vtiger.fosslabs.com>
References: <076.89b574125c4524982f3f9b818aabf9f7@vtiger.fosslabs.com>
Message-ID: <085.71490f99207b1e16a95aa48a06d84f76@vtiger.fosslabs.com>

#1373: Accounts > New Custom view : No navigation link
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  jerrydgeorge
      Type:  defect     |      Status:  closed      
  Priority:  major      |   Milestone:              
 Component:  vtigercrm  |     Version:  5.0.0       
Resolution:  fixed      |    Keywords:              
------------------------+---------------------------------------------------
Changes (by jerrydgeorge):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1373>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 02:57:37 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 09:57:37 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7609 -
	/vtigercrm/trunk/include/utils/utils.php
Message-ID: <20060628095737.AB84083EC80@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 28 03:57:33 2006
New Revision: 7609

Log:
changes made to fix the issue in trac id:1142

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 Jun 28 03:57:33 2006
@@ -1216,7 +1216,10 @@
 
 function getUnitPrice($productid)
 {
-	global $log;
+	global $log,$current_user;
+	$currencyid=fetchCurrency($current_user->id);
+	$rate_symbol = getCurrencySymbolandCRate($currencyid);
+	$rate = $rate_symbol['rate'];
 	$log->debug("Entering getUnitPrice(".$productid.") method ...");
         $log->info("in getUnitPrice productid ".$productid);
 
@@ -1224,6 +1227,7 @@
         $query = "select unit_price from vtiger_products where productid=".$productid;
         $result = $adb->query($query);
         $up = $adb->query_result($result,0,'unit_price');
+	$up = convertFromDollar($up,$rate);
 	$log->debug("Exiting getUnitPrice method ...");
         return $up;
 }



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 03:05:03 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 10:05:03 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7610 -
 /vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php
Message-ID: <20060628100503.CB14683EFFC@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 28 04:04:59 2006
New Revision: 7610

Log:
* Added queries to modify the database which are all the changed have been made in betweeb June 23 to 28

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 Jun 28 04:04:59 2006
@@ -3197,8 +3197,35 @@
 
 Execute("insert into vtiger_field values (2,".$conn->getUniqueID("vtiger_field").",'campaignid','vtiger_potential',1,'58','campaignid','Campaign Source',1,0,0,100,12,1,1,'N~O',1,null,'BAS')");
 
-
-
+//Added on 28-06-06
+//Campaigns module added in Leads and Contacts RelatedList
+Execute("insert into vtiger_relatedlists values(".$conn->getUniqueID('vtiger_relatedlists').",".getTabid("Leads").",".getTabid("Campaigns").",'get_campaigns',6,'Campaigns',0)");
+Execute("insert into vtiger_relatedlists values(".$conn->getUniqueID('vtiger_relatedlists').",".getTabid("Contacts").",".getTabid("Campaigns").",'get_campaigns',11,'Campaigns',0)");
+
+//campaignid removed from vtiger_leaddetails and vtiger_contactdetails tables
+Execute("alter table vtiger_leaddetails drop column campaignid");
+Execute("alter table vtiger_contactdetails drop column campaignid");
+
+//Contact Name has been removed from Events Information
+Execute("delete from vtiger_field where tabid=16 and fieldname='contact_id'");
+
+//queries to resequence the fields
+$fieldname=array('eventstatus','sendnotification','activitytype','location','createdtime','modifiedtime','taskpriority','notime','visibility');
+$tablename=array('vtiger_activity','vtiger_activity','vtiger_activity','vtiger_activity','vtiger_crmentity','vtiger_crmentity','vtiger_activity','vtiger_activity','vtiger_activity');
+
+$sequence = array(10,11,12,13,14,15,16,17,18);
+for($j = 0;$j < 9;$j++)
+{
+	Execute("update vtiger_field set sequence=".$sequence[$j]." where tablename='".$tablename[$j]."' && fieldname='".$fieldname[$j]."' and tabid=16");
+}
+
+//Campaign has been removed from field table
+Execute("delete from vtiger_field where tabid=7 and fieldname='campaignid'");
+Execute("delete from vtiger_field where tabid=4 and fieldname='campaignid'");
+
+//Query added to have Calendar under Marketing and Support
+$conn->query("insert into vtiger_parenttabrel values (2,17,7)");
+$conn->query("insert into vtiger_parenttabrel values (4,17,9)");
 
 
 



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 03:06:06 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 10:06:06 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7611 - in /vtigercrm/trunk:
 Smarty/templates/ include/js/ modules/Calendar/ modules/Emails/
 modules/PriceBooks/ modules/Settings/ modules/Users/
Message-ID: <20060628100607.1E662839AB4@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 28 04:05:52 2006
New Revision: 7611

Log:
alert message atleast changed to at least

Modified:
    vtigercrm/trunk/Smarty/templates/GroupEditView.tpl
    vtigercrm/trunk/Smarty/templates/ListEmailTemplates.tpl
    vtigercrm/trunk/Smarty/templates/ListWordTemplates.tpl
    vtigercrm/trunk/Smarty/templates/Reports.tpl
    vtigercrm/trunk/include/js/ListView.js
    vtigercrm/trunk/include/js/Mail.js
    vtigercrm/trunk/include/js/Merge.js
    vtigercrm/trunk/include/js/general.js
    vtigercrm/trunk/modules/Calendar/script.js
    vtigercrm/trunk/modules/Emails/Email.js
    vtigercrm/trunk/modules/PriceBooks/PriceBook.js
    vtigercrm/trunk/modules/Settings/ListMailAccount.php
    vtigercrm/trunk/modules/Users/Users.js

Modified: vtigercrm/trunk/Smarty/templates/GroupEditView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/GroupEditView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/GroupEditView.tpl Wed Jun 28 04:05:52 2006
@@ -144,7 +144,7 @@
 	if(document.newGroupForm.selectedColumnsString.value.replace(/^\s+/g, '').replace(/\s+$/g, '').length==0)
 	{ldelim}
 
-		alert('Group should have atleast one member. Select a member to the group');
+		alert('Group should have at least one member. Select a member to the group');
 		return false;
 	{rdelim}
 	dup_validation();	

Modified: vtigercrm/trunk/Smarty/templates/ListEmailTemplates.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ListEmailTemplates.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ListEmailTemplates.tpl Wed Jun 28 04:05:52 2006
@@ -26,7 +26,7 @@
                 {rdelim}
                 else
                 {ldelim}
-                        alert("Please select atleast one entity");
+                        alert("Please select at least one entity");
                         return false;
                 {rdelim}
         {rdelim}
@@ -47,7 +47,7 @@
                 {rdelim}
                else
                 {ldelim}
-                        alert("Please select atleast one entity");
+                        alert("Please select at least one entity");
                         return false;
                 {rdelim}
        {rdelim}

Modified: vtigercrm/trunk/Smarty/templates/ListWordTemplates.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ListWordTemplates.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ListWordTemplates.tpl Wed Jun 28 04:05:52 2006
@@ -26,7 +26,7 @@
                 {rdelim}
                 else
                 {ldelim}
-                        alert("Please select atleast one entity");
+                        alert("Please select at least one entity");
                         return false;
                 {rdelim}
         {rdelim}
@@ -47,7 +47,7 @@
                 {rdelim}
                else
                 {ldelim}
-                        alert("Please select atleast one entity");
+                        alert("Please select at least one entity");
                         return false;
                 {rdelim}
        {rdelim}

Modified: vtigercrm/trunk/Smarty/templates/Reports.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Reports.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Reports.tpl Wed Jun 28 04:05:52 2006
@@ -238,7 +238,7 @@
 			
 	}else
 	{
-		alert('Please select atleast one Report');
+		alert('Please select at least one Report');
 		return false;
 	}
 }
@@ -318,7 +318,7 @@
 			
 	}else
 	{
-		alert('Please select atleast one Report');
+		alert('Please select at least one Report');
 		return false;
 	}
 }

Modified: vtigercrm/trunk/include/js/ListView.js
==============================================================================
--- vtigercrm/trunk/include/js/ListView.js (original)
+++ vtigercrm/trunk/include/js/ListView.js Wed Jun 28 04:05:52 2006
@@ -29,7 +29,7 @@
 	}
 	else
 	{
-		alert("Please select atleast one entity");
+		alert("Please select at least one entity");
 		return false;
 	}
 	fnvshobj(obj,divid);
@@ -56,7 +56,7 @@
         }
         else
         {
-            alert("Please select atleast one entity");
+            alert("Please select at least one entity");
             return false;
         }
 		if(confirm("Are you sure you want to delete the selected "+xx+" records ?"))

Modified: vtigercrm/trunk/include/js/Mail.js
==============================================================================
--- vtigercrm/trunk/include/js/Mail.js (original)
+++ vtigercrm/trunk/include/js/Mail.js Wed Jun 28 04:05:52 2006
@@ -31,7 +31,7 @@
 	}
 	else
 	{
-		alert("Please select atleast one entity");
+		alert("Please select at least one entity");
 		return false;
 	}
 	allids = document.massdelete.idlist.value;	
@@ -56,7 +56,7 @@
                 }
                 else
                 {
-                        alert("Please select atleast one entity");
+                        alert("Please select at least one entity");
                         return false;
                 }
         }
@@ -77,7 +77,7 @@
                 }
                 else
                 {
-                        alert("Please select atleast one entity");
+                        alert("Please select at least one entity");
                         return false;
                 }
         }

Modified: vtigercrm/trunk/include/js/Merge.js
==============================================================================
--- vtigercrm/trunk/include/js/Merge.js (original)
+++ vtigercrm/trunk/include/js/Merge.js Wed Jun 28 04:05:52 2006
@@ -25,7 +25,7 @@
                 else
                 {
                 			
-                        alert("Please select atleast one entity");
+                        alert("Please select at least one entity");
                         return false;
                 }
         }
@@ -47,7 +47,7 @@
                else
                 {
                 			
-                        alert("Please select atleast one entity");
+                        alert("Please select at least one entity");
                         return false;
                 }
         }

Modified: vtigercrm/trunk/include/js/general.js
==============================================================================
--- vtigercrm/trunk/include/js/general.js (original)
+++ vtigercrm/trunk/include/js/general.js Wed Jun 28 04:05:52 2006
@@ -1649,7 +1649,7 @@
                 }
                 else
 		{
-                        alert("Please select atleast one entity");
+                        alert("Please select at least one entity");
                         return false;
                 }
         }
@@ -1670,7 +1670,7 @@
                 }
                  else
                 {
-                        alert("Please select atleast one entity");
+                        alert("Please select at least one entity");
                         return false;
                 }
         }

Modified: vtigercrm/trunk/modules/Calendar/script.js
==============================================================================
--- vtigercrm/trunk/modules/Calendar/script.js (original)
+++ vtigercrm/trunk/modules/Calendar/script.js Wed Jun 28 04:05:52 2006
@@ -23,7 +23,7 @@
                 }
                 else
                 {
-                        alert("Please select atleast one user");
+                        alert("Please select at least one user");
                         return false;
                 }
         }
@@ -43,7 +43,7 @@
                 }
                 else
                 {
-                        alert("Please select atleast one user");
+                        alert("Please select at least one user");
                         return false;
                 }
         }

Modified: vtigercrm/trunk/modules/Emails/Email.js
==============================================================================
--- vtigercrm/trunk/modules/Emails/Email.js (original)
+++ vtigercrm/trunk/modules/Emails/Email.js Wed Jun 28 04:05:52 2006
@@ -95,7 +95,7 @@
                 }
                 else
                 {
-                        alert("Please select atleast one entity");
+                        alert("Please select at least one entity");
                         return false;
                 }
         }
@@ -121,7 +121,7 @@
                 }
                 else
                 {
-                        alert("Please select atleast one entity");
+                        alert("Please select at least one entity");
                         return false;
                 }
         }

Modified: vtigercrm/trunk/modules/PriceBooks/PriceBook.js
==============================================================================
--- vtigercrm/trunk/modules/PriceBooks/PriceBook.js (original)
+++ vtigercrm/trunk/modules/PriceBooks/PriceBook.js Wed Jun 28 04:05:52 2006
@@ -47,7 +47,7 @@
 		}
 		else 
 		{
-			alert("Please select atleast one entity");
+			alert("Please select at least one entity");
 			return false;
 		}
 	}
@@ -96,7 +96,7 @@
 		}
 		else
 		{
-			alert("Please select atleast one entity");
+			alert("Please select at least one entity");
 			return false;
 		}
 	}

Modified: vtigercrm/trunk/modules/Settings/ListMailAccount.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/ListMailAccount.php (original)
+++ vtigercrm/trunk/modules/Settings/ListMailAccount.php Wed Jun 28 04:05:52 2006
@@ -131,7 +131,7 @@
                 }
                 else
                 {
-                        alert("Please select atleast one entity");
+                        alert("Please select at least one entity");
                         return false;
                 }
         }
@@ -153,7 +153,7 @@
                 }
                 else
                 {
-                        alert("Please select atleast one entity");
+                        alert("Please select at least one entity");
                         return false;
                 }
         }

Modified: vtigercrm/trunk/modules/Users/Users.js
==============================================================================
--- vtigercrm/trunk/modules/Users/Users.js (original)
+++ vtigercrm/trunk/modules/Users/Users.js Wed Jun 28 04:05:52 2006
@@ -35,7 +35,7 @@
                 }
                 else
                 {
-                        alert("Please select atleast one entity");
+                        alert("Please select at least one entity");
                         return false;
                 }
         }
@@ -56,7 +56,7 @@
                 }
                 else
                 {
-			alert("Please select atleast one entity");
+			alert("Please select at least one entity");
 	                return false;
                 }
         }



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 03:07:30 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 10:07:30 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7612 - in /vtigercrm/trunk:
 include/js/Inventory.js modules/Products/AddProductToPriceBooks.html
Message-ID: <20060628100730.C067083EFFC@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 28 04:07:24 2006
New Revision: 7612

Log:
alert msg changed from atleast to at least

Modified:
    vtigercrm/trunk/include/js/Inventory.js
    vtigercrm/trunk/modules/Products/AddProductToPriceBooks.html

Modified: vtigercrm/trunk/include/js/Inventory.js
==============================================================================
--- vtigercrm/trunk/include/js/Inventory.js (original)
+++ vtigercrm/trunk/include/js/Inventory.js Wed Jun 28 04:07:24 2006
@@ -343,7 +343,7 @@
 
 	if(rowCnt == 0)
 	{
-		alert('No product is selected. Select atleast one Product');
+		alert('No product is selected. Select at least one Product');
 		return false;
 	}
 

Modified: vtigercrm/trunk/modules/Products/AddProductToPriceBooks.html
==============================================================================
--- vtigercrm/trunk/modules/Products/AddProductToPriceBooks.html (original)
+++ vtigercrm/trunk/modules/Products/AddProductToPriceBooks.html Wed Jun 28 04:07:24 2006
@@ -46,7 +46,7 @@
 		}
 		else 
 		{
-			alert("Please select atleast one entity");
+			alert("Please select at least one entity");
 			return false;
 		}
 	}
@@ -95,7 +95,7 @@
 		}
 		else
 		{
-			alert("Please select atleast one entity");
+			alert("Please select at least one entity");
 			return false;
 		}
 	}



From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 28 03:07:34 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 28 Jun 2006 10:07:34 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231376=3A?=
 =?utf-8?q?_Error_message=3A_Please_select_atleast_one_record?=
In-Reply-To: <076.41781f98ac9f5dfb9527fcc3083cd3c1@vtiger.fosslabs.com>
References: <076.41781f98ac9f5dfb9527fcc3083cd3c1@vtiger.fosslabs.com>
Message-ID: <085.b1a09aacdef4d0215493b31fb855a5be@vtiger.fosslabs.com>

#1376: Error message: Please select atleast one record
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  jerrydgeorge
      Type:  defect     |      Status:  new         
  Priority:  minor      |   Milestone:              
 Component:  vtigercrm  |     Version:  5.0.0       
Resolution:             |    Keywords:              
------------------------+---------------------------------------------------
Changes (by jerrydgeorge):

  * owner:  developer => jerrydgeorge

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1376>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 28 03:07:44 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 28 Jun 2006 10:07:44 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231376=3A?=
 =?utf-8?q?_Error_message=3A_Please_select_atleast_one_record?=
In-Reply-To: <076.41781f98ac9f5dfb9527fcc3083cd3c1@vtiger.fosslabs.com>
References: <076.41781f98ac9f5dfb9527fcc3083cd3c1@vtiger.fosslabs.com>
Message-ID: <085.75289fff29821293af7d73d71d581596@vtiger.fosslabs.com>

#1376: Error message: Please select atleast one record
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  jerrydgeorge
      Type:  defect     |      Status:  closed      
  Priority:  minor      |   Milestone:              
 Component:  vtigercrm  |     Version:  5.0.0       
Resolution:  fixed      |    Keywords:              
------------------------+---------------------------------------------------
Changes (by jerrydgeorge):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1376>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 03:07:57 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 10:07:57 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7613 -
	/vtigercrm/trunk/include/utils/EditViewUtils.php
Message-ID: <20060628100757.97A3983EFFC@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 28 04:07:53 2006
New Revision: 7613

Log:
changes made to fix the issue in trac id:1142

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

Modified: vtigercrm/trunk/include/utils/EditViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/EditViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/EditViewUtils.php Wed Jun 28 04:07:53 2006
@@ -58,6 +58,11 @@
 	$custfld = '';
 	$ui_type[]= $uitype;
 	$editview_fldname[] = $fieldname;
+
+	$currencyid=fetchCurrency($current_user->id);
+	$rate_symbol = getCurrencySymbolandCRate($currencyid);
+	$rate = $rate_symbol['rate'];
+	$currency= $rate_symbol['symbol'];
 
 	if($generatedtype == 2)
 		$mod_strings[$fieldlabel] = $fieldlabel;
@@ -953,10 +958,6 @@
 	
 	elseif($uitype == 71 || $uitype == 72)
 	{
-		$currencyid=fetchCurrency($current_user->id);
-		$rate_symbol = getCurrencySymbolandCRate($currencyid);
-		$rate = $rate_symbol['rate'];
-		$currency= $rate_symbol['symbol'];
 		$editview_label[]=$mod_strings[$fieldlabel].': ('.$currency.')';
 		if($value!='')
 		        $fieldvalue[] = convertFromDollar($value,$rate);
@@ -1155,7 +1156,12 @@
 			$value = $_REQUEST['mg_subject'];
 		}
 		$editview_label[]=$mod_strings[$fieldlabel];
-		$fieldvalue[] = $value;
+		if($uitype == 1 && ($fieldname=='expectedrevenue' || $fieldname=='budgetcost' || $fieldname=='actualcost' || $fieldname=='expectedroi' || $fieldname=='actualroi' ) && ($module_name=='Campaigns'))
+		{
+			$fieldvalue[] = convertFromDollar($value,$rate);
+		}
+		else
+			$fieldvalue[] = $value;
 	}
 
 	// Mike Crowe Mod --------------------------------------------------------force numerics right justified.
@@ -1305,7 +1311,10 @@
 	$log->debug("Entering getAssociatedProducts(".$module.",".$focus.",".$seid=''.") method ...");
 	global $adb;
 	$output = '';
-	global $theme;
+	global $theme,$current_user;
+	$currencyid=fetchCurrency($current_user->id);
+	$rate_symbol = getCurrencySymbolandCRate($currencyid);
+	$rate = $rate_symbol['rate'];
 	$theme_path="themes/".$theme."/";
 	$image_path=$theme_path."images/";
 	$product_Detail = Array();
@@ -1370,6 +1379,9 @@
 		{
 			$product_Detail[$i]['qtyInStock'.$i]=$qtyinstock;
 		}
+		$unitprice=convertFromDollar($unitprice,$rate);
+		$listprice=convertFromDollar($listprice,$rate);
+		$total_with_tax =convertFromDollar($total_with_tax,$rate);
 		$product_Detail[$i]['txtQty'.$i]=$qty;
 		$product_Detail[$i]['unitPrice'.$i]=$unitprice;
 		$product_Detail[$i]['txtListPrice'.$i]=$listprice;



From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 28 03:08:35 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 28 Jun 2006 10:08:35 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231372=3A?=
 =?utf-8?q?_Custom_Veiw=3A_List_in_Metrics_option_is_wrong_function?=
In-Reply-To: <076.4043c7ad57292395a7049af96923eab8@vtiger.fosslabs.com>
References: <076.4043c7ad57292395a7049af96923eab8@vtiger.fosslabs.com>
Message-ID: <085.1d3b07b8950ab20c31f5757ccf35cde3@vtiger.fosslabs.com>

#1372: Custom Veiw: List in Metrics option is wrong function
--------------------------+-------------------------------------------------
  Reporter:  gopal        |       Owner:  developer
      Type:  enhancement  |      Status:  closed   
  Priority:  critical     |   Milestone:           
 Component:  vtigercrm    |     Version:  5.0.0    
Resolution:  fixed        |    Keywords:           
--------------------------+-------------------------------------------------
Changes (by jerrydgeorge):

  * resolution:  => fixed
  * status:  new => closed
  * type:  defect => enhancement

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1372>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 03:21:10 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 10:21:10 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7614 -
	/vtigercrm/trunk/include/utils/DetailViewUtils.php
Message-ID: <20060628102110.ADDD3839AB4@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 28 04:21:07 2006
New Revision: 7614

Log:
changes made to fix the issue in trac id:1142

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 Wed Jun 28 04:21:07 2006
@@ -49,7 +49,10 @@
 	$arr_data =Array();
 	$label_fld = Array();
 	$data_fld = Array();
-
+	$currencyid=fetchCurrency($current_user->id);
+	$rate_symbol=getCurrencySymbolandCRate($currencyid);
+	$rate = $rate_symbol['rate'];
+	$curr_symbol = $rate_symbol['symbol'];
 	if($generatedtype == 2)
 		$mod_strings[$fieldlabel] = $fieldlabel;
 
@@ -761,10 +764,6 @@
 	{
 		$label_fld[] =$mod_strings[$fieldlabel];
 		$display_val = '';
-		$currencyid=fetchCurrency($current_user->id);
-		$rate_symbol = getCurrencySymbolandCRate($currencyid);
-		$rate = $rate_symbol['rate'];
-		$curr_symbol = $rate_symbol['symbol'];
 	        if($col_fields[$fieldname] != '' && $col_fields[$fieldname] != 0)
 		{
 	 	    $amount_user_specific=convertFromDollar($col_fields[$fieldname],$rate);
@@ -860,11 +859,14 @@
 	}
 	else
 	{
-	
 	 $label_fld[] =$mod_strings[$fieldlabel];
-          if($col_fields[$fieldname]=='0')
-                $col_fields[$fieldname]='';
-	
+        if($col_fields[$fieldname]=='0')
+              $col_fields[$fieldname]='';
+	 if($uitype == 1 && ($fieldname=='expectedrevenue' || $fieldname=='budgetcost' || $fieldname=='actualcost' || $fieldname=='expectedroi' || $fieldname=='actualroi' ))
+	 {
+		$label_fld[] = convertFromDollar($col_fields[$fieldname],$rate);
+	 }
+	else
 		$label_fld[] = $col_fields[$fieldname];
 	}
 	$label_fld[]=$uitype;
@@ -895,8 +897,10 @@
 	global $adb;
 	global $theme;
 	global $log;
-	global $app_strings;
-	
+	global $app_strings,$current_user;
+	$currencyid=fetchCurrency($current_user->id);
+	$rate_symbol=getCurrencySymbolandCRate($currencyid);
+	$rate = $rate_symbol['rate'];
 	$theme_path="themes/".$theme."/";
 	$image_path=$theme_path."images/";
 	$log->debug("in getDetailAssociatedProducts. Module is  ".$module);
@@ -964,6 +968,9 @@
 		{	
 			$output .= '<td>'.$qtyinstock.'</td>';
 		}
+		$unitprice = convertFromDollar($unitprice,$rate);
+		$listprice = convertFromDollar($listprice,$rate);
+		$total_with_tax = convertFromDollar($total_with_tax,$rate);
 		$output .= '<td style="padding:3px;">'.$qty.'</td>';
 		$output .= '<td style="padding:3px;">'.$unitprice.'</td>';
 		$output .= '<td style="padding:3px;">'.$listprice.'</td>';
@@ -979,22 +986,22 @@
 	$output .= '<tr>'; 
 	$output .= '<td width="150"></td>';
 	$output .= '<td><div align="right"><b>'.$app_strings['LBL_SUB_TOTAL'].':</b></div></td>';
-	$output .= '<td width="150"><div align="right" style="border:1px solid #000;padding:2px">&nbsp;'.$focus->column_fields['hdnSubTotal'].'</div></td>';
+	$output .= '<td width="150"><div align="right" style="border:1px solid #000;padding:2px">&nbsp;'.convertFromDollar($focus->column_fields['hdnSubTotal'],$rate).'</div></td>';
 	$output .= '</tr>';
 	$output .= '<tr>'; 
 	$output .=  '<td>&nbsp;</td>';
 	$output .= '<td><div align="right"><b>'.$app_strings['LBL_TAX'].':</b></div></td>';
-	$output .= '<td width="150"><div align="right" style="border:1px solid #000;padding:2px">&nbsp;'.$focus->column_fields['txtTax'].'</div></td>';
+	$output .= '<td width="150"><div align="right" style="border:1px solid #000;padding:2px">&nbsp;'.convertFromDollar($focus->column_fields['txtTax'],$rate).'</div></td>';
 	$output .= '</tr>';
 	$output .= '<tr>'; 
 	$output .= '<td>&nbsp;</td>';
 	$output .= '<td><div align="right"><b>'.$app_strings['LBL_ADJUSTMENT'].':</b></div></td>';
-	$output .= '<td width="150"><div align="right"><div align="right" style="border:1px solid #000;padding:2px">&nbsp;'.$focus->column_fields['txtAdjustment'].'</div></td>';
+	$output .= '<td width="150"><div align="right"><div align="right" style="border:1px solid #000;padding:2px">&nbsp;'.convertFromDollar($focus->column_fields['txtAdjustment'],$rate).'</div></td>';
 	$output .= '</tr>';
 	$output .= '<tr>'; 
 	$output .= '<td>&nbsp;</td>';
 	$output .= '<td><div align="right"><b>'.$app_strings['LBL_GRAND_TOTAL'].':</b></div></td>';
-	$output .= '<td width="150"><div id="grandTotal" align="right" style="border:1px solid #000;padding:2px">&nbsp;'.$focus->column_fields['hdnGrandTotal'].'</div></td>';
+	$output .= '<td width="150"><div id="grandTotal" align="right" style="border:1px solid #000;padding:2px">&nbsp;'.convertFromDollar($focus->column_fields['hdnGrandTotal'],$rate).'</div></td>';
 	$output .= '</tr>';
 	$output .= '</table>';
 



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 03:26:27 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 10:26:27 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7615 -
	/vtigercrm/trunk/modules/SalesOrder/EditView.php
Message-ID: <20060628102627.CEF507AD39F@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 28 04:26:24 2006
New Revision: 7615

Log:
changes made to fix the issue in trac id:1142

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

Modified: vtigercrm/trunk/modules/SalesOrder/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/SalesOrder/EditView.php (original)
+++ vtigercrm/trunk/modules/SalesOrder/EditView.php Wed Jun 28 04:26:24 2006
@@ -29,14 +29,16 @@
 require_once('include/utils/utils.php');
 require_once('include/FormValidationUtil.php');
 
-global $app_strings,$mod_strings,$log,$theme,$currentModule;
+global $app_strings,$mod_strings,$log,$theme,$currentModule,$current_user;
 
 $log->debug("Inside Sales Order EditView");
 
 
 $focus = new SalesOrder();
 $smarty = new vtigerCRM_Smarty();
-
+$currencyid=fetchCurrency($current_user->id);
+$rate_symbol = getCurrencySymbolandCRate($currencyid);
+$rate = $rate_symbol['rate'];
 if(isset($_REQUEST['record']) && $_REQUEST['record'] != '') 
 {
     if(isset($_REQUEST['convertmode']) &&  $_REQUEST['convertmode'] == 'quotetoso')
@@ -52,10 +54,10 @@
 	$associated_prod = getAssociatedProducts("Quotes",$quote_focus);
 	$smarty->assign("ASSOCIATEDPRODUCTS", $associated_prod);
 	$smarty->assign("MODE", $quote_focus->mode);
-	$smarty->assign("TAXVALUE", $quote_focus->column_fields['txtTax']);
-	$smarty->assign("ADJUSTMENTVALUE", $quote_focus->column_fields['txtAdjustment']);
-	$smarty->assign("SUBTOTAL", $quote_focus->column_fields['hdnSubTotal']);
-	$smarty->assign("GRANDTOTAL", $quote_focus->column_fields['hdnGrandTotal']);
+	$smarty->assign("TAXVALUE", convertFromDollar($quote_focus->column_fields['txtTax'],$rate));
+	$smarty->assign("ADJUSTMENTVALUE", convertFromDollar($quote_focus->column_fields['txtAdjustment'],$rate));
+	$smarty->assign("SUBTOTAL", convertFromDollar($quote_focus->column_fields['hdnSubTotal'],$rate));
+	$smarty->assign("GRANDTOTAL", convertFromDollar($quote_focus->column_fields['hdnGrandTotal'],$rate));
 	$smarty->assign("AVAILABLE_PRODUCTS", 'true');
 
     }
@@ -133,10 +135,10 @@
 		$smarty->assign("QUOTE_ID", $focus->column_fields['quote_id']);
 		$smarty->assign("ASSOCIATEDPRODUCTS", $associated_prod);
 		$smarty->assign("MODE", $quote_focus->mode);
-		$smarty->assign("TAXVALUE", $quote_focus->column_fields['txtTax']);
-		$smarty->assign("ADJUSTMENTVALUE", $quote_focus->column_fields['txtAdjustment']);
-		$smarty->assign("SUBTOTAL", $quote_focus->column_fields['hdnSubTotal']);
-		$smarty->assign("GRANDTOTAL", $quote_focus->column_fields['hdnGrandTotal']);
+		$smarty->assign("TAXVALUE", convertFromDollar($quote_focus->column_fields['txtTax'],$rate));
+		$smarty->assign("ADJUSTMENTVALUE", convertFromDollar($quote_focus->column_fields['txtAdjustment'],$rate));
+		$smarty->assign("SUBTOTAL", convertFromDollar($quote_focus->column_fields['hdnSubTotal'],$rate));
+		$smarty->assign("GRANDTOTAL", convertFromDollar($quote_focus->column_fields['hdnGrandTotal'],$rate));
 		$smarty->assign("AVAILABLE_PRODUCTS", 'true');
 	}
 }
@@ -235,10 +237,10 @@
 	$associated_prod = getAssociatedProducts("Quotes",$quote_focus);
 	$smarty->assign("ASSOCIATEDPRODUCTS", $associated_prod);
 	$smarty->assign("MODE", $focus->mode);
-	$smarty->assign("TAXVALUE", $txtTax);
-	$smarty->assign("ADJUSTMENTVALUE", $txtAdj);
-	$smarty->assign("SUBTOTAL", $quote_focus->column_fields['hdnSubTotal']);
-	$smarty->assign("GRANDTOTAL", $quote_focus->column_fields['hdnGrandTotal']);
+	$smarty->assign("TAXVALUE", convertFromDollar($txtTax,$rate));
+	$smarty->assign("ADJUSTMENTVALUE", convertFromDollar($txtAdj,$rate));
+	$smarty->assign("SUBTOTAL", convertFromDollar($quote_focus->column_fields['hdnSubTotal'],$rate));
+	$smarty->assign("GRANDTOTAL", convertFromDollar($quote_focus->column_fields['hdnGrandTotal'],$rate));
 }
 elseif($focus->mode == 'edit')
 {
@@ -248,25 +250,26 @@
 	$associated_prod = getAssociatedProducts("SalesOrder",$focus);
 	$smarty->assign("ASSOCIATEDPRODUCTS", $associated_prod);
 	$smarty->assign("MODE", $focus->mode);
-	$smarty->assign("TAXVALUE", $focus->column_fields['txtTax']);
-	$smarty->assign("ADJUSTMENTVALUE", $focus->column_fields['txtAdjustment']);
-	$smarty->assign("SUBTOTAL", $focus->column_fields['hdnSubTotal']);
-	$smarty->assign("GRANDTOTAL", $focus->column_fields['hdnGrandTotal']);
+	$smarty->assign("TAXVALUE", convertFromDollar($focus->column_fields['txtTax'],$rate));
+	$smarty->assign("ADJUSTMENTVALUE", convertFromDollar($focus->column_fields['txtAdjustment'],$rate));
+	$smarty->assign("SUBTOTAL", convertFromDollar($focus->column_fields['hdnSubTotal'],$rate));
+	$smarty->assign("GRANDTOTAL", convertFromDollar($focus->column_fields['hdnGrandTotal'],$rate));
 }
 elseif(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true')
 {
 	$smarty->assign("ROWCOUNT", $num_of_products);
 	$smarty->assign("ASSOCIATEDPRODUCTS", $associated_prod);
 	$smarty->assign("MODE", $focus->mode);
-	$smarty->assign("TAXVALUE", $focus->column_fields['txtTax']);
-	$smarty->assign("ADJUSTMENTVALUE", $focus->column_fields['txtAdjustment']);
-	$smarty->assign("SUBTOTAL", $focus->column_fields['hdnSubTotal']);
-	$smarty->assign("GRANDTOTAL", $focus->column_fields['hdnGrandTotal']);
+	$smarty->assign("TAXVALUE", convertFromDollar($focus->column_fields['txtTax'],$rate));
+	$smarty->assign("ADJUSTMENTVALUE", convertFromDollar($focus->column_fields['txtAdjustment'],$rate));
+	$smarty->assign("SUBTOTAL", convertFromDollar($focus->column_fields['hdnSubTotal'],$rate));
+	$smarty->assign("GRANDTOTAL", convertFromDollar($focus->column_fields['hdnGrandTotal'],$rate));
 }
 elseif((isset($_REQUEST['potential_id']) && $_REQUEST['potential_id'] != '') || (isset($_REQUEST['product_id']) && $_REQUEST['product_id'] != '')) {
         $smarty->assign("ROWCOUNT", $num_of_products);
         $smarty->assign("ASSOCIATEDPRODUCTS", $associated_prod);
 	$InvTotal = getInventoryTotal($_REQUEST['return_module'],$_REQUEST['return_id']);
+	$InvTotal = convertFromDollar($InvTotal,$rate);
         $smarty->assign("MODE", $focus->mode);
         $smarty->assign("TAXVALUE", "0.000");
         $smarty->assign("ADJUSTMENTVALUE", "0.000");



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 03:28:38 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 10:28:38 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7616 -
	/vtigercrm/trunk/modules/SalesOrder/Save.php
Message-ID: <20060628102838.4C54C83FBC4@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 28 04:28:34 2006
New Revision: 7616

Log:
changes made to fix the issue in trac id:1142

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

Modified: vtigercrm/trunk/modules/SalesOrder/Save.php
==============================================================================
--- vtigercrm/trunk/modules/SalesOrder/Save.php (original)
+++ vtigercrm/trunk/modules/SalesOrder/Save.php Wed Jun 28 04:28:34 2006
@@ -29,7 +29,10 @@
 $local_log =& LoggerManager::getLogger('index');
 
 $focus = new SalesOrder();
-
+global $current_user;
+$currencyid=fetchCurrency($current_user->id);
+$rate_symbol = getCurrencySymbolandCRate($currencyid);
+$rate = $rate_symbol['rate'];
 setObjectValuesFromRequest(&$focus);
 
 $focus->save("SalesOrder");
@@ -77,6 +80,7 @@
         $prod_status = $_REQUEST[$status_var];
         $qty = $_REQUEST[$qty_var];
         $listprice = $_REQUEST[$list_price_var];
+	$listprice = convertToDollar($listprice,$rate);
 	$vat = $_REQUEST[$vat_var];
 	$sales = $_REQUEST[$sales_var];
 	$service = $_REQUEST[$service_var];



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 03:32:09 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 10:32:09 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7617 -
	/vtigercrm/trunk/modules/Quotes/Save.php
Message-ID: <20060628103209.A788583FBC4@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 28 04:32:06 2006
New Revision: 7617

Log:
changes made to fix the issue in trac id:1142

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

Modified: vtigercrm/trunk/modules/Quotes/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Quotes/Save.php (original)
+++ vtigercrm/trunk/modules/Quotes/Save.php Wed Jun 28 04:32:06 2006
@@ -28,8 +28,10 @@
 
 $local_log =& LoggerManager::getLogger('index');
 
-global $log;
-
+global $log,$current_user;
+$currencyid=fetchCurrency($current_user->id);
+$rate_symbol = getCurrencySymbolandCRate($currencyid);
+$rate = $rate_symbol['rate'];
 $log->debug("Inside Quote Save");
 
 $focus = new Quote();
@@ -75,6 +77,7 @@
 	$prod_status = $_REQUEST[$status_var];
 	$qty = $_REQUEST[$qty_var];
 	$listprice = $_REQUEST[$list_price_var];
+	$listprice = convertToDollar($listprice,$rate);
 	$vat = $_REQUEST[$vat_var];
 	$sales = $_REQUEST[$sales_var];
 	$service = $_REQUEST[$service_var];



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 03:34:57 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 10:34:57 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7618 -
	/vtigercrm/trunk/modules/Quotes/EditView.php
Message-ID: <20060628103457.1E7CF7AD39F@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 28 04:34:53 2006
New Revision: 7618

Log:
changes made to fix the issue in trac id:1142

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

Modified: vtigercrm/trunk/modules/Quotes/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/Quotes/EditView.php (original)
+++ vtigercrm/trunk/modules/Quotes/EditView.php Wed Jun 28 04:34:53 2006
@@ -28,13 +28,15 @@
 require_once('include/utils/utils.php');
 require_once('include/FormValidationUtil.php');
 
-global $app_strings,$mod_strings,$log,$theme,$currentModule;
+global $app_strings,$mod_strings,$log,$theme,$currentModule,$current_user;
 
 $log->debug("Inside Quote EditView");
 
 $focus = new Quote();
 $smarty = new vtigerCRM_Smarty;
-
+$currencyid=fetchCurrency($current_user->id);
+$rate_symbol = getCurrencySymbolandCRate($currencyid);
+$rate = $rate_symbol['rate'];
 
 if(isset($_REQUEST['record']) && $_REQUEST['record'] != '') 
 {
@@ -141,26 +143,27 @@
 	$associated_prod = getAssociatedProducts("Quotes",$focus);//getProductDetailsBlockInfo('edit','Quotes',$focus); 
 	$smarty->assign("ASSOCIATEDPRODUCTS", $associated_prod);
 	$smarty->assign("MODE", $focus->mode);
-	$smarty->assign("TAXVALUE", $focus->column_fields['txtTax']);
-	$smarty->assign("ADJUSTMENTVALUE", $focus->column_fields['txtAdjustment']);
-	$smarty->assign("SUBTOTAL", $focus->column_fields['hdnSubTotal']);
-	$smarty->assign("GRANDTOTAL", $focus->column_fields['hdnGrandTotal']);
+	$smarty->assign("TAXVALUE", convertFromDollar($focus->column_fields['txtTax'],$rate));
+	$smarty->assign("ADJUSTMENTVALUE", convertFromDollar($focus->column_fields['txtAdjustment'],$rate));
+	$smarty->assign("SUBTOTAL", convertFromDollar($focus->column_fields['hdnSubTotal'],$rate));
+	$smarty->assign("GRANDTOTAL", convertFromDollar($focus->column_fields['hdnGrandTotal'],$rate));
 
 }
 elseif(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') {
         $smarty->assign("ROWCOUNT", $num_of_products);
         $smarty->assign("ASSOCIATEDPRODUCTS", $associated_prod);
         $smarty->assign("MODE", $focus->mode);
-        $smarty->assign("TAXVALUE", $focus->column_fields['txtTax']);
-        $smarty->assign("ADJUSTMENTVALUE", $focus->column_fields['txtAdjustment']);
-        $smarty->assign("SUBTOTAL", $focus->column_fields['hdnSubTotal']);
-        $smarty->assign("GRANDTOTAL", $focus->column_fields['hdnGrandTotal']);
+	$smarty->assign("TAXVALUE", convertFromDollar($focus->column_fields['txtTax'],$rate));
+	$smarty->assign("ADJUSTMENTVALUE", convertFromDollar($focus->column_fields['txtAdjustment'],$rate));
+	$smarty->assign("SUBTOTAL", convertFromDollar($focus->column_fields['hdnSubTotal'],$rate));
+	$smarty->assign("GRANDTOTAL", convertFromDollar($focus->column_fields['hdnGrandTotal'],$rate));
 
 }
 elseif((isset($_REQUEST['potential_id']) && $_REQUEST['potential_id'] != '') || (isset($_REQUEST['product_id']) && $_REQUEST['product_id'] != '')) {
         $smarty->assign("ROWCOUNT", $num_of_products);
         $smarty->assign("ASSOCIATEDPRODUCTS", $associated_prod);
 	$InvTotal = getInventoryTotal($_REQUEST['return_module'],$_REQUEST['return_id']);
+	$InvTotal = convertFromDollar($InvTotal,$rate);
         $smarty->assign("MODE", $focus->mode);
         $smarty->assign("TAXVALUE", "0.000");
         $smarty->assign("ADJUSTMENTVALUE", "0.000");



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 03:36:31 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 10:36:31 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7619 -
	/vtigercrm/trunk/modules/Invoice/Save.php
Message-ID: <20060628103631.7AFD383FBC4@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 28 04:36:28 2006
New Revision: 7619

Log:
changes made to fix the issue in trac id:1142

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

Modified: vtigercrm/trunk/modules/Invoice/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Invoice/Save.php (original)
+++ vtigercrm/trunk/modules/Invoice/Save.php Wed Jun 28 04:36:28 2006
@@ -29,7 +29,10 @@
 $local_log =& LoggerManager::getLogger('index');
 
 $focus = new Invoice();
-
+global $current_user;
+$currencyid=fetchCurrency($current_user->id);
+$rate_symbol = getCurrencySymbolandCRate($currencyid);
+$rate = $rate_symbol['rate'];
 setObjectValuesFromRequest(&$focus);
 
 $focus->save("Invoice");
@@ -77,6 +80,7 @@
         $prod_status = $_REQUEST[$status_var];
         $qty = $_REQUEST[$qty_var];
         $listprice = $_REQUEST[$list_price_var];
+	$listprice = convertToDollar($listprice,$rate);
 	$vat = $_REQUEST[$vat_var];
 	$sales = $_REQUEST[$sales_var];
 	$service = $_REQUEST[$service_var];



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 03:41:01 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 10:41:01 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7620 -
	/vtigercrm/trunk/modules/Invoice/EditView.php
Message-ID: <20060628104101.422DE83FBC4@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 28 04:40:57 2006
New Revision: 7620

Log:
changes made to fix the issue in trac id:1142

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

Modified: vtigercrm/trunk/modules/Invoice/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/Invoice/EditView.php (original)
+++ vtigercrm/trunk/modules/Invoice/EditView.php Wed Jun 28 04:40:57 2006
@@ -31,11 +31,13 @@
 require_once('include/utils/utils.php');
 require_once('include/FormValidationUtil.php');
 
-global $app_strings,$mod_strings,$currentModule,$log;
+global $app_strings,$mod_strings,$currentModule,$log,$current_user;
 
 $focus = new Invoice();
 $smarty = new vtigerCRM_Smarty();
-
+$currencyid=fetchCurrency($current_user->id);
+$rate_symbol = getCurrencySymbolandCRate($currencyid);
+$rate = $rate_symbol['rate'];
 if(isset($_REQUEST['record']) && $_REQUEST['record'] != '') 
 {
     if(isset($_REQUEST['convertmode']) &&  $_REQUEST['convertmode'] == 'quotetoinvoice')
@@ -53,10 +55,10 @@
 
 	$smarty->assign("ASSOCIATEDPRODUCTS", $associated_prod);
 	$smarty->assign("MODE", $quote_focus->mode);
-	$smarty->assign("TAXVALUE", $txtTax);
-	$smarty->assign("ADJUSTMENTVALUE", $txtAdj);
-	$smarty->assign("SUBTOTAL", $quote_focus->column_fields['hdnSubTotal']);
-	$smarty->assign("GRANDTOTAL", $quote_focus->column_fields['hdnGrandTotal']);
+	$smarty->assign("TAXVALUE", convertFromDollar($txtTax,$rate));
+	$smarty->assign("ADJUSTMENTVALUE", convertFromDollar($txtAdj,$rate));
+	$smarty->assign("SUBTOTAL", convertFromDollar($quote_focus->column_fields['hdnSubTotal'],$rate));
+	$smarty->assign("GRANDTOTAL", convertFromDollar($quote_focus->column_fields['hdnGrandTotal'],$rate));
 	$smarty->assign("AVAILABLE_PRODUCTS", 'true');
     }
     elseif(isset($_REQUEST['convertmode']) &&  $_REQUEST['convertmode'] == 'sotoinvoice')
@@ -74,10 +76,10 @@
 
 	$smarty->assign("ASSOCIATEDPRODUCTS", $associated_prod);
 	$smarty->assign("MODE", $so_focus->mode);
-	$smarty->assign("TAXVALUE", $txtTax);
-	$smarty->assign("ADJUSTMENTVALUE", $txtAdj);
-	$smarty->assign("SUBTOTAL", $so_focus->column_fields['hdnSubTotal']);
-	$smarty->assign("GRANDTOTAL", $so_focus->column_fields['hdnGrandTotal']);
+	$smarty->assign("TAXVALUE", convertFromDollar($txtTax,$rate));
+	$smarty->assign("ADJUSTMENTVALUE", convertFromDollar($txtAdj,$rate));
+	$smarty->assign("SUBTOTAL", convertFromDollar($so_focus->column_fields['hdnSubTotal'],$rate));
+	$smarty->assign("GRANDTOTAL", convertFromDollar($so_focus->column_fields['hdnGrandTotal'],$rate));
 	$smarty->assign("AVAILABLE_PRODUCTS", 'true');
 
     }
@@ -251,10 +253,10 @@
 	$associated_prod = getAssociatedProducts("Invoice",$focus);
 	$smarty->assign("ASSOCIATEDPRODUCTS", $associated_prod);
 	$smarty->assign("MODE", $focus->mode);
-	$smarty->assign("TAXVALUE", $focus->column_fields['txtTax']);
-	$smarty->assign("ADJUSTMENTVALUE", $focus->column_fields['txtAdjustment']);
-	$smarty->assign("SUBTOTAL", $focus->column_fields['hdnSubTotal']);
-	$smarty->assign("GRANDTOTAL", $focus->column_fields['hdnGrandTotal']);
+	$smarty->assign("TAXVALUE", convertFromDollar($focus->column_fields['txtTax'],$rate));
+	$smarty->assign("ADJUSTMENTVALUE", convertFromDollar($focus->column_fields['txtAdjustment'],$rate));
+	$smarty->assign("SUBTOTAL", convertFromDollar($focus->column_fields['hdnSubTotal'],$rate));
+	$smarty->assign("GRANDTOTAL", convertFromDollar($focus->column_fields['hdnGrandTotal'],$rate));
 }
 elseif(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true')
 {
@@ -265,6 +267,7 @@
 	$smarty->assign("ROWCOUNT", $num_of_products);
 	$smarty->assign("ASSOCIATEDPRODUCTS", $associated_prod);
 	$InvTotal = getInventoryTotal($_REQUEST['return_module'],$_REQUEST['return_id']);
+	$InvTotal = convertFromDollar($InvTotal,$rate);
         $smarty->assign("MODE", $focus->mode);
 	$smarty->assign("TAXVALUE", "0.000");
 	$smarty->assign("ADJUSTMENTVALUE", "0.000");



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 03:43:36 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 10:43:36 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7621 -
	/vtigercrm/trunk/modules/Campaigns/Save.php
Message-ID: <20060628104336.A43D583FBC4@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 28 04:43:32 2006
New Revision: 7621

Log:
changes made to fix the issue in trac id:1142

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

Modified: vtigercrm/trunk/modules/Campaigns/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Campaigns/Save.php (original)
+++ vtigercrm/trunk/modules/Campaigns/Save.php Wed Jun 28 04:43:32 2006
@@ -26,8 +26,38 @@
 require_once('include/database/PearDatabase.php');
 
 $focus = new Campaign();
+ global $current_user;
+ $currencyid=fetchCurrency($current_user->id);
+ $rate_symbol = getCurrencySymbolandCRate($currencyid);
+ $rate = $rate_symbol['rate'];
+setObjectValuesFromRequest(&$focus);
 
-setObjectValuesFromRequest(&$focus);
+if(isset($_REQUEST['expectedrevenue']))
+{
+	$value = convertToDollar($_REQUEST['expectedrevenue'],$rate);
+	$focus->column_fields['expectedrevenue'] = $value;
+}
+if(isset($_REQUEST['budgetcost']))
+{
+	$value = convertToDollar($_REQUEST['budgetcost'],$rate);
+	$focus->column_fields['budgetcost'] = $value;
+}
+if(isset($_REQUEST['actualcost']))
+{
+	$value = convertToDollar($_REQUEST['actualcost'],$rate);
+	$focus->column_fields['actualcost'] = $value;
+}
+if(isset($_REQUEST['actualroi']))
+{
+	$value = convertToDollar($_REQUEST['actualroi'],$rate);
+	$focus->column_fields['actualroi'] = $value;
+}
+if(isset($_REQUEST['expectedroi']))
+{
+	$value = convertToDollar($_REQUEST['expectedroi'],$rate);
+	$focus->column_fields['expectedroi'] = $value;
+}
+
 
 $focus->save("Campaigns");
 $return_id = $focus->id;



From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 28 03:44:07 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 28 Jun 2006 10:44:07 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231142=3A?=
 =?utf-8?q?_currency_conversion_is_not_applied_for_product_details?=
In-Reply-To: <076.ed680d7929677a23842f476fd7e13220@vtiger.fosslabs.com>
References: <076.ed680d7929677a23842f476fd7e13220@vtiger.fosslabs.com>
Message-ID: <085.3de94cc865d0dd8b8402d5b392619349@vtiger.fosslabs.com>

#1142: currency conversion is not applied for product details
------------------------+---------------------------------------------------
  Reporter:  mangai     |       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

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1142>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 03:55:36 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 10:55:36 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7622 -
	/vtigercrm/trunk/modules/Notes/Save.php
Message-ID: <20060628105536.C493583FC21@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 28 04:55:33 2006
New Revision: 7622

Log:
* Modified to retrieve and save the note attachment to the new note when we duplicate the note

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

Modified: vtigercrm/trunk/modules/Notes/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Notes/Save.php (original)
+++ vtigercrm/trunk/modules/Notes/Save.php Wed Jun 28 04:55:33 2006
@@ -40,32 +40,40 @@
 
 if (!isset($_REQUEST['date_due_flag'])) $focus->date_due_flag = 'off';
 
-//Added for retrieve the old existing vtiger_attachments when duplicated without new attachment
+//Save the Note
+$focus->save("Notes");
+
+//Added to retrieve the existing attachment of the notes and save it for the new duplicated note
 if($_FILES['filename']['name'] == '' && $_REQUEST['mode'] != 'edit' && $_REQUEST['old_id'] != '')
 {
-        $sql = "select vtiger_attachments.attachmentsid from vtiger_attachments inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid=vtiger_attachments.attachmentsid where vtiger_seattachmentsrel.crmid= ".$_REQUEST['old_id'];
+        $sql = "select vtiger_attachments.* from vtiger_attachments inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid=vtiger_attachments.attachmentsid where vtiger_seattachmentsrel.crmid= ".$_REQUEST['old_id'];
         $result = $adb->query($sql);
         if($adb->num_rows($result) != 0)
+	{
                 $attachmentid = $adb->query_result($result,0,'attachmentsid');
-	        if($attachmentid != '')
-	        {
-	                $attachquery = "select * from vtiger_attachments where attachmentsid = ".$attachmentid;
-	                $result = $adb->query($attachquery);
-	                $filename = $adb->query_result($result,0,'name');
-	                $filetype = $adb->query_result($result,0,'type');
-			$filepath = $adb->query_result($result,0,'path');
+		$filename = $adb->query_result($result,0,'name');
+		$filetype = $adb->query_result($result,0,'type');
+		$filepath = $adb->query_result($result,0,'path');
 
-	                $_FILES['filename']['name'] = $filename;
-	                $_FILES['filename']['type'] = $filetype;
+		$new_attachmentid = $adb->getUniqueID("vtiger_crmentity");
+		$date_var = date('YmdHis');
 
-			//we should read the file and calculate the size, without setting vtiger_filesize, attachment will not save
-	                $filesize = filesize($filepath.$filename);
-	                $_FILES['filename']['size'] = $filesize;
-	        }
+		$upload_filepath = decideFilePath();
+
+		//Read the old file contents and write it as a new file with new attachment id
+		$handle = @fopen($upload_filepath.$new_attachmentid."_".$filename,'w');
+		fputs($handle, file_get_contents($filepath.$attachmentid."_".$filename));
+		fclose($handle);	
+
+		$adb->query("update vtiger_notes set filename=\"$filename\" where notesid=$focus->id");	
+		$adb->query("insert into vtiger_crmentity (crmid,setype,createdtime) values('".$new_attachmentid."','Notes Attachment','".$date_var."')");
+
+		$adb->query("insert into vtiger_attachments values(".$new_attachmentid.",'".$filename."','','".$filetype."','".$upload_filepath."')");
+
+		$adb->query("insert into vtiger_seattachmentsrel values('".$focus->id."','".$new_attachmentid."')");
+	}
 }
-																						
 
-$focus->save("Notes");
 
 $return_id = $focus->id;
 $note_id = $return_id;



From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 28 03:56:29 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 28 Jun 2006 10:56:29 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231386=3A?=
 =?utf-8?q?_Attachment_is_not_Saved_while_duplicating_Notes?=
In-Reply-To: <076.23ff7f44f849d0ff988e6bfb215ede83@vtiger.fosslabs.com>
References: <076.23ff7f44f849d0ff988e6bfb215ede83@vtiger.fosslabs.com>
Message-ID: <085.b5a647daa84cbe67bbf21279d3b87b7d@vtiger.fosslabs.com>

#1386: Attachment is not Saved while duplicating Notes
------------------------+---------------------------------------------------
  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:  new => closed

Comment:

 This issue is fixed.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1386>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 03:59:38 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 10:59:38 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7623 -
	/vtigercrm/trunk/schema/DatabaseSchema.xml
Message-ID: <20060628105938.F006A83FC11@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 28 04:59:35 2006
New Revision: 7623

Log:
column server_port included in vtiger_system table,homeorder has been changed and type and size changed in vtiger_campaign table for expectedrevenue,budgetcost,actualcost,expectedroi and actualroi

Modified:
    vtigercrm/trunk/schema/DatabaseSchema.xml

Modified: vtigercrm/trunk/schema/DatabaseSchema.xml
==============================================================================
--- vtigercrm/trunk/schema/DatabaseSchema.xml (original)
+++ vtigercrm/trunk/schema/DatabaseSchema.xml Wed Jun 28 04:59:35 2006
@@ -66,7 +66,7 @@
 			<default value="23:00" />
 		</field>	
 		<field name="homeorder" type="C" size="255">
-			<default value="ALVT,PLVT,QLTQ,CVLVT,HLT,OLV,GRT,OLTSO,ILTI,MNL" />
+			<default value="ALVT,PLVT,QLTQ,CVLVT,HLT,OLV,GRT,OLTSO,ILTI,MNL,HDB" />
 		</field>
 		<field name="activity_view" type="C" size="25">
 			<default value="Today" />
@@ -1184,9 +1184,9 @@
 		<field name="campaignname" type="C" size="255" />
 		<field name="campaigntype" type="C" size="255" />
 		<field name="campaignstatus" type="C" size="255" />
-		<field name="expectedrevenue" type="I" size="19" />
-		<field name="budgetcost" type="I" size="19" />
-		<field name="actualcost" type="I" size="19" />
+		<field name="expectedrevenue" type="N" size="11.3" />
+		<field name="budgetcost" type="N" size="11.3" />
+		<field name="actualcost" type="N" size="11.3" />
 		<field name="expectedresponse" type="C" size="255" />
 		<field name="numsent" type="N" size="11.0" />
 		<field name="product_id" type="I" size="19" />
@@ -1195,10 +1195,10 @@
 		<field name="targetsize" type="I" size="19" />
 		<field name="expectedresponsecount" type="I" size="19" />
 		<field name="expectedsalescount" type="I" size="19" />
-		<field name="expectedroi" type="I" size="19" />
+		<field name="expectedroi" type="N" size="11.3" />
 		<field name="actualresponsecount" type="I" size="19" />
 		<field name="actualsalescount" type="I" size="19" />
-		<field name="actualroi" type="I" size="19" />
+		<field name="actualroi" type="N" size="11.3" />
 		<field name="campaignid" type="I" size="19">
 			<key />
 		</field>
@@ -1781,6 +1781,7 @@
 			<key />
 		</field>
 		<field name="server" type="C" size="30" />
+		<field name="server_port" type="I" size="19" />
 		<field name="server_username" type="C" size="30" />
 		<field name="server_password" type="C" size="30" />
 		<field name="server_type" type="C" size="20" />



From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 28 05:02:21 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 28 Jun 2006 12:02:21 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231388=3A?=
 =?utf-8?q?_Quick_Edit_not_functional_for_activity_module?=
Message-ID: <076.50cd906646f38b3f0a24d3ab69d7789d@vtiger.fosslabs.com>

#1388: Quick Edit not functional for activity module
-----------------------+----------------------------------------------------
 Reporter:  ahmed      |       Owner:  Jeri 
     Type:  defect     |      Status:  new  
 Priority:  critical   |   Milestone:       
Component:  vtigercrm  |     Version:  5.0.0
 Keywords:             |  
-----------------------+----------------------------------------------------


-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1388>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 28 05:03:38 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 28 Jun 2006 12:03:38 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231389=3A?=
 =?utf-8?q?_Values_retained_in_the_Pending_Activities_=28Homepage=29_even_?=
 =?utf-8?q?if_no_activity_records_are_present=2E?=
Message-ID: <076.411f5cbf1eec66cd754596f2025d46c0@vtiger.fosslabs.com>

#1389: Values retained in the Pending Activities (Homepage) even if no activity
records are present.
-----------------------+----------------------------------------------------
 Reporter:  ahmed      |       Owner:  jeri 
     Type:  defect     |      Status:  new  
 Priority:  critical   |   Milestone:       
Component:  vtigercrm  |     Version:  5.0.0
 Keywords:             |  
-----------------------+----------------------------------------------------


-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1389>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 28 05:04:57 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 28 Jun 2006 12:04:57 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231390=3A?=
 =?utf-8?q?_Custome_View_Issue_in_Activities?=
Message-ID: <076.74b7dccf8426c4468275b28cfd4f7db2@vtiger.fosslabs.com>

#1390: Custome View Issue in Activities
-----------------------+----------------------------------------------------
 Reporter:  ahmed      |       Owner:  mangai
     Type:  defect     |      Status:  new   
 Priority:  critical   |   Milestone:        
Component:  vtigercrm  |     Version:  5.0.0 
 Keywords:             |  
-----------------------+----------------------------------------------------
 While viewing the activities list with activitytype criteria, we get no
 results.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1390>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 28 05:06:06 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 28 Jun 2006 12:06:06 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231391=3A?=
 =?utf-8?q?_Background_Img_missing_when_editing_the_selected_products_in_P?=
 =?utf-8?q?riceBook_Related_List?=
Message-ID: <076.fb585b9ef8e9e11ac11d7e70c1f143bb@vtiger.fosslabs.com>

#1391: Background Img missing when editing the selected products in PriceBook
Related List
-----------------------+----------------------------------------------------
 Reporter:  ahmed      |       Owner:  Ela  
     Type:  defect     |      Status:  new  
 Priority:  critical   |   Milestone:       
Component:  vtigercrm  |     Version:  5.0.0
 Keywords:             |  
-----------------------+----------------------------------------------------


-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1391>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 05:27:48 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 12:27:48 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7624 - in
 /vtigercrm/trunk/modules: Accounts/Account.php Contacts/Contact.php
 Leads/Lead.php Potentials/Opportunity.php Products/Product.php
Message-ID: <20060628122748.1B40D59021C@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 28 06:27:31 2006
New Revision: 7624

Log:
* Fixed the issues in the export query

Modified:
    vtigercrm/trunk/modules/Accounts/Account.php
    vtigercrm/trunk/modules/Contacts/Contact.php
    vtigercrm/trunk/modules/Leads/Lead.php
    vtigercrm/trunk/modules/Potentials/Opportunity.php
    vtigercrm/trunk/modules/Products/Product.php

Modified: vtigercrm/trunk/modules/Accounts/Account.php
==============================================================================
--- vtigercrm/trunk/modules/Accounts/Account.php (original)
+++ vtigercrm/trunk/modules/Accounts/Account.php Wed Jun 28 06:27:31 2006
@@ -590,10 +590,10 @@
 	{
 		global $log;
                 $log->debug("Entering create_export_query(".$order_by.",".$where.") method ...");
-		if($this->checkIfCustomTableExists('accountscf'))
-		{
-
-			$query = $this->constructCustomQueryAddendum('accountscf','Accounts') . "
+		if($this->checkIfCustomTableExists('vtiger_accountscf'))
+		{
+
+			$query = $this->constructCustomQueryAddendum('vtiger_accountscf','Accounts') . "
 				vtiger_account.*,
 					".$this->entity_table.".*,
 				vtiger_accountbillads.city AS billing_city,

Modified: vtigercrm/trunk/modules/Contacts/Contact.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/Contact.php (original)
+++ vtigercrm/trunk/modules/Contacts/Contact.php Wed Jun 28 06:27:31 2006
@@ -513,9 +513,9 @@
         {
 		global $log;
 		$log->debug("Entering create_export_query(".$order_by.",".$where.") method ...");
-		if($this->checkIfCustomTableExists('contactscf'))
+		if($this->checkIfCustomTableExists('vtiger_contactscf'))
 		{
-			$query =  $this->constructCustomQueryAddendum('contactscf','Contacts') ."
+			$query =  $this->constructCustomQueryAddendum('vtiger_contactscf','Contacts') ."
                                 vtiger_contactdetails.*, vtiger_contactaddress.*,
                                 vtiger_account.accountname account_name,
                                 vtiger_users.user_name assigned_user_name

Modified: vtigercrm/trunk/modules/Leads/Lead.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/Lead.php (original)
+++ vtigercrm/trunk/modules/Leads/Lead.php Wed Jun 28 06:27:31 2006
@@ -125,10 +125,10 @@
 	{
 		global $log;
 		$log->debug("Entering create_export_query(".$order_by.",".$where.") method ...");
-		if($this->checkIfCustomTableExists('leadscf'))
+		if($this->checkIfCustomTableExists('vtiger_leadscf'))
 		{
 
-			$query = $this->constructCustomQueryAddendum('leadscf','Leads') . " 
+			$query = $this->constructCustomQueryAddendum('vtiger_leadscf','Leads') . " 
 			vtiger_leaddetails.*, ".$this->entity_table.".*, vtiger_leadsubdetails.*,vtiger_leadaddress.city city, vtiger_leadaddress.state state,vtiger_leadaddress.code code,vtiger_leadaddress.country country, vtiger_leadaddress.phone phone, vtiger_users.user_name, vtiger_users.status user_status
 				FROM ".$this->entity_table."
 				INNER JOIN vtiger_leaddetails

Modified: vtigercrm/trunk/modules/Potentials/Opportunity.php
==============================================================================
--- vtigercrm/trunk/modules/Potentials/Opportunity.php (original)
+++ vtigercrm/trunk/modules/Potentials/Opportunity.php Wed Jun 28 06:27:31 2006
@@ -167,28 +167,31 @@
 		global $log;
 		$log->debug("Entering create_export_query(".$order_by.",". $where.") method ...");
 
-		if($this->checkIfCustomTableExists('potentialscf'))
-		{
-			$query = $this->constructCustomQueryAddendum('potentialscf','Potentials') ."
+		if($this->checkIfCustomTableExists('vtiger_potentialscf'))
+		{
+			$query = $this->constructCustomQueryAddendum('vtiger_potentialscf','Potentials') ."
 			vtiger_potential.*,
 			vtiger_account.accountname account_name,
 			vtiger_users.user_name assigned_user_name
-					FROM vtiger_potential
-					INNER JOIN vtiger_crmentity
-					ON vtiger_crmentity.crmid=vtiger_potential.potentialid
-					LEFT JOIN vtiger_account on vtiger_potential.accountid=vtiger_account.accountid
-					left join vtiger_potentialscf on vtiger_potentialscf.potentialid=vtiger_potential.potentialid
-					left join vtiger_users on vtiger_crmentity.smownerid=vtiger_users.id where vtiger_crmentity.deleted=0 ";
+				FROM vtiger_potential
+				INNER JOIN vtiger_crmentity ON vtiger_crmentity.crmid=vtiger_potential.potentialid
+				LEFT JOIN vtiger_account on vtiger_potential.accountid=vtiger_account.accountid
+				left join vtiger_potentialscf on vtiger_potentialscf.potentialid=vtiger_potential.potentialid
+				left join vtiger_users on vtiger_crmentity.smownerid=vtiger_users.id 
+			where vtiger_crmentity.deleted=0 ";
 		}
 		else
 		{
 			$query = "SELECT
 			vtiger_potential.*,
-			vtiger_account.accountname vtiger_account_name,
+			vtiger_account.accountname account_name,
 			vtiger_users.user_name assigned_user_name
-					FROM vtiger_potential inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_potential.potentialid                                LEFT JOIN vtiger_users
-					ON vtiger_crmentity.smownerid=vtiger_users.id
-					LEFT JOIN vtiger_account on vtiger_potential.accountid=vtiger_account.accountid  LEFT JOIN vtiger_potentialscf on vtiger_potentialscf.potentialid=vtiger_potential.potentialid where vtiger_crmentity.deleted=0 ";
+				FROM vtiger_potential 
+				inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_potential.potentialid 
+				LEFT JOIN vtiger_users ON vtiger_crmentity.smownerid=vtiger_users.id
+				LEFT JOIN vtiger_account on vtiger_potential.accountid=vtiger_account.accountid  
+				LEFT JOIN vtiger_potentialscf on vtiger_potentialscf.potentialid=vtiger_potential.potentialid 
+			where vtiger_crmentity.deleted=0 ";
 		}	
 
 		$log->debug("Exiting create_export_query method ...");

Modified: vtigercrm/trunk/modules/Products/Product.php
==============================================================================
--- vtigercrm/trunk/modules/Products/Product.php (original)
+++ vtigercrm/trunk/modules/Products/Product.php Wed Jun 28 06:27:31 2006
@@ -23,9 +23,9 @@
 
 	 // Josh added for importing and exporting -added in patch2
         var $unit_price;
-        var $table_name = "products";
+        var $table_name = "vtiger_products";
         var $object_name = "Product";
-        var $entity_table = "crmentity";
+        var $entity_table = "vtiger_crmentity";
         var $required_fields = Array(
                 'productname'=>1
         );
@@ -440,16 +440,16 @@
 	{
 		global $log;
 		$log->debug("Entering create_export_query(".$order_by.",".$where.") method ...");
-		if($this->checkIfCustomTableExists('productcf'))
+		if($this->checkIfCustomTableExists('vtiger_productcf'))
 		{
 
-		$query = $this->constructCustomQueryAddendum('productcf','Products') ."    
+		$query = $this->constructCustomQueryAddendum('vtiger_productcf','Products') ."    
 			vtiger_products.productid AS productid,
 			vtiger_products.productname AS productname,
 			vtiger_products.productcode AS productcode,
-			vtiger_products.productcategory AS vtiger_productcategory,
-			vtiger_products.manufacturer AS vtiger_manufacturer,
-			vtiger_products.product_description AS product_description,
+			vtiger_products.productcategory AS productcategory,
+			vtiger_products.manufacturer AS manufacturer,
+			vtiger_crmentity.description AS product_description,
 			vtiger_products.qty_per_unit AS qty_per_unit,
 			vtiger_products.unit_price AS unit_price,
 			vtiger_products.weight AS weight,
@@ -462,16 +462,16 @@
 			vtiger_products.discontinued AS discontinued,
 			vtiger_products.sales_start_date AS sales_start_date,
 			vtiger_products.sales_end_date AS sales_end_date,
-			vtiger_products.usageunit AS vtiger_usageunit,
+			vtiger_products.usageunit AS usageunit,
 			vtiger_products.serialno AS serialno,
-			vtiger_products.currency AS vtiger_currency,
+			vtiger_products.currency AS currency,
 			vtiger_products.reorderlevel AS reorderlevel,
 			vtiger_products.website AS website,
-			vtiger_products.taxclass AS vtiger_taxclass,
+			vtiger_products.taxclass AS taxclass,
 			vtiger_products.mfr_part_no AS mfr_part_no,
-			vtiger_products.vendor_part_no AS vtiger_vendor_part_no,
+			vtiger_products.vendor_part_no AS vendor_part_no,
 			vtiger_products.qtyinstock AS qtyinstock,
-			vtiger_products.productsheet AS vtiger_productsheet,
+			vtiger_products.productsheet AS productsheet,
 			vtiger_products.qtyindemand AS qtyindemand
 			FROM ".$this->entity_table."
 			INNER JOIN vtiger_products
@@ -487,9 +487,9 @@
 			$query = "SELECT vtiger_products.productid AS productid,
 			vtiger_products.productname AS productname,
 			vtiger_products.productcode AS productcode,
-			vtiger_products.productcategory AS vtiger_productcategory,
-			vtiger_products.manufacturer AS vtiger_manufacturer,
-			vtiger_products.product_description AS product_description,
+			vtiger_products.productcategory AS productcategory,
+			vtiger_products.manufacturer AS manufacturer,
+			vtiger_crmentity.description AS product_description,
 			vtiger_products.qty_per_unit AS qty_per_unit,
 			vtiger_products.unit_price AS unit_price,
 			vtiger_products.weight AS weight,
@@ -502,16 +502,16 @@
 			vtiger_products.discontinued AS discontinued,
 			vtiger_products.sales_start_date AS sales_start_date,
 			vtiger_products.sales_end_date AS sales_end_date,
-			vtiger_products.usageunit AS vtiger_usageunit,
+			vtiger_products.usageunit AS usageunit,
 			vtiger_products.serialno AS serialno,
 			vtiger_products.currency AS vtiger_currency,
 			vtiger_products.reorderlevel AS reorderlevel,
 			vtiger_products.website AS website,
-			vtiger_products.taxclass AS vtiger_taxclass,
+			vtiger_products.taxclass AS taxclass,
 			vtiger_products.mfr_part_no AS mfr_part_no,
-			vtiger_products.vendor_part_no AS vtiger_vendor_part_no,
+			vtiger_products.vendor_part_no AS vendor_part_no,
 			vtiger_products.qtyinstock AS qtyinstock,
-			vtiger_products.productsheet AS vtiger_productsheet,
+			vtiger_products.productsheet AS productsheet,
 			vtiger_products.qtyindemand AS qtyindemand
 			FROM ".$this->table_name ."
 			INNER JOIN vtiger_crmentity



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 05:28:47 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 12:28:47 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7625 -
	/vtigercrm/trunk/modules/Users/User.php
Message-ID: <20060628122847.C950059021C@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 28 06:28:43 2006
New Revision: 7625

Log:
* Modified the function retrieve_entity_info as if the record is empty then return null and added to set the id

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

Modified: vtigercrm/trunk/modules/Users/User.php
==============================================================================
--- vtigercrm/trunk/modules/Users/User.php (original)
+++ vtigercrm/trunk/modules/Users/User.php Wed Jun 28 06:28:43 2006
@@ -708,6 +708,14 @@
 	function retrieve_entity_info($record, $module)
 	{
 		global $adb,$log;
+		$log->debug("Entering into retrieve_entity_info($record, $module) method.");
+
+		if($record == '')
+		{
+			$log->debug("record is empty. returning null");
+			return null;
+		}
+
 		$result = Array();
 		foreach($this->tab_name_index as $table_name=>$index)
 		{
@@ -730,6 +738,11 @@
 		}
 		$this->column_fields["record_id"] = $record;
 		$this->column_fields["record_module"] = $module;
+
+		$this->id = $record;
+		$log->debug("Exit from retrieve_entity_info($record, $module) method.");
+
+		return $this;
 	}
 	function uploadAndSaveFile($id,$module,$file_details)
 	{



From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 28 05:30:17 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 28 Jun 2006 12:30:17 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231378=3A?=
 =?utf-8?q?_Emails=3A_Improper_Export_link?=
In-Reply-To: <076.70d0318c40a5216b6e6108b9de7b7e0f@vtiger.fosslabs.com>
References: <076.70d0318c40a5216b6e6108b9de7b7e0f@vtiger.fosslabs.com>
Message-ID: <085.a2c6ccd8d4c5bd94c20ee7c9921fe9cb@vtiger.fosslabs.com>

#1378: Emails: Improper Export link
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  mickie
      Type:  defect     |      Status:  closed
  Priority:  blocker    |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mickie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 Export is failed in all modules and they have been fixed and export is
 working fine.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1378>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 28 05:50:11 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 28 Jun 2006 12:50:11 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231392=3A?=
 =?utf-8?q?_Product_popup_throws_page_not_found_error?=
Message-ID: <076.98b6c865c25365846d37f3a61ea7c371@vtiger.fosslabs.com>

#1392: Product popup throws page not found error
-----------------------+----------------------------------------------------
 Reporter:  mickie     |       Owner:  mickie
     Type:  defect     |      Status:  new   
 Priority:  major      |   Milestone:        
Component:  vtigercrm  |     Version:  5.0.0 
 Keywords:             |  
-----------------------+----------------------------------------------------
 when we create PO or SO we have to select Product through Popup where as
 if we select the product after made search in the popup then it throws
 "page not found error"

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1392>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 06:01:17 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 13:01:17 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7626 -
 /vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl
Message-ID: <20060628130117.3D6207FDA83@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 28 07:01:13 2006
New Revision: 7626

Log:
Update sharing access file

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

Modified: vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl Wed Jun 28 07:01:13 2006
@@ -192,8 +192,7 @@
                 'index.php',
                 {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
                         method: 'post',
-                        postBody: 'module=Users&action=UsersAjax&orgajax=true&mode='+mode+'&sharing_module='+modulename+'&sh
-areid='+id,
+                        postBody: 'module=Users&action=UsersAjax&orgajax=true&mode='+mode+'&sharing_module='+modulename+'&shareid='+id,
                         onComplete: function(response) {ldelim}
                                 $("status").style.display="none";
                                 $("tempdiv").innerHTML=response.responseText;



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 06:05:02 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 13:05:02 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7627 -
	/vtigercrm/trunk/Smarty/templates/DetailView.tpl
Message-ID: <20060628130503.84B647FDA83@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 28 07:04:58 2006
New Revision: 7627

Log:
inline style has been removed in locateMap layer

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 Wed Jun 28 07:04:58 2006
@@ -79,7 +79,7 @@
                 {assign var=address1 value='Mailing'}
                 {assign var=address2 value='Other'}
         {/if}
-        <div id="locateMap" style="width: 125px; right: 159px; top: 260px; display: none; z-index:50" onmouseout="fninvsh('locateMap')" onmouseover="fnvshNrm('locateMap')">
+        <div id="locateMap" onMouseOut="fninvsh('locateMap')" onMouseOver="fnvshNrm('locateMap')">
                 <table bgcolor="#ffffff" border="0" cellpadding="0" cellspacing="0" width="100%">
                         <tr>
                                 <td>
@@ -211,7 +211,7 @@
                                                         {if $MODULE eq 'Leads'}
                                                         <input name="mapbutton" value="{$APP.LBL_LOCATE_MAP}" class="small" type="button" onClick="searchMapLocation( 'Main' )" title="{$APP.LBL_LOCATE_MAP}">
                                                         {else}
-                                                        <input name="mapbutton" value="{$APP.LBL_LOCATE_MAP}" class="small" type="button" onClick="fnvshobj(this,'locateMap');" onmouseout="fninvsh('locateMap');" title="{$APP.LBL_LOCATE_MAP}">
+                                                        <input name="mapbutton" value="{$APP.LBL_LOCATE_MAP}" class="small" type="button" onClick="fnvshobj(this,'locateMap');" onMouseOut="fninvsh('locateMap');" title="{$APP.LBL_LOCATE_MAP}">
 							{/if}
                                                         {/if}
                                                         </td>



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 06:07:22 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 13:07:22 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7628 -
	/vtigercrm/trunk/themes/blue/style.css
Message-ID: <20060628130722.5BAE583FD30@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 28 07:07:18 2006
New Revision: 7628

Log:
locateMap style 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 Wed Jun 28 07:07:18 2006
@@ -1875,6 +1875,17 @@
 	z-index:2000;
 }
 
+#locateMap{
+	width:120px;
+	background-color:#CCCCCC;
+	border:1px solid #DDDDDD;
+	padding-top:5px;
+	position:absolute;
+	display:none;
+	z-index:2000;
+}
+
+
 a.reportMnu{
 	font-size:11px;
 	color:#0070BA;
@@ -1885,7 +1896,7 @@
 	border-bottom:1px solid #E1E1E1;
 	padding-left:20px;
 	padding-top:3px;
-}	
+}
 
 a.reportMnu:Hover{
 	font-size:11px;



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 06:07:24 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 13:07:24 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7629 -
	/vtigercrm/trunk/modules/Contacts/chat.php
Message-ID: <20060628130724.97A4B7FDA83@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 28 07:07:11 2006
New Revision: 7629

Log:
Added vtiger_ in getUniqueID function parameter

Modified:
    vtigercrm/trunk/modules/Contacts/chat.php

Modified: vtigercrm/trunk/modules/Contacts/chat.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/chat.php (original)
+++ vtigercrm/trunk/modules/Contacts/chat.php Wed Jun 28 07:07:11 2006
@@ -172,7 +172,7 @@
 	return;
       }
     
-    $_SESSION['chat_user'] = $adb->getUniqueID('chat_users');
+    $_SESSION['chat_user'] = $adb->getUniqueID('vtiger_chat_users');
     
     $res = $adb->query("INSERT INTO vtiger_chat_users (id, nick, session, ping, ip)
    			 VALUES ('".$_SESSION['chat_user']."',
@@ -346,7 +346,7 @@
     $msg = $this->msgParse($msg);
     if(strlen($msg) == 0) return;
     
-    $id = $adb->getUniqueID('chat_msg');
+    $id = $adb->getUniqueID('vtiger_chat_msg');
     $res = $adb->query("INSERT INTO vtiger_chat_msg (id, chat_from, chat_to, born, msg)
     			VALUES (".$id.", '".$_SESSION['chat_user']."', '".$to."', ".$adb->database->sysTimeStamp.", '".$msg."')");
     



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 06:09:36 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 13:09:36 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7630 -
 /vtigercrm/trunk/modules/CustomView/PopulateCustomView.php
Message-ID: <20060628130936.73FE583F28B@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 28 07:09:21 2006
New Revision: 7630

Log:
Added vtiger_ in getUniqueID function parameter

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 Jun 28 07:09:21 2006
@@ -427,7 +427,7 @@
 {
 	global $adb;
 
-	$genCVid = $adb->getUniqueID("customview");
+	$genCVid = $adb->getUniqueID("vtiger_customview");
 
 	if($genCVid != "")
 	{



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 06:11:45 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 13:11:45 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7631 -
	/vtigercrm/trunk/modules/CustomView/Save.php
Message-ID: <20060628131145.41D9983F28B@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 28 07:11:22 2006
New Revision: 7631

Log:
Added vtiger_ in getUniqueID function parameter

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 Wed Jun 28 07:11:22 2006
@@ -89,7 +89,7 @@
 
 	if(!$cvid)
 	{
-		$genCVid = $adb->getUniqueID("customview");
+		$genCVid = $adb->getUniqueID("vtiger_customview");
 		if($genCVid != "")
 		{
 



From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 28 06:14:25 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 28 Jun 2006 13:14:25 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231393=3A?=
 =?utf-8?q?_Add_Tag_Link_shows_Page_Not_Found_while_accessing_from_other_m?=
 =?utf-8?q?achine=2E?=
Message-ID: <076.82526953e64e63d31ad8af0d4f1c9556@vtiger.fosslabs.com>

#1393: Add Tag Link shows Page Not Found while accessing from other machine.
-----------------------+----------------------------------------------------
 Reporter:  ahmed      |       Owner:  saraj
     Type:  defect     |      Status:  new  
 Priority:  blocker    |   Milestone:       
Component:  vtigercrm  |     Version:  5.0.0
 Keywords:             |  
-----------------------+----------------------------------------------------


-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1393>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 06:19:42 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 13:19:42 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7632 -
	/vtigercrm/trunk/modules/Portal/Portal.php
Message-ID: <20060628131942.A5704771F73@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 28 07:19:22 2006
New Revision: 7632

Log:
Added vtiger_ in getUniqueID function parameter

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

Modified: vtigercrm/trunk/modules/Portal/Portal.php
==============================================================================
--- vtigercrm/trunk/modules/Portal/Portal.php (original)
+++ vtigercrm/trunk/modules/Portal/Portal.php Wed Jun 28 07:19:22 2006
@@ -14,7 +14,7 @@
 {
 	global $adb;
 	$adb->println("just entered the SavePortal method");
-	$portalid=$adb->getUniqueID('portal');
+	$portalid=$adb->getUniqueID('vtiger_portal');
 	$query="insert into vtiger_portal values(".$portalid.",'".$portalname."','".$portalurl."',0)";
 	$adb->println($query);
 	$result=$adb->query($query);



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 06:22:27 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 13:22:27 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7633 -
	/vtigercrm/trunk/modules/Reports/PopulateReports.php
Message-ID: <20060628132227.8F05183FAB5@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 28 07:22:13 2006
New Revision: 7633

Log:
Added vtiger_ in getUniqueID function parameter

Modified:
    vtigercrm/trunk/modules/Reports/PopulateReports.php

Modified: vtigercrm/trunk/modules/Reports/PopulateReports.php
==============================================================================
--- vtigercrm/trunk/modules/Reports/PopulateReports.php (original)
+++ vtigercrm/trunk/modules/Reports/PopulateReports.php Wed Jun 28 07:22:13 2006
@@ -429,7 +429,7 @@
 function insertSelectQuery()
 {
 	global $adb;
-	$genQueryId = $adb->getUniqueID("selectquery");
+	$genQueryId = $adb->getUniqueID("vtiger_selectquery");
         if($genQueryId != "")
         {
 		$iquerysql = "insert into vtiger_selectquery (QUERYID,STARTINDEX,NUMOFOBJECTS) values (".$genQueryId.",0,0)";



From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 28 06:24:05 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 28 Jun 2006 13:24:05 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231393=3A?=
 =?utf-8?q?_Add_Tag_Link_shows_Page_Not_Found_while_accessing_from_other_m?=
 =?utf-8?q?achine=2E?=
In-Reply-To: <076.82526953e64e63d31ad8af0d4f1c9556@vtiger.fosslabs.com>
References: <076.82526953e64e63d31ad8af0d4f1c9556@vtiger.fosslabs.com>
Message-ID: <085.9a59a23711618c5777bacb363b1868bf@vtiger.fosslabs.com>

#1393: Add Tag Link shows Page Not Found while accessing from other machine.
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  jerrydgeorge
      Type:  defect     |      Status:  new         
  Priority:  blocker    |   Milestone:              
 Component:  vtigercrm  |     Version:  5.0.0       
Resolution:             |    Keywords:              
------------------------+---------------------------------------------------
Changes (by jerrydgeorge):

  * owner:  saraj => jerrydgeorge

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1393>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 28 06:24:38 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 28 Jun 2006 13:24:38 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231393=3A?=
 =?utf-8?q?_Add_Tag_Link_shows_Page_Not_Found_while_accessing_from_other_m?=
 =?utf-8?q?achine=2E?=
In-Reply-To: <076.82526953e64e63d31ad8af0d4f1c9556@vtiger.fosslabs.com>
References: <076.82526953e64e63d31ad8af0d4f1c9556@vtiger.fosslabs.com>
Message-ID: <085.26e30a135ce8f0e97f9b3fc3606d9216@vtiger.fosslabs.com>

#1393: Add Tag Link shows Page Not Found while accessing from other machine.
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  jerrydgeorge
      Type:  defect     |      Status:  closed      
  Priority:  blocker    |   Milestone:              
 Component:  vtigercrm  |     Version:  5.0.0       
Resolution:  fixed      |    Keywords:              
------------------------+---------------------------------------------------
Changes (by jerrydgeorge):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1393>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 06:24:44 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 13:24:44 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7634 -
	/vtigercrm/trunk/include/freetag/freetag.class.php
Message-ID: <20060628132444.CB41383FD19@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 28 07:24:41 2006
New Revision: 7634

Log:
tag search page not found issue has been fixed

Modified:
    vtigercrm/trunk/include/freetag/freetag.class.php

Modified: vtigercrm/trunk/include/freetag/freetag.class.php
==============================================================================
--- vtigercrm/trunk/include/freetag/freetag.class.php (original)
+++ vtigercrm/trunk/include/freetag/freetag.class.php Wed Jun 28 07:24:41 2006
@@ -32,10 +32,6 @@
 	 *  @access private
 	 *  @param string
 	 */ 
-	//var $_db_user = 'root';
-	//var $_db_pass = '';
-	//var $_db_host = 'jerijohn';
-	//var $_db_name = 'vtigercrm06_03'; 
 	/**#@-*/
 
 	/**
@@ -919,22 +915,20 @@
 		// by $step.
 		$cloud_html = '';
 		$cloud_spans = array();
-		//included to get the site URL
-		include("config.php");
 		if($module =='')
 			$module = 'All';	
 		if($module != 'All')	
 		{	
 			foreach($tag_list[0] as $tag => $qty) {
 				$size = $min_font_size + ($qty - $min_qty) * 3;
-				$cloud_span[] = '<span id="tag_'.$tag_list[1][$tag].'" class="' . $span_class . '" onMouseOver=$("tagspan_'.$tag_list[1][$tag].'").style.display="inline"; onMouseOut=$("tagspan_'.$tag_list[1][$tag].'").style.display="none";><a class="tagit" href="'.$site_URL.'/index.php?module=Home&action=UnifiedSearch&search_module='.$module.'&query_string='. $tag . '" style="font-size: '. $size . $font_units . '">' . htmlspecialchars(stripslashes($tag)) . '</a><span class="'. $span_class .'" id="tagspan_'.$tag_list[1][$tag].'" style="display:none;cursor:pointer;" onClick="DeleteTag('.$tag_list[1][$tag].');"><img src="'.$image_path.'del_tag.gif"></span></span>';
+				$cloud_span[] = '<span id="tag_'.$tag_list[1][$tag].'" class="' . $span_class . '" onMouseOver=$("tagspan_'.$tag_list[1][$tag].'").style.display="inline"; onMouseOut=$("tagspan_'.$tag_list[1][$tag].'").style.display="none";><a class="tagit" href="index.php?module=Home&action=UnifiedSearch&search_module='.$module.'&query_string='. $tag . '" style="font-size: '. $size . $font_units . '">' . htmlspecialchars(stripslashes($tag)) . '</a><span class="'. $span_class .'" id="tagspan_'.$tag_list[1][$tag].'" style="display:none;cursor:pointer;" onClick="DeleteTag('.$tag_list[1][$tag].');"><img src="'.$image_path.'del_tag.gif"></span></span>';
 
 			}
 		}else
 		{
 			foreach($tag_list[0] as $tag => $qty) {
 				$size = $min_font_size + ($qty - $min_qty) * 3;
-				$cloud_span[] = '<span class="' . $span_class . '"><a class="tagit" href="'.$site_URL.'/index.php?module=Home&action=UnifiedSearch&search_module='.$module.'&query_string='. $tag . '" style="font-size: '. $size . $font_units . '">' . htmlspecialchars(stripslashes($tag)) . '</a></span>';
+				$cloud_span[] = '<span class="' . $span_class . '"><a class="tagit" href="index.php?module=Home&action=UnifiedSearch&search_module='.$module.'&query_string='. $tag . '" style="font-size: '. $size . $font_units . '">' . htmlspecialchars(stripslashes($tag)) . '</a></span>';
 
 			}
 



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 06:30:15 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 13:30:15 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7635 -
	/vtigercrm/trunk/modules/Settings/Save.php
Message-ID: <20060628133015.7C99883FAB5@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 28 07:30:11 2006
New Revision: 7635

Log:
changes made to save proxy setting info

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

Modified: vtigercrm/trunk/modules/Settings/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/Save.php (original)
+++ vtigercrm/trunk/modules/Settings/Save.php Wed Jun 28 07:30:11 2006
@@ -12,6 +12,7 @@
 require_once("include/database/PearDatabase.php");
 
 $server=$_REQUEST['server'];
+$port=$_REQUEST['port'];
 $server_username=$_REQUEST['server_username'];
 $server_password=$_REQUEST['server_password'];
 $server_type = $_REQUEST['server_type'];
@@ -28,10 +29,10 @@
 if($id=='')
 {
 	$id = $adb->getUniqueID("systems");
-	$sql="insert into vtiger_systems values(" .$id .",'".$server."','".$server_username."','".$server_password."','".$server_type."','".$smtp_auth."')";
+	$sql="insert into vtiger_systems values(" .$id .",'".$server."','".$port."','".$server_username."','".$server_password."','".$server_type."','".$smtp_auth."')";
 }
 else
-	$sql="update vtiger_systems set server = '".$server."', server_username = '".$server_username."', server_password = '".$server_password."', smtp_auth='".$smtp_auth."', server_type = '".$server_type."' where id = ".$id;
+	$sql="update vtiger_systems set server = '".$server."', server_username = '".$server_username."', server_password = '".$server_password."', smtp_auth='".$smtp_auth."', server_type = '".$server_type."',server_port='".$port."' where id = ".$id;
 
 $adb->query($sql);
 if($server_type == 'backup')
@@ -54,8 +55,22 @@
 		ftp_close($conn_id);
 	}
 }
+
+if($server_type == 'proxy')
+{
+	$action = 'ProxyServerConfig&proxy_server_mode=edit';
+	if (!$sock = fsockopen($server, $port, $errno, $errstr, 30))
+	{
+	       $error_str = $errstr.' : '.$errno ;
+	}else
+	{
+	       $action = 'ProxyServerConfig';
+	        fclose($sock);
+	}
+}
+
 //Added code to send a test mail to the currently logged in user
-if($server_type != 'backup')
+if($server_type != 'backup' && $server_type != 'proxy')
 {
 	require_once("modules/Emails/mail.php");
 	global $current_user;



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 06:42:28 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 13:42:28 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7636 -
	/vtigercrm/trunk/data/CRMEntity.php
Message-ID: <20060628134228.408837E8AD1@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 28 07:42:24 2006
New Revision: 7636

Log:
Problem in displaying graph in dashboard home page fixed

Modified:
    vtigercrm/trunk/data/CRMEntity.php

Modified: vtigercrm/trunk/data/CRMEntity.php
==============================================================================
--- vtigercrm/trunk/data/CRMEntity.php (original)
+++ vtigercrm/trunk/data/CRMEntity.php Wed Jun 28 07:42:24 2006
@@ -1512,42 +1512,8 @@
 	 */
 	function get_full_list($order_by = "", $where = "") {
 		$this->log->debug("get_full_list:  order_by = '$order_by' and where = '$where'");
-		$query = "SELECT * FROM $this->table_name ";
-		
-		if($where != "")
-			$query .= "where ($where) AND deleted=0";
-		else
-			$query .= "where deleted=0";
-
-		if(!empty($order_by))
-			$query .= " ORDER BY $order_by";
-
-		$result =& $this->db->query($query, false);
-
-		if($this->db->getRowCount($result) > 0){
-		
-			// We have some data.
-			while ($row = $this->db->fetchByAssoc($result)) {
-				foreach($this->list_fields as $field)
-				{
-					if (isset($row[$field])) {
-						$this->$field = $row[$field];
-						
-						$this->log->debug("process_full_list: $this->object_name({$row['id']}): ".$field." = ".$this->$field);
-					}
-					else {
- 	                                                $this->$field = '';   
-					}
-				}
-
-
-				$list[] = clone($this);         //added clone tosupport PHP5
-			}
-		}
-
-		if (isset($list)) return $list;
-		else return null;
-
+		$query = $this->create_list_query($order_by, $where);
+		return $this->process_full_list_query($query);
 	}
 
 }



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 07:26:09 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 14:26:09 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7637 -
	/vtigercrm/trunk/modules/Reports/Save.php
Message-ID: <20060628142609.70B3559021C@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 28 08:25:55 2006
New Revision: 7637

Log:
Added vtiger_ in getUniqueID function parameter

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

Modified: vtigercrm/trunk/modules/Reports/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Reports/Save.php (original)
+++ vtigercrm/trunk/modules/Reports/Save.php Wed Jun 28 08:25:55 2006
@@ -89,7 +89,7 @@
 //<<<<<<<advancedfilter>>>>>>>>
 if($reportid == "")
 {
-	$genQueryId = $adb->getUniqueID("selectquery");
+	$genQueryId = $adb->getUniqueID("vtiger_selectquery");
 	if($genQueryId != "")
 	{
 		$iquerysql = "insert into vtiger_selectquery (QUERYID,STARTINDEX,NUMOFOBJECTS) values (".$genQueryId.",0,0)";



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 07:27:37 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 14:27:37 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7638 -
	/vtigercrm/trunk/modules/Rss/Rss.php
Message-ID: <20060628142737.01EA8771F73@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 28 08:27:25 2006
New Revision: 7638

Log:
Added vtiger_ in getUniqueID function parameter

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

Modified: vtigercrm/trunk/modules/Rss/Rss.php
==============================================================================
--- vtigercrm/trunk/modules/Rss/Rss.php (original)
+++ vtigercrm/trunk/modules/Rss/Rss.php Wed Jun 28 08:27:25 2006
@@ -106,7 +106,7 @@
 			{
 				$rsstitle = $url;
 			}
-			$genRssId = $adb->getUniqueID("rss");
+			$genRssId = $adb->getUniqueID("vtiger_rss");
 			$sSQL = "insert into vtiger_rss (RSSID,RSSURL,RSSTITLE,RSSTYPE,STARRED) values (".$genRssId.",'".addslashes($url);
 			$sSQL .= "','".addslashes($rsstitle)."',0,".$makestarred.")";
 			$result = $adb->query($sSQL);



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 07:35:51 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 14:35:51 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7639 -
 /vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php
Message-ID: <20060628143551.3AE2883FD57@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 28 08:35:37 2006
New Revision: 7639

Log:
Added vtiger_ in getUniqueID function parameter

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

Modified: vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php (original)
+++ vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php Wed Jun 28 08:35:37 2006
@@ -63,7 +63,7 @@
 {
 	if($_REQUEST['fieldid'] == '')
 	{
-		$max_fieldid = $adb->getUniqueID("field");
+		$max_fieldid = $adb->getUniqueID("vtiger_field");
 		$columnName = 'cf_'.$max_fieldid;
 	}
 	else
@@ -234,13 +234,13 @@
 	//retreiving the sequence
 	if($_REQUEST['fieldid'] == '')
 	{
-		$custfld_fieldid=$adb->getUniqueID("field");
+		$custfld_fieldid=$adb->getUniqueID("vtiger_field");
 	}
 	else
 	{
 		$custfld_fieldid= $_REQUEST['fieldid'];
 	}
-	$custfld_sequece=$adb->getUniqueId("customfield_sequence");
+	$custfld_sequece=$adb->getUniqueId("vtiger_customfield_sequence");
     	
 	$blockid ='';
         //get the blockid for this custom block
@@ -296,7 +296,7 @@
 			for($i = 0; $i < $count; $i++)
 			{
 				$pickArray[$i] = trim($pickArray[$i]);
-				$id = $adb->getUniqueID($columnName);
+				$id = $adb->getUniqueID('vtiger_'.$columnName);
 				if($pickArray[$i] != '')
 				{
 					$query = "insert into vtiger_".$columnName." values(".$id.",'".$pickArray[$i]."',".$i.",1)";



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 07:41:01 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 14:41:01 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7640 -
	/vtigercrm/trunk/modules/Settings/Save.php
Message-ID: <20060628144101.C204E83FD58@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 28 08:40:48 2006
New Revision: 7640

Log:
Added vtiger_ in getUniqueID function parameter

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

Modified: vtigercrm/trunk/modules/Settings/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/Save.php (original)
+++ vtigercrm/trunk/modules/Settings/Save.php Wed Jun 28 08:40:48 2006
@@ -28,7 +28,7 @@
 
 if($id=='')
 {
-	$id = $adb->getUniqueID("systems");
+	$id = $adb->getUniqueID("vtiger_systems");
 	$sql="insert into vtiger_systems values(" .$id .",'".$server."','".$port."','".$server_username."','".$server_password."','".$server_type."','".$smtp_auth."')";
 }
 else



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 07:41:56 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 14:41:56 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7641 -
 /vtigercrm/trunk/modules/Settings/SaveCurrencyInfo.php
Message-ID: <20060628144156.1219983FD5D@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 28 08:41:43 2006
New Revision: 7641

Log:
Added vtiger_ in getUniqueID function parameter

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

Modified: vtigercrm/trunk/modules/Settings/SaveCurrencyInfo.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/SaveCurrencyInfo.php (original)
+++ vtigercrm/trunk/modules/Settings/SaveCurrencyInfo.php Wed Jun 28 08:41:43 2006
@@ -24,7 +24,7 @@
 }
 else
 {
-        $sql = "insert into vtiger_currency_info values(".$db->getUniqueID("currency_info").",'".$currency_name."','".$currency_code."','".$currency_symbol."','".$conversion_rate."','".$currency_status."','0')";
+        $sql = "insert into vtiger_currency_info values(".$db->getUniqueID("vtiger_currency_info").",'".$currency_name."','".$currency_code."','".$currency_symbol."','".$conversion_rate."','".$currency_status."','0')";
 }
 $adb->query($sql);
 $loc = "Location: index.php?module=Settings&action=CurrencyListView&parenttab=".$_REQUEST['parenttab'];



From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 28 07:42:28 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 28 Jun 2006 14:42:28 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231394=3A?=
 =?utf-8?q?_quote_is_not_getting_saved_when_we_create_SO_from_Quotes?=
Message-ID: <076.2e16a7e666b39de47b21f8d6af637752@vtiger.fosslabs.com>

#1394: quote is not getting saved when we create SO from Quotes
-----------------------+----------------------------------------------------
 Reporter:  mickie     |       Owner:  mickie
     Type:  defect     |      Status:  new   
 Priority:  major      |   Milestone:        
Component:  vtigercrm  |     Version:  5.0.0 
 Keywords:             |  
-----------------------+----------------------------------------------------
 From Quotes we can create SO where as the quote details are populated. but
 when we save the SO, SO is saved without the relationship with quote.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1394>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 07:43:31 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 14:43:31 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7642 -
 /vtigercrm/trunk/modules/Settings/SaveMailAccount.php
Message-ID: <20060628144331.EE6FB83FD58@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 28 08:43:19 2006
New Revision: 7642

Log:
Added vtiger_ in getUniqueID function parameter

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

Modified: vtigercrm/trunk/modules/Settings/SaveMailAccount.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/SaveMailAccount.php (original)
+++ vtigercrm/trunk/modules/Settings/SaveMailAccount.php Wed Jun 28 08:43:19 2006
@@ -37,7 +37,7 @@
 }
 else
 {
-	$account_id = $adb->getUniqueID("mail_accounts");
+	$account_id = $adb->getUniqueID("vtiger_mail_accounts");
 	$sql="insert into vtiger_mail_accounts values(" .$account_id .",'".$current_user->id."','".$displayname."','".$email."','".$account_name."','".$mailprotocol."','".$server_username."','".$server_password."','".$mail_servername."','".$box_refresh."','".$mails_per_page."', '".$ssltype."', '".$sslmeth."', '".$_REQUEST["int_mailer"]."','1','0')";
 }
 



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 08:21:12 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 15:21:12 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7643 - in
 /vtigercrm/trunk/modules/Dashboard: Entity_charts.php display_charts.php
Message-ID: <20060628152112.5F3B87E8AD1@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 28 09:21:07 2006
New Revision: 7643

Log:
Security check intensified for dashboards

Modified:
    vtigercrm/trunk/modules/Dashboard/Entity_charts.php
    vtigercrm/trunk/modules/Dashboard/display_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 Wed Jun 28 09:21:07 2006
@@ -383,14 +383,14 @@
 
 function get_graph_by_type($graph_by,$graph_title,$module,$where,$query)
 {
-	global $user_id,$date_start,$end_date,$type;
+	global $user_id,$date_start,$end_date,$type,$mod_strings;
 
 	//Giving the Cached image name
 	$cache_file_name=abs(crc32($user_id))."_".$type."_".crc32($date_start.$end_date).".png";
 	$html_imagename=$graph_by; //Html image name for the graph
 
 	$graph_details=module_Chart($user_id,$date_start,$end_date,$query,$graph_by,$graph_title,$where,$module,$type);
-
+	
 	if($graph_details!=0)
 	{
 		$name_val=$graph_details[0];
@@ -414,7 +414,7 @@
 	}
 	else
 	{
-		
+                 echo $mod_strings['LBL_NO_PERMISSION_FIELD'];
 	}
 	
 }

Modified: vtigercrm/trunk/modules/Dashboard/display_charts.php
==============================================================================
--- vtigercrm/trunk/modules/Dashboard/display_charts.php (original)
+++ vtigercrm/trunk/modules/Dashboard/display_charts.php Wed Jun 28 09:21:07 2006
@@ -15,6 +15,7 @@
 	
 global $tmp_dir;
 global $mod_strings,$app_strings;
+global $current_user;
 
 $period=($_REQUEST['period'])?$_REQUEST['period']:"tmon"; // Period >> lmon- Last Month, tmon- This Month, lweek-LastWeek, tweek-ThisWeek; lday- Last Day 
 $type=($_REQUEST['type'])?$_REQUEST['type']:"leadsource";
@@ -72,6 +73,25 @@
 //Query for tickets by contact
 $tickets_by_contact="select vtiger_troubletickets.*, vtiger_contactdetails.* from vtiger_troubletickets inner join vtiger_contactdetails on vtiger_contactdetails.contactid=vtiger_troubletickets.parent_id";
 
+
+/**This function generates the security parameters for a given module based on the assigned profile 
+*Param $module - module name
+*Returns an string value
+*/
+
+function dashboard_check($module)
+{
+	global $current_user;
+	$sec_parameter = '';
+	$tab_id = getTabid($module);
+	require('user_privileges/user_privileges_'.$current_user->id.'.php');
+	require('user_privileges/sharing_privileges_'.$current_user->id.'.php');
+	if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[$tab_id] == 3)
+	{
+		$sec_parameter=getListViewSecurityParameter($module);
+	}
+	return $sec_parameter;
+}
 /**  This function returns  the values for the graph, for any type of graph needed	 
         * Portions created by vtiger are Copyright (C) vtiger.
         * All Rights Reserved.
@@ -221,7 +241,7 @@
                     	$graph_title= $mod_strings['leadsource'];
                     	$module="Leads";
                     	$where="";
-                    	$query=$leads_query;                   
+                    	$query=$leads_query." ".dashboard_check($module);                   
                     	echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
                     
                     }
@@ -232,7 +252,7 @@
                     	$graph_title= $mod_strings['leadstatus'];
                     	$module="Leads";
                     	$where="";
-                    	$query=$leads_query;
+                    	$query=$leads_query." ".dashboard_check($module);
                     	echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
                     }
                     //Charts for Lead Industry
@@ -242,7 +262,7 @@
                             $graph_title=$mod_strings['leadindustry'];
                             $module="Leads";
                             $where="";
-                            $query=$leads_query;
+                            $query=$leads_query." ".dashboard_check($module);
                             echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
                     }
                     //Sales by Lead Source
@@ -252,7 +272,7 @@
                             $graph_title=$mod_strings['salesbyleadsource'];
                             $module="Potentials";
                             $where=" and vtiger_potential.sales_stage like '%Closed Won%' ";
-                            $query=$potential_query;
+                            $query=$potential_query." ".dashboard_check($module);
                             echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
                     }
                     //Sales by Account
@@ -262,7 +282,7 @@
                          $graph_title=$mod_strings['salesbyaccount'];
                          $module="Potentials";
                          $where=" and vtiger_potential.sales_stage like '%Closed Won%' ";
-                         $query=$potential_query;
+                         $query=$potential_query." ".dashboard_check($module);
                          echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
                     }
 		    //Sales by User
@@ -272,7 +292,7 @@
 			$graph_title=$mod_strings['salesbyuser'];
 			$module="Potentials";
 			$where=" and (vtiger_crmentity.smownerid != NULL || vtiger_crmentity.smownerid != ' ')";
-			$query=$potential_query;
+			$query=$potential_query." ".dashboard_check($module);
 			echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
 		    }
 		    //Sales by team
@@ -282,7 +302,7 @@
 			$graph_title=$mod_strings['salesbyteam'];
 			$module="Potentials";
 			$where=" and (vtiger_potentialgrouprelation.groupname != NULL || vtiger_potentialgrouprelation.groupname != '')";
-			$query=$potential_query;
+			$query=$potential_query." ".dashboard_check($module);
 			echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
 		    }
                     //Charts for Account by Industry
@@ -292,7 +312,7 @@
                             $graph_title=$mod_strings['accountindustry'];
                             $module="Accounts";
                             $where="";
-                            $query=$account_query;
+                            $query=$account_query." ".dashboard_check($module);
                             echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
                     }
                     //Charts for Products by Category
@@ -302,7 +322,7 @@
                             $graph_title=$mod_strings['productcategory'];
                             $module="Products";
                             $where="";
-                            $query=$products_query;
+                            $query=$products_query." ".dashboard_check($module);
                             echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
                     }
 		    //Charts for Products by Quantity in stock
@@ -312,7 +332,7 @@
 			    $graph_title=$mod_strings['productbyqtyinstock'];
 			    $module="Products";
 			    $where="";
-			    $query=$products_query;
+			    $query=$products_query." ".dashboard_check($module);
 			    echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
 		    }
 		    //Charts for Products by PO
@@ -322,7 +342,7 @@
 			    $graph_title=$mod_strings['productbypo'];
 			    $module="Products";
 			    $where="";
-			    $query=$products_query;
+			    $query=$products_query." ".dashboard_check($module);
 			    echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
 		    }
 		    //Charts for Products by Quotes
@@ -332,7 +352,7 @@
    			    $graph_title=$mod_strings['productbyquotes'];
 			    $module="Products";
 			    $where=""; 
-			    $query=$products_query;
+			    $query=$products_query." ".dashboard_check($module);
 			    echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
 		    }
 		    //Charts for Products by Invoice
@@ -342,7 +362,7 @@
 			    $graph_title=$mod_strings['productbyinvoice'];
 			    $module="Products";
 			    $where="";
-			    $query=$products_query;
+			    $query=$products_query." ".dashboard_check($module);
 			    echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
 		    }
 
@@ -353,7 +373,7 @@
                             $graph_title=$mod_strings['sobyaccounts'];
                             $module="SalesOrder";
                             $where="";
-                            $query=$so_query;
+                            $query=$so_query." ".dashboard_check($module);
                             echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
                     }
                     //Sales Order by Status
@@ -363,7 +383,7 @@
                             $graph_title=$mod_strings['sobystatus'];
                             $module="SalesOrder";
                             $where="";
-                            $query=$so_query;
+                            $query=$so_query." ".dashboard_check($module);
                             echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
                     }
                     //Purchase Order by Status
@@ -373,7 +393,7 @@
                             $graph_title=$mod_strings['pobystatus'];
                             $module="PurchaseOrder";
                             $where="";
-                            $query=$po_query;
+                            $query=$po_query." ".dashboard_check($module);
                             echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
                     }
                     //Quotes by Accounts
@@ -383,7 +403,7 @@
                             $graph_title= $mod_strings['quotesbyaccounts'];
                             $module="Quotes";
                             $where="";
-                            $query=$quotes_query;
+                            $query=$quotes_query." ".dashboard_check($module);
                             echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
                     }
                     //Quotes by Stage
@@ -393,7 +413,7 @@
                             $graph_title=$mod_strings['quotesbystage'];
                             $module="Quotes";
                             $where="";
-                            $query=$quotes_query;
+                            $query=$quotes_query." ".dashboard_check($module);
                             echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
                     }
                     //Invoice by Accounts
@@ -403,7 +423,7 @@
                             $graph_title=$mod_strings['invoicebyacnts'];
                             $module="Invoice";
                             $where="";
-                            $query=$invoice_query;
+                            $query=$invoice_query." ".dashboard_check($module);
                             echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
                     }
                     //Invoices by status
@@ -413,7 +433,7 @@
                             $graph_title=$mod_strings['invoicebystatus'];
                             $module="Invoice";
                             $where="";
-                            $query=$invoice_query;
+                            $query=$invoice_query." ".dashboard_check($module);
                             echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
                     }
                     //Tickets by Status
@@ -423,7 +443,7 @@
                             $graph_title=$mod_strings['ticketsbystatus'];
                             $module="HelpDesk";
                             $where="";
-                            $query=$helpdesk_query;
+                            $query=$helpdesk_query." ".dashboard_check($module);
                             echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
                     }
                     //Tickets by Priority
@@ -433,7 +453,7 @@
                             $graph_title=$mod_strings['ticketsbypriority'];
                             $module="HelpDesk";
                             $where="";
-                            $query=$helpdesk_query;
+                            $query=$helpdesk_query." ".dashboard_check($module);
                             echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
                     }
 		    //Tickets by Category
@@ -443,7 +463,7 @@
 			    $graph_title=$mod_strings['ticketsbycategory'];
 			    $module="HelpDesk";
 			    $where="";
-			    $query=$helpdesk_query;
+			    $query=$helpdesk_query." ".dashboard_check($module);
 			    echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
 		    }
 		    //Tickets by User   
@@ -453,7 +473,7 @@
 			    $graph_title=$mod_strings['ticketsbyuser'];
 			    $module="HelpDesk";
 			    $where=" and (vtiger_crmentity.smownerid != NULL || vtiger_crmentity.smownerid != ' ')";
-			    $query=$helpdesk_query;
+			    $query=$helpdesk_query." ".dashboard_check($module);
 			    echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
 		    }
 		    //Tickets by Team
@@ -463,7 +483,7 @@
 			    $graph_title=$mod_strings['ticketsbyteam'];
 			    $module="HelpDesk";
 			    $where=" and (vtiger_ticketgrouprelation.groupname != NULL || vtiger_ticketgrouprelation.groupname != ' ')";
-			    $query=$helpdesk_query;
+			    $query=$helpdesk_query." ".dashboard_check($module);
 			    echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
 		    }    
 		    //Tickets by Product
@@ -473,7 +493,7 @@
 			    $graph_title=$mod_strings['ticketsbyproduct'];
 			    $module="HelpDesk";
 			    $where="";
-			    $query=$helpdesk_query;
+			    $query=$helpdesk_query." ".dashboard_check($module);
 			    echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
 		    }
 		    //Campaigns by Contact
@@ -483,7 +503,7 @@
 			    $graph_title=$mod_strings['ticketsbycampaign'];
 			    $module="Campaigns";
 			    $where="";
-			    $query=$campaign_query;
+			    $query=$campaign_query." ".dashboard_check($module);
 			    echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
 		    }
 		    //Tickets by Account
@@ -493,7 +513,7 @@
 			    $graph_title=$mod_strings['ticketsbyaccount'];
 			    $module="HelpDesk";
 			    $where="";
-			    $query=$tickets_by_account;
+			    $query=$tickets_by_account." ".dashboard_check($module);
 			    echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
 		    }
 			    //Tickets by Contact
@@ -503,7 +523,7 @@
 				    $graph_title=$mod_strings['ticketsbycontact'];
 				    $module="HelpDesk";
 				    $where="";
-				    $query=$tickets_by_contact;
+				    $query=$tickets_by_contact." ".dashboard_check($module);
 				    echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
 				    }
 		    else



From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 28 08:23:14 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 28 Jun 2006 15:23:14 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231088=3A?=
 =?utf-8?q?_Issue_in_Custom_view=2C_Reports=2C_Dashboard_Security_Implemen?=
 =?utf-8?q?tation?=
In-Reply-To: <076.80fe4e3b3d04da48f15c540f9a0bd179@vtiger.fosslabs.com>
References: <076.80fe4e3b3d04da48f15c540f9a0bd179@vtiger.fosslabs.com>
Message-ID: <085.bbfb55c95d9dc8dcd258c2daf9203ad6@vtiger.fosslabs.com>

#1088: Issue in Custom view, Reports, Dashboard Security Implementation
------------------------+---------------------------------------------------
  Reporter:  don        |       Owner:  philip
      Type:  defect     |      Status:  closed
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by saraj):

  * resolution:  => fixed
  * status:  reopened => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1088>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 09:12:17 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 16:12:17 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7644 -
	/vtigercrm/trunk/include/language/en_us.lang.php
Message-ID: <20060628161218.3F5B083FD24@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 28 10:12:09 2006
New Revision: 7644

Log:
New UI for Users has been integrated

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

Modified: vtigercrm/trunk/include/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/include/language/en_us.lang.php (original)
+++ vtigercrm/trunk/include/language/en_us.lang.php Wed Jun 28 10:12:09 2006
@@ -940,6 +940,8 @@
 'LBL_TO_CONFIGURE'=>'to Configure',
 'LBL_HERE'=>'here',
 'LBL_RECORDS'=>'Records',
+'LBL_SCROLL'=>'[Scroll to Top]',
+'LBL_EXPAND_COLLAPSE'=>'Expand/Collapse',
 );
 
 



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 09:12:45 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 16:12:45 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7645 -
 /vtigercrm/trunk/modules/Users/language/en_us.lang.php
Message-ID: <20060628161246.3E28883FD57@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 28 10:12:38 2006
New Revision: 7645

Log:
New UI for Users has been integrated

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

Modified: vtigercrm/trunk/modules/Users/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Users/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Users/language/en_us.lang.php Wed Jun 28 10:12:38 2006
@@ -566,7 +566,12 @@
 'Country'=>'Country',
 'Password'=>'Password',
 'Confirm Password'=>'Confirm Password',
-
+'LBL_SHOWN'=>'Shown',
+'LBL_HIDDEN'=>'Hidden',
+'LBL_SHOW'=>'Show',
+'LBL_HIDE'=>'Hide',
+'LBL_HOME_PAGE_COMP'=>'Home Page Components',
+'LBL_LOGIN_HISTORY'=>'Login History',
 );
 
 ?>



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 09:15:09 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 16:15:09 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7646 - in
 /vtigercrm/trunk/modules/Users: DetailView.php EditView.php Save.php
Message-ID: <20060628161509.8466283FD57@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 28 10:14:57 2006
New Revision: 7646

Log:
New UI for Users has been integrated

Modified:
    vtigercrm/trunk/modules/Users/DetailView.php
    vtigercrm/trunk/modules/Users/EditView.php
    vtigercrm/trunk/modules/Users/Save.php

Modified: vtigercrm/trunk/modules/Users/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DetailView.php (original)
+++ vtigercrm/trunk/modules/Users/DetailView.php Wed Jun 28 10:14:57 2006
@@ -132,11 +132,11 @@
 		&& $default_user_name == $focus->user_name
 		&& isset($lock_default_user_name)
 		&& $lock_default_user_name == true	) {
-	$buttons = "<input title='".$app_strings['LBL_EDIT_BUTTON_TITLE']."' accessKey='".$app_strings['LBL_EDIT_BUTTON_KEY']."' class='classBtn' onclick=\"this.form.return_module.value='Users'; this.form.return_action.value='DetailView'; this.form.return_id.value='$focus->id'; this.form.action.value='EditView'; this.form.parenttab.value='$parenttab'\" type='submit' name='Edit' value='  ".$app_strings['LBL_EDIT_BUTTON_LABEL']."  '>";
+	$buttons = "<input title='".$app_strings['LBL_EDIT_BUTTON_TITLE']."' accessKey='".$app_strings['LBL_EDIT_BUTTON_KEY']."' class='crmButton small edit' onclick=\"this.form.return_module.value='Users'; this.form.return_action.value='DetailView'; this.form.return_id.value='$focus->id'; this.form.action.value='EditView'; this.form.parenttab.value='$parenttab'\" type='submit' name='Edit' value='  ".$app_strings['LBL_EDIT_BUTTON_LABEL']."  '>";
 	$smarty->assign('EDIT_BUTTON',$buttons);
 }
 elseif (is_admin($current_user) || $_REQUEST['record'] == $current_user->id) {
-	$buttons = "<input title='".$app_strings['LBL_EDIT_BUTTON_TITLE']."' accessKey='".$app_strings['LBL_EDIT_BUTTON_KEY']."' class='classBtn' onclick=\"this.form.return_module.value='Users'; this.form.return_action.value='DetailView'; this.form.return_id.value='$focus->id'; this.form.action.value='EditView'; this.form.parenttab.value='$parenttab'\" type='submit' name='Edit' value='  ".$app_strings['LBL_EDIT_BUTTON_LABEL']."  '>";
+	$buttons = "<input title='".$app_strings['LBL_EDIT_BUTTON_TITLE']."' accessKey='".$app_strings['LBL_EDIT_BUTTON_KEY']."' class='crmButton small edit' onclick=\"this.form.return_module.value='Users'; this.form.return_action.value='DetailView'; this.form.return_id.value='$focus->id'; this.form.action.value='EditView'; this.form.parenttab.value='$parenttab'\" type='submit' name='Edit' value='  ".$app_strings['LBL_EDIT_BUTTON_LABEL']."  '>";
 	$smarty->assign('EDIT_BUTTON',$buttons);
 	
 		$buttons = "<input title='".$mod_strings['LBL_CHANGE_PASSWORD_BUTTON_TITLE']."' accessKey='".$mod_strings['LBL_CHANGE_PASSWORD_BUTTON_KEY']."' class='classBtn' LANGUAGE=javascript onclick='return window.open(\"index.php?module=Users&action=ChangePassword&form=DetailView\",\"test\",\"width=320,height=165,resizable=no,scrollbars=0, toolbar=no, titlebar=no, left=100, top=126, screenX=100, screenY=126\");' type='button' name='password' value='".$mod_strings['LBL_CHANGE_PASSWORD_BUTTON_LABEL']."'>";
@@ -153,7 +153,7 @@
 }
 if (is_admin($current_user)) 
 {
-	$buttons = "<input title='".$app_strings['LBL_DUPLICATE_BUTTON_TITLE']."' accessKey='".$app_strings['LBL_DUPLICATE_BUTTON_KEY']."' class='classBtn' onclick=\"this.form.return_module.value='Users'; this.form.return_action.value='DetailView'; this.form.isDuplicate.value=true; this.form.return_id.value='".$_REQUEST['record']."';this.form.action.value='EditView'\" type='submit' name='Duplicate' value=' ".$app_strings['LBL_DUPLICATE_BUTTON_LABEL']."'   >";
+	$buttons = "<input title='".$app_strings['LBL_DUPLICATE_BUTTON_TITLE']."' accessKey='".$app_strings['LBL_DUPLICATE_BUTTON_KEY']."' class='crmButton small cancel' onclick=\"this.form.return_module.value='Users'; this.form.return_action.value='DetailView'; this.form.isDuplicate.value=true; this.form.return_id.value='".$_REQUEST['record']."';this.form.action.value='EditView'\" type='submit' name='Duplicate' value=' ".$app_strings['LBL_DUPLICATE_BUTTON_LABEL']."'   >";
 	$smarty->assign('DUPLICATE_BUTTON',$buttons);
 	
 	//done so that only the admin user can see the customize tab button
@@ -182,10 +182,11 @@
 $smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']);
 $smarty->assign("MODULE", 'Users');
 $smarty->assign("CURRENT_USERID", $current_user->id);
+$smarty->assign("HOMEORDER",$focus->getHomeOrder($focus->id));
 $smarty->assign("BLOCKS", getBlocks($currentModule,"detail_view",'',$focus->column_fields));
 
 
-        $smarty->display("UserDetailView.tpl");
+$smarty->display("UserDetailView.tpl");
 
 
 ?>

Modified: vtigercrm/trunk/modules/Users/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/Users/EditView.php (original)
+++ vtigercrm/trunk/modules/Users/EditView.php Wed Jun 28 10:14:57 2006
@@ -104,6 +104,7 @@
 	$smarty->assign("USERNAME_READONLY", "readonly");
 }
 
+$smarty->assign("HOMEORDER",$focus->getHomeOrder($focus->id));
 
 
 

Modified: vtigercrm/trunk/modules/Users/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Users/Save.php (original)
+++ vtigercrm/trunk/modules/Users/Save.php Wed Jun 28 10:14:57 2006
@@ -80,6 +80,7 @@
 	
 	setObjectValuesFromRequest(&$focus);
 	$focus->saveentity("Users");
+	$focus->saveHomeOrder($focus->id);
 	$return_id = $focus->id;
 
 if (isset($_POST['user_name']) && isset($_POST['new_password'])) {



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 09:17:54 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 16:17:54 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7647 -
	/vtigercrm/trunk/modules/Users/User.php
Message-ID: <20060628161754.B46DF83FD57@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 28 10:17:46 2006
New Revision: 7647

Log:
New UI for Users has been integrated

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

Modified: vtigercrm/trunk/modules/Users/User.php
==============================================================================
--- vtigercrm/trunk/modules/Users/User.php (original)
+++ vtigercrm/trunk/modules/Users/User.php Wed Jun 28 10:17:46 2006
@@ -115,6 +115,7 @@
 	var $tagcloud;
 	var $imagename;
 	var $defhomeview;
+	var $homeorder_array = array('ALVT','PLVT','QLTQ','CVLVT','HLT','OLV','GRT','OLTSO','ILTI','MNL','HDB');
 
 	var $encodeFields = Array("first_name", "last_name", "description");
 
@@ -868,7 +869,6 @@
 			$button = '';
 			$query = 'select vtiger_users.*,vtiger_groups.* from vtiger_users inner join vtiger_users2group on vtiger_users.id=vtiger_users2group.userid left join vtiger_groups on vtiger_groups.groupid=vtiger_users2group.groupid where vtiger_users.id='.$id;
 			$log->debug("Exiting get_contacts method ...");
-			echo '<pre>';print_r(getAllGroupInfo($query));echo '</pre>';
 			return getAllGroupInfo($query);
 			}
 
@@ -881,6 +881,54 @@
 		//GS Save entity being called with the modulename as parameter
 		$this->saveentity($module_name);
 	}
+	function getHomeOrder($id="")	
+	{
+		global $log;
+		global $adb;
+		$log->debug("Entering in function getHomeOrder($id)");
+		if($id == '')
+		{
+			for($i = 0;$i < count($this->homeorder_array);$i++)
+                        {
+				$return_array[$this->homeorder_array[$i]] = $this->homeorder_array[$i];
+			}
+		}else
+		{
+			$query = "select homeorder from vtiger_users where id=$id";
+			$homeorder = $adb->query_result($adb->query($query),0,'homeorder');
+			for($i = 0;$i < count($this->homeorder_array);$i++)
+			{
+				if(!stristr($homeorder,$this->homeorder_array[$i]))
+				{
+					$return_array[$this->homeorder_array[$i]] = '';
+				}else
+				{
+					$return_array[$this->homeorder_array[$i]] = $this->homeorder_array[$i];
+				}
+					
+			}
+
+		}
+
+		$log->debug("Exiting from function getHomeOrder($id)");
+		return $return_array;
+	}
+	function saveHomeOrder($id)
+	{
+		if($id == '')
+			return null;
+		global $log,$adb;
+                $log->debug("Entering in function saveHomeOrder($id)");
+		for($i = 0;$i < count($this->homeorder_array);$i++)
+                {
+			if($_REQUEST[$this->homeorder_array[$i]] != '')
+				$save_array[] = $this->homeorder_array[$i];
+		}
+		$homeorder = implode(',',$save_array);	
+		$query = "update vtiger_users set homeorder ='$homeorder' where id=$id";
+		$adb->query($query);
+                $log->debug("Exiting from function saveHomeOrder($id)");
+	}
 
 }
 ?>



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 09:19:04 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 16:19:04 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7648 - in
 /vtigercrm/trunk/Smarty/templates: UserDetailView.tpl UserEditView.tpl
Message-ID: <20060628161905.1E3D383FD24@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 28 10:18:54 2006
New Revision: 7648

Log:
New UI for Users has been integrated

Modified:
    vtigercrm/trunk/Smarty/templates/UserDetailView.tpl
    vtigercrm/trunk/Smarty/templates/UserEditView.tpl

Modified: vtigercrm/trunk/Smarty/templates/UserDetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/UserDetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/UserDetailView.tpl Wed Jun 28 10:18:54 2006
@@ -13,154 +13,174 @@
 <script language="JavaScript" type="text/javascript" src="include/js/ColorPicker2.js"></script>
 <script language="javascript" type="text/javascript" src="include/js/general.js"></script>
 <script language="JavaScript" type="text/javascript" src="include/js/dtlviewajax.js"></script>
+<script src="include/scriptaculous/scriptaculous.js" type="text/javascript"></script>
 <span id="crmspanid" style="display:none;position:absolute;"  onmouseover="show('crmspanid');">
    <a class="link"  align="right" href="javascript:;">{$APP.LBL_EDIT_BUTTON}</a>
 </span>
 
-<style type="text/css">@import url(themes/blue/style.css);</style>
-
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
+<br>
+<table align="center" border="0" cellpadding="0" cellspacing="0" width="98%">
 <tr>
-{if $CATEGORY eq 'Settings'}
-	{include file='SettingsMenu.tpl'}
-{/if}
-<td width="75%" valign="top">
-
-<table width="100%"  border="0" cellspacing="0" cellpadding="0">
-	<tr><td class="padTab" align="left">
-		<table width="100%" border="0" cellpadding="0" cellspacing="0">
+    <td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
+    <td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
+    <br>
+
+    <div align=center>
+    {if $CATEGORY eq 'Settings'}
+        {include file='SetMenu.tpl'}
+    {/if}
+	<table width="100%"  border="0" cellspacing="0" cellpadding="0">
+	<tr>
+	    <td class="padTab" align="left">
 		<form name="DetailView" method="POST" action="index.php" ENCTYPE="multipart/form-data" id="form">
-			<input type="hidden" name="module" value="Users">
-			<input type="hidden" name="record" value="{$ID}">
-			<input type="hidden" name="isDuplicate" value=false>
-			<input type="hidden" name="action">
-
-{if $CATEGORY eq 'Settings'}
+		<input type="hidden" name="module" value="Users">
+		<input type="hidden" name="record" value="{$ID}">
+		<input type="hidden" name="isDuplicate" value=false>
+		<input type="hidden" name="action">
+		{if $CATEGORY eq 'Settings'}
 			<input type="hidden" name="modechk" value="prefview">
-{/if}
-			<input type="hidden" name="old_password">
-			<input type="hidden" name="new_password">
-			<input type="hidden" name="return_module">
-			<input type="hidden" name="return_action">
-			<input type="hidden" name="return_id">
-			<input type="hidden" name="forumDisplay">
-{if $CATEGORY eq 'Settings'}
+		{/if}
+		<input type="hidden" name="old_password">
+		<input type="hidden" name="new_password">
+		<input type="hidden" name="return_module">
+		<input type="hidden" name="return_action">
+		<input type="hidden" name="return_id">
+		<input type="hidden" name="forumDisplay">
+		{if $CATEGORY eq 'Settings'}
 			<input type="hidden" name="parenttab" value="{$PARENTTAB}">
-{/if}	
-
+		{/if}	
+	        <table width="100%" border="0" cellpadding="0" cellspacing="0">
+		<tr>
+		    <td style="border-bottom:1px dashed #CCCCCC;">
+			<table width="100%" cellpadding="5" cellspacing="0" border="0">
 			<tr>
-				<td style="border-bottom:1px dashed #CCCCCC;">
-					<table width="100%" cellpadding="5" cellspacing="0" border="0">
-					<tr>
-						<td colspan=2 style="padding:5px;">
-						{if $CATEGORY eq 'Settings'}
-							<span class="lvtHeaderText">
-							<b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS} </a> > {$MOD.LBL_USER_MANAGEMENT} > {$MOD.LBL_USERS}</b></span>
-						{else}
-							<span class="lvtHeaderText">	
-							<b>{$APP.LBL_MY_PREFERENCES}</b>
-							</span>
-						{/if}
-						<span id="vtbusy_info" style="display:none;" valign="bottom"><img src="{$IMAGE_PATH}vtbusy.gif" border="0"></span>					
-				<hr noshade="noshade" size="1" />
-						</td>
-						<td align="right"><hr noshade="noshade" size="1" /></td>
-									  </tr>
-									<tr>
-											<td width="5%"><img src="{$IMAGE_PATH}user.gif" align="absmiddle"></td>
-											<td width="95%"><span class="genHeaderGrayBig">{$USER_NAME}</span><br>
-												<b class="small">{$UMOD.LBL_DETAIL_VIEW} {$FIRST_NAME} {$LAST_NAME}</b>
-											</td>
-									</tr>
-							</table>
-					</td>
+			    <td rowspan="2"><img src="{$IMAGE_PATH}user.gif" align="absmiddle"></td>	
+			    <td>
+			    {if $CATEGORY eq 'Settings'}
+				<span class="lvtHeaderText">
+				<b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS} </a> > {$MOD.LBL_USER_MANAGEMENT} > {$MOD.LBL_USERS}</b></span>
+			    {else}
+				<span class="lvtHeaderText">	
+				<b>{$APP.LBL_MY_PREFERENCES}</b>
+			   	</span>
+			    {/if}
+			    <span id="vtbusy_info" style="display:none;" valign="bottom"><img src="{$IMAGE_PATH}vtbusy.gif" border="0"></span>					
+			    </td>
+			    <td rowspan="2" nowrap>
+				{if $CATEGORY eq 'Settings'}
+                                	{$DUPLICATE_BUTTON}
+                        	{/if}
+				{$EDIT_BUTTON}
+			    </td>	
 			</tr>
-			<tr><td>&nbsp;</td></tr>
-			<tr valign="center">
-			        <td class="small" align="center">
-					{$EDIT_BUTTON}
-				{$CHANGE_PW_BUTTON}
-				{$LOGIN_HISTORY_BUTTON}
-			{if $CATEGORY eq 'Settings'}
-				{$DUPLICATE_BUTTON}
-			{/if}	
-				{$CHANGE_HOMEPAGE_BUTTON}	
-				{$LISTROLES_BUTTON}
-	</td></tr>
-
-		<tr><td colspan="2">&nbsp;</td></tr>
-		<tr><td colspan="2">
-		<table align="center" border="0" cellpadding="0" cellspacing="0" width="99%">
-		  
-		  <tr>
-			<td>
-			  <table class="small" border="0" cellpadding="3" cellspacing="0" width="100%">
-			  <tr >
-			        <td id="prof" width="25%" align="center" nowrap="nowrap" class="dvtSelectedCell" onClick="fnVis('prof')"><b>{$UMOD.LBL_USER_LOGIN_ROLE}</b></td>
-			     <td class="dvtTabCache" width="10" nowrap="nowrap">&nbsp;</td>
-
-			     <td class="dvtUnSelectedCell" align=center nowrap><a href="index.php?action=CallRelatedList&module={$MODULE}&record={$ID}&parenttab={$CATEGORY}">{$APP.LBL_MORE} {$APP.LBL_INFORMATION}</a></td>
-				    <td class="dvtTabCache" nowrap="nowrap" width="10">&nbsp;</td>
-			  </tr>
-			  </table>
-			</td>
-		  </tr>
-		  <tr>
+			<tr>
+			    <td>sssssssssss</td>
+			</tr>
+		    </table>
+		</td>
+	    </tr>
+	    <tr><td>&nbsp;</td></tr>
+	    <tr valign="center">
+	    	<td class="small" align="center">
+			{$CHANGE_PW_BUTTON}
+			{$LOGIN_HISTORY_BUTTON}
+		</td>
+	    </tr>
+	    <tr><td colspan="2">&nbsp;</td></tr>
+	    <tr>
+		<td colspan="2">
+		    <table align="center" border="0" cellpadding="0" cellspacing="0" width="99%">
+		    <tr>
 		  	<td align="left" valign="top">
-				{foreach key=header item=detail from=$BLOCKS}
-				<table border=0 cellspacing=0 cellpadding=0 width=100% class="small">
-  		    	<tr>
-    	               <td>&nbsp;</td>
-        	           <td>&nbsp;</td>
-            	       <td>&nbsp;</td>
-                	   <td align=right>
-				</tr>  
+			    {foreach key=header name=blockforeach item=detail from=$BLOCKS}
+				<br>
+				<table class="tableHeading" border="0" cellpadding="5" cellspacing="0" width="100%">
 				<tr>
-						{strip}
-					     <td colspan=4 style="border-bottom:1px solid #999999;padding:5px;" bgcolor="#e5e5e5">
-							<b>	{$header}</b>
-						 </td>
-						 {/strip}
-			    </tr>
-					{foreach item=detail from=$detail}
-					<tr style="height:25px">
-							{foreach key=label item=data from=$detail}
-							   {assign var=keyid value=$data.ui}
-							   {assign var=keyval value=$data.value}
-							   {assign var=keytblname value=$data.tablename}
-							   {assign var=keyfldname value=$data.fldname}
-							   {assign var=keyoptions value=$data.options}
-							   {assign var=keysecid value=$data.secid}
-							   {assign var=keyseclink value=$data.link}
-							   {assign var=keycursymb value=$data.cursymb}
-							   {assign var=keysalut value=$data.salut}
-							   {assign var=keycntimage value=$data.cntimage}
-							   {assign var=keyadmin value=$data.isadmin}
-							   
-							   <input type="hidden" id="hdtxt_IsAdmin" value={$keyadmin}></input>
-							   	{if $label ne ''}
-									<td class="dvtCellLabel" align=right width=25%>{$label}</td>
-									{include file="DetailViewUI.tpl"}
-								{else}
-                                    <td class="dvtCellLabel" align=right>&nbsp;</td>
-                                    <td class="dvtCellInfo" align=left >&nbsp;</td>
-				{/if}	
-							{/foreach}
+				    {strip}
+				     <td class="big">	
+					<strong>{$smarty.foreach.blockforeach.iteration}. {$header}</strong>
+				     </td>
+				     <td class="small" align="right">&nbsp;</td>	
+				    {/strip}
+			        </tr>
+				</table>
+				<table border="0" cellpadding="5" cellspacing="0" width="100%">
+				{foreach item=detail from=$detail}
+				<tr style="height:25px">
+					{foreach key=label item=data from=$detail}
+					   {assign var=keyid value=$data.ui}
+					   {assign var=keyval value=$data.value}
+					   {assign var=keytblname value=$data.tablename}
+					   {assign var=keyfldname value=$data.fldname}
+					   {assign var=keyoptions value=$data.options}
+					   {assign var=keysecid value=$data.secid}
+					   {assign var=keyseclink value=$data.link}
+					   {assign var=keycursymb value=$data.cursymb}
+					   {assign var=keysalut value=$data.salut}
+					   {assign var=keycntimage value=$data.cntimage}
+					   {assign var=keyadmin value=$data.isadmin}
+					   
+					   <input type="hidden" id="hdtxt_IsAdmin" value={$keyadmin}></input>
+					   {if $label ne ''}
+					   <td class="dvtCellLabel" align=right width=25%>{$label}</td>
+						{include file="DetailViewUI.tpl"}
+					   {else}
+                                    	   <td class="dvtCellLabel" align=right>&nbsp;</td>
+                                    	   <td class="dvtCellInfo" align=left >&nbsp;</td>
+					   {/if}	
+					{/foreach}
 			 	</tr>
-					{/foreach}
-					</table>
-				 {/foreach}
+				{/foreach}
+			    </table>
+			    {/foreach}
+			    <br>
+			    <table class="tableHeading" border="0" cellpadding="5" cellspacing="0" width="100%">
+			    	<tr>
+				     <td class="big">	
+					<strong>4.{$UMOD.LBL_HOME_PAGE_COMP}</strong>
+				     </td>
+				     <td class="small" align="right"><img src="{$IMAGE_PATH}showDown.gif" alt="{$APP.LBL_EXPAND_COLLAPSE}" title="{$APP.LBL_EXPAND_COLLAPSE}" onClick="ShowHidefn('home_comp');"></td>	
+			        </tr>
+			    </table>
+			<div style="float: none; display: none;" id="home_comp">	
+			    <table border="0" cellpadding="5" cellspacing="0" width="100%">
+				{foreach item=homeitems key=values from=$HOMEORDER}
+					<tr><td class="dvtCellLabel" align="right" width="30%">{$UMOD.$values}</td>
+					    {if $homeitems neq ''}
+					    	<td class="dvtCellInfo" align="center" width="5%">
+					   	<img src="{$IMAGE_PATH}prvPrfSelectedTick.gif" alt="{$UMOD.LBL_SHOWN}" height="12" width="12"></td><td class="dvtCellInfo" align="left">{$UMOD.LBL_SHOWN}</td> 		
+					    {else}	
+						<td class="dvtCellInfo" align="center" width="5%">
+					   	<img src="{$IMAGE_PATH}no.gif" alt="{$UMOD.LBL_HIDDEN}" height="12" width="12"></td><td class="dvtCellInfo" align="left">{$UMOD.LBL_HIDDEN}</td> 		
+					    {/if}	
+					</tr>			
+				{/foreach}
+			    </table>	
+			</div>
+			<br>
+			    <table class="tableHeading" border="0" cellpadding="5" cellspacing="0" width="100%">
+			    	<tr>
+				     <td class="big">	
+					<strong>5.{$UMOD.LBL_LOGIN_HISTORY}</strong>
+				     </td>
+				     <td class="small" align="right">&nbsp;</td>	
+			        </tr>
+			    </table>
+			    <table border="0" cellpadding="5" cellspacing="0" width="100%">
+				<tr><td>&nbsp;</td><td></td></tr>	
+			    </table>	
 
 			</td>
 			</tr>
 			
-	        <tr><td>&nbsp;</td></tr>
+		        <tr><td>&nbsp;</td></tr>
 			
-	  </table>
+	  	</table>
 
 
 
 </td></tr>
+<tr><td class="small"><div align="right"><a href="#top">{$MOD.LBL_SCROLL}</a></div></td></tr>
 </table>
 </form>
 </td></tr>
@@ -170,15 +190,23 @@
 </td>
 </tr>
 </table>
-
+</div>
+<td valign="top"><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
+</tr>
+</table>
+<br>
 {$JAVASCRIPT}
-{if $CATEGORY eq 'Settings'}
-	{include file='SettingsSubMenu.tpl'}
-{/if}
 
 <!-- added for validation -->
 <script language="javascript">
   var fieldname = new Array({$VALIDATION_DATA_FIELDNAME});
   var fieldlabel = new Array({$VALIDATION_DATA_FIELDLABEL});
   var fielddatatype = new Array({$VALIDATION_DATA_FIELDDATATYPE});
+function ShowHidefn(divid)
+{ldelim}
+	if($(divid).style.display != 'none')
+		Effect.Fade(divid);
+	else
+		Effect.Appear(divid);
+{rdelim}
 </script>

Modified: vtigercrm/trunk/Smarty/templates/UserEditView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/UserEditView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/UserEditView.tpl Wed Jun 28 10:18:54 2006
@@ -11,7 +11,6 @@
 -->*}
 <script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
 <script language="JavaScript" type="text/javascript" src="include/js/ColorPicker2.js"></script>
-<style type="text/css">@import url(themes/blue/style.css);</style>
 
 <script language="JavaScript" type="text/javascript">
 
@@ -51,115 +50,155 @@
 </script>
 
 
-
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-<tr>
-{if $PARENTTAB neq ''}	
-	{include file='SettingsMenu.tpl'}
-{/if}
-<td width="75%" valign="top">
-<table width="100%"  border="0" cellspacing="0" cellpadding="0">
+<table align="center" border="0" cellpadding="0" cellspacing="0" width="98%">
+<tbody><tr>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
+        <td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
+        <br>
+
+	<div align=center>
+	{if $PARENTTAB eq 'Settings'}
+		{include file='SetMenu.tpl'}
+	{/if}
+
+
+	<table width="100%"  border="0" cellspacing="0" cellpadding="0">
 	<tr><td align="left">
-			<table width="100%" cellpadding="5" cellspacing="0" border="0">
-			<tr>
-			<td colspan="2" style="padding:5px;">
+		<table class="settingsSelUITopLine" border="0" cellpadding="5" cellspacing="0" width="100%">
+		<tr>
+			<td rowspan="2"><img src="{$IMAGE_PATH}user.gif" align="absmiddle"></td>
+			<td>	
 				<span class="lvtHeaderText">
-					{if $PARENTTAB neq ''}	
-					<b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS} </a> > {$MOD.LBL_USER_MANAGEMENT} > {$MOD.LBL_USERS}</b></span>
-					{else}
-                                            <span class="lvtHeaderText">
-                                            <b>{$APP.LBL_MY_PREFERENCES}</b>
-                                            </span>
-                                        {/if}
-				<hr noshade="noshade" size="1" />
-			</td>
-		  </tr>
+				{if $PARENTTAB neq ''}	
+				<b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS} </a> > {$MOD.LBL_USER_MANAGEMENT} > {$MOD.LBL_USERS}</b></span>
+				{else}
+                                <span class="lvtHeaderText">
+                                <b>{$APP.LBL_MY_PREFERENCES}</b>
+                                </span>
+                                {/if}
+			</td>
+			<td rowspan="2" nowrap>
+				<input title="{$APP.LBL_SAVE_BUTTON_TITLE}" accesskey="{$APP.LBL_SAVE_BUTTON_KEY}" class="small crmbutton save"  name="button" value="  {$APP.LBL_SAVE_BUTTON_LABEL}  "  onclick="this.form.action.value='Save'; return verify_data(EditView)" style="width: 70px;" type="button" />
+				<input title="{$APP.LBL_CANCEL_BUTTON_TITLE}" accesskey="{$APP.LBL_CANCEL_BUTTON_KEY}" class="small crmbutton cancel" name="button" value="  {$APP.LBL_CANCEL_BUTTON_LABEL}  " onclick="window.history.back()" style="width: 70px;" type="button" />
+						
+			</td>
+	 	</tr>
 		<tr>
-											<td width="5%"><img src="{$IMAGE_PATH}user.gif" align="absmiddle"></td>
-										{if $MODE eq 'edit'}
-												<td width="95%"><span class="genHeaderGrayBig">{$USER_NAME}</span><br>
-												<b class="small">{$UMOD.LBL_EDIT_VIEW} {$FIRST_NAME} {$LAST_NAME}</b>
-											</td>
-										{else}
-												<td width="95%"><span class="genHeaderGrayBig">{$UMOD.LBL_NEW_USER_BUTTON_LABEL}</span><br>
-												<b class="small">{$UMOD.LBL_CREATE_NEW_USER}</b>
-											</td>
-										{/if}
-											
-									</tr>
-							</table>
-	</td></tr>
-	
+			{if $MODE eq 'edit'}
+				<td><span class="genHeaderGrayBig">{$USER_NAME}</span><br>
+				<b class="small">{$UMOD.LBL_EDIT_VIEW} {$FIRST_NAME} {$LAST_NAME}</b>
+			{else}
+				<td><span class="genHeaderGrayBig">{$UMOD.LBL_NEW_USER_BUTTON_LABEL}</span><br>
+				<b class="small">{$UMOD.LBL_CREATE_NEW_USER}</b>
+			{/if}
+			</td>
+                </tr>
+		</table>
+	</td>
+	</tr>
 	<tr><td class="padTab" align="left">
 		<form name="EditView" method="POST" action="index.php" ENCTYPE="multipart/form-data">
-			<input type="hidden" name="module" value="Users">
-			<input type="hidden" name="record" value="{$ID}">
-			<input type="hidden" name="mode" value="{$MODE}">
-			<input type='hidden' name='parenttab' value='{$PARENTTAB}'>
-			<input type="hidden" name="activity_mode" value="{$ACTIVITYMODE}">
-			<input type="hidden" name="action">
-			<input type="hidden" name="return_module" value="{$RETURN_MODULE}">
-			<input type="hidden" name="return_id" value="{$RETURN_ID}">
-			<input type="hidden" name="return_action" value="{$RETURN_ACTION}">			
-			<input type="hidden" name="tz" value="Europe/Berlin">			
-			<input type="hidden" name="holidays" value="de,en_uk,fr,it,us,">			
-			<input type="hidden" name="workdays" value="0,1,2,3,4,5,6,">			
-			<input type="hidden" name="namedays" value="">			
-			<input type="hidden" name="weekstart" value="1">
+		<input type="hidden" name="module" value="Users">
+		<input type="hidden" name="record" value="{$ID}">
+		<input type="hidden" name="mode" value="{$MODE}">
+		<input type='hidden' name='parenttab' value='{$PARENTTAB}'>
+		<input type="hidden" name="activity_mode" value="{$ACTIVITYMODE}">
+		<input type="hidden" name="action">
+		<input type="hidden" name="return_module" value="{$RETURN_MODULE}">
+		<input type="hidden" name="return_id" value="{$RETURN_ID}">
+		<input type="hidden" name="return_action" value="{$RETURN_ACTION}">			
+		<input type="hidden" name="tz" value="Europe/Berlin">			
+		<input type="hidden" name="holidays" value="de,en_uk,fr,it,us,">			
+		<input type="hidden" name="workdays" value="0,1,2,3,4,5,6,">			
+		<input type="hidden" name="namedays" value="">			
+		<input type="hidden" name="weekstart" value="1">
 		<table width="100%" border="0" cellpadding="0" cellspacing="0">
 
-		<tr><td colspan="2">&nbsp;</td></tr>
 		<tr><td colspan="2">
-		<table align="center" border="0" cellpadding="0" cellspacing="0" width="99%">
-		  <tr>
-			<td>
-			  <table class="small" border="0" cellpadding="3" cellspacing="0" width="100%">
-			  <tr>
-			     <td id="prof" width="25%" align="center" nowrap="nowrap" class="dvtSelectedCell" onclick="fnVis('prof')" ><b>{$UMOD.LBL_USER_LOGIN_ROLE}</b></td>
-			     <td class="dvtTabCache" width="10" nowrap="nowrap">&nbsp;</td>
-			  </tr>
-			  </table>
-			</td>
-		  </tr>
+			<table align="center" border="0" cellpadding="0" cellspacing="0" width="99%">
 			<tr>
 			    <td align="left" valign="top">
-			        <div id="mnuTab">
-			             <table class="dvtContentSpace" border="0" cellpadding="0" cellspacing="0" width="100%">
-				        <tr><td height="35">&nbsp;</td></tr>
+			             <table border="0" cellpadding="0" cellspacing="0" width="100%">
 					<tr><td align="left">
-					   <table width="99%"  border="0" cellspacing="0" cellpadding="5" align="center" class="small">
-
-									   {foreach key=header item=data from=$BLOCKS}
-					     <tr>
-											<td colspan=4 class="detailedViewHeader">
-											<b>{$header}</b>
-						</td>
-					     </tr>
-										<!-- Handle the ui types display -->
-										{include file="DisplayFields.tpl"}
-
-									   {/foreach}
-
-
-							        <tr>
-							            <td colspan=4><div align="center">
-								    <input title="{$APP.LBL_SAVE_BUTTON_TITLE}" accesskey="{$APP.LBL_SAVE_BUTTON_KEY}" class="small"  name="button" value="  {$APP.LBL_SAVE_BUTTON_LABEL}  "  onclick="this.form.action.value='Save'; return verify_data(EditView)" style="width: 70px;" type="button" />
-								    <input title="{$APP.LBL_CANCEL_BUTTON_TITLE}" accesskey="{$APP.LBL_CANCEL_BUTTON_KEY}" class="small" name="button" value="  {$APP.LBL_CANCEL_BUTTON_LABEL}  " onclick="window.history.back()" style="width: 70px;" type="button" />
-								        </div></td>
-								</tr>
-							  </table>
-							  </td></tr>
+						{foreach key=header name=blockforeach item=data from=$BLOCKS}
+						<br>
+		                                <table class="tableHeading" border="0" cellpadding="5" cellspacing="0" width="100%">
+                		                <tr>
+                                		    {strip}
+		                                     <td class="big">
+                		                        <strong>{$smarty.foreach.blockforeach.iteration}. {$header}</strong>
+                                		     </td>
+		                                     <td class="small" align="right">&nbsp;</td>
+		                                  {/strip}
+                		              	</tr>
+                                		</table>
+		                                <table border="0" cellpadding="5" cellspacing="0" width="100%">
+						<!-- Handle the ui types display -->
+							{include file="DisplayFields.tpl"}
 						</table>
-						</form>
+					   	{/foreach}
+				<br>
+			    	<table class="tableHeading" border="0" cellpadding="5" cellspacing="0" width="100%">
+			    	<tr>
+				     <td class="big">	
+					<strong>4.sdjhfsjkhfjalkssdjhfsjkhfjalks</strong>
+				     </td>
+				     <td class="small" align="right">&nbsp;</td>	
+			        </tr>
+			    	</table>
+			    	<table border="0" cellpadding="5" cellspacing="0" width="100%">
+				{foreach item=homeitems key=values from=$HOMEORDER}
+					<tr><td class="dvtCellLabel" align="right" width="30%">{$UMOD.$values}</td>
+					    {if $homeitems neq ''}
+					    	<td class="dvtCellInfo" align="center" width="5%">
+					   	<input name="{$values}" value="{$values}" checked type="radio"></td><td class="dvtCellInfo" align="left" width="20%">Show</td> 		
+					    	<td class="dvtCellInfo" align="center" width="5%">
+					   	<input name="{$values}" value="" type="radio"></td><td class="dvtCellInfo" align="left">Hide</td> 		
+					    {else}	
+					    	<td class="dvtCellInfo" align="center" width="5%">
+					   	<input name="{$values}" value="{$values}" type="radio"></td><td class="dvtCellInfo" align="left">Show</td> 		
+					    	<td class="dvtCellInfo" align="center" width="5%">
+					   	<input name="{$values}" value="" checked type="radio"></td><td class="dvtCellInfo" align="left">Hide</td> 		
+					    {/if}	
+					</tr>			
+				{/foreach}
+			    	</table>	
+				<br>
+			    	<table class="tableHeading" border="0" cellpadding="5" cellspacing="0" width="100%">
+			    	<tr>
+				     <td class="big">	
+					<strong>5.kssdjhfsjkhfjalks</strong>
+				     </td>
+				     <td class="small" align="right">&nbsp;</td>	
+			        </tr>
+			    	</table>
+			    	<table border="0" cellpadding="5" cellspacing="0" width="100%">
+					<tr><td>&nbsp;</td><td></td></tr>	
+			    	</table>	
+				<tr><td colspan=4>&nbsp;</td></tr>
+							
+					        <tr>
+					       		<td colspan=4 align="right">
+							<input title="{$APP.LBL_SAVE_BUTTON_TITLE}" accesskey="{$APP.LBL_SAVE_BUTTON_KEY}" class="small crmbutton save"  name="button" value="  {$APP.LBL_SAVE_BUTTON_LABEL}  "  onclick="this.form.action.value='Save'; return verify_data(EditView)" style="width: 70px;" type="button" />
+							<input title="{$APP.LBL_CANCEL_BUTTON_TITLE}" accesskey="{$APP.LBL_CANCEL_BUTTON_KEY}" class="small crmbutton cancel" name="button" value="  {$APP.LBL_CANCEL_BUTTON_LABEL}  " onclick="window.history.back()" style="width: 70px;" type="button" />
+							</td>
+						</tr>
+					    </table>
+					 </td></tr>
+					</table>
 			  	   </td></tr>
 				   </table>
-				    </td></tr>
+				 <br>
+				  </td></tr>
+				<tr><td class="small"><div align="right"><a href="#top">{$MOD.LBL_SCROLL}</a></div></td></tr>
 				</table>
+				</form>	
+			</td>
+			</tr>
+			</table>
 </td>
 </tr>
 </table>
-
+</td></tr></table>
+<br>
 {$JAVASCRIPT}
-{if $PARENTTAB neq ''}
-	{include file='SettingsSubMenu.tpl'}
-{/if}



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 09:36:14 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 16:36:14 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7649 -
	/vtigercrm/trunk/modules/Users/add2db.php
Message-ID: <20060628163614.E4B8B83FD57@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 28 10:36:07 2006
New Revision: 7649

Log:
New UI for Users has been integrated

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

Modified: vtigercrm/trunk/modules/Users/add2db.php
==============================================================================
--- vtigercrm/trunk/modules/Users/add2db.php (original)
+++ vtigercrm/trunk/modules/Users/add2db.php Wed Jun 28 10:36:07 2006
@@ -81,7 +81,7 @@
 			$parent_type = 'Potential';
 		}
 	 
-		$genQueryId = $adb->getUniqueID("wordtemplates");
+		$genQueryId = $adb->getUniqueID("vtiger_wordtemplates");
 		if($genQueryId != '')
 		{
 			if($result!=false && $savefile=="true")



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 09:49:10 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 16:49:10 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7650 -
 /vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
Message-ID: <20060628164910.10AE683FD57@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 28 10:49:00 2006
New Revision: 7650

Log:
New UI for Users has been integrated

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

Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original)
+++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Wed Jun 28 10:49:00 2006
@@ -28,16 +28,16 @@
 	function create_tables () {
 		global $app_strings;
 
-		$role1_id = $this->db->getUniqueID("role");
-		$role2_id = $this->db->getUniqueID("role");
-		$role3_id = $this->db->getUniqueID("role");
-		$role4_id = $this->db->getUniqueID("role");
-		$role5_id = $this->db->getUniqueID("role");
-
-		$profile1_id = $this->db->getUniqueID("profile");
-		$profile2_id = $this->db->getUniqueID("profile");
-		$profile3_id = $this->db->getUniqueID("profile");
-		$profile4_id = $this->db->getUniqueID("profile");
+		$role1_id = $this->db->getUniqueID("vtiger_role");
+		$role2_id = $this->db->getUniqueID("vtiger_role");
+		$role3_id = $this->db->getUniqueID("vtiger_role");
+		$role4_id = $this->db->getUniqueID("vtiger_role");
+		$role5_id = $this->db->getUniqueID("vtiger_role");
+
+		$profile1_id = $this->db->getUniqueID("vtiger_profile");
+		$profile2_id = $this->db->getUniqueID("vtiger_profile");
+		$profile3_id = $this->db->getUniqueID("vtiger_profile");
+		$profile4_id = $this->db->getUniqueID("vtiger_profile");
 
                 $this->db->query("insert into vtiger_role values('H".$role1_id."','Organisation','H".$role1_id."',0)");
                 $this->db->query("insert into vtiger_role values('H".$role2_id."','CEO','H".$role1_id."::H".$role2_id."',1)");
@@ -161,57 +161,57 @@
 //Account Details -- START
  //Block9
 
-$this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'accountname','vtiger_account',1,'2','accountname','Account Name',1,0,0,100,1,9,1,'V~M',0,1,'BAS')");	
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'phone','vtiger_account',1,'11','phone','Phone',1,0,0,100,2,9,1,'V~O',0,2,'BAS')");	
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'website','vtiger_account',1,'17','website','Website',1,0,0,100,3,9,1,'V~O',0,3,'BAS')");	
-
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'fax','vtiger_account',1,'1','fax','Fax',1,0,0,100,4,9,1,'V~O',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'tickersymbol','vtiger_account',1,'1','tickersymbol','Ticker Symbol',1,0,0,100,5,9,1,'V~O',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'otherphone','vtiger_account',1,'11','otherphone','Other Phone',1,0,0,100,6,9,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'parentid','vtiger_account',1,'51','account_id','Member Of',1,0,0,100,7,9,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'email1','vtiger_account',1,'13','email1','Email',1,0,0,100,8,9,1,'E~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'employees','vtiger_account',1,'7','employees','Employees',1,0,0,100,9,9,1,'I~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'email2','vtiger_account',1,'13','email2','Other Email',1,0,0,100,10,9,1,'E~O',1,null,'ADV')");
-
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'ownership','vtiger_account',1,'1','ownership','Ownership',1,0,0,100,11,9,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'rating','vtiger_account',1,'1','rating','Rating',1,0,0,100,12,9,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'industry','vtiger_account',1,'15','industry','industry',1,0,0,100,13,9,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'siccode','vtiger_account',1,'1','siccode','SIC Code',1,0,0,100,14,9,1,'I~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'account_type','vtiger_account',1,'15','accounttype','Type',1,0,0,100,15,9,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'annualrevenue','vtiger_account',1,'71','annual_revenue','Annual Revenue',1,0,0,100,16,9,1,'I~O',1,null,'ADV')");
+$this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("vtiger_field").",'accountname','vtiger_account',1,'2','accountname','Account Name',1,0,0,100,1,9,1,'V~M',0,1,'BAS')");	
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("vtiger_field").",'phone','vtiger_account',1,'11','phone','Phone',1,0,0,100,2,9,1,'V~O',0,2,'BAS')");	
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("vtiger_field").",'website','vtiger_account',1,'17','website','Website',1,0,0,100,3,9,1,'V~O',0,3,'BAS')");	
+
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("vtiger_field").",'fax','vtiger_account',1,'1','fax','Fax',1,0,0,100,4,9,1,'V~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("vtiger_field").",'tickersymbol','vtiger_account',1,'1','tickersymbol','Ticker Symbol',1,0,0,100,5,9,1,'V~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("vtiger_field").",'otherphone','vtiger_account',1,'11','otherphone','Other Phone',1,0,0,100,6,9,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("vtiger_field").",'parentid','vtiger_account',1,'51','account_id','Member Of',1,0,0,100,7,9,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("vtiger_field").",'email1','vtiger_account',1,'13','email1','Email',1,0,0,100,8,9,1,'E~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("vtiger_field").",'employees','vtiger_account',1,'7','employees','Employees',1,0,0,100,9,9,1,'I~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("vtiger_field").",'email2','vtiger_account',1,'13','email2','Other Email',1,0,0,100,10,9,1,'E~O',1,null,'ADV')");
+
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("vtiger_field").",'ownership','vtiger_account',1,'1','ownership','Ownership',1,0,0,100,11,9,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("vtiger_field").",'rating','vtiger_account',1,'1','rating','Rating',1,0,0,100,12,9,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("vtiger_field").",'industry','vtiger_account',1,'15','industry','industry',1,0,0,100,13,9,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("vtiger_field").",'siccode','vtiger_account',1,'1','siccode','SIC Code',1,0,0,100,14,9,1,'I~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("vtiger_field").",'account_type','vtiger_account',1,'15','accounttype','Type',1,0,0,100,15,9,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("vtiger_field").",'annualrevenue','vtiger_account',1,'71','annual_revenue','Annual Revenue',1,0,0,100,16,9,1,'I~O',1,null,'ADV')");
  //Added vtiger_field emailoptout for vtiger_accounts -- after 4.2 patch2
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'emailoptout','vtiger_account',1,'56','emailoptout','Email Opt Out',1,0,0,100,17,9,1,'C~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'notify_owner','vtiger_account',1,56,'notify_owner','Notify Owner',1,0,0,10,18,9,1,'C~O',1,NULL,'ADV')");
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,19,9,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,20,9,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,21,9,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("vtiger_field").",'emailoptout','vtiger_account',1,'56','emailoptout','Email Opt Out',1,0,0,100,17,9,1,'C~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("vtiger_field").",'notify_owner','vtiger_account',1,56,'notify_owner','Notify Owner',1,0,0,10,18,9,1,'C~O',1,NULL,'ADV')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("vtiger_field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,19,9,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("vtiger_field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,20,9,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("vtiger_field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,21,9,2,'T~O',1,null,'BAS')");
 
 
 
 
  //Block 11
-$this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'street','vtiger_accountbillads',1,'21','bill_street','Billing Address',1,0,0,100,1,11,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'street','vtiger_accountshipads',1,'21','ship_street','Shipping Address',1,0,0,100,2,11,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'city','vtiger_accountbillads',1,'1','bill_city','Billing City',1,0,0,100,5,11,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'city','vtiger_accountshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,11,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'state','vtiger_accountbillads',1,'1','bill_state','Billing State',1,0,0,100,7,11,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'state','vtiger_accountshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,11,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'code','vtiger_accountbillads',1,'1','bill_code','Billing Code',1,0,0,100,9,11,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'code','vtiger_accountshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,11,1,'V~O',1,null,'BAS')");
-
-
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'country','vtiger_accountbillads',1,'1','bill_country','Billing Country',1,0,0,100,11,11,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'country','vtiger_accountshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,11,1,'V~O',1,null,'BAS')");
-
-$this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'pobox','vtiger_accountbillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,11,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'pobox','vtiger_accountshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,11,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("vtiger_field").",'street','vtiger_accountbillads',1,'21','bill_street','Billing Address',1,0,0,100,1,11,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("vtiger_field").",'street','vtiger_accountshipads',1,'21','ship_street','Shipping Address',1,0,0,100,2,11,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("vtiger_field").",'city','vtiger_accountbillads',1,'1','bill_city','Billing City',1,0,0,100,5,11,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("vtiger_field").",'city','vtiger_accountshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,11,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("vtiger_field").",'state','vtiger_accountbillads',1,'1','bill_state','Billing State',1,0,0,100,7,11,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("vtiger_field").",'state','vtiger_accountshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,11,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("vtiger_field").",'code','vtiger_accountbillads',1,'1','bill_code','Billing Code',1,0,0,100,9,11,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("vtiger_field").",'code','vtiger_accountshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,11,1,'V~O',1,null,'BAS')");
+
+
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("vtiger_field").",'country','vtiger_accountbillads',1,'1','bill_country','Billing Country',1,0,0,100,11,11,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("vtiger_field").",'country','vtiger_accountshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,11,1,'V~O',1,null,'BAS')");
+
+$this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("vtiger_field").",'pobox','vtiger_accountbillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,11,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("vtiger_field").",'pobox','vtiger_accountshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,11,1,'V~O',1,null,'BAS')");
 
 
  //Block12
-$this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,12,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("vtiger_field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,12,1,'V~O',1,null,'BAS')");
  
 
 
@@ -222,45 +222,45 @@
 
 //Block13 -- Start
 
-$this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'salutation','vtiger_leaddetails',1,'55','salutationtype','Salutation',1,0,0,100,1,13,3,'V~O',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'firstname','vtiger_leaddetails',1,'55','firstname','First Name',1,0,0,100,2,13,1,'V~O',0,1,'BAS')");	
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'phone','vtiger_leadaddress',1,'11','phone','Phone',1,0,0,100,3,13,1,'V~O',0,4,'BAS')");	
-
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'lastname','vtiger_leaddetails',1,'2','lastname','Last Name',1,0,0,100,4,13,1,'V~M',0,2,'BAS')");	
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'mobile','vtiger_leadaddress',1,'1','mobile','Mobile',1,0,0,100,5,13,1,'V~O',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'company','vtiger_leaddetails',1,'2','company','Company',1,0,0,100,6,13,1,'V~M',0,3,'BAS')");
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'fax','vtiger_leadaddress',1,'1','fax','Fax',1,0,0,100,7,13,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'designation','vtiger_leaddetails',1,'1','designation','Designation',1,0,0,100,8,13,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'email','vtiger_leaddetails',1,'13','email','Email',1,0,0,100,9,13,1,'E~O',0,5,'BAS')");
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'leadsource','vtiger_leaddetails',1,'15','leadsource','Lead Source',1,0,0,100,10,13,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'website','vtiger_leadsubdetails',1,'17','website','Website',1,0,0,100,11,13,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'industry','vtiger_leaddetails',1,'15','industry','Industry',1,0,0,100,12,13,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'leadstatus','vtiger_leaddetails',1,'15','leadstatus','Lead Status',1,0,0,100,13,13,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'annualrevenue','vtiger_leaddetails',1,'71','annualrevenue','Annual Revenue',1,0,0,100,14,13,1,'I~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'rating','vtiger_leaddetails',1,'15','rating','Rating',1,0,0,100,15,13,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'noofemployees','vtiger_leaddetails',1,'1','noofemployees','No Of Employees',1,0,0,100,16,13,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,17,13,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'yahooid','vtiger_leaddetails',1,'13','yahooid','Yahoo Id',1,0,0,100,18,13,1,'V~O',1,null,'ADV')");
-$this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,19,13,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,20,13,2,'T~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("vtiger_field").",'salutation','vtiger_leaddetails',1,'55','salutationtype','Salutation',1,0,0,100,1,13,3,'V~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("vtiger_field").",'firstname','vtiger_leaddetails',1,'55','firstname','First Name',1,0,0,100,2,13,1,'V~O',0,1,'BAS')");	
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("vtiger_field").",'phone','vtiger_leadaddress',1,'11','phone','Phone',1,0,0,100,3,13,1,'V~O',0,4,'BAS')");	
+
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("vtiger_field").",'lastname','vtiger_leaddetails',1,'2','lastname','Last Name',1,0,0,100,4,13,1,'V~M',0,2,'BAS')");	
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("vtiger_field").",'mobile','vtiger_leadaddress',1,'1','mobile','Mobile',1,0,0,100,5,13,1,'V~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("vtiger_field").",'company','vtiger_leaddetails',1,'2','company','Company',1,0,0,100,6,13,1,'V~M',0,3,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("vtiger_field").",'fax','vtiger_leadaddress',1,'1','fax','Fax',1,0,0,100,7,13,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("vtiger_field").",'designation','vtiger_leaddetails',1,'1','designation','Designation',1,0,0,100,8,13,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("vtiger_field").",'email','vtiger_leaddetails',1,'13','email','Email',1,0,0,100,9,13,1,'E~O',0,5,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("vtiger_field").",'leadsource','vtiger_leaddetails',1,'15','leadsource','Lead Source',1,0,0,100,10,13,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("vtiger_field").",'website','vtiger_leadsubdetails',1,'17','website','Website',1,0,0,100,11,13,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("vtiger_field").",'industry','vtiger_leaddetails',1,'15','industry','Industry',1,0,0,100,12,13,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("vtiger_field").",'leadstatus','vtiger_leaddetails',1,'15','leadstatus','Lead Status',1,0,0,100,13,13,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("vtiger_field").",'annualrevenue','vtiger_leaddetails',1,'71','annualrevenue','Annual Revenue',1,0,0,100,14,13,1,'I~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("vtiger_field").",'rating','vtiger_leaddetails',1,'15','rating','Rating',1,0,0,100,15,13,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("vtiger_field").",'noofemployees','vtiger_leaddetails',1,'1','noofemployees','No Of Employees',1,0,0,100,16,13,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("vtiger_field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,17,13,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("vtiger_field").",'yahooid','vtiger_leaddetails',1,'13','yahooid','Yahoo Id',1,0,0,100,18,13,1,'V~O',1,null,'ADV')");
+$this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("vtiger_field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,19,13,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("vtiger_field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,20,13,2,'T~O',1,null,'BAS')");
 
 //Block13 -- End
 
 
 //Block15 -- Start
 
-$this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'lane','vtiger_leadaddress',1,'21','lane','Street',1,0,0,100,1,15,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'code','vtiger_leadaddress',1,'1','code','Postal Code',1,0,0,100,3,15,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'city','vtiger_leadaddress',1,'1','city','City',1,0,0,100,4,15,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'country','vtiger_leadaddress',1,'1','country','Country',1,0,0,100,5,15,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'state','vtiger_leadaddress',1,'1','state','State',1,0,0,100,6,15,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'pobox','vtiger_leadaddress',1,'1','pobox','Po Box',1,0,0,100,2,15,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("vtiger_field").",'lane','vtiger_leadaddress',1,'21','lane','Street',1,0,0,100,1,15,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("vtiger_field").",'code','vtiger_leadaddress',1,'1','code','Postal Code',1,0,0,100,3,15,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("vtiger_field").",'city','vtiger_leadaddress',1,'1','city','City',1,0,0,100,4,15,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("vtiger_field").",'country','vtiger_leadaddress',1,'1','country','Country',1,0,0,100,5,15,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("vtiger_field").",'state','vtiger_leadaddress',1,'1','state','State',1,0,0,100,6,15,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("vtiger_field").",'pobox','vtiger_leadaddress',1,'1','pobox','Po Box',1,0,0,100,2,15,1,'V~O',1,null,'BAS')");
 
 //Block15 --End
 
 //Block16 -- Start
 
-$this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,16,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("vtiger_field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,16,1,'V~O',1,null,'BAS')");
 
 //Block16 -- End
 
@@ -270,64 +270,64 @@
 //Contact Details -- START
 //Block4 -- Start
 
-$this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'salutation','vtiger_contactdetails',1,'55','salutationtype','Salutation',1,0,0,100,1,4,3,'V~O',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'firstname','vtiger_contactdetails',1,'55','firstname','First Name',1,0,0,100,2,4,1,'V~O',0,1,'BAS')");	
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'phone','vtiger_contactdetails',1,'11','phone','Office Phone',1,0,0,100,3,4,1,'V~O',0,4,'BAS')");	
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'lastname','vtiger_contactdetails',1,'2','lastname','Last Name',1,0,0,100,4,4,1,'V~M',0,2,'BAS')");	
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'mobile','vtiger_contactdetails',1,'1','mobile','Mobile',1,0,0,100,5,4,1,'V~O',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'accountid','vtiger_contactdetails',1,'51','account_id','Account Name',1,0,0,100,6,4,1,'I~O',0,3,'BAS')");	
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'homephone','vtiger_contactsubdetails',1,'11','homephone','Home Phone',1,0,0,100,7,4,1,'V~O',1,null,'ADV')");	
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'leadsource','vtiger_contactsubdetails',1,'15','leadsource','Lead Source',1,0,0,100,8,4,1,'V~O',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'otherphone','vtiger_contactsubdetails',1,'11','otherphone','Phone',1,0,0,100,9,4,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'title','vtiger_contactdetails',1,'1','title','Title',1,0,0,100,10,4,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'fax','vtiger_contactdetails',1,'1','fax','Fax',1,0,0,100,11,4,1,'V~O',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'department','vtiger_contactdetails',1,'1','department','Department',1,0,0,100,12,4,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'birthday','vtiger_contactsubdetails',1,'5','birthday','Birthdate',1,0,0,100,14,4,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'email','vtiger_contactdetails',1,'13','email','Email',1,0,0,100,15,4,1,'E~O',0,5,'ADV')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'reportsto','vtiger_contactdetails',1,'57','contact_id','Reports To',1,0,0,100,16,4,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'assistant','vtiger_contactsubdetails',1,'1','assistant','Assistant',1,0,0,100,17,4,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'yahooid','vtiger_contactdetails',1,'13','yahooid','Yahoo Id',1,0,0,100,18,4,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'assistantphone','vtiger_contactsubdetails',1,'11','assistantphone','Assistant Phone',1,0,0,100,19,4,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'donotcall','vtiger_contactdetails',1,'56','donotcall','Do Not Call',1,0,0,100,20,4,1,'C~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'emailoptout','vtiger_contactdetails',1,'56','emailoptout','Email Opt Out',1,0,0,100,21,4,1,'C~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,22,4,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'reference','vtiger_contactdetails',1,'56','reference','Reference',1,0,0,10,23,4,1,'C~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'notify_owner','vtiger_contactdetails',1,'56','notify_owner','Notify Owner',1,0,0,10,24,4,1,'C~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,25,4,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,26,4,2,'T~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'salutation','vtiger_contactdetails',1,'55','salutationtype','Salutation',1,0,0,100,1,4,3,'V~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'firstname','vtiger_contactdetails',1,'55','firstname','First Name',1,0,0,100,2,4,1,'V~O',0,1,'BAS')");	
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'phone','vtiger_contactdetails',1,'11','phone','Office Phone',1,0,0,100,3,4,1,'V~O',0,4,'BAS')");	
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'lastname','vtiger_contactdetails',1,'2','lastname','Last Name',1,0,0,100,4,4,1,'V~M',0,2,'BAS')");	
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'mobile','vtiger_contactdetails',1,'1','mobile','Mobile',1,0,0,100,5,4,1,'V~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'accountid','vtiger_contactdetails',1,'51','account_id','Account Name',1,0,0,100,6,4,1,'I~O',0,3,'BAS')");	
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'homephone','vtiger_contactsubdetails',1,'11','homephone','Home Phone',1,0,0,100,7,4,1,'V~O',1,null,'ADV')");	
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'leadsource','vtiger_contactsubdetails',1,'15','leadsource','Lead Source',1,0,0,100,8,4,1,'V~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'otherphone','vtiger_contactsubdetails',1,'11','otherphone','Phone',1,0,0,100,9,4,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'title','vtiger_contactdetails',1,'1','title','Title',1,0,0,100,10,4,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'fax','vtiger_contactdetails',1,'1','fax','Fax',1,0,0,100,11,4,1,'V~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'department','vtiger_contactdetails',1,'1','department','Department',1,0,0,100,12,4,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'birthday','vtiger_contactsubdetails',1,'5','birthday','Birthdate',1,0,0,100,14,4,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'email','vtiger_contactdetails',1,'13','email','Email',1,0,0,100,15,4,1,'E~O',0,5,'ADV')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'reportsto','vtiger_contactdetails',1,'57','contact_id','Reports To',1,0,0,100,16,4,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'assistant','vtiger_contactsubdetails',1,'1','assistant','Assistant',1,0,0,100,17,4,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'yahooid','vtiger_contactdetails',1,'13','yahooid','Yahoo Id',1,0,0,100,18,4,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'assistantphone','vtiger_contactsubdetails',1,'11','assistantphone','Assistant Phone',1,0,0,100,19,4,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'donotcall','vtiger_contactdetails',1,'56','donotcall','Do Not Call',1,0,0,100,20,4,1,'C~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'emailoptout','vtiger_contactdetails',1,'56','emailoptout','Email Opt Out',1,0,0,100,21,4,1,'C~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,22,4,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'reference','vtiger_contactdetails',1,'56','reference','Reference',1,0,0,10,23,4,1,'C~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'notify_owner','vtiger_contactdetails',1,'56','notify_owner','Notify Owner',1,0,0,10,24,4,1,'C~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,25,4,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,26,4,2,'T~O',1,null,'BAS')");
 
 //Block4 -- End
 
 //Block6 - Begin Customer Portal
 
-$this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'portal','vtiger_customerdetails',1,'56','portal','Portal User',1,0,0,100,1,6,1,'C~O',1,null,'ADV')");
-$this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'support_start_date','vtiger_customerdetails',1,'5','support_start_date','Support Start Date',1,0,0,100,2,6,1,'D~O',1,null,'ADV')");
-$this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'support_end_date','vtiger_customerdetails',1,'5','support_end_date','Support End Date',1,0,0,100,3,6,1,'D~O~OTH~GE~support_start_date~Support Start Date',1,null,'ADV')");
+$this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'portal','vtiger_customerdetails',1,'56','portal','Portal User',1,0,0,100,1,6,1,'C~O',1,null,'ADV')");
+$this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'support_start_date','vtiger_customerdetails',1,'5','support_start_date','Support Start Date',1,0,0,100,2,6,1,'D~O',1,null,'ADV')");
+$this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'support_end_date','vtiger_customerdetails',1,'5','support_end_date','Support End Date',1,0,0,100,3,6,1,'D~O~OTH~GE~support_start_date~Support Start Date',1,null,'ADV')");
 
 //Block6 - End Customer Portal
 
 //Block 7 -- Start
 
-$this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'mailingstreet','vtiger_contactaddress',1,'21','mailingstreet','Mailing Street',1,0,0,100,1,7,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'otherstreet','vtiger_contactaddress',1,'21','otherstreet','Other Street',1,0,0,100,2,7,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'mailingcity','vtiger_contactaddress',1,'1','mailingcity','Mailing City',1,0,0,100,5,7,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'othercity','vtiger_contactaddress',1,'1','othercity','Other City',1,0,0,100,6,7,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'mailingstate','vtiger_contactaddress',1,'1','mailingstate','Mailing State',1,0,0,100,7,7,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'otherstate','vtiger_contactaddress',1,'1','otherstate','Other State',1,0,0,100,8,7,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'mailingzip','vtiger_contactaddress',1,'1','mailingzip','Mailing Zip',1,0,0,100,9,7,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'otherzip','vtiger_contactaddress',1,'1','otherzip','Other Zip',1,0,0,100,10,7,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'mailingcountry','vtiger_contactaddress',1,'1','mailingcountry','Mailing Country',1,0,0,100,11,7,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'othercountry','vtiger_contactaddress',1,'1','othercountry','Other Country',1,0,0,100,12,7,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'mailingpobox','vtiger_contactaddress',1,'1','mailingpobox','Mailing Po Box',1,0,0,100,3,7,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'otherpobox','vtiger_contactaddress',1,'1','otherpobox','Other Po Box',1,0,0,100,4,7,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'mailingstreet','vtiger_contactaddress',1,'21','mailingstreet','Mailing Street',1,0,0,100,1,7,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'otherstreet','vtiger_contactaddress',1,'21','otherstreet','Other Street',1,0,0,100,2,7,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'mailingcity','vtiger_contactaddress',1,'1','mailingcity','Mailing City',1,0,0,100,5,7,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'othercity','vtiger_contactaddress',1,'1','othercity','Other City',1,0,0,100,6,7,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'mailingstate','vtiger_contactaddress',1,'1','mailingstate','Mailing State',1,0,0,100,7,7,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'otherstate','vtiger_contactaddress',1,'1','otherstate','Other State',1,0,0,100,8,7,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'mailingzip','vtiger_contactaddress',1,'1','mailingzip','Mailing Zip',1,0,0,100,9,7,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'otherzip','vtiger_contactaddress',1,'1','otherzip','Other Zip',1,0,0,100,10,7,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'mailingcountry','vtiger_contactaddress',1,'1','mailingcountry','Mailing Country',1,0,0,100,11,7,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'othercountry','vtiger_contactaddress',1,'1','othercountry','Other Country',1,0,0,100,12,7,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'mailingpobox','vtiger_contactaddress',1,'1','mailingpobox','Mailing Po Box',1,0,0,100,3,7,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'otherpobox','vtiger_contactaddress',1,'1','otherpobox','Other Po Box',1,0,0,100,4,7,1,'V~O',1,null,'BAS')");
 //Block7 -- End
 
 //ContactImageInformation
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'imagename','vtiger_contactdetails',1,'69','imagename','Contact Image',1,0,0,100,1,75,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'imagename','vtiger_contactdetails',1,'69','imagename','Contact Image',1,0,0,100,1,75,1,'V~O',1,null,'ADV')");
 
 
 //Block8 -- Start
-$this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,8,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,8,1,'V~O',1,null,'BAS')");
 //Block8 -- End
 //Contact Details -- END
 
@@ -335,25 +335,25 @@
 //Potential Details -- START
 //Block1 -- Start
 
-$this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'potentialname','vtiger_potential',1,'2','potentialname','Potential Name',1,0,0,100,1,1,1,'V~M',0,1,'BAS')");	
- $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'amount','vtiger_potential',1,71,'amount','Amount',1,0,0,100,2,1,1,'N~O',0,5,'BAS')");	
- $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'accountid','vtiger_potential',1,'50','account_id','Account Name',1,0,0,100,3,1,1,'V~M',0,2,'BAS')");	
- $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'closingdate','vtiger_potential',1,'23','closingdate','Expected Close Date',1,0,0,100,5,1,1,'D~M',0,3,'BAS')");	
- $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'potentialtype','vtiger_potential',1,'15','opportunity_type','Type',1,0,0,100,6,1,1,'V~O',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'nextstep','vtiger_potential',1,'1','nextstep','Next Step',1,0,0,100,7,1,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'leadsource','vtiger_potential',1,'15','leadsource','Lead Source',1,0,0,100,8,1,1,'V~O',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'sales_stage','vtiger_potential',1,'16','sales_stage','Sales Stage',1,0,0,100,9,1,1,'V~O',0,4,'BAS')");
- $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,10,1,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'probability','vtiger_potential',1,'9','probability','Probability',1,0,0,100,11,1,1,'N~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'campaignid','vtiger_potential',1,'58','campaignid','Campaign Source',1,0,0,100,12,1,1,'N~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,13,1,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,14,1,2,'T~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("vtiger_field").",'potentialname','vtiger_potential',1,'2','potentialname','Potential Name',1,0,0,100,1,1,1,'V~M',0,1,'BAS')");	
+ $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("vtiger_field").",'amount','vtiger_potential',1,71,'amount','Amount',1,0,0,100,2,1,1,'N~O',0,5,'BAS')");	
+ $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("vtiger_field").",'accountid','vtiger_potential',1,'50','account_id','Account Name',1,0,0,100,3,1,1,'V~M',0,2,'BAS')");	
+ $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("vtiger_field").",'closingdate','vtiger_potential',1,'23','closingdate','Expected Close Date',1,0,0,100,5,1,1,'D~M',0,3,'BAS')");	
+ $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("vtiger_field").",'potentialtype','vtiger_potential',1,'15','opportunity_type','Type',1,0,0,100,6,1,1,'V~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("vtiger_field").",'nextstep','vtiger_potential',1,'1','nextstep','Next Step',1,0,0,100,7,1,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("vtiger_field").",'leadsource','vtiger_potential',1,'15','leadsource','Lead Source',1,0,0,100,8,1,1,'V~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("vtiger_field").",'sales_stage','vtiger_potential',1,'16','sales_stage','Sales Stage',1,0,0,100,9,1,1,'V~O',0,4,'BAS')");
+ $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("vtiger_field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,10,1,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("vtiger_field").",'probability','vtiger_potential',1,'9','probability','Probability',1,0,0,100,11,1,1,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("vtiger_field").",'campaignid','vtiger_potential',1,'58','campaignid','Campaign Source',1,0,0,100,12,1,1,'N~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("vtiger_field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,13,1,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("vtiger_field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,14,1,2,'T~O',1,null,'BAS')");
 
 //Block1 -- End
 
 //Block3 -- Start
 
- $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,3,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("vtiger_field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,3,1,'V~O',1,null,'BAS')");
 
 //Block3 -- End
 //Potential Details -- END
@@ -362,31 +362,31 @@
 //campaign entries being added
 
 
- $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'campaignname','vtiger_campaign',1,'2','campaignname','Campaign Name',1,0,0,100,1,76,1,'V~M',0,1,'BAS')");
- $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'campaigntype','vtiger_campaign',1,15,'campaigntype','Campaign Type',1,0,0,100,2,76,1,'V~O',0,5,'BAS')");
- $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'product_id','vtiger_campaign',1,59,'product_id','Product',1,0,0,100,3,76,1,'I~O',0,5,'BAS')");
- $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'campaignstatus','vtiger_campaign',1,15,'campaignstatus','Campaign Status',1,0,0,100,4,76,1,'V~O',0,5,'BAS')");
- $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'closingdate','vtiger_campaign',1,'23','closingdate','Expected Close Date',1,0,0,100,5,76,1,'D~M',0,3,'BAS')");
- $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'expectedrevenue','vtiger_campaign',1,'1','expectedrevenue','Expected Revenue',1,0,0,100,6,76,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'budgetcost','vtiger_campaign',1,'1','budgetcost','Budget Cost',1,0,0,100,7,76,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'actualcost','vtiger_campaign',1,'1','actualcost','Actual Cost',1,0,0,100,8,76,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'expectedresponse','vtiger_campaign',1,'15','expectedresponse','Expected Response',1,0,0,100,9,76,1,'V~O',0,4,'BAS')");
- $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'smownerid','vtiger_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 vtiger_field values (26,".$this->db->getUniqueID("field").",'numsent','vtiger_campaign',1,'9','numsent','Num Sent',1,0,0,100,11,76,1,'N~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'sponsor','vtiger_campaign',1,'1','sponsor','Sponsor',1,0,0,100,12,76,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'targetaudience','vtiger_campaign',1,'1','targetaudience','Target Audience',1,0,0,100,13,76,1,'V~O',1,null,'BAS')");
-
-$this->db->query("insert into vtiger_field values(26,".$this->db->getUniqueID("field").",'targetsize','vtiger_campaign',1,'1','targetsize','TargetSize',1,0,0,100,14,76,1,'N~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values(26,".$this->db->getUniqueID("field").",'expectedresponsecount','vtiger_campaign',1,'1','expectedresponsecount','Expected Response Count',1,0,0,100,17,76,1,'N~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values(26,".$this->db->getUniqueID("field").",'expectedsalescount','vtiger_campaign',1,'1','expectedsalescount','Expected Sales Count',1,0,0,100,15,76,1,'N~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values(26,".$this->db->getUniqueID("field").",'expectedroi','vtiger_campaign',1,'1','expectedroi','Expected ROI',1,0,0,100,19,76,1,'N~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values(26,".$this->db->getUniqueID("field").",'actualresponsecount','vtiger_campaign',1,'1','actualresponsecount','Actual Response Count',1,0,0,100,18,76,1,'N~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values(26,".$this->db->getUniqueID("field").",'actualsalescount','vtiger_campaign',1,'1','actualsalescount','Actual Sales Count',1,0,0,100,16,76,1,'N~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values(26,".$this->db->getUniqueID("field").",'actualroi','vtiger_campaign',1,'1','actualroi','Actual ROI',1,0,0,100,20,76,1,'N~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,15,76,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,16,76,2,'T~O',1,null,'BAS')");
-
-$this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,78,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("vtiger_field").",'campaignname','vtiger_campaign',1,'2','campaignname','Campaign Name',1,0,0,100,1,76,1,'V~M',0,1,'BAS')");
+ $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("vtiger_field").",'campaigntype','vtiger_campaign',1,15,'campaigntype','Campaign Type',1,0,0,100,2,76,1,'V~O',0,5,'BAS')");
+ $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("vtiger_field").",'product_id','vtiger_campaign',1,59,'product_id','Product',1,0,0,100,3,76,1,'I~O',0,5,'BAS')");
+ $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("vtiger_field").",'campaignstatus','vtiger_campaign',1,15,'campaignstatus','Campaign Status',1,0,0,100,4,76,1,'V~O',0,5,'BAS')");
+ $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("vtiger_field").",'closingdate','vtiger_campaign',1,'23','closingdate','Expected Close Date',1,0,0,100,5,76,1,'D~M',0,3,'BAS')");
+ $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("vtiger_field").",'expectedrevenue','vtiger_campaign',1,'1','expectedrevenue','Expected Revenue',1,0,0,100,6,76,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("vtiger_field").",'budgetcost','vtiger_campaign',1,'1','budgetcost','Budget Cost',1,0,0,100,7,76,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("vtiger_field").",'actualcost','vtiger_campaign',1,'1','actualcost','Actual Cost',1,0,0,100,8,76,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("vtiger_field").",'expectedresponse','vtiger_campaign',1,'15','expectedresponse','Expected Response',1,0,0,100,9,76,1,'V~O',0,4,'BAS')");
+ $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("vtiger_field").",'smownerid','vtiger_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 vtiger_field values (26,".$this->db->getUniqueID("vtiger_field").",'numsent','vtiger_campaign',1,'9','numsent','Num Sent',1,0,0,100,11,76,1,'N~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("vtiger_field").",'sponsor','vtiger_campaign',1,'1','sponsor','Sponsor',1,0,0,100,12,76,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("vtiger_field").",'targetaudience','vtiger_campaign',1,'1','targetaudience','Target Audience',1,0,0,100,13,76,1,'V~O',1,null,'BAS')");
+
+$this->db->query("insert into vtiger_field values(26,".$this->db->getUniqueID("vtiger_field").",'targetsize','vtiger_campaign',1,'1','targetsize','TargetSize',1,0,0,100,14,76,1,'N~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values(26,".$this->db->getUniqueID("vtiger_field").",'expectedresponsecount','vtiger_campaign',1,'1','expectedresponsecount','Expected Response Count',1,0,0,100,17,76,1,'N~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values(26,".$this->db->getUniqueID("vtiger_field").",'expectedsalescount','vtiger_campaign',1,'1','expectedsalescount','Expected Sales Count',1,0,0,100,15,76,1,'N~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values(26,".$this->db->getUniqueID("vtiger_field").",'expectedroi','vtiger_campaign',1,'1','expectedroi','Expected ROI',1,0,0,100,19,76,1,'N~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values(26,".$this->db->getUniqueID("vtiger_field").",'actualresponsecount','vtiger_campaign',1,'1','actualresponsecount','Actual Response Count',1,0,0,100,18,76,1,'N~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values(26,".$this->db->getUniqueID("vtiger_field").",'actualsalescount','vtiger_campaign',1,'1','actualsalescount','Actual Sales Count',1,0,0,100,16,76,1,'N~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values(26,".$this->db->getUniqueID("vtiger_field").",'actualroi','vtiger_campaign',1,'1','actualroi','Actual ROI',1,0,0,100,20,76,1,'N~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("vtiger_field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,15,76,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("vtiger_field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,16,76,2,'T~O',1,null,'BAS')");
+
+$this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("vtiger_field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,78,1,'V~O',1,null,'BAS')");
 
 //Campaign entries end
 
@@ -394,23 +394,23 @@
 //Ticket Details -- START
 //Block25 -- Start
 
- $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,2,25,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'parent_id','vtiger_troubletickets',1,'68','parent_id','Related To',1,0,0,100,4,25,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'priority','vtiger_troubletickets',1,'15','ticketpriorities','Priority',1,0,0,100,5,25,1,'V~O',0,3,'BAS')");
- $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'product_id','vtiger_troubletickets',1,'59','product_id','Product Name',1,0,0,100,6,25,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'severity','vtiger_troubletickets',1,'15','ticketseverities','Severity',1,0,0,100,7,25,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'status','vtiger_troubletickets',1,'15','ticketstatus','Status',1,0,0,100,8,25,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'category','vtiger_troubletickets',1,'15','ticketcategories','Category',1,0,0,100,9,25,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'update_log','vtiger_troubletickets',1,'15','update_log','Update History',1,0,0,100,9,25,3,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,10,25,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,11,25,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("vtiger_field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,2,25,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("vtiger_field").",'parent_id','vtiger_troubletickets',1,'68','parent_id','Related To',1,0,0,100,4,25,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("vtiger_field").",'priority','vtiger_troubletickets',1,'15','ticketpriorities','Priority',1,0,0,100,5,25,1,'V~O',0,3,'BAS')");
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("vtiger_field").",'product_id','vtiger_troubletickets',1,'59','product_id','Product Name',1,0,0,100,6,25,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("vtiger_field").",'severity','vtiger_troubletickets',1,'15','ticketseverities','Severity',1,0,0,100,7,25,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("vtiger_field").",'status','vtiger_troubletickets',1,'15','ticketstatus','Status',1,0,0,100,8,25,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("vtiger_field").",'category','vtiger_troubletickets',1,'15','ticketcategories','Category',1,0,0,100,9,25,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("vtiger_field").",'update_log','vtiger_troubletickets',1,'15','update_log','Update History',1,0,0,100,9,25,3,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("vtiger_field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,10,25,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("vtiger_field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,11,25,2,'T~O',1,null,'BAS')");
  //Added on 26-12-2005 to add attachment in ticket editview
- $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'filename','vtiger_attachments',1,'61','filename','Attachment',1,0,0,100,12,26,1,'V~O',0,1,'BAS')");
-
- $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'title','vtiger_troubletickets',1,'22','ticket_title','Title',1,0,0,100,1,26,1,'V~M',0,1,'BAS')");
- $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'description','vtiger_troubletickets',1,'19','description','Description',1,0,0,100,1,28,1,'V~O',0,2,'BAS')");
- $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'solution','vtiger_troubletickets',1,'19','solution','Solution',1,0,0,100,1,29,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'comments','vtiger_ticketcomments',1,'19','comments','Add Comment',1,0,0,100,1,30,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("vtiger_field").",'filename','vtiger_attachments',1,'61','filename','Attachment',1,0,0,100,12,26,1,'V~O',0,1,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("vtiger_field").",'title','vtiger_troubletickets',1,'22','ticket_title','Title',1,0,0,100,1,26,1,'V~M',0,1,'BAS')");
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("vtiger_field").",'description','vtiger_troubletickets',1,'19','description','Description',1,0,0,100,1,28,1,'V~O',0,2,'BAS')");
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("vtiger_field").",'solution','vtiger_troubletickets',1,'19','solution','Solution',1,0,0,100,1,29,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("vtiger_field").",'comments','vtiger_ticketcomments',1,'19','comments','Add Comment',1,0,0,100,1,30,1,'V~O',1,null,'BAS')");
 
 //Block25-30 -- End
 //Ticket Details -- END
@@ -418,68 +418,68 @@
 //Product Details -- START
 //Block31-36 -- Start
 
-$this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'productname','vtiger_products',1,'2','productname','Product Name',1,0,0,100,1,31,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'productcode','vtiger_products',1,'1','productcode','Product Code',1,0,0,100,2,31,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'discontinued','vtiger_products',1,'56','discontinued','Product Active',1,0,0,100,3,31,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'manufacturer','vtiger_products',1,'15','manufacturer','Manufacturer',1,0,0,100,4,1,31,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'productcategory','vtiger_products',1,'15','productcategory','Product Category',1,0,0,100,4,31,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'sales_start_date','vtiger_products',1,'5','sales_start_date','Sales Start Date',1,0,0,100,5,31,1,'D~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'sales_end_date','vtiger_products',1,'5','sales_end_date','Sales End Date',1,0,0,100,6,31,1,'D~O~OTH~GE~sales_start_date~Sales Start Date',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'start_date','vtiger_products',1,'5','start_date','Support Start Date',1,0,0,100,7,31,1,'D~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'expiry_date','vtiger_products',1,'5','expiry_date','Support Expiry Date',1,0,0,100,8,31,1,'D~O~OTH~GE~start_date~Start Date',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'productname','vtiger_products',1,'2','productname','Product Name',1,0,0,100,1,31,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'productcode','vtiger_products',1,'1','productcode','Product Code',1,0,0,100,2,31,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'discontinued','vtiger_products',1,'56','discontinued','Product Active',1,0,0,100,3,31,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'manufacturer','vtiger_products',1,'15','manufacturer','Manufacturer',1,0,0,100,4,1,31,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'productcategory','vtiger_products',1,'15','productcategory','Product Category',1,0,0,100,4,31,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'sales_start_date','vtiger_products',1,'5','sales_start_date','Sales Start Date',1,0,0,100,5,31,1,'D~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'sales_end_date','vtiger_products',1,'5','sales_end_date','Sales End Date',1,0,0,100,6,31,1,'D~O~OTH~GE~sales_start_date~Sales Start Date',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'start_date','vtiger_products',1,'5','start_date','Support Start Date',1,0,0,100,7,31,1,'D~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'expiry_date','vtiger_products',1,'5','expiry_date','Support Expiry Date',1,0,0,100,8,31,1,'D~O~OTH~GE~start_date~Start Date',1,null,'BAS')");
  
 
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'crmid','vtiger_seproductsrel',1,'66','parent_id','Related To',1,0,0,100,10,31,1,'I~O',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'contactid','vtiger_products',1,'57','contact_id','Contact Name',1,0,0,100,11,31,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'website','vtiger_products',1,'17','website','Website',1,0,0,100,12,31,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'vendor_id','vtiger_products',1,'75','vendor_id','Vendor Name',1,0,0,100,13,31,1,'I~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'mfr_part_no','vtiger_products',1,'1','mfr_part_no','Mfr PartNo',1,0,0,100,14,31,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'vendor_part_no','vtiger_products',1,'1','vendor_part_no','Vendor PartNo',1,0,0,100,15,31,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'serialno','vtiger_products',1,'1','serial_no','Serial No',1,0,0,100,16,31,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'productsheet','vtiger_products',1,'1','productsheet','Product Sheet',1,0,0,100,17,31,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'glacct','vtiger_products',1,'15','glacct','GL Account',1,0,0,100,18,31,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,19,31,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,20,31,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'crmid','vtiger_seproductsrel',1,'66','parent_id','Related To',1,0,0,100,10,31,1,'I~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'contactid','vtiger_products',1,'57','contact_id','Contact Name',1,0,0,100,11,31,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'website','vtiger_products',1,'17','website','Website',1,0,0,100,12,31,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'vendor_id','vtiger_products',1,'75','vendor_id','Vendor Name',1,0,0,100,13,31,1,'I~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'mfr_part_no','vtiger_products',1,'1','mfr_part_no','Mfr PartNo',1,0,0,100,14,31,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'vendor_part_no','vtiger_products',1,'1','vendor_part_no','Vendor PartNo',1,0,0,100,15,31,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'serialno','vtiger_products',1,'1','serial_no','Serial No',1,0,0,100,16,31,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'productsheet','vtiger_products',1,'1','productsheet','Product Sheet',1,0,0,100,17,31,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'glacct','vtiger_products',1,'15','glacct','GL Account',1,0,0,100,18,31,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,19,31,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,20,31,2,'T~O',1,null,'BAS')");
 
 
 //Block32 Pricing Information
 
-$this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'unit_price','vtiger_products',1,'71','unit_price','Unit Price',1,0,0,100,1,32,1,'N~O',1,null,'BAS')"); 
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'commissionrate','vtiger_products',1,'9','commissionrate','Commission Rate',1,0,0,100,2,32,1,'N~O',1,null,'BAS')"); 
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'taxclass','vtiger_producttaxrel',1,'83','taxclass','Tax Class',1,0,0,100,4,32,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'unit_price','vtiger_products',1,'71','unit_price','Unit Price',1,0,0,100,1,32,1,'N~O',1,null,'BAS')"); 
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'commissionrate','vtiger_products',1,'9','commissionrate','Commission Rate',1,0,0,100,2,32,1,'N~O',1,null,'BAS')"); 
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'taxclass','vtiger_producttaxrel',1,'83','taxclass','Tax Class',1,0,0,100,4,32,1,'V~O',1,null,'BAS')");
 
 
 //Block 33 stock info
 
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'usageunit','vtiger_products',1,'15','usageunit','Usage Unit',1,0,0,100,1,33,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'qty_per_unit','vtiger_products',1,'1','qty_per_unit','Qty/Unit',1,0,0,100,2,33,1,'N~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'qtyinstock','vtiger_products',1,'1','qtyinstock','Qty In Stock',1,0,0,100,3,33,1,'I~O',1,null,'ADV')");
-$this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'reorderlevel','vtiger_products',1,'1','reorderlevel','Reorder Level',1,0,0,100,4,33,1,'I~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'handler','vtiger_products',1,'52','assigned_user_id','Handler',1,0,0,100,5,33,1,'I~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'qtyindemand','vtiger_products',1,'1','qtyindemand','Qty In Demand',1,0,0,100,6,33,1,'I~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'usageunit','vtiger_products',1,'15','usageunit','Usage Unit',1,0,0,100,1,33,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'qty_per_unit','vtiger_products',1,'1','qty_per_unit','Qty/Unit',1,0,0,100,2,33,1,'N~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'qtyinstock','vtiger_products',1,'1','qtyinstock','Qty In Stock',1,0,0,100,3,33,1,'I~O',1,null,'ADV')");
+$this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'reorderlevel','vtiger_products',1,'1','reorderlevel','Reorder Level',1,0,0,100,4,33,1,'I~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'handler','vtiger_products',1,'52','assigned_user_id','Handler',1,0,0,100,5,33,1,'I~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'qtyindemand','vtiger_products',1,'1','qtyindemand','Qty In Demand',1,0,0,100,6,33,1,'I~O',1,null,'ADV')");
 
 
 //ProductImageInformation
 
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'imagename','vtiger_products',1,'69','imagename','Product Image',1,0,0,100,1,35,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'imagename','vtiger_products',1,'69','imagename','Product Image',1,0,0,100,1,35,1,'V~O',1,null,'ADV')");
 
 
 //Block 36 Description Info
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'product_description','vtiger_products',1,'19','product_description','Description',1,0,0,100,1,36,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'product_description','vtiger_products',1,'19','product_description','Description',1,0,0,100,1,36,1,'V~O',1,null,'BAS')");
 
 //Product Details -- END
 
 //Note Details -- START
 //Block17 -- Start
 
-$this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("field").",'contact_id','vtiger_notes',1,'57','contact_id','Contact Name',1,0,0,100,1,17,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("field").",'crmid','vtiger_senotesrel',1,'62','parent_id','Related To',1,0,0,100,2,17,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("field").",'title','vtiger_notes',1,'2','notes_title','Subject',1,0,0,100,3,17,1,'V~M',0,1,'BAS')");
-$this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,4,17,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,5,17,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("field").",'filename','vtiger_notes',1,'61','filename','Attachment',1,0,0,100,4,17,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("field").",'notecontent','vtiger_notes',1,'19','notecontent','Note',1,0,0,100,5,18,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("vtiger_field").",'contact_id','vtiger_notes',1,'57','contact_id','Contact Name',1,0,0,100,1,17,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("vtiger_field").",'crmid','vtiger_senotesrel',1,'62','parent_id','Related To',1,0,0,100,2,17,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("vtiger_field").",'title','vtiger_notes',1,'2','notes_title','Subject',1,0,0,100,3,17,1,'V~M',0,1,'BAS')");
+$this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("vtiger_field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,4,17,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("vtiger_field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,5,17,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("vtiger_field").",'filename','vtiger_notes',1,'61','filename','Attachment',1,0,0,100,4,17,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("vtiger_field").",'notecontent','vtiger_notes',1,'19','notecontent','Note',1,0,0,100,5,18,1,'V~O',1,null,'BAS')");
 
 //Block17 -- End
 //Note Details -- END
@@ -487,92 +487,92 @@
 //Email Details -- START
 //Block21 -- Start
 
-	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'date_start','vtiger_activity',1,'6','date_start','Date & Time Sent',1,0,0,100,1,21,1,'DT~M~time_start~Time Start',1,null,'BAS')");
-	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'semodule','vtiger_activity',1,'2','parent_type','Sales Enity Module',1,0,0,100,2,21,3,'',1,null,'BAS')");
-	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'activitytype','vtiger_activity',1,'2','activitytype','Activtiy Type',1,0,0,100,3,21,3,'V~O',1,null,'BAS')");
-	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'crmid','vtiger_seactivityrel',1,'357','parent_id','Related To',1,0,0,100,1,22,1,'I~O',1,null,'BAS')");
-	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,5,21,1,'V~M',1,null,'BAS')");
-	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'subject','vtiger_activity',1,'2','subject','Subject',1,0,0,100,1,23,1,'V~M',1,null,'BAS')");
-	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'filename','vtiger_attachments',1,'61','filename','Attachment',1,0,0,100,2,23,1,'V~O',1,null,'BAS')");
-	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,24,1,'V~O',1,null,'BAS')");
-	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'time_start','vtiger_activity',1,'2','time_start','Time Start',1,0,0,100,9,1,23,'T~O',1,null,'BAS')");
-	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,10,1,22,'T~O',1,null,'BAS')");
- 	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,11,21,2,'T~O',1,null,'BAS')");
+	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("vtiger_field").",'date_start','vtiger_activity',1,'6','date_start','Date & Time Sent',1,0,0,100,1,21,1,'DT~M~time_start~Time Start',1,null,'BAS')");
+	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("vtiger_field").",'semodule','vtiger_activity',1,'2','parent_type','Sales Enity Module',1,0,0,100,2,21,3,'',1,null,'BAS')");
+	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("vtiger_field").",'activitytype','vtiger_activity',1,'2','activitytype','Activtiy Type',1,0,0,100,3,21,3,'V~O',1,null,'BAS')");
+	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("vtiger_field").",'crmid','vtiger_seactivityrel',1,'357','parent_id','Related To',1,0,0,100,1,22,1,'I~O',1,null,'BAS')");
+	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("vtiger_field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,5,21,1,'V~M',1,null,'BAS')");
+	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("vtiger_field").",'subject','vtiger_activity',1,'2','subject','Subject',1,0,0,100,1,23,1,'V~M',1,null,'BAS')");
+	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("vtiger_field").",'filename','vtiger_attachments',1,'61','filename','Attachment',1,0,0,100,2,23,1,'V~O',1,null,'BAS')");
+	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("vtiger_field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,24,1,'V~O',1,null,'BAS')");
+	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("vtiger_field").",'time_start','vtiger_activity',1,'2','time_start','Time Start',1,0,0,100,9,1,23,'T~O',1,null,'BAS')");
+	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("vtiger_field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,10,1,22,'T~O',1,null,'BAS')");
+ 	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("vtiger_field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,11,21,2,'T~O',1,null,'BAS')");
 
 //Block21 -- End
 //Email Details -- END
 
 //Task Details --START
 //Block19 -- Start
-$this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'subject','vtiger_activity',1,'2','subject','Subject',1,0,0,100,1,19,1,'V~M',0,1,'BAS')");
- $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,2,19,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'date_start','vtiger_activity',1,'6','date_start','Start Date & Time',1,0,0,100,3,19,1,'DT~M~time_start',0,2,'BAS')");
- $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'time_start','vtiger_activity',1,'2','time_start','Time Start',1,0,0,100,4,19,3,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'due_date','vtiger_activity',1,'23','due_date','Due Date',1,0,0,100,5,19,1,'D~M~OTH~GE~date_start~Start Date & Time',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'crmid','vtiger_seactivityrel',1,'66','parent_id','Related To',1,0,0,100,7,19,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'contactid','vtiger_cntactivityrel',1,'57','contact_id','Contact Name',1,0,0,100,8,19,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'status','vtiger_activity',1,'15','taskstatus','Status',1,0,0,100,9,19,1,'V~O',0,3,'BAS')");
- $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'eventstatus','vtiger_activity',1,'15','eventstatus','Status',1,0,0,100,9,19,3,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'priority','vtiger_activity',1,'15','taskpriority','Priority',1,0,0,100,10,19,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'sendnotification','vtiger_activity',1,'56','sendnotification','Send Notification',1,0,0,100,11,19,1,'C~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,14,19,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,15,19,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'activitytype','vtiger_activity',1,'15','activitytype','Activity Type',1,0,0,100,16,19,3,'V~O',1,null,'BAS')");
- $this->db->query("Insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'visibility','vtiger_activity',1,15,'visibility','Visibility',1,0,0,100,17,19,3,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,20,1,'V~O',1,null,'BAS')");
-
-
-$this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'duration_hours','vtiger_activity',1,'63','duration_hours','Duration',1,0,0,100,17,19,3,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'duration_minutes','vtiger_activity',1,'15','duration_minutes','Duration Minutes',1,0,0,100,18,19,3,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'location','vtiger_activity',1,'1','location','Location',1,0,0,100,19,19,3,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'reminder_time','vtiger_activity_reminder',1,'30','reminder_time','Send Reminder',1,0,0,100,1,19,3,'I~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("vtiger_field").",'subject','vtiger_activity',1,'2','subject','Subject',1,0,0,100,1,19,1,'V~M',0,1,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("vtiger_field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,2,19,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("vtiger_field").",'date_start','vtiger_activity',1,'6','date_start','Start Date & Time',1,0,0,100,3,19,1,'DT~M~time_start',0,2,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("vtiger_field").",'time_start','vtiger_activity',1,'2','time_start','Time Start',1,0,0,100,4,19,3,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("vtiger_field").",'due_date','vtiger_activity',1,'23','due_date','Due Date',1,0,0,100,5,19,1,'D~M~OTH~GE~date_start~Start Date & Time',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("vtiger_field").",'crmid','vtiger_seactivityrel',1,'66','parent_id','Related To',1,0,0,100,7,19,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("vtiger_field").",'contactid','vtiger_cntactivityrel',1,'57','contact_id','Contact Name',1,0,0,100,8,19,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("vtiger_field").",'status','vtiger_activity',1,'15','taskstatus','Status',1,0,0,100,9,19,1,'V~O',0,3,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("vtiger_field").",'eventstatus','vtiger_activity',1,'15','eventstatus','Status',1,0,0,100,9,19,3,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("vtiger_field").",'priority','vtiger_activity',1,'15','taskpriority','Priority',1,0,0,100,10,19,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("vtiger_field").",'sendnotification','vtiger_activity',1,'56','sendnotification','Send Notification',1,0,0,100,11,19,1,'C~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("vtiger_field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,14,19,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("vtiger_field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,15,19,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("vtiger_field").",'activitytype','vtiger_activity',1,'15','activitytype','Activity Type',1,0,0,100,16,19,3,'V~O',1,null,'BAS')");
+ $this->db->query("Insert into vtiger_field values (9,".$this->db->getUniqueID("vtiger_field").",'visibility','vtiger_activity',1,15,'visibility','Visibility',1,0,0,100,17,19,3,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("vtiger_field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,20,1,'V~O',1,null,'BAS')");
+
+
+$this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("vtiger_field").",'duration_hours','vtiger_activity',1,'63','duration_hours','Duration',1,0,0,100,17,19,3,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("vtiger_field").",'duration_minutes','vtiger_activity',1,'15','duration_minutes','Duration Minutes',1,0,0,100,18,19,3,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("vtiger_field").",'location','vtiger_activity',1,'1','location','Location',1,0,0,100,19,19,3,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("vtiger_field").",'reminder_time','vtiger_activity_reminder',1,'30','reminder_time','Send Reminder',1,0,0,100,1,19,3,'I~O',1,null,'BAS')");
  
- $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'recurringtype','vtiger_recurringevents',1,'15','recurringtype','Recurrence',1,0,0,100,6,19,3,'O~O',1,null,'BAS')");
-
- $this->db->query("Insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'notime','vtiger_activity',1,56,'notime','No Time',1,0,0,100,20,19,3,'C~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("vtiger_field").",'recurringtype','vtiger_recurringevents',1,'15','recurringtype','Recurrence',1,0,0,100,6,19,3,'O~O',1,null,'BAS')");
+
+ $this->db->query("Insert into vtiger_field values (9,".$this->db->getUniqueID("vtiger_field").",'notime','vtiger_activity',1,56,'notime','No Time',1,0,0,100,20,19,3,'C~O',1,null,'BAS')");
 //Block19 -- End
 //Task Details -- END
 
 //Event Details --START
 //Block41-43-- Start
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'subject','vtiger_activity',1,'2','subject','Subject',1,0,0,100,1,41,1,'V~M',0,1,'BAS')");
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,2,41,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'date_start','vtiger_activity',1,'6','date_start','Start Date & Time',1,0,0,100,3,41,1,'DT~M~time_start',0,2,'BAS')");
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'time_start','vtiger_activity',1,'2','time_start','Time Start',1,0,0,100,4,41,3,'T~M',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'due_date','vtiger_activity',1,'23','due_date','End Date',1,0,0,100,5,41,1,'D~M~OTH~GE~date_start~Start Date & Time',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'recurringtype','vtiger_recurringevents',1,'15','recurringtype','Recurrence',1,0,0,100,6,41,1,'O~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("vtiger_field").",'subject','vtiger_activity',1,'2','subject','Subject',1,0,0,100,1,41,1,'V~M',0,1,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("vtiger_field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,2,41,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("vtiger_field").",'date_start','vtiger_activity',1,'6','date_start','Start Date & Time',1,0,0,100,3,41,1,'DT~M~time_start',0,2,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("vtiger_field").",'time_start','vtiger_activity',1,'2','time_start','Time Start',1,0,0,100,4,41,3,'T~M',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("vtiger_field").",'due_date','vtiger_activity',1,'23','due_date','End Date',1,0,0,100,5,41,1,'D~M~OTH~GE~date_start~Start Date & Time',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("vtiger_field").",'recurringtype','vtiger_recurringevents',1,'15','recurringtype','Recurrence',1,0,0,100,6,41,1,'O~O',1,null,'BAS')");
   
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'duration_hours','vtiger_activity',1,'63','duration_hours','Duration',1,0,0,100,7,41,1,'I~M',0,5,'BAS')");
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'duration_minutes','vtiger_activity',1,'15','duration_minutes','Duration Minutes',1,0,0,100,8,41,3,'O~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'crmid','vtiger_seactivityrel',1,'66','parent_id','Related To',1,0,0,100,9,41,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'eventstatus','vtiger_activity',1,'15','eventstatus','Status',1,0,0,100,10,41,1,'V~O',0,3,'BAS')");
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'sendnotification','vtiger_activity',1,'56','sendnotification','Send Notification',1,0,0,100,11,41,1,'C~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'activitytype','vtiger_activity',1,'15','activitytype','Activity Type',1,0,0,100,12,41,1,'V~O',0,4,'BAS')");
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'location','vtiger_activity',1,'1','location','Location',1,0,0,100,13,41,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,14,41,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,15,41,2,'T~O',1,null,'BAS')");
- $this->db->query("Insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'priority','vtiger_activity',1,15,'taskpriority','Priority',1,0,0,100,16,41,1,'V~O',1,null,'BAS')");
- $this->db->query("Insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'notime','vtiger_activity',1,56,'notime','No Time',1,0,0,100,17,41,1,'C~O',1,null,'BAS')");
- $this->db->query("Insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'visibility','vtiger_activity',1,15,'visibility','Visibility',1,0,0,100,18,41,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("vtiger_field").",'duration_hours','vtiger_activity',1,'63','duration_hours','Duration',1,0,0,100,7,41,1,'I~M',0,5,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("vtiger_field").",'duration_minutes','vtiger_activity',1,'15','duration_minutes','Duration Minutes',1,0,0,100,8,41,3,'O~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("vtiger_field").",'crmid','vtiger_seactivityrel',1,'66','parent_id','Related To',1,0,0,100,9,41,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("vtiger_field").",'eventstatus','vtiger_activity',1,'15','eventstatus','Status',1,0,0,100,10,41,1,'V~O',0,3,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("vtiger_field").",'sendnotification','vtiger_activity',1,'56','sendnotification','Send Notification',1,0,0,100,11,41,1,'C~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("vtiger_field").",'activitytype','vtiger_activity',1,'15','activitytype','Activity Type',1,0,0,100,12,41,1,'V~O',0,4,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("vtiger_field").",'location','vtiger_activity',1,'1','location','Location',1,0,0,100,13,41,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("vtiger_field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,14,41,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("vtiger_field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,15,41,2,'T~O',1,null,'BAS')");
+ $this->db->query("Insert into vtiger_field values (16,".$this->db->getUniqueID("vtiger_field").",'priority','vtiger_activity',1,15,'taskpriority','Priority',1,0,0,100,16,41,1,'V~O',1,null,'BAS')");
+ $this->db->query("Insert into vtiger_field values (16,".$this->db->getUniqueID("vtiger_field").",'notime','vtiger_activity',1,56,'notime','No Time',1,0,0,100,17,41,1,'C~O',1,null,'BAS')");
+ $this->db->query("Insert into vtiger_field values (16,".$this->db->getUniqueID("vtiger_field").",'visibility','vtiger_activity',1,15,'visibility','Visibility',1,0,0,100,18,41,1,'V~O',1,null,'BAS')");
  
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,43,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'reminder_time','vtiger_activity_reminder',1,'30','reminder_time','Send Reminder',1,0,0,100,1,42,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("vtiger_field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,43,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("vtiger_field").",'reminder_time','vtiger_activity_reminder',1,'30','reminder_time','Send Reminder',1,0,0,100,1,42,1,'I~O',1,null,'BAS')");
 //Block41-43 -- End
 //Event Details -- END
 
 //Faq Details -- START
 //Block37-40 -- Start
 
-$this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("field").",'product_id','vtiger_faq',1,'59','product_id','Product Name',1,0,0,100,1,37,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("field").",'category','vtiger_faq',1,'15','faqcategories','Category',1,0,0,100,2,37,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("field").",'status','vtiger_faq',1,'15','faqstatus','Status',1,0,0,100,3,37,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("field").",'question','vtiger_faq',1,'20','question','Question',1,0,0,100,1,38,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("field").",'answer','vtiger_faq',1,'20','faq_answer','Answer',1,0,0,100,1,39,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("field").",'comments','vtiger_faqcomments',1,'19','comments','Add Comment',1,0,0,100,1,40,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,3,37,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,4,37,2,'T~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("vtiger_field").",'product_id','vtiger_faq',1,'59','product_id','Product Name',1,0,0,100,1,37,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("vtiger_field").",'category','vtiger_faq',1,'15','faqcategories','Category',1,0,0,100,2,37,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("vtiger_field").",'status','vtiger_faq',1,'15','faqstatus','Status',1,0,0,100,3,37,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("vtiger_field").",'question','vtiger_faq',1,'20','question','Question',1,0,0,100,1,38,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("vtiger_field").",'answer','vtiger_faq',1,'20','faq_answer','Answer',1,0,0,100,1,39,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("vtiger_field").",'comments','vtiger_faqcomments',1,'19','comments','Add Comment',1,0,0,100,1,40,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("vtiger_field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,3,37,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("vtiger_field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,4,37,2,'T~O',1,null,'BAS')");
 
 
 //Block37-40 -- End
@@ -581,41 +581,41 @@
 //Vendor Details --START
 //Block44-47
 
-$this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'vendorname','vtiger_vendor',1,'2','vendorname','Vendor Name',1,0,0,100,1,44,1,'V~M',0,1,'BAS')");
- $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'phone','vtiger_vendor',1,'1','phone','Phone',1,0,0,100,3,44,1,'V~O',0,2,'BAS')");
- $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'email','vtiger_vendor',1,'13','email','Email',1,0,0,100,4,44,1,'E~O',0,3,'BAS')");
- $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'website','vtiger_vendor',1,'17','website','Website',1,0,0,100,5,44,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'glacct','vtiger_vendor',1,'15','glacct','GL Account',1,0,0,100,6,44,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'category','vtiger_vendor',1,'1','category','Category',1,0,0,100,7,44,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,8,44,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,9,44,2,'T~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("vtiger_field").",'vendorname','vtiger_vendor',1,'2','vendorname','Vendor Name',1,0,0,100,1,44,1,'V~M',0,1,'BAS')");
+ $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("vtiger_field").",'phone','vtiger_vendor',1,'1','phone','Phone',1,0,0,100,3,44,1,'V~O',0,2,'BAS')");
+ $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("vtiger_field").",'email','vtiger_vendor',1,'13','email','Email',1,0,0,100,4,44,1,'E~O',0,3,'BAS')");
+ $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("vtiger_field").",'website','vtiger_vendor',1,'17','website','Website',1,0,0,100,5,44,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("vtiger_field").",'glacct','vtiger_vendor',1,'15','glacct','GL Account',1,0,0,100,6,44,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("vtiger_field").",'category','vtiger_vendor',1,'1','category','Category',1,0,0,100,7,44,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("vtiger_field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,8,44,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("vtiger_field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,9,44,2,'T~O',1,null,'BAS')");
 
 //Block 46
 
-$this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'street','vtiger_vendor',1,'21','street','Street',1,0,0,100,1,46,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'pobox','vtiger_vendor',1,'1','pobox','Po Box',1,0,0,100,2,46,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'city','vtiger_vendor',1,'1','city','City',1,0,0,100,3,46,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'state','vtiger_vendor',1,'1','state','State',1,0,0,100,4,46,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'postalcode','vtiger_vendor',1,'1','postalcode','Postal Code',1,0,0,100,5,46,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'country','vtiger_vendor',1,'1','country','Country',1,0,0,100,6,46,1,'V~O',1,null,'ADV')");
+$this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("vtiger_field").",'street','vtiger_vendor',1,'21','street','Street',1,0,0,100,1,46,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("vtiger_field").",'pobox','vtiger_vendor',1,'1','pobox','Po Box',1,0,0,100,2,46,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("vtiger_field").",'city','vtiger_vendor',1,'1','city','City',1,0,0,100,3,46,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("vtiger_field").",'state','vtiger_vendor',1,'1','state','State',1,0,0,100,4,46,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("vtiger_field").",'postalcode','vtiger_vendor',1,'1','postalcode','Postal Code',1,0,0,100,5,46,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("vtiger_field").",'country','vtiger_vendor',1,'1','country','Country',1,0,0,100,6,46,1,'V~O',1,null,'ADV')");
 
 //Block 47
 
-$this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,47,1,'V~O',1,null,'ADV')");
+$this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("vtiger_field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,47,1,'V~O',1,null,'ADV')");
 
 //Vendor Details -- END
 
 //PriceBook Details Start
 //Block48
 
-$this->db->query("insert into vtiger_field values (19,".$this->db->getUniqueID("field").",'bookname','vtiger_pricebook',1,'2','bookname','Price Book Name',1,0,0,100,1,48,1,'V~M',0,1,'BAS')");
- $this->db->query("insert into vtiger_field values (19,".$this->db->getUniqueID("field").",'active','vtiger_pricebook',1,'56','active','Active',1,0,0,100,3,48,1,'V~O',0,2,'BAS')");
-$this->db->query("insert into vtiger_field values (19,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,4,48,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (19,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,5,48,2,'T~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (19,".$this->db->getUniqueID("vtiger_field").",'bookname','vtiger_pricebook',1,'2','bookname','Price Book Name',1,0,0,100,1,48,1,'V~M',0,1,'BAS')");
+ $this->db->query("insert into vtiger_field values (19,".$this->db->getUniqueID("vtiger_field").",'active','vtiger_pricebook',1,'56','active','Active',1,0,0,100,3,48,1,'V~O',0,2,'BAS')");
+$this->db->query("insert into vtiger_field values (19,".$this->db->getUniqueID("vtiger_field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,4,48,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (19,".$this->db->getUniqueID("vtiger_field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,5,48,2,'T~O',1,null,'BAS')");
 
 //Block50
 
-$this->db->query("insert into vtiger_field values (19,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,50,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (19,".$this->db->getUniqueID("vtiger_field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,50,1,'V~O',1,null,'BAS')");
 
 //PriceBook Details End
 
@@ -623,53 +623,53 @@
 //Quote Details -- START
  //Block51
 
-$this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'subject','vtiger_quotes',1,'2','subject','Subject',1,0,0,100,1,51,1,'V~M',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'potentialid','vtiger_quotes',1,'76','potential_id','Potential Name',1,0,0,100,2,51,1,'I~O',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'quotestage','vtiger_quotes',1,'15','quotestage','Quote Stage',1,0,0,100,3,51,1,'V~O',1,null,'BAS')");	
-
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'validtill','vtiger_quotes',1,'5','validtill','Valid Till',1,0,0,100,4,51,1,'D~O',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'team','vtiger_quotes',1,'1','team','Team',1,0,0,100,5,51,1,'V~O',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'contactid','vtiger_quotes',1,'57','contact_id','Contact Name',1,0,0,100,6,51,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'carrier','vtiger_quotes',1,'15','carrier','Carrier',1,0,0,100,8,51,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'subtotal','vtiger_quotes',1,'1','hdnSubTotal','Sub Total',1,0,0,100,9,51,3,'N~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'shipping','vtiger_quotes',1,'1','shipping','Shipping',1,0,0,100,10,51,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'inventorymanager','vtiger_quotes',1,'77','assigned_user_id1','Inventory Manager',1,0,0,100,11,51,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'tax','vtiger_quotes',1,'1','txtTax','Tax',1,0,0,100,13,51,3,'N~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'adjustment','vtiger_quotes',1,'1','txtAdjustment','Adjustment',1,0,0,100,20,51,3,'NN~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'total','vtiger_quotes',1,'1','hdnGrandTotal','Total',1,0,0,100,14,51,3,'N~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'accountid','vtiger_quotes',1,'73','account_id','Account Name',1,0,0,100,16,51,1,'I~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,17,51,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,18,51,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,19,51,2,'T~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("vtiger_field").",'subject','vtiger_quotes',1,'2','subject','Subject',1,0,0,100,1,51,1,'V~M',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("vtiger_field").",'potentialid','vtiger_quotes',1,'76','potential_id','Potential Name',1,0,0,100,2,51,1,'I~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("vtiger_field").",'quotestage','vtiger_quotes',1,'15','quotestage','Quote Stage',1,0,0,100,3,51,1,'V~O',1,null,'BAS')");	
+
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("vtiger_field").",'validtill','vtiger_quotes',1,'5','validtill','Valid Till',1,0,0,100,4,51,1,'D~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("vtiger_field").",'team','vtiger_quotes',1,'1','team','Team',1,0,0,100,5,51,1,'V~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("vtiger_field").",'contactid','vtiger_quotes',1,'57','contact_id','Contact Name',1,0,0,100,6,51,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("vtiger_field").",'carrier','vtiger_quotes',1,'15','carrier','Carrier',1,0,0,100,8,51,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("vtiger_field").",'subtotal','vtiger_quotes',1,'1','hdnSubTotal','Sub Total',1,0,0,100,9,51,3,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("vtiger_field").",'shipping','vtiger_quotes',1,'1','shipping','Shipping',1,0,0,100,10,51,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("vtiger_field").",'inventorymanager','vtiger_quotes',1,'77','assigned_user_id1','Inventory Manager',1,0,0,100,11,51,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("vtiger_field").",'tax','vtiger_quotes',1,'1','txtTax','Tax',1,0,0,100,13,51,3,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("vtiger_field").",'adjustment','vtiger_quotes',1,'1','txtAdjustment','Adjustment',1,0,0,100,20,51,3,'NN~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("vtiger_field").",'total','vtiger_quotes',1,'1','hdnGrandTotal','Total',1,0,0,100,14,51,3,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("vtiger_field").",'accountid','vtiger_quotes',1,'73','account_id','Account Name',1,0,0,100,16,51,1,'I~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("vtiger_field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,17,51,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("vtiger_field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,18,51,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("vtiger_field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,19,51,2,'T~O',1,null,'BAS')");
 
 
  //Block 53
 
-$this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'bill_street','vtiger_quotesbillads',1,'24','bill_street','Billing Address',1,0,0,100,1,53,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'ship_street','vtiger_quotesshipads',1,'24','ship_street','Shipping Address',1,0,0,100,2,53,1,'V~M',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'bill_city','vtiger_quotesbillads',1,'1','bill_city','Billing City',1,0,0,100,5,53,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'ship_city','vtiger_quotesshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,53,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'bill_state','vtiger_quotesbillads',1,'1','bill_state','Billing State',1,0,0,100,7,53,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'ship_state','vtiger_quotesshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,53,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'bill_code','vtiger_quotesbillads',1,'1','bill_code','Billing Code',1,0,0,100,9,53,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'ship_code','vtiger_quotesshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,53,1,'V~O',1,null,'BAS')");
-
-
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'bill_country','vtiger_quotesbillads',1,'1','bill_country','Billing Country',1,0,0,100,11,53,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'ship_country','vtiger_quotesshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,53,1,'V~O',1,null,'BAS')");
-
-$this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'bill_pobox','vtiger_quotesbillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,53,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'ship_pobox','vtiger_quotesshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,53,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("vtiger_field").",'bill_street','vtiger_quotesbillads',1,'24','bill_street','Billing Address',1,0,0,100,1,53,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("vtiger_field").",'ship_street','vtiger_quotesshipads',1,'24','ship_street','Shipping Address',1,0,0,100,2,53,1,'V~M',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("vtiger_field").",'bill_city','vtiger_quotesbillads',1,'1','bill_city','Billing City',1,0,0,100,5,53,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("vtiger_field").",'ship_city','vtiger_quotesshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,53,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("vtiger_field").",'bill_state','vtiger_quotesbillads',1,'1','bill_state','Billing State',1,0,0,100,7,53,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("vtiger_field").",'ship_state','vtiger_quotesshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,53,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("vtiger_field").",'bill_code','vtiger_quotesbillads',1,'1','bill_code','Billing Code',1,0,0,100,9,53,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("vtiger_field").",'ship_code','vtiger_quotesshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,53,1,'V~O',1,null,'BAS')");
+
+
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("vtiger_field").",'bill_country','vtiger_quotesbillads',1,'1','bill_country','Billing Country',1,0,0,100,11,53,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("vtiger_field").",'ship_country','vtiger_quotesshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,53,1,'V~O',1,null,'BAS')");
+
+$this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("vtiger_field").",'bill_pobox','vtiger_quotesbillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,53,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("vtiger_field").",'ship_pobox','vtiger_quotesshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,53,1,'V~O',1,null,'BAS')");
  //Block55
 
-$this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,56,1,'V~O',1,null,'ADV')");
+$this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("vtiger_field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,56,1,'V~O',1,null,'ADV')");
 
 //Block 56
-$this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'terms_conditions','vtiger_quotes',1,'19','terms_conditions','Terms & Conditions',1,0,0,100,1,55,1,'V~O',1,null,'ADV')");
+$this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("vtiger_field").",'terms_conditions','vtiger_quotes',1,'19','terms_conditions','Terms & Conditions',1,0,0,100,1,55,1,'V~O',1,null,'ADV')");
 
 
 //Quote Details -- END
@@ -677,109 +677,109 @@
 //Purchase Order Details -- START
  //Block57
  
-$this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'subject','vtiger_purchaseorder',1,'2','subject','Subject',1,0,0,100,1,57,1,'V~M',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'vendorid','vtiger_purchaseorder',1,'81','vendor_id','Vendor Name',1,0,0,100,3,57,1,'I~M',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'requisition_no','vtiger_purchaseorder',1,'1','requisition_no','Requisition No',1,0,0,100,4,57,1,'V~O',1,null,'BAS')");	
-
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'tracking_no','vtiger_purchaseorder',1,'1','tracking_no','Tracking Number',1,0,0,100,5,57,1,'V~O',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'contactid','vtiger_purchaseorder',1,'57','contact_id','Contact Name',1,0,0,100,6,57,1,'I~O',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'duedate','vtiger_purchaseorder',1,'5','duedate','Due Date',1,0,0,100,7,57,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'carrier','vtiger_purchaseorder',1,'15','carrier','Carrier',1,0,0,100,8,57,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'salestax','vtiger_purchaseorder',1,'1','txtTax','Sales Tax',1,0,0,100,10,57,3,'N~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'adjustment','vtiger_purchaseorder',1,'1','txtAdjustment','Adjustment',1,0,0,100,10,57,3,'NN~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'salescommission','vtiger_purchaseorder',1,'1','salescommission','Sales Commission',1,0,0,100,11,57,1,'N~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'exciseduty','vtiger_purchaseorder',1,'1','exciseduty','Excise Duty',1,0,0,100,12,57,1,'N~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'total','vtiger_purchaseorder',1,'1','hdnGrandTotal','Total',1,0,0,100,13,57,3,'N~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'subtotal','vtiger_purchaseorder',1,'1','hdnSubTotal','Sub Total',1,0,0,100,14,57,3,'N~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'postatus','vtiger_purchaseorder',1,'15','postatus','Status',1,0,0,100,15,57,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,16,57,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,17,57,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,18,57,2,'T~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("vtiger_field").",'subject','vtiger_purchaseorder',1,'2','subject','Subject',1,0,0,100,1,57,1,'V~M',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("vtiger_field").",'vendorid','vtiger_purchaseorder',1,'81','vendor_id','Vendor Name',1,0,0,100,3,57,1,'I~M',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("vtiger_field").",'requisition_no','vtiger_purchaseorder',1,'1','requisition_no','Requisition No',1,0,0,100,4,57,1,'V~O',1,null,'BAS')");	
+
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("vtiger_field").",'tracking_no','vtiger_purchaseorder',1,'1','tracking_no','Tracking Number',1,0,0,100,5,57,1,'V~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("vtiger_field").",'contactid','vtiger_purchaseorder',1,'57','contact_id','Contact Name',1,0,0,100,6,57,1,'I~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("vtiger_field").",'duedate','vtiger_purchaseorder',1,'5','duedate','Due Date',1,0,0,100,7,57,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("vtiger_field").",'carrier','vtiger_purchaseorder',1,'15','carrier','Carrier',1,0,0,100,8,57,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("vtiger_field").",'salestax','vtiger_purchaseorder',1,'1','txtTax','Sales Tax',1,0,0,100,10,57,3,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("vtiger_field").",'adjustment','vtiger_purchaseorder',1,'1','txtAdjustment','Adjustment',1,0,0,100,10,57,3,'NN~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("vtiger_field").",'salescommission','vtiger_purchaseorder',1,'1','salescommission','Sales Commission',1,0,0,100,11,57,1,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("vtiger_field").",'exciseduty','vtiger_purchaseorder',1,'1','exciseduty','Excise Duty',1,0,0,100,12,57,1,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("vtiger_field").",'total','vtiger_purchaseorder',1,'1','hdnGrandTotal','Total',1,0,0,100,13,57,3,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("vtiger_field").",'subtotal','vtiger_purchaseorder',1,'1','hdnSubTotal','Sub Total',1,0,0,100,14,57,3,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("vtiger_field").",'postatus','vtiger_purchaseorder',1,'15','postatus','Status',1,0,0,100,15,57,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("vtiger_field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,16,57,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("vtiger_field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,17,57,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("vtiger_field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,18,57,2,'T~O',1,null,'BAS')");
 
 
 
  //Block 59
 
-$this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'bill_street','vtiger_pobillads',1,'24','bill_street','Billing Address',1,0,0,100,1,59,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'ship_street','vtiger_poshipads',1,'24','ship_street','Shipping Address',1,0,0,100,2,59,1,'V~M',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'bill_city','vtiger_pobillads',1,'1','bill_city','Billing City',1,0,0,100,5,59,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'ship_city','vtiger_poshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,59,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'bill_state','vtiger_pobillads',1,'1','bill_state','Billing State',1,0,0,100,7,59,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'ship_state','vtiger_poshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,59,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'bill_code','vtiger_pobillads',1,'1','bill_code','Billing Code',1,0,0,100,9,59,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'ship_code','vtiger_poshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,59,1,'V~O',1,null,'BAS')");
-
-
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'bill_country','vtiger_pobillads',1,'1','bill_country','Billing Country',1,0,0,100,11,59,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'ship_country','vtiger_poshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,59,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'bill_pobox','vtiger_pobillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,59,1,'V~O',1,null,'BAS')");
-  $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'ship_pobox','vtiger_poshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,59,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("vtiger_field").",'bill_street','vtiger_pobillads',1,'24','bill_street','Billing Address',1,0,0,100,1,59,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("vtiger_field").",'ship_street','vtiger_poshipads',1,'24','ship_street','Shipping Address',1,0,0,100,2,59,1,'V~M',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("vtiger_field").",'bill_city','vtiger_pobillads',1,'1','bill_city','Billing City',1,0,0,100,5,59,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("vtiger_field").",'ship_city','vtiger_poshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,59,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("vtiger_field").",'bill_state','vtiger_pobillads',1,'1','bill_state','Billing State',1,0,0,100,7,59,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("vtiger_field").",'ship_state','vtiger_poshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,59,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("vtiger_field").",'bill_code','vtiger_pobillads',1,'1','bill_code','Billing Code',1,0,0,100,9,59,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("vtiger_field").",'ship_code','vtiger_poshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,59,1,'V~O',1,null,'BAS')");
+
+
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("vtiger_field").",'bill_country','vtiger_pobillads',1,'1','bill_country','Billing Country',1,0,0,100,11,59,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("vtiger_field").",'ship_country','vtiger_poshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,59,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("vtiger_field").",'bill_pobox','vtiger_pobillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,59,1,'V~O',1,null,'BAS')");
+  $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("vtiger_field").",'ship_pobox','vtiger_poshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,59,1,'V~O',1,null,'BAS')");
   
  //Block61
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,62,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("vtiger_field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,62,1,'V~O',1,null,'ADV')");
 
  //Block62
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'terms_conditions','vtiger_purchaseorder',1,'19','terms_conditions','Terms & Conditions',1,0,0,100,1,61,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("vtiger_field").",'terms_conditions','vtiger_purchaseorder',1,'19','terms_conditions','Terms & Conditions',1,0,0,100,1,61,1,'V~O',1,null,'ADV')");
 
 //Purchase Order Details -- END
 
 //Sales Order Details -- START
  //Block63
  
-$this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'subject','vtiger_salesorder',1,'2','subject','Subject',1,0,0,100,1,63,1,'V~M',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'potentialid','vtiger_salesorder',1,'76','potential_id','Potential Name',1,0,0,100,2,63,1,'I~O',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'customerno','vtiger_salesorder',1,'1','customerno','Customer No',1,0,0,100,3,63,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'quoteid','vtiger_salesorder',1,'78','quote_id','Quote Name',1,0,0,100,4,63,1,'I~O',1,null,'BAS')");	
-$this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'purchaseorder','vtiger_salesorder',1,'1','vtiger_purchaseorder','Purchase Order',1,0,0,100,4,63,1,'V~O',1,null,'BAS')");	
-
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'contactid','vtiger_salesorder',1,'57','contact_id','Contact Name',1,0,0,100,6,63,1,'I~O',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'duedate','vtiger_salesorder',1,'5','duedate','Due Date',1,0,0,100,8,63,1,'D~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'carrier','vtiger_salesorder',1,'15','carrier','Carrier',1,0,0,100,9,63,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'pending','vtiger_salesorder',1,'1','pending','Pending',1,0,0,100,10,63,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'sostatus','vtiger_salesorder',1,'15','sostatus','Status',1,0,0,100,11,63,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'salestax','vtiger_salesorder',1,'1','txtTax','Sales Tax',1,0,0,100,12,63,3,'N~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'adjustment','vtiger_salesorder',1,'1','txtAdjustment','Sales Tax',1,0,0,100,12,63,3,'NN~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'salescommission','vtiger_salesorder',1,'1','salescommission','Sales Commission',1,0,0,100,13,63,1,'N~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'exciseduty','vtiger_salesorder',1,'1','exciseduty','Excise Duty',1,0,0,100,13,63,1,'N~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'total','vtiger_salesorder',1,'1','hdnGrandTotal','Total',1,0,0,100,14,63,3,'N~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'subtotal','vtiger_salesorder',1,'1','hdnSubTotal','Total',1,0,0,100,15,63,3,'N~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'accountid','vtiger_salesorder',1,'73','account_id','Account Name',1,0,0,100,16,63,1,'I~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,17,63,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,18,63,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,19,63,2,'T~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("vtiger_field").",'subject','vtiger_salesorder',1,'2','subject','Subject',1,0,0,100,1,63,1,'V~M',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("vtiger_field").",'potentialid','vtiger_salesorder',1,'76','potential_id','Potential Name',1,0,0,100,2,63,1,'I~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("vtiger_field").",'customerno','vtiger_salesorder',1,'1','customerno','Customer No',1,0,0,100,3,63,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("vtiger_field").",'quoteid','vtiger_salesorder',1,'78','quote_id','Quote Name',1,0,0,100,4,63,1,'I~O',1,null,'BAS')");	
+$this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("vtiger_field").",'purchaseorder','vtiger_salesorder',1,'1','vtiger_purchaseorder','Purchase Order',1,0,0,100,4,63,1,'V~O',1,null,'BAS')");	
+
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("vtiger_field").",'contactid','vtiger_salesorder',1,'57','contact_id','Contact Name',1,0,0,100,6,63,1,'I~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("vtiger_field").",'duedate','vtiger_salesorder',1,'5','duedate','Due Date',1,0,0,100,8,63,1,'D~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("vtiger_field").",'carrier','vtiger_salesorder',1,'15','carrier','Carrier',1,0,0,100,9,63,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("vtiger_field").",'pending','vtiger_salesorder',1,'1','pending','Pending',1,0,0,100,10,63,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("vtiger_field").",'sostatus','vtiger_salesorder',1,'15','sostatus','Status',1,0,0,100,11,63,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("vtiger_field").",'salestax','vtiger_salesorder',1,'1','txtTax','Sales Tax',1,0,0,100,12,63,3,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("vtiger_field").",'adjustment','vtiger_salesorder',1,'1','txtAdjustment','Sales Tax',1,0,0,100,12,63,3,'NN~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("vtiger_field").",'salescommission','vtiger_salesorder',1,'1','salescommission','Sales Commission',1,0,0,100,13,63,1,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("vtiger_field").",'exciseduty','vtiger_salesorder',1,'1','exciseduty','Excise Duty',1,0,0,100,13,63,1,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("vtiger_field").",'total','vtiger_salesorder',1,'1','hdnGrandTotal','Total',1,0,0,100,14,63,3,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("vtiger_field").",'subtotal','vtiger_salesorder',1,'1','hdnSubTotal','Total',1,0,0,100,15,63,3,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("vtiger_field").",'accountid','vtiger_salesorder',1,'73','account_id','Account Name',1,0,0,100,16,63,1,'I~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("vtiger_field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,17,63,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("vtiger_field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,18,63,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("vtiger_field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,19,63,2,'T~O',1,null,'BAS')");
 
 
 
  //Block 65
 
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'bill_street','vtiger_sobillads',1,'24','bill_street','Billing Address',1,0,0,100,1,65,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'ship_street','vtiger_soshipads',1,'24','ship_street','Shipping Address',1,0,0,100,2,65,1,'V~M',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'bill_city','vtiger_sobillads',1,'1','bill_city','Billing City',1,0,0,100,5,65,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'ship_city','vtiger_soshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,65,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'bill_state','vtiger_sobillads',1,'1','bill_state','Billing State',1,0,0,100,7,65,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'ship_state','vtiger_soshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,65,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'bill_code','vtiger_sobillads',1,'1','bill_code','Billing Code',1,0,0,100,9,65,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'ship_code','vtiger_soshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,65,1,'V~O',1,null,'BAS')");
-
-
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'bill_country','vtiger_sobillads',1,'1','bill_country','Billing Country',1,0,0,100,11,65,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'ship_country','vtiger_soshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,65,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'bill_pobox','vtiger_sobillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,65,1,'V~O',1,null,'BAS')");
-  $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'ship_pobox','vtiger_soshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,65,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("vtiger_field").",'bill_street','vtiger_sobillads',1,'24','bill_street','Billing Address',1,0,0,100,1,65,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("vtiger_field").",'ship_street','vtiger_soshipads',1,'24','ship_street','Shipping Address',1,0,0,100,2,65,1,'V~M',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("vtiger_field").",'bill_city','vtiger_sobillads',1,'1','bill_city','Billing City',1,0,0,100,5,65,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("vtiger_field").",'ship_city','vtiger_soshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,65,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("vtiger_field").",'bill_state','vtiger_sobillads',1,'1','bill_state','Billing State',1,0,0,100,7,65,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("vtiger_field").",'ship_state','vtiger_soshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,65,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("vtiger_field").",'bill_code','vtiger_sobillads',1,'1','bill_code','Billing Code',1,0,0,100,9,65,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("vtiger_field").",'ship_code','vtiger_soshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,65,1,'V~O',1,null,'BAS')");
+
+
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("vtiger_field").",'bill_country','vtiger_sobillads',1,'1','bill_country','Billing Country',1,0,0,100,11,65,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("vtiger_field").",'ship_country','vtiger_soshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,65,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("vtiger_field").",'bill_pobox','vtiger_sobillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,65,1,'V~O',1,null,'BAS')");
+  $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("vtiger_field").",'ship_pobox','vtiger_soshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,65,1,'V~O',1,null,'BAS')");
   
 //Block67
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,68,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("vtiger_field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,68,1,'V~O',1,null,'ADV')");
 
  //Block68
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'terms_conditions','vtiger_salesorder',1,'19','terms_conditions','Terms & Conditions',1,0,0,100,1,67,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("vtiger_field").",'terms_conditions','vtiger_salesorder',1,'19','terms_conditions','Terms & Conditions',1,0,0,100,1,67,1,'V~O',1,null,'ADV')");
 
 
 //Sales Order Details -- END
@@ -787,94 +787,94 @@
 //Invoice Details -- START
  //Block69
 
-$this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'subject','vtiger_invoice',1,'2','subject','Subject',1,0,0,100,1,69,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'salesorderid','vtiger_invoice',1,'80','salesorder_id','Sales Order',1,0,0,100,2,69,1,'I~O',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'customerno','vtiger_invoice',1,'1','customerno','Customer No',1,0,0,100,3,69,1,'V~O',1,null,'BAS')");	
+$this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'subject','vtiger_invoice',1,'2','subject','Subject',1,0,0,100,1,69,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'salesorderid','vtiger_invoice',1,'80','salesorder_id','Sales Order',1,0,0,100,2,69,1,'I~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'customerno','vtiger_invoice',1,'1','customerno','Customer No',1,0,0,100,3,69,1,'V~O',1,null,'BAS')");	
 
  
 //to include contact name vtiger_field in Invoice-start
-$this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'contactid','vtiger_invoice',1,'57','contact_id','Contact Name',1,0,0,100,4,69,1,'I~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'contactid','vtiger_invoice',1,'57','contact_id','Contact Name',1,0,0,100,4,69,1,'I~O',1,null,'BAS')");
 //end
 
-$this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'invoicedate','vtiger_invoice',1,'5','invoicedate','Invoice Date',1,0,0,100,5,69,1,'D~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'duedate','vtiger_invoice',1,'5','duedate','Due Date',1,0,0,100,6,69,1,'D~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'purchaseorder','vtiger_invoice',1,'1','vtiger_purchaseorder','Purchase Order',1,0,0,100,8,69,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'salestax','vtiger_invoice',1,'1','txtTax','Sales Tax',1,0,0,100,9,69,3,'N~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'adjustment','vtiger_invoice',1,'1','txtAdjustment','Sales Tax',1,0,0,100,9,69,3,'NN~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'salescommission','vtiger_invoice',1,'1','salescommission','Sales Commission',1,0,0,10,13,69,1,'N~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'exciseduty','vtiger_invoice',1,'1','exciseduty','Excise Duty',1,0,0,100,11,69,1,'N~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'subtotal','vtiger_invoice',1,'1','hdnSubTotal','Sub Total',1,0,0,100,12,69,3,'N~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'total','vtiger_invoice',1,'1','hdnGrandTotal','Total',1,0,0,100,13,69,3,'N~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'accountid','vtiger_invoice',1,'73','account_id','Account Name',1,0,0,100,14,69,1,'I~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'invoicestatus','vtiger_invoice',1,'15','invoicestatus','Status',1,0,0,100,15,69,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,16,69,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,17,69,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,18,69,2,'T~O',1,null,'BAS')"); 
+$this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'invoicedate','vtiger_invoice',1,'5','invoicedate','Invoice Date',1,0,0,100,5,69,1,'D~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'duedate','vtiger_invoice',1,'5','duedate','Due Date',1,0,0,100,6,69,1,'D~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'purchaseorder','vtiger_invoice',1,'1','vtiger_purchaseorder','Purchase Order',1,0,0,100,8,69,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'salestax','vtiger_invoice',1,'1','txtTax','Sales Tax',1,0,0,100,9,69,3,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'adjustment','vtiger_invoice',1,'1','txtAdjustment','Sales Tax',1,0,0,100,9,69,3,'NN~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'salescommission','vtiger_invoice',1,'1','salescommission','Sales Commission',1,0,0,10,13,69,1,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'exciseduty','vtiger_invoice',1,'1','exciseduty','Excise Duty',1,0,0,100,11,69,1,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'subtotal','vtiger_invoice',1,'1','hdnSubTotal','Sub Total',1,0,0,100,12,69,3,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'total','vtiger_invoice',1,'1','hdnGrandTotal','Total',1,0,0,100,13,69,3,'N~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'accountid','vtiger_invoice',1,'73','account_id','Account Name',1,0,0,100,14,69,1,'I~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'invoicestatus','vtiger_invoice',1,'15','invoicestatus','Status',1,0,0,100,15,69,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,16,69,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,17,69,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,18,69,2,'T~O',1,null,'BAS')"); 
 
  //Block 71
 
-$this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'bill_street','vtiger_invoicebillads',1,'24','bill_street','Billing Address',1,0,0,100,1,71,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'ship_street','vtiger_invoiceshipads',1,'24','ship_street','Shipping Address',1,0,0,100,2,71,1,'V~M',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'bill_city','vtiger_invoicebillads',1,'1','bill_city','Billing City',1,0,0,100,5,71,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'ship_city','vtiger_invoiceshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,71,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'bill_state','vtiger_invoicebillads',1,'1','bill_state','Billing State',1,0,0,100,7,71,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'ship_state','vtiger_invoiceshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,71,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'bill_code','vtiger_invoicebillads',1,'1','bill_code','Billing Code',1,0,0,100,9,71,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'ship_code','vtiger_invoiceshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,71,1,'V~O',1,null,'BAS')");
-
-
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'bill_country','vtiger_invoicebillads',1,'1','bill_country','Billing Country',1,0,0,100,11,71,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'ship_country','vtiger_invoiceshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,71,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'bill_pobox','vtiger_invoicebillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,71,1,'V~O',1,null,'BAS')");
-  $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'ship_pobox','vtiger_invoiceshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,71,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'bill_street','vtiger_invoicebillads',1,'24','bill_street','Billing Address',1,0,0,100,1,71,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'ship_street','vtiger_invoiceshipads',1,'24','ship_street','Shipping Address',1,0,0,100,2,71,1,'V~M',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'bill_city','vtiger_invoicebillads',1,'1','bill_city','Billing City',1,0,0,100,5,71,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'ship_city','vtiger_invoiceshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,71,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'bill_state','vtiger_invoicebillads',1,'1','bill_state','Billing State',1,0,0,100,7,71,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'ship_state','vtiger_invoiceshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,71,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'bill_code','vtiger_invoicebillads',1,'1','bill_code','Billing Code',1,0,0,100,9,71,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'ship_code','vtiger_invoiceshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,71,1,'V~O',1,null,'BAS')");
+
+
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'bill_country','vtiger_invoicebillads',1,'1','bill_country','Billing Country',1,0,0,100,11,71,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'ship_country','vtiger_invoiceshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,71,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'bill_pobox','vtiger_invoicebillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,71,1,'V~O',1,null,'BAS')");
+  $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'ship_pobox','vtiger_invoiceshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,71,1,'V~O',1,null,'BAS')");
 
 //Block73
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,74,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,74,1,'V~O',1,null,'ADV')");
  //Block74
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'terms_conditions','vtiger_invoice',1,'19','terms_conditions','Terms & Conditions',1,0,0,100,1,73,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'terms_conditions','vtiger_invoice',1,'19','terms_conditions','Terms & Conditions',1,0,0,100,1,73,1,'V~O',1,null,'ADV')");
 
 
 //Invoice Details -- END
  //users Details Starts Block 79,80,81
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'user_name','vtiger_users',1,'106','user_name','User Name',1,0,0,11,1,79,1,'V~M',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'is_admin','vtiger_users',1,'156','is_admin','Admin',1,0,0,3,2,79,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'user_password','vtiger_users',1,'99','user_password','Password',1,0,0,30,3,79,4,'P~M',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'confirm_password','vtiger_users',1,'99','confirm_password','Confirm Password',1,0,0,30,4,79,4,'P~M',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'first_name','vtiger_users',1,'1','first_name','First Name',1,0,0,30,5,79,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'last_name','vtiger_users',1,'2','last_name','Last Name',1,0,0,30,6,79,1,'V~M',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'roleid','vtiger_user2role',1,'98','roleid','Role',1,0,0,200,7,79,1,'V~M',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'email1','vtiger_users',1,'104','email1','Email',1,0,0,100,9,79,1,'E~M',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'status','vtiger_users',1,'115','status','Status',1,0,0,100,10,79,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'activity_view','vtiger_users',1,'15','activity_view','Default Activity View',1,0,0,100,13,79,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'lead_view','vtiger_users',1,'15','lead_view','Default Lead View',1,0,0,100,12,79,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'currency_id','vtiger_users',1,'116','currency_id','Currency',1,0,0,100,11,79,1,'I~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'hour_format','vtiger_users',1,'116','hour_format','Calendar Hour Format',1,0,0,100,13,79,3,'I~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'end_hour','vtiger_users',1,'116','end_hour','Day ends at',1,0,0,100,15,79,3,'I~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'start_hour','vtiger_users',1,'116','start_hour','Day starts at',1,0,0,100,14,79,3,'I~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'title','vtiger_users',1,'1','title','Title',1,0,0,50,1,80,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'phone_work','vtiger_users',1,'1','phone_work','Office Phone',1,0,0,50,2,80,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'department','vtiger_users',1,'1','department','Department',1,0,0,50,3,80,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'phone_mobile','vtiger_users',1,'1','phone_mobile','Mobile',1,0,0,50,4,80,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'reports_to_id','vtiger_users',1,'101','reports_to_id','Reports To',1,0,0,50,5,80,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'phone_other','vtiger_users',1,'1','phone_other','Other Phone',1,0,0,50,5,80,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'email2','vtiger_users',1,'13','email2','Other Email',1,0,0,100,6,80,1,'E~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'phone_fax','vtiger_users',1,'1','phone_fax','Fax',1,0,0,50,7,80,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'yahoo_id','vtiger_users',1,'13','yahoo_id','Yahoo id',1,0,0,100,7,80,1,'E~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'phone_home','vtiger_users',1,'1','phone_home','Home Phone',1,0,0,50,8,80,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'imagename','vtiger_users',1,'105','imagename','User Image',1,0,0,250,9,80,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'date_format','vtiger_users',1,'15','date_format','Date Format',1,0,0,30,10,80,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'tagcloud','vtiger_users',1,'103','tagcloud','Tag Cloud',1,0,0,250,13,80,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'signature','vtiger_users',1,'21','signature','Signature',1,0,0,250,11,80,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'description','vtiger_users',1,'21','description','Notes',1,0,0,250,12,80,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'address_street','vtiger_users',1,'21','address_street','Street Address',1,0,0,250,1,81,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'address_city','vtiger_users',1,'1','address_city','City',1,0,0,100,2,81,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'address_state','vtiger_users',1,'1','address_state','State',1,0,0,100,3,81,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'address_postalcode','vtiger_users',1,'1','address_postalcode','Postal Code',1,0,0,100,4,81,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'address_country','vtiger_users',1,'1','address_country','Country',1,0,0,100,5,81,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'user_name','vtiger_users',1,'106','user_name','User Name',1,0,0,11,1,79,1,'V~M',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'is_admin','vtiger_users',1,'156','is_admin','Admin',1,0,0,3,2,79,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'user_password','vtiger_users',1,'99','user_password','Password',1,0,0,30,3,79,4,'P~M',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'confirm_password','vtiger_users',1,'99','confirm_password','Confirm Password',1,0,0,30,4,79,4,'P~M',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'first_name','vtiger_users',1,'1','first_name','First Name',1,0,0,30,5,79,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'last_name','vtiger_users',1,'2','last_name','Last Name',1,0,0,30,6,79,1,'V~M',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'roleid','vtiger_user2role',1,'98','roleid','Role',1,0,0,200,7,79,1,'V~M',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'email1','vtiger_users',1,'104','email1','Email',1,0,0,100,9,79,1,'E~M',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'status','vtiger_users',1,'115','status','Status',1,0,0,100,10,79,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'activity_view','vtiger_users',1,'15','activity_view','Default Activity View',1,0,0,100,13,79,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'lead_view','vtiger_users',1,'15','lead_view','Default Lead View',1,0,0,100,12,79,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'currency_id','vtiger_users',1,'116','currency_id','Currency',1,0,0,100,11,79,1,'I~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'hour_format','vtiger_users',1,'116','hour_format','Calendar Hour Format',1,0,0,100,13,79,3,'I~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'end_hour','vtiger_users',1,'116','end_hour','Day ends at',1,0,0,100,15,79,3,'I~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'start_hour','vtiger_users',1,'116','start_hour','Day starts at',1,0,0,100,14,79,3,'I~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'title','vtiger_users',1,'1','title','Title',1,0,0,50,1,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'phone_work','vtiger_users',1,'1','phone_work','Office Phone',1,0,0,50,2,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'department','vtiger_users',1,'1','department','Department',1,0,0,50,3,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'phone_mobile','vtiger_users',1,'1','phone_mobile','Mobile',1,0,0,50,4,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'reports_to_id','vtiger_users',1,'101','reports_to_id','Reports To',1,0,0,50,5,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'phone_other','vtiger_users',1,'1','phone_other','Other Phone',1,0,0,50,5,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'email2','vtiger_users',1,'13','email2','Other Email',1,0,0,100,6,80,1,'E~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'phone_fax','vtiger_users',1,'1','phone_fax','Fax',1,0,0,50,7,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'yahoo_id','vtiger_users',1,'13','yahoo_id','Yahoo id',1,0,0,100,7,80,1,'E~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'phone_home','vtiger_users',1,'1','phone_home','Home Phone',1,0,0,50,8,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'imagename','vtiger_users',1,'105','imagename','User Image',1,0,0,250,9,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'date_format','vtiger_users',1,'15','date_format','Date Format',1,0,0,30,10,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'tagcloud','vtiger_users',1,'103','tagcloud','Tag Cloud',1,0,0,250,13,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'signature','vtiger_users',1,'21','signature','Signature',1,0,0,250,11,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'description','vtiger_users',1,'21','description','Notes',1,0,0,250,12,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'address_street','vtiger_users',1,'21','address_street','Street Address',1,0,0,250,1,81,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'address_city','vtiger_users',1,'1','address_city','City',1,0,0,100,2,81,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'address_state','vtiger_users',1,'1','address_state','State',1,0,0,100,3,81,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'address_postalcode','vtiger_users',1,'1','address_postalcode','Postal Code',1,0,0,100,4,81,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'address_country','vtiger_users',1,'1','address_country','Country',1,0,0,100,5,81,1,'V~O',1,null,'BAS')");
 
  //user Details End
 
@@ -1574,44 +1574,44 @@
                 $this->db->query("insert into vtiger_org_share_action2tab values(7,17)");
 
 		//Insert into default_org_sharingrule
-               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",2,2,0)");
-
-               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",4,2,2)");
-
-               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",6,2,0)");
-
-               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",7,2,0)");
-
-               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",9,3,1)");
-               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",13,2,0)");
-               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",16,3,2)");
-               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",17,7,0)");
-               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",20,2,0)");
-               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",21,2,0)");
-               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",22,2,0)");
-               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",23,2,0)");
-               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",26,2,0)");
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('vtiger_def_org_share').",2,2,0)");
+
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('vtiger_def_org_share').",4,2,2)");
+
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('vtiger_def_org_share').",6,2,0)");
+
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('vtiger_def_org_share').",7,2,0)");
+
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('vtiger_def_org_share').",9,3,1)");
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('vtiger_def_org_share').",13,2,0)");
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('vtiger_def_org_share').",16,3,2)");
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('vtiger_def_org_share').",17,7,0)");
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('vtiger_def_org_share').",20,2,0)");
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('vtiger_def_org_share').",21,2,0)");
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('vtiger_def_org_share').",22,2,0)");
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('vtiger_def_org_share').",23,2,0)");
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('vtiger_def_org_share').",26,2,0)");
 
 		//Populating the DataShare Related Modules
 
 		//Lead Related Module
 
 		//Account Related Module
-		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",6,2)");
-		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",6,13)");
-		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",6,20)");
-		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",6,22)");
-		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",6,23)");
+		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('vtiger_datashare_relatedmodules').",6,2)");
+		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('vtiger_datashare_relatedmodules').",6,13)");
+		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('vtiger_datashare_relatedmodules').",6,20)");
+		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('vtiger_datashare_relatedmodules').",6,22)");
+		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('vtiger_datashare_relatedmodules').",6,23)");
 
 		//Potential Related Module
-		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",2,20)");
-		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",2,22)");
+		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('vtiger_datashare_relatedmodules').",2,20)");
+		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('vtiger_datashare_relatedmodules').",2,22)");
 
 		//Quote Related Module
-		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",20,22)");
+		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('vtiger_datashare_relatedmodules').",20,22)");
 
 		//SO Related Module
-		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",22,23)");	
+		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('vtiger_datashare_relatedmodules').",22,23)");	
 
 
 			
@@ -1623,216 +1623,216 @@
 
 	//insert into related list vtiger_table
 	//Inserting for vtiger_account related lists
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("Potentials").",'get_opportunities',1,'Potentials',0)");	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("Potentials").",'get_opportunities',1,'Potentials',0)");	
 		
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("Contacts").",'get_contacts',2,'Contacts',0)");
-
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("Activities").",'get_activities',3,'Activities',0)");
-
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("HelpDesk").",'get_tickets',4,'HelpDesk',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("Activities").",'get_history',5,'Activity History',0)");
-
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",0,'get_attachments',6,'Attachments',0)");
-
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("Quotes").",'get_quotes',7,'Quotes',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("Invoice").",'get_invoices',8,'Invoice',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("SalesOrder").",'get_salesorder',9,'Sales Order',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("Products").",'get_products',10,'Products',0)");
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("Contacts").",'get_contacts',2,'Contacts',0)");
+
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("Activities").",'get_activities',3,'Activities',0)");
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("HelpDesk").",'get_tickets',4,'HelpDesk',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("Activities").",'get_history',5,'Activity History',0)");
+
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",0,'get_attachments',6,'Attachments',0)");
+
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("Quotes").",'get_quotes',7,'Quotes',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("Invoice").",'get_invoices',8,'Invoice',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("SalesOrder").",'get_salesorder',9,'Sales Order',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("Products").",'get_products',10,'Products',0)");
 
 	//Inserting Lead Related Lists	
 
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Leads").",".getTabid("Activities").",'get_activities',1,'Activities',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Leads").",".getTabid("Emails").",'get_emails',2,'Emails',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Leads").",".getTabid("Activities").",'get_history',3,'Activity History',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Leads").",0,'get_attachments',4,'Attachments',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Leads").",".getTabid("Products").",'get_products',5,'Products',0)");
-
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Leads").",".getTabid("Campaigns").",'get_campaigns',6,'Campaigns',0)");
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Leads").",".getTabid("Activities").",'get_activities',1,'Activities',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Leads").",".getTabid("Emails").",'get_emails',2,'Emails',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Leads").",".getTabid("Activities").",'get_history',3,'Activity History',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Leads").",0,'get_attachments',4,'Attachments',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Leads").",".getTabid("Products").",'get_products',5,'Products',0)");
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Leads").",".getTabid("Campaigns").",'get_campaigns',6,'Campaigns',0)");
 
 	//Inserting for contact related lists
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Potentials").",'get_opportunities',1,'Potentials',0)");	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Contacts").",".getTabid("Potentials").",'get_opportunities',1,'Potentials',0)");	
 		
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Activities").",'get_activities',2,'Activities',0)");
-
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Emails").",'get_emails',3,'Emails',0)");
-
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("HelpDesk").",'get_tickets',4,'HelpDesk',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Quotes").",'get_quotes',5,'Quotes',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("PurchaseOrder").",'get_purchase_orders',6,'Purchase Order',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("SalesOrder").",'get_salesorder',7,'Sales Order',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Products").",'get_products',8,'Products',0)");
-
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Activities").",'get_history',9,'Activity History',0)");
-
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",0,'get_attachments',10,'Attachments',0)");
-
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Campaigns").",'get_campaigns',11,'Campaigns',0)");
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Contacts").",".getTabid("Activities").",'get_activities',2,'Activities',0)");
+
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Contacts").",".getTabid("Emails").",'get_emails',3,'Emails',0)");
+
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Contacts").",".getTabid("HelpDesk").",'get_tickets',4,'HelpDesk',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Contacts").",".getTabid("Quotes").",'get_quotes',5,'Quotes',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Contacts").",".getTabid("PurchaseOrder").",'get_purchase_orders',6,'Purchase Order',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Contacts").",".getTabid("SalesOrder").",'get_salesorder',7,'Sales Order',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Contacts").",".getTabid("Products").",'get_products',8,'Products',0)");
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Contacts").",".getTabid("Activities").",'get_history',9,'Activity History',0)");
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Contacts").",0,'get_attachments',10,'Attachments',0)");
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Contacts").",".getTabid("Campaigns").",'get_campaigns',11,'Campaigns',0)");
 
 	//Inserting Potential Related Lists	
 
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",".getTabid("Activities").",'get_activities',1,'Activities',0)");
-
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",".getTabid("Contacts").",'get_contacts',2,'Contacts',0)");
-
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",".getTabid("Products").",'get_products',3,'Products',0)");
-
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",0,'get_stage_history',4,'Sales Stage History',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",0,'get_attachments',5,'Attachments',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",".getTabid("Quotes").",'get_Quotes',6,'Quotes',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",".getTabid("SalesOrder").",'get_salesorder',7,'Sales Order',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",".getTabid("Activities").",'get_history',8,'Activity History',0)");
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Potentials").",".getTabid("Activities").",'get_activities',1,'Activities',0)");
+
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Potentials").",".getTabid("Contacts").",'get_contacts',2,'Contacts',0)");
+
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Potentials").",".getTabid("Products").",'get_products',3,'Products',0)");
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Potentials").",0,'get_stage_history',4,'Sales Stage History',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Potentials").",0,'get_attachments',5,'Attachments',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Potentials").",".getTabid("Quotes").",'get_Quotes',6,'Quotes',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Potentials").",".getTabid("SalesOrder").",'get_salesorder',7,'Sales Order',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Potentials").",".getTabid("Activities").",'get_history',8,'Activity History',0)");
 
 		//Inserting Product Related Lists	
 
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",".getTabid("HelpDesk").",'get_tickets',1,'HelpDesk',0)");
-
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",".getTabid("Activities").",'get_activities',2,'Activities',0)");
-
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",0,'get_attachments',3,'Attachments',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",".getTabid("Quotes").",'get_quotes',4,'Quotes',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",".getTabid("PurchaseOrder").",'get_purchase_orders',5,'Purchase Order',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",".getTabid("SalesOrder").",'get_salesorder',6,'Sales Order',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",".getTabid("Invoice").",'get_invoices',7,'Invoice',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",".getTabid("PriceBooks").",'get_product_pricebooks',8,'PriceBooks',0)");
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Products").",".getTabid("HelpDesk").",'get_tickets',1,'HelpDesk',0)");
+
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Products").",".getTabid("Activities").",'get_activities',2,'Activities',0)");
+
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Products").",0,'get_attachments',3,'Attachments',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Products").",".getTabid("Quotes").",'get_quotes',4,'Quotes',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Products").",".getTabid("PurchaseOrder").",'get_purchase_orders',5,'Purchase Order',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Products").",".getTabid("SalesOrder").",'get_salesorder',6,'Sales Order',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Products").",".getTabid("Invoice").",'get_invoices',7,'Invoice',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Products").",".getTabid("PriceBooks").",'get_product_pricebooks',8,'PriceBooks',0)");
 	
 		//Inserting Emails Related Lists	
 
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Emails").",".getTabid("Contacts").",'get_contacts',1,'Contacts',0)");
-
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Emails").",0,'get_users',2,'Users',0)");
-
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Emails").",0,'get_attachments',3,'Attachments',0)");
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Emails").",".getTabid("Contacts").",'get_contacts',1,'Contacts',0)");
+
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Emails").",0,'get_users',2,'Users',0)");
+
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Emails").",0,'get_attachments',3,'Attachments',0)");
 
 		//Inserting HelpDesk Related Lists
 		
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("HelpDesk").",".getTabid("Activities").",'get_activities',1,'Activities',0)");
-
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("HelpDesk").",0,'get_attachments',2,'Attachments',0)");
-
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("HelpDesk").",0,'get_ticket_history',3,'Ticket History',0)");
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("HelpDesk").",".getTabid("Activities").",'get_activities',1,'Activities',0)");
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("HelpDesk").",0,'get_attachments',2,'Attachments',0)");
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("HelpDesk").",0,'get_ticket_history',3,'Ticket History',0)");
 
 	//Inserting PriceBook Related Lists
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("PriceBooks").",14,'get_pricebook_products',2,'Products',0)");
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("PriceBooks").",14,'get_pricebook_products',2,'Products',0)");
 
         // Inserting Vendor Related Lists
-        $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Vendors").",14,'get_products',1,'Products',0)");
-
-        $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Vendors").",21,'get_purchase_orders',2,'Purchase Order',0)");
-
-        $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Vendors").",4,'get_contacts',3,'Contacts',0)");
+        $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Vendors").",14,'get_products',1,'Products',0)");
+
+        $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Vendors").",21,'get_purchase_orders',2,'Purchase Order',0)");
+
+        $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Vendors").",4,'get_contacts',3,'Contacts',0)");
 
 	// Inserting Quotes Related Lists
 	
-        $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Quotes").",".getTabid("Invoice").",'get_salesorder',1,'Sales Order',0)");
+        $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Quotes").",".getTabid("Invoice").",'get_salesorder',1,'Sales Order',0)");
         
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Quotes").",9,'get_activities',2,'Activities',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Quotes").",9,'get_history',3,'Activity History',0)");
-
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Quotes").",0,'get_quotestagehistory',4,'Quote Stage History',0)");
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Quotes").",9,'get_activities',2,'Activities',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Quotes").",9,'get_history',3,'Activity History',0)");
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Quotes").",0,'get_quotestagehistory',4,'Quote Stage History',0)");
 
 	// Inserting Purchase order Related Lists
 
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("PurchaseOrder").",9,'get_activities',1,'Activities',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("PurchaseOrder").",0,'get_attachments',2,'Attachments',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("PurchaseOrder").",".getTabid("Activities").",'get_history',3,'Activity History',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("PurchaseOrder").",0,'get_postatushistory',4,'PurchaseOrder Status History',0)");
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("PurchaseOrder").",9,'get_activities',1,'Activities',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("PurchaseOrder").",0,'get_attachments',2,'Attachments',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("PurchaseOrder").",".getTabid("Activities").",'get_history',3,'Activity History',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("PurchaseOrder").",0,'get_postatushistory',4,'PurchaseOrder Status History',0)");
 
 	// Inserting Sales order Related Lists
 
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("SalesOrder").",9,'get_activities',1,'Activities',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("SalesOrder").",0,'get_attachments',2,'Attachments',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("SalesOrder").",".getTabid("Invoice").",'get_invoices',3,'Invoice',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("SalesOrder").",".getTabid("Activities").",'get_history',4,'Activity History',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("SalesOrder").",0,'get_sostatushistory',5,'SalesOrder Status History',0)");
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("SalesOrder").",9,'get_activities',1,'Activities',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("SalesOrder").",0,'get_attachments',2,'Attachments',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("SalesOrder").",".getTabid("Invoice").",'get_invoices',3,'Invoice',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("SalesOrder").",".getTabid("Activities").",'get_history',4,'Activity History',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("SalesOrder").",0,'get_sostatushistory',5,'SalesOrder Status History',0)");
 
 	// Inserting Invoice Related Lists
 
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Invoice").",9,'get_activities',1,'Activities',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Invoice").",0,'get_attachments',2,'Attachments',0)");
-
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Invoice").",".getTabid("Activities").",'get_history',3,'Activity History',0)");
-
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Invoice").",0,'get_invoicestatushistory',4,'Invoice Status History',0)");
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Invoice").",9,'get_activities',1,'Activities',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Invoice").",0,'get_attachments',2,'Attachments',0)");
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Invoice").",".getTabid("Activities").",'get_history',3,'Activity History',0)");
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Invoice").",0,'get_invoicestatushistory',4,'Invoice Status History',0)");
 
 	// Inserting Activities Related Lists
 	
-	$this->db->query("insert into vtiger_relatedlists values (".$this->db->getUniqueID('relatedlists').",".getTabid("Activities").",0,'get_users',1,'Users',0)");
-	$this->db->query("insert into vtiger_relatedlists values (".$this->db->getUniqueID('relatedlists').",".getTabid("Activities").",4,'get_contacts',2,'Contacts',0)");
+	$this->db->query("insert into vtiger_relatedlists values (".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Activities").",0,'get_users',1,'Users',0)");
+	$this->db->query("insert into vtiger_relatedlists values (".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Activities").",4,'get_contacts',2,'Contacts',0)");
 
 	// Inserting Campaigns Related Lists
 
-         $this->db->query("insert into vtiger_relatedlists values (".$this->db->getUniqueID('relatedlists').",".getTabid("Campaigns").",".getTabid("Contacts").",'get_contacts',1,'Contacts',0)");
-         $this->db->query("insert into vtiger_relatedlists values (".$this->db->getUniqueID('relatedlists').",".getTabid("Campaigns").",".getTabid("Leads").",'get_leads',2,'Leads',0)");
-	 $this->db->query("insert into vtiger_relatedlists values (".$this->db->getUniqueID('relatedlists').",".getTabid("Campaigns").",".getTabid("Potentials").",'get_opportunities',3,'Potentials',0)");
-	 $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Campaigns").",9,'get_activities',4,'Activities',0)");
+         $this->db->query("insert into vtiger_relatedlists values (".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Campaigns").",".getTabid("Contacts").",'get_contacts',1,'Contacts',0)");
+         $this->db->query("insert into vtiger_relatedlists values (".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Campaigns").",".getTabid("Leads").",'get_leads',2,'Leads',0)");
+	 $this->db->query("insert into vtiger_relatedlists values (".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Campaigns").",".getTabid("Potentials").",'get_opportunities',3,'Potentials',0)");
+	 $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Campaigns").",9,'get_activities',4,'Activities',0)");
 
  //Inserting User Related Lists
  
-        $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Users").",".getTabid("Activities").",'get_activities',1,'Activities',0)");
+        $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Users").",".getTabid("Activities").",'get_activities',1,'Activities',0)");
  
-        $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Users").",".getTabid("Contacts").",'get_contacts',2,'Contacts',0)");
+        $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Users").",".getTabid("Contacts").",'get_contacts',2,'Contacts',0)");
  
-        $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Users").",".getTabid("Users").",'get_user_groups',3,'Groups',0)");
+        $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Users").",".getTabid("Users").",'get_user_groups',3,'Groups',0)");
 
 	 
-               $this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("notificationscheduler").",'LBL_TASK_NOTIFICATION_DESCRITPION',1,'Task Delay Notification','Tasks delayed beyond 24 hrs ','LBL_TASK_NOTIFICATION')");
-
-
-                $this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("notificationscheduler").",'LBL_BIG_DEAL_DESCRIPTION' ,1,'Big Deal notification','Success! A big deal has been won! ','LBL_BIG_DEAL')");
-
-
-                $this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("notificationscheduler").",'LBL_TICKETS_DESCRIPTION',1,'Pending Tickets notification','Ticket pending please ','LBL_PENDING_TICKETS')");
-
-
-                $this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("notificationscheduler").",'LBL_MANY_TICKETS_DESCRIPTION',1,'Too many tickets Notification','Too many tickets pending against this entity ','LBL_MANY_TICKETS')");
-
-
-                $this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("notificationscheduler").",'LBL_START_DESCRIPTION' ,1,'Support Start Notification','Support starts please ','LBL_START_NOTIFICATION')");
-
-                $this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("notificationscheduler").",'LBL_SUPPORT_DESCRIPTION',1,'Support ending please','Support Ending Notification','LBL_SUPPORT_NOTICIATION')");
+               $this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("vtiger_notificationscheduler").",'LBL_TASK_NOTIFICATION_DESCRITPION',1,'Task Delay Notification','Tasks delayed beyond 24 hrs ','LBL_TASK_NOTIFICATION')");
+
+
+                $this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("vtiger_notificationscheduler").",'LBL_BIG_DEAL_DESCRIPTION' ,1,'Big Deal notification','Success! A big deal has been won! ','LBL_BIG_DEAL')");
+
+
+                $this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("vtiger_notificationscheduler").",'LBL_TICKETS_DESCRIPTION',1,'Pending Tickets notification','Ticket pending please ','LBL_PENDING_TICKETS')");
+
+
+                $this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("vtiger_notificationscheduler").",'LBL_MANY_TICKETS_DESCRIPTION',1,'Too many tickets Notification','Too many tickets pending against this entity ','LBL_MANY_TICKETS')");
+
+
+                $this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("vtiger_notificationscheduler").",'LBL_START_DESCRIPTION' ,1,'Support Start Notification','Support starts please ','LBL_START_NOTIFICATION')");
+
+                $this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("vtiger_notificationscheduler").",'LBL_SUPPORT_DESCRIPTION',1,'Support ending please','Support Ending Notification','LBL_SUPPORT_NOTICIATION')");
 		
- 		$this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("notificationscheduler").",'LBL_ACTIVITY_REMINDER_DESCRIPTION' ,1,'Activity Reminder Notication','This is a reminder notification for the Activity','LBL_ACTIVITY_NOTIFICATION')");
+ 		$this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("vtiger_notificationscheduler").",'LBL_ACTIVITY_REMINDER_DESCRIPTION' ,1,'Activity Reminder Notication','This is a reminder notification for the Activity','LBL_ACTIVITY_NOTIFICATION')");
 
 		//Inserting Inventory Notifications
 	$invoice_body = 'Dear {HANDLER},
@@ -1847,7 +1847,7 @@
 {CURRENTUSER}';
 
 		
-               $this->db->query("insert into vtiger_inventorynotification(notificationid,notificationname,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("inventorynotification").",'InvoiceNotification','{PRODUCTNAME} Stock Level is Low','".$invoice_body." ','InvoiceNotificationDescription')");
+               $this->db->query("insert into vtiger_inventorynotification(notificationid,notificationname,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("vtiger_inventorynotification").",'InvoiceNotification','{PRODUCTNAME} Stock Level is Low','".$invoice_body." ','InvoiceNotificationDescription')");
 
 		$quote_body = 'Dear {HANDLER},
 
@@ -1859,7 +1859,7 @@
 {CURRENTUSER}';	
 		
 		
-               $this->db->query("insert into vtiger_inventorynotification(notificationid,notificationname,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("inventorynotification").",'QuoteNotification','Quote given for {PRODUCTNAME}','".$quote_body." ','QuoteNotificationDescription')");
+               $this->db->query("insert into vtiger_inventorynotification(notificationid,notificationname,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("vtiger_inventorynotification").",'QuoteNotification','Quote given for {PRODUCTNAME}','".$quote_body." ','QuoteNotificationDescription')");
 
 		$so_body = 'Dear {HANDLER},
 
@@ -1873,10 +1873,10 @@
 {CURRENTUSER}';
 
 		
-               $this->db->query("insert into vtiger_inventorynotification(notificationid,notificationname,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("inventorynotification").",'SalesOrderNotification','Sales Order generated for {PRODUCTNAME}','".$so_body." ','SalesOrderNotificationDescription')");
+               $this->db->query("insert into vtiger_inventorynotification(notificationid,notificationname,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("vtiger_inventorynotification").",'SalesOrderNotification','Sales Order generated for {PRODUCTNAME}','".$so_body." ','SalesOrderNotificationDescription')");
 
 		//Insert into vtiger_currency vtiger_table
-		$this->db->query("insert into vtiger_currency_info values(".$this->db->getUniqueID("currency_info").",'U.S Dollar','USD','$',1,'Active','-11')");
+		$this->db->query("insert into vtiger_currency_info values(".$this->db->getUniqueID("vtiger_currency_info").",'U.S Dollar','USD','$',1,'Active','-11')");
                 
 
 
@@ -1904,7 +1904,7 @@
 	-MNOP
 	-QRST';
 
-          $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Announcement for Release','Announcement for Release','Announcement of a release','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
+          $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Announcement for Release','Announcement for Release','Announcement of a release','".$body."',0,".$this->db->getUniqueID('vtiger_emailtemplates').")");
 	
 
 
@@ -1933,7 +1933,7 @@
  title';
 
 
-               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Pending Invoices','Invoices Pending','Payment Due','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
+               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Pending Invoices','Invoices Pending','Payment Due','".$body."',0,".$this->db->getUniqueID('vtiger_emailtemplates').")");
 
 
 
@@ -1960,7 +1960,7 @@
 name
 title';
 	       
-               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Acceptance Proposal','Acceptance Proposal','Acceptance of Proposal','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
+               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Acceptance Proposal','Acceptance Proposal','Acceptance of Proposal','".$body."',0,".$this->db->getUniqueID('vtiger_emailtemplates').")");
 
 
 $body= ' The undersigned hereby acknowledges receipt and delivery
@@ -1973,7 +1973,7 @@
 name
 title';
 	       
-               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Goods received acknowledgement','Goods received acknowledgement','Acknowledged Receipt of Goods','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
+               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Goods received acknowledgement','Goods received acknowledgement','Acknowledged Receipt of Goods','".$body."',0,".$this->db->getUniqueID('vtiger_emailtemplates').")");
 
 
 	       $body= ' Dear
@@ -1990,7 +1990,7 @@
 
 
 	       
-               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Accept Order','Accept Order','Acknowledgement/Acceptance of Order','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
+               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Accept Order','Accept Order','Acknowledgement/Acceptance of Order','".$body."',0,".$this->db->getUniqueID('vtiger_emailtemplates').")");
 
 
 
@@ -2013,7 +2013,7 @@
 name
 title';
 	       
-               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Address Change','Change of Address','Address Change','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
+               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Address Change','Change of Address','Address Change','".$body."',0,".$this->db->getUniqueID('vtiger_emailtemplates').")");
 
 
 
@@ -2039,7 +2039,7 @@
 
 
 	       
-               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Follow Up','Follow Up','Follow Up of meeting','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
+               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Follow Up','Follow Up','Follow Up of meeting','".$body."',0,".$this->db->getUniqueID('vtiger_emailtemplates').")");
 
 
 
@@ -2061,7 +2061,7 @@
 title';
 
 	       
-               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Target Crossed!','Target Crossed!','Fantastic Sales Spree!','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
+               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Target Crossed!','Target Crossed!','Fantastic Sales Spree!','".$body."',0,".$this->db->getUniqueID('vtiger_emailtemplates').")");
 
 $body='
 Dear
@@ -2077,14 +2077,14 @@
 title';
 
 	       
-               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Thanks Note','Thanks Note','Note of thanks','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
+               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Thanks Note','Thanks Note','Note of thanks','".$body."',0,".$this->db->getUniqueID('vtiger_emailtemplates').")");
 
 		
 	       //Insert into vtiger_organizationdetails vtiger_table 
 	       $this->db->query("insert into vtiger_organizationdetails(organizationame,address,city,state,country,code,phone,fax,website,logoname) values ('vtiger',' 40-41-42, Sivasundar Apartments, Flat D-II, Shastri Street, Velachery','Chennai','Tamil Nadu','India','600 042','+91-44-5202-1990','+91-44-5202-1990','www.vtiger.com','vtiger-crm-logo.jpg')");
 
   //Insert into vtiger_inventory_tandc vtiger_table
-               $this->db->query("insert into vtiger_inventory_tandc values('".$this->db->getUniqueID('inventory_tandc')."','Inventory','')");
+               $this->db->query("insert into vtiger_inventory_tandc values('".$this->db->getUniqueID('vtiger_inventory_tandc')."','Inventory','')");
 
 	$this->db->query("insert into vtiger_actionmapping values(0,'Save',0)");
 	$this->db->query("insert into vtiger_actionmapping values(1,'EditView',0)");
@@ -2169,9 +2169,9 @@
         $this->db->query("insert into vtiger_parenttabrel values (4,17,9)");
 		
 	//Added to populate the default inventory tax informations
-	$this->db->query("insert into vtiger_inventorytaxinfo values(".$this->db->getUniqueID("inventorytaxinfo").",'VAT','4.5')");
-	$this->db->query("insert into vtiger_inventorytaxinfo values(".$this->db->getUniqueID("inventorytaxinfo").",'Sales','10')");
-	$this->db->query("insert into vtiger_inventorytaxinfo values(".$this->db->getUniqueID("inventorytaxinfo").",'Service','12.5')");
+	$this->db->query("insert into vtiger_inventorytaxinfo values(".$this->db->getUniqueID("vtiger_inventorytaxinfo").",'VAT','4.5')");
+	$this->db->query("insert into vtiger_inventorytaxinfo values(".$this->db->getUniqueID("vtiger_inventorytaxinfo").",'Sales','10')");
+	$this->db->query("insert into vtiger_inventorytaxinfo values(".$this->db->getUniqueID("vtiger_inventorytaxinfo").",'Service','12.5')");
 	
 	}
 }



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 09:52:51 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 16:52:51 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7651 -
	/vtigercrm/trunk/modules/Users/saveemailtemplate.php
Message-ID: <20060628165251.A7CA083FDBF@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 28 10:52:43 2006
New Revision: 7651

Log:
Added vtiger_ in getUniqueID function parameter

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

Modified: vtigercrm/trunk/modules/Users/saveemailtemplate.php
==============================================================================
--- vtigercrm/trunk/modules/Users/saveemailtemplate.php (original)
+++ vtigercrm/trunk/modules/Users/saveemailtemplate.php Wed Jun 28 10:52:43 2006
@@ -41,7 +41,7 @@
 }
 else
 {
-	$templateid = $db->getUniqueID('emailtemplates');
+	$templateid = $db->getUniqueID('vtiger_emailtemplates');
 	$sql = "insert into vtiger_emailtemplates values ('". $folderName. "','".$templateName."','".$subject."','".$description."','".$body."',0,".$templateid.")";
 	$adb->query($sql);
 



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 09:54:32 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 16:54:32 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7653 -
	/vtigercrm/trunk/modules/Webmails/Save.php
Message-ID: <20060628165432.2548A83FD57@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 28 10:54:23 2006
New Revision: 7653

Log:
Added vtiger_ in getUniqueID function parameter

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

Modified: vtigercrm/trunk/modules/Webmails/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Webmails/Save.php (original)
+++ vtigercrm/trunk/modules/Webmails/Save.php Wed Jun 28 10:54:23 2006
@@ -107,7 +107,7 @@
 
 	    $upload_filepath = decideFilePath();
 	    for($i=0,$num_files=count($attachments);$i<$num_files;$i++) {
-		$current_id = $adb->getUniqueID("crmentity");
+		$current_id = $adb->getUniqueID("vtiger_crmentity");
 		$date_var = date('YmdHis');
 
 		$filename = ereg_replace("[ ()-]+", "_",$attachments[$i]["filename"]);



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 09:56:56 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 16:56:56 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7654 -
	/vtigercrm/trunk/soap/customerportal.php
Message-ID: <20060628165657.6A37783FDD5@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 28 10:56:46 2006
New Revision: 7654

Log:
Added vtiger_ in getUniqueID function parameter

Modified:
    vtigercrm/trunk/soap/customerportal.php

Modified: vtigercrm/trunk/soap/customerportal.php
==============================================================================
--- vtigercrm/trunk/soap/customerportal.php (original)
+++ vtigercrm/trunk/soap/customerportal.php Wed Jun 28 10:56:46 2006
@@ -713,7 +713,7 @@
 	fclose($handle);	
 
 	//Now store this file information in db and relate with the ticket
-	$attachmentid = $adb->getUniqueID("crmentity");
+	$attachmentid = $adb->getUniqueID("vtiger_crmentity");
 	$date_var = date('YmdHis');
 	$description = 'CustomerPortal Attachment';
 



From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 09:57:23 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 16:57:23 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7655 -
	/vtigercrm/trunk/soap/vtigerolservice.php
Message-ID: <20060628165723.7F13C83FDD5@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 28 10:57:15 2006
New Revision: 7655

Log:
Added vtiger_ in getUniqueID function parameter

Modified:
    vtigercrm/trunk/soap/vtigerolservice.php

Modified: vtigercrm/trunk/soap/vtigerolservice.php
==============================================================================
--- vtigercrm/trunk/soap/vtigerolservice.php (original)
+++ vtigercrm/trunk/soap/vtigerolservice.php Wed Jun 28 10:57:15 2006
@@ -372,7 +372,7 @@
      $seed_user = new User();
      $user_id = $seed_user->retrieve_user_id($username);
      	
-     $crmid = $adb->getUniqueID("crmentity");
+     $crmid = $adb->getUniqueID("vtiger_crmentity");
      
      $upload_file_path = decideFilePath();
    	



From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 28 10:00:05 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 28 Jun 2006 17:00:05 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231370=3A?=
 =?utf-8?q?_Campaigns=3A_Disconnected_Simple_Time_Filter?=
In-Reply-To: <076.ba40063443d1d72768187489cd3eea9d@vtiger.fosslabs.com>
References: <076.ba40063443d1d72768187489cd3eea9d@vtiger.fosslabs.com>
Message-ID: <085.7981351dce6a5c63224dd49beb790231@vtiger.fosslabs.com>

#1370: Campaigns: Disconnected Simple Time Filter
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  ela  
      Type:  defect     |      Status:  new  
  Priority:  critical   |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => ela

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1370>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 28 10:00:52 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 28 Jun 2006 17:00:52 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231379=3A?=
 =?utf-8?q?_Calendar=3A_+_icon_position?=
In-Reply-To: <076.0c79d92ae6c8bcb494ec7242b613447b@vtiger.fosslabs.com>
References: <076.0c79d92ae6c8bcb494ec7242b613447b@vtiger.fosslabs.com>
Message-ID: <085.a679f86ba6dbe21ab40be203a850fd53@vtiger.fosslabs.com>

#1379: Calendar: + icon position
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  ela  
      Type:  defect     |      Status:  new  
  Priority:  critical   |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => ela

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1379>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 28 10:01:37 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 28 Jun 2006 17:01:37 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231381=3A?=
 =?utf-8?q?_To_Do_-_Wrong_grouping?=
In-Reply-To: <076.badf11791e67728b99c8aecc440697a7@vtiger.fosslabs.com>
References: <076.badf11791e67728b99c8aecc440697a7@vtiger.fosslabs.com>
Message-ID: <085.96294d75168c477e791bee1b5c3093dc@vtiger.fosslabs.com>

#1381: To Do - Wrong grouping
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  mangai
      Type:  defect     |      Status:  new   
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => mangai

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1381>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 28 10:01:55 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 28 Jun 2006 17:01:55 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231382=3A?=
 =?utf-8?q?_Calendar=3A_Start_My_Calendar_Time_=2E=2E?=
In-Reply-To: <076.c0c6252fbd0b46e64e1992decb196d6d@vtiger.fosslabs.com>
References: <076.c0c6252fbd0b46e64e1992decb196d6d@vtiger.fosslabs.com>
Message-ID: <085.78315172a038320d8d05f28cf4550356@vtiger.fosslabs.com>

#1382: Calendar: Start My Calendar Time ..
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  mangai
      Type:  defect     |      Status:  new   
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => mangai

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1382>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 28 10:02:19 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 28 Jun 2006 17:02:19 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231368=3A?=
 =?utf-8?q?_Inactive_Import/Export_button_in_Campaigns_module?=
In-Reply-To: <076.e9c23975424fab1b5c70a96fbb22a0fb@vtiger.fosslabs.com>
References: <076.e9c23975424fab1b5c70a96fbb22a0fb@vtiger.fosslabs.com>
Message-ID: <085.519bb61abaf25c71aa754a9198d47bca@vtiger.fosslabs.com>

#1368: Inactive Import/Export button in Campaigns module
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  ahmed
      Type:  defect     |      Status:  new  
  Priority:  major      |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => ahmed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1368>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 28 10:03:09 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 28 Jun 2006 17:03:09 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231383=3A?=
 =?utf-8?q?_Usage_of_=22Faq=22_module_name?=
In-Reply-To: <076.2e1bf80fcff6a7f829a7cb26e55a7836@vtiger.fosslabs.com>
References: <076.2e1bf80fcff6a7f829a7cb26e55a7836@vtiger.fosslabs.com>
Message-ID: <085.4d3c8f36ccb4e8c701c956c0f5bd1f55@vtiger.fosslabs.com>

#1383: Usage of "Faq" module name
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  ahmed
      Type:  defect     |      Status:  new  
  Priority:  major      |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => ahmed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1383>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 28 10:03:29 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 28 Jun 2006 17:03:29 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231384=3A?=
	=?utf-8?q?_RSS_-_RHS_Image?=
In-Reply-To: <076.6dc4261cd0c8a5800f9a2fc04552b1d0@vtiger.fosslabs.com>
References: <076.6dc4261cd0c8a5800f9a2fc04552b1d0@vtiger.fosslabs.com>
Message-ID: <085.dd3a288e141526a8d84e56b127eeb194@vtiger.fosslabs.com>

#1384: RSS - RHS Image
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  saint
      Type:  defect     |      Status:  new  
  Priority:  major      |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => saint

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1384>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 28 10:04:27 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 28 Jun 2006 17:04:27 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231385=3A?=
 =?utf-8?q?_Tool_bar_icons_-_Page_opens_at_different_palces?=
In-Reply-To: <076.a97c3862753f2ecb63d9e35d91c10490@vtiger.fosslabs.com>
References: <076.a97c3862753f2ecb63d9e35d91c10490@vtiger.fosslabs.com>
Message-ID: <085.4c2e659f980aa2155567bb9b6bb5d901@vtiger.fosslabs.com>

#1385: Tool bar icons - Page opens at different palces
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  ela  
      Type:  defect     |      Status:  new  
  Priority:  major      |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => ela

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1385>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 09:53:52 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 16:53:52 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7652 -
 /vtigercrm/trunk/modules/Users/savetermsandconditions.php
Message-ID: <20060628165352.B78C583FDBF@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 28 10:53:44 2006
New Revision: 7652

Log:
Added vtiger_ in getUniqueID function parameter

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 Wed Jun 28 10:53:44 2006
@@ -19,7 +19,7 @@
 $inv_id = $adb->query_result($result,0,'id');
 if($inv_id == '')
 {
-        $inv_id=$adb->getUniqueID('inventory_tandc');
+        $inv_id=$adb->getUniqueID('vtiger_inventory_tandc');
         $sql="insert into vtiger_inventory_tandc values( '".$inv_id ."','".$inv_type."','". $inv_tandc."')";
 }
 else



From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 28 09:58:42 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 28 Jun 2006 16:58:42 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231375=3A?=
 =?utf-8?q?_Ajax_Chat_window_need_to_be_improved?=
In-Reply-To: <076.9a61ff39258b85bdf4e662518c1eefac@vtiger.fosslabs.com>
References: <076.9a61ff39258b85bdf4e662518c1eefac@vtiger.fosslabs.com>
Message-ID: <085.ba6e6ba8624f0aba73e99837a1ef54f8@vtiger.fosslabs.com>

#1375: Ajax Chat window need to be improved
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  ela  
      Type:  defect     |      Status:  new  
  Priority:  blocker    |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => ela

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1375>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 28 10:00:32 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 28 Jun 2006 17:00:32 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231371=3A?=
 =?utf-8?q?_Campaigns_Custom_View=3A_Double_Veritcal_scrolling?=
In-Reply-To: <076.95f3ca699904fad0d589b89d3722d2c1@vtiger.fosslabs.com>
References: <076.95f3ca699904fad0d589b89d3722d2c1@vtiger.fosslabs.com>
Message-ID: <085.cdcf78651fb175c8a1ad58ab158ad5ac@vtiger.fosslabs.com>

#1371: Campaigns Custom View: Double Veritcal scrolling
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  ela  
      Type:  defect     |      Status:  new  
  Priority:  critical   |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => ela

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1371>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 28 23:04:52 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 29 Jun 2006 06:04:52 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231341=3A?=
	=?utf-8?q?_Mail_Merge_Templates?=
In-Reply-To: <076.b35680daa00096d0d2e99844d8d6d426@vtiger.fosslabs.com>
References: <076.b35680daa00096d0d2e99844d8d6d426@vtiger.fosslabs.com>
Message-ID: <085.de1d9664dc695c02c8442f7a923b9fdc@vtiger.fosslabs.com>

#1341: Mail Merge Templates
--------------------------+-------------------------------------------------
  Reporter:  anonymous    |       Owner:  ahmed
      Type:  enhancement  |      Status:  new  
  Priority:  major        |   Milestone:       
 Component:  vtigercrm    |     Version:  5.0.0
Resolution:               |    Keywords:       
--------------------------+-------------------------------------------------
Changes (by jerrydgeorge):

  * owner:  developer => ahmed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1341>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 23:06:44 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 29 Jun 2006 06:06:44 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7656 -
	/vtigercrm/trunk/modules/Quotes/DetailView.php
Message-ID: <20060629060644.6D045772499@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 29 00:06:40 2006
New Revision: 7656

Log:
* Modified the SINGLE_MOD value from ['Quote'] to 'Quote'

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 Thu Jun 29 00:06:40 2006
@@ -62,7 +62,7 @@
 
 $smarty->assign("CUSTOMFIELD", $cust_fld);
 $smarty->assign("ID", $_REQUEST['record']);
-$smarty->assign("SINGLE_MOD",$app_strings['Quote']);
+$smarty->assign("SINGLE_MOD",'Quote');
 $category = getParentTab();
 $smarty->assign("CATEGORY",$category);
 



From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 29 01:55:29 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 29 Jun 2006 08:55:29 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231369=3A?=
 =?utf-8?q?_Campaigns=3A_Column_Sorting_is_missing?=
In-Reply-To: <076.905324df51cc4ae1000ffb348c83fce2@vtiger.fosslabs.com>
References: <076.905324df51cc4ae1000ffb348c83fce2@vtiger.fosslabs.com>
Message-ID: <085.2167679bc47dee7a21e12328cfa48175@vtiger.fosslabs.com>

#1369: Campaigns: Column Sorting is missing
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  philip
      Type:  defect     |      Status:  closed
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by saraj):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 (In [7657]) sorting added for  all columns in default view. Fixes #1369.

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1369>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 29 01:55:30 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 29 Jun 2006 08:55:30 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7657 -
	/vtigercrm/trunk/modules/Campaigns/Campaign.php
Message-ID: <20060629085530.AC8AE772583@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 29 02:55:25 2006
New Revision: 7657

Log:
sorting added for  all columns in default view. Fixes #1369.

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 Jun 29 02:55:25 2006
@@ -30,7 +30,7 @@
 	var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_campaign'=>'campaignid','vtiger_campaignscf'=>'campaignid');
 	var $column_fields = Array();
 
-	var $sortby_fields = Array('campaignname','smownerid','expectedcost');
+	var $sortby_fields = Array('campaignname','smownerid','campaigntype','product_id','expectedrevenue','closingdate','campaignstatus','expectedresponse','targetaudience');
 
 	var $list_fields = Array(
 					'Campaign Name'=>Array('campaign'=>'campaignname'),



From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 29 02:18:01 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 29 Jun 2006 09:18:01 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231012=3A?=
 =?utf-8?q?_HelpDesk_-_Detail_View_UI_problem?=
In-Reply-To: <076.b198b1e865f9e93c599c9d928fe197d4@vtiger.fosslabs.com>
References: <076.b198b1e865f9e93c599c9d928fe197d4@vtiger.fosslabs.com>
Message-ID: <085.b7d306f29a5bc332c47daf8ad178a3b3@vtiger.fosslabs.com>

#1012: HelpDesk - Detail View UI problem
------------------------+---------------------------------------------------
  Reporter:  saraj      |       Owner:  mangay             
      Type:  defect     |      Status:  closed             
  Priority:  major      |   Milestone:                     
 Component:  vtigercrm  |     Version:  5.0.0              
Resolution:  wontfix    |    Keywords:  helpdesk detailview
------------------------+---------------------------------------------------
Changes (by mangai):

  * resolution:  => wontfix
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1012>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 29 02:50:27 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 29 Jun 2006 09:50:27 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231377=3A?=
 =?utf-8?q?_Error_Message_in_Emails_module?=
In-Reply-To: <076.f36d424ef8cb55fbe8cd894d788526eb@vtiger.fosslabs.com>
References: <076.f36d424ef8cb55fbe8cd894d788526eb@vtiger.fosslabs.com>
Message-ID: <085.d3719d3fca9361b3fa19edc1295a611a@vtiger.fosslabs.com>

#1377: Error Message in Emails module
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  developer
      Type:  defect     |      Status:  closed   
  Priority:  blocker    |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:  fixed      |    Keywords:           
------------------------+---------------------------------------------------
Comment (by richie):

 (In [7658]) changes made by mmbrich reverted as Listview issue in emails
 has been fixed by enabling allflag .Fixes #1377

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1377>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 29 02:50:28 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 29 Jun 2006 09:50:28 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7658 -
	/vtigercrm/trunk/include/utils/ListViewUtils.php
Message-ID: <20060629095028.CA5A4772805@vtiger.fosslabs.com>

Author: richie
Date: Thu Jun 29 03:50:23 2006
New Revision: 7658

Log:
changes made by mmbrich reverted as Listview issue in emails has been fixed by enabling allflag .Fixes #1377 

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 Thu Jun 29 03:50:23 2006
@@ -368,7 +368,7 @@
 	{
 		$end = $noofrows;
 	}
-	if($paging != 0) {$paging = ceil ($noofrows / $limit);}
+	$paging = ceil ($noofrows / $limit);
 	// Display the navigation
 	if ($display > 1) {
 		$previous = $display - 1;



From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 29 03:24:56 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 29 Jun 2006 10:24:56 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231357=3A?=
 =?utf-8?q?_Activity_History_missing_in_Products_and_HelpDesk_Related_List?=
In-Reply-To: <076.c812704daaa1c7137cf696dc99c6d8cd@vtiger.fosslabs.com>
References: <076.c812704daaa1c7137cf696dc99c6d8cd@vtiger.fosslabs.com>
Message-ID: <085.b9b33472fed12b5d409334f3249eaa66@vtiger.fosslabs.com>

#1357: Activity History missing in Products and HelpDesk Related List
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  philip
      Type:  defect     |      Status:  closed
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by saraj):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 (In [7659]) Activites removed from product related list. Fixes #1357.

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1357>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 29 03:24:57 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 29 Jun 2006 10:24:57 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7659 -
 /vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
Message-ID: <20060629102457.3D7698389C1@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 29 04:24:49 2006
New Revision: 7659

Log:
Activites removed from product related list. Fixes #1357.

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

Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original)
+++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Thu Jun 29 04:24:49 2006
@@ -1709,10 +1709,6 @@
 
 	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Products").",".getTabid("HelpDesk").",'get_tickets',1,'HelpDesk',0)");
 
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Products").",".getTabid("Activities").",'get_activities',2,'Activities',0)");
-
-	
 	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Products").",0,'get_attachments',3,'Attachments',0)");
 	
 	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Products").",".getTabid("Quotes").",'get_quotes',4,'Quotes',0)");



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 29 03:31:52 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 29 Jun 2006 10:31:52 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7660 -
	/vtigercrm/trunk/include/js/ListView.js
Message-ID: <20060629103152.55C558389C1@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 29 04:31:47 2006
New Revision: 7660

Log:
Updated listview js file with an if check that gets rid of inconsistency in list view button - ahmed

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

Modified: vtigercrm/trunk/include/js/ListView.js
==============================================================================
--- vtigercrm/trunk/include/js/ListView.js (original)
+++ vtigercrm/trunk/include/js/ListView.js Thu Jun 29 04:31:47 2006
@@ -11,7 +11,10 @@
 {
 	var select_options  =  document.getElementsByName('selected_id');
 	var x = select_options.length;
-	var viewid = document.massdelete.viewname.value;
+	if(typeof(document.massdelete.viewname) != 'undefined')
+		var viewid = document.massdelete.viewname.value;
+	else
+		var viewid ='';		
 	idstring = "";
 
 	xx = 0;
@@ -38,8 +41,12 @@
 {
 		var select_options  =  document.getElementsByName('selected_id');
 		var x = select_options.length;
-		var viewid = document.massdelete.viewname.value;
-        idstring = "";
+		if(typeof(document.massdelete.viewname) != 'undefined')
+			var viewid = document.massdelete.viewname.value;
+		else
+			var viewid ='';		
+
+		idstring = "";
 
         xx = 0;
         for(i = 0; i < x ; i++)



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 29 04:37:05 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 29 Jun 2006 11:37:05 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7661 - in /vtigercrm/trunk:
 Popup.php Smarty/templates/Popup.tpl Smarty/templates/PopupContents.tpl
Message-ID: <20060629113705.926D6772800@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 29 05:36:59 2006
New Revision: 7661

Log:
* Modified to handle the popuptype after made search

Modified:
    vtigercrm/trunk/Popup.php
    vtigercrm/trunk/Smarty/templates/Popup.tpl
    vtigercrm/trunk/Smarty/templates/PopupContents.tpl

Modified: vtigercrm/trunk/Popup.php
==============================================================================
--- vtigercrm/trunk/Popup.php (original)
+++ vtigercrm/trunk/Popup.php Thu Jun 29 05:36:59 2006
@@ -296,7 +296,7 @@
 $navigationOutput = getTableHeaderNavigation($navigation_array, $url_string,$currentModule,"Popup");
 $smarty->assign("NAVIGATION", $navigationOutput);
 $smarty->assign("RECORD_COUNTS", $record_string);
-$smarty->assign("POPUP_TYPE", $popuptype);
+$smarty->assign("POPUPTYPE", $popuptype);
 
 
 if(isset($_REQUEST['ajax']) && $_REQUEST['ajax'] != '')

Modified: vtigercrm/trunk/Smarty/templates/Popup.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Popup.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Popup.tpl Thu Jun 29 05:36:59 2006
@@ -51,6 +51,7 @@
 					<input type="hidden" name="curr_row" value="{$CURR_ROW}">
 					<input type="hidden" name="fldname_pb" value="{$FIELDNAME}">
 					<input type="hidden" name="productid_pb" value="{$PRODUCTID}">
+					<input name="popuptype" id="popup_type" type="hidden" value="{$POPUPTYPE}">
 
 				</td>
 				<td width="20%" class="dvtCellLabel">

Modified: vtigercrm/trunk/Smarty/templates/PopupContents.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/PopupContents.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/PopupContents.tpl Thu Jun 29 05:36:59 2006
@@ -27,7 +27,7 @@
         <input name="pmodule" type="hidden" value="{$MODULE}">
 		<input type="hidden" name="curr_row" value="{$CURR_ROW}">	
 		<input name="entityid" type="hidden" value="">
-		<input name="popup_type" id="popup_type" type="hidden" value="{$POPUP_TYPE}">
+		<input name="popuptype" id="popup_type" type="hidden" value="{$POPUPTYPE}">
 		<input name="idlist" type="hidden" value="">
 		<div style="overflow:auto;height:334px;">
 		<table style="background-color: rgb(204, 204, 204);" class="small" border="0" cellpadding="5" cellspacing="1" width="100%">



From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 29 04:53:14 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 29 Jun 2006 11:53:14 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231201=3A?=
 =?utf-8?q?_could_not_install_=2Ebin_with_default_apache_and_mysql?=
In-Reply-To: <076.a2a48d622de2b413e928bb5187dbd9ad@vtiger.fosslabs.com>
References: <076.a2a48d622de2b413e928bb5187dbd9ad@vtiger.fosslabs.com>
Message-ID: <085.da70e492f5463cfc4760b2a3f399e46a@vtiger.fosslabs.com>

#1201: could not install .bin with default apache and mysql
------------------------+---------------------------------------------------
  Reporter:  mangai     |       Owner:  Richie
      Type:  defect     |      Status:  closed
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * resolution:  => fixed
  * status:  new => closed

Old description:

> I got the following error in .bin installation with default apache and
> mysql.
>
> compiling imap c-files
>
> ************************ Error **********************
>  Error while installing PHP 5.1.2 Quitting setup ...
> *****************************************************
>
> But .bin and .bin installation with bundled apache and default mysql was
> successful

New description:

 I got the following error in .bin installation with default apache and
 mysql.

 compiling imap c-files

 ************************ Error **********************
  Error while installing PHP 5.1.2 Quitting setup ...
 *****************************************************

 But .bin and .bin installation with bundled apache and default mysql was
 successful


 Richie: The issue was because of improper entry in the httpd.conf file
 which was a result of an error in the .bin script. Has been fixed.

Comment:

 Fixed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1201>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 29 04:53:53 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 29 Jun 2006 11:53:53 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231185=3A?=
 =?utf-8?q?_could_not_install_=2Ebin_with_default_apache_and_bundled_mysql?=
In-Reply-To: <076.6370e2d438c2565f58d0b5d3f57b00ec@vtiger.fosslabs.com>
References: <076.6370e2d438c2565f58d0b5d3f57b00ec@vtiger.fosslabs.com>
Message-ID: <085.ec9f5b77934ed302dc795ce5024e84a6@vtiger.fosslabs.com>

#1185: could not install .bin with default apache and bundled mysql
------------------------+---------------------------------------------------
  Reporter:  mangai     |       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:

 Issue was due to improper .bin script which resulted in proper entry not
 being put into the httpd.conf file.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1185>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 29 05:00:49 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 29 Jun 2006 12:00:49 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231392=3A?=
 =?utf-8?q?_Product_popup_throws_page_not_found_error?=
In-Reply-To: <076.98b6c865c25365846d37f3a61ea7c371@vtiger.fosslabs.com>
References: <076.98b6c865c25365846d37f3a61ea7c371@vtiger.fosslabs.com>
Message-ID: <085.07f4d676e5200077666b3a97261a4cbb@vtiger.fosslabs.com>

#1392: Product popup throws page not found error
------------------------+---------------------------------------------------
  Reporter:  mickie     |       Owner:  mickie
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mickie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 This issue has been fixed.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1392>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 29 05:31:26 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 29 Jun 2006 12:31:26 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7662 -
 /vtigercrm/trunk/modules/Users/language/en_us.lang.php
Message-ID: <20060629123127.4B10083FD77@vtiger.fosslabs.com>

Author: richie
Date: Thu Jun 29 06:30:58 2006
New Revision: 7662

Log:
New UI for Users has been integrated

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

Modified: vtigercrm/trunk/modules/Users/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Users/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Users/language/en_us.lang.php Thu Jun 29 06:30:58 2006
@@ -240,7 +240,8 @@
 // Added fields in detailViewmailtemplate.html,listgroupmembers.php,listgroups.php
 'LBL_DETAIL_VIEW_OF_EMAIL_TEMPLATE'=>'Detail View of Email Template',
 'LBL_DETAIL_VIEW'=>'Detail View of',
-'LBL_EDIT_VIEW'=>'Edit View of',
+'LBL_EDIT_VIEW'=>'Editing details of the user',
+'LBL_EDITING'=>'Editing user',
 'LBL_GROUP_MEMBERS_LIST'=>'Group members list',
 'LBL_GROUPS'=>'Groups',
 'LBL_ADD_GROUP_BUTTON'=>'Add Group',
@@ -572,6 +573,7 @@
 'LBL_HIDE'=>'Hide',
 'LBL_HOME_PAGE_COMP'=>'Home Page Components',
 'LBL_LOGIN_HISTORY'=>'Login History',
+'LBL_USERDETAIL_INFO'=>'Viewing details about the user',
 );
 
 ?>



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 29 05:31:44 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 29 Jun 2006 12:31:44 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7663 - in
 /vtigercrm/trunk/modules/Users: DetailView.php EditView.php ListView.php
 LoginHistory.php ShowHistory.php User.php UserGroups.php
Message-ID: <20060629123144.DA95B83F3F2@vtiger.fosslabs.com>

Author: richie
Date: Thu Jun 29 06:30:44 2006
New Revision: 7663

Log:
New UI for Users has been integrated

Added:
    vtigercrm/trunk/modules/Users/UserGroups.php
Modified:
    vtigercrm/trunk/modules/Users/DetailView.php
    vtigercrm/trunk/modules/Users/EditView.php
    vtigercrm/trunk/modules/Users/ListView.php
    vtigercrm/trunk/modules/Users/LoginHistory.php
    vtigercrm/trunk/modules/Users/ShowHistory.php
    vtigercrm/trunk/modules/Users/User.php

Modified: vtigercrm/trunk/modules/Users/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DetailView.php (original)
+++ vtigercrm/trunk/modules/Users/DetailView.php Thu Jun 29 06:30:44 2006
@@ -83,10 +83,6 @@
 require_once($theme_path.'layout_utils.php');
 
 //the user might belong to multiple groups
-if($focus->id != 1)
-{
- $groupids = fetchUserGroupids($focus->id);
-}
 $log->info("User detail view");
 
 $category = getParenttab();
@@ -99,7 +95,7 @@
 $smarty->assign("MOD", $smod_strings);
 
 $smarty->assign("APP", $app_strings);
-
+$smarty->assign("GROUP_COUNT",count(getGroupDetails($focus->id)));
 $smarty->assign("THEME", $theme);
 $smarty->assign("IMAGE_PATH", $image_path);$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']);
 $smarty->assign("ID", $focus->id);
@@ -139,16 +135,9 @@
 	$buttons = "<input title='".$app_strings['LBL_EDIT_BUTTON_TITLE']."' accessKey='".$app_strings['LBL_EDIT_BUTTON_KEY']."' class='crmButton small edit' onclick=\"this.form.return_module.value='Users'; this.form.return_action.value='DetailView'; this.form.return_id.value='$focus->id'; this.form.action.value='EditView'; this.form.parenttab.value='$parenttab'\" type='submit' name='Edit' value='  ".$app_strings['LBL_EDIT_BUTTON_LABEL']."  '>";
 	$smarty->assign('EDIT_BUTTON',$buttons);
 	
-		$buttons = "<input title='".$mod_strings['LBL_CHANGE_PASSWORD_BUTTON_TITLE']."' accessKey='".$mod_strings['LBL_CHANGE_PASSWORD_BUTTON_KEY']."' class='classBtn' LANGUAGE=javascript onclick='return window.open(\"index.php?module=Users&action=ChangePassword&form=DetailView\",\"test\",\"width=320,height=165,resizable=no,scrollbars=0, toolbar=no, titlebar=no, left=100, top=126, screenX=100, screenY=126\");' type='button' name='password' value='".$mod_strings['LBL_CHANGE_PASSWORD_BUTTON_LABEL']."'>";
+		$buttons = "<input title='".$mod_strings['LBL_CHANGE_PASSWORD_BUTTON_TITLE']."' accessKey='".$mod_strings['LBL_CHANGE_PASSWORD_BUTTON_KEY']."' class='crmButton password small' LANGUAGE=javascript onclick='return window.open(\"index.php?module=Users&action=ChangePassword&form=DetailView\",\"test\",\"width=320,height=165,resizable=no,scrollbars=0, toolbar=no, titlebar=no, left=200, top=226, screenX=100, screenY=126\");' type='button' name='password' value='".$mod_strings['LBL_CHANGE_PASSWORD_BUTTON_LABEL']."'>";
 		$smarty->assign('CHANGE_PW_BUTTON',$buttons);
 	
-	$buttons = "<input title='".$mod_strings['LBL_LOGIN_HISTORY_BUTTON_TITLE']."' accessKey='".$mod_strings['LBL_LOGIN_HISTORY_BUTTON_KEY']."' class='classBtn' onclick=\"this.form.return_module.value='Users'; this.form.return_action.value='ShowHistory'; this.form.return_id.value='$focus->id'; this.form.action.value='ShowHistory'\" type='submit' name='LoginHistory' value=' ".$mod_strings['LBL_LOGIN_HISTORY_BUTTON_LABEL']." '>";	
-	$smarty->assign('LOGIN_HISTORY_BUTTON',$buttons);
-	$buttons = "<input title='".$mod_strings['LBL_LIST_MAILSERVER_BUTTON_TITLE']."' accessKey='".$mod_strings['LBL_LIST_MAILSERVER_BUTTON_KEY']."' class='classBtn' onclick=\"this.form.return_module.value='Users'; this.form.return_action.value='ListMailAccount'; this.form.return_id.value='$focus->id'; this.form.module.value='Settings' ;this.form.action.value='ListMailAccount'\" type='submit' name='ListMailServerAccount' value=' ".$mod_strings['LBL_LIST_MAILSERVER_BUTTON_LABEL']." '>";
-	$smarty->assign('LIST_MAILSERVER_BUTTON',$buttons);
-	$buttons = "<input title='".$mod_strings['LBL_CHANGE_HOMEPAGE_TITLE']."' class='classBtn' align='center' onclick=\"this.form.return_module.value='Users';  this.form.return_action.value='DetailView';  this.form.action.value='EditHomeOrder';  this.form.record.value='$focus->id';\"  type='submit' name='EditHomeOrder'  value='  ".$mod_strings['LBL_CHANGE_HOMEPAGE_LABEL']."  '>";
-	$smarty->assign('CHANGE_HOMEPAGE_BUTTON',$buttons);
-
 	
 }
 if (is_admin($current_user)) 
@@ -184,7 +173,7 @@
 $smarty->assign("CURRENT_USERID", $current_user->id);
 $smarty->assign("HOMEORDER",$focus->getHomeOrder($focus->id));
 $smarty->assign("BLOCKS", getBlocks($currentModule,"detail_view",'',$focus->column_fields));
-
+$smarty->assign("USERNAME",$focus->last_name.' '.$focus->first_name);
 
 $smarty->display("UserDetailView.tpl");
 

Modified: vtigercrm/trunk/modules/Users/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/Users/EditView.php (original)
+++ vtigercrm/trunk/modules/Users/EditView.php Thu Jun 29 06:30:44 2006
@@ -43,6 +43,7 @@
 	$mode='edit';
 	if (!is_admin($current_user) && $_REQUEST['record'] != $current_user->id) die ("Unauthorized access to user administration.");
     $focus->retrieve_entity_info($_REQUEST['record'],'Users');
+	$smarty->assign("USERNAME",$focus->last_name.' '.$focus->first_name);
 }else
 {
 	$mode='create';
@@ -110,6 +111,6 @@
 
 $smarty->assign('PARENTTAB',$_REQUEST['parenttab']);
 
-	$smarty->display('UserEditView.tpl');
+$smarty->display('UserEditView.tpl');
 
 ?>

Modified: vtigercrm/trunk/modules/Users/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Users/ListView.php (original)
+++ vtigercrm/trunk/modules/Users/ListView.php Thu Jun 29 06:30:44 2006
@@ -59,10 +59,7 @@
 $list_query .= ' ORDER BY '.$order_by.' '.$sorder;
 $list_result = $adb->query($list_query);
 //Retreive the Navigation array
-$navigation_array = getNavigationValues($start, $no_of_users['user'], '10');
-$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] ." ".$no_of_users['user'];
+$navigation_array = getNavigationValues($start, $adb->num_rows($list_result), $no_of_users['user']);
 
 $navigationOutput = getTableHeaderNavigation($navigation_array, $url_string,"Administration","index",'');
 $smarty->assign("MOD", return_module_language($current_language,'Settings'));

Modified: vtigercrm/trunk/modules/Users/LoginHistory.php
==============================================================================
--- vtigercrm/trunk/modules/Users/LoginHistory.php (original)
+++ vtigercrm/trunk/modules/Users/LoginHistory.php Thu Jun 29 06:30:44 2006
@@ -18,7 +18,7 @@
 require_once('include/database/PearDatabase.php');
 
 // Contact is used to store customer information.
-class LoginHistory extends SugarBean {
+class LoginHistory {
 	var $log;
 	var $db;
 
@@ -51,11 +51,77 @@
 		$this->db = new PearDatabase();
 	}
 	
+	var $sortby_fields = Array('user_name', 'user_ip', 'login_time', 'logout_time', 'status');	 
+       	
 	// This is the list of vtiger_fields that are in the lists.
-	var $list_fields = Array('login_id', 'user_name', 'user_ip', 'login_time', 'logout_time', 'status');	
+	var $list_fields = Array(
+			'User Name'=>Array('vtiger_loginhistory'=>'user_name'), 
+			'User IP'=>Array('vtiger_loginhistory'=>'user_ip'), 
+			'Signin Time'=>Array('vtiger_loginhistory'=>'login_time'),
+		        'Signout Time'=>Array('vtiger_loginhistory'=>'logout_time'), 
+			'Status'=>Array('vtiger_loginhistory'=>'status'),
+		);	
+	
+	var $list_fields_name = Array(
+		'User Name'=>'user_name',
+		'User IP'=>'user_ip',
+		'Signin Time'=>'login_time',
+		'Signout Time'=>'logout_time',
+		'Status'=>'status'
+		);	
+	var $default_order_by = "login_time";
+	var $default_sort_order = 'DESC';
+
+
+	function getHistoryListViewHeader()
+	{
+		global $app_strings;
 		
-	var $default_order_by = "login_id";
+		$header_array = array($app_strings['LBL_LIST_USER_NAME'], $app_strings['LBL_LIST_USERIP'], $app_strings['LBL_LIST_SIGNIN'], $app_strings['LBL_LIST_SIGNOUT'], $app_strings['LBL_LIST_STATUS']);
 
+		return $header_array;
+		
+	}
+
+	function getHistoryListViewEntries($navigation_array, $sorder='', $orderby='')
+	{
+		global $adb, $current_user;	
+
+		if($sorder != '' && $order_by != '')
+		{
+			if(is_admin($current_user))
+	       			$list_query = "Select * from vtiger_loginhistory order by ".$order_by." ".$sorder;
+			else	
+	       			$list_query = "Select * from vtiger_loginhistory where user_name=".$current_user->user_name." order by ".$order_by." ".$sorder;
+				
+		}	
+		else
+		{
+			if(is_admin($current_user))
+				$list_query = "Select * from vtiger_loginhistory order by ".$this->default_order_by." ".$this->default_sort_order;
+			else	
+				$list_query = "Select * from vtiger_loginhistory where user_name='".$current_user->user_name."' order by ".$this->default_order_by." ".$this->default_sort_order;
+				
+		}
+		$result = $adb->query($list_query);
+		$entries_list = array();
+		
+		for($i = $navigation_array['start']; $i <= $navigation_array['end_val']; $i++)
+		{
+			$entries = array();
+			$loginid = $adb->query_result($result, $i-1, 'login_id');
+
+			$entries[] = $adb->query_result($result, $i-1, 'user_name');
+			$entries[] = $adb->query_result($result, $i-1, 'user_ip');
+			$entries[] = $adb->query_result($result, $i-1, 'login_time');
+			$entries[] = $adb->query_result($result, $i-1, 'logout_time');
+			$entries[] = $adb->query_result($result, $i-1, 'status');
+
+			$entries_list[] = $entries;
+		}		
+		return $entries_list;
+		
+	}
 	
 	/** Records the Login info */
 	function user_login(&$usname,&$usip,&$intime)

Modified: vtigercrm/trunk/modules/Users/ShowHistory.php
==============================================================================
--- vtigercrm/trunk/modules/Users/ShowHistory.php (original)
+++ vtigercrm/trunk/modules/Users/ShowHistory.php Thu Jun 29 06:30:44 2006
@@ -9,13 +9,12 @@
  * All Rights Reserved.
  ********************************************************************************/
 
-require_once('XTemplate/xtpl.php');
+require_once('Smarty_setup.php');
 require_once('data/Tracker.php');
 require_once('modules/Users/LoginHistory.php');
 require_once('modules/Users/User.php');
 require_once('themes/'.$theme.'/layout_utils.php');
 require_once('include/logging.php');
-require_once('include/ListView/ListView.php');
 require_once('include/database/PearDatabase.php');
 #require_once('modules/Users/User.php');
 require_once('include/utils/utils.php');
@@ -23,7 +22,7 @@
 global $app_strings;
 global $mod_strings;
 global $app_list_strings;
-global $current_language;
+global $current_language, $current_user, $adb;
 $current_module_strings = return_module_language($current_language, 'Users');
 
 global $list_max_entries_per_page;
@@ -34,28 +33,54 @@
 global $currentModule;
 
 global $theme;
+$theme_path="themes/".$theme."/";
+$image_path=$theme_path."images/";
 
-$focus = new User();
+$focus = new LoginHistory();
 
-if(isset($_REQUEST['record'])) {
-	$focus->retrieve_entity_info($_REQUEST['record'],"Users");
+$smarty = new vtigerCRM_Smarty;
+
+$category = getParenttab();
+
+if(is_admin($current_user))
+{
+	$qry = "Select * from vtiger_loginhistory";
+	$qry_result = $adb->query($qry);
+	$no_of_rows = $adb->num_rows($qry_result);
 }
-if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') {
-	$focus->id = "";
+else
+{
+	$qry = "Select * from vtiger_loginhistory where user_name='".$current_user->user_name."'";
+	$qry_result = $adb->query($qry);
+	$no_of_rows = $adb->num_rows($qry_result);
 }
 
-// focus_list is the means of passing data to a ListView.
-global $focus_list;
+//Retreiving the start value from request
+if(isset($_REQUEST['start']) && $_REQUEST['start'] != '')
+{
+        $start = $_REQUEST['start'];
+}
+else
+	$start=1;
 
-if (!isset($where)) $where = "";
+//Retreive the Navigation array
+$navigation_array = getNavigationValues($start, $no_of_rows, '10');
 
-$seedLogin = new LoginHistory();
 
-$ListView = new ListView();
-$ListView->initNewXTemplate('modules/Users/ShowHistory.html',$current_module_strings);
-$ListView->setHeaderTitle($current_module_strings['LBL_LOGIN_HISTORY_BUTTON_LABEL']);
-$ListView->setHeaderText($button);
-$ListView->setQuery($where, "", "login_id", "LOGIN");
-$ListView->processListView($seedLogin, "main", "LOGIN");
+$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] ." ".$no_of_rows;
 
+$navigationOutput = getTableHeaderNavigation($navigation_array, $url_string,"Users","ShowHistory",'');
+
+$smarty->assign("MOD", $current_module_strings);
+$smarty->assign("APP", $app_strings);
+$smarty->assign("IMAGE_PATH",$image_path);
+$smarty->assign("LIST_HEADER",$focus->getHistoryListViewHeader());
+$smarty->assign("LIST_ENTRIES",$focus->getHistoryListViewEntries($navigation_array, $sorder, $sortby));
+$smarty->assign("RECORD_COUNTS", $record_string);
+$smarty->assign("NAVIGATION", $navigationOutput);
+$smarty->assign("CATEGORY",$category);
+
+$smarty->display("ShowHistoryContents.tpl");
 ?>

Modified: vtigercrm/trunk/modules/Users/User.php
==============================================================================
--- vtigercrm/trunk/modules/Users/User.php (original)
+++ vtigercrm/trunk/modules/Users/User.php Thu Jun 29 06:30:44 2006
@@ -861,19 +861,6 @@
 			return GetRelatedList('Users','Activities',$focus,$query,$button,$returnset);
         }
 
-function get_user_groups($id)
-{
-		global $log;
-                        $log->debug("Entering get_contacts(".$id.") method ...");
-			global $app_strings;
-			$button = '';
-			$query = 'select vtiger_users.*,vtiger_groups.* from vtiger_users inner join vtiger_users2group on vtiger_users.id=vtiger_users2group.userid left join vtiger_groups on vtiger_groups.groupid=vtiger_users2group.groupid where vtiger_users.id='.$id;
-			$log->debug("Exiting get_contacts method ...");
-			return getAllGroupInfo($query);
-			}
-
-
-	
 	function save($module_name) 
 	{
 		global $log;



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 29 05:32:38 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 29 Jun 2006 12:32:38 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7664 - in
 /vtigercrm/trunk/include/utils: CommonUtils.php DetailViewUtils.php
 UserInfoUtil.php
Message-ID: <20060629123240.44BF183F870@vtiger.fosslabs.com>

Author: richie
Date: Thu Jun 29 06:32:03 2006
New Revision: 7664

Log:
Changes made as the New UI for Users has been integrated

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

Modified: vtigercrm/trunk/include/utils/CommonUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/CommonUtils.php (original)
+++ vtigercrm/trunk/include/utils/CommonUtils.php Thu Jun 29 06:32:03 2006
@@ -952,12 +952,12 @@
 	{
 		if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0 || $module == "Users")
 		{
-			$sql = "select vtiger_field.* from vtiger_field where vtiger_field.tabid=".$tabid." and vtiger_field.block in $blockid_list and vtiger_field.displaytype in (1,2) order by block,sequence";
+			$sql = "select vtiger_field.* from vtiger_field where vtiger_field.tabid=".$tabid." and vtiger_field.block in $blockid_list and vtiger_field.displaytype in (1,2,4) order by block,sequence";
 		}
 		else
 		{
 			$profileList = getCurrentUserProfileList();
-			$sql = "select vtiger_field.* from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.tabid=".$tabid." and vtiger_field.block in ".$blockid_list." and vtiger_field.displaytype in (1,2) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList." group by vtiger_field.fieldid order by block,sequence";
+			$sql = "select vtiger_field.* from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.tabid=".$tabid." and vtiger_field.block in ".$blockid_list." and vtiger_field.displaytype in (1,2,4) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList." group by vtiger_field.fieldid order by block,sequence";
 		}
 		$result = $adb->query($sql);
 		$getBlockInfo=getDetailBlockInformation($module,$result,$col_fields,$tabid,$block_label);
@@ -973,7 +973,7 @@
 			else
 			{
 				$profileList = getCurrentUserProfileList();
-				$sql = "select vtiger_field.* from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid  where vtiger_field.tabid=".$tabid." and vtiger_field.block in ".$blockid_list." and vtiger_field.displaytype in (1,4) and info_type = '".$info_type."' and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList.=" group by vtiger_field.fieldid order by block,sequence";
+				$sql = "select vtiger_field.* from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid  where vtiger_field.tabid=".$tabid." and vtiger_field.block in ".$blockid_list." and ".$display_type_check." and info_type = '".$info_type."' and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList.=" group by vtiger_field.fieldid order by block,sequence";
 			}
 		}
 		else
@@ -985,7 +985,7 @@
 			else
 			{
 				$profileList = getCurrentUserProfileList();
-				$sql = "select vtiger_field.* from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid  where vtiger_field.tabid=".$tabid." and vtiger_field.block in ".$blockid_list." and vtiger_field.displaytype in (1,4) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList.=" group by vtiger_field.fieldid order by block,sequence";
+				$sql = "select vtiger_field.* from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid  where vtiger_field.tabid=".$tabid." and vtiger_field.block in ".$blockid_list." and ".$display_type_check." and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList.=" group by vtiger_field.fieldid order by block,sequence";
 			}
 		}
 		$result = $adb->query($sql);

Modified: vtigercrm/trunk/include/utils/DetailViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/DetailViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/DetailViewUtils.php Thu Jun 29 06:32:03 2006
@@ -58,7 +58,13 @@
 
         if($col_fields[$fieldname]=='--None--')
                 $col_fields[$fieldname]='';
-	if($uitype == 116)
+	if($uitype == 99)
+	{
+		$label_fld[] = $mod_strings[$fieldlabel];
+		$label_fld[] = $col_fields[$fieldname];
+		if($fieldname == 'confirm_password')
+			return null;
+	}elseif($uitype == 116)
 	{
 		$label_fld[] = $mod_strings[$fieldlabel];
                 $label_fld[] = getCurrencyName($col_fields[$fieldname]);
@@ -1084,7 +1090,10 @@
 		$generatedtype = $adb->query_result($result,$i,"generatedtype");
 		$tabid = $adb->query_result($result,$i,"tabid");
 		$custfld = getDetailViewOutputHtml($uitype, $fieldname, $fieldlabel, $col_fields,$generatedtype,$tabid);
-		$label_data[$block][] = array($custfld[0]=>array("value"=>$custfld[1],"ui"=>$custfld[2],"options"=>$custfld["options"],"secid"=>$custfld["secid"],"link"=>$custfld["link"],"cursymb"=>$custfld["cursymb"],"salut"=>$custfld["salut"],"cntimage"=>$custfld["cntimage"],"isadmin"=>$custfld["isadmin"],"tablename"=>$fieldtablename,"fldname"=>$fieldname));
+		if(is_array($custfld))
+		{
+			$label_data[$block][] = array($custfld[0]=>array("value"=>$custfld[1],"ui"=>$custfld[2],"options"=>$custfld["options"],"secid"=>$custfld["secid"],"link"=>$custfld["link"],"cursymb"=>$custfld["cursymb"],"salut"=>$custfld["salut"],"cntimage"=>$custfld["cntimage"],"isadmin"=>$custfld["isadmin"],"tablename"=>$fieldtablename,"fldname"=>$fieldname));
+		}
 		$i++;
 		if($i<$noofrows)
 		{
@@ -1099,7 +1108,10 @@
 			$tabid = $adb->query_result($result,$i,"tabid");
 
 			$custfld = getDetailViewOutputHtml($uitype, $fieldname, $fieldlabel, $col_fields,$generatedtype,$tabid);
-			$label_data[$block][] = array($custfld[0]=>array("value"=>$custfld[1],"ui"=>$custfld[2],"options"=>$custfld["options"],"secid"=>$custfld["secid"],"link"=>$custfld["link"],"cursymb"=>$custfld["cursymb"],"salut"=>$custfld["salut"],"cntimage"=>$custfld["cntimage"],"isadmin"=>$custfld["isadmin"],"tablename"=>$fieldtablename,"fldname"=>$fieldname));
+			if(is_array($custfld))
+			{
+				$label_data[$block][] = array($custfld[0]=>array("value"=>$custfld[1],"ui"=>$custfld[2],"options"=>$custfld["options"],"secid"=>$custfld["secid"],"link"=>$custfld["link"],"cursymb"=>$custfld["cursymb"],"salut"=>$custfld["salut"],"cntimage"=>$custfld["cntimage"],"isadmin"=>$custfld["isadmin"],"tablename"=>$fieldtablename,"fldname"=>$fieldname));
+			}
 		}
 
 	}

Modified: vtigercrm/trunk/include/utils/UserInfoUtil.php
==============================================================================
--- vtigercrm/trunk/include/utils/UserInfoUtil.php (original)
+++ vtigercrm/trunk/include/utils/UserInfoUtil.php Thu Jun 29 06:32:03 2006
@@ -2763,6 +2763,30 @@
 
 }
 
+/** Function to get groupid and groupname of all for the given groupid 
+  * @returns $grpArray -- Group Array in the following format:
+  * $grpArray=Array($grpid1=>$grpname); 
+ */
+function getGroupDetails($id)
+{
+	global $log;
+	$log->debug("Entering getAllGroupDetails() method ...");
+	global $adb;
+	$query="select * from vtiger_groups where groupid = $id";
+	$result = $adb->query($query);
+	$num_rows=$adb->num_rows($result);
+	if($num_rows < 1)
+		return null;
+	$group_details=Array();
+	$grpid=$adb->query_result($result,0,'groupid');
+	$grpname=$adb->query_result($result,0,'groupname');
+	$grpdesc=$adb->query_result($result,0,'description');
+	$group_details=Array($grpid,$grpname,$grpdesc);
+		
+	$log->debug("Exiting getAllGroupDetails method ...");
+	return $group_details;
+
+}
 /** Function to get group information of all vtiger_groups 
   * @returns $grpInfoArray -- Group Informaton array in the following format: 
   * $grpInfoArray=Array($grpid1=>Array($grpname,description) $grpid2=>Array($grpname,description),............,$grpidn=>Array($grpname,description)); 



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 29 05:33:36 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 29 Jun 2006 12:33:36 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7665 - in
 /vtigercrm/trunk/Smarty/templates: DetailViewUI.tpl DisplayFields.tpl
 ShowHistoryContents.tpl UserDetailView.tpl UserEditView.tpl UserGroups.tpl
 UserListViewContents.tpl
Message-ID: <20060629123337.3A76F83F8C5@vtiger.fosslabs.com>

Author: richie
Date: Thu Jun 29 06:32:43 2006
New Revision: 7665

Log:
Changes made as the New UI for Users has been integrated

Added:
    vtigercrm/trunk/Smarty/templates/ShowHistoryContents.tpl
    vtigercrm/trunk/Smarty/templates/UserGroups.tpl
Modified:
    vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl
    vtigercrm/trunk/Smarty/templates/DisplayFields.tpl
    vtigercrm/trunk/Smarty/templates/UserDetailView.tpl
    vtigercrm/trunk/Smarty/templates/UserEditView.tpl
    vtigercrm/trunk/Smarty/templates/UserListViewContents.tpl

Modified: vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl Thu Jun 29 06:32:43 2006
@@ -226,6 +226,8 @@
                     <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                     </div>
                     </td>
+						{elseif $keyid eq '99'}<!-- Password Field-->
+						<td width=25% class="dvtCellInfo" align="left">{$CHANGE_PW_BUTTON}</td>	
 					    {elseif $keyid eq '56'} <!--CheckBox--> 
                       <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onMouseOver="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}">{$keyval}&nbsp;</span>
                     	<div id="editarea_{$label}" style="display:none;">

Modified: vtigercrm/trunk/Smarty/templates/DisplayFields.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DisplayFields.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DisplayFields.tpl Thu Jun 29 06:32:43 2006
@@ -489,7 +489,7 @@
 				{else}
 					<td width="30%" align=left class="dvtCellInfo">
 						<input name="{$fldname}" {$disable_status} tabindex="{$vt_tab}" type="checkbox">
-						<input name="{$fldname}" type="hidden" value="{$fldvalue}">
+						<input name="{$fldname}" type="hidden" value="off">
 					</td>
 				{/if}
 		{elseif $uitype eq 98}<!-- Role Selection Popup -->		

Modified: vtigercrm/trunk/Smarty/templates/UserDetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/UserDetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/UserDetailView.tpl Thu Jun 29 06:32:43 2006
@@ -47,9 +47,9 @@
 		<input type="hidden" name="return_id">
 		<input type="hidden" name="forumDisplay">
 		{if $CATEGORY eq 'Settings'}
-			<input type="hidden" name="parenttab" value="{$PARENTTAB}">
+		<input type="hidden" name="parenttab" value="{$PARENTTAB}">
 		{/if}	
-	        <table width="100%" border="0" cellpadding="0" cellspacing="0">
+	        <table width="100%" border="0" cellpadding="0" cellspacing="0" class="settingsSelUITopLine">
 		<tr>
 		    <td style="border-bottom:1px dashed #CCCCCC;">
 			<table width="100%" cellpadding="5" cellspacing="0" border="0">
@@ -57,35 +57,32 @@
 			    <td rowspan="2"><img src="{$IMAGE_PATH}user.gif" align="absmiddle"></td>	
 			    <td>
 			    {if $CATEGORY eq 'Settings'}
-				<span class="lvtHeaderText">
-				<b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS} </a> > {$MOD.LBL_USER_MANAGEMENT} > {$MOD.LBL_USERS}</b></span>
+				<span class="heading2">
+				<b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS} </a> &gt; <a href="index.php?module=Administration&action=index&parenttab=Settings"> {$MOD.LBL_USERS} </a>&gt;"{$USERNAME}" </b></span>
 			    {else}
-				<span class="lvtHeaderText">	
+				<span class="heading2">	
 				<b>{$APP.LBL_MY_PREFERENCES}</b>
 			   	</span>
 			    {/if}
 			    <span id="vtbusy_info" style="display:none;" valign="bottom"><img src="{$IMAGE_PATH}vtbusy.gif" border="0"></span>					
 			    </td>
-			    <td rowspan="2" nowrap>
-				{if $CATEGORY eq 'Settings'}
-                                	{$DUPLICATE_BUTTON}
-                        	{/if}
-				{$EDIT_BUTTON}
+			    <td rowspan="2" nowrap>&nbsp;					
 			    </td>	
 			</tr>
 			<tr>
-			    <td>sssssssssss</td>
+			    <td>{$UMOD.LBL_USERDETAIL_INFO} "{$USERNAME}"</td>
 			</tr>
 		    </table>
 		</td>
 	    </tr>
-	    <tr><td>&nbsp;</td></tr>
-	    <tr valign="center">
-	    	<td class="small" align="center">
-			{$CHANGE_PW_BUTTON}
-			{$LOGIN_HISTORY_BUTTON}
-		</td>
-	    </tr>
+	    <tr><td colspan="2">&nbsp;</td></tr>
+	    <tr>
+		<td rowspan="2" nowrap align="right">
+			{if $CATEGORY eq 'Settings'}
+                               	{$DUPLICATE_BUTTON}
+                       	{/if}
+			{$EDIT_BUTTON}
+		</td>&nbsp;</tr>
 	    <tr><td colspan="2">&nbsp;</td></tr>
 	    <tr>
 		<td colspan="2">
@@ -161,13 +158,32 @@
 			    <table class="tableHeading" border="0" cellpadding="5" cellspacing="0" width="100%">
 			    	<tr>
 				     <td class="big">	
-					<strong>5.{$UMOD.LBL_LOGIN_HISTORY}</strong>
-				     </td>
-				     <td class="small" align="right">&nbsp;</td>	
+					<strong>5.My Groups</strong>
+				     </td>
+				     <td class="small" align="right">
+					{if $GROUP_COUNT > 0}
+					<img src="{$IMAGE_PATH}showDown.gif" alt="{$APP.LBL_EXPAND_COLLAPSE}" title="{$APP.LBL_EXPAND_COLLAPSE}" onClick="fetchGroups_js({$ID});">
+					{else}
+						&nbsp;
+					{/if}
+					</td>	
 			        </tr>
 			    </table>
 			    <table border="0" cellpadding="5" cellspacing="0" width="100%">
-				<tr><td>&nbsp;</td><td></td></tr>	
+				<tr><td align="left"><div id="user_group_cont" style="display:none;"></div></td></tr>	
+			    </table>	
+
+			<br>
+			    <table class="tableHeading" border="0" cellpadding="5" cellspacing="0" width="100%">
+			    	<tr>
+				     <td class="big">	
+					<strong>6.{$UMOD.LBL_LOGIN_HISTORY}</strong>
+				     </td>
+				     <td class="small" align="right"><img src="{$IMAGE_PATH}showDown.gif" alt="{$APP.LBL_EXPAND_COLLAPSE}" title="{$APP.LBL_EXPAND_COLLAPSE}" onClick="fetchlogin_js({$ID});"></td>	
+			        </tr>
+			    </table>
+			    <table border="0" cellpadding="5" cellspacing="0" width="100%">
+				<tr><td align="left"><div id="login_history_cont" style="display:none;"></div></td><td></td></tr>	
 			    </table>	
 
 			</td>
@@ -209,4 +225,70 @@
 	else
 		Effect.Appear(divid);
 {rdelim}
+{literal}
+function fetchlogin_js(id)
+{
+	if($('login_history_cont').style.display != 'none')
+		Effect.Fade('login_history_cont');
+	else
+		fetchLoginHistory(id);
+
+}
+function fetchLoginHistory(id)
+{
+        $("status").style.display="inline";
+        new Ajax.Request(
+                'index.php',
+                {queue: {position: 'end', scope: 'command'},
+                        method: 'post',
+                        postBody: 'module=Users&action=UsersAjax&file=ShowHistory&ajax=true&record='+id,
+                        onComplete: function(response) {
+                                $("status").style.display="none";
+                                $("login_history_cont").innerHTML= response.responseText;
+				Effect.Appear('login_history_cont');
+                        }
+                }
+        );
+
+}
+function fetchGroups_js(id)
+{
+	if($('user_group_cont').style.display != 'none')
+		Effect.Fade('user_group_cont');
+	else
+		fetchUserGroups(id);
+}
+function fetchUserGroups(id)
+{
+        $("status").style.display="inline";
+        new Ajax.Request(
+                'index.php',
+                {queue: {position: 'end', scope: 'command'},
+                        method: 'post',
+                        postBody: 'module=Users&action=UsersAjax&file=UserGroups&ajax=true&record='+id,
+                        onComplete: function(response) {
+                                $("status").style.display="none";
+                                $("user_group_cont").innerHTML= response.responseText;
+				Effect.Appear('user_group_cont');
+                        }
+                }
+        );
+
+}
+function getListViewEntries_js(module,url)
+{
+	$("status").style.display="inline";
+        new Ajax.Request(
+        	'index.php',
+                {queue: {position: 'end', scope: 'command'},
+                	method: 'post',
+                        postBody:"module="+module+"&action="+module+"Ajax&file=ShowHistory&ajax=true&"+url,
+			onComplete: function(response) {
+                        	$("status").style.display="none";
+                                $("login_history_cont").innerHTML= response.responseText;
+                  	}
+                }
+        );
+}
+{/literal}
 </script>

Modified: vtigercrm/trunk/Smarty/templates/UserEditView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/UserEditView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/UserEditView.tpl Thu Jun 29 06:32:43 2006
@@ -61,42 +61,6 @@
 		{include file='SetMenu.tpl'}
 	{/if}
 
-
-	<table width="100%"  border="0" cellspacing="0" cellpadding="0">
-	<tr><td align="left">
-		<table class="settingsSelUITopLine" border="0" cellpadding="5" cellspacing="0" width="100%">
-		<tr>
-			<td rowspan="2"><img src="{$IMAGE_PATH}user.gif" align="absmiddle"></td>
-			<td>	
-				<span class="lvtHeaderText">
-				{if $PARENTTAB neq ''}	
-				<b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS} </a> > {$MOD.LBL_USER_MANAGEMENT} > {$MOD.LBL_USERS}</b></span>
-				{else}
-                                <span class="lvtHeaderText">
-                                <b>{$APP.LBL_MY_PREFERENCES}</b>
-                                </span>
-                                {/if}
-			</td>
-			<td rowspan="2" nowrap>
-				<input title="{$APP.LBL_SAVE_BUTTON_TITLE}" accesskey="{$APP.LBL_SAVE_BUTTON_KEY}" class="small crmbutton save"  name="button" value="  {$APP.LBL_SAVE_BUTTON_LABEL}  "  onclick="this.form.action.value='Save'; return verify_data(EditView)" style="width: 70px;" type="button" />
-				<input title="{$APP.LBL_CANCEL_BUTTON_TITLE}" accesskey="{$APP.LBL_CANCEL_BUTTON_KEY}" class="small crmbutton cancel" name="button" value="  {$APP.LBL_CANCEL_BUTTON_LABEL}  " onclick="window.history.back()" style="width: 70px;" type="button" />
-						
-			</td>
-	 	</tr>
-		<tr>
-			{if $MODE eq 'edit'}
-				<td><span class="genHeaderGrayBig">{$USER_NAME}</span><br>
-				<b class="small">{$UMOD.LBL_EDIT_VIEW} {$FIRST_NAME} {$LAST_NAME}</b>
-			{else}
-				<td><span class="genHeaderGrayBig">{$UMOD.LBL_NEW_USER_BUTTON_LABEL}</span><br>
-				<b class="small">{$UMOD.LBL_CREATE_NEW_USER}</b>
-			{/if}
-			</td>
-                </tr>
-		</table>
-	</td>
-	</tr>
-	<tr><td class="padTab" align="left">
 		<form name="EditView" method="POST" action="index.php" ENCTYPE="multipart/form-data">
 		<input type="hidden" name="module" value="Users">
 		<input type="hidden" name="record" value="{$ID}">
@@ -112,7 +76,52 @@
 		<input type="hidden" name="workdays" value="0,1,2,3,4,5,6,">			
 		<input type="hidden" name="namedays" value="">			
 		<input type="hidden" name="weekstart" value="1">
-		<table width="100%" border="0" cellpadding="0" cellspacing="0">
+
+	<table width="100%"  border="0" cellspacing="0" cellpadding="0" class="settingsSelUITopLine">
+	<tr><td align="left">
+		<table class="settingsSelUITopLine" border="0" cellpadding="5" cellspacing="0" width="100%">
+		<tr>
+			<td rowspan="2"><img src="{$IMAGE_PATH}user.gif" align="absmiddle"></td>
+			<td>	
+				<span class="lvtHeaderText">
+				{if $PARENTTAB neq ''}	
+				<b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS} </a> &gt; <a href="index.php?module=Administration&action=index&parenttab=Settings">{$MOD.LBL_USERS}</a> &gt; 
+					{if $MODE eq 'edit'}
+						{$UMOD.LBL_EDITING} "{$USERNAME}" 
+					{else}
+						{$UMOD.LBL_CREATE_NEW_USER}
+					{/if}
+					</b></span>
+				{else}
+                                <span class="lvtHeaderText">
+                                <b>{$APP.LBL_MY_PREFERENCES}</b>
+                                </span>
+                                {/if}
+			</td>
+			<td rowspan="2" nowrap>&nbsp;
+			</td>
+	 	</tr>
+		<tr>
+			{if $MODE eq 'edit'}
+				<td><b class="small">{$UMOD.LBL_EDIT_VIEW} "{$USERNAME}"</b>
+			{else}
+				<td><b class="small">{$UMOD.LBL_CREATE_NEW_USER}</b>
+			{/if}
+			</td>
+                </tr>
+		</table>
+	</td>
+	</tr>
+	<tr><td>&nbsp;</td></tr>
+	<tr>
+		<td nowrap align="right">
+				<input title="{$APP.LBL_SAVE_BUTTON_TITLE}" accesskey="{$APP.LBL_SAVE_BUTTON_KEY}" class="small crmbutton save"  name="button" value="  {$APP.LBL_SAVE_BUTTON_LABEL}  "  onclick="this.form.action.value='Save'; return verify_data(EditView)" style="width: 70px;" type="button" />
+				<input title="{$APP.LBL_CANCEL_BUTTON_TITLE}" accesskey="{$APP.LBL_CANCEL_BUTTON_KEY}" class="small crmbutton cancel" name="button" value="  {$APP.LBL_CANCEL_BUTTON_LABEL}  " onclick="window.history.back()" style="width: 70px;" type="button" />
+						
+		</td>
+	</tr>
+	<tr><td class="padTab" align="left">
+				<table width="100%" border="0" cellpadding="0" cellspacing="0">
 
 		<tr><td colspan="2">
 			<table align="center" border="0" cellpadding="0" cellspacing="0" width="99%">
@@ -141,7 +150,7 @@
 			    	<table class="tableHeading" border="0" cellpadding="5" cellspacing="0" width="100%">
 			    	<tr>
 				     <td class="big">	
-					<strong>4.sdjhfsjkhfjalkssdjhfsjkhfjalks</strong>
+					<strong>4.{$UMOD.LBL_HOME_PAGE_COMP}</strong>
 				     </td>
 				     <td class="small" align="right">&nbsp;</td>	
 			        </tr>
@@ -164,17 +173,6 @@
 				{/foreach}
 			    	</table>	
 				<br>
-			    	<table class="tableHeading" border="0" cellpadding="5" cellspacing="0" width="100%">
-			    	<tr>
-				     <td class="big">	
-					<strong>5.kssdjhfsjkhfjalks</strong>
-				     </td>
-				     <td class="small" align="right">&nbsp;</td>	
-			        </tr>
-			    	</table>
-			    	<table border="0" cellpadding="5" cellspacing="0" width="100%">
-					<tr><td>&nbsp;</td><td></td></tr>	
-			    	</table>	
 				<tr><td colspan=4>&nbsp;</td></tr>
 							
 					        <tr>
@@ -192,10 +190,10 @@
 				  </td></tr>
 				<tr><td class="small"><div align="right"><a href="#top">{$MOD.LBL_SCROLL}</a></div></td></tr>
 				</table>
-				</form>	
 			</td>
 			</tr>
 			</table>
+			</form>	
 </td>
 </tr>
 </table>

Modified: vtigercrm/trunk/Smarty/templates/UserListViewContents.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/UserListViewContents.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/UserListViewContents.tpl Thu Jun 29 06:32:43 2006
@@ -25,11 +25,12 @@
 	{foreach name=userlist item=listvalues key=userid from=$LIST_ENTRIES}
 <tr>
 	<td class="listTableRow small" valign=top>{$smarty.foreach.userlist.iteration}</td>
-	<td class="listTableRow small" valign=top><a href="index.php?action=EditView&return_action=ListView&return_module=Users&module=Users&parenttab=Settings&record={$userid}"><img src="{$IMAGE_PATH}editfield.gif" alt="Edit" title="Edit" border="0"></a>&nbsp;
+	<td class="listTableRow small" nowrap valign=top><a href="index.php?action=EditView&return_action=ListView&return_module=Users&module=Users&parenttab=Settings&record={$userid}"><img src="{$IMAGE_PATH}settingsActBtnEdit.gif" alt="{$APP.LBL_EDIT_BUTTON}" title="{$APP.LBL_EDIT_BUTTON}" border="0"></a>
 	{if $userid neq 1 && $userid neq 2}	
-	<img src="{$IMAGE_PATH}delete.gif" onclick="deleteUser('{$userid}')" border="0"  alt="Delete" title="Delete"/></a>
+	<img src="{$IMAGE_PATH}settingsActBtnDelete.gif" onclick="deleteUser('{$userid}')" border="0"  alt="{$APP.LBL_DELETE_BUTTON}" title="{$APP.LBL_DELETE_BUTTON}" style="cursor:pointer;"/></a>
 	{/if}
-&nbsp;</td>
+	<a href="index.php?action=EditView&return_action=ListView&return_module=Users&module=Users&parenttab=Settings&record={$userid}&isDuplicate=true"><img src="{$IMAGE_PATH}settingsActBtnDuplicate.gif" alt="{$APP.LBL_DUPLICATE_BUTTON}" title="{$APP.LBL_DUPLICATE_BUTTON}" border="0"></a>
+</td>
 	<td class="listTableRow small" valign=top><b><a href="index.php?module=Users&action=DetailView&parenttab=Settings&record={$userid}"> {$listvalues.3} </a></b><br><a href="index.php?module=Users&action=DetailView&parenttab=Settings&record={$userid}"> {$listvalues.1} {$listvalues.0}</a> ({$listvalues.2})</td>
 	<td class="listTableRow small" valign=top>{$listvalues.5}</td>
 	<td class="listTableRow small" valign=top>{$listvalues.7}</td>



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 29 05:35:19 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 29 Jun 2006 12:35:19 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7666 -
	/vtigercrm/trunk/include/language/en_us.lang.php
Message-ID: <20060629123520.BE91A83FB19@vtiger.fosslabs.com>

Author: richie
Date: Thu Jun 29 06:34:49 2006
New Revision: 7666

Log:
language issue in signin and signout has been changed

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

Modified: vtigercrm/trunk/include/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/include/language/en_us.lang.php (original)
+++ vtigercrm/trunk/include/language/en_us.lang.php Thu Jun 29 06:34:49 2006
@@ -204,9 +204,9 @@
 
 'LBL_LIST_USERIP'=>'User IP',
 
-'LBL_LIST_SIGNIN'=>'Signin Time',
-
-'LBL_LIST_SIGNOUT'=>'Signout Time',
+'LBL_LIST_SIGNIN'=>'Sign in Time',
+
+'LBL_LIST_SIGNOUT'=>'Sign out Time',
 
 'LBL_LIST_STATUS'=>'Status',
 



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 29 05:36:08 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 29 Jun 2006 12:36:08 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7667 - in
 /vtigercrm/trunk/themes/blue/images: settingsActBtnDelete.gif
 settingsActBtnDuplicate.gif settingsActBtnEdit.gif
Message-ID: <20060629123608.4F2D683FB19@vtiger.fosslabs.com>

Author: richie
Date: Thu Jun 29 06:35:36 2006
New Revision: 7667

Log:
New Images added to integrate UI for Users

Added:
    vtigercrm/trunk/themes/blue/images/settingsActBtnDelete.gif   (with props)
    vtigercrm/trunk/themes/blue/images/settingsActBtnDuplicate.gif   (with props)
    vtigercrm/trunk/themes/blue/images/settingsActBtnEdit.gif   (with props)



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 29 06:07:56 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 29 Jun 2006 13:07:56 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7668 -
	/vtigercrm/trunk/modules/SalesOrder/EditView.php
Message-ID: <20060629130756.D25A183FDFA@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 29 07:07:52 2006
New Revision: 7668

Log:
* Added QUOTE_ID to set the quote id where as previously if we create SO from quote then the quote relationship was not saved. now the quote-SO relationship saved

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

Modified: vtigercrm/trunk/modules/SalesOrder/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/SalesOrder/EditView.php (original)
+++ vtigercrm/trunk/modules/SalesOrder/EditView.php Thu Jun 29 07:07:52 2006
@@ -52,6 +52,7 @@
 
 	//Added to display the Quotes's associated vtiger_products -- when we create SO from Quotes DetailView 
 	$associated_prod = getAssociatedProducts("Quotes",$quote_focus);
+	$smarty->assign("QUOTE_ID", $quoteid);
 	$smarty->assign("ASSOCIATEDPRODUCTS", $associated_prod);
 	$smarty->assign("MODE", $quote_focus->mode);
 	$smarty->assign("TAXVALUE", convertFromDollar($quote_focus->column_fields['txtTax'],$rate));



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 29 06:09:20 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 29 Jun 2006 13:09:20 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7669 -
 /vtigercrm/trunk/Smarty/templates/Inventory/InventoryActions.tpl
Message-ID: <20060629130920.BB80583FDF9@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 29 07:09:16 2006
New Revision: 7669

Log:
* Added return_id to pass to SO editview where as previously if we create SO from quote then the quote relationship was not saved. now the quote-SO relationship saved

Modified:
    vtigercrm/trunk/Smarty/templates/Inventory/InventoryActions.tpl

Modified: vtigercrm/trunk/Smarty/templates/Inventory/InventoryActions.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Inventory/InventoryActions.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Inventory/InventoryActions.tpl Thu Jun 29 07:09:16 2006
@@ -151,7 +151,7 @@
 	   <tr>
 		<td align="left" style="padding-left:10px;border-bottom:1px dotted #CCCCCC;">
 			<img src="{$IMAGE_PATH}pointer.gif" hspace="5" align="absmiddle"/>
-			<a href="javascript: document.DetailView.return_module.value='{$MODULE}'; document.DetailView.return_action.value='DetailView'; document.DetailView.convertmode.value='quotetoso'; document.DetailView.module.value='SalesOrder'; document.DetailView.action.value='EditView'; document.DetailView.submit();" class="webMnu">{$APP.LBL_GENERATE} {$APP.SalesOrder}</a> 
+			<a href="javascript: document.DetailView.return_module.value='{$MODULE}'; document.DetailView.return_action.value='DetailView'; document.DetailView.convertmode.value='quotetoso'; document.DetailView.module.value='SalesOrder'; document.DetailView.action.value='EditView'; document.DetailView.return_id.value='{$ID}'; document.DetailView.submit();" class="webMnu">{$APP.LBL_GENERATE} {$APP.SalesOrder}</a> 
 		</td>
 	   </tr>
 	   <!-- Quotes Actions ends -->



From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 29 06:10:38 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 29 Jun 2006 13:10:38 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231394=3A?=
 =?utf-8?q?_quote_is_not_getting_saved_when_we_create_SO_from_Quotes?=
In-Reply-To: <076.2e16a7e666b39de47b21f8d6af637752@vtiger.fosslabs.com>
References: <076.2e16a7e666b39de47b21f8d6af637752@vtiger.fosslabs.com>
Message-ID: <085.0d77e9ce01889a5e728a02c7a65cba4a@vtiger.fosslabs.com>

#1394: quote is not getting saved when we create SO from Quotes
------------------------+---------------------------------------------------
  Reporter:  mickie     |       Owner:  mickie
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mickie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 This issue has been fixed now.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1394>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 29 06:30:06 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 29 Jun 2006 13:30:06 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231395=3A?=
 =?utf-8?q?_Improper_Time_Displayed_while_creating_Event/task?=
Message-ID: <076.59a2dcba37c02890d142606a127d39df@vtiger.fosslabs.com>

#1395: Improper Time Displayed while creating Event/task
-----------------------+----------------------------------------------------
 Reporter:  ahmed      |       Owner:  mangai
     Type:  defect     |      Status:  new   
 Priority:  critical   |   Milestone:        
Component:  vtigercrm  |     Version:  5.0.0 
 Keywords:             |  
-----------------------+----------------------------------------------------


-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1395>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 29 06:53:41 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 29 Jun 2006 13:53:41 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231388=3A?=
 =?utf-8?q?_Quick_Edit_not_functional_for_activity_module?=
In-Reply-To: <076.50cd906646f38b3f0a24d3ab69d7789d@vtiger.fosslabs.com>
References: <076.50cd906646f38b3f0a24d3ab69d7789d@vtiger.fosslabs.com>
Message-ID: <085.8518bfff429e7487778e12721cea4620@vtiger.fosslabs.com>

#1388: Quick Edit not functional for activity module
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  Jeri  
      Type:  defect     |      Status:  closed
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 (In [7670]) issue in ajax edit has been fixed .Fixes #1388

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1388>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 29 06:53:42 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 29 Jun 2006 13:53:42 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7670 - in /vtigercrm/trunk:
 include/js/general.js modules/Users/DefaultDataPopulator.php
Message-ID: <20060629135343.520DA83F723@vtiger.fosslabs.com>

Author: richie
Date: Thu Jun 29 07:53:35 2006
New Revision: 7670

Log:
issue in ajax edit has been fixed .Fixes #1388

Modified:
    vtigercrm/trunk/include/js/general.js
    vtigercrm/trunk/modules/Users/DefaultDataPopulator.php

Modified: vtigercrm/trunk/include/js/general.js
==============================================================================
--- vtigercrm/trunk/include/js/general.js (original)
+++ vtigercrm/trunk/include/js/general.js Thu Jun 29 07:53:35 2006
@@ -819,30 +819,33 @@
 	}
        //added to check Start Date & Time,if Activity Status is Planned.//start
         for (var j=0; j<fieldname.length; j++)
+	{
+
+		if(getObj(fieldname[j]) != null)
 		{
-
-			if(getObj(fieldname[j]) != null)
+			if(fieldname[j] == "date_start")
 			{
-				if(fieldname[j] == "date_start")
-				{
-					var datelabel = fieldlabel[j]
-						var datefield = fieldname[j]
-						var startdatevalue = getObj(datefield).value.replace(/^\s+/g, '').replace(/\s+$/g, '')
-				}
-				if(fieldname[j] == "time_start")
-				{
-					var timelabel = fieldlabel[j]
-						var timefield = fieldname[j]
-						var timeval=getObj(timefield).value.replace(/^\s+/g, '').replace(/\s+$/g, '')
-				}
-				if(fieldname[j] == "eventstatus" || fieldname[j] == "taskstatus")
-				{
-					var statusvalue = getObj(fieldname[j]).value.replace(/^\s+/g, '').replace(/\s+$/g, '')
-						var statuslabel = fieldlabel[j++]
-				}
+				var datelabel = fieldlabel[j]
+					var datefield = fieldname[j]
+					var startdatevalue = getObj(datefield).value.replace(/^\s+/g, '').replace(/\s+$/g, '')
 			}
+			if(fieldname[j] == "time_start")
+			{
+				var timelabel = fieldlabel[j]
+					var timefield = fieldname[j]
+					var timeval=getObj(timefield).value.replace(/^\s+/g, '').replace(/\s+$/g, '')
+			}
+			if(fieldname[j] == "eventstatus" || fieldname[j] == "taskstatus")
+			{
+				var statusvalue = getObj(fieldname[j]).value.replace(/^\s+/g, '').replace(/\s+$/g, '')
+					var statuslabel = fieldlabel[j++]
+			}
+		}else
+		{
+			return true;
 		}
-		if(statusvalue == "Planned")
+	}
+	if(statusvalue == "Planned")
         {
                 var dateelements=splitDateVal(startdatevalue)
 

Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original)
+++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Thu Jun 29 07:53:35 2006
@@ -537,7 +537,7 @@
 //Event Details --START
 //Block41-43-- Start
  $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("vtiger_field").",'subject','vtiger_activity',1,'2','subject','Subject',1,0,0,100,1,41,1,'V~M',0,1,'BAS')");
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("vtiger_field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,2,41,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("vtiger_field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,2,41,1,'V~M',1,null,'BAS')");
  $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("vtiger_field").",'date_start','vtiger_activity',1,'6','date_start','Start Date & Time',1,0,0,100,3,41,1,'DT~M~time_start',0,2,'BAS')");
  $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("vtiger_field").",'time_start','vtiger_activity',1,'2','time_start','Time Start',1,0,0,100,4,41,3,'T~M',1,null,'BAS')");
 



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 29 07:11:55 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 29 Jun 2006 14:11:55 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7671 -
 /vtigercrm/trunk/modules/Users/language/en_us.lang.php
Message-ID: <20060629141155.7552483F723@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 29 08:11:51 2006
New Revision: 7671

Log:
label added for HomePage Dashborad

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

Modified: vtigercrm/trunk/modules/Users/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Users/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Users/language/en_us.lang.php Thu Jun 29 08:11:51 2006
@@ -488,6 +488,7 @@
 'GRT'=>'My Group Allocation',
 'OLTSO'=>'Top Sales Orders',
 'ILTI'=>'Top Invoices',
+'HDB'=>'HomePage Dashborad',
 //Added for 5.0 alpha
 'LBL_GROUP_NAME_ERROR'=>'Group Name already exists!',
 'MNL'=>'My New Leads',



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 29 07:17:30 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 29 Jun 2006 14:17:30 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7672 -
	/vtigercrm/trunk/modules/Users/User.php
Message-ID: <20060629141730.8707E83F723@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 29 08:17:26 2006
New Revision: 7672

Log:
get_activities and get_contacts functions are removed

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 Thu Jun 29 08:17:26 2006
@@ -819,48 +819,6 @@
 		return;
 	}
 
-
-
-
-
-
-
-
-//Function Call for Related List -- Start
-        function get_contacts($id)
-	{
-			global $log;
-                        $log->debug("Entering get_contacts(".$id.") method ...");
-			global $app_strings;
-
-			$focus = new Contact();
-
-			
-			
-			$button = '';
-			$query = 'select vtiger_contactdetails.*, vtiger_crmentity.* from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_contactdetails.contactid where vtiger_crmentity.smownerid='.$id.' and vtiger_crmentity.deleted=0';
-			$log->debug("Exiting get_contacts method ...");
-			return GetRelatedList('Users','Contacts',$focus,$query,$button,$returnset);
-        }
-
-
-
-
-//Function Call for Related List -- Start
-        function get_activities($id)
-	{
-			global $log;
-                        $log->debug("Entering get_contacts(".$id.") method ...");
-			global $app_strings;
-
-			$focus = new Activity();
-			
-			$button = '';
-			$query = 'select vtiger_activity.* from vtiger_activity inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid where vtiger_crmentity.smownerid='.$id.' and (vtiger_activity.activitytype="Meeting" || vtiger_activity.activitytype="Task" || vtiger_activity.activitytype="Call" ) and vtiger_crmentity.deleted=0';
-			$log->debug("Exiting get_contacts method ...");
-			return GetRelatedList('Users','Activities',$focus,$query,$button,$returnset);
-        }
-
 	function save($module_name) 
 	{
 		global $log;



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 29 07:18:13 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 29 Jun 2006 14:18:13 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7673 -
	/vtigercrm/trunk/modules/Users/CallRelatedList.php
Message-ID: <20060629141813.05E6983F723@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 29 08:18:10 2006
New Revision: 7673

Log:
user relatedlist has been removed

Removed:
    vtigercrm/trunk/modules/Users/CallRelatedList.php



From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 29 07:26:26 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 29 Jun 2006 14:26:26 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231396=3A?=
 =?utf-8?q?_Event_not_getting_displayed_in_contact_Related_List?=
Message-ID: <076.ad344c79dc1dc0ab1b64472bf84dc959@vtiger.fosslabs.com>

#1396: Event not getting displayed in contact Related List
-----------------------+----------------------------------------------------
 Reporter:  ahmed      |       Owner:  mangai
     Type:  defect     |      Status:  new   
 Priority:  critical   |   Milestone:        
Component:  vtigercrm  |     Version:  5.0.0 
 Keywords:             |  
-----------------------+----------------------------------------------------


-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1396>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 29 07:28:22 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 29 Jun 2006 14:28:22 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231357=3A?=
 =?utf-8?q?_Activity_History_missing_in_Products_and_HelpDesk_Related_List?=
In-Reply-To: <076.c812704daaa1c7137cf696dc99c6d8cd@vtiger.fosslabs.com>
References: <076.c812704daaa1c7137cf696dc99c6d8cd@vtiger.fosslabs.com>
Message-ID: <085.4b410ffff6cc0c2596ba7ccf34d51c37@vtiger.fosslabs.com>

#1357: Activity History missing in Products and HelpDesk Related List
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  philip
      Type:  defect     |      Status:  closed
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Comment (by richie):

 (In [7674]) Added Activity history for helpdesk. Fixes #1357

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1357>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 29 07:28:23 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 29 Jun 2006 14:28:23 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7674 - in
 /vtigercrm/trunk/modules: HelpDesk/HelpDesk.php
 Users/DefaultDataPopulator.php
Message-ID: <20060629142823.6282283FDEB@vtiger.fosslabs.com>

Author: richie
Date: Thu Jun 29 08:28:16 2006
New Revision: 7674

Log:
Added Activity history for helpdesk. Fixes #1357

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

Modified: vtigercrm/trunk/modules/HelpDesk/HelpDesk.php
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/HelpDesk.php (original)
+++ vtigercrm/trunk/modules/HelpDesk/HelpDesk.php Thu Jun 29 08:28:16 2006
@@ -124,7 +124,7 @@
 
 		$returnset = '&return_module=HelpDesk&return_action=CallRelatedList&return_id='.$id;
 
-		$query = "SELECT vtiger_activity.*, vtiger_crmentity.crmid, vtiger_contactdetails.contactid, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_recurringevents.recurringtype, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid= vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting')";
+		$query = "SELECT vtiger_activity.*, vtiger_crmentity.crmid, vtiger_contactdetails.contactid, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_recurringevents.recurringtype, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid= vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting') AND ( vtiger_activity.status is NULL OR vtiger_activity.status != 'Completed' ) and ( vtiger_activity.eventstatus is NULL OR vtiger_activity.eventstatus != 'Held')";
 		$log->debug("Exiting get_activities method ...");
 		
 		return GetRelatedList('HelpDesk','Activities',$focus,$query,$button,$returnset);
@@ -424,6 +424,29 @@
 		$log->debug("Exiting getCustomerName method ...");
         	return $customername;
 	}
+	
+	function get_history($id)
+	{
+		global $log;
+		$log->debug("Entering get_history(".$id.") method ...");
+		$query = "SELECT vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.status, vtiger_activity.eventstatus,
+		vtiger_activity.activitytype, vtiger_troubletickets.ticketid, vtiger_troubletickets.title, vtiger_crmentity.modifiedtime,
+		vtiger_crmentity.createdtime, vtiger_crmentity.description, vtiger_users.user_name
+				from vtiger_activity
+				inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid= vtiger_activity.activityid
+				inner join vtiger_troubletickets on vtiger_troubletickets.ticketid = vtiger_seactivityrel.crmid
+				inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid
+				left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_activity.activityid
+                                left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname
+				inner join vtiger_users on vtiger_crmentity.smcreatorid= vtiger_users.id
+				where (vtiger_activity.activitytype = 'Meeting' or vtiger_activity.activitytype='Call' or vtiger_activity.activitytype='Task')
+				and (vtiger_activity.status = 'Completed' or vtiger_activity.status = 'Deferred' or (vtiger_activity.eventstatus = 'Held' and vtiger_activity.eventstatus != ''))
+				and vtiger_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("Entering get_history method ...");
+		return getHistory('HelpDesk',$query,$id);
+	}
+
 
 
 }

Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original)
+++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Thu Jun 29 08:28:16 2006
@@ -1627,7 +1627,6 @@
 		
 	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("Contacts").",'get_contacts',2,'Contacts',0)");
 
-	
 	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("Activities").",'get_activities',3,'Activities',0)");
 
 	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("HelpDesk").",'get_tickets',4,'HelpDesk',0)");
@@ -1738,6 +1737,8 @@
 	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("HelpDesk").",0,'get_attachments',2,'Attachments',0)");
 
 	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("HelpDesk").",0,'get_ticket_history',3,'Ticket History',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("HelpDesk").",".getTabid("Activities").",'get_history',4,'Activity History',0)");
 
 	//Inserting PriceBook Related Lists
 	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("PriceBooks").",14,'get_pricebook_products',2,'Products',0)");



From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 29 07:39:36 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 29 Jun 2006 14:39:36 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231389=3A?=
 =?utf-8?q?_Values_retained_in_the_Pending_Activities_=28Homepage=29_even_?=
 =?utf-8?q?if_no_activity_records_are_present=2E?=
In-Reply-To: <076.411f5cbf1eec66cd754596f2025d46c0@vtiger.fosslabs.com>
References: <076.411f5cbf1eec66cd754596f2025d46c0@vtiger.fosslabs.com>
Message-ID: <085.6f32f7354f41db66df124c084dbd9030@vtiger.fosslabs.com>

#1389: Values retained in the Pending Activities (Homepage) even if no activity
records are present.
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  jeri  
      Type:  defect     |      Status:  closed
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 (In [7675]) query has been modified to fix the pending activity issue in
 home Page.Fixes #1389

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1389>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 29 07:39:37 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 29 Jun 2006 14:39:37 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7675 -
	/vtigercrm/trunk/modules/Activities/OpenListView.php
Message-ID: <20060629143937.D443A83FE08@vtiger.fosslabs.com>

Author: richie
Date: Thu Jun 29 08:39:31 2006
New Revision: 7675

Log:
query has been modified to fix the pending activity issue in home Page.Fixes #1389

Modified:
    vtigercrm/trunk/modules/Activities/OpenListView.php

Modified: vtigercrm/trunk/modules/Activities/OpenListView.php
==============================================================================
--- vtigercrm/trunk/modules/Activities/OpenListView.php (original)
+++ vtigercrm/trunk/modules/Activities/OpenListView.php Thu Jun 29 08:39:31 2006
@@ -55,34 +55,34 @@
 
 	if($activity_view == 'Today')
 	{	
-		$later = date("Y-m-d",strtotime("$today + 1 day"));
+		$later = date("Y-m-d",strtotime("$today +1 day"));
 	}	
 	else if($activity_view == 'This Week')
 	{
-		$later = date("Y-m-d", strtotime("$today + 7 days"));
+		$later = date("Y-m-d", strtotime("$today +7 days"));
 	}
 	else if($activity_view == 'This Month')
 	{	
-		$later = date("Y-m-d", strtotime("$today + 1 month"));
+		$later = date("Y-m-d", strtotime("$today +1 month"));
 	}	
 	else if($activity_view == 'This Year')	
 	{
-		$later = date("Y-m-d", strtotime("$today + 1 year"));
+		$later = date("Y-m-d", strtotime("$today +1 year"));
 	}
 	else if($activity_view == 'OverDue')	
 	{
 		$later = date("Y-m-d", strtotime("$today +1 day"));
 	}
-	$last_tendays = date("Y-m-d",strtotime("$today - 10 days"));
+	$last_tendays = date("Y-m-d",strtotime("$today -10 days"));
 	if($mode != 1)
 	{
 		//for upcoming avtivities
-		$list_query = " select vtiger_crmentity.crmid,vtiger_crmentity.smownerid,vtiger_crmentity.setype, vtiger_activity.*, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid, vtiger_account.accountid, vtiger_account.accountname, vtiger_recurringevents.recurringtype,vtiger_recurringevents.recurringdate from vtiger_activity inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid= vtiger_cntactivityrel.contactid left join vtiger_seactivityrel on vtiger_seactivityrel.activityid = vtiger_activity.activityid left outer join vtiger_account on vtiger_account.accountid = vtiger_contactdetails.accountid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid inner join vtiger_salesmanactivityrel on vtiger_salesmanactivityrel.activityid=vtiger_activity.activityid WHERE vtiger_crmentity.deleted=0 and (vtiger_activity.activitytype = 'Meeting' or vtiger_activity.activitytype='Call' or vtiger_activity.activitytype='Task') AND ( vtiger_activity.status is NULL OR vtiger_activity.status != 'Completed' ) and ( vtiger_activity.status is NULL OR vtiger_activity.status != 'Deferred') and  (  vtiger_activity.eventstatus is NULL OR  vtiger_activity.eventstatus != 'Held') and (vtiger_activity.eventstatus is NULL OR  vtiger_activity.eventstatus != 'Not Held' ) AND (((date_start > '$today' AND date_start < '$later'))  OR (vtiger_recurringevents.recurringdate between '$today' and '$later') ) AND vtiger_crmentity.smownerid !=0 AND vtiger_salesmanactivityrel.smid ='$current_user->id'";
+		$list_query = " select vtiger_crmentity.crmid,vtiger_crmentity.smownerid,vtiger_crmentity.setype, vtiger_activity.*, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid, vtiger_account.accountid, vtiger_account.accountname, vtiger_recurringevents.recurringtype,vtiger_recurringevents.recurringdate from vtiger_activity inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid= vtiger_cntactivityrel.contactid left join vtiger_seactivityrel on vtiger_seactivityrel.activityid = vtiger_activity.activityid left outer join vtiger_account on vtiger_account.accountid = vtiger_contactdetails.accountid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid inner join vtiger_salesmanactivityrel on vtiger_salesmanactivityrel.activityid=vtiger_activity.activityid WHERE vtiger_crmentity.deleted=0 and (vtiger_activity.activitytype = 'Meeting' or vtiger_activity.activitytype='Call' or vtiger_activity.activitytype='Task') AND ( vtiger_activity.status is NULL OR vtiger_activity.status != 'Completed' ) and ( vtiger_activity.status is NULL OR vtiger_activity.status != 'Deferred') and  (  vtiger_activity.eventstatus is NULL OR  vtiger_activity.eventstatus != 'Held') and (vtiger_activity.eventstatus is NULL OR  vtiger_activity.eventstatus != 'Not Held' ) AND ((date_start > '$today' AND date_start < '$later')  OR (vtiger_recurringevents.recurringdate between '$today' and '$later') ) AND vtiger_crmentity.smownerid !=0 AND vtiger_salesmanactivityrel.smid ='$current_user->id'";
 	}	
 	else
 	{
 		//for pending activities for the last 10 days
-		$list_query = " select vtiger_crmentity.crmid,vtiger_crmentity.smownerid,vtiger_crmentity.setype, vtiger_activity.*, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid, vtiger_account.accountid, vtiger_account.accountname, vtiger_recurringevents.recurringtype,vtiger_recurringevents.recurringdate from vtiger_activity inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid= vtiger_cntactivityrel.contactid left join vtiger_seactivityrel on vtiger_seactivityrel.activityid = vtiger_activity.activityid left outer join vtiger_account on vtiger_account.accountid = vtiger_contactdetails.accountid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid inner join vtiger_salesmanactivityrel on vtiger_salesmanactivityrel.activityid=vtiger_activity.activityid WHERE vtiger_crmentity.deleted=0 and (vtiger_activity.activitytype = 'Meeting' or vtiger_activity.activitytype='Call' or vtiger_activity.activitytype='Task') AND ( vtiger_activity.status is NULL OR vtiger_activity.status != 'Completed' ) and ( vtiger_activity.status is NULL OR vtiger_activity.status != 'Deferred') and (  vtiger_activity.eventstatus is NULL OR  vtiger_activity.eventstatus != 'Held') and (vtiger_activity.eventstatus is NULL OR  vtiger_activity.eventstatus != 'Not Held' ) AND (due_date > '$last_tendays' AND due_date <= '$today') OR (vtiger_recurringevents.recurringdate > '$last_tendays' AND vtiger_recurringevents.recurringdate <= '$today') AND vtiger_crmentity.smownerid !=0 AND vtiger_salesmanactivityrel.smid ='$current_user->id'";
+		$list_query = " select vtiger_crmentity.crmid,vtiger_crmentity.smownerid,vtiger_crmentity.setype, vtiger_activity.*, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid, vtiger_account.accountid, vtiger_account.accountname, vtiger_recurringevents.recurringtype,vtiger_recurringevents.recurringdate from vtiger_activity inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid= vtiger_cntactivityrel.contactid left join vtiger_seactivityrel on vtiger_seactivityrel.activityid = vtiger_activity.activityid left outer join vtiger_account on vtiger_account.accountid = vtiger_contactdetails.accountid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid inner join vtiger_salesmanactivityrel on vtiger_salesmanactivityrel.activityid=vtiger_activity.activityid WHERE vtiger_crmentity.deleted=0 and (vtiger_activity.activitytype = 'Meeting' or vtiger_activity.activitytype='Call' or vtiger_activity.activitytype='Task') AND ( vtiger_activity.status is NULL OR vtiger_activity.status != 'Completed' ) and ( vtiger_activity.status is NULL OR vtiger_activity.status != 'Deferred') and (  vtiger_activity.eventstatus is NULL OR  vtiger_activity.eventstatus != 'Held') and (vtiger_activity.eventstatus is NULL OR  vtiger_activity.eventstatus != 'Not Held' ) AND ((due_date > '$last_tendays' AND due_date <= '$today') OR (vtiger_recurringevents.recurringdate > '$last_tendays' AND vtiger_recurringevents.recurringdate <= '$today')) AND vtiger_crmentity.smownerid !=0 AND vtiger_salesmanactivityrel.smid ='$current_user->id'";
 	}
 	$res = $adb->query($list_query);
 	$noofrecords = $adb->num_rows($res);



From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 29 07:41:45 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 29 Jun 2006 14:41:45 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231397=3A?=
 =?utf-8?q?_Add_New_Email_div_Goes_out_of_the_screen?=
Message-ID: <076.2f2fc814f9ae3c4d9cc3e8d30b4fb765@vtiger.fosslabs.com>

#1397: Add New Email div Goes out of the screen
--------------------------+-------------------------------------------------
 Reporter:  jerrydgeorge  |       Owner:  developer
     Type:  defect        |      Status:  new      
 Priority:  major         |   Milestone:           
Component:  vtigercrm     |     Version:  5.0.0    
 Keywords:                |  
--------------------------+-------------------------------------------------
 When i Click an add email from related list it is going out of the page

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1397>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 29 07:41:50 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 29 Jun 2006 14:41:50 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231398=3A?=
 =?utf-8?q?_Add_New_Email_div_Goes_out_of_the_screen?=
Message-ID: <076.13994c1af8465ee3fb98a2251a8b4676@vtiger.fosslabs.com>

#1398: Add New Email div Goes out of the screen
--------------------------+-------------------------------------------------
 Reporter:  jerrydgeorge  |       Owner:  ela  
     Type:  defect        |      Status:  new  
 Priority:  major         |   Milestone:       
Component:  vtigercrm     |     Version:  5.0.0
 Keywords:                |  
--------------------------+-------------------------------------------------
 When i Click an add email from related list it is going out of the page

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1398>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 29 07:42:30 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 29 Jun 2006 14:42:30 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231397=3A?=
 =?utf-8?q?_Add_New_Email_div_Goes_out_of_the_screen?=
In-Reply-To: <076.2f2fc814f9ae3c4d9cc3e8d30b4fb765@vtiger.fosslabs.com>
References: <076.2f2fc814f9ae3c4d9cc3e8d30b4fb765@vtiger.fosslabs.com>
Message-ID: <085.50b6bf8ca8d27709f7066fc9c6c60114@vtiger.fosslabs.com>

#1397: Add New Email div Goes out of the screen
---------------------------+------------------------------------------------
  Reporter:  jerrydgeorge  |       Owner:  developer
      Type:  defect        |      Status:  closed   
  Priority:  major         |   Milestone:           
 Component:  vtigercrm     |     Version:  5.0.0    
Resolution:  duplicate     |    Keywords:           
---------------------------+------------------------------------------------
Changes (by jerrydgeorge):

  * resolution:  => duplicate
  * status:  new => closed

Comment:

 1398

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1397>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 29 08:19:39 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 29 Jun 2006 15:19:39 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231399=3A?=
 =?utf-8?q?_Import_of_contacts_won=27t_link_to_accounts?=
Message-ID: <076.c341350a734ddf6f096a76b70c965286@vtiger.fosslabs.com>

#1399: Import of contacts won't link to accounts
-----------------------+----------------------------------------------------
 Reporter:  andrewr    |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  major      |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 When importing a contact list if the account is mapped it skips importing
 that record.
 If the csv has a blank account for a record it is imported.
 If you unmap the account field the whole file is imported OK.
 This file was created from a vTiger export.
 SVN version 7669.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1399>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 29 08:41:39 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 29 Jun 2006 15:41:39 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231401=3A?=
 =?utf-8?q?_Qty_in_stock_not_displayed_while_adding_SO=2C_PO=2C_INV=2C_Quo?=
 =?utf-8?q?tes?=
Message-ID: <076.d3ca8ee69bf7e900ba9538557e700b06@vtiger.fosslabs.com>

#1401: Qty in stock not displayed while adding SO, PO, INV, Quotes
-----------------------+----------------------------------------------------
 Reporter:  ahmed      |       Owner:  mickie
     Type:  defect     |      Status:  new   
 Priority:  major      |   Milestone:        
Component:  vtigercrm  |     Version:  5.0.0 
 Keywords:             |  
-----------------------+----------------------------------------------------
 If we are creating a SO, PO, Inv from a particular product, the quantity
 in stock column doesnot display any value.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1401>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 29 08:46:28 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 29 Jun 2006 15:46:28 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231402=3A?=
	=?utf-8?q?_PriceBook_Issues_in_Product?=
Message-ID: <076.3865925b10005a3ad66a5dec37e66865@vtiger.fosslabs.com>

#1402: PriceBook Issues in Product
-----------------------+----------------------------------------------------
 Reporter:  ahmed      |       Owner:  mickie
     Type:  defect     |      Status:  new   
 Priority:  critical   |   Milestone:        
Component:  vtigercrm  |     Version:  5.0.0 
 Keywords:             |  
-----------------------+----------------------------------------------------
 While adding a Pbook from Product related list we are directed to the
 pricebook page which does not display any records in the list even after
 adding a couple of pricebooks. As a result not able to add any Pricebook
 to product related list

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1402>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 29 08:48:14 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 29 Jun 2006 15:48:14 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7676 - in /vtigercrm/trunk:
 Smarty/templates/DetailView.tpl Smarty/templates/DetailViewUI.tpl
 data/CRMEntity.php modules/Faq/language/en_us.lang.php
 modules/HelpDesk/language/en_us.lang.php
Message-ID: <20060629154815.33A7383FE65@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 29 09:48:04 2006
New Revision: 7676

Log:
* Modified to display the comments properly where as previously when the language string changes then the comments will not be shown and the add comment value has been emptied because the comments are shown in seperate block

Modified:
    vtigercrm/trunk/Smarty/templates/DetailView.tpl
    vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl
    vtigercrm/trunk/data/CRMEntity.php
    vtigercrm/trunk/modules/Faq/language/en_us.lang.php
    vtigercrm/trunk/modules/HelpDesk/language/en_us.lang.php

Modified: vtigercrm/trunk/Smarty/templates/DetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DetailView.tpl Thu Jun 29 09:48:04 2006
@@ -221,7 +221,7 @@
 
 
 							<!-- This is added to display the existing comments -->
-							{if $header eq 'Comments' || $header eq 'Comment Information'}
+							{if $header eq $MOD.LBL_COMMENTS || $header eq $MOD.LBL_COMMENT_INFORMATION}
 							   <tr>
 								<td colspan=4 style="border-bottom:1px solid #999999;padding:5px;" bgcolor="#e5e5e5">
 						        	<b>{$MOD.LBL_COMMENT_INFORMATION}</b>

Modified: vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl Thu Jun 29 09:48:04 2006
@@ -97,6 +97,10 @@
                                                        </div>
                                                   </td>
                                              {elseif $keyid eq '19' || $keyid eq '20'} <!--TextArea/Description-->
+						<!-- we will empty the value of ticket and faq comment -->
+						{if $label eq $MOD.LBL_ADD_COMMENT}
+							{assign var=keyval value=''}
+						{/if}
                                                   <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}">{$keyval}</span>
                                               		<div id="editarea_{$label}" style="display:none;">
                                               		  <textarea id="txtbox_{$label}" name="{$keyfldname}"  class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'"onBlur="this.className='detailedViewTextBox'" cols="90" rows="8">{$keyval}</textarea>                                            		  

Modified: vtigercrm/trunk/data/CRMEntity.php
==============================================================================
--- vtigercrm/trunk/data/CRMEntity.php (original)
+++ vtigercrm/trunk/data/CRMEntity.php Thu Jun 29 09:48:04 2006
@@ -1000,15 +1000,20 @@
 }
 function insertIntoFAQCommentTable($table_name, $module)
 {
-	 global $log;
+	global $log;
 	$log->info("in insertIntoFAQCommentTable  ".$table_name."    module is  ".$module);
         global $adb;
 
         $current_time = date('Y-m-d H:i:s');
 
-	if($_REQUEST['comments'] != '')
-	{
-		$comment = addslashes($_REQUEST['comments']);
+	if($this->column_fields['comments'] != '')
+		$comment = $this->column_fields['comments'];
+	else
+		$comment = $_REQUEST['comments'];
+
+	if($comment != '')
+	{
+		$comment = addslashes($comment);
 		$sql = "insert into vtiger_faqcomments values('',".$this->id.",'".$comment."','".$current_time."')";
 		$adb->query($sql);
 	}

Modified: vtigercrm/trunk/modules/Faq/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Faq/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Faq/language/en_us.lang.php Thu Jun 29 09:48:04 2006
@@ -107,6 +107,7 @@
 'Question'=>'Question',
 'Answer'=>'Answer',
 'Comments'=>'Comments',
+'LBL_COMMENTS'=>'Comments',//give the same value given to the above string 'Comments'
 'Created Time'=>'Created Time',
 'Modified Time'=>'Modified Time',
 
@@ -116,6 +117,7 @@
 'Product Name'=>'Product Name',
 'FAQ Id'=>'FAQ Id',
 'Add Comment'=>'Add Comment',
+'LBL_ADD_COMMENT'=>'Add Comment',//give the same value given to the above string 'Add Comment'
 'LBL_COMMENT_INFORMATION'=>'Comment Information',
 'Status'=>'Status',
 

Modified: vtigercrm/trunk/modules/HelpDesk/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/HelpDesk/language/en_us.lang.php Thu Jun 29 09:48:04 2006
@@ -136,6 +136,7 @@
 'LBL_TICKET_RESOLUTION'=>'Solution Information',
 'Solution'=>'Solution',
 'Add Comment'=>'Add Comment',
+'LBL_ADD_COMMENT'=>'Add Comment',//give the same value given to the above string 'Add Comment'
 
 //Added for 4.2 Release -- CustomView
 'Ticket ID'=>'Ticket ID',



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 29 09:23:55 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 29 Jun 2006 16:23:55 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7677 -
	/vtigercrm/trunk/index.php
Message-ID: <20060629162355.CB33F83FE76@vtiger.fosslabs.com>

Author: richie
Date: Thu Jun 29 10:23:47 2006
New Revision: 7677

Log:
Support for last view done

Modified:
    vtigercrm/trunk/index.php

Modified: vtigercrm/trunk/index.php
==============================================================================
--- vtigercrm/trunk/index.php (original)
+++ vtigercrm/trunk/index.php Thu Jun 29 10:23:47 2006
@@ -487,7 +487,7 @@
 	if(isset($_REQUEST['record']) && $_REQUEST['record']!='' && $_REQUEST["module"] != "Webmails") 
         {
                 // Only track a viewing if the record was retrieved.
-                //$focus->track_view($current_user->id, $actualModule,$_REQUEST['record']);
+                $focus->track_view($current_user->id, $actualModule,$_REQUEST['record']);
         }
 
 }	



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 29 09:25:40 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 29 Jun 2006 16:25:40 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7678 -
	/vtigercrm/trunk/Smarty/templates/Header.tpl
Message-ID: <20060629162540.749E083F860@vtiger.fosslabs.com>

Author: richie
Date: Thu Jun 29 10:25:29 2006
New Revision: 7678

Log:
Support for last view done

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 Thu Jun 29 10:25:29 2006
@@ -470,5 +470,26 @@
 {ldelim}
             window.open("index.php?module=Users&action=about_us","aboutwin","height=520,width=515,top=200,left=300")
 {rdelim}
+
 </script>
 
+
+<div id="tracker" style="display:none;position:absolute;z-index:100000001;" onmouseout="fninvsh('tracker');" onMouseOver="fnvshNrm('tracker');">
+
+	<table class="trackerBorder" border="0" cellpadding="5" cellspacing="0" width="200">
+	<tbody><tr style="cursor:move;"><td colspan="2" class="trackerHeading small" id="Track_Handle"><strong>Last Viewed</strong></td><td align="right" style="padding:5px;" class="trackerHeading small">
+		<a href="javascript:;"><img src="{$IMAGEPATH}close.gif" border="0"  onClick="fninvsh('tracker')" hspace="5" align="absmiddle"></a>
+		</td></tr>
+	{foreach name=trackinfo item=trackelements from=$TRACINFO}
+	<tr><td class="trackerListBullet small" align="center" width="12">{$smarty.foreach.trackinfo.iteration}</td><td class="trackerList small"> <a href="index.php?module={$trackelements.module_name}&action=DetailView&record={$trackelements.crmid}">{$trackelements.item_summary}</a> </td><td class="trackerList small">&nbsp;</td></tr>
+	{/foreach}
+	</tbody></table>
+</div>	
+<script>
+	var THandle = document.getElementById("Track_Handle");
+	var TRoot   = document.getElementById("tracker");
+	Drag.init(THandle, TRoot);
+</script>		
+
+
+



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 29 09:28:22 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 29 Jun 2006 16:28:22 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7679 -
	/vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl
Message-ID: <20060629162822.B3FB783FE43@vtiger.fosslabs.com>

Author: richie
Date: Thu Jun 29 10:28:12 2006
New Revision: 7679

Log:
Support for last view done

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

Modified: vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl Thu Jun 29 10:28:12 2006
@@ -1,122 +1,124 @@
-{*<!--
-/*********************************************************************************
-  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
-   * ("License"); You may not use this file except in compliance with the License
-   * The Original Code is:  vtiger CRM Open Source
-   * The Initial Developer of the Original Code is vtiger.
-   * Portions created by vtiger are Copyright (C) vtiger.
-   * All Rights Reserved.
-  *
- ********************************************************************************/
--->*}
-<script type="text/javascript" src="modules/{$MODULE}/{$SINGLE_MOD}.js"></script>
-<!-- Activity createlink layer start  -->
-{if $MODULE eq 'Activities'}
-<div id="reportLay" style="width: 125px; right: 159px; top: 260px; display: none; z-index:50" onmouseout="fninvsh('reportLay')" onmouseover="fnvshNrm('reportLay')">
-        <table bgcolor="#ffffff" border="0" cellpadding="0" cellspacing="0" width="100%">
-                <tr>
-                        <td>
-                                <a href="index.php?module={$MODULE}&action=EditView&return_module={$MODULE}&activity_mode=Events&return_action=DetailView&parenttab={$CATEGORY}" class="calMnu">{$NEW_EVENT}</a>
-                                <a href="index.php?module={$MODULE}&action=EditView&return_module={$MODULE}&activity_mode=Task&return_action=DetailView&parenttab={$CATEGORY}" class="calMnu">{$NEW_TASK}</a>
-                        </td>
-                </tr>
-        </table>
-
-</div>
-{/if}
-<!-- Activity createlink layer end  -->
-
-
-<TABLE border=0 cellspacing=0 cellpadding=0 width=100% class=small>
-<tr><td style="height:2px"></td></tr>
-<tr>
-	<td style="padding-left:10px;padding-right:50px" class="moduleName" nowrap>{$APP.$CATEGORY} > <a class="hdrLink" href="index.php?action=ListView&module={$MODULE}">{$APP.$MODULE}</a></td>
-	<td width=100% nowrap>
-	
-		<table border="0" cellspacing="0" cellpadding="0" >
-		<tr>
-		<td class="sep1" style="width:1px;"></td>
-		<td class=small >
-			<!-- Add and Search -->
-			<table border=0 cellspacing=0 cellpadding=0>
-			<tr>
-			<td>
-				<table border=0 cellspacing=0 cellpadding=5>
-				<tr>
-					{if $CHECK.EditView eq 'yes'}
-			        		{if $MODULE eq 'Activities'}
-		                      	        	<td style="padding-right:0px;padding-left:10px;"><a href="javascript:;" id="showSubMenu"  onMouseOver="fnvshobj(this,'reportLay');" onMouseOut="fninvsh('reportLay');"><img src="{$IMAGE_PATH}btnL3Add.gif" alt="{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}..." title="{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}..." border=0></a></td>
-                	   			 {else}
-	                        		       	<td style="padding-right:0px;padding-left:10px;"><a href="index.php?module={$MODULE}&action=EditView&return_action=DetailView&parenttab={$CATEGORY}"><img src="{$IMAGE_PATH}btnL3Add.gif" alt="{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}..." title="{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}..." border=0></a></td>
-			                       	{/if}
-					{else}
-						<td style="padding-right:0px;padding-left:10px;"><img src="{$IMAGE_PATH}btnL3Add-Faded.gif" alt="{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}..." title="{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}..." border=0></td>	
-					{/if}
-									
-						<td style="padding-right:10px"><img src="{$IMAGE_PATH}btnL3Search-Faded.gif" alt="{$APP.LBL_SEARCH_ALT}{$MODULE}..." title="{$APP.LBL_SEARCH_TITLE}{$MODULE}..." border=0></td>
-					
-				</tr>
-				</table>
-			</td>
-			</tr>
-			</table>
-		</td>
-		<td style="width:20px;">&nbsp;</td>
-		<td class="small">
-			<!-- Calendar Clock Calculator and Chat -->
-				<table border=0 cellspacing=0 cellpadding=5>
-				<tr>
-					<td style="padding-right:0px;padding-left:10px;"><a href="javascript:;" onClick='fnvshobj(this,"miniCal");getMiniCal();'><img src="{$IMAGE_PATH}btnL3Calendar.gif" alt="{$APP.LBL_CALENDAR_ALT}" title="{$APP.LBL_CALENDAR_TITLE}" border=0></a></a></td>
-					<td style="padding-right:0px"><a href="javascript:;"><img src="{$IMAGE_PATH}btnL3Clock.gif" alt="{$APP.LBL_CLOCK_ALT}" title="{$APP.LBL_CLOCK_TITLE}" border=0 onClick="fnvshobj(this,'wclock');"></a></a></td>
-					<td style="padding-right:0px"><a href="#"><img src="{$IMAGE_PATH}btnL3Calc.gif" alt="{$APP.LBL_CALCULATOR_ALT}" title="{$APP.LBL_CALCULATOR_TITLE}" border=0 onClick="fnvshobj(this,'calculator_cont');fetch_calc();"></a></td>
-					<td style="padding-right:10px"><a href="javascript:;" onClick='return window.open("index.php?module=Contacts&action=vtchat","Chat","width=450,height=400,resizable=1,scrollbars=1");'><img src="{$IMAGE_PATH}tbarChat.gif" alt="{$APP.LBL_CHAT_ALT}" title="{$APP.LBL_CHAT_TITLE}" border=0></a>
-                    </td>	
-				</tr>
-				</table>
-		</td>
-		<td style="width:20px;">&nbsp;</td>
-		<td class="small">
-			<!-- Import / Export -->
-			<table border=0 cellspacing=0 cellpadding=5>
-			<tr>
-			{if $MODULE eq 'Contacts' || $MODULE eq 'Leads' || $MODULE eq 'Accounts' || $MODULE eq 'Potentials' || $MODULE eq 'Products' }
-		   		{if $CHECK.Import eq 'yes'}	
-					<td style="padding-right:0px;padding-left:10px;"><a href="index.php?module={$MODULE}&action=Import&step=1&return_module={$MODULE}&return_action=index&parenttab={$CATEGORY}"><img src="{$IMAGE_PATH}tbarImport.gif" alt="{$APP.LBL_IMPORT} {$APP.$MODULE}" title="{$APP.LBL_IMPORT} {$APP.$MODULE}" border="0"></a></td>	
-				{else}	
-					<td style="padding-right:0px;padding-left:10px;"><img src="{$IMAGE_PATH}tbarImport-Faded.gif" alt="{$APP.LBL_IMPORT} {$APP.$MODULE}" title="{$APP.LBL_IMPORT} {$APP.$MODULE}" border="0"></td>	
-				{/if}	
-				{if $CHECK.Export eq 'yes'}	
-	    			<td style="padding-right:10px"><a href="index.php?module={$MODULE}&action=Export&all=1"><img src="{$IMAGE_PATH}tbarExport.gif" alt="{$APP.LBL_EXPORT} {$APP.$MODULE}" title="{$APP.LBL_EXPORT} {$APP.$MODULE}" border="0"></a></td>
-				{else}	
-					<td style="padding-right:10px"><img src="{$IMAGE_PATH}tbarExport-Faded.gif" alt="{$APP.LBL_EXPORT} {$APP.$MODULE}" title="{$APP.LBL_EXPORT} {$APP.$MODULE}" border="0"></td>
-                {/if}
-			{elseif $MODULE eq 'Notes' || $MODULE eq 'Emails'}	
-				
-				{if $CHECK.Export eq 'yes'}
-					<td style="padding-right:0px;padding-left:10px;"><img src="{$IMAGE_PATH}tbarImport-Faded.gif" alt="{$APP.LBL_IMPORT} {$APP.$MODULE}" title="{$APP.LBL_IMPORT} {$APP.$MODULE}" border="0"></td>
-					<td style="padding-right:10px"><a href="index.php?module={$MODULE}&action=Export&all=1"><img src="{$IMAGE_PATH}tbarExport.gif" alt="{$APP.LBL_EXPORT} {$APP.$MODULE}" title="{$APP.LBL_EXPORT} {$APP.$MODULE}" border="0"></a></td>
-				{else}	 
-					<td style="padding-right:0px;padding-left:10px;"><img src="{$IMAGE_PATH}tbarImport-Faded.gif" alt="{$APP.LBL_IMPORT} {$APP.$MODULE}" title="{$APP.LBL_IMPORT} {$APP.$MODULE}" border="0"></td>
-					<td style="padding-right:10px"><img src="{$IMAGE_PATH}tbarExport-Faded.gif" alt="{$APP.LBL_EXPORT} {$APP.$MODULE}" title="{$APP.LBL_EXPORT} {$APP.$MODULE}" border="0"></td>
-				{/if}
-			{else}
-				<td style="padding-right:0px;padding-left:10px;"><img src="{$IMAGE_PATH}tbarImport-Faded.gif" alt="{$APP.LBL_IMPORT} {$APP.$MODULE}" title="{$APP.LBL_IMPORT} {$APP.$MODULE}" border="0"></td>
-                <td style="padding-right:10px"><img src="{$IMAGE_PATH}tbarExport-Faded.gif" alt="{$APP.LBL_EXPORT} {$APP.$MODULE}" title="{$APP.LBL_EXPORT} {$APP.$MODULE}" border="0"></td>
-			{/if}
-			</tr>
-			</table>	
-		<td style="width:20px;">&nbsp;</td>
-		<td class="small">
-			<!-- All Menu -->
-				<table border=0 cellspacing=0 cellpadding=5>
-				<tr>
-				<td style="padding-left:10px;"><a href="javascript:;" onmouseout="fninvsh('allMenu');" onClick="fnvshobj(this,'allMenu')"><img src="{$IMAGE_PATH}btnL3AllMenu.gif" alt="{$APP.LBL_ALL_MENU_ALT}" title="{$APP.LBL_ALL_MENU_TITLE}" border="0"></a></td>
-				</tr>
-				</table>
-		</td>			
-		</tr>
-		</table>
-	</td>
-</tr>
-<tr><td style="height:2px"></td></tr>
-</TABLE>
+{*<!--
+/*********************************************************************************
+  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
+   * ("License"); You may not use this file except in compliance with the License
+   * The Original Code is:  vtiger CRM Open Source
+   * The Initial Developer of the Original Code is vtiger.
+   * Portions created by vtiger are Copyright (C) vtiger.
+   * All Rights Reserved.
+  *
+ ********************************************************************************/
+-->*}
+<script type="text/javascript" src="modules/{$MODULE}/{$SINGLE_MOD}.js"></script>
+<!-- Activity createlink layer start  -->
+{if $MODULE eq 'Activities'}
+<div id="reportLay" style="width: 125px; right: 159px; top: 260px; display: none; z-index:50" onmouseout="fninvsh('reportLay')" onmouseover="fnvshNrm('reportLay')">
+        <table bgcolor="#ffffff" border="0" cellpadding="0" cellspacing="0" width="100%">
+                <tr>
+                        <td>
+                                <a href="index.php?module={$MODULE}&action=EditView&return_module={$MODULE}&activity_mode=Events&return_action=DetailView&parenttab={$CATEGORY}" class="calMnu">{$NEW_EVENT}</a>
+                                <a href="index.php?module={$MODULE}&action=EditView&return_module={$MODULE}&activity_mode=Task&return_action=DetailView&parenttab={$CATEGORY}" class="calMnu">{$NEW_TASK}</a>
+                        </td>
+                </tr>
+        </table>
+
+</div>
+{/if}
+<!-- Activity createlink layer end  -->
+
+
+<TABLE border=0 cellspacing=0 cellpadding=0 width=100% class=small>
+<tr><td style="height:2px"></td></tr>
+<tr>
+	<td style="padding-left:10px;padding-right:50px" class="moduleName" nowrap>{$APP.$CATEGORY} > <a class="hdrLink" href="index.php?action=ListView&module={$MODULE}">{$APP.$MODULE}</a></td>
+	<td width=100% nowrap>
+	
+		<table border="0" cellspacing="0" cellpadding="0" >
+		<tr>
+		<td class="sep1" style="width:1px;"></td>
+		<td class=small >
+			<!-- Add and Search -->
+			<table border=0 cellspacing=0 cellpadding=0>
+			<tr>
+			<td>
+				<table border=0 cellspacing=0 cellpadding=5>
+				<tr>
+					{if $CHECK.EditView eq 'yes'}
+			        		{if $MODULE eq 'Activities'}
+		                      	        	<td style="padding-right:0px;padding-left:10px;"><a href="javascript:;" id="showSubMenu"  onMouseOver="fnvshobj(this,'reportLay');" onMouseOut="fninvsh('reportLay');"><img src="{$IMAGE_PATH}btnL3Add.gif" alt="{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}..." title="{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}..." border=0></a></td>
+                	   			 {else}
+	                        		       	<td style="padding-right:0px;padding-left:10px;"><a href="index.php?module={$MODULE}&action=EditView&return_action=DetailView&parenttab={$CATEGORY}"><img src="{$IMAGE_PATH}btnL3Add.gif" alt="{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}..." title="{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}..." border=0></a></td>
+			                       	{/if}
+					{else}
+						<td style="padding-right:0px;padding-left:10px;"><img src="{$IMAGE_PATH}btnL3Add-Faded.gif" alt="{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}..." title="{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}..." border=0></td>	
+					{/if}
+									
+						<td style="padding-right:10px"><img src="{$IMAGE_PATH}btnL3Search-Faded.gif" alt="{$APP.LBL_SEARCH_ALT}{$MODULE}..." title="{$APP.LBL_SEARCH_TITLE}{$MODULE}..." border=0></td>
+					
+				</tr>
+				</table>
+			</td>
+			</tr>
+			</table>
+		</td>
+		<td style="width:20px;">&nbsp;</td>
+		<td class="small">
+			<!-- Calendar Clock Calculator and Chat -->
+				<table border=0 cellspacing=0 cellpadding=5>
+				<tr>
+					<td style="padding-right:0px;padding-left:10px;"><a href="javascript:;" onClick='fnvshobj(this,"miniCal");getMiniCal();'><img src="{$IMAGE_PATH}btnL3Calendar.gif" alt="{$APP.LBL_CALENDAR_ALT}" title="{$APP.LBL_CALENDAR_TITLE}" border=0></a></a></td>
+					<td style="padding-right:0px"><a href="javascript:;"><img src="{$IMAGE_PATH}btnL3Clock.gif" alt="{$APP.LBL_CLOCK_ALT}" title="{$APP.LBL_CLOCK_TITLE}" border=0 onClick="fnvshobj(this,'wclock');"></a></a></td>
+					<td style="padding-right:0px"><a href="#"><img src="{$IMAGE_PATH}btnL3Calc.gif" alt="{$APP.LBL_CALCULATOR_ALT}" title="{$APP.LBL_CALCULATOR_TITLE}" border=0 onClick="fnvshobj(this,'calculator_cont');fetch_calc();"></a></td>
+					<td style="padding-right:10px"><a href="javascript:;" onClick='return window.open("index.php?module=Contacts&action=vtchat","Chat","width=450,height=400,resizable=1,scrollbars=1");'><img src="{$IMAGE_PATH}tbarChat.gif" alt="{$APP.LBL_CHAT_ALT}" title="{$APP.LBL_CHAT_TITLE}" border=0></a>
+                    </td>	
+					<td style="padding-right:10px"><img src="{$IMAGE_PATH}btnL3Tracker.gif" alt="{$APP.LBL_CHAT_ALT}" title="{$APP.LBL_CHAT_TITLE}" border=0 onClick="fnvshobj(this,'tracker');">
+                    			</td>	
+				</tr>
+				</table>
+		</td>
+		<td style="width:20px;">&nbsp;</td>
+		<td class="small">
+			<!-- Import / Export -->
+			<table border=0 cellspacing=0 cellpadding=5>
+			<tr>
+			{if $MODULE eq 'Contacts' || $MODULE eq 'Leads' || $MODULE eq 'Accounts' || $MODULE eq 'Potentials' || $MODULE eq 'Products' }
+		   		{if $CHECK.Import eq 'yes'}	
+					<td style="padding-right:0px;padding-left:10px;"><a href="index.php?module={$MODULE}&action=Import&step=1&return_module={$MODULE}&return_action=index&parenttab={$CATEGORY}"><img src="{$IMAGE_PATH}tbarImport.gif" alt="{$APP.LBL_IMPORT} {$APP.$MODULE}" title="{$APP.LBL_IMPORT} {$APP.$MODULE}" border="0"></a></td>	
+				{else}	
+					<td style="padding-right:0px;padding-left:10px;"><img src="{$IMAGE_PATH}tbarImport-Faded.gif" alt="{$APP.LBL_IMPORT} {$APP.$MODULE}" title="{$APP.LBL_IMPORT} {$APP.$MODULE}" border="0"></td>	
+				{/if}	
+				{if $CHECK.Export eq 'yes'}	
+	    			<td style="padding-right:10px"><a href="index.php?module={$MODULE}&action=Export&all=1"><img src="{$IMAGE_PATH}tbarExport.gif" alt="{$APP.LBL_EXPORT} {$APP.$MODULE}" title="{$APP.LBL_EXPORT} {$APP.$MODULE}" border="0"></a></td>
+				{else}	
+					<td style="padding-right:10px"><img src="{$IMAGE_PATH}tbarExport-Faded.gif" alt="{$APP.LBL_EXPORT} {$APP.$MODULE}" title="{$APP.LBL_EXPORT} {$APP.$MODULE}" border="0"></td>
+                {/if}
+			{elseif $MODULE eq 'Notes' || $MODULE eq 'Emails'}	
+				
+				{if $CHECK.Export eq 'yes'}
+					<td style="padding-right:0px;padding-left:10px;"><img src="{$IMAGE_PATH}tbarImport-Faded.gif" alt="{$APP.LBL_IMPORT} {$APP.$MODULE}" title="{$APP.LBL_IMPORT} {$APP.$MODULE}" border="0"></td>
+					<td style="padding-right:10px"><a href="index.php?module={$MODULE}&action=Export&all=1"><img src="{$IMAGE_PATH}tbarExport.gif" alt="{$APP.LBL_EXPORT} {$APP.$MODULE}" title="{$APP.LBL_EXPORT} {$APP.$MODULE}" border="0"></a></td>
+				{else}	 
+					<td style="padding-right:0px;padding-left:10px;"><img src="{$IMAGE_PATH}tbarImport-Faded.gif" alt="{$APP.LBL_IMPORT} {$APP.$MODULE}" title="{$APP.LBL_IMPORT} {$APP.$MODULE}" border="0"></td>
+					<td style="padding-right:10px"><img src="{$IMAGE_PATH}tbarExport-Faded.gif" alt="{$APP.LBL_EXPORT} {$APP.$MODULE}" title="{$APP.LBL_EXPORT} {$APP.$MODULE}" border="0"></td>
+				{/if}
+			{else}
+				<td style="padding-right:0px;padding-left:10px;"><img src="{$IMAGE_PATH}tbarImport-Faded.gif" alt="{$APP.LBL_IMPORT} {$APP.$MODULE}" title="{$APP.LBL_IMPORT} {$APP.$MODULE}" border="0"></td>
+                <td style="padding-right:10px"><img src="{$IMAGE_PATH}tbarExport-Faded.gif" alt="{$APP.LBL_EXPORT} {$APP.$MODULE}" title="{$APP.LBL_EXPORT} {$APP.$MODULE}" border="0"></td>
+			{/if}
+			</tr>
+			</table>	
+		<td style="width:20px;">&nbsp;</td>
+		<td class="small">
+			<!-- All Menu -->
+				<table border=0 cellspacing=0 cellpadding=5>
+				<tr>
+				<td style="padding-left:10px;"><a href="javascript:;" onmouseout="fninvsh('allMenu');" onClick="fnvshobj(this,'allMenu')"><img src="{$IMAGE_PATH}btnL3AllMenu.gif" alt="{$APP.LBL_ALL_MENU_ALT}" title="{$APP.LBL_ALL_MENU_TITLE}" border="0"></a></td>
+				</tr>
+				</table>
+		</td>			
+		</tr>
+		</table>
+	</td>
+</tr>
+<tr><td style="height:2px"></td></tr>
+</TABLE>



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 29 09:29:15 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 29 Jun 2006 16:29:15 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7680 -
	/vtigercrm/trunk/Smarty/templates/Buttons_List.tpl
Message-ID: <20060629162915.A1A9383FE43@vtiger.fosslabs.com>

Author: richie
Date: Thu Jun 29 10:29:06 2006
New Revision: 7680

Log:
Support for last view done

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

Modified: vtigercrm/trunk/Smarty/templates/Buttons_List.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Buttons_List.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Buttons_List.tpl Thu Jun 29 10:29:06 2006
@@ -1,126 +1,128 @@
-{*<!--
-/*********************************************************************************
-  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
-   * ("License"); You may not use this file except in compliance with the License
-   * The Original Code is:  vtiger CRM Open Source
-   * The Initial Developer of the Original Code is vtiger.
-   * Portions created by vtiger are Copyright (C) vtiger.
-   * All Rights Reserved.
-  *
- ********************************************************************************/
--->*}
-<script type="text/javascript" src="modules/{$MODULE}/{$SINGLE_MOD}.js"></script>
-<!-- Activity createlink layer start  -->
-{if $MODULE eq 'Activities'}
-<div id="reportLay" style="width: 125px; right: 159px; top: 260px; display: none; z-index:50" onmouseout="fninvsh('reportLay')" onmouseover="fnvshNrm('reportLay')">
-        <table bgcolor="#ffffff" border="0" cellpadding="0" cellspacing="0" width="100%">
-                <tr>
-                        <td>
-                                <a href="index.php?module={$MODULE}&action=EditView&return_module={$MODULE}&activity_mode=Events&return_action=DetailView&parenttab={$CATEGORY}" class="calMnu">{$NEW_EVENT}</a>
-                                <a href="index.php?module={$MODULE}&action=EditView&return_module={$MODULE}&activity_mode=Task&return_action=DetailView&parenttab={$CATEGORY}" class="calMnu">{$NEW_TASK}</a>
-                        </td>
-                </tr>
-        </table>
-
-</div>
-{/if}
-<!-- Activity createlink layer end  -->
-
-
-<TABLE border=0 cellspacing=0 cellpadding=0 width=100% class=small>
-<tr><td style="height:2px"></td></tr>
-<tr>
-	<td style="padding-left:10px;padding-right:50px" class="moduleName" nowrap>{$APP.$CATEGORY} > <a class="hdrLink" href="index.php?action=ListView&module={$MODULE}">{$APP.$MODULE}</a></td>
-	<td width=100% nowrap>
-	
-		<table border="0" cellspacing="0" cellpadding="0" >
-		<tr>
-		<td class="sep1" style="width:1px;"></td>
-		<td class=small >
-			<!-- Add and Search -->
-			<table border=0 cellspacing=0 cellpadding=0>
-			<tr>
-			<td>
-				<table border=0 cellspacing=0 cellpadding=5>
-				<tr>
-					{if $CHECK.EditView eq 'yes' && $MODULE neq 'Emails' && $MODULE neq 'Webmails'}
-			        		{if $MODULE eq 'Activities'}
-		                      	        	<td style="padding-right:0px;padding-left:10px;"><a href="javascript:;" id="showSubMenu"  onMouseOver="fnvshobj(this,'reportLay');" onMouseOut="fninvsh('reportLay');"><img src="{$IMAGE_PATH}btnL3Add.gif" alt="{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}..." title="{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}..." border=0></a></td>
-                	   			 {else}
-	                        		       	<td style="padding-right:0px;padding-left:10px;"><a href="index.php?module={$MODULE}&action=EditView&return_action=DetailView&parenttab={$CATEGORY}"><img src="{$IMAGE_PATH}btnL3Add.gif" alt="{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}..." title="{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}..." border=0></a></td>
-			                       	{/if}
-					{else}
-						<td style="padding-right:0px;padding-left:10px;"><img src="{$IMAGE_PATH}btnL3Add-Faded.gif" alt="{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}..." title="{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}..." border=0></td>	
-					{/if}
-									
-					{if $CHECK.index eq 'yes' && $MODULE neq 'Emails' && $MODULE neq 'Webmails'}
-						 <td style="padding-right:10px"><a href="javascript:;" onClick="moveMe('searchAcc');searchshowhide('searchAcc','advSearch')" ><img src="{$IMAGE_PATH}btnL3Search.gif" alt="{$APP.LBL_SEARCH_ALT}{$MODULE}..." title="{$APP.LBL_SEARCH_TITLE}{$MODULE}..." border=0></a></a></td>
-					{else}
-						<td style="padding-right:10px"><img src="{$IMAGE_PATH}btnL3Search-Faded.gif" alt="{$APP.LBL_SEARCH_ALT}{$MODULE}..." title="{$APP.LBL_SEARCH_TITLE}{$MODULE}..." border=0></td>
-					{/if}
-					
-				</tr>
-				</table>
-			</td>
-			</tr>
-			</table>
-		</td>
-		<td style="width:20px;">&nbsp;</td>
-		<td class="small">
-			<!-- Calendar Clock Calculator and Chat -->
-				<table border=0 cellspacing=0 cellpadding=5>
-				<tr>
-					<td style="padding-right:0px;padding-left:10px;"><a href="javascript:;" onClick='fnvshobj(this,"miniCal");getMiniCal();'><img src="{$IMAGE_PATH}btnL3Calendar.gif" alt="{$APP.LBL_CALENDAR_ALT}" title="{$APP.LBL_CALENDAR_TITLE}" border=0></a></a></td>
-					<td style="padding-right:0px"><a href="javascript:;"><img src="{$IMAGE_PATH}btnL3Clock.gif" alt="{$APP.LBL_CLOCK_ALT}" title="{$APP.LBL_CLOCK_TITLE}" border=0 onClick="fnvshobj(this,'wclock');"></a></a></td>
-					<td style="padding-right:0px"><a href="#"><img src="{$IMAGE_PATH}btnL3Calc.gif" alt="{$APP.LBL_CALCULATOR_ALT}" title="{$APP.LBL_CALCULATOR_TITLE}" border=0 onClick="fnvshobj(this,'calculator_cont');fetch_calc();"></a></td>
-					<td style="padding-right:10px"><a href="javascript:;" onClick='return window.open("index.php?module=Contacts&action=vtchat","Chat","width=450,height=400,resizable=1,scrollbars=1");'><img src="{$IMAGE_PATH}tbarChat.gif" alt="{$APP.LBL_CHAT_ALT}" title="{$APP.LBL_CHAT_TITLE}" border=0></a>
-                    </td>	
-				</tr>
-				</table>
-		</td>
-		<td style="width:20px;">&nbsp;</td>
-		<td class="small">
-			<!-- Import / Export -->
-			<table border=0 cellspacing=0 cellpadding=5>
-			<tr>
-			{if $MODULE eq 'Contacts' || $MODULE eq 'Leads' || $MODULE eq 'Accounts' || $MODULE eq 'Potentials' || $MODULE eq 'Products' }
-		   		{if $CHECK.Import eq 'yes'}	
-					<td style="padding-right:0px;padding-left:10px;"><a href="index.php?module={$MODULE}&action=Import&step=1&return_module={$MODULE}&return_action=index&parenttab={$CATEGORY}"><img src="{$IMAGE_PATH}tbarImport.gif" alt="{$APP.LBL_IMPORT} {$APP.$MODULE}" title="{$APP.LBL_IMPORT} {$APP.$MODULE}" border="0"></a></td>	
-				{else}	
-					<td style="padding-right:0px;padding-left:10px;"><img src="{$IMAGE_PATH}tbarImport-Faded.gif" alt="{$APP.LBL_IMPORT} {$APP.$MODULE}" title="{$APP.LBL_IMPORT} {$APP.$MODULE}" border="0"></td>	
-				{/if}	
-				{if $CHECK.Export eq 'yes'}	
-	    			<td style="padding-right:10px"><a href="index.php?module={$MODULE}&action=Export&all=1"><img src="{$IMAGE_PATH}tbarExport.gif" alt="{$APP.LBL_EXPORT} {$APP.$MODULE}" title="{$APP.LBL_EXPORT} {$APP.$MODULE}" border="0"></a></td>
-				{else}	
-					<td style="padding-right:10px"><img src="{$IMAGE_PATH}tbarExport-Faded.gif" alt="{$APP.LBL_EXPORT} {$APP.$MODULE}" title="{$APP.LBL_EXPORT} {$APP.$MODULE}" border="0"></td>
-                {/if}
-			{elseif $MODULE eq 'Notes' || $MODULE eq 'Emails'}	
-				
-				{if $CHECK.Export eq 'yes'}
-					<td style="padding-right:0px;padding-left:10px;"><img src="{$IMAGE_PATH}tbarImport-Faded.gif" alt="{$APP.LBL_IMPORT} {$APP.$MODULE}" title="{$APP.LBL_IMPORT} {$APP.$MODULE}" border="0"></td>
-					<td style="padding-right:10px"><a href="index.php?module={$MODULE}&action=Export&all=1"><img src="{$IMAGE_PATH}tbarExport.gif" alt="{$APP.LBL_EXPORT} {$APP.$MODULE}" title="{$APP.LBL_EXPORT} {$APP.$MODULE}" border="0"></a></td>
-				{else}	 
-					<td style="padding-right:0px;padding-left:10px;"><img src="{$IMAGE_PATH}tbarImport-Faded.gif" alt="{$APP.LBL_IMPORT} {$APP.$MODULE}" title="{$APP.LBL_IMPORT} {$APP.$MODULE}" border="0"></td>
-					<td style="padding-right:10px"><img src="{$IMAGE_PATH}tbarExport-Faded.gif" alt="{$APP.LBL_EXPORT} {$APP.$MODULE}" title="{$APP.LBL_EXPORT} {$APP.$MODULE}" border="0"></td>
-				{/if}
-			{else}
-				<td style="padding-right:0px;padding-left:10px;"><img src="{$IMAGE_PATH}tbarImport-Faded.gif" alt="{$APP.LBL_IMPORT} {$APP.$MODULE}" title="{$APP.LBL_IMPORT} {$APP.$MODULE}" border="0"></td>
-                <td style="padding-right:10px"><img src="{$IMAGE_PATH}tbarExport-Faded.gif" alt="{$APP.LBL_EXPORT} {$APP.$MODULE}" title="{$APP.LBL_EXPORT} {$APP.$MODULE}" border="0"></td>
-			{/if}
-			</tr>
-			</table>	
-		<td style="width:20px;">&nbsp;</td>
-		<td class="small">
-			<!-- All Menu -->
-				<table border=0 cellspacing=0 cellpadding=5>
-				<tr>
-				<td style="padding-left:10px;"><a href="javascript:;" onmouseout="fninvsh('allMenu');" onClick="fnvshobj(this,'allMenu')"><img src="{$IMAGE_PATH}btnL3AllMenu.gif" alt="{$APP.LBL_ALL_MENU_ALT}" title="{$APP.LBL_ALL_MENU_TITLE}" border="0"></a></td>
-				</tr>
-				</table>
-		</td>			
-		</tr>
-		</table>
-	</td>
-</tr>
-<tr><td style="height:2px"></td></tr>
-</TABLE>
+{*<!--
+/*********************************************************************************
+  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
+   * ("License"); You may not use this file except in compliance with the License
+   * The Original Code is:  vtiger CRM Open Source
+   * The Initial Developer of the Original Code is vtiger.
+   * Portions created by vtiger are Copyright (C) vtiger.
+   * All Rights Reserved.
+  *
+ ********************************************************************************/
+-->*}
+<script type="text/javascript" src="modules/{$MODULE}/{$SINGLE_MOD}.js"></script>
+<!-- Activity createlink layer start  -->
+{if $MODULE eq 'Activities'}
+<div id="reportLay" style="width: 125px; right: 159px; top: 260px; display: none; z-index:50" onmouseout="fninvsh('reportLay')" onmouseover="fnvshNrm('reportLay')">
+        <table bgcolor="#ffffff" border="0" cellpadding="0" cellspacing="0" width="100%">
+                <tr>
+                        <td>
+                                <a href="index.php?module={$MODULE}&action=EditView&return_module={$MODULE}&activity_mode=Events&return_action=DetailView&parenttab={$CATEGORY}" class="calMnu">{$NEW_EVENT}</a>
+                                <a href="index.php?module={$MODULE}&action=EditView&return_module={$MODULE}&activity_mode=Task&return_action=DetailView&parenttab={$CATEGORY}" class="calMnu">{$NEW_TASK}</a>
+                        </td>
+                </tr>
+        </table>
+
+</div>
+{/if}
+<!-- Activity createlink layer end  -->
+
+
+<TABLE border=0 cellspacing=0 cellpadding=0 width=100% class=small>
+<tr><td style="height:2px"></td></tr>
+<tr>
+	<td style="padding-left:10px;padding-right:50px" class="moduleName" nowrap>{$APP.$CATEGORY} > <a class="hdrLink" href="index.php?action=ListView&module={$MODULE}">{$APP.$MODULE}</a></td>
+	<td width=100% nowrap>
+	
+		<table border="0" cellspacing="0" cellpadding="0" >
+		<tr>
+		<td class="sep1" style="width:1px;"></td>
+		<td class=small >
+			<!-- Add and Search -->
+			<table border=0 cellspacing=0 cellpadding=0>
+			<tr>
+			<td>
+				<table border=0 cellspacing=0 cellpadding=5>
+				<tr>
+					{if $CHECK.EditView eq 'yes' && $MODULE neq 'Emails' && $MODULE neq 'Webmails'}
+			        		{if $MODULE eq 'Activities'}
+		                      	        	<td style="padding-right:0px;padding-left:10px;"><a href="javascript:;" id="showSubMenu"  onMouseOver="fnvshobj(this,'reportLay');" onMouseOut="fninvsh('reportLay');"><img src="{$IMAGE_PATH}btnL3Add.gif" alt="{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}..." title="{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}..." border=0></a></td>
+                	   			 {else}
+	                        		       	<td style="padding-right:0px;padding-left:10px;"><a href="index.php?module={$MODULE}&action=EditView&return_action=DetailView&parenttab={$CATEGORY}"><img src="{$IMAGE_PATH}btnL3Add.gif" alt="{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}..." title="{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}..." border=0></a></td>
+			                       	{/if}
+					{else}
+						<td style="padding-right:0px;padding-left:10px;"><img src="{$IMAGE_PATH}btnL3Add-Faded.gif" alt="{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}..." title="{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}..." border=0></td>	
+					{/if}
+									
+					{if $CHECK.index eq 'yes' && $MODULE neq 'Emails' && $MODULE neq 'Webmails'}
+						 <td style="padding-right:10px"><a href="javascript:;" onClick="moveMe('searchAcc');searchshowhide('searchAcc','advSearch')" ><img src="{$IMAGE_PATH}btnL3Search.gif" alt="{$APP.LBL_SEARCH_ALT}{$MODULE}..." title="{$APP.LBL_SEARCH_TITLE}{$MODULE}..." border=0></a></a></td>
+					{else}
+						<td style="padding-right:10px"><img src="{$IMAGE_PATH}btnL3Search-Faded.gif" alt="{$APP.LBL_SEARCH_ALT}{$MODULE}..." title="{$APP.LBL_SEARCH_TITLE}{$MODULE}..." border=0></td>
+					{/if}
+					
+				</tr>
+				</table>
+			</td>
+			</tr>
+			</table>
+		</td>
+		<td style="width:20px;">&nbsp;</td>
+		<td class="small">
+			<!-- Calendar Clock Calculator and Chat -->
+				<table border=0 cellspacing=0 cellpadding=5>
+				<tr>
+					<td style="padding-right:0px;padding-left:10px;"><a href="javascript:;" onClick='fnvshobj(this,"miniCal");getMiniCal();'><img src="{$IMAGE_PATH}btnL3Calendar.gif" alt="{$APP.LBL_CALENDAR_ALT}" title="{$APP.LBL_CALENDAR_TITLE}" border=0></a></a></td>
+					<td style="padding-right:0px"><a href="javascript:;"><img src="{$IMAGE_PATH}btnL3Clock.gif" alt="{$APP.LBL_CLOCK_ALT}" title="{$APP.LBL_CLOCK_TITLE}" border=0 onClick="fnvshobj(this,'wclock');"></a></a></td>
+					<td style="padding-right:0px"><a href="#"><img src="{$IMAGE_PATH}btnL3Calc.gif" alt="{$APP.LBL_CALCULATOR_ALT}" title="{$APP.LBL_CALCULATOR_TITLE}" border=0 onClick="fnvshobj(this,'calculator_cont');fetch_calc();"></a></td>
+					<td style="padding-right:10px"><a href="javascript:;" onClick='return window.open("index.php?module=Contacts&action=vtchat","Chat","width=450,height=400,resizable=1,scrollbars=1");'><img src="{$IMAGE_PATH}tbarChat.gif" alt="{$APP.LBL_CHAT_ALT}" title="{$APP.LBL_CHAT_TITLE}" border=0></a>
+                    </td>	
+					<td style="padding-right:10px"><img src="{$IMAGE_PATH}btnL3Tracker.gif" alt="{$APP.LBL_CHAT_ALT}" title="{$APP.LBL_CHAT_TITLE}" border=0 onClick="fnvshobj(this,'tracker');">
+                    			</td>	
+				</tr>
+				</table>
+		</td>
+		<td style="width:20px;">&nbsp;</td>
+		<td class="small">
+			<!-- Import / Export -->
+			<table border=0 cellspacing=0 cellpadding=5>
+			<tr>
+			{if $MODULE eq 'Contacts' || $MODULE eq 'Leads' || $MODULE eq 'Accounts' || $MODULE eq 'Potentials' || $MODULE eq 'Products' }
+		   		{if $CHECK.Import eq 'yes'}	
+					<td style="padding-right:0px;padding-left:10px;"><a href="index.php?module={$MODULE}&action=Import&step=1&return_module={$MODULE}&return_action=index&parenttab={$CATEGORY}"><img src="{$IMAGE_PATH}tbarImport.gif" alt="{$APP.LBL_IMPORT} {$APP.$MODULE}" title="{$APP.LBL_IMPORT} {$APP.$MODULE}" border="0"></a></td>	
+				{else}	
+					<td style="padding-right:0px;padding-left:10px;"><img src="{$IMAGE_PATH}tbarImport-Faded.gif" alt="{$APP.LBL_IMPORT} {$APP.$MODULE}" title="{$APP.LBL_IMPORT} {$APP.$MODULE}" border="0"></td>	
+				{/if}	
+				{if $CHECK.Export eq 'yes'}	
+	    			<td style="padding-right:10px"><a href="index.php?module={$MODULE}&action=Export&all=1"><img src="{$IMAGE_PATH}tbarExport.gif" alt="{$APP.LBL_EXPORT} {$APP.$MODULE}" title="{$APP.LBL_EXPORT} {$APP.$MODULE}" border="0"></a></td>
+				{else}	
+					<td style="padding-right:10px"><img src="{$IMAGE_PATH}tbarExport-Faded.gif" alt="{$APP.LBL_EXPORT} {$APP.$MODULE}" title="{$APP.LBL_EXPORT} {$APP.$MODULE}" border="0"></td>
+                {/if}
+			{elseif $MODULE eq 'Notes' || $MODULE eq 'Emails'}	
+				
+				{if $CHECK.Export eq 'yes'}
+					<td style="padding-right:0px;padding-left:10px;"><img src="{$IMAGE_PATH}tbarImport-Faded.gif" alt="{$APP.LBL_IMPORT} {$APP.$MODULE}" title="{$APP.LBL_IMPORT} {$APP.$MODULE}" border="0"></td>
+					<td style="padding-right:10px"><a href="index.php?module={$MODULE}&action=Export&all=1"><img src="{$IMAGE_PATH}tbarExport.gif" alt="{$APP.LBL_EXPORT} {$APP.$MODULE}" title="{$APP.LBL_EXPORT} {$APP.$MODULE}" border="0"></a></td>
+				{else}	 
+					<td style="padding-right:0px;padding-left:10px;"><img src="{$IMAGE_PATH}tbarImport-Faded.gif" alt="{$APP.LBL_IMPORT} {$APP.$MODULE}" title="{$APP.LBL_IMPORT} {$APP.$MODULE}" border="0"></td>
+					<td style="padding-right:10px"><img src="{$IMAGE_PATH}tbarExport-Faded.gif" alt="{$APP.LBL_EXPORT} {$APP.$MODULE}" title="{$APP.LBL_EXPORT} {$APP.$MODULE}" border="0"></td>
+				{/if}
+			{else}
+				<td style="padding-right:0px;padding-left:10px;"><img src="{$IMAGE_PATH}tbarImport-Faded.gif" alt="{$APP.LBL_IMPORT} {$APP.$MODULE}" title="{$APP.LBL_IMPORT} {$APP.$MODULE}" border="0"></td>
+                <td style="padding-right:10px"><img src="{$IMAGE_PATH}tbarExport-Faded.gif" alt="{$APP.LBL_EXPORT} {$APP.$MODULE}" title="{$APP.LBL_EXPORT} {$APP.$MODULE}" border="0"></td>
+			{/if}
+			</tr>
+			</table>	
+		<td style="width:20px;">&nbsp;</td>
+		<td class="small">
+			<!-- All Menu -->
+				<table border=0 cellspacing=0 cellpadding=5>
+				<tr>
+				<td style="padding-left:10px;"><a href="javascript:;" onmouseout="fninvsh('allMenu');" onClick="fnvshobj(this,'allMenu')"><img src="{$IMAGE_PATH}btnL3AllMenu.gif" alt="{$APP.LBL_ALL_MENU_ALT}" title="{$APP.LBL_ALL_MENU_TITLE}" border="0"></a></td>
+				</tr>
+				</table>
+		</td>			
+		</tr>
+		</table>
+	</td>
+</tr>
+<tr><td style="height:2px"></td></tr>
+</TABLE>



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 29 09:38:30 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 29 Jun 2006 16:38:30 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7681 -
	/vtigercrm/trunk/themes/blue/style.css
Message-ID: <20060629163830.EA2D183FE79@vtiger.fosslabs.com>

Author: richie
Date: Thu Jun 29 10:38:19 2006
New Revision: 7681

Log:
Support for last view done

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 Jun 29 10:38:19 2006
@@ -1,2858 +1,2875 @@
-.small {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	line-height: 14px;
-	color: #000000;
-}
-.big {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	line-height: 18px;
-	color: #000000;
-	font-weight:bold;
-}
-
-.ybToday {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	line-height: 14px;
-	color: #119911;
-}
-.ybUnfinished {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	line-height: 14px;
-	color: #993311;
-}
-.ybTime {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	line-height: 14px;
-	color: #777777;
-	font-weight:bold;
-}
-.yellowBox {
-	background-color:#ffffE1;
-	border:1px solid #999999;
-}
-.ybSeperator{
-	height:0px;
-	border-top:2px dotted #adadad;
-}
-
-.genHeaderBig{
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 16px;
-	line-height: 19px;
-	color: #000000;
-	font-weight:bold;
-}
-.genHeaderSmall{
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 14px;
-	line-height: 16px;
-	color: #000000;
-	font-weight:bold;
-}
-
-.moduleName {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 18px;
-	color: #000000;
-	font-weight:bold;
-}
-
-.rssDisplayPanel {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	line-height: 12px;
-	color: #ABABAB;
-}
-.hdrNameBg {
-
-	background:url(images/topBg.gif);
-}
-
-.hdrTabBg {
-	background:#bbbbbb url(images/tabUnSelectedBg.gif) repeat-x ;
-}
-
-.tabSelected {
-	background:#bbbbbb url(images/tabSelectedBg.gif) repeat-x;
-	font-family:  Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	padding-left:15px;
-	padding-right:15px;
-	padding-top:2px;
-	padding-bottom:2px;
-
-}
-
-.tabUnSelected {
-	background:#bbbbbb url(images/tabUnSelectedBg.gif) repeat-x;
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	padding-left:15px;
-	padding-right:15px;
-	padding-top:2px;
-	padding-bottom:2px;
-}
-
-.tabSeperator {
-	background:#bbbbbb url(images/tabSeperatorBg.gif) repeat-x;
-}
-
-/*.level2text {
-	background:#bbbbbb url(images/level2Bg.gif) repeat-x;
-    font-family: Arial, Helvetica, sans-serif;
-    font-size: 11px;
-	padding-left:20px;
-	padding-right:20px;
-	padding-top:5px;
-	padding-bottom:5px;
-	font-weight:bold;
-	color:white;
-}*/
-
-.level2text {
-    background:#bbbbbb url(images/level2Bg.gif) repeat-x;
-    font-family: Arial, Helvetica, sans-serif;
-    font-size: 11px;
-    padding-left:20px;
-    padding-right:20px;
-    padding-top:5px;
-    padding-bottom:5px;
-    font-weight:bold;
-    color:white;
-}
-
-.level2text a{
-	text-decoration:none;
-	color:white;
-}
-
-.level2text a:hover {
-	text-decoration:underline;
-	color:white;
-
-}
-
-.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;
-	font-size: 11px;
-}
-
-.level2textSel{
-	font-weight:bold;
-	color:#000000;
-	padding-left:20px;
-	padding-right:20px;
-	padding-top:3px;
-	padding-bottom:3px;
-}
-	
-
-.tabLiner {
-	background:#9abffc url(images/moduleSelectorBg.gif) bottom repeat-x;
-	padding:0px;
-}
-
-.sep1 {
-	background:#999999;
-}
-
-.showPanelBg {
-	background:url(images/showPanelTopBg.gif) repeat-x;
-}
-
-a {
-	text-decoration:none;
-	color:#003399;
-}
-
-a:hover {
-	text-decoration:underline;
-}
-
-.hdrLink {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 18px;
-	text-decoration:none;
-	color:#333333;
-	font-weight:bold;
-}
-
-.hdrLink:hover {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 18px;
-	text-decoration:underline;
-	color:#333333;
-	font-weight:bold;
-}
-
-.searchBox {
-	border: 0px solid #999999;
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	padding-left:2px;
-	width:100px;
-	background-color:#ffffef;
-}
-
-.searchBtn {
-	border : 1px #cccccc solid;
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	width:30px;
-	height:19px;
-	background-color:#cccccc;
-}
-
-.lvtBg {
-	background-color:#cccccc;
-
-}
-
-.lvtHeaderText {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 14px;
-	font-weight:bold;
-}
-
-.lvtCol {
-	border-top:1px solid #eeeeee;
-	border-left:1px solid #eeeeee;
-	border-right:1px solid #999999;
-	border-bottom:1px solid #999999;
-	background-color:#dadada;
-	color:#666666;
-	font-weight:bold;
-}
-
-.lvtColData {
-	background-color:#fafafa;
-}
-
-.lvtColDataHover {
-	background-color:#efefef;
-}
-
-.dvtSelectedCell {
-	border-left:1px solid #cacaca;
-	border-top:3px solid #999999;
-	border-right:1px solid #cacaca;
-	padding-left:20px;
-	padding-right:20px;
-	background-color:white;
-	font-weight:bold;
-}
-
-.dvtUnSelectedCell {
-	border-left:1px solid #cacaca;
-	border-top:1px solid #cacaca;
-	border-right:1px solid #cacaca;
-	border-bottom:1px solid #cacaca;
-	padding-left:20px;
-	padding-right:20px;
-	background-color:#efefef;
-	cursor:pointer;
-}
-
-.dvtTabCache {
-	border-bottom:1px solid #cacaca;
-}
-
-.dvtContentSpace {
-	border-left:1px solid #cacaca;
-	border-right:1px solid #cacaca;
-	border-bottom:1px solid #cacaca;
-	padding-left:0px;
-}
-
-.rightAddInfo {
-	border-left:1px solid #a2a2a2;
-	border-right:1px solid #dddddd;
-	border-bottom:1px solid #dddddd;
-	border-top:1px solid #a2a2a2;
-	background-color:#fafafa;
-	padding:5px;
-}
-
-.dvtCellLabel {
-	background-color:#f6f6f6;
-	padding-right:10px;
-	border-bottom:1px solid #eaeaea;
-	color:#737373;
-	white-space:nowrap;
-}
-
-.dvtCellInfo {
-	padding-left:10px;
-	border-bottom:1px solid #eaeaea;
-	white-space:nowrap;
-}
-
-.rightMailMerge {
-	border:1px solid #dddddd
-}
-
-.rightMailMergeHeader {
-	border-bottom:1px solid #dddddd;
-	padding:5px;
-	background-color:#eaeaea;
-
-}
-
-.rightMailMergeContent {
-	padding:5px;
-	background-color:#fafafa;
-
-}
-
-.rightUpcomingActivitiesHeader{
-	border-bottom:1px solid #ddddcc;
-	padding:5px;
-	background-color:#ffffdd;
-}
-
-.rightUpcomingActivitiesContent {
-	padding:5px;
-	background-color:#ffffef;
-}
-
-.detailedViewHeader{
-	border-bottom:1px solid #999999;
-	padding:5px; 
-	background-color:#e5e5e5;
-
-}
-
-.detailedViewTextBox {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	color: #000000;
-	border:1px solid #bababa;
-	padding-left:5px;
-	width:90%;
-	background-color:#ffffff;
-}
-
-.detailedViewProdTextBox {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	color: #000000;
-	border:1px solid #bababa;
-	padding-left:5px;
-	width:85%;
-	background-color:#ffffff;
-}
-
-.detailedViewTextBoxOn {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	color: #000000;
-	border:1px solid #bababa;
-	padding-left:5px;
-	width:90%;
-	background-color:#ffffdd;
-}
-
-.detailedViewTextArea {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	color: #000000;
-	border:1px solid #bababa;
-	padding-left:5px;
-	width:95%;
-	height:100px;
-	background-color:#ffffff;
-	text-align:left;
-}
-
-.moduleSearch {
-	border:1px solid #dddddd;
-	background-color:#ffffef;
-
-}
-
-.searchHdrBox {
-
-	border-bottom:1px dashed #dddddd;
-}
-
-.advSearch {
-	padding:10px;
-	border-left:1px solid #eaeaea; 
-	border-right:1px solid #eaeaea; 
-	border-bottom:1px solid #eaeaea; 	
-	overflow:auto;
-	width:600px;
-	height:150px;
-	background-color:#ffffef;
-
-}
-
-.searchAlph {
-	border:1px solid #dadada;
-	background-color:#ffffff;
-	cursor:pointer;
-	width:10px
-
-}
-.searchAlphselected {
-	border:1px solid #666666;
-	background-color:#bbbbbb;
-	cursor:pointer;
-	width:10px
-
-}
-.searchNotFound {
-	border:2px solid #ff3333;
-	background-color:#fafafa;
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	color: #ff0000;
-	height:50px;
-	width:640px;
-}
-
-.hiliteBtn4Search {
-	border:1px solid #cccccc;
-	background-color:#fafafa;
-	line-height:37px;
-	height:40px;
-	padding:5px;
-}
-
-.loginTopBg {
-	background:url(images/loginTopBg.gif) repeat-x;
-}
-
-.loginTopShade {
-	background:url(images/loginTopShade.gif) repeat-x;
-}
-
-.loginBg{
-	background:#448cEB url(images/loginBg.gif) repeat-x;
-}
-
-.textbox {
-	border:1px solid #999999;
-	background-color:#ffffff;
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	width:120px;
-	padding:2px;
-
-}
-
-.loginBottomBg {
-	background:url(images/loginBottomBg.gif) repeat-x;
-}
-
-.loginSignin {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 18px;
-	color: #448ceb;
-	font-weight:bold;
-}
-
-.loginBillBoard {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	color:#ffffff;
-}
-
-.mx {
-}
-
-.calTopBg {
-	background:url(images/calBg.gif) repeat-x;
-}
-
-.calDisplay {
-	border-left:1px solid #d0d0d0;
-	border-right:1px solid #d0d0d0;
-}
-.calBottomBg {
-	background:url(images/calBottomBg.gif) repeat-x;
-}
-
-.calDayHourCell {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 18px;
-}
-.calDayHour {
-	border-top:2px solid #dadada;
-}
-.calDiv {
-	overflow:auto; width:95%;height:320px;padding:0px;background-color:#fefefe;
-	border-top: 1px solid #bababa;
-	border-bottom: 1px solid #bababa;
-}
-
-.calHourOccupied {
-	background-color:#ffffbb;
-
-}
-
-.calAddEvent {
-	position:absolute;
-	z-index:10000;
-	width:500px;
-
-	left:200px;
-	top:150px;
-	border:2px solid #999999;
-	background-color:#ffffff;
-	padding:5px;
-}
-
-.addEventHeader{
-	border-bottom:2px dotted #cccccc;
-}
-
-.addEventFooter{
-	border-top:2px dotted #cccccc;
-	height:40px;
-}
-
-.addEventInnerBox {
-	border:1px dotted #dadada;
-
-}
-
-.cellScheduled {
-	background-color:#ffffef;
-	color:#7a7a7a;
-}
-
-.cellSchHover {
-	border-bottom:1px solid #999999;
-	border-right:1px solid #999999;
-	border-left:1px solid #dadada;
-	border-top:1px solid #dadada;
-	background-color:#ffffef;	
-	color:#7a7a7a;	
-}
-
-.cellSch{
-	border:0px;
-	background-color:#ffffef;
-	color:#7a7a7a;
-}
-
-.cellNormalHover {
-	border-bottom:1px solid #999999;
-	border-right:1px solid #999999;
-	border-left:1px solid #dadada;
-	border-top:1px solid #dadada;
-	background-color:#ffffff;	
-	color:#7a7a7a;	
-}
-
-.cellNormal {
-	border:0px;
-	background-color:#ffffff;
-}
-
-.calEventNormal {
-        border:1px solid #999999;
-        background-color:#99ffcc;
-
-}
-
-.calEventCritical {
-        border:1px solid #999999;
-        background-color:#FFCC33;
-}
-.tblPro1 {
-
-border:2px solid #dadada;
-       background-color:white;
-
-}
-
-.tblPro1IconCell {
-    border-right:1px solid #dadada;
-}
-
-.tblPro1HeadingCell {
-    font-weight:bold;
-color:#4a4a4a;
-}
-
-.tblPro1ColHeader {
-    background-color:#dadada;
-    border-left:1px solid white;
-    border-right:1px solid #999999;
-    font-size: 11px;
-    line-height: 14px;
-    background-image:url(images/tblPro1ColBg.gif);
-}
-
-.tblPro1DataCell {
-    border-bottom:1px solid #f5f5f5;
-    color:#5a5a5a;
-    font-size: 11px;
-    line-height: 14px;
-
-}
-
-.divEventToDo {
-overflow:auto;
-height:150px;
-border:1px solid #dadada;
-
-}
-
-.EventToDo{
-
-}
-
-.thumbnail{
-    background-color:#ffffff;
-padding: 7px;
-border: 1px solid #ddd;
-float: left;
-	   margin-right: 10px;
-	   margin-bottom: 15px;
-}
-
-.thumbnailcaption
-{ font-size: 0.9em; padding-top: 0.2em ;	}
-
-/* For Settings */
-
-.lftMnuTab{
-    font-family:Verdana, Arial, Helvetica, sans-serif;
-    font-size:12px;
-    color:#FFFFFF;
-    background-color:#BBBBBB;
-    border-left:1px solid #666666;
-    border-right:1px solid #666666;
-    border-top:0px solid #666666;
-    border-collapse:collapse;
-    text-align:right;
-    padding-top:0px;
-    padding-left:5px;
-    padding-right:5px;
-    vertical-align:top;
-}
-
-.lftMnuHdr{
-    font-family:Arial, Helvetica, sans-serif;
-    font-size:12px;
-    font-weight:bold;
-    color:white;
-    background-color:#DDDDDD;
-    border-bottom:1px solid #BBBBBB;
-    text-decoration:none;
-    width:99%;
-}
-
-.lftMnuHdr tr td{
-    font-family:Arial, Helvetica, sans-serif;
-    font-size:12px;
-    font-weight:bold;
-    color:white;
-    background-color:#DDDDDD;
-    border-bottom:1px solid #BBBBBB;
-    text-align:left;
-    text-decoration:none;
-    height:25px;
-    padding-right:0px;
-    padding-left:0px;
-}
-
-a.lftMnuHdr{
-    font-family:Arial, Helvetica, sans-serif;
-    font-size:12px;
-    font-weight:bold;
-    color:white;
-    background-color:#666666;
-    border-top:1px solid #BBBBBB;
-    border-bottom:1px solid #999999;
-    text-align:left;
-    text-decoration:none;
-    height:25px;
-    padding-left:5px;
-    width:100%;
-    display:block;
-    vertical-align:middle;
-}
-
-a.lftMnuHdr:Hover{
-    font-family:Arial, Helvetica, sans-serif;
-    font-size:12px;
-    font-weight:bold;
-    color:white;
-    background-color:#666666;
-    border-top:1px solid #BBBBBB;
-    border-bottom:1px solid #999999;
-    text-align:left;
-    text-decoration:none;
-    height:25px;
-    padding-left:5px;
-    width:100%;
-    display:block;
-}
-
-a.lftSubMnu{
-    font-family:Arial, Helvetica, sans-serif;
-    font-size:11px;
-    font-weight:normal;
-    display:block;
-    color:#666666;
-    height:20px;
-    width:93%;
-    text-align:left;
-    padding-left:15px;
-    text-decoration:none;
-    border-bottom:1px solid #BBBBBB;
-    padding-top:2px;
-    white-space:nowrap;
-}
-
-a.lftSubMnu:Hover{
-    font-family:Arial, Helvetica, sans-serif;
-    font-size:11px;
-    font-weight:normal;
-    display:block;
-    color:#666666;
-    height:20px;
-    width:93%;
-    text-align:left;
-    padding-left:15px;
-    text-decoration:none;
-    border-bottom:1px solid #BBBBBB;
-    padding-top:2px;
-    white-space:nowrap;
-    background-color:#CCCCCC;
-}
-
-.padTab{
-    padding-top:10px;
-    padding-left:10px;
-    padding-left:10px;
-    padding-bottom:0px;
-    vertical-align:top;
-    background-color:#FFFFFF;
-}
-
-.controlTab{
-    font-family:Arial, Helvetica, sans-serif;
-    font-size:12px;
-    text-align:center;
-    font-weight:bold;
-    text-decoration:none;
-    width:100%;
-    border:0px;
-}   
-
-.controlTab tr td{
-    font-family:Arial, Helvetica, sans-serif;
-    font-size:12px;
-    text-align:center;
-    font-weight:bold;
-    text-decoration:none;
-    vertical-align:bottom;
-}
-
-#company{
-    position:relative;
-    width:100%;
-    height:200px;
-    display:block;
-    background-color:#FFFFFF;
-    white-space:nowrap;
-    overflow:auto;
-    border:1px solid #CCCCCC;
-}
-                               
-
-#user{position:relative;left:0px;top:0px;width:100%;display:block;}
-#studio{position:relative;left:0px;top:0px;width:100%;display:block;}
-#communication{position:relative;left:0px;top:0px;width:100%;display:block;}
-#config{position:relative;left:0px;top:0px;width:100%;display:block;}
-
-#userTab{position:relative;left:0px;top:0px;width:100%;display:none;}
-#studioTab{position:relative;left:0px;top:0px;width:100%;display:none;}
-
-#scrollTab{
-	position:relative;
-	width:100%;
-	height:350px;
-	overflow:auto;
-	border:0px solid #CCCCCC;
-	display:block;
-}
-
-.dock{
-	vertical-align:middle;
-	text-align:left;
-	padding-left:0px;
-}
-.imgDoc{
-	cursor:pointer;
-	border:0px;
-}
-
-#one{
-	position:relative;
-	display:block;
-	width:245px;
-}
-
-#mnuTab{
-	position:relative;
-	overflow:auto;
-	width:100%;
-	display:block;
-	top: 1px;
-
-}
-
-#mnuTab1{
-
-   position:relative;
-
-   overflow:auto;
-
-   width:100%;
-
-   display:none;
-
-}
-
-#mnuTab2{
-
-   position:relative;
-
-   overflow:auto;
-
-   width:100%;
-
-   display:none;
-
-}
-
-
-/* End of Settings */
-
-.bggray{
-	background-color: #dfdfdf;
-}
-.bgwhite{
-	background-color: #FFFFFF;
-}
-.copy{
-	font-size:9px;
-	font-family: Verdana, Arial, Helvetica, Sans-serif;
-}
-
-#basicTab{
-	position:relative;
-	overflow:auto;
-	width:100%;
-	display:block;
-}
-
-#moreTab{
-	position:relative;
-	overflow:auto;
-	width:100%;
-	display:none;
-}
-
-/*Added for Advance Seearch*/
-
-#scrollTab{
-	position:relative;
-	width:100%;
-	height:350px;
-	overflow:auto;
-	border:0px solid #CCCCCC;
-	display:block;
-}
-
-.dock{
-	vertical-align:middle;
-	text-align:left;
-	padding-left:0px;
-}
-
-.imgDoc{
-	cursor:pointer;
-	border:0px;
-}
-#slideMnu{
-	background-color:#BBBBBB;
-	vertical-align:top;
-}
-
-#one{
-	position:relative;
-	display:block;
-	width:245px;
-}
-
-.prdTab{
-	font-family:Arial, Helvetica, sans-serif;
-	font-size:11px;
-	text-align:left;
-	width:100%;
-	border-left:0px solid #CCCCCC;
-	border-right:0px solid #CCCCCC;
-	border-collapse:collapse;
-}
-
-.prdTab tr th{
-	font-family:Arial, Helvetica, sans-serif;
-	font-size:11px;
-	text-align:left;
-	border-right:1px solid #CCCCCC;
-	border-left:1px solid #CCCCCC;
-	padding-left:5px;
-	background-color:#E5E5E5;
-	height:20px;
-	color:#000000;
-	font-weight:bold;
-	text-decoration:none;
-	border-bottom:1px solid #CCCCCC;
-}
-
-.prdTab tr td{
-	font-family:Arial, Helvetica, sans-serif;
-	font-size:11px;
-	text-align:left;
-	border-right:1px solid #CCCCCC;
-	border-left:1px solid #CCCCCC;
-	border-bottom:1px solid #CCCCCC;
-	padding-left:5px;
-	color:#000000;
-	text-decoration:none;
-	font-weight:normal;
-	height:20px;
-}
-
-.delTxt{
-	font-family:Arial, Helvetica, sans-serif;
-	font-size:11px;
-	text-decoration:underline;
-	font-weight:normal;
-	color:#000099;
-	cursor:pointer;
-}
-
-/* Dashboard CSS */
-
-.dashMain{
-	font-family:Arial, Helvetica, sans-serif;
-	font-size:11px;
-	background-color:#EBEBEB;
-	width:840px;
-	border-left:1px solid #CBCBCB;
-	border-right:1px solid #CBCBCB;
-	border-bottom:1px solid #CBCBCB;
-}
-
-.dashMain tr th{
-	font-family:Arial, Helvetica, sans-serif;
-	font-size:11px;
-	padding:0px;
-	border:0px solid #CBCBCB;
-}
-.dashMain tr td{
-	font-family:Arial, Helvetica, sans-serif;
-	font-size:11px;
-	padding-left:10px;
-	border:0px solid #CBCBCB;
-}
-
-.dashMnuUnSel{
-	font-family:Arial, Helvetica, sans-serif;
-	font-size:11px;
-	text-decoration:none;
-	text-align:left;
-	padding:5px;
-	height:20px;
-	vertical-align:middle;
-}
-
-.dashMnuSel{
-	font-family:Arial, Helvetica, sans-serif;
-	font-size:11px;
-	text-decoration:none;
-	text-align:left;
-	background-color:#CBCBCB;
-	font-weight:bold;
-	color:#000000;
-	padding:5px;
-	height:20px;
-	vertical-align:middle;
-}
-
-.dashInner{
-	width:100%;
-	border:0px solid #000000;
-	padding:0px;
-}
-
-.dashInner tr td{
-	width:100%;
-	border:0px solid #000000;
-	padding-left:0px;
-	padding-bottom:0px;
-	padding-right:0px;
-	padding-top:0px;
-}
-
-#dashChart{
-	font-family:Verdana, Arial, Helvetica, sans-serif;
-	font-size:11px;
-	background-color:#EBEBEB;
-	width:640px;
-	height:425px;
-	overflow:auto;
-	padding-left:5px;
-	padding-top:10px;
-	position:relative;
-}
-
-.dashSerial{
-	font-family:Verdana, Arial, Helvetica, sans-serif;
-	font-size:30px;
-	font-weight:bold;
-	color:#000000;
-}
-
-
-/*  menu */
-
-#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 #ECECEC;
-	background-color:#CCCCCC;
-	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 #ECECEC;
-	color:#000000;
-	text-align:left;
-	text-decoration:none;
-	display:block;
-}
-
-#mnuKey{
-	font-family:Verdana, Arial, Helvetica, sans-serif;
-	font-size:11px;
-	background-color:#666666;
-	color:#FFFFFF;
-	text-decoration:none;
-	padding:5px;
-	font-weight:bold;
-	width:8px;
-	cursor:pointer;
-	vertical-align:top;
-	height:100px;
-	position:relative;
-	top:0px;
-	left:0px;
-}
-
-#slidemenu{
-	height:525px;
-	vertical-align:top;
-	width:100px;
-	background-color:#CCCCCC;
-	border-right:1px solid #CCCCCC;
-	opacity:.9;
-	display:none;
-}
-
-/* clock */
-
-.citystyle{
-	position:relative;
-	top:0px;
-	left:0px;
-	text-align:left;
-	
-}
-#theClockLayer{
-	position:relative;
-	height:180px;
-	left:20px;
-	text-align:center;
-}
-.handsanddotsstyle{
-	margin-top:10px;
-	position:absolute;
-	top:0px;
-	left:0px;
-	width:2px;
-	height:2px;
-	font-size:2px;
-	background-color:#000000;
-}
-.facestyle{
-	margin-top:10px;
-	position:absolute;
-	top:0px;
-	left:0px;
-	width:15px;
-	height:15px;
-	text-align:center;
-	font-family:arial,sans-serif;
-	font-size:10px;
-	color:#000000;
-}
-.datestyle{
-	margin-top:20px;
-	position:absolute;
-	top:0px;
-	left:0px;
-	width:100px;
-	text-align:center;
-	font-family:arial,sans-serif;
-	font-size:10px;
-	color:#000000;
-}
-.ampmstyle{
-	margin-top:23px;
-	position:absolute;
-	top:0px;
-	left:0px;
-	width:20px;
-	text-align:center;
-	font-family:arial,sans-serif;
-	font-size:10px;
-	color:#000000;
-}
-
-#wclock{
-	position:absolute;
-	left:100px;
-	top:100px;
-	display:none;
-	background-color:#CCCCCC;
-	width:175px;
-}
-
-.leftFormBorder1 {
-	border: 1px solid #AFC8E4;
-	background-color: #FFFFFF;
-	opacity:.7;
-}
-
-
-
-
-/* Calculator */
-.calcBg {
-	/*background-color: #666;*//*BFC1B7*/
-	background: url(images/cal_bg.gif);
-	border: 1px solid #009900;
-}
-.calcResult {
-	width: 100%;
-	height: 25px;
-	background-color: #FFFFCC;/*CBDFD6*/
-	border-top: 1px solid #CCC;
-	border-left: 0px;
-	border-right: 1px solid #CCC;
-	border-bottom: 1px solid #CCC;
-	font-size: 10px;
-	text-align: right;
-}
-.calcMem {
-	width: 100%;
-	height: 25px;
-	border-top: 1px solid #CCC;
-	border-left: 1px solid #CCC;
-	border-right: 0px;
-	border-bottom: 1px solid #CCC;
-	background-color: #FFFFCC;/*CBDFD6*/
-	font-family: Arial;
-	font-size: 10px;
-	color: #BBB;
-	text-align: left;
-}
-.calcBlackBtn, .calcGreyBtn, .calcBigBtn, .calcCancBtn, .calcMemBtn, .calcBackBtn {
-	border: none;
-	height: 20px;
-	font-size: 11px;
-	color: #FFF;
-	text-align:center;
-}
-.calcBackBtn {
-	background: url(images/calc_back_btn.gif) no-repeat;
-	width:25px;
-}
-.calcBlackBtn {
-	background: url(images/calc_black_btn.gif) no-repeat;
-	width:25px;
-}
-.calcGreyBtn {
-	background: url(images/calc_grey_btn.gif) no-repeat;
-	width:25px;
-}
-.calcCancBtn {
-	background: url(images/calc_canc_btn.gif) no-repeat;
-	width:25px;
-	
-}
-.calcMemBtn {
-	background: url(images/calc_mem_btn.gif) no-repeat;
-	width:25px;
-	/*background-color: #CCC;*/
-}
-#calc{
-	position:absolute;
-	left:100px;
-	top:100px;
-	background-color:#FFFFFF;
-	width:185px;
-	border-bottom:2px solid #000000;
-	border-right:2px solid #666666;
-	border-left:2px solid #CCCCCC;
-	border-top:2px 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:200px;
-	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;
-}
-
-
-/*  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;
-}
-
-.prvPrfTopBg {
-	background-color:#ebebeb;
-}
-
-.prvPrfBottomBg {
-	background-color:#ebebeb;
-}
-
-.prvPrfOutline {
-	border:1px solid #ebebeb;
-}
-
-.prvPrfSelectedTab {
-	background:url(images/prvPrfSelectedTab.gif) repeat-x;
-	cursor:pointer;
-
-}
-
-.prvPrfUnSelectedTab {
-	background:url(images/prvPrfUnSelectedTab.gif) repeat-x;
-	cursor:pointer;
-}
-
-.prvPrfTexture {
-	background:url(images/prvPrfTexture1.gif);
-
-}
-.prvPrfBgOn{
-	background-color:#33ee33;
-}
-.prvPrfBgOff{
-	background-color:#cccccc;
-}
-
-.prvPrfHoverOn {
-	background-color:#ffffef;
-	
-}
-.prvPrfHoverOut {
-	background-color:#ffffff;
-}
-
-.prvPrfBgImgGlobal {
-	background:url(images/prvPrfBgImgGlobal.jpg) top right no-repeat;
-}
-.prvPrfBgImgTab {
-	background:url(images/prvPrfBgImgTab.jpg) top right no-repeat;
-}
-.prvPrfBgImgStandard {
-	background:url(images/prvPrfBgImgStandard.jpg) top right no-repeat;
-}
-.prvPrfBgImgUtils {
-	background:url(images/prvPrfBgImgUtils.jpg) top right no-repeat;
-}
-.prvPrfBgImgField {
-	background:url(images/prvPrfBgImgField.jpg) top right no-repeat;
-}
-
-.prvPrfTabSample {
-	border-top:1px solid #ababab;
-	border-left:1px solid #ababab;
-	border-right:1px solid #a1a1a1;
-}
-
-/*  Organization */
-
-.orgTab{
-	font-family:Arial, Helvetica, sans-serif;
-	font-size:11px;
-	font-weight:normal;
-	color:#666666;
-	border:0px solid #9B9B9B;
-	border-collapse:collapse;
-	width:100%;
-}
-
-.orgTab tr th{
-	text-align:left;
-	font-family:Arial, Helvetica, sans-serif;
-	font-size:12px;
-	text-decoration:none;
-	font-weight:bold;
-	height:20px;
-	padding-left:5px;
-}
-
-.orgTab tr td{
-	font-family:Arial, Helvetica, sans-serif;
-	font-size:11px;
-	text-decoration:none;
-	font-weight:normal;
-	padding-left:5px;
-	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%;
-}
-
-.globTab tr th{
-	text-align:right;
-	background-color:#CCCCCC;
-	border-bottom:1px solid #999999;
-	border-right:2px solid #999999;
-	color:#000000;
-	font-family:Arial, Helvetica, sans-serif;
-	font-size:12px;
-	text-decoration:none;
-	font-weight:bold;
-	height:20px;
-	padding-right:5px;
-	
-}
-
-.globTab tr td{
-	text-align:left;
-	border:1px solid #CCCCCC;
-	color:#666666;
-	font-family:Arial, Helvetica, sans-serif;
-	font-size:11px;
-	text-decoration:none;
-	font-weight:normal;
-	padding-left:5px;
-	height:20px;
-}
-
-
-/* Groups */
-
-.groupul{
-	margin:0px;
-	font-family:Arial, Helvetica, sans-serif;
-	font-weight:bold;
-	font-size:12px;
-	color:#000000;
-	text-decoration:underline;
-	text-align:left;
-}
-
-.groupli{
-	margin-left:20px;
-	font-family:Arial, Helvetica, sans-serif;
-	font-weight:normal;
-	font-size:12px;
-	text-decoration:none;
-	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:block;
-	position:absolute;
-	left:0px;
-	top:0px;
-}
-
-/*  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:Verdana, Arial, Helvetica, sans-serif;
-	text-decoration:none;
-	font-weight:normal;
-	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;
-}
-
-.classBtnSmall{
-	font-family:Verdana, Arial, Helvetica, sans-serif;
-	text-decoration:none;
-	font-weight:normal;
-	font-size:9px;
-	background-color:#DBDBDB;
-	border-bottom:2px solid #999999;
-	border-right:2px solid #999999;
-	border-top:2px solid #F5F5F5;
-	border-left:2px solid #F5F5F5;
-	color:#000000;
-	text-align:center;
-}
-
-.classBtnDisable{
-	font-family:Verdana, Arial, Helvetica, sans-serif;
-	text-decoration:none;
-	font-weight:normal;
-	font-size:10px;
-	background-color:#DBDBDB;
-	border-bottom:2px solid #CCCCCC;
-	border-right:2px solid #CCCCCC;
-	border-top:2px solid #F5F5F5;
-	border-left:2px solid #F5F5F5;
-	color:#666666;
-	text-align:center;
-	padding-top:3px;
-	padding-bottom:3px;
-}
-
-.txtBox{
-	width:85%;
-	border:1px solid #666666;
-	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;*/
-}
-
-.genHeaderGray{
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 14px;
-	line-height: 16px;
-	color: #888888;
-	font-weight:bold;
-}
-
-.genHeaderGrayBig{
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 18px;
-	line-height: 16px;
-	color: #888888;
-	font-weight:bold;
-}
-
-.importBox{
-	width:125px;
-	border:1px solid #666666;
-	font-family:Arial, Helvetica, sans-serif;
-	font-size:11px;
-}
-
-#imLead{
-	width:100%;
-	overflow:auto;
-	position:relative;
-	border:1px solid #666666;
-	height:175px;
-}
-
-.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;
-	z-index:2000;
-}
-
-#locateMap{
-	width:120px;
-	background-color:#CCCCCC;
-	border:1px solid #DDDDDD;
-	padding-top:5px;
-	position:absolute;
-	display:none;
-	z-index:2000;
-}
-
-
-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;
-}
-	
-/* END OF REPORT */
-/* WEB MAIL */
-a.webMnu{
-	font-size:11px;
-	color:#0070BA;
-	text-decoration:underline;
-}
-a.webMnu:Hover{
-	font-size:11px;
-	color:#0070BA;
-	text-decoration:underline;
-}
-
-.mailHdr{
-	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:#FFFFFF;
-	vertical-align:middle;
-	border:0px solid #000000;
-}
-
-.classWebBtn{
-	font-family:Verdana, Arial, Helvetica, sans-serif;
-	text-decoration:none;
-	font-weight:normal;
-	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;
-}
-
-/*  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{
-	border:2px solid #CCCCCC;
-	background-color:#FFFFFF;
-	width:30%;
-	position:relative;
-	visibility:visible;
-	margin:9px;
-	height:250px;
-}
-
-.fontBold{
-	font-size:13px;
-	color:#000000;
-	text-decoration:none;
-	font-weight:bold;
-}
-
-.style_Gray{
-	color:gray;
-}
-	
-/* End of Home Page */
-
-/* All Menu */
-#allMenu{
-	width:500px;
-	border-top:2px solid #CCCCCC;
-	border-left:2px solid #CCCCCC;
-	border-bottom:2px solid #666666;
-	border-right:2px solid #666666;
-	left:300px;
-	top:100px;
-	background-color:#CCCCCC;
-	position:absolute;
-	z-index:1000001;
-	display:none;
-}
-
-
-.allMnuTable{
-	width:100%;
-	border:1px solid #000000;
-	background-color:#FFFFFF;
-}
-
-.allMnuHandle td{
-	height:20px;
-	color:#FFFFFF;
-	font-family:Arial, Helvetica, sans-serif;
-	font-size:12px;
-	font-weight:bold;
-	text-decoration:none;
-	background-color:#000066;
-	cursor:move;
-	padding:2px;
-	border-bottom:2px solid #666666;
-}
-
-.allMnuHdr{
-	font-family:Verdana, Arial, Helvetica, sans-serif;
-	font-weight:normal;
-	font-size:11px;
-	text-decoration:none;
-	display:block;
-	background-color:#FFFFFF;
-	color:#000099;
-	padding-top:5px;
-	padding-bottom:5px;
-}
-a.allMnu{
-	font-family:Verdana, Arial, Helvetica, sans-serif;
-	font-size:10px;
-	text-decoration:none;
-	font-weight:normal;
-	display:block;
-	width:125px;
-	height:15px;
-	padding-left:5px;
-	padding-top:0px;
-	padding-bottom:0px;
-	background-color:#FFFFFF;
-	border:1px solid #FFFFFF;
-	color:#000033;
-	margin-left:20px;
-}
-
-a.allMnu:Hover{
-	font-family:Verdana, Arial, Helvetica, sans-serif;
-	font-size:10px;
-	text-decoration:none;
-	font-weight:normal;
-	display:block;
-	width:125px;
-	height:15px;
-	padding-left:5px;
-	padding-top:0px;
-	padding-bottom:0px;
-	background-color:#ECFFFF;
-	border:1px solid #00CCFF;
-	color:#000033;
-}
-/* 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;
-	z-index:1000;
-}
-
-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;
-}	
-
-.calendarNav{
-	font-size:12px;
-	color:#FFFFFF;
-	white-space:nowrap;
-	text-align:center;
-	font-weight:bold;
-	padding-left:10px;
-	padding-right:10px;
-	background-image:url(images/cal_nav.gif);
-	background-repeat:repeat-x;
-}
-
-#addEventDropDown{
-	position:absolute;
-	display:none;
-	width:110px;
-	border:1px solid #666666;
-	left:0px;
-	top:0px;
-	z-index:5000;
-}
-
-.calAction{
-	width:175px;
-	background-color:#CCCCCC;
-	border:1px solid #DDDDDD;
-	padding-top:5px;
-	position:absolute;
-	display:none;
-	z-index:2000;
-}
-
-.calSettings{
-	position:absolute;
-	z-index:20000;
-	width:500px;
-	left:200px;
-	top:150px;
-	border:2px solid #999999;
-	background-color:#ffffff;
-	padding:5px;
-}
-									
-/* End of Calendar */
-
-/* Cal Year View */
-.month_table{
-	border:2px solid #CCCCCC;
-	width:100%;
-	background-color:white;
-}
-
-.month_table tr th{
-	background-color:#E9E9E9;
-	color:#000000;
-	text-align:center;
-	border:1px dotted #CCCCCC;
-	height:20px;
-	width:14%;
-	font-weight:normal;
-}
-
-.month_table tr td{
-	border:1px dotted #CCCCCC;
-	color:#000000;
-	text-align:center;
-	height:20px;
-}
-
-.cal_Hdr{
-	background-image:url(images/cal_Hdr.gif);
-	background-repeat:repeat-x;
-	background-position:left top;
-	font-weight:bold;
-	color:#000000;
-	text-align:left;
-	border:0px solid #000000;
-}
-
-.eventDay{
-	background-color:#FF9966;
-	font-weight:bold;
-}
-
-.currDay{
-	background-color:#006600;
-	font-weight:bold;
-	text-decoration:underline;
-}
-
-/* End of Cal Year View */
-
-/* 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;
-}
-
-#CurrencyDeleteLay{
-	font-family:Arial, Helvetica, sans-serif;
-	font-size:11px;
-	text-align:left;
-	width:300px;
-	border:3px solid #CCCCCC;
-	background-color:#FFFFFF;
-	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;
-    font-weight: bold;
-    white-space:nowrap;
-}
-.rptTable {
-    border-left: 1px solid #DDDDDD;
-    border-bottom: 1px solid #DDDDDD;
-    border-top: 1px solid #DDDDDD;
-}
-.rptTitle, .rptHead, .rptData, .rptGrpHead{
-    font-family: Verdana, Arial, Helvetica, Sans-serif;
-    font-size: 11px;
-	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;
-}
-.rptGrpHead {
-	background: #FFF;
-    border-bottom: 1px solid #FFF;
-    border-top: 1px solid #DDDDDD;
-    font-weight: normal;
-}
-
-.rptData {
-            background: #FFF;
-            font-weight: normal;
-}
-.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;
-    left:100px;
-    top:100px;
-}
-
-#folderLay{
-    width:175px;
-    background-color:#CCCCCC;
-    border:1px solid #DDDDDD;
-    padding-top:5px;
-    position:absolute;
-    display:none;
-}
-
-/* Css for quick Create */
-
-.qcWindow {
-	    background-color:white;
-            border:2px solid #999999;
-}
-
-.qcHeader{
-	    background:url(images/qcBg.gif) repeat-x;
-	    background-color:gray;
-	    color:black;
-	    font-family: Arial, Helvetica, sans-serif;
-	    font-size: 12px;
-	    line-height: 19px;
-	    padding-left:10px;
-}
-.qcTextBox{
-            border:1px solid #999999;
-	    width:90%;
-}
-.qcTextArea{
-	    border:1px solid #999999;
-	    width:90%;
-	    height:70px;
-	    font-family: Arial, Helvetica, sans-serif;
-	    font-size: 11px;
-}
-.qcTransport{
-	    background-color:#ededed;
-
-}
-
-#role_popup{
-        position:relative;
-        left:0px;
-        top:0px;
-        width:95%;
-        height:300px;
-        overflow:auto;
-        border:1px solid #999999;
-        text-align:left;
-        background-color:#FFFFFF;
-    }
-
-.unread_email {
-	font-weight:bold;
-}
-
-								    
-/* MY SITES */
-
-.SiteSel{
-	font-family:Arial, Helvetica, sans-serif;
-	background-image:url(images/site_sel.jpg);
-	background-position:left bottom;
-	background-repeat:no-repeat;
-	height:33px;
-	width:194px;
-	text-align:center;
-	vertical-align:middle;
-	color:#000000;
-	font-weight:bold;
-	font-size:11px;
-	text-decoration:none;
-}
-
-.SiteUnSel{
-	font-family:Arial, Helvetica, sans-serif;
-	background-image:url(images/site_unsel.jpg);
-	background-position:left bottom;
-	background-repeat:no-repeat;
-	height:33px;
-	width:194px;
-	text-align:center;
-	vertical-align:middle;
-	color:#000000;
-	font-weight:normal;
-	font-size:11px;
-	text-decoration:none;
-	cursor:pointer;
-}
-
-.SiteHdr{
-	font-family:Arial, Helvetica, sans-serif;
-	background-image:url(images/site_hdr.jpg);
-	background-position:right bottom;
-	background-repeat:no-repeat;
-	height:33px;
-	text-align:center;
-	vertical-align:middle;
-	color:#000000;
-	font-weight:normal;
-	font-size:11px;
-	text-decoration:none;
-}
-.unread_email {
-	font-weight:bold;
-}
-
-
-.tagCloud {
-    border:1px solid #737373;
-}
-
-   
-.tagCloudTopBg {
-    background: url(images/tagCloudBg.gif) repeat-x;
-   
-}
-
-.tagCloudDisplay {
-    background-color:#e5e5e5;
-    padding:10px;
-    font-family: Arial, Helvetica, sans-serif;
-    font-size: 11px;
-    line-height: 14px;
-    color: #000000;
-
-}
-.adProgressBar {
-	border-style:solid;
-	border-width:2px;
-	border-color:blue;
-
-}
-
-.h2 {
-
-	font-size:18px;
-	line-height:20px;
-
-}
-
-.gray {
-
-	color:gray;
-}
-
-.hdeskComments {
-
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	line-height: 14px;
-	color: #999999;
-	border:0px;
-	background-color:#ffffef;
-	width:100%;
-
-}
-
-ul {
-	list-style:circle;
-	line-height:20px;
-	padding-left:5px;
-	margin-left:20px;
-	font-weight:normal;
-
-}
-
-	
-.branch {
-	list-style-image: url("secAdd.gif");
-}	
-
-
-
-.tagCloudTopBg {
-	background-image: url(images/topCloudBg.gif);
-	background-repeat: repeat-x;	
-}
-
-.tagCloudDisplay {
-	background-color:#e5e5e5;
-	padding:5px;
-}
-	
-	
-	
-.heading1 {
-	font-family:  Arial, Helvetica, sans-serif;
-	font-size: 19px;
-	line-height: 14px;
-	color: #000000;
-}
-
-.heading2 {
-	font-family:  Arial, Helvetica, sans-serif;
-	font-size: 16px;
-	line-height: 16px;
-	font-weight:bold;
-	color: #000000;
-}
-
-.heading3 {
-	font-family:  Arial, Helvetica, sans-serif;
-	font-size: 14px;
-	line-height: 14px;
-	color: #999999;
-}
-
-.heading4 {
-	font-family:  Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	line-height: 14px;
-	color: #999999;
-}
-
-.settingsUI {
-
-	background-color:#efefef;
-	border:2px solid #777777;
-
-}
-
-
-.settingsTabHeader {
-	font-family:  Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	line-height:25px;
-	font-weight:bold;
-	color:#ffffff;
-	background-image: url(images/settingsMTBg.gif);
-	background-repeat: repeat-x;
-	padding-left:10px;
-	padding-right:10px;
-	
-
-}
-
-.settingsTabList {
-	font-family:  Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	line-height:20px;
-	font-weight:normal;
-	color:#000000;
-	background-color:#e3e3e3;
-	padding-left:30px;
-	border-top:1px solid #eaeaea;
-	border-bottom:1px solid #d3d3d3;
-}
-.settingsTabSelected {
-	font-family:  Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	line-height:20px;
-	font-weight:bold;
-	color:#000000;
-	background-color:#ffffff;
-	padding-left:30px;
-}
-.settingsSelectedUI {
-	padding:10px;
-	background:url(images/settingsSelUIBg.gif) repeat-x;
-	background-color:#ffffff;
-}
-.settingsIconDisplay {
-	font-family:  Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	line-height:14px;
-	padding:10px;
-
-	color:#000000;
-	background-color:#ffffff;
-	padding-left:10px;
-}
-.settingsSelUITopLine{
-	border-bottom:2px dotted #999999;
-
-}
-
-.tableHeading{
-	background-color:#ffffff;
-	border-bottom:2px solid #aaaaaa;
-}
-.colHeader{
-	background-color:#dadada;
-	border-left:1px solid #eaeaea;
-	border-top:1px solid #eaeaea;
-	border-right:1px solid #aaaaaa;
-	border-bottom:1px solid #aaaaaa;
-	font-weight:bold;
-
-}
-.cellLabel {
-	background-color:#eaeaea;
-	border-top:1px solid #efefef;
-	border-bottom:1px solid #dadada;
-	color:#555555;
-
-}
-.cellText {
-	color:#333333;
-	border-bottom:1px solid #dadada;
-}
-
-.listTable{
-	border-left:1px solid #cccccc;
-	border-right:1px solid #cccccc;
-	border-bottom:1px solid #cccccc;
-
-}
-
-.listTableRow{
-	border-bottom:1px solid #eaeaea;
-	border-right	:1px solid #eaeaea;
-	border-bottom:1px solid #eaeaea;
-	border-bottom:1px solid #eaeaea;
-}
-.listRow{
-	border-bottom:2px solid #eaeaea;
-
-}
-
-.listTableTopButtons{
-	background-color:#eeeeee;
-	
-}
-
-.crmButton{
-	
-	border-left:1px solid #ffffff;
-	border-top:1px solid #ffffff;
-	border-right:1px solid #555555;
-	border-bottom:1px solid #555555;
-	padding-left:20px;
-	padding-right:20px;
-}
-
-.create{
-	background-color:#33cc11;
-	color:#333333;
-	font-weight:bold;
-}
-.delete {
-	background-color:#dd9900;
-	color:#ffffff;
-	font-weight:bold;
-}
-.edit {
-	background-color:#a5a5ee;
-	color:#ffffff;
-	font-weight:bold;
-}
-.save{
-	background-color:#33cc11;
-	color:#ffffff;
-	font-weight:bold;
-}
-.cancel {
-	background-color:#dd9900;
-	color:#ffffff;
-	font-weight:bold;
-}
-
-.inactive{
-color:#999999;
-}
-
-.active{
-color:#229922;
-
-}
-textarea {
-	width:95%;
-	height:70px;
-	border:1px solid #dadada;
-}
-.treeTable1{
-	padding:0px;
-}
-
-.prvPrfBigText {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 14px;
-}
-
-.prvPrfTopBg {
-	background-color:#ebebeb;
-}
-
-.prvPrfBottomBg {
-	background-color:#ebebeb;
-}
-
-.prvPrfOutline {
-	border:1px solid #ebebeb;
-}
-
-.prvPrfSelectedTab {
-	background:url(images/prvPrfSelectedTab.gif) repeat-x;
-
-}
-
-.prvPrfUnSelectedTab {
-	background:url(images/prvPrfUnSelectedTab.gif) repeat-x;
-
-}
-
-.prvPrfTexture {
-	background:url(images/prvPrfTexture1.gif);
-
-}
-.prvPrfBgOn{
-	background-color:#33ee33;
-}
-.prvPrfBgOff{
-	background-color:#cccccc;
-}
-
-.prvPrfHoverOn {
-	background-color:#ffffef;
-	
-}
-.prvPrfHoverOut {
-	background-color:#ffffff;
-}
-
-.prvPrfBgImgGlobal {
-	background:url(images/prvPrfBgImgGlobal.jpg) top right no-repeat;
-}
-.prvPrfBgImgTab {
-	background:url(images/prvPrfBgImgTab.jpg) top right no-repeat;
-}
-.prvPrfBgImgStandard {
-	background:url(images/prvPrfBgImgStandard.jpg) top right no-repeat;
-}
-.prvPrfBgImgUtils {
-	background:url(images/prvPrfBgImgUtils.jpg) top right no-repeat;
-}
-.prvPrfBgImgField {
-	background:url(images/prvPrfBgImgField.jpg) top right no-repeat;
-}
-
-.prvPrfTabSample {
-	border-top:1px solid #ababab;
-	border-left:1px solid #ababab;
-	border-right:1px solid #a1a1a1;
-}
-
-.cellBottomDotLine {
-	border-bottom-width: 2px;
-	border-bottom-style: dotted;
-	border-bottom-color: #CCCCCC;
-	background-color:#ededed;
-}
-.crmFormList{
-	border:1px solid #cccccc;
-	width:90%;
-	height:120px;
-
-}
-.cellBottomDotLinePlain {
-	border-bottom-width: 2px;
-	border-bottom-style: dotted;
-	border-bottom-color: #CCCCCC;
-	
-}
-.crmFormDropDown {
-border-width:1px;
-}
-.thickBorder {
-	border: 2px solid #999999;
-}
-
+.small {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	line-height: 14px;
+	color: #000000;
+}
+.big {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	line-height: 18px;
+	color: #000000;
+	font-weight:bold;
+}
+
+.ybToday {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	line-height: 14px;
+	color: #119911;
+}
+.ybUnfinished {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	line-height: 14px;
+	color: #993311;
+}
+.ybTime {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	line-height: 14px;
+	color: #777777;
+	font-weight:bold;
+}
+.yellowBox {
+	background-color:#ffffE1;
+	border:1px solid #999999;
+}
+.ybSeperator{
+	height:0px;
+	border-top:2px dotted #adadad;
+}
+
+.genHeaderBig{
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 16px;
+	line-height: 19px;
+	color: #000000;
+	font-weight:bold;
+}
+.genHeaderSmall{
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 14px;
+	line-height: 16px;
+	color: #000000;
+	font-weight:bold;
+}
+
+.moduleName {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 18px;
+	color: #000000;
+	font-weight:bold;
+}
+
+.rssDisplayPanel {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	line-height: 12px;
+	color: #ABABAB;
+}
+.hdrNameBg {
+
+	background:url(images/topBg.gif);
+}
+
+.hdrTabBg {
+	background:#bbbbbb url(images/tabUnSelectedBg.gif) repeat-x ;
+}
+
+.tabSelected {
+	background:#bbbbbb url(images/tabSelectedBg.gif) repeat-x;
+	font-family:  Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	padding-left:15px;
+	padding-right:15px;
+	padding-top:2px;
+	padding-bottom:2px;
+
+}
+
+.tabUnSelected {
+	background:#bbbbbb url(images/tabUnSelectedBg.gif) repeat-x;
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	padding-left:15px;
+	padding-right:15px;
+	padding-top:2px;
+	padding-bottom:2px;
+}
+
+.tabSeperator {
+	background:#bbbbbb url(images/tabSeperatorBg.gif) repeat-x;
+}
+
+/*.level2text {
+	background:#bbbbbb url(images/level2Bg.gif) repeat-x;
+    font-family: Arial, Helvetica, sans-serif;
+    font-size: 11px;
+	padding-left:20px;
+	padding-right:20px;
+	padding-top:5px;
+	padding-bottom:5px;
+	font-weight:bold;
+	color:white;
+}*/
+
+.level2text {
+    background:#bbbbbb url(images/level2Bg.gif) repeat-x;
+    font-family: Arial, Helvetica, sans-serif;
+    font-size: 11px;
+    padding-left:20px;
+    padding-right:20px;
+    padding-top:5px;
+    padding-bottom:5px;
+    font-weight:bold;
+    color:white;
+}
+
+.level2text a{
+	text-decoration:none;
+	color:white;
+}
+
+.level2text a:hover {
+	text-decoration:underline;
+	color:white;
+
+}
+
+.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;
+	font-size: 11px;
+}
+
+.level2textSel{
+	font-weight:bold;
+	color:#000000;
+	padding-left:20px;
+	padding-right:20px;
+	padding-top:3px;
+	padding-bottom:3px;
+}
+	
+
+.tabLiner {
+	background:#9abffc url(images/moduleSelectorBg.gif) bottom repeat-x;
+	padding:0px;
+}
+
+.sep1 {
+	background:#999999;
+}
+
+.showPanelBg {
+	background:url(images/showPanelTopBg.gif) repeat-x;
+}
+
+a {
+	text-decoration:none;
+	color:#003399;
+}
+
+a:hover {
+	text-decoration:underline;
+}
+
+.hdrLink {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 18px;
+	text-decoration:none;
+	color:#333333;
+	font-weight:bold;
+}
+
+.hdrLink:hover {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 18px;
+	text-decoration:underline;
+	color:#333333;
+	font-weight:bold;
+}
+
+.searchBox {
+	border: 0px solid #999999;
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	padding-left:2px;
+	width:100px;
+	background-color:#ffffef;
+}
+
+.searchBtn {
+	border : 1px #cccccc solid;
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	width:30px;
+	height:19px;
+	background-color:#cccccc;
+}
+
+.lvtBg {
+	background-color:#cccccc;
+
+}
+
+.lvtHeaderText {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 14px;
+	font-weight:bold;
+}
+
+.lvtCol {
+	border-top:1px solid #eeeeee;
+	border-left:1px solid #eeeeee;
+	border-right:1px solid #999999;
+	border-bottom:1px solid #999999;
+	background-color:#dadada;
+	color:#666666;
+	font-weight:bold;
+}
+
+.lvtColData {
+	background-color:#fafafa;
+}
+
+.lvtColDataHover {
+	background-color:#efefef;
+}
+
+.dvtSelectedCell {
+	border-left:1px solid #cacaca;
+	border-top:3px solid #999999;
+	border-right:1px solid #cacaca;
+	padding-left:20px;
+	padding-right:20px;
+	background-color:white;
+	font-weight:bold;
+}
+
+.dvtUnSelectedCell {
+	border-left:1px solid #cacaca;
+	border-top:1px solid #cacaca;
+	border-right:1px solid #cacaca;
+	border-bottom:1px solid #cacaca;
+	padding-left:20px;
+	padding-right:20px;
+	background-color:#efefef;
+	cursor:pointer;
+}
+
+.dvtTabCache {
+	border-bottom:1px solid #cacaca;
+}
+
+.dvtContentSpace {
+	border-left:1px solid #cacaca;
+	border-right:1px solid #cacaca;
+	border-bottom:1px solid #cacaca;
+	padding-left:0px;
+}
+
+.rightAddInfo {
+	border-left:1px solid #a2a2a2;
+	border-right:1px solid #dddddd;
+	border-bottom:1px solid #dddddd;
+	border-top:1px solid #a2a2a2;
+	background-color:#fafafa;
+	padding:5px;
+}
+
+.dvtCellLabel {
+	background-color:#f6f6f6;
+	padding-right:10px;
+	border-bottom:1px solid #eaeaea;
+	color:#737373;
+	white-space:nowrap;
+}
+
+.dvtCellInfo {
+	padding-left:10px;
+	border-bottom:1px solid #eaeaea;
+	white-space:nowrap;
+}
+
+.rightMailMerge {
+	border:1px solid #dddddd
+}
+
+.rightMailMergeHeader {
+	border-bottom:1px solid #dddddd;
+	padding:5px;
+	background-color:#eaeaea;
+
+}
+
+.rightMailMergeContent {
+	padding:5px;
+	background-color:#fafafa;
+
+}
+
+.rightUpcomingActivitiesHeader{
+	border-bottom:1px solid #ddddcc;
+	padding:5px;
+	background-color:#ffffdd;
+}
+
+.rightUpcomingActivitiesContent {
+	padding:5px;
+	background-color:#ffffef;
+}
+
+.detailedViewHeader{
+	border-bottom:1px solid #999999;
+	padding:5px; 
+	background-color:#e5e5e5;
+
+}
+
+.detailedViewTextBox {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	color: #000000;
+	border:1px solid #bababa;
+	padding-left:5px;
+	width:90%;
+	background-color:#ffffff;
+}
+
+.detailedViewProdTextBox {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	color: #000000;
+	border:1px solid #bababa;
+	padding-left:5px;
+	width:85%;
+	background-color:#ffffff;
+}
+
+.detailedViewTextBoxOn {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	color: #000000;
+	border:1px solid #bababa;
+	padding-left:5px;
+	width:90%;
+	background-color:#ffffdd;
+}
+
+.detailedViewTextArea {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	color: #000000;
+	border:1px solid #bababa;
+	padding-left:5px;
+	width:95%;
+	height:100px;
+	background-color:#ffffff;
+	text-align:left;
+}
+
+.moduleSearch {
+	border:1px solid #dddddd;
+	background-color:#ffffef;
+
+}
+
+.searchHdrBox {
+
+	border-bottom:1px dashed #dddddd;
+}
+
+.advSearch {
+	padding:10px;
+	border-left:1px solid #eaeaea; 
+	border-right:1px solid #eaeaea; 
+	border-bottom:1px solid #eaeaea; 	
+	overflow:auto;
+	width:600px;
+	height:150px;
+	background-color:#ffffef;
+
+}
+
+.searchAlph {
+	border:1px solid #dadada;
+	background-color:#ffffff;
+	cursor:pointer;
+	width:10px
+
+}
+.searchAlphselected {
+	border:1px solid #666666;
+	background-color:#bbbbbb;
+	cursor:pointer;
+	width:10px
+
+}
+.searchNotFound {
+	border:2px solid #ff3333;
+	background-color:#fafafa;
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	color: #ff0000;
+	height:50px;
+	width:640px;
+}
+
+.hiliteBtn4Search {
+	border:1px solid #cccccc;
+	background-color:#fafafa;
+	line-height:37px;
+	height:40px;
+	padding:5px;
+}
+
+.loginTopBg {
+	background:url(images/loginTopBg.gif) repeat-x;
+}
+
+.loginTopShade {
+	background:url(images/loginTopShade.gif) repeat-x;
+}
+
+.loginBg{
+	background:#448cEB url(images/loginBg.gif) repeat-x;
+}
+
+.textbox {
+	border:1px solid #999999;
+	background-color:#ffffff;
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	width:120px;
+	padding:2px;
+
+}
+
+.loginBottomBg {
+	background:url(images/loginBottomBg.gif) repeat-x;
+}
+
+.loginSignin {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 18px;
+	color: #448ceb;
+	font-weight:bold;
+}
+
+.loginBillBoard {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	color:#ffffff;
+}
+
+.mx {
+}
+
+.calTopBg {
+	background:url(images/calBg.gif) repeat-x;
+}
+
+.calDisplay {
+	border-left:1px solid #d0d0d0;
+	border-right:1px solid #d0d0d0;
+}
+.calBottomBg {
+	background:url(images/calBottomBg.gif) repeat-x;
+}
+
+.calDayHourCell {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 18px;
+}
+.calDayHour {
+	border-top:2px solid #dadada;
+}
+.calDiv {
+	overflow:auto; width:95%;height:320px;padding:0px;background-color:#fefefe;
+	border-top: 1px solid #bababa;
+	border-bottom: 1px solid #bababa;
+}
+
+.calHourOccupied {
+	background-color:#ffffbb;
+
+}
+
+.calAddEvent {
+	position:absolute;
+	z-index:10000;
+	width:500px;
+
+	left:200px;
+	top:150px;
+	border:2px solid #999999;
+	background-color:#ffffff;
+	padding:5px;
+}
+
+.addEventHeader{
+	border-bottom:2px dotted #cccccc;
+}
+
+.addEventFooter{
+	border-top:2px dotted #cccccc;
+	height:40px;
+}
+
+.addEventInnerBox {
+	border:1px dotted #dadada;
+
+}
+
+.cellScheduled {
+	background-color:#ffffef;
+	color:#7a7a7a;
+}
+
+.cellSchHover {
+	border-bottom:1px solid #999999;
+	border-right:1px solid #999999;
+	border-left:1px solid #dadada;
+	border-top:1px solid #dadada;
+	background-color:#ffffef;	
+	color:#7a7a7a;	
+}
+
+.cellSch{
+	border:0px;
+	background-color:#ffffef;
+	color:#7a7a7a;
+}
+
+.cellNormalHover {
+	border-bottom:1px solid #999999;
+	border-right:1px solid #999999;
+	border-left:1px solid #dadada;
+	border-top:1px solid #dadada;
+	background-color:#ffffff;	
+	color:#7a7a7a;	
+}
+
+.cellNormal {
+	border:0px;
+	background-color:#ffffff;
+}
+
+.calEventNormal {
+        border:1px solid #999999;
+        background-color:#99ffcc;
+
+}
+
+.calEventCritical {
+        border:1px solid #999999;
+        background-color:#FFCC33;
+}
+.tblPro1 {
+
+border:2px solid #dadada;
+       background-color:white;
+
+}
+
+.tblPro1IconCell {
+    border-right:1px solid #dadada;
+}
+
+.tblPro1HeadingCell {
+    font-weight:bold;
+color:#4a4a4a;
+}
+
+.tblPro1ColHeader {
+    background-color:#dadada;
+    border-left:1px solid white;
+    border-right:1px solid #999999;
+    font-size: 11px;
+    line-height: 14px;
+    background-image:url(images/tblPro1ColBg.gif);
+}
+
+.tblPro1DataCell {
+    border-bottom:1px solid #f5f5f5;
+    color:#5a5a5a;
+    font-size: 11px;
+    line-height: 14px;
+
+}
+
+.divEventToDo {
+overflow:auto;
+height:150px;
+border:1px solid #dadada;
+
+}
+
+.EventToDo{
+
+}
+
+.thumbnail{
+    background-color:#ffffff;
+padding: 7px;
+border: 1px solid #ddd;
+float: left;
+	   margin-right: 10px;
+	   margin-bottom: 15px;
+}
+
+.thumbnailcaption
+{ font-size: 0.9em; padding-top: 0.2em ;	}
+
+/* For Settings */
+
+.lftMnuTab{
+    font-family:Verdana, Arial, Helvetica, sans-serif;
+    font-size:12px;
+    color:#FFFFFF;
+    background-color:#BBBBBB;
+    border-left:1px solid #666666;
+    border-right:1px solid #666666;
+    border-top:0px solid #666666;
+    border-collapse:collapse;
+    text-align:right;
+    padding-top:0px;
+    padding-left:5px;
+    padding-right:5px;
+    vertical-align:top;
+}
+
+.lftMnuHdr{
+    font-family:Arial, Helvetica, sans-serif;
+    font-size:12px;
+    font-weight:bold;
+    color:white;
+    background-color:#DDDDDD;
+    border-bottom:1px solid #BBBBBB;
+    text-decoration:none;
+    width:99%;
+}
+
+.lftMnuHdr tr td{
+    font-family:Arial, Helvetica, sans-serif;
+    font-size:12px;
+    font-weight:bold;
+    color:white;
+    background-color:#DDDDDD;
+    border-bottom:1px solid #BBBBBB;
+    text-align:left;
+    text-decoration:none;
+    height:25px;
+    padding-right:0px;
+    padding-left:0px;
+}
+
+a.lftMnuHdr{
+    font-family:Arial, Helvetica, sans-serif;
+    font-size:12px;
+    font-weight:bold;
+    color:white;
+    background-color:#666666;
+    border-top:1px solid #BBBBBB;
+    border-bottom:1px solid #999999;
+    text-align:left;
+    text-decoration:none;
+    height:25px;
+    padding-left:5px;
+    width:100%;
+    display:block;
+    vertical-align:middle;
+}
+
+a.lftMnuHdr:Hover{
+    font-family:Arial, Helvetica, sans-serif;
+    font-size:12px;
+    font-weight:bold;
+    color:white;
+    background-color:#666666;
+    border-top:1px solid #BBBBBB;
+    border-bottom:1px solid #999999;
+    text-align:left;
+    text-decoration:none;
+    height:25px;
+    padding-left:5px;
+    width:100%;
+    display:block;
+}
+
+a.lftSubMnu{
+    font-family:Arial, Helvetica, sans-serif;
+    font-size:11px;
+    font-weight:normal;
+    display:block;
+    color:#666666;
+    height:20px;
+    width:93%;
+    text-align:left;
+    padding-left:15px;
+    text-decoration:none;
+    border-bottom:1px solid #BBBBBB;
+    padding-top:2px;
+    white-space:nowrap;
+}
+
+a.lftSubMnu:Hover{
+    font-family:Arial, Helvetica, sans-serif;
+    font-size:11px;
+    font-weight:normal;
+    display:block;
+    color:#666666;
+    height:20px;
+    width:93%;
+    text-align:left;
+    padding-left:15px;
+    text-decoration:none;
+    border-bottom:1px solid #BBBBBB;
+    padding-top:2px;
+    white-space:nowrap;
+    background-color:#CCCCCC;
+}
+
+.padTab{
+    padding-top:10px;
+    padding-left:10px;
+    padding-left:10px;
+    padding-bottom:0px;
+    vertical-align:top;
+    background-color:#FFFFFF;
+}
+
+.controlTab{
+    font-family:Arial, Helvetica, sans-serif;
+    font-size:12px;
+    text-align:center;
+    font-weight:bold;
+    text-decoration:none;
+    width:100%;
+    border:0px;
+}   
+
+.controlTab tr td{
+    font-family:Arial, Helvetica, sans-serif;
+    font-size:12px;
+    text-align:center;
+    font-weight:bold;
+    text-decoration:none;
+    vertical-align:bottom;
+}
+
+#company{
+    position:relative;
+    width:100%;
+    height:200px;
+    display:block;
+    background-color:#FFFFFF;
+    white-space:nowrap;
+    overflow:auto;
+    border:1px solid #CCCCCC;
+}
+                               
+
+#user{position:relative;left:0px;top:0px;width:100%;display:block;}
+#studio{position:relative;left:0px;top:0px;width:100%;display:block;}
+#communication{position:relative;left:0px;top:0px;width:100%;display:block;}
+#config{position:relative;left:0px;top:0px;width:100%;display:block;}
+
+#userTab{position:relative;left:0px;top:0px;width:100%;display:none;}
+#studioTab{position:relative;left:0px;top:0px;width:100%;display:none;}
+
+#scrollTab{
+	position:relative;
+	width:100%;
+	height:350px;
+	overflow:auto;
+	border:0px solid #CCCCCC;
+	display:block;
+}
+
+.dock{
+	vertical-align:middle;
+	text-align:left;
+	padding-left:0px;
+}
+.imgDoc{
+	cursor:pointer;
+	border:0px;
+}
+
+#one{
+	position:relative;
+	display:block;
+	width:245px;
+}
+
+#mnuTab{
+	position:relative;
+	overflow:auto;
+	width:100%;
+	display:block;
+	top: 1px;
+
+}
+
+#mnuTab1{
+
+   position:relative;
+
+   overflow:auto;
+
+   width:100%;
+
+   display:none;
+
+}
+
+#mnuTab2{
+
+   position:relative;
+
+   overflow:auto;
+
+   width:100%;
+
+   display:none;
+
+}
+
+
+/* End of Settings */
+
+.bggray{
+	background-color: #dfdfdf;
+}
+.bgwhite{
+	background-color: #FFFFFF;
+}
+.copy{
+	font-size:9px;
+	font-family: Verdana, Arial, Helvetica, Sans-serif;
+}
+
+#basicTab{
+	position:relative;
+	overflow:auto;
+	width:100%;
+	display:block;
+}
+
+#moreTab{
+	position:relative;
+	overflow:auto;
+	width:100%;
+	display:none;
+}
+
+/*Added for Advance Seearch*/
+
+#scrollTab{
+	position:relative;
+	width:100%;
+	height:350px;
+	overflow:auto;
+	border:0px solid #CCCCCC;
+	display:block;
+}
+
+.dock{
+	vertical-align:middle;
+	text-align:left;
+	padding-left:0px;
+}
+
+.imgDoc{
+	cursor:pointer;
+	border:0px;
+}
+#slideMnu{
+	background-color:#BBBBBB;
+	vertical-align:top;
+}
+
+#one{
+	position:relative;
+	display:block;
+	width:245px;
+}
+
+.prdTab{
+	font-family:Arial, Helvetica, sans-serif;
+	font-size:11px;
+	text-align:left;
+	width:100%;
+	border-left:0px solid #CCCCCC;
+	border-right:0px solid #CCCCCC;
+	border-collapse:collapse;
+}
+
+.prdTab tr th{
+	font-family:Arial, Helvetica, sans-serif;
+	font-size:11px;
+	text-align:left;
+	border-right:1px solid #CCCCCC;
+	border-left:1px solid #CCCCCC;
+	padding-left:5px;
+	background-color:#E5E5E5;
+	height:20px;
+	color:#000000;
+	font-weight:bold;
+	text-decoration:none;
+	border-bottom:1px solid #CCCCCC;
+}
+
+.prdTab tr td{
+	font-family:Arial, Helvetica, sans-serif;
+	font-size:11px;
+	text-align:left;
+	border-right:1px solid #CCCCCC;
+	border-left:1px solid #CCCCCC;
+	border-bottom:1px solid #CCCCCC;
+	padding-left:5px;
+	color:#000000;
+	text-decoration:none;
+	font-weight:normal;
+	height:20px;
+}
+
+.delTxt{
+	font-family:Arial, Helvetica, sans-serif;
+	font-size:11px;
+	text-decoration:underline;
+	font-weight:normal;
+	color:#000099;
+	cursor:pointer;
+}
+
+/* Dashboard CSS */
+
+.dashMain{
+	font-family:Arial, Helvetica, sans-serif;
+	font-size:11px;
+	background-color:#EBEBEB;
+	width:840px;
+	border-left:1px solid #CBCBCB;
+	border-right:1px solid #CBCBCB;
+	border-bottom:1px solid #CBCBCB;
+}
+
+.dashMain tr th{
+	font-family:Arial, Helvetica, sans-serif;
+	font-size:11px;
+	padding:0px;
+	border:0px solid #CBCBCB;
+}
+.dashMain tr td{
+	font-family:Arial, Helvetica, sans-serif;
+	font-size:11px;
+	padding-left:10px;
+	border:0px solid #CBCBCB;
+}
+
+.dashMnuUnSel{
+	font-family:Arial, Helvetica, sans-serif;
+	font-size:11px;
+	text-decoration:none;
+	text-align:left;
+	padding:5px;
+	height:20px;
+	vertical-align:middle;
+}
+
+.dashMnuSel{
+	font-family:Arial, Helvetica, sans-serif;
+	font-size:11px;
+	text-decoration:none;
+	text-align:left;
+	background-color:#CBCBCB;
+	font-weight:bold;
+	color:#000000;
+	padding:5px;
+	height:20px;
+	vertical-align:middle;
+}
+
+.dashInner{
+	width:100%;
+	border:0px solid #000000;
+	padding:0px;
+}
+
+.dashInner tr td{
+	width:100%;
+	border:0px solid #000000;
+	padding-left:0px;
+	padding-bottom:0px;
+	padding-right:0px;
+	padding-top:0px;
+}
+
+#dashChart{
+	font-family:Verdana, Arial, Helvetica, sans-serif;
+	font-size:11px;
+	background-color:#EBEBEB;
+	width:640px;
+	height:425px;
+	overflow:auto;
+	padding-left:5px;
+	padding-top:10px;
+	position:relative;
+}
+
+.dashSerial{
+	font-family:Verdana, Arial, Helvetica, sans-serif;
+	font-size:30px;
+	font-weight:bold;
+	color:#000000;
+}
+
+
+/*  menu */
+
+#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 #ECECEC;
+	background-color:#CCCCCC;
+	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 #ECECEC;
+	color:#000000;
+	text-align:left;
+	text-decoration:none;
+	display:block;
+}
+
+#mnuKey{
+	font-family:Verdana, Arial, Helvetica, sans-serif;
+	font-size:11px;
+	background-color:#666666;
+	color:#FFFFFF;
+	text-decoration:none;
+	padding:5px;
+	font-weight:bold;
+	width:8px;
+	cursor:pointer;
+	vertical-align:top;
+	height:100px;
+	position:relative;
+	top:0px;
+	left:0px;
+}
+
+#slidemenu{
+	height:525px;
+	vertical-align:top;
+	width:100px;
+	background-color:#CCCCCC;
+	border-right:1px solid #CCCCCC;
+	opacity:.9;
+	display:none;
+}
+
+/* clock */
+
+.citystyle{
+	position:relative;
+	top:0px;
+	left:0px;
+	text-align:left;
+	
+}
+#theClockLayer{
+	position:relative;
+	height:180px;
+	left:20px;
+	text-align:center;
+}
+.handsanddotsstyle{
+	margin-top:10px;
+	position:absolute;
+	top:0px;
+	left:0px;
+	width:2px;
+	height:2px;
+	font-size:2px;
+	background-color:#000000;
+}
+.facestyle{
+	margin-top:10px;
+	position:absolute;
+	top:0px;
+	left:0px;
+	width:15px;
+	height:15px;
+	text-align:center;
+	font-family:arial,sans-serif;
+	font-size:10px;
+	color:#000000;
+}
+.datestyle{
+	margin-top:20px;
+	position:absolute;
+	top:0px;
+	left:0px;
+	width:100px;
+	text-align:center;
+	font-family:arial,sans-serif;
+	font-size:10px;
+	color:#000000;
+}
+.ampmstyle{
+	margin-top:23px;
+	position:absolute;
+	top:0px;
+	left:0px;
+	width:20px;
+	text-align:center;
+	font-family:arial,sans-serif;
+	font-size:10px;
+	color:#000000;
+}
+
+#wclock{
+	position:absolute;
+	left:100px;
+	top:100px;
+	display:none;
+	background-color:#CCCCCC;
+	width:175px;
+}
+
+.leftFormBorder1 {
+	border: 1px solid #AFC8E4;
+	background-color: #FFFFFF;
+	opacity:.7;
+}
+
+
+
+
+/* Calculator */
+.calcBg {
+	/*background-color: #666;*//*BFC1B7*/
+	background: url(images/cal_bg.gif);
+	border: 1px solid #009900;
+}
+.calcResult {
+	width: 100%;
+	height: 25px;
+	background-color: #FFFFCC;/*CBDFD6*/
+	border-top: 1px solid #CCC;
+	border-left: 0px;
+	border-right: 1px solid #CCC;
+	border-bottom: 1px solid #CCC;
+	font-size: 10px;
+	text-align: right;
+}
+.calcMem {
+	width: 100%;
+	height: 25px;
+	border-top: 1px solid #CCC;
+	border-left: 1px solid #CCC;
+	border-right: 0px;
+	border-bottom: 1px solid #CCC;
+	background-color: #FFFFCC;/*CBDFD6*/
+	font-family: Arial;
+	font-size: 10px;
+	color: #BBB;
+	text-align: left;
+}
+.calcBlackBtn, .calcGreyBtn, .calcBigBtn, .calcCancBtn, .calcMemBtn, .calcBackBtn {
+	border: none;
+	height: 20px;
+	font-size: 11px;
+	color: #FFF;
+	text-align:center;
+}
+.calcBackBtn {
+	background: url(images/calc_back_btn.gif) no-repeat;
+	width:25px;
+}
+.calcBlackBtn {
+	background: url(images/calc_black_btn.gif) no-repeat;
+	width:25px;
+}
+.calcGreyBtn {
+	background: url(images/calc_grey_btn.gif) no-repeat;
+	width:25px;
+}
+.calcCancBtn {
+	background: url(images/calc_canc_btn.gif) no-repeat;
+	width:25px;
+	
+}
+.calcMemBtn {
+	background: url(images/calc_mem_btn.gif) no-repeat;
+	width:25px;
+	/*background-color: #CCC;*/
+}
+#calc{
+	position:absolute;
+	left:100px;
+	top:100px;
+	background-color:#FFFFFF;
+	width:185px;
+	border-bottom:2px solid #000000;
+	border-right:2px solid #666666;
+	border-left:2px solid #CCCCCC;
+	border-top:2px 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:200px;
+	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;
+}
+
+
+/*  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;
+}
+
+.prvPrfTopBg {
+	background-color:#ebebeb;
+}
+
+.prvPrfBottomBg {
+	background-color:#ebebeb;
+}
+
+.prvPrfOutline {
+	border:1px solid #ebebeb;
+}
+
+.prvPrfSelectedTab {
+	background:url(images/prvPrfSelectedTab.gif) repeat-x;
+	cursor:pointer;
+
+}
+
+.prvPrfUnSelectedTab {
+	background:url(images/prvPrfUnSelectedTab.gif) repeat-x;
+	cursor:pointer;
+}
+
+.prvPrfTexture {
+	background:url(images/prvPrfTexture1.gif);
+
+}
+.prvPrfBgOn{
+	background-color:#33ee33;
+}
+.prvPrfBgOff{
+	background-color:#cccccc;
+}
+
+.prvPrfHoverOn {
+	background-color:#ffffef;
+	
+}
+.prvPrfHoverOut {
+	background-color:#ffffff;
+}
+
+.prvPrfBgImgGlobal {
+	background:url(images/prvPrfBgImgGlobal.jpg) top right no-repeat;
+}
+.prvPrfBgImgTab {
+	background:url(images/prvPrfBgImgTab.jpg) top right no-repeat;
+}
+.prvPrfBgImgStandard {
+	background:url(images/prvPrfBgImgStandard.jpg) top right no-repeat;
+}
+.prvPrfBgImgUtils {
+	background:url(images/prvPrfBgImgUtils.jpg) top right no-repeat;
+}
+.prvPrfBgImgField {
+	background:url(images/prvPrfBgImgField.jpg) top right no-repeat;
+}
+
+.prvPrfTabSample {
+	border-top:1px solid #ababab;
+	border-left:1px solid #ababab;
+	border-right:1px solid #a1a1a1;
+}
+
+/*  Organization */
+
+.orgTab{
+	font-family:Arial, Helvetica, sans-serif;
+	font-size:11px;
+	font-weight:normal;
+	color:#666666;
+	border:0px solid #9B9B9B;
+	border-collapse:collapse;
+	width:100%;
+}
+
+.orgTab tr th{
+	text-align:left;
+	font-family:Arial, Helvetica, sans-serif;
+	font-size:12px;
+	text-decoration:none;
+	font-weight:bold;
+	height:20px;
+	padding-left:5px;
+}
+
+.orgTab tr td{
+	font-family:Arial, Helvetica, sans-serif;
+	font-size:11px;
+	text-decoration:none;
+	font-weight:normal;
+	padding-left:5px;
+	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%;
+}
+
+.globTab tr th{
+	text-align:right;
+	background-color:#CCCCCC;
+	border-bottom:1px solid #999999;
+	border-right:2px solid #999999;
+	color:#000000;
+	font-family:Arial, Helvetica, sans-serif;
+	font-size:12px;
+	text-decoration:none;
+	font-weight:bold;
+	height:20px;
+	padding-right:5px;
+	
+}
+
+.globTab tr td{
+	text-align:left;
+	border:1px solid #CCCCCC;
+	color:#666666;
+	font-family:Arial, Helvetica, sans-serif;
+	font-size:11px;
+	text-decoration:none;
+	font-weight:normal;
+	padding-left:5px;
+	height:20px;
+}
+
+
+/* Groups */
+
+.groupul{
+	margin:0px;
+	font-family:Arial, Helvetica, sans-serif;
+	font-weight:bold;
+	font-size:12px;
+	color:#000000;
+	text-decoration:underline;
+	text-align:left;
+}
+
+.groupli{
+	margin-left:20px;
+	font-family:Arial, Helvetica, sans-serif;
+	font-weight:normal;
+	font-size:12px;
+	text-decoration:none;
+	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:block;
+	position:absolute;
+	left:0px;
+	top:0px;
+}
+
+/*  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:Verdana, Arial, Helvetica, sans-serif;
+	text-decoration:none;
+	font-weight:normal;
+	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;
+}
+
+.classBtnSmall{
+	font-family:Verdana, Arial, Helvetica, sans-serif;
+	text-decoration:none;
+	font-weight:normal;
+	font-size:9px;
+	background-color:#DBDBDB;
+	border-bottom:2px solid #999999;
+	border-right:2px solid #999999;
+	border-top:2px solid #F5F5F5;
+	border-left:2px solid #F5F5F5;
+	color:#000000;
+	text-align:center;
+}
+
+.classBtnDisable{
+	font-family:Verdana, Arial, Helvetica, sans-serif;
+	text-decoration:none;
+	font-weight:normal;
+	font-size:10px;
+	background-color:#DBDBDB;
+	border-bottom:2px solid #CCCCCC;
+	border-right:2px solid #CCCCCC;
+	border-top:2px solid #F5F5F5;
+	border-left:2px solid #F5F5F5;
+	color:#666666;
+	text-align:center;
+	padding-top:3px;
+	padding-bottom:3px;
+}
+
+.txtBox{
+	width:85%;
+	border:1px solid #666666;
+	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;*/
+}
+
+.genHeaderGray{
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 14px;
+	line-height: 16px;
+	color: #888888;
+	font-weight:bold;
+}
+
+.genHeaderGrayBig{
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 18px;
+	line-height: 16px;
+	color: #888888;
+	font-weight:bold;
+}
+
+.importBox{
+	width:125px;
+	border:1px solid #666666;
+	font-family:Arial, Helvetica, sans-serif;
+	font-size:11px;
+}
+
+#imLead{
+	width:100%;
+	overflow:auto;
+	position:relative;
+	border:1px solid #666666;
+	height:175px;
+}
+
+.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;
+	z-index:2000;
+}
+
+#locateMap{
+	width:120px;
+	background-color:#CCCCCC;
+	border:1px solid #DDDDDD;
+	padding-top:5px;
+	position:absolute;
+	display:none;
+	z-index:2000;
+}
+
+
+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;
+}
+	
+/* END OF REPORT */
+/* WEB MAIL */
+a.webMnu{
+	font-size:11px;
+	color:#0070BA;
+	text-decoration:underline;
+}
+a.webMnu:Hover{
+	font-size:11px;
+	color:#0070BA;
+	text-decoration:underline;
+}
+
+.mailHdr{
+	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:#FFFFFF;
+	vertical-align:middle;
+	border:0px solid #000000;
+}
+
+.classWebBtn{
+	font-family:Verdana, Arial, Helvetica, sans-serif;
+	text-decoration:none;
+	font-weight:normal;
+	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;
+}
+
+/*  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{
+	border:2px solid #CCCCCC;
+	background-color:#FFFFFF;
+	width:30%;
+	position:relative;
+	visibility:visible;
+	margin:9px;
+	height:250px;
+}
+
+.fontBold{
+	font-size:13px;
+	color:#000000;
+	text-decoration:none;
+	font-weight:bold;
+}
+
+.style_Gray{
+	color:gray;
+}
+	
+/* End of Home Page */
+
+/* All Menu */
+#allMenu{
+	width:500px;
+	border-top:2px solid #CCCCCC;
+	border-left:2px solid #CCCCCC;
+	border-bottom:2px solid #666666;
+	border-right:2px solid #666666;
+	left:300px;
+	top:100px;
+	background-color:#CCCCCC;
+	position:absolute;
+	z-index:1000001;
+	display:none;
+}
+
+
+.allMnuTable{
+	width:100%;
+	border:1px solid #000000;
+	background-color:#FFFFFF;
+}
+
+.allMnuHandle td{
+	height:20px;
+	color:#FFFFFF;
+	font-family:Arial, Helvetica, sans-serif;
+	font-size:12px;
+	font-weight:bold;
+	text-decoration:none;
+	background-color:#000066;
+	cursor:move;
+	padding:2px;
+	border-bottom:2px solid #666666;
+}
+
+.allMnuHdr{
+	font-family:Verdana, Arial, Helvetica, sans-serif;
+	font-weight:normal;
+	font-size:11px;
+	text-decoration:none;
+	display:block;
+	background-color:#FFFFFF;
+	color:#000099;
+	padding-top:5px;
+	padding-bottom:5px;
+}
+a.allMnu{
+	font-family:Verdana, Arial, Helvetica, sans-serif;
+	font-size:10px;
+	text-decoration:none;
+	font-weight:normal;
+	display:block;
+	width:125px;
+	height:15px;
+	padding-left:5px;
+	padding-top:0px;
+	padding-bottom:0px;
+	background-color:#FFFFFF;
+	border:1px solid #FFFFFF;
+	color:#000033;
+	margin-left:20px;
+}
+
+a.allMnu:Hover{
+	font-family:Verdana, Arial, Helvetica, sans-serif;
+	font-size:10px;
+	text-decoration:none;
+	font-weight:normal;
+	display:block;
+	width:125px;
+	height:15px;
+	padding-left:5px;
+	padding-top:0px;
+	padding-bottom:0px;
+	background-color:#ECFFFF;
+	border:1px solid #00CCFF;
+	color:#000033;
+}
+/* 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;
+	z-index:1000;
+}
+
+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;
+}	
+
+.calendarNav{
+	font-size:12px;
+	color:#FFFFFF;
+	white-space:nowrap;
+	text-align:center;
+	font-weight:bold;
+	padding-left:10px;
+	padding-right:10px;
+	background-image:url(images/cal_nav.gif);
+	background-repeat:repeat-x;
+}
+
+#addEventDropDown{
+	position:absolute;
+	display:none;
+	width:110px;
+	border:1px solid #666666;
+	left:0px;
+	top:0px;
+	z-index:5000;
+}
+
+.calAction{
+	width:175px;
+	background-color:#CCCCCC;
+	border:1px solid #DDDDDD;
+	padding-top:5px;
+	position:absolute;
+	display:none;
+	z-index:2000;
+}
+
+.calSettings{
+	position:absolute;
+	z-index:20000;
+	width:500px;
+	left:200px;
+	top:150px;
+	border:2px solid #999999;
+	background-color:#ffffff;
+	padding:5px;
+}
+									
+/* End of Calendar */
+
+/* Cal Year View */
+.month_table{
+	border:2px solid #CCCCCC;
+	width:100%;
+	background-color:white;
+}
+
+.month_table tr th{
+	background-color:#E9E9E9;
+	color:#000000;
+	text-align:center;
+	border:1px dotted #CCCCCC;
+	height:20px;
+	width:14%;
+	font-weight:normal;
+}
+
+.month_table tr td{
+	border:1px dotted #CCCCCC;
+	color:#000000;
+	text-align:center;
+	height:20px;
+}
+
+.cal_Hdr{
+	background-image:url(images/cal_Hdr.gif);
+	background-repeat:repeat-x;
+	background-position:left top;
+	font-weight:bold;
+	color:#000000;
+	text-align:left;
+	border:0px solid #000000;
+}
+
+.eventDay{
+	background-color:#FF9966;
+	font-weight:bold;
+}
+
+.currDay{
+	background-color:#006600;
+	font-weight:bold;
+	text-decoration:underline;
+}
+
+/* End of Cal Year View */
+
+/* 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;
+}
+
+#CurrencyDeleteLay{
+	font-family:Arial, Helvetica, sans-serif;
+	font-size:11px;
+	text-align:left;
+	width:300px;
+	border:3px solid #CCCCCC;
+	background-color:#FFFFFF;
+	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;
+    font-weight: bold;
+    white-space:nowrap;
+}
+.rptTable {
+    border-left: 1px solid #DDDDDD;
+    border-bottom: 1px solid #DDDDDD;
+    border-top: 1px solid #DDDDDD;
+}
+.rptTitle, .rptHead, .rptData, .rptGrpHead{
+    font-family: Verdana, Arial, Helvetica, Sans-serif;
+    font-size: 11px;
+	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;
+}
+.rptGrpHead {
+	background: #FFF;
+    border-bottom: 1px solid #FFF;
+    border-top: 1px solid #DDDDDD;
+    font-weight: normal;
+}
+
+.rptData {
+            background: #FFF;
+            font-weight: normal;
+}
+.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;
+    left:100px;
+    top:100px;
+}
+
+#folderLay{
+    width:175px;
+    background-color:#CCCCCC;
+    border:1px solid #DDDDDD;
+    padding-top:5px;
+    position:absolute;
+    display:none;
+}
+
+/* Css for quick Create */
+
+.qcWindow {
+	    background-color:white;
+            border:2px solid #999999;
+}
+
+.qcHeader{
+	    background:url(images/qcBg.gif) repeat-x;
+	    background-color:gray;
+	    color:black;
+	    font-family: Arial, Helvetica, sans-serif;
+	    font-size: 12px;
+	    line-height: 19px;
+	    padding-left:10px;
+}
+.qcTextBox{
+            border:1px solid #999999;
+	    width:90%;
+}
+.qcTextArea{
+	    border:1px solid #999999;
+	    width:90%;
+	    height:70px;
+	    font-family: Arial, Helvetica, sans-serif;
+	    font-size: 11px;
+}
+.qcTransport{
+	    background-color:#ededed;
+
+}
+
+#role_popup{
+        position:relative;
+        left:0px;
+        top:0px;
+        width:95%;
+        height:300px;
+        overflow:auto;
+        border:1px solid #999999;
+        text-align:left;
+        background-color:#FFFFFF;
+    }
+
+.unread_email {
+	font-weight:bold;
+}
+
+								    
+/* MY SITES */
+
+.SiteSel{
+	font-family:Arial, Helvetica, sans-serif;
+	background-image:url(images/site_sel.jpg);
+	background-position:left bottom;
+	background-repeat:no-repeat;
+	height:33px;
+	width:194px;
+	text-align:center;
+	vertical-align:middle;
+	color:#000000;
+	font-weight:bold;
+	font-size:11px;
+	text-decoration:none;
+}
+
+.SiteUnSel{
+	font-family:Arial, Helvetica, sans-serif;
+	background-image:url(images/site_unsel.jpg);
+	background-position:left bottom;
+	background-repeat:no-repeat;
+	height:33px;
+	width:194px;
+	text-align:center;
+	vertical-align:middle;
+	color:#000000;
+	font-weight:normal;
+	font-size:11px;
+	text-decoration:none;
+	cursor:pointer;
+}
+
+.SiteHdr{
+	font-family:Arial, Helvetica, sans-serif;
+	background-image:url(images/site_hdr.jpg);
+	background-position:right bottom;
+	background-repeat:no-repeat;
+	height:33px;
+	text-align:center;
+	vertical-align:middle;
+	color:#000000;
+	font-weight:normal;
+	font-size:11px;
+	text-decoration:none;
+}
+.unread_email {
+	font-weight:bold;
+}
+
+
+.tagCloud {
+    border:1px solid #737373;
+}
+
+   
+.tagCloudTopBg {
+    background: url(images/tagCloudBg.gif) repeat-x;
+   
+}
+
+.tagCloudDisplay {
+    background-color:#e5e5e5;
+    padding:10px;
+    font-family: Arial, Helvetica, sans-serif;
+    font-size: 11px;
+    line-height: 14px;
+    color: #000000;
+
+}
+.adProgressBar {
+	border-style:solid;
+	border-width:2px;
+	border-color:blue;
+
+}
+
+.h2 {
+
+	font-size:18px;
+	line-height:20px;
+
+}
+
+.gray {
+
+	color:gray;
+}
+
+.hdeskComments {
+
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	line-height: 14px;
+	color: #999999;
+	border:0px;
+	background-color:#ffffef;
+	width:100%;
+
+}
+
+ul {
+	list-style:circle;
+	line-height:20px;
+	padding-left:5px;
+	margin-left:20px;
+	font-weight:normal;
+
+}
+
+	
+.branch {
+	list-style-image: url("secAdd.gif");
+}	
+
+
+
+.tagCloudTopBg {
+	background-image: url(images/topCloudBg.gif);
+	background-repeat: repeat-x;	
+}
+
+.tagCloudDisplay {
+	background-color:#e5e5e5;
+	padding:5px;
+}
+	
+	
+	
+.heading1 {
+	font-family:  Arial, Helvetica, sans-serif;
+	font-size: 19px;
+	line-height: 14px;
+	color: #000000;
+}
+
+.heading2 {
+	font-family:  Arial, Helvetica, sans-serif;
+	font-size: 16px;
+	line-height: 16px;
+	font-weight:bold;
+	color: #000000;
+}
+
+.heading3 {
+	font-family:  Arial, Helvetica, sans-serif;
+	font-size: 14px;
+	line-height: 14px;
+	color: #999999;
+}
+
+.heading4 {
+	font-family:  Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	line-height: 14px;
+	color: #999999;
+}
+
+.settingsUI {
+
+	background-color:#efefef;
+	border:2px solid #777777;
+
+}
+
+
+.settingsTabHeader {
+	font-family:  Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	line-height:25px;
+	font-weight:bold;
+	color:#ffffff;
+	background-image: url(images/settingsMTBg.gif);
+	background-repeat: repeat-x;
+	padding-left:10px;
+	padding-right:10px;
+	
+
+}
+
+.settingsTabList {
+	font-family:  Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	line-height:20px;
+	font-weight:normal;
+	color:#000000;
+	background-color:#e3e3e3;
+	padding-left:30px;
+	border-top:1px solid #eaeaea;
+	border-bottom:1px solid #d3d3d3;
+}
+.settingsTabSelected {
+	font-family:  Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	line-height:20px;
+	font-weight:bold;
+	color:#000000;
+	background-color:#ffffff;
+	padding-left:30px;
+}
+.settingsSelectedUI {
+	padding:10px;
+	background:url(images/settingsSelUIBg.gif) repeat-x;
+	background-color:#ffffff;
+}
+.settingsIconDisplay {
+	font-family:  Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	line-height:14px;
+	padding:10px;
+
+	color:#000000;
+	background-color:#ffffff;
+	padding-left:10px;
+}
+.settingsSelUITopLine{
+	border-bottom:2px dotted #999999;
+
+}
+
+.tableHeading{
+	background-color:#ffffff;
+	border-bottom:2px solid #aaaaaa;
+}
+.colHeader{
+	background-color:#dadada;
+	border-left:1px solid #eaeaea;
+	border-top:1px solid #eaeaea;
+	border-right:1px solid #aaaaaa;
+	border-bottom:1px solid #aaaaaa;
+	font-weight:bold;
+
+}
+.cellLabel {
+	background-color:#eaeaea;
+	border-top:1px solid #efefef;
+	border-bottom:1px solid #dadada;
+	color:#555555;
+
+}
+.cellText {
+	color:#333333;
+	border-bottom:1px solid #dadada;
+}
+
+.listTable{
+	border-left:1px solid #cccccc;
+	border-right:1px solid #cccccc;
+	border-bottom:1px solid #cccccc;
+
+}
+
+.listTableRow{
+	border-bottom:1px solid #eaeaea;
+	border-right	:1px solid #eaeaea;
+	border-bottom:1px solid #eaeaea;
+	border-bottom:1px solid #eaeaea;
+}
+.listRow{
+	border-bottom:2px solid #eaeaea;
+
+}
+
+.listTableTopButtons{
+	background-color:#eeeeee;
+	
+}
+
+.crmButton{
+	
+	border-left:1px solid #ffffff;
+	border-top:1px solid #ffffff;
+	border-right:1px solid #555555;
+	border-bottom:1px solid #555555;
+	padding-left:20px;
+	padding-right:20px;
+}
+
+.create{
+	background-color:#33cc11;
+	color:#333333;
+	font-weight:bold;
+}
+.delete {
+	background-color:#dd9900;
+	color:#ffffff;
+	font-weight:bold;
+}
+.edit {
+	background-color:#a5a5ee;
+	color:#ffffff;
+	font-weight:bold;
+}
+.save{
+	background-color:#33cc11;
+	color:#ffffff;
+	font-weight:bold;
+}
+.cancel {
+	background-color:#dd9900;
+	color:#ffffff;
+	font-weight:bold;
+}
+
+.inactive{
+color:#999999;
+}
+
+.active{
+color:#229922;
+
+}
+textarea {
+	width:95%;
+	height:70px;
+	border:1px solid #dadada;
+}
+.treeTable1{
+	padding:0px;
+}
+
+.prvPrfBigText {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 14px;
+}
+
+.prvPrfTopBg {
+	background-color:#ebebeb;
+}
+
+.prvPrfBottomBg {
+	background-color:#ebebeb;
+}
+
+.prvPrfOutline {
+	border:1px solid #ebebeb;
+}
+
+.prvPrfSelectedTab {
+	background:url(images/prvPrfSelectedTab.gif) repeat-x;
+
+}
+
+.prvPrfUnSelectedTab {
+	background:url(images/prvPrfUnSelectedTab.gif) repeat-x;
+
+}
+
+.prvPrfTexture {
+	background:url(images/prvPrfTexture1.gif);
+
+}
+.prvPrfBgOn{
+	background-color:#33ee33;
+}
+.prvPrfBgOff{
+	background-color:#cccccc;
+}
+
+.prvPrfHoverOn {
+	background-color:#ffffef;
+	
+}
+.prvPrfHoverOut {
+	background-color:#ffffff;
+}
+
+.prvPrfBgImgGlobal {
+	background:url(images/prvPrfBgImgGlobal.jpg) top right no-repeat;
+}
+.prvPrfBgImgTab {
+	background:url(images/prvPrfBgImgTab.jpg) top right no-repeat;
+}
+.prvPrfBgImgStandard {
+	background:url(images/prvPrfBgImgStandard.jpg) top right no-repeat;
+}
+.prvPrfBgImgUtils {
+	background:url(images/prvPrfBgImgUtils.jpg) top right no-repeat;
+}
+.prvPrfBgImgField {
+	background:url(images/prvPrfBgImgField.jpg) top right no-repeat;
+}
+
+.prvPrfTabSample {
+	border-top:1px solid #ababab;
+	border-left:1px solid #ababab;
+	border-right:1px solid #a1a1a1;
+}
+
+.cellBottomDotLine {
+	border-bottom-width: 2px;
+	border-bottom-style: dotted;
+	border-bottom-color: #CCCCCC;
+	background-color:#ededed;
+}
+.crmFormList{
+	border:1px solid #cccccc;
+	width:90%;
+	height:120px;
+
+}
+.cellBottomDotLinePlain {
+	border-bottom-width: 2px;
+	border-bottom-style: dotted;
+	border-bottom-color: #CCCCCC;
+	
+}
+.crmFormDropDown {
+border-width:1px;
+}
+.thickBorder {
+	border: 2px solid #999999;
+}
+.trackerBorder {
+	border-width:2px;
+	border-style:solid;
+	border-color:#999999;
+	background-color:#ffffff;
+}
+.trackerHeading {
+	border-bottom:1px solid #cccccc;
+	background-color:#efefef;
+}
+.trackerListBullet {
+	border-right:1px dotted #cccccc;
+	background-color:#f9f9f9;
+}
+.trackerList {
+	border-bottom:1px solid #eeeeee;
+}
+



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 29 09:41:25 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 29 Jun 2006 16:41:25 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7682 -
	/vtigercrm/trunk/data/CRMEntity.php
Message-ID: <20060629164125.4BBFF83FE25@vtiger.fosslabs.com>

Author: richie
Date: Thu Jun 29 10:41:16 2006
New Revision: 7682

Log:
Support for last view done

Modified:
    vtigercrm/trunk/data/CRMEntity.php

Modified: vtigercrm/trunk/data/CRMEntity.php
==============================================================================
--- vtigercrm/trunk/data/CRMEntity.php (original)
+++ vtigercrm/trunk/data/CRMEntity.php Thu Jun 29 10:41:16 2006
@@ -1521,5 +1521,20 @@
 		return $this->process_full_list_query($query);
 	}
 
+	/**
+	 * Track the viewing of a detail record.  This leverages get_summary_text() which is object specific
+	 * params $user_id - The user that is viewing the record.
+	 * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc..
+	 * All Rights Reserved..
+	 * Contributor(s): ______________________________________..
+	 */
+	function track_view($user_id, $current_module,$id='')
+	{
+		$this->log->debug("About to call vtiger_tracker (user_id, module_name, item_id)($user_id, $current_module, $this->id)");
+
+		$tracker = new Tracker();
+		$tracker->track_view($user_id, $current_module, $id, '');
+	}
+
 }
 ?>



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 29 09:48:12 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 29 Jun 2006 16:48:12 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7684 - in
 /vtigercrm/trunk/themes/blue/images: btnL3Tracker-Faded.gif
 btnL3Tracker.gif
Message-ID: <20060629164812.7E2D083FE81@vtiger.fosslabs.com>

Author: richie
Date: Thu Jun 29 10:47:52 2006
New Revision: 7684

Log:
Support for last view done

Added:
    vtigercrm/trunk/themes/blue/images/btnL3Tracker-Faded.gif   (with props)
    vtigercrm/trunk/themes/blue/images/btnL3Tracker.gif   (with props)



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 29 09:42:31 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 29 Jun 2006 16:42:31 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7683 -
	/vtigercrm/trunk/themes/blue/header.php
Message-ID: <20060629164231.5537683FE53@vtiger.fosslabs.com>

Author: richie
Date: Thu Jun 29 10:42:23 2006
New Revision: 7683

Log:
Support for last view done

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 Thu Jun 29 10:42:23 2006
@@ -100,5 +100,11 @@
 	$smarty->assign("QUERY_STRING","$app_strings[LBL_SEARCH_STRING]");
 
 global $module_menu;
+
+
+require_once('data/Tracker.php');
+$tracFocus=new Tracker();
+$list = $tracFocus->get_recently_viewed($current_user->id);
+$smarty->assign("TRACINFO",$list);
 $smarty->display("Header.tpl");
 ?>



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 29 10:27:55 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 29 Jun 2006 17:27:55 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7685 -
	/vtigercrm/trunk/adodb/adodb-datadict.inc.php
Message-ID: <20060629172755.815A183FE8D@vtiger.fosslabs.com>

Author: richie
Date: Thu Jun 29 11:27:41 2006
New Revision: 7685

Log:
fixed the innodb and foreign key issue by srini

Modified:
    vtigercrm/trunk/adodb/adodb-datadict.inc.php

Modified: vtigercrm/trunk/adodb/adodb-datadict.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/adodb-datadict.inc.php (original)
+++ vtigercrm/trunk/adodb/adodb-datadict.inc.php Thu Jun 29 11:27:41 2006
@@ -1,784 +1,812 @@
-<?php
-
-/**
-  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence.
-	
-  Set tabs to 4 for best viewing.
- 
- 	DOCUMENTATION:
-	
-		See adodb/tests/test-datadict.php for docs and examples.
-*/
-
-/*
-	Test script for parser
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-function Lens_ParseTest()
-{
-$str = "`zcol ACOL` NUMBER(32,2) DEFAULT 'The \"cow\" (and Jim''s dog) jumps over the moon' PRIMARY, INTI INT AUTO DEFAULT 0, zcol2\"afs ds";
-print "<p>$str</p>";
-$a= Lens_ParseArgs($str);
-print "<pre>";
-print_r($a);
-print "</pre>";
-}
-
-
-if (!function_exists('ctype_alnum')) {
-	function ctype_alnum($text) {
-		return preg_match('/^[a-z0-9]*$/i', $text);
-	}
-}
-
-//Lens_ParseTest();
-
-/**
-	Parse arguments, treat "text" (text) and 'text' as quotation marks.
-	To escape, use "" or '' or ))
-	
-	Will read in "abc def" sans quotes, as: abc def
-	Same with 'abc def'.
-	However if `abc def`, then will read in as `abc def`
-	
-	@param endstmtchar    Character that indicates end of statement
-	@param tokenchars     Include the following characters in tokens apart from A-Z and 0-9 
-	@returns 2 dimensional array containing parsed tokens.
-*/
-function Lens_ParseArgs($args,$endstmtchar=',',$tokenchars='_.-')
-{
-	$pos = 0;
-	$intoken = false;
-	$stmtno = 0;
-	$endquote = false;
-	$tokens = array();
-	$tokens[$stmtno] = array();
-	$max = strlen($args);
-	$quoted = false;
-	$tokarr = array();
-	
-	while ($pos < $max) {
-		$ch = substr($args,$pos,1);
-		switch($ch) {
-		case ' ':
-		case "\t":
-		case "\n":
-		case "\r":
-			if (!$quoted) {
-				if ($intoken) {
-					$intoken = false;
-					$tokens[$stmtno][] = implode('',$tokarr);
-				}
-				break;
-			}
-			
-			$tokarr[] = $ch;
-			break;
-		
-		case '`':
-			if ($intoken) $tokarr[] = $ch;
-		case '(':
-		case ')':	
-		case '"':
-		case "'":
-			
-			if ($intoken) {
-				if (empty($endquote)) {
-					$tokens[$stmtno][] = implode('',$tokarr);
-					if ($ch == '(') $endquote = ')';
-					else $endquote = $ch;
-					$quoted = true;
-					$intoken = true;
-					$tokarr = array();
-				} else if ($endquote == $ch) {
-					$ch2 = substr($args,$pos+1,1);
-					if ($ch2 == $endquote) {
-						$pos += 1;
-						$tokarr[] = $ch2;
-					} else {
-						$quoted = false;
-						$intoken = false;
-						$tokens[$stmtno][] = implode('',$tokarr);
-						$endquote = '';
-					}
-				} else
-					$tokarr[] = $ch;
-					
-			}else {
-			
-				if ($ch == '(') $endquote = ')';
-				else $endquote = $ch;
-				$quoted = true;
-				$intoken = true;
-				$tokarr = array();
-				if ($ch == '`') $tokarr[] = '`';
-			}
-			break;
-			
-		default:
-			
-			if (!$intoken) {
-				if ($ch == $endstmtchar) {
-					$stmtno += 1;
-					$tokens[$stmtno] = array();
-					break;
-				}
-			
-				$intoken = true;
-				$quoted = false;
-				$endquote = false;
-				$tokarr = array();
-	
-			}
-			
-			if ($quoted) $tokarr[] = $ch;
-			else if (ctype_alnum($ch) || strpos($tokenchars,$ch) !== false) $tokarr[] = $ch;
-			else {
-				if ($ch == $endstmtchar) {			
-					$tokens[$stmtno][] = implode('',$tokarr);
-					$stmtno += 1;
-					$tokens[$stmtno] = array();
-					$intoken = false;
-					$tokarr = array();
-					break;
-				}
-				$tokens[$stmtno][] = implode('',$tokarr);
-				$tokens[$stmtno][] = $ch;
-				$intoken = false;
-			}
-		}
-		$pos += 1;
-	}
-	if ($intoken) $tokens[$stmtno][] = implode('',$tokarr);
-	
-	return $tokens;
-}
-
-
-class ADODB_DataDict {
-	var $connection;
-	var $debug = false;
-	var $dropTable = 'DROP TABLE %s';
-	var $renameTable = 'RENAME TABLE %s TO %s'; 
-	var $dropIndex = 'DROP INDEX %s';
-	var $addCol = ' ADD';
-	var $alterCol = ' ALTER COLUMN';
-	var $dropCol = ' DROP COLUMN';
-	var $renameColumn = 'ALTER TABLE %s RENAME COLUMN %s TO %s';	// table, old-column, new-column, column-definitions (not used by default)
-	var $nameRegex = '\w';
-	var $nameRegexBrackets = 'a-zA-Z0-9_\(\)';
-	var $schema = false;
-	var $serverInfo = array();
-	var $autoIncrement = false;
-	var $dataProvider;
-	var $invalidResizeTypes4 = array('CLOB','BLOB','TEXT','DATE','TIME'); // for changetablesql
-	var $blobSize = 100; 	/// any varchar/char field this size or greater is treated as a blob
-							/// in other words, we use a text area for editting.
-	
-	function GetCommentSQL($table,$col)
-	{
-		return false;
-	}
-	
-	function SetCommentSQL($table,$col,$cmt)
-	{
-		return false;
-	}
-	
-	function MetaTables()
-	{
-		if (!$this->connection->IsConnected()) return array();
-		return $this->connection->MetaTables();
-	}
-	
-	function MetaColumns($tab, $upper=true, $schema=false)
-	{
-		if (!$this->connection->IsConnected()) return array();
-		return $this->connection->MetaColumns($this->TableName($tab), $upper, $schema);
-	}
-	
-	function MetaPrimaryKeys($tab,$owner=false,$intkey=false)
-	{
-		if (!$this->connection->IsConnected()) return array();
-		return $this->connection->MetaPrimaryKeys($this->TableName($tab), $owner, $intkey);
-	}
-	
-	function MetaIndexes($table, $primary = false, $owner = false)
-	{
-		if (!$this->connection->IsConnected()) return array();
-		return $this->connection->MetaIndexes($this->TableName($table), $primary, $owner);
-	}
-	
-	function MetaType($t,$len=-1,$fieldobj=false)
-	{
-		return ADORecordSet::MetaType($t,$len,$fieldobj);
-	}
-	
-	function NameQuote($name = NULL,$allowBrackets=false)
-	{
-		if (!is_string($name)) {
-			return FALSE;
-		}
-		
-		$name = trim($name);
-		
-		if ( !is_object($this->connection) ) {
-			return $name;
-		}
-		
-		$quote = $this->connection->nameQuote;
-		
-		// if name is of the form `name`, quote it
-		if ( preg_match('/^`(.+)`$/', $name, $matches) ) {
-			return $quote . $matches[1] . $quote;
-		}
-		
-		// if name contains special characters, quote it
-		$regex = ($allowBrackets) ? $this->nameRegexBrackets : $this->nameRegex;
-		
-		if ( !preg_match('/^[' . $regex . ']+$/', $name) ) {
-			return $quote . $name . $quote;
-		}
-		
-		return $name;
-	}
-	
-	function TableName($name)
-	{
-		if ( $this->schema ) {
-			return $this->NameQuote($this->schema) .'.'. $this->NameQuote($name);
-		}
-		return $this->NameQuote($name);
-	}
-	
-	// Executes the sql array returned by GetTableSQL and GetIndexSQL
-	function ExecuteSQLArray($sql, $continueOnError = true)
-	{
-		$rez = 2;
-		$conn = &$this->connection;
-		$saved = $conn->debug;
-		foreach($sql as $line) {
-			
-			if ($this->debug) $conn->debug = true;
-			$ok = $conn->Execute($line);
-			$conn->debug = $saved;
-			if (!$ok) {
-				if ($this->debug) ADOConnection::outp($conn->ErrorMsg());
-				if (!$continueOnError) return 0;
-				$rez = 1;
-			}
-		}
-		return $rez;
-	}
-	
-	/*
-	 	Returns the actual type given a character code.
-		
-		C:  varchar
-		X:  CLOB (character large object) or largest varchar size if CLOB is not supported
-		C2: Multibyte varchar
-		X2: Multibyte CLOB
-		
-		B:  BLOB (binary large object)
-		
-		D:  Date
-		T:  Date-time 
-		L:  Integer field suitable for storing booleans (0 or 1)
-		I:  Integer
-		F:  Floating point number
-		N:  Numeric or decimal number
-	*/
-	
-	function ActualType($meta)
-	{
-		return $meta;
-	}
-	
-	function CreateDatabase($dbname,$options=false)
-	{
-		$options = $this->_Options($options);
-		$sql = array();
-		
-		$s = 'CREATE DATABASE ' . $this->NameQuote($dbname);
-		if (isset($options[$this->upperName]))
-			$s .= ' '.$options[$this->upperName];
-		
-		$sql[] = $s;
-		return $sql;
-	}
-	
-	/*
-	 Generates the SQL to create index. Returns an array of sql strings.
-	*/
-	function CreateIndexSQL($idxname, $tabname, $flds, $idxoptions = false)
-	{
-		if (!is_array($flds)) {
-			$flds = explode(',',$flds);
-		}
-		
-		foreach($flds as $key => $fld) {
-			# some indexes can use partial fields, eg. index first 32 chars of "name" with NAME(32)
-			$flds[$key] = $this->NameQuote($fld,$allowBrackets=true);
-		}
-		
-		return $this->_IndexSQL($this->NameQuote($idxname), $this->TableName($tabname), $flds, $this->_Options($idxoptions));
-	}
-	
-	function DropIndexSQL ($idxname, $tabname = NULL)
-	{
-		return array(sprintf($this->dropIndex, $this->NameQuote($idxname), $this->TableName($tabname)));
-	}
-	
-	function SetSchema($schema)
-	{
-		$this->schema = $schema;
-	}
-	
-	function AddColumnSQL($tabname, $flds)
-	{
-		$tabname = $this->TableName ($tabname);
-		$sql = array();
-		list($lines,$pkey) = $this->_GenFields($flds);
-		$alter = 'ALTER TABLE ' . $tabname . $this->addCol . ' ';
-		foreach($lines as $v) {
-			$sql[] = $alter . $v;
-		}
-		return $sql;
-	}
-	
-	/**
-	 * Change the definition of one column
-	 *
-	 * As some DBM's can't do that on there own, you need to supply the complete defintion of the new table,
-	 * to allow, recreating the table and copying the content over to the new table
-	 * @param string $tabname table-name
-	 * @param string $flds column-name and type for the changed column
-	 * @param string $tableflds='' complete defintion of the new table, eg. for postgres, default ''
-	 * @param array/string $tableoptions='' options for the new table see CreateTableSQL, default ''
-	 * @return array with SQL strings
-	 */
-	function AlterColumnSQL($tabname, $flds, $tableflds='',$tableoptions='')
-	{
-		$tabname = $this->TableName ($tabname);
-		$sql = array();
-		list($lines,$pkey) = $this->_GenFields($flds);
-		$alter = 'ALTER TABLE ' . $tabname . $this->alterCol . ' ';
-		foreach($lines as $v) {
-			$sql[] = $alter . $v;
-		}
-		return $sql;
-	}
-	
-	/**
-	 * Rename one column
-	 *
-	 * Some DBM's can only do this together with changeing the type of the column (even if that stays the same, eg. mysql)
-	 * @param string $tabname table-name
-	 * @param string $oldcolumn column-name to be renamed
-	 * @param string $newcolumn new column-name
-	 * @param string $flds='' complete column-defintion-string like for AddColumnSQL, only used by mysql atm., default=''
-	 * @return array with SQL strings
-	 */
-	function RenameColumnSQL($tabname,$oldcolumn,$newcolumn,$flds='')
-	{
-		$tabname = $this->TableName ($tabname);
-		if ($flds) {
-			list($lines,$pkey) = $this->_GenFields($flds);
-			list(,$first) = each($lines);
-			list(,$column_def) = split("[\t ]+",$first,2);
-		}
-		return array(sprintf($this->renameColumn,$tabname,$this->NameQuote($oldcolumn),$this->NameQuote($newcolumn),$column_def));
-	}
-		
-	/**
-	 * Drop one column
-	 *
-	 * Some DBM's can't do that on there own, you need to supply the complete defintion of the new table,
-	 * to allow, recreating the table and copying the content over to the new table
-	 * @param string $tabname table-name
-	 * @param string $flds column-name and type for the changed column
-	 * @param string $tableflds='' complete defintion of the new table, eg. for postgres, default ''
-	 * @param array/string $tableoptions='' options for the new table see CreateTableSQL, default ''
-	 * @return array with SQL strings
-	 */
-	function DropColumnSQL($tabname, $flds, $tableflds='',$tableoptions='')
-	{
-		$tabname = $this->TableName ($tabname);
-		if (!is_array($flds)) $flds = explode(',',$flds);
-		$sql = array();
-		$alter = 'ALTER TABLE ' . $tabname . $this->dropCol . ' ';
-		foreach($flds as $v) {
-			$sql[] = $alter . $this->NameQuote($v);
-		}
-		return $sql;
-	}
-	
-	function DropTableSQL($tabname)
-	{
-		return array (sprintf($this->dropTable, $this->TableName($tabname)));
-	}
-	
-	function RenameTableSQL($tabname,$newname)
-	{
-		return array (sprintf($this->renameTable, $this->TableName($tabname),$this->TableName($newname)));
-	}	
-	
-	/*
-	 Generate the SQL to create table. Returns an array of sql strings.
-	*/
-	function CreateTableSQL($tabname, $flds, $tableoptions=false)
-	{
-		if (!$tableoptions) $tableoptions = array();
-		
-		list($lines,$pkey) = $this->_GenFields($flds, true);
-		
-		$taboptions = $this->_Options($tableoptions);
-		$tabname = $this->TableName ($tabname);
-		$sql = $this->_TableSQL($tabname,$lines,$pkey,$taboptions);
-		
-		$tsql = $this->_Triggers($tabname,$taboptions);
-		foreach($tsql as $s) $sql[] = $s;
-		
-		return $sql;
-	}
-	
-	function _GenFields($flds,$widespacing=false)
-	{
-		if (is_string($flds)) {
-			$padding = '     ';
-			$txt = $flds.$padding;
-			$flds = array();
-			$flds0 = Lens_ParseArgs($txt,',');
-			$hasparam = false;
-			foreach($flds0 as $f0) {
-				$f1 = array();
-				foreach($f0 as $token) {
-					switch (strtoupper($token)) {
-					case 'CONSTRAINT':
-					case 'DEFAULT': 
-						$hasparam = $token;
-						break;
-					default:
-						if ($hasparam) $f1[$hasparam] = $token;
-						else $f1[] = $token;
-						$hasparam = false;
-						break;
-					}
-				}
-				$flds[] = $f1;
-				
-			}
-		}
-		$this->autoIncrement = false;
-		$lines = array();
-		$pkey = array();
-		foreach($flds as $fld) {
-			$fld = _array_change_key_case($fld);
-		
-			$fname = false;
-			$fdefault = false;
-			$fautoinc = false;
-			$ftype = false;
-			$fsize = false;
-			$fprec = false;
-			$fprimary = false;
-			$fnoquote = false;
-			$fdefts = false;
-			$fdefdate = false;
-			$fconstraint = false;
-			$fnotnull = false;
-			$funsigned = false;
-			
-			//-----------------
-			// Parse attributes
-			foreach($fld as $attr => $v) {
-				if ($attr == 2 && is_numeric($v)) $attr = 'SIZE';
-				else if (is_numeric($attr) && $attr > 1 && !is_numeric($v)) $attr = strtoupper($v);
-				
-				switch($attr) {
-				case '0':
-				case 'NAME': 	$fname = $v; break;
-				case '1':
-				case 'TYPE': 	$ty = $v; $ftype = $this->ActualType(strtoupper($v)); break;
-				
-				case 'SIZE': 	
-								$dotat = strpos($v,'.'); if ($dotat === false) $dotat = strpos($v,',');
-								if ($dotat === false) $fsize = $v;
-								else {
-									$fsize = substr($v,0,$dotat);
-									$fprec = substr($v,$dotat+1);
-								}
-								break;
-				case 'UNSIGNED': $funsigned = true; break;
-				case 'AUTOINCREMENT':
-				case 'AUTO':	$fautoinc = true; $fnotnull = true; break;
-				case 'KEY':
-				case 'PRIMARY':	$fprimary = $v; $fnotnull = true; break;
-				case 'DEF':
-				case 'DEFAULT': $fdefault = $v; break;
-				case 'NOTNULL': $fnotnull = $v; break;
-				case 'NOQUOTE': $fnoquote = $v; break;
-				case 'DEFDATE': $fdefdate = $v; break;
-				case 'DEFTIMESTAMP': $fdefts = $v; break;
-				case 'CONSTRAINT': $fconstraint = $v; break;
-				} //switch
-			} // foreach $fld
-			
-			//--------------------
-			// VALIDATE FIELD INFO
-			if (!strlen($fname)) {
-				if ($this->debug) ADOConnection::outp("Undefined NAME");
-				return false;
-			}
-			
-			$fid = strtoupper(preg_replace('/^`(.+)`$/', '$1', $fname));
-			$fname = $this->NameQuote($fname);
-			
-			if (!strlen($ftype)) {
-				if ($this->debug) ADOConnection::outp("Undefined TYPE for field '$fname'");
-				return false;
-			} else {
-				$ftype = strtoupper($ftype);
-			}
-			
-			$ftype = $this->_GetSize($ftype, $ty, $fsize, $fprec);
-			
-			if ($ty == 'X' || $ty == 'X2' || $ty == 'B') $fnotnull = false; // some blob types do not accept nulls
-			
-			if ($fprimary) $pkey[] = $fname;
-			
-			// some databases do not allow blobs to have defaults
-			if ($ty == 'X') $fdefault = false;
-			
-			//--------------------
-			// CONSTRUCT FIELD SQL
-			if ($fdefts) {
-				if (substr($this->connection->databaseType,0,5) == 'mysql') {
-					$ftype = 'TIMESTAMP';
-				} else {
-					$fdefault = $this->connection->sysTimeStamp;
-				}
-			} else if ($fdefdate) {
-				if (substr($this->connection->databaseType,0,5) == 'mysql') {
-					$ftype = 'TIMESTAMP';
-				} else {
-					$fdefault = $this->connection->sysDate;
-				}
-			} else if ($fdefault !== false && !$fnoquote)
-				if ($ty == 'C' or $ty == 'X' or 
-					( substr($fdefault,0,1) != "'" && !is_numeric($fdefault)))
-					if (strlen($fdefault) != 1 && substr($fdefault,0,1) == ' ' && substr($fdefault,strlen($fdefault)-1) == ' ') 
-						$fdefault = trim($fdefault);
-					else if (strtolower($fdefault) != 'null')
-						$fdefault = $this->connection->qstr($fdefault);
-			$suffix = $this->_CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned);
-			
-			if ($widespacing) $fname = str_pad($fname,24);
-			$lines[$fid] = $fname.' '.$ftype.$suffix;
-			
-			if ($fautoinc) $this->autoIncrement = true;
-		} // foreach $flds
-		
-		return array($lines,$pkey);
-	}
-	/*
-		 GENERATE THE SIZE PART OF THE DATATYPE
-			$ftype is the actual type
-			$ty is the type defined originally in the DDL
-	*/
-	function _GetSize($ftype, $ty, $fsize, $fprec)
-	{
-		if (strlen($fsize) && $ty != 'X' && $ty != 'B' && strpos($ftype,'(') === false) {
-			$ftype .= "(".$fsize;
-			if (strlen($fprec)) $ftype .= ",".$fprec;
-			$ftype .= ')';
-		}
-		return $ftype;
-	}
-	
-	
-	// return string must begin with space
-	function _CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint)
-	{	
-		$suffix = '';
-		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
-		if ($fnotnull) $suffix .= ' NOT NULL';
-		if ($fconstraint) $suffix .= ' '.$fconstraint;
-		return $suffix;
-	}
-	
-	function _IndexSQL($idxname, $tabname, $flds, $idxoptions)
-	{
-		$sql = array();
-		
-		if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) {
-			$sql[] = sprintf ($this->dropIndex, $idxname);
-			if ( isset($idxoptions['DROP']) )
-				return $sql;
-		}
-		
-		if ( empty ($flds) ) {
-			return $sql;
-		}
-		
-		$unique = isset($idxoptions['UNIQUE']) ? ' UNIQUE' : '';
-	
-		$s = 'CREATE' . $unique . ' INDEX ' . $idxname . ' ON ' . $tabname . ' ';
-		
-		if ( isset($idxoptions[$this->upperName]) )
-			$s .= $idxoptions[$this->upperName];
-		
-		if ( is_array($flds) )
-			$flds = implode(', ',$flds);
-		$s .= '(' . $flds . ')';
-		$sql[] = $s;
-		
-		return $sql;
-	}
-	
-	function _DropAutoIncrement($tabname)
-	{
-		return false;
-	}
-	
-	function _TableSQL($tabname,$lines,$pkey,$tableoptions)
-	{
-		$sql = array();
-		
-		if (isset($tableoptions['REPLACE']) || isset ($tableoptions['DROP'])) {
-			$sql[] = sprintf($this->dropTable,$tabname);
-			if ($this->autoIncrement) {
-				$sInc = $this->_DropAutoIncrement($tabname);
-				if ($sInc) $sql[] = $sInc;
-			}
-			if ( isset ($tableoptions['DROP']) ) {
-				return $sql;
-			}
-		}
-		$s = "CREATE TABLE $tabname (\n";
-		$s .= implode(",\n", $lines);
-		if (sizeof($pkey)>0) {
-			$s .= ",\n                 PRIMARY KEY (";
-			$s .= implode(", ",$pkey).")";
-		}
-		if (isset($tableoptions['CONSTRAINTS'])) 
-			$s .= "\n".$tableoptions['CONSTRAINTS'];
-		
-		if (isset($tableoptions[$this->upperName.'_CONSTRAINTS'])) 
-			$s .= "\n".$tableoptions[$this->upperName.'_CONSTRAINTS'];
-		
-		$s .= "\n)";
-		if (isset($tableoptions[$this->upperName])) $s .= $tableoptions[$this->upperName];
-		$sql[] = $s;
-		
-		return $sql;
-	}
-	
-	/*
-		GENERATE TRIGGERS IF NEEDED
-		used when table has auto-incrementing field that is emulated using triggers
-	*/
-	function _Triggers($tabname,$taboptions)
-	{
-		return array();
-	}
-	
-	/*
-		Sanitize options, so that array elements with no keys are promoted to keys
-	*/
-	function _Options($opts)
-	{
-		if (!is_array($opts)) return array();
-		$newopts = array();
-		foreach($opts as $k => $v) {
-			if (is_numeric($k)) $newopts[strtoupper($v)] = $v;
-			else $newopts[strtoupper($k)] = $v;
-		}
-		return $newopts;
-	}
-	
-	/*
-	"Florian Buzin [ easywe ]" <florian.buzin#easywe.de>
-	
-	This function changes/adds new fields to your table. You don't
-	have to know if the col is new or not. It will check on its own.
-	*/
-	function ChangeTableSQL($tablename, $flds, $tableoptions = false)
-	{
-	global $ADODB_FETCH_MODE;
-	
-		$save = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-		if ($this->connection->fetchMode !== false) $savem = $this->connection->SetFetchMode(false);
-		
-		// check table exists
-		$save_handler = $this->connection->raiseErrorFn;
-		$this->connection->raiseErrorFn = '';
-		$cols = $this->MetaColumns($tablename);
-		$this->connection->raiseErrorFn = $save_handler;
-		
-		if (isset($savem)) $this->connection->SetFetchMode($savem);
-		$ADODB_FETCH_MODE = $save;
-		
-		if ( empty($cols)) { 
-			return $this->CreateTableSQL($tablename, $flds, $tableoptions);
-		}
-		
-		if (is_array($flds)) {
-		// Cycle through the update fields, comparing
-		// existing fields to fields to update.
-		// if the Metatype and size is exactly the
-		// same, ignore - by Mark Newham
-			$holdflds = array();
-			foreach($flds as $k=>$v) {
-				if ( isset($cols[$k]) && is_object($cols[$k]) ) {
-					// If already not allowing nulls, then don't change
-					$obj = $cols[$k];
-					if (isset($obj->not_null) && $obj->not_null)
-						$v = str_replace('NOT NULL','',$v);
-
-					$c = $cols[$k];
-					$ml = $c->max_length;
-					$mt = $this->MetaType($c->type,$ml);
-					if ($ml == -1) $ml = '';
-					if ($mt == 'X') $ml = $v['SIZE'];
-					if (($mt != $v['TYPE']) ||  $ml != $v['SIZE']) {
-						$holdflds[$k] = $v;
-					}
-				} else {
-					$holdflds[$k] = $v;
-				}		
-			}
-			$flds = $holdflds;
-		}
-	
-
-		// already exists, alter table instead
-		list($lines,$pkey) = $this->_GenFields($flds);
-		$alter = 'ALTER TABLE ' . $this->TableName($tablename);
-		$sql = array();
-
-		foreach ( $lines as $id => $v ) {
-			if ( isset($cols[$id]) && is_object($cols[$id]) ) {
-			
-				$flds = Lens_ParseArgs($v,',');
-				
-				//  We are trying to change the size of the field, if not allowed, simply ignore the request.
-				if ($flds && in_array(strtoupper(substr($flds[0][1],0,4)),$this->invalidResizeTypes4)) continue;	 
-	 		
-				$sql[] = $alter . $this->alterCol . ' ' . $v;
-			} else {
-				$sql[] = $alter . $this->addCol . ' ' . $v;
-			}
-		}
-		
-		return $sql;
-	}
-} // class
-?>
+<?php
+
+/**
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence.
+	
+  Set tabs to 4 for best viewing.
+ 
+ 	DOCUMENTATION:
+	
+		See adodb/tests/test-datadict.php for docs and examples.
+*/
+
+/*
+	Test script for parser
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+function Lens_ParseTest()
+{
+$str = "`zcol ACOL` NUMBER(32,2) DEFAULT 'The \"cow\" (and Jim''s dog) jumps over the moon' PRIMARY, INTI INT AUTO DEFAULT 0, zcol2\"afs ds";
+print "<p>$str</p>";
+$a= Lens_ParseArgs($str);
+print "<pre>";
+print_r($a);
+print "</pre>";
+}
+
+
+if (!function_exists('ctype_alnum')) {
+	function ctype_alnum($text) {
+		return preg_match('/^[a-z0-9]*$/i', $text);
+	}
+}
+
+//Lens_ParseTest();
+
+/**
+	Parse arguments, treat "text" (text) and 'text' as quotation marks.
+	To escape, use "" or '' or ))
+	
+	Will read in "abc def" sans quotes, as: abc def
+	Same with 'abc def'.
+	However if `abc def`, then will read in as `abc def`
+	
+	@param endstmtchar    Character that indicates end of statement
+	@param tokenchars     Include the following characters in tokens apart from A-Z and 0-9 
+	@returns 2 dimensional array containing parsed tokens.
+*/
+function Lens_ParseArgs($args,$endstmtchar=',',$tokenchars='_.-')
+{
+	$pos = 0;
+	$intoken = false;
+	$stmtno = 0;
+	$endquote = false;
+	$tokens = array();
+	$tokens[$stmtno] = array();
+	$max = strlen($args);
+	$quoted = false;
+	$tokarr = array();
+	
+	while ($pos < $max) {
+		$ch = substr($args,$pos,1);
+		switch($ch) {
+		case ' ':
+		case "\t":
+		case "\n":
+		case "\r":
+			if (!$quoted) {
+				if ($intoken) {
+					$intoken = false;
+					$tokens[$stmtno][] = implode('',$tokarr);
+				}
+				break;
+			}
+			
+			$tokarr[] = $ch;
+			break;
+		
+		case '`':
+			if ($intoken) $tokarr[] = $ch;
+		case '(':
+		case ')':	
+		case '"':
+		case "'":
+			
+			if ($intoken) {
+				if (empty($endquote)) {
+					$tokens[$stmtno][] = implode('',$tokarr);
+					if ($ch == '(') $endquote = ')';
+					else $endquote = $ch;
+					$quoted = true;
+					$intoken = true;
+					$tokarr = array();
+				} else if ($endquote == $ch) {
+					$ch2 = substr($args,$pos+1,1);
+					if ($ch2 == $endquote) {
+						$pos += 1;
+						$tokarr[] = $ch2;
+					} else {
+						$quoted = false;
+						$intoken = false;
+						$tokens[$stmtno][] = implode('',$tokarr);
+						$endquote = '';
+					}
+				} else
+					$tokarr[] = $ch;
+					
+			}else {
+			
+				if ($ch == '(') $endquote = ')';
+				else $endquote = $ch;
+				$quoted = true;
+				$intoken = true;
+				$tokarr = array();
+				if ($ch == '`') $tokarr[] = '`';
+			}
+			break;
+			
+		default:
+			
+			if (!$intoken) {
+				if ($ch == $endstmtchar) {
+					$stmtno += 1;
+					$tokens[$stmtno] = array();
+					break;
+				}
+			
+				$intoken = true;
+				$quoted = false;
+				$endquote = false;
+				$tokarr = array();
+	
+			}
+			
+			if ($quoted) $tokarr[] = $ch;
+			else if (ctype_alnum($ch) || strpos($tokenchars,$ch) !== false) $tokarr[] = $ch;
+			else {
+				if ($ch == $endstmtchar) {			
+					$tokens[$stmtno][] = implode('',$tokarr);
+					$stmtno += 1;
+					$tokens[$stmtno] = array();
+					$intoken = false;
+					$tokarr = array();
+					break;
+				}
+				$tokens[$stmtno][] = implode('',$tokarr);
+				$tokens[$stmtno][] = $ch;
+				$intoken = false;
+			}
+		}
+		$pos += 1;
+	}
+	if ($intoken) $tokens[$stmtno][] = implode('',$tokarr);
+	
+	return $tokens;
+}
+
+
+class ADODB_DataDict {
+	var $connection;
+	var $debug = false;
+	var $dropTable = 'DROP TABLE %s';
+	var $renameTable = 'RENAME TABLE %s TO %s'; 
+	var $dropIndex = 'DROP INDEX %s';
+	var $addCol = ' ADD';
+	var $alterCol = ' ALTER COLUMN';
+	var $dropCol = ' DROP COLUMN';
+	var $renameColumn = 'ALTER TABLE %s RENAME COLUMN %s TO %s';	// table, old-column, new-column, column-definitions (not used by default)
+	var $nameRegex = '\w';
+	var $nameRegexBrackets = 'a-zA-Z0-9_\(\)';
+	var $schema = false;
+	var $serverInfo = array();
+	var $autoIncrement = false;
+	var $dataProvider;
+	var $invalidResizeTypes4 = array('CLOB','BLOB','TEXT','DATE','TIME'); // for changetablesql
+	var $blobSize = 100; 	/// any varchar/char field this size or greater is treated as a blob
+							/// in other words, we use a text area for editting.
+	
+	function GetCommentSQL($table,$col)
+	{
+		return false;
+	}
+	
+	function SetCommentSQL($table,$col,$cmt)
+	{
+		return false;
+	}
+	
+	function MetaTables()
+	{
+		if (!$this->connection->IsConnected()) return array();
+		return $this->connection->MetaTables();
+	}
+	
+	function MetaColumns($tab, $upper=true, $schema=false)
+	{
+		if (!$this->connection->IsConnected()) return array();
+		return $this->connection->MetaColumns($this->TableName($tab), $upper, $schema);
+	}
+	
+	function MetaPrimaryKeys($tab,$owner=false,$intkey=false)
+	{
+		if (!$this->connection->IsConnected()) return array();
+		return $this->connection->MetaPrimaryKeys($this->TableName($tab), $owner, $intkey);
+	}
+	
+	function MetaIndexes($table, $primary = false, $owner = false)
+	{
+		if (!$this->connection->IsConnected()) return array();
+		return $this->connection->MetaIndexes($this->TableName($table), $primary, $owner);
+	}
+	
+	function MetaType($t,$len=-1,$fieldobj=false)
+	{
+		return ADORecordSet::MetaType($t,$len,$fieldobj);
+	}
+	
+	function NameQuote($name = NULL,$allowBrackets=false)
+	{
+		if (!is_string($name)) {
+			return FALSE;
+		}
+		
+		$name = trim($name);
+		
+		if ( !is_object($this->connection) ) {
+			return $name;
+		}
+		
+		$quote = $this->connection->nameQuote;
+		
+		// if name is of the form `name`, quote it
+		if ( preg_match('/^`(.+)`$/', $name, $matches) ) {
+			return $quote . $matches[1] . $quote;
+		}
+		
+		// if name contains special characters, quote it
+		$regex = ($allowBrackets) ? $this->nameRegexBrackets : $this->nameRegex;
+		
+		if ( !preg_match('/^[' . $regex . ']+$/', $name) ) {
+			return $quote . $name . $quote;
+		}
+		
+		return $name;
+	}
+	
+	function TableName($name)
+	{
+		if ( $this->schema ) {
+			return $this->NameQuote($this->schema) .'.'. $this->NameQuote($name);
+		}
+		return $this->NameQuote($name);
+	}
+	
+	// Executes the sql array returned by GetTableSQL and GetIndexSQL
+	function ExecuteSQLArray($sql, $continueOnError = true)
+	{
+		$rez = 2;
+		$conn = &$this->connection;
+		$saved = $conn->debug;
+		foreach($sql as $line) {
+			
+			if ($this->debug) $conn->debug = true;
+			$ok = $conn->Execute($line);
+			$conn->debug = $saved;
+			if (!$ok) {
+				if ($this->debug) ADOConnection::outp($conn->ErrorMsg());
+				if (!$continueOnError) return 0;
+				$rez = 1;
+			}
+		}
+		return $rez;
+	}
+	
+	/*
+	 	Returns the actual type given a character code.
+		
+		C:  varchar
+		X:  CLOB (character large object) or largest varchar size if CLOB is not supported
+		C2: Multibyte varchar
+		X2: Multibyte CLOB
+		
+		B:  BLOB (binary large object)
+		
+		D:  Date
+		T:  Date-time 
+		L:  Integer field suitable for storing booleans (0 or 1)
+		I:  Integer
+		F:  Floating point number
+		N:  Numeric or decimal number
+	*/
+	
+	function ActualType($meta)
+	{
+		return $meta;
+	}
+	
+	function CreateDatabase($dbname,$options=false)
+	{
+		$options = $this->_Options($options);
+		$sql = array();
+		
+		$s = 'CREATE DATABASE ' . $this->NameQuote($dbname);
+		if (isset($options[$this->upperName]))
+			$s .= ' '.$options[$this->upperName];
+		
+		$sql[] = $s;
+		return $sql;
+	}
+	
+	/*
+	 Generates the SQL to create index. Returns an array of sql strings.
+	*/
+	function CreateIndexSQL($idxname, $tabname, $flds, $idxoptions = false)
+	{
+		if (!is_array($flds)) {
+			$flds = explode(',',$flds);
+		}
+		
+		foreach($flds as $key => $fld) {
+			# some indexes can use partial fields, eg. index first 32 chars of "name" with NAME(32)
+			$flds[$key] = $this->NameQuote($fld,$allowBrackets=true);
+		}
+		
+		return $this->_IndexSQL($this->NameQuote($idxname), $this->TableName($tabname), $flds, $this->_Options($idxoptions));
+	}
+	
+	function DropIndexSQL ($idxname, $tabname = NULL)
+	{
+		return array(sprintf($this->dropIndex, $this->NameQuote($idxname), $this->TableName($tabname)));
+	}
+	
+	function SetSchema($schema)
+	{
+		$this->schema = $schema;
+	}
+	
+	function AddColumnSQL($tabname, $flds)
+	{
+		$tabname = $this->TableName ($tabname);
+		$sql = array();
+		list($lines,$pkey) = $this->_GenFields($flds);
+		$alter = 'ALTER TABLE ' . $tabname . $this->addCol . ' ';
+		foreach($lines as $v) {
+			$sql[] = $alter . $v;
+		}
+		return $sql;
+	}
+	
+	/**
+	 * Change the definition of one column
+	 *
+	 * As some DBM's can't do that on there own, you need to supply the complete defintion of the new table,
+	 * to allow, recreating the table and copying the content over to the new table
+	 * @param string $tabname table-name
+	 * @param string $flds column-name and type for the changed column
+	 * @param string $tableflds='' complete defintion of the new table, eg. for postgres, default ''
+	 * @param array/string $tableoptions='' options for the new table see CreateTableSQL, default ''
+	 * @return array with SQL strings
+	 */
+	function AlterColumnSQL($tabname, $flds, $tableflds='',$tableoptions='')
+	{
+		$tabname = $this->TableName ($tabname);
+		$sql = array();
+		list($lines,$pkey) = $this->_GenFields($flds);
+		$alter = 'ALTER TABLE ' . $tabname . $this->alterCol . ' ';
+		foreach($lines as $v) {
+			$sql[] = $alter . $v;
+		}
+		return $sql;
+	}
+	
+	/**
+	 * Rename one column
+	 *
+	 * Some DBM's can only do this together with changeing the type of the column (even if that stays the same, eg. mysql)
+	 * @param string $tabname table-name
+	 * @param string $oldcolumn column-name to be renamed
+	 * @param string $newcolumn new column-name
+	 * @param string $flds='' complete column-defintion-string like for AddColumnSQL, only used by mysql atm., default=''
+	 * @return array with SQL strings
+	 */
+	function RenameColumnSQL($tabname,$oldcolumn,$newcolumn,$flds='')
+	{
+		$tabname = $this->TableName ($tabname);
+		if ($flds) {
+			list($lines,$pkey) = $this->_GenFields($flds);
+			list(,$first) = each($lines);
+			list(,$column_def) = split("[\t ]+",$first,2);
+		}
+		return array(sprintf($this->renameColumn,$tabname,$this->NameQuote($oldcolumn),$this->NameQuote($newcolumn),$column_def));
+	}
+		
+	/**
+	 * Drop one column
+	 *
+	 * Some DBM's can't do that on there own, you need to supply the complete defintion of the new table,
+	 * to allow, recreating the table and copying the content over to the new table
+	 * @param string $tabname table-name
+	 * @param string $flds column-name and type for the changed column
+	 * @param string $tableflds='' complete defintion of the new table, eg. for postgres, default ''
+	 * @param array/string $tableoptions='' options for the new table see CreateTableSQL, default ''
+	 * @return array with SQL strings
+	 */
+	function DropColumnSQL($tabname, $flds, $tableflds='',$tableoptions='')
+	{
+		$tabname = $this->TableName ($tabname);
+		if (!is_array($flds)) $flds = explode(',',$flds);
+		$sql = array();
+		$alter = 'ALTER TABLE ' . $tabname . $this->dropCol . ' ';
+		foreach($flds as $v) {
+			$sql[] = $alter . $this->NameQuote($v);
+		}
+		return $sql;
+	}
+	
+	function DropTableSQL($tabname)
+	{
+		return array (sprintf($this->dropTable, $this->TableName($tabname)));
+	}
+	
+	function RenameTableSQL($tabname,$newname)
+	{
+		return array (sprintf($this->renameTable, $this->TableName($tabname),$this->TableName($newname)));
+	}	
+	
+	/*
+	 Generate the SQL to create table. Returns an array of sql strings.
+	*/
+	function CreateTableSQL($tabname, $flds, $tableoptions=false)
+	{
+		if (!$tableoptions) $tableoptions = array();
+		
+		list($lines,$pkey) = $this->_GenFields($flds, true);
+		
+		$taboptions = $this->_Options($tableoptions);
+		$tabname = $this->TableName ($tabname);
+		$sql = $this->_TableSQL($tabname,$lines,$pkey,$taboptions);
+		
+		$tsql = $this->_Triggers($tabname,$taboptions);
+		foreach($tsql as $s) $sql[] = $s;
+		
+		return $sql;
+	}
+	
+	function _GenFields($flds,$widespacing=false)
+	{
+		if (is_string($flds)) {
+			$padding = '     ';
+			$txt = $flds.$padding;
+			$flds = array();
+			$flds0 = Lens_ParseArgs($txt,',');
+			$hasparam = false;
+			foreach($flds0 as $f0) {
+				$f1 = array();
+				foreach($f0 as $token) {
+					switch (strtoupper($token)) {
+					case 'CONSTRAINT':
+					case 'DEFAULT': 
+						$hasparam = $token;
+						break;
+					default:
+						if ($hasparam) $f1[$hasparam] = $token;
+						else $f1[] = $token;
+						$hasparam = false;
+						break;
+					}
+				}
+				$flds[] = $f1;
+				
+			}
+		}
+		$this->autoIncrement = false;
+		$lines = array();
+		$pkey = array();
+		foreach($flds as $fld) {
+			$fld = _array_change_key_case($fld);
+		
+			$fname = false;
+			$fdefault = false;
+			$fautoinc = false;
+			$ftype = false;
+			$fsize = false;
+			$fprec = false;
+			$fprimary = false;
+			$fnoquote = false;
+			$fdefts = false;
+			$fdefdate = false;
+			$fconstraint = false;
+			$fnotnull = false;
+			$funsigned = false;
+			
+			//-----------------
+			// Parse attributes
+			foreach($fld as $attr => $v) {
+				if ($attr == 2 && is_numeric($v)) $attr = 'SIZE';
+				else if (is_numeric($attr) && $attr > 1 && !is_numeric($v)) $attr = strtoupper($v);
+				
+				switch($attr) {
+				case '0':
+				case 'NAME': 	$fname = $v; break;
+				case '1':
+				case 'TYPE': 	$ty = $v; $ftype = $this->ActualType(strtoupper($v)); break;
+				
+				case 'SIZE': 	
+								$dotat = strpos($v,'.'); if ($dotat === false) $dotat = strpos($v,',');
+								if ($dotat === false) $fsize = $v;
+								else {
+									$fsize = substr($v,0,$dotat);
+									$fprec = substr($v,$dotat+1);
+								}
+								break;
+				case 'UNSIGNED': $funsigned = true; break;
+				case 'AUTOINCREMENT':
+				case 'AUTO':	$fautoinc = true; $fnotnull = true; break;
+				case 'KEY':
+				case 'PRIMARY':	$fprimary = $v; $fnotnull = true; break;
+				case 'DEF':
+				case 'DEFAULT': $fdefault = $v; break;
+				case 'NOTNULL': $fnotnull = $v; break;
+				case 'NOQUOTE': $fnoquote = $v; break;
+				case 'DEFDATE': $fdefdate = $v; break;
+				case 'DEFTIMESTAMP': $fdefts = $v; break;
+				case 'CONSTRAINT': $fconstraint = $v; break;
+				} //switch
+			} // foreach $fld
+			
+			//--------------------
+			// VALIDATE FIELD INFO
+			if (!strlen($fname)) {
+				if ($this->debug) ADOConnection::outp("Undefined NAME");
+				return false;
+			}
+			
+			$fid = strtoupper(preg_replace('/^`(.+)`$/', '$1', $fname));
+			$fname = $this->NameQuote($fname);
+			
+			if (!strlen($ftype)) {
+				if ($this->debug) ADOConnection::outp("Undefined TYPE for field '$fname'");
+				return false;
+			} else {
+				$ftype = strtoupper($ftype);
+			}
+			
+			$ftype = $this->_GetSize($ftype, $ty, $fsize, $fprec);
+			
+			if ($ty == 'X' || $ty == 'X2' || $ty == 'B') $fnotnull = false; // some blob types do not accept nulls
+			
+			if ($fprimary) $pkey[] = $fname;
+			
+			// some databases do not allow blobs to have defaults
+			if ($ty == 'X') $fdefault = false;
+			
+			//--------------------
+			// CONSTRUCT FIELD SQL
+			if ($fdefts) {
+				if (substr($this->connection->databaseType,0,5) == 'mysql') {
+					$ftype = 'TIMESTAMP';
+				} else {
+					$fdefault = $this->connection->sysTimeStamp;
+				}
+			} else if ($fdefdate) {
+				if (substr($this->connection->databaseType,0,5) == 'mysql') {
+					$ftype = 'TIMESTAMP';
+				} else {
+					$fdefault = $this->connection->sysDate;
+				}
+			} else if ($fdefault !== false && !$fnoquote)
+				if ($ty == 'C' or $ty == 'X' or 
+					( substr($fdefault,0,1) != "'" && !is_numeric($fdefault)))
+					if (strlen($fdefault) != 1 && substr($fdefault,0,1) == ' ' && substr($fdefault,strlen($fdefault)-1) == ' ') 
+						$fdefault = trim($fdefault);
+					else if (strtolower($fdefault) != 'null')
+						$fdefault = $this->connection->qstr($fdefault);
+			$suffix = $this->_CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned);
+			
+			if ($widespacing) $fname = str_pad($fname,24);
+			$lines[$fid] = $fname.' '.$ftype.$suffix;
+			
+			if ($fautoinc) $this->autoIncrement = true;
+		} // foreach $flds
+		
+		return array($lines,$pkey);
+	}
+	/*
+		 GENERATE THE SIZE PART OF THE DATATYPE
+			$ftype is the actual type
+			$ty is the type defined originally in the DDL
+	*/
+	function _GetSize($ftype, $ty, $fsize, $fprec)
+	{
+		if (strlen($fsize) && $ty != 'X' && $ty != 'B' && strpos($ftype,'(') === false) {
+			$ftype .= "(".$fsize;
+			if (strlen($fprec)) $ftype .= ",".$fprec;
+			$ftype .= ')';
+		}
+		return $ftype;
+	}
+	
+	
+	// return string must begin with space
+	function _CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint)
+	{	
+		$suffix = '';
+		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
+		if ($fnotnull) $suffix .= ' NOT NULL';
+		if ($fconstraint) $suffix .= ' '.$fconstraint;
+		return $suffix;
+	}
+	
+	function _IndexSQL($idxname, $tabname, $flds, $idxoptions)
+	{
+		$sql = array();
+		
+		if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) {
+			$sql[] = sprintf ($this->dropIndex, $idxname);
+			if ( isset($idxoptions['DROP']) )
+				return $sql;
+		}
+		
+		if ( empty ($flds) ) {
+			return $sql;
+		}
+		
+		$unique = isset($idxoptions['UNIQUE']) ? ' UNIQUE' : '';
+	
+		$s = 'CREATE' . $unique . ' INDEX ' . $idxname . ' ON ' . $tabname . ' ';
+		
+		if ( isset($idxoptions[$this->upperName]) )
+			$s .= $idxoptions[$this->upperName];
+		
+		if ( is_array($flds) )
+			$flds = implode(', ',$flds);
+		$s .= '(' . $flds . ')';
+		$sql[] = $s;
+		
+		return $sql;
+	}
+	
+	function _DropAutoIncrement($tabname)
+	{
+		return false;
+	}
+	
+	function _TableSQL($tabname,$lines,$pkey,$tableoptions)
+	{
+		$sql = array();
+		
+		if (isset($tableoptions['REPLACE']) || isset ($tableoptions['DROP'])) {
+			$sql[] = sprintf($this->dropTable,$tabname);
+			if ($this->autoIncrement) {
+				$sInc = $this->_DropAutoIncrement($tabname);
+				if ($sInc) $sql[] = $sInc;
+			}
+			if ( isset ($tableoptions['DROP']) ) {
+				return $sql;
+			}
+		}
+		$s = "CREATE TABLE $tabname (\n";
+		$s .= implode(",\n", $lines);
+		if (sizeof($pkey)>0) {
+			$s .= ",\n                 PRIMARY KEY (";
+			$s .= implode(", ",$pkey).")";
+		}
+		if (isset($tableoptions['CONSTRAINTS'])) 
+			$s .= "\n".$tableoptions['CONSTRAINTS'];
+		
+		if (isset($tableoptions[$this->upperName.'_CONSTRAINTS'])) 
+			$s .= "\n".$tableoptions[$this->upperName.'_CONSTRAINTS'];
+		
+		$s .= "\n)";
+		if (isset($tableoptions[$this->upperName])) $s .= $tableoptions[$this->upperName];
+		$sql[] = $s;
+		
+		return $sql;
+	}
+	
+	/*
+		GENERATE TRIGGERS IF NEEDED
+		used when table has auto-incrementing field that is emulated using triggers
+	*/
+	function _Triggers($tabname,$taboptions)
+	{
+		return array();
+	}
+	
+	/*
+		Sanitize options, so that array elements with no keys are promoted to keys
+	*/
+	function _Options($opts)
+	{
+		if (!is_array($opts)) return array();
+		$newopts = array();
+		foreach($opts as $k => $v) {
+			if (is_numeric($k)) $newopts[strtoupper($v)] = $v;
+			else $newopts[strtoupper($k)] = $v;
+		}
+		return $newopts;
+	}
+	
+	/*
+	"Florian Buzin [ easywe ]" <florian.buzin#easywe.de>
+	
+	This function changes/adds new fields to your table. You don't
+	have to know if the col is new or not. It will check on its own.
+	*/
+	function ChangeTableSQL($tablename, $flds, $tableoptions = false, $forceAlter = false) // GS Fix for constraint impl - forceAlter
+	{
+	global $ADODB_FETCH_MODE;
+	
+		$save = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
+		if ($this->connection->fetchMode !== false) $savem = $this->connection->SetFetchMode(false);
+		
+		// check table exists
+		$save_handler = $this->connection->raiseErrorFn;
+		$this->connection->raiseErrorFn = '';
+		$cols = $this->MetaColumns($tablename);
+		$this->connection->raiseErrorFn = $save_handler;
+		
+		if (isset($savem)) $this->connection->SetFetchMode($savem);
+		$ADODB_FETCH_MODE = $save;
+		
+		if ( $forceAlter == false && empty($cols)) { // GS Fix for constraint impl
+			return $this->CreateTableSQL($tablename, $flds, $tableoptions);
+		}
+		
+		if (is_array($flds)) {
+		// Cycle through the update fields, comparing
+		// existing fields to fields to update.
+		// if the Metatype and size is exactly the
+		// same, ignore - by Mark Newham
+			$holdflds = array();
+			foreach($flds as $k=>$v) {
+				if ( isset($cols[$k]) && is_object($cols[$k]) ) {
+					// If already not allowing nulls, then don't change
+					$obj = $cols[$k];
+					if (isset($obj->not_null) && $obj->not_null)
+						$v = str_replace('NOT NULL','',$v);
+
+					$c = $cols[$k];
+					$ml = $c->max_length;
+					$mt = $this->MetaType($c->type,$ml);
+					if ($ml == -1) $ml = '';
+					if ($mt == 'X') $ml = $v['SIZE'];
+					if (($mt != $v['TYPE']) ||  $ml != $v['SIZE']) {
+						$holdflds[$k] = $v;
+					}
+				} else {
+					$holdflds[$k] = $v;
+				}		
+			}
+			$flds = $holdflds;
+		}
+	
+
+		// already exists, alter table instead
+		list($lines,$pkey) = $this->_GenFields($flds);
+		$alter = 'ALTER TABLE ' . $this->TableName($tablename);
+		$sql = array();
+
+		foreach ( $lines as $id => $v ) {
+			if ( isset($cols[$id]) && is_object($cols[$id]) ) {
+			
+				$flds = Lens_ParseArgs($v,',');
+				
+				//  We are trying to change the size of the field, if not allowed, simply ignore the request.
+				if ($flds && in_array(strtoupper(substr($flds[0][1],0,4)),$this->invalidResizeTypes4)) continue;	 
+	 		
+				$sql[] = $alter . $this->alterCol . ' ' . $v;
+			} else {
+				$sql[] = $alter . $this->addCol . ' ' . $v;
+			}
+		}
+
+		// GS Fix for constraint impl -- start
+		if($forceAlter == false) return $sql;
+		$sqlarray = array();
+
+		$alter .= implode(",\n", $sql);
+		if (sizeof($pkey)>0) {
+			$alter .= ",\n PRIMARY KEY (";
+			$alter .= implode(", ",$pkey).")";
+		}
+		
+		if (isset($tableoptions['CONSTRAINTS'])) 
+			$alter .= "\n".$tableoptions['CONSTRAINTS'];
+
+		if (isset($tableoptions[$this->upperName.'_CONSTRAINTS'])) 
+			$alter .= "\n".$tableoptions[$this->upperName.'_CONSTRAINTS'];
+
+		if (isset($tableoptions[$this->upperName])) $alter .= $tableoptions[$this->upperName];
+			$sqlarray[] = $alter;
+
+		
+		$taboptions = $this->_Options($tableoptions);
+		$tsql = $this->_Triggers($this->TableName($tablename),$taboptions);
+		foreach($tsql as $s) $sqlarray[] = $s;
+
+		// GS Fix for constraint impl -- end
+		
+		return $sqlarray;
+
+		
+	}
+} // class
+?>



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 29 10:29:39 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 29 Jun 2006 17:29:39 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7686 -
	/vtigercrm/trunk/adodb/adodb-xmlschema.inc.php
Message-ID: <20060629172939.D0A4F83FE8E@vtiger.fosslabs.com>

Author: richie
Date: Thu Jun 29 11:29:21 2006
New Revision: 7686

Log:
fixed the innodb and foreign key issue by srini

Modified:
    vtigercrm/trunk/adodb/adodb-xmlschema.inc.php

Modified: vtigercrm/trunk/adodb/adodb-xmlschema.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/adodb-xmlschema.inc.php (original)
+++ vtigercrm/trunk/adodb/adodb-xmlschema.inc.php Thu Jun 29 11:29:21 2006
@@ -1,2221 +1,2227 @@
-<?php
-// Copyright (c) 2004 ars Cognita Inc., all rights reserved
-/* ******************************************************************************
-    Released under both BSD license and Lesser GPL library license. 
- 	Whenever there is any discrepancy between the two licenses, 
- 	the BSD license will take precedence. 
-*******************************************************************************/
-/**
- * xmlschema is a class that allows the user to quickly and easily
- * build a database on any ADOdb-supported platform using a simple
- * XML schema.
- *
- * Last Editor: $Author: jlim $
- * @author Richard Tango-Lowy & Dan Cech
- * @version $Revision: 1.12 $
- *
- * @package axmls
- * @tutorial getting_started.pkg
- */
- 
-function _file_get_contents($file) 
-{
- 	if (function_exists('file_get_contents')) return file_get_contents($file);
-	
-	$f = fopen($file,'r');
-	if (!$f) return '';
-	$t = '';
-	
-	while ($s = fread($f,100000)) $t .= $s;
-	fclose($f);
-	return $t;
-}
-
-
-/**
-* Debug on or off
-*/
-if( !defined( 'XMLS_DEBUG' ) ) {
-	define( 'XMLS_DEBUG', FALSE );
-}
-
-/**
-* Default prefix key
-*/
-if( !defined( 'XMLS_PREFIX' ) ) {
-	define( 'XMLS_PREFIX', '%%P' );
-}
-
-/**
-* Maximum length allowed for object prefix
-*/
-if( !defined( 'XMLS_PREFIX_MAXLEN' ) ) {
-	define( 'XMLS_PREFIX_MAXLEN', 10 );
-}
-
-/**
-* Execute SQL inline as it is generated
-*/
-if( !defined( 'XMLS_EXECUTE_INLINE' ) ) {
-	define( 'XMLS_EXECUTE_INLINE', FALSE );
-}
-
-/**
-* Continue SQL Execution if an error occurs?
-*/
-if( !defined( 'XMLS_CONTINUE_ON_ERROR' ) ) {
-	define( 'XMLS_CONTINUE_ON_ERROR', FALSE );
-}
-
-/**
-* Current Schema Version
-*/
-if( !defined( 'XMLS_SCHEMA_VERSION' ) ) {
-	define( 'XMLS_SCHEMA_VERSION', '0.2' );
-}
-
-/**
-* Default Schema Version.  Used for Schemas without an explicit version set.
-*/
-if( !defined( 'XMLS_DEFAULT_SCHEMA_VERSION' ) ) {
-	define( 'XMLS_DEFAULT_SCHEMA_VERSION', '0.1' );
-}
-
-/**
-* Default Schema Version.  Used for Schemas without an explicit version set.
-*/
-if( !defined( 'XMLS_DEFAULT_UPGRADE_METHOD' ) ) {
-	define( 'XMLS_DEFAULT_UPGRADE_METHOD', 'ALTER' );
-}
-
-/**
-* Include the main ADODB library
-*/
-if( !defined( '_ADODB_LAYER' ) ) {
-	require( 'adodb.inc.php' );
-	require( 'adodb-datadict.inc.php' );
-}
-
-/**
-* Abstract DB Object. This class provides basic methods for database objects, such
-* as tables and indexes.
-*
-* @package axmls
-* @access private
-*/
-class dbObject {
-	
-	/**
-	* var object Parent
-	*/
-	var $parent;
-	
-	/**
-	* var string current element
-	*/
-	var $currentElement;
-	
-	/**
-	* NOP
-	*/
-	function dbObject( &$parent, $attributes = NULL ) {
-		$this->parent =& $parent;
-	}
-	
-	/**
-	* XML Callback to process start elements
-	*
-	* @access private
-	*/
-	function _tag_open( &$parser, $tag, $attributes ) {
-		
-	}
-	
-	/**
-	* XML Callback to process CDATA elements
-	*
-	* @access private
-	*/
-	function _tag_cdata( &$parser, $cdata ) {
-		
-	}
-	
-	/**
-	* XML Callback to process end elements
-	*
-	* @access private
-	*/
-	function _tag_close( &$parser, $tag ) {
-		
-	}
-	
-	function create() {
-		return array();
-	}
-	
-	/**
-	* Destroys the object
-	*/
-	function destroy() {
-		unset( $this );
-	}
-	
-	/**
-	* Checks whether the specified RDBMS is supported by the current
-	* database object or its ranking ancestor.
-	*
-	* @param string $platform RDBMS platform name (from ADODB platform list).
-	* @return boolean TRUE if RDBMS is supported; otherwise returns FALSE.
-	*/
-	function supportedPlatform( $platform = NULL ) {
-		return is_object( $this->parent ) ? $this->parent->supportedPlatform( $platform ) : TRUE;
-	}
-	
-	/**
-	* Returns the prefix set by the ranking ancestor of the database object.
-	*
-	* @param string $name Prefix string.
-	* @return string Prefix.
-	*/
-	function prefix( $name = '' ) {
-		return is_object( $this->parent ) ? $this->parent->prefix( $name ) : $name;
-	}
-	
-	/**
-	* Extracts a field ID from the specified field.
-	*
-	* @param string $field Field.
-	* @return string Field ID.
-	*/
-	function FieldID( $field ) {
-		return strtoupper( preg_replace( '/^`(.+)`$/', '$1', $field ) );
-	}
-}
-
-/**
-* Creates a table object in ADOdb's datadict format
-*
-* This class stores information about a database table. As charactaristics
-* of the table are loaded from the external source, methods and properties
-* of this class are used to build up the table description in ADOdb's
-* datadict format.
-*
-* @package axmls
-* @access private
-*/
-class dbTable extends dbObject {
-	
-	/**
-	* @var string Table name
-	*/
-	var $name;
-	
-	/**
-	* @var array Field specifier: Meta-information about each field
-	*/
-	var $fields = array();
-	
-	/**
-	* @var array List of table indexes.
-	*/
-	var $indexes = array();
-	
-	/**
-	* @var array Table options: Table-level options
-	*/
-	var $opts = array();
-	
-	/**
-	* @var string Field index: Keeps track of which field is currently being processed
-	*/
-	var $current_field;
-	
-	/**
-	* @var boolean Mark table for destruction
-	* @access private
-	*/
-	var $drop_table;
-	
-	/**
-	* @var boolean Mark field for destruction (not yet implemented)
-	* @access private
-	*/
-	var $drop_field = array();
-	
-	/**
-	* Iniitializes a new table object.
-	*
-	* @param string $prefix DB Object prefix
-	* @param array $attributes Array of table attributes.
-	*/
-	function dbTable( &$parent, $attributes = NULL ) {
-		$this->parent =& $parent;
-		$this->name = $this->prefix($attributes['NAME']);
-	}
-	
-	/**
-	* XML Callback to process start elements. Elements currently 
-	* processed are: INDEX, DROP, FIELD, KEY, NOTNULL, AUTOINCREMENT & DEFAULT. 
-	*
-	* @access private
-	*/
-	function _tag_open( &$parser, $tag, $attributes ) {
-		$this->currentElement = strtoupper( $tag );
-		
-		switch( $this->currentElement ) {
-			case 'INDEX':
-				if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) ) {
-					xml_set_object( $parser, $this->addIndex( $attributes ) );
-				}
-				break;
-			case 'DATA':
-				if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) ) {
-					xml_set_object( $parser, $this->addData( $attributes ) );
-				}
-				break;
-			case 'DROP':
-				$this->drop();
-				break;
-			case 'FIELD':
-				// Add a field
-				$fieldName = $attributes['NAME'];
-				$fieldType = $attributes['TYPE'];
-				$fieldSize = isset( $attributes['SIZE'] ) ? $attributes['SIZE'] : NULL;
-				$fieldOpts = isset( $attributes['OPTS'] ) ? $attributes['OPTS'] : NULL;
-				
-				$this->addField( $fieldName, $fieldType, $fieldSize, $fieldOpts );
-				break;
-			case 'KEY':
-			case 'NOTNULL':
-			case 'AUTOINCREMENT':
-				// Add a field option
-				$this->addFieldOpt( $this->current_field, $this->currentElement );
-				break;
-			case 'DEFAULT':
-				// Add a field option to the table object
-				
-				// Work around ADOdb datadict issue that misinterprets empty strings.
-				if( $attributes['VALUE'] == '' ) {
-					$attributes['VALUE'] = " '' ";
-				}
-				
-				$this->addFieldOpt( $this->current_field, $this->currentElement, $attributes['VALUE'] );
-				break;
-			case 'DEFDATE':
-			case 'DEFTIMESTAMP':
-				// Add a field option to the table object
-				$this->addFieldOpt( $this->current_field, $this->currentElement );
-				break;
-			default:
-				// print_r( array( $tag, $attributes ) );
-		}
-	}
-	
-	/**
-	* XML Callback to process CDATA elements
-	*
-	* @access private
-	*/
-	function _tag_cdata( &$parser, $cdata ) {
-		switch( $this->currentElement ) {
-			// Table constraint
-			case 'CONSTRAINT':
-				if( isset( $this->current_field ) ) {
-					$this->addFieldOpt( $this->current_field, $this->currentElement, $cdata );
-				} else {
-					$this->addTableOpt( $cdata );
-				}
-				break;
-			// Table option
-			case 'OPT':
-				$this->addTableOpt( $cdata );
-				break;
-			default:
-				
-		}
-	}
-	
-	/**
-	* XML Callback to process end elements
-	*
-	* @access private
-	*/
-	function _tag_close( &$parser, $tag ) {
-		$this->currentElement = '';
-		
-		switch( strtoupper( $tag ) ) {
-			case 'TABLE':
-				$this->parent->addSQL( $this->create( $this->parent ) );
-				xml_set_object( $parser, $this->parent );
-				$this->destroy();
-				break;
-			case 'FIELD':
-				unset($this->current_field);
-				break;
-
-		}
-	}
-	
-	/**
-	* Adds an index to a table object
-	*
-	* @param array $attributes Index attributes
-	* @return object dbIndex object
-	*/
-	function &addIndex( $attributes ) {
-		$name = strtoupper( $attributes['NAME'] );
-		$this->indexes[$name] =& new dbIndex( $this, $attributes );
-		return $this->indexes[$name];
-	}
-	
-	/**
-	* Adds data to a table object
-	*
-	* @param array $attributes Data attributes
-	* @return object dbData object
-	*/
-	function &addData( $attributes ) {
-		if( !isset( $this->data ) ) {
-			$this->data =& new dbData( $this, $attributes );
-		}
-		return $this->data;
-	}
-	
-	/**
-	* Adds a field to a table object
-	*
-	* $name is the name of the table to which the field should be added. 
-	* $type is an ADODB datadict field type. The following field types
-	* are supported as of ADODB 3.40:
-	* 	- C:  varchar
-	*	- X:  CLOB (character large object) or largest varchar size
-	*	   if CLOB is not supported
-	*	- C2: Multibyte varchar
-	*	- X2: Multibyte CLOB
-	*	- B:  BLOB (binary large object)
-	*	- D:  Date (some databases do not support this, and we return a datetime type)
-	*	- T:  Datetime or Timestamp
-	*	- L:  Integer field suitable for storing booleans (0 or 1)
-	*	- I:  Integer (mapped to I4)
-	*	- I1: 1-byte integer
-	*	- I2: 2-byte integer
-	*	- I4: 4-byte integer
-	*	- I8: 8-byte integer
-	*	- F:  Floating point number
-	*	- N:  Numeric or decimal number
-	*
-	* @param string $name Name of the table to which the field will be added.
-	* @param string $type	ADODB datadict field type.
-	* @param string $size	Field size
-	* @param array $opts	Field options array
-	* @return array Field specifier array
-	*/
-	function addField( $name, $type, $size = NULL, $opts = NULL ) {
-		$field_id = $this->FieldID( $name );
-		
-		// Set the field index so we know where we are
-		$this->current_field = $field_id;
-		
-		// Set the field name (required)
-		$this->fields[$field_id]['NAME'] = $name;
-		
-		// Set the field type (required)
-		$this->fields[$field_id]['TYPE'] = $type;
-		
-		// Set the field size (optional)
-		if( isset( $size ) ) {
-			$this->fields[$field_id]['SIZE'] = $size;
-		}
-		
-		// Set the field options
-		if( isset( $opts ) ) {
-			$this->fields[$field_id]['OPTS'][] = $opts;
-		}
-	}
-	
-	/**
-	* Adds a field option to the current field specifier
-	*
-	* This method adds a field option allowed by the ADOdb datadict 
-	* and appends it to the given field.
-	*
-	* @param string $field	Field name
-	* @param string $opt ADOdb field option
-	* @param mixed $value Field option value
-	* @return array Field specifier array
-	*/
-	function addFieldOpt( $field, $opt, $value = NULL ) {
-		if( !isset( $value ) ) {
-			$this->fields[$this->FieldID( $field )]['OPTS'][] = $opt;
-		// Add the option and value
-		} else {
-			$this->fields[$this->FieldID( $field )]['OPTS'][] = array( $opt => $value );
-		}
-	}
-	
-	/**
-	* Adds an option to the table
-	*
-	* This method takes a comma-separated list of table-level options
-	* and appends them to the table object.
-	*
-	* @param string $opt Table option
-	* @return array Options
-	*/
-	function addTableOpt( $opt ) {
-		$this->opts[] = $opt;
-		
-		return $this->opts;
-	}
-	
-	/**
-	* Generates the SQL that will create the table in the database
-	*
-	* @param object $xmls adoSchema object
-	* @return array Array containing table creation SQL
-	*/
-	function create( &$xmls ) {
-		$sql = array();
-		
-		// drop any existing indexes
-		if( is_array( $legacy_indexes = $xmls->dict->MetaIndexes( $this->name ) ) ) {
-			foreach( $legacy_indexes as $index => $index_details ) {
-				$sql[] = $xmls->dict->DropIndexSQL( $index, $this->name );
-			}
-		}
-		
-		// remove fields to be dropped from table object
-		foreach( $this->drop_field as $field ) {
-			unset( $this->fields[$field] );
-		}
-		
-		// if table exists
-		if( is_array( $legacy_fields = $xmls->dict->MetaColumns( $this->name ) ) ) {
-			// drop table
-			if( $this->drop_table ) {
-				$sql[] = $xmls->dict->DropTableSQL( $this->name );
-				
-				return $sql;
-			}
-			
-			// drop any existing fields not in schema
-			foreach( $legacy_fields as $field_id => $field ) {
-				if( !isset( $this->fields[$field_id] ) ) {
-					$sql[] = $xmls->dict->DropColumnSQL( $this->name, '`'.$field->name.'`' );
-				}
-			}
-		// if table doesn't exist
-		} else {
-			if( $this->drop_table ) {
-				return $sql;
-			}
-			
-			$legacy_fields = array();
-		}
-		
-		// Loop through the field specifier array, building the associative array for the field options
-		$fldarray = array();
-		
-		foreach( $this->fields as $field_id => $finfo ) {
-			// Set an empty size if it isn't supplied
-			if( !isset( $finfo['SIZE'] ) ) {
-				$finfo['SIZE'] = '';
-			}
-			
-			// Initialize the field array with the type and size
-			$fldarray[$field_id] = array(
-				'NAME' => $finfo['NAME'],
-				'TYPE' => $finfo['TYPE'],
-				'SIZE' => $finfo['SIZE']
-			);
-			
-			// Loop through the options array and add the field options. 
-			if( isset( $finfo['OPTS'] ) ) {
-				foreach( $finfo['OPTS'] as $opt ) {
-					// Option has an argument.
-					if( is_array( $opt ) ) {
-						$key = key( $opt );
-						$value = $opt[key( $opt )];
-						@$fldarray[$field_id][$key] .= $value;
-					// Option doesn't have arguments
-					} else {
-						$fldarray[$field_id][$opt] = $opt;
-					}
-				}
-			}
-		}
-		
-		if( empty( $legacy_fields ) ) {
-			// Create the new table
-			$sql[] = $xmls->dict->CreateTableSQL( $this->name, $fldarray, $this->opts );
-			logMsg( end( $sql ), 'Generated CreateTableSQL' );
-		} else {
-			// Upgrade an existing table
-			logMsg( "Upgrading {$this->name} using '{$xmls->upgrade}'" );
-			switch( $xmls->upgrade ) {
-				// Use ChangeTableSQL
-				case 'ALTER':
-					logMsg( 'Generated ChangeTableSQL (ALTERing table)' );
-					$sql[] = $xmls->dict->ChangeTableSQL( $this->name, $fldarray, $this->opts );
-					break;
-				case 'REPLACE':
-					logMsg( 'Doing upgrade REPLACE (testing)' );
-					$sql[] = $xmls->dict->DropTableSQL( $this->name );
-					$sql[] = $xmls->dict->CreateTableSQL( $this->name, $fldarray, $this->opts );
-					break;
-				// ignore table
-				default:
-					return array();
-			}
-		}
-		
-		foreach( $this->indexes as $index ) {
-			$sql[] = $index->create( $xmls );
-		}
-		
-		if( isset( $this->data ) ) {
-			$sql[] = $this->data->create( $xmls );
-		}
-		
-		return $sql;
-	}
-	
-	/**
-	* Marks a field or table for destruction
-	*/
-	function drop() {
-		if( isset( $this->current_field ) ) {
-			// Drop the current field
-			logMsg( "Dropping field '{$this->current_field}' from table '{$this->name}'" );
-			// $this->drop_field[$this->current_field] = $xmls->dict->DropColumnSQL( $this->name, $this->current_field );
-			$this->drop_field[$this->current_field] = $this->current_field;
-		} else {
-			// Drop the current table
-			logMsg( "Dropping table '{$this->name}'" );
-			// $this->drop_table = $xmls->dict->DropTableSQL( $this->name );
-			$this->drop_table = TRUE;
-		}
-	}
-}
-
-/**
-* Creates an index object in ADOdb's datadict format
-*
-* This class stores information about a database index. As charactaristics
-* of the index are loaded from the external source, methods and properties
-* of this class are used to build up the index description in ADOdb's
-* datadict format.
-*
-* @package axmls
-* @access private
-*/
-class dbIndex extends dbObject {
-	
-	/**
-	* @var string	Index name
-	*/
-	var $name;
-	
-	/**
-	* @var array	Index options: Index-level options
-	*/
-	var $opts = array();
-	
-	/**
-	* @var array	Indexed fields: Table columns included in this index
-	*/
-	var $columns = array();
-	
-	/**
-	* @var boolean Mark index for destruction
-	* @access private
-	*/
-	var $drop = FALSE;
-	
-	/**
-	* Initializes the new dbIndex object.
-	*
-	* @param object $parent Parent object
-	* @param array $attributes Attributes
-	*
-	* @internal
-	*/
-	function dbIndex( &$parent, $attributes = NULL ) {
-		$this->parent =& $parent;
-		
-		$this->name = $this->prefix ($attributes['NAME']);
-	}
-	
-	/**
-	* XML Callback to process start elements
-	*
-	* Processes XML opening tags. 
-	* Elements currently processed are: DROP, CLUSTERED, BITMAP, UNIQUE, FULLTEXT & HASH. 
-	*
-	* @access private
-	*/
-	function _tag_open( &$parser, $tag, $attributes ) {
-		$this->currentElement = strtoupper( $tag );
-		
-		switch( $this->currentElement ) {
-			case 'DROP':
-				$this->drop();
-				break;
-			case 'CLUSTERED':
-			case 'BITMAP':
-			case 'UNIQUE':
-			case 'FULLTEXT':
-			case 'HASH':
-				// Add index Option
-				$this->addIndexOpt( $this->currentElement );
-				break;
-			default:
-				// print_r( array( $tag, $attributes ) );
-		}
-	}
-	
-	/**
-	* XML Callback to process CDATA elements
-	*
-	* Processes XML cdata.
-	*
-	* @access private
-	*/
-	function _tag_cdata( &$parser, $cdata ) {
-		switch( $this->currentElement ) {
-			// Index field name
-			case 'COL':
-				$this->addField( $cdata );
-				break;
-			default:
-				
-		}
-	}
-	
-	/**
-	* XML Callback to process end elements
-	*
-	* @access private
-	*/
-	function _tag_close( &$parser, $tag ) {
-		$this->currentElement = '';
-		
-		switch( strtoupper( $tag ) ) {
-			case 'INDEX':
-				xml_set_object( $parser, $this->parent );
-				break;
-		}
-	}
-	
-	/**
-	* Adds a field to the index
-	*
-	* @param string $name Field name
-	* @return string Field list
-	*/
-	function addField( $name ) {
-		$this->columns[$this->FieldID( $name )] = $name;
-		
-		// Return the field list
-		return $this->columns;
-	}
-	
-	/**
-	* Adds options to the index
-	*
-	* @param string $opt Comma-separated list of index options.
-	* @return string Option list
-	*/
-	function addIndexOpt( $opt ) {
-		$this->opts[] = $opt;
-		
-		// Return the options list
-		return $this->opts;
-	}
-	
-	/**
-	* Generates the SQL that will create the index in the database
-	*
-	* @param object $xmls adoSchema object
-	* @return array Array containing index creation SQL
-	*/
-	function create( &$xmls ) {
-		if( $this->drop ) {
-			return NULL;
-		}
-		
-		// eliminate any columns that aren't in the table
-		foreach( $this->columns as $id => $col ) {
-			if( !isset( $this->parent->fields[$id] ) ) {
-				unset( $this->columns[$id] );
-			}
-		}
-		
-		return $xmls->dict->CreateIndexSQL( $this->name, $this->parent->name, $this->columns, $this->opts );
-	}
-	
-	/**
-	* Marks an index for destruction
-	*/
-	function drop() {
-		$this->drop = TRUE;
-	}
-}
-
-/**
-* Creates a data object in ADOdb's datadict format
-*
-* This class stores information about table data.
-*
-* @package axmls
-* @access private
-*/
-class dbData extends dbObject {
-	
-	var $data = array();
-	
-	var $row;
-	
-	/**
-	* Initializes the new dbIndex object.
-	*
-	* @param object $parent Parent object
-	* @param array $attributes Attributes
-	*
-	* @internal
-	*/
-	function dbData( &$parent, $attributes = NULL ) {
-		$this->parent =& $parent;
-	}
-	
-	/**
-	* XML Callback to process start elements
-	*
-	* Processes XML opening tags. 
-	* Elements currently processed are: DROP, CLUSTERED, BITMAP, UNIQUE, FULLTEXT & HASH. 
-	*
-	* @access private
-	*/
-	function _tag_open( &$parser, $tag, $attributes ) {
-		$this->currentElement = strtoupper( $tag );
-		
-		switch( $this->currentElement ) {
-			case 'ROW':
-				$this->row = count( $this->data );
-				$this->data[$this->row] = array();
-				break;
-			case 'F':
-				$this->addField($attributes);
-			default:
-				// print_r( array( $tag, $attributes ) );
-		}
-	}
-	
-	/**
-	* XML Callback to process CDATA elements
-	*
-	* Processes XML cdata.
-	*
-	* @access private
-	*/
-	function _tag_cdata( &$parser, $cdata ) {
-		switch( $this->currentElement ) {
-			// Index field name
-			case 'F':
-				$this->addData( $cdata );
-				break;
-			default:
-				
-		}
-	}
-	
-	/**
-	* XML Callback to process end elements
-	*
-	* @access private
-	*/
-	function _tag_close( &$parser, $tag ) {
-		$this->currentElement = '';
-		
-		switch( strtoupper( $tag ) ) {
-			case 'DATA':
-				xml_set_object( $parser, $this->parent );
-				break;
-		}
-	}
-	
-	/**
-	* Adds a field to the index
-	*
-	* @param string $name Field name
-	* @return string Field list
-	*/
-	function addField( $attributes ) {
-		if( isset( $attributes['NAME'] ) ) {
-			$name = $attributes['NAME'];
-		} else {
-			$name = count($this->data[$this->row]);
-		}
-		
-		// Set the field index so we know where we are
-		$this->current_field = $this->FieldID( $name );
-	}
-	
-	/**
-	* Adds options to the index
-	*
-	* @param string $opt Comma-separated list of index options.
-	* @return string Option list
-	*/
-	function addData( $cdata ) {
-		if( !isset( $this->data[$this->row] ) ) {
-			$this->data[$this->row] = array();
-		}
-		
-		if( !isset( $this->data[$this->row][$this->current_field] ) ) {
-			$this->data[$this->row][$this->current_field] = '';
-		}
-		
-		$this->data[$this->row][$this->current_field] .= $cdata;
-	}
-	
-	/**
-	* Generates the SQL that will create the index in the database
-	*
-	* @param object $xmls adoSchema object
-	* @return array Array containing index creation SQL
-	*/
-	function create( &$xmls ) {
-		$table = $xmls->dict->TableName($this->parent->name);
-		$table_field_count = count($this->parent->fields);
-		$sql = array();
-		
-		// eliminate any columns that aren't in the table
-		foreach( $this->data as $row ) {
-			$table_fields = $this->parent->fields;
-			$fields = array();
-			
-			foreach( $row as $field_id => $field_data ) {
-				if( !array_key_exists( $field_id, $table_fields ) ) {
-					if( is_numeric( $field_id ) ) {
-						$field_id = reset( array_keys( $table_fields ) );
-					} else {
-						continue;
-					}
-				}
-				
-				$name = $table_fields[$field_id]['NAME'];
-				
-				switch( $table_fields[$field_id]['TYPE'] ) {
-					case 'C':
-					case 'C2':
-					case 'X':
-					case 'X2':
-						$fields[$name] = $xmls->db->qstr( $field_data );
-						break;
-					case 'I':
-					case 'I1':
-					case 'I2':
-					case 'I4':
-					case 'I8':
-						$fields[$name] = intval($field_data);
-						break;
-					default:
-						$fields[$name] = $field_data;
-				}
-				
-				unset($table_fields[$field_id]);
-			}
-			
-			// check that at least 1 column is specified
-			if( empty( $fields ) ) {
-				continue;
-			}
-			
-			// check that no required columns are missing
-			if( count( $fields ) < $table_field_count ) {
-				foreach( $table_fields as $field ) {
-					if (isset( $field['OPTS'] ))
-						if( ( in_array( 'NOTNULL', $field['OPTS'] ) || in_array( 'KEY', $field['OPTS'] ) ) && !in_array( 'AUTOINCREMENT', $field['OPTS'] ) ) {
-							continue(2);
-						}
-				}
-			}
-			
-			$sql[] = 'INSERT INTO '. $table .' ('. implode( ',', array_keys( $fields ) ) .') VALUES ('. implode( ',', $fields ) .')';
-		}
-		
-		return $sql;
-	}
-}
-
-/**
-* Creates the SQL to execute a list of provided SQL queries
-*
-* @package axmls
-* @access private
-*/
-class dbQuerySet extends dbObject {
-	
-	/**
-	* @var array	List of SQL queries
-	*/
-	var $queries = array();
-	
-	/**
-	* @var string	String used to build of a query line by line
-	*/
-	var $query;
-	
-	/**
-	* @var string	Query prefix key
-	*/
-	var $prefixKey = '';
-	
-	/**
-	* @var boolean	Auto prefix enable (TRUE)
-	*/
-	var $prefixMethod = 'AUTO';
-	
-	/**
-	* Initializes the query set.
-	*
-	* @param object $parent Parent object
-	* @param array $attributes Attributes
-	*/
-	function dbQuerySet( &$parent, $attributes = NULL ) {
-		$this->parent =& $parent;
-			
-		// Overrides the manual prefix key
-		if( isset( $attributes['KEY'] ) ) {
-			$this->prefixKey = $attributes['KEY'];
-		}
-		
-		$prefixMethod = isset( $attributes['PREFIXMETHOD'] ) ? strtoupper( trim( $attributes['PREFIXMETHOD'] ) ) : '';
-		
-		// Enables or disables automatic prefix prepending
-		switch( $prefixMethod ) {
-			case 'AUTO':
-				$this->prefixMethod = 'AUTO';
-				break;
-			case 'MANUAL':
-				$this->prefixMethod = 'MANUAL';
-				break;
-			case 'NONE':
-				$this->prefixMethod = 'NONE';
-				break;
-		}
-	}
-	
-	/**
-	* XML Callback to process start elements. Elements currently 
-	* processed are: QUERY. 
-	*
-	* @access private
-	*/
-	function _tag_open( &$parser, $tag, $attributes ) {
-		$this->currentElement = strtoupper( $tag );
-		
-		switch( $this->currentElement ) {
-			case 'QUERY':
-				// Create a new query in a SQL queryset.
-				// Ignore this query set if a platform is specified and it's different than the 
-				// current connection platform.
-				if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) ) {
-					$this->newQuery();
-				} else {
-					$this->discardQuery();
-				}
-				break;
-			default:
-				// print_r( array( $tag, $attributes ) );
-		}
-	}
-	
-	/**
-	* XML Callback to process CDATA elements
-	*/
-	function _tag_cdata( &$parser, $cdata ) {
-		switch( $this->currentElement ) {
-			// Line of queryset SQL data
-			case 'QUERY':
-				$this->buildQuery( $cdata );
-				break;
-			default:
-				
-		}
-	}
-	
-	/**
-	* XML Callback to process end elements
-	*
-	* @access private
-	*/
-	function _tag_close( &$parser, $tag ) {
-		$this->currentElement = '';
-		
-		switch( strtoupper( $tag ) ) {
-			case 'QUERY':
-				// Add the finished query to the open query set.
-				$this->addQuery();
-				break;
-			case 'SQL':
-				$this->parent->addSQL( $this->create( $this->parent ) );
-				xml_set_object( $parser, $this->parent );
-				$this->destroy();
-				break;
-			default:
-				
-		}
-	}
-	
-	/**
-	* Re-initializes the query.
-	*
-	* @return boolean TRUE
-	*/
-	function newQuery() {
-		$this->query = '';
-		
-		return TRUE;
-	}
-	
-	/**
-	* Discards the existing query.
-	*
-	* @return boolean TRUE
-	*/
-	function discardQuery() {
-		unset( $this->query );
-		
-		return TRUE;
-	}
-	
-	/** 
-	* Appends a line to a query that is being built line by line
-	*
-	* @param string $data Line of SQL data or NULL to initialize a new query
-	* @return string SQL query string.
-	*/
-	function buildQuery( $sql = NULL ) {
-		if( !isset( $this->query ) OR empty( $sql ) ) {
-			return FALSE;
-		}
-		
-		$this->query .= $sql;
-		
-		return $this->query;
-	}
-	
-	/**
-	* Adds a completed query to the query list
-	*
-	* @return string	SQL of added query
-	*/
-	function addQuery() {
-		if( !isset( $this->query ) ) {
-			return FALSE;
-		}
-		
-		$this->queries[] = $return = trim($this->query);
-		
-		unset( $this->query );
-		
-		return $return;
-	}
-	
-	/**
-	* Creates and returns the current query set
-	*
-	* @param object $xmls adoSchema object
-	* @return array Query set
-	*/
-	function create( &$xmls ) {
-		foreach( $this->queries as $id => $query ) {
-			switch( $this->prefixMethod ) {
-				case 'AUTO':
-					// Enable auto prefix replacement
-					
-					// Process object prefix.
-					// Evaluate SQL statements to prepend prefix to objects
-					$query = $this->prefixQuery( '/^\s*((?is)INSERT\s+(INTO\s+)?)((\w+\s*,?\s*)+)(\s.*$)/', $query, $xmls->objectPrefix );
-					$query = $this->prefixQuery( '/^\s*((?is)UPDATE\s+(FROM\s+)?)((\w+\s*,?\s*)+)(\s.*$)/', $query, $xmls->objectPrefix );
-					$query = $this->prefixQuery( '/^\s*((?is)DELETE\s+(FROM\s+)?)((\w+\s*,?\s*)+)(\s.*$)/', $query, $xmls->objectPrefix );
-					
-					// SELECT statements aren't working yet
-					#$data = preg_replace( '/(?ias)(^\s*SELECT\s+.*\s+FROM)\s+(\W\s*,?\s*)+((?i)\s+WHERE.*$)/', "\1 $prefix\2 \3", $data );
-					
-				case 'MANUAL':
-					// If prefixKey is set and has a value then we use it to override the default constant XMLS_PREFIX.
-					// If prefixKey is not set, we use the default constant XMLS_PREFIX
-					if( isset( $this->prefixKey ) AND( $this->prefixKey !== '' ) ) {
-						// Enable prefix override
-						$query = str_replace( $this->prefixKey, $xmls->objectPrefix, $query );
-					} else {
-						// Use default replacement
-						$query = str_replace( XMLS_PREFIX , $xmls->objectPrefix, $query );
-					}
-			}
-			
-			$this->queries[$id] = trim( $query );
-		}
-		
-		// Return the query set array
-		return $this->queries;
-	}
-	
-	/**
-	* Rebuilds the query with the prefix attached to any objects
-	*
-	* @param string $regex Regex used to add prefix
-	* @param string $query SQL query string
-	* @param string $prefix Prefix to be appended to tables, indices, etc.
-	* @return string Prefixed SQL query string.
-	*/
-	function prefixQuery( $regex, $query, $prefix = NULL ) {
-		if( !isset( $prefix ) ) {
-			return $query;
-		}
-		
-		if( preg_match( $regex, $query, $match ) ) {
-			$preamble = $match[1];
-			$postamble = $match[5];
-			$objectList = explode( ',', $match[3] );
-			// $prefix = $prefix . '_';
-			
-			$prefixedList = '';
-			
-			foreach( $objectList as $object ) {
-				if( $prefixedList !== '' ) {
-					$prefixedList .= ', ';
-				}
-				
-				$prefixedList .= $prefix . trim( $object );
-			}
-			
-			$query = $preamble . ' ' . $prefixedList . ' ' . $postamble;
-		}
-		
-		return $query;
-	}
-}
-
-/**
-* Loads and parses an XML file, creating an array of "ready-to-run" SQL statements
-* 
-* This class is used to load and parse the XML file, to create an array of SQL statements
-* that can be used to build a database, and to build the database using the SQL array.
-*
-* @tutorial getting_started.pkg
-*
-* @author Richard Tango-Lowy & Dan Cech
-* @version $Revision: 1.12 $
-*
-* @package axmls
-*/
-class adoSchema {
-	
-	/**
-	* @var array	Array containing SQL queries to generate all objects
-	* @access private
-	*/
-	var $sqlArray;
-	
-	/**
-	* @var object	ADOdb connection object
-	* @access private
-	*/
-	var $db;
-	
-	/**
-	* @var object	ADOdb Data Dictionary
-	* @access private
-	*/
-	var $dict;
-	
-	/**
-	* @var string Current XML element
-	* @access private
-	*/
-	var $currentElement = '';
-	
-	/**
-	* @var string If set (to 'ALTER' or 'REPLACE'), upgrade an existing database
-	* @access private
-	*/
-	var $upgrade = '';
-	
-	/**
-	* @var string Optional object prefix
-	* @access private
-	*/
-	var $objectPrefix = '';
-	
-	/**
-	* @var long	Original Magic Quotes Runtime value
-	* @access private
-	*/
-	var $mgq;
-	
-	/**
-	* @var long	System debug
-	* @access private
-	*/
-	var $debug;
-	
-	/**
-	* @var string Regular expression to find schema version
-	* @access private
-	*/
-	var $versionRegex = '/<schema.*?( version="([^"]*)")?.*?>/';
-	
-	/**
-	* @var string Current schema version
-	* @access private
-	*/
-	var $schemaVersion;
-	
-	/**
-	* @var int	Success of last Schema execution
-	*/
-	var $success;
-	
-	/**
-	* @var bool	Execute SQL inline as it is generated
-	*/
-	var $executeInline;
-	
-	/**
-	* @var bool	Continue SQL execution if errors occur
-	*/
-	var $continueOnError;
-	
-	/**
-	* Creates an adoSchema object
-	*
-	* Creating an adoSchema object is the first step in processing an XML schema.
-	* The only parameter is an ADOdb database connection object, which must already
-	* have been created.
-	*
-	* @param object $db ADOdb database connection object.
-	*/
-	function adoSchema( &$db ) {
-		// Initialize the environment
-		$this->mgq = get_magic_quotes_runtime();
-		set_magic_quotes_runtime(0);
-		
-		$this->db =& $db;
-		$this->debug = $this->db->debug;
-		$this->dict = NewDataDictionary( $this->db );
-		$this->sqlArray = array();
-		$this->schemaVersion = XMLS_SCHEMA_VERSION;
-		$this->executeInline( XMLS_EXECUTE_INLINE );
-		$this->continueOnError( XMLS_CONTINUE_ON_ERROR );
-		$this->setUpgradeMethod();
-	}
-	
-	/**
-	* Sets the method to be used for upgrading an existing database
-	*
-	* Use this method to specify how existing database objects should be upgraded.
-	* The method option can be set to ALTER, REPLACE, BEST, or NONE. ALTER attempts to
-	* alter each database object directly, REPLACE attempts to rebuild each object
-	* from scratch, BEST attempts to determine the best upgrade method for each
-	* object, and NONE disables upgrading.
-	*
-	* This method is not yet used by AXMLS, but exists for backward compatibility.
-	* The ALTER method is automatically assumed when the adoSchema object is
-	* instantiated; other upgrade methods are not currently supported.
-	*
-	* @param string $method Upgrade method (ALTER|REPLACE|BEST|NONE)
-	* @returns string Upgrade method used
-	*/
-	function SetUpgradeMethod( $method = '' ) {
-		if( !is_string( $method ) ) {
-			return FALSE;
-		}
-		
-		$method = strtoupper( $method );
-		
-		// Handle the upgrade methods
-		switch( $method ) {
-			case 'ALTER':
-				$this->upgrade = $method;
-				break;
-			case 'REPLACE':
-				$this->upgrade = $method;
-				break;
-			case 'BEST':
-				$this->upgrade = 'ALTER';
-				break;
-			case 'NONE':
-				$this->upgrade = 'NONE';
-				break;
-			default:
-				// Use default if no legitimate method is passed.
-				$this->upgrade = XMLS_DEFAULT_UPGRADE_METHOD;
-		}
-		
-		return $this->upgrade;
-	}
-	
-	/**
-	* Enables/disables inline SQL execution.
-	*
-	* Call this method to enable or disable inline execution of the schema. If the mode is set to TRUE (inline execution),
-	* AXMLS applies the SQL to the database immediately as each schema entity is parsed. If the mode
-	* is set to FALSE (post execution), AXMLS parses the entire schema and you will need to call adoSchema::ExecuteSchema()
-	* to apply the schema to the database.
-	*
-	* @param bool $mode execute
-	* @return bool current execution mode
-	*
-	* @see ParseSchema(), ExecuteSchema()
-	*/
-	function ExecuteInline( $mode = NULL ) {
-		if( is_bool( $mode ) ) {
-			$this->executeInline = $mode;
-		}
-		
-		return $this->executeInline;
-	}
-	
-	/**
-	* Enables/disables SQL continue on error.
-	*
-	* Call this method to enable or disable continuation of SQL execution if an error occurs.
-	* If the mode is set to TRUE (continue), AXMLS will continue to apply SQL to the database, even if an error occurs.
-	* If the mode is set to FALSE (halt), AXMLS will halt execution of generated sql if an error occurs, though parsing
-	* of the schema will continue.
-	*
-	* @param bool $mode execute
-	* @return bool current continueOnError mode
-	*
-	* @see addSQL(), ExecuteSchema()
-	*/
-	function ContinueOnError( $mode = NULL ) {
-		if( is_bool( $mode ) ) {
-			$this->continueOnError = $mode;
-		}
-		
-		return $this->continueOnError;
-	}
-	
-	/**
-	* Loads an XML schema from a file and converts it to SQL.
-	*
-	* Call this method to load the specified schema (see the DTD for the proper format) from
-	* the filesystem and generate the SQL necessary to create the database described. 
-	* @see ParseSchemaString()
-	*
-	* @param string $file Name of XML schema file.
-	* @param bool $returnSchema Return schema rather than parsing.
-	* @return array Array of SQL queries, ready to execute
-	*/
-	function ParseSchema( $filename, $returnSchema = FALSE ) {
-		return $this->ParseSchemaString( $this->ConvertSchemaFile( $filename ), $returnSchema );
-	}
-	
-	/**
-	* Loads an XML schema from a file and converts it to SQL.
-	*
-	* Call this method to load the specified schema from a file (see the DTD for the proper format) 
-	* and generate the SQL necessary to create the database described by the schema.
-	*
-	* @param string $file Name of XML schema file.
-	* @param bool $returnSchema Return schema rather than parsing.
-	* @return array Array of SQL queries, ready to execute.
-	*
-	* @deprecated Replaced by adoSchema::ParseSchema() and adoSchema::ParseSchemaString()
-	* @see ParseSchema(), ParseSchemaString()
-	*/
-	function ParseSchemaFile( $filename, $returnSchema = FALSE ) {
-		// Open the file
-		if( !($fp = fopen( $filename, 'r' )) ) {
-			// die( 'Unable to open file' );
-			return FALSE;
-		}
-		
-		// do version detection here
-		if( $this->SchemaFileVersion( $filename ) != $this->schemaVersion ) {
-			return FALSE;
-		}
-		
-		if ( $returnSchema )
-		{
-			$xmlstring = '';
-			while( $data = fread( $fp, 100000 ) ) {
-				$xmlstring .= $data;
-			}
-			return $xmlstring;
-		}
-		
-		$this->success = 2;
-		
-		$xmlParser = $this->create_parser();
-		
-		// Process the file
-		while( $data = fread( $fp, 4096 ) ) {
-			if( !xml_parse( $xmlParser, $data, feof( $fp ) ) ) {
-				die( sprintf(
-					"XML error: %s at line %d",
-					xml_error_string( xml_get_error_code( $xmlParser) ),
-					xml_get_current_line_number( $xmlParser)
-				) );
-			}
-		}
-		
-		xml_parser_free( $xmlParser );
-		
-		return $this->sqlArray;
-	}
-	
-	/**
-	* Converts an XML schema string to SQL.
-	*
-	* Call this method to parse a string containing an XML schema (see the DTD for the proper format)
-	* and generate the SQL necessary to create the database described by the schema. 
-	* @see ParseSchema()
-	*
-	* @param string $xmlstring XML schema string.
-	* @param bool $returnSchema Return schema rather than parsing.
-	* @return array Array of SQL queries, ready to execute.
-	*/
-	function ParseSchemaString( $xmlstring, $returnSchema = FALSE ) {
-		if( !is_string( $xmlstring ) OR empty( $xmlstring ) ) {
-			return FALSE;
-		}
-		
-		// do version detection here
-		if( $this->SchemaStringVersion( $xmlstring ) != $this->schemaVersion ) {
-			return FALSE;
-		}
-		
-		if ( $returnSchema )
-		{
-			return $xmlstring;
-		}
-		
-		$this->success = 2;
-		
-		$xmlParser = $this->create_parser();
-		
-		if( !xml_parse( $xmlParser, $xmlstring, TRUE ) ) {
-			die( sprintf(
-				"XML error: %s at line %d",
-				xml_error_string( xml_get_error_code( $xmlParser) ),
-				xml_get_current_line_number( $xmlParser)
-			) );
-		}
-		
-		xml_parser_free( $xmlParser );
-		
-		return $this->sqlArray;
-	}
-	
-	/**
-	* Loads an XML schema from a file and converts it to uninstallation SQL.
-	*
-	* Call this method to load the specified schema (see the DTD for the proper format) from
-	* the filesystem and generate the SQL necessary to remove the database described.
-	* @see RemoveSchemaString()
-	*
-	* @param string $file Name of XML schema file.
-	* @param bool $returnSchema Return schema rather than parsing.
-	* @return array Array of SQL queries, ready to execute
-	*/
-	function RemoveSchema( $filename, $returnSchema = FALSE ) {
-		return $this->RemoveSchemaString( $this->ConvertSchemaFile( $filename ), $returnSchema );
-	}
-	
-	/**
-	* Converts an XML schema string to uninstallation SQL.
-	*
-	* Call this method to parse a string containing an XML schema (see the DTD for the proper format)
-	* and generate the SQL necessary to uninstall the database described by the schema. 
-	* @see RemoveSchema()
-	*
-	* @param string $schema XML schema string.
-	* @param bool $returnSchema Return schema rather than parsing.
-	* @return array Array of SQL queries, ready to execute.
-	*/
-	function RemoveSchemaString( $schema, $returnSchema = FALSE ) {
-		
-		// grab current version
-		if( !( $version = $this->SchemaStringVersion( $schema ) ) ) {
-			return FALSE;
-		}
-		
-		return $this->ParseSchemaString( $this->TransformSchema( $schema, 'remove-' . $version), $returnSchema );
-	}
-	
-	/**
-	* Applies the current XML schema to the database (post execution).
-	*
-	* Call this method to apply the current schema (generally created by calling 
-	* ParseSchema() or ParseSchemaString() ) to the database (creating the tables, indexes, 
-	* and executing other SQL specified in the schema) after parsing.
-	* @see ParseSchema(), ParseSchemaString(), ExecuteInline()
-	*
-	* @param array $sqlArray Array of SQL statements that will be applied rather than
-	*		the current schema.
-	* @param boolean $continueOnErr Continue to apply the schema even if an error occurs.
-	* @returns integer 0 if failure, 1 if errors, 2 if successful.
-	*/
-	function ExecuteSchema( $sqlArray = NULL, $continueOnErr =  NULL ) {
-		if( !is_bool( $continueOnErr ) ) {
-			$continueOnErr = $this->ContinueOnError();
-		}
-		
-		if( !isset( $sqlArray ) ) {
-			$sqlArray = $this->sqlArray;
-		}
-		
-		if( !is_array( $sqlArray ) ) {
-			$this->success = 0;
-		} else {
-			$this->success = $this->dict->ExecuteSQLArray( $sqlArray, $continueOnErr );
-		}
-		
-		return $this->success;
-	}
-	
-	/**
-	* Returns the current SQL array. 
-	*
-	* Call this method to fetch the array of SQL queries resulting from 
-	* ParseSchema() or ParseSchemaString(). 
-	*
-	* @param string $format Format: HTML, TEXT, or NONE (PHP array)
-	* @return array Array of SQL statements or FALSE if an error occurs
-	*/
-	function PrintSQL( $format = 'NONE' ) {
-		$sqlArray = null;
-		return $this->getSQL( $format, $sqlArray );
-	}
-	
-	/**
-	* Saves the current SQL array to the local filesystem as a list of SQL queries.
-	*
-	* Call this method to save the array of SQL queries (generally resulting from a
-	* parsed XML schema) to the filesystem.
-	*
-	* @param string $filename Path and name where the file should be saved.
-	* @return boolean TRUE if save is successful, else FALSE. 
-	*/
-	function SaveSQL( $filename = './schema.sql' ) {
-		
-		if( !isset( $sqlArray ) ) {
-			$sqlArray = $this->sqlArray;
-		}
-		if( !isset( $sqlArray ) ) {
-			return FALSE;
-		}
-		
-		$fp = fopen( $filename, "w" );
-		
-		foreach( $sqlArray as $key => $query ) {
-			fwrite( $fp, $query . ";\n" );
-		}
-		fclose( $fp );
-	}
-	
-	/**
-	* Create an xml parser
-	*
-	* @return object PHP XML parser object
-	*
-	* @access private
-	*/
-	function &create_parser() {
-		// Create the parser
-		$xmlParser = xml_parser_create();
-		xml_set_object( $xmlParser, $this );
-		
-		// Initialize the XML callback functions
-		xml_set_element_handler( $xmlParser, '_tag_open', '_tag_close' );
-		xml_set_character_data_handler( $xmlParser, '_tag_cdata' );
-		
-		return $xmlParser;
-	}
-	
-	/**
-	* XML Callback to process start elements
-	*
-	* @access private
-	*/
-	function _tag_open( &$parser, $tag, $attributes ) {
-		switch( strtoupper( $tag ) ) {
-			case 'TABLE':
-				$this->obj = new dbTable( $this, $attributes );
-				xml_set_object( $parser, $this->obj );
-				break;
-			case 'SQL':
-				if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) ) {
-					$this->obj = new dbQuerySet( $this, $attributes );
-					xml_set_object( $parser, $this->obj );
-				}
-				break;
-			default:
-				// print_r( array( $tag, $attributes ) );
-		}
-		
-	}
-	
-	/**
-	* XML Callback to process CDATA elements
-	*
-	* @access private
-	*/
-	function _tag_cdata( &$parser, $cdata ) {
-	}
-	
-	/**
-	* XML Callback to process end elements
-	*
-	* @access private
-	* @internal
-	*/
-	function _tag_close( &$parser, $tag ) {
-		
-	}
-	
-	/**
-	* Converts an XML schema string to the specified DTD version.
-	*
-	* Call this method to convert a string containing an XML schema to a different AXMLS
-	* DTD version. For instance, to convert a schema created for an pre-1.0 version for 
-	* AXMLS (DTD version 0.1) to a newer version of the DTD (e.g. 0.2). If no DTD version 
-	* parameter is specified, the schema will be converted to the current DTD version. 
-	* If the newFile parameter is provided, the converted schema will be written to the specified
-	* file.
-	* @see ConvertSchemaFile()
-	*
-	* @param string $schema String containing XML schema that will be converted.
-	* @param string $newVersion DTD version to convert to.
-	* @param string $newFile File name of (converted) output file.
-	* @return string Converted XML schema or FALSE if an error occurs.
-	*/
-	function ConvertSchemaString( $schema, $newVersion = NULL, $newFile = NULL ) {
-		
-		// grab current version
-		if( !( $version = $this->SchemaStringVersion( $schema ) ) ) {
-			return FALSE;
-		}
-		
-		if( !isset ($newVersion) ) {
-			$newVersion = $this->schemaVersion;
-		}
-		
-		if( $version == $newVersion ) {
-			$result = $schema;
-		} else {
-			$result = $this->TransformSchema( $schema, 'convert-' . $version . '-' . $newVersion);
-		}
-		
-		if( is_string( $result ) AND is_string( $newFile ) AND ( $fp = fopen( $newFile, 'w' ) ) ) {
-			fwrite( $fp, $result );
-			fclose( $fp );
-		}
-		
-		return $result;
-	}
-	
-	// compat for pre-4.3 - jlim
-	function _file_get_contents($path)
-	{
-		if (function_exists('file_get_contents')) return file_get_contents($path);
-		return join('',file($path));
-	}
-	
-	/**
-	* Converts an XML schema file to the specified DTD version.
-	*
-	* Call this method to convert the specified XML schema file to a different AXMLS
-	* DTD version. For instance, to convert a schema created for an pre-1.0 version for 
-	* AXMLS (DTD version 0.1) to a newer version of the DTD (e.g. 0.2). If no DTD version 
-	* parameter is specified, the schema will be converted to the current DTD version. 
-	* If the newFile parameter is provided, the converted schema will be written to the specified
-	* file.
-	* @see ConvertSchemaString()
-	*
-	* @param string $filename Name of XML schema file that will be converted.
-	* @param string $newVersion DTD version to convert to.
-	* @param string $newFile File name of (converted) output file.
-	* @return string Converted XML schema or FALSE if an error occurs.
-	*/
-	function ConvertSchemaFile( $filename, $newVersion = NULL, $newFile = NULL ) {
-		
-		// grab current version
-		if( !( $version = $this->SchemaFileVersion( $filename ) ) ) {
-			return FALSE;
-		}
-		
-		if( !isset ($newVersion) ) {
-			$newVersion = $this->schemaVersion;
-		}
-		
-		if( $version == $newVersion ) {
-			$result = _file_get_contents( $filename );
-			
-			// remove unicode BOM if present
-			if( substr( $result, 0, 3 ) == sprintf( '%c%c%c', 239, 187, 191 ) ) {
-				$result = substr( $result, 3 );
-			}
-		} else {
-			$result = $this->TransformSchema( $filename, 'convert-' . $version . '-' . $newVersion, 'file' );
-		}
-		
-		if( is_string( $result ) AND is_string( $newFile ) AND ( $fp = fopen( $newFile, 'w' ) ) ) {
-			fwrite( $fp, $result );
-			fclose( $fp );
-		}
-		
-		return $result;
-	}
-	
-	function TransformSchema( $schema, $xsl, $schematype='string' )
-	{
-		// Fail if XSLT extension is not available
-		if( ! function_exists( 'xslt_create' ) ) {
-			return FALSE;
-		}
-		
-		$xsl_file = dirname( __FILE__ ) . '/xsl/' . $xsl . '.xsl';
-		
-		// look for xsl
-		if( !is_readable( $xsl_file ) ) {
-			return FALSE;
-		}
-		
-		switch( $schematype )
-		{
-			case 'file':
-				if( !is_readable( $schema ) ) {
-					return FALSE;
-				}
-				
-				$schema = _file_get_contents( $schema );
-				break;
-			case 'string':
-			default:
-				if( !is_string( $schema ) ) {
-					return FALSE;
-				}
-		}
-		
-		$arguments = array (
-			'/_xml' => $schema,
-			'/_xsl' => _file_get_contents( $xsl_file )
-		);
-		
-		// create an XSLT processor
-		$xh = xslt_create ();
-		
-		// set error handler
-		xslt_set_error_handler ($xh, array (&$this, 'xslt_error_handler'));
-		
-		// process the schema
-		$result = xslt_process ($xh, 'arg:/_xml', 'arg:/_xsl', NULL, $arguments); 
-		
-		xslt_free ($xh);
-		
-		return $result;
-	}
-	
-	/**
-	* Processes XSLT transformation errors
-	*
-	* @param object $parser XML parser object
-	* @param integer $errno Error number
-	* @param integer $level Error level
-	* @param array $fields Error information fields
-	*
-	* @access private
-	*/
-	function xslt_error_handler( $parser, $errno, $level, $fields ) {
-		if( is_array( $fields ) ) {
-			$msg = array(
-				'Message Type' => ucfirst( $fields['msgtype'] ),
-				'Message Code' => $fields['code'],
-				'Message' => $fields['msg'],
-				'Error Number' => $errno,
-				'Level' => $level
-			);
-			
-			switch( $fields['URI'] ) {
-				case 'arg:/_xml':
-					$msg['Input'] = 'XML';
-					break;
-				case 'arg:/_xsl':
-					$msg['Input'] = 'XSL';
-					break;
-				default:
-					$msg['Input'] = $fields['URI'];
-			}
-			
-			$msg['Line'] = $fields['line'];
-		} else {
-			$msg = array(
-				'Message Type' => 'Error',
-				'Error Number' => $errno,
-				'Level' => $level,
-				'Fields' => var_export( $fields, TRUE )
-			);
-		}
-		
-		$error_details = $msg['Message Type'] . ' in XSLT Transformation' . "\n"
-					   . '<table>' . "\n";
-		
-		foreach( $msg as $label => $details ) {
-			$error_details .= '<tr><td><b>' . $label . ': </b></td><td>' . htmlentities( $details ) . '</td></tr>' . "\n";
-		}
-		
-		$error_details .= '</table>';
-		
-		trigger_error( $error_details, E_USER_ERROR );
-	}
-	
-	/**
-	* Returns the AXMLS Schema Version of the requested XML schema file.
-	*
-	* Call this method to obtain the AXMLS DTD version of the requested XML schema file.
-	* @see SchemaStringVersion()
-	*
-	* @param string $filename AXMLS schema file
-	* @return string Schema version number or FALSE on error
-	*/
-	function SchemaFileVersion( $filename ) {
-		// Open the file
-		if( !($fp = fopen( $filename, 'r' )) ) {
-			// die( 'Unable to open file' );
-			return FALSE;
-		}
-		
-		// Process the file
-		while( $data = fread( $fp, 4096 ) ) {
-			if( preg_match( $this->versionRegex, $data, $matches ) ) {
-				return !empty( $matches[2] ) ? $matches[2] : XMLS_DEFAULT_SCHEMA_VERSION;
-			}
-		}
-		
-		return FALSE;
-	}
-	
-	/**
-	* Returns the AXMLS Schema Version of the provided XML schema string.
-	*
-	* Call this method to obtain the AXMLS DTD version of the provided XML schema string.
-	* @see SchemaFileVersion()
-	*
-	* @param string $xmlstring XML schema string
-	* @return string Schema version number or FALSE on error
-	*/
-	function SchemaStringVersion( $xmlstring ) {
-		if( !is_string( $xmlstring ) OR empty( $xmlstring ) ) {
-			return FALSE;
-		}
-		
-		if( preg_match( $this->versionRegex, $xmlstring, $matches ) ) {
-			return !empty( $matches[2] ) ? $matches[2] : XMLS_DEFAULT_SCHEMA_VERSION;
-		}
-		
-		return FALSE;
-	}
-	
-	/**
-	* Extracts an XML schema from an existing database.
-	*
-	* Call this method to create an XML schema string from an existing database.
-	* If the data parameter is set to TRUE, AXMLS will include the data from the database
-	* in the schema. 
-	*
-	* @param boolean $data Include data in schema dump
-	* @return string Generated XML schema
-	*/
-	function ExtractSchema( $data = FALSE ) {
-		$old_mode = $this->db->SetFetchMode( ADODB_FETCH_NUM );
-		
-		$schema = '<?xml version="1.0"?>' . "\n"
-				. '<schema version="' . $this->schemaVersion . '">' . "\n";
-		
-		if( is_array( $tables = $this->db->MetaTables( 'TABLES' ) ) ) {
-			foreach( $tables as $table ) {
-				$schema .= '	<table name="' . $table . '">' . "\n";
-				
-				// grab details from database
-				$rs = $this->db->Execute( 'SELECT * FROM ' . $table . ' WHERE 1=1' );
-				$fields = $this->db->MetaColumns( $table );
-				$indexes = $this->db->MetaIndexes( $table );
-				
-				if( is_array( $fields ) ) {
-					foreach( $fields as $details ) {
-						$extra = '';
-						$content = array();
-						
-						if( $details->max_length > 0 ) {
-							$extra .= ' size="' . $details->max_length . '"';
-						}
-						
-						if( $details->primary_key ) {
-							$content[] = '<KEY/>';
-						} elseif( $details->not_null ) {
-							$content[] = '<NOTNULL/>';
-						}
-						
-						if( $details->has_default ) {
-							$content[] = '<DEFAULT value="' . $details->default_value . '"/>';
-						}
-						
-						if( $details->auto_increment ) {
-							$content[] = '<AUTOINCREMENT/>';
-						}
-						
-						// this stops the creation of 'R' columns,
-						// AUTOINCREMENT is used to create auto columns
-						$details->primary_key = 0;
-						$type = $rs->MetaType( $details );
-						
-						$schema .= '		<field name="' . $details->name . '" type="' . $type . '"' . $extra . '>';
-						
-						if( !empty( $content ) ) {
-							$schema .= "\n			" . implode( "\n			", $content ) . "\n		";
-						}
-						
-						$schema .= '</field>' . "\n";
-					}
-				}
-				
-				if( is_array( $indexes ) ) {
-					foreach( $indexes as $index => $details ) {
-						$schema .= '		<index name="' . $index . '">' . "\n";
-						
-						if( $details['unique'] ) {
-							$schema .= '			<UNIQUE/>' . "\n";
-						}
-						
-						foreach( $details['columns'] as $column ) {
-							$schema .= '			<col>' . $column . '</col>' . "\n";
-						}
-						
-						$schema .= '		</index>' . "\n";
-					}
-				}
-				
-				if( $data ) {
-					$rs = $this->db->Execute( 'SELECT * FROM ' . $table );
-					
-					if( is_object( $rs ) ) {
-						$schema .= '		<data>' . "\n";
-						
-						while( $row = $rs->FetchRow() ) {
-							foreach( $row as $key => $val ) {
-								$row[$key] = htmlentities($val);
-							}
-							
-							$schema .= '			<row><f>' . implode( '</f><f>', $row ) . '</f></row>' . "\n";
-						}
-						
-						$schema .= '		</data>' . "\n";
-					}
-				}
-				
-				$schema .= '	</table>' . "\n";
-			}
-		}
-		
-		$this->db->SetFetchMode( $old_mode );
-		
-		$schema .= '</schema>';
-		return $schema;
-	}
-	
-	/**
-	* Sets a prefix for database objects
-	*
-	* Call this method to set a standard prefix that will be prepended to all database tables 
-	* and indices when the schema is parsed. Calling setPrefix with no arguments clears the prefix.
-	*
-	* @param string $prefix Prefix that will be prepended.
-	* @param boolean $underscore If TRUE, automatically append an underscore character to the prefix.
-	* @return boolean TRUE if successful, else FALSE
-	*/
-	function SetPrefix( $prefix = '', $underscore = TRUE ) {
-		switch( TRUE ) {
-			// clear prefix
-			case empty( $prefix ):
-				logMsg( 'Cleared prefix' );
-				$this->objectPrefix = '';
-				return TRUE;
-			// prefix too long
-			case strlen( $prefix ) > XMLS_PREFIX_MAXLEN:
-			// prefix contains invalid characters
-			case !preg_match( '/^[a-z][a-z0-9_]+$/i', $prefix ):
-				logMsg( 'Invalid prefix: ' . $prefix );
-				return FALSE;
-		}
-		
-		if( $underscore AND substr( $prefix, -1 ) != '_' ) {
-			$prefix .= '_';
-		}
-		
-		// prefix valid
-		logMsg( 'Set prefix: ' . $prefix );
-		$this->objectPrefix = $prefix;
-		return TRUE;
-	}
-	
-	/**
-	* Returns an object name with the current prefix prepended.
-	*
-	* @param string	$name Name
-	* @return string	Prefixed name
-	*
-	* @access private
-	*/
-	function prefix( $name = '' ) {
-		// if prefix is set
-		if( !empty( $this->objectPrefix ) ) {
-			// Prepend the object prefix to the table name
-			// prepend after quote if used
-			return preg_replace( '/^(`?)(.+)$/', '$1' . $this->objectPrefix . '$2', $name );
-		}
-		
-		// No prefix set. Use name provided.
-		return $name;
-	}
-	
-	/**
-	* Checks if element references a specific platform
-	*
-	* @param string $platform Requested platform
-	* @returns boolean TRUE if platform check succeeds
-	*
-	* @access private
-	*/
-	function supportedPlatform( $platform = NULL ) {
-		$regex = '/^(\w*\|)*' . $this->db->databaseType . '(\|\w*)*$/';
-		
-		if( !isset( $platform ) OR preg_match( $regex, $platform ) ) {
-			logMsg( "Platform $platform is supported" );
-			return TRUE;
-		} else {
-			logMsg( "Platform $platform is NOT supported" );
-			return FALSE;
-		}
-	}
-	
-	/**
-	* Clears the array of generated SQL.
-	*
-	* @access private
-	*/
-	function clearSQL() {
-		$this->sqlArray = array();
-	}
-	
-	/**
-	* Adds SQL into the SQL array.
-	*
-	* @param mixed $sql SQL to Add
-	* @return boolean TRUE if successful, else FALSE.
-	*
-	* @access private
-	*/	
-	function addSQL( $sql = NULL ) {
-		if( is_array( $sql ) ) {
-			foreach( $sql as $line ) {
-				$this->addSQL( $line );
-			}
-			
-			return TRUE;
-		}
-		
-		if( is_string( $sql ) ) {
-			$this->sqlArray[] = $sql;
-			
-			// if executeInline is enabled, and either no errors have occurred or continueOnError is enabled, execute SQL.
-			if( $this->ExecuteInline() && ( $this->success == 2 || $this->ContinueOnError() ) ) {
-				$saved = $this->db->debug;
-				$this->db->debug = $this->debug;
-				$ok = $this->db->Execute( $sql );
-				$this->db->debug = $saved;
-				
-				if( !$ok ) {
-					if( $this->debug ) {
-						ADOConnection::outp( $this->db->ErrorMsg() );
-					}
-					
-					$this->success = 1;
-				}
-			}
-			
-			return TRUE;
-		}
-		
-		return FALSE;
-	}
-	
-	/**
-	* Gets the SQL array in the specified format.
-	*
-	* @param string $format Format
-	* @return mixed SQL
-	*	
-	* @access private
-	*/
-	function getSQL( $format = NULL, $sqlArray = NULL ) {
-		if( !is_array( $sqlArray ) ) {
-			$sqlArray = $this->sqlArray;
-		}
-		
-		if( !is_array( $sqlArray ) ) {
-			return FALSE;
-		}
-		
-		switch( strtolower( $format ) ) {
-			case 'string':
-			case 'text':
-				return !empty( $sqlArray ) ? implode( ";\n\n", $sqlArray ) . ';' : '';
-			case'html':
-				return !empty( $sqlArray ) ? nl2br( htmlentities( implode( ";\n\n", $sqlArray ) . ';' ) ) : '';
-		}
-		
-		return $this->sqlArray;
-	}
-	
-	/**
-	* Destroys an adoSchema object.
-	*
-	* Call this method to clean up after an adoSchema object that is no longer in use.
-	* @deprecated adoSchema now cleans up automatically.
-	*/
-	function Destroy() {
-		set_magic_quotes_runtime( $this->mgq );
-		unset( $this );
-	}
-}
-
-/**
-* Message logging function
-*
-* @access private
-*/
-function logMsg( $msg, $title = NULL, $force = FALSE ) {
-	if( XMLS_DEBUG or $force ) {
-		echo '<pre>';
-		
-		if( isset( $title ) ) {
-			echo '<h3>' . htmlentities( $title ) . '</h3>';
-		}
-		
-		if( is_object( $this ) ) {
-			echo '[' . get_class( $this ) . '] ';
-		}
-		
-		print_r( $msg );
-		
-		echo '</pre>';
-	}
-}
-?>
+<?php
+// Copyright (c) 2004 ars Cognita Inc., all rights reserved
+/* ******************************************************************************
+    Released under both BSD license and Lesser GPL library license. 
+ 	Whenever there is any discrepancy between the two licenses, 
+ 	the BSD license will take precedence. 
+*******************************************************************************/
+/**
+ * xmlschema is a class that allows the user to quickly and easily
+ * build a database on any ADOdb-supported platform using a simple
+ * XML schema.
+ *
+ * Last Editor: $Author: jlim $
+ * @author Richard Tango-Lowy & Dan Cech
+ * @version $Revision: 1.12 $
+ *
+ * @package axmls
+ * @tutorial getting_started.pkg
+ */
+ 
+function _file_get_contents($file) 
+{
+ 	if (function_exists('file_get_contents')) return file_get_contents($file);
+	
+	$f = fopen($file,'r');
+	if (!$f) return '';
+	$t = '';
+	
+	while ($s = fread($f,100000)) $t .= $s;
+	fclose($f);
+	return $t;
+}
+
+
+/**
+* Debug on or off
+*/
+if( !defined( 'XMLS_DEBUG' ) ) {
+	define( 'XMLS_DEBUG', FALSE );
+}
+
+/**
+* Default prefix key
+*/
+if( !defined( 'XMLS_PREFIX' ) ) {
+	define( 'XMLS_PREFIX', '%%P' );
+}
+
+/**
+* Maximum length allowed for object prefix
+*/
+if( !defined( 'XMLS_PREFIX_MAXLEN' ) ) {
+	define( 'XMLS_PREFIX_MAXLEN', 10 );
+}
+
+/**
+* Execute SQL inline as it is generated
+*/
+if( !defined( 'XMLS_EXECUTE_INLINE' ) ) {
+	define( 'XMLS_EXECUTE_INLINE', FALSE );
+}
+
+/**
+* Continue SQL Execution if an error occurs?
+*/
+if( !defined( 'XMLS_CONTINUE_ON_ERROR' ) ) {
+	define( 'XMLS_CONTINUE_ON_ERROR', FALSE );
+}
+
+/**
+* Current Schema Version
+*/
+if( !defined( 'XMLS_SCHEMA_VERSION' ) ) {
+	define( 'XMLS_SCHEMA_VERSION', '0.2' );
+}
+
+/**
+* Default Schema Version.  Used for Schemas without an explicit version set.
+*/
+if( !defined( 'XMLS_DEFAULT_SCHEMA_VERSION' ) ) {
+	define( 'XMLS_DEFAULT_SCHEMA_VERSION', '0.1' );
+}
+
+/**
+* Default Schema Version.  Used for Schemas without an explicit version set.
+*/
+if( !defined( 'XMLS_DEFAULT_UPGRADE_METHOD' ) ) {
+	define( 'XMLS_DEFAULT_UPGRADE_METHOD', 'ALTER' );
+}
+
+/**
+* Include the main ADODB library
+*/
+if( !defined( '_ADODB_LAYER' ) ) {
+	require( 'adodb.inc.php' );
+	require( 'adodb-datadict.inc.php' );
+}
+
+/**
+* Abstract DB Object. This class provides basic methods for database objects, such
+* as tables and indexes.
+*
+* @package axmls
+* @access private
+*/
+class dbObject {
+	
+	/**
+	* var object Parent
+	*/
+	var $parent;
+	
+	/**
+	* var string current element
+	*/
+	var $currentElement;
+	
+	/**
+	* NOP
+	*/
+	function dbObject( &$parent, $attributes = NULL ) {
+		$this->parent =& $parent;
+	}
+	
+	/**
+	* XML Callback to process start elements
+	*
+	* @access private
+	*/
+	function _tag_open( &$parser, $tag, $attributes ) {
+		
+	}
+	
+	/**
+	* XML Callback to process CDATA elements
+	*
+	* @access private
+	*/
+	function _tag_cdata( &$parser, $cdata ) {
+		
+	}
+	
+	/**
+	* XML Callback to process end elements
+	*
+	* @access private
+	*/
+	function _tag_close( &$parser, $tag ) {
+		
+	}
+	
+	function create() {
+		return array();
+	}
+	
+	/**
+	* Destroys the object
+	*/
+	function destroy() {
+		unset( $this );
+	}
+	
+	/**
+	* Checks whether the specified RDBMS is supported by the current
+	* database object or its ranking ancestor.
+	*
+	* @param string $platform RDBMS platform name (from ADODB platform list).
+	* @return boolean TRUE if RDBMS is supported; otherwise returns FALSE.
+	*/
+	function supportedPlatform( $platform = NULL ) {
+		return is_object( $this->parent ) ? $this->parent->supportedPlatform( $platform ) : TRUE;
+	}
+	
+	/**
+	* Returns the prefix set by the ranking ancestor of the database object.
+	*
+	* @param string $name Prefix string.
+	* @return string Prefix.
+	*/
+	function prefix( $name = '' ) {
+		return is_object( $this->parent ) ? $this->parent->prefix( $name ) : $name;
+	}
+	
+	/**
+	* Extracts a field ID from the specified field.
+	*
+	* @param string $field Field.
+	* @return string Field ID.
+	*/
+	function FieldID( $field ) {
+		return strtoupper( preg_replace( '/^`(.+)`$/', '$1', $field ) );
+	}
+}
+
+/**
+* Creates a table object in ADOdb's datadict format
+*
+* This class stores information about a database table. As charactaristics
+* of the table are loaded from the external source, methods and properties
+* of this class are used to build up the table description in ADOdb's
+* datadict format.
+*
+* @package axmls
+* @access private
+*/
+class dbTable extends dbObject {
+	
+	/**
+	* @var string Table name
+	*/
+	var $name;
+	
+	/**
+	* @var array Field specifier: Meta-information about each field
+	*/
+	var $fields = array();
+	
+	/**
+	* @var array List of table indexes.
+	*/
+	var $indexes = array();
+	
+	/**
+	* @var array Table options: Table-level options
+	*/
+	var $opts = array();
+	
+	/**
+	* @var string Field index: Keeps track of which field is currently being processed
+	*/
+	var $current_field;
+	
+	/**
+	* @var boolean Mark table for destruction
+	* @access private
+	*/
+	var $drop_table;
+	
+	/**
+	* @var boolean Mark field for destruction (not yet implemented)
+	* @access private
+	*/
+	var $drop_field = array();
+	var $alter; // GS Fix for constraint impl
+	
+	/**
+	* Iniitializes a new table object.
+	*
+	* @param string $prefix DB Object prefix
+	* @param array $attributes Array of table attributes.
+	*/
+	function dbTable( &$parent, $attributes = NULL ) {
+		$this->parent =& $parent;
+		$this->name = $this->prefix($attributes['NAME']);
+		// GS Fix for constraint impl
+		if(isset($attributes['ALTER']))
+		{
+			$this->alter = $attributes['ALTER'];
+		}
+	}
+	
+	/**
+	* XML Callback to process start elements. Elements currently 
+	* processed are: INDEX, DROP, FIELD, KEY, NOTNULL, AUTOINCREMENT & DEFAULT. 
+	*
+	* @access private
+	*/
+	function _tag_open( &$parser, $tag, $attributes ) {
+		$this->currentElement = strtoupper( $tag );
+		
+		switch( $this->currentElement ) {
+			case 'INDEX':
+				if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) ) {
+					xml_set_object( $parser, $this->addIndex( $attributes ) );
+				}
+				break;
+			case 'DATA':
+				if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) ) {
+					xml_set_object( $parser, $this->addData( $attributes ) );
+				}
+				break;
+			case 'DROP':
+				$this->drop();
+				break;
+			case 'FIELD':
+				// Add a field
+				$fieldName = $attributes['NAME'];
+				$fieldType = $attributes['TYPE'];
+				$fieldSize = isset( $attributes['SIZE'] ) ? $attributes['SIZE'] : NULL;
+				$fieldOpts = isset( $attributes['OPTS'] ) ? $attributes['OPTS'] : NULL;
+				
+				$this->addField( $fieldName, $fieldType, $fieldSize, $fieldOpts );
+				break;
+			case 'KEY':
+			case 'NOTNULL':
+			case 'AUTOINCREMENT':
+				// Add a field option
+				$this->addFieldOpt( $this->current_field, $this->currentElement );
+				break;
+			case 'DEFAULT':
+				// Add a field option to the table object
+				
+				// Work around ADOdb datadict issue that misinterprets empty strings.
+				if( $attributes['VALUE'] == '' ) {
+					$attributes['VALUE'] = " '' ";
+				}
+				
+				$this->addFieldOpt( $this->current_field, $this->currentElement, $attributes['VALUE'] );
+				break;
+			case 'DEFDATE':
+			case 'DEFTIMESTAMP':
+				// Add a field option to the table object
+				$this->addFieldOpt( $this->current_field, $this->currentElement );
+				break;
+			default:
+				// print_r( array( $tag, $attributes ) );
+		}
+	}
+	
+	/**
+	* XML Callback to process CDATA elements
+	*
+	* @access private
+	*/
+	function _tag_cdata( &$parser, $cdata ) {
+		switch( $this->currentElement ) {
+			// Table constraint
+			case 'CONSTRAINT':
+				if( isset( $this->current_field ) ) {
+					$this->addFieldOpt( $this->current_field, $this->currentElement, $cdata );
+				} else {
+					$this->addTableOpt('CONSTRAINTS', $cdata ); // GS Fix for constraint impl
+				}
+				break;
+			// Table option
+			case 'OPT':
+				$this->addTableOpt('mysql', $cdata ); // GS Fix for constraint impl
+				break;
+			default:
+				
+		}
+	}
+	
+	/**
+	* XML Callback to process end elements
+	*
+	* @access private
+	*/
+	function _tag_close( &$parser, $tag ) {
+		$this->currentElement = '';
+		
+		switch( strtoupper( $tag ) ) {
+			case 'TABLE':
+				$this->parent->addSQL( $this->create( $this->parent ) );
+				xml_set_object( $parser, $this->parent );
+				$this->destroy();
+				break;
+			case 'FIELD':
+				unset($this->current_field);
+				break;
+
+		}
+	}
+	
+	/**
+	* Adds an index to a table object
+	*
+	* @param array $attributes Index attributes
+	* @return object dbIndex object
+	*/
+	function &addIndex( $attributes ) {
+		$name = strtoupper( $attributes['NAME'] );
+		$this->indexes[$name] =& new dbIndex( $this, $attributes );
+		return $this->indexes[$name];
+	}
+	
+	/**
+	* Adds data to a table object
+	*
+	* @param array $attributes Data attributes
+	* @return object dbData object
+	*/
+	function &addData( $attributes ) {
+		if( !isset( $this->data ) ) {
+			$this->data =& new dbData( $this, $attributes );
+		}
+		return $this->data;
+	}
+	
+	/**
+	* Adds a field to a table object
+	*
+	* $name is the name of the table to which the field should be added. 
+	* $type is an ADODB datadict field type. The following field types
+	* are supported as of ADODB 3.40:
+	* 	- C:  varchar
+	*	- X:  CLOB (character large object) or largest varchar size
+	*	   if CLOB is not supported
+	*	- C2: Multibyte varchar
+	*	- X2: Multibyte CLOB
+	*	- B:  BLOB (binary large object)
+	*	- D:  Date (some databases do not support this, and we return a datetime type)
+	*	- T:  Datetime or Timestamp
+	*	- L:  Integer field suitable for storing booleans (0 or 1)
+	*	- I:  Integer (mapped to I4)
+	*	- I1: 1-byte integer
+	*	- I2: 2-byte integer
+	*	- I4: 4-byte integer
+	*	- I8: 8-byte integer
+	*	- F:  Floating point number
+	*	- N:  Numeric or decimal number
+	*
+	* @param string $name Name of the table to which the field will be added.
+	* @param string $type	ADODB datadict field type.
+	* @param string $size	Field size
+	* @param array $opts	Field options array
+	* @return array Field specifier array
+	*/
+	function addField( $name, $type, $size = NULL, $opts = NULL ) {
+		$field_id = $this->FieldID( $name );
+		
+		// Set the field index so we know where we are
+		$this->current_field = $field_id;
+		
+		// Set the field name (required)
+		$this->fields[$field_id]['NAME'] = $name;
+		
+		// Set the field type (required)
+		$this->fields[$field_id]['TYPE'] = $type;
+		
+		// Set the field size (optional)
+		if( isset( $size ) ) {
+			$this->fields[$field_id]['SIZE'] = $size;
+		}
+		
+		// Set the field options
+		if( isset( $opts ) ) {
+			$this->fields[$field_id]['OPTS'][] = $opts;
+		}
+	}
+	
+	/**
+	* Adds a field option to the current field specifier
+	*
+	* This method adds a field option allowed by the ADOdb datadict 
+	* and appends it to the given field.
+	*
+	* @param string $field	Field name
+	* @param string $opt ADOdb field option
+	* @param mixed $value Field option value
+	* @return array Field specifier array
+	*/
+	function addFieldOpt( $field, $opt, $value = NULL ) {
+		if( !isset( $value ) ) {
+			$this->fields[$this->FieldID( $field )]['OPTS'][] = $opt;
+		// Add the option and value
+		} else {
+			$this->fields[$this->FieldID( $field )]['OPTS'][] = array( $opt => $value );
+		}
+	}
+	
+	/**
+	* Adds an option to the table
+	*
+	* This method takes a comma-separated list of table-level options
+	* and appends them to the table object.
+	*
+	* @param string $opt Table option
+	* @return array Options
+	*/
+	function addTableOpt($key, $opt ) { // GS Fix for constraint impl
+		//$this->opts[] = $opt;
+		$this->opts[$key] = $opt;
+		
+		return $this->opts;
+	}
+	
+	/**
+	* Generates the SQL that will create the table in the database
+	*
+	* @param object $xmls adoSchema object
+	* @return array Array containing table creation SQL
+	*/
+	function create( &$xmls ) {
+		$sql = array();
+		
+		// drop any existing indexes
+		if( is_array( $legacy_indexes = $xmls->dict->MetaIndexes( $this->name ) ) ) {
+			foreach( $legacy_indexes as $index => $index_details ) {
+				$sql[] = $xmls->dict->DropIndexSQL( $index, $this->name );
+			}
+		}
+		
+		// remove fields to be dropped from table object
+		foreach( $this->drop_field as $field ) {
+			unset( $this->fields[$field] );
+		}
+		
+		// if table exists
+		if( is_array( $legacy_fields = $xmls->dict->MetaColumns( $this->name ) ) ) {
+			// drop table
+			if( $this->drop_table ) {
+				$sql[] = $xmls->dict->DropTableSQL( $this->name );
+				
+				return $sql;
+			}
+			
+			// drop any existing fields not in schema
+			foreach( $legacy_fields as $field_id => $field ) {
+				if( !isset( $this->fields[$field_id] ) ) {
+					$sql[] = $xmls->dict->DropColumnSQL( $this->name, '`'.$field->name.'`' );
+				}
+			}
+		// if table doesn't exist
+		} else {
+			if( $this->drop_table ) {
+				return $sql;
+			}
+			
+			$legacy_fields = array();
+		}
+		
+		// Loop through the field specifier array, building the associative array for the field options
+		$fldarray = array();
+		
+		foreach( $this->fields as $field_id => $finfo ) {
+			// Set an empty size if it isn't supplied
+			if( !isset( $finfo['SIZE'] ) ) {
+				$finfo['SIZE'] = '';
+			}
+			
+			// Initialize the field array with the type and size
+			$fldarray[$field_id] = array(
+				'NAME' => $finfo['NAME'],
+				'TYPE' => $finfo['TYPE'],
+				'SIZE' => $finfo['SIZE']
+			);
+			
+			// Loop through the options array and add the field options. 
+			if( isset( $finfo['OPTS'] ) ) {
+				foreach( $finfo['OPTS'] as $opt ) {
+					// Option has an argument.
+					if( is_array( $opt ) ) {
+						$key = key( $opt );
+						$value = $opt[key( $opt )];
+						@$fldarray[$field_id][$key] .= $value;
+					// Option doesn't have arguments
+					} else {
+						$fldarray[$field_id][$opt] = $opt;
+					}
+				}
+			}
+		}		
+		if( empty( $legacy_fields ) && !isset($this->alter)) { // GS Fix for constraint impl
+			// Create the new table
+			$sql[] = $xmls->dict->CreateTableSQL( $this->name, $fldarray, $this->opts );
+			logMsg( end( $sql ), 'Generated CreateTableSQL' );
+		} else {
+			// Upgrade an existing table
+			logMsg( "Upgrading {$this->name} using '{$xmls->upgrade}'" );
+			switch( $xmls->upgrade ) {
+				// Use ChangeTableSQL
+				case 'ALTER':
+					logMsg( 'Generated ChangeTableSQL (ALTERing table)' );
+					$sql[] = $xmls->dict->ChangeTableSQL( $this->name, $fldarray, $this->opts, $this->alter ); // GS Fix for constraint impl
+					break;
+				case 'REPLACE':
+					logMsg( 'Doing upgrade REPLACE (testing)' );
+					$sql[] = $xmls->dict->DropTableSQL( $this->name );
+					$sql[] = $xmls->dict->CreateTableSQL( $this->name, $fldarray, $this->opts );
+					break;
+				// ignore table
+				default:
+					return array();
+			}
+		}
+		
+		foreach( $this->indexes as $index ) {
+			$sql[] = $index->create( $xmls );
+		}
+		
+		if( isset( $this->data ) ) {
+			$sql[] = $this->data->create( $xmls );
+		}
+		
+		return $sql;
+	}
+	
+	/**
+	* Marks a field or table for destruction
+	*/
+	function drop() {
+		if( isset( $this->current_field ) ) {
+			// Drop the current field
+			logMsg( "Dropping field '{$this->current_field}' from table '{$this->name}'" );
+			// $this->drop_field[$this->current_field] = $xmls->dict->DropColumnSQL( $this->name, $this->current_field );
+			$this->drop_field[$this->current_field] = $this->current_field;
+		} else {
+			// Drop the current table
+			logMsg( "Dropping table '{$this->name}'" );
+			// $this->drop_table = $xmls->dict->DropTableSQL( $this->name );
+			$this->drop_table = TRUE;
+		}
+	}
+}
+
+/**
+* Creates an index object in ADOdb's datadict format
+*
+* This class stores information about a database index. As charactaristics
+* of the index are loaded from the external source, methods and properties
+* of this class are used to build up the index description in ADOdb's
+* datadict format.
+*
+* @package axmls
+* @access private
+*/
+class dbIndex extends dbObject {
+	
+	/**
+	* @var string	Index name
+	*/
+	var $name;
+	
+	/**
+	* @var array	Index options: Index-level options
+	*/
+	var $opts = array();
+	
+	/**
+	* @var array	Indexed fields: Table columns included in this index
+	*/
+	var $columns = array();
+	
+	/**
+	* @var boolean Mark index for destruction
+	* @access private
+	*/
+	var $drop = FALSE;
+	
+	/**
+	* Initializes the new dbIndex object.
+	*
+	* @param object $parent Parent object
+	* @param array $attributes Attributes
+	*
+	* @internal
+	*/
+	function dbIndex( &$parent, $attributes = NULL ) {
+		$this->parent =& $parent;
+		
+		$this->name = $this->prefix ($attributes['NAME']);
+	}
+	
+	/**
+	* XML Callback to process start elements
+	*
+	* Processes XML opening tags. 
+	* Elements currently processed are: DROP, CLUSTERED, BITMAP, UNIQUE, FULLTEXT & HASH. 
+	*
+	* @access private
+	*/
+	function _tag_open( &$parser, $tag, $attributes ) {
+		$this->currentElement = strtoupper( $tag );
+		
+		switch( $this->currentElement ) {
+			case 'DROP':
+				$this->drop();
+				break;
+			case 'CLUSTERED':
+			case 'BITMAP':
+			case 'UNIQUE':
+			case 'FULLTEXT':
+			case 'HASH':
+				// Add index Option
+				$this->addIndexOpt( $this->currentElement );
+				break;
+			default:
+				// print_r( array( $tag, $attributes ) );
+		}
+	}
+	
+	/**
+	* XML Callback to process CDATA elements
+	*
+	* Processes XML cdata.
+	*
+	* @access private
+	*/
+	function _tag_cdata( &$parser, $cdata ) {
+		switch( $this->currentElement ) {
+			// Index field name
+			case 'COL':
+				$this->addField( $cdata );
+				break;
+			default:
+				
+		}
+	}
+	
+	/**
+	* XML Callback to process end elements
+	*
+	* @access private
+	*/
+	function _tag_close( &$parser, $tag ) {
+		$this->currentElement = '';
+		
+		switch( strtoupper( $tag ) ) {
+			case 'INDEX':
+				xml_set_object( $parser, $this->parent );
+				break;
+		}
+	}
+	
+	/**
+	* Adds a field to the index
+	*
+	* @param string $name Field name
+	* @return string Field list
+	*/
+	function addField( $name ) {
+		$this->columns[$this->FieldID( $name )] = $name;
+		
+		// Return the field list
+		return $this->columns;
+	}
+	
+	/**
+	* Adds options to the index
+	*
+	* @param string $opt Comma-separated list of index options.
+	* @return string Option list
+	*/
+	function addIndexOpt( $opt ) {
+		$this->opts[] = $opt;
+		
+		// Return the options list
+		return $this->opts;
+	}
+	
+	/**
+	* Generates the SQL that will create the index in the database
+	*
+	* @param object $xmls adoSchema object
+	* @return array Array containing index creation SQL
+	*/
+	function create( &$xmls ) {
+		if( $this->drop ) {
+			return NULL;
+		}
+		
+		// eliminate any columns that aren't in the table
+		foreach( $this->columns as $id => $col ) {
+			if( !isset( $this->parent->fields[$id] ) ) {
+				unset( $this->columns[$id] );
+			}
+		}
+		
+		return $xmls->dict->CreateIndexSQL( $this->name, $this->parent->name, $this->columns, $this->opts );
+	}
+	
+	/**
+	* Marks an index for destruction
+	*/
+	function drop() {
+		$this->drop = TRUE;
+	}
+}
+
+/**
+* Creates a data object in ADOdb's datadict format
+*
+* This class stores information about table data.
+*
+* @package axmls
+* @access private
+*/
+class dbData extends dbObject {
+	
+	var $data = array();
+	
+	var $row;
+	
+	/**
+	* Initializes the new dbIndex object.
+	*
+	* @param object $parent Parent object
+	* @param array $attributes Attributes
+	*
+	* @internal
+	*/
+	function dbData( &$parent, $attributes = NULL ) {
+		$this->parent =& $parent;
+	}
+	
+	/**
+	* XML Callback to process start elements
+	*
+	* Processes XML opening tags. 
+	* Elements currently processed are: DROP, CLUSTERED, BITMAP, UNIQUE, FULLTEXT & HASH. 
+	*
+	* @access private
+	*/
+	function _tag_open( &$parser, $tag, $attributes ) {
+		$this->currentElement = strtoupper( $tag );
+		
+		switch( $this->currentElement ) {
+			case 'ROW':
+				$this->row = count( $this->data );
+				$this->data[$this->row] = array();
+				break;
+			case 'F':
+				$this->addField($attributes);
+			default:
+				// print_r( array( $tag, $attributes ) );
+		}
+	}
+	
+	/**
+	* XML Callback to process CDATA elements
+	*
+	* Processes XML cdata.
+	*
+	* @access private
+	*/
+	function _tag_cdata( &$parser, $cdata ) {
+		switch( $this->currentElement ) {
+			// Index field name
+			case 'F':
+				$this->addData( $cdata );
+				break;
+			default:
+				
+		}
+	}
+	
+	/**
+	* XML Callback to process end elements
+	*
+	* @access private
+	*/
+	function _tag_close( &$parser, $tag ) {
+		$this->currentElement = '';
+		
+		switch( strtoupper( $tag ) ) {
+			case 'DATA':
+				xml_set_object( $parser, $this->parent );
+				break;
+		}
+	}
+	
+	/**
+	* Adds a field to the index
+	*
+	* @param string $name Field name
+	* @return string Field list
+	*/
+	function addField( $attributes ) {
+		if( isset( $attributes['NAME'] ) ) {
+			$name = $attributes['NAME'];
+		} else {
+			$name = count($this->data[$this->row]);
+		}
+		
+		// Set the field index so we know where we are
+		$this->current_field = $this->FieldID( $name );
+	}
+	
+	/**
+	* Adds options to the index
+	*
+	* @param string $opt Comma-separated list of index options.
+	* @return string Option list
+	*/
+	function addData( $cdata ) {
+		if( !isset( $this->data[$this->row] ) ) {
+			$this->data[$this->row] = array();
+		}
+		
+		if( !isset( $this->data[$this->row][$this->current_field] ) ) {
+			$this->data[$this->row][$this->current_field] = '';
+		}
+		
+		$this->data[$this->row][$this->current_field] .= $cdata;
+	}
+	
+	/**
+	* Generates the SQL that will create the index in the database
+	*
+	* @param object $xmls adoSchema object
+	* @return array Array containing index creation SQL
+	*/
+	function create( &$xmls ) {
+		$table = $xmls->dict->TableName($this->parent->name);
+		$table_field_count = count($this->parent->fields);
+		$sql = array();
+		
+		// eliminate any columns that aren't in the table
+		foreach( $this->data as $row ) {
+			$table_fields = $this->parent->fields;
+			$fields = array();
+			
+			foreach( $row as $field_id => $field_data ) {
+				if( !array_key_exists( $field_id, $table_fields ) ) {
+					if( is_numeric( $field_id ) ) {
+						$field_id = reset( array_keys( $table_fields ) );
+					} else {
+						continue;
+					}
+				}
+				
+				$name = $table_fields[$field_id]['NAME'];
+				
+				switch( $table_fields[$field_id]['TYPE'] ) {
+					case 'C':
+					case 'C2':
+					case 'X':
+					case 'X2':
+						$fields[$name] = $xmls->db->qstr( $field_data );
+						break;
+					case 'I':
+					case 'I1':
+					case 'I2':
+					case 'I4':
+					case 'I8':
+						$fields[$name] = intval($field_data);
+						break;
+					default:
+						$fields[$name] = $field_data;
+				}
+				
+				unset($table_fields[$field_id]);
+			}
+			
+			// check that at least 1 column is specified
+			if( empty( $fields ) ) {
+				continue;
+			}
+			
+			// check that no required columns are missing
+			if( count( $fields ) < $table_field_count ) {
+				foreach( $table_fields as $field ) {
+					if (isset( $field['OPTS'] ))
+						if( ( in_array( 'NOTNULL', $field['OPTS'] ) || in_array( 'KEY', $field['OPTS'] ) ) && !in_array( 'AUTOINCREMENT', $field['OPTS'] ) ) {
+							continue(2);
+						}
+				}
+			}
+			
+			$sql[] = 'INSERT INTO '. $table .' ('. implode( ',', array_keys( $fields ) ) .') VALUES ('. implode( ',', $fields ) .')';
+		}
+		
+		return $sql;
+	}
+}
+
+/**
+* Creates the SQL to execute a list of provided SQL queries
+*
+* @package axmls
+* @access private
+*/
+class dbQuerySet extends dbObject {
+	
+	/**
+	* @var array	List of SQL queries
+	*/
+	var $queries = array();
+	
+	/**
+	* @var string	String used to build of a query line by line
+	*/
+	var $query;
+	
+	/**
+	* @var string	Query prefix key
+	*/
+	var $prefixKey = '';
+	
+	/**
+	* @var boolean	Auto prefix enable (TRUE)
+	*/
+	var $prefixMethod = 'AUTO';
+	
+	/**
+	* Initializes the query set.
+	*
+	* @param object $parent Parent object
+	* @param array $attributes Attributes
+	*/
+	function dbQuerySet( &$parent, $attributes = NULL ) {
+		$this->parent =& $parent;
+			
+		// Overrides the manual prefix key
+		if( isset( $attributes['KEY'] ) ) {
+			$this->prefixKey = $attributes['KEY'];
+		}
+		
+		$prefixMethod = isset( $attributes['PREFIXMETHOD'] ) ? strtoupper( trim( $attributes['PREFIXMETHOD'] ) ) : '';
+		
+		// Enables or disables automatic prefix prepending
+		switch( $prefixMethod ) {
+			case 'AUTO':
+				$this->prefixMethod = 'AUTO';
+				break;
+			case 'MANUAL':
+				$this->prefixMethod = 'MANUAL';
+				break;
+			case 'NONE':
+				$this->prefixMethod = 'NONE';
+				break;
+		}
+	}
+	
+	/**
+	* XML Callback to process start elements. Elements currently 
+	* processed are: QUERY. 
+	*
+	* @access private
+	*/
+	function _tag_open( &$parser, $tag, $attributes ) {
+		$this->currentElement = strtoupper( $tag );
+		
+		switch( $this->currentElement ) {
+			case 'QUERY':
+				// Create a new query in a SQL queryset.
+				// Ignore this query set if a platform is specified and it's different than the 
+				// current connection platform.
+				if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) ) {
+					$this->newQuery();
+				} else {
+					$this->discardQuery();
+				}
+				break;
+			default:
+				// print_r( array( $tag, $attributes ) );
+		}
+	}
+	
+	/**
+	* XML Callback to process CDATA elements
+	*/
+	function _tag_cdata( &$parser, $cdata ) {
+		switch( $this->currentElement ) {
+			// Line of queryset SQL data
+			case 'QUERY':
+				$this->buildQuery( $cdata );
+				break;
+			default:
+				
+		}
+	}
+	
+	/**
+	* XML Callback to process end elements
+	*
+	* @access private
+	*/
+	function _tag_close( &$parser, $tag ) {
+		$this->currentElement = '';
+		
+		switch( strtoupper( $tag ) ) {
+			case 'QUERY':
+				// Add the finished query to the open query set.
+				$this->addQuery();
+				break;
+			case 'SQL':
+				$this->parent->addSQL( $this->create( $this->parent ) );
+				xml_set_object( $parser, $this->parent );
+				$this->destroy();
+				break;
+			default:
+				
+		}
+	}
+	
+	/**
+	* Re-initializes the query.
+	*
+	* @return boolean TRUE
+	*/
+	function newQuery() {
+		$this->query = '';
+		
+		return TRUE;
+	}
+	
+	/**
+	* Discards the existing query.
+	*
+	* @return boolean TRUE
+	*/
+	function discardQuery() {
+		unset( $this->query );
+		
+		return TRUE;
+	}
+	
+	/** 
+	* Appends a line to a query that is being built line by line
+	*
+	* @param string $data Line of SQL data or NULL to initialize a new query
+	* @return string SQL query string.
+	*/
+	function buildQuery( $sql = NULL ) {
+		if( !isset( $this->query ) OR empty( $sql ) ) {
+			return FALSE;
+		}
+		
+		$this->query .= $sql;
+		
+		return $this->query;
+	}
+	
+	/**
+	* Adds a completed query to the query list
+	*
+	* @return string	SQL of added query
+	*/
+	function addQuery() {
+		if( !isset( $this->query ) ) {
+			return FALSE;
+		}
+		
+		$this->queries[] = $return = trim($this->query);
+		
+		unset( $this->query );
+		
+		return $return;
+	}
+	
+	/**
+	* Creates and returns the current query set
+	*
+	* @param object $xmls adoSchema object
+	* @return array Query set
+	*/
+	function create( &$xmls ) {
+		foreach( $this->queries as $id => $query ) {
+			switch( $this->prefixMethod ) {
+				case 'AUTO':
+					// Enable auto prefix replacement
+					
+					// Process object prefix.
+					// Evaluate SQL statements to prepend prefix to objects
+					$query = $this->prefixQuery( '/^\s*((?is)INSERT\s+(INTO\s+)?)((\w+\s*,?\s*)+)(\s.*$)/', $query, $xmls->objectPrefix );
+					$query = $this->prefixQuery( '/^\s*((?is)UPDATE\s+(FROM\s+)?)((\w+\s*,?\s*)+)(\s.*$)/', $query, $xmls->objectPrefix );
+					$query = $this->prefixQuery( '/^\s*((?is)DELETE\s+(FROM\s+)?)((\w+\s*,?\s*)+)(\s.*$)/', $query, $xmls->objectPrefix );
+					
+					// SELECT statements aren't working yet
+					#$data = preg_replace( '/(?ias)(^\s*SELECT\s+.*\s+FROM)\s+(\W\s*,?\s*)+((?i)\s+WHERE.*$)/', "\1 $prefix\2 \3", $data );
+					
+				case 'MANUAL':
+					// If prefixKey is set and has a value then we use it to override the default constant XMLS_PREFIX.
+					// If prefixKey is not set, we use the default constant XMLS_PREFIX
+					if( isset( $this->prefixKey ) AND( $this->prefixKey !== '' ) ) {
+						// Enable prefix override
+						$query = str_replace( $this->prefixKey, $xmls->objectPrefix, $query );
+					} else {
+						// Use default replacement
+						$query = str_replace( XMLS_PREFIX , $xmls->objectPrefix, $query );
+					}
+			}
+			
+			$this->queries[$id] = trim( $query );
+		}
+		
+		// Return the query set array
+		return $this->queries;
+	}
+	
+	/**
+	* Rebuilds the query with the prefix attached to any objects
+	*
+	* @param string $regex Regex used to add prefix
+	* @param string $query SQL query string
+	* @param string $prefix Prefix to be appended to tables, indices, etc.
+	* @return string Prefixed SQL query string.
+	*/
+	function prefixQuery( $regex, $query, $prefix = NULL ) {
+		if( !isset( $prefix ) ) {
+			return $query;
+		}
+		
+		if( preg_match( $regex, $query, $match ) ) {
+			$preamble = $match[1];
+			$postamble = $match[5];
+			$objectList = explode( ',', $match[3] );
+			// $prefix = $prefix . '_';
+			
+			$prefixedList = '';
+			
+			foreach( $objectList as $object ) {
+				if( $prefixedList !== '' ) {
+					$prefixedList .= ', ';
+				}
+				
+				$prefixedList .= $prefix . trim( $object );
+			}
+			
+			$query = $preamble . ' ' . $prefixedList . ' ' . $postamble;
+		}
+		
+		return $query;
+	}
+}
+
+/**
+* Loads and parses an XML file, creating an array of "ready-to-run" SQL statements
+* 
+* This class is used to load and parse the XML file, to create an array of SQL statements
+* that can be used to build a database, and to build the database using the SQL array.
+*
+* @tutorial getting_started.pkg
+*
+* @author Richard Tango-Lowy & Dan Cech
+* @version $Revision: 1.12 $
+*
+* @package axmls
+*/
+class adoSchema {
+	
+	/**
+	* @var array	Array containing SQL queries to generate all objects
+	* @access private
+	*/
+	var $sqlArray;
+	
+	/**
+	* @var object	ADOdb connection object
+	* @access private
+	*/
+	var $db;
+	
+	/**
+	* @var object	ADOdb Data Dictionary
+	* @access private
+	*/
+	var $dict;
+	
+	/**
+	* @var string Current XML element
+	* @access private
+	*/
+	var $currentElement = '';
+	
+	/**
+	* @var string If set (to 'ALTER' or 'REPLACE'), upgrade an existing database
+	* @access private
+	*/
+	var $upgrade = '';
+	
+	/**
+	* @var string Optional object prefix
+	* @access private
+	*/
+	var $objectPrefix = '';
+	
+	/**
+	* @var long	Original Magic Quotes Runtime value
+	* @access private
+	*/
+	var $mgq;
+	
+	/**
+	* @var long	System debug
+	* @access private
+	*/
+	var $debug;
+	
+	/**
+	* @var string Regular expression to find schema version
+	* @access private
+	*/
+	var $versionRegex = '/<schema.*?( version="([^"]*)")?.*?>/';
+	
+	/**
+	* @var string Current schema version
+	* @access private
+	*/
+	var $schemaVersion;
+	
+	/**
+	* @var int	Success of last Schema execution
+	*/
+	var $success;
+	
+	/**
+	* @var bool	Execute SQL inline as it is generated
+	*/
+	var $executeInline;
+	
+	/**
+	* @var bool	Continue SQL execution if errors occur
+	*/
+	var $continueOnError;
+	
+	/**
+	* Creates an adoSchema object
+	*
+	* Creating an adoSchema object is the first step in processing an XML schema.
+	* The only parameter is an ADOdb database connection object, which must already
+	* have been created.
+	*
+	* @param object $db ADOdb database connection object.
+	*/
+	function adoSchema( &$db ) {
+		// Initialize the environment
+		$this->mgq = get_magic_quotes_runtime();
+		set_magic_quotes_runtime(0);
+		
+		$this->db =& $db;
+		$this->debug = $this->db->debug;
+		$this->dict = NewDataDictionary( $this->db );
+		$this->sqlArray = array();
+		$this->schemaVersion = XMLS_SCHEMA_VERSION;
+		$this->executeInline( XMLS_EXECUTE_INLINE );
+		$this->continueOnError( XMLS_CONTINUE_ON_ERROR );
+		$this->setUpgradeMethod();
+	}
+	
+	/**
+	* Sets the method to be used for upgrading an existing database
+	*
+	* Use this method to specify how existing database objects should be upgraded.
+	* The method option can be set to ALTER, REPLACE, BEST, or NONE. ALTER attempts to
+	* alter each database object directly, REPLACE attempts to rebuild each object
+	* from scratch, BEST attempts to determine the best upgrade method for each
+	* object, and NONE disables upgrading.
+	*
+	* This method is not yet used by AXMLS, but exists for backward compatibility.
+	* The ALTER method is automatically assumed when the adoSchema object is
+	* instantiated; other upgrade methods are not currently supported.
+	*
+	* @param string $method Upgrade method (ALTER|REPLACE|BEST|NONE)
+	* @returns string Upgrade method used
+	*/
+	function SetUpgradeMethod( $method = '' ) {
+		if( !is_string( $method ) ) {
+			return FALSE;
+		}
+		
+		$method = strtoupper( $method );
+		
+		// Handle the upgrade methods
+		switch( $method ) {
+			case 'ALTER':
+				$this->upgrade = $method;
+				break;
+			case 'REPLACE':
+				$this->upgrade = $method;
+				break;
+			case 'BEST':
+				$this->upgrade = 'ALTER';
+				break;
+			case 'NONE':
+				$this->upgrade = 'NONE';
+				break;
+			default:
+				// Use default if no legitimate method is passed.
+				$this->upgrade = XMLS_DEFAULT_UPGRADE_METHOD;
+		}
+		
+		return $this->upgrade;
+	}
+	
+	/**
+	* Enables/disables inline SQL execution.
+	*
+	* Call this method to enable or disable inline execution of the schema. If the mode is set to TRUE (inline execution),
+	* AXMLS applies the SQL to the database immediately as each schema entity is parsed. If the mode
+	* is set to FALSE (post execution), AXMLS parses the entire schema and you will need to call adoSchema::ExecuteSchema()
+	* to apply the schema to the database.
+	*
+	* @param bool $mode execute
+	* @return bool current execution mode
+	*
+	* @see ParseSchema(), ExecuteSchema()
+	*/
+	function ExecuteInline( $mode = NULL ) {
+		if( is_bool( $mode ) ) {
+			$this->executeInline = $mode;
+		}
+		
+		return $this->executeInline;
+	}
+	
+	/**
+	* Enables/disables SQL continue on error.
+	*
+	* Call this method to enable or disable continuation of SQL execution if an error occurs.
+	* If the mode is set to TRUE (continue), AXMLS will continue to apply SQL to the database, even if an error occurs.
+	* If the mode is set to FALSE (halt), AXMLS will halt execution of generated sql if an error occurs, though parsing
+	* of the schema will continue.
+	*
+	* @param bool $mode execute
+	* @return bool current continueOnError mode
+	*
+	* @see addSQL(), ExecuteSchema()
+	*/
+	function ContinueOnError( $mode = NULL ) {
+		if( is_bool( $mode ) ) {
+			$this->continueOnError = $mode;
+		}
+		
+		return $this->continueOnError;
+	}
+	
+	/**
+	* Loads an XML schema from a file and converts it to SQL.
+	*
+	* Call this method to load the specified schema (see the DTD for the proper format) from
+	* the filesystem and generate the SQL necessary to create the database described. 
+	* @see ParseSchemaString()
+	*
+	* @param string $file Name of XML schema file.
+	* @param bool $returnSchema Return schema rather than parsing.
+	* @return array Array of SQL queries, ready to execute
+	*/
+	function ParseSchema( $filename, $returnSchema = FALSE ) {
+		return $this->ParseSchemaString( $this->ConvertSchemaFile( $filename ), $returnSchema );
+	}
+	
+	/**
+	* Loads an XML schema from a file and converts it to SQL.
+	*
+	* Call this method to load the specified schema from a file (see the DTD for the proper format) 
+	* and generate the SQL necessary to create the database described by the schema.
+	*
+	* @param string $file Name of XML schema file.
+	* @param bool $returnSchema Return schema rather than parsing.
+	* @return array Array of SQL queries, ready to execute.
+	*
+	* @deprecated Replaced by adoSchema::ParseSchema() and adoSchema::ParseSchemaString()
+	* @see ParseSchema(), ParseSchemaString()
+	*/
+	function ParseSchemaFile( $filename, $returnSchema = FALSE ) {
+		// Open the file
+		if( !($fp = fopen( $filename, 'r' )) ) {
+			// die( 'Unable to open file' );
+			return FALSE;
+		}
+		
+		// do version detection here
+		if( $this->SchemaFileVersion( $filename ) != $this->schemaVersion ) {
+			return FALSE;
+		}
+		
+		if ( $returnSchema )
+		{
+			$xmlstring = '';
+			while( $data = fread( $fp, 100000 ) ) {
+				$xmlstring .= $data;
+			}
+			return $xmlstring;
+		}
+		
+		$this->success = 2;
+		
+		$xmlParser = $this->create_parser();
+		
+		// Process the file
+		while( $data = fread( $fp, 4096 ) ) {
+			if( !xml_parse( $xmlParser, $data, feof( $fp ) ) ) {
+				die( sprintf(
+					"XML error: %s at line %d",
+					xml_error_string( xml_get_error_code( $xmlParser) ),
+					xml_get_current_line_number( $xmlParser)
+				) );
+			}
+		}
+		
+		xml_parser_free( $xmlParser );
+		
+		return $this->sqlArray;
+	}
+	
+	/**
+	* Converts an XML schema string to SQL.
+	*
+	* Call this method to parse a string containing an XML schema (see the DTD for the proper format)
+	* and generate the SQL necessary to create the database described by the schema. 
+	* @see ParseSchema()
+	*
+	* @param string $xmlstring XML schema string.
+	* @param bool $returnSchema Return schema rather than parsing.
+	* @return array Array of SQL queries, ready to execute.
+	*/
+	function ParseSchemaString( $xmlstring, $returnSchema = FALSE ) {
+		if( !is_string( $xmlstring ) OR empty( $xmlstring ) ) {
+			return FALSE;
+		}
+		
+		// do version detection here
+		if( $this->SchemaStringVersion( $xmlstring ) != $this->schemaVersion ) {
+			return FALSE;
+		}
+		
+		if ( $returnSchema )
+		{
+			return $xmlstring;
+		}
+		
+		$this->success = 2;
+		
+		$xmlParser = $this->create_parser();
+		
+		if( !xml_parse( $xmlParser, $xmlstring, TRUE ) ) {
+			die( sprintf(
+				"XML error: %s at line %d",
+				xml_error_string( xml_get_error_code( $xmlParser) ),
+				xml_get_current_line_number( $xmlParser)
+			) );
+		}
+		
+		xml_parser_free( $xmlParser );
+		
+		return $this->sqlArray;
+	}
+	
+	/**
+	* Loads an XML schema from a file and converts it to uninstallation SQL.
+	*
+	* Call this method to load the specified schema (see the DTD for the proper format) from
+	* the filesystem and generate the SQL necessary to remove the database described.
+	* @see RemoveSchemaString()
+	*
+	* @param string $file Name of XML schema file.
+	* @param bool $returnSchema Return schema rather than parsing.
+	* @return array Array of SQL queries, ready to execute
+	*/
+	function RemoveSchema( $filename, $returnSchema = FALSE ) {
+		return $this->RemoveSchemaString( $this->ConvertSchemaFile( $filename ), $returnSchema );
+	}
+	
+	/**
+	* Converts an XML schema string to uninstallation SQL.
+	*
+	* Call this method to parse a string containing an XML schema (see the DTD for the proper format)
+	* and generate the SQL necessary to uninstall the database described by the schema. 
+	* @see RemoveSchema()
+	*
+	* @param string $schema XML schema string.
+	* @param bool $returnSchema Return schema rather than parsing.
+	* @return array Array of SQL queries, ready to execute.
+	*/
+	function RemoveSchemaString( $schema, $returnSchema = FALSE ) {
+		
+		// grab current version
+		if( !( $version = $this->SchemaStringVersion( $schema ) ) ) {
+			return FALSE;
+		}
+		
+		return $this->ParseSchemaString( $this->TransformSchema( $schema, 'remove-' . $version), $returnSchema );
+	}
+	
+	/**
+	* Applies the current XML schema to the database (post execution).
+	*
+	* Call this method to apply the current schema (generally created by calling 
+	* ParseSchema() or ParseSchemaString() ) to the database (creating the tables, indexes, 
+	* and executing other SQL specified in the schema) after parsing.
+	* @see ParseSchema(), ParseSchemaString(), ExecuteInline()
+	*
+	* @param array $sqlArray Array of SQL statements that will be applied rather than
+	*		the current schema.
+	* @param boolean $continueOnErr Continue to apply the schema even if an error occurs.
+	* @returns integer 0 if failure, 1 if errors, 2 if successful.
+	*/
+	function ExecuteSchema( $sqlArray = NULL, $continueOnErr =  NULL ) {
+		if( !is_bool( $continueOnErr ) ) {
+			$continueOnErr = $this->ContinueOnError();
+		}
+		
+		if( !isset( $sqlArray ) ) {
+			$sqlArray = $this->sqlArray;
+		}
+		
+		if( !is_array( $sqlArray ) ) {
+			$this->success = 0;
+		} else {
+			$this->success = $this->dict->ExecuteSQLArray( $sqlArray, $continueOnErr );
+		}
+		
+		return $this->success;
+	}
+	
+	/**
+	* Returns the current SQL array. 
+	*
+	* Call this method to fetch the array of SQL queries resulting from 
+	* ParseSchema() or ParseSchemaString(). 
+	*
+	* @param string $format Format: HTML, TEXT, or NONE (PHP array)
+	* @return array Array of SQL statements or FALSE if an error occurs
+	*/
+	function PrintSQL( $format = 'NONE' ) {
+		$sqlArray = null;
+		return $this->getSQL( $format, $sqlArray );
+	}
+	
+	/**
+	* Saves the current SQL array to the local filesystem as a list of SQL queries.
+	*
+	* Call this method to save the array of SQL queries (generally resulting from a
+	* parsed XML schema) to the filesystem.
+	*
+	* @param string $filename Path and name where the file should be saved.
+	* @return boolean TRUE if save is successful, else FALSE. 
+	*/
+	function SaveSQL( $filename = './schema.sql' ) {
+		
+		if( !isset( $sqlArray ) ) {
+			$sqlArray = $this->sqlArray;
+		}
+		if( !isset( $sqlArray ) ) {
+			return FALSE;
+		}
+		
+		$fp = fopen( $filename, "w" );
+		
+		foreach( $sqlArray as $key => $query ) {
+			fwrite( $fp, $query . ";\n" );
+		}
+		fclose( $fp );
+	}
+	
+	/**
+	* Create an xml parser
+	*
+	* @return object PHP XML parser object
+	*
+	* @access private
+	*/
+	function &create_parser() {
+		// Create the parser
+		$xmlParser = xml_parser_create();
+		xml_set_object( $xmlParser, $this );
+		
+		// Initialize the XML callback functions
+		xml_set_element_handler( $xmlParser, '_tag_open', '_tag_close' );
+		xml_set_character_data_handler( $xmlParser, '_tag_cdata' );
+		
+		return $xmlParser;
+	}
+	
+	/**
+	* XML Callback to process start elements
+	*
+	* @access private
+	*/
+	function _tag_open( &$parser, $tag, $attributes ) {
+		switch( strtoupper( $tag ) ) {
+			case 'TABLE':
+				$this->obj = new dbTable( $this, $attributes );
+				xml_set_object( $parser, $this->obj );
+				break;
+			case 'SQL':
+				if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) ) {
+					$this->obj = new dbQuerySet( $this, $attributes );
+					xml_set_object( $parser, $this->obj );
+				}
+				break;
+			default:
+				// print_r( array( $tag, $attributes ) );
+		}
+		
+	}
+	
+	/**
+	* XML Callback to process CDATA elements
+	*
+	* @access private
+	*/
+	function _tag_cdata( &$parser, $cdata ) {
+	}
+	
+	/**
+	* XML Callback to process end elements
+	*
+	* @access private
+	* @internal
+	*/
+	function _tag_close( &$parser, $tag ) {
+		
+	}
+	
+	/**
+	* Converts an XML schema string to the specified DTD version.
+	*
+	* Call this method to convert a string containing an XML schema to a different AXMLS
+	* DTD version. For instance, to convert a schema created for an pre-1.0 version for 
+	* AXMLS (DTD version 0.1) to a newer version of the DTD (e.g. 0.2). If no DTD version 
+	* parameter is specified, the schema will be converted to the current DTD version. 
+	* If the newFile parameter is provided, the converted schema will be written to the specified
+	* file.
+	* @see ConvertSchemaFile()
+	*
+	* @param string $schema String containing XML schema that will be converted.
+	* @param string $newVersion DTD version to convert to.
+	* @param string $newFile File name of (converted) output file.
+	* @return string Converted XML schema or FALSE if an error occurs.
+	*/
+	function ConvertSchemaString( $schema, $newVersion = NULL, $newFile = NULL ) {
+		
+		// grab current version
+		if( !( $version = $this->SchemaStringVersion( $schema ) ) ) {
+			return FALSE;
+		}
+		
+		if( !isset ($newVersion) ) {
+			$newVersion = $this->schemaVersion;
+		}
+		
+		if( $version == $newVersion ) {
+			$result = $schema;
+		} else {
+			$result = $this->TransformSchema( $schema, 'convert-' . $version . '-' . $newVersion);
+		}
+		
+		if( is_string( $result ) AND is_string( $newFile ) AND ( $fp = fopen( $newFile, 'w' ) ) ) {
+			fwrite( $fp, $result );
+			fclose( $fp );
+		}
+		
+		return $result;
+	}
+	
+	// compat for pre-4.3 - jlim
+	function _file_get_contents($path)
+	{
+		if (function_exists('file_get_contents')) return file_get_contents($path);
+		return join('',file($path));
+	}
+	
+	/**
+	* Converts an XML schema file to the specified DTD version.
+	*
+	* Call this method to convert the specified XML schema file to a different AXMLS
+	* DTD version. For instance, to convert a schema created for an pre-1.0 version for 
+	* AXMLS (DTD version 0.1) to a newer version of the DTD (e.g. 0.2). If no DTD version 
+	* parameter is specified, the schema will be converted to the current DTD version. 
+	* If the newFile parameter is provided, the converted schema will be written to the specified
+	* file.
+	* @see ConvertSchemaString()
+	*
+	* @param string $filename Name of XML schema file that will be converted.
+	* @param string $newVersion DTD version to convert to.
+	* @param string $newFile File name of (converted) output file.
+	* @return string Converted XML schema or FALSE if an error occurs.
+	*/
+	function ConvertSchemaFile( $filename, $newVersion = NULL, $newFile = NULL ) {
+		
+		// grab current version
+		if( !( $version = $this->SchemaFileVersion( $filename ) ) ) {
+			return FALSE;
+		}
+		
+		if( !isset ($newVersion) ) {
+			$newVersion = $this->schemaVersion;
+		}
+		
+		if( $version == $newVersion ) {
+			$result = _file_get_contents( $filename );
+			
+			// remove unicode BOM if present
+			if( substr( $result, 0, 3 ) == sprintf( '%c%c%c', 239, 187, 191 ) ) {
+				$result = substr( $result, 3 );
+			}
+		} else {
+			$result = $this->TransformSchema( $filename, 'convert-' . $version . '-' . $newVersion, 'file' );
+		}
+		
+		if( is_string( $result ) AND is_string( $newFile ) AND ( $fp = fopen( $newFile, 'w' ) ) ) {
+			fwrite( $fp, $result );
+			fclose( $fp );
+		}
+		
+		return $result;
+	}
+	
+	function TransformSchema( $schema, $xsl, $schematype='string' )
+	{
+		// Fail if XSLT extension is not available
+		if( ! function_exists( 'xslt_create' ) ) {
+			return FALSE;
+		}
+		
+		$xsl_file = dirname( __FILE__ ) . '/xsl/' . $xsl . '.xsl';
+		
+		// look for xsl
+		if( !is_readable( $xsl_file ) ) {
+			return FALSE;
+		}
+		
+		switch( $schematype )
+		{
+			case 'file':
+				if( !is_readable( $schema ) ) {
+					return FALSE;
+				}
+				
+				$schema = _file_get_contents( $schema );
+				break;
+			case 'string':
+			default:
+				if( !is_string( $schema ) ) {
+					return FALSE;
+				}
+		}
+		
+		$arguments = array (
+			'/_xml' => $schema,
+			'/_xsl' => _file_get_contents( $xsl_file )
+		);
+		
+		// create an XSLT processor
+		$xh = xslt_create ();
+		
+		// set error handler
+		xslt_set_error_handler ($xh, array (&$this, 'xslt_error_handler'));
+		
+		// process the schema
+		$result = xslt_process ($xh, 'arg:/_xml', 'arg:/_xsl', NULL, $arguments); 
+		
+		xslt_free ($xh);
+		
+		return $result;
+	}
+	
+	/**
+	* Processes XSLT transformation errors
+	*
+	* @param object $parser XML parser object
+	* @param integer $errno Error number
+	* @param integer $level Error level
+	* @param array $fields Error information fields
+	*
+	* @access private
+	*/
+	function xslt_error_handler( $parser, $errno, $level, $fields ) {
+		if( is_array( $fields ) ) {
+			$msg = array(
+				'Message Type' => ucfirst( $fields['msgtype'] ),
+				'Message Code' => $fields['code'],
+				'Message' => $fields['msg'],
+				'Error Number' => $errno,
+				'Level' => $level
+			);
+			
+			switch( $fields['URI'] ) {
+				case 'arg:/_xml':
+					$msg['Input'] = 'XML';
+					break;
+				case 'arg:/_xsl':
+					$msg['Input'] = 'XSL';
+					break;
+				default:
+					$msg['Input'] = $fields['URI'];
+			}
+			
+			$msg['Line'] = $fields['line'];
+		} else {
+			$msg = array(
+				'Message Type' => 'Error',
+				'Error Number' => $errno,
+				'Level' => $level,
+				'Fields' => var_export( $fields, TRUE )
+			);
+		}
+		
+		$error_details = $msg['Message Type'] . ' in XSLT Transformation' . "\n"
+					   . '<table>' . "\n";
+		
+		foreach( $msg as $label => $details ) {
+			$error_details .= '<tr><td><b>' . $label . ': </b></td><td>' . htmlentities( $details ) . '</td></tr>' . "\n";
+		}
+		
+		$error_details .= '</table>';
+		
+		trigger_error( $error_details, E_USER_ERROR );
+	}
+	
+	/**
+	* Returns the AXMLS Schema Version of the requested XML schema file.
+	*
+	* Call this method to obtain the AXMLS DTD version of the requested XML schema file.
+	* @see SchemaStringVersion()
+	*
+	* @param string $filename AXMLS schema file
+	* @return string Schema version number or FALSE on error
+	*/
+	function SchemaFileVersion( $filename ) {
+		// Open the file
+		if( !($fp = fopen( $filename, 'r' )) ) {
+			// die( 'Unable to open file' );
+			return FALSE;
+		}
+		
+		// Process the file
+		while( $data = fread( $fp, 4096 ) ) {
+			if( preg_match( $this->versionRegex, $data, $matches ) ) {
+				return !empty( $matches[2] ) ? $matches[2] : XMLS_DEFAULT_SCHEMA_VERSION;
+			}
+		}
+		
+		return FALSE;
+	}
+	
+	/**
+	* Returns the AXMLS Schema Version of the provided XML schema string.
+	*
+	* Call this method to obtain the AXMLS DTD version of the provided XML schema string.
+	* @see SchemaFileVersion()
+	*
+	* @param string $xmlstring XML schema string
+	* @return string Schema version number or FALSE on error
+	*/
+	function SchemaStringVersion( $xmlstring ) {
+		if( !is_string( $xmlstring ) OR empty( $xmlstring ) ) {
+			return FALSE;
+		}
+		
+		if( preg_match( $this->versionRegex, $xmlstring, $matches ) ) {
+			return !empty( $matches[2] ) ? $matches[2] : XMLS_DEFAULT_SCHEMA_VERSION;
+		}
+		
+		return FALSE;
+	}
+	
+	/**
+	* Extracts an XML schema from an existing database.
+	*
+	* Call this method to create an XML schema string from an existing database.
+	* If the data parameter is set to TRUE, AXMLS will include the data from the database
+	* in the schema. 
+	*
+	* @param boolean $data Include data in schema dump
+	* @return string Generated XML schema
+	*/
+	function ExtractSchema( $data = FALSE ) {
+		$old_mode = $this->db->SetFetchMode( ADODB_FETCH_NUM );
+		
+		$schema = '<?xml version="1.0"?>' . "\n"
+				. '<schema version="' . $this->schemaVersion . '">' . "\n";
+		
+		if( is_array( $tables = $this->db->MetaTables( 'TABLES' ) ) ) {
+			foreach( $tables as $table ) {
+				$schema .= '	<table name="' . $table . '">' . "\n";
+				
+				// grab details from database
+				$rs = $this->db->Execute( 'SELECT * FROM ' . $table . ' WHERE 1=1' );
+				$fields = $this->db->MetaColumns( $table );
+				$indexes = $this->db->MetaIndexes( $table );
+				
+				if( is_array( $fields ) ) {
+					foreach( $fields as $details ) {
+						$extra = '';
+						$content = array();
+						
+						if( $details->max_length > 0 ) {
+							$extra .= ' size="' . $details->max_length . '"';
+						}
+						
+						if( $details->primary_key ) {
+							$content[] = '<KEY/>';
+						} elseif( $details->not_null ) {
+							$content[] = '<NOTNULL/>';
+						}
+						
+						if( $details->has_default ) {
+							$content[] = '<DEFAULT value="' . $details->default_value . '"/>';
+						}
+						
+						if( $details->auto_increment ) {
+							$content[] = '<AUTOINCREMENT/>';
+						}
+						
+						// this stops the creation of 'R' columns,
+						// AUTOINCREMENT is used to create auto columns
+						$details->primary_key = 0;
+						$type = $rs->MetaType( $details );
+						
+						$schema .= '		<field name="' . $details->name . '" type="' . $type . '"' . $extra . '>';
+						
+						if( !empty( $content ) ) {
+							$schema .= "\n			" . implode( "\n			", $content ) . "\n		";
+						}
+						
+						$schema .= '</field>' . "\n";
+					}
+				}
+				
+				if( is_array( $indexes ) ) {
+					foreach( $indexes as $index => $details ) {
+						$schema .= '		<index name="' . $index . '">' . "\n";
+						
+						if( $details['unique'] ) {
+							$schema .= '			<UNIQUE/>' . "\n";
+						}
+						
+						foreach( $details['columns'] as $column ) {
+							$schema .= '			<col>' . $column . '</col>' . "\n";
+						}
+						
+						$schema .= '		</index>' . "\n";
+					}
+				}
+				
+				if( $data ) {
+					$rs = $this->db->Execute( 'SELECT * FROM ' . $table );
+					
+					if( is_object( $rs ) ) {
+						$schema .= '		<data>' . "\n";
+						
+						while( $row = $rs->FetchRow() ) {
+							foreach( $row as $key => $val ) {
+								$row[$key] = htmlentities($val);
+							}
+							
+							$schema .= '			<row><f>' . implode( '</f><f>', $row ) . '</f></row>' . "\n";
+						}
+						
+						$schema .= '		</data>' . "\n";
+					}
+				}
+				
+				$schema .= '	</table>' . "\n";
+			}
+		}
+		
+		$this->db->SetFetchMode( $old_mode );
+		
+		$schema .= '</schema>';
+		return $schema;
+	}
+	
+	/**
+	* Sets a prefix for database objects
+	*
+	* Call this method to set a standard prefix that will be prepended to all database tables 
+	* and indices when the schema is parsed. Calling setPrefix with no arguments clears the prefix.
+	*
+	* @param string $prefix Prefix that will be prepended.
+	* @param boolean $underscore If TRUE, automatically append an underscore character to the prefix.
+	* @return boolean TRUE if successful, else FALSE
+	*/
+	function SetPrefix( $prefix = '', $underscore = TRUE ) {
+		switch( TRUE ) {
+			// clear prefix
+			case empty( $prefix ):
+				logMsg( 'Cleared prefix' );
+				$this->objectPrefix = '';
+				return TRUE;
+			// prefix too long
+			case strlen( $prefix ) > XMLS_PREFIX_MAXLEN:
+			// prefix contains invalid characters
+			case !preg_match( '/^[a-z][a-z0-9_]+$/i', $prefix ):
+				logMsg( 'Invalid prefix: ' . $prefix );
+				return FALSE;
+		}
+		
+		if( $underscore AND substr( $prefix, -1 ) != '_' ) {
+			$prefix .= '_';
+		}
+		
+		// prefix valid
+		logMsg( 'Set prefix: ' . $prefix );
+		$this->objectPrefix = $prefix;
+		return TRUE;
+	}
+	
+	/**
+	* Returns an object name with the current prefix prepended.
+	*
+	* @param string	$name Name
+	* @return string	Prefixed name
+	*
+	* @access private
+	*/
+	function prefix( $name = '' ) {
+		// if prefix is set
+		if( !empty( $this->objectPrefix ) ) {
+			// Prepend the object prefix to the table name
+			// prepend after quote if used
+			return preg_replace( '/^(`?)(.+)$/', '$1' . $this->objectPrefix . '$2', $name );
+		}
+		
+		// No prefix set. Use name provided.
+		return $name;
+	}
+	
+	/**
+	* Checks if element references a specific platform
+	*
+	* @param string $platform Requested platform
+	* @returns boolean TRUE if platform check succeeds
+	*
+	* @access private
+	*/
+	function supportedPlatform( $platform = NULL ) {
+		$regex = '/^(\w*\|)*' . $this->db->databaseType . '(\|\w*)*$/';
+		
+		if( !isset( $platform ) OR preg_match( $regex, $platform ) ) {
+			logMsg( "Platform $platform is supported" );
+			return TRUE;
+		} else {
+			logMsg( "Platform $platform is NOT supported" );
+			return FALSE;
+		}
+	}
+	
+	/**
+	* Clears the array of generated SQL.
+	*
+	* @access private
+	*/
+	function clearSQL() {
+		$this->sqlArray = array();
+	}
+	
+	/**
+	* Adds SQL into the SQL array.
+	*
+	* @param mixed $sql SQL to Add
+	* @return boolean TRUE if successful, else FALSE.
+	*
+	* @access private
+	*/	
+	function addSQL( $sql = NULL ) {
+		if( is_array( $sql ) ) {
+			foreach( $sql as $line ) {
+				$this->addSQL( $line );
+			}
+			
+			return TRUE;
+		}
+		
+		if( is_string( $sql ) ) {
+			$this->sqlArray[] = $sql;
+			
+			// if executeInline is enabled, and either no errors have occurred or continueOnError is enabled, execute SQL.
+			if( $this->ExecuteInline() && ( $this->success == 2 || $this->ContinueOnError() ) ) {
+				$saved = $this->db->debug;
+				$this->db->debug = $this->debug;
+				$ok = $this->db->Execute( $sql );
+				$this->db->debug = $saved;
+				
+				if( !$ok ) {
+					if( $this->debug ) {
+						ADOConnection::outp( $this->db->ErrorMsg() );
+					}
+					
+					$this->success = 1;
+				}
+			}
+			
+			return TRUE;
+		}
+		
+		return FALSE;
+	}
+	
+	/**
+	* Gets the SQL array in the specified format.
+	*
+	* @param string $format Format
+	* @return mixed SQL
+	*	
+	* @access private
+	*/
+	function getSQL( $format = NULL, $sqlArray = NULL ) {
+		if( !is_array( $sqlArray ) ) {
+			$sqlArray = $this->sqlArray;
+		}
+		
+		if( !is_array( $sqlArray ) ) {
+			return FALSE;
+		}
+		
+		switch( strtolower( $format ) ) {
+			case 'string':
+			case 'text':
+				return !empty( $sqlArray ) ? implode( ";\n\n", $sqlArray ) . ';' : '';
+			case'html':
+				return !empty( $sqlArray ) ? nl2br( htmlentities( implode( ";\n\n", $sqlArray ) . ';' ) ) : '';
+		}
+		
+		return $this->sqlArray;
+	}
+	
+	/**
+	* Destroys an adoSchema object.
+	*
+	* Call this method to clean up after an adoSchema object that is no longer in use.
+	* @deprecated adoSchema now cleans up automatically.
+	*/
+	function Destroy() {
+		set_magic_quotes_runtime( $this->mgq );
+		unset( $this );
+	}
+}
+
+/**
+* Message logging function
+*
+* @access private
+*/
+function logMsg( $msg, $title = NULL, $force = FALSE ) {
+	if( XMLS_DEBUG or $force ) {
+		echo '<pre>';
+		
+		if( isset( $title ) ) {
+			echo '<h3>' . htmlentities( $title ) . '</h3>';
+		}
+		
+		if( is_object( $this ) ) {
+			echo '[' . get_class( $this ) . '] ';
+		}
+		
+		print_r( $msg );
+		
+		echo '</pre>';
+	}
+}
+?>



From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 29 23:44:10 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 30 Jun 2006 06:44:10 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7687 -
 /vtigercrm/trunk/Smarty/templates/Inventory/InventoryDetailView.tpl
Message-ID: <20060630064410.BE9B383FEDD@vtiger.fosslabs.com>

Author: richie
Date: Fri Jun 30 00:44:06 2006
New Revision: 7687

Log:
Issue in delete tag in Inventory modules has been fixed

Modified:
    vtigercrm/trunk/Smarty/templates/Inventory/InventoryDetailView.tpl

Modified: vtigercrm/trunk/Smarty/templates/Inventory/InventoryDetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Inventory/InventoryDetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Inventory/InventoryDetailView.tpl Fri Jun 30 00:44:06 2006
@@ -13,6 +13,7 @@
 -->*}
 <script type="text/javascript" src="modules/{$MODULE}/{$SINGLE_MOD}.js"></script>
 <script language="JavaScript" type="text/javascript" src="include/js/dtlviewajax.js"></script>
+<script src="include/scriptaculous/scriptaculous.js" type="text/javascript"></script>
 <div id="convertleaddiv" style="display:block;position:absolute;left:225px;top:150px;"></div>
 <span id="crmspanid" style="display:none;position:absolute;"  onmouseover="show('crmspanid');">
    <a class="link"  align="right" href="javascript:;">{$APP.LBL_EDIT_BUTTON}</a>
@@ -27,6 +28,22 @@
 		alert("Please enter a tag");
 		return false;
 	{rdelim}
+{rdelim}
+function DeleteTag(id)
+{ldelim}
+	$("vtbusy_info").style.display="inline";
+	Effect.Fade('tag_'+id);
+	new Ajax.Request(
+		'index.php',
+                {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+                        method: 'post',
+                        postBody: "file=TagCloud&module={$MODULE}&action={$MODULE}Ajax&ajxaction=DELETETAG&tagid=" +id,
+                        onComplete: function(response) {ldelim}
+						getTagCloud();
+						$("vtbusy_info").style.display="none";
+                        {rdelim}
+                {rdelim}
+        );
 {rdelim}
 
 </script>
@@ -244,17 +261,21 @@
 {/if}
 
 <script>
-	new Ajax.Request(
-  	      'index.php',
-        	{ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
-	        method: 'post',
-        	postBody: 'module={$MODULE}&action={$MODULE}Ajax&file=TagCloud&ajxaction=GETTAGCLOUD',
-	        onComplete: function(response) {ldelim}
-        	                        $("tagfields").innerHTML=response.responseText;
-                	                $("txtbox_tagfields").value ='';
-                        	{rdelim}
-		{rdelim}
-	);
+function getTagCloud()
+{ldelim}
+new Ajax.Request(
+        'index.php',
+        {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+        method: 'post',
+        postBody: 'module={$MODULE}&action={$MODULE}Ajax&file=TagCloud&ajxaction=GETTAGCLOUD&recordid={$ID}',
+        onComplete: function(response) {ldelim}
+                                $("tagfields").innerHTML=response.responseText;
+                                $("txtbox_tagfields").value ='';
+                        {rdelim}
+        {rdelim}
+);
+{rdelim}
+getTagCloud();
 </script>
 
 	</td>



From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 29 23:52:17 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 30 Jun 2006 06:52:17 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231403=3A?=
 =?utf-8?q?_Billing/Shipping_Address_not_copied_while_selecting_vendor_in_?=
 =?utf-8?q?Create_PO?=
Message-ID: <076.42e49747ae640cf03d761f3ac3d3938e@vtiger.fosslabs.com>

#1403: Billing/Shipping Address not copied while selecting vendor in Create PO
-----------------------+----------------------------------------------------
 Reporter:  ahmed      |       Owner:  mickie
     Type:  defect     |      Status:  new   
 Priority:  critical   |   Milestone:        
Component:  vtigercrm  |     Version:  5.0.0 
 Keywords:             |  
-----------------------+----------------------------------------------------


-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1403>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 29 23:55:00 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 30 Jun 2006 06:55:00 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231404=3A?=
 =?utf-8?q?_Product_not_getting_displayed_in_List_view_when_added_from_ven?=
 =?utf-8?q?dor_related_list?=
Message-ID: <076.a2f1476f2b295979718cb1f522ba91a7@vtiger.fosslabs.com>

#1404: Product not getting displayed in List view when added from vendor related
list
-----------------------+----------------------------------------------------
 Reporter:  ahmed      |       Owner:  mickie
     Type:  defect     |      Status:  new   
 Priority:  critical   |   Milestone:        
Component:  vtigercrm  |     Version:  5.0.0 
 Keywords:             |  
-----------------------+----------------------------------------------------


-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1404>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 30 00:02:26 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 30 Jun 2006 07:02:26 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7688 -
	/vtigercrm/trunk/modules/Contacts/Save.php
Message-ID: <20060630070227.178CB83FEE7@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 30 01:02:21 2006
New Revision: 7688

Log:
changes made to save the reltion between campaign and contact

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

Modified: vtigercrm/trunk/modules/Contacts/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/Save.php (original)
+++ vtigercrm/trunk/modules/Contacts/Save.php Fri Jun 30 01:02:21 2006
@@ -131,6 +131,15 @@
 
 	$local_log->debug("Saved record with id of ".$return_id);
 
+	if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] == "Campaigns")
+	{
+		if(isset($_REQUEST['return_id']) && $_REQUEST['return_id'] != "")
+		{
+			$sql = "insert into vtiger_campaigncontrel values (".$_REQUEST['return_id'].",".$focus->id.")";
+			$adb->query($sql);
+		}
+	}
+
 	//BEGIN -- Code for Create Customer Portal Users password and Send Mail 
 	if($_REQUEST['portal'] == '' && $_REQUEST['mode'] == 'edit')
 	{



From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 30 00:06:07 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 30 Jun 2006 07:06:07 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7689 - in
 /vtigercrm/trunk/modules: Contacts/Save.php Leads/Save.php
Message-ID: <20060630070608.15A1383FEE7@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 30 01:06:03 2006
New Revision: 7689

Log:
changes made to save the reltion between campaign and contact

Modified:
    vtigercrm/trunk/modules/Contacts/Save.php
    vtigercrm/trunk/modules/Leads/Save.php

Modified: vtigercrm/trunk/modules/Contacts/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/Save.php (original)
+++ vtigercrm/trunk/modules/Contacts/Save.php Fri Jun 30 01:06:03 2006
@@ -50,7 +50,7 @@
 
 $local_log =& LoggerManager::getLogger('index');
 
-global $log;
+global $log,$adb;
 $focus = new Contact();
 
 setObjectValuesFromRequest(&$focus);

Modified: vtigercrm/trunk/modules/Leads/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/Save.php (original)
+++ vtigercrm/trunk/modules/Leads/Save.php Fri Jun 30 01:06:03 2006
@@ -19,7 +19,7 @@
 require_once('include/utils/UserInfoUtil.php');
 
 $local_log =& LoggerManager::getLogger('index');
-global $log;
+global $log,$adb;
 $focus = new Lead();
 global $current_user;
 $currencyid=fetchCurrency($current_user->id);
@@ -68,6 +68,17 @@
 //code added for returning back to the current view after edit from list view
 if($_REQUEST['return_viewname'] == '') $return_viewname='0';
 if($_REQUEST['return_viewname'] != '')$return_viewname=$_REQUEST['return_viewname'];
+
+if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] == "Campaigns")
+{
+	if(isset($_REQUEST['return_id']) && $_REQUEST['return_id'] != "")
+	{
+		$sql = "insert into vtiger_campaignleadrel values (".$_REQUEST['return_id'].",".$focus->id.")";
+		$adb->query($sql);
+	}
+}
+
+
 header("Location: index.php?action=$return_action&module=$return_module&record=$return_id&viewname=$return_viewname");
 
 //Code to save the custom vtiger_field info into database



From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 30 00:07:59 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 30 Jun 2006 07:07:59 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231405=3A?=
 =?utf-8?q?_Task_is_not_getting_displayed_in_Porder_Related_List_after_add?=
 =?utf-8?q?in?=
Message-ID: <076.95f1de3e7c6dbd3c93787f87e760d526@vtiger.fosslabs.com>

#1405: Task is not getting displayed in Porder Related List after addin
-----------------------+----------------------------------------------------
 Reporter:  ahmed      |       Owner:  mickie
     Type:  defect     |      Status:  new   
 Priority:  critical   |   Milestone:        
Component:  vtigercrm  |     Version:  5.0.0 
 Keywords:             |  
-----------------------+----------------------------------------------------


-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1405>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 30 00:08:58 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 30 Jun 2006 07:08:58 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231406=3A?=
 =?utf-8?q?_Advanced_Search_in_Purchase_Order_displays_no_values_in_combo?=
 =?utf-8?q?=2E?=
Message-ID: <076.604b3fbca2f49db5e075d878933ccd89@vtiger.fosslabs.com>

#1406: Advanced Search in Purchase Order displays no values in combo.
-----------------------+----------------------------------------------------
 Reporter:  ahmed      |       Owner:  saraj
     Type:  defect     |      Status:  new  
 Priority:  critical   |   Milestone:       
Component:  vtigercrm  |     Version:  5.0.0
 Keywords:             |  
-----------------------+----------------------------------------------------


-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1406>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 30 00:08:59 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 30 Jun 2006 07:08:59 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7690 -
	/vtigercrm/trunk/modules/Activities/Save.php
Message-ID: <20060630070859.F28F083FEEF@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 30 01:08:56 2006
New Revision: 7690

Log:
changes made to save the relation between activity and contact

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

Modified: vtigercrm/trunk/modules/Activities/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Activities/Save.php (original)
+++ vtigercrm/trunk/modules/Activities/Save.php Fri Jun 30 01:08:56 2006
@@ -26,7 +26,7 @@
 //require("modules/Emails/class.phpmailer.php");
 require_once("config.php");
 require_once('include/database/PearDatabase.php');
-
+global $adb;
 $local_log =& LoggerManager::getLogger('index');
 
 $focus = new Activity();
@@ -110,7 +110,15 @@
 		$adb->query($sql);
 	}
 }
-
+if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] == "Contacts")
+{
+	if(isset($_REQUEST['return_id']) && $_REQUEST['return_id'] != "")
+	{
+		$sql = "insert into vtiger_cntactivityrel values (".$_REQUEST['return_id'].",".$focus->id.")";
+		$adb->query($sql);
+	}
+}
+									
 $activemode = "";
 if($activity_mode != '') $activemode = "&activity_mode=".$activity_mode;
 



From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 30 00:14:07 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 30 Jun 2006 07:14:07 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7691 - in /vtigercrm/trunk:
 Smarty/templates/EmailDetails.tpl include/js/general.js
 include/utils/ListViewUtils.php modules/Emails/DetailView.php
Message-ID: <20060630071407.ED32083FEEA@vtiger.fosslabs.com>

Author: richie
Date: Fri Jun 30 01:14:00 2006
New Revision: 7691

Log:
Email Detailview from Related lists has been integrated

Modified:
    vtigercrm/trunk/Smarty/templates/EmailDetails.tpl
    vtigercrm/trunk/include/js/general.js
    vtigercrm/trunk/include/utils/ListViewUtils.php
    vtigercrm/trunk/modules/Emails/DetailView.php

Modified: vtigercrm/trunk/Smarty/templates/EmailDetails.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/EmailDetails.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/EmailDetails.tpl Fri Jun 30 01:14:00 2006
@@ -24,7 +24,7 @@
 				{/if}
 				{foreach item=row from=$BLOCKS}	
 				{foreach item=elements key=title from=$row}	
-					{if $title eq 'Attachment' && $elements.value != ''}
+					{if $elements.fldname eq 'filename' && $elements.value != ''}
 						<input type="button" name="download" value=" {$MOD.LBL_DOWNLOAD_ATTCH_BUTTON} " class="classWebBtn" onclick="fnvshobj(this,'reportLay')"/>
 					{/if}
 				{/foreach}
@@ -41,8 +41,8 @@
 <tr>
 	<td height="250" bgcolor="#FFFFFF" valign="top" style="padding-top:10px;">
 	{foreach item=row from=$BLOCKS}	
-	{foreach item=elements key=title from=$row}	
-		{if $title eq 'Subject'}
+	{foreach item=elements from=$row}	
+		{if $elements.fldname eq 'subject'}
 		<table width="100%" border="0" cellpadding="0" cellspacing="0">
 	{if $EMAIL_FLAG neq 'WEBMAIL'}
 	<tr><td width="20%" align="right" valign="top"><b>{$MOD.LBL_TO}</b></td><td width="2%">&nbsp;</td><td>{$TO_MAIL}&nbsp;</td></tr>
@@ -54,7 +54,7 @@
 	<tr><td align="right"><b>{$MOD.LBL_SUBJECT}</b></td><td>&nbsp;</td><td>{$elements.value}&nbsp;</td></tr>
 			<tr><td align="right" style="border-bottom:1px solid #666666;" colspan="3">&nbsp;</td></tr>
 		</table>
-		{elseif $title eq 'Description'}
+		{elseif $elements.fldname eq 'description'}
 		<div>
 			{$BLOCKS.4.Description.value}
 		</div>
@@ -66,7 +66,7 @@
 </table>
 {foreach item=row from=$BLOCKS}	
 	{foreach item=elements key=title from=$row}	
-	{if $title eq 'Attachment'}
+	{if $elements.fldname eq 'filename'}
 	<div id="reportLay" style="width:130px;" onmouseout="fninvsh('reportLay')" onmouseover="fnvshNrm('reportLay')">
 		<table width="100%" cellpadding="0" cellspacing="0" border="0" bgcolor="#FFFFFF">
 		{foreach item=attachments from=$elements.options}

Modified: vtigercrm/trunk/include/js/general.js
==============================================================================
--- vtigercrm/trunk/include/js/general.js (original)
+++ vtigercrm/trunk/include/js/general.js Fri Jun 30 01:14:00 2006
@@ -1687,6 +1687,11 @@
                         return false;
                 }
 }
+function ShowEmail(id)
+{
+       url = 'index.php?module=Emails&action=EmailsAjax&file=DetailView&record='+id;
+       openPopUp('xComposeEmail',this,url,'createemailWin',820,652,'menubar=no,toolbar=no,location=no,status=no,resizable=no');
+}
 
 var bSaf = (navigator.userAgent.indexOf('Safari') != -1);
 var bOpera = (navigator.userAgent.indexOf('Opera') != -1);

Modified: vtigercrm/trunk/include/utils/ListViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/ListViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/ListViewUtils.php Fri Jun 30 01:14:00 2006
@@ -696,7 +696,7 @@
 					{
 						$list_result_count = $i-1;
 						$tmp_value = getValue($ui_col_array,$list_result,$fieldname,$focus,$module,$entity_id,$list_result_count,"list","",$returnset,$oCv->setdefaultviewid);
-						$value = '<a href="javascript:;" onClick="OpenCompose(\''.$entity_id.'\',\'edit\');">'.$tmp_value.'</a>';
+						$value = '<a href="javascript:;" onClick="ShowEmail(\''.$entity_id.'\');">'.$tmp_value.'</a>';
 
 					}
 					else
@@ -2724,7 +2724,7 @@
 
 	$edit_link .= "&parenttab=".$_REQUEST["parenttab"];
 	if($module == 'Emails')
-	        $edit_link = 'javascript:;" onclick="OpenCompose(\'123\',\'edit\');';
+	        $edit_link = 'javascript:;" onclick="OpenCompose(\''.$entity_id.'\',\'edit\');';
 	return $edit_link;
 }
 

Modified: vtigercrm/trunk/modules/Emails/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/DetailView.php (original)
+++ vtigercrm/trunk/modules/Emails/DetailView.php Fri Jun 30 01:14:00 2006
@@ -45,9 +45,9 @@
 	$result = $adb->query($query);
     	$smarty->assign('FROM_MAIL',$adb->query_result($result,0,'from_email'));	
 	$to_email = ereg_replace('###',', ',$adb->query_result($result,0,'to_email'));
-	$smarty->assign('TO_MAIL',$to_email);	
-	$smarty->assign('CC_MAIL',ereg_replace('###',', ',$adb->query_result($result,0,'cc_email')));	
-    	$smarty->assign('BCC_MAIL',ereg_replace('###',', ',$adb->query_result($result,0,'bcc_email')));	
+	$smarty->assign('TO_MAIL',to_html($to_email));	
+	$smarty->assign('CC_MAIL',to_html(ereg_replace('###',', ',$adb->query_result($result,0,'cc_email'))));	
+    	$smarty->assign('BCC_MAIL',to_html(ereg_replace('###',', ',$adb->query_result($result,0,'bcc_email'))));	
     	$smarty->assign('EMAIL_FLAG',$adb->query_result($result,0,'email_flag'));	
 	if($focus->column_fields['name'] != '')
 	        $focus->name = $focus->column_fields['name'];		
@@ -131,14 +131,8 @@
 	else $smarty->assign("NAME", "");
 
 $entries = getBlocks($currentModule,"detail_view",'',$focus->column_fields);
-if($_REQUEST['mode'] != 'ajax')
-	$smarty->assign("BLOCKS" , $entries);
-else	
-{
-	$entries['Email Information']['4']['Description']['value'] = from_html($entries['Email Information']['4']['Description']['value']);
-	$smarty->assign("BLOCKS", $entries['Email Information']);
-}
-	
+$entries['Email Information']['4']['Description']['value'] = from_html($entries['Email Information']['4']['Description']['value']);
+$smarty->assign("BLOCKS", $entries['Email Information']);
 $smarty->assign("SINGLE_MOD",$app_strings['Email']);
 
 $smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']);
@@ -157,7 +151,7 @@
 $smarty->assign("MODULE",$currentModule);
 $smarty->assign("SENDER",$email_id);
 if($_REQUEST['mode'] != 'ajax')
-	$smarty->display("DetailView.tpl");
+	$smarty->display("EmailDetailView.tpl");
 else
 	$smarty->display("EmailDetails.tpl")
 ?>



From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 30 00:14:25 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 30 Jun 2006 07:14:25 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7692 -
	/vtigercrm/trunk/modules/Activities/Activity.php
Message-ID: <20060630071425.9AC2983FEEA@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 30 01:14:21 2006
New Revision: 7692

Log:
query has been modified in get_contacts function

Modified:
    vtigercrm/trunk/modules/Activities/Activity.php

Modified: vtigercrm/trunk/modules/Activities/Activity.php
==============================================================================
--- vtigercrm/trunk/modules/Activities/Activity.php (original)
+++ vtigercrm/trunk/modules/Activities/Activity.php Fri Jun 30 01:14:21 2006
@@ -43,9 +43,9 @@
 	
 	var $reminder_table = "vtiger_activity_reminder";
 	
-	var $tab_name = Array('vtiger_crmentity','vtiger_activity','vtiger_seactivityrel','vtiger_cntactivityrel','vtiger_salesmanactivityrel','vtiger_activity_reminder','vtiger_recurringevents','vtiger_invitees');
-
-	var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_activity'=>'activityid','vtiger_seactivityrel'=>'activityid','vtiger_cntactivityrel'=>'activityid','vtiger_salesmanactivityrel'=>'activityid','vtiger_activity_reminder'=>'activity_id','vtiger_recurringevents'=>'activityid');
+	var $tab_name = Array('vtiger_crmentity','vtiger_activity','vtiger_seactivityrel','vtiger_salesmanactivityrel','vtiger_activity_reminder','vtiger_recurringevents','vtiger_invitees');
+
+	var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_activity'=>'activityid','vtiger_seactivityrel'=>'activityid','vtiger_salesmanactivityrel'=>'activityid','vtiger_activity_reminder'=>'activity_id','vtiger_recurringevents'=>'activityid');
 
 	var $column_fields = Array();
 	var $sortby_fields = Array('subject','due_date','date_start','smownerid','activitytype');	//Sorting is added for due date and start date	
@@ -154,7 +154,7 @@
 			$returnset = '&return_module=Activities&return_action=DetailView&activity_mode=Events&return_id='.$id;
 
 
-			$query = 'select vtiger_users.user_name,vtiger_contactdetails.accountid,vtiger_contactdetails.contactid, vtiger_contactdetails.firstname,vtiger_contactdetails.lastname, vtiger_contactdetails.department, vtiger_contactdetails.title, vtiger_contactdetails.email, vtiger_contactdetails.phone, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_contactdetails inner join vtiger_seactivityrel on vtiger_seactivityrel.crmid=vtiger_contactdetails.contactid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid left join vtiger_users on vtiger_users.id = vtiger_crmentity.smownerid where vtiger_seactivityrel.activityid='.$id.' and vtiger_crmentity.deleted=0';
+			$query = 'select vtiger_users.user_name,vtiger_contactdetails.accountid,vtiger_contactdetails.contactid, vtiger_contactdetails.firstname,vtiger_contactdetails.lastname, vtiger_contactdetails.department, vtiger_contactdetails.title, vtiger_contactdetails.email, vtiger_contactdetails.phone, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_contactdetails inner join vtiger_cntactivityrel on vtiger_cntactivityrel.contactid=vtiger_contactdetails.contactid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid left join vtiger_users on vtiger_users.id = vtiger_crmentity.smownerid where vtiger_cntactivityrel.activityid='.$id.' and vtiger_crmentity.deleted=0';
 			$log->debug("Exiting get_contacts method ...");
 			return GetRelatedList('Activities','Contacts',$focus,$query,$button,$returnset);
         }



From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 30 00:15:40 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 30 Jun 2006 07:15:40 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7693 -
 /vtigercrm/trunk/Smarty/templates/EmailDetailView.tpl
Message-ID: <20060630071540.247A383FEF0@vtiger.fosslabs.com>

Author: richie
Date: Fri Jun 30 01:15:35 2006
New Revision: 7693

Log:
Email Detailview from Related lists has been integrated

Added:
    vtigercrm/trunk/Smarty/templates/EmailDetailView.tpl   (with props)



From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 30 00:15:52 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 30 Jun 2006 07:15:52 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231407=3A?=
 =?utf-8?q?_Not_able_to_delete_contact_from_vendor_related_list?=
Message-ID: <076.7a0430f79de907a68048a0360a372261@vtiger.fosslabs.com>

#1407: Not able to delete contact from vendor related list
-----------------------+----------------------------------------------------
 Reporter:  ahmed      |       Owner:  mickie
     Type:  defect     |      Status:  new   
 Priority:  critical   |   Milestone:        
Component:  vtigercrm  |     Version:  5.0.0 
 Keywords:             |  
-----------------------+----------------------------------------------------


-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1407>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 30 00:16:39 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 30 Jun 2006 07:16:39 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7694 -
 /vtigercrm/trunk/modules/Activities/updateRelations.php
Message-ID: <20060630071639.C96D383FEF0@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 30 01:16:35 2006
New Revision: 7694

Log:
query has been modified to maintain contact/activity relation

Modified:
    vtigercrm/trunk/modules/Activities/updateRelations.php

Modified: vtigercrm/trunk/modules/Activities/updateRelations.php
==============================================================================
--- vtigercrm/trunk/modules/Activities/updateRelations.php (original)
+++ vtigercrm/trunk/modules/Activities/updateRelations.php Fri Jun 30 01:16:35 2006
@@ -22,7 +22,7 @@
 		if($id != '')
 		{
 			$record = $_REQUEST['parentid'];
-			$sql = "insert into vtiger_seactivityrel values (".$id.",".$_REQUEST["parentid"].")";
+			$sql = "insert into vtiger_cntactivityrel values (".$id.",".$_REQUEST["parentid"].")";
 			$adb->query($sql);
 		}
 	}
@@ -32,7 +32,7 @@
 elseif(isset($_REQUEST['entityid']) && $_REQUEST['entityid'] != '')
 {
 	$record = $_REQUEST["parid"];
-	$sql = "insert into vtiger_seactivityrel values (". $_REQUEST["entityid"] .",".$_REQUEST["parid"] .")";
+	$sql = "insert into vtiger_cntactivityrel values (". $_REQUEST["entityid"] .",".$_REQUEST["parid"] .")";
 	$adb->query($sql);
 	header("Location: index.php?action=CallRelatedList&module=Activities&activity_mode=Events&record=".$record);
 }



From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 30 00:22:08 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 30 Jun 2006 07:22:08 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7695 -
	/vtigercrm/trunk/modules/Activities/Activity.php
Message-ID: <20060630072208.95BD483FF00@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 30 01:22:05 2006
New Revision: 7695

Log:
vtiger_cntactivityrel has been added in tab_name array

Modified:
    vtigercrm/trunk/modules/Activities/Activity.php

Modified: vtigercrm/trunk/modules/Activities/Activity.php
==============================================================================
--- vtigercrm/trunk/modules/Activities/Activity.php (original)
+++ vtigercrm/trunk/modules/Activities/Activity.php Fri Jun 30 01:22:05 2006
@@ -43,9 +43,10 @@
 	
 	var $reminder_table = "vtiger_activity_reminder";
 	
-	var $tab_name = Array('vtiger_crmentity','vtiger_activity','vtiger_seactivityrel','vtiger_salesmanactivityrel','vtiger_activity_reminder','vtiger_recurringevents','vtiger_invitees');
-
-	var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_activity'=>'activityid','vtiger_seactivityrel'=>'activityid','vtiger_salesmanactivityrel'=>'activityid','vtiger_activity_reminder'=>'activity_id','vtiger_recurringevents'=>'activityid');
+	var $tab_name = Array('vtiger_crmentity','vtiger_activity','vtiger_seactivityrel','vtiger_cntactivityr
+el','vtiger_salesmanactivityrel','vtiger_activity_reminder','vtiger_recurringevents','vtiger_invitees');
+
+	var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_activity'=>'activityid','vtiger_seactivityrel'=>'activityid','vtiger_cntactivityrel'=>'activityid','vtiger_salesmanactivityrel'=>'activityid','vtiger_activity_reminder'=>'activity_id','vtiger_recurringevents'=>'activityid');
 
 	var $column_fields = Array();
 	var $sortby_fields = Array('subject','due_date','date_start','smownerid','activitytype');	//Sorting is added for due date and start date	



From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 30 00:24:28 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 30 Jun 2006 07:24:28 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231390=3A?=
 =?utf-8?q?_Custome_View_Issue_in_Activities?=
In-Reply-To: <076.74b7dccf8426c4468275b28cfd4f7db2@vtiger.fosslabs.com>
References: <076.74b7dccf8426c4468275b28cfd4f7db2@vtiger.fosslabs.com>
Message-ID: <085.c8d95dad0cdd5dae5ec1fc5eaec547f9@vtiger.fosslabs.com>

#1390: Custome View Issue in Activities
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  jeri 
      Type:  defect     |      Status:  new  
  Priority:  critical   |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by mangai):

  * owner:  mangai => jeri

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1390>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 30 00:24:37 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 30 Jun 2006 07:24:37 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231396=3A?=
 =?utf-8?q?_Event_not_getting_displayed_in_contact_Related_List?=
In-Reply-To: <076.ad344c79dc1dc0ab1b64472bf84dc959@vtiger.fosslabs.com>
References: <076.ad344c79dc1dc0ab1b64472bf84dc959@vtiger.fosslabs.com>
Message-ID: <085.7a37edd9777eebd3d8dab2b049f51bf6@vtiger.fosslabs.com>

#1396: Event not getting displayed in contact Related List
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  mangai
      Type:  defect     |      Status:  closed
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mangai):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1396>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 30 01:06:25 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 30 Jun 2006 08:06:25 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7696 - in /vtigercrm/trunk:
 modules/HelpDesk/HelpDesk.php soap/customerportal.php
Message-ID: <20060630080625.B01117E8AD1@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 30 02:06:20 2006
New Revision: 7696

Log:
* Modified to fix the prefix vtiger_ problem

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

Modified: vtigercrm/trunk/modules/HelpDesk/HelpDesk.php
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/HelpDesk.php (original)
+++ vtigercrm/trunk/modules/HelpDesk/HelpDesk.php Fri Jun 30 02:06:20 2006
@@ -280,7 +280,7 @@
 				$where_conditions = " and ( ".$where_conditions." ) ";
 
 			$query .= $where_conditions;
-			$this->db->println("where condition for customer vtiger_portal tickets search : ".$where_conditions);
+			$this->db->println("where condition for customer portal tickets search : ".$where_conditions);
 		}
 
 		$query .= " order by vtiger_crmentity.crmid desc";

Modified: vtigercrm/trunk/soap/customerportal.php
==============================================================================
--- vtigercrm/trunk/soap/customerportal.php (original)
+++ vtigercrm/trunk/soap/customerportal.php Fri Jun 30 02:06:20 2006
@@ -155,7 +155,13 @@
         'array',
         '',
         array(
-                'files' => array('filename'=>'xsd:string','filecontents'=>'tns:xsd:string'),
+                'files' => array(
+					'fileid'=>'xsd:string','type'=>'tns:xsd:string',
+					'filename'=>'xsd:string','type'=>'tns:xsd:string',
+					'filesize'=>'xsd:string','type'=>'tns:xsd:string',
+					'filetype'=>'xsd:string','type'=>'tns:xsd:string',
+					'filecontents'=>'xsd:string','type'=>'tns:xsd:string'
+				),
              )
 );
 
@@ -366,7 +372,7 @@
 		$result['faq'][$k]['faqcreatedtime'] = $adb->query_result($faq_result,$k,'createdtime');
 		$result['faq'][$k]['faqmodifiedtime'] = $adb->query_result($faq_result,$k,'modifiedtime');
 
-		$faq_comment_query = "select * from vtiger_faqcomments where vtiger_faqid=".$faqid." order by createdtime DESC";
+		$faq_comment_query = "select * from vtiger_faqcomments where faqid=".$faqid." order by createdtime DESC";
 		$faq_comment_result = $adb->query($faq_comment_query);
 		$faq_comment_noofrows = $adb->num_rows($faq_comment_result);
 		for($l=0;$l<$faq_comment_noofrows;$l++)
@@ -650,16 +656,19 @@
 
 function get_picklists($picklist_name)
 {
-	global $adb;
+	global $adb, $log;
+	$log->debug("Entering into function get_picklists($picklist_name)");
+	
 	$picklist_array = Array();
 
-	$res = $adb->query("select * from ".$picklist_name);
+	$res = $adb->query("select * from vtiger_".$picklist_name);
 	for($i=0;$i<$adb->num_rows($res);$i++)
 	{
 		$picklist_val = $adb->query_result($res,$i,$picklist_name);
 		$picklist_array[$i] = $picklist_val;
 	}
 
+	$log->debug("Exit from function get_picklists($picklist_name)");
 	return $picklist_array;
 }
 
@@ -678,16 +687,16 @@
 		$filename = $adb->query_result($res,$i,'name');
 		$filepath = $adb->query_result($res,$i,'path');
 
-		$filesize = vtiger_filesize($filepath.$filename);
 		$fileid = $adb->query_result($res,$i,'attachmentsid');
+		$filesize = filesize($filepath.$fileid."_".$filename);
 		$filetype = $adb->query_result($res,$i,'type');
 
-		$filecontents = base64_encode(file_get_contents($filepath.$filename));//fread(fopen($filepath.$filename, "r"), $filesize));
-
+		$filecontents = base64_encode(file_get_contents($filepath.$fileid."_".$filename));//fread(fopen($filepath.$filename, "r"), $filesize));
+
+		$output[$i]['fileid'] = $fileid;
+		$output[$i]['filename'] = $filename;
 		$output[$i]['filetype'] = $filetype;
-		$output[$i]['filename'] = $filename;
 		$output[$i]['filesize'] = $filesize;
-		$output[$i]['fileid'] = $fileid;
 		$output[$i]['filecontents'] = $filecontents;
 	}
 
@@ -702,8 +711,9 @@
 	//decide the file path where we should upload the file in the server
 	$upload_filepath = decideFilePath();
 
-	$upload_dir = $root_directory.'test/upload/';
-	$new_filename = $ticketid.'_'.$filename;
+	$attachmentid = $adb->getUniqueID("vtiger_crmentity");
+
+	$new_filename = $attachmentid.'_'.$filename;
 
 	$data = base64_decode($filecontents);
 
@@ -713,14 +723,13 @@
 	fclose($handle);	
 
 	//Now store this file information in db and relate with the ticket
-	$attachmentid = $adb->getUniqueID("vtiger_crmentity");
 	$date_var = date('YmdHis');
 	$description = 'CustomerPortal Attachment';
 
 	$crmquery = "insert into vtiger_crmentity (crmid,setype,description,createdtime) values('".$attachmentid."','HelpDesk Attachment','".$description."','".$date_var."')";
 	$crmresult = $adb->query($crmquery);
 
-	$attachmentquery = "insert into vtiger_attachments values(".$attachmentid.",'".$new_filename."','".$description."','".$filetype."','".$upload_filepath."')";
+	$attachmentquery = "insert into vtiger_attachments values(".$attachmentid.",'".$filename."','".$description."','".$filetype."','".$upload_filepath."')";
 	$attachmentreulst = $adb->query($attachmentquery);
 
 	$relatedquery = $sql1 = "insert into vtiger_seattachmentsrel values('".$ticketid."','".$attachmentid."')";



From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 30 01:13:03 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 30 Jun 2006 08:13:03 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7697 -
	/customerportal/trunk/login.php
Message-ID: <20060630081303.D75887E8AD1@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 30 02:13:00 2006
New Revision: 7697

Log:
* Added code to redirect the customer to index when he click on browser back after login

Modified:
    customerportal/trunk/login.php

Modified: customerportal/trunk/login.php
==============================================================================
--- customerportal/trunk/login.php (original)
+++ customerportal/trunk/login.php Fri Jun 30 02:13:00 2006
@@ -11,6 +11,12 @@
 
 require_once("language/en_us.lang.php");
 
+ at session_start();
+if(isset($_SESSION['customer_id']) && isset($_SESSION['customer_name']))
+{
+	header("Location: index.php?action=index&module=Tickets");
+	exit;
+}
 if($_REQUEST['close_window'] == 'true')
 {
    ?>



From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 30 02:58:20 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 30 Jun 2006 09:58:20 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231390=3A?=
 =?utf-8?q?_Custome_View_Issue_in_Activities?=
In-Reply-To: <076.74b7dccf8426c4468275b28cfd4f7db2@vtiger.fosslabs.com>
References: <076.74b7dccf8426c4468275b28cfd4f7db2@vtiger.fosslabs.com>
Message-ID: <085.ca6a90dfbe85d8fc2deff6107f4cd7b1@vtiger.fosslabs.com>

#1390: Custome View Issue in Activities
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  jeri  
      Type:  defect     |      Status:  closed
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 (In [7698]) Issue in Activities has been fixed.Fixes #1390

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1390>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 30 02:58:21 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 30 Jun 2006 09:58:21 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7698 -
	/vtigercrm/trunk/modules/CustomView/CustomView.php
Message-ID: <20060630095821.D1E237726B9@vtiger.fosslabs.com>

Author: richie
Date: Fri Jun 30 03:58:17 2006
New Revision: 7698

Log:
Issue in Activities has been fixed.Fixes #1390

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 Fri Jun 30 03:58:17 2006
@@ -79,7 +79,11 @@
 		$this->smownerid = $current_user->id;
 	}
 
-	// Mike Crowe Mod --------------------------------------------------------getViewId
+
+	/** To get the customViewId of the specified module 
+	  * @param $module -- The module Name:: Type String
+	  * @returns  customViewId :: Type Integer 
+	 */	
 	function getViewId($module)
 	{
 		global $adb;
@@ -108,33 +112,15 @@
 
 	}
 	
-	// Mike Crowe Mod --------------------------------------------------------getGroupId
-	function getGroupId($module)
-	{
-		if(isset($_REQUEST['gname']) == false)
-		{
-			if ( isset($_SESSION["cg$module"]) )
-			{
-				$groupid = $_SESSION["cg$module"];
-			}
-			elseif($this->setdefaultgroupid != "")
-			{
-				$groupid = $this->setdefaultgroupid;
-			}else
-			{
-				$groupid = "0";
-			}
-		}
-		else
-		{
-			$groupid =  $_REQUEST['gname'];
-		}
-		$_SESSION["cg$module"] = $groupid;
-		return $groupid;
-	}
-
-	// to get the available vtiger_customviews for a module
 	// return type array
+	/** to get the details of a customview
+	  * @param $cvid :: Type Integer
+	  * @returns  $customviewlist Array in the following format
+	  * $customviewlist = Array('viewname'=>value,
+	  *                         'setdefault'=>defaultchk,
+	  *                         'setmetrics'=>setmetricschk)   	    
+	 */	
+
 	function getCustomViewByCvid($cvid)
 	{
 		global $adb;
@@ -152,6 +138,13 @@
 		}
 		return $customviewlist;		
 	}	
+
+	/** to get the customviewCombo for the class variable customviewmodule
+	  * @param $viewid :: Type Integer
+	  * $viewid will make the corresponding selected
+	  * @returns  $customviewCombo :: Type String 
+	 */	
+
 	function getCustomViewCombo($viewid='')
 	{
 		global $adb;
@@ -179,6 +172,17 @@
 		}
 		return $shtml;
 	}
+
+	/** to get the getColumnsListbyBlock for the given module and Block 
+	  * @param $module :: Type String 
+	  * @param $block :: Type Integer
+	  * @returns  $columnlist Array in the format 
+	  * $columnlist = Array ($fieldlabel =>'$fieldtablename:$fieldcolname:$fieldname:$module_$fieldlabel1:$fieldtypeofdata',
+	                         $fieldlabel1 =>'$fieldtablename1:$fieldcolname1:$fieldname1:$module_$fieldlabel11:$fieldtypeofdata1',
+					|
+			         $fieldlabeln =>'$fieldtablenamen:$fieldcolnamen:$fieldnamen:$module_$fieldlabel1n:$fieldtypeofdatan')
+	 */	
+
 	function getColumnsListbyBlock($module,$block)
 	{
 		global $adb;
@@ -209,12 +213,12 @@
 		//Added on 14-10-2005 -- added ticket id in list
 		if($module == 'HelpDesk' && $block == 25)
 		{
-			$module_columnlist['crmentity:crmid::HelpDesk_Ticket ID:I'] = 'Ticket ID';
+			$module_columnlist['vtiger_crmentity:crmid::HelpDesk_Ticket_ID:I'] = 'Ticket ID';
 		}
 		//Added to include vtiger_activity type in vtiger_activity vtiger_customview list
 		if($module == 'Activities' && $block == 19)
 		{
-			$module_columnlist['activity:activitytype:activitytype:Activities_Activity Type:C'] = 'Activity Type';
+			$module_columnlist['vtiger_activity:activitytype:activitytype:Activities_Activity_Type:C'] = 'Activity Type';
 		}
 
 		for($i=0; $i<$noofrows; $i++)
@@ -234,7 +238,7 @@
 			{
 				$fieldlabel = "Start Date";
 				if($module == 'Activities' && $block == 19)
-					$module_columnlist['activity:time_start::Activities_Start Time:I'] = 'Start Time';
+					$module_columnlist['vtiger_activity:time_start::Activities_Start_Time:I'] = 'Start Time';
 
 			}
 			$fieldlabel1 = str_replace(" ","_",$fieldlabel);
@@ -249,6 +253,26 @@
 		return $module_columnlist;
 	}
 
+	/** to get the getModuleColumnsList for the given module 
+	  * @param $module :: Type String
+	  * @returns  $ret_module_list Array in the following format
+	  * $ret_module_list = 
+		Array ('module' =>
+				Array('BlockLabel1' => 
+						Array('$fieldtablename:$fieldcolname:$fieldname:$module_$fieldlabel1:$fieldtypeofdata'=>$fieldlabel,
+	                                        Array('$fieldtablename1:$fieldcolname1:$fieldname1:$module_$fieldlabel11:$fieldtypeofdata1'=>$fieldlabel1,
+				Array('BlockLabel2' => 
+						Array('$fieldtablename:$fieldcolname:$fieldname:$module_$fieldlabel1:$fieldtypeofdata'=>$fieldlabel,
+	                                        Array('$fieldtablename1:$fieldcolname1:$fieldname1:$module_$fieldlabel11:$fieldtypeofdata1'=>$fieldlabel1,
+					 |
+				Array('BlockLabeln' => 
+						Array('$fieldtablename:$fieldcolname:$fieldname:$module_$fieldlabel1:$fieldtypeofdata'=>$fieldlabel,
+	                                        Array('$fieldtablename1:$fieldcolname1:$fieldname1:$module_$fieldlabel11:$fieldtypeofdata1'=>$fieldlabel1,
+	 
+
+	 */	
+
+
 	function getModuleColumnsList($module)
 	{
 		foreach($this->module_list[$module] as $key=>$value)
@@ -262,6 +286,14 @@
 		return $ret_module_list;
 	}
 
+	/** to get the getModuleColumnsList for the given customview 
+	  * @param $cvid :: Type Integer
+	  * @returns  $columnlist Array in the following format
+	  * $columnlist = Array( $columnindex => $columnname,
+	  *			 $columnindex1 => $columnname1,  
+	  *					|
+	  *			 $columnindexn => $columnnamen)  
+	  */	
 	function getColumnsListByCvid($cvid)
 	{
 		global $adb;
@@ -270,7 +302,6 @@
 		$sSQL .= " inner join vtiger_customview on vtiger_customview.cvid = vtiger_cvcolumnlist.cvid";
 		$sSQL .= " where vtiger_customview.cvid =".$cvid." order by vtiger_cvcolumnlist.columnindex";
 		$result = $adb->query($sSQL);
-		
 		while($columnrow = $adb->fetch_array($result))
 		{
 			$columnlist[$columnrow['columnindex']] = $columnrow['columnname'];



From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 30 03:01:05 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 30 Jun 2006 10:01:05 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7699 -
	/vtigercrm/trunk/modules/Accounts/ListView.php
Message-ID: <20060630100105.A739C7726B4@vtiger.fosslabs.com>

Author: richie
Date: Fri Jun 30 04:01:02 2006
New Revision: 7699

Log:
function call getGroupId removed as it is not used

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 Fri Jun 30 04:01:02 2006
@@ -76,7 +76,6 @@
 $viewid = $oCustomView->getViewId($currentModule);
 $customviewcombo_html = $oCustomView->getCustomViewCombo($viewid);
 $viewnamedesc = $oCustomView->getCustomViewByCvid($viewid);
-$groupid = $oCustomView->getGroupId($currentModule);
 //<<<<<customview>>>>>
 $smarty->assign("CHANGE_OWNER",getUserslist());
 if(isset($_REQUEST['query']) && $_REQUEST['query'] == 'true')



From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 30 04:20:25 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 30 Jun 2006 11:20:25 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231408=3A?=
 =?utf-8?q?_Member_Of_Hierarchy_To_Be_Viewable_From_Top_Account_Down?=
Message-ID: <076.1537c41e22e8c26ed5018f5cb2afbba9@vtiger.fosslabs.com>

#1408: Member Of Hierarchy To Be Viewable From Top Account Down
-------------------------+--------------------------------------------------
 Reporter:  robbiew      |       Owner:  developer
     Type:  enhancement  |      Status:  new      
 Priority:  major        |   Milestone:           
Component:  vtigercrm    |     Version:  5.0.0    
 Keywords:  member of    |  
-------------------------+--------------------------------------------------
 Member of account hierarchy needs to be viewable from the top level
 account so that member accounts can be viewed

 Robbie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1408>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 30 04:28:56 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 30 Jun 2006 11:28:56 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7700 -
	/vtigercrm/trunk/modules/Accounts/Tickerdetail.php
Message-ID: <20060630112858.B550D18145D@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 30 05:28:44 2006
New Revision: 7700

Log:
file include method has been changed

Modified:
    vtigercrm/trunk/modules/Accounts/Tickerdetail.php

Modified: vtigercrm/trunk/modules/Accounts/Tickerdetail.php
==============================================================================
--- vtigercrm/trunk/modules/Accounts/Tickerdetail.php (original)
+++ vtigercrm/trunk/modules/Accounts/Tickerdetail.php Fri Jun 30 05:28:44 2006
@@ -8,8 +8,8 @@
  * All Rights Reserved.
 *
  ********************************************************************************/
-include("modules/Accounts/Account.php");
-include("getCompanyProfile.php");
+require_once("modules/Accounts/Account.php");
+require_once("getCompanyProfile.php");
 $variable = $_REQUEST['tickersymbol'];
 $url = "http://moneycentral.msn.com/investor/research/profile.asp?Symbol=".trim($variable);
 $data = getComdata($url,trim($variable));



From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 30 04:43:19 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 30 Jun 2006 11:43:19 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231409=3A?=
 =?utf-8?q?_Advanced_Search_in_Invoice_displays_no_values_in_combo=2E?=
Message-ID: <076.a2da11cba0da9c78ff0beaa17549d577@vtiger.fosslabs.com>

#1409: Advanced Search in Invoice displays no values in combo.
-----------------------+----------------------------------------------------
 Reporter:  ahmed      |       Owner:  saraj
     Type:  defect     |      Status:  new  
 Priority:  critical   |   Milestone:       
Component:  vtigercrm  |     Version:  5.0.0
 Keywords:             |  
-----------------------+----------------------------------------------------


-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1409>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 30 04:43:35 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 30 Jun 2006 11:43:35 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7701 -
	/vtigercrm/trunk/class_http/class_http.php
Message-ID: <20060630114335.97A7318150A@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 30 05:43:27 2006
New Revision: 7701

Log:
changes made to get proxy server address

Modified:
    vtigercrm/trunk/class_http/class_http.php

Modified: vtigercrm/trunk/class_http/class_http.php
==============================================================================
--- vtigercrm/trunk/class_http/class_http.php (original)
+++ vtigercrm/trunk/class_http/class_http.php Fri Jun 30 05:43:27 2006
@@ -150,6 +150,7 @@
   PRIVATE getFromUrl() method to scrape content from url.
   */
   function getFromUrl($url, $user="", $pwd="") {
+	  global $adb;
     $this->log .= "getFromUrl() called<br />";
     preg_match("~([a-z]*://)?([^:^/]*)(:([0-9]{1,5}))?(/.*)?~i", $url, $parts);
   	$protocol = $parts[1];
@@ -163,17 +164,24 @@
         $port = "80";
       }
     }
-	$server = '';
-	$port = '';
-	$user = "";    // added
-	$pwd = "";    // added
-	$proxy_cont = '';
-
+    $query = "select * from vtiger_systems where server_type='proxy'";
+    $result = $adb->query($query);
+    $noofrows = $adb->num_rows($result);
+    if($noofrows != 0)
+    {
+	    $server = $adb->query_result($result,0,"server");
+	    $port = $adb->query_result($result,0,"server_port");
+	    $user = $adb->query_result($result,0,"server_username"); // added
+	    $pwd = $adb->query_result($result,0,"server_password");    // added
+    }
+    
 	  if ($path == "") { $path = "/"; }
 
-		if (!$sock = fsockopen($server, $port, $errno, $errstr, $this->connect_timeout)) {
+		if (!$sock = @fsockopen($server, $port, $errno, $errstr, $this->connect_timeout)) {
       $this->log .= "Could not open connection. Error "
         .$errno.": ".$errstr."<br />\n";
+	echo '<b><font color="red">Kindly set proxy server settings under Settings tab</font></b>';
+	die;
       return false;
     }
   if (!$sock)    {return false;}



From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 30 04:52:57 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 30 Jun 2006 11:52:57 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7702 -
	/vtigercrm/trunk/modules/Settings/Save.php
Message-ID: <20060630115257.281BF18153D@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 30 05:52:47 2006
New Revision: 7702

Log:
proxy server settings integrated

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

Modified: vtigercrm/trunk/modules/Settings/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/Save.php (original)
+++ vtigercrm/trunk/modules/Settings/Save.php Fri Jun 30 05:52:47 2006
@@ -10,13 +10,12 @@
  ********************************************************************************/
 
 require_once("include/database/PearDatabase.php");
-
 $server=$_REQUEST['server'];
 $port=$_REQUEST['port'];
 $server_username=$_REQUEST['server_username'];
 $server_password=$_REQUEST['server_password'];
 $server_type = $_REQUEST['server_type'];
-
+$db_update = true;
 if($_REQUEST['smtp_auth'] == 'on' || $_REQUEST['smtp_auth'] == 1)
 	$smtp_auth = 'true';
 else
@@ -25,16 +24,37 @@
 $sql="select * from vtiger_systems where server_type = '".$server_type."'";
 $id=$adb->query_result($adb->query($sql),0,"id");
 
+if($server_type == 'proxy')
+{
+	$action = 'ProxyServerConfig&proxy_server_mode=edit';
+	if (!$sock =@fsockopen($server, $port, $errno, $errstr, 30))
+	{
+		$error_str = 'error=Unable connect to "'.$server.':'.$port.'"';
+		$db_update = false;
+	}else
+	{
+		$url = "http://www.google.co.in";
+		$proxy_cont = '';
+		$sock = fsockopen($server, $port);
+		if (!$sock)    {return false;}
+		fputs($sock, "GET $url HTTP/1.0\r\nHost: $server\r\n");
+		fputs($sock, "Proxy-Authorization: Basic " . base64_encode ("$server_username:$server_password") . "\r\n\r\n");
+		while(!feof($sock)) {$proxy_cont .= fread($sock,4096);}
+		fclose($sock);
+		$proxy_cont = substr($proxy_cont, strpos($proxy_cont,"\r\n\r\n")+4);
+		
+		if(substr_count($proxy_cont, "Cache Access Denied") > 0)
+		{
+			$error_str = 'error=Proxy Authentication Required';
+			$db_update = false;
+		}
+		else
+		{
+			$action = 'ProxyServerConfig';
+		}
+	}
+}
 
-if($id=='')
-{
-	$id = $adb->getUniqueID("vtiger_systems");
-	$sql="insert into vtiger_systems values(" .$id .",'".$server."','".$port."','".$server_username."','".$server_password."','".$server_type."','".$smtp_auth."')";
-}
-else
-	$sql="update vtiger_systems set server = '".$server."', server_username = '".$server_username."', server_password = '".$server_password."', smtp_auth='".$smtp_auth."', server_type = '".$server_type."',server_port='".$port."' where id = ".$id;
-
-$adb->query($sql);
 if($server_type == 'backup')
 {
 	$conn_id = @ftp_connect($server);
@@ -42,11 +62,13 @@
 	if(!$conn_id)
 	{
 		$error_str = 'error=Unable connect to "'.$server.'"';
+		$db_update = false;
 	}else
 	{
 		if(!@ftp_login($conn_id, $server_username, $server_password))
 		{
 			$error_str = 'error=Couldn\'t connect to "'.$server.'" as user "'.$server_username.'"';
+			$db_update = false;
 		}
 		else
 		{
@@ -56,17 +78,17 @@
 	}
 }
 
-if($server_type == 'proxy')
+if($db_update)
 {
-	$action = 'ProxyServerConfig&proxy_server_mode=edit';
-	if (!$sock = fsockopen($server, $port, $errno, $errstr, 30))
+	if($id=='')
 	{
-	       $error_str = $errstr.' : '.$errno ;
-	}else
-	{
-	       $action = 'ProxyServerConfig';
-	        fclose($sock);
+		$id = $adb->getUniqueID("vtiger_systems");
+		$sql="insert into vtiger_systems values(" .$id .",'".$server."','".$port."','".$server_username."','".$server_password."','".$server_type."','".$smtp_auth."')";
 	}
+	else
+		$sql="update vtiger_systems set server = '".$server."', server_username = '".$server_username."', server_password = '".$server_password."', smtp_auth='".$smtp_auth."', server_type = '".$server_type."',server_port='".$port."' where id = ".$id;
+
+	$adb->query($sql);
 }
 
 //Added code to send a test mail to the currently logged in user



From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 30 04:57:43 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 30 Jun 2006 11:57:43 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231410=3A?=
 =?utf-8?q?_Inconsistency_when_saving_invoice_after_deleting_product?=
Message-ID: <076.2d85198f0b3d6e7494586a658db2fc52@vtiger.fosslabs.com>

#1410: Inconsistency when saving invoice after deleting product
-----------------------+----------------------------------------------------
 Reporter:  ahmed      |       Owner:  mickie
     Type:  defect     |      Status:  new   
 Priority:  critical   |   Milestone:        
Component:  vtigercrm  |     Version:  5.0.0 
 Keywords:             |  
-----------------------+----------------------------------------------------


-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1410>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 30 05:36:46 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 30 Jun 2006 12:36:46 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231412=3A?=
 =?utf-8?q?_Unable_to_add_Users_in_Event_Related_List?=
Message-ID: <076.dc27857ee704cc578df6306a717d2b14@vtiger.fosslabs.com>

#1412: Unable to add Users in Event Related List
-----------------------+----------------------------------------------------
 Reporter:  ahmed      |       Owner:  mangai
     Type:  defect     |      Status:  new   
 Priority:  critical   |   Milestone:        
Component:  vtigercrm  |     Version:  5.0.0 
 Keywords:             |  
-----------------------+----------------------------------------------------


-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1412>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 30 05:36:39 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 30 Jun 2006 12:36:39 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231411=3A?=
 =?utf-8?q?_Mail_Merge_functionality_using_Quotes/Invoice_data_fields?=
Message-ID: <076.944f1afdc57609414b2511fad157a0d5@vtiger.fosslabs.com>

#1411: Mail Merge functionality using Quotes/Invoice data fields
-------------------------+--------------------------------------------------
 Reporter:  mickie       |       Owner:  developer
     Type:  enhancement  |      Status:  new      
 Priority:  major        |   Milestone:           
Component:  vtigercrm    |     Version:  5.0.0    
 Keywords:               |  
-------------------------+--------------------------------------------------
 would be to be able to merge the Quotes/Invoice fields into a Word or RTF
 file. This way the user can easily design the Quotes/Inovice layout
 according to his/her wishes.
 Ref => http://forums.vtiger.com/viewtopic.php?t=6978

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1411>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 30 05:37:49 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 30 Jun 2006 12:37:49 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23223=3A_?=
 =?utf-8?q?Issue_Entering_ticker_symbol?=
In-Reply-To: <076.77f0327f73033d13477d5b03eb082e2c@vtiger.fosslabs.com>
References: <076.77f0327f73033d13477d5b03eb082e2c@vtiger.fosslabs.com>
Message-ID: <085.41cb0fa680e65441e28040c0e009d901@vtiger.fosslabs.com>

#223: Issue Entering ticker symbol
---------------------------+------------------------------------------------
  Reporter:  jerrydgeorge  |       Owner:  mangai       
      Type:  enhancement   |      Status:  closed       
  Priority:  major         |   Milestone:               
 Component:  vtigercrm     |     Version:  5.0.0        
Resolution:  fixed         |    Keywords:  ticker symbol
---------------------------+------------------------------------------------
Changes (by mangai):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 fixed and integrated in svn

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/223>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 30 05:41:17 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 30 Jun 2006 12:41:17 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231413=3A?=
	=?utf-8?q?_HelpDesk_ticket_to_Invoice?=
Message-ID: <076.14a1e485add272281c4096c85fbf8a77@vtiger.fosslabs.com>

#1413: HelpDesk ticket to Invoice
-------------------------+--------------------------------------------------
 Reporter:  mickie       |       Owner:  developer
     Type:  enhancement  |      Status:  new      
 Priority:  major        |   Milestone:           
Component:  vtigercrm    |     Version:  5.0.1    
 Keywords:               |  
-------------------------+--------------------------------------------------
 would like to be able to create an invoice straight from a helpdesk
 ticket. I have never been able to use mail merge reliably, because I do
 not use IE. I like how invoices can be created from quotes and it would be
 nice to be able to do the same with tickets.
 Ref ==> http://forums.vtiger.com/viewtopic.php?t=7858

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1413>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 30 05:45:53 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 30 Jun 2006 12:45:53 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231414=3A?=
 =?utf-8?q?_Searching_Activities_by_ActivityType_from_Custom_View_does_not?=
 =?utf-8?q?_show_any_result?=
Message-ID: <076.58b65d03d785097bb14a301cda2997bc@vtiger.fosslabs.com>

#1414: Searching Activities by ActivityType from Custom View does not show any
result
-----------------------+----------------------------------------------------
 Reporter:  ahmed      |       Owner:  jeri 
     Type:  defect     |      Status:  new  
 Priority:  critical   |   Milestone:       
Component:  vtigercrm  |     Version:  5.0.0
 Keywords:             |  
-----------------------+----------------------------------------------------


-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1414>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 30 05:54:33 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 30 Jun 2006 12:54:33 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7703 - in
 /vtigercrm/trunk/soap: vtigerolservice.php wordplugin.php
Message-ID: <20060630125433.D4E55181709@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 30 06:54:27 2006
New Revision: 7703

Log:
checked vtiger_ prefix and neat alighned

Modified:
    vtigercrm/trunk/soap/vtigerolservice.php
    vtigercrm/trunk/soap/wordplugin.php

Modified: vtigercrm/trunk/soap/vtigerolservice.php
==============================================================================
--- vtigercrm/trunk/soap/vtigerolservice.php (original)
+++ vtigercrm/trunk/soap/vtigerolservice.php Fri Jun 30 06:54:27 2006
@@ -288,7 +288,7 @@
 function AddMessageToContact($username,$contactid,$msgdtls)
 {
 	global $adb;
-     require_once('modules/Users/User.php');
+	require_once('modules/Users/User.php');
 	require_once('modules/Emails/Email.php');
 	
 	$seed_user = new User();
@@ -296,40 +296,40 @@
 	
 	foreach($msgdtls as $msgdtl)
 	{
-     	if(isset($msgdtl))
-     	{    
-          	$email = new Email();
-               //$log->debug($msgdtls['contactid']);
-          	$email_body = str_replace("'", "''", $msgdtl['body']);
-          	$email_subject = str_replace("'", "''",$msgdtl['subject']);
-          	$date_sent = getDisplayDate($msgdtl['datesent']);
-                
-          	$email->column_fields[subject] = $email_subject;
-          	$email->column_fields[assigned_user_id] = $user_id;
-          	$email->column_fields[date_start] = $date_sent;
-          	$email->column_fields[description]  = htmlentities($email_body);
-         	$email->column_fields[activitytype] = 'Emails'; 
-          	$email->save("Emails");
-          
-          	$email->set_emails_contact_invitee_relationship($email->id,$contactid);
-          	$email->set_emails_se_invitee_relationship($email->id,$contactid);
-          	$email->set_emails_user_invitee_relationship($email->id,$user_id);
-		$sql = "select email from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid where vtiger_crmentity.deleted =0 and vtiger_contactdetails.contactid='".$contactid."'";
-		$result = $adb->query($sql);
-		$camodulerow = $adb->fetch_array($result);
-		if(isset($camodulerow))
-		{
-			$emailid = $camodulerow["email"];
-			$query = 'insert into vtiger_emaildetails values ('.$email->id.',"","'.$emailid.'","","","","'.$cotactid."@77|".'","OUTLOOK")';
-			$adb->query($query);
-		}
-		return $email->id;
-          }
-          else
-          {
-               return "";
-          }
-     }
+     		if(isset($msgdtl))
+     		{    
+          		$email = new Email();
+			//$log->debug($msgdtls['contactid']);
+			$email_body = str_replace("'", "''", $msgdtl['body']);
+			$email_subject = str_replace("'", "''",$msgdtl['subject']);
+			$date_sent = getDisplayDate($msgdtl['datesent']);
+
+			$email->column_fields[subject] = $email_subject;
+			$email->column_fields[assigned_user_id] = $user_id;
+			$email->column_fields[date_start] = $date_sent;
+			$email->column_fields[description]  = htmlentities($email_body);
+			$email->column_fields[activitytype] = 'Emails'; 
+			$email->save("Emails");
+
+			$email->set_emails_contact_invitee_relationship($email->id,$contactid);
+			$email->set_emails_se_invitee_relationship($email->id,$contactid);
+			$email->set_emails_user_invitee_relationship($email->id,$user_id);
+			$sql = "select email from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid where vtiger_crmentity.deleted =0 and vtiger_contactdetails.contactid='".$contactid."'";
+			$result = $adb->query($sql);
+			$camodulerow = $adb->fetch_array($result);
+			if(isset($camodulerow))
+			{
+				$emailid = $camodulerow["email"];
+				$query = 'insert into vtiger_emaildetails values ('.$email->id.',"","'.$emailid.'","","","","'.$cotactid."@77|".'","OUTLOOK")';
+				$adb->query($query);
+			}
+			return $email->id;
+		}
+		else
+		{
+			return "";
+		}
+	}
 }
 
 function LoginToVtiger($userid,$password)
@@ -363,74 +363,74 @@
 
 function AddEmailAttachment($emailid,$filedata,$filename,$filesize,$filetype,$username)
 {
-     global $adb;
-     require_once('modules/Users/User.php');
-     require_once('include/utils/utils.php');
-     
-     $date_var = date('YmdHis');
-     
-     $seed_user = new User();
-     $user_id = $seed_user->retrieve_user_id($username);
-     	
-     $crmid = $adb->getUniqueID("vtiger_crmentity");
-     
-     $upload_file_path = decideFilePath();
-   	
-     $handle = fopen($upload_file_path.$filename,"wb");
-     fwrite($handle,base64_decode($filedata),$filesize);
-     fclose($handle);
-
-     $sql1 = "insert into vtiger_crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime,modifiedtime) 
-     values(".$crmid.",".$user_id.",".$user_id.",'Emails Attachment',' ',".$adb->formatString("crmentity","createdtime",$date_var).",".$adb->formatString("crmentity","modifiedtime",$date_var).")";
-     
-     $entityresult = $adb->query($sql1);	
-     $filetype="application/octet-stream";
-     
-     if($entityresult != false)
-     {
-    	$sql2="insert into vtiger_attachments(attachmentsid, name, description, type, path) 
-               values(".$crmid.",'".$filename."',' ','".$filetype."','".$upload_file_path."')";
-    	    
-        $result=$adb->query($sql2);
-     
-        $sql3='insert into vtiger_seattachmentsrel values('.$emailid.','.$crmid.')';
-        $adb->query($sql3);
-     
-        return $crmid;   
-     }
-     else
-     {
-   		 //$server->setError("Invalid username and/or password"); 
-          return "";
-     }
+	global $adb;
+	require_once('modules/Users/User.php');
+	require_once('include/utils/utils.php');
+
+	$date_var = date('YmdHis');
+
+	$seed_user = new User();
+	$user_id = $seed_user->retrieve_user_id($username);
+
+	$crmid = $adb->getUniqueID("vtiger_crmentity");
+
+	$upload_file_path = decideFilePath();
+
+	$handle = fopen($upload_file_path.$crmid."_".$filename,"wb");
+	fwrite($handle,base64_decode($filedata),$filesize);
+	fclose($handle);
+
+	$sql1 = "insert into vtiger_crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime,modifiedtime) 
+			values(".$crmid.",".$user_id.",".$user_id.",'Emails Attachment',' ',".$adb->formatString("vtiger_crmentity","createdtime",$date_var).",".$adb->formatString("vtiger_crmentity","modifiedtime",$date_var).")";
+
+	$entityresult = $adb->query($sql1);	
+	$filetype="application/octet-stream";
+
+	if($entityresult != false)
+	{
+		$sql2="insert into vtiger_attachments(attachmentsid, name, description, type, path) 
+				values(".$crmid.",'".$filename."',' ','".$filetype."','".$upload_file_path."')";
+
+		$result=$adb->query($sql2);
+
+		$sql3='insert into vtiger_seattachmentsrel values('.$emailid.','.$crmid.')';
+		$adb->query($sql3);
+
+		return $crmid;   
+	}
+	else
+	{
+		//$server->setError("Invalid username and/or password"); 
+		return "";
+	}
 }
 
 function GetContacts($username)
 {
-    global $adb;
-    require_once('modules/Contacts/Contact.php');
-     
-    $seed_contact = new Contact();
-    $output_list = Array();
-     
-    $query = $seed_contact->get_contactsforol($username);
-    $result = $adb->query($query);
-    
-    while($contact = $adb->fetch_array($result))
-  	{
-        if($contact["birthdate"] == "0000-00-00")
-        {
-	        	$contact["birthdate"] = "";
-        }
-        if($contact["salutation"] == "--None--")
-        {
-          	$contact["salutation"] = "";
-        }
-        
-        $namelist = explode(" ", $contact["last_name"]);
-        if(isset($namelist))
-        {
-        	if(count($namelist) >= 2) 
+	global $adb;
+	require_once('modules/Contacts/Contact.php');
+
+	$seed_contact = new Contact();
+	$output_list = Array();
+
+	$query = $seed_contact->get_contactsforol($username);
+	$result = $adb->query($query);
+
+	while($contact = $adb->fetch_array($result))
+	{
+		if($contact["birthdate"] == "0000-00-00")
+		{
+			$contact["birthdate"] = "";
+		}
+		if($contact["salutation"] == "--None--")
+		{
+			$contact["salutation"] = "";
+		}
+
+		$namelist = explode(" ", $contact["last_name"]);
+		if(isset($namelist))
+		{
+			if(count($namelist) >= 2) 
 			{
 				$contact["last_name"] = $namelist[count($namelist)-1];       	
 				for($i=0; $i<count($namelist)-2; $i++)
@@ -442,7 +442,7 @@
 					$middlename = implode(" ",$middlename);
 				}
 			}
-        }
+		}
 
 		$output_list[] = Array(
 				"id" => $contact["id"],
@@ -476,11 +476,11 @@
 				"description" => "",
 				"category" => "",        
 			  	);
-  	}
-  	
-    //to remove an erroneous compiler warning
-    $seed_contact = $seed_contact;
-    return $output_list;
+	}
+
+	//to remove an erroneous compiler warning
+	$seed_contact = $seed_contact;
+	return $output_list;
 }
 
 function AddContacts($username,$cntdtls)
@@ -499,44 +499,46 @@
 	
 	foreach($cntdtls as $cntrow)
 	{
-      if(isset($cntrow))
-      {
-  			$contact->column_fields[salutation]=$cntrow["title"];		
-      	$contact->column_fields[firstname]=$cntrow["firstname"];
-      	if($cntrow["middlename"] != "")
-      	{
-      		$contact->column_fields[lastname]=$cntrow["middlename"]." ".$cntrow["lastname"];
-      	}else
-      	{
-      		$contact->column_fields[lastname]=$cntrow["lastname"];
-      	}
-      	$contact->column_fields[birthday]= getDisplayDate($cntrow["birthdate"]);
-      	$contact->column_fields[email]=$cntrow["emailaddress"];
-      	$contact->column_fields[title]=$cntrow["jobtitle"];
-      	$contact->column_fields[department]=$cntrow["department"];
-      	$contact->column_fields[account_id]= retrieve_account_id($cntrow["accountname"],$user_id);
-          $contact->column_fields[phone]= $cntrow["officephone"];
-          $contact->column_fields[homephone]= $cntrow["homephone"];
-          $contact->column_fields[otherphone]= $cntrow["otherphone"];
-          $contact->column_fields[fax]= $cntrow["fax"];
-      	$contact->column_fields[mobile]=$cntrow["mobile"];
-      	$contact->column_fields[assistant]= $cntrow["asstname"];
-          $contact->column_fields[assistantphone]= $cntrow["asstphone"];     
-      	//$contact->column_fields[reports_to_id] =retrievereportsto($reportsto,$user_id,$account_id);// NOT FIXED IN SAVEENTITY.PHP
-      	$contact->column_fields[mailingstreet]=$cntrow["mailingstreet"];
-      	$contact->column_fields[mailingcity]=$cntrow["mailingcity"];
-      	$contact->column_fields[mailingstate]=$cntrow["mailingstate"];
-      	$contact->column_fields[mailingzip]=$cntrow["mailingzip"];
-      	$contact->column_fields[mailingcountry]=$cntrow["mailingcountry"];    
-      	$contact->column_fields[otherstreet]=$cntrow["otherstreet"];
-      	$contact->column_fields[othercity]=$cntrow["othercity"];
-      	$contact->column_fields[otherstate]=$cntrow["otherstate"];
-      	$contact->column_fields[otherzip]=$cntrow["otherzip"];
-      	$contact->column_fields[othercountry]=$cntrow["othercountry"];    	
-          $contact->column_fields[assigned_user_id]=$user_id;   
-  		$contact->column_fields[description]= $cntrow["description"];
-       	$contact->save("Contacts");	
-			}	
+		if(isset($cntrow))
+		{
+			$contact->column_fields[salutation]=$cntrow["title"];		
+ 			$contact->column_fields[firstname]=$cntrow["firstname"];
+			
+			if($cntrow["middlename"] != "")
+			{
+				$contact->column_fields[lastname]=$cntrow["middlename"]." ".$cntrow["lastname"];
+			}else
+			{
+				$contact->column_fields[lastname]=$cntrow["lastname"];
+			}
+
+			$contact->column_fields[birthday]= getDisplayDate($cntrow["birthdate"]);
+			$contact->column_fields[email]=$cntrow["emailaddress"];
+			$contact->column_fields[title]=$cntrow["jobtitle"];
+			$contact->column_fields[department]=$cntrow["department"];
+			$contact->column_fields[account_id]= retrieve_account_id($cntrow["accountname"],$user_id);
+			$contact->column_fields[phone]= $cntrow["officephone"];
+			$contact->column_fields[homephone]= $cntrow["homephone"];
+			$contact->column_fields[otherphone]= $cntrow["otherphone"];
+			$contact->column_fields[fax]= $cntrow["fax"];
+			$contact->column_fields[mobile]=$cntrow["mobile"];
+			$contact->column_fields[assistant]= $cntrow["asstname"];
+			$contact->column_fields[assistantphone]= $cntrow["asstphone"];     
+			//$contact->column_fields[reports_to_id] =retrievereportsto($reportsto,$user_id,$account_id);// NOT FIXED IN SAVEENTITY.PHP
+			$contact->column_fields[mailingstreet]=$cntrow["mailingstreet"];
+			$contact->column_fields[mailingcity]=$cntrow["mailingcity"];
+			$contact->column_fields[mailingstate]=$cntrow["mailingstate"];
+			$contact->column_fields[mailingzip]=$cntrow["mailingzip"];
+			$contact->column_fields[mailingcountry]=$cntrow["mailingcountry"];    
+			$contact->column_fields[otherstreet]=$cntrow["otherstreet"];
+			$contact->column_fields[othercity]=$cntrow["othercity"];
+			$contact->column_fields[otherstate]=$cntrow["otherstate"];
+			$contact->column_fields[otherzip]=$cntrow["otherzip"];
+			$contact->column_fields[othercountry]=$cntrow["othercountry"];    	
+			$contact->column_fields[assigned_user_id]=$user_id;   
+			$contact->column_fields[description]= $cntrow["description"];
+			$contact->save("Contacts");	
+		}	
 	}
 	$contact = $contact;	
 	return $contact->id;
@@ -558,47 +560,47 @@
 	
 	foreach($cntdtls as $cntrow)
 	{
-      if(isset($cntrow))
-      {
-				$contact->retrieve_entity_info($cntrow["id"],"Contacts");
-  			$contact->column_fields[salutation]=$cntrow["title"];		
-      	$contact->column_fields[firstname]=$cntrow["firstname"];
-      	if($cntrow["middlename"] != "")
-      	{
-      		$contact->column_fields[lastname]=$cntrow["middlename"]." ".$cntrow["lastname"];
-      	}else
-      	{
-      		$contact->column_fields[lastname]=$cntrow["lastname"];
-      	}
-      	$contact->column_fields[birthday]= getDisplayDate($cntrow["birthdate"]);
-      	$contact->column_fields[email]=$cntrow["emailaddress"];
-      	$contact->column_fields[title]=$cntrow["jobtitle"];
-      	$contact->column_fields[department]=$cntrow["department"];
-      	$contact->column_fields[account_id]= retrieve_account_id($cntrow["accountname"],$user_id);
-        $contact->column_fields[phone]= $cntrow["officephone"];
-        $contact->column_fields[homephone]= $cntrow["homephone"];
-        $contact->column_fields[otherphone]= $cntrow["otherphone"];
-        $contact->column_fields[fax]= $cntrow["fax"];
-      	$contact->column_fields[mobile]=$cntrow["mobile"];
-      	$contact->column_fields[assistant]= $cntrow["asstname"];
-        $contact->column_fields[assistantphone]= $cntrow["asstphone"];     
-      	//$contact->column_fields[reports_to_id] =retrievereportsto($reportsto,$user_id,$account_id);// NOT FIXED IN SAVEENTITY.PHP
-      	$contact->column_fields[mailingstreet]=$cntrow["mailingstreet"];
-      	$contact->column_fields[mailingcity]=$cntrow["mailingcity"];
-      	$contact->column_fields[mailingstate]=$cntrow["mailingstate"];
-      	$contact->column_fields[mailingzip]=$cntrow["mailingzip"];
-      	$contact->column_fields[mailingcountry]=$cntrow["mailingcountry"];    
-      	$contact->column_fields[otherstreet]=$cntrow["otherstreet"];
-      	$contact->column_fields[othercity]=$cntrow["othercity"];
-      	$contact->column_fields[otherstate]=$cntrow["otherstate"];
-      	$contact->column_fields[otherzip]=$cntrow["otherzip"];
-      	$contact->column_fields[othercountry]=$cntrow["othercountry"];    	
-        $contact->column_fields[assigned_user_id]=$user_id;   
-  		  $contact->column_fields[description]= $cntrow["description"];
-  		  $contact->id = $cntrow["id"];
-  		  $contact->mode = "edit";
-       	$contact->save("Contacts");	
-			}	
+		if(isset($cntrow))
+		{
+			$contact->retrieve_entity_info($cntrow["id"],"Contacts");
+			$contact->column_fields[salutation]=$cntrow["title"];		
+			$contact->column_fields[firstname]=$cntrow["firstname"];
+			if($cntrow["middlename"] != "")
+			{
+				$contact->column_fields[lastname]=$cntrow["middlename"]." ".$cntrow["lastname"];
+			}else
+			{
+				$contact->column_fields[lastname]=$cntrow["lastname"];
+			}
+			$contact->column_fields[birthday]= getDisplayDate($cntrow["birthdate"]);
+			$contact->column_fields[email]=$cntrow["emailaddress"];
+			$contact->column_fields[title]=$cntrow["jobtitle"];
+			$contact->column_fields[department]=$cntrow["department"];
+			$contact->column_fields[account_id]= retrieve_account_id($cntrow["accountname"],$user_id);
+			$contact->column_fields[phone]= $cntrow["officephone"];
+			$contact->column_fields[homephone]= $cntrow["homephone"];
+			$contact->column_fields[otherphone]= $cntrow["otherphone"];
+			$contact->column_fields[fax]= $cntrow["fax"];
+			$contact->column_fields[mobile]=$cntrow["mobile"];
+			$contact->column_fields[assistant]= $cntrow["asstname"];
+			$contact->column_fields[assistantphone]= $cntrow["asstphone"];     
+			//$contact->column_fields[reports_to_id] =retrievereportsto($reportsto,$user_id,$account_id);// NOT FIXED IN SAVEENTITY.PHP
+			$contact->column_fields[mailingstreet]=$cntrow["mailingstreet"];
+			$contact->column_fields[mailingcity]=$cntrow["mailingcity"];
+			$contact->column_fields[mailingstate]=$cntrow["mailingstate"];
+			$contact->column_fields[mailingzip]=$cntrow["mailingzip"];
+			$contact->column_fields[mailingcountry]=$cntrow["mailingcountry"];    
+			$contact->column_fields[otherstreet]=$cntrow["otherstreet"];
+			$contact->column_fields[othercity]=$cntrow["othercity"];
+			$contact->column_fields[otherstate]=$cntrow["otherstate"];
+			$contact->column_fields[otherzip]=$cntrow["otherzip"];
+			$contact->column_fields[othercountry]=$cntrow["othercountry"];    	
+			$contact->column_fields[assigned_user_id]=$user_id;   
+			$contact->column_fields[description]= $cntrow["description"];
+			$contact->id = $cntrow["id"];
+			$contact->mode = "edit";
+			$contact->save("Contacts");	
+		}	
 	}	
 	$contact = $contact;
 	return $contact->id;
@@ -606,62 +608,62 @@
 
 function DeleteContacts($username,$crmid)
 {
-  global $current_user;
+	global $current_user;
 	require_once('modules/Users/User.php');
 	require_once('modules/Contacts/Contact.php');
-	 
+
 	$seed_user = new User();
 	$user_id = $seed_user->retrieve_user_id($username);
 	$current_user = $seed_user;
 	$current_user->retrieve($user_id);
- 
-  $contact = new Contact();
-  $contact->id = $crmid;
-  $contact->mark_deleted($contact->id);
-  
-  $contact = $contact;
-  return $contact->id;
+
+	$contact = new Contact();
+	$contact->id = $crmid;
+	$contact->mark_deleted($contact->id);
+
+	$contact = $contact;
+	return $contact->id;
 }
 
 function retrieve_account_id($account_name,$user_id)
 {
-    
-		if($account_name=="")
-    {
-        return null;
-    }
-
-    $query = "select vtiger_account.accountname vtiger_accountname,vtiger_account.accountid vtiger_accountid from vtiger_account inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_account.accountid where vtiger_crmentity.deleted=0 and vtiger_account.accountname='" .$account_name."'";
-
-
-	  $db = new PearDatabase();
-    $result=  $db->query($query) or die ("Not able to execute insert");
-    
-    $rows_count =  $db->getRowCount($result);
-    if($rows_count==0)
-    {
-    	require_once('modules/Accounts/Account.php');
-	    $account = new Account();
-    	$account->column_fields[accountname] = $account_name;
-    	$account->column_fields[assigned_user_id]=$user_id;
-    	//$account->saveentity("Accounts");
-    	$account->save("Accounts");
-        //mysql_close();
-    	return $account->id;
-    }
-    else if ($rows_count==1)
-    {
-        $row = $db->fetchByAssoc($result, 0);
-        //mysql_close();
-        return $row["accountid"];	    
-    }
-    else
-    {
-        $row = $db->fetchByAssoc($result, 0);
-        //mysql_close();
-        return $row["accountid"];	    
-    }
-    
+
+	if($account_name=="")
+	{
+		return null;
+	}
+
+	$query = "select vtiger_account.accountname accountname,vtiger_account.accountid accountid from vtiger_account inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_account.accountid where vtiger_crmentity.deleted=0 and vtiger_account.accountname='" .$account_name."'";
+
+
+	$db = new PearDatabase();
+	$result=  $db->query($query) or die ("Not able to execute insert");
+
+	$rows_count =  $db->getRowCount($result);
+	if($rows_count==0)
+	{
+		require_once('modules/Accounts/Account.php');
+		$account = new Account();
+		$account->column_fields[accountname] = $account_name;
+		$account->column_fields[assigned_user_id]=$user_id;
+		//$account->saveentity("Accounts");
+		$account->save("Accounts");
+		//mysql_close();
+		return $account->id;
+	}
+	else if ($rows_count==1)
+	{
+		$row = $db->fetchByAssoc($result, 0);
+		//mysql_close();
+		return $row["accountid"];	    
+	}
+	else
+	{
+		$row = $db->fetchByAssoc($result, 0);
+		//mysql_close();
+		return $row["accountid"];	    
+	}
+
 }
 
 function GetTasks($username)
@@ -670,52 +672,52 @@
 	require_once('modules/Activities/Activity.php');
 		
 	$seed_task = new Activity();
-    $output_list = Array();
+	$output_list = Array();
   
-    $query = $seed_task->get_tasksforol($username);
-    $result = $adb->query($query);
+	$query = $seed_task->get_tasksforol($username);
+	$result = $adb->query($query);
     
-    while($task = $adb->fetch_array($result))
-  	{
+	while($task = $adb->fetch_array($result))
+	{
   		if($task["startdate"] == "0000-00-00" || $task["startdate"] == NULL)
-        {
-	       	$task["startdate"] = "";
-        }
-        if($task["duedate"] == "0000-00-00" || $task["duedate"] == NULL)
-        {
-	       	$task["duedate"] = "";
-        }
+        	{
+		       	$task["startdate"] = "";
+        	}
+        	if($task["duedate"] == "0000-00-00" || $task["duedate"] == NULL)
+        	{
+		       	$task["duedate"] = "";
+        	}
         
-        if($task["status"] == "Not Started")
-        {
-       		$task["status"] = "0";
-        }else if($task["status"] == "In Progress")
-        {
-        	$task["status"] = "1";
-        }else if($task["status"] == "Completed")
-        {
-        	$task["status"] = "2";
-        }else if($task["status"] == "Deferred")
-        {
-        	$task["status"] = "4";
-        }else if($task["status"] == "Pending Input" || $task["status"] == "Planned")
-        {
-        	$task["status"] = "3";
-        }else
-        {
-        	$task["status"] = "0";
-        }
+        	if($task["status"] == "Not Started")
+        	{
+       			$task["status"] = "0";
+        	}else if($task["status"] == "In Progress")
+        	{
+        		$task["status"] = "1";
+        	}else if($task["status"] == "Completed")
+        	{
+        		$task["status"] = "2";
+        	}else if($task["status"] == "Deferred")
+        	{
+        		$task["status"] = "4";
+        	}else if($task["status"] == "Pending Input" || $task["status"] == "Planned")
+        	{
+        		$task["status"] = "3";
+        	}else
+        	{
+        		$task["status"] = "0";
+        	}
         
-        if($task["priority"] == "High")
-        {
-       		$task["priority"] = "2";
-        }else if($task["priority"] == "Low")
-        {
-        	$task["priority"] = "0";
-        }else if($task["priority"] == "Medium")
-        {
-        	$task["priority"] = "1";
-        }
+        	if($task["priority"] == "High")
+        	{
+       			$task["priority"] = "2";
+        	}else if($task["priority"] == "Low")
+        	{
+        		$task["priority"] = "0";
+        	}else if($task["priority"] == "Medium")
+        	{
+        		$task["priority"] = "1";
+        	}
         
 		$output_list[] = Array(
 						"id" => $task["taskid"],
@@ -728,7 +730,7 @@
 						"contactname" => $task["firstname"]." ".$task["lastname"],
 						"category" => "",        
 						);
-  	}
+	}
 	$seed_task = $seed_task;
 	return $output_list;
 }
@@ -748,8 +750,8 @@
 	
 	foreach($taskdtls as $taskrow)
 	{
-      	if(isset($taskrow))
-      	{
+      		if(isset($taskrow))
+      		{
 			if($taskrow["status"] == "0")
 			{
 				$taskrow["status"] = "Not Started";
@@ -811,8 +813,8 @@
 	
 	foreach($taskdtls as $taskrow)
 	{
-      if(isset($taskrow))
-      {
+		if(isset($taskrow))
+		{
 			if($taskrow["status"] == "0")
 			{
 				$taskrow["status"] = "Not Started";
@@ -833,16 +835,16 @@
 				$taskrow["status"] = "Not Started";
 			}
         
-    		if($taskrow["priority"] == "2")
-            {
-           		$taskrow["priority"] = "High";
-            }else if($taskrow["priority"] == "0")
-            {
-            	$taskrow["priority"] = "Low";
-            }else if($taskrow["priority"] == "1")
-            {
-            	$taskrow["priority"] = "Medium";
-            }
+    			if($taskrow["priority"] == "2")
+			{
+           			$taskrow["priority"] = "High";
+           		}else if($taskrow["priority"] == "0")
+           		{
+           			$taskrow["priority"] = "Low";
+           		}else if($taskrow["priority"] == "1")
+           		{
+           		 	$taskrow["priority"] = "Medium";
+           		}
 					
 			$task->retrieve_entity_info($taskrow["id"],"Activities");
 			$task->column_fields[subject] = $taskrow["subject"];
@@ -859,8 +861,8 @@
 			$task->mode="edit";
 
 			$task->save("Activities");
-      }
-  }
+		}
+	}
 	return $task->id;
 }
 
@@ -892,32 +894,32 @@
 	$query = $seed_clndr->get_calendarsforol($username);
 	$result = $adb->query($query);
     
-    while($clndr = $adb->fetch_array($result))
+	while($clndr = $adb->fetch_array($result))
   	{
   		if($clndr["startdate"] == "0000-00-00" || $clndr["startdate"] == NULL)
-        {
+        	{
 	        	$clndr["startdate"] = "";
-        }
-        if($clndr["duedate"] == "0000-00-00" || $clndr["duedate"] == NULL)
-        {
+		}
+	        if($clndr["duedate"] == "0000-00-00" || $clndr["duedate"] == NULL)
+        	{
 	        	$clndr["duedate"] = "";
-        }
+        	}
 		
-	   //this seperates the $$clndr["startdate"] into an array - YYYY-MM-DD
-	   $expldstartdate = explode("-", $clndr["startdate"]);
-	   $expldtimestart = explode(":", $clndr["startime"]);	
-
-	   $expldduedate = explode("-", $clndr["duedate"]);
-
-	   //this makes a timestamp out of the exploded date this number is in seconds
-	   $startdtm = mktime($expldtimestart[0], $expldtimestart[1], 0, $expldstartdate[1], $expldstartdate[2], $expldstartdate[0]);
-		
-       $duedtm = mktime($expldtimestart[0]+$clndr["duehours"], $expldtimestart[1]+$clndr["dueminutes"], 0, $expldduedate[1], $expldduedate[2], $expldduedate[0]);
-       
-	   $clndr["startdate"] = date("Y-m-d H:i:s", $startdtm);
-	   $clndr["duedate"] = date("Y-m-d H:i:s", $duedtm);
-
-	   $output_list[] = Array(
+		//this seperates the $$clndr["startdate"] into an array - YYYY-MM-DD
+		$expldstartdate = explode("-", $clndr["startdate"]);
+		$expldtimestart = explode(":", $clndr["startime"]);	
+
+		$expldduedate = explode("-", $clndr["duedate"]);
+
+		//this makes a timestamp out of the exploded date this number is in seconds
+		$startdtm = mktime($expldtimestart[0], $expldtimestart[1], 0, $expldstartdate[1], $expldstartdate[2], $expldstartdate[0]);
+
+		$duedtm = mktime($expldtimestart[0]+$clndr["duehours"], $expldtimestart[1]+$clndr["dueminutes"], 0, $expldduedate[1], $expldduedate[2], $expldduedate[0]);
+
+		$clndr["startdate"] = date("Y-m-d H:i:s", $startdtm);
+		$clndr["duedate"] = date("Y-m-d H:i:s", $duedtm);
+
+		$output_list[] = Array(
 						"id" => $clndr["clndrid"],
 						"subject" => $clndr["subject"],
 						"startdate" => $clndr["startdate"],
@@ -947,8 +949,8 @@
 	
 	foreach($clndrdtls as $clndrow)
 	{
-      if(isset($clndrow))
-      {
+		if(isset($clndrow))
+		{
 			$astartdtm = explode(" ",$clndrow["startdate"]);
 			$aduedtm = explode(" ",$clndrow["duedate"]);
 			
@@ -975,8 +977,8 @@
 			$clndr->column_fields[activitytype]="Meeting";
 			$clndr->column_fields[assigned_user_id]=$user_id;
 			$clndr->save("Activities");
-      }
-  }
+		}
+	}
 	return $clndr->id;
 }
 
@@ -996,8 +998,8 @@
 	
 	foreach($clndrdtls as $clndrow)
 	{
-      if(isset($clndrow))
-      {
+		if(isset($clndrow))
+		{
 			$astartdtm = explode(" ",$clndrow["startdate"]);
 			$aduedtm = explode(" ",$clndrow["duedate"]);
 			
@@ -1027,8 +1029,8 @@
 			$clndr->id = $clndrow["id"];
 			$clndr->mode="edit";
 			$clndr->save("Activities");
-      }
-  }
+		}
+	}
 	return $clndr->id;
 }
 
@@ -1052,24 +1054,24 @@
 //To find the Difference between time
 function get_time_difference( $start, $end )
 {
-    $uts['start'] = strtotime( $start );
-    $uts['end'] = strtotime( $end );
-    if( $uts['start']!==-1 && $uts['end']!==-1 )
-    {
-        if( $uts['end'] >= $uts['start'] )
-        {
-            $diff    =    $uts['end'] - $uts['start'];
-            if( $days=intval((floor($diff/86400))) )
-                $diff = $diff % 86400;
-            if( $hours=intval((floor($diff/3600))) )
-                $diff = $diff % 3600;
-            if( $minutes=intval((floor($diff/60))) )
-                $diff = $diff % 60;
-            $diff    =    intval( $diff );            
-            return( array('days'=>$days, 'hours'=>$hours, 'minutes'=>$minutes, 'seconds'=>$diff) );
-        }
-    }
-    return( false );
+	$uts['start'] = strtotime( $start );
+	$uts['end'] = strtotime( $end );
+	if( $uts['start']!==-1 && $uts['end']!==-1 )
+	{
+		if( $uts['end'] >= $uts['start'] )
+		{
+			$diff    =    $uts['end'] - $uts['start'];
+			if( $days=intval((floor($diff/86400))) )
+			$diff = $diff % 86400;
+			if( $hours=intval((floor($diff/3600))) )
+			$diff = $diff % 3600;
+			if( $minutes=intval((floor($diff/60))) )
+			$diff = $diff % 60;
+			$diff    =    intval( $diff );            
+			return( array('days'=>$days, 'hours'=>$hours, 'minutes'=>$minutes, 'seconds'=>$diff) );
+		}
+	}
+	return( false );
 }
 
 $server->service(utf8_encode($HTTP_RAW_POST_DATA)); 

Modified: vtigercrm/trunk/soap/wordplugin.php
==============================================================================
--- vtigercrm/trunk/soap/wordplugin.php (original)
+++ vtigercrm/trunk/soap/wordplugin.php Fri Jun 30 06:54:27 2006
@@ -71,72 +71,67 @@
 	        
 function get_tickets_columns($user_name, $password)
 {
-    require_once('modules/HelpDesk/HelpDesk.php');
-    if(isPermitted("HelpDesk","index") == "yes")
-    { 
-    $helpdesk = new HelpDesk();
-    return $helpdesk->getColumnNames_Hd();
-    }
-    else
-    return null;
+	require_once('modules/HelpDesk/HelpDesk.php');
+	if(isPermitted("HelpDesk","index") == "yes")
+	{ 
+		$helpdesk = new HelpDesk();
+		return $helpdesk->getColumnNames_Hd();
+	}
+	else
+		return null;
 }
 
 function get_contacts_columns($user_name, $password)
 {
-    require_once('modules/Contacts/Contact.php');
-    if(isPermitted("Contacts","index") == "yes")
-    {
-	    $contact = new Contact();
-	    return $contact->getColumnNames();	   
-    }
- else
-    return null;
+	require_once('modules/Contacts/Contact.php');
+	if(isPermitted("Contacts","index") == "yes")
+	{
+		$contact = new Contact();
+		return $contact->getColumnNames();	   
+	}
+	else
+		return null;
 
 }
 
 
 function get_accounts_columns($user_name, $password)
 {
-    require_once('modules/Accounts/Account.php');
-    if(isPermitted("Accounts","index") == "yes")
-    {
-	    $account = new Account();
-	    return $account->getColumnNames_Acnt();
-    }
- else
-    return null;
+	require_once('modules/Accounts/Account.php');
+	if(isPermitted("Accounts","index") == "yes")
+	{
+		$account = new Account();
+		return $account->getColumnNames_Acnt();
+	}
+	else
+		return null;
 
 }
 
 
 function get_leads_columns($user_name, $password)
 {
-    require_once('modules/Leads/Lead.php');
- if(isPermitted("Leads","index") == "yes")
-     {
-    $lead = new Lead();
-    return $lead->getColumnNames_Lead();
-    }
- else
-    return null;
-
+	require_once('modules/Leads/Lead.php');
+	if(isPermitted("Leads","index") == "yes")
+	{
+		$lead = new Lead();
+		return $lead->getColumnNames_Lead();
+	}
+	else
+		return null;
 }
 
 function get_user_columns($user_name, $password)
 {
-    require_once('modules/Users/User.php');
-     if(isPermitted("Users","index") == "yes")
-         {
-		 
-    $user = new User();
-    return $user->getColumnNames_User();
-    }
- else
-    return null;
-
+	require_once('modules/Users/User.php');
+	if(isPermitted("Users","index") == "yes")
+	{
+		$user = new User();
+		return $user->getColumnNames_User();
+	}
+	else
+		return null;
 }
-
-
 
 
 function create_session($user_name, $password)



From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 30 05:56:03 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 30 Jun 2006 12:56:03 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7704 - in /vtigercrm/trunk:
 include/utils/ modules/Accounts/ modules/Activities/ modules/Campaigns/
 modules/Contacts/ modules/Faq/ modules/HelpDesk/ modules/Invoice/
 modules/Leads/ modules/Notes/ modules/Potentials/ modules/PriceBooks/
 modules/Products/ modules/PurchaseOrder/ modules/Quotes/
 modules/SalesOrder/ modules/Vendors/
Message-ID: <20060630125604.81299181752@vtiger.fosslabs.com>

Author: richie
Date: Fri Jun 30 06:55:39 2006
New Revision: 7704

Log:
Added limit values of all listview query in listview

Modified:
    vtigercrm/trunk/include/utils/ListViewUtils.php
    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/Leads/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/include/utils/ListViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/ListViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/ListViewUtils.php Fri Jun 30 06:55:39 2006
@@ -516,7 +516,8 @@
 	}
 	//end
 	if($navigation_array['start'] !=0)
-	for ($i=$navigation_array['start']; $i<=$navigation_array['end_val']; $i++)
+	for ($i=1; $i<=$noofrows; $i++)
+	//for ($i=$navigation_array['start']; $i<=$navigation_array['end_val']; $i++)
 	{
 		$list_header =Array();
 		//Getting the entityid
@@ -1463,7 +1464,6 @@
 					if($module == "Contacts")
 					{
 						$query="SELECT vtiger_contactdetails.imagename FROM vtiger_contactdetails WHERE lastname='".$temp_val."'";
-						//echo $query;
 						$result = $adb->query($query);
 						$imagename=$adb->query_result($result,0,'imagename');
 						if($imagename != '')

Modified: vtigercrm/trunk/modules/Accounts/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Accounts/ListView.php (original)
+++ vtigercrm/trunk/modules/Accounts/ListView.php Fri Jun 30 06:55:39 2006
@@ -76,6 +76,7 @@
 $viewid = $oCustomView->getViewId($currentModule);
 $customviewcombo_html = $oCustomView->getCustomViewCombo($viewid);
 $viewnamedesc = $oCustomView->getCustomViewByCvid($viewid);
+$groupid = $oCustomView->getGroupId($currentModule);
 //<<<<<customview>>>>>
 $smarty->assign("CHANGE_OWNER",getUserslist());
 if(isset($_REQUEST['query']) && $_REQUEST['query'] == 'true')
@@ -170,10 +171,11 @@
                 $query .= ' ORDER BY '.$tablename.$order_by.' '.$sorder;
         }
 }
-$list_result = $adb->query($query);
 
 //Retreiving the no of rows
-$noofrows = $adb->num_rows($list_result);
+
+$count_result = $adb->query("select count(*) count ".substr($query, strpos($query,'FROM'),strlen($query)));
+$noofrows = $adb->query_result($count_result,0,"count");
 
 //Storing Listview session object
 if($_SESSION['lvs'][$currentModule])
@@ -193,6 +195,14 @@
 $start_rec = $navigation_array['start'];
 $end_rec = $navigation_array['end_val']; 
 //By Raju Ends
+
+//limiting the query
+if ($start_rec ==0) 
+	$limit_start_rec = 0;
+else
+	$limit_start_rec = $start_rec -1;
+	
+$list_result = $adb->query($query. " limit ".$limit_start_rec.",".$list_max_entries_per_page);
 
 //mass merge for word templates -- *Raj*17/11
 while($row = $adb->fetch_array($list_result))

Modified: vtigercrm/trunk/modules/Activities/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Activities/ListView.php (original)
+++ vtigercrm/trunk/modules/Activities/ListView.php Fri Jun 30 06:55:39 2006
@@ -135,8 +135,6 @@
         $list_query .= ' ORDER BY '.$tablename.$order_by.' '.$sorder;
 }
 
-$list_result = $adb->query($list_query);
-
 //Constructing the list view
 $smarty->assign("CUSTOMVIEW_OPTION",$customviewcombo_html);
 $smarty->assign("VIEWID", $viewid);
@@ -151,8 +149,16 @@
 
 
 //Retreiving the no of rows
-$noofrows = $adb->num_rows($list_result);
-
+$count_result = $adb->query("select count(*) count ".substr($list_query, strpos($list_query,'FROM'),strlen($list_query)));
+$noofrows = 0;
+if($adb->num_rows($count_result)!=0)
+{
+	for($k=0;$k < $adb->num_rows($count_result);$k++)
+        {
+		$noofrows = $noofrows + $adb->query_result($count_result,$k,"count");
+	}
+}
+										
 //Storing Listview session object
 if($_SESSION['lvs'][$currentModule])
 {
@@ -170,6 +176,13 @@
 $end_rec = $navigation_array['end_val']; 
 //By raju Ends
 
+//limiting the query
+if ($start_rec ==0) 
+	$limit_start_rec = 0;
+else
+	$limit_start_rec = $start_rec -1;
+	
+$list_result = $adb->query($list_query. " limit ".$limit_start_rec.",".$list_max_entries_per_page);
 
 $record_string= $app_strings['LBL_SHOWING']." " .$start_rec." - ".$end_rec." " .$app_strings['LBL_LIST_OF'] ." ".$noofrows;
 

Modified: vtigercrm/trunk/modules/Campaigns/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Campaigns/ListView.php (original)
+++ vtigercrm/trunk/modules/Campaigns/ListView.php Fri Jun 30 06:55:39 2006
@@ -151,11 +151,11 @@
 	$list_query .= ' order by vtiger_campaign.campaignid DESC';
 }
 
-$list_result = $adb->query($list_query);
 //Constructing the list view
 
 //Retreiving the no of rows
-$noofrows = $adb->num_rows($list_result);
+$count_result = $adb->query("select count(*) count ".substr($list_query, strpos($list_query,'FROM'),strlen($list_query)));
+$noofrows = $adb->query_result($count_result,0,"count");
 
 //Storing Listview session object
 if($_SESSION['lvs'][$currentModule])
@@ -173,6 +173,14 @@
 $start_rec = $navigation_array['start'];
 $end_rec = $navigation_array['end_val']; 
 //By Raju Ends
+
+//limiting the query
+if ($start_rec ==0) 
+	$limit_start_rec = 0;
+else
+	$limit_start_rec = $start_rec -1;
+	
+$list_result = $adb->query($list_query. " limit ".$limit_start_rec.",".$list_max_entries_per_page);
 
 //mass merge for word templates -- *Raj*17/11
 while($row = $adb->fetch_array($list_result))

Modified: vtigercrm/trunk/modules/Contacts/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/ListView.php (original)
+++ vtigercrm/trunk/modules/Contacts/ListView.php Fri Jun 30 06:55:39 2006
@@ -169,8 +169,6 @@
         }
 }
 
-$list_result = $adb->query($list_query);
-
 //Constructing the list view
 
 $custom = get_form_header($current_module_strings['LBL_LIST_FORM_TITLE'],$other_text, false);
@@ -183,8 +181,8 @@
 $smarty->assign("CUSTOMVIEW_OPTION",$customviewcombo_html);
 $smarty->assign("VIEWID", $viewid);
 //Retreiving the no of rows
-$noofrows = $adb->num_rows($list_result);
-
+$count_result = $adb->query("select count(*) count ".substr($list_query, strpos($list_query,'FROM'),strlen($list_query)));
+$noofrows = $adb->query_result($count_result,0,"count");
 //Storing Listview session object
 if($_SESSION['lvs'][$currentModule])
 {
@@ -201,6 +199,14 @@
 $start_rec = $navigation_array['start'];
 $end_rec = $navigation_array['end_val']; 
 //By Raju Ends
+
+//limiting the query
+if ($start_rec ==0) 
+	$limit_start_rec = 0;
+else
+	$limit_start_rec = $start_rec -1;
+	
+$list_result = $adb->query($list_query. " limit ".$limit_start_rec.",".$list_max_entries_per_page);
 
 //mass merge for word templates -- *Raj*17/11
 while($row = $adb->fetch_array($list_result))

Modified: vtigercrm/trunk/modules/Faq/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Faq/ListView.php (original)
+++ vtigercrm/trunk/modules/Faq/ListView.php Fri Jun 30 06:55:39 2006
@@ -129,11 +129,7 @@
         $list_query .= ' ORDER BY '.$tablename.$order_by.' '.$sorder;
 }
 
-$list_result = $adb->query($list_query);
-
 //Constructing the list view 
-
-
 
 $smarty->assign("MOD", $mod_strings);
 $smarty->assign("APP", $app_strings);
@@ -143,7 +139,9 @@
 $smarty->assign("CATEGORY",$category);
 $smarty->assign("SINGLE_MOD",'Note');
 //Retreiving the no of rows
-$noofrows = $adb->num_rows($list_result);
+//Retreiving the no of rows
+$count_result = $adb->query("select count(*) count ".substr($list_query, strpos($list_query,'FROM'),strlen($list_query)));
+$noofrows = $adb->query_result($count_result,0,"count");
 
 if($viewnamedesc['viewname'] == 'All')
 {
@@ -166,6 +164,14 @@
 $start_rec = $navigation_array['start'];
 $end_rec = $navigation_array['end_val']; 
 // Raju Ends
+
+//limiting the query
+if ($start_rec ==0) 
+	$limit_start_rec = 0;
+else
+	$limit_start_rec = $start_rec -1;
+	
+$list_result = $adb->query($list_query. " limit ".$limit_start_rec.",".$list_max_entries_per_page);
 
 $record_string= $app_strings[LBL_SHOWING]." " .$start_rec." - ".$end_rec." " .$app_strings[LBL_LIST_OF] ." ".$noofrows;
 

Modified: vtigercrm/trunk/modules/HelpDesk/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/ListView.php (original)
+++ vtigercrm/trunk/modules/HelpDesk/ListView.php Fri Jun 30 06:55:39 2006
@@ -142,13 +142,11 @@
 	$list_query .= ' order by vtiger_troubletickets.ticketid DESC';
 }
 
-
-$list_result = $adb->query($list_query);
-
 //Constructing the list view
 
 //Retreiving the no of rows
-$noofrows = $adb->num_rows($list_result);
+$count_result = $adb->query("select count(*) count ".substr($list_query, strpos($list_query,'FROM'),strlen($list_query)));
+$noofrows = $adb->query_result($count_result,0,"count");
 
 //Storing Listview session object
 if($_SESSION['lvs'][$currentModule])
@@ -166,6 +164,14 @@
 $start_rec = $navigation_array['start'];
 $end_rec = $navigation_array['end_val']; 
 //By Raju Ends
+
+//limiting the query
+if ($start_rec ==0) 
+	$limit_start_rec = 0;
+else
+	$limit_start_rec = $start_rec -1;
+	
+$list_result = $adb->query($list_query. " limit ".$limit_start_rec.",".$list_max_entries_per_page);
 
 //mass merge for word templates -- *Raj*17/11
 while($row = $adb->fetch_array($list_result))

Modified: vtigercrm/trunk/modules/Invoice/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Invoice/ListView.php (original)
+++ vtigercrm/trunk/modules/Invoice/ListView.php Fri Jun 30 06:55:39 2006
@@ -140,10 +140,10 @@
         }
 }
 
-$list_result = $adb->query($query);
 
 //Retreiving the no of rows
-$noofrows = $adb->num_rows($list_result);
+$count_result = $adb->query("select count(*) count ".substr($query, strpos($query,'FROM'),strlen($query)));
+$noofrows = $adb->query_result($count_result,0,"count");
 
 //Storing Listview session object
 if($_SESSION['lvs'][$currentModule])
@@ -162,6 +162,14 @@
 $start_rec = $navigation_array['start'];
 $end_rec = $navigation_array['end_val']; 
 //By Raju Ends
+
+//limiting the query
+if ($start_rec ==0) 
+	$limit_start_rec = 0;
+else
+	$limit_start_rec = $start_rec -1;
+	
+$list_result = $adb->query($query. " limit ".$limit_start_rec.",".$list_max_entries_per_page);
 
 $record_string= $app_strings[LBL_SHOWING]." " .$start_rec." - ".$end_rec." " .$app_strings[LBL_LIST_OF] ." ".$noofrows;
 

Modified: vtigercrm/trunk/modules/Leads/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/ListView.php (original)
+++ vtigercrm/trunk/modules/Leads/ListView.php Fri Jun 30 06:55:39 2006
@@ -171,9 +171,9 @@
         $query .= ' ORDER BY '.$tablename.$order_by.' '.$sorder;
 }
 
-$list_result = $adb->query($query);
 //Retreiving the no of rows
-$noofrows = $adb->num_rows($list_result);
+$count_result = $adb->query("select count(*) count ".substr($query, strpos($query,'FROM'),strlen($query)));
+$noofrows = $adb->query_result($count_result,0,"count");
 
 //Storing Listview session object
 if($_SESSION['lvs'][$currentModule])
@@ -185,6 +185,14 @@
 
 //Retreive the Navigation array
 $navigation_array = getNavigationValues($start, $noofrows, $list_max_entries_per_page);
+
+//limiting the query
+if ($start_rec ==0) 
+	$limit_start_rec = 0;
+else
+	$limit_start_rec = $start_rec -1;
+	
+$list_result = $adb->query($query. " limit ".$limit_start_rec.",".$list_max_entries_per_page);
 
 
 //mass merge for word templates -- *Raj*17/11
@@ -217,6 +225,14 @@
 $end_rec = $navigation_array['end_val']; 
 //By Raju Ends
 
+//limiting the query
+if ($start_rec ==0) 
+	$limit_start_rec = 0;
+else
+	$limit_start_rec = $start_rec -1;
+	
+$list_result = $adb->query($query. " limit ".$limit_start_rec.",".$list_max_entries_per_page);
+
 $record_string= $app_strings[LBL_SHOWING]." " .$start_rec." - ".$end_rec." " .$app_strings[LBL_LIST_OF] ." ".$noofrows;
 
 //Retreive the List View Table Header

Modified: vtigercrm/trunk/modules/Notes/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Notes/ListView.php (original)
+++ vtigercrm/trunk/modules/Notes/ListView.php Fri Jun 30 06:55:39 2006
@@ -149,10 +149,10 @@
         $query .= ' ORDER BY '.$tablename.$order_by.' '.$sorder;
 }
 
-$list_result = $adb->query($query);
 
 //Retreiving the no of rows
-$noofrows = $adb->num_rows($list_result);
+$count_result = $adb->query("select count(*) count ".substr($query, strpos($query,'FROM'),strlen($query)));
+$noofrows = $adb->query_result($count_result,0,"count");
 
 //Storing Listview session object
 if($_SESSION['lvs'][$currentModule])
@@ -170,6 +170,14 @@
 $start_rec = $navigation_array['start'];
 $end_rec = $navigation_array['end_val']; 
 //By raju Ends
+
+//limiting the query
+if ($start_rec ==0) 
+	$limit_start_rec = 0;
+else
+	$limit_start_rec = $start_rec -1;
+	
+$list_result = $adb->query($query. " limit ".$limit_start_rec.",".$list_max_entries_per_page);
 
 
 $record_string= $app_strings[LBL_SHOWING]." " .$start_rec." - ".$end_rec." " .$app_strings[LBL_LIST_OF] ." ".$noofrows;

Modified: vtigercrm/trunk/modules/Potentials/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Potentials/ListView.php (original)
+++ vtigercrm/trunk/modules/Potentials/ListView.php Fri Jun 30 06:55:39 2006
@@ -153,8 +153,6 @@
 
 }
 
-$list_result = $adb->query($list_query);
-
 //Constructing the list view
 
 $smarty->assign("MOD", $mod_strings);
@@ -169,7 +167,8 @@
 
 
 //Retreiving the no of rows
-$noofrows = $adb->num_rows($list_result);
+$count_result = $adb->query("select count(*) count ".substr($list_query, strpos($list_query,'FROM'),strlen($list_query)));
+$noofrows = $adb->query_result($count_result,0,"count");
 
 //Storing Listview session object
 if($_SESSION['lvs'][$currentModule])
@@ -188,6 +187,14 @@
 $start_rec = $navigation_array['start'];
 $end_rec = $navigation_array['end_val']; 
 //By Raju Ends
+
+//limiting the query
+if ($start_rec ==0) 
+	$limit_start_rec = 0;
+else
+	$limit_start_rec = $start_rec -1;
+	
+$list_result = $adb->query($list_query. " limit ".$limit_start_rec.",".$list_max_entries_per_page);
 
 $record_string= $app_strings[LBL_SHOWING]." " .$start_rec." - ".$end_rec." " .$app_strings[LBL_LIST_OF] ." ".$noofrows;
 

Modified: vtigercrm/trunk/modules/PriceBooks/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/PriceBooks/ListView.php (original)
+++ vtigercrm/trunk/modules/PriceBooks/ListView.php Fri Jun 30 06:55:39 2006
@@ -110,10 +110,10 @@
         $list_query .= ' ORDER BY '.$tablename.$order_by.' '.$sorder;
 }
 
-$list_result = $adb->query($list_query);
 
 //Retreiving the no of rows
-$noofrows = $adb->num_rows($list_result);
+$count_result = $adb->query("select count(*) count ".substr($list_query, strpos($list_query,'FROM'),strlen($list_query)));
+$noofrows = $adb->query_result($count_result,0,"count");
 
 //Storing Listview session object
 if($_SESSION['lvs'][$currentModule])
@@ -131,6 +131,14 @@
 $start_rec = $navigation_array['start'];
 $end_rec = $navigation_array['end_val']; 
 //By Raju Ends
+
+//limiting the query
+if ($start_rec ==0) 
+	$limit_start_rec = 0;
+else
+	$limit_start_rec = $start_rec -1;
+	
+$list_result = $adb->query($list_query. " limit ".$limit_start_rec.",".$list_max_entries_per_page);
 
 $record_string= $app_strings[LBL_SHOWING]." " .$start_rec." - ".$end_rec." " .$app_strings[LBL_LIST_OF] ." ".$noofrows;
 

Modified: vtigercrm/trunk/modules/Products/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Products/ListView.php (original)
+++ vtigercrm/trunk/modules/Products/ListView.php Fri Jun 30 06:55:39 2006
@@ -121,11 +121,9 @@
         $list_query .= ' ORDER BY '.$tablename.$order_by.' '.$sorder;
 }
 
-$list_result = $adb->query($list_query);
-
-
 //Retreiving the no of rows
-$noofrows = $adb->num_rows($list_result);
+$count_result = $adb->query("select count(*) count ".substr($list_query, strpos($list_query,'FROM'),strlen($list_query)));
+$noofrows = $adb->query_result($count_result,0,"count");
 
 //Storing Listview session object
 if($_SESSION['lvs'][$currentModule])
@@ -143,6 +141,13 @@
 $end_rec = $navigation_array['end_val']; 
 //By Raju Ends
 
+//limiting the query
+if ($start_rec ==0) 
+	$limit_start_rec = 0;
+else
+	$limit_start_rec = $start_rec -1;
+	
+$list_result = $adb->query($list_query. " limit ".$limit_start_rec.",".$list_max_entries_per_page);
 
 $record_string= $app_strings[LBL_SHOWING]." " .$start_rec." - ".$end_rec." " .$app_strings[LBL_LIST_OF] ." ".$noofrows;
 

Modified: vtigercrm/trunk/modules/PurchaseOrder/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/PurchaseOrder/ListView.php (original)
+++ vtigercrm/trunk/modules/PurchaseOrder/ListView.php Fri Jun 30 06:55:39 2006
@@ -138,10 +138,9 @@
         }
 }
 
-$list_result = $adb->query($query);
-
 //Retreiving the no of rows
-$noofrows = $adb->num_rows($list_result);
+$count_result = $adb->query("select count(*) count ".substr($query, strpos($query,'FROM'),strlen($query)));
+$noofrows = $adb->query_result($count_result,0,"count");
         
 //Storing Listview session object
 if($_SESSION['lvs'][$currentModule])
@@ -160,6 +159,13 @@
 $end_rec = $navigation_array['end_val']; 
 //By Raju Ends
 
+//limiting the query
+if ($start_rec ==0) 
+	$limit_start_rec = 0;
+else
+	$limit_start_rec = $start_rec -1;
+	
+$list_result = $adb->query($query. " limit ".$limit_start_rec.",".$list_max_entries_per_page);
 
 $record_string= $app_strings[LBL_SHOWING]." " .$start_rec." - ".$end_rec." " .$app_strings[LBL_LIST_OF] ." ".$noofrows;
 

Modified: vtigercrm/trunk/modules/Quotes/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Quotes/ListView.php (original)
+++ vtigercrm/trunk/modules/Quotes/ListView.php Fri Jun 30 06:55:39 2006
@@ -138,10 +138,9 @@
         }
 }
 
-$list_result = $adb->query($query);
-
 //Retreiving the no of rows
-$noofrows = $adb->num_rows($list_result);
+$count_result = $adb->query("select count(*) count ".substr($query, strpos($query,'FROM'),strlen($query)));
+$noofrows = $adb->query_result($count_result,0,"count");
 
 //Storing Listview session object
 if($_SESSION['lvs'][$currentModule])
@@ -161,6 +160,13 @@
 $end_rec = $navigation_array['end_val']; 
 //By Raju Ends
 
+//limiting the query
+if ($start_rec ==0) 
+	$limit_start_rec = 0;
+else
+	$limit_start_rec = $start_rec -1;
+	
+$list_result = $adb->query($query. " limit ".$limit_start_rec.",".$list_max_entries_per_page);
 
 $record_string= $app_strings[LBL_SHOWING]." " .$start_rec." - ".$end_rec." " .$app_strings[LBL_LIST_OF] ." ".$noofrows;
 

Modified: vtigercrm/trunk/modules/SalesOrder/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/SalesOrder/ListView.php (original)
+++ vtigercrm/trunk/modules/SalesOrder/ListView.php Fri Jun 30 06:55:39 2006
@@ -125,11 +125,10 @@
         }
 }
 
-$list_result = $adb->query($list_query);
-
 
 //Retreiving the no of rows
-$noofrows = $adb->num_rows($list_result);
+$count_result = $adb->query("select count(*) count ".substr($list_query, strpos($list_query,'FROM'),strlen($list_query)));
+$noofrows = $adb->query_result($count_result,0,"count");
 
 //Storing Listview session object
 if($_SESSION['lvs'][$currentModule])
@@ -148,6 +147,13 @@
 $end_rec = $navigation_array['end_val']; 
 //By Raju Ends
 
+//limiting the query
+if ($start_rec ==0) 
+	$limit_start_rec = 0;
+else
+	$limit_start_rec = $start_rec -1;
+	
+$list_result = $adb->query($list_query. " limit ".$limit_start_rec.",".$list_max_entries_per_page);
 
 $record_string= $app_strings[LBL_SHOWING]." " .$start_rec." - ".$end_rec." " .$app_strings[LBL_LIST_OF] ." ".$noofrows;
 

Modified: vtigercrm/trunk/modules/Vendors/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Vendors/ListView.php (original)
+++ vtigercrm/trunk/modules/Vendors/ListView.php Fri Jun 30 06:55:39 2006
@@ -120,10 +120,9 @@
         $list_query .= ' ORDER BY '.$tablename.$order_by.' '.$sorder;
 }
 
-$list_result = $adb->query($list_query);
-
 //Retreiving the no of rows
-$noofrows = $adb->num_rows($list_result);
+$count_result = $adb->query("select count(*) count ".substr($list_query, strpos($list_query,'FROM'),strlen($list_query)));
+$noofrows = $adb->query_result($count_result,0,"count");
 
 //Storing Listview session object
 if($_SESSION['lvs'][$currentModule])
@@ -140,6 +139,14 @@
 $start_rec = $navigation_array['start'];
 $end_rec = $navigation_array['end_val']; 
 //By raju Ends
+
+//limiting the query
+if ($start_rec ==0) 
+	$limit_start_rec = 0;
+else
+	$limit_start_rec = $start_rec -1;
+	
+$list_result = $adb->query($list_query. " limit ".$limit_start_rec.",".$list_max_entries_per_page);
 
 $record_string= $app_strings[LBL_SHOWING]." " .$start_rec." - ".$end_rec." " .$app_strings[LBL_LIST_OF] ." ".$noofrows;
 



From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 30 06:08:42 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 30 Jun 2006 13:08:42 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231415=3A?=
 =?utf-8?q?_Change_Password_of_Users_Non_functional?=
Message-ID: <076.da83271b37f799418751d0d82a587681@vtiger.fosslabs.com>

#1415: Change Password of Users Non functional
-----------------------+----------------------------------------------------
 Reporter:  ahmed      |       Owner:  Jeri 
     Type:  defect     |      Status:  new  
 Priority:  blocker    |   Milestone:       
Component:  vtigercrm  |     Version:  5.0.0
 Keywords:             |  
-----------------------+----------------------------------------------------


-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1415>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 30 06:13:19 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 30 Jun 2006 13:13:19 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7705 -
	/vtigercrm/trunk/modules/Accounts/ListView.php
Message-ID: <20060630131319.A11751817A3@vtiger.fosslabs.com>

Author: richie
Date: Fri Jun 30 07:13:14 2006
New Revision: 7705

Log:
unwanted function getGroupId 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 Fri Jun 30 07:13:14 2006
@@ -76,7 +76,6 @@
 $viewid = $oCustomView->getViewId($currentModule);
 $customviewcombo_html = $oCustomView->getCustomViewCombo($viewid);
 $viewnamedesc = $oCustomView->getCustomViewByCvid($viewid);
-$groupid = $oCustomView->getGroupId($currentModule);
 //<<<<<customview>>>>>
 $smarty->assign("CHANGE_OWNER",getUserslist());
 if(isset($_REQUEST['query']) && $_REQUEST['query'] == 'true')



From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 30 06:32:37 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 30 Jun 2006 13:32:37 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7706 -
 /vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
Message-ID: <20060630133238.D6498181A01@vtiger.fosslabs.com>

Author: richie
Date: Fri Jun 30 07:32:31 2006
New Revision: 7706

Log:
user relatedlist has been removed

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

Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original)
+++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Fri Jun 30 07:32:31 2006
@@ -1804,15 +1804,6 @@
 	 $this->db->query("insert into vtiger_relatedlists values (".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Campaigns").",".getTabid("Potentials").",'get_opportunities',3,'Potentials',0)");
 	 $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Campaigns").",9,'get_activities',4,'Activities',0)");
 
- //Inserting User Related Lists
- 
-        $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Users").",".getTabid("Activities").",'get_activities',1,'Activities',0)");
- 
-        $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Users").",".getTabid("Contacts").",'get_contacts',2,'Contacts',0)");
- 
-        $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Users").",".getTabid("Users").",'get_user_groups',3,'Groups',0)");
-
-	 
                $this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("vtiger_notificationscheduler").",'LBL_TASK_NOTIFICATION_DESCRITPION',1,'Task Delay Notification','Tasks delayed beyond 24 hrs ','LBL_TASK_NOTIFICATION')");
 
 



From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 30 06:35:04 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 30 Jun 2006 13:35:04 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7707 -
	/vtigercrm/trunk/modules/Dashboard/Entity_charts.php
Message-ID: <20060630133505.6A88C1819F7@vtiger.fosslabs.com>

Author: richie
Date: Fri Jun 30 07:34:57 2006
New Revision: 7707

Log:
vertical_bargraph.php has been included

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 Fri Jun 30 07:34:57 2006
@@ -15,7 +15,7 @@
 require_once('include/database/PearDatabase.php');
 require_once('include/utils/CommonUtils.php');
 include("modules/Dashboard/horizontal_bargraph.php");
-//include("modules/Dashboard/vertical_bargraph.php");
+include("modules/Dashboard/vertical_bargraph.php");
 include("modules/Dashboard/pie_graph.php");
 
 //To get the vtiger_account names



From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 30 06:36:38 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 30 Jun 2006 13:36:38 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7708 -
	/vtigercrm/trunk/modules/Dashboard/HomepageDB.php
Message-ID: <20060630133638.365DA181A08@vtiger.fosslabs.com>

Author: richie
Date: Fri Jun 30 07:36:32 2006
New Revision: 7708

Log:
changes made to integrate vertical chart in home page

Modified:
    vtigercrm/trunk/modules/Dashboard/HomepageDB.php

Modified: vtigercrm/trunk/modules/Dashboard/HomepageDB.php
==============================================================================
--- vtigercrm/trunk/modules/Dashboard/HomepageDB.php (original)
+++ vtigercrm/trunk/modules/Dashboard/HomepageDB.php Fri Jun 30 07:36:32 2006
@@ -38,13 +38,13 @@
                 $cnt_table=$graph_details[6];
 	       	$test_target_val=$graph_details[7];
 
-                $width=400;
+                $width=425;
                 $height=225;
                 $top=30;
                 $left=140;
                 $bottom=120;
                 $title=$graph_title;
-		$sHTML = render_graph($tmp_dir."pie_".$cache_file_name,$html_imagename."_pie",$cnt_val,$name_val,$width,$height,$left,$right,$top,$bottom,$title,$target_val,"pie");
+		$sHTML = render_graph($tmp_dir."vert_".$cache_file_name,$html_imagename."_vert",$cnt_val,$name_val,$width,$height,$left,$right,$top,$bottom,$title,$target_val,"vertical");
 		return $sHTML;
 		
         }



From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 30 07:05:26 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Fri, 30 Jun 2006 14:05:26 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7709 -
 /vtigercrm/trunk/include/magpierss/extlib/Snoopy.class.inc
Message-ID: <20060630140526.C381E181B4C@vtiger.fosslabs.com>

Author: richie
Date: Fri Jun 30 08:05:22 2006
New Revision: 7709

Log:
changes made to set proxy server

Modified:
    vtigercrm/trunk/include/magpierss/extlib/Snoopy.class.inc

Modified: vtigercrm/trunk/include/magpierss/extlib/Snoopy.class.inc
==============================================================================
--- vtigercrm/trunk/include/magpierss/extlib/Snoopy.class.inc (original)
+++ vtigercrm/trunk/include/magpierss/extlib/Snoopy.class.inc Fri Jun 30 08:05:22 2006
@@ -34,7 +34,7 @@
 http://snoopy.sourceforge.com
 
 *************************************************/
-
+require_once("include/database/PearDatabase.php");
 class Snoopy
 {
 	/**** Public variables ****/
@@ -43,8 +43,8 @@
 
 	var $host			=	"www.php.net";		// host name we are connecting to
 	var $port			=	80;					// port we are connecting to
-	var $proxy_host		=	"192.168.4.158";					// proxy host to use
-	var $proxy_port		=	"80";					// proxy port to use
+	var $proxy_host		=	"";					// proxy host to use
+	var $proxy_port		=	"";					// proxy port to use
 	var $agent			=	"Snoopy v1.0";		// agent we masquerade as
 	var	$referer		=	"";					// referer info to pass
 	var $cookies		=	array();			// array of cookies to pass
@@ -63,8 +63,8 @@
 												// NOTE: this currently does not respect
 												// dates, domains or paths.
 	
-	var	$user			=	"jerijohn";					// user for http authentication
-	var	$pass			=	"jerijohn";					// password for http authentication
+	var	$user			=	"";					// user for http authentication
+	var	$pass			=	"";					// password for http authentication
 	
 	// http accept types
 	var $accept			=	"image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*";
@@ -112,6 +112,20 @@
 	
 	var $_isproxy		=	true;				// set if using a proxy server
 	var $_fp_timeout	=	60;					// timeout for socket connection
+	function Snoopy()
+	{
+		global $adb;
+		$query = "select * from vtiger_systems where server_type='proxy'";
+		$result = $adb->query($query);
+		$noofrows = $adb->num_rows($result);
+		if($noofrows != 0)
+		{
+			$this->proxy_host=$adb->query_result($result,0,"server");
+			$this->proxy_port=$adb->query_result($result,0,"server_port");
+			$this->user=$adb->query_result($result,0,"server_username");
+			$this->pass=$adb->query_result($result,0,"server_password");
+		}
+	}
 
 /*======================================================================*\
 	Function:	fetch



From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 30 17:57:33 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sat, 01 Jul 2006 00:57:33 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231416=3A?=
 =?utf-8?q?_Create_DEPENDENCIES=2ETXT_to_maintain_list_of_snapshoted_packa?=
 =?utf-8?q?ges_in_codebase?=
Message-ID: <076.7e964d05c94606ee6c7bdb86b30a9b4a@vtiger.fosslabs.com>

#1416: Create DEPENDENCIES.TXT to maintain list of snapshoted packages in codebase
---------------------------------------------------------------------------+
 Reporter:  jeffk                                                          |       Owner:  jeffk
     Type:  enhancement                                                    |      Status:  new  
 Priority:  minor                                                          |   Milestone:  5.0.0
Component:  vtigercrm                                                      |     Version:  5.0.0
 Keywords:  dependencies packaging libraries php javascript distributions  |  
---------------------------------------------------------------------------+
 vtigercrm currently bundles snapshots of several external php and
 javascript libraries. Many of these libraries are unmodified copies. Some
 have had local modifications made to fix vtigercrm issues.

 Some or all distributions will prefer to package vtigercrm without
 including snapshotted libraries which are otherwise available as system
 packaged libraries.

 A good example of this is adodb. Since security updates are sometimes
 released for this database library, the distribution packagers will want
 to use their own system package as the one and only adodb installed on the
 system. An insecure version of adodb could have implications for the
 entire database backend, not just vtigercrm's database.

 To assist packagers, we should maintain a DEPENDENCIES.TXT file, listing
 the exact version of each snapshotted library. Additional information.

 The secondary use of this library will be to enable vtigercrm developers
 to identify, unmodify and eventually remove snapshotted libraries from the
 codebase.

 The ideal end result is a supplemental/convenience download package that
 contains all library dependencies of a vtigercrm release. Systems which
 can meet these prerequisites entirely through their system packageing will
 not need to distribute this file as part of the vtigercrm package.

 I will start this DEPENDENCIES.txt file in the trunk and 4.2 branch. The
 initial tab-separated listing format:
 {{{
 #pkg    pkgvers relpath statusmodified  statusexternaldep       dowloadurl
 adodb   adodb-4.90      /adodb  false        unknown
 http://prdownloads.sourceforge.net/adodb/adodb490.tgz
 }}}
 is highly open to suggestion. Please modify the format and add to the
 listings as you see fit.

  * pkg: versionless package name as defined by the original project
  * pkgvers: versioned package name as defined by the original project
  * relpath: vtigercrm root relative pathname of snapshot library
  * statusmodified: true/false/unknown indicator of any modifications to
 library release version
  * statusexternaldep: true/false/unknown indicator of whether vtigercrm
 can work with this library removed from relpath, but available on system
 PHP path (e.g. system packaging)
  * downloadurl: direct download URL for specific library release version,
 wget-able URL if possible.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1416>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 30 18:04:22 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sat, 01 Jul 2006 01:04:22 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231416=3A?=
 =?utf-8?q?_Create_DEPENDENCIES=2ETXT_to_maintain_list_of_snapshoted_packa?=
 =?utf-8?q?ges_in_codebase?=
In-Reply-To: <076.7e964d05c94606ee6c7bdb86b30a9b4a@vtiger.fosslabs.com>
References: <076.7e964d05c94606ee6c7bdb86b30a9b4a@vtiger.fosslabs.com>
Message-ID: <085.1839003ac93644501f6ae243df87164b@vtiger.fosslabs.com>

#1416: Create DEPENDENCIES.TXT to maintain list of snapshoted packages in codebase
--------------------------+-------------------------------------------------
  Reporter:  jeffk        |       Owner:  jeffk                                                        
      Type:  enhancement  |      Status:  new                                                          
  Priority:  minor        |   Milestone:  5.0.0                                                        
 Component:  vtigercrm    |     Version:  5.0.0                                                        
Resolution:               |    Keywords:  dependencies packaging libraries php javascript distributions
--------------------------+-------------------------------------------------
Comment (by jeffk):

 (In [7710]) refs #1416. add DEPENDENCIES.txt

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1416>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 30 18:04:23 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 01 Jul 2006 01:04:23 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7710 -
	/vtigercrm/trunk/DEPENDENCIES.txt
Message-ID: <20060701010423.57EB55FB120@vtiger.fosslabs.com>

Author: jeffk
Date: Fri Jun 30 19:04:20 2006
New Revision: 7710

Log:
refs #1416. add DEPENDENCIES.txt

Added:
    vtigercrm/trunk/DEPENDENCIES.txt   (with props)



From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 30 18:04:59 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sat, 01 Jul 2006 01:04:59 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231416=3A?=
 =?utf-8?q?_Create_DEPENDENCIES=2ETXT_to_maintain_list_of_snapshoted_packa?=
 =?utf-8?q?ges_in_codebase?=
In-Reply-To: <076.7e964d05c94606ee6c7bdb86b30a9b4a@vtiger.fosslabs.com>
References: <076.7e964d05c94606ee6c7bdb86b30a9b4a@vtiger.fosslabs.com>
Message-ID: <085.1216b7f045d058df25f027730a70c99a@vtiger.fosslabs.com>

#1416: Create DEPENDENCIES.TXT to maintain list of snapshoted packages in codebase
--------------------------+-------------------------------------------------
  Reporter:  jeffk        |       Owner:  jeffk                                                        
      Type:  enhancement  |      Status:  new                                                          
  Priority:  minor        |   Milestone:  5.0.0                                                        
 Component:  vtigercrm    |     Version:  5.0.0                                                        
Resolution:               |    Keywords:  dependencies packaging libraries php javascript distributions
--------------------------+-------------------------------------------------
Comment (by jeffk):

 (In [7711]) refs #1416. add DEPENDENCIES.txt

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1416>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 30 18:04:59 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 01 Jul 2006 01:04:59 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7711 -
	/vtigercrm/branches/4.2/DEPENDENCIES.txt
Message-ID: <20060701010459.7F74162BD22@vtiger.fosslabs.com>

Author: jeffk
Date: Fri Jun 30 19:04:57 2006
New Revision: 7711

Log:
refs #1416. add DEPENDENCIES.txt

Added:
    vtigercrm/branches/4.2/DEPENDENCIES.txt   (with props)



From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 30 18:30:24 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 01 Jul 2006 01:30:24 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7712 -
	/vtigercrm/trunk/DEPENDENCIES.txt
Message-ID: <20060701013024.C186F62BD29@vtiger.fosslabs.com>

Author: jeffk
Date: Fri Jun 30 19:30:22 2006
New Revision: 7712

Log:
refs #1416 and #1116. add FCKEditor to DEPENDENCIES.txt

Modified:
    vtigercrm/trunk/DEPENDENCIES.txt

Modified: vtigercrm/trunk/DEPENDENCIES.txt
==============================================================================
--- vtigercrm/trunk/DEPENDENCIES.txt (original)
+++ vtigercrm/trunk/DEPENDENCIES.txt Fri Jun 30 19:30:22 2006
@@ -1,2 +1,3 @@
 #pkg	pkgvers	relpath	statusmodified	statusexternaldep	dowloadurl
-adodb	adodb-4.90	adodb/	snapshot	unknown	http://prdownloads.sourceforge.net/adodb/adodb490.tgz
+adodb	adodb-4.90	adodb/	false	unknown	http://prdownloads.sourceforge.net/adodb/adodb490.tgz
+FCKeditor	FCKeditor-2.2	include/fckeditor/	true	unknown	http://prdownloads.sourceforge.net/fckeditor/FCKeditor-2.2.gz.tar



From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 30 18:30:23 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sat, 01 Jul 2006 01:30:23 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231416=3A?=
 =?utf-8?q?_Create_DEPENDENCIES=2ETXT_to_maintain_list_of_snapshoted_packa?=
 =?utf-8?q?ges_in_codebase?=
In-Reply-To: <076.7e964d05c94606ee6c7bdb86b30a9b4a@vtiger.fosslabs.com>
References: <076.7e964d05c94606ee6c7bdb86b30a9b4a@vtiger.fosslabs.com>
Message-ID: <085.1385f104f03bc2ec9b553b5248645f00@vtiger.fosslabs.com>

#1416: Create DEPENDENCIES.TXT to maintain list of snapshoted packages in codebase
--------------------------+-------------------------------------------------
  Reporter:  jeffk        |       Owner:  jeffk                                                        
      Type:  enhancement  |      Status:  new                                                          
  Priority:  minor        |   Milestone:  5.0.0                                                        
 Component:  vtigercrm    |     Version:  5.0.0                                                        
Resolution:               |    Keywords:  dependencies packaging libraries php javascript distributions
--------------------------+-------------------------------------------------
Comment (by jeffk):

 (In [7712]) refs #1416 and #1116. add FCKEditor to DEPENDENCIES.txt

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1416>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 30 18:30:24 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sat, 01 Jul 2006 01:30:24 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231116=3A?=
 =?utf-8?q?_FCKeditor=3A_document_version_used=2C_merge_new_versions_as_re?=
 =?utf-8?q?leased?=
In-Reply-To: <076.23b59aa20444402e3e3f439012465746@vtiger.fosslabs.com>
References: <076.23b59aa20444402e3e3f439012465746@vtiger.fosslabs.com>
Message-ID: <085.d575c58bc4875a1a0b4cc1f9dfd7f860@vtiger.fosslabs.com>

#1116: FCKeditor: document version used, merge new versions as released
------------------------+---------------------------------------------------
  Reporter:  jeffk      |       Owner:  jeffk                    
      Type:  defect     |      Status:  new                      
  Priority:  major      |   Milestone:  5.0.0                    
 Component:  vtigercrm  |     Version:  5.0.1                    
Resolution:             |    Keywords:  editor packaging snapshot
------------------------+---------------------------------------------------
Comment (by jeffk):

 (In [7712]) refs #1416 and #1116. add FCKEditor to DEPENDENCIES.txt

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1116>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 30 18:32:22 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sat, 01 Jul 2006 01:32:22 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231416=3A?=
 =?utf-8?q?_Create_DEPENDENCIES=2ETXT_to_maintain_list_of_snapshoted_packa?=
 =?utf-8?q?ges_in_codebase?=
In-Reply-To: <076.7e964d05c94606ee6c7bdb86b30a9b4a@vtiger.fosslabs.com>
References: <076.7e964d05c94606ee6c7bdb86b30a9b4a@vtiger.fosslabs.com>
Message-ID: <085.9dfc23b360eb8adc1b6af73b11c5713c@vtiger.fosslabs.com>

#1416: Create DEPENDENCIES.TXT to maintain list of snapshoted packages in codebase
--------------------------+-------------------------------------------------
  Reporter:  jeffk        |       Owner:  jeffk                                                        
      Type:  enhancement  |      Status:  new                                                          
  Priority:  minor        |   Milestone:  5.0.0                                                        
 Component:  vtigercrm    |     Version:  5.0.0                                                        
Resolution:               |    Keywords:  dependencies packaging libraries php javascript distributions
--------------------------+-------------------------------------------------
Comment (by jeffk):

 (In [7713]) refs #1416 and #1116. add FCKEditor to DEPENDENCIES.txt

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1416>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 30 18:32:22 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sat, 01 Jul 2006 01:32:22 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231116=3A?=
 =?utf-8?q?_FCKeditor=3A_document_version_used=2C_merge_new_versions_as_re?=
 =?utf-8?q?leased?=
In-Reply-To: <076.23b59aa20444402e3e3f439012465746@vtiger.fosslabs.com>
References: <076.23b59aa20444402e3e3f439012465746@vtiger.fosslabs.com>
Message-ID: <085.3d1e09024083e7f42746bb2aa24bbdfc@vtiger.fosslabs.com>

#1116: FCKeditor: document version used, merge new versions as released
------------------------+---------------------------------------------------
  Reporter:  jeffk      |       Owner:  jeffk                    
      Type:  defect     |      Status:  new                      
  Priority:  major      |   Milestone:  5.0.0                    
 Component:  vtigercrm  |     Version:  5.0.1                    
Resolution:             |    Keywords:  editor packaging snapshot
------------------------+---------------------------------------------------
Comment (by jeffk):

 (In [7713]) refs #1416 and #1116. add FCKEditor to DEPENDENCIES.txt

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1116>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 30 18:32:23 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 01 Jul 2006 01:32:23 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7713 -
	/vtigercrm/branches/4.2/DEPENDENCIES.txt
Message-ID: <20060701013223.56BC85F5CDF@vtiger.fosslabs.com>

Author: jeffk
Date: Fri Jun 30 19:32:21 2006
New Revision: 7713

Log:
refs #1416 and #1116. add FCKEditor to DEPENDENCIES.txt

Modified:
    vtigercrm/branches/4.2/DEPENDENCIES.txt

Modified: vtigercrm/branches/4.2/DEPENDENCIES.txt
==============================================================================
--- vtigercrm/branches/4.2/DEPENDENCIES.txt (original)
+++ vtigercrm/branches/4.2/DEPENDENCIES.txt Fri Jun 30 19:32:21 2006
@@ -1,2 +1,3 @@
 #pkg	pkgvers	relpath	statusmodified	statusexternaldep	dowloadurl
-adodb	adodb-4.90	adodb/	snapshot	unknown	http://prdownloads.sourceforge.net/adodb/adodb490.tgz
+adodb	adodb-4.90	adodb/	false	unknown	http://prdownloads.sourceforge.net/adodb/adodb490.tgz
+FCKeditor	FCKeditor-2.2	include/fckeditor/	true	unknown	http://prdownloads.sourceforge.net/fckeditor/FCKeditor-2.2.gz.tar



From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 30 18:44:30 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sat, 01 Jul 2006 01:44:30 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231416=3A?=
 =?utf-8?q?_Create_DEPENDENCIES=2ETXT_to_maintain_list_of_snapshoted_packa?=
 =?utf-8?q?ges_in_codebase?=
In-Reply-To: <076.7e964d05c94606ee6c7bdb86b30a9b4a@vtiger.fosslabs.com>
References: <076.7e964d05c94606ee6c7bdb86b30a9b4a@vtiger.fosslabs.com>
Message-ID: <085.755fc6f6d8f72e7d553a8a4f689906a1@vtiger.fosslabs.com>

#1416: Create DEPENDENCIES.TXT to maintain list of snapshoted packages in codebase
--------------------------+-------------------------------------------------
  Reporter:  jeffk        |       Owner:  jeffk                                                        
      Type:  enhancement  |      Status:  new                                                          
  Priority:  minor        |   Milestone:  5.0.0                                                        
 Component:  vtigercrm    |     Version:  5.0.0                                                        
Resolution:               |    Keywords:  dependencies packaging libraries php javascript distributions
--------------------------+-------------------------------------------------
Comment (by jeffk):

 (In [7714]) refs #1416 and #1116. add fpdf to DEPENDENCIES.txt

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1416>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 30 18:44:30 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sat, 01 Jul 2006 01:44:30 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231116=3A?=
 =?utf-8?q?_FCKeditor=3A_document_version_used=2C_merge_new_versions_as_re?=
 =?utf-8?q?leased?=
In-Reply-To: <076.23b59aa20444402e3e3f439012465746@vtiger.fosslabs.com>
References: <076.23b59aa20444402e3e3f439012465746@vtiger.fosslabs.com>
Message-ID: <085.6560d80a60debe767a8d289dfb21086f@vtiger.fosslabs.com>

#1116: FCKeditor: document version used, merge new versions as released
------------------------+---------------------------------------------------
  Reporter:  jeffk      |       Owner:  jeffk                    
      Type:  defect     |      Status:  new                      
  Priority:  major      |   Milestone:  5.0.0                    
 Component:  vtigercrm  |     Version:  5.0.1                    
Resolution:             |    Keywords:  editor packaging snapshot
------------------------+---------------------------------------------------
Comment (by jeffk):

 (In [7714]) refs #1416 and #1116. add fpdf to DEPENDENCIES.txt

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1116>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 30 18:44:31 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 01 Jul 2006 01:44:31 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7714 -
	/vtigercrm/trunk/DEPENDENCIES.txt
Message-ID: <20060701014431.8330362BD3C@vtiger.fosslabs.com>

Author: jeffk
Date: Fri Jun 30 19:44:29 2006
New Revision: 7714

Log:
refs #1416 and #1116. add fpdf to DEPENDENCIES.txt

Modified:
    vtigercrm/trunk/DEPENDENCIES.txt

Modified: vtigercrm/trunk/DEPENDENCIES.txt
==============================================================================
--- vtigercrm/trunk/DEPENDENCIES.txt (original)
+++ vtigercrm/trunk/DEPENDENCIES.txt Fri Jun 30 19:44:29 2006
@@ -1,3 +1,4 @@
 #pkg	pkgvers	relpath	statusmodified	statusexternaldep	dowloadurl
 adodb	adodb-4.90	adodb/	false	unknown	http://prdownloads.sourceforge.net/adodb/adodb490.tgz
 FCKeditor	FCKeditor-2.2	include/fckeditor/	true	unknown	http://prdownloads.sourceforge.net/fckeditor/FCKeditor-2.2.gz.tar
+fpdf	fpdf-1.53	include/fpdf	true	unknown	http://www.fpdf.org/en/dl.php?v=153&f=tgz



From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 30 18:45:08 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sat, 01 Jul 2006 01:45:08 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231416=3A?=
 =?utf-8?q?_Create_DEPENDENCIES=2ETXT_to_maintain_list_of_snapshoted_packa?=
 =?utf-8?q?ges_in_codebase?=
In-Reply-To: <076.7e964d05c94606ee6c7bdb86b30a9b4a@vtiger.fosslabs.com>
References: <076.7e964d05c94606ee6c7bdb86b30a9b4a@vtiger.fosslabs.com>
Message-ID: <085.c85ab9d5dbc91b5d5d64712a90bfd837@vtiger.fosslabs.com>

#1416: Create DEPENDENCIES.TXT to maintain list of snapshoted packages in codebase
--------------------------+-------------------------------------------------
  Reporter:  jeffk        |       Owner:  jeffk                                                        
      Type:  enhancement  |      Status:  new                                                          
  Priority:  minor        |   Milestone:  5.0.0                                                        
 Component:  vtigercrm    |     Version:  5.0.0                                                        
Resolution:               |    Keywords:  dependencies packaging libraries php javascript distributions
--------------------------+-------------------------------------------------
Comment (by jeffk):

 (In [7715]) refs #1416. add fpdf to DEPENDENCIES.txt

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1416>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 30 18:45:08 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 01 Jul 2006 01:45:08 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7715 -
	/vtigercrm/branches/4.2/DEPENDENCIES.txt
Message-ID: <20060701014508.D1E5662BD3C@vtiger.fosslabs.com>

Author: jeffk
Date: Fri Jun 30 19:45:07 2006
New Revision: 7715

Log:
refs #1416. add fpdf to DEPENDENCIES.txt

Modified:
    vtigercrm/branches/4.2/DEPENDENCIES.txt

Modified: vtigercrm/branches/4.2/DEPENDENCIES.txt
==============================================================================
--- vtigercrm/branches/4.2/DEPENDENCIES.txt (original)
+++ vtigercrm/branches/4.2/DEPENDENCIES.txt Fri Jun 30 19:45:07 2006
@@ -1,3 +1,4 @@
 #pkg	pkgvers	relpath	statusmodified	statusexternaldep	dowloadurl
 adodb	adodb-4.90	adodb/	false	unknown	http://prdownloads.sourceforge.net/adodb/adodb490.tgz
 FCKeditor	FCKeditor-2.2	include/fckeditor/	true	unknown	http://prdownloads.sourceforge.net/fckeditor/FCKeditor-2.2.gz.tar
+fpdf	fpdf-1.53	include/fpdf	true	unknown	http://www.fpdf.org/en/dl.php?v=153&f=tgz



From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 30 20:15:59 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sat, 01 Jul 2006 03:15:59 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231416=3A?=
 =?utf-8?q?_Create_DEPENDENCIES=2ETXT_to_maintain_list_of_snapshoted_packa?=
 =?utf-8?q?ges_in_codebase?=
In-Reply-To: <076.7e964d05c94606ee6c7bdb86b30a9b4a@vtiger.fosslabs.com>
References: <076.7e964d05c94606ee6c7bdb86b30a9b4a@vtiger.fosslabs.com>
Message-ID: <085.52c84c2afe7afaf26f622f38b0ca9ff3@vtiger.fosslabs.com>

#1416: Create DEPENDENCIES.TXT to maintain list of snapshoted packages in codebase
--------------------------+-------------------------------------------------
  Reporter:  jeffk        |       Owner:  jeffk                                                        
      Type:  enhancement  |      Status:  new                                                          
  Priority:  minor        |   Milestone:  5.0.0                                                        
 Component:  vtigercrm    |     Version:  5.0.0                                                        
Resolution:               |    Keywords:  dependencies packaging libraries php javascript distributions
--------------------------+-------------------------------------------------
Comment (by jeffk):

 (In [7716]) refs #1416. add Image_Graph Image_Canvas Image_Color to
 DEPENDENCIES.txt

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1416>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 30 20:15:59 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 01 Jul 2006 03:15:59 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7716 -
	/vtigercrm/trunk/DEPENDENCIES.txt
Message-ID: <20060701031559.DBCF462BD3C@vtiger.fosslabs.com>

Author: jeffk
Date: Fri Jun 30 21:15:57 2006
New Revision: 7716

Log:
refs #1416. add Image_Graph Image_Canvas Image_Color to DEPENDENCIES.txt

Modified:
    vtigercrm/trunk/DEPENDENCIES.txt

Modified: vtigercrm/trunk/DEPENDENCIES.txt
==============================================================================
--- vtigercrm/trunk/DEPENDENCIES.txt (original)
+++ vtigercrm/trunk/DEPENDENCIES.txt Fri Jun 30 21:15:57 2006
@@ -2,3 +2,6 @@
 adodb	adodb-4.90	adodb/	false	unknown	http://prdownloads.sourceforge.net/adodb/adodb490.tgz
 FCKeditor	FCKeditor-2.2	include/fckeditor/	true	unknown	http://prdownloads.sourceforge.net/fckeditor/FCKeditor-2.2.gz.tar
 fpdf	fpdf-1.53	include/fpdf	true	unknown	http://www.fpdf.org/en/dl.php?v=153&f=tgz
+Image_Canvas	Image_Canvas-0.3.0	include/Image	true	unknown	http://pear.php.net/get/Image_Canvas-0.3.0.tgz
+Image_Color	Image_Color-1.0.2	include/Image	true	unknown	http://pear.php.net/get/Image_Color-1.0.2.tgz
+Image_Graph	Image_Graph-0.7.2	include/Image	true	unknown	http://pear.php.net/get/Image_Graph-0.7.2.tgz



From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 30 20:16:37 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sat, 01 Jul 2006 03:16:37 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231416=3A?=
 =?utf-8?q?_Create_DEPENDENCIES=2ETXT_to_maintain_list_of_snapshoted_packa?=
 =?utf-8?q?ges_in_codebase?=
In-Reply-To: <076.7e964d05c94606ee6c7bdb86b30a9b4a@vtiger.fosslabs.com>
References: <076.7e964d05c94606ee6c7bdb86b30a9b4a@vtiger.fosslabs.com>
Message-ID: <085.c01e6c9ba69380387d309b0dac8b0e7b@vtiger.fosslabs.com>

#1416: Create DEPENDENCIES.TXT to maintain list of snapshoted packages in codebase
--------------------------+-------------------------------------------------
  Reporter:  jeffk        |       Owner:  jeffk                                                        
      Type:  enhancement  |      Status:  new                                                          
  Priority:  minor        |   Milestone:  5.0.0                                                        
 Component:  vtigercrm    |     Version:  5.0.0                                                        
Resolution:               |    Keywords:  dependencies packaging libraries php javascript distributions
--------------------------+-------------------------------------------------
Comment (by jeffk):

 (In [7717]) refs #1416. add Image_Graph Image_Canvas Image_Color to
 DEPENDENCIES.txt

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1416>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 30 20:16:37 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 01 Jul 2006 03:16:37 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7717 -
	/vtigercrm/branches/4.2/DEPENDENCIES.txt
Message-ID: <20060701031637.78A1662BD3E@vtiger.fosslabs.com>

Author: jeffk
Date: Fri Jun 30 21:16:35 2006
New Revision: 7717

Log:
refs #1416. add Image_Graph Image_Canvas Image_Color to DEPENDENCIES.txt

Modified:
    vtigercrm/branches/4.2/DEPENDENCIES.txt

Modified: vtigercrm/branches/4.2/DEPENDENCIES.txt
==============================================================================
--- vtigercrm/branches/4.2/DEPENDENCIES.txt (original)
+++ vtigercrm/branches/4.2/DEPENDENCIES.txt Fri Jun 30 21:16:35 2006
@@ -2,3 +2,6 @@
 adodb	adodb-4.90	adodb/	false	unknown	http://prdownloads.sourceforge.net/adodb/adodb490.tgz
 FCKeditor	FCKeditor-2.2	include/fckeditor/	true	unknown	http://prdownloads.sourceforge.net/fckeditor/FCKeditor-2.2.gz.tar
 fpdf	fpdf-1.53	include/fpdf	true	unknown	http://www.fpdf.org/en/dl.php?v=153&f=tgz
+Image_Canvas	Image_Canvas-0.3.0	include/Image	true	unknown	http://pear.php.net/get/Image_Canvas-0.3.0.tgz
+Image_Color	Image_Color-1.0.2	include/Image	true	unknown	http://pear.php.net/get/Image_Color-1.0.2.tgz
+Image_Graph	Image_Graph-0.7.2	include/Image	true	unknown	http://pear.php.net/get/Image_Graph-0.7.2.tgz



From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 30 20:20:44 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sat, 01 Jul 2006 03:20:44 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231416=3A?=
 =?utf-8?q?_Create_DEPENDENCIES=2ETXT_to_maintain_list_of_snapshoted_packa?=
 =?utf-8?q?ges_in_codebase?=
In-Reply-To: <076.7e964d05c94606ee6c7bdb86b30a9b4a@vtiger.fosslabs.com>
References: <076.7e964d05c94606ee6c7bdb86b30a9b4a@vtiger.fosslabs.com>
Message-ID: <085.af218543d1f798ec0368b69b07af840f@vtiger.fosslabs.com>

#1416: Create DEPENDENCIES.TXT to maintain list of snapshoted packages in codebase
--------------------------+-------------------------------------------------
  Reporter:  jeffk        |       Owner:  jeffk                                                        
      Type:  enhancement  |      Status:  new                                                          
  Priority:  minor        |   Milestone:  5.0.0                                                        
 Component:  vtigercrm    |     Version:  5.0.0                                                        
Resolution:               |    Keywords:  dependencies packaging libraries php javascript distributions
--------------------------+-------------------------------------------------
Comment (by jeffk):

 (In [7718]) refs #1416. remove relpath trailing slashes.

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1416>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 30 20:20:45 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 01 Jul 2006 03:20:45 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7718 -
	/vtigercrm/trunk/DEPENDENCIES.txt
Message-ID: <20060701032045.89C5F62BD99@vtiger.fosslabs.com>

Author: jeffk
Date: Fri Jun 30 21:20:43 2006
New Revision: 7718

Log:
refs #1416. remove relpath trailing slashes.

Modified:
    vtigercrm/trunk/DEPENDENCIES.txt

Modified: vtigercrm/trunk/DEPENDENCIES.txt
==============================================================================
--- vtigercrm/trunk/DEPENDENCIES.txt (original)
+++ vtigercrm/trunk/DEPENDENCIES.txt Fri Jun 30 21:20:43 2006
@@ -1,6 +1,6 @@
 #pkg	pkgvers	relpath	statusmodified	statusexternaldep	dowloadurl
-adodb	adodb-4.90	adodb/	false	unknown	http://prdownloads.sourceforge.net/adodb/adodb490.tgz
-FCKeditor	FCKeditor-2.2	include/fckeditor/	true	unknown	http://prdownloads.sourceforge.net/fckeditor/FCKeditor-2.2.gz.tar
+adodb	adodb-4.90	adodb	false	unknown	http://prdownloads.sourceforge.net/adodb/adodb490.tgz
+FCKeditor	FCKeditor-2.2	include/fckeditor	true	unknown	http://prdownloads.sourceforge.net/fckeditor/FCKeditor-2.2.gz.tar
 fpdf	fpdf-1.53	include/fpdf	true	unknown	http://www.fpdf.org/en/dl.php?v=153&f=tgz
 Image_Canvas	Image_Canvas-0.3.0	include/Image	true	unknown	http://pear.php.net/get/Image_Canvas-0.3.0.tgz
 Image_Color	Image_Color-1.0.2	include/Image	true	unknown	http://pear.php.net/get/Image_Color-1.0.2.tgz



From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 30 20:21:39 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sat, 01 Jul 2006 03:21:39 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231416=3A?=
 =?utf-8?q?_Create_DEPENDENCIES=2ETXT_to_maintain_list_of_snapshoted_packa?=
 =?utf-8?q?ges_in_codebase?=
In-Reply-To: <076.7e964d05c94606ee6c7bdb86b30a9b4a@vtiger.fosslabs.com>
References: <076.7e964d05c94606ee6c7bdb86b30a9b4a@vtiger.fosslabs.com>
Message-ID: <085.5dd28db59faf30579918ca904eb01f2f@vtiger.fosslabs.com>

#1416: Create DEPENDENCIES.TXT to maintain list of snapshoted packages in codebase
--------------------------+-------------------------------------------------
  Reporter:  jeffk        |       Owner:  jeffk                                                        
      Type:  enhancement  |      Status:  new                                                          
  Priority:  minor        |   Milestone:  5.0.0                                                        
 Component:  vtigercrm    |     Version:  5.0.0                                                        
Resolution:               |    Keywords:  dependencies packaging libraries php javascript distributions
--------------------------+-------------------------------------------------
Comment (by jeffk):

 (In [7719]) refs #1416. remove relpath trailing slashes.

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1416>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 30 20:21:39 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 01 Jul 2006 03:21:39 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7719 -
	/vtigercrm/branches/4.2/DEPENDENCIES.txt
Message-ID: <20060701032139.815C662BD9A@vtiger.fosslabs.com>

Author: jeffk
Date: Fri Jun 30 21:21:37 2006
New Revision: 7719

Log:
refs #1416. remove relpath trailing slashes.

Modified:
    vtigercrm/branches/4.2/DEPENDENCIES.txt

Modified: vtigercrm/branches/4.2/DEPENDENCIES.txt
==============================================================================
--- vtigercrm/branches/4.2/DEPENDENCIES.txt (original)
+++ vtigercrm/branches/4.2/DEPENDENCIES.txt Fri Jun 30 21:21:37 2006
@@ -1,6 +1,6 @@
 #pkg	pkgvers	relpath	statusmodified	statusexternaldep	dowloadurl
-adodb	adodb-4.90	adodb/	false	unknown	http://prdownloads.sourceforge.net/adodb/adodb490.tgz
-FCKeditor	FCKeditor-2.2	include/fckeditor/	true	unknown	http://prdownloads.sourceforge.net/fckeditor/FCKeditor-2.2.gz.tar
+adodb	adodb-4.90	adodb	false	unknown	http://prdownloads.sourceforge.net/adodb/adodb490.tgz
+FCKeditor	FCKeditor-2.2	include/fckeditor	true	unknown	http://prdownloads.sourceforge.net/fckeditor/FCKeditor-2.2.gz.tar
 fpdf	fpdf-1.53	include/fpdf	true	unknown	http://www.fpdf.org/en/dl.php?v=153&f=tgz
 Image_Canvas	Image_Canvas-0.3.0	include/Image	true	unknown	http://pear.php.net/get/Image_Canvas-0.3.0.tgz
 Image_Color	Image_Color-1.0.2	include/Image	true	unknown	http://pear.php.net/get/Image_Color-1.0.2.tgz



From vtiger-tickets at vtiger.fosslabs.com  Thu Jun  1 01:43:49 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 01 Jun 2006 05:43:49 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231250=3A?=
 =?utf-8?q?_Beta__Demo=3A_Sales_=3E_Leads_=3E_Detail_View_fatal_error?=
Message-ID: <076.78fe8716a71e90b18b5ac94f0c53cd10@vtiger.fosslabs.com>

#1250: Beta  Demo: Sales > Leads > Detail View fatal error
-----------------------+----------------------------------------------------
 Reporter:  anonymous  |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  critical   |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 Open an existing lead, look at the tag cloud:

 Warning: main(include/Ajax/TagCloud.php): failed to open stream: No such
 file or directory in
 /home/site/html/products/crm/demo_5alpha/modules/Leads/TagCloud.php on
 line 12

 Fatal error: main(): Failed opening required 'include/Ajax/TagCloud.php'
 (include_path='.::/usr/share/pear') in
 /home/site/html/products/crm/demo_5alpha/modules/Leads/TagCloud.php on
 line 12

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1250>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun  1 02:01:55 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 01 Jun 2006 06:01:55 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231251=3A?=
	=?utf-8?q?_Chat_not_working=3F=3F?=
Message-ID: <076.c47ecc4624fe78215a43eca164a2c051@vtiger.fosslabs.com>

#1251: Chat not working??
-----------------------+----------------------------------------------------
 Reporter:             |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  minor      |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 Chat Not working in any of the tab. Public Chat leads to the squeezed
 homepage in the same window. Please take care !!!

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1251>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun  1 05:37:29 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 01 Jun 2006 09:37:29 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231252=3A?=
 =?utf-8?q?_Ticket_-_Activity_-_Relation?=
Message-ID: <076.f54f7a210a2bc06ab7c96747af544498@vtiger.fosslabs.com>

#1252: Ticket - Activity - Relation
-----------------------+----------------------------------------------------
 Reporter:  eberled    |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  critical   |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 Tasks created under a ticket don't store this relation. If a user now gets
 a task he doesn't know that there is corresponding ticket.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1252>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun  1 06:23:11 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 01 Jun 2006 10:23:11 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231253=3A?=
 =?utf-8?q?_Campaigns_Cannot_Assign_To_Existing_Contacts=2C_Leads_or_Accou?=
 =?utf-8?q?nts?=
Message-ID: <076.329f0bfa1e61cd49791cee91bbc8d6ba@vtiger.fosslabs.com>

#1253: Campaigns Cannot Assign To Existing Contacts, Leads or Accounts
-----------------------------------+----------------------------------------
 Reporter:  robbie-w at boston.ac.uk  |       Owner:  developer
     Type:  task                   |      Status:  new      
 Priority:  major                  |   Milestone:           
Component:  vtigercrm              |     Version:  5.0.0    
 Keywords:                         |  
-----------------------------------+----------------------------------------
 Campaigns Cannot be assigned To Existing Contacts, Leads or Accounts. This
 is a required functionality if this module is to be of use. Also would
 need to check whether the contact accepts that particular form of
 marketing i.e. email opt out

 Thanks

 Robbie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1253>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun  1 07:00:39 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 01 Jun 2006 11:00:39 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231254=3A?=
 =?utf-8?q?_Currency_on_products_showing_wrongly_converted_US_value?=
Message-ID: <076.db8e221cdb38da7dd6320851fe5c35f3@vtiger.fosslabs.com>

#1254: Currency on products showing wrongly converted US value
------------------------+---------------------------------------------------
 Reporter:  arosewarne  |       Owner:  developer
     Type:  defect      |      Status:  new      
 Priority:  major       |   Milestone:  5.0.0    
Component:  vtigercrm   |     Version:  5.0.0    
 Keywords:  currency    |  
------------------------+---------------------------------------------------
 My preferred currency is british pounds. The conversion is 1.8 to the US
 dollar.
 I enter 20 pounds on the product screen. The amount displayed on the
 product in the view and edit screens is ?36.
 On the product overview page it correctly displays ?20.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1254>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun  1 07:07:00 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 01 Jun 2006 11:07:00 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231254=3A?=
 =?utf-8?q?_Currency_on_products_showing_wrongly_converted_US_value?=
In-Reply-To: <076.db8e221cdb38da7dd6320851fe5c35f3@vtiger.fosslabs.com>
References: <076.db8e221cdb38da7dd6320851fe5c35f3@vtiger.fosslabs.com>
Message-ID: <085.bd526e3ae09cce4f978cbf48c6620329@vtiger.fosslabs.com>

#1254: Currency on products showing wrongly converted US value
-------------------------+--------------------------------------------------
  Reporter:  arosewarne  |       Owner:  developer
      Type:  defect      |      Status:  closed   
  Priority:  major       |   Milestone:  5.0.0    
 Component:  vtigercrm   |     Version:  5.0.0    
Resolution:  duplicate   |    Keywords:  currency 
-------------------------+--------------------------------------------------
Changes (by andrew at intracode.co.uk):

  * resolution:  => duplicate
  * status:  new => closed

Comment:

 See ticket #1142
 Apologies for not checking before posting.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1254>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun  1 08:21:01 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 01 Jun 2006 12:21:01 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231255=3A?=
 =?utf-8?q?_Adding_products_to_leads=2C_contacts_or_potentials_-_should_se?=
 =?utf-8?q?lect_from_a_list_of_existing?=
Message-ID: <076.deb11edc283ea7cd73ede48a39d03e8e@vtiger.fosslabs.com>

#1255: Adding products to leads, contacts or potentials - should select from a
list of existing
------------------------+---------------------------------------------------
 Reporter:  arosewarne  |       Owner:  developer
     Type:  defect      |      Status:  new      
 Priority:  major       |   Milestone:           
Component:  vtigercrm   |     Version:  5.0.0    
 Keywords:              |  
------------------------+---------------------------------------------------
 When I select 'Add a Product' to leads, contacts or potentials I don't
 want to create a new product, as I would with a note or email etc. I
 really want to be able to select from a list of products I have already
 defined, like in quote.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1255>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun  1 10:56:44 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 01 Jun 2006 14:56:44 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231256=3A?=
 =?utf-8?q?_Login_as_user_causes_segfault=2E?=
Message-ID: <076.d314963a958ad693ce77530081747090@vtiger.fosslabs.com>

#1256: Login as user causes segfault.
------------------------------------------+---------------------------------
 Reporter:  client.services.ny at gmail.com  |       Owner:  developer
     Type:  defect                        |      Status:  new      
 Priority:  blocker                       |   Milestone:           
Component:  vtigercrm                     |     Version:           
 Keywords:  SVN segfault                  |  
------------------------------------------+---------------------------------
 Pulled SVN last night (31-May), and installed, logged-in, etc.

 Attempted to login as created user on 6/1, causes segfault.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1256>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun  1 14:15:30 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 01 Jun 2006 18:15:30 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6885 -
	/vtigercrm/tags/vtigercrm-4.2.4/
Message-ID: <20060601181530.26730717C22@vtiger.fosslabs.com>

Author: allanbush
Date: Thu Jun  1 12:15:21 2006
New Revision: 6885

Log:
Tag 4.2.4 for release

Added:
    vtigercrm/tags/vtigercrm-4.2.4/
      - copied from r6884, vtigercrm/branches/4.2.4/




From vtiger-tickets at vtiger.fosslabs.com  Thu Jun  1 21:37:54 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 02 Jun 2006 01:37:54 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231257=3A?=
 =?utf-8?q?_calender-_time_display_should_start_earlier_instead_of_10=2E00?=
 =?utf-8?q?_am?=
Message-ID: <076.d27bacbd23f52c8c928d56ba5872fc60@vtiger.fosslabs.com>

#1257: calender- time display should start earlier instead of 10.00 am
-------------------------+--------------------------------------------------
 Reporter:  ftc          |       Owner:  developer
     Type:  enhancement  |      Status:  new      
 Priority:  major        |   Milestone:           
Component:  vtigercrm    |     Version:  5.0.0    
 Keywords:               |  
-------------------------+--------------------------------------------------
 Should it be more useful if the time starts earlier instead of 10.00 a.m.
 People might want to have meeting early in the morning 8.00 a.m?? I don't
 think they  have much office activity during late at night like 23.00??

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1257>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun  2 07:24:45 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 02 Jun 2006 11:24:45 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231258=3A?=
 =?utf-8?q?_Can=27t_create_custom_fields?=
Message-ID: <076.e2de34810640366206140549ecde537d@vtiger.fosslabs.com>

#1258: Can't create custom fields
-----------------------+----------------------------------------------------
 Reporter:  nik        |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  major      |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 I'm getting an error "Field type is not selected" when trying to create a
 custom field. The type is selected.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1258>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun  2 09:30:15 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 02 Jun 2006 13:30:15 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6886 -
	/vtigercrm/trunk/modules/Users/EditHomeOrder.php
Message-ID: <20060602133015.50AFE5F606D@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun  2 07:30:11 2006
New Revision: 6886

Log:
Added a Back Button in Home Page Order - Ahmed

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

Modified: vtigercrm/trunk/modules/Users/EditHomeOrder.php
==============================================================================
--- vtigercrm/trunk/modules/Users/EditHomeOrder.php (original)
+++ vtigercrm/trunk/modules/Users/EditHomeOrder.php Fri Jun  2 07:30:11 2006
@@ -253,6 +253,7 @@
 <form align="center" action="" method="post">
          <input type="hidden" name="order" id="order" value="">
         <div align="center">
+		<input type="button" onclick="window.history.back()" value="Back">
                 <input type="button" onclick="showValue()" value="Update System">
         </div>
         <br>




From vtiger-tickets at vtiger.fosslabs.com  Fri Jun  2 11:13:15 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 02 Jun 2006 15:13:15 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231259=3A?=
	=?utf-8?q?_i18n_issues_with_Beta?=
Message-ID: <076.f7b53125520cc2d8322c4161c2676a8c@vtiger.fosslabs.com>

#1259: i18n issues with Beta
-----------------------+----------------------------------------------------
 Reporter:  anonymous  |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  minor      |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 Ther are still some hardcoded i18n issue (More.., more..)highly visible
 not covered with the lang files

 \Modules\Rss\Rss.php
 8.498   <a target=\"_BLANK\" href=\"$this->rss_link\">More...</a>
 9.777   <a target=\"_BLANK\" href=\"$this->rss_link\">More...</a>

 \Smarty\templates\Homepage.tpl
 11.072  <tr><td colspan="2" align="right" valign="bottom"><a
 href="index.php?module={$modulename}&action=index">more..</a></td></tr>

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1259>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun  2 11:32:31 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 02 Jun 2006 15:32:31 -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.a8d588cab36569472c304759af6e1a5f@vtiger.fosslabs.com>

#727: Tab order is wrong
-------------------------+--------------------------------------------------
  Reporter:  OnwealdTim  |       Owner:  philip      
      Type:  defect      |      Status:  new         
  Priority:  critical    |   Milestone:  5.0.0       
 Component:  vtigercrm   |     Version:  5.0.0       
Resolution:              |    Keywords:  ui tab order
-------------------------+--------------------------------------------------
Comment (by anonymous):

 this is an important issue. I hear my partners compaining at least once a
 day :-(

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/727>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun  2 11:44:24 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 02 Jun 2006 15:44:24 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231259=3A?=
	=?utf-8?q?_i18n_issues_with_Beta?=
In-Reply-To: <076.f7b53125520cc2d8322c4161c2676a8c@vtiger.fosslabs.com>
References: <076.f7b53125520cc2d8322c4161c2676a8c@vtiger.fosslabs.com>
Message-ID: <085.f9c1987141d5d376d6e1f566c0509c1c@vtiger.fosslabs.com>

#1259: i18n issues with Beta
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  developer
      Type:  defect     |      Status:  new      
  Priority:  minor      |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:             |    Keywords:           
------------------------+---------------------------------------------------
Comment (by anonymous):

 see also

 \Smarty\templates\Clock.tpl

 840     <td style="text-align:left;padding-left:5px;border-bottom:1px
 solid #666666;" id="Handle">World Clock</td>

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1259>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun  2 11:47:14 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 02 Jun 2006 15:47:14 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231259=3A?=
	=?utf-8?q?_i18n_issues_with_Beta?=
In-Reply-To: <076.f7b53125520cc2d8322c4161c2676a8c@vtiger.fosslabs.com>
References: <076.f7b53125520cc2d8322c4161c2676a8c@vtiger.fosslabs.com>
Message-ID: <085.4a20ccbc8fd193a5fd707239c7886528@vtiger.fosslabs.com>

#1259: i18n issues with Beta
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  developer
      Type:  defect     |      Status:  new      
  Priority:  minor      |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:             |    Keywords:           
------------------------+---------------------------------------------------
Comment (by anonymous):

 and here:

 \Smarty\templates\Calculator.tpl

 820     <td style="text-align:left;padding-left:5px;border-bottom:1px
 solid #666666;" id="calc_Handle">Calculator</td>

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1259>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun  2 12:01:55 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 02 Jun 2006 16:01:55 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231259=3A?=
	=?utf-8?q?_i18n_issues_with_Beta?=
In-Reply-To: <076.f7b53125520cc2d8322c4161c2676a8c@vtiger.fosslabs.com>
References: <076.f7b53125520cc2d8322c4161c2676a8c@vtiger.fosslabs.com>
Message-ID: <085.a81218ef99fa98c978e478fb9ad2940e@vtiger.fosslabs.com>

#1259: i18n issues with Beta
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  developer
      Type:  defect     |      Status:  new      
  Priority:  minor      |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:             |    Keywords:           
------------------------+---------------------------------------------------
Comment (by anonymous):

 and here:

 \Modules\Calendar\calendarLayout.php

 48.791  $list_view .="<td colspan='".$header_rows."'><i>None
 Scheduled</i></td>";
 52.452  $list_view .="<td colspan='".$header_rows."'><i>None
 Scheduled</i></td>";

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1259>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun  2 12:15:38 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 02 Jun 2006 16:15:38 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231259=3A?=
	=?utf-8?q?_i18n_issues_with_Beta?=
In-Reply-To: <076.f7b53125520cc2d8322c4161c2676a8c@vtiger.fosslabs.com>
References: <076.f7b53125520cc2d8322c4161c2676a8c@vtiger.fosslabs.com>
Message-ID: <085.e90054241571ef66959a50f67c5c0411@vtiger.fosslabs.com>

#1259: i18n issues with Beta
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  developer
      Type:  defect     |      Status:  new      
  Priority:  minor      |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:             |    Keywords:           
------------------------+---------------------------------------------------
Comment (by anonymous):

 and here:

 \Modules\Calendar\calendarLayout.php

 9.471   <td align='right' width='25%'><b>View : </b>";

 and here (this eems to be a major issue and also includes "today", "this
 week" and "this month")

 \Modules\Activities\OpenListView.php
 2.676   else if($activity_view == 'This Year')
 12.949  else if($activity_view == 'This Year')
 13.708  $ACTIVITY_VIEW_SELECT_OPTION .= '<option value="This Year"
 '.$selected4.'>';
 13.771  $ACTIVITY_VIEW_SELECT_OPTION .= 'This Year';

 and here: (it also includes "today", "Last Week")

 \Modules\Leads\ListViewTop.php
 2.339   else if($lead_view == 'Last 2 Days')
 5.239   else if($lead_view == 'Last 2 Days')
 5.665   $LEAD_VIEW_SELECT_OPTION .= '<option value="Last 2 Days"
 '.$selected2.'>';
 5.727   $LEAD_VIEW_SELECT_OPTION .= 'Last 2 Days';

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1259>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun  2 12:27:53 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 02 Jun 2006 16:27:53 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231259=3A?=
	=?utf-8?q?_i18n_issues_with_Beta?=
In-Reply-To: <076.f7b53125520cc2d8322c4161c2676a8c@vtiger.fosslabs.com>
References: <076.f7b53125520cc2d8322c4161c2676a8c@vtiger.fosslabs.com>
Message-ID: <085.2f26948130b439562c26361e98729cf0@vtiger.fosslabs.com>

#1259: i18n issues with Beta
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  developer
      Type:  defect     |      Status:  new      
  Priority:  minor      |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:             |    Keywords:           
------------------------+---------------------------------------------------
Comment (by anonymous):

 there seems to be no translation for the standard report names possible.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1259>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun  2 12:42:49 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 02 Jun 2006 16:42:49 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231259=3A?=
	=?utf-8?q?_i18n_issues_with_Beta?=
In-Reply-To: <076.f7b53125520cc2d8322c4161c2676a8c@vtiger.fosslabs.com>
References: <076.f7b53125520cc2d8322c4161c2676a8c@vtiger.fosslabs.com>
Message-ID: <085.d4a62b7712e602b42d2ba4cbce6d4b04@vtiger.fosslabs.com>

#1259: i18n issues with Beta
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  developer
      Type:  defect     |      Status:  new      
  Priority:  minor      |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:             |    Keywords:           
------------------------+---------------------------------------------------
Comment (by anonymous):

 see here, the entire popup window does not get translated

 Modules\Portal\Popup.php

 1.182   <td class="genHeaderSmall" align="left" width="30%">Add
 Bookmark</td>

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1259>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun  2 13:09:01 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 02 Jun 2006 17:09:01 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231260=3A?=
	=?utf-8?q?_i18n_issue_at_activities?=
Message-ID: <076.bf2281a02d95e6f032d828d0839694a6@vtiger.fosslabs.com>

#1260: i18n issue at activities
-----------------------+----------------------------------------------------
 Reporter:  anonymous  |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  major      |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 at the menu that allows to schedule a new activity the following entry
 field (drop down lists) can not get translated:

 Status: there are activity fields for the status at the studio but these
 fields do not apply to the activity menu

 Acivitytype: No changes possible at the studio

 Visibility: No changes possible at the studio

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1260>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun  2 13:10:50 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 02 Jun 2006 17:10:50 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231260=3A?=
 =?utf-8?q?_i18n_issue_at_activities?=
In-Reply-To: <076.bf2281a02d95e6f032d828d0839694a6@vtiger.fosslabs.com>
References: <076.bf2281a02d95e6f032d828d0839694a6@vtiger.fosslabs.com>
Message-ID: <085.fdcb871d9fef1fa3809282da221022a5@vtiger.fosslabs.com>

#1260: i18n issue at activities
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  developer
      Type:  defect     |      Status:  new      
  Priority:  major      |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:             |    Keywords:           
------------------------+---------------------------------------------------
Comment (by anonymous):

 There are lables at the activiy lang file:
 'LBL_MINUTES'=>'Minuten',
 'LBL_HOURS'=>'Stunden',
 'LBL_BEFORE_EVENT'=>'vor Ereignis',

 They do not apply for the new activity menu.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1260>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun  2 13:13:54 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 02 Jun 2006 17:13:54 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231260=3A?=
 =?utf-8?q?_i18n_issue_at_activities?=
In-Reply-To: <076.bf2281a02d95e6f032d828d0839694a6@vtiger.fosslabs.com>
References: <076.bf2281a02d95e6f032d828d0839694a6@vtiger.fosslabs.com>
Message-ID: <085.9e7ab8187d4a33e07d2d47eaeba8c6b2@vtiger.fosslabs.com>

#1260: i18n issue at activities
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  developer
      Type:  defect     |      Status:  new      
  Priority:  major      |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:             |    Keywords:           
------------------------+---------------------------------------------------
Comment (by anonymous):

 "Recurring Events" can also not get translated

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1260>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun  2 13:58:38 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 02 Jun 2006 17:58:38 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231259=3A?=
	=?utf-8?q?_i18n_issues_with_Beta?=
In-Reply-To: <076.f7b53125520cc2d8322c4161c2676a8c@vtiger.fosslabs.com>
References: <076.f7b53125520cc2d8322c4161c2676a8c@vtiger.fosslabs.com>
Message-ID: <085.734380847fdaca000d592ee839aec795@vtiger.fosslabs.com>

#1259: i18n issues with Beta
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  developer
      Type:  defect     |      Status:  new      
  Priority:  minor      |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:             |    Keywords:           
------------------------+---------------------------------------------------
Comment (by anonymous):

 here is a bug (for minutes) in \Include\Utils\EditViewUtils.php

 35.364  $fieldvalue[] =
 array(array(0,32,'remdays','days',$rem_days),array(0,24,'remhrs','hours',$rem_hrs),array(1,60,'remmin','minutes
 before event',$rem_min));

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1259>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun  2 14:21:53 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 02 Jun 2006 18:21:53 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231259=3A?=
	=?utf-8?q?_i18n_issues_with_Beta?=
In-Reply-To: <076.f7b53125520cc2d8322c4161c2676a8c@vtiger.fosslabs.com>
References: <076.f7b53125520cc2d8322c4161c2676a8c@vtiger.fosslabs.com>
Message-ID: <085.6eb41505678cca6b9fe0bbcdcf273458@vtiger.fosslabs.com>

#1259: i18n issues with Beta
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  developer
      Type:  defect     |      Status:  new      
  Priority:  minor      |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:             |    Keywords:           
------------------------+---------------------------------------------------
Comment (by anonymous):

 Standard email snet by the CRM are hardcoded.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1259>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun  2 16:25:42 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 02 Jun 2006 20:25:42 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231261=3A?=
 =?utf-8?q?_vtigercrm-5=2E0-beta_tag_incorrect_for_release_process=2C_tag_?=
 =?utf-8?q?vtigercrm-5=2E0=2E0beta1_correctly?=
Message-ID: <076.cf0e2bb1cc2f75858999fd249d815604@vtiger.fosslabs.com>

#1261: vtigercrm-5.0-beta tag incorrect for release process, tag
vtigercrm-5.0.0beta1 correctly
------------------------------------------+---------------------------------
 Reporter:  jeffk                         |       Owner:  jeffk
     Type:  defect                        |      Status:  new  
 Priority:  major                         |   Milestone:  5.0.0
Component:  vtigercrm                     |     Version:  5.0.0
 Keywords:  packaging versioning release  |  
------------------------------------------+---------------------------------
 The recent release of 'vtigercrm-5.0-beta' was tagged, but in a way that
 does not adhere to release processes developed in the vtigercrm-4.2
 series.

 I will point out the problems, and re-tag the release correctly to fix the
 issue.

  - The release can't be named vtigercrm-5.0-beta, unless you expect to
 have only one beta

  - The release version shouldn't be 5.0, it should be 5.0.0. This is a
 style and process issue, but we're trying to make things as easy as
 possible for packagers (to attract their assistance) by using our three
 ordinal scheme everywhere. Major, Minor, Maintenance, suffix. This
 consistency will cover every type of release we need to make.

  - The directory for vtigercrm release tags is source:vtigercrm/tags, not
 source:tags. This is partially my fault, I haven't pushed to remove the
 obsolete directories left over by the cvs2svn conversion we did when
 leaving sourceforge. source:branches and source:tags are obsolete
 directories, we'll remove them soon.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1261>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun  2 16:31:09 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 02 Jun 2006 20:31:09 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231261=3A?=
 =?utf-8?q?_vtigercrm-5=2E0-beta_tag_incorrect_for_release_process=2C_tag_?=
 =?utf-8?q?vtigercrm-5=2E0=2E0beta1_correctly?=
In-Reply-To: <076.cf0e2bb1cc2f75858999fd249d815604@vtiger.fosslabs.com>
References: <076.cf0e2bb1cc2f75858999fd249d815604@vtiger.fosslabs.com>
Message-ID: <085.cf709c2a13257ed59bf3e4f4458be3ee@vtiger.fosslabs.com>

#1261: vtigercrm-5.0-beta tag incorrect for release process, tag
vtigercrm-5.0.0beta1 correctly
------------------------+---------------------------------------------------
  Reporter:  jeffk      |       Owner:  jeffk                       
      Type:  defect     |      Status:  new                         
  Priority:  major      |   Milestone:  5.0.0                       
 Component:  vtigercrm  |     Version:  5.0.0                       
Resolution:             |    Keywords:  packaging versioning release
------------------------+---------------------------------------------------
Comment (by jeffk):

 (In [6887]) refs #1261. retag vtigercrm-5.0.0beta1

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1261>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun  2 16:31:09 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 02 Jun 2006 20:31:09 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6887 -
	/vtigercrm/tags/vtigercrm-5.0.0beta1/
Message-ID: <20060602203109.C854B6205D5@vtiger.fosslabs.com>

Author: jeffk
Date: Fri Jun  2 14:31:07 2006
New Revision: 6887

Log:
refs #1261. retag vtigercrm-5.0.0beta1

Added:
    vtigercrm/tags/vtigercrm-5.0.0beta1/
      - copied from r6881, vtigercrm/trunk/




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun  2 16:33:05 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 02 Jun 2006 20:33:05 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6888 -
	/tags/vtigercrm-5.0.0-beta/
Message-ID: <20060602203305.4CD255F7B09@vtiger.fosslabs.com>

Author: jeffk
Date: Fri Jun  2 14:33:03 2006
New Revision: 6888

Log:
fixes

Removed:
    tags/vtigercrm-5.0.0-beta/




From vtiger-tickets at vtiger.fosslabs.com  Fri Jun  2 16:41:18 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 02 Jun 2006 20:41:18 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231261=3A?=
 =?utf-8?q?_vtigercrm-5=2E0-beta_tag_incorrect_for_release_process=2C_tag_?=
 =?utf-8?q?vtigercrm-5=2E0=2E0beta1_correctly?=
In-Reply-To: <076.cf0e2bb1cc2f75858999fd249d815604@vtiger.fosslabs.com>
References: <076.cf0e2bb1cc2f75858999fd249d815604@vtiger.fosslabs.com>
Message-ID: <085.3a0b2770f3d97750ee800fc69d18a9e3@vtiger.fosslabs.com>

#1261: vtigercrm-5.0-beta tag incorrect for release process, tag
vtigercrm-5.0.0beta1 correctly
------------------------+---------------------------------------------------
  Reporter:  jeffk      |       Owner:  jeffk                       
      Type:  defect     |      Status:  closed                      
  Priority:  major      |   Milestone:  5.0.0                       
 Component:  vtigercrm  |     Version:  5.0.0                       
Resolution:  fixed      |    Keywords:  packaging versioning release
------------------------+---------------------------------------------------
Changes (by jeffk):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 Closing per r6888. I made a mistake in commit message (missing opening
 qoute),

 Can't use propset on this repository:
 {{{
 $ svn propset --revprop -r 6888 svn:log 'fixes #1261. remove improper tag
 vtigercrm-5.0-beta in obsolete root tags directory'
 svn: DAV request failed; it's possible that the repository's pre-revprop-
 change hook either failed or is non-existent
 svn: At least one property change failed; repository is unchanged
 }}}

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1261>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun  2 18:48:13 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 02 Jun 2006 22:48:13 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=2348=3A_S?=
 =?utf-8?q?ales_Orders_Created_from_Quote_are_not_saved_and_do_not_retain_?=
 =?utf-8?q?associations?=
In-Reply-To: <076.6d585e55b32136b76a36642c5be35e19@vtiger.fosslabs.com>
References: <076.6d585e55b32136b76a36642c5be35e19@vtiger.fosslabs.com>
Message-ID: <085.4b8c0cfa8dad7c2cbefba8a482f89bdf@vtiger.fosslabs.com>

#48: Sales Orders Created from Quote are not saved and do not retain
associations
-----------------------------------------------+----------------------------
  Reporter:  onwealdandy <arodes at onweald.com>  |       Owner:  developer
      Type:  defect                            |      Status:  reopened 
  Priority:  major                             |   Milestone:  4.2.4    
 Component:  vtigercrm                         |     Version:  4.2.3    
Resolution:                                    |    Keywords:  order    
-----------------------------------------------+----------------------------
Changes (by anonymous):

  * resolution:  fixed =>
  * status:  closed => reopened

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/48>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun  2 18:50:30 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 02 Jun 2006 22:50:30 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=2348=3A_S?=
 =?utf-8?q?ales_Orders_Created_from_Quote_are_not_saved_and_do_not_retain_?=
 =?utf-8?q?associations?=
In-Reply-To: <076.6d585e55b32136b76a36642c5be35e19@vtiger.fosslabs.com>
References: <076.6d585e55b32136b76a36642c5be35e19@vtiger.fosslabs.com>
Message-ID: <085.e46d55f9e3d361ee7e0b26f6b92c5716@vtiger.fosslabs.com>

#48: Sales Orders Created from Quote are not saved and do not retain
associations
-----------------------------------------------+----------------------------
  Reporter:  onwealdandy <arodes at onweald.com>  |       Owner:  developer
      Type:  defect                            |      Status:  reopened 
  Priority:  major                             |   Milestone:  4.2.4    
 Component:  vtigercrm                         |     Version:  4.2.3    
Resolution:                                    |    Keywords:  order    
-----------------------------------------------+----------------------------
Comment (by sebastian_sw at hotmail.com):

 i have this problem with invoice, quotes and orders.

 Any solution? maybe someone can attached the codes for this modules

 Thanks

 Seb

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/48>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun  2 20:07:02 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 03 Jun 2006 00:07:02 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6889 -
	/vtigercrm/tags/vtigercrm-4.2.4rc1/
Message-ID: <20060603000702.CBA4F64F5F5@vtiger.fosslabs.com>

Author: jeffk
Date: Fri Jun  2 18:07:01 2006
New Revision: 6889

Log:
remove unsupported prerelease tags after testing period ends. leave final release tags in place indefinitely, even after announced deprecation of support.

Removed:
    vtigercrm/tags/vtigercrm-4.2.4rc1/




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun  2 20:07:16 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 03 Jun 2006 00:07:16 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6890 -
	/vtigercrm/tags/vtigercrm-4.2.4rc2/
Message-ID: <20060603000716.4BECD64F5F5@vtiger.fosslabs.com>

Author: jeffk
Date: Fri Jun  2 18:07:14 2006
New Revision: 6890

Log:
remove unsupported prerelease tags after testing period ends. leave final release tags in place indefinitely, even after announced deprecation of support.

Removed:
    vtigercrm/tags/vtigercrm-4.2.4rc2/




From vtiger-tickets at vtiger.fosslabs.com  Sat Jun  3 11:40:03 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sat, 03 Jun 2006 15:40:03 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231262=3A?=
 =?utf-8?q?_Products_not_being_listed_against_Accounts_when_Sales_Order/In?=
 =?utf-8?q?voice_created?=
Message-ID: <076.fd68f0c276cf51384c7c588eeaea61be@vtiger.fosslabs.com>

#1262: Products not being listed against Accounts when Sales Order/Invoice created
---------------------------------+------------------------------------------
 Reporter:  thealbs at yahoo.co.uk  |       Owner:  developer
     Type:  defect               |      Status:  new      
 Priority:  major                |   Milestone:           
Component:  vtigercrm            |     Version:  5.0.0    
 Keywords:  products             |  
---------------------------------+------------------------------------------
 Hi there

 the product looks great! I have one question regarding the link between
 Accounts and Products. Once the Account has completed a sales-
 order/invoice which has a number of Products listed on it, shouldn't those
 Products be listed against the Account?

 For example, ACME.COM ask for a quote for 5 new widgets.
 When the invoice is generated for the new widgets, then the five new
 widgets should be listed against the ACME.COM account record?

 For service providers this would make the product so much more usable!

 Thanks

 Brian

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1262>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Sat Jun  3 21:26:56 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sun, 04 Jun 2006 01:26:56 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231263=3A?=
 =?utf-8?q?_Miscellaneous_Formatting_Issues_on_Home_Page?=
Message-ID: <076.5f75ce96bab4ec540e83025d032a7109@vtiger.fosslabs.com>

#1263: Miscellaneous Formatting Issues on Home Page
-----------------------+----------------------------------------------------
 Reporter:  briand     |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  minor      |   Milestone:  4.2.5    
Component:  vtigercrm  |     Version:  4.2.4rc3 
 Keywords:             |  
-----------------------+----------------------------------------------------
 The following formatting issues are addressed in the patch.
 Incorrect class on table for Top Accounts.
 Missing black line on bottom of Top Accounts (not noticable in default
 theme).
 Too much space between Activities and Allocation when Accounts and
 Potentials do not exist.
 "None Scheduled" message relating to Potentials does not make sense for
 potentials and is not consistent with other Home sections.
 Spacing issues between Accounts and Potentials sections.
 Other miscellaneous HTML fixes.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1263>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun  5 07:18:55 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 05 Jun 2006 11:18:55 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6891 -
	/vtigercrm/trunk/install/3confirmConfig.php
Message-ID: <20060605111855.8F44A64F604@vtiger.fosslabs.com>

Author: don
Date: Mon Jun  5 05:18:50 2006
New Revision: 6891

Log:
check for mysql version made only for versions less than 4.1

Modified:
    vtigercrm/trunk/install/3confirmConfig.php

Modified: vtigercrm/trunk/install/3confirmConfig.php
==============================================================================
--- vtigercrm/trunk/install/3confirmConfig.php (original)
+++ vtigercrm/trunk/install/3confirmConfig.php Mon Jun  5 05:18:50 2006
@@ -102,7 +102,7 @@
 			-  specified database user, password, hostname, database type, or port is invalid.<BR>
 			-  specified database user does not have access to connect to the database server from the host';
 }
-elseif($db_type == 'mysql' && ($mysql_server_version < '4.1' || $mysql_server_version > '5.0.19'))
+elseif($db_type == 'mysql' && $mysql_server_version < '4.1')
 {
 	$error_msg = 'MySQL version '.$mysql_server_version.' is not supported, kindly connect to MySQL 4.1.x or above';
 }




From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun  5 07:49:33 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 05 Jun 2006 11:49:33 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6892 - in
 /vtigercrm/trunk/modules/Rss: Rss.php language/en_us.lang.php
Message-ID: <20060605114933.E4AF364FD2B@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun  5 05:49:24 2006
New Revision: 6892

Log:
i18n updated for RSS Module - ahmed

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

Modified: vtigercrm/trunk/modules/Rss/Rss.php
==============================================================================
--- vtigercrm/trunk/modules/Rss/Rss.php (original)
+++ vtigercrm/trunk/modules/Rss/Rss.php Mon Jun  5 05:49:24 2006
@@ -259,7 +259,7 @@
 	function getStarredRssHTML()
 	{
 		global $adb;
-		global $image_path;
+		global $image_path,$mod_strings;
 
 		$sSQL = "select * from rss where starred=1";
 		$result = $adb->query($sSQL);
@@ -275,7 +275,7 @@
 				if(count($this->rss_object) > 10)
 				{
 					$shtml .= "<tr><td colspan='3' align=\"right\">
-						<a target=\"_BLANK\" href=\"$this->rss_link\">More...</a>
+						<a target=\"_BLANK\" href=\"$this->rss_link\">".$mod_strings['LBL_MORE']."</a>
 						</td></tr>";
 				}
 			}
@@ -292,8 +292,8 @@
 		}
 		$starredhtml  = "<table class='rssTable' cellspacing='0' cellpadding='0'>
 						<tr>
-       	                <th width='75%'>Subject</th>
-           	            <th width='25%'>Sender</th>
+       	                <th width='75%'>".$mod_strings['LBL_SUBJECT']."</th>
+           	            <th width='25%'>".$mod_strings['LBL_SENDER']."</th>
                    	    </tr>".$starredhtml."</table>";
 
 		return $starredhtml;
@@ -306,7 +306,7 @@
 	function getSelectedRssHTML($rssid)
 	{
 		global $adb;
-		global $image_path;
+		global $image_path, $mod_strings;
 
 		$sSQL = "select * from rss where rssid=".$rssid;
 		$result = $adb->query($sSQL);
@@ -322,7 +322,7 @@
 				if(count($this->rss_object) > 10)
 				{
 					$shtml .= "<tr><td colspan='3' align=\"right\">
-							<a target=\"_BLANK\" href=\"$this->rss_link\">More...</a>
+							<a target=\"_BLANK\" href=\"$this->rss_link\">".$mod_strings['LBL_MORE']."</a>
 							</td></tr>";
 				}
 			}
@@ -339,8 +339,8 @@
 		}
 		$starredhtml  = "<table class='rssTable' cellspacing='0' cellpadding='0'>
 						<tr>
-       	                <th width='75%'>Subject</th>
-           	            <th width='25%'>Sender</th>
+       	                <th width='75%'>".$mod_strings['LBL_SUBJECT']."</th>
+           	            <th width='25%'>".$mod_strings['LBL_SENDER']."</th>
                    	    </tr>".$starredhtml."</table>";
 
 		return $starredhtml;

Modified: vtigercrm/trunk/modules/Rss/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Rss/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Rss/language/en_us.lang.php Mon Jun  5 05:49:24 2006
@@ -32,6 +32,9 @@
 'LBL_POP_CRM_RSS'=>'Popular CRM Related Feeds',
 'LBL_ALL_RSS_FEEDS'=>'All RSS Feeds',
 
+'LBL_MORE'=>'More...',
+'LBL_SUBJECT'=>'Suject',
+'LBL_SENDER'=>'Sender',
 'LBL_CATEGORY'=>'Category :',
 'LBL_FEED'=>'Feed :',
 'LBL_ADD_RSS_FEED'=>'Add Rss Feed',




From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun  5 08:04:34 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 05 Jun 2006 12:04:34 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6893 -
	/vtigercrm/trunk/Smarty/templates/HomePage.tpl
Message-ID: <20060605120434.A03E564FD35@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun  5 06:04:31 2006
New Revision: 6893

Log:
i18n updated for Homepage - ahmed

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 Mon Jun  5 06:04:31 2006
@@ -167,7 +167,7 @@
 		{/if}
            </tr>
 {/foreach}
-	<tr><td colspan="2" align="right" valign="bottom"><a href="index.php?module={$modulename}&action=index">more..</a></td></tr>
+	<tr><td colspan="2" align="right" valign="bottom"><a href="index.php?module={$modulename}&action=index">{$APP.LBL_MORE}..</a></td></tr>
 	</table>
 				
 			</div>




From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun  5 08:24:48 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 05 Jun 2006 12:24:48 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6894 - in
 /vtigercrm/trunk/modules/Portal: Popup.php language/en_us.lang.php
Message-ID: <20060605122448.3E7D664FD3D@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun  5 06:24:43 2006
New Revision: 6894

Log:
i18n for MySites module updated - ahmed

Modified:
    vtigercrm/trunk/modules/Portal/Popup.php
    vtigercrm/trunk/modules/Portal/language/en_us.lang.php

Modified: vtigercrm/trunk/modules/Portal/Popup.php
==============================================================================
--- vtigercrm/trunk/modules/Portal/Popup.php (original)
+++ vtigercrm/trunk/modules/Portal/Popup.php Mon Jun  5 06:24:43 2006
@@ -26,25 +26,25 @@
 $portal_inputs.='<div style="display:block;position:relative;" id="orgLay">
 		<table border="0" cellpadding="5" cellspacing="0" width="100%">
 		<tbody><tr>
-			<td class="genHeaderSmall" align="left" width="30%">Add Bookmark</td>
+			<td class="genHeaderSmall" align="left" width="30%">' .$mod_strings['LBL_ADD'] .' '.$mod_strings['LBL_BOOKMARK'].'</td>
 			<td align="right" width="80%"><a href="javascript:fninvsh(\'orgLay\');"><img src="../themes/blue/images/close.gif" align="absmiddle" border="0"></a></td>
 		</tr>
 		<tr><td colspan="2"><hr></td></tr>
 		<tr>
 
-			<td align="right"><b>Bookmark URL :</b></td>
+			<td align="right"><b>'.$mod_strings['LBL_BOOKMARK'].' ' .$mod_strings['LBL_URL'] .' </b></td>
 			<td align="left"><input name="portalurl" id="portalurl" class="txtBox" value="'.$portalurl.'" type="text"></td>
 		</tr>
 		<tr>
-			<td align="right"><b>Bookmark Name : </b></td>
+			<td align="right"><b>'.$mod_strings['LBL_BOOKMARK'].' ' .$mod_strings['LBL_NAME'] .' </b></td>
 			<td align="left"><input name="portalname" id="portalname" value="'.$portalname.'" class="txtBox" type="text"></td>
 		</tr>
 		<tr><td style="border-bottom: 1px dashed rgb(204, 204, 204);" colspan="2">&nbsp;</td></tr>
 
 		<tr>
 			<td colspan="2" align="center">
-					<input name="save" value=" &nbsp;Save&nbsp; " class="classBtn" onClick="SaveSite(\''.$portalid.'\')" type="button">&nbsp;&nbsp;
-					<input name="cancel" value=" Cancel " class="classBtn" onclick="fninvsh(\'orgLay\');" type="button">
+					<input name="save" value=" &nbsp;{$APP.LBL_SAVE_BUTTON_LABEL}&nbsp; " class="classBtn" onClick="SaveSite(\''.$portalid.'\')" type="button">&nbsp;&nbsp;
+					<input name="cancel" value=" {$APP.LBL_CANCEL_BUTTON_LABEL}  " class="classBtn" onclick="fninvsh(\'orgLay\');" type="button">
 			</td>
 		</tr>
 		<tr><td colspan="2" style="border-top: 1px dashed rgb(204, 204, 204);">&nbsp;</td></tr>

Modified: vtigercrm/trunk/modules/Portal/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Portal/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Portal/language/en_us.lang.php Mon Jun  5 06:24:43 2006
@@ -17,6 +17,10 @@
 'LBL_BOOKMARK_LIST'=>'Bookmark List',
 'LBL_MY_BOOKMARKS'=>'My Bookmarks',
 'LBL_NEW_BOOKMARK'=>'New Bookmark',
+'LBL_BOOKMARK'=>'Bookmark',
+'LBL_NAME'=>'Name :',
+'LBL_URL'=>'URL :',
+'LBL_ADD'=>'Add',
 'LBL_SNO'=>'#',
 'LBL_BOOKMARK_NAME_URL'=>'Bookmark Name &amp; URL',
 'LBL_TOOLS'=>'Tools',




From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun  5 08:44:43 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 05 Jun 2006 12:44:43 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6895 - in /vtigercrm/trunk:
 Smarty/templates/Calculator.tpl Smarty/templates/Clock.tpl
 modules/Utilities/Calculator.php
Message-ID: <20060605124443.A214364FD2D@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun  5 06:44:36 2006
New Revision: 6895

Log:
updated i18n for Clock & Calculator - ahmed

Modified:
    vtigercrm/trunk/Smarty/templates/Calculator.tpl
    vtigercrm/trunk/Smarty/templates/Clock.tpl
    vtigercrm/trunk/modules/Utilities/Calculator.php

Modified: vtigercrm/trunk/Smarty/templates/Calculator.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Calculator.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Calculator.tpl Mon Jun  5 06:44:36 2006
@@ -13,7 +13,7 @@
 <div id="calc" style="z-index:10000002">
 	<table class="leftFormBorder1" border="0" cellpadding="0" cellspacing="0" width="100%">
 		<tr class="lvtCol" style="cursor:move;" >
-			<td style="text-align:left;padding-left:5px;border-bottom:1px solid #666666;" id="calc_Handle">Calculator</td>
+			<td style="text-align:left;padding-left:5px;border-bottom:1px solid #666666;" id="calc_Handle">{$APP.LBL_CALCULATOR}</td>
 			<td align="right" style="padding:5px;border-bottom:1px solid #666666;">
 			<a href="javascript:;">
 			<img src="{$IMAGEPATH}close.gif" border="0"  onClick="fninvsh('calc')" hspace="5" align="absmiddle">

Modified: vtigercrm/trunk/Smarty/templates/Clock.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Clock.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Clock.tpl Mon Jun  5 06:44:36 2006
@@ -14,7 +14,7 @@
 	<table class="leftFormBorder1" align="center" border="0" cellpadding="2" cellspacing="0" width="100%">
 	<tbody>
 	<tr class="lvtCol" style="cursor:move;" >
-		<td style="text-align:left;padding-left:5px;border-bottom:1px solid #666666;" id="Handle">World Clock</td>
+		<td style="text-align:left;padding-left:5px;border-bottom:1px solid #666666;" id="Handle">{$APP.LBL_WORLD_CLOCK}</td>
 		<td align="right" style="padding:5px;border-bottom:1px solid #666666;">
 			<a href="javascript:;">
 				<img src="{$IMAGEPATH}close.gif" border="0"  onClick="fninvsh('wclock')" hspace="5" align="absmiddle">

Modified: vtigercrm/trunk/modules/Utilities/Calculator.php
==============================================================================
--- vtigercrm/trunk/modules/Utilities/Calculator.php (original)
+++ vtigercrm/trunk/modules/Utilities/Calculator.php Mon Jun  5 06:44:36 2006
@@ -16,13 +16,13 @@
 
 require_once('Smarty_setup.php');
 require_once("include/calculator/Calc.php");
-global $theme;
+global $theme,$app_strings;
 $theme_path="themes/".$theme."/";
 $image_path=$theme_path."images/";
 
 $smarty = new vtigerCRM_Smarty;
 
-
+$smarty->assign("APP", $app_strings);
 $smarty->assign("IMAGEPATH",$image_path);
 $smarty->assign("CALC",get_calc($image_path));
 $smarty->display("Calculator.tpl");




From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun  5 09:37:01 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 05 Jun 2006 13:37:01 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6896 -
	/vtigercrm/trunk/modules/Calendar/addEventUI.php
Message-ID: <20060605133701.19E0764FCE7@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun  5 07:36:58 2006
New Revision: 6896

Log:
API docs updated

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

Modified: vtigercrm/trunk/modules/Calendar/addEventUI.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/addEventUI.php (original)
+++ vtigercrm/trunk/modules/Calendar/addEventUI.php Mon Jun  5 07:36:58 2006
@@ -72,6 +72,14 @@
 $calendar_arr['calendar'] = new Calendar($mysel,$date_data);
 $calendar_arr['view'] = $mysel;
 $calendar_arr['calendar']->hour_format = $current_user->hour_format;
+
+/**
+  *To construct time select combo box
+  *@param $format -- the format :: Type string
+  *@param $bimode -- The mode :: Type string
+  *constructs html select combo box for time selection 
+  *and returns it in string format.
+ */
 
  function getTimeCombo($format,$bimode)
  {




From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun  5 09:38:43 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 05 Jun 2006 13:38:43 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6897 -
	/vtigercrm/trunk/modules/Calendar/Appointment.php
Message-ID: <20060605133844.117DE64FCE7@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun  5 07:38:40 2006
New Revision: 6897

Log:
API docs updated

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

Modified: vtigercrm/trunk/modules/Calendar/Appointment.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/Appointment.php (original)
+++ vtigercrm/trunk/modules/Calendar/Appointment.php Mon Jun  5 07:38:40 2006
@@ -41,7 +41,16 @@
 		$this->participant = Array();
 		$this->participant_state = Array();
 		$this->description = "";
-	}	
+	}
+	
+	/** To get the events of the specified user and shared events
+	  * @param $userid -- The user Id:: Type integer
+          * @param $from_datetime -- The start date Obj :: Type Array
+          * @param $to_datetime -- The end date Obj :: Type Array
+          * @param $view -- The calendar view :: Type String
+	  * @returns $list :: Type Array
+	 */
+	
 	function readAppointment($userid, &$from_datetime, &$to_datetime, $view)
 	{
 		global $current_user,$adb;
@@ -109,6 +118,11 @@
 		return $list;
 	}
 
+
+	/** To read and set the events value in Appointment Obj
+          * @param $act_array -- The activity array :: Type Array
+          * @param $view -- The calendar view :: Type String
+         */
 	function readResult($act_array, $view)
 	{
 		global $adb;
@@ -226,6 +240,11 @@
 	
 }
 
+/** To two array values
+  * @param $a -- The activity array :: Type Array
+  * @param $b -- The activity array :: Type Array
+  * @returns value 0 or 1 or -1 depends on comparision result
+ */
 function compare($a,$b)
 {
 	if ($a->start_time->ts == $b->start_time->ts)




From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun  5 09:47:27 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 05 Jun 2006 13:47:27 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6898 -
	/vtigercrm/trunk/modules/Calendar/CalendarCommon.php
Message-ID: <20060605134728.13EDC64FCC2@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun  5 07:47:24 2006
New Revision: 6898

Log:
API docs updated

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

Modified: vtigercrm/trunk/modules/Calendar/CalendarCommon.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/CalendarCommon.php (original)
+++ vtigercrm/trunk/modules/Calendar/CalendarCommon.php Mon Jun  5 07:47:24 2006
@@ -17,10 +17,9 @@
 $image_path=$theme_path."images/";
 
 /**
- * Function to get the lists of sharedids 
- * This function accepts the user id as argument and
- * returns the shared ids related with the user id
- * as an array
+ * To get the lists of sharedids 
+ * @param $id -- The user id :: Type integer
+ * @returns $sharedids -- The shared users id :: Type Array
  */
 function getSharedUserId($id)
 {
@@ -37,10 +36,9 @@
 }
 
 /**
- * Function to get the lists of user ids who shared their calendar with an user
- * This function accepts the shared id as arguments and
- * returns the user ids related with the shared id
- * as a comma seperated string
+ * To get the lists of users id who shared their calendar with specified user
+ * @param $sharedid -- The shared user id :: Type integer
+ * @returns $shared_ids -- a comma seperated users id  :: Type string
  */
 function getSharedCalendarId($sharedid)
 {
@@ -57,39 +55,10 @@
 }
 
 /**
- * Function to get the label for user lists
- * Returns the label as an array
- */
-function getSharedUserListViewHeader()
-{
-	global $mod_strings;
-		$header_label=array($mod_strings['LBL_LIST_NAME'],
-			            $mod_strings['LBL_LIST_USER_NAME'],
-				   );
-	return $header_label;
-}
-
-/**
- * Function to get the entries for user lists
- * This function accepts the shared id as arguments and
- * returns the user entries related with the shared id
- * as an array
- */
-function getSharedUserListViewEntries($sharedid)
-{
-	global $adb;
-	$query = "SELECT * from users where id=".$sharedid;
-	$result =$adb->query($query);
-	$entries[]=$adb->query_result($result,0,'first_name').' '.$adb->query_result($result,0,'last_name');
-	$entries[]='<a href="index.php?action=DetailView&module=Users&parenttab=Settings&record='.$sharedid.'">'.$adb->query_result($result,0,'user_name').'</a>';
-	return $entries;
-
-}
-
-/**
- * Function to get userid and username of all users except the current user
- * @returns $userArray -- User Array in the following format:
- * $userArray=Array($userid1=>$username, $userid2=>$username,............,$useridn=>$username);
+ * To get userid and username of all users except the current user
+ * @param $id -- The user id :: Type integer
+ * @returns $user_details -- Array in the following format:
+ * $user_details=Array($userid1=>$username, $userid2=>$username,............,$useridn=>$username);
  */
 function getOtherUserName($id)
 {
@@ -107,6 +76,13 @@
 	return $user_details;
 }
 
+/**
+ * To get hour,minute and format
+ * @param $starttime -- The date&time :: Type string
+ * @param $endtime -- The date&time :: Type string
+ * @param $format -- The format :: Type string
+ * @returns $timearr :: Type Array
+*/
 function getaddEventPopupTime($starttime,$endtime,$format)
 {
 	$timearr = Array();




From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun  5 09:49:15 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 05 Jun 2006 13:49:15 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6899 -
	/vtigercrm/trunk/modules/Calendar/calendarLayout.php
Message-ID: <20060605134915.092BE64FCC2@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun  5 07:49:11 2006
New Revision: 6899

Log:
API docs updated

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

Modified: vtigercrm/trunk/modules/Calendar/calendarLayout.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/calendarLayout.php (original)
+++ vtigercrm/trunk/modules/Calendar/calendarLayout.php Mon Jun  5 07:49:11 2006
@@ -13,8 +13,9 @@
 require_once('include/utils/CommonUtils.php');
 require_once('modules/Calendar/CalendarCommon.php');
 
-/** To construct calendar subtabs
-  * @param $param_arr -- The calendar object:: Type class Calendar
+/**
+  * To construct calendar subtabs
+  * @param $param_arr -- The calendar array :: Type Array
  */
 function calendar_layout(& $param_arr)
 {
@@ -69,8 +70,9 @@
 	
 }
 
-/** To construct small calendar 
-  * @param $cal -- The calendar object:: Type class Calendar
+/**
+  * To construct small(mini) calendar 
+  * @param $cal -- The calendar array:: Type Array
  */
 function get_mini_calendar(& $cal)
 {
@@ -139,9 +141,10 @@
 	
 }
 
-/*To construct calendar headertabs
- * @param $header -- The calendar object:: Type class Calendar
-*/
+/**
+  * To construct calendar headertabs
+  * @param $header -- The calendar array :: Type Array
+  */
 function get_cal_header_tab(& $header)
 {
 	global $mod_strings;
@@ -192,9 +195,10 @@
 	echo $tabhtml;
 }
 
-/*To display events/todos detail in calendar header
- *@param $cal_arr -- The calendar array:: Type Array 
-*/
+/**
+  * To display events/todos detail in calendar header
+  * @param $cal_arr -- The calendar array:: Type Array 
+  */
 function get_cal_header_data(& $cal_arr)
 {
 	global $mod_strings;
@@ -225,9 +229,10 @@
 		</table>";
 	echo $headerdata;	
 }
-/*To get View Combo box
- *@param $cal -- The calendar array:: Type Array
-*/
+/**
+  * To get View Combo box
+  * @param $cal -- The calendar array:: Type Array
+  */
 function getEventViewOption(& $cal)
 {
 	global $mod_strings;
@@ -238,9 +243,10 @@
 	return $view;
 }
 
-/*link to previous day/week/month/year view
- *@param $cal -- The calendar array:: Type Array
-*/
+/**
+  * link to previous day/week/month/year view
+  * @param $cal -- The calendar array:: Type Array
+  */
 function get_previous_cal(& $cal)
 {
         global $mod_strings;
@@ -248,9 +254,10 @@
 	return $link;
 }
 
-/*link to next day/week/month view
- *@param $cal -- The calendar array:: Type Array
-*/
+/**
+  * link to next day/week/month view
+  * @param $cal -- The calendar array:: Type Array
+  */
 function get_next_cal(& $cal)
 {
         global $mod_strings;
@@ -259,9 +266,10 @@
 
 }
 
-/*To display date info in calendar header
- *@param $cal -- The calendar array:: Type Array
-*/
+/**
+  * To display date info in calendar header
+  * @param $cal -- The calendar array:: Type Array
+  */
 function display_date($view,$date_time)
 {
 	if ($view == 'day')
@@ -298,9 +306,10 @@
         }
 
 }
-/*To get css class name for date
- *@param $slice_date -- The calendar date:: Type string
- *return css class name :: Type string 
+/**
+  * To get css class name for date
+  * @param $slice_date -- The calendar date:: Type string
+  * @returns css class name :: Type string 
 */
 function dateCheck($slice_date)
 {
@@ -315,10 +324,11 @@
 	}
 }
 
-/*To get day/week/month events Hourview
- @param $view -- The calendar array :: Type Array
- @param $type -- The type(to differntiate hourview and listview) :: Type string
-*/
+/**
+  * To get day/week/month events Hourview
+  * @param $view -- The calendar array :: Type Array
+  * @param $type -- The type(to differntiate hourview and listview) :: Type string
+  */
 function getHourView(& $view,$type = 'default' )
 {
 	if($view['view'] == 'day')
@@ -343,10 +353,11 @@
 	}
 }
 
-/*To get day/week/month events listview
- @param $cal -- The calendar array :: Type Array
- @param $mode -- The mode(to differntiate hourview and listview) :: Type string
-*/
+/**
+  * To get day/week/month events listview
+  * @param $cal -- The calendar array :: Type Array
+  * @param $mode -- The mode(to differntiate hourview and listview) :: Type string
+  */
 function getEventListView(& $cal,$mode='')
 {
 	if($cal['calendar']->view == 'day')
@@ -399,11 +410,12 @@
 	
 }
 
-/*To get day/week/month todos listview
- *@param $cal -- The calendar array :: Type Array
- *@param $check -- The check :: Type string
- *return todolist string or todo listview html depends on $check value
-*/
+/**
+  * To get day/week/month todos listview
+  * @param $cal -- The calendar array :: Type Array
+  * @param $check -- The check :: Type string
+  * @returns todolist string or todo listview html depends on $check value
+  */
 function getTodosListView($cal, $check='')
 {
 	if($cal['calendar']->view == 'day')
@@ -455,10 +467,11 @@
         }
 }
 
-/*To get calendar layout for dayview
- *@param $cal -- The calendar array :: Type Array
- *@param $type -- The type :: Type string
-*/
+/**
+  * To get calendar layout for dayview
+  * @param $cal -- The calendar array :: Type Array
+  * @param $type -- The type :: Type string
+  */
 function getDayViewLayout(& $cal,$type)
 {
 	global $current_user,$app_strings;
@@ -533,10 +546,11 @@
 	echo $dayview_layout;		
 }
 
-/*To get calendar layout for week view
- *@param $cal -- The calendar array :: Type Array
- *@param $type  -- The type :: Type string
-*/
+/**
+  * To get calendar layout for week view
+  * @param $cal -- The calendar array :: Type Array
+  * @param $type  -- The type :: Type string
+  */
 function getWeekViewLayout(& $cal,$type)
 {
 	global $current_user,$app_strings;
@@ -635,10 +649,11 @@
 		
 }
 	
-/*To get calendar layout for month view
- *@param $cal -- The calendar array :: Type Array
- *@param $type  -- The type :: Type string
-*/
+/**
+  * To get calendar layout for month view
+  * @param $cal -- The calendar array :: Type Array
+  * @param $type  -- The type :: Type string
+  */
 function getMonthViewLayout(& $cal,$type)
 {
 	global $current_user,$app_strings;
@@ -709,10 +724,11 @@
 		
 }
 
-/*To get calendar layout for year view
- *@param $cal -- The calendar array :: Type Array
- *@param $type  -- The type :: Type string
-*/
+/** 
+  * To get calendar layout for year view
+  * @param $cal -- The calendar array :: Type Array
+  * @param $type  -- The type :: Type string
+  */
 function getYearViewLayout(& $cal,$type)
 {
 	global $mod_strings;
@@ -817,11 +833,12 @@
 	
 }
 
-/*To display events in day view
- *@param $cal -- The calendar array :: Type Array
- *@param $slice  -- The slice(date and time) :: Type string
- *returns event in html div format
-*/
+/**
+  * To display events in day view
+  * @param $cal -- The calendar array :: Type Array
+  * @param $slice  -- The slice(date and time) :: Type string
+  * @returns $eventlayer(html div) -- Type string
+  */
 function getdayEventLayer(& $cal,$slice)
 {
 	global $mod_strings;
@@ -870,10 +887,11 @@
 	}
 }
 
-/*To display events in week view
- *@param $cal -- The calendar array :: Type Array
- *@param $slice  -- The slice(date) :: Type string
- *returns event in html div format
+/**
+  * To display events in week view
+  * @param $cal -- The calendar array :: Type Array
+  * @param $slice  -- The slice(date) :: Type string
+  * @returns $eventlayer(html div) -- Type string
 */
 function getweekEventLayer(& $cal,$slice)
 {
@@ -907,11 +925,12 @@
 			
 }
 
-/*To display events in month view
- *@param $cal -- The calendar array :: Type Array
- *@param $slice  -- The slice(date) :: Type string
- *returns event in html div format
-*/
+/**
+  * To display events in month view
+  * @param $cal -- The calendar array :: Type Array
+  * @param $slice  -- The slice(date) :: Type string
+  * @returns $eventlayer(html div) -- Type string
+  */
 function getmonthEventLayer(& $cal,$slice)
 {
 	global $mod_strings;
@@ -963,13 +982,14 @@
 
 }
 
-/*To get events list scheduled between specified dates
- *@param $calendar -- The calendar array :: Type Array
- *@param $start_date -- the start date :: Type string
- *@param $end_date -- the end date :: Type string
- *@param $info -- the info :: Type string
- *returns $Entries :: Type Array
-*/
+/**
+  * To get events list scheduled between specified dates
+  * @param $calendar -- The calendar array :: Type Array
+  * @param $start_date -- the start date :: Type string
+  * @param $end_date -- the end date :: Type string
+  * @param $info -- the info :: Type string
+  * @returns $Entries :: Type Array
+  */
 function getEventList(& $calendar,$start_date,$end_date,$info='')
 {
 	$Entries = Array();
@@ -1048,13 +1068,14 @@
 }
 
 
-/*To get todos list scheduled between specified dates
- *@param $calendar -- The calendar array :: Type Array
- *@param $start_date -- the start date :: Type string
- *@param $end_date -- the end date :: Type string
- *@param $info -- the info :: Type string
- *returns $Entries :: Type Array
-*/
+/**
+  * To get todos list scheduled between specified dates
+  * @param $calendar -- The calendar array :: Type Array
+  * @param $start_date -- the start date :: Type string
+  * @param $end_date -- the end date :: Type string
+  * @param $info -- the info :: Type string
+  * returns $Entries :: Type Array
+  */
 function getTodoList(& $calendar,$start_date,$end_date,$info='')
 {
         $Entries = Array();
@@ -1110,11 +1131,12 @@
 	return $Entries;
 }
 
-/*To get number of events and todos
- *@param $cal -- The calendar array :: Type Array
- *@param $mode  -- The mode :: Type string
- *return number of events and todos in Array format
-*/
+/**
+  * To get number of events and todos
+  * @param $cal -- The calendar array :: Type Array
+  * @param $mode  -- The mode :: Type string
+  * @returns $event_todo_info(number of events and todos) -- Type Array 
+  */
 function getEventTodoInfo(& $cal, $mode)
 {
 	global $mod_strings;
@@ -1133,10 +1155,11 @@
 	return $event_todo_info;
 }
 
-/*To construct event listview
- *@param $entry_list -- The event entries array :: Type Array
- *constructs event listview in HTML format
-*/
+/**
+  * To construct event listview
+  * @param $entry_list -- The event entries array :: Type Array
+  * constructs event listview in HTML format
+  */
 function constructEventListView($entry_list)
 {
 	global $mod_strings;
@@ -1188,11 +1211,12 @@
 	echo $list_view;
 }
 
-/*To construct todo listview
- *@param $todo_list -- The todo entries array :: Type Array
- *@param $cal -- The calendar array :: Type Array
- *constructs todo listview in HTML format
-*/
+/**
+  * To construct todo listview
+  * @param $todo_list -- The todo entries array :: Type Array
+  * @param $cal -- The calendar array :: Type Array
+  * constructs todo listview in HTML format
+  */
 function constructTodoListView($todo_list,$cal)
 {
 	global $mod_strings;




From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun  5 10:37:24 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 05 Jun 2006 14:37:24 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6900 -
	/vtigercrm/trunk/modules/Contacts/vtchat.php
Message-ID: <20060605143724.8723464FD86@vtiger.fosslabs.com>

Author: don
Date: Mon Jun  5 08:37:20 2006
New Revision: 6900

Log:
issue in chat has been fixed

Modified:
    vtigercrm/trunk/modules/Contacts/vtchat.php

Modified: vtigercrm/trunk/modules/Contacts/vtchat.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/vtchat.php (original)
+++ vtigercrm/trunk/modules/Contacts/vtchat.php Mon Jun  5 08:37:20 2006
@@ -12,7 +12,7 @@
 <title>Ajax Css-Popup chat</title>
 
 <!-- NEEDED SCRIPTS  -->
-<script type="text/javascript" src="modules/Contacts/js/ajax.js"></script>
+<script type="text/javascript" src="include/js/ajax.js"></script>
 <script type="text/javascript" src="modules/Contacts/js/dom-drag_p.js"></script>
 <script type="text/javascript" src="modules/Contacts/js/css-window_p.js"></script>
 <script type="text/javascript" src="modules/Contacts/js/chat.js"></script>




From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun  5 10:37:57 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 05 Jun 2006 14:37:57 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6901 -
	/vtigercrm/trunk/modules/Contacts/js/ajax.js
Message-ID: <20060605143758.0B16B64FD86@vtiger.fosslabs.com>

Author: don
Date: Mon Jun  5 08:37:54 2006
New Revision: 6901

Log:
duplicate file has been removed

Removed:
    vtigercrm/trunk/modules/Contacts/js/ajax.js




From vtiger-tickets at vtiger.fosslabs.com  Mon Jun  5 12:24:31 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 05 Jun 2006 16:24:31 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231264=3A?=
	=?utf-8?q?_MsSql_and_IIS_--_Please?=
Message-ID: <076.38e4ee7739ea23c2b97e6055bc35f7d1@vtiger.fosslabs.com>

#1264: MsSql and IIS -- Please
------------------------------------------+---------------------------------
 Reporter:  joe.green at heartlandfarms.com  |       Owner:  developer
     Type:  defect                        |      Status:  new      
 Priority:  major                         |   Milestone:           
Component:  vtigercrm                     |     Version:  5.0.0    
 Keywords:                                |  
------------------------------------------+---------------------------------
 You have a fantastic product, but most of my clients will insist on MsSql
 and IIS.

 Can you? / Would You?

 Please

 Thanks, Joe.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1264>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun  5 23:11:49 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 06 Jun 2006 03:11:49 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6902 -
	/vtigercrm/trunk/modules/Contacts/chat.php
Message-ID: <20060606031149.139FF7B36F1@vtiger.fosslabs.com>

Author: allanbush
Date: Mon Jun  5 21:11:45 2006
New Revision: 6902

Log:
SQL cleanup for postgres support.  Ref #752.

Modified:
    vtigercrm/trunk/modules/Contacts/chat.php

Modified: vtigercrm/trunk/modules/Contacts/chat.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/chat.php (original)
+++ vtigercrm/trunk/modules/Contacts/chat.php Mon Jun  5 21:11:45 2006
@@ -68,12 +68,12 @@
     // las message id received by user
     if(!isset($_SESSION["mlid"]))
       {
-	$res = $adb->query("show table status like 'chat_msg'");
+	$res = $adb->query("SELECT max(id) AS id FROM chat_msg");
 	$line = $adb->fetch_array($res);
-	if(intval($line['Auto_increment']) == 0)
+	if(intval($line['id']) == 0)
 	  $_SESSION["mlid"] = 0;
 	else
-	  $_SESSION["mlid"] = intval($line['Auto_increment']) - 1;
+	  $_SESSION["mlid"] = intval($line['id']) - 1;
       }
     
     // when the las user list was sended.
@@ -89,7 +89,7 @@
       }
     else
       {
-	$res = $adb->query("update chat_users set ping=now() where session='".session_id()."'");
+	      $res = $adb->query("UPDATE chat_users SET ping = ".$adb->database->sysTimeStamp." WHERE session = '".session_id()."'");
 	if($adb->getAffectedRowCount($res) == 0)
 	  {
 	    $this->setUserNick();
@@ -164,7 +164,7 @@
   {
 	global $current_user;	
 	global $adb;
-    $res = $adb->query("select id from chat_users where session='".session_id()."'");
+    $res = $adb->query("SELECT id FROM chat_users WHERE session = '".session_id()."'");
     if($adb->num_rows($res) > 0)
       {
 	$line = $adb->fetch_array($res);
@@ -172,14 +172,14 @@
 	return;
       }
     
-    $res = $adb->query("show table status like 'chat_users'");
-    $line = $adb->fetch_array($res);
-    if(intval($line['Auto_increment']) == 0)
-      $line['Auto_increment'] = 1;
-    
-    $_SESSION['chat_user'] = $line['Auto_increment'];
-    
-    $res = $adb->query("insert into chat_users set nick='".$current_user->user_name."',session='".session_id()."',ping=now(),ip='".$_SERVER['REMOTE_ADDR']."'");
+    $_SESSION['chat_user'] = $adb->getUniqueID('chat_users');
+    
+    $res = $adb->query("INSERT INTO chat_users (id, nick, session, ping, ip)
+   			 VALUES ('".$_SESSION['chat_user']."',
+			 	'".$current_user->user_name."',
+				 '".session_id()."',
+				 ".$adb->database->sysTimeStamp.",
+				 '".$_SERVER['REMOTE_ADDR']."')");
     //$res = $adb->query("select LAST_INSERT_ID()");
     //$line = $adb->fetch_array($res);
     //$_SESSION['chat_user'] = $line[0];
@@ -193,8 +193,10 @@
 	global $adb;
     global $chat_conf;
     $tmp = '';
-    $res = $adb->query("delete from chat_users where ((unix_timestamp(now())-unix_timestamp(ping))>'".$chat_conf['alive_time']."')");
-    $res = $adb->query("select id,nick from chat_users");
+    $delete_from = time() - $chat_conf['alive_time'];
+    $res = $adb->query("DELETE FROM chat_users
+    			WHERE ping > ".$adb->formatDate($delete_from));
+    $res = $adb->query("SELECT id, nick FROM chat_users");
     if($adb->num_rows($res)==0)
       {
 	$this->json = '';
@@ -227,7 +229,21 @@
 	global $adb;
     global $chat_conf;
     $format = '{"mlid":%s,"chat":%s,"from":"%s","msg":"%s"},';
-    $res = $adb->query("select ms.id mid,ms.chat_from mfrom,ms.chat_to mto,pv.id id,us.nick `from`,ms.msg msg from chat_users us,chat_pvchat pv,chat_msg ms where pv.msg=ms.id and us.id=ms.chat_from and ms.id>'".($_SESSION['mlid'])."' and ((ms.chat_from='".$_SESSION['chat_user']."' and ms.chat_to>0) or (ms.chat_to='".$_SESSION['chat_user']."' and ms.chat_from>0)) order by ms.born limit 0,".$chat_conf['msg_limit']);
+    $res = $adb->limitQuery("SELECT ms.id AS mid, ms.chat_from AS mfrom,
+   				 ms.chat_to AS mto,pv.id AS id,
+				 us.nick AS nfrom, ms.msg AS msg
+			FROM chat_users us
+			INNER JOIN chat_msg ms
+				ON us.id = ms.chat_from
+			INNER JOIN chat_pvchat pv
+				ON pv.msg = ms.id
+			WHERE ms.id > '".($_SESSION['mlid'])."'
+			AND (ms.chat_from = '".$_SESSION['chat_user']."'
+				AND ms.chat_to > 0)
+			OR (ms.chat_to = '".$_SESSION['chat_user']."'
+				AND ms.chat_from>0)
+			ORDER BY ms.born",
+			0, $chat_conf['msg_limit']);
     if($adb->num_rows($res)==0)
       {
 	$this->json = '';
@@ -242,7 +258,7 @@
 	else
 	  $cid = $line['mfrom'];
 
-	$tmp .= sprintf($format,$line['mid'],$cid,$line['from'],addslashes($line['msg']));
+	$tmp .= sprintf($format,$line['mid'],$cid,$line['nfrom'],addslashes($line['msg']));
       }
     $tmp = trim($tmp,',');
     $this->json = sprintf($this->json,$tmp);
@@ -258,7 +274,18 @@
 	global $adb;
     global $chat_conf;
     $format = '{"mlid":%s,"from":"%s","msg":"%s"},';
-    $res = $adb->query("select ms.id mid,ms.chat_from mfrom,ms.chat_to mto,p.id id,us.nick `from`,ms.msg msg from chat_users us,chat_pchat p,chat_msg ms where p.msg=ms.id and us.id=ms.chat_from and ms.id>'".($_SESSION['mlid'])."' and ms.chat_to=0 order by ms.born limit 0,".$chat_conf['msg_limit']);
+    $res = $adb->limitQuery("SELECT ms.id AS mid, ms.chat_from AS mfrom,
+    				ms.chat_to AS mto, p.id AS id,
+				us.nick AS nfrom, ms.msg AS msg
+			FROM chat_users us
+			INNER JOIN chat_msg ms
+				ON us.id = ms.chat_from
+			INNER JOIN chat_pchat p
+				ON p.msg = ms.id
+			WHERE ms.id > '".($_SESSION['mlid'])."'
+			AND ms.chat_to = 0
+			ORDER BY ms.born",
+			0, $chat_conf['msg_limit']);
     if($adb->num_rows($res)==0)
       {
 	$this->json = '';
@@ -268,7 +295,7 @@
     $tmp = '';
     while($line = $adb->fetch_array($res))
       {
-	$tmp .= sprintf($format,$line['mid'],$line['from'],addslashes($line['msg']));
+	$tmp .= sprintf($format,$line['mid'],$line['nfrom'],addslashes($line['msg']));
       }
     $tmp = trim($tmp,',');
     $this->json = sprintf($this->json,$tmp);
@@ -291,9 +318,13 @@
 	  case '\nick':
 	    if(isset($words[1]) && strlen($words[1]) > 3)
 	      {
-		$res = $adb->query("select nick from chat_users where id='".$_SESSION['chat_user']."'");
+		$res = $adb->query("SELECT nick
+				FROM chat_users
+				WHERE id= '".$_SESSION['chat_user']."'");
 		$line = $adb->fetch_array($res);
-		$res = $adb->query("update chat_users set nick='".addslashes($words[1])."' where id='".$_SESSION['chat_user']."'");
+		$res = $adb->query("UPDATE chat_users
+				SET nick = ".$adb->quote($words[1])."
+				WHERE id = '".$_SESSION['chat_user']."'");
 		$msg = '\sys <span class="sysb">'.$line['nick'].'</span> changed nick to <span class="sysb">'.$words[1].'</span>';
 	      }
 	    break;
@@ -315,13 +346,15 @@
     $msg = $this->msgParse($msg);
     if(strlen($msg) == 0) return;
     
-    $res = $adb->query("insert into chat_msg set `chat_from`='".$_SESSION['chat_user']."',`chat_to`='".$to."',born=now(),msg='".$msg."'");
+    $id = $adb->getUniqueID('chat_msg');
+    $res = $adb->query("INSERT INTO chat_msg (id, chat_from, chat_to, born, msg)
+    			VALUES (".$id.", '".$_SESSION['chat_user']."', '".$to."', ".$adb->database->sysTimeStamp.", '".$msg."')");
     
     $chat = "p";
     if($to != 0)
       $chat .= "v";
     
-    $res = $adb->query("insert into chat_".$chat."chat set msg=LAST_INSERT_ID()");
+      $res = $adb->query("INSERT INTO chat_".$chat."chat (msg) VALUES (".$id.")");
   }
 
   /**
@@ -330,7 +363,11 @@
   function pvClose($to)
   {
 	global $adb;
-    $res = $adb->query("delete from chat_msg where (`chat_from`='".$to."' and `chat_to`='".$_SESSION['chat_user']."') or (`chat_from`='".$_SESSION['chat_user']."' and `chat_to`='".$to."')");
+    $res = $adb->query("DELETE FROM chat_msg
+   			 WHERE (chat_from = '".$to."'
+				 AND chat_to = '".$_SESSION['chat_user']."')
+			 OR (chat_from = '".$_SESSION['chat_user']."'
+				 AND chat_to = '".$to."')");
   }
 }
 




From vtiger-tickets at vtiger.fosslabs.com  Tue Jun  6 03:29:15 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 06 Jun 2006 07:29:15 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231265=3A?=
 =?utf-8?q?_Global_Search_Function_throws_error?=
Message-ID: <076.76671c46776deb9518824e095947cbde@vtiger.fosslabs.com>

#1265: Global Search Function throws error
-----------------------+----------------------------------------------------
 Reporter:  anonymous  |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  major      |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 Searched for "?sterlich" with the global search function at Beta- Demo

 Warning: strstr(): Empty delimiter. in
 /home/site/html/products/crm/demo_5beta/modules/Home/UnifiedSearch.php on
 line 187

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1265>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun  6 03:33:13 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 06 Jun 2006 07:33:13 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231234=3A?=
 =?utf-8?q?_usability_issue_in_calendar?=
In-Reply-To: <076.8d042b2e895f5b682f940fd414e0a397@vtiger.fosslabs.com>
References: <076.8d042b2e895f5b682f940fd414e0a397@vtiger.fosslabs.com>
Message-ID: <085.852df4a3f37e1fb4069d7a2727f7cfd9@vtiger.fosslabs.com>

#1234: usability issue in calendar
---------------------------+------------------------------------------------
  Reporter:  jerrydgeorge  |       Owner:  mangai
      Type:  defect        |      Status:  new   
  Priority:  major         |   Milestone:        
 Component:  vtigercrm     |     Version:  5.0.0 
Resolution:                |    Keywords:        
---------------------------+------------------------------------------------
Comment (by anonymous):

 you may add, created by .. on .. and modified by ... on ...

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1234>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun  6 05:39:18 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 06 Jun 2006 09:39:18 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6903 - in /vtigercrm/trunk:
 Smarty/templates/Rss.tpl include/magpierss/extlib/Snoopy.class.inc
 modules/Rss/ListView.php modules/Rss/Popup.php modules/Rss/Rss.php
 schema/DatabaseSchema.xml
Message-ID: <20060606093918.000FE7B06E4@vtiger.fosslabs.com>

Author: don
Date: Tue Jun  6 03:39:08 2006
New Revision: 6903

Log:
rsscategory has been removed

Modified:
    vtigercrm/trunk/Smarty/templates/Rss.tpl
    vtigercrm/trunk/include/magpierss/extlib/Snoopy.class.inc
    vtigercrm/trunk/modules/Rss/ListView.php
    vtigercrm/trunk/modules/Rss/Popup.php
    vtigercrm/trunk/modules/Rss/Rss.php
    vtigercrm/trunk/schema/DatabaseSchema.xml

Modified: vtigercrm/trunk/Smarty/templates/Rss.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Rss.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Rss.tpl Tue Jun  6 03:39:08 2006
@@ -54,8 +54,7 @@
 	var ajaxObj = new VtigerAjax(ajaxRssSaveResponse);
 	rssurl = document.getElementById('rssurl').value;
 	rssurl = rssurl.replace(/&/gi,"##amp##");
-	var category = document.getElementById('rsscategory')[document.getElementById('rsscategory').selectedIndex].value;
-	var urlstring = 'module=Rss&action=RssAjax&vtigerfile=Popup&directmode=ajax&rsscategory='+category+'&rssurl='+rssurl;
+	var urlstring = 'module=Rss&action=RssAjax&vtigerfile=Popup&directmode=ajax&rssurl='+rssurl;
 	ajaxObj.process("index.php?",urlstring);
 }
 function ajaxRssSaveResponse(response)
@@ -168,10 +167,6 @@
 	<td align="left" width="70%"><input type="text" id="rssurl" class="txtBox" /></td>
 	</tr>
 	
-	<tr>
-	<td align="right"><b>{$MOD.LBL_CATEGORY}</b></td>
-	<td align="left"><select id="rsscategory" class="importBox" style="width:100%">{$RSSCATEG}</select></td>
-	</tr>
 	<tr><td colspan="2" style="border-bottom:1px dashed #CCCCCC;">&nbsp;</td></tr>
 	<tr>
 	<td	colspan="2" align="center">

Modified: vtigercrm/trunk/include/magpierss/extlib/Snoopy.class.inc
==============================================================================
--- vtigercrm/trunk/include/magpierss/extlib/Snoopy.class.inc (original)
+++ vtigercrm/trunk/include/magpierss/extlib/Snoopy.class.inc Tue Jun  6 03:39:08 2006
@@ -43,8 +43,8 @@
 
 	var $host			=	"www.php.net";		// host name we are connecting to
 	var $port			=	80;					// port we are connecting to
-	var $proxy_host		=	"";					// proxy host to use
-	var $proxy_port		=	"";					// proxy port to use
+	var $proxy_host		=	"192.168.4.158";					// proxy host to use
+	var $proxy_port		=	"80";					// proxy port to use
 	var $agent			=	"Snoopy v1.0";		// agent we masquerade as
 	var	$referer		=	"";					// referer info to pass
 	var $cookies		=	array();			// array of cookies to pass
@@ -63,8 +63,8 @@
 												// NOTE: this currently does not respect
 												// dates, domains or paths.
 	
-	var	$user			=	"";					// user for http authentication
-	var	$pass			=	"";					// password for http authentication
+	var	$user			=	"jerijohn";					// user for http authentication
+	var	$pass			=	"jerijohn";					// password for http authentication
 	
 	// http accept types
 	var $accept			=	"image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*";
@@ -427,10 +427,11 @@
 			   $headers .= "Accept-encoding: gzip\r\n";
 			}
 			else {
-			   trigger_error(
+				//commented to supress the warning
+			   /*trigger_error(
 			   	"use_gzip is on, but PHP was built without zlib support.".
 				"  Requesting file(s) without gzip encoding.", 
-				E_USER_NOTICE);
+				E_USER_NOTICE);*/
 			}
 		}
 		

Modified: vtigercrm/trunk/modules/Rss/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Rss/ListView.php (original)
+++ vtigercrm/trunk/modules/Rss/ListView.php Tue Jun  6 03:39:08 2006
@@ -81,7 +81,6 @@
 	require_once("modules/".$currentModule."/Forms.php");
 	if (function_exists('get_rssfeeds_form'))
 	{
-		$rss_form->assign("RSSCATEG", $oRss->getRsscategory_html());
 		$rss_form->assign("RSSFEEDS", get_rssfeeds_form());
 	}
 }

Modified: vtigercrm/trunk/modules/Rss/Popup.php
==============================================================================
--- vtigercrm/trunk/modules/Rss/Popup.php (original)
+++ vtigercrm/trunk/modules/Rss/Popup.php Tue Jun  6 03:39:08 2006
@@ -28,12 +28,11 @@
 elseif(isset($_REQUEST["rssurl"]))
 {
 	$newRssUrl = str_replace('##amp##','&',$_REQUEST["rssurl"]);
-	$rsscategory = $_REQUEST["rsscategory"];
 	$setstarred = 0;
 	$oRss = new vtigerRSS();
 	if($oRss->setRSSUrl($newRssUrl))
 	{
-			$result = $oRss->saveRSSUrl($newRssUrl,$setstarred,$rsscategory);
+			$result = $oRss->saveRSSUrl($newRssUrl,$setstarred);
         	if($result == false)
         	{
 				echo "Unable to save the RSS Feed URL" ;

Modified: vtigercrm/trunk/modules/Rss/Rss.php
==============================================================================
--- vtigercrm/trunk/modules/Rss/Rss.php (original)
+++ vtigercrm/trunk/modules/Rss/Rss.php Tue Jun  6 03:39:08 2006
@@ -96,15 +96,13 @@
 	}
 
 	/** Function to save the Rss Feeds  
-	  * This Function accepts the RssURl,RssCategory,Starred Status as arguments and 
+	  * This Function accepts the RssURl,Starred Status as arguments and 
 	  * returns true on sucess 
 	  * returns false if fails
 	 */
-	function saveRSSUrl($url,$makestarred=0,$rsscategory='')
-	{
-		global $adb;
-		if($rsscategory == '')
-			$rsscategory = 'vtiger Discussions';	
+	function saveRSSUrl($url,$makestarred=0)
+	{
+		global $adb;
 
 		if ($url != "")
 		{
@@ -114,8 +112,8 @@
 				$rsstitle = $url;
 			}
 			$genRssId = $adb->getUniqueID("rss");
-			$sSQL = "insert into rss (RSSID,RSSURL,RSSTITLE,RSSTYPE,STARRED,RSSCATEGORY) values (".$genRssId.",'".addslashes($url);
-			$sSQL .= "','".addslashes($rsstitle)."',0,".$makestarred.",'".addslashes($rsscategory)."')";
+			$sSQL = "insert into rss (RSSID,RSSURL,RSSTITLE,RSSTYPE,STARRED) values (".$genRssId.",'".addslashes($url);
+			$sSQL .= "','".addslashes($rsstitle)."',0,".$makestarred.")";
 			$result = $adb->query($sSQL);
 			if($result)
 			{
@@ -355,27 +353,11 @@
 	{
 		global $adb;
 		global $image_path;
-		$sSQL = "select * from rsscategory where presence = 1 order by sortorderid";
-		$result = $adb->query($sSQL);
-
-		while($categoryrow = $adb->fetch_array($result))
-		{
 			$shtml .= "<tr>
-						<td width=\"15\">
-						<div align=\"center\"><a href=\"javascript:;\" onClick=\"toggleRSSFolder('".$categoryrow["sortorderid"]."')\"><img id=\"".$categoryrow["sortorderid"]."_toggle\" src=\"".$image_path."plus.gif\" border=\"0\"></a></div>
-						</td>
-						<td width=\"20\">
-						<div align=\"center\"><img id=\"".$categoryrow["sortorderid"]."_folder\" src=\"".$image_path."rss_folder_cls.gif\"></div>
-						</td>
-						<td nowrap><a href=\"javascript:;\" onClick=\"toggleRSSFolder('".$categoryrow["sortorderid"]."')\" class=\"rssFolder\">".$categoryrow["rsscategory"]."</a>
-						</td>
-					  </tr>
-					  <tr>
 						<td colspan=\"3\">
-						<div id=\"".$categoryrow["sortorderid"]."_feeds\" style=\"display:none\"><table width=\"100%\" border=\"0\" cellspacing=\"2\" cellpadding=\"2\" style=\"margin:5 0 0 35\">".$this->getRssFeedsbyCategory($categoryrow["rsscategory"])."</table></div>
+						<table width=\"100%\" border=\"0\" cellspacing=\"2\" cellpadding=\"2\" style=\"margin:5 0 0 35\">".$this->getRssFeedsbyCategory()."</table>
 						</td>
 					  </tr>";
-		}
 
 		return $shtml;
 	}
@@ -384,13 +366,13 @@
 	  * This Function accepts the RssCategory as argument 
 	  * and returns the html string for the Rss feeds lists
 	 */
-	function getRssFeedsbyCategory($rsscategory)
-	{
-
-		global $adb;
-		global $image_path;
-
-		$sSQL = "select * from rss where rsscategory='".$rsscategory."'";
+	function getRssFeedsbyCategory()
+	{
+
+		global $adb;
+		global $image_path;
+
+		$sSQL = "select * from rss";
 		$result = $adb->query($sSQL);
 		while($allrssrow = $adb->fetch_array($result))
 		{

Modified: vtigercrm/trunk/schema/DatabaseSchema.xml
==============================================================================
--- vtigercrm/trunk/schema/DatabaseSchema.xml (original)
+++ vtigercrm/trunk/schema/DatabaseSchema.xml Tue Jun  6 03:39:08 2006
@@ -3181,33 +3181,6 @@
 		<field name="starred" type="I" size="1">
 			<default value="0" />
 		</field>
-		<field name="rsscategory" type="C" size="100">
-			<default value="" />
-		</field>
-	</table>
-
-	<table name="rsscategory">
-		<field name="rsscategoryid" type="I" size="19">
-			<key />
-			<autoincrement />
-		</field>
-		<field name="rsscategory" type="C" size="200">
-			<notnull />
-		</field>
-		<field name="sortorderid" type="I" size="19">
-			<notnull />
-			<default value="0" />
-		</field>
-		<field name="presence" type="I" size="1">
-			<notnull />
-			<default value="1" />
-		</field>
-
-		<index name="rsscategory_rsscategory">
-			<col>rsscategory</col>
-			<unique />
-		</index>
-		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
 	<table name="vendorcf">




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun  6 05:43:16 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 06 Jun 2006 09:43:16 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6904 -
	/vtigercrm/trunk/modules/Rss/Rss.php
Message-ID: <20060606094316.6D6CF7E84E3@vtiger.fosslabs.com>

Author: don
Date: Tue Jun  6 03:43:12 2006
New Revision: 6904

Log:
delete link has been removed

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

Modified: vtigercrm/trunk/modules/Rss/Rss.php
==============================================================================
--- vtigercrm/trunk/modules/Rss/Rss.php (original)
+++ vtigercrm/trunk/modules/Rss/Rss.php Tue Jun  6 03:43:12 2006
@@ -145,7 +145,7 @@
 			}
 			$shtml .= "<td class=\"rssTitle\"><a href=\"index.php?module=Rss&action=ListView&record=$allrssrow[rssid]
 				\" class=\"rssTitle\">".$allrssrow[rsstitle]."</a></td>";
-			$shtml .= "<td><a href=\"index.php?module=Rss&action=Delete&return_module=Rss&return_action=index&record=$allrssrow[rssid]\"><img src=\"".$image_path."del.gif\" border=\"0\" align=\"absmiddle\"></a></td></tr>";
+			$shtml .= "<td>&nbsp;</td></tr>";
 
 		}
 		return $shtml;
@@ -171,7 +171,7 @@
 				$shtml .= "<td width=\"15\">
 					<img src=\"".$image_path."offstar.gif\" align=\"absmiddle\" onMouseOver=\"this.style.cursor='pointer'\" id=\"star-$allrssrow[rssid]\"></td>";
 			}
-			$shtml .= "<td class=\"rssTitle\"><a href=\"index.php?module=Rss&action=ListView&record=$allrssrow[rssid]\" class=\"rssTitle\">".$allrssrow[rsstitle]."</a></td><td><a href=\"index.php?module=Rss&action=Delete&return_module=Rss&return_action=index&record=$allrssrow[rssid]\"><img src=\"".$image_path."del.gif\" border=\"0\" align=\"absmiddle\"></a></td>";
+			$shtml .= "<td class=\"rssTitle\"><a href=\"index.php?module=Rss&action=ListView&record=$allrssrow[rssid]\" class=\"rssTitle\">".$allrssrow[rsstitle]."</a></td><td>&nbsp;</td>";
 			$shtml .= "</tr>";
 
 		}
@@ -386,7 +386,7 @@
 				 	   $shtml .= "<img src=\"".$image_path."offstar.gif\" align=\"absmiddle\" onMouseOver=\"this.style.cursor='pointer'\" id=\"star-$allrssrow[rssid]\">";
 			}
 					   $shtml .= "</td>";
-			$shtml .= "<td class=\"rssTitle\" width=\"10%\" nowrap><a href=\"javascript:GetRssFeedList('$allrssrow[rssid]')\" class=\"rssTitle\">".$allrssrow[rsstitle]."</a></td><td><a href=\"javascript:DeleteRssFeeds('$allrssrow[rssid]');\"><img src=\"".$image_path."del.gif\"  border=\"0\" align=\"absmiddle\"></a></td>";
+			$shtml .= "<td class=\"rssTitle\" width=\"10%\" nowrap><a href=\"javascript:GetRssFeedList('$allrssrow[rssid]')\" class=\"rssTitle\">".$allrssrow[rsstitle]."</a></td><td>&nbsp;</td>";
 			$shtml .= "</tr>";
 		}
 		return $shtml;




From vtiger-tickets at vtiger.fosslabs.com  Tue Jun  6 05:48:13 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 06 Jun 2006 09:48:13 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231266=3A?=
 =?utf-8?q?_Email_Opt-out_missing_in_Leads?=
Message-ID: <076.98612190c9a98af18e148b6e53d138fc@vtiger.fosslabs.com>

#1266: Email Opt-out missing in Leads
-------------------------+--------------------------------------------------
 Reporter:  gopal        |       Owner:  developer
     Type:  enhancement  |      Status:  new      
 Priority:  major        |   Milestone:           
Component:  vtigercrm    |     Version:  5.0.0    
 Keywords:               |  
-------------------------+--------------------------------------------------
 Email Opt-out function is missing in Lead page where it is available in
 Contact page. It is better to have Opt-out option in Leads also as people
 can send mass emails based on lead data.
 Gopal

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1266>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun  6 05:52:48 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 06 Jun 2006 09:52:48 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231267=3A?=
	=?utf-8?q?_Reports_for_Management?=
Message-ID: <076.7d4de1023a5c8c54e4e4d481bd7635f2@vtiger.fosslabs.com>

#1267: Reports for Management
-------------------------+--------------------------------------------------
 Reporter:  anonymous    |       Owner:  developer
     Type:  enhancement  |      Status:  new      
 Priority:  major        |   Milestone:           
Component:  vtigercrm    |     Version:  5.0.0    
 Keywords:               |  
-------------------------+--------------------------------------------------
 It is paramount for managers to know how much the CRM is used by the
 staff. Therefore, a report is required that presents the users activities
 (created, modified CRM entries) ba a users report only visible to the
 management.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1267>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun  6 10:33:01 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 06 Jun 2006 14:33:01 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231268=3A?=
 =?utf-8?q?_Error_in_Email_language_file?=
Message-ID: <076.e552d828a7b238f9e865edf84f9ad995@vtiger.fosslabs.com>

#1268: Error in Email language file
-----------------------+----------------------------------------------------
 Reporter:  anonymous  |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  critical   |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 If you change the entry of 'LBL_EMAIL_INFORMATION'=>'Email Information',
 at the language file let say to 'LBL_EMAIL_INFORMATION'=>'E-Mail
 Information',
 you will be unable to create a new email.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1268>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun  6 10:44:48 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 06 Jun 2006 14:44:48 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6905 - in /vtigercrm/trunk:
 Smarty/templates/DetailView.tpl Smarty/templates/DetailViewUI.tpl
 include/js/dtlviewajax.js
Message-ID: <20060606144448.595167E8500@vtiger.fosslabs.com>

Author: don
Date: Tue Jun  6 08:44:42 2006
New Revision: 6905

Log:
inplace edit has been reverted back

Modified:
    vtigercrm/trunk/Smarty/templates/DetailView.tpl
    vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl
    vtigercrm/trunk/include/js/dtlviewajax.js

Modified: vtigercrm/trunk/Smarty/templates/DetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DetailView.tpl Tue Jun  6 08:44:42 2006
@@ -15,6 +15,10 @@
 
 
 <script language="JavaScript" type="text/javascript" src="include/js/dtlviewajax.js"></script>
+<span id="crmspanid" style="display:none;position:absolute;"  onmouseover="show('crmspanid');">
+   <a class="link"  align="right" href="javascript:;">Edit</a>
+</span>
+
 {if $MODULE eq 'Leads' or $MODULE eq 'Contacts' or $MODULE eq 'Accounts'}
 <div id="sendmail_cont" style="z-index:100001;position:absolute;"></div>
 {/if}

Modified: vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl Tue Jun  6 08:44:42 2006
@@ -13,57 +13,137 @@
 -->*}
 
 <!-- This file is used to display the fields based on the ui type in detailview -->
-{if $keyid eq '1' || $keyid eq 2 || $keyid eq '11' || $keyid eq '7' || $keyid eq '9' || $keyid eq '55' || $keyid eq '71' || $keyid eq '72'} <!--TextBox-->
-	<td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" >
-		{if $keyid eq '55'}<!--SalutationSymbol-->
-			{$keysalut}
-		{/if}
-
-		<div id="dtlview_{$label}" onClick="hndMouseOver({$keyid},'{$label}');">{$keyval}&nbsp;</div>
-		<div id="editarea_{$label}" style="display:none;">
-			<input class="detailedViewTextBox" onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" type="text" id="txtbox_{$label}" name="{$keyfldname}" maxlength='100' value="{$keyval}"></input>
-			<br>
-			<input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');"/> or
-			<a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
-		</div>
-	</td>
-{elseif $keyid eq '13'} <!--Email-->
-                     <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}"><div id="dtlview_{$label}"  onClick="hndMouseOver({$keyid},'{$label}');">
-			{if $INT_MAILER eq 'true'}
-				<a href="javascript:InternalMailer('{$keyval}','email_addy');">&nbsp;{$keyval}</a></div>
-			{else}
-				<a href="mailto:{$keyval}" target="_blank">&nbsp;{$keyval}</a></div>
-			{/if}
-                	 <div id="editarea_{$label}" style="display:none;">
-    	                 <input class="detailedViewTextBox" onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" type="text" id="txtbox_{$label}" name="{$keyfldname}" maxlength='100' value="{$keyval}"></input>
-	                      <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');"/> or
-                    	  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
-                     </div>
-                     </td>
-                     {elseif $keyid eq '15' || $keyid eq '16'} <!--ComboBox-->
-       				 <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}"><div id="dtlview_{$label}"  onClick="hndMouseOver({$keyid},'{$label}');">&nbsp;{$keyval}</div>
-                     <div id="editarea_{$label}" style="display:none;">
-                     <select id="txtbox_{$label}" name="{$keyfldname}">
-                     {foreach item=arr from=$keyoptions}
-                     	{foreach key=sel_value item=value from=$arr}
-                        	<option value="{$sel_value}" {$value}>{$sel_value}</option>
-                        {/foreach}
-                     {/foreach}
-                     </select>
-                     <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');"/> or
-                     <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
-                   	</div>
-                   	</td>
-                    {elseif $keyid eq '53'} <!--Assigned To-->
-                    <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}">
-                    <div id="dtlview_{$label}" onClick="hndMouseOver({$keyid},'{$label}');">
+		{if $keyid eq '1' || $keyid eq 2 || $keyid eq '11' || $keyid eq '7' || $keyid eq '9' || $keyid eq '55' || $keyid eq '71' || $keyid eq '72'} <!--TextBox-->
+                                         		<td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">
+                                         		      {if $keyid eq '55'}<!--SalutationSymbol-->
+                                         		            {$keysalut}
+                                         		      {elseif $keyid eq '71' || $keyid eq '72'}  <!--CurrencySymbol-->
+                                         		            {$keycursymb}
+                                                        {/if}
+                                                       <span id="dtlview_{$label}">{$keyval}</span>
+                                              		<div id="editarea_{$label}" style="display:none;">
+                                              		  <input class="detailedViewTextBox" onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" type="text" id="txtbox_{$label}" name="textbox_{$label}" maxlength='100' value="{$keyval}"></input>
+                                              		  <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
+                                                       </div>
+                                                  </td>
+                                             {elseif $keyid eq '13'} <!--Email-->
+                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}"><a href="mailto:{$keyval}" target="_blank">{$keyval}</a></span>
+                                              		<div id="editarea_{$label}" style="display:none;">
+                                              		  <input class="detailedViewTextBox" onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" type="text" id="txtbox_{$label}" name="textbox_{$label}" maxlength='100' value="{$keyval}"></input>
+                                              		  <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
+                                                       </div>
+                                                  </td>
+                                             {elseif $keyid eq '15' || $keyid eq '16'} <!--ComboBox-->
+               							<td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}">{$keyval}</span>
+                                              		<div id="editarea_{$label}" style="display:none;">
+                    							   <select id="txtbox_{$label}" name="{$keyfldname}">
+                    								{foreach item=arr from=$keyoptions}
+                    									{foreach key=sel_value item=value from=$arr}
+                    										<option value="{$sel_value}" {$value}>{$sel_value}</option>
+                    									{/foreach}
+                    								{/foreach}
+                    							   </select>
+                    							   <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                              		   <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
+                    							</div>
+               							</td>
+                                             {elseif $keyid eq '17'} <!--WebSite-->
+                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}"><a href="http://{$keyval}" target="_blank">{$keyval}</a></span>
+                                              		<div id="editarea_{$label}" style="display:none;">
+                                              		  <input class="detailedViewTextBox" onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" type="text" id="txtbox_{$label}" name="textbox_{$label}" maxlength='100' value="{$keyval}"></input>
+                                              		  <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
+                                                       </div>
+                                                  </td>
+                                             {elseif $keyid eq '19' || $keyid eq '20'} <!--TextArea/Description-->
+                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}">{$keyval}</span>
+                                              		<div id="editarea_{$label}" style="display:none;">
+                                              		  <textarea id="txtbox_{$label}" name="txtbox_{$label}"  class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'"onBlur="this.className='detailedViewTextBox'" cols="90" rows="8">{$keyval}</textarea>                                            		  
+                                              		  <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
+                                                       </div>
+                                                  </td>
+                                             {elseif $keyid eq '21' || $keyid eq '24' || $keyid eq '22'} <!--TextArea/Street-->
+                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}">{$keyval}</span>
+                                              		<div id="editarea_{$label}" style="display:none;">
+                                              		  <textarea id="txtbox_{$label}" name="txtbox_{$label}"  class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'"onBlur="this.className='detailedViewTextBox'" rows=2>{$keyval}</textarea>                                            		  
+                                              		  <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
+                                                       </div>
+                                                  </td>
+                                             {elseif $keyid eq '50' || $keyid eq '73' || $keyid eq '51'} <!--AccountPopup-->
+                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}"><a href="{$keyseclink}">{$keyval}</a></span>
+                                              		<div id="editarea_{$label}" style="display:none;">                                              		  
+                                                         <input readonly id="popuptxt_{$label}" name="account_name" type="text" value="{$keyval}"><input id="txtbox_{$label}" name="{$keyfldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Accounts&action=Popup&popuptype=specific&form=TasksEditView&form_submit=false","test","width=600,height=400,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'>
+                                                         <!--AccountPopup/WithClear-->{if $keyid eq '51'} &nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.account_id.value=''; this.form.account_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>{/if} 
+                                              		  <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
+                                                       </div>
+                                                  </td>
+                                             {elseif $keyid eq '57'} <!--ContactPopup-->
+                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}"><a href="{$keyseclink}">{$keyval}</a></span>
+                                              		<div id="editarea_{$label}" style="display:none;">                                              		  
+                                                         <input id="popuptxt_{$label}" name="contact_name" readonly type="text" style="border:1px solid #bababa;" value="{$keyval}"><input id="txtbox_{$label}" name="{$keyfldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Contacts&action=Popup&html=Popup_picker&popuptype=specific&form=EditView","test","width=600,height=400,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.contact_id.value=''; this.form.contact_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
+                                                         <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
+                                                       </div>
+                                                  </td>                                                  
+                                             {elseif $keyid eq '59'} <!--ProductPopup-->
+                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}"><a href="{$keyseclink}">{$keyval}</a></span>
+                                              		<div id="editarea_{$label}" style="display:none;">                                              		  
+                                                         <input id="popuptxt_{$label}" name="product_name" readonly type="text" value="{$keyval}"><input id="txtbox_{$label}" name="{$keyfldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Products&action=Popup&html=Popup_picker&form=HelpDeskEditView&popuptype=specific","test","width=600,height=400,resizable=1,scrollbars=1,top=150,left=200");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.product_id.value=''; this.form.product_name.value=''; return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
+                                                         <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
+                                                       </div>
+                                                  </td>
+                                             {elseif $keyid eq '75' || $keyid eq '81'} <!--VendorPopup-->
+                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}"><a href="{$keyseclink}">{$keyval}</a></span>
+                                              		<div id="editarea_{$label}" style="display:none;">
+                                                         <input id="popuptxt_{$label}" name="vendor_name" readonly type="text" style="border:1px solid #bababa;" value="{$keyval}"><input id="txtbox_{$label}" name="{$fldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Vendors&action=Popup&html=Popup_picker&popuptype=specific&form=EditView","test","width=600,height=400,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'>
+                                                         {if $uitype eq 75}&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.vendor_id.value='';this.form.vendor_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>{/if}                                              		  
+                                                         <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
+                                                       </div>
+                                                  </td>
+                                             {elseif $keyid eq 76} <!--PotentialPopup-->
+                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}"><a href="{$keyseclink}">{$keyval}</a></span>
+                                              		<div id="editarea_{$label}" style="display:none;">                                              		  
+                                                         <input id="popuptxt_{$label}" name="potential_name" readonly type="text" style="border:1px solid #bababa;" value="{$keyval}"><input id="txtbox_{$label}" name="{$keyfldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Potentials&action=Popup&html=Popup_picker&popuptype=specific_potential_account_address&form=EditView","test","width=600,height=400,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.potential_id.value=''; this.form.potential_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
+                                                         <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
+                                                       </div>
+                                                  </td>
+                                             {elseif $keyid eq 78} <!--QuotePopup-->
+                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}"><a href="{$keyseclink}">{$keyval}</a></span>
+                                              		<div id="editarea_{$label}" style="display:none;">                                              		  
+                                                         <input id="popuptxt_{$label}" name="quote_name" readonly type="text" style="border:1px solid #bababa;" value="{$keyval}"><input id="txtbox_{$label}" name="{$keyfldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Quotes&action=Popup&html=Popup_picker&popuptype=specific&form=EditView","test","width=600,height=400,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.quote_id.value=''; this.form.quote_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
+                                                         <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
+                                                       </div>
+                                                  </td>
+                                             {elseif $keyid eq 82} <!--Email Body-->
+                                                  <td colspan="3" width=100% class="dvtCellInfo" align="left"><div id="dtlview_{$label}" style="width:100%;height:200px;overflow:hidden;border:1px solid gray" class="detailedViewTextBox" onmouseover="this.className='detailedViewTextBoxOn'" onmouseout="this.className='detailedViewTextBox'">{$keyval}</div>
+                                                  </td>
+                                             {elseif $keyid eq 80} <!--SalesOrderPopup-->
+                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}"><a href="{$keyseclink}">{$keyval}</a></span>
+                                              		<div id="editarea_{$label}" style="display:none;">                                              		  
+                                                         <input id="popuptxt_{$label}" name="salesorder_name" readonly type="text" style="border:1px solid #bababa;" value="{$keyval}"><input id="txtbox_{$label}" name="{$keyfldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=SalesOrder&action=Popup&html=Popup_picker&popuptype=specific&form=EditView","test","width=600,height=400,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.salesorder_id.value=''; this.form.salesorder_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
+                                                         <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
+                                                       </div>
+                                                  </td>
+					{elseif $keyid eq '53'} <!--Assigned To-->
+                    <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">
+                    <span id="dtlview_{$label}">
                     {if $keyseclink eq ''}
                         {$keyval}
                     {else}
                         <a href="{$keyseclink}">{$keyval}</a>         
                     {/if}
 					&nbsp;
-                    </div>
+                    </span>
                     <div id="editarea_{$label}" style="display:none;">
                    	<input type="hidden" id="hdtxt_{$label}" value="{$keyval}"></input>
                    	<select id="txtbox_{$label}" onchange="setSelectValue('{$label}')" name="{$keyfldname}">
@@ -78,45 +158,8 @@
                     <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
                     </div>
                     </td>
-                    {elseif $keyid eq '17'} <!--WebSite-->
-                    <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}"><div id="dtlview_{$label}"  onClick="hndMouseOver({$keyid},'{$label}');"><a href="http://{$keyval}" target="_blank">&nbsp;{$keyval}</a></div>
-                    <div id="editarea_{$label}" style="display:none;">
-                      <input class="detailedViewTextBox" onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" type="text" id="txtbox_{$label}" name="{$keyfldname}" maxlength='100' value="{$keyval}"></input>
-                      <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');"/> or
-                      <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
-                    </div>
-                    </td>
-                    {elseif $keyid eq '19' || $keyid eq '20'} <!--TextArea/Description-->
-			<!-- In Add Comment are we should not display anything -->
-			{if $label eq 'Add Comment'}
-				{assign var=keyval value=""}
-			{/if}
-                    <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}"><div id="dtlview_{$label}"  onClick="hndMouseOver({$keyid},'{$label}');">&nbsp;{$keyval}</div>
-                   	<div id="editarea_{$label}" style="display:none;">
-                    <textarea id="txtbox_{$label}" name="txtbox_{$label}"  class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'"onBlur="this.className='detailedViewTextBox'" cols="90" rows="8">{$keyval}</textarea>                                            		  
-                    <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');"/> or
-                    <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
-                    </div>
-                    </td>
-                    {elseif $keyid eq '21' || $keyid eq '24' || $keyid eq '22'} <!--TextArea/Street-->
-                    <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}"><div id="dtlview_{$label}"  onClick="hndMouseOver({$keyid},'{$label}');">&nbsp;{$keyval}</div>
-                    <div id="editarea_{$label}" style="display:none;">
-                      <textarea id="txtbox_{$label}" name="txtbox_{$label}"  class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'"onBlur="this.className='detailedViewTextBox'" rows=2>{$keyval}</textarea>                                            		  
-                      <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');"/> or
-                      <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
-                     </div>
-                     </td>
-                     {elseif $keyid eq '50' || $keyid eq '73' || $keyid eq '51'} <!--AccountPopup-->
-                     <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}"><div id="dtlview_{$label}"  onClick="hndMouseOver({$keyid},'{$label}');"><a href="{$keyseclink}">&nbsp;{$keyval}</a></div>
-                    	<div id="editarea_{$label}" style="display:none;">                                              		  
-                        <input readonly id="popuptxt_{$label}" name="account_name" type="text" value="{$keyval}"><input id="txtbox_{$label}" name="{$keyfldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Accounts&action=Popup&popuptype=specific&form=TasksEditView&form_submit=false","test","width=600,height=400,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'>
-                       <!--AccountPopup/WithClear-->{if $keyid eq '51'} &nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.account_id.value=''; this.form.account_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>{/if} 
-                       <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');"/> or
-                       <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
-                       </div>
-                    </td>
-                    {elseif $keyid eq '56'} <!--CheckBox--> 
-                      <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}"><div id="dtlview_{$label}" onClick="hndMouseOver({$keyid},'{$label}');">{$keyval}&nbsp;</div>
+					    {elseif $keyid eq '56'} <!--CheckBox--> 
+                      <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onMouseOver="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}">{$keyval}&nbsp;</span>
                     	<div id="editarea_{$label}" style="display:none;">
                         {if $keyval eq 'yes'}                                              		  
                             <input id="txtbox_{$label}" type="checkbox" style="border:1px solid #bababa;" checked value="1">
@@ -127,58 +170,6 @@
                           <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
                         </div>
                         </td>     
-                        {elseif $keyid eq '57'} <!--ContactPopup-->
-                             <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}"><div id="dtlview_{$label}" onClick="hndMouseOver({$keyid},'{$label}');"><a href="{$keyseclink}">&nbsp;{$keyval}</a></div>
-                        		<div id="editarea_{$label}" style="display:none;">                                              		  
-                               <input id="popuptxt_{$label}" name="contact_name" readonly type="text" style="border:1px solid #bababa;" value="{$keyval}"><input id="txtbox_{$label}" name="{$keyfldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Contacts&action=Popup&html=Popup_picker&popuptype=specific&form=EditView","test","width=600,height=400,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.contact_id.value=''; this.form.contact_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
-                                 <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');"/> or
-                        		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
-                         </div>
-                          </td>                                                  
-                          {elseif $keyid eq '59'} <!--ProductPopup-->
-                             <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}"><div id="dtlview_{$label}"  onClick="hndMouseOver({$keyid},'{$label}');"><a href="{$keyseclink}">&nbsp;{$keyval}</a></div>
-                       		<div id="editarea_{$label}" style="display:none;">                                              		  
-                            <input id="popuptxt_{$label}" name="product_name" readonly type="text" value="{$keyval}"><input id="txtbox_{$label}" name="{$keyfldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Products&action=Popup&html=Popup_picker&form=HelpDeskEditView&popuptype=specific","test","width=600,height=400,resizable=1,scrollbars=1,top=150,left=200");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.product_id.value=''; this.form.product_name.value=''; return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
-                             <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');"/> or
-                       		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
-                         </div>
-                         </td>
-                      {elseif $keyid eq '75' || $keyid eq '81'} <!--VendorPopup-->
-                        <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}"><div id="dtlview_{$label}"  onClick="hndMouseOver({$keyid},'{$label}');"><a href="{$keyseclink}">&nbsp;{$keyval}</a></div>
-                      	<div id="editarea_{$label}" style="display:none;">
-                        <input id="popuptxt_{$label}" name="vendor_name" readonly type="text" style="border:1px solid #bababa;" value="{$keyval}"><input id="txtbox_{$label}" name="{$fldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Vendors&action=Popup&html=Popup_picker&popuptype=specific&form=EditView","test","width=600,height=400,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'>
-                    {if $uitype eq 75}&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.vendor_id.value='';this.form.vendor_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>{/if}                                              		  
-                     <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');"/> or
-                     <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
-                     </div>
-                     </td>
-                     {elseif $keyid eq 76} <!--PotentialPopup-->
-                           <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}"><div id="dtlview_{$label}"  onClick="hndMouseOver({$keyid},'{$label}');"><a href="{$keyseclink}">&nbsp;{$keyval}</a></div>
-                      		<div id="editarea_{$label}" style="display:none;">                                              		  
-                            <input id="popuptxt_{$label}" name="potential_name" readonly type="text" style="border:1px solid #bababa;" value="{$keyval}"><input id="txtbox_{$label}" name="{$keyfldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Potentials&action=Popup&html=Popup_picker&popuptype=specific_potential_account_address&form=EditView","test","width=600,height=400,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.potential_id.value=''; this.form.potential_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
-                            <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');"/> or
-                     	  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
-                       </div>
-                       </td>
-                       {elseif $keyid eq 78} <!--QuotePopup-->
-                        <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}"><div id="dtlview_{$label}"  onClick="hndMouseOver({$keyid},'{$label}');"><a href="{$keyseclink}">&nbsp;{$keyval}</a></div>
-                       	<div id="editarea_{$label}" style="display:none;">                                              		  
-                        <input id="popuptxt_{$label}" name="quote_name" readonly type="text" style="border:1px solid #bababa;" value="{$keyval}"><input id="txtbox_{$label}" name="{$keyfldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Quotes&action=Popup&html=Popup_picker&popuptype=specific&form=EditView","test","width=600,height=400,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.quote_id.value=''; this.form.quote_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
-                        <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');"/> or
-                        <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
-                        </div>
-                        </td>
-                        {elseif $keyid eq 82} <!--Email Body-->
-                              <td colspan="3" width=100% class="dvtCellInfo" align="left"><div id="dtlview_{$label}" style="width:100%;height:200px;overflow:hidden;border:1px solid gray" class="detailedViewTextBox" onmouseover="this.className='detailedViewTextBoxOn'" onmouseout="this.className='detailedViewTextBox'">&nbsp;{$keyval}</div>
-                        	 </td>
-                        {elseif $keyid eq 80} <!--SalesOrderPopup-->
-                              <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}"><div id="dtlview_{$label}"  onClick="hndMouseOver({$keyid},'{$label}');"><a href="{$keyseclink}">&nbsp;{$keyval}</a></div>
-                          		<div id="editarea_{$label}" style="display:none;">                                              		  
-                                <input id="popuptxt_{$label}" name="salesorder_name" readonly type="text" style="border:1px solid #bababa;" value="{$keyval}"><input id="txtbox_{$label}" name="{$keyfldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=SalesOrder&action=Popup&html=Popup_picker&popuptype=specific&form=DetailView","test","width=600,height=400,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.salesorder_id.value=''; this.form.salesorder_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
-                                 <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');"/> or
-                           		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
-                                  </div>
-                             </td>
 						{elseif $keyid eq 83}<!-- Handle the Tax in Inventory -->
 							<td align="right" class="dvtCellLabel">
 							{$APP.LBL_VAT} {$APP.COVERED_PERCENTAGE}
@@ -206,6 +197,7 @@
 								{$SERVICE_TAX}
 							</td>
 	
+
 				{else}
                                                   	<td class="dvtCellInfo" align="left" width=25%">{$keyval}</td>
 				{/if}

Modified: vtigercrm/trunk/include/js/dtlviewajax.js
==============================================================================
--- vtigercrm/trunk/include/js/dtlviewajax.js (original)
+++ vtigercrm/trunk/include/js/dtlviewajax.js Tue Jun  6 08:44:42 2006
@@ -10,16 +10,20 @@
 var globaldtlviewspanid = "";
 var globaleditareaspanid = ""; 
 var globaltxtboxid = "";
+var itsonview=false;
 
 function showHide(showId, hideId)
 {
-	showBlock(showId);
-	hide(hideId);
+	show(showId);
+	fnhide(hideId);
 }
 
 function hndCancel(valuespanid,textareapanid,fieldlabel)
 {
+
   showHide(valuespanid,textareapanid);
+  itsonview=false;
+  return false;
 }
 
 function hndMouseOver(uitype,fieldLabel)
@@ -27,17 +31,37 @@
       var mouseArea="";
       mouseArea="mouseArea_"+ fieldLabel;
       
+      if(itsonview)
+      {
+            return;
+      }
+      
+      show("crmspanid");
       globaldtlviewspanid= "dtlview_"+ fieldLabel;//valuespanid;
       globaleditareaspanid="editarea_"+ fieldLabel;//textareapanid;
       globaltxtboxid="txtbox_"+ fieldLabel;//textboxpanid;
-	handleEdit();
+      divObj = getObj('crmspanid'); 
+      crmy = findPosY(getObj(mouseArea));
+      crmx = findPosX(getObj(mouseArea));
+      if(document.all)
+      {
+          divObj.onclick=handleEdit;
+      }
+      else
+      {
+          divObj.setAttribute('onclick','handleEdit();');
+      }
+      divObj.style.left=(crmx+getObj(mouseArea).offsetWidth -divObj.offsetWidth)+"px";
+      divObj.style.top=crmy+"px";
 }
 
 function handleEdit()
 {
-     showBlock(globaleditareaspanid) ;
-     hide(globaldtlviewspanid);
+     show(globaleditareaspanid) ;
+     fnhide(globaldtlviewspanid);
      getObj(globaltxtboxid).focus();
+     fnhide('crmspanid');
+     itsonview=true;
      return false;
 }
 
@@ -50,7 +74,7 @@
      }
      else if(item.indexOf(":#:SUCCESS")>-1)
      {
-          hide("vtbusy_info");
+          fnhide("vtbusy_info");
      }
 }
 
@@ -64,111 +88,136 @@
 
 function dtlViewAjaxSave(fieldLabel,module,uitype,tableName,fieldName,crmId)
 {
-     var dtlView = "dtlview_"+ fieldLabel;
-     var editArea = "editarea_"+ fieldLabel;
-     var txtBox= "txtbox_"+ fieldLabel;
-     var popupTxt= "popuptxt_"+ fieldLabel;      
-	   var hdTxt = "hdtxt_"+ fieldLabel;
-	   
-     if(formValidate() == false)
-     {
-        return false;
-     }
-     
-     
-     var isAdmin = document.getElementById("hdtxt_IsAdmin").value; 
-     var tagValue = trim(document.getElementById(txtBox).value);
-     
-     //overriden the tagValue based on UI Type for checkbox 
-     if(uitype == '56')
-     {
-        if(document.getElementById(txtBox).checked == true)
-        {
-          tagValue = "1";
-        }else
-        {
-          tagValue = "0";
-        }
-     }
-     
-     var data = "module=" + module + "&action=" + module + "Ajax&file=DetailViewAjax&recordid=" + crmId ;
-     data = data + "&fldName=" + fieldName + "&fieldValue=" + escape(tagValue) + "&ajxaction=DETAILVIEW";
-     show("vtbusy_info");
-     
-     var ajaxObj = new VtigerAjax(dtlViewAjaxResponse);
-     ajaxObj.process("index.php?",data);
-     if(uitype == '13')
-     {
-          getObj(dtlView).innerHTML = "<a href=\"mailto:"+ tagValue+"\" target=\"_blank\">"+tagValue+"&nbsp;</a>";
-     }
-     else if(uitype == '17')
-     {
-          getObj(dtlView).innerHTML = "<a href=\"http://"+ tagValue+"\" target=\"_blank\">"+tagValue+"&nbsp;</a>";
-     }
-     else if(getObj(popupTxt))
-     {
-      	var popObj = getObj(popupTxt);
-      	if(uitype == '50' || uitype == '73' || uitype == '51')
-      	{
-      		getObj(dtlView).innerHTML = "<a href=\"index.php?module=Accounts&action=DetailView&record="+tagValue+"\">"+popObj.value+"&nbsp;</a>";
-      	}
-      	else if(uitype == '57')
-      	{
-      		getObj(dtlView).innerHTML = "<a href=\"index.php?module=Contacts&action=DetailView&record="+tagValue+"\">"+popObj.value+"&nbsp;</a>";
-      	}
-      	else if(uitype == '59')
-      	{
-      		getObj(dtlView).innerHTML = "<a href=\"index.php?module=Products&action=DetailView&record="+tagValue+"\">"+popObj.value+"&nbsp;</a>";
-      	}
-      	else if(uitype == '75' || uitype == '81' )
-      	{
-      		getObj(dtlView).innerHTML = "<a href=\"index.php?module=Vendors&action=DetailView&record="+tagValue+"\">"+popObj.value+"&nbsp;</a>";
-      
-      	}
-      	else if(uitype == '76')
-      	{
-      		getObj(dtlView).innerHTML = "<a href=\"index.php?module=Potentials&action=DetailView&record="+tagValue+"\">"+popObj.value+"&nbsp;</a>";
-      	}
-      	else if(uitype == '78')
-      	{
-      		getObj(dtlView).innerHTML = "<a href=\"index.php?module=Quotes&action=DetailView&record="+tagValue+"\">"+popObj.value+"&nbsp;</a>";
-      	}
-      	else if(uitype == '80')
-      	{
-      		getObj(dtlView).innerHTML = "<a href=\"index.php?module=SalesOrder&action=DetailView&record="+tagValue+"\">"+popObj.value+"&nbsp;</a>";
-      	}
-      	else
-      	{
-      		getObj(dtlView).innerHTML = popObj.value;
-      	}
-     }
-     else if(uitype == '53')
-     {
-      		var hdObj = getObj(hdTxt);
-      		if(isAdmin == "0")
-      		{
-              getObj(dtlView).innerHTML = hdObj.value;
-          }else if(isAdmin == "1")
-          {
-              getObj(dtlView).innerHTML = "<a href=\"index.php?module=Users&action=DetailView&record="+tagValue+"\">"+hdObj.value+"&nbsp;</a>";;
-          }
-     }
-     else if(uitype == '56')
-     {
-        if(tagValue == '1')
-        {
-            getObj(dtlView).innerHTML = "yes";
-        }else
-        {
-            getObj(dtlView).innerHTML = "";
-        }
-        
-     }
-     else
-     {
-          getObj(dtlView).innerHTML = tagValue;
-     }
-     showHide(dtlView,editArea);  //show,hide
+	var dtlView = "dtlview_"+ fieldLabel;
+	var editArea = "editarea_"+ fieldLabel;
+	var txtBox= "txtbox_"+ fieldLabel;
+	var popupTxt= "popuptxt_"+ fieldLabel;      
+	var hdTxt = "hdtxt_"+ fieldLabel;
+
+	if(formValidate() == false)
+	{
+		return false;
+	}
+
+
+	var isAdmin = document.getElementById("hdtxt_IsAdmin").value; 
+
+	var tagValue = trim(document.getElementById(txtBox).value);
+
+	//overriden the tagValue based on UI Type for checkbox 
+	if(uitype == '56')
+	{
+		if(document.getElementById(txtBox).checked == true)
+		{
+			tagValue = "1";
+		}else
+		{
+			tagValue = "0";
+		}
+	}
+
+	var data = "file=DetailViewAjax&module=" + module + "&action=" + module + "Ajax&recordid=" + crmId ;
+	data = data + "&fldName=" + fieldName + "&fieldValue=" + escape(tagValue) + "&ajxaction=DETAILVIEW";
+	show("vtbusy_info");
+
+	var ajaxObj = new VtigerAjax(dtlViewAjaxResponse);
+	ajaxObj.process("index.php?",data);
+	if(uitype == '13')
+	{
+		getObj(dtlView).innerHTML = "<a href=\"mailto:"+ tagValue+"\" target=\"_blank\">"+tagValue+"&nbsp;</a>";
+	}
+	else if(uitype == '17')
+	{
+		getObj(dtlView).innerHTML = "<a href=\"http://"+ tagValue+"\" target=\"_blank\">"+tagValue+"&nbsp;</a>";
+	}
+	else if(uitype == '53')
+	{
+		var hdObj = getObj(hdTxt);
+			if(isAdmin == "0")
+			{
+				getObj(dtlView).innerHTML = hdObj.value;
+			}else if(isAdmin == "1")
+			{
+				getObj(dtlView).innerHTML = "<a href=\"index.php?module=Users&action=DetailView&record="+tagValue+"\">"+hdObj.value+"&nbsp;</a>";;
+			}
+	}
+	else if(uitype == '56')
+	{
+		if(tagValue == '1')
+		{
+			getObj(dtlView).innerHTML = "yes";
+		}else
+		{
+			getObj(dtlView).innerHTML = "";
+		}
+
+	}
+
+	else if(getObj(popupTxt))
+	{
+		var popObj = getObj(popupTxt);
+		if(uitype == '50' || uitype == '73' || uitype == '51')
+		{
+			getObj(dtlView).innerHTML = "<a href=\"index.php?module=Accounts&action=DetailView&record="+tagValue+"\">"+popObj.value+"&nbsp;</a>";
+		}
+		else if(uitype == '57')
+		{
+			getObj(dtlView).innerHTML = "<a href=\"index.php?module=Contacts&action=DetailView&record="+tagValue+"\">"+popObj.value+"&nbsp;</a>";
+		}
+		else if(uitype == '59')
+		{
+			getObj(dtlView).innerHTML = "<a href=\"index.php?module=Products&action=DetailView&record="+tagValue+"\">"+popObj.value+"&nbsp;</a>";
+		}
+		else if(uitype == '75' || uitype == '81' )
+		{
+			getObj(dtlView).innerHTML = "<a href=\"index.php?module=Vendors&action=DetailView&record="+tagValue+"\">"+popObj.value+"&nbsp;</a>";
+
+		}
+		else if(uitype == '76')
+		{
+			getObj(dtlView).innerHTML = "<a href=\"index.php?module=Potentials&action=DetailView&record="+tagValue+"\">"+popObj.value+"&nbsp;</a>";
+		}
+		else if(uitype == '78')
+		{
+			getObj(dtlView).innerHTML = "<a href=\"index.php?module=Quotes&action=DetailView&record="+tagValue+"\">"+popObj.value+"&nbsp;</a>";
+		}
+		else if(uitype == '80')
+		{
+			getObj(dtlView).innerHTML = "<a href=\"index.php?module=SalesOrder&action=DetailView&record="+tagValue+"\">"+popObj.value+"&nbsp;</a>";
+		}
+		else if(uitype == '53')
+		{
+			var hdObj = getObj(hdTxt);
+			if(isAdmin == "0")
+			{
+				getObj(dtlView).innerHTML = hdObj.value;
+			}else if(isAdmin == "1")
+			{
+				getObj(dtlView).innerHTML = "<a href=\"index.php?module=Users&action=DetailView&record="+tagValue+"\">"+hdObj.value+"&nbsp;</a>";;
+			}
+		}
+		else if(uitype == '56')
+		{
+			if(tagValue == '1')
+			{
+				getObj(dtlView).innerHTML = "yes";
+			}else
+			{
+				getObj(dtlView).innerHTML = "";
+			}
+
+		}
+		else
+		{
+			getObj(dtlView).innerHTML = popObj.value;
+		}
+	}
+	else
+	{
+		getObj(dtlView).innerHTML = tagValue;
+	}
+	showHide(dtlView,editArea);  //show,hide
+	itsonview=false;
 }
 
 
@@ -176,26 +225,26 @@
 {
      var item = response.responseText;
 	 getObj('tagfields').innerHTML = item;
-     hide("vtbusy_info");
+     fnhide("vtbusy_info");
 }
 
 function SaveTag(txtBox,crmId,module)
 {
 	var tagValue = document.getElementById(txtBox).value;
 	document.getElementById(txtBox).value ='';
-    var data = "module=" + module + "&action=" + module + "Ajax&file=TagCloud&recordid=" + crmId + "&file=TagCloud&ajxaction=SAVETAG&tagfields=" +tagValue;
+    var data = "file=TagCloud&module=" + module + "&action=" + module + "Ajax&recordid=" + crmId + "&ajxaction=SAVETAG&tagfields=" +tagValue;
     
 	var ajaxObj = new VtigerAjax(dtlViewAjaxTagResponse);
     ajaxObj.process("index.php?",data);
    	show("vtbusy_info");
 }
-
 function setSelectValue(fieldLabel)
 {
-  var hdTxtBox = 'hdtxt_'+fieldLabel; 
-  var selCombo= 'txtbox_'+fieldLabel;
-  var oHdTxtBox = document.getElementById(hdTxtBox);
-  var oSelCombo = document.getElementById(selCombo);
-  
-  oHdTxtBox.value = oSelCombo.options[oSelCombo.selectedIndex].text;
-}
+	var hdTxtBox = 'hdtxt_'+fieldLabel;
+	var selCombo= 'txtbox_'+fieldLabel;
+	var oHdTxtBox = document.getElementById(hdTxtBox);
+	var oSelCombo = document.getElementById(selCombo);
+
+	oHdTxtBox.value = oSelCombo.options[oSelCombo.selectedIndex].text;
+}
+




From vtiger-tickets at vtiger.fosslabs.com  Tue Jun  6 11:18:59 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 06 Jun 2006 15:18:59 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231269=3A?=
 =?utf-8?q?_Picklist_editing_impossible_when_customfield_created?=
Message-ID: <076.0ac8352198014e97e1e06ac4c87ba236@vtiger.fosslabs.com>

#1269: Picklist editing impossible when customfield created
-----------------------+----------------------------------------------------
 Reporter:  abos       |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  major      |   Milestone:  5.0.0    
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 When i create a custom field (tested with picklist), i can't edit the
 default picklist in Picklist Editor, nothing appear.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1269>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun  6 11:21:10 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 06 Jun 2006 15:21:10 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231270=3A?=
 =?utf-8?q?_Picklist_editor_not_exist_for_invoices?=
Message-ID: <076.9bd0e7d72add51e29114ababf0f13b67@vtiger.fosslabs.com>

#1270: Picklist editor not exist for invoices
--------------------------------+-------------------------------------------
 Reporter:  abos                |       Owner:  developer
     Type:  defect              |      Status:  new      
 Priority:  major               |   Milestone:  5.0.0    
Component:  vtigercrm           |     Version:  5.0.0    
 Keywords:  invoices, picklist  |  
--------------------------------+-------------------------------------------
 Impossible to change the picklist for invoices module

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1270>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun  6 13:15:47 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 06 Jun 2006 17:15:47 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231271=3A?=
 =?utf-8?q?_Organisation_wont_save_when_containt_=27?=
Message-ID: <076.62b916cddc422a4f2f6a8828de68207a@vtiger.fosslabs.com>

#1271: Organisation wont save when containt '
-----------------------+----------------------------------------------------
 Reporter:  abos       |       Owner:  abos 
     Type:  defect     |      Status:  new  
 Priority:  major      |   Milestone:       
Component:  vtigercrm  |     Version:  5.0.0
 Keywords:             |  
-----------------------+----------------------------------------------------
 In the company info, when i have a ' i can't save anything.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1271>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun  6 13:16:45 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 06 Jun 2006 17:16:45 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231271=3A?=
 =?utf-8?q?_Organisation_wont_save_when_containt_=27?=
In-Reply-To: <076.62b916cddc422a4f2f6a8828de68207a@vtiger.fosslabs.com>
References: <076.62b916cddc422a4f2f6a8828de68207a@vtiger.fosslabs.com>
Message-ID: <085.862e44c08aed2e864615857963a9eee3@vtiger.fosslabs.com>

#1271: Organisation wont save when containt '
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  abos 
      Type:  defect     |      Status:  new  
  Priority:  major      |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Comment (by abos):

 Solution :
 Change the file /module/Settings/add2db.php from Line 86 :

        $organization_name=addslashes($_REQUEST['organization_name']);
        $org_name=addslashes($_REQUEST['org_name']);
 $organization_address=addslashes($_REQUEST['organization_address']);
        $organization_city=addslashes($_REQUEST['organization_city']);
        $organization_state=addslashes($_REQUEST['organization_state']);
        $organization_code=$_REQUEST['organization_code'];
 $organization_country=addslashes($_REQUEST['organization_country']);
        $organization_phone=$_REQUEST['organization_phone'];
        $organization_fax=$_REQUEST['organization_fax'];
        $organization_website=$_REQUEST['organization_website'];
        $organization_logo=$_REQUEST['organization_logo'];

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1271>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun  6 13:34:11 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 06 Jun 2006 17:34:11 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231271=3A?=
 =?utf-8?q?_Organisation_wont_save_when_containt_=27?=
In-Reply-To: <076.62b916cddc422a4f2f6a8828de68207a@vtiger.fosslabs.com>
References: <076.62b916cddc422a4f2f6a8828de68207a@vtiger.fosslabs.com>
Message-ID: <085.fe6e08def218d795d9c2ccbbfa5dcb67@vtiger.fosslabs.com>

#1271: Organisation wont save when containt '
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  allanbush
      Type:  defect     |      Status:  new      
  Priority:  major      |   Milestone:  5.0.0    
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:             |    Keywords:           
------------------------+---------------------------------------------------
Changes (by allanbush):

  * milestone:  => 5.0.0
  * owner:  abos => allanbush

Comment:

 The preferred method is to use $adb->quote("string") to escape data for
 sql execution.

 This also effects the 4.2 branch.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1271>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun  6 13:35:48 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 06 Jun 2006 17:35:48 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231271=3A?=
 =?utf-8?q?_Organisation_wont_save_when_containt_=27?=
In-Reply-To: <076.62b916cddc422a4f2f6a8828de68207a@vtiger.fosslabs.com>
References: <076.62b916cddc422a4f2f6a8828de68207a@vtiger.fosslabs.com>
Message-ID: <085.1a70c8978061a5f09f78dbc3024c637e@vtiger.fosslabs.com>

#1271: Organisation wont save when containt '
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  allanbush
      Type:  defect     |      Status:  new      
  Priority:  major      |   Milestone:  5.0.0    
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:             |    Keywords:           
------------------------+---------------------------------------------------
Comment (by allanbush):

 (In [6906]) Proper escaping of sql data.  Refs #1271.

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1271>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun  6 13:35:49 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 06 Jun 2006 17:35:49 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6906 -
	/vtigercrm/trunk/modules/Settings/add2db.php
Message-ID: <20060606173549.65F787E852F@vtiger.fosslabs.com>

Author: allanbush
Date: Tue Jun  6 11:35:47 2006
New Revision: 6906

Log:
Proper escaping of sql data.  Refs #1271.

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 Tue Jun  6 11:35:47 2006
@@ -99,7 +99,7 @@
 		if(!isset($organization_logoname))
 			$organization_logoname="";
 
-		$sql="select * from organizationdetails where organizationame = '".$org_name."'";
+		$sql="SELECT * FROM organizationdetails WHERE organizationame = ".$adb->quote($org_name);
 		$result = $adb->query($sql);
 		$org_name = $adb->query_result($result,0,'organizationame');
 		$org_logo = $adb->query_result($result,0,'logoname'); 
@@ -107,7 +107,19 @@
 
 		if($org_name=='')
 		{
-			$sql="insert into organizationdetails(organizationame,address,city,state,code,country,phone,fax,website,logoname) values( '".$organization_name ."','".$organization_address."','". $organization_city."','".$organization_state."','".$organization_code."','".$organization_country."','".$organization_phone."','".$organization_fax."','".$organization_website."','".$organization_logoname."')";
+			$sql="INSERT INTO organizationdetails
+				(organizationame, address, city, state, code, country, phone, fax, website, logoname)
+				VALUES (".$adb->quote($organization_name).
+					",".$adb->quote($organization_address).
+					",".$adb->quote($organization_city).
+					",".$adb->quote($organization_state).
+					",".$adb->quote($organization_code).
+					",".$adb->quote($organization_country).
+					",".$adb->quote($organization_phone).
+					",".$adb->quote($organization_fax).
+					",".$adb->quote($organization_website).
+					",".$adb->quote($organization_logoname).
+				")";
 		}
 		else
 		{
@@ -130,7 +142,18 @@
 				$organization_logoname=$org_logo;
 			}
 
-			$sql="update organizationdetails set organizationame = '".$organization_name."', address = '".$organization_address."', city = '".$organization_city."', state = '".$organization_state."',  code = '".$organization_code."', country = '".$organization_country."' ,  phone = '".$organization_phone."' ,  fax = '".$organization_fax."',  website = '".$organization_website."', logoname = '". $organization_logoname ."' where organizationame = '".$org_name."'";
+			$sql = "UPDATE organizationdetails
+				SET organizationame = ".$adb->quote($organization_name).",
+					address = ".$adb->quote($organization_address).",
+					city = ".$adb->quote($organization_city).",
+					state = ".$adb->quote($organization_state).",
+					code = ".$adb->quote($organization_code).",
+					country = ".$adb->quote($organization_country)." ,
+					phone = ".$adb->quote($organization_phone)." ,
+					fax = ".$adb->quote($organization_fax).",
+					website = ".$adb->quote($organization_website).",
+					logoname = ".$adb->quote($organization_logoname)."
+				WHERE organizationame = ".$adb->quote($org_name);
 		}
 		$adb->query($sql);
 




From vtiger-tickets at vtiger.fosslabs.com  Tue Jun  6 13:39:20 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 06 Jun 2006 17:39:20 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231272=3A?=
 =?utf-8?q?_Tag_Cloud_error_with_new_Leads?=
Message-ID: <076.a19a3b814ba528da3bce99823fdc8f36@vtiger.fosslabs.com>

#1272: Tag Cloud error with new Leads
-----------------------+----------------------------------------------------
 Reporter:  anonymous  |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  critical   |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 If you create a new lead the tag cloud is already filled but should be
 empty.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1272>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun  6 13:41:48 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 06 Jun 2006 17:41:48 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231271=3A?=
 =?utf-8?q?_Organisation_wont_save_when_containt_=27?=
In-Reply-To: <076.62b916cddc422a4f2f6a8828de68207a@vtiger.fosslabs.com>
References: <076.62b916cddc422a4f2f6a8828de68207a@vtiger.fosslabs.com>
Message-ID: <085.28e2cc870b7448b22fbfa4edcec1cd2d@vtiger.fosslabs.com>

#1271: Organisation wont save when containt '
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  allanbush
      Type:  defect     |      Status:  closed   
  Priority:  major      |   Milestone:  5.0.0    
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:  fixed      |    Keywords:           
------------------------+---------------------------------------------------
Changes (by allanbush):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 (In [6907]) Proper escaping of sql data.  Closes #1271.

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1271>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun  6 13:41:48 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 06 Jun 2006 17:41:48 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6907 -
	/vtigercrm/branches/4.2/modules/Settings/add2db.php
Message-ID: <20060606174148.9519F7E8526@vtiger.fosslabs.com>

Author: allanbush
Date: Tue Jun  6 11:41:46 2006
New Revision: 6907

Log:
Proper escaping of sql data.  Closes #1271.

Modified:
    vtigercrm/branches/4.2/modules/Settings/add2db.php

Modified: vtigercrm/branches/4.2/modules/Settings/add2db.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Settings/add2db.php (original)
+++ vtigercrm/branches/4.2/modules/Settings/add2db.php Tue Jun  6 11:41:46 2006
@@ -110,7 +110,7 @@
 	if(!isset($organization_logoname))
 		$organization_logoname="";
 
-	$sql="select * from organizationdetails where organizationame = '".$org_name."'";
+	$sql="SELECT * FROM organizationdetails WHERE organizationame = ".$adb->quote($org_name);
 	$result = $adb->query($sql);
 	$org_name = $adb->query_result($result,0,'organizationame');
 	$org_logo = $adb->query_result($result,0,'logoname'); 
@@ -118,7 +118,20 @@
 
 	if($org_name=='')
 	{
-		$sql="insert into organizationdetails(organizationame,address,city,state,code,country,phone,fax,website,logoname) values( '".$organization_name ."','".$organization_address."','". $organization_city."','".$organization_state."','".$organization_code."','".$organization_country."','".$organization_phone."','".$organization_fax."','".$organization_website."','".$organization_logoname."')";
+		$sql="INSERT INTO organizationdetails
+			(organizationame, address, city, state, code, country, phone, fax, website, logoname)
+			VALUES (".$adb->quote($organization_name).
+				",".$adb->quote($organization_address).
+				",".$adb->quote($organization_city).
+				",".$adb->quote($organization_state).
+				",".$adb->quote($organization_code).
+				",".$adb->quote($organization_country).
+				",".$adb->quote($organization_phone).
+				",".$adb->quote($organization_fax).
+				",".$adb->quote($organization_website).
+				",".$adb->quote($organization_logoname).
+			")";
+
 	}
 	else
 	{
@@ -132,7 +145,18 @@
 			$organization_logoname=$org_logo;
 		}
 
-		$sql="update organizationdetails set organizationame = '".$organization_name."', address = '".$organization_address."', city = '".$organization_city."', state = '".$organization_state."',  code = '".$organization_code."', country = '".$organization_country."' ,  phone = '".$organization_phone."' ,  fax = '".$organization_fax."',  website = '".$organization_website."', logoname = '". $organization_logoname ."' where organizationame = '".$org_name."'";
+		$sql = "UPDATE organizationdetails
+			SET organizationame = ".$adb->quote($organization_name).",
+				address = ".$adb->quote($organization_address).",
+				city = ".$adb->quote($organization_city).",
+				state = ".$adb->quote($organization_state).",
+				code = ".$adb->quote($organization_code).",
+				country = ".$adb->quote($organization_country)." ,
+				phone = ".$adb->quote($organization_phone)." ,
+				fax = ".$adb->quote($organization_fax).",
+				website = ".$adb->quote($organization_website).",
+				logoname = ".$adb->quote($organization_logoname)."
+			WHERE organizationame = ".$adb->quote($org_name);
 	}
 	$adb->query($sql);
 




From vtiger-tickets at vtiger.fosslabs.com  Tue Jun  6 16:35:44 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 06 Jun 2006 20:35:44 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231173=3A?=
	=?utf-8?q?_unable_to_veiw_pdf?=
In-Reply-To: <076.2f691fd08704f9500476c37cc5e5685c@vtiger.fosslabs.com>
References: <076.2f691fd08704f9500476c37cc5e5685c@vtiger.fosslabs.com>
Message-ID: <085.743870073bb98bee5e47b0dc7c696cbd@vtiger.fosslabs.com>

#1173: unable to veiw pdf
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  developer
      Type:  defect     |      Status:  new      
  Priority:  major      |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:             |    Keywords:           
------------------------+---------------------------------------------------
Comment (by anonymous):

 same for me

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1173>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun  7 00:44:08 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 07 Jun 2006 04:44:08 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231273=3A?=
 =?utf-8?q?_can_make_Activity_Type__more_fexible=3F?=
Message-ID: <076.b803679c18dae4da6b07a17780be31dc@vtiger.fosslabs.com>

#1273: can make Activity Type  more fexible?
-------------------------+--------------------------------------------------
 Reporter:  ftc          |       Owner:  developer
     Type:  enhancement  |      Status:  new      
 Priority:  major        |   Milestone:           
Component:  vtigercrm    |     Version:  5.0.0    
 Keywords:               |  
-------------------------+--------------------------------------------------
 Any consideration to make activity type as an add on picklist in setting?.
 It will be more useful if people can choose their activites instead of
 only call, meeting and task.  There are all sorts of activity types
 depending on the industry....Sometimes they can have "products party" like
 tupperware party or girl's lingerie session,  product training,  even
 so.... door to door sales?, street harnessment?.. Well they are all
 marketing  and selling process?

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1273>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 02:00:39 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 06:00:39 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6908 -
	/vtigercrm/trunk/Smarty/templates/CreateProfile.tpl
Message-ID: <20060607060039.E69BC7E8574@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 00:00:35 2006
New Revision: 6908

Log:
ajax functionality has been modified

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

Modified: vtigercrm/trunk/Smarty/templates/CreateProfile.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/CreateProfile.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/CreateProfile.tpl Wed Jun  7 00:00:35 2006
@@ -93,16 +93,18 @@
 
 function dup_validation(profilename)
 {ldelim}
-        var ajaxObj = new VtigerAjax(ajaxSaveResponse);
-        var urlstring ="module=Users&action=UsersAjax&file=CreateProfile1&ajax=true&dup_check=true&profile_name="+profilename;
-
-        ajaxObj.process("index.php?",urlstring);
-{rdelim}
-function ajaxSaveResponse(response)
-{ldelim}
-        if(response.responseText == 'SUCESS')
-                document.profileform.submit();
-        else
-                alert(response.responseText);
+	new Ajax.Request(
+		'index.php',
+		{ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+			method: 'post',
+			postBody: 'module=Users&action=UsersAjax&file=CreateProfile1&ajax=true&dup_check=true&profile_name='+profilename,
+			onComplete: function(response) {ldelim}
+					if(response.responseText == 'SUCESS')
+						document.profileform.submit();
+					else
+						alert(response.responseText);
+				{rdelim}
+		{rdelim}
+	);
 {rdelim}
 </script>




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 02:01:40 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 06:01:40 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6909 -
 /vtigercrm/trunk/Smarty/templates/CurrencyListView.tpl
Message-ID: <20060607060140.B747E7E8574@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 00:01:37 2006
New Revision: 6909

Log:
ajax functionality 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 Jun  7 00:01:37 2006
@@ -15,36 +15,37 @@
 <script>
 	function deleteCurrency(currid)
 	{
-        	show("status");
-	        var ajaxObj = new VtigerAjax(ajaxCurrencyDeleteResponse);
-        	var urlstring = "action=SettingsAjax&file=CurrencyDeleteStep1&return_action=CurrencyListView&return_module=Settings&module=Settings&parenttab=Settings&id="+currid;
-	        ajaxObj.process("index.php?",urlstring);
+		$("status").style.display="inline";
+		new Ajax.Request(
+			'index.php',
+			{queue: {position: 'end', scope: 'command'},
+				method: 'post',
+				postBody: 'action=SettingsAjax&file=CurrencyDeleteStep1&return_action=CurrencyListView&return_module=Settings&module=Settings&parenttab=Settings&id='+currid,
+				onComplete: function(response) {
+					$("status").style.display="none";
+                                        $("currencydiv").innerHTML= response.responseText;
+                                }
+                        }
+		);
 	}
 
-	function ajaxCurrencyDeleteResponse(response)
-	{
-        	hide("status");
-	        document.getElementById("currencydiv").innerHTML= response.responseText;
-	}
-	
 	function transferCurrency(del_currencyid)
 	{
-                show("status");
-                hide("CurrencyDeleteLay");
-                var ajaxObj = new VtigerAjax(ajaxCurrencySaveResponse);
-                var trans_currencyid=document.getElementById('transfer_currency_id').options[document.getElementById('transfer_currency_id').options.selectedIndex].value;
-                var urlstring ="module=Settings&action=SettingsAjax&file=CurrencyDelete&ajax=true&delete_currency_id="+del_currencyid+"&transfer_currency_id="+trans_currencyid;
-                ajaxObj.process("index.php?",urlstring);
-
+		$("status").style.display="inline";
+		$("CurrencyDeleteLay").style.display = "none";
+		var trans_currencyid=$("transfer_currency_id").options[$("transfer_currency_id").options.selectedIndex].value;
+		new Ajax.Request(
+			'index.php',
+			{queue: {position: 'end', scope: 'command'},
+				method: 'post',
+				postBody: 'module=Settings&action=SettingsAjax&file=CurrencyDelete&ajax=true&delete_currency_id='+del_currencyid+'&transfer_currency_id='+trans_currencyid,
+				onComplete: function(response) {
+					$("status").style.display="none";
+					$("CurrencyListViewContents").innerHTML= response.responseText;
+				}
+			}
+		);
 	}
-
-	function ajaxCurrencySaveResponse(response)
-	{
-        	hide("status");
-	        document.getElementById("CurrencyListViewContents").innerHTML= response.responseText;
-	}
-
-
 </script>
 
 {/literal}




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 02:03:34 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 06:03:34 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6910 -
 /vtigercrm/trunk/Smarty/templates/CustomFieldList.tpl
Message-ID: <20060607060334.0B9C87E8579@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 00:03:31 2006
New Revision: 6910

Log:
ajax functionality has been modified

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

Modified: vtigercrm/trunk/Smarty/templates/CustomFieldList.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/CustomFieldList.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/CustomFieldList.tpl Wed Jun  7 00:03:31 2006
@@ -10,45 +10,54 @@
  ********************************************************************************/ *}
 <script language="JavaScript" type="text/javascript" src="include/js/customview.js"></script>
 <script language="javascript">
-function ajaxSaveResponse(response)
-{ldelim}
-        document.getElementById("cfList").innerHTML=response.responseText;
-{rdelim}
+{literal}
+
 function getCustomFieldList(customField)
-{ldelim}
-	var ajaxObj = new VtigerAjax(ajaxSaveResponse);
+{
 	var modulename = customField.options[customField.options.selectedIndex].value;
-	var urlstring ="module=Settings&action=SettingsAjax&file=CustomFieldList&fld_module="+modulename+"&parenttab=Settings&ajax=true";
-	ajaxObj.process("index.php?",urlstring);
-{rdelim}
+	new Ajax.Request(
+		'index.php',
+		{queue: {position: 'end', scope: 'command'},
+			method: 'post',
+			postBody: 'module=Settings&action=SettingsAjax&file=CustomFieldList&fld_module='+modulename+'&parenttab=Settings&ajax=true',
+			onComplete: function(response) {
+				$("cfList").innerHTML=response.responseText;
+			}
+		}
+	);	
+}
 
 function deleteCustomField(id, fld_module, colName, uitype)
-{ldelim}
+{
         if(confirm("Are you sure?"))
-        {ldelim}
+        {
                 document.form.action="index.php?module=Settings&action=DeleteCustomField&fld_module="+fld_module+"&fld_id="+id+"&colName="+colName+"&uitype="+uitype
                 document.form.submit()
-        {rdelim}
-{rdelim}
+        }
+}
 
-function ajaxCFSaveResponse(response)
-{ldelim}
-        document.getElementById("createcf").innerHTML=response.responseText;
-{rdelim}
 function getCreateCustomFieldForm(customField,id,tabid,ui)
-{ldelim}
-        var ajaxObj = new VtigerAjax(ajaxCFSaveResponse);
+{
         var modulename = customField;
-        var urlstring ="module=Settings&action=SettingsAjax&file=CreateCustomField&fld_module="+modulename+"&parenttab=Settings&ajax=true&fieldid="+id+"&tabid="+tabid+"&uitype="+ui;
-        ajaxObj.process("index.php?",urlstring);
-{rdelim}
+	new Ajax.Request(
+		'index.php',
+		{queue: {position: 'end', scope: 'command'},
+			method: 'post',
+			postBody: 'module=Settings&action=SettingsAjax&file=CreateCustomField&fld_module='+customField+'&parenttab=Settings&ajax=true&fieldid='+id+'&tabid='+tabid+'&uitype='+ui,
+			onComplete: function(response) {
+				$("createcf").innerHTML=response.responseText;
+			}
+		}
+	);
+
+}
 
 function CustomFieldMapping()
-{ldelim}
+{
         document.form.action="index.php?module=Settings&action=LeadCustomFieldMapping";
         document.form.submit();
-{rdelim}
-
+}
+{/literal}
 </script>
 <div id="createcf" style="display:block;position:absolute;top:175px;left:275px;"></div>
 <table width="100%" border="0" cellpadding="0" cellspacing="0">




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 02:04:27 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 06:04:27 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6911 -
	/vtigercrm/trunk/Smarty/templates/Emails.tpl
Message-ID: <20060607060427.86D427E8579@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 00:04:23 2006
New Revision: 6911

Log:
ajax functionality has been modified

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 Jun  7 00:04:23 2006
@@ -11,24 +11,15 @@
 -->*}
 <!--  USER  SETTINGS PAGE STARTS HERE -->
 <script language="javascript">
-function ajaxSaveResponse(response)
-{ldelim}
-	hide("status");
-	document.getElementById("email_con").innerHTML=response.responseText;
-	execJS(document.getElementById('email_con'));
-{rdelim}
-function ajaxgetResponse(response)
-{ldelim}
-	hide("status");
-	document.getElementById("EmailDetails").innerHTML=response.responseText;
-{rdelim}
+
 function setSubject(subject)
 {ldelim}
-document.getElementById("subjectsetter").innerHTML=subject
-{rdelim}
+	document.getElementById("subjectsetter").innerHTML=subject
+{rdelim}
+
 function getEmailContents(id)
 {ldelim}
-	show("status");
+	$("status").style.display="inline";
 	var rowid = 'row_'+id;
 	getObj(rowid).className = 'prvPrfHoverOn';
 	if(gselectedrowid != 0 && gselectedrowid != id)
@@ -37,34 +28,22 @@
 		getObj(prev_selected_rowid).className = 'prvPrfHoverOff';
 	{rdelim}
 	gselectedrowid = id;
-	var ajaxObj = new VtigerAjax(ajaxgetResponse);
-	var urlstring ="module=Emails&action=EmailsAjax&file=DetailView&mode=ajax&record="+id;
-	ajaxObj.process("index.php?",urlstring);
-{rdelim}
-{literal}
-
-function ajaxDelResponse(response)
-{
-	hide("status");
-	document.getElementById('EmailDetails').innerHTML = '<table valign="top" border="0" cellpadding="0" cellspacing="0" width="100%"><tbody><tr><td class="forwardBg"><table border="0" cellpadding="0" cellspacing="0" width="100%"><tbody><tr><td colspan="2">&nbsp;</td></tr></tbody></table></td></tr><tr><td style="padding-top: 10px;" bgcolor="#ffffff" height="300" valign="top"></td></tr></tbody></table>';
-	document.getElementById("subjectsetter").innerHTML='';
-	document.getElementById("email_con").innerHTML=response.responseText;
-	execJS(document.getElementById('email_con'));
-}
-
-{/literal}
+	new Ajax.Request(
+		'index.php',
+		{ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+			method: 'post',
+			postBody: 'module=Emails&action=EmailsAjax&file=DetailView&mode=ajax&record='+id,
+			onComplete: function(response) {ldelim}
+						$("status").style.display="none";
+						$("EmailDetails").innerHTML = response.responseText;
+					{rdelim}
+			{rdelim}
+		);
+{rdelim}
+
 function ShowFolders(folderid)
 {ldelim}
-	show("status");
-	if(gFolderid != folderid)
-	{ldelim}	
-    	var ajaxObj = new VtigerAjax(ajaxSaveResponse);
-		gselectedrowid = 0;
-	{rdelim}
-	else
-	{ldelim}
-		var ajaxObj = new VtigerAjax(ajaxDelResponse);
-	{rdelim}
+	$("status").style.display="inline";
 	gFolderid = folderid;
 	getObj('search_text').value = '';
 	switch(folderid)
@@ -87,8 +66,31 @@
 		case 6:
 			getObj('mail_fldrname').innerHTML = '{$MOD.LBL_QUAL_CONTACT}';
 	{rdelim}
-    var urlstring ="module=Emails&ajax=true&action=EmailsAjax&file=ListView&folderid="+folderid;
-   	ajaxObj.process("index.php?",urlstring);
+	
+	new Ajax.Request(
+                'index.php',
+                {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+                method: 'post',
+                postBody: 'module=Emails&ajax=true&action=EmailsAjax&file=ListView&folderid='+folderid,
+                onComplete: function(response) {ldelim}
+                                        $("status").style.display="none";
+                                        if(gFolderid != folderid)
+                                        {ldelim}
+                                                gselectedrowid = 0;
+                                                $("email_con").innerHTML=response.responseText;
+                                                execJS($('email_con'));
+                                        {rdelim}
+                                        else
+                                        {ldelim}
+                                                $('EmailDetails').innerHTML = '<table valign="top" border="0" cellpadding="0" cellspacing="0" width="100%"><tbody><tr><td class="forwardBg"><table border="0" cellpadding="0" cellspacing="0" width="100%"><tbody><tr><td colspan="2">&nbsp;</td></tr></tbody></table></td></tr><tr><td style="padding-top:10px;" bgcolor="#ffffff" height="300" valign="top"></td></tr></tbody></table>';
+                                                $("subjectsetter").innerHTML='';
+                                                $("email_con").innerHTML=response.responseText;
+                                                execJS($('email_con'));
+                                        {rdelim}
+                                {rdelim}
+                        {rdelim}
+	);
+
 {rdelim}
 function getListViewEntries_js(module,url)
 {ldelim}




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 02:06:37 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 06:06:37 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6913 -
	/vtigercrm/trunk/Smarty/templates/Header.tpl
Message-ID: <20060607060637.3AEE77E8583@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 00:06:33 2006
New Revision: 6913

Log:
ajax functionality has been modified

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 Jun  7 00:06:33 2006
@@ -142,46 +142,57 @@
 	{include file="Clock.tpl"}
 
 
-<div id="qcform" style="position:absolute;width:500px;top:60px;left:450px;z-index:5000;`"></div>
+<div id="qcform" style="position:absolute;width:500px;top:60px;left:450px;z-index:5000;"></div>
 
 <script>
 function fetch_clock()
 {ldelim}
-	var ajaxObj = new VtigerAjax(ajaxClockResponse);
-	var urlstring = "module=Utilities&action=UtilitiesAjax&file=Clock";
-	ajaxObj.process("index.php?",urlstring);
+	new Ajax.Request(
+		'index.php',
+		{ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+			method: 'post',
+			postBody: 'module=Utilities&action=UtilitiesAjax&file=Clock',
+			onComplete: function(response)
+				    {ldelim}
+					$("clock_cont").innerHTML=response.responseText;
+					execJS($('clock_cont'));
+				    {rdelim}
+		{rdelim}
+	);
 
 {rdelim}
-function ajaxClockResponse(response)
-{ldelim}
-	document.getElementById("clock_cont").innerHTML=response.responseText;
-	execJS(document.getElementById('clock_cont'));
-{rdelim}
+
 function fetch_calc()
 {ldelim}
-	var ajaxObj = new VtigerAjax(ajaxCalcResponse);
-	var urlstring = "module=Utilities&action=UtilitiesAjax&file=Calculator";
-	ajaxObj.process("index.php?",urlstring);
-
+	new Ajax.Request(
+		'index.php',
+		{ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+			method: 'post',
+			postBody: 'module=Utilities&action=UtilitiesAjax&file=Calculator',
+			onComplete: function(response)
+					{ldelim}
+						$("calculator_cont").innerHTML=response.responseText;
+						execJS($('calculator_cont'));
+					{rdelim}
+		{rdelim}
+	);
 {rdelim}
-function ajaxCalcResponse(response)
-{ldelim}
-	document.getElementById("calculator_cont").innerHTML=response.responseText;
-	execJS(document.getElementById('calculator_cont'));
-{rdelim}
-
 
 function Announcement_rss()
 {ldelim}
-	var ajaxObj = new VtigerAjax(ajaxRssResponse);
-	var urlstring = "module=Users&action=UsersAjax&announce_rss=yes";
-		ajaxObj.process("index.php?",urlstring);
-
-{rdelim}
-function ajaxRssResponse(response)
-{ldelim}
-	if(document.getElementById("rss").innerHTML != response.responseText)
-		document.getElementById("rss").innerHTML=response.responseText;
+	new Ajax.Request(
+                'index.php',
+                {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+                        method: 'post',
+                        postBody: 'module=Users&action=UsersAjax&announce_rss=yes',
+                        onComplete: function(response)
+                                        {ldelim}
+						if($("rss").innerHTML != response.responseText)
+							$("rss").innerHTML=response.responseText;
+                                        {rdelim}
+                {rdelim}
+        );
+
 {rdelim}
 setInterval("Announcement_rss()",300000)
 </script>
@@ -190,23 +201,32 @@
 
 function QCreate(qcoptions)
 {ldelim}
-        show("status");
-        var ajaxObj = new VtigerAjax(ajaxQCreateResponse);
-        var module = qcoptions.options[qcoptions.options.selectedIndex].value;
+	$("status").style.display="inline";
+	var module = qcoptions.options[qcoptions.options.selectedIndex].value;
 	if(module == 'Events')
-                var urlstring = "module=Activities&action=ActivitiesAjax&file=QuickCreate&activity_mode=Events";
-        else
-	        var urlstring = "module="+module+"&action="+module+"Ajax&file=QuickCreate";
-          ajaxObj.process("index.php?",urlstring);
+	{ldelim}
+		module = 'Activities';
+		action = 'Activities';
+		var urlstr = '&activity_mode=Events';
+	{rdelim}
+	else
+		var urlstr = '';
+	new Ajax.Request(
+                'index.php',
+                {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+                        method: 'post',
+                        postBody: 'module='+module+'&action='+module+'Ajax&file=QuickCreate'+urlstr,
+                        onComplete: function(response)
+                                        {ldelim}
+						$("status").style.display="none";
+						$("qcform").style.display="inline";
+					        $("qcform").innerHTML = response.responseText;
+						eval($("qcform"));
+                                        {rdelim}
+                {rdelim}
+        );
 {rdelim}
 
-function ajaxQCreateResponse(response)
-{ldelim}
-        hide("status");
-        show("qcform");
-        document.getElementById('qcform').innerHTML = response.responseText;
-        eval(document.getElementById('qcform'));
-{rdelim}
 </script>
 
 {literal}
@@ -377,8 +397,6 @@
                chktime.setDate(dd)
                chktime.setHours(hourval)
                chktime.setMinutes(minval)
-               //chkdate.setHours(hourval)
-               //chkdate.setMinutes(minval)
                 if (!compareDates(chkdate,datelabel,currdate,"Current date & time for Activities with status as Planned","GE")) {
                         getObj(datefield).focus()
                         return false




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 02:07:19 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 06:07:19 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6914 -
	/vtigercrm/trunk/Smarty/templates/ImportStep2.tpl
Message-ID: <20060607060719.1DA377E8583@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 00:07:15 2006
New Revision: 6914

Log:
ajax functionality has been modified

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

Modified: vtigercrm/trunk/Smarty/templates/ImportStep2.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ImportStep2.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ImportStep2.tpl Wed Jun  7 00:07:15 2006
@@ -17,19 +17,17 @@
 
 function getImportSavedMap(impoptions)
 {ldelim}
-	//show('status');
-	var ajaxObj = new VtigerAjax(ajaxImportSavedMapResponse);
 	var mapping = impoptions.options[impoptions.options.selectedIndex].value;
-	var urlstring = "module=Import&mapping="+mapping+"&action=ImportAjax";
-	ajaxObj.process("index.php",urlstring);
-
-{rdelim}
-
-function ajaxImportSavedMapResponse(response)
-{ldelim}
-	//hide('status');
-	document.getElementById('importmapform').innerHTML = response.responseText;
-
+	new Ajax.Request(
+		'index.php',
+		{ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+			method: 'post',
+			postBody: 'module=Import&mapping='+mapping+'&action=ImportAjax',
+			onComplete: function(response) {ldelim}
+					$("importmapform").innerHTML = response.responseText;
+				{rdelim}
+			{rdelim}
+		);
 {rdelim}
 
 </script>




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 02:08:45 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 06:08:45 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6915 -
	/vtigercrm/trunk/Smarty/templates/ListView.tpl
Message-ID: <20060607060845.A9B667E8583@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 00:08:41 2006
New Revision: 6915

Log:
ajax functionality has been modified

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 Jun  7 00:08:41 2006
@@ -21,20 +21,11 @@
 {/if}
 <script language="JavaScript" type="text/javascript" src="modules/{$MODULE}/{$SINGLE_MOD}.js"></script>
 <script language="javascript">
-function ajaxSaveResponse(response)
-{ldelim}
-	hide("status");
-	result = response.responseText.split('&#&#&#'); 
-	document.getElementById("ListViewContents").innerHTML= result[2];
-	if(result[1] != '')
-		alert(result[1]);	
-{rdelim}
 
 function callSearch(searchtype)
 {ldelim}
 	search_fld_val= document.basicSearch.search_field[document.basicSearch.search_field.selectedIndex].value;
         search_txt_val=document.basicSearch.search_text.value;
-        var ajaxObj = new VtigerAjax(ajaxSaveResponse);
         var urlstring = '';
         if(searchtype == 'Basic')
         {ldelim}
@@ -59,8 +50,20 @@
                 urlstring += 'search_cnt='+no_rows+'&';
                 urlstring += 'searchtype=advance&'
         {rdelim}
-        urlstring = urlstring +'query=true&file=index&module={$MODULE}&action={$MODULE}Ajax&ajax=true';
-        ajaxObj.process("index.php?",urlstring);
+	new Ajax.Request(
+		'index.php',
+		{ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+			method: 'post',
+			postBody:urlstring +'query=true&file=index&module={$MODULE}&action={$MODULE}Ajax&ajax=true',
+			onComplete: function(response) {ldelim}
+				$("status").style.display="none";
+                                result = response.responseText.split('&#&#&#');
+                                $("ListViewContents").innerHTML= result[2];
+                                if(result[1] != '')
+                                        alert(result[1]);
+			{rdelim}
+	       {rdelim}
+        );
 
 {rdelim}
 function alphabetic(module,url,dataid)
@@ -72,11 +75,21 @@
 
         {rdelim}
         getObj(dataid).className = 'searchAlphselected';
-        show("status");
-        var ajaxObj = new VtigerAjax(ajaxSaveResponse);
-        var urlstring ="module="+module+"&action="+module+"Ajax&file=index&ajax=true&"+url;
-        ajaxObj.process("index.php?",urlstring);
-
+	$("status").style.display="inline";
+	new Ajax.Request(
+		'index.php',
+		{ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+			method: 'post',
+			postBody: 'module='+module+'&action='+module+'Ajax&file=index&ajax=true&'+url,
+			onComplete: function(response) {ldelim}
+				$("status").style.display="none";
+				result = response.responseText.split('&#&#&#');
+				$("ListViewContents").innerHTML= result[2];
+				if(result[1] != '')
+			                alert(result[1]);
+			{rdelim}
+		{rdelim}
+	);
 {rdelim}
 
 </script>
@@ -399,8 +412,7 @@
 
 function ajaxChangeStatus(statusname)
 {
-	show("status");
-	var ajaxObj = new VtigerAjax(ajaxSaveResponse);
+	$("status").style.display="inline";
 	var viewid = document.massdelete.viewname.value;
 	var idstring = document.massdelete.idlist.value;
 	if(statusname == 'status')
@@ -419,8 +431,21 @@
 {literal}
 
 	}
+	new Ajax.Request(
+                'index.php',
+                {queue: {position: 'end', scope: 'command'},
+                        method: 'post',
+                        postBody: urlstring,
+                        onComplete: function(response) {
+                                $("status").style.display="none";
+                                result = response.responseText.split('&#&#&#');
+                                $("ListViewContents").innerHTML= result[2];
+                                if(result[1] != '')
+                                        alert(result[1]);
+                        }
+                }
+        );
 	
-	ajaxObj.process("index.php?",urlstring);
 }
 </script>
 {/literal}




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 02:10:11 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 06:10:11 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6916 -
 /vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl
Message-ID: <20060607061011.2E5C67E857F@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 00:10:07 2006
New Revision: 6916

Log:
ajax functionality has been modified

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

Modified: vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl Wed Jun  7 00:10:07 2006
@@ -222,18 +222,21 @@
 </table>
 <div id="tempdiv" style="display:block;position:absolute;left:225px;top:150px;"></div>
 <script>
-function ajaxSaveResponse(response)
-{ldelim}
-	hide("status");
-	document.getElementById("tempdiv").innerHTML=response.responseText;
-{rdelim}
 
 function callEditDiv(modulename,mode,id)
 {ldelim}
-	show("status");
-	var ajaxObj = new VtigerAjax(ajaxSaveResponse);
-	var urlstring = "module=Users&action=UsersAjax&orgajax=true&mode="+mode+"&sharing_module="+modulename+"&shareid="+id;
-	ajaxObj.process("index.php?",urlstring);
+	$("status").style.display="inline";
+	new Ajax.Request(
+		'index.php',
+		{ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+			method: 'post',
+			postBody: 'module=Users&action=UsersAjax&orgajax=true&mode='+mode+'&sharing_module='+modulename+'&shareid='+id,
+			onComplete: function(response) {ldelim}
+				$("status").style.display="none";
+				$("tempdiv").innerHTML=response.responseText;
+			{rdelim}
+		{rdelim}
+	);
 {rdelim}
 
 function fnwriteRules(module,related)




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 02:05:42 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 06:05:42 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6912 -
	/vtigercrm/trunk/Smarty/templates/GroupEditView.tpl
Message-ID: <20060607060542.018907E8579@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 00:05:38 2006
New Revision: 6912

Log:
ajax functionality has been modified

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

Modified: vtigercrm/trunk/Smarty/templates/GroupEditView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/GroupEditView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/GroupEditView.tpl Wed Jun  7 00:05:38 2006
@@ -15,23 +15,26 @@
 
 function dup_validation()
 {ldelim}
-        //show("status");
-        var ajaxObj = new VtigerAjax(ajaxSaveResponse);
-        var groupname = document.getElementById('groupName').value;
-        var mode = getObj('mode').value;
-        var groupid = getObj('groupId').value;
-        if(mode == 'edit')
-                var urlstring ="module=Users&action=UsersAjax&file=SaveGroup&ajax=true&dup_check=true&mode="+mode+"&groupName="+groupname+"&groupid="+groupid;
-        else
-                var urlstring ="module=Users&action=UsersAjax&file=SaveGroup&ajax=true&dup_check=true&groupName="+groupname;
-        ajaxObj.process("index.php?",urlstring);
-{rdelim}
-function ajaxSaveResponse(response)
-{ldelim}
-        if(response.responseText == 'SUCESS')
-                document.newGroupForm.submit();
-        else
-                alert(response.responseText);
+	var mode = getObj('mode').value;
+	var groupname = $('groupName').value;
+	var groupid = getObj('groupId').value;
+	if(mode == 'edit')
+		var reminstr = '&mode='+mode+'&groupName='+groupname+'&groupid='+groupid;
+	else
+		var reminstr = '&groupName='+groupname;
+	new Ajax.Request(
+		'index.php',
+		{ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+			method: 'post',
+			postBody: 'module=Users&action=UsersAjax&file=SaveGroup&ajax=true&dup_check=true'+reminstr,
+			onComplete: function(response) {ldelim}
+				if(response.responseText == 'SUCESS')
+					document.newGroupForm.submit();
+				else
+					alert(response.responseText);
+			{rdelim}
+		{rdelim}
+	);
 {rdelim}
 
 var constructedOptionValue;




From vtiger-tickets at vtiger.fosslabs.com  Wed Jun  7 03:25:14 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 07 Jun 2006 07:25:14 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231274=3A?=
 =?utf-8?q?_customer_portal_5=2E0_missing?=
Message-ID: <076.709d4c1791ce9aaefba03d131eecd0c0@vtiger.fosslabs.com>

#1274: customer portal 5.0 missing
-----------------------+----------------------------------------------------
 Reporter:  anonymous  |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  blocker    |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 at Beta there are no customer portal functions working

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1274>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun  7 03:25:25 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 07 Jun 2006 07:25:25 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231274=3A?=
 =?utf-8?q?_customer_portal_5=2E0_missing?=
In-Reply-To: <076.709d4c1791ce9aaefba03d131eecd0c0@vtiger.fosslabs.com>
References: <076.709d4c1791ce9aaefba03d131eecd0c0@vtiger.fosslabs.com>
Message-ID: <085.8d6e101ace10db13d2b96ffe13df2502@vtiger.fosslabs.com>

#1274: customer portal 5.0 missing
-----------------------------+----------------------------------------------
  Reporter:  anonymous       |       Owner:  developer
      Type:  defect          |      Status:  new      
  Priority:  blocker         |   Milestone:           
 Component:  customerportal  |     Version:  5.0.0    
Resolution:                  |    Keywords:           
-----------------------------+----------------------------------------------
Changes (by anonymous):

  * component:  vtigercrm => customerportal

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1274>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 04:04:41 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 08:04:41 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6917 -
	/vtigercrm/trunk/Smarty/templates/RelatedLists.tpl
Message-ID: <20060607080441.6E12A7E8590@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 02:04:37 2006
New Revision: 6917

Log:
i18n updated for related lists across all modules -ahmed

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

Modified: vtigercrm/trunk/Smarty/templates/RelatedLists.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/RelatedLists.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/RelatedLists.tpl Wed Jun  7 02:04:37 2006
@@ -24,7 +24,7 @@
 		<div class="small" style="padding:20px">
 		
 		
-		 <span class="lvtHeaderText"><font color="purple">[ {$ID} ] </font>{$NAME} -  {$SINGLE_MOD} More Information</span> <br>
+		 <span class="lvtHeaderText"><font color="purple">[ {$ID} ] </font>{$NAME} -  {$SINGLE_MOD} {$APP.LBL_MORE} {$APP.LBL_INFORMATION}</span> <br>
 		 {$UPDATEINFO}
 		 <hr noshade size=1>
 		 <br> 
@@ -37,12 +37,12 @@
 				<tr>
 					<td class="dvtTabCache" style="width:10px" nowrap>&nbsp;</td>
 					{if $MODULE eq 'Activities'}
-                                                <td class="dvtUnSelectedCell" align=center nowrap><a href="index.php?action=DetailView&module={$MODULE}&record={$ID}&activity_mode={$ACTIVITY_MODE}&parenttab={$CATEGORY}">{$SINGLE_MOD} Information</a></td>
+                                                <td class="dvtUnSelectedCell" align=center nowrap><a href="index.php?action=DetailView&module={$MODULE}&record={$ID}&activity_mode={$ACTIVITY_MODE}&parenttab={$CATEGORY}">{$SINGLE_MOD} {$APP.LBL_INFORMATION}</a></td>
                                         {else}
-                                        <td class="dvtUnSelectedCell" align=center nowrap><a href="index.php?action=DetailView&module={$MODULE}&record={$ID}&parenttab={$CATEGORY}">{$SINGLE_MOD} Information</a></td>
+                                        <td class="dvtUnSelectedCell" align=center nowrap><a href="index.php?action=DetailView&module={$MODULE}&record={$ID}&parenttab={$CATEGORY}">{$SINGLE_MOD} {$APP.LBL_INFORMATION}</a></td>
                                         {/if}
 					<td class="dvtTabCache" style="width:10px">&nbsp;</td>
-					<td class="dvtSelectedCell" align=center nowrap>More Information</td>
+					<td class="dvtSelectedCell" align=center nowrap>{$APP.LBL_MORE} {$APP.LBL_INFORMATION}</td>
 					<td class="dvtTabCache" style="width:100%">&nbsp;</td>
 				</tr>
 				</table>
@@ -75,76 +75,76 @@
 							<td align=right>
 							{if $header eq 'Potentials'}
 						
-							<input title="New Potential" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='Potentials'" type="submit" name="button" value="Add new Potential"></td>
+							<input title="{$APP.LBL_ADD_NEW} {$APP.Potential}" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='Potentials'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Potential}"></td>
 							{elseif $header eq 'PriceBooks'}
 							{if $MODULE eq 'Products'}
-							<input title="Add to PriceBook" accessKey="" class="small" value="Add to PriceBook" LANGUAGE=javascript onclick="this.form.action.value='AddProductToPriceBooks';this.form.module.value='Products'"  type="submit" name="button">
+							<input title="{$APP.LBL_ADD_TO} {$APP.PriceBook}" accessKey="" class="small" value="{$APP.LBL_ADD_TO} {$APP.PriceBook}" LANGUAGE=javascript onclick="this.form.action.value='AddProductToPriceBooks';this.form.module.value='Products'"  type="submit" name="button">
 							{/if}
 							
 							{elseif $header eq 'Products'}
 							{if $MODULE eq 'PriceBooks'}
-							<input title="Select Product" accessKey="" class="small" value="Select Product" LANGUAGE=javascript onclick="this.form.action.value='AddProductsToPriceBook';this.form.module.value='Products';this.form.return_module.value='Products';this.form.return_action.value='PriceBookDetailView'"  type="submit" name="button"></td>
-
-							{else}
-							<input title="New Product" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='Products';this.form.return_module.value='{$MODULE}';this.form.return_action.value='CallRelatedList'" type="submit" name="button" value="Add new Product"></td>				
+							<input title="{$APP.LBL_SELECT_PRODUCT_BUTTON_LABEL}" accessKey="" class="small" value="{$APP.LBL_SELECT_PRODUCT_BUTTON_LABEL}" LANGUAGE=javascript onclick="this.form.action.value='AddProductsToPriceBook';this.form.module.value='Products';this.form.return_module.value='Products';this.form.return_action.value='PriceBookDetailView'"  type="submit" name="button"></td>
+
+							{else}
+							<input title="{$APP.LBL_ADD_NEW} {$APP.Product}" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='Products';this.form.return_module.value='{$MODULE}';this.form.return_action.value='CallRelatedList'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Product}"></td>				
 							{/if}	
 							{elseif $header eq 'Leads'}
-                                                        <input title="New Lead" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='Leads'" type="submit" name="button" value="Add new Lead"></td>
+                                                        <input title="{$APP.LBL_ADD_NEW} {$APP.Lead}" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='Leads'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Lead}"></td>
 							{elseif $header eq 'Contacts' }
 							{if $MODULE eq 'Activities' || $MODULE eq 'Potentials' || $MODULE eq 'Vendors'}
-                                                        <input title="Change" accessKey="" class="small" value="Select Contact" LANGUAGE=javascript onclick='return window.open("index.php?module=Contacts&return_module={$MODULE}&action=Popup&popuptype=detailview&select=enable&form=EditView&form_submit=false&recordid={$ID}","test","width=640,height=570,resizable=0,scrollbars=0");' type="button"  name="button"></td>
+                                                        <input title="Change" accessKey="" class="small" value="{$APP.LBL_SELECT_BUTTON_LABEL} {$APP.Contact}" LANGUAGE=javascript onclick='return window.open("index.php?module=Contacts&return_module={$MODULE}&action=Popup&popuptype=detailview&select=enable&form=EditView&form_submit=false&recordid={$ID}","test","width=640,height=570,resizable=0,scrollbars=0");' type="button"  name="button"></td>
 							{elseif $MODULE eq 'Emails'}
-							<input title="Bulk Mail" accessykey="F" class="small" onclick="this.form.action.value='sendmail';this.form.return_action.value='DetailView';this.form.module.value='Emails';this.form.return_module.value='Emails';" name="button" value="Bulk Mails" type="submit">&nbsp;
-                                                        <input title="Change" accessKey="" class="small" value="Select Contact" LANGUAGE=javascript onclick='return window.open("index.php?module=Contacts&return_module=Emails&action=Popup&popuptype=detailview&form=EditView&form_submit=false&recordid={$ID}","test","width=640,height=570,resizable=0,scrollbars=0");' type="button"  name="button"></td>
-							{else}
-                                                        <input title="New Contact" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='Contacts'" type="submit" name="button" value="Add new Contact"></td>
+							<input title="{$APP.LBL_BULK_MAILS}" accessykey="F" class="small" onclick="this.form.action.value='sendmail';this.form.return_action.value='DetailView';this.form.module.value='Emails';this.form.return_module.value='Emails';" name="button" value="{$APP.LBL_BULK_MAILS}" type="submit">&nbsp;
+                                                        <input title="Change" accessKey="" class="small" value="{$APP.LBL_SELECT_BUTTON_LABEL} {$APP.Contact}" LANGUAGE=javascript onclick='return window.open("index.php?module=Contacts&return_module=Emails&action=Popup&popuptype=detailview&form=EditView&form_submit=false&recordid={$ID}","test","width=640,height=570,resizable=0,scrollbars=0");' type="button"  name="button"></td>
+							{else}
+                                                        <input title="{$APP.LBL_ADD_NEW} {$APP.Contact}" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='Contacts'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Contact}"></td>
                                                         {/if}
 
 							{elseif $header eq 'Activities'}
 							{if $MODULE eq 'PurchaseOrder' || $MODULE eq 'Invoice' || $MODULE eq 'SalesOrder' || $MODULE eq 'Quotes'}	
 							<input type="hidden" name="activity_mode">
-							<input title="New Task" accessyKey="F" class="small" onclick="this.form.action.value='EditView'; this.form.return_action.value='CallRelatedList'; this.form.module.value='Activities'; this.form.return_module.value='{$MODULE}'; this.form.activity_mode.value='Task'" type="submit" name="button" value="Add new Task"></td>
+							<input title="{$APP.LBL_ADD_NEW} {$APP.Task}" accessyKey="F" class="small" onclick="this.form.action.value='EditView'; this.form.return_action.value='CallRelatedList'; this.form.module.value='Activities'; this.form.return_module.value='{$MODULE}'; this.form.activity_mode.value='Task'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Task}"></td>
 							{else}
 							<input type="hidden" name="activity_mode">
-							<input title="New Task" accessyKey="F" class="small" onclick="this.form.action.value='EditView'; this.form.return_action.value='CallRelatedList'; this.form.module.value='Activities'; this.form.return_module.value='{$MODULE}'; this.form.activity_mode.value='Task'" type="submit" name="button" value="Add new Task">&nbsp;
-							<input title="New Event" accessyKey="F" class="small" onclick="this.form.action.value='EditView'; this.form.return_action.value='CallRelatedList'; this.form.module.value='Activities'; this.form.return_module.value='{$MODULE}'; this.form.activity_mode.value='Events'" type="submit" name="button" value="Add new Event"></td>
+							<input title="{$APP.LBL_ADD_NEW} {$APP.Task}" accessyKey="F" class="small" onclick="this.form.action.value='EditView'; this.form.return_action.value='CallRelatedList'; this.form.module.value='Activities'; this.form.return_module.value='{$MODULE}'; this.form.activity_mode.value='Task'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Task}">&nbsp;
+							<input title="{$APP.LBL_ADD_NEW} {$APP.Event}" accessyKey="F" class="small" onclick="this.form.action.value='EditView'; this.form.return_action.value='CallRelatedList'; this.form.module.value='Activities'; this.form.return_module.value='{$MODULE}'; this.form.activity_mode.value='Events'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Event}"></td>
 							{/if}
 							{elseif $header eq 'HelpDesk'}
-							<input title="New Ticket" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='HelpDesk'" type="submit" name="button" value="Add new Ticket"></td>
+							<input title="{$APP.LBL_ADD_NEW} {$APP.Ticket}" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='HelpDesk'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Ticket}"></td>
 							{elseif $header eq 'Attachments'}
-							<input title="New Notes" accessyKey="F" class="small" onclick="this.form.action.value='EditView'; this.form.return_action.value='CallRelatedList'; this.form.module.value='Notes'" type="submit" name="button" value="Add new Note">&nbsp;
+							<input title="{$APP.LBL_ADD_NEW} {$APP.Note}" accessyKey="F" class="small" onclick="this.form.action.value='EditView'; this.form.return_action.value='CallRelatedList'; this.form.module.value='Notes'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Note}">&nbsp;
 							<input type="hidden" name="fileid">
-							<input title="New Attachment" accessyKey="F" class="small" onclick="OpenWindow('index.php?module=uploads&action=uploadsAjax&file=upload&return_action=CallRelatedList&return_module={$MODULE}&return_id={$id}');" type="button" name="button" value="Add new Attachment"></td>
+							<input title="{$APP.LBL_ADD_NEW} {$APP.LBL_ATTACHMENT}" accessyKey="F" class="small" onclick="OpenWindow('index.php?module=uploads&action=uploadsAjax&file=upload&return_action=CallRelatedList&return_module={$MODULE}&return_id={$id}');" type="button" name="button" value="{$APP.LBL_ADD_NEW} {$APP.LBL_ATTACHMENT}"></td>
 							{elseif $header eq 'Quotes'}
-							<input title="New Quote" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='Quotes'" type="submit" name="button" value="Add new Quote"></td>
+							<input title="{$APP.LBL_ADD_NEW} {$APP.Quote}" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='Quotes'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Quote}"></td>
 							
 							{elseif $header eq 'Invoice'}
 							{if $MODULE eq 'SalesOrder'}
 							<input type="hidden">
 							{else}
-							<input title="New Invoice" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='Invoice'" type="submit" name="button" value="Add new Invoice"></td>
+							<input title="{$APP.LBL_ADD_NEW} {$APP.Invoice}" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='Invoice'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Invoice}"></td>
 							{/if}
 
 							{elseif $header eq 'Sales Order'}
 							{if $MODULE eq 'Quotes'}
 							<input type="hidden">
 							{else}
-							<input title="New SalesOrder" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='SalesOrder'" type="submit" name="button" value="Add new Sales Order"></td>
+							<input title="{$APP.LBL_ADD_NEW} {$APP.SalesOrder}" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='SalesOrder'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.SalesOrder}"></td>
 							{/if}
 
 							{elseif $header eq 'Purchase Order'}
-							<input title="New Purchase Order" accessyKey="O" class="small" onclick="this.form.action.value='EditView'; this.form.module.value='PurchaseOrder'; this.form.return_module.value='{$MODULE}'; this.form.return_action.value='CallRelatedList'" type="submit" name="button" value="Add new Purchase Order"></td>
+							<input title="{$APP.LBL_ADD_NEW} {$APP.PurchaseOrder}" accessyKey="O" class="small" onclick="this.form.action.value='EditView'; this.form.module.value='PurchaseOrder'; this.form.return_module.value='{$MODULE}'; this.form.return_action.value='CallRelatedList'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.PurchaseOrder}"></td>
 							
 							{elseif $header eq 'Emails'}
 							<input type="hidden" name="email_directing_module">
 							<input type="hidden" name="record">
-							<input title="New Email" accessyKey="F" class="small" onclick="fnvshobj(this,'sendmail_cont');sendmail('{$MODULE}',{$id});" type="button" name="button" value="Add new Email"></td>
+							<input title="{$APP.LBL_ADD_NEW} {$APP.Email}" accessyKey="F" class="small" onclick="fnvshobj(this,'sendmail_cont');sendmail('{$MODULE}',{$id});" type="button" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Email}"></td>
 							{elseif $header eq 'Users'}
                                                                 {if $MODULE eq 'Activities'}
-                                                                <input title="Change" accessKey="" tabindex="2" type="button" class="small" value="Select User" name="button" LANGUAGE=javascript onclick='return window.open("index.php?module=Users&return_module=Activities&return_action=CallRelatedList&activity_mode=Events&action=Popup&popuptype=detailview&form=EditView&form_submit=true&return_id={$id}&recordid={$ID}","test","width=640,height=525,resizable=0,scrollbars=0")';>
+                                                                <input title="Change" accessKey="" tabindex="2" type="button" class="small" value="{$APP.LBL_SELECT_USER_BUTTON_LABEL}" name="button" LANGUAGE=javascript onclick='return window.open("index.php?module=Users&return_module=Activities&return_action=CallRelatedList&activity_mode=Events&action=Popup&popuptype=detailview&form=EditView&form_submit=true&return_id={$id}&recordid={$ID}","test","width=640,height=525,resizable=0,scrollbars=0")';>
 								{elseif $MODULE	eq 'Emails'}
-								<input title="Bulk Mail" accessykey="F" class="small" onclick="this.form.action.value='sendmail';this.form.return_action.value='DetailView';this.form.module.value='Emails';this.form.return_module.value='Emails';" name="button" value="Bulk Mails" type="submit">&nbsp;
-								<input title="Change" accesskey="" tabindex="2" class="small" value="Select User" name="Button" language="javascript" onclick='return window.open("index.php?module=Users&return_module=Emails&action=Popup&popuptype=detailview&form=EditView&form_submit=true&return_id={$id}&recordid={$ID}","test","width=640,height=520,resizable=0,scrollbars=0");' type="button">&nbsp;</td>
+								<input title="{$APP.LBL_BULK_MAILS}" accessykey="F" class="small" onclick="this.form.action.value='sendmail';this.form.return_action.value='DetailView';this.form.module.value='Emails';this.form.return_module.value='Emails';" name="button" value="{$APP.LBL_BULK_MAILS}" type="submit">&nbsp;
+								<input title="Change" accesskey="" tabindex="2" class="small" value="{$APP.LBL_SELECT_USER_BUTTON_LABEL}" name="Button" language="javascript" onclick='return window.open("index.php?module=Users&return_module=Emails&action=Popup&popuptype=detailview&form=EditView&form_submit=true&return_id={$id}&recordid={$ID}","test","width=640,height=520,resizable=0,scrollbars=0");' type="button">&nbsp;</td>
                                                                 {/if}
 							{elseif $header eq 'Activity History'}
                                                         &nbsp;</td>
@@ -178,7 +178,7 @@
 							<table style="background-color:#eaeaea;color:eeeeee" border="0" cellpadding="3" cellspacing="1" width="100%" class="small">
 							<tbody>
 								<tr style="height: 25px;" bgcolor="white">
-									<td><i>None included</i></td>
+									<td><i>{$APP.LBL_NONE_INCLUDED}</i></td>
 								</tr>
 							</tbody>
 						




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 04:07:16 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 08:07:16 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6918 -
	/vtigercrm/trunk/include/language/en_us.lang.php
Message-ID: <20060607080716.D35C17E8590@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 02:07:11 2006
New Revision: 6918

Log:
Lang file updated

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

Modified: vtigercrm/trunk/include/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/include/language/en_us.lang.php (original)
+++ vtigercrm/trunk/include/language/en_us.lang.php Wed Jun  7 02:07:11 2006
@@ -287,7 +287,6 @@
 'LNK_NEW_PRICEBOOK'=>'New PriceBook',
 
 
-
 'NTC_REQUIRED'=>'Indicates required field',
 
 'LBL_REQUIRED_SYMBOL'=>'*',
@@ -422,6 +421,8 @@
 //added by raju
 
 'LBL_ADD_ITEM'=>'Add',
+
+'LBL_ADD_NEW'=>'Add new',
 
 //Added for version 5
 
@@ -460,9 +461,13 @@
 
 'LBL_OPEN_ACTIVITIES'=>'Open Activities',
 
-'LBL_HISTORY'=>'Activity History',
+'LBL_HISTORY'=>'History',
+
+'LBL_ACTIVITY_HISTORY'=>'Activity History',
 
 'LBL_ATTACHMENTS'=>'Attachments',
+
+'LBL_ATTACHMENT'=>'Attachment',
 
 'LBL_TYPE'=>'Type',
 
@@ -713,8 +718,8 @@
 'Events'=>'Events',
 'Quotes'=>'Quotes',
 'PriceBook'=>'Price Books',
-'PurchaseOrder'=>'Purchase Orders',
-'SalesOrder'=> 'Sales Orders',
+'PurchaseOrder'=>'Purchase Order',
+'SalesOrder'=> 'Sales Order',
 'Invoice'=>'Invoice',
 'Calendar'=>'Calendar',
 'Home'=>'Home',
@@ -757,6 +762,7 @@
 'Email'=>'Email',
 'Activity'=>'Activity',
 'Event'=>'Event',
+'Task'=>'Task',
 'Quote'=>'Quote',
 'PriceBook'=>'PriceBook',
 'PurchaseOrder'=>'Purchase Order',
@@ -769,6 +775,8 @@
 'Vendor'=>'Vendor',
 'Webmail'=>'Webmail',
 
+'LBL_NONE_INCLUDED'=>'None Included',
+'LBL_ADD_TO'=>'Add to',
 
 'LBL_SELECT_TEMPLATE_TO_MAIL_MERGE'=>'Select template to Mail Merge:',
 'LBL_TITLE_OR_DESCRIPTION'=>'Title / Description',
@@ -805,8 +813,8 @@
 'Start Date'=>'Start Date',
 'Related to'=>'Related To',
 'Recurring Type'=> 'Recurring Type',
-'SalesOrder'=> 'Sales Orders',
-'PurchaseOrder'=> 'Purchase Orders',
+'SalesOrder'=> 'Sales Order',
+'PurchaseOrder'=> 'Purchase Order',
 'LBL_QUOTE_NAME'=>'Quote Name',
  //Added Orders in activity parent type selection / Related list
 'LBL_NEW_QUOTE_BUTTON_TITLE'=>'New Quote [Alt+Q]',




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 04:55:45 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 08:55:45 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6919 -
	/vtigercrm/branches/4.2.4/README.txt
Message-ID: <20060607085546.198307E8593@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 02:55:41 2006
New Revision: 6919

Log:
changes made for 4.2.4 release

Modified:
    vtigercrm/branches/4.2.4/README.txt

Modified: vtigercrm/branches/4.2.4/README.txt
==============================================================================
--- vtigercrm/branches/4.2.4/README.txt (original)
+++ vtigercrm/branches/4.2.4/README.txt Wed Jun  7 02:55:41 2006
@@ -1,35 +1,1432 @@
-vtigerCRM Readme
+####################################################
+vtiger CRM 4.2.4
+June 06, 2005
+####################################################
+
+After much delay vtigercrm 4.2.4 has been released.
+
+This is the first community driven release, so a big thanks goes out to all the people involved in making this happen.
+
+This is mostly a bug fix release, but it does mark the first release using the new SVN/Trac system which helps us harness the power of the community contributions and track issues and their fixes so everyone can help out.  The Trac system can be seen here: http://vtiger.fosslabs.com
+
+A list of fixed bugs can be seen using the trac ticket system here:
+http://vtiger.fosslabs.com/cgi-bin/trac.cgi/query?status=closed&milestone=4.2.4&order=priority
+
+A full changelog can be seen trough the trac svn log here:
+http://vtiger.fosslabs.com/cgi-bin/trac.cgi/log/vtigercrm/tags/vtigercrm-4.2.4?action=stop_on_copy&rev=6885&stop_rev=&mode=follow_copy&verbose=on
+
+vtigercrm 4.2.4 can be downloaded here:
+<download links>
+
+INSTALLATION PROCEDURE:
+
+For a new installation simply extract the files into a directory accessible through your apache setup then point your web browser to that directory on your website and follow the installation instructions.  Software you'll require is apache (1.3.x or 2.x) with php (4.3+, no 5.x support yet) and mysql (4.x).
+
+You can post any issues or suggestions at http://vtiger.fosslabs.com/cgi-bin/trac.cgi/newticket 
+
+
+UPGRADING:
+
+If you are upgrading from a previous version of vtigercrm first backup all data then follow the instructions for the appropriate version below:
+
+4.2.3:
+	- No database changes are need if you are using a successfull installation.
+		- If tables were only partially created for you using an earlier version please wipe your database and try with 4.2.4, your problems should be solved.
+	- To save your current configuration copy the config.php file from your old installation to config.inc.php in the new installation.  You'll also have to edit the config file as follows:
+		- change the following variable names in config.php
+
+		from:
+			$dbconfig['db_host_name'] =
+			$dbconfig['db_user_name'] =
+
+		to:
+			$dbconfig['db_hostname'] =
+			$dbconfig['db_username'] =
+
+	- If your 4.2.3 installation has previously been upgraded from an earlier release there is one database modification missed in pervious upgrades you will want to make manually:
+		alter table wordtemplates drop primary key;
+		alter table wordtemplates change filename filename varchar(100) not null;
+		alter table wordtemplates add column templateid integer(19) primary key;
+
+
+4.2.2 (aka 4.2 patch2):
+	- Apply the 4.2.3 patch as per: http://forums.vtiger.com/viewtopic.php?t=4166
+	- Then follow the instructions for a 4.2.3 upgrade.
+
+
+4.2.1 or 4.2:
+	- Apply the 4.2.2 patch as per: http://forums.vtiger.com/viewtopic.php?t=2903
+	- Then follow the instructions for a 4.2.2 upgrade.
+
+####################################################
+vtiger CRM 4.2.3
+Dec 23, 2005
+####################################################
+We are pleased to announce the vtigerCRM 4.2.3 release. This release is a consolidated with earlier patches (1 & 2 - refer below section for the list of fixes) and Multiple vulnerablity fixes. 
+
+Note: First Time vtiger CRM users can directly install the source in their
+vtiger suported version of LAMP / WAMP. 
+
+**************************************************************************************************************
+*   IMPORTANT NOTICE                                                                                         *
+**************************************************************************************************************
+* The vtigerCRM 4.2.3 is ONLY for the first time vtiger users and not for                                    *
+* the existing users. The existing v4.2 users are recomended to upgrade their system by applying v4.2 patch  *
+* 2 and vulnerability fixes patch. You can download the patches from the                                     *
+* following urls.                                                                                            *
+* http://forums.vtiger.com/viewtopic.php?t=2903								     *
+* http://forums.vtiger.com/viewtopic.php?t=4166                                                              *
+**************************************************************************************************************
+
+Software requirements : PHP 4.3.x, MySQL 4.0.x (4.0.20 prefered), Apache 1.3.x
+or 2.0.x 
+
+For more details refer to http://www.vtiger.com/wiki/index.php/Vtiger_CRM_4.2.3_-_Installation_Guide
+
+
+***********************
+I. Vulnerability fixes
+***********************
+
+Posted by D.Fabian / SEC-CONSULT/ ww.sec-consult.com
+
+a) Multiple SQL Injection Vulnerabilities
+b) Cross Site Scripting
+c) Path Traversal/File Disclosure
+d) Arbitrary File Upload
+e) Remote Code Execution
+
+Posted by Christopher Kunz / www.hardened-php.net
+
+a) Arbitrary File Upload
+b) Authentication ByPass
+c) Unsafe File Inclusion
+d) Arbitrary code execution
+
+
+####################################################
+vtiger CRM 4.2 Patch 2
+Sep 15, 2005
+####################################################
+
+We are pleased to announce the consolidated patch for vtiger CRM 4.2. This release includes many code contributions from vtiger community and bug fixes!
+
+******************************************
+I. Code Contributions by vtiger Community
+******************************************
+
+Thanks to Bela, Fredy, JLee, MikeCrowe, and Sholmi for their valuable contributions to the vtiger CRM development. 
+
+Following contributions were made at vtiger Discussions under "vtiger CRM - Code Contributions" forum:
+
+1. T2025  - 2 bugs - JLee (Same as P8180 in vtiger Discussions " Little typo in function get_lead_feild_options")
+
+2. T2324  - Modification to the Aqua theme - Bela (Note: We have included the fix for all the themes except blue theme)  
+
+3. T2406  - Description spanned over all columns - Fredy
+
+4. T2431  - Search by TicketId field in HelpDesk - Fredy
+
+5. T2524  - Scrollable related lists - Fredy
+
+6. P9578  - Import/Export Products - JLee
+
+7. T2196  - Fix for World Clock Bug - JLee
+
+8. T2139  - Bug in: EditView.html - Shlomi
+ 
+9. T2000  - Add "Assigned To" as a choice when Importing - MikeCrowe
+
+10. T1585 - Improved Calendar - Fredy
+  
+****************
+II. New Features
+****************
+
+1. Import/Export Products
+
+2. Scrollable List View for related Lists
+
+***************
+III. Bug Fixes
+***************
+
+--------------------------
+A. http://bugs.vtiger.com
+--------------------------
+
+-------------------------------------
+S.No ID    Subject
+-------------------------------------
+1.   67  - Inventory Mgmt Related List
+
+2.   70  - Activities - Quick Create
+
+3.   81  - Price Book - Select Product list price
+
+4.   82  - Inventory Mgmt Related List Issue
+
+5.   96  - Alignment is not proper for Total and sub total
+
+6.  108  - Without entering any value in global search if we click on search then the n an empty page is displayed
+
+7.  113  - Security UI not good enough
+
+8.  114  - Better icons for the inv mgmt modules
+
+9.  428 - User Signature Issue
+
+10. 125  - UI for New Product creation not proper
+
+11. 129  - Advanced search requires some fields (SF.Net ID: 
+
+12. 131  - Sorting Name in Leads
+
+13. 143  - Product related list in Activity can be removed
+
+14. 149  - New Ticket Creation - Group empty
+
+15. 160  - Modified time and created time are 0 in Add Business Card
+
+16.  406 - Clock is dislocated after delete a record
+
+17.  407 - HelpDesk quick create- title not saved
+
+18.  408 - Activities CustomView contact not displayed
+
+19. 409 - After mass delete FAQ control goes to HelpDesk
+
+20. 410 - Footer alignment changed
+
+21. 411 - New Event Creation
+
+22. 405 - FAQ quick create
+
+23. 412 - Security - Activity delete
+
+24. 413 - Security - Default Organization for Activities
+
+25. 414 - Field positioning Sales/Support Start dates
+
+26. 415 - Inventory Related List
+
+27. 416 - Inventory RL
+
+28. 417 - Inventory RL - Activity History missing
+
+29. 418 - Ticket - Create
+
+30. 419 - Email - Edit View
+
+31. 420 - Availability of user
+
+32. 421 - Adding Products to Price book Validations
+
+33. 422 - New Activity Creation - Group empty
+
+34. 424 - History in Potential, PO, SO and Invoice
+
+35. 425 - After delete tickets it displays empty list
+
+36. 426 - Invoice Display in Home Page
+
+37.  86 - File Size validation for the product image
+
+38.  78 - Adding pricebook to products
+
+39.  81 - IE 6 Pricebook Validations
+ 
+-----------------------------------
+B. vtiger Discussions - Bug Tracker
+-----------------------------------
+
+-------------------------------------
+S.No ID        Subject
+-------------------------------------
+
+40.  T1707   - Customer Portal language bug
+
+41.  T2080   - Email doesn't work
+
+42.  P8047   - Change Status Not Updating Modify Date
+
+43.  P8004   - BUG modules/HelpDesk/Save.php
+
+44.  P8301   - Additional Info to Helpdesk-Issue
+
+45.  P8449   - Calendar icon missing at HelpDesk
+
+46.  P8306   - Missing values in Cumulative Statistics
+
+47.  T1802   - Still not possible to delete a contact - account relation
+
+48.  T1398   - Issues in Contacts 
+
+49.  T1694   - Email Editor Add Link doesn't work
+
+50.  T1742   - Bug when assigning product from 2nd page to potential
+
+51.  T2025   - 2 bugs
+
+52.  T2313   - New Task Bug
+
+53.  P8170   - Quotes popup trouble
+
+54.  P8098   - Vendor pick list not working in Purchase order
+
+55.  T1862   - Customize Quote Template
+
+56.  P8159   - New Calendar Bug
+
+57.  T2038   - Please fix these Bugs in 4.2
+
+58.  T1696   - Accounts Website url fix
+
+59.  T2003   - Pricebook bug 
+
+60.  P8293   - Double entries in 'Default Organization Sharing Access'
+
+61.  T2512   - Home upcoming activities
+
+62.  P8030   - Meetings not held must not be shown in upcoming activities
+
+
+####################################################
+
+vtiger CRM 4.2 Patch 1
+Aug 10, 2005
+
+####################################################
+
+New Feature:
+
+Reports can be exported in Excel Format.
+
+Bug Fixes:
+
+1. Forum Post ID 6550: Can not add new product
+
+2. SF ID1159916: settings-Company details 
+
+3. SF ID1160084: Task - End Date 
+
+4. SF ID1161317: date accept 0 value 
+
+5. SF ID1161326: Lead Conversion 
+
+6. Forum Topic ID 2038: Please fix these Bugs in 4.2
+
+7. Internal: Make QuickActivityRegister have enddate(duedate)
+
+8. Forum Topic ID 1696: Calendar bug fix for non-admin user
+
+9. Forum Topic ID 1648: Converting a lead 
+
+10. SF ID 1161344: probability is not validate if we give greater value 
+
+11. Forum Topic ID 2223: Editing Company information
+
+12. Interna: Calendar in Quick create in events
+
+13. Forum Topic ID 1803: chips impossible to add more activity (task/event)
+
+14. Forum Post ID 6733: Missing required field in New Event shortcut
+
+15. Internal: Lead Conversion form validation
+
+16. Forum Topic ID 2038:Please fix these Bugs in 4.2
+
+17. SF ID 1161223: Export to PDF
+
+18. Forum Topic ID 1693:Bad PDF output
+
+19. Forum Topic ID 2012:Report Customization iNot working in IE
+
+20. Forum Topic ID 1823: Translation Issue 2
+
+21. Forum Topic ID 2038: Please fix these Bugs in 4.2
+
+22. Internal: Invoice Qty & inventory issues in 4.2 GA
+
+23. Forum Topic ID 1717: bug report in new sales order and PDF invoice on
+online demo
+
+24. Internal: Inventory Mgmt
+
+25. Internal: Detail View Ui for Products Relateion in inventory is imporper 
+
+26. Internal: SO - Popup Account - table issue 
+
+27. Internal: Notes - Cancel/ back 
+
+28. Internal: No of Employees Field not validated 
+
+29. Internal: Filling with Todays date 
+
+30. Internal: Security - Default Organization for Activities 
+
+31. Internal: Security - Activity delete 
+
+32. Internal: Inventory Mgmt Logging 
+
+33. Internal: URL and URL name 
+
+34. Internal: Feild level access for task
+
+35. Forum Topic ID 1823: Custom Date field not working?
+
+36. Internal: Support for Text Area Custom Field
+
+37. Forum Topic ID 1643: Any user can change onw role for admin role? 
+
+38. Internal: Class not set in inventory product UI
+
+39. Forum Topic ID 2258: Nasty security bug in latest 4.2!
+
+40. Code Contribution: Indexing code by Microwe integrated
+
+41. Internal: Title doesn't show up
+
+42. Forum Topic ID 1997: Fixing bugs.
+
+43. Forum Topic ID 822:Translation-Issue
+
+44. Forum Topic ID 1768: Contact address pulled from Acccount
+
+45. Forum Topic ID 1753: VtigerCRM 4.0 Character causing troubles
+
+46. 1161351: Inventory Mgmt Related List 
+
+47. 1161347: Inventory Related List 
+
+48. 1161415:Contacts - Related Lists - Deleting Products
+
+49. 1161406: Assigned ToUser in Leads can be Assigned to User
+
+50. Forum Topic ID 2092: Product Popup in New Quotes
+
+51. Forum Topic ID 1980: Account Pop Http 404 when pickup a account in New
+Sales Order
+
+52. Forum Topic ID 2003: Pricebook bug
+
+53. 1161337: Price Book Product Select
+
+54. Forum Topic ID 2088: Address Information Won't Export
+
+55. Forum Topic ID 1582: Importing Checkbox Values when importing leads
+
+56. 1161356:Email - quick create date and time sent date not validated
+
+57. 1160290: Potentials incorrectly pulls up deleted notes in related
+
+58. Internal: Form Validation for Add Business Card
+
+59. Internal: Single, double quotes problem in ticket comments and FAQ
+comments
+
+60. Forum Topic ID 1612: Misbehaviour on validation of number fields
+
+
+#######################
+
+vtiger CRM 4.2 GA
+July 18, 2005
+
+#######################
+
+We are pleased to announce the latest version of vtiger CRM. This release includes many new features and few bug fixes!
+
+*****************
+A. New Features
+*****************
+
+  * Activity Management
+
+  * Manage recurring events (daily/weekly/monthly/yearly)
+
+  * Group/Shared calendar to plan meetings with vtiger CRM users without time conflicts
+
+  * UI enhancements related to overdue tasks in Activities list view 
+
+2. Lead Management
+
+ * Capture leads directly from your Web site to vtiger CRM
+
+ * Customize Online Lead Form as per your Web site requirements
+
+ * Create mailing lists and execute E-mail marketing campaigns
+
+ * Add multiple products to the leads
+
+ * Customize list of the leads as per users' requirements
+
+ * Create fully customizable lead reports
+
+ * Lead conversion mapping for all the custom fields
+
+3. Account & Contact Management
+
+ * Generate quotes, sales orders, and invoices directly from the accounts and contacts 
+
+ * Track history of all the products purchased by customers
+
+4. Products Management
+
+ * Create Price Books and associate products with Price Books
+
+ * Procure products from the selected Vendors list
+
+ * Associate Trouble Tickets and Knowledge Base articles with products
+
+ * Ability to upload product images for easy identification
+
+5. Sales Quotes
+
+ * Track outstanding quotes from the quotes list view
+
+ * Add Line Items to the quotes and update sub-total, taxes, adjustments, and grand total amounts
+
+ * Select different prices for the same product as per customer segment
+
+ * Create printer-friendly Sales Quotes and deliver to the prospect customers through in-built E-mail service
+
+ * Create Sales Order or Invoice with a single click from the Sales Quote
+
+ * Avoid duplicate work by dynamically displaying the Billing and Shipping addresses of the prospect
+
+ * Display quotes related to accounts under the related list
+
+ * Customize Sales Quote fields as per your organization requirements
+
+ * Set up your company information to display your company address while creating PDF documents
+
+6. Order Management
+
+ * Streamline organization-wide procurement and fulfillment processes by integrated Order Management with CRM
+
+ * Track outstanding orders from the Orders List View
+
+ *  Procure products from the available Vendors/Manufacturers/Resellers list in vtiger CRM
+
+ * Manage up-to-date stock position by seamless integration between order fulfillment and available stock in your warehouse
+
+ * Customize Purchase Order (PO) and Sales Order (SO) fields as per your organization requirements
+
+ * Avoid duplicate work by dynamically displaying the Billing and Shipping addresses of the prospect while creating orders
+
+ * Add Line Items to the Orders and update sub-total, taxes, adjustments, and grand total amounts automatically
+
+ * Create printer-friendly Order (PO/SO) and deliver to the Vendors/Customers through in-built E-mail service
+
+ * Once the Sales Order is confirmed create Invoice from Sales Order with a single click
+
+ * Periodically notify the stock position to the concerned parties in your organization so that stock is always available to fulfill the outstanding orders
+
+7. Invoices
+
+ * Track outstanding invoices from the Invoices list view
+
+ * Create printer-friendly Invoices and deliver to the customers through in-built E-mail service
+
+ * Customize Invoice fields as per your organization requirements
+
+ * Add Line Items to the Invoice and update sub-total, taxes, adjustments, and grand total amounts automatically
+
+ * Customize Invoice fields as per your organization requirements
+
+ * Avoid duplicate work by dynamically displaying the Billing and Shipping addresses of the customer while creating invoices
+
+ * Associate invoices with the General Ledger account for hassle free book keeping 
+
+
+8. Help Desk
+
+ * Manage product-wise Knowledge Base articles/FAQ
+
+ * Associate Articles with trouble tickets and products
+
+ * Provide public access to the Knowledge Base only after approval
+
+ * Update Articles/FAQ in vtiger CRM as based customer suggestions & comments
+
+9. E-mail Integration
+
+ * Configure incoming E-mail servers on per user basis. Each user can retrieve his own E-mails 
+
+ * Fetch E-mail messages through POP and IMAP services
+
+ * Setup multiple incoming E-mail servers 
+
+ * Seamless integration between incoming E-mail messages and the corresponding contacts in vtiger CRM with a single click
+
+ * Fetch incoming E-mail messages as RSS feed in RSS module
+
+ * Send E-mail notification to the users when records are assigned to them or there is a deadline coming up
+
+ * Ready-to use E-mail templates
+
+ * Populate vtiger CRM user related fields in E-mail templates
+
+ * Export E-mail messages into CSV file
+
+ * Fetch inbound E-mails and associate to the contacts or create E-mails directly into vtiger CRM
+
+ * Send mass E-mails to the contacts and other users
+
+10. Other Features
+
+ * Lead conversion feature within module access scope
+
+ * Generate quotes and sales orders, from the potentials
+
+*****************
+B. Bug Fixes
+*****************
+
+1. FORUM:1545 - Quotes, orders - working or not ? 
+
+2. FORUM:1560 - Can not change user password & problem with ordering system
+
+3. FORUM:5512 - In custom fields calendar, when a calendar field in created, the calendar drop down does not appear
+
+4. FORUM:5553 - Contact with apostrophe ' in name cannot own a ticket
+
+5. FORUM:5795 - If you change the name of admin passwords are lost !!!
+
+6. FORUM:5810 - In contacts module Brithdate shown as 0000-00-00
+
+7. FORUM:4501 - Error message while associating user to a group
+
+8. FORUM:4550 - Issue related to custom drop-down list order
+
+9. FORUM:4039- Issue with duplicating a contact
+
+10. FORUM:4073 - Normal user with no access to the settings is anyway able to change the profile of a role.
+
+11. FORUM:1409 - Report Export to PDF
+
+12. FORUM:1818 - Outlook Sync applies makes Calendar appointments 2020
+
+13. FORUM:606 File Missing: testemailtemplateusage.php 
+
+14. FORUM:1294 - Problem with e-mail templates
+
+15. FORUM:1050 - Subject of emails not imported - Need confirmation
+
+16. FORUM:1276 - Converting Leads and assigning to user
+
+17. FORUM:1270 - Bug in e-mail module
+
+18. ORUM:1742 - Bug when assigning product from 2nd page to potential
+
+19. FORUM:1772 - Bug: wrong date format when converting leads
+
+20. FORUM:1559 - Tasks not working in Leads
+
+21. FORUM: 5247 - Account search doesn't work
+
+22. FORUM:5096 - Phone search
+
+23. FORUM:5715 - Currency Support
+
+24. FORUM:5795 - Roles and Passwords
+
+
+25. SF1102842 - CSV import, problem with ?,?,?
+
+26. SF1097215 - Mass Delete in Accounts, Contacts and Opportunities
+
+27. SF1025603 - Phone in Task
+
+28. SF1093989 - picklists - I18N
+
+29. SF1090963 - wrong header caption in activities, history
+
+30. SF1090711 - Duplicate entries in language translation
+
+31. SF1095038 - Import Leads - No Mapping Fields
+
+32. SF1093132 - Lead Import Fails - v3.2
+
+33. SF1094944 - The leads dropdown list does not update
+
+34. SF1090715 - Error on importing contacts from cvs file
+
+35. SF1073179 - Importing .xls files but missing one of the column header
+
+36. SF1073159 - Importing Problem
+
+37. SF1087482 - user not deleted
+
+38. SF1094950 - New E-mail - Error Message
+
+39. SF1090721 - Meeting Contact - Unable to remove
+
+40. SF 1090717 - New Note: Field Name missing
+
+41. SF 1230595 - Custom Calendar in Tickets not working
+
+42. SF 1221170 - Sort Notes 
+
+43. SF 1221036 - Orders 
+
+44. SF 1214401 - Contact birthday translation 
+
+45. SF 1214396 - Task start date and Calendar date scrambled 
+
+46. SF 1218633 - Phone Search not working 
+
+47. SF 1231325 - Error with open tickets link on home page
+
+48. Create users without associating to any of the groups
+
+49. Non-editable user name
+
+50. Mandatory fields checks while configuring currency fields
+
+51. Mandatory fields checks while configuring database backup server
+
+52. The currency symbol which is set in Currency configuration, it is not reflected in dashboard graphs.
+
+53. Field accessibility support not provided for Potential fields
+
+
+*****************
+C. Known Issues
+*****************
+
+1. FORUM:1816 - Outlook Plugin error in Outlook
+
+2. FORUM:1818 - Outlook Sync applies makes Calendar appointments 2020
+
+3. FORUM:1293 - Leads have disappeared - We turned off Leads for all users in the Sales profile. Now we have turned them back on in Settings and they still don't appear. When have restarted the server to completely restart all services just in case but that didn't fix it. Any ideas?
+
+4. FORUM:1752 - Bug: Decimals lost in custom currency fields in products
+
+5. FORUM:1831- Import Error CSV Leads (File size more than 2MB cannot be imported)
+
+6. PDF report overlaps if the number of columns are more than the paper size and last few columns are hidden
+
+7. While creating a new event from Ticket related list, ticket name is not displayed under Activity page
+
+8. In Products related Price Book if edit link will point to Price Book edit view instead of Edit product list price
+
+9. If an event is assigned to Group then in the users list the group members name is displayed
+
+10. If an event is assigned to a team, if the team name is empty then also the event is being saved
+
+11. In Lead Conversion, the type of custom field is not taken into consideration
+
+12. If any of the events associated with recurring event is closed, all the related recurring events are also closed 
+
+13. In Reports, The Date fields in "Filter Options" will not be retained after clicking the 'Apply Filter' button
+
+14. When a New Sales Order, Purchase Order, Invoice and Quotes are created from a Product Detail View, Account Name and Potential Name will not be populated.
+
+15. In a Product Detail View if 'Add to Price Book' hyperlink is clicked and if no Price Book is present in the list, and if 'Add to Product' is selected, vtiger Home page will be displayed. 
+
+16. While generating reports the fields selected in 'Columns to Total' will not be displayed.
+
+***************
+D. Limitations
+***************
+
+1. Security is not implemented for Reports and Dashboards.
+
+2. GIF images are not supported while generating PDF documents such as Quotes,Orders and Invoice.
+
+
+NOTE: For more details about vtiger CRM 4.2 Release Notes, Please refer to the following URL:
+
+http://www.vtiger.com/wiki/index.php/Vtiger_CRM_4_2_Release_Notes
+ 
+#######################
+
+vtiger CRM 4.2 Alpha
+May 31, 2005
+
+#######################
+
+We are pleased to announce the latest version of vtiger CRM. This release includes many new features and few bug fixes!
+
+******************************************************************************************
+Note: vtiger CRM 4.2 Alpha is only for testing and can not be used for production purpose.
+
+Please post Bugs at the following URL:
+
+vtiger Discussions: http://www.vtiger.com/discussions/viewforum.php?f=12
+
+******************************************************************************************
+
+New Features
+
+1. Quotes module
+2. Order Management module (Purchase Orders & Sales Orders)
+3. Invoices module
+4. Price Books 
+5. Vendor/Suppliers Management
+6. Customizable Reports
+7. Customizable List Views
+8. Customer Self-service Portal
+9. RSS module
+10. Event Reminders
+11. Configurable Email Notifications
+12. Incoming Email Support
+
+--------------------
+vtiger CRM 4.0.1
+April 29, 2005
+
+We are pleased to announce the latest version of vtiger CRM. This release
+includes some of the new features and numerous bug fixes!
+
+-------------
+New Features
+-------------
+
+1) Default Organisation Fields - Fields that are not needed can be made hidden across the organisation. 
+2) Multiple Date format support.
+3) Currency Support.
+4) Customer Portal Beta Release - as an add on.
+
+----------
+Bug Fixes
+----------
+
+1) When time like '1:00' is given as input in new event, instead of '01:00',
+an expection will be thrown in the calendar
+2) Php warning fixes - contributed by joduba.
+3) 'Sales Stage' column empty in Potentials table for Contacts and Accounts
+Detail view.
+4) Calendar icons not working in homepage in my pipline chart.
+5) Delete confirmation for notes and attachments in all modules Related list.
+6) Select Contact from Popup after navigation throws exception.
+7) Duplicate entry in Notes listview, when created from Ticket Module.
+8 Added 'Contact' in HelpDesk List View.
+9) Issue in Description Update across modules when saved during edition.
+10) Problem in Notes Update, when no attachment is given.
+11) When a Custom field contains space, export query fails.
+12) Intialising 'log_sql' variable in config.php - php warning fix
+13) Show tickets in Detailview / Related listof contacts.
+14) In Help Desk search 'Status' & 'Priority' given as combo.
+15) Note Title should not be unique.
+16) Problem in importing more than 1000 records.
+17) In Email template big text is not supported
+18 Paragraph support in email template
+19) Amount size entry should be increased in Potentials (increase the digits)
+20) Duplicate Email template entry when editing a template.
+21) Notes and Attachment title/description display in related list
+22) When selected a username in the popup window after search from
+Activity/Email Detail View an exception is thrown.
+23) After email export, the body field in document is empty.
+24) Problem in HelpDesk Search based on Created Date.
+25) When assigned, Contact Salutation type in email template, and used in
+select email template, salutation type is empty.
+26) Sorted by 'Contact' in Ticket List View.
+27) Title field not validated when creating a new ticket
+28) My Account' link in login page throws exception
+29) Usename/creator will shown in all events in Calendar
+30) In Account Advance Search 'State' field empty after giving a value to
+search.
+31) In Home Page my groups all the group entities are displayed
+32) In Home Page My Activities, the Activity Link is not working.
+33) The Group Name link is the User Detail View not working.
+34) Email fiele length in accounts table modified from 30 to 100
+35) Check Box custom field Search not working
+36) Product search fields are interchaged between Basic and Advanced.
+commision rate & Qty/Unit -- Moved from Basic to Advanced. Manufacturer &
+category -- Moved from Advanced to Basic
+37) Improper Link issue in Popup after search.
+38) In Home Page My Tickets - Related to Contacts link are not working.
+39) Unwanted includes in Calendar Removed
+40) Sorting of Potentials in Home Page(Amount in Descending order)
+41) Login History - improper login/logout time
+42) Email Form Validation
+43) Pipleline total not getting updated.
+44) In Email List View displaying of Contact Issue.
+45) Enabling Status for Call and Meetings.
+46) Removing Notes, Products from Default Organisation Sharing.
+47) Populating modified time during entity creation.
+48) Edit and Duplicate of Attachments not working.
+49) Displaying of Closed Ticket in Home Page.
+50) Deleted entities are getting listed in Tracker.
+51) Enabling History tabs in Leads, Contacts, Accounts and Potentials for
+Activity History.
+
+
+--------------------
+vtiger CRM 4
+March 29, 2005
+
+We are pleased to announce the latest version of vtiger CRM. This release includes several new features and numerous bug fixes!
+
+-------------
+New Features
+-------------
+
+A. General
+
+1. Database layer is redesigned for a better data integrity
+
+2. Multiple database support for MySQL, Oracle, MSSQL, and Postgres through ADOdb (We have tested in MySQL and Oracle only)   
+3. Microsoft Office Plug-in to create mail merge templates in Microsoft Word and create on-the-fly documents with customer specific data in vtiger CRM
+
+4. Mozilla Thunderbird Plug-in to add E-mail messages and addresses from Thunderbird to vtiger CRM
+
+5. E-mail notifications to vtiger CRM users as well as customers instantly as well as periodically
+
+6. Search enabled for all the fields (including custom fields) in various modules
+
+7. Database migration from version 3.2 to version 4
+
+8. Accessories, such as World Clock and Calculator
+
+B. Lead Management
+
+1. Filter leads list in Leads home page based on lead status
+
+2. Change leads owner in bulk
+
+3. Export Leads into Spreadsheet programs
+
+C. Account Management
+
+1. Filter accounts list in Accounts home page based on type of the account
+
+2. Delete accounts in bulk
+
+3. Change accounts owner in bulk
+
+D. Contact Management
+
+1. Delete contacts in bulk
+
+2. Change contacts owner in bulk
+
+3. Create mail merge documents for contacts   
+
+E. Opportunity Management
+
+1. Notification of Big deals to the specific users/non users
+
+2. Filter opportunities list in Opportunities home page based on the sales stage
+
+3. Delete opportunities in bulk
+
+F. Help desk
+
+1. Automatically generate ticket ID while creating trouble tickets
+
+2. Filter trouble tickets list in Help desk home page based on the priority of the ticket
+
+3. Add/Modify custom fields in Help desk
+
+G. Products
+
+1. Enhanced the standard fields based on users feedback
+
+2. Add/Modify custom fields in Products
+
+H. Activity Management
+
+1. All the activities (Tasks, Calls, and Meetings) can be managed in a Activities module 
+
+2. Calendar user interface is enhanced, with a small calendar in Home page
+
+3. Synchronize calendar records with Microsoft Outlook  
+
+I. Studio:
+
+1. Add custom fields in Helpdesk and Products modules
+
+2. Modify the custom pick list values in all the modules
+
+3. Custom objects for URL and boolean types
+
+4. Enhanced user interface for product customization 
+	
+J. Communication Templates:
+
+1. Mail Merge Templates to create on-the-fly Microsoft Word documents based on customer data
+
+2. Canned E-mail Notifications through Linux Cron Job/Window Scheduler:
+
+K. Security Management
+
+1. Manage Profiles and associate to the roles
+
+2. Module level access control list for profiles
+
+3. Field level access control list for profiles
+
+4. Organization level record sharing model
+
+5. User management from Settings module
+
+L. System Administration
+
+1. Outgoing Email server configuration
+
+2. Database backup server configuration
+
+We have also provided the following features requested in Sourceforge.net and vtiger Discussions:
+
+SourceForge
+
+1. 1157343: Custom fields for tickets
+
+2. 1108850:  Mozilla Thunderbird (Non-MS Outlook) Plugin
+
+3. 1069886: PostgreSQL Support
+
+4. 1050500: HelpDesk or Trouble ticketing
+
+
+vtiger Discussions
+
+1. RC1 - Leads : Sorting Lead List - by eberled
+
+2. Database management (database backup) - by eberled and ITPM
+
+3. Enable/Disable Import/Export features according to the user's profile - by bwoo and fredy
+
+4. Small Calendar in Home page
+
+5. Department instead of Account in Contact list - by joduba
+
+6. Delete contacts in bulk - by david and Bez
+
+7. Delete users - by Jim
+
+8. ACL on data - Stefano
+
+9. Groups and user level security - by Jay McDonald
+
 ----------------
-
-After several months of working on our CRM solution, based on Apache, MySQL
-and other open source components, we came across a SourceForge open source
-project initiated by SugarCRM, having the same vision, and doing something
-very similar to what we were doing. They started out with the same promise
-we did, namely that CRM software is needlessly expensive, and hosted offerings
-only pretend to be affordable. While we were getting ready with our offering,
-the open source project had already launched it; the underlying infrastructure
-of Apache and MySQL was similar to what we were doing, and most importantly,
-the SugarCRM Public License allowed us to create distributions based on this
-code (SPL - a copy of Version 1.1.2 is found here, and the URL is at
-http://www.sugarcrm.com/home/content/view/35/86/) we decided it would be even
-faster to adopt that as our core and add value on top, an example of open
-source based collaboration.
-
-We gratefully acknowledge the contribution made by SugarCRM, and we intend to
-actively participate and lead in bringing this vision of affordable enterprise
-applications, but we make it clear that vtiger is not affiliated with nor is
-endorsed by SugarCRM.
-
-Please feel free to send your valuable comments to contact at vtiger.com so that
-we can have a better CRM product at free of cost. Check out our website at
-http://www.vtiger.com for support forums, detailed product information,
-our future plan and much more.
-
-software requirements
+Important Notes
+----------------
+
+* We have tested vtiger CRM 4 in MySQL and Oracle database software. Though we didn't tested in other database software, we feel it should work.
+
+* Cases Module is phased out (Help desk module take care of all the customer support related features)
+
+* Opportunities module is renamed as Potentials
+
+* Tasks, Calls and, Meetings modules are phased out (Activities module take care of all the tasks and events related features)
+----------
+Bug Fixes
+----------
+
+We have fixed the following issues reported in Sourceforge.net and vtiger Discussions:
+
+SourceForge.net
+----------------
+
+1. 1087474: suggestion
+
+2. 1169597: Tab Order in data entry is inconvenient
+
+3. 1158945: Cancel button behavior 2
+
+4. 1158943: Cancel button behavior
+
+5. 1161346: RC1 - Custom field Date not working
+
+6. 1157577: Account View -- Contact Name
+
+7. 1158932: RC1- Need "Select Product" on Potentials
+
+8. 1158934: RC1 - Need select multiple products on Activities
+
+9. 1158934:  RC1 - Need select multiple products on Activities - Richie Please check it is promised in sf.net
+
+10. 1160628: Deleted tickets are still visible in the account overview
+
+11. 1160522: minor issues in RC 1
+
+12. 1157581: BusinessCard.php
+
+13. 1158473: double $contact_id definition in modules/Calendar/UserCalend
+
+14. 1157587: website character needs to be longer
+
+15. 1157583: redirection limit for url exceeded
+16. 1156560: Single quotation mark not handled when creating new note
+
+17. 1069310: Time out during contact import
+
+18. 1156463: Outlook Plug-in Error: wrong encryption string
+
+19. 1111432: Meetings get duplicated views after editing
+
+20. 1152457: V3.2 Log-In Recognition
+
+21. 1151958: Leads "Change Status" button doesn't work
+
+22. 1151793: Editing lead errors
+
+23. 1145907: exporting xls to leads -
+
+24. 1087484: user deleted problem
+
+25. 1122448: export of opportunities
+
+26. 1122446: upload file size hardwired
+
+27. 1119621: PHP Error when cancelling editing of a ticket
+
+28. 1116923: Custom contacts import fails if no last name specified
+
+29. 1116919: CVS Import bombs when data contain single quote
+
+30. 1032651: New Attachment - Error message
+
+
+vtiger Discussions
+------------------
+ 
+1. Displaying the corresponding lead in Meeting/Call/Task modules
+
+2. Activity - missing confirmation on deleting activities - by fredy
+
+3. RC1 - Potentials "Only my items" not working - by eberled
+
+4. RC1 - Potentials sorting tables returns an error - by eberled
+
+5. RC1 Helpdesk - 'Assigned to' vs. 'Group' - by eberled
+
+6. RC1 - Helpdesk: Changing a ticket doesn't work - by eberled
+
+7. RC1- Homepage / Helpdesk : all tickets are listed - by eberled
+
+8. RC1 - Helpdesk : Account and Contact Name - by eberled
+
+9. RC1- Settings: Communication Templates - by eberled
+
+10. Unable to tab - by 829
+
+11. Email to Contacts and Mass Mail - by Jay
+
+12. blank.gif doesnt display - by timb
+
+13. RC1 - Product commission rate needs decimal field -by dchaffee
+
+14. RC1 - Potentials sorting tables returns an error - by eberled 
+
+15. Bugs in table insert statements during a new installation - by pab63
+
+16. RC1 - Selecting a contact shows only name and no firstname - by eberled
+
+17. Problem installing on subdomain - by cyberox
+
+18. help desk trouble ticket - by 829
+
+19. RC1 - Admin-Page: Empty Link in top right corner - by eberled
+
+20. RC1 - Admin Page: Wrong mail server password shown - by eberled
+
+21. RC1 - Admin : Creating User ( input field tab order) -by eberled 
+ 
+22. Accentuated characters - by bigtime
+
+23. Can't create new leads, contacts, accounts - by Peter - 
+
+24. RC1 - Admin : Show users related to a group not working - by eberled
+
+25. RC1 - Account : Description Information - by eberled
+
+26. RC1- Accounts : Searching for - by eberled
+
+27. RC1 - Leads : Input field tab order - by eberled
+
+28. RC1 - Leads : Input field for postalcode to large - by eberled
+
+29. vtiger DIscussions: RC1 - Accounts : Please show first name under contacts - by eberled
+
+30. RC1 - Contacts: Notes not created using 'Add buisness Card' - by eberled
+
+31. RC1 - Contacts : Advanced search - by eberled
+
+32. RC1 - Potentials: Expected Close Date - by eberled
+
+33. RC1 - Helpdesk : Searching - by eberled
+
+34. RC1 - Helpdesk : Searching II - by eberled
+
+35. RC1 - Accounts Detailview : empty 'Last modified date' - by eberled
+
+36. Problems with Thunderbird plugin - by mike
+
+37. vTiger CRM 4 (RC1) - Save Record Failure -
+
+38. User withread-only access to the contacts. However this user can easily 'mass delete' all contacts.
+  
+39. Unable to install Outlook plugin 4 RC 1 - by Christian
+
+40. RC1 Thunderbird plugin doesn\'t work
+
+41. Calculator bug - by 829
+
+42. Outlook Plugin Issues (outlook 2003) - by adrian
+
+43. vtiger Outlook Plugin 4.0.1 beta Release - by adrian
+
+44. CRM 4 RC1 problem or not? - 
+
+45. Problem installing RC1 - by stelaix
+
+46. Install Errors in step 5 - by pab
+
+47. Some Contact fields not synching - by Tareef
+
+48. vtiger v4 - How do you add a manufacturer? - 
+
+49. Contacts in vtiger Outlook related - Maarten
+
+50. RC1 - Product search to include Category, Manufacturer - by dchaffee
+
+51. RC1 - Products - No way to update product category field - by dchaffee
+
+52. Product commission rate needs decimal field - by dchaffee
+
+53. RC1 - New Notes for Tickets - by nuguid
+
+54. RC1 - Settings: Picklist - by eberled
+
+55. RC1- Settings : Helpdesk Picklist doesn't work - by eberled
+
+56. RC1 - Setting : Picklist values for Sales Stages - by eberled
+
+57. RC1 - Home : My Group Allocation - by eberled
+
+58. RC1 - Page Admin - by eberled
+
+
+
+Known Issues
+
+1. 1111896: Outlook raises a security alert when adding email with vtiger Outlook Plug-in
+
+2. In Windowos OS, System Inoformantion is not displayed
+
+3. While importing leads, accounts, contacts, and potentials the XLS file format can be browsed even though the allowed file format is CSV.
+ 
+----------------------------
+vtiger CRM 4 Beta
+January 10, 2005
+
+We are pleased to announce the latest version of vtiger CRM.
+
+New Features:
+
+1. Help Desk module to handle trouble tickets, Frequently Asked Questions and Support Statistics
+
+2. Products module to add company wide products related information at a centralized location
+
+3. Mail merge Templates
+
+4. Sending Mass E-mails to contacts
+
+5. Delete attachments
+
+6. Add/Sync Email attachments using vtiger Outlook Plug-in from Microsoft(R) Outlook(R) to vtiger CRM
+
+7. Add/Sync tasks using vtiger Outlook Plug-in from Microsoft(R) Outlook(R) to vtiger CRM
+
+8. Creating Groups and assigning users to groups
+
+9. Assigning leads/tickets to groups/individuals
+
+10. New theme 'Blue' has been added
+
+
+Issues Fixed:
+
+We have fixed the following issues reported in Sourceforge.net:
+
+1. 1093648 - Attachment contains extra footer
+
+2. 1097245 - Email Field in Leads - 25 chars
+
+3. 1093120 - User name doesn't appear in meetings
+
+4. 1090718 - Meeting User - Unable to remove
+
+5. 1092763 - Meeting attendee list does not list user's Name
+
+6. 1094922 - New Attachment - Error Message
+
+7. 1089207 - problem in emails
+
+8. 1089136 - need attachment
+
+9. 1037521 - Attachment/Import - Error message
+
+10. 1032707 - Unable to view/Save the Attachments
+
+11. 1019074 - handle mysql data
+
+12. 1028989 - Print Problem
+
+13. 1085617 - Wrong focus after deleting cases/contacts/opportunities
+
+14. 1089627 - Problem with vtiger. 25 Character email limit
+
+15. 1090721 - Meeting Contact - Unable to remove
+
+16. 1090279 - Export Custom Fields - Not working
+
+17. 1098475: Contacts: Field TITLE is too short
+
+18. 1093669 - Delete attachments
+
+19. Support for Latest versions of Apache and MySQL in installation wizard (Both Linux and Windows).
+
+----------------------------
+
+vtiger CRM 3.2.1
+December 21, 2004
+
+We are pleased to announce the latest version of vtiger CRM.
+
+New Features:
+
+1. Basic Calendar support
+2. German and Dutch Languages Support
+
+Issues Fixed:
+
+a) Duration minutes in calls not getting saved when a new call is created is fixed. 
+ 
+b) On deleting any entity, the Leads List View page getting displayed is fixed. 
+ 
+c) Internationalisation support for Custom Fields provided. 
+ 
+d) Internationalistaion support for Pick List Value Customization provided. 
+ 
+e) Quick create form is getting displayed now. 
+ 
+f) Empty Line Space appearing between the heading and List view table in module Lead and MessageBoard is fixed 
+ 
+g) Proper Message display is done when a user with no delete privileges tries to delete the entity.
+
+h) vtiger Outlook Plug-in in server side fixes related to performance improvement.
+
+
+---------------------------
+vtiger CRM 3.2
+December 13, 2004
+
+We are pleased to announce the latest version of vtiger CRM.
+
+New Features:
+
+a) Custom Field Support 
+
+b) Security Support 
+
+c) Migration from 3.0 to 3.2 
+
+----------------------------
+
+vtiger CRM 3
+November 8, 2004
+
+We are pleased to announce the latest version of vtiger CRM.
+
+New features:
+
+a) Support for accessing vtiger CRM server from Microsoft Outlook behind Proxy settings
+
+b) Synchronize customer specific tasks in between Microsft Outlook and vtiger CRM.
+
+c) Integrated Message Boards with vtiger CRM, which can be used to share customer knowledge among CRM service users.
+
 ---------------------
-PHP 4.x, MySQL 4.x, Apache 1.x or 2.x
-
-For more details please refer:
-http://www.vtiger.com/wiki/index.php/Vtiger_CRM_4.2.3_-_Installation_Guide
+
+vtiger CRM 3.0 Beta
+October 7, 2004
+
+We are pleased to announce the latest version of vtiger CRM.
+
+The new features are:
+
+a) Released vtiger Outlook Plug-in, business productivity enhancement utility for Microsoft Outlook users. It is an open source project covered under vtiger Public License 1.0 based on Mozilla Public License 1.1. 
+
+---------------------
+vtiger CRM 2.0
+September 6, 2004
+
+We are pleased to announce the latest version of vtiger CRM.
+
+The new features are:
+
+a) DRAG and DROP of the tabs!!
+This was achieved after working for quite a long time in the labs, not to
+mention many sleepless nights!.
+By using this feature, you can customize the tabs that you want to work with.
+Do let us know what you feel about it.
+
+b) Lead Management
+
+Sales reps can create leads and initiate the CRM cycle.
+We have tried to incorporate all the required features during this short period.
+Do let us know if you would like to see some more features.
+
+c) Import Leads from External Sources
+
+Sales reps can import leads to vtiger CRM from external sources, such as Microsoft Outlook, 
+ACT, GoldMine, and others in *.XLS file format. This feature eliminates the manual
+data entry and enhances the Sales rep's productivity.
+
+d) Attach Files
+
+Sales reps can attach sales-related materials, such as marketing collaterals, presentations,
+price quotes, and others, so that they can instantly access the related documents while 
 dealing with leads/opportunities, accounts, and contacts.
 
+Send your feedback, which is vital for our understanding your needs.
+
+-------------------------------------------------------------------------------------------------------------
+vtiger CRM 1.0
+August 26, 2004
+
+-=Overview=-
+
+After several months of working on our CRM solution, based on Apache, MySQL and other open source components, we came across a SourceForge open source project initiated by SugarCRM, having the same vision, and doing something very similar to what we were doing. They started out with the same premise we did, namely that CRM software is needlessly expensive, and hosted offerings only pretend to be affordable. While we were getting ready with our offering, the open source project had already launched it; the underlying infrastructure of Apache and MySQL was similar to what we were doing, and most importantly, the SugarCRM Public License allowed us to create distributions based on this code (SPL - a copy of Version 1.1.2 is found here, and the URL is at http://www.sugarcrm.com/home/content/view/35/86/) we decided it would be even faster to adopt that as our core and add value on top, an example of open source based collaboration.
+
+We gratefully acknowledge the contribution made by SugarCRM, and we intend to actively participate and lead in bringing this vision of affordable enterprise applications, but we make it clear that vtiger is not affiliated with nor is endorsed by SugarCRM.
+
+The team at vtiger CRM is pleased to announce the v1.0 the first release of vtiger CRM Open Source project.
+
+This first release of vtiger.Sales is best suited for small sales forces.  If
+you're looking to manage the basics of sales deals where every user can see
+all of the data in the system, then vtiger.Sales v1.0 is right for you.  Over the next few months, we will be building out vtiger.Sales to meet the needs of larger, multi-national sales forces that need features like forecasting, data access permissions and internationalization.
+
+Please feel free to send your valuable comments to contact at vtiger.com so that we can have a better CRM product at free of cost. Check out our website at http://www.vtiger.com for support forums, detailed product information, our future plan and much more.  
+
+-=Features=-
+We have incorporated the following features in this release based on SugarCRM. 
+
+Opportunities
+vtiger.Sales provides a complete, yet easy-to-use Opportunities module.  From deal size to each contact?s role, from listing the competitors to tracking the lead source, sales reps can easily manage each sales opportunity to completion.  
+
+Accounts & Contacts
+With the Accounts & Contacts module, you can easily enter and update key account and contact information. Tracking and staying in touch with your customers is simply a click away. 
+
+Activity & Task Management
+Managing your customer interactions is at the heart of a sales automation application. vtiger.Sales provides a simple and clean set of tools for quickly tracking tasks, phone calls, emails and meetings. 
+
+Notes & Attachments
+Easily keep notes on every contact, opportunity or account. 
+
+Home Screen 
+Focus on the right activities with a quick view of your top opportunities, pipeline, today's appointments and task list.
+
+Dashboard 
+A picture is always worth a thousand words.  With the dashboard module, you can graphically view how your opportunities  breakdown by sales stage or industry.
+
+Administration 
+Easily manage all the users in the system, their passwords, user interface themes and more. 
+




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 05:18:10 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 09:18:10 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6920 -
	/vtigercrm/trunk/Smarty/templates/UserProfile.tpl
Message-ID: <20060607091811.1C5197E8599@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 03:18:07 2006
New Revision: 6920

Log:
ajax functionality has been modified

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 Wed Jun  7 03:18:07 2006
@@ -76,18 +76,20 @@
 </table>
 <div id="tempdiv" style="display:block;position:absolute;left:350px;top:200px;"></div>
 <script>
-function ajaxSaveResponse(response)
-{ldelim}
-	hide("status");
-	document.getElementById("tempdiv").innerHTML=response.responseText;
-{rdelim}
-
 function DeleteProfile(profileid)
 {ldelim}
-	show("status");
-	var ajaxObj = new VtigerAjax(ajaxSaveResponse);
-	var urlstring = "module=Users&action=UsersAjax&file=ProfileDeleteStep1&profileid="+profileid;
-	ajaxObj.process("index.php?",urlstring);
+	$("status").style.display="inline";
+        new Ajax.Request(
+                'index.php',
+                {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+                        method: 'post',
+                        postBody:'module=Users&action=UsersAjax&file=ProfileDeleteStep1&profileid='+profileid,
+                        onComplete: function(response) {ldelim}
+                                $("status").style.display="none";
+				$("tempdiv").innerHTML=response.responseText;
+                        {rdelim}
+                {rdelim}
+        );
 {rdelim}
 </script>
 {include file='SettingsSubMenu.tpl'}




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 05:19:02 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 09:19:02 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6921 -
	/vtigercrm/trunk/Smarty/templates/UserListView.tpl
Message-ID: <20060607091902.9A5DF7E8599@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 03:18:59 2006
New Revision: 6921

Log:
ajax functionality has been modified

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 Wed Jun  7 03:18:59 2006
@@ -65,41 +65,52 @@
 <script>
 function getListViewEntries_js(module,url)
 {
-		show("status");
-		var ajaxObj = new VtigerAjax(ajaxSaveResponse);
-		var urlstring ="module=Users&action=UsersAjax&file=ListView&ajax=true&"+url;
-	    ajaxObj.process("index.php?",urlstring);
-
-}
-function ajaxSaveResponse(response)
-{
-	hide("status");
-	document.getElementById("ListViewContents").innerHTML= response.responseText;
+	$("status").style.display="inline";
+        new Ajax.Request(
+		'index.php',
+                {queue: {position: 'end', scope: 'command'},
+                        method: 'post',
+                        postBody: 'module=Users&action=UsersAjax&file=ListView&ajax=true&'+url,
+                        onComplete: function(response) {
+                                $("status").style.display="none";
+				$("ListViewContents").innerHTML= response.responseText;
+                        }
+                }
+        );
 }
 
 function deleteUser(userid)
 {
-	show("status");
-	var ajaxObj = new VtigerAjax(ajaxDeleteResponse);
-	var urlstring = "action=UsersAjax&file=UserDeleteStep1&return_action=ListView&return_module=Users&module=Users&parenttab=Settings&record="+userid;
-	ajaxObj.process("index.php?",urlstring);
-
-}
-
-function ajaxDeleteResponse(response)
-{
-	hide("status");
-	document.getElementById("tempdiv").innerHTML= response.responseText;
+	$("status").style.display="inline";
+        new Ajax.Request(
+                'index.php',
+                {queue: {position: 'end', scope: 'command'},
+                        method: 'post',
+                        postBody: 'action=UsersAjax&file=UserDeleteStep1&return_action=ListView&return_module=Users&module=Users&parenttab=Settings&record='+userid,
+                        onComplete: function(response) {
+                                $("status").style.display="none";
+				$("tempdiv").innerHTML= response.responseText;
+                        }
+                }
+        );
 }
 
 function transferUser(del_userid)
 {
-		show("status");
-		hide("DeleteLay");
-		var ajaxObj = new VtigerAjax(ajaxSaveResponse);
-		var trans_userid=document.getElementById('transfer_user_id').options[document.getElementById('transfer_user_id').options.selectedIndex].value;
-		var urlstring ="module=Users&action=UsersAjax&file=DeleteUser&ajax=true&delete_user_id="+del_userid+"&transfer_user_id="+trans_userid;
-	    	ajaxObj.process("index.php?",urlstring);
+	$("status").style.display="inline";
+	$("DeleteLay").style.display="none";
+	var trans_userid=$('transfer_user_id').options[$('transfer_user_id').options.selectedIndex].value;
+        new Ajax.Request(
+                'index.php',
+                {queue: {position: 'end', scope: 'command'},
+                        method: 'post',
+                        postBody: 'module=Users&action=UsersAjax&file=DeleteUser&ajax=true&delete_user_id='+del_userid+'&transfer_user_id='+trans_userid,
+                        onComplete: function(response) {
+                                $("status").style.display="none";
+                                $("ListViewContents").innerHTML= response.responseText;
+                        }
+                }
+        );
 
 }
 </script>




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 05:21:27 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 09:21:27 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6922 -
	/vtigercrm/trunk/Smarty/templates/UserEditView.tpl
Message-ID: <20060607092127.CFCFB7E8599@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 03:21:24 2006
New Revision: 6922

Log:
ajax functionality has been modified

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

Modified: vtigercrm/trunk/Smarty/templates/UserEditView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/UserEditView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/UserEditView.tpl Wed Jun  7 03:21:24 2006
@@ -31,22 +31,23 @@
 <script language="javascript">
 function check_duplicate()
 {ldelim}
-
-        var ajaxObj = new VtigerAjax(ajaxSaveUserResponse);
-        var user_name = document.getElementById('user_name').value;
-
-        var urlstring ="module=Users&action=UsersAjax&file=Save&ajax=true&dup_check=true&userName="+user_name;
-        ajaxObj.process("index.php?",urlstring);
+	var user_name = $('user_name').value;
+	new Ajax.Request(
+                'index.php',
+                {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+                        method: 'post',
+                        postBody: 'module=Users&action=UsersAjax&file=Save&ajax=true&dup_check=true&userName='+user_name,
+                        onComplete: function(response) {ldelim}
+				if(response.responseText == 'SUCCESS')
+			                document.EditView.submit();
+       				else
+			                alert(response.responseText);
+                        {rdelim}
+                {rdelim}
+        );
 
 {rdelim}
 
-function ajaxSaveUserResponse(response)
-{ldelim}
-        if(response.responseText == 'SUCCESS')
-                document.EditView.submit();
-        else
-                alert(response.responseText);
-{rdelim}
 </script>
 
 




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 05:23:02 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 09:23:02 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6923 -
	/vtigercrm/trunk/Smarty/templates/Rss.tpl
Message-ID: <20060607092302.66E087E8599@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 03:22:58 2006
New Revision: 6923

Log:
ajax functionality has been modified

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

Modified: vtigercrm/trunk/Smarty/templates/Rss.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Rss.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Rss.tpl Wed Jun  7 03:22:58 2006
@@ -12,27 +12,25 @@
 <script language="JavaScript" type="text/javascript" src="modules/Rss/Rss.js"></script>
 <script src="include/scriptaculous/prototype.js" type="text/javascript"></script>
 <script src="include/scriptaculous/scriptaculous.js" type="text/javascript"></script>
-<script language="JavaScript" type="text/javascript" src="include/js/ajax.js"></script>
 <script>
 {literal}
 
-function ajaxSetDefault(response)
-{
-	hide('status');
-	getrssfolders();
-}
 function GetRssFeedList(id)
 {
-	show('status');	
-	var ajaxObj = new VtigerAjax(ajaxRssFeedResponse);
-	var urlstring = 'module=Rss&action=RssAjax&vtigerfile=ListView&directmode=ajax&record='+id;
-	ajaxObj.process("index.php?",urlstring);
+	$("status").style.display="inline";
+        new Ajax.Request(
+                'index.php',
+                {queue: {position: 'end', scope: 'command'},
+                        method: 'post',
+                        postBody: 'module=Rss&action=RssAjax&vtigerfile=ListView&directmode=ajax&record='+id,
+                        onComplete: function(response) {
+                                $("status").style.display="none";
+				$("rssfeedscont").innerHTML=response.responseText;
+                        }
+                }
+        );
 }
-function ajaxRssFeedResponse(response)
-{
-	hide('status');	
-	document.getElementById("rssfeedscont").innerHTML=response.responseText;
-}
+
 function DeleteRssFeeds(id)
 {
    if(id != '')	
@@ -41,38 +39,50 @@
 	{	
 		show('status');	
 		var feed = 'feed_'+id;
-		document.getElementById(feed).parentNode.removeChild(document.getElementById(feed));
-		var ajaxObj = new VtigerAjax(ajaxRssFeedResponse);
-		var urlstring = 'module=Rss&return_module=Rss&action=RssAjax&vtigerfile=Delete&directmode=ajax&record='+id;
-		ajaxObj.process("index.php?",urlstring);
+		$(feed).parentNode.removeChild($(feed));
+		new Ajax.Request(
+                	'index.php',
+        	        {queue: {position: 'end', scope: 'command'},
+                        	method: 'post',
+	                        postBody: 'module=Rss&return_module=Rss&action=RssAjax&vtigerfile=Delete&directmode=ajax&record='+id,
+        	                onComplete: function(response) {
+	        	                $("status").style.display="none";
+                                	$("rssfeedscont").innerHTML=response.responseText;
+                        	}
+                	}
+        	);
 	}
    }
 }
 function SaveRssFeeds()
 {
-	show('status');	
-	var ajaxObj = new VtigerAjax(ajaxRssSaveResponse);
-	rssurl = document.getElementById('rssurl').value;
+	$("status").style.display="inline";
+	rssurl = $('rssurl').value;
 	rssurl = rssurl.replace(/&/gi,"##amp##");
-	var urlstring = 'module=Rss&action=RssAjax&vtigerfile=Popup&directmode=ajax&rssurl='+rssurl;
-	ajaxObj.process("index.php?",urlstring);
-}
-function ajaxRssSaveResponse(response)
-{
-	hide('status')	
-	if(isNaN(parseInt(response.responseText)))	
-	{
-		alert(response.responseText);
-		document.getElementById('rssurl').value = '';
-	}
-	else
-	{
-		GetRssFeedList(response.responseText);
-		getrssfolders();
-		document.getElementById('rssurl').value = '';
-		Effect.Puff('PopupLay');
-	}
-		
+	var category = $('rsscategory')[$('rsscategory').selectedIndex].value;
+	new Ajax.Request(
+		'index.php',
+		{queue: {position: 'end', scope: 'command'},
+			method: 'post',
+			postBody:'module=Rss&action=RssAjax&vtigerfile=Popup&directmode=ajax&rsscategory='+category+'&rssurl='+rssurl, 
+			onComplete: function(response) {
+	
+                                        $("status").style.display="none";
+					if(isNaN(parseInt(response.responseText)))
+        				{
+				                alert(response.responseText);
+				                $('rssurl').value = '';
+					}
+					else
+        				{
+				                GetRssFeedList(response.responseText);
+				                getrssfolders();
+				                $('rssurl').value = '';
+				                Effect.Puff('PopupLay');
+        				}
+                                }
+                        }
+                );
 }
 {/literal}
 </script>
@@ -167,6 +177,10 @@
 	<td align="left" width="70%"><input type="text" id="rssurl" class="txtBox" /></td>
 	</tr>
 	
+	<tr>
+	<td align="right"><b>{$MOD.LBL_CATEGORY}</b></td>
+	<td align="left"><select id="rsscategory" class="importBox" style="width:100%">{$RSSCATEG}</select></td>
+	</tr>
 	<tr><td colspan="2" style="border-bottom:1px dashed #CCCCCC;">&nbsp;</td></tr>
 	<tr>
 	<td	colspan="2" align="center">
@@ -194,21 +208,32 @@
 {ldelim}
 	if(id != '')
 	{ldelim}
-		show('status');	
-		var ajaxObj = new VtigerAjax(ajaxSetDefault);
-		var urlstring = 'module=Rss&action=RssAjax&vtigerfile=Popup&directmode=ajax&record='+id;
-		ajaxObj.process("index.php?",urlstring);
+		$("status").style.display="inline";
+		new Ajax.Request(
+                	'index.php',
+	                {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+        	                method: 'post',
+                	        postBody:'module=Rss&action=RssAjax&vtigerfile=Popup&directmode=ajax&record='+id, 
+                        	onComplete: function(response) {ldelim}
+                                	$("status").style.display="none";
+        				getrssfolders();
+        	               {rdelim}
+                	{rdelim}
+        	);
 	{rdelim}
 {rdelim}
 function getrssfolders()
 {ldelim}
-	var ajaxObj = new VtigerAjax(ajaxrssfolders);
-	var urlstring = 'module=Rss&action=RssAjax&vtigerfile=ListView&folders=true';
-	ajaxObj.process("index.php?",urlstring);
-{rdelim}
-function ajaxrssfolders(response)
-{ldelim}
-	hide('status')
-	document.getElementById("rssfolders").innerHTML=response.responseText;
+	new Ajax.Request(
+        	'index.php',
+                {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+                	method: 'post',
+                        postBody:'module=Rss&action=RssAjax&vtigerfile=ListView&folders=true',
+			onComplete: function(response) {ldelim}
+                        		$("status").style.display="none";
+					$("rssfolders").innerHTML=response.responseText;
+                               {rdelim}
+                        {rdelim}
+                );
 {rdelim}
 </script>




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 05:23:52 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 09:23:52 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6924 -
	/vtigercrm/trunk/Smarty/templates/RoleEditView.tpl
Message-ID: <20060607092352.C309B7E8599@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 03:23:49 2006
New Revision: 6924

Log:
ajax functionality has been modified

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 Wed Jun  7 03:23:49 2006
@@ -13,24 +13,27 @@
 <script language="javascript">
 function dup_validation()
 {ldelim}
-	//show("status");
-	var ajaxObj = new VtigerAjax(ajaxSaveResponse);
-	var rolename = document.getElementById('rolename').value;
+	var rolename = $('rolename').value;
 	var mode = getObj('mode').value;
 	var roleid = getObj('roleid').value;
 	if(mode == 'edit')
-		var urlstring ="module=Users&action=UsersAjax&file=SaveRole&ajax=true&dup_check=true&mode="+mode+"&roleName="+rolename+"&roleid="+roleid;
+		var urlstring ="&mode="+mode+"&roleName="+rolename+"&roleid="+roleid;
 	else
-		var urlstring ="module=Users&action=UsersAjax&file=SaveRole&ajax=true&dup_check=true&roleName="+rolename;
-
-	ajaxObj.process("index.php?",urlstring);
-{rdelim}
-function ajaxSaveResponse(response)
-{ldelim}
-	if(response.responseText == 'SUCESS')
-		document.newRoleForm.submit();
-	else
-		alert(response.responseText);
+		var urlstring ="&roleName="+rolename;
+	new Ajax.Request(
+                'index.php',
+                {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+                                method: 'post',
+                                postBody: 'module=Users&action=UsersAjax&file=SaveRole&ajax=true&dup_check=true'+urlstring,
+                                onComplete: function(response) {ldelim}
+					if(response.responseText == 'SUCESS')
+						document.newRoleForm.submit();
+					else
+						alert(response.responseText);
+                                {rdelim}
+                        {rdelim}
+                );
+
 {rdelim}
 function validate()
 {ldelim}




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 05:25:11 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 09:25:11 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6925 -
	/vtigercrm/trunk/Smarty/templates/Reports.tpl
Message-ID: <20060607092511.2FE7B7E8572@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 03:25:07 2006
New Revision: 6925

Log:
ajax functionality has been modified

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

Modified: vtigercrm/trunk/Smarty/templates/Reports.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Reports.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Reports.tpl Wed Jun  7 03:25:07 2006
@@ -109,27 +109,31 @@
 {*<!-- Contents -->*}
 {literal}
 <script>
-function ajaxDelFolderResp(response)
-{
-	var item = response.responseText;
-	getObj('customizedrep').innerHTML = item;
-	
-}
+
 function DeleteFolder(id)
 {
 	var title = 'folder'+id;
 	var fldr_name = getObj(title).innerHTML;
 	if(confirm("Are you sure you want to delete the folder  "+fldr_name +" ?"))
 	{
-		var ajaxObj = new VtigerAjax(ajaxDelFolderResp);
-		url ='action=ReportsAjax&mode=ajax&file=DeleteReportFolder&module=Reports&record='+id;
-		ajaxObj.process("index.php?",url);
+		new Ajax.Request(
+			'index.php',
+	                {queue: {position: 'end', scope: 'command'},
+        	                method: 'post',
+                	        postBody: 'action=ReportsAjax&mode=ajax&file=DeleteReportFolder&module=Reports&record='+id,
+                        	onComplete: function(response) {
+					var item = response.responseText;
+				        getObj('customizedrep').innerHTML = item;
+                        	}
+                	}
+        	);
 	}
 	else
 	{
 		return false;
 	}
 }
+
 function AddFolder()
 {
 	if(getObj('folder_name').value.replace(/^\s+/g, '').replace(/\s+$/g, '').length==0)
@@ -140,7 +144,6 @@
 	else
 	{
 		fninvsh('orgLay');
-		var ajaxObj = new VtigerAjax(ajaxDelFolderResp);
 		var foldername = getObj('folder_name').value;
 		var folderdesc = getObj('folder_desc').value;
 		getObj('folder_name').value = '';
@@ -150,15 +153,25 @@
 			var mode = getObj('fldrsave_mode').value;
 		if(mode == 'save')
 		{
-			url ='action=ReportsAjax&mode=ajax&file=SaveReportFolder&module=Reports&savemode=Save&foldername='+foldername+'&folderdesc='+folderdesc;
+			url ='&savemode=Save&foldername='+foldername+'&folderdesc='+folderdesc;
 		}
 		else
 		{
 			var folderid = getObj('folder_id').value;
-			url ='action=ReportsAjax&mode=ajax&file=SaveReportFolder&module=Reports&savemode=Edit&foldername='+foldername+'&folderdesc='+folderdesc+'&record='+folderid;
+			url ='&savemode=Edit&foldername='+foldername+'&folderdesc='+folderdesc+'&record='+folderid;
 		}
 		getObj('fldrsave_mode').value = 'save';
-		ajaxObj.process("index.php?",url);
+		new Ajax.Request(
+                        'index.php',
+                        {queue: {position: 'end', scope: 'command'},
+                                method: 'post',
+                                postBody: 'action=ReportsAjax&mode=ajax&file=SaveReportFolder&module=Reports'+url,
+                                onComplete: function(response) {
+                                        var item = response.responseText;
+                                        getObj('customizedrep').innerHTML = item;
+                                }
+                        }
+                );
 	}
 }
 function EditFolder(id,name,desc)
@@ -206,10 +219,18 @@
 	if(idstring != '')
 	{
 		if(confirm("Are you sure you want to delete the selected "+count+" reports ?"))
-        {
-			var ajaxObj = new VtigerAjax(ajaxDelFolderResp);
-			url ='action=ReportsAjax&mode=ajax&file=Delete&module=Reports&idlist='+idstring;
-			ajaxObj.process("index.php?",url);
+       		{
+			new Ajax.Request(
+                        'index.php',
+                        {queue: {position: 'end', scope: 'command'},
+                                method: 'post',
+                                postBody: 'action=ReportsAjax&mode=ajax&file=Delete&module=Reports&idlist='+idstring,
+                                onComplete: function(response) {
+                                        var item = response.responseText;
+                                        getObj('customizedrep').innerHTML = item;
+                                }
+                        }
+                );
 		}else
 		{
 			return false;
@@ -225,17 +246,20 @@
 {
 	if(confirm("Are you sure you want to delete this report ?"))
 	{
-		var ajaxObj = new VtigerAjax(ajaxDelReportResp);
-		url ='action=ReportsAjax&file=Delete&module=Reports&record='+id;
-		ajaxObj.process("index.php?",url);
+		new Ajax.Request(
+                        'index.php',
+                        {queue: {position: 'end', scope: 'command'},
+                                method: 'post',
+                                postBody: 'action=ReportsAjax&file=Delete&module=Reports&record='+id,
+                                onComplete: function(response) {
+					getObj('reportContents').innerHTML = response.responseText;
+                                }
+                        }
+                );
 	}else
 	{
 		return false;
 	}
-}
-function ajaxDelReportResp(response)
-{
-	getObj('reportContents').innerHTML = response.responseText;
 }
 function MoveReport(id,foldername)
 {
@@ -276,10 +300,17 @@
 	if(idstring != '')
 	{
 		if(confirm("Are you sure you want to move this report to "+foldername+" folder ?"))
-        {
-			var ajaxObj = new VtigerAjax(ajaxDelReportResp);
-			url ='action=ReportsAjax&file=ChangeFolder&module=Reports&folderid='+id+'&idlist='+idstring;
-			ajaxObj.process("index.php?",url);
+        	{
+			new Ajax.Request(
+                        'index.php',
+                        {queue: {position: 'end', scope: 'command'},
+                                method: 'post',
+                                postBody: 'action=ReportsAjax&file=ChangeFolder&module=Reports&folderid='+id+'&idlist='+idstring,
+                                onComplete: function(response) {
+                                	        getObj('reportContents').innerHTML = response.responseText;
+                	                }
+                        	}
+	                );
 		}else
 		{
 			return false;




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 05:25:46 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 09:25:46 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6926 -
	/vtigercrm/trunk/Smarty/templates/ReportRun.tpl
Message-ID: <20060607092546.B2B9B7E8599@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 03:25:43 2006
New Revision: 6926

Log:
ajax functionality has been modified

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 Wed Jun  7 03:25:43 2006
@@ -127,18 +127,21 @@
     Calendar.setup ({inputField : "jscal_field_date_end", ifFormat : "%Y-%m-%d", showsTime : false, button : "jscal_trigger_date_end", singleClick : true, step : 1});
 function generateReport(id)
 {
-	var ajaxObj = new VtigerAjax(ajaxgenReportResp);
 	var stdDateFilterFieldvalue = document.NewReport.stdDateFilterField.options  [document.NewReport.stdDateFilterField.selectedIndex].value;
 	var stdDateFiltervalue = document.NewReport.stdDateFilter.options[document.NewReport.stdDateFilter.selectedIndex].value;
 	var startdatevalue = document.NewReport.startdate.value;
 	var enddatevalue = document.NewReport.enddate.value;
-	url ='action=ReportsAjax&file=SaveAndRun&mode=ajax&module=Reports&record='+id+'&stdDateFilterField='+stdDateFilterFieldvalue+'&stdDateFilter='+stdDateFiltervalue+'&startdate='+startdatevalue+'&enddate='+enddatevalue;
-	ajaxObj.process("index.php?",url);
-}
-function ajaxgenReportResp(response)
-{
-	getObj('Generate').innerHTML = response.responseText;
-	setTimeout("ReportInfor()",1);
+	new Ajax.Request(
+                'index.php',
+                {queue: {position: 'end', scope: 'command'},
+                        method: 'post',
+                        postBody: 'action=ReportsAjax&file=SaveAndRun&mode=ajax&module=Reports&record='+id+'&stdDateFilterField='+stdDateFilterFieldvalue+'&stdDateFilter='+stdDateFiltervalue+'&startdate='+startdatevalue+'&enddate='+enddatevalue,
+                        onComplete: function(response) {
+				getObj('Generate').innerHTML = response.responseText;
+				setTimeout("ReportInfor()",1);
+                        }
+                }
+        );
 }
 function selectReport()
 {




From vtiger-tickets at vtiger.fosslabs.com  Wed Jun  7 05:40:58 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 07 Jun 2006 09:40:58 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231275=3A?=
	=?utf-8?q?_Move_Tickets_to_FAQ?=
Message-ID: <076.3172336494b1ae9199990df7c684d75e@vtiger.fosslabs.com>

#1275: Move Tickets to FAQ
-------------------------+--------------------------------------------------
 Reporter:  anonymous    |       Owner:  developer
     Type:  enhancement  |      Status:  new      
 Priority:  major        |   Milestone:           
Component:  vtigercrm    |     Version:  5.0.0    
 Keywords:               |  
-------------------------+--------------------------------------------------
 tickets might include attachments. When you move a ticket to FAQ these
 attachements get lost, since FAQ do not have attachments --> therefor
 attachements for FAQ are needed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1275>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 05:57:26 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 09:57:26 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6927 - in
 /vtigercrm/trunk/modules: Accounts/DetailView.php Activities/DetailView.php
 Campaigns/DetailView.php Contacts/DetailView.php Emails/DetailView.php
Message-ID: <20060607095726.ED6AA7E85AC@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 03:57:11 2006
New Revision: 6927

Log:
i18n updated - ahmed

Modified:
    vtigercrm/trunk/modules/Accounts/DetailView.php
    vtigercrm/trunk/modules/Activities/DetailView.php
    vtigercrm/trunk/modules/Campaigns/DetailView.php
    vtigercrm/trunk/modules/Contacts/DetailView.php
    vtigercrm/trunk/modules/Emails/DetailView.php

Modified: vtigercrm/trunk/modules/Accounts/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Accounts/DetailView.php (original)
+++ vtigercrm/trunk/modules/Accounts/DetailView.php Wed Jun  7 03:57:11 2006
@@ -29,7 +29,7 @@
 global $mod_strings;
 global $app_strings;
 global $app_list_strings;
-global $log;
+global $log, $currentModule;
 
 $focus = new Account();
 if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) {
@@ -108,6 +108,6 @@
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
 
-$smarty->assign("MODULE","Accounts");
+$smarty->assign("MODULE",$currentModule);
 $smarty->display("DetailView.tpl");
 ?>

Modified: vtigercrm/trunk/modules/Activities/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Activities/DetailView.php (original)
+++ vtigercrm/trunk/modules/Activities/DetailView.php Wed Jun  7 03:57:11 2006
@@ -28,7 +28,7 @@
 require_once('include/database/PearDatabase.php');
 require_once('include/utils/utils.php');
 require_once('include/utils/utils.php');
-global $mod_strings;
+global $mod_strings, $currentModule;
 if( $_SESSION['mail_send_error']!="")
 {
 	echo '<b><font color=red>'. $mod_strings{"LBL_NOTIFICATION_ERROR"}.'</font></b><br>';
@@ -148,7 +148,7 @@
  $smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']);
  $smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']);
 
-$smarty->assign("MODULE",$app_strings['Activities']);
+$smarty->assign("MODULE",$currentModule);
 $smarty->display("DetailView.tpl");
 
 ?>

Modified: vtigercrm/trunk/modules/Campaigns/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Campaigns/DetailView.php (original)
+++ vtigercrm/trunk/modules/Campaigns/DetailView.php Wed Jun  7 03:57:11 2006
@@ -68,7 +68,7 @@
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
 
-$smarty->assign("MODULE",$app_strings['Campaigns']);
+$smarty->assign("MODULE",$currentModule);
 $smarty->display("DetailView.tpl");
 $focus->id = $_REQUEST['record'];
 

Modified: vtigercrm/trunk/modules/Contacts/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/DetailView.php (original)
+++ vtigercrm/trunk/modules/Contacts/DetailView.php Wed Jun  7 03:57:11 2006
@@ -121,7 +121,7 @@
 $smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']);
 $smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']);
 
-$smarty->assign("MODULE",$app_strings['Contacts']);
+$smarty->assign("MODULE",$currentModule);
 $smarty->display("DetailView.tpl");
 ?>
 

Modified: vtigercrm/trunk/modules/Emails/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/DetailView.php (original)
+++ vtigercrm/trunk/modules/Emails/DetailView.php Wed Jun  7 03:57:11 2006
@@ -156,7 +156,7 @@
 $smarty->assign("CHECK", $check_button);
 	
 //Constructing the Related Lists from here
-$smarty->assign("MODULE",$app_strings['Emails']);
+$smarty->assign("MODULE",$currentModule);
 $smarty->assign("SENDER",$email_id);
 if($_REQUEST['mode'] != 'ajax')
 	$smarty->display("DetailView.tpl");




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 06:06:04 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 10:06:04 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6928 -
	/vtigercrm/trunk/modules/Leads/DetailView.php
Message-ID: <20060607100604.42FB97E85AE@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 04:06:00 2006
New Revision: 6928

Log:
i18n updated - ahmed

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 Jun  7 04:06:00 2006
@@ -122,7 +122,7 @@
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
 
-$smarty->assign("MODULE", $module);
+$smarty->assign("MODULE", $currentModule);
 $smarty->display("DetailView.tpl");
 
 ?>




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 06:20:30 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 10:20:30 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6929 -
	/vtigercrm/trunk/modules/Campaigns/ListView.php
Message-ID: <20060607102031.11D787E85AA@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 04:20:27 2006
New Revision: 6929

Log:
update listview

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 Jun  7 04:20:27 2006
@@ -108,7 +108,7 @@
 $smarty->assign("MOD", $mod_strings);
 $smarty->assign("APP", $app_strings);
 $smarty->assign("IMAGE_PATH",$image_path);
-$smarty->assign("MODULE",'Campaigns');
+$smarty->assign("MODULE",$currentModule);
 $smarty->assign("BUTTONS",$other_text);
 $smarty->assign("CATEGORY",$category);
 $smarty->assign("SINGLE_MOD",'Campaign');




From vtiger-tickets at vtiger.fosslabs.com  Wed Jun  7 06:50:46 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 07 Jun 2006 10:50:46 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231276=3A?=
 =?utf-8?q?_Language_file_issue_/include/language?=
Message-ID: <076.705db0ccf0fb3c7495be9bad38dc724d@vtiger.fosslabs.com>

#1276: Language file issue /include/language
-----------------------+----------------------------------------------------
 Reporter:  anonymous  |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  critical   |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 if you translate the terms 'Accounts' or 'Contacts' the "More Information"
 tab at the detail view at the contacs menu does not work anymore and
 reponses with Hacking attemd!

 //Added fields to display the related lists titles and None Scheduled
 'LBL_NONE_SCHEDULED'=>'None Scheduled',

 'Leads'=>'Leads',
 'Accounts'=>'Accounts',
 'Contacts'=>'Contacts',
 'Accounts & Contacts'=>'Organisationen & Personen',
 'Potentials'=>'Verkaufspotentiale',

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1276>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 07:24:16 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 11:24:16 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6930 -
	/vtigercrm/tags/vtigercrm-4.2.4/README.txt
Message-ID: <20060607112416.DCB4F7E85BA@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 05:24:11 2006
New Revision: 6930

Log:
Changes made for 4.2.4 release

Modified:
    vtigercrm/tags/vtigercrm-4.2.4/README.txt

Modified: vtigercrm/tags/vtigercrm-4.2.4/README.txt
==============================================================================
--- vtigercrm/tags/vtigercrm-4.2.4/README.txt (original)
+++ vtigercrm/tags/vtigercrm-4.2.4/README.txt Wed Jun  7 05:24:11 2006
@@ -1,35 +1,1432 @@
-vtigerCRM Readme
+####################################################
+vtiger CRM 4.2.4
+June 06, 2005
+####################################################
+
+After much delay vtigercrm 4.2.4 has been released.
+
+This is the first community driven release, so a big thanks goes out to all the people involved in making this happen.
+
+This is mostly a bug fix release, but it does mark the first release using the new SVN/Trac system which helps us harness the power of the community contributions and track issues and their fixes so everyone can help out.  The Trac system can be seen here: http://vtiger.fosslabs.com
+
+A list of fixed bugs can be seen using the trac ticket system here:
+http://vtiger.fosslabs.com/cgi-bin/trac.cgi/query?status=closed&milestone=4.2.4&order=priority
+
+A full changelog can be seen trough the trac svn log here:
+http://vtiger.fosslabs.com/cgi-bin/trac.cgi/log/vtigercrm/tags/vtigercrm-4.2.4?action=stop_on_copy&rev=6885&stop_rev=&mode=follow_copy&verbose=on
+
+vtigercrm 4.2.4 can be downloaded here:
+<download links>
+
+INSTALLATION PROCEDURE:
+
+For a new installation simply extract the files into a directory accessible through your apache setup then point your web browser to that directory on your website and follow the installation instructions.  Software you'll require is apache (1.3.x or 2.x) with php (4.3+, no 5.x support yet) and mysql (4.x).
+
+You can post any issues or suggestions at http://vtiger.fosslabs.com/cgi-bin/trac.cgi/newticket 
+
+
+UPGRADING:
+
+If you are upgrading from a previous version of vtigercrm first backup all data then follow the instructions for the appropriate version below:
+
+4.2.3:
+	- No database changes are need if you are using a successfull installation.
+		- If tables were only partially created for you using an earlier version please wipe your database and try with 4.2.4, your problems should be solved.
+	- To save your current configuration copy the config.php file from your old installation to config.inc.php in the new installation.  You'll also have to edit the config file as follows:
+		- change the following variable names in config.php
+
+		from:
+			$dbconfig['db_host_name'] =
+			$dbconfig['db_user_name'] =
+
+		to:
+			$dbconfig['db_hostname'] =
+			$dbconfig['db_username'] =
+
+	- If your 4.2.3 installation has previously been upgraded from an earlier release there is one database modification missed in pervious upgrades you will want to make manually:
+		alter table wordtemplates drop primary key;
+		alter table wordtemplates change filename filename varchar(100) not null;
+		alter table wordtemplates add column templateid integer(19) primary key;
+
+
+4.2.2 (aka 4.2 patch2):
+	- Apply the 4.2.3 patch as per: http://forums.vtiger.com/viewtopic.php?t=4166
+	- Then follow the instructions for a 4.2.3 upgrade.
+
+
+4.2.1 or 4.2:
+	- Apply the 4.2.2 patch as per: http://forums.vtiger.com/viewtopic.php?t=2903
+	- Then follow the instructions for a 4.2.2 upgrade.
+
+####################################################
+vtiger CRM 4.2.3
+Dec 23, 2005
+####################################################
+We are pleased to announce the vtigerCRM 4.2.3 release. This release is a consolidated with earlier patches (1 & 2 - refer below section for the list of fixes) and Multiple vulnerablity fixes. 
+
+Note: First Time vtiger CRM users can directly install the source in their
+vtiger suported version of LAMP / WAMP. 
+
+**************************************************************************************************************
+*   IMPORTANT NOTICE                                                                                         *
+**************************************************************************************************************
+* The vtigerCRM 4.2.3 is ONLY for the first time vtiger users and not for                                    *
+* the existing users. The existing v4.2 users are recomended to upgrade their system by applying v4.2 patch  *
+* 2 and vulnerability fixes patch. You can download the patches from the                                     *
+* following urls.                                                                                            *
+* http://forums.vtiger.com/viewtopic.php?t=2903								     *
+* http://forums.vtiger.com/viewtopic.php?t=4166                                                              *
+**************************************************************************************************************
+
+Software requirements : PHP 4.3.x, MySQL 4.0.x (4.0.20 prefered), Apache 1.3.x
+or 2.0.x 
+
+For more details refer to http://www.vtiger.com/wiki/index.php/Vtiger_CRM_4.2.3_-_Installation_Guide
+
+
+***********************
+I. Vulnerability fixes
+***********************
+
+Posted by D.Fabian / SEC-CONSULT/ ww.sec-consult.com
+
+a) Multiple SQL Injection Vulnerabilities
+b) Cross Site Scripting
+c) Path Traversal/File Disclosure
+d) Arbitrary File Upload
+e) Remote Code Execution
+
+Posted by Christopher Kunz / www.hardened-php.net
+
+a) Arbitrary File Upload
+b) Authentication ByPass
+c) Unsafe File Inclusion
+d) Arbitrary code execution
+
+
+####################################################
+vtiger CRM 4.2 Patch 2
+Sep 15, 2005
+####################################################
+
+We are pleased to announce the consolidated patch for vtiger CRM 4.2. This release includes many code contributions from vtiger community and bug fixes!
+
+******************************************
+I. Code Contributions by vtiger Community
+******************************************
+
+Thanks to Bela, Fredy, JLee, MikeCrowe, and Sholmi for their valuable contributions to the vtiger CRM development. 
+
+Following contributions were made at vtiger Discussions under "vtiger CRM - Code Contributions" forum:
+
+1. T2025  - 2 bugs - JLee (Same as P8180 in vtiger Discussions " Little typo in function get_lead_feild_options")
+
+2. T2324  - Modification to the Aqua theme - Bela (Note: We have included the fix for all the themes except blue theme)  
+
+3. T2406  - Description spanned over all columns - Fredy
+
+4. T2431  - Search by TicketId field in HelpDesk - Fredy
+
+5. T2524  - Scrollable related lists - Fredy
+
+6. P9578  - Import/Export Products - JLee
+
+7. T2196  - Fix for World Clock Bug - JLee
+
+8. T2139  - Bug in: EditView.html - Shlomi
+ 
+9. T2000  - Add "Assigned To" as a choice when Importing - MikeCrowe
+
+10. T1585 - Improved Calendar - Fredy
+  
+****************
+II. New Features
+****************
+
+1. Import/Export Products
+
+2. Scrollable List View for related Lists
+
+***************
+III. Bug Fixes
+***************
+
+--------------------------
+A. http://bugs.vtiger.com
+--------------------------
+
+-------------------------------------
+S.No ID    Subject
+-------------------------------------
+1.   67  - Inventory Mgmt Related List
+
+2.   70  - Activities - Quick Create
+
+3.   81  - Price Book - Select Product list price
+
+4.   82  - Inventory Mgmt Related List Issue
+
+5.   96  - Alignment is not proper for Total and sub total
+
+6.  108  - Without entering any value in global search if we click on search then the n an empty page is displayed
+
+7.  113  - Security UI not good enough
+
+8.  114  - Better icons for the inv mgmt modules
+
+9.  428 - User Signature Issue
+
+10. 125  - UI for New Product creation not proper
+
+11. 129  - Advanced search requires some fields (SF.Net ID: 
+
+12. 131  - Sorting Name in Leads
+
+13. 143  - Product related list in Activity can be removed
+
+14. 149  - New Ticket Creation - Group empty
+
+15. 160  - Modified time and created time are 0 in Add Business Card
+
+16.  406 - Clock is dislocated after delete a record
+
+17.  407 - HelpDesk quick create- title not saved
+
+18.  408 - Activities CustomView contact not displayed
+
+19. 409 - After mass delete FAQ control goes to HelpDesk
+
+20. 410 - Footer alignment changed
+
+21. 411 - New Event Creation
+
+22. 405 - FAQ quick create
+
+23. 412 - Security - Activity delete
+
+24. 413 - Security - Default Organization for Activities
+
+25. 414 - Field positioning Sales/Support Start dates
+
+26. 415 - Inventory Related List
+
+27. 416 - Inventory RL
+
+28. 417 - Inventory RL - Activity History missing
+
+29. 418 - Ticket - Create
+
+30. 419 - Email - Edit View
+
+31. 420 - Availability of user
+
+32. 421 - Adding Products to Price book Validations
+
+33. 422 - New Activity Creation - Group empty
+
+34. 424 - History in Potential, PO, SO and Invoice
+
+35. 425 - After delete tickets it displays empty list
+
+36. 426 - Invoice Display in Home Page
+
+37.  86 - File Size validation for the product image
+
+38.  78 - Adding pricebook to products
+
+39.  81 - IE 6 Pricebook Validations
+ 
+-----------------------------------
+B. vtiger Discussions - Bug Tracker
+-----------------------------------
+
+-------------------------------------
+S.No ID        Subject
+-------------------------------------
+
+40.  T1707   - Customer Portal language bug
+
+41.  T2080   - Email doesn't work
+
+42.  P8047   - Change Status Not Updating Modify Date
+
+43.  P8004   - BUG modules/HelpDesk/Save.php
+
+44.  P8301   - Additional Info to Helpdesk-Issue
+
+45.  P8449   - Calendar icon missing at HelpDesk
+
+46.  P8306   - Missing values in Cumulative Statistics
+
+47.  T1802   - Still not possible to delete a contact - account relation
+
+48.  T1398   - Issues in Contacts 
+
+49.  T1694   - Email Editor Add Link doesn't work
+
+50.  T1742   - Bug when assigning product from 2nd page to potential
+
+51.  T2025   - 2 bugs
+
+52.  T2313   - New Task Bug
+
+53.  P8170   - Quotes popup trouble
+
+54.  P8098   - Vendor pick list not working in Purchase order
+
+55.  T1862   - Customize Quote Template
+
+56.  P8159   - New Calendar Bug
+
+57.  T2038   - Please fix these Bugs in 4.2
+
+58.  T1696   - Accounts Website url fix
+
+59.  T2003   - Pricebook bug 
+
+60.  P8293   - Double entries in 'Default Organization Sharing Access'
+
+61.  T2512   - Home upcoming activities
+
+62.  P8030   - Meetings not held must not be shown in upcoming activities
+
+
+####################################################
+
+vtiger CRM 4.2 Patch 1
+Aug 10, 2005
+
+####################################################
+
+New Feature:
+
+Reports can be exported in Excel Format.
+
+Bug Fixes:
+
+1. Forum Post ID 6550: Can not add new product
+
+2. SF ID1159916: settings-Company details 
+
+3. SF ID1160084: Task - End Date 
+
+4. SF ID1161317: date accept 0 value 
+
+5. SF ID1161326: Lead Conversion 
+
+6. Forum Topic ID 2038: Please fix these Bugs in 4.2
+
+7. Internal: Make QuickActivityRegister have enddate(duedate)
+
+8. Forum Topic ID 1696: Calendar bug fix for non-admin user
+
+9. Forum Topic ID 1648: Converting a lead 
+
+10. SF ID 1161344: probability is not validate if we give greater value 
+
+11. Forum Topic ID 2223: Editing Company information
+
+12. Interna: Calendar in Quick create in events
+
+13. Forum Topic ID 1803: chips impossible to add more activity (task/event)
+
+14. Forum Post ID 6733: Missing required field in New Event shortcut
+
+15. Internal: Lead Conversion form validation
+
+16. Forum Topic ID 2038:Please fix these Bugs in 4.2
+
+17. SF ID 1161223: Export to PDF
+
+18. Forum Topic ID 1693:Bad PDF output
+
+19. Forum Topic ID 2012:Report Customization iNot working in IE
+
+20. Forum Topic ID 1823: Translation Issue 2
+
+21. Forum Topic ID 2038: Please fix these Bugs in 4.2
+
+22. Internal: Invoice Qty & inventory issues in 4.2 GA
+
+23. Forum Topic ID 1717: bug report in new sales order and PDF invoice on
+online demo
+
+24. Internal: Inventory Mgmt
+
+25. Internal: Detail View Ui for Products Relateion in inventory is imporper 
+
+26. Internal: SO - Popup Account - table issue 
+
+27. Internal: Notes - Cancel/ back 
+
+28. Internal: No of Employees Field not validated 
+
+29. Internal: Filling with Todays date 
+
+30. Internal: Security - Default Organization for Activities 
+
+31. Internal: Security - Activity delete 
+
+32. Internal: Inventory Mgmt Logging 
+
+33. Internal: URL and URL name 
+
+34. Internal: Feild level access for task
+
+35. Forum Topic ID 1823: Custom Date field not working?
+
+36. Internal: Support for Text Area Custom Field
+
+37. Forum Topic ID 1643: Any user can change onw role for admin role? 
+
+38. Internal: Class not set in inventory product UI
+
+39. Forum Topic ID 2258: Nasty security bug in latest 4.2!
+
+40. Code Contribution: Indexing code by Microwe integrated
+
+41. Internal: Title doesn't show up
+
+42. Forum Topic ID 1997: Fixing bugs.
+
+43. Forum Topic ID 822:Translation-Issue
+
+44. Forum Topic ID 1768: Contact address pulled from Acccount
+
+45. Forum Topic ID 1753: VtigerCRM 4.0 Character causing troubles
+
+46. 1161351: Inventory Mgmt Related List 
+
+47. 1161347: Inventory Related List 
+
+48. 1161415:Contacts - Related Lists - Deleting Products
+
+49. 1161406: Assigned ToUser in Leads can be Assigned to User
+
+50. Forum Topic ID 2092: Product Popup in New Quotes
+
+51. Forum Topic ID 1980: Account Pop Http 404 when pickup a account in New
+Sales Order
+
+52. Forum Topic ID 2003: Pricebook bug
+
+53. 1161337: Price Book Product Select
+
+54. Forum Topic ID 2088: Address Information Won't Export
+
+55. Forum Topic ID 1582: Importing Checkbox Values when importing leads
+
+56. 1161356:Email - quick create date and time sent date not validated
+
+57. 1160290: Potentials incorrectly pulls up deleted notes in related
+
+58. Internal: Form Validation for Add Business Card
+
+59. Internal: Single, double quotes problem in ticket comments and FAQ
+comments
+
+60. Forum Topic ID 1612: Misbehaviour on validation of number fields
+
+
+#######################
+
+vtiger CRM 4.2 GA
+July 18, 2005
+
+#######################
+
+We are pleased to announce the latest version of vtiger CRM. This release includes many new features and few bug fixes!
+
+*****************
+A. New Features
+*****************
+
+  * Activity Management
+
+  * Manage recurring events (daily/weekly/monthly/yearly)
+
+  * Group/Shared calendar to plan meetings with vtiger CRM users without time conflicts
+
+  * UI enhancements related to overdue tasks in Activities list view 
+
+2. Lead Management
+
+ * Capture leads directly from your Web site to vtiger CRM
+
+ * Customize Online Lead Form as per your Web site requirements
+
+ * Create mailing lists and execute E-mail marketing campaigns
+
+ * Add multiple products to the leads
+
+ * Customize list of the leads as per users' requirements
+
+ * Create fully customizable lead reports
+
+ * Lead conversion mapping for all the custom fields
+
+3. Account & Contact Management
+
+ * Generate quotes, sales orders, and invoices directly from the accounts and contacts 
+
+ * Track history of all the products purchased by customers
+
+4. Products Management
+
+ * Create Price Books and associate products with Price Books
+
+ * Procure products from the selected Vendors list
+
+ * Associate Trouble Tickets and Knowledge Base articles with products
+
+ * Ability to upload product images for easy identification
+
+5. Sales Quotes
+
+ * Track outstanding quotes from the quotes list view
+
+ * Add Line Items to the quotes and update sub-total, taxes, adjustments, and grand total amounts
+
+ * Select different prices for the same product as per customer segment
+
+ * Create printer-friendly Sales Quotes and deliver to the prospect customers through in-built E-mail service
+
+ * Create Sales Order or Invoice with a single click from the Sales Quote
+
+ * Avoid duplicate work by dynamically displaying the Billing and Shipping addresses of the prospect
+
+ * Display quotes related to accounts under the related list
+
+ * Customize Sales Quote fields as per your organization requirements
+
+ * Set up your company information to display your company address while creating PDF documents
+
+6. Order Management
+
+ * Streamline organization-wide procurement and fulfillment processes by integrated Order Management with CRM
+
+ * Track outstanding orders from the Orders List View
+
+ *  Procure products from the available Vendors/Manufacturers/Resellers list in vtiger CRM
+
+ * Manage up-to-date stock position by seamless integration between order fulfillment and available stock in your warehouse
+
+ * Customize Purchase Order (PO) and Sales Order (SO) fields as per your organization requirements
+
+ * Avoid duplicate work by dynamically displaying the Billing and Shipping addresses of the prospect while creating orders
+
+ * Add Line Items to the Orders and update sub-total, taxes, adjustments, and grand total amounts automatically
+
+ * Create printer-friendly Order (PO/SO) and deliver to the Vendors/Customers through in-built E-mail service
+
+ * Once the Sales Order is confirmed create Invoice from Sales Order with a single click
+
+ * Periodically notify the stock position to the concerned parties in your organization so that stock is always available to fulfill the outstanding orders
+
+7. Invoices
+
+ * Track outstanding invoices from the Invoices list view
+
+ * Create printer-friendly Invoices and deliver to the customers through in-built E-mail service
+
+ * Customize Invoice fields as per your organization requirements
+
+ * Add Line Items to the Invoice and update sub-total, taxes, adjustments, and grand total amounts automatically
+
+ * Customize Invoice fields as per your organization requirements
+
+ * Avoid duplicate work by dynamically displaying the Billing and Shipping addresses of the customer while creating invoices
+
+ * Associate invoices with the General Ledger account for hassle free book keeping 
+
+
+8. Help Desk
+
+ * Manage product-wise Knowledge Base articles/FAQ
+
+ * Associate Articles with trouble tickets and products
+
+ * Provide public access to the Knowledge Base only after approval
+
+ * Update Articles/FAQ in vtiger CRM as based customer suggestions & comments
+
+9. E-mail Integration
+
+ * Configure incoming E-mail servers on per user basis. Each user can retrieve his own E-mails 
+
+ * Fetch E-mail messages through POP and IMAP services
+
+ * Setup multiple incoming E-mail servers 
+
+ * Seamless integration between incoming E-mail messages and the corresponding contacts in vtiger CRM with a single click
+
+ * Fetch incoming E-mail messages as RSS feed in RSS module
+
+ * Send E-mail notification to the users when records are assigned to them or there is a deadline coming up
+
+ * Ready-to use E-mail templates
+
+ * Populate vtiger CRM user related fields in E-mail templates
+
+ * Export E-mail messages into CSV file
+
+ * Fetch inbound E-mails and associate to the contacts or create E-mails directly into vtiger CRM
+
+ * Send mass E-mails to the contacts and other users
+
+10. Other Features
+
+ * Lead conversion feature within module access scope
+
+ * Generate quotes and sales orders, from the potentials
+
+*****************
+B. Bug Fixes
+*****************
+
+1. FORUM:1545 - Quotes, orders - working or not ? 
+
+2. FORUM:1560 - Can not change user password & problem with ordering system
+
+3. FORUM:5512 - In custom fields calendar, when a calendar field in created, the calendar drop down does not appear
+
+4. FORUM:5553 - Contact with apostrophe ' in name cannot own a ticket
+
+5. FORUM:5795 - If you change the name of admin passwords are lost !!!
+
+6. FORUM:5810 - In contacts module Brithdate shown as 0000-00-00
+
+7. FORUM:4501 - Error message while associating user to a group
+
+8. FORUM:4550 - Issue related to custom drop-down list order
+
+9. FORUM:4039- Issue with duplicating a contact
+
+10. FORUM:4073 - Normal user with no access to the settings is anyway able to change the profile of a role.
+
+11. FORUM:1409 - Report Export to PDF
+
+12. FORUM:1818 - Outlook Sync applies makes Calendar appointments 2020
+
+13. FORUM:606 File Missing: testemailtemplateusage.php 
+
+14. FORUM:1294 - Problem with e-mail templates
+
+15. FORUM:1050 - Subject of emails not imported - Need confirmation
+
+16. FORUM:1276 - Converting Leads and assigning to user
+
+17. FORUM:1270 - Bug in e-mail module
+
+18. ORUM:1742 - Bug when assigning product from 2nd page to potential
+
+19. FORUM:1772 - Bug: wrong date format when converting leads
+
+20. FORUM:1559 - Tasks not working in Leads
+
+21. FORUM: 5247 - Account search doesn't work
+
+22. FORUM:5096 - Phone search
+
+23. FORUM:5715 - Currency Support
+
+24. FORUM:5795 - Roles and Passwords
+
+
+25. SF1102842 - CSV import, problem with ?,?,?
+
+26. SF1097215 - Mass Delete in Accounts, Contacts and Opportunities
+
+27. SF1025603 - Phone in Task
+
+28. SF1093989 - picklists - I18N
+
+29. SF1090963 - wrong header caption in activities, history
+
+30. SF1090711 - Duplicate entries in language translation
+
+31. SF1095038 - Import Leads - No Mapping Fields
+
+32. SF1093132 - Lead Import Fails - v3.2
+
+33. SF1094944 - The leads dropdown list does not update
+
+34. SF1090715 - Error on importing contacts from cvs file
+
+35. SF1073179 - Importing .xls files but missing one of the column header
+
+36. SF1073159 - Importing Problem
+
+37. SF1087482 - user not deleted
+
+38. SF1094950 - New E-mail - Error Message
+
+39. SF1090721 - Meeting Contact - Unable to remove
+
+40. SF 1090717 - New Note: Field Name missing
+
+41. SF 1230595 - Custom Calendar in Tickets not working
+
+42. SF 1221170 - Sort Notes 
+
+43. SF 1221036 - Orders 
+
+44. SF 1214401 - Contact birthday translation 
+
+45. SF 1214396 - Task start date and Calendar date scrambled 
+
+46. SF 1218633 - Phone Search not working 
+
+47. SF 1231325 - Error with open tickets link on home page
+
+48. Create users without associating to any of the groups
+
+49. Non-editable user name
+
+50. Mandatory fields checks while configuring currency fields
+
+51. Mandatory fields checks while configuring database backup server
+
+52. The currency symbol which is set in Currency configuration, it is not reflected in dashboard graphs.
+
+53. Field accessibility support not provided for Potential fields
+
+
+*****************
+C. Known Issues
+*****************
+
+1. FORUM:1816 - Outlook Plugin error in Outlook
+
+2. FORUM:1818 - Outlook Sync applies makes Calendar appointments 2020
+
+3. FORUM:1293 - Leads have disappeared - We turned off Leads for all users in the Sales profile. Now we have turned them back on in Settings and they still don't appear. When have restarted the server to completely restart all services just in case but that didn't fix it. Any ideas?
+
+4. FORUM:1752 - Bug: Decimals lost in custom currency fields in products
+
+5. FORUM:1831- Import Error CSV Leads (File size more than 2MB cannot be imported)
+
+6. PDF report overlaps if the number of columns are more than the paper size and last few columns are hidden
+
+7. While creating a new event from Ticket related list, ticket name is not displayed under Activity page
+
+8. In Products related Price Book if edit link will point to Price Book edit view instead of Edit product list price
+
+9. If an event is assigned to Group then in the users list the group members name is displayed
+
+10. If an event is assigned to a team, if the team name is empty then also the event is being saved
+
+11. In Lead Conversion, the type of custom field is not taken into consideration
+
+12. If any of the events associated with recurring event is closed, all the related recurring events are also closed 
+
+13. In Reports, The Date fields in "Filter Options" will not be retained after clicking the 'Apply Filter' button
+
+14. When a New Sales Order, Purchase Order, Invoice and Quotes are created from a Product Detail View, Account Name and Potential Name will not be populated.
+
+15. In a Product Detail View if 'Add to Price Book' hyperlink is clicked and if no Price Book is present in the list, and if 'Add to Product' is selected, vtiger Home page will be displayed. 
+
+16. While generating reports the fields selected in 'Columns to Total' will not be displayed.
+
+***************
+D. Limitations
+***************
+
+1. Security is not implemented for Reports and Dashboards.
+
+2. GIF images are not supported while generating PDF documents such as Quotes,Orders and Invoice.
+
+
+NOTE: For more details about vtiger CRM 4.2 Release Notes, Please refer to the following URL:
+
+http://www.vtiger.com/wiki/index.php/Vtiger_CRM_4_2_Release_Notes
+ 
+#######################
+
+vtiger CRM 4.2 Alpha
+May 31, 2005
+
+#######################
+
+We are pleased to announce the latest version of vtiger CRM. This release includes many new features and few bug fixes!
+
+******************************************************************************************
+Note: vtiger CRM 4.2 Alpha is only for testing and can not be used for production purpose.
+
+Please post Bugs at the following URL:
+
+vtiger Discussions: http://www.vtiger.com/discussions/viewforum.php?f=12
+
+******************************************************************************************
+
+New Features
+
+1. Quotes module
+2. Order Management module (Purchase Orders & Sales Orders)
+3. Invoices module
+4. Price Books 
+5. Vendor/Suppliers Management
+6. Customizable Reports
+7. Customizable List Views
+8. Customer Self-service Portal
+9. RSS module
+10. Event Reminders
+11. Configurable Email Notifications
+12. Incoming Email Support
+
+--------------------
+vtiger CRM 4.0.1
+April 29, 2005
+
+We are pleased to announce the latest version of vtiger CRM. This release
+includes some of the new features and numerous bug fixes!
+
+-------------
+New Features
+-------------
+
+1) Default Organisation Fields - Fields that are not needed can be made hidden across the organisation. 
+2) Multiple Date format support.
+3) Currency Support.
+4) Customer Portal Beta Release - as an add on.
+
+----------
+Bug Fixes
+----------
+
+1) When time like '1:00' is given as input in new event, instead of '01:00',
+an expection will be thrown in the calendar
+2) Php warning fixes - contributed by joduba.
+3) 'Sales Stage' column empty in Potentials table for Contacts and Accounts
+Detail view.
+4) Calendar icons not working in homepage in my pipline chart.
+5) Delete confirmation for notes and attachments in all modules Related list.
+6) Select Contact from Popup after navigation throws exception.
+7) Duplicate entry in Notes listview, when created from Ticket Module.
+8 Added 'Contact' in HelpDesk List View.
+9) Issue in Description Update across modules when saved during edition.
+10) Problem in Notes Update, when no attachment is given.
+11) When a Custom field contains space, export query fails.
+12) Intialising 'log_sql' variable in config.php - php warning fix
+13) Show tickets in Detailview / Related listof contacts.
+14) In Help Desk search 'Status' & 'Priority' given as combo.
+15) Note Title should not be unique.
+16) Problem in importing more than 1000 records.
+17) In Email template big text is not supported
+18 Paragraph support in email template
+19) Amount size entry should be increased in Potentials (increase the digits)
+20) Duplicate Email template entry when editing a template.
+21) Notes and Attachment title/description display in related list
+22) When selected a username in the popup window after search from
+Activity/Email Detail View an exception is thrown.
+23) After email export, the body field in document is empty.
+24) Problem in HelpDesk Search based on Created Date.
+25) When assigned, Contact Salutation type in email template, and used in
+select email template, salutation type is empty.
+26) Sorted by 'Contact' in Ticket List View.
+27) Title field not validated when creating a new ticket
+28) My Account' link in login page throws exception
+29) Usename/creator will shown in all events in Calendar
+30) In Account Advance Search 'State' field empty after giving a value to
+search.
+31) In Home Page my groups all the group entities are displayed
+32) In Home Page My Activities, the Activity Link is not working.
+33) The Group Name link is the User Detail View not working.
+34) Email fiele length in accounts table modified from 30 to 100
+35) Check Box custom field Search not working
+36) Product search fields are interchaged between Basic and Advanced.
+commision rate & Qty/Unit -- Moved from Basic to Advanced. Manufacturer &
+category -- Moved from Advanced to Basic
+37) Improper Link issue in Popup after search.
+38) In Home Page My Tickets - Related to Contacts link are not working.
+39) Unwanted includes in Calendar Removed
+40) Sorting of Potentials in Home Page(Amount in Descending order)
+41) Login History - improper login/logout time
+42) Email Form Validation
+43) Pipleline total not getting updated.
+44) In Email List View displaying of Contact Issue.
+45) Enabling Status for Call and Meetings.
+46) Removing Notes, Products from Default Organisation Sharing.
+47) Populating modified time during entity creation.
+48) Edit and Duplicate of Attachments not working.
+49) Displaying of Closed Ticket in Home Page.
+50) Deleted entities are getting listed in Tracker.
+51) Enabling History tabs in Leads, Contacts, Accounts and Potentials for
+Activity History.
+
+
+--------------------
+vtiger CRM 4
+March 29, 2005
+
+We are pleased to announce the latest version of vtiger CRM. This release includes several new features and numerous bug fixes!
+
+-------------
+New Features
+-------------
+
+A. General
+
+1. Database layer is redesigned for a better data integrity
+
+2. Multiple database support for MySQL, Oracle, MSSQL, and Postgres through ADOdb (We have tested in MySQL and Oracle only)   
+3. Microsoft Office Plug-in to create mail merge templates in Microsoft Word and create on-the-fly documents with customer specific data in vtiger CRM
+
+4. Mozilla Thunderbird Plug-in to add E-mail messages and addresses from Thunderbird to vtiger CRM
+
+5. E-mail notifications to vtiger CRM users as well as customers instantly as well as periodically
+
+6. Search enabled for all the fields (including custom fields) in various modules
+
+7. Database migration from version 3.2 to version 4
+
+8. Accessories, such as World Clock and Calculator
+
+B. Lead Management
+
+1. Filter leads list in Leads home page based on lead status
+
+2. Change leads owner in bulk
+
+3. Export Leads into Spreadsheet programs
+
+C. Account Management
+
+1. Filter accounts list in Accounts home page based on type of the account
+
+2. Delete accounts in bulk
+
+3. Change accounts owner in bulk
+
+D. Contact Management
+
+1. Delete contacts in bulk
+
+2. Change contacts owner in bulk
+
+3. Create mail merge documents for contacts   
+
+E. Opportunity Management
+
+1. Notification of Big deals to the specific users/non users
+
+2. Filter opportunities list in Opportunities home page based on the sales stage
+
+3. Delete opportunities in bulk
+
+F. Help desk
+
+1. Automatically generate ticket ID while creating trouble tickets
+
+2. Filter trouble tickets list in Help desk home page based on the priority of the ticket
+
+3. Add/Modify custom fields in Help desk
+
+G. Products
+
+1. Enhanced the standard fields based on users feedback
+
+2. Add/Modify custom fields in Products
+
+H. Activity Management
+
+1. All the activities (Tasks, Calls, and Meetings) can be managed in a Activities module 
+
+2. Calendar user interface is enhanced, with a small calendar in Home page
+
+3. Synchronize calendar records with Microsoft Outlook  
+
+I. Studio:
+
+1. Add custom fields in Helpdesk and Products modules
+
+2. Modify the custom pick list values in all the modules
+
+3. Custom objects for URL and boolean types
+
+4. Enhanced user interface for product customization 
+	
+J. Communication Templates:
+
+1. Mail Merge Templates to create on-the-fly Microsoft Word documents based on customer data
+
+2. Canned E-mail Notifications through Linux Cron Job/Window Scheduler:
+
+K. Security Management
+
+1. Manage Profiles and associate to the roles
+
+2. Module level access control list for profiles
+
+3. Field level access control list for profiles
+
+4. Organization level record sharing model
+
+5. User management from Settings module
+
+L. System Administration
+
+1. Outgoing Email server configuration
+
+2. Database backup server configuration
+
+We have also provided the following features requested in Sourceforge.net and vtiger Discussions:
+
+SourceForge
+
+1. 1157343: Custom fields for tickets
+
+2. 1108850:  Mozilla Thunderbird (Non-MS Outlook) Plugin
+
+3. 1069886: PostgreSQL Support
+
+4. 1050500: HelpDesk or Trouble ticketing
+
+
+vtiger Discussions
+
+1. RC1 - Leads : Sorting Lead List - by eberled
+
+2. Database management (database backup) - by eberled and ITPM
+
+3. Enable/Disable Import/Export features according to the user's profile - by bwoo and fredy
+
+4. Small Calendar in Home page
+
+5. Department instead of Account in Contact list - by joduba
+
+6. Delete contacts in bulk - by david and Bez
+
+7. Delete users - by Jim
+
+8. ACL on data - Stefano
+
+9. Groups and user level security - by Jay McDonald
+
 ----------------
-
-After several months of working on our CRM solution, based on Apache, MySQL
-and other open source components, we came across a SourceForge open source
-project initiated by SugarCRM, having the same vision, and doing something
-very similar to what we were doing. They started out with the same promise
-we did, namely that CRM software is needlessly expensive, and hosted offerings
-only pretend to be affordable. While we were getting ready with our offering,
-the open source project had already launched it; the underlying infrastructure
-of Apache and MySQL was similar to what we were doing, and most importantly,
-the SugarCRM Public License allowed us to create distributions based on this
-code (SPL - a copy of Version 1.1.2 is found here, and the URL is at
-http://www.sugarcrm.com/home/content/view/35/86/) we decided it would be even
-faster to adopt that as our core and add value on top, an example of open
-source based collaboration.
-
-We gratefully acknowledge the contribution made by SugarCRM, and we intend to
-actively participate and lead in bringing this vision of affordable enterprise
-applications, but we make it clear that vtiger is not affiliated with nor is
-endorsed by SugarCRM.
-
-Please feel free to send your valuable comments to contact at vtiger.com so that
-we can have a better CRM product at free of cost. Check out our website at
-http://www.vtiger.com for support forums, detailed product information,
-our future plan and much more.
-
-software requirements
+Important Notes
+----------------
+
+* We have tested vtiger CRM 4 in MySQL and Oracle database software. Though we didn't tested in other database software, we feel it should work.
+
+* Cases Module is phased out (Help desk module take care of all the customer support related features)
+
+* Opportunities module is renamed as Potentials
+
+* Tasks, Calls and, Meetings modules are phased out (Activities module take care of all the tasks and events related features)
+----------
+Bug Fixes
+----------
+
+We have fixed the following issues reported in Sourceforge.net and vtiger Discussions:
+
+SourceForge.net
+----------------
+
+1. 1087474: suggestion
+
+2. 1169597: Tab Order in data entry is inconvenient
+
+3. 1158945: Cancel button behavior 2
+
+4. 1158943: Cancel button behavior
+
+5. 1161346: RC1 - Custom field Date not working
+
+6. 1157577: Account View -- Contact Name
+
+7. 1158932: RC1- Need "Select Product" on Potentials
+
+8. 1158934: RC1 - Need select multiple products on Activities
+
+9. 1158934:  RC1 - Need select multiple products on Activities - Richie Please check it is promised in sf.net
+
+10. 1160628: Deleted tickets are still visible in the account overview
+
+11. 1160522: minor issues in RC 1
+
+12. 1157581: BusinessCard.php
+
+13. 1158473: double $contact_id definition in modules/Calendar/UserCalend
+
+14. 1157587: website character needs to be longer
+
+15. 1157583: redirection limit for url exceeded
+16. 1156560: Single quotation mark not handled when creating new note
+
+17. 1069310: Time out during contact import
+
+18. 1156463: Outlook Plug-in Error: wrong encryption string
+
+19. 1111432: Meetings get duplicated views after editing
+
+20. 1152457: V3.2 Log-In Recognition
+
+21. 1151958: Leads "Change Status" button doesn't work
+
+22. 1151793: Editing lead errors
+
+23. 1145907: exporting xls to leads -
+
+24. 1087484: user deleted problem
+
+25. 1122448: export of opportunities
+
+26. 1122446: upload file size hardwired
+
+27. 1119621: PHP Error when cancelling editing of a ticket
+
+28. 1116923: Custom contacts import fails if no last name specified
+
+29. 1116919: CVS Import bombs when data contain single quote
+
+30. 1032651: New Attachment - Error message
+
+
+vtiger Discussions
+------------------
+ 
+1. Displaying the corresponding lead in Meeting/Call/Task modules
+
+2. Activity - missing confirmation on deleting activities - by fredy
+
+3. RC1 - Potentials "Only my items" not working - by eberled
+
+4. RC1 - Potentials sorting tables returns an error - by eberled
+
+5. RC1 Helpdesk - 'Assigned to' vs. 'Group' - by eberled
+
+6. RC1 - Helpdesk: Changing a ticket doesn't work - by eberled
+
+7. RC1- Homepage / Helpdesk : all tickets are listed - by eberled
+
+8. RC1 - Helpdesk : Account and Contact Name - by eberled
+
+9. RC1- Settings: Communication Templates - by eberled
+
+10. Unable to tab - by 829
+
+11. Email to Contacts and Mass Mail - by Jay
+
+12. blank.gif doesnt display - by timb
+
+13. RC1 - Product commission rate needs decimal field -by dchaffee
+
+14. RC1 - Potentials sorting tables returns an error - by eberled 
+
+15. Bugs in table insert statements during a new installation - by pab63
+
+16. RC1 - Selecting a contact shows only name and no firstname - by eberled
+
+17. Problem installing on subdomain - by cyberox
+
+18. help desk trouble ticket - by 829
+
+19. RC1 - Admin-Page: Empty Link in top right corner - by eberled
+
+20. RC1 - Admin Page: Wrong mail server password shown - by eberled
+
+21. RC1 - Admin : Creating User ( input field tab order) -by eberled 
+ 
+22. Accentuated characters - by bigtime
+
+23. Can't create new leads, contacts, accounts - by Peter - 
+
+24. RC1 - Admin : Show users related to a group not working - by eberled
+
+25. RC1 - Account : Description Information - by eberled
+
+26. RC1- Accounts : Searching for - by eberled
+
+27. RC1 - Leads : Input field tab order - by eberled
+
+28. RC1 - Leads : Input field for postalcode to large - by eberled
+
+29. vtiger DIscussions: RC1 - Accounts : Please show first name under contacts - by eberled
+
+30. RC1 - Contacts: Notes not created using 'Add buisness Card' - by eberled
+
+31. RC1 - Contacts : Advanced search - by eberled
+
+32. RC1 - Potentials: Expected Close Date - by eberled
+
+33. RC1 - Helpdesk : Searching - by eberled
+
+34. RC1 - Helpdesk : Searching II - by eberled
+
+35. RC1 - Accounts Detailview : empty 'Last modified date' - by eberled
+
+36. Problems with Thunderbird plugin - by mike
+
+37. vTiger CRM 4 (RC1) - Save Record Failure -
+
+38. User withread-only access to the contacts. However this user can easily 'mass delete' all contacts.
+  
+39. Unable to install Outlook plugin 4 RC 1 - by Christian
+
+40. RC1 Thunderbird plugin doesn\'t work
+
+41. Calculator bug - by 829
+
+42. Outlook Plugin Issues (outlook 2003) - by adrian
+
+43. vtiger Outlook Plugin 4.0.1 beta Release - by adrian
+
+44. CRM 4 RC1 problem or not? - 
+
+45. Problem installing RC1 - by stelaix
+
+46. Install Errors in step 5 - by pab
+
+47. Some Contact fields not synching - by Tareef
+
+48. vtiger v4 - How do you add a manufacturer? - 
+
+49. Contacts in vtiger Outlook related - Maarten
+
+50. RC1 - Product search to include Category, Manufacturer - by dchaffee
+
+51. RC1 - Products - No way to update product category field - by dchaffee
+
+52. Product commission rate needs decimal field - by dchaffee
+
+53. RC1 - New Notes for Tickets - by nuguid
+
+54. RC1 - Settings: Picklist - by eberled
+
+55. RC1- Settings : Helpdesk Picklist doesn't work - by eberled
+
+56. RC1 - Setting : Picklist values for Sales Stages - by eberled
+
+57. RC1 - Home : My Group Allocation - by eberled
+
+58. RC1 - Page Admin - by eberled
+
+
+
+Known Issues
+
+1. 1111896: Outlook raises a security alert when adding email with vtiger Outlook Plug-in
+
+2. In Windowos OS, System Inoformantion is not displayed
+
+3. While importing leads, accounts, contacts, and potentials the XLS file format can be browsed even though the allowed file format is CSV.
+ 
+----------------------------
+vtiger CRM 4 Beta
+January 10, 2005
+
+We are pleased to announce the latest version of vtiger CRM.
+
+New Features:
+
+1. Help Desk module to handle trouble tickets, Frequently Asked Questions and Support Statistics
+
+2. Products module to add company wide products related information at a centralized location
+
+3. Mail merge Templates
+
+4. Sending Mass E-mails to contacts
+
+5. Delete attachments
+
+6. Add/Sync Email attachments using vtiger Outlook Plug-in from Microsoft(R) Outlook(R) to vtiger CRM
+
+7. Add/Sync tasks using vtiger Outlook Plug-in from Microsoft(R) Outlook(R) to vtiger CRM
+
+8. Creating Groups and assigning users to groups
+
+9. Assigning leads/tickets to groups/individuals
+
+10. New theme 'Blue' has been added
+
+
+Issues Fixed:
+
+We have fixed the following issues reported in Sourceforge.net:
+
+1. 1093648 - Attachment contains extra footer
+
+2. 1097245 - Email Field in Leads - 25 chars
+
+3. 1093120 - User name doesn't appear in meetings
+
+4. 1090718 - Meeting User - Unable to remove
+
+5. 1092763 - Meeting attendee list does not list user's Name
+
+6. 1094922 - New Attachment - Error Message
+
+7. 1089207 - problem in emails
+
+8. 1089136 - need attachment
+
+9. 1037521 - Attachment/Import - Error message
+
+10. 1032707 - Unable to view/Save the Attachments
+
+11. 1019074 - handle mysql data
+
+12. 1028989 - Print Problem
+
+13. 1085617 - Wrong focus after deleting cases/contacts/opportunities
+
+14. 1089627 - Problem with vtiger. 25 Character email limit
+
+15. 1090721 - Meeting Contact - Unable to remove
+
+16. 1090279 - Export Custom Fields - Not working
+
+17. 1098475: Contacts: Field TITLE is too short
+
+18. 1093669 - Delete attachments
+
+19. Support for Latest versions of Apache and MySQL in installation wizard (Both Linux and Windows).
+
+----------------------------
+
+vtiger CRM 3.2.1
+December 21, 2004
+
+We are pleased to announce the latest version of vtiger CRM.
+
+New Features:
+
+1. Basic Calendar support
+2. German and Dutch Languages Support
+
+Issues Fixed:
+
+a) Duration minutes in calls not getting saved when a new call is created is fixed. 
+ 
+b) On deleting any entity, the Leads List View page getting displayed is fixed. 
+ 
+c) Internationalisation support for Custom Fields provided. 
+ 
+d) Internationalistaion support for Pick List Value Customization provided. 
+ 
+e) Quick create form is getting displayed now. 
+ 
+f) Empty Line Space appearing between the heading and List view table in module Lead and MessageBoard is fixed 
+ 
+g) Proper Message display is done when a user with no delete privileges tries to delete the entity.
+
+h) vtiger Outlook Plug-in in server side fixes related to performance improvement.
+
+
+---------------------------
+vtiger CRM 3.2
+December 13, 2004
+
+We are pleased to announce the latest version of vtiger CRM.
+
+New Features:
+
+a) Custom Field Support 
+
+b) Security Support 
+
+c) Migration from 3.0 to 3.2 
+
+----------------------------
+
+vtiger CRM 3
+November 8, 2004
+
+We are pleased to announce the latest version of vtiger CRM.
+
+New features:
+
+a) Support for accessing vtiger CRM server from Microsoft Outlook behind Proxy settings
+
+b) Synchronize customer specific tasks in between Microsft Outlook and vtiger CRM.
+
+c) Integrated Message Boards with vtiger CRM, which can be used to share customer knowledge among CRM service users.
+
 ---------------------
-PHP 4.x, MySQL 4.x, Apache 1.x or 2.x
-
-For more details please refer:
-http://www.vtiger.com/wiki/index.php/Vtiger_CRM_4.2.3_-_Installation_Guide
+
+vtiger CRM 3.0 Beta
+October 7, 2004
+
+We are pleased to announce the latest version of vtiger CRM.
+
+The new features are:
+
+a) Released vtiger Outlook Plug-in, business productivity enhancement utility for Microsoft Outlook users. It is an open source project covered under vtiger Public License 1.0 based on Mozilla Public License 1.1. 
+
+---------------------
+vtiger CRM 2.0
+September 6, 2004
+
+We are pleased to announce the latest version of vtiger CRM.
+
+The new features are:
+
+a) DRAG and DROP of the tabs!!
+This was achieved after working for quite a long time in the labs, not to
+mention many sleepless nights!.
+By using this feature, you can customize the tabs that you want to work with.
+Do let us know what you feel about it.
+
+b) Lead Management
+
+Sales reps can create leads and initiate the CRM cycle.
+We have tried to incorporate all the required features during this short period.
+Do let us know if you would like to see some more features.
+
+c) Import Leads from External Sources
+
+Sales reps can import leads to vtiger CRM from external sources, such as Microsoft Outlook, 
+ACT, GoldMine, and others in *.XLS file format. This feature eliminates the manual
+data entry and enhances the Sales rep's productivity.
+
+d) Attach Files
+
+Sales reps can attach sales-related materials, such as marketing collaterals, presentations,
+price quotes, and others, so that they can instantly access the related documents while 
 dealing with leads/opportunities, accounts, and contacts.
 
+Send your feedback, which is vital for our understanding your needs.
+
+-------------------------------------------------------------------------------------------------------------
+vtiger CRM 1.0
+August 26, 2004
+
+-=Overview=-
+
+After several months of working on our CRM solution, based on Apache, MySQL and other open source components, we came across a SourceForge open source project initiated by SugarCRM, having the same vision, and doing something very similar to what we were doing. They started out with the same premise we did, namely that CRM software is needlessly expensive, and hosted offerings only pretend to be affordable. While we were getting ready with our offering, the open source project had already launched it; the underlying infrastructure of Apache and MySQL was similar to what we were doing, and most importantly, the SugarCRM Public License allowed us to create distributions based on this code (SPL - a copy of Version 1.1.2 is found here, and the URL is at http://www.sugarcrm.com/home/content/view/35/86/) we decided it would be even faster to adopt that as our core and add value on top, an example of open source based collaboration.
+
+We gratefully acknowledge the contribution made by SugarCRM, and we intend to actively participate and lead in bringing this vision of affordable enterprise applications, but we make it clear that vtiger is not affiliated with nor is endorsed by SugarCRM.
+
+The team at vtiger CRM is pleased to announce the v1.0 the first release of vtiger CRM Open Source project.
+
+This first release of vtiger.Sales is best suited for small sales forces.  If
+you're looking to manage the basics of sales deals where every user can see
+all of the data in the system, then vtiger.Sales v1.0 is right for you.  Over the next few months, we will be building out vtiger.Sales to meet the needs of larger, multi-national sales forces that need features like forecasting, data access permissions and internationalization.
+
+Please feel free to send your valuable comments to contact at vtiger.com so that we can have a better CRM product at free of cost. Check out our website at http://www.vtiger.com for support forums, detailed product information, our future plan and much more.  
+
+-=Features=-
+We have incorporated the following features in this release based on SugarCRM. 
+
+Opportunities
+vtiger.Sales provides a complete, yet easy-to-use Opportunities module.  From deal size to each contact?s role, from listing the competitors to tracking the lead source, sales reps can easily manage each sales opportunity to completion.  
+
+Accounts & Contacts
+With the Accounts & Contacts module, you can easily enter and update key account and contact information. Tracking and staying in touch with your customers is simply a click away. 
+
+Activity & Task Management
+Managing your customer interactions is at the heart of a sales automation application. vtiger.Sales provides a simple and clean set of tools for quickly tracking tasks, phone calls, emails and meetings. 
+
+Notes & Attachments
+Easily keep notes on every contact, opportunity or account. 
+
+Home Screen 
+Focus on the right activities with a quick view of your top opportunities, pipeline, today's appointments and task list.
+
+Dashboard 
+A picture is always worth a thousand words.  With the dashboard module, you can graphically view how your opportunities  breakdown by sales stage or industry.
+
+Administration 
+Easily manage all the users in the system, their passwords, user interface themes and more. 
+




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 07:40:21 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 11:40:21 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6931 -
 /vtigercrm/trunk/modules/Dashboard/display_charts.php
Message-ID: <20060607114021.3E24D7E85B7@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 05:40:17 2006
New Revision: 6931

Log:
i18n updated for dashboard module - ahmed

Modified:
    vtigercrm/trunk/modules/Dashboard/display_charts.php

Modified: vtigercrm/trunk/modules/Dashboard/display_charts.php
==============================================================================
--- vtigercrm/trunk/modules/Dashboard/display_charts.php (original)
+++ vtigercrm/trunk/modules/Dashboard/display_charts.php Wed Jun  7 05:40:17 2006
@@ -17,7 +17,7 @@
         include("modules/Dashboard/pie_graph.php");
 	
 global $tmp_dir;
-
+global $mod_strings,$app_strings;
 
 $period=($_REQUEST['period'])?$_REQUEST['period']:"tmon"; // Period >> lmon- Last Month, tmon- This Month, lweek-LastWeek, tweek-ThisWeek; lday- Last Day 
 $type=($_REQUEST['type'])?$_REQUEST['type']:"leadsource";
@@ -71,22 +71,22 @@
         * Contributor(s): ______________________________________..
  */
 $graph_array = Array(
-          "leadsource" => "Leads By Source",
-          "leadstatus" => "Leads By Status",
-          "leadindustry" => "Leads By Industry",
-          "salesbyleadsource" => "Sales by LeadSource",
-          "salesbyaccount" => "Sales by Accounts",
-          "accountindustry" => "Account By Industry",
-          "productcategory" => "Products by Category",
-          "sobyaccounts" => "Sales Order by Accounts",
-          "sobystatus" => "Sales Order by Status",
-          "pobystatus" => "Purchase Order by Status",
-          "quotesbyaccounts" => "Quotes by Accounts",
-          "quotesbystage" => "Quotes by Stage",
-          "invoicebyacnts" => "Invoices by Accounts",
-          "invoicebystatus" => "Invoices by status",
-          "ticketsbystatus" => "Tickets by status",
-          "ticketsbypriority" => "Tickets by Priority",
+	  "leadsource" => $mod_strings['leadsource'],
+          "leadstatus" => $mod_strings['leadstatus'],
+          "leadindustry" => $mod_strings['leadindustry'],
+          "salesbyleadsource" => $mod_strings['salesbyleadsource'],
+          "salesbyaccount" => $mod_strings['salesbyaccount'],
+          "accountindustry" => $mod_strings['accountindustry'],
+          "productcategory" => $mod_strings['productcategory'],
+          "sobyaccounts" => $mod_strings['sobyaccounts'],
+          "sobystatus" => $mod_strings['sobystatus'],
+          "pobystatus" => $mod_strings['pobystatus'],
+          "quotesbyaccounts" => $mod_strings['quotesbyaccounts'],
+          "quotesbystage" => $mod_strings['quotesbystage'],
+          "invoicebyacnts" => $mod_strings['invoicebyacnts'],
+          "invoicebystatus" => $mod_strings['invoicebystatus'],
+          "ticketsbystatus" => $mod_strings['ticketsbystatus'],
+          "ticketsbypriority" => $mod_strings['ticketsbypriority'],
           );
 function get_graph_by_type($graph_by,$graph_title,$module,$where,$query)
 {
@@ -139,7 +139,7 @@
 {
 
 	global $tmp_dir;
-     global $graph_title;
+     global $graph_title, $mod_strings;
 	$val=explode(":",$title); 		
 	$display_title=$val[0];	
 			
@@ -151,7 +151,7 @@
  		   <td nowrap><span class=genHeaderSmall>".$graph_title."</span></td>
  		 </tr>
    		 <tr>
-		   <td><span class=big>Horizontal Bar Chart</span> </td>
+		   <td nowrap><span class=big>".$mod_strings['LBL_HORZ_BAR_CHART']."</span> </td>
 		 </tr>
 		</table>
   	   </td>
@@ -197,7 +197,7 @@
  		   <td nowrap><span class=genHeaderSmall>".$graph_title."</span></td>
  		 </tr>
    		 <tr>
-		   <td><span class=big>Pie Chart</span> </td>
+		   <td><span class=big>".$mod_strings['LBL_PIE_CHART']."</span> </td>
 		 </tr>
 		</table>
   	   </td>
@@ -342,7 +342,7 @@
     <td width="20%" nowrap valign="top">
 		<table width="100%"  border="0" cellspacing="0" cellpadding="0" bgcolor="#DFDFDF">
           	<tr><td class="dashMnuUnSel">
-                    <a href="index.php?module=Dashboard&action=index&type=dashboardhome">Dashboard Home</a>
+                    <a href="index.php?module=Dashboard&action=index&type=dashboardhome"><? echo $mod_strings['LBL_DASHBRD_HOME'];?></a>
                </td></tr>              
                <?php 
                  $mnuHTML = "";
@@ -375,7 +375,7 @@
                     if(($type == "leadsource") && (getFieldVisibilityPermission('Leads',$user_id,'leadsource') == "0"))
                     {
                     	$graph_by="leadsource";
-                    	$graph_title="Leads By Source";
+                    	$graph_title= $mod_strings['leadsource'];
                     	$module="Leads";
                     	$where="";
                     	$query=$leads_query;                   
@@ -386,7 +386,7 @@
                     elseif (($type == "leadstatus")&& (getFieldVisibilityPermission('Leads',$user_id,'leadstatus') == "0"))
                     {
                     	$graph_by="leadstatus";
-                    	$graph_title="Leads By Status";
+                    	$graph_title= $mod_strings['leadstatus'];
                     	$module="Leads";
                     	$where="";
                     	$query=$leads_query;
@@ -396,7 +396,7 @@
                     elseif (($type == "leadindustry") && (getFieldVisibilityPermission('Leads',$user_id,'industry') == "0"))
                     {
                     	$graph_by="industry";
-                            $graph_title="Leads By Industry";
+                            $graph_title=$mod_strings['leadindustry'];
                             $module="Leads";
                             $where="";
                             $query=$leads_query;
@@ -406,7 +406,7 @@
                     elseif (($type == "salesbyleadsource")&& (getFieldVisibilityPermission('Potentials',$user_id,'leadsource') == "0"))
                     {
                             $graph_by="leadsource";
-                            $graph_title="Sales by LeadSource";
+                            $graph_title=$mod_strings['salesbyleadsource'];
                             $module="Potentials";
                             $where=" and potential.sales_stage like '%Closed Won%' ";
                             $query=$potential_query;
@@ -416,7 +416,7 @@
                     elseif (($type == "salesbyaccount") && (getFieldVisibilityPermission('Potentials',$user_id,'account_id') == "0"))
                     {
                     	$graph_by="accountid";
-                         $graph_title="Sales by Accounts";
+                         $graph_title=$mod_strings['salesbyaccount'];
                          $module="Potentials";
                          $where=" and potential.sales_stage like '%Closed Won%' ";
                          $query=$potential_query;
@@ -426,7 +426,7 @@
                     elseif (($type == "accountindustry") && (getFieldVisibilityPermission('Accounts',$user_id,'industry') == "0"))
                     {
                     	$graph_by="industry";
-                            $graph_title="Account By Industry";
+                            $graph_title=$mod_strings['accountindustry'];
                             $module="Accounts";
                             $where="";
                             $query=$account_query;
@@ -436,7 +436,7 @@
                     elseif (($type == "productcategory") && (getFieldVisibilityPermission('Products',$user_id,'productcategory') == "0"))
                     {
                     	$graph_by="productcategory";
-                            $graph_title="Products by Category";
+                            $graph_title=$mod_strings['productcategory'];
                             $module="Products";
                             $where="";
                             $query=$products_query;
@@ -446,7 +446,7 @@
                     elseif (($type == "sobyaccounts") && (getFieldVisibilityPermission('SalesOrder',$user_id,'account_id') == "0"))
                     {
                     	$graph_by="accountid";
-                            $graph_title="Sales Order by Accounts";
+                            $graph_title=$mod_strings['sobyaccounts'];
                             $module="SalesOrder";
                             $where="";
                             $query=$so_query;
@@ -456,7 +456,7 @@
                     elseif (($type == "sobystatus") && (getFieldVisibilityPermission('SalesOrder',$user_id,'sostatus') == "0"))
                     {
                             $graph_by="sostatus";
-                            $graph_title="Sales Order by Status";
+                            $graph_title=$mod_strings['sobystatus'];
                             $module="SalesOrder";
                             $where="";
                             $query=$so_query;
@@ -466,7 +466,7 @@
                     elseif (($type == "pobystatus") && (getFieldVisibilityPermission('PurchaseOrder',$user_id,'postatus') == "0"))
                     {
                             $graph_by="postatus";
-                            $graph_title="Purchase Order by Status";
+                            $graph_title=$mod_strings['pobystatus'];
                             $module="PurchaseOrder";
                             $where="";
                             $query=$po_query;
@@ -476,7 +476,7 @@
                     elseif (($type == "quotesbyaccounts") && (getFieldVisibilityPermission('Quotes',$user_id,'account_id') == "0"))
                     {
                             $graph_by="accountid";
-                            $graph_title="Quotes by Accounts";
+                            $graph_title= $mod_strings['quotesbyaccounts'];
                             $module="Quotes";
                             $where="";
                             $query=$quotes_query;
@@ -486,7 +486,7 @@
                     elseif (($type == "quotesbystage") && (getFieldVisibilityPermission('Quotes',$user_id,'quotestage') == "0"))
                     {
                             $graph_by="quotestage";
-                            $graph_title="Quotes by Stage";
+                            $graph_title=$mod_strings['quotesbystage'];
                             $module="Quotes";
                             $where="";
                             $query=$quotes_query;
@@ -496,7 +496,7 @@
                     elseif (($type == "invoicebyacnts") && (getFieldVisibilityPermission('Invoice',$user_id,'account_id') == "0"))
                     {
                             $graph_by="accountid";
-                            $graph_title="Invoices by Accounts";
+                            $graph_title=$mod_strings['invoicebyacnts'];
                             $module="Invoice";
                             $where="";
                             $query=$invoice_query;
@@ -506,7 +506,7 @@
                     elseif (($type == "invoicebystatus") && (getFieldVisibilityPermission('Invoice',$user_id,'invoicestatus') == "0"))
                     {
                             $graph_by="invoicestatus";
-                            $graph_title="Invoices by status";
+                            $graph_title=$mod_strings['invoicebystatus'];
                             $module="Invoice";
                             $where="";
                             $query=$invoice_query;
@@ -516,7 +516,7 @@
                     elseif (($type == "ticketsbystatus") && (getFieldVisibilityPermission('HelpDesk',$user_id,'ticketstatus') == "0"))
                     {
                             $graph_by="ticketstatus";
-                            $graph_title="Tickets by status";
+                            $graph_title=$mod_strings['ticketsbystatus'];
                             $module="HelpDesk";
                             $where="";
                             $query=$helpdesk_query;
@@ -526,7 +526,7 @@
                     elseif (($type == "ticketsbypriority") && (getFieldVisibilityPermission('HelpDesk',$user_id,'ticketpriorities') == "0"))
                     {
                             $graph_by="priority";
-                            $graph_title="Tickets by Priority";
+                            $graph_title=$mod_strings['ticketsbypriority'];
                             $module="HelpDesk";
                             $where="";
                             $query=$helpdesk_query;




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 07:41:54 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 11:41:54 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6932 -
 /vtigercrm/trunk/Smarty/templates/Settings/Announcements.tpl
Message-ID: <20060607114154.016067E85B7@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 05:41:51 2006
New Revision: 6932

Log:
ajax functionality has been modified

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 Jun  7 05:41:51 2006
@@ -12,19 +12,21 @@
 <script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
 {literal}
 <script>
-function ajaxSaveResponse(response)
-{
-	document.getElementById("announcement").innerHTML=response.responseText;
-	hide("an_busy");
-}
 function Announcement()
 {
-	show("an_busy");
-	var ajaxObj = new VtigerAjax(ajaxSaveResponse);
-	var announcement=document.getElementById("announcement").value;
-	//var title=document.getElementById("title_announce").value;
-	var urlstring = "module=Users&action=UsersAjax&announcement="+announcement+"&announce_save=yes";
-	ajaxObj.process("index.php?",urlstring);
+	$("an_busy").style.display="inline";
+	var announcement=$("announcement").value;
+	new Ajax.Request(
+	'index.php',
+        {queue: {position: 'end', scope: 'command'},
+       		method: 'post',
+	        postBody: 'module=Users&action=UsersAjax&announcement='+announcement+'&announce_save=yes',
+	        onComplete: function(response) {
+					$("announcement").innerHTML=response.responseText;
+					$("an_busy").style.display="none";
+                        	}
+	        }
+	);
 }
 </script>
 {/literal}




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 07:42:54 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 11:42:54 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6933 -
 /vtigercrm/trunk/Smarty/templates/Settings/EmailNotification.tpl
Message-ID: <20060607114254.645F47E85B7@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 05:42:50 2006
New Revision: 6933

Log:
ajax functionality has been modified

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 Wed Jun  7 05:42:50 2006
@@ -46,33 +46,39 @@
 <script>
 function fetchSaveNotify(id)
 {
-	hide('editdiv');
-	show('status');
-	var ajaxObj = new VtigerAjax(ajaxsavenotifyresponse);
-	var active = document.getElementById("notify_status").options[document.getElementById("notify_status").options.selectedIndex].value;
-	var subject = document.getElementById("notifysubject").value;
-	var body = document.getElementById("notifybody").value;
-	urlstring ='action=UsersAjax&module=Users&file=SaveNotification&active='+active+'&notifysubject='+subject+'&notifybody='+body+'&record='+id;
-	ajaxObj.process("index.php?",urlstring);
-}
-function ajaxsavenotifyresponse(response)
-{
-	hide("status");
-	document.getElementById("notifycontents").innerHTML=response.responseText;	
+	$("editdiv").style.display="none";
+	$("status").style.display="inline";
+	var active = $("notify_status").options[$("notify_status").options.selectedIndex].value;
+	var subject = $("notifysubject").value;
+        var body = $("notifybody").value;
+	new Ajax.Request(
+                'index.php',
+                {queue: {position: 'end', scope: 'command'},
+                        method: 'post',
+                        postBody: 'action=UsersAjax&module=Users&file=SaveNotification&active='+active+'&notifysubject='+subject+'&notifybody='+body+'&record='+id,
+                        onComplete: function(response) {
+                                $("status").style.display="none";
+				$("notifycontents").innerHTML=response.responseText;
+                        }
+                }
+        );
 }
 
 function fetchEditNotify(id)
 {
-	show('status');
-	var ajaxObj = new VtigerAjax(ajaxnotifyresponse);
-	urlstring ='action=UsersAjax&module=Users&file=EditNotification&record='+id;
-	ajaxObj.process("index.php?",urlstring);
-}
-function ajaxnotifyresponse(response)
-{
-	hide("status");
-	document.getElementById("editdiv").innerHTML=response.responseText;	
-	show("editdiv");
+	$("status").style.display="inline";
+	new Ajax.Request(
+                'index.php',
+                {queue: {position: 'end', scope: 'command'},
+                        method: 'post',
+                        postBody:'action=UsersAjax&module=Users&file=EditNotification&record='+id,
+                        onComplete: function(response) {
+                                $("status").style.display="none";
+                                $("editdiv").innerHTML=response.responseText;
+				$("editdiv").style.display="inline";
+                        }
+                }
+        );
 }
 </script>
 {/literal}




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 07:43:32 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 11:43:32 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6934 -
 /vtigercrm/trunk/Smarty/templates/Settings/InventoryNotify.tpl
Message-ID: <20060607114332.2972E7E85B7@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 05:43:28 2006
New Revision: 6934

Log:
ajax functionality has been modified

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

Modified: vtigercrm/trunk/Smarty/templates/Settings/InventoryNotify.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Settings/InventoryNotify.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Settings/InventoryNotify.tpl Wed Jun  7 05:43:28 2006
@@ -46,32 +46,37 @@
 <script>
 function fetchSaveNotify(id)
 {
-	hide('editdiv');
-	show('status');
-	var ajaxObj = new VtigerAjax(ajaxsavenotifyresponse);
-	var subject = document.getElementById("notifysubject").value;
-	var body = document.getElementById("notifybody").value;
-	urlstring ='action=UsersAjax&module=Users&file=SaveInventoryNotification&notifysubject='+subject+'&notifybody='+body+'&record='+id;
-	ajaxObj.process("index.php?",urlstring);
-}
-function ajaxsavenotifyresponse(response)
-{
-	hide("status");
-	//document.getElementById("notifycontents").innerHTML=response.responseText;	
+	$("editdiv").style.display="none";
+	$("status").style.display="inline";
+	var subject = $("notifysubject").value;
+        var body = $("notifybody").value;
+        new Ajax.Request(
+                'index.php',
+                {queue: {position: 'end', scope: 'command'},
+                        method: 'post',
+                        postBody: 'action=UsersAjax&module=Users&file=SaveInventoryNotification&notifysubject='+subject+'&notifybody='+body+'&record='+id,
+                        onComplete: function(response) {
+                                $("status").style.display="none";
+                        }
+                }
+        );
 }
 
 function fetchEditNotify(id)
 {
-	show('status');
-	var ajaxObj = new VtigerAjax(ajaxnotifyresponse);
-	urlstring ='action=UsersAjax&module=Users&file=EditInventoryNotification&record='+id;
-	ajaxObj.process("index.php?",urlstring);
-}
-function ajaxnotifyresponse(response)
-{
-	hide("status");
-	document.getElementById("editdiv").innerHTML=response.responseText;	
-	show("editdiv");
+	$("status").style.display="inline";
+	new Ajax.Request(
+                'index.php',
+                {queue: {position: 'end', scope: 'command'},
+                        method: 'post',
+                        postBody: 'action=UsersAjax&module=Users&file=EditInventoryNotification&record='+id,
+                        onComplete: function(response) {
+                                $("status").style.display="none";
+				$("editdiv").innerHTML=response.responseText;
+				$("editdiv").style.display="inline";
+                        }
+                }
+        );
 }
 </script>
 {/literal}




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 07:44:43 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 11:44:43 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6935 -
 /vtigercrm/trunk/Smarty/templates/Settings/ModuleOwners.tpl
Message-ID: <20060607114443.1DFE17E85B7@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 05:44:39 2006
New Revision: 6935

Log:
ajax functionality has been modified

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

Modified: vtigercrm/trunk/Smarty/templates/Settings/ModuleOwners.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Settings/ModuleOwners.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Settings/ModuleOwners.tpl Wed Jun  7 05:44:39 2006
@@ -11,13 +11,6 @@
 -->*}
 <script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
 <script language="JavaScript" type="text/javascript" src="include/js/ajax.js"></script>
-<script language="javascript">
-function ajaxmoduleresponse(response)
-{ldelim}
-	hide("status");
-	document.getElementById("module_list_owner").innerHTML=response.responseText;
-{rdelim}
-</script>
 <style type="text/css">@import url(themes/blue/style.css);</style>
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
 <tr>
@@ -52,17 +45,24 @@
 <script>
 function assignmodulefn(mode)
 {
-	show('status');
-	var ajaxObj = new VtigerAjax(ajaxmoduleresponse);
+	$("status").style.display="inline";
 	var urlstring ='';
 	for(i = 0;i < document.support_owners.elements.length;i++)
 	{
 		if(document.support_owners.elements[i].name != 'button')
 		urlstring +='&'+document.support_owners.elements[i].name+'='+document.support_owners.elements[i].value;
 	}
-	
-	urlstring +='&list_module_mode='+mode+'&file_mode=ajax';
-	ajaxObj.process("index.php?",urlstring);
+	new Ajax.Request(
+                'index.php',
+                {queue: {position: 'end', scope: 'command'},
+                        method: 'post',
+                        postBody: urlstring+'&list_module_mode='+mode+'&file_mode=ajax',
+                        onComplete: function(response) {
+                                $("status").style.display="none";
+				$("module_list_owner").innerHTML=response.responseText;
+                        }
+                }
+        );
 }
 </script>
 {/literal}




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 07:45:53 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 11:45:53 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6936 -
 /vtigercrm/trunk/Smarty/templates/Settings/PickList.tpl
Message-ID: <20060607114554.0E5EC7E85B7@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 05:45:50 2006
New Revision: 6936

Log:
ajax functionality has been modified

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 Wed Jun  7 05:45:50 2006
@@ -83,11 +83,6 @@
 	}
 }
 
-function ajachangeresponse(response)
-{
-	hide("status");
-	document.getElementById("picklist_datas").innerHTML=response.responseText;	
-}
 {/literal}
 </script>
 <style type="text/css">@import url(themes/blue/style.css);</style>
@@ -167,33 +162,52 @@
 <script>
 function SavePickList(fieldname,module)
 {
-	show('status');
-	Effect.Puff(document.getElementById('editdiv'),{duration:2});
-	var ajaxObj = new VtigerAjax(ajachangeresponse);
-	var body = document.getElementById("picklist_values").value;
-	urlstring ='action=SettingsAjax&module=Settings&directmode=ajax&file=UpdateComboValues&table_name='+fieldname+'&fld_module='+module+'&listarea='+body;
-	ajaxObj.process("index.php?",urlstring);
+	$("status").style.display="inline";
+	Effect.Puff($('editdiv'),{duration:2});
+	var body = $("picklist_values").value;
+	new Ajax.Request(
+        	'index.php',
+	        {queue: {position: 'end', scope: 'command'},
+        		method: 'post',
+		        postBody: 'action=SettingsAjax&module=Settings&directmode=ajax&file=UpdateComboValues&table_name='+fieldname+'&fld_module='+module+'&listarea='+body,
+		        onComplete: function(response) {
+					$("status").style.display="none";
+        				$("picklist_datas").innerHTML=response.responseText;
+	                        }
+        	}
+	);
 }
 function changeModule(pickmodule)
 {
-	show('status');
-	var ajaxObj = new VtigerAjax(ajachangeresponse);
+	$("status").style.display="inline";
 	var module=pickmodule.options[pickmodule.options.selectedIndex].value;
-	urlstring ='action=SettingsAjax&module=Settings&directmode=ajax&file=PickList&fld_module='+module;
-	ajaxObj.process("index.php?",urlstring);
+	new Ajax.Request(
+                'index.php',
+                {queue: {position: 'end', scope: 'command'},
+                        method: 'post',
+                        postBody: 'action=SettingsAjax&module=Settings&directmode=ajax&file=PickList&fld_module='+module,
+                        onComplete: function(response) {
+                                        $("status").style.display="none";
+                                        $("picklist_datas").innerHTML=response.responseText;
+                                }
+                }
+        );
 }
 function fetchEditPickList(module,fieldname)
 {
-	show('status');
-	var ajaxObj = new VtigerAjax(ajaxnotifyresponse);
-	urlstring ='action=SettingsAjax&module=Settings&mode=edit&file=EditComboField&fld_module='+module+'&fieldname='+fieldname;
-	ajaxObj.process("index.php?",urlstring);
-}
-function ajaxnotifyresponse(response)
-{
-	hide("status");
-	document.getElementById("editdiv").innerHTML=response.responseText;	
-	Effect.Grow('editdiv');
+	$("status").style.display="inline";
+	new Ajax.Request(
+                'index.php',
+                {queue: {position: 'end', scope: 'command'},
+                        method: 'post',
+                        postBody: 'action=SettingsAjax&module=Settings&mode=edit&file=EditComboField&fld_module='+module+'&fieldname='+fieldname,
+			onComplete: function(response) {
+                                        $("status").style.display="none";
+                                        $("editdiv").innerHTML=response.responseText;
+					Effect.Grow('editdiv');
+                	}
+                }
+        );
 }
 </script>
 {/literal}




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 07:47:34 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 11:47:34 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6937 -
	/vtigercrm/trunk/Smarty/templates/ListRoles.tpl
Message-ID: <20060607114734.32EC67E85B7@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 05:47:30 2006
New Revision: 6937

Log:
ajax functionality has been modified

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

Modified: vtigercrm/trunk/Smarty/templates/ListRoles.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ListRoles.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ListRoles.tpl Wed Jun  7 05:47:30 2006
@@ -160,8 +160,8 @@
 	
 	function put_child_ID(currObj)
 	{ldelim}
-			var move_Element = document.getElementById('Drag_content');
-	 		parentName  = document.getElementById(currObj).innerHTML;
+			var move_Element = $('Drag_content');
+	 		parentName  = $(currObj).innerHTML;
 			parentId = currObj;
 			move_Element.style.display = 'none';
 			hideAll = false;	
@@ -175,29 +175,28 @@
 			{ldelim}
 				childId = childId.replace(/user_/gi,'');
 				parentId = parentId.replace(/user_/gi,'');
-        			var ajaxObj = new VtigerAjax(ajaxSaveResponse);
-				
-                		var urlstring ="module=Users&action=UsersAjax&file=RoleDragDrop&ajax=true&parentId="+parentId+"&childId="+childId;
-        			ajaxObj.process("index.php?",urlstring);
+				new Ajax.Request(
+  					'index.php',
+				        {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+					        method: 'post',
+					        postBody: 'module=Users&action=UsersAjax&file=RoleDragDrop&ajax=true&parentId='+parentId+'&childId='+childId,
+						onComplete: function(response) {ldelim}
+							if(response.responseText != 'You cannot move a Parent Node under a Child Node')
+							{ldelim}
+						                $('RoleTreeFull').innerHTML=response.responseText;
+						                hideAll = false;
+							        parentId = "";
+						                parentName = "";
+						                childId ="NULL";
+								childName = "NULL";
+						        {rdelim}
+						        else
+						                alert(response.responseText);
+			                        {rdelim}
+				        {rdelim}
+				);
 			{rdelim}
 	{rdelim}
-
-
-	function ajaxSaveResponse(response)
-	{ldelim}
-        if(response.responseText != 'You cannot move a Parent Node under a Child Node')
-	{ldelim}
-                document.getElementById('RoleTreeFull').innerHTML=response.responseText;
-		hideAll = false;
-		parentId = "";
-		parentName = "";
-		childId ="NULL";
-		childName = "NULL";
-	{rdelim}
-        else
-                alert(response.responseText);
-	{rdelim}
-
 
 	function fnVisible(Obj)
 	{ldelim}




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 07:53:36 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 11:53:36 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6938 - in
 /vtigercrm/trunk/Smarty/templates/Inventory: InventoryCreateView.tpl
 InventoryDetailView.tpl InventoryEditView.tpl
Message-ID: <20060607115336.88E337E85CD@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 05:53:30 2006
New Revision: 6938

Log:
ajax functionality has been modified

Modified:
    vtigercrm/trunk/Smarty/templates/Inventory/InventoryCreateView.tpl
    vtigercrm/trunk/Smarty/templates/Inventory/InventoryDetailView.tpl
    vtigercrm/trunk/Smarty/templates/Inventory/InventoryEditView.tpl

Modified: vtigercrm/trunk/Smarty/templates/Inventory/InventoryCreateView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Inventory/InventoryCreateView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Inventory/InventoryCreateView.tpl Wed Jun  7 05:53:30 2006
@@ -23,23 +23,24 @@
 
 <script type="text/javascript">
 
-function ajaxResponse(response)
-{ldelim}
-        document.getElementById('autocom').innerHTML = response.responseText;
-        document.getElementById('autocom').style.display="block";
-        hide('vtbusy_info');
-{rdelim}
-
 function sensex_info()
 {ldelim}
-        var Ticker = document.getElementById('tickersymbol').value;
+        var Ticker = $('tickersymbol').value;
         if(Ticker!='')
         {ldelim}
-                show('vtbusy_info');
-                var ajaxObj = new VtigerAjax(ajaxResponse);
-                //var Ticker = document.getElementById('tickersymbol').value;
-                var urlstring = "module={$MODULE}&action=Tickerdetail&tickersymbol="+Ticker;
-                ajaxObj.process("index.php?",urlstring);
+		$("vtbusy_info").style.display="inline";
+		new Ajax.Request(
+          	      'index.php',
+                      {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+                      		method: 'post',
+                        	postBody: 'module={$MODULE}&action=Tickerdetail&tickersymbol='+Ticker,
+	                        onComplete: function(response) {ldelim}
+					$('autocom').innerHTML = response.responseText;
+				        $('autocom').style.display="block";
+        	                        $("vtbusy_info").style.display="none";
+                	        {rdelim}
+                	{rdelim}
+        	);
         {rdelim}
 {rdelim}
 

Modified: vtigercrm/trunk/Smarty/templates/Inventory/InventoryDetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Inventory/InventoryDetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Inventory/InventoryDetailView.tpl Wed Jun  7 05:53:30 2006
@@ -235,16 +235,17 @@
 {/if}
 
 <script>
-	var data = "module={$MODULE}&action={$MODULE}Ajax&ajxaction=GETTAGCLOUD&file=TagCloud";
-	var ajaxObj = new VtigerAjax(ajaxTagCloudResp);
-	ajaxObj.process("index.php?",data);
-	function ajaxTagCloudResp(response)
-	{ldelim}
-		var item = response.responseText;
-		getObj('tagfields').innerHTML = item;
-		document.getElementById('txtbox_tagfields').value ='';	
-
-	{rdelim}
+	new Ajax.Request(
+  	      'index.php',
+        	{ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+	        method: 'post',
+        	postBody: 'module={$MODULE}&action={$MODULE}Ajax&file=TagCloud&ajxaction=GETTAGCLOUD',
+	        onComplete: function(response) {ldelim}
+        	                        $("tagfields").innerHTML=response.responseText;
+                	                $("txtbox_tagfields").value ='';
+                        	{rdelim}
+		{rdelim}
+	);
 </script>
 
 	</td>

Modified: vtigercrm/trunk/Smarty/templates/Inventory/InventoryEditView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Inventory/InventoryEditView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Inventory/InventoryEditView.tpl Wed Jun  7 05:53:30 2006
@@ -22,25 +22,27 @@
 <script type="text/javascript" src="include/js/Inventory.js"></script>
 <script type="text/javascript">
 
-function ajaxResponse(response)
+function sensex_info()
 {ldelim}
-        document.getElementById('autocom').innerHTML = response.responseText;
-        document.getElementById('autocom').style.display="block";
-        hide('vtbusy_info');
+        var Ticker = $('tickersymbol').value;
+        if(Ticker!='')
+        {ldelim}
+                $("vtbusy_info").style.display="inline";
+                new Ajax.Request(
+                      'index.php',
+                      {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+                                method: 'post',
+                                postBody: 'module={$MODULE}&action=Tickerdetail&tickersymbol='+Ticker,
+                                onComplete: function(response) {ldelim}
+                                        $('autocom').innerHTML = response.responseText;
+                                        $('autocom').style.display="block";
+                                        $("vtbusy_info").style.display="none";
+                                {rdelim}
+                        {rdelim}
+                );
+        {rdelim}
 {rdelim}
 
-function sensex_info()
-{ldelim}
-        var Ticker = document.getElementById('tickersymbol').value;
-        if(Ticker!='')
-        {ldelim}
-                show('vtbusy_info');
-                var ajaxObj = new VtigerAjax(ajaxResponse);
-                //var Ticker = document.getElementById('tickersymbol').value;
-                var urlstring = "module={$MODULE}&action=Tickerdetail&tickersymbol="+Ticker;
-                ajaxObj.process("index.php?",urlstring);
-        {rdelim}
-{rdelim}
 </script>
 
 		{include file='Buttons_List1.tpl'}	




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 08:01:05 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 12:01:05 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6939 -
	/vtigercrm/trunk/Smarty/templates/DetailView.tpl
Message-ID: <20060607120106.E63947E85D1@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 06:00:56 2006
New Revision: 6939

Log:
ajax functionality has been modified

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 Wed Jun  7 06:00:56 2006
@@ -25,17 +25,23 @@
 
 <div id="convertleaddiv" style="display:block;position:absolute;left:225px;top:150px;"></div>
 <script>
-function ajaxSaveResponse(response)
-{ldelim}
-        document.getElementById("convertleaddiv").innerHTML=response.responseText;
-{rdelim}
+{literal}
 
 function callConvertLeadDiv(id)
-{ldelim}
-        var ajaxObj = new VtigerAjax(ajaxSaveResponse);
-        var urlstring = "module=Leads&action=LeadsAjax&file=ConvertLead&record="+id;
-        ajaxObj.process("index.php?",urlstring);
-{rdelim}
+{
+        new Ajax.Request(
+                'index.php',
+                {queue: {position: 'end', scope: 'command'},
+                        method: 'post',
+                        postBody: 'module=Leads&action=LeadsAjax&file=ConvertLead&record='+id,
+                        onComplete: function(response) {
+                                $("convertleaddiv").innerHTML=response.responseText;
+                        }
+                }
+        );
+}
+{/literal}
+
 function tagvalidate()
 {ldelim}
 	if(document.getElementById('txtbox_tagfields').value != '')
@@ -316,15 +322,17 @@
 {/if}
 
 <script>
-var data = "module={$MODULE}&action={$MODULE}Ajax&file=TagCloud&ajxaction=GETTAGCLOUD";
-var ajaxObj = new VtigerAjax(ajaxTagCloudResp);
-ajaxObj.process("index.php?",data);
-function ajaxTagCloudResp(response)
-{ldelim}
-	var item = response.responseText;
-	getObj('tagfields').innerHTML = item;
-	document.getElementById('txtbox_tagfields').value ='';	
-{rdelim}
+new Ajax.Request(
+        'index.php',
+        {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+        method: 'post',
+        postBody: 'module={$MODULE}&action={$MODULE}Ajax&file=TagCloud&ajxaction=GETTAGCLOUD',
+        onComplete: function(response) {ldelim}
+                                $("tagfields").innerHTML=response.responseText;
+                                $("txtbox_tagfields").value ='';
+                        {rdelim}
+        {rdelim}
+);
 </script>
 <!-- added for validation -->
 <script language="javascript">




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 08:04:48 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 12:04:48 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6940 - in
 /vtigercrm/trunk/Smarty/templates: CreateView.tpl salesEditView.tpl
Message-ID: <20060607120448.B4A807E85D2@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 06:04:44 2006
New Revision: 6940

Log:
ajax functionality has been modified

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 Wed Jun  7 06:04:44 2006
@@ -21,27 +21,26 @@
 <script type="text/javascript" src="modules/{$MODULE}/{$SINGLE_MOD}.js"></script>
 
 <script type="text/javascript">
-
-function ajaxResponse(response)
-{ldelim}
-        document.getElementById('autocom').innerHTML = response.responseText;
-        document.getElementById('autocom').style.display="block";
-        hide('vtbusy_info');
-{rdelim}
-
 function sensex_info()
 {ldelim}
-        var Ticker = document.getElementById('tickersymbol').value;
+        var Ticker = $('tickersymbol').value;
         if(Ticker!='')
         {ldelim}
-                show('vtbusy_info');
-                var ajaxObj = new VtigerAjax(ajaxResponse);
-                //var Ticker = document.getElementById('tickersymbol').value;
-                var urlstring = "module={$MODULE}&action=Tickerdetail&tickersymbol="+Ticker;
-                ajaxObj.process("index.php?",urlstring);
+                $("vtbusy_info").style.display="inline";
+                new Ajax.Request(
+                      'index.php',
+                      {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+                                method: 'post',
+                                postBody: 'module={$MODULE}&action=Tickerdetail&tickersymbol='+Ticker,
+                                onComplete: function(response) {ldelim}
+                                        $('autocom').innerHTML = response.responseText;
+                                        $('autocom').style.display="block";
+                                        $("vtbusy_info").style.display="none";
+                                {rdelim}
+                        {rdelim}
+                );
         {rdelim}
 {rdelim}
-
 </script>
 
 		{include file='Buttons_List1.tpl'}

Modified: vtigercrm/trunk/Smarty/templates/salesEditView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/salesEditView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/salesEditView.tpl Wed Jun  7 06:04:44 2006
@@ -20,24 +20,24 @@
 <script type="text/javascript" src="jscalendar/calendar-setup.js"></script>
 <script type="text/javascript" src="modules/{$MODULE}/{$SINGLE_MOD}.js"></script>
 <script type="text/javascript">
-
-function ajaxResponse(response)
-{ldelim}
-        document.getElementById('autocom').innerHTML = response.responseText;
-        document.getElementById('autocom').style.display="block";
-        hide('vtbusy_info');
-{rdelim}
-
 function sensex_info()
 {ldelim}
-        var Ticker = document.getElementById('tickersymbol').value;
+        var Ticker = $('tickersymbol').value;
         if(Ticker!='')
         {ldelim}
-                show('vtbusy_info');
-                var ajaxObj = new VtigerAjax(ajaxResponse);
-                //var Ticker = document.getElementById('tickersymbol').value;
-                var urlstring = "module={$MODULE}&action=Tickerdetail&tickersymbol="+Ticker;
-                ajaxObj.process("index.php?",urlstring);
+                $("vtbusy_info").style.display="inline";
+                new Ajax.Request(
+                      'index.php',
+                      {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+                                method: 'post',
+                                postBody: 'module={$MODULE}&action=Tickerdetail&tickersymbol='+Ticker,
+                                onComplete: function(response) {ldelim}
+                                        $('autocom').innerHTML = response.responseText;
+                                        $('autocom').style.display="block";
+                                        $("vtbusy_info").style.display="none";
+                                {rdelim}
+                        {rdelim}
+                );
         {rdelim}
 {rdelim}
 </script>




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 08:25:39 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 12:25:39 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6941 -
	/vtigercrm/trunk/Smarty/templates/Popup.tpl
Message-ID: <20060607122539.066667E85EF@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 06:25:34 2006
New Revision: 6941

Log:
ajax functionality has been modified

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

Modified: vtigercrm/trunk/Smarty/templates/Popup.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Popup.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Popup.tpl Wed Jun  7 06:25:34 2006
@@ -15,7 +15,7 @@
 <link rel="stylesheet" type="text/css" href="{$THEME_PATH}style.css">
 <script language="JavaScript" type="text/javascript" src="include/js/general.js"></script>
 <script language="JavaScript" type="text/javascript" src="modules/{$MODULE}/{$SINGLE_MOD}.js"></script>
-<script language="JavaScript" type="text/javascript" src="include/js/ajax.js"></script>
+<script language="javascript" type="text/javascript" src="include/scriptaculous/prototype.js"></script>
 <script type="text/javascript">
 function add_data_to_relatedlist(entity_id,recordid) {ldelim}
 
@@ -85,17 +85,25 @@
     {rdelim}
 	search_fld_val= document.basicSearch.search_field[document.basicSearch.search_field.selectedIndex].value;
     search_txt_val=document.basicSearch.search_text.value;
-    var ajaxObj = new VtigerAjax(ajaxSaveResponse);
     var urlstring = '';
     if(searchtype == 'Basic')
     {ldelim}
-       urlstring = 'search_field='+search_fld_val+'&searchtype=BasicSearch&search_text='+search_txt_val;
-	{rdelim}
-	popuptype = document.getElementById('popup_type').value;
+	urlstring = 'search_field='+search_fld_val+'&searchtype=BasicSearch&search_text='+search_txt_val;
+    {rdelim}
+	popuptype = $('popup_type').value;
 	urlstring += '&popuptype='+popuptype;
 	urlstring = urlstring +'&query=true&file=Popup&module={$MODULE}&action={$MODULE}Ajax&ajax=true';
 	urlstring +=gethiddenelements();
-	ajaxObj.process("index.php?",urlstring);
+	new Ajax.Request(
+		'index.php',
+		{ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+				method: 'post',
+				postBody: urlstring,
+				onComplete: function(response) {ldelim}
+					$("ListViewContents").innerHTML= response.responseText;
+				{rdelim}
+			{rdelim}
+		);
 {rdelim}	
 function alphabetic(module,url,dataid)
 {ldelim}
@@ -105,10 +113,18 @@
 	getObj(data_td_id).className = 'searchAlph';
     {rdelim}
     getObj(dataid).className = 'searchAlphselected';
-    var ajaxObj = new VtigerAjax(ajaxSaveResponse);
     var urlstring ="module="+module+"&action="+module+"Ajax&file=Popup&ajax=true&"+url;
     urlstring +=gethiddenelements();
-    ajaxObj.process("index.php?",urlstring);
+    new Ajax.Request(
+                'index.php',
+                {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+                                method: 'post',
+                                postBody: urlstring,
+                                onComplete: function(response) {ldelim}
+                                        $("ListViewContents").innerHTML= response.responseText;
+				{rdelim}
+			{rdelim}
+		);
 {rdelim}
 function gethiddenelements()
 {ldelim}
@@ -124,16 +140,20 @@
 	return urlstring;
 {rdelim}
 																									
-function ajaxSaveResponse(response)
-{ldelim}
-	document.getElementById("ListViewContents").innerHTML= response.responseText;
-{rdelim}
 function getListViewEntries_js(module,url)
 {ldelim}
-        var ajaxObj = new VtigerAjax(ajaxSaveResponse);
 	popuptype = document.getElementById('popup_type').value;
         var urlstring ="module="+module+"&action="+module+"Ajax&popuptype="+popuptype+"&file=Popup&ajax=true&"+url;
     	urlstring +=gethiddenelements();
-        ajaxObj.process("index.php?",urlstring);
+	new Ajax.Request(
+                'index.php',
+                {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+                                method: 'post',
+                                postBody: urlstring,
+                                onComplete: function(response) {ldelim}
+                                        $("ListViewContents").innerHTML= response.responseText;
+				{rdelim}
+			{rdelim}
+		);
 {rdelim}
 </script>




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 08:30:46 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 12:30:46 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6942 - in
 /vtigercrm/trunk/Smarty/templates: HomePage.tpl MySites.tpl
Message-ID: <20060607123046.DDB447E8601@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 06:30:42 2006
New Revision: 6942

Log:
ajax.js has been removed

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

Modified: vtigercrm/trunk/Smarty/templates/HomePage.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/HomePage.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/HomePage.tpl Wed Jun  7 06:30:42 2006
@@ -10,7 +10,6 @@
  ********************************************************************************/
 -->*}
 <script language="javascript" type="text/javascript" src="include/scriptaculous/prototype.js"></script>
-<script language="JavaScript" type="text/javascript" src="include/js/ajax.js"></script>
 <script language="javascript" type="text/javascript" src="include/scriptaculous/scriptaculous.js"></script>
 <script language="javascript" type="text/javascript" src="include/scriptaculous/effects.js"></script>
 <script language="javascript" type="text/javascript" src="include/scriptaculous/builder.js"></script>

Modified: vtigercrm/trunk/Smarty/templates/MySites.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/MySites.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/MySites.tpl Wed Jun  7 06:30:42 2006
@@ -14,7 +14,6 @@
 
 <script src="include/scriptaculous/prototype.js" type="text/javascript"></script>
 <script src="include/scriptaculous/scriptaculous.js" type="text/javascript"></script>
-<script language="JavaScript" type="text/javascript" src="include/js/ajax.js"></script>
 <script language="JavaScript" type="text/javascript" src="modules/Portal/Portal.js"></script>
 
 {include file="Buttons_List1.tpl"}




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 08:40:35 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 12:40:35 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6943 -
 /vtigercrm/trunk/Smarty/templates/Inventory/InventoryActions.tpl
Message-ID: <20060607124035.C65977E85D2@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 06:40:30 2006
New Revision: 6943

Log:
i18n Updated for Inventory Modules - ahmed

Modified:
    vtigercrm/trunk/Smarty/templates/Inventory/InventoryActions.tpl

Modified: vtigercrm/trunk/Smarty/templates/Inventory/InventoryActions.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Inventory/InventoryActions.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Inventory/InventoryActions.tpl Wed Jun  7 06:40:30 2006
@@ -37,25 +37,25 @@
 	   <tr>
 		<td align="left" style="padding-left:10px;">
 			<img src="{$IMAGE_PATH}pointer.gif" hspace="5" align="absmiddle"/>
-			<a href="javascript: document.DetailView.module.value='Quotes'; document.DetailView.action.value='EditView'; document.DetailView.return_module.value='Products'; document.DetailView.return_action.value='DetailView'; document.DetailView.return_id.value='{$ID}'; document.DetailView.parent_id.value='{$ID}'; document.DetailView.product_id.value='{$ID}'; document.DetailView.record.value=''; document.DetailView.submit();" class="webMnu">Create Quote</a> 
-		</td>
-	   </tr>
-	   <tr>
-		<td align="left" style="padding-left:10px;">
-			<img src="{$IMAGE_PATH}pointer.gif" hspace="5" align="absmiddle"/>
-			<a href="javascript: document.DetailView.module.value='Invoice'; document.DetailView.action.value='EditView'; document.DetailView.return_module.value='Products'; document.DetailView.return_action.value='DetailView'; document.DetailView.return_id.value='{$ID}'; document.DetailView.parent_id.value='{$ID}'; document.DetailView.product_id.value='{$ID}'; document.DetailView.record.value=''; document.DetailView.submit();" class="webMnu">Create Invoice</a> 
-		</td>
-	   </tr>
-	   <tr>
-		<td align="left" style="padding-left:10px;">
-			<img src="{$IMAGE_PATH}pointer.gif" hspace="5" align="absmiddle"/>
-			<a href="javascript: document.DetailView.module.value='SalesOrder'; document.DetailView.action.value='EditView'; document.DetailView.return_module.value='Products'; document.DetailView.return_action.value='DetailView'; document.DetailView.return_id.value='{$ID}'; document.DetailView.parent_id.value='{$ID}'; document.DetailView.product_id.value='{$ID}'; document.DetailView.record.value=''; document.DetailView.submit();" class="webMnu">Create SalesOrder</a> 
-		</td>
-	   </tr>
-	   <tr>
-		<td align="left" style="padding-left:10px;">
-			<img src="{$IMAGE_PATH}pointer.gif" hspace="5" align="absmiddle"/>
-			<a href="javascript: document.DetailView.module.value='PurchaseOrder'; document.DetailView.action.value='EditView'; document.DetailView.return_module.value='Products'; document.DetailView.return_action.value='DetailView'; document.DetailView.return_id.value='{$ID}'; document.DetailView.parent_id.value='{$ID}'; document.DetailView.product_id.value='{$ID}'; document.DetailView.record.value=''; document.DetailView.submit();" class="webMnu">Create PurchaseOrder</a> 
+			<a href="javascript: document.DetailView.module.value='Quotes'; document.DetailView.action.value='EditView'; document.DetailView.return_module.value='Products'; document.DetailView.return_action.value='DetailView'; document.DetailView.return_id.value='{$ID}'; document.DetailView.parent_id.value='{$ID}'; document.DetailView.product_id.value='{$ID}'; document.DetailView.record.value=''; document.DetailView.submit();" class="webMnu">{$APP.LBL_CREATE_BUTTON_LABEL} {$APP.Quote}</a> 
+		</td>
+	   </tr>
+	   <tr>
+		<td align="left" style="padding-left:10px;">
+			<img src="{$IMAGE_PATH}pointer.gif" hspace="5" align="absmiddle"/>
+			<a href="javascript: document.DetailView.module.value='Invoice'; document.DetailView.action.value='EditView'; document.DetailView.return_module.value='Products'; document.DetailView.return_action.value='DetailView'; document.DetailView.return_id.value='{$ID}'; document.DetailView.parent_id.value='{$ID}'; document.DetailView.product_id.value='{$ID}'; document.DetailView.record.value=''; document.DetailView.submit();" class="webMnu">{$APP.LBL_CREATE_BUTTON_LABEL} {$APP.Invoice}</a> 
+		</td>
+	   </tr>
+	   <tr>
+		<td align="left" style="padding-left:10px;">
+			<img src="{$IMAGE_PATH}pointer.gif" hspace="5" align="absmiddle"/>
+			<a href="javascript: document.DetailView.module.value='SalesOrder'; document.DetailView.action.value='EditView'; document.DetailView.return_module.value='Products'; document.DetailView.return_action.value='DetailView'; document.DetailView.return_id.value='{$ID}'; document.DetailView.parent_id.value='{$ID}'; document.DetailView.product_id.value='{$ID}'; document.DetailView.record.value=''; document.DetailView.submit();" class="webMnu">{$APP.LBL_CREATE_BUTTON_LABEL} {$APP.SalesOrder}</a> 
+		</td>
+	   </tr>
+	   <tr>
+		<td align="left" style="padding-left:10px;">
+			<img src="{$IMAGE_PATH}pointer.gif" hspace="5" align="absmiddle"/>
+			<a href="javascript: document.DetailView.module.value='PurchaseOrder'; document.DetailView.action.value='EditView'; document.DetailView.return_module.value='Products'; document.DetailView.return_action.value='DetailView'; document.DetailView.return_id.value='{$ID}'; document.DetailView.parent_id.value='{$ID}'; document.DetailView.product_id.value='{$ID}'; document.DetailView.record.value=''; document.DetailView.submit();" class="webMnu">{$APP.LBL_CREATE_BUTTON_LABEL} {$APP.PurchaseOrder}</a> 
 		</td>
 	   </tr>
 	   <!--
@@ -91,7 +91,7 @@
 	   <tr>
 		<td align="left" style="padding-left:10px;">
 			<img src="{$IMAGE_PATH}pointer.gif" hspace="5" align="absmiddle"/>
-			<a href="javascript: document.DetailView.module.value='PurchaseOrder'; document.DetailView.action.value='EditView'; document.DetailView.return_module.value='Vendors'; document.DetailView.return_action.value='DetailView'; document.DetailView.return_id.value='{$ID}'; document.DetailView.parent_id.value='{$ID}'; document.DetailView.vendor_id.value='{$ID}'; document.DetailView.record.value=''; document.DetailView.submit();" class="webMnu">Create PurchaseOrder</a> 
+			<a href="javascript: document.DetailView.module.value='PurchaseOrder'; document.DetailView.action.value='EditView'; document.DetailView.return_module.value='Vendors'; document.DetailView.return_action.value='DetailView'; document.DetailView.return_id.value='{$ID}'; document.DetailView.parent_id.value='{$ID}'; document.DetailView.vendor_id.value='{$ID}'; document.DetailView.record.value=''; document.DetailView.submit();" class="webMnu">{$APP.LBL_CREATE_BUTTON_LABEL} {$APP.PurchaseOrder}</a> 
 		</td>
 	   </tr>
 	   <!--
@@ -121,7 +121,7 @@
 	   <tr>
 		<td align="left" style="padding-left:10px;">
 			<img src="{$IMAGE_PATH}pointer.gif" hspace="5" align="absmiddle"/>
-			<a href="javascript: document.DetailView.module.value='Invoice'; document.DetailView.action.value='EditView'; document.DetailView.return_module.value='SalesOrder'; document.DetailView.return_action.value='DetailView'; document.DetailView.return_id.value='{$ID}'; document.DetailView.record.value='{$ID}'; document.DetailView.convertmode.value='sotoinvoice'; document.DetailView.submit();" class="webMnu">Create Invoice</a> 
+			<a href="javascript: document.DetailView.module.value='Invoice'; document.DetailView.action.value='EditView'; document.DetailView.return_module.value='SalesOrder'; document.DetailView.return_action.value='DetailView'; document.DetailView.return_id.value='{$ID}'; document.DetailView.record.value='{$ID}'; document.DetailView.convertmode.value='sotoinvoice'; document.DetailView.submit();" class="webMnu">{$APP.LBL_CREATE_BUTTON_LABEL} {$APP.Invoice}</a> 
 		</td>
 	   </tr>
 	   <!--
@@ -145,13 +145,13 @@
 	   <tr>
 		<td align="left" style="padding-left:10px;">
 			<img src="{$IMAGE_PATH}pointer.gif" hspace="5" align="absmiddle"/> 
-			<a href="javascript: document.DetailView.return_module.value='{$MODULE}'; document.DetailView.return_action.value='DetailView'; document.DetailView.convertmode.value='{$CONVERTMODE}'; document.DetailView.module.value='Invoice'; document.DetailView.action.value='EditView'; document.DetailView.return_id.value='{$ID}'; document.DetailView.submit();" class="webMnu">Generate Invoice</a> 
+			<a href="javascript: document.DetailView.return_module.value='{$MODULE}'; document.DetailView.return_action.value='DetailView'; document.DetailView.convertmode.value='{$CONVERTMODE}'; document.DetailView.module.value='Invoice'; document.DetailView.action.value='EditView'; document.DetailView.return_id.value='{$ID}'; document.DetailView.submit();" class="webMnu">{$APP.LBL_GENERATE} {$APP.Invoice}</a> 
 		</td>
 	   </tr>
 	   <tr>
 		<td align="left" style="padding-left:10px;border-bottom:1px dotted #CCCCCC;">
 			<img src="{$IMAGE_PATH}pointer.gif" hspace="5" align="absmiddle"/>
-			<a href="javascript: document.DetailView.return_module.value='SalesOrder'; document.DetailView.return_action.value='DetailView'; document.DetailView.convertmode.value='quotetoso'; document.DetailView.module.value='SalesOrder'; document.DetailView.action.value='EditView'; document.DetailView.submit();" class="webMnu">Generate Sales Order</a> 
+			<a href="javascript: document.DetailView.return_module.value='SalesOrder'; document.DetailView.return_action.value='DetailView'; document.DetailView.convertmode.value='quotetoso'; document.DetailView.module.value='SalesOrder'; document.DetailView.action.value='EditView'; document.DetailView.submit();" class="webMnu">{$APP.LBL_GENERATE} {$APP.SalesOrder}</a> 
 		</td>
 	   </tr>
 	   <!-- Vendors Actions ends -->
@@ -180,7 +180,7 @@
 
    <tr>
 	<td align="left">
-		<span class="genHeaderSmall">Tools</span><br /> 
+		<span class="genHeaderSmall">{$APP.Tools}</span><br /> 
 	</td>
    </tr>
 
@@ -199,7 +199,7 @@
    <tr>
 	<td align="left" style="padding-left:10px;">
 		<img src="{$IMAGE_PATH}pointer.gif" hspace="5" align="absmiddle"/>
-		<a href="javascript: document.DetailView.return_module.value='{$MODULE}'; document.DetailView.return_action.value='DetailView'; document.DetailView.module.value='{$MODULE}'; document.DetailView.action.value='{$export_pdf_action}'; document.DetailView.record.value='{$ID}'; document.DetailView.return_id.value='{$ID}'; document.DetailView.submit();" class="webMnu">Export To PDF</a> 
+		<a href="javascript: document.DetailView.return_module.value='{$MODULE}'; document.DetailView.return_action.value='DetailView'; document.DetailView.module.value='{$MODULE}'; document.DetailView.action.value='{$export_pdf_action}'; document.DetailView.record.value='{$ID}'; document.DetailView.return_id.value='{$ID}'; document.DetailView.submit();" class="webMnu">{$APP.LBL_EXPORT_TO_PDF}</a> 
 	</td>
    </tr>
 




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 08:42:44 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 12:42:44 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6944 -
	/vtigercrm/trunk/modules/Calendar/script.js
Message-ID: <20060607124244.088757E85D2@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 06:42:41 2006
New Revision: 6944

Log:
ajax functionality has been modified

Modified:
    vtigercrm/trunk/modules/Calendar/script.js

Modified: vtigercrm/trunk/modules/Calendar/script.js
==============================================================================
--- vtigercrm/trunk/modules/Calendar/script.js (original)
+++ vtigercrm/trunk/modules/Calendar/script.js Wed Jun  7 06:42:41 2006
@@ -391,23 +391,20 @@
 	usr_id.value = selectedColStr;
 }
 
-function ajaxCalSaveResponse(response)
-{
-	document.getElementById("hrView_default").style.display = "none";
-        document.getElementById("toggleDiv").innerHTML=response.responseText;
-}
-
-function fnRedirect(view,hour,day,month,year){
-	var ajaxObj = new VtigerAjax(ajaxCalSaveResponse);
-	var tagName =  document.getElementById('viewBox');
-	var OptionData = tagName.options[tagName.selectedIndex].value;
-	if(OptionData == 'hourview'){
-		var urlstring ="module=Calendar&action=CalendarAjax&view="+view+"&hour="+hour+"&day="+day+"&month="+month+"&year="+year+"&type="+OptionData+"&parenttab=My Home Page&ajax=true";
-	}
-	else if(OptionData == 'listview'){
-		var urlstring ="module=Calendar&action=CalendarAjax&view="+view+"&hour="+hour+"&day="+day+"&month="+month+"&year="+year+"&type="+OptionData+"&parenttab=My Home Page&ajax=true";
-	}
-	ajaxObj.process("index.php?",urlstring);
+function fnRedirect(view,hour,day,month,year) {
+        var OptionData = $('viewBox').options[$('viewBox').selectedIndex].value;
+        new Ajax.Request(
+                'index.php',
+                {queue: {position: 'end', scope: 'command'},
+                        method: 'post',
+                        postBody: 'module=Calendar&action=CalendarAjax&view='+view+'&hour='+hour+'&day='+day+'&month='+month+'&year='+year+'&type='+OptionData+'&parenttab=My Home Page&ajax=true',
+                        onComplete: function(response) {
+                                $("hrView_default").style.display = "none";
+                                $("toggleDiv").innerHTML=response.responseText;
+                        }
+                }
+
+          );
 }
 
 function fnAddEvent(obj,CurrObj,start_date,end_date,start_hr,start_min,start_fmt,end_hr,end_min,end_fmt){
@@ -431,29 +428,32 @@
 		var tagName = document.getElementById('addEventDropDown').style.display= 'block';
 }
 
-function ajaxMiniCalSaveResponse(response)
-{
-        document.getElementById("miniCal").innerHTML=response.responseText;
-}
-
-function getMiniCal()
-{
-	var ajaxObj = new VtigerAjax(ajaxMiniCalSaveResponse);
-	var urlstring ="module=Calendar&action=CalendarAjax&type=minical&parenttab=My Home Page&ajax=true";
-	ajaxObj.process("index.php?",urlstring);
-	
-}
-
-function getCalSettings()
-{
-	 var ajaxObj = new VtigerAjax(ajaxCalSettingsSaveResponse);
-	 var urlstring ="module=Calendar&action=CalendarAjax&type=settings&parenttab=My Home Page&ajax=true";
-	 ajaxObj.process("index.php?",urlstring);
-}
-
-function ajaxCalSettingsSaveResponse(response)
-{
-        document.getElementById("calSettings").innerHTML=response.responseText;
+function getMiniCal(){
+        new Ajax.Request(
+                'index.php',
+                {queue: {position: 'end', scope: 'command'},
+                        method: 'post',
+                        postBody: 'module=Calendar&action=CalendarAjax&type=minical&parenttab=My Home Page&ajax=true',
+                        onComplete: function(response) {
+                                $("miniCal").innerHTML=response.responseText;
+                        }
+                }
+
+          );
+}
+
+function getCalSettings(){
+        new Ajax.Request(
+                'index.php',
+                {queue: {position: 'end', scope: 'command'},
+                        method: 'post',
+                        postBody: 'module=Calendar&action=CalendarAjax&type=settings&parenttab=My Home Page&ajax=true',
+                        onComplete: function(response) {
+                                $("calSettings").innerHTML=response.responseText;
+                        }
+                }
+
+          );
 }
 
 function getcalAction(obj,Lay,id,view,hour,day,month,year,type){




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 08:43:34 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 12:43:34 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6945 -
	/vtigercrm/trunk/include/language/en_us.lang.php
Message-ID: <20060607124334.CA86C7E85D2@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 06:43:31 2006
New Revision: 6945

Log:
lang file updated

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

Modified: vtigercrm/trunk/include/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/include/language/en_us.lang.php (original)
+++ vtigercrm/trunk/include/language/en_us.lang.php Wed Jun  7 06:43:31 2006
@@ -137,6 +137,8 @@
 'LBL_SELECT_BUTTON_TITLE'=>'Select [Alt+T]',
 
 'LBL_CREATE_BUTTON_LABEL' =>'Create',
+
+'LBL_GENERATE'=>'Generate',
 
 'LBL_SAVE_BUTTON_KEY'=>'S',
 




From vtiger-tickets at vtiger.fosslabs.com  Wed Jun  7 09:03:54 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 07 Jun 2006 13:03:54 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231277=3A?=
 =?utf-8?q?_Can=27t_translate_term_close_without_problem?=
Message-ID: <076.d518c5251779ede24caf171d8d809788@vtiger.fosslabs.com>

#1277: Can't translate term close without problem
-----------------------+----------------------------------------------------
 Reporter:  abos       |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  major      |   Milestone:  5.0.0    
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 If english term close is translated in lang file, we have problem.
 See screenshot.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1277>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 09:05:40 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 13:05:40 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6946 -
	/vtigercrm/trunk/include/js/ListView.js
Message-ID: <20060607130540.9977E7E8611@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 07:05:36 2006
New Revision: 6946

Log:
ajax functionality has been modified

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

Modified: vtigercrm/trunk/include/js/ListView.js
==============================================================================
--- vtigercrm/trunk/include/js/ListView.js (original)
+++ vtigercrm/trunk/include/js/ListView.js Wed Jun  7 07:05:36 2006
@@ -92,10 +92,22 @@
         }
 		if(confirm("Are you sure you want to delete the selected "+xx+" records ?"))
 		{
-			show("status");
-			var ajaxObj = new VtigerAjax(ajaxSaveResponse);
-			var urlstring ="module=Users&action=massdelete&return_module="+module+"&viewname="+viewid+"&idlist="+idstring;
-	    	ajaxObj.process("index.php?",urlstring);
+			
+			$("status").style.display="inline";
+			new Ajax.Request(
+          	  	      'index.php',
+			      	{queue: {position: 'end', scope: 'command'},
+		                        method: 'post',
+                		        postBody:"module=Users&action=massdelete&return_module="+module+"&viewname="+viewid+"&idlist="+idstring,
+		                        onComplete: function(response) {
+        	        	                $("status").style.display="none";
+                	        	        result = response.responseText.split('&#&#&#');
+                        	        	$("ListViewContents").innerHTML= result[2];
+	                        	        if(result[1] != '')
+                                        		alert(result[1]);
+		                        }
+              			 }
+       			);
 		}
 		else
 		{
@@ -106,23 +118,45 @@
 
 function showDefaultCustomView(selectView,module)
 {
-
-		show("status");
-		var ajaxObj = new VtigerAjax(ajaxSaveResponse);
-		var viewName = selectView.options[selectView.options.selectedIndex].value;
-		var urlstring ="module="+module+"&action="+module+"Ajax&file=ListView&ajax=true&start=1&viewname="+viewName;
-	    ajaxObj.process("index.php?",urlstring);
+	$("status").style.display="inline";
+	var viewName = selectView.options[selectView.options.selectedIndex].value;
+	new Ajax.Request(
+               	'index.php',
+                {queue: {position: 'end', scope: 'command'},
+                       	method: 'post',
+                        postBody:"module="+module+"&action="+module+"Ajax&file=ListView&ajax=true&start=1&viewname="+viewName,
+                        onComplete: function(response) {
+                        $("status").style.display="none";
+                        result = response.responseText.split('&#&#&#');
+                        $("ListViewContents").innerHTML= result[2];
+                        if(result[1] != '')
+                               	alert(result[1]);
+                        }
+                }
+	);
 }
 
 
 function getListViewEntries_js(module,url)
 {
-        show("status");
-        var ajaxObj = new VtigerAjax(ajaxSaveResponse);
-        var urlstring ="module="+module+"&action="+module+"Ajax&file=index&ajax=true&"+url;
-	if(document.getElementById('search_url').value!='')
-        	urlstring = urlstring+document.getElementById('search_url').value;
-        ajaxObj.process("index.php?",urlstring);
-
+	$("status").style.display="inline";
+	if($('search_url').value!='')
+                urlstring = $('search_url').value;
+	else
+		urlstring = '';
+        new Ajax.Request(
+        	'index.php',
+                {queue: {position: 'end', scope: 'command'},
+                	method: 'post',
+                        postBody:"module="+module+"&action="+module+"Ajax&file=index&ajax=true&"+url+urlstring,
+			onComplete: function(response) {
+                        	$("status").style.display="none";
+                                result = response.responseText.split('&#&#&#');
+                                $("ListViewContents").innerHTML= result[2];
+                                if(result[1] != '')
+                                        alert(result[1]);
+                  	}
+                }
+        );
 }
 




From vtiger-tickets at vtiger.fosslabs.com  Wed Jun  7 09:07:08 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 07 Jun 2006 13:07:08 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231278=3A?=
 =?utf-8?q?_Translations_for_module_name_in_related_list=2E?=
Message-ID: <076.8117b3de443679e88c0c49ef370ecdbe@vtiger.fosslabs.com>

#1278: Translations for module name in related list.
-----------------------+----------------------------------------------------
 Reporter:  abos       |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  major      |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 Please change the file :
 /Smart/Templates/relatedList.tpl
 ~line 70
 <td  valign=bottom><b>{$APP.$header}</b></td>

 Thanks

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1278>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 09:20:57 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 13:20:57 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6947 -
	/vtigercrm/trunk/modules/Portal/Portal.js
Message-ID: <20060607132057.808515CE14E@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 07:20:53 2006
New Revision: 6947

Log:
ajax functionality has been modified

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

Modified: vtigercrm/trunk/modules/Portal/Portal.js
==============================================================================
--- vtigercrm/trunk/modules/Portal/Portal.js (original)
+++ vtigercrm/trunk/modules/Portal/Portal.js Wed Jun  7 07:20:53 2006
@@ -11,20 +11,23 @@
 
 function fetchAddSite(id)
 {
-	show('status');
-	var ajaxObj = new VtigerAjax(ajaxeditSiteResp);
-	url ='module=Portal&action=PortalAjax&file=Popup&record='+id;
-	ajaxObj.process("index.php?",url);
+	$("status").style.display="inline";
+	new Ajax.Request(
+		'index.php',
+		{queue: {position: 'end', scope: 'command'},
+			method: 'post',
+			postBody:'module=Portal&action=PortalAjax&file=Popup&record='+id,
+			onComplete: function(response) {
+				$("status").style.display="none";
+				$('editportal_cont').innerHTML = response.responseText;
+			}
+		}
+	);
 }
-function ajaxeditSiteResp(response)
-{
-	hide('status');
-	document.getElementById('editportal_cont').innerHTML = response.responseText;
 
-}
 function fetchContents(mode)
 {
-	show('status');
+	$("status").style.display="inline";
 	if(mode == 'data')
 	{
 		getObj('datatab').className = 'SiteSel';
@@ -35,42 +38,61 @@
 		getObj('datatab').className = 'SiteUnSel';
 		getObj('managetab').className = 'SiteSel';
 	}
-	var ajaxObj = new VtigerAjax(ajaxfetchContentsResp);
-	url ='action=PortalAjax&mode=ajax&module=Portal&file=ListView&datamode='+mode;
-	ajaxObj.process("index.php?",url);
-}
-function ajaxfetchContentsResp(response)
-{
-	hide('status');
-	document.getElementById('portalcont').innerHTML = response.responseText;
+	new Ajax.Request(
+                'index.php',
+                {queue: {position: 'end', scope: 'command'},
+                        method: 'post',
+                        postBody:'action=PortalAjax&mode=ajax&module=Portal&file=ListView&datamode='+mode,
+                        onComplete: function(response) {
+                                $("status").style.display="none";
+                                $('portalcont').innerHTML = response.responseText;
+                        }
+                }
+        );
 }
 function DeleteSite(id)
 {
 	if(confirm("Are you sure you want to delete ?"))
 	{
-		show('status');
-		var ajaxObj = new VtigerAjax(ajaxfetchContentsResp);
-		url ='action=PortalAjax&mode=ajax&file=Delete&module=Portal&record='+id;
-		ajaxObj.process("index.php?",url);
+		$("status").style.display="inline";
+		new Ajax.Request(
+          	      'index.php',
+                	{queue: {position: 'end', scope: 'command'},
+                        	method: 'post',
+	                        postBody:'action=PortalAjax&mode=ajax&file=Delete&module=Portal&record='+id,
+        	                onComplete: function(response) {
+                	                $("status").style.display="none";
+                        	        $('portalcont').innerHTML = response.responseText;
+                        	}
+                	}
+        	);
 	}
 }
 function SaveSite(id)
 {
-	var ajaxObj = new VtigerAjax(ajaxfetchContentsResp);
-	if (document.getElementById('portalurl').value.replace(/^\s+/g, '').replace(/\s+$/g, '').length==0) {
+	if ($('portalurl').value.replace(/^\s+/g, '').replace(/\s+$/g, '').length==0) {
 		alert('Site Url cannot be empty')
 		return false;
 	}
-	if (document.getElementById('portalname').value.replace(/^\s+/g, '').replace(/\s+$/g, '').length==0) {
+	if ($('portalname').value.replace(/^\s+/g, '').replace(/\s+$/g, '').length==0) {
 		alert('Site Name cannot be empty')
 		return false;
 	}
 	Effect.Puff('orgLay');	
-	show('status');
+	$("status").style.display="inline";
 	var portalurl = document.getElementById('portalurl').value;
 	var portalname = document.getElementById('portalname').value;
-	url ='action=PortalAjax&mode=ajax&file=Save&module=Portal&portalname='+portalname+'&portalurl='+portalurl+'&record='+id;
-	ajaxObj.process("index.php?",url);
+        new Ajax.Request(
+        	'index.php',
+                {queue: {position: 'end', scope: 'command'},
+                	method: 'post',
+                        postBody:'action=PortalAjax&mode=ajax&file=Save&module=Portal&portalname='+portalname+'&portalurl='+portalurl+'&record='+id,
+                        onComplete: function(response) {
+                        		$("status").style.display="none";
+                                        $('portalcont').innerHTML = response.responseText;
+                        }
+                }
+	);
 }
 function setSite(oUrllist)
 {




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 09:22:57 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 13:22:57 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6948 -
 /vtigercrm/trunk/Smarty/templates/Settings/InventoryNotifyContents.tpl
Message-ID: <20060607132257.809BB64F6F0@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 07:22:53 2006
New Revision: 6948

Log:
i18n updated for inventory notifications - ahmed

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 Jun  7 07:22:53 2006
@@ -16,7 +16,7 @@
 	<td class="lvtCol" width="5%">#</td>
 	<td class="lvtCol" width="40%">{$CMOD.LBL_NOTIFICATION}</td>
 	<td class="lvtCol" width="50%">{$CMOD.LBL_DESCRIPTION}</td>
-	<td class="lvtCol" width="5%">Tool</td>
+	<td class="lvtCol" width="5%">{$CMOD.Tools}</td>
 	</tr>
 	{foreach name=notifyfor item=elements from=$NOTIFICATION}
 	<tr class="lvtColData" onmouseover="this.className='lvtColDataHover'" onmouseout="this.className='lvtColData'" bgcolor="white">




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 09:50:26 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 13:50:26 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6950 -
 /vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl
Message-ID: <20060607135026.D31A77E85E8@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 07:50:23 2006
New Revision: 6950

Log:
i18n done for Add Priv button - ahmed

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

Modified: vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl Wed Jun  7 07:50:23 2006
@@ -179,7 +179,7 @@
 					  	<img src="{$IMAGE_PATH}arrow.jpg" align="absmiddle">&nbsp;
 						<b>{$APP.$modulename}</b>&nbsp;&nbsp; 
 						</td>
-					 	<td align="right"><input title="New" class="small" type="button" name="Create" value="Add Privileges" onClick="callEditDiv('{$modulename}','create','')"></td>
+					 	<td align="right"><input title="New" class="small" type="button" name="Create" value="{$APP.LBL_ADD_ITEM} {$CMOD.LBL_PRIVILEGES}" onClick="callEditDiv('{$modulename}','create','')"></td>
 				  	</tr>
 				  	<tr>
 				  		<td colspan="2" style="padding: 20px;" bgcolor="#ffffff" align="center">




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 09:51:41 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 13:51:41 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6951 -
	/vtigercrm/trunk/Smarty/templates/Emails.tpl
Message-ID: <20060607135141.28E857E85E8@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 07:51:37 2006
New Revision: 6951

Log:
ajax functionality has been modified

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 Jun  7 07:51:37 2006
@@ -94,10 +94,19 @@
 {rdelim}
 function getListViewEntries_js(module,url)
 {ldelim}
-		show("status");
-        var ajaxObj = new VtigerAjax(ajaxSaveResponse);
-        var urlstring ="module="+module+"&action="+module+"Ajax&file=ListView&ajax=true&"+url;
-        ajaxObj.process("index.php?",urlstring);
+	$("status").style.display="inline";
+	new Ajax.Request(
+		'index.php',
+		{ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+                	method: 'post',
+			postBody: "module="+module+"&action="+module+"Ajax&file=ListView&ajax=true&"+url,
+			onComplete: function(response) {ldelim}
+				$("status").style.display="none";
+				$("email_con").innerHTML=response.responseText;
+				execJS(document.getElementById('email_con'));
+			{rdelim}
+		{rdelim}
+	);
 
 {rdelim}
 </script>




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 10:03:39 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 14:03:39 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6952 -
	/vtigercrm/trunk/modules/Emails/Email.js
Message-ID: <20060607140339.1F0737E8617@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 08:03:35 2006
New Revision: 6952

Log:
ajax functionality has been modified

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

Modified: vtigercrm/trunk/modules/Emails/Email.js
==============================================================================
--- vtigercrm/trunk/modules/Emails/Email.js (original)
+++ vtigercrm/trunk/modules/Emails/Email.js Wed Jun  7 08:03:35 2006
@@ -10,82 +10,27 @@
 
 var gFolderid = 1;
 var gselectedrowid = 0;
-function massDelete()
-{
-		var delete_selected_row = false;
-        x = document.massdelete.selected_id.length;
-        idstring = "";
-        if ( x == undefined)
-        {
-
-                if (document.massdelete.selected_id.checked)
-                {
-					if(document.massdelete.selected_id.value == gselectedrowid)
-					{
-						gselectedrowid = 0;
-						delete_selected_row = true;						
-					}
-                        idstring = document.massdelete.selected_id.value;
-						xx = 1;
-                }
-                else
-                {
-                        alert("Please select atleast one entity");
-                        return false;
-                }
-        }
-        else
-        {
-                xx = 0;
-                for(i = 0; i < x ; i++)
-                {
-                        if(document.massdelete.selected_id[i].checked)
-						{
-							if(document.massdelete.selected_id[i].value == gselectedrowid)
-							{
-								gselectedrowid = 0;
-								delete_selected_row = true;						
-							}
-							idstring = document.massdelete.selected_id[i].value +";"+idstring
-							xx++
-						}
-                }
-                if (xx != 0)
-                {
-                        document.massdelete.idlist.value=idstring;
-                }
-                else
-                {
-                        alert("Please select atleast one entity");
-                        return false;
-                }
-        }
-		if(confirm("Are you sure you want to delete the selected "+xx+" records ?"))
-		{	
-			getObj('search_text').value = '';
-			show("status");
-			if(!delete_selected_row)
-				var ajaxObj = new VtigerAjax(ajaxSaveResponse);
-			else	
-				var ajaxObj = new VtigerAjax(ajaxDelResponse);
-			var urlstring ="module=Users&action=massdelete&folderid="+gFolderid+"&return_module=Emails&idlist="+idstring;
-		    ajaxObj.process("index.php?",urlstring);
-		}
-		else
-		{
-			return false;
-		}
-}
 function DeleteEmail(id)
 {
 	if(confirm("Are you sure you want to delete ?"))
 	{	
 		getObj('search_text').value = '';
 		gselectedrowid = 0;
-		show("status");
-		var ajaxObj = new VtigerAjax(ajaxDelResponse);
-		var urlstring ="module=Users&action=massdelete&return_module=Emails&folderid="+gFolderid+"&idlist="+id;
-	   	ajaxObj.process("index.php?",urlstring);
+		$("status").style.display="inline";
+                new Ajax.Request(
+                        'index.php',
+                        {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+                                method: 'post',
+                                postBody: "module=Users&action=massdelete&return_module=Emails&folderid="+gFolderid+"&idlist="+id,
+                                onComplete: function(response) {ldelim}
+                                                $("status").style.display="none";
+                                                $('EmailDetails').innerHTML = '<table valign="top" border="0" cellpadding="0" cellspacing="0" width="100%"><tbody><tr><td class="forwardBg"><table border="0" cellpadding="0" cellspacing="0" width="100%"><tbody><tr><td colspan="2">&nbsp;</td></tr></tbody></table></td></tr><tr><td style="padding-top: 10px;" bgcolor="#ffffff" height="300" valign="top"></td></tr></tbody></table>';
+                                                $("subjectsetter").innerHTML='';
+                                                $("email_con").innerHTML=response.responseText;
+                                                execJS($('email_con'));
+                                {rdelim}
+                        {rdelim}
+                );
 	}
 	else
 	{
@@ -98,8 +43,19 @@
 	var osearch_field = document.getElementById('search_field');
 	var search_field = osearch_field.options[osearch_field.options.selectedIndex].value;
 	var search_text = document.getElementById('search_text').value;
-	var ajaxObj = new VtigerAjax(ajaxDelResponse);
-	var urlstring ="module=Emails&action=EmailsAjax&ajax=true&file=ListView&folderid="+gFolderid+"&search=true&search_field="+search_field+"&search_text="+search_text;
-    ajaxObj.process("index.php?",urlstring);
+	new Ajax.Request(
+                'index.php',
+                {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+                        method: 'post',
+                        postBody: "module=Emails&action=EmailsAjax&ajax=true&file=ListView&folderid="+gFolderid+"&search=true&search_field="+search_field+"&search_text="+search_text,
+                        onComplete: function(response) {ldelim}
+                                        $("status").style.display="none";
+                                        $('EmailDetails').innerHTML = '<table valign="top" border="0" cellpadding="0" cellspacing="0" width="100%"><tbody><tr><td class="forwardBg"><table border="0" cellpadding="0" cellspacing="0" width="100%"><tbody><tr><td colspan="2">&nbsp;</td></tr></tbody></table></td></tr><tr><td style="padding-top: 10px;" bgcolor="#ffffff" height="300" valign="top"></td></tr></tbody></table>';
+                                        $("subjectsetter").innerHTML='';
+                                        $("email_con").innerHTML=response.responseText;
+                                        execJS($('email_con'));
+                        {rdelim}
+                {rdelim}
+        );
 }
 




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 10:08:06 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 14:08:06 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6953 -
	/vtigercrm/trunk/modules/Faq/Faq.js
Message-ID: <20060607140806.2B87D7E8617@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 08:08:02 2006
New Revision: 6953

Log:
unwanted js functions have been removed

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

Modified: vtigercrm/trunk/modules/Faq/Faq.js
==============================================================================
--- vtigercrm/trunk/modules/Faq/Faq.js (original)
+++ vtigercrm/trunk/modules/Faq/Faq.js Wed Jun  7 08:08:02 2006
@@ -7,60 +7,6 @@
  * All Rights Reserved.
  *
  ********************************************************************************/
-
-
-function massDelete()
-{
-	x = document.massdelete.selected_id.length;
-	idstring = "";
-
-	if ( x == undefined)
-	{
-	
-		if (document.massdelete.selected_id.checked)
-		{
-			document.massdelete.idlist.value=document.massdelete.selected_id.value;
-		}
-		else 
-		{
-			alert("Please select atleast one entity");
-			return false;
-		}
-	}
-	else
-	{
-		xx = 0;
-		for(i = 0; i < x ; i++)
-		{
-			if(document.massdelete.selected_id[i].checked)
-			{
-				idstring = document.massdelete.selected_id[i].value +";"+idstring
-			xx++	
-			}
-		}
-		if (xx != 0)
-		{
-			document.massdelete.idlist.value=idstring;
-		}
-		else
-		{
-			alert("Please select atleast one entity");
-			return false;
-		}
-	}
-	if(confirm("Are you sure you want to delete the selected "+xx+" records ?"))
-    {
-		show("status");
-		var ajaxObj = new VtigerAjax(ajaxSaveResponse);
-		var urlstring ="module=Users&action=massdelete&return_module=Faq&idlist="+idstring;
-	    ajaxObj.process("index.php?",urlstring);
-	}
-	else
-	{
-		return false;
-	}
-}
-
 
 function clear_form(form) 
 {




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 10:21:58 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 14:21:58 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6954 -
	/vtigercrm/trunk/include/js/dtlviewajax.js
Message-ID: <20060607142158.866F77E8614@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 08:21:54 2006
New Revision: 6954

Log:
ajax functionality has been modified

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

Modified: vtigercrm/trunk/include/js/dtlviewajax.js
==============================================================================
--- vtigercrm/trunk/include/js/dtlviewajax.js (original)
+++ vtigercrm/trunk/include/js/dtlviewajax.js Wed Jun  7 08:21:54 2006
@@ -65,19 +65,6 @@
      return false;
 }
 
-function dtlViewAjaxResponse(response)
-{
-     var item = response.responseText;
-     if(item.indexOf(":#:FAILURE")>-1)
-     {
-          alert("Error while Editing");
-     }
-     else if(item.indexOf(":#:SUCCESS")>-1)
-     {
-          fnhide("vtbusy_info");
-     }
-}
-
 function trim(str)
 {
 	return(str.replace(/\s+$/,''));
@@ -118,10 +105,24 @@
 
 	var data = "file=DetailViewAjax&module=" + module + "&action=" + module + "Ajax&recordid=" + crmId ;
 	data = data + "&fldName=" + fieldName + "&fieldValue=" + escape(tagValue) + "&ajxaction=DETAILVIEW";
-	show("vtbusy_info");
-
-	var ajaxObj = new VtigerAjax(dtlViewAjaxResponse);
-	ajaxObj.process("index.php?",data);
+	$("vtbusy_info").style.display="inline";
+	new Ajax.Request(
+		'index.php',
+                {queue: {position: 'end', scope: 'command'},
+                        method: 'post',
+                        postBody: data,
+                        onComplete: function(response) {
+				if(response.responseText.indexOf(":#:FAILURE")>-1)
+				{
+					alert("Error while Editing");
+				}
+				else if(item.indexOf(":#:SUCCESS")>-1)
+     				{
+					$("vtbusy_info").style.display="none";
+     				}
+                       	}
+                }
+        );
 	if(uitype == '13')
 	{
 		getObj(dtlView).innerHTML = "<a href=\"mailto:"+ tagValue+"\" target=\"_blank\">"+tagValue+"&nbsp;</a>";
@@ -220,23 +221,23 @@
 	itsonview=false;
 }
 
-
-function dtlViewAjaxTagResponse(response)
-{
-     var item = response.responseText;
-	 getObj('tagfields').innerHTML = item;
-     fnhide("vtbusy_info");
-}
-
 function SaveTag(txtBox,crmId,module)
 {
 	var tagValue = document.getElementById(txtBox).value;
 	document.getElementById(txtBox).value ='';
-    var data = "file=TagCloud&module=" + module + "&action=" + module + "Ajax&recordid=" + crmId + "&ajxaction=SAVETAG&tagfields=" +tagValue;
+	$("vtbusy_info").style.display="inline";
+	new Ajax.Request(
+		'index.php',
+                {queue: {position: 'end', scope: 'command'},
+                        method: 'post',
+                        postBody: "file=TagCloud&module=" + module + "&action=" + module + "Ajax&recordid=" + crmId + "&ajxaction=SAVETAG&tagfields=" +tagValue,
+                        onComplete: function(response) {
+				        getObj('tagfields').innerHTML = response.responseText;
+					$("vtbusy_info").style.display="none";
+                        }
+                }
+        );
     
-	var ajaxObj = new VtigerAjax(dtlViewAjaxTagResponse);
-    ajaxObj.process("index.php?",data);
-   	show("vtbusy_info");
 }
 function setSelectValue(fieldLabel)
 {




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 10:22:38 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 14:22:38 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6955 -
	/vtigercrm/trunk/include/js/ajax.js
Message-ID: <20060607142238.83CCB7E8614@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 08:22:35 2006
New Revision: 6955

Log:
file deleted

Removed:
    vtigercrm/trunk/include/js/ajax.js




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 11:23:58 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 15:23:58 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6956 - in
 /vtigercrm/trunk/Smarty/templates: EditProfile.tpl ProfileDetailView.tpl
Message-ID: <20060607152358.832C47E8621@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 09:23:54 2006
New Revision: 6956

Log:
i18n updated for profiles - ahmed

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

Modified: vtigercrm/trunk/Smarty/templates/EditProfile.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/EditProfile.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/EditProfile.tpl Wed Jun  7 09:23:54 2006
@@ -140,7 +140,7 @@
 </tr>
 <tr>
 <td valign="top"></td>
-<td > {$CMOD.LBL_ALLOW} "{$PROFILE_NAME}" {$CMOD.LBL_MESG_VIEW}</td>
+<td > {$CMOD.LBL_ALLOW} "{$PROFILE_NAME}" {$CMOD.LBL_MESG_EDIT}</td>
 </tr>
 </table>
 </td>
@@ -192,18 +192,18 @@
 <td width=97% valign=top onMouseOver="this.className='prvPrfHoverOn'" onMouseOut="this.className='prvPrfHoverOff'" >
 <table border=0 cellspacing=0 cellpadding=5 width=100% class=small>
 
-<tr>
-<td>{$CMOD.LBL_ENTITY}</td>
-<td>{$CMOD.LBL_CREATE_EDIT}</td>
-<td>{$CMOD.LBL_DELETE}</td>
-<td>{$CMOD.LBL_VIEW}</td>
-</tr>
-
+	<tr>
+	<td><b>{$CMOD.LBL_ENTITY}</b></td>
+	<td><b>{$CMOD.LBL_CREATE_EDIT}</b></td>
+	<td><b>{$CMOD.LBL_DELETE}</b></td>
+	<td><b>{$CMOD.LBL_VIEW}</b></td>
+	</tr>
 {foreach item=value from=$STANDARD_PRIV}
 <tr>
-{foreach item=element from=$value}
-<td>{$element}</td>
-{/foreach}
+<td>{$APP[$value.0]}</td>
+<td>{$value.1}</td>
+<td>{$value.2}</td>
+<td>{$value.3}</td>
 </tr>
 {/foreach}
 
@@ -263,7 +263,7 @@
 {foreach item=value from=$TAB_PRIV}
 <tr>
 {foreach item=element from=$value}
-<td width=35%>{$element.0}</td>
+<td width=35%>{$APP[$element.0]}</td>
 <td width=15%>{$element.1}</td>
 {/foreach}
 </tr>
@@ -322,7 +322,7 @@
 
 {foreach key=module item=value from=$UTILITIES_PRIV}
 <tr>
-<td colspan="4" style="border-bottom:1px solid #efefef"><b>{$module}</b></td>
+<td colspan="4" style="border-bottom:1px solid #efefef"><b>{$APP.$module}</b></td>
 </tr>
 <tr>
 <td class="prvPrfTexture" style="width:20px">&nbsp;</td>
@@ -330,9 +330,9 @@
 <table border="0" cellspacing="0" cellpadding="5" width="100%" class="small">
 {foreach item=element from=$value}
 <tr>
-<td width=25%>{$element.0.0}</td>
+<td width=25%>{$APP[$element.0.0]}</td>
 <td width=25%>{$element.0.1}</td>
-<td width=25%>{$element.1.0}</td>
+<td width=25%>{$APP[$element.1.0]}</td>
 <td width=25%>{$element.1.1}</td>
 {/foreach}
 </tr>
@@ -387,7 +387,7 @@
 <td>
 <select id="module_list" name="module_list" onchange="showmoduleperm(this)">
 {foreach key=module item=label from=$PRI_FIELD_LIST}
-<option value="{$label}">{$label}</option>
+<option value="{$label}">{$APP.$label}</option>
 {/foreach}
 </td>
 <td width=50%>&nbsp;</td>

Modified: vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl Wed Jun  7 09:23:54 2006
@@ -171,17 +171,18 @@
 		<table border=0 cellspacing=0 cellpadding=5 width=100% class=small>
 		
 		<tr>
-		<td>{$CMOD.LBL_ENTITY}</td>
-		<td>{$CMOD.LBL_CREATE_EDIT}</td>
-		<td>{$CMOD.LBL_DELETE}</td>
-		<td>{$CMOD.LBL_VIEW}</td>
+		<td><b>{$CMOD.LBL_ENTITY}</b></td>
+		<td><b>{$CMOD.LBL_CREATE_EDIT}</b></td>
+		<td><b>{$CMOD.LBL_DELETE}</b></td>
+		<td><b>{$CMOD.LBL_VIEW}</b></td>
 		</tr>
 		
 		{foreach item=value from=$STANDARD_PRIV}
 		<tr>
-		{foreach item=element from=$value}
-		<td>{$element}</td>
-		{/foreach}
+		<td>{$APP[$value.0]}</td>
+		<td>{$value.1}</td>
+		<td>{$value.2}</td>
+		<td>{$value.3}</td>
 		</tr>
 		{/foreach}
 		
@@ -242,7 +243,7 @@
 		{foreach item=value from=$TAB_PRIV}
 		<tr>
 		{foreach item=element from=$value}
-		<td width=35%>{$element.0}</td>
+		<td width=35%>{$APP[$element.0]}</td>
 		<td width=15%>{$element.1}</td>
 		{/foreach}
 		</tr>
@@ -308,9 +309,9 @@
 		<table border="0" cellspacing="0" cellpadding="5" width="100%" class="small">
 		{foreach item=element from=$value}
 		<tr>
-		<td width=25%>{$element.0.0}</td>
+		<td width=25%>{$APP[$element.0.0]}</td>
 		<td width=25%>{$element.0.1}</td>
-		<td width=25%>{$element.1.0}</td>
+		<td width=25%>{$APP[$element.1.0]}</td>
 		<td width=25%>{$element.1.1}</td>
 		{/foreach}
 		</tr>
@@ -364,7 +365,7 @@
 		<td>
 		<select id="module_list" name="module_list" onchange="showmoduleperm(this)">
 		{foreach key=module item=label from=$PRI_FIELD_LIST}
-			<option value="{$label}">{$label}</option>
+			<option value="{$label}">{$APP.$label}</option>
 		{/foreach}
 		</td>
 		<td width=50%>&nbsp;</td>




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 11:26:06 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 15:26:06 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6957 -
 /vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl
Message-ID: <20060607152606.DA4797E8562@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 09:26:02 2006
New Revision: 6957

Log:
profile tpl updated

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 Wed Jun  7 09:26:02 2006
@@ -301,7 +301,7 @@
 		
 		{foreach key=module item=value from=$UTILITIES_PRIV}
 		<tr>
-		<td colspan="4" style="border-bottom:1px solid #efefef"><b>{$module}</b></td>
+		<td colspan="4" style="border-bottom:1px solid #efefef"><b>{$APP.$module}</b></td>
 		</tr>
 		<tr>
 		<td class="prvPrfTexture" style="width:20px">&nbsp;</td>




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 11:28:14 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 15:28:14 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6958 -
	/vtigercrm/trunk/include/language/en_us.lang.php
Message-ID: <20060607152814.B8CDE7E8621@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 09:28:11 2006
New Revision: 6958

Log:
lang file updated

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

Modified: vtigercrm/trunk/include/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/include/language/en_us.lang.php (original)
+++ vtigercrm/trunk/include/language/en_us.lang.php Wed Jun  7 09:28:11 2006
@@ -352,6 +352,11 @@
 'LBL_EXPORT'=>'Export',
 
 'LBL_EXPORT_ALL'=>'Export All',
+
+'Export'=>'Export',
+'Import'=>'Import',
+'Merge'=>'Merge',
+'ConvertLead'=>'ConvertLead',
 
 //3.2 release
 




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 11:31:01 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 15:31:01 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6959 - in /vtigercrm/trunk:
 Smarty/templates/ modules/Migration/ modules/Migration/ModifyDatabase/
 modules/Migration/language/
Message-ID: <20060607153101.DFC357E8562@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 09:30:51 2006
New Revision: 6959

Log:
* Modified to handle the MySQL Path not found problem in windows, added one more option to alter the 4.2.3 database setup directly and some queries

Modified:
    vtigercrm/trunk/Smarty/templates/MigrationStep1.tpl
    vtigercrm/trunk/modules/Migration/Migration.php
    vtigercrm/trunk/modules/Migration/MigrationCheck.php
    vtigercrm/trunk/modules/Migration/MigrationStep1.php
    vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php
    vtigercrm/trunk/modules/Migration/language/en_us.lang.php

Modified: vtigercrm/trunk/Smarty/templates/MigrationStep1.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/MigrationStep1.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/MigrationStep1.tpl Wed Jun  7 09:30:51 2006
@@ -1,240 +1,394 @@
-{*<!--
-/*********************************************************************************
-  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
-   * ("License"); You may not use this file except in compliance with the License
-   * The Original Code is:  vtiger CRM Open Source
-   * The Initial Developer of the Original Code is vtiger.
-   * Portions created by vtiger are Copyright (C) vtiger.
-   * All Rights Reserved.
-  *
- ********************************************************************************/
--->*}
-
-
-<script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
-<script language="JavaScript" type="text/javascript" src="include/js/general.js"></script>
-<style type="text/css">@import url(themes/blue/style.css);</style>
-
-<form name="Migration" method="POST" action="index.php" enctype="multipart/form-data">
-<input type="hidden" name="module" value="Migration">
-<input type="hidden" name="action" value="MigrationCheck">
-<input type="hidden" name="migration_option" value="">
-<input type="hidden" name="parenttab" value="Settings">
-
-<table width="100%" border="0" cellpadding="0" cellspacing="0" height="100%">
-   <tr>
-	<td class="showPanelBg" valign="top" width="95%"  style="padding-left:20px; "><br />
-		<span class="lvtHeaderText"> Settings &gt; Migrate from Previous Version </span>
-		<hr noshade="noshade" size="1" />
-	</td>
-	<td width="5%" class="showPanelBg">&nbsp;</td>
-   </tr>
-   <tr>
-	<td width="98%" style="padding-left:20px;" valign="top">
-		<!-- module Select Table -->
-		<table width="95%"  border="0" cellspacing="0" cellpadding="0" align="center">
-		   <tr>
-			<td width="7" height="6" style="font-size:1px;font-family:Arial, Helvetica, sans-serif;"><img src="{$IMAGE_PATH}top_left.jpg" align="top"  /></td>
-			<td bgcolor="#EBEBEB" style="font-size:1px;font-family:Arial, Helvetica, sans-serif;height:6px;"></td>
-			<td width="8" height="6" style="font-size:1px;font-family:Arial, Helvetica, sans-serif;"><img src="{$IMAGE_PATH}top_right.jpg" width="8" height="6" align="top" /></td>
-		   </tr>
-		   <tr>
-			<td bgcolor="#EBEBEB" width="7"></td>
-			<td bgcolor="#ECECEC" style="padding-left:10px;padding-top:10px;vertical-align:top;">
-				<table width="100%"  border="0" cellpadding="5" cellspacing="0">
-				   <tr>
-					<td width="10%"><img src="{$IMAGE_PATH}migrate.gif" align="absmiddle"/></td>
-					<td width="90%">
-						<span class="genHeaderBig">Migrate From Previous Version</span><br />
-						Update your new vtiger CRM 5 database with the data from previous installation<br />
-						To Start, follow the instructions below
-					</td>
-				   </tr>
-				   <tr bgcolor="#FFFFFF">
-					<td colspan="2">
-						<span class="genHeaderGray">Step 1 : </span>
-				  		<span class="genHeaderSmall">Select Source</span><br />
-						To Start Migration, you must specify the format in which the old data is Available<br /><br />
-					</td>
-				   </tr>
-				   <tr bgcolor="#FFFFFF">
-					<td align="right" valign="top"><input type="radio" name="radio" id="db_details" value="db_details" onclick="fnChangeMigrate()" "{$DB_DETAILS_CHECKED}" /></td>
-					<td><b>I Have the Data Base Format</b> ( Live Data )<br />
-						This option requires you to have the host machine's ( where the DB is stored ) address and DB access  details.
-						Both local and remote systems are supported in this method. Refer documentation for Help.
-					</td>
-				   </tr>
-				   <tr><td colspan="2" bgcolor="#FFFFFF" height="10"></td></tr>
-				   <tr bgcolor="#FFFFFF">
-					<td align="right" valign="top"><input type="radio" name="radio" id="dump_details" value="dump_details" onclick="fnChangeMigrate()" "{$DUMP_DETAILS_CHECKED}"/></td>
-					<td><b>I Have a Data Base as a Database Dump</b> ( Usually archived )<br />
-						This option requires you to have the dump file, in this local system.
-						You cannot specify a remote machine. Refer documentation for Help.
-					</td>
-				   </tr>
-				   <tr bgcolor="#FFFFFF">
-					<td align="right" valign="top"><b>Note: </b></td>
-					<td>{$MOD.LBL_NOTES_DUMP_PROCESS}</td>
-				   </tr>
-				   <tr><td colspan="2" height="10"></td></tr>
-				   <tr bgcolor="#FFFFFF">
-					<td colspan="2">
-						<!-- OPTION 1 -->
-						<div id="mnuTab" style="display:{$SHOW_DB_DETAILS}">
-							<table width="100%" border="0" cellpadding="5" cellspacing="0">
-							   <tr bgcolor="#FFFFFF">
-								<td colspan="2">
-									<span class="genHeaderGray">Step 2 : </span>
-									<span class="genHeaderSmall">Host Database Access Details</span><br /><br />
-								</td>
-							   </tr>
-							   <tr>
-								<td width="30%" align="right">Source MySQL Host Name or IP Address : </td>
-								<td width="70%"><input type="text" name="old_host_name" class="importBox" value="{$OLD_HOST_NAME}" /></td>
-							   </tr>
-							   <tr>
-								<td align="right">Source MySQL Port Number : </td>
-								<td><input type="text" name="old_port_no" class="importBox" value="{$OLD_PORT_NO}" /></td>
-							   </tr>
-							   <tr>
-								<td align="right">Source MySql User Name : </td>
-								<td><input type="text" name="old_mysql_username" class="importBox" value="{$OLD_MYSQL_USERNAME}" /></td>
-							   </tr>
-							   <tr>
-								<td align="right">Source MySql Password : </td>
-								<td><input type="text" name="old_mysql_password" class="importBox" value="{$OLD_MYSQL_PASSWORD}" /></td>
-							   </tr>
-							   <tr>
-								<td align="right">Source Database Name : </td>
-								<td><input type="text" name="old_dbname" class="importBox" value="{$OLD_DBNAME}" /></td>
-							   </tr>
-							</table>
-						</div>
-
-						<!-- OPTION 2 -->
-						<div id="mnuTab2" style="display:{$SHOW_DUMP_DETAILS}">
-							<table width="100%" border="0" cellpadding="5" cellspacing="0">
-							   <tr bgcolor="#FFFFFF">
-								<td colspan="2">
-									<span class="genHeaderGray">Step 2 : </span>
-									<span class="genHeaderSmall">Locate Database Dump File</span><br /><br />
-								</td>
-							   </tr>
-							   <tr>
-								<td width="10%">&nbsp;</td>
-								<td width="90%">
-									Dump File Location : 
-									<input type="file" name="old_dump_filename" class="txtBox" />
-								</td>
-							   </tr>
-							</table>
-						</div>
-
-					</td>
-				   </tr>
-				   <tr>
-					<td colspan="2" style="padding:10px;" align="center">
-						<input type="submit" name="migrate" value="  Migrate  "  class="classBtn" onclick="return validate_migration(Migration);"/>
-						&nbsp;<input type="submit" name="cancel" value=" &nbsp;Cancel&nbsp; "  class="classBtn" onclick="this.form.module.value='Settings';this.form.action.value='index';"/>
- 					</td>
-				   </tr>
-				</table>
-			</td>
-			<td bgcolor="#EBEBEB" width="8"></td>
-		   </tr>
-		   <tr>
-			<td width="7" height="8" style="font-size:1px;font-family:Arial, Helvetica, sans-serif;"><img src="{$IMAGE_PATH}bottom_left.jpg" align="bottom"  /></td>
-			<td bgcolor="#ECECEC" height="8" style="font-size:1px;" ></td>
-			<td width="8" height="8" style="font-size:1px;font-family:Arial, Helvetica, sans-serif;"><img src="{$IMAGE_PATH}bottom_right.jpg" align="bottom" /></td>
-		   </tr>
-		</table>
-		<br />
-	</td>
-	<td>&nbsp;</td>
-   </tr>
-</table>
-<!-- END -->
-</form>
-
-<script language="javascript" type="text/javascript">
-	//function to show and hide the db_details or dump_details details based on the radio option selected
-	function fnChangeMigrate()
-	{ldelim}
-		var opt_one = document.getElementById('db_details').checked;
-		var opt_two = document.getElementById('dump_details').checked;
-		if(opt_one)
-		{ldelim}
-			document.getElementById('mnuTab').style.display = 'block';
-			document.getElementById('mnuTab2').style.display = 'none';
-		{rdelim}
-		else
-		{ldelim}
-			document.getElementById('mnuTab').style.display = 'none';
-			document.getElementById('mnuTab2').style.display = 'block';
-		{rdelim}
-	{rdelim}
-
-	//function to validate the input values based on the radio option selected
-	function validate_migration(formname)
-	{ldelim}
-
-		var error = false;
-		var mig_option = '';
-
-		if(document.getElementById("db_details").checked == true)
-		{ldelim}
-			formname.migration_option.value = 'db_details';
-			//check whether the user entered the valid Source MySQL database details when db details selected
-			if(trim(formname.old_host_name.value) == '')
-			{ldelim}
-				error_msg = "Please enter the Source Host Name";
-				error = true;
-			{rdelim}
-			else if(trim(formname.old_port_no.value) == '')
-			{ldelim}
-				error_msg = "Please enter the Source MySql Port Number";
-				error = true;
-			{rdelim}
-			else if(trim(formname.old_mysql_username.value) == '')
-			{ldelim}
-				error_msg = "Please enter the Source MySql User Name";
-				error = true;
-			{rdelim}
-			else if(trim(formname.old_dbname.value) == '')
-			{ldelim}
-				error_msg = "Please enter the Source Database Name";
-				error = true;
-			{rdelim}
-		{rdelim}
-		else if(document.getElementById("dump_details").checked == true)
-		{ldelim}
-			formname.migration_option.value = 'dump_details';
-			//check whether the user entered the MySQL File when dump file details selected
-			if(trim(formname.old_dump_filename.value) == '')
-			{ldelim}
-				error_msg = "Please enter the Valid MySQL Dump File";
-				error = true;
-			{rdelim}
-		{rdelim}
-		else
-		{ldelim}
-			formname.migration_option.value = '';
-			error_msg = "Please select any one option";
-			error = true;
-		{rdelim}
-
-		//if there is any error then alert the user and return false;
-		if(error == true)
-		{ldelim}
-			alert(error_msg);
-			return false;
-		{rdelim}
-		else
-		{ldelim}
-			return true;
-		{rdelim}
-
-		return false;
-	{rdelim}
-</script>
-
+{*<!--
+/*********************************************************************************
+  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
+   * ("License"); You may not use this file except in compliance with the License
+   * The Original Code is:  vtiger CRM Open Source
+   * The Initial Developer of the Original Code is vtiger.
+   * Portions created by vtiger are Copyright (C) vtiger.
+   * All Rights Reserved.
+  *
+ ********************************************************************************/
+-->*}
+
+
+<script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
+<script language="JavaScript" type="text/javascript" src="include/js/general.js"></script>
+<style type="text/css">@import url(themes/blue/style.css);</style>
+
+<form name="Migration" method="POST" action="index.php" enctype="multipart/form-data">
+<input type="hidden" name="module" value="Migration">
+<input type="hidden" name="action" value="MigrationCheck">
+<input type="hidden" name="migration_option" value="">
+<input type="hidden" name="parenttab" value="Settings">
+<input type="hidden" id="getmysqlpath" name="getmysqlpath" value="{$GET_MYSQL_PATH}">
+
+<table width="100%" border="0" cellpadding="0" cellspacing="0" height="100%" class="small">
+   <tr>
+	<td class="showPanelBg" valign="top" width="95%"  style="padding-left:20px; "><br />
+		<span class="lvtHeaderText"> Settings &gt; Migrate from Previous Version </span>
+		<hr noshade="noshade" size="1" />
+	</td>
+	<td width="5%" class="showPanelBg">&nbsp;</td>
+   </tr>
+   <tr>
+	<td width="98%" style="padding-left:20px;" valign="top">
+		<!-- module Select Table -->
+		<table width="95%"  border="0" cellspacing="0" cellpadding="0" align="center" class="small">
+		   <tr>
+			<td width="7" height="6" style="font-size:1px;font-family:Arial, Helvetica, sans-serif;"><img src="{$IMAGE_PATH}top_left.jpg" align="top"  /></td>
+			<td bgcolor="#EBEBEB" style="font-size:1px;font-family:Arial, Helvetica, sans-serif;height:6px;"></td>
+			<td width="8" height="6" style="font-size:1px;font-family:Arial, Helvetica, sans-serif;"><img src="{$IMAGE_PATH}top_right.jpg" width="8" height="6" align="top" /></td>
+		   </tr>
+		   <tr>
+			<td bgcolor="#EBEBEB" width="7"></td>
+			<td bgcolor="#ECECEC" style="padding-left:10px;padding-top:10px;vertical-align:top;">
+				<table width="100%"  border="0" cellpadding="5" cellspacing="0" class="small">
+				   <tr>
+					<td width="10%"><img src="{$IMAGE_PATH}migrate.gif" align="absmiddle"/></td>
+					<td width="90%">
+						<span class="genHeaderBig">Migrate From Previous Version</span><br />
+						Update your new vtiger CRM 5 database with the data from previous installation<br />
+						To Start, follow the instructions below
+					</td>
+				   </tr>
+				   <tr bgcolor="#FFFFFF">
+					<td colspan="2">
+						<span class="genHeaderGray">Step 1 : </span>
+				  		<span class="genHeaderSmall">Select Source</span><br />
+						To Start Migration, you must specify the format in which the old data is Available<br /><br />
+					</td>
+				   </tr>
+				   <tr bgcolor="#FFFFFF">
+					<td align="right" valign="top">
+						<input type="radio" name="radio" id="db_details" value="db_details" onclick="fnChangeMigrate()" "{$DB_DETAILS_CHECKED}" />
+					</td>
+					<td>
+						<b>I Have the Data Base Format</b> ( Live Data )<br />
+						This option requires you to have the host machine's ( where the DB is stored ) address and DB access  details.
+						Both local and remote systems are supported in this method. Refer documentation for Help.
+					</td>
+				   </tr>
+				   <tr><td colspan="2" bgcolor="#FFFFFF" height="10"></td></tr>
+				   <tr bgcolor="#FFFFFF">
+					<td align="right" valign="top">
+						<input type="radio" name="radio" id="dump_details" value="dump_details" onclick="fnChangeMigrate()" "{$DUMP_DETAILS_CHECKED}"/>
+					</td>
+					<td>
+						<b>I Have a Data Base as a Database Dump</b> ( Usually archived )<br />
+						This option requires you to have the dump file, in this local system


From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 11:34:41 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 15:34:41 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6960 -
 /vtigercrm/trunk/modules/Users/language/en_us.lang.php
Message-ID: <20060607153441.495F77E8627@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 09:34:37 2006
New Revision: 6960

Log:
lang file updated

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

Modified: vtigercrm/trunk/modules/Users/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Users/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Users/language/en_us.lang.php Wed Jun  7 09:34:37 2006
@@ -479,7 +479,7 @@
 'LBL_GLOBAL_ACCESS_PRIVILEGES'=>'Global Access Privileges',
 'LBL_CUSTOM_ACCESS_PRIVILEGES'=>'Custom Access Privileges',
 'LBL_BOTH'=>'Both',
-'LBL_VIEW'=>'view',
+'LBL_VIEW'=>'View',
 'LBL_RECALCULATE_BUTTON'=>'Recalculate',
 'LBL_ADD_PRIVILEGES_BUTTON'=>'Add Privileges',
 'LBL_CUSTOM_ACCESS_MESG'=>'No Custom Access Rules defined .',




From vtiger-tickets at vtiger.fosslabs.com  Wed Jun  7 11:41:31 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 07 Jun 2006 15:41:31 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231277=3A?=
 =?utf-8?q?_Can=27t_translate_term_close_without_problem?=
In-Reply-To: <076.d518c5251779ede24caf171d8d809788@vtiger.fosslabs.com>
References: <076.d518c5251779ede24caf171d8d809788@vtiger.fosslabs.com>
Message-ID: <085.669ad77fa6846e7ecae6596a4f500d93@vtiger.fosslabs.com>

#1277: Can't translate term close without problem
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  developer
      Type:  defect     |      Status:  new      
  Priority:  major      |   Milestone:  5.0.0    
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:             |    Keywords:           
------------------------+---------------------------------------------------
Comment (by juao):

 This was already solved for milestone 4.2.4 (ticket #27) with changeset
 [3879]
 Do the same for 5.0.0 and i think the problem will be solved.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1277>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 11:47:49 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 15:47:49 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6961 -
 /vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php
Message-ID: <20060607154749.9C31C7E8627@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 09:47:45 2006
New Revision: 6961

Log:
* Added 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 Wed Jun  7 09:47:45 2006
@@ -2882,78 +2882,77 @@
 
 
 //Security profile and tab table handling by DON starts
-	$sql_sec="select profileid from  profile";
-	$result_sec=$conn->query($sql_sec);
-	$num_rows=$conn->num_rows($result_sec);
-	for($i=0;$i<$num_row;$i++)
-	{
-		$prof_id=$conn->query_result($result_sec,$i,'profileid');
-		$sql1_sec="insert into profile2utility values(".$prof_id.",13,8,0)";
-		Execute($sql1_sec);
-		
-		$sql2_sec="insert into profile2utility values(".$prof_id.",7,9,0)";
-		Execute($sql2_sec);
-
-		$sql3_sec="insert into profile2tab values(".$prof_id.",26,0)";
-                Execute($sql3_sec);
-
-		$sql4_sec="insert into profile2tab values(".$prof_id.",27,0)";
-                Execute($sql4_sec);
-
-		$sql7_sec="insert into profile2standardpermissions values(".$prof_id.",26,0,0)";
-                Execute($sql7_sec);
-
-		$sql8_sec="insert into profile2standardpermissions values(".$prof_id.",26,1,0)";
-                Execute($sql8_sec);
-
-		$sql9_sec="insert into profile2standardpermissions values(".$prof_id.",26,2,0)";
-                Execute($sql9_sec);
-
-		$sql10_sec="insert into profile2standardpermissions values(".$prof_id.",26,3,0)";
-                Execute($sql10_sec);
-
-		$sql11_sec="insert into profile2standardpermissions values(".$prof_id.",26,4,0)";
-                Execute($sql11_sec);	
-		
-	}
-
-	//Inserting into tab tables
-	$sec2="INSERT INTO tab VALUES (27,'Portal',0,24,'Portal',null,null,1)";
-	$sec3="INSERT INTO tab VALUES (28,'Webmails',0,25,'Webmails',null,null,1)";
-
-	//Insert into def_org_share tables
-	$sec4="insert into def_org_share values (".$conn->getUniqueID('def_org_share').",26,2,0)";	
-
-	Execute($sec2);
-	Execute($sec3);
-	Execute($sec4);
-
-	//Inserting into datashare related modules table
-
-	Execute("insert into datashare_relatedmodules_seq values(1)");
+$sql_sec="select profileid from  profile";
+$result_sec=$conn->query($sql_sec);
+$num_rows=$conn->num_rows($result_sec);
+for($i=0;$i<$num_row;$i++)
+{
+	$prof_id=$conn->query_result($result_sec,$i,'profileid');
+	$sql1_sec="insert into profile2utility values(".$prof_id.",13,8,0)";
+	Execute($sql1_sec);
+
+	$sql2_sec="insert into profile2utility values(".$prof_id.",7,9,0)";
+	Execute($sql2_sec);
+
+	$sql3_sec="insert into profile2tab values(".$prof_id.",26,0)";
+	Execute($sql3_sec);
+
+	$sql4_sec="insert into profile2tab values(".$prof_id.",27,0)";
+	Execute($sql4_sec);
+
+	$sql7_sec="insert into profile2standardpermissions values(".$prof_id.",26,0,0)";
+	Execute($sql7_sec);
+
+	$sql8_sec="insert into profile2standardpermissions values(".$prof_id.",26,1,0)";
+	Execute($sql8_sec);
+
+	$sql9_sec="insert into profile2standardpermissions values(".$prof_id.",26,2,0)";
+	Execute($sql9_sec);
+
+	$sql10_sec="insert into profile2standardpermissions values(".$prof_id.",26,3,0)";
+	Execute($sql10_sec);
+
+	$sql11_sec="insert into profile2standardpermissions values(".$prof_id.",26,4,0)";
+	Execute($sql11_sec);	
+
+}
+
+//Inserting into tab tables
+$sec2="INSERT INTO tab VALUES (27,'Portal',0,24,'Portal',null,null,1)";
+$sec3="INSERT INTO tab VALUES (28,'Webmails',0,25,'Webmails',null,null,1)";
+
+//Insert into def_org_share tables
+$sec4="insert into def_org_share values (".$conn->getUniqueID('def_org_share').",26,2,0)";	
+
+Execute($sec2);
+Execute($sec3);
+Execute($sec4);
+
+//Inserting into datashare related modules table
+
+Execute("insert into datashare_relatedmodules_seq values(1)");
 	
-	//Lead Related Module
-                Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",7,10)");
-
-                //Account Related Module
-                Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",6,2)");
-                Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",6,13)");
-                Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",6,20)");
-                Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",6,22)");
-                Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",6,23)");
-                Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",6,10)");
-
-
-	
-		//Potential Related Module
-                Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",2,20)");
-                Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",2,22)");
-
-                //Quote Related Module
-                Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",20,22)");
-
-                //SO Related Module
-                Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",22,23)");
+//Lead Related Module
+Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",7,10)");
+
+//Account Related Module
+Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",6,2)");
+Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",6,13)");
+Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",6,20)");
+Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",6,22)");
+Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",6,23)");
+Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",6,10)");
+
+
+//Potential Related Module
+Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",2,20)");
+Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",2,22)");
+
+//Quote Related Module
+Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",20,22)");
+
+//SO Related Module
+Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",22,23)");
 	
 
 //By Don Ends
@@ -2962,10 +2961,30 @@
 $alter_query18 = "alter table mail_accounts add column int_mailer int(1) default '0'";
 Execute($alter_query18);
 
-
-
-
-
+$update_query_array5 = Array(
+	"update field set info_type='BAS' where tabid=6 and fieldname in ('tickersymbol','account_id')",
+	"update relatedlists set label = 'Activity History' where tabid in (4,6,7,20,21,22,23) and label = 'History'",
+	"update relatedlists set label = 'Products' where tabid=2 and name='get_products' and label='History'",
+	"update relatedlists set label = 'Activity History' where tabid=2 and name='get_history' and label='History'"
+			    );
+foreach($update_query_array5 as $query)
+{
+	Execute($query);
+}
+
+$insert_query_array27 = Array(
+	"insert into relatedlists values(".$conn->getUniqueID('relatedlists').",13,0,'get_ticket_history',3,'Ticket History',0)",
+	"insert into parenttabrel values (2,10,4)",
+	"insert into parenttabrel values (4,10,7)"
+			     );
+foreach($insert_query_array27 as $query)
+{
+	Execute($query);
+}
+
+
+
+			     
 
 //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 Jun  7 14:06:41 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 07 Jun 2006 18:06:41 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=2348=3A_S?=
 =?utf-8?q?ales_Orders_Created_from_Quote_are_not_saved_and_do_not_retain_?=
 =?utf-8?q?associations?=
In-Reply-To: <076.6d585e55b32136b76a36642c5be35e19@vtiger.fosslabs.com>
References: <076.6d585e55b32136b76a36642c5be35e19@vtiger.fosslabs.com>
Message-ID: <085.eddaf7a5aee20b81c69248a1085e0ac1@vtiger.fosslabs.com>

#48: Sales Orders Created from Quote are not saved and do not retain
associations
-----------------------------------------------+----------------------------
  Reporter:  onwealdandy <arodes at onweald.com>  |       Owner:  developer
      Type:  defect                            |      Status:  reopened 
  Priority:  major                             |   Milestone:  4.2.5    
 Component:  vtigercrm                         |     Version:  4.2.3    
Resolution:                                    |    Keywords:  order    
-----------------------------------------------+----------------------------
Changes (by anonymous):

  * milestone:  4.2.4 => 4.2.5

Comment:

 source:vtigercrm/tags/vtigercrm-4.2.4 recently released. Moving milestone
 target to next point release of vtigercrm-4.2 series, vtigercrm-4.2.5.
 Please confirm problem still exists on that branch.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/48>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 14:23:22 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 18:23:22 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6962 - in
 /vtigercrm/branches/4.2: ./ install/ log4php/appenders/ modules/Users/
 themes/Aqua/ themes/blue/ themes/nature/ themes/orange/
Message-ID: <20060607182322.B21DE7E864C@vtiger.fosslabs.com>

Author: jeffk
Date: Wed Jun  7 12:23:13 2006
New Revision: 6962

Log:
merge source:vtigercrm/branches/4.2.4 r6803:6819 to source:vtigercrm/branches/4.2 in preparation for removal of source:vtigercrm/branches/4.2.4, which has been tagged source:vtigercrm/tags/vtigercrm-4.2.4

Modified:
    vtigercrm/branches/4.2/changelog.txt
    vtigercrm/branches/4.2/config.inc.php
    vtigercrm/branches/4.2/config.template.php
    vtigercrm/branches/4.2/install/2setConfig.php
    vtigercrm/branches/4.2/log4php/appenders/LoggerAppenderFile.php
    vtigercrm/branches/4.2/modules/Users/about_us.php
    vtigercrm/branches/4.2/themes/Aqua/header.html
    vtigercrm/branches/4.2/themes/blue/header.html
    vtigercrm/branches/4.2/themes/nature/header.html
    vtigercrm/branches/4.2/themes/orange/header.html
    vtigercrm/branches/4.2/vtigerversion.php

Modified: vtigercrm/branches/4.2/changelog.txt
==============================================================================
--- vtigercrm/branches/4.2/changelog.txt (original)
+++ vtigercrm/branches/4.2/changelog.txt Wed Jun  7 12:23:13 2006
@@ -1,7 +1,92 @@
+vtigerCRM v4.2.4 (Jun 1, 2006)
+-------------------------------
+
+NOTE: first time vtigerCRM users can directly install the source in their vtiger supported version of LAMP / WAMP. 
+
+bug fixes
+---------
+
+r3606: Issue in Pop-up New link which caused elements to disappear when hovering over ">>"
+r3607: Display currency symbol in listview header
+r3608: Added dash after Potential Name when converting from Lead
+r3609: Start/End date options in Custom View
+r3614: utils.php call time pass reference error
+r3615: fix for totals in reports not showing up
+r3616: PearDatabase.php call time pass reference
+r3617: Signatures are double-spaced in e-mails
+r3618: vendor search has a field "company" .but vendor form does not have company field
+r3619: "Email" mapping added for new search field
+r3773: Search leads by Fax in advanced search
+r3775: Order pending activities by date and time
+r3776: Allow more lead columns to be sorted
+r3777: Import CSV files with CR as line ending
+r3779: Set memory limit higher than 8mb
+r3783: removing schtasks.exe from source cron directory
+r3784: move DatabaseSchema.xml out of adodb/ into new schema/ directory
+r3787: Emails that contain HTML characters cause bad display in the Reply, Reply to All buttons area
+r3789: My Group Allocation on the Home page does not have a border on the right edge
+r3790: When switching from Email to Webmails and back to Emails, the tabs are drawn incorrectly
+r3792: Products listed in the Help Desk custom views display the record ID instead of the Product Name
+r3794: Missing border on Home module with more than 5 tickets open
+r3795: Remove readonly attribs from installer db form fields
+r3796: when we display fieldlabels, the label will not be displayed if there is a special character(like &)
+r3803: copyright / license cleanup
+r3809: install cleanup
+r3811: unified naming scheme to vtigerCRM files
+r3824: split README with Changelog
+r3831: fix extraneous colon character appearing in installer stage 3 next to database name
+r3833: add template for config file and 4.2.3 sql file
+r3834: add config file for FHS system
+r3868: update to jpgraph-1.20.3
+r3869: rename db_host_name and db_user_name to db_hostname and db_username
+r3871: move columns for sunday and week number to the right
+r3872: Fix Home Ticket List is Colored Opposite of Other Sections
+r3873: Fix html emails sent with tags viewable
+r3874: fixed time shift occuring if the calendar view spans a time change (daylight saving switch) 
+r3875: removed magic quotes check on input sanitization as magic quotes are removed on all input in the index.php file
+r3876: Apostrophe in description of Lead means that the lead is lost upon converting
+r3877: Don't die 'Couldn't get the group listing'
+r3878: fix direct calls to mysql functions
+r3879: Fix activities relatedlist won't display well if translated
+r3891: Fix missing "break" in OpenListView.php CASE statement
+r3892: Show rendered html instead of tags in notes editor
+r3911: update to adodb-4.72
+r3912: Fix Quotes/Invoices/Orders Do Not Support Negative Adjustments
+r3914: add file to extract adodb XML schema from database
+r3915: remove unused code in extractSchema
+r3931: port constraints & table type hack for AXMLS from 4.55 to 4.72
+r3932: Add indexes & fix FK name collisions in DB XML Schema
+r3933: Remove foreign keys that point to missing fields
+r3934: remove duplicate indexes in database
+r3935: turn on adodb and AXMLS debugging during install
+r3937: installer use template file
+r3938: Put vtiger version and release date only in vtigerversion.php
+r3940: config.inc.php is configuration file included by config.php
+r3941: added missing parameters in template file
+r3942: create install/5createTables.inc.php and modify install.php to use it when called from the command line
+r3943: output one less line to compensate for create_default_users().  see #40
+r3945: fix scope issue in getUserFldArray()
+r3966: remove old unused modules and files
+r4051: Remove hard coded upload limits
+r4057: changes made to support multiple packaging
+r4058: reduce memory usage in lead attachment upload code
+r4059: reduce adodb memory usage to enable larger BLOB uploads
+r4392: clean up uninitialized var notice while importing leads ref #70
+r4394: disable installer after successful install for security reasons.  closes #25
+r4397: Patch forUnicode-readyAlphabeticalSearch(), by justoff.
+r4399: Jpgraph fixes for Traditional Chinese, by kiange. closes #37
+r4400: Fix quotes are not created correctly form Potentials or from Quote screen, by onwealdandy. closes #51
+r4401: Translate of hard code by Summing columns in reports, by kleo. closes #54
+r4402: urlencode the downloading filename to deal with special characters, by mcrowe. closes #64
+r4443: expand lead street field to match street maxlen in contacts
+r5079: Detect if the key metric is for a sub module and set the partent module and appropriate sub module code when needed. Closes #93.
+r5113: Added inital condition check before looping through the parts list.  Closes #96.
+r6804: $host_name doesn't appear to be used anywhere, removing from configureation.  Closes #68.
+
+
+
 vtigerCRM v4.2.3 (Dec 23, 2005)
 -------------------------------
-
-NOTE: first time vtigerCRM users can directly install the source in their vtiger supported version of LAMP / WAMP. 
 
 vulnerability fixes
 -------------------
@@ -20,6 +105,7 @@
 b) Authentication ByPass
 c) Unsafe File Inclusion
 d) Arbitrary code execution
+
 
 vtigerCRM v4.2 Patch 2 (Sep 15, 2005)
 -------------------------------------
@@ -125,6 +211,7 @@
 61.  T2512   - Home upcoming activities
 62.  P8030   - Meetings not held must not be shown in upcoming activities
 
+
 vtigerCRM v4.2 Patch 1 (Aug 10, 2005)
 -------------------------------------
 
@@ -197,6 +284,7 @@
 59. Internal: Single, double quotes problem in ticket comments and FAQ comments
 60. Forum Topic ID 1612: Misbehaviour on validation of number fields
 
+
 vtigerCRM v4.2 GA (July 18, 2005)
 ---------------------------------
 
@@ -379,6 +467,7 @@
 NOTE: For more details about vtigerCRM v4.2 Release Notes, Please refer to the following URL:
 http://www.vtiger.com/wiki/index.php/Vtiger_CRM_4_2_Release_Notes
  
+ 
 vtigerCRM v4.2 Alpha (May 31, 2005)
 -----------------------------------
 
@@ -397,6 +486,7 @@
 10. Event Reminders
 11. Configurable Email Notifications
 12. Incoming Email Support
+
 
 vtigerCRM v4.0.1 (April 29, 2005)
 ---------------------------------
@@ -465,6 +555,7 @@
 49) Displaying of Closed Ticket in Home Page.
 50) Deleted entities are getting listed in Tracker.
 51) Enabling History tabs in Leads, Contacts, Accounts and Potentials for Activity History.
+
 
 vtigerCRM v4.0 (March 29, 2005)
 --------------------------------
@@ -682,6 +773,7 @@
 2. In Windowos OS, System Inoformantion is not displayed
 3. While importing leads, accounts, contacts, and potentials the XLS file format can be browsed even though the allowed file format is CSV.
  
+ 
 vtigerCRM v4.0 Beta (January 10, 2005)
 -------------------------------------
 
@@ -724,6 +816,7 @@
 18. 1093669 - Delete attachments
 19. Support for Latest versions of Apache and MySQL in installation wizard (Both Linux and Windows).
 
+
 vtigerCRM v3.2.1 (December 21, 2004)
 ------------------------------------
 
@@ -745,6 +838,7 @@
 g) Proper Message display is done when a user with no delete privileges tries to delete the entity.
 h) vtiger Outlook Plug-in in server side fixes related to performance improvement.
 
+
 vtigerCRM v3.2 (December 13, 2004)
 ----------------------------------
 
@@ -775,6 +869,7 @@
 
 Released vtiger Outlook Plug-in, business productivity enhancement utility for Microsoft Outlook users.
 It is an open source project covered under vtiger Public License 1.0 based on Mozilla Public License 1.1.
+
 
 vtigerCRM v2.0 (September 6, 2004)
 ----------------------------------
@@ -808,6 +903,7 @@
 
 Send your feedback, which is vital for our understanding your needs.
 
+
 vtigerCRM v1.0 (August 26, 2004)
 --------------------------------
 

Modified: vtigercrm/branches/4.2/config.inc.php
==============================================================================
--- vtigercrm/branches/4.2/config.inc.php (original)
+++ vtigercrm/branches/4.2/config.inc.php Wed Jun  7 12:23:13 2006
@@ -48,6 +48,9 @@
 $dbconfig['db_name'] = 'vtigercrm';
 $dbconfig['db_type'] = 'pgsql';
 $dbconfig['db_status'] = 'true';
+
+//$site_URL = '';
+//$root_directory = '';
 
 // TODO: test if port is empty
 // TODO: set db_hostname dependending on db_type
@@ -178,4 +181,12 @@
 // translation_string_prefix default value = false
 $translation_string_prefix = false;
 
+// access level for vtiger log files
+// set to 1, the vtiger.log will be readable by the owner (chmod: 0600)
+// set to 0, the vtiger.log will not be readable remotely (chmod: 0200)
+
+// 0 is recommended for security.
+// You may need to set it to 1 to read it for certain hosted accounts.
+$log_readable = 0;
+
 ?>

Modified: vtigercrm/branches/4.2/config.template.php
==============================================================================
--- vtigercrm/branches/4.2/config.template.php (original)
+++ vtigercrm/branches/4.2/config.template.php Wed Jun  7 12:23:13 2006
@@ -73,8 +73,6 @@
 
 // ssl default value = false
 $dbconfigoption['ssl'] = false;
-
-$host_name = $dbconfig['db_hostname'];
 
 $site_URL = '_SITE_URL_';
 
@@ -178,4 +176,12 @@
 // translation_string_prefix default value = false
 $translation_string_prefix = false;
 
+// access level for vtiger log files
+// set to 1, the vtiger.log will be readable by the owner (chmod: 0600)
+// set to 0, the vtiger.log will not be readable remotely (chmod: 0200)
+
+// 0 is recommended for security.
+// You may need to set it to 1 to read it for certain hosted accounts.
+$log_readable = 0;
+
 ?>

Modified: vtigercrm/branches/4.2/install/2setConfig.php
==============================================================================
--- vtigercrm/branches/4.2/install/2setConfig.php (original)
+++ vtigercrm/branches/4.2/install/2setConfig.php Wed Jun  7 12:23:13 2006
@@ -112,9 +112,6 @@
 
   !isset($_REQUEST['db_drop_tables']) ? $db_drop_tables = "0" : $db_drop_tables = $_REQUEST['db_drop_tables'];
 
-  if (isset($_REQUEST['host_name'])) $host_name = $_REQUEST['host_name'];
-    else $host_name = $hostname;
-
   if (isset($_REQUEST['site_URL'])) $site_URL = $_REQUEST['site_URL'];
     else $site_URL = $web_root;
 
@@ -150,7 +147,6 @@
   */
   !isset($_REQUEST['db_name']) ? $db_name = "vtigercrm4_2_4" : $db_name = $_REQUEST['db_name'];
   !isset($_REQUEST['db_drop_tables']) ? $db_drop_tables = "0" : $db_drop_tables = $_REQUEST['db_drop_tables'];
-  !isset($_REQUEST['host_name']) ? $host_name= $hostname : $host_name= $_REQUEST['host_name'];
   !isset($_REQUEST['site_URL']) ? $site_URL = $web_root : $site_URL = $_REQUEST['site_URL'];
   !isset($_REQUEST['root_directory']) ? $root_directory = $current_dir : $root_directory = stripslashes($_REQUEST['root_directory']);
   !isset($_REQUEST['cache_dir']) ? $cache_dir = $cache_dir : $cache_dir = stripslashes($_REQUEST['cache_dir']);

Modified: vtigercrm/branches/4.2/log4php/appenders/LoggerAppenderFile.php
==============================================================================
--- vtigercrm/branches/4.2/log4php/appenders/LoggerAppenderFile.php (original)
+++ vtigercrm/branches/4.2/log4php/appenders/LoggerAppenderFile.php Wed Jun  7 12:23:13 2006
@@ -26,6 +26,12 @@
 require_once(LOG4PHP_DIR . '/helpers/LoggerOptionConverter.php');
 require_once(LOG4PHP_DIR . '/LoggerLog.php');
 
+if (!defined('ROOT_DIR')) define('ROOT_DIR', LOG4PHP_DIR . '/..');
+if (!defined('LOG_READ'))
+{
+	include(ROOT_DIR . '/config.php');
+	define('LOG_READ', $log_readable);
+}
 /**
  * FileAppender appends log events to a file.
  *
@@ -77,7 +83,8 @@
         $this->fp = @fopen($fileName, ($this->getAppend()? 'a':'w'));
 
 	// Denying read option for log file. Added for Vulnerability fix
-        if (is_readable($fileName)) chmod ($fileName,0200);
+        if (is_readable($fileName) and (LOG_READ == 0)) chmod ($fileName,0200);
+        if (!is_readable($fileName) and (LOG_READ == 1)) chmod ($fileName,0600);
 
         if ($this->fp) {
             if ($this->getAppend())

Modified: vtigercrm/branches/4.2/modules/Users/about_us.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Users/about_us.php (original)
+++ vtigercrm/branches/4.2/modules/Users/about_us.php Wed Jun  7 12:23:13 2006
@@ -37,28 +37,33 @@
 </tr>
 
 <tr>
-<td class="dataLabel" height="30 px"><font face="Helvetica, sans-serif"><b>4.2.3 Release Date:&nbsp;</b></td>
-<td class="dataField" height="30 px">&nbsp;<?php echo $release_date; ?><span class="gensmall"> (Current version)</span></td>
+<td class="dataLabel" height="30 px"><font face="Helvetica, sans-serif"><b>4.2.4 Release Date:&nbsp;</b></td>
+<td class="dataField" height="30 px">&nbsp;<?php echo $release_date; ?><span class="gensmall"> (Current version)</span></font></td>
 </tr>
 
 <tr>
-<td class="dataLabel" height="30 px"><font face="Helvetica, sans-serif"><b>4.2 Release Date:&nbsp;</b></td>
-<td class="dataField" height="30 px">&nbsp;18-7-2005</font></td>
+<td class="dataLabel" height="30 px"><font face="Helvetica, sans-serif"><b>4.2.3 Release Date:&nbsp;</b></td>
+<td class="dataField" height="30 px">&nbsp;23 December 2005</font></td>
+</tr>
+
+<tr>
+<td class="dataLabel" height="30 px"><font face="Helvetica, sans-serif"><b>4.2.0 Release Date:&nbsp;</b></td>
+<td class="dataField" height="30 px">&nbsp;18 July 2005</font></td>
 </tr>
 
 <tr>
 <td class="dataLabel" height="30 px"><font face="Helvetica, sans-serif"><b>4.0.1 Release Date:&nbsp;</b></td>
-<td class="dataField" height="30 px">&nbsp;04-29-2005</font></td>
+<td class="dataField" height="30 px">&nbsp;29 April 2005</font></td>
                 </tr>
 		
 	
 <tr>
-<td class="dataLabel" height="30 px"><font face="Helvetica, sans-serif"><b>4.0 Release Date:&nbsp;</b></td>
-<td class="dataField" height="30 px">&nbsp;03-29-2005</font></td>
+<td class="dataLabel" height="30 px"><font face="Helvetica, sans-serif"><b>4.0.0 Release Date:&nbsp;</b></td>
+<td class="dataField" height="30 px">&nbsp;29 March 2005</font></td>
 	        </tr>
 		<tr>
-		<td class="dataLabel" height="30 px"><font face="Helvetica, sans-serif"><b>3.2 Release Date:&nbsp;</b></td>
-		<td class="dataField" height="30 px">&nbsp;12-13-2004</font></td>
+		<td class="dataLabel" height="30 px"><font face="Helvetica, sans-serif"><b>3.2.0 Release Date:&nbsp;</b></td>
+		<td class="dataField" height="30 px">&nbsp;13 December 2004</font></td>
 			        </tr>
 
 <tr>
@@ -76,4 +81,3 @@
 </td>
 </tr>
 </table>
-

Modified: vtigercrm/branches/4.2/themes/Aqua/header.html
==============================================================================
--- vtigercrm/branches/4.2/themes/Aqua/header.html (original)
+++ vtigercrm/branches/4.2/themes/Aqua/header.html Wed Jun  7 12:23:13 2006
@@ -46,7 +46,7 @@
 <script>
 function openwin()
 {
-        window.open("index.php?module=Users&action=about_us","aboutwin","height=300,width=400,top=200,left=300")
+        window.open("index.php?module=Users&action=about_us","aboutwin","height=520,width=400,top=200,left=300")
 }
 </script>
 

Modified: vtigercrm/branches/4.2/themes/blue/header.html
==============================================================================
--- vtigercrm/branches/4.2/themes/blue/header.html (original)
+++ vtigercrm/branches/4.2/themes/blue/header.html Wed Jun  7 12:23:13 2006
@@ -49,7 +49,7 @@
 <script>
 function openwin()
 {
-        window.open("index.php?module=Users&action=about_us","aboutwin","height=300,width=400,top=200,left=300")
+        window.open("index.php?module=Users&action=about_us","aboutwin","height=520,width=400,top=200,left=300")
 }
 </script>
 

Modified: vtigercrm/branches/4.2/themes/nature/header.html
==============================================================================
--- vtigercrm/branches/4.2/themes/nature/header.html (original)
+++ vtigercrm/branches/4.2/themes/nature/header.html Wed Jun  7 12:23:13 2006
@@ -45,7 +45,7 @@
 <script>
 function openwin()
 {
-        window.open("index.php?module=Users&action=about_us","aboutwin","height=300,width=400,top=200,left=300")
+        window.open("index.php?module=Users&action=about_us","aboutwin","height=520,width=400,top=200,left=300")
 }
 </script>
 

Modified: vtigercrm/branches/4.2/themes/orange/header.html
==============================================================================
Binary files - no diff available.

Modified: vtigercrm/branches/4.2/vtigerversion.php
==============================================================================
--- vtigercrm/branches/4.2/vtigerversion.php (original)
+++ vtigercrm/branches/4.2/vtigerversion.php Wed Jun  7 12:23:13 2006
@@ -11,6 +11,6 @@
 
 $patch_version = '';
 $modified_database = '';
-$vtiger_version = '4.2.3';
-$release_date = '23 December 2005';
+$vtiger_version = '4.2.4';
+$release_date = '1 June 2006';
 ?>




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 14:26:11 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 07 Jun 2006 18:26:11 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6963 -
	/vtigercrm/branches/4.2.4/
Message-ID: <20060607182611.3B2897E86A7@vtiger.fosslabs.com>

Author: jeffk
Date: Wed Jun  7 12:26:09 2006
New Revision: 6963

Log:
source:vtigercrm/tags/vtigercrm-4.2.4 tagged, ok to remove source:vtigercrm/branches/4.2.4, prerelease changesets r6803:6819 merged to source:vtigercrm/branches/4.2, continue development at that URL

Removed:
    vtigercrm/branches/4.2.4/




From vtiger-tickets at vtiger.fosslabs.com  Wed Jun  7 16:28:45 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 07 Jun 2006 20:28:45 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231279=3A?=
 =?utf-8?q?_database_creation_error_problems_afterword?=
Message-ID: <076.fb2022c8962a6bd349bf1145132bfaa6@vtiger.fosslabs.com>

#1279: database creation error problems afterword
-----------------------+----------------------------------------------------
 Reporter:  anonymous  |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  major      |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 I encountered two issues while installing you beta.

 1) when I go through the setup wizard, if I select create database and
 provide it with the root credentials it gives an error.

 2) once it's is going to create the tables that i required it gets an
 error and nothing happens in the datase, however if I check the populate
 tables with data, it does it successfully.

 3) once I login and I'm browing there are sections that I click on and
 only the top menu shows up but nothing else.

 I'm running on apache 2.2.2, php 5.1.4 and mysql 4.0.19

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1279>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun  7 18:10:28 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 07 Jun 2006 22:10:28 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231280=3A?=
 =?utf-8?q?_Translation_issue_for_detailviews?=
Message-ID: <076.9b3cc9b6c6bc8054331835baebdc32df@vtiger.fosslabs.com>

#1280: Translation issue for detailviews
-----------------------+----------------------------------------------------
 Reporter:  abos       |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  major      |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 File smarty/templates/detailview.tpl

 ~line 19
 change for
    <a class="link"  align="right"
 href="javascript:;">{$APP.LBL_EDIT_BUTTON}</a>


 File smarty/templates/DetailviewUI.tpl
 Change all : class="small" value="Save"
 For : class="small" value="{$APP.LBL_SAVE_LABEL}"

 And all : class="link">Cancel</a>
 For : class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>

 And all : /> or
 for a new app string.


 ~line 77
  <tr height=20><td>{$UPDATEINFO}</td><td align="right" width="400"
 nowrap><div id="addtagdiv"><a href="javascript:;"
 onClick="show('tagdiv'),fnhide('addtagdiv'),document.getElementById('txtbox_tagfields').focus()">+addtag</a></div><div
 id="tagdiv" style="display:none;"><input class="textbox"  type="text"
 id="txtbox_tagfields" name="textbox_First Name"
 value=""></input>&nbsp;&nbsp;<input name="button_tagfileds" type="button"
 class="small" value="Tag it" onclick="return tagvalidate()"/><input
 name="close" type="button" class="small" value="Close"
 onClick="fnhide('tagdiv'),show('addtagdiv')"></div></td></tr>

 Tag it & close must be translated. Close need to be a new string, do not
 use Close. (not same usage in france)

 ~line 301
     Change for
     <input value="  {$APP.Merge}  "
 onclick="this.form.action.value='Merge';" type="submit"></input>

 Cheer

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1280>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun  7 20:12:17 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 08 Jun 2006 00:12:17 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231281=3A?=
 =?utf-8?q?_issues_with_Vtigercrm_4=2E2=2E4?=
Message-ID: <076.8b6d308ffb189659226c108a73a27dea@vtiger.fosslabs.com>

#1281: issues with Vtigercrm 4.2.4
--------------------------------------+-------------------------------------
 Reporter:  sebastian_sw at hotmail.com  |       Owner:  developer
     Type:  defect                    |      Status:  new      
 Priority:  major                     |   Milestone:           
Component:  vtigercrm                 |     Version:  4.2.4rc3 
 Keywords:                            |  
--------------------------------------+-------------------------------------
 Istalation goes fine.
 Creating Accounts, products and Quotes ok.

 After creating, Quotes are not displayed in any of the places where should
 be.-

 Orders are displayed in the Orders Module, but arent linked with the
 specific account.

 Running Mysql 4.1.16 - Apache 2.0.54

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1281>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun  7 21:10:20 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 08 Jun 2006 01:10:20 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6964 -
	/vtigercrm/branches/4.2/include/utils.php
Message-ID: <20060608011020.B58147E863E@vtiger.fosslabs.com>

Author: allanbush
Date: Wed Jun  7 19:10:16 2006
New Revision: 6964

Log:
Fixes problems displaying quotes without associated potentials caused by query error.  Ref #1281.

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 Wed Jun  7 19:10:16 2006
@@ -2310,6 +2310,7 @@
 {
 global $vtlog;
 $vtlog->logthis("in getPotentialName ".$potential_id,'info');  
+	if(!$potential_id) return '';
 	global $adb;
 	$sql = "select potentialname from potential where potentialid=".$potential_id;
         $result = $adb->query($sql);




From vtiger-tickets at vtiger.fosslabs.com  Wed Jun  7 21:12:16 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 08 Jun 2006 01:12:16 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231281=3A?=
 =?utf-8?q?_issues_with_Vtigercrm_4=2E2=2E4?=
In-Reply-To: <076.8b6d308ffb189659226c108a73a27dea@vtiger.fosslabs.com>
References: <076.8b6d308ffb189659226c108a73a27dea@vtiger.fosslabs.com>
Message-ID: <085.11d06893700d6d8edf25fb5855c81558@vtiger.fosslabs.com>

#1281: issues with Vtigercrm 4.2.4
---------------------------------------+------------------------------------
  Reporter:  sebastian_sw at hotmail.com  |       Owner:  developer
      Type:  defect                    |      Status:  new      
  Priority:  major                     |   Milestone:           
 Component:  vtigercrm                 |     Version:  4.2.4rc3 
Resolution:                            |    Keywords:           
---------------------------------------+------------------------------------
Comment (by allanbush):

 [6964] Fixes problems displaying quotes without associated potentials
 caused by query error.  Ref #1281.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1281>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun  7 21:18:04 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 08 Jun 2006 01:18:04 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231281=3A?=
 =?utf-8?q?_Quotes_without_an_associated_potential_do_not_display_in_list_?=
 =?utf-8?q?views=2E?=
In-Reply-To: <076.8b6d308ffb189659226c108a73a27dea@vtiger.fosslabs.com>
References: <076.8b6d308ffb189659226c108a73a27dea@vtiger.fosslabs.com>
Message-ID: <085.bec79f5aab060ffc8f72c1ace62c9341@vtiger.fosslabs.com>

#1281: Quotes without an associated potential do not display in list views.
---------------------------------------+------------------------------------
  Reporter:  sebastian_sw at hotmail.com  |       Owner:  allanbush
      Type:  defect                    |      Status:  assigned 
  Priority:  critical                  |   Milestone:           
 Component:  vtigercrm                 |     Version:  4.2.4rc3 
Resolution:                            |    Keywords:           
---------------------------------------+------------------------------------
Changes (by allanbush):

  * priority:  major => critical
  * summary:  issues with Vtigercrm 4.2.4 => Quotes without an associated
              potential do not display in list views.
  * status:  new => assigned
  * owner:  developer => allanbush

Comment:

 This is pretty major (although present in 4.2.3 as well so it's not a
 regression error).  Any thoughts on a 4.2.4.1 release to fix this problem
 (and any others that come up in the next few days).  I don't see 4.2.5
 being released in the near future, the scope is too large and we don't
 currently have the resources to work on it.

 PS we still need the Milestones and Versions updated.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1281>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun  8 01:04:59 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 08 Jun 2006 05:04:59 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6965 -
	/vtigercrm/trunk/modules/Emails/Email.js
Message-ID: <20060608050459.DA4797E87BD@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 23:04:53 2006
New Revision: 6965

Log:
ajax functionality has been modified

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

Modified: vtigercrm/trunk/modules/Emails/Email.js
==============================================================================
--- vtigercrm/trunk/modules/Emails/Email.js (original)
+++ vtigercrm/trunk/modules/Emails/Email.js Wed Jun  7 23:04:53 2006
@@ -19,17 +19,17 @@
 		$("status").style.display="inline";
                 new Ajax.Request(
                         'index.php',
-                        {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+                        {queue: {position: 'end', scope: 'command'},
                                 method: 'post',
                                 postBody: "module=Users&action=massdelete&return_module=Emails&folderid="+gFolderid+"&idlist="+id,
-                                onComplete: function(response) {ldelim}
+                                onComplete: function(response) {
                                                 $("status").style.display="none";
                                                 $('EmailDetails').innerHTML = '<table valign="top" border="0" cellpadding="0" cellspacing="0" width="100%"><tbody><tr><td class="forwardBg"><table border="0" cellpadding="0" cellspacing="0" width="100%"><tbody><tr><td colspan="2">&nbsp;</td></tr></tbody></table></td></tr><tr><td style="padding-top: 10px;" bgcolor="#ffffff" height="300" valign="top"></td></tr></tbody></table>';
                                                 $("subjectsetter").innerHTML='';
                                                 $("email_con").innerHTML=response.responseText;
                                                 execJS($('email_con'));
-                                {rdelim}
-                        {rdelim}
+                                }
+                        }
                 );
 	}
 	else
@@ -45,17 +45,17 @@
 	var search_text = document.getElementById('search_text').value;
 	new Ajax.Request(
                 'index.php',
-                {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+                {queue: {position: 'end', scope: 'command'},
                         method: 'post',
                         postBody: "module=Emails&action=EmailsAjax&ajax=true&file=ListView&folderid="+gFolderid+"&search=true&search_field="+search_field+"&search_text="+search_text,
-                        onComplete: function(response) {ldelim}
+                        onComplete: function(response) {
                                         $("status").style.display="none";
                                         $('EmailDetails').innerHTML = '<table valign="top" border="0" cellpadding="0" cellspacing="0" width="100%"><tbody><tr><td class="forwardBg"><table border="0" cellpadding="0" cellspacing="0" width="100%"><tbody><tr><td colspan="2">&nbsp;</td></tr></tbody></table></td></tr><tr><td style="padding-top: 10px;" bgcolor="#ffffff" height="300" valign="top"></td></tr></tbody></table>';
                                         $("subjectsetter").innerHTML='';
                                         $("email_con").innerHTML=response.responseText;
                                         execJS($('email_con'));
-                        {rdelim}
-                {rdelim}
+                        }
+                }
         );
 }
 




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun  8 01:08:40 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 08 Jun 2006 05:08:40 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6966 - in /vtigercrm/trunk:
 Smarty/templates/RelatedLists.tpl include/language/en_us.lang.php
Message-ID: <20060608050840.671BB7E87D5@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 23:08:32 2006
New Revision: 6966

Log:
Lang file Updated

Modified:
    vtigercrm/trunk/Smarty/templates/RelatedLists.tpl
    vtigercrm/trunk/include/language/en_us.lang.php

Modified: vtigercrm/trunk/Smarty/templates/RelatedLists.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/RelatedLists.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/RelatedLists.tpl Wed Jun  7 23:08:32 2006
@@ -67,7 +67,7 @@
 					  {foreach key=header item=detail from=$RELATEDLISTS}
 						<table border=0 cellspacing=0 cellpadding=0 width=100% class="small" style="border-bottom:1px solid #999999;padding:5px;">
 							<tr>
-							<td  valign=bottom><b>{$header}</b></td>
+							<td  valign=bottom><b>{$APP.$header}</b></td>
 							{if $detail ne ''}
 							<td align=center>{$detail.navigation.0}</td>
 							{$detail.navigation.1}

Modified: vtigercrm/trunk/include/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/include/language/en_us.lang.php (original)
+++ vtigercrm/trunk/include/language/en_us.lang.php Wed Jun  7 23:08:32 2006
@@ -740,6 +740,14 @@
 'Rss'=>'RSS',
 'Portal'=>'My Sites',
 'Webmails'=>'Webmails',
+'Attachments'=>'Attachments',
+'Activity History'=>'Activity History',
+'Ticket History'=>'Ticket History',
+'Purchase Order'=>'Purchase Order',
+'Sales Stage History'=>'Sales Stage History',
+'Users'=>'Users',
+
+
 
 //Added language for Parent Tab
 




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun  8 01:12:12 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 08 Jun 2006 05:12:12 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6967 -
	/vtigercrm/trunk/include/js/Mail.js
Message-ID: <20060608051212.5C1147E87CD@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 23:12:08 2006
New Revision: 6967

Log:
ajax functionality has been modified

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

Modified: vtigercrm/trunk/include/js/Mail.js
==============================================================================
--- vtigercrm/trunk/include/js/Mail.js (original)
+++ vtigercrm/trunk/include/js/Mail.js Wed Jun  7 23:12:08 2006
@@ -146,12 +146,16 @@
 }
 function sendmail(module,idstrings)
 {
-	var ajaxObj = new VtigerAjax(ajaxSendmailResponse);
-	var urlstring ="module=Emails&return_module="+module+"&action=EmailsAjax&file=mailSelect&idlist="+idstrings;
-	ajaxObj.process("index.php?",urlstring);
+        new Ajax.Request(
+                'index.php',
+                {queue: {position: 'end', scope: 'command'},
+                        method: 'post',
+                        postBody: "module=Emails&return_module="+module+"&action=EmailsAjax&file=mailSelect&idlist="+idstrings,
+                        onComplete: function(response) {
+                                        getObj('sendmail_cont').innerHTML=response.responseText;
+                        }
+                }
+        );
 }
-function ajaxSendmailResponse(response)
-{
-	getObj('sendmail_cont').innerHTML=response.responseText;
-}
+
 	




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun  8 01:14:42 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 08 Jun 2006 05:14:42 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6968 -
	/vtigercrm/trunk/modules/Users/listroles.html
Message-ID: <20060608051442.826F97E87CD@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 23:14:38 2006
New Revision: 6968

Log:
ajax functionality has been modified

Modified:
    vtigercrm/trunk/modules/Users/listroles.html

Modified: vtigercrm/trunk/modules/Users/listroles.html
==============================================================================
--- vtigercrm/trunk/modules/Users/listroles.html (original)
+++ vtigercrm/trunk/modules/Users/listroles.html Wed Jun  7 23:14:38 2006
@@ -115,18 +115,18 @@
 	x.display="none";
 }
 
-function ajaxSaveResponse(response)
-{
-   document.getElementById("tempdiv").innerHTML=response.responseText;
-}
-
 function DeleteRole(roleid)
 {
-    //show("an_busy");
-    var ajaxObj = new VtigerAjax(ajaxSaveResponse);
-    var urlstring = "module=Users&action=UsersAjax&file=RoleDeleteStep1&roleid="+roleid;
-    ajaxObj.process("index.php?",urlstring);
+	new Ajax.Request(
+		'index.php',
+		{queue: {position: 'end', scope: 'command'},
+			method: 'post',
+			postBody: "module=Users&action=UsersAjax&file=RoleDeleteStep1&roleid="+roleid,
+			onComplete: function(response) {
+					$("tempdiv").innerHTML=response.responseText;
+			}
+		}
+	);
 }
-
 </script>
 <!-- END: main -->




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun  8 01:40:35 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 08 Jun 2006 05:40:35 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6969 - in
 /vtigercrm/trunk/Smarty/templates: Header.tpl
 Settings/EmailNotification.tpl Settings/InventoryNotify.tpl
 Settings/ModuleOwners.tpl Settings/PickList.tpl
Message-ID: <20060608054035.42D3D7E879D@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun  7 23:40:28 2006
New Revision: 6969

Log:
ajax.js has been removed

Modified:
    vtigercrm/trunk/Smarty/templates/Header.tpl
    vtigercrm/trunk/Smarty/templates/Settings/EmailNotification.tpl
    vtigercrm/trunk/Smarty/templates/Settings/InventoryNotify.tpl
    vtigercrm/trunk/Smarty/templates/Settings/ModuleOwners.tpl
    vtigercrm/trunk/Smarty/templates/Settings/PickList.tpl

Modified: vtigercrm/trunk/Smarty/templates/Header.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Header.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Header.tpl Wed Jun  7 23:40:28 2006
@@ -23,7 +23,6 @@
 	<!-- header-vtiger crm name & RSS -->
 	<script language="JavaScript" type="text/javascript" src="include/js/general.js"></script>
 	<script language="javascript" type="text/javascript" src="include/scriptaculous/prototype.js"></script>
-	<script language="JavaScript" type="text/javascript" src="include/js/ajax.js"></script>
 	<script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
 	<script language="JavaScript" type="text/javascript" src="include/calculator/calc.js"></script>
 	<script language="JavaScript" type="text/javascript" src="modules/Calendar/script.js"></script>

Modified: vtigercrm/trunk/Smarty/templates/Settings/EmailNotification.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Settings/EmailNotification.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Settings/EmailNotification.tpl Wed Jun  7 23:40:28 2006
@@ -10,7 +10,6 @@
  ********************************************************************************/
 -->*}
 <script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
-<script language="JavaScript" type="text/javascript" src="include/js/ajax.js"></script>
 <style type="text/css">@import url(themes/blue/style.css);</style>
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
 <tr>

Modified: vtigercrm/trunk/Smarty/templates/Settings/InventoryNotify.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Settings/InventoryNotify.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Settings/InventoryNotify.tpl Wed Jun  7 23:40:28 2006
@@ -10,7 +10,6 @@
  ********************************************************************************/
 -->*}
 <script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
-<script language="JavaScript" type="text/javascript" src="include/js/ajax.js"></script>
 <style type="text/css">@import url(themes/blue/style.css);</style>
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
 <tr>

Modified: vtigercrm/trunk/Smarty/templates/Settings/ModuleOwners.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Settings/ModuleOwners.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Settings/ModuleOwners.tpl Wed Jun  7 23:40:28 2006
@@ -10,7 +10,6 @@
  ********************************************************************************/
 -->*}
 <script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
-<script language="JavaScript" type="text/javascript" src="include/js/ajax.js"></script>
 <style type="text/css">@import url(themes/blue/style.css);</style>
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
 <tr>

Modified: vtigercrm/trunk/Smarty/templates/Settings/PickList.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Settings/PickList.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Settings/PickList.tpl Wed Jun  7 23:40:28 2006
@@ -12,7 +12,6 @@
 <script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
 <script src="include/scriptaculous/prototype.js" type="text/javascript"></script>
 <script src="include/scriptaculous/scriptaculous.js" type="text/javascript"></script>
-<script language="JavaScript" type="text/javascript" src="include/js/ajax.js"></script>
 <script>
 {literal}
 function splitvalues() {




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun  8 04:13:26 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 08 Jun 2006 08:13:26 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6970 - in
 /vtigercrm/trunk/Smarty/templates: DetailView.tpl DetailViewUI.tpl
Message-ID: <20060608081326.E58DE7E883D@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun  8 02:13:22 2006
New Revision: 6970

Log:
i18n updated

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

Modified: vtigercrm/trunk/Smarty/templates/DetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DetailView.tpl Thu Jun  8 02:13:22 2006
@@ -16,7 +16,7 @@
 
 <script language="JavaScript" type="text/javascript" src="include/js/dtlviewajax.js"></script>
 <span id="crmspanid" style="display:none;position:absolute;"  onmouseover="show('crmspanid');">
-   <a class="link"  align="right" href="javascript:;">Edit</a>
+   <a class="link"  align="right" href="javascript:;">{$APP.LBL_EDIT_BUTTON}</a>
 </span>
 
 {if $MODULE eq 'Leads' or $MODULE eq 'Contacts' or $MODULE eq 'Accounts'}
@@ -74,7 +74,7 @@
 		
 		<table align="center" border="0" cellpadding="0" cellspacing="0" width="95%"><tr><td>		
 		 <span class="lvtHeaderText"><font color="purple">[ {$ID} ] </font>{$NAME} -  {$APP[$SINGLE_MOD]} {$APP.LBL_INFORMATION}</span>&nbsp;&nbsp;<span id="vtbusy_info" style="display:none;" valign="bottom"><img src="{$IMAGE_PATH}vtbusy.gif" border="0"></span><span id="vtbusy_info" style="visibility:hidden;" valign="bottom"><img src="{$IMAGE_PATH}vtbusy.gif" border="0"></span></td><td>&nbsp;</td></tr>
-		 <tr height=20><td>{$UPDATEINFO}</td><td align="right" width="400" nowrap><div id="addtagdiv"><a href="javascript:;" onClick="show('tagdiv'),fnhide('addtagdiv'),document.getElementById('txtbox_tagfields').focus()">+addtag</a></div><div id="tagdiv" style="display:none;"><input class="textbox"  type="text" id="txtbox_tagfields" name="textbox_First Name" value=""></input>&nbsp;&nbsp;<input name="button_tagfileds" type="button" class="small" value="Tag it" onclick="return tagvalidate()"/><input name="close" type="button" class="small" value="Close" onClick="fnhide('tagdiv'),show('addtagdiv')"></div></td></tr>
+		 <tr height=20><td>{$UPDATEINFO}</td><td align="right" width="400" nowrap><div id="addtagdiv"><a href="javascript:;" onClick="show('tagdiv'),fnhide('addtagdiv'),document.getElementById('txtbox_tagfields').focus()">{$APP.LBL_ADD_TAG}</a></div><div id="tagdiv" style="display:none;"><input class="textbox"  type="text" id="txtbox_tagfields" name="textbox_First Name" value=""></input>&nbsp;&nbsp;<input name="button_tagfileds" type="button" class="small" value="{$APP.LBL_TAG_IT}" onclick="return tagvalidate()"/><input name="close" type="button" class="small" value="{$APP.LBL_CLOSE}" onClick="fnhide('tagdiv'),show('addtagdiv')"></div></td></tr>
 		 </table>			 
 		 <hr noshade size=1>
 		
@@ -171,7 +171,7 @@
                                                         <td align=right>
 							{if $header eq 'Address Information' && ($MODULE eq 'Accounts' || $MODULE eq 'Contacts' || $MODULE eq 'Leads') }
                                                         {if $MODULE eq 'Leads'}
-                                                        <input id="locateMap" name="locateMap" value="Locate Map" class="small" type="button" onClick="searchMapLocation( 'Main' )" title="Locate Map">
+                                                        <input id="locateMap" name="locateMap" value="{$APP.LBL_LOCATE_MAP}" class="small" type="button" onClick="searchMapLocation( 'Main' )" title="{$APP.LBL_LOCATE_MAP}">
                                                         {else}
                                                                 {if $MODULE eq 'Accounts'}
                                                                        {assign var=address1 value='Billing'}
@@ -181,14 +181,14 @@
                                                                        {assign var=address1 value='Mailing'}
                                                                        {assign var=address2 value='Other'}
                                                                 {/if}
-                                                                <input id="locateMap" name="locateMap" value="Locate Map" class="small" type="button" onClick="javascript:showLocateMapMenu()" title="Locate Map">
+                                                                <input id="locateMap" name="locateMap" value="{$APP.LBL_LOCATE_MAP}" class="small" type="button" onClick="javascript:showLocateMapMenu()" title="{$APP.LBL_LOCATE_MAP}">
                                                         <div id="dropDownMenu" style="position:absolute;display:none;z-index:60">
 							<table border="0" cellspacing="0" cellpadding="4">
                                                 <tr bgcolor=white class="lvtColData" onMouseOver="this.className='lvtColDataHover'" style="cursor:pointer;" onMouseOut="this.className='lvtColData'" onClick="searchMapLocation( 'Main' )">
-                                                <td>{$address1} Address</td>
+                                                <td>{$address1} {$APP.LBL_ADDRESS}</td>
                                                 </tr>
                                                 <tr bgcolor=white class="lvtColData" onMouseOver="this.className='lvtColDataHover'" style="cursor:pointer;" onMouseOut="this.className='lvtColData'"  onClick="searchMapLocation( 'Other' )">
-                                                <td>{$address2} Address</td>
+                                                <td>{$address2} {$APP.LBL_ADDRESS}</td>
                                                 </tr>
                                                 </table>
                                                 </div>
@@ -298,7 +298,7 @@
       				<tr style="height:25px">
       						<td class="rightMailMergeContent">
           						<select name="mergefile">{foreach key=templid item=tempflname from=$TOPTIONS}<option value="{$templid}">{$tempflname}</option>{/foreach}</select>
-          						<input value="Merge" onclick="this.form.action.value='Merge';" type="submit"></input>
+          						<input value="{$APP.LBL_MERGE_BUTTON_LABEL}" onclick="this.form.action.value='Merge';" type="submit"></input>
       					  </td>
       				</tr>
   				</table>

Modified: vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl Thu Jun  8 02:13:22 2006
@@ -23,16 +23,16 @@
                                                        <span id="dtlview_{$label}">{$keyval}</span>
                                               		<div id="editarea_{$label}" style="display:none;">
                                               		  <input class="detailedViewTextBox" onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" type="text" id="txtbox_{$label}" name="textbox_{$label}" maxlength='100' value="{$keyval}"></input>
-                                              		  <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
-                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
+                                              		  <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                                                        </div>
                                                   </td>
                                              {elseif $keyid eq '13'} <!--Email-->
                                                   <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}"><a href="mailto:{$keyval}" target="_blank">{$keyval}</a></span>
                                               		<div id="editarea_{$label}" style="display:none;">
                                               		  <input class="detailedViewTextBox" onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" type="text" id="txtbox_{$label}" name="textbox_{$label}" maxlength='100' value="{$keyval}"></input>
-                                              		  <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
-                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
+                                              		  <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                                                        </div>
                                                   </td>
                                              {elseif $keyid eq '15' || $keyid eq '16'} <!--ComboBox-->
@@ -45,32 +45,32 @@
                     									{/foreach}
                     								{/foreach}
                     							   </select>
-                    							   <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
-                                              		   <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
+                    							   <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                              		   <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                     							</div>
                							</td>
                                              {elseif $keyid eq '17'} <!--WebSite-->
                                                   <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}"><a href="http://{$keyval}" target="_blank">{$keyval}</a></span>
                                               		<div id="editarea_{$label}" style="display:none;">
                                               		  <input class="detailedViewTextBox" onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" type="text" id="txtbox_{$label}" name="textbox_{$label}" maxlength='100' value="{$keyval}"></input>
-                                              		  <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
-                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
+                                              		  <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                                                        </div>
                                                   </td>
                                              {elseif $keyid eq '19' || $keyid eq '20'} <!--TextArea/Description-->
                                                   <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}">{$keyval}</span>
                                               		<div id="editarea_{$label}" style="display:none;">
                                               		  <textarea id="txtbox_{$label}" name="txtbox_{$label}"  class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'"onBlur="this.className='detailedViewTextBox'" cols="90" rows="8">{$keyval}</textarea>                                            		  
-                                              		  <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
-                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
+                                              		  <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                                                        </div>
                                                   </td>
                                              {elseif $keyid eq '21' || $keyid eq '24' || $keyid eq '22'} <!--TextArea/Street-->
                                                   <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}">{$keyval}</span>
                                               		<div id="editarea_{$label}" style="display:none;">
                                               		  <textarea id="txtbox_{$label}" name="txtbox_{$label}"  class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'"onBlur="this.className='detailedViewTextBox'" rows=2>{$keyval}</textarea>                                            		  
-                                              		  <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
-                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
+                                              		  <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                                                        </div>
                                                   </td>
                                              {elseif $keyid eq '50' || $keyid eq '73' || $keyid eq '51'} <!--AccountPopup-->
@@ -78,24 +78,24 @@
                                               		<div id="editarea_{$label}" style="display:none;">                                              		  
                                                          <input readonly id="popuptxt_{$label}" name="account_name" type="text" value="{$keyval}"><input id="txtbox_{$label}" name="{$keyfldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Accounts&action=Popup&popuptype=specific&form=TasksEditView&form_submit=false","test","width=600,height=400,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'>
                                                          <!--AccountPopup/WithClear-->{if $keyid eq '51'} &nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.account_id.value=''; this.form.account_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>{/if} 
-                                              		  <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
-                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
+                                              		  <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                                                        </div>
                                                   </td>
                                              {elseif $keyid eq '57'} <!--ContactPopup-->
                                                   <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}"><a href="{$keyseclink}">{$keyval}</a></span>
                                               		<div id="editarea_{$label}" style="display:none;">                                              		  
                                                          <input id="popuptxt_{$label}" name="contact_name" readonly type="text" style="border:1px solid #bababa;" value="{$keyval}"><input id="txtbox_{$label}" name="{$keyfldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Contacts&action=Popup&html=Popup_picker&popuptype=specific&form=EditView","test","width=600,height=400,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.contact_id.value=''; this.form.contact_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
-                                                         <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
-                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
+                                                         <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                                                        </div>
                                                   </td>                                                  
                                              {elseif $keyid eq '59'} <!--ProductPopup-->
                                                   <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}"><a href="{$keyseclink}">{$keyval}</a></span>
                                               		<div id="editarea_{$label}" style="display:none;">                                              		  
                                                          <input id="popuptxt_{$label}" name="product_name" readonly type="text" value="{$keyval}"><input id="txtbox_{$label}" name="{$keyfldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Products&action=Popup&html=Popup_picker&form=HelpDeskEditView&popuptype=specific","test","width=600,height=400,resizable=1,scrollbars=1,top=150,left=200");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.product_id.value=''; this.form.product_name.value=''; return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
-                                                         <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
-                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
+                                                         <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                                                        </div>
                                                   </td>
                                              {elseif $keyid eq '75' || $keyid eq '81'} <!--VendorPopup-->
@@ -103,24 +103,24 @@
                                               		<div id="editarea_{$label}" style="display:none;">
                                                          <input id="popuptxt_{$label}" name="vendor_name" readonly type="text" style="border:1px solid #bababa;" value="{$keyval}"><input id="txtbox_{$label}" name="{$fldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Vendors&action=Popup&html=Popup_picker&popuptype=specific&form=EditView","test","width=600,height=400,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'>
                                                          {if $uitype eq 75}&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.vendor_id.value='';this.form.vendor_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>{/if}                                              		  
-                                                         <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
-                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
+                                                         <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                                                        </div>
                                                   </td>
                                              {elseif $keyid eq 76} <!--PotentialPopup-->
                                                   <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}"><a href="{$keyseclink}">{$keyval}</a></span>
                                               		<div id="editarea_{$label}" style="display:none;">                                              		  
                                                          <input id="popuptxt_{$label}" name="potential_name" readonly type="text" style="border:1px solid #bababa;" value="{$keyval}"><input id="txtbox_{$label}" name="{$keyfldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Potentials&action=Popup&html=Popup_picker&popuptype=specific_potential_account_address&form=EditView","test","width=600,height=400,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.potential_id.value=''; this.form.potential_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
-                                                         <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
-                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
+                                                         <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                                                        </div>
                                                   </td>
                                              {elseif $keyid eq 78} <!--QuotePopup-->
                                                   <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}"><a href="{$keyseclink}">{$keyval}</a></span>
                                               		<div id="editarea_{$label}" style="display:none;">                                              		  
                                                          <input id="popuptxt_{$label}" name="quote_name" readonly type="text" style="border:1px solid #bababa;" value="{$keyval}"><input id="txtbox_{$label}" name="{$keyfldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Quotes&action=Popup&html=Popup_picker&popuptype=specific&form=EditView","test","width=600,height=400,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.quote_id.value=''; this.form.quote_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
-                                                         <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
-                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
+                                                         <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                                                        </div>
                                                   </td>
                                              {elseif $keyid eq 82} <!--Email Body-->
@@ -130,8 +130,8 @@
                                                   <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}"><a href="{$keyseclink}">{$keyval}</a></span>
                                               		<div id="editarea_{$label}" style="display:none;">                                              		  
                                                          <input id="popuptxt_{$label}" name="salesorder_name" readonly type="text" style="border:1px solid #bababa;" value="{$keyval}"><input id="txtbox_{$label}" name="{$keyfldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=SalesOrder&action=Popup&html=Popup_picker&popuptype=specific&form=EditView","test","width=600,height=400,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.salesorder_id.value=''; this.form.salesorder_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
-                                                         <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
-                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
+                                                         <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                              		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                                                        </div>
                                                   </td>
 					{elseif $keyid eq '53'} <!--Assigned To-->
@@ -154,8 +154,8 @@
                     {/foreach}
                     </select>
                     <br>
-                    <input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');"/> or
-                    <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
+                    <input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');"/> or
+                    <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                     </div>
                     </td>
 					    {elseif $keyid eq '56'} <!--CheckBox--> 
@@ -166,8 +166,8 @@
                         {else}
                           <input id="txtbox_{$label}" type="checkbox" style="border:1px solid #bababa;" value="0">
                        	{/if}
-                         <br><input name="button_{$label}" type="button" class="small" value="Save" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');"/> or
-                          <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">Cancel</a>
+                         <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');"/> or
+                          <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                         </div>
                         </td>     
 						{elseif $keyid eq 83}<!-- Handle the Tax in Inventory -->




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun  8 04:15:56 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 08 Jun 2006 08:15:56 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6971 -
	/vtigercrm/trunk/include/language/en_us.lang.php
Message-ID: <20060608081556.D2EF57E88E9@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun  8 02:15:52 2006
New Revision: 6971

Log:
lang file updated

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

Modified: vtigercrm/trunk/include/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/include/language/en_us.lang.php (original)
+++ vtigercrm/trunk/include/language/en_us.lang.php Thu Jun  8 02:15:52 2006
@@ -228,7 +228,15 @@
 
 'LNK_IMPORT_LEADS'=>'Import Leads',
 
-
+'LBL_LOCATE_MAP'=>'Locate Map',
+
+'LBL_ADDRESS'=>'Address',
+
+'LBL_ADD_TAG'=>'+addtag',
+
+'LBL_TAG_IT'=>'Tag it',
+
+'LBL_CLOSE'=>'Close',
 
 'LNK_ADVANCED_SEARCH'=>'Advanced Search',
 




From vtiger-tickets at vtiger.fosslabs.com  Thu Jun  8 07:14:47 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 08 Jun 2006 11:14:47 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231274=3A?=
 =?utf-8?q?_customer_portal_5=2E0_missing?=
In-Reply-To: <076.709d4c1791ce9aaefba03d131eecd0c0@vtiger.fosslabs.com>
References: <076.709d4c1791ce9aaefba03d131eecd0c0@vtiger.fosslabs.com>
Message-ID: <085.266d9dfe137dc926f5bf48ece4b64d21@vtiger.fosslabs.com>

#1274: customer portal 5.0 missing
-----------------------------+----------------------------------------------
  Reporter:  anonymous       |       Owner:  mickie
      Type:  defect          |      Status:  new   
  Priority:  blocker         |   Milestone:        
 Component:  customerportal  |     Version:  5.0.0 
Resolution:                  |    Keywords:        
-----------------------------+----------------------------------------------
Changes (by richie):

  * owner:  developer => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1274>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun  8 07:16:39 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 08 Jun 2006 11:16:39 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6972 -
	/vtigercrm/trunk/data/SugarBean.php
Message-ID: <20060608111639.6816E7E88FD@vtiger.fosslabs.com>

Author: richie
Date: Thu Jun  8 05:16:34 2006
New Revision: 6972

Log:
removed unwanted methods

Modified:
    vtigercrm/trunk/data/SugarBean.php

Modified: vtigercrm/trunk/data/SugarBean.php
==============================================================================
--- vtigercrm/trunk/data/SugarBean.php (original)
+++ vtigercrm/trunk/data/SugarBean.php Thu Jun  8 05:16:34 2006
@@ -199,16 +199,6 @@
 		return $this;
 	}
 
-	/**
-	 * This function returns a paged list of the current object type.  It is intended to allow for
-	 * hopping back and forth through pages of data.  It only retrieves what is on the current page.
-	 * This method must be called on a new instance.  It trashes the values of all the fields in the current one.
-	 */
-	function get_lead_list($order_by = "", $where = "", $row_offset = 0) {
-		$query = $this->create_lead_list_query($order_by, $where);
-		return $this->process_list_query($query, $row_offset);
-	}
-		
 	function get_list($order_by = "", $where = "", $row_offset = 0, $limit=-1, $max=-1) {
 		$this->log->debug("get_list:  order_by = '$order_by' and where = '$where' and limit = '$limit'");
 		
@@ -342,14 +332,6 @@
 	 * All Rights Reserved..
 	 * Contributor(s): ______________________________________..
 	 */
-/*	function track_view($user_id, $current_module)
-	{
-		$this->log->debug("About to call tracker (user_id, module_name, item_id)($user_id, $current_module, $this->id)");
-
-		$tracker = new Tracker();
-		$tracker->track_view($user_id, $current_module, $this->id, $this->get_summary_text());
-	}
-	*/
 	function track_view($user_id, $current_module,$id='')
 	{
 		$this->log->debug("About to call tracker (user_id, module_name, item_id)($user_id, $current_module, $this->id)");
@@ -358,30 +340,6 @@
 		$tracker->track_view($user_id, $current_module, $id, '');
 	}
 
-
-	/**
-	 * This is designed to be overridden and add specific fields to each record.  This allows the generic query to fill in
-	 * the major fields, and then targetted queries to get related fields and add them to the record.  The contact's account for instance.
-	 * This method is only used for populating extra fields in lists
-	 * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc..
-	 * All Rights Reserved..
-	 * Contributor(s): ______________________________________..
-	 */
-	function fill_in_additional_list_fields()
-	{
-	}
-
-	/**
-	 * This is designed to be overridden and add specific fields to each record.  This allows the generic query to fill in
-	 * the major fields, and then targetted queries to get related fields and add them to the record.  The contact's account for instance.
-	 * This method is only used for populating extra fields in the detail form
-	 * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc..
-	 * All Rights Reserved..
-	 * Contributor(s): ______________________________________..
-	 */
-	function fill_in_additional_detail_fields()
-	{
-	}
 
 	/** This function should be overridden in each module.  It marks an item as deleted.
 	* If it is not overridden, then marking this type of item is not allowed
@@ -403,11 +361,11 @@
 	}
 
 
-	/* This is to allow subclasses to fill in row specific columns of a list view form */
+	/* This is to allow subclasses to fill in row specific columns of a list view form 
 	function list_view_parse_additional_sections(&$list_form)
 	{
 	}
-
+	*/
 	/* This function assigns all of the values into the template for the list view */
 	function get_list_view_array(){
 		$return_array = Array();
@@ -489,31 +447,6 @@
 			} 
 		} 
 	}
-	/**
-		builds a generic search based on the query string using or
-		do not include any $this-> because this is called on without having the class instantiated
-	*/
-	function build_generic_where_clause($value){
-			$where_clause = "WHERE "; 
-		$first = 1; 
-		foreach ($fields_array as $name=>$value) 
-		{ 
-			if ($first) 
-			{ 
-				$first = 0;
-			} 
-			else 
-			{ 
-				$where_clause .= " or";
-			} 
-
-			$where_clause .= "$name = ".$adb->quote($value)."";
-		} 
-
-		$where_clause .= " AND deleted=0";
-		return $where_clause;
-	}
-
 }
 
 




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun  8 07:46:30 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 08 Jun 2006 11:46:30 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6973 -
	/vtigercrm/trunk/include/ListView/ListView.php
Message-ID: <20060608114630.A8AF97E8829@vtiger.fosslabs.com>

Author: richie
Date: Thu Jun  8 05:46:26 2006
New Revision: 6973

Log:
removed unwanted methods

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 Jun  8 05:46:26 2006
@@ -40,17 +40,6 @@
 	var $querey_where_has_changed = false;
 	var $display_header_and_footer = true;
 
-/**sets whether or not to display the xtemplate header and footer
- * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
- * All Rights Reserved.
- * 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
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
@@ -79,17 +68,6 @@
 		$log->debug("Exiting ListView method ...");
 	}	
 }
-/**sets how many records should be displayed per page in the list view
- * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
- * All Rights Reserved.
- * 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;
@@ -108,35 +86,6 @@
 	$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.
- * All Rights Reserved.
- * 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
- * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
- * All Rights Reserved.
- * 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);
-	$log->debug("Exiting initNewXTemplate method ...");	
-}
-
-
 /**sets the parameters dealing with the db
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
  * All Rights Reserved.
@@ -203,13 +152,6 @@
 	
 }
 
-function displayArrow(){
-	global $log;
-	$log->debug("Entering displayArrow() method ...");
-	 $log->debug("Exiting displayArrow method ...");
-	
-}
-
 /**sets the theme used only use if it is different from the global
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
  * All Rights Reserved.
@@ -283,101 +225,6 @@
 
 }
 
-/**INTERNAL FUNCTION creates an XTemplate DO NOT CALL THIS THIS IS AN INTERNAL FUNCTION
- * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
- * All Rights Reserved.
- * 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);
-			$this->xTemplate->assign("APP", $this->local_app_strings);
-			if(isset($this->local_mod_strings))$this->xTemplate->assign("MOD", $this->local_mod_strings);
-			$this->xTemplate->assign("THEME", $this->local_theme);
-			$this->xTemplate->assign("IMAGE_PATH", $this->local_image_path);
-			$this->xTemplate->assign("MODULE_NAME", $this->local_current_module);
-		}else{
-			$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
- * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
- * All Rights Reserved.
- * Contributor(s): ______________________________________.
-*/
- function setXTemplate(&$newXTemplate){
-	global $log;
-	$log->debug("Entering setXTemplate(".$newXTemplate.") method ...");
-	$this->xTemplate = $newXTemplate;
-	$log->debug("Exiting setXTemplate method ...");
-}
-
-/**returns the XTemplate
- * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
- * All Rights Reserved.
- * Contributor(s): ______________________________________.
-*/
- function getXTemplate(){	
-	global $log;
-	$log->debug("Entering getXTemplate() method ...");
-	$log->debug("Exiting getXTemplate method ...");
-	return $this->xTemplate;	
-}
-
-/**assigns a name value pair to the XTemplate
- * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
- * All Rights Reserved.
- * 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 ...");
-		
-}
-
-/**INTERNAL FUNCTION returns the offset first checking the querey then checking the session if the where clause has changed from the last time it returns 0
- * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
- * All Rights Reserved.
- * 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;	
-}
-
-/**INTERNAL FUNCTION sets the offset in the session
- * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
- * All Rights Reserved.
- * 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
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
@@ -439,234 +286,6 @@
 	return $this->local_current_module."_".$localVarName."_".$varName;
 }
 
-/**
-
- * @return void
- * @param unknown $seed
- * @param unknown $xTemplateSection
- * @param unknown $html_varName
- * @desc INTERNAL FUNCTION Handles List Views using seeds that extend SugarBean
-	$XTemplateSection is the section in the XTemplate file that should be parsed usually main
-	$html_VarName is the variable name used in the XTemplateFile e.g. TASK
-	$seed is a seed that extends SugarBean
-	 * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc..
-	 * All Rights Reserved..
-	 * 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'];
-	$row_count = $response['row_count'];
-	$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;
-}
-
-/**
-
- * @return void
- * @param unknown $data
- * @param unknown $xTemplateSection
- * @param unknown $html_varName
- * @desc INTERNAL FUNCTION process the List Navigation
- * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
- * All Rights Reserved.
- * 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;
-	global $theme;
-    $theme_path="themes/".$theme."/";
-    $image_path=$theme_path."images/";
-
-	$start_record = $current_offset + 1;
-	if($row_count == 0)
-		$start_record = 0;
-	$end_record = $start_record + $this->records_per_page;
-	// back up the the last page.
-	if($end_record > $row_count+1)
-	{
-		$end_record = $row_count+1;
-	}
-	// Deterime the start location of the last page
-	if($row_count == 0)
-		$number_pages = 0;
-	else
-		$number_pages = floor(($row_count - 1) / $this->records_per_page);
-	$last_offset = $number_pages * $this->records_per_page;
-	if(empty($this->query_limit) || $this->query_limit > $this->records_per_page){
-		$base_URL = $_SERVER['PHP_SELF'];
-		if(isset($_SERVER['QUERY_STRING'])){
-			$base_URL = ereg_replace("\&".$this->getSessionVariableName($html_varName,"ORDER_BY")."=[0-9a-zA-Z\_]*","",$base_URL .'?'.$_SERVER['QUERY_STRING']);
-			$base_URL = ereg_replace("\&".$this->getSessionVariableName($html_varName,"offset")."=[0-9]*","",$base_URL);
-		}
-		if($_SERVER['REQUEST_METHOD'] == 'POST'){
-			$base_URL .= '?';
-			if(isset($_REQUEST['action'])) $base_URL .= '&action='.$_REQUEST['action'];
-			if(isset($_REQUEST['record'])) $base_URL .= '&record='.$_REQUEST['record'];
-			if(isset($_REQUEST['module'])) $base_URL .= '&module='.$_REQUEST['module'];
-		}	
-		$base_URL .= "&".$this->getSessionVariableName($html_varName,"offset")."=";
-		$current_URL = $base_URL.$current_offset;
-		$start_URL = $base_URL."0";
-		$previous_URL  = $base_URL.$previous_offset;
-		$next_URL  = $base_URL.$next_offset;
-		$end_URL  = $base_URL.$last_offset;
-		$sort_URL_base = $base_URL. "&".$this->getSessionVariableName($html_varName,"ORDER_BY")."=";
-
-		$this->log->debug("Offsets: (start, previous, next, last)(0, $previous_offset, $next_offset, $last_offset)");
-
-		if(0 == $current_offset){
-			$start_link = '<img src="'.$image_path.'start_disabled.gif" border="0" align="absmiddle">&nbsp;';
-			$previous_link = '<img src="'.$image_path.'previous_disabled.gif" border="0" align="absmiddle">&nbsp;';
-		}else{
-			$start_link = "<a href=\"$start_URL\"><img src='".$image_path."start.gif' border='0' align='absmiddle'></a>";
-			$previous_link = "<a href=\"$previous_URL\"><img src='".$image_path."previous.gif' border='0' align='absmiddle'></a>";
-		}
-
-		if($last_offset <= $current_offset){
-			$next_link = '<img src="'.$image_path.'next_disabled.gif" border="0" align="absmiddle">&nbsp;';
-			$end_link = '<img src="'.$image_path.'end_disabled.gif" border="0" align="absmiddle">&nbsp;';
-		}
-		else{
-			$end_link = "<a href=\"$end_URL\"><img src='".$image_path."end.gif' border='0' align='absmiddle'>&nbsp;</a>";
-			$next_link = "<a href=\"$next_URL\"><img src='".$image_path."next.gif' border='0' align='absmiddle'></a>";
-		}
-		global $current_module;
-		$this->log->info("Offset (next, current, prev)($next_offset, $current_offset, $previous_offset)");
-		$this->log->info("Start/end records ($start_record, $end_record)");
-		if($sort_URL_base !== "") $this->xTemplate->assign("ORDER_BY", $sort_URL_base);
-		$this->xTemplate->assign("START_RECORD", $start_record);
-		$this->xTemplate->assign("END_RECORD", $end_record-1);
-		$this->xTemplate->assign("ROW_COUNT", $row_count);
-		if ($start_link !== "") $this->xTemplate->assign("START_LINK", $start_link);
-		if ($end_link !== "")$this->xTemplate->assign("END_LINK", $end_link);
-		if ($next_link !== "") $this->xTemplate->assign("NEXT_LINK", $next_link);
-		if ($previous_link !== "") $this->xTemplate->assign("PREVIOUS_LINK", $previous_link);
-
-		$_SESSION['export_where'] = $this->query_where;
-
-		$export_link = "<a target=\"_blank\" href=\"include\export.php?module=".$this->local_current_module."\" class=\"listFormHeaderLinks\">".$this->local_app_strings['LBL_EXPORT']."</a>";
-
-		if ($_REQUEST['module']== 'Home' || 
-			$this->local_current_module == 'Import' ||
-			($allow_exports=='none' || ( $allow_exports=='admin' && ! is_admin($current_user) ) ) )
-		{
-			$this->xTemplate->assign("EXPORT_LINK", "");
-		}
-		else
-		{
-			$this->xTemplate->assign("EXPORT_LINK", "&nbsp;[ ".$export_link." ]");
-		}
-		$this->xTemplate->parse($xtemplateSection.".list_nav_row");
-		$log->debug("Exiting processListNavigation method ...");	
-	}	
-}
-/**
-
- * @return void
- * @param unknown $data
- * @param unknown $xTemplateSection
- * @param unknown $html_varName
- * @desc INTERNAL FUNCTION handles the rows
- * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
- * All Rights Reserved.
- * 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)
-	{
-		$fields = $aItem->get_list_view_data();
-		$this->xTemplate->assign($html_varName, $fields);
-
-		if($oddRow)
-		{
-			$this->xTemplate->assign("ROW_COLOR", 'oddListRow');
-		}
-		else
-		{
-			$this->xTemplate->assign("ROW_COLOR", 'evenListRow');
-		}
-		$oddRow = !$oddRow;
-
-		$aItem->list_view_parse_additional_sections($this->xTemplate, $xtemplateSection);
-		$this->xTemplate->parse($xtemplateSection.".row");
-	}
-	$this->xTemplate->parse($xtemplateSection);	
-	$log->debug("Exiting processListRows method ...");
-}
-/**
-
- * @return void
- * @param unknown $seed
- * @param unknown $xTemplateSection
- * @param unknown $html_varName
- * @desc PUBLIC FUNCTION Handles List Views using seeds that extend SugarBean
-	$XTemplateSection is the section in the XTemplate file that should be parsed usually main
-	$html_VarName is the variable name used in the XTemplateFile e.g. TASK
-	$seed is a seed there are two types of seeds one is a subclass of SugarBean, the other is a list usually created from a sugar bean using get_list
-	if no XTemplate is set it will create  a new XTemplate
-	 * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc..
-	 * All Rights Reserved..
-	 * 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");
-	$list = null;
-	if($isSugarBean){
-		$list =	$this->processSugarBean($xTemplateSection, $html_varName, $seed);
-	}else{
-		$list = &$seed;
-	}
-	
-	$this->processSortArrows($html_varName);
-	$this->processListRows($list,$xTemplateSection, $html_varName);
-	if($this->display_header_and_footer)
-		echo get_form_header( $this->header_title, $this->header_text, false);
-	$this->xTemplate->out($xTemplateSection);
-	if($this->display_header_and_footer)
-		echo get_form_footer();
-	if($isSugarBean )
-		echo "</td></tr>\n</table>\n";
-	$log->debug("Exiting processListView method ...");
-		
-	//if(isset($_SESSION['validation'])){
-	//	print base64_decode('PGEgaHJlZj0naHR0cDovL3d3dy5zdWdhcmNybS5jb20nPlBPV0VSRUQmbmJzcDtCWSZuYnNwO1NVR0FSQ1JNPC9hPg==');
-//}
-		
-}
-
-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 = "&nbsp;<img border='0' src='".$this->local_image_path."/arrow_down.gif' >";
-	if($desc){
-		$imgArrow = "&nbsp;<img border='0' src='".$this->local_image_path."/arrow_up.gif' >";
-	}	
-	if($orderBy == 'amount*1')	
-		$this->xTemplateAssign('amount_arrow', $imgArrow);		
-	else{
-		$this->xTemplateAssign($orderBy.'_arrow', $imgArrow);
-	}
-	$log->debug("Exiting processSortArrows method ...");	
-}
 
 }
 




From vtiger-tickets at vtiger.fosslabs.com  Thu Jun  8 07:59:34 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 08 Jun 2006 11:59:34 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231282=3A?=
 =?utf-8?q?_Problems_with_graphs_-_Sales_Orders_by_Account?=
Message-ID: <076.9cc8264925ac84b43a6a0aafbcf08aae@vtiger.fosslabs.com>

#1282: Problems with graphs - Sales Orders by Account
-----------------------------+----------------------------------------------
 Reporter:  arosewarne       |       Owner:  developer
     Type:  defect           |      Status:  new      
 Priority:  major            |   Milestone:           
Component:  vtigercrm        |     Version:  5.0.0    
 Keywords:  analytics graph  |  
-----------------------------+----------------------------------------------
 - If there is a comma in any account name the graph bars and acale become
 misaligned and unreadable
  - When you click on a bar it does not return the refined search. This is
 because it passes through 'accountid' when it should pass 'account_id'

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1282>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun  8 08:00:41 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 08 Jun 2006 12:00:41 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231124=3A?=
	=?utf-8?q?_issue_in_attachments?=
In-Reply-To: <076.eece6f4dd358282fca02037b81e9226c@vtiger.fosslabs.com>
References: <076.eece6f4dd358282fca02037b81e9226c@vtiger.fosslabs.com>
Message-ID: <085.b67f19aadc1d46cdfbca47a84bb67053@vtiger.fosslabs.com>

#1124: issue in attachments
------------------------+---------------------------------------------------
  Reporter:  mangai     |       Owner:  mickie
      Type:  defect     |      Status:  closed
  Priority:  critical   |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  invalid    |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mickie):

  * resolution:  => invalid
  * status:  new => closed

Comment:

 Now from relatedlists we can attach files one by one. we cannot attach
 multiple files at a time. so that this problem will not occur.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1124>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun  8 08:13:04 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 08 Jun 2006 12:13:04 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6974 -
	/vtigercrm/trunk/modules/Potentials/Opportunity.php
Message-ID: <20060608121304.9E48D7E8911@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun  8 06:13:00 2006
New Revision: 6974

Log:
* Modified the query to get the assigned to user name for quote relatedlist 

Modified:
    vtigercrm/trunk/modules/Potentials/Opportunity.php

Modified: vtigercrm/trunk/modules/Potentials/Opportunity.php
==============================================================================
--- vtigercrm/trunk/modules/Potentials/Opportunity.php (original)
+++ vtigercrm/trunk/modules/Potentials/Opportunity.php Thu Jun  8 06:13:00 2006
@@ -471,7 +471,7 @@
 		$returnset = '&return_module=Potentials&return_action=DetailView&return_id='.$id;
 
 
-		$query = "select crmentity.*, quotes.*,potential.potentialname from quotes inner join crmentity on crmentity.crmid=quotes.quoteid 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 potential.potentialid=".$id;
+		$query = "select crmentity.*, quotes.*, potential.potentialname, users.user_name from quotes inner join crmentity on crmentity.crmid=quotes.quoteid 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 left join users on users.id=crmentity.smownerid where crmentity.deleted=0 and potential.potentialid=".$id;
 		$log->debug("Exiting get_quotes method ...");
 		return  GetRelatedList('Potentials','Quotes',$focus,$query,$button,$returnset);
 	}




From vtiger-tickets at vtiger.fosslabs.com  Thu Jun  8 08:13:46 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 08 Jun 2006 12:13:46 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23984=3A_?=
 =?utf-8?q?Assigned_to_Field_is_blank_when_adding_Quote_from_Potential_Rel?=
 =?utf-8?q?ated_List?=
In-Reply-To: <076.965de5c278750b9b10a94849f6dde98c@vtiger.fosslabs.com>
References: <076.965de5c278750b9b10a94849f6dde98c@vtiger.fosslabs.com>
Message-ID: <085.ee72920062448473e2279e653ee54579@vtiger.fosslabs.com>

#984: Assigned to Field is blank when adding Quote from Potential Related List
------------------------+---------------------------------------------------
  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:  new => closed

Comment:

 This issue has been fixed and the file has been checkedin in svn.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/984>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun  8 08:23:07 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 08 Jun 2006 12:23:07 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231274=3A?=
 =?utf-8?q?_customer_portal_5=2E0_missing?=
In-Reply-To: <076.709d4c1791ce9aaefba03d131eecd0c0@vtiger.fosslabs.com>
References: <076.709d4c1791ce9aaefba03d131eecd0c0@vtiger.fosslabs.com>
Message-ID: <085.00e08e4230c4cf783055dbfa2963827d@vtiger.fosslabs.com>

#1274: customer portal 5.0 missing
-----------------------------+----------------------------------------------
  Reporter:  anonymous       |       Owner:  mickie
      Type:  defect          |      Status:  new   
  Priority:  blocker         |   Milestone:        
 Component:  customerportal  |     Version:  5.0.0 
Resolution:                  |    Keywords:        
-----------------------------+----------------------------------------------
Comment (by mickie):

 Here the customerportal is working.
 can you please let us know the following details
 1. URL of your vtiger server
 2. URL to access the customerportal
 3. values given for the variables $Server_Path and $Authenticate_Path in
 customerportal/PortalConfig.php file.
 This will help us to debug the problem further.if you do not want to post
 the details here then please send a PM or you can send to mickie at
 vtiger.com

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1274>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun  8 08:36:37 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 08 Jun 2006 12:36:37 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231018=3A?=
 =?utf-8?q?_HelpDesk_-_Cancel_button_in_FileUpload_page=2E?=
In-Reply-To: <076.55eb71bdbfc0dc234d8a5f6c145f3221@vtiger.fosslabs.com>
References: <076.55eb71bdbfc0dc234d8a5f6c145f3221@vtiger.fosslabs.com>
Message-ID: <085.739d08d330c98503221f8e55d7999e19@vtiger.fosslabs.com>

#1018: HelpDesk - Cancel button in FileUpload page.
------------------------+---------------------------------------------------
  Reporter:  saraj      |       Owner:  mickie             
      Type:  defect     |      Status:  closed             
  Priority:  major      |   Milestone:                     
 Component:  vtigercrm  |     Version:  5.0.0              
Resolution:  fixed      |    Keywords:  helpdesk fileupload
------------------------+---------------------------------------------------
Changes (by mickie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 In previous releases, when we click on new attachment from relatedlist the
 control goes to a new page to browse the file. But now the attachment
 option has been given as Popup window where as in popup window we have
 cancel button.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1018>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun  8 09:01:04 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 08 Jun 2006 13:01:04 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231283=3A?=
 =?utf-8?q?_Issue_in_Related_List_Sorting?=
Message-ID: <076.eb979459170c63c66e73d114d83eb936@vtiger.fosslabs.com>

#1283: Issue in Related List Sorting
----------------------------------+-----------------------------------------
 Reporter:  saraj                 |       Owner:  saraj
     Type:  defect                |      Status:  new  
 Priority:  major                 |   Milestone:       
Component:  vtigercrm             |     Version:  5.0.0
 Keywords:  sorting related list  |  
----------------------------------+-----------------------------------------
 In Related List, if sorted the entries or the records gets disappeared.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1283>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun  8 10:14:12 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 08 Jun 2006 14:14:12 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23117=3A_?=
 =?utf-8?q?issue_in_Page_navigation?=
In-Reply-To: <076.6c2b56e976313ee3444368c0830c47ae@vtiger.fosslabs.com>
References: <076.6c2b56e976313ee3444368c0830c47ae@vtiger.fosslabs.com>
Message-ID: <085.d9f16e479dc2b0afcc842b629edb4b6f@vtiger.fosslabs.com>

#117: issue in Page navigation
------------------------+---------------------------------------------------
  Reporter:  jeri       |       Owner:  philip    
      Type:  defect     |      Status:  closed    
  Priority:  major      |   Milestone:  5.0.0     
 Component:  vtigercrm  |     Version:  5.0.0     
Resolution:  fixed      |    Keywords:  pagination
------------------------+---------------------------------------------------
Changes (by saraj):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/117>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun  8 10:28:49 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 08 Jun 2006 14:28:49 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6975 -
	/vtigercrm/trunk/include/formbase.php
Message-ID: <20060608142849.7E8817E8944@vtiger.fosslabs.com>

Author: richie
Date: Thu Jun  8 08:28:44 2006
New Revision: 6975

Log:
file not needed

Removed:
    vtigercrm/trunk/include/formbase.php




From vtiger-tickets at vtiger.fosslabs.com  Thu Jun  8 11:01:20 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 08 Jun 2006 15:01:20 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231284=3A?=
 =?utf-8?q?_Removal_of_commented-out_code_is_helpful?=
Message-ID: <076.1f009815df5e22f62e7a2c599acd3ebf@vtiger.fosslabs.com>

#1284: Removal of commented-out code is helpful
-----------------------+----------------------------------------------------
 Reporter:  jeffk      |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  minor      |   Milestone:  5.0.0    
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 Just a generalized meta-item following up richie's good work removing
 unused methods as seen in r6972, r6973.

 In addition to removal of unused code, I think we should also remove
 commented-out code from the codebase when encountering it:

  - Code removed is code that can't have bugs.
  - Commented lines suffer bit-rot from lack of  API updates, etc.
  - PHP comment blocks are easy to accidentally uncomment, another source
 of bugs.

 Subversion's support for merging changesets encourages removal of unwanted
 code, because you'll always be able to bring it back in-place.

 The only thing you need to do is make a clearly worded note of it in the
 commit message, and optionally document code removal via a trac ticket.

 Commit messages and trac tickets are searchable resources, and properly
 documented, removal of commented code won't prevent us from finding the
 old code if we need it.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1284>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun  8 11:03:24 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 08 Jun 2006 15:03:24 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231284=3A?=
 =?utf-8?q?_Removal_of_commented-out_code_is_helpful?=
In-Reply-To: <076.1f009815df5e22f62e7a2c599acd3ebf@vtiger.fosslabs.com>
References: <076.1f009815df5e22f62e7a2c599acd3ebf@vtiger.fosslabs.com>
Message-ID: <085.38be6ab811231ec70d02afa2b7309edd@vtiger.fosslabs.com>

#1284: Removal of commented-out code is helpful
------------------------+---------------------------------------------------
  Reporter:  jeffk      |       Owner:  developer
      Type:  defect     |      Status:  new      
  Priority:  minor      |   Milestone:  5.0.0    
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:             |    Keywords:           
------------------------+---------------------------------------------------
Comment (by jeffk):

 My inspiration for this ticket:

 http://www.nedbatchelder.com/text/deleting-code.html

 and fixing my typo'd list:

  * Code removed is code that can't have bugs.
  * Commented lines suffer bit-rot from lack of API updates, etc.
  * PHP comment blocks are easy to accidentally uncomment, another source
 of bugs.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1284>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun  8 11:39:15 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 08 Jun 2006 15:39:15 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231281=3A?=
 =?utf-8?q?_Quotes_without_an_associated_potential_do_not_display_in_list_?=
 =?utf-8?q?views=2E?=
In-Reply-To: <076.8b6d308ffb189659226c108a73a27dea@vtiger.fosslabs.com>
References: <076.8b6d308ffb189659226c108a73a27dea@vtiger.fosslabs.com>
Message-ID: <085.3de01c3fa539b219505e323d87349525@vtiger.fosslabs.com>

#1281: Quotes without an associated potential do not display in list views.
---------------------------------------+------------------------------------
  Reporter:  sebastian_sw at hotmail.com  |       Owner:  allanbush
      Type:  defect                    |      Status:  assigned 
  Priority:  critical                  |   Milestone:           
 Component:  vtigercrm                 |     Version:  4.2.4rc3 
Resolution:                            |    Keywords:           
---------------------------------------+------------------------------------
Comment (by allanbush):

 Just want to add a note that I think the second part of this bug about
 sales orders not appearing in the account related lists is side effect of
 the first bug.  Because the page craps out when it encounters the bad
 query the rest of the page (including the sales order list) isn't
 rendered.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1281>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun  8 11:45:49 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 08 Jun 2006 15:45:49 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231285=3A?=
	=?utf-8?q?_picklist_-_custom_field?=
Message-ID: <076.d54873cd2f44419ccf2fc08db8faed61@vtiger.fosslabs.com>

#1285: picklist - custom field
-----------------------+----------------------------------------------------
 Reporter:  anonymous  |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  blocker    |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 If you create custom field as picklist, you may access and modify it by
 Settings > Picklist. When you delete this custom field, the entire
 picklist menu at Studio is not availabel anymore. The picklist menu still
 points to a DB entry what is not available anymore.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1285>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun  8 13:46:35 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 08 Jun 2006 17:46:35 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6976 - in
 /vtigercrm/trunk/modules: Accounts/Account.php Contacts/Contact.php
 Leads/Lead.php Potentials/Opportunity.php
Message-ID: <20060608174635.B4CE57E8954@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun  8 11:46:27 2006
New Revision: 6976

Log:
Removed the variables names corresponding to each module in field table - ahmed

Modified:
    vtigercrm/trunk/modules/Accounts/Account.php
    vtigercrm/trunk/modules/Contacts/Contact.php
    vtigercrm/trunk/modules/Leads/Lead.php
    vtigercrm/trunk/modules/Potentials/Opportunity.php

Modified: vtigercrm/trunk/modules/Accounts/Account.php
==============================================================================
--- vtigercrm/trunk/modules/Accounts/Account.php (original)
+++ vtigercrm/trunk/modules/Accounts/Account.php Thu Jun  8 11:46:27 2006
@@ -38,24 +38,9 @@
 	var $log;
 	var $db;
 
-
-	// Stored fields
-	var $id;
-	var $mode;
-
-	// These are for related fields
-	var $opportunity_id;
-	var $contact_id;
-	var $note_id;
-	var $email_id;
-	var $member_id;
-	var $parent_name;
-	var $assigned_user_name;
-
 	var $table_name = "account";
 	var $tab_name = Array('crmentity','account','accountbillads','accountshipads','accountscf');
 	var $tab_name_index = Array('crmentity'=>'crmid','account'=>'accountid','accountbillads'=>'accountaddressid','accountshipads'=>'accountaddressid','accountscf'=>'accountid');
-
 
 	var $entity_table = "crmentity";
 
@@ -92,10 +77,6 @@
 			'Assigned To'=>'assigned_user_id'
 			);
 	var $list_link_field= 'accountname';
-
-	var $record_id;
-	var $list_mode;
-	var $popup_type;
 
 	var $search_fields = Array(
 			'Account Name'=>Array('account'=>'accountname'),

Modified: vtigercrm/trunk/modules/Contacts/Contact.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/Contact.php (original)
+++ vtigercrm/trunk/modules/Contacts/Contact.php Thu Jun  8 11:46:27 2006
@@ -37,28 +37,9 @@
 	var $log;
 	var $db;
 
-	// Stored fields
-	var $id;
-	var $mode;
-
-	var $contactid;
-	
-
-	// These are for related fields
-	var $accountname;
-	var $accountid;
-	var $campaignid;
-	var $reports_to_name;
-	var $opportunity_id;
-	var $note_id;
-	var $email_id;
-	var $assigned_user_name;
-		
 	var $table_name = "contactdetails";
 	var $tab_name = Array('crmentity','contactdetails','contactaddress','contactsubdetails','contactscf','customerdetails','attachments');
 	var $tab_name_index = Array('crmentity'=>'crmid','contactdetails'=>'contactid','contactaddress'=>'contactaddressid','contactsubdetails'=>'contactsubscriptionid','contactscf'=>'contactid','customerdetails'=>'customerid','attachments'=>'attachmentsid');
-
-
 
 	var $module_id = "contactid";
 	var $object_name = "Contact";
@@ -124,10 +105,6 @@
 	'Phone' => 'phone',
 	'Assigned To' => 'assigned_user_id'
 	);
-
-	var $record_id;
-	var $list_mode;
-        var $popup_type;
 
 	var $search_fields = Array(
 	'Name' => Array('contactdetails'=>'lastname'),

Modified: vtigercrm/trunk/modules/Leads/Lead.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/Lead.php (original)
+++ vtigercrm/trunk/modules/Leads/Lead.php Thu Jun  8 11:46:27 2006
@@ -27,54 +27,6 @@
 class Lead extends CRMEntity {
 	var $log;
 	var $db;
-
-	// Stored fields
-	var $leadid;
-	var $email;
-	var $firstname;
-	var $salutation;
-	var $lastname;
-	var $company;
-	var $annualrevenue;
-
-	var $industry;
-	var $campaign;
-	var $rating;
-	var $status;
-	var $leadsource;
-	var $designation;
-	var $licencekey;
-	var $region;
-	var $space;
-	var $comments;
-	var $priority;
-	var $partnercontact;
-	var $maildate;
-	var $nextstepdate;
-	var $fundingsituation;
-	var $deleted;
-
-	var $description;
-	// These are for related fields
-	var $city;
-	var $code;
-	var $state;
-	var $country;
-	var $phone;
-	var $mobile;
-	var $fax;
-	var $lane;
-	var $leadaddresstype;
-	var $currency;
-	var $website;
-	var $callornot;
-	var $readornot;
-	var $empct;
-
-	var $accountid;
-	var $contactid;
-	var $campaignid;
-	var $potentialid;
 
 	var $module_id = "leadid";
 
@@ -124,10 +76,6 @@
 		'Assigned To'=>'assigned_user_id'
 	);
 	var $list_link_field= 'lastname';
-
-	var $record_id;
-	var $list_mode;
-	var $popup_type;
 
 	var $search_fields = Array(
 		'Name'=>Array('leaddetails'=>'lastname'),

Modified: vtigercrm/trunk/modules/Potentials/Opportunity.php
==============================================================================
--- vtigercrm/trunk/modules/Potentials/Opportunity.php (original)
+++ vtigercrm/trunk/modules/Potentials/Opportunity.php Thu Jun  8 11:46:27 2006
@@ -35,14 +35,6 @@
 class Potential extends CRMEntity {
 	var $log;
 	var $db;
-	// Stored fields
-	var $id;
-	var $potentialid;
-	var $private;
-
-	var $stage;
-
-	var $deleted;
 
 	var $module_name="Potentials";
 	var $table_name = "potential";
@@ -79,10 +71,6 @@
 
 	var $list_link_field= 'potentialname';
 
-	var $record_id;
-	var $list_mode;
-	var $popup_type;
-
 	var $search_fields = Array(
 			'Potential'=>Array('potential'=>'potentialname'),
 			'Account Name'=>Array('potential'=>'accountid'),
@@ -114,8 +102,6 @@
 	}
 
 	var $new_schema = true;
-
-
 
 	function create_list_query($order_by, $where)
 	{




From vtiger-tickets at vtiger.fosslabs.com  Thu Jun  8 23:13:06 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 09 Jun 2006 03:13:06 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231286=3A?=
 =?utf-8?q?_Getting_a_warning_message_in_the_week_view_of_the_calendar?=
Message-ID: <076.09b3d19c2818c145cad7974f71d66816@vtiger.fosslabs.com>

#1286: Getting a warning message in the week view of the calendar
-----------------------+----------------------------------------------------
 Reporter:  Jaguar     |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  minor      |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 Getting the following error in the week view of the calendar:-

 Warning: array_push(): First argument should be an array in
 /home/site/html/products/crm/demo_5beta/modules/Calendar/Calendar.php on
 line 187

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1286>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun  9 01:22:20 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 09 Jun 2006 05:22:20 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231287=3A?=
	=?utf-8?q?_Support_PHP_5?=
Message-ID: <076.34213a5e5121e9857e7ff28b81783537@vtiger.fosslabs.com>

#1287: Support PHP 5
-----------------------+----------------------------------------------------
 Reporter:  allanbush  |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  major      |   Milestone:  4.2.5    
Component:  vtigercrm  |     Version:  4.2.4rc3 
 Keywords:  php5       |  
-----------------------+----------------------------------------------------
 Version 4.2.5 should support php versions > 4.3, including php 5.x.

 Does anyone know of a way to set mod_php4 and mod_php5 up side by side for
 easier testing?

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1287>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun  9 01:29:19 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 09 Jun 2006 05:29:19 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231287=3A?=
	=?utf-8?q?_Support_PHP_5?=
In-Reply-To: <076.34213a5e5121e9857e7ff28b81783537@vtiger.fosslabs.com>
References: <076.34213a5e5121e9857e7ff28b81783537@vtiger.fosslabs.com>
Message-ID: <085.303b64f26e9855d81f73923dcc03b167@vtiger.fosslabs.com>

#1287: Support PHP 5
------------------------+---------------------------------------------------
  Reporter:  allanbush  |       Owner:  developer
      Type:  defect     |      Status:  new      
  Priority:  major      |   Milestone:  4.2.5    
 Component:  vtigercrm  |     Version:  4.2.4rc3 
Resolution:             |    Keywords:  php5     
------------------------+---------------------------------------------------
Comment (by allanbush):

 (In [6977]) Inital steps for php5 support from
 http://forums.vtiger.com/viewtopic.php?t=6777 .  Refs #1287.  Jpgraph has
 not been replaced as the new version is not compatible with php4.

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1287>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun  9 01:29:20 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 09 Jun 2006 05:29:20 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6977 - in
 /vtigercrm/branches/4.2: data/CRMEntity.php export.php index.php
 install.php phprint.php soap.php
Message-ID: <20060609052921.8E6267E8985@vtiger.fosslabs.com>

Author: allanbush
Date: Thu Jun  8 23:29:16 2006
New Revision: 6977

Log:
Inital steps for php5 support from http://forums.vtiger.com/viewtopic.php?t=6777 .  Refs #1287.  Jpgraph has not been replaced as the new version is not compatible with php4.

Modified:
    vtigercrm/branches/4.2/data/CRMEntity.php
    vtigercrm/branches/4.2/export.php
    vtigercrm/branches/4.2/index.php
    vtigercrm/branches/4.2/install.php
    vtigercrm/branches/4.2/phprint.php
    vtigercrm/branches/4.2/soap.php

Modified: vtigercrm/branches/4.2/data/CRMEntity.php
==============================================================================
--- vtigercrm/branches/4.2/data/CRMEntity.php (original)
+++ vtigercrm/branches/4.2/data/CRMEntity.php Thu Jun  8 23:29:16 2006
@@ -1025,10 +1025,7 @@
 				}
 
 
-				//$this->db->println("here is the bug");
-			
-
-				$list[] = $this;
+				$list[] = clone($this);
 			}
 		}
 
@@ -1060,10 +1057,7 @@
 				else
 					$this->db->println("rowid not set unable to retrieve");
 				 
-				 
-				
-
-				$list[] = $this;
+				$list[] = clone($this);
 			}
 		}
 

Modified: vtigercrm/branches/4.2/export.php
==============================================================================
--- vtigercrm/branches/4.2/export.php (original)
+++ vtigercrm/branches/4.2/export.php Thu Jun  8 23:29:16 2006
@@ -12,10 +12,6 @@
  * All Rights Reserved.
  * Contributor(s): ______________________________________.
  ********************************************************************************/
-
-if (substr(phpversion(), 0, 1) == "5") {
-        ini_set("zend.ze1_compatibility_mode", "1");
-}
 
 require_once('config.php');
 require_once('include/logging.php');

Modified: vtigercrm/branches/4.2/index.php
==============================================================================
--- vtigercrm/branches/4.2/index.php (original)
+++ vtigercrm/branches/4.2/index.php Thu Jun  8 23:29:16 2006
@@ -22,11 +22,11 @@
 global $entityDel;
 global $display;
 
+if (version_compare(phpversion(), '5.0') < 0) {
+	eval('function clone($object) { return $object; } ');
+}
+
 require_once('include/utils.php');
-//$phpbb_root_path='./modules/MessageBoard/';
-if (substr(phpversion(), 0, 1) == "5") {
-        ini_set("zend.ze1_compatibility_mode", "1");
-}
 
 function fetchPermissionDataForTabList()
 {

Modified: vtigercrm/branches/4.2/install.php
==============================================================================
--- vtigercrm/branches/4.2/install.php (original)
+++ vtigercrm/branches/4.2/install.php Thu Jun  8 23:29:16 2006
@@ -23,10 +23,6 @@
     	header("Location: index.php");
     	exit();
     }
-}
-
-if (substr(phpversion(), 0, 1) == "5") {
-  ini_set("zend.ze1_compatibility_mode", "1");
 }
 
 function stripslashes_checkstrings($value) {

Modified: vtigercrm/branches/4.2/phprint.php
==============================================================================
--- vtigercrm/branches/4.2/phprint.php (original)
+++ vtigercrm/branches/4.2/phprint.php Thu Jun  8 23:29:16 2006
@@ -18,10 +18,6 @@
  * theme header and footer files defined for the user as well as the module as
  * defined by the input parameters.
  ********************************************************************************/
-
-if (substr(phpversion(), 0, 1) == "5") {
-	ini_set("zend.ze1_compatibility_mode", "1");
-}
 
 if (ini_get("allow_url_fopen") != 1) {
         die("You must have the allow_url_fopen directive in your php.ini file enabled");

Modified: vtigercrm/branches/4.2/soap.php
==============================================================================
--- vtigercrm/branches/4.2/soap.php (original)
+++ vtigercrm/branches/4.2/soap.php Thu Jun  8 23:29:16 2006
@@ -12,10 +12,6 @@
  * All Rights Reserved.
  * Contributor(s): ______________________________________.
  ********************************************************************************/
-
-if (substr(phpversion(), 0, 1) == "5") {
-	ini_set("zend.ze1_compatibility_mode", "1");
-}
 
 require_once('include/logging.php');
 require_once("config.php");




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun  9 01:55:02 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 09 Jun 2006 05:55:02 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6978 -
	/vtigercrm/branches/4.2/modules/Contacts/
Message-ID: <20060609055502.E7CDA7E896F@vtiger.fosslabs.com>

Author: allanbush
Date: Thu Jun  8 23:54:58 2006
New Revision: 6978

Log:
Removed unused files.

Removed:
    vtigercrm/branches/4.2/modules/Contacts/BusinessCard.html
    vtigercrm/branches/4.2/modules/Contacts/BusinessCard.php
    vtigercrm/branches/4.2/modules/Contacts/ContactFormBase.php
    vtigercrm/branches/4.2/modules/Contacts/ContactOpportunityRelationship.php
    vtigercrm/branches/4.2/modules/Contacts/ContactOpportunityRelationshipEdit.html
    vtigercrm/branches/4.2/modules/Contacts/ContactOpportunityRelationshipEdit.php
    vtigercrm/branches/4.2/modules/Contacts/CustomAction.php
    vtigercrm/branches/4.2/modules/Contacts/DeleteContactCaseRelationship.php
    vtigercrm/branches/4.2/modules/Contacts/DeleteContactOpportunityRelationship.php
    vtigercrm/branches/4.2/modules/Contacts/DeleteDirectReportRelationship.php
    vtigercrm/branches/4.2/modules/Contacts/SaveBusinessCard.php
    vtigercrm/branches/4.2/modules/Contacts/SaveContactOpportunityRelationship.php
    vtigercrm/branches/4.2/modules/Contacts/SubPanelView.html
    vtigercrm/branches/4.2/modules/Contacts/SubPanelView.php
    vtigercrm/branches/4.2/modules/Contacts/SubPanelViewAccounts.html
    vtigercrm/branches/4.2/modules/Contacts/SubPanelViewCase.html
    vtigercrm/branches/4.2/modules/Contacts/SubPanelViewCase.php
    vtigercrm/branches/4.2/modules/Contacts/SubPanelViewContact.html
    vtigercrm/branches/4.2/modules/Contacts/SubPanelViewContactsAndUsers.php
    vtigercrm/branches/4.2/modules/Contacts/SubPanelViewDirectReport.html
    vtigercrm/branches/4.2/modules/Contacts/SubPanelViewOpportunity.html
    vtigercrm/branches/4.2/modules/Contacts/SubPanelViewOpportunity.php
Modified:
    vtigercrm/branches/4.2/modules/Contacts/Popup.php

Modified: vtigercrm/branches/4.2/modules/Contacts/Popup.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Contacts/Popup.php (original)
+++ vtigercrm/branches/4.2/modules/Contacts/Popup.php Thu Jun  8 23:54:58 2006
@@ -115,7 +115,7 @@
 		}
 		$where .= "crmentity.smownerid IN(";
 		foreach ($assigned_user_id as $key => $val) {
-			$where .= "".PearDatabase::quote($val)."";
+			$where .= "".$adb->quote($val)."";
 			$where .= ($key == count($assigned_user_id) - 1) ? ")" : ", ";
 		}
 	}




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun  9 01:57:49 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 09 Jun 2006 05:57:49 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6979 -
	/vtigercrm/trunk/Smarty/templates/MigrationStep1.tpl
Message-ID: <20060609055749.5D5417E8974@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun  8 23:57:45 2006
New Revision: 6979

Log:
* Midified the file name

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

Modified: vtigercrm/trunk/Smarty/templates/MigrationStep1.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/MigrationStep1.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/MigrationStep1.tpl Thu Jun  8 23:57:45 2006
@@ -199,7 +199,7 @@
 <br>2. Create new database (Better is to create a database in the server where your vtiger 5.0 Database is running.)
 <br>3. Apply this 4.2.3 dump to this new database.
 <br>Now give this new database access details. This migration will modify this Database to fit with the 5.0 Schema.
-Then you can give this Database name in config.php file to use this Database ie., $dbconfig['db_name'] = 'new db name';
+Then you can give this Database name in config.inc.php file to use this Database ie., $dbconfig['db_name'] = 'new db name';
 
 								</td>
 							   </tr>




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun  9 02:39:51 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 09 Jun 2006 06:39:51 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6980 - in
 /vtigercrm/branches/4.2/modules: Accounts/ Activities/ Calendar/tmp/
 CustomView/ Emails/ Help/ Home/ Leads/ Meetings/ Notes/ Potentials/
 Reports/ Settings/ Utilities/ Yahoo/ imports/
Message-ID: <20060609063951.635ED7E898E@vtiger.fosslabs.com>

Author: allanbush
Date: Fri Jun  9 00:39:43 2006
New Revision: 6980

Log:
Removed unused files.

Removed:
    vtigercrm/branches/4.2/modules/Accounts/AccountFormBase.php
    vtigercrm/branches/4.2/modules/Accounts/CustomAction.php
    vtigercrm/branches/4.2/modules/Accounts/DeleteMemberAccountRelationship.php
    vtigercrm/branches/4.2/modules/Accounts/SubPanelView.php
    vtigercrm/branches/4.2/modules/Accounts/SubPanelViewMemberAccount.html
    vtigercrm/branches/4.2/modules/Activities/GroupAllocationView.html
    vtigercrm/branches/4.2/modules/Activities/GroupAllocationView.php
    vtigercrm/branches/4.2/modules/Activities/SubPanelView.html
    vtigercrm/branches/4.2/modules/Activities/SubPanelView.php
    vtigercrm/branches/4.2/modules/Activities/SubPanelViewContacts.html
    vtigercrm/branches/4.2/modules/Calendar/tmp/
    vtigercrm/branches/4.2/modules/CustomView/CustomAction.html
    vtigercrm/branches/4.2/modules/CustomView/CustomAction.php
    vtigercrm/branches/4.2/modules/CustomView/SendMailAction.php
    vtigercrm/branches/4.2/modules/Emails/DeleteEmailContactRelationship.php
    vtigercrm/branches/4.2/modules/Emails/DeleteEmailUserRelationship.php
    vtigercrm/branches/4.2/modules/Emails/SubPanelViewRecipients.html
    vtigercrm/branches/4.2/modules/Emails/SubPanelViewRecipients.php
    vtigercrm/branches/4.2/modules/Help/
    vtigercrm/branches/4.2/modules/Home/LastViewed.php
    vtigercrm/branches/4.2/modules/Leads/CustomAction.php
    vtigercrm/branches/4.2/modules/Leads/Headers.php
    vtigercrm/branches/4.2/modules/Leads/fetchfile.php
    vtigercrm/branches/4.2/modules/Leads/result.php
    vtigercrm/branches/4.2/modules/Meetings/
    vtigercrm/branches/4.2/modules/Notes/NoteFormBase.php
    vtigercrm/branches/4.2/modules/Potentials/SubPanelView.html
    vtigercrm/branches/4.2/modules/Potentials/SubPanelView.php
    vtigercrm/branches/4.2/modules/Reports/countries.txt
    vtigercrm/branches/4.2/modules/Settings/test.php
    vtigercrm/branches/4.2/modules/Utilities/
    vtigercrm/branches/4.2/modules/Yahoo/
    vtigercrm/branches/4.2/modules/imports/




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun  9 02:59:32 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 09 Jun 2006 06:59:32 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6981 - in
 /vtigercrm/branches/4.2: database/ include/ include/database/
 modules/Accounts/ modules/Calendar/ modules/Faq/ modules/HelpDesk/
 modules/Import/ modules/Invoice/ modules/Orders/ modules/Quotes/
 modules/Settings/ modules/Users/
Message-ID: <20060609065932.948297E8993@vtiger.fosslabs.com>

Author: allanbush
Date: Fri Jun  9 00:59:25 2006
New Revision: 6981

Log:
Removed unused files.

Removed:
    vtigercrm/branches/4.2/database/
    vtigercrm/branches/4.2/include/PopulatePhpBBtables.php
    vtigercrm/branches/4.2/include/listview.php
    vtigercrm/branches/4.2/modules/Users/Listhistory.php
    vtigercrm/branches/4.2/modules/Users/MassDeleteUsers.php
Modified:
    vtigercrm/branches/4.2/include/database/PearDatabase.php
    vtigercrm/branches/4.2/modules/Accounts/Merge.php
    vtigercrm/branches/4.2/modules/Accounts/Save.php
    vtigercrm/branches/4.2/modules/Calendar/Save.php
    vtigercrm/branches/4.2/modules/Faq/Save.php
    vtigercrm/branches/4.2/modules/HelpDesk/EditTicket.php
    vtigercrm/branches/4.2/modules/Import/ImportContact.php
    vtigercrm/branches/4.2/modules/Invoice/Save.php
    vtigercrm/branches/4.2/modules/Orders/Save.php
    vtigercrm/branches/4.2/modules/Orders/SaveSalesOrder.php
    vtigercrm/branches/4.2/modules/Quotes/Save.php
    vtigercrm/branches/4.2/modules/Settings/ComboFieldList.php
    vtigercrm/branches/4.2/modules/Users/Logout.php
    vtigercrm/branches/4.2/modules/Users/createemailtemplate.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 Fri Jun  9 00:59:25 2006
@@ -15,7 +15,8 @@
 
 require_once('include/logging.php');
 include('adodb/adodb.inc.php');
-require_once("adodb/adodb-xmlschema.inc.php");
+require_once("adodb/adodb-xmlschema03.inc.php");
+require_once("include/utils.php");
 
 require_once('vtigerlogger.php');
 global $vtlog;
@@ -664,7 +665,7 @@
 		}
 		
 		$this->database = ADONewConnection($this->dbType);
-		//$this->database->debug = true;
+		$this->database->debug = true;
 		
 		$this->database->Connect($this->dbHostName, $this->userName, $this->userPassword, $this->dbName);
 		$this->database->LogSQL($this->enableSQLlog);

Modified: vtigercrm/branches/4.2/modules/Accounts/Merge.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Accounts/Merge.php (original)
+++ vtigercrm/branches/4.2/modules/Accounts/Merge.php Fri Jun  9 00:59:25 2006
@@ -28,7 +28,6 @@
 }
 </script>
 <?php
-//require_once('database/DatabaseConnection.php');
 require_once('include/database/PearDatabase.php');
 require_once('config.php');
 //echo 'id is ....... ' .$_REQUEST['record'];

Modified: vtigercrm/branches/4.2/modules/Accounts/Save.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Accounts/Save.php (original)
+++ vtigercrm/branches/4.2/modules/Accounts/Save.php Fri Jun  9 00:59:25 2006
@@ -23,7 +23,6 @@
 
 require_once('modules/Accounts/Account.php');
 require_once('include/logging.php');
-//require_once('database/DatabaseConnection.php');
 require_once('include/database/PearDatabase.php');
 
 $local_log =& LoggerManager::getLogger('index');

Modified: vtigercrm/branches/4.2/modules/Calendar/Save.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Calendar/Save.php (original)
+++ vtigercrm/branches/4.2/modules/Calendar/Save.php Fri Jun  9 00:59:25 2006
@@ -26,7 +26,6 @@
 require_once('include/database/PearDatabase.php');
 require_once('modules/Calendar/webelements.p3');
 require_once('modules/Calendar/Date.pinc');
-#require_once('database/DatabaseConnection.php');
 
 //Added for Appointment Validation
  global $callink,$mod_strings;

Modified: vtigercrm/branches/4.2/modules/Faq/Save.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Faq/Save.php (original)
+++ vtigercrm/branches/4.2/modules/Faq/Save.php Fri Jun  9 00:59:25 2006
@@ -23,7 +23,6 @@
 
 require_once('modules/Faq/Faq.php');
 require_once('include/logging.php');
-//require_once('database/DatabaseConnection.php');
 require_once('include/database/PearDatabase.php');
 
 $local_log =& LoggerManager::getLogger('index');

Modified: vtigercrm/branches/4.2/modules/HelpDesk/EditTicket.php
==============================================================================
--- vtigercrm/branches/4.2/modules/HelpDesk/EditTicket.php (original)
+++ vtigercrm/branches/4.2/modules/HelpDesk/EditTicket.php Fri Jun  9 00:59:25 2006
@@ -9,7 +9,6 @@
 *
  ********************************************************************************/
 require_once('include/database/PearDatabase.php');
-//require_once('database/DatabaseConnection.php');
 require_once('HelpDeskUtil.php');
 require_once('XTemplate/xtpl.php');
 require_once('include/utils.php');

Modified: vtigercrm/branches/4.2/modules/Import/ImportContact.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Import/ImportContact.php (original)
+++ vtigercrm/branches/4.2/modules/Import/ImportContact.php Fri Jun  9 00:59:25 2006
@@ -18,19 +18,6 @@
  ********************************************************************************/
 include_once('config.php');
 require_once('include/logging.php');
-/*
-require_once('database/DatabaseConnection.php');
-require_once('data/SugarBean.php');
-require_once('include/utils.php');
-require_once('modules/Potentials/Opportunity.php');
-require_once('modules/Cases/Case.php');
-require_once('modules/Tasks/Task.php');
-require_once('modules/Notes/Note.php');
-require_once('modules/Meetings/Meeting.php');
-require_once('modules/Calls/Call.php');
-require_once('modules/Emails/Email.php');
-require_once('modules/Accounts/Account.php');
-*/
 require_once('modules/Contacts/Contact.php');
 require_once('modules/Import/UsersLastImport.php');
 require_once('include/database/PearDatabase.php');

Modified: vtigercrm/branches/4.2/modules/Invoice/Save.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Invoice/Save.php (original)
+++ vtigercrm/branches/4.2/modules/Invoice/Save.php Fri Jun  9 00:59:25 2006
@@ -23,7 +23,6 @@
 
 require_once('modules/Invoice/Invoice.php');
 require_once('include/logging.php');
-//require_once('database/DatabaseConnection.php');
 require_once('include/database/PearDatabase.php');
 
 $local_log =& LoggerManager::getLogger('index');

Modified: vtigercrm/branches/4.2/modules/Orders/Save.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Orders/Save.php (original)
+++ vtigercrm/branches/4.2/modules/Orders/Save.php Fri Jun  9 00:59:25 2006
@@ -23,7 +23,6 @@
 
 require_once('modules/Orders/Order.php');
 require_once('include/logging.php');
-//require_once('database/DatabaseConnection.php');
 require_once('include/database/PearDatabase.php');
 
 $local_log =& LoggerManager::getLogger('index');

Modified: vtigercrm/branches/4.2/modules/Orders/SaveSalesOrder.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Orders/SaveSalesOrder.php (original)
+++ vtigercrm/branches/4.2/modules/Orders/SaveSalesOrder.php Fri Jun  9 00:59:25 2006
@@ -23,7 +23,6 @@
 
 require_once('modules/Orders/SalesOrder.php');
 require_once('include/logging.php');
-//require_once('database/DatabaseConnection.php');
 require_once('include/database/PearDatabase.php');
 
 $local_log =& LoggerManager::getLogger('index');

Modified: vtigercrm/branches/4.2/modules/Quotes/Save.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Quotes/Save.php (original)
+++ vtigercrm/branches/4.2/modules/Quotes/Save.php Fri Jun  9 00:59:25 2006
@@ -23,7 +23,6 @@
 
 require_once('modules/Quotes/Quote.php');
 require_once('include/logging.php');
-//require_once('database/DatabaseConnection.php');
 require_once('include/database/PearDatabase.php');
 
 $local_log =& LoggerManager::getLogger('index');

Modified: vtigercrm/branches/4.2/modules/Settings/ComboFieldList.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Settings/ComboFieldList.php (original)
+++ vtigercrm/branches/4.2/modules/Settings/ComboFieldList.php Fri Jun  9 00:59:25 2006
@@ -11,7 +11,6 @@
  ********************************************************************************/
 
 require_once('include/database/PearDatabase.php');
-require_once('database/DatabaseConnection.php');
 require_once('XTemplate/xtpl.php');
 require_once('themes/'.$theme.'/layout_utils.php');
 global $mod_strings;

Modified: vtigercrm/branches/4.2/modules/Users/Logout.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Users/Logout.php (original)
+++ vtigercrm/branches/4.2/modules/Users/Logout.php Fri Jun  9 00:59:25 2006
@@ -18,7 +18,6 @@
  ********************************************************************************/
 
 require_once('include/logging.php');
-require_once('database/DatabaseConnection.php');
 require_once('modules/Users/LoginHistory.php');
 require_once('modules/Users/User.php');
 require_once('config.php');

Modified: vtigercrm/branches/4.2/modules/Users/createemailtemplate.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Users/createemailtemplate.php (original)
+++ vtigercrm/branches/4.2/modules/Users/createemailtemplate.php Fri Jun  9 00:59:25 2006
@@ -8,7 +8,6 @@
  * All Rights Reserved.
 *
  ********************************************************************************/
-require_once('database/DatabaseConnection.php');
 require_once('XTemplate/xtpl.php');
 require_once('include/utils.php');
 




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun  9 07:56:32 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 09 Jun 2006 11:56:32 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6982 - in /vtigercrm/trunk:
 include/SearchBlock.html include/SearchBlock.php
 modules/Reports/NewReportFolder.php modules/Settings/ComboFieldList.html
 modules/Settings/ComboFieldList.php modules/Users/listroles.html
Message-ID: <20060609115633.5209B7E89A0@vtiger.fosslabs.com>

Author: richie
Date: Fri Jun  9 05:56:24 2006
New Revision: 6982

Log:
file not needed

Removed:
    vtigercrm/trunk/include/SearchBlock.html
    vtigercrm/trunk/include/SearchBlock.php
    vtigercrm/trunk/modules/Reports/NewReportFolder.php
    vtigercrm/trunk/modules/Settings/ComboFieldList.html
    vtigercrm/trunk/modules/Settings/ComboFieldList.php
    vtigercrm/trunk/modules/Users/listroles.html




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun  9 08:10:46 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 09 Jun 2006 12:10:46 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6983 - in /vtigercrm/trunk:
 include/utils/SearchUtils.php modules/Potentials/Charts.php
Message-ID: <20060609121046.B647D7E899B@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun  9 06:10:40 2006
New Revision: 6983

Log:
Changes made to show proper records in listview, when clicked on graph image in dashboard home page

Modified:
    vtigercrm/trunk/include/utils/SearchUtils.php
    vtigercrm/trunk/modules/Potentials/Charts.php

Modified: vtigercrm/trunk/include/utils/SearchUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/SearchUtils.php (original)
+++ vtigercrm/trunk/include/utils/SearchUtils.php Fri Jun  9 06:10:40 2006
@@ -18,8 +18,16 @@
 $column_array=array('accountid','contact_id');
 $table_col_array=array('account.accountname','contactdetails.firstname,contactdetails.lastname');
 
-
-
+/**This function is used to get the list view header values in a list view during search
+*Param $focus - module object
+*Param $module - module name
+*Param $sort_qry - sort by value
+*Param $sorder - sorting order (asc/desc)
+*Param $order_by - order by
+*Param $relatedlist - flag to check whether the header is for listvie or related list
+*Param $oCv - Custom view object
+*Returns the listview header values in an array
+*/
 
 function getSearchListHeaderValues($focus, $module,$sort_qry='',$sorder='',$order_by='',$relatedlist='',$oCv='')
 {
@@ -178,6 +186,10 @@
 
 }
 
+/**This function is used to get the where condition for search listview query along with url_string
+*Param $module - module name
+*Returns the where conditions and url_string values in string format
+*/
 
 function Search($module)
 {
@@ -215,6 +227,13 @@
 
 }
 
+/**This function is used to get user_id's for a given user_name during search
+*Param $table_name - tablename
+*Param $column_name - columnname
+*Param $search_string - searchstring value (username)
+*Returns the where conditions for list query in string format
+*/
+
 function get_usersid($table_name,$column_name,$search_string)
 {
 
@@ -247,6 +266,13 @@
 	$log->debug("Exiting get_usersid method ...");
 	return $where;	
 }
+
+/**This function is used to get where conditions for a given accountid or contactid during search for their respective names
+*Param $column_name - columnname
+*Param $search_string - searchstring value (username)
+*Returns the where conditions for list query in string format
+*/
+
 
 function getValuesforColumns($column_name,$search_string)
 {
@@ -284,6 +310,13 @@
 	return $where;
 }
 
+/**This function is used to get where conditions in Basic Search
+*Param $module - module name
+*Param $search_field - columnname/field name in which the string has be searched
+*Param $search_string - searchstring value (username)
+*Returns the where conditions for list query in string format
+*/
+
 function BasicSearch($module,$search_field,$search_string)
 {
 	 global $log;
@@ -328,6 +361,11 @@
 	return $where;
 }
 
+/**This function is used to get where conditions in Advance Search
+*Param $module - module name
+*Returns the where conditions for list query in string format
+*/
+
 function getAdvSearchfields($module)
 {
 	global $log;
@@ -401,6 +439,11 @@
 	return $OPTION_SET;
 }
 
+/**This function is returns the search criteria options for Advance Search
+*takes no parameter
+*Returns the criteria option in html format
+*/
+
 function getcriteria_options()
 {
 	global $log;
@@ -409,6 +452,14 @@
 	$log->debug("Exiting getcriteria_options method ...");
 	return $CRIT_OPT;
 }
+
+/**This function is returns the where conditions for each search criteria option in Advance Search
+*Param $criteria - search criteria option
+*Param $searchstring - search string
+*Param $searchfield - fieldname to be search for 
+*Returns the search criteria option (where condition) to be added in list query
+*/
+
 function getSearch_criteria($criteria,$searchstring,$searchfield)
 {
 	global $log;
@@ -460,7 +511,13 @@
 	}
 	$log->debug("Exiting getSearch_criteria method ...");
 	return $where_string;
-}								
+}
+
+/**This function is returns the where conditions for search
+*Param $currentModule - module name
+*Returns the where condition to be added in list query in string format
+*/
+
 function getWhereCondition($currentModule)
 {
 	global $log;
@@ -518,6 +575,10 @@
 		}
 		$where="(".$adv_string.")#@@#".$url_string."&searchtype=advance&search_cnt=".$tot_no_criteria."&matchtype=".$_REQUEST['matchtype'];
 	}
+	elseif($_REQUEST['type']=='dbrd')
+	{
+		$where = getdashboardcondition();
+	}
 	else
 	{
  		$where=Search($currentModule);
@@ -526,4 +587,54 @@
 	return $where;
 
 }
+
+/**This function is returns the where conditions for dashboard and shows the records when clicked on dashboard graph
+*Takes no parameter, process the values got from the html request object
+*Returns the search criteria option (where condition) to be added in list query
+*/
+
+function getdashboardcondition()
+{
+	global $adb;
+	$where_clauses = Array();
+	$url_string = "";
+
+	if (isset($_REQUEST['leadsource'])) $lead_source = $_REQUEST['leadsource'];
+	if (isset($_REQUEST['date_closed'])) $date_closed = $_REQUEST['date_closed'];
+	if (isset($_REQUEST['sales_stage'])) $sales_stage = $_REQUEST['sales_stage'];
+	if (isset($_REQUEST['closingdate_start'])) $date_closed_start = $_REQUEST['closingdate_start'];
+	if (isset($_REQUEST['closingdate_end'])) $date_closed_end = $_REQUEST['closingdate_end'];
+	
+
+	if(isset($date_closed_start) && $date_closed_start != "" && isset($date_closed_end) && $date_closed_end != "")
+	{
+		array_push($where_clauses, "potential.closingdate >= ".$adb->quote($date_closed_start)." and potential.closingdate <= ".$adb->quote($date_closed_end));
+		$url_string .= "&closingdate_start=".$date_closed_start."&closingdate_end=".$date_closed_end;
+	}
+	
+	if(isset($sales_stage) && $sales_stage!=''){
+		if($sales_stage=='Other')
+		array_push($where_clauses, "(potential.sales_stage <> 'Closed Won' and potential.sales_stage <> 'Closed Lost')");
+		else
+		array_push($where_clauses, "potential.sales_stage = ".$adb->quote($sales_stage));
+		$url_string .= "&sales_stage=".$sales_stage;
+	}
+	if(isset($lead_source) && $lead_source != "") {
+		array_push($where_clauses, "potential.leadsource = ".$adb->quote($lead_source));
+		$url_string .= "&leadsource=".$lead_source;
+	}
+	
+	if(isset($date_closed) && $date_closed != "") {
+		array_push($where_clauses, $adb->getDBDateString("potential.closingdate")." like ".$adb->quote($date_closed.'%')."");
+		$url_string .= "&date_closed=".$date_closed;
+	}
+	$where = "";
+	foreach($where_clauses as $clause)
+	{
+		if($where != "")
+		$where .= " and ";
+		$where .= $clause;
+	}
+	return $where."#@@#".$url_string;
+}
 ?>

Modified: vtigercrm/trunk/modules/Potentials/Charts.php
==============================================================================
--- vtigercrm/trunk/modules/Potentials/Charts.php (original)
+++ vtigercrm/trunk/modules/Potentials/Charts.php Fri Jun  9 06:10:40 2006
@@ -177,7 +177,7 @@
 					array_push($datax[$stage], 0);
 					array_push($aAlts[$stage], "");
 				}
-				array_push($aTargets[$stage], "index.php?module=Potentials&action=ListView&date_closed=$month&sales_stage=".urlencode($stage)."&query=true");
+				array_push($aTargets[$stage], "index.php?module=Potentials&action=ListView&date_closed=$month&sales_stage=".urlencode($stage)."&query=true&type=dbrd");
 			  }
 		  	  array_push($legend,$month);
 			}
@@ -522,7 +522,7 @@
 					array_push($datax[$stage], 0);
 					array_push($aAlts[$stage], "");
 				}
-				array_push($aTargets[$stage], "index.php?module=Potentials&action=ListView&leadsource=".urlencode($lead)."&sales_stage=".urlencode($stage)."&query=true");
+				array_push($aTargets[$stage], "index.php?module=Potentials&action=ListView&leadsource=".urlencode($lead)."&sales_stage=".urlencode($stage)."&query=true&type=dbrd");
 			  }
 			  array_push($legend,$translation);
 			}
@@ -842,7 +842,7 @@
 					array_push($datay[$the_id], 0);
 					array_push($aAlts[$the_id], "");
 				}
-				array_push($aTargets[$the_id], "index.php?module=Potentials&action=ListView&assigned_user_id[]=$the_id&sales_stage=".urlencode($stage_key)."&closingdate_start=".urlencode($date_start)."&closingdate_end=".urlencode($date_end)."&query=true");
+				array_push($aTargets[$the_id], "index.php?module=Potentials&action=ListView&assigned_user_id[]=$the_id&sales_stage=".urlencode($stage_key)."&closingdate_start=".urlencode($date_start)."&closingdate_end=".urlencode($date_end)."&query=true&type=dbrd");
 			  }
 			  array_push($legend,$stage_translation);
 			}
@@ -1106,7 +1106,7 @@
 						// put none in if the field is blank.
 						array_push($visible_legends, $current_module_strings['NTC_NO_LEGENDS']);
 					}
-					array_push($aTargets, "index.php?module=Potentials&action=ListView&leadsource=".urlencode($lead_source_key)."&query=true");
+					array_push($aTargets, "index.php?module=Potentials&action=ListView&leadsource=".urlencode($lead_source_key)."&query=true&type=dbrd");
 					array_push($aAlts, $count[$lead_source_key]." ".$current_module_strings['LBL_OPPS_IN_LEAD_SOURCE']." $lead_source_translation	");
 				}
 			}




From vtiger-tickets at vtiger.fosslabs.com  Fri Jun  9 08:14:05 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 09 Jun 2006 12:14:05 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231288=3A?=
	=?utf-8?q?_Calendar_Creating_new_task?=
Message-ID: <076.273e3446e6cf906546860e7682d35c38@vtiger.fosslabs.com>

#1288: Calendar Creating new task
-----------------------+----------------------------------------------------
 Reporter:  anonymous  |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  critical   |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 When creating a task at the activity list there is possibility to add a
 lot ot different information types. These are missing when you create a
 task from the calendar.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1288>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun  9 08:20:13 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 09 Jun 2006 12:20:13 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6984 - in
 /vtigercrm/trunk/modules/Import: ImportSave.php ImportStep1.php
 ImportStep2.php ImportStep3.php ImportSteplast.php
Message-ID: <20060609122013.CDE5A7E89AB@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun  9 06:20:06 2006
New Revision: 6984

Log:
* Modified the steps where as in previous the php files start with step2 and ends with step4 but now it has been starts with step1 and ends with step3 properly

Modified:
    vtigercrm/trunk/modules/Import/ImportSave.php
    vtigercrm/trunk/modules/Import/ImportStep1.php
    vtigercrm/trunk/modules/Import/ImportStep2.php
    vtigercrm/trunk/modules/Import/ImportStep3.php
    vtigercrm/trunk/modules/Import/ImportSteplast.php

Modified: vtigercrm/trunk/modules/Import/ImportSave.php
==============================================================================
--- vtigercrm/trunk/modules/Import/ImportSave.php (original)
+++ vtigercrm/trunk/modules/Import/ImportSave.php Fri Jun  9 06:20:06 2006
@@ -205,7 +205,7 @@
 else
 {
 	$module = 'Import';
-	$action = 'ImportStep4';
+	$action = 'ImportStep3';
 }
 ?>
 

Modified: vtigercrm/trunk/modules/Import/ImportStep1.php
==============================================================================
--- vtigercrm/trunk/modules/Import/ImportStep1.php (original)
+++ vtigercrm/trunk/modules/Import/ImportStep1.php Fri Jun  9 06:20:06 2006
@@ -1,211 +1,90 @@
 <?php
 /*********************************************************************************
- * The contents of this file are subject to the SugarCRM Public License Version 1.1.2
- * ("License"); You may not use this file except in compliance with the 
- * License. You may obtain a copy of the License at http://www.sugarcrm.com/SPL
- * Software distributed under the License is distributed on an  "AS IS"  basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
- * the specific language governing rights and limitations under the License.
- * The Original Code is:  SugarCRM Open Source
- * The Initial Developer of the Original Code is SugarCRM, Inc.
- * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.;
+** The contents of this file are subject to the vtiger CRM Public License Version 1.0
+ * ("License"); You may not use this file except in compliance with the License
+ * The Original Code is:  vtiger CRM Open Source
+ * The Initial Developer of the Original Code is vtiger.
+ * Portions created by vtiger are Copyright (C) vtiger.
  * All Rights Reserved.
- *Contributor(s): ______________________________________.
+ *
  ********************************************************************************/
-/*********************************************************************************
- * $Header$
- * Description:  TODO: To be written.
- * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
- * All Rights Reserved.
- * Contributor(s): ______________________________________..
- ********************************************************************************/
-require_once('XTemplate/xtpl.php');
-require_once('data/Tracker.php');
+
+require_once('Smarty_setup.php');
+require_once('modules/Import/ImportLead.php');
+require_once('modules/Import/ImportAccount.php');
 require_once('modules/Import/ImportContact.php');
-require_once('modules/Import/ImportAccount.php');
 require_once('modules/Import/ImportOpportunity.php');
-require_once('modules/Import/ImportLead.php');
-require_once('modules/Import/Forms.php');
+require_once('modules/Import/ImportProduct.php');
 require_once('modules/Import/ImportMap.php');
-require_once('modules/Import/ImportProduct.php');
+require_once('include/utils/CommonUtils.php');
 
 global $mod_strings;
+global $app_strings;
 global $app_list_strings;
-global $app_strings;
 global $current_user;
 
+global $import_mod_strings;
 
 $focus = 0;
 
 global $theme;
-$error_msg = '';
 $theme_path="themes/".$theme."/";
 $image_path=$theme_path."images/";
 require_once($theme_path.'layout_utils.php');
 
 $log->info($mod_strings['LBL_MODULE_NAME'] . " Upload Step 1");
 
-global $import_dir;
+$smarty = new vtigerCRM_Smarty;
 
-$tmp_file_name = $import_dir. "IMPORT_".$current_user->id;
+$smarty->assign("MOD", $mod_strings);
+$smarty->assign("APP", $app_strings);
+$smarty->assign("IMP", $import_mod_strings);
 
-if (file_exists($tmp_file_name))
+$category = getParenttab();
+$smarty->assign("CATEGORY", $category);
+
+$import_object_array = Array(
+				"Leads"=>"ImportLead",
+				"Accounts"=>"ImportAccount",
+				"Contacts"=>"ImportContact",
+				"Potentials"=>"ImportOpportunity",
+				"Products"=>"ImportProduct"
+			    );
+
+if(isset($_REQUEST['module']) && $_REQUEST['module'] != '')
 {
-	unlink($tmp_file_name);
-}
-
-
-
-if (isset($_REQUEST['delete_map_id']))
-{
-	$import_map = new ImportMap();
-	$import_map->mark_deleted($_REQUEST['delete_map_id']);
-}
-
-if (isset($_REQUEST['publish']) )
-{
-	$import_map = new ImportMap();
-	$result = 0;
-
-	$import_map = $import_map->retrieve($_REQUEST['import_map_id'], false);
-
-	if ($_REQUEST['publish'] == 'yes')
-	{
-		$result = $import_map->mark_published($current_user->id,"yes");
-		if ($result == -1)
-		{
-			$error_msg = "Unable to publish. There is another published Import Map by the same name.";
-		}
-	}
-	else if ( $_REQUEST['publish'] == 'no')
-	{
-	 	// if you don't own this importmap, you do now!
-		// unless you have a map by the same name
-		$result = $import_map->mark_published($current_user->id,"no");
-		if ($result == -1)
-		{
-			$error_msg = "Unable to un-publish a map owned by another user. You own an Import Map by the same name.";
-		}
-	}
-}
-
-$xtpl=new XTemplate ('modules/Import/ImportStep1.html');
-$xtpl->assign("MOD", $mod_strings);
-$xtpl->assign("APP", $app_strings);
-
-if ($error_msg != '')
-{
-	$xtpl->assign("ERROR", $error_msg);
-	$xtpl->parse("main.error");
-}
-
-if ( $_REQUEST['module'] == 'Contacts')
-{
-	$focus = new ImportContact();
-}
-else if ( $_REQUEST['module'] == 'Accounts')
-{
-	$focus = new ImportAccount();
-} 
-else if ( $_REQUEST['module'] == 'Potentials')
-{
-	$focus = new ImportOpportunity();
-} 
-else if ( $_REQUEST['module'] == 'Leads')
-{
-	$focus = new ImportLead();
-}
-else if ( $_REQUEST['module'] == 'Products')
-{
-	$focus = new ImportProduct();
+	$object_name = $import_object_array[$_REQUEST['module']];
+	$focus = new $object_name();
 }
 else
 {
- echo "Imports aren't set up for this module type\n";
- exit;
+	echo "Sorry! Import Option is not provided for this module.";
+	exit;
 }
 
-if (isset($_REQUEST['return_module'])) $xtpl->assign("RETURN_MODULE", $_REQUEST['return_module']);
+if(isset($_REQUEST['return_module'])) $smarty->assign("RETURN_MODULE", $_REQUEST['return_module']);
+if(isset($_REQUEST['return_action'])) $smarty->assign("RETURN_ACTION", $_REQUEST['return_action']);
 
-if (isset($_REQUEST['return_action'])) $xtpl->assign("RETURN_ACTION", $_REQUEST['return_action']);
+$smarty->assign("THEME", $theme);
+$smarty->assign("IMAGE_PATH", $image_path);
+$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']);
 
-$xtpl->assign("THEME", $theme);
+$smarty->assign("HEADER", $app_strings['LBL_IMPORT']." ". $mod_strings['LBL_MODULE_NAME']);
+$smarty->assign("HAS_HEADER_CHECKED"," CHECKED");
 
-$xtpl->assign("IMAGE_PATH", $image_path);$xtpl->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']);
+$smarty->assign("MODULE", $_REQUEST['module']);
+$smarty->assign("SOURCE", $_REQUEST['source']);
 
-$xtpl->assign("HEADER", $app_strings['LBL_IMPORT']." ". $mod_strings['LBL_MODULE_NAME']);
+//we have set this as default. upto 4.2.3 we have Outlook, Act, SF formats. but now CUSTOM is enough to import
+$lang_key = "CUSTOM";
+$smarty->assign("INSTRUCTIONS_TITLE",$mod_strings["LBL_IMPORT_{$lang_key}_TITLE"]);
 
-$xtpl->assign("MODULE", $_REQUEST['module']);
-
-$xtpl->assign("JAVASCRIPT", get_validate_upload_js());
-
-if ( $_REQUEST['module'] == 'Contacts')
+for($i = 1; isset($mod_strings["LBL_{$lang_key}_NUM_$i"]);$i++)
 {
-$xtpl->parse("main.show_salesforce");
-$xtpl->parse("main.show_outlook");
-$xtpl->parse("main.show_act");
-}
-else if ( $_REQUEST['module'] == 'Accounts')
-{
-$xtpl->parse("main.show_salesforce");
-$xtpl->parse("main.show_act");
-} 
-else if ( $_REQUEST['module'] == 'Potentials')
-{
-$xtpl->parse("main.show_salesforce");
-} 
-
-if ( is_admin($current_user)) 
-{
-//	$xtpl->parse("main.create_global_map");
+	$smarty->assign("STEP_NUM",$mod_strings["LBL_NUM_$i"]);
+	$smarty->assign("INSTRUCTION_STEP",$mod_strings["LBL_{$lang_key}_NUM_$i"]);
 }
 
-$query_arr = array('assigned_user_id'=>$current_user->id,'is_published'=>'no','module'=>$_REQUEST['module']);
-
-$import_map_seed = new ImportMap();
-
-$custom_imports_arr = $import_map_seed->retrieve_all_by_string_fields($query_arr);
-
-if ( count($custom_imports_arr) )
-{
-	foreach ( $custom_imports_arr as $import)
-	{
-		$xtpl->assign("IMPORT_NAME", $import->name);
-		$xtpl->assign("IMPORT_ID", $import->id);
-		if ( is_admin($current_user)) 
-		{
-			$xtpl->parse("main.saved.saved_elem.is_admin");
-		}
-		$xtpl->parse("main.saved.saved_elem");
-	}
-
-	$xtpl->parse("main.saved");
-}
-
-
-$query_arr = array('is_published'=>'yes','module'=>$_REQUEST['module']);
-
-$published_imports_arr = $import_map_seed->retrieve_all_by_string_fields($query_arr);
-
-if ( count($published_imports_arr) )
-{
-	foreach ( $published_imports_arr as $import)
-	{
-		$xtpl->assign("IMPORT_NAME", $import->name);
-		$xtpl->assign("IMPORT_ID", $import->id);
-		if ( is_admin($current_user))
-		{	
-			$xtpl->parse("main.published.published_elem.is_admin");
-		}
-		$xtpl->parse("main.published.published_elem");
-	}
-
-	$xtpl->parse("main.published");
-}
-
-
-$xtpl->parse("main");
-
-$xtpl->out("main");
+$smarty->display("ImportStep1.tpl");
 
 ?>

Modified: vtigercrm/trunk/modules/Import/ImportStep2.php
==============================================================================
--- vtigercrm/trunk/modules/Import/ImportStep2.php (original)
+++ vtigercrm/trunk/modules/Import/ImportStep2.php Fri Jun  9 06:20:06 2006
@@ -10,7 +10,7 @@
  * The Initial Developer of the Original Code is SugarCRM, Inc.
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.;
  * All Rights Reserved.
- *Contributor(s): ______________________________________.
+ * Contributor(s): ______________________________________.
  ********************************************************************************/
 /*********************************************************************************
  * $Header$
@@ -21,150 +21,397 @@
  ********************************************************************************/
 
 require_once('Smarty_setup.php');
-require_once('data/Tracker.php');
+require_once('modules/Import/ImportLead.php');
+require_once('modules/Import/ImportAccount.php');
 require_once('modules/Import/ImportContact.php');
-require_once('modules/Import/ImportAccount.php');
 require_once('modules/Import/ImportOpportunity.php');
-require_once('modules/Import/ImportLead.php');
+require_once('modules/Import/ImportProduct.php');
 require_once('modules/Import/Forms.php');
+require_once('modules/Import/parse_utils.php');
 require_once('modules/Import/ImportMap.php');
-require_once('modules/Import/ImportProduct.php');
+require_once('include/database/PearDatabase.php');
+require_once('include/CustomFieldUtil.php');
 require_once('include/utils/CommonUtils.php');
 
+ at session_unregister('column_position_to_field');
+ at session_unregister('totalrows');
+ at session_unregister('recordcount');
+ at session_unregister('startval');
+ at session_unregister('return_field_count');
+$_SESSION['totalrows'] = '';
+$_SESSION['recordcount'] = 500;
+$_SESSION['startval'] = 0;
+
 global $mod_strings;
+global $mod_list_strings;
+global $app_strings;
 global $app_list_strings;
-global $app_strings;
 global $current_user;
-
-global $import_mod_strings;
-
-
+global $import_file_name;
+global $upload_maxsize;
+
+global $import_dir;
 $focus = 0;
+$delimiter = ',';
+$max_lines = 3;
+
+$has_header = 0;
+
+if ( isset($_REQUEST['has_header']))
+{
+	$has_header = 1;
+}
 
 global $theme;
 $theme_path="themes/".$theme."/";
 $image_path=$theme_path."images/";
 require_once($theme_path.'layout_utils.php');
 
-$log->info($mod_strings['LBL_MODULE_NAME'] . " Upload Step 1");
-
-$smarty = new vtigerCRM_Smarty;
+if (!is_uploaded_file($_FILES['userfile']['tmp_name']) )
+{
+	show_error_import($mod_strings['LBL_IMPORT_MODULE_ERROR_NO_UPLOAD']);
+	exit;
+}
+else if ($_FILES['userfile']['size'] > $upload_maxsize)
+{
+	show_error_import( $mod_strings['LBL_IMPORT_MODULE_ERROR_LARGE_FILE'] . " ". $upload_maxsize. " ". $mod_strings['LBL_IMPORT_MODULE_ERROR_LARGE_FILE_END']);
+	exit;
+}
+if( !is_writable( $import_dir ))
+{
+	show_error_import($mod_strings['LBL_IMPORT_MODULE_NO_DIRECTORY'].$import_dir.$mod_strings['LBL_IMPORT_MODULE_NO_DIRECTORY_END']);
+	exit;
+}
+
+$tmp_file_name = $import_dir. "IMPORT_".$current_user->id;
+
+move_uploaded_file($_FILES['userfile']['tmp_name'], $tmp_file_name);
+
+
+// Now parse the file and look for errors
+$ret_value = 0;
+
+if ($_REQUEST['source'] == 'act')
+{
+	$ret_value = parse_import_act($tmp_file_name,$delimiter,$max_lines,$has_header);
+} 
+else
+{
+	$ret_value = parse_import($tmp_file_name,$delimiter,$max_lines,$has_header);
+}
+
+if ($ret_value == -1)
+{
+	show_error_import( $mod_strings['LBL_CANNOT_OPEN'] );
+	exit;
+} 
+else if ($ret_value == -2)
+{
+	show_error_import( $mod_strings['LBL_NOT_SAME_NUMBER'] );
+	exit;
+}
+else if ( $ret_value == -3 )
+{
+	show_error_import( $mod_strings['LBL_NO_LINES'] );
+	exit;
+}
+
+
+$rows = $ret_value['rows'];
+$ret_field_count = $ret_value['field_count'];
+
+$smarty =  new vtigerCRM_Smarty;
+
+$smarty->assign("TMP_FILE", $tmp_file_name );
+$smarty->assign("SOURCE", $_REQUEST['source'] );
 
 $smarty->assign("MOD", $mod_strings);
 $smarty->assign("APP", $app_strings);
-$smarty->assign("IMP", $import_mod_strings);
-
-$category = getParenttab();
-$smarty->assign("CATEGORY", $category);
-
-if ( $_REQUEST['module'] == 'Contacts')
-{
-	$focus = new ImportContact();
-}
-else if ( $_REQUEST['module'] == 'Accounts')
-{
-	$focus = new ImportAccount();
-} 
-else if ( $_REQUEST['module'] == 'Potentials')
-{
-	$focus = new ImportOpportunity();
-}
-else if ( $_REQUEST['module'] == 'Leads')
-{
-	$focus = new ImportLead();
-}
-else if ( $_REQUEST['module'] == 'Products')
-{
-	$focus = new ImportProduct();
-}
-
-else
-{
- echo "Imports aren't set up for this module type\n";
- exit;
-}
-
-if (isset($_REQUEST['return_module'])) $smarty->assign("RETURN_MODULE", $_REQUEST['return_module']);
-
-if (isset($_REQUEST['return_action'])) $smarty->assign("RETURN_ACTION", $_REQUEST['return_action']);
+
+if(isset($_REQUEST['return_module'])) $smarty->assign("RETURN_MODULE", $_REQUEST['return_module']);
+if(isset($_REQUEST['return_action'])) $smarty->assign("RETURN_ACTION", $_REQUEST['return_action']);
 
 $smarty->assign("THEME", $theme);
-
 $smarty->assign("IMAGE_PATH", $image_path);
 $smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']);
 
 $smarty->assign("HEADER", $app_strings['LBL_IMPORT']." ". $mod_strings['LBL_MODULE_NAME']);
+$smarty->assign("HASHEADER", $has_header);
+
+$import_object_array = Array(
+				"Leads"=>"ImportLead",
+				"Accounts"=>"ImportAccount",
+				"Contacts"=>"ImportContact",
+				"Potentials"=>"ImportOpportunity",
+				"Products"=>"ImportProduct"
+			    );
+
+if(isset($_REQUEST['module']) && $_REQUEST['module'] != '')
+{
+	$object_name = $import_object_array[$_REQUEST['module']];
+	$focus = new $object_name();
+}
+else
+{
+	$focus = new ImportContact();
+}
+
+
+$total_num_rows=sizeof($rows);	
+$firstrow = $rows[0];
+if($total_num_rows >1 )
+{
+	$secondrow = $rows[1];
+}		
+if($total_num_rows >2)
+{
+	$thirdrow = $rows[2];
+}
+
+	
+$field_map = $outlook_contacts_field_map;
+
+$mapping_file = new ImportMap();
+$saved_map_lists = $mapping_file->getSavedMappingsList($_REQUEST['return_module']);
+$map_list_combo = '<select name="source" id="saved_source" disabled onchange="getImportSavedMap(this)">';
+$map_list_combo .= '<OPTION value="-1" selected>--Select--</OPTION>';
+if(is_array($saved_map_lists))
+{
+	foreach($saved_map_lists as $mapid => $mapname)
+	{
+		$map_list_combo .= '<OPTION value='.$mapid.'>'.$mapname.'</OPTION>';
+	}
+}
+$map_list_combo .= '</select>';
+$smarty->assign("SAVED_MAP_LISTS",$map_list_combo);
+
+
+if ( count($mapping_arr) > 0)
+{
+	$field_map = &$mapping_arr;
+}
+else if ($_REQUEST['source'] == 'other')
+{
+	if ($_REQUEST['module'] == 'Contacts')
+	{
+		$field_map = $outlook_contacts_field_map;
+	} 
+	else if ($_REQUEST['module'] == 'Accounts')
+	{
+		$field_map = $outlook_accounts_field_map;
+	}
+	else if ($_REQUEST['module'] == 'Potentials')
+	{
+		$field_map = $salesforce_opportunities_field_map;
+	}
+} 
+
+
+$add_one = 1;
+$start_at = 0;
+
+if($has_header)
+{
+	$add_one = 0;
+	$start_at = 1;
+} 
+
+for($row_count = $start_at; $row_count < count($rows); $row_count++ )
+{
+	$smarty->assign("ROWCOUNT", $row_count + $add_one);
+}
+
+$list_string_key = strtolower($_REQUEST['module']);
+$list_string_key .= "_import_fields";
+
+$translated_column_fields = $mod_list_strings[$list_string_key];
+
+// adding custom fields translations
+getCustomFieldTrans($_REQUEST['module'],&$translated_column_fields);
+
+$cnt=1;
+for($field_count = 0; $field_count < $ret_field_count; $field_count++)
+{
+
+	$smarty->assign("COLCOUNT", $field_count + 1);
+	$suggest = "";
+
+	/*
+	if ($has_header && isset( $field_map[$firstrow[$field_count]] ) )
+	{
+		$suggest = $field_map[$firstrow[$field_count]];	
+	}
+	else if (isset($field_map[$field_count]))
+	{
+		$suggest = $field_map[$field_count];	
+	}
+	*/
+
+	if($_REQUEST['module']=='Accounts')
+	{
+		$tablename='account';
+		$focus1=new Account();
+	}
+	if($_REQUEST['module']=='Contacts')
+	{
+		$tablename='contactdetails';
+		$focus1=new Contact();
+ 	}
+	if($_REQUEST['module']=='Leads')
+ 	{
+		$tablename='leaddetails';
+		$focus1=new Lead();
+	}
+	if($_REQUEST['module']=='Potentials')
+ 	{
+		$tablename='potential';
+		$focus1=new Potential();
+	}
+	if($_REQUEST['module']=='Products')
+ 	{
+ 		$tablename='products';
+ 		$focus1=new Product();
+ 	}
+
+	
+	$smarty->assign("FIRSTROW",$firstrow);
+	$smarty->assign("SECONDROW",$secondrow);
+	$smarty->assign("THIRDROW",$thirdrow);
+	$smarty_array[$field_count + 1] = getFieldSelect(	$focus->importable_fields,
+							$field_count,
+							$focus1->required_fields,
+							$suggest,
+							$translated_column_fields,
+							$tablename
+						   );
+
+	$pos = 0;
+
+	foreach ( $rows as $row ) 
+	{
+		
+		if( isset($row[$field_count]) && $row[$field_count] != '')
+		{
+			$smarty->assign("CELL",htmlspecialchars($row[$field_count]));
+//			$smarty->parse("main.table.row.cell");
+		} 
+		else
+		{
+//			$smarty->parse("main.table.row.cellempty");
+		}
+
+		$cnt++;
+	}
+}
+ at session_unregister('import_has_header');
+ at session_unregister('import_firstrow');
+ at session_unregister('import_field_map');
+ at session_unregister('import_module_object_column_fields');
+ at session_unregister('import_module_field_count');
+ at session_unregister('import_module_object_required_fields');
+ at session_unregister('import_module_translated_column_fields');
+$_SESSION['import_has_header'] = $has_header;
+$_SESSION['import_firstrow'] = $firstrow;
+$_SESSION['import_field_map'] = $field_map;
+$_SESSION['import_module_object_column_fields'] = $focus->importable_fields;
+$_SESSION['import_module_field_count'] = $field_count;
+$_SESSION['import_module_object_required_fields'] = $focus1->required_fields;
+$_SESSION['import_module_translated_column_fields'] = $translated_column_fields;
+
+
+//echo '<pre>Default array ==> '; print_r($smarty_array); echo '</pre>';
+
+$smarty->assign("SELECTFIELD",$smarty_array);
+$smarty->assign("ROW", $row);
+
+$module_key = "LBL_".strtoupper($_REQUEST['module'])."_NOTE_";
+
+for ($i = 1;isset($mod_strings[$module_key.$i]);$i++)
+{
+	$smarty->assign("NOTETEXT", $mod_strings[$module_key.$i]);
+}
+
+if($has_header)
+{
+	$smarty->assign("HAS_HEADER", 'on');
+} 
+else
+{
+	$smarty->assign("HAS_HEADER", 'off');
+}
 
 $smarty->assign("MODULE", $_REQUEST['module']);
 
-// see if the source starts with 'custom' 
-// if so, pull off the id, load that map, and get the name
-if ($_REQUEST['source'] == "outlook")
-{
-	$smarty->assign("SOURCE", $_REQUEST['source']);
-	$smarty->assign("SOURCE_NAME","Outlook ");
-	$smarty->assign("HAS_HEADER_CHECKED"," CHECKED");
-} 
-else if ($_REQUEST['source'] == "act")
-{
-	$smarty->assign("SOURCE", $_REQUEST['source']);
-	$smarty->assign("SOURCE_NAME","ACT! ");
-	$smarty->assign("HAS_HEADER_CHECKED"," CHECKED");
-}
-else if ( strncasecmp("custom:",$_REQUEST['source'],7) == 0)
-{
-	$id = substr($_REQUEST['source'],7);
-	$import_map_seed = new ImportMap();
-
-	$import_map_seed->retrieve($id, false);
-
-	$adb->println($import_map_seed->toString());
-
-	$smarty->assign("SOURCE_ID", $import_map_seed->id);
-	$smarty->assign("SOURCE_NAME", $import_map_seed->name);
-	$smarty->assign("SOURCE", "custom");
-
-	if ($import_map_seed->has_header)
-	{
-		$smarty->assign("HAS_HEADER_CHECKED"," CHECKED");
-	}
-}
-else
-{
-	$smarty->assign("HAS_HEADER_CHECKED"," CHECKED");
-	$smarty->assign("SOURCE", $_REQUEST['source']);
-}
-
-$smarty->assign("JAVASCRIPT", get_validate_upload_js());
-
-$lang_key = '';
-
-if ($_REQUEST['source'] == "outlook")
-{
-	$lang_key = "OUTLOOK";
-}
-else if ($_REQUEST['source'] == "act")
-{
-	$lang_key = "ACT";
-}
-else if ($_REQUEST['source'] == "salesforce")
-{
-	$lang_key = "SF";
-}
-else 
-{
-	$lang_key = "CUSTOM";
-}
-
-$smarty->assign("INSTRUCTIONS_TITLE",$mod_strings["LBL_IMPORT_{$lang_key}_TITLE"]);
-
-for ($i = 1; isset($mod_strings["LBL_{$lang_key}_NUM_$i"]);$i++)
-{
-$smarty->assign("STEP_NUM",$mod_strings["LBL_NUM_$i"]);
-$smarty->assign("INSTRUCTION_STEP",$mod_strings["LBL_{$lang_key}_NUM_$i"]);
-
-}
-
-$smarty->display("ImportStep1.tpl");
+$category = getParenttab();
+$smarty->assign('CATEGORY' , $category);
+
+$smarty->assign("JAVASCRIPT2", get_readonly_js() );
+
+$smarty->display('ImportStep2.tpl');
 
 ?>
+<script language="javascript" type="text/javascript">
+function validate_import_map()
+{
+	var tagName;
+	var count = 0;
+	var field_count = "<?php echo $field_count; ?>";
+	var required_fields = new Array();
+	var required_fields_name = new Array();
+	var seq_string = '';
+
+	<?php 
+		foreach($focus->required_fields as $name => $index)
+		{
+			?>
+			required_fields[count] = "<?php echo $name; ?>";
+			required_fields_name[count] = "<?php echo $translated_column_fields[$name]; ?>";
+			count = count + 1;
+			<?php 
+		} 
+	?>		
+	for(loop_count = 0; loop_count<field_count;loop_count++)
+	{
+		tagName = document.getElementById('colnum'+loop_count);
+		optionData = tagName.options[tagName.selectedIndex].value;
+
+		if(optionData != -1)
+		{
+			tmp = seq_string.indexOf(optionData);
+			if(tmp == -1)
+			{
+				seq_string = seq_string + optionData;
+			}
+			else
+			{
+				//if a field mapped more than once, alert the user and return
+				alert("'"+tagName.options[tagName.selectedIndex].text+"' is mapped more than once. Please check the mapping.");
+				return false;
+			}
+		}
+
+	}
+
+	//check whether the mandatory fields have been mapped.
+	for(inner_loop = 0; inner_loop<required_fields.length;inner_loop++)
+	{
+		if(seq_string.indexOf(required_fields[inner_loop]) == -1)
+		{
+			alert('Please map the mandatory field "'+required_fields_name[inner_loop]+'"');
+			return false;
+		}
+	}
+
+	//This is to check whether the save map name has been given or not when save map check box is checked
+	if(document.getElementById("save_map").checked == true)
+	{
+		if(trim(document.getElementById("save_map_as").value) == '')
+		{
+			alert("Please Enter Save Map Name");
+			return false;
+		}
+	}
+
+	return true;
+}
+</script>

Modified: vtigercrm/trunk/modules/Import/ImportStep3.php
==============================================================================
--- vtigercrm/trunk/modules/Import/ImportStep3.php (original)
+++ vtigercrm/trunk/modules/Import/ImportStep3.php Fri Jun  9 06:20:06 2006
@@ -21,487 +21,338 @@
  ********************************************************************************/
 
 require_once('Smarty_setup.php');
-require_once('data/Tracker.php');
+require_once('modules/Import/ImportLead.php');
+require_once('modules/Import/ImportAccount.php');
 require_once('modules/Import/ImportContact.php');
-require_once('modules/Import/ImportAccount.php');
 require_once('modules/Import/ImportOpportunity.php');
-require_once('modules/Import/ImportLead.php');
-require_once('modules/Import/Forms.php');
+require_once('modules/Import/ImportProduct.php');
+require_once('modules/Import/ImportMap.php');
+require_once('modules/Import/UsersLastImport.php');
 require_once('modules/Import/parse_utils.php');
-require_once('modules/Import/ImportMap.php');
+require_once('include/ListView/ListView.php');
 require_once('include/database/PearDatabase.php');
-require_once('include/CustomFieldUtil.php');
-require_once('modules/Import/ImportProduct.php');
-require_once('include/utils/CommonUtils.php');
-
- at session_unregister('column_position_to_field');
- at session_unregister('totalrows');
- at session_unregister('recordcount');
- at session_unregister('startval');
- at session_unregister('return_field_count');
-$_SESSION['totalrows'] = '';
-$_SESSION['recordcount'] = 500;
-$_SESSION['startval'] = 0;
+require_once('modules/Import/ImportSave.php');
+
+set_time_limit(0);
+ini_set("display_errors",'0');
+
+
+function p($str)
+{
+	global $adb;
+	$adb->println("IMP :".$str);
+}
+
+function implode_assoc($inner_delim, $outer_delim, $array) 
+{
+	$output = array();
+
+	foreach( $array as $key => $item )
+	{
+               $output[] = $key . $inner_delim . $item;
+	}
+
+       return implode($outer_delim, $output);
+}
 
 global $mod_strings;
-global $mod_list_strings;
 global $app_list_strings;
 global $app_strings;
 global $current_user;
 global $import_file_name;
+global $theme;
 global $upload_maxsize;
-
-global $theme;
-global $outlook_contacts_field_map;
-global $act_contacts_field_map;
-global $salesforce_contacts_field_map;
-global $outlook_accounts_field_map;
-global $act_accounts_field_map;
-global $salesforce_accounts_field_map;
-global $salesforce_opportunities_field_map;
-global $import_dir;
-$focus = 0;
-$delimiter = ',';
-$max_lines = 3;
-
-$has_header = 0;
-
-if ( isset($_REQUEST['has_header']))
-{
-	$has_header = 1;
-}
+global $site_URL;
 
 $theme_path="themes/".$theme."/";
 $image_path=$theme_path."images/";
 require_once($theme_path.'layout_utils.php');
 
-if (!is_uploaded_file($_FILES['userfile']['tmp_name']) )
-{
-	show_error_import($mod_strings['LBL_IMPORT_MODULE_ERROR_NO_UPLOAD']);
-	exit;
-}
-else if ($_FILES['userfile']['size'] > $upload_maxsize)
-{
-	show_error_import( $mod_strings['LBL_IMPORT_MODULE_ERROR_LARGE_FILE'] . " ". $upload_maxsize. " ". $mod_strings['LBL_IMPORT_MODULE_ERROR_LARGE_FILE_END']);
-	exit;
-}
-if( !is_writable( $import_dir ))
-{
-	show_error_import($mod_strings['LBL_IMPORT_MODULE_NO_DIRECTORY'].$import_dir.$mod_strings['LBL_IMPORT_MODULE_NO_DIRECTORY_END']);
-	exit;
-}
-
-$tmp_file_name = $import_dir. "IMPORT_".$current_user->id;
-
-move_uploaded_file($_FILES['userfile']['tmp_name'], $tmp_file_name);
-
+$log->info("Upload Step 3");
+
+
+$delimiter = ',';
+// file handle
+$count = 0;
+$error = "";
+$col_pos_to_field = array();
+$header_to_field = array();
+$field_to_pos = array();
+$focus = 0;
+$current_bean_type = "";
+$id_exists_count = 0;
+$broken_ids = 0;
+
+$has_header = 0;
+
+if ( isset( $_REQUEST['has_header']) && $_REQUEST['has_header'] == 'on')
+{
+	$has_header = 1;
+}
+if($_REQUEST['modulename'] != '')
+	$_REQUEST['module'] = $_REQUEST['modulename'];
+
+
+$import_object_array = Array(
+				"Leads"=>"ImportLead",
+				"Accounts"=>"ImportAccount",
+				"Contacts"=>"ImportContact",
+				"Potentials"=>"ImportOpportunity",
+				"Products"=>"ImportProduct"
+			    );
+
+if(isset($_REQUEST['module']) && $_REQUEST['module'] != '')
+{
+	$current_bean_type = $import_object_array[$_REQUEST['module']];
+}
+else
+{
+	$current_bean_type = "ImportContact";
+}
+
+$focus = new $current_bean_type();
+
+//Constructing the custom field Array
+require_once('include/CustomFieldUtil.php');
+$custFldArray = getCustomFieldArray($_REQUEST['module']);
+p("IMP 3: custFldArray");
+p($custFldArray);
+
+//Initializing  an empty Array to store the custom field Column Name and Value
+$resCustFldArray = Array();
+
+p("Getting from request");
+// loop through all request variables
+foreach ($_REQUEST as $name=>$value)
+{
+	p("name=".$name." value=".$value);
+	// only look for var names that start with "colnum"
+	if ( strncasecmp( $name, "colnum", 6) != 0 )
+	{	
+		continue;
+	}
+	if ($value == "-1")
+	{
+		
+		continue;
+	}
+
+	// this value is a user defined field name
+	$user_field = $value;
+
+	// pull out the column position for this field name
+	$pos = substr($name,6);
+
+	// make sure we haven't seen this field defined yet
+	if ( isset( $field_to_pos[$user_field]) )
+	{
+		show_error_import($mod_strings['LBL_ERROR_MULTIPLE']);
+	        exit;
+
+	}
+
+	p("user_field=".$user_field." if=".$focus->importable_fields[$user_field]);
+	
+	// match up the "official" field to the user 
+	// defined one, and map to columm position: 
+	if ( isset( $focus->importable_fields[$user_field] ) || isset( $custFldArray[$user_field] ))
+	{
+		p("user_field SET=".$user_field);
+		// now mark that we've seen this field
+		$field_to_pos[$user_field] = $pos;
+		$col_pos_to_field[$pos] = $user_field;
+	}
+}
+
+p("field_to_pos");
+$adb->println($field_to_pos);
+p("col_pos_to_field");
+$adb->println($col_pos_to_field);
 
 // Now parse the file and look for errors
+$max_lines = -1;
+
 $ret_value = 0;
 
 if ($_REQUEST['source'] == 'act')
 {
-	$ret_value = parse_import_act($tmp_file_name,$delimiter,$max_lines,$has_header);
-} 
-else
-{
-	$ret_value = parse_import($tmp_file_name,$delimiter,$max_lines,$has_header);
-}
-
-if ($ret_value == -1)
-{
-	show_error_import( $mod_strings['LBL_CANNOT_OPEN'] );
-	exit;
-} 
-else if ($ret_value == -2)
-{
-	show_error_import( $mod_strings['LBL_NOT_SAME_NUMBER'] );
-	exit;
-}
-else if ( $ret_value == -3 )
-{
-	show_error_import( $mod_strings['LBL_NO_LINES'] );
-	exit;
-}
-
-
-$rows = $ret_value['rows'];
+        $ret_value = parse_import_act($_REQUEST['tmp_file'],$delimiter,$max_lines,$has_header);
+}
+else
+{
+	$ret_value = parse_import($_REQUEST['tmp_file'],$delimiter,$max_lines,$has_header);
+}
+
+if (file_exists($_REQUEST['tmp_file']))
+{
+	unlink($_REQUEST['tmp_file']);
+}
+
+$datarows = $ret_value['rows'];
+
 $ret_field_count = $ret_value['field_count'];
 
-$smarty =  new vtigerCRM_Smarty;
-
-$smarty->assign("TMP_FILE", $tmp_file_name );
-
-$smarty->assign("SOURCE", $_REQUEST['source'] );
-
-$source_to_name = array( 
-			'outlook'=>$mod_strings['LBL_MICROSOFT_OUTLOOK'],
-			'act'=>$mod_strings['LBL_ACT'],
-			'salesforce'=>$mod_strings['LBL_SALESFORCE'],
-			'custom'=>$mod_strings['LBL_CUSTOM'],
-			'other'=>$mod_strings['LBL_CUSTOM'],
-		      );
-
-$smarty->assign("SOURCE_NAME", $source_to_name[$_REQUEST['source']] );
-$smarty->assign("MOD", $mod_strings);
-$smarty->assign("APP", $app_strings);
-
-if (isset($_REQUEST['return_module'])) $smarty->assign("RETURN_MODULE", $_REQUEST['return_module']);
-if (isset($_REQUEST['return_action'])) $smarty->assign("RETURN_ACTION", $_REQUEST['return_action']);
-
-$smarty->assign("THEME", $theme);
-$smarty->assign("IMAGE_PATH", $image_path);
-$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']);
-
-$smarty->assign("HEADER", $app_strings['LBL_IMPORT']." ". $mod_strings['LBL_MODULE_NAME']);
-$smarty->assign("HASHEADER", $has_header);
-
-
-if (! isset( $_REQUEST['module'] ) || $_REQUEST['module'] == 'Contacts')
-{
-	$focus = new ImportContact();
-}
-else if ( $_REQUEST['module'] == 'Accounts')
-{
-	$focus = new ImportAccount();
-}
-else if ( $_REQUEST['module'] == 'Potentials')
-{
-	$focus = new ImportOpportunity();
-}
-else if ( $_REQUEST['module'] == 'Leads')
-{
-	$focus = new ImportLead();
-}
-else if ( $_REQUEST['module'] == 'Products')
-{
-	$focus = new ImportProduct();
-}
-
-
-
-$total_num_rows=sizeof($rows);	
-$firstrow = $rows[0];
-if($total_num_rows >1 )
-{
-	$secondrow = $rows[1];
-}		
-if($total_num_rows >2)
-{
-	$thirdrow = $rows[2];
-}
-
-	
-$field_map = $outlook_contacts_field_map;
-
-/*if ( isset( $_REQUEST['source_id']))
-{
-	$mapping_file = new ImportMap();
-
-	//$mapping_file->retrieve_entity_info( $_REQUEST['source_id'],$_REQUEST['return_module']);
-	$mapping_file->retrieve( $_REQUEST['source_id'],false);
-	$adb->println("richie : ".$mapping_file->toString());
-
-	$mapping_content = $mapping_file->content;
-
-	$mapping_arr = array();
-
-	if ( isset($mapping_content) && $mapping_content != "")
-	{
-		$pairs = split("&",$mapping_content);
-	
-		foreach ($pairs as $pair)
+$saved_ids = array();
+
+$firstrow = 0;
+
+if (! isset($datarows))
+{
+	$error = $mod_strings['LBL_FILE_ALREADY_BEEN_OR'];
+	$datarows = array();
+}
+
+if ($has_header == 1)
+{
+	$firstrow = array_shift($datarows);
+}
+
+//Mark the last imported records as deleted which are imported by the current user in users_last_import table
+if(!isset($_REQUEST['startval']))
+{
+	$seedUsersLastImport = new UsersLastImport();
+	$seedUsersLastImport->mark_deleted_by_user_id($current_user->id);
+}
+$skip_required_count = 0;
+
+p("processing started ret_field_count=".$ret_field_count);
+$adb->println($datarows);
+
+$error = '';
+$focus = new $current_bean_type();
+
+
+// SAVE MAPPING IF REQUESTED
+if(isset($_REQUEST['save_map']) && $_REQUEST['save_map'] == 'on' && isset($_REQUEST['save_map_as']) && $_REQUEST['save_map_as'] != '')
+{
+	p("save map");
+	$serialized_mapping = '';
+
+	if( $has_header)
+	{
+		foreach($col_pos_to_field as $pos=>$field_name)
 		{
-			list($name,$value) = split("=",$pair);
-			$mapping_arr["$name"] = $value;
-		}
-	}
-}
-*/
-	$mapping_file = new ImportMap();
-	$saved_map_lists = $mapping_file->getSavedMappingsList($_REQUEST['return_module']);
-	$map_list_combo = '<select name="source" id="saved_source" disabled onchange="getImportSavedMap(this)">';
-	$map_list_combo .= '<OPTION value="-1" selected>--Select--</OPTION>';
-	if(is_array($saved_map_lists))
-	{
-		foreach($saved_map_lists as $mapid => $mapname)
-		{
-			$map_list_combo .= '<OPTION value='.$mapid.'>'.$mapname.'</OPTION>';
-		}
-	}
-	$map_list_combo .= '</select>';
-	$smarty->assign("SAVED_MAP_LISTS",$map_list_combo);
-
-
-
-if ( count($mapping_arr) > 0)
-{
-	$field_map = &$mapping_arr;
-}
-else if ($_REQUEST['source'] == 'other')
-{
-	if ($_REQUEST['module'] == 'Contacts')
-	{
-		$field_map = $outlook_contacts_field_map;
-	} 
-	else if ($_REQUEST['module'] == 'Accounts')
-	{
-		$field_map = $outlook_accounts_field_map;
-	}
-	else if ($_REQUEST['module'] == 'Potentials')
-	{
-		$field_map = $salesforce_opportunities_field_map;
-	}
-} 
-else if ($_REQUEST['source'] == 'act')
-{
-	if ($_REQUEST['module'] == 'Contacts')
-	{
-		$field_map = $act_contacts_field_map;
-	} 
-	else if ($_REQUEST['module'] == 'Accounts')
-	{
-		$field_map = $act_accounts_field_map;
-	}
-}
-else if ($_REQUEST['source'] == 'salesforce')
-{
-	if ($_REQUEST['module'] == 'Contacts')
-	{
-		$field_map = $salesforce_contacts_field_map;
-	} 
-	else if ($_REQUEST['module'] == 'Accounts')
-	{
-		$field_map = $salesforce_accounts_field_map;
-	}
-	else if ($_REQUEST['module'] == 'Potentials')
-	{
-		$field_map = $salesforce_opportunities_field_map;
-	}
-}
-else if ($_REQUEST['source'] == 'outlook')
-{
-	$smarty->assign("IMPORT_FIRST_CHECKED", " CHECKED");
-	if ($_REQUEST['module'] == 'Contacts')
-	{
-		$field_map = $outlook_contacts_field_map;
-	} 
-	else if ($_REQUEST['module'] == 'Accounts')
-	{
-		$field_map = $outlook_accounts_field_map;
-	}
-
-}
-
-$add_one = 1;
-$start_at = 0;
-
-if ( $has_header)
-{
-	$add_one = 0;
-	$start_at = 1;
-} 
-
-for($row_count = $start_at; $row_count < count($rows); $row_count++ )
-{
-	$smarty->assign("ROWCOUNT", $row_count + $add_one);
-}
-
-$list_string_key = strtolower($_REQUEST['module']);
-$list_string_key .= "_import_fields";
-
-$translated_column_fields = $mod_list_strings[$list_string_key];
-
-// adding custom fields translations
-getCustomFieldTrans($_REQUEST['module'],&$translated_column_fields);
-
-$cnt=1;
-for($field_count = 0; $field_count < $ret_field_count; $field_count++)
-{
-
-	$smarty->assign("COLCOUNT", $field_count + 1);
-	$suggest = "";
-
-	/*
-	if ($has_header && isset( $field_map[$firstrow[$field_count]] ) )
-	{
-		$suggest = $field_map[$firstrow[$field_count]];	
-	}
-	else if (isset($field_map[$field_count]))
-	{
-		$suggest = $field_map[$field_count];	
-	}
-	*/
-
-	if($_REQUEST['module']=='Accounts')
-	{
-		$tablename='account';
-		$focus1=new Account();
-	}
-	if($_REQUEST['module']=='Contacts')
-	{
-		$tablename='contactdetails';
-		$focus1=new Contact();
- 	}
-	if($_REQUEST['module']=='Leads')
- 	{
-		$tablename='leaddetails';
-		$focus1=new Lead();
-	}
-	if($_REQUEST['module']=='Potentials')
- 	{
-		$tablename='potential';
-		$focus1=new Potential();
-	}
-	if($_REQUEST['module']=='Products')
- 	{
- 		$tablename='products';
- 		$focus1=new Product();
- 	}
-
-	
-	$smarty->assign("FIRSTROW",$firstrow);
-	$smarty->assign("SECONDROW",$secondrow);
-	$smarty->assign("THIRDROW",$thirdrow);
-	$smarty_array[$field_count + 1] = getFieldSelect(	$focus->importable_fields,
-							$field_count,
-							$focus1->required_fields,
-							$suggest,
-							$translated_column_fields,
-							$tablename
-						   );
-
-	$pos = 0;
-
-	foreach ( $rows as $row ) 
-	{
-		
-		if( isset($row[$field_count]) && $row[$field_count] != '')
-		{
-			$smarty->assign("CELL",htmlspecialchars($row[$field_count]));
-//			$smarty->parse("main.table.row.cell");
-		} 
-		else
-		{
-//			$smarty->parse("main.table.row.cellempty");
-		}
-
-		$cnt++;
-	}
-}
- at session_unregister('import_has_header');
- at session_unregister('import_firstrow');
- at session_unregister('import_field_map');
- at session_unregister('import_module_object_column_fields');
- at session_unregister('import_module_field_count');
- at session_unregister('import_module_object_required_fields');
- at session_unregister('import_module_translated_column_fields');
-$_SESSION['import_has_header'] = $has_header;
-$_SESSION['import_firstrow'] = $firstrow;
-$_SESSION['import_field_map'] = $field_map;
-$_SESSION['import_module_object_column_fields'] = $focus->importable_fields;
-$_SESSION['import_module_field_count'] = $field_count;
-$_SESSION['import_module_object_required_fields'] = $focus1->required_fields;
-$_SESSION['import_module_translated_column_fields'] = $translated_column_fields;
-
-
-//echo '<pre>Default array ==> '; print_r($smarty_array); echo '</pre>';
-
-$smarty->assign("SELECTFIELD",$smarty_array);
-$smarty->assign("ROW", $row);
-//$xtpl->parse("main.table");
-
-$module_key = "LBL_".strtoupper($_REQUEST['module'])."_NOTE_";
-
-for ($i = 1;isset($mod_strings[$module_key.$i]);$i++)
-{
-	$smarty->assign("NOTETEXT", $mod_strings[$module_key.$i]);
-	//$xtpl->parse("main.note");
-}
-
-
-if($has_header)
-{
-	$smarty->assign("HAS_HEADER", 'on');
-} 
-else
-{
-	$smarty->assign("HAS_HEADER", 'off');
-}
-
-
-$smarty->assign("MODULE", $_REQUEST['module']);
-
-$category = getParenttab();
-$smarty->assign('CATEGORY' , $category);
-
-$smarty->assign("JAVASCRIPT2", get_readonly_js() );
-
-$smarty->display('ImportStep2.tpl');
-
-?>
-<script language="javascript" type="text/javascript">
-function validate_import_map()
-{
-	var tagName;
-	var count = 0;
-	var field_count = "<?php echo $field_count; ?>";
-	var required_fields = new Array();
-	var required_fields_name = new Array();
-	var seq_string = '';
-
-	<?php 
-		foreach($focus->required_fields as $name => $index)
-		{
-			?>
-			required_fields[count] = "<?php echo $name; ?>";
-			required_fields_name[count] = "<?php echo $translated_column_fields[$name]; ?>";
-			count = count + 1;
-			<?php 
-		} 
-	?>		
-	for(loop_count = 0; loop_count<field_count;loop_count++)
-	{
-		tagName = document.getElementById('colnum'+loop_count);
-		optionData = tagName.options[tagName.selectedIndex].value;
-
-		if(optionData != -1)
-		{
-			tmp = seq_string.indexOf(optionData);
-			if(tmp == -1)
+			if ( isset($firstrow[$pos]) &&  isset( $field_name))
 			{
-				seq_string = seq_string + optionData;
-			}
-			else
-			{
-				//if a field mapped more than once, alert the user and return
-				alert("'"+tagName.options[tagName.selectedIndex].text+"' is mapped more than once. Please check the mapping.");
-				return false;
+				$header_to_field[ $firstrow[$pos] ] = $field_name;
 			}
 		}
 
-	}
-
-	//check whether the mandatory fields have been mapped.
-	for(inner_loop = 0; inner_loop<required_fields.length;inner_loop++)
-	{
-		if(seq_string.indexOf(required_fields[inner_loop]) == -1)
-		{
-			alert('Please map the mandatory field "'+required_fields_name[inner_loop]+'"');
-			return false;
-		}
-	}
-
-	//This is to check whether the save map name has been given or not when save map check box is checked
-	if(document.getElementById("save_map").checked == true)
-	{
-		if(trim(document.getElementById("save_map_as").value) == '')
-		{
-			alert("Please Enter Save Map Name");
-			return false;
-		}
-	}
-
-	return true;
-}
-</script>
+		$serialized_mapping = implode_assoc("=","&",$header_to_field);
+	}
+	else
+	{
+		$serialized_mapping = implode_assoc("=","&",$col_pos_to_field);
+	}
+
+	$mapping_file_name = $_REQUEST['save_map_as'];
+
+	$mapping_file = new ImportMap();
+
+	//$query_arr = array('assigned_user_id'=>$current_user->id,'name'=>$mapping_file_name);
+	//$mapping_file->retrieve_by_string_fields($query_arr, false);
+
+	$result = $mapping_file->save_map( $current_user->id,
+					$mapping_file_name,
+					$_REQUEST['module'],
+					$has_header,
+					$serialized_mapping );
+
+	$adb->println("Save map done");
+	$adb->println($result);
+}
+//save map - ends
+
+
+
+
+if(isset($_SESSION['totalrows']) && $_SESSION['totalrows'] != '')
+{
+	$xrows = $_SESSION['totalrows'];
+}
+else
+{
+	$xrows = $datarows;
+}
+if(isset($_SESSION['return_field_count']))
+{
+	$ret_field_count = $_SESSION['return_field_count'];
+}
+if(isset($_SESSION['column_position_to_field']))
+{
+	$col_pos_to_field = $_SESSION['column_position_to_field'];
+}
+if($xrows != '')
+{
+	$datarows = $xrows;
+}
+if($_REQUEST['skipped_record_count'] != '')
+	$skipped_record_count = $_REQUEST['skipped_record_count'];
+else
+	$_REQUEST['skipped_record_count'] = 0;
+
+if($_REQUEST['noofrows'] != '')
+	$totalnoofrows = $_REQUEST['noofrows'];
+else
+	$totalnoofrows = count($datarows);
+
+$loopcount = ($totalnoofrows/$RECORDCOUNT)+1;
+
+if($_REQUEST['startval'] != '')
+	$START = $_REQUEST['startval'];
+else
+	$START = $_SESSION['startval'];
+if($_REQUEST['recordcount'] != '')
+	$RECORDCOUNT = $_REQUEST['recordcount'];
+else
+	$RECORDCOUNT = $_SESSION['recordcount'];
+
+if(($START+$RECORDCOUNT) > $totalnoofrows)
+{
+	$RECORDCOUNT = $totalnoofrows - $START;
+}
+
+if($totalnoofrows > $RECORDCOUNT && $START < $totalnoofrows)
+{
+	$rows1 = Array();
+	for($j=$START;$j<$START+$RECORDCOUNT;$j++)
+	{
+		$rows1[] = $datarows[$j];
+	}
+
+	$res = InsertImportRecords($datarows,$rows1,$focus,$ret_field_count,$col_pos_to_field,$START,$RECORDCOUNT,$_REQUEST['module'],$totalnoofrows,$skipped_record_count);
+
+	if($START != 0)
+		echo '<b>'.$res.'</b>';
+
+	$count = $_REQUEST['count'];
+}
+else
+{
+	if($START == 0)
+	{
+		$res = InsertImportRecords($datarows,$datarows,$focus,$ret_field_count,$col_pos_to_field,$START,$totalnoofrows,$_REQUEST['module'],$totalnoofrows,$skipped_record_count);
+	}
+//	exit;
+}
+
+
+
+
+
+
+if ($error != "")
+{
+	show_error_import( $mod_strings['LBL_ERROR']." ". $error);
+	exit;
+}
+else 
+{
+	$message= urlencode($mod_strings['LBL_SUCCESS']."<BR>$count ". $mod_strings['LBL_MODULE_NAME']." ".$mod_strings['LBL_SUCCESSFULLY']."<br>".($broken_ids+$id_exists_count) ." ". $mod_strings['LBL_IDS_EXISTED_OR_LONGER']. "<br>$skip_required_count " .  $mod_strings['LBL_RECORDS_SKIPPED'] );
+
+	header("Location: index.php?module={$_REQUEST['module']}&action=Import&step=last&return_module={$_REQUEST['return_module']}&return_action={$_REQUEST['return_action']}&message=$message");
+exit;
+}
+
+
+?>

Modified: vtigercrm/trunk/modules/Import/ImportSteplast.php
==============================================================================
--- vtigercrm/trunk/modules/Import/ImportSteplast.php (original)
+++ vtigercrm/trunk/modules/Import/ImportSteplast.php Fri Jun  9 06:20:06 2006
@@ -57,7 +57,7 @@
 $image_path=$theme_path."images/";
 require_once($theme_path.'layout_utils.php');
 
-$log->info("Upload Step 2");
+$log->info("Import Step last");
 
 if ( isset($_REQUEST['message']))
 {
@@ -83,7 +83,7 @@
 				   <form enctype="multipart/form-data" name="Import" method="POST" action="index.php">
 					<input type="hidden" name="module" value="<?php echo $_REQUEST['modulename']; ?>">
 					<input type="hidden" name="action" value="Import">
-					<input type="hidden" name="step" value="2">
+					<input type="hidden" name="step" value="1">
 					<input type="hidden" name="return_id" value="<?php echo $_REQUEST['return_id']; ?>">
 					<input type="hidden" name="return_module" value="<?php echo $_REQUEST['return_module']; ?>">
 					<input type="hidden" name="return_action" value="<?php echo (($_REQUEST['return_action'] != '')?$_REQUEST['return_action']:'index'); ?>">
@@ -131,10 +131,10 @@
 $implict_account = false;
 
 $import_modules_array = Array(
+				"Leads"=>"Lead",
+				"Accounts"=>"Account",
 				"Contacts"=>"Contact",
 				"Potentials"=>"Potential",
-				"Leads"=>"Lead",
-				"Accounts"=>"Account",
 				"Products"=>"Product" 
 			     );
 
@@ -153,7 +153,7 @@
 	//Retreiving the no of rows
 	$noofrows = $adb->num_rows($list_result);
 
-	if($noofrows>1) 
+	if($noofrows>=1) 
 	{
 		if($module_name != 'Accounts')
 		{




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun  9 08:21:30 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 09 Jun 2006 12:21:30 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6985 -
	/vtigercrm/trunk/modules/Import/ImportStepundo.php
Message-ID: <20060609122130.E6C927E89AB@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun  9 06:21:27 2006
New Revision: 6985

Log:
* Modified the steps where as in previous the php files start with step2 and ends with step4 but now it has been starts with step1 and ends with step3 properly

Modified:
    vtigercrm/trunk/modules/Import/ImportStepundo.php

Modified: vtigercrm/trunk/modules/Import/ImportStepundo.php
==============================================================================
--- vtigercrm/trunk/modules/Import/ImportStepundo.php (original)
+++ vtigercrm/trunk/modules/Import/ImportStepundo.php Fri Jun  9 06:21:27 2006
@@ -102,7 +102,7 @@
 <form name="Import" method="POST" action="index.php">
 <input type="hidden" name="module" value="<?php echo $_REQUEST['module']; ?>">
 <input type="hidden" name="action" value="Import">
-<input type="hidden" name="step" value="2">
+<input type="hidden" name="step" value="1">
 <input type="hidden" name="return_module" value="<?php echo $_REQUEST['RETURN_MODULE'] ?>">
 <input type="hidden" name="return_id" value="<?php echo $_REQUEST['RETURN_ID'] ?>">
 <input type="hidden" name="return_action" value="<?php echo $_REQUEST['RETURN_ACTION'] ?>">




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun  9 08:22:45 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 09 Jun 2006 12:22:45 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6986 -
	/vtigercrm/trunk/modules/Import/ImportStep4.php
Message-ID: <20060609122245.AE5167E89AB@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun  9 06:22:42 2006
New Revision: 6986

Log:
* Removed this file as these code is moved to step3

Removed:
    vtigercrm/trunk/modules/Import/ImportStep4.php




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun  9 08:36:43 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 09 Jun 2006 12:36:43 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6987 - in
 /vtigercrm/trunk/Smarty/templates: Buttons_List.tpl ImportStep1.tpl
 ImportStep2.tpl Importerror.tpl
Message-ID: <20060609123643.02CA664FC48@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun  9 06:36:37 2006
New Revision: 6987

Log:
* Modified the steps where as in previous the php files start with step2 and ends with step4 but now it has been starts with step1 and ends with step3 properly

Modified:
    vtigercrm/trunk/Smarty/templates/Buttons_List.tpl
    vtigercrm/trunk/Smarty/templates/ImportStep1.tpl
    vtigercrm/trunk/Smarty/templates/ImportStep2.tpl
    vtigercrm/trunk/Smarty/templates/Importerror.tpl

Modified: vtigercrm/trunk/Smarty/templates/Buttons_List.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Buttons_List.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Buttons_List.tpl Fri Jun  9 06:36:37 2006
@@ -85,7 +85,7 @@
 			<tr>
 			{if $MODULE eq 'Contacts' || $MODULE eq 'Leads' || $MODULE eq 'Accounts' || $MODULE eq 'Potentials' || $MODULE eq 'Products' }
 		   		{if $CHECK.Import eq 'yes'}	
-					<td style="padding-right:0px;padding-left:10px;"><a href="index.php?module={$MODULE}&action=Import&step=2&return_module={$MODULE}&return_action=index&parenttab={$CATEGORY}"><img src="{$IMAGE_PATH}tbarImport.gif" alt="{$APP.LBL_IMPORT} {$APP.$MODULE}" title="{$APP.LBL_IMPORT} {$APP.$MODULE}" border="0"></a></td>	
+					<td style="padding-right:0px;padding-left:10px;"><a href="index.php?module={$MODULE}&action=Import&step=1&return_module={$MODULE}&return_action=index&parenttab={$CATEGORY}"><img src="{$IMAGE_PATH}tbarImport.gif" alt="{$APP.LBL_IMPORT} {$APP.$MODULE}" title="{$APP.LBL_IMPORT} {$APP.$MODULE}" border="0"></a></td>	
 				{else}	
 					<td style="padding-right:0px;padding-left:10px;"><img src="{$IMAGE_PATH}tbarImport-Faded.gif" alt="{$APP.LBL_IMPORT} {$APP.$MODULE}" title="{$APP.LBL_IMPORT} {$APP.$MODULE}" border="0"></td>	
 				{/if}	

Modified: vtigercrm/trunk/Smarty/templates/ImportStep1.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ImportStep1.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ImportStep1.tpl Fri Jun  9 06:36:37 2006
@@ -37,7 +37,7 @@
 			<td width="75%" valign=top>
 				<form enctype="multipart/form-data" name="Import" method="POST" action="index.php">
 				<input type="hidden" name="module" value="{$MODULE}">
-				<input type="hidden" name="step" value="2">
+				<input type="hidden" name="step" value="1">
 				<input type="hidden" name="source" value="{$SOURCE}">
 				<input type="hidden" name="source_id" value="{$SOURCE_ID}">
 				<input type="hidden" name="action" value="Import">
@@ -100,7 +100,7 @@
 				   <tr bgcolor="#ECECEC"><td colspan="2"><hr /></td></tr>
 				   <tr bgcolor="#ECECEC">
 					<td colspan="2" align="right" style="padding-right:40px;">
-						<input title="{$MOD.LBL_NEXT}" accessKey="" class="classBtn" type="submit" name="button" value="  {$MOD.LBL_NEXT} &rsaquo; "  onclick="this.form.action.value='Import';this.form.step.value='3'; return verify_data(this.form);">
+						<input title="{$MOD.LBL_NEXT}" accessKey="" class="classBtn" type="submit" name="button" value="  {$MOD.LBL_NEXT} &rsaquo; "  onclick="this.form.action.value='Import';this.form.step.value='2'; return verify_data(this.form);">
 					</td>
 				   </tr>
 				   <tr bgcolor="#ECECEC">

Modified: vtigercrm/trunk/Smarty/templates/ImportStep2.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ImportStep2.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ImportStep2.tpl Fri Jun  9 06:36:37 2006
@@ -55,7 +55,7 @@
 				<form enctype="multipart/form-data" name="Import" method="POST" action="index.php">
 				<input type="hidden" name="module" value="{$MODULE}">
 				<input type="hidden" name="action" value="Import">
-				<input type="hidden" name="step" value="4">
+				<input type="hidden" name="step" value="3">
 				<input type="hidden" name="has_header" value="{$HAS_HEADER}">
 				<input type="hidden" name="source" value="{$SOURCE}">
 				<input type="hidden" name="delimiter" value="{$DELIMITER}">
@@ -153,9 +153,9 @@
 				   <tr bgcolor="#ECECEC"><td><hr /></td></tr>
 				   <tr bgcolor="#ECECEC">
 					<td align="right" style="padding-right:40px;" >
-						<input type="submit" name="button"  value=" &nbsp;&lsaquo; {$MOD.LBL_BACK} &nbsp; " class="classBtn" onclick="this.form.action.value='Import';this.form.step.value='2'; return true;" />
+						<input type="submit" name="button"  value=" &nbsp;&lsaquo; {$MOD.LBL_BACK} &nbsp; " class="classBtn" onclick="this.form.action.value='Import';this.form.step.value='1'; return true;" />
 						&nbsp;&nbsp;
-						<input type="submit" name="button"  value=" &nbsp; {$MOD.LBL_IMPORT_NOW} &rsaquo; &nbsp; " class="classBtn" onclick="this.form.action.value='Import';this.form.step.value='4'; return validate_import_map();" />
+						<input type="submit" name="button"  value=" &nbsp; {$MOD.LBL_IMPORT_NOW} &rsaquo; &nbsp; " class="classBtn" onclick="this.form.action.value='Import';this.form.step.value='3'; return validate_import_map();" />
 					</td>
 				   </tr>
 				   <tr bgcolor="#ECECEC"><td align="right" >&nbsp;</td></tr>

Modified: vtigercrm/trunk/Smarty/templates/Importerror.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Importerror.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Importerror.tpl Fri Jun  9 06:36:37 2006
@@ -16,7 +16,7 @@
 		<input type="hidden" name="module" value="{$MODULE}">
  		<input type="hidden" name="return_module" value="{$MODULE}">
 		<input type="hidden" name="return_action" value="index">
-		<input type="hidden" name="step" value="2">
+		<input type="hidden" name="step" value="1">
 		<input type="hidden" name="action" value="Import">
 
 		<!-- IMPORT ERROR STARTS HERE  -->




From vtiger-tickets at vtiger.fosslabs.com  Fri Jun  9 08:57:52 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 09 Jun 2006 12:57:52 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231289=3A?=
 =?utf-8?q?_Edit/Del_links_are_must_in_relatedlists?=
Message-ID: <076.c2484dcccdec49e5b30c79bee458fec5@vtiger.fosslabs.com>

#1289: Edit/Del links are must in relatedlists
-----------------------+----------------------------------------------------
 Reporter:  mickie     |       Owner:  don  
     Type:  task       |      Status:  new  
 Priority:  critical   |   Milestone:       
Component:  vtigercrm  |     Version:  5.0.0
 Keywords:             |  
-----------------------+----------------------------------------------------
 In our previous releases we have edit and del links in the relatedlist.
 These links are must.
 For example, i have added a pricebook in the product related list. now i
 want to change that list price where as i can't.
 Also, i am in account relatedlist, i have contacts for this account.
 previouly by click on del link the account - contact relationship can be
 deleted. but now if i want to delete that account-contact relationship i
 want to go to contact detailview -> edit -> clear that parent account
 value.

 Please provide these links in all relatedlist. Also it will be useful to
 provide these links in listview.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1289>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun  9 09:26:38 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 09 Jun 2006 13:26:38 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6988 -
	/vtigercrm/trunk/include/file.php
Message-ID: <20060609132638.5385A7E89DA@vtiger.fosslabs.com>

Author: richie
Date: Fri Jun  9 07:26:34 2006
New Revision: 6988

Log:
file not needed

Removed:
    vtigercrm/trunk/include/file.php




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun  9 09:59:52 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 09 Jun 2006 13:59:52 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6989 -
	/vtigercrm/trunk/modules/Dashboard/Entity_charts.php
Message-ID: <20060609135952.286F07E89ED@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun  9 07:59:47 2006
New Revision: 6989

Log:
Quotes by Accounts, on clicking dashboard image issue fixedChanged blah and foo to do this or that. Fixes #309

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 Fri Jun  9 07:59:47 2006
@@ -211,7 +211,11 @@
 						$graph_for="ticketpriorities";
 					}
 
+					if($graph_for == "accountid") $graph_for = "account_id";
+					
 					$link_val="index.php?module=".$module."&action=index&search_text=".$name."&search_field=".$graph_for."&searchtype=BasicSearch&query=true";
+
+					if($graph_for == "account_id") $graph_for = "accountid";
 
 					//Adding the links to the graph	
 					if($i==0)




From vtiger-tickets at vtiger.fosslabs.com  Fri Jun  9 09:59:51 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 09 Jun 2006 13:59:51 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23309=3A_?=
 =?utf-8?q?Quotes_by_Accounts_on_drill_down_shows_List_View?=
In-Reply-To: <076.e0e33881a887e78b8da9880872f2699e@vtiger.fosslabs.com>
References: <076.e0e33881a887e78b8da9880872f2699e@vtiger.fosslabs.com>
Message-ID: <085.b5b876e9b02680474d9e247a8d5d549c@vtiger.fosslabs.com>

#309: Quotes by Accounts on drill down shows List View
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  philip   
      Type:  defect     |      Status:  closed   
  Priority:  critical   |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:  fixed      |    Keywords:  Dashboard
------------------------+---------------------------------------------------
Changes (by saraj):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 (In [6989]) Quotes by Accounts, on clicking dashboard image issue
 fixedChanged blah and foo to do this or that. Fixes #309

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/309>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun  9 10:50:16 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 09 Jun 2006 14:50:16 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231290=3A?=
	=?utf-8?q?_Company_Information?=
Message-ID: <076.d72bc388560618f95d42b1de2961a633@vtiger.fosslabs.com>

#1290: Company Information
---------------------------------+------------------------------------------
 Reporter:  daneswood            |       Owner:  developer
     Type:  defect               |      Status:  new      
 Priority:  minor                |   Milestone:           
Component:  vtigercrm            |     Version:  5.0.0    
 Keywords:  company information  |  
---------------------------------+------------------------------------------
 When you set up a logo in the company information configuration, it does
 not appear to be possible to change it once you have uploaded it.
 Attempts to overwrite it just repeats the original image details.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1290>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun  9 16:12:23 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 09 Jun 2006 20:12:23 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6990 -
	/vtigercrm/trunk/themes/blue/style.css
Message-ID: <20060609201224.141067E89FC@vtiger.fosslabs.com>

Author: don
Date: Fri Jun  9 14:12:19 2006
New Revision: 6990

Log:
style.css updated for new settings ui - 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 Fri Jun  9 14:12:19 2006
@@ -1,15 +1,45 @@
 .small {
 	font-family: Arial, Helvetica, sans-serif;
 	font-size: 11px;
+	line-height: 14px;
 	color: #000000;
 }
 .big {
 	font-family: Arial, Helvetica, sans-serif;
 	font-size: 12px;
 	line-height: 18px;
-	color: #aaaaaa;
-	font-weight:bold;
-}
+	color: #000000;
+	font-weight:bold;
+}
+
+.ybToday {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	line-height: 14px;
+	color: #119911;
+}
+.ybUnfinished {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	line-height: 14px;
+	color: #993311;
+}
+.ybTime {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	line-height: 14px;
+	color: #777777;
+	font-weight:bold;
+}
+.yellowBox {
+	background-color:#ffffE1;
+	border:1px solid #999999;
+}
+.ybSeperator{
+	height:0px;
+	border-top:2px dotted #adadad;
+}
+
 .genHeaderBig{
 	font-family: Arial, Helvetica, sans-serif;
 	font-size: 16px;
@@ -90,8 +120,8 @@
     font-size: 11px;
     padding-left:20px;
     padding-right:20px;
-    padding-top:3px;
-    padding-bottom:3px;
+    padding-top:5px;
+    padding-bottom:5px;
     font-weight:bold;
     color:white;
 }
@@ -99,8 +129,6 @@
 .level2text a{
 	text-decoration:none;
 	color:white;
-	padding-left:10px;
-	padding-right:10px;
 }
 
 .level2text a:hover {
@@ -148,21 +176,15 @@
 
 .showPanelBg {
 	background:url(images/showPanelTopBg.gif) repeat-x;
-	background-position:top;
 }
 
 a {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	text-decoration:none;
-	color:#333366;
+	text-decoration:none;
+	color:#003399;
 }
 
 a:hover {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 11px;
 	text-decoration:underline;
-	color:#333333;
 }
 
 .hdrLink {
@@ -272,7 +294,6 @@
 .dvtCellLabel {
 	background-color:#f6f6f6;
 	padding-right:10px;
-	padding-left:10px;
 	border-bottom:1px solid #eaeaea;
 	color:#737373;
 	white-space:nowrap;
@@ -280,7 +301,6 @@
 
 .dvtCellInfo {
 	padding-left:10px;
-	padding-right:10px;
 	border-bottom:1px solid #eaeaea;
 	white-space:nowrap;
 }
@@ -292,8 +312,6 @@
 .rightMailMergeHeader {
 	border-bottom:1px solid #dddddd;
 	padding:5px;
-	font-size: 11px;
-        line-height: 14px;
 	background-color:#eaeaea;
 
 }
@@ -2471,8 +2489,8 @@
 
    
 .tagCloudTopBg {
-    background: url(images/tagCloudBg.gif) repeat-x;
-    background-color:#e5e5e5;
+    background: url(images/tagCloudBg.gif);
+    background-repeat:repeat-x;
    
 }
 
@@ -2483,6 +2501,322 @@
     font-size: 11px;
     line-height: 14px;
     color: #000000;
-    height:100px;
-
-}
+
+}
+.adProgressBar {
+	border-style:solid;
+	border-width:2px;
+	border-color:blue;
+
+}
+
+.h2 {
+
+	font-size:18px;
+	line-height:20px;
+
+}
+
+.gray {
+
+	color:gray;
+}
+
+.hdeskComments {
+
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	line-height: 14px;
+	color: #999999;
+	border:0px;
+	background-color:#ffffef;
+	width:100%;
+
+}
+
+
+
+
+ul {
+	list-style:none;
+	line-height:20px;
+	padding-left:20px;
+	margin-left:0px;
+	font-weight:normal;
+	border-top:1px dotted #dadada;
+
+}
+	
+.branch {
+	list-style-image: url("secAdd.gif");
+}	
+
+
+
+.tagCloudTopBg {
+	background-image:url(images/topCloudBg.gif) repeat-x;
+}
+
+.tagCloudDisplay {
+	background-color:#e5e5e5;
+	padding:5px;
+}
+	
+	
+	
+.heading1 {
+	font-family:  Arial, Helvetica, sans-serif;
+	font-size: 19px;
+	line-height: 14px;
+	color: #000000;
+}
+
+.heading2 {
+	font-family:  Arial, Helvetica, sans-serif;
+	font-size: 16px;
+	line-height: 16px;
+	font-weight:bold;
+	color: #000000;
+}
+
+.heading3 {
+	font-family:  Arial, Helvetica, sans-serif;
+	font-size: 14px;
+	line-height: 14px;
+	color: #999999;
+}
+
+.heading4 {
+	font-family:  Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	line-height: 14px;
+	color: #999999;
+}
+
+.settingsUI {
+
+	background-color:#efefef;
+	border:2px solid #777777;
+
+}
+
+
+.settingsTabHeader {
+	font-family:  Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	line-height:25px;
+	font-weight:bold;
+	color:#ffffff;
+	background-image: url(images/settingsMTBg.gif);
+	background-repeat: repeat-x;
+	padding-left:10px;
+	padding-right:10px;
+	
+
+}
+
+.settingsTabList {
+	font-family:  Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	line-height:20px;
+	font-weight:normal;
+	color:#000000;
+	background-color:#e3e3e3;
+	padding-left:30px;
+	border-top:1px solid #eaeaea;
+	border-bottom:1px solid #d3d3d3;
+}
+.settingsTabSelected {
+	font-family:  Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	line-height:20px;
+	font-weight:bold;
+	color:#000000;
+	background-color:#ffffff;
+	padding-left:30px;
+}
+.settingsSelectedUI {
+	padding:10px;
+	background:url(images/settingsSelUIBg.gif) repeat-x;
+	background-color:#ffffff;
+}
+.settingsIconDisplay {
+	font-family:  Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	line-height:14px;
+	padding:10px;
+
+	color:#000000;
+	background-color:#ffffff;
+	padding-left:10px;
+}
+.settingsSelUITopLine{
+	border-bottom:2px dotted #999999;
+
+}
+
+.tableHeading{
+	background-color:#ffffff;
+	border-bottom:2px solid #aaaaaa;
+}
+.ColHeader{
+	background-color:#dadada;
+	border-left:1px solid #eaeaea;
+	border-top:1px solid #eaeaea;
+	border-right:1px solid #aaaaaa;
+	border-bottom:1px solid #aaaaaa;
+	font-weight:bold;
+
+}
+.cellLabel {
+	background-color:#eaeaea;
+	border-top:1px solid #efefef;
+	border-bottom:1px solid #dadada;
+	color:#555555;
+
+}
+.cellText {
+	color:#333333;
+	border-bottom:1px solid #dadada;
+}
+
+.listTable{
+	border-left:1px solid #cccccc;
+	border-right:1px solid #cccccc;
+	border-bottom:1px solid #cccccc;
+
+}
+
+.listTableRow{
+	border-bottom:1px solid #eaeaea;
+	border-right	:1px solid #eaeaea;
+	border-bottom:1px solid #eaeaea;
+	border-bottom:1px solid #eaeaea;
+}
+
+.listTableTopButtons{
+	background-color:#eeeeee;
+	
+}
+
+.crmButton{
+	
+	border-left:1px solid #ffffff;
+	border-top:1px solid #ffffff;
+	border-right:1px solid #555555;
+	border-bottom:1px solid #555555;
+	padding-left:20px;
+	padding-right:20px;
+}
+
+.create{
+	background-color:#33cc11;
+	color:#333333;
+	font-weight:bold;
+}
+.delete {
+	background-color:#dd9900;
+	color:#ffffff;
+	font-weight:bold;
+}
+.edit {
+	background-color:#a5a5ee;
+	color:#ffffff;
+	font-weight:bold;
+}
+.save{
+	background-color:#33cc11;
+	color:#ffffff;
+	font-weight:bold;
+}
+.cancel {
+	background-color:#dd9900;
+	color:#ffffff;
+	font-weight:bold;
+}
+
+.inactive{
+color:#999999;
+}
+
+.active{
+color:#229922;
+
+}
+textarea {
+	width:95%;
+	height:70px;
+	border:1px solid #dadada;
+}
+.treeTable1{
+	padding:0px;
+}
+
+.prvPrfBigText {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 14px;
+}
+
+.prvPrfTopBg {
+	background-color:#ebebeb;
+}
+
+.prvPrfBottomBg {
+	background-color:#ebebeb;
+}
+
+.prvPrfOutline {
+	border:1px solid #ebebeb;
+}
+
+.prvPrfSelectedTab {
+	background:url(../images/prvPrfSelectedTab.gif) repeat-x;
+
+}
+
+.prvPrfUnSelectedTab {
+	background:url(../images/prvPrfUnSelectedTab.gif) repeat-x;
+
+}
+
+.prvPrfTexture {
+	background:url(../images/prvPrfTexture1.gif);
+
+}
+.prvPrfBgOn{
+	background-color:#33ee33;
+}
+.prvPrfBgOff{
+	background-color:#cccccc;
+}
+
+.prvPrfHoverOn {
+	background-color:#ffffef;
+	
+}
+.prvPrfHoverOut {
+	background-color:#ffffff;
+}
+
+.prvPrfBgImgGlobal {
+	background:url(../images/prvPrfBgImgGlobal.jpg) top right no-repeat;
+}
+.prvPrfBgImgTab {
+	background:url(../images/prvPrfBgImgTab.jpg) top right no-repeat;
+}
+.prvPrfBgImgStandard {
+	background:url(../images/prvPrfBgImgStandard.jpg) top right no-repeat;
+}
+.prvPrfBgImgUtils {
+	background:url(../images/prvPrfBgImgUtils.jpg) top right no-repeat;
+}
+.prvPrfBgImgField {
+	background:url(../images/prvPrfBgImgField.jpg) top right no-repeat;
+}
+
+.prvPrfTabSample {
+	border-top:1px solid #ababab;
+	border-left:1px solid #ababab;
+	border-right:1px solid #a1a1a1;
+}
+




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun  9 16:14:30 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 09 Jun 2006 20:14:30 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6991 -
	/vtigercrm/trunk/Smarty/templates/Settings.tpl
Message-ID: <20060609201431.144367E89FC@vtiger.fosslabs.com>

Author: don
Date: Fri Jun  9 14:14:27 2006
New Revision: 6991

Log:
New Settings tpl for new ui - ahmed

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 Jun  9 14:14:27 2006
@@ -1,175 +1,519 @@
-{*<!--
-/*********************************************************************************
-  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
-   * ("License"); You may not use this file except in compliance with the License
-   * The Original Code is:  vtiger CRM Open Source
-   * The Initial Developer of the Original Code is vtiger.
-   * Portions created by vtiger are Copyright (C) vtiger.
-   * All Rights Reserved.
-  *
- ********************************************************************************/
--->*}
-<style type="text/css">@import url(themes/blue/style.css);</style>
-<table width="100%" border="0" cellpadding="0" cellspacing="0" class="small">
-<tr>
-		{include file='SettingsMenu.tpl'}
-<td width="75%" valign="top">
-<table width="100%"  border="0" cellspacing="0" cellpadding="0" class="small">
-<tr>
-
-<td class="detailedViewHeader" align="left"><b>{$MOD.LBL_USER_MANAGEMENT}</b></td>
-</tr>
-
-<tr>
-<td class="padTab">
-
-<table class="controlTab" cellspacing="0" cellpadding="0">
-<tr>
-
-<td width="25%"><a href="index.php?module=Administration&action=index&parenttab=Settings"><img src="{$IMAGE_PATH}user.gif" border="0" alt="{$MOD.LBL_CREATE_AND_MANAGE_USERS}" title="{$MOD.LBL_CREATE_AND_MANAGE_USERS}"/></a><br>
-<a href="index.php?module=Administration&action=index&parenttab=Settings" alt="{$MOD.LBL_CREATE_AND_MANAGE_USERS}" title="{$MOD.LBL_CREATE_AND_MANAGE_USERS}">{$MOD.LBL_USERS}</a></td>
-
-<td width="25%"><a href="index.php?module=Users&action=listroles&parenttab=Settings"><img src="{$IMAGE_PATH}roles.gif" alt="{$MOD.LBL_CREATE_AND_MANAGE_USER_ROLES}" title="{$MOD.LBL_CREATE_AND_MANAGE_USER_ROLES}" border="0"/></a><br>
-<a href="index.php?module=Users&action=listroles&parenttab=Settings" alt="{$MOD.LBL_CREATE_AND_MANAGE_USER_ROLES}" title="{$MOD.LBL_CREATE_AND_MANAGE_USER_ROLES}">{$MOD.LBL_ROLES}</a>
-</td>
-
-<td width="25%"><a href="index.php?module=Users&action=ListProfiles&parenttab=Settings"><img src="{$IMAGE_PATH}profile.gif" alt="{$MOD.LBL_CREATE_AND_MANAGE_USER_PROFILES}" title="{$MOD.LBL_CREATE_AND_MANAGE_USER_PROFILES}"  border="0" /></a><br>
-<a href="index.php?module=Users&action=ListProfiles&parenttab=Settings" alt="{$MOD.LBL_CREATE_AND_MANAGE_USER_PROFILES}" title="{$MOD.LBL_CREATE_AND_MANAGE_USER_PROFILES}">{$MOD.LBL_PROFILES}</a>
-</td>
-
-<td width="25%"><a href="index.php?module=Users&action=listgroups&parenttab=Settings"><img src="{$IMAGE_PATH}groups.gif" alt="{$MOD.LBL_CREATE_AND_MANAGE_USER_GROUPS}" title="{$MOD.LBL_CREATE_AND_MANAGE_USER_GROUPS}" border="0" /></a><br>
-<a href="index.php?module=Users&action=listgroups&parenttab=Settings" alt="{$MOD.LBL_CREATE_AND_MANAGE_USER_GROUPS}" title="{$MOD.LBL_CREATE_AND_MANAGE_USER_GROUPS}">{$MOD.USERGROUPLIST}</a></td>
-
-</tr>
-
-<tr><td colspan="4" height="30px;">&nbsp;</td></tr>
-
-<tr>
-
-<td><a href="index.php?module=Users&action=OrgSharingDetailView&parenttab=Settings"><img src="{$IMAGE_PATH}shareaccess.gif" alt="{$MOD.LBL_SETTING_DEFAULT_SHARING_ACCESS}" title="{$MOD.LBL_SETTING_DEFAULT_SHARING_ACCESS}" border="0"/></a><br>
-<a href="index.php?module=Users&action=OrgSharingDetailView&parenttab=Settings" alt="{$MOD.LBL_SETTING_DEFAULT_SHARING_ACCESS}" title="{$MOD.LBL_SETTING_DEFAULT_SHARING_ACCESS}">{$MOD.LBL_DEFAULT_ORGANIZATION_SHARING_ACCESS}</a>
-</td>
-
-<td><a href="index.php?module=Users&action=DefaultFieldPermissions&parenttab=Settings"><img src="{$IMAGE_PATH}orgshar.gif" alt="{$MOD.LBL_SETTING_DEFAULT_ORGANIZATION_FIELDS}" title="{$MOD.LBL_SETTING_DEFAULT_ORGANIZATION_FIELDS}" border="0"/></a><br>						
-<a href="index.php?module=Users&action=DefaultFieldPermissions&parenttab=Settings" alt="{$MOD.LBL_SETTING_DEFAULT_ORGANIZATION_FIELDS}" title="{$MOD.LBL_SETTING_DEFAULT_ORGANIZATION_FIELDS}">{$MOD.LBL_DEFAULT_ORGANIZATION_FIELDS}</a></td>
-
-<td><a href="index.php?module=Settings&action=ListModuleOwners&parenttab=Settings"><img src="{$IMAGE_PATH}assign.gif" alt="{$MOD.LBL_ASSIGN_MODULE_OWNERS}" title="{$MOD.LBL_ASSIGN_MODULE_OWNERS}" border="0"/></a><br />
-<a href="index.php?module=Settings&action=ListModuleOwners&parenttab=Settings" alt="{$MOD.LBL_ASSIGN_MODULE_OWNERS}" title="{$MOD.LBL_ASSIGN_MODULE_OWNERS}">{$MOD.LBL_ASSIGN_MODULE_OWNERS}</a>
-
-<td><a href="index.php?module=Users&action=Announcements&parenttab=Settings"><img src="{$IMAGE_PATH}announ.gif" alt="{$MOD.LBL_SETTING_ANNOUNCEMENT}" title="{$MOD.LBL_SETTING_ANNOUNCEMENT}" border="0" /></a><br>
-<a href="index.php?module=Users&action=Announcements&parenttab=Settings" alt="{$MOD.LBL_SETTING_ANNOUNCEMENT}" title="{$MOD.LBL_SETTING_ANNOUNCEMENT}">{$MOD.LBL_ANNOUNCEMENT}</a></td>
-<td>&nbsp;</td>
-
-</tr>
-
-</table>
-</td>
-</tr>
-
-<tr><td>&nbsp;</td></tr>
-
-<tr>
-<td class="detailedViewHeader" align="left" ><b>{$MOD.LBL_STUDIO}</b></td>
-</tr>
-
-<tr>
-<td class="padTab">
-
-<table class="controlTab" cellspacing="0" cellpadding="0">
-
-<tr>
-<td width="25%"><a href="index.php?module=Settings&action=SettingsSubMenu&type=CustomField&parenttab=Settings"><img src="{$IMAGE_PATH}custom.gif" border="0" alt="{$MOD.LBL_CREATE_AND_MANAGE_USER_DEFINED_FIELDS}" title="{$MOD.LBL_CREATE_AND_MANAGE_USER_DEFINED_FIELDS}"/></a><br />
-<a href="index.php?module=Settings&action=SettingsSubMenu&type=CustomField&parenttab=Settings" alt="{$MOD.LBL_CREATE_AND_MANAGE_USER_DEFINED_FIELDS}" title="{$MOD.LBL_CREATE_AND_MANAGE_USER_DEFINED_FIELDS}">{$MOD.LBL_CUSTOM_FIELD_SETTINGS}</a></td>
-
-<td width="25%"><a href="index.php?module=Settings&action=PickList&parenttab=Settings"><img src="{$IMAGE_PATH}picklist.gif" alt="{$MOD.LBL_EDIT_PICKLIST_VALUES}" title="{$MOD.LBL_EDIT_PICKLIST_VALUES}" border="0"/></a><br />
-<a href="index.php?module=Settings&action=PickList&parenttab=Settings" alt="{$MOD.LBL_EDIT_PICKLIST_VALUES}" title="{$MOD.LBL_EDIT_PICKLIST_VALUES}">{$MOD.LBL_PICKLIST_SETTINGS}</a> </td>
-
-<td width="25%"> </td>
-<td width="25%">&nbsp;</td>
-</tr>
-
-<tr>
-<td colspan="4" height="30px;">&nbsp;</td>
-</tr>
-
-</table>
-</td>
-</tr>
-
-<tr><td>&nbsp;</td></tr>
-
-<tr>
-<td class="detailedViewHeader" align="left"><b>{$MOD.LBL_COMMUNICATION_TEMPLATES}</b></td>
-</tr>
-
-<tr><td class="padTab">
-<table class="controlTab" cellspacing="0" cellpadding="0">
-<tr>
-
-<td width="25%"><a href="index.php?module=Users&action=listemailtemplates&parenttab=Settings"><img src="{$IMAGE_PATH}ViewTemplate.gif" border="0" alt="{$MOD.LBL_CREATE_EMAIL_TEMPLATES}" title="{$MOD.LBL_CREATE_EMAIL_TEMPLATES}"/></a><br />
-<a href="index.php?module=Users&action=listemailtemplates&parenttab=Settings" alt="{$MOD.LBL_CREATE_EMAIL_TEMPLATES}" title="{$MOD.LBL_CREATE_EMAIL_TEMPLATES}">{$MOD.EMAILTEMPLATES}</a></td>
-
-<td width="25%"><a href="index.php?module=Users&action=listwordtemplates&parenttab=Settings"><img src="{$IMAGE_PATH}mailmarge.gif" alt="{$MOD.LBL_UPLOAD_MSWORD_TEMPLATES}" title="{$MOD.LBL_UPLOAD_MSWORD_TEMPLATES}" border="0"/></a><br />
-<a href="index.php?module=Users&action=listwordtemplates&parenttab=Settings" alt="{$MOD.LBL_UPLOAD_MSWORD_TEMPLATES}" title="{$MOD.LBL_UPLOAD_MSWORD_TEMPLATES}">{$MOD.WORDINTEGRATION}</a> </td>
-
-<td width="25%"><a href="index.php?module=Users&action=listnotificationschedulers&parenttab=Settings"><img src="{$IMAGE_PATH}notification.gif" alt="{$MOD.LBL_SCHEDULE_EMAIL_NOTIFICATION}" title="{$MOD.LBL_SCHEDULE_EMAIL_NOTIFICATION}"  border="0" /></a><br />
-<a href="index.php?module=Users&action=listnotificationschedulers&parenttab=Settings" alt="{$MOD.LBL_SCHEDULE_EMAIL_NOTIFICATION}" title="{$MOD.LBL_SCHEDULE_EMAIL_NOTIFICATION}">{$MOD.NOTIFICATIONSCHEDULERS}</a> </td>
-<td width="25%"><a href="index.php?module=Users&action=listinventorynotifications&parenttab=Settings"><img src="{$IMAGE_PATH}inventory.gif" alt="{$MOD.LBL_INVENTORY_NOTIFICATIONS}" title="{$MOD.LBL_INVENTORY_NOTIFICATIONS}" border="0" /></a><br />
-<a href="index.php?module=Users&action=listinventorynotifications&parenttab=Settings" alt="{$MOD.LBL_INVENTORY_NOTIFICATIONS}" title="{$MOD.LBL_INVENTORY_NOTIFICATIONS}">{$MOD.INVENTORYNOTIFICATION}</a></td>
-</tr>
-<tr><td colspan="4" height="30px;">&nbsp;</td></tr>
-<tr>
-<td width="25%"><a href="index.php?module=Users&action=OrganizationTermsandConditions&parenttab=Settings"><img src="{$IMAGE_PATH}terms.gif" alt="{$MOD.LBL_INVENTORY_TERMSANDCONDITIONS}" title="{$MOD.LBL_INVENTORY_TERMSANDCONDITIONS}" border="0"/></a><br />
-<a href="index.php?module=Users&action=OrganizationTermsandConditions&parenttab=Settings" alt="{$MOD.LBL_INVENTORY_TERMSANDCONDITIONS}" title="{$MOD.LBL_INVENTORY_TERMSANDCONDITIONS}">{$MOD.INVENTORYTERMSANDCONDITIONS}</a> </td>
-<td width="25%">&nbsp;</td><td width="25%">&nbsp;</td><td width="25%">&nbsp;</td>
-</tr>
-
-<td>&nbsp;</td>
-</tr>
-
-</table>
-</td></tr>
-
-<tr><td>&nbsp;</td></tr>
-<tr>
-<td class="detailedViewHeader" align="left"><b>{$MOD.LBL_CONFIGURATION}</b></td>
-</tr>
-<tr><td class="padTab">
-<table class="controlTab" cellspacing="0" cellpadding="0">
-<tr>
-
-<td width="25%"><a href="index.php?module=Settings&action=OrganizationConfig&parenttab=Settings"><img src="{$IMAGE_PATH}company.gif" border="0" alt="{$MOD.LBL_SPECIFY_COMPANY_DETAILS}" title="{$MOD.LBL_SPECIFY_COMPANY_DETAILS}"/></a><br />
-<a href="index.php?module=Settings&action=OrganizationConfig&parenttab=Settings" alt="{$MOD.LBL_SPECIFY_COMPANY_DETAILS}" title="{$MOD.LBL_SPECIFY_COMPANY_DETAILS}">{$MOD.LBL_ORGANIZATION_DETAILS}</a></td>
-
-<td width="25%"><a href="index.php?module=Settings&action=EmailConfig&parenttab=Settings"><img src="{$IMAGE_PATH}ogmailserver.gif" alt="{$MOD.LBL_CONFIGURE_MAIL_SERVER}" title="{$MOD.LBL_CONFIGURE_MAIL_SERVER}" border="0"/></a><br />
-<a href="index.php?module=Settings&action=EmailConfig&parenttab=Settings" alt="{$MOD.LBL_CONFIGURE_MAIL_SERVER}" title="{$MOD.LBL_CONFIGURE_MAIL_SERVER}">{$MOD.LBL_EMAIL_CONFIG}</a></td>
-
-<td width="25%"><a href="index.php?module=Settings&action=BackupServerConfig&parenttab=Settings"><img src="{$IMAGE_PATH}backupserver.gif" alt="{$MOD.LBL_CONFIGURE_BACKUP_SERVER}" title="{$MOD.LBL_CONFIGURE_BACKUP_SERVER}"  border="0" /></a><br />
-<a href="index.php?module=Settings&action=BackupServerConfig&parenttab=Settings" alt="{$MOD.LBL_CONFIGURE_BACKUP_SERVER}" title="{$MOD.LBL_CONFIGURE_BACKUP_SERVER}">{$MOD.LBL_BACKUP_SERVER_CONFIGURATION}</a> </td>
-
-<td width="25%"><a href="index.php?module=System&action=systemconfig&parenttab=Settings"><img src="{$IMAGE_PATH}system.gif" alt="{$MOD.LBL_SYSTEM_CONFIGURATION}" title="{$MOD.LBL_SYSTEM_CONFIGURATION}" border="0" /></a><br />
-<a href="index.php?module=System&action=systemconfig&parenttab=Settings" alt="{$MOD.LBL_SYSTEM_CONFIGURATION}" title="{$MOD.LBL_SYSTEM_CONFIGURATION}">{$MOD.LBL_SYSTEM_CONFIG}</a></td>
-
-</tr>
-
-<tr><td colspan="4" height="30px;">&nbsp;</td></tr>
-
-<tr>
-
-<td><a href="index.php?module=Settings&action=CurrencyListView&parenttab=Settings"><img src="{$IMAGE_PATH}currency.gif" alt="{$MOD.LBL_CURRENCY_CONFIGURATION}" title="{$MOD.LBL_CURRENCY_CONFIGURATION}" border="0"/></a><br />
-<a href="index.php?module=Settings&action=CurrencyListView&parenttab=Settings" alt="{$MOD.LBL_CURRENCY_CONFIGURATION}" title="{$MOD.LBL_CURRENCY_CONFIGURATION}">{$MOD.LBL_CURRENCY_CONFIG}</a> </td>
-
-<td><a href="index.php?module=Settings&action=TaxConfig&parenttab=Settings"><img src="{$IMAGE_PATH}taxConfiguration.gif" alt="{$MOD.LBL_INVENTORY_TAX_CONFIG}" title="{$MOD.LBL_INVENTORY_TAX_CONFIG}" border="0"/></a><br />
-<a href="index.php?module=Settings&action=TaxConfig&parenttab=Settings" alt="{$MOD.LBL_INVENTORY_TAX_CONFIG}" title="{$MOD.LBL_INVENTORY_TAX_CONFIG}">{$MOD.LBL_INVENTORY_TAX_CONFIG}</a> </td>
-
-<td><a href="index.php?module=Migration&action=MigrationStep1&parenttab=Settings"><img src="{$IMAGE_PATH}migrate.gif" alt="{$MOD.LBL_MIGRATION_INFO}" title="{$MOD.LBL_MIGRATION_INFO}" border="0"/></a><br />
-<a href="index.php?module=Migration&action=MigrationStep1&parenttab=Settings" alt="{$MOD.LBL_MIGRATION_INFO}" title="{$MOD.LBL_MIGRATION_INFO}">{$MOD.LBL_MIGRATION}</a></td>
-
-</tr>
-<tr><td colspan="4" height="30px;">&nbsp;</td></tr>
-</table></td></tr>
-</table>
-</td>
-</tr>
-</table>
-		{include file='SettingsSubMenu.tpl'}
+{*<!--
+/*********************************************************************************
+  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
+   * ("License"); You may not use this file except in compliance with the License
+   * The Original Code is:  vtiger CRM Open Source
+   * The Initial Developer of the Original Code is vtiger.
+   * Portions created by vtiger are Copyright (C) vtiger.
+   * All Rights Reserved.
+  *
+ ********************************************************************************/
+-->*}
+
+<style type="text/css">@import url(themes/blue/style.css);</style>
+<body class=small>
+<br>
+<table align="center" border="0" cellpadding="0" cellspacing="0" width="98%">
+<tbody><tr>
+        <td valign="top"><img src="themes/blue/images/showPanelTopLeft.gif"></td>
+	<td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
+	<br>
+	<div align=center>
+	<table border=0 cellspacing=0 cellpadding=10 width=90% class="settingsUI">
+	<tr>
+		<td>
+		<!-- heading -->
+
+		<span class="heading2">{$MOD.LBL_SETTINGS}</span>
+		</td>
+	</tr>
+	<tr>
+		<td>
+			<!--All Icons table -->
+			<table border=0 cellspacing=0 cellpadding=0 width=100%>
+			<tr>
+
+				<td class="settingsTabHeader">
+				<!-- Users & Access Management -->
+					{$MOD.LBL_USER_MANAGEMENT}	
+				</td>
+			</tr>
+			<tr>
+				<td class="settingsIconDisplay small">
+				<!-- Icons for Users & Access Management -->
+				
+				<table border=0 cellspacing=0 cellpadding=10 width=100%>
+
+				<tr>
+					<td width=25% valign=top>
+					<!-- icon 1-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Administration&action=index&parenttab=Settings"><img src="{$IMAGE_PATH}ico-users.gif" alt="{$MOD.LBL_USERS}" width="48" height="48" border=0 title="{$MOD.LBL_USERS}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Administration&action=index&parenttab=Settings">{$MOD.LBL_USERS}</a></td>
+						</tr>
+
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_USER_DESCRIPTION}</td>
+						</tr>
+						</table>
+					</td>
+					<td width=25% valign=top>
+					<!-- icon 2-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Users&action=listroles&parenttab=Settings"><img src="{$IMAGE_PATH}ico-roles.gif" alt="{$MOD.LBL_ROLES}" width="48" height="48" border=0 title="{$MOD.LBL_ROLES}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Users&action=listroles&parenttab=Settings">{$MOD.LBL_ROLES}</a></td>
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_ROLE_DESCRIPTION}</td>
+						</tr>
+						</table>
+
+					</td>
+					<td width=25% valign=top>
+					<!-- icon 3-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Users&action=ListProfiles&parenttab=Settings"><img src="{$IMAGE_PATH}ico-profile.gif" alt="{$MOD.LBL_PROFILES}" width="48" height="48" border=0 title="{$MOD.LBL_PROFILES}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Users&action=ListProfiles&parenttab=Settings">{$MOD.LBL_PROFILES}</a></td>
+						</tr>
+
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_PROFILE_DESCRIPTION}</td>
+						</tr>
+						</table>
+					</td>
+					<td width=25% valign=top>
+					<!-- icon 4-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Users&action=listgroups&parenttab=Settings"><img src="{$IMAGE_PATH}ico-groups.gif" alt="{$MOD.USERGROUPLIST}" width="48" height="48" border=0 title="{$MOD.USERGROUPLIST}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Users&action=listgroups&parenttab=Settings">{$MOD.USERGROUPLIST}</a></td>
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_GROUP_DESCRIPTION}</td>
+						</tr>
+						</table>
+
+					</td>
+				</tr>
+				<!-- Row 2 -->
+				<tr>
+					<td width=25% valign=top>
+					<!-- icon 5-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Users&action=OrgSharingDetailView&parenttab=Settings"><img src="{$IMAGE_PATH}shareaccess.gif" alt="{$MOD.LBL_SHARING_ACCESS}" width="48" height="48" border=0 title="{$MOD.LBL_SHARING_ACCESS}"></a></td>
+
+							<td class=big valign=top><a href="index.php?module=Users&action=OrgSharingDetailView&parenttab=Settings">{$MOD.LBL_SHARING_ACCESS}</a></td>
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_SHARING_ACCESS_DESCRIPTION}</td>
+						</tr>
+						</table>
+					</td>
+					<td width=25% valign=top>
+
+					<!-- icon 6 -->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Users&action=DefaultFieldPermissions&parenttab=Settings"><img src="{$IMAGE_PATH}orgshar.gif" alt="Fields to be shown" width="48" height="48" border=0 title="Fields to be shown"></a></td>
+							<td class=big valign=top><a href="index.php?module=Users&action=DefaultFieldPermissions&parenttab=Settings">{$MOD.LBL_FIELDS_ACCESS}</a></td>
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_SHARING_FIELDS_DESCRIPTION}</td>
+
+						</tr>
+						</table>
+					</td>
+					<td width=25% valign=top>
+					<!-- icon 7-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=ListModuleOwners&parenttab=Settings"><img src="{$IMAGE_PATH}assign.gif" alt="{$MOD.LBL_ASSIGN_MODULE_OWNERS}" width="48" height="48" border=0 title="{$MOD.LBL_ASSIGN_MODULE_OWNERS}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Settings&action=ListModuleOwners&parenttab=Settings">{$MOD.LBL_MODULE_OWNERS}</a></td>
+
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_MODULE_OWNERS_DESCRIPTION}</td>
+						</tr>
+						</table>
+					</td>
+					<td width=25% valign=top>
+					<!-- icon 8-->
+
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Users&action=Announcements&parenttab=Settings"><img src="{$IMAGE_PATH}announ.gif" alt="{$MOD.LBL_ANNOUNCEMENT}" width="48" height="48" border=0 title="{$MOD.LBL_ANNOUNCEMENT}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Users&action=Announcements&parenttab=Settings">{$MOD.LBL_ANNOUNCEMENT}</a></td>
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_ANNOUNCEMENT_DESCRIPTION}</td>
+						</tr>
+
+						</table>
+					</td>
+				</tr>
+				</table>
+				
+				
+				</td>
+			</tr>
+
+
+			<tr>
+				<td class="settingsTabHeader">
+
+				<!-- Studio  -->
+					{$MOD.LBL_STUDIO}	
+				</td>
+			</tr>
+			<tr>
+				<td class="settingsIconDisplay small">
+				<!-- Icons for Users & Access Management -->
+				
+				<table border=0 cellspacing=0 cellpadding=10 width=100%>
+				<tr>
+
+					<td width=25% valign=top>
+					<!-- icon 9-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=SettingsSubMenu&type=CustomField&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}custom.gif" alt="{$MOD.LBL_CUSTOM_FIELDS}" title="{$MOD.LBL_CUSTOM_FIELDS}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Settings&action=SettingsSubMenu&type=CustomField&parenttab=Settings">{$MOD.LBL_CUSTOM_FIELDS}</a></td>
+						</tr>
+						<tr>
+
+							<td class="small" valign=top>{$MOD.LBL_CUSTOM_FIELDS_DESCRIPTION}</td>
+						</tr>
+						</table>
+					</td>
+					<td width=25% valign=top>
+					<!-- icon 10-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+
+							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=PickList&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}picklist.gif" alt="{$MOD.LBL_PICKLIST_EDITOR}" title="{$MOD.LBL_PICKLIST_EDITOR}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Settings&action=PickList&parenttab=Settings">{$MOD.LBL_PICKLIST_EDITOR}</a></td>
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_PICKLIST_DESCRIPTION}</td>	
+						</tr>
+						</table>
+					</td>
+
+					<td width=25% valign=top>
+					<!-- empty-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top>&nbsp;</td>
+							<td class=big valign=top>&nbsp;</td>
+						</tr>
+						<tr>
+							<td class="small" valign=top>&nbsp;</td>
+
+						</tr>
+						</table>
+					</td>
+					<td width=25% valign=top>
+					<!-- empty-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top>&nbsp;</td>
+							<td class=big valign=top>&nbsp;</td>
+
+						</tr>
+						<tr>
+							<td class="small" valign=top>&nbsp;</td>
+						</tr>
+						</table>
+					</td>
+				</tr>
+				</table>
+				
+				
+				</td>
+
+			</tr>
+			
+			
+			
+			<tr>
+				<td class="settingsTabHeader">
+				<!-- Communication Templates -->
+					{$MOD.LBL_COMMUNICATION_TEMPLATES}
+				</td>
+			</tr>
+			<tr>
+				<td class="settingsIconDisplay small">
+
+				<!-- Icons for Communication Templates -->
+				
+				<table border=0 cellspacing=0 cellpadding=10 width=100%>
+				<tr>
+					<td width=25% valign=top>
+					<!-- icon 11-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Users&action=listemailtemplates&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}ViewTemplate.gif" alt="{$MOD.EMAILTEMPLATES}" title="{$MOD.EMAILTEMPLATES}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Users&action=listemailtemplates&parenttab=Settings">{$MOD.EMAILTEMPLATES}</a></td>
+
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_EMAIL_TEMPLATE_DESCRIPTION}</td>
+						</tr>
+						</table>
+					</td>
+					<td width=25% valign=top>
+					<!-- icon 12-->
+
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Users&action=listwordtemplates&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}mailmarge.gif" alt="{$MOD.LBL_MAIL_MERGE}" title="{$MOD.LBL_MAIL_MERGE}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Users&action=listwordtemplates&parenttab=Settings">{$MOD.WORDINTEGRATION}</a></td>
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_MAIL_MERGE_DESCRIPTION}</td>
+						</tr>
+
+						</table>
+					</td>
+					<td width=25% valign=top>
+					<!-- icon 13-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Users&action=listnotificationschedulers&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}notification.gif" alt="{$MOD.NOTIFICATIONSCHEDULERS}" title="{$MOD.NOTIFICATIONSCHEDULERS}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Users&action=listnotificationschedulers&parenttab=Settings">{$MOD.NOTIFICATIONSCHEDULERS}</a></td>
+
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_NOTIF_SCHED_DESCRIPTION}</td>
+						</tr>
+						</table>
+					</td>
+					<td width=25% valign=top>
+					<!-- icon 14-->
+
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Users&action=listinventorynotifications&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}/inventory.gif" alt="{$MOD.INVENTORYNOTIFICATION}" title="{$MOD.INVENTORYNOTIFICATION}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Users&action=listinventorynotifications&parenttab=Settings">{$MOD.INVENTORYNOTIFICATION}</a></td>
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_INV_NOTIF_DESCRIPTION}</td>
+						</tr>
+
+						</table>
+					</td>
+				</tr>
+				<!-- Row 2 -->
+				<tr>
+					<td width=25% valign=top>
+					<!-- icon 15-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+
+							<td rowspan=2 valign=top><a href="index.php?module=Users&action=OrganizationTermsandConditions&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}terms.gif" alt="{$MOD.INVENTORYTERMSANDCONDITIONS}" title="{$MOD.INVENTORYTERMSANDCONDITIONS}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Users&action=OrganizationTermsandConditions&parenttab=Settings">{$MOD.INVENTORYTERMSANDCONDITIONS}</a></td>
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_INV_TANDC_DESCRIPTION}</td>
+						</tr>
+						</table>
+
+					</td>
+					<td width=25% valign=top>
+					<!-- empty -->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top>&nbsp;</td>
+							<td class=big valign=top>&nbsp;</td>
+						</tr>
+						<tr>
+
+							<td class="small" valign=top>&nbsp;</td>
+						</tr>
+						</table>
+					</td>
+					<td width=25% valign=top>
+					<!-- empty-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top>&nbsp;</td>
+
+							<td class=big valign=top>&nbsp;</td>
+						</tr>
+						<tr>
+							<td class="small" valign=top>&nbsp;</td>
+						</tr>
+						</table>
+					</td>
+					<td width=25% valign=top>
+					<!-- empty-->
+
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top>&nbsp;</td>
+							<td class=big valign=top>&nbsp;</td>
+						</tr>
+						<tr>
+							<td class="small" valign=top>&nbsp;</td>
+						</tr>
+						</table>
+
+					</td>
+				</tr>
+				</table>
+				
+				
+				</td>
+			</tr>
+			<tr>
+				<td class="settingsTabHeader">
+				<!-- Other settings -->
+					{$MOD.LBL_OTHER_SETTINGS}
+				</td>
+
+			</tr>
+			<tr>
+				<td class="settingsIconDisplay small">
+				<!-- Icons for Other Settings-->
+				
+				<table border=0 cellspacing=0 cellpadding=10 width=100%>
+				<tr>
+					<td width=25% valign=top>
+					<!-- icon 16-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=OrganizationConfig&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}company.gif" alt="{$MOD.LBL_COMPANY_DETAILS}" title="{$MOD.LBL_COMPANY_DETAILS}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Settings&action=OrganizationConfig&parenttab=Settings">{$MOD.LBL_COMPANY_DETAILS}</a></td>
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_COMPANY_DESCRIPTION}</td>
+						</tr>
+						</table>
+
+					</td>
+					<td width=25% valign=top>
+					<!-- icon 17-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=EmailConfig&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}ogmailserver.gif" alt="{$MOD.LBL_MAIL_SERVER_SETTINGS}" title="{$MOD.LBL_MAIL_SERVER_SETTINGS}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Settings&action=EmailConfig&parenttab=Settings">{$MOD.LBL_MAIL_SERVER_SETTINGS}</a></td>
+						</tr>
+
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_MAIL_SERVER_DESCRIPTION}</td>
+						</tr>
+						</table>
+					</td>
+					<td width=25% valign=top>
+					<!-- icon 18-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=BackupServerConfig&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}backupserver.gif" alt="{$MOD.LBL_BACKUP_SERVER_SETTINGS}" title="{$MOD.LBL_BACKUP_SERVER_SETTINGS}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Settings&action=BackupServerConfig&parenttab=Settings">{$MOD.LBL_BACKUP_SERVER_SETTINGS}</a></td>
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_BACKUP_SERVER_DESCRIPTION}</td>
+						</tr>
+						</table>
+
+					</td>
+					<td width=25% valign=top>
+					<!-- icon 19-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=CurrencyListView&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}currency.gif" alt="{$MOD.LBL_CURRENCY_SETTINGS}" title="{$MOD.LBL_CURRENCY_SETTINGS}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Settings&action=CurrencyListView&parenttab=Settings">{$MOD.LBL_CURRENCY_SETTINGS}</a></td>
+						</tr>
+
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_CURRENCY_DESCRIPTION}</td>
+						</tr>
+						</table>
+					</td>
+				</tr>
+				<!-- Row 2 -->
+				<tr>
+
+					<td width=25% valign=top>
+					<!-- icon 20-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=TaxConfig&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}taxConfiguration.gif" alt="{$MOD.LBL_TAX_SETTINGS}" title="{$MOD.LBL_TAX_SETTINGS}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Settings&action=TaxConfig&parenttab=Settings">{$MOD.LBL_TAX_SETTINGS}</a></td>
+						</tr>
+						<tr>
+
+							<td class="small" valign=top>{$MOD.LBL_TAX_DESCRIPTION}</td>
+						</tr>
+						</table>
+					</td>
+					<td width=25% valign=top>
+					<!-- empty -->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+
+							<td rowspan=2 valign=top>&nbsp;</td>
+							<td class=big valign=top>&nbsp;</td>
+						</tr>
+						<tr>
+							<td class="small" valign=top>&nbsp;</td>
+						</tr>
+						</table>
+					</td>
+					<td width=25% valign=top>
+
+					<!-- empty-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top>&nbsp;</td>
+							<td class=big valign=top>&nbsp;</td>
+						</tr>
+						<tr>
+							<td class="small" valign=top>&nbsp;</td>
+						</tr>
+
+						</table>
+					</td>
+					<td width=25% valign=top>
+					<!-- empty-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top>&nbsp;</td>
+							<td class=big valign=top>&nbsp;</td>
+						</tr>
+
+						<tr>
+							<td class="small" valign=top>&nbsp;</td>
+						</tr>
+						</table>
+					</td>
+				</tr>
+				</table>
+				
+				
+				</td>
+			</tr>
+
+			</table>
+		
+		</td>
+	</tr>
+	</table>
+		
+	</div>
+
+	</td>
+        <td valign="top"><img src="themes/blue/images/showPanelTopRight.gif"></td>
+   </tr>
+</tbody></table>
+
+
+</body>




From vtiger-tickets at vtiger.fosslabs.com  Fri Jun  9 16:15:38 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 09 Jun 2006 20:15:38 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231291=3A?=
 =?utf-8?q?_http=3A//1stbest=2Ebitacoras=2Ecom/buy-valium=2Ehtml?=
Message-ID: <076.89213295f44514ae39999ba043b64bf0@vtiger.fosslabs.com>

#1291: http://1stbest.bitacoras.com/buy-valium.html
----------------------------------------------------------+-----------------
 Reporter:  buy valium Online                             |       Owner:  developer
     Type:                                                |      Status:  new      
 Priority:                                                |   Milestone:           
Component:                                                |     Version:           
 Keywords:  http://1stbest.bitacoras.com/buy-valium.html  |  
----------------------------------------------------------+-----------------
 very good site!
  [URL= http://1stbest.bitacoras.com/buy-valium.html ]buy valium
 Online[/URL] [URL= http://1stbest.bitacoras.com/buy-tramadol.html ]buy
 tramadol Online[/URL] [URL= http://1stbest.bitacoras.com/buy-vicodin.html
 ]buy vicodin Online[/URL] [URL= http://1stbest.bitacoras.com/buy-
 cialis.html ]buy cialis Online[/URL] [URL= http://1stbest.bitacoras.com
 /buy-xanax.html ]buy xanax Online[/URL] [URL= http://1stbest.bitacoras.com
 /buy-didrex.html ]buy didrex Online[/URL] [URL=
 http://1stbest.bitacoras.com/buy-diazepam.html ]buy diazepam Online[/URL]
 [URL= http://1stbest.bitacoras.com/buy-ultram.html ]buy ultram
 Online[/URL] [URL= http://1stbest.bitacoras.com/buy-adipex.html ]buy
 adipex Online[/URL] [URL= http://1stbest.bitacoras.com/buy-lortab.html
 ]buy lortab Online[/URL]
  <a href="http://1stbest.bitacoras.com/buy-valium.html ">buy valium
 Online</a> <a href="http://1stbest.bitacoras.com/buy-tramadol.html ">buy
 tramadol Online</a> <a href="http://1stbest.bitacoras.com/buy-vicodin.html
 ">buy vicodin Online</a> <a href="http://1stbest.bitacoras.com/buy-
 cialis.html ">buy cialis Online</a> <a href="http://1stbest.bitacoras.com
 /buy-xanax.html ">buy xanax Online</a> <a
 href="http://1stbest.bitacoras.com/buy-didrex.html ">buy didrex Online</a>
 <a href="http://1stbest.bitacoras.com/buy-diazepam.html ">buy diazepam
 Online</a> <a href="http://1stbest.bitacoras.com/buy-ultram.html ">buy
 ultram Online</a> <a href="http://1stbest.bitacoras.com/buy-adipex.html
 ">buy adipex Online</a> <a href="http://1stbest.bitacoras.com/buy-
 lortab.html ">buy lortab Online</a>

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1291>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun  9 16:17:10 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 09 Jun 2006 20:17:10 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6992 -
 /vtigercrm/trunk/modules/Settings/language/en_us.lang.php
Message-ID: <20060609201710.B59197E89FC@vtiger.fosslabs.com>

Author: don
Date: Fri Jun  9 14:17:07 2006
New Revision: 6992

Log:
lang file updated

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 Fri Jun  9 14:17:07 2006
@@ -182,12 +182,16 @@
 
 'CUSTOMFIELD'=>'Custom Field',
 
+'LBL_CUSTOM_FIELDS'=>'Custom Fields',
+
 'LBL_ADD_FIELD'=>'Add Field',
 
 'LBL_CUSTM_MSG'=>'allows you to ....',
 
 'PicklistFields'=>' Picklist Fields',
 
+'LBL_PICKLIST_EDITOR'=>'Picklist Editor',
+
 'Edit'=>'Edit',
 
 
@@ -252,9 +256,11 @@
 
 'USERGROUPLIST'=>'Groups',
 
-'EMAILTEMPLATES'=>'Email Templates',
+'EMAILTEMPLATES'=>'E-Mail Templates',
 
 'WORDINTEGRATION'=>'Mail Merge Templates',
+
+'LBL_MAIL_MERGE'=>'Mail Merge',
 
 'NOTIFICATIONSCHEDULERS'=>'Notification Schedulers',
 //currency status
@@ -315,6 +321,8 @@
 
 'LBL_CURRENCY_TITLE'=>'Currency',
 
+'LBL_CURRENCY_SETTINGS'=>'Currency Settings',
+
 'LBL_YES'=>'yes',
 'LBL_NO'=>'no',
 
@@ -337,7 +345,9 @@
 
 'LBL_CREATE_AND_MANAGE_USER_GROUPS'=>'- Create and Manage user groups',
 
-'LBL_DEFAULT_ORGANIZATION_SHARING_ACCESS'=>'Default Organization Sharing Access',
+'LBL_SHARING_ACCESS'=>'Sharing Access',
+
+'LBL_FIELDS_ACCESS'=>'Fields',
 
 'LBL_DEFAULT_ORGANIZATION_FIELDS'=>'Default Organization Fields Access',
 
@@ -414,6 +424,8 @@
 'LBL_BACKUP_SERVER_CONFIGURATION'=>'Backup Server Configuration',
 
 'LBL_BACKUP_SERVER_INFO'=>'Backup Server Information',
+
+'LBL_BACKUP_SERVER_SETTINGS'=>'Backup Server Settings',
 
 'LBL_CONFIGURE_BACKUP_SERVER'=>' - Configure Backup Server',
 
@@ -531,7 +543,7 @@
 'LBL_UPLOAD'=>'Upload',
 'LBL_FILENAME'=>'File Name',
 'LBL_SETTINGS'=>'Settings',
-'LBL_COMPANY_INFO'=>'Company Information',
+'LBL_COMPANY_DETAILS'=>'Company Details',
 
 'LBL_SEVERITY'=>'Severity',
 'LBL_FAQ_CATEGORY'=>'FAQ Category',
@@ -545,6 +557,8 @@
 'LBL_INVENTORY_NOTIFICATIONS'=>' - Edit Inventory Email Notifications',
 'INVENTORYTERMSANDCONDITIONS'=>'Inventory Terms & Conditions',//newly added for Inventory terms and conditions
 'LBL_INVENTORY_TERMSANDCONDITIONS'=>' - Edit Inventory Terms & Conditions',//newly added
+
+'LBL_OTHER_SETTINGS'=>'Other Settings',
 
 'LBL_INV_NOT_DESC'=>'The following is the list of notifications that are sent to the product handler regarding the demand and the current quantity in hand during the creation of a Quote, SalesOrder and Invoice.',
 
@@ -575,11 +589,37 @@
 
 //Added fields after 4.2 ptach 2
 'LBL_ASSIGN_MODULE_OWNERS'=>'Assign Module Owners',
+'LBL_MODULE_OWNERS'=>'Module Owners',
 'LBL_ASSIGN_MODULE_OWNERS_INFO'=>' - Assign Owners for each modules',
 'LBL_MODULE'=>'Module',
 'LBL_OWNER'=>'Owner',
 'LBL_MIGRATION'=>'Migrate from Previous Version',
 'LBL_MIGRATION_INFO'=>' - Migration from previous Version of vTiger',
+
+//Added for 5 GA - Description of Settings UI
+
+'LBL_USER_DESCRIPTION'=>'Manage Users list who access CRM',
+'LBL_ROLE_DESCRIPTION'=>'Define hierarchy of Roles and assign to Users',
+'LBL_PROFILE_DESCRIPTION'=>'Define Profiles to provide access rights to each Role',
+'LBL_GROUP_DESCRIPTION'=>'Define Groups based on roles, users, profiles etc',
+'LBL_SHARING_ACCESS_DESCRIPTION'=>'Define privileges for each Role to access CRM modules',
+'LBL_SHARING_FIELDS_DESCRIPTION'=>'Show or hide fields in each CRM Module',
+'LBL_MODULE_OWNERS_DESCRIPTION'=>'Assign Owners for each CRM module',
+'LBL_ANNOUNCEMENT_DESCRIPTION'=>'Edit the contents of Announcements display',
+'LBL_CUSTOM_FIELDS_DESCRIPTION'=>'Create and Manage user-defined fields',
+'LBL_PICKLIST_DESCRIPTION'=>'Manage contents of Picklists in all CRM Modules',
+'LBL_EMAIL_TEMPLATE_DESCRIPTION'=>'Manage templates for E-Mail module',
+'LBL_MAIL_MERGE_DESCRIPTION'=>'Manage templates for Mail Merging',
+'LBL_NOTIF_SCHED_DESCRIPTION'=>'Manage Notifications that will alert in case of important actions',
+'LBL_INV_NOTIF_DESCRIPTION'=>'Change Settings of Inventory related Notifications',
+'LBL_INV_TANDC_DESCRIPTION'=>'Manage the text contents of Terms and Conditions',
+'LBL_COMPANY_DESCRIPTION'=>'Manage details about your company',
+'LBL_MAIL_SERVER_DESCRIPTION'=>'Edit settings for Outgoing E-Mail Server',
+'LBL_BACKUP_SERVER_DESCRIPTION'=>'Edit settings of Backup Server',
+'LBL_CURRENCY_DESCRIPTION'=>'Manage Currencies and Exchange Rates',
+'LBL_TAX_DESCRIPTION'=>'Manage values for Sales tax, VAT etc',
+
+
 
 //Added fields after 5.0 Alpha
 'LBL_REQUIRE_SMTP_AUTHENTICATION'=>'Require SMTP Authentication?',
@@ -596,6 +636,7 @@
 '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.',
 'LBL_SELECT_CRM_MODULE'=>'Select crm module',
+'LBL_TAX_SETTINGS'=>'Tax Settings',
 'LBL_INVENTORY_TAX_CONFIG'=>'Inventory Tax Configuration',
 );
 




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun  9 16:42:21 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 09 Jun 2006 20:42:21 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6993 - in
 /vtigercrm/trunk/themes/blue/images: settingsMTBg.gif settingsSelUIBg.gif
Message-ID: <20060609204222.2A25A7E89FC@vtiger.fosslabs.com>

Author: richie
Date: Fri Jun  9 14:42:16 2006
New Revision: 6993

Log:
Added images for settings ui - ahmed

Added:
    vtigercrm/trunk/themes/blue/images/settingsMTBg.gif   (with props)
    vtigercrm/trunk/themes/blue/images/settingsSelUIBg.gif   (with props)




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun  9 16:43:06 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 09 Jun 2006 20:43:06 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6994 - in
 /vtigercrm/trunk/themes/blue/images: ico-groups.gif ico-profile.gif
 ico-roles.gif ico-users.gif
Message-ID: <20060609204306.5EB227E89FC@vtiger.fosslabs.com>

Author: richie
Date: Fri Jun  9 14:42:59 2006
New Revision: 6994

Log:
added images for setting ui

Added:
    vtigercrm/trunk/themes/blue/images/ico-groups.gif   (with props)
    vtigercrm/trunk/themes/blue/images/ico-profile.gif   (with props)
    vtigercrm/trunk/themes/blue/images/ico-roles.gif   (with props)
    vtigercrm/trunk/themes/blue/images/ico-users.gif   (with props)




From vtiger-tickets at vtiger.fosslabs.com  Sat Jun 10 14:41:08 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sat, 10 Jun 2006 18:41:08 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231292=3A?=
	=?utf-8?q?_Buy_Viagra?=
Message-ID: <076.3be71aaa1fa450bc94bdfa03d862bd31@vtiger.fosslabs.com>

#1292: Buy Viagra
-------------------------------------------------+--------------------------
 Reporter:  anonymous                            |       Owner:  developer
     Type:  defect                               |      Status:  new      
 Priority:  major                                |   Milestone:           
Component:  vtigercrm                            |     Version:  5.0.0    
 Keywords:  Viagra,Ambien,Diazepam,Levitra,Soma  |  
-------------------------------------------------+--------------------------
 <a href="http://1viagra.harisen.jp/Buy-Viagra.html ">Buy Viagra</a>
 <a href="http://1viagra.harisen.jp/Buy-Ambien.html ">Buy Ambien</a>
 <a href="http://1viagra.harisen.jp/Buy-Diazepam.html ">Buy Diazepam</a>
 <a href="http://1viagra.harisen.jp/Buy-Levitra.html ">Buy Levitra</a>
 <a href="http://1viagra.harisen.jp/Buy-Soma.html ">Buy Soma</a>
 <a href="http://file.viagra7.blog.shinobi.jp/viagra.html ">Buy Viagra</a>
 [URL= http://1viagra.harisen.jp/Buy-Viagra.html ]Buy Viagra[/URL]
 [URL= http://1viagra.harisen.jp/Buy-Ambien.html ]Buy Ambien[/URL]
 [URL= http://1viagra.harisen.jp/Buy-Diazepam.html ]Buy Diazepam[/URL]
 [URL= http://1viagra.harisen.jp/Buy-Levitra.html ]Buy Levitra[/URL]
 [URL= http://1viagra.harisen.jp/Buy-Soma.html ]Buy Soma[/URL]
 [URL= http://file.viagra7.blog.shinobi.jp/viagra.html ]Buy Viagra[/URL]

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1292>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Sat Jun 10 20:31:32 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sun, 11 Jun 2006 00:31:32 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231199=3A?=
 =?utf-8?q?_DashBoard_-_Leads_by_Industry_Issue?=
In-Reply-To: <076.3535dcc3d95c5df1eb70a7d4b867c8f6@vtiger.fosslabs.com>
References: <076.3535dcc3d95c5df1eb70a7d4b867c8f6@vtiger.fosslabs.com>
Message-ID: <085.24c151a640307dc1eb5bde5574b96429@vtiger.fosslabs.com>

#1199: DashBoard - Leads by Industry Issue
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  philip
      Type:  defect     |      Status:  new   
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1199>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Sun Jun 11 06:59:38 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sun, 11 Jun 2006 10:59:38 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231293=3A?=
 =?utf-8?q?_Select_Products_missing_from_Activities_in_5=2E0?=
Message-ID: <076.0fa458c2ddcf4a4ee4262524258defbd@vtiger.fosslabs.com>

#1293: Select Products missing from Activities in 5.0
-----------------------+----------------------------------------------------
 Reporter:  anonymous  |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  major      |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 There use to be the ability to relate products to Activities that appears
 to be missing in 5.0.  Please add this back in as this is a major feature
 for us to track which products a sales rep has talked with during a sales
 activity.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1293>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Sun Jun 11 13:06:15 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sun, 11 Jun 2006 17:06:15 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231294=3A?=
 =?utf-8?q?_Picklist_/_Custom_Fields_Error?=
Message-ID: <076.0f035f4d3e1919336e3dcf1142be6790@vtiger.fosslabs.com>

#1294: Picklist / Custom Fields Error
-----------------------+----------------------------------------------------
 Reporter:  JHoevel    |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  major      |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 I figured out that there could be an error regarding new custom picklists
 and the picklist editor.

 I created a new picklist in leads at custom filed settings. Secondly I've
 used the picklist settings and choose leads. Result was an error:

 Fatal error: Call to a member function FetchRow() on a non-object in
 C:\vtiger\vtigercrm-5.0.0-beta\apache\htdocs\vtigerCRM\include\database\PearDatabase.php
 on line 431

 Sorry
 Joerg

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1294>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 12 02:31:51 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 12 Jun 2006 06:31:51 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231278=3A?=
 =?utf-8?q?_Translations_for_module_name_in_related_list=2E?=
In-Reply-To: <076.8117b3de443679e88c0c49ef370ecdbe@vtiger.fosslabs.com>
References: <076.8117b3de443679e88c0c49ef370ecdbe@vtiger.fosslabs.com>
Message-ID: <085.d813a7e5b436e6eaa31e927fa4e76562@vtiger.fosslabs.com>

#1278: Translations for module name in related list.
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  developer
      Type:  defect     |      Status:  closed   
  Priority:  major      |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:  fixed      |    Keywords:           
------------------------+---------------------------------------------------
Changes (by ahmed):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 Changes Done

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1278>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 12 02:35:50 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 12 Jun 2006 06:35:50 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231280=3A?=
 =?utf-8?q?_Translation_issue_for_detailviews?=
In-Reply-To: <076.9b3cc9b6c6bc8054331835baebdc32df@vtiger.fosslabs.com>
References: <076.9b3cc9b6c6bc8054331835baebdc32df@vtiger.fosslabs.com>
Message-ID: <085.ca555b53453fdc036fbb51e9e306fbf1@vtiger.fosslabs.com>

#1280: Translation issue for detailviews
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  developer
      Type:  defect     |      Status:  closed   
  Priority:  major      |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:  fixed      |    Keywords:           
------------------------+---------------------------------------------------
Changes (by ahmed):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 Changes Done

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1280>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 12 07:59:04 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 12 Jun 2006 11:59:04 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6995 -
	/tags/vtigercrm-5.0.0-beta/
Message-ID: <20060612115904.46A2A7E8A6A@vtiger.fosslabs.com>

Author: richie
Date: Mon Jun 12 05:58:58 2006
New Revision: 6995

Log:
made a copy

Added:
    tags/vtigercrm-5.0.0-beta/
      - copied from r6881, vtigercrm/trunk/




From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 12 08:59:07 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 12 Jun 2006 12:59:07 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231295=3A?=
 =?utf-8?q?_Color_code_items_in_the_shared_calendar_view?=
Message-ID: <076.b4a0b4e8d19ce6073a31a3ecfcb23759@vtiger.fosslabs.com>

#1295: Color code items in the shared calendar view
-------------------------+--------------------------------------------------
 Reporter:  anonymous    |       Owner:  developer
     Type:  enhancement  |      Status:  new      
 Priority:  minor        |   Milestone:  5.0.0    
Component:  vtigercrm    |     Version:  5.0.0    
 Keywords:  calendar     |  
-------------------------+--------------------------------------------------
 When you are in the calendar view, it would be helpful if your calendar
 items were a different color from those of other users.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1295>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 12 10:42:26 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 12 Jun 2006 14:42:26 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231296=3A?=
 =?utf-8?q?_Sort_order_hide_the_related_datas?=
Message-ID: <076.89346f6520426628c32e65be31646f8e@vtiger.fosslabs.com>

#1296: Sort order hide the related datas
------------------------------------------+---------------------------------
 Reporter:  abos                          |       Owner:  developer
     Type:  defect                        |      Status:  new      
 Priority:  critical                      |   Milestone:           
Component:  vtigercrm                     |     Version:  5.0.0    
 Keywords:  related, data, sorder, order  |  
------------------------------------------+---------------------------------
 When i click arrow to change the sort order for the related datas, all
 related data are hiden. I need to disconnect and reconnect to see the
 related datas.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1296>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 12 11:00:28 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 12 Jun 2006 15:00:28 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6996 -
	/vtigercrm/trunk/database/DatabaseConnection.php
Message-ID: <20060612150028.EBE3C7E8A87@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 12 09:00:24 2006
New Revision: 6996

Log:
log level has been changed

Modified:
    vtigercrm/trunk/database/DatabaseConnection.php

Modified: vtigercrm/trunk/database/DatabaseConnection.php
==============================================================================
--- vtigercrm/trunk/database/DatabaseConnection.php (original)
+++ vtigercrm/trunk/database/DatabaseConnection.php Mon Jun 12 09:00:24 2006
@@ -63,7 +63,7 @@
 	$log1 =& LoggerManager::getLogger('GS');
 	if(is_array($msg))
 	{
-		$log1->fatal("PearDatabse ->".print_r($msg,true));
+		$log1->info("PearDatabse ->".print_r($msg,true));
 /*		$log1->fatal("PearDatabse ->".$this->getString($msg));
 		foreach ($msg as $str)
 		{
@@ -75,7 +75,7 @@
 	}
 	else
 	{
-		$log1->fatal("PearDatabase ->".$msg);
+		$log1->info("PearDatabase ->".$msg);
 	}
 	return $msg;
 	}




From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 12 11:01:40 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 12 Jun 2006 15:01:40 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6997 -
	/vtigercrm/trunk/include/database/PearDatabase.php
Message-ID: <20060612150141.0BB7B7E8A8D@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 12 09:01:37 2006
New Revision: 6997

Log:
log level has been changed

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

Modified: vtigercrm/trunk/include/database/PearDatabase.php
==============================================================================
--- vtigercrm/trunk/include/database/PearDatabase.php (original)
+++ vtigercrm/trunk/include/database/PearDatabase.php Mon Jun 12 09:01:37 2006
@@ -42,11 +42,11 @@
 		$log1 =& LoggerManager::getLogger('VT');
 		if(is_array($msg))
 		{
-			$log1->fatal("PearDatabse ->".print_r($msg,true));
+			$log1->info("PearDatabse ->".print_r($msg,true));
 		}
 		else
 		{
-			$log1->fatal("PearDatabase ->".$msg);
+			$log1->info("PearDatabase ->".$msg);
 		}
 		return $msg;
 	}




From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 12 11:02:48 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 12 Jun 2006 15:02:48 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231188=3A?=
 =?utf-8?q?_default_email_population_not_proper?=
In-Reply-To: <076.c8af4af2b612afa73930163d3526615a@vtiger.fosslabs.com>
References: <076.c8af4af2b612afa73930163d3526615a@vtiger.fosslabs.com>
Message-ID: <085.425bac09deddcb5ebdc46f37dca9e9c6@vtiger.fosslabs.com>

#1188: default email population not proper
------------------------+---------------------------------------------------
  Reporter:  richie     |       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: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1188>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 12 11:05:03 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 12 Jun 2006 15:05:03 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231285=3A?=
 =?utf-8?q?_picklist_-_custom_field?=
In-Reply-To: <076.d54873cd2f44419ccf2fc08db8faed61@vtiger.fosslabs.com>
References: <076.d54873cd2f44419ccf2fc08db8faed61@vtiger.fosslabs.com>
Message-ID: <085.47baf7e94f0efcf6cf7fec296c713e01@vtiger.fosslabs.com>

#1285: picklist - custom field
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  minnie
      Type:  defect     |      Status:  new   
  Priority:  blocker    |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * owner:  developer => minnie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1285>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 12 11:07:30 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 12 Jun 2006 15:07:30 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231268=3A?=
 =?utf-8?q?_Error_in_Email_language_file?=
In-Reply-To: <076.e552d828a7b238f9e865edf84f9ad995@vtiger.fosslabs.com>
References: <076.e552d828a7b238f9e865edf84f9ad995@vtiger.fosslabs.com>
Message-ID: <085.63462dab6ad6ab968b052d43e5174993@vtiger.fosslabs.com>

#1268: Error in Email language file
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       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: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1268>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 12 11:07:47 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 12 Jun 2006 15:07:47 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231276=3A?=
 =?utf-8?q?_Language_file_issue_/include/language?=
In-Reply-To: <076.705db0ccf0fb3c7495be9bad38dc724d@vtiger.fosslabs.com>
References: <076.705db0ccf0fb3c7495be9bad38dc724d@vtiger.fosslabs.com>
Message-ID: <085.4a46d49ce8466bae74d36dd1e481e7bc@vtiger.fosslabs.com>

#1276: Language file issue /include/language
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       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: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1276>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 12 11:07:43 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 12 Jun 2006 15:07:43 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231272=3A?=
 =?utf-8?q?_Tag_Cloud_error_with_new_Leads?=
In-Reply-To: <076.a19a3b814ba528da3bce99823fdc8f36@vtiger.fosslabs.com>
References: <076.a19a3b814ba528da3bce99823fdc8f36@vtiger.fosslabs.com>
Message-ID: <085.478109af6574734aa3a96132fda41868@vtiger.fosslabs.com>

#1272: Tag Cloud error with new Leads
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  richie
      Type:  defect     |      Status:  new   
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * owner:  developer => richie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1272>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 12 11:10:14 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 12 Jun 2006 15:10:14 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231272=3A?=
 =?utf-8?q?_Tag_Cloud_error_with_new_Leads?=
In-Reply-To: <076.a19a3b814ba528da3bce99823fdc8f36@vtiger.fosslabs.com>
References: <076.a19a3b814ba528da3bce99823fdc8f36@vtiger.fosslabs.com>
Message-ID: <085.9a1bb6bb559ab248bf24cdca7086d8f0@vtiger.fosslabs.com>

#1272: Tag Cloud error with new Leads
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  richie
      Type:  defect     |      Status:  new   
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Comment (by richie):

 I believe the problem is due to a slight misconception.

 The tag cloud is across the organization. It is not for a specific user.
 It is for a specific module but across the organization.
 So, in your case, I believe the tag might have been already created for
 the Leads module when you happened to try creating a new Lead.

 Please correct me if wrong.

 Thanks,
 Richie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1272>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 12 14:46:19 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 12 Jun 2006 18:46:19 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=2358=3A_R?=
 =?utf-8?q?eplace_jpgrah_1=2E20=2E3_to_1=2E5=2E2_in_vtigercrm?=
In-Reply-To: <076.36e42b58afdd49562f88d2163d3f4627@vtiger.fosslabs.com>
References: <076.36e42b58afdd49562f88d2163d3f4627@vtiger.fosslabs.com>
Message-ID: <085.986306d45de674f7e73a88d45a28dfd3@vtiger.fosslabs.com>

#58: Replace jpgrah 1.20.3 to 1.5.2 in vtigercrm
------------------------+---------------------------------------------------
  Reporter:  fathi      |       Owner:  developer
      Type:  task       |      Status:  closed   
  Priority:  major      |   Milestone:  4.2.5    
 Component:  vtigercrm  |     Version:  4.2.3    
Resolution:  fixed      |    Keywords:           
------------------------+---------------------------------------------------
Changes (by allanbush):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 (In [6998]) Replaced jpgraph with free Image Graph option from #755.
 Closes #755 and #58.

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/58>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 12 14:46:18 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 12 Jun 2006 18:46:18 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23755=3A_?=
 =?utf-8?q?Image_Graph_implementation_for_4=2E2=2E5_jpgraph_replacement?=
In-Reply-To: <076.48939851ba2c8a6f490b5e0d7b8c550b@vtiger.fosslabs.com>
References: <076.48939851ba2c8a6f490b5e0d7b8c550b@vtiger.fosslabs.com>
Message-ID: <085.11d5afab59cfddbdb3e1b4d187682b14@vtiger.fosslabs.com>

#755: Image Graph implementation for 4.2.5 jpgraph replacement
--------------------------+-------------------------------------------------
  Reporter:  jacquemesm   |       Owner:  developer          
      Type:  enhancement  |      Status:  closed             
  Priority:  major        |   Milestone:  4.2.5              
 Component:  vtigercrm    |     Version:  4.2.4rc3           
Resolution:  fixed        |    Keywords:  Image Graph jpgraph
--------------------------+-------------------------------------------------
Changes (by allanbush):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 (In [6998]) Replaced jpgraph with free Image Graph option from #755.
 Closes #755 and #58.

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/755>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 12 14:46:19 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 12 Jun 2006 18:46:19 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6998 - in
 /vtigercrm/branches/4.2: ./ 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/ modules/Dashboard/ modules/Potentials/
Message-ID: <20060612184620.2ED4B7E8BD5@vtiger.fosslabs.com>

Author: allanbush
Date: Mon Jun 12 12:45:46 2006
New Revision: 6998

Log:
Replaced jpgraph with free Image Graph option from #755. Closes #755 and #58.

Added:
    vtigercrm/branches/4.2/Image/
    vtigercrm/branches/4.2/Image/Canvas/
    vtigercrm/branches/4.2/Image/Canvas.php
    vtigercrm/branches/4.2/Image/Canvas/Color.php
    vtigercrm/branches/4.2/Image/Canvas/Fonts/
    vtigercrm/branches/4.2/Image/Canvas/Fonts/README
    vtigercrm/branches/4.2/Image/Canvas/Fonts/Vera.ttf   (with props)
    vtigercrm/branches/4.2/Image/Canvas/Fonts/VeraBI.ttf   (with props)
    vtigercrm/branches/4.2/Image/Canvas/Fonts/VeraBd.ttf   (with props)
    vtigercrm/branches/4.2/Image/Canvas/Fonts/VeraCopyright.txt
    vtigercrm/branches/4.2/Image/Canvas/Fonts/VeraIt.ttf   (with props)
    vtigercrm/branches/4.2/Image/Canvas/Fonts/VeraMoBI.ttf   (with props)
    vtigercrm/branches/4.2/Image/Canvas/Fonts/VeraMoBd.ttf   (with props)
    vtigercrm/branches/4.2/Image/Canvas/Fonts/VeraMoIt.ttf   (with props)
    vtigercrm/branches/4.2/Image/Canvas/Fonts/VeraMono.ttf   (with props)
    vtigercrm/branches/4.2/Image/Canvas/Fonts/VeraSe.ttf   (with props)
    vtigercrm/branches/4.2/Image/Canvas/Fonts/VeraSeBd.ttf   (with props)
    vtigercrm/branches/4.2/Image/Canvas/Fonts/fontmap.txt
    vtigercrm/branches/4.2/Image/Canvas/GD/
    vtigercrm/branches/4.2/Image/Canvas/GD.php
    vtigercrm/branches/4.2/Image/Canvas/GD/JPG.php
    vtigercrm/branches/4.2/Image/Canvas/GD/PNG.php
    vtigercrm/branches/4.2/Image/Canvas/ImageMap.php
    vtigercrm/branches/4.2/Image/Canvas/PDF.php
    vtigercrm/branches/4.2/Image/Canvas/SVG.php
    vtigercrm/branches/4.2/Image/Canvas/Tool.php
    vtigercrm/branches/4.2/Image/Canvas/WithMap.php
    vtigercrm/branches/4.2/Image/Color.php
    vtigercrm/branches/4.2/Image/Graph/
    vtigercrm/branches/4.2/Image/Graph.php
    vtigercrm/branches/4.2/Image/Graph/Axis/
    vtigercrm/branches/4.2/Image/Graph/Axis.php
    vtigercrm/branches/4.2/Image/Graph/Axis/Category.php
    vtigercrm/branches/4.2/Image/Graph/Axis/Logarithmic.php
    vtigercrm/branches/4.2/Image/Graph/Axis/Marker/
    vtigercrm/branches/4.2/Image/Graph/Axis/Marker/Area.php
    vtigercrm/branches/4.2/Image/Graph/Axis/Marker/Line.php
    vtigercrm/branches/4.2/Image/Graph/Axis/Radar.php
    vtigercrm/branches/4.2/Image/Graph/Common.php
    vtigercrm/branches/4.2/Image/Graph/Config.php
    vtigercrm/branches/4.2/Image/Graph/Constants.php
    vtigercrm/branches/4.2/Image/Graph/DataPreprocessor/
    vtigercrm/branches/4.2/Image/Graph/DataPreprocessor.php
    vtigercrm/branches/4.2/Image/Graph/DataPreprocessor/Array.php
    vtigercrm/branches/4.2/Image/Graph/DataPreprocessor/Currency.php
    vtigercrm/branches/4.2/Image/Graph/DataPreprocessor/Date.php
    vtigercrm/branches/4.2/Image/Graph/DataPreprocessor/Formatted.php
    vtigercrm/branches/4.2/Image/Graph/DataPreprocessor/Function.php
    vtigercrm/branches/4.2/Image/Graph/DataPreprocessor/NumberText.php
    vtigercrm/branches/4.2/Image/Graph/DataPreprocessor/RomanNumerals.php
    vtigercrm/branches/4.2/Image/Graph/DataPreprocessor/Sequential.php
    vtigercrm/branches/4.2/Image/Graph/DataSelector/
    vtigercrm/branches/4.2/Image/Graph/DataSelector.php
    vtigercrm/branches/4.2/Image/Graph/DataSelector/EveryNthPoint.php
    vtigercrm/branches/4.2/Image/Graph/DataSelector/NoZeros.php
    vtigercrm/branches/4.2/Image/Graph/DataSelector/Values.php
    vtigercrm/branches/4.2/Image/Graph/Dataset/
    vtigercrm/branches/4.2/Image/Graph/Dataset.php
    vtigercrm/branches/4.2/Image/Graph/Dataset/Function.php
    vtigercrm/branches/4.2/Image/Graph/Dataset/Random.php
    vtigercrm/branches/4.2/Image/Graph/Dataset/Sequential.php
    vtigercrm/branches/4.2/Image/Graph/Dataset/Trivial.php
    vtigercrm/branches/4.2/Image/Graph/Dataset/VectorFunction.php
    vtigercrm/branches/4.2/Image/Graph/Element.php
    vtigercrm/branches/4.2/Image/Graph/Figure/
    vtigercrm/branches/4.2/Image/Graph/Figure/Circle.php
    vtigercrm/branches/4.2/Image/Graph/Figure/Ellipse.php
    vtigercrm/branches/4.2/Image/Graph/Figure/Polygon.php
    vtigercrm/branches/4.2/Image/Graph/Figure/Rectangle.php
    vtigercrm/branches/4.2/Image/Graph/Fill/
    vtigercrm/branches/4.2/Image/Graph/Fill.php
    vtigercrm/branches/4.2/Image/Graph/Fill/Array.php
    vtigercrm/branches/4.2/Image/Graph/Fill/Gradient.php
    vtigercrm/branches/4.2/Image/Graph/Fill/Image.php
    vtigercrm/branches/4.2/Image/Graph/Font.php
    vtigercrm/branches/4.2/Image/Graph/Grid/
    vtigercrm/branches/4.2/Image/Graph/Grid.php
    vtigercrm/branches/4.2/Image/Graph/Grid/Bars.php
    vtigercrm/branches/4.2/Image/Graph/Grid/Lines.php
    vtigercrm/branches/4.2/Image/Graph/Grid/Polar.php
    vtigercrm/branches/4.2/Image/Graph/Images/
    vtigercrm/branches/4.2/Image/Graph/Images/Icons/
    vtigercrm/branches/4.2/Image/Graph/Images/Icons/pinpoint.png   (with props)
    vtigercrm/branches/4.2/Image/Graph/Images/Icons/pinpointr.png   (with props)
    vtigercrm/branches/4.2/Image/Graph/Images/Maps/
    vtigercrm/branches/4.2/Image/Graph/Images/Maps/README
    vtigercrm/branches/4.2/Image/Graph/Layout/
    vtigercrm/branches/4.2/Image/Graph/Layout.php
    vtigercrm/branches/4.2/Image/Graph/Layout/Horizontal.php
    vtigercrm/branches/4.2/Image/Graph/Layout/Matrix.php
    vtigercrm/branches/4.2/Image/Graph/Layout/Vertical.php
    vtigercrm/branches/4.2/Image/Graph/Legend.php
    vtigercrm/branches/4.2/Image/Graph/Line/
    vtigercrm/branches/4.2/Image/Graph/Line/Array.php
    vtigercrm/branches/4.2/Image/Graph/Line/Dashed.php
    vtigercrm/branches/4.2/Image/Graph/Line/Dotted.php
    vtigercrm/branches/4.2/Image/Graph/Line/Formatted.php
    vtigercrm/branches/4.2/Image/Graph/Line/Solid.php
    vtigercrm/branches/4.2/Image/Graph/Logo.php
    vtigercrm/branches/4.2/Image/Graph/Marker/
    vtigercrm/branches/4.2/Image/Graph/Marker.php
    vtigercrm/branches/4.2/Image/Graph/Marker/Array.php
    vtigercrm/branches/4.2/Image/Graph/Marker/Asterisk.php
    vtigercrm/branches/4.2/Image/Graph/Marker/Average.php
    vtigercrm/branches/4.2/Image/Graph/Marker/Box.php
    vtigercrm/branches/4.2/Image/Graph/Marker/Bubble.php
    vtigercrm/branches/4.2/Image/Graph/Marker/Circle.php
    vtigercrm/branches/4.2/Image/Graph/Marker/Cross.php
    vtigercrm/branches/4.2/Image/Graph/Marker/Diamond.php
    vtigercrm/branches/4.2/Image/Graph/Marker/Icon.php
    vtigercrm/branches/4.2/Image/Graph/Marker/Pinpoint.php
    vtigercrm/branches/4.2/Image/Graph/Marker/Plus.php
    vtigercrm/branches/4.2/Image/Graph/Marker/Pointing/
    vtigercrm/branches/4.2/Image/Graph/Marker/Pointing.php
    vtigercrm/branches/4.2/Image/Graph/Marker/Pointing/Angular.php
    vtigercrm/branches/4.2/Image/Graph/Marker/Pointing/Radial.php
    vtigercrm/branches/4.2/Image/Graph/Marker/ReversePinpoint.php
    vtigercrm/branches/4.2/Image/Graph/Marker/Star.php
    vtigercrm/branches/4.2/Image/Graph/Marker/Triangle.php
    vtigercrm/branches/4.2/Image/Graph/Marker/Value.php
    vtigercrm/branches/4.2/Image/Graph/Plot/
    vtigercrm/branches/4.2/Image/Graph/Plot.php
    vtigercrm/branches/4.2/Image/Graph/Plot/Area.php
    vtigercrm/branches/4.2/Image/Graph/Plot/Band.php
    vtigercrm/branches/4.2/Image/Graph/Plot/Bar.php
    vtigercrm/branches/4.2/Image/Graph/Plot/BoxWhisker.php
    vtigercrm/branches/4.2/Image/Graph/Plot/CandleStick.php
    vtigercrm/branches/4.2/Image/Graph/Plot/Dot.php
    vtigercrm/branches/4.2/Image/Graph/Plot/Fit/
    vtigercrm/branches/4.2/Image/Graph/Plot/Fit/Line.php
    vtigercrm/branches/4.2/Image/Graph/Plot/Impulse.php
    vtigercrm/branches/4.2/Image/Graph/Plot/Line.php
    vtigercrm/branches/4.2/Image/Graph/Plot/Odo.php
    vtigercrm/branches/4.2/Image/Graph/Plot/Pie.php
    vtigercrm/branches/4.2/Image/Graph/Plot/Radar.php
    vtigercrm/branches/4.2/Image/Graph/Plot/Smoothed/
    vtigercrm/branches/4.2/Image/Graph/Plot/Smoothed/Area.php
    vtigercrm/branches/4.2/Image/Graph/Plot/Smoothed/Bezier.php
    vtigercrm/branches/4.2/Image/Graph/Plot/Smoothed/Line.php
    vtigercrm/branches/4.2/Image/Graph/Plot/Smoothed/Radar.php
    vtigercrm/branches/4.2/Image/Graph/Plot/Step.php
    vtigercrm/branches/4.2/Image/Graph/Plotarea/
    vtigercrm/branches/4.2/Image/Graph/Plotarea.php
    vtigercrm/branches/4.2/Image/Graph/Plotarea/Element.php
    vtigercrm/branches/4.2/Image/Graph/Plotarea/Map.php
    vtigercrm/branches/4.2/Image/Graph/Plotarea/Radar.php
    vtigercrm/branches/4.2/Image/Graph/Simple.php
    vtigercrm/branches/4.2/Image/Graph/Title.php
    vtigercrm/branches/4.2/Image/Graph/Tool.php
    vtigercrm/branches/4.2/PEAR.php
    vtigercrm/branches/4.2/include/GraphUtils.php
Modified:
    vtigercrm/branches/4.2/modules/Dashboard/Chart_lead_source_by_outcome.php
    vtigercrm/branches/4.2/modules/Dashboard/Chart_my_pipeline_by_sales_stage.php
    vtigercrm/branches/4.2/modules/Dashboard/Chart_outcome_by_month.php
    vtigercrm/branches/4.2/modules/Dashboard/Chart_pipeline_by_lead_source.php
    vtigercrm/branches/4.2/modules/Dashboard/Chart_pipeline_by_sales_stage.php
    vtigercrm/branches/4.2/modules/Potentials/Charts.php

Modified: vtigercrm/branches/4.2/modules/Dashboard/Chart_lead_source_by_outcome.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Dashboard/Chart_lead_source_by_outcome.php (original)
+++ vtigercrm/branches/4.2/modules/Dashboard/Chart_lead_source_by_outcome.php Mon Jun 12 12:45:46 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 "<em>Charts not supported in PHP 5.</em>";
-}
-else {
 $draw_this = new jpgraph();
 echo $draw_this->lead_source_by_outcome($datax, $ids, $tmp_dir.$cache_file_name, $refresh);
 echo "<P><font size='1'><em>".$current_module_strings['LBL_LEAD_SOURCE_BY_OUTCOME_DESC']."</em></font></P>";
@@ -140,4 +136,4 @@
 [<a href="index.php?module=<?php echo $currentModule;?>&action=<?php echo $action;?>&lsbo_edit=true"><?php echo $current_module_strings['LBL_EDIT'];?></a>]
 </FONT></div>
 <?php } 
-}?>
+?>

Modified: vtigercrm/branches/4.2/modules/Dashboard/Chart_my_pipeline_by_sales_stage.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Dashboard/Chart_my_pipeline_by_sales_stage.php (original)
+++ vtigercrm/branches/4.2/modules/Dashboard/Chart_my_pipeline_by_sales_stage.php Mon Jun 12 12:45:46 2006
@@ -118,10 +118,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 "<em>Charts not supported in PHP 5.</em>";
-}
-else {
 $draw_this = new jpgraph();
 echo $draw_this->pipeline_by_sales_stage($datax, $date_start, $date_end, $ids, $tmp_dir.$cache_file_name, $refresh);
 echo "<P><font size='1'><em>".$current_module_strings['LBL_PIPELINE_FORM_TITLE_DESC']."</em></font></P>";
@@ -181,5 +177,4 @@
 </FONT></div>
 <?php } 
 echo get_validate_chart_js();
-} 
 ?>

Modified: vtigercrm/branches/4.2/modules/Dashboard/Chart_outcome_by_month.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Dashboard/Chart_outcome_by_month.php (original)
+++ vtigercrm/branches/4.2/modules/Dashboard/Chart_outcome_by_month.php Mon Jun 12 12:45:46 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 "<em>Charts not supported in PHP 5.</em>";
-}
-else {
 $draw_this = new jpgraph();
 echo $draw_this->outcome_by_month($date_start, $date_end, $ids, $tmp_dir.$cache_file_name, $refresh);
 echo "<P><font size='1'><em>".$current_module_strings['LBL_MONTH_BY_OUTCOME_DESC']."</em></font></P>";
@@ -163,4 +159,4 @@
 </FONT></div>
 <?php } 
 echo get_validate_chart_js();
-}?>
+?>

Modified: vtigercrm/branches/4.2/modules/Dashboard/Chart_pipeline_by_lead_source.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Dashboard/Chart_pipeline_by_lead_source.php (original)
+++ vtigercrm/branches/4.2/modules/Dashboard/Chart_pipeline_by_lead_source.php Mon Jun 12 12:45:46 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 "<em>Charts not supported in PHP 5.</em>";
-}
-else {
 $draw_this = new jpgraph();
 echo $draw_this->pipeline_by_lead_source($datax, $ids, $tmp_dir.$cache_file_name, $refresh);
 echo "<P><font size='1'><em>".$current_module_strings['LBL_LEAD_SOURCE_FORM_DESC']."</em></font></P>";
@@ -140,4 +136,4 @@
 [<a href="index.php?module=<?php echo $currentModule;?>&action=<?php echo $action;?>&pbls_edit=true"><?php echo $current_module_strings['LBL_EDIT'];?></a>]
 </FONT></div>
 <?php } 
-}?>
+?>

Modified: vtigercrm/branches/4.2/modules/Dashboard/Chart_pipeline_by_sales_stage.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Dashboard/Chart_pipeline_by_sales_stage.php (original)
+++ vtigercrm/branches/4.2/modules/Dashboard/Chart_pipeline_by_sales_stage.php Mon Jun 12 12:45:46 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 "<em>Charts not supported in PHP 5.</em>";
-}
-else {
 $draw_this = new jpgraph();
 echo $draw_this->pipeline_by_sales_stage($datax, $date_start, $date_end, $ids, $tmp_dir.$cache_file_name, $refresh);
 echo "<P><font size='1'><em>".$current_module_strings['LBL_SALES_STAGE_FORM_DESC']."</em></font></P>";
@@ -203,4 +199,4 @@
 </FONT></div>
 <?php } 
 //echo get_validate_chart_js();
-}?>
+?>

Modified: vtigercrm/branches/4.2/modules/Potentials/Charts.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Potentials/Charts.php (original)
+++ vtigercrm/branches/4.2/modules/Potentials/Charts.php Mon Jun 12 12:45:46 2006
@@ -20,52 +20,12 @@
 require_once('config.php');
 require_once('include/logging.php');
 require_once('modules/Potentials/Opportunity.php');
-require_once("jpgraph/jpgraph.php");
+require_once('Image/Graph.php');
 require_once('include/utils.php');
+require_once('include/GraphUtils.php');
+
 require_once('include/logging.php');
 
-
-
-
-// TTF Font families
-DEFINE("FF_COURIER",10);
-DEFINE("FF_VERDANA",11);
-DEFINE("FF_TIMES",12);
-DEFINE("FF_COMIC",14);
-DEFINE("FF_ARIAL",15);
-DEFINE("FF_GEORGIA",16);
-DEFINE("FF_TREBUCHE",17);
-
-// Chinese font
-DEFINE("FF_SIMSUN",30);
-DEFINE("FF_CHINESE",31);
-DEFINE("FF_BIG5",31);
-DEFINE("FF_TCHINESE_UTF8",32);
-
-
-function calculate_font_family($locale)
-
-{
-
-	switch($locale)
-	{
-		case 'cn_zh':
-			return FF_SIMSUN;
-		case 'zh-tw':
-		    return FF_TCHINESE_UTF8;
-		case 'tw_zh':
-			if(!function_exists('iconv')){
-				echo " Unable to display traditional Chinese on the graphs.<BR>The function iconv does not exists please read more about <a href='http://us4.php.net/iconv'>iconv here</a><BR>";
-				return FF_FONT1;
-
-			}
-			else return FF_CHINESE;
-		default:
-			return FF_FONT1;
-	}
-
-	return FF_FONT1;
-}
 
 
 class jpgraph {
@@ -79,7 +39,8 @@
 	function outcome_by_month($date_start='1971-10-15', $date_end='2071-10-15', $user_id=array('1'), $cache_file_name='a_file', $refresh=false) {
 		global $app_strings,$lang_crm, $app_list_strings, $current_module_strings, $log, $charset, $tmp_dir;
 		global $theme;
-		include_once ("jpgraph/jpgraph_bar.php");
+		include_once ('Image/Graph.php');
+		include_once ('Image/Canvas.php');
 
 		// Size of graph
 		$width=600;
@@ -87,13 +48,39 @@
 
 		$log =& LoggerManager::getLogger('outcome_by_month chart');
 		// Set the basic parameters of the graph
-		$graph = new Graph($width,$height,$cache_file_name);
+		$canvas =& Image_Canvas::factory('png', array('width' => $width, 'height' => $height, 'usemap' => true));
+		$imagemap = $canvas->getImageMap();
+		$graph =& Image_Graph::factory('graph', $canvas);
 		$log->debug("graph object created");
 
-		$graph->SetScale("textlin");
+		// add a TrueType font
+		$font =& $graph->addNew('font', calculate_font_name($lang_crm));
+		// set the font size to 11 pixels
+		$font->setSize(8);
+		
+		$graph->setFont($font);
+		// create the plotarea layout
+        $title =& Image_Graph::factory('title', array('Title',10));
+    	$plotarea =& Image_Graph::factory('plotarea',array(
+                    'axis',
+                    'axis'
+                ));
+        $footer =& Image_Graph::factory('title', array('Footer',8));
+		$graph->add(
+		    Image_Graph::vertical($title,
+	        Image_Graph::vertical(
+				$plotarea,
+        	    $footer,
+            	90
+		        ),
+        	5
+	    	)
+		);   
+
+		//$graph->SetScale("textlin");
 
 		if (!file_exists($cache_file_name) || !file_exists($cache_file_name.'.map') || $refresh == true) {
-			$font = calculate_font_family($lang_crm);
+			//$font = calculate_font_family($lang_crm);
 
 			$log->debug("date_start is: $date_start");
 			$log->debug("date_end is: $date_end");
@@ -206,32 +193,45 @@
 			$log->debug($count);
 
 			//now build the bar plots for each user across the sales stages
-			$bplot = array();
-			$color = array('Closed Lost'=>'FF9900','Closed Won'=>'009933', $other=>'0066CC');
+			$color = array('Closed Lost'=>'#FF9900','Closed Won'=>'#009933', $other=>'#0066CC');
 			$index = 0;
+			$datasets = array();
+			$xlabels = array();
+			$fills =& Image_Graph::factory('Image_Graph_Fill_Array');
 			foreach($stages as $stage) {
-				// Now create a bar pot
-				$bplot[$index] = new BarPlot($datax[$stage]);
-
-				//You can change the width of the bars if you like
-				$bplot[$index]->SetWidth(5);
+				// Now create a bar plot
+				$datasets[$index] = & Image_Graph::factory('dataset');
+				foreach($datax[$stage] as $i => $y) {
+				  	$x = 1+2*$i;
+				    $datasets[$index]->addPoint(
+				        $x,
+				        $y,
+				        array(
+				            'url' => $aTargets[$stage][$i],
+				            'alt' => $aAlts[$stage][$i]
+				        )
+				    );
+				}
 
 				// Set fill colors for bars
-				$bplot[$index]->SetFillColor("#".$color[$stage]);
-
-				// We want to display the value of each bar at the top
-				$bplot[$index]->value->Show();
-				$bplot[$index]->value->SetFont($font,FS_NORMAL,8);
-				//$bplot->value->SetAlign('left','center');
-				$bplot[$index]->value->SetColor("white");
-				$bplot[$index]->value->SetFormat(getCurrencySymbol().'%d');
-				$bplot[$index]->SetValuePos('center');
-
-				//set client side image map URL's
-				$bplot[$index]->SetCSIMTargets($aTargets[$stage],$aAlts[$stage]);
-				$log->debug("bplot[$index] is: ");
-				$log->debug($bplot[$index]);
+				$fills->addColor($color[$stage]);
+
 				$index++;
+			}
+			for($i=0;$i<count($months); $i++)
+			{
+			  $x = 1+2*$i;
+			  $xlabels[$x] = $months[$i];
+			  $xlabels[$x+1] = '';
+			}
+			
+			// compute maximum value because of grace jpGraph parameter not supported
+			$maximum = 0;
+			foreach($months as $num=>$m) {
+			  	$monthSum = 0;
+			  	foreach($stages as $stage) $monthSum += $datax[$stage][$num];
+				if($monthSum > $maximum) $maximum = $monthSum;
+				$log->debug('maximum = '.$maximum.' month = '.$m.' sum = '.$monthSum);
 			}
 
 			if($theme == "blue")
@@ -242,85 +242,103 @@
 			{
 				$font_color = "#000000";
 			}
+			$font->setColor($font_color);
 
 			// Create the grouped bar plot
-			$gbplot = new AccBarPlot($bplot);
-
-			// Add the bar to the graph
-			$graph->Add($gbplot);
-
-			// No frame around the image
-			$graph->SetFrame(true,"white");
-
-			// Rotate graph 90 degrees and set margin
-			$top = 20;
-			$bottom = 50;
-			$left = 20;
-			$right = 50;
-			$graph->SetMargin($left,$right,$top,$bottom);
+			$gbplot = & $plotarea->addNew('bar', array($datasets, 'stacked'));
+			$gbplot->setFillStyle($fills);
+
+			//You can change the width of the bars if you like
+			$gbplot->setBarWidth(60/count($months),"%");
+
+			// set margin
+			$plotarea->setPadding(array('top'=>0,'bottom'=>0,'left'=>10,'right'=>20));
 
 			// Set white margin color
-			$graph->SetMarginColor('#F5F5F5');
+			$graph->setBackgroundColor('#F5F5F5');
 
 			// Use a box around the plot area
-			$graph->SetBox();
+			$gbplot->setBorderColor('black');
 
 			// Use a gradient to fill the plot area
-			$graph->SetBackgroundGradient('#E5E5E5','white',GRAD_HOR,BGRAD_PLOT);
+			$gbplot->setBackground(Image_Graph::factory('gradient', array(IMAGE_GRAPH_GRAD_VERTICAL, 'white', '#E5E5E5')));
 
 			// Setup title
-			$title = $current_module_strings['LBL_TOTAL_PIPELINE'].getCurrencySymbol().$total.$app_strings['LBL_THOUSANDS_SYMBOL'];
-			$graph->title->Set($title);
-			$graph->title->SetColor($font_color);
-			$graph->title->SetFont($font,FS_BOLD,11);
+			$curr_symbol = getCurrencySymbol();
+			$titlestr = $current_module_strings['LBL_TOTAL_PIPELINE'].$curr_symbol.$total.$app_strings['LBL_THOUSANDS_SYMBOL'];
+			$title->setText($titleStr);
+
+			// Create the xaxis labels
+			$array_data =& Image_Graph::factory('Image_Graph_DataPreprocessor_Array', 
+			    array($xlabels) 
+			); 
 
 			// Setup X-axis
-			$graph->xaxis->SetColor($font_color);
-			$graph->xaxis->SetTickLabels($legend);
-			$graph->xaxis->SetFont($font,FS_NORMAL,8);
-
-			// Some extra margin looks nicer
-			$graph->xaxis->SetLabelMargin(10);
-
-			// Label align for X-axis
-			$graph->xaxis->SetLabelAlign('center','center');
-			$graph->yaxis->SetColor($font_color);
-			$graph->yaxis->SetLabelSide(SIDE_LEFT);
-
-			// The fix the tick marks
-			$graph->yaxis->SetTickSide(SIDE_RIGHT);
+			$xaxis =& $plotarea->getAxis(IMAGE_GRAPH_AXIS_X);
+			$xaxis->setDataPreprocessor($array_data);
+			$xaxis->forceMinimum(0);
+			$xaxis->forceMaximum(2*count($months));
+			$xaxis->setLabelInterval(1);
+			$xaxis->setTickOptions(0,0);
+			$xaxis->setLabelInterval(2,2);
+			$xaxis->setTickOptions(5,0,2);
+
+			// set grid
+			$gridY =& $plotarea->addNew('line_grid', IMAGE_GRAPH_AXIS_Y);
+			$gridY->setLineColor('#E5E5E5 at 0.5');
+
 
 			// 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(10);
+			$yaxis =& $plotarea->getAxis(IMAGE_GRAPH_AXIS_Y);
+			$yaxis->forceMaximum($maximum * 1.1);
+			$ticks = get_tickspacing($maximum);
 
 			// 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');
-
-			// First make the labels look right
-			$graph->yaxis->SetLabelAlign('left','top');
-			$graph->yaxis->SetLabelFormat(getCurrencySymbol().'%d');
-			$graph->yaxis->SetLabelSide(SIDE_RIGHT);
-
-			// The fix the tick marks
-			$graph->yaxis->SetTickSide(SIDE_LEFT);
+			$yaxis->setAxisIntersection('max');
+
+			// Then fix the tick marks
+			$valueproc =& Image_Graph::factory('Image_Graph_DataPreprocessor_Formatted', $curr_symbol."%d");
+			$yaxis->setFontSize(8);
+			$yaxis->setDataPreprocessor($valueproc);
+			// Arrange Y-Axis tick marks inside
+			$yaxis->setLabelInterval($ticks[0]);
+			$yaxis->setTickOptions(-5,0);
+			$yaxis->setLabelInterval($ticks[1],2);
+			$yaxis->setTickOptions(-2,0,2);
+			$yaxis->setLabelOption('position','inside');
 
 			// Finally setup the title
-			$graph->yaxis->SetTitleSide(SIDE_RIGHT);
-			$graph->yaxis->SetTitleMargin(35);
-
-			$subtitle .= $current_module_strings['LBL_OPP_SIZE'].getCurrencySymbol().$current_module_strings['LBL_OPP_SIZE_VALUE'];
-			$graph->footer->right->SetColor($font_color);
-			$graph->footer->right->Set($subtitle);
-			$graph->footer->right->SetFont($font,FS_NORMAL,8);
-
-			$graph->yaxis->SetFont($font,FS_NORMAL, 8);
+			$yaxis->setLabelOption('position','inside');
+			
+			// eliminate zero values
+			$gbplot->setDataSelector(Image_Graph::factory('Image_Graph_DataSelector_NoZeros'));
+			
+			// set markers
+			$marker =& $graph->addNew('value_marker', IMAGE_GRAPH_VALUE_Y);
+			$marker->setDataPreprocessor($valueproc);
+			$marker->setFillColor('000000 at 0.0');
+			$marker->setBorderColor('000000 at 0.0');
+			$marker->setFontColor('white');
+			$marker->setFontSize(8);
+			$gbplot->setMarker($marker);
+
+			$subtitle .= $current_module_strings['LBL_OPP_SIZE'].$curr_symbol.$current_module_strings['LBL_OPP_SIZE_VALUE'];
+			$footer->setText($subtitle);
+			$footer->setAlignment(IMAGE_GRAPH_ALIGN_TOP_RIGHT);
 
 			// .. and stroke the graph
-			$graph->Stroke($cache_file_name);
-			$imgMap = $graph->GetHTMLImageMap('outcome_by_month');
+			$imgMap = $graph->done(
+								    array(
+									        'tohtml' => true,
+									        'border' => 0,
+									        'filename' => $cache_file_name,
+									        'filepath' => './',
+									        'urlpath' => ''
+									    ));
+			//$imgMap = htmlspecialchars($output);
 			save_image_map($cache_file_name.'.map', $imgMap);
 		}
 		else {
@@ -329,9 +347,7 @@
 			fclose($imgMap_fp);
 		}
 		$fileModTime = filemtime($cache_file_name.'.map');
-		$return = "\n$imgMap\n";
-		$return .= "<img src='$cache_file_name?modTime=$fileModTime'\n";
-		$return .= "ismap usemap='#outcome_by_month' border='0'>\n";
+		$return = "\n$imgMap";
 		return $return;
 	}
 
@@ -351,7 +367,8 @@
 		global $app_strings,$lang_crm, $current_module_strings, $log, $charset, $tmp_dir;
 		global $theme;
 
-		include_once ("jpgraph/jpgraph_bar.php");
+		include_once ('Image/Graph.php');
+		include_once ('Image/Canvas.php');
 
 		// Size of graph
 		$width=300;
@@ -359,13 +376,36 @@
 
 		$log =& LoggerManager::getLogger('lead_source_by_outcome chart');
 		// Set the basic parameters of the graph
-		$graph = new Graph($width,$height,$cache_file_name);
+		$canvas =& Image_Canvas::factory('png', array('width' => $width, 'height' => $height, 'usemap' => true));
+		$imagemap = $canvas->getImageMap();
+		$graph =& Image_Graph::factory('graph', $canvas);
 		$log->debug("graph object created");
-
-		$graph->SetScale("textlin");
+		// add a TrueType font
+		$font =& $graph->addNew('font', calculate_font_name($lang_crm));
+		// set the font size to 11 pixels
+		$font->setSize(8);
+		
+		$graph->setFont($font);
+		// create the plotarea layout
+        $title =& Image_Graph::factory('title', array('Test',10));
+    	$plotarea =& Image_Graph::factory('plotarea',array(
+                    'axis',
+                    'axis',
+                    'horizontal'
+                ));
+        $footer =& Image_Graph::factory('title', array('Footer',8));
+		$graph->add(
+		    Image_Graph::vertical($title,
+	        Image_Graph::vertical(
+				$plotarea,
+        	    $footer,
+            	90
+		        ),
+        	5
+	    	)
+		);   
 
 		if (!file_exists($cache_file_name) || !file_exists($cache_file_name.'.map') || $refresh == true) {
-			$font = calculate_font_family($lang_crm);
 
 			$log->debug("datay is:");
 			$log->debug($datay);
@@ -494,35 +534,49 @@
 			$log->debug($count);
 
 			//now build the bar plots for each user across the sales stages
-			$bplot = array();
 			$color = array('Closed Lost'=>'FF9900','Closed Won'=>'009933', $other=>'0066CC');
 			$index = 0;
+			$xlabels = array();
+			$datasets = array();
+			$fills =& Image_Graph::factory('Image_Graph_Fill_Array');
 			foreach($stages as $stage) {
 				// Now create a bar pot
-				$bplot[$index] = new BarPlot($datax[$stage]);
-
-				//You can change the width of the bars if you like
-				$bplot[$index]->SetWidth(5);
+				$datasets[$index] = & Image_Graph::factory('dataset');
+				foreach($datax[$stage] as $i => $y) {
+				  	$x = 1+2*$i;
+				    $datasets[$index]->addPoint(
+				        //$datay[$legend[$x]],
+				        $x,
+				        $y,
+				        array(
+				            'url' => $aTargets[$stage][$i],
+				            'alt' => $aAlts[$stage][$i],
+				            'target' => '_blank'
+				        )
+				    );
+				}
+			for($i=0;$i<count($legend); $i++)
+			{
+			  $x = 1+2*$i;
+			  $xlabels[$x] = $legend[$i];
+			  $xlabels[$x+1] = '';
+			}
 
 				// Set fill colors for bars
-				$bplot[$index]->SetFillColor("#".$color[$stage]);
-
-				// We want to display the value of each bar at the top
-				$bplot[$index]->value->Show();
-				$bplot[$index]->value->SetFont($font,FS_NORMAL,7);
-				//$bplot->value->SetAlign('left','center');
-				$bplot[$index]->value->SetColor("white");
-				$bplot[$index]->value->SetFormat(getCurrencySymbol().'%d');
-				$bplot[$index]->SetValuePos('center');
-
-				//set client side image map URL's
-				$bplot[$index]->SetCSIMTargets($aTargets[$stage],$aAlts[$stage]);
-				$log->debug("bplot[$index] is: ");
-				$log->debug($bplot[$index]);
+				$fills->addColor("#".$color[$stage]);
+
 				$log->debug("datax[$stage] is: ");
 				$log->debug($datax[$stage]);
 				$index++;
 			}
+			
+			// compute maximum value because of grace jpGraph parameter not supported
+			$maximum = 0;
+			foreach($legend as $legendidx=>$legend_text) {
+			  	$dataxSum = 0;
+				foreach($stages as $stage) $dataxSum += $datax[$stage][$legendidx];
+				if($dataxSum > $maximum) $maximum = $dataxSum;
+			}
 
 			if($theme == "blue")
 			{
@@ -532,84 +586,92 @@
 			{
 				$font_color = "#000000";
 			}
+			$font->setColor($font_color);
 
 			// Create the grouped bar plot
-			$gbplot = new AccBarPlot($bplot);
-
-			// Add the bar to the graph
-			$graph->Add($gbplot);
-
-			// No frame around the image
-			$graph->SetFrame(true,"white");
-
-			// Rotate graph 90 degrees and set margin
-			$top = 20;
-			$bottom = 50;
-			$left = 130;
-			$right = 40;
-			$graph->Set90AndMargin($left,$right,$top,$bottom);
+			$gbplot = & $plotarea->addNew('bar', array($datasets, 'stacked'));
+			$gbplot->setFillStyle($fills);
+
+			//You can change the width of the bars if you like
+			$gbplot->setBarWidth(120/count($legend),"%");
 
 			// Set white margin color
-			$graph->SetMarginColor('#F5F5F5');
+			$graph->setBackgroundColor('#F5F5F5');
 
 			// Use a box around the plot area
-			$graph->SetBox();
+			$gbplot->setBorderColor('black');
 
 			// Use a gradient to fill the plot area
-			$graph->SetBackgroundGradient('#E5E5E5','white',GRAD_HOR,BGRAD_PLOT);
+			$gbplot->setBackground(Image_Graph::factory('gradient', array(IMAGE_GRAPH_GRAD_HORIZONTAL, 'white', '#E5E5E5')));
 
 			// Setup title
-			$title = $current_module_strings['LBL_ALL_OPPORTUNITIES'].getCurrencySymbol().$total.$app_strings['LBL_THOUSANDS_SYMBOL'];
-			$graph->title->Set($title);
-			$graph->title->SetColor($font_color);
-			$graph->title->SetFont($font,FS_BOLD,11);
+			$curr_symbol = getCurrencySymbol();
+			$titlestr = $current_module_strings['LBL_ALL_OPPORTUNITIES'].$curr_symbol.$total.$app_strings['LBL_THOUSANDS_SYMBOL'];
+			$title->setText($titlestr);
+
+			// Create the xaxis labels
+			$array_data =& Image_Graph::factory('Image_Graph_DataPreprocessor_Array', 
+			    array($xlabels) 
+			); 
 
 			// Setup X-axis
-			$graph->xaxis->SetTickLabels($legend);
-			$graph->xaxis->SetColor($font_color);
-			$graph->xaxis->SetFont($font,FS_NORMAL,8);
-
-			// Some extra margin looks nicer
-			$graph->xaxis->SetLabelMargin(10);
-
-			// Label align for X-axis
-			$graph->xaxis->SetLabelAlign('right','center');
-			$graph->yaxis->SetLabelSide(SIDE_LEFT);
-			$graph->yaxis->SetColor($font_color);
-			// The fix the tick marks
-			$graph->yaxis->SetTickSide(SIDE_RIGHT);
+			$xaxis =& $plotarea->getAxis(IMAGE_GRAPH_AXIS_X);
+			$xaxis->setDataPreprocessor($array_data);
+			$xaxis->forceMinimum(0);
+			$xaxis->forceMaximum(2*count($legend));
+			$xaxis->setLabelInterval(1);
+			$xaxis->setTickOptions(0,0);
+			$xaxis->setLabelInterval(2,2);
+			$xaxis->setTickOptions(5,0,2);
+			$xaxis->setInverted(true);
+			
+			// set grid
+			$gridY =& $plotarea->addNew('line_grid', IMAGE_GRAPH_AXIS_Y);
+			$gridY->setLineColor('#E5E5E5 at 0.5');
 
 			// 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(10);
-
-			// 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');
-
-			// First make the labels look right
-			$graph->yaxis->SetLabelAlign('left','top');
-			$graph->yaxis->SetLabelFormat(getCurrencySymbol().'%d');
-			$graph->yaxis->SetLabelSide(SIDE_RIGHT);
-
-			// The fix the tick marks
-			$graph->yaxis->SetTickSide(SIDE_LEFT);
+			$yaxis =& $plotarea->getAxis(IMAGE_GRAPH_AXIS_Y);
+			$yaxis->forceMaximum($maximum * 1.1);
+			$ticks = get_tickspacing($maximum);
+
+			// Then fix the tick marks
+			$yaxis->setFontSize(8);
+			$yaxis->setAxisIntersection('max');
+			$valueproc =& Image_Graph::factory('Image_Graph_DataPreprocessor_Formatted', $curr_symbol."%d");
+			$yaxis->setDataPreprocessor($valueproc);
+			$yaxis->setLabelInterval($ticks[0]);
+			$yaxis->setTickOptions(-5,0);
+			$yaxis->setLabelInterval($ticks[1],2);
+			$yaxis->setTickOptions(-2,0,2);
+			
+			// eliminate zero values
+			$gbplot->setDataSelector(Image_Graph::factory('Image_Graph_DataSelector_NoZeros'));
+			
+			// set markers
+			$marker =& $graph->addNew('value_marker', IMAGE_GRAPH_VALUE_Y);
+			$marker->setDataPreprocessor($valueproc);
+			$marker->setFillColor('#000000 at 0.0');
+			$marker->setBorderColor('#000000 at 0.0');
+			$marker->setFontColor('white');
+			$marker->setFontSize(8);
+			$gbplot->setMarker($marker);
 
 			// Finally setup the title
-			$graph->yaxis->SetTitleSide(SIDE_RIGHT);
-			$graph->yaxis->SetTitleMargin(35);
-
-			$subtitle = $current_module_strings['LBL_OPP_SIZE'].getCurrencySymbol().$current_module_strings['LBL_OPP_SIZE_VALUE']; 
-			$graph->footer->right->SetColor($font_color);
-			$graph->footer->right->Set($subtitle);
-			$graph->footer->right->SetFont($font,FS_NORMAL,8);
-
-			$graph->yaxis->SetFont($font,FS_NORMAL, 8);
+			$subtitle = $current_module_strings['LBL_OPP_SIZE'].$curr_symbol.$current_module_strings['LBL_OPP_SIZE_VALUE']; 
+			$footer->setText($subtitle);
+			$footer->setAlignment(IMAGE_GRAPH_ALIGN_TOP_RIGHT);
 
 			// .. and stroke the graph
-			$graph->Stroke($cache_file_name);
-			$imgMap = $graph->GetHTMLImageMap('lead_source_by_outcome');
+			$imgMap = $graph->done(
+								    array(
+									        'tohtml' => true,
+									        'border' => 0,
+									        'filename' => $cache_file_name,
+									        'filepath' => './',
+									        'urlpath' => ''
+									    ));
+			//$imgMap = htmlspecialchars($output);
 			save_image_map($cache_file_name.'.map', $imgMap);
 		}
 		else {
@@ -618,9 +680,7 @@
 			fclose($imgMap_fp);
 		}
 		$fileModTime = filemtime($cache_file_name.'.map');
-		$return = "\n$imgMap\n";
-		$return .= "<img src='$cache_file_name?modTime=$fileModTime'\n";
-		$return .= "ismap usemap='#lead_source_by_outcome' border='0'>\n";
+		$return = "\n$imgMap";
 		return $return;
 	}
 
@@ -634,7 +694,8 @@
 	function pipeline_by_sales_stage($datax=array('foo','bar'), $date_start='2071-10-15', $date_end='2071-10-15', $user_id=array('1'), $cache_file_name='a_file', $refresh=false) {
 		global $app_strings,$lang_crm, $current_module_strings, $log, $charset, $tmp_dir;
 		global $theme;
-		include_once ("jpgraph/jpgraph_bar.php");
+		include_once ('Image/Graph.php');
+		include_once ('Image/Canvas.php');
 
 		// Size of graph
 		$width=300;
@@ -642,13 +703,40 @@
 
 		$log =& LoggerManager::getLogger('opportunity charts');
 		// Set the basic parameters of the graph
-		$graph = new Graph($width,$height,$cache_file_name);
+
+		
+		$canvas =& Image_Canvas::factory('png', array('width' => $width, 'height' => $height, 'usemap' => true));
+		$imagemap = $canvas->getImageMap();
+		$graph =& Image_Graph::factory('graph', $canvas);
+		//$log->debug("graph object created");
+		// add a TrueType font
+		//$font =& $graph->addNew('font', calculate_font_name($lang_crm));
+		$font =& $graph->addNew('font', calculate_font_name($lang_crm));
+		// set the font size to 11 pixels
+		$font->setSize(8);
+		
+		$graph->setFont($font);
+        $title =& Image_Graph::factory('title', array('Test',10));
+    	$plotarea =& Image_Graph::factory('plotarea',array(
+                    'axis',
+                    'axis',
+                    'horizontal'
+                ));
+        $footer =& Image_Graph::factory('title', array('Footer',8));
+		$graph->add(
+		    Image_Graph::vertical($title,
+	        Image_Graph::vertical(
+				$plotarea,
+        	    $footer,
+            	90
+		        ),
+        	5
+	    	)
+		);   
 		$log->debug("graph object created");
-
-		$graph->SetScale("textlin");
+		
 
 		if (!file_exists($cache_file_name) || !file_exists($cache_file_name.'.map') || $refresh == true) {
-			$font = calculate_font_family($lang_crm);
 
 			$log->debug("starting pipeline chart");
 			$log->debug("datax is:");
@@ -764,63 +852,61 @@
 			$log->debug($count);
 
 			//now build the bar plots for each user across the sales stages
-			$bplot = array();
-			$color = 'D50100';
+			$colors = color_generator(count($user_id),'#D50100','#002222');
 			$index = 0;
+			$datasets = array();
+			$xlabels = array();
+			$fills =& Image_Graph::factory('Image_Graph_Fill_Array');
 			foreach($user_id as $the_id) {
 				// Now create a bar pot
-				$bplot[$index] = new BarPlot($datay[$the_id]);
-				//color="black",$hsize=3,$vsize=3,$show=true
-				$bplot[$index]->SetShadow();
-				//You can change the width of the bars if you like
-				$bplot[$index]->SetWidth(0.5);
+				$datasets[$index] = & Image_Graph::factory('dataset');
+				foreach($datay[$the_id] as $i => $y) {
+				    $x = 1+2*$i;
+				    $datasets[$index]->addPoint(
+				        $x,
+				        $y,
+				        array(
+				            'url' => $aTargets[$the_id][$i],
+				            'alt' => $aAlts[$the_id][$i]
+				        )
+				    );
+				}
 
 				// Set fill colors for bars
-				//$bplot[$index]->SetFillGradient('red','#7D7D7D',GRAD_HOR);//SetFillColor("#$color");
-				$bplot[$index]->SetFillColor("#$color");
-				$color = $color + 220022;
-
-				// We want to display the value of each bar at the top
-				$bplot[$index]->value->Show();
-				$bplot[$index]->value->SetFont($font,FS_NORMAL,8);
-				//$bplot->value->SetAlign('left','center');
-				$bplot[$index]->value->SetColor("white");
-				$bplot[$index]->value->SetFormat(getCurrencySymbol().'%d');
-				$bplot[$index]->SetValuePos('center');
-
-				//set client side image map URL's
-				$bplot[$index]->SetCSIMTargets($aTargets[$the_id],$aAlts[$the_id]);
-				$log->debug("bplot[$index] is: ");
-				$log->debug($bplot[$index]);
-				$log->debug("datay[$the_id] is: ");
-				$log->debug($datay[$the_id]);
+				$fills->addColor($colors[$index]);
+
 				$index++;
 			}
-
+			for($i=0;$i<count($legend); $i++)
+			{
+			  $x = 1+2*$i;
+			  $xlabels[$x] = $legend[$i];
+			  $xlabels[$x+1] = '';
+			}
+			
+			// compute maximum value because of grace jpGraph parameter not supported
+			$maximum = 0;
+			foreach($legend as $legendidx=>$legend_text) {
+			  	$legendsum = 0;
+				foreach($user_id as $the_id) $legendsum += $datay[$the_id][$legendidx];
+				if($legendsum > $maximum) $maximum = $legendsum;
+			}
 			// Create the grouped bar plot
-			$gbplot = new AccBarPlot($bplot);
-
-			// Add the bar to the graph
-			$graph->Add($gbplot);
-
-			// No frame around the image
-			$graph->SetFrame(true,"white");
-
-			// Rotate graph 90 degrees and set margin
-			$top = 20;
-			$bottom = 70;
-			$left = 130;
-			$right = 40;
-			$graph->Set90AndMargin($left,$right,$top,$bottom);
+			$gbplot = & $plotarea->addNew('bar', array($datasets, 'stacked'));
+			$gbplot->setFillStyle($fills);
+
+			//You can change the width of the bars if you like
+			$gbplot->setBarWidth(120/count($legend),"%");
+
 
 			// Set white margin color
-			$graph->SetMarginColor('#F5F5F5');
+			$graph->setBackgroundColor('#F5F5F5');
 
 			// Use a box around the plot area
-			$graph->SetBox();
+			$gbplot->setBorderColor('black');
 
 			// Use a gradient to fill the plot area
-			$graph->SetBackgroundGradient('#E5E5E5','white',GRAD_HOR,BGRAD_PLOT);
+			$gbplot->setBackground(Image_Graph::factory('gradient', array(IMAGE_GRAPH_GRAD_HORIZONTAL, 'white', '#E5E5E5')));
 
 			if($theme == "blue")
 			{
@@ -830,57 +916,81 @@
 			{
 				$font_color = "#000000";
 			}
-
+			$font->setColor($font_color);
 
 			// Setup title
-			$title = $current_module_strings['LBL_TOTAL_PIPELINE'].getCurrencySymbol().$total.$app_strings['LBL_THOUSANDS_SYMBOL'];
-			$graph->title->Set($title);
-			$graph->title->SetColor($font_color);
-			$graph->title->SetFont($font,FS_BOLD,11);
-
+			$curr_symbol = getCurrencySymbol();
+			$titlestr = $current_module_strings['LBL_TOTAL_PIPELINE'].$curr_symbol.$total.$app_strings['LBL_THOUSANDS_SYMBOL'];
+			$title->setText($titlestr);
+
+			// Create the xaxis labels
+			$array_data =& Image_Graph::factory('Image_Graph_DataPreprocessor_Array', 
+			    array($xlabels) 
+			); 
+
+		
 			// Setup X-axis
-			$graph->xaxis->SetTickLabels($legend);
-			$graph->xaxis->SetColor($font_color);
-			$graph->xaxis->SetFont($font,FS_NORMAL,8);
-
-			// Some extra margin looks nicer
-			$graph->xaxis->SetLabelMargin(10);
-
-			// Label align for X-axis
-			$graph->xaxis->SetLabelAlign('right','center');
+			$xaxis =& $plotarea->getAxis(IMAGE_GRAPH_AXIS_X);
+			$xaxis->setDataPreprocessor($array_data);
+			$xaxis->forceMinimum(0);
+			$xaxis->forceMaximum(2*count($legend));
+			$xaxis->setLabelInterval(1);
+			$xaxis->setTickOptions(0,0);
+			$xaxis->setLabelInterval(2,2);
+			$xaxis->setTickOptions(5,0,2);
+			$xaxis->setInverted(true);
+
+			// Setup Y-axis
+			$yaxis =& $plotarea->getAxis(IMAGE_GRAPH_AXIS_Y);
+			$yaxis->setFontSize(8);
+			$yaxis->setAxisIntersection('max');
 
 			// 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(10);
-
-			// 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($maximum * 1.1);
+			$ticks = get_tickspacing($maximum);
+			
+			// set grid
+			$gridY =& $plotarea->addNew('line_grid', IMAGE_GRAPH_AXIS_Y);
+			$gridY->setLineColor('#E5E5E5 at 0.5');
 
 			// First make the labels look right
-			$graph->yaxis->SetColor($font_color);
-			$graph->yaxis->SetLabelAlign('center','top');
-			$graph->yaxis->SetLabelFormat(getCurrencySymbol().'%d');
-			$graph->yaxis->SetLabelSide(SIDE_RIGHT);
-
-			// The fix the tick marks
-			$graph->yaxis->SetTickSide(SIDE_LEFT);
+			$valueproc =& Image_Graph::factory('Image_Graph_DataPreprocessor_Formatted', $curr_symbol."%d");
+			$yaxis->setDataPreprocessor($valueproc);
+			$yaxis->setLabelInterval($ticks[0]);
+			$yaxis->setTickOptions(-5,0);
+			$yaxis->setLabelInterval($ticks[1],2);
+			$yaxis->setTickOptions(-2,0,2);
+			
+			// eliminate zero values
+			$gbplot->setDataSelector(Image_Graph::factory('Image_Graph_DataSelector_NoZeros'));
+			
+			// set markers
+			$marker =& $graph->addNew('value_marker', IMAGE_GRAPH_VALUE_Y);
+			$marker->setDataPreprocessor($valueproc);
+			$marker->setFillColor('000000 at 0.0');
+			$marker->setBorderColor('000000 at 0.0');
+			$marker->setFontColor('white');
+			$marker->setFontSize(8);
+			$gbplot->setMarker($marker);
 
 			// Finally setup the title
-			$graph->yaxis->SetTitleSide(SIDE_RIGHT);
-			$graph->yaxis->SetTitleMargin(35);
-
-			$subtitle .= $current_module_strings['LBL_OPP_SIZE'].getCurrencySymbol().$current_module_strings['LBL_OPP_SIZE_VALUE']; 
-			$graph->footer->right->Set($subtitle);
-			$graph->footer->right->SetColor($font_color);
-			$graph->footer->right->SetFont($font,FS_NORMAL,8);
-
-			$graph->yaxis->SetFont($font,FS_NORMAL, 8);
+
+			$curr_symbol = getCurrencySymbol();
+			$subtitle .= $current_module_strings['LBL_OPP_SIZE'].$curr_symbol.$current_module_strings['LBL_OPP_SIZE_VALUE']; 
+			$footer->setText($subtitle);
+			$footer->setAlignment(IMAGE_GRAPH_ALIGN_TOP_RIGHT);
 
 			// .. and stroke the graph
-			$graph->Stroke($cache_file_name);
-			$imgMap = $graph->GetHTMLImageMap('pipeline');
+			$imgMap = $graph->done(
+								    array(
+									        'tohtml' => true,
+									        'border' => 0,
+									        'filename' => $cache_file_name,
+									        'filepath' => './',
+									        'urlpath' => ''
+									    ));
+			//$imgMap = $graph->GetHTMLImageMap('pipeline');
 			save_image_map($cache_file_name.'.map', $imgMap);
 		}
 		else {
@@ -889,9 +999,7 @@
 			fclose($imgMap_fp);
 		}
 		$fileModTime = filemtime($cache_file_name.'.map');
-		$return = "\n$imgMap\n";
-		$return .= "<img src='$cache_file_name?modTime=$fileModTime'\n";
-		$return .= "ismap usemap='#pipeline' border='0'>\n";
+		$return = "\n$imgMap";
 		return $return;
 	}
 
@@ -908,10 +1016,10 @@
 		global $app_strings,$lang_crm, $current_module_strings, $log, $charset, $tmp_dir;
 		global $theme;
 
-		include_once ("jpgraph/jpgraph_pie.php");
-		include_once ("jpgraph/jpgraph_pie3d.php");
-
-		$font = calculate_font_family($lang_crm);
+		include_once ('Image/Graph.php');
+		include_once ('Image/Canvas.php');
+
+		$font = calculate_font_name($lang_crm);
 
 		if (!file_exists($cache_file_name) || !file_exists($cache_file_name.'.map') || $refresh == true) {
 			$log =& LoggerManager::getLogger('opportunity charts');
@@ -1013,47 +1121,99 @@
 			}
 
 			// Create the Pie Graph.
-			$graph = new PieGraph(490,260,$cache_file_name);
-
-			$graph->SetShadow();
+			$width = 600;
+			$height = 400;
+	
+			$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('Test',10));
+	    	$plotarea =& Image_Graph::factory('plotarea',array(
+                    'category',
+                    'axis'
+                ));
+	        $footer =& Image_Graph::factory('title', array('Footer',8));
+			$graph->add(
+			    Image_Graph::vertical($title,
+		        Image_Graph::vertical(
+					$plotarea,
+	        	    $footer,
+	            	90
+			        ),
+	        	5
+		    	)
+			);   
+
+			// Generate colours
+			$colors = color_generator(count($visible_legends),'#33CCFF','#3322FF');
+			$index = 0;
+			$dataset = & Image_Graph::factory('dataset');
+			$fills =& Image_Graph::factory('Image_Graph_Fill_Array');
+			foreach($visible_legends as $legend) {
+			    $dataset->addPoint(
+			        $legend,
+			        $data[$index],
+			        array(
+			            'url' => $aTargets[$index],
+			            'alt' => $aAlts[$index]
+			        )
+			    );
+				$fills->addColor($colors[$index]);
+			    $log->debug('point ='.$legend.','.$data[$index]);
+
+				$index++;
+			}
+
+			// create the pie chart and associate the filling colours			
+			$gbplot = & $plotarea->addNew('pie', $dataset);
+			$plotarea->hideAxis();
+			$gbplot->setFillStyle($fills);
 
 			// Setup title
-			$title = $current_module_strings['LBL_TOTAL_PIPELINE'].getCurrencySymbol().$total.$app_strings['LBL_THOUSANDS_SYMBOL'];
-			$graph->title->Set($title);
-			$graph->title->SetColor($font_color);
-			$graph->title->SetFont($font,FS_BOLD,11);
-
-			// No frame around the image
-			$graph->SetFrame(false);
-			//$graph->SetMarginColor('#F5F5F5');
-
-			$graph->legend->Pos(0.01,0.10);
-			$graph->legend->SetColor($font_color);
-			$graph->legend->SetFont($font,FS_NORMAL,12);
-
-			$subtitle = $current_module_strings['LBL_OPP_SIZE'].getCurrencySymbol().$current_module_strings['LBL_OPP_SIZE_VALUE'];
-			$graph->footer->left->Set($subtitle);
-			$graph->footer->left->SetColor($font_color);
-			$graph->footer->left->SetFont($font,FS_NORMAL,8);
-
-			// Create pie plot
-			$p1 = new PiePlot3d($data);
-			$p1->SetSize(0.30);
-			$p1->SetTheme("water");
-			$p1->SetCenter(0.33,0.35);
-			$p1->SetAngle(30);
-			$p1->value->SetFont($font,FS_NORMAL,12);
-			$p1->SetLegends($visible_legends);
-			$p1->SetLabelType(PIE_VALUE_ABS);
-			$p1->value->SetFormat(getCurrencySymbol().'%d');
-
-			//set client side image map URL's
-			$p1->SetCSIMTargets($aTargets,$aAlts);
-
-			$graph->Add($p1);
-
-			$graph->Stroke($cache_file_name);
-			$imgMap = $graph->GetHTMLImageMap('pipeline_by_lead_source');
+			$curr_symbol = getCurrencySymbol();
+			$titlestr = $current_module_strings['LBL_TOTAL_PIPELINE'].$curr_symbol.$total.$app_strings['LBL_THOUSANDS_SYMBOL'];
+			$title->setText($titlestr);
+
+			// format the data values
+			$valueproc =& Image_Graph::factory('Image_Graph_DataPreprocessor_Formatted', $curr_symbol."%d");
+
+			// set markers
+			$marker =& $graph->addNew('value_marker', IMAGE_GRAPH_VALUE_Y);
+			$marker->setDataPreprocessor($valueproc);
+			$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();
+
+			$subtitle = $current_module_strings['LBL_OPP_SIZE'].$curr_symbol.$current_module_strings['LBL_OPP_SIZE_VALUE'];
+			$footer->setText($subtitle);
+			$footer->setAlignment(IMAGE_GRAPH_ALIGN_TOP_LEFT);
+
+			$imgMap = $graph->done(
+								    array(
+									        'tohtml' => true,
+									        'border' => 0,
+									        'filename' => $cache_file_name,
+									        'filepath' => './',
+									        'urlpath' => ''
+									    ));
+			//$imgMap = htmlspecialchars($output);
 			save_image_map($cache_file_name.'.map', $imgMap);
 		}
 		else {
@@ -1062,9 +1222,7 @@
 			fclose($imgMap_fp);
 		}
 		$fileModTime = filemtime($cache_file_name.'.map');
-		$return = "\n$imgMap\n";
-		$return .= "<img src='$cache_file_name?modTime=$fileModTime'\n";
-		$return .= "ismap usemap='#pipeline_by_lead_source' border='0'>\n";
+		$return = "\n$imgMap";
 		return $return;
 
 	}




From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 12 14:50:24 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 12 Jun 2006 18:50:24 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23755=3A_?=
 =?utf-8?q?Image_Graph_implementation_for_4=2E2=2E5_jpgraph_replacement?=
In-Reply-To: <076.48939851ba2c8a6f490b5e0d7b8c550b@vtiger.fosslabs.com>
References: <076.48939851ba2c8a6f490b5e0d7b8c550b@vtiger.fosslabs.com>
Message-ID: <085.6086d4db379e6e4c66a4762a657df280@vtiger.fosslabs.com>

#755: Image Graph implementation for 4.2.5 jpgraph replacement
--------------------------+-------------------------------------------------
  Reporter:  jacquemesm   |       Owner:  developer          
      Type:  enhancement  |      Status:  closed             
  Priority:  major        |   Milestone:  4.2.5              
 Component:  vtigercrm    |     Version:  4.2.4rc3           
Resolution:  fixed        |    Keywords:  Image Graph jpgraph
--------------------------+-------------------------------------------------
Comment (by allanbush):

 (In [6999]) Removed old grpahing program.  Refs #755 and #58.

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/755>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 12 14:50:25 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 12 Jun 2006 18:50:25 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=2358=3A_R?=
 =?utf-8?q?eplace_jpgrah_1=2E20=2E3_to_1=2E5=2E2_in_vtigercrm?=
In-Reply-To: <076.36e42b58afdd49562f88d2163d3f4627@vtiger.fosslabs.com>
References: <076.36e42b58afdd49562f88d2163d3f4627@vtiger.fosslabs.com>
Message-ID: <085.8225a2cd83475c2d68e1620db7ab5dea@vtiger.fosslabs.com>

#58: Replace jpgrah 1.20.3 to 1.5.2 in vtigercrm
------------------------+---------------------------------------------------
  Reporter:  fathi      |       Owner:  developer
      Type:  task       |      Status:  closed   
  Priority:  major      |   Milestone:  4.2.5    
 Component:  vtigercrm  |     Version:  4.2.3    
Resolution:  fixed      |    Keywords:           
------------------------+---------------------------------------------------
Comment (by allanbush):

 (In [6999]) Removed old grpahing program.  Refs #755 and #58.

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/58>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 12 14:50:25 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 12 Jun 2006 18:50:25 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r6999 -
	/vtigercrm/branches/4.2/jpgraph/
Message-ID: <20060612185025.BD4B17E8BEE@vtiger.fosslabs.com>

Author: allanbush
Date: Mon Jun 12 12:50:22 2006
New Revision: 6999

Log:
Removed old grpahing program.  Refs #755 and #58.

Removed:
    vtigercrm/branches/4.2/jpgraph/




From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 12 14:53:06 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 12 Jun 2006 18:53:06 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7000 -
	/vtigercrm/branches/4.2/cache/images/
Message-ID: <20060612185306.B62457E8BED@vtiger.fosslabs.com>

Author: allanbush
Date: Mon Jun 12 12:53:04 2006
New Revision: 7000

Log:
Set ignore property to leave generated graphs alone.

Modified:
    vtigercrm/branches/4.2/cache/images/   (props changed)




From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 12 15:00:29 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 12 Jun 2006 19:00:29 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7001 - in
 /vtigercrm/branches/4.2/Image/Canvas/Fonts: VeraCopyright.txt fontmap.txt
Message-ID: <20060612190029.5D06C7E8BED@vtiger.fosslabs.com>

Author: allanbush
Date: Mon Jun 12 13:00:27 2006
New Revision: 7001

Log:
Applied changeset:5124 to the 4.2 branch to improve the font appearence.

Modified:
    vtigercrm/branches/4.2/Image/Canvas/Fonts/VeraCopyright.txt
    vtigercrm/branches/4.2/Image/Canvas/Fonts/fontmap.txt

Modified: vtigercrm/branches/4.2/Image/Canvas/Fonts/VeraCopyright.txt
==============================================================================
--- vtigercrm/branches/4.2/Image/Canvas/Fonts/VeraCopyright.txt (original)
+++ vtigercrm/branches/4.2/Image/Canvas/Fonts/VeraCopyright.txt Mon Jun 12 13:00:27 2006
@@ -1,3 +1,4 @@
+Bitstream Vera Fonts Copyright
 Bitstream Vera Fonts Copyright
 
 The fonts have a generous copyright, allowing derivative works (as
@@ -122,3 +123,126 @@
       "sans", "serif" and "monospace".  Other software (e.g., the XFree86
       core server) has other mechanisms for font substitution.
 
+
+The fonts have a generous copyright, allowing derivative works (as
+long as "Bitstream" or "Vera" are not in the names), and full
+redistribution (so long as they are not *sold* by themselves). They
+can be be bundled, redistributed and sold with any software.
+
+The fonts are distributed under the following copyright:
+
+Copyright
+=========
+
+Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream
+Vera is a trademark of Bitstream, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the fonts accompanying this license ("Fonts") and associated
+documentation files (the "Font Software"), to reproduce and distribute
+the Font Software, including without limitation the rights to use,
+copy, merge, publish, distribute, and/or sell copies of the Font
+Software, and to permit persons to whom the Font Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright and trademark notices and this permission notice
+shall be included in all copies of one or more of the Font Software
+typefaces.
+
+The Font Software may be modified, altered, or added to, and in
+particular the designs of glyphs or characters in the Fonts may be
+modified and additional glyphs or characters may be added to the
+Fonts, only if the fonts are renamed to names not containing either
+the words "Bitstream" or the word "Vera".
+
+This License becomes null and void to the extent applicable to Fonts
+or Font Software that has been modified and is distributed under the
+"Bitstream Vera" names.
+
+The Font Software may be sold as part of a larger software package but
+no copy of one or more of the Font Software typefaces may be sold by
+itself.
+
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL
+BITSTREAM OR THE GNOME FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL,
+OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT
+SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.
+
+Except as contained in this notice, the names of Gnome, the Gnome
+Foundation, and Bitstream Inc., shall not be used in advertising or
+otherwise to promote the sale, use or other dealings in this Font
+Software without prior written authorization from the Gnome Foundation
+or Bitstream Inc., respectively. For further information, contact:
+fonts at gnome dot org.
+
+Copyright FAQ
+=============
+
+   1. I don't understand the resale restriction... What gives?
+
+      Bitstream is giving away these fonts, but wishes to ensure its
+      competitors can't just drop the fonts as is into a font sale system
+      and sell them as is. It seems fair that if Bitstream can't make money
+      from the Bitstream Vera fonts, their competitors should not be able to
+      do so either. You can sell the fonts as part of any software package,
+      however.
+
+   2. I want to package these fonts separately for distribution and
+      sale as part of a larger software package or system.  Can I do so?
+
+      Yes. A RPM or Debian package is a "larger software package" to begin 
+      with, and you aren't selling them independently by themselves. 
+      See 1. above.
+
+   3. Are derivative works allowed?
+      Yes!
+
+   4. Can I change or add to the font(s)?
+      Yes, but you must change the name(s) of the font(s).
+
+   5. Under what terms are derivative works allowed?
+
+      You must change the name(s) of the fonts. This is to ensure the
+      quality of the fonts, both to protect Bitstream and Gnome. We want to
+      ensure that if an application has opened a font specifically of these
+      names, it gets what it expects (though of course, using fontconfig,
+      substitutions could still could have occurred during font
+      opening). You must include the Bitstream copyright. Additional
+      copyrights can be added, as per copyright law. Happy Font Hacking!
+
+   6. If I have improvements for Bitstream Vera, is it possible they might get 
+       adopted in future versions?
+
+      Yes. The contract between the Gnome Foundation and Bitstream has
+      provisions for working with Bitstream to ensure quality additions to
+      the Bitstream Vera font family. Please contact us if you have such
+      additions. Note, that in general, we will want such additions for the
+      entire family, not just a single font, and that you'll have to keep
+      both Gnome and Jim Lyles, Vera's designer, happy! To make sense to add
+      glyphs to the font, they must be stylistically in keeping with Vera's
+      design. Vera cannot become a "ransom note" font. Jim Lyles will be
+      providing a document describing the design elements used in Vera, as a
+      guide and aid for people interested in contributing to Vera.
+
+   7. I want to sell a software package that uses these fonts: Can I do so?
+
+      Sure. Bundle the fonts with your software and sell your software
+      with the fonts. That is the intent of the copyright.
+
+   8. If applications have built the names "Bitstream Vera" into them, 
+      can I override this somehow to use fonts of my choosing?
+
+      This depends on exact details of the software. Most open source
+      systems and software (e.g., Gnome, KDE, etc.) are now converting to
+      use fontconfig (see www.fontconfig.org) to handle font configuration,
+      selection and substitution; it has provisions for overriding font
+      names and subsituting alternatives. An example is provided by the
+      supplied local.conf file, which chooses the family Bitstream Vera for
+      "sans", "serif" and "monospace".  Other software (e.g., the XFree86
+      core server) has other mechanisms for font substitution.
+

Modified: vtigercrm/branches/4.2/Image/Canvas/Fonts/fontmap.txt
==============================================================================
--- vtigercrm/branches/4.2/Image/Canvas/Fonts/fontmap.txt (original)
+++ vtigercrm/branches/4.2/Image/Canvas/Fonts/fontmap.txt Mon Jun 12 13:00:27 2006
@@ -19,6 +19,16 @@
 Times New Roman Bold,timesbd.ttf
 Times New Roman Bold Italic,timesbi.ttf
 Times New Roman Italic,timesi.ttf
+Vera,Vera.ttf
+Vera Bold,VeraBd.ttf
+Vera Italic,VeraIt.ttf
+Vera Bold Italic,VeraBI.ttf
+Vera Mono,VeraMono.ttf
+Vera Bold,VeraMoBd.ttf
+Vera Italic,VeraMoIt.ttf
+Vera Bold Italic,VeraMoBI.ttf
+Vera Serif,VeraSe.ttf
+Vera Serif Bold,VeraSeBd.ttf
 Vera,Vera.ttf
 Vera Bold,VeraBd.ttf
 Vera Italic,VeraIt.ttf




From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 12 16:04:46 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 12 Jun 2006 20:04:46 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231287=3A?=
	=?utf-8?q?_Support_PHP_5?=
In-Reply-To: <076.34213a5e5121e9857e7ff28b81783537@vtiger.fosslabs.com>
References: <076.34213a5e5121e9857e7ff28b81783537@vtiger.fosslabs.com>
Message-ID: <085.c33afe80b056d7434c2946cac2f8d92f@vtiger.fosslabs.com>

#1287: Support PHP 5
------------------------+---------------------------------------------------
  Reporter:  allanbush  |       Owner:  developer
      Type:  defect     |      Status:  new      
  Priority:  major      |   Milestone:  4.2.5    
 Component:  vtigercrm  |     Version:  4.2.4rc3 
Resolution:             |    Keywords:  php5     
------------------------+---------------------------------------------------
Comment (by allanbush):

 (In [7002]) Replaced all instances PearDatabase::quote with $adb->quote as
 part of php 5 support.  Refs #1287 and Closes #65.

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1287>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 12 16:04:46 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 12 Jun 2006 20:04:46 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=2365=3A_S?=
 =?utf-8?q?cope_resolution_operator_=22=3A=3A=22_in_PHP_5?=
In-Reply-To: <076.a8ab3a0deda9c63944e1e856e717ec9f@vtiger.fosslabs.com>
References: <076.a8ab3a0deda9c63944e1e856e717ec9f@vtiger.fosslabs.com>
Message-ID: <085.482b71822dadcd85c5bb242217d0ad02@vtiger.fosslabs.com>

#65: Scope resolution operator "::" in PHP 5
----------------------------------+-----------------------------------------
  Reporter:  m.jacquemes at neuf.fr  |       Owner:  developer            
      Type:  defect               |      Status:  closed               
  Priority:  major                |   Milestone:  4.2.5                
 Component:  vtigercrm            |     Version:  4.2.4rc2             
Resolution:  fixed                |    Keywords:  scope operator search
----------------------------------+-----------------------------------------
Changes (by allanbush):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 (In [7002]) Replaced all instances PearDatabase::quote with $adb->quote as
 part of php 5 support.  Refs #1287 and Closes #65.

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/65>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 12 16:04:47 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 12 Jun 2006 20:04:47 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7002 - in
 /vtigercrm/branches/4.2: data/ modules/Accounts/ modules/Activities/
 modules/Contacts/ modules/CustomView/ modules/Emails/ modules/HelpDesk/
 modules/Invoice/ modules/Notes/ modules/Orders/ modules/Potentials/
 modules/Products/ modules/Quotes/ modules/Reports/ modules/Users/
Message-ID: <20060612200449.0D44A7E8C02@vtiger.fosslabs.com>

Author: allanbush
Date: Mon Jun 12 14:04:34 2006
New Revision: 7002

Log:
Replaced all instances PearDatabase::quote with $adb->quote as part of php 5 support.  Refs #1287 and Closes #65.

Modified:
    vtigercrm/branches/4.2/data/CRMEntity.php
    vtigercrm/branches/4.2/data/SugarBean.php
    vtigercrm/branches/4.2/modules/Accounts/ListView.php
    vtigercrm/branches/4.2/modules/Accounts/Popup.php
    vtigercrm/branches/4.2/modules/Activities/ListView.php
    vtigercrm/branches/4.2/modules/Contacts/ListView.php
    vtigercrm/branches/4.2/modules/Contacts/Popup.php
    vtigercrm/branches/4.2/modules/CustomView/CustomView.php
    vtigercrm/branches/4.2/modules/Emails/ListView.php
    vtigercrm/branches/4.2/modules/HelpDesk/ListView.php
    vtigercrm/branches/4.2/modules/Invoice/ListView.php
    vtigercrm/branches/4.2/modules/Notes/ListView.php
    vtigercrm/branches/4.2/modules/Orders/ListView.php
    vtigercrm/branches/4.2/modules/Orders/PopupSalesOrder.php
    vtigercrm/branches/4.2/modules/Orders/SalesOrderListView.php
    vtigercrm/branches/4.2/modules/Potentials/ListView.php
    vtigercrm/branches/4.2/modules/Potentials/Popup.php
    vtigercrm/branches/4.2/modules/Products/AddProductsToPriceBook.php
    vtigercrm/branches/4.2/modules/Products/ListView.php
    vtigercrm/branches/4.2/modules/Products/PriceBookListView.php
    vtigercrm/branches/4.2/modules/Products/PriceBookPopup.php
    vtigercrm/branches/4.2/modules/Products/VendorListView.php
    vtigercrm/branches/4.2/modules/Products/VendorPopup.php
    vtigercrm/branches/4.2/modules/Quotes/ListView.php
    vtigercrm/branches/4.2/modules/Quotes/Popup.php
    vtigercrm/branches/4.2/modules/Reports/ReportRun.php
    vtigercrm/branches/4.2/modules/Users/ListView.php

Modified: vtigercrm/branches/4.2/data/CRMEntity.php
==============================================================================
--- vtigercrm/branches/4.2/data/CRMEntity.php (original)
+++ vtigercrm/branches/4.2/data/CRMEntity.php Mon Jun 12 14:04:34 2006
@@ -1216,6 +1216,7 @@
 
 	function get_where(&$fields_array)
 	{ 
+		global $adb;
 		$where_clause = "WHERE "; 
 		$first = 1; 
 		foreach ($fields_array as $name=>$value) 
@@ -1229,7 +1230,7 @@
 				$where_clause .= " AND ";
 			} 
 
-			$where_clause .= "$name = ".PearDatabase::quote($value)."";
+			$where_clause .= "$name = ".$adb->quote($value)."";
 		} 
 
 		$where_clause .= " AND deleted=0";
@@ -1284,6 +1285,7 @@
 	*/
 	function build_generic_where_clause($value){
 			$where_clause = "WHERE "; 
+		global $adb;
 		$first = 1; 
 		foreach ($fields_array as $name=>$value) 
 		{ 
@@ -1296,7 +1298,7 @@
 				$where_clause .= " or";
 			} 
 
-			$where_clause .= "$name = ".PearDatabase::quote($value)."";
+			$where_clause .= "$name = ".$adb->quote($value)."";
 		} 
 
 		$where_clause .= " AND deleted=0";

Modified: vtigercrm/branches/4.2/data/SugarBean.php
==============================================================================
--- vtigercrm/branches/4.2/data/SugarBean.php (original)
+++ vtigercrm/branches/4.2/data/SugarBean.php Mon Jun 12 14:04:34 2006
@@ -116,11 +116,6 @@
 						$insValues = $insValues.", ";
 					}
 				}
-				/*else
-					$query = $query.", ";
-	
-				$query = $query.$field."='".PearDatabase::quote(from_html($this->$field,$isUpdate))."'";
-				*/
 				if($isUpdate)
 				{
 					$updKeyValues = $updKeyValues.$field."=".$this->db->formatString($this->table_name,$field,from_html($this->$field,$isUpdate));
@@ -553,6 +548,7 @@
 
 	function get_where(&$fields_array)
 	{ 
+		global $adb;
 		$where_clause = "WHERE "; 
 		$first = 1; 
 		foreach ($fields_array as $name=>$value) 
@@ -566,7 +562,7 @@
 				$where_clause .= " AND ";
 			} 
 
-			$where_clause .= "$name = ".PearDatabase::quote($value)."";
+			$where_clause .= "$name = ".$adb->quote($value)."";
 		} 
 
 		$where_clause .= " AND deleted=0";
@@ -621,6 +617,7 @@
 	*/
 	function build_generic_where_clause($value){
 			$where_clause = "WHERE "; 
+		global $adb;
 		$first = 1; 
 		foreach ($fields_array as $name=>$value) 
 		{ 
@@ -633,7 +630,7 @@
 				$where_clause .= " or";
 			} 
 
-			$where_clause .= "$name = ".PearDatabase::quote($value)."";
+			$where_clause .= "$name = ".$adb->quote($value)."";
 		} 
 
 		$where_clause .= " AND deleted=0";

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 Mon Jun 12 14:04:34 2006
@@ -99,83 +99,83 @@
 
 	if(isset($name) && $name != "")
 	{
-		array_push($where_clauses, "account.accountname ".$adb->getLike()." ".PearDatabase::quote($name."%"));
+		array_push($where_clauses, "account.accountname ".$adb->getLike()." ".$adb->quote($name."%"));
 		$url_string .= "&accountname=".$name;
 	}
 	if(isset($website) && $website != "")
 	{
-		array_push($where_clauses, "account.website ".$adb->getLike()." ".PearDatabase::quote("%".$website."%"));
+		array_push($where_clauses, "account.website ".$adb->getLike()." ".$adb->quote("%".$website."%"));
 		$url_string .= "&website=".$website;
 	}
 	if(isset($phone) && $phone != "")
 	{
-		array_push($where_clauses, "(account.phone ".$adb->getLike()." ".PearDatabase::quote("%".$phone."%")." OR account.otherphone ".$adb->getLike()." ".PearDatabase::quote("%".$phone."%")." OR account.fax ".$adb->getLike()." ".PearDatabase::quote("%".$phone."%").")");
+		array_push($where_clauses, "(account.phone ".$adb->getLike()." ".$adb->quote("%".$phone."%")." OR account.otherphone ".$adb->getLike()." ".$adb->quote("%".$phone."%")." OR account.fax ".$adb->getLike()." ".$adb->quote("%".$phone."%").")");
 		$url_string .= "&phone=".$phone;
 	}
 	if(isset($annual_revenue) && $annual_revenue != "")
 	{
-		array_push($where_clauses, "account.annualrevenue ".$adb->getLike()." ".PearDatabase::quote($annual_revenue."%"));
+		array_push($where_clauses, "account.annualrevenue ".$adb->getLike()." ".$adb->quote($annual_revenue."%"));
 		$url_string .= "&annual_revenue=".$annual_revenue;
 	}
 	if(isset($employees) && $employees != "")
 	{
-		array_push($where_clauses, "account.employees ".$adb->getLike()." ".PearDatabase::quote($employees."%"));
+		array_push($where_clauses, "account.employees ".$adb->getLike()." ".$adb->quote($employees."%"));
 		$url_string .= "&employees=".$employees;
 	}
 	if(isset($address_street) && $address_street != "")
 	{
-		array_push($where_clauses, "(accountbillads.street ".$adb->getLike()." ".PearDatabase::quote($address_street."%")." OR accountshipads.street ".$adb->getLike()." ".PearDatabase::quote($address_street."%").")");
+		array_push($where_clauses, "(accountbillads.street ".$adb->getLike()." ".$adb->quote($address_street."%")." OR accountshipads.street ".$adb->getLike()." ".$adb->quote($address_street."%").")");
 		$url_string .= "&address_street=".$address_street;
 	}
 	if(isset($address_city) && $address_city != "")
 	{
-		array_push($where_clauses, "(accountbillads.city ".$adb->getLike()." ".PearDatabase::quote($address_city."%")." OR accountshipads.city ".$adb->getLike()." ".PearDatabase::quote($address_city."%").")");
+		array_push($where_clauses, "(accountbillads.city ".$adb->getLike()." ".$adb->quote($address_city."%")." OR accountshipads.city ".$adb->getLike()." ".$adb->quote($address_city."%").")");
 		$url_string .= "&bill_city=".$address_city;
 	}
 	if(isset($address_state) && $address_state != "")
 	{
-		array_push($where_clauses, "(accountbillads.state ".$adb->getLike()." ".PearDatabase::quote($address_state."%")." OR accountshipads.state ".$adb->getLike()." ".PearDatabase::quote($address_state."%").")");
+		array_push($where_clauses, "(accountbillads.state ".$adb->getLike()." ".$adb->quote($address_state."%")." OR accountshipads.state ".$adb->getLike()." ".$adb->quote($address_state."%").")");
 		$url_string .= "&bill_state=".$address_state;
 	}
 	if(isset($address_postalcode) && $address_postalcode != "")
 	{
-		array_push($where_clauses, "(accountbillads.code ".$adb->getLike()." ".PearDatabase::quote($address_postalcode."%")." OR accountshipads.code ".$adb->getLike()." ".PearDatabase::quote($address_postalcode."%").")");
+		array_push($where_clauses, "(accountbillads.code ".$adb->getLike()." ".$adb->quote($address_postalcode."%")." OR accountshipads.code ".$adb->getLike()." ".$adb->quote($address_postalcode."%").")");
 		$url_string .= "&bill_code=".$address_postalcode;
 	}
 	if(isset($address_country) && $address_country != "")
 	{
-		array_push($where_clauses, "(accountbillads.country ".$adb->getLike()." ".PearDatabase::quote($address_country."%")." OR accountshipads.country ".$adb->getLike()." ".PearDatabase::quote($address_country."%").")");
+		array_push($where_clauses, "(accountbillads.country ".$adb->getLike()." ".$adb->quote($address_country."%")." OR accountshipads.country ".$adb->getLike()." ".$adb->quote($address_country."%").")");
 		$url_string .= "&bill_country=".$address_country;
 	}
 	if(isset($email) && $email != "")
 	{
-		array_push($where_clauses, "(account.email1 ".$adb->getLike()." ".PearDatabase::quote($email."%")." OR account.email2 ".$adb->getLike()." ".PearDatabase::quote($email."%").")");
+		array_push($where_clauses, "(account.email1 ".$adb->getLike()." ".$adb->quote($email."%")." OR account.email2 ".$adb->getLike()." ".$adb->quote($email."%").")");
 		$url_string .= "&email=".$email;
 	}
 	if(isset($industry) && $industry != "")
 	{
-		array_push($where_clauses, "account.industry = ".PearDatabase::quote($industry));
+		array_push($where_clauses, "account.industry = ".$adb->quote($industry));
 		$url_string .= "&industry=".$industry;
 	}
 	if(isset($ownership) && $ownership != "")
 	{
-	 	array_push($where_clauses, "account.ownership ".$adb->getLike()." ".PearDatabase::quote($ownership."%"));
+	 	array_push($where_clauses, "account.ownership ".$adb->getLike()." ".$adb->quote($ownership."%"));
 		$url_string .= "&ownership=".$ownership;
 	}
-	if(isset($rating) && $rating != "") array_push($where_clauses, "account.rating ".$adb->getLike()." ".PearDatabase::quote($rating."%"));
+	if(isset($rating) && $rating != "") array_push($where_clauses, "account.rating ".$adb->getLike()." ".$adb->quote($rating."%"));
 	if(isset($sic_code) && $sic_code != "")
 	{
-		array_push($where_clauses, "account.siccode ".$adb->getLike()." ".PearDatabase::quote($sic_code."%"));
+		array_push($where_clauses, "account.siccode ".$adb->getLike()." ".$adb->quote($sic_code."%"));
 		$url_string .= "&siccode=".$sic_code;
 	}
 	if(isset($ticker_symbol) && $ticker_symbol != "")
 	{
-		array_push($where_clauses, "account.tickersymbol ".$adb->getLike()." ".PearDatabase::quote($ticker_symbol."%"));
+		array_push($where_clauses, "account.tickersymbol ".$adb->getLike()." ".$adb->quote($ticker_symbol."%"));
 		$url_string .= "&tickersymbol=".$ticker_symbol;
 	}
 	if(isset($account_type) && $account_type != "")
 	{
-		array_push($where_clauses, "account.account_type = ".PearDatabase::quote($account_type));
+		array_push($where_clauses, "account.account_type = ".$adb->quote($account_type));
 		$url_string .= "&accounttype=".$account_type;
 	}
 	if(isset($current_user_only) && $current_user_only != "")
@@ -197,7 +197,7 @@
 		}
 		$where .= "crmentity.smownerid IN(";
 		foreach ($assigned_user_id as $key => $val) {
-			$where .= PearDatabase::quote($val);
+			$where .= $adb->quote($val);
 			$where .= ($key == count($assigned_user_id) - 1) ? ")" : ", ";
 			   // ACIPIA - to allow prev/next button to use criterias
 			  $url_string .= '&' . urlencode( 'assigned_user_id[]' ) . '=' . $val ;

Modified: vtigercrm/branches/4.2/modules/Accounts/Popup.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Accounts/Popup.php (original)
+++ vtigercrm/branches/4.2/modules/Accounts/Popup.php Mon Jun 12 14:04:34 2006
@@ -89,16 +89,16 @@
 //upto this added for Custom Field
 */	
 	if(isset($name) && $name != ""){
-		array_push($where_clauses, "account.accountname ".$adb->getLike()." ".PearDatabase::quote($name."%"));
+		array_push($where_clauses, "account.accountname ".$adb->getLike()." ".$adb->quote($name."%"));
 		$url_string .= "&name=".$name;
 	}
-	if(isset($website) && $website != "") array_push($where_clauses, "account.website ".$adb->getLike()." ".PearDatabase::quote("%".$website."%"));
-	if(isset($phone) && $phone != "") array_push($where_clauses, "(account.phone ".$adb->getLike()." ".PearDatabase::quote("%".$phone."%")." OR account.otherphone ".$adb->getLike()." ".PearDatabase::quote("%".$phone."%")." OR account.fax ".$adb->getLike()." ".PearDatabase::quote("%".$phone."%").")");
+	if(isset($website) && $website != "") array_push($where_clauses, "account.website ".$adb->getLike()." ".$adb->quote("%".$website."%"));
+	if(isset($phone) && $phone != "") array_push($where_clauses, "(account.phone ".$adb->getLike()." ".$adb->quote("%".$phone."%")." OR account.otherphone ".$adb->getLike()." ".$adb->quote("%".$phone."%")." OR account.fax ".$adb->getLike()." ".$adb->quote("%".$phone."%").")");
 	if(isset($address_city) && $address_city != ""){
-		array_push($where_clauses, "(accountbillads.city ".$adb->getLike()." ".PearDatabase::quote("%".$address_city."%")." OR accountshipads.city ".$adb->getLike()." ".PearDatabase::quote($address_city."%").")");
+		array_push($where_clauses, "(accountbillads.city ".$adb->getLike()." ".$adb->quote("%".$address_city."%")." OR accountshipads.city ".$adb->getLike()." ".$adb->quote($address_city."%").")");
 		$url_string .= "&address_city=".$address_city;
 	}
-	if(isset($ownership) && $ownership != "") array_push($where_clauses, "account.ownership ".$adb->getLike()." ".PearDatabase::quote($ownership."%"));
+	if(isset($ownership) && $ownership != "") array_push($where_clauses, "account.ownership ".$adb->getLike()." ".$adb->quote($ownership."%"));
 	if(isset($current_user_only) && $current_user_only != ""){
 		array_push($where_clauses, "crmentity.smownerid='$current_user->id'");
 		$url_string .= "&current_user_only=".$current_user_only;
@@ -118,7 +118,7 @@
 		}
 		$where .= "crmentity.smownerid IN(";
 		foreach ($assigned_user_id as $key => $val) {
-			$where .= PearDatabase::quote($val);
+			$where .= $adb->quote($val);
 			$where .= ($key == count($assigned_user_id) - 1) ? ")" : ", ";
 		}
 	}

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 Mon Jun 12 14:04:34 2006
@@ -119,20 +119,20 @@
 	}
 	if(isset($name) && $name != '')
 	{
-		array_push($where_clauses, "activity.subject ".$adb->getLike()." ".PearDatabase::quote($name.'%')."");
+		array_push($where_clauses, "activity.subject ".$adb->getLike()." ".$adb->quote($name.'%')."");
 		$url_string .= "&name=".$name;
 	}
 	if(isset($contactname) && $contactname != '')
 	{
 		//$contactnames = explode(" ", $contactname);
 		//foreach ($contactnames as $name) {
-		array_push($where_clauses, "(contactdetails.firstname ".$adb->getLike()." ".PearDatabase::quote($contactname.'%')." OR contactdetails.lastname ".$adb->getLike()." ".PearDatabase::quote($contactname.'%').")");
+		array_push($where_clauses, "(contactdetails.firstname ".$adb->getLike()." ".$adb->quote($contactname.'%')." OR contactdetails.lastname ".$adb->getLike()." ".$adb->quote($contactname.'%').")");
 		$url_string .= "&contactname=".$contactname;
 		//}
 	}
 	if(isset($duedate) && $duedate != '')
 	{
-		array_push($where_clauses, "activity.duedate ".$adb->getLike()." ".PearDatabase::quote($datedue.'%')."");
+		array_push($where_clauses, "activity.duedate ".$adb->getLike()." ".$adb->quote($datedue.'%')."");
 	}
 	if(isset($status) && $status != '')
 	{
@@ -141,7 +141,7 @@
 		$the_where_clause = "(";
 		$val = reset($each_status);
 		do {
-			$the_where_clause .= "activity.status = ".PearDatabase::quote($val);
+			$the_where_clause .= "activity.status = ".$adb->quote($val);
 			$val = next($each_status);
 			if ($val) $the_where_clause .= " OR ";
 		} while($val);

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 Mon Jun 12 14:04:34 2006
@@ -101,59 +101,59 @@
 
 
 	if(isset($lastname) && $lastname != "") {
-			array_push($where_clauses, "contactdetails.lastname ".$adb->getLike()." ".PearDatabase::quote($lastname.'%')."");
+			array_push($where_clauses, "contactdetails.lastname ".$adb->getLike()." ".$adb->quote($lastname.'%')."");
 			$url_string .= "&lastname=".$lastname;
 	}
 	if(isset($firstname) && $firstname != "") {
-			array_push($where_clauses, "contactdetails.firstname ".$adb->getLike()." ".PearDatabase::quote($firstname.'%')."");
+			array_push($where_clauses, "contactdetails.firstname ".$adb->getLike()." ".$adb->quote($firstname.'%')."");
 			$url_string .= "&firstname=".$firstname;
 	}
 	if(isset($accountname) && $accountname != "")	{
-			array_push($where_clauses, "account.accountname ".$adb->getLike()." ".PearDatabase::quote($accountname.'%')."");
+			array_push($where_clauses, "account.accountname ".$adb->getLike()." ".$adb->quote($accountname.'%')."");
 			$url_string .= "&accountname=".$accountname;
 	}
 	if(isset($leadsource) && $leadsource != "") {
-			array_push($where_clauses, "contactsubdetails.leadsource = ".PearDatabase::quote($leadsource)."");
+			array_push($where_clauses, "contactsubdetails.leadsource = ".$adb->quote($leadsource)."");
 			$url_string .= "&leadsource=".$leadsource;
 	}
 	if(isset($donotcall) && $donotcall != "") {
-			array_push($where_clauses, "contactdetails.donotcall = ".PearDatabase::quote($donotcall)."");
+			array_push($where_clauses, "contactdetails.donotcall = ".$adb->quote($donotcall)."");
 			$url_string .= "&donotcall=".$donotcall;
 	}
 	if(isset($phone) && $phone != "") {
-			array_push($where_clauses, "(contactdetails.phone ".$adb->getLike()." ".PearDatabase::quote('%'.$phone.'%')." OR contactdetails.mobile ".$adb->getLike()." ".PearDatabase::quote('%'.$phone.'%')." OR contactdetails.fax ".$adb->getLike()." ".PearDatabase::quote('%'.$phone.'%').")");
+			array_push($where_clauses, "(contactdetails.phone ".$adb->getLike()." ".$adb->quote('%'.$phone.'%')." OR contactdetails.mobile ".$adb->getLike()." ".$adb->quote('%'.$phone.'%')." OR contactdetails.fax ".$adb->getLike()." ".$adb->quote('%'.$phone.'%').")");
 			$url_string .= "&phone=".$phone;
 	}
 	if(isset($email) && $email != "") {
-			array_push($where_clauses, "(contactdetails.email ".$adb->getLike()." ".PearDatabase::quote($email.'%').")");
+			array_push($where_clauses, "(contactdetails.email ".$adb->getLike()." ".$adb->quote($email.'%').")");
 			$url_string .= "&email=".$email;
 	}
 	if(isset($yahooid) && $yahooid != "") {
-			array_push($where_clauses, "contactdetails.yahooid ".$adb->getLike()." ".PearDatabase::quote($yahooid.'%')."");
+			array_push($where_clauses, "contactdetails.yahooid ".$adb->getLike()." ".$adb->quote($yahooid.'%')."");
 			$url_string .= "&yahooid=".$yahooid;
 	}
 	if(isset($assistant) && $assistant != "") {
-			array_push($where_clauses, "contactsubdetails.assistant ".$adb->getLike()." ".PearDatabase::quote($assistant.'%')."");
+			array_push($where_clauses, "contactsubdetails.assistant ".$adb->getLike()." ".$adb->quote($assistant.'%')."");
 			$url_string .= "&yahooid=".$yahooid;
 	}
 	if(isset($mailingstreet) && $mailingstreet != "") {
-			array_push($where_clauses, "(contactaddress.mailingstreet ".$adb->getLike()." ".PearDatabase::quote($mailingstreet.'%')." OR contactaddress.otherstreet ".$adb->getLike()." ".PearDatabase::quote($mailingstreet.'%').")");
+			array_push($where_clauses, "(contactaddress.mailingstreet ".$adb->getLike()." ".$adb->quote($mailingstreet.'%')." OR contactaddress.otherstreet ".$adb->getLike()." ".$adb->quote($mailingstreet.'%').")");
 			$url_string .= "&mailingstreet=".$mailingstreet;
 	}
 	if(isset($mailingcity) && $mailingcity != "") {
-			array_push($where_clauses, "(contactaddress.mailingcity ".$adb->getLike()." ".PearDatabase::quote($mailingcity.'%')." OR contactaddress.othercity ".$adb->getLike()." ".PearDatabase::quote($mailingcity.'%').")");
+			array_push($where_clauses, "(contactaddress.mailingcity ".$adb->getLike()." ".$adb->quote($mailingcity.'%')." OR contactaddress.othercity ".$adb->getLike()." ".$adb->quote($mailingcity.'%').")");
 			$url_string .= "&mailingcity=".$mailingcity;
 	}
 	if(isset($mailingstate) && $mailingstate != "") {
-			array_push($where_clauses, "(contactaddress.mailingstate ".$adb->getLike()." ".PearDatabase::quote($mailingstate.'%')." OR contactaddress.otherstate ".$adb->getLike()." ".PearDatabase::quote($mailingstate.'%').")");
+			array_push($where_clauses, "(contactaddress.mailingstate ".$adb->getLike()." ".$adb->quote($mailingstate.'%')." OR contactaddress.otherstate ".$adb->getLike()." ".$adb->quote($mailingstate.'%').")");
 			$url_string .= "&mailingstate=".$mailingstate;
 	}
 	if(isset($mailingzip) && $mailingzip != "") {
-			array_push($where_clauses, "(contactaddress.mailingzip ".$adb->getLike()." ".PearDatabase::quote($mailingzip.'%')." OR contactaddress.otherzip ".$adb->getLike()." ".PearDatabase::quote($mailingzip.'%').")");
+			array_push($where_clauses, "(contactaddress.mailingzip ".$adb->getLike()." ".$adb->quote($mailingzip.'%')." OR contactaddress.otherzip ".$adb->getLike()." ".$adb->quote($mailingzip.'%').")");
 			$url_string .= "&mailingzip=".$mailingzip;
 	}
 	if(isset($mailingcountry) && $mailingcountry != "") {
-			array_push($where_clauses, "(contactaddress.mailingcountry ".$adb->getLike()." ".PearDatabase::quote($mailingcountry.'%')." OR contactaddress.othercountry ".$adb->getLike()." ".PearDatabase::quote($mailingcountry.'%').")");
+			array_push($where_clauses, "(contactaddress.mailingcountry ".$adb->getLike()." ".$adb->quote($mailingcountry.'%')." OR contactaddress.othercountry ".$adb->getLike()." ".$adb->quote($mailingcountry.'%').")");
 			$url_string .= "&mailingcountry=".$mailingcountry;
 	}
 	if(isset($current_user_only) && $current_user_only != "") {
@@ -183,7 +183,7 @@
 		}
 		$where .= "crmentity.smownerid IN(";
 		foreach ($assigned_user_id as $key => $val) {
-			$where .= "".PearDatabase::quote($val)."";
+			$where .= "".$adb->quote($val)."";
 			$where .= ($key == count($assigned_user_id) - 1) ? ")" : ", ";
 			// ACIPIA - to allow prev/next button to use criterias
 		        $url_string .= '&' . urlencode( 'assigned_user_id[]' ) . '=' . $val ;

Modified: vtigercrm/branches/4.2/modules/Contacts/Popup.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Contacts/Popup.php (original)
+++ vtigercrm/branches/4.2/modules/Contacts/Popup.php Mon Jun 12 14:04:34 2006
@@ -86,15 +86,15 @@
 	$where_clauses = Array();
 
 	if(isset($lastname) && $lastname != "") {
-			array_push($where_clauses, "contactdetails.lastname ".$adb->getLike()." ".PearDatabase::quote($lastname.'%')."");
+			array_push($where_clauses, "contactdetails.lastname ".$adb->getLike()." ".$adb->quote($lastname.'%')."");
 			$url_string .= "&lastname=".$lastname;
 	}
 	if(isset($firstname) && $firstname != "") {
-			array_push($where_clauses, "contactdetails.firstname ".$adb->getLike()." ".PearDatabase::quote($firstname.'%')."");
+			array_push($where_clauses, "contactdetails.firstname ".$adb->getLike()." ".$adb->quote($firstname.'%')."");
 			$url_string .= "&firstname=".$firstname;
 	}
 	if(isset($title) && $title != "")	{
-			array_push($where_clauses, "contactdetails.title ".$adb->getLike()." ".PearDatabase::quote("%".$title.'%')."");
+			array_push($where_clauses, "contactdetails.title ".$adb->getLike()." ".$adb->quote("%".$title.'%')."");
 			$url_string .= "&title=".$title;
 	}
 	if(isset($current_user_only) && $current_user_only != "") {

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 Mon Jun 12 14:04:34 2006
@@ -821,7 +821,7 @@
 		{
 			if(trim($value) != "")
                         {
-                                $rtvalue = " = ".PearDatabase::quote($value);
+                                $rtvalue = " = ".$adb->quote($value);
                         }else
                         {
                                 $rtvalue = " is NULL";
@@ -831,7 +831,7 @@
 		{
 			if(trim($value) != "")
                         {
-                                $rtvalue = " <> ".PearDatabase::quote($value);
+                                $rtvalue = " <> ".$adb->quote($value);
                         }else
                         {
                                 $rtvalue = "is NOT NULL";
@@ -839,31 +839,31 @@
 		}
 		if($comparator == "s")
 		{
-			$rtvalue = " ".$adb->getLike()." ".PearDatabase::quote($value."%");
+			$rtvalue = " ".$adb->getLike()." ".$adb->quote($value."%");
 		}
 		if($comparator == "c")
 		{
-			$rtvalue = " ".$adb->getLike()." ".PearDatabase::quote("%".$value."%");
+			$rtvalue = " ".$adb->getLike()." ".$adb->quote("%".$value."%");
 		}
 		if($comparator == "k")
 		{
-			$rtvalue = " not ".$adb->getLike()." ".PearDatabase::quote("%".$value."%");
+			$rtvalue = " not ".$adb->getLike()." ".$adb->quote("%".$value."%");
 		}
 		if($comparator == "l")
 		{
-			$rtvalue = " < ".PearDatabase::quote($value);
+			$rtvalue = " < ".$adb->quote($value);
 		}
 		if($comparator == "g")
 		{
-			$rtvalue = " > ".PearDatabase::quote($value);
+			$rtvalue = " > ".$adb->quote($value);
 		}
 		if($comparator == "m")
 		{
-			$rtvalue = " <= ".PearDatabase::quote($value);
+			$rtvalue = " <= ".$adb->quote($value);
 		}
 		if($comparator == "h")
 		{
-			$rtvalue = " >= ".PearDatabase::quote($value);
+			$rtvalue = " >= ".$adb->quote($value);
 		}
 		
 		return $rtvalue;

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 Mon Jun 12 14:04:34 2006
@@ -219,19 +219,19 @@
 	}
 	if(isset($name) && $name != '')
 	{
-		array_push($where_clauses, "activity.subject ".$adb->getLike()." ".PearDatabase::quote($name.'%')."");
+		array_push($where_clauses, "activity.subject ".$adb->getLike()." ".$adb->quote($name.'%')."");
 		$url_string .= "&subject=".$name;
 
 	}
 	if(isset($contactname) && $contactname != '')
 	{
-		array_push($where_clauses, "(contactdetails.firstname ".$adb->getLike()." ".PearDatabase::quote($contactname.'%')." OR contactdetails.lastname ".$adb->getLike()." ".PearDatabase::quote($contactname.'%').")");
+		array_push($where_clauses, "(contactdetails.firstname ".$adb->getLike()." ".$adb->quote($contactname.'%')." OR contactdetails.lastname ".$adb->getLike()." ".$adb->quote($contactname.'%').")");
 		$url_string .= "&contactname=".$contactname;
 
 	}
 	if(isset($date_start) && $date_start != '')
 	{
-		array_push($where_clauses, "events.eventdatestart ".$adb->getLike()." ".PearDatabase::quote($date_start.'%')."");
+		array_push($where_clauses, "events.eventdatestart ".$adb->getLike()." ".$adb->quote($date_start.'%')."");
 	}
 	if(isset($location) && $location != '')
 	{
@@ -241,7 +241,7 @@
 		$val = reset($each_location);
 		do
 		{
-			$the_where_clause .= "location = ".PearDatabase::quote($val)."";
+			$the_where_clause .= "location = ".$adb->quote($val)."";
 			$val = next($each_location);
 			if ($val) $the_where_clause .= " OR ";
 		} while($val);

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 Mon Jun 12 14:04:34 2006
@@ -95,7 +95,7 @@
 	}
 	if(isset($contact_name) && $contact_name != "")
 	{
-		array_push($where_clauses, "(contactdetails.firstname ".$adb->getLike()."".PearDatabase::quote($contact_name.'%')." OR contactdetails.lastname ".$adb->getLike()." ".PearDatabase::quote($contact_name.'%').")");
+		array_push($where_clauses, "(contactdetails.firstname ".$adb->getLike()."".$adb->quote($contact_name.'%')." OR contactdetails.lastname ".$adb->getLike()." ".$adb->quote($contact_name.'%').")");
 		$url_string .= "&contact_name=".$contact_name;
 
 	}

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 Mon Jun 12 14:04:34 2006
@@ -82,12 +82,12 @@
 	
 	if(isset($subject) && $subject != "") 
 	{
-		array_push($where_clauses, "invoice.subject ".$adb->getLike()." ".PearDatabase::quote($subject."%"));
+		array_push($where_clauses, "invoice.subject ".$adb->getLike()." ".$adb->quote($subject."%"));
 		$url_string .= "&subject=".$subject;
 	}
 	if(isset($salesorder) && $salesorder != "")
 	{
-		array_push($where_clauses, "salesorder.subject ".$adb->getLike()." ".PearDatabase::quote("%".$salesorder."%"));
+		array_push($where_clauses, "salesorder.subject ".$adb->getLike()." ".$adb->quote("%".$salesorder."%"));
 		$url_string .= "&salesorder=".$salesorder;
 	}
 	
@@ -105,7 +105,7 @@
 		}
 		$where .= "crmentity.smownerid IN(";
 		foreach ($assigned_user_id as $key => $val) {
-			$where .= PearDatabase::quote($val);
+			$where .= $adb->quote($val);
 			$where .= ($key == count($assigned_user_id) - 1) ? ")" : ", ";
 		}
 	}

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 Mon Jun 12 14:04:34 2006
@@ -106,14 +106,14 @@
 
 	if(isset($name) && $name != '')
 	{
-		array_push($where_clauses, "notes.title ".$adb->getLike()." ".PearDatabase::quote($name.'%')."");
+		array_push($where_clauses, "notes.title ".$adb->getLike()." ".$adb->quote($name.'%')."");
 		$url_string .= "&title=".$name;
 	}
 	if(isset($contact_name) && $contact_name != '')
 	{
 		$contact_names = explode(" ", $contact_name);
 		foreach ($contact_names as $name) {
-			array_push($where_clauses, "(contactdetails.firstname ".$adb->getLike()." ".PearDatabase::quote($name.'%')." OR contactdetails.lastname ".$adb->getLike()." ".PearDatabase::quote($name.'%').")");
+			array_push($where_clauses, "(contactdetails.firstname ".$adb->getLike()." ".$adb->quote($name.'%')." OR contactdetails.lastname ".$adb->getLike()." ".$adb->quote($name.'%').")");
 		}
 		$url_string .= "&contact_name=".$contact_name;
 	}

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 Mon Jun 12 14:04:34 2006
@@ -83,17 +83,17 @@
 	
 	if(isset($subject) && $subject != "") 
 	{
-		array_push($where_clauses, "purchaseorder.subject ".$adb->getLike()." ".PearDatabase::quote($subject."%"));
+		array_push($where_clauses, "purchaseorder.subject ".$adb->getLike()." ".$adb->quote($subject."%"));
 		$url_string .= "&subject=".$subject;
 	}
 	if(isset($vendorname) && $vendorname != "")
 	{
-		array_push($where_clauses, "vendor.vendorname ".$adb->getLike()." ".PearDatabase::quote("%".$vendorname."%"));
+		array_push($where_clauses, "vendor.vendorname ".$adb->getLike()." ".$adb->quote("%".$vendorname."%"));
 		$url_string .= "&vendorname=".$vendorname;
 	}
 	if(isset($trackingno) && $trackingno != "")
 	{
-		array_push($where_clauses, "purchaseorder.tracking_no ".$adb->getLike()." ".PearDatabase::quote("%".$trackingno."%"));
+		array_push($where_clauses, "purchaseorder.tracking_no ".$adb->getLike()." ".$adb->quote("%".$trackingno."%"));
 		$url_string .= "&trackingno=".$trackingno;
 	}
 	
@@ -111,7 +111,7 @@
 		}
 		$where .= "crmentity.smownerid IN(";
 		foreach ($assigned_user_id as $key => $val) {
-			$where .= PearDatabase::quote($val);
+			$where .= $adb->quote($val);
 			$where .= ($key == count($assigned_user_id) - 1) ? ")" : ", ";
 		}
 	}

Modified: vtigercrm/branches/4.2/modules/Orders/PopupSalesOrder.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Orders/PopupSalesOrder.php (original)
+++ vtigercrm/branches/4.2/modules/Orders/PopupSalesOrder.php Mon Jun 12 14:04:34 2006
@@ -61,21 +61,21 @@
 
 	if (isset($subject) && $subject !='')
 	{
-		array_push($where_clauses, "salesorder.subject ".$adb->getLike()." ".PearDatabase::quote($subject.'%'));
+		array_push($where_clauses, "salesorder.subject ".$adb->getLike()." ".$adb->quote($subject.'%'));
 		//$search_query .= " and productname ".$adb->getLike()." '".$productname."%'";
 		$url_string .= "&subject=".$subject;
 	}
 	
 	if (isset($accountname) && $accountname !='')
 	{
-		array_push($where_clauses, "account.accountname ".$adb->getLike()." ".PearDatabase::quote($accountname.'%'));
+		array_push($where_clauses, "account.accountname ".$adb->getLike()." ".$adb->quote($accountname.'%'));
 		//$search_query .= " and productcode ".$adb->getLike()." '".$productcode."%'";
 		$url_string .= "&accountname=".$accountname;
 	}
 
 	if (isset($quotename) && $quotename !='')
 	{
-		array_push($where_clauses, "quotes.subject ".$adb->getLike()." ".PearDatabase::quote($quotename.'%'));
+		array_push($where_clauses, "quotes.subject ".$adb->getLike()." ".$adb->quote($quotename.'%'));
 		 //$search_query .= " and commissionrate ".$adb->getLike()." '".$commissionrate."%'";
 		 $url_string .= "&quotename=".$quotename;
 	}

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 Mon Jun 12 14:04:34 2006
@@ -83,21 +83,21 @@
 
 	if (isset($subject) && $subject !='')
 	{
-		array_push($where_clauses, "salesorder.subject ".$adb->getLike()." ".PearDatabase::quote($subject.'%'));
+		array_push($where_clauses, "salesorder.subject ".$adb->getLike()." ".$adb->quote($subject.'%'));
 		//$search_query .= " and productname ".$adb->getLike()." '".$productname."%'";
 		$url_string .= "&subject=".$subject;
 	}
 	
 	if (isset($accountname) && $accountname !='')
 	{
-		array_push($where_clauses, "account.accountname ".$adb->getLike()." ".PearDatabase::quote($accountname.'%'));
+		array_push($where_clauses, "account.accountname ".$adb->getLike()." ".$adb->quote($accountname.'%'));
 		//$search_query .= " and productcode ".$adb->getLike()." '".$productcode."%'";
 		$url_string .= "&accountname=".$accountname;
 	}
 
 	if (isset($quotename) && $quotename !='')
 	{
-		array_push($where_clauses, "quotes.subject ".$adb->getLike()." ".PearDatabase::quote($quotename.'%'));
+		array_push($where_clauses, "quotes.subject ".$adb->getLike()." ".$adb->quote($quotename.'%'));
 		 //$search_query .= " and commissionrate ".$adb->getLike()." '".$commissionrate."%'";
 		 $url_string .= "&quotename=".$quotename;
 	}

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 Mon Jun 12 14:04:34 2006
@@ -93,46 +93,46 @@
 //upto this added for Custom Field
 
 	if(isset($name) && $name != "") {
-			array_push($where_clauses, "potential.potentialname ".$adb->getLike()." ".PearDatabase::quote($name.'%')."");
+		array_push($where_clauses, "potential.potentialname ".$adb->getLike()." ".$adb->quote($name.'%')."");
 			$url_string .= "&potentialname=".$name;
 	}
 	if(isset($accountname) && $accountname != "") {
-			array_push($where_clauses, "account.accountname ".$adb->getLike()." ".PearDatabase::quote($accountname.'%')."");
-			$url_string .= "&accountname=".$accountname;
+		array_push($where_clauses, "account.accountname ".$adb->getLike()." ".$adb->quote($accountname.'%')."");
+		$url_string .= "&accountname=".$accountname;
 
 
 	}
 	if(isset($lead_source) && $lead_source == "None") {
-			array_push($where_clauses, "potential.leadsource = ".PearDatabase::quote($lead_source)."");
-			$url_string .= "&leadsource=".$lead_source;
+		array_push($where_clauses, "potential.leadsource = ".$adb->quote($lead_source)."");
+		$url_string .= "&leadsource=".$lead_source;
 	}
 	// added to handle request from dashboard GS
 	if(isset($lead_source) && $lead_source != "") {
-			array_push($where_clauses, "potential.leadsource = ".PearDatabase::quote($lead_source)."");
-			$url_string .= "&leadsource=".$lead_source;
+		array_push($where_clauses, "potential.leadsource = ".$adb->quote($lead_source)."");
+		$url_string .= "&leadsource=".$lead_source;
 	}
 	if(isset($opportunity_type) && $opportunity_type != "") {
-			array_push($where_clauses, "potential.potentialtype = ".PearDatabase::quote($opportunity_type)."");
-			$url_string .= "&opportunity_type=".$opportunity_type;
+		array_push($where_clauses, "potential.potentialtype = ".$adb->quote($opportunity_type)."");
+		$url_string .= "&opportunity_type=".$opportunity_type;
 	}
 	if(isset($amount) && $amount != "") {
-			array_push($where_clauses, "potential.amount ".$adb->getLike()." ".PearDatabase::quote($amount.'%')."");
-			$url_string .= "&amount=".$amount;
+		array_push($where_clauses, "potential.amount ".$adb->getLike()." ".$adb->quote($amount.'%')."");
+		$url_string .= "&amount=".$amount;
 	}
 	if(isset($nextstep) && $nextstep != "") {
-			array_push($where_clauses, "potential.nextstep ".$adb->getLike()." ".PearDatabase::quote($nextstep.'%')."");
-			$url_string .= "&nextstep=".$nextstep;
+		array_push($where_clauses, "potential.nextstep ".$adb->getLike()." ".$adb->quote($nextstep.'%')."");
+		$url_string .= "&nextstep=".$nextstep;
 	}
 	if(isset($sales_stage) && $sales_stage != "") {
 			if($sales_stage=='Other')
 				array_push($where_clauses, "(potential.sales_stage <> 'Closed Won' and potential.sales_stage <> 'Closed Lost')");
 			else
-				array_push($where_clauses, "potential.sales_stage = ".PearDatabase::quote($sales_stage));
+				array_push($where_clauses, "potential.sales_stage = ".$adb->quote($sales_stage));
 			$url_string .= "&sales_stage=".$sales_stage;
 	}
 	if(isset($probability) && $probability != "") {
-			array_push($where_clauses, "potential.probability ".$adb->getLike()." ".PearDatabase::quote($probability.'%')."");
-			$url_string .= "&probability=".$probability;
+		array_push($where_clauses, "potential.probability ".$adb->getLike()." ".$adb->quote($probability.'%')."");
+		$url_string .= "&probability=".$probability;
 
 	}
 	if(isset($current_user_only) && $current_user_only != "") {
@@ -140,13 +140,13 @@
 			$url_string .= "&current_user_only=".$current_user_only;
 	}
 	if(isset($date_closed) && $date_closed != "") {
-			array_push($where_clauses, $adb->getDBDateString("potential.closingdate")." ".$adb->getLike()." ".PearDatabase::quote($date_closed.'%')."");
-			$url_string .= "&closingdate=".$date_closed;
+		array_push($where_clauses, $adb->getDBDateString("potential.closingdate")." ".$adb->getLike()." ".$adb->quote($date_closed.'%')."");
+		$url_string .= "&closingdate=".$date_closed;
 	}
 	if(isset($date_closed_start) && $date_closed_start != "" && isset($date_closed_end) && $date_closed_end != "")
 	{
-			array_push($where_clauses, "potential.closingdate >= ".PearDatabase::quote($date_closed_start)." and potential.closingdate <= ".PearDatabase::quote($date_closed_end));
-			$url_string .= "&closingdate_start=".$date_closed_start;
+		array_push($where_clauses, "potential.closingdate >= ".$adb->quote($date_closed_start)." and potential.closingdate <= ".$adb->quote($date_closed_end));
+		$url_string .= "&closingdate_start=".$date_closed_start;
 	}
 
 	$where = "";
@@ -163,7 +163,7 @@
 		}
 		$where .= "crmentity.smownerid IN(";
 		foreach ($assigned_user_id as $key => $val) {
-			$where .= "".PearDatabase::quote($val)."";
+			$where .= "".$adb->quote($val)."";
 			$where .= ($key == count($assigned_user_id) - 1) ? ")" : ", ";
 			// ACIPIA - to allow prev/next button to use criterias
 			$url_string .= '&' . urlencode( 'assigned_user_id[]' ) . '=' . $val ;

Modified: vtigercrm/branches/4.2/modules/Potentials/Popup.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Potentials/Popup.php (original)
+++ vtigercrm/branches/4.2/modules/Potentials/Popup.php Mon Jun 12 14:04:34 2006
@@ -73,12 +73,12 @@
 	$where_clauses = array();
 
 	if(isset($name) && $name != "") {
-			array_push($where_clauses, "potential.potentialname ".$adb->getLike()." ".PearDatabase::quote($name.'%')."");
-			$url_string .= "&name=".$name;		
+		array_push($where_clauses, "potential.potentialname ".$adb->getLike()." ".$adb->quote($name.'%')."");
+		$url_string .= "&name=".$name;		
 	}
 	if(isset($accountname) && $accountname != "") {
-			array_push($where_clauses, "account.accountname ".$adb->getLike()." ".PearDatabase::quote('%'.$accountname.'%')."");
-			$url_string .= "&account_name=".$accountname;		
+		array_push($where_clauses, "account.accountname ".$adb->getLike()." ".$adb->quote('%'.$accountname.'%')."");
+		$url_string .= "&account_name=".$accountname;		
 	}
 	if(isset($current_user_only) && $current_user_only != "") {
 			array_push($where_clauses, "crmentity.smcreator='$current_user->id'");
@@ -101,7 +101,7 @@
 		}
 		$where .= "crmentity.smcreatorid IN(";
 		foreach ($assigned_user_id as $key => $val) {
-			$where .= "".PearDatabase::quote($val)."";
+			$where .= "".$adb->quote($val)."";
 			$where .= ($key == count($assigned_user_id) - 1) ? ")" : ", ";
 		}
 	}

Modified: vtigercrm/branches/4.2/modules/Products/AddProductsToPriceBook.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Products/AddProductsToPriceBook.php (original)
+++ vtigercrm/branches/4.2/modules/Products/AddProductsToPriceBook.php Mon Jun 12 14:04:34 2006
@@ -96,65 +96,65 @@
 
 	if (isset($productname) && $productname !='')
 	{
-		array_push($where_clauses, "productname ".$adb->getLike()." ".PearDatabase::quote($productname.'%'));
+		array_push($where_clauses, "productname ".$adb->getLike()." ".$adb->quote($productname.'%'));
 		//$search_query .= " and productname ".$adb->getLike()." '".$productname."%'";
 		$url_string .= "&productname=".$productname;
 	}
 	
 	if (isset($productcode) && $productcode !='')
 	{
-		array_push($where_clauses, "productcode ".$adb->getLike()." ".PearDatabase::quote($productcode.'%'));
+		array_push($where_clauses, "productcode ".$adb->getLike()." ".$adb->quote($productcode.'%'));
 		//$search_query .= " and productcode ".$adb->getLike()." '".$productcode."%'";
 		$url_string .= "&productcode=".$productcode;
 	}
 
 	if (isset($commissionrate) && $commissionrate !='')
 	{
-		array_push($where_clauses, "commissionrate ".$adb->getLike()." ".PearDatabase::quote($commissionrate.'%'));
+		array_push($where_clauses, "commissionrate ".$adb->getLike()." ".$adb->quote($commissionrate.'%'));
 		 //$search_query .= " and commissionrate ".$adb->getLike()." '".$commissionrate."%'";
 		 $url_string .= "&commissionrate=".$commissionrate;
 	}
 	
 	if (isset($qtyperunit) && $qtyperunit !='')
 	{
-		array_push($where_clauses, "qty_per_unit ".$adb->getLike()." ".PearDatabase::quote($qtyperunit.'%'));
+		array_push($where_clauses, "qty_per_unit ".$adb->getLike()." ".$adb->quote($qtyperunit.'%'));
 	 	//$search_query .= " and qty_per_unit ".$adb->getLike()." '".$qtyperunit."%'";
 		$url_string .= "&qtyperunit=".$qtyperunit;
 	}
 	
 	if (isset($unitprice) && $unitprice !='')
 	{
-		array_push($where_clauses, "unit_price ".$adb->getLike()." ".PearDatabase::quote($unitprice.'%'));
+		array_push($where_clauses, "unit_price ".$adb->getLike()." ".$adb->quote($unitprice.'%'));
 	 //	$search_query .= " and unit_price ".$adb->getLike()." '".$unitprice."%'";
 		$url_string .= "&unitprice=".$unitprice;
 	}
 	if (isset($manufacturer) && $manufacturer !='' && $manufacturer !='--None--')
         {
-		array_push($where_clauses, "manufacturer ".$adb->getLike()." ".PearDatabase::quote($manufacturer.'%'));
+		array_push($where_clauses, "manufacturer ".$adb->getLike()." ".$adb->quote($manufacturer.'%'));
         	//$search_query .= " and manufacturer ".$adb->getLike()." '".$manufacturer."%'";
                 $url_string .= "&manufacturer=".$manufacturer;
 	}
 	if (isset($productcategory) && $productcategory !='' && $productcategory !='--None--')
         {
-		array_push($where_clauses, "productcategory ".$adb->getLike()." ".PearDatabase::quote($productcategory.'%'));
+		array_push($where_clauses, "productcategory ".$adb->getLike()." ".$adb->quote($productcategory.'%'));
         	//$search_query .= " and productcategory ".$adb->getLike()." '".$productcategory."%'";
                 $url_string .= "&productcategory=".$productcategory;
 	}
 	if (isset($start_date) && $start_date !='')
         {
-		array_push($where_clauses, "start_date ".$adb->getLike()." ".PearDatabase::quote($start_date.'%'));
+		array_push($where_clauses, "start_date ".$adb->getLike()." ".$adb->quote($start_date.'%'));
                 //$search_query .= " and start_date = '".$start_date."%'";
                 $url_string .= "&start_date=".$start_date;
         } 
 	if (isset($expiry_date) && $expiry_date !='')
         {
-		array_push($where_clauses, "expiry_date ".$adb->getLike()." ".PearDatabase::quote($expiry_date.'%'));
+		array_push($where_clauses, "expiry_date ".$adb->getLike()." ".$adb->quote($expiry_date.'%'));
                 //$search_query .= " and expiry_date = '".$expiry_date."%'";
                 $url_string .= "&expiry_date=".$expiry_date;
         } 
 	if (isset($purchase_date) && $purchase_date !='')
         {
-		array_push($where_clauses, "purchase_date ".$adb->getLike()." ".PearDatabase::quote($purchase_date.'%'));
+		array_push($where_clauses, "purchase_date ".$adb->getLike()." ".$adb->quote($purchase_date.'%'));
                 //$search_query .= " and purchase_date = '".$purchase_date."%'";
                 $url_string .= "&purchase_date=".$purchase_date;
         }

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 Mon Jun 12 14:04:34 2006
@@ -90,65 +90,65 @@
 
 	if (isset($productname) && $productname !='')
 	{
-		array_push($where_clauses, "productname ".$adb->getLike()." ".PearDatabase::quote($productname.'%'));
+		array_push($where_clauses, "productname ".$adb->getLike()." ".$adb->quote($productname.'%'));
 		//$search_query .= " and productname ".$adb->getLike()." '".$productname."%'";
 		$url_string .= "&productname=".$productname;
 	}
 	
 	if (isset($productcode) && $productcode !='')
 	{
-		array_push($where_clauses, "productcode ".$adb->getLike()." ".PearDatabase::quote($productcode.'%'));
+		array_push($where_clauses, "productcode ".$adb->getLike()." ".$adb->quote($productcode.'%'));
 		//$search_query .= " and productcode ".$adb->getLike()." '".$productcode."%'";
 		$url_string .= "&productcode=".$productcode;
 	}
 
 	if (isset($commissionrate) && $commissionrate !='')
 	{
-		array_push($where_clauses, "commissionrate ".$adb->getLike()." ".PearDatabase::quote($commissionrate.'%'));
+		array_push($where_clauses, "commissionrate ".$adb->getLike()." ".$adb->quote($commissionrate.'%'));
 		 //$search_query .= " and commissionrate ".$adb->getLike()." '".$commissionrate."%'";
 		 $url_string .= "&commissionrate=".$commissionrate;
 	}
 	
 	if (isset($qtyperunit) && $qtyperunit !='')
 	{
-		array_push($where_clauses, "qty_per_unit ".$adb->getLike()." ".PearDatabase::quote($qtyperunit.'%'));
+		array_push($where_clauses, "qty_per_unit ".$adb->getLike()." ".$adb->quote($qtyperunit.'%'));
 	 	//$search_query .= " and qty_per_unit ".$adb->getLike()." '".$qtyperunit."%'";
 		$url_string .= "&qtyperunit=".$qtyperunit;
 	}
 	
 	if (isset($unitprice) && $unitprice !='')
 	{
-		array_push($where_clauses, "unit_price ".$adb->getLike()." ".PearDatabase::quote($unitprice.'%'));
+		array_push($where_clauses, "unit_price ".$adb->getLike()." ".$adb->quote($unitprice.'%'));
 	 //	$search_query .= " and unit_price ".$adb->getLike()." '".$unitprice."%'";
 		$url_string .= "&unitprice=".$unitprice;
 	}
 	if (isset($manufacturer) && $manufacturer !='' && $manufacturer !='--None--')
         {
-		array_push($where_clauses, "manufacturer ".$adb->getLike()." ".PearDatabase::quote($manufacturer.'%'));
+		array_push($where_clauses, "manufacturer ".$adb->getLike()." ".$adb->quote($manufacturer.'%'));
         	//$search_query .= " and manufacturer ".$adb->getLike()." '".$manufacturer."%'";
                 $url_string .= "&manufacturer=".$manufacturer;
 	}
 	if (isset($productcategory) && $productcategory !='' && $productcategory !='--None--')
         {
-		array_push($where_clauses, "productcategory ".$adb->getLike()." ".PearDatabase::quote($productcategory.'%'));
+		array_push($where_clauses, "productcategory ".$adb->getLike()." ".$adb->quote($productcategory.'%'));
         	//$search_query .= " and productcategory ".$adb->getLike()." '".$productcategory."%'";
                 $url_string .= "&productcategory=".$productcategory;
 	}
 	if (isset($start_date) && $start_date !='')
         {
-		array_push($where_clauses, "start_date ".$adb->getLike()." ".PearDatabase::quote($start_date.'%'));
+		array_push($where_clauses, "start_date ".$adb->getLike()." ".$adb->quote($start_date.'%'));
                 //$search_query .= " and start_date = '".$start_date."%'";
                 $url_string .= "&start_date=".$start_date;
         } 
 	if (isset($expiry_date) && $expiry_date !='')
         {
-		array_push($where_clauses, "expiry_date ".$adb->getLike()." ".PearDatabase::quote($expiry_date.'%'));
+		array_push($where_clauses, "expiry_date ".$adb->getLike()." ".$adb->quote($expiry_date.'%'));
                 //$search_query .= " and expiry_date = '".$expiry_date."%'";
                 $url_string .= "&expiry_date=".$expiry_date;
         } 
 	if (isset($purchase_date) && $purchase_date !='')
         {
-		array_push($where_clauses, "purchase_date ".$adb->getLike()." ".PearDatabase::quote($purchase_date.'%'));
+		array_push($where_clauses, "purchase_date ".$adb->getLike()." ".$adb->quote($purchase_date.'%'));
                 //$search_query .= " and purchase_date = '".$purchase_date."%'";
                 $url_string .= "&purchase_date=".$purchase_date;
         }

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 Mon Jun 12 14:04:34 2006
@@ -84,7 +84,7 @@
 
 	if (isset($bookname) && $bookname !='')
 	{
-		array_push($where_clauses, "bookname ".$adb->getLike()." ".PearDatabase::quote($bookname.'%'));
+		array_push($where_clauses, "bookname ".$adb->getLike()." ".$adb->quote($bookname.'%'));
 		//$search_query .= " and productname ".$adb->getLike()." '".$productname."%'";
 		$url_string .= "&bookname=".$bookname;
 	}

Modified: vtigercrm/branches/4.2/modules/Products/PriceBookPopup.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Products/PriceBookPopup.php (original)
+++ vtigercrm/branches/4.2/modules/Products/PriceBookPopup.php Mon Jun 12 14:04:34 2006
@@ -54,202 +54,6 @@
 $sorder = 'ASC';  // Default sort order
 if(isset($_REQUEST['sorder']) && $_REQUEST['sorder'] != '')
 $sorder = $_REQUEST['sorder'];
-/*
-if(isset($_REQUEST['query']) && $_REQUEST['query'] != '' && $_REQUEST['query'] == 'true')
-{
-	$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'];
-
-	$where_clauses = Array();
-	//$search_query='';
-
-	//Added for Custom Field Search
-	$sql="select * from field where tablename='productcf' order by fieldlabel";
-	$result=$adb->query($sql);
-	for($i=0;$i<$adb->num_rows($result);$i++)
-	{
-	        $column[$i]=$adb->query_result($result,$i,'columnname');
-	        $fieldlabel[$i]=$adb->query_result($result,$i,'fieldlabel');
-		$uitype[$i]=$adb->query_result($result,$i,'uitype');
-
-	        if (isset($_REQUEST[$column[$i]])) $customfield[$i] = $_REQUEST[$column[$i]];
-	
-	        if(isset($customfield[$i]) && $customfield[$i] != '')
-	        {
-			if($uitype[$i] == 56)
-                                $str=" productcf.".$column[$i]." = 1";
-                        else
-			        $str=" productcf.".$column[$i]." like '$customfield[$i]%'";
-		        array_push($where_clauses, $str);
-	       	//	  $search_query .= ' and '.$str;
-			$url_string .="&".$column[$i]."=".$customfield[$i];
-	        }
-	}
-	//upto this added for Custom Field
-
-	if (isset($productname) && $productname !='')
-	{
-		array_push($where_clauses, "productname like ".PearDatabase::quote($productname.'%'));
-		//$search_query .= " and productname like '".$productname."%'";
-		$url_string .= "&productname=".$productname;
-	}
-	
-	if (isset($productcode) && $productcode !='')
-	{
-		array_push($where_clauses, "productcode like ".PearDatabase::quote($productcode.'%'));
-		//$search_query .= " and productcode like '".$productcode."%'";
-		$url_string .= "&productcode=".$productcode;
-	}
-
-	if (isset($commissionrate) && $commissionrate !='')
-	{
-		array_push($where_clauses, "commissionrate like ".PearDatabase::quote($commissionrate.'%'));
-		 //$search_query .= " and commissionrate like '".$commissionrate."%'";
-		 $url_string .= "&commissionrate=".$commissionrate;
-	}
-	
-	if (isset($qtyperunit) && $qtyperunit !='')
-	{
-		array_push($where_clauses, "qty_per_unit like ".PearDatabase::quote($qtyperunit.'%'));
-	 	//$search_query .= " and qty_per_unit like '".$qtyperunit."%'";
-		$url_string .= "&qtyperunit=".$qtyperunit;
-	}
-	
-	if (isset($unitprice) && $unitprice !='')
-	{
-		array_push($where_clauses, "unit_price like ".PearDatabase::quote($unitprice.'%'));
-	 //	$search_query .= " and unit_price like '".$unitprice."%'";
-		$url_string .= "&unitprice=".$unitprice;
-	}
-	if (isset($manufacturer) && $manufacturer !='' && $manufacturer !='--None--')
-        {
-		array_push($where_clauses, "manufacturer like ".PearDatabase::quote($manufacturer.'%'));
-        	//$search_query .= " and manufacturer like '".$manufacturer."%'";
-                $url_string .= "&manufacturer=".$manufacturer;
-	}
-	if (isset($productcategory) && $productcategory !='' && $productcategory !='--None--')
-        {
-		array_push($where_clauses, "productcategory like ".PearDatabase::quote($productcategory.'%'));
-        	//$search_query .= " and productcategory like '".$productcategory."%'";
-                $url_string .= "&productcategory=".$productcategory;
-	}
-	if (isset($start_date) && $start_date !='')
-        {
-		array_push($where_clauses, "start_date like ".PearDatabase::quote($start_date.'%'));
-                //$search_query .= " and start_date = '".$start_date."%'";
-                $url_string .= "&start_date=".$start_date;
-        } 
-	if (isset($expiry_date) && $expiry_date !='')
-        {
-		array_push($where_clauses, "expiry_date like ".PearDatabase::quote($expiry_date.'%'));
-                //$search_query .= " and expiry_date = '".$expiry_date."%'";
-                $url_string .= "&expiry_date=".$expiry_date;
-        } 
-	if (isset($purchase_date) && $purchase_date !='')
-        {
-		array_push($where_clauses, "purchase_date like ".PearDatabase::quote($purchase_date.'%'));
-                //$search_query .= " and purchase_date = '".$purchase_date."%'";
-                $url_string .= "&purchase_date=".$purchase_date;
-        }
-	$where = "";
-	foreach($where_clauses as $clause)
-	{
-		if($where != "")
-		$where .= " and ";
-		$where .= $clause;
-	}
-
-	$log->info("Here is the where clause for the list view: $where");
- 
-
-}
-
-//Constructing the Search Form
-if (!isset($_REQUEST['search_form']) || $_REQUEST['search_form'] != 'false') {
-        // Stick the form header out there.
-	echo get_form_header($current_module_strings['LBL_SEARCH_FORM_TITLE'],'', false);
-        $search_form=new XTemplate ('modules/Products/PopupSearchForm.html');
-        $search_form->assign("MOD", $mod_strings);
-        $search_form->assign("APP", $app_strings);
-	$clearsearch = 'true';
-	
-	if ($order_by !='') $search_form->assign("ORDER_BY", $order_by);
-	if ($sorder !='') $search_form->assign("SORDER", $sorder);
-	$search_form->assign("JAVASCRIPT", get_clear_form_js());
-	if($order_by != '') {
-		$ordby = "&order_by=".$order_by;
-	}
-	else
-	{
-		$ordby ='';
-	}
-	$search_form->assign("BASIC_LINK", "index.php?module=Products".$ordby."&action=index".$url_string."&sorder=".$sorder);
-	$search_form->assign("ADVANCE_LINK", "index.php?module=Products&action=index".$ordby."&advanced=true".$url_string."&sorder=".$sorder);
-
-	if ($productname !='') $search_form->assign("PRODUCT_NAME", $productname);
-	if ($commissionrate !='') $search_form->assign("COMMISSION_RATE", $commissionrate);
-	if ($productcode !='') $search_form->assign("PRODUCT_CODE", $productcode);
-	if ($qtyperunit !='') $search_form->assign("QTYPERUNIT", $qtyperunit);
-	if ($unitprice !='') $search_form->assign("UNITPRICE", $unitprice);
-	if (isset($_REQUEST['manufacturer'])) $manufacturer = $_REQUEST['manufacturer'];	
-	if (isset($_REQUEST['productcategory'])) $productcategoty = $_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'];	
-
-//Combo Fields for Manufacturer and Category are moved from advanced to Basic Search
-/*        if (isset($manufacturer)) $search_form->assign("MANUFACTURER", get_select_options($comboFieldArray['manufacturer_dom'], $manufacturer, $clearsearch));
-        else $search_form->assign("MANUFACTURER", get_select_options($comboFieldArray['manufacturer_dom'], '', $clearsearch));
-        if (isset($productcategory)) $search_form->assign("PRODUCTCATEGORY", get_select_options($comboFieldArray['productcategory_dom'], $productcategoty, $clearsearch));
-        else $search_form->assign("PRODUCTCATEGORY", get_select_options($comboFieldArray['productcategory_dom'], '', $clearsearch));
-*/
- /*       if (isset($_REQUEST['advanced']) && $_REQUEST['advanced'] == 'true') 
-	{
-		$url_string .="&advanced=true";
-		$search_form->assign("ALPHABETICAL",AlphabeticalSearch('Products','index','productname','true','advanced'));
-
-		$search_form->assign("SUPPORT_START_DATE",$_REQUEST['start_date']);
-		$search_form->assign("SUPPORT_EXPIRY_DATE",$_REQUEST['expiry_date']);
-		$search_form->assign("PURCHASE_DATE",$_REQUEST['purchase_date']);
-		$search_form->assign("DATE_FORMAT", $current_user->date_format);
-
-		//Added for Custom Field Search
-		$sql="select * from field where tablename='productcf' order by fieldlabel";
-		$result=$adb->query($sql);
-		for($i=0;$i<$adb->num_rows($result);$i++)
-		{
-		        $column[$i]=$adb->query_result($result,$i,'columnname');
-		        $fieldlabel[$i]=$adb->query_result($result,$i,'fieldlabel');
-		        if (isset($_REQUEST[$column[$i]])) $customfield[$i] = $_REQUEST[$column[$i]];
-		}
-		require_once('include/CustomFieldUtil.php');
-		$custfld = CustomFieldSearch($customfield, "productcf", "productcf", "productid", $app_strings,$theme,$column,$fieldlabel);
-		$search_form->assign("CUSTOMFIELD", $custfld);
-		//upto this added for Custom Field
-
-                $search_form->parse("advanced");
-                $search_form->out("advanced");
-	}
-	else
-	{        
-		$search_form->assign("ALPHABETICAL",AlphabeticalSearch('Products','index','productname','true','basic'));
-		$search_form->parse("main");
-	        $search_form->out("main");
-	}
-echo get_form_footer();
-//echo '<br><br>';
-
-}
-*/
 //Retreive the list from Database
 
 //$list_query = getListQuery("PriceBook");

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 Mon Jun 12 14:04:34 2006
@@ -85,76 +85,25 @@
 
 	if (isset($vendorname) && $vendorname !='')
 	{
-		array_push($where_clauses, "vendorname ".$adb->getLike()." ".PearDatabase::quote($vendorname.'%'));
+		array_push($where_clauses, "vendorname ".$adb->getLike()." ".$adb->quote($vendorname.'%'));
 		//$search_query .= " and productname ".$adb->getLike()." '".$productname."%'";
 		$url_string .= "&vendorname=".$vendorname;
 	}
 
 	if (isset($email) && $email !='')
 	{
-		array_push($where_clauses, "email =".PearDatabase::quote($email));
+		array_push($where_clauses, "email =".$adb->quote($email));
 		//$search_query .= " and productcode ".$adb->getLike()." '".$productcode."%'";
 		$url_string .= "&email=".$email;
 	}
 	
 	if (isset($category) && $category !='')
 	{
-		array_push($where_clauses, "category ".$adb->getLike()." ".PearDatabase::quote($category.'%'));
+		array_push($where_clauses, "category ".$adb->getLike()." ".$adb->quote($category.'%'));
 		//$search_query .= " and productcode ".$adb->getLike()." '".$productcode."%'";
 		$url_string .= "&category=".$category;
 	}
 
-/*	if (isset($commissionrate) && $commissionrate !='')
-	{
-		array_push($where_clauses, "commissionrate ".$adb->getLike()." ".PearDatabase::quote($commissionrate.'%'));
-		 //$search_query .= " and commissionrate ".$adb->getLike()." '".$commissionrate."%'";
-		 $url_string .= "&commissionrate=".$commissionrate;
-	}
-
-	if (isset($qtyperunit) && $qtyperunit !='')
-	{
-		array_push($where_clauses, "qty_per_unit ".$adb->getLike()." ".PearDatabase::quote($qtyperunit.'%'));
-	 	//$search_query .= " and qty_per_unit ".$adb->getLike()." '".$qtyperunit."%'";
-		$url_string .= "&qtyperunit=".$qtyperunit;
-	}
-
-	if (isset($unitprice) && $unitprice !='')
-	{
-		array_push($where_clauses, "unit_price ".$adb->getLike()." ".PearDatabase::quote($unitprice.'%'));
-	 //	$search_query .= " and unit_price ".$adb->getLike()." '".$unitprice."%'";
-		$url_string .= "&unitprice=".$unitprice;
-	}
-	if (isset($manufacturer) && $manufacturer !='' && $manufacturer !='--None--')
-        {
-		array_push($where_clauses, "manufacturer ".$adb->getLike()." ".PearDatabase::quote($manufacturer.'%'));
-        	//$search_query .= " and manufacturer ".$adb->getLike()." '".$manufacturer."%'";
-                $url_string .= "&manufacturer=".$manufacturer;
-	}
-	if (isset($productcategory) && $productcategory !='' && $productcategory !='--None--')
-        {
-		array_push($where_clauses, "productcategory ".$adb->getLike()." ".PearDatabase::quote($productcategory.'%'));
-        	//$search_query .= " and productcategory ".$adb->getLike()." '".$productcategory."%'";
-                $url_string .= "&productcategory=".$productcategory;
-	}
-	if (isset($start_date) && $start_date !='')
-        {
-		array_push($where_clauses, "start_date ".$adb->getLike()." ".PearDatabase::quote($start_date.'%'));
-                //$search_query .= " and start_date = '".$start_date."%'";
-                $url_string .= "&start_date=".$start_date;
-        }
-	if (isset($expiry_date) && $expiry_date !='')
-        {
-		array_push($where_clauses, "expiry_date ".$adb->getLike()." ".PearDatabase::quote($expiry_date.'%'));
-                //$search_query .= " and expiry_date = '".$expiry_date."%'";
-                $url_string .= "&expiry_date=".$expiry_date;
-        }
-	if (isset($purchase_date) && $purchase_date !='')
-        {
-		array_push($where_clauses, "purchase_date ".$adb->getLike()." ".PearDatabase::quote($purchase_date.'%'));
-                //$search_query .= " and purchase_date = '".$purchase_date."%'";
-                $url_string .= "&purchase_date=".$purchase_date;
-        }
-*/
 	$where = "";
 	foreach($where_clauses as $clause)
 	{

Modified: vtigercrm/branches/4.2/modules/Products/VendorPopup.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Products/VendorPopup.php (original)
+++ vtigercrm/branches/4.2/modules/Products/VendorPopup.php Mon Jun 12 14:04:34 2006
@@ -91,21 +91,21 @@
 
 	if (isset($vendorname) && $vendorname !='')
 	{
-		array_push($where_clauses, "vendorname ".$adb->getLike()." ".PearDatabase::quote($vendorname.'%'));
+		array_push($where_clauses, "vendorname ".$adb->getLike()." ".$adb->quote($vendorname.'%'));
 		//$search_query .= " and productname ".$adb->getLike()." '".$productname."%'";
 		$url_string .= "&vendorname=".$vendorname;
 	}
 
 	if (isset($companyname) && $companyname !='')
 	{
-		array_push($where_clauses, "company_name ".$adb->getLike()." ".PearDatabase::quote($companyname.'%'));
+		array_push($where_clauses, "company_name ".$adb->getLike()." ".$adb->quote($companyname.'%'));
 		//$search_query .= " and productcode ".$adb->getLike()." '".$productcode."%'";
 		$url_string .= "&companyname=".$companyname;
 	}
 	
 	if (isset($category) && $category !='')
 	{
-		array_push($where_clauses, "category ".$adb->getLike()." ".PearDatabase::quote($category.'%'));
+		array_push($where_clauses, "category ".$adb->getLike()." ".$adb->quote($category.'%'));
 		//$search_query .= " and productcode ".$adb->getLike()." '".$productcode."%'";
 		$url_string .= "&category=".$category;
 	}

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 Mon Jun 12 14:04:34 2006
@@ -83,23 +83,23 @@
 	
 	if(isset($subject) && $subject != "") 
 	{
-		array_push($where_clauses, "quotes.subject ".$adb->getLike()." ".PearDatabase::quote($subject."%"));
+		array_push($where_clauses, "quotes.subject ".$adb->getLike()." ".$adb->quote($subject."%"));
 		$url_string .= "&subject=".$subject;
 	}
 	if(isset($potentialname) && $potentialname != "")
 	{
-		array_push($where_clauses, "potential.potentialname ".$adb->getLike()." ".PearDatabase::quote("%".$potentialname."%"));
+		array_push($where_clauses, "potential.potentialname ".$adb->getLike()." ".$adb->quote("%".$potentialname."%"));
 		$url_string .= "&potentialname=".$potentialname;
 	}
 	if(isset($accountname) && $accountname != "")
 	{
-		array_push($where_clauses, "account.accountname ".$adb->getLike()." ".PearDatabase::quote("%".$accountname."%"));
+		array_push($where_clauses, "account.accountname ".$adb->getLike()." ".$adb->quote("%".$accountname."%"));
 		$url_string .= "&accountname=".$accountname;
 	}
 
 	if(isset($quotestage) && $quotestage != "")
 	{
-		array_push($where_clauses, "quotes.quotestage ".$adb->getLike()." ".PearDatabase::quote("%".$quotestage."%"));
+		array_push($where_clauses, "quotes.quotestage ".$adb->getLike()." ".$adb->quote("%".$quotestage."%"));
 		$url_string .= "&quotestage=".$quotestage;
 	}
 	
@@ -117,7 +117,7 @@
 		}
 		$where .= "crmentity.smownerid IN(";
 		foreach ($assigned_user_id as $key => $val) {
-			$where .= PearDatabase::quote($val);
+			$where .= $adb->quote($val);
 			$where .= ($key == count($assigned_user_id) - 1) ? ")" : ", ";
 		}
 	}

Modified: vtigercrm/branches/4.2/modules/Quotes/Popup.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Quotes/Popup.php (original)
+++ vtigercrm/branches/4.2/modules/Quotes/Popup.php Mon Jun 12 14:04:34 2006
@@ -97,18 +97,18 @@
 	
 	if(isset($subject) && $subject != "") 
 	{
-		array_push($where_clauses, "quotes.subject ".$adb->getLike()." ".PearDatabase::quote($subject."%"));
+		array_push($where_clauses, "quotes.subject ".$adb->getLike()." ".$adb->quote($subject."%"));
 		$url_string .= "&subject=".$subject;
 	}
 	if(isset($accountname) && $accountname != "")
 	{
-		array_push($where_clauses, "account.accountname ".$adb->getLike()." ".PearDatabase::quote("%".$accountname."%"));
+		array_push($where_clauses, "account.accountname ".$adb->getLike()." ".$adb->quote("%".$accountname."%"));
 		$url_string .= "&accountname=".$accountname;
 	}
 
 	if(isset($quotestage) && $quotestage != "")
 	{
-		array_push($where_clauses, "quotes.quotestage ".$adb->getLike()." ".PearDatabase::quote("%".$quotestage."%"));
+		array_push($where_clauses, "quotes.quotestage ".$adb->getLike()." ".$adb->quote("%".$quotestage."%"));
 		$url_string .= "&quotestage=".$quotestage;
 	}
 	
@@ -126,7 +126,7 @@
 		}
 		$where .= "crmentity.smownerid IN(";
 		foreach ($assigned_user_id as $key => $val) {
-			$where .= PearDatabase::quote($val);
+			$where .= $adb->quote($val);
 			$where .= ($key == count($assigned_user_id) - 1) ? ")" : ", ";
 		}
 	}

Modified: vtigercrm/branches/4.2/modules/Reports/ReportRun.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Reports/ReportRun.php (original)
+++ vtigercrm/branches/4.2/modules/Reports/ReportRun.php Mon Jun 12 14:04:34 2006
@@ -181,7 +181,7 @@
                 {
                         if(trim($value) != "")
 			{
-				$rtvalue = " = ".PearDatabase::quote($value);
+				$rtvalue = " = ".$adb->quote($value);
 			}else
 			{
 				$rtvalue = " is NULL";
@@ -191,7 +191,7 @@
                 {
                         if(trim($value) != "")
 			{
-				$rtvalue = " <> ".PearDatabase::quote($value);
+				$rtvalue = " <> ".$adb->quote($value);
 			}else
 			{
 				$rtvalue = " is NOT NULL";
@@ -199,31 +199,31 @@
                 }
                 if($comparator == "s")
                 {
-                        $rtvalue = " ".$adb->getLike()." ".PearDatabase::quote($value."%");
+                        $rtvalue = " ".$adb->getLike()." ".$adb->quote($value."%");
                 }
                 if($comparator == "c")
                 {
-                        $rtvalue = " ".$adb->getLike()." ".PearDatabase::quote("%".$value."%");
+                        $rtvalue = " ".$adb->getLike()." ".$adb->quote("%".$value."%");
                 }
                 if($comparator == "k")
                 {
-                        $rtvalue = " not ".$adb->getLike()." ".PearDatabase::quote("%".$value."%");
+                        $rtvalue = " not ".$adb->getLike()." ".$adb->quote("%".$value."%");
                 }
                 if($comparator == "l")
                 {
-                        $rtvalue = " < ".PearDatabase::quote($value);
+                        $rtvalue = " < ".$adb->quote($value);
                 }
                 if($comparator == "g")
 								{
-                        $rtvalue = " > ".PearDatabase::quote($value);
+                        $rtvalue = " > ".$adb->quote($value);
                 }
                 if($comparator == "m")
                 {
-                        $rtvalue = " <= ".PearDatabase::quote($value);
+                        $rtvalue = " <= ".$adb->quote($value);
                 }
                 if($comparator == "h")
                 {
-                        $rtvalue = " >= ".PearDatabase::quote($value);
+                        $rtvalue = " >= ".$adb->quote($value);
                 }
 
                 $vtlog->logthis("ReportRun :: Successfully returned getAdvComparator","info");

Modified: vtigercrm/branches/4.2/modules/Users/ListView.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Users/ListView.php (original)
+++ vtigercrm/branches/4.2/modules/Users/ListView.php Mon Jun 12 14:04:34 2006
@@ -67,21 +67,21 @@
 	$where_clauses = Array();
 	
 	$adb->checkConnection();
-	if(isset($last_name) && $last_name != "") array_push($where_clauses, "last_name ".$adb->getLike()." ".PearDatabase::quote($last_name.'%')."");
-	if(isset($first_name) && $first_name != "") array_push($where_clauses, "first_name ".$adb->getLike()." ".PearDatabase::quote($first_name.'%')."");
-	if(isset($user_name) && $user_name != "") array_push($where_clauses, "user_name ".$adb->getLike()." ".PearDatabase::quote($user_name.'%')."");
-	if(isset($status) && $status != "") array_push($where_clauses, "status = ".PearDatabase::quote($status)."");
-	if(isset($is_admin) && $is_admin != "") array_push($where_clauses, "is_admin = ".PearDatabase::quote($is_admin)."");
-	if(isset($phone) && $phone != "") array_push($where_clauses, "(phone_home ".$adb->getLike()." ".PearDatabase::quote('%'.$phone.'%')." OR phone_mobile ".$adb->getLike()." ".PearDatabase::quote('%'.$phone.'%')." OR phone_work ".$adb->getLike()." ".PearDatabase::quote('%'.$phone.'%')." OR phone_other ".$adb->getLike()." ".PearDatabase::quote('%'.$phone.'%')." OR phone_fax ".$adb->getLike()." ".PearDatabase::quote('%'.$phone.'%').")");
-	if(isset($email) && $email != "") array_push($where_clauses, "(users.email1 ".$adb->getLike()." ".PearDatabase::quote($email.'%')." OR users.email2 ".$adb->getLike()." ".PearDatabase::quote($email.'%').")");
-	if(isset($yahoo_id) && $yahoo_id != "") array_push($where_clauses, "yahoo_id ".$adb->getLike()." ".PearDatabase::quote($yahoo_id.'%')."");
-	if(isset($department) && $department != "") array_push($where_clauses, "department ".$adb->getLike()." ".PearDatabase::quote($department.'%')."");
-	if(isset($title) && $title != "") array_push($where_clauses, "title ".$adb->getLike()." ".PearDatabase::quote($title.'%')."");
-	if(isset($address_street) && $address_street != "") array_push($where_clauses, "address_street ".$adb->getLike()." ".PearDatabase::quote($address_street.'%')."");
-	if(isset($address_city) && $address_city != "") array_push($where_clauses, "address_city ".$adb->getLike()." ".PearDatabase::quote($address_city.'%')."");
-	if(isset($address_state) && $address_state != "") array_push($where_clauses, "address_state ".$adb->getLike()." ".PearDatabase::quote($address_state.'%')."");
-	if(isset($address_postalcode) && $address_postalcode != "") array_push($where_clauses, "address_postalcode ".$adb->getLike()." ".PearDatabase::quote($address_postalcode.'%')."");
-	if(isset($address_country) && $address_country != "") array_push($where_clauses, "address_country ".$adb->getLike()." ".PearDatabase::quote($address_country.'%')."");
+	if(isset($last_name) && $last_name != "") array_push($where_clauses, "last_name ".$adb->getLike()." ".$adb->quote($last_name.'%')."");
+	if(isset($first_name) && $first_name != "") array_push($where_clauses, "first_name ".$adb->getLike()." ".$adb->quote($first_name.'%')."");
+	if(isset($user_name) && $user_name != "") array_push($where_clauses, "user_name ".$adb->getLike()." ".$adb->quote($user_name.'%')."");
+	if(isset($status) && $status != "") array_push($where_clauses, "status = ".$adb->quote($status)."");
+	if(isset($is_admin) && $is_admin != "") array_push($where_clauses, "is_admin = ".$adb->quote($is_admin)."");
+	if(isset($phone) && $phone != "") array_push($where_clauses, "(phone_home ".$adb->getLike()." ".$adb->quote('%'.$phone.'%')." OR phone_mobile ".$adb->getLike()." ".$adb->quote('%'.$phone.'%')." OR phone_work ".$adb->getLike()." ".$adb->quote('%'.$phone.'%')." OR phone_other ".$adb->getLike()." ".$adb->quote('%'.$phone.'%')." OR phone_fax ".$adb->getLike()." ".$adb->quote('%'.$phone.'%').")");
+	if(isset($email) && $email != "") array_push($where_clauses, "(users.email1 ".$adb->getLike()." ".$adb->quote($email.'%')." OR users.email2 ".$adb->getLike()." ".$adb->quote($email.'%').")");
+	if(isset($yahoo_id) && $yahoo_id != "") array_push($where_clauses, "yahoo_id ".$adb->getLike()." ".$adb->quote($yahoo_id.'%')."");
+	if(isset($department) && $department != "") array_push($where_clauses, "department ".$adb->getLike()." ".$adb->quote($department.'%')."");
+	if(isset($title) && $title != "") array_push($where_clauses, "title ".$adb->getLike()." ".$adb->quote($title.'%')."");
+	if(isset($address_street) && $address_street != "") array_push($where_clauses, "address_street ".$adb->getLike()." ".$adb->quote($address_street.'%')."");
+	if(isset($address_city) && $address_city != "") array_push($where_clauses, "address_city ".$adb->getLike()." ".$adb->quote($address_city.'%')."");
+	if(isset($address_state) && $address_state != "") array_push($where_clauses, "address_state ".$adb->getLike()." ".$adb->quote($address_state.'%')."");
+	if(isset($address_postalcode) && $address_postalcode != "") array_push($where_clauses, "address_postalcode ".$adb->getLike()." ".$adb->quote($address_postalcode.'%')."");
+	if(isset($address_country) && $address_country != "") array_push($where_clauses, "address_country ".$adb->getLike()." ".$adb->quote($address_country.'%')."");
 
 
 	$where = "";




From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 12 16:08:32 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 12 Jun 2006 20:08:32 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231287=3A?=
	=?utf-8?q?_Support_PHP_5?=
In-Reply-To: <076.34213a5e5121e9857e7ff28b81783537@vtiger.fosslabs.com>
References: <076.34213a5e5121e9857e7ff28b81783537@vtiger.fosslabs.com>
Message-ID: <085.3ca231f8ba3a9bc90ba2693d2133a24f@vtiger.fosslabs.com>

#1287: Support PHP 5
------------------------+---------------------------------------------------
  Reporter:  allanbush  |       Owner:  developer
      Type:  defect     |      Status:  new      
  Priority:  major      |   Milestone:  4.2.5    
 Component:  vtigercrm  |     Version:  4.2.4rc3 
Resolution:             |    Keywords:  php5     
------------------------+---------------------------------------------------
Comment (by allanbush):

 [6998] replaced the jpgraph dependency with ImageGraph which should work
 properly using both php4 and php5.


 No known php5 issues left.  Leaving this bug open until proper testing can
 be performed.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1287>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 12 16:30:35 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 12 Jun 2006 20:30:35 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7003 - in /vtigercrm/trunk:
 ./ cron/ data/ include/ include/Ajax/ include/ListView/ include/freetag/
 include/utils/ install/ modules/Accounts/ modules/Accounts/language/
 modules/Activities/ modules/Activities/language/ modules/Calendar/
 modules/Calendar/language/ modules/Campaigns/ modules/Contacts/
 modules/Contacts/language/ modules/CustomView/ modules/CustomView/language/
 modules/Dashboard/ modules/Dashboard/language/ modules/Emails/
 modules/Emails/language/ modules/Faq/ modules/Faq/language/
 modules/HelpDesk/ modules/HelpDesk/language/ modules/Home/ modules/Import/
 modules/Import/language/ modules/Invoice/ modules/Invoice/language/
 modules/Invoice/pdf_templates/ modules/Leads/ modules/Leads/language/
 modules/Migration/ modules/Migration/ModifyDatabase/ modules/Notes/
 modules/Notes/language/ modules/Portal/ modules/Potentials/
 modules/Potentials/language/ modules/PriceBooks/ modules/Products/
 modules/Products/language/ modules/PurchaseOrder/
 modules/PurchaseOrder/language/ modules/PurchaseOrder/pdf_templates/
 modules/Quotes/ modules/Quotes/language/ modules/Quotes/pdf_templates/
 modules/Reports/ modules/Reports/language/ modules/Rss/ modules/SalesOrder/
 modules/SalesOrder/language/ modules/SalesOrder/pdf_templates/
 modules/Settings/ modules/Settings/language/ modules/Users/
 modules/Users/language/ modules/Utilities/ modules/Vendors/
 modules/Webmails/ modules/Webmails/images/ modules/Webmails/language/ soap/
Message-ID: <20060612203044.567177E8BE5@vtiger.fosslabs.com>

Author: don
Date: Mon Jun 12 14:26:25 2006
New Revision: 7003

Log:
added the prefix vtiger_ in all table names

Modified:
    vtigercrm/trunk/cron/intimateTaskStatus.php
    vtigercrm/trunk/data/CRMEntity.php
    vtigercrm/trunk/data/SugarBean.php
    vtigercrm/trunk/data/Tracker.php
    vtigercrm/trunk/include/Ajax/TagCloud.php
    vtigercrm/trunk/include/ComboUtil.php
    vtigercrm/trunk/include/CustomFieldUtil.php
    vtigercrm/trunk/include/FormValidationUtil.php
    vtigercrm/trunk/include/ListView/ListView.php
    vtigercrm/trunk/include/PopulateComboValues.php
    vtigercrm/trunk/include/RelatedListView.php
    vtigercrm/trunk/include/freetag/freetag.class.php
    vtigercrm/trunk/include/utils/CommonUtils.php
    vtigercrm/trunk/include/utils/DeleteUtils.php
    vtigercrm/trunk/include/utils/DetailViewUtils.php
    vtigercrm/trunk/include/utils/EditViewUtils.php
    vtigercrm/trunk/include/utils/GetGroupUsers.php
    vtigercrm/trunk/include/utils/GetParentGroups.php
    vtigercrm/trunk/include/utils/GetUserGroups.php
    vtigercrm/trunk/include/utils/InventoryUtils.php
    vtigercrm/trunk/include/utils/ListViewUtils.php
    vtigercrm/trunk/include/utils/SearchUtils.php
    vtigercrm/trunk/include/utils/UserInfoUtil.php
    vtigercrm/trunk/include/utils/export.php
    vtigercrm/trunk/include/utils/utils.php
    vtigercrm/trunk/index.php
    vtigercrm/trunk/install/0welcome.php
    vtigercrm/trunk/install/1checkSystem.php
    vtigercrm/trunk/install/2setConfig.php
    vtigercrm/trunk/install/3confirmConfig.php
    vtigercrm/trunk/install/4createConfigFile.php
    vtigercrm/trunk/install/5createTables.inc.php
    vtigercrm/trunk/install/5createTables.php
    vtigercrm/trunk/install/populateSeedData.php
    vtigercrm/trunk/modules/Accounts/Account.php
    vtigercrm/trunk/modules/Accounts/Forms.php
    vtigercrm/trunk/modules/Accounts/ListViewTop.php
    vtigercrm/trunk/modules/Accounts/Merge.php
    vtigercrm/trunk/modules/Accounts/Popup_picker.php
    vtigercrm/trunk/modules/Accounts/Save.php
    vtigercrm/trunk/modules/Accounts/language/en_us.lang.php
    vtigercrm/trunk/modules/Activities/Activity.php
    vtigercrm/trunk/modules/Activities/EditView.php
    vtigercrm/trunk/modules/Activities/Event.php
    vtigercrm/trunk/modules/Activities/Forms.php
    vtigercrm/trunk/modules/Activities/GroupAllocationView.php
    vtigercrm/trunk/modules/Activities/ListView.php
    vtigercrm/trunk/modules/Activities/OpenListView.php
    vtigercrm/trunk/modules/Activities/RenderRelatedListUI.php
    vtigercrm/trunk/modules/Activities/Save.php
    vtigercrm/trunk/modules/Activities/language/en_us.lang.php
    vtigercrm/trunk/modules/Activities/updateRelations.php
    vtigercrm/trunk/modules/Calendar/Appointment.php
    vtigercrm/trunk/modules/Calendar/CalendarCommon.php
    vtigercrm/trunk/modules/Calendar/addEventUI.php
    vtigercrm/trunk/modules/Calendar/calendarLayout.php
    vtigercrm/trunk/modules/Calendar/disable_sharing.php
    vtigercrm/trunk/modules/Calendar/language/en_us.lang.php
    vtigercrm/trunk/modules/Calendar/updateCalendarSharing.php
    vtigercrm/trunk/modules/Campaigns/Campaign.php
    vtigercrm/trunk/modules/Campaigns/ListView.php
    vtigercrm/trunk/modules/Contacts/CallRelatedList.php
    vtigercrm/trunk/modules/Contacts/Contact.php
    vtigercrm/trunk/modules/Contacts/EditView.php
    vtigercrm/trunk/modules/Contacts/Forms.php
    vtigercrm/trunk/modules/Contacts/ListView.php
    vtigercrm/trunk/modules/Contacts/Merge.php
    vtigercrm/trunk/modules/Contacts/Save.php
    vtigercrm/trunk/modules/Contacts/chat.php
    vtigercrm/trunk/modules/Contacts/language/en_us.lang.php
    vtigercrm/trunk/modules/CustomView/CustomView.php
    vtigercrm/trunk/modules/CustomView/Delete.php
    vtigercrm/trunk/modules/CustomView/Forms.php
    vtigercrm/trunk/modules/CustomView/ListViewTop.php
    vtigercrm/trunk/modules/CustomView/PopulateCustomView.php
    vtigercrm/trunk/modules/CustomView/Save.php
    vtigercrm/trunk/modules/CustomView/SaveAction.php
    vtigercrm/trunk/modules/CustomView/SendMailAction.php
    vtigercrm/trunk/modules/CustomView/language/en_us.lang.php
    vtigercrm/trunk/modules/Dashboard/Chart_lead_source_by_outcome.php
    vtigercrm/trunk/modules/Dashboard/Chart_my_pipeline_by_sales_stage.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/Entity_charts.php
    vtigercrm/trunk/modules/Dashboard/Forms.php
    vtigercrm/trunk/modules/Dashboard/ReportsCharts.php
    vtigercrm/trunk/modules/Dashboard/display_charts.php
    vtigercrm/trunk/modules/Dashboard/language/en_us.lang.php
    vtigercrm/trunk/modules/Emails/Choose.php
    vtigercrm/trunk/modules/Emails/ChooseEmail.php
    vtigercrm/trunk/modules/Emails/DetailView.php
    vtigercrm/trunk/modules/Emails/EditView.php
    vtigercrm/trunk/modules/Emails/Email.php
    vtigercrm/trunk/modules/Emails/Forms.php
    vtigercrm/trunk/modules/Emails/ListView.php
    vtigercrm/trunk/modules/Emails/Save.php
    vtigercrm/trunk/modules/Emails/class.phpmailer.php
    vtigercrm/trunk/modules/Emails/class.smtp.php
    vtigercrm/trunk/modules/Emails/language/en_us.lang.php
    vtigercrm/trunk/modules/Emails/mail.php
    vtigercrm/trunk/modules/Emails/mailSelect.php
    vtigercrm/trunk/modules/Emails/mailbox.php
    vtigercrm/trunk/modules/Emails/mailsend.php
    vtigercrm/trunk/modules/Emails/sendmail.php
    vtigercrm/trunk/modules/Emails/updateRelations.php
    vtigercrm/trunk/modules/Emails/webmailsend.php
    vtigercrm/trunk/modules/Faq/Faq.php
    vtigercrm/trunk/modules/Faq/language/en_us.lang.php
    vtigercrm/trunk/modules/HelpDesk/Convert.php
    vtigercrm/trunk/modules/HelpDesk/ConvertAsFAQ.php
    vtigercrm/trunk/modules/HelpDesk/ConvertToEntities.php
    vtigercrm/trunk/modules/HelpDesk/Forms.php
    vtigercrm/trunk/modules/HelpDesk/HelpDesk.php
    vtigercrm/trunk/modules/HelpDesk/ListTickets.php
    vtigercrm/trunk/modules/HelpDesk/ListView.php
    vtigercrm/trunk/modules/HelpDesk/Merge.php
    vtigercrm/trunk/modules/HelpDesk/Save.php
    vtigercrm/trunk/modules/HelpDesk/TicketStatisticsUtil.php
    vtigercrm/trunk/modules/HelpDesk/language/en_us.lang.php
    vtigercrm/trunk/modules/Home/Forms.php
    vtigercrm/trunk/modules/Home/LastViewed.php
    vtigercrm/trunk/modules/Home/UnifiedSearch.php
    vtigercrm/trunk/modules/Home/home_rss.php
    vtigercrm/trunk/modules/Home/index.php
    vtigercrm/trunk/modules/Import/Forms.php
    vtigercrm/trunk/modules/Import/ImportAccount.php
    vtigercrm/trunk/modules/Import/ImportContact.php
    vtigercrm/trunk/modules/Import/ImportLead.php
    vtigercrm/trunk/modules/Import/ImportMap.php
    vtigercrm/trunk/modules/Import/ImportOpportunity.php
    vtigercrm/trunk/modules/Import/ImportProduct.php
    vtigercrm/trunk/modules/Import/ImportSave.php
    vtigercrm/trunk/modules/Import/ImportStep2.php
    vtigercrm/trunk/modules/Import/ImportStep3.php
    vtigercrm/trunk/modules/Import/UsersLastImport.php
    vtigercrm/trunk/modules/Import/index.php
    vtigercrm/trunk/modules/Import/language/en_us.lang.php
    vtigercrm/trunk/modules/Import/parse_utils.php
    vtigercrm/trunk/modules/Invoice/CreatePDF.php
    vtigercrm/trunk/modules/Invoice/EditView.php
    vtigercrm/trunk/modules/Invoice/Invoice.php
    vtigercrm/trunk/modules/Invoice/ListTopInvoice.php
    vtigercrm/trunk/modules/Invoice/Save.php
    vtigercrm/trunk/modules/Invoice/language/en_us.lang.php
    vtigercrm/trunk/modules/Invoice/pdf_templates/header.php
    vtigercrm/trunk/modules/Leads/CallRelatedList.php
    vtigercrm/trunk/modules/Leads/ConvertLead.php
    vtigercrm/trunk/modules/Leads/Forms.php
    vtigercrm/trunk/modules/Leads/Lead.php
    vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php
    vtigercrm/trunk/modules/Leads/ListViewTop.php
    vtigercrm/trunk/modules/Leads/Merge.php
    vtigercrm/trunk/modules/Leads/Save.php
    vtigercrm/trunk/modules/Leads/language/en_us.lang.php
    vtigercrm/trunk/modules/Migration/Migration.php
    vtigercrm/trunk/modules/Migration/MigrationCheck.php
    vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php
    vtigercrm/trunk/modules/Migration/ModifyDatabase/MigrationInfo.php
    vtigercrm/trunk/modules/Migration/updateCurrency.php
    vtigercrm/trunk/modules/Notes/EditView.php
    vtigercrm/trunk/modules/Notes/Forms.php
    vtigercrm/trunk/modules/Notes/Note.php
    vtigercrm/trunk/modules/Notes/Save.php
    vtigercrm/trunk/modules/Notes/language/en_us.lang.php
    vtigercrm/trunk/modules/Portal/ListView.php
    vtigercrm/trunk/modules/Portal/Popup.php
    vtigercrm/trunk/modules/Portal/Portal.php
    vtigercrm/trunk/modules/Potentials/Charts.php
    vtigercrm/trunk/modules/Potentials/EditView.php
    vtigercrm/trunk/modules/Potentials/Forms.php
    vtigercrm/trunk/modules/Potentials/ListView.php
    vtigercrm/trunk/modules/Potentials/ListViewTop.php
    vtigercrm/trunk/modules/Potentials/Opportunity.php
    vtigercrm/trunk/modules/Potentials/Save.php
    vtigercrm/trunk/modules/Potentials/language/en_us.lang.php
    vtigercrm/trunk/modules/Potentials/updateRelations.php
    vtigercrm/trunk/modules/PriceBooks/PriceBook.php
    vtigercrm/trunk/modules/Products/AddProductToPriceBooks.php
    vtigercrm/trunk/modules/Products/AddProductsToPriceBook.php
    vtigercrm/trunk/modules/Products/DeletePriceBookProductRel.php
    vtigercrm/trunk/modules/Products/EditView.php
    vtigercrm/trunk/modules/Products/Forms.php
    vtigercrm/trunk/modules/Products/Product.php
    vtigercrm/trunk/modules/Products/Save.php
    vtigercrm/trunk/modules/Products/UpdateListPrice.php
    vtigercrm/trunk/modules/Products/addPbProductRelToDB.php
    vtigercrm/trunk/modules/Products/language/en_us.lang.php
    vtigercrm/trunk/modules/Products/updateRelations.php
    vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php
    vtigercrm/trunk/modules/PurchaseOrder/EditView.php
    vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php
    vtigercrm/trunk/modules/PurchaseOrder/Save.php
    vtigercrm/trunk/modules/PurchaseOrder/language/en_us.lang.php
    vtigercrm/trunk/modules/PurchaseOrder/pdf_templates/header.php
    vtigercrm/trunk/modules/Quotes/CreatePDF.php
    vtigercrm/trunk/modules/Quotes/EditView.php
    vtigercrm/trunk/modules/Quotes/ListTopQuotes.php
    vtigercrm/trunk/modules/Quotes/Quote.php
    vtigercrm/trunk/modules/Quotes/Save.php
    vtigercrm/trunk/modules/Quotes/language/en_us.lang.php
    vtigercrm/trunk/modules/Quotes/pdf_templates/header.php
    vtigercrm/trunk/modules/Reports/ChangeFolder.php
    vtigercrm/trunk/modules/Reports/Delete.php
    vtigercrm/trunk/modules/Reports/DeleteReportFolder.php
    vtigercrm/trunk/modules/Reports/PopulateReports.php
    vtigercrm/trunk/modules/Reports/ReportColumns.php
    vtigercrm/trunk/modules/Reports/ReportRun.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/language/en_us.lang.php
    vtigercrm/trunk/modules/Rss/ListView.php
    vtigercrm/trunk/modules/Rss/Popup.php
    vtigercrm/trunk/modules/Rss/Rss.php
    vtigercrm/trunk/modules/Rss/Star.php
    vtigercrm/trunk/modules/SalesOrder/CreateSOPDF.php
    vtigercrm/trunk/modules/SalesOrder/EditView.php
    vtigercrm/trunk/modules/SalesOrder/ListTopSalesOrder.php
    vtigercrm/trunk/modules/SalesOrder/SalesOrder.php
    vtigercrm/trunk/modules/SalesOrder/Save.php
    vtigercrm/trunk/modules/SalesOrder/language/en_us.lang.php
    vtigercrm/trunk/modules/SalesOrder/pdf_templates/header.php
    vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php
    vtigercrm/trunk/modules/Settings/AddMailAccount.php
    vtigercrm/trunk/modules/Settings/BackupServerConfig.php
    vtigercrm/trunk/modules/Settings/CurrencyDelete.php
    vtigercrm/trunk/modules/Settings/CurrencyDeleteStep1.php
    vtigercrm/trunk/modules/Settings/CurrencyEditView.php
    vtigercrm/trunk/modules/Settings/CurrencyListView.php
    vtigercrm/trunk/modules/Settings/DeleteCustomField.php
    vtigercrm/trunk/modules/Settings/DeleteLeadCustomFieldMapping.php
    vtigercrm/trunk/modules/Settings/DeleteMailAccount.php
    vtigercrm/trunk/modules/Settings/EditCompanyDetails.php
    vtigercrm/trunk/modules/Settings/EditFieldBlock.php
    vtigercrm/trunk/modules/Settings/EmailConfig.php
    vtigercrm/trunk/modules/Settings/Forms.php
    vtigercrm/trunk/modules/Settings/LeadCustomFieldMapping.php
    vtigercrm/trunk/modules/Settings/ListLeadCustomFieldMapping.php
    vtigercrm/trunk/modules/Settings/ListModuleOwners.php
    vtigercrm/trunk/modules/Settings/OrganizationConfig.php
    vtigercrm/trunk/modules/Settings/PickList.php
    vtigercrm/trunk/modules/Settings/Save.php
    vtigercrm/trunk/modules/Settings/SaveCompany.php
    vtigercrm/trunk/modules/Settings/SaveConvertLead.php
    vtigercrm/trunk/modules/Settings/SaveCurrencyInfo.php
    vtigercrm/trunk/modules/Settings/SaveMailAccount.php
    vtigercrm/trunk/modules/Settings/SettingsSubMenu.php
    vtigercrm/trunk/modules/Settings/TaxConfig.php
    vtigercrm/trunk/modules/Settings/add2db.php
    vtigercrm/trunk/modules/Settings/downloadfile.php
    vtigercrm/trunk/modules/Settings/language/en_us.lang.php
    vtigercrm/trunk/modules/Users/Announcements.php
    vtigercrm/trunk/modules/Users/Authenticate.php
    vtigercrm/trunk/modules/Users/ChangePassword.php
    vtigercrm/trunk/modules/Users/CreateProfile.php
    vtigercrm/trunk/modules/Users/CreateProfile1.php
    vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php
    vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
    vtigercrm/trunk/modules/Users/Delete.php
    vtigercrm/trunk/modules/Users/DeleteGroup.php
    vtigercrm/trunk/modules/Users/DeleteUser.php
    vtigercrm/trunk/modules/Users/DetailView.php
    vtigercrm/trunk/modules/Users/EditHomeOrder.php
    vtigercrm/trunk/modules/Users/EditInventoryNotification.php
    vtigercrm/trunk/modules/Users/EditNotification.php
    vtigercrm/trunk/modules/Users/EditView.php
    vtigercrm/trunk/modules/Users/Forms.php
    vtigercrm/trunk/modules/Users/ListProfiles.php
    vtigercrm/trunk/modules/Users/Listhistory.php
    vtigercrm/trunk/modules/Users/Login.php
    vtigercrm/trunk/modules/Users/LoginHistory.php
    vtigercrm/trunk/modules/Users/Logout.php
    vtigercrm/trunk/modules/Users/OrgSharingDetailView.php
    vtigercrm/trunk/modules/Users/OrganizationTermsandConditions.php
    vtigercrm/trunk/modules/Users/ProfileDeleteStep1.php
    vtigercrm/trunk/modules/Users/RoleDetailView.php
    vtigercrm/trunk/modules/Users/RoleDragDrop.php
    vtigercrm/trunk/modules/Users/RolePopup.php
    vtigercrm/trunk/modules/Users/Save.php
    vtigercrm/trunk/modules/Users/SaveGroup.php
    vtigercrm/trunk/modules/Users/SaveInventoryNotification.php
    vtigercrm/trunk/modules/Users/SaveNotification.php
    vtigercrm/trunk/modules/Users/SaveOrgSharing.php
    vtigercrm/trunk/modules/Users/SaveProfile.php
    vtigercrm/trunk/modules/Users/SaveRole.php
    vtigercrm/trunk/modules/Users/TabCustomise.php
    vtigercrm/trunk/modules/Users/UpdateDefaultFieldLevelAccess.php
    vtigercrm/trunk/modules/Users/UpdateProfileChanges.php
    vtigercrm/trunk/modules/Users/UpdateTab.php
    vtigercrm/trunk/modules/Users/User.php
    vtigercrm/trunk/modules/Users/UserDeleteStep1.php
    vtigercrm/trunk/modules/Users/UsersAjax.php
    vtigercrm/trunk/modules/Users/add2db.php
    vtigercrm/trunk/modules/Users/binaryfilelist.php
    vtigercrm/trunk/modules/Users/createrole.php
    vtigercrm/trunk/modules/Users/deleteemailtemplate.php
    vtigercrm/trunk/modules/Users/deletewordtemplate.php
    vtigercrm/trunk/modules/Users/detailviewemailtemplate.php
    vtigercrm/trunk/modules/Users/downloadfile.php
    vtigercrm/trunk/modules/Users/editemailtemplate.php
    vtigercrm/trunk/modules/Users/language/en_us.lang.php
    vtigercrm/trunk/modules/Users/listemailtemplates.php
    vtigercrm/trunk/modules/Users/listinventorynotifications.php
    vtigercrm/trunk/modules/Users/listnotificationschedulers.php
    vtigercrm/trunk/modules/Users/listroles.php
    vtigercrm/trunk/modules/Users/listwordtemplates.php
    vtigercrm/trunk/modules/Users/lookupemailtemplates.php
    vtigercrm/trunk/modules/Users/massChangeStatus.php
    vtigercrm/trunk/modules/Users/massdelete.php
    vtigercrm/trunk/modules/Users/populatetemplate.php
    vtigercrm/trunk/modules/Users/profilePrivileges.php
    vtigercrm/trunk/modules/Users/saveemailtemplate.php
    vtigercrm/trunk/modules/Users/savetermsandconditions.php
    vtigercrm/trunk/modules/Users/updateLeadDBStatus.php
    vtigercrm/trunk/modules/Users/updateNotificationSchedulers.php
    vtigercrm/trunk/modules/Utilities/Merge.php
    vtigercrm/trunk/modules/Vendors/Vendor.php
    vtigercrm/trunk/modules/Vendors/updateRelations.php
    vtigercrm/trunk/modules/Webmails/CallRelatedList.php
    vtigercrm/trunk/modules/Webmails/ListView.php
    vtigercrm/trunk/modules/Webmails/Save.php
    vtigercrm/trunk/modules/Webmails/Webmail.php
    vtigercrm/trunk/modules/Webmails/dlAttachments.php
    vtigercrm/trunk/modules/Webmails/images/index.php
    vtigercrm/trunk/modules/Webmails/language/en_us.lang.php
    vtigercrm/trunk/soap/contactserialize.php
    vtigercrm/trunk/soap/customerportal.php
    vtigercrm/trunk/soap/vtigerolservice.php
    vtigercrm/trunk/soap/webforms.php

Modified: vtigercrm/trunk/cron/intimateTaskStatus.php
==============================================================================
--- vtigercrm/trunk/cron/intimateTaskStatus.php (original)
+++ vtigercrm/trunk/cron/intimateTaskStatus.php Mon Jun 12 14:26:25 2006
@@ -16,20 +16,20 @@
 $selecteddb = $dbconfig['db_name'];
 mysql_select_db($selecteddb,$db);
 
-$emailresult = mysql_query("SELECT email1 from users",$db);
+$emailresult = mysql_query("SELECT email1 from vtiger_users",$db);
 $emailid = mysql_fetch_row($emailresult);
 $emailaddress = $emailid[0];
-$mailserveresult = mysql_query("SELECT server,server_username,server_password FROM systems",$db);
+$mailserveresult = mysql_query("SELECT server,server_username,server_password FROM vtiger_systems",$db);
 $mailrow = mysql_fetch_row($mailserveresult);
 $mailserver = $mailrow[0];
 
 $mailuname = $mailrow[1];
 $mailpwd = $mailrow[1];
 
-//query the notificationscheduler table and get data for those notifications which are active
+//query the vtiger_notificationscheduler vtiger_table and get data for those notifications which are active
 
 
-$sql = "select active from notificationscheduler where schedulednotificationid=1";
+$sql = "select active from vtiger_notificationscheduler where schedulednotificationid=1";
 $result = mysql_query($sql);
 
 $activevalue = mysql_fetch_row($result);
@@ -39,7 +39,7 @@
 
 //get all those activities where the status is not completed even after the passing of 24 hours
 $today = date("Ymd"); 
-$result = mysql_query("select (activity.date_start +1) from activity where activity.status !='Completed' and ".$today." > (activity.date_start+1)",$db);
+$result = mysql_query("select (vtiger_activity.date_start +1) from vtiger_activity where vtiger_activity.status !='Completed' and ".$today." > (vtiger_activity.date_start+1)",$db);
 while ($myrow = mysql_fetch_row($result))
 {
   $status=$myrow[0];
@@ -51,13 +51,13 @@
 }
 
 //Big Deal Alert
-$sql = "select active from notificationscheduler where schedulednotificationid=2";
+$sql = "select active from vtiger_notificationscheduler where schedulednotificationid=2";
 $result = mysql_query($sql);
 
 $activevalue = mysql_fetch_row($result);
 if($activevalue[0] == 1)
 {
-$result = mysql_query("SELECT sales_stage,amount FROM potential",$db);
+$result = mysql_query("SELECT sales_stage,amount FROM vtiger_potential",$db);
 while ($myrow = mysql_fetch_row($result))
 {
   $amount=$myrow[1];
@@ -72,13 +72,13 @@
 }
 
 //Pending tickets
-$sql = "select active from notificationscheduler where schedulednotificationid=3";
+$sql = "select active from vtiger_notificationscheduler where schedulednotificationid=3";
 $result = mysql_query($sql);
 
 $activevalue = mysql_fetch_row($result);
 if($activevalue[0] == 1)
 {
-$result = mysql_query("SELECT status,ticketid FROM troubletickets",$db);
+$result = mysql_query("SELECT status,ticketid FROM vtiger_troubletickets",$db);
 while ($myrow = mysql_fetch_row($result))
 {
   $status=$myrow[0];
@@ -94,15 +94,15 @@
 
 }
 
-//Too many tickets related to a particular account/company causing concern
-$sql = "select active from notificationscheduler where schedulednotificationid=4";
+//Too many tickets related to a particular vtiger_account/company causing concern
+$sql = "select active from vtiger_notificationscheduler where schedulednotificationid=4";
 $result = mysql_query($sql);
 
 $activevalue = mysql_fetch_row($result);
 if($activevalue[0] == 1)
 {
 
-$result = mysql_query("SELECT status,troubletickets.ticketid FROM troubletickets where status!='Completed'",$db);
+$result = mysql_query("SELECT status,vtiger_troubletickets.ticketid FROM vtiger_troubletickets where status!='Completed'",$db);
 while ($myrow = mysql_fetch_row($result))
 {
   $status=$myrow[0];
@@ -114,13 +114,13 @@
 }
 
 //Support Starting
-$sql = "select active from notificationscheduler where schedulednotificationid=5";
+$sql = "select active from vtiger_notificationscheduler where schedulednotificationid=5";
 $result = mysql_query($sql);
 
 $activevalue = mysql_fetch_row($result);
 if($activevalue[0] == 1)
 {
-$result = mysql_query("SELECT start_date FROM products",$db);
+$result = mysql_query("SELECT start_date FROM vtiger_products",$db);
 while ($myrow = mysql_fetch_row($result))
 {
   $status=$myrow[0];
@@ -130,14 +130,14 @@
 }
 
 //Support ending
-$sql = "select active from notificationscheduler where schedulednotificationid=6";
+$sql = "select active from vtiger_notificationscheduler where schedulednotificationid=6";
 $result = mysql_query($sql);
 
 $activevalue = mysql_fetch_row($result);
 if($activevalue[0] == 1)
 {
 
-$result = mysql_query("SELECT expiry_date from products",$db);
+$result = mysql_query("SELECT expiry_date from vtiger_products",$db);
 while ($myrow = mysql_fetch_row($result))
 {
   $status=$myrow[0];

Modified: vtigercrm/trunk/data/CRMEntity.php
==============================================================================
--- vtigercrm/trunk/data/CRMEntity.php (original)
+++ vtigercrm/trunk/data/CRMEntity.php Mon Jun 12 14:26:25 2006
@@ -31,9 +31,9 @@
   /**
    * This method implements a generic insert and update logic for any SugarBean
    * This method only works for subclasses that implement the same variable names.
-   * This method uses the presence of an id field that is not null to signify and update.
-   * The id field should not be set otherwise.
-   * todo - Add support for field type validation and encoding of parameters.
+   * This method uses the presence of an id vtiger_field that is not null to signify and update.
+   * The id vtiger_field should not be set otherwise.
+   * todo - Add support for vtiger_field type validation and encoding of parameters.
    * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
    * All Rights Reserved.
    * Contributor(s): ______________________________________..
@@ -68,19 +68,19 @@
 
 	foreach($this->tab_name as $table_name)
 	{
-		if($table_name == "crmentity")
+		if($table_name == "vtiger_crmentity")
 		{
 			$this->insertIntoCrmEntity($module);
 		}
-		elseif($table_name == "salesmanactivityrel")
+		elseif($table_name == "vtiger_salesmanactivityrel")
 		{
 			$this->insertIntoSmActivityRel($module);
 		}
 		//added by raju
-		elseif($table_name=="seactivityrel" )
+		elseif($table_name=="vtiger_seactivityrel" )
 		{
 			if($module=="Emails" && $_REQUEST['smodule']!='webmails')
-			//modified by Richie as raju's implementation broke the feature for addition of webmail to crmentity.need to be more careful in future while integrating code
+			//modified by Richie as raju's implementation broke the feature for addition of webmail to vtiger_crmentity.need to be more careful in future while integrating code
 			//if($_REQUEST['smodule']!='webmails' && $_REQUEST['smodule'] != '')
 			{
 				if($_REQUEST['currentid']!='')
@@ -95,9 +95,9 @@
 				if($_REQUEST['module'] != 'Emails' && $_REQUEST['module'] != 'Webmails')
 				{
 					if(!$parentid) {
-						$parentid = $adb->getUniqueID('seactivityrel');
+						$parentid = $adb->getUniqueID('vtiger_seactivityrel');
 					}
-					$mysql='insert into seactivityrel values('.$parentid.','.$actid.')';
+					$mysql='insert into vtiger_seactivityrel values('.$parentid.','.$actid.')';
 					$adb->query($mysql);
 				}
 				else
@@ -107,11 +107,11 @@
 					{
 						$realid=explode("@",$myids[$i]);
 						$mycrmid=$realid[0];
-						//added to handle the relationship of emails with users
+						//added to handle the relationship of emails with vtiger_users
 						if($realid[1] == -1)
-							$mysql='insert into salesmanactivityrel values('.$mycrmid.','.$actid.')';
+							$mysql='insert into vtiger_salesmanactivityrel values('.$mycrmid.','.$actid.')';
 						else	
-							$mysql='insert into seactivityrel values('.$mycrmid.','.$actid.')';
+							$mysql='insert into vtiger_seactivityrel values('.$mycrmid.','.$actid.')';
 						$adb->query($mysql);
 					}
 				}
@@ -128,7 +128,7 @@
 				}
 			}			
 		}
-		elseif($table_name == "seticketsrel" || $table_name ==  "seproductsrel" || $table_name ==  "senotesrel")
+		elseif($table_name == "vtiger_seticketsrel" || $table_name ==  "vtiger_seproductsrel" || $table_name ==  "vtiger_senotesrel")
 		{
 			if(isset($this->column_fields['parent_id']) && $this->column_fields['parent_id'] != '')//raju - mass mailing ends
 			{
@@ -139,7 +139,7 @@
 				$this->deleteRelation($table_name);
 			}
 		}
-		elseif($table_name ==  "cntactivityrel")
+		elseif($table_name ==  "vtiger_cntactivityrel")
 		{
 			if(isset($this->column_fields['contact_id']) && $this->column_fields['contact_id'] != '')
 			{
@@ -151,22 +151,22 @@
 			}
 
 		}
-		elseif($table_name ==  "ticketcomments")
+		elseif($table_name ==  "vtiger_ticketcomments")
 		{
                 	$this->insertIntoTicketCommentTable($table_name, $module);
 		}
-		elseif($table_name ==  "faqcomments")
+		elseif($table_name ==  "vtiger_faqcomments")
 		{
                 	$this->insertIntoFAQCommentTable($table_name, $module);
 		}
-		elseif($table_name == "activity_reminder")
+		elseif($table_name == "vtiger_activity_reminder")
 		{
 			if($recur_type == "--None--")
 			{
 				$this->insertIntoReminderTable($table_name,$module,"");
 			}
 		}
-		elseif($table_name == "recurringevents") // Code included by Jaguar -  starts
+		elseif($table_name == "vtiger_recurringevents") // Code included by Jaguar -  starts
 		{
 			$recur_type = trim($_REQUEST['recurringtype']);
 			if($recur_type != "--None--"  && $recur_type != '')
@@ -175,7 +175,7 @@
 			}		
 		}// Code included by Jaguar - Ends
 		// Code included by Minnie  -  starts	
-		elseif($table_name == "invitees") 
+		elseif($table_name == "vtiger_invitees") 
 		{
 			if($invitees_array != '')
 			{
@@ -183,11 +183,11 @@
 			}
 		}
 		// Code included by Minnie  -  Ends
-		elseif($table_name == 'producttaxrel')
+		elseif($table_name == 'vtiger_producttaxrel')
 		{
 			$this->insertTaxInformation($table_name, $module);
 		}
-		elseif($table_name == 'attachments')
+		elseif($table_name == 'vtiger_attachments')
 		{
 			$this->insertIntoAttachment($this->id,$module);
 		}
@@ -226,7 +226,7 @@
 			$data = base64_encode(fread(fopen($filedata, "r"), $filesize));
 		}
 		
-		$current_id = $adb->getUniqueID("crmentity");
+		$current_id = $adb->getUniqueID("vtiger_crmentity");
 
 		if($module=='Emails') 
 		{ 
@@ -241,22 +241,22 @@
 		$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 vtiger_crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime,modifiedtime) values(".$current_id.",".$current_user->id.",".$ownerid.",'".$module." Attachment','"."',".$adb->formatString("vtiger_crmentity","createdtime",$date_var).",".$adb->formatString("vtiger_crmentity","modifiedtime",$date_var).")";
 		$adb->query($sql1);
 
-		$sql2="insert into attachments(attachmentsid, name, description, type) values(".$current_id.",'".$filename."','"."','".$filetype."')";
+		$sql2="insert into vtiger_attachments(attachmentsid, name, description, type) values(".$current_id.",'".$filename."','"."','".$filetype."')";
 		$result=$adb->query($sql2);
 
 		//TODO -- instead of put contents in db now we should store the file in harddisk
 
-		$sql3='insert into seattachmentsrel values('.$id.','.$current_id.')';
+		$sql3='insert into vtiger_seattachmentsrel values('.$id.','.$current_id.')';
 		$adb->query($sql3);
 	}
 
 
 	/**
-	 *      This function is used to add the attachments. This will call the function uploadAndSaveFile which will upload the attachment into the server and save that attachment information in the database.
-	 *      @param int $id  - entity id to which the files to be uploaded
+	 *      This function is used to add the vtiger_attachments. This will call the function uploadAndSaveFile which will upload the attachment into the server and save that attachment information in the database.
+	 *      @param int $id  - entity id to which the vtiger_files to be uploaded
 	 *      @param string $module  - the current module name
 	*/
 	function insertIntoAttachment($id,$module)
@@ -272,17 +272,17 @@
 			}
 		}
 
-		//Remove the deleted attachments from db - Products
+		//Remove the deleted vtiger_attachments from db - Products
 		if($module == 'Products' && $_REQUEST['del_file_list'] != '')
 		{
 			$del_file_list = explode("###",trim($_REQUEST['del_file_list'],"###"));
 			foreach($del_file_list as $del_file_name)
 			{
-				$attach_res = $adb->query("select attachments.attachmentsid from attachments inner join seattachmentsrel on attachments.attachmentsid=seattachmentsrel.attachmentsid where crmid=$id and name=\"$del_file_name\"");
+				$attach_res = $adb->query("select vtiger_attachments.attachmentsid from vtiger_attachments inner join vtiger_seattachmentsrel on vtiger_attachments.attachmentsid=vtiger_seattachmentsrel.attachmentsid where crmid=$id and name=\"$del_file_name\"");
 				$attachments_id = $adb->query_result($attach_res,0,'attachmentsid');
 				
-				$del_res1 = $adb->query("delete from attachments where attachmentsid=$attachments_id");
-				$del_res2 = $adb->query("delete from seattachmentsrel where attachmentsid=$attachments_id");
+				$del_res1 = $adb->query("delete from vtiger_attachments where attachmentsid=$attachments_id");
+				$del_res2 = $adb->query("delete from vtiger_seattachmentsrel where attachmentsid=$attachments_id");
 			}
 		}
 
@@ -344,35 +344,35 @@
 
 		if($save_file == 'true')
 		{
-			$current_id = $adb->getUniqueID("crmentity");
-
-			//This is only to update the attached filename in the notes table for the Notes module
+			$current_id = $adb->getUniqueID("vtiger_crmentity");
+
+			//This is only to update the attached filename in the vtiger_notes vtiger_table for the Notes module
 			if($module=='Notes')
 			{
-				$sql="update notes set filename='".$filename."' where notesid = ".$id;
+				$sql="update vtiger_notes set filename='".$filename."' where notesid = ".$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 vtiger_crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime,modifiedtime) values(".$current_id.",".$current_user->id.",".$ownerid.",'".$module." Attachment','".$this->column_fields['description']."',".$adb->formatString("vtiger_crmentity","createdtime",$date_var).",".$adb->formatString("vtiger_crmentity","modifiedtime",$date_var).")";
 			$adb->query($sql1);
 
-			$sql2="insert into attachments(attachmentsid, name, description, type, path) values(".$current_id.",'".$filename."','".$this->column_fields['description']."','".$filetype."','".$upload_file_path."')";
+			$sql2="insert into vtiger_attachments(attachmentsid, name, description, type, path) values(".$current_id.",'".$filename."','".$this->column_fields['description']."','".$filetype."','".$upload_file_path."')";
 			$result=$adb->query($sql2);
 
 			if($_REQUEST['mode'] == 'edit')
 			{
 				if($id != '' && $_REQUEST['fileid'] != '')
 				{
-					$delquery = 'delete from seattachmentsrel where crmid = '.$id.' and attachmentsid = '.$_REQUEST['fileid'];
+					$delquery = 'delete from vtiger_seattachmentsrel where crmid = '.$id.' and attachmentsid = '.$_REQUEST['fileid'];
 					$adb->query($delquery);
 				}
 			}
 			if($module == 'Notes')
 			{
-				$query = "delete from seattachmentsrel where crmid = ".$id;
+				$query = "delete from vtiger_seattachmentsrel where crmid = ".$id;
 				$adb->query($query);
 			}
-			$sql3='insert into seattachmentsrel values('.$id.','.$current_id.')';
+			$sql3='insert into vtiger_seattachmentsrel values('.$id.','.$current_id.')';
 			$adb->query($sql3);
 		}
 		else
@@ -413,31 +413,31 @@
 	}
 	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;
+		$description_val = from_html($adb->formatString("vtiger_crmentity","description",$this->column_fields['description']),($insertion_mode == 'edit')?true:false);
+		$sql = "update vtiger_crmentity set smownerid=".$ownerid.",modifiedby=".$current_user->id.",description=".$description_val.", modifiedtime=".$adb->formatString("vtiger_crmentity","modifiedtime",$date_var)." where crmid=".$this->id;
 
 		$adb->query($sql);
-		$sql1 ="delete from ownernotify where crmid=".$this->id;
+		$sql1 ="delete from vtiger_ownernotify where crmid=".$this->id;
 		$adb->query($sql1);
 		if($ownerid != $current_user->id)
 		{
-			$sql1 = "insert into ownernotify values(".$this->id.",".$ownerid.",null)";
+			$sql1 = "insert into vtiger_ownernotify values(".$this->id.",".$ownerid.",null)";
 			$adb->query($sql1);
 		}
 	}
 	else
 	{
 		//if this is the create mode and the group allocation is chosen, then do the following
-		$current_id = $adb->getUniqueID("crmentity");
+		$current_id = $adb->getUniqueID("vtiger_crmentity");
 		$_REQUEST['currentid']=$current_id;
 
-		$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.",".$adb->formatDate($date_var).",".$adb->formatDate($date_var).")";
+		$description_val = from_html($adb->formatString("vtiger_crmentity","description",$this->column_fields['description']),($insertion_mode == 'edit')?true:false);
+		$sql = "insert into vtiger_crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime,modifiedtime) values('".$current_id."','".$current_user->id."','".$ownerid."','".$module."',".$description_val.",".$adb->formatDate($date_var).",".$adb->formatDate($date_var).")";
 		$adb->query($sql);
 		$this->id = $current_id;
 	}
 
-	//$sql = "insert into crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime,modifiedtime) values(".$current_id.",".$current_user->id.",".$ownerid.",'".$module."','".$this->column_fields['description']."',".$adb->formatString("crmentity","createdtime",$date_var).",".$adb->formatString("crmentity","modifiedtime",$date_var).")";
+	//$sql = "insert into vtiger_crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime,modifiedtime) values(".$current_id.",".$current_user->id.",".$ownerid.",'".$module."','".$this->column_fields['description']."',".$adb->formatString("crmentity","createdtime",$date_var).",".$adb->formatString("crmentity","modifiedtime",$date_var).")";
 	//$adb->query($sql);
 	//echo $sql;
 	//$this->id = $current_id;
@@ -452,11 +452,11 @@
     if($this->mode == 'edit')
     {
 
-      $sql = "delete from salesmanactivityrel where activityid=".$this->id." and smid = ".$this->column_fields['assigned_user_id']."";
+      $sql = "delete from vtiger_salesmanactivityrel where activityid=".$this->id." and smid = ".$this->column_fields['assigned_user_id']."";
       $adb->query($sql);
 
     }
-	$sql_qry = "insert into salesmanactivityrel (smid,activityid) values(".$this->column_fields['assigned_user_id'].",".$this->id.")";
+	$sql_qry = "insert into vtiger_salesmanactivityrel (smid,activityid) values(".$this->column_fields['assigned_user_id'].",".$this->id.")";
     $adb->query($sql_qry);
 
   }
@@ -467,8 +467,8 @@
     global $current_user;
     $ticketid = $id;
     //Updating History
-    $tktresult = $adb->query("select * from troubletickets where ticketid='".$ticketid."'");
-    $crmresult = $adb->query("select * from crmentity where crmid='".$ticketid."'");
+    $tktresult = $adb->query("select * from vtiger_troubletickets where ticketid='".$ticketid."'");
+    $crmresult = $adb->query("select * from vtiger_crmentity where crmid='".$ticketid."'");
     $updatelog = $adb->query_result($tktresult,0,"update_log");
     $old_user_id = $adb->query_result($crmresult,0,"smownerid");
     $old_status = $adb->query_result($tktresult,0,"status");
@@ -518,11 +518,11 @@
   function insertIntoEntityTable($table_name, $module)
   {
 	  global $log;	
-	   $log->info("function insertIntoCrmEntity ".$module.' table name ' .$table_name);
+	   $log->info("function insertIntoCrmEntity ".$module.' vtiger_table name ' .$table_name);
 	  global $adb;
 	  $insertion_mode = $this->mode;
 
-	  //Checkin whether an entry is already is present in the table to update
+	  //Checkin whether an entry is already is present in the vtiger_table to update
 	  if($insertion_mode == 'edit')
 	  {
 		  $check_query = "select * from ".$table_name." where ".$this->tab_name_index[$table_name]."=".$this->id;
@@ -547,7 +547,7 @@
 	  }
 
 	  $tabid= getTabid($module);	
-	  $sql = "select * from field where tabid=".$tabid." and tablename='".$table_name."' and displaytype in (1,3)"; 
+	  $sql = "select * from vtiger_field where tabid=".$tabid." and tablename='".$table_name."' and displaytype in (1,3)"; 
 	  $result = $adb->query($sql);
 	  $noofrows = $adb->num_rows($result);
 	  for($i=0; $i<$noofrows; $i++)
@@ -616,18 +616,18 @@
 		  if($insertion_mode == 'edit')
 		  {
 			  //code by richie starts
-			  if(($table_name == "troubletickets") && ($columname == "update_log"))
+			  if(($table_name == "vtiger_troubletickets") && ($columname == "update_log"))
 			  {
 				  $fldvalue = $this->constructUpdateLog($this->id);
 				  $fldvalue = from_html($adb->formatString($table_name,$columname,$fldvalue),($insertion_mode == 'edit')?true:false);
 			  }
 			  //code by richie ends
 
-			  if($table_name == 'notes' && $columname == 'filename' && $_FILES['filename']['name'] == '')
+			  if($table_name == 'vtiger_notes' && $columname == 'filename' && $_FILES['filename']['name'] == '')
 			  {
 				  $fldvalue = $this->getOldFileName($this->id);
 			  }
-			  if($table_name == 'products' && $columname == 'imagename')
+			  if($table_name == 'vtiger_products' && $columname == 'imagename')
 			  {
 			/*	  //Product Image Handling done
 				  if($_FILES['imagename']['name'] != '')
@@ -653,7 +653,7 @@
 		      */		  
 
 			  }
-			  if($table_name != 'ticketcomments')
+			  if($table_name != 'vtiger_ticketcomments')
 			  {
 				  if($i == 0)
 				  {
@@ -668,7 +668,7 @@
 		  else
 		  {
 			  //code by richie starts
-			  if(($table_name == "troubletickets") && ($columname == "update_log"))
+			  if(($table_name == "vtiger_troubletickets") && ($columname == "update_log"))
 			  {
 				  global $current_user;
 				  $fldvalue = date("l dS F Y h:i:s A").' by '.$current_user->user_name;
@@ -692,7 +692,7 @@
 				  $fldvalue = from_html($adb->formatString($table_name,$columname,$fldvalue),($insertion_mode == 'edit')?true:false);
 				  //echo ' updatevalue is ............. ' .$fldvalue;
 			  }
-			  elseif($table_name == 'products' && $columname == 'imagename')
+			  elseif($table_name == 'vtiger_products' && $columname == 'imagename')
 			  {
 				  //Product Image Handling done
 			/*	  if($_FILES['imagename']['name'] != '')
@@ -733,15 +733,15 @@
 	  {
 		  if($_REQUEST['module'] == 'Potentials')
 		  {
-			  $dbquery = 'select sales_stage from potential where potentialid = '.$this->id;
+			  $dbquery = 'select vtiger_sales_stage from vtiger_potential where potentialid = '.$this->id;
 			  $sales_stage = $adb->query_result($adb->query($dbquery),0,'sales_stage');
 			  if($sales_stage != $_REQUEST['sales_stage'])
 			  {
 				  $date_var = 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 vtiger_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).")";
 				  //Changed to insert the close date based on user date format - after 4.2 patch2
 				  $closingdate = getDBInsertDateValue($_REQUEST['closingdate']);
-				  $sql = "insert into potstagehistory values('',".$this->id.",'".$_REQUEST['amount']."','".$sales_stage."','".$_REQUEST['probability']."',0,".$adb->formatString("potstagehistory","closedate",$closingdate).",".$adb->formatString("potstagehistory","lastmodified",$date_var).")";
+				  $sql = "insert into vtiger_potstagehistory values('',".$this->id.",'".$_REQUEST['amount']."','".$sales_stage."','".$_REQUEST['probability']."',0,".$adb->formatString("vtiger_potstagehistory","closedate",$closingdate).",".$adb->formatString("vtiger_potstagehistory","lastmodified",$date_var).")";
 				  $adb->query($sql);
 			  }
 		  }
@@ -758,49 +758,49 @@
 		  {
 			  $groupname = $_REQUEST['assigned_group_name'];
 			  //echo 'about to update lead group relation';
-			  if($module == 'Leads' && $table_name == 'leaddetails')
+			  if($module == 'Leads' && $table_name == 'vtiger_leaddetails')
 			  {
 				  updateLeadGroupRelation($this->id,$groupname);
 			  }
-                          elseif($module == 'Accounts' && $table_name == 'account')
+                          elseif($module == 'Accounts' && $table_name == 'vtiger_account')
 			  {
 				  updateAccountGroupRelation($this->id,$groupname);
 			  }
-			  elseif($module == 'Contacts' && $table_name == 'contactdetails')
+			  elseif($module == 'Contacts' && $table_name == 'vtiger_contactdetails')
 			  {
 				  updateContactGroupRelation($this->id,$groupname);
 			  }
-			  elseif($module == 'Potentials' && $table_name == 'potential')
+			  elseif($module == 'Potentials' && $table_name == 'vtiger_potential')
 			  {
 				  updatePotentialGroupRelation($this->id,$groupname);
 			  }
-			  elseif($module == 'Quotes' && $table_name == 'quotes')
+			  elseif($module == 'Quotes' && $table_name == 'vtiger_quotes')
 			  {
 				  updateQuoteGroupRelation($this->id,$groupname);
 			  }
-			  elseif($module == 'SalesOrder' && $table_name == 'salesorder')
+			  elseif($module == 'SalesOrder' && $table_name == 'vtiger_salesorder')
 			  {
 				  updateSoGroupRelation($this->id,$groupname);
 			  }
-			  elseif($module == 'Invoice' && $table_name == 'invoice')
+			  elseif($module == 'Invoice' && $table_name == 'vtiger_invoice')
 			  {
 				  updateInvoiceGroupRelation($this->id,$groupname);
 			  }
-			  elseif($module == 'PurchaseOrder' && $table_name == 'purchaseorder')
+			  elseif($module == 'PurchaseOrder' && $table_name == 'vtiger_purchaseorder')
 			  {
 				  updatePoGroupRelation($this->id,$groupname);
 			  }
-			  elseif($module == 'HelpDesk' && $table_name == 'troubletickets')
+			  elseif($module == 'HelpDesk' && $table_name == 'vtiger_troubletickets')
 			  {
 				  updateTicketGroupRelation($this->id,$groupname);
 			  }
-			  elseif($module == 'Campaigns' && $table_name == 'campaign')
+			  elseif($module == 'Campaigns' && $table_name == 'vtiger_campaign')
 			  {
 				  updateCampaignGroupRelation($this->id,$groupname);
 			  }
 			  elseif($module =='Activities' || $module =='Events' || $module == 'Emails')
 			  {
-				 if($table_name == 'activity')
+				 if($table_name == 'vtiger_activity')
 				 {
 				   updateActivityGroupRelation($this->id,$groupname);
 				 }
@@ -811,49 +811,49 @@
 		  else
 		  {
 			  //echo 'about to update lead group relation again!';
-			  if($module == 'Leads' && $table_name == 'leaddetails')
+			  if($module == 'Leads' && $table_name == 'vtiger_leaddetails')
 			  {
 				  updateLeadGroupRelation($this->id,'');
 			  }
-			  elseif($module == 'Accounts' && $table_name == 'account')
+			  elseif($module == 'Accounts' && $table_name == 'vtiger_account')
 			  {
 				  updateAccountGroupRelation($this->id,'');
 			  }
-			  elseif($module == 'Contacts' && $table_name == 'contactdetails')
+			  elseif($module == 'Contacts' && $table_name == 'vtiger_contactdetails')
 			  {
 				  updateContactGroupRelation($this->id,'');
 			  }
-			  elseif($module == 'Potentials' && $table_name == 'potential')
+			  elseif($module == 'Potentials' && $table_name == 'vtiger_potential')
 			  {
 				  updatePotentialGroupRelation($this->id,'');
 			  }
-			  elseif($module == 'Quotes' && $table_name == 'quotes')
+			  elseif($module == 'Quotes' && $table_name == 'vtiger_quotes')
 			  {
 				  updateQuoteGroupRelation($this->id,'');
 			  }
-			  elseif($module == 'SalesOrder' && $table_name == 'salesorder')
+			  elseif($module == 'SalesOrder' && $table_name == 'vtiger_salesorder')
 			  {
 				  updateSoGroupRelation($this->id,'');
 			  }
-			  elseif($module == 'Invoice' && $table_name == 'invoice')
+			  elseif($module == 'Invoice' && $table_name == 'vtiger_invoice')
 			  {
 				  updateInvoiceGroupRelation($this->id,'');
 			  }
-			  elseif($module == 'PurchaseOrder' && $table_name == 'purchaseorder')
+			  elseif($module == 'PurchaseOrder' && $table_name == 'vtiger_purchaseorder')
 			  {
 				  updatePoGroupRelation($this->id,'');
 			  }
-			  elseif($module == 'HelpDesk' && $table_name == 'troubletickets')
+			  elseif($module == 'HelpDesk' && $table_name == 'vtiger_troubletickets')
 			  {
 				  updateTicketGroupRelation($this->id,'');
 			  }
-			  elseif($module == 'Campaigns' && $table_name == 'campaign')
+			  elseif($module == 'Campaigns' && $table_name == 'vtiger_campaign')
 			  {
 				  updateCampaignGroupRelation($this->id,$groupname);
 			  }
 			  elseif($module =='Activities' || $module =='Events' || $module == 'Emails')
 			  {
-				  if($table_name == 'activity')
+				  if($table_name == 'vtiger_activity')
                                   {
 			             updateActivityGroupRelation($this->id,$groupname);
 				  }
@@ -868,47 +868,47 @@
 		  $sql1 = "insert into ".$table_name." (".$column.") values(".$value.")";
 		  $adb->query($sql1); 
 		  $groupname = $_REQUEST['assigned_group_name'];
-		  if($_REQUEST['assigntype'] == 'T' && $table_name == 'leaddetails')
+		  if($_REQUEST['assigntype'] == 'T' && $table_name == 'vitger_leaddetails')
 		  {
 			  insert2LeadGroupRelation($this->id,$groupname);
 		  }
-		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'account')
+		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'vitger_account')
 		  {
 			  insert2AccountGroupRelation($this->id,$groupname);
 		  }
-		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'contactdetails')
+		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'vitger_contactdetails')
 		  {
 			  insert2ContactGroupRelation($this->id,$groupname);
 		  }
-		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'potential')
+		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'vitger_potential')
 		  {
 			  insert2PotentialGroupRelation($this->id,$groupname);
 		  }
-		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'quotes')
+		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'vitger_quotes')
 		  {
 			  insert2QuoteGroupRelation($this->id,$groupname);
 		  }
-		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'salesorder')
+		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'vitger_salesorder')
 		  {
 			  insert2SoGroupRelation($this->id,$groupname);
 		  }
-		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'invoice')
+		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'vitger_invoice')
 		  {
 			  insert2InvoiceGroupRelation($this->id,$groupname);
 		  }
-		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'purchaseorder')
+		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'vitger_purchaseorder')
 		  {
 			  insert2PoGroupRelation($this->id,$groupname);
 		  }
-		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'activity') 
+		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'vitger_activity') 
 		  {
 			  insert2ActivityGroupRelation($this->id,$groupname);
 		  }
-		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'troubletickets') 
+		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'vitger_troubletickets') 
 		  {
 			  insert2TicketGroupRelation($this->id,$groupname);
 		  }
-		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'campaign')
+		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'vitger_campaign')
 		  {
 			  insert2CampaignGroupRelation($this->id,$groupname);
 		  }
@@ -935,14 +935,14 @@
 	   global $log;
 $log->info("in getOldFileName  ".$notesid);
 	global $adb;
-	$query1 = "select * from seattachmentsrel where crmid=".$notesid;
+	$query1 = "select * from vtiger_seattachmentsrel where crmid=".$notesid;
 	$result = $adb->query($query1);
 	$noofrows = $adb->num_rows($result);
 	if($noofrows != 0)
 		$attachmentid = $adb->query_result($result,0,'attachmentsid');
 	if($attachmentid != '')
 	{
-		$query2 = "select * from attachments where attachmentsid=".$attachmentid;
+		$query2 = "select * from vtiger_attachments where attachmentsid=".$attachmentid;
 		$filename = $adb->query_result($adb->query($query2),0,'name');
 	}
 	return "'".$filename."'";
@@ -963,7 +963,7 @@
 	if($_REQUEST['comments'] != '')
 	{
 		$comment = addslashes($_REQUEST['comments']);
-		$sql = "insert into ticketcomments values('',".$this->id.",'".$comment."','".$current_user->id."','".$ownertype."','".$current_time."')";
+		$sql = "insert into vtiger_ticketcomments values('',".$this->id.",'".$comment."','".$current_user->id."','".$ownertype."','".$current_time."')";
 	        $adb->query($sql);
 	}
 }
@@ -978,7 +978,7 @@
 	if($_REQUEST['comments'] != '')
 	{
 		$comment = addslashes($_REQUEST['comments']);
-		$sql = "insert into faqcomments values('',".$this->id.",'".$comment."','".$current_time."')";
+		$sql = "insert into vtiger_faqcomments values('',".$this->id.",'".$comment."','".$current_time."')";
 		$adb->query($sql);
 	}
 }
@@ -1028,7 +1028,7 @@
 	{
 		if($inviteeid != '')
 		{
-			$query="insert into invitees values(".$this->id.",".$inviteeid.")";
+			$query="insert into vtiger_invitees values(".$this->id.",".$inviteeid.")";
 			$adb->query($query);
 		}
 	}
@@ -1059,7 +1059,7 @@
 	{
 		$activity_id=$this->id;
 
-		$sql='select min(recurringdate) AS min_date,max(recurringdate) AS max_date, recurringtype, activityid from recurringevents where activityid='. $activity_id.' group by activityid, recurringtype';
+		$sql='select min(recurringdate) AS min_date,max(recurringdate) AS max_date, recurringtype, activityid from vtiger_recurringevents where activityid='. $activity_id.' group by activityid, recurringtype';
 		
 		$result = $adb->query($sql);
 		$noofrows = $adb->num_rows($result);
@@ -1073,15 +1073,15 @@
 		{
 			if($_REQUEST['set_reminder'] == 'Yes')
 			{
-				$sql = 'delete from activity_reminder where activity_id='.$activity_id;
+				$sql = 'delete from vtiger_activity_reminder where activity_id='.$activity_id;
 				$adb->query($sql);
-				$sql = 'delete  from recurringevents where activityid='.$activity_id;
+				$sql = 'delete  from vtiger_recurringevents where activityid='.$activity_id;
 				$adb->query($sql);
 				$flag="true";
 			}
 			elseif($_REQUEST['set_reminder'] == 'No')
 			{
-				$sql = 'delete  from activity_reminder where activity_id='.$activity_id;
+				$sql = 'delete  from vtiger_activity_reminder where activity_id='.$activity_id;
 				$adb->query($sql);
 				$flag="false";
 			}
@@ -1090,9 +1090,9 @@
 		}
 		else
 		{
-			$sql = 'delete from activity_reminder where activity_id='.$activity_id;
+			$sql = 'delete from vtiger_activity_reminder where activity_id='.$activity_id;
 			$adb->query($sql);
-			$sql = 'delete  from recurringevents where activityid='.$activity_id;
+			$sql = 'delete  from vtiger_recurringevents where activityid='.$activity_id;
 			$adb->query($sql);
 		}
 	}
@@ -1128,7 +1128,7 @@
 				$tdate=$date_array[$k];
 				if($tdate <= $end_date)
 				{
-					$max_recurid_qry = 'select max(recurringid) AS recurid from recurringevents;';
+					$max_recurid_qry = 'select max(recurringid) AS recurid from vtiger_recurringevents;';
 					$result = $adb->query($max_recurid_qry);
 					$noofrows = $adb->num_rows($result);
 					for($i=0; $i<$noofrows; $i++)
@@ -1136,7 +1136,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 vtiger_recurringevents values ('".$current_id."','".$this->id."','".$tdate."','".$type."')";
 					$adb->query($recurring_insert);
 					if($_REQUEST['set_reminder'] == 'Yes')
 					{
@@ -1184,7 +1184,7 @@
     $detailview_query .= " where ".$table_list[0].".".$table_index[0]." = ".$record;
     $result = $adb->query($detailview_query);*/
     $tabid = getTabid($module);
-    $sql1 =  "select * from field where tabid=".$tabid;
+    $sql1 =  "select * from vtiger_field where tabid=".$tabid;
     $result1 = $adb->query($sql1);
     $noofrows = $adb->num_rows($result1);
     for($i=0; $i<$noofrows; $i++)
@@ -1316,7 +1316,7 @@
 	*/
 	function mark_deleted($id)
 	{
-		$query = "UPDATE crmentity set deleted=1 where crmid='$id'";
+		$query = "UPDATE vtiger_crmentity set deleted=1 where crmid='$id'";
 		$this->db->query($query, true,"Error marking record deleted: ");
 
 
@@ -1349,9 +1349,9 @@
 
 	// this method is called during an import before inserting a bean
 	// define an associative array called $special_fields
-	// the keys are user defined, and don't directly map to the bean's fields
+	// the keys are user defined, and don't directly map to the bean's vtiger_fields
 	// the value is the method name within that bean that will do extra
-	// processing for that field. example: 'full_name'=>'get_names_from_full_name'
+	// processing for that vtiger_field. example: 'full_name'=>'get_names_from_full_name'
 
 	function process_special_fields() 
 	{ 
@@ -1365,7 +1365,7 @@
 	}
 
 	/**
-         * Function to check if the custom field table exists
+         * Function to check if the custom vtiger_field vtiger_table exists
          * return true or false
          */
         function checkIfCustomTableExists($tablename)
@@ -1385,14 +1385,14 @@
         }
 
 	/**
-	 * function to construct the query to fetch the custom fields
-	 * return the query to fetch the custom fields
+	 * function to construct the query to fetch the custom vtiger_fields
+	 * return the query to fetch the custom vtiger_fields
          */
         function constructCustomQueryAddendum($tablename,$module)
         {
                 global $adb;
 		$tabid=getTabid($module);		
-                $sql1 = "select columnname,fieldlabel from field where generatedtype=2 and tabid=".$tabid;
+                $sql1 = "select columnname,fieldlabel from vtiger_field where generatedtype=2 and tabid=".$tabid;
                 $result = $adb->query($sql1);
                 $numRows = $adb->num_rows($result);
                 $sql3 = "select ";
@@ -1420,8 +1420,8 @@
         }
 
 
-	/**	function to save the product tax information in producttarel table
-	 *	@param string $tablename - tablename to save the product tax relationship (producttaxrel)
+	/**	function to save the product tax information in producttarel vtiger_table
+	 *	@param string $tablename - vtiger_tablename to save the product tax relationship (producttaxrel)
 	 *	@param string $module	 - current module name
 	 *	$return void
 	*/
@@ -1439,7 +1439,7 @@
 			foreach($tax_array as $tax_type)
 			{
 				$taxid = getTaxId($tax_type);
-				$sql = "delete from producttaxrel where productid=$this->id and taxid=$taxid";
+				$sql = "delete from vtiger_producttaxrel where productid=$this->id and taxid=$taxid";
 				$adb->query($sql);
 			}
 		}
@@ -1452,7 +1452,7 @@
 
 			$log->debug("Going to save the Product - VAT tax relationship");
 
-			$sql = "insert into producttaxrel values($this->id,$taxid,$tax_per)";
+			$sql = "insert into vtiger_producttaxrel values($this->id,$taxid,$tax_per)";
 			$adb->query($sql);
 		}
 		//Save the Product - Sales tax relationship if Sales tax check box is enabled
@@ -1465,7 +1465,7 @@
 
 			$log->debug("Going to save the Product - Sales tax relationship");
 
-			$sql = "insert into producttaxrel values($this->id,$taxid,$tax_per)";
+			$sql = "insert into vtiger_producttaxrel values($this->id,$taxid,$tax_per)";
 			$adb->query($sql);
 		}
 		//Save the Product - Service tax relationship if Service tax check box is enabled
@@ -1478,7 +1478,7 @@
 
 			$log->debug("Going to save the Product - Service tax relationship");
 
-			$sql = "insert into producttaxrel values($this->id,$taxid,$tax_per)";
+			$sql = "insert into vtiger_producttaxrel values($this->id,$taxid,$tax_per)";
 			$adb->query($sql);
 		}
 

Modified: vtigercrm/trunk/data/SugarBean.php
==============================================================================
--- vtigercrm/trunk/data/SugarBean.php (original)
+++ vtigercrm/trunk/data/SugarBean.php Mon Jun 12 14:26:25 2006
@@ -32,9 +32,9 @@
     /**
      * This method implements a generic insert and update logic for any SugarBean
      * This method only works for subclasses that implement the same variable names.
-     * This method uses the presence of an id field that is not null to signify and update.
-     * The id field should not be set otherwise.
-     * todo - Add support for field type validation and encoding of parameters.
+     * This method uses the presence of an id vtiger_field that is not null to signify and update.
+     * The id vtiger_field should not be set otherwise.
+     * todo - Add support for vtiger_field type validation and encoding of parameters.
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
  * All Rights Reserved.
  * Contributor(s): ______________________________________..
@@ -89,7 +89,7 @@
 		$updKeyValues='';
 		foreach($this->column_fields as $field)
 		{
-			// Do not write out the id field on the update statement.
+			// Do not write out the id vtiger_field on the update statement.
 			// We are not allowed to change ids.
 			if($isUpdate && ('id' == $field))
 				continue;
@@ -158,7 +158,7 @@
     
     /**
      * This function retrieves a record of the appropriate type from the DB.
-     * It fills in all of the fields from the DB into the object it was called on.
+     * It fills in all of the vtiger_fields from the DB into the object it was called on.
      * param $id - If ID is specified, it overrides the current value of $this->id.  If not specified the current value of $this->id will be used.
      * returns this - The object that it was called apon or null if exactly 1 record was not found.
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
@@ -172,7 +172,7 @@
 		if($id == '') {
 			return null;
 		}
-// GS porting crmentity
+// GS porting vtiger_crmentity
 $query = "SELECT * FROM $this->table_name WHERE $this->module_id = '$id'";
 //		$query = "SELECT * FROM $this->table_name WHERE ID = '$id'";
 		$this->log->debug("Retrieve $this->object_name: ".$query);
@@ -334,7 +334,7 @@
 	 */
 	function track_view($user_id, $current_module,$id='')
 	{
-		$this->log->debug("About to call tracker (user_id, module_name, item_id)($user_id, $current_module, $this->id)");
+		$this->log->debug("About to call vtiger_tracker (user_id, module_name, item_id)($user_id, $current_module, $this->id)");
 
 		$tracker = new Tracker();
 		$tracker->track_view($user_id, $current_module, $id, '');
@@ -433,9 +433,9 @@
 
 	// this method is called during an import before inserting a bean
 	// define an associative array called $special_fields
-	// the keys are user defined, and don't directly map to the bean's fields
+	// the keys are user defined, and don't directly map to the bean's vtiger_fields
 	// the value is the method name within that bean that will do extra
-	// processing for that field. example: 'full_name'=>'get_names_from_full_name'
+	// processing for that vtiger_field. example: 'full_name'=>'get_names_from_full_name'
 
 	function process_special_fields() 
 	{ 

Modified: vtigercrm/trunk/data/Tracker.php
==============================================================================
--- vtigercrm/trunk/data/Tracker.php (original)
+++ vtigercrm/trunk/data/Tracker.php Mon Jun 12 14:26:25 2006
@@ -34,9 +34,9 @@
 class Tracker {
     var $log;
     var $db;
-    var $table_name = "tracker";
-
-    // Tracker table
+    var $table_name = "vtiger_tracker";
+
+    // Tracker vtiger_table
     var $column_fields = Array(
         "id",
         "user_id",
@@ -54,7 +54,7 @@
     }
 
     /**
-     * Add this new item to the tracker table.  If there are too many items (global config for now)
+     * Add this new item to the vtiger_tracker vtiger_table.  If there are too many items (global config for now)
      * then remove the oldest item.  If there is more than one extra item, log an error.
      * If the new item is the same as the most recent item then do not change the list
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
@@ -75,7 +75,7 @@
          //get the first name and last name from the respective modules
           if($current_module =='Leads')
           {
-            $query = 'select firstname,lastname from leaddetails where leadid=' .$item_id;
+            $query = 'select firstname,lastname from vtiger_leaddetails where leadid=' .$item_id;
             $result = $this->db->query($query);
             $firstname = $adb->query_result($result,0,'firstname');
             $lastname =  $adb->query_result($result,0,'lastname');
@@ -83,7 +83,7 @@
           }
           elseif ($current_module =='Accounts')
           {
-            $query = 'select accountname from account where accountid=' .$item_id;
+            $query = 'select accountname from vtiger_account where accountid=' .$item_id;
             $result = $this->db->query($query);
             $accountname = $adb->query_result($result,0,'accountname');
             $item_summary = $accountname;
@@ -91,7 +91,7 @@
           }
           elseif($current_module =='Contacts')
           {
-            $query = 'select firstname,lastname from contactdetails where contactid=' .$item_id;
+            $query = 'select firstname,lastname from vtiger_contactdetails where contactid=' .$item_id;
             $result = $this->db->query($query);
             $firstname = $adb->query_result($result,0,'firstname');
             $lastname =  $adb->query_result($result,0,'lastname');
@@ -100,14 +100,14 @@
           }
           elseif($current_module =='Potentials')
           {
-            $query = 'select potentialname from potential where potentialid=' .$item_id;
+            $query = 'select potentialname from vtiger_potential where potentialid=' .$item_id;
             $result = $this->db->query($query);
             $potentialname =  $adb->query_result($result,0,'potentialname');
             $item_summary = $potentialname;
           }
           elseif($current_module =='Notes')
           {
-            $query = 'select title from notes where notesid=' .$item_id;
+            $query = 'select title from vtiger_notes where notesid=' .$item_id;
             $result = $this->db->query($query);
             $title = $adb->query_result($result,0,'title');
             $item_summary = $title;
@@ -115,7 +115,7 @@
           }
           elseif($current_module =='HelpDesk')
           {
-            $query = 'select title from troubletickets where ticketid=' .$item_id;
+            $query = 'select title from vtiger_troubletickets where ticketid=' .$item_id;
             $result = $this->db->query($query);
             $title = $adb->query_result($result,0,'title');
             $item_summary = $title;
@@ -123,7 +123,7 @@
           elseif($current_module =='Activities')
           {
             //$query = 'select name from calls where callid=' .$item_id;
-	    $query = 'select subject from activity where activityid=' .$item_id;
+	    $query = 'select subject from vtiger_activity where activityid=' .$item_id;
             $result = $this->db->query($query);
             $name = $adb->query_result($result,0,'subject');
             $item_summary = $name;
@@ -131,21 +131,21 @@
           elseif($current_module =='Emails')
           {
             //$query = 'select name from emails where emailid=' .$item_id;
-	    $query = 'select subject from activity where activityid=' .$item_id;
+	    $query = 'select subject from vtiger_activity where activityid=' .$item_id;
             $result = $this->db->query($query);
             $name = $adb->query_result($result,0,'subject');
             $item_summary = $name;
           }
           elseif($current_module =='Products')
           {
-            $query = 'select productname from products where productid=' .$item_id;
+            $query = 'select productname from vtiger_products where productid=' .$item_id;
             $result = $this->db->query($query);
             $productname = $adb->query_result($result,0,'productname');
             $item_summary = $productname;
           }
           elseif($current_module =='Users')
           {
-            $query = 'select first_name,last_name from users where id=' .$item_id;
+            $query = 'select first_name,last_name from vtiger_users where id=' .$item_id;
             $result = $this->db->query($query);
             $firstname = $adb->query_result($result,0,'first_name');
             $lastname = $adb->query_result($result,0,'last_name');
@@ -153,49 +153,49 @@
           }
 	  elseif($current_module =='Invoice')
           {
-            $query = 'select subject from invoice where invoiceid=' .$item_id;
+            $query = 'select subject from vtiger_invoice where invoiceid=' .$item_id;
             $result = $this->db->query($query);
             $invoice = $adb->query_result($result,0,'subject');
             $item_summary = $invoice;
           }
           elseif($current_module =='Quotes')
           {
-            $query = 'select subject from quotes where quoteid=' .$item_id;
+            $query = 'select subject from vtiger_quotes where quoteid=' .$item_id;
             $result = $this->db->query($query);
             $quote = $adb->query_result($result,0,'subject');
             $item_summary = $quote;
           }
 	  elseif($current_module =='PurchaseOrder')
           {
-            $query = 'select subject from purchaseorder where purchaseorderid=' .$item_id;
+            $query = 'select subject from vtiger_purchaseorder where purchaseorderid=' .$item_id;
             $result = $this->db->query($query);
             $po = $adb->query_result($result,0,'subject');
             $item_summary = $po;
           }
 	  elseif($current_module =='SalesOrder')
           {
-            $query = 'select subject from salesorder where salesorderid=' .$item_id;
+            $query = 'select subject from vtiger_salesorder where salesorderid=' .$item_id;
             $result = $this->db->query($query);
             $so = $adb->query_result($result,0,'subject');
             $item_summary = $so;
           }
 	  elseif($current_module =='Vendor')
           {
-            $query = 'select vendorname from vendor where vendorid=' .$item_id;
+            $query = 'select vtiger_vendorname from vtiger_vendor where vendorid=' .$item_id;
             $result = $this->db->query($query);
             $vendor = $adb->query_result($result,0,'vendorname');
             $item_summary = $vendor;
           }
 	  elseif($current_module =='PriceBook')
           {
-            $query = 'select bookname from pricebook where pricebookid=' .$item_id;
+            $query = 'select bookname from vtiger_pricebook where pricebookid=' .$item_id;
             $result = $this->db->query($query);
             $pb = $adb->query_result($result,0,'bookname');
             $item_summary = $pb;
           }	
 
 	 
-	 #if condition added to skip faq in last viewed history
+	 #if condition added to skip vtiger_faq in last viewed history
 	  if ($current_module != 'Faq')
 	  {		
           $query = "INSERT into $this->table_name (user_id, module_name, item_id, item_summary) values ('$user_id', '$current_module', '$esc_item_id', ".$this->db->formatString($this->table_name,'item_summary',$item_summary).")";
@@ -212,7 +212,7 @@
     /**
      * param $user_id - The id of the user to retrive the history for
      * param $module_name - Filter the history to only return records from the specified module.  If not specified all records are returned
-     * return - return the array of result set rows from the query.  All of the table fields are included
+     * return - return the array of result set rows from the query.  All of the vtiger_table vtiger_fields are included
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
  * All Rights Reserved.
  * Contributor(s): ______________________________________..
@@ -224,7 +224,7 @@
     	}
 
 //        $query = "SELECT * from $this->table_name WHERE user_id='$user_id' ORDER BY id DESC";
-	$query = "SELECT * from $this->table_name inner join crmentity on crmentity.crmid=tracker.item_id WHERE user_id='$user_id' and crmentity.deleted=0 ORDER BY id DESC";
+	$query = "SELECT * from $this->table_name inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_tracker.item_id WHERE user_id='$user_id' and vtiger_crmentity.deleted=0 ORDER BY id DESC";
         $this->log->debug("About to retrieve list: $query");
         $result = $this->db->query($query, true);
         $list = Array();

Modified: vtigercrm/trunk/include/Ajax/TagCloud.php
==============================================================================
--- vtigercrm/trunk/include/Ajax/TagCloud.php (original)
+++ vtigercrm/trunk/include/Ajax/TagCloud.php Mon Jun 12 14:26:25 2006
@@ -34,7 +34,7 @@
 	$module = $_REQUEST["module"];
 	$useid = $current_user->id;
 	global $adb;
-	$query="select * from freetagged_objects where module = '".$module ."'";
+	$query="select * from vtiger_freetagged_objects where module = '".$module ."'";
 	$result=$adb->query($query);
 	if($adb->num_rows($result) > 0)
 	{

Modified: vtigercrm/trunk/include/ComboUtil.php
==============================================================================
--- vtigercrm/trunk/include/ComboUtil.php (original)
+++ vtigercrm/trunk/include/ComboUtil.php Mon Jun 12 14:26:25 2006
@@ -20,7 +20,7 @@
 	{
 		$fldArrName= $arrayName;
 		$arrayName = Array();
-		$result = $adb->query("select * from ".$tableName." where presence=1 order by sortorderid");
+		$result = $adb->query("select * from vtiger_".$tableName." where presence=1 order by sortorderid");
 		while($row = $adb->fetch_array($result))
 		{
 			$val = $row[$tableName];

Modified: vtigercrm/trunk/include/CustomFieldUtil.php
==============================================================================
--- vtigercrm/trunk/include/CustomFieldUtil.php (original)
+++ vtigercrm/trunk/include/CustomFieldUtil.php Mon Jun 12 14:26:25 2006
@@ -13,9 +13,9 @@
 require_once('include/utils/utils.php');
 
 /**
- * Function to get field typename
+ * Function to get vtiger_field typename
  * @param $uitype :: uitype -- Type integer
- * returns the field type name -- Type string
+ * returns the vtiger_field type name -- Type string
  */
 function getCustomFieldTypeName($uitype)
 {
@@ -82,8 +82,8 @@
 }
 
 /**
- * Function to get custom fields
- * @param $module :: table name -- Type string
+ * Function to get custom vtiger_fields
+ * @param $module :: vtiger_table name -- Type string
  * returns customfields in key-value pair array format
  */
 function getCustomFieldArray($module)
@@ -91,7 +91,7 @@
 	global $log;
 	$log->debug("Entering getCustomFieldArray(".$module.") method ...");
 	global $adb;
-	$custquery = "select * from field where tablename='".$module."'";
+	$custquery = "select * from vtiger_field where vtiger_tablename='".$module."'";
 	$custresult = $adb->query($custquery);
 	$custFldArray = Array();
 	$noofrows = $adb->num_rows($custresult);
@@ -106,9 +106,9 @@
 }
 
 /**
- * Function to get columnname and fieldlabel from field table
+ * Function to get columnname and vtiger_fieldlabel from vtiger_field vtiger_table
  * @param $module :: module name -- Type string
- * @param $trans_array :: translated column fields -- Type array
+ * @param $trans_array :: translated column vtiger_fields -- Type array
  * returns trans_array in key-value pair array format
  */
 function getCustomFieldTrans($module, $trans_array)
@@ -117,7 +117,7 @@
 	$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;
+	$custquery = "select columnname,fieldlabel from vtiger_field where generatedtype=2 and vtiger_tabid=".$tab_id;
 	$custresult = $adb->query($custquery);
 	$custFldArray = Array();
 	$noofrows = $adb->num_rows($custresult);
@@ -132,10 +132,10 @@
 
 
 /**
- * Function to get customfield record from field table
+ * Function to get customfield record from vtiger_field vtiger_table
  * @param $tab :: Tab ID -- Type integer
- * @param $datatype :: field name -- Type string
- * @param $id :: field Id -- Type integer
+ * @param $datatype :: vtiger_field name -- Type string
+ * @param $id :: vtiger_field Id -- Type integer
  * returns the data result in string format
  */
 function getCustomFieldData($tab,$id,$datatype)
@@ -143,7 +143,7 @@
 	global $log;
 	$log->debug("Entering getCustomFieldData(".$tab.",".$id.",".$datatype.") method ...");
 	global $adb;
-	$query = "select * from field where tabid=".$tab." and fieldid=".$id;
+	$query = "select * from vtiger_field where vtiger_tabid=".$tab." and vtiger_fieldid=".$id;
 	$result = $adb->query($query);
 	$return_data=$adb->fetch_array($result);
 	$log->debug("Exiting getCustomFieldData method ...");
@@ -153,9 +153,9 @@
 
 /**
  * Function to get customfield type,length value,decimal value and picklist value
- * @param $label :: field typename -- Type string
+ * @param $label :: vtiger_field typename -- Type string
  * @param $typeofdata :: datatype -- Type string
- * returns the field type,length,decimal
+ * returns the vtiger_field type,length,decimal
  * and picklist value in ';' separated array format
  */
 function getFldTypeandLengthValue($label,$typeofdata)

Modified: vtigercrm/trunk/include/FormValidationUtil.php
==============================================================================
--- vtigercrm/trunk/include/FormValidationUtil.php (original)
+++ vtigercrm/trunk/include/FormValidationUtil.php Mon Jun 12 14:26:25 2006
@@ -32,22 +32,22 @@
   	{
 		if($numValues > 1 && $i != $numValues-1)
     		{
-			$sql .= "select fieldlabel,fieldname,typeofdata from field where tablename='".$tablearray[$i] ."'and tabid=10 and displaytype <> 2 union ";
+			$sql .= "select fieldlabel,fieldname,typeofdata from vtiger_field where tablename='".$tablearray[$i] ."'and tabid=10 and displaytype <> 2 union ";
      		}
    		else
     		{
-   			$sql  .= "select fieldlabel,fieldname,typeofdata from field where tablename='".$tablearray[$i] ."' and tabid=10 and displaytype <> 2 ";
+   			$sql  .= "select fieldlabel,fieldname,typeofdata from vtiger_field where tablename='".$tablearray[$i] ."' and tabid=10 and displaytype <> 2 ";
     		}
   	}
   	else
   	{
     		if($numValues > 1 && $i != $numValues-1)
     		{
-      			$sql .= "select fieldlabel,fieldname,typeofdata from field where tablename='".$tablearray[$i] ."'".$tab_con." and displaytype in (1,3) union ";
+      			$sql .= "select fieldlabel,fieldname,typeofdata from vtiger_field where tablename='".$tablearray[$i] ."'".$tab_con." and displaytype in (1,3) union ";
     		}
     		else
     		{
-      			$sql  .= "select fieldlabel,fieldname,typeofdata from field where tablename='".$tablearray[$i] ."'".$tab_con." and displaytype in (1,3)";
+      			$sql  .= "select fieldlabel,fieldname,typeofdata from vtiger_field where tablename='".$tablearray[$i] ."'".$tab_con." and displaytype in (1,3)";
     		}
   	}
   }

Modified: vtigercrm/trunk/include/ListView/ListView.php
==============================================================================
--- vtigercrm/trunk/include/ListView/ListView.php (original)
+++ vtigercrm/trunk/include/ListView/ListView.php Mon Jun 12 14:26:25 2006
@@ -75,7 +75,7 @@
 	$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
+/**sets the header text this is text thats appended to the header vtiger_table and is usually used for the creation of buttons
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
  * All Rights Reserved.
  * Contributor(s): ______________________________________.

Modified: vtigercrm/trunk/include/PopulateComboValues.php
==============================================================================
--- vtigercrm/trunk/include/PopulateComboValues.php (original)
+++ vtigercrm/trunk/include/PopulateComboValues.php Mon Jun 12 14:26:25 2006
@@ -24,7 +24,7 @@
 
 
 	/** 
-	 * To populate the default combo values for the combo tables
+	 * To populate the default combo values for the combo vtiger_tables
 	 */
 	function insertComboValues($values, $tableName)
 	{
@@ -37,11 +37,11 @@
 			$id = $adb->getUniqueID($tableName);
 			if($val != '')
 			{
-				$adb->query("insert into ".$tableName. " values(".$id.",'".$val."',".$i.",1)");
+				$adb->query("insert into vtiger_".$tableName. " values(".$id.",'".$val."',".$i.",1)");
 			}
 			else
 			{
-				$adb->query("insert into ".$tableName. " values(".$id.",'--None--',".$i.",1)");
+				$adb->query("insert into vtiger_".$tableName. " values(".$id.",'--None--',".$i.",1)");
 			}
 			$i++;
 		}
@@ -50,7 +50,7 @@
 
 
 	/** 
-	 * To populate the combo tables at startup time
+	 * To populate the combo vtiger_tables at startup time
 	 */
 
 	function create_tables () 

Modified: vtigercrm/trunk/include/RelatedListView.php
==============================================================================
--- vtigercrm/trunk/include/RelatedListView.php (original)
+++ vtigercrm/trunk/include/RelatedListView.php Mon Jun 12 14:26:25 2006
@@ -379,7 +379,7 @@
 
 // begin: Armando L?scher 14.07.2005 -> ?scrollableTables
 // Desc: 'X'
-//			 Insert new table with 1 cell where all entries are in a new table.
+//			 Insert new vtiger_table with 1 cell where all entries are in a new vtiger_table.
 //			 This cell will be scrollable when too many entries exist
 		$list .= ($noofrows>15) ? '<tr><td colspan="'.$colspan.'"><div style="overflow:auto;height:315px;width:100%;"><table cellspacing="0" cellpadding="0" border="0" width="100%">':'';
 // end: Armando L?scher 14.07.2005 -> ?scrollableTables
@@ -512,7 +512,7 @@
 		}
 
 // begin: Armando L?scher 14.07.2005 -> ?scrollableTables
-// Desc: Close table from 
+// Desc: Close vtiger_table from 
 		$list .= ($noofrows>15) ? '</table></div></td></tr>':'';
 // end: Armando L?scher 14.07.2005 -> ?scrollableTables
 
@@ -590,7 +590,7 @@
 
 // begin: Armando L?scher 14.07.2005 -> ?scrollableTables
 // Desc: 'X'
-//			 Insert new table with 1 cell where all entries are in a new table.
+//			 Insert new vtiger_table with 1 cell where all entries are in a new vtiger_table.
 //			 This cell will be scrollable when too many entries exist
 		$list_body .= ($num_rows>15) ? '<tr><td colspan="12"><div style="overflow:auto;height:315px;width:100%;"><table cellspacing="0" cellpadding="0" border="0" width="100%">':'';
 // end: Armando L?scher 14.07.2005 -> ?scrollableTablEs

Modified: vtigercrm/trunk/include/freetag/freetag.class.php
==============================================================================
--- vtigercrm/trunk/include/freetag/freetag.class.php (original)
+++ vtigercrm/trunk/include/freetag/freetag.class.php Mon Jun 12 14:26:25 2006
@@ -50,9 +50,9 @@
 	var $_debug = FALSE;
 	/**
 	 * @access private
-	 * @param string The prefix of freetag database tables.
-	 */
-	var $_table_prefix = '';
+	 * @param string The prefix of freetag database vtiger_tables.
+	 */
+	var $_table_prefix = 'vtiger_';
 	/**
 	 * @access private
 	 * @param string The regex-style set of characters that are valid for normalized tags.
@@ -65,7 +65,7 @@
 	var $_normalize_tags = 1;
 	/**
 	 * @access private
-	 * @param string Whether to prevent multiple users from tagging the same object. By default, set to block (ala Upcoming.org)
+	 * @param string Whether to prevent multiple vtiger_users from tagging the same object. By default, set to block (ala Upcoming.org)
 	 */
 	var $_block_multiuser_tag_on_object =0;
 	/**
@@ -97,10 +97,10 @@
 	 * - db_pass: Database password
 	 * - db_host: Database hostname [default: localhost]
 	 * - db_name: Database name
-	 * - table_prefix: If you wish to create multiple Freetag databases on the same database, you can put a prefix in front of the table names and pass separate prefixes to the constructor. [default: '']
+	 * - vtiger_table_prefix: If you wish to create multiple Freetag databases on the same database, you can put a prefix in front of the vtiger_table names and pass separate prefixes to the constructor. [default: '']
 	 * - normalize_tags: Whether to normalize (lowercase and filter for valid characters) on tags at all. [default: 1]
 	 * - normalized_valid_chars: Pass a regex-style set of valid characters that you want your tags normalized against. [default: 'a-zA-Z0-9' for alphanumeric]
-	 * - block_multiuser_tag_on_object: Set to 0 in order to allow individual users to all tag the same object with the same tag. Default is 1 to only allow one occurence of a tag per object. [default: 1]
+	 * - block_multiuser_tag_on_object: Set to 0 in order to allow individual vtiger_users to all tag the same object with the same tag. Default is 1 to only allow one occurence of a tag per object. [default: 1]
 	 * - MAX_TAG_LENGTH: maximum length of normalized tags in chars. [default: 30]
 	 * - ADODB_DIR: directory in which adodb is installed. Change if you don't want to use the bundled version. [default: adodb/]
 	 * - PCONNECT: Whether to use ADODB persistent connections. [default: FALSE]
@@ -240,7 +240,7 @@
 	 * get_objects_with_tag_combo
 	 *
 	 * Returns an array of object ID's that have all the tags passed in the
-	 * tagArray parameter. Use this to provide tag combo services to your users.
+	 * tagArray parameter. Use this to provide tag combo services to your vtiger_users.
 	 *
 	 * @param array - Pass an array of normalized form tags along to the function.
 	 * @param int (Optional) - The numerical offset to begin display at. Defaults to 0.
@@ -347,7 +347,7 @@
 	 * You can use this function to show the tags on an object. Since it supports both user-specific
 	 * and general modes with the $tagger_id parameter, you can use it twice on a page to make it work
 	 * similar to upcoming.org and flickr, where the page displays your own tags differently than
-	 * other users' tags.
+	 * other vtiger_users' tags.
 	 *
 	 * @param int The unique ID of the object in question.
 	 * @param int The offset of tags to return.
@@ -428,7 +428,7 @@
 		$prefix = $this->_table_prefix;
 
 		// First, check for duplicate of the normalized form of the tag on this object.
-		// Dynamically switch between allowing duplication between users on the constructor param 'block_multiuser_tag_on_object'.
+		// Dynamically switch between allowing duplication between vtiger_users on the constructor param 'block_multiuser_tag_on_object'.
 		// If it's set not to block multiuser tags, then modify the existence
 		// check to look for a tag by this particular user. Otherwise, the following
 		// query will reveal whether that tag exists on that object for ANY user.
@@ -514,7 +514,7 @@
 	 *
 	 * @param int The unique ID of the person who tagged the object with this tag.
 	 * @param int The ID of the object in question.
-	 * @param string The raw string form of the tag to delete. See above for notes.
+	 * @param string The raw string form of the tag to delete. See above for vtiger_notes.
 	 *
 	 * @return string Returns the tag in normalized form.
 	 */ 
@@ -682,7 +682,7 @@
 	 *
 	 * @param int The unique ID of the person who tagged the object with this tag.
 	 * @param int The ID of the object in question.
-	 * @param string The raw string form of the tag to delete. See above for notes.
+	 * @param string The raw string form of the tag to delete. See above for vtiger_notes.
 	 * @param int Whether to skip the update portion for objects that haven't been tagged. (Default: 1)
 	 *
 	 * @return string Returns the tag in normalized form.
@@ -1015,7 +1015,7 @@
 	 *
 	 * Finds tags that are "similar" or related to the given tag.
 	 * It does this by looking at the other tags on objects tagged with the tag specified.
-	 * Confusing? Think of it like e-commerce's "Other users who bought this also bought," 
+	 * Confusing? Think of it like e-commerce's "Other vtiger_users who bought this also bought," 
 	 * as that's exactly how this works.
 	 *
 	 * Returns an empty array if no tag is passed, or if no related tags are found.

Modified: vtigercrm/trunk/include/utils/CommonUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/CommonUtils.php (original)
+++ vtigercrm/trunk/include/utils/CommonUtils.php Mon Jun 12 14:26:25 2006
@@ -119,7 +119,7 @@
 	foreach ($key_list as $option_key=>$option_value) {
 		$selected_string = '';
 		// the system is evaluating $selected_key == 0 || '' to true.  Be very careful when changing this.  Test all cases.
-		// The reported bug was only happening with one of the users in the drop down.  It was being replaced by none.
+		// The vtiger_reported bug was only happening with one of the vtiger_users in the drop down.  It was being replaced by none.
 		if (($option_key != '' && $selected_key == $option_key) || ($selected_key == '' && $option_key == '') || (in_array($option_key, $selected_key)))
 		{
 			$selected_string = 'selected ';
@@ -221,22 +221,22 @@
 
 /** To get the Currency of the specified user
   * @param $id -- The user Id:: Type integer
-  * @returns  currencyid :: Type integer
+  * @returns  vtiger_currencyid :: Type integer
  */
 function fetchCurrency($id)
 {
 	global $log;
 	$log->debug("Entering fetchCurrency(".$id.") method ...");
         global $adb;
-        $sql = "select currency_id from users where id=" .$id;
+        $sql = "select currency_id from vtiger_users where id=" .$id;
         $result = $adb->query($sql);
         $currencyid=  $adb->query_result($result,0,"currency_id");
 	$log->debug("Exiting fetchCurrency method ...");
         return $currencyid;
 }
 
-/** Function to get the Currency name from the currency_info
-  * @param $currencyid -- currencyid:: Type integer
+/** Function to get the Currency name from the vtiger_currency_info
+  * @param $currencyid -- vtiger_currencyid:: Type integer
   * @returns $currencyname -- Currency Name:: Type varchar
   *
  */
@@ -255,7 +255,7 @@
 
 
 /**
- * Function to fetch the list of groups from group table 
+ * Function to fetch the list of vtiger_groups from group vtiger_table 
  * Takes no value as input 
  * returns the query result set object
  */
@@ -265,7 +265,7 @@
 	global $log;
 	$log->debug("Entering get_group_options() method ...");
 	global $adb,$noof_group_rows;;
-	$sql = "select groupname from groups";
+	$sql = "select groupname from vtiger_groups";
 	$result = $adb->query($sql);
 	$noof_group_rows=$adb->num_rows($result);
 	$log->debug("Exiting get_group_options method ...");
@@ -293,7 +293,7 @@
 
         $log->info("module  is ".$module);
         global $adb;
-	$sql = "select tabid from tab where name='".$module."'";
+	$sql = "select tabid from vtiger_tab where name='".$module."'";
 	$result = $adb->query($sql);
 	$tabid=  $adb->query_result($result,0,"tabid");
 	}
@@ -314,7 +314,7 @@
 	$log->debug("Entering getSalesEntityType(".$crmid.") method ...");
 	$log->info("in getSalesEntityType ".$crmid);
 	global $adb;
-	$sql = "select * from crmentity where crmid=".$crmid;
+	$sql = "select * from vtiger_crmentity where crmid=".$crmid;
         $result = $adb->query($sql);
 	$parent_module = $adb->query_result($result,0,"setype");
 	$log->debug("Exiting getSalesEntityType method ...");
@@ -322,9 +322,9 @@
 }
 
 /**
- * Function to get the AccountName when a account id is given 
- * Takes the input as $acount_id - account id
- * returns the account name in string format.
+ * Function to get the AccountName when a vtiger_account id is given 
+ * Takes the input as $acount_id - vtiger_account id
+ * returns the vtiger_account name in string format.
  */
 
 function getAccountName($account_id)
@@ -336,7 +336,7 @@
 	global $adb;
 	if($account_id != '')
 	{
-		$sql = "select accountname from account where accountid=".$account_id;
+		$sql = "select accountname from vtiger_account where accountid=".$account_id;
         	$result = $adb->query($sql);
 		$accountname = $adb->query_result($result,0,"accountname");
 	}
@@ -358,7 +358,7 @@
 	$log->info("in getproductname ".$product_id);
 
 	global $adb;
-	$sql = "select productname from products where productid=".$product_id;
+	$sql = "select productname from vtiger_products where productid=".$product_id;
         $result = $adb->query($sql);
 	$productname = $adb->query_result($result,0,"productname");
 	$log->debug("Exiting getProductName method ...");
@@ -366,9 +366,9 @@
 }
 
 /**
- * Function to get the Potentail Name when a potential id is given 
- * Takes the input as $potential_id - potential id
- * returns the potential name in string format.
+ * Function to get the Potentail Name when a vtiger_potential id is given 
+ * Takes the input as $potential_id - vtiger_potential id
+ * returns the vtiger_potential name in string format.
  */
 
 function getPotentialName($potential_id)
@@ -381,7 +381,7 @@
 	$potentialname = '';
 	if($potential_id != '')
 	{
-		$sql = "select potentialname from potential where potentialid=".$potential_id;
+		$sql = "select potentialname from vtiger_potential where potentialid=".$potential_id;
         	$result = $adb->query($sql);
 		$potentialname = $adb->query_result($result,0,"potentialname");
 	}
@@ -402,7 +402,7 @@
 	$log->info("in getContactName ".$contact_id);
 
         global $adb;
-        $sql = "select * from contactdetails where contactid=".$contact_id;
+        $sql = "select * from vtiger_contactdetails where contactid=".$contact_id;
         $result = $adb->query($sql);
         $firstname = $adb->query_result($result,0,"firstname");
         $lastname = $adb->query_result($result,0,"lastname");
@@ -412,8 +412,8 @@
 }
 
 /**
- * Function to get the Vendor Name when a vendor id is given 
- * Takes the input as $vendor_id - vendor id
+ * Function to get the Vendor Name when a vtiger_vendor id is given 
+ * Takes the input as $vendor_id - vtiger_vendor id
  * returns the Vendor Name in string format.
  */
 
@@ -423,7 +423,7 @@
 	$log->debug("Entering getVendorName(".$vendor_id.") method ...");
 	$log->info("in getVendorName ".$vendor_id);
         global $adb;
-        $sql = "select * from vendor where vendorid=".$vendor_id;
+        $sql = "select * from vtiger_vendor where vendorid=".$vendor_id;
         $result = $adb->query($sql);
         $vendor_name = $adb->query_result($result,0,"vendorname");
 	$log->debug("Exiting getVendorName method ...");
@@ -431,7 +431,7 @@
 }
 
 /**
- * Function to get the Quote Name when a vendor id is given 
+ * Function to get the Quote Name when a vtiger_vendor id is given 
  * Takes the input as $quote_id - quote id
  * returns the Quote Name in string format.
  */
@@ -442,7 +442,7 @@
 	$log->debug("Entering getQuoteName(".$quote_id.") method ...");
 	$log->info("in getQuoteName ".$quote_id);
         global $adb;
-        $sql = "select * from quotes where quoteid=".$quote_id;
+        $sql = "select * from vtiger_quotes where quoteid=".$quote_id;
         $result = $adb->query($sql);
         $quote_name = $adb->query_result($result,0,"subject");
 	$log->debug("Exiting getQuoteName method ...");
@@ -450,8 +450,8 @@
 }
 
 /**
- * Function to get the PriceBook Name when a pricebook id is given 
- * Takes the input as $pricebook_id - pricebook id
+ * Function to get the PriceBook Name when a vtiger_pricebook id is given 
+ * Takes the input as $pricebook_id - vtiger_pricebook id
  * returns the PriceBook Name in string format.
  */
 
@@ -461,7 +461,7 @@
 	$log->debug("Entering getPriceBookName(".$pricebookid.") method ...");
 	$log->info("in getPriceBookName ".$pricebookid);
         global $adb;
-        $sql = "select * from pricebook where pricebookid=".$pricebookid;
+        $sql = "select * from vtiger_pricebook where pricebookid=".$pricebookid;
         $result = $adb->query($sql);
         $pricebook_name = $adb->query_result($result,0,"bookname");
 	$log->debug("Exiting getPriceBookName method ...");
@@ -478,15 +478,15 @@
 	$log->debug("Entering getPoName(".$po_id.") method ...");
         $log->info("in getPoName ".$po_id);
         global $adb;
-        $sql = "select * from purchaseorder where purchaseorderid=".$po_id;
+        $sql = "select * from vtiger_purchaseorder where purchaseorderid=".$po_id;
         $result = $adb->query($sql);
         $po_name = $adb->query_result($result,0,"subject");
 	$log->debug("Exiting getPoName method ...");
         return $po_name;
 }
 /**
- * Function to get the Sales Order Name when a salesorder id is given 
- * Takes the input as $salesorder_id - salesorder id
+ * Function to get the Sales Order Name when a vtiger_salesorder id is given 
+ * Takes the input as $salesorder_id - vtiger_salesorder id
  * returns the Salesorder Name in string format.
  */
 
@@ -496,7 +496,7 @@
 	$log->debug("Entering getSoName(".$so_id.") method ...");
 	$log->info("in getSoName ".$so_id);
 	global $adb;
-        $sql = "select * from salesorder where salesorderid=".$so_id;
+        $sql = "select * from vtiger_salesorder where salesorderid=".$so_id;
         $result = $adb->query($sql);
         $so_name = $adb->query_result($result,0,"subject");
 	$log->debug("Exiting getSoName method ...");
@@ -518,47 +518,47 @@
         global $adb;
         if($module == 'Leads')
         {
-               $sql = "select leadgrouprelation.groupname,groups.groupid from leadgrouprelation inner join groups on groups.groupname=leadgrouprelation.groupname where leadgrouprelation.leadid=".$id;
+               $sql = "select vtiger_leadgrouprelation.groupname,vtiger_groups.groupid from vtiger_leadgrouprelation inner join vtiger_groups on vtiger_groups.groupname=vtiger_leadgrouprelation.groupname where vtiger_leadgrouprelation.leadid=".$id;
         }
         elseif($module == 'Accounts')
         {
-               $sql = "select accountgrouprelation.groupname,groups.groupid from accountgrouprelation inner join groups on groups.groupname=accountgrouprelation.groupname where accountgrouprelation.accountid=".$id;
+               $sql = "select vtiger_accountgrouprelation.groupname,vtiger_groups.groupid from vtiger_accountgrouprelation inner join vtiger_groups on vtiger_groups.groupname=vtiger_accountgrouprelation.groupname where vtiger_accountgrouprelation.accountid=".$id;
         }
         elseif($module == 'Contacts')
         {
-               $sql = "select contactgrouprelation.groupname,groups.groupid from contactgrouprelation inner join groups on groups.groupname=contactgrouprelation.groupname where contactgrouprelation.contactid=".$id;
+               $sql = "select vtiger_contactgrouprelation.groupname,vtiger_groups.groupid from vtiger_contactgrouprelation inner join vtiger_groups on vtiger_groups.groupname=vtiger_contactgrouprelation.groupname where vtiger_contactgrouprelation.contactid=".$id;
         }
 	elseif($module == 'Potentials')
         {
-               $sql = "select potentialgrouprelation.groupname,groups.groupid from potentialgrouprelation inner join groups on groups.groupname=potentialgrouprelation.groupname where potentialgrouprelation.potentialid=".$id;
+               $sql = "select vtiger_potentialgrouprelation.groupname,vtiger_groups.groupid from vtiger_potentialgrouprelation inner join vtiger_groups on vtiger_groups.groupname=vtiger_potentialgrouprelation.groupname where vtiger_potentialgrouprelation.potentialid=".$id;
         }
 	elseif($module == 'Quotes')
         {
-               $sql = "select quotegrouprelation.groupname,groups.groupid from quotegrouprelation inner join groups on groups.groupname=quotegrouprelation.groupname where quotegrouprelation.quoteid=".$id;
+               $sql = "select vtiger_quotegrouprelation.groupname,vtiger_groups.groupid from vtiger_quotegrouprelation inner join vtiger_groups on vtiger_groups.groupname=vtiger_quotegrouprelation.groupname where vtiger_quotegrouprelation.quoteid=".$id;
         }
 	elseif($module == 'SalesOrder')
         {
-               $sql = "select sogrouprelation.groupname,groups.groupid from sogrouprelation inner join groups on groups.groupname=sogrouprelation.groupname where sogrouprelation.salesorderid=".$id;
+               $sql = "select vtiger_sogrouprelation.groupname,vtiger_groups.groupid from vtiger_sogrouprelation inner join vtiger_groups on vtiger_groups.groupname=vtiger_sogrouprelation.groupname where vtiger_sogrouprelation.salesorderid=".$id;
         }
 	elseif($module == 'Invoice')
         {
-               $sql = "select invoicegrouprelation.groupname,groups.groupid from invoicegrouprelation inner join groups on groups.groupname=invoicegrouprelation.groupname where invoicegrouprelation.invoiceid=".$id;
+               $sql = "select vtiger_invoicegrouprelation.groupname,vtiger_groups.groupid from vtiger_invoicegrouprelation inner join vtiger_groups on vtiger_groups.groupname=vtiger_invoicegrouprelation.groupname where vtiger_invoicegrouprelation.invoiceid=".$id;
         }
 	elseif($module == 'PurchaseOrder')
         {
-               $sql = "select pogrouprelation.groupname,groups.groupid from pogrouprelation inner join groups on groups.groupname=pogrouprelation.groupname where pogrouprelation.purchaseorderid=".$id;
+               $sql = "select vtiger_pogrouprelation.groupname,vtiger_groups.groupid from vtiger_pogrouprelation inner join vtiger_groups on vtiger_groups.groupname=vtiger_pogrouprelation.groupname where vtiger_pogrouprelation.purchaseorderid=".$id;
         }
         elseif($module == 'HelpDesk')
         {
-               $sql = "select ticketgrouprelation.groupname,groups.groupid from ticketgrouprelation inner join groups on groups.groupname=ticketgrouprelation.groupname where ticketgrouprelation.ticketid=".$id;
+               $sql = "select vtiger_ticketgrouprelation.groupname,vtiger_groups.groupid from vtiger_ticketgrouprelation inner join vtiger_groups on vtiger_groups.groupname=vtiger_ticketgrouprelation.groupname where vtiger_ticketgrouprelation.ticketid=".$id;
         }
 	elseif($module == 'Campaigns')
 	{
-	       $sql = "select campaigngrouprelation.groupname,groups.groupid from campaigngrouprelation inner join groups on groups.groupname=campaigngrouprelation.groupname where campaigngrouprelation.campaignid=".$id;
+	       $sql = "select vtiger_campaigngrouprelation.groupname,vtiger_groups.groupid from vtiger_campaigngrouprelation inner join vtiger_groups on vtiger_groups.groupname=vtiger_campaigngrouprelation.groupname where vtiger_campaigngrouprelation.campaignid=".$id;
         }
         elseif($module == 'Activities' || $module == 'Emails' || $module == 'Events')
         {
-               $sql = "select activitygrouprelation.groupname,groups.groupid from activitygrouprelation inner join groups on groups.groupname=activitygrouprelation.groupname where activitygrouprelation.activityid=".$id;
+               $sql = "select vtiger_activitygrouprelation.groupname,vtiger_groups.groupid from vtiger_activitygrouprelation inner join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_activitygrouprelation.activityid=".$id;
 	}
 	$result = $adb->query($sql);
         $group_info[] = $adb->query_result($result,0,"groupname");
@@ -584,7 +584,7 @@
 	global $adb;
 	if($userid != '')
 	{
-		$sql = "select user_name from users where id=".$userid;
+		$sql = "select user_name from vtiger_users where id=".$userid;
 		$result = $adb->query($sql);
 		$user_name = $adb->query_result($result,0,"user_name");
 	}
@@ -594,7 +594,7 @@
 
 /**
  * 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
+ * param $focus - the module object contains the column vtiger_fields
  */
    
 function getURLstring($focus)
@@ -708,7 +708,7 @@
 	return $display_date;
 }
 
-/** This function returns the default currency information.
+/** This function returns the default vtiger_currency information.
   * Takes no param, return type array.
     */
     
@@ -718,7 +718,7 @@
 	global $adb;
 	$log->debug("Entering getDisplayCurrency() method ...");
         $curr_array = Array();
-        $sql1 = "select * from currency_info where currency_status='Active'";
+        $sql1 = "select * from vtiger_currency_info where currency_status='Active'";
         $result = $adb->query($sql1);
         $num_rows=$adb->num_rows($result);
         for($i=0; $i<$num_rows;$i++)
@@ -755,9 +755,9 @@
         return $amount * $crate;
 }
 
-/** This function returns the conversion rate and currency symbol
+/** This function returns the conversion rate and vtiger_currency symbol
   * in array format for a given id.
-  * param $id - currency id.
+  * param $id - vtiger_currency id.
   */
       
 function getCurrencySymbolandCRate($id)
@@ -765,7 +765,7 @@
 	global $log;
 	$log->debug("Entering getCurrencySymbolandCRate(".$id.") method ...");
         global $adb;
-        $sql1 = "select conversion_rate,currency_symbol from currency_info where id=".$id;
+        $sql1 = "select conversion_rate,currency_symbol from vtiger_currency_info where id=".$id;
         $result = $adb->query($sql1);
 	$rate_symbol['rate'] = $adb->query_result($result,0,"conversion_rate");
 	$rate_symbol['symbol'] = $adb->query_result($result,0,"currency_symbol");
@@ -782,7 +782,7 @@
 	global $log;
 	$log->debug("Entering getTermsandConditions() method ...");
         global $adb;
-        $sql1 = "select * from inventory_tandc";
+        $sql1 = "select * from vtiger_inventory_tandc";
         $result = $adb->query($sql1);
         $tandc = $adb->query_result($result,0,"tandc");
 	$log->debug("Exiting getTermsandConditions method ...");
@@ -791,10 +791,10 @@
 
 /**
  * Create select options in a dropdown list.  To be used inside
-  *  a reminder select statement in a activity form. 
+  *  a reminder select statement in a vtiger_activity form. 
    * param $start - start value
    * param $end - end value
-   * param $fldname - field name 
+   * param $fldname - vtiger_field name 
    * param $selvalue - selected value 
    */
     
@@ -821,7 +821,7 @@
 
 /** This function returns the List price of a given product in a given price book.
   * param $productid - product id.
-  * param $pbid - pricebook id.
+  * param $pbid - vtiger_pricebook id.
   */
   
 function getListPrice($productid,$pbid)
@@ -831,7 +831,7 @@
         $log->info("in getListPrice productid ".$productid);
 
 	global $adb;
-	$query = "select listprice from pricebookproductrel where pricebookid=".$pbid." and productid=".$productid;
+	$query = "select listprice from vtiger_pricebookproductrel where pricebookid=".$pbid." and productid=".$productid;
 	$result = $adb->query($query);
 	$lp = $adb->query_result($result,0,'listprice');
 	$log->debug("Exiting getListPrice method ...");
@@ -889,8 +889,8 @@
    return($ret);
 }
 /**
- * This function returns the blocks and its related information for given module.
- * Input Parameter are $module - module name, $disp_view = display view (edit,detail or create),$mode - edit, $col_fields - * column fields/
+ * This function returns the vtiger_blocks and its related information for given module.
+ * Input Parameter are $module - module name, $disp_view = display view (edit,detail or create),$mode - edit, $col_fields - * column vtiger_fields/
  * This function returns an array
  */
 
@@ -903,7 +903,7 @@
         $tabid = getTabid($module);
         $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";
+        $query="select blockid,blocklabel,show_title from vtiger_blocks where tabid=$tabid and $disp_view=0 and visible = 0 order by sequence";
 
         $result = $adb->query($query);
         $noofrows = $adb->num_rows($result);
@@ -918,18 +918,18 @@
 		$block_label[$blockid] = $adb->query_result($result,$i,"blocklabel");
 	}
 	$blockid_list .= ')';
-	//retreive the profileList from database
+	//retreive the vtiger_profileList from database
 	require('user_privileges/user_privileges_'.$current_user->id.'.php');
 	if($disp_view == "detail_view")
 	{
 		if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0)
 		{
-			$sql = "select field.* from field where field.tabid=".$tabid." and field.block in $blockid_list and field.displaytype in (1,2) order by block,sequence";
+			$sql = "select vtiger_field.* from vtiger_field where vtiger_field.tabid=".$tabid." and vtiger_field.block in $blockid_list and vtiger_field.displaytype in (1,2) order by block,sequence";
 		}
 		else
 		{
 			$profileList = getCurrentUserProfileList();
-			$sql = "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 field.block in ".$blockid_list." and field.displaytype in (1,2) and profile2field.visible=0 and def_org_field.visible=0 and profile2field.profileid in ".$profileList." group by field.fieldid order by block,sequence";
+			$sql = "select vtiger_field.* from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.tabid=".$tabid." and vtiger_field.block in ".$blockid_list." and vtiger_field.displaytype in (1,2) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList." group by vtiger_field.fieldid order by block,sequence";
 		}
 		$result = $adb->query($sql);
 		$getBlockInfo=getDetailBlockInformation($module,$result,$col_fields,$tabid,$block_label);
@@ -940,24 +940,24 @@
 		{
 			if($is_admin==true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2]== 0)
 			{
-				$sql = "select field.* from field where field.tabid=".$tabid." and field.block in ".$blockid_list ." and field.displaytype=1 and info_type = '".$info_type."' order by block,sequence";
+				$sql = "select vtiger_field.* from vtiger_field where vtiger_field.tabid=".$tabid." and vtiger_field.block in ".$blockid_list ." and vtiger_field.displaytype=1 and info_type = '".$info_type."' order by block,sequence";
 			}
 			else
 			{
 				$profileList = getCurrentUserProfileList();
-				$sql = "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 field.block in ".$blockid_list." and field.displaytype=1 and info_type = '".$info_type."' and profile2field.visible=0 and def_org_field.visible=0 and profile2field.profileid in ".$profileList.=" group by field.fieldid order by block,sequence";
+				$sql = "select vtiger_field.* from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid  where vtiger_field.tabid=".$tabid." and vtiger_field.block in ".$blockid_list." and vtiger_field.displaytype=1 and info_type = '".$info_type."' and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList.=" group by vtiger_field.fieldid order by block,sequence";
 			}
 		}
 		else
 		{
 			if($is_admin==true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0)
 			{
-				$sql = "select field.* from field where field.tabid=".$tabid." and field.block in ".$blockid_list." and field.displaytype=1 order by block,sequence";
+				$sql = "select vtiger_field.* from vtiger_field where vtiger_field.tabid=".$tabid." and vtiger_field.block in ".$blockid_list." and vtiger_field.displaytype=1 order by block,sequence";
 			}
 			else
 			{
 				$profileList = getCurrentUserProfileList();
-				$sql = "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 field.block in ".$blockid_list." and field.displaytype=1 and profile2field.visible=0 and def_org_field.visible=0 and profile2field.profileid in ".$profileList.=" group by field.fieldid order by block,sequence";
+				$sql = "select vtiger_field.* from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid  where vtiger_field.tabid=".$tabid." and vtiger_field.block in ".$blockid_list." and vtiger_field.displaytype=1 and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList.=" group by vtiger_field.fieldid order by block,sequence";
 			}
 		}
 		$result = $adb->query($sql);
@@ -995,7 +995,7 @@
 	$log->debug("Entering getBlockId(".$tabid.",".$label.") method ...");
         global $adb;
         $blockid = '';
-        $query = "select blockid from blocks where tabid=$tabid and blocklabel = '$label'";
+        $query = "select blockid from vtiger_blocks where tabid=$tabid and blocklabel = '$label'";
         $result = $adb->query($query);
         $noofrows = $adb->num_rows($result);
         if($noofrows == 1)
@@ -1007,8 +1007,8 @@
 }
 
 /**
- * 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 function is used to get the Parent and Child vtiger_tab relation array.
+ * Takes no parameter and get the data from parent_tabdata.php and vtiger_tabdata.php
  * This returns array type value
  */
 
@@ -1059,8 +1059,8 @@
 }
 
 /**
- * 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 function is used to get the Parent Tab name for a given parent vtiger_tab id.
+ * Takes the input parameter as $parenttabid - Parent vtiger_tab id
  * This returns value string type 
  */
 
@@ -1076,7 +1076,7 @@
 	}
 	else
 	{
-		$sql = "select parenttab_label from parenttab where parenttabid=".$parenttabid;
+		$sql = "select parenttab_label from vtiger_parenttab where parenttabid=".$parenttabid;
 		$result = $adb->query($sql);
 		$parent_tabname=  $adb->query_result($result,0,"parenttab_label");
 	}
@@ -1113,7 +1113,7 @@
 	}
 	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."'";
+		$sql = "select vtiger_parenttab.* from vtiger_parenttab inner join vtiger_parenttabrel on vtiger_parenttabrel.parenttabid=vtiger_parenttab.parenttabid inner join vtiger_tab on vtiger_tab.tabid=vtiger_parenttabrel.tabid where vtiger_tab.name='".$module."'";
 		$result = $adb->query($sql);
 		$tab =  $adb->query_result($result,0,"parenttab_label");
 		$log->debug("Exiting getParentTabFromModule method ...");
@@ -1123,7 +1123,7 @@
 
 /**
  * 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
+ * Takes no parameter but gets the vtiger_parenttab value from form request
  * This returns value string type 
  */
 
@@ -1146,7 +1146,7 @@
 /**
  * This function is used to get the days in between the current time and the modified time of an entity .
  * Takes the input parameter as $id - crmid  it will calculate the number of days in between the
- * the current time and the modified time from the crmentity table and return the result as a string.
+ * the current time and the modified time from the vtiger_crmentity vtiger_table and return the result as a string.
  * The return format is updated <No of Days> day ago <(date when updated)>
  */
 
@@ -1157,7 +1157,7 @@
 
     global $adb;
     global $app_strings;
-    $query='select modifiedtime from crmentity where crmid ='.$id ;
+    $query='select modifiedtime from vtiger_crmentity where crmid ='.$id ;
     $result = $adb->query($query);
     $modifiedtime = $adb->query_result($result,0,'modifiedtime');
     $values=explode(' ',$modifiedtime);
@@ -1194,7 +1194,7 @@
 	$script_images=array();
 	$script = '<script>var ProductImages = new Array(';
    	$i=0;
-	$query='select imagename from products where productid='.$id;
+	$query='select imagename from vtiger_products where productid='.$id;
 	$result = $adb->query($query);
 	$imagename=$adb->query_result($result,0,'imagename');
 	$image_lists=explode('###',$imagename);
@@ -1381,7 +1381,7 @@
 
 /**
  * This function is used get the User Count.
- * It returns the array which has the total users ,admin users,and the non admin users 
+ * It returns the array which has the total vtiger_users ,admin vtiger_users,and the non admin vtiger_users 
  */
 
 function UserCount()
@@ -1389,9 +1389,9 @@
 	global $log;
 	$log->debug("Entering UserCount() method ...");
 	global $adb;
-	$result=$adb->query("select * from users where deleted =0;");
+	$result=$adb->query("select * from vtiger_users where deleted =0;");
 	$user_count=$adb->num_rows($result);
-	$result=$adb->query("select * from users where deleted =0 AND is_admin != 'on';");
+	$result=$adb->query("select * from vtiger_users where deleted =0 AND is_admin != 'on';");
 	$nonadmin_count = $adb->num_rows($result);
 	$admin_count = $user_count-$nonadmin_count;
 	$count=array('user'=>$user_count,'admin'=>$admin_count,'nonadmin'=>$nonadmin_count);
@@ -1435,7 +1435,7 @@
 		$log->debug("Entering DefHomeView() method ...");
 		global $adb;
 		global $current_user;
-		$query="select defhomeview from users where id = ".$current_user->id;
+		$query="select defhomeview from vtiger_users where id = ".$current_user->id;
 		$result=$adb->query($query);
 		$defaultview=$adb->query_result($result,0,'defhomeview');
 		$log->debug("Exiting DefHomeView method ...");
@@ -1472,7 +1472,7 @@
 }
 
  /**
- * Function to write the tabid and name to a flat file tabdata.txt so that the data
+ * Function to write the tabid and name to a flat file vtiger_tabdata.txt so that the data
  * is obtained from the file instead of repeated queries
  * returns null
  */
@@ -1481,9 +1481,9 @@
 {
 	global $log;
 	$log->debug("Entering create_tab_data_file() method ...");
-        $log->info("creating tabdata file");
+        $log->info("creating vtiger_tabdata file");
         global $adb;
-        $sql = "select * from tab";
+        $sql = "select * from vtiger_tab";
         $result = $adb->query($sql);
         $num_rows=$adb->num_rows($result);
         $result_array=Array();
@@ -1540,7 +1540,7 @@
 
 
  /**
- * Function to write the parenttabid and name to a flat file parent_tabdata.txt so that the data
+ * Function to write the vtiger_parenttabid and name to a flat file parent_tabdata.txt so that the data
  * is obtained from the file instead of repeated queries
  * returns null
  */
@@ -1551,7 +1551,7 @@
 	$log->debug("Entering create_parenttab_data_file() method ...");
 	$log->info("creating parent_tabdata file");
 	global $adb;
-	$sql = "select parenttabid,parenttab_label from parenttab order by sequence";
+	$sql = "select parenttabid,parenttab_label from vtiger_parenttab order by sequence";
 	$result = $adb->query($sql);
 	$num_rows=$adb->num_rows($result);
 	$result_array=Array();
@@ -1591,7 +1591,7 @@
 			foreach($result_array as $parid=>$parvalue)
 			{
 				$childArray=Array();
-				$sql = "select * from parenttabrel where parenttabid=".$parid." order by sequence";
+				$sql = "select * from vtiger_parenttabrel where parenttabid=".$parid." order by sequence";
 				$result = $adb->query($sql);
 				$num_rows=$adb->num_rows($result);
 				$result_array=Array();
@@ -1654,7 +1654,7 @@
 			 'Contacts'=>'LNK_NEW_CONTACT',
 			 'Vendors'=>'LNK_NEW_VENDOR'); 	
 
-$qc_query = "select distinct tab.tablabel,tab.name from field inner join tab on tab.tabid = field.tabid where quickcreate=0 order by tab.tablabel";
+$qc_query = "select distinct vtiger_tab.tablabel,vtiger_tab.name from vtiger_field inner join vtiger_tab on vtiger_tab.tabid = vtiger_field.tabid where quickcreate=0 order by vtiger_tab.tablabel";
 $result = $adb->query($qc_query);
 $noofrows = $adb->num_rows($result);
 $return_qcmodule = Array();
@@ -1680,7 +1680,7 @@
 }
 																					   
 /**
- * This function is used to get the Quick create form field parameters for a given module.
+ * This function is used to get the Quick create form vtiger_field parameters for a given module.
  * Param $module - module name 
  * returns the value in array format
  */
@@ -1700,12 +1700,12 @@
 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";
+                 $quickcreate_query = "select * from vtiger_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";
+                 $quickcreate_query = "select vtiger_field.* from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.tabid=".$tabid." and quickcreate=0 and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0  and vtiger_profile2field.profileid in ".$profileList." order by quickcreatesequence";
            }
 																					     
 $category = getParentTab();
@@ -1830,7 +1830,7 @@
 	global $log;
 	$log->debug("Entering getUserslist() method ...");
 	global $adb;
-	$result=$adb->query("select * from users");
+	$result=$adb->query("select * from vtiger_users");
 	for($i=0;$i<$adb->num_rows($result);$i++)
 	{
 	       $useridlist[$i]=$adb->query_result($result,$i,'id');
@@ -1883,7 +1883,7 @@
 		
 	switch ($module)
 	{
-		case "Accounts" : $query = "select accountname from account where accountid in (".$list.")";
+		case "Accounts" : $query = "select accountname from vtiger_account where accountid in (".$list.")";
 				  $result = $adb->query($query);
 				  $numrows = $adb->num_rows($result);
 				  $account_name = array();	
@@ -1895,7 +1895,7 @@
 					return $account_name;
 					break;
 
-		  case "Leads" :  $query = "select concat(firstname,' ',lastname) as leadname from leaddetails where leadid in (".$list.")";
+		  case "Leads" :  $query = "select concat(firstname,' ',lastname) as leadname from vtiger_leaddetails where leadid in (".$list.")";
 				  $result = $adb->query($query);
 				  $numrows = $adb->num_rows($result);
 				  $lead_name = array();
@@ -1908,7 +1908,7 @@
 					return $lead_name;
 					break;
 		
-	       case "Contacts" : $query = "select concat(firstname,' ',lastname) as contactname from contactdetails where contactid in (".$list.")"; 
+	       case "Contacts" : $query = "select concat(firstname,' ',lastname) as contactname from vtiger_contactdetails where contactid in (".$list.")"; 
 				 $result = $adb->query($query);
 				 $numrows = $adb->num_rows($result);
 				 $contact_name = array();
@@ -1921,7 +1921,7 @@
 					return $contact_name;
 					break;
 
-	    case "Potentials"  : $query = "select potentialname from potential where potentialid in (".$list.")";
+	    case "Potentials"  : $query = "select potentialname from vtiger_potential where potentialid in (".$list.")";
 				 $result = $adb->query($query);
 				 $numrows = $adb->num_rows($result);
 				 $potential_name = array();
@@ -1934,7 +1934,7 @@
 					return $potential_name;
 					break;
 
-	        case "Quotes"  : $query = "select subject from quotes where quoteid in (".$list.")";
+	        case "Quotes"  : $query = "select subject from vtiger_quotes where quoteid in (".$list.")";
 				 $result = $adb->query($query);
 				 $numrows = $adb->num_rows($result);
 				 $quote_subject = array();		    	
@@ -1947,7 +1947,7 @@
 					return $quote_subject;
 					break;	
 
-	    case "SalesOrder"  : $query = "select subject from salesorder where salesorderid in (".$list.")";
+	    case "SalesOrder"  : $query = "select subject from vtiger_salesorder where salesorderid in (".$list.")";
 				 $result = $adb->query($query);
 				 $numrows = $adb->num_rows($result);
 				 $so_subject = array();		    	
@@ -1960,7 +1960,7 @@
 					return $so_subject;
 					break;
 	
-	       case "Invoice"  : $query = "select subject from invoice where invoiceid in (".$list.")";
+	       case "Invoice"  : $query = "select subject from vtiger_invoice where invoiceid in (".$list.")";
 				 $result = $adb->query($query);
 				 $numrows = $adb->num_rows($result);
 				 $inv_subject = array();		    	
@@ -1973,7 +1973,7 @@
 					return $inv_subject;
 					break;
 		
-	      case "Products"  : $query = "select productname from products where productid in (".$list.")";
+	      case "Products"  : $query = "select productname from vtiger_products where productid in (".$list.")";
 				 $result = $adb->query($query);
 				 $numrows = $adb->num_rows($result);
 				 $product_name = array();		    	
@@ -1986,7 +1986,7 @@
 					return $product_name;
 					break;
 
-	   case "PriceBooks"  :  $query = "select bookname from pricebook where pricebookid in (".$list.")";
+	   case "PriceBooks"  :  $query = "select bookname from vtiger_pricebook where pricebookid in (".$list.")";
 				 $result = $adb->query($query);
 				 $numrows = $adb->num_rows($result);
 				 $pbook_name = array();		    	
@@ -1999,7 +1999,7 @@
 					return $pbook_name;
 					break;
 
-	        case "Notes"  :  $query = "select title from notes where notesid in (".$list.")";
+	        case "Notes"  :  $query = "select title from vtiger_notes where notesid in (".$list.")";
 				 $result = $adb->query($query);
 				 $numrows = $adb->num_rows($result);
 				 $notes_title = array();		    	
@@ -2012,7 +2012,7 @@
 					return $notes_title;
 					break;
 		
-	  case "Activities"  :  $query = "select subject from activity where activityid in (".$list.")";
+	  case "Activities"  :  $query = "select subject from vtiger_activity where activityid in (".$list.")";
 				 $result = $adb->query($query);
 				 $numrows = $adb->num_rows($result);
 				 $activity_subject = array();		    	
@@ -2025,7 +2025,7 @@
 					return $activity_subject;
 					break;
 
-	    case "Campaigns"  :  $query = "select campaignname from campaign where campaignid in (".$list.")";
+	    case "Campaigns"  :  $query = "select campaignname from vtiger_campaign where campaignid in (".$list.")";
 				 $result = $adb->query($query);
 				 $numrows = $adb->num_rows($result);
 				 $campaign_name = array();		    	
@@ -2038,7 +2038,7 @@
 					return $campaign_name;
 					break;
 
-	          case "Faq"  :  $query = "select question from faq where id in (".$list.")";
+	          case "Faq"  :  $query = "select question from vtiger_faq where id in (".$list.")";
 				 $result = $adb->query($query);
 				 $numrows = $adb->num_rows($result);
 				 $faq_name = array();		    	
@@ -2051,7 +2051,7 @@
 					return $faq_name;
 					break;
 		
-	      case "Vendors"  :  $query = "select vendorname from vendor where vendorid in (".$list.")";
+	      case "Vendors"  :  $query = "select vendorname from vtiger_vendor where vendorid in (".$list.")";
 				 $result = $adb->query($query);
 				 $numrows = $adb->num_rows($result);
 				 $vendor_name = array();		    	
@@ -2064,7 +2064,7 @@
 					return $vendor_name;
 					break;
 
-	case "PurchaseOrder"  :  $query = "select subject from purchaseorder where purchaseorderid in (".$list.")";
+	case "PurchaseOrder"  :  $query = "select subject from vtiger_purchaseorder where purchaseorderid in (".$list.")";
 				 $result = $adb->query($query);
 				 $numrows = $adb->num_rows($result);
 				 $po_name = array();		    	
@@ -2077,7 +2077,7 @@
 					return $po_name;
 					break;
 
-	     case "HelpDesk"  :  $query = "select title from troubletickets where ticketid in (".$list.")";
+	     case "HelpDesk"  :  $query = "select title from vtiger_troubletickets where ticketid in (".$list.")";
 				 $result = $adb->query($query);
 				 $numrows = $adb->num_rows($result);
 				 $ticket_name = array();		    	
@@ -2099,7 +2099,7 @@
         global $adb;
 	global $current_user;
         $resultant_array = Array();
-        $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';
+        $query = 'select name,tablabel,parenttab_label,vtiger_tab.tabid from vtiger_parenttabrel inner join vtiger_tab on vtiger_parenttabrel.tabid = vtiger_tab.tabid inner join vtiger_parenttab on vtiger_parenttabrel.parenttabid = vtiger_parenttab.parenttabid order by vtiger_parenttab.sequence';
         $result = $adb->query($query);
 	require('user_privileges/user_privileges_'.$current_user->id.'.php');
         for($i=0;$i<$adb->num_rows($result);$i++)
@@ -2179,7 +2179,7 @@
 }
 
 /**
- * 	This function is used to get the Path in where we store the files based on the module.
+ * 	This function is used to get the Path in where we store the vtiger_files based on the module.
  *	@param string $module   - module name
  * 	return string $storage_path - path inwhere the file will be uploaded (also where it was stored) will be return based on the module
 */
@@ -2205,7 +2205,7 @@
 
 /**
  * 	This function is used to check whether the attached file is a image file or not
- *	@param string $file_details  - files array which contains all the uploaded file details
+ *	@param string $file_details  - vtiger_files array which contains all the uploaded file details
  * 	return string $save_image - true or false. if the image can be uploaded then true will return otherwise false.
 */
 function validateImageFile($file_details)
@@ -2243,7 +2243,7 @@
         global $adb,$log;
         $log->debug("Entering into getTemplateDetails($templateid) method ...");
         $returndata =  Array();
-        $result = $adb->query("select * from emailtemplates where templateid=$templateid");
+        $result = $adb->query("select * from vtiger_emailtemplates where templateid=$templateid");
         $returndata[] = $templateid;
         $returndata[] = $adb->query_result($result,0,'body');
         $returndata[] = $adb->query_result($result,0,'subject');
@@ -2278,7 +2278,7 @@
 			if(is_array($fields["accounts"]))
 			{
 				$columnfields = implode(',',$fields["accounts"]);
-				$query = 'select '.$columnfields.' from account where accountid ='.$id;
+				$query = 'select '.$columnfields.' from vtiger_account where accountid ='.$id;
 				$result = $adb->query($query);
 				foreach($fields["accounts"] as $columnname)			
 				{

Modified: vtigercrm/trunk/include/utils/DeleteUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/DeleteUtils.php (original)
+++ vtigercrm/trunk/include/utils/DeleteUtils.php Mon Jun 12 14:26:25 2006
@@ -24,73 +24,73 @@
 	case Accounts:
 		if($return_id!='')
 		{
-			$sql ='delete from seactivityrel where crmid = '.$record.' and activityid = '.$return_id;
+			$sql ='delete from vtiger_seactivityrel where crmid = '.$record.' and activityid = '.$return_id;
 			$adb->query($sql);
 		}
 	break;
 	case Activities:
 		if($return_module == 'Contacts')
 		{
-			$sql = 'delete from cntactivityrel where contactid = '.$return_id.' and activityid = '.$record;
+			$sql = 'delete from vtiger_cntactivityrel where contactid = '.$return_id.' and activityid = '.$record;
 			$adb->query($sql);
 		}
 		else
 		{
-			$sql= 'delete from seactivityrel where activityid='.$record;
+			$sql= 'delete from vtiger_seactivityrel where activityid='.$record;
 			$adb->query($sql);
 		}
 
 		if($return_module == 'HelpDesk')
 		{
-			$sql = 'delete from seticketsrel where ticketid = '.$return_id.' and crmid = '.$record;
-			$adb->query($sql);
-		}
-		$sql = 'delete from activity_reminder where activity_id='.$record;
+			$sql = 'delete from vtiger_seticketsrel where ticketid = '.$return_id.' and crmid = '.$record;
+			$adb->query($sql);
+		}
+		$sql = 'delete from vtiger_activity_reminder where activity_id='.$record;
  		$adb->query($sql);
 
- 		$sql = 'delete  from recurringevents where activityid='.$record;
+ 		$sql = 'delete  from vtiger_recurringevents where activityid='.$record;
  		$adb->query($sql);
 	break;
 	case Contacts:
 		if($return_module == 'Accounts')
 		{
-			$sql = 'update crmentity set deleted = 1 where crmid = '.$record;
+			$sql = 'update vtiger_crmentity set deleted = 1 where crmid = '.$record;
 			$adb->query($sql);
 		}
 		if($return_module == 'Potentials' && $record != '' && $return_id != '')
 		{
-			$sql = 'delete from contpotentialrel where contactid='.$record.' and potentialid='.$return_id;
+			$sql = 'delete from vtiger_contpotentialrel where contactid='.$record.' and potentialid='.$return_id;
 			$adb->query($sql);
 		}
 		if($record != '' && $return_id != '')
 		{
-			$sql = 'delete from seactivityrel where crmid = '.$record.' and activityid = '.$return_id;
-			$adb->query($sql);
-			$sql_recentviewed ='delete from tracker where user_id = '.$current_user->id.' and item_id = '.$record;
+			$sql = 'delete from vtiger_seactivityrel where crmid = '.$record.' and activityid = '.$return_id;
+			$adb->query($sql);
+			$sql_recentviewed ='delete from vtiger_tracker where user_id = '.$current_user->id.' and item_id = '.$record;
 			$adb->query($sql_recentviewed);
 		}
 		if($return_module == 'Products')
 		{
-			$sql = 'delete from vendorcontactrel where contactid='.$record.' and vendorid='.$return_id;
+			$sql = 'delete from vtiger_vendorcontactrel where contactid='.$record.' and vendorid='.$return_id;
 			$adb->query($sql);
 		}
 	break;
 	case Emails:
-		$sql='delete from seactivityrel where activityid='.$adb->quote($record);
+		$sql='delete from vtiger_seactivityrel where activityid='.$adb->quote($record);
 		$adb->query($sql);
 	break;
 	case HelpDesk:
 		if($return_module == 'Contacts' || $return_module == 'Accounts')
 		{
-			$sql = "update troubletickets set parent_id='' where ticketid=".$record;
-			$adb->query($sql);
-			$se_sql= 'delete from seticketsrel where ticketid='.$record;
+			$sql = "update vtiger_troubletickets set parent_id='' where ticketid=".$record;
+			$adb->query($sql);
+			$se_sql= 'delete from vtiger_seticketsrel where ticketid='.$record;
 			$adb->query($se_sql);
 
 		}
 		if($return_module == 'Products')
 		{
-			$sql = "update troubletickets set product_id='' where ticketid=".$record;
+			$sql = "update vtiger_troubletickets set product_id='' where ticketid=".$record;
 			$adb->query($sql);
 		}
 	break;
@@ -101,13 +101,13 @@
 		}
 		elseif($return_module=="SalesOrder")
 		{
-			$relation_query = "UPDATE invoice set salesorderid='' where invoiceid=".$record;
+			$relation_query = "UPDATE vtiger_invoice set salesorderid='' where invoiceid=".$record;
 			$adb->query($relation_query);
 		}
 		elseif($return_module=="Products")
 		{
-			//Removing the relation from the quotes product rel
-			$inv_query = "select * from invoiceproductrel where productid=".$return_id;
+			//Removing the relation from the vtiger_quotes product rel
+			$inv_query = "select * from vtiger_invoiceproductrel where productid=".$return_id;
 			$result = $adb->query($inv_query);
 			$num_rows = $adb->num_rows($result);
 			for($i=0; $i< $num_rows; $i++)
@@ -120,48 +120,48 @@
 				//Get the current sub total from Quotes and update it with the new subtotal
 				updateSubTotal("Invoices","invoice","subtotal","total","invoiceid",$invoice_id,$prod_total);
 			}
-			//delete the relation from quotes product rel
-			$del_query = "delete from invoiceproductrel where productid=".$return_id." and invoiceid=".$record;
+			//delete the relation from vtiger_quotes product rel
+			$del_query = "delete from vtiger_invoiceproductrel where productid=".$return_id." and invoiceid=".$record;
 			$adb->query($del_query);
 		}
 	break;
 	case Leads:
-		$sql = 'delete from seactivityrel where crmid = '.$record.' and activityid = '.$return_id;
+		$sql = 'delete from vtiger_seactivityrel where crmid = '.$record.' and activityid = '.$return_id;
 		$adb->query($sql);
 	break;
 	case Notes:
 		if($return_module== 'Contacts')
 		{
-			$sql = 'update notes set contact_id = 0 where notesid = '.$record;
-			$adb->query($sql);
-		}
-		$sql = 'delete from senotesrel where notesid = '.$record. ' and crmid = '.$return_id;
+			$sql = 'update vtiger_notes set contact_id = 0 where notesid = '.$record;
+			$adb->query($sql);
+		}
+		$sql = 'delete from vtiger_senotesrel where notesid = '.$record. ' and crmid = '.$return_id;
 		$adb->query($sql);
 
 	break;
 	case Potentials:
 		if($return_module == 'Accounts')
 		{
-			$sql = 'update crmentity set deleted = 1 where crmid = '.$record;
-			$adb->query($sql);
-		}
-		$sql ='delete from seactivityrel where crmid = '.$record.' and activityid = '.$return_id;
+			$sql = 'update vtiger_crmentity set deleted = 1 where crmid = '.$record;
+			$adb->query($sql);
+		}
+		$sql ='delete from vtiger_seactivityrel where crmid = '.$record.' and activityid = '.$return_id;
 		$adb->query($sql);
 	break;
 	case Products:
 		if($record != '' && $return_id != '')
 		{
 			if($return_module == 'Activities')
-				$sql = 'delete from seactivityrel where crmid = '.$record.' and activityid = '.$return_id;
+				$sql = 'delete from vtiger_seactivityrel where crmid = '.$record.' and activityid = '.$return_id;
 
 			if($return_module == 'Potentials' || $return_module == 'Accounts' || $return_module == 'Leads')
-				$sql = 'delete from seproductsrel where crmid = '.$return_id.' and productid = '.$record;
+				$sql = 'delete from vtiger_seproductsrel where crmid = '.$return_id.' and productid = '.$record;
 
 			$adb->query($sql);
 		}
 		if($return_module == "Contacts")
 		{
-			$sql = "UPDATE products set contactid = '' where productid = ".$record;
+			$sql = "UPDATE vtiger_products set contactid = '' where productid = ".$record;
 			$adb->query($sql);
 		}
 	break;
@@ -173,13 +173,13 @@
 		}
 		elseif($return_module == "Vendors")
 		{
-			$sql_req ='DELETE from purchaseorder where purchaseorderid= '.$record;
+			$sql_req ='DELETE from vtiger_purchaseorder where purchaseorderid= '.$record;
 			$adb->query($sql_req);
 		}
 		elseif($return_module == "Products")
 		{
 			//Removing the relation from the po product rel
-			$po_query = "select * from poproductrel where productid=".$return_id;
+			$po_query = "select * from vtiger_poproductrel where productid=".$return_id;
 			$result = $adb->query($po_query);
 			$num_rows = $adb->num_rows($result);
 			for($i=0; $i< $num_rows; $i++)
@@ -192,13 +192,13 @@
 				updateSubTotal("PurchaseOrder","purchaseorder","subtotal","total","purchaseorderid",$po_id,$prod_total);
 			}
 			//delete the relation from po product rel
-			$del_query = "delete from poproductrel where productid=".$return_id." and purchaseorderid=".$record;
+			$del_query = "delete from vtiger_poproductrel where productid=".$return_id." and purchaseorderid=".$record;
 			$adb->query($del_query);
 
 		}
 		elseif($return_module == "Contacts")
 		{
-			$sql_req ='UPDATE purchaseorder set contactid="" where purchaseorderid = '.$record;
+			$sql_req ='UPDATE vtiger_purchaseorder set contactid="" where purchaseorderid = '.$record;
 			$adb->query($sql_req);
 		}
 	break;
@@ -209,18 +209,18 @@
 		}
 		elseif($return_module == "Potentials")
 		{
-			$relation_query = "UPDATE quotes set potentialid='' where quoteid=".$record;
+			$relation_query = "UPDATE vtiger_quotes set potentialid='' where quoteid=".$record;
 			$adb->query($relation_query);
 		}
 		elseif($return_module == "Contacts")
 		{
-			$relation_query = "UPDATE quotes set contactid='' where quoteid=".$record;
+			$relation_query = "UPDATE vtiger_quotes set contactid='' where quoteid=".$record;
 			$adb->query($relation_query);
 		}
 		elseif($return_module == "Products")
 		{
-			//Removing the relation from the quotes product rel
-			$qt_query = "select * from quotesproductrel where productid=".$return_id;
+			//Removing the relation from the vtiger_quotes product rel
+			$qt_query = "select * from vtiger_quotesproductrel where productid=".$return_id;
 			$result = $adb->query($qt_query);
 			$num_rows = $adb->num_rows($result);
 			for($i=0; $i< $num_rows; $i++)
@@ -233,8 +233,8 @@
 				//Get the current sub total from Quotes and update it with the new subtotal
 				updateSubTotal("Quotes","quotes","subtotal","total","quoteid",$quote_id,$prod_total);
 			}
-			//delete the relation from quotes product rel
-			$del_query = "delete from quotesproductrel where productid=".$return_id." and quoteid=".$record;
+			//delete the relation from vtiger_quotes product rel
+			$del_query = "delete from vtiger_quotesproductrel where productid=".$return_id." and quoteid=".$record;
 			$adb->query($del_query);
 
 		}
@@ -245,23 +245,23 @@
 		}
 		elseif($return_module == "Quotes")
 		{
-			$relation_query = "UPDATE salesorder set quoteid='' where salesorderid=".$record;
+			$relation_query = "UPDATE vtiger_salesorder set quoteid='' where salesorderid=".$record;
 			$adb->query($relation_query);
 		}
 		elseif($return_module == "Potentials")
 		{
-			$relation_query = "UPDATE salesorder set potentialid='' where salesorderid=".$record;
+			$relation_query = "UPDATE vtiger_salesorder set potentialid='' where salesorderid=".$record;
 			$adb->query($relation_query);
 		}
 		elseif($return_module == "Contacts")
 		{
-			$relation_query = "UPDATE salesorder set contactid='' where salesorderid=".$record;
+			$relation_query = "UPDATE vtiger_salesorder set contactid='' where salesorderid=".$record;
 			$adb->query($relation_query);
 		}
 		elseif($return_module == "Products")
 		{
 			//Removing the relation from the so product rel
-			$so_query = "select * from soproductrel where productid=".$return_id;
+			$so_query = "select * from vtiger_soproductrel where productid=".$return_id;
 			$result = $adb->query($so_query);
 			$num_rows = $adb->num_rows($result);
 			for($i=0; $i< $num_rows; $i++)
@@ -275,17 +275,17 @@
 				updateSubTotal("SalesOrder","salesorder","subtotal","total","salesorderid",$so_id,$prod_total);
 			}
 			//delete the relation from so product rel
-			$del_query = "delete from soproductrel where productid=".$return_id." and salesorderid=".$record;
+			$del_query = "delete from vtiger_soproductrel where productid=".$return_id." and salesorderid=".$record;
 			$adb->query($del_query);
 
 		}
 	break;
 		case Rss:
-			$del_query = "delete from rss where rssid=".$record;
+			$del_query = "delete from vtiger_rss where rssid=".$record;
 			$adb->query($del_query);
 	break;
 		case Portal:
-			$del_query = "delete from portal where portalid=".$record;
+			$del_query = "delete from vtiger_portal where portalid=".$record;
 			$adb->query($del_query);
 	break;
 	endswitch;
@@ -300,7 +300,7 @@
 	}
 	if($module != 'Faq')
 	{	
-		$sql_recentviewed ='delete from tracker where user_id = '.$current_user->id.' and item_id = '.$record;
+		$sql_recentviewed ='delete from vtiger_tracker where user_id = '.$current_user->id.' and item_id = '.$record;
         	$adb->query($sql_recentviewed);
 	}
 	$log->debug("Entering DeleteEntity method ...");

Modified: vtigercrm/trunk/include/utils/DetailViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/DetailViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/DetailViewUtils.php Mon Jun 12 14:26:25 2006
@@ -25,13 +25,13 @@
 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
+/** This function returns the detail view form vtiger_field and and its properties in array format.
+  * Param $uitype - UI type of the vtiger_field
+  * Param $fieldname - Form vtiger_field name
+  * Param $fieldlabel - Form vtiger_field label name
+  * Param $col_fields - array contains the vtiger_fieldname and values
   * Param $generatedtype - Field generated type (default is 1)
-  * Param $tabid - tab id to which the Field belongs to (default is "")
+  * Param $tabid - vtiger_tab id to which the Field belongs to (default is "")
   * Return type is an array
   */
 
@@ -67,7 +67,7 @@
 	     $label_fld[] = $mod_strings[$fieldlabel];
 	     $label_fld[] = $col_fields[$fieldname];
 	     
-		$pick_query="select * from ".$fieldname;
+		$pick_query="select * from vtiger_".$fieldname;
 		$pickListResult = $adb->query($pick_query);
 		$noofpickrows = $adb->num_rows($pickListResult);
 
@@ -260,7 +260,7 @@
         {
 		if($tabid == 4)
            {
-                   $query="select contactdetails.imagename from contactdetails where contactid=".$col_fields['record_id'];
+                   $query="select vtiger_contactdetails.imagename from vtiger_contactdetails where contactid=".$col_fields['record_id'];
                    $result = $adb->query($query);
                    $imagename=$adb->query_result($result,0,'imagename');
                    if($imagename != '')
@@ -333,10 +333,10 @@
         {
                 global $adb;
 
-                $attachmentid=$adb->query_result($adb->query("select * from seattachmentsrel where crmid = ".$col_fields['record_id']),0,'attachmentsid');
+                $attachmentid=$adb->query_result($adb->query("select * from vtiger_seattachmentsrel where crmid = ".$col_fields['record_id']),0,'attachmentsid');
 		if($col_fields[$fieldname] == '' && $attachmentid != '')
 		{
-				$attachquery = "select * from attachments where attachmentsid=".$attachmentid;
+				$attachquery = "select * from vtiger_attachments where attachmentsid=".$attachmentid;
         		        $col_fields[$fieldname] = $adb->query_result($adb->query($attachquery),0,'name');
 		}
 
@@ -356,7 +356,7 @@
 		if($tabid==14)
 		{
 			$images=array();
-			$query = 'select productname,attachments.path,attachments.name from products left join seattachmentsrel on seattachmentsrel.crmid=products.productid inner join attachments on attachments.attachmentsid=seattachmentsrel.attachmentsid where productid='.$col_fields['record_id'];
+			$query = 'select productname,vtiger_attachments.path,vtiger_attachments.name from vtiger_products left join vtiger_seattachmentsrel on vtiger_seattachmentsrel.crmid=vtiger_products.productid inner join vtiger_attachments on vtiger_attachments.attachmentsid=vtiger_seattachmentsrel.attachmentsid where productid='.$col_fields['record_id'];
 			$result_image = $adb->query($query);
 			for($image_iter=0;$image_iter < $adb->num_rows($result_image);$image_iter++)	
 			{
@@ -405,7 +405,7 @@
 			if($parent_module == "Leads")
 			{
 				$label_fld[] =$app_strings['LBL_LEAD_NAME'];
-				$sql = "select * from leaddetails where leadid=".$value;
+				$sql = "select * from vtiger_leaddetails where leadid=".$value;
 				$result = $adb->query($sql);
 				$first_name = $adb->query_result($result,0,"firstname");
 				$last_name = $adb->query_result($result,0,"lastname");
@@ -415,7 +415,7 @@
 			elseif($parent_module == "Accounts")
 			{
 				$label_fld[] = $app_strings['LBL_ACCOUNT_NAME'];
-				$sql = "select * from  account where accountid=".$value;
+				$sql = "select * from  vtiger_account where accountid=".$value;
 				$result = $adb->query($sql);
 				$account_name = $adb->query_result($result,0,"accountname");
 
@@ -424,7 +424,7 @@
 			elseif($parent_module == "Potentials")
 			{
 				$label_fld[] =$app_strings['LBL_POTENTIAL_NAME'];
-				$sql = "select * from  potential where potentialid=".$value;
+				$sql = "select * from  vtiger_potential where potentialid=".$value;
 				$result = $adb->query($sql);
 				$potentialname = $adb->query_result($result,0,"potentialname");
 
@@ -433,7 +433,7 @@
 			elseif($parent_module == "Products")
 			{
 				$label_fld[] =$app_strings['LBL_PRODUCT_NAME'];
-				$sql = "select * from  products where productid=".$value;
+				$sql = "select * from  vtiger_products where productid=".$value;
 				$result = $adb->query($sql);
 				$productname= $adb->query_result($result,0,"productname");
 
@@ -442,7 +442,7 @@
 			elseif($parent_module == "PurchaseOrder")
 			{
 				$label_fld[] =$app_strings['LBL_PORDER_NAME'];
-				$sql = "select * from  purchaseorder where purchaseorderid=".$value;
+				$sql = "select * from  vtiger_purchaseorder where purchaseorderid=".$value;
 				$result = $adb->query($sql);
 				$pordername= $adb->query_result($result,0,"subject");
 
@@ -451,7 +451,7 @@
 			elseif($parent_module == "SalesOrder")
 			{
 				$label_fld[] = $app_strings['LBL_SORDER_NAME'];
-				$sql = "select * from  salesorder where salesorderid=".$value;
+				$sql = "select * from  vtiger_salesorder where salesorderid=".$value;
 				$result = $adb->query($sql);
 				$sordername= $adb->query_result($result,0,"subject");
 
@@ -460,7 +460,7 @@
 			elseif($parent_module == "Invoice")
 			{
 				$label_fld[] = $app_strings['LBL_INVOICE_NAME'];
-				$sql = "select * from  invoice where invoiceid=".$value;
+				$sql = "select * from  vtiger_invoice where invoiceid=".$value;
 				$result = $adb->query($sql);
 				$invoicename= $adb->query_result($result,0,"subject");
 
@@ -484,7 +484,7 @@
 			if($parent_module == "Leads")
 			{
 				$label_fld[] =$app_strings['LBL_LEAD_NAME'];
-				$sql = "select * from leaddetails where leadid=".$value;
+				$sql = "select * from vtiger_leaddetails where leadid=".$value;
 				$result = $adb->query($sql);
 				$first_name = $adb->query_result($result,0,"firstname");
 				$last_name = $adb->query_result($result,0,"lastname");
@@ -494,7 +494,7 @@
 			elseif($parent_module == "Accounts")
 			{
 				$label_fld[] = $app_strings['LBL_ACCOUNT_NAME'];
-				$sql = "select * from  account where accountid=".$value;
+				$sql = "select * from  vtiger_account where accountid=".$value;
 				$result = $adb->query($sql);
 				$account_name = $adb->query_result($result,0,"accountname");
 
@@ -503,7 +503,7 @@
 			elseif($parent_module == "Potentials")
 			{
 				$label_fld[] =$app_strings['LBL_POTENTIAL_NAME'];
-				$sql = "select * from  potential where potentialid=".$value;
+				$sql = "select * from  vtiger_potential where potentialid=".$value;
 				$result = $adb->query($sql);
 				$potentialname = $adb->query_result($result,0,"potentialname");
 
@@ -512,7 +512,7 @@
 			elseif($parent_module == "Quotes")
                         {
 				$label_fld[] =$app_strings['LBL_QUOTE_NAME'];
-                                $sql = "select * from  quotes where quoteid=".$value;
+                                $sql = "select * from  vtiger_quotes where quoteid=".$value;
                                 $result = $adb->query($sql);
                                 $quotename = $adb->query_result($result,0,"subject");
 
@@ -521,7 +521,7 @@
 			elseif($parent_module == "PurchaseOrder")
                         {
 				$label_fld[] = $app_strings['LBL_PORDER_NAME'];
-                                $sql = "select * from  purchaseorder where purchaseorderid=".$value;
+                                $sql = "select * from  vtiger_purchaseorder where purchaseorderid=".$value;
                                 $result = $adb->query($sql);
                                 $pordername = $adb->query_result($result,0,"subject");
 
@@ -530,7 +530,7 @@
                         elseif($parent_module == "SalesOrder")
                         {
 				$label_fld[] = $app_strings['LBL_SORDER_NAME'];
-                                $sql = "select * from  salesorder where salesorderid=".$value;
+                                $sql = "select * from  vtiger_salesorder where salesorderid=".$value;
                                 $result = $adb->query($sql);
                                 $sordername = $adb->query_result($result,0,"subject");
 
@@ -539,7 +539,7 @@
 			elseif($parent_module == "Invoice")
                         {
 				$label_fld[] = $app_strings['LBL_INVOICE_NAME'];
-                                $sql = "select * from  invoice where invoiceid=".$value;
+                                $sql = "select * from  vtiger_invoice where invoiceid=".$value;
                                 $result = $adb->query($sql);
                                 $invoicename = $adb->query_result($result,0,"subject");
 
@@ -562,7 +562,7 @@
 			if($parent_module == "Leads")
 			{
 				$label_fld[] = $app_strings['LBL_LEAD_NAME'];
-				$sql = "select * from leaddetails where leadid=".$value;
+				$sql = "select * from vtiger_leaddetails where leadid=".$value;
 				$result = $adb->query($sql);
 				$first_name = $adb->query_result($result,0,"firstname");
 				$last_name = $adb->query_result($result,0,"lastname");
@@ -572,7 +572,7 @@
 			elseif($parent_module == "Contacts")
 			{
 				$label_fld[] = $app_strings['LBL_CONTACT_NAME'];
-				$sql = "select * from  contactdetails where contactid=".$value;
+				$sql = "select * from  vtiger_contactdetails where contactid=".$value;
 				$result = $adb->query($sql);
 				$first_name = $adb->query_result($result,0,"firstname");
                                 $last_name = $adb->query_result($result,0,"lastname");
@@ -596,7 +596,7 @@
 			$parent_name='';
 			$parent_id='';
 			$myemailid= $_REQUEST['record'];
-			$mysql = "select crmid from seactivityrel where activityid=".$myemailid;
+			$mysql = "select crmid from vtiger_seactivityrel where activityid=".$myemailid;
 			$myresult = $adb->query($mysql);
 			$mycount=$adb->num_rows($myresult);
 			if ($mycount>1){
@@ -609,7 +609,7 @@
 				if($parent_module == "Leads")
 				{
 					$label_fld[] = $app_strings['LBL_LEAD_NAME'];
-					$sql = "select * from leaddetails where leadid=".$value;
+					$sql = "select * from vtiger_leaddetails where leadid=".$value;
 					$result = $adb->query($sql);
 					$first_name = $adb->query_result($result,0,"firstname");
 					$last_name = $adb->query_result($result,0,"lastname");
@@ -618,7 +618,7 @@
 				elseif($parent_module == "Contacts")
 				{
 					$label_fld[] = $app_strings['LBL_CONTACT_NAME'];
-					$sql = "select * from  contactdetails where contactid=".$value;
+					$sql = "select * from  vtiger_contactdetails where contactid=".$value;
 					$result = $adb->query($sql);
 					$first_name = $adb->query_result($result,0,"firstname");
 					$last_name = $adb->query_result($result,0,"lastname");
@@ -627,7 +627,7 @@
 				elseif($parent_module == "Accounts")
 				{
 					$label_fld[] = $app_strings['LBL_ACCOUNT_NAME'];
-					$sql = "select * from  account where accountid=".$value;
+					$sql = "select * from  vtiger_account where accountid=".$value;
 					$result = $adb->query($sql);
 					$accountname = $adb->query_result($result,0,"accountname");
 					$label_fld[] = '<a href="index.php?module='.$parent_module.'&action=DetailView&record='.$value.'">'.$accountname.'</a>';
@@ -651,7 +651,7 @@
 			if($parent_module == "Contacts")
 			{
 				$label_fld[] = $app_strings['LBL_CONTACT_NAME'];
-				$sql = "select * from  contactdetails where contactid=".$value;
+				$sql = "select * from  vtiger_contactdetails where contactid=".$value;
 				$result = $adb->query($sql);
 				$first_name = $adb->query_result($result,0,"firstname");
                                 $last_name = $adb->query_result($result,0,"lastname");
@@ -661,7 +661,7 @@
 			elseif($parent_module == "Accounts")
 			{
 				$label_fld[] = $app_strings['LBL_ACCOUNT_NAME'];
-				$sql = "select * from account where accountid=".$value;
+				$sql = "select * from vtiger_account where accountid=".$value;
 				$result = $adb->query($sql);
 				$account_name = $adb->query_result($result,0,"accountname");
 
@@ -833,7 +833,7 @@
 	return $label_fld;
 }
 
-/** This function returns a HTML output of associated products for a given entity (Quotes,Invoice,Sales order or Purchase order)
+/** This function returns a HTML output of associated vtiger_products for a given entity (Quotes,Invoice,Sales order or Purchase order)
   * Param $module - module name
   * Param $focus - module object
   * Return type string
@@ -870,19 +870,19 @@
 
 	if($module == 'Quotes')
 	{
-		$query="select products.productname,products.unit_price,products.qtyinstock,quotesproductrel.* from quotesproductrel inner join products on products.productid=quotesproductrel.productid where quoteid=".$focus->id;
+		$query="select vtiger_products.productname,vtiger_products.unit_price,vtiger_products.qtyinstock,vtiger_quotesproductrel.* from vtiger_quotesproductrel inner join vtiger_products on vtiger_products.productid=vtiger_quotesproductrel.productid where quoteid=".$focus->id;
 	}
 	elseif($module == 'PurchaseOrder')
 	{
-		$query="select products.productname,products.unit_price,products.qtyinstock,poproductrel.* from poproductrel inner join products on products.productid=poproductrel.productid where purchaseorderid=".$focus->id;
+		$query="select vtiger_products.productname,vtiger_products.unit_price,vtiger_products.qtyinstock,vtiger_poproductrel.* from vtiger_poproductrel inner join vtiger_products on vtiger_products.productid=vtiger_poproductrel.productid where purchaseorderid=".$focus->id;
 	}
 	elseif($module == 'SalesOrder')
 	{
-		$query="select products.productname,products.unit_price,products.qtyinstock,soproductrel.* from soproductrel inner join products on products.productid=soproductrel.productid where salesorderid=".$focus->id;
+		$query="select vtiger_products.productname,vtiger_products.unit_price,vtiger_products.qtyinstock,vtiger_soproductrel.* from vtiger_soproductrel inner join vtiger_products on vtiger_products.productid=vtiger_soproductrel.productid where salesorderid=".$focus->id;
 	}
 	elseif($module == 'Invoice')
 	{
-		$query="select products.productname,products.unit_price,products.qtyinstock,invoiceproductrel.* from invoiceproductrel inner join products on products.productid=invoiceproductrel.productid where invoiceid=".$focus->id;
+		$query="select vtiger_products.productname,vtiger_products.unit_price,vtiger_products.qtyinstock,vtiger_invoiceproductrel.* from vtiger_invoiceproductrel inner join vtiger_products on vtiger_products.productid=vtiger_invoiceproductrel.productid where invoiceid=".$focus->id;
 	}
 	$result = $adb->query($query);
 	$num_rows=$adb->num_rows($result);
@@ -954,7 +954,7 @@
 
 }
 
-/** This function returns the related tab details for a given entity or a module.
+/** This function returns the related vtiger_tab details for a given entity or a module.
 * Param $module - module name
 * Param $focus - module object
 * Return type is an array
@@ -970,7 +970,7 @@
 	
 	$cur_tab_id = getTabid($module);
 
-	$sql1 = "select * from relatedlists where tabid=".$cur_tab_id;
+	$sql1 = "select * from vtiger_relatedlists where tabid=".$cur_tab_id;
 	$result = $adb->query($sql1);
 	$num_row = $adb->num_rows($result);
 	for($i=0; $i<$num_row; $i++)
@@ -1001,8 +1001,8 @@
 /** 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
+* Param $col_fields - column vtiger_fields array for the module 
+* Param $tabid - vtiger_tab id
 * Return type is an array
 */
 

Modified: vtigercrm/trunk/include/utils/EditViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/EditViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/EditViewUtils.php Mon Jun 12 14:26:25 2006
@@ -24,12 +24,12 @@
 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
+/** This function returns the vtiger_field details for a given vtiger_fieldname.
+  * Param $uitype - UI type of the vtiger_field
+  * Param $fieldname - Form vtiger_field name
+  * Param $fieldlabel - Form vtiger_field label name
+  * Param $maxlength - maximum length of the vtiger_field
+  * Param $col_fields - array contains the vtiger_fieldname and values
   * Param $generatedtype - Field generated type (default is 1)
   * Param $module_name - module name
   * Return type is an array
@@ -110,7 +110,7 @@
 	elseif($uitype == 15 || $uitype == 16)
 	{
 		$editview_label[]=$mod_strings[$fieldlabel];
-		$pick_query="select * from ".$fieldname;
+		$pick_query="select * from vtiger_".$fieldname;
 		$pickListResult = $adb->query($pick_query);
 		$noofpickrows = $adb->num_rows($pickListResult);
 
@@ -340,7 +340,7 @@
 	{
 		$options =Array();
 		$editview_label[]=$mod_strings[$fieldlabel];
-		$pick_query="select * from groups";
+		$pick_query="select * from vtiger_groups";
 		$pickListResult = $adb->query($pick_query);
 		$noofpickrows = $adb->num_rows($pickListResult);
 		for($j = 0; $j < $noofpickrows; $j++)
@@ -364,7 +364,7 @@
 	{
 		$editview_label[]=$mod_strings[$fieldlabel];
 		$options = Array();
-		$pick_query="select * from salutationtype order by sortorderid";
+		$pick_query="select * from vtiger_salutationtype order by sortorderid";
 		$pickListResult = $adb->query($pick_query);
 		$noofpickrows = $adb->num_rows($pickListResult);
 		$salt_value = $col_fields["salutationtype"];
@@ -409,7 +409,7 @@
 		if($value=='')
 			$value=1;
 		$options = Array();
-		$pick_query="select * from duration_minutes order by sortorderid";
+		$pick_query="select * from vtiger_duration_minutes order by sortorderid";
 		$pickListResult = $adb->query($pick_query);
 		$noofpickrows = $adb->num_rows($pickListResult);
 		$salt_value = $col_fields["duration_minutes"];
@@ -481,10 +481,10 @@
 		}
 		if($col_fields['record_id'] != '')
 		{
-			$attachmentid=$adb->query_result($adb->query("select * from seattachmentsrel where crmid = ".$col_fields['record_id']),0,'attachmentsid');
+			$attachmentid=$adb->query_result($adb->query("select * from vtiger_seattachmentsrel where crmid = ".$col_fields['record_id']),0,'attachmentsid');
 			if($col_fields[$fieldname] == '' && $attachmentid != '')
 			{
-				$attachquery = "select * from attachments where attachmentsid=".$attachmentid;
+				$attachquery = "select * from vtiger_attachments where attachmentsid=".$attachmentid;
 				$value = $adb->query_result($adb->query($attachquery),0,'name');
 			}
 		}
@@ -500,11 +500,11 @@
 		//This query is for Products only
 		if($module_name == 'Products')
 		{
-			$query = 'select attachments.path,attachments.name from products left join seattachmentsrel on seattachmentsrel.crmid=products.productid inner join attachments on attachments.attachmentsid=seattachmentsrel.attachmentsid where productid='.$col_fields['record_id'];
+			$query = 'select vtiger_attachments.path,vtiger_attachments.name from vtiger_products left join vtiger_seattachmentsrel on vtiger_seattachmentsrel.crmid=vtiger_products.productid inner join vtiger_attachments on vtiger_attachments.attachmentsid=vtiger_seattachmentsrel.attachmentsid where productid='.$col_fields['record_id'];
 		}
 		else
 		{
-			$query = "select attachments.path, attachments.name from contactdetails left join seattachmentsrel on seattachmentsrel.crmid=contactdetails.contactid inner join attachments on attachments.attachmentsid=seattachmentsrel.attachmentsid where contactdetails.imagename=attachments.name and contactid=".$col_fields['record_id'];
+			$query = "select vtiger_attachments.path, vtiger_attachments.name from vtiger_contactdetails left join vtiger_seattachmentsrel on vtiger_seattachmentsrel.crmid=vtiger_contactdetails.contactid inner join vtiger_attachments on vtiger_attachments.attachmentsid=vtiger_seattachmentsrel.attachmentsid where vtiger_contactdetails.imagename=vtiger_attachments.name and contactid=".$col_fields['record_id'];
 		}
 		$result_image = $adb->query($query);
 		for($image_iter=0;$image_iter < $adb->num_rows($result_image);$image_iter++)	
@@ -530,7 +530,7 @@
 			$parent_module = getSalesEntityType($value);
 			if($parent_module == "Leads")
 			{
-				$sql = "select * from leaddetails where leadid=".$value;
+				$sql = "select * from vtiger_leaddetails where leadid=".$value;
 				$result = $adb->query($sql);
 				$first_name = $adb->query_result($result,0,"firstname");
 				$last_name = $adb->query_result($result,0,"lastname");
@@ -540,7 +540,7 @@
 			}
 			elseif($parent_module == "Accounts")
 			{
-				$sql = "select * from  account where accountid=".$value;
+				$sql = "select * from  vtiger_account where accountid=".$value;
 				$result = $adb->query($sql);
 				$parent_name = $adb->query_result($result,0,"accountname");
 				$account_selected = "selected";
@@ -548,7 +548,7 @@
 			}
 			elseif($parent_module == "Potentials")
 			{
-				$sql = "select * from  potential where potentialid=".$value;
+				$sql = "select * from  vtiger_potential where potentialid=".$value;
 				$result = $adb->query($sql);
 				$parent_name = $adb->query_result($result,0,"potentialname");
 				$potential_selected = "selected";
@@ -556,7 +556,7 @@
 			}
 			elseif($parent_module == "Products")
 			{
-				$sql = "select * from  products where productid=".$value;
+				$sql = "select * from  vtiger_products where productid=".$value;
 				$result = $adb->query($sql);
 				$parent_name= $adb->query_result($result,0,"productname");
 				$product_selected = "selected";
@@ -564,7 +564,7 @@
 			}
 			elseif($parent_module == "PurchaseOrder")
 			{
-				$sql = "select * from  purchaseorder where purchaseorderid=".$value;
+				$sql = "select * from  vtiger_purchaseorder where purchaseorderid=".$value;
 				$result = $adb->query($sql);
 				$parent_name= $adb->query_result($result,0,"subject");
 				$porder_selected = "selected";
@@ -572,7 +572,7 @@
 			}
 			elseif($parent_module == "SalesOrder")
 			{
-				$sql = "select * from  salesorder where salesorderid=".$value;
+				$sql = "select * from  vtiger_salesorder where salesorderid=".$value;
 				$result = $adb->query($sql);
 				$parent_name= $adb->query_result($result,0,"subject");
 				$sorder_selected = "selected";
@@ -580,7 +580,7 @@
 			}
 			elseif($parent_module == "Invoice")
 			{
-				$sql = "select * from  invoice where invoiceid=".$value;
+				$sql = "select * from  vtiger_invoice where invoiceid=".$value;
 				$result = $adb->query($sql);
 				$parent_name= $adb->query_result($result,0,"subject");
 				$invoice_selected = "selected";
@@ -614,7 +614,7 @@
 	{
 		if(isset($_REQUEST['parent_id']) && $_REQUEST['parent_id'] != '')
 			$value = $_REQUEST['parent_id'];
-		// Check for activity type if task orders to be added in select option
+		// Check for vtiger_activity type if task orders to be added in select option
 		$act_mode = $_REQUEST['activity_mode'];
 
 		if($value != '')
@@ -622,7 +622,7 @@
 			$parent_module = getSalesEntityType($value);
 			if($parent_module == "Leads")
 			{
-				$sql = "select * from leaddetails where leadid=".$value;
+				$sql = "select * from vtiger_leaddetails where leadid=".$value;
 				$result = $adb->query($sql);
 				$first_name = $adb->query_result($result,0,"firstname");
 				$last_name = $adb->query_result($result,0,"lastname");
@@ -632,7 +632,7 @@
 			}
 			elseif($parent_module == "Accounts")
 			{
-				$sql = "select * from  account where accountid=".$value;
+				$sql = "select * from  vtiger_account where accountid=".$value;
 				$result = $adb->query($sql);
 				$parent_name = $adb->query_result($result,0,"accountname");
 				$account_selected = "selected";
@@ -640,7 +640,7 @@
 			}
 			elseif($parent_module == "Potentials")
 			{
-				$sql = "select * from  potential where potentialid=".$value;
+				$sql = "select * from  vtiger_potential where potentialid=".$value;
 				$result = $adb->query($sql);
 				$parent_name = $adb->query_result($result,0,"potentialname");
 				$potential_selected = "selected";
@@ -648,7 +648,7 @@
 			}
 			elseif($parent_module == "Quotes")
 			{
-				$sql = "select * from  quotes where quoteid=".$value;
+				$sql = "select * from  vtiger_quotes where quoteid=".$value;
 				$result = $adb->query($sql);
 				$parent_name = $adb->query_result($result,0,"subject");
 				$quote_selected = "selected";
@@ -658,21 +658,21 @@
 			{
 				if($parent_module == "PurchaseOrder")
 				{
-					$sql = "select * from purchaseorder where purchaseorderid=".$value;
+					$sql = "select * from vtiger_purchaseorder where purchaseorderid=".$value;
 					$result = $adb->query($sql);
 					$parent_name = $adb->query_result($result,0,"subject");
 					$purchase_selected = "selected";
 				}
 				if($parent_module == "SalesOrder")
 				{
-					$sql = "select * from salesorder where salesorderid=".$value;
+					$sql = "select * from vtiger_salesorder where salesorderid=".$value;
 					$result = $adb->query($sql);
 					$parent_name = $adb->query_result($result,0,"subject");
 					$sales_selected = "selected";
 				}
 				if($parent_module == "Invoice")
 				{
-					$sql = "select * from invoice where invoiceid=".$value;
+					$sql = "select * from vtiger_invoice where invoiceid=".$value;
 					$result = $adb->query($sql);
 					$parent_name = $adb->query_result($result,0,"subject");
 					$invoice_selected = "selected";
@@ -762,7 +762,7 @@
 					$lead_selected = 'selected';
 				}
 				for ($j=1;$j<$nemail;$j++){
-					$querystr='select columnname from field where fieldid='.$realid[$j].';';
+					$querystr='select columnname from vtiger_field where fieldid='.$realid[$j].';';
 					$result=$adb->query($querystr);
 					$temp=$adb->query_result($result,0,'columnname');
 					$temp1=br2nl($myfocus->column_fields[$temp]);
@@ -793,7 +793,7 @@
 			$parent_name='';
 			$parent_id='';
 			$myemailid= $_REQUEST['record'];
-			$mysql = "select crmid from seactivityrel where activityid=".$myemailid;
+			$mysql = "select crmid from vtiger_seactivityrel where activityid=".$myemailid;
 			$myresult = $adb->query($mysql);
 			$mycount=$adb->num_rows($myresult);
 			if($mycount >0)
@@ -804,7 +804,7 @@
 					$parent_module = getSalesEntityType($mycrmid);
 					if($parent_module == "Leads")
 					{
-						$sql = "select firstname,lastname,email from leaddetails where leadid=".$mycrmid;
+						$sql = "select firstname,lastname,email from vtiger_leaddetails where leadid=".$mycrmid;
 						$result = $adb->query($sql);
 						$first_name = $adb->query_result($result,0,"firstname");
 						$last_name = $adb->query_result($result,0,"lastname");
@@ -815,7 +815,7 @@
 					}
 					elseif($parent_module == "Contacts")
 					{
-						$sql = "select * from  contactdetails where contactid=".$mycrmid;
+						$sql = "select * from  vtiger_contactdetails where contactid=".$mycrmid;
 						$result = $adb->query($sql);
 						$first_name = $adb->query_result($result,0,"firstname");
 						$last_name = $adb->query_result($result,0,"lastname");
@@ -826,7 +826,7 @@
 					}
 					elseif($parent_module == "Accounts")
 					{
-						$sql = "select * from  account where accountid=".$mycrmid;
+						$sql = "select * from  vtiger_account where accountid=".$mycrmid;
 						$result = $adb->query($sql);
 						$account_name = $adb->query_result($result,0,"accountname");
 						$myemail=$adb->query_result($result,0,"email1");
@@ -835,7 +835,7 @@
 						$account_selected = 'selected';
 					}elseif($parent_module == "Users")
 					{
-						$sql = "select user_name,email1 from users where id=".$mycrmid;
+						$sql = "select user_name,email1 from vtiger_users where id=".$mycrmid;
 						$result = $adb->query($sql);
 						$account_name = $adb->query_result($result,0,"user_name");
 						$myemail=$adb->query_result($result,0,"email1");
@@ -872,7 +872,7 @@
 			$parent_module = getSalesEntityType($value);
 			if($parent_module == "Contacts")
 			{
-				$sql = "select * from  contactdetails where contactid=".$value;
+				$sql = "select * from  vtiger_contactdetails where contactid=".$value;
 				$result = $adb->query($sql);
 				$first_name = $adb->query_result($result,0,"firstname");
 				$last_name = $adb->query_result($result,0,"lastname");
@@ -882,7 +882,7 @@
 			}
 			elseif($parent_module == "Accounts")
 			{
-				$sql = "select * from  account where accountid=".$value;
+				$sql = "select * from  vtiger_account where accountid=".$value;
 				$result = $adb->query($sql);
 				$parent_name = $adb->query_result($result,0,"accountname");
 				$account_selected = "selected";
@@ -1039,7 +1039,7 @@
 	return $final_arr;
 }
 
-/** This function returns the invoice object populated with the details from sales order object.
+/** This function returns the vtiger_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
@@ -1081,7 +1081,7 @@
 
 }
 
-/** This function returns the invoice object populated with the details from quote object.
+/** This function returns the vtiger_invoice object populated with the details from quote object.
 * Param $focus - Invoice object
 * Param $quote_focus - Quote order focus
 * Param $quoteid - quote id
@@ -1156,7 +1156,7 @@
 
 }
 
-/** This function returns the detailed list of products associated to a given entity or a record.
+/** This function returns the detailed list of vtiger_products associated to a given entity or a record.
 * Param $module - module name
 * Param $focus - module object
 * Param $seid - sales entity id
@@ -1176,27 +1176,27 @@
 	$product_Detail = Array();
 	if($module == 'Quotes')
 	{
-		$query="select products.productname,products.unit_price,products.qtyinstock,quotesproductrel.* from quotesproductrel inner join products on products.productid=quotesproductrel.productid where quoteid=".$focus->id;
+		$query="select vtiger_products.productname,vtiger_products.unit_price,vtiger_products.qtyinstock,vtiger_quotesproductrel.* from vtiger_quotesproductrel inner join vtiger_products on vtiger_products.productid=vtiger_quotesproductrel.productid where quoteid=".$focus->id;
 	}
 	elseif($module == 'PurchaseOrder')
 	{
-		$query="select products.productname,products.unit_price,products.qtyinstock,poproductrel.* from poproductrel inner join products on products.productid=poproductrel.productid where purchaseorderid=".$focus->id;
+		$query="select vtiger_products.productname,vtiger_products.unit_price,vtiger_products.qtyinstock,vtiger_poproductrel.* from vtiger_poproductrel inner join vtiger_products on vtiger_products.productid=vtiger_poproductrel.productid where purchaseorderid=".$focus->id;
 	}
 	elseif($module == 'SalesOrder')
 	{
-		$query="select products.productname,products.unit_price,products.qtyinstock,soproductrel.* from soproductrel inner join products on products.productid=soproductrel.productid where salesorderid=".$focus->id;
+		$query="select vtiger_products.productname,vtiger_products.unit_price,vtiger_products.qtyinstock,vtiger_soproductrel.* from vtiger_soproductrel inner join vtiger_products on vtiger_products.productid=vtiger_soproductrel.productid where salesorderid=".$focus->id;
 	}
 	elseif($module == 'Invoice')
 	{
-		$query="select products.productname,products.unit_price,products.qtyinstock,invoiceproductrel.* from invoiceproductrel inner join products on products.productid=invoiceproductrel.productid where invoiceid=".$focus->id;
+		$query="select vtiger_products.productname,vtiger_products.unit_price,vtiger_products.qtyinstock,vtiger_invoiceproductrel.* from vtiger_invoiceproductrel inner join vtiger_products on vtiger_products.productid=vtiger_invoiceproductrel.productid where invoiceid=".$focus->id;
 	}
 	elseif($module == 'Potentials')
 	{
-		$query="select products.productname,products.unit_price,products.qtyinstock,seproductsrel.* from products inner join seproductsrel on seproductsrel.productid=products.productid where crmid=".$seid;
+		$query="select vtiger_products.productname,vtiger_products.unit_price,vtiger_products.qtyinstock,vtiger_seproductsrel.* from vtiger_products inner join vtiger_seproductsrel on vtiger_seproductsrel.productid=vtiger_products.productid where crmid=".$seid;
 	}
 	elseif($module == 'Products')
 	{
-		$query="select products.productid,products.productname,products.unit_price,products.qtyinstock,crmentity.* from products inner join crmentity on crmentity.crmid=products.productid where crmentity.deleted=0 and productid=".$seid;
+		$query="select vtiger_products.productid,vtiger_products.productname,vtiger_products.unit_price,vtiger_products.qtyinstock,vtiger_crmentity.* from vtiger_products inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_products.productid where vtiger_crmentity.deleted=0 and productid=".$seid;
 	}
 
 	$result = $adb->query($query);
@@ -1260,7 +1260,7 @@
 
 }
 
-/** This function returns the no of products associated to the given entity or a record.
+/** This function returns the no of vtiger_products associated to the given entity or a record.
 * Param $module - module name
 * Param $focus - module object
 * Param $seid - sales entity id
@@ -1275,27 +1275,27 @@
 	$output = '';
 	if($module == 'Quotes')
 	{
-		$query="select products.productname,products.unit_price,quotesproductrel.* from quotesproductrel inner join products on products.productid=quotesproductrel.productid where quoteid=".$focus->id;
+		$query="select vtiger_products.productname,vtiger_products.unit_price,vtiger_quotesproductrel.* from vtiger_quotesproductrel inner join vtiger_products on vtiger_products.productid=vtiger_quotesproductrel.productid where quoteid=".$focus->id;
 	}
 	elseif($module == 'PurchaseOrder')
 	{
-		$query="select products.productname,products.unit_price,poproductrel.* from poproductrel inner join products on products.productid=poproductrel.productid where purchaseorderid=".$focus->id;
+		$query="select vtiger_products.productname,vtiger_products.unit_price,vtiger_poproductrel.* from vtiger_poproductrel inner join vtiger_products on vtiger_products.productid=vtiger_poproductrel.productid where purchaseorderid=".$focus->id;
 	}
 	elseif($module == 'SalesOrder')
 	{
-		$query="select products.productname,products.unit_price,soproductrel.* from soproductrel inner join products on products.productid=soproductrel.productid where salesorderid=".$focus->id;
+		$query="select vtiger_products.productname,vtiger_products.unit_price,vtiger_soproductrel.* from vtiger_soproductrel inner join vtiger_products on vtiger_products.productid=vtiger_soproductrel.productid where salesorderid=".$focus->id;
 	}
 	elseif($module == 'Invoice')
 	{
-		$query="select products.productname,products.unit_price,invoiceproductrel.* from invoiceproductrel inner join products on products.productid=invoiceproductrel.productid where invoiceid=".$focus->id;
+		$query="select vtiger_products.productname,vtiger_products.unit_price,vtiger_invoiceproductrel.* from vtiger_invoiceproductrel inner join vtiger_products on vtiger_products.productid=vtiger_invoiceproductrel.productid where invoiceid=".$focus->id;
 	}
 	elseif($module == 'Potentials')
 	{
-		$query="select products.productname,products.unit_price,seproductsrel.* from products inner join seproductsrel on seproductsrel.productid=products.productid where crmid=".$seid;
+		$query="select vtiger_products.productname,vtiger_products.unit_price,vtiger_seproductsrel.* from vtiger_products inner join vtiger_seproductsrel on vtiger_seproductsrel.productid=vtiger_products.productid where crmid=".$seid;
 	}	
 	elseif($module == 'Products')
 	{
-		$query="select products.productname,products.unit_price, crmentity.* from products inner join crmentity on crmentity.crmid=products.productid where crmentity.deleted=0 and productid=".$seid;
+		$query="select vtiger_products.productname,vtiger_products.unit_price, vtiger_crmentity.* from vtiger_products inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_products.productid where vtiger_crmentity.deleted=0 and productid=".$seid;
 	}
 
 
@@ -1309,8 +1309,8 @@
 * 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 $col_fields - vtiger_fields array
+* Param $tabid - vtiger_tab id
 * Param $info_type - information type (basic/advance) default ""
 * Return type is an object array
 */
@@ -1402,8 +1402,8 @@
 	
 }
 
-/** 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
+/** This function returns the data type of the vtiger_fields, with vtiger_field label, which is used for javascript validation.
+* Param $validationData - array of vtiger_fieldnames with datatype
 * Return type array 
 */
 

Modified: vtigercrm/trunk/include/utils/GetGroupUsers.php
==============================================================================
--- vtigercrm/trunk/include/utils/GetGroupUsers.php (original)
+++ vtigercrm/trunk/include/utils/GetGroupUsers.php Mon Jun 12 14:26:25 2006
@@ -10,7 +10,7 @@
  ********************************************************************************/
 
 
-/** Class to retreive all the users present in a group 
+/** Class to retreive all the vtiger_users present in a group 
  *
  */
 require_once('include/utils/UserInfoUtil.php');
@@ -21,17 +21,17 @@
 	var $group_users=array();
 	var $group_subgroups=array();
 
-	/** to get all the users and groups of the specified group
+	/** to get all the vtiger_users and vtiger_groups of the specified group
 	 * @params $groupId --> Group Id :: Type Integer
-         * @returns the users present in the group in the variable $parent_groups of the class
-         * @returns the sub groups present in the group in the variable $group_subgroups of the class
+         * @returns the vtiger_users present in the group in the variable $parent_groups of the class
+         * @returns the sub vtiger_groups present in the group in the variable $group_subgroups of the class
          */
 	function getAllUsersInGroup($groupid)
 	{
 		global $adb,$log;
 		$log->debug("Entering getAllUsersInGroup(".$groupid.") method...");
 		//Retreiving from the user2grouptable
-		$query="select * from users2group where groupid=".$groupid;
+		$query="select * from vtiger_users2group where groupid=".$groupid;
 		$result = $adb->query($query);
 		$num_rows=$adb->num_rows($result);
 		for($i=0;$i<$num_rows;$i++)
@@ -45,8 +45,8 @@
 		}
 		
 
-		//Retreiving from the group2role
-		$query="select * from group2role where groupid=".$groupid;
+		//Retreiving from the vtiger_group2role
+		$query="select * from vtiger_group2role where groupid=".$groupid;
                 $result = $adb->query($query);
                 $num_rows=$adb->num_rows($result);
                 for($i=0;$i<$num_rows;$i++)
@@ -66,8 +66,8 @@
 			
                 }
 
-		//Retreiving from the group2rs
-		$query="select * from group2rs where groupid=".$groupid;
+		//Retreiving from the vtiger_group2rs
+		$query="select * from vtiger_group2rs where groupid=".$groupid;
                 $result = $adb->query($query);
                 $num_rows=$adb->num_rows($result);
                 for($i=0;$i<$num_rows;$i++)
@@ -86,7 +86,7 @@
  
                 }
 		//Retreving from group2group
-		$query="select * from group2grouprel where groupid=".$groupid;
+		$query="select * from vtiger_group2grouprel where groupid=".$groupid;
                 $result = $adb->query($query);
                 $num_rows=$adb->num_rows($result);
                 for($i=0;$i<$num_rows;$i++)

Modified: vtigercrm/trunk/include/utils/GetParentGroups.php
==============================================================================
--- vtigercrm/trunk/include/utils/GetParentGroups.php (original)
+++ vtigercrm/trunk/include/utils/GetParentGroups.php Mon Jun 12 14:26:25 2006
@@ -16,7 +16,7 @@
 
 	var $parent_groups=Array();
 
-	/** to get all the parent groups of the specified group
+	/** to get all the parent vtiger_groups of the specified group
 	 * @params $groupId --> Group Id :: Type Integer
          * @returns updates the parent group in the varibale $parent_groups of the class
          */
@@ -24,7 +24,7 @@
 	{
 		global $adb,$log;
 		$log->debug("Entering getAllParentGroups(".$groupid.") method...");
-		$query="select groupid from group2grouprel where containsgroupid=".$groupId;
+		$query="select groupid from vtiger_group2grouprel where containsgroupid=".$groupId;
 		$adb->query($query);
 		$result=$adb->query($query);
 		$num_rows=$adb->num_rows($result);

Modified: vtigercrm/trunk/include/utils/GetUserGroups.php
==============================================================================
--- vtigercrm/trunk/include/utils/GetUserGroups.php (original)
+++ vtigercrm/trunk/include/utils/GetUserGroups.php Mon Jun 12 14:26:25 2006
@@ -20,7 +20,7 @@
 	var $user_groups=Array();
 	//var $userRole='';
 
-	/** to get all the parent groups of the specified group
+	/** to get all the parent vtiger_groups of the specified group
 	 * @params $groupId --> Group Id :: Type Integer
          * @returns updates the parent group in the varibale $parent_groups of the class
          */
@@ -29,7 +29,7 @@
 		global $adb,$log;
 		$log->debug("Entering getAllUserGroups(".$userid.") method...");
 		//Retreiving from the user2grouptable
-		$query="select * from users2group where userid=".$userid;
+		$query="select * from vtiger_users2group where userid=".$userid;
 		$result = $adb->query($query);
 		$num_rows=$adb->num_rows($result);
 		for($i=0;$i<$num_rows;$i++)
@@ -44,8 +44,8 @@
 
 		//Setting the User Role
 		$userRole = fetchUserRole($userid);
-		//Retreiving from the user2role
-		$query="select * from group2role where roleid='".$userRole."'";
+		//Retreiving from the vtiger_user2role
+		$query="select * from vtiger_group2role where roleid='".$userRole."'";
                 $result = $adb->query($query);
                 $num_rows=$adb->num_rows($result);
                 for($i=0;$i<$num_rows;$i++)
@@ -66,7 +66,7 @@
 			$parentRolelist .= "'".$par_rol_id."',";		
 		}
 		$parentRolelist .= "'".$userRole."')";
-		$query="select * from group2rs where roleandsubid in".$parentRolelist;
+		$query="select * from vtiger_group2rs where roleandsubid in".$parentRolelist;
                 $result = $adb->query($query);
                 $num_rows=$adb->num_rows($result);
                 for($i=0;$i<$num_rows;$i++)

Modified: vtigercrm/trunk/include/utils/InventoryUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/InventoryUtils.php (original)
+++ vtigercrm/trunk/include/utils/InventoryUtils.php Mon Jun 12 14:26:25 2006
@@ -11,8 +11,8 @@
 
 /**
  * This function returns the Product detail block values in array format.
- * Input Parameter are $module - module name, $focus - module object, $num_of_products - no.of products associated with it  * $associated_prod = associated product details
- * column fields/
+ * Input Parameter are $module - module name, $focus - module object, $num_of_products - no.of vtiger_products associated with it  * $associated_prod = associated product details
+ * column vtiger_fields/
  */
 
 function getProductDetailsBlockInfo($mode,$module,$focus='',$num_of_products='',$associated_prod='')
@@ -58,7 +58,7 @@
  * Param $productid - product id
  * Param $qty - product quantity in no's
  * Param $mode - mode type
- * Param $ext_prod_arr - existing products 
+ * Param $ext_prod_arr - existing vtiger_products 
  * Param $module - module name
  * return type void
  */
@@ -175,7 +175,7 @@
 		{
 			$notificationname = 'InvoiceNotification';
 		}
-		$query = "select * from inventorynotification where notificationname='".$notification_table."'";
+		$query = "select * from vtiger_inventorynotification where notificationname='".$notification_table."'";
 		$result = $adb->query($query);
 
 		$subject = $adb->query_result($result,0,'notificationsubject');
@@ -210,7 +210,7 @@
 	global $log;
 	$log->debug("Entering getPrdQtyInStck(".$product_id.") method ...");
 	global $adb;
-	$query1 = "SELECT qtyinstock FROM products WHERE productid = ".$product_id;
+	$query1 = "SELECT qtyinstock FROM vtiger_products WHERE productid = ".$product_id;
 	$result=$adb->query($query1);
 	$qtyinstck= $adb->query_result($result,0,"qtyinstock");
 	$log->debug("Exiting getPrdQtyInStck method ...");
@@ -227,7 +227,7 @@
 	global $log;
 	$log->debug("Entering getPrdReOrderLevel(".$product_id.") method ...");
 	global $adb;
-	$query1 = "SELECT reorderlevel FROM products WHERE productid = ".$product_id;
+	$query1 = "SELECT reorderlevel FROM vtiger_products WHERE productid = ".$product_id;
 	$result=$adb->query($query1);
 	$reorderlevel= $adb->query_result($result,0,"reorderlevel");
 	$log->debug("Exiting getPrdReOrderLevel method ...");
@@ -244,7 +244,7 @@
 	global $log;
 	$log->debug("Entering getPrdHandler(".$product_id.") method ...");
 	global $adb;
-	$query1 = "SELECT handler FROM products WHERE productid = ".$product_id;
+	$query1 = "SELECT handler FROM vtiger_products WHERE productid = ".$product_id;
 	$result=$adb->query($query1);
 	$handler= $adb->query_result($result,0,"handler");
 	$log->debug("Exiting getPrdHandler method ...");
@@ -253,14 +253,14 @@
 
 /**	function to get the taxid
  *	@param string $type - tax type (VAT or Sales or Service)
- *	return int   $taxid - taxid corresponding to the Tax type from inventorytaxinfo table
+ *	return int   $taxid - taxid corresponding to the Tax type from vtiger_inventorytaxinfo vtiger_table
  */
 function getTaxId($type)
 {
 	global $adb, $log;
 	$log->debug("Entering into getTaxId($type) function.");
 
-	$res = $adb->query("SELECT taxid FROM inventorytaxinfo WHERE taxname='$type'");
+	$res = $adb->query("SELECT taxid FROM vtiger_inventorytaxinfo WHERE taxname='$type'");
 	$taxid = $adb->query_result($res,0,'taxid');
 
 	$log->debug("Exiting from getTaxId($type) function. return value=$taxid");
@@ -269,7 +269,7 @@
 
 /**	function to get the taxpercentage
  *	@param string $type       - tax type (VAT or Sales or Service)
- *	return int $taxpercentage - taxpercentage corresponding to the Tax type from inventorytaxinfo table
+ *	return int $taxpercentage - taxpercentage corresponding to the Tax type from vtiger_inventorytaxinfo vtiger_table
  */
 function getTaxPercentage($type)
 {
@@ -278,7 +278,7 @@
 
 	$taxpercentage = '';
 
-	$res = $adb->query("SELECT percentage FROM inventorytaxinfo WHERE taxname = '$type'");
+	$res = $adb->query("SELECT percentage FROM vtiger_inventorytaxinfo WHERE taxname = '$type'");
 	$taxpercentage = $adb->query_result($res,0,'percentage');
 
 	$log->debug("Exiting from getTaxPercentage($type) function. return value=$taxpercentage");
@@ -289,7 +289,7 @@
  *	@param string $type       - tax type (VAT or Sales or Service)
  *	@param id  $productid     - productid to which we want the tax percentage
  *	@param id  $default       - if 'default' then first look for product's tax percentage and product's tax is empty then it will return the default configured tax percentage, else it will return the product's tax (not look for default value)
- *	return int $taxpercentage - taxpercentage corresponding to the Tax type from inventorytaxinfo table
+ *	return int $taxpercentage - taxpercentage corresponding to the Tax type from vtiger_inventorytaxinfo vtiger_table
  */
 function getProductTaxPercentage($type,$productid,$default='')
 {
@@ -299,11 +299,11 @@
 	$taxpercentage = '';
 
 	$res = $adb->query("SELECT taxpercentage
-			FROM inventorytaxinfo
-			INNER JOIN producttaxrel
-				ON inventorytaxinfo.taxid = producttaxrel.taxid
-			WHERE producttaxrel.productid = $productid
-			AND inventorytaxinfo.taxname = '$type'");
+			FROM vtiger_inventorytaxinfo
+			INNER JOIN vtiger_producttaxrel
+				ON vtiger_inventorytaxinfo.taxid = vtiger_producttaxrel.taxid
+			WHERE vtiger_producttaxrel.productid = $productid
+			AND vtiger_inventorytaxinfo.taxname = '$type'");
 	$taxpercentage = $adb->query_result($res,0,'taxpercentage');
 
 	//This is to retrive the default configured value if the taxpercentage related to product is empty

Modified: vtigercrm/trunk/include/utils/ListViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/ListViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/ListViewUtils.php Mon Jun 12 14:26:25 2006
@@ -49,10 +49,10 @@
 	$image_path=$theme_path."images/";
 	$list_header = Array();
 
-	//Get the tabid of the module
+	//Get the vtiger_tabid of the module
 	$tabid = getTabid($module);
 	global $current_user;
-	//added for customview 27/5
+	//added for vtiger_customview 27/5
 	if($oCv)
 	{
 		if(isset($oCv->list_fields))
@@ -86,17 +86,17 @@
 	if($is_admin==false)
 	{
 		$profileList = getCurrentUserProfileList();
-		$query  = "SELECT DISTINCT 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;
+		$query  = "SELECT DISTINCT vtiger_field.fieldname
+			FROM vtiger_field
+			INNER JOIN vtiger_profile2field
+				ON vtiger_profile2field.fieldid = vtiger_field.fieldid
+			INNER JOIN vtiger_def_org_field
+				ON vtiger_def_org_field.fieldid = vtiger_field.fieldid
+			WHERE vtiger_field.tabid = ".$tabid."
+			AND vtiger_profile2field.visible = 0
+			AND vtiger_def_org_field.visible = 0
+			AND vtiger_profile2field.profileid IN ".$profileList."
+			AND vtiger_field.fieldname IN ".$field_list;
 		$result = $adb->query($query);
 		$field=Array();
 		for($k=0;$k < $adb->num_rows($result);$k++)
@@ -106,10 +106,10 @@
 	}
 	//end
 
-	//modified for customview 27/5 - $app_strings change to $mod_strings
+	//modified for vtiger_customview 27/5 - $app_strings change to $mod_strings
 	foreach($focus->list_fields as $name=>$tableinfo)
 	{
-		//added for customview 27/5
+		//added for vtiger_customview 27/5
 		if($oCv)
 		{
 			if(isset($oCv->list_fields_name))
@@ -128,7 +128,7 @@
 		{
 			if(isset($focus->sortby_fields) && $focus->sortby_fields !='')
 			{
-				//Added on 14-12-2005 to avoid if and else check for every list field for arrow image and change order
+				//Added on 14-12-2005 to avoid if and else check for every list vtiger_field for arrow image and change order
 				$change_sorder = array('ASC'=>'DESC','DESC'=>'ASC');
 				$arrow_gif = array('ASC'=>'arrow_down.gif','DESC'=>'arrow_up.gif');
 
@@ -166,7 +166,7 @@
 							{
 								$lbl_name = $mod_strings[$name];
 							}
-							//added to display currency symbol in listview header
+							//added to display vtiger_currency symbol in listview header
 							if($lbl_name =='Amount')
 							{
 								$currencyid=fetchCurrency($current_user->id);
@@ -194,7 +194,7 @@
 
 				}
 			}
-																	//added to display currency symbol in related listview header
+																	//added to display vtiger_currency symbol in related listview header
 																	if($name =='Amount' && $relatedlist !='' )
 		{
 			$currencyid=fetchCurrency($current_user->id);
@@ -256,17 +256,17 @@
 	if($is_admin==false)
 	{
 		$profileList = getCurrentUserProfileList();
-		$query  = "SELECT DISTINCT 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;
+		$query  = "SELECT DISTINCT vtiger_field.fieldname
+			FROM vtiger_field
+			INNER JOIN vtiger_profile2field
+				ON vtiger_profile2field.fieldid = vtiger_field.fieldid
+			INNER JOIN vtiger_def_org_field
+				ON vtiger_def_org_field.fieldid = vtiger_field.fieldid
+			WHERE vtiger_field.tabid = ".$tabid."
+			AND vtiger_profile2field.visible=0
+			AND vtiger_def_org_field.visible=0
+			AND vtiger_profile2field.profileid IN ".$profileList."
+			AND vtiger_field.fieldname IN ".$field_list;
 		$result = $adb->query($query);
 		$field=Array();
 		for($k=0;$k < $adb->num_rows($result);$k++)
@@ -287,17 +287,17 @@
 		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."'";
+                	$query = "SELECT vtiger_profile2field.*
+				FROM vtiger_field
+				INNER JOIN vtiger_profile2field
+					ON vtiger_profile2field.fieldid = vtiger_field.fieldid
+				INNER JOIN vtiger_def_org_field
+					ON vtiger_def_org_field.fieldid = vtiger_field.fieldid
+				WHERE vtiger_field.tabid = ".$tabid."
+				AND vtiger_profile2field.visible = 0
+				AND vtiger_def_org_field.visible = 0
+				AND vtiger_profile2field.profileid IN ".$profileList."
+				AND vtiger_field.fieldname = '".$fieldname."'";
 
                 	$result = $adb->query($query);
                 }
@@ -431,11 +431,11 @@
 *Param $returnset - list query parameters in url string
 *Param $edit_action - Edit action value
 *Param $del_action - delete action value
-*Param $oCv - customview object
+*Param $oCv - vtiger_customview object
 *Returns an array type
 */
 
-//parameter added for customview $oCv 27/5
+//parameter added for vtiger_customview $oCv 27/5
 function getListViewEntries($focus, $module,$list_result,$navigation_array,$relatedlist='',$returnset='',$edit_action='EditView',$del_action='Delete',$oCv='')
 {
 	global $log;
@@ -449,10 +449,10 @@
 	$evt_status;
 	$theme_path="themes/".$theme."/";
 	$image_path=$theme_path."images/";
-	//getting the fieldtable entries from database
+	//getting the vtiger_fieldtable entries from database
 	$tabid = getTabid($module);
 
-	//added for customview 27/5
+	//added for vtiger_customview 27/5
 	if($oCv)
 	{
 		if(isset($oCv->list_fields))
@@ -485,17 +485,17 @@
 	if($is_admin==false)
 	{
 		$profileList = getCurrentUserProfileList();
-		$query  = "SELECT DISTINCT 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;
+		$query  = "SELECT DISTINCT vtiger_field.fieldname
+			FROM vtiger_field
+			INNER JOIN vtiger_profile2field
+				ON vtiger_profile2field.fieldid = vtiger_field.fieldid
+			INNER JOIN vtiger_def_org_field
+				ON vtiger_def_org_field.fieldid = vtiger_field.fieldid
+			WHERE vtiger_field.tabid = ".$tabid."
+			AND vtiger_profile2field.visible = 0
+			AND vtiger_def_org_field.visible = 0
+			AND vtiger_profile2field.profileid IN ".$profileList."
+			AND vtiger_field.fieldname IN ".$field_list;
 		$result = $adb->query($query);
 		$field=Array();
 		for($k=0;$k < $adb->num_rows($result);$k++)
@@ -507,7 +507,7 @@
 	$ui_col_array=Array();
 
 	$query = "SELECT uitype, columnname, fieldname
-		FROM field
+		FROM vtiger_field
 		WHERE tabid = ".$tabid."
 		AND fieldname IN".$field_list;
 	$result = $adb->query($query);
@@ -555,7 +555,7 @@
 		{
 			$fieldname = $focus->list_fields_name[$name];
 
-			//added for customview 27/5
+			//added for vtiger_customview 27/5
 			if($oCv)
 			{
 				if(isset($oCv->list_fields_name))
@@ -655,7 +655,7 @@
 					}
 					elseif($name=='Account Name')
 					{
-						//modified for customview 27/5
+						//modified for vtiger_customview 27/5
 						if($module == 'Accounts')
 						{
 							$account_id = $adb->query_result($list_result,$i-1,"crmid");
@@ -754,7 +754,7 @@
 *Param $returnset - list query parameters in url string
 *Param $edit_action - Edit action value
 *Param $del_action - delete action value
-*Param $oCv - customview object
+*Param $oCv - vtiger_customview object
 *Returns an array type
 */
 
@@ -770,7 +770,7 @@
 	$image_path=$theme_path."images/";
 	$list_block = Array();
 
-	//getting the fieldtable entries from database
+	//getting the vtiger_fieldtable entries from database
 	$tabid = getTabid($module);
 	require('user_privileges/user_privileges_'.$current_user->id.'.php');
 	
@@ -791,17 +791,17 @@
 	if($is_admin==false)
 	{
 		$profileList = getCurrentUserProfileList();
-		$query  = "SELECT DISTINCT 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;
+		$query  = "SELECT DISTINCT vtiger_field.fieldname
+			FROM vtiger_field
+			INNER JOIN vtiger_profile2field
+				ON vtiger_profile2field.fieldid = vtiger_field.fieldid
+			INNER JOIN vtiger_def_org_field
+				ON vtiger_def_org_field.fieldid = vtiger_field.fieldid
+			WHERE vtiger_field.tabid = ".$tabid."
+			AND vtiger_profile2field.visible = 0
+			AND vtiger_def_org_field.visible = 0
+			AND vtiger_profile2field.profileid IN ".$profileList."
+			AND vtiger_field.fieldname IN ".$field_list;
 		$result = $adb->query($query);
 		$field=Array();
 		for($k=0;$k < $adb->num_rows($result);$k++)
@@ -813,7 +813,7 @@
 	$ui_col_array=Array();
 
 	$query = "SELECT uitype, columnname, fieldname
-		FROM field
+		FROM vtiger_field
 		WHERE tabid=".$tabid."
 		AND fieldname IN ".$field_list;
 	$result = $adb->query($query);
@@ -844,17 +844,17 @@
 				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."'";
+					$query = "SELECT vtiger_profile2field.*
+						FROM vtiger_field
+						INNER JOIN vtiger_profile2field
+						ON vtiger_profile2field.fieldid = vtiger_field.fieldid
+						INNER JOIN vtiger_def_org_field
+						ON vtiger_def_org_field.fieldid = vtiger_field.fieldid
+						WHERE vtiger_field.tabid = ".$tabid."
+						AND vtiger_profile2field.visible = 0
+						AND vtiger_def_org_field.visible = 0
+						AND vtiger_profile2field.profileid IN ".$profileList."
+						AND vtiger_field.fieldname = '".$fieldname."'";
 
 					$result = $adb->query($query);
 				}
@@ -927,10 +927,10 @@
 }
 
 
-/**This function generates the value for a given field namee 
-*Param $field_result - field result in array
+/**This function generates the value for a given vtiger_field namee 
+*Param $field_result - vtiger_field result in array
 *Param $list_result - resultset of a listview query
-*Param $fieldname - field name
+*Param $fieldname - vtiger_field name
 *Param $focus - module object
 *Param $module - module name
 *Param $entity_id - entity id
@@ -993,7 +993,7 @@
 	elseif($uitype == 71 || $uitype == 72)
 	{
 		if($temp_val != '' && $temp_val != 0)
-		{       //changes made to remove currency symbol infront of each potential amount
+		{       //changes made to remove vtiger_currency symbol infront of each vtiger_potential amount
                         $value = $temp_val;
 		}
 		else
@@ -1029,7 +1029,7 @@
 		global $adb;
 		if($temp_val != '')
                 {
-			$sql="SELECT * FROM contactdetails WHERE contactid=".$temp_val;		
+			$sql="SELECT * FROM vtiger_contactdetails WHERE contactid=".$temp_val;		
 			$result=$adb->query($sql);
 			$firstname=$adb->query_result($result,0,"firstname");
 			$lastname=$adb->query_result($result,0,"lastname");
@@ -1057,7 +1057,7 @@
 	{
 			global $adb;
 
-	$attachmentid=$adb->query_result($adb->query("SELECT * FROM seattachmentsrel WHERE crmid = ".$entity_id),0,'attachmentsid');
+	$attachmentid=$adb->query_result($adb->query("SELECT * FROM vtiger_seattachmentsrel WHERE crmid = ".$entity_id),0,'attachmentsid');
 	$value = '<a href = "index.php?module=uploads&action=downloadfile&return_module='.$module.'&fileid='.$attachmentid.'&filename='.$temp_val.'">'.$temp_val.'</a>';
 
 	}
@@ -1349,9 +1349,9 @@
 						if($emailaddress == '')
 							$emailaddress=$adb->query_result($list_result,$list_result_count,"email2");
 
-						$querystr="SELECT fieldid,fieldlabel,columnname FROM field WHERE tabid=".getTabid($module)." and uitype=13;";
+						$querystr="SELECT fieldid,fieldlabel,columnname FROM vtiger_field WHERE tabid=".getTabid($module)." and uitype=13;";
 						$queryres = $adb->query($querystr);
-						//Change this index 0 - to get the fieldid based on email1 or email2
+						//Change this index 0 - to get the vtiger_fieldid based on email1 or email2
 						$fieldid = $adb->query_result($queryres,0,'fieldid');
 
 						$value = '<a href="a" LANGUAGE=javascript onclick=\'return set_return_emails('.$entity_id.','.$fieldid.',"'.$name.'","'.$emailaddress.'"); \'>'.$name.'</a>';
@@ -1365,9 +1365,9 @@
 						if($emailaddress == '')
 							$emailaddress=$adb->query_result($list_result,$list_result_count,"yahooid");
 
-						$querystr="SELECT fieldid,fieldlabel,columnname FROM field WHERE tabid=".getTabid($module)." and uitype=13;";
+						$querystr="SELECT fieldid,fieldlabel,columnname FROM vtiger_field WHERE tabid=".getTabid($module)." and uitype=13;";
 						$queryres = $adb->query($querystr);
-						//Change this index 0 - to get the fieldid based on email or yahooid
+						//Change this index 0 - to get the vtiger_fieldid based on email or yahooid
 						$fieldid = $adb->query_result($queryres,0,'fieldid');
 
 						//$value = '<a href="javascript: submitform('.$entity_id.');">'.$name.'</a>';
@@ -1403,7 +1403,7 @@
 				{
 					if($module == "Contacts")
                                         {
-                                                 $query="SELECT contactdetails.imagename FROM contactdetails WHERE lastname='".$temp_val."'";
+                                                 $query="SELECT vtiger_contactdetails.imagename FROM vtiger_contactdetails WHERE lastname='".$temp_val."'";
                                                 //echo $query;
                                                  $result = $adb->query($query);
                                                  $imagename=$adb->query_result($result,0,'imagename');
@@ -1462,7 +1462,7 @@
 		}
 	}
 	
-	// Mike Crowe Mod --------------------------------------------------------Make right justified and currency value
+	// Mike Crowe Mod --------------------------------------------------------Make right justified and vtiger_currency value
 	if ( in_array($uitype,array(71,72,7,9,90)) )
 	{
 		$value = '<span align="right">'.$value.'</div>';
@@ -1484,29 +1484,29 @@
 	$tab_id = getTabid($module);	
 	if($module == "HelpDesk")
 	{
-		$query = "SELECT crmentity.crmid, crmentity.smownerid,
-				troubletickets.title, troubletickets.status,
-				troubletickets.priority, troubletickets.parent_id,
-				contactdetails.contactid, 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 ticketgrouprelation
-				ON troubletickets.ticketid = ticketgrouprelation.ticketid
-			LEFT JOIN groups
-				ON groups.groupname = ticketgrouprelation.groupname
-			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 vtiger_crmentity.crmid, vtiger_crmentity.smownerid,
+			vtiger_troubletickets.title, vtiger_troubletickets.status,
+			vtiger_troubletickets.priority, vtiger_troubletickets.parent_id,
+			vtiger_contactdetails.contactid, vtiger_contactdetails.firstname,
+			vtiger_contactdetails.lastname, vtiger_account.accountid,
+			vtiger_account.accountname, vtiger_ticketcf.*
+			FROM vtiger_troubletickets
+			INNER JOIN vtiger_ticketcf
+				ON vtiger_ticketcf.ticketid = vtiger_troubletickets.ticketid
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_troubletickets.ticketid
+			LEFT JOIN vtiger_ticketgrouprelation
+				ON vtiger_troubletickets.ticketid = vtiger_ticketgrouprelation.ticketid
+			LEFT JOIN vtiger_groups
+				ON vtiger_groups.groupname = vtiger_ticketgrouprelation.groupname
+			LEFT JOIN vtiger_contactdetails
+				ON vtiger_troubletickets.parent_id = vtiger_contactdetails.contactid
+			LEFT JOIN vtiger_account
+				ON vtiger_account.accountid = vtiger_troubletickets.parent_id
+			LEFT JOIN vtiger_users
+				ON vtiger_crmentity.smownerid = vtiger_users.id
+				AND vtiger_troubletickets.ticketid = vtiger_ticketcf.ticketid
+			WHERE vtiger_crmentity.deleted = 0 ";
 		if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[$tab_id] == 3)
 		{
 				$sec_parameter=getListViewSecurityParameter($module);
@@ -1518,60 +1518,60 @@
 	if($module == "Accounts")
 	{
 		//Query modified to sort by assigned to
-		$query = "SELECT crmentity.crmid, crmentity.smownerid,
-				account.accountname, account.email1,
-				account.email2, account.website, account.phone,
-				accountbillads.city,
-				accountscf.*
-			FROM account
-			INNER JOIN crmentity
-				ON crmentity.crmid = account.accountid
-			INNER JOIN accountbillads
-				ON account.accountid = accountbillads.accountaddressid
-			INNER JOIN accountshipads
-				ON account.accountid = accountshipads.accountaddressid
-			INNER JOIN accountscf
-				ON account.accountid = accountscf.accountid
-			LEFT JOIN accountgrouprelation
-				ON accountscf.accountid = accountgrouprelation.accountid
-			LEFT JOIN groups
-				ON groups.groupname = accountgrouprelation.groupname
-			LEFT JOIN users
-				ON users.id = crmentity.smownerid
-			WHERE crmentity.deleted = 0 ";
+		$query = "SELECT vtiger_crmentity.crmid, vtiger_crmentity.smownerid,
+			vtiger_account.accountname, vtiger_account.email1,
+			vtiger_account.email2, vtiger_account.website, vtiger_account.phone,
+			vtiger_accountbillads.city,
+			vtiger_accountscf.*
+			FROM vtiger_account
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_account.accountid
+			INNER JOIN vtiger_accountbillads
+				ON vtiger_account.accountid = vtiger_accountbillads.accountaddressid
+			INNER JOIN vtiger_accountshipads
+				ON vtiger_account.accountid = vtiger_accountshipads.accountaddressid
+			INNER JOIN vtiger_accountscf
+				ON vtiger_account.accountid = vtiger_accountscf.accountid
+			LEFT JOIN vtiger_accountgrouprelation
+				ON vtiger_accountscf.accountid = vtiger_accountgrouprelation.accountid
+			LEFT JOIN vtiger_groups
+				ON vtiger_groups.groupname = vtiger_accountgrouprelation.groupname
+			LEFT JOIN vtiger_users
+				ON vtiger_users.id = vtiger_crmentity.smownerid
+			WHERE vtiger_crmentity.deleted = 0 ";
 
 	if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[$tab_id] == 3)
                 {
-                    $query .= "AND (crmentity.smownerid IN (".$current_user->id.")
-		   		 OR crmentity.smownerid IN (
-					 SELECT user2role.userid
-					 FROM user2role
-					 INNER JOIN users
-						 ON users.id = user2role.userid
-					 INNER JOIN role
-						 ON role.roleid = user2role.roleid
-					 WHERE role.parentrole LIKE '".$current_user_parent_role_seq."::%')
-					 OR crmentity.smownerid IN (
+                    $query .= "AND (vtiger_crmentity.smownerid IN (".$current_user->id.")
+		   		 OR vtiger_crmentity.smownerid IN (
+					 SELECT vtiger_user2role.userid
+					 FROM vtiger_user2role
+					 INNER JOIN vtiger_users
+						 ON vtiger_users.id = vtiger_user2role.userid
+					 INNER JOIN vtiger_role
+						 ON vtiger_role.roleid = vtiger_user2role.roleid
+					 WHERE vtiger_role.parentrole LIKE '".$current_user_parent_role_seq."::%')
+					 OR vtiger_crmentity.smownerid IN (
 						 SELECT shareduserid
-						 FROM tmp_read_user_sharing_per
+						 FROM vtiger_tmp_read_user_sharing_per
 						 WHERE userid=".$current_user->id."
 						 AND tabid=".$tab_id.")
-					 OR (crmentity.smownerid in (0)
+					 OR (vtiger_crmentity.smownerid in (0)
 					 AND (";
 
                         if(sizeof($current_user_groups) > 0)
                         {
                               $query .= "accountgrouprelation.groupname IN (
 				      		SELECT groupname
-						FROM groups
+						FROM vtiger_groups
 						WHERE groupid IN ".getCurrentUserGroupList().")
 					OR ";
                         }
                          $query .= "accountgrouprelation.groupname IN (
-				 	SELECT groups.groupname
-					FROM tmp_read_group_sharing_per
-					INNER JOIN groups
-						ON groups.groupid = tmp_read_group_sharing_per.sharedgroupid
+				 	SELECT vtiger_groups.groupname
+					FROM vtiger_tmp_read_group_sharing_per
+					INNER JOIN vtiger_groups
+						ON vtiger_groups.groupid = vtiger_tmp_read_group_sharing_per.sharedgroupid
 					WHERE userid=".$current_user->id."
 					AND tabid=".$tab_id.")))) ";
                 }
@@ -1580,27 +1580,27 @@
 	if ($module == "Potentials")
 	{
 		//Query modified to sort by assigned to
-		$query = "SELECT crmentity.crmid, crmentity.smownerid,
-				account.accountname,
-				potential.accountid, potential.potentialname,
-				potential.sales_stage, potential.amount,
-				potential.currency, potential.closingdate,
-				potential.typeofrevenue,
-				potentialscf.*
-			FROM potential
-			INNER JOIN crmentity
-				ON crmentity.crmid = potential.potentialid
-			INNER JOIN account
-				ON potential.accountid = account.accountid
-			INNER JOIN potentialscf
-				ON potentialscf.potentialid = 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 crmentity.deleted = 0 ".$where; 
+		$query = "SELECT vtiger_crmentity.crmid, vtiger_crmentity.smownerid,
+			vtiger_account.accountname,
+			vtiger_potential.accountid, vtiger_potential.potentialname,
+			vtiger_potential.sales_stage, vtiger_potential.amount,
+			vtiger_potential.currency, vtiger_potential.closingdate,
+			vtiger_potential.typeofrevenue,
+			vtiger_potentialscf.*
+			FROM vtiger_potential
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_potential.potentialid
+			INNER JOIN vtiger_account
+				ON vtiger_potential.accountid = vtiger_account.accountid
+			INNER JOIN vtiger_potentialscf
+				ON vtiger_potentialscf.potentialid = vtiger_potential.potentialid
+			LEFT JOIN vtiger_potentialgrouprelation
+				ON vtiger_potential.potentialid = vtiger_potentialgrouprelation.potentialid
+			LEFT JOIN vtiger_groups
+				ON vtiger_groups.groupname = vtiger_potentialgrouprelation.groupname
+			LEFT JOIN vtiger_users
+				ON vtiger_users.id = vtiger_crmentity.smownerid
+			WHERE vtiger_crmentity.deleted = 0 ".$where; 
 
 		if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[$tab_id] == 3)
 		{
@@ -1612,28 +1612,28 @@
 	}
 	if($module == "Leads")
 	{
-		$query = "SELECT crmentity.crmid, crmentity.smownerid,
-				leaddetails.firstname, leaddetails.lastname,
-				leaddetails.company, leadaddress.phone,
-				leadsubdetails.website, leaddetails.email,
-				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 ";
+		$query = "SELECT vtiger_crmentity.crmid, vtiger_crmentity.smownerid,
+			vtiger_leaddetails.firstname, vtiger_leaddetails.lastname,
+			vtiger_leaddetails.company, vtiger_leadaddress.phone,
+			vtiger_leadsubdetails.website, vtiger_leaddetails.email,
+			vtiger_leadscf.*
+			FROM vtiger_leaddetails
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_leaddetails.leadid
+			INNER JOIN vtiger_leadsubdetails
+				ON vtiger_leadsubdetails.leadsubscriptionid = vtiger_leaddetails.leadid
+			INNER JOIN vtiger_leadaddress
+				ON vtiger_leadaddress.leadaddressid = vtiger_leadsubdetails.leadsubscriptionid
+			INNER JOIN vtiger_leadscf
+				ON vtiger_leaddetails.leadid = vtiger_leadscf.leadid
+			LEFT JOIN vtiger_leadgrouprelation
+				ON vtiger_leadscf.leadid = vtiger_leadgrouprelation.leadid
+			LEFT JOIN vtiger_groups
+				ON vtiger_groups.groupname = vtiger_leadgrouprelation.groupname
+			LEFT JOIN vtiger_users
+				ON vtiger_users.id = vtiger_crmentity.smownerid
+			WHERE vtiger_crmentity.deleted = 0
+			AND vtiger_leaddetails.converted = 0 ";
                if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[$tab_id] == 3)
                 {
 			$sec_parameter=getListViewSecurityParameter($module);
@@ -1642,75 +1642,75 @@
 	}
 	if($module == "Products")
 	{
-		$query = "SELECT crmentity.crmid, products.*, productcf.*
-			FROM products
-			INNER JOIN crmentity
-				ON crmentity.crmid = products.productid
-			LEFT JOIN productcf
-				ON products.productid = productcf.productid
-			LEFT JOIN seproductsrel
-				ON seproductsrel.productid = products.productid
-			WHERE crmentity.deleted = 0
-			AND ((seproductsrel.crmid IS NULL
-					AND (products.contactid = 0
-						OR products.contactid IS NULL))
-				OR seproductsrel.crmid IN (".getReadEntityIds('Leads').")
-				OR seproductsrel.crmid IN (".getReadEntityIds('Accounts').")
-				OR seproductsrel.crmid IN (".getReadEntityIds('Potentials').")
-				OR products.contactid IN (".getReadEntityIds('Contacts').")) ";
+		$query = "SELECT vtiger_crmentity.crmid, vtiger_products.*, vtiger_productcf.*
+			FROM vtiger_products
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_products.productid
+			LEFT JOIN vtiger_productcf
+				ON vtiger_products.productid = vtiger_productcf.productid
+			LEFT JOIN vtiger_seproductsrel
+				ON vtiger_seproductsrel.productid = vtiger_products.productid
+			WHERE vtiger_crmentity.deleted = 0
+			AND ((vtiger_seproductsrel.crmid IS NULL
+					AND (vtiger_products.contactid = 0
+						OR vtiger_products.contactid IS NULL))
+				OR vtiger_seproductsrel.crmid IN (".getReadEntityIds('Leads').")
+				OR vtiger_seproductsrel.crmid IN (".getReadEntityIds('Accounts').")
+				OR vtiger_seproductsrel.crmid IN (".getReadEntityIds('Potentials').")
+				OR vtiger_products.contactid IN (".getReadEntityIds('Contacts').")) ";
 	}
         if($module == "Notes")
         {
-		$query = "SELECT crmentity.crmid, crmentity.modifiedtime,
-				notes.title, notes.contact_id, notes.filename,
-				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
-			AND ((senotesrel.crmid IS NULL
-					AND (notes.contact_id = 0
-						OR notes.contact_id IS NULL))
-				OR senotesrel.crmid IN (".getReadEntityIds('Leads').")
-				OR senotesrel.crmid IN (".getReadEntityIds('Accounts').")
-				OR senotesrel.crmid IN (".getReadEntityIds('Potentials').")
-				OR senotesrel.crmid IN (".getReadEntityIds('Products').")
-				OR senotesrel.crmid IN (".getReadEntityIds('Invoice').")
-				OR senotesrel.crmid IN (".getReadEntityIds('PurchaseOrder').")
-				OR senotesrel.crmid IN (".getReadEntityIds('SalesOrder').")
-				OR notes.contact_id IN (".getReadEntityIds('Contacts').")) ";
+		$query = "SELECT vtiger_crmentity.crmid, vtiger_crmentity.modifiedtime,
+			vtiger_notes.title, vtiger_notes.contact_id, vtiger_notes.filename,
+			vtiger_senotesrel.crmid AS relatedto,
+			vtiger_contactdetails.firstname, vtiger_contactdetails.lastname,
+			vtiger_notes.*
+			FROM vtiger_notes
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_notes.notesid
+			LEFT JOIN vtiger_senotesrel
+				ON vtiger_senotesrel.notesid = vtiger_notes.notesid
+			LEFT JOIN vtiger_contactdetails
+				ON vtiger_contactdetails.contactid = vtiger_notes.contact_id
+			WHERE vtiger_crmentity.deleted = 0
+			AND ((vtiger_senotesrel.crmid IS NULL
+					AND (vtiger_notes.contact_id = 0
+						OR vtiger_notes.contact_id IS NULL))
+				OR vtiger_senotesrel.crmid IN (".getReadEntityIds('Leads').")
+				OR vtiger_senotesrel.crmid IN (".getReadEntityIds('Accounts').")
+				OR vtiger_senotesrel.crmid IN (".getReadEntityIds('Potentials').")
+				OR vtiger_senotesrel.crmid IN (".getReadEntityIds('Products').")
+				OR vtiger_senotesrel.crmid IN (".getReadEntityIds('Invoice').")
+				OR vtiger_senotesrel.crmid IN (".getReadEntityIds('PurchaseOrder').")
+				OR vtiger_senotesrel.crmid IN (".getReadEntityIds('SalesOrder').")
+				OR vtiger_notes.contact_id IN (".getReadEntityIds('Contacts').")) ";
         }
 	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
-			LEFT JOIN users
-				ON users.id = crmentity.smownerid
-			WHERE crmentity.deleted = 0 ".$where;
+		$query = "SELECT vtiger_contactdetails.firstname, vtiger_contactdetails.lastname,
+			vtiger_contactdetails.title, vtiger_contactdetails.accountid,
+			vtiger_contactdetails.email, vtiger_contactdetails.phone,
+			vtiger_crmentity.smownerid, vtiger_crmentity.crmid
+			FROM vtiger_contactdetails
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_contactdetails.contactid
+			INNER JOIN vtiger_contactaddress
+				ON vtiger_contactdetails.contactid = vtiger_contactaddress.contactaddressid
+			INNER JOIN vtiger_contactsubdetails
+				ON vtiger_contactaddress.contactaddressid = vtiger_contactsubdetails.contactsubscriptionid
+			INNER JOIN vtiger_contactscf
+				ON vtiger_contactdetails.contactid = vtiger_contactscf.contactid
+			LEFT JOIN vtiger_account
+				ON vtiger_account.accountid = vtiger_contactdetails.accountid
+			LEFT JOIN vtiger_contactgrouprelation
+				ON vtiger_contactscf.contactid = vtiger_contactgrouprelation.contactid
+			LEFT JOIN vtiger_groups
+				ON vtiger_groups.groupname = vtiger_contactgrouprelation.groupname
+			LEFT JOIN vtiger_users
+				ON vtiger_users.id = vtiger_crmentity.smownerid
+			WHERE vtiger_crmentity.deleted = 0 ".$where;
 
 		if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[$tab_id] == 3)
 		{
@@ -1720,73 +1720,73 @@
         }
 	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 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;
+		$query = "SELECT vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.setype,
+			vtiger_activity.*,
+			vtiger_contactdetails.lastname, vtiger_contactdetails.firstname,
+			vtiger_contactdetails.contactid,
+			vtiger_account.accountid, vtiger_account.accountname,
+			vtiger_recurringevents.recurringtype
+			FROM vtiger_activity
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_activity.activityid
+			LEFT JOIN vtiger_cntactivityrel
+				ON vtiger_cntactivityrel.activityid = vtiger_activity.activityid
+			LEFT JOIN vtiger_contactdetails
+				ON vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid
+			LEFT JOIN vtiger_seactivityrel
+				ON vtiger_seactivityrel.activityid = vtiger_activity.activityid
+			LEFT JOIN vtiger_activitygrouprelation
+				ON vtiger_activitygrouprelation.activityid = vtiger_crmentity.crmid
+			LEFT JOIN vtiger_groups
+				ON vtiger_groups.groupname = vtiger_activitygrouprelation.groupname
+			LEFT JOIN vtiger_users
+				ON vtiger_users.id = vtiger_crmentity.smownerid
+			LEFT OUTER JOIN vtiger_account
+				ON vtiger_account.accountid = vtiger_contactdetails.accountid
+			LEFT OUTER JOIN vtiger_recurringevents
+				ON vtiger_recurringevents.activityid = vtiger_activity.activityid
+			WHERE vtiger_crmentity.deleted = 0
+			AND (vtiger_activity.activitytype = 'Meeting'
+				OR vtiger_activity.activitytype = 'Call'
+				OR vtiger_activity.activitytype = 'Task') ".$where;
 		if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[$tab_id] == 3)
 		{
 			$sec_parameter=getListViewSecurityParameter($module);
 			$query .= $sec_parameter;		
 
 		}
-		//$query .=" group by activity.activityid ";
+		//$query .=" group by vtiger_activity.activityid ";
 		//included by Jaguar
         }
 	if($module == "Emails")
         {
-		$query = "SELECT DISTINCT crmentity.crmid, crmentity.smownerid,
-				activity.activityid, activity.subject,
-				activity.date_start,
-				contactdetails.lastname, contactdetails.firstname,
-				contactdetails.contactid
-			FROM activity
-			INNER JOIN crmentity
-				ON crmentity.crmid = activity.activityid
-			LEFT JOIN users
-				ON users.id = crmentity.smownerid
-			LEFT JOIN seactivityrel
-				ON seactivityrel.activityid = activity.activityid
-			LEFT JOIN contactdetails
-				ON contactdetails.contactid = seactivityrel.crmid
-			LEFT JOIN cntactivityrel
-				ON cntactivityrel.activityid = activity.activityid
-				AND cntactivityrel.contactid = cntactivityrel.contactid
-			LEFT JOIN activitygrouprelation
-				ON activitygrouprelation.activityid = crmentity.crmid
-			LEFT JOIN groups
-				ON groups.groupname = activitygrouprelation.groupname
-			LEFT JOIN salesmanactivityrel
-				ON salesmanactivityrel.activityid = activity.activityid
-			LEFT JOIN emaildetails
-				ON emaildetails.emailid = activity.activityid
-			WHERE activity.activitytype = 'Emails'
-			AND crmentity.deleted = 0 ";
+		$query = "SELECT DISTINCT vtiger_crmentity.crmid, vtiger_crmentity.smownerid,
+			vtiger_activity.activityid, vtiger_activity.subject,
+			vtiger_activity.date_start,
+			vtiger_contactdetails.lastname, vtiger_contactdetails.firstname,
+			vtiger_contactdetails.contactid
+			FROM vtiger_activity
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_activity.activityid
+			LEFT JOIN vtiger_users
+				ON vtiger_users.id = vtiger_crmentity.smownerid
+			LEFT JOIN vtiger_seactivityrel
+				ON vtiger_seactivityrel.activityid = vtiger_activity.activityid
+			LEFT JOIN vtiger_contactdetails
+				ON vtiger_contactdetails.contactid = vtiger_seactivityrel.crmid
+			LEFT JOIN vtiger_cntactivityrel
+				ON vtiger_cntactivityrel.activityid = vtiger_activity.activityid
+				AND vtiger_cntactivityrel.contactid = vtiger_cntactivityrel.contactid
+			LEFT JOIN vtiger_activitygrouprelation
+				ON vtiger_activitygrouprelation.activityid = vtiger_crmentity.crmid
+			LEFT JOIN vtiger_groups
+				ON vtiger_groups.groupname = vtiger_activitygrouprelation.groupname
+			LEFT JOIN vtiger_salesmanactivityrel
+				ON vtiger_salesmanactivityrel.activityid = vtiger_activity.activityid
+			LEFT JOIN vtiger_emaildetails
+				ON vtiger_emaildetails.emailid = vtiger_activity.activityid
+			WHERE vtiger_activity.activitytype = 'Emails'
+			AND vtiger_crmentity.deleted = 0 ";
 		if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[$tab_id] == 3)
 		{
 			$sec_parameter=getListViewSecurityParameter($module);
@@ -1796,61 +1796,61 @@
 
 	if($module == "Faq")
 	{
-		$query = "SELECT crmentity.crmid, crmentity.createdtime, crmentity.modifiedtime,
-				faq.*
-			FROM faq
-			INNER JOIN crmentity
-				ON crmentity.crmid = faq.id
-			LEFT JOIN products
-				ON faq.product_id = products.productid
-			WHERE crmentity.deleted = 0";
+		$query = "SELECT vtiger_crmentity.crmid, vtiger_crmentity.createdtime, vtiger_crmentity.modifiedtime,
+			vtiger_faq.*
+			FROM vtiger_faq
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_faq.id
+			LEFT JOIN vtiger_products
+				ON vtiger_faq.product_id = vtiger_products.productid
+			WHERE vtiger_crmentity.deleted = 0";
 	}
 	
 	if($module == "Vendors")
 	{
-		$query = "SELECT crmentity.crmid, vendor.*
-			FROM vendor
-			INNER JOIN crmentity
-				ON crmentity.crmid = vendor.vendorid
-			WHERE crmentity.deleted = 0";
+		$query = "SELECT vtiger_crmentity.crmid, vtiger_vendor.*
+			FROM vtiger_vendor
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_vendor.vendorid
+			WHERE vtiger_crmentity.deleted = 0";
 	}
 	if($module == "PriceBooks")
 	{
-		$query = "SELECT crmentity.crmid, pricebook.*
-			FROM pricebook
-			INNER JOIN crmentity
-				ON crmentity.crmid = pricebook.pricebookid
-			WHERE crmentity.deleted = 0";
+		$query = "SELECT vtiger_crmentity.crmid, vtiger_pricebook.*
+			FROM vtiger_pricebook
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_pricebook.pricebookid
+			WHERE vtiger_crmentity.deleted = 0";
 	}
 	if($module == "Quotes")
 	{
 		//Query modified to sort by assigned to
-		$query = "SELECT crmentity.*,
-				quotes.*,
-				quotesbillads.*,
-				quotesshipads.*,
-				potential.potentialname,
-				account.accountname
-			FROM quotes
-			INNER JOIN crmentity
-				ON crmentity.crmid = quotes.quoteid
-			INNER JOIN quotesbillads
-				ON quotes.quoteid = quotesbillads.quotebilladdressid
-			INNER JOIN quotesshipads
-				ON quotes.quoteid = quotesshipads.quoteshipaddressid
-			LEFT JOIN quotescf
-				ON quotes.quoteid = quotescf.quoteid
-			LEFT OUTER JOIN account
-				ON account.accountid = quotes.accountid
-			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
-			LEFT JOIN users
-				ON users.id = crmentity.smownerid
-			WHERE crmentity.deleted = 0 ".$where;
+		$query = "SELECT vtiger_crmentity.*,
+			vtiger_quotes.*,
+			vtiger_quotesbillads.*,
+			vtiger_quotesshipads.*,
+			vtiger_potential.potentialname,
+			vtiger_account.accountname
+			FROM vtiger_quotes
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_quotes.quoteid
+			INNER JOIN vtiger_quotesbillads
+				ON vtiger_quotes.quoteid = vtiger_quotesbillads.quotebilladdressid
+			INNER JOIN vtiger_quotesshipads
+				ON vtiger_quotes.quoteid = vtiger_quotesshipads.quoteshipaddressid
+			LEFT JOIN vtiger_quotescf
+				ON vtiger_quotes.quoteid = vtiger_quotescf.quoteid
+			LEFT OUTER JOIN vtiger_account
+				ON vtiger_account.accountid = vtiger_quotes.accountid
+			LEFT OUTER JOIN vtiger_potential
+				ON vtiger_potential.potentialid = vtiger_quotes.potentialid
+			LEFT JOIN vtiger_quotegrouprelation
+				ON vtiger_quotes.quoteid = vtiger_quotegrouprelation.quoteid
+			LEFT JOIN vtiger_groups
+				ON vtiger_groups.groupname = vtiger_quotegrouprelation.groupname
+			LEFT JOIN vtiger_users
+				ON vtiger_users.id = vtiger_crmentity.smownerid
+			WHERE vtiger_crmentity.deleted = 0 ".$where;
 		if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[$tab_id] == 3)
 		{
 			$sec_parameter=getListViewSecurityParameter($module);
@@ -1860,29 +1860,29 @@
 	if($module == "PurchaseOrder")
         {
 		//Query modified to sort by assigned to
-                $query = "SELECT crmentity.*,
-				purchaseorder.*,
-				pobillads.*,
-				poshipads.*,
-				vendor.vendorname
-			FROM purchaseorder
-			INNER JOIN crmentity
-				ON crmentity.crmid = purchaseorder.purchaseorderid
-			LEFT OUTER JOIN vendor
-				ON purchaseorder.vendorid = vendor.vendorid
-			INNER JOIN pobillads
-				ON purchaseorder.purchaseorderid = pobillads.pobilladdressid
-			INNER JOIN poshipads
-				ON purchaseorder.purchaseorderid = poshipads.poshipaddressid
-			LEFT JOIN purchaseordercf
-				ON purchaseordercf.purchaseorderid = purchaseorder.purchaseorderid
-			LEFT JOIN pogrouprelation
-				ON purchaseorder.purchaseorderid = pogrouprelation.purchaseorderid
-			LEFT JOIN groups
-				ON groups.groupname = pogrouprelation.groupname
-			LEFT JOIN users
-				ON users.id = crmentity.smownerid
-			WHERE crmentity.deleted = 0 ";
+                $query = "SELECT vtiger_crmentity.*,
+			vtiger_purchaseorder.*,
+			vtiger_pobillads.*,
+			vtiger_poshipads.*,
+			vtiger_vendor.vendorname
+			FROM vtiger_purchaseorder
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_purchaseorder.purchaseorderid
+			LEFT OUTER JOIN vtiger_vendor
+				ON vtiger_purchaseorder.vendorid = vtiger_vendor.vendorid
+			INNER JOIN vtiger_pobillads
+				ON vtiger_purchaseorder.purchaseorderid = vtiger_pobillads.pobilladdressid
+			INNER JOIN vtiger_poshipads
+				ON vtiger_purchaseorder.purchaseorderid = vtiger_poshipads.poshipaddressid
+			LEFT JOIN vtiger_purchaseordercf
+				ON vtiger_purchaseordercf.purchaseorderid = vtiger_purchaseorder.purchaseorderid
+			LEFT JOIN vtiger_pogrouprelation
+				ON vtiger_purchaseorder.purchaseorderid = vtiger_pogrouprelation.purchaseorderid
+			LEFT JOIN vtiger_groups
+				ON vtiger_groups.groupname = vtiger_pogrouprelation.groupname
+			LEFT JOIN vtiger_users
+				ON vtiger_users.id = vtiger_crmentity.smownerid
+			WHERE vtiger_crmentity.deleted = 0 ";
 		if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[$tab_id] == 3)
 		{
 			$sec_parameter=getListViewSecurityParameter($module);
@@ -1892,32 +1892,32 @@
         if($module == "SalesOrder")
         {
 		//Query modified to sort by assigned to
-                $query = "SELECT crmentity.*,
-				salesorder.*,
-				sobillads.*,
-				soshipads.*,
-				quotes.subject AS quotename,
-				account.accountname
-			FROM salesorder
-			INNER JOIN crmentity
-				ON crmentity.crmid = salesorder.salesorderid
-			INNER JOIN sobillads
-				ON salesorder.salesorderid = sobillads.sobilladdressid
-			INNER JOIN soshipads
-				ON salesorder.salesorderid = soshipads.soshipaddressid
-			LEFT JOIN salesordercf
-				ON salesordercf.salesorderid = 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
-			LEFT JOIN users
-				ON users.id = crmentity.smownerid
-			WHERE crmentity.deleted = 0 ".$where;
+                $query = "SELECT vtiger_crmentity.*,
+			vtiger_salesorder.*,
+			vtiger_sobillads.*,
+			vtiger_soshipads.*,
+			vtiger_quotes.subject AS quotename,
+			vtiger_account.accountname
+			FROM vtiger_salesorder
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_salesorder.salesorderid
+			INNER JOIN vtiger_sobillads
+				ON vtiger_salesorder.salesorderid = vtiger_sobillads.sobilladdressid
+			INNER JOIN vtiger_soshipads
+				ON vtiger_salesorder.salesorderid = vtiger_soshipads.soshipaddressid
+			LEFT JOIN vtiger_salesordercf
+				ON vtiger_salesordercf.salesorderid = vtiger_salesorder.salesorderid
+			LEFT OUTER JOIN vtiger_quotes
+				ON vtiger_quotes.quoteid = vtiger_salesorder.quoteid
+			LEFT OUTER JOIN vtiger_account
+				ON vtiger_account.accountid = vtiger_salesorder.accountid
+			LEFT JOIN vtiger_sogrouprelation
+				ON vtiger_salesorder.salesorderid = vtiger_sogrouprelation.salesorderid
+			LEFT JOIN vtiger_groups
+				ON vtiger_groups.groupname = vtiger_sogrouprelation.groupname
+			LEFT JOIN vtiger_users
+				ON vtiger_users.id = vtiger_crmentity.smownerid
+			WHERE vtiger_crmentity.deleted = 0 ".$where;
 		if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[$tab_id] == 3)
 		{
 			$sec_parameter=getListViewSecurityParameter($module);
@@ -1928,29 +1928,29 @@
 	{
 		//Query modified to sort by assigned to
 		//query modified -Code contribute by Geoff(http://forums.vtiger.com/viewtopic.php?t=3376)
-		$query = "SELECT crmentity.*,
-				invoice.*,
-				invoicebillads.*,
-				invoiceshipads.*,
-				salesorder.subject AS salessubject
-			FROM invoice
-			INNER JOIN crmentity
-				ON crmentity.crmid = invoice.invoiceid
-			INNER JOIN invoicebillads
-				ON invoice.invoiceid = invoicebillads.invoicebilladdressid
-			INNER JOIN invoiceshipads
-				ON invoice.invoiceid = invoiceshipads.invoiceshipaddressid
-			LEFT OUTER JOIN salesorder
-				ON salesorder.salesorderid = invoice.salesorderid
-			INNER JOIN invoicecf
-				ON invoice.invoiceid = invoicecf.invoiceid
-			LEFT JOIN invoicegrouprelation
-				ON invoice.invoiceid = invoicegrouprelation.invoiceid
-			LEFT JOIN groups
-				ON groups.groupname = invoicegrouprelation.groupname
-			LEFT JOIN users
-				ON users.id = crmentity.smownerid
-			WHERE crmentity.deleted = 0 ".$where;
+		$query = "SELECT vtiger_crmentity.*,
+			vtiger_invoice.*,
+			vtiger_invoicebillads.*,
+			vtiger_invoiceshipads.*,
+			vtiger_salesorder.subject AS salessubject
+			FROM vtiger_invoice
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_invoice.invoiceid
+			INNER JOIN vtiger_invoicebillads
+				ON vtiger_invoice.invoiceid = vtiger_invoicebillads.invoicebilladdressid
+			INNER JOIN vtiger_invoiceshipads
+				ON vtiger_invoice.invoiceid = vtiger_invoiceshipads.invoiceshipaddressid
+			LEFT OUTER JOIN vtiger_salesorder
+				ON vtiger_salesorder.salesorderid = vtiger_invoice.salesorderid
+			INNER JOIN vtiger_invoicecf
+				ON vtiger_invoice.invoiceid = vtiger_invoicecf.invoiceid
+			LEFT JOIN vtiger_invoicegrouprelation
+				ON vtiger_invoice.invoiceid = vtiger_invoicegrouprelation.invoiceid
+			LEFT JOIN vtiger_groups
+				ON vtiger_groups.groupname = vtiger_invoicegrouprelation.groupname
+			LEFT JOIN vtiger_users
+				ON vtiger_users.id = vtiger_crmentity.smownerid
+			WHERE vtiger_crmentity.deleted = 0 ".$where;
 		if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[$tab_id] == 3)
 		{
 			$sec_parameter=getListViewSecurityParameter($module);
@@ -1961,18 +1961,18 @@
 	{
 		//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
-			LEFT JOIN campaigngrouprelation
-				ON campaign.campaignid = campaigngrouprelation.campaignid
-			LEFT JOIN groups
-				ON groups.groupname = campaigngrouprelation.groupname
-			LEFT JOIN users
-				ON users.id = crmentity.smownerid
-			WHERE crmentity.deleted = 0 ".$where;
+		$query = "SELECT vtiger_crmentity.*,
+			vtiger_campaign.*
+			FROM vtiger_campaign
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_campaign.campaignid
+			LEFT JOIN vtiger_campaigngrouprelation
+				ON vtiger_campaign.campaignid = vtiger_campaigngrouprelation.campaignid
+			LEFT JOIN vtiger_groups
+				ON vtiger_groups.groupname = vtiger_campaigngrouprelation.groupname
+			LEFT JOIN vtiger_users
+				ON vtiger_users.id = vtiger_crmentity.smownerid
+			WHERE vtiger_crmentity.deleted = 0 ".$where;
 		if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[$tab_id] == 3)
 		{
 			$sec_parameter=getListViewSecurityParameter($module);
@@ -1997,16 +1997,16 @@
 
 	if($module == "Leads")
 	{
-		$query = "SELECT crmentity.crmid
-			FROM leaddetails
-			INNER JOIN crmentity
-				ON crmentity.crmid = leaddetails.leadid
-			LEFT JOIN leadgrouprelation
-				ON leaddetails.leadid = leadgrouprelation.leadid
-			LEFT JOIN groups
-                                ON groups.groupname = leadgrouprelation.groupname
-			WHERE crmentity.deleted = 0
-			AND leaddetails.converted = 0 ";
+		$query = "SELECT vtiger_crmentity.crmid
+			FROM vtiger_leaddetails
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_leaddetails.leadid
+			LEFT JOIN vtiger_leadgrouprelation
+				ON vtiger_leaddetails.leadid = vtiger_leadgrouprelation.leadid
+			LEFT JOIN vtiger_groups
+                                ON vtiger_groups.groupname = vtiger_leadgrouprelation.groupname
+			WHERE vtiger_crmentity.deleted = 0
+			AND vtiger_leaddetails.converted = 0 ";
                if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[$tab_id] == 3)
                 {
 			$sec_parameter=getListViewSecurityParameter($module);
@@ -2019,15 +2019,15 @@
 	if($module == "Accounts")
 	{
 		//Query modified to sort by assigned to
-		$query = "SELECT crmentity.crmid
-			FROM account
-			INNER JOIN crmentity
-				ON crmentity.crmid = account.accountid
-			LEFT JOIN accountgrouprelation
-				ON account.accountid = accountgrouprelation.accountid
-			LEFT JOIN groups
-                                ON groups.groupname = accountgrouprelation.groupname
-			WHERE crmentity.deleted = 0 ";
+		$query = "SELECT vtiger_crmentity.crmid
+			FROM vtiger_account
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_account.accountid
+			LEFT JOIN vtiger_accountgrouprelation
+				ON vtiger_account.accountid = vtiger_accountgrouprelation.accountid
+			LEFT JOIN vtiger_groups
+                                ON vtiger_groups.groupname = vtiger_accountgrouprelation.groupname
+			WHERE vtiger_crmentity.deleted = 0 ";
 
 	if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[$tab_id] == 3)
                 {
@@ -2041,15 +2041,15 @@
 	if ($module == "Potentials")
 	{
 		//Query modified to sort by assigned to
-		$query = "SELECT crmentity.crmid
-			FROM potential
-			INNER JOIN crmentity
-				ON crmentity.crmid = potential.potentialid
-			LEFT JOIN potentialgrouprelation
-				ON potential.potentialid = potentialgrouprelation.potentialid
-			LEFT JOIN groups
-                                ON groups.groupname = potentialgrouprelation.groupname
-			WHERE crmentity.deleted = 0 "; 
+		$query = "SELECT vtiger_crmentity.crmid
+			FROM vtiger_potential
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_potential.potentialid
+			LEFT JOIN vtiger_potentialgrouprelation
+				ON vtiger_potential.potentialid = vtiger_potentialgrouprelation.potentialid
+			LEFT JOIN vtiger_groups
+                                ON vtiger_groups.groupname = vtiger_potentialgrouprelation.groupname
+			WHERE vtiger_crmentity.deleted = 0 "; 
 
 		if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[$tab_id] == 3)
 		{
@@ -2065,15 +2065,15 @@
 		//Query modified to sort by assigned to
 
 		
-		$query = "SELECT crmentity.crmid
-			FROM contactdetails
-			INNER JOIN crmentity
-				ON crmentity.crmid = contactdetails.contactid
-			LEFT JOIN contactgrouprelation
-				ON contactdetails.contactid = contactgrouprelation.contactid
-			LEFT JOIN groups
-                                ON groups.groupname = contactgrouprelation.groupname
-			WHERE crmentity.deleted = 0 ";
+		$query = "SELECT vtiger_crmentity.crmid
+			FROM vtiger_contactdetails
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_contactdetails.contactid
+			LEFT JOIN vtiger_contactgrouprelation
+				ON vtiger_contactdetails.contactid = vtiger_contactgrouprelation.contactid
+			LEFT JOIN vtiger_groups
+                                ON vtiger_groups.groupname = vtiger_contactgrouprelation.groupname
+			WHERE vtiger_crmentity.deleted = 0 ";
 
 		if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[$tab_id] == 3)
 		{
@@ -2083,34 +2083,34 @@
         }
 	if($module == "Products")
 	{
-		$query = "SELECT DISTINCT crmentity.crmid
-			FROM products
-			INNER JOIN crmentity
-				ON crmentity.crmid = products.productid
-			LEFT JOIN seproductsrel
-				ON seproductsrel.productid = products.productid
-			WHERE crmentity.deleted = 0
-			AND ((seproductsrel.crmid IS NULL
-					OR products.contactid = 0
-					OR products.contactid IS NULL)
-				OR seproductsrel.crmid IN (".getReadEntityIds('Leads').")
-				OR seproductsrel.crmid IN (".getReadEntityIds('Accounts').")
-				OR seproductsrel.crmid IN (".getReadEntityIds('Potentials').")
-				OR products.contactid IN (".getReadEntityIds('Contacts').")) ";
+		$query = "SELECT DISTINCT vtiger_crmentity.crmid
+			FROM vtiger_products
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_products.productid
+			LEFT JOIN vtiger_seproductsrel
+				ON vtiger_seproductsrel.productid = vtiger_products.productid
+			WHERE vtiger_crmentity.deleted = 0
+			AND ((vtiger_seproductsrel.crmid IS NULL
+					OR vtiger_products.contactid = 0
+					OR vtiger_products.contactid IS NULL)
+				OR vtiger_seproductsrel.crmid IN (".getReadEntityIds('Leads').")
+				OR vtiger_seproductsrel.crmid IN (".getReadEntityIds('Accounts').")
+				OR vtiger_seproductsrel.crmid IN (".getReadEntityIds('Potentials').")
+				OR vtiger_products.contactid IN (".getReadEntityIds('Contacts').")) ";
 	}
 
 	if($module == "PurchaseOrder")
         {
 		//Query modified to sort by assigned to
-                $query = "SELECT crmentity.crmid
-			FROM purchaseorder
-			INNER JOIN crmentity
-				ON crmentity.crmid = purchaseorder.purchaseorderid
-			LEFT JOIN pogrouprelation
-				ON purchaseorder.purchaseorderid = pogrouprelation.purchaseorderid
-			LEFT JOIN groups
-                                ON groups.groupname = pogrouprelation.groupname
-			WHERE crmentity.deleted = 0 ";
+                $query = "SELECT vtiger_crmentity.crmid
+			FROM vtiger_purchaseorder
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_purchaseorder.purchaseorderid
+			LEFT JOIN vtiger_pogrouprelation
+				ON vtiger_purchaseorder.purchaseorderid = vtiger_pogrouprelation.purchaseorderid
+			LEFT JOIN vtiger_groups
+                                ON vtiger_groups.groupname = vtiger_pogrouprelation.groupname
+			WHERE vtiger_crmentity.deleted = 0 ";
 		if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[$tab_id] == 3)
 		{
 			$sec_parameter=getListViewSecurityParameter($module);
@@ -2120,15 +2120,15 @@
         if($module == "SalesOrder")
         {
 		//Query modified to sort by assigned to
-                $query = "SELECT crmentity.crmid
-			FROM salesorder
-			INNER JOIN crmentity
-				ON crmentity.crmid = salesorder.salesorderid
-			LEFT JOIN sogrouprelation
-				ON salesorder.salesorderid = sogrouprelation.salesorderid
-			LEFT JOIN groups
-                                ON groups.groupname = sogrouprelation.groupname
-			WHERE crmentity.deleted = 0 ".$where;
+                $query = "SELECT vtiger_crmentity.crmid
+			FROM vtiger_salesorder
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_salesorder.salesorderid
+			LEFT JOIN vtiger_sogrouprelation
+				ON vtiger_salesorder.salesorderid = vtiger_sogrouprelation.salesorderid
+			LEFT JOIN vtiger_groups
+                                ON vtiger_groups.groupname = vtiger_sogrouprelation.groupname
+			WHERE vtiger_crmentity.deleted = 0 ".$where;
 		if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[$tab_id] == 3)
 		{
 			$sec_parameter=getListViewSecurityParameter($module);
@@ -2137,15 +2137,15 @@
         }
 	if($module == "Invoice")
 	{
-		$query = "SELECT crmentity.crmid
-			FROM invoice
-			INNER JOIN crmentity
-				ON crmentity.crmid = invoice.invoiceid
-			LEFT JOIN invoicegrouprelation
-				ON invoice.invoiceid = invoicegrouprelation.invoiceid
-			LEFT JOIN groups
-				ON groups.groupname = invoicegrouprelation.groupname
-			WHERE crmentity.deleted = 0 ".$where;
+		$query = "SELECT vtiger_crmentity.crmid
+			FROM vtiger_invoice
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_invoice.invoiceid
+			LEFT JOIN vtiger_invoicegrouprelation
+				ON vtiger_invoice.invoiceid = vtiger_invoicegrouprelation.invoiceid
+			LEFT JOIN vtiger_groups
+				ON vtiger_groups.groupname = vtiger_invoicegrouprelation.groupname
+			WHERE vtiger_crmentity.deleted = 0 ".$where;
 		if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[$tab_id] == 3)
 		{
 			$sec_parameter=getListViewSecurityParameter($module);
@@ -2159,7 +2159,7 @@
 }
 
 
-//parameter $viewid added for customview 27/5
+//parameter $viewid added for vtiger_customview 27/5
 function AlphabeticalSearch($module,$action,$fieldname,$query,$type,$popuptype='',$recordid='',$return_module='',$append_url='',$viewid='',$groupid='')
 {
 	global $log;
@@ -2208,43 +2208,43 @@
 		$parent_name=$app_strings['LBL_MULTIPLE'];
         }
         //Raju -- Ends
-			$parent_query = "SELECT accountname FROM account WHERE accountid=".$seid;
+			$parent_query = "SELECT accountname FROM vtiger_account WHERE accountid=".$seid;
 			$parent_result = $adb->query($parent_query);
 			$parent_name = $adb->query_result($parent_result,0,"accountname");
 		}
 		if($parent_module == 'Leads')
 		{
-			$parent_query = "SELECT firstname,lastname FROM leaddetails WHERE leadid=".$seid;
+			$parent_query = "SELECT firstname,lastname FROM vtiger_leaddetails WHERE leadid=".$seid;
 			$parent_result = $adb->query($parent_query);
 			$parent_name = $adb->query_result($parent_result,0,"lastname")." ".$adb->query_result($parent_result,0,"firstname");
 		}
 		if($parent_module == 'Potentials')
 		{
-			$parent_query = "SELECT potentialname FROM potential WHERE potentialid=".$seid;
+			$parent_query = "SELECT potentialname FROM vtiger_potential WHERE potentialid=".$seid;
 			$parent_result = $adb->query($parent_query);
 			$parent_name = $adb->query_result($parent_result,0,"potentialname");
 		}
 		if($parent_module == 'Products')
 		{
-			$parent_query = "SELECT productname FROM products WHERE productid=".$seid;
+			$parent_query = "SELECT productname FROM vtiger_products WHERE productid=".$seid;
 			$parent_result = $adb->query($parent_query);
 			$parent_name = $adb->query_result($parent_result,0,"productname");
 		}
 		if($parent_module == 'PurchaseOrder')
 		{
-			$parent_query = "SELECT subject FROM purchaseorder WHERE purchaseorderid=".$seid;
+			$parent_query = "SELECT subject FROM vtiger_purchaseorder WHERE purchaseorderid=".$seid;
 			$parent_result = $adb->query($parent_query);
 			$parent_name = $adb->query_result($parent_result,0,"subject");
 		}
 		if($parent_module == 'SalesOrder')
 		{
-			$parent_query = "SELECT subject FROM salesorder WHERE salesorderid=".$seid;
+			$parent_query = "SELECT subject FROM vtiger_salesorder WHERE salesorderid=".$seid;
 			$parent_result = $adb->query($parent_query);
 			$parent_name = $adb->query_result($parent_result,0,"subject");
 		}
 		if($parent_module == 'Invoice')
 		{
-			$parent_query = "SELECT subject FROM invoice WHERE invoiceid=".$seid;
+			$parent_query = "SELECT subject FROM vtiger_invoice WHERE invoiceid=".$seid;
 			$parent_result = $adb->query($parent_query);
 			$parent_name = $adb->query_result($parent_result,0,"subject");
 		}
@@ -2261,7 +2261,7 @@
 }
 
 
-//used in home page listTop files
+//used in home page listTop vtiger_files
 function getRelatedTo($module,$list_result,$rset)
 {
 	global $log;
@@ -2273,36 +2273,36 @@
         {
                 $notesid = $adb->query_result($list_result,$rset,"notesid");
                 $action = "DetailView";
-                $evt_query="SELECT senotesrel.crmid, crmentity.setype
-			FROM senotesrel
-			INNER JOIN crmentity
-				ON  senotesrel.crmid = crmentity.crmid
-			WHERE senotesrel.notesid ='".$notesid."'";
+                $evt_query="SELECT vtiger_senotesrel.crmid, vtiger_crmentity.setype
+			FROM vtiger_senotesrel
+			INNER JOIN vtiger_crmentity
+				ON  vtiger_senotesrel.crmid = vtiger_crmentity.crmid
+			WHERE vtiger_senotesrel.notesid ='".$notesid."'";
 	}else if($module == "Products")
 	{
 		$productid = $adb->query_result($list_result,$rset,"productid");
                 $action = "DetailView";
-                $evt_query="SELECT seproductsrel.crmid, crmentity.setype
-			FROM seproductsrel
-			INNER JOIN crmentity
-				ON seproductsrel.crmid = crmentity.crmid
-			WHERE seproductsrel.productid ='".$productid."'";
+                $evt_query="SELECT vtiger_seproductsrel.crmid, vtiger_crmentity.setype
+			FROM vtiger_seproductsrel
+			INNER JOIN vtiger_crmentity
+				ON vtiger_seproductsrel.crmid = vtiger_crmentity.crmid
+			WHERE vtiger_seproductsrel.productid ='".$productid."'";
 
 	}else
 	{
 		$activity_id = $adb->query_result($list_result,$rset,"activityid");
 		$action = "DetailView";
-		$evt_query="SELECT seactivityrel.crmid, crmentity.setype
-			FROM seactivityrel
-			INNER JOIN crmentity
-				ON  seactivityrel.crmid = crmentity.crmid
-			WHERE seactivityrel.activityid='".$activity_id."'";
+		$evt_query="SELECT vtiger_seactivityrel.crmid, vtiger_crmentity.setype
+			FROM vtiger_seactivityrel
+			INNER JOIN vtiger_crmentity
+				ON  vtiger_seactivityrel.crmid = vtiger_crmentity.crmid
+			WHERE vtiger_seactivityrel.activityid='".$activity_id."'";
 
 		if($module == 'HelpDesk')
 		{
 			$activity_id = $adb->query_result($list_result,$rset,"parent_id");
 			if($activity_id != '')
-				$evt_query = "SELECT * FROM crmentity WHERE crmid=".$activity_id;
+				$evt_query = "SELECT * FROM vtiger_crmentity WHERE crmid=".$activity_id;
 		}
 	}
 	//added by raju to change the related to in emails inot multiple if email is for more than one contact
@@ -2326,55 +2326,55 @@
 	$action = "DetailView";
         if($parent_module == 'Accounts')
         {
-                $parent_query = "SELECT accountname FROM account WHERE accountid=".$parent_id;
+                $parent_query = "SELECT accountname FROM vtiger_account WHERE accountid=".$parent_id;
                 $parent_result = $adb->query($parent_query);
                 $parent_name = $adb->query_result($parent_result,0,"accountname");
         }
         if($parent_module == 'Leads')
         {
-                $parent_query = "SELECT firstname,lastname FROM leaddetails WHERE leadid=".$parent_id;
+                $parent_query = "SELECT firstname,lastname FROM vtiger_leaddetails WHERE leadid=".$parent_id;
                 $parent_result = $adb->query($parent_query);
                 $parent_name = $adb->query_result($parent_result,0,"lastname")." ".$adb->query_result($parent_result,0,"firstname");
         }
         if($parent_module == 'Potentials')
         {
-                $parent_query = "SELECT potentialname FROM potential WHERE potentialid=".$parent_id;
+                $parent_query = "SELECT potentialname FROM vtiger_potential WHERE potentialid=".$parent_id;
                 $parent_result = $adb->query($parent_query);
                 $parent_name = $adb->query_result($parent_result,0,"potentialname");
         }
         if($parent_module == 'Products')
         {
-                $parent_query = "SELECT productname FROM products WHERE productid=".$parent_id;
+                $parent_query = "SELECT productname FROM vtiger_products WHERE productid=".$parent_id;
                 $parent_result = $adb->query($parent_query);
                 $parent_name = $adb->query_result($parent_result,0,"productname");
         }
 	if($parent_module == 'Quotes')
         {
-                $parent_query = "SELECT subject FROM quotes WHERE quoteid=".$parent_id;
+                $parent_query = "SELECT subject FROM vtiger_quotes WHERE quoteid=".$parent_id;
                 $parent_result = $adb->query($parent_query);
                 $parent_name = $adb->query_result($parent_result,0,"subject");
         }
 	if($parent_module == 'PurchaseOrder')
         {
-                $parent_query = "SELECT subject FROM purchaseorder WHERE purchaseorderid=".$parent_id;
+                $parent_query = "SELECT subject FROM vtiger_purchaseorder WHERE purchaseorderid=".$parent_id;
                 $parent_result = $adb->query($parent_query);
                 $parent_name = $adb->query_result($parent_result,0,"subject");
         }
 	if($parent_module == 'Invoice')
         {
-                $parent_query = "SELECT subject FROM invoice WHERE invoiceid=".$parent_id;
+                $parent_query = "SELECT subject FROM vtiger_invoice WHERE invoiceid=".$parent_id;
                 $parent_result = $adb->query($parent_query);
                 $parent_name = $adb->query_result($parent_result,0,"subject");
         }
         if($parent_module == 'SalesOrder')
         {
-                $parent_query = "SELECT subject FROM salesorder WHERE salesorderid=".$parent_id;
+                $parent_query = "SELECT subject FROM vtiger_salesorder WHERE salesorderid=".$parent_id;
                 $parent_result = $adb->query($parent_query);
                 $parent_name = $adb->query_result($parent_result,0,"subject");
         }
 	if($parent_module == 'Contacts' && ($module == 'Emails' || $module == 'HelpDesk'))
         {
-                $parent_query = "SELECT firstname,lastname FROM contactdetails WHERE contactid=".$parent_id;
+                $parent_query = "SELECT firstname,lastname FROM vtiger_contactdetails WHERE contactid=".$parent_id;
                 $parent_result = $adb->query($parent_query);
                 $parent_name = $adb->query_result($parent_result,0,"lastname")." ".$adb->query_result($parent_result,0,"firstname");
         }
@@ -2460,11 +2460,11 @@
 
 	if($currentmodule=="Contacts" && $returnmodule == "Potentials")
 	{
-		$query = "SELECT contactid FROM contpotentialrel WHERE potentialid = ".$recordid;
+		$query = "SELECT contactid FROM vtiger_contpotentialrel WHERE potentialid = ".$recordid;
 	}
 	elseif($currentmodule=="Contacts" && $returnmodule == "Vendors")
 	{
-		$query = "SELECT contactid FROM vendorcontactrel WHERE vendorid = ".$recordid;
+		$query = "SELECT contactid FROM vtiger_vendorcontactrel WHERE vendorid = ".$recordid;
 	}
 
 	if($query !='')
@@ -2477,7 +2477,7 @@
 				$skip_id[]=$adb->query_result($result,$k,"contactid");
 			}
 			$skipids = constructList($skip_id,'INTEGER');
-			$where_relquery = "and contactdetails.contactid not in ".$skipids;
+			$where_relquery = "and vtiger_contactdetails.contactid not in ".$skipids;
 		}
 	}
 	$log->debug("Exiting getRelCheckquery method ...");

Modified: vtigercrm/trunk/include/utils/SearchUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/SearchUtils.php (original)
+++ vtigercrm/trunk/include/utils/SearchUtils.php Mon Jun 12 14:26:25 2006
@@ -16,7 +16,7 @@
 require_once('include/utils/CommonUtils.php'); //new
 	
 $column_array=array('accountid','contact_id');
-$table_col_array=array('account.accountname','contactdetails.firstname,contactdetails.lastname');
+$table_col_array=array('vtiger_account.accountname','vtiger_contactdetails.firstname,vtiger_contactdetails.lastname');
 
 /**This function is used to get the list view header values in a list view during search
 *Param $focus - module object
@@ -44,10 +44,10 @@
         $image_path=$theme_path."images/";
         $search_header = Array();
 
-        //Get the tabid of the module
+        //Get the vtiger_tabid of the module
         //require_once('include/utils/UserInfoUtil.php')
         $tabid = getTabid($module);
-        //added for customview 27/5
+        //added for vtiger_customview 27/5
         if($oCv)
         {
                 if(isset($oCv->list_fields))
@@ -55,7 +55,7 @@
                         $focus->list_fields = $oCv->list_fields;
                 }
         }
-	//Added to reduce the no. of queries logging for non-admin users -- by Minnie-start
+	//Added to reduce the no. of queries logging for non-admin vtiger_users -- by Minnie-start
 	$field_list ='(';
 	$j=0;
 	require('user_privileges/user_privileges_'.$current_user->id.'.php');
@@ -77,12 +77,12 @@
 		$j++;
 	}
 	$field_list .=')';
-	//Getting the Entries from Profile2 field table
+	//Getting the Entries from Profile2 vtiger_field vtiger_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";
+		//changed to get vtiger_field.fieldname
+		$query  = "select vtiger_profile2field.*,vtiger_field.fieldname from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.tabid=".$tabid." and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0  and vtiger_profile2field.profileid in ".$profileList." and vtiger_field.fieldname in ".$field_list." group by vtiger_field.fieldid";
 		$result = $adb->query($query);
 		$field=Array();
 		for($k=0;$k < $adb->num_rows($result);$k++)
@@ -91,11 +91,11 @@
 		}
 	}
 
-        //modified for customview 27/5 - $app_strings change to $mod_strings
+        //modified for vtiger_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
+                //$fieldname = $focus->list_fields_name[$name];  //commented for vtiger_customview 27/5
+                //added for vtiger_customview 27/5
                 if($oCv)
                 {
                         if(isset($oCv->list_fields_name))
@@ -122,7 +122,7 @@
 		{
                         if(isset($focus->sortby_fields) && $focus->sortby_fields !='')
                         {
-                                //Added on 14-12-2005 to avoid if and else check for every list field for arrow image and change order
+                                //Added on 14-12-2005 to avoid if and else check for every list vtiger_field for arrow image and change order
 
                                 foreach($focus->list_fields[$name] as $tab=>$col)
                                 {
@@ -228,7 +228,7 @@
 }
 
 /**This function is used to get user_id's for a given user_name during search
-*Param $table_name - tablename
+*Param $table_name - vtiger_tablename
 *Param $column_name - columnname
 *Param $search_string - searchstring value (username)
 *Returns the where conditions for list query in string format
@@ -240,7 +240,7 @@
 	global $log;
         $log->debug("Entering get_usersid(".$table_name.",".$column_name.",".$search_string.") method ...");
 	global $adb;
-	$user_qry="select distinct(users.id)from users inner join crmentity on crmentity.smownerid=users.id where users.user_name like '%".$search_string."%' ";
+	$user_qry="select distinct(vtiger_users.id)from vtiger_users inner join vtiger_crmentity on vtiger_crmentity.smownerid=vtiger_users.id where vtiger_users.user_name like '%".$search_string."%' ";
 	$user_result=$adb->query($user_qry);
 	$noofuser_rows=$adb->num_rows($user_result);
 	$x=$noofuser_rows-1;
@@ -256,7 +256,7 @@
 				$where .= " or ";
 			}
 		}
-		$where.=" or groups.groupname like '%".$search_string."%')";
+		$where.=" or vtiger_groups.groupname like '%".$search_string."%')";
 	}
 	else
 	{
@@ -267,7 +267,7 @@
 	return $where;	
 }
 
-/**This function is used to get where conditions for a given accountid or contactid during search for their respective names
+/**This function is used to get where conditions for a given vtiger_accountid or contactid during search for their respective names
 *Param $column_name - columnname
 *Param $search_string - searchstring value (username)
 *Returns the where conditions for list query in string format
@@ -331,7 +331,7 @@
 		$where="$table_name.$column_name like '%".$search_string."%'";	
 	}else
 	{	
-		$qry="select field.columnname,tablename from tab inner join field on field.tabid=tab.tabid where name='".$module."' and fieldname='".$search_field."'";
+		$qry="select vtiger_field.columnname,tablename from vtiger_tab inner join vtiger_field on vtiger_field.tabid=vtiger_tab.tabid where name='".$module."' and fieldname='".$search_field."'";
 		$result = $adb->query($qry);
 		$noofrows = $adb->num_rows($result);
 		if($noofrows!=0)
@@ -345,7 +345,7 @@
 			}
 			elseif($table_name == "activity" && $column_name == "status")
 			{
-				$where="$table_name.$column_name like '%".$search_string."%' or activity.eventstatus like '%".$search_string."%'";
+				$where="$table_name.$column_name like '%".$search_string."%' or vtiger_activity.eventstatus like '%".$search_string."%'";
 			}
 			else if(in_array($column_name,$column_array))
 			{
@@ -378,18 +378,18 @@
 
 	if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0)
 	{
-		$sql = "select * from field ";
-		$sql.= " where field.tabid=".$tabid." and";
-		$sql.= " field.displaytype in (1,2)";
+		$sql = "select * from vtiger_field ";
+		$sql.= " where vtiger_field.tabid=".$tabid." and";
+		$sql.= " vtiger_field.displaytype in (1,2)";
 		$sql.= " order by block,sequence";
 	}
 	else
 	{
 		$profileList = getCurrentUserProfileList();
-		$sql = "select * from field inner join profile2field on profile2field.fieldid=field.fieldid inner join def_org_field on def_org_field.fieldid=field.fieldid ";
-		$sql.= " where field.tabid=".$tabid." and";
-		$sql.= " field.displaytype in (1,2) and profile2field.visible=0";
-		$sql.= " and def_org_field.visible=0  and profile2field.profileid in ".$profileList." order by block,sequence";
+		$sql = "select * from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid ";
+		$sql.= " where vtiger_field.tabid=".$tabid." and";
+		$sql.= " vtiger_field.displaytype in (1,2) and vtiger_profile2field.visible=0";
+		$sql.= " and vtiger_def_org_field.visible=0  and vtiger_profile2field.profileid in ".$profileList." order by block,sequence";
 	}
 
 
@@ -410,10 +410,10 @@
 		{
 			$module_columnlist['crmentity:crmid::HelpDesk_Ticket ID:I'] = 'Ticket ID';
 		}
-		//Added to include activity type in activity customview list
+		//Added to include vtiger_activity type in vtiger_activity vtiger_customview list
 		if($module == 'Activities' && $block == 19)
 		{
-			$module_columnlist['activity:activitytype:activitytype:Activities_Activity Type:C'] = 'Activity Type';
+			$module_columnlist['vtiger_activity:activitytype:activitytype:Activities_Activity Type:C'] = 'Activity Type';
 		}
 		if($fieldlabel == "Related To")
 		{
@@ -423,7 +423,7 @@
 		{
 			$fieldlabel = "Start Date";
 			if($module == 'Activities' && $block == 19)
-				$module_columnlist['activity:time_start::Activities_Start Time:I'] = 'Start Time';
+				$module_columnlist['vtiger_activity:time_start::Activities_Start Time:I'] = 'Start Time';
 
 		}
 		$fieldlabel1 = str_replace(" ","_",$fieldlabel);
@@ -456,7 +456,7 @@
 /**This function is returns the where conditions for each search criteria option in Advance Search
 *Param $criteria - search criteria option
 *Param $searchstring - search string
-*Param $searchfield - fieldname to be search for 
+*Param $searchfield - vtiger_fieldname to be search for 
 *Returns the search criteria option (where condition) to be added in list query
 */
 
@@ -608,13 +608,13 @@
 
 	if(isset($date_closed_start) && $date_closed_start != "" && isset($date_closed_end) && $date_closed_end != "")
 	{
-		array_push($where_clauses, "potential.closingdate >= ".$adb->quote($date_closed_start)." and potential.closingdate <= ".$adb->quote($date_closed_end));
+		array_push($where_clauses, "potential.closingdate >= ".$adb->quote($date_closed_start)." and vtiger_potential.closingdate <= ".$adb->quote($date_closed_end));
 		$url_string .= "&closingdate_start=".$date_closed_start."&closingdate_end=".$date_closed_end;
 	}
 	
 	if(isset($sales_stage) && $sales_stage!=''){
 		if($sales_stage=='Other')
-		array_push($where_clauses, "(potential.sales_stage <> 'Closed Won' and potential.sales_stage <> 'Closed Lost')");
+		array_push($where_clauses, "(vtiger_potential.sales_stage <> 'Closed Won' and vtiger_potential.sales_stage <> 'Closed Lost')");
 		else
 		array_push($where_clauses, "potential.sales_stage = ".$adb->quote($sales_stage));
 		$url_string .= "&sales_stage=".$sales_stage;

Modified: vtigercrm/trunk/include/utils/UserInfoUtil.php
==============================================================================
--- vtigercrm/trunk/include/utils/UserInfoUtil.php (original)
+++ vtigercrm/trunk/include/utils/UserInfoUtil.php Mon Jun 12 14:26:25 2006
@@ -26,8 +26,8 @@
 	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;
+	//$sql= "select vtiger_rolename from vtiger_user2role where userid='" .$userid ."'";
+   $sql = "select * from vtiger_mail_accounts where status=1 and user_id=".$user->id;
         $result = $adb->query($sql);
 	$log->debug("Exiting getMailServerInfo method ...");
 	return $result;
@@ -35,15 +35,15 @@
 
 /** To get the Role of the specified user
   * @param $userid -- The user Id:: Type integer
-  * @returns  roleid :: Type String
+  * @returns  vtiger_roleid :: Type String
  */
 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 ."'";
+	//$sql= "select vtiger_rolename from vtiger_user2role where userid='" .$userid ."'";
+	$sql = "select roleid from vtiger_user2role where userid='" .$userid ."'";
         $result = $adb->query($sql);
 	$roleid=  $adb->query_result($result,0,"roleid");
 	$log->debug("Exiting fetchUserRole method ...");
@@ -59,12 +59,12 @@
 	global $log;
 	$log->debug("Entering fetchUserProfileId(".$userid.") method ...");
 	global $adb;
-	$sql = "select roleid from user2role where userid=" .$userid;
+	$sql = "select roleid from vtiger_user2role where userid=" .$userid;
         $result = $adb->query($sql);
 	$roleid=  $adb->query_result($result,0,"roleid");
 
 
-	$sql1 = "select profileid from role2profile where roleid='" .$roleid."'";
+	$sql1 = "select profileid from vtiger_role2profile where roleid='" .$roleid."'";
         $result1 = $adb->query($sql1);
 	$profileid=  $adb->query_result($result1,0,"profileid");
 	$log->debug("Exiting fetchUserProfileId method ...");
@@ -101,7 +101,7 @@
 
         $persistPermArray = Array();
         $profiles = Array();
-        $sql = "select distinct profileid from profile2tab";
+        $sql = "select distinct profileid from vtiger_profile2tab";
         $result = $adb->query($sql);
         $num_rows = $adb->num_rows($result);
         for ( $i=0; $i < $num_rows; $i++ )
@@ -110,7 +110,7 @@
         $persistPermArray = Array();
         foreach ( $profiles as $profileid )
         {
-                $sql = "select * from profile2tab where profileid=" .$profileid ;
+                $sql = "select * from vtiger_profile2tab where profileid=" .$profileid ;
                 $result = $adb->query($sql);
                 if($MAX_TAB_PER !='')
                 {
@@ -127,7 +127,7 @@
 	$log->debug("Exiting loadAllPerms method ...");
 }
 
-/** Function to get all the tab permission for the specified profile
+/** Function to get all the vtiger_tab permission for the specified vtiger_profile
   * @param $profileid -- Profile Id:: Type integer
   * @returns  TabPermission Array in the following format:
   * $tabPermission = Array($tabid1=>permission,
@@ -152,7 +152,7 @@
         }
         else
         {
-                $sql = "select * from profile2tab where profileid=" .$profileid ;
+                $sql = "select * from vtiger_profile2tab where profileid=" .$profileid ;
                 $result = $adb->query($sql);
                 $tab_perr_array = Array();
                 if($MAX_TAB_PER !='')
@@ -173,7 +173,7 @@
 
 }
 
-/** Function to get all the tab permission for the specified profile other than tabid 15
+/** Function to get all the vtiger_tab permission for the specified vtiger_profile other than tabid 15
   * @param $profileid -- Profile Id:: Type integer
   * @returns  TabPermission Array in the following format:
   * $tabPermission = Array($tabid1=>permission,
@@ -201,7 +201,7 @@
         }
         else
         {
-                $sql = "select * from profile2tab where profileid=" .$profileid;
+                $sql = "select * from vtiger_profile2tab where profileid=" .$profileid;
                 $result = $adb->query($sql);
                 $tab_perr_array = Array();
                 $num_rows = $adb->num_rows($result);
@@ -220,7 +220,7 @@
 
 }
 
-/** Function to get all the tab standard action permission for the specified profile
+/** Function to get all the vtiger_tab standard action permission for the specified vtiger_profile
   * @param $profileid -- Profile Id:: Type integer
   * @returns  Tab Action Permission Array in the following format:
   * $tabPermission = Array($tabid1=>Array(actionid1=>permission, actionid2=>permission,...,actionidn=>permission), 
@@ -236,7 +236,7 @@
 	global $adb;
 	$check = Array();
 	$temp_tabid = Array();	
-	$sql1 = "select * from profile2standardpermissions where profileid=".$profileid." and tabid not in(16) order by(tabid)";
+	$sql1 = "select * from vtiger_profile2standardpermissions where profileid=".$profileid." and tabid not in(16) order by(tabid)";
 	//echo $sql1.'<BR>';
 	$result1 = $adb->query($sql1);
         $num_rows1 = $adb->num_rows($result1);
@@ -258,7 +258,7 @@
 	return $check;
 }
 
-/** Function to get all the tab utility action permission for the specified profile
+/** Function to get all the vtiger_tab utility action permission for the specified vtiger_profile
   * @param $profileid -- Profile Id:: Type integer
   * @returns  Tab Utility Action Permission Array in the following format:
   * $tabPermission = Array($tabid1=>Array(actionid1=>permission, actionid2=>permission,...,actionidn=>permission), 
@@ -276,7 +276,7 @@
 	global $adb;
 	$check = Array();
 	$temp_tabid = Array();	
-	$sql1 = "select * from profile2utility where profileid=".$profileid." order by(tabid)";
+	$sql1 = "select * from vtiger_profile2utility where profileid=".$profileid." order by(tabid)";
 	//echo $sql1.'<BR>';
 	$result1 = $adb->query($sql1);
         $num_rows1 = $adb->num_rows($result1);
@@ -317,7 +317,7 @@
 	$log->debug("Entering getDefaultSharingEditAction() method ...");
 	global $adb;
 	//retreiving the standard permissions	
-	$sql= "select * from def_org_share where editstatus=0";
+	$sql= "select * from vtiger_def_org_share where editstatus=0";
 	$result = $adb->query($sql);
 	$permissionRow=$adb->fetch_array($result);
 	do
@@ -348,7 +348,7 @@
 	$log->debug("Entering getDefaultSharingAction() method ...");
 	global $adb;
 	//retreivin the standard permissions	
-	$sql= "select * from def_org_share where editstatus in(0,1)";
+	$sql= "select * from vtiger_def_org_share where editstatus in(0,1)";
 	$result = $adb->query($sql);
 	$permissionRow=$adb->fetch_array($result);
 	do
@@ -381,7 +381,7 @@
 	global $adb;
 	$copy=Array();
 	//retreiving the standard permissions	
-	$sql= "select * from def_org_share";
+	$sql= "select * from vtiger_def_org_share";
 	$result = $adb->query($sql);
 	$num_rows=$adb->num_rows($result);
 
@@ -407,7 +407,7 @@
   global $log;
   $log->debug("Entering setPermittedTabs2Session(".$profileid.") method ...");
   global $adb;
-  $sql = "select tabid from profile2tab where profileid=" .$profileid ." and permissions =0" ;
+  $sql = "select tabid from vtiger_profile2tab where profileid=" .$profileid ." and permissions =0" ;
   $result = $adb->query($sql);
   
   $tabPermission=$adb->fetch_array($result);
@@ -436,7 +436,7 @@
   $log->debug("Entering setPermittedActions2Session(".$profileid.") method ...");
   global $adb;
   $check = Array(); 	
-  $sql1 = "select tabid from profile2tab where profileid=" .$profileid ." and permissions =0" ;
+  $sql1 = "select tabid from vtiger_profile2tab where profileid=" .$profileid ." and permissions =0" ;
   $result1 = $adb->query($sql1);
   $num_rows1 = $adb->num_rows($result1);
   for($i=0; $i<$num_rows1; $i++)
@@ -448,7 +448,7 @@
 	//echo '<BR>';
 
 	//Inserting the Standard Actions into the Array	
-	$sql= "select * from profile2standardpermissions where profileid =".$profileid." and tabid=".$tab_id;
+	$sql= "select * from vtiger_profile2standardpermissions where profileid =".$profileid." and tabid=".$tab_id;
 	$result = $adb->query($sql);
 	$num_rows = $adb->num_rows($result);
 	for($j=0; $j<$num_rows; $j++)
@@ -463,7 +463,7 @@
 	}
 	
 	//Inserting the utility Actions into the Array
-	$sql2= "select * from profile2utility where profileid =".$profileid." and tabid=".$tab_id;
+	$sql2= "select * from vtiger_profile2utility where profileid =".$profileid." and tabid=".$tab_id;
 	$result2 = $adb->query($sql2);
 	$num_rows2 = $adb->num_rows($result2);
 	for($k=0; $k<$num_rows2; $k++)
@@ -496,8 +496,8 @@
 	$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;
-	$sql = "select * from def_org_share";
+	//$sql= "select default_org_sharingrule.* from default_org_sharingrule inner join vtiger_profile2tab on vtiger_profile2tab.tabid = default_org_sharingrule.tabid where vtiger_profile2tab.permissions =0 and vtiger_profile2tab.profileid=".$profileid;
+	$sql = "select * from vtiger_def_org_share";
 	$result = $adb->query($sql);
 	$permissionRow=$adb->fetch_array($result);
 	do
@@ -514,10 +514,10 @@
 }
 
 
-/** Function to create the role
+/** Function to create the vtiger_role
   * @param $roleName -- Role Name:: Type varchar
   * @param $parentRoleId -- Parent Role Id:: Type varchar
-  * @param $roleProfileArray -- Profile to be associated with this role:: Type Array
+  * @param $roleProfileArray -- Profile to be associated with this vtiger_role:: Type Array
   * @returns  the Rold Id :: Type varchar
   *
  */
@@ -536,11 +536,11 @@
         $nowParentRoleHr=$parentRoleHr.'::'.$roleId;
         $nowRoleDepth=$parentRoleDepth + 1;
 
-	//Inserting role into db
-	$query="insert into role values('".$roleId."','".$roleName."','".$nowParentRoleHr."',".$nowRoleDepth.")";
+	//Inserting vtiger_role into db
+	$query="insert into vtiger_role values('".$roleId."','".$roleName."','".$nowParentRoleHr."',".$nowRoleDepth.")";
 	$adb->query($query);
 
-	//Inserting into role2profile table
+	//Inserting into vtiger_role2profile vtiger_table
 	foreach($roleProfileArray as $profileId)
         {
                 if($profileId != '')
@@ -554,10 +554,10 @@
 
 }
 
-/** Function to update the role
+/** Function to update the vtiger_role
   * @param $roleName -- Role Name:: Type varchar
   * @param $roleId -- Role Id:: Type varchar
-  * @param $roleProfileArray -- Profile to be associated with this role:: Type Array
+  * @param $roleProfileArray -- Profile to be associated with this vtiger_role:: Type Array
   *
  */
 function updateRole($roleId,$roleName,$roleProfileArray)
@@ -565,10 +565,10 @@
 	global $log;
 	$log->debug("Entering updateRole(".$roleId.",".$roleName.",".$roleProfileArray.") method ...");
 	global $adb;
-	$sql1 = "update role set rolename='".$roleName."' where roleid='".$roleId."'";
+	$sql1 = "update vtiger_role set rolename='".$roleName."' where roleid='".$roleId."'";
         $adb->query($sql1);
 	//Updating the Role2Profile relation
-	$sql2 = "delete from role2profile where roleId='".$roleId."'";
+	$sql2 = "delete from vtiger_role2profile where roleId='".$roleId."'";
 	$adb->query($sql2);
 
 	foreach($roleProfileArray as $profileId)
@@ -582,7 +582,7 @@
 	
 }
 
-/** Function to add the role to profile relation
+/** Function to add the vtiger_role to vtiger_profile relation
   * @param $profileId -- Profile Id:: Type integer
   * @param $roleId -- Role Id:: Type varchar
   *
@@ -592,7 +592,7 @@
 	global $log;
 	$log->debug("Entering insertRole2ProfileRelation(".$roleId.",".$profileId.") method ...");
 	global $adb;
-	$query="insert into role2profile values('".$roleId."',".$profileId.")";
+	$query="insert into vtiger_role2profile values('".$roleId."',".$profileId.")";
 	$adb->query($query);	
 	$log->debug("Exiting insertRole2ProfileRelation method ...");
 	
@@ -609,7 +609,7 @@
 	global $log;
 	$log->debug("Entering createNewGroup(".$groupName.",".$groupDescription.") method ...");
 	global $adb;
-	$sql = "insert into groups(name,description) values('" .$groupName ."','". $groupDescription ."')";
+	$sql = "insert into vtiger_groups(name,description) values('" .$groupName ."','". $groupDescription ."')";
 	$result = $adb->query($sql); 
 	$log->debug("Exiting createNewGroup method ...");
 	header("Location: index.php?module=Users&action=listgroups");
@@ -627,7 +627,7 @@
 	global $log;
 	$log->debug("Entering fetchTabId(".$moduleName.") method ...");
 	global $adb;
-	$sql = "select id from tabu where name ='" .$moduleName ."'";
+	$sql = "select id from vtiger_tab where name ='" .$moduleName ."'";
 	$result = $adb->query($sql); 
 	$tabid =  $adb->query_result($result,0,"id");
 	$log->debug("Exiting fetchTabId method ...");
@@ -645,12 +645,12 @@
 	global $log;
 	$log->debug("Entering populatePermissions4NewRole(".$parentroleName.",".$roleName.") method ...");
   global $adb;
-  //fetch the permissions for the parent role
+  //fetch the permissions for the parent vtiger_role
   $referenceValues = fetchTabReferenceEntityValues($parentroleName);
 
   while($permissionRow = $adb->fetch_array($referenceValues))
   {
-    $sql_insert="insert into role2tab(rolename,tabid,module_permission,description) values('" .$roleName ."'," .$permissionRow['tabid'] ."," .$permissionRow['module_permission'] .", '')";
+    $sql_insert="insert into vtiger_role2tab(rolename,tabid,module_permission,description) values('" .$roleName ."'," .$permissionRow['tabid'] ."," .$permissionRow['module_permission'] .", '')";
 
     //echo $sql_insert;
     $adb->query($sql_insert);
@@ -659,7 +659,7 @@
   $actionreferenceValues = fetchActionReferenceEntityValues($parentroleName);
   while($permissionRow = $adb->fetch_array($actionreferenceValues))
   {
-    $sql_insert="insert into role2action(rolename,tabid,actionname,action_permission,description) values('" .$roleName ."'," .$permissionRow['tabid'] .",'" .$permissionRow['actionname'] ."'," .$permissionRow['action_permission'] .", '')";
+    $sql_insert="insert into vtiger_role2action(rolename,tabid,actionname,action_permission,description) values('" .$roleName ."'," .$permissionRow['tabid'] .",'" .$permissionRow['actionname'] ."'," .$permissionRow['action_permission'] .", '')";
     //echo $sql_insert;
     $adb->query($sql_insert);
   }
@@ -677,7 +677,7 @@
 	global $log;
 	$log->debug("Entering fetchTabReferenceEntityValues(".$parentrolename.") method ...");
   global $adb;
-  $sql = "select tabid,module_permission,description from role2tab where rolename='" .$parentrolename ."'"; 
+  $sql = "select tabid,module_permission,description from vtiger_role2tab where rolename='" .$parentrolename ."'"; 
   //echo $sql;
   $result=$adb->query($sql);
 $log->debug("Exiting fetchTabReferenceEntityValues method ...");
@@ -696,13 +696,13 @@
 	global $log;
 $log->debug("Entering fetchActionReferenceEntityValues(".$parentrolename.") method ...");
   global $adb;
-  $sql = "select tabid,actionname,action_permission,description from role2action where rolename='" .$parentrolename ."'"; 
+  $sql = "select tabid,actionname,action_permission,description from vtiger_role2action where rolename='" .$parentrolename ."'"; 
     $result=$adb->query($sql);
 $log->debug("Exiting fetchActionReferenceEntityValues method ...");
   return $result;
 }
 
-/** Function to get the roleid from rolename
+/** Function to get the vtiger_roleid from vtiger_rolename
   * @param $rolename -- Role Name:: Type varchar
   * @returns Role Id:: Type varchar
   *
@@ -713,14 +713,14 @@
 $log->debug("Entering fetchRoleId(".$rolename.") method ...");
 
   global $adb;
-  $sqlfetchroleid = "select roleid from role where rolename='".$rolename ."'";
+  $sqlfetchroleid = "select roleid from vtiger_role where rolename='".$rolename ."'";
   $resultroleid = $adb->query($sqlfetchroleid);
   $role_id = $adb->query_result($resultroleid,0,"roleid");
 $log->debug("Exiting fetchRoleId method ...");
   return $role_id;
 }
 
-/** Function to update user to role mapping based on the userid
+/** Function to update user to vtiger_role mapping based on the userid
   * @param $roleid -- Role Id:: Type varchar
   * @param $userid User Id:: Type integer
   *
@@ -731,14 +731,14 @@
 $log->debug("Entering updateUser2RoleMapping(".$roleid.",".$userid.") method ...");
   global $adb;
   //Check if row already exists
-  $sqlcheck = "select * from user2role where userid=".$userid;
+  $sqlcheck = "select * from vtiger_user2role where userid=".$userid;
   $resultcheck = $adb->query($sqlcheck);
   if($adb->num_rows($resultcheck) == 1)
   {
-  	$sqldelete = "delete from user2role where userid=".$userid;
+  	$sqldelete = "delete from vtiger_user2role where userid=".$userid;
   	$result_delete = $adb->query($sqldelete);
   }	
-  $sql = "insert into user2role(userid,roleid) values(" .$userid .",'" .$roleid ."')";
+  $sql = "insert into vtiger_user2role(userid,roleid) values(" .$userid .",'" .$roleid ."')";
   $result = $adb->query($sql);
 	$log->debug("Exiting updateUser2RoleMapping method ...");
 
@@ -755,14 +755,14 @@
 global $log;
 $log->debug("Entering updateUsers2GroupMapping(".$groupname.",".$userid.") method ...");
   global $adb;
-  $sqldelete = "delete from users2group where userid = '" .$userid ."'";
+  $sqldelete = "delete from vtiger_users2group where userid = '" .$userid ."'";
   $result_delete = $adb->query($sqldelete);
-  $sql = "insert into users2group(groupname,userid) values('" .$groupname ."','" .$userid ."')";
+  $sql = "insert into vtiger_users2group(groupname,userid) values('" .$groupname ."','" .$userid ."')";
   $result = $adb->query($sql);
   $log->debug("Exiting updateUsers2GroupMapping method ...");
 }
 
-/** Function to add user to role mapping 
+/** Function to add user to vtiger_role mapping 
   * @param $roleid -- Role Id:: Type varchar
   * @param $userid User Id:: Type integer
   *
@@ -773,7 +773,7 @@
 $log->debug("Entering insertUser2RoleMapping(".$roleid.",".$userid.") method ...");
 
   global $adb;	
-  $sql = "insert into user2role(userid,roleid) values('" .$userid ."','" .$roleid ."')";
+  $sql = "insert into vtiger_user2role(userid,roleid) values('" .$userid ."','" .$roleid ."')";
  $adb->query($sql); 
 $log->debug("Exiting insertUser2RoleMapping method ...");
 
@@ -789,7 +789,7 @@
 global $log;
 $log->debug("Entering insertUsers2GroupMapping(".$groupname.",".$userid.") method ...");
   global $adb;
-  $sql = "insert into users2group(groupname,userid) values('" .$groupname ."','" .$userid ."')";
+  $sql = "insert into vtiger_users2group(groupname,userid) values('" .$groupname ."','" .$userid ."')";
   $adb->query($sql);
 $log->debug("Exiting insertUsers2GroupMapping method ...");
 }
@@ -804,7 +804,7 @@
 global $log;
 $log->debug("Entering fetchWordTemplateList(".$module.") method ...");
   global $adb;
-  $sql_word = "select templateid, filename from wordtemplates where module ='".$module."'" ; 
+  $sql_word = "select templateid, filename from vtiger_wordtemplates where module ='".$module."'" ; 
   $result=$adb->query($sql_word);
 $log->debug("Exiting fetchWordTemplateList method ...");
   return $result;
@@ -822,7 +822,7 @@
 global $log;
 $log->debug("Entering fetchEmailTemplateInfo(".$templateName.") method ...");
 	global $adb;
-        $sql= "select * from emailtemplates where templatename='" .$templateName ."'";
+        $sql= "select * from vtiger_emailtemplates where templatename='" .$templateName ."'";
         $result = $adb->query($sql);
 $log->debug("Exiting fetchEmailTemplateInfo method ...");
         return $result;
@@ -888,7 +888,7 @@
 	global $log;
 	$log->debug("Entering insert2LeadGroupRelation(".$leadid.",".$groupname.") method ...");
 global $adb;
-  $sql = "insert into leadgrouprelation values (" .$leadid .",'".$groupname."')";
+  $sql = "insert into vtiger_leadgrouprelation values (" .$leadid .",'".$groupname."')";
   $adb->query($sql);
 	$log->debug("Exiting insert2LeadGroupRelation method ...");
 
@@ -904,9 +904,9 @@
 global $log;
 $log->debug("Entering updateLeadGroupRelation(".$leadid.",".$groupname.") method ...");
  global $adb;
-  $sqldelete = "delete from leadgrouprelation where leadid=".$leadid;
+  $sqldelete = "delete from vtiger_leadgrouprelation where leadid=".$leadid;
   $adb->query($sqldelete);
-  $sql = "insert into leadgrouprelation values (".$leadid .",'" .$groupname ."')";  
+  $sql = "insert into vtiger_leadgrouprelation values (".$leadid .",'" .$groupname ."')";  
   $adb->query($sql);
   $log->debug("Exiting updateLeadGroupRelation method ...");
 
@@ -922,7 +922,7 @@
 global $log;
 $log->debug("Entering insert2AccountGroupRelation(".$accountid.",".$groupname.") method ...");
 global $adb;
-  $sql = "insert into accountgrouprelation values (" .$accountid .",'".$groupname."')";
+  $sql = "insert into vtiger_accountgrouprelation values (" .$accountid .",'".$groupname."')";
   $adb->query($sql);
 $log->debug("Exiting insert2AccountGroupRelation method ...");
 
@@ -939,9 +939,9 @@
 global $log;
 $log->debug("Entering updateAccountGroupRelation(".$accountid.",".$groupname.") method ...");
  global $adb;
-  $sqldelete = "delete from accountgrouprelation where accountid=".$accountid;
+  $sqldelete = "delete from vtiger_accountgrouprelation where accountid=".$accountid;
   $adb->query($sqldelete);
-  $sql = "insert into accountgrouprelation values (".$accountid .",'" .$groupname ."')";
+  $sql = "insert into vtiger_accountgrouprelation values (".$accountid .",'" .$groupname ."')";
   $adb->query($sql);
 $log->debug("Exiting updateAccountGroupRelation method ...");
 
@@ -957,7 +957,7 @@
 global $log;
 $log->debug("Entering insert2ContactGroupRelation(".$contactid.",".$groupname.") method ...");
 global $adb;
-  $sql = "insert into contactgrouprelation values (" .$contactid .",'".$groupname."')";
+  $sql = "insert into vtiger_contactgrouprelation values (" .$contactid .",'".$groupname."')";
   $adb->query($sql);
 $log->debug("Exiting insert2ContactGroupRelation method ...");
 
@@ -974,9 +974,9 @@
 global $log;
 $log->debug("Entering updateContactGroupRelation(".$contactid.",".$groupname.") method ...");
  global $adb;
-  $sqldelete = "delete from contactgrouprelation where contactid=".$contactid;
+  $sqldelete = "delete from vtiger_contactgrouprelation where contactid=".$contactid;
   $adb->query($sqldelete);
-  $sql = "insert into contactgrouprelation values (".$contactid .",'" .$groupname ."')";
+  $sql = "insert into vtiger_contactgrouprelation values (".$contactid .",'" .$groupname ."')";
   $adb->query($sql);
 $log->debug("Exiting updateContactGroupRelation method ...");
 
@@ -991,7 +991,7 @@
 global $log;
 $log->debug("Entering insert2PotentialGroupRelation(".$potentialid.",".$groupname.") method ...");
 global $adb;
-  $sql = "insert into potentialgrouprelation values (" .$potentialid .",'".$groupname."')";
+  $sql = "insert into vtiger_potentialgrouprelation values (" .$potentialid .",'".$groupname."')";
   $adb->query($sql);
   $log->debug("Exiting insert2PotentialGroupRelation method ...");
 
@@ -1008,9 +1008,9 @@
 global $log;
 $log->debug("Entering updatePotentialGroupRelation(".$potentialid.",".$groupname.") method ...");
  global $adb;
-  $sqldelete = "delete from potentialgrouprelation where potentialid=".$potentialid;
+  $sqldelete = "delete from vtiger_potentialgrouprelation where potentialid=".$potentialid;
   $adb->query($sqldelete);
-  $sql = "insert into potentialgrouprelation values (".$potentialid .",'" .$groupname ."')";
+  $sql = "insert into vtiger_potentialgrouprelation values (".$potentialid .",'" .$groupname ."')";
   $adb->query($sql);
   $log->debug("Exiting updatePotentialGroupRelation method ...");
 
@@ -1026,7 +1026,7 @@
 global $log;
 $log->debug("Entering insert2QuoteGroupRelation(".$quoteid.",".$groupname.") method ...");
 global $adb;
-  $sql = "insert into quotegrouprelation values (" .$quoteid .",'".$groupname."')";
+  $sql = "insert into vtiger_quotegrouprelation values (" .$quoteid .",'".$groupname."')";
   $adb->query($sql);
 $log->debug("Exiting insert2QuoteGroupRelation method ...");
 
@@ -1043,9 +1043,9 @@
 global $log;
 $log->debug("Entering updateQuoteGroupRelation(".$quoteid.",".$groupname.") method ...");
  global $adb;
-  $sqldelete = "delete from quotegrouprelation where quoteid=".$quoteid;
+  $sqldelete = "delete from vtiger_quotegrouprelation where quoteid=".$quoteid;
   $adb->query($sqldelete);
-  $sql = "insert into quotegrouprelation values (".$quoteid .",'" .$groupname ."')";
+  $sql = "insert into vtiger_quotegrouprelation values (".$quoteid .",'" .$groupname ."')";
   $adb->query($sql);
 $log->debug("Exiting updateQuoteGroupRelation method ...");
 
@@ -1060,7 +1060,7 @@
 global $log;
 $log->debug("Entering insert2SoGroupRelation(".$salesorderid.",".$groupname.") method ...");
 global $adb;
-  $sql = "insert into sogrouprelation values (" .$salesorderid .",'".$groupname."')";
+  $sql = "insert into vtiger_sogrouprelation values (" .$salesorderid .",'".$groupname."')";
   $adb->query($sql);
 $log->debug("Exiting insert2SoGroupRelation method ...");
 
@@ -1077,9 +1077,9 @@
 global $log;
 $log->debug("Entering updateSoGroupRelation(".$salesorderid.",".$groupname.") method ...");
  global $adb;
-  $sqldelete = "delete from sogrouprelation where salesorderid=".$salesorderid;
+  $sqldelete = "delete from vtiger_sogrouprelation where salesorderid=".$salesorderid;
   $adb->query($sqldelete);
-  $sql = "insert into sogrouprelation values (".$salesorderid .",'" .$groupname ."')";
+  $sql = "insert into vtiger_sogrouprelation values (".$salesorderid .",'" .$groupname ."')";
   $adb->query($sql);
 $log->debug("Exiting updateSoGroupRelation method ...");
 
@@ -1095,7 +1095,7 @@
 global $log;
 $log->debug("Entering insert2InvoiceGroupRelation(".$invoiceid.",".$groupname.") method ...");
 global $adb;
-  $sql = "insert into invoicegrouprelation values (" .$invoiceid .",'".$groupname."')";
+  $sql = "insert into vtiger_invoicegrouprelation values (" .$invoiceid .",'".$groupname."')";
   $adb->query($sql);
 $log->debug("Exiting insert2InvoiceGroupRelation method ...");
 
@@ -1112,9 +1112,9 @@
 global $log;
 $log->debug("Entering updateInvoiceGroupRelation(".$invoiceid.",".$groupname.") method ...");
  global $adb;
-  $sqldelete = "delete from invoicegrouprelation where invoiceid=".$invoiceid;
+  $sqldelete = "delete from vtiger_invoicegrouprelation where invoiceid=".$invoiceid;
   $adb->query($sqldelete);
-  $sql = "insert into invoicegrouprelation values (".$invoiceid .",'" .$groupname ."')";
+  $sql = "insert into vtiger_invoicegrouprelation values (".$invoiceid .",'" .$groupname ."')";
   $adb->query($sql);
 $log->debug("Exiting updateInvoiceGroupRelation method ...");
 
@@ -1130,7 +1130,7 @@
 global $log;
 $log->debug("Entering insert2PoGroupRelation(".$poid.",".$groupname.") method ...");
 global $adb;
-  $sql = "insert into pogrouprelation values (" .$poid .",'".$groupname."')";
+  $sql = "insert into vtiger_pogrouprelation values (" .$poid .",'".$groupname."')";
   $adb->query($sql);
 $log->debug("Exiting insert2PoGroupRelation method ...");
 
@@ -1147,9 +1147,9 @@
 global $log;
 $log->debug("Entering updatePoGroupRelation(".$poid.",".$groupname.") method ...");
  global $adb;
-  $sqldelete = "delete from pogrouprelation where purchaseorderid=".$poid;
+  $sqldelete = "delete from vtiger_pogrouprelation where purchaseorderid=".$poid;
   $adb->query($sqldelete);
-  $sql = "insert into pogrouprelation values (".$poid .",'" .$groupname ."')";
+  $sql = "insert into vtiger_pogrouprelation values (".$poid .",'" .$groupname ."')";
   $adb->query($sql);
 $log->debug("Exiting updatePoGroupRelation method ...");
 
@@ -1166,16 +1166,16 @@
 global $log;
 $log->debug("Entering updateTicketGroupRelation(".$ticketid.",".$groupname.") method ...");
  global $adb;
-  $sqldelete = "delete from ticketgrouprelation where ticketid=".$ticketid;
+  $sqldelete = "delete from vtiger_ticketgrouprelation where ticketid=".$ticketid;
   $adb->query($sqldelete);
-  $sql = "insert into ticketgrouprelation values (".$ticketid .",'" .$groupname ."')";  
+  $sql = "insert into vtiger_ticketgrouprelation values (".$ticketid .",'" .$groupname ."')";  
   $adb->query($sql);
 $log->debug("Exiting updateTicketGroupRelation method ...");
 
 }
 
 
-/** Function to insert activity group relation 
+/** Function to insert vtiger_activity group relation 
   * @param $activityid -- Activity Id:: Type integer
   * @param $groupname -- Group Name:: Type varchar
   *
@@ -1185,7 +1185,7 @@
 global $log;
 $log->debug("Entering insert2ActivityGroupRelation(".$activityid.",".$groupname.") method ...");
 global $adb;
-  $sql = "insert into activitygrouprelation values (" .$activityid .",'".$groupname."')";
+  $sql = "insert into vtiger_activitygrouprelation values (" .$activityid .",'".$groupname."')";
   $adb->query($sql);
 $log->debug("Exiting insert2ActivityGroupRelation method ...");
 
@@ -1202,13 +1202,13 @@
 global $log;
 $log->debug("Entering insert2TicketGroupRelation(".$ticketid.",".$groupname.") method ...");
 global $adb;
-  $sql = "insert into ticketgrouprelation values (" .$ticketid .",'".$groupname."')";
+  $sql = "insert into vtiger_ticketgrouprelation values (" .$ticketid .",'".$groupname."')";
   $adb->query($sql);
 $log->debug("Exiting insert2TicketGroupRelation method ...");
 
 }
 
-/** Function to update activity group relation 
+/** Function to update vtiger_activity group relation 
   * @param $activityid -- Activity Id:: Type integer
   * @param $groupname -- Group Name:: Type varchar
   *
@@ -1218,10 +1218,10 @@
 global $log;
 $log->debug("Entering updateActivityGroupRelation(".$activityid.",".$groupname.") method ...");
 	global $adb;
-  $sqldelete = "delete from activitygrouprelation where activityid=".$activityid;
+  $sqldelete = "delete from vtiger_activitygrouprelation where activityid=".$activityid;
   if($groupname != '' && $groupname != 'null') {
 	  $adb->query($sqldelete);
-	  $sql = "insert into activitygrouprelation values (".$activityid .",'" .$groupname ."')";  
+	  $sql = "insert into vtiger_activitygrouprelation values (".$activityid .",'" .$groupname ."')";  
 	  $adb->query($sql);
   }
   $log->debug("Exiting updateActivityGroupRelation method ...");
@@ -1244,7 +1244,7 @@
         {
                 $tabid = 5;
         }
-        $query = "select * from profile2field where profileid =".$profileid." and tabid=".$tabid;
+        $query = "select * from vtiger_profile2field where profileid =".$profileid." and tabid=".$tabid;
         //echo $query;
         $result = $adb->query($query);
 	$log->debug("Exiting getFieldList method ...");
@@ -1266,7 +1266,7 @@
         {
                 $tabid = 5;
         }
-        $query = "select * from profile2field where profileid =".$profileid." and tabid=".$tabid;
+        $query = "select * from vtiger_profile2field where profileid =".$profileid." and tabid=".$tabid;
         //echo $query;
         $result = $adb->query($query);
 	$fldVisbArray = Array();
@@ -1296,7 +1296,7 @@
         {
                 $tabid = 5;
         }
-        $query = "select * from profile2field where profileid =".$profileid." and tabid=".$tabid;
+        $query = "select * from vtiger_profile2field where profileid =".$profileid." and tabid=".$tabid;
         //echo $query;
         $result = $adb->query($query);
 	$fldReadOnlyArray = Array();
@@ -1312,7 +1312,7 @@
 }
 
 
-/** Function to get the role name from the roleid 
+/** Function to get the vtiger_role name from the vtiger_roleid 
   * @param $roleid -- Role Id:: Type varchar
   * @returns $rolename -- Role Name:: Type varchar
   *
@@ -1322,14 +1322,14 @@
 	global $log;
 	$log->debug("Entering getRoleName(".$roleid.") method ...");
 	global $adb;
-	$sql1 = "select * from role where roleid='".$roleid."'";
+	$sql1 = "select * from vtiger_role where roleid='".$roleid."'";
 	$result = $adb->query($sql1);
 	$rolename = $adb->query_result($result,0,"rolename");
 	$log->debug("Exiting getRoleName method ...");
 	return $rolename;	
 }
 
-/** Function to get the profile name from the profileid 
+/** Function to get the vtiger_profile name from the vtiger_profileid 
   * @param $profileid -- Profile Id:: Type integer
   * @returns $rolename -- Role Name:: Type varchar
   *
@@ -1339,7 +1339,7 @@
 	global $log;
 	$log->debug("Entering getProfileName(".$profileid.") method ...");
 	global $adb;
-	$sql1 = "select * from profile where profileid=".$profileid;
+	$sql1 = "select * from vtiger_profile where profileid=".$profileid;
 	$result = $adb->query($sql1);
 	$profilename = $adb->query_result($result,0,"profilename");
 	$log->debug("Exiting getProfileName method ...");
@@ -1398,7 +1398,7 @@
 	//Retreiving the Tabid and Action Id	
 	$tabid = getTabid($module);
 	$actionid=getActionid($actionname);
-	//If no actionid, then allow action is tab permission is available	
+	//If no actionid, then allow action is vtiger_tab permission is available	
 	if($actionid == '')
 	{
 		if($profileTabsPermission[$tabid] ==0)
@@ -1437,7 +1437,7 @@
 
 		}
 	}
-	//Checking for tab permission
+	//Checking for vtiger_tab permission
 	if($profileTabsPermission[$tabid] !=0)
 	{
 		$permission = "no";
@@ -1906,7 +1906,7 @@
 		$defSharingPermissionData = getDefaultSharingAction();
 		$others_permission_id = $defSharingPermissionData[$tabid];
 
-		//Checking whether this tab is allowed
+		//Checking whether this vtiger_tab is allowed
 		if($tab_per_Data[$tabid] == 0)
 		{
 			$permission = 'yes';
@@ -1996,7 +1996,7 @@
 	global $log;
 	$log->debug("Entering setGlobalProfilePermission2Session(".$profileid.") method ...");
   global $adb;
-  $sql = "select * from profile2globalpermissions where profileid=".$profileid ;
+  $sql = "select * from vtiger_profile2globalpermissions where profileid=".$profileid ;
   $result = $adb->query($sql);
   $num_rows = $adb->num_rows($result);
 
@@ -2014,7 +2014,7 @@
 
 
 
-/** Function to get the Profile Global Information for the specified profileid  
+/** Function to get the Profile Global Information for the specified vtiger_profileid  
   * @param $profileid -- Profile Id:: Type integer
   * @returns Profile Gloabal Permission Array in the following format:
   * $profileGloblaPermisson=Array($viewall_actionid=>permission, $editall_actionid=>permission)
@@ -2024,7 +2024,7 @@
 global $log;
 $log->debug("Entering getProfileGlobalPermission(".$profileid.") method ...");
   global $adb;
-  $sql = "select * from profile2globalpermissions where profileid=".$profileid ;
+  $sql = "select * from vtiger_profile2globalpermissions where profileid=".$profileid ;
   $result = $adb->query($sql);
   $num_rows = $adb->num_rows($result);
 
@@ -2040,7 +2040,7 @@
   
 }
 
-/** Function to get the Profile Tab Permissions for the specified profileid  
+/** Function to get the Profile Tab Permissions for the specified vtiger_profileid  
   * @param $profileid -- Profile Id:: Type integer
   * @returns Profile Tabs Permission Array in the following format:
   * $profileTabPermisson=Array($tabid1=>permission, $tabid2=>permission,........., $tabidn=>permission)
@@ -2050,7 +2050,7 @@
 global $log;
 $log->debug("Entering getProfileTabsPermission(".$profileid.") method ...");
   global $adb;
-  $sql = "select * from profile2tab where profileid=".$profileid ;
+  $sql = "select * from vtiger_profile2tab where profileid=".$profileid ;
   $result = $adb->query($sql);
   $num_rows = $adb->num_rows($result);
 
@@ -2067,7 +2067,7 @@
 }
 
 
-/** Function to get the Profile Action Permissions for the specified profileid  
+/** Function to get the Profile Action Permissions for the specified vtiger_profileid  
   * @param $profileid -- Profile Id:: Type integer
   * @returns Profile Tabs Action Permission Array in the following format:
   *    $tabActionPermission = Array($tabid1=>Array(actionid1=>permission, actionid2=>permission,...,actionidn=>permission),
@@ -2082,7 +2082,7 @@
 	global $adb;
 	$check = Array();
 	$temp_tabid = Array();	
-	$sql1 = "select * from profile2standardpermissions where profileid=".$profileid;
+	$sql1 = "select * from vtiger_profile2standardpermissions where profileid=".$profileid;
 	//echo $sql1.'<BR>';
 	$result1 = $adb->query($sql1);
         $num_rows1 = $adb->num_rows($result1);
@@ -2110,7 +2110,7 @@
 
 
 
-/** Function to get the Standard and Utility Profile Action Permissions for the specified profileid  
+/** Function to get the Standard and Utility Profile Action Permissions for the specified vtiger_profileid  
   * @param $profileid -- Profile Id:: Type integer
   * @returns Profile Tabs Action Permission Array in the following format:
   *    $tabActionPermission = Array($tabid1=>Array(actionid1=>permission, actionid2=>permission,...,actionidn=>permission),
@@ -2139,7 +2139,7 @@
 }
 
 
-/** Function to create profile 
+/** Function to create vtiger_profile 
   * @param $profilename -- Profile Name:: Type varchar
   * @param $parentProfileId -- Profile Id:: Type integer
  */
@@ -2149,40 +2149,40 @@
 $log->debug("Entering createProfile(".$profilename.",".$parentProfileId.",".$description.") method ...");
 	global $adb;
 	//Inserting values into Profile Table
-	$sql1 = "insert into profile values('','".$profilename."','".$description."')";
+	$sql1 = "insert into vtiger_profile values('','".$profilename."','".$description."')";
 	$adb->query($sql1);
 
-	//Retreiving the profileid
-	$sql2 = "select max(profileid) as current_id from profile";
+	//Retreiving the vtiger_profileid
+	$sql2 = "select max(profileid) as current_id from vtiger_profile";
 	$result2 = $adb->query($sql2);
 	$current_profile_id = $adb->query_result($result2,0,'current_id');
 
-	//Inserting values into profile2globalpermissions
-	$sql3 = "select * from profile2globalpermissions where profileid=".$parentProfileId;
+	//Inserting values into vtiger_profile2globalpermissions
+	$sql3 = "select * from vtiger_profile2globalpermissions where profileid=".$parentProfileId;
 	$result3= $adb->query($sql3);
 	$p2tab_rows = $adb->num_rows($result3);
 	for($i=0; $i<$p2tab_rows; $i++)
 	{
 		$act_id=$adb->query_result($result3,$i,'globalactionid');
 		$permissions=$adb->query_result($result3,$i,'globalactionpermission');
-		$sql4="insert into profile2globalpermissions values(".$current_profile_id.", ".$act_id.", ".$permissions.")";
+		$sql4="insert into vtiger_profile2globalpermissions values(".$current_profile_id.", ".$act_id.", ".$permissions.")";
 		$adb->query($sql4);	
 	}
 
-	//Inserting values into Profile2tab table
-	$sql3 = "select * from profile2tab where profileid=".$parentProfileId;
+	//Inserting values into Profile2tab vtiger_table
+	$sql3 = "select * from vtiger_profile2tab where profileid=".$parentProfileId;
 	$result3= $adb->query($sql3);
 	$p2tab_rows = $adb->num_rows($result3);
 	for($i=0; $i<$p2tab_rows; $i++)
 	{
 		$tab_id=$adb->query_result($result3,$i,'tabid');
 		$permissions=$adb->query_result($result3,$i,'permissions');
-		$sql4="insert into profile2tab values(".$current_profile_id.", ".$tab_id.", ".$permissions.")";
+		$sql4="insert into vtiger_profile2tab values(".$current_profile_id.", ".$tab_id.", ".$permissions.")";
 		$adb->query($sql4);	
 	}
 
-	//Inserting values into Profile2standard table
-	$sql6 = "select * from profile2standardpermissions where profileid=".$parentProfileId;
+	//Inserting values into Profile2standard vtiger_table
+	$sql6 = "select * from vtiger_profile2standardpermissions where profileid=".$parentProfileId;
 	$result6= $adb->query($sql6);
 	$p2per_rows = $adb->num_rows($result6);
 	for($i=0; $i<$p2per_rows; $i++)
@@ -2190,12 +2190,12 @@
 		$tab_id=$adb->query_result($result6,$i,'tabid');
 		$action_id=$adb->query_result($result6,$i,'operation');	
 		$permissions=$adb->query_result($result6,$i,'permissions');
-		$sql7="insert into profile2standardpermissions values(".$current_profile_id.", ".$tab_id.", ".$action_id.", ".$permissions.")";
+		$sql7="insert into vtiger_profile2standardpermissions values(".$current_profile_id.", ".$tab_id.", ".$action_id.", ".$permissions.")";
 		$adb->query($sql7);	
 	}
 
-	//Inserting values into Profile2Utility table
-	$sql8 = "select * from profile2utility where profileid=".$parentProfileId;
+	//Inserting values into Profile2Utility vtiger_table
+	$sql8 = "select * from vtiger_profile2utility where profileid=".$parentProfileId;
 	$result8= $adb->query($sql8);
 	$p2util_rows = $adb->num_rows($result8);
 	for($i=0; $i<$p2util_rows; $i++)
@@ -2203,12 +2203,12 @@
 		$tab_id=$adb->query_result($result8,$i,'tabid');
 		$action_id=$adb->query_result($result8,$i,'activityid');	
 		$permissions=$adb->query_result($result8,$i,'permission');
-		$sql9="insert into profile2utility values(".$current_profile_id.", ".$tab_id.", ".$action_id.", ".$permissions.")";
+		$sql9="insert into vtiger_profile2utility values(".$current_profile_id.", ".$tab_id.", ".$action_id.", ".$permissions.")";
 		$adb->query($sql9);	
 	}
 
-	//Inserting values into Profile2field table
-	$sql10 = "select * from profile2field where profileid=".$parentProfileId;
+	//Inserting values into Profile2field vtiger_table
+	$sql10 = "select * from vtiger_profile2field where profileid=".$parentProfileId;
 	$result10= $adb->query($sql10);
 	$p2field_rows = $adb->num_rows($result10);
 	for($i=0; $i<$p2field_rows; $i++)
@@ -2217,14 +2217,14 @@
 		$fieldid=$adb->query_result($result10,$i,'fieldid');	
 		$permissions=$adb->query_result($result10,$i,'visible');
 		$readonly=$adb->query_result($result10,$i,'readonly');
-		$sql11="insert into profile2field values(".$current_profile_id.", ".$tab_id.", ".$fieldid.", ".$permissions." ,".$readonly.")";
+		$sql11="insert into vtiger_profile2field values(".$current_profile_id.", ".$tab_id.", ".$fieldid.", ".$permissions." ,".$readonly.")";
 		$adb->query($sql11);	
 	}
 	$log->debug("Exiting createProfile method ...");
 }
 
-/** Function to delete profile 
-  * @param $transfer_profileid -- Profile Id to which the existing role2profile relationships are to be transferred :: Type varchar
+/** Function to delete vtiger_profile 
+  * @param $transfer_profileid -- Profile Id to which the existing vtiger_role2profile relationships are to be transferred :: Type varchar
   * @param $prof_id -- Profile Id to be deleted:: Type integer
  */
 function deleteProfile($prof_id,$transfer_profileid='')
@@ -2232,48 +2232,48 @@
 	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;
+	//delete from vtiger_profile2global permissions
+	$sql4 = "delete from vtiger_profile2globalpermissions where profileid=".$prof_id;
 	$adb->query($sql4);
 
-	//deleting from profile 2 tab;
-	$sql4 = "delete from profile2tab where profileid=".$prof_id;
+	//deleting from vtiger_profile 2 vtiger_tab;
+	$sql4 = "delete from vtiger_profile2tab where profileid=".$prof_id;
 	$adb->query($sql4);
 
-	//deleting from profile2standardpermissions table
-	$sql5 = "delete from profile2standardpermissions where profileid=".$prof_id;
+	//deleting from vtiger_profile2standardpermissions vtiger_table
+	$sql5 = "delete from vtiger_profile2standardpermissions where profileid=".$prof_id;
 	$adb->query($sql5);
 
-	//deleting from profile2field
-	$sql6 ="delete from profile2field where profileid=".$prof_id;
+	//deleting from vtiger_profile2field
+	$sql6 ="delete from vtiger_profile2field where profileid=".$prof_id;
 	$adb->query($sql6);
 
-	//deleting from profile2utility
-	$sql7 ="delete from profile2utility where profileid=".$prof_id;
+	//deleting from vtiger_profile2utility
+	$sql7 ="delete from vtiger_profile2utility where profileid=".$prof_id;
 	$adb->query($sql7);
 
-	//updating role2profile
+	//updating vtiger_role2profile
         if(isset($transfer_profileid) && $transfer_profileid != '')
         {
 
-                $sql8 = "select roleid from role2profile where profileid=".$prof_id;
+                $sql8 = "select roleid from vtiger_role2profile where profileid=".$prof_id;
                 $result=$adb->query($sql8);
                 $num_rows=$adb->num_rows($result);
 
                 for($i=0;$i<$num_rows;$i++)
                 {
                         $roleid=$adb->query_result($result,$i,'roleid');
-                        $sql = "select profileid from role2profile where roleid='".$roleid."'";
+                        $sql = "select profileid from vtiger_role2profile where roleid='".$roleid."'";
                         $profresult=$adb->query($sql);
                         $num=$adb->num_rows($profresult);
                         if($num>1)
                         {
-                                $sql10="delete from role2profile where roleid='".$roleid."' and profileid=".$prof_id;
+                                $sql10="delete from vtiger_role2profile where roleid='".$roleid."' and profileid=".$prof_id;
                                 $adb->query($sql10);
                         }
                         else
                         {
-                                $sql8 = "update role2profile set profileid=".$transfer_profileid." where profileid=".$prof_id." and roleid='".$roleid."'";
+                                $sql8 = "update vtiger_role2profile set profileid=".$transfer_profileid." where profileid=".$prof_id." and roleid='".$roleid."'";
                                 $adb->query($sql8);
                         }
 
@@ -2281,15 +2281,15 @@
                 }
         }
 
-	//delete from profile table;
-	$sql9 = "delete from profile where profileid=".$prof_id;
+	//delete from vtiger_profile vtiger_table;
+	$sql9 = "delete from vtiger_profile where profileid=".$prof_id;
 	$adb->query($sql9);
 	$log->debug("Exiting deleteProfile method ...");	
 
 }
 
-/** Function to get all  the role information 
-  * @returns $allRoleDetailArray-- Array will contain the details of all the roles. RoleId will be the key:: Type array
+/** Function to get all  the vtiger_role information 
+  * @returns $allRoleDetailArray-- Array will contain the details of all the vtiger_roles. RoleId will be the key:: Type array
  */
 function getAllRoleDetails()
 {
@@ -2297,7 +2297,7 @@
 $log->debug("Entering getAllRoleDetails() method ...");
 	global $adb;
 	$role_det = Array();
-	$query = "select * from role";
+	$query = "select * from vtiger_role";
 	$result = $adb->query($query);
 	$num_rows=$adb->num_rows($result);
 	for($i=0; $i<$num_rows;$i++)
@@ -2311,7 +2311,7 @@
 		$sub_role='';
 		
 		//getting the immediate subordinates
-		$query1="select * from role where parentrole like '".$parentrole."::%' and depth=".$sub_roledepth;
+		$query1="select * from vtiger_role where parentrole like '".$parentrole."::%' and depth=".$sub_roledepth;
 		$res1 = $adb->query($query1);
 		$num_roles = $adb->num_rows($res1);
 		if($num_roles > 0)
@@ -2341,15 +2341,15 @@
 }
 
 
-/** Function to get all  the profile information 
-  * @returns $allProfileInfoArray-- Array will contain the details of all the profiles. Profile ID will be the key:: Type array
+/** Function to get all  the vtiger_profile information 
+  * @returns $allProfileInfoArray-- Array will contain the details of all the vtiger_profiles. Profile ID will be the key:: Type array
  */
 function getAllProfileInfo()
 {
 	global $log;
 	$log->debug("Entering getAllProfileInfo() method ...");
 	global $adb;
-	$query="select * from profile";
+	$query="select * from vtiger_profile";
 	$result = $adb->query($query);
 	$num_rows=$adb->num_rows($result);
 	$prof_details=Array();
@@ -2364,7 +2364,7 @@
 	return $prof_details;	
 }
 
-/** Function to get the role information of the specified role
+/** Function to get the vtiger_role information of the specified vtiger_role
   * @param $roleid -- RoleId :: Type varchar 
   * @returns $roleInfoArray-- RoleInfoArray in the following format:
   *       $roleInfo=Array($roleId=>Array($rolename,$parentrole,$roledepth,$immediateParent));
@@ -2374,7 +2374,7 @@
 	global $log;
 	$log->debug("Entering getRoleInformation(".$roleid.") method ...");
 	global $adb;
-	$query = "select * from role where roleid='".$roleid."'";
+	$query = "select * from vtiger_role where roleid='".$roleid."'";
 	$result = $adb->query($query);
 	$rolename=$adb->query_result($result,0,'rolename');
 	$parentrole=$adb->query_result($result,0,'parentrole');
@@ -2393,7 +2393,7 @@
 }
 
 
-/** Function to get the role related profiles
+/** Function to get the vtiger_role related vtiger_profiles
   * @param $roleid -- RoleId :: Type varchar 
   * @returns $roleProfiles-- Role Related Profile Array in the following format:
   *       $roleProfiles=Array($profileId1=>$profileName,$profileId2=>$profileName,........,$profileIdn=>$profileName));
@@ -2403,7 +2403,7 @@
 	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."'";
+	$query = "select vtiger_role2profile.*,vtiger_profile.profilename from vtiger_role2profile inner join vtiger_profile on vtiger_profile.profileid=vtiger_role2profile.profileid where roleid='".$roleId."'";
 	$result = $adb->query($query);
 	$num_rows=$adb->num_rows($result);
 	$roleRelatedProfiles=Array();
@@ -2416,7 +2416,7 @@
 }
 
 
-/** Function to get the role related users
+/** Function to get the vtiger_role related vtiger_users
   * @param $roleid -- RoleId :: Type varchar 
   * @returns $roleUsers-- Role Related User Array in the following format:
   *       $roleUsers=Array($userId1=>$userName,$userId2=>$userName,........,$userIdn=>$userName));
@@ -2426,7 +2426,7 @@
 	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."'";
+	$query = "select vtiger_user2role.*,vtiger_users.user_name from vtiger_user2role inner join vtiger_users on vtiger_users.id=vtiger_user2role.userid where roleid='".$roleId."'";
 	$result = $adb->query($query);
 	$num_rows=$adb->num_rows($result);
 	$roleRelatedUsers=Array();
@@ -2441,7 +2441,7 @@
 }
 
 
-/** Function to get the role related user ids
+/** Function to get the vtiger_role related user ids
   * @param $roleid -- RoleId :: Type varchar 
   * @returns $roleUserIds-- Role Related User Array in the following format:
   *       $roleUserIds=Array($userId1,$userId2,........,$userIdn);
@@ -2452,7 +2452,7 @@
 	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."'";
+	$query = "select vtiger_user2role.*,vtiger_users.user_name from vtiger_user2role inner join vtiger_users on vtiger_users.id=vtiger_user2role.userid where roleid='".$roleId."'";
 	$result = $adb->query($query);
 	$num_rows=$adb->num_rows($result);
 	$roleRelatedUsers=Array();
@@ -2466,7 +2466,7 @@
 
 }
 
-/** Function to get the role and subordinate users
+/** Function to get the vtiger_role and subordinate vtiger_users
   * @param $roleid -- RoleId :: Type varchar 
   * @returns $roleSubUsers-- Role and Subordinates Related Users Array in the following format:
   *       $roleSubUsers=Array($userId1=>$userName,$userId2=>$userName,........,$userIdn=>$userName));
@@ -2478,7 +2478,7 @@
 	global $adb;
 	$roleInfoArr=getRoleInformation($roleId);
 	$parentRole=$roleInfoArr[$roleId][1];
-	$query = "select user2role.*,users.user_name from user2role inner join users on users.id=user2role.userid inner join role on role.roleid=user2role.roleid where role.parentrole like '".$parentRole."%'";
+	$query = "select vtiger_user2role.*,vtiger_users.user_name from vtiger_user2role inner join vtiger_users on vtiger_users.id=vtiger_user2role.userid inner join vtiger_role on vtiger_role.roleid=vtiger_user2role.roleid where vtiger_role.parentrole like '".$parentRole."%'";
 	$result = $adb->query($query);
 	$num_rows=$adb->num_rows($result);
 	$roleRelatedUsers=Array();
@@ -2493,7 +2493,7 @@
 }
 
 
-/** Function to get the role and subordinate user ids
+/** Function to get the vtiger_role and subordinate user ids
   * @param $roleid -- RoleId :: Type varchar 
   * @returns $roleSubUserIds-- Role and Subordinates Related Users Array in the following format:
   *       $roleSubUserIds=Array($userId1,$userId2,........,$userIdn);
@@ -2505,7 +2505,7 @@
 	global $adb;
 	$roleInfoArr=getRoleInformation($roleId);
 	$parentRole=$roleInfoArr[$roleId][1];
-	$query = "select user2role.*,users.user_name from user2role inner join users on users.id=user2role.userid inner join role on role.roleid=user2role.roleid where role.parentrole like '".$parentRole."%'";
+	$query = "select vtiger_user2role.*,vtiger_users.user_name from vtiger_user2role inner join vtiger_users on vtiger_users.id=vtiger_user2role.userid inner join vtiger_role on vtiger_role.roleid=vtiger_user2role.roleid where vtiger_role.parentrole like '".$parentRole."%'";
 	$result = $adb->query($query);
 	$num_rows=$adb->num_rows($result);
 	$roleRelatedUsers=Array();
@@ -2519,7 +2519,7 @@
 
 }
 
-/** Function to get the role and subordinate Information for the specified roleId
+/** Function to get the vtiger_role and subordinate Information for the specified vtiger_roleId
   * @param $roleid -- RoleId :: Type varchar 
   * @returns $roleSubInfo-- Role and Subordinates Information array in the following format:
   *       $roleSubInfo=Array($roleId1=>Array($rolename,$parentrole,$roledepth,$immediateParent), $roleId2=>Array($rolename,$parentrole,$roledepth,$immediateParent),.....);
@@ -2533,7 +2533,7 @@
 	$roleInfo=$roleDetails[$roleId];
 	$roleParentSeq=$roleInfo[1];
 	
-	$query="select * from role where parentrole like '".$roleParentSeq."%' order by parentrole asc";
+	$query="select * from vtiger_role where parentrole like '".$roleParentSeq."%' order by parentrole asc";
 	$result=$adb->query($query);
 	$num_rows=$adb->num_rows($result);
 	$roleInfo=Array();
@@ -2556,7 +2556,7 @@
 }
 
 
-/** Function to get the role and subordinate role ids
+/** Function to get the vtiger_role and subordinate vtiger_role ids
   * @param $roleid -- RoleId :: Type varchar 
   * @returns $roleSubRoleIds-- Role and Subordinates RoleIds in an Array in the following format:
   *       $roleSubRoleIds=Array($roleId1,$roleId2,........,$roleIdn);
@@ -2570,7 +2570,7 @@
 	$roleInfo=$roleDetails[$roleId];
 	$roleParentSeq=$roleInfo[1];
 	
-	$query="select * from role where parentrole like '".$roleParentSeq."%' order by parentrole asc";
+	$query="select * from vtiger_role where parentrole like '".$roleParentSeq."%' order by parentrole asc";
 	$result=$adb->query($query);
 	$num_rows=$adb->num_rows($result);
 	$roleInfo=Array();
@@ -2585,9 +2585,9 @@
 
 }
 
-/** Function to get delete the spcified role 
+/** Function to get delete the spcified vtiger_role 
   * @param $roleid -- RoleId :: Type varchar 
-  * @param $transferRoleId -- RoleId to which users of the role that is being deleted are transferred:: Type varchar 
+  * @param $transferRoleId -- RoleId to which vtiger_users of the vtiger_role that is being deleted are transferred:: Type varchar 
  */
 function deleteRole($roleId,$transferRoleId)
 {
@@ -2598,26 +2598,26 @@
         foreach($roleInfo as $roleid=>$roleDetArr)
         {
 
-                $sql1 = "update user2role set roleid='".$transferRoleId."' where roleid='".$roleid."'";
+                $sql1 = "update vtiger_user2role set roleid='".$transferRoleId."' where roleid='".$roleid."'";
                 $adb->query($sql1);
 
-                //Deleteing from role2profile table
-                $sql2 = "delete from role2profile where roleid='".$roleid."'";
+                //Deleteing from vtiger_role2profile vtiger_table
+                $sql2 = "delete from vtiger_role2profile where roleid='".$roleid."'";
                 $adb->query($sql2);
 
-                //delete handling for groups
-                $sql10 = "delete from group2role where roleid='".$roleid."'";
+                //delete handling for vtiger_groups
+                $sql10 = "delete from vtiger_group2role where roleid='".$roleid."'";
                 $adb->query($sql10);
 
-                $sql11 = "delete from group2rs where roleandsubid='".$roleid."'";
+                $sql11 = "delete from vtiger_group2rs where roleandsubid='".$roleid."'";
                 $adb->query($sql11);
 
 
                 //delete handling for sharing rules
                 deleteRoleRelatedSharingRules($roleid);
 
-                //delete from role table;
-                $sql9 = "delete from role where roleid='".$roleid."'";
+                //delete from vtiger_role vtiger_table;
+                $sql9 = "delete from vtiger_role where roleid='".$roleid."'";
                 $adb->query($sql9);
                 //echo $sql1.'            '.$sql2.'           '.$sql9;
 
@@ -2628,7 +2628,7 @@
 
 }
 
-/** Function to delete the role related sharing rules
+/** Function to delete the vtiger_role related sharing rules
   * @param $roleid -- RoleId :: Type varchar
  */
 function deleteRoleRelatedSharingRules($roleId)
@@ -2636,14 +2636,14 @@
 	global $log;
 	$log->debug("Entering deleteRoleRelatedSharingRules(".$roleId.") method ...");
         global $adb;
-        $dataShareTableColArr=Array('datashare_grp2role'=>'to_roleid',
-                                    'datashare_grp2rs'=>'to_roleandsubid',
-                                    'datashare_role2group'=>'share_roleid',
-                                    'datashare_role2role'=>'share_roleid::to_roleid',
-                                    'datashare_role2rs'=>'share_roleid::to_roleandsubid',
-                                    'datashare_rs2grp'=>'share_roleandsubid',
-                                    'datashare_rs2role'=>'share_roleandsubid::to_roleid',
-                                    'datashare_rs2rs'=>'share_roleandsubid::to_roleandsubid');
+        $dataShareTableColArr=Array('vtiger_datashare_grp2role'=>'to_roleid',
+                                    'vtiger_datashare_grp2rs'=>'to_roleandsubid',
+                                    'vtiger_datashare_role2group'=>'share_roleid',
+                                    'vtiger_datashare_role2role'=>'share_roleid::to_roleid',
+                                    'vtiger_datashare_role2rs'=>'share_roleid::to_roleandsubid',
+                                    'vtiger_datashare_rs2grp'=>'share_roleandsubid',
+                                    'vtiger_datashare_rs2role'=>'share_roleandsubid::to_roleid',
+                                    'vtiger_datashare_rs2rs'=>'share_roleandsubid::to_roleandsubid');
 
         foreach($dataShareTableColArr as $tablename=>$colname)
         {
@@ -2676,11 +2676,11 @@
 	$log->debug("Entering deleteGroupRelatedSharingRules(".$grpId.") method ...");
 
         global $adb;
-        $dataShareTableColArr=Array('datashare_grp2grp'=>'share_groupid::to_groupid',
-                                    'datashare_grp2role'=>'share_groupid',
-                                    'datashare_grp2rs'=>'share_groupid',
-                                    'datashare_role2group'=>'to_groupid',
-                                    'datashare_rs2grp'=>'to_groupid');
+        $dataShareTableColArr=Array('vtiger_datashare_grp2grp'=>'share_groupid::to_groupid',
+                                    'vtiger_datashare_grp2role'=>'share_groupid',
+                                    'vtiger_datashare_grp2rs'=>'share_groupid',
+                                    'vtiger_datashare_role2group'=>'to_groupid',
+                                    'vtiger_datashare_rs2grp'=>'to_groupid');
 
 
         foreach($dataShareTableColArr as $tablename=>$colname)
@@ -2706,7 +2706,7 @@
 }
 
 
-/** Function to get userid and username of all users 
+/** Function to get userid and username of all vtiger_users 
   * @returns $userArray -- User Array in the following format:
   * $userArray=Array($userid1=>$username, $userid2=>$username,............,$useridn=>$username); 
  */
@@ -2715,7 +2715,7 @@
 	global $log;
 	$log->debug("Entering getAllUserName() method ...");
 	global $adb;
-	$query="select * from users where deleted=0";
+	$query="select * from vtiger_users where deleted=0";
 	$result = $adb->query($query);
 	$num_rows=$adb->num_rows($result);
 	$user_details=Array();
@@ -2732,7 +2732,7 @@
 }
 
 
-/** Function to get groupid and groupname of all groups 
+/** Function to get groupid and groupname of all vtiger_groups 
   * @returns $grpArray -- Group Array in the following format:
   * $grpArray=Array($grpid1=>$grpname, $grpid2=>$grpname,............,$grpidn=>$grpname); 
  */
@@ -2741,7 +2741,7 @@
 	global $log;
 	$log->debug("Entering getAllGroupName() method ...");
 	global $adb;
-	$query="select * from groups";
+	$query="select * from vtiger_groups";
 	$result = $adb->query($query);
 	$num_rows=$adb->num_rows($result);
 	$group_details=Array();
@@ -2757,7 +2757,7 @@
 
 }
 
-/** Function to get group information of all groups 
+/** Function to get group information of all vtiger_groups 
   * @returns $grpInfoArray -- Group Informaton array in the following format: 
   * $grpInfoArray=Array($grpid1=>Array($grpname,description) $grpid2=>Array($grpname,description),............,$grpidn=>Array($grpname,description)); 
  */
@@ -2766,7 +2766,7 @@
 	global $log;
 	$log->debug("Entering getAllGroupInfo() method ...");
 	global $adb;
-	$query="select * from groups";
+	$query="select * from vtiger_groups";
 	$result = $adb->query($query);
 	$num_rows=$adb->num_rows($result);
 	$group_details=Array();
@@ -2798,8 +2798,8 @@
 	$log->debug("Entering createGroup(".$groupName.",".$groupMemberArray.",".$description.") method ...");
 	global $adb;
 	$groupId=$adb->getUniqueId("groups");
-	//Insert into group table
-	$query = "insert into groups values(".$groupId.",'".$groupName."','".$description."')";
+	//Insert into group vtiger_table
+	$query = "insert into vtiger_groups values(".$groupId.",'".$groupName."','".$description."')";
 	$adb->query($query);
 
 	//Insert Group to Group Relation
@@ -2844,13 +2844,13 @@
 	global $log;
 	$log->debug("Entering insertGroupToGroupRelation(".$groupId.",".$containsGroupId.") method ...");
 	global $adb;
-	$query="insert into group2grouprel values(".$groupId.",".$containsGroupId.")";
+	$query="insert into vtiger_group2grouprel values(".$groupId.",".$containsGroupId.")";
 	$adb->query($query);
 	$log->debug("Exiting insertGroupToGroupRelation method ...");
 }
 
 
-/** Function to insert group to role relation 
+/** Function to insert group to vtiger_role relation 
   * @param $groupId -- Group Id :: Type integer 
   * @param $roleId -- Role Id :: Type varchar 
  */
@@ -2859,13 +2859,13 @@
 	 global $log;
 	$log->debug("Entering insertGroupToRoleRelation(".$groupId.",".$roleId.") method ...");
 	global $adb;
-	$query="insert into group2role values(".$groupId.",'".$roleId."')";
+	$query="insert into vtiger_group2role values(".$groupId.",'".$roleId."')";
 	$adb->query($query);
 	$log->debug("Exiting insertGroupToRoleRelation method ...");
 }
 
 
-/** Function to insert group to role&subordinate relation 
+/** Function to insert group to vtiger_role&subordinate relation 
   * @param $groupId -- Group Id :: Type integer 
   * @param $rsId -- Role Sub Id :: Type varchar 
  */
@@ -2874,7 +2874,7 @@
 	global $log;
 	$log->debug("Entering insertGroupToRsRelation(".$groupId.",".$rsId.") method ...");
 	global $adb;
-	$query="insert into group2rs values(".$groupId.",'".$rsId."')";
+	$query="insert into vtiger_group2rs values(".$groupId.",'".$rsId."')";
 	$adb->query($query);
 	$log->debug("Exiting insertGroupToRsRelation method ...");
 }
@@ -2888,7 +2888,7 @@
 	global $log;
 	$log->debug("Entering insertGroupToUserRelation(".$groupId.",".$userId.") method ...");
 	global $adb;
-	$query="insert into users2group values(".$groupId.",".$userId.")";
+	$query="insert into vtiger_users2group values(".$groupId.",".$userId.")";
 	$adb->query($query);
 	$log->debug("Exiting insertGroupToUserRelation method ...");
 }
@@ -2907,7 +2907,7 @@
 	$groupDetailArr=Array();
 	$groupMemberArr=Array();
 	//Retreving the group Info
-	$query="select * from groups where groupid=".$groupId;
+	$query="select * from vtiger_groups where groupid=".$groupId;
 	$result = $adb->query($query);
 	$groupName=$adb->query_result($result,0,'groupname');
 	$description=$adb->query_result($result,0,'description');
@@ -2936,7 +2936,7 @@
 
 	global $adb;
 	//Retreving the group Info
-	$query="select * from groups where groupid=".$groupId;
+	$query="select * from vtiger_groups where groupid=".$groupId;
 	$result = $adb->query($query);
 	$groupName=$adb->query_result($result,0,'groupname');
 	$log->debug("Exiting fetchGroupName method ...");
@@ -2971,7 +2971,7 @@
 	return($groupMemberArr);
 }
 
-/** Function to get the group related roles of the specified group 
+/** Function to get the group related vtiger_roles of the specified group 
   * @param $groupId -- Group Id :: Type integer 
   * @returns Group Related Role Array in the follwing format:
   *  $groupRoles=Array(roleid1,roleid2,roleid3,.....,roleidn);
@@ -2982,7 +2982,7 @@
 	$log->debug("Entering getGroupRelatedRoles(".$groupId.") method ...");
 	global $adb;
 	$roleGroupArr=Array();
-	$query="select * from group2role where groupid=".$groupId;
+	$query="select * from vtiger_group2role where groupid=".$groupId;
 	$result = $adb->query($query);
 	$num_rows=$adb->num_rows($result);
 	for($i=0;$i<$num_rows;$i++)
@@ -2996,7 +2996,7 @@
 }
 
 
-/** Function to get the group related roles and subordinates of the specified group 
+/** Function to get the group related vtiger_roles and subordinates of the specified group 
   * @param $groupId -- Group Id :: Type integer 
   * @returns Group Related Roles & Subordinate Array in the follwing format:
   *  $groupRoleSubordinates=Array(roleid1,roleid2,roleid3,.....,roleidn);
@@ -3007,7 +3007,7 @@
 	$log->debug("Entering getGroupRelatedRoleSubordinates(".$groupId.") method ...");
 	global $adb;
 	$rsGroupArr=Array();
-	$query="select * from group2rs where groupid=".$groupId;
+	$query="select * from vtiger_group2rs where groupid=".$groupId;
 	$result = $adb->query($query);
 	$num_rows=$adb->num_rows($result);
 	for($i=0;$i<$num_rows;$i++)
@@ -3020,7 +3020,7 @@
 }
 
 
-/** Function to get the group related groups  
+/** Function to get the group related vtiger_groups  
   * @param $groupId -- Group Id :: Type integer 
   * @returns Group Related Groups Array in the follwing format:
   *  $groupGroups=Array(grpid1,grpid2,grpid3,.....,grpidn);
@@ -3031,7 +3031,7 @@
 	$log->debug("Entering getGroupRelatedGroups(".$groupId.") method ...");
 	global $adb;
 	$groupGroupArr=Array();
-	$query="select * from group2grouprel where groupid=".$groupId;
+	$query="select * from vtiger_group2grouprel where groupid=".$groupId;
 	$result = $adb->query($query);
 	$num_rows=$adb->num_rows($result);
 	for($i=0;$i<$num_rows;$i++)
@@ -3044,7 +3044,7 @@
 			
 }
 
-/** Function to get the group related users  
+/** Function to get the group related vtiger_users  
   * @param $userId -- User Id :: Type integer 
   * @returns Group Related Users Array in the follwing format:
   *  $groupUsers=Array(userid1,userid2,userid3,.....,useridn);
@@ -3055,7 +3055,7 @@
 	$log->debug("Entering getGroupRelatedUsers(".$groupId.") method ...");
 	global $adb;
 	$userGroupArr=Array();
-	$query="select * from users2group where groupid=".$groupId;
+	$query="select * from vtiger_users2group where groupid=".$groupId;
 	$result = $adb->query($query);
 	$num_rows=$adb->num_rows($result);
 	for($i=0;$i<$num_rows;$i++)
@@ -3079,7 +3079,7 @@
 	global $log;
 	$log->debug("Entering updateGroup(".$groupId.",".$groupName.",".$groupMemberArray.",".$description.") method ...");
 	global $adb;
-	$query="update groups set groupname='".$groupName."',description='".$description."' where groupid=".$groupId;
+	$query="update vtiger_groups set groupname='".$groupName."',description='".$description."' where groupid=".$groupId;
 	$adb->query($query);
 
 	//Deleting the Group Member Relation
@@ -3129,7 +3129,7 @@
 	$log->debug("Entering deleteGroup(".$groupId.") method ...");	
 	global $adb;
 	deleteGroupRelatedSharingRules($groupId);		
-	$query="delete from groups where groupid=".$groupId;
+	$query="delete from vtiger_groups where groupid=".$groupId;
 	$adb->query($query);
 
 	deleteGroupRelatedGroups($groupId);
@@ -3148,13 +3148,13 @@
 	global $log;
 	$log->debug("Entering deleteGroupRelatedGroups(".$groupId.") method ...");
 	global $adb;
-	$query="delete from group2grouprel where groupid=".$groupId;
+	$query="delete from vtiger_group2grouprel where groupid=".$groupId;
 	$adb->query($query);
 	$log->debug("Exiting deleteGroupRelatedGroups method ...");
 }
 
 
-/** Function to delete group to role relation of the  specified group  
+/** Function to delete group to vtiger_role relation of the  specified group  
   * @param $groupId -- Group Id :: Type integer 
  */
 function deleteGroupRelatedRoles($groupId)
@@ -3162,13 +3162,13 @@
 	global $log;
 	$log->debug("Entering deleteGroupRelatedRoles(".$groupId.") method ...");
 	global $adb;
-	$query="delete from group2role where groupid=".$groupId;
+	$query="delete from vtiger_group2role where groupid=".$groupId;
 	$adb->query($query);
 	$log->debug("Exiting deleteGroupRelatedRoles method ...");
 }
 
 
-/** Function to delete group to role and subordinates relation of the  specified group  
+/** Function to delete group to vtiger_role and subordinates relation of the  specified group  
   * @param $groupId -- Group Id :: Type integer 
  */
 function deleteGroupRelatedRolesAndSubordinates($groupId)
@@ -3176,7 +3176,7 @@
 	global $log;
 	$log->debug("Entering deleteGroupRelatedRolesAndSubordinates(".$groupId.") method ...");
 	global $adb;
-	$query="delete from group2rs where groupid=".$groupId;
+	$query="delete from vtiger_group2rs where groupid=".$groupId;
 	$adb->query($query);
 	$log->debug("Exiting deleteGroupRelatedRolesAndSubordinates method ...");
 }
@@ -3190,7 +3190,7 @@
 	global $log;
 	$log->debug("Entering deleteGroupRelatedUsers(".$groupId.") method ...");
 	global $adb;
-	$query="delete from users2group where groupid=".$groupId;
+	$query="delete from vtiger_users2group where groupid=".$groupId;
 	$adb->query($query);
 	$log->debug("Exiting deleteGroupRelatedUsers method ...");
 }
@@ -3204,7 +3204,7 @@
 	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;
+	$query="select * from vtiger_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 ...");
@@ -3228,7 +3228,7 @@
 	$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;
+	$query = "select vtiger_org_share_action_mapping.share_action_name,vtiger_org_share_action2tab.share_action_id from vtiger_org_share_action2tab inner join vtiger_org_share_action_mapping on vtiger_org_share_action2tab.share_action_id=vtiger_org_share_action_mapping.share_action_id where vtiger_org_share_action2tab.tabid=".$tabid;
 	$result=$adb->query($query);
 	$num_rows=$adb->num_rows($result);
 	for($i=0; $i<$num_rows; $i++)
@@ -3245,8 +3245,8 @@
 /** This function adds a organisation level sharing rule for the specified Module
   * It takes the following input parameters:
   * 	$tabid -- Module tabid - Datatype::Integer
-  * 	$shareEntityType -- The Entity Type may be groups,roles,rs and users - Datatype::String
-  * 	$toEntityType -- The Entity Type may be groups,roles,rs and users - Datatype::String
+  * 	$shareEntityType -- The Entity Type may be vtiger_groups,roles,rs and vtiger_users - Datatype::String
+  * 	$toEntityType -- The Entity Type may be vtiger_groups,roles,rs and vtiger_users - Datatype::String
   * 	$shareEntityId -- The id of the group,role,rs,user to be shared 
   * 	$toEntityId -- The id of the group,role,rs,user to which the specified entity is to be shared
   * 	$sharePermisson -- This can have the following values:
@@ -3266,57 +3266,57 @@
 	if($shareEntityType == 'groups' && $toEntityType == 'groups')
 	{
 		$type_string='GRP::GRP';
-		$query = "insert into datashare_grp2grp values(".$shareid.", ".$shareEntityId.", ".$toEntityId.", ".$sharePermission.")";
+		$query = "insert into vtiger_datashare_grp2grp values(".$shareid.", ".$shareEntityId.", ".$toEntityId.", ".$sharePermission.")";
 	}
 	elseif($shareEntityType == 'groups' && $toEntityType == 'roles')
 	{
 		
 		$type_string='GRP::ROLE';
-		$query = "insert into datashare_grp2role values(".$shareid.", ".$shareEntityId.", '".$toEntityId."', ".$sharePermission.")";
+		$query = "insert into vtiger_datashare_grp2role values(".$shareid.", ".$shareEntityId.", '".$toEntityId."', ".$sharePermission.")";
 	}
 	elseif($shareEntityType == 'groups' && $toEntityType == 'rs')
 	{
 		
 		$type_string='GRP::RS';
-		$query = "insert into datashare_grp2rs values(".$shareid.", ".$shareEntityId.", '".$toEntityId."', ".$sharePermission.")";
+		$query = "insert into vtiger_datashare_grp2rs values(".$shareid.", ".$shareEntityId.", '".$toEntityId."', ".$sharePermission.")";
 	}
 	elseif($shareEntityType == 'roles' && $toEntityType == 'groups')
 	{
 		
 		$type_string='ROLE::GRP';
-		$query = "insert into datashare_role2group values(".$shareid.", '".$shareEntityId."', ".$toEntityId.", ".$sharePermission.")";
+		$query = "insert into vtiger_datashare_role2group values(".$shareid.", '".$shareEntityId."', ".$toEntityId.", ".$sharePermission.")";
 	}
 	elseif($shareEntityType == 'roles' && $toEntityType == 'roles')
 	{
 		
 		$type_string='ROLE::ROLE';
-		$query = "insert into datashare_role2role values(".$shareid.", '".$shareEntityId."', '".$toEntityId."', ".$sharePermission.")";
+		$query = "insert into vtiger_datashare_role2role values(".$shareid.", '".$shareEntityId."', '".$toEntityId."', ".$sharePermission.")";
 	}
 	elseif($shareEntityType == 'roles' && $toEntityType == 'rs')
 	{
 		
 		$type_string='ROLE::RS';
-		$query = "insert into datashare_role2rs values(".$shareid.", '".$shareEntityId."', '".$toEntityId."', ".$sharePermission.")";
+		$query = "insert into vtiger_datashare_role2rs values(".$shareid.", '".$shareEntityId."', '".$toEntityId."', ".$sharePermission.")";
 	}
 	elseif($shareEntityType == 'rs' && $toEntityType == 'groups')
 	{
 		
 		$type_string='RS::GRP';
-		$query = "insert into datashare_rs2grp values(".$shareid.", '".$shareEntityId."', ".$toEntityId.", ".$sharePermission.")";
+		$query = "insert into vtiger_datashare_rs2grp values(".$shareid.", '".$shareEntityId."', ".$toEntityId.", ".$sharePermission.")";
 	}
 	elseif($shareEntityType == 'rs' && $toEntityType == 'roles')
 	{
 		
 		$type_string='RS::ROLE';
-		$query = "insert into datashare_rs2role values(".$shareid.", '".$shareEntityId."', '".$toEntityId."', ".$sharePermission.")";
+		$query = "insert into vtiger_datashare_rs2role values(".$shareid.", '".$shareEntityId."', '".$toEntityId."', ".$sharePermission.")";
 	}
 	elseif($shareEntityType == 'rs' && $toEntityType == 'rs')
 	{
 		
 		$type_string='RS::RS';
-		$query = "insert into datashare_rs2rs values(".$shareid.", '".$shareEntityId."', '".$toEntityId."', ".$sharePermission.")";
-	}
-	$query1 = "insert into datashare_module_rel values(".$shareid.",".$tabid.",'".$type_string."')";
+		$query = "insert into vtiger_datashare_rs2rs values(".$shareid.", '".$shareEntityId."', '".$toEntityId."', ".$sharePermission.")";
+	}
+	$query1 = "insert into vtiger_datashare_module_rel values(".$shareid.",".$tabid.",'".$type_string."')";
 	$adb->query($query1);		
 	$adb->query($query);	
 	$log->debug("Exiting addSharingRule method ...");
@@ -3329,8 +3329,8 @@
   * It takes the following input parameters:
   *     $shareid -- Id of the Sharing Rule to be updated
   * 	$tabid -- Module tabid - Datatype::Integer
-  * 	$shareEntityType -- The Entity Type may be groups,roles,rs and users - Datatype::String
-  * 	$toEntityType -- The Entity Type may be groups,roles,rs and users - Datatype::String
+  * 	$shareEntityType -- The Entity Type may be vtiger_groups,roles,rs and vtiger_users - Datatype::String
+  * 	$toEntityType -- The Entity Type may be vtiger_groups,roles,rs and vtiger_users - Datatype::String
   * 	$shareEntityId -- The id of the group,role,rs,user to be shared 
   * 	$toEntityId -- The id of the group,role,rs,user to which the specified entity is to be shared
   * 	$sharePermisson -- This can have the following values:
@@ -3344,7 +3344,7 @@
 	$log->debug("Entering updateSharingRule(".$shareid.",".$tabid.",".$shareEntityType.",".$toEntityType.",".$shareEntityId.",".$toEntityId.",".$sharePermission.") method ...");
 	
 	global $adb;
-	$query2="select * from datashare_module_rel where shareid=".$shareid;
+	$query2="select * from vtiger_datashare_module_rel where shareid=".$shareid;
 	$res=$adb->query($query2);
 	$typestr=$adb->query_result($res,0,'relationtype');
 	$tabname=getDSTableNameForType($typestr);
@@ -3355,58 +3355,58 @@
 	if($shareEntityType == 'groups' && $toEntityType == 'groups')
 	{
 		$type_string='GRP::GRP';
-		$query = "insert into datashare_grp2grp values(".$shareid.", ".$shareEntityId.", ".$toEntityId.", ".$sharePermission.")";
+		$query = "insert into vtiger_datashare_grp2grp values(".$shareid.", ".$shareEntityId.", ".$toEntityId.", ".$sharePermission.")";
 	}
 	elseif($shareEntityType == 'groups' && $toEntityType == 'roles')
 	{
 		
 		$type_string='GRP::ROLE';
-		$query = "insert into datashare_grp2role values(".$shareid.", ".$shareEntityId.", '".$toEntityId."', ".$sharePermission.")";
+		$query = "insert into vtiger_datashare_grp2role values(".$shareid.", ".$shareEntityId.", '".$toEntityId."', ".$sharePermission.")";
 	}
 	elseif($shareEntityType == 'groups' && $toEntityType == 'rs')
 	{
 		
 		$type_string='GRP::RS';
-		$query = "insert into datashare_grp2rs values(".$shareid.", ".$shareEntityId.", '".$toEntityId."', ".$sharePermission.")";
+		$query = "insert into vtiger_datashare_grp2rs values(".$shareid.", ".$shareEntityId.", '".$toEntityId."', ".$sharePermission.")";
 	}
 	elseif($shareEntityType == 'roles' && $toEntityType == 'groups')
 	{
 		
 		$type_string='ROLE::GRP';
-		$query = "insert into datashare_role2group values(".$shareid.", '".$shareEntityId."', ".$toEntityId.", ".$sharePermission.")";
+		$query = "insert into vtiger_datashare_role2group values(".$shareid.", '".$shareEntityId."', ".$toEntityId.", ".$sharePermission.")";
 	}
 	elseif($shareEntityType == 'roles' && $toEntityType == 'roles')
 	{
 		
 		$type_string='ROLE::ROLE';
-		$query = "insert into datashare_role2role values(".$shareid.", '".$shareEntityId."', '".$toEntityId."', ".$sharePermission.")";
+		$query = "insert into vtiger_datashare_role2role values(".$shareid.", '".$shareEntityId."', '".$toEntityId."', ".$sharePermission.")";
 	}
 	elseif($shareEntityType == 'roles' && $toEntityType == 'rs')
 	{
 		
 		$type_string='ROLE::RS';
-		$query = "insert into datashare_role2rs values(".$shareid.", '".$shareEntityId."', '".$toEntityId."', ".$sharePermission.")";
+		$query = "insert into vtiger_datashare_role2rs values(".$shareid.", '".$shareEntityId."', '".$toEntityId."', ".$sharePermission.")";
 	}
 	elseif($shareEntityType == 'rs' && $toEntityType == 'groups')
 	{
 		
 		$type_string='RS::GRP';
-		$query = "insert into datashare_rs2grp values(".$shareid.", '".$shareEntityId."', ".$toEntityId.", ".$sharePermission.")";
+		$query = "insert into vtiger_datashare_rs2grp values(".$shareid.", '".$shareEntityId."', ".$toEntityId.", ".$sharePermission.")";
 	}
 	elseif($shareEntityType == 'rs' && $toEntityType == 'roles')
 	{
 		
 		$type_string='RS::ROLE';
-		$query = "insert into datashare_rs2role values(".$shareid.", '".$shareEntityId."', '".$toEntityId."', ".$sharePermission.")";
+		$query = "insert into vtiger_datashare_rs2role values(".$shareid.", '".$shareEntityId."', '".$toEntityId."', ".$sharePermission.")";
 	}
 	elseif($shareEntityType == 'rs' && $toEntityType == 'rs')
 	{
 		
 		$type_string='RS::RS';
-		$query = "insert into datashare_rs2rs values(".$shareid.", '".$shareEntityId."', '".$toEntityId."', ".$sharePermission.")";
-	}
-	
-	$query1 = "update datashare_module_rel set relationtype='".$type_string."' where shareid=".$shareid;
+		$query = "insert into vtiger_datashare_rs2rs values(".$shareid.", '".$shareEntityId."', '".$toEntityId."', ".$sharePermission.")";
+	}
+	
+	$query1 = "update vtiger_datashare_module_rel set relationtype='".$type_string."' where shareid=".$shareid;
 	$adb->query($query1);		
 	$adb->query($query);	
 	$log->debug("Exiting updateSharingRule method ...");
@@ -3424,17 +3424,17 @@
 	global $log;
 	$log->debug("Entering deleteSharingRule(".$shareid.") method ...");
 	global $adb;
-	$query2="select * from datashare_module_rel where shareid=".$shareid;
+	$query2="select * from vtiger_datashare_module_rel where shareid=".$shareid;
 	$res=$adb->query($query2);
 	$typestr=$adb->query_result($res,0,'relationtype');
 	$tabname=getDSTableNameForType($typestr);
 	$query3="delete from ".$tabname." where shareid=".$shareid;
 	$adb->query($query3);
-	$query4="delete from datashare_module_rel where shareid=".$shareid;
+	$query4="delete from vtiger_datashare_module_rel where shareid=".$shareid;
 	$adb->query($query4);
 
 	//deleting the releated module sharing permission
-	$query5="delete from datashare_relatedmodule_permission where shareid=".$shareid;
+	$query5="delete from vtiger_datashare_relatedmodule_permission where shareid=".$shareid;
 	$adb->query($query5);
 	$log->debug("Exiting deleteSharingRule method ...");
 	
@@ -3456,15 +3456,15 @@
 {
 	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',
-				    'datashare_role2group'=>'share_roleid::to_groupid',
-				    'datashare_role2role'=>'share_roleid::to_roleid',
-				    'datashare_role2rs'=>'share_roleid::to_roleandsubid',
-				    'datashare_rs2grp'=>'share_roleandsubid::to_groupid',
-				    'datashare_rs2role'=>'share_roleandsubid::to_roleid',
-				    'datashare_rs2rs'=>'share_roleandsubid::to_roleandsubid');
+	$dataShareTableColArr=Array('vtiger_datashare_grp2grp'=>'share_groupid::to_groupid',
+				    'vtiger_datashare_grp2role'=>'share_groupid::to_roleid',
+				    'vtiger_datashare_grp2rs'=>'share_groupid::to_roleandsubid',
+				    'vtiger_datashare_role2group'=>'share_roleid::to_groupid',
+				    'vtiger_datashare_role2role'=>'share_roleid::to_roleid',
+				    'vtiger_datashare_role2rs'=>'share_roleid::to_roleandsubid',
+				    'vtiger_datashare_rs2grp'=>'share_roleandsubid::to_groupid',
+				    'vtiger_datashare_rs2role'=>'share_roleandsubid::to_roleid',
+				    'vtiger_datashare_rs2rs'=>'share_roleandsubid::to_roleandsubid');
 	$log->debug("Exiting getDataShareTableandColumnArray method ...");
 	return $dataShareTableColArr;	
 					
@@ -3507,15 +3507,15 @@
 {
 	global $log;
 	$log->debug("Entering getDataShareTableName() method ...");
-	$dataShareTableColArr=Array('GRP::GRP'=>'datashare_grp2grp',
-				    'GRP::ROLE'=>'datashare_grp2role',
-				    'GRP::RS'=>'datashare_grp2rs',
-				    'ROLE::GRP'=>'datashare_role2group',
-				    'ROLE::ROLE'=>'datashare_role2role',
-				    'ROLE::RS'=>'datashare_role2rs',
-				    'RS::GRP'=>'datashare_rs2grp',
-				    'RS::ROLE'=>'datashare_rs2role',
-				    'RS::RS'=>'datashare_rs2rs');
+	$dataShareTableColArr=Array('GRP::GRP'=>'vtiger_datashare_grp2grp',
+				    'GRP::ROLE'=>'vtiger_datashare_grp2role',
+				    'GRP::RS'=>'vtiger_datashare_grp2rs',
+				    'ROLE::GRP'=>'vtiger_datashare_role2group',
+				    'ROLE::ROLE'=>'vtiger_datashare_role2role',
+				    'ROLE::RS'=>'vtiger_datashare_role2rs',
+				    'RS::GRP'=>'vtiger_datashare_rs2grp',
+				    'RS::ROLE'=>'vtiger_datashare_rs2role',
+				    'RS::RS'=>'vtiger_datashare_rs2rs');
 	$log->debug("Exiting getDataShareTableName method ...");
 	return $dataShareTableColArr;	
 					
@@ -3539,7 +3539,7 @@
 
 /** Function to get the Entity type from the specified DataShare Table Column Name
  *  @param $colname -- Datashare Table Column Name :: Type Varchar
- *  @returns The entity type. The entity type may be groups or roles or rs -- Type Varchar
+ *  @returns The entity type. The entity type may be vtiger_groups or vtiger_roles or rs -- Type Varchar
  */
 function getEntityTypeFromCol($colName)
 {
@@ -3566,7 +3566,7 @@
 
 /** Function to get the Entity Display Link
  *  @param $entityid -- Entity Id 
- *  @params $entityType --  The entity type may be groups or roles or rs -- Type Varchar
+ *  @params $entityType --  The entity type may be vtiger_groups or vtiger_roles or rs -- Type Varchar
  *  @returns the Entity Display link  
  */
 function getEntityDisplayLink($entityType,$entityid)
@@ -3605,7 +3605,7 @@
 	$log->debug("Entering getSharingRuleInfo(".$shareId.") method ...");
 	global $adb;
 	$shareRuleInfoArr=Array();
-	$query="select * from datashare_module_rel where shareid=".$shareId;
+	$query="select * from vtiger_datashare_module_rel where shareid=".$shareId;
 	$result=$adb->query($query);
 	//Retreving the Sharing Tabid
 	$tabid=$adb->query_result($result,0,'tabid');
@@ -3658,7 +3658,7 @@
 	$log->debug("Entering getRelatedSharingModules(".$tabid.") method ...");
 	global $adb;
 	$relatedSharingModuleArray=Array();
-	$query="select * from datashare_relatedmodules where tabid=".$tabid;
+	$query="select * from vtiger_datashare_relatedmodules where tabid=".$tabid;
 	$result=$adb->query($query);
 	$num_rows=$adb->num_rows($result);
 	for($i=0;$i<$num_rows;$i++)
@@ -3690,7 +3690,7 @@
 	$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.")" ;
+	$query="insert into vtiger_datashare_relatedmodule_permission values(".$shareid.", ".$relatedModuleSharingId.", ".$sharePermission.")" ;
 	$result=$adb->query($query);
 	$log->debug("Exiting addRelatedModuleSharingPermission method ...");
 }
@@ -3711,7 +3711,7 @@
 	$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;		
+	$query="update vtiger_datashare_relatedmodule_permission set permission=".$sharePermission." where shareid=".$shareid." and datashare_relatedmodule_id=".$relatedModuleSharingId;		
 	$result=$adb->query($query);
 	$log->debug("Exiting updateRelatedModuleSharingPermission method ...");
 }
@@ -3728,7 +3728,7 @@
 	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 ;
+	$query="select datashare_relatedmodule_id from vtiger_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 ...");
@@ -3752,7 +3752,7 @@
 	$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;
+	$query="select vtiger_datashare_relatedmodules.*,vtiger_datashare_relatedmodule_permission.permission from vtiger_datashare_relatedmodules inner join vtiger_datashare_relatedmodule_permission on vtiger_datashare_relatedmodule_permission.datashare_relatedmodule_id=vtiger_datashare_relatedmodules.datashare_relatedmodule_id where vtiger_datashare_relatedmodule_permission.shareid=".$shareid;
 	$result=$adb->query($query);
 	$num_rows=$adb->num_rows($result);
 	for($i=0;$i<$num_rows;$i++)
@@ -3769,10 +3769,10 @@
 }
 
 
-/** This function is to retreive the profiles associated with the  the specified user 
+/** This function is to retreive the vtiger_profiles associated with the  the specified user 
   * It takes the following input parameters:
   *     $userid -- The User Id:: Type Integer
-  *This function will return the profiles associated to the specified users in an Array in the following format:
+  *This function will return the vtiger_profiles associated to the specified vtiger_users in an Array in the following format:
   *     $userProfileArray=(profileid1,profileid2,profileid3,...,profileidn);
   */
 function getUserProfile($userId)
@@ -3782,7 +3782,7 @@
 	global $adb;
 	$roleId=fetchUserRole($userId);
 	$profArr=Array();	
-	$sql1 = "select profileid from role2profile where roleid='" .$roleId."'";
+	$sql1 = "select profileid from vtiger_role2profile where roleid='" .$roleId."'";
         $result1 = $adb->query($sql1);
 	$num_rows=$adb->num_rows($result1);
 	for($i=0;$i<$num_rows;$i++)
@@ -3796,7 +3796,7 @@
 	
 }
 
-/** To retreive the global permission of the specifed user from the various profiles associated with the user  
+/** To retreive the global permission of the specifed user from the various vtiger_profiles associated with the user  
   * @param $userid -- The User Id:: Type Integer
   * @returns  user global permission  array in the following format:
   *     $gloabalPerrArray=(view all action id=>permission,
@@ -3842,7 +3842,7 @@
 
 }
 
-/** To retreive the tab permissions of the specifed user from the various profiles associated with the user  
+/** To retreive the vtiger_tab permissions of the specifed user from the various vtiger_profiles associated with the user  
   * @param $userid -- The User Id:: Type Integer
   * @returns  user global permission  array in the following format:
   *     $tabPerrArray=(tabid1=>permission,
@@ -3887,7 +3887,7 @@
 
 }
 
-/** To retreive the tab acion permissions of the specifed user from the various profiles associated with the user  
+/** To retreive the vtiger_tab acion permissions of the specifed user from the various vtiger_profiles associated with the user  
   * @param $userid -- The User Id:: Type Integer
   * @returns  user global permission  array in the following format:
   *     $actionPerrArray=(tabid1=>permission,
@@ -3935,9 +3935,9 @@
 
 }
 
-/** To retreive the parent role of the specified role 
+/** To retreive the parent vtiger_role of the specified vtiger_role 
   * @param $roleid -- The Role Id:: Type varchar
-  * @returns  parent role array in the following format:
+  * @returns  parent vtiger_role array in the following format:
   *     $parentRoleArray=(roleid1,roleid2,.......,roleidn);
  */
 function getParentRole($roleId)
@@ -3960,9 +3960,9 @@
 	
 }
 
-/** To retreive the subordinate roles of the specified parent role  
+/** To retreive the subordinate vtiger_roles of the specified parent vtiger_role  
   * @param $roleid -- The Role Id:: Type varchar
-  * @returns  subordinate role array in the following format:
+  * @returns  subordinate vtiger_role array in the following format:
   *     $subordinateRoleArray=(roleid1,roleid2,.......,roleidn);
  */
 function getRoleSubordinates($roleId)
@@ -3974,7 +3974,7 @@
 	$roleInfo=$roleDetails[$roleId];
 	$roleParentSeq=$roleInfo[1];
 	
-	$query="select * from role where parentrole like '".$roleParentSeq."::%' order by parentrole asc";
+	$query="select * from vtiger_role where parentrole like '".$roleParentSeq."::%' order by parentrole asc";
 	$result=$adb->query($query);
 	$num_rows=$adb->num_rows($result);
 	$roleSubordinates=Array();
@@ -3990,14 +3990,14 @@
 
 }
 
-/** To retreive the subordinate roles and users of the specified parent role  
+/** To retreive the subordinate vtiger_roles and vtiger_users of the specified parent vtiger_role  
   * @param $roleid -- The Role Id:: Type varchar
-  * @returns  subordinate role array in the following format:
+  * @returns  subordinate vtiger_role array in the following format:
   *     $subordinateRoleUserArray=(roleid1=>Array(userid1,userid2,userid3),
-                               roleid2=>Array(userid1,userid2,userid3)
+                               vtiger_roleid2=>Array(userid1,userid2,userid3)
 				                |
 						|
-			       roleidn=>Array(userid1,userid2,userid3));
+			       vtiger_roleidn=>Array(userid1,userid2,userid3));
  */
 function getSubordinateRoleAndUsers($roleId)
 {
@@ -4102,7 +4102,7 @@
 	global $current_user;
 	$user_array=Array();
 	$tabid=getTabid($module);
-	$query = "select shareduserid from tmp_read_user_sharing_per where userid=".$current_user->id." and tabid=".$tabid;
+	$query = "select shareduserid from vtiger_tmp_read_user_sharing_per where userid=".$current_user->id." and tabid=".$tabid;
 	$result=$adb->query($query);
 	$num_rows=$adb->num_rows($result);
 	for($i=0;$i<$num_rows;$i++)
@@ -4123,7 +4123,7 @@
 	global $current_user;
 	$grp_array=Array();
 	$tabid=getTabid($module);
-	$query = "select sharedgroupid from tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid;
+	$query = "select sharedgroupid from vtiger_tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid;
 	$result=$adb->query($query);
 	$num_rows=$adb->num_rows($result);
 	for($i=0;$i<$num_rows;$i++)
@@ -4144,7 +4144,7 @@
 	global $current_user;
 	$grp_array=Array();
 	$tabid=getTabid($module);
-	$query = "select sharedgroupid from tmp_write_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid;
+	$query = "select sharedgroupid from vtiger_tmp_write_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid;
 	$result=$adb->query($query);
 	$num_rows=$adb->num_rows($result);
 	for($i=0;$i<$num_rows;$i++)
@@ -4205,172 +4205,172 @@
 
 	if($module == 'Leads')
 	{
-		$sec_query .= "and (crmentity.smownerid in($current_user->id) or crmentity.smownerid in(select user2role.userid from user2role inner join users on users.id=user2role.userid inner join role on role.roleid=user2role.roleid where role.parentrole like '".$current_user_parent_role_seq."::%') or crmentity.smownerid in(select shareduserid from tmp_read_user_sharing_per where userid=".$current_user->id." and tabid=".$tabid.") or (crmentity.smownerid in (0) and (";
+		$sec_query .= "and (vtiger_crmentity.smownerid in($current_user->id) or vtiger_crmentity.smownerid in(select vtiger_user2role.userid from vtiger_user2role inner join vtiger_users on vtiger_users.id=vtiger_user2role.userid inner join vtiger_role on vtiger_role.roleid=vtiger_user2role.roleid where vtiger_role.parentrole like '".$current_user_parent_role_seq."::%') or vtiger_crmentity.smownerid in(select shareduserid from vtiger_tmp_read_user_sharing_per where userid=".$current_user->id." and tabid=".$tabid.") or (vtiger_crmentity.smownerid in (0) and (";
 
                         if(sizeof($current_user_groups) > 0)
                         {
                               $sec_query .= "groups.groupid in".getCurrentUserGroupList()." or ";
                         }
-                         $sec_query .= "groups.groupid in(select tmp_read_group_sharing_per.sharedgroupid from tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";	
+                         $sec_query .= "groups.groupid in(select vtiger_tmp_read_group_sharing_per.sharedgroupid from vtiger_tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";	
 	}
 	elseif($module == 'Accounts')
 	{
-		$sec_query .= "and (crmentity.smownerid in($current_user->id) or crmentity.smownerid in(select user2role.userid from user2role inner join users on users.id=user2role.userid inner join role on role.roleid=user2role.roleid where role.parentrole like '".$current_user_parent_role_seq."::%') or crmentity.smownerid in(select shareduserid from tmp_read_user_sharing_per where userid=".$current_user->id." and tabid=".$tabid.") or (crmentity.smownerid in (0) and (";
+		$sec_query .= "and (vtiger_crmentity.smownerid in($current_user->id) or vtiger_crmentity.smownerid in(select vtiger_user2role.userid from vtiger_user2role inner join vtiger_users on vtiger_users.id=vtiger_user2role.userid inner join vtiger_role on vtiger_role.roleid=vtiger_user2role.roleid where vtiger_role.parentrole like '".$current_user_parent_role_seq."::%') or vtiger_crmentity.smownerid in(select shareduserid from vtiger_tmp_read_user_sharing_per where userid=".$current_user->id." and tabid=".$tabid.") or (vtiger_crmentity.smownerid in (0) and (";
 
                 if(sizeof($current_user_groups) > 0)
                 {
                 	$sec_query .= "groups.groupid in".getCurrentUserGroupList()." or ";
                 }
-		$sec_query .= "groups.groupid in(select tmp_read_group_sharing_per.sharedgroupid from tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";			
+		$sec_query .= "groups.groupid in(select vtiger_tmp_read_group_sharing_per.sharedgroupid from vtiger_tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";			
 	
 	}
 	elseif($module == 'Contacts')
 	{
-		$sec_query .= "and (crmentity.smownerid in($current_user->id) or crmentity.smownerid in(select user2role.userid from user2role inner join users on users.id=user2role.userid inner join role on role.roleid=user2role.roleid where role.parentrole like '".$current_user_parent_role_seq."::%') or crmentity.smownerid in(select shareduserid from tmp_read_user_sharing_per where userid=".$current_user->id." and tabid=".$tabid.") or (crmentity.smownerid in (0) and (";
+		$sec_query .= "and (vtiger_crmentity.smownerid in($current_user->id) or vtiger_crmentity.smownerid in(select vtiger_user2role.userid from vtiger_user2role inner join vtiger_users on vtiger_users.id=vtiger_user2role.userid inner join vtiger_role on vtiger_role.roleid=vtiger_user2role.roleid where vtiger_role.parentrole like '".$current_user_parent_role_seq."::%') or vtiger_crmentity.smownerid in(select shareduserid from vtiger_tmp_read_user_sharing_per where userid=".$current_user->id." and tabid=".$tabid.") or (vtiger_crmentity.smownerid in (0) and (";
 
                 if(sizeof($current_user_groups) > 0)
                 {
                 	$sec_query .= "groups.groupid in".getCurrentUserGroupList()." or ";
                 }
-		$sec_query .= "groups.groupid in(select tmp_read_group_sharing_per.sharedgroupid from tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";			
+		$sec_query .= "groups.groupid in(select vtiger_tmp_read_group_sharing_per.sharedgroupid from vtiger_tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";			
 	
 	}
 	elseif($module == 'Potentials')
 	{
-		$sec_query .= "and (crmentity.smownerid in($current_user->id) or crmentity.smownerid in(select user2role.userid from user2role inner join users on users.id=user2role.userid inner join role on role.roleid=user2role.roleid where role.parentrole like '".$current_user_parent_role_seq."::%') or crmentity.smownerid in(select shareduserid from tmp_read_user_sharing_per where userid=".$current_user->id." and tabid=".$tabid.") or potential.accountid in (select crmid from crmentity where setype='accounts' and crmentity.smownerid in(select shareduserid from tmp_read_user_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Accounts')." and relatedtabid=".$tabid.")) or potential.accountid in (select crmid from crmentity left join accountgrouprelation on accountgrouprelation.accountid=crmentity.crmid inner join groups on groups.groupname=accountgrouprelation.groupname where setype='Accounts' and crmentity.smownerid=0 and groups.groupid in(select tmp_read_group_rel_sharing_per.sharedgroupid from tmp_read_group_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Accounts')." and relatedtabid=".$tabid.")) or (crmentity.smownerid in (0) and (";
+		$sec_query .= "and (vtiger_crmentity.smownerid in($current_user->id) or vtiger_crmentity.smownerid in(select vtiger_user2role.userid from vtiger_user2role inner join vtiger_users on vtiger_users.id=vtiger_user2role.userid inner join vtiger_role on vtiger_role.roleid=vtiger_user2role.roleid where vtiger_role.parentrole like '".$current_user_parent_role_seq."::%') or vtiger_crmentity.smownerid in(select shareduserid from vtiger_tmp_read_user_sharing_per where userid=".$current_user->id." and tabid=".$tabid.") or vtiger_potential.accountid in (select crmid from vtiger_crmentity where setype='accounts' and vtiger_crmentity.smownerid in(select shareduserid from vtiger_tmp_read_user_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Accounts')." and relatedtabid=".$tabid.")) or vtiger_potential.accountid in (select crmid from vtiger_crmentity left join vtiger_accountgrouprelation on vtiger_accountgrouprelation.accountid=vtiger_crmentity.crmid inner join vtiger_groups on vtiger_groups.groupname=vtiger_accountgrouprelation.groupname where setype='Accounts' and vtiger_crmentity.smownerid=0 and vtiger_groups.groupid in(select vtiger_tmp_read_group_rel_sharing_per.sharedgroupid from vtiger_tmp_read_group_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Accounts')." and relatedtabid=".$tabid.")) or (vtiger_crmentity.smownerid in (0) and (";
 
                 if(sizeof($current_user_groups) > 0)
                 {
                 	$sec_query .= "groups.groupid in".getCurrentUserGroupList()." or ";
                 }
-		$sec_query .= "groups.groupid in(select tmp_read_group_sharing_per.sharedgroupid from tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";			
+		$sec_query .= "groups.groupid in(select vtiger_tmp_read_group_sharing_per.sharedgroupid from vtiger_tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";			
 	
 	}
 	elseif($module == 'HelpDesk')
 	{
-		$sec_query .= "and (crmentity.smownerid in($current_user->id) or crmentity.smownerid in(select user2role.userid from user2role inner join users on users.id=user2role.userid inner join role on role.roleid=user2role.roleid where role.parentrole like '".$current_user_parent_role_seq."::%') or crmentity.smownerid in(select shareduserid from tmp_read_user_sharing_per where userid=".$current_user->id." and tabid=".$tabid.") or troubletickets.parent_id in (select crmid from crmentity where setype='Accounts' and crmentity.smownerid in(select shareduserid from tmp_read_user_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Accounts')." and relatedtabid=".$tabid.")) or troubletickets.parent_id in (select crmid from crmentity left join accountgrouprelation on accountgrouprelation.accountid=crmentity.crmid inner join groups on groups.groupname=accountgrouprelation.groupname where setype='Accounts' and crmentity.smownerid=0 and groups.groupid in(select tmp_read_group_rel_sharing_per.sharedgroupid from tmp_read_group_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Accounts')." and relatedtabid=".$tabid.")) or (crmentity.smownerid in (0) and (";
+		$sec_query .= "and (vtiger_crmentity.smownerid in($current_user->id) or vtiger_crmentity.smownerid in(select vtiger_user2role.userid from vtiger_user2role inner join vtiger_users on vtiger_users.id=vtiger_user2role.userid inner join vtiger_role on vtiger_role.roleid=vtiger_user2role.roleid where vtiger_role.parentrole like '".$current_user_parent_role_seq."::%') or vtiger_crmentity.smownerid in(select shareduserid from vtiger_tmp_read_user_sharing_per where userid=".$current_user->id." and tabid=".$tabid.") or vtiger_troubletickets.parent_id in (select crmid from vtiger_crmentity where setype='Accounts' and vtiger_crmentity.smownerid in(select shareduserid from vtiger_tmp_read_user_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Accounts')." and relatedtabid=".$tabid.")) or vtiger_troubletickets.parent_id in (select crmid from vtiger_crmentity left join vtiger_accountgrouprelation on vtiger_accountgrouprelation.accountid=vtiger_crmentity.crmid inner join vtiger_groups on vtiger_groups.groupname=vtiger_accountgrouprelation.groupname where setype='Accounts' and vtiger_crmentity.smownerid=0 and vtiger_groups.groupid in(select vtiger_tmp_read_group_rel_sharing_per.sharedgroupid from vtiger_tmp_read_group_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Accounts')." and relatedtabid=".$tabid.")) or (vtiger_crmentity.smownerid in (0) and (";
 
                 if(sizeof($current_user_groups) > 0)
                 {
                 	$sec_query .= "groups.groupid in".getCurrentUserGroupList()." or ";
                 }
-		$sec_query .= "groups.groupid in(select tmp_read_group_sharing_per.sharedgroupid from tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";			
+		$sec_query .= "groups.groupid in(select vtiger_tmp_read_group_sharing_per.sharedgroupid from vtiger_tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";			
 	
 	}
 	elseif($module == 'Emails')
 	{
 		echo '<BR>now<BR>'; 
-		$sec_query .= "and (crmentity.smownerid in($current_user->id) or crmentity.smownerid in(select user2role.userid from user2role inner join users on users.id=user2role.userid inner join role on role.roleid=user2role.roleid where role.parentrole like '".$current_user_parent_role_seq."::%') or crmentity.smownerid in(select shareduserid from tmp_read_user_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")";
-
-		//Adding crterial for account related emails sharing
-		 $sec_query .= "or seactivityrel.crmid in (select crmid from crmentity where setype='Accounts' and crmentity.smownerid in(select shareduserid from tmp_read_user_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Accounts')." and relatedtabid=".$tabid.")) or seactivityrel.crmid in (select crmid from crmentity left join accountgrouprelation on accountgrouprelation.accountid=crmentity.crmid inner join groups on groups.groupname=accountgrouprelation.groupname where setype='Accounts' and crmentity.smownerid=0 and groups.groupid in(select tmp_read_group_rel_sharing_per.sharedgroupid from tmp_read_group_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Accounts')." and relatedtabid=".$tabid."))";
+		$sec_query .= "and (vtiger_crmentity.smownerid in($current_user->id) or vtiger_crmentity.smownerid in(select vtiger_user2role.userid from vtiger_user2role inner join vtiger_users on vtiger_users.id=vtiger_user2role.userid inner join vtiger_role on vtiger_role.roleid=vtiger_user2role.roleid where vtiger_role.parentrole like '".$current_user_parent_role_seq."::%') or vtiger_crmentity.smownerid in(select shareduserid from vtiger_tmp_read_user_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")";
+
+		//Adding crterial for vtiger_account related emails sharing
+		 $sec_query .= "or vtiger_seactivityrel.crmid in (select crmid from vtiger_crmentity where setype='Accounts' and vtiger_crmentity.smownerid in(select shareduserid from vtiger_tmp_read_user_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Accounts')." and relatedtabid=".$tabid.")) or vtiger_seactivityrel.crmid in (select crmid from vtiger_crmentity left join vtiger_accountgrouprelation on vtiger_accountgrouprelation.accountid=vtiger_crmentity.crmid inner join vtiger_groups on vtiger_groups.groupname=vtiger_accountgrouprelation.groupname where setype='Accounts' and vtiger_crmentity.smownerid=0 and vtiger_groups.groupid in(select vtiger_tmp_read_group_rel_sharing_per.sharedgroupid from vtiger_tmp_read_group_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Accounts')." and relatedtabid=".$tabid."))";
 		//Adding crterial for lead related emails sharing
-		 $sec_query .= " or seactivityrel.crmid in (select crmid from crmentity where setype='Leads' and crmentity.smownerid in(select shareduserid from tmp_read_user_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Leads')." and relatedtabid=".$tabid.")) or seactivityrel.crmid in (select crmid from crmentity left join leadgrouprelation on leadgrouprelation.leadid=crmentity.crmid inner join groups on groups.groupname=leadgrouprelation.groupname where setype='Leads' and crmentity.smownerid=0 and groups.groupid in(select tmp_read_group_rel_sharing_per.sharedgroupid from tmp_read_group_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Leads')." and relatedtabid=".$tabid."))";
+		 $sec_query .= " or vtiger_seactivityrel.crmid in (select crmid from vtiger_crmentity where setype='Leads' and vtiger_crmentity.smownerid in(select shareduserid from vtiger_tmp_read_user_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Leads')." and relatedtabid=".$tabid.")) or vtiger_seactivityrel.crmid in (select crmid from vtiger_crmentity left join vtiger_leadgrouprelation on vtiger_leadgrouprelation.leadid=vtiger_crmentity.crmid inner join vtiger_groups on vtiger_groups.groupname=vtiger_leadgrouprelation.groupname where setype='Leads' and vtiger_crmentity.smownerid=0 and vtiger_groups.groupid in(select vtiger_tmp_read_group_rel_sharing_per.sharedgroupid from vtiger_tmp_read_group_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Leads')." and relatedtabid=".$tabid."))";
 	
 
 		//Adding crteria for group sharing
-		 $sec_query .= " or (crmentity.smownerid in (0) and (";
+		 $sec_query .= " or (vtiger_crmentity.smownerid in (0) and (";
 
                 if(sizeof($current_user_groups) > 0)
                 {
                 	$sec_query .= "groups.groupid in".getCurrentUserGroupList()." or ";
                 }
-		$sec_query .= "groups.groupid in(select tmp_read_group_sharing_per.sharedgroupid from tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";
+		$sec_query .= "groups.groupid in(select vtiger_tmp_read_group_sharing_per.sharedgroupid from vtiger_tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";
 	
 	}
 	elseif($module == 'Activities')
 	{
-		$sec_query .= "and (crmentity.smownerid in($current_user->id) or crmentity.smownerid in(select user2role.userid from user2role inner join users on users.id=user2role.userid inner join role on role.roleid=user2role.roleid where role.parentrole like '".$current_user_parent_role_seq."::%')";
+		$sec_query .= "and (vtiger_crmentity.smownerid in($current_user->id) or vtiger_crmentity.smownerid in(select vtiger_user2role.userid from vtiger_user2role inner join vtiger_users on vtiger_users.id=vtiger_user2role.userid inner join vtiger_role on vtiger_role.roleid=vtiger_user2role.roleid where vtiger_role.parentrole like '".$current_user_parent_role_seq."::%')";
 
 		if(sizeof($current_user_groups) > 0)
 		{
-			$sec_query .= " or (crmentity.smownerid in (0) and (groups.groupid in".getCurrentUserGroupList()."))";
+			$sec_query .= " or (vtiger_crmentity.smownerid in (0) and (vtiger_groups.groupid in".getCurrentUserGroupList()."))";
 		}
 		$sec_query .= ")";	
 	}
 	elseif($module == 'Quotes')
 	{
-		$sec_query .= "and (crmentity.smownerid in($current_user->id) or crmentity.smownerid in(select user2role.userid from user2role inner join users on users.id=user2role.userid inner join role on role.roleid=user2role.roleid where role.parentrole like '".$current_user_parent_role_seq."::%') or crmentity.smownerid in(select shareduserid from tmp_read_user_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")";
-
-		//Adding crterial for account related quotes sharing
-		 $sec_query .= "or quotes.accountid in (select crmid from crmentity where setype='Accounts' and crmentity.smownerid in(select shareduserid from tmp_read_user_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Accounts')." and relatedtabid=".$tabid.")) or quotes.accountid in (select crmid from crmentity left join accountgrouprelation on accountgrouprelation.accountid=crmentity.crmid inner join groups on groups.groupname=accountgrouprelation.groupname where setype='Accounts' and crmentity.smownerid=0 and groups.groupid in(select tmp_read_group_rel_sharing_per.sharedgroupid from tmp_read_group_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Accounts')." and relatedtabid=".$tabid."))";
-		//Adding crterial for potential related quotes sharing
-		 $sec_query .= " or quotes.potentialid in (select crmid from crmentity where setype='Potentials' and crmentity.smownerid in(select shareduserid from tmp_read_user_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Potentials')." and relatedtabid=".$tabid.")) or quotes.potentialid in (select crmid from crmentity left join potentialgrouprelation on potentialgrouprelation.potentialid=crmentity.crmid inner join groups on groups.groupname=potentialgrouprelation.groupname where setype='Potentials' and crmentity.smownerid=0 and groups.groupid in(select tmp_read_group_rel_sharing_per.sharedgroupid from tmp_read_group_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Potentials')." and relatedtabid=".$tabid."))";
+		$sec_query .= "and (vtiger_crmentity.smownerid in($current_user->id) or vtiger_crmentity.smownerid in(select vtiger_user2role.userid from vtiger_user2role inner join vtiger_users on vtiger_users.id=vtiger_user2role.userid inner join vtiger_role on vtiger_role.roleid=vtiger_user2role.roleid where vtiger_role.parentrole like '".$current_user_parent_role_seq."::%') or vtiger_crmentity.smownerid in(select shareduserid from vtiger_tmp_read_user_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")";
+
+		//Adding crterial for vtiger_account related vtiger_quotes sharing
+		 $sec_query .= "or vtiger_quotes.accountid in (select crmid from vtiger_crmentity where setype='Accounts' and vtiger_crmentity.smownerid in(select shareduserid from vtiger_tmp_read_user_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Accounts')." and relatedtabid=".$tabid.")) or vtiger_quotes.accountid in (select crmid from vtiger_crmentity left join vtiger_accountgrouprelation on vtiger_accountgrouprelation.accountid=vtiger_crmentity.crmid inner join vtiger_groups on vtiger_groups.groupname=vtiger_accountgrouprelation.groupname where setype='Accounts' and vtiger_crmentity.smownerid=0 and vtiger_groups.groupid in(select vtiger_tmp_read_group_rel_sharing_per.sharedgroupid from vtiger_tmp_read_group_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Accounts')." and relatedtabid=".$tabid."))";
+		//Adding crterial for vtiger_potential related vtiger_quotes sharing
+		 $sec_query .= " or vtiger_quotes.potentialid in (select crmid from vtiger_crmentity where setype='Potentials' and vtiger_crmentity.smownerid in(select shareduserid from vtiger_tmp_read_user_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Potentials')." and relatedtabid=".$tabid.")) or vtiger_quotes.potentialid in (select crmid from vtiger_crmentity left join vtiger_potentialgrouprelation on vtiger_potentialgrouprelation.potentialid=vtiger_crmentity.crmid inner join vtiger_groups on vtiger_groups.groupname=vtiger_potentialgrouprelation.groupname where setype='Potentials' and vtiger_crmentity.smownerid=0 and vtiger_groups.groupid in(select vtiger_tmp_read_group_rel_sharing_per.sharedgroupid from vtiger_tmp_read_group_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Potentials')." and relatedtabid=".$tabid."))";
 	
 
 		//Adding crteria for group sharing
-		 $sec_query .= " or (crmentity.smownerid in (0) and (";
+		 $sec_query .= " or (vtiger_crmentity.smownerid in (0) and (";
 
                 if(sizeof($current_user_groups) > 0)
                 {
                 	$sec_query .= "groups.groupid in".getCurrentUserGroupList()." or ";
                 }
-		$sec_query .= "groups.groupid in(select tmp_read_group_sharing_per.sharedgroupid from tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";			
+		$sec_query .= "groups.groupid in(select vtiger_tmp_read_group_sharing_per.sharedgroupid from vtiger_tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";			
 	
 	}	
 	elseif($module == 'PurchaseOrder')
 	{
-		$sec_query .= "and (crmentity.smownerid in($current_user->id) or crmentity.smownerid in(select user2role.userid from user2role inner join users on users.id=user2role.userid inner join role on role.roleid=user2role.roleid where role.parentrole like '".$current_user_parent_role_seq."::%') or crmentity.smownerid in(select shareduserid from tmp_read_user_sharing_per where userid=".$current_user->id." and tabid=".$tabid.") or (crmentity.smownerid in (0) and (";
+		$sec_query .= "and (vtiger_crmentity.smownerid in($current_user->id) or vtiger_crmentity.smownerid in(select vtiger_user2role.userid from vtiger_user2role inner join vtiger_users on vtiger_users.id=vtiger_user2role.userid inner join vtiger_role on vtiger_role.roleid=vtiger_user2role.roleid where vtiger_role.parentrole like '".$current_user_parent_role_seq."::%') or vtiger_crmentity.smownerid in(select shareduserid from vtiger_tmp_read_user_sharing_per where userid=".$current_user->id." and tabid=".$tabid.") or (vtiger_crmentity.smownerid in (0) and (";
 
                 if(sizeof($current_user_groups) > 0)
                 {
                 	$sec_query .= "groups.groupid in".getCurrentUserGroupList()." or ";
                 }
-		$sec_query .= "groups.groupid in(select tmp_read_group_sharing_per.sharedgroupid from tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";			
+		$sec_query .= "groups.groupid in(select vtiger_tmp_read_group_sharing_per.sharedgroupid from vtiger_tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";			
 	
 	}
 	elseif($module == 'SalesOrder')
 	{
-		$sec_query .= "and (crmentity.smownerid in($current_user->id) or crmentity.smownerid in(select user2role.userid from user2role inner join users on users.id=user2role.userid inner join role on role.roleid=user2role.roleid where role.parentrole like '".$current_user_parent_role_seq."::%') or crmentity.smownerid in(select shareduserid from tmp_read_user_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")";
-
-		//Adding crterial for account related so sharing
-		 $sec_query .= "or salesorder.accountid in (select crmid from crmentity where setype='Accounts' and crmentity.smownerid in(select shareduserid from tmp_read_user_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Accounts')." and relatedtabid=".$tabid.")) or salesorder.accountid in (select crmid from crmentity left join accountgrouprelation on accountgrouprelation.accountid=crmentity.crmid inner join groups on groups.groupname=accountgrouprelation.groupname where setype='Accounts' and crmentity.smownerid=0 and groups.groupid in(select tmp_read_group_rel_sharing_per.sharedgroupid from tmp_read_group_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Accounts')." and relatedtabid=".$tabid."))";
-		//Adding crterial for potential related so sharing
-		 $sec_query .= " or salesorder.potentialid in (select crmid from crmentity where setype='Potentials' and crmentity.smownerid in(select shareduserid from tmp_read_user_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Potentials')." and relatedtabid=".$tabid.")) or salesorder.potentialid in (select crmid from crmentity left join potentialgrouprelation on potentialgrouprelation.potentialid=crmentity.crmid inner join groups on groups.groupname=potentialgrouprelation.groupname where setype='Potentials' and crmentity.smownerid=0 and groups.groupid in(select tmp_read_group_rel_sharing_per.sharedgroupid from tmp_read_group_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Potentials')." and relatedtabid=".$tabid."))";
-		//Adding crterial for quotes related so sharing
-		 $sec_query .= " or salesorder.quoteid in (select crmid from crmentity where setype='Quotes' and crmentity.smownerid in(select shareduserid from tmp_read_user_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Quotes')." and relatedtabid=".$tabid.")) or salesorder.quoteid in (select crmid from crmentity left join quotegrouprelation on quotegrouprelation.quoteid=crmentity.crmid inner join groups on groups.groupname=quotegrouprelation.groupname where setype='Quotes' and crmentity.smownerid=0 and groups.groupid in(select tmp_read_group_rel_sharing_per.sharedgroupid from tmp_read_group_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Quotes')." and relatedtabid=".$tabid."))";
+		$sec_query .= "and (vtiger_crmentity.smownerid in($current_user->id) or vtiger_crmentity.smownerid in(select vtiger_user2role.userid from vtiger_user2role inner join vtiger_users on vtiger_users.id=vtiger_user2role.userid inner join vtiger_role on vtiger_role.roleid=vtiger_user2role.roleid where vtiger_role.parentrole like '".$current_user_parent_role_seq."::%') or vtiger_crmentity.smownerid in(select shareduserid from vtiger_tmp_read_user_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")";
+
+		//Adding crterial for vtiger_account related so sharing
+		 $sec_query .= "or vtiger_salesorder.accountid in (select crmid from vtiger_crmentity where setype='Accounts' and vtiger_crmentity.smownerid in(select shareduserid from vtiger_tmp_read_user_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Accounts')." and relatedtabid=".$tabid.")) or vtiger_salesorder.accountid in (select crmid from vtiger_crmentity left join vtiger_accountgrouprelation on vtiger_accountgrouprelation.accountid=vtiger_crmentity.crmid inner join vtiger_groups on vtiger_groups.groupname=vtiger_accountgrouprelation.groupname where setype='Accounts' and vtiger_crmentity.smownerid=0 and vtiger_groups.groupid in(select vtiger_tmp_read_group_rel_sharing_per.sharedgroupid from vtiger_tmp_read_group_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Accounts')." and relatedtabid=".$tabid."))";
+		//Adding crterial for vtiger_potential related so sharing
+		 $sec_query .= " or vtiger_salesorder.potentialid in (select crmid from vtiger_crmentity where setype='Potentials' and vtiger_crmentity.smownerid in(select shareduserid from vtiger_tmp_read_user_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Potentials')." and relatedtabid=".$tabid.")) or vtiger_salesorder.potentialid in (select crmid from vtiger_crmentity left join vtiger_potentialgrouprelation on vtiger_potentialgrouprelation.potentialid=vtiger_crmentity.crmid inner join vtiger_groups on vtiger_groups.groupname=vtiger_potentialgrouprelation.groupname where setype='Potentials' and vtiger_crmentity.smownerid=0 and vtiger_groups.groupid in(select vtiger_tmp_read_group_rel_sharing_per.sharedgroupid from vtiger_tmp_read_group_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Potentials')." and relatedtabid=".$tabid."))";
+		//Adding crterial for vtiger_quotes related so sharing
+		 $sec_query .= " or vtiger_salesorder.quoteid in (select crmid from vtiger_crmentity where setype='Quotes' and vtiger_crmentity.smownerid in(select shareduserid from vtiger_tmp_read_user_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Quotes')." and relatedtabid=".$tabid.")) or vtiger_salesorder.quoteid in (select crmid from vtiger_crmentity left join vtiger_quotegrouprelation on vtiger_quotegrouprelation.quoteid=vtiger_crmentity.crmid inner join vtiger_groups on vtiger_groups.groupname=vtiger_quotegrouprelation.groupname where setype='Quotes' and vtiger_crmentity.smownerid=0 and vtiger_groups.groupid in(select vtiger_tmp_read_group_rel_sharing_per.sharedgroupid from vtiger_tmp_read_group_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Quotes')." and relatedtabid=".$tabid."))";
 	
 
 		//Adding crteria for group sharing
-		 $sec_query .= " or (crmentity.smownerid in (0) and (";
+		 $sec_query .= " or (vtiger_crmentity.smownerid in (0) and (";
 
                 if(sizeof($current_user_groups) > 0)
                 {
                 	$sec_query .= "groups.groupid in".getCurrentUserGroupList()." or ";
                 }
-		$sec_query .= "groups.groupid in(select tmp_read_group_sharing_per.sharedgroupid from tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";			
+		$sec_query .= "groups.groupid in(select vtiger_tmp_read_group_sharing_per.sharedgroupid from vtiger_tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";			
 	
 	}
 	elseif($module == 'Invoice')
 	{
-		$sec_query .= "and (crmentity.smownerid in($current_user->id) or crmentity.smownerid in(select user2role.userid from user2role inner join users on users.id=user2role.userid inner join role on role.roleid=user2role.roleid where role.parentrole like '".$current_user_parent_role_seq."::%') or crmentity.smownerid in(select shareduserid from tmp_read_user_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")";
-
-		//Adding crterial for account related invoice sharing
-		 $sec_query .= "or invoice.accountid in (select crmid from crmentity where setype='Accounts' and crmentity.smownerid in(select shareduserid from tmp_read_user_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Accounts')." and relatedtabid=".$tabid.")) or invoice.accountid in (select crmid from crmentity left join accountgrouprelation on accountgrouprelation.accountid=crmentity.crmid inner join groups on groups.groupname=accountgrouprelation.groupname where setype='Accounts' and crmentity.smownerid=0 and groups.groupid in(select tmp_read_group_rel_sharing_per.sharedgroupid from tmp_read_group_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Accounts')." and relatedtabid=".$tabid."))";
-		//Adding crterial for salesorder related invoice sharing
-		 $sec_query .= " or invoice.salesorderid in (select crmid from crmentity where setype='SalesOrder' and crmentity.smownerid in(select shareduserid from tmp_read_user_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('SalesOrder')." and relatedtabid=".$tabid.")) or invoice.salesorderid in(select crmid from crmentity left join sogrouprelation on sogrouprelation.salesorderid=crmentity.crmid inner join groups on groups.groupname=sogrouprelation.groupname where setype='SalesOrder' and crmentity.smownerid=0 and groups.groupid in(select tmp_read_group_rel_sharing_per.sharedgroupid from tmp_read_group_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('SalesOrder')." and relatedtabid=".$tabid."))";
+		$sec_query .= "and (vtiger_crmentity.smownerid in($current_user->id) or vtiger_crmentity.smownerid in(select vtiger_user2role.userid from vtiger_user2role inner join vtiger_users on vtiger_users.id=vtiger_user2role.userid inner join vtiger_role on vtiger_role.roleid=vtiger_user2role.roleid where vtiger_role.parentrole like '".$current_user_parent_role_seq."::%') or vtiger_crmentity.smownerid in(select shareduserid from vtiger_tmp_read_user_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")";
+
+		//Adding crterial for vtiger_account related vtiger_invoice sharing
+		 $sec_query .= "or vtiger_invoice.accountid in (select crmid from vtiger_crmentity where setype='Accounts' and vtiger_crmentity.smownerid in(select shareduserid from vtiger_tmp_read_user_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Accounts')." and relatedtabid=".$tabid.")) or vtiger_invoice.accountid in (select crmid from vtiger_crmentity left join vtiger_accountgrouprelation on vtiger_accountgrouprelation.accountid=vtiger_crmentity.crmid inner join vtiger_groups on vtiger_groups.groupname=vtiger_accountgrouprelation.groupname where setype='Accounts' and vtiger_crmentity.smownerid=0 and vtiger_groups.groupid in(select vtiger_tmp_read_group_rel_sharing_per.sharedgroupid from vtiger_tmp_read_group_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Accounts')." and relatedtabid=".$tabid."))";
+		//Adding crterial for vtiger_salesorder related vtiger_invoice sharing
+		 $sec_query .= " or vtiger_invoice.salesorderid in (select crmid from vtiger_crmentity where setype='SalesOrder' and vtiger_crmentity.smownerid in(select shareduserid from vtiger_tmp_read_user_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('SalesOrder')." and relatedtabid=".$tabid.")) or vtiger_invoice.salesorderid in(select crmid from vtiger_crmentity left join vtiger_sogrouprelation on vtiger_sogrouprelation.salesorderid=vtiger_crmentity.crmid inner join vtiger_groups on vtiger_groups.groupname=vtiger_sogrouprelation.groupname where setype='SalesOrder' and vtiger_crmentity.smownerid=0 and vtiger_groups.groupid in(select vtiger_tmp_read_group_rel_sharing_per.sharedgroupid from vtiger_tmp_read_group_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('SalesOrder')." and relatedtabid=".$tabid."))";
 	
 
 		//Adding crteria for group sharing
-		 $sec_query .= " or (crmentity.smownerid in (0) and (";
+		 $sec_query .= " or (vtiger_crmentity.smownerid in (0) and (";
 
                 if(sizeof($current_user_groups) > 0)
                 {
                 	$sec_query .= "groups.groupid in".getCurrentUserGroupList()." or ";
                 }
-		$sec_query .= "groups.groupid in(select tmp_read_group_sharing_per.sharedgroupid from tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";			
+		$sec_query .= "groups.groupid in(select vtiger_tmp_read_group_sharing_per.sharedgroupid from vtiger_tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";			
 	
 	}
 	elseif($module == 'Campaigns')
 	{
 
-		$sec_query .= " and (crmentity.smownerid in($current_user->id) or crmentity.smownerid in(select user2role.userid from user2role inner join users on users.id=user2role.userid inner join role on role.roleid=user2role.roleid where role.parentrole like '".$current_user_parent_role_seq."::%') or crmentity.smownerid in(select shareduserid from tmp_read_user_sharing_per where userid=".$current_user->id." and tabid=".$tabid.") or (crmentity.smownerid in (0) and (";
+		$sec_query .= " and (vtiger_crmentity.smownerid in($current_user->id) or vtiger_crmentity.smownerid in(select vtiger_user2role.userid from vtiger_user2role inner join vtiger_users on vtiger_users.id=vtiger_user2role.userid inner join vtiger_role on vtiger_role.roleid=vtiger_user2role.roleid where vtiger_role.parentrole like '".$current_user_parent_role_seq."::%') or vtiger_crmentity.smownerid in(select shareduserid from vtiger_tmp_read_user_sharing_per where userid=".$current_user->id." and tabid=".$tabid.") or (vtiger_crmentity.smownerid in (0) and (";
 
 		if(sizeof($current_user_groups) > 0)
 		{
 			$sec_query .= "groups.groupid in".getCurrentUserGroupList()." or ";
 		}
-		$sec_query .= "groups.groupid in(select tmp_read_group_sharing_per.sharedgroupid from tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";
+		$sec_query .= "groups.groupid in(select vtiger_tmp_read_group_sharing_per.sharedgroupid from vtiger_tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";
 
 			
 	}	
@@ -4378,20 +4378,20 @@
 	{
 
 		//Current User	
-		$sec_query = " and (crmentity.smownerid=".$current_user->id;
+		$sec_query = " and (vtiger_crmentity.smownerid=".$current_user->id;
 
 		//Subordinate User
 		$subUsersList=getSubordinateUsersList();
 		if($subUsersList != '')
 		{
-			$sec_query .= " or crmentity.smownerid in".$subUsersList;
+			$sec_query .= " or vtiger_crmentity.smownerid in".$subUsersList;
 		}
 
 		//Shared User
 		$sharedUsersList=getReadSharingUsersList($module);
 		if($sharedUsersList != '')
 		{
-			$sec_query .= " or crmentity.smownerid in".$sharedUsersList;
+			$sec_query .= " or vtiger_crmentity.smownerid in".$sharedUsersList;
 		}
 
 
@@ -4401,14 +4401,14 @@
 			$userGroupsList=getCurrentUserGroupList();
 			if($userGroupsList != '')
 			{
-				$sec_query .= " or (crmentity.smownerid in(0) and groups.groupid in".$userGroupsList.")";
+				$sec_query .= " or (vtiger_crmentity.smownerid in(0) and vtiger_groups.groupid in".$userGroupsList.")";
 			}
 
 			//Shared User Groups
 			$sharedGroupsList=getReadSharingGroupsList($module);
 			if($sharedGroupsList != '')
 			{
-				$sec_query .= " or (crmentity.smownerid in(0) and groups.groupid in".$sharedGroupsList.")";
+				$sec_query .= " or (vtiger_crmentity.smownerid in(0) and vtiger_groups.groupid in".$sharedGroupsList.")";
 			}	
 
 
@@ -4427,7 +4427,7 @@
 	global $adb,$noof_group_rows;
 	$current_user_group_list=getCurrentUserGroupList();
 	$sharing_write_group_list=getWriteSharingGroupsList($module);
-	$query ="select groupname from groups";
+	$query ="select groupname from vtiger_groups";
 	if($current_user_group_list != '' && $sharing_write_group_list != '')
 	{
 		$query .= " where (groupid in".$current_user_group_list." or groupid in".$sharing_write_group_list.")";
@@ -4456,13 +4456,13 @@
 	$log->debug("Entering getGrpId(".$groupname.") method ...");
 	global $adb;
 	
-	$result = $adb->query("select groupid from groups where groupname='".$groupname."'");
+	$result = $adb->query("select groupid from vtiger_groups where groupname='".$groupname."'");
 	$groupid = $adb->query_result($result,0,'groupid');
 	$log->debug("Exiting getGrpId method ...");
 	return $groupid;
 }
 
-/** Function to check permission to access a field for a given user
+/** Function to check permission to access a vtiger_field for a given user
   * @param $fld_module -- Module :: Type String
   * @param $userid -- User Id :: Type integer
   * @param $fieldname -- Field Name :: Type varchar
@@ -4487,13 +4487,13 @@
 	}
 	else
 	{
-		//get profile list using userid
+		//get vtiger_profile list using userid
 		$profilelist = getCurrentUserProfileList();
 
 		//get tabid
 		$tabid = getTabid($fld_module);
 
-		$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";
+		$query="select vtiger_profile2field.* from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.tabid=".$tabid." and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0  and vtiger_profile2field.profileid in".$profilelist." and vtiger_field.fieldname='".$fieldname."' group by vtiger_field.fieldid";
 		$result = $adb->query($query);
 
 		$log->debug("Exiting getFieldVisibilityPermission method ...");
@@ -4501,8 +4501,8 @@
 	}
 }
 
-/** Function to get the field access module array 
-  * @returns The field Access module Array :: Type Array
+/** Function to get the vtiger_field access module array 
+  * @returns The vtiger_field Access module Array :: Type Array
   *
  */
 function getFieldModuleAccessArray()
@@ -4576,8 +4576,8 @@
 
 
 
-/** Function to recalculate the Sharing Rules for all the users 
-  * This function will recalculate all the sharing rules for all the users in the Organization and will write them in flat files 
+/** Function to recalculate the Sharing Rules for all the vtiger_users 
+  * This function will recalculate all the sharing rules for all the vtiger_users in the Organization and will write them in flat vtiger_files 
   *
  */
 function RecalculateSharingRules()
@@ -4586,7 +4586,7 @@
 	$log->debug("Entering RecalculateSharingRules() method ...");
 	global $adb;
 	require_once('modules/Users/CreateUserPrivilegeFile.php');
-	$query="select id from users where deleted=0";
+	$query="select id from vtiger_users where deleted=0";
 	$result=$adb->query($query);
 	$num_rows=$adb->num_rows($result);
 	for($i=0;$i<$num_rows;$i++)
@@ -4599,9 +4599,9 @@
 				
 }
 
-//Code added by Minnie for campaigngroup relation -- start
-
-/** Function to add campaign group relation
+//Code added by Minnie for vtiger_campaigngroup relation -- start
+
+/** Function to add vtiger_campaign group relation
   * @param $campaignid -- Campaign Id:: Type integer
   * @param $groupname -- Group Name:: Type varchar
   *
@@ -4611,13 +4611,13 @@
 	global $log;
 	$log->debug("Entering insert2CampaignGroupRelation(".$campaignid.",".$groupname.") method ...");
 	global $adb;
-	$sql = "insert into campaigngrouprelation values (" .$campaignid .",'".$groupname."')";
+	$sql = "insert into vtiger_campaigngrouprelation values (" .$campaignid .",'".$groupname."')";
 	$adb->query($sql);
 	$log->debug("Exiting insert2CampaignGroupRelation method ...");
 
 }
 
-/** Function to update campaign group relation
+/** Function to update vtiger_campaign group relation
   * @param $campaignid -- Campaign Id:: Type integer
   * @param $groupname -- Group Name:: Type varchar
   *
@@ -4627,10 +4627,10 @@
 	global $log;
 	$log->debug("Entering updateCampaignGroupRelation(".$campaignid.",".$groupname.") method ...");
 	global $adb;
-	$sqldelete = "delete from campaigngrouprelation where campaignid=".$campaignid;
+	$sqldelete = "delete from vtiger_campaigngrouprelation where campaignid=".$campaignid;
 	$adb->query($sqldelete);
 	if($groupname) {
-		$sql = "insert into campaigngrouprelation values (".$campaignid .",'" .$groupname ."')";
+		$sql = "insert into vtiger_campaigngrouprelation values (".$campaignid .",'" .$groupname ."')";
 		$adb->query($sql);
 	}
 	$log->debug("Exiting updateCampaignGroupRelation method ...");

Modified: vtigercrm/trunk/include/utils/export.php
==============================================================================
--- vtigercrm/trunk/include/utils/export.php (original)
+++ vtigercrm/trunk/include/utils/export.php Mon Jun 12 14:26:25 2006
@@ -100,7 +100,7 @@
 	else if ($type == "Accounts")
 	{
 		$focus = new Account;
-		$exp_query="SELECT columnname, fieldlabel FROM field where tabid=6";
+		$exp_query="SELECT columnname, fieldlabel FROM vtiger_field where tabid=6";
 		$account_result=$adb->query($exp_query);
 		if($adb->num_rows($account_result)!=0)
 		{

Modified: vtigercrm/trunk/include/utils/utils.php
==============================================================================
--- vtigercrm/trunk/include/utils/utils.php (original)
+++ vtigercrm/trunk/include/utils/utils.php Mon Jun 12 14:26:25 2006
@@ -133,21 +133,21 @@
 		require_once('include/database/PearDatabase.php');
 		$db = new PearDatabase();
 		$temp_result = Array();
-		// Including deleted users for now.
+		// Including deleted vtiger_users for now.
 		if (empty($status)) {
-				$query = "SELECT id, user_name from users";
+				$query = "SELECT id, user_name from vtiger_users";
 		}
 		else {
 				if($private == 'private')
 				{
 					$log->debug("Sharing is Private. Only the current user should be listed");
-					$query = "select id as id,user_name as user_name from users where id=".$current_user->id." and status='Active' union select user2role.userid as id,users.user_name as user_name from user2role inner join users on users.id=user2role.userid inner join role on role.roleid=user2role.roleid where role.parentrole like '".$current_user_parent_role_seq."::%' and status='Active' union select shareduserid as id,users.user_name as user_name from tmp_read_user_sharing_per inner join users on users.id=tmp_read_user_sharing_per.shareduserid where status='Active' and tmp_read_user_sharing_per.userid=".$current_user->id." and tmp_read_user_sharing_per.tabid=".getTabid($module);	
+					$query = "select id as id,user_name as user_name from vtiger_users where id=".$current_user->id." and status='Active' union select vtiger_user2role.userid as id,vtiger_users.user_name as user_name from vtiger_user2role inner join vtiger_users on vtiger_users.id=vtiger_user2role.userid inner join vtiger_role on vtiger_role.roleid=vtiger_user2role.roleid where vtiger_role.parentrole like '".$current_user_parent_role_seq."::%' and status='Active' union select shareduserid as id,vtiger_users.user_name as user_name from vtiger_tmp_read_user_sharing_per inner join vtiger_users on vtiger_users.id=vtiger_tmp_read_user_sharing_per.shareduserid where status='Active' and vtiger_tmp_read_user_sharing_per.userid=".$current_user->id." and vtiger_tmp_read_user_sharing_per.tabid=".getTabid($module);	
 						
 				}
 				else
 				{
-					$log->debug("Sharing is Public. All users should be listed");
-					$query = "SELECT id, user_name from users WHERE status='$status'";
+					$log->debug("Sharing is Public. All vtiger_users should be listed");
+					$query = "SELECT id, user_name from vtiger_users WHERE status='$status'";
 				}
 		}
 		if (!empty($assigned_user)) {
@@ -675,8 +675,8 @@
 }
 
 /**
- * Create javascript to set the cursor focus to specific field in a form
- * when the screen is rendered.  The field name is currently hardcoded into the
+ * Create javascript to set the cursor focus to specific vtiger_field in a form
+ * when the screen is rendered.  The vtiger_field name is currently hardcoded into the
  * the function.
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
  * All Rights Reserved.
@@ -685,7 +685,7 @@
 function get_set_focus_js () {
 global $log;
 $log->debug("Entering set_focus() method ...");
-//TODO Clint 5/20 - Make this function more generic so that it can take in the target form and field names as variables
+//TODO Clint 5/20 - Make this function more generic so that it can take in the target form and vtiger_field names as variables
 $the_script = <<<EOQ
 <script type="text/javascript" language="JavaScript">
 <!-- Begin
@@ -693,12 +693,12 @@
 	if (document.forms.length > 0) {
 		for (i = 0; i < document.forms.length; i++) {
 			for (j = 0; j < document.forms[i].elements.length; j++) {
-				var field = document.forms[i].elements[j];
-				if ((field.type == "text" || field.type == "textarea" || field.type == "password") &&
-						!field.disabled && (field.name == "first_name" || field.name == "name")) {
-					field.focus();
-                    if (field.type == "text") {
-                        field.select();
+				var vtiger_field = document.forms[i].elements[j];
+				if ((vtiger_field.type == "text" || vtiger_field.type == "textarea" || vtiger_field.type == "password") &&
+						!field.disabled && (vtiger_field.name == "first_name" || vtiger_field.name == "name")) {
+				vtiger_field.focus();
+                    if (vtiger_field.type == "text") {
+                        vtiger_field.select();
                     }
 					break;
 	    		}
@@ -800,16 +800,16 @@
   if($module == 'Leads')
   {
 
-   $sql="select (case when (user_name is null) then  (leadgrouprelation.groupname) else (user_name) end) as name from leads left join users on users.id= assigned_user_id left join leadgrouprelation on leadgrouprelation.leadid=leads.id where leads.deleted=0 and leads.id='". $id ."'";
+   $sql="select (case when (user_name is null) then  (vtiger_leadgrouprelation.groupname) else (user_name) end) as name from leads left join vtiger_users on vtiger_users.id= assigned_user_id left join vtiger_leadgrouprelation on vtiger_leadgrouprelation.leadid=leads.id where leads.deleted=0 and leads.id='". $id ."'";
    
   }
   else if($module == 'Tasks')
   {
-       $sql="select (case when (user_name is null) then  (taskgrouprelation.groupname) else (user_name) end) as name from tasks left join users on users.id= assigned_user_id left join taskgrouprelation on taskgrouprelation.taskid=tasks.id where tasks.deleted=0 and tasks.id='". $id ."'";
+       $sql="select (case when (user_name is null) then  (taskgrouprelation.groupname) else (user_name) end) as name from tasks left join vtiger_users on vtiger_users.id= assigned_user_id left join taskgrouprelation on taskgrouprelation.taskid=tasks.id where tasks.deleted=0 and tasks.id='". $id ."'";
   }
   else if($module == 'Calls')
   {
-       $sql="select (case when (user_name is null) then  (callgrouprelation.groupname) else (user_name) end) as name from calls left join users on users.id= assigned_user_id left join callgrouprelation on callgrouprelation.callid=calls.id where calls.deleted=0 and calls.id='". $id ."'";
+       $sql="select (case when (user_name is null) then  (callgrouprelation.groupname) else (user_name) end) as name from calls left join vtiger_users on vtiger_users.id= assigned_user_id left join callgrouprelation on callgrouprelation.callid=calls.id where calls.deleted=0 and calls.id='". $id ."'";
   }
 
 	$result = $adb->query($sql);
@@ -824,7 +824,7 @@
 	$log->debug("Entering getTabname(".$tabid.") method ...");
         $log->info("tab id is ".$tabid);
         global $adb;
-	$sql = "select tablabel from tab where tabid='".$tabid."'";
+	$sql = "select tablabel from vtiger_tab where tabid='".$tabid."'";
 	$result = $adb->query($sql);
 	$tabname=  $adb->query_result($result,0,"tablabel");
 	$log->debug("Exiting getTabname method ...");
@@ -846,7 +846,7 @@
 	global $log;
         $log->info("tab id is ".$tabid);
         global $adb;
-        $sql = "select name from tab where tabid='".$tabid."'";
+        $sql = "select name from vtiger_tab where tabid='".$tabid."'";
         $result = $adb->query($sql);
         $tabname=  $adb->query_result($result,0,"name");
 	}
@@ -863,7 +863,7 @@
 	global $adb;
 	$column_fld = Array();
         $tabid = getTabid($module);
-	$sql = "select * from field where tabid=".$tabid;
+	$sql = "select * from vtiger_field where tabid=".$tabid;
         $result = $adb->query($sql);
         $noofrows = $adb->num_rows($result);
 	for($i=0; $i<$noofrows; $i++)
@@ -884,7 +884,7 @@
         global $adb;
         if($userid != '')
         {
-                $sql = "select email1 from users where id=".$userid;
+                $sql = "select email1 from vtiger_users where id=".$userid;
                 $result = $adb->query($sql);
                 $email = $adb->query_result($result,0,"email1");
         }
@@ -899,7 +899,7 @@
 	$log->info("in getUserId_Ol ".$username);
 
 	global $adb;
-	$sql = "select id from users where user_name='".$username."'";
+	$sql = "select id from vtiger_users where user_name='".$username."'";
 	$result = $adb->query($sql);
 	$num_rows = $adb->num_rows($result);
 	if($num_rows > 0)
@@ -923,7 +923,7 @@
 	$log->info("get Actionid ".$action);
 
 	$actionid = '';
-	$query="select * from actionmapping where actionname='".$action."'";
+	$query="select * from vtiger_actionmapping where actionname='".$action."'";
         $result =$adb->query($query);
         $actionid=$adb->query_result($result,0,'actionid');
 	$log->info("action id selected is ".$actionid );
@@ -940,7 +940,7 @@
 	global $adb;
 
 	$actionname='';
-	$query="select * from actionmapping where actionid=".$actionid ." and securitycheck=0";
+	$query="select * from vtiger_actionmapping where actionid=".$actionid ." and securitycheck=0";
 	$result =$adb->query($query);
 	$actionname=$adb->query_result($result,0,"actionname");
 	$log->debug("Exiting getActionname method ...");
@@ -955,7 +955,7 @@
         $log->info("in getUserId ".$record);
 
 	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 * from vtiger_crmentity where crmid = ".$record),0,'smownerid');
 	$log->debug("Exiting getUserId method ...");
 	return $user_id;	
 }
@@ -967,7 +967,7 @@
 
 	global $adb;
 	$ownerArr=Array();
-	$query="select * from crmentity where crmid = ".$record;
+	$query="select * from vtiger_crmentity where crmid = ".$record;
 	$result=$adb->query($query);
 	$user_id=$adb->query_result($result,0,'smownerid');
 	if($user_id != 0)
@@ -980,48 +980,48 @@
 		$module=$adb->query_result($result,0,'setype');
 		if($module == 'Leads')
 		{
-			$query1="select groups.groupid from leadgrouprelation inner join groups on groups.groupname = leadgrouprelation.groupname where leadid=".$record;
+			$query1="select vtiger_groups.groupid from vtiger_leadgrouprelation inner join vtiger_groups on vtiger_groups.groupname = vtiger_leadgrouprelation.groupname where leadid=".$record;
 		}
 		elseif($module == 'Activities' || $module == 'Emails')
 		{
 
-			$query1="select groups.groupid from activitygrouprelation inner join groups on groups.groupname = activitygrouprelation.groupname where activityid=".$record;
+			$query1="select vtiger_groups.groupid from vtiger_activitygrouprelation inner join vtiger_groups on vtiger_groups.groupname = vtiger_activitygrouprelation.groupname where activityid=".$record;
 		}
 		elseif($module == 'HelpDesk')
 		{
-			$query1="select groups.groupid from ticketgrouprelation inner join groups on groups.groupname = ticketgrouprelation.groupname where ticketid=".$record;
+			$query1="select vtiger_groups.groupid from vtiger_ticketgrouprelation inner join vtiger_groups on vtiger_groups.groupname = vtiger_ticketgrouprelation.groupname where ticketid=".$record;
 		}
 		elseif($module == 'Accounts')
 		{
-			$query1="select groups.groupid from accountgrouprelation inner join groups on groups.groupname = accountgrouprelation.groupname where accountid=".$record;
+			$query1="select vtiger_groups.groupid from vtiger_accountgrouprelation inner join vtiger_groups on vtiger_groups.groupname = vtiger_accountgrouprelation.groupname where accountid=".$record;
 		}
 		elseif($module == 'Contacts')
 		{
-			$query1="select groups.groupid from contactgrouprelation inner join groups on groups.groupname = contactgrouprelation.groupname where contactid=".$record;
+			$query1="select vtiger_groups.groupid from vtiger_contactgrouprelation inner join vtiger_groups on vtiger_groups.groupname = vtiger_contactgrouprelation.groupname where contactid=".$record;
 		}
 		elseif($module == 'Potentials')
 		{
-			$query1="select groups.groupid from potentialgrouprelation inner join groups on groups.groupname = potentialgrouprelation.groupname where potentialid=".$record;
+			$query1="select vtiger_groups.groupid from vtiger_potentialgrouprelation inner join vtiger_groups on vtiger_groups.groupname = vtiger_potentialgrouprelation.groupname where potentialid=".$record;
 		}
 		elseif($module == 'Quotes')
 		{
-			$query1="select groups.groupid from quotegrouprelation inner join groups on groups.groupname = quotegrouprelation.groupname where quoteid=".$record;
+			$query1="select vtiger_groups.groupid from vtiger_quotegrouprelation inner join vtiger_groups on vtiger_groups.groupname = vtiger_quotegrouprelation.groupname where quoteid=".$record;
 		}
 		elseif($module == 'PurchaseOrder')
 		{
-			$query1="select groups.groupid from pogrouprelation inner join groups on groups.groupname = pogrouprelation.groupname where purchaseorderid=".$record;
+			$query1="select vtiger_groups.groupid from vtiger_pogrouprelation inner join vtiger_groups on vtiger_groups.groupname = vtiger_pogrouprelation.groupname where purchaseorderid=".$record;
 		}
 		elseif($module == 'SalesOrder')
 		{
-			$query1="select groups.groupid from sogrouprelation inner join groups on groups.groupname = sogrouprelation.groupname where salesorderid=".$record;
+			$query1="select vtiger_groups.groupid from vtiger_sogrouprelation inner join vtiger_groups on vtiger_groups.groupname = vtiger_sogrouprelation.groupname where salesorderid=".$record;
 		}
 		elseif($module == 'Invoice')
 		{
-			$query1="select groups.groupid from invoicegrouprelation inner join groups on groups.groupname = invoicegrouprelation.groupname where invoiceid=".$record;
+			$query1="select vtiger_groups.groupid from vtiger_invoicegrouprelation inner join vtiger_groups on vtiger_groups.groupname = vtiger_invoicegrouprelation.groupname where invoiceid=".$record;
 		}
 		elseif($module == 'Campaigns')
 		{
-			$query1="select groups.groupid from campaigngrouprelation inner join groups on groups.groupname = campaigngrouprelation.groupname where campaignid=".$record;
+			$query1="select vtiger_groups.groupid from vtiger_campaigngrouprelation inner join vtiger_groups on vtiger_groups.groupname = vtiger_campaigngrouprelation.groupname where campaignid=".$record;
 		}
 
 		$result1=$adb->query($query1);
@@ -1043,13 +1043,13 @@
 
 	global $adb;
 	$adb->database->SetFetchMode(ADODB_FETCH_ASSOC); 
-	$fld_result = $adb->query("select * from field where generatedtype=1 and displaytype in (1,2)");
+	$fld_result = $adb->query("select * from vtiger_field where generatedtype=1 and displaytype in (1,2)");
         $num_rows = $adb->num_rows($fld_result);
         for($i=0; $i<$num_rows; $i++)
         {
                  $tab_id = $adb->query_result($fld_result,$i,'tabid');
                  $field_id = $adb->query_result($fld_result,$i,'fieldid');
-                 $adb->query("insert into profile2field values (".$profileid.",".$tab_id.",".$field_id.",0,1)");
+                 $adb->query("insert into vtiger_profile2field values (".$profileid.",".$tab_id.",".$field_id.",0,1)");
 	}
 	$log->debug("Exiting insertProfile2field method ...");
 }
@@ -1060,13 +1060,13 @@
 	$log->debug("Entering insert_def_org_field() method ...");
 	global $adb;
 	$adb->database->SetFetchMode(ADODB_FETCH_ASSOC); 
-	$fld_result = $adb->query("select * from field where generatedtype=1 and displaytype in (1,2)");
+	$fld_result = $adb->query("select * from vtiger_field where generatedtype=1 and displaytype in (1,2)");
         $num_rows = $adb->num_rows($fld_result);
         for($i=0; $i<$num_rows; $i++)
         {
                  $tab_id = $adb->query_result($fld_result,$i,'tabid');
                  $field_id = $adb->query_result($fld_result,$i,'fieldid');
-                 $adb->query("insert into def_org_field values (".$tab_id.",".$field_id.",0,1)");
+                 $adb->query("insert into vtiger_def_org_field values (".$tab_id.",".$field_id.",0,1)");
 	}
 	$log->debug("Exiting insert_def_org_field() method ...");
 }
@@ -1075,12 +1075,12 @@
 {
 	global $log;
 	$log->debug("Entering getProfile2FieldList(".$fld_module.",". $profileid.") method ...");
-        $log->info("in getProfile2FieldList ".$fld_module. ' profile id is  '.$profileid);
+        $log->info("in getProfile2FieldList ".$fld_module. ' vtiger_profile id is  '.$profileid);
 
 	global $adb;
 	$tabid = getTabid($fld_module);
 	
-	$query = "select profile2field.visible,field.* from profile2field inner join field on field.fieldid=profile2field.fieldid where profile2field.profileid=".$profileid." and profile2field.tabid=".$tabid;
+	$query = "select vtiger_profile2field.visible,vtiger_field.* from vtiger_profile2field inner join vtiger_field on vtiger_field.fieldid=vtiger_profile2field.fieldid where vtiger_profile2field.profileid=".$profileid." and vtiger_profile2field.tabid=".$tabid;
 	$result = $adb->query($query);
 	$log->debug("Exiting getProfile2FieldList method ...");
 	return $result;
@@ -1092,12 +1092,12 @@
 {
 	global $log;
 	$log->debug("Entering getProfile2FieldPermissionList(".$fld_module.",". $profileid.") method ...");
-        $log->info("in getProfile2FieldList ".$fld_module. ' profile id is  '.$profileid);
+        $log->info("in getProfile2FieldList ".$fld_module. ' vtiger_profile id is  '.$profileid);
 
 	global $adb;
 	$tabid = getTabid($fld_module);
 	
-	$query = "select profile2field.visible,field.* from profile2field inner join field on field.fieldid=profile2field.fieldid where profile2field.profileid=".$profileid." and profile2field.tabid=".$tabid;
+	$query = "select vtiger_profile2field.visible,vtiger_field.* from vtiger_profile2field inner join vtiger_field on vtiger_field.fieldid=vtiger_profile2field.fieldid where vtiger_profile2field.profileid=".$profileid." and vtiger_profile2field.tabid=".$tabid;
 	$result = $adb->query($query);
 	$return_data=array();
     for($i=0; $i<$adb->num_rows($result); $i++)
@@ -1112,7 +1112,7 @@
 {
 	global $log;
      $log->debug("Entering getProfile2AllFieldList(".$mod_array.",".$profileid.") method ...");
-     $log->info("in getProfile2AllFieldList profile id is " .$profileid);
+     $log->info("in getProfile2AllFieldList vtiger_profile id is " .$profileid);
 
 	global $adb;
 	$profilelist=array();
@@ -1136,7 +1136,7 @@
 	global $adb;
 	$tabid = getTabid($fld_module);
 	
-	$query = "select def_org_field.visible,field.* from def_org_field inner join field on field.fieldid=def_org_field.fieldid where def_org_field.tabid=".$tabid;
+	$query = "select vtiger_def_org_field.visible,vtiger_field.* from vtiger_def_org_field inner join vtiger_field on vtiger_field.fieldid=vtiger_def_org_field.fieldid where vtiger_def_org_field.tabid=".$tabid;
 	$result = $adb->query($query);
 	$log->debug("Exiting getDefOrgFieldList method ...");
 	return $result;
@@ -1163,16 +1163,16 @@
  {
 	global $log;
 	$log->debug("Entering ChangeStatus(".$status.",".$activityid.",".$activity_mode."='') method ...");
-        $log->info("in ChangeStatus ".$status. ' activityid is  '.$activityid);
+        $log->info("in ChangeStatus ".$status. ' vtiger_activityid is  '.$activityid);
 
         global $adb;
         if ($activity_mode == 'Task')
         {
-                $query = "Update activity set status='".$status."' where activityid = ".$activityid;
+                $query = "Update vtiger_activity set status='".$status."' where activityid = ".$activityid;
         }
         elseif ($activity_mode == 'Events')
         {
-                $query = "Update activity set eventstatus='".$status."' where activityid = ".$activityid;
+                $query = "Update vtiger_activity set eventstatus='".$status."' where activityid = ".$activityid;
         }
 	if($query) {
         	$adb->query($query);
@@ -1221,7 +1221,7 @@
         $log->info("in getUnitPrice productid ".$productid);
 
         global $adb;
-        $query = "select unit_price from products where productid=".$productid;
+        $query = "select unit_price from vtiger_products where productid=".$productid;
         $result = $adb->query($query);
         $up = $adb->query_result($result,0,'unit_price');
 	$log->debug("Exiting getUnitPrice method ...");
@@ -1284,7 +1284,7 @@
 	$log->debug("Entering getProductImageName(".$id.",".$deleted_array."='') method ...");
 	global $adb;
 	$image_array=array();	
-	$query = "select imagename from products where productid=".$id;
+	$query = "select imagename from vtiger_products where productid=".$id;
 	$result = $adb->query($query);
 	$image_name = $adb->query_result($result,0,"imagename");
 	$image_array=explode("###",$image_name);
@@ -1308,7 +1308,7 @@
 	global $log;
 	$log->debug("Entering getContactImageName(".$id.") method ...");
         global $adb;
-        $query = "select imagename from contactdetails where contactid=".$id;
+        $query = "select imagename from vtiger_contactdetails where contactid=".$id;
         $result = $adb->query($query);
         $image_name = $adb->query_result($result,0,"imagename");
         $log->debug("Inside getContactImageName. The image_name is ".$image_name);
@@ -1342,11 +1342,11 @@
 	global $adb;
 	if($return_module == "Potentials")
 	{
-		$query ="select products.productname,products.unit_price,products.qtyinstock,seproductsrel.* from products inner join seproductsrel on seproductsrel.productid=products.productid where crmid=".$id;
+		$query ="select vtiger_products.productname,vtiger_products.unit_price,vtiger_products.qtyinstock,vtiger_seproductsrel.* from vtiger_products inner join vtiger_seproductsrel on vtiger_seproductsrel.productid=vtiger_products.productid where crmid=".$id;
 	}
 	elseif($return_module == "Products")
 	{
-		$query="select products.productid,products.productname,products.unit_price,products.qtyinstock,crmentity.* from products inner join crmentity on crmentity.crmid=products.productid where crmentity.deleted=0 and productid=".$id;
+		$query="select vtiger_products.productid,vtiger_products.productname,vtiger_products.unit_price,vtiger_products.qtyinstock,vtiger_crmentity.* from vtiger_products inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_products.productid where vtiger_crmentity.deleted=0 and productid=".$id;
 	}
 	$result = $adb->query($query);
 	$num_rows=$adb->num_rows($result);
@@ -1371,7 +1371,7 @@
 	global $log;
 	$log->debug("Entering updateProductQty(".$product_id.",". $upd_qty.") method ...");
 	global $adb;
-	$query= "update products set qtyinstock=".$upd_qty." where productid=".$product_id;
+	$query= "update vtiger_products set qtyinstock=".$upd_qty." where productid=".$product_id;
         $adb->query($query);
 	$log->debug("Exiting updateProductQty method ...");
 
@@ -1382,7 +1382,7 @@
 	global $log;
 	$log->debug("Entering get_account_info(".$parent_id.") method ...");
         global $adb;
-        $query = "select accountid from potential where potentialid=".$parent_id;
+        $query = "select accountid from vtiger_potential where potentialid=".$parent_id;
         $result = $adb->query($query);
         $accountid=$adb->query_result($result,0,'accountid');
 	$log->debug("Exiting get_account_info method ...");
@@ -1768,7 +1768,7 @@
         if($focus->column_fields['email'] == '' && $focus->column_fields['yahooid'] != '')
                 $fieldname = 'yahooid';
 
-        $res = $adb->query("select * from field where tabid = ".getTabid($module)." and fieldname='".$fieldname."'");
+        $res = $adb->query("select * from vtiger_field where tabid = ".getTabid($module)." and fieldname='".$fieldname."'");
         $fieldid = $adb->query_result($res,0,'fieldid');
 
         $hidden .= '<input type="hidden" name="emailids" value="'.$id.'@'.$fieldid.'|">';
@@ -1791,7 +1791,7 @@
         $log->info("in getPoName ".$po_id);
 
         global $adb;
-        $sql = "select postatus from purchaseorder where purchaseorderid=".$po_id;
+        $sql = "select postatus from vtiger_purchaseorder where purchaseorderid=".$po_id;
         $result = $adb->query($sql);
         $po_status = $adb->query_result($result,0,"postatus");
 	$log->debug("Exiting getPoStatus method ...");
@@ -1810,7 +1810,7 @@
 	global $adb;
 	$qtyInStck=getProductQtyInStock($productId);
 	$updQty=$qtyInStck + $qty;
-	$sql = "UPDATE products set qtyinstock=$updQty where productid=".$productId;
+	$sql = "UPDATE vtiger_products set qtyinstock=$updQty where productid=".$productId;
 	$adb->query($sql);
 	$log->debug("Exiting addToProductStock method ...");
 	
@@ -1824,7 +1824,7 @@
 	global $log;
 	$log->debug("Entering getProductQtyInStock(".$product_id.") method ...");
         global $adb;
-        $query1 = "select qtyinstock from products where productid=".$product_id;
+        $query1 = "select qtyinstock from vtiger_products where productid=".$product_id;
         $result=$adb->query($query1);
         $qtyinstck= $adb->query_result($result,0,"qtyinstock");
 	$log->debug("Exiting getProductQtyInStock method ...");
@@ -1861,10 +1861,10 @@
 
 
 
-/**     Function to get the table name from 'field' table for the input field based on the module
+/**     Function to get the vtiger_table name from 'field' vtiger_table for the input vtiger_field based on the module
  *      @param  : string $module - current module value
- *      @param  : string $fieldname - fieldname to which we want the tablename
- *      @return : string $tablename - tablename in which $fieldname is a column, which is retrieved from 'field' table per $module basis
+ *      @param  : string $fieldname - vtiger_fieldname to which we want the vtiger_tablename
+ *      @return : string $tablename - vtiger_tablename in which $fieldname is a column, which is retrieved from 'field' vtiger_table per $module basis
  */
 function getTableNameForField($module,$fieldname)
 {
@@ -1873,7 +1873,7 @@
 	global $adb;
 	$tabid = getTabid($module);
 
-	$sql = "select tablename from field where tabid=".$tabid." and fieldname like '%".$fieldname."%'";
+	$sql = "select tablename from vtiger_field where tabid=".$tabid." and fieldname like '%".$fieldname."%'";
 	$res = $adb->query($sql);
 
 	$tablename = '';
@@ -1908,7 +1908,7 @@
 	global $log;
 	$log->debug("Entering getPotentialsRelatedAccounts(".$record_id.") method ...");
 	global $adb;
-	$query="select accountid from potential where potentialid=".$record_id;
+	$query="select accountid from vtiger_potential where potentialid=".$record_id;
 	$result=$adb->query($query);
 	$accountid=$adb->query_result($result,0,'accountid');
 	$log->debug("Exiting getPotentialsRelatedAccounts method ...");
@@ -1920,7 +1920,7 @@
 	global $log;
 	$log->debug("Entering getEmailsRelatedAccounts(".$record_id.") method ...");
 	global $adb;
-	$query = "select seactivityrel.crmid from seactivityrel inner join crmentity on crmentity.crmid=seactivityrel.crmid where crmentity.setype='Accounts' and activityid=".$record_id;
+	$query = "select vtiger_seactivityrel.crmid from vtiger_seactivityrel inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_seactivityrel.crmid where vtiger_crmentity.setype='Accounts' and activityid=".$record_id;
 	$result = $adb->query($query);
 	$accountid=$adb->query_result($result,0,'crmid');
 	$log->debug("Exiting getEmailsRelatedAccounts method ...");
@@ -1932,7 +1932,7 @@
 	global $log;
 	$log->debug("Entering getEmailsRelatedLeads(".$record_id.") method ...");
 	global $adb;
-	$query = "select seactivityrel.crmid from seactivityrel inner join crmentity on crmentity.crmid=seactivityrel.crmid where crmentity.setype='Leads' and activityid=".$record_id;
+	$query = "select vtiger_seactivityrel.crmid from vtiger_seactivityrel inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_seactivityrel.crmid where vtiger_crmentity.setype='Leads' and activityid=".$record_id;
 	$result = $adb->query($query);
 	$leadid=$adb->query_result($result,0,'crmid');
 	$log->debug("Exiting getEmailsRelatedLeads method ...");
@@ -1944,7 +1944,7 @@
 	global $log;
 	$log->debug("Entering getHelpDeskRelatedAccounts(".$record_id.") method ...");
 	global $adb;
-        $query="select parent_id from troubletickets inner join crmentity on crmentity.crmid=troubletickets.parent_id where ticketid=".$record_id." and crmentity.setype='Accounts'";
+        $query="select parent_id from vtiger_troubletickets inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_troubletickets.parent_id where ticketid=".$record_id." and vtiger_crmentity.setype='Accounts'";
         $result=$adb->query($query);
         $accountid=$adb->query_result($result,0,'parent_id');
 	$log->debug("Exiting getHelpDeskRelatedAccounts method ...");
@@ -1957,7 +1957,7 @@
 	global $log;
 	$log->debug("Entering getQuotesRelatedAccounts(".$record_id.") method ...");
 	global $adb;
-        $query="select accountid from quotes where quoteid=".$record_id;
+        $query="select accountid from vtiger_quotes where quoteid=".$record_id;
         $result=$adb->query($query);
         $accountid=$adb->query_result($result,0,'accountid');
 	$log->debug("Exiting getQuotesRelatedAccounts method ...");
@@ -1970,7 +1970,7 @@
 	global $log;
 	$log->debug("Entering getQuotesRelatedPotentials(".$record_id.") method ...");
 	global $adb;
-        $query="select potentialid from quotes where quoteid=".$record_id;
+        $query="select potentialid from vtiger_quotes where quoteid=".$record_id;
         $result=$adb->query($query);
         $potid=$adb->query_result($result,0,'potentialid');
 	$log->debug("Exiting getQuotesRelatedPotentials method ...");
@@ -1982,7 +1982,7 @@
 	global $log;
 	$log->debug("Entering getSalesOrderRelatedAccounts(".$record_id.") method ...");
 	global $adb;
-        $query="select accountid from salesorder where salesorder=".$record_id;
+        $query="select accountid from vtiger_salesorder where salesorder=".$record_id;
         $result=$adb->query($query);
         $accountid=$adb->query_result($result,0,'accountid');
 	$log->debug("Exiting getSalesOrderRelatedAccounts method ...");
@@ -1995,7 +1995,7 @@
 	global $log;
 	$log->debug("Entering getSalesOrderRelatedPotentials(".$record_id.") method ...");
 	global $adb;
-        $query="select potentialid from salesorder where salesorder=".$record_id;
+        $query="select potentialid from vtiger_salesorder where salesorder=".$record_id;
         $result=$adb->query($query);
         $potid=$adb->query_result($result,0,'potentialid');
 	$log->debug("Exiting getSalesOrderRelatedPotentials method ...");
@@ -2007,7 +2007,7 @@
 	global $log;
 	$log->debug("Entering getSalesOrderRelatedQuotes(".$record_id.") method ...");
 	global $adb;
-        $query="select quoteid from salesorder where salesorder=".$record_id;
+        $query="select quoteid from vtiger_salesorder where salesorder=".$record_id;
         $result=$adb->query($query);
         $qtid=$adb->query_result($result,0,'quoteid');
 	$log->debug("Exiting getSalesOrderRelatedQuotes method ...");
@@ -2019,7 +2019,7 @@
 	global $log;
 	$log->debug("Entering getInvoiceRelatedAccounts(".$record_id.") method ...");
 	global $adb;
-        $query="select accountid from invoice where invoiceid=".$record_id;
+        $query="select accountid from vtiger_invoice where invoiceid=".$record_id;
         $result=$adb->query($query);
         $accountid=$adb->query_result($result,0,'accountid');
 	$log->debug("Exiting getInvoiceRelatedAccounts method ...");
@@ -2031,7 +2031,7 @@
 	global $log;
 	$log->debug("Entering getInvoiceRelatedSalesOrder(".$record_id.") method ...");
 	global $adb;
-        $query="select salesorderid from invoice where invoiceid=".$record_id;
+        $query="select salesorderid from vtiger_invoice where invoiceid=".$record_id;
         $result=$adb->query($query);
         $soid=$adb->query_result($result,0,'salesorderid');
 	$log->debug("Exiting getInvoiceRelatedSalesOrder method ...");
@@ -2147,7 +2147,7 @@
 }//function ends
 
 
-/**   Function to get the Graph and table format for a particular date
+/**   Function to get the Graph and vtiger_table format for a particular date
         based upon the period
         * Portions created by vtiger are Copyright (C) vtiger.
         * All Rights Reserved.
@@ -2158,7 +2158,7 @@
 	global $log;
 	$log->debug("Entering Graph_n_table_format(".$period_type.",".$date_value.") method ...");
         $date_val=explode("-",$date_value);
-        if($period_type=="month")   //to get the table format dates
+        if($period_type=="month")   //to get the vtiger_table format dates
         {
                 $table_format=date("j",mktime(0,0,0,date($date_val[1]),(date($date_val[2])),date($date_val[0])));
                 $graph_format=date("D",mktime(0,0,0,date($date_val[1]),(date($date_val[2])),date($date_val[0])));
@@ -2185,7 +2185,7 @@
 	$log->debug("Entering getImageCount(".$id.") method ...");
 	global $adb;
 	$image_lists=array();
-	$query="select imagename from products where productid=".$id;
+	$query="select imagename from vtiger_products where productid=".$id;
 	$result=$adb->query($query);
 	$imagename=$adb->query_result($result,0,'imagename');
 	$image_lists=explode("###",$imagename);
@@ -2198,7 +2198,7 @@
 	global $log;
 	$log->debug("Entering getUserImageName(".$id.") method ...");
 	global $adb;
-	$query = "select imagename from users where id=".$id;
+	$query = "select imagename from vtiger_users where id=".$id;
 	$result = $adb->query($query);
 	$image_name = $adb->query_result($result,0,"imagename");
 	$log->debug("Inside getUserImageName. The image_name is ".$image_name);
@@ -2213,7 +2213,7 @@
 	global $log;
 	$log->debug("Entering getUserImageNames() method ...");
 	global $adb;
-	$query = "select imagename from users where deleted=0";
+	$query = "select imagename from vtiger_users where deleted=0";
 	$result = $adb->query($query);
 	$image_name=array();
 	for($i=0;$i<$adb->num_rows($result);$i++)
@@ -2250,6 +2250,6 @@
 
 function useInternalMailer() {
 	global $current_user,$adb;
-	return $adb->query_result($adb->query("select int_mailer from mail_accounts where user_id='".$current_user->id."'"),0,"int_mailer");
+	return $adb->query_result($adb->query("select int_mailer from vtiger_mail_accounts where user_id='".$current_user->id."'"),0,"int_mailer");
 }
 ?>

Modified: vtigercrm/trunk/index.php
==============================================================================
--- vtigercrm/trunk/index.php (original)
+++ vtigercrm/trunk/index.php Mon Jun 12 14:26:25 2006
@@ -15,7 +15,7 @@
 /*********************************************************************************
  * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/index.php,v 1.93 2005/04/21 16:17:25 ray Exp $
  * Description: Main file and starting point for the application.  Calls the 
- * theme header and footer files defined for the user as well as the module as 
+ * theme header and footer vtiger_files defined for the user as well as the module as 
  * defined by the input parameters.
  ********************************************************************************/
 
@@ -105,7 +105,7 @@
 if (isset($_REQUEST['PHPSESSID'])) $log->debug("****Starting for session ".$_REQUEST['PHPSESSID']);
 else $log->debug("****Starting for new session");
 
-// We use the REQUEST_URI later to construct dynamic URLs.  IIS does not pass this field
+// We use the REQUEST_URI later to construct dynamic URLs.  IIS does not pass this vtiger_field
 // to prevent an error, if it is not set, we will assign it to ''
 if(!isset($_SERVER['REQUEST_URI']))
 {
@@ -271,7 +271,7 @@
 			ereg("^Webmails",$module) ))
 	{
 		$skipHeaders=true;
-		//skip headers for all these invocations as they are mostly popups
+		//skip vtiger_headers for all these invocations as they are mostly popups
 		if(ereg("^Popup", $action) ||
 			ereg("^ChangePassword", $action) ||
 			ereg("^Export", $action) ||
@@ -319,7 +319,7 @@
 }
 else {
     // use $default_module and $default_action as set in config.php
-    // Redirect to the correct module with the correct action.  We need the URI to include these fields.
+    // Redirect to the correct module with the correct action.  We need the URI to include these vtiger_fields.
   
 
         header("Location: index.php?action=$default_action&module=$default_module");
@@ -501,9 +501,9 @@
         setcookie('ck_login_language_vtiger', $_SESSION['authenticated_user_language']);
 }
 
-//skip headers for popups, deleting, saving, importing and other actions
+//skip vtiger_headers for popups, deleting, saving, importing and other actions
 if(!$skipHeaders) {
-	$log->debug("including headers");
+	$log->debug("including vtiger_headers");
 	if($use_current_login)
 	{
 		if(isset($_REQUEST['category']) && $_REQUEST['category'] !='')
@@ -522,7 +522,7 @@
 	if(isset($_SESSION['administrator_error']))
 	{
 		// only print DB errors once otherwise they will still look broken after they are fixed.
-		// Only print the errors for admin users.
+		// Only print the errors for admin vtiger_users.
 		if(is_admin($current_user)) 
 			echo $_SESSION['administrator_error'];
 		unset($_SESSION['administrator_error']);
@@ -531,7 +531,7 @@
 	echo "<!-- startscrmprint -->";
 }
 else {
-		$log->debug("skipping headers");
+		$log->debug("skipping vtiger_headers");
 }
 
 

Modified: vtigercrm/trunk/install/0welcome.php
==============================================================================
--- vtigercrm/trunk/install/0welcome.php (original)
+++ vtigercrm/trunk/install/0welcome.php Mon Jun 12 14:26:25 2006
@@ -54,7 +54,7 @@
 <body leftMargin="0" topMargin="0" marginheight="0" marginwidth="0">
 
 
-<!-- Master table -->
+<!-- Master vtiger_table -->
 <table border=0 cellspacing=0 cellpadding=0 width=100%>
 <tr>
 <td width="10%" valign="top"></td>
@@ -95,7 +95,7 @@
 <p><b><i>Again, thanks for taking out the time to try vtiger! We want you to know that we really appreciate it.</i></b>
 
 <p><b>Installation Instructions:-</b></p>
-<p>This Configuration Wizard will create vtiger CRM 5.0 Beta databases and tables and configuration files you need to start. The entire process should take about four minutes. Click the Start button when you are ready. 
+<p>This Configuration Wizard will create vtiger CRM 5.0 Beta databases and vtiger_tables and configuration vtiger_files you need to start. The entire process should take about four minutes. Click the Start button when you are ready. 
 <br><br>
 <p><span style="color:#555555">- vtiger CRM 5.0 Beta is tested on mySQL 4.1.X, mySQL 5.0.19, PHP 5.0.19 and Apache 2.0.40.</p> 
 <p align="center"><font color='red'><b>vtiger CRM 5 Beta will not work on mysql 4.0.x versions</b></font></center><center><font color='blue'><b>vtiger crm can run on a system which has xampp/lampp/wampp already installed in it provided it meets the above mentioned requirements</b></font></center>
@@ -183,7 +183,7 @@
 			form for making modifications,<br>
 			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; including but not limited to software
 			source code, documentation<br>
-			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; source, and configuration files.<br>
+			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; source, and configuration vtiger_files.<br>
 			<br>
 			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; "Object" form shall mean any form
 			resulting from mechanical<br>
@@ -233,8 +233,8 @@
 			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; to the Licensor or its representatives,
 			including but not limited to<br>
 			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; communication on electronic mailing
-			lists, source code control systems,<br>
-			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; and issue tracking systems that are
+			lists, source code control vtiger_systems,<br>
+			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; and issue tracking vtiger_systems that are
 			managed by, or on behalf of, the<br>
 			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Licensor for the purpose of discussing
 			and improving the Work, but<br>
@@ -306,10 +306,10 @@
 			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Derivative Works
 			a copy of this License; and<br>
 			<br>
-			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; (b) You must cause any modified files to
+			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; (b) You must cause any modified vtiger_files to
 			carry prominent notices<br>
 			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; stating that You
-			changed the files; and<br>
+			changed the vtiger_files; and<br>
 			<br>
 			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; (c) You must retain, in the Source form
 			of any Derivative Works<br>
@@ -460,7 +460,7 @@
 			<br>
 			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; To apply the Apache License to your
 			work, attach the following<br>
-			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; boilerplate notice, with the fields
+			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; boilerplate notice, with the vtiger_fields
 			enclosed by brackets "[]"<br>
 			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; replaced with your own identifying
 			information. (Don't include<br>
@@ -547,7 +547,7 @@
 			&nbsp;*<br>
 			&nbsp;* 2. The origin of this software must not be misrepresented,
 			either by<br>
-			&nbsp;* explicit claim or by omission.&nbsp; Since few users ever read
+			&nbsp;* explicit claim or by omission.&nbsp; Since few vtiger_users ever read
 			sources, credits<br>
 			&nbsp;* must appear in the documentation.<br>
 			&nbsp;*<br>
@@ -865,7 +865,7 @@
 			acknowledgments normally appear.<br>
 			&nbsp;*<br>
 			&nbsp;* 4. The names "Apache" and "Apache Software Foundation" must<br>
-			&nbsp;*&nbsp;&nbsp;&nbsp; not be used to endorse or promote products
+			&nbsp;*&nbsp;&nbsp;&nbsp; not be used to endorse or promote vtiger_products
 			derived from this<br>
 			&nbsp;*&nbsp;&nbsp;&nbsp; software without prior written permission.
 			For written<br>
@@ -1018,7 +1018,7 @@
 			<br>
 			&nbsp;&nbsp; somewhere reasonably visible in your documentation and in
 			any relevant<br>
-			&nbsp;&nbsp; files or online help data or similar. A reference to the
+			&nbsp;&nbsp; vtiger_files or online help data or similar. A reference to the
 			ftp site for<br>
 			&nbsp;&nbsp; the source, that is, to<br>
 			<br>
@@ -1092,7 +1092,7 @@
 			and Clark Cooper<br>
 			<br>
 			Permission is hereby granted, free of charge, to any person obtaining<br>
-			a copy of this software and associated documentation files (the<br>
+			a copy of this software and associated documentation vtiger_files (the<br>
 			"Software"), to deal in the Software without restriction, including<br>
 			without limitation the rights to use, copy, modify, merge, publish,<br>
 			distribute, sublicense, and/or sell copies of the Software, and to<br>
@@ -1189,16 +1189,16 @@
 			<br>
 			IMPORTANT:<br>
 			<br>
-			Send bug (error) reports, questions and comments to the mailing list<br>
+			Send bug (error) vtiger_reports, questions and comments to the mailing list<br>
 			at mysql at lists.mysql.com<br>
 			<br>
-			Please use the 'mysqlbug' script when posting bug reports or questions<br>
+			Please use the 'mysqlbug' script when posting bug vtiger_reports or questions<br>
 			about MySQL. mysqlbug will gather some information about your system<br>
 			and start your editor with a form in which you can describe your<br>
-			problem. Bug reports might be silently ignored by the MySQL<br>
-			maintainers if there is not a good reason included in the report as to<br>
-			why mysqlbug has not been used. A report that says 'MySQL does not<br>
-			work for me. Why?' is not considered a valid bug report.<br>
+			problem. Bug vtiger_reports might be silently ignored by the MySQL<br>
+			maintainers if there is not a good reason included in the vtiger_report as to<br>
+			why mysqlbug has not been used. A vtiger_report that says 'MySQL does not<br>
+			work for me. Why?' is not considered a valid bug vtiger_report.<br>
 			<br>
 			The mysqlbug script can be found in the 'scripts' directory of the<br>
 			distribution, that is '&lt;where-you-installed-mysql&gt;/scripts'.<br>
@@ -1228,7 +1228,7 @@
 			provided with the<br>
 			&nbsp;&nbsp;&nbsp;&nbsp; distribution.<br>
 			&nbsp;<br>
-			&nbsp; 3. The name "PHP" must not be used to endorse or promote products<br>
+			&nbsp; 3. The name "PHP" must not be used to endorse or promote vtiger_products<br>
 			&nbsp;&nbsp;&nbsp;&nbsp; derived from this software without prior
 			written permission. For<br>
 			&nbsp;&nbsp;&nbsp;&nbsp; written permission, please contact
@@ -1343,7 +1343,7 @@
 			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 1.9. ''Modifications'' means any
 			addition to or deletion from the substance or structure of either the
 			Original Code or any previous Modifications. When Covered Code is
-			released as a series of files, a Modification is:<br>
+			released as a series of vtiger_files, a Modification is:<br>
 			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; A.
 			Any addition to or deletion from the contents of a file containing
 			Original Code or previous Modifications.<br>
@@ -1367,7 +1367,7 @@
 			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 1.11. ''Source Code'' means the
 			preferred form of the Covered Code for making modifications to it,
 			including all modules it contains, plus any associated interface
-			definition files, scripts used to control compilation and installation
+			definition vtiger_files, scripts used to control compilation and installation
 			of an Executable, or source code differential comparisons against
 			either the Original Code or another well known, available Covered Code
 			of the Contributor's choice. The Source Code can be in a compressed or
@@ -1686,7 +1686,7 @@
 			such claim is resolved (such as by license or settlement) prior to the
 			initiation of patent infringement litigation, then the reasonable value
 			of the licenses granted by such Participant under Sections 2.1 or 2.2
-			shall be taken into account in determining the amount or value of any
+			shall be taken into vtiger_account in determining the amount or value of any
 			payment or license.<br>
 			<br>
 			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 8.4.&nbsp; In the event of termination
@@ -1783,7 +1783,7 @@
 			Contributor(s): ______________________________________.<br>
 			<br>
 			[NOTE: The text of this Exhibit A may differ slightly from the text of
-			the notices in the Source Code files of the Original Code. You should
+			the notices in the Source Code vtiger_files of the Original Code. You should
 			use the text of this Exhibit A rather than the text found in the
 			Original Code Source Code for Your Modifications.]<br>
 			<br>
@@ -1834,7 +1834,7 @@
 			intended to<br>
 			guarantee your freedom to share and change free software--to make sure
 			the<br>
-			software is free for all its users.<br>
+			software is free for all its vtiger_users.<br>
 			<br>
 			This license, the Lesser General Public License, applies to some
 			specially<br>
@@ -1871,7 +1871,7 @@
 			must<br>
 			make sure that they, too, receive or can get the source code. If you
 			link<br>
-			other code with the library, you must provide complete object files to
+			other code with the library, you must provide complete object vtiger_files to
 			the<br>
 			recipients, so that they can relink them with the library after making
 			changes<br>
@@ -1946,7 +1946,7 @@
 			<br>
 			In other cases, permission to use a particular library in non-free
 			programs<br>
-			enables a greater number of people to use a large body of free
+			enables a greater number of people to use a vtiger_large body of free
 			software. For<br>
 			example, permission to use the GNU C Library in non-free programs
 			enables many<br>
@@ -2046,23 +2046,23 @@
 			&nbsp;&nbsp;&nbsp; a) The modified work must itself be a software
 			library.<br>
 			<br>
-			&nbsp;&nbsp;&nbsp; b) You must cause the files modified to carry
+			&nbsp;&nbsp;&nbsp; b) You must cause the vtiger_files modified to carry
 			prominent notices stating<br>
-			that you changed the files and the date of any change.<br>
+			that you changed the vtiger_files and the date of any change.<br>
 			<br>
 			&nbsp;&nbsp;&nbsp; c) You must cause the whole of the work to be
 			licensed at no charge to all<br>
 			third parties under the terms of this License.<br>
 			<br>
 			&nbsp;&nbsp;&nbsp; d) If a facility in the modified Library refers to a
-			function or a table<br>
+			function or a vtiger_table<br>
 			of data to be supplied by an application program that uses the
 			facility, other<br>
 			than as an argument passed when the facility is invoked, then you must
 			make a<br>
 			good faith effort to ensure that, in the event an application does not
 			supply<br>
-			such function or table, the facility still operates, and performs
+			such function or vtiger_table, the facility still operates, and performs
 			whatever<br>
 			part of its purpose remains meaningful.<br>
 			<br>
@@ -2233,7 +2233,7 @@
 			executable<br>
 			containing the modified Library. (It is understood that the user who
 			changes<br>
-			the contents of definitions files in the Library will not necessarily
+			the contents of definitions vtiger_files in the Library will not necessarily
 			be able<br>
 			to recompile the application to use the modified definitions.)<br>
 			<br>
@@ -2526,19 +2526,19 @@
 			Acknowledgements:<br>
 			<br>
 			We have used the following software:<br>
-			<br>1. ExcelReader package to read the xls files. We have taken the utility from the following Web site : <br>
+			<br>1. ExcelReader package to read the xls vtiger_files. We have taken the utility from the following Web site : <br>
 			http://freshmeat.net/projects/phpexcelreader/<br>
 			The product is available as GNU General Public License (GPL).<br>
-			2. E-mail Client to handle attachments with PHP. We have taken the ideas from the article by Kevin Steffer available at the<br>
+			2. E-mail Client to handle vtiger_attachments with PHP. We have taken the ideas from the article by Kevin Steffer available at the<br>
   http://www.linuxscope.net/articles/mailAttachmentsPHP.html<br>
-			3. FPDF package to create PDF reports and documents. We have downloaded package from http://www.fpdf.org<br>
+			3. FPDF package to create PDF vtiger_reports and documents. We have downloaded package from http://www.fpdf.org<br>
 			4. Prototype (Object-Oriented JavaScript framework) package to ease development of dynamic web applications. We have downloaded package from http://prototype.conio.net<br>
 			5. class_http to cache scraped content. We have downloaded package from http://www.troywolf.com/articles/php/class_http/ <br>
-			6.Carousel Slideshow package to display large images as thumbnails. We have downloaded package from http://www.dynamicdrive.com/dynamicindex14/carousel2.htm<br>
-			7. Ajax Popup Chat for enabling instant messaging for vtiger CRM users. We have downloaded package from http://www.os-solution.com/demo/ajaxcsspopupchat/index.php<br>
+			6.Carousel Slideshow package to display vtiger_large images as thumbnails. We have downloaded package from http://www.dynamicdrive.com/dynamicindex14/carousel2.htm<br>
+			7. Ajax Popup Chat for enabling instant messaging for vtiger CRM vtiger_users. We have downloaded package from http://www.os-solution.com/demo/ajaxcsspopupchat/index.php<br>
 			8. Image Crossfade Redux for enabling fade effect to images. We have downloaded package from http://slayeroffice.com/code/imageCrossFade/xfade2.html<br>
 			9. Calculator for enabling calculations in vtiger CRM. We have downloaded package from http://www.hmhd.com/steve<br>
-We are grateful to the creators of the respective products for providing such a beautiful utilities.<br>
+We are grateful to the creators of the respective vtiger_products for providing such a beautiful utilities.<br>
 			
 			&nbsp;<br>
 			<br>
@@ -2587,7 +2587,7 @@
 <td width="10%" valign="top"></td>
 </tr>
 </table>
-<!-- Master table closes -->
+<!-- Master vtiger_table closes -->
 
 </body>
 </html>

Modified: vtigercrm/trunk/install/1checkSystem.php
==============================================================================
--- vtigercrm/trunk/install/1checkSystem.php (original)
+++ vtigercrm/trunk/install/1checkSystem.php Mon Jun 12 14:26:25 2006
@@ -156,7 +156,7 @@
 </head>
 <body leftMargin="0" topMargin="0" marginheight="0" marginwidth="0">
 
-<!-- Master table -->
+<!-- Master vtiger_table -->
 <table border=0 cellspacing=0 cellpadding=0 width=100%>
 <tr>
 	<td align=center>
@@ -250,7 +250,7 @@
         </tr>
 		<tr bgcolor="#fafafa">
 		    <td valign=top ><strong>Uploads Directory</strong><br> (storage/)</td>
-            <td valign=top bgcolor="white"><?php echo (is_writable('./storage/'))?"<strong><font color=\"#0066CC\">Writeable</font></strong>":"<strong><font color=\"#FF0000\">Not Writeable</strong> <br>You might experience problems with the file attachments feature. Refer <a href=http://www.vtiger.com/forums/viewtopic.php?t=24&highlight=permission>File attachments issue</a> for more details </font>"; ?></td>
+            <td valign=top bgcolor="white"><?php echo (is_writable('./storage/'))?"<strong><font color=\"#0066CC\">Writeable</font></strong>":"<strong><font color=\"#FF0000\">Not Writeable</strong> <br>You might experience problems with the file vtiger_attachments feature. Refer <a href=http://www.vtiger.com/forums/viewtopic.php?t=24&highlight=permission>File vtiger_attachments issue</a> for more details </font>"; ?></td>
         </tr>
 		<tr bgcolor="#fafafa">
 		    <td valign=top ><strong>Install Directory</strong><br> (install/)</td>
@@ -262,19 +262,19 @@
         </tr>
 	<tr bgcolor="#fafafa">
 		<td valign=top ><strong>Product Image Directory</strong><br> (test/product/)</td>
-		<td valign=top bgcolor="white"><?php echo (is_writable('./test/product/'))?"<strong><font color=\"#0066CC\">Writeable</font></strong>":"<strong><font color=\"#FF0000\">Not Writeable</strong> <br>You might experience problems while attaching image for Products.Refer <a href=http://www.vtiger.com/forums/viewtopic.php?t=24&highlight=permission>File attachments issue</a> for more details </font>"; ?></td>
+		<td valign=top bgcolor="white"><?php echo (is_writable('./test/product/'))?"<strong><font color=\"#0066CC\">Writeable</font></strong>":"<strong><font color=\"#FF0000\">Not Writeable</strong> <br>You might experience problems while attaching image for Products.Refer <a href=http://www.vtiger.com/forums/viewtopic.php?t=24&highlight=permission>File vtiger_attachments issue</a> for more details </font>"; ?></td>
 	</tr>
 	<tr bgcolor="#fafafa">
 		<td valign=top ><strong>User Image Directory</strong><br> (test/user/)</td>
-		<td valign=top bgcolor="white"><?php echo (is_writable('./test/user/'))?"<strong><font color=\"#0066CC\">Writeable</font></strong>":"<strong><font color=\"#FF0000\">Not Writeable</strong> <br>You might experience problems while attaching image for Users. Refer <a href=http://www.vtiger.com/forums/viewtopic.php?t=24&highlight=permission>File attachments issue</a> for more details </font>"; ?></td>
+		<td valign=top bgcolor="white"><?php echo (is_writable('./test/user/'))?"<strong><font color=\"#0066CC\">Writeable</font></strong>":"<strong><font color=\"#FF0000\">Not Writeable</strong> <br>You might experience problems while attaching image for Users. Refer <a href=http://www.vtiger.com/forums/viewtopic.php?t=24&highlight=permission>File vtiger_attachments issue</a> for more details </font>"; ?></td>
 	</tr>
 	<tr bgcolor="#fafafa">
 		<td valign=top ><strong>Contact Image Directory</strong><br> (test/contact/)</td>
-		<td valign=top bgcolor="white"><?php echo (is_writable('./test/contact/'))?"<strong><font color=\"#0066CC\">Writeable</font></strong>":"<strong><font color=\"#FF0000\">Not Writeable</strong> <br>You might experience problems while attaching image for Contacts. Refer <a href=http://www.vtiger.com/forums/viewtopic.php?t=24&highlight=permission>File attachments issue</a> for more details </font>"; ?></td>
+		<td valign=top bgcolor="white"><?php echo (is_writable('./test/contact/'))?"<strong><font color=\"#0066CC\">Writeable</font></strong>":"<strong><font color=\"#FF0000\">Not Writeable</strong> <br>You might experience problems while attaching image for Contacts. Refer <a href=http://www.vtiger.com/forums/viewtopic.php?t=24&highlight=permission>File vtiger_attachments issue</a> for more details </font>"; ?></td>
 	</tr>
 		<tr bgcolor="#fafafa">
 		    <td valign=top ><strong>Logo Directory</strong><br> (test/logo/)</td>
-            <td valign=top bgcolor="white"><?php echo (is_writable('./test/logo/'))?"<strong><font color=\"#0066CC\">Writeable</font></strong>":"<strong><font color=\"#FF0000\">Not Writeable</strong> <br>You might experience problems with the company logo in the pdf generation. Refer <a href=http://www.vtiger.com/forums/viewtopic.php?t=24&highlight=permission>File attachments issue</a> for more details </font>"; ?></td>
+            <td valign=top bgcolor="white"><?php echo (is_writable('./test/logo/'))?"<strong><font color=\"#0066CC\">Writeable</font></strong>":"<strong><font color=\"#FF0000\">Not Writeable</strong> <br>You might experience problems with the company logo in the pdf generation. Refer <a href=http://www.vtiger.com/forums/viewtopic.php?t=24&highlight=permission>File vtiger_attachments issue</a> for more details </font>"; ?></td>
         </tr>
 
 		<tr bgcolor="#fafafa">
@@ -359,7 +359,7 @@
 </td>
 </tr>
 </table>
-<!-- Master table closes -->
+<!-- Master vtiger_table closes -->
 
 <br><br><br>
 <!--

Modified: vtigercrm/trunk/install/2setConfig.php
==============================================================================
--- vtigercrm/trunk/install/2setConfig.php (original)
+++ vtigercrm/trunk/install/2setConfig.php Mon Jun 12 14:26:25 2006
@@ -234,7 +234,7 @@
 
 	// Here we decide whether to submit the form.
 	if (isError == true) {
-		alert("Missing required fields: " + errorMessage);
+		alert("Missing required vtiger_fields: " + errorMessage);
 		return false;
 	}
 
@@ -244,7 +244,7 @@
 </script>
 
 
-<!-- Master table -->
+<!-- Master vtiger_table -->
 <table border=0 cellspacing=0 cellpadding=0 width=100%>
 <tr>
 	<td align=center>
@@ -291,7 +291,7 @@
 
 					  If you do not have root access to your database (for example you are installing in a virtual
 					  hosting environment), you will need to have your database created for you before you proceed.
-					  However, this installer will still be able to create the necessary database tables. <br><br>
+					  However, this installer will still be able to create the necessary database vtiger_tables. <br><br>
 			
 					  If you unsure of your database host, username or password, we suggest that you use the default
 					  values below. <br><br>
@@ -433,7 +433,7 @@
 </td>
 </tr>
 </table>
-<!-- Master table closes -->
+<!-- Master vtiger_table closes -->
 
 <br><br><br>
 

Modified: vtigercrm/trunk/install/3confirmConfig.php
==============================================================================
--- vtigercrm/trunk/install/3confirmConfig.php (original)
+++ vtigercrm/trunk/install/3confirmConfig.php Mon Jun 12 14:26:25 2006
@@ -131,7 +131,7 @@
 	</head>
 	<body leftMargin="0" topMargin="0" marginheight="0" marginwidth="0">
 
-		<!-- Master table -->
+		<!-- Master vtiger_table -->
 		<table border=0 cellspacing=0 cellpadding=0 width=100%>
 			<tr>
 				<td align=center>
@@ -299,6 +299,6 @@
 				</td>
 			</tr>
 		</table>
-	<!-- Master table closes -->
+	<!-- Master vtiger_table closes -->
 	</body>
 </html>

Modified: vtigercrm/trunk/install/4createConfigFile.php
==============================================================================
--- vtigercrm/trunk/install/4createConfigFile.php (original)
+++ vtigercrm/trunk/install/4createConfigFile.php Mon Jun 12 14:26:25 2006
@@ -121,7 +121,7 @@
 
 <body leftMargin="0" topMargin="0" marginheight="0" marginwidth="0">
 
-<!-- Master table -->
+<!-- Master vtiger_table -->
 <table border=0 cellspacing=0 cellpadding=0 width=100%>
 <tr>
 	<td align=center>
@@ -290,7 +290,7 @@
 </td>
 </tr>
 </table>
-<!-- Master table closes -->
+<!-- Master vtiger_table closes -->
 
 </body>
 

Modified: vtigercrm/trunk/install/5createTables.inc.php
==============================================================================
--- vtigercrm/trunk/install/5createTables.inc.php (original)
+++ vtigercrm/trunk/install/5createTables.inc.php Mon Jun 12 14:26:25 2006
@@ -90,10 +90,10 @@
         $user->save();
 
         // we need to change the admin user to a fixed id of 1.
-        //$query = "update users set id='1' where user_name='$user->user_name'";
+        //$query = "update vtiger_users set id='1' where user_name='$user->user_name'";
         //$result = $db->query($query, true, "Error updating admin user ID: ");
 
-        $log->info("Created ".$user->table_name." table. for user $user->id");
+        $log->info("Created ".$user->table_name." vtiger_table. for user $user->id");
 
 	/*
         if($create_default_user) {
@@ -115,16 +115,16 @@
         }
 	*/
 
-	// insert values into user2role table
-	$role_query = "select roleid from role where rolename='administrator'";
+	// insert values into vtiger_user2role vtiger_table
+	$role_query = "select roleid from vtiger_role where rolename='administrator'";
 	$db->database->SetFetchMode(ADODB_FETCH_ASSOC);
 	$role_result = $db->query($role_query);
 	$role_id = $db->query_result($role_result,0,"roleid");
 
-	$sql_stmt1 = "insert into user2role values(".$user->id.",'".$role_id."')";
+	$sql_stmt1 = "insert into vtiger_user2role values(".$user->id.",'".$role_id."')";
 	$db->query($sql_stmt1) or die($app_strings['ERR_CREATING_TABLE'].mysql_error());
 
-	//Creating the flat files
+	//Creating the flat vtiger_files
 	createUserPrivilegesfile($user->id);
         createUserSharingPrivilegesfile($user->id);
 
@@ -152,15 +152,15 @@
         $user->email = $std_email;
         $user->save();
 
-	$role_query = "select roleid from role where rolename='standard_user'";
+	$role_query = "select roleid from vtiger_role where rolename='standard_user'";
 	$db->database->SetFetchMode(ADODB_FETCH_ASSOC);
 	$role_result = $db->query($role_query);
 	$role_id = $db->query_result($role_result,0,"roleid");
 
-	$sql_stmt2 = "insert into user2role values(".$user->id.",'".$role_id."')";
+	$sql_stmt2 = "insert into vtiger_user2role values(".$user->id.",'".$role_id."')";
 	$db->query($sql_stmt2) or die($app_strings['ERR_CREATING_TABLE'].mysql_error());
 
-	//Creating the flat files
+	//Creating the flat vtiger_files
 	createUserPrivilegesfile($user->id);
         createUserSharingPrivilegesfile($user->id);
 
@@ -169,8 +169,8 @@
 //$startTime = microtime();
 $modules = array("DefaultDataPopulator");
 $focus=0;				
-// tables creation
-eecho("Creating Core tables: ");
+// vtiger_tables creation
+eecho("Creating Core vtiger_tables: ");
 $success = $db->createTables("schema/DatabaseSchema.xml");
 
 // TODO HTML
@@ -188,34 +188,34 @@
 }
 			
 
-// populate users table
+// populate vtiger_users vtiger_table
 //$uid = $db->getUniqueID("users");
-//$sql_stmt1 = "insert into users(id,user_name,user_password,last_name,email1,date_format) values(".$uid.",'standarduser','stX/AHHNK/Gkw','standarduser','standarduser at standard.user.com','yyyy-mm-dd')";
+//$sql_stmt1 = "insert into vtiger_users(id,user_name,user_password,last_name,email1,date_format) values(".$uid.",'standarduser','stX/AHHNK/Gkw','standarduser','standarduser at standard.user.com','yyyy-mm-dd')";
 //$db->query($sql_stmt1) or die($app_strings['ERR_CREATING_TABLE'].mysql_error());
 
 
-// create and populate combo tables
+// create and populate combo vtiger_tables
 require_once('include/PopulateComboValues.php');
 $combo = new PopulateComboValues();
 $combo->create_tables();
 
 create_default_users();
 
-// default report population
+// default vtiger_report population
 require_once('modules/Reports/PopulateReports.php');
 
-// default customview population
+// default vtiger_customview population
 require_once('modules/CustomView/PopulateCustomView.php');
 
-//Writing tab data in flat file
+//Writing vtiger_tab data in flat file
 create_tab_data_file();
 create_parenttab_data_file();
 
 // ensure required sequences are created (adodb creates them as needed, but if
 // creation occurs within a transaction we get problems
-$db->getUniqueID("crmentity");
-$db->getUniqueID("seactivityrel");
-$db->getUniqueID("freetags");
+$db->getUniqueID("vtiger_crmentity");
+$db->getUniqueID("vtiger_seactivityrel");
+$db->getUniqueID("vtiger_freetags");
 
 // populate the db with seed data
 if ($db_populate) {

Modified: vtigercrm/trunk/install/5createTables.php
==============================================================================
--- vtigercrm/trunk/install/5createTables.php (original)
+++ vtigercrm/trunk/install/5createTables.php Mon Jun 12 14:26:25 2006
@@ -193,7 +193,7 @@
 </td>
 </tr>
 </table>
-<!-- master table closes -->
+<!-- master vtiger_table closes -->
 
 
 </body></html>

Modified: vtigercrm/trunk/install/populateSeedData.php
==============================================================================
--- vtigercrm/trunk/install/populateSeedData.php (original)
+++ vtigercrm/trunk/install/populateSeedData.php Mon Jun 12 14:26:25 2006
@@ -145,7 +145,7 @@
 	
 	$account_name = $company_name_array[$i];
 
-	// Create new accounts.
+	// Create new vtiger_accounts.
 	$account = new Account();
 	$account->column_fields["accountname"] = $account_name;
 	$account->column_fields["phone"] = create_phone_number();
@@ -182,11 +182,11 @@
 	if ($i > 3)
 	{
 		$freetag = $adb->getUniqueId('freetags');
-		$query = "insert into freetags values ($freetag, '$cloudtag[1]', '$cloudtag[1]')";
+		$query = "insert into vtiger_freetags values ($freetag, '$cloudtag[1]', '$cloudtag[1]')";
 		$res = $adb->query($query);
 
 		$date = date('YmdHis'); 
-		$query_tag = "insert into freetagged_objects values ($freetag, 1,".$account->id.", $date, 'Accounts')";
+		$query_tag = "insert into vtiger_freetagged_objects values ($freetag, 1,".$account->id.", $date, 'Accounts')";
 		$result = $adb->query($query_tag);
 	}
 
@@ -227,7 +227,7 @@
 	
 	$opportunity_ids[] = $opp->id;
 
-//	$adb->println("PSD Potential [".$opp->id."] - account[".$account->id."]");
+//	$adb->println("PSD Potential [".$opp->id."] - vtiger_account[".$account->id."]");
 	
 }
 
@@ -285,11 +285,11 @@
 	if ($i > 8)
 	{
 		$freetag = $adb->getUniqueId('freetags');
-		$query = "insert into freetags values ($freetag, '$cloudtag[2]', '$cloudtag[2]')";
+		$query = "insert into vtiger_freetags values ($freetag, '$cloudtag[2]', '$cloudtag[2]')";
 		$res1 = $adb->query($query);
 
 		$date = date('YmdHis'); 
-		$query_tag = "insert into freetagged_objects values ($freetag, 1,".$contact->id.", $date, 'Contacts')";
+		$query_tag = "insert into vtiger_freetagged_objects values ($freetag, 1,".$contact->id.", $date, 'Contacts')";
 		$result1 = $adb->query($query_tag);
 	}
 	// This assumes that there will be one opportunity per company in the seed data.
@@ -297,10 +297,10 @@
 	//$query = "insert into opportunities_contacts set id='".create_guid()."', contact_id='$contact->id', contact_role='".$app_list_strings['opportunity_relationship_type_default_key']."', opportunity_id='".$opportunity_ids[$opportunity_key]."'";
 	//$db->query($query, true, "unable to create seed links between opportunities and contacts");
 
-	$query = "insert into contpotentialrel ( contactid, potentialid ) values (".$contact->id.",".$opportunity_ids[$opportunity_key].")";
+	$query = "insert into vtiger_contpotentialrel ( contactid, vtiger_potentialid ) values (".$contact->id.",".$opportunity_ids[$opportunity_key].")";
 	$db->query($query);
 
-//	$adb->println("PSD Contact [".$contact->id."] - account[".$account_ids[$account_key]."] - potential[".$opportunity_ids[$opportunity_key]."]");
+//	$adb->println("PSD Contact [".$contact->id."] - vtiger_account[".$account_ids[$account_key]."] - vtiger_potential[".$opportunity_ids[$opportunity_key]."]");
 
 	//Create new tasks
 	/*$task = new Task();
@@ -396,7 +396,7 @@
 
 }
 
-// Temp fix since user is not logged in while populating data updating creatorid in crmentity - GS
+// Temp fix since user is not logged in while populating data updating creatorid in vtiger_crmentity - GS
 
 
 //Populating Vendor Data
@@ -544,7 +544,7 @@
 http://support.microsoft.com/default.aspx?scid=kb%3BEN-US%3B263074
 
 If you want to continue working with vtiger Outlook Plug-in, select the Allow access for check box and select the time from drop-down box.",
-	" Since, vtigerCRM & all plugins are open source, it is not signed up with third party vendors and IE will ask to download even though the plugin are not signed.
+	" Since, vtigerCRM & all plugins are open source, it is not signed up with third party vtiger_vendors and IE will ask to download even though the plugin are not signed.
 
 This message if produced by Microsoft Windows XP. I English Windows XP with the SP2 and the last updates. I told IE to accept installation of the ActiveX, but after it, this message has appeared. Provably there is a place where to tall to WinXP to not validate if the code is signed... but I don\'t know where.
 
@@ -600,7 +600,7 @@
 	$quote_ids[] = $quote->id;
 
 	$product_key = array_rand($product_ids); 
-	$query = "insert into quotesproductrel ( quoteid, productid, quantity, listprice ) values (".$quote->id.",".$product_ids[$product_key].",10,2999.000 )";
+	$query = "insert into vtiger_quotesproductrel ( quoteid, productid, quantity, listprice ) values (".$quote->id.",".$product_ids[$product_key].",10,2999.000 )";
 	$db->query($query);
 }
 
@@ -633,7 +633,7 @@
 	$salesorder_ids[] = $so->id;
 	
 	$product_key = array_rand($product_ids);
-        $query = "insert into soproductrel ( salesorderid, productid, quantity, listprice ) values (".$so->id.",".$product_ids[$product_key].",12,499.000 )";
+        $query = "insert into vtiger_soproductrel ( vtiger_salesorderid, productid, quantity, listprice ) values (".$so->id.",".$product_ids[$product_key].",12,499.000 )";
         $db->query($query);
 
 }
@@ -668,7 +668,7 @@
 	$purchaseorder_ids[] = $po->id;
 
 	$product_key = array_rand($product_ids);
-        $query = "insert into poproductrel ( purchaseorderid, productid, quantity, listprice ) values (".$po->id.",".$product_ids[$product_key].",15,1299.000 )";
+        $query = "insert into vtiger_poproductrel ( vtiger_purchaseorderid, productid, quantity, listprice ) values (".$po->id.",".$product_ids[$product_key].",15,1299.000 )";
         $db->query($query);
 
 }
@@ -701,16 +701,16 @@
 	if ($i > 3)
 	{
 		$freetag = $adb->getUniqueId('freetags');
-		$query = "insert into freetags values ($freetag, '$cloudtag[0]', '$cloudtag[0]')";
+		$query = "insert into vtiger_freetags values ($freetag, '$cloudtag[0]', '$cloudtag[0]')";
 		$res_inv = $adb->query($query);
 
 		$date = date('YmdHis'); 
-		$query_tag = "insert into freetagged_objects values ($freetag, 1,".$invoice->id.", $date, 'Invoice')";
+		$query_tag = "insert into vtiger_freetagged_objects values ($freetag, 1,".$invoice->id.", $date, 'Invoice')";
 		$result_inv = $adb->query($query_tag);
 	}
 
 	$product_key = array_rand($product_ids);
-        $query = "insert into invoiceproductrel ( invoiceid, productid, quantity, listprice ) values (".$invoice->id.",".$product_ids[$product_key].",18,269.000 )";
+        $query = "insert into vtiger_invoiceproductrel ( vtiger_invoiceid, productid, quantity, listprice ) values (".$invoice->id.",".$product_ids[$product_key].",18,269.000 )";
         $db->query($query);
 	
 }
@@ -781,7 +781,7 @@
 	$notes_ids[] = $notes ->id;
 	
 	$product_key = array_rand($product_ids);
-        $query = "insert into senotesrel (crmid, notesid) values (".$product_ids[$product_key].", ".$notes->id.")";
+        $query = "insert into vtiger_senotesrel (crmid, vtiger_notesid) values (".$product_ids[$product_key].", ".$notes->id.")";
 	$db->query($query);
 		
 }
@@ -823,11 +823,11 @@
 	if ($i > 3)
 	{
 		$freetag = $adb->getUniqueId('freetags');
-		$query = "insert into freetags values ($freetag, '$cloudtag[3]', '$cloudtag[3]')";
+		$query = "insert into vtiger_freetags values ($freetag, '$cloudtag[3]', '$cloudtag[3]')";
 		$res_tkt = $adb->query($query);
 
 		$date = date('YmdHis'); 
-		$query_tag = "insert into freetagged_objects values ($freetag, 1,".$helpdesk->id.", $date, 'HelpDesk')";
+		$query_tag = "insert into vtiger_freetagged_objects values ($freetag, 1,".$helpdesk->id.", $date, 'HelpDesk')";
 		$result_tkt = $adb->query($query_tag);
 	}
 
@@ -915,7 +915,7 @@
 }
 
 
-$adb->query("update crmentity set smcreatorid=".$assigned_user_id);
+$adb->query("update vtiger_crmentity set smcreatorid=".$assigned_user_id);
 
 $expected_revenue = Array("250000","750000","500000");
 $budget_cost = Array("25000","50000","90000");

Modified: vtigercrm/trunk/modules/Accounts/Account.php
==============================================================================
--- vtigercrm/trunk/modules/Accounts/Account.php (original)
+++ vtigercrm/trunk/modules/Accounts/Account.php Mon Jun 12 14:26:25 2006
@@ -33,23 +33,23 @@
 require_once('modules/Emails/Email.php');
 require_once('include/utils/utils.php');
 
-// Account is used to store account information.
+// Account is used to store vtiger_account information.
 class Account extends CRMEntity {
 	var $log;
 	var $db;
 
 	var $table_name = "account";
-	var $tab_name = Array('crmentity','account','accountbillads','accountshipads','accountscf');
-	var $tab_name_index = Array('crmentity'=>'crmid','account'=>'accountid','accountbillads'=>'accountaddressid','accountshipads'=>'accountaddressid','accountscf'=>'accountid');
-
-	var $entity_table = "crmentity";
-
-	var $billadr_table = "accountbillads";
+	var $tab_name = Array('vtiger_crmentity','vtiger_account','vtiger_accountbillads','vtiger_accountshipads','vtiger_accountscf');
+	var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_account'=>'accountid','vtiger_accountbillads'=>'accountaddressid','vtiger_accountshipads'=>'accountaddressid','vtiger_accountscf'=>'accountid');
+
+	var $entity_table = "vtiger_crmentity";
+
+	var $billadr_table = "vtiger_accountbillads";
 
 	var $object_name = "Accounts";
 	// Mike Crowe Mod --------------------------------------------------------added for general search
-	var $base_table_name = "account";
-	var $cf_table_name = "accountscf";
+	var $base_table_name = "vtiger_account";
+	var $cf_table_name = "vtiger_accountscf";
 
 	var $new_schema = true;
 
@@ -60,13 +60,13 @@
 	var $sortby_fields = Array('accountname','city','website','phone','smownerid');		
 
 
-	// This is the list of fields that are in the lists.
+	// This is the list of vtiger_fields that are in the lists.
 	var $list_fields = Array(
-			'Account Name'=>Array('account'=>'accountname'),
-			'City'=>Array('accountbillads'=>'city'), 
-			'Website'=>Array('account'=>'website'),
-			'Phone'=>Array('account'=> 'phone'),
-			'Assigned To'=>Array('crmentity'=>'smownerid')
+			'Account Name'=>Array('vtiger_account'=>'accountname'),
+			'City'=>Array('vtiger_accountbillads'=>'city'), 
+			'Website'=>Array('vtiger_account'=>'website'),
+			'Phone'=>Array('vtiger_account'=> 'phone'),
+			'Assigned To'=>Array('vtiger_crmentity'=>'smownerid')
 			);
 
 	var $list_fields_name = Array(
@@ -79,8 +79,8 @@
 	var $list_link_field= 'accountname';
 
 	var $search_fields = Array(
-			'Account Name'=>Array('account'=>'accountname'),
-			'City'=>Array('accountbillads'=>'city'), 
+			'Account Name'=>Array('vtiger_account'=>'accountname'),
+			'City'=>Array('vtiger_accountbillads'=>'city'), 
 			);
 
 	var $search_fields_name = Array(
@@ -88,7 +88,7 @@
 			'City'=>'bill_city',
 			);
 
-	// This is the list of fields that are required.
+	// This is the list of vtiger_fields that are required.
 	var $required_fields =  array("accountname"=>1);
 
 	//Added these variables which are used as default order by and sortorder in ListView
@@ -149,21 +149,21 @@
 		$returnset = '&return_module=Accounts&return_action=DetailView&return_id='.$id;
 
 		//SQL
-		$query = "SELECT contactdetails.*,
-				crmentity.crmid,
-                        	crmentity.smownerid,
-				users.user_name
-			FROM contactdetails
-			INNER JOIN crmentity
-				ON crmentity.crmid = 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 crmentity.deleted = 0
-			AND contactdetails.accountid = ".$id;
+		$query = "SELECT vtiger_contactdetails.*,
+			vtiger_crmentity.crmid,
+                        vtiger_crmentity.smownerid,
+			vtiger_users.user_name
+			FROM vtiger_contactdetails
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_contactdetails.contactid
+			LEFT JOIN vtiger_contactgrouprelation
+				ON vtiger_contactdetails.contactid = vtiger_contactgrouprelation.contactid
+			LEFT JOIN vtiger_groups
+				ON vtiger_groups.groupname = vtiger_contactgrouprelation.groupname
+			LEFT JOIN vtiger_users
+				ON vtiger_crmentity.smownerid = vtiger_users.id
+			WHERE vtiger_crmentity.deleted = 0
+			AND vtiger_contactdetails.accountid = ".$id;
 		$log->debug("Exiting get_contacts method ...");
 		return GetRelatedList('Accounts','Contacts',$focus,$query,$button,$returnset);
 	}
@@ -188,23 +188,23 @@
 		}
 		$returnset = '&return_module=Accounts&return_action=DetailView&return_id='.$id;
 
-		$query = "SELECT potential.potentialid, potential.accountid,
-				potential.potentialname, potential.sales_stage,
-				potential.potentialtype, potential.amount,
-				potential.closingdate, potential.potentialtype,
-				users.user_name,
-				crmentity.crmid, crmentity.smownerid
-			FROM potential
-			INNER JOIN crmentity
-				ON crmentity.crmid = potential.potentialid
-			LEFT JOIN users
-				ON crmentity.smownerid = users.id
-			LEFT JOIN potentialgrouprelation
-				ON potential.potentialid = potentialgrouprelation.potentialid
-			LEFT JOIN groups
-				ON groups.groupname = potentialgrouprelation.groupname
-			WHERE crmentity.deleted = 0
-			AND potential.accountid = ".$id;
+		$query = "SELECT vtiger_potential.potentialid, vtiger_potential.accountid,
+			vtiger_potential.potentialname, vtiger_potential.sales_stage,
+			vtiger_potential.potentialtype, vtiger_potential.amount,
+			vtiger_potential.closingdate, vtiger_potential.potentialtype,
+			vtiger_users.user_name,
+			vtiger_crmentity.crmid, vtiger_crmentity.smownerid
+			FROM vtiger_potential
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_potential.potentialid
+			LEFT JOIN vtiger_users
+				ON vtiger_crmentity.smownerid = vtiger_users.id
+			LEFT JOIN vtiger_potentialgrouprelation
+				ON vtiger_potential.potentialid = vtiger_potentialgrouprelation.potentialid
+			LEFT JOIN vtiger_groups
+				ON vtiger_groups.groupname = vtiger_potentialgrouprelation.groupname
+			WHERE vtiger_crmentity.deleted = 0
+			AND vtiger_potential.accountid = ".$id;
 		$log->debug("Exiting get_opportunities method ...");
 
 		return GetRelatedList('Accounts','Potentials',$focus,$query,$button,$returnset);
@@ -231,42 +231,42 @@
 		}
 		$returnset = '&return_module=Accounts&return_action=DetailView&return_id='.$id;
 
-		$query = "SELECT activity.*,
-				seactivityrel.*,
-				contactdetails.contactid, contactdetails.lastname,
-				contactdetails.firstname,
-				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."
+		$query = "SELECT vtiger_activity.*,
+			vtiger_seactivityrel.*,
+			vtiger_contactdetails.contactid, vtiger_contactdetails.lastname,
+			vtiger_contactdetails.firstname,
+			vtiger_crmentity.crmid, vtiger_crmentity.smownerid,
+			vtiger_crmentity.modifiedtime,
+			vtiger_users.user_name,
+			vtiger_recurringevents.recurringtype
+			FROM vtiger_activity
+			INNER JOIN vtiger_seactivityrel
+				ON vtiger_seactivityrel.activityid = vtiger_activity.activityid
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_activity.activityid
+			LEFT JOIN vtiger_cntactivityrel
+				ON vtiger_cntactivityrel.activityid = vtiger_activity.activityid
+			LEFT JOIN vtiger_contactdetails
+				ON vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid
+			LEFT JOIN vtiger_users
+				ON vtiger_users.id = vtiger_crmentity.smownerid
+			LEFT OUTER JOIN vtiger_recurringevents
+				ON vtiger_recurringevents.activityid = vtiger_activity.activityid
+			LEFT JOIN vtiger_activitygrouprelation
+				ON vtiger_activitygrouprelation.activityid = vtiger_crmentity.crmid
+			LEFT JOIN vtiger_groups
+				ON vtiger_groups.groupname = vtiger_activitygrouprelation.groupname
+			WHERE vtiger_seactivityrel.crmid = ".$id."
 			AND (activitytype='Task'
-				OR activitytype='Call'
-				OR activitytype='Meeting')
-			AND crmentity.deleted = 0
-			AND ((activity.status IS NOT NULL
-					AND activity.status != 'Completed')
-				AND (activity.status IS NOT NULL
-					AND activity.status != 'Deferred')
-				OR (activity.eventstatus !=''
-					AND  activity.eventstatus != 'Held'))";
+				OR vtiger_activitytype='Call'
+				OR vtiger_activitytype='Meeting')
+			AND vtiger_crmentity.deleted = 0
+			AND ((vtiger_activity.status IS NOT NULL
+					AND vtiger_activity.status != 'Completed')
+				AND (vtiger_activity.status IS NOT NULL
+					AND vtiger_activity.status != 'Deferred')
+				OR (vtiger_activity.eventstatus !=''
+					AND  vtiger_activity.eventstatus != 'Held'))";
 		$log->debug("Exiting get_activities method ...");
 		return GetRelatedList('Accounts','Activities',$focus,$query,$button,$returnset);
 
@@ -276,37 +276,37 @@
 	{
 		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, crmentity.createdtime,
-				crmentity.description,
-				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 activitygrouprelation
-				ON activitygrouprelation.activityid = activity.activityid
-			LEFT JOIN groups
-				ON groups.groupname = activitygrouprelation.groupname
-			INNER JOIN users
-				ON crmentity.smcreatorid = users.id
-			WHERE (activity.activitytype = 'Meeting'
-				OR activity.activitytype = 'Call'
-				OR activity.activitytype = 'Task')
-			AND (activity.status = 'Completed'
-				OR activity.status = 'Deferred'
-				OR (activity.eventstatus = 'Held'
-					AND activity.eventstatus != ''))
-			AND seactivityrel.crmid = ".$id;
+		$query = "SELECT vtiger_activity.activityid, vtiger_activity.subject,
+			vtiger_activity.status, vtiger_activity.eventstatus,
+			vtiger_activity.activitytype,
+			vtiger_contactdetails.contactid, vtiger_contactdetails.firstname,
+			vtiger_contactdetails.lastname,
+			vtiger_crmentity.modifiedtime, vtiger_crmentity.createdtime,
+			vtiger_crmentity.description,
+			vtiger_users.user_name
+			FROM vtiger_activity
+			INNER JOIN vtiger_seactivityrel
+				ON vtiger_seactivityrel.activityid = vtiger_activity.activityid
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_activity.activityid
+			LEFT JOIN vtiger_cntactivityrel
+				ON vtiger_cntactivityrel.activityid = vtiger_activity.activityid 
+			LEFT JOIN vtiger_contactdetails
+				ON vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid
+			LEFT JOIN vtiger_activitygrouprelation
+				ON vtiger_activitygrouprelation.activityid = vtiger_activity.activityid
+			LEFT JOIN vtiger_groups
+				ON vtiger_groups.groupname = vtiger_activitygrouprelation.groupname
+			INNER JOIN vtiger_users
+				ON vtiger_crmentity.smcreatorid = vtiger_users.id
+			WHERE (vtiger_activity.activitytype = 'Meeting'
+				OR vtiger_activity.activitytype = 'Call'
+				OR vtiger_activity.activitytype = 'Task')
+			AND (vtiger_activity.status = 'Completed'
+				OR vtiger_activity.status = 'Deferred'
+				OR (vtiger_activity.eventstatus = 'Held'
+					AND vtiger_activity.eventstatus != ''))
+			AND vtiger_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('Accounts',$query,$id);
@@ -317,49 +317,49 @@
 		 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
-		$query = "SELECT notes.title, notes.notecontent AS description,
-				notes.filename, notes.notesid AS crmid,
+		// Desc: Inserted crm2.createdtime, vtiger_notes.notecontent description, vtiger_users.user_name
+		// Inserted inner join vtiger_users on crm2.smcreatorid= vtiger_users.id
+		$query = "SELECT vtiger_notes.title, vtiger_notes.notecontent AS description,
+			vtiger_notes.filename, vtiger_notes.notesid AS crmid,
 				'Notes      ' AS ActivityType,
-				attachments.type AS FileType,
+			vtiger_attachments.type AS FileType,
 				crm2.modifiedtime AS lastmodified, crm2.createdtime,
-				seattachmentsrel.attachmentsid,
-				users.user_name
-			FROM notes
-			INNER JOIN senotesrel
-				ON senotesrel.notesid = notes.notesid
-			INNER JOIN crmentity
-				ON crmentity.crmid = senotesrel.crmid
-			INNER JOIN crmentity crm2
-				ON crm2.crmid = notes.notesid
+			vtiger_seattachmentsrel.attachmentsid,
+			vtiger_users.user_name
+			FROM vtiger_notes
+			INNER JOIN vtiger_senotesrel
+				ON vtiger_senotesrel.notesid = vtiger_notes.notesid
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_senotesrel.crmid
+			INNER JOIN vtiger_crmentity crm2
+				ON crm2.crmid = vtiger_notes.notesid
 				AND crm2.deleted = 0
-			LEFT JOIN seattachmentsrel
-				ON seattachmentsrel.crmid = notes.notesid
-			LEFT JOIN attachments
-				ON seattachmentsrel.attachmentsid = attachments.attachmentsid
-			INNER JOIN users
-				ON crm2.smcreatorid = users.id
-			WHERE crmentity.crmid = ".$id."
+			LEFT JOIN vtiger_seattachmentsrel
+				ON vtiger_seattachmentsrel.crmid = vtiger_notes.notesid
+			LEFT JOIN vtiger_attachments
+				ON vtiger_seattachmentsrel.attachmentsid = vtiger_attachments.attachmentsid
+			INNER JOIN vtiger_users
+				ON crm2.smcreatorid = vtiger_users.id
+			WHERE vtiger_crmentity.crmid = ".$id."
 		 UNION ALL
-			SELECT attachments.description AS title, attachments.description,
-				attachments.name AS filename,
-				seattachmentsrel.attachmentsid AS crmid,
+			SELECT vtiger_attachments.description AS title, vtiger_attachments.description,
+			vtiger_attachments.name AS filename,
+			vtiger_seattachmentsrel.attachmentsid AS crmid,
 				'Attachments' AS ActivityType,
-				attachments.type AS FileType,
+			vtiger_attachments.type AS FileType,
 				crm2.modifiedtime AS lastmodified, crm2.createdtime,
-				attachments.attachmentsid,
-				users.user_name
-			FROM attachments
-			INNER JOIN seattachmentsrel
-				ON seattachmentsrel.attachmentsid = attachments.attachmentsid
-			INNER JOIN crmentity
-				ON crmentity.crmid = seattachmentsrel.crmid
-			INNER JOIN crmentity crm2
-				ON crm2.crmid = attachments.attachmentsid
-			INNER JOIN users
-				ON crm2.smcreatorid = users.id
-			WHERE crmentity.crmid = ".$id."
+			vtiger_attachments.attachmentsid,
+			vtiger_users.user_name
+			FROM vtiger_attachments
+			INNER JOIN vtiger_seattachmentsrel
+				ON vtiger_seattachmentsrel.attachmentsid = vtiger_attachments.attachmentsid
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_seattachmentsrel.crmid
+			INNER JOIN vtiger_crmentity crm2
+				ON crm2.crmid = vtiger_attachments.attachmentsid
+			INNER JOIN vtiger_users
+				ON crm2.smcreatorid = vtiger_users.id
+			WHERE vtiger_crmentity.crmid = ".$id."
 			ORDER BY createdtime DESC";
 		$log->debug("Exiting get_attachments method ...");
 		return getAttachmentsAndNotes('Accounts',$query,$id);
@@ -381,27 +381,27 @@
 		$returnset = '&return_module=Accounts&return_action=DetailView&return_id='.$id;
 
 
-		$query = "SELECT users.user_name,
-				groups.groupname,
-				crmentity.*,
-				quotes.*,
-				potential.potentialname,
-				account.accountname
-			FROM quotes
-			INNER JOIN crmentity
-				ON crmentity.crmid = quotes.quoteid
-			LEFT OUTER JOIN account
-				ON account.accountid = quotes.accountid
-			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
-			LEFT JOIN users
-				ON crmentity.smownerid = users.id
-			WHERE crmentity.deleted = 0
-			AND account.accountid = ".$id;
+		$query = "SELECT vtiger_users.user_name,
+			vtiger_groups.groupname,
+			vtiger_crmentity.*,
+			vtiger_quotes.*,
+			vtiger_potential.potentialname,
+			vtiger_account.accountname
+			FROM vtiger_quotes
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_quotes.quoteid
+			LEFT OUTER JOIN vtiger_account
+				ON vtiger_account.accountid = vtiger_quotes.accountid
+			LEFT OUTER JOIN vtiger_potential
+				ON vtiger_potential.potentialid = vtiger_quotes.potentialid
+			LEFT JOIN vtiger_quotegrouprelation
+				ON vtiger_quotes.quoteid = vtiger_quotegrouprelation.quoteid
+			LEFT JOIN vtiger_groups
+				ON vtiger_groups.groupname = vtiger_quotegrouprelation.groupname
+			LEFT JOIN vtiger_users
+				ON vtiger_crmentity.smownerid = vtiger_users.id
+			WHERE vtiger_crmentity.deleted = 0
+			AND vtiger_account.accountid = ".$id;
 		$log->debug("Exiting get_quotes method ...");
 		return GetRelatedList('Accounts','Quotes',$focus,$query,$button,$returnset);
 	}
@@ -421,27 +421,27 @@
 		}
 		$returnset = '&return_module=Accounts&return_action=DetailView&return_id='.$id;
 
-		$query = "SELECT users.user_name,
-				groups.groupname,
-				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
-			LEFT OUTER JOIN salesorder
-				ON salesorder.salesorderid = invoice.salesorderid
-			LEFT JOIN invoicegrouprelation
-				ON invoice.invoiceid = invoicegrouprelation.invoiceid
-			LEFT JOIN groups
-				ON groups.groupname = invoicegrouprelation.groupname
-			LEFT JOIN users
-				ON crmentity.smownerid = users.id
-			WHERE crmentity.deleted = 0
-			AND account.accountid = ".$id;
+		$query = "SELECT vtiger_users.user_name,
+			vtiger_groups.groupname,
+			vtiger_crmentity.*,
+			vtiger_invoice.*,
+			vtiger_account.accountname,
+			vtiger_salesorder.subject AS salessubject
+			FROM vtiger_invoice
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_invoice.invoiceid
+			LEFT OUTER JOIN vtiger_account
+				ON vtiger_account.accountid = vtiger_invoice.accountid
+			LEFT OUTER JOIN vtiger_salesorder
+				ON vtiger_salesorder.salesorderid = vtiger_invoice.salesorderid
+			LEFT JOIN vtiger_invoicegrouprelation
+				ON vtiger_invoice.invoiceid = vtiger_invoicegrouprelation.invoiceid
+			LEFT JOIN vtiger_groups
+				ON vtiger_groups.groupname = vtiger_invoicegrouprelation.groupname
+			LEFT JOIN vtiger_users
+				ON vtiger_crmentity.smownerid = vtiger_users.id
+			WHERE vtiger_crmentity.deleted = 0
+			AND vtiger_account.accountid = ".$id;
 		$log->debug("Exiting get_invoices method ...");
 		return GetRelatedList('Accounts','Invoice',$focus,$query,$button,$returnset);
 	}
@@ -462,27 +462,27 @@
 
 		$returnset = '&return_module=Accounts&return_action=DetailView&return_id='.$id;
 
-		$query = "SELECT crmentity.*,
-				salesorder.*,
-				quotes.subject AS quotename,
-				account.accountname,
-				users.user_name,
-				groups.groupname
-			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
-			LEFT JOIN users
-				ON crmentity.smownerid = users.id
-			WHERE crmentity.deleted = 0
-			AND salesorder.accountid = ".$id;
+		$query = "SELECT vtiger_crmentity.*,
+			vtiger_salesorder.*,
+			vtiger_quotes.subject AS quotename,
+			vtiger_account.accountname,
+			vtiger_users.user_name,
+			vtiger_groups.groupname
+			FROM vtiger_salesorder
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_salesorder.salesorderid
+			LEFT OUTER JOIN vtiger_quotes
+				ON vtiger_quotes.quoteid = vtiger_salesorder.quoteid
+			LEFT OUTER JOIN vtiger_account
+				ON vtiger_account.accountid = vtiger_salesorder.accountid
+			LEFT JOIN vtiger_sogrouprelation
+				ON vtiger_salesorder.salesorderid = vtiger_sogrouprelation.salesorderid
+			LEFT JOIN vtiger_groups
+				ON vtiger_groups.groupname = vtiger_sogrouprelation.groupname
+			LEFT JOIN vtiger_users
+				ON vtiger_crmentity.smownerid = vtiger_users.id
+			WHERE vtiger_crmentity.deleted = 0
+			AND vtiger_salesorder.accountid = ".$id;
 		$log->debug("Exiting get_salesorder method ...");		
 		return GetRelatedList('Accounts','SalesOrder',$focus,$query,$button,$returnset);
 	}
@@ -498,23 +498,23 @@
 		$button .= '<td valign="bottom" align="right"><input title="New TICKET" accessyKey="F" class="button" onclick="this.form.action.value=\'EditView\';this.form.module.value=\'HelpDesk\'" type="submit" name="button" value="'.$app_strings['LBL_NEW_TICKET'].'">&nbsp;</td>';
 		$returnset = '&return_module=Accounts&return_action=DetailView&return_id='.$id;
 
-		$query = "SELECT users.user_name, users.id,
-				troubletickets.title, troubletickets.ticketid AS crmid,
-				troubletickets.status, troubletickets.priority,
-				troubletickets.parent_id,
-				crmentity.smownerid, crmentity.modifiedtime
-			FROM troubletickets
-			INNER JOIN crmentity
-				ON crmentity.crmid = troubletickets.ticketid
-			LEFT JOIN account
-				ON account.accountid = 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 account.accountid = ".$id ;
+		$query = "SELECT vtiger_users.user_name, vtiger_users.id,
+			vtiger_troubletickets.title, vtiger_troubletickets.ticketid AS crmid,
+			vtiger_troubletickets.status, vtiger_troubletickets.priority,
+			vtiger_troubletickets.parent_id,
+			vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime
+			FROM vtiger_troubletickets
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_troubletickets.ticketid
+			LEFT JOIN vtiger_account
+				ON vtiger_account.accountid = vtiger_troubletickets.parent_id
+			LEFT JOIN vtiger_users
+				ON vtiger_users.id=vtiger_crmentity.smownerid
+			LEFT JOIN vtiger_ticketgrouprelation
+				ON vtiger_troubletickets.ticketid = vtiger_ticketgrouprelation.ticketid
+			LEFT JOIN vtiger_groups
+				ON vtiger_groups.groupname = vtiger_ticketgrouprelation.groupname
+			WHERE vtiger_account.accountid = ".$id ;
 		//Appending the security parameter
 		global $current_user;
 		require('user_privileges/user_privileges_'.$current_user->id.'.php');
@@ -527,25 +527,25 @@
 
 		}
 		$query .= " UNION ALL
-			SELECT users.user_name, users.id,
-				troubletickets.title, troubletickets.ticketid AS crmid,
-				troubletickets.status, troubletickets.priority,
-				troubletickets.parent_id,
-				crmentity.smownerid, crmentity.modifiedtime
-			FROM troubletickets
-			INNER JOIN crmentity
-				ON crmentity.crmid = troubletickets.ticketid
-			LEFT JOIN contactdetails
-				ON contactdetails.contactid = troubletickets.parent_id
-			LEFT JOIN account
-				ON account.accountid = contactdetails.accountid
-			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 account.accountid = ".$id;
+			SELECT vtiger_users.user_name, vtiger_users.id,
+			vtiger_troubletickets.title, vtiger_troubletickets.ticketid AS crmid,
+			vtiger_troubletickets.status, vtiger_troubletickets.priority,
+			vtiger_troubletickets.parent_id,
+			vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime
+			FROM vtiger_troubletickets
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_troubletickets.ticketid
+			LEFT JOIN vtiger_contactdetails
+				ON vtiger_contactdetails.contactid = vtiger_troubletickets.parent_id
+			LEFT JOIN vtiger_account
+				ON vtiger_account.accountid = vtiger_contactdetails.accountid
+			LEFT JOIN vtiger_users
+				ON vtiger_users.id = vtiger_crmentity.smownerid
+			LEFT JOIN vtiger_ticketgrouprelation
+				ON vtiger_troubletickets.ticketid = vtiger_ticketgrouprelation.ticketid
+			LEFT JOIN vtiger_groups
+				ON vtiger_groups.groupname = vtiger_ticketgrouprelation.groupname
+			WHERE vtiger_account.accountid = ".$id;
 		$log->debug("Exiting get_tickets method ...");
 		return GetRelatedList('Accounts','HelpDesk',$focus,$query,$button,$returnset);
 	}
@@ -569,19 +569,19 @@
 		}
 		$returnset = '&return_module=Accounts&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
-			FROM products
-			INNER JOIN seproductsrel
-				ON products.productid = seproductsrel.productid
-			INNER JOIN crmentity
-				ON crmentity.crmid = products.productid
-			INNER JOIN account
-				ON account.accountid = seproductsrel.crmid
-			WHERE account.accountid = ".$id."
-			AND crmentity.deleted = 0";
+		$query = "SELECT vtiger_products.productid, vtiger_products.productname,
+			vtiger_products.productcode, vtiger_products.commissionrate,
+			vtiger_products.qty_per_unit, vtiger_products.unit_price,
+			vtiger_crmentity.crmid, vtiger_crmentity.smownerid
+			FROM vtiger_products
+			INNER JOIN vtiger_seproductsrel
+				ON vtiger_products.productid = vtiger_seproductsrel.productid
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_products.productid
+			INNER JOIN vtiger_account
+				ON vtiger_account.accountid = vtiger_seproductsrel.crmid
+			WHERE vtiger_account.accountid = ".$id."
+			AND vtiger_crmentity.deleted = 0";
 		$log->debug("Exiting get_products method ...");
 		return GetRelatedList('Accounts','Products',$focus,$query,$button,$returnset);
 	}
@@ -595,62 +595,62 @@
 		{
 
 			$query = $this->constructCustomQueryAddendum('accountscf','Accounts') . "
-					account.*,
+				vtiger_account.*,
 					".$this->entity_table.".*,
-					accountbillads.city AS billing_city,
-					accountbillads.country AS billing_country,
-					accountbillads.code AS billing_code,
-					accountbillads.state AS billing_state,
-					accountbillads.street AS billing_street,
-					accountshipads.city AS shipping_city,
-					accountshipads.country AS shipping_country,
-					accountshipads.code AS shipping_code,
-					accountshipads.state AS shipping_state,
-					accountshipads.street AS shipping_street,
-					users.user_name,
-					users.status AS user_status
+				vtiger_accountbillads.city AS billing_city,
+				vtiger_accountbillads.country AS billing_country,
+				vtiger_accountbillads.code AS billing_code,
+				vtiger_accountbillads.state AS billing_state,
+				vtiger_accountbillads.street AS billing_street,
+				vtiger_accountshipads.city AS shipping_city,
+				vtiger_accountshipads.country AS shipping_country,
+				vtiger_accountshipads.code AS shipping_code,
+				vtiger_accountshipads.state AS shipping_state,
+				vtiger_accountshipads.street AS shipping_street,
+				vtiger_users.user_name,
+				vtiger_users.status AS user_status
 				FROM ".$this->entity_table."
-				INNER JOIN account
-					ON crmentity.crmid = account.accountid
-				LEFT JOIN accountbillads
-					ON account.accountid = accountbillads.accountaddressid
-				LEFT JOIN accountshipads
-					ON account.accountid = accountshipads.accountaddressid
-				LEFT JOIN accountscf 
-					ON accountscf.accountid = account.accountid
-				LEFT JOIN users
-					ON crmentity.smownerid = users.id ";
+				INNER JOIN vtiger_account
+					ON vtiger_crmentity.crmid = vtiger_account.accountid
+				LEFT JOIN vtiger_accountbillads
+					ON vtiger_account.accountid = vtiger_accountbillads.accountaddressid
+				LEFT JOIN vtiger_accountshipads
+					ON vtiger_account.accountid = vtiger_accountshipads.accountaddressid
+				LEFT JOIN vtiger_accountscf 
+					ON vtiger_accountscf.accountid = vtiger_account.accountid
+				LEFT JOIN vtiger_users
+					ON vtiger_crmentity.smownerid = vtiger_users.id ";
 
 		}
 		else
 		{
-			$query = "SELECT account.*,
+			$query = "SELECT vtiger_account.*,
 					".$this->entity_table.".*,
-					accountbillads.city AS billing_city,
-					accountbillads.country AS billing_country,
-					accountbillads.code AS billing_code,
-					accountbillads.state AS billing_state,
-					accountbillads.street AS billing_street,
-					accountshipads.city AS shipping_city,
-					accountshipads.country AS shipping_country,
-					accountshipads.code AS shipping_code,
-					accountshipads.state AS shipping_state,
-					accountshipads.street AS shipping_street,
-					users.user_name,
-					users.status AS user_status
+				vtiger_accountbillads.city AS billing_city,
+				vtiger_accountbillads.country AS billing_country,
+				vtiger_accountbillads.code AS billing_code,
+				vtiger_accountbillads.state AS billing_state,
+				vtiger_accountbillads.street AS billing_street,
+				vtiger_accountshipads.city AS shipping_city,
+				vtiger_accountshipads.country AS shipping_country,
+				vtiger_accountshipads.code AS shipping_code,
+				vtiger_accountshipads.state AS shipping_state,
+				vtiger_accountshipads.street AS shipping_street,
+				vtiger_users.user_name,
+				vtiger_users.status AS user_status
 				FROM ".$this->entity_table."
-				INNER JOIN account
-					ON crmentity.crmid = account.accountid
-				LEFT JOIN accountbillads
-					ON account.accountid = accountbillads.accountaddressid
-				LEFT JOIN accountshipads
-					ON account.accountid = accountshipads.accountaddressid
-				LEFT JOIN users
-					ON crmentity.smownerid = users.id ";
-		}
-
-		$where_auto = " users.status = 'Active'
-			AND crmentity.deleted = 0 ";
+				INNER JOIN vtiger_account
+					ON vtiger_crmentity.crmid = vtiger_account.accountid
+				LEFT JOIN vtiger_accountbillads
+					ON vtiger_account.accountid = vtiger_accountbillads.accountaddressid
+				LEFT JOIN vtiger_accountshipads
+					ON vtiger_account.accountid = vtiger_accountshipads.accountaddressid
+				LEFT JOIN vtiger_users
+					ON vtiger_crmentity.smownerid = vtiger_users.id ";
+		}
+
+		$where_auto = " vtiger_users.status = 'Active'
+			AND vtiger_crmentity.deleted = 0 ";
 
 		if($where != "")
 			$query .= "WHERE ($where) AND ".$where_auto;
@@ -669,7 +669,7 @@
 	{
 		global $log;
                 $log->debug("Entering getColumnNames_Acnt() method ...");
-		$sql1 = "SELECT fieldlabel FROM field WHERE tabid = 6";
+		$sql1 = "SELECT vtiger_fieldlabel FROM vtiger_field WHERE vtiger_tabid = 6";
 		$result = $this->db->query($sql1);
 		$numRows = $this->db->num_rows($result);
 		for($i=0; $i < $numRows;$i++)

Modified: vtigercrm/trunk/modules/Accounts/Forms.php
==============================================================================
--- vtigercrm/trunk/modules/Accounts/Forms.php (original)
+++ vtigercrm/trunk/modules/Accounts/Forms.php Mon Jun 12 14:26:25 2006
@@ -27,7 +27,7 @@
 require_once('include/utils/utils.php'); //new
 
 /**
- * Create HTML form to enter a new record with the minimum necessary fields.
+ * Create HTML form to enter a new record with the minimum necessary vtiger_fields.
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
  * All Rights Reserved.
  * Contributor(s): ______________________________________..
@@ -52,7 +52,7 @@
 $qcreate_form = get_left_form_header($mod_strings['LBL_NEW_FORM_TITLE']);
 
 
-$qcreate_get_field="select * from field where tabid=6 and quickcreate=0 order by quickcreatesequence";
+$qcreate_get_field="select * from vtiger_field where vtiger_tabid=6 and quickcreate=0 order by quickcreatesequence";
 $qcreate_get_result=$adb->query($qcreate_get_field);
 $qcreate_get_noofrows=$adb->num_rows($qcreate_get_result);
 
@@ -138,9 +138,9 @@
 $qcreate_form.='</form>';
 $qcreate_form.='<script type="text/javascript">
 		
-	var fieldname = new Array('.$fieldName.')
-	var fieldlabel = new Array('.$fieldLabel.')
-	var fielddatatype = new Array('.$fldDataType.')
+	var vtiger_fieldname = new Array('.$fieldName.')
+	var vtiger_fieldlabel = new Array('.$fieldLabel.')
+	var vtiger_fielddatatype = new Array('.$fldDataType.')
 
 		</script>';
 

Modified: vtigercrm/trunk/modules/Accounts/ListViewTop.php
==============================================================================
--- vtigercrm/trunk/modules/Accounts/ListViewTop.php (original)
+++ vtigercrm/trunk/modules/Accounts/ListViewTop.php Mon Jun 12 14:26:25 2006
@@ -21,7 +21,7 @@
  ********************************************************************************/
 function getTopAccounts()
 {
-	$log = LoggerManager::getLogger('top accounts_list');
+	$log = LoggerManager::getLogger('top vtiger_accounts_list');
 	$log->debug("Entering getTopAccounts() method ...");
 	require_once("data/Tracker.php");
 	require_once('modules/Potentials/Opportunity.php');
@@ -33,7 +33,7 @@
 	global $current_user;
 	$current_module_strings = return_module_language($current_language, "Accounts");
 
-	$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.accountid, account.accountname, account.tickersymbol order by amount desc;";
+	$list_query = "select vtiger_account.accountid, vtiger_account.accountname, vtiger_account.tickersymbol, sum(vtiger_potential.amount) as amount from vtiger_potential inner join vtiger_crmentity on (vtiger_potential.potentialid=vtiger_crmentity.crmid) inner join vtiger_account on (vtiger_potential.accountid=vtiger_account.accountid) where vtiger_crmentity.deleted=0 AND vtiger_crmentity.smownerid='".$current_user->id."' and vtiger_potential.sales_stage <> '".$app_strings['LBL_CLOSE_WON']."' and vtiger_potential.sales_stage <> '".$app_strings['LBL_CLOSE_LOST']."' group by vtiger_account.accountid, vtiger_account.accountname, vtiger_account.tickersymbol order by amount desc;";
 	$list_result=$adb->query($list_query);
 	$open_accounts_list = array();
 	$noofrows = min($adb->num_rows($list_result),7);

Modified: vtigercrm/trunk/modules/Accounts/Merge.php
==============================================================================
--- vtigercrm/trunk/modules/Accounts/Merge.php (original)
+++ vtigercrm/trunk/modules/Accounts/Merge.php Mon Jun 12 14:26:25 2006
@@ -39,7 +39,7 @@
 }
 //get the particular file from db and store it in the local hard disk.
 //store the path to the location where the file is stored and pass it  as parameter to the method 
-$sql = "select filename,data,filesize from wordtemplates where templateid=".$templateid;
+$sql = "select filename,data,filesize from vtiger_wordtemplates where templateid=".$templateid;
 
 $result = $adb->query($sql);
 $temparray = $adb->fetch_array($result);
@@ -75,8 +75,8 @@
 
 //echo $mass_merge;
 //die;
-//for setting accountid=0 for the contacts which are deleted
-$ct_query = "select crmid from crmentity where setype='Contacts' and deleted=1";
+//for setting vtiger_accountid=0 for the contacts which are deleted
+$ct_query = "select crmid from vtiger_crmentity where setype='Contacts' and deleted=1";
 $result = $adb->query($ct_query);
 
 while($row = $adb->fetch_array($result))
@@ -87,13 +87,13 @@
 if(count($deleted_id) > 0)
 {
 	$deleted_id = implode(",",$deleted_id);
-	$update_query = "update contactdetails set accountid = 0 where contactid in (".$deleted_id.")";
+	$update_query = "update vtiger_contactdetails set vtiger_accountid = 0 where contactid in (".$deleted_id.")";
 	$result = $adb->query($update_query);
 }
-//End setting accountid=0 for the contacts which are deleted
+//End setting vtiger_accountid=0 for the contacts which are deleted
 
 //<<<<<<<<<<<<<<<<header for csv and select columns for query>>>>>>>>>>>>>>>>>>>>>>>>
-$query1="select tab.name,field.tablename,field.columnname,field.fieldlabel from field inner join tab on tab.tabid = field.tabid where field.tabid in (4,6) and field.block <> 6 and field.block <> 75 order by field.tablename";
+$query1="select vtiger_tab.name,vtiger_field.tablename,vtiger_field.columnname,vtiger_field.fieldlabel from vtiger_field inner join vtiger_tab on vtiger_tab.tabid = vtiger_field.tabid where vtiger_field.tabid in (4,6) and vtiger_field.block <> 6 and vtiger_field.block <> 75 order by vtiger_field.tablename";
 
 $result = $adb->query($query1);
 $y=$adb->num_rows($result);
@@ -116,7 +116,7 @@
   {
       if($modulename == "Accounts")
       {
-  			$querycolumns[$x] = "concat(users.last_name,' ',users.first_name) as userjoinname,users.first_name,users.last_name,users.user_name,users.yahoo_id,users.title,users.phone_work,users.department,users.phone_mobile,users.phone_other,users.phone_fax,users.email1,users.phone_home,users.email2,users.address_street,users.address_city,users.address_state,users.address_postalcode,users.address_country";
+  			$querycolumns[$x] = "concat(vtiger_users.last_name,' ',vtiger_users.first_name) as userjoinname,vtiger_users.first_name,vtiger_users.last_name,vtiger_users.user_name,vtiger_users.yahoo_id,vtiger_users.title,vtiger_users.phone_work,vtiger_users.department,vtiger_users.phone_mobile,vtiger_users.phone_other,vtiger_users.phone_fax,vtiger_users.email1,vtiger_users.phone_home,vtiger_users.email2,vtiger_users.address_street,vtiger_users.address_city,vtiger_users.address_state,vtiger_users.address_postalcode,vtiger_users.address_country";
       }
   		if($modulename == "Contacts")
       {
@@ -159,22 +159,22 @@
 {
 	$selectcolumns = implode($querycolumns,",");
 
-$query = "select  ".$selectcolumns." from account 
-				inner join crmentity on crmentity.crmid=account.accountid 
-				inner join accountbillads on account.accountid=accountbillads.accountaddressid 
-				inner join accountshipads on account.accountid=accountshipads.accountaddressid 
-				inner join accountscf on account.accountid = accountscf.accountid 
-				left join account as accountAccount on accountAccount.accountid = account.parentid
-				left join users on users.id = crmentity.smownerid
-				left join contactdetails on contactdetails.accountid=account.accountid
-				left join crmentity as crmentityContacts on crmentityContacts.crmid = contactdetails.contactid 
-				left join contactaddress on contactdetails.contactid = contactaddress.contactaddressid 
-				left join contactsubdetails on contactdetails.contactid = contactsubdetails.contactsubscriptionid 
-				left join contactscf on contactdetails.contactid = contactscf.contactid 
-				left join contactdetails as contactdetailsContacts on contactdetailsContacts.contactid = contactdetails.reportsto
-				left join account as accountContacts on accountContacts.accountid = contactdetails.accountid 
-				left join users as usersContacts on usersContacts.id = crmentityContacts.smownerid
-				where crmentity.deleted=0 and (crmentityContacts.deleted=0 || crmentityContacts.deleted is null) and account.accountid in(".$mass_merge.")";
+$query = "select  ".$selectcolumns." from vtiger_account 
+				inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_account.accountid 
+				inner join vtiger_accountbillads on vtiger_account.accountid=vtiger_accountbillads.accountaddressid 
+				inner join vtiger_accountshipads on vtiger_account.accountid=vtiger_accountshipads.accountaddressid 
+				inner join vtiger_accountscf on vtiger_account.accountid = vtiger_accountscf.accountid 
+				left join vtiger_account as vtiger_accountAccount on vtiger_accountAccount.accountid = vtiger_account.parentid
+				left join vtiger_users on vtiger_users.id = vtiger_crmentity.smownerid
+				left join vtiger_contactdetails on vtiger_contactdetails.accountid=vtiger_account.accountid
+				left join vtiger_crmentity as vtiger_crmentityContacts on vtiger_crmentityContacts.crmid = vtiger_contactdetails.contactid 
+				left join vtiger_contactaddress on vtiger_contactdetails.contactid = vtiger_contactaddress.contactaddressid 
+				left join vtiger_contactsubdetails on vtiger_contactdetails.contactid = vtiger_contactsubdetails.contactsubscriptionid 
+				left join vtiger_contactscf on vtiger_contactdetails.contactid = vtiger_contactscf.contactid 
+				left join vtiger_contactdetails as vtiger_contactdetailsContacts on vtiger_contactdetailsContacts.contactid = vtiger_contactdetails.reportsto
+				left join vtiger_account as vtiger_accountContacts on vtiger_accountContacts.accountid = vtiger_contactdetails.accountid 
+				left join vtiger_users as vtiger_usersContacts on vtiger_usersContacts.id = vtiger_crmentityContacts.smownerid
+				where vtiger_crmentity.deleted=0 and (crmentityContacts.deleted=0 || vtiger_crmentityContacts.deleted is null) and vtiger_account.accountid in(".$mass_merge.")";
 //echo $query;
 //die;	
 $result = $adb->query($query);
@@ -209,7 +209,7 @@
 $csvdata = implode($mergevalue,"###");
 }else
 {
-	die("No fields to do Merge");
+	die("No vtiger_fields to do Merge");
 }
 
 $handle = fopen($wordtemplatedownloadpath."datasrc.csv","wb");

Modified: vtigercrm/trunk/modules/Accounts/Popup_picker.php
==============================================================================
--- vtigercrm/trunk/modules/Accounts/Popup_picker.php (original)
+++ vtigercrm/trunk/modules/Accounts/Popup_picker.php Mon Jun 12 14:26:25 2006
@@ -99,9 +99,9 @@
 if($_REQUEST['form'] == 'TasksEditView')
 {
 	$the_javascript  = "<script type='text/javascript' language='JavaScript'>\n";
-	$the_javascript .= "function set_return(account_id, account_name) {\n";
-	$the_javascript .= "	window.opener.document.EditView.parent_name.value = account_name;\n";
-	$the_javascript .= "	window.opener.document.EditView.parent_id.value = account_id;\n";
+	$the_javascript .= "function set_return(account_id, vtiger_account_name) {\n";
+	$the_javascript .= "	window.opener.document.EditView.parent_name.value = vtiger_account_name;\n";
+	$the_javascript .= "	window.opener.document.EditView.parent_id.value = vtiger_account_id;\n";
 	$the_javascript .= "}\n";
 	$the_javascript .= "</script>\n";
 	$button  = "<table cellspacing='0' cellpadding='1' border='0'><form border='0' action='index.php' method='post' name='form' id='form'>\n";
@@ -113,9 +113,9 @@
 elseif($_REQUEST['form'] == 'HelpDeskEditView')
 {
 	$the_javascript  = "<script type='text/javascript' language='JavaScript'>\n";
-	$the_javascript .= "function set_return(account_id, account_name) {\n";
-	$the_javascript .= "	window.opener.document.EditView.parent_name.value = account_name;\n";
-	$the_javascript .= "	window.opener.document.EditView.parent_id.value = account_id;\n";
+	$the_javascript .= "function set_return(account_id, vtiger_account_name) {\n";
+	$the_javascript .= "	window.opener.document.EditView.parent_name.value = vtiger_account_name;\n";
+	$the_javascript .= "	window.opener.document.EditView.parent_id.value = vtiger_account_id;\n";
 	$the_javascript .= "}\n";
 	$the_javascript .= "</script>\n";
 	$button  = "<table cellspacing='0' cellpadding='1' border='0'><form border='0' action='index.php' method='post' name='form' id='form'>\n";
@@ -127,8 +127,8 @@
 elseif(isset($_REQUEST['form_submit']) && $_REQUEST['form'] == 'AccountDetailView' && $_REQUEST['form_submit'] == 'true')
 {
 	$the_javascript  = "<script type='text/javascript' language='JavaScript'>\n";
-	$the_javascript .= "function set_return(account_id, account_name) {\n";
-	$the_javascript .= "	window.opener.document.DetailView.member_id.value = account_id; \n";
+	$the_javascript .= "function set_return(account_id, vtiger_account_name) {\n";
+	$the_javascript .= "	window.opener.document.DetailView.member_id.value = vtiger_account_id; \n";
 	$the_javascript .= "	window.opener.document.DetailView.return_module.value = window.opener.document.DetailView.module.value; \n";
 	$the_javascript .= "	window.opener.document.DetailView.return_action.value = 'DetailView'; \n";
 	$the_javascript .= "	window.opener.document.DetailView.return_id.value = window.opener.document.DetailView.record.value; \n";
@@ -144,9 +144,9 @@
 elseif ($_REQUEST['form'] == 'EditView') 
 {
 	$the_javascript  = "<script type='text/javascript' language='JavaScript'>\n";
-	$the_javascript .= "function set_return(account_id, account_name) {\n";
-	$the_javascript .= "	window.opener.document.EditView.account_name.value = account_name;\n";
-	$the_javascript .= "	window.opener.document.EditView.account_id.value = account_id;\n";
+	$the_javascript .= "function set_return(account_id, vtiger_account_name) {\n";
+	$the_javascript .= "	window.opener.document.EditView.account_name.value = vtiger_account_name;\n";
+	$the_javascript .= "	window.opener.document.EditView.account_id.value = vtiger_account_id;\n";
 	$the_javascript .= "}\n";
 	$the_javascript .= "</script>\n";
 	$button  = "<table cellspacing='0' cellpadding='1' border='0'><form border='0' action='index.php' method='post' name='form' id='form'>\n";

Modified: vtigercrm/trunk/modules/Accounts/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Accounts/Save.php (original)
+++ vtigercrm/trunk/modules/Accounts/Save.php Mon Jun 12 14:26:25 2006
@@ -98,13 +98,13 @@
 if($_REQUEST['return_viewname'] == '') $return_viewname='0';
 if($_REQUEST['return_viewname'] != '')$return_viewname=$_REQUEST['return_viewname'];
 
-//Send notification mail to the assigned to owner about the account creation
+//Send notification mail to the assigned to owner about the vtiger_account creation
 if($focus->column_fields['notify_owner'] == 1 || $focus->column_fields['notify_owner'] == 'on')
 	$status = sendNotificationToOwner('Accounts',&$focus);
 
 header("Location: index.php?action=$return_action&module=$return_module&parenttab=$parenttab&record=$return_id&viewname=$return_viewname");
 
-//Code to save the custom field info into database
+//Code to save the custom vtiger_field info into database
 function save_customfields($entity_id)
 {
 	global $log;
@@ -114,12 +114,12 @@
 	$dbquery = "SELECT * FROM customfields WHERE module = 'Accounts'";
         /*
 	$result = mysql_query($dbquery);
-	$custquery = "SELECT * FROM accountcf WHERE accountid = '".$entity_id."'";
+	$custquery = "SELECT * FROM vtiger_accountcf WHERE vtiger_accountid = '".$entity_id."'";
         $cust_result = mysql_query($custquery);
 	if(mysql_num_rows($result) != 0)
         */
 	$result = $adb->query($dbquery);
-	$custquery = "SELECT * FROM accountcf WHERE accountid = '".$entity_id."'";
+	$custquery = "SELECT * FROM vtiger_accountcf WHERE vtiger_accountid = '".$entity_id."'";
         $cust_result = $adb->query($custquery);
 	if($adb->num_rows($result) != 0)
 	{
@@ -185,19 +185,19 @@
                   if(isset($_REQUEST['record']) && $_REQUEST['record'] != '' && $adb->num_rows($cust_result) !=0)
 		{
 			//Update Block
-                        $query = "UPDATE accountcf SET ".$update." WHERE accountid='".$entity_id."'"; 
+                        $query = "UPDATE vtiger_accountcf SET ".$update." WHERE vtiger_accountid='".$entity_id."'"; 
 			$adb->query($query);
 		}
 		else
 		{
 			//Insert Block
-			$query = "INSERT INTO accountcf (".$columns.") VALUES(".$values.")";
+			$query = "INSERT INTO vtiger_accountcf (".$columns.") VALUES(".$values.")";
                         $adb->query($query);
 		}
 		
 	}
 	$log->debug("Exiting save_customfields method ...");
-	// commented by srini - PATCH for saving accounts
+	// commented by srini - PATCH for saving vtiger_accounts
 	/*else
 	{
           //if(isset($_REQUEST['record']) && $_REQUEST['record'] != '' && mysql_num_rows($cust_result) !=0)
@@ -208,7 +208,7 @@
 		else
 		{
 			//Insert Block
-			$query = "INSERT INTO accountcf (".$columns.") VALUES(".$values.")";
+			$query = "INSERT INTO vtiger_accountcf (".$columns.") VALUES(".$values.")";
                         $adb->query($query);
 			//mysql_query($query);
 		}

Modified: vtigercrm/trunk/modules/Accounts/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Accounts/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Accounts/language/en_us.lang.php Mon Jun 12 14:26:25 2006
@@ -81,10 +81,10 @@
 'NTC_COPY_SHIPPING_ADDRESS'=>'Copy shipping address to billing address',
 'NTC_REMOVE_MEMBER_ORG_CONFIRMATION'=>'Are you sure you want to remove this record as a member organization?',
 'LBL_DUPLICATE'=>'Potential Duplicate Accounts',
-'MSG_DUPLICATE' => 'Creating this account may potentialy create a duplicate account. You may either select an account from the list below or you may click on Create New Account to continue creating a new account with the previously entered data.',
+'MSG_DUPLICATE' => 'Creating this vtiger_account may vtiger_potentialy create a duplicate vtiger_account. You may either select an vtiger_account from the list below or you may click on Create New Account to continue creating a new vtiger_account with the previously entered data.',
 
 'LBL_INVITEE'=>'Contacts',
-'ERR_DELETE_RECORD'=>"A record number must be specified to delete the account.",
+'ERR_DELETE_RECORD'=>"A record number must be specified to delete the vtiger_account.",
 
 'LBL_SELECT_ACCOUNT'=>'Select Account',
 'LBL_GENERAL_INFORMATION'=>'General Information',
@@ -104,7 +104,7 @@
 'LBL_NEW_CONTACT'=>'New Contact',
 'LBL_CONTACT_TITLE'=>'Contacts',
 
-//Added fields after RC1 - Release
+//Added vtiger_fields after RC1 - Release
 'LBL_ALL'=>'All',
 'LBL_PROSPECT'=>'Prospect',
 'LBL_INVESTOR'=>'Investor',

Modified: vtigercrm/trunk/modules/Activities/Activity.php
==============================================================================
--- vtigercrm/trunk/modules/Activities/Activity.php (original)
+++ vtigercrm/trunk/modules/Activities/Activity.php Mon Jun 12 14:26:25 2006
@@ -32,7 +32,7 @@
 	var $log;
 	var $db;
 
-	// Stored fields
+	// Stored vtiger_fields
   	var $eventid;
 	var $description;
 	var $firstname;
@@ -48,7 +48,7 @@
 
 	var $table_name = "activity";
 	#var $object_name = "activity";	
-		// Mike Crowe Mod --------------------------------------------------------Renamed to match tab
+		// Mike Crowe Mod --------------------------------------------------------Renamed to match vtiger_tab
 	var $object_name = "Activities";
 	// Mike Crowe Mod --------------------------------------------------------added for general search
     var $base_table_name = "activity";
@@ -58,17 +58,17 @@
 	
 	var $reminder_table = "activity_reminder";
 	
-	var $tab_name = Array('crmentity','activity','seactivityrel','cntactivityrel','salesmanactivityrel','activity_reminder','recurringevents','invitees');
-
-	var $tab_name_index = Array('crmentity'=>'crmid','activity'=>'activityid','seactivityrel'=>'activityid','cntactivityrel'=>'activityid','salesmanactivityrel'=>'activityid','activity_reminder'=>'activity_id','recurringevents'=>'activityid');
+	var $tab_name = Array('vtiger_crmentity','vtiger_activity','vtiger_seactivityrel','vtiger_cntactivityrel','vtiger_salesmanactivityrel','vtiger_activity_reminder','vtiger_recurringevents','vtiger_invitees');
+
+	var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_activity'=>'activityid','vtiger_seactivityrel'=>'activityid','vtiger_cntactivityrel'=>'activityid','vtiger_salesmanactivityrel'=>'activityid','vtiger_activity_reminder'=>'activity_id','vtiger_recurringevents'=>'activityid');
 
 	var $column_fields = Array();
 	var $sortby_fields = Array('subject','due_date','date_start','smownerid','activitytype');	//Sorting is added for due date and start date	
 
-	// This is used to retrieve related fields from form posts.
+	// This is used to retrieve related vtiger_fields from form posts.
 	var $additional_column_fields = Array('assigned_user_name', 'assigned_user_id', 'contactname', 'contact_phone', 'contact_email', 'parent_name');
 
-	// This is the list of fields that are in the lists.
+	// This is the list of vtiger_fields that are in the lists.
 	var $list_fields = Array(
        'Close'=>Array('activity'=>'status'),
        'Type'=>Array('activity'=>'activitytype'),
@@ -164,12 +164,12 @@
 
 			if(isPermitted("Contacts",3,"") == 'yes')
 			{
-				$button .= '<input title="Change" accessKey="" tabindex="2" type="button" class="button" value="'.$app_strings['LBL_SELECT_CONTACT_BUTTON_LABEL'].'" name="Button" LANGUAGE=javascript onclick=\'return window.open("index.php?module=Contacts&return_module=Activities&action=Popup&popuptype=detailview&form=EditView&form_submit=false&recordid='.$_REQUEST["record"].'","test","width=600,height=400,resizable=1,scrollbars=1");\'>&nbsp;';
+				$button .= '<input title="Change" accessKey="" vtiger_tabindex="2" type="button" class="button" value="'.$app_strings['LBL_SELECT_CONTACT_BUTTON_LABEL'].'" name="Button" LANGUAGE=javascript onclick=\'return window.open("index.php?module=Contacts&return_module=Activities&action=Popup&popuptype=detailview&form=EditView&form_submit=false&recordid='.$_REQUEST["record"].'","test","width=600,height=400,resizable=1,scrollbars=1");\'>&nbsp;';
 			}
 			$returnset = '&return_module=Activities&return_action=DetailView&activity_mode=Events&return_id='.$id;
 
 
-			$query = 'select contactdetails.accountid, contactdetails.contactid, contactdetails.firstname,contactdetails.lastname, contactdetails.department, contactdetails.title, contactdetails.email, contactdetails.phone, crmentity.crmid, crmentity.smownerid, crmentity.modifiedtime from contactdetails inner join seactivityrel on seactivityrel.crmid=contactdetails.contactid inner join crmentity on crmentity.crmid = contactdetails.contactid where seactivityrel.activityid='.$id.' and crmentity.deleted=0';
+			$query = 'select vtiger_contactdetails.accountid, vtiger_contactdetails.contactid, vtiger_contactdetails.firstname,vtiger_contactdetails.lastname, vtiger_contactdetails.department, vtiger_contactdetails.title, vtiger_contactdetails.email, vtiger_contactdetails.phone, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_contactdetails inner join vtiger_seactivityrel on vtiger_seactivityrel.crmid=vtiger_contactdetails.contactid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid where vtiger_seactivityrel.activityid='.$id.' and vtiger_crmentity.deleted=0';
 			$log->debug("Exiting get_contacts method ...");
 			return GetRelatedList('Activities','Contacts',$focus,$query,$button,$returnset);
         }
@@ -178,7 +178,7 @@
 	{
 			global $adb,$log;
 			$log->debug("Entering get_users(".$id.") method ...");
-			$query = 'SELECT users.id, users.first_name,users.last_name, users.user_name, users.email1, users.email2, users.yahoo_id, users.phone_home, users.phone_work, users.phone_mobile, users.phone_other, users.phone_fax,activity.date_start,activity.due_date,activity.time_start,activity.duration_hours,activity.duration_minutes from users inner join salesmanactivityrel on salesmanactivityrel.smid=users.id  inner join activity on activity.activityid=salesmanactivityrel.activityid where activity.activityid='.$id;
+			$query = 'SELECT vtiger_users.id, vtiger_users.first_name,vtiger_users.last_name, vtiger_users.user_name, vtiger_users.email1, vtiger_users.email2, vtiger_users.yahoo_id, vtiger_users.phone_home, vtiger_users.phone_work, vtiger_users.phone_mobile, vtiger_users.phone_other, vtiger_users.phone_fax,vtiger_activity.date_start,vtiger_activity.due_date,vtiger_activity.time_start,vtiger_activity.duration_hours,vtiger_activity.duration_minutes from vtiger_users inner join vtiger_salesmanactivityrel on vtiger_salesmanactivityrel.smid=vtiger_users.id  inner join vtiger_activity on vtiger_activity.activityid=vtiger_salesmanactivityrel.activityid where vtiger_activity.activityid='.$id;
 			$activity_id=$id;
 
 			global $mod_strings;
@@ -229,12 +229,12 @@
 				}
 
 			// To display the dates for the Group calendar starts -Jaguar
-			$recur_dates_qry='select distinct(recurringdate) from recurringevents where activityid='.$activity_id;
+			$recur_dates_qry='select distinct(recurringdate) from vtiger_recurringevents where vtiger_activityid='.$activity_id;
 			$recur_result=$adb->query($recur_dates_qry);
 			$noofrows_recur = $adb->num_rows($recur_result);
 			if($noofrows_recur==0)
 			{
-				$recur_dates_qry='select activity.date_start,recurringevents.* from activity left outer join recurringevents on activity.activityid=recurringevents.activityid where recurringevents.activityid is NULL and activity.activityid='.$activity_id;
+				$recur_dates_qry='select vtiger_activity.date_start,vtiger_recurringevents.* from vtiger_activity left outer join vtiger_recurringevents on vtiger_activity.activityid=vtiger_recurringevents.activityid where vtiger_recurringevents.activityid is NULL and vtiger_activity.activityid='.$activity_id;
 				$recur_result=$adb->query($recur_dates_qry);
 				$noofrows_recur = $adb->num_rows($recur_result);
 
@@ -251,7 +251,7 @@
 				$activity_start_time=time_to_number($act_time_start);	
 				$activity_end_time=get_duration($act_time_start,$act_hour_dur,$act_mins_dur);	
 
-				$activity_owner_qry='select users.user_name,users.id AS userid from users,crmentity where users.id=crmentity.smownerid and crmentity.crmid='.$id;
+				$activity_owner_qry='select vtiger_users.user_name,vtiger_users.id AS userid from vtiger_users,crmentity where vtiger_users.id=vtiger_crmentity.smownerid and vtiger_crmentity.crmid='.$id;
 				$result_owner=$adb->query($activity_owner_qry);
 
 				while($row_owner = $adb->fetch_array($result_owner))
@@ -259,7 +259,7 @@
 					$owner=$row_owner['userid'];
 				}
 
-				$recur_dates_qry='select recurringdate from recurringevents where activityid ='.$activity_id;
+				$recur_dates_qry='select recurringdate from vtiger_recurringevents where vtiger_activityid ='.$activity_id;
 				$recur_result=$adb->query($recur_dates_qry);
 				$noofrows_recur = $adb->num_rows($recur_result);
 				$userid=$row['id'];
@@ -298,7 +298,7 @@
   	{
 	 global $log;
          $log->debug("Entering get_full_list(".$criteria.") method ...");
-    $query = "select crmentity.crmid,crmentity.smownerid,crmentity.setype, activity.*, contactdetails.lastname, contactdetails.firstname, contactdetails.contactid 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 WHERE crmentity.deleted=0 ".$criteria;
+    $query = "select vtiger_crmentity.crmid,vtiger_crmentity.smownerid,vtiger_crmentity.setype, vtiger_activity.*, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid from vtiger_activity inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid= vtiger_cntactivityrel.contactid left join vtiger_seactivityrel on vtiger_seactivityrel.activityid = vtiger_activity.activityid WHERE vtiger_crmentity.deleted=0 ".$criteria;
     $result =& $this->db->query($query);
 	echo $query;
     $this->log->debug("process_full_list_query: result is ".$result);
@@ -338,7 +338,7 @@
 	{
 		global $log;
 	        $log->debug("Entering getCount_Meeting(".$user_name.") method ...");
-      $query = "select count(*) from activity inner join crmentity on crmentity.crmid=activity.activityid inner join salesmanactivityrel on salesmanactivityrel.activityid=activity.activityid inner join users on users.id=salesmanactivityrel.smid where user_name='" .$user_name ."' and crmentity.deleted=0 and activity.activitytype='Meeting'";
+      $query = "select count(*) from vtiger_activity inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid inner join vtiger_salesmanactivityrel on vtiger_salesmanactivityrel.activityid=vtiger_activity.activityid inner join vtiger_users on vtiger_users.id=vtiger_salesmanactivityrel.smid where user_name='" .$user_name ."' and vtiger_crmentity.deleted=0 and vtiger_activity.activitytype='Meeting'";
 
       $result = $this->db->query($query,true,"Error retrieving contacts count");
       $rows_found =  $this->db->getRowCount($result);
@@ -351,7 +351,7 @@
     {   
 	    global $log;
             $log->debug("Entering get_calendars(".$user_name.",".$from_index.",".$offset.") method ...");
-		$query = "select activity.location as location,activity.duration_hours as duehours, activity.duration_minutes as dueminutes,activity.time_start as time_start, activity.subject as name,crmentity.modifiedtime as date_modified, activity.date_start start_date,activity.activityid as id,activity.status as status, crmentity.description as description, activity.priority as priority, activity.due_date as date_due ,contactdetails.firstname cfn, contactdetails.lastname cln from activity inner join salesmanactivityrel on salesmanactivityrel.activityid=activity.activityid inner join users on users.id=salesmanactivityrel.smid left join cntactivityrel on cntactivityrel.activityid=activity.activityid left join contactdetails on contactdetails.contactid=cntactivityrel.contactid inner join crmentity on crmentity.crmid=activity.activityid where user_name='" .$user_name ."' and crmentity.deleted=0 and activity.activitytype='Meeting' limit " .$from_index ."," .$offset;
+		$query = "select vtiger_activity.location as location,vtiger_activity.duration_hours as duehours, vtiger_activity.duration_minutes as dueminutes,vtiger_activity.time_start as time_start, vtiger_activity.subject as name,vtiger_crmentity.modifiedtime as date_modified, vtiger_activity.date_start start_date,vtiger_activity.activityid as id,vtiger_activity.status as status, vtiger_crmentity.description as description, vtiger_activity.priority as vtiger_priority, vtiger_activity.due_date as date_due ,vtiger_contactdetails.firstname cfn, vtiger_contactdetails.lastname cln from vtiger_activity inner join vtiger_salesmanactivityrel on vtiger_salesmanactivityrel.activityid=vtiger_activity.activityid inner join vtiger_users on vtiger_users.id=vtiger_salesmanactivityrel.smid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid=vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid=vtiger_cntactivityrel.contactid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid where user_name='" .$user_name ."' and vtiger_crmentity.deleted=0 and vtiger_activity.activitytype='Meeting' limit " .$from_index ."," .$offset;
 	$log->debug("Exiting get_calendars method ...");
 	    return $this->process_list_query1($query);   
     }       
@@ -361,7 +361,7 @@
     {
 	    global $log;
             $log->debug("Entering getCount(".$user_name.") method ...");
-        $query = "select count(*) from activity inner join crmentity on crmentity.crmid=activity.activityid inner join salesmanactivityrel on salesmanactivityrel.activityid=activity.activityid inner join users on users.id=salesmanactivityrel.smid where user_name='" .$user_name ."' and crmentity.deleted=0 and activity.activitytype='Task'";
+        $query = "select count(*) from vtiger_activity inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid inner join vtiger_salesmanactivityrel on vtiger_salesmanactivityrel.activityid=vtiger_activity.activityid inner join vtiger_users on vtiger_users.id=vtiger_salesmanactivityrel.smid where user_name='" .$user_name ."' and vtiger_crmentity.deleted=0 and vtiger_activity.activitytype='Task'";
 
         $result = $this->db->query($query,true,"Error retrieving contacts count");
         $rows_found =  $this->db->getRowCount($result);
@@ -375,7 +375,7 @@
     {   
 	global $log;
         $log->debug("Entering get_tasks(".$user_name.",".$from_index.",".$offset.") method ...");
-	 $query = "select activity.subject as name,crmentity.modifiedtime as date_modified, activity.date_start start_date,activity.activityid as id,activity.status as status, crmentity.description as description, activity.priority as priority, activity.due_date as date_due ,contactdetails.firstname cfn, contactdetails.lastname cln from activity inner join salesmanactivityrel on salesmanactivityrel.activityid=activity.activityid inner join users on users.id=salesmanactivityrel.smid left join cntactivityrel on cntactivityrel.activityid=activity.activityid left join contactdetails on contactdetails.contactid=cntactivityrel.contactid inner join crmentity on crmentity.crmid=activity.activityid where user_name='" .$user_name ."' and crmentity.deleted=0 and activity.activitytype='Task' limit " .$from_index ."," .$offset;
+	 $query = "select vtiger_activity.subject as name,vtiger_crmentity.modifiedtime as date_modified, vtiger_activity.date_start start_date,vtiger_activity.activityid as id,vtiger_activity.status as status, vtiger_crmentity.description as description, vtiger_activity.priority as vtiger_priority, vtiger_activity.due_date as date_due ,vtiger_contactdetails.firstname cfn, vtiger_contactdetails.lastname cln from vtiger_activity inner join vtiger_salesmanactivityrel on vtiger_salesmanactivityrel.activityid=vtiger_activity.activityid inner join vtiger_users on vtiger_users.id=vtiger_salesmanactivityrel.smid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid=vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid=vtiger_cntactivityrel.contactid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid where user_name='" .$user_name ."' and vtiger_crmentity.deleted=0 and vtiger_activity.activitytype='Task' limit " .$from_index ."," .$offset;
 	 $log->debug("Exiting get_tasks method ...");
     return $this->process_list_query1($query);
     
@@ -424,12 +424,12 @@
         return $response;
     }
 		
-	function activity_reminder($activity_id,$reminder_time,$reminder_sent=0,$recurid,$remindermode='')
+	function vtiger_activity_reminder($activity_id,$reminder_time,$reminder_sent=0,$recurid,$remindermode='')
 	{
 		global $log;
-		$log->debug("Entering activity_reminder(".$activity_id.",".$reminder_time.",".$reminder_sent.",".$recurid.",".$remindermode.") method ...");
-		//Check for activityid already present in the reminder_table
-		$query_exist = "SELECT activity_id FROM ".$this->reminder_table." WHERE activity_id = ".$activity_id;
+		$log->debug("Entering vtiger_activity_reminder(".$activity_id.",".$reminder_time.",".$reminder_sent.",".$recurid.",".$remindermode.") method ...");
+		//Check for vtiger_activityid already present in the reminder_table
+		$query_exist = "SELECT vtiger_activity_id FROM ".$this->reminder_table." WHERE vtiger_activity_id = ".$activity_id;
 		$result_exist = $this->db->query($query_exist);
 
 		if($remindermode == 'edit')
@@ -438,7 +438,7 @@
 			{
 				$query = "UPDATE ".$this->reminder_table." SET";
 				$query .=" reminder_sent = ".$reminder_sent.",";
-				$query .=" reminder_time = ".$reminder_time." WHERE activity_id =".$activity_id; 
+				$query .=" reminder_time = ".$reminder_time." WHERE vtiger_activity_id =".$activity_id; 
 			}
 			else
 			{
@@ -447,14 +447,14 @@
 		}
 		elseif(($remindermode == 'delete') && ($this->db->num_rows($result_exist) == 1))
 		{
-			$query = "DELETE FROM ".$this->reminder_table." WHERE activity_id = ".$activity_id;
+			$query = "DELETE FROM ".$this->reminder_table." WHERE vtiger_activity_id = ".$activity_id;
 		}
 		else
 		{
 			$query = "INSERT INTO ".$this->reminder_table." VALUES (".$activity_id.",".$reminder_time.",0,'".$recurid."')";
 		}
-      		$this->db->query($query,true,"Error in processing table $this->reminder_table");
-		$log->debug("Exiting activity_reminder method ...");
+      		$this->db->query($query,true,"Error in processing vtiger_table $this->reminder_table");
+		$log->debug("Exiting vtiger_activity_reminder method ...");
 	}
 
 //Used for vtigerCRM Outlook Add-In
@@ -462,15 +462,15 @@
 {
 	global $log;
         $log->debug("Entering get_tasksforol(".$username.") method ...");
-	$query = "select activity.subject,activity.date_start startdate,
-			 activity.activityid as taskid,activity.status,
-			 crmentity.description,activity.priority as priority,activity.due_date as duedate,
-			 contactdetails.firstname, contactdetails.lastname 
-			 from activity inner join crmentity on crmentity.crmid=activity.activityid 
-			 inner join users on users.id = crmentity.smownerid 
-			 left join cntactivityrel on cntactivityrel.activityid=activity.activityid 
-			 left join contactdetails on contactdetails.contactid=cntactivityrel.contactid 
-			 where users.user_name='".$username."' and crmentity.deleted=0 and activity.activitytype='Task'";
+	$query = "select vtiger_activity.subject,vtiger_activity.date_start startdate,
+			 vtiger_activity.activityid as taskid,vtiger_activity.status,
+			 vtiger_crmentity.description,vtiger_activity.priority as vtiger_priority,vtiger_activity.due_date as duedate,
+			 vtiger_contactdetails.firstname, vtiger_contactdetails.lastname 
+			 from vtiger_activity inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid 
+			 inner join vtiger_users on vtiger_users.id = vtiger_crmentity.smownerid 
+			 left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid=vtiger_activity.activityid 
+			 left join vtiger_contactdetails on vtiger_contactdetails.contactid=vtiger_cntactivityrel.contactid 
+			 where vtiger_users.user_name='".$username."' and vtiger_crmentity.deleted=0 and vtiger_activity.activitytype='Task'";
 	$log->debug("Exiting get_tasksforol method ...");		 
 	return $query;
 }
@@ -479,17 +479,17 @@
 {
 	global $log;
         $log->debug("Entering get_calendarsforol(".$user_name.") method ...");
-	  $query = "select activity.location, activity.duration_hours as duehours, 
-				activity.duration_minutes as dueminutes,activity.time_start as startime, 
-				activity.subject,activity.date_start as startdate,activity.activityid as clndrid,
-				crmentity.description,activity.due_date as duedate ,
-				contactdetails.firstname, contactdetails.lastname from activity 
-				inner join salesmanactivityrel on salesmanactivityrel.activityid=activity.activityid 
-				inner join users on users.id=salesmanactivityrel.smid 
-				left join cntactivityrel on cntactivityrel.activityid=activity.activityid 
-				left join contactdetails on contactdetails.contactid=cntactivityrel.contactid 
-				inner join crmentity on crmentity.crmid=activity.activityid 
-				where users.user_name='".$user_name."' and crmentity.deleted=0 and activity.activitytype='Meeting'";
+	  $query = "select vtiger_activity.location, vtiger_activity.duration_hours as duehours, 
+			vtiger_activity.duration_minutes as dueminutes,vtiger_activity.time_start as startime, 
+			vtiger_activity.subject,vtiger_activity.date_start as startdate,vtiger_activity.activityid as clndrid,
+			vtiger_crmentity.description,vtiger_activity.due_date as duedate ,
+			vtiger_contactdetails.firstname, vtiger_contactdetails.lastname from vtiger_activity 
+				inner join vtiger_salesmanactivityrel on vtiger_salesmanactivityrel.activityid=vtiger_activity.activityid 
+				inner join vtiger_users on vtiger_users.id=vtiger_salesmanactivityrel.smid 
+				left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid=vtiger_activity.activityid 
+				left join vtiger_contactdetails on vtiger_contactdetails.contactid=vtiger_cntactivityrel.contactid 
+				inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid 
+				where vtiger_users.user_name='".$user_name."' and vtiger_crmentity.deleted=0 and vtiger_activity.activitytype='Meeting'";
 	$log->debug("Exiting get_calendarsforol method ...");
 	return $query;
 }

Modified: vtigercrm/trunk/modules/Activities/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/Activities/EditView.php (original)
+++ vtigercrm/trunk/modules/Activities/EditView.php Mon Jun 12 14:26:25 2006
@@ -31,7 +31,7 @@
 require_once('include/FormValidationUtil.php');
 global $app_strings;
 global $mod_strings;
-// Unimplemented until jscalendar language files are fixed
+// Unimplemented until jscalendar language vtiger_files are fixed
 $activity_lbl='';
 $activity_mode = $_REQUEST['activity_mode'];
 if($activity_mode == 'Task')
@@ -98,7 +98,7 @@
 $category = getParentTab();
 $smarty->assign("CATEGORY",$category);
 
-// Unimplemented until jscalendar language files are fixed
+// Unimplemented until jscalendar language vtiger_files are fixed
 $smarty->assign("CALENDAR_LANG", $app_strings['LBL_JSCALENDAR_LANG']);
 $smarty->assign("CALENDAR_DATEFORMAT", parse_calendardate($app_strings['NTC_DATE_FORMAT']));
 

Modified: vtigercrm/trunk/modules/Activities/Event.php
==============================================================================
--- vtigercrm/trunk/modules/Activities/Event.php (original)
+++ vtigercrm/trunk/modules/Activities/Event.php Mon Jun 12 14:26:25 2006
@@ -30,7 +30,7 @@
 	var $log;
 	var $db;
 
-	// Stored fields
+	// Stored vtiger_fields
   	var $eventid;
 	var $description;
 	var $status;
@@ -51,10 +51,10 @@
 
 	var $column_fields = Array();
 
-	// This is used to retrieve related fields from form posts.
+	// This is used to retrieve related vtiger_fields from form posts.
 	var $additional_column_fields = Array('assigned_user_name', 'assigned_user_id', 'contactname', 'contact_phone', 'contact_email', 'parent_name');
 
-	// This is the list of fields that are in the lists.
+	// This is the list of vtiger_fields that are in the lists.
 	var $list_fields = Array(
        'Close'=>Array('event'=>'status'),
        'Subject'=>Array('activity'=>'subject'),
@@ -88,7 +88,7 @@
     {
 	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";
+        $query = "select count(*) from tasks inner join vtiger_users on vtiger_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");

Modified: vtigercrm/trunk/modules/Activities/Forms.php
==============================================================================
--- vtigercrm/trunk/modules/Activities/Forms.php (original)
+++ vtigercrm/trunk/modules/Activities/Forms.php Mon Jun 12 14:26:25 2006
@@ -15,7 +15,7 @@
 /*********************************************************************************
  * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Activities/Forms.php,v 1.7 2005/04/19 16:49:29 ray Exp $
  * Description:  Contains a variety of utility functions used to display UI
- * components such as form headers and footers.  Intended to be modified on a per
+ * components such as form vtiger_headers and footers.  Intended to be modified on a per
  * theme basis.
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
  * All Rights Reserved.
@@ -60,23 +60,23 @@
  */
 // Declaring valid date character, minimum year and maximum year
 
-var fieldname,fieldlabel,fielddatatype;	
+var vtiger_fieldname,fieldlabel,fielddatatype;	
 function verify_data(form,fname,flabel,fdatatype) 
 {
 	var form_name=form.name;
 	if(form_name=='ActivitySave')
         {
                form.due_date.value=form.date_start.value;
-	       fieldname =fname.split(",");
-	       fieldlabel = flabel.split(",");
-               fielddatatype = fdatatype.split(",");
+	       vtiger_fieldname =fname.split(",");
+	       vtiger_fieldlabel = flabel.split(",");
+               vtiger_fielddatatype = fdatatype.split(",");
         }
         else
         {
               form.due_date.value=form.date_start.value;
-	      fieldname = fname.split(",");
-              fieldlabel = flabel.split(",");
-              fielddatatype = fdatatype.split(",");
+	      vtiger_fieldname = fname.split(",");
+              vtiger_fieldlabel = flabel.split(",");
+              vtiger_fielddatatype = fdatatype.split(",");
         
         }
 
@@ -93,7 +93,7 @@
 
 /* Commented for RC
 /**
- * Create HTML form to enter a new record with the minimum necessary fields.
+ * Create HTML form to enter a new record with the minimum necessary vtiger_fields.
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
  * All Rights Reserved.
  * Contributor(s): ______________________________________..
@@ -106,13 +106,13 @@
 global $theme;
 global $adb;//for dynamic quickcreateform construction
 
-// Unimplemented until jscalendar language files are fixed
+// Unimplemented until jscalendar language vtiger_files are fixed
 // global $current_language;
 // global $default_language;
 // global $cal_codes;
 
 $user_id = $current_user->id;
-// Unimplemented until jscalendar language files are fixed
+// Unimplemented until jscalendar language vtiger_files are fixed
 // $cal_lang = (empty($cal_codes[$current_language])) ? $cal_codes[$default_language] : $cal_codes[$current_language];
 $cal_lang = "en";
 $cal_dateformat = parse_calendardate($app_strings['NTC_DATE_FORMAT']);
@@ -126,7 +126,7 @@
 $fieldLabel_task = '';
 $fldDataType_task = '';
 
-$qcreate_get_field="select * from field where tabid=9 and quickcreate=0 order by quickcreatesequence";
+$qcreate_get_field="select * from vtiger_field where vtiger_tabid=9 and quickcreate=0 order by quickcreatesequence";
 $qcreate_get_result=$adb->query($qcreate_get_field);
 $qcreate_get_noofrows=$adb->num_rows($qcreate_get_result);
 $fieldName_array_task = Array();//for validation
@@ -239,7 +239,7 @@
 $fieldLabel = '';
 $fldDataType = '';
 
-$qcreate_get_field="select * from field where tabid=16 and quickcreate=0 order by quickcreatesequence";
+$qcreate_get_field="select * from vtiger_field where vtiger_tabid=16 and quickcreate=0 order by quickcreatesequence";
 $qcreate_get_result=$adb->query($qcreate_get_field);
 $qcreate_get_noofrows=$adb->num_rows($qcreate_get_result);
 

Modified: vtigercrm/trunk/modules/Activities/GroupAllocationView.php
==============================================================================
--- vtigercrm/trunk/modules/Activities/GroupAllocationView.php (original)
+++ vtigercrm/trunk/modules/Activities/GroupAllocationView.php Mon Jun 12 14:26:25 2006
@@ -52,7 +52,7 @@
 if(isset($_REQUEST['query']))
 {
 
-  $query = "select leads.last_name,leadgrouprelation.groupname from leads inner join leadgrouprelation on leads.id=leadgrouprelation.leadid where leadgrouprelation.deleted=0  and leads.deleted=0";
+  $query = "select leads.last_name,vtiger_leadgrouprelation.groupname from leads inner join vtiger_leadgrouprelation on leads.id=vtiger_leadgrouprelation.leadid where vtiger_leadgrouprelation.deleted=0  and leads.deleted=0";
   $log->info("Here is the where clause for the list view: $query");
 
 }

Modified: vtigercrm/trunk/modules/Activities/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Activities/ListView.php (original)
+++ vtigercrm/trunk/modules/Activities/ListView.php Mon Jun 12 14:26:25 2006
@@ -125,7 +125,7 @@
 	$list_query .= " AND " .$where;
 }
 
-$list_query .= ' group by activity.activityid';
+$list_query .= ' group by vtiger_activity.activityid';
 
 if(isset($order_by) && $order_by != '')
 {
@@ -177,7 +177,7 @@
 if($viewid !='')
 $url_string .="&viewname=".$viewid;
 
-//Cambiado code to add close button in custom field
+//Cambiado code to add close button in custom vtiger_field
 if (($viewid!=0)&&($viewid!="")){
   if (!isset($oCustomView->list_fields['Close'])) $oCustomView->list_fields['Close']=array ( 'activity' => 'status' );
   if (!isset($oCustomView->list_fields_name['Close'])) $oCustomView->list_fields_name['Close']='status';

Modified: vtigercrm/trunk/modules/Activities/OpenListView.php
==============================================================================
--- vtigercrm/trunk/modules/Activities/OpenListView.php (original)
+++ vtigercrm/trunk/modules/Activities/OpenListView.php Mon Jun 12 14:26:25 2006
@@ -45,7 +45,7 @@
 	//code added to customize upcomming and pending activities
 	if($_REQUEST['activity_view']=='')
 	{	
-		$query = "select activity_view from users where id ='$current_user->id'";
+		$query = "select activity_view from vtiger_users where id ='$current_user->id'";
 		$result=$adb->query($query);
 		$activity_view=$adb->query_result($result,0,'activity_view');
 	}
@@ -78,12 +78,12 @@
 	if($mode != 1)
 	{
 		//for upcoming avtivities
-		$list_query = " select crmentity.crmid,crmentity.smownerid,crmentity.setype, activity.*, contactdetails.lastname, contactdetails.firstname, contactdetails.contactid, account.accountid, account.accountname, recurringevents.recurringtype,recurringevents.recurringdate 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 inner join salesmanactivityrel on salesmanactivityrel.activityid=activity.activityid WHERE crmentity.deleted=0 and (activity.activitytype = 'Meeting' or activity.activitytype='Call' or activity.activitytype='Task') AND ( activity.status is NULL OR activity.status != 'Completed' ) and ( activity.status is NULL OR activity.status != 'Deferred') and  (  activity.eventstatus is NULL OR  activity.eventstatus != 'Held') and (activity.eventstatus is NULL OR  activity.eventstatus != 'Not Held' ) AND (((date_start > '$today' AND date_start < '$later'))  OR (recurringevents.recurringdate between '$today' and '$later') ) AND crmentity.smownerid !=0 AND salesmanactivityrel.smid ='$current_user->id'";
+		$list_query = " select vtiger_crmentity.crmid,vtiger_crmentity.smownerid,vtiger_crmentity.setype, vtiger_activity.*, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid, vtiger_account.accountid, vtiger_account.accountname, vtiger_recurringevents.recurringtype,vtiger_recurringevents.recurringdate from vtiger_activity inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid= vtiger_cntactivityrel.contactid left join vtiger_seactivityrel on vtiger_seactivityrel.activityid = vtiger_activity.activityid left outer join vtiger_account on vtiger_account.accountid = vtiger_contactdetails.accountid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid inner join vtiger_salesmanactivityrel on vtiger_salesmanactivityrel.activityid=vtiger_activity.activityid WHERE vtiger_crmentity.deleted=0 and (vtiger_activity.activitytype = 'Meeting' or vtiger_activity.activitytype='Call' or vtiger_activity.activitytype='Task') AND ( vtiger_activity.status is NULL OR vtiger_activity.status != 'Completed' ) and ( vtiger_activity.status is NULL OR vtiger_activity.status != 'Deferred') and  (  vtiger_activity.eventstatus is NULL OR  vtiger_activity.eventstatus != 'Held') and (vtiger_activity.eventstatus is NULL OR  vtiger_activity.eventstatus != 'Not Held' ) AND (((date_start > '$today' AND date_start < '$later'))  OR (vtiger_recurringevents.recurringdate between '$today' and '$later') ) AND vtiger_crmentity.smownerid !=0 AND vtiger_salesmanactivityrel.smid ='$current_user->id'";
 	}	
 	else
 	{
 		//for pending activities for the last 10 days
-		$list_query = " select crmentity.crmid,crmentity.smownerid,crmentity.setype, activity.*, contactdetails.lastname, contactdetails.firstname, contactdetails.contactid, account.accountid, account.accountname, recurringevents.recurringtype,recurringevents.recurringdate 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 inner join salesmanactivityrel on salesmanactivityrel.activityid=activity.activityid WHERE crmentity.deleted=0 and (activity.activitytype = 'Meeting' or activity.activitytype='Call' or activity.activitytype='Task') AND ( activity.status is NULL OR activity.status != 'Completed' ) and ( activity.status is NULL OR activity.status != 'Deferred') and (  activity.eventstatus is NULL OR  activity.eventstatus != 'Held') and (activity.eventstatus is NULL OR  activity.eventstatus != 'Not Held' ) AND (due_date > '$last_tendays' AND due_date <= '$today') OR (recurringevents.recurringdate > '$last_tendays' AND recurringevents.recurringdate <= '$today') AND crmentity.smownerid !=0 AND salesmanactivityrel.smid ='$current_user->id'";
+		$list_query = " select vtiger_crmentity.crmid,vtiger_crmentity.smownerid,vtiger_crmentity.setype, vtiger_activity.*, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid, vtiger_account.accountid, vtiger_account.accountname, vtiger_recurringevents.recurringtype,vtiger_recurringevents.recurringdate from vtiger_activity inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid= vtiger_cntactivityrel.contactid left join vtiger_seactivityrel on vtiger_seactivityrel.activityid = vtiger_activity.activityid left outer join vtiger_account on vtiger_account.accountid = vtiger_contactdetails.accountid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid inner join vtiger_salesmanactivityrel on vtiger_salesmanactivityrel.activityid=vtiger_activity.activityid WHERE vtiger_crmentity.deleted=0 and (vtiger_activity.activitytype = 'Meeting' or vtiger_activity.activitytype='Call' or vtiger_activity.activitytype='Task') AND ( vtiger_activity.status is NULL OR vtiger_activity.status != 'Completed' ) and ( vtiger_activity.status is NULL OR vtiger_activity.status != 'Deferred') and (  vtiger_activity.eventstatus is NULL OR  vtiger_activity.eventstatus != 'Held') and (vtiger_activity.eventstatus is NULL OR  vtiger_activity.eventstatus != 'Not Held' ) AND (due_date > '$last_tendays' AND due_date <= '$today') OR (vtiger_recurringevents.recurringdate > '$last_tendays' AND vtiger_recurringevents.recurringdate <= '$today') AND vtiger_crmentity.smownerid !=0 AND vtiger_salesmanactivityrel.smid ='$current_user->id'";
 	}
 	$res = $adb->query($list_query);
 	$noofrecords = $adb->num_rows($res);
@@ -110,7 +110,7 @@
 					'recurringdate' => getDisplayDate($adb->query_result($list_result,$i,'recurringdate')),
 					'parent'=> $parent_name,
 					// Fredy Klammsteiner, 4.8.2005: changes from 4.0.1 migrated to 4.2
-					'priority' => $adb->query_result($list_result,$i,'priority'), // Armando L?scher 04.07.2005 -> ?priority -> Desc: Get priority from db
+					'priority' => $adb->query_result($list_result,$i,'priority'), // Armando L?scher 04.07.2005 -> ?priority -> Desc: Get vtiger_priority from db
 					);
 		}
 	$later_day = getDisplayDate(date("Y-m-d", strtotime("$later -1 day ")));
@@ -149,7 +149,7 @@
 			$event['date_start']=$event['recurringdate'];
 			// Fredy Klammsteiner, 4.8.2005: changes from 4.0.1 migrated to 4.2
 		// begin: Armando L?scher 04.07.2005 -> ?priority
-		// Desc: Set priority colors
+		// Desc: Set vtiger_priority colors
 		$font_color_high = "color:#00DD00;";
 		$font_color_medium = "color:#DD00DD;";
 

Modified: vtigercrm/trunk/modules/Activities/RenderRelatedListUI.php
==============================================================================
--- vtigercrm/trunk/modules/Activities/RenderRelatedListUI.php (original)
+++ vtigercrm/trunk/modules/Activities/RenderRelatedListUI.php Mon Jun 12 14:26:25 2006
@@ -64,11 +64,11 @@
 		if( $owner != $userid)
 		{
 			
-			$usr_query="select activityid,activity.date_start,activity.due_date, activity.time_start,activity.duration_hours,activity.duration_minutes,crmentity.smownerid from activity,crmentity where crmentity.crmid=activity.activityid and ('".$avail_date."' like date_start) and crmentity.smownerid=".$userid." and activity.activityid !=".$activity_id."  and crmentity.deleted=0";
+			$usr_query="select vtiger_activityid,vtiger_activity.date_start,vtiger_activity.due_date, vtiger_activity.time_start,vtiger_activity.duration_hours,vtiger_activity.duration_minutes,vtiger_crmentity.smownerid from vtiger_activity,crmentity where vtiger_crmentity.crmid=vtiger_activity.activityid and ('".$avail_date."' like date_start) and vtiger_crmentity.smownerid=".$userid." and vtiger_activity.activityid !=".$activity_id."  and vtiger_crmentity.deleted=0";
 		}
 		else
 		{
-			$usr_query="select activityid,activity.date_start,activity.due_date, activity.time_start,activity.duration_hours,activity.duration_minutes,crmentity.smownerid from activity,crmentity where crmentity.crmid=activity.activityid and ('".$avail_date."' like date_start) and crmentity.smownerid=".$userid." and activity.activityid !=".$activity_id." and crmentity.deleted=0";
+			$usr_query="select vtiger_activityid,vtiger_activity.date_start,vtiger_activity.due_date, vtiger_activity.time_start,vtiger_activity.duration_hours,vtiger_activity.duration_minutes,vtiger_crmentity.smownerid from vtiger_activity,crmentity where vtiger_crmentity.crmid=vtiger_activity.activityid and ('".$avail_date."' like date_start) and vtiger_crmentity.smownerid=".$userid." and vtiger_activity.activityid !=".$activity_id." and vtiger_crmentity.deleted=0";
 		}
 		$result_cal=$adb->query($usr_query);   
 		$noofrows_cal = $adb->num_rows($result_cal);
@@ -98,7 +98,7 @@
 		}
 		if($avail_flag!="true")
 		{
-			$recur_query="SELECT activity.activityid, activity.time_start, activity.duration_hours, activity.duration_minutes , crmentity.smownerid, recurringevents.recurringid, recurringevents.recurringdate as date_start from activity inner join crmentity on activity.activityid = crmentity.crmid inner join recurringevents on activity.activityid=recurringevents.activityid where ('".$avail_date."' like recurringevents.recurringdate) and crmentity.smownerid=".$userid." and activity.activityid !=".$activity_id." and crmentity.deleted=0";
+			$recur_query="SELECT vtiger_activity.activityid, vtiger_activity.time_start, vtiger_activity.duration_hours, vtiger_activity.duration_minutes , vtiger_crmentity.smownerid, vtiger_recurringevents.recurringid, vtiger_recurringevents.recurringdate as date_start from vtiger_activity inner join vtiger_crmentity on vtiger_activity.activityid = vtiger_crmentity.crmid inner join vtiger_recurringevents on vtiger_activity.activityid=vtiger_recurringevents.activityid where ('".$avail_date."' like vtiger_recurringevents.recurringdate) and vtiger_crmentity.smownerid=".$userid." and vtiger_activity.activityid !=".$activity_id." and vtiger_crmentity.deleted=0";
 			
 			$result_cal=$adb->query($recur_query);   
 			$noofrows_cal = $adb->num_rows($result_cal);

Modified: vtigercrm/trunk/modules/Activities/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Activities/Save.php (original)
+++ vtigercrm/trunk/modules/Activities/Save.php Mon Jun 12 14:26:25 2006
@@ -106,7 +106,7 @@
 		$crmid = $_REQUEST['product_id'];
 	if($crmid != $_REQUEST['parent_id'])
 	{
-		$sql = "insert into seactivityrel (activityid, crmid) values('".$focus->id."','".$crmid."')";
+		$sql = "insert into vtiger_seactivityrel (activityid, crmid) values('".$focus->id."','".$crmid."')";
 		$adb->query($sql);
 	}
 }
@@ -114,7 +114,7 @@
 $activemode = "";
 if($activity_mode != '') $activemode = "&activity_mode=".$activity_mode;
 
-//Added code to send mail to the assigned to user about the details of the activity if sendnotification = on and assigned to user
+//Added code to send mail to the assigned to user about the details of the vtiger_activity if sendnotification = on and assigned to user
 if($_REQUEST['sendnotification'] == 'on' && $_REQUEST['assigntype'] == 'U')
 {
 	global $current_user;
@@ -128,7 +128,7 @@
         $mail_status  = send_mail('Activities',$to_email,$current_user->user_name,'',$subject,$description);
 }
 
-//code added to send mail to the invitees
+//code added to send mail to the vtiger_invitees
 if(isset($_REQUEST['inviteesid']) && $_REQUEST['inviteesid']!='')
 {
 	global $current_user;
@@ -163,7 +163,7 @@
 	$page.='&allflag=Normal';
 header("Location: index.php?action=$return_action&module=$return_module$view$hour$day$month$year&record=$return_id$activemode&viewname=$return_viewname$page");
 
-//Function to get the activity details for mail body
+//Function to get the vtiger_activity details for mail body
 function getActivityDetails($description)
 {
 	global $log;
@@ -175,7 +175,7 @@
 	$status = (($_REQUEST['activity_mode']=='Task')?($_REQUEST['taskstatus']):($_REQUEST['eventstatus']));
 
 	$list = 'Dear '.$name.',';
-	$list .= '<br><br> There is an activity('.$_REQUEST['activity_mode'].')'.$reply.'. The details are :';
+	$list .= '<br><br> There is an vtiger_activity('.$_REQUEST['activity_mode'].')'.$reply.'. The details are :';
 	$list .= '<br>Subject : '.$_REQUEST['subject'];
 	$list .= '<br>Status : '.$status;
 	$list .= '<br>Priority : '.$_REQUEST['taskpriority'];

Modified: vtigercrm/trunk/modules/Activities/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Activities/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Activities/language/en_us.lang.php Mon Jun 12 14:26:25 2006
@@ -65,14 +65,14 @@
 'LBL_LIST_LAST_MODIFIED'=>'Last Modified',
 'LBL_LIST_RECURRING_TYPE'=>'Recurring Type',
 
-'ERR_DELETE_RECORD'=>"A record number must be specified to delete the account.",
+'ERR_DELETE_RECORD'=>"A record number must be specified to delete the vtiger_account.",
 'NTC_NONE_SCHEDULED'=>'None scheduled.',
 
-// Added fields for Attachments in Activities/SubPanelView.php
+// Added vtiger_fields for Attachments in Activities/SubPanelView.php
 'LBL_ATTACHMENTS'=>'Attachments',
 'LBL_NEW_ATTACHMENT'=>'New Attachment',
 
-//Added fields after RC1 - Release
+//Added vtiger_fields after RC1 - Release
 'LBL_ALL'=>'All',
 'LBL_CALL'=>'Call',
 'LBL_MEETING'=>'Meeting',

Modified: vtigercrm/trunk/modules/Activities/updateRelations.php
==============================================================================
--- vtigercrm/trunk/modules/Activities/updateRelations.php (original)
+++ vtigercrm/trunk/modules/Activities/updateRelations.php Mon Jun 12 14:26:25 2006
@@ -22,7 +22,7 @@
 		if($id != '')
 		{
 			$record = $_REQUEST['parentid'];
-			$sql = "insert into seactivityrel values (".$id.",".$_REQUEST["parentid"].")";
+			$sql = "insert into vtiger_seactivityrel values (".$id.",".$_REQUEST["parentid"].")";
 			$adb->query($sql);
 		}
 	}
@@ -32,7 +32,7 @@
 elseif(isset($_REQUEST['entityid']) && $_REQUEST['entityid'] != '')
 {
 	$record = $_REQUEST["parid"];
-	$sql = "insert into seactivityrel values (". $_REQUEST["entityid"] .",".$_REQUEST["parid"] .")";
+	$sql = "insert into vtiger_seactivityrel values (". $_REQUEST["entityid"] .",".$_REQUEST["parid"] .")";
 	$adb->query($sql);
 	header("Location: index.php?action=CallRelatedList&module=Activities&activity_mode=Events&record=".$record);
 }
@@ -40,11 +40,11 @@
 
 
  
-//This if for adding the users 
+//This if for adding the vtiger_users 
 if(isset($_REQUEST['user_id']) && $_REQUEST['user_id'] != '')
 {
 	$record = $_REQUEST['record'];
-	$sql = "insert into salesmanactivityrel values (". $_REQUEST["user_id"] .",".$_REQUEST["record"] .")";
+	$sql = "insert into vtiger_salesmanactivityrel values (". $_REQUEST["user_id"] .",".$_REQUEST["record"] .")";
 	$adb->query($sql);
 	header("Location: index.php?action=CallRelatedList&module=Activities&activity_mode=Events&record=".$record);
 

Modified: vtigercrm/trunk/modules/Calendar/Appointment.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/Appointment.php (original)
+++ vtigercrm/trunk/modules/Calendar/Appointment.php Mon Jun 12 14:26:25 2006
@@ -57,20 +57,20 @@
 		$shared_ids = getSharedCalendarId($current_user->id);		
 		if(empty($shared_ids))
 			$shared_ids = $current_user->id;
-                $q= "select activity.*, crmentity.*, account.accountname,account.accountid,activitygrouprelation.groupname FROM activity inner join crmentity on activity.activityid = crmentity.crmid left join recurringevents on activity.activityid=recurringevents.activityid left outer join activitygrouprelation on activitygrouprelation.activityid=activity.activityid left join cntactivityrel on activity.activityid = cntactivityrel.activityid left join contactdetails on cntactivityrel.contactid = contactdetails.contactid left join account  on contactdetails.accountid = account.accountid inner join salesmanactivityrel on salesmanactivityrel.activityid=activity.activityid WHERE activity.activitytype in ('Call','Meeting') AND ";
+                $q= "select vtiger_activity.*, vtiger_crmentity.*, vtiger_account.accountname,vtiger_account.accountid,vtiger_activitygrouprelation.groupname FROM vtiger_activity inner join vtiger_crmentity on vtiger_activity.activityid = vtiger_crmentity.crmid left join vtiger_recurringevents on vtiger_activity.activityid=vtiger_recurringevents.activityid left outer join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_activity.activityid = vtiger_cntactivityrel.activityid left join vtiger_contactdetails on vtiger_cntactivityrel.contactid = vtiger_contactdetails.contactid left join vtiger_account  on vtiger_contactdetails.accountid = vtiger_account.accountid inner join vtiger_salesmanactivityrel on vtiger_salesmanactivityrel.activityid=vtiger_activity.activityid WHERE vtiger_activity.activitytype in ('Call','Meeting') AND ";
 
                 if(!is_admin($current_user))
                 {
                         $q .= " ( ";
                 }
 
-                $q.=" ((activity.date_start < '". $to_datetime->get_formatted_date() ."' AND activity.date_start >= '". $from_datetime->get_formatted_date()."')";
-                if(!is_admin($current_user))
-                {
-                        $q .= "  ) AND ((crmentity.smownerid ='".$current_user->id."' and salesmanactivityrel.smid = '".$current_user->id."') or (crmentity.smownerid in (".$shared_ids.") and salesmanactivityrel.smid in (".$shared_ids.")))";
-                }
-                $q .= " AND crmentity.deleted = 0) AND recurringevents.activityid is NULL ";
-                $q .= " ORDER by activity.date_start,activity.time_start";
+                $q.=" ((vtiger_activity.date_start < '". $to_datetime->get_formatted_date() ."' AND vtiger_activity.date_start >= '". $from_datetime->get_formatted_date()."')";
+                if(!is_admin($current_user))
+                {
+                        $q .= "  ) AND ((vtiger_crmentity.smownerid ='".$current_user->id."' and vtiger_salesmanactivityrel.smid = '".$current_user->id."') or (vtiger_crmentity.smownerid in (".$shared_ids.") and vtiger_salesmanactivityrel.smid in (".$shared_ids.")))";
+                }
+                $q .= " AND vtiger_crmentity.deleted = 0) AND vtiger_recurringevents.activityid is NULL ";
+                $q .= " ORDER by vtiger_activity.date_start,vtiger_activity.time_start";
 		$r = $adb->query($q);
                 $n = $adb->getRowCount($r);
                 $a = 0;
@@ -85,9 +85,9 @@
                         unset($obj);
                 }
 		//Get Recurring events
-		$q = "SELECT activity.activityid, activity.subject, activity.activitytype, crmentity.description, activity.time_start, activity.duration_hours, activity.duration_minutes, activity.priority, activity.location,activity.eventstatus, crmentity.*, recurringevents.recurringid, recurringevents.recurringdate as date_start ,recurringevents.recurringtype,account.accountname,account.accountid,activitygrouprelation.groupname from activity inner join crmentity on activity.activityid = crmentity.crmid inner join recurringevents on activity.activityid=recurringevents.activityid left outer join activitygrouprelation on activitygrouprelation.activityid=activity.activityid left join cntactivityrel on activity.activityid = cntactivityrel.activityid left join contactdetails on cntactivityrel.contactid = contactdetails.contactid left join account  on contactdetails.accountid = account.accountid inner join salesmanactivityrel on salesmanactivityrel.activityid=activity.activityid";
-
-                $q.=" where ( activity.activitytype in ('Call','Meeting') AND ";
+		$q = "SELECT vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.activitytype, vtiger_crmentity.description, vtiger_activity.time_start, vtiger_activity.duration_hours, vtiger_activity.duration_minutes, vtiger_activity.priority, vtiger_activity.location,vtiger_activity.eventstatus, vtiger_crmentity.*, vtiger_recurringevents.recurringid, vtiger_recurringevents.recurringdate as date_start ,vtiger_recurringevents.recurringtype,vtiger_account.accountname,vtiger_account.accountid,vtiger_activitygrouprelation.groupname from vtiger_activity inner join vtiger_crmentity on vtiger_activity.activityid = vtiger_crmentity.crmid inner join vtiger_recurringevents on vtiger_activity.activityid=vtiger_recurringevents.activityid left outer join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_activity.activityid = vtiger_cntactivityrel.activityid left join vtiger_contactdetails on vtiger_cntactivityrel.contactid = vtiger_contactdetails.contactid left join vtiger_account  on vtiger_contactdetails.accountid = vtiger_account.accountid inner join vtiger_salesmanactivityrel on vtiger_salesmanactivityrel.activityid=vtiger_activity.activityid";
+
+                $q.=" where ( vtiger_activity.activitytype in ('Call','Meeting') AND ";
                 if(!is_admin($current_user))
                 {
                         $q .= " ( ";
@@ -95,10 +95,10 @@
                 $q .= "  (recurringdate < '".$to_datetime->get_formatted_date()."' AND recurringdate >= '".$from_datetime->get_formatted_date(). "') ";
                 if(!is_admin($current_user))
                 {
-			$q .= " ) AND ((crmentity.smownerid ='".$current_user->id."' and salesmanactivityrel.smid = '".$current_user->id."' ) or (crmentity.smownerid in (".$shared_ids.") and salesmanactivityrel.smid in (".$shared_ids.")))";
-                }
-
-                $q .= " AND crmentity.deleted = 0 )" ;
+			$q .= " ) AND ((vtiger_crmentity.smownerid ='".$current_user->id."' and vtiger_salesmanactivityrel.smid = '".$current_user->id."' ) or (vtiger_crmentity.smownerid in (".$shared_ids.") and vtiger_salesmanactivityrel.smid in (".$shared_ids.")))";
+                }
+
+                $q .= " AND vtiger_crmentity.deleted = 0 )" ;
                 $q .= " ORDER by recurringid";
                 $r = $adb->query($q);
                 $n = $adb->getRowCount($r);
@@ -120,7 +120,7 @@
 
 
 	/** To read and set the events value in Appointment Obj
-          * @param $act_array -- The activity array :: Type Array
+          * @param $act_array -- The vtiger_activity array :: Type Array
           * @param $view -- The calendar view :: Type String
          */
 	function readResult($act_array, $view)
@@ -199,7 +199,7 @@
 			$this->assignedto ="user";
 			$this->ownerid = $act_array["smownerid"];
 			$this->owner   = getUserName($act_array["smownerid"]);
-                        $query="SELECT cal_color FROM users where id = ".$this->ownerid;
+                        $query="SELECT cal_color FROM vtiger_users where id = ".$this->ownerid;
                         $result=$adb->query($query);
                         if($adb->getRowCount($result)!=0)
 			{
@@ -241,8 +241,8 @@
 }
 
 /** To two array values
-  * @param $a -- The activity array :: Type Array
-  * @param $b -- The activity array :: Type Array
+  * @param $a -- The vtiger_activity array :: Type Array
+  * @param $b -- The vtiger_activity array :: Type Array
   * @returns value 0 or 1 or -1 depends on comparision result
  */
 function compare($a,$b)

Modified: vtigercrm/trunk/modules/Calendar/CalendarCommon.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/CalendarCommon.php (original)
+++ vtigercrm/trunk/modules/Calendar/CalendarCommon.php Mon Jun 12 14:26:25 2006
@@ -19,13 +19,13 @@
 /**
  * To get the lists of sharedids 
  * @param $id -- The user id :: Type integer
- * @returns $sharedids -- The shared users id :: Type Array
+ * @returns $sharedids -- The shared vtiger_users id :: Type Array
  */
 function getSharedUserId($id)
 {
         global $adb;
 	$sharedid = Array();
-        $query = "SELECT * from sharedcalendar where userid=".$id;
+        $query = "SELECT * from vtiger_sharedcalendar where userid=".$id;
         $result = $adb->query($query);
         $rows = $adb->num_rows($result);
         for($j=0;$j<$rows;$j++)
@@ -36,14 +36,14 @@
 }
 
 /**
- * To get the lists of users id who shared their calendar with specified user
+ * To get the lists of vtiger_users id who shared their calendar with specified user
  * @param $sharedid -- The shared user id :: Type integer
- * @returns $shared_ids -- a comma seperated users id  :: Type string
+ * @returns $shared_ids -- a comma seperated vtiger_users id  :: Type string
  */
 function getSharedCalendarId($sharedid)
 {
 	global $adb;
-	$query = "SELECT * from sharedcalendar where sharedid=".$sharedid;
+	$query = "SELECT * from vtiger_sharedcalendar where sharedid=".$sharedid;
 	$result = $adb->query($query);
 	if($adb->num_rows($result)!=0)
 	{
@@ -55,7 +55,7 @@
 }
 
 /**
- * To get userid and username of all users except the current user
+ * To get userid and username of all vtiger_users except the current user
  * @param $id -- The user id :: Type integer
  * @returns $user_details -- Array in the following format:
  * $user_details=Array($userid1=>$username, $userid2=>$username,............,$useridn=>$username);
@@ -63,7 +63,7 @@
 function getOtherUserName($id)
 {
 	global $adb;
-	$query="select * from users where deleted=0 and status='Active' and id!=".$id;
+	$query="select * from vtiger_users where deleted=0 and status='Active' and id!=".$id;
 	$result = $adb->query($query);
 	$num_rows=$adb->num_rows($result);
 	$user_details=Array();

Modified: vtigercrm/trunk/modules/Calendar/addEventUI.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/addEventUI.php (original)
+++ vtigercrm/trunk/modules/Calendar/addEventUI.php Mon Jun 12 14:26:25 2006
@@ -616,9 +616,9 @@
                 </table>
 </form>
 <script>
-	var fieldname = new Array('task_subject','task_date_start','task_time_start','taskstatus');
-        var fieldlabel = new Array('Subject','Date','Time','Status');
-        var fielddatatype = new Array('V~M','D~M~time_start','T~O','V~O');
+	var vtiger_fieldname = new Array('task_subject','task_date_start','task_time_start','taskstatus');
+        var vtiger_fieldlabel = new Array('Subject','Date','Time','Status');
+        var vtiger_fielddatatype = new Array('V~M','D~M~time_start','T~O','V~O');
 </script>	
 
 </div>

Modified: vtigercrm/trunk/modules/Calendar/calendarLayout.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/calendarLayout.php (original)
+++ vtigercrm/trunk/modules/Calendar/calendarLayout.php Mon Jun 12 14:26:25 2006
@@ -997,30 +997,30 @@
 	$shared_ids = getSharedCalendarId($current_user->id);
 	if(empty($shared_ids))
 		$shared_ids = $current_user->id;
-	$query = "SELECT cntactivityrel.contactid, activity.*
-		FROM activity
-		INNER JOIN crmentity
-			ON crmentity.crmid = activity.activityid
-		LEFT JOIN cntactivityrel
-			ON cntactivityrel.activityid = activity.activityid
-		LEFT OUTER JOIN recurringevents
-			ON recurringevents.activityid = activity.activityid
-		WHERE crmentity.deleted = 0
-			AND (activity.activitytype = 'Meeting' OR activity.activitytype = 'Call')
-			AND (activity.date_start BETWEEN '".$start_date."' AND '".$end_date."'
-				OR recurringevents.recurringdate BETWEEN '".$start_date."' AND '".$end_date."')";
+	$query = "SELECT vtiger_cntactivityrel.contactid, vtiger_activity.*
+		FROM vtiger_activity
+		INNER JOIN vtiger_crmentity
+			ON vtiger_crmentity.crmid = vtiger_activity.activityid
+		LEFT JOIN vtiger_cntactivityrel
+			ON vtiger_cntactivityrel.activityid = vtiger_activity.activityid
+		LEFT OUTER JOIN vtiger_recurringevents
+			ON vtiger_recurringevents.activityid = vtiger_activity.activityid
+		WHERE vtiger_crmentity.deleted = 0
+			AND (vtiger_activity.activitytype = 'Meeting' OR vtiger_activity.activitytype = 'Call')
+			AND (vtiger_activity.date_start BETWEEN '".$start_date."' AND '".$end_date."'
+				OR vtiger_recurringevents.recurringdate BETWEEN '".$start_date."' AND '".$end_date."')";
 	if($info != '')
 	{
-		$pending_query = $query." AND (activity.eventstatus = 'Planned')
-			AND crmentity.smownerid = ".$current_user->id."
-		ORDER BY activity.date_start,activity.time_start ASC";
+		$pending_query = $query." AND (vtiger_activity.eventstatus = 'Planned')
+			AND vtiger_crmentity.smownerid = ".$current_user->id."
+		ORDER BY vtiger_activity.date_start,vtiger_activity.time_start ASC";
 		$res = $adb->query($pending_query);
 		$pending_rows = $adb->num_rows($res);
 	}
 	if(!is_admin($current_user))
-		$query .= " AND crmentity.smownerid in (".$shared_ids.")";
+		$query .= " AND vtiger_crmentity.smownerid in (".$shared_ids.")";
 		
-	$query .= "ORDER BY activity.date_start,activity.time_start ASC";
+	$query .= "ORDER BY vtiger_activity.date_start,vtiger_activity.time_start ASC";
 
 	$result = $adb->query($query);
 	$rows = $adb->num_rows($result);
@@ -1083,27 +1083,27 @@
 	$shared_ids = getSharedCalendarId($current_user->id);
 	if(empty($shared_ids))
 		$shared_ids = $current_user->id;
-        $query = "SELECT cntactivityrel.contactid, activity.*
-                FROM activity
-                INNER JOIN crmentity
-                        ON crmentity.crmid = activity.activityid
-                LEFT JOIN cntactivityrel
-                        ON cntactivityrel.activityid = activity.activityid
-                WHERE crmentity.deleted = 0
-                        AND activity.activitytype = 'Task'
-                        AND (activity.date_start BETWEEN '".$start_date."' AND '".$end_date."')";
+        $query = "SELECT vtiger_cntactivityrel.contactid, vtiger_activity.*
+                FROM vtiger_activity
+                INNER JOIN vtiger_crmentity
+                        ON vtiger_crmentity.crmid = vtiger_activity.activityid
+                LEFT JOIN vtiger_cntactivityrel
+                        ON vtiger_cntactivityrel.activityid = vtiger_activity.activityid
+                WHERE vtiger_crmentity.deleted = 0
+                        AND vtiger_activity.activitytype = 'Task'
+                        AND (vtiger_activity.date_start BETWEEN '".$start_date."' AND '".$end_date."')";
         if($info != '')
         {
-                $pending_query = $query." AND (activity.status != 'Completed')
-                        AND crmentity.smownerid = ".$current_user->id."
-                ORDER BY activity.date_start,activity.time_start ASC";
+                $pending_query = $query." AND (vtiger_activity.status != 'Completed')
+                        AND vtiger_crmentity.smownerid = ".$current_user->id."
+                ORDER BY vtiger_activity.date_start,vtiger_activity.time_start ASC";
                 $res = $adb->query($pending_query);
                 $pending_rows = $adb->num_rows($res);
         }
 	
 	if(!is_admin($current_user))
-                $query .= " AND crmentity.smownerid in (".$shared_ids.")";
-        $query .= " ORDER BY activity.date_start,activity.time_start ASC";
+                $query .= " AND vtiger_crmentity.smownerid in (".$shared_ids.")";
+        $query .= " ORDER BY vtiger_activity.date_start,vtiger_activity.time_start ASC";
 
         $result = $adb->query($query);
         $rows = $adb->num_rows($result);

Modified: vtigercrm/trunk/modules/Calendar/disable_sharing.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/disable_sharing.php (original)
+++ vtigercrm/trunk/modules/Calendar/disable_sharing.php Mon Jun 12 14:26:25 2006
@@ -16,7 +16,7 @@
 $storearray = explode(";",$idlist);
 foreach($storearray as $id)
 {
-        $sql="delete from sharedcalendar where sharedid='" .$id ."'";
+        $sql="delete from vtiger_sharedcalendar where sharedid='" .$id ."'";
         $result = $adb->query($sql);
 }
 header("Location:index.php?module=".$returnmodule."&action=".$returnaction);

Modified: vtigercrm/trunk/modules/Calendar/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Calendar/language/en_us.lang.php Mon Jun 12 14:26:25 2006
@@ -108,7 +108,7 @@
 
 'LBL_APP_IGNORE_TIME2' => '(i.e. the appointment takes place<br />at no particular time on these day(s) )',
 
-'LBL_APP_ERR001' =>'Invalid Date in field %s!',
+'LBL_APP_ERR001' =>'Invalid Date in vtiger_field %s!',
 'LBL_APP_ERR002' =>'start after end !',
 'LBL_APP_ERR003' =>'Missing Contact !',
 'LBL_APP_ERR004' =>'Missing Subject !',
@@ -208,10 +208,10 @@
 'LBL_EVERYMON'=>'Every Month',
 'LBL_REPEATEVENT'=>'Repeat Event',
 
-'LBL_INVITE_INST1'=>'To invite, select the users from the "Available Users" list and click the "Add" button.',
-'LBL_INVITE_INST2'=>'To remove, select the users in the "Selected Users" list and the click "Remove" button.',
-'LBL_SELUSR_INFO'=>' Selected users will receive an email about the Event.',
-'LBL_CALSHAREMESSAGE'=>'Share my calendar with the following selected users',
+'LBL_INVITE_INST1'=>'To invite, select the vtiger_users from the "Available Users" list and click the "Add" button.',
+'LBL_INVITE_INST2'=>'To remove, select the vtiger_users in the "Selected Users" list and the click "Remove" button.',
+'LBL_SELUSR_INFO'=>' Selected vtiger_users will receive an email about the Event.',
+'LBL_CALSHAREMESSAGE'=>'Share my calendar with the following selected vtiger_users',
 'LBL_CALSHARE'=>'Calendar Sharing',
 'LBL_SEL_USERS'=>'Selected Users',
 'LBL_AVL_USERS'=>'Available Users',

Modified: vtigercrm/trunk/modules/Calendar/updateCalendarSharing.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/updateCalendarSharing.php (original)
+++ vtigercrm/trunk/modules/Calendar/updateCalendarSharing.php Mon Jun 12 14:26:25 2006
@@ -15,7 +15,7 @@
 	$hour_format = $_REQUEST['hour_format'];
 else
 	$hour_format = 'am/pm';
-$delquery = "delete from sharedcalendar where userid=".$_REQUEST["current_userid"];
+$delquery = "delete from vtiger_sharedcalendar where userid=".$_REQUEST["current_userid"];
 $adb->query($delquery);
 $sharedid = $_REQUEST['user'];
 if(isset($sharedid) && $sharedid != null)
@@ -24,18 +24,18 @@
         {
                 if($sid != '')
                 {
-			$sql = "insert into sharedcalendar values (".$_REQUEST["current_userid"].",".$sid.")";
+			$sql = "insert into vtiger_sharedcalendar values (".$_REQUEST["current_userid"].",".$sid.")";
 		        $adb->query($sql);
                 }
         }
 }
 if(isset($_REQUEST['start_hour']) && $_REQUEST['start_hour'] != '')
 {
-	$sql = "update users set start_hour='".$_REQUEST['start_hour']."' where id=".$current_user->id;
+	$sql = "update vtiger_users set start_hour='".$_REQUEST['start_hour']."' where id=".$current_user->id;
         $adb->query($sql);
 }
 
-$sql = "update users set hour_format='".$hour_format."' where id=".$current_user->id;
+$sql = "update vtiger_users set hour_format='".$hour_format."' where id=".$current_user->id;
 $adb->query($sql);
 header("Location: index.php?action=index&module=Calendar&parenttab=My Home Page");
 

Modified: vtigercrm/trunk/modules/Campaigns/Campaign.php
==============================================================================
--- vtigercrm/trunk/modules/Campaigns/Campaign.php (original)
+++ vtigercrm/trunk/modules/Campaigns/Campaign.php Mon Jun 12 14:26:25 2006
@@ -25,12 +25,12 @@
 	var $log;
 	var $db;
 
-	// Stored fields
+	// Stored vtiger_fields
 	var $id;
 	var $mode;
 
-	var $tab_name = Array('crmentity','campaign','campaignscf');
-	var $tab_name_index = Array('crmentity'=>'crmid','campaign'=>'campaignid','campaignscf'=>'campaignid');
+	var $tab_name = Array('vtiger_crmentity','vtiger_campaign','vtiger_campaignscf');
+	var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_campaign'=>'campaignid','vtiger_campaignscf'=>'campaignid');
 	var $column_fields = Array();
 
 	var $sortby_fields = Array('campaignname','smownerid','expectedcost');
@@ -69,7 +69,7 @@
                 $button = '';
                 $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;
+		$query = 'SELECT vtiger_contactdetails.*, vtiger_crmentity.crmid, vtiger_users.user_name, vtiger_groups.groupname, vtiger_crmentity.smownerid from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid left join vtiger_users on vtiger_crmentity.smownerid = vtiger_users.id left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid left join vtiger_groups on vtiger_groups.groupname=vtiger_contactgrouprelation.groupname  where vtiger_crmentity.deleted=0 and vtiger_contactdetails.campaignid = '.$id;
 		$log->debug("Exiting get_contacts method ...");
                 return GetRelatedList('Campaigns','Contacts',$focus,$query,$button,$returnset);
         }
@@ -84,7 +84,7 @@
                 $button = '';
                 $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;
+		$query = 'SELECT vtiger_leaddetails.*, vtiger_crmentity.crmid, vtiger_users.user_name, vtiger_groups.groupname, vtiger_crmentity.smownerid from vtiger_leaddetails inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_leaddetails.leadid left join vtiger_users on vtiger_crmentity.smownerid = vtiger_users.id left join vtiger_leadgrouprelation on vtiger_leaddetails.leadid=vtiger_leadgrouprelation.leadid left join vtiger_groups on vtiger_groups.groupname=vtiger_leadgrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_leaddetails.campaignid = '.$id;
 		$log->debug("Exiting get_leads method ...");
                 return GetRelatedList('Campaigns','Leads',$focus,$query,$button,$returnset);
         }

Modified: vtigercrm/trunk/modules/Campaigns/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Campaigns/ListView.php (original)
+++ vtigercrm/trunk/modules/Campaigns/ListView.php Mon Jun 12 14:26:25 2006
@@ -136,7 +136,7 @@
 {
 	if($order_by == 'smownerid')
 	{
-		$list_query .= ' ORDER BY users.user_name '.$sorder;
+		$list_query .= ' ORDER BY vtiger_users.user_name '.$sorder;
 	}
 	else
 	{
@@ -148,7 +148,7 @@
 }
 else
 {
-	$list_query .= ' order by campaign.campaignid DESC';
+	$list_query .= ' order by vtiger_campaign.campaignid DESC';
 }
 
 $list_result = $adb->query($list_query);

Modified: vtigercrm/trunk/modules/Contacts/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/Contacts/CallRelatedList.php Mon Jun 12 14:26:25 2006
@@ -29,11 +29,11 @@
 }
 
 global $adb;
-$sql = $adb->query('select accountid from contactdetails where contactid='.$focus->id);
+$sql = $adb->query('select vtiger_accountid from vtiger_contactdetails where contactid='.$focus->id);
 $accountid = $adb->query_result($sql,0,'accountid');
 if($accountid == 0) $accountid='';
 
-$sql1 = $adb->query('select campaignid from contactdetails where contactid='.$focus->id);
+$sql1 = $adb->query('select vtiger_campaignid from vtiger_contactdetails where contactid='.$focus->id);
 $campaignid = $adb->query_result($sql1,0,'campaignid');
 if($campaignid == 0) $campaignid='';
 

Modified: vtigercrm/trunk/modules/Contacts/Contact.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/Contact.php (original)
+++ vtigercrm/trunk/modules/Contacts/Contact.php Mon Jun 12 14:26:25 2006
@@ -38,8 +38,8 @@
 	var $db;
 
 	var $table_name = "contactdetails";
-	var $tab_name = Array('crmentity','contactdetails','contactaddress','contactsubdetails','contactscf','customerdetails','attachments');
-	var $tab_name_index = Array('crmentity'=>'crmid','contactdetails'=>'contactid','contactaddress'=>'contactaddressid','contactsubdetails'=>'contactsubscriptionid','contactscf'=>'contactid','customerdetails'=>'customerid','attachments'=>'attachmentsid');
+	var $tab_name = Array('vtiger_crmentity','vtiger_contactdetails','vtiger_contactaddress','vtiger_contactsubdetails','vtiger_contactscf','vtiger_customerdetails','vtiger_attachments');
+	var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_contactdetails'=>'contactid','vtiger_contactaddress'=>'contactaddressid','vtiger_contactsubdetails'=>'contactsubscriptionid','vtiger_contactscf'=>'contactid','vtiger_customerdetails'=>'customerid','vtiger_attachments'=>'attachmentsid');
 
 	var $module_id = "contactid";
 	var $object_name = "Contact";
@@ -52,7 +52,7 @@
 
 	var $list_link_field= 'lastname';
 
-	// This is the list of fields that are in the lists.
+	// This is the list of vtiger_fields that are in the lists.
 	var $list_fields = Array(
 	'Last Name' => Array('contactdetails'=>'lastname'),
 	'First Name' => Array('contactdetails'=>'firstname'),
@@ -116,7 +116,7 @@
 	'Title' => 'title'
 	);
 
-	// This is the list of fields that are required
+	// This is the list of vtiger_fields that are required
 	var $required_fields =  array("lastname"=>1);
 
 	//Added these variables which are used as default order by and sortorder in ListView
@@ -159,7 +159,7 @@
     {
 	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";
+        $query = "select count(*) from vtiger_contactdetails  inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_contactdetails.contactid inner join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where user_name='" .$user_name ."' and vtiger_crmentity.deleted=0";
 
         $result = $this->db->query($query,true,"Error retrieving contacts count");
         $rows_found =  $this->db->getRowCount($result);
@@ -174,7 +174,7 @@
     {   
 	global $log;
 	$log->debug("Entering get_contacts1(".$user_name.",".$email_address.") method ...");
-      $query = "select users.user_name, 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";
+      $query = "select vtiger_users.user_name, vtiger_contactdetails.lastname last_name,vtiger_contactdetails.firstname first_name,vtiger_contactdetails.contactid as id, vtiger_contactdetails.salutation as salutation, vtiger_contactdetails.email as email1,vtiger_contactdetails.title as title,vtiger_contactdetails.mobile as phone_mobile,vtiger_account.accountname as vtiger_account_name,vtiger_account.accountid as vtiger_account_id   from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_contactdetails.contactid inner join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid  left join vtiger_account on vtiger_account.accountid=vtiger_contactdetails.accountid left join vtiger_contactaddress on vtiger_contactaddress.contactaddressid=vtiger_contactdetails.contactid  left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid where user_name='" .$user_name ."' and vtiger_crmentity.deleted=0  and vtiger_contactdetails.email like '%" .$email_address ."%' limit 50";
     
 	$log->debug("Exiting get_contacts1 method ...");
       return $this->process_list_query1($query);
@@ -184,7 +184,7 @@
     {   
 	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;
+      $query = "select vtiger_users.user_name,vtiger_groups.groupname,vtiger_contactdetails.department department, vtiger_contactdetails.phone office_phone, vtiger_contactdetails.fax fax, vtiger_contactsubdetails.assistant assistant_name, vtiger_contactsubdetails.otherphone other_phone, vtiger_contactsubdetails.homephone home_phone,vtiger_contactsubdetails.birthday birthdate, vtiger_contactdetails.lastname last_name,vtiger_contactdetails.firstname first_name,vtiger_contactdetails.contactid as id, vtiger_contactdetails.salutation as salutation, vtiger_contactdetails.email as email1,vtiger_contactdetails.title as title,vtiger_contactdetails.mobile as phone_mobile,vtiger_account.accountname as vtiger_account_name,vtiger_account.accountid as vtiger_account_id, vtiger_contactaddress.mailingcity as primary_address_city,vtiger_contactaddress.mailingstreet as primary_address_street, vtiger_contactaddress.mailingcountry as primary_address_country,vtiger_contactaddress.mailingstate as primary_address_state, vtiger_contactaddress.mailingzip as primary_address_postalcode,   vtiger_contactaddress.othercity as alt_address_city,vtiger_contactaddress.otherstreet as alt_address_street, vtiger_contactaddress.othercountry as alt_address_country,vtiger_contactaddress.otherstate as alt_address_state, vtiger_contactaddress.otherzip as alt_address_postalcode  from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_contactdetails.contactid inner join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_account on vtiger_account.accountid=vtiger_contactdetails.accountid left join vtiger_contactaddress on vtiger_contactaddress.contactaddressid=vtiger_contactdetails.contactid left join vtiger_contactsubdetails on vtiger_contactsubdetails.contactsubscriptionid = vtiger_contactdetails.contactid left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid left join vtiger_groups on vtiger_groups.groupname=vtiger_contactgrouprelation.groupname left join vtiger_users on vtiger_crmentity.smownerid=vtiger_users.id where user_name='" .$user_name ."' and vtiger_crmentity.deleted=0 limit " .$from_index ."," .$offset;
       
 	$log->debug("Exiting get_contacts method ...");
       return $this->process_list_query1($query);
@@ -218,8 +218,8 @@
                     }   
 	     }	
     
-// TODO OPTIMIZE THE QUERY ACCOUNT NAME AND ID are set separetly for every contactdetails and hence 
-// account query goes for ecery single account row
+// TODO OPTIMIZE THE QUERY ACCOUNT NAME AND ID are set separetly for every vtiger_contactdetails and hence 
+// vtiger_account query goes for ecery single vtiger_account row
 
                     $list[] = $contact;
                 }
@@ -261,7 +261,7 @@
 		$log->info("Potential Related List for Contact Displayed");
 
 		// First, get the list of IDs.
-		$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';
+		$query = 'select vtiger_users.user_name,vtiger_groups.groupname,vtiger_contactdetails.accountid, vtiger_contactdetails.contactid , vtiger_potential.potentialid, vtiger_potential.potentialname, vtiger_potential.potentialtype, vtiger_potential.sales_stage, vtiger_potential.amount, vtiger_potential.closingdate, vtiger_crmentity.crmid, vtiger_crmentity.smownerid from vtiger_contactdetails inner join vtiger_potential on vtiger_contactdetails.accountid = vtiger_potential.accountid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_potential.potentialid left join vtiger_potentialgrouprelation on vtiger_potential.potentialid=vtiger_potentialgrouprelation.potentialid left join vtiger_groups on vtiger_groups.groupname=vtiger_potentialgrouprelation.groupname left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_contactdetails.contactid = '.$id.' and vtiger_crmentity.deleted=0';
 		if($this->column_fields['account_id'] != 0)
 		$log->debug("Exiting get_opportunities method ...");
 		return GetRelatedList('Contacts','Potentials',$focus,$query,$button,$returnset);
@@ -292,7 +292,7 @@
 
 		$log->info("Activity Related List for Contact Displayed");
 
-		$query = "SELECT users.user_name,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 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 contactdetails.contactid=".$id." and crmentity.deleted = 0 and (activity.activitytype = 'Meeting' or activity.activitytype='Call' or activity.activitytype='Task') AND ( activity.status is NULL OR activity.status != 'Completed' ) and ( activity.eventstatus is NULL OR activity.eventstatus != 'Held') ";  //recurring type is added in Query -Jaguar
+		$query = "SELECT vtiger_users.user_name,vtiger_contactdetails.lastname, vtiger_contactdetails.firstname,  vtiger_activity.activityid , vtiger_activity.subject, vtiger_activity.activitytype, vtiger_activity.date_start, vtiger_activity.due_date, vtiger_cntactivityrel.contactid, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_recurringevents.recurringtype  from vtiger_contactdetails inner join vtiger_cntactivityrel on vtiger_cntactivityrel.contactid = vtiger_contactdetails.contactid inner join vtiger_activity on vtiger_cntactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_cntactivityrel.activityid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname  where vtiger_contactdetails.contactid=".$id." and vtiger_crmentity.deleted = 0 and (vtiger_activity.activitytype = 'Meeting' or vtiger_activity.activitytype='Call' or vtiger_activity.activitytype='Task') AND ( vtiger_activity.status is NULL OR vtiger_activity.status != 'Completed' ) and ( vtiger_activity.eventstatus is NULL OR vtiger_activity.eventstatus != 'Held') ";  //recurring type is added in Query -Jaguar
 		$log->debug("Exiting get_activities method ...");
 		return GetRelatedList('Contacts','Activities',$focus,$query,$button,$returnset);
 
@@ -302,21 +302,21 @@
 	{
 		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,
-			crmentity.createdtime, crmentity.description, users.user_name
-				from activity
-				inner join cntactivityrel on cntactivityrel.activityid= activity.activityid
-				inner join contactdetails on contactdetails.contactid= cntactivityrel.contactid
-				inner join crmentity on crmentity.crmid=activity.activityid
-				left join seactivityrel on seactivityrel.activityid=activity.activityid
-				left join activitygrouprelation on activitygrouprelation.activityid=activity.activityid
-                                left join groups on groups.groupname=activitygrouprelation.groupname
-				inner join users on crmentity.smcreatorid= users.id
-				where (activity.activitytype = 'Meeting' or activity.activitytype='Call' or activity.activitytype='Task')
-				and (activity.status = 'Completed' or activity.status = 'Deferred' or (activity.eventstatus = 'Held' and activity.eventstatus != ''))
-				and cntactivityrel.contactid=".$id;
+		$query = "SELECT vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.status, vtiger_activity.eventstatus,
+		vtiger_activity.activitytype, vtiger_contactdetails.contactid, vtiger_contactdetails.firstname,
+		vtiger_contactdetails.lastname, vtiger_crmentity.modifiedtime,
+		vtiger_crmentity.createdtime, vtiger_crmentity.description, vtiger_users.user_name
+				from vtiger_activity
+				inner join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid
+				inner join vtiger_contactdetails on vtiger_contactdetails.contactid= vtiger_cntactivityrel.contactid
+				inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid
+				left join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid
+				left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_activity.activityid
+                                left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname
+				inner join vtiger_users on vtiger_crmentity.smcreatorid= vtiger_users.id
+				where (vtiger_activity.activitytype = 'Meeting' or vtiger_activity.activitytype='Call' or vtiger_activity.activitytype='Task')
+				and (vtiger_activity.status = 'Completed' or vtiger_activity.status = 'Deferred' or (vtiger_activity.eventstatus = 'Held' and vtiger_activity.eventstatus != ''))
+				and vtiger_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);
@@ -332,7 +332,7 @@
 		$button = '<td valign="bottom" align="right"><input title="New Ticket" accessyKey="F" class="button" onclick="this.form.action.value=\'EditView\';this.form.module.value=\'HelpDesk\'" type="submit" name="button" value="'.$app_strings['LBL_NEW_TICKET'].'">&nbsp;</td>';
 		$returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id;
 
-		$query = "select users.user_name,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;
+		$query = "select vtiger_users.user_name,vtiger_crmentity.crmid, vtiger_troubletickets.title, vtiger_contactdetails.contactid, vtiger_troubletickets.parent_id, vtiger_contactdetails.firstname, vtiger_contactdetails.lastname, vtiger_troubletickets.status, vtiger_troubletickets.priority, vtiger_crmentity.smownerid from vtiger_troubletickets inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_troubletickets.ticketid left join vtiger_contactdetails on vtiger_contactdetails.contactid=vtiger_troubletickets.parent_id left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_ticketgrouprelation on vtiger_troubletickets.ticketid=vtiger_ticketgrouprelation.ticketid left join vtiger_groups on vtiger_groups.groupname=vtiger_ticketgrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_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);
@@ -342,28 +342,28 @@
 	{
 		global $log;
 		$log->debug("Entering get_attachments(".$id.") method ...");
-		$query = "select notes.title,'Notes      ' AS ActivityType,
-			notes.filename, attachments.type AS FileType,crm2.modifiedtime AS lastmodified,
-			seattachmentsrel.attachmentsid AS attachmentsid, notes.notesid AS crmid,
-			crm2.createdtime, notes.notecontent AS description, users.user_name
-		from notes
-			inner join crmentity on crmentity.crmid= notes.contact_id
-			inner join crmentity crm2 on crm2.crmid=notes.notesid and crm2.deleted=0
-			left join seattachmentsrel on seattachmentsrel.crmid =notes.notesid
-			left join attachments on seattachmentsrel.attachmentsid = attachments.attachmentsid
-			inner join users on crm2.smcreatorid= users.id
-		where crmentity.crmid=".$id;
+		$query = "select vtiger_notes.title,'Notes      ' AS ActivityType,
+		vtiger_notes.filename, vtiger_attachments.type AS FileType,crm2.modifiedtime AS lastmodified,
+		vtiger_seattachmentsrel.attachmentsid AS vtiger_attachmentsid, vtiger_notes.notesid AS crmid,
+			crm2.createdtime, vtiger_notes.notecontent AS description, vtiger_users.user_name
+		from vtiger_notes
+			inner join vtiger_crmentity on vtiger_crmentity.crmid= vtiger_notes.contact_id
+			inner join vtiger_crmentity crm2 on crm2.crmid=vtiger_notes.notesid and crm2.deleted=0
+			left join vtiger_seattachmentsrel on vtiger_seattachmentsrel.crmid =vtiger_notes.notesid
+			left join vtiger_attachments on vtiger_seattachmentsrel.attachmentsid = vtiger_attachments.attachmentsid
+			inner join vtiger_users on crm2.smcreatorid= vtiger_users.id
+		where vtiger_crmentity.crmid=".$id;
 		$query .= " union all ";
-		$query .= "select attachments.description AS title,'Attachments' AS ActivityType,
-			attachments.name AS filename, attachments.type AS FileType,crm2.modifiedtime AS lastmodified,
-			attachments.attachmentsid AS attachmentsid, seattachmentsrel.attachmentsid AS crmid,
-			crm2.createdtime, attachments.description, users.user_name
-		from attachments
-			inner join seattachmentsrel on seattachmentsrel.attachmentsid= attachments.attachmentsid
-			inner join crmentity on crmentity.crmid= seattachmentsrel.crmid
-			inner join crmentity crm2 on crm2.crmid=attachments.attachmentsid
-			inner join users on crm2.smcreatorid= users.id
-		where crmentity.crmid=".$id."
+		$query .= "select vtiger_attachments.description AS title,'Attachments' AS ActivityType,
+		vtiger_attachments.name AS filename, vtiger_attachments.type AS FileType,crm2.modifiedtime AS lastmodified,
+		vtiger_attachments.attachmentsid AS vtiger_attachmentsid, vtiger_seattachmentsrel.attachmentsid AS crmid,
+			crm2.createdtime, vtiger_attachments.description, vtiger_users.user_name
+		from vtiger_attachments
+			inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid= vtiger_attachments.attachmentsid
+			inner join vtiger_crmentity on vtiger_crmentity.crmid= vtiger_seattachmentsrel.crmid
+			inner join vtiger_crmentity crm2 on crm2.crmid=vtiger_attachments.attachmentsid
+			inner join vtiger_users on crm2.smcreatorid= vtiger_users.id
+		where vtiger_crmentity.crmid=".$id."
 		order by createdtime desc";
 	  	$log->info("Notes&Attachmenmts for Contact Displayed");
 		$log->debug("Exiting get_attachments method ...");
@@ -384,7 +384,7 @@
 		$button .= '<input title="'.$app_strings['LBL_NEW_QUOTE_BUTTON_TITLE'].'" accessyKey="'.$app_strings['LBL_NEW_QUOTE_BUTTON_KEY'].'" class="button" onclick="this.form.action.value=\'EditView\';this.form.module.value=\'Quotes\'" type="submit" name="button" value="'.$app_strings['LBL_NEW_QUOTE_BUTTON'].'">&nbsp;</td>';
 		}
 		$returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id;
-		$query = "select users.user_name,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 users on users.id=crmentity.smownerid left join quotegrouprelation on quotes.quoteid=quotegrouprelation.quoteid left join groups on groups.groupname=quotegrouprelation.groupname where crmentity.deleted=0 and contactdetails.contactid=".$id;
+		$query = "select vtiger_users.user_name,vtiger_crmentity.*, vtiger_quotes.*,vtiger_potential.potentialname,vtiger_contactdetails.lastname from vtiger_quotes inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_quotes.quoteid left outer join vtiger_contactdetails on vtiger_contactdetails.contactid=vtiger_quotes.contactid left outer join vtiger_potential on vtiger_potential.potentialid=vtiger_quotes.potentialid  left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_quotegrouprelation on vtiger_quotes.quoteid=vtiger_quotegrouprelation.quoteid left join vtiger_groups on vtiger_groups.groupname=vtiger_quotegrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_contactdetails.contactid=".$id;
 		$log->debug("Exiting get_quotes method ...");
 		return GetRelatedList('Contacts','Quotes',$focus,$query,$button,$returnset);
 	  }
@@ -405,7 +405,7 @@
 		 }
 		 $returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id;
 
-		 $query = "select users.user_name,crmentity.*, salesorder.*, quotes.subject as quotename, account.accountname, contactdetails.lastname from salesorder inner join crmentity on crmentity.crmid=salesorder.salesorderid left join users on users.id=crmentity.smownerid 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;
+		 $query = "select vtiger_users.user_name,vtiger_crmentity.*, vtiger_salesorder.*, vtiger_quotes.subject as quotename, vtiger_account.accountname, vtiger_contactdetails.lastname from vtiger_salesorder inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_salesorder.salesorderid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left outer join vtiger_quotes on vtiger_quotes.quoteid=vtiger_salesorder.quoteid left outer join vtiger_account on vtiger_account.accountid=vtiger_salesorder.accountid left outer join vtiger_contactdetails on vtiger_contactdetails.contactid=vtiger_salesorder.contactid left join vtiger_sogrouprelation on vtiger_salesorder.salesorderid=vtiger_sogrouprelation.salesorderid left join vtiger_groups on vtiger_groups.groupname=vtiger_sogrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_salesorder.contactid = ".$id;
 		$log->debug("Exiting get_salesorder method ...");
 		 return GetRelatedList('Contacts','SalesOrder',$focus,$query,$button,$returnset);
 	 }
@@ -426,7 +426,7 @@
 		 }
 		 $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';
+		 $query = 'select vtiger_products.productid, vtiger_products.productname, vtiger_products.productcode, vtiger_products.commissionrate, vtiger_products.qty_per_unit, vtiger_products.unit_price, vtiger_crmentity.crmid, vtiger_crmentity.smownerid,vtiger_contactdetails.lastname from vtiger_products inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_products.productid left outer join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_products.contactid where vtiger_contactdetails.contactid = '.$id.' and vtiger_crmentity.deleted = 0';
 		$log->debug("Exiting get_products method ...");
 		 return GetRelatedList('Contacts','Products',$focus,$query,$button,$returnset);
 	 }
@@ -448,7 +448,7 @@
 		 }
 		 $returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id;
 
-		 $query = "select users.user_name,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 users on users.id=crmentity.smownerid left join pogrouprelation on purchaseorder.purchaseorderid=pogrouprelation.purchaseorderid left join groups on groups.groupname=pogrouprelation.groupname where crmentity.deleted=0 and purchaseorder.contactid=".$id;
+		 $query = "select vtiger_users.user_name,vtiger_crmentity.*, vtiger_purchaseorder.*,vtiger_vendor.vendorname,vtiger_contactdetails.lastname from vtiger_purchaseorder inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_purchaseorder.purchaseorderid left outer join vtiger_vendor on vtiger_purchaseorder.vendorid=vtiger_vendor.vendorid left outer join vtiger_contactdetails on vtiger_contactdetails.contactid=vtiger_purchaseorder.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_pogrouprelation on vtiger_purchaseorder.purchaseorderid=vtiger_pogrouprelation.purchaseorderid left join vtiger_groups on vtiger_groups.groupname=vtiger_pogrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_purchaseorder.contactid=".$id;
 		$log->debug("Exiting get_purchase_orders method ...");
 		 return GetRelatedList('Contacts','PurchaseOrder',$focus,$query,$button,$returnset);
 	 }
@@ -476,7 +476,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";
+		$query = "select vtiger_activity.activityid, vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.activitytype, vtiger_users.user_name, vtiger_crmentity.modifiedtime, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_activity.date_start from vtiger_activity, vtiger_seactivityrel, vtiger_contactdetails, vtiger_users, vtiger_crmentity left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.activityid = vtiger_activity.activityid and vtiger_contactdetails.contactid = vtiger_seactivityrel.crmid and vtiger_users.id=vtiger_crmentity.smownerid and vtiger_crmentity.crmid = vtiger_activity.activityid  and vtiger_contactdetails.contactid = ".$id." and vtiger_activity.activitytype='Emails' and vtiger_crmentity.deleted = 0";
 		$log->debug("Exiting get_emails method ...");
 		return GetRelatedList('Contacts','Emails',$focus,$query,$button,$returnset);
 	}
@@ -492,30 +492,30 @@
 		if($this->checkIfCustomTableExists('contactscf'))
 		{
 			$query =  $this->constructCustomQueryAddendum('contactscf','Contacts') ."
-                                contactdetails.*, contactaddress.*,
-                                account.accountname account_name,
-                                users.user_name assigned_user_name
-                                FROM contactdetails
-				inner join crmentity on crmentity.crmid=contactdetails.contactid
-                                LEFT JOIN users ON crmentity.smownerid=users.id
-                                LEFT JOIN account on contactdetails.accountid=account.accountid
-				left join contactaddress on contactaddress.contactaddressid=contactdetails.contactid
-			        left join contactscf on contactscf.contactid=contactdetails.contactid
-				where crmentity.deleted=0 and users.status='Active' ";
+                                vtiger_contactdetails.*, vtiger_contactaddress.*,
+                                vtiger_account.accountname vtiger_account_name,
+                                vtiger_users.user_name assigned_user_name
+                                FROM vtiger_contactdetails
+				inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_contactdetails.contactid
+                                LEFT JOIN vtiger_users ON vtiger_crmentity.smownerid=vtiger_users.id
+                                LEFT JOIN vtiger_account on vtiger_contactdetails.accountid=vtiger_account.accountid
+				left join vtiger_contactaddress on vtiger_contactaddress.contactaddressid=vtiger_contactdetails.contactid
+			        left join vtiger_contactscf on vtiger_contactscf.contactid=vtiger_contactdetails.contactid
+				where vtiger_crmentity.deleted=0 and vtiger_users.status='Active' ";
 		}
 		else
 		{
                   	 $query = "SELECT
-                                contactdetails.*, contactaddress.*,
-                                account.accountname account_name,
-                                users.user_name assigned_user_name
-                                FROM contactdetails
-                                inner join crmentity on crmentity.crmid=contactdetails.contactid
-                                LEFT JOIN users ON crmentity.smownerid=users.id
-                                LEFT JOIN account on contactdetails.accountid=account.accountid
-				left join contactaddress on contactaddress.contactaddressid=contactdetails.contactid
-			        left join contactscf on contactscf.contactid=contactdetails.contactid
-				where crmentity.deleted=0 and users.status='Active' ";
+                                vtiger_contactdetails.*, vtiger_contactaddress.*,
+                                vtiger_account.accountname vtiger_account_name,
+                                vtiger_users.user_name assigned_user_name
+                                FROM vtiger_contactdetails
+                                inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_contactdetails.contactid
+                                LEFT JOIN vtiger_users ON vtiger_crmentity.smownerid=vtiger_users.id
+                                LEFT JOIN vtiger_account on vtiger_contactdetails.accountid=vtiger_account.accountid
+				left join vtiger_contactaddress on vtiger_contactaddress.contactaddressid=vtiger_contactdetails.contactid
+			        left join vtiger_contactscf on vtiger_contactscf.contactid=vtiger_contactdetails.contactid
+				where vtiger_crmentity.deleted=0 and vtiger_users.status='Active' ";
 		}
                  $log->info("Export Query Constructed Successfully");
 		$log->debug("Exiting create_export_query method ...");
@@ -528,7 +528,7 @@
 {
 	global $log;
 	$log->debug("Entering getColumnNames() method ...");
-	$sql1 = "select fieldlabel from field where tabid=4 and block <> 6 and block <> 75";
+	$sql1 = "select vtiger_fieldlabel from vtiger_field where vtiger_tabid=4 and block <> 6 and block <> 75";
 	$result = $this->db->query($sql1);
 	$numRows = $this->db->num_rows($result);
 	for($i=0; $i < $numRows;$i++)
@@ -548,16 +548,16 @@
 {
 	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,
-						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 
-						where user_name='" .$username ."' and crmentity.deleted=0  and contactdetails.email like '%".$emailaddress."%'";
+	$query = "select vtiger_contactdetails.lastname as last_name,vtiger_contactdetails.firstname as first_name,
+					vtiger_contactdetails.contactid as id, vtiger_contactdetails.salutation as salutation, 
+					vtiger_contactdetails.email as email1,vtiger_contactdetails.title as title,
+					vtiger_contactdetails.mobile as phone_mobile,vtiger_account.accountname as vtiger_account_name,
+					vtiger_account.accountid as vtiger_account_id  from vtiger_contactdetails 
+						inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_contactdetails.contactid 
+						inner join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid  
+						left join vtiger_account on vtiger_account.accountid=vtiger_contactdetails.accountid 
+						left join vtiger_contactaddress on vtiger_contactaddress.contactaddressid=vtiger_contactdetails.contactid 
+						where user_name='" .$username ."' and vtiger_crmentity.deleted=0  and vtiger_contactdetails.email like '%".$emailaddress."%'";
 						
 	$log->debug("Exiting get_searchbyemailid method ...");
 	return $this->process_list_query1($query);
@@ -567,27 +567,27 @@
 {
 	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,  
-						contactsubdetails.otherphone, contactsubdetails.homephone,
-						contactsubdetails.birthday birthdate, contactdetails.lastname last_name,
-						contactdetails.firstname first_name,contactdetails.contactid as id, 
-						contactdetails.salutation, contactdetails.email,
-						contactdetails.title,contactdetails.mobile,
-						account.accountname as account_name,account.accountid as account_id, 
-						contactaddress.mailingcity, contactaddress.mailingstreet, 
-						contactaddress.mailingcountry, contactaddress.mailingstate, 
-						contactaddress.mailingzip, contactaddress.othercity,
-						contactaddress.otherstreet, contactaddress.othercountry,
-						contactaddress.otherstate, contactaddress.otherzip   
-						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 
-						where users.user_name='" .$user_name ."' and crmentity.deleted=0";
+	$query = "select vtiger_contactdetails.department department, vtiger_contactdetails.phone, 
+					vtiger_contactdetails.fax, vtiger_contactsubdetails.assistant assistant_name,
+					vtiger_contactsubdetails.assistantphone,  
+					vtiger_contactsubdetails.otherphone, vtiger_contactsubdetails.homephone,
+					vtiger_contactsubdetails.birthday birthdate, vtiger_contactdetails.lastname last_name,
+					vtiger_contactdetails.firstname first_name,vtiger_contactdetails.contactid as id, 
+					vtiger_contactdetails.salutation, vtiger_contactdetails.email,
+					vtiger_contactdetails.title,vtiger_contactdetails.mobile,
+					vtiger_account.accountname as vtiger_account_name,vtiger_account.accountid as vtiger_account_id, 
+					vtiger_contactaddress.mailingcity, vtiger_contactaddress.mailingstreet, 
+					vtiger_contactaddress.mailingcountry, vtiger_contactaddress.mailingstate, 
+					vtiger_contactaddress.mailingzip, vtiger_contactaddress.othercity,
+					vtiger_contactaddress.otherstreet, vtiger_contactaddress.othercountry,
+					vtiger_contactaddress.otherstate, vtiger_contactaddress.otherzip   
+						from vtiger_contactdetails 
+						inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_contactdetails.contactid 
+						inner join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid 
+						left join vtiger_account on vtiger_account.accountid=vtiger_contactdetails.accountid 
+						left join vtiger_contactaddress on vtiger_contactaddress.contactaddressid=vtiger_contactdetails.contactid 
+						left join vtiger_contactsubdetails on vtiger_contactsubdetails.contactsubscriptionid = vtiger_contactdetails.contactid 
+						where vtiger_users.user_name='" .$user_name ."' and vtiger_crmentity.deleted=0";
 						
 	$log->debug("Exiting get_contactsforol method ...");
 	return $query;

Modified: vtigercrm/trunk/modules/Contacts/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/EditView.php (original)
+++ vtigercrm/trunk/modules/Contacts/EditView.php Mon Jun 12 14:26:25 2006
@@ -105,7 +105,7 @@
 
 $smarty->assign("OP_MODE",$disp_view);
 
-//needed when creating a new contact with a default account value passed in
+//needed when creating a new contact with a default vtiger_account value passed in
 if (isset($_REQUEST['account_name']) && is_null($focus->account_name)) {
 	$focus->account_name = $_REQUEST['account_name'];
 	
@@ -147,7 +147,7 @@
 if(isset($_REQUEST['activity_mode']) && $_REQUEST['activity_mode'] !='')
         $smarty->assign("ACTIVITYMODE",$_REQUEST['activity_mode']);
 
-// Unimplemented until jscalendar language files are fixed
+// Unimplemented until jscalendar language vtiger_files are fixed
 $smarty->assign("CALENDAR_LANG", $app_strings['LBL_JSCALENDAR_LANG']);
 $smarty->assign("CALENDAR_DATEFORMAT", parse_calendardate($app_strings['NTC_DATE_FORMAT']));
 

Modified: vtigercrm/trunk/modules/Contacts/Forms.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/Forms.php (original)
+++ vtigercrm/trunk/modules/Contacts/Forms.php Mon Jun 12 14:26:25 2006
@@ -15,7 +15,7 @@
 /*********************************************************************************
  * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Contacts/Forms.php,v 1.7 2005/03/04 15:18:47 jack Exp $
  * Description:  Contains a variety of utility functions used to display UI
- * components such as form headers and footers.  Intended to be modified on a per
+ * components such as form vtiger_headers and footers.  Intended to be modified on a per
  * theme basis.
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
  * All Rights Reserved.
@@ -79,7 +79,7 @@
 }
 
 /**
- * Create HTML form to enter a new record with the minimum necessary fields.
+ * Create HTML form to enter a new record with the minimum necessary vtiger_fields.
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
  * All Rights Reserved.
  * Contributor(s): ______________________________________..
@@ -107,7 +107,7 @@
 $qcreate_form = get_left_form_header($mod_strings['LBL_NEW_FORM_TITLE']);
 
 
-$qcreate_get_field="select * from field where tabid=4 and quickcreate=0 order by quickcreatesequence";
+$qcreate_get_field="select * from vtiger_field where vtiger_tabid=4 and quickcreate=0 order by quickcreatesequence";
 $qcreate_get_result=$adb->query($qcreate_get_field);
 $qcreate_get_noofrows=$adb->num_rows($qcreate_get_result);
 
@@ -196,9 +196,9 @@
 $qcreate_form.='</form>';
 $qcreate_form.='<script type="text/javascript">
 		
-	var fieldname = new Array('.$fieldName.')
-	var fieldlabel = new Array('.$fieldLabel.')
-	var fielddatatype = new Array('.$fldDataType.')
+	var vtiger_fieldname = new Array('.$fieldName.')
+	var vtiger_fieldlabel = new Array('.$fieldLabel.')
+	var vtiger_fielddatatype = new Array('.$fldDataType.')
 
 		</script>';
 

Modified: vtigercrm/trunk/modules/Contacts/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/ListView.php (original)
+++ vtigercrm/trunk/modules/Contacts/ListView.php Mon Jun 12 14:26:25 2006
@@ -79,7 +79,7 @@
 	$smarty->assign("SEARCH_URL",$url_string);
 				
 //Added for Custom Field Search
-/*$sql="select * from field where tablename='contactscf' order by fieldlabel";
+/*$sql="select * from vtiger_field where vtiger_tablename='contactscf' order by vtiger_fieldlabel";
 $result=$adb->query($sql);
 for($i=0;$i<$adb->num_rows($result);$i++)
 {
@@ -91,11 +91,11 @@
         if(isset($customfield[$i]) && $customfield[$i] != '')
         {
 		if($uitype[$i] == 56)
-			$str = " contactscf.".$column[$i]." = 1";
+			$str = " vtiger_contactscf.".$column[$i]." = 1";
 		elseif($uitype[$i] == 15)//Added to handle the picklist customfield - after 4.2 patch2 
-			$str = " contactscf.".$column[$i]." = '".$customfield[$i]."'";
+			$str = " vtiger_contactscf.".$column[$i]." = '".$customfield[$i]."'";
 		else
-	        	$str = " contactscf.".$column[$i]." like '$customfield[$i]%'";
+	        	$str = " vtiger_contactscf.".$column[$i]." like '$customfield[$i]%'";
                 array_push($where_clauses, $str);
 		$url_string .="&".$column[$i]."=".$customfield[$i];
         }

Modified: vtigercrm/trunk/modules/Contacts/Merge.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/Merge.php (original)
+++ vtigercrm/trunk/modules/Contacts/Merge.php Mon Jun 12 14:26:25 2006
@@ -42,7 +42,7 @@
 }
 //get the particular file from db and store it in the local hard disk.
 //store the path to the location where the file is stored and pass it  as parameter to the method 
-$sql = "select filename,data,filesize from wordtemplates where templateid=".$templateid;
+$sql = "select filename,data,filesize from vtiger_wordtemplates where templateid=".$templateid;
 
 $result = $adb->query($sql);
 $temparray = $adb->fetch_array($result);
@@ -77,7 +77,7 @@
 }
 
 //<<<<<<<<<<<<<<<<header for csv and select columns for query>>>>>>>>>>>>>>>>>>>>>>>>
-$query1="select tab.name,field.tablename,field.columnname,field.fieldlabel from field inner join tab on tab.tabid = field.tabid where field.tabid in (4,6) and field.block <> 6 and field.block <> 75 order by field.tablename";
+$query1="select vtiger_tab.name,vtiger_field.tablename,vtiger_field.columnname,vtiger_field.fieldlabel from vtiger_field inner join vtiger_tab on vtiger_tab.tabid = vtiger_field.tabid where vtiger_field.tabid in (4,6) and vtiger_field.block <> 6 and vtiger_field.block <> 75 order by vtiger_field.tablename";
 
 $result = $adb->query($query1);
 $y=$adb->num_rows($result);
@@ -104,7 +104,7 @@
     }
 		if($modulename == "Contacts")
     {
-    	$querycolumns[$x]="concat(users.last_name,' ',users.first_name) as usercname,users.first_name,users.last_name,users.user_name,users.yahoo_id,users.title,users.phone_work,users.department,users.phone_mobile,users.phone_other,users.phone_fax,users.email1,users.phone_home,users.email2,users.address_street,users.address_city,users.address_state,users.address_postalcode,users.address_country";
+    	$querycolumns[$x]="concat(vtiger_users.last_name,' ',vtiger_users.first_name) as usercname,vtiger_users.first_name,vtiger_users.last_name,vtiger_users.user_name,vtiger_users.yahoo_id,vtiger_users.title,vtiger_users.phone_work,vtiger_users.department,vtiger_users.phone_mobile,vtiger_users.phone_other,vtiger_users.phone_fax,vtiger_users.email1,vtiger_users.phone_home,vtiger_users.email2,vtiger_users.address_street,vtiger_users.address_city,vtiger_users.address_state,vtiger_users.address_postalcode,vtiger_users.address_country";
     }
   }
 	if($columnname == "parentid")
@@ -146,22 +146,22 @@
 	$selectcolumns = implode($querycolumns,",");
 	
 
-$query = "select ".$selectcolumns." from contactdetails
-				inner join crmentity on crmentity.crmid = contactdetails.contactid 
-				inner join contactaddress on contactdetails.contactid = contactaddress.contactaddressid 
-				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
-				left join account as accountContacts on accountContacts.accountid = contactdetails.accountid 
-				left join users on users.id = crmentity.smownerid
-				left join account on account.accountid = contactdetails.accountid
-				left join crmentity as crmentityAccounts on crmentityAccounts.crmid=account.accountid
-				left join accountbillads on account.accountid=accountbillads.accountaddressid
-				left join accountshipads on account.accountid=accountshipads.accountaddressid
-				left join accountscf on account.accountid = accountscf.accountid
-				left join account as accountAccounts on accountAccounts.accountid = account.parentid
-				left join users as usersAccounts on usersAccounts.id = crmentityAccounts.smownerid 
-				where crmentity.deleted=0 and (crmentityAccounts.deleted <> 1) and contactdetails.contactid in(".$mass_merge.")";
+$query = "select ".$selectcolumns." from vtiger_contactdetails
+				inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid 
+				inner join vtiger_contactaddress on vtiger_contactdetails.contactid = vtiger_contactaddress.contactaddressid 
+				inner join vtiger_contactsubdetails on vtiger_contactdetails.contactid = vtiger_contactsubdetails.contactsubscriptionid 
+				inner join vtiger_contactscf on vtiger_contactdetails.contactid = vtiger_contactscf.contactid 
+				left join vtiger_contactdetails as vtiger_contactdetailsContacts on vtiger_contactdetailsContacts.contactid = vtiger_contactdetails.reportsto
+				left join vtiger_account as vtiger_accountContacts on vtiger_accountContacts.accountid = vtiger_contactdetails.accountid 
+				left join vtiger_users on vtiger_users.id = vtiger_crmentity.smownerid
+				left join vtiger_account on vtiger_account.accountid = vtiger_contactdetails.accountid
+				left join vtiger_crmentity as vtiger_crmentityAccounts on vtiger_crmentityAccounts.crmid=vtiger_account.accountid
+				left join vtiger_accountbillads on vtiger_account.accountid=vtiger_accountbillads.accountaddressid
+				left join vtiger_accountshipads on vtiger_account.accountid=vtiger_accountshipads.accountaddressid
+				left join vtiger_accountscf on vtiger_account.accountid = vtiger_accountscf.accountid
+				left join vtiger_account as vtiger_accountAccounts on vtiger_accountAccounts.accountid = vtiger_account.parentid
+				left join vtiger_users as vtiger_usersAccounts on vtiger_usersAccounts.id = vtiger_crmentityAccounts.smownerid 
+				where vtiger_crmentity.deleted=0 and (crmentityAccounts.deleted <> 1) and vtiger_contactdetails.contactid in(".$mass_merge.")";
 				
 
 $result = $adb->query($query);
@@ -197,7 +197,7 @@
 $csvdata = implode($mergevalue,"###");
 }else
 {
-	die("No fields to do Merge");
+	die("No vtiger_fields to do Merge");
 }	
 
 $handle = fopen($wordtemplatedownloadpath."datasrc.csv","wb");

Modified: vtigercrm/trunk/modules/Contacts/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/Save.php (original)
+++ vtigercrm/trunk/modules/Contacts/Save.php Mon Jun 12 14:26:25 2006
@@ -84,7 +84,7 @@
         {
                 if(isset($_REQUEST[$fieldname]))
                 {
-			$log->debug("Assigning the previous values given for the contact to respective fields ");
+			$log->debug("Assigning the previous values given for the contact to respective vtiger_fields ");
                         $field_values_passed.="&";
                         $value = $_REQUEST[$fieldname];
                         $focus->column_fields[$fieldname] = $value;
@@ -113,7 +113,7 @@
 if($saveimage=="true")
 {
         $focus->column_fields['imagename']=$image_name_val;
-        $log->debug("Assign the Image name to the field name ");
+        $log->debug("Assign the Image name to the vtiger_field name ");
 }
 //Saving the contact
 if($image_error=="false")
@@ -134,7 +134,7 @@
 	//BEGIN -- Code for Create Customer Portal Users password and Send Mail 
 	if($_REQUEST['portal'] == '' && $_REQUEST['mode'] == 'edit')
 	{
-		$sql = "update portalinfo set user_name='".$_REQUEST['email']."',isactive=0 where id=".$_REQUEST['record'];
+		$sql = "update vtiger_portalinfo set user_name='".$_REQUEST['email']."',isactive=0 where id=".$_REQUEST['record'];
 		$adb->query($sql);
 	}
 	elseif($_REQUEST['portal'] != '' && $_REQUEST['email'] != '')// && $_REQUEST['mode'] != 'edit')
@@ -145,7 +145,7 @@
 		if($_REQUEST['mode'] != 'edit')
 			$insert = 'true';
 
-		$sql = "select id,user_name,user_password,isactive from portalinfo";
+		$sql = "select id,user_name,user_password,isactive from vtiger_portalinfo";
 		$result = $adb->query($sql);
 
 		for($i=0;$i<$adb->num_rows($result);$i++)
@@ -159,7 +159,7 @@
 					$flag = 'true';
 				else
 				{
-					$sql = "update portalinfo set user_name='".$username."', isactive=1 where id=".$id;
+					$sql = "update vtiger_portalinfo set user_name='".$username."', isactive=1 where id=".$id;
 					$adb->query($sql);
 					$update = 'true';
 					$flag = 'true';
@@ -175,7 +175,7 @@
 		if($insert == 'true')
 		{
 			$password = makeRandomPassword();
-			$sql = "insert into portalinfo (id,user_name,user_password,type,isactive) values(".$focus->id.",'".$username."','".$password."','C',1)";
+			$sql = "insert into vtiger_portalinfo (id,user_name,user_password,type,isactive) values(".$focus->id.",'".$username."','".$password."','C',1)";
 			$adb->query($sql);
 		}
 

Modified: vtigercrm/trunk/modules/Contacts/chat.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/chat.php (original)
+++ vtigercrm/trunk/modules/Contacts/chat.php Mon Jun 12 14:26:25 2006
@@ -32,7 +32,7 @@
  * Constants for the chat
  */
 $chat_conf = array();
-$chat_conf['alive_time'] = "30"; // time users should report to be online, in seconds.
+$chat_conf['alive_time'] = "30"; // time vtiger_users should vtiger_report to be online, in seconds.
 $chat_conf['msg_limit'] = "10"; // maximum msg's to send in one request.
 
 /*************************************************************/
@@ -68,7 +68,7 @@
     // las message id received by user
     if(!isset($_SESSION["mlid"]))
       {
-	$res = $adb->query("SELECT max(id) AS id FROM chat_msg");
+	$res = $adb->query("SELECT max(id) AS id FROM vtiger_chat_msg");
 	$line = $adb->fetch_array($res);
 	if(intval($line['id']) == 0)
 	  $_SESSION["mlid"] = 0;
@@ -89,7 +89,7 @@
       }
     else
       {
-	      $res = $adb->query("UPDATE chat_users SET ping = ".$adb->database->sysTimeStamp." WHERE session = '".session_id()."'");
+	      $res = $adb->query("UPDATE vtiger_chat_users SET ping = ".$adb->database->sysTimeStamp." WHERE session = '".session_id()."'");
 	if($adb->getAffectedRowCount($res) == 0)
 	  {
 	    $this->setUserNick();
@@ -164,7 +164,7 @@
   {
 	global $current_user;	
 	global $adb;
-    $res = $adb->query("SELECT id FROM chat_users WHERE session = '".session_id()."'");
+    $res = $adb->query("SELECT id FROM vtiger_chat_users WHERE session = '".session_id()."'");
     if($adb->num_rows($res) > 0)
       {
 	$line = $adb->fetch_array($res);
@@ -174,7 +174,7 @@
     
     $_SESSION['chat_user'] = $adb->getUniqueID('chat_users');
     
-    $res = $adb->query("INSERT INTO chat_users (id, nick, session, ping, ip)
+    $res = $adb->query("INSERT INTO vtiger_chat_users (id, nick, session, ping, ip)
    			 VALUES ('".$_SESSION['chat_user']."',
 			 	'".$current_user->user_name."',
 				 '".session_id()."',
@@ -186,7 +186,7 @@
   }
   
   /**
-   * generate the available users list
+   * generate the available vtiger_users list
    */
   function getUserList()
   {
@@ -194,9 +194,9 @@
     global $chat_conf;
     $tmp = '';
     $delete_from = time() - $chat_conf['alive_time'];
-    $res = $adb->query("DELETE FROM chat_users
+    $res = $adb->query("DELETE FROM vtiger_chat_users
     			WHERE ping > ".$adb->formatDate($delete_from));
-    $res = $adb->query("SELECT id, nick FROM chat_users");
+    $res = $adb->query("SELECT id, nick FROM vtiger_chat_users");
     if($adb->num_rows($res)==0)
       {
 	$this->json = '';
@@ -232,10 +232,10 @@
     $res = $adb->limitQuery("SELECT ms.id AS mid, ms.chat_from AS mfrom,
    				 ms.chat_to AS mto,pv.id AS id,
 				 us.nick AS nfrom, ms.msg AS msg
-			FROM chat_users us
-			INNER JOIN chat_msg ms
+			FROM vtiger_chat_users us
+			INNER JOIN vtiger_chat_msg ms
 				ON us.id = ms.chat_from
-			INNER JOIN chat_pvchat pv
+			INNER JOIN vtiger_chat_pvchat pv
 				ON pv.msg = ms.id
 			WHERE ms.id > '".($_SESSION['mlid'])."'
 			AND (ms.chat_from = '".$_SESSION['chat_user']."'
@@ -277,10 +277,10 @@
     $res = $adb->limitQuery("SELECT ms.id AS mid, ms.chat_from AS mfrom,
     				ms.chat_to AS mto, p.id AS id,
 				us.nick AS nfrom, ms.msg AS msg
-			FROM chat_users us
-			INNER JOIN chat_msg ms
+			FROM vtiger_chat_users us
+			INNER JOIN vtiger_chat_msg ms
 				ON us.id = ms.chat_from
-			INNER JOIN chat_pchat p
+			INNER JOIN vtiger_chat_pchat p
 				ON p.msg = ms.id
 			WHERE ms.id > '".($_SESSION['mlid'])."'
 			AND ms.chat_to = 0
@@ -319,10 +319,10 @@
 	    if(isset($words[1]) && strlen($words[1]) > 3)
 	      {
 		$res = $adb->query("SELECT nick
-				FROM chat_users
+				FROM vtiger_chat_users
 				WHERE id= '".$_SESSION['chat_user']."'");
 		$line = $adb->fetch_array($res);
-		$res = $adb->query("UPDATE chat_users
+		$res = $adb->query("UPDATE vtiger_chat_users
 				SET nick = ".$adb->quote($words[1])."
 				WHERE id = '".$_SESSION['chat_user']."'");
 		$msg = '\sys <span class="sysb">'.$line['nick'].'</span> changed nick to <span class="sysb">'.$words[1].'</span>';
@@ -347,7 +347,7 @@
     if(strlen($msg) == 0) return;
     
     $id = $adb->getUniqueID('chat_msg');
-    $res = $adb->query("INSERT INTO chat_msg (id, chat_from, chat_to, born, msg)
+    $res = $adb->query("INSERT INTO vtiger_chat_msg (id, chat_from, chat_to, born, msg)
     			VALUES (".$id.", '".$_SESSION['chat_user']."', '".$to."', ".$adb->database->sysTimeStamp.", '".$msg."')");
     
     $chat = "p";
@@ -363,7 +363,7 @@
   function pvClose($to)
   {
 	global $adb;
-    $res = $adb->query("DELETE FROM chat_msg
+    $res = $adb->query("DELETE FROM vtiger_chat_msg
    			 WHERE (chat_from = '".$to."'
 				 AND chat_to = '".$_SESSION['chat_user']."')
 			 OR (chat_from = '".$_SESSION['chat_user']."'

Modified: vtigercrm/trunk/modules/Contacts/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Contacts/language/en_us.lang.php Mon Jun 12 14:26:25 2006
@@ -52,8 +52,8 @@
 	
 'LBL_EXISTING_CONTACT' => 'Used an existing contact',
 'LBL_CREATED_CONTACT' => 'Created a new contact',
-'LBL_EXISTING_ACCOUNT' => 'Used an existing account',
-'LBL_CREATED_ACCOUNT' => 'Created a new account',
+'LBL_EXISTING_ACCOUNT' => 'Used an existing vtiger_account',
+'LBL_CREATED_ACCOUNT' => 'Created a new vtiger_account',
 'LBL_CREATED_CALL' => 'Created a new call',
 'LBL_CREATED_MEETING' => 'Created a new meeting',
 'LBL_ADDMORE_BUSINESSCARD' =>'Add another business card',
@@ -102,13 +102,13 @@
 'LBL_CONTACT_ROLE'=>'Role:',
 'LBL_OPP_NAME'=>'Opportunity Name:',
 'LBL_DUPLICATE'=>'Potential Duplicate Contacts',
-'MSG_DUPLICATE' => 'Creating this contact may potentialy create a duplicate contact. You may either select a contact from the list below or you may click on Create New Contact to continue creating a new contact with the previously entered data.',
+'MSG_DUPLICATE' => 'Creating this contact may vtiger_potentialy create a duplicate contact. You may either select a contact from the list below or you may click on Create New Contact to continue creating a new contact with the previously entered data.',
 
 'LNK_NEW_APPOINTMENT' => 'New Appointment',
 'LBL_ADD_BUSINESSCARD' => 'Add Business Card',
 'NTC_DELETE_CONFIRMATION'=>'Are you sure you want to delete this record?',
 'NTC_REMOVE_CONFIRMATION'=>'Are you sure you want to remove this contact from this case?',
-'NTC_REMOVE_DIRECT_REPORT_CONFIRMATION'=>'Are you sure you want to remove this record as a direct report?',
+'NTC_REMOVE_DIRECT_REPORT_CONFIRMATION'=>'Are you sure you want to remove this record as a direct vtiger_report?',
 'ERR_DELETE_RECORD'=>"en_us A record number must be specified to delete the contact.",
 'NTC_COPY_PRIMARY_ADDRESS'=>'Copy primary address to alternate address',
 'NTC_COPY_ALTERNATE_ADDRESS'=>'Copy alternate address to primary address',
@@ -176,7 +176,7 @@
 'Contact Image'=>'Contact Image',
 'Description'=>'Description',
 
-// Added fields for Add Business Card
+// Added vtiger_fields for Add Business Card
 'LBL_NEW_CONTACT'=>'New Contact',
 'LBL_NEW_ACCOUNT'=>'New Account',
 'LBL_NOTE_SUBJECT'=>'Note Subject:',
@@ -187,7 +187,7 @@
 'LBL_START_DATE'=>'Start Date:',
 'LBL_START_TIME'=>'Start Time:',
 
-//Added field after 4_0_1
+//Added vtiger_field after 4_0_1
 'Portal User'=>'Portal User',
 'LBL_CUSTOMER_PORTAL_INFORMATION'=>'Customer Portal Information',
 'Support Start Date'=>'Support Start Date',
@@ -195,7 +195,7 @@
 //Added for 4.2 Release -- CustomView
 'Name'=>'Name',
 'LBL_ALL'=>'All',
-'LBL_MAXIMUM_LIMIT_ERROR'=>'Sorry, the uploaded file exceeds the maximum filesize limit. Please try a file smaller than 800000 bytes',
+'LBL_MAXIMUM_LIMIT_ERROR'=>'Sorry, the uploaded file exceeds the maximum vtiger_filesize limit. Please try a file smaller than 800000 bytes',
 'LBL_UPLOAD_ERROR'=>'Problems in file upload. Please try again!',
 'LBL_IMAGE_ERROR'=>'The given file is not of type image(.gif/.jpg/.png)',
 'LBL_INVALID_IMAGE'=>'Invalid file OR File has no data',

Modified: vtigercrm/trunk/modules/CustomView/CustomView.php
==============================================================================
--- vtigercrm/trunk/modules/CustomView/CustomView.php (original)
+++ vtigercrm/trunk/modules/CustomView/CustomView.php Mon Jun 12 14:26:25 2006
@@ -94,7 +94,7 @@
 				$viewid = $this->setdefaultviewid;
 			}else
 			{
-				$query="select cvid from customview where viewname='All' and entitytype='".$module."'";
+				$query="select cvid from vtiger_customview where viewname='All' and entitytype='".$module."'";
 				$cvresult=$adb->query($query);
 				$viewid = $adb->query_result($cvresult,0,'cvid');;
 			}
@@ -133,14 +133,14 @@
 		return $groupid;
 	}
 
-	// to get the available customviews for a module
+	// to get the available vtiger_customviews for a module
 	// return type array
 	function getCustomViewByCvid($cvid)
 	{
 		global $adb;
 		$tabid = getTabid($this->customviewmodule);
-		$ssql = "select customview.* from customview inner join tab on tab.name = customview.entitytype";
-		$ssql .= " where customview.cvid=".$cvid;		
+		$ssql = "select vtiger_customview.* from vtiger_customview inner join vtiger_tab on vtiger_tab.name = vtiger_customview.entitytype";
+		$ssql .= " where vtiger_customview.cvid=".$cvid;		
 
 		$result = $adb->query($ssql);
 
@@ -157,8 +157,8 @@
 		global $adb;
 		global $app_strings;
 		$tabid = getTabid($this->customviewmodule);
-		$ssql = "select customview.* from customview inner join tab on tab.name = customview.entitytype";
-		$ssql .= " where tab.tabid=".$tabid;
+		$ssql = "select vtiger_customview.* from vtiger_customview inner join vtiger_tab on vtiger_tab.name = vtiger_customview.entitytype";
+		$ssql .= " where vtiger_tab.tabid=".$tabid;
 		$result = $adb->query($ssql);
 		while($cvrow=$adb->fetch_array($result))
 		{
@@ -188,18 +188,18 @@
 
 		if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0)
 		{
-			$sql = "select * from field ";
-			$sql.= " where field.tabid=".$tabid." and field.block in (".$block.") and";
-			$sql.= " field.displaytype in (1,2)";
+			$sql = "select * from vtiger_field ";
+			$sql.= " where vtiger_field.tabid=".$tabid." and vtiger_field.block in (".$block.") and";
+			$sql.= " vtiger_field.displaytype in (1,2)";
 			$sql.= " order by sequence";
 		}
 		else
 		{
 			$profileList = getCurrentUserProfileList();
-			$sql = "select * from field inner join profile2field on profile2field.fieldid=field.fieldid inner join def_org_field on def_org_field.fieldid=field.fieldid ";
-			$sql.= " where field.tabid=".$tabid." and field.block in (".$block.") and";
-			$sql.= " field.displaytype in (1,2) and profile2field.visible=0";
-			$sql.= " and def_org_field.visible=0  and profile2field.profileid in ".$profileList." order by sequence";
+			$sql = "select * from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid ";
+			$sql.= " where vtiger_field.tabid=".$tabid." and vtiger_field.block in (".$block.") and";
+			$sql.= " vtiger_field.displaytype in (1,2) and vtiger_profile2field.visible=0";
+			$sql.= " and vtiger_def_org_field.visible=0  and vtiger_profile2field.profileid in ".$profileList." order by sequence";
 		}	
 
 
@@ -211,7 +211,7 @@
 		{
 			$module_columnlist['crmentity:crmid::HelpDesk_Ticket ID:I'] = 'Ticket ID';
 		}
-		//Added to include activity type in activity customview list
+		//Added to include vtiger_activity type in vtiger_activity vtiger_customview list
 		if($module == 'Activities' && $block == 19)
 		{
 			$module_columnlist['activity:activitytype:activitytype:Activities_Activity Type:C'] = 'Activity Type';
@@ -266,9 +266,9 @@
 	{
 		global $adb;
 		
-		$sSQL = "select cvcolumnlist.* from cvcolumnlist";
-		$sSQL .= " inner join customview on customview.cvid = cvcolumnlist.cvid";
-		$sSQL .= " where customview.cvid =".$cvid." order by cvcolumnlist.columnindex";
+		$sSQL = "select vtiger_cvcolumnlist.* from vtiger_cvcolumnlist";
+		$sSQL .= " inner join vtiger_customview on vtiger_customview.cvid = vtiger_cvcolumnlist.cvid";
+		$sSQL .= " where vtiger_customview.cvid =".$cvid." order by vtiger_cvcolumnlist.columnindex";
 		$result = $adb->query($sSQL);
 		
 		while($columnrow = $adb->fetch_array($result))
@@ -297,18 +297,18 @@
 
 		if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0)
 		{
-			$sql = "select * from field inner join tab on tab.tabid = field.tabid ";
-			$sql.= " where field.tabid=".$tabid." and field.block in (".$blockids.")
-                        and (field.uitype =5 or field.displaytype=2) ";
-			$sql.= " order by field.sequence";
+			$sql = "select * from vtiger_field inner join vtiger_tab on vtiger_tab.tabid = vtiger_field.tabid ";
+			$sql.= " where vtiger_field.tabid=".$tabid." and vtiger_field.block in (".$blockids.")
+                        and (vtiger_field.uitype =5 or vtiger_field.displaytype=2) ";
+			$sql.= " order by vtiger_field.sequence";
 		}
 		else
 		{
 			$profileList = getCurrentUserProfileList();
-			$sql = "select * from field inner join tab on tab.tabid = field.tabid inner join  profile2field on profile2field.fieldid=field.fieldid inner join def_org_field on def_org_field.fieldid=field.fieldid ";
-			$sql.= " where field.tabid=".$tabid." and field.block in (".$blockids.") and (field.uitype =5 or field.displaytype=2)";
-			$sql.= " and profile2field.visible=0";
-			$sql.= " and def_org_field.visible=0  and profile2field.profileid in ".$profileList." order by field.sequence";
+			$sql = "select * from vtiger_field inner join vtiger_tab on vtiger_tab.tabid = vtiger_field.tabid inner join  vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid ";
+			$sql.= " where vtiger_field.tabid=".$tabid." and vtiger_field.block in (".$blockids.") and (vtiger_field.uitype =5 or vtiger_field.displaytype=2)";
+			$sql.= " and vtiger_profile2field.visible=0";
+			$sql.= " and vtiger_def_org_field.visible=0  and vtiger_profile2field.profileid in ".$profileList." order by vtiger_field.sequence";
 		}			
 
 
@@ -609,8 +609,8 @@
 	{
 		global $adb;
 
-		$sSQL = "select cvstdfilter.* from cvstdfilter inner join customview on customview.cvid = cvstdfilter.cvid";
-		$sSQL .= " where cvstdfilter.cvid=".$cvid;
+		$sSQL = "select vtiger_cvstdfilter.* from vtiger_cvstdfilter inner join vtiger_customview on vtiger_customview.cvid = vtiger_cvstdfilter.cvid";
+		$sSQL .= " where vtiger_cvstdfilter.cvid=".$cvid;
 
 		$result = $adb->query($sSQL);
 		$stdfilterrow = $adb->fetch_array($result);
@@ -644,8 +644,8 @@
 		global $adb;
 		global $modules;
 
-		$sSQL = "select cvadvfilter.* from cvadvfilter inner join customview on cvadvfilter.cvid = customview.cvid";
-		$sSQL .= " where cvadvfilter.cvid=".$cvid;
+		$sSQL = "select vtiger_cvadvfilter.* from vtiger_cvadvfilter inner join vtiger_customview on vtiger_cvadvfilter.cvid = vtiger_customview.cvid";
+		$sSQL .= " where vtiger_cvadvfilter.cvid=".$cvid;
 		$result = $adb->query($sSQL);
 
 		while($advfilterrow = $adb->fetch_array($result))
@@ -678,7 +678,7 @@
 					{
 						if($list[1] == "status")
 						{
-							$sqllist_column = "case when (activity.status not like '') then activity.status else activity.eventstatus end as activitystatus";
+							$sqllist_column = "case when (vtiger_activity.status not like '') then vtiger_activity.status else vtiger_activity.eventstatus end as vtiger_activitystatus";
 						}
 					}
 					$sqllist[] = $sqllist_column;
@@ -756,10 +756,10 @@
 							$advfiltersql[] = " (".$advorsqls.") ";
 						}else
 						{
-							//Added for getting activity Status -Jaguar
+							//Added for getting vtiger_activity Status -Jaguar
 							if($this->customviewmodule == "Activities" && $columns[1] == "status")
 							{
-								$advfiltersql[] = "case when (activity.status not like '') then activity.status else activity.eventstatus end".$this->getAdvComparator($advfltrow["comparator"],trim($advfltrow["value"]));
+								$advfiltersql[] = "case when (vtiger_activity.status not like '') then vtiger_activity.status else vtiger_activity.eventstatus end".$this->getAdvComparator($advfltrow["comparator"],trim($advfltrow["value"]));
 							}
 							else
 							{
@@ -833,7 +833,7 @@
                 global $log;
                 $log->info("in getSalesEntityId ".$setype);
 		global $adb;
-		$sql = "select crmid from crmentity where setype='".$setype."' and deleted = 0";
+		$sql = "select crmid from vtiger_crmentity where setype='".$setype."' and deleted = 0";
 		$result = $adb->query($sql);
 		while($row = $adb->fetch_array($result))
 		{
@@ -856,7 +856,7 @@
 		global $adb;
 		if($so_name != '')
 		{
-			$sql = "select salesorderid from salesorder where subject='".$so_name."'";
+			$sql = "select vtiger_salesorderid from vtiger_salesorder where subject='".$so_name."'";
 			$result = $adb->query($sql);
 			$so_id = $adb->query_result($result,0,"salesorderid");
 		}
@@ -870,7 +870,7 @@
 		global $adb;
 		if($product_name != '')
 		{
-			$sql = "select productid from products where productname='".$product_name."'";
+			$sql = "select productid from vtiger_products where productname='".$product_name."'";
 			$result = $adb->query($sql);
 			$productid = $adb->query_result($result,0,"productid");
 		}
@@ -884,7 +884,7 @@
 		global $adb;
 		if($quote_name != '')
 		{
-			$sql = "select quoteid from quotes where subject='".$quote_name."'";
+			$sql = "select quoteid from vtiger_quotes where subject='".$quote_name."'";
 			$result = $adb->query($sql);
 			$quote_id = $adb->query_result($result,0,"quoteid");
 		}
@@ -898,7 +898,7 @@
 		global $adb;
 		if($pot_name != '')
 		{
-			$sql = "select potentialid from potential where potentialname='".$pot_name."'";
+			$sql = "select vtiger_potentialid from vtiger_potential where vtiger_potentialname='".$pot_name."'";
 			$result = $adb->query($sql);
 			$potentialid = $adb->query_result($result,0,"potentialid");
 		}
@@ -911,7 +911,7 @@
 		global $adb;
 		if($vendor_name != '')
 		{
-			$sql = "select vendorid from vendor where vendorname='".$vendor_name."'";
+			$sql = "select vtiger_vendorid from vtiger_vendor where vtiger_vendorname='".$vendor_name."'";
 			$result = $adb->query($sql);
 			$vendor_id = $adb->query_result($result,0,"vendorid");
 		}
@@ -925,7 +925,7 @@
 		global $adb;
 		if($contact_name != '')
 		{
-			$sql = "select contactid from contactdetails where lastname='".$contact_name."'";
+			$sql = "select contactid from vtiger_contactdetails where lastname='".$contact_name."'";
 			$result = $adb->query($sql);
 			$contact_id = $adb->query_result($result,0,"contactid");
 		}
@@ -939,7 +939,7 @@
 		global $adb;
 		if($account_name != '')
 		{
-			$sql = "select accountid from account where accountname='".$account_name."'";
+			$sql = "select vtiger_accountid from vtiger_account where vtiger_accountname='".$account_name."'";
 			$result = $adb->query($sql);
 			$accountid = $adb->query_result($result,0,"accountid");
 		}		
@@ -1235,26 +1235,26 @@
 			$listviewquery = substr($listquery, strpos($listquery,'FROM'),strlen($listquery));
 			if($module == "Activities" || $module == "Emails")
 			{
-				$query = "select groups.groupname ,users.user_name,".$this->getCvColumnListSQL($viewid)." ,crmentity.crmid,activity.* ".$listviewquery;
+				$query = "select vtiger_groups.groupname ,vtiger_users.user_name,".$this->getCvColumnListSQL($viewid)." ,vtiger_crmentity.crmid,vtiger_activity.* ".$listviewquery;
 			}else if($module == "Notes")
 			{
-				$query = "select ".$this->getCvColumnListSQL($viewid)." ,crmentity.crmid,notes.* ".$listviewquery;
+				$query = "select ".$this->getCvColumnListSQL($viewid)." ,vtiger_crmentity.crmid,vtiger_notes.* ".$listviewquery;
 			}
 			else if($module == "Products")
 			{
-				$query = "select ".$this->getCvColumnListSQL($viewid)." ,crmentity.crmid,products.* ".$listviewquery;
+				$query = "select ".$this->getCvColumnListSQL($viewid)." ,vtiger_crmentity.crmid,vtiger_products.* ".$listviewquery;
 			}
 			else if($module == "Vendors")
 			{
-				$query = "select ".$this->getCvColumnListSQL($viewid)." ,crmentity.crmid ".$listviewquery;
+				$query = "select ".$this->getCvColumnListSQL($viewid)." ,vtiger_crmentity.crmid ".$listviewquery;
 			}
 			else if($module == "PriceBooks")
 			{
-				$query = "select ".$this->getCvColumnListSQL($viewid)." ,crmentity.crmid ".$listviewquery;
+				$query = "select ".$this->getCvColumnListSQL($viewid)." ,vtiger_crmentity.crmid ".$listviewquery;
 			}
 			else
 			{
-				$query = "select groups.groupname ,users.user_name,".$this->getCvColumnListSQL($viewid)." ,crmentity.crmid ".$listviewquery;
+				$query = "select vtiger_groups.groupname ,vtiger_users.user_name,".$this->getCvColumnListSQL($viewid)." ,vtiger_crmentity.crmid ".$listviewquery;
 			}
 			$stdfiltersql = $this->getCVStdFilterSQL($viewid);
 			$advfiltersql = $this->getCVAdvFilterSQL($viewid);
@@ -1299,8 +1299,8 @@
 	{
 		global $adb;
 
-		$sSQL = "select customaction.* from customaction inner join customview on customaction.cvid = customview.cvid";
-		$sSQL .= " where customaction.cvid=".$cvid;
+		$sSQL = "select vtiger_customaction.* from vtiger_customaction inner join vtiger_customview on vtiger_customaction.cvid = vtiger_customview.cvid";
+		$sSQL .= " where vtiger_customaction.cvid=".$cvid;
 		$result = $adb->query($sSQL);
 
 		while($carow = $adb->fetch_array($result))

Modified: vtigercrm/trunk/modules/CustomView/Delete.php
==============================================================================
--- vtigercrm/trunk/modules/CustomView/Delete.php (original)
+++ vtigercrm/trunk/modules/CustomView/Delete.php Mon Jun 12 14:26:25 2006
@@ -19,7 +19,7 @@
 
 if(isset($cvid) && $cvid != '')
 {
-	$deletesql = "delete from customview where cvid =".$cvid;
+	$deletesql = "delete from vtiger_customview where cvid =".$cvid;
 	$deleteresult = $adb->query($deletesql);
 	$_SESSION['lvs'][$module]["viewname"] = '';
 }

Modified: vtigercrm/trunk/modules/CustomView/Forms.php
==============================================================================
--- vtigercrm/trunk/modules/CustomView/Forms.php (original)
+++ vtigercrm/trunk/modules/CustomView/Forms.php Mon Jun 12 14:26:25 2006
@@ -50,7 +50,7 @@
 			}
 			if ( hash[ form.elements[i].value ] == 1)
 			{
-				// got same field more than once
+				// got same vtiger_field more than once
 				isError = true;
 			}
 			hash[form.elements[i].value] = 1;
@@ -69,7 +69,7 @@
 		return false;
 	}
 
-	for(var field_name in required)
+	for(var vtiger_field_name in required)
 	{
 		// contacts hack to bypass errors if full_name is set
 		if (field_name == 'last_name' && 
@@ -77,7 +77,7 @@
 		{
 			continue;
 		}
-		if ( hash[ field_name ] != 1 )
+		if ( hash[ vtiger_field_name ] != 1 )
 		{
 				isError = true;
 				errorMessage += "$err_required " + required[field_name];

Modified: vtigercrm/trunk/modules/CustomView/ListViewTop.php
==============================================================================
--- vtigercrm/trunk/modules/CustomView/ListViewTop.php (original)
+++ vtigercrm/trunk/modules/CustomView/ListViewTop.php Mon Jun 12 14:26:25 2006
@@ -92,8 +92,8 @@
 function getMetricList()
 {
 	global $adb;
-	$ssql = "select customview.* from customview inner join tab on tab.name = customview.entitytype";
-	$ssql .= " where customview.setmetrics = 1 order by customview.entitytype";
+	$ssql = "select vtiger_customview.* from vtiger_customview inner join vtiger_tab on vtiger_tab.name = vtiger_customview.entitytype";
+	$ssql .= " where vtiger_customview.setmetrics = 1 order by vtiger_customview.entitytype";
 	$result = $adb->query($ssql);
 	while($cvrow=$adb->fetch_array($result))
 	{

Modified: vtigercrm/trunk/modules/CustomView/PopulateCustomView.php
==============================================================================
--- vtigercrm/trunk/modules/CustomView/PopulateCustomView.php (original)
+++ vtigercrm/trunk/modules/CustomView/PopulateCustomView.php Mon Jun 12 14:26:25 2006
@@ -133,199 +133,199 @@
 		    );
 
 
-$cvcolumns = Array(Array('leaddetails:lastname:lastname:Leads_Last_Name:V',
-                         'leaddetails:firstname:firstname:Leads_First_Name:V',
-                         'leaddetails:company:company:Leads_Company:V',
-			 'leadaddress:phone:phone:Leads_Phone:V',
-                         'leadsubdetails:website:website:Leads_Website:V',
-                         'leaddetails:email:email:Leads_Email:E',
-			 'crmentity:smownerid:assigned_user_id:Leads_Assigned_To:V'),
-
-	           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: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:E'),
+$cvcolumns = Array(Array('vtiger_leaddetails:lastname:lastname:Leads_Last_Name:V',
+                         'vtiger_leaddetails:firstname:firstname:Leads_First_Name:V',
+                         'vtiger_leaddetails:company:company:Leads_Company:V',
+			 'vtiger_leadaddress:phone:phone:Leads_Phone:V',
+                         'vtiger_leadsubdetails:website:website:Leads_Website:V',
+                         'vtiger_leaddetails:email:email:Leads_Email:E',
+			 'vtiger_crmentity:smownerid:assigned_user_id:Leads_Assigned_To:V'),
+
+	           Array('vtiger_leaddetails:firstname:firstname:Leads_First_Name:V',
+                         'vtiger_leaddetails:lastname:lastname:Leads_Last_Name:V',
+                         'vtiger_leaddetails:company:company:Leads_Company:V',
+                         'vtiger_leaddetails:leadsource:leadsource:Leads_Lead_Source:V',
+                         'vtiger_leadsubdetails:website:website:Leads_Website:V',
+                         'vtiger_leaddetails:email:email:Leads_Email:E'),
+
+		   Array('vtiger_leaddetails:firstname:firstname:Leads_First_Name:V',
+                         'vtiger_leaddetails:lastname:lastname:Leads_Last_Name:V',
+                         'vtiger_leaddetails:company:company:Leads_Company:V',
+                         'vtiger_leaddetails:leadsource:leadsource:Leads_Lead_Source:V',
+                         'vtiger_leadsubdetails:website:website:Leads_Website:V',
+                         'vtiger_leaddetails:email:email:Leads_Email:E'),
 	
-		   Array('account:accountname:accountname:Accounts_Account_Name:V',
-                         'accountbillads:city:bill_city:Accounts_City:V',
-                         'account:website:website:Accounts_Website:V',
-                         'account:phone:phone:Accounts_Phone:V',
-                         'crmentity:smownerid:assigned_user_id:Accounts_Assigned_To:V'),
-
-		   Array('account:accountname:accountname:Accounts_Account_Name:V',
-			 'account:phone:phone:Accounts_Phone:V',
-			 'account:website:website:Accounts_Website:V',
-			 'account:rating:rating:Accounts_Rating:V',
-			 'crmentity:smownerid:assigned_user_id:Accounts_Assigned_To:V'),
-
-		   Array('account:accountname:accountname:Accounts_Account_Name:V',
-                         'account:phone:phone:Accounts_Phone:V',
-                         'account:website:website:Accounts_Website:V',
-                         'accountbillads:city:bill_city:Accounts_City:V',
-                         'crmentity:smownerid:assigned_user_id:Accounts_Assigned_To:V'),
-
-		   Array('contactdetails:firstname:firstname:Contacts_First_Name:V',
-                         '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: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',
-                         'contactdetails:lastname:lastname:Contacts_Last_Name:V',
-                         'contactaddress:mailingstreet:mailingstreet:Contacts_Mailing_Street:V',
-                         'contactaddress:mailingcity:mailingcity:Contacts_City:V',
-                         'contactaddress:mailingstate:mailingstate:Contacts_State:V',
-			 'contactaddress:mailingzip:mailingzip:Contacts_Zip:V',
-			 'contactaddress:mailingcountry:mailingcountry:Contacts_Country:V'),
+		   Array('vtiger_account:accountname:accountname:Accounts_Account_Name:V',
+                         'vtiger_accountbillads:city:bill_city:Accounts_City:V',
+                         'vtiger_account:website:website:Accounts_Website:V',
+                         'vtiger_account:phone:phone:Accounts_Phone:V',
+                         'vtiger_crmentity:smownerid:assigned_user_id:Accounts_Assigned_To:V'),
+
+		   Array('vtiger_account:accountname:accountname:Accounts_Account_Name:V',
+			 'vtiger_account:phone:phone:Accounts_Phone:V',
+			 'vtiger_account:website:website:Accounts_Website:V',
+			 'vtiger_account:rating:rating:Accounts_Rating:V',
+			 'vtiger_crmentity:smownerid:assigned_user_id:Accounts_Assigned_To:V'),
+
+		   Array('vtiger_account:accountname:accountname:Accounts_Account_Name:V',
+                         'vtiger_account:phone:phone:Accounts_Phone:V',
+                         'vtiger_account:website:website:Accounts_Website:V',
+                         'vtiger_accountbillads:city:bill_city:Accounts_City:V',
+                         'vtiger_crmentity:smownerid:assigned_user_id:Accounts_Assigned_To:V'),
+
+		   Array('vtiger_contactdetails:firstname:firstname:Contacts_First_Name:V',
+                         'vtiger_contactdetails:lastname:lastname:Contacts_Last_Name:V',
+                         'vtiger_contactdetails:title:title:Contacts_Title:V',
+                         'vtiger_contactdetails:accountid:account_id:Contacts_Account_Name:I',
+                         'vtiger_contactdetails:email:email:Contacts_Email:E',
+                         'vtiger_contactdetails:phone:phone:Contacts_Office_Phone:V',
+			 'vtiger_crmentity:smownerid:assigned_user_id:Contacts_Assigned_To:V'),
+
+		   Array('vtiger_contactdetails:firstname:firstname:Contacts_First_Name:V',
+                         'vtiger_contactdetails:lastname:lastname:Contacts_Last_Name:V',
+                         'vtiger_contactaddress:mailingstreet:mailingstreet:Contacts_Mailing_Street:V',
+                         'vtiger_contactaddress:mailingcity:mailingcity:Contacts_City:V',
+                         'vtiger_contactaddress:mailingstate:mailingstate:Contacts_State:V',
+			 'vtiger_contactaddress:mailingzip:mailingzip:Contacts_Zip:V',
+			 'vtiger_contactaddress:mailingcountry:mailingcountry:Contacts_Country:V'),
 		   
-		   Array('contactdetails:firstname:firstname:Contacts_First_Name:V',
-                         '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:E',
-			 'contactsubdetails:otherphone:otherphone:Contacts_Phone:V',
-			 'crmentity:smownerid:assigned_user_id:Contacts_Assigned_To:V'),
+		   Array('vtiger_contactdetails:firstname:firstname:Contacts_First_Name:V',
+                         'vtiger_contactdetails:lastname:lastname:Contacts_Last_Name:V',
+                         'vtiger_contactdetails:title:title:Contacts_Title:V',
+                         'vtiger_contactdetails:accountid:account_id:Contacts_Account_Name:I',
+                         'vtiger_contactdetails:email:email:Contacts_Email:E',
+			 'vtiger_contactsubdetails:otherphone:otherphone:Contacts_Phone:V',
+			 'vtiger_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: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'),
-
-                   Array('potential:potentialname:potentialname:Potentials_Potential_Name:V',
-                         'potential:accountid:account_id:Potentials_Account_Name:V',
-                         'potential:amount:amount:Potentials_Amount:N',
-                         'potential:closingdate:closingdate:Potentials_Expected_Close_Date:D',
-                         'crmentity:smownerid:assigned_user_id:Potentials_Assigned_To:V'),
-
-		   Array('potential:potentialname:potentialname:Potentials_Potential_Name:V',
-                         'potential:accountid:account_id:Potentials_Account_Name:V',
-                         'potential:amount:amount:Potentials_Amount:N',
-                         'potential:leadsource:leadsource:Potentials_Lead_Source:V',
-                         'potential:closingdate:closingdate:Potentials_Expected_Close_Date:D',
-                         'crmentity:smownerid:assigned_user_id:Potentials_Assigned_To:V'),
-
-		   Array('crmentity:crmid::HelpDesk_Ticket_ID:I',
-			 'troubletickets:title:ticket_title:HelpDesk_Title:V',
-                         'troubletickets:parent_id:parent_id:HelpDesk_Related_to:I',
-                         'troubletickets:status:ticketstatus:HelpDesk_Status:V',
-                         'troubletickets:priority:ticketpriorities:HelpDesk_Priority:V',
-                         'crmentity:smownerid:assigned_user_id:HelpDesk_Assigned_To:V'),
-
-		   Array('troubletickets:title:ticket_title:HelpDesk_Title:V',
-                         'troubletickets:parent_id:parent_id:HelpDesk_Related_to:I',
-                         'troubletickets:priority:ticketpriorities:HelpDesk_Priority:V',
-                         'troubletickets:product_id:product_id:HelpDesk_Product_Name:I',
-                         'crmentity:smownerid:assigned_user_id:HelpDesk_Assigned_To:V'),
-
-		   Array('troubletickets:title:ticket_title:HelpDesk_Title:V',
-                         'troubletickets:parent_id:parent_id:HelpDesk_Related_to:I',
-                         'troubletickets:status:ticketstatus:HelpDesk_Status:V',
-                         'troubletickets:product_id:product_id:HelpDesk_Product_Name:I',
-                         'crmentity:smownerid:assigned_user_id:HelpDesk_Assigned_To:V'),
-
-		   Array('crmentity:crmid::Quotes_Quote_ID:I',
-			 'quotes:subject:subject:Quotes_Subject:V',
-                         'quotes:quotestage:quotestage:Quotes_Quote_Stage:V',
-                         'quotes:potentialid:potential_id:Quotes_Potential_Name:I',
-                         'quotes:accountid:account_id:Quotes_Account_Name:I',
-                         'quotes:total:hdnGrandTotal:Quotes_Total:I',
-			 'crmentity:smownerid:assigned_user_id:Quotes_Assigned_To:V'),
-
-		   Array('quotes:subject:subject:Quotes_Subject:V',
-                         'quotes:quotestage:quotestage:Quotes_Quote_Stage:V',
-                         'quotes:potentialid:potential_id:Quotes_Potential_Name:I',
-                         'quotes:accountid:account_id:Quotes_Account_Name:I',
-                         'quotes:validtill:validtill:Quotes_Valid_Till:D',
-			 'crmentity:smownerid:assigned_user_id:Quotes_Assigned_To:V'),
-
-		   Array('quotes:subject:subject:Quotes_Subject:V',
-                         'quotes:potentialid:potential_id:Quotes_Potential_Name:I',
-                         'quotes:accountid:account_id:Quotes_Account_Name:I',
-                         'quotes:validtill:validtill:Quotes_Valid_Till:D',
-                         'crmentity:smownerid:assigned_user_id:Quotes_Assigned_To:V'),
+		   Array('vtiger_potential:potentialname:potentialname:Potentials_Potential_Name:V',
+                         'vtiger_potential:accountid:account_id:Potentials_Account_Name:V',
+                         'vtiger_potential:sales_stage:sales_stage:Potentials_Sales_Stage:V',
+                         'vtiger_potential:leadsource:leadsource:Potentials_Lead_Source:V',
+                         'vtiger_potential:closingdate:closingdate:Potentials_Expected_Close_Date:D',
+                         'vtiger_crmentity:smownerid:assigned_user_id:Potentials_Assigned_To:V'),
+
+                   Array('vtiger_potential:potentialname:potentialname:Potentials_Potential_Name:V',
+                         'vtiger_potential:accountid:account_id:Potentials_Account_Name:V',
+                         'vtiger_potential:amount:amount:Potentials_Amount:N',
+                         'vtiger_potential:closingdate:closingdate:Potentials_Expected_Close_Date:D',
+                         'vtiger_crmentity:smownerid:assigned_user_id:Potentials_Assigned_To:V'),
+
+		   Array('vtiger_potential:potentialname:potentialname:Potentials_Potential_Name:V',
+                         'vtiger_potential:accountid:account_id:Potentials_Account_Name:V',
+                         'vtiger_potential:amount:amount:Potentials_Amount:N',
+                         'vtiger_potential:leadsource:leadsource:Potentials_Lead_Source:V',
+                         'vtiger_potential:closingdate:closingdate:Potentials_Expected_Close_Date:D',
+                         'vtiger_crmentity:smownerid:assigned_user_id:Potentials_Assigned_To:V'),
+
+		   Array('vtiger_crmentity:crmid::HelpDesk_Ticket_ID:I',
+			 'vtiger_troubletickets:title:ticket_title:HelpDesk_Title:V',
+                         'vtiger_troubletickets:parent_id:parent_id:HelpDesk_Related_to:I',
+                         'vtiger_troubletickets:status:ticketstatus:HelpDesk_Status:V',
+                         'vtiger_troubletickets:priority:ticketpriorities:HelpDesk_Priority:V',
+                         'vtiger_crmentity:smownerid:assigned_user_id:HelpDesk_Assigned_To:V'),
+
+		   Array('vtiger_troubletickets:title:ticket_title:HelpDesk_Title:V',
+                         'vtiger_troubletickets:parent_id:parent_id:HelpDesk_Related_to:I',
+                         'vtiger_troubletickets:priority:ticketpriorities:HelpDesk_Priority:V',
+                         'vtiger_troubletickets:product_id:product_id:HelpDesk_Product_Name:I',
+                         'vtiger_crmentity:smownerid:assigned_user_id:HelpDesk_Assigned_To:V'),
+
+		   Array('vtiger_troubletickets:title:ticket_title:HelpDesk_Title:V',
+                         'vtiger_troubletickets:parent_id:parent_id:HelpDesk_Related_to:I',
+                         'vtiger_troubletickets:status:ticketstatus:HelpDesk_Status:V',
+                         'vtiger_troubletickets:product_id:product_id:HelpDesk_Product_Name:I',
+                         'vtiger_crmentity:smownerid:assigned_user_id:HelpDesk_Assigned_To:V'),
+
+		   Array('vtiger_crmentity:crmid::Quotes_Quote_ID:I',
+			 'vtiger_quotes:subject:subject:Quotes_Subject:V',
+                         'vtiger_quotes:quotestage:quotestage:Quotes_Quote_Stage:V',
+                         'vtiger_quotes:potentialid:potential_id:Quotes_Potential_Name:I',
+                         'vtiger_quotes:accountid:account_id:Quotes_Account_Name:I',
+                         'vtiger_quotes:total:hdnGrandTotal:Quotes_Total:I',
+			 'vtiger_crmentity:smownerid:assigned_user_id:Quotes_Assigned_To:V'),
+
+		   Array('vtiger_quotes:subject:subject:Quotes_Subject:V',
+                         'vtiger_quotes:quotestage:quotestage:Quotes_Quote_Stage:V',
+                         'vtiger_quotes:potentialid:potential_id:Quotes_Potential_Name:I',
+                         'vtiger_quotes:accountid:account_id:Quotes_Account_Name:I',
+                         'vtiger_quotes:validtill:validtill:Quotes_Valid_Till:D',
+			 'vtiger_crmentity:smownerid:assigned_user_id:Quotes_Assigned_To:V'),
+
+		   Array('vtiger_quotes:subject:subject:Quotes_Subject:V',
+                         'vtiger_quotes:potentialid:potential_id:Quotes_Potential_Name:I',
+                         'vtiger_quotes:accountid:account_id:Quotes_Account_Name:I',
+                         'vtiger_quotes:validtill:validtill:Quotes_Valid_Till:D',
+                         'vtiger_crmentity:smownerid:assigned_user_id:Quotes_Assigned_To:V'),
 			
-		   Array('activity:status:taskstatus:Activities_Status:V',
-                         'activity:activitytype:activitytype:Activities_Type:V',
-                         'activity:subject:subject:Activities_Subject: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',
-				'crmentity:smownerid:assigned_user_id:Emails_Sender:V',
-                 'activity:date_start:date_start:Emails_Date_Sent:D'),
+		   Array('vtiger_activity:status:taskstatus:Activities_Status:V',
+                         'vtiger_activity:activitytype:activitytype:Activities_Type:V',
+                         'vtiger_activity:subject:subject:Activities_Subject:V',
+                         'vtiger_cntactivityrel:contactid:contact_id:Activities_Contact_Name:I',
+                         'vtiger_seactivityrel:crmid:parent_id:Activities_Related_to:V',
+                         'vtiger_activity:date_start:date_start:Activities_Start_Date:D',
+                         'vtiger_activity:due_date:due_date:Activities_End_Date:D',
+                         'vtiger_crmentity:smownerid:assigned_user_id:Activities_Assigned_To:V'),
+
+		   Array('vtiger_activity:subject:subject:Emails_Subject:V',
+				'vtiger_crmentity:smownerid:assigned_user_id:Emails_Sender:V',
+                 'vtiger_activity:date_start:date_start:Emails_Date_Sent:D'),
 		
-		   Array('crmentity:crmid::Invoice_Invoice_Id:I',
-                         'invoice:subject:subject:Invoice_Subject: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('vtiger_crmentity:crmid::Invoice_Invoice_Id:I',
+                         'vtiger_invoice:subject:subject:Invoice_Subject:V',
+                         'vtiger_invoice:salesorderid:salesorder_id:Invoice_Sales_Order:I',
+                         'vtiger_invoice:invoicestatus:invoicestatus:Invoice_Status:V',
+                         'vtiger_invoice:total:hdnGrandTotal:Invoice_Total:I',
+                         'vtiger_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:parent_id:Notes_Related_to:I',
-                        'notes:filename:filename:Notes_File:V',
-                        'crmentity:modifiedtime:modifiedtime:Notes_Modified_Time:V'),
+		  Array('vtiger_notes:title:title:Notes_Title:V',
+                        'vtiger_notes:contact_id:contact_id:Notes_Contact_Name:I',
+                        'vtiger_senotesrel:crmid:parent_id:Notes_Related_to:I',
+                        'vtiger_notes:filename:filename:Notes_File:V',
+                        'vtiger_crmentity:modifiedtime:modifiedtime:Notes_Modified_Time:V'),
 		
-		  Array('pricebook:bookname:bookname:PriceBooks_Price_Book_Name:V',
-                        'pricebook:active:active:PriceBooks_Active:V'),
+		  Array('vtiger_pricebook:bookname:bookname:PriceBooks_Price_Book_Name:V',
+                        'vtiger_pricebook:active:active:PriceBooks_Active:V'),
 		  
-		  Array('products:productname:productname:Products_Product_Name:V',
-                        'products:productcode:productcode:Products_Product_Code:V',
-                        'products:commissionrate:commissionrate:Products_Commission_Rate:V',
-                        'products:qty_per_unit:qty_per_unit:Products_Qty/Unit:V',
-                        'products:unit_price:unit_price:Products_Unit_Price:V'),
+		  Array('vtiger_products:productname:productname:Products_Product_Name:V',
+                        'vtiger_products:productcode:productcode:Products_Product_Code:V',
+                        'vtiger_products:commissionrate:commissionrate:Products_Commission_Rate:V',
+                        'vtiger_products:qty_per_unit:qty_per_unit:Products_Qty/Unit:V',
+                        'vtiger_products:unit_price:unit_price:Products_Unit_Price:V'),
 		  
-		  Array('crmentity:crmid::PurchaseOrder_Order_Id:I',
-                        'purchaseorder:subject:subject:PurchaseOrder_Subject:V',
-                        'purchaseorder:vendorid:vendor_id:PurchaseOrder_Vendor_Name:I',
-                        'purchaseorder:tracking_no:tracking_no:PurchaseOrder_Tracking_Number:V',
-                        'crmentity:smownerid:assigned_user_id:PurchaseOrder_Assigned_To:V'),
+		  Array('vtiger_crmentity:crmid::PurchaseOrder_Order_Id:I',
+                        'vtiger_purchaseorder:subject:subject:PurchaseOrder_Subject:V',
+                        'vtiger_purchaseorder:vendorid:vendor_id:PurchaseOrder_Vendor_Name:I',
+                        'vtiger_purchaseorder:tracking_no:tracking_no:PurchaseOrder_Tracking_Number:V',
+                        'vtiger_crmentity:smownerid:assigned_user_id:PurchaseOrder_Assigned_To:V'),
 		  
-	          Array('crmentity:crmid::SalesOrder_Order_Id:I',
-                        'salesorder:subject:subject:SalesOrder_Subject:V',
-                        'account:accountid:account_id:SalesOrder_Account_Name:V',
-                        'quotes:quoteid:quote_id:SalesOrder_Quote_Name:I',
-                        'salesorder:total:hdnGrandTotal:SalesOrder_Total:V',
-                        'crmentity:smownerid:assigned_user_id:SalesOrder_Assigned_To:V'),
-
-	          Array('vendor:vendorname:vendorname:Vendors_Vendor_Name:V',
-			'vendor:phone:phone:Vendors_Phone:V',
-			'vendor:email:email:Vendors_Email:E',
-                        'vendor:category:category:Vendors_Category:V'),
-
-
-
-
-		 Array('faq:id::Faq_FAQ_Id:I',
-		       'faq:question:question:Faq_Question:V',
-		       'faq:category:faqcategories:Faq_Category:V',
-		       'faq:product_id:product_id:Faq_Product_Name:I',
-		       'crmentity:createdtime:createdtime:Faq_Created_Time:D',
-                       'crmentity:modifiedtime:modifiedtime:Faq_Modified_Time:D'),
+	          Array('vtiger_crmentity:crmid::SalesOrder_Order_Id:I',
+                        'vtiger_salesorder:subject:subject:SalesOrder_Subject:V',
+                        'vtiger_account:accountid:account_id:SalesOrder_Account_Name:V',
+                        'vtiger_quotes:quoteid:quote_id:SalesOrder_Quote_Name:I',
+                        'vtiger_salesorder:total:hdnGrandTotal:SalesOrder_Total:V',
+                        'vtiger_crmentity:smownerid:assigned_user_id:SalesOrder_Assigned_To:V'),
+
+	          Array('vtiger_vendor:vendorname:vendorname:Vendors_Vendor_Name:V',
+			'vtiger_vendor:phone:phone:Vendors_Phone:V',
+			'vtiger_vendor:email:email:Vendors_Email:E',
+                        'vtiger_vendor:category:category:Vendors_Category:V'),
+
+
+
+
+		 Array('vtiger_faq:id::Faq_FAQ_Id:I',
+		       'vtiger_faq:question:question:Faq_Question:V',
+		       'vtiger_faq:category:faqcategories:Faq_Category:V',
+		       'vtiger_faq:product_id:product_id:Faq_Product_Name:I',
+		       'vtiger_crmentity:createdtime:createdtime:Faq_Created_Time:D',
+                       'vtiger_crmentity:modifiedtime:modifiedtime:Faq_Modified_Time:D'),
 		      //this sequence has to be maintained 
-		 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'),
+		 Array('vtiger_campaign:campaignname:campaignname:Campaigns_Campaign_Name:V',
+		       'vtiger_campaign:campaigntype:campaigntype:Campaigns_Campaign_Type:N',
+		       'vtiger_campaign:campaignstatus:campaignstatus:Campaigns_Campaign_Status:N',
+		       'vtiger_campaign:expectedrevenue:expectedrevenue:Campaigns_Expected_Revenue:V',
+		       'vtiger_campaign:closingdate:closingdate:Campaigns_Expected_Close_Date:D',
+		       'vtiger_crmentity:smownerid:assigned_user_id:Campaigns_Assigned_To:V'),
 
 
 		 Array('subject:subject:subject:Subject:V',
@@ -336,17 +336,17 @@
 
 
 
-$cvstdfilters = Array(Array('columnname'=>'crmentity:modifiedtime:modifiedtime:Leads_Modified_Time',
+$cvstdfilters = Array(Array('columnname'=>'vtiger_crmentity:modifiedtime:modifiedtime:Leads_Modified_Time',
                             'datefilter'=>'thismonth',
                             'startdate'=>'2005-06-01',
                             'enddate'=>'2005-06-30'),
 
-		      Array('columnname'=>'crmentity:createdtime:createdtime:Accounts_Created_Time',
+		      Array('columnname'=>'vtiger_crmentity:createdtime:createdtime:Accounts_Created_Time',
                             'datefilter'=>'thisweek',
                             'startdate'=>'2005-06-19',
                             'enddate'=>'2005-06-25'),
 
-		      Array('columnname'=>'contactsubdetails:birthday:birthday:Contacts_Birthdate',
+		      Array('columnname'=>'vtiger_contactsubdetails:birthday:birthday:Contacts_Birthdate',
                             'datefilter'=>'today',
                             'startdate'=>'2005-06-25',
                             'enddate'=>'2005-06-25')
@@ -354,53 +354,53 @@
 
 $cvadvfilters = Array(
                 	Array(
-               			 Array('columnname'=>'leaddetails:leadstatus:leadstatus:Leads_Lead_Status:V',
+               			 Array('columnname'=>'vtiger_leaddetails:leadstatus:leadstatus:Leads_Lead_Status:V',
 		                      'comparator'=>'e',
         		              'value'=>'Hot'
                      			)
                      	 ),
 		      		Array(
-                          Array('columnname'=>'account:account_type:accounttype:Accounts_Type:V',
+                          Array('columnname'=>'vtiger_account:account_type:accounttype:Accounts_Type:V',
                                 'comparator'=>'e',
                                  'value'=>'Prospect'
                                  )
                            ),
 				     Array(
-                            Array('columnname'=>'potential:sales_stage:sales_stage:Potentials_Sales_Stage:V',
+                            Array('columnname'=>'vtiger_potential:sales_stage:sales_stage:Potentials_Sales_Stage:V',
                                   'comparator'=>'e',
                                   'value'=>'Closed Won'
                                  )
                            ),
 				     Array(
-                            Array('columnname'=>'potential:sales_stage:sales_stage:Potentials_Sales_Stage:V',
+                            Array('columnname'=>'vtiger_potential:sales_stage:sales_stage:Potentials_Sales_Stage:V',
                                   'comparator'=>'e',
                                   'value'=>'Prospecting'
                                  )
                            ),
 				     Array(
-                            Array('columnname'=>'troubletickets:status:ticketstatus:HelpDesk_Status:V',
+                            Array('columnname'=>'vtiger_troubletickets:status:ticketstatus:HelpDesk_Status:V',
                                   'comparator'=>'n',
                                   'value'=>'Closed'
                                  )
                            ),
 				     Array(
-                            Array('columnname'=>'troubletickets:priority:ticketpriorities:HelpDesk_Priority:V',
+                            Array('columnname'=>'vtiger_troubletickets:priority:ticketpriorities:HelpDesk_Priority:V',
                                   'comparator'=>'e',
                                   'value'=>'High'
                                  )
                            ),
 				     Array(
-	                        Array('columnname'=>'quotes:quotestage:quotestage:Quotes_Quote_Stage:V',
+	                        Array('columnname'=>'vtiger_quotes:quotestage:quotestage:Quotes_Quote_Stage:V',
                                   'comparator'=>'n',
                                   'value'=>'Accepted'
                                  ),
-						    Array('columnname'=>'quotes:quotestage:quotestage:Quotes_Quote_Stage:V',
+						    Array('columnname'=>'vtiger_quotes:quotestage:quotestage:Quotes_Quote_Stage:V',
                                   'comparator'=>'n',
                                   'value'=>'Rejected'
                                  )
                            ),
 				     Array(
-                            Array('columnname'=>'quotes:quotestage:quotestage:Quotes_Quote_Stage:V',
+                            Array('columnname'=>'vtiger_quotes:quotestage:quotestage:Quotes_Quote_Stage:V',
                                   'comparator'=>'e',
                                   'value'=>'Rejected'
                                  )
@@ -432,7 +432,7 @@
 	if($genCVid != "")
 	{
 
-		$customviewsql = "insert into customview(cvid,viewname,setdefault,setmetrics,entitytype)";
+		$customviewsql = "insert into vtiger_customview(cvid,viewname,setdefault,setmetrics,entitytype)";
 		$customviewsql .= " values(".$genCVid.",'".$viewname."',".$setdefault.",".$setmetrics.",'".$cvmodule."')";
 		$customviewresult = $adb->query($customviewsql);
 	}
@@ -446,7 +446,7 @@
 	{
 		for($i=0;$i<count($columnslist);$i++)
 		{
-			$columnsql = "insert into cvcolumnlist (cvid,columnindex,columnname)";
+			$columnsql = "insert into vtiger_cvcolumnlist (cvid,columnindex,columnname)";
 			$columnsql .= " values (".$CVid.",".$i.",'".$columnslist[$i]."')";
 			$columnresult = $adb->query($columnsql);
 		}
@@ -458,7 +458,7 @@
 	global $adb;
 	if($CVid != "")
 	{
-		$stdfiltersql = "insert into cvstdfilter(cvid,columnname,stdfilter,startdate,enddate)";
+		$stdfiltersql = "insert into vtiger_cvstdfilter(cvid,columnname,stdfilter,startdate,enddate)";
 		$stdfiltersql .= " values (".$CVid.",'".$filtercolumn."',";
 		$stdfiltersql .= "'".$filtercriteria."',";
 		$stdfiltersql .= "'".$startdate."',";
@@ -474,7 +474,7 @@
 	{
 		foreach($filters as $i=>$filter)
 		{
-			$advfiltersql = "insert into cvadvfilter(cvid,columnindex,columnname,comparator,value)";
+			$advfiltersql = "insert into vtiger_cvadvfilter(cvid,columnindex,columnname,comparator,value)";
 			$advfiltersql .= " values (".$CVid.",".$i.",'".$filter['columnname']."',";
 			$advfiltersql .= "'".$filter['comparator']."',";
 			$advfiltersql .= "'".$filter['value']."')";

Modified: vtigercrm/trunk/modules/CustomView/Save.php
==============================================================================
--- vtigercrm/trunk/modules/CustomView/Save.php (original)
+++ vtigercrm/trunk/modules/CustomView/Save.php Mon Jun 12 14:26:25 2006
@@ -95,32 +95,32 @@
 
 			if($setdefault == 1)
 			{
-				$updatedefaultsql = "UPDATE customview SET setdefault = 0 WHERE entitytype = ".$adb->quote($cvmodule);
+				$updatedefaultsql = "UPDATE vtiger_customview SET setdefault = 0 WHERE entitytype = ".$adb->quote($cvmodule);
 				$updatedefaultresult = $adb->query($updatedefaultsql);
 			}
 			$log->info("CustomView :: Save :: setdefault upated successfully");
 
-			$customviewsql = "INSERT INTO customview(cvid, viewname,
+			$customviewsql = "INSERT INTO vtiger_customview(cvid, viewname,
 						setdefault, setmetrics,
 						entitytype)
 					VALUES (".$genCVid.",".$adb->quote($viewname).",
 						".$setdefault.",".$setmetrics.",
 						".$adb->quote($cvmodule).")";
 			$customviewresult = $adb->query($customviewsql);
-			$log->info("CustomView :: Save :: customview created successfully");
+			$log->info("CustomView :: Save :: vtiger_customview created successfully");
 			if($customviewresult)
 			{
 				if(isset($columnslist))
 				{
 					for($i=0;$i<count($columnslist);$i++)
 					{
-						$columnsql = "INSERT INTO cvcolumnlist (cvid, columnindex, columnname)
+						$columnsql = "INSERT INTO vtiger_cvcolumnlist (cvid, columnindex, columnname)
 							VALUES (".$genCVid.", ".$i.", ".$adb->quote($columnslist[$i]).")";
 						$columnresult = $adb->query($columnsql);
 					}
-					$log->info("CustomView :: Save :: cvcolumnlist created successfully");
-
-					$stdfiltersql = "INSERT INTO cvstdfilter
+					$log->info("CustomView :: Save :: vtiger_cvcolumnlist created successfully");
+
+					$stdfiltersql = "INSERT INTO vtiger_cvstdfilter
 								(cvid,
 								columnname,
 								stdfilter,
@@ -134,10 +134,10 @@
 								".$adb->formatDate($std_filter_list["startdate"]).",
 								".$adb->formatDate($std_filter_list["enddate"]).")";
 					$stdfilterresult = $adb->query($stdfiltersql);
-					$log->info("CustomView :: Save :: cvstdfilter created successfully");
+					$log->info("CustomView :: Save :: vtiger_cvstdfilter created successfully");
 					for($i=0;$i<count($adv_filter_col);$i++)
 					{
-						$advfiltersql = "INSERT INTO cvadvfilter
+						$advfiltersql = "INSERT INTO vtiger_cvadvfilter
 								(cvid,
 								columnindex,
 								columnname,
@@ -151,7 +151,7 @@
 								".$adb->quote($adv_filter_value[$i]).")";
 						$advfilterresult = $adb->query($advfiltersql);
 					}
-					$log->info("CustomView :: Save :: cvadvfilter created successfully");
+					$log->info("CustomView :: Save :: vtiger_cvadvfilter created successfully");
 				}
 			}
 			$cvid = $genCVid;
@@ -161,26 +161,26 @@
 
 		if($setdefault == 1)
 		{
-			$updatedefaultsql = "UPDATE customview SET setdefault = 0 WHERE entitytype = ".$adb->quote($cvmodule);
+			$updatedefaultsql = "UPDATE vtiger_customview SET setdefault = 0 WHERE entitytype = ".$adb->quote($cvmodule);
 			$updatedefaultresult = $adb->query($updatedefaultsql);
 		}
 		$log->info("CustomView :: Save :: setdefault upated successfully".$genCVid);
-		$updatecvsql = "UPDATE customview
+		$updatecvsql = "UPDATE vtiger_customview
 				SET viewname = ".$adb->quote($viewname).",
 					setdefault = ".$setdefault.",
 					setmetrics = ".$setmetrics."
 				WHERE cvid = ".$cvid;
 		$updatecvresult = $adb->query($updatecvsql);
-		$log->info("CustomView :: Save :: customview upated successfully".$genCVid);
-		$deletesql = "DELETE FROM cvcolumnlist WHERE cvid = ".$cvid;
+		$log->info("CustomView :: Save :: vtiger_customview upated successfully".$genCVid);
+		$deletesql = "DELETE FROM vtiger_cvcolumnlist WHERE cvid = ".$cvid;
 		$deleteresult = $adb->query($deletesql);
 
-		$deletesql = "DELETE FROM cvstdfilter WHERE cvid = ".$cvid;
+		$deletesql = "DELETE FROM vtiger_cvstdfilter WHERE cvid = ".$cvid;
 		$deleteresult = $adb->query($deletesql);
 
-		$deletesql = "DELETE FROM cvadvfilter WHERE cvid = ".$cvid;
+		$deletesql = "DELETE FROM vtiger_cvadvfilter WHERE cvid = ".$cvid;
 		$deleteresult = $adb->query($deletesql);
-		$log->info("CustomView :: Save :: cvcolumnlist,cvstdfilter,cvadvfilter deleted successfully before update".$genCVid);
+		$log->info("CustomView :: Save :: vtiger_cvcolumnlist,cvstdfilter,cvadvfilter deleted successfully before update".$genCVid);
 
 		$genCVid = $cvid;
 		if($updatecvresult)
@@ -189,12 +189,12 @@
 			{
 				for($i=0;$i<count($columnslist);$i++)
 				{
-					$columnsql = "INSERT INTO cvcolumnlist (cvid, columnindex, columnname)
+					$columnsql = "INSERT INTO vtiger_cvcolumnlist (cvid, columnindex, columnname)
 						VALUES (".$genCVid.", ".$i.", ".$adb->quote($columnslist[$i]).")";
 					$columnresult = $adb->query($columnsql);
 				}
-				$log->info("CustomView :: Save :: cvcolumnlist update successfully".$genCVid);
-				$stdfiltersql = "INSERT INTO cvstdfilter
+				$log->info("CustomView :: Save :: vtiger_cvcolumnlist update successfully".$genCVid);
+				$stdfiltersql = "INSERT INTO vtiger_cvstdfilter
 							(cvid,
 							columnname,
 							stdfilter,
@@ -207,10 +207,10 @@
 							".$adb->formatDate($std_filter_list["startdate"]).",
 							".$adb->formatDate($std_filter_list["enddate"]).")";
 				$stdfilterresult = $adb->query($stdfiltersql);
-				$log->info("CustomView :: Save :: cvstdfilter update successfully".$genCVid);
+				$log->info("CustomView :: Save :: vtiger_cvstdfilter update successfully".$genCVid);
 				for($i=0;$i<count($adv_filter_col);$i++)
 				{
-					$advfiltersql = "INSERT INTO cvadvfilter
+					$advfiltersql = "INSERT INTO vtiger_cvadvfilter
 								(cvid,
 								columnindex,
 								columnname,
@@ -224,7 +224,7 @@
 								".$adb->quote($adv_filter_value[$i]).")";
 					$advfilterresult = $adb->query($advfiltersql);
 				}
-				$log->info("CustomView :: Save :: cvadvfilter update successfully".$genCVid);
+				$log->info("CustomView :: Save :: vtiger_cvadvfilter update successfully".$genCVid);
 			}
 		}
 	}

Modified: vtigercrm/trunk/modules/CustomView/SaveAction.php
==============================================================================
--- vtigercrm/trunk/modules/CustomView/SaveAction.php (original)
+++ vtigercrm/trunk/modules/CustomView/SaveAction.php Mon Jun 12 14:26:25 2006
@@ -22,7 +22,7 @@
 {
 	if($mode == "new")
 	{
-		$customactionsql = "insert into customaction(cvid,subject,module,content)";
+		$customactionsql = "insert into vtiger_customaction(cvid,subject,module,content)";
 		$customactionsql .= " values(".$cvid.",'".$subject."','".$cvmodule."','".$body."')";
 		$customactionresult = $adb->query($customactionsql);
 		if($customactionresult == false)
@@ -37,7 +37,7 @@
 
 	}elseif($mode == "edit")
 	{
-		$updatecasql = "update customaction set subject='".$subject."',content='".$body."' where cvid=".$cvid;
+		$updatecasql = "update vtiger_customaction set subject='".$subject."',content='".$body."' where cvid=".$cvid;
 		$updatecaresult = $adb->query($updatecasql);
 		if($updatecaresult == false)
 		{

Modified: vtigercrm/trunk/modules/CustomView/SendMailAction.php
==============================================================================
--- vtigercrm/trunk/modules/CustomView/SendMailAction.php (original)
+++ vtigercrm/trunk/modules/CustomView/SendMailAction.php Mon Jun 12 14:26:25 2006
@@ -38,7 +38,7 @@
 			if($id == '') continue;
 			if($camodule == "Contacts")
 			{
-				$sql="select * from contactdetails inner join crmentity on crmentity.crmid = contactdetails.contactid where crmentity.deleted =0 and contactdetails.contactid='" .$id ."'";
+				$sql="select * from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid where vtiger_crmentity.deleted =0 and vtiger_contactdetails.contactid='" .$id ."'";
 				$result = $adb->query($sql);
 				$camodulerow = $adb->fetch_array($result);
 				if(isset($camodulerow))
@@ -65,7 +65,7 @@
 
 			}elseif($camodule == "Leads")
 			{
-				$sql="select * from leaddetails inner join crmentity on crmentity.crmid = leaddetails.leadid where crmentity.deleted =0 and leaddetails.leadid='" .$id ."'";
+				$sql="select * from vtiger_leaddetails inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_leaddetails.leadid where vtiger_crmentity.deleted =0 and vtiger_leaddetails.leadid='" .$id ."'";
 				$result = $adb->query($sql);
 				$camodulerow = $adb->fetch_array($result);
 				if(isset($camodulerow))
@@ -88,7 +88,7 @@
 				}
 			}elseif($camodule == "Accounts")
 			{
-				$sql="select * from account inner join crmentity on crmentity.crmid = account.accountid where crmentity.deleted =0 and account.accountid='" .$id ."'";
+				$sql="select * from vtiger_account inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_account.accountid where vtiger_crmentity.deleted =0 and vtiger_account.accountid='" .$id ."'";
 				$result = $adb->query($sql);
 				$camodulerow = $adb->fetch_array($result);
 				if(isset($camodulerow))
@@ -128,7 +128,7 @@
 	if($current_user_id != '')
 	{
 		global $adb;
-		$sql = "select * from users where id= ".$current_user_id;
+		$sql = "select * from vtiger_users where id= ".$current_user_id;
 		$result = $adb->query($sql);
 		$from = $adb->query_result($result,0,'email1');
 		$initialfrom = $adb->query_result($result,0,'user_name');
@@ -136,7 +136,7 @@
 	if($mail_server=='')
 	{
 		global $adb;
-		$mailserverresult=$adb->query("select * from systems where server_type='email'");
+		$mailserverresult=$adb->query("select * from vtiger_systems where server_type='email'");
 		$mail_server = $adb->query_result($mailserverresult,0,'server');
 		$mail_server_username = $adb->query_result($mailserverresult,0,'server_username');
 		$mail_server_password = $adb->query_result($mailserverresult,0,'server_password');

Modified: vtigercrm/trunk/modules/CustomView/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/CustomView/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/CustomView/language/en_us.lang.php Mon Jun 12 14:26:25 2006
@@ -86,7 +86,7 @@
 'less_or_equal'=>'less or equal', 
 'greater_or_equal'=>'greater or equal', 
  
-//Strings added to translate field label groups 
+//Strings added to translate vtiger_field label vtiger_groups 
 'Address'=>'Address', 
 'Information'=>'Information', 
 'Description'=>'Description', 
@@ -96,7 +96,7 @@
 '- Task Information'=>'- Task Information', 
 '- Task Description'=>'- Task Description', 
  
-//Strings added for helpdesk module fields 
+//Strings added for helpdesk module vtiger_fields 
 'Title'=>'Title', 
 'Assigned To'=>'Assigned To', 
 'Related to'=>'Related to', 
@@ -109,7 +109,7 @@
 'Modified Time'=>'Modified Time', 
 'Attachment'=>'Attachment', 
  
-//Strings added for Leads module fields 
+//Strings added for Leads module vtiger_fields 
 'First Name'=>'First Name', 
 'Phone'=>'Phone', 
 'Last Name'=>'Last Name', 
@@ -128,7 +128,7 @@
 'Country'=>'Country', 
 'State'=>'State', 
  
-//Strings added for Accounts module fields 
+//Strings added for Accounts module vtiger_fields 
 'Account Name'=>'Account Name', 
 'Ticker Symbol'=>'Ticker Symbol', 
 'Other Phone'=>'Other Phone', 
@@ -153,7 +153,7 @@
 'Billing Country'=>'Billing Country', 
  
  
-//Strings added for Contacts module fields 
+//Strings added for Contacts module vtiger_fields 
  
 'Office Phone'=>'Office Phone', 
 'Home Phone'=>'Home Phone', 
@@ -175,7 +175,7 @@
 'Other Country'=>'Other Country', 
  
  
-//Strings added for Potential module fields 
+//Strings added for Potential module vtiger_fields 
  
 'Potential Name'=>'Potential Name', 
 'Amount'=>'Amount', 
@@ -185,7 +185,7 @@
 'Probability'=>'Probability', 
  
  
-//Strings added for Quotes module fields 
+//Strings added for Quotes module vtiger_fields 
 'Subject'=>'Subject', 
 'Quote Stage'=>'Quote Stage', 
 'Valid Till'=>'Valid Till', 
@@ -195,7 +195,7 @@
 'Shipping'=>'Shipping', 
 'Inventory Manager'=>'Inventory Manager', 
  
-//Strings added for Sales Orders module fields 
+//Strings added for Sales Orders module vtiger_fields 
 'Customer No'=>'Customer No', 
 'Quote Name'=>'Quote Name', 
 'Purchase Order'=>'Purchase Order', 
@@ -204,11 +204,11 @@
 'Sales Commission'=>'Sales Commission', 
 'Excise Duty'=>'Excise Duty', 
  
-//Strings added for Invoices module fields 
+//Strings added for Invoices module vtiger_fields 
 'Sales Order'=>'Sales Order', 
 'Invoice Date'=>'Invoice Date', 
  
-//Strings added for Product module fields 
+//Strings added for Product module vtiger_fields 
 'Product Code'=>'Product Code', 
 'Product Active'=>'Product Active', 
 'Product Category'=>'Product Category', 
@@ -224,16 +224,16 @@
 'Product Sheet'=>'Product Sheet', 
 'GL Account'=>'GL Account', 
  
-//Strings added for Price book module fields 
+//Strings added for Price book module vtiger_fields 
 'Price Book Name'=>'Price Book Name', 
 'Active'=>'Active', 
  
-//Strings added for tasks & events module fields 
+//Strings added for tasks & events module vtiger_fields 
 'Start Date & Time'=>'Start Date & Time', 
  
 //error message 
-'Missing required fields'=>'Missing required fields', 
-//Strings added for campaigns 
+'Missing required vtiger_fields'=>'Missing required vtiger_fields', 
+//Strings added for vtiger_campaigns 
 'Campaign Name'=>'Campaign Name', 
 'Campaign Type'=>'Campaign Type', 
 'Product'=>'Product', 
@@ -255,10 +255,10 @@
  
  
  
-//Added for customview.tpl 
+//Added for vtiger_customview.tpl 
  
 'LBL_Select_a_Column'=>'Select a Column', 
-'Missing_required_fields'=>'Missing required fields', 
+'Missing_required_fields'=>'Missing required vtiger_fields', 
 'Details'=>'Details', 
 'New_Custom_View'=>'New Custom view', 
 'LBL_AF_HDR5'=>'Simple Time Filter allows you to select date based on  

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 Mon Jun 12 14:26:25 2006
@@ -89,7 +89,7 @@
 	$ids = array_keys($ids);
 }
 
-//create unique prefix based on selected users for image files
+//create unique prefix based on selected vtiger_users for image vtiger_files
 $id_hash = '';
 if (isset($ids)) {
 	sort($ids);

Modified: vtigercrm/trunk/modules/Dashboard/Chart_my_pipeline_by_sales_stage.php
==============================================================================
--- vtigercrm/trunk/modules/Dashboard/Chart_my_pipeline_by_sales_stage.php (original)
+++ vtigercrm/trunk/modules/Dashboard/Chart_my_pipeline_by_sales_stage.php Mon Jun 12 14:26:25 2006
@@ -106,7 +106,7 @@
 $log->debug($datax);
 
 $ids = array($current_user->id);
-//create unique prefix based on selected users for image files
+//create unique prefix based on selected vtiger_users for image vtiger_files
 $id_hash = '';
 if (isset($ids)) {
 	sort($ids);

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 Mon Jun 12 14:26:25 2006
@@ -90,7 +90,7 @@
 	$ids = array_keys($ids);
 }
 
-//create unique prefix based on selected users for image files
+//create unique prefix based on selected vtiger_users for image vtiger_files
 $id_hash = '';
 if (isset($ids)) {
 	sort($ids);

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 Mon Jun 12 14:26:25 2006
@@ -89,7 +89,7 @@
 	$ids = array_keys($ids);
 }
 
-//create unique prefix based on selected users for image files
+//create unique prefix based on selected vtiger_users for image vtiger_files
 $id_hash = '';
 if (isset($ids)) {
 	sort($ids);

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 Mon Jun 12 14:26:25 2006
@@ -124,7 +124,7 @@
 	$ids = array_keys($ids);
 }
 
-//create unique prefix based on selected users for image files
+//create unique prefix based on selected vtiger_users for image vtiger_files
 $id_hash = '';
 if (isset($ids)) {
 	sort($ids);

Modified: vtigercrm/trunk/modules/Dashboard/Entity_charts.php
==============================================================================
--- vtigercrm/trunk/modules/Dashboard/Entity_charts.php (original)
+++ vtigercrm/trunk/modules/Dashboard/Entity_charts.php Mon Jun 12 14:26:25 2006
@@ -15,9 +15,9 @@
 require_once('include/database/PearDatabase.php');
 require_once('include/utils/CommonUtils.php');
 
-//To get the account names
-
-/* Function to get the Account name for a given account id
+//To get the vtiger_account names
+
+/* Function to get the Account name for a given vtiger_account id
  * Portions created by vtiger are Copyright (C) vtiger.
  * All Rights Reserved.
  * Contributor(s): ______________________________________..
@@ -27,7 +27,7 @@
 {
 	global $adb;
 
-	$acc_qry="select accountname from account where accountid =".$acc_id;
+	$acc_qry="select vtiger_accountname from vtiger_account where vtiger_accountid =".$acc_id;
 	$acc_result=$adb->query($acc_qry);
 	$no_acc_rows=$adb->num_rows($acc_result);
 
@@ -57,7 +57,7 @@
 	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 vtiger_crmentity.smownerid=".$user_id." and vtiger_crmentity.createdtime between '".$date_start."' and '".$end_date."'" ;
 	$query.=$where;
 	if($added_qry!="")
 		$query.=$added_qry;
@@ -117,7 +117,7 @@
 			$mod_cnt_table="<table border=0 cellspacing=1 cellpadding=3><tr>
 				<th>  Status </th>";
 
-			//Assigning the Header values to the table and giving the dates as graphformat 
+			//Assigning the Header values to the vtiger_table and giving the dates as graphformat 
 			for($i=0; $i<$days; $i++)
 			{
 				$tdate=$date_array[$i];
@@ -235,7 +235,7 @@
 					$test_target_val.="K".$link_val;
 			}
 			$mod_cnt_table .="</tr><tr><td class=\"$class\">Total</td>";
-			//For all Days getting the table 
+			//For all Days getting the vtiger_table 
 			for($k=0; $k<$days;$k++)
 			{
 				$tdate=$date_array[$k];

Modified: vtigercrm/trunk/modules/Dashboard/Forms.php
==============================================================================
--- vtigercrm/trunk/modules/Dashboard/Forms.php (original)
+++ vtigercrm/trunk/modules/Dashboard/Forms.php Mon Jun 12 14:26:25 2006
@@ -15,7 +15,7 @@
 /*********************************************************************************
  * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Dashboard/Forms.php,v 1.2 2004/10/06 09:02:05 jack Exp $
  * Description:  Contains a variety of utility functions used to display UI 
- * components such as form headers and footers.  Intended to be modified on a per 
+ * components such as form vtiger_headers and footers.  Intended to be modified on a per 
  * theme basis.
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
  * All Rights Reserved.

Modified: vtigercrm/trunk/modules/Dashboard/ReportsCharts.php
==============================================================================
--- vtigercrm/trunk/modules/Dashboard/ReportsCharts.php (original)
+++ vtigercrm/trunk/modules/Dashboard/ReportsCharts.php Mon Jun 12 14:26:25 2006
@@ -186,7 +186,7 @@
 	{
 		//Getting the cached image
 		$imgMap_fp = fopen($cache_file_name.'.map', "rb");
-		$imgMap = fread($imgMap_fp, filesize($cache_file_name.'.map'));
+		$imgMap = fread($imgMap_fp, vtiger_filesize($cache_file_name.'.map'));
 		fclose($imgMap_fp);
 		$base_name_cache_file=basename($cache_file_name);
 		$ccc="cache/images/".$base_name_cache_file;

Modified: vtigercrm/trunk/modules/Dashboard/display_charts.php
==============================================================================
--- vtigercrm/trunk/modules/Dashboard/display_charts.php (original)
+++ vtigercrm/trunk/modules/Dashboard/display_charts.php Mon Jun 12 14:26:25 2006
@@ -35,35 +35,35 @@
 $user_id=$current_user->id;
 
 // Query for Leads
-$leads_query="select crmentity.crmid,crmentity.createdtime, leaddetails.*, 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 ";
+$leads_query="select vtiger_crmentity.crmid,vtiger_crmentity.createdtime, vtiger_leaddetails.*, vtiger_crmentity.smownerid, vtiger_leadscf.* from vtiger_leaddetails inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_leaddetails.leadid inner join vtiger_leadsubdetails on vtiger_leadsubdetails.leadsubscriptionid=vtiger_leaddetails.leadid inner join vtiger_leadaddress on vtiger_leadaddress.leadaddressid=vtiger_leadsubdetails.leadsubscriptionid inner join vtiger_leadscf on vtiger_leaddetails.leadid = vtiger_leadscf.leadid left join vtiger_leadgrouprelation on vtiger_leadscf.leadid=vtiger_leadgrouprelation.leadid left join vtiger_groups on vtiger_groups.groupname=vtiger_leadgrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_leaddetails.converted=0 ";
 
 
 //Query for Accounts
-$account_query="select crmentity.*, account.*, accountscf.* from account inner join crmentity on crmentity.crmid=account.accountid inner join accountbillads on account.accountid=accountbillads.accountaddressid inner join accountshipads on account.accountid=accountshipads.accountaddressid inner join accountscf on account.accountid = accountscf.accountid left join accountgrouprelation on accountscf.accountid=accountgrouprelation.accountid left join groups on groups.groupname=accountgrouprelation.groupname left join users on users.id=crmentity.smownerid where crmentity.deleted=0 ";
+$account_query="select vtiger_crmentity.*, vtiger_account.*, vtiger_accountscf.* from vtiger_account inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_account.accountid inner join vtiger_accountbillads on vtiger_account.accountid=vtiger_accountbillads.accountaddressid inner join vtiger_accountshipads on vtiger_account.accountid=vtiger_accountshipads.accountaddressid inner join vtiger_accountscf on vtiger_account.accountid = vtiger_accountscf.accountid left join vtiger_accountgrouprelation on vtiger_accountscf.accountid=vtiger_accountgrouprelation.accountid left join vtiger_groups on vtiger_groups.groupname=vtiger_accountgrouprelation.groupname left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_crmentity.deleted=0 ";
 
 
 //Query For Products
-$products_query="select distinct(crmentity.crmid),crmentity.createdtime,products.*, productcf.* from products inner join crmentity on crmentity.crmid=products.productid left join productcf on products.productid = productcf.productid left join seproductsrel on seproductsrel.productid = products.productid where crmentity.deleted=0 ";
+$products_query="select distinct(vtiger_crmentity.crmid),vtiger_crmentity.createdtime,vtiger_products.*, vtiger_productcf.* from vtiger_products inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_products.productid left join vtiger_productcf on vtiger_products.productid = vtiger_productcf.productid left join vtiger_seproductsrel on vtiger_seproductsrel.productid = vtiger_products.productid where vtiger_crmentity.deleted=0 ";
 
 //Query for Potential
-$potential_query= "select  crmentity.*,account.accountname, potential.*, potentialscf.* from potential inner join crmentity on crmentity.crmid=potential.potentialid inner join account on potential.accountid = account.accountid inner join potentialscf on potentialscf.potentialid = 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 crmentity.deleted=0 ";
+$potential_query= "select  vtiger_crmentity.*,vtiger_account.accountname, vtiger_potential.*, vtiger_potentialscf.* from vtiger_potential inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_potential.potentialid inner join vtiger_account on vtiger_potential.accountid = vtiger_account.accountid inner join vtiger_potentialscf on vtiger_potentialscf.potentialid = vtiger_potential.potentialid left join vtiger_potentialgrouprelation on vtiger_potential.potentialid=vtiger_potentialgrouprelation.potentialid left join vtiger_groups on vtiger_groups.groupname=vtiger_potentialgrouprelation.groupname left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_crmentity.deleted=0 ";
 
 //Query for Sales Order
-$so_query="select crmentity.*,salesorder.*,account.accountid,quotes.quoteid from salesorder inner join crmentity on crmentity.crmid=salesorder.salesorderid inner join sobillads on salesorder.salesorderid=sobillads.sobilladdressid inner join soshipads on salesorder.salesorderid=soshipads.soshipaddressid left join salesordercf on salesordercf.salesorderid = 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 left join users on users.id=crmentity.smownerid where crmentity.deleted=0 ";
+$so_query="select vtiger_crmentity.*,vtiger_salesorder.*,vtiger_account.accountid,vtiger_quotes.quoteid from vtiger_salesorder inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_salesorder.salesorderid inner join vtiger_sobillads on vtiger_salesorder.salesorderid=vtiger_sobillads.sobilladdressid inner join vtiger_soshipads on vtiger_salesorder.salesorderid=vtiger_soshipads.soshipaddressid left join vtiger_salesordercf on vtiger_salesordercf.salesorderid = vtiger_salesorder.salesorderid left outer join vtiger_quotes on vtiger_quotes.quoteid=vtiger_salesorder.quoteid left outer join vtiger_account on vtiger_account.accountid=vtiger_salesorder.accountid left join vtiger_sogrouprelation on vtiger_salesorder.salesorderid=vtiger_sogrouprelation.salesorderid left join vtiger_groups on vtiger_groups.groupname=vtiger_sogrouprelation.groupname left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_crmentity.deleted=0 ";
 
 
 //Query for Purchase Order
 
-$po_query="select crmentity.*,purchaseorder.* from purchaseorder inner join crmentity on crmentity.crmid=purchaseorder.purchaseorderid left outer join vendor on purchaseorder.vendorid=vendor.vendorid inner join pobillads on purchaseorder.purchaseorderid=pobillads.pobilladdressid inner join poshipads on purchaseorder.purchaseorderid=poshipads.poshipaddressid left join purchaseordercf on purchaseordercf.purchaseorderid = purchaseorder.purchaseorderid left join pogrouprelation on purchaseorder.purchaseorderid=pogrouprelation.purchaseorderid left join groups on groups.groupname=pogrouprelation.groupname left join users on users.id=crmentity.smownerid where crmentity.deleted=0 ";
+$po_query="select vtiger_crmentity.*,vtiger_purchaseorder.* from vtiger_purchaseorder inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_purchaseorder.purchaseorderid left outer join vtiger_vendor on vtiger_purchaseorder.vendorid=vtiger_vendor.vendorid inner join vtiger_pobillads on vtiger_purchaseorder.purchaseorderid=vtiger_pobillads.pobilladdressid inner join vtiger_poshipads on vtiger_purchaseorder.purchaseorderid=vtiger_poshipads.poshipaddressid left join vtiger_purchaseordercf on vtiger_purchaseordercf.purchaseorderid = vtiger_purchaseorder.purchaseorderid left join vtiger_pogrouprelation on vtiger_purchaseorder.purchaseorderid=vtiger_pogrouprelation.purchaseorderid left join vtiger_groups on vtiger_groups.groupname=vtiger_pogrouprelation.groupname left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_crmentity.deleted=0 ";
 
 // Query for Quotes
-$quotes_query="select crmentity.*,quotes.* from quotes inner join crmentity on crmentity.crmid=quotes.quoteid inner join quotesbillads on quotes.quoteid=quotesbillads.quotebilladdressid inner join quotesshipads on quotes.quoteid=quotesshipads.quoteshipaddressid left join quotescf on quotes.quoteid = quotescf.quoteid left outer join account on account.accountid=quotes.accountid 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 left join users on users.id=crmentity.smownerid where crmentity.deleted=0 ";
+$quotes_query="select vtiger_crmentity.*,vtiger_quotes.* from vtiger_quotes inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_quotes.quoteid inner join vtiger_quotesbillads on vtiger_quotes.quoteid=vtiger_quotesbillads.quotebilladdressid inner join vtiger_quotesshipads on vtiger_quotes.quoteid=vtiger_quotesshipads.quoteshipaddressid left join vtiger_quotescf on vtiger_quotes.quoteid = vtiger_quotescf.quoteid left outer join vtiger_account on vtiger_account.accountid=vtiger_quotes.accountid left outer join vtiger_potential on vtiger_potential.potentialid=vtiger_quotes.potentialid left join vtiger_quotegrouprelation on vtiger_quotes.quoteid=vtiger_quotegrouprelation.quoteid left join vtiger_groups on vtiger_groups.groupname=vtiger_quotegrouprelation.groupname left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_crmentity.deleted=0 ";
 
 //Query for Invoice
-$invoice_query="select crmentity.*,invoice.* from invoice inner join crmentity on crmentity.crmid=invoice.invoiceid inner join invoicebillads on invoice.invoiceid=invoicebillads.invoicebilladdressid inner join invoiceshipads on invoice.invoiceid=invoiceshipads.invoiceshipaddressid left outer join salesorder on salesorder.salesorderid=invoice.salesorderid inner join invoicecf on invoice.invoiceid = invoicecf.invoiceid left join invoicegrouprelation on invoice.invoiceid=invoicegrouprelation.invoiceid left join groups on groups.groupname=invoicegrouprelation.groupname left join users on users.id=crmentity.smownerid where crmentity.deleted=0 ";
+$invoice_query="select vtiger_crmentity.*,vtiger_invoice.* from vtiger_invoice inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_invoice.invoiceid inner join vtiger_invoicebillads on vtiger_invoice.invoiceid=vtiger_invoicebillads.invoicebilladdressid inner join vtiger_invoiceshipads on vtiger_invoice.invoiceid=vtiger_invoiceshipads.invoiceshipaddressid left outer join vtiger_salesorder on vtiger_salesorder.salesorderid=vtiger_invoice.salesorderid inner join vtiger_invoicecf on vtiger_invoice.invoiceid = vtiger_invoicecf.invoiceid left join vtiger_invoicegrouprelation on vtiger_invoice.invoiceid=vtiger_invoicegrouprelation.invoiceid left join vtiger_groups on vtiger_groups.groupname=vtiger_invoicegrouprelation.groupname left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_crmentity.deleted=0 ";
 
 //Query for tickets
-$helpdesk_query=" select troubletickets.status AS ticketstatus, troubletickets.*,crmentity.* from troubletickets inner join ticketcf on ticketcf.ticketid = troubletickets.ticketid inner join crmentity on crmentity.crmid=troubletickets.ticketid left join ticketgrouprelation on troubletickets.ticketid=ticketgrouprelation.ticketid left join groups on groups.groupname=ticketgrouprelation.groupname 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";
+$helpdesk_query=" select vtiger_troubletickets.status AS vtiger_ticketstatus, vtiger_troubletickets.*,vtiger_crmentity.* from vtiger_troubletickets inner join vtiger_ticketcf on vtiger_ticketcf.ticketid = vtiger_troubletickets.ticketid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_troubletickets.ticketid left join vtiger_ticketgrouprelation on vtiger_troubletickets.ticketid=vtiger_ticketgrouprelation.ticketid left join vtiger_groups on vtiger_groups.groupname=vtiger_ticketgrouprelation.groupname left join vtiger_contactdetails on vtiger_troubletickets.parent_id=vtiger_contactdetails.contactid left join vtiger_account on vtiger_account.accountid=vtiger_troubletickets.parent_id left join vtiger_users on vtiger_crmentity.smownerid=vtiger_users.id and vtiger_troubletickets.ticketid = vtiger_ticketcf.ticketid where vtiger_crmentity.deleted=0";
 
  /**  This function returns  the values for the graph, for any type of graph needed	 
         * Portions created by vtiger are Copyright (C) vtiger.
@@ -257,7 +257,7 @@
 	{
 		//Getting the cached image
 		$imgMap_fp = fopen($cache_file_name.'.map', "rb");
-		$imgMap = fread($imgMap_fp, filesize($cache_file_name.'.map'));
+		$imgMap = fread($imgMap_fp, vtiger_filesize($cache_file_name.'.map'));
 		fclose($imgMap_fp);
 		$base_name_cache_file=basename($cache_file_name);
 		$ccc="cache/images/".$base_name_cache_file;
@@ -408,7 +408,7 @@
                             $graph_by="leadsource";
                             $graph_title=$mod_strings['salesbyleadsource'];
                             $module="Potentials";
-                            $where=" and potential.sales_stage like '%Closed Won%' ";
+                            $where=" and vtiger_potential.sales_stage like '%Closed Won%' ";
                             $query=$potential_query;
                             echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
                     }
@@ -418,7 +418,7 @@
                     	$graph_by="accountid";
                          $graph_title=$mod_strings['salesbyaccount'];
                          $module="Potentials";
-                         $where=" and potential.sales_stage like '%Closed Won%' ";
+                         $where=" and vtiger_potential.sales_stage like '%Closed Won%' ";
                          $query=$potential_query;
                          echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
                     }

Modified: vtigercrm/trunk/modules/Dashboard/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Dashboard/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Dashboard/language/en_us.lang.php Mon Jun 12 14:26:25 2006
@@ -22,13 +22,13 @@
  
 $mod_strings = Array(
 'LBL_SALES_STAGE_FORM_TITLE'=>'Pipeline By Sales Stage',
-'LBL_SALES_STAGE_FORM_DESC'=>'Shows cumulative opportunity amounts by selected sales stages for selected users where the expected closed date is within the specificed date range.',
+'LBL_SALES_STAGE_FORM_DESC'=>'Shows cumulative opportunity amounts by selected sales stages for selected vtiger_users where the expected closed date is within the specificed date range.',
 'LBL_MONTH_BY_OUTCOME'=>'Pipeline By Month By Outcome',
-'LBL_MONTH_BY_OUTCOME_DESC'=>'Shows cumulative opportunity amounts by month by outcome for selected users where the expected closed date is within the specificed date range.  Outcome is based on whether the sales stage is Closed Won, Closed Lost or any other value.',
+'LBL_MONTH_BY_OUTCOME_DESC'=>'Shows cumulative opportunity amounts by month by outcome for selected vtiger_users where the expected closed date is within the specificed date range.  Outcome is based on whether the sales stage is Closed Won, Closed Lost or any other value.',
 'LBL_LEAD_SOURCE_FORM_TITLE'=>'All Opportunities By Lead Source',
-'LBL_LEAD_SOURCE_FORM_DESC'=>'Shows cumulative opportunity amounts by selected lead source for selected users.',
+'LBL_LEAD_SOURCE_FORM_DESC'=>'Shows cumulative opportunity amounts by selected lead source for selected vtiger_users.',
 'LBL_LEAD_SOURCE_BY_OUTCOME'=>'All Opportunities By Lead Source By Outcome',
-'LBL_LEAD_SOURCE_BY_OUTCOME_DESC'=>'Shows cumulative opportunity amounts by selected lead source by outcome for selected users where the expected closed date is within the specificed date range.  Outcome is based on whether the sales stage is Closed Won, Closed Lost or any other value.',
+'LBL_LEAD_SOURCE_BY_OUTCOME_DESC'=>'Shows cumulative opportunity amounts by selected lead source by outcome for selected vtiger_users where the expected closed date is within the specificed date range.  Outcome is based on whether the sales stage is Closed Won, Closed Lost or any other value.',
 'LBL_PIPELINE_FORM_TITLE_DESC'=>'Shows cumulative amounts by selected sales stages for your opportunities where the expected closed date is within the specificed date range.',
 'LBL_DATE_RANGE'=>'Date range is',
 'LBL_DATE_RANGE_TO'=>'to',
@@ -51,8 +51,8 @@
 'LBL_DATE_START'=>'Begin Date:',
 'LBL_DATE_END'=>'End Date:',
 //Added for 5.0 
-'LBL_NO_PERMISSION'=>'Your profile doesn\'t allow you view the Graph for this module',
-'LBL_NO_PERMISSION_FIELD'=>'Your profile doesn\'t allow you view the Graph for this module or for the Field',
+'LBL_NO_PERMISSION'=>'Your vtiger_profile doesn\'t allow you view the Graph for this module',
+'LBL_NO_PERMISSION_FIELD'=>'Your vtiger_profile doesn\'t allow you view the Graph for this module or for the Field',
 
 "leadsource" => "Leads By Source",
 "leadstatus" => "Leads By Status",

Modified: vtigercrm/trunk/modules/Emails/Choose.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/Choose.php (original)
+++ vtigercrm/trunk/modules/Emails/Choose.php Mon Jun 12 14:26:25 2006
@@ -16,15 +16,15 @@
 
 if ($pmodule=='Accounts')
 {
-	$querystr="select fieldid,fieldlabel,columnname,tablename from field where tabid=6 and uitype=13;"; 
+	$querystr="select vtiger_fieldid,fieldlabel,columnname,tablename from vtiger_field where vtiger_tabid=6 and uitype=13;"; 
 }
 elseif ($pmodule=='Contacts')
 {
-	$querystr="select fieldid,fieldlabel,columnname from field where tabid=4 and uitype=13;";
+	$querystr="select vtiger_fieldid,fieldlabel,columnname from vtiger_field where vtiger_tabid=4 and uitype=13;";
 }
 elseif ($pmodule=='Leads')
 {
-	$querystr="select fieldid,fieldlabel,columnname from field where tabid=7 and uitype=13;";
+	$querystr="select vtiger_fieldid,fieldlabel,columnname from vtiger_field where vtiger_tabid=7 and uitype=13;";
 }
 
 $result=$adb->query($querystr);

Modified: vtigercrm/trunk/modules/Emails/ChooseEmail.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/ChooseEmail.php (original)
+++ vtigercrm/trunk/modules/Emails/ChooseEmail.php Mon Jun 12 14:26:25 2006
@@ -14,15 +14,15 @@
 
 if ($pmodule=='Accounts')
 {
-	$querystr="select fieldid,fieldlabel,columnname,tablename from field where tabid=6 and uitype=13;"; 
+	$querystr="select vtiger_fieldid,fieldlabel,columnname,tablename from vtiger_field where vtiger_tabid=6 and uitype=13;"; 
 }
 elseif ($pmodule=='Contacts')
 {
-	$querystr="select fieldid,fieldlabel,columnname from field where tabid=4 and uitype=13;";
+	$querystr="select vtiger_fieldid,fieldlabel,columnname from vtiger_field where vtiger_tabid=4 and uitype=13;";
 }
 elseif ($pmodule=='Leads')
 {
-	$querystr="select fieldid,fieldlabel,columnname from field where tabid=7 and uitype=13;";
+	$querystr="select vtiger_fieldid,fieldlabel,columnname from vtiger_field where vtiger_tabid=7 and uitype=13;";
 }
 $result=$adb->query($querystr);
 $numrows = $adb->num_rows($result);

Modified: vtigercrm/trunk/modules/Emails/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/DetailView.php (original)
+++ vtigercrm/trunk/modules/Emails/DetailView.php Mon Jun 12 14:26:25 2006
@@ -42,7 +42,7 @@
 	$focus->retrieve_entity_info($_REQUEST['record'],"Emails");
 	$log->info("Entity info successfully retrieved for DetailView.");
 	$focus->id = $_REQUEST['record'];
-	$query = 'select email_flag,from_email,to_email,cc_email,bcc_email from emaildetails where emailid ='.$focus->id;
+	$query = 'select email_flag,from_email,to_email,cc_email,bcc_email from vtiger_emaildetails where emailid ='.$focus->id;
 	$result = $adb->query($query);
     	$smarty->assign('FROM_MAIL',$adb->query_result($result,0,'from_email'));	
 	$to_email = ereg_replace('###',', ',$adb->query_result($result,0,'to_email'));

Modified: vtigercrm/trunk/modules/Emails/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/EditView.php (original)
+++ vtigercrm/trunk/modules/Emails/EditView.php Mon Jun 12 14:26:25 2006
@@ -61,7 +61,7 @@
 		$focus->mode = '';
 	}else
 	{
-		$query = 'select idlists,from_email,to_email,cc_email,bcc_email from emaildetails where emailid ='.$focus->id;
+		$query = 'select idlists,from_email,to_email,cc_email,bcc_email from vtiger_emaildetails where emailid ='.$focus->id;
 		$result = $adb->query($query);
 		$smarty->assign('FROM_MAIL',$adb->query_result($result,0,'from_email'));	
 		$to_email = ereg_replace('###',',',$adb->query_result($result,0,'to_email'));
@@ -88,15 +88,15 @@
 	$rec_id = $_REQUEST["rec_id"];
 
 	if($rec_type == "record_id") {
-		$rs = $adb->query("select setype from crmentity where crmid='".$rec_id."'");
+		$rs = $adb->query("select setype from vtiger_crmentity where crmid='".$rec_id."'");
 		$type = $adb->query_result($rs,0,'setype');
 
 		if($type == "Leads") 
-			$q = "select email as email1 from leaddetails where leadid='".$rec_id."'";
+			$q = "select email as email1 from vtiger_leaddetails where leadid='".$rec_id."'";
 		elseif ($type == "Contacts")
-			$q = "select email as email1 from contactdetails where contactid='".$rec_id."'";
+			$q = "select email as email1 from vtiger_contactdetails where contactid='".$rec_id."'";
 		elseif ($type == "Accounts")
-			$q = "select email1,email2 from account where accountid='".$rec_id."'";
+			$q = "select email1,email2 from vtiger_account where vtiger_accountid='".$rec_id."'";
 
 		$email1 = $adb->query_result($adb->query($q),0,"email1");
 	} elseif ($rec_type == "email_addy") {
@@ -217,7 +217,7 @@
         $smarty->assign("MODE", $focus->mode);
 }
 
-// Unimplemented until jscalendar language files are fixed
+// Unimplemented until jscalendar language vtiger_files are fixed
 
 $smarty->assign("CALENDAR_LANG", $app_strings['LBL_JSCALENDAR_LANG']);
 $smarty->assign("CALENDAR_DATEFORMAT", parse_calendardate($app_strings['NTC_DATE_FORMAT']));
@@ -252,7 +252,7 @@
 
 if(isset($focus->parent_type) && $focus->parent_type != "") 
 {
-	$change_parent_button = "<input title='".$app_strings['LBL_CHANGE_BUTTON_TITLE']."' tabindex='2' accessKey='".$app_strings['LBL_CHANGE_BUTTON_KEY']."' type='button' class='button' value='".$app_strings['LBL_CHANGE_BUTTON_LABEL']."' name='button' LANGUAGE=javascript onclick='return window.open(\"index.php?module=\"+ document.EditView.parent_type.value + \"&action=Popup&html=Popup_picker&form=TasksEditView\",\"test\",\"width=600,height=400,resizable=1,scrollbars=1\");'>";
+	$change_parent_button = "<input title='".$app_strings['LBL_CHANGE_BUTTON_TITLE']."' vtiger_tabindex='2' accessKey='".$app_strings['LBL_CHANGE_BUTTON_KEY']."' type='button' class='button' value='".$app_strings['LBL_CHANGE_BUTTON_LABEL']."' name='button' LANGUAGE=javascript onclick='return window.open(\"index.php?module=\"+ document.EditView.parent_type.value + \"&action=Popup&html=Popup_picker&form=TasksEditView\",\"test\",\"width=600,height=400,resizable=1,scrollbars=1\");'>";
 	$smarty->assign("CHANGE_PARENT_BUTTON", $change_parent_button);
 }
 

Modified: vtigercrm/trunk/modules/Emails/Email.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/Email.php (original)
+++ vtigercrm/trunk/modules/Emails/Email.php Mon Jun 12 14:26:25 2006
@@ -35,7 +35,7 @@
 	var $log;
 	var $db;
 
-	// Stored fields
+	// Stored vtiger_fields
 	var $id;
 	var $mode;
 
@@ -46,15 +46,15 @@
 	var $time_start;
   	var $module_id="emailid";
 
-	var $rel_users_table = "salesmanactivityrel";
-	var $rel_contacts_table = "cntactivityrel";
-	var $rel_serel_table = "seactivityrel";
+	var $rel_users_table = "vtiger_salesmanactivityrel";
+	var $rel_contacts_table = "vtiger_cntactivityrel";
+	var $rel_serel_table = "vtiger_seactivityrel";
 
 	var $table_name = "activity";
-	var $tab_name = Array('crmentity','activity','seactivityrel','cntactivityrel','attachments');
-        var $tab_name_index = Array('crmentity'=>'crmid','activity'=>'activityid','seactivityrel'=>'activityid','cntactivityrel'=>'activityid','attachments'=>'attachmentsid');
-
-	// This is the list of fields that are in the lists.
+	var $tab_name = Array('vtiger_crmentity','vtiger_activity','vtiger_seactivityrel','vtiger_cntactivityrel','vtiger_attachments');
+        var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_activity'=>'activityid','vtiger_seactivityrel'=>'activityid','vtiger_cntactivityrel'=>'activityid','vtiger_attachments'=>'attachmentsid');
+
+	// This is the list of vtiger_fields that are in the lists.
         var $list_fields = Array(
 				       'Subject'=>Array('activity'=>'subject'),
 				       'Related to'=>Array('seactivityrel'=>'activityid'),
@@ -109,7 +109,7 @@
 		$button = '';
 		$returnset = '&return_module=Emails&return_action=DetailView&return_id='.$id;
 
-		$query = 'select contactdetails.accountid, contactdetails.contactid, contactdetails.firstname,contactdetails.lastname, contactdetails.department, contactdetails.title, contactdetails.email, contactdetails.phone, contactdetails.emailoptout, crmentity.crmid, crmentity.smownerid, crmentity.modifiedtime from contactdetails inner join cntactivityrel on cntactivityrel.contactid=contactdetails.contactid inner join crmentity on crmentity.crmid = contactdetails.contactid left join contactgrouprelation on contactdetails.contactid=contactgrouprelation.contactid left join groups on groups.groupname=contactgrouprelation.groupname where cntactivityrel.activityid='.$adb->quote($id).' and crmentity.deleted=0';
+		$query = 'select vtiger_contactdetails.accountid, vtiger_contactdetails.contactid, vtiger_contactdetails.firstname,vtiger_contactdetails.lastname, vtiger_contactdetails.department, vtiger_contactdetails.title, vtiger_contactdetails.email, vtiger_contactdetails.phone, vtiger_contactdetails.emailoptout, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_contactdetails inner join vtiger_cntactivityrel on vtiger_cntactivityrel.contactid=vtiger_contactdetails.contactid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid left join vtiger_groups on vtiger_groups.groupname=vtiger_contactgrouprelation.groupname where vtiger_cntactivityrel.activityid='.$adb->quote($id).' and vtiger_crmentity.deleted=0';
 		$log->info("Contact Related List for Email is Displayed");
 		$log->debug("Exiting get_contacts method ...");
 		return GetRelatedList('Emails','Contacts',$focus,$query,$button,$returnset);
@@ -154,7 +154,7 @@
 	}	
 	// Mike Crowe Mod --------------------------------------------------------
 
-	/** Returns a list of the associated users
+	/** Returns a list of the associated vtiger_users
 	 * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc..
 	 * All Rights Reserved..
 	 * Contributor(s): ______________________________________..
@@ -169,7 +169,7 @@
 
 		$id = $_REQUEST['record'];
 
-		$query = 'SELECT users.id, users.first_name,users.last_name, users.user_name, users.email1, users.email2, users.yahoo_id, users.phone_home, users.phone_work, users.phone_mobile, users.phone_other, users.phone_fax from users inner join salesmanactivityrel on salesmanactivityrel.smid=users.id and salesmanactivityrel.activityid='.$adb->quote($id);
+		$query = 'SELECT vtiger_users.id, vtiger_users.first_name,vtiger_users.last_name, vtiger_users.user_name, vtiger_users.email1, vtiger_users.email2, vtiger_users.yahoo_id, vtiger_users.phone_home, vtiger_users.phone_work, vtiger_users.phone_mobile, vtiger_users.phone_other, vtiger_users.phone_fax from vtiger_users inner join vtiger_salesmanactivityrel on vtiger_salesmanactivityrel.smid=vtiger_users.id and vtiger_salesmanactivityrel.activityid='.$adb->quote($id);
 		$result=$adb->query($query);   
 
 		$noofrows = $adb->num_rows($result);
@@ -219,35 +219,35 @@
 	}
 
 	/**
-	  * Returns a list of the associated attachments and notes of the Email
+	  * Returns a list of the associated vtiger_attachments and vtiger_notes of the Email
 	  */
 	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,
-			crm2.createdtime, notes.notecontent description, users.user_name
-		from notes
-			inner join senotesrel on senotesrel.notesid= notes.notesid
-			inner join crmentity on crmentity.crmid= senotesrel.crmid
-			inner join crmentity crm2 on crm2.crmid=notes.notesid and crm2.deleted=0
-			left join seattachmentsrel  on seattachmentsrel.crmid =notes.notesid
-			left join attachments on seattachmentsrel.attachmentsid = attachments.attachmentsid
-			inner join users on crm2.smcreatorid= users.id
-		where crmentity.crmid=".$adb->quote($id);
+		$query = "select vtiger_notes.title,'Notes      '  ActivityType, vtiger_notes.filename,
+		vtiger_attachments.type  FileType,crm2.modifiedtime lastmodified,
+		vtiger_seattachmentsrel.attachmentsid vtiger_attachmentsid, vtiger_notes.notesid crmid,
+			crm2.createdtime, vtiger_notes.notecontent description, vtiger_users.user_name
+		from vtiger_notes
+			inner join vtiger_senotesrel on vtiger_senotesrel.notesid= vtiger_notes.notesid
+			inner join vtiger_crmentity on vtiger_crmentity.crmid= vtiger_senotesrel.crmid
+			inner join vtiger_crmentity crm2 on crm2.crmid=vtiger_notes.notesid and crm2.deleted=0
+			left join vtiger_seattachmentsrel  on vtiger_seattachmentsrel.crmid =vtiger_notes.notesid
+			left join vtiger_attachments on vtiger_seattachmentsrel.attachmentsid = vtiger_attachments.attachmentsid
+			inner join vtiger_users on crm2.smcreatorid= vtiger_users.id
+		where vtiger_crmentity.crmid=".$adb->quote($id);
 		$query .= ' union all ';
-		$query .= "select attachments.description title ,'Attachments'  ActivityType,
-			attachments.name filename, attachments.type FileType,crm2.modifiedtime lastmodified,
-			attachments.attachmentsid  attachmentsid,	seattachmentsrel.attachmentsid crmid,
-			crm2.createdtime, attachments.description, users.user_name
-		from attachments
-			inner join seattachmentsrel on seattachmentsrel.attachmentsid= attachments.attachmentsid
-			inner join crmentity on crmentity.crmid= seattachmentsrel.crmid
-			inner join crmentity crm2 on crm2.crmid=attachments.attachmentsid
-			inner join users on crm2.smcreatorid= users.id
-		where crmentity.crmid=".$adb->quote($id);
+		$query .= "select vtiger_attachments.description title ,'Attachments'  ActivityType,
+		vtiger_attachments.name filename, vtiger_attachments.type FileType,crm2.modifiedtime lastmodified,
+		vtiger_attachments.attachmentsid  vtiger_attachmentsid,vtiger_seattachmentsrel.attachmentsid crmid,
+			crm2.createdtime, vtiger_attachments.description, vtiger_users.user_name
+		from vtiger_attachments
+			inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid= vtiger_attachments.attachmentsid
+			inner join vtiger_crmentity on vtiger_crmentity.crmid= vtiger_seattachmentsrel.crmid
+			inner join vtiger_crmentity crm2 on crm2.crmid=vtiger_attachments.attachmentsid
+			inner join vtiger_users on crm2.smcreatorid= vtiger_users.id
+		where vtiger_crmentity.crmid=".$adb->quote($id);
 		
 		$log->info("Notes&Attachments Related List for Email is Displayed");
 		$log->debug("Exiting get_attachments method ...");
@@ -261,7 +261,7 @@
 	{
 		global $log;
 		$log->debug("Entering create_export_query(".$order_by.",".$where.") method ...");
-		$query = 'SELECT activity.activityid, activity.subject, activity.activitytype, attachments.name as filename, crmentity.description as email_content FROM activity inner join crmentity on crmentity.crmid=activity.activityid left join seattachmentsrel on activity.activityid=seattachmentsrel.crmid left join attachments on seattachmentsrel.attachmentsid = attachments.attachmentsid where activity.activitytype="Emails" and crmentity.deleted=0';
+		$query = 'SELECT vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.activitytype, vtiger_attachments.name as filename, vtiger_crmentity.description as email_content FROM vtiger_activity inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_seattachmentsrel on vtiger_activity.activityid=vtiger_seattachmentsrel.crmid left join vtiger_attachments on vtiger_seattachmentsrel.attachmentsid = vtiger_attachments.attachmentsid where vtiger_activity.activitytype="Emails" and vtiger_crmentity.deleted=0';
 
 		$log->debug("Exiting create_export_query method ...");
                 return $query;
@@ -312,7 +312,7 @@
 function get_to_emailids($module)
 {
 	global $adb;
-	$query = 'select columnname,fieldid from field where fieldid in('.ereg_replace(':',',',$_REQUEST["field_lists"]).')';
+	$query = 'select columnname,fieldid from vtiger_field where vtiger_fieldid in('.ereg_replace(':',',',$_REQUEST["field_lists"]).')';
     $result = $adb->query($query);
 	$columns = Array();
 	$idlists = '';
@@ -327,13 +327,13 @@
 	switch($module)
 	{
 		case 'Leads':
-			$query = 'select crmid,concat(lastname," ",firstname) as entityname,'.$columnlists.' from leaddetails inner join crmentity on crmentity.crmid=leaddetails.leadid left join leadscf on leadscf.leadid = leaddetails.leadid where crmentity.deleted=0 and crmentity.crmid in ('.$crmids.')';
+			$query = 'select crmid,concat(lastname," ",firstname) as entityname,'.$columnlists.' from vtiger_leaddetails inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_leaddetails.leadid left join vtiger_leadscf on vtiger_leadscf.leadid = vtiger_leaddetails.leadid where vtiger_crmentity.deleted=0 and vtiger_crmentity.crmid in ('.$crmids.')';
 			break;
 		case 'Contacts':
-			$query = 'select crmid,concat(lastname," ",firstname) as entityname,'.$columnlists.' from contactdetails inner join crmentity on crmentity.crmid=contactdetails.contactid left join contactscf on contactscf.contactid = contactdetails.contactid where crmentity.deleted=0 and crmentity.crmid in ('.$crmids.')';
+			$query = 'select crmid,concat(lastname," ",firstname) as entityname,'.$columnlists.' from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_contactdetails.contactid left join vtiger_contactscf on vtiger_contactscf.contactid = vtiger_contactdetails.contactid where vtiger_crmentity.deleted=0 and vtiger_crmentity.crmid in ('.$crmids.')';
 			break;
 		case 'Accounts':
-			$query = 'select crmid,accountname as entityname,'.$columnlists.' from account inner join crmentity on crmentity.crmid=account.accountid left join accountscf on accountscf.accountid = account.accountid where crmentity.deleted=0 and crmentity.crmid in ('.$crmids.')';
+			$query = 'select crmid,accountname as entityname,'.$columnlists.' from vtiger_account inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_account.accountid left join vtiger_accountscf on vtiger_accountscf.accountid = vtiger_account.accountid where vtiger_crmentity.deleted=0 and vtiger_crmentity.crmid in ('.$crmids.')';
 			break;
 	}	
 	$result = $adb->query($query);

Modified: vtigercrm/trunk/modules/Emails/Forms.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/Forms.php (original)
+++ vtigercrm/trunk/modules/Emails/Forms.php Mon Jun 12 14:26:25 2006
@@ -15,7 +15,7 @@
 /*********************************************************************************
  * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Emails/Forms.php,v 1.4 2005/04/19 16:48:31 ray Exp $
  * Description:  Contains a variety of utility functions used to display UI
- * components such as form headers and footers.  Intended to be modified on a per
+ * components such as form vtiger_headers and footers.  Intended to be modified on a per
  * theme basis.
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
  * All Rights Reserved.
@@ -211,7 +211,7 @@
 }
 
 /**
- * Create HTML form to enter a new record with the minimum necessary fields.
+ * Create HTML form to enter a new record with the minimum necessary vtiger_fields.
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
  * All Rights Reserved.
  * Contributor(s): ______________________________________..
@@ -226,7 +226,7 @@
 	global $adb;//for dynamic quickcreateform construction
 
 
-	// Unimplemented until jscalendar language files are fixed
+	// Unimplemented until jscalendar language vtiger_files are fixed
 	// global $current_language;
 	// global $default_language;
 	// global $cal_codes;
@@ -244,7 +244,7 @@
 	$default_date_start = date('Y-m-d');
 	$default_time_start = date('H:i');
 	$user_id = $current_user->id;
-	// Unimplemented until jscalendar language files are fixed
+	// Unimplemented until jscalendar language vtiger_files are fixed
 	// $cal_lang = (empty($cal_codes[$current_language])) ? $cal_codes[$default_language] : $cal_codes[$current_language];
 	$cal_lang = "en";
 	$cal_dateformat = parse_calendardate($app_strings['NTC_DATE_FORMAT']);
@@ -252,7 +252,7 @@
 	$qcreate_form = get_left_form_header($mod_strings['LBL_NEW_FORM_TITLE']);
 
 
-	$qcreate_get_field="select * from field where tabid=10 and quickcreate=0 order by quickcreatesequence";
+	$qcreate_get_field="select * from vtiger_field where vtiger_tabid=10 and quickcreate=0 order by quickcreatesequence";
 	$qcreate_get_result=$adb->query($qcreate_get_field);
 	$qcreate_get_noofrows=$adb->num_rows($qcreate_get_result);
 
@@ -345,9 +345,9 @@
 inputField : "QCK_date_start", ifFormat : "'.$cal_dateformat.'", showsTime : false, button : "jscal_trigger", singleClick : true, step : 1
 });
 
-		var fieldname = new Array('.$fieldName.')
-		var fieldlabel = new Array('.$fieldLabel.')
-		var fielddatatype = new Array('.$fldDataType.')
+		var vtiger_fieldname = new Array('.$fieldName.')
+		var vtiger_fieldlabel = new Array('.$fieldLabel.')
+		var vtiger_fielddatatype = new Array('.$fldDataType.')
 
 	</script>';
 

Modified: vtigercrm/trunk/modules/Emails/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/ListView.php (original)
+++ vtigercrm/trunk/modules/Emails/ListView.php Mon Jun 12 14:26:25 2006
@@ -88,14 +88,14 @@
 $display_title = $mod_strings['LBL_LIST_FORM_TITLE'];
 if($email_title)$display_title = $email_title;
 
-//to get the search field if exists
+//to get the search vtiger_field if exists
 if(isset($_REQUEST['search']) && $_REQUEST['search'] != '' && $_REQUEST['search_text'] != '')
 {
 	$url_string .= "&search=".$_REQUEST['search']."&search_field=".$_REQUEST['search_field']."&search_text=".$_REQUEST['search_text'];
 	if($_REQUEST['search_field'] != 'join')
 		$where = $_REQUEST['search_field']." like '%".$_REQUEST['search_text']."%'";	
 	else
-		$where = "(subject like '%".$_REQUEST['search_text']."%' OR users.user_name like '%".$_REQUEST['search_text']."%')";	
+		$where = "(subject like '%".$_REQUEST['search_text']."%' OR vtiger_users.user_name like '%".$_REQUEST['search_text']."%')";	
 }
 
 
@@ -118,23 +118,23 @@
 }
 if($_REQUEST['folderid'] =='2')
 {
-	$list_query .= "AND seactivityrel.crmid in (select contactid from contactdetails) AND emaildetails.email_flag !='WEBMAIL'";
+	$list_query .= "AND vtiger_seactivityrel.crmid in (select contactid from vtiger_contactdetails) AND vtiger_emaildetails.email_flag !='WEBMAIL'";
 }
 if($_REQUEST['folderid'] =='3')
 {
-	$list_query .= "AND seactivityrel.crmid in (select accountid from account)";	
+	$list_query .= "AND vtiger_seactivityrel.crmid in (select vtiger_accountid from vtiger_account)";	
 }
 if($_REQUEST['folderid'] =='4')
 {
-	$list_query .= "AND seactivityrel.crmid in (select leadid from leaddetails)";	
+	$list_query .= "AND vtiger_seactivityrel.crmid in (select leadid from vtiger_leaddetails)";	
 }
 if($_REQUEST['folderid'] =='5')
 {
-	$list_query .= "AND salesmanactivityrel.smid in (select id from users)";	
+	$list_query .= "AND vtiger_salesmanactivityrel.smid in (select id from vtiger_users)";	
 }
 if($_REQUEST['folderid'] =='6')
 {
-	$list_query .= "AND emaildetails.email_flag ='WEBMAIL'";	
+	$list_query .= "AND vtiger_emaildetails.email_flag ='WEBMAIL'";	
 }
 if(isset($order_by) && $order_by != '')
 {

Modified: vtigercrm/trunk/modules/Emails/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/Save.php (original)
+++ vtigercrm/trunk/modules/Emails/Save.php Mon Jun 12 14:26:25 2006
@@ -21,11 +21,11 @@
  * Contributor(s): ______________________________________..
  ********************************************************************************/
 
-//Added on 09-11-2005 to avoid loading the webmail files in Email process
+//Added on 09-11-2005 to avoid loading the webmail vtiger_files in Email process
 if($_REQUEST['smodule'] != '')
 {
 	define('SM_PATH','modules/squirrelmail-1.4.4/');
-	/* SquirrelMail required files. */
+	/* SquirrelMail required vtiger_files. */
 	require_once(SM_PATH . 'functions/strings.php');
 	require_once(SM_PATH . 'functions/imap_general.php');
 	require_once(SM_PATH . 'functions/imap_messages.php');
@@ -130,7 +130,7 @@
 	global $log;
 	$log->debug("Entering checkIfContactExists(".$mailid.") method ...");
 	global $adb;
-	$sql = "select contactid from contactdetails inner join crmentity on crmentity.crmid=contactdetails.contactid where crmentity.deleted=0 and email= ".$adb->quote($mailid);
+	$sql = "select contactid from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_contactdetails.contactid where vtiger_crmentity.deleted=0 and email= ".$adb->quote($mailid);
 	$result = $adb->query($sql);
 	$numRows = $adb->num_rows($result);
 	if($numRows > 0)
@@ -153,10 +153,10 @@
 $focus->column_fields["date_start"]= date('Y-m-d');
 $focus->save("Emails");
 
-//saving the email details in emaildetails table
+//saving the email details in vtiger_emaildetails vtiger_table
 $return_id = $focus->id;
 $email_id = $return_id;
-$query = 'select emailid from emaildetails where emailid ='.$email_id;
+$query = 'select emailid from vtiger_emaildetails where emailid ='.$email_id;
 $result = $adb->query($query);
 if(isset($_REQUEST["hidden_toid"]) && $_REQUEST["hidden_toid"]!='')
 	$all_to_ids = ereg_replace(",","###",$_REQUEST["hidden_toid"]);
@@ -167,10 +167,10 @@
 $all_bcc_ids = ereg_replace(",","###",$_REQUEST["bccmail"]);
 if($adb->num_rows($result) > 0)
 {
-	$query = 'update emaildetails set to_email="'.$all_to_ids.'",cc_email="'.$all_cc_ids.'",bcc_email="'.$all_bcc_ids.'",idlists="'.$_REQUEST["parent_id"].'",email_flag="SAVED" where emailid = '.$email_id;
+	$query = 'update vtiger_emaildetails set to_email="'.$all_to_ids.'",cc_email="'.$all_cc_ids.'",bcc_email="'.$all_bcc_ids.'",idlists="'.$_REQUEST["parent_id"].'",email_flag="SAVED" where emailid = '.$email_id;
 }else
 {
-	$query = 'insert into emaildetails values ('.$email_id.',"","'.$all_to_ids.'","'.$all_cc_ids.'","'.$all_bcc_ids.'","","'.$_REQUEST["parent_id"].'","SAVED")';
+	$query = 'insert into vtiger_emaildetails values ('.$email_id.',"","'.$all_to_ids.'","'.$all_cc_ids.'","'.$all_bcc_ids.'","","'.$_REQUEST["parent_id"].'","SAVED")';
 }
 $adb->query($query);
 

Modified: vtigercrm/trunk/modules/Emails/class.phpmailer.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/class.phpmailer.php (original)
+++ vtigercrm/trunk/modules/Emails/class.phpmailer.php Mon Jun 12 14:26:25 2006
@@ -24,7 +24,7 @@
     /////////////////////////////////////////////////
 
     /**
-     * Email priority (1 = High, 3 = Normal, 5 = low).
+     * Email vtiger_priority (1 = High, 3 = Normal, 5 = low).
      * @var int
      */
     var $Priority          = 3;
@@ -134,7 +134,7 @@
     var $ConfirmReadingTo  = "";
 
     /**
-     *  Sets the hostname to use in Message-Id and Received headers
+     *  Sets the hostname to use in Message-Id and Received vtiger_headers
      *  and as default HELO string. If empty, the value returned
      *  by SERVER_NAME is used or 'localhost.localdomain'.
      *  @var string
@@ -613,7 +613,7 @@
     /////////////////////////////////////////////////
 
     /**
-     * Creates recipient headers.  
+     * Creates recipient vtiger_headers.  
      * @access private
      * @return string
      */
@@ -805,7 +805,7 @@
                        "<" . trim($this->ConfirmReadingTo) . ">");
         }
 
-        // Add custom headers
+        // Add custom vtiger_headers
         for($index = 0; $index < count($this->CustomHeader); $index++)
         {
             $result .= $this->HeaderLine(trim($this->CustomHeader[$index][0]), 
@@ -984,7 +984,7 @@
     /////////////////////////////////////////////////
 
     /**
-     * Adds an attachment from a path on the filesystem.
+     * Adds an attachment from a path on the vtiger_filesystem.
      * Returns false if the file could not be found
      * or accessed.
      * @param string $path Path to the attachment.
@@ -1019,7 +1019,7 @@
     }
 
     /**
-     * Attaches all fs, string, and binary attachments to the message.
+     * Attaches all fs, string, and binary vtiger_attachments to the message.
      * Returns an empty string on failure.
      * @access private
      * @return string
@@ -1028,7 +1028,7 @@
         // Return text of body
         $mime = array();
 
-        // Add all attachments
+        // Add all vtiger_attachments
         for($i = 0; $i < count($this->attachment); $i++)
         {
             // Check for string attachment
@@ -1089,7 +1089,7 @@
         }
         $magic_quotes = get_magic_quotes_runtime();
         set_magic_quotes_runtime(0);
-        $file_buffer = fread($fd, filesize($path));
+        $file_buffer = fread($fd, vtiger_filesize($path));
         $file_buffer = $this->EncodeString($file_buffer, $encoding);
         fclose($fd);
         set_magic_quotes_runtime($magic_quotes);
@@ -1195,7 +1195,7 @@
         // Replace every high ascii, control and = characters
         $encoded = preg_replace('/([\000-\010\013\014\016-\037\075\177-\377])/e',
                   "'='.sprintf('%02X', ord('\\1'))", $encoded);
-        // Replace every spaces and tabs when it's the last character on a line
+        // Replace every spaces and vtiger_tabs when it's the last character on a line
         $encoded = preg_replace("/([\011\040])".$this->LE."/e",
                   "'='.sprintf('%02X', ord('\\1')).'".$this->LE."'", $encoded);
 
@@ -1365,8 +1365,8 @@
     }
 
     /**
-     * Clears all previously set filesystem, string, and binary
-     * attachments.  Returns void.
+     * Clears all previously set vtiger_filesystem, string, and binary
+     * vtiger_attachments.  Returns void.
      * @return void
      */
     function ClearAttachments() {
@@ -1374,7 +1374,7 @@
     }
 
     /**
-     * Clears all custom headers.  Returns void.
+     * Clears all custom vtiger_headers.  Returns void.
      * @return void
      */
     function ClearCustomHeaders() {

Modified: vtigercrm/trunk/modules/Emails/class.smtp.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/class.smtp.php (original)
+++ vtigercrm/trunk/modules/Emails/class.smtp.php Mon Jun 12 14:26:25 2006
@@ -126,7 +126,7 @@
         if(substr(PHP_OS, 0, 3) != "WIN")
            socket_set_timeout($this->smtp_conn, $tval, 0);
 
-        # get any announcement stuff
+        # get any vtiger_announcement stuff
         $announce = $this->get_lines();
 
         # set the timeout  of any socket functions at 1/10 of a second
@@ -252,8 +252,8 @@
     /**
      * Issues a data command and sends the msg_data to the server
      * finializing the mail transaction. $msg_data is the message
-     * that is to be send with the headers. Each header needs to be
-     * on a single line followed by a <CRLF> with the message headers
+     * that is to be send with the vtiger_headers. Each header needs to be
+     * on a single line followed by a <CRLF> with the message vtiger_headers
      * and the message body being seperated by and additional <CRLF>.
      *
      * Implements rfc 821: DATA <CRLF>
@@ -313,13 +313,13 @@
         $msg_data = str_replace("\r","\n",$msg_data);
         $lines = explode("\n",$msg_data);
 
-        # we need to find a good way to determine is headers are
+        # we need to find a good way to determine is vtiger_headers are
         # in the msg_data or if it is a straight msg body
-        # currently I'm assuming rfc 822 definitions of msg headers
-        # and if the first field of the first line (':' sperated)
+        # currently I'm assuming rfc 822 definitions of msg vtiger_headers
+        # and if the first vtiger_field of the first line (':' sperated)
         # does not contain a space then it _should_ be a header
         # and we can process all lines before a blank "" line as
-        # headers.
+        # vtiger_headers.
         $field = substr($lines[0],0,strpos($lines[0],":"));
         $in_headers = false;
         if(!empty($field) && !strstr($field," ")) {
@@ -345,9 +345,9 @@
 
                 $lines_out[] = substr($line,0,$pos);
                 $line = substr($line,$pos + 1);
-                # if we are processing headers we need to
+                # if we are processing vtiger_headers we need to
                 # add a LWSP-char to the front of the new line
-                # rfc 822 on long msg headers
+                # rfc 822 on long msg vtiger_headers
                 if($in_headers) {
                     $line = "\t" . $line;
                 }
@@ -805,7 +805,7 @@
      * $from. Returns true if successful or false otherwise. If True
      * the mail transaction is started and then one or more Recipient
      * commands may be called followed by a Data command. This command
-     * will send the message to the users terminal if they are logged
+     * will send the message to the vtiger_users terminal if they are logged
      * in.
      *
      * Implements rfc 821: SEND <SP> FROM:<reverse-path> <CRLF>
@@ -853,7 +853,7 @@
      * $from. Returns true if successful or false otherwise. If True
      * the mail transaction is started and then one or more Recipient
      * commands may be called followed by a Data command. This command
-     * will send the message to the users terminal if they are logged
+     * will send the message to the vtiger_users terminal if they are logged
      * in and send them an email.
      *
      * Implements rfc 821: SAML <SP> FROM:<reverse-path> <CRLF>
@@ -901,7 +901,7 @@
      * $from. Returns true if successful or false otherwise. If True
      * the mail transaction is started and then one or more Recipient
      * commands may be called followed by a Data command. This command
-     * will send the message to the users terminal if they are logged
+     * will send the message to the vtiger_users terminal if they are logged
      * in or mail it to them if they are not.
      *
      * Implements rfc 821: SOML <SP> FROM:<reverse-path> <CRLF>

Modified: vtigercrm/trunk/modules/Emails/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Emails/language/en_us.lang.php Mon Jun 12 14:26:25 2006
@@ -33,7 +33,7 @@
 'LBL_LIST_DATE'=>'Date Sent',
 'LBL_LIST_TIME'=>'Time Sent',
 
-'ERR_DELETE_RECORD'=>"A record number must be specified to delete the account.",
+'ERR_DELETE_RECORD'=>"A record number must be specified to delete the vtiger_account.",
 'LBL_DATE_SENT'=>'Date Sent:',
 'LBL_SUBJECT'=>'Subject :',
 'LBL_BODY'=>'Body:',
@@ -99,7 +99,7 @@
 'LBL_NEW_ACCOUNT'=>'New Account',
 'LBL_ACCOUNT_TITLE'=>'Accounts',
 
-// Added fields after vtiger4 - Beta
+// Added vtiger_fields after vtiger4 - Beta
 'LBL_USER_TITLE'=>'Users',
 'LBL_NEW_USER'=>'New User',
 

Modified: vtigercrm/trunk/modules/Emails/mail.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/mail.php (original)
+++ vtigercrm/trunk/modules/Emails/mail.php Mon Jun 12 14:26:25 2006
@@ -16,13 +16,13 @@
   *   $module 		-- current module 
   *   $to_email 	-- to email address 
   *   $from_name	-- currently loggedin user name
-  *   $from_email	-- currently loggedin users's email id. you can give as '' if you are not in HelpDesk module
+  *   $from_email	-- currently loggedin vtiger_users's email id. you can give as '' if you are not in HelpDesk module
   *   $subject		-- subject of the email you want to send
   *   $contents		-- body of the email you want to send
   *   $cc		-- add email ids with comma seperated. - optional 
   *   $bcc		-- add email ids with comma seperated. - optional.
-  *   $attachment	-- whether we want to attach the currently selected file or all files.[values = current,all] - optional
-  *   $emailid		-- id of the email object which will be used to get the attachments
+  *   $attachment	-- whether we want to attach the currently selected file or all vtiger_files.[values = current,all] - optional
+  *   $emailid		-- id of the email object which will be used to get the vtiger_attachments
   */
 function send_mail($module,$to_email,$from_name,$from_email,$subject,$contents,$cc='',$bcc='',$attachment='',$emailid='')
 {
@@ -35,7 +35,7 @@
 
 	$adb->println("To id => '".$to_email."'\nSubject ==>'".$subject."'\nContents ==> '".$contents."'");
 
-	//Get the email id of assigned_to user -- pass the value and name, name must be "user_name" or "id"(field names of users table)
+	//Get the email id of assigned_to user -- pass the value and name, name must be "user_name" or "id"(field names of vtiger_users vtiger_table)
 	//$to_email = getUserEmailId('id',$assigned_user_id);
 
 	//if module is HelpDesk then from_email will come based on support email id 
@@ -65,7 +65,7 @@
 }
 
 /**	Function to get the user Email id based on column name and column value
-  *	$name -- column name of the users table 
+  *	$name -- column name of the vtiger_users vtiger_table 
   *	$val  -- column value 
   */
 function getUserEmailId($name,$val)
@@ -74,9 +74,9 @@
 	$adb->println("Inside the function getUserEmailId. --- ".$name." = '".$val."'");
 	if($val != '')
 	{
-		//$sql = "select email1, email2, yahoo_id from users where ".$name." = '".$val."'";
+		//$sql = "select email1, email2, yahoo_id from vtiger_users where ".$name." = '".$val."'";
 		//done to resolve the PHP5 specific behaviour
-		$sql = "select email1, email2, yahoo_id from users where ".$name." = ".$adb->quote($val);
+		$sql = "select email1, email2, yahoo_id from vtiger_users where ".$name." = ".$adb->quote($val);
 		$res = $adb->query($sql);
 		$email = $adb->query_result($res,0,'email1');
 		if($email == '')
@@ -106,7 +106,7 @@
 	global $adb;
 	$adb->println("Inside the function addSignature");
 
-	$sign = $adb->query_result($adb->query("select signature from users where user_name=".$adb->quote($fromname)),0,"signature");
+	$sign = $adb->query_result($adb->query("select signature from vtiger_users where user_name=".$adb->quote($fromname)),0,"signature");
 	if($sign != '')
 	{
 		$contents .= '<br><br><font color=darkgrey>'.$sign.'</font>';
@@ -127,9 +127,9 @@
   *	$from_name	-- from name which will be displayed in the mail
   *	$to_email 	-- to email address  -- This can be an email in a single string, a comma separated
   *			   list of emails or an array of email addresses
-  *	$attachment	-- whether we want to attach the currently selected file or all files.
+  *	$attachment	-- whether we want to attach the currently selected file or all vtiger_files.
   				[values = current,all] - optional
-  *	$emailid	-- id of the email object which will be used to get the attachments - optional
+  *	$emailid	-- id of the email object which will be used to get the vtiger_attachments - optional
   */
 function setMailerProperties($mail,$subject,$contents,$from_email,$from_name,$to_email,$attachment='',$emailid='')
 {
@@ -147,7 +147,7 @@
 
 	//Handle the from name and email for HelpDesk
 	$mail->From = $from_email;
-	$rs = $adb->query("select first_name,last_name from users where user_name='".$from_name."'");
+	$rs = $adb->query("select first_name,last_name from vtiger_users where user_name='".$from_name."'");
 	if($adb->num_rows($rs) > 0)
 		$from_name = $adb->query_result($rs,0,"first_name")." ".$adb->query_result($rs,0,"last_name");
 
@@ -176,7 +176,7 @@
 		addAttachment(&$mail,$_FILES['filename']['name'],$emailid);
 	}
 
-	//This will add all the files which are related to this record or email
+	//This will add all the vtiger_files which are related to this record or email
 	if($attachment == 'all')
 	{
 		addAllAttachments(&$mail,$emailid);
@@ -197,7 +197,7 @@
 	global $adb;
 	$adb->println("Inside the function setMailServerProperties");
 
-	$res = $adb->query("select * from systems where server_type='email'");
+	$res = $adb->query("select * from vtiger_systems where server_type='email'");
 	$server = $adb->query_result($res,0,'server');
         $username = $adb->query_result($res,0,'server_username');
         $password = $adb->query_result($res,0,'server_password');
@@ -231,17 +231,17 @@
         }
 }
 
-/**     Function to add all the files as attachment with the mail object
+/**     Function to add all the vtiger_files as attachment with the mail object
   *     $mail -- reference of the mail object
-  *     $record -- email id ie., record id which is used to get the all attachments from database
+  *     $record -- email id ie., record id which is used to get the all vtiger_attachments from database
   */
 function addAllAttachments($mail,$record)
 {
 	global $adb, $root_directory;
         $adb->println("Inside the function addAllAttachments");
 
-	//Retrieve the files from database where avoid the file which has been currently selected
-	$sql = "select attachments.* from attachments inner join seattachmentsrel on attachments.attachmentsid = seattachmentsrel.attachmentsid inner join crmentity on crmentity.crmid = attachments.attachmentsid where crmentity.deleted=0 and seattachmentsrel.crmid=".$record;
+	//Retrieve the vtiger_files from database where avoid the file which has been currently selected
+	$sql = "select vtiger_attachments.* from vtiger_attachments inner join vtiger_seattachmentsrel on vtiger_attachments.attachmentsid = vtiger_seattachmentsrel.attachmentsid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_attachments.attachmentsid where vtiger_crmentity.deleted=0 and vtiger_seattachmentsrel.crmid=".$record;
 	$res = $adb->query($sql);
 	$count = $adb->num_rows($res);
 
@@ -316,7 +316,7 @@
 
 /**	Function to get the Parent email id from HelpDesk to send the details about the ticket via email
   *	$returnmodule -- Parent module value. Contact or Account for send email about the ticket details
-  *	$parentid -- id of the parent ie., contact or account
+  *	$parentid -- id of the parent ie., contact or vtiger_account
   */
 function getParentMailId($parentmodule,$parentid)
 {
@@ -325,14 +325,14 @@
 
         if($parentmodule == 'Contacts')
         {
-                $tablename = 'contactdetails';
+                $tablename = 'vtiger_contactdetails';
                 $idname = 'contactid';
 		$first_email = 'email';
 		$second_email = 'yahooid';
         }
         if($parentmodule == 'Accounts')
         {
-                $tablename = 'account';
+                $tablename = 'vtiger_account';
                 $idname = 'accountid';
 		$first_email = 'email1';
 		$second_email = 'email2';
@@ -451,7 +451,7 @@
 			}
 			elseif($status_str[1] == '0')
 			{
-				$adb->println("first elseif part - status will be 0 which is the case of assigned to users's email is empty.");
+				$adb->println("first elseif part - status will be 0 which is the case of assigned to vtiger_users's email is empty.");
 				$errorstr .= '<br><b><font color=red> Mail could not be sent to the assigned to user. Please check the assigned to user email id...</font></b>';
 				//Added to display the message about the CC && BCC mail sending status
 				if($status_str[0] == 'cc_success')

Modified: vtigercrm/trunk/modules/Emails/mailSelect.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/mailSelect.php (original)
+++ vtigercrm/trunk/modules/Emails/mailSelect.php Mon Jun 12 14:26:25 2006
@@ -24,15 +24,15 @@
 $smarty = new vtigerCRM_Smarty;
 if ($pmodule=='Accounts')
 {
-	$querystr="select fieldid,fieldlabel,columnname,tablename from field where tabid=6 and uitype=13;"; 
+	$querystr="select vtiger_fieldid,fieldlabel,columnname,tablename from vtiger_field where vtiger_tabid=6 and uitype=13;"; 
 }
 elseif ($pmodule=='Contacts')
 {
-	$querystr="select fieldid,fieldlabel,columnname from field where tabid=4 and uitype=13;";
+	$querystr="select vtiger_fieldid,fieldlabel,columnname from vtiger_field where vtiger_tabid=4 and uitype=13;";
 }
 elseif ($pmodule=='Leads')
 {
-	$querystr="select fieldid,fieldlabel,columnname from field where tabid=7 and uitype=13;";
+	$querystr="select vtiger_fieldid,fieldlabel,columnname from vtiger_field where vtiger_tabid=7 and uitype=13;";
 }
 $result=$adb->query($querystr);
 $numrows = $adb->num_rows($result);

Modified: vtigercrm/trunk/modules/Emails/mailbox.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/mailbox.php (original)
+++ vtigercrm/trunk/modules/Emails/mailbox.php Mon Jun 12 14:26:25 2006
@@ -73,7 +73,7 @@
 	      
 	   function handleFile(nr) {
 	   	if (b != "ie") {
- 	      		alert("This feature is currently only available for Microsoft Internet Explorer 5.5+ users\n\nWait for an update!");
+ 	      		alert("This feature is currently only available for Microsoft Internet Explorer 5.5+ vtiger_users\n\nWait for an update!");
 	   	} else {
 	   		check = confirm("Do you want to download the file ?");
 			if (check) {

Modified: vtigercrm/trunk/modules/Emails/mailsend.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/mailsend.php (original)
+++ vtigercrm/trunk/modules/Emails/mailsend.php Mon Jun 12 14:26:25 2006
@@ -35,7 +35,7 @@
 	$grp_obj = new GetGroupUsers();
 	$grp_obj->getAllUsersInGroup(getGrpId($_REQUEST['assigned_group_name']));
 	$users_list = constructList($grp_obj->group_users,'INTEGER');
-	$sql = "select first_name, last_name, email1, email2, yahoo_id from users where id in ".$users_list;
+	$sql = "select first_name, last_name, email1, email2, yahoo_id from vtiger_users where id in ".$users_list;
 	$res = $adb->query($sql);
 	$user_email = '';
 	while ($user_info = $adb->fetch_array($res))
@@ -73,7 +73,7 @@
 {
 	$mail_status = send_mail('Emails',$to_email,$current_user->user_name,'',$_REQUEST['subject'],$_REQUEST['description'],$cc,$bcc,'all',$focus->id);
 	
-	$query = 'update emaildetails set email_flag ="SENT" where emailid='.$focus->id;
+	$query = 'update vtiger_emaildetails set email_flag ="SENT" where emailid='.$focus->id;
 	$adb->query($query);
 	//set the errorheader1 to 1 if the mail has not been sent to the assigned to user
 	if($mail_status != 1)//when mail send fails
@@ -105,8 +105,8 @@
 	$mycrmid=$realid[0];
 	if($realid[1] == -1)
 	{
-		//handle the mail send to users
-		$emailadd = $adb->query_result($adb->query("select email1 from users where id=$mycrmid"),0,'email1');
+		//handle the mail send to vtiger_users
+		$emailadd = $adb->query_result($adb->query("select email1 from vtiger_users where id=$mycrmid"),0,'email1');
 		$pmodule = 'Users';
 		$description = getMergedDescription($focus->column_fields['description'],$mycrmid,$pmodule);
 		$mail_status = send_mail('Emails',$emailadd,$current_user->user_name,'',$focus->column_fields['subject'],$description,'','','all',$focus->id);
@@ -115,12 +115,12 @@
 	}
 	else
 	{
-		//Send mail to account or lead or contact based on their ids
+		//Send mail to vtiger_account or lead or contact based on their ids
 		$pmodule=getSalesEntityType($mycrmid);
 		for ($j=1;$j<$nemail;$j++)
 		{
 			$temp=$realid[$j];
-			$myquery='Select columnname from field where fieldid='.$adb->quote($temp);
+			$myquery='Select columnname from vtiger_field where vtiger_fieldid='.$adb->quote($temp);
 			$fresult=$adb->query($myquery);			
 			if ($pmodule=='Contacts')
 			{
@@ -180,7 +180,7 @@
 {
 	global $adb;
 	$date_var = date('Ymd');
-	$query = 'update activity set date_start ='.$date_var.' where activityid = '.$returnid;
+	$query = 'update vtiger_activity set date_start ='.$date_var.' where vtiger_activityid = '.$returnid;
 	$adb->query($query);
 }
 //The following function call is used to parse and form a encoded error message and then pass to result page

Modified: vtigercrm/trunk/modules/Emails/sendmail.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/sendmail.php (original)
+++ vtigercrm/trunk/modules/Emails/sendmail.php Mon Jun 12 14:26:25 2006
@@ -38,12 +38,12 @@
 	
 	$noofrows = $adb->num_rows($result);
 
-	$dbQuery = 'select attachments.*, activity.subject, crmentity.description  from activity inner join crmentity on crmentity.crmid = activity.activityid left join seattachmentsrel on seattachmentsrel.crmid = activity.activityid left join attachments on seattachmentsrel.attachmentsid = attachments.attachmentsid where crmentity.crmid = '.$adb->quote($_REQUEST['return_id']);
+	$dbQuery = 'select vtiger_attachments.*, vtiger_activity.subject, vtiger_crmentity.description  from vtiger_activity inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_activity.activityid left join vtiger_seattachmentsrel on vtiger_seattachmentsrel.crmid = vtiger_activity.activityid left join vtiger_attachments on vtiger_seattachmentsrel.attachmentsid = vtiger_attachments.attachmentsid where vtiger_crmentity.crmid = '.$adb->quote($_REQUEST['return_id']);
 
         $result1 = $adb->query($dbQuery) or die("Couldn't get file list");
 	$temparray = $adb->fetch_array($result1);
 
-	$notequery = 'select  attachments.*, notes.notesid, notes.filename,notes.notecontent  from notes inner join senotesrel on senotesrel.notesid= notes.notesid inner join crmentity on crmentity.crmid= senotesrel.crmid left join seattachmentsrel  on seattachmentsrel.crmid =notes.notesid left join attachments on seattachmentsrel.attachmentsid = attachments.attachmentsid where crmentity.crmid='.$adb->quote($_REQUEST['return_id']);
+	$notequery = 'select  vtiger_attachments.*, vtiger_notes.notesid, vtiger_notes.filename,vtiger_notes.notecontent  from vtiger_notes inner join vtiger_senotesrel on vtiger_senotesrel.notesid= vtiger_notes.notesid inner join vtiger_crmentity on vtiger_crmentity.crmid= vtiger_senotesrel.crmid left join vtiger_seattachmentsrel  on vtiger_seattachmentsrel.crmid =vtiger_notes.notesid left join vtiger_attachments on vtiger_seattachmentsrel.attachmentsid = vtiger_attachments.attachmentsid where vtiger_crmentity.crmid='.$adb->quote($_REQUEST['return_id']);
 	$result2 = $adb->query($notequery) or die("Couldn't get file list");
 
 	$mail = new PHPMailer();
@@ -52,7 +52,7 @@
 
 	$DESCRIPTION = $adb->query_result($result1,0,"description");
 	$DESCRIPTION .= '<br><br>';
-	$DESCRIPTION .= '<font color=darkgrey>'.nl2br($adb->query_result($adb->query("select * from users where user_name=".$adb->quote($from)),0,"signature")).'</font>';
+	$DESCRIPTION .= '<font color=darkgrey>'.nl2br($adb->query_result($adb->query("select * from vtiger_users where user_name=".$adb->quote($from)),0,"signature")).'</font>';
 
         $mail->Body    = nl2br($DESCRIPTION);
 	$initialfrom = $from;
@@ -60,7 +60,7 @@
 
 	if($mail_server=='')
 	{
-	        $mailserverresult = $adb->query("select * from systems where server_type = 'email'");
+	        $mailserverresult = $adb->query("select * from vtiger_systems where server_type = 'email'");
         	$mail_server = $adb->query_result($mailserverresult,0,'server');
 		$mail_server_username = $adb->query_result($mailserverresult,0,'server_username');
                 $mail_server_password = $adb->query_result($mailserverresult,0,'server_password');
@@ -73,9 +73,9 @@
 	$mail->SMTPAuth = $smtp_auth;
 	$mail->Username = $mail_server_username;
 	$mail->Password = $mail_server_password;
-	//$mail->From = $adb->query_result($adb->query("select * from users where user_name='".$from."'"),0,"email1");
-
-	$mail->From = $adb->query_result($adb->query("select * from users where user_name=".$adb->quote($from)),0,"email1");
+	//$mail->From = $adb->query_result($adb->query("select * from vtiger_users where user_name='".$from."'"),0,"email1");
+
+	$mail->From = $adb->query_result($adb->query("select * from vtiger_users where user_name=".$adb->quote($from)),0,"email1");
 	$mail->FromName = $initialfrom;
 	$mail->AddReplyTo($from);
 	$mail->WordWrap = 50;
@@ -93,7 +93,7 @@
 		if(!@fwrite($handle,base64_decode($fileContent),$filesize)){}
 		if(!@fclose($handle)){}
 
-		$mail->AddAttachment($root_directory."/test/upload/".$filename);//temparray['filename']) // add attachments
+		$mail->AddAttachment($root_directory."/test/upload/".$filename);//temparray['filename']) // add vtiger_attachments
 		$log->info("File '".$filename."' is attached with the mail.");
 	}
 
@@ -108,7 +108,7 @@
 		if(!@fwrite($handle,base64_decode($fileContent),$filesize)){}
 		if(!@fclose($handle)){}
 
-		$mail->AddAttachment($root_directory."/test/upload/".$filename);//temparray['filename']) // add attachments
+		$mail->AddAttachment($root_directory."/test/upload/".$filename);//temparray['filename']) // add vtiger_attachments
 		$log->info("File '".$filename."' is attached with the mail.");
 	}
 

Modified: vtigercrm/trunk/modules/Emails/updateRelations.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/updateRelations.php (original)
+++ vtigercrm/trunk/modules/Emails/updateRelations.php Mon Jun 12 14:26:25 2006
@@ -24,7 +24,7 @@
 		if($id != '')
 		{
 			$record = $_REQUEST["parentid"];
-			$sql = "insert into seactivityrel values (". $adb->quote($id).",".$adb->quote($_REQUEST["parentid"]) .")";
+			$sql = "insert into vtiger_seactivityrel values (". $adb->quote($id).",".$adb->quote($_REQUEST["parentid"]) .")";
 			$adb->query($sql);
 		}
 	}
@@ -33,8 +33,8 @@
 elseif (isset($_REQUEST['entityid']) && $_REQUEST['entityid'] != '')
 {
 	$record = $_REQUEST["parid"];
-	//$sql = "insert into seactivityrel values (". $_REQUEST["entityid"] .",".$_REQUEST["parid"] .")";
-	$sql = "insert into seactivityrel values (". $adb->quote($_REQUEST["entityid"]).",".$adb->quote($_REQUEST["parid"]) .")";
+	//$sql = "insert into vtiger_seactivityrel values (". $_REQUEST["entityid"] .",".$_REQUEST["parid"] .")";
+	$sql = "insert into vtiger_seactivityrel values (". $adb->quote($_REQUEST["entityid"]).",".$adb->quote($_REQUEST["parid"]) .")";
 	$adb->query($sql);
 	header("Location: index.php?action=CallRelatedList&module=Emails&record=".$record);
 }
@@ -44,8 +44,8 @@
 if(isset($_REQUEST['user_id']) && $_REQUEST['user_id'] != '')
 {
 	$record = $_REQUEST['record'];
-	//$sql = "insert into salesmanactivityrel values (". $_REQUEST["user_id"] .",".$_REQUEST["record"] .")";
-	$sql = "insert into salesmanactivityrel values (".$adb->quote($_REQUEST["user_id"]).",".$adb->quote($_REQUEST["record"]).")";
+	//$sql = "insert into vtiger_salesmanactivityrel values (". $_REQUEST["user_id"] .",".$_REQUEST["record"] .")";
+	$sql = "insert into vtiger_salesmanactivityrel values (".$adb->quote($_REQUEST["user_id"]).",".$adb->quote($_REQUEST["record"]).")";
 	$adb->query($sql);
 	header("Location: index.php?action=CallRelatedList&module=Emails&record=".$record);
 }

Modified: vtigercrm/trunk/modules/Emails/webmailsend.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/webmailsend.php (original)
+++ vtigercrm/trunk/modules/Emails/webmailsend.php Mon Jun 12 14:26:25 2006
@@ -12,7 +12,7 @@
 
 $mail_status = send_mail('Emails',$_REQUEST["parent_name"],$current_user->user_name,'',$_REQUEST['subject'],$_REQUEST['description'],$_REQUEST["ccmail"],$_REQUEST["bccmail"],'all',$focus->id);
 	
-$query = 'update emaildetails set email_flag ="SENT" where emailid='.$focus->id;
+$query = 'update vtiger_emaildetails set email_flag ="SENT" where emailid='.$focus->id;
 $adb->query($query);
 
 //set the errorheader1 to 1 if the mail has not been sent to the assigned to user

Modified: vtigercrm/trunk/modules/Faq/Faq.php
==============================================================================
--- vtigercrm/trunk/modules/Faq/Faq.php (original)
+++ vtigercrm/trunk/modules/Faq/Faq.php Mon Jun 12 14:26:25 2006
@@ -28,25 +28,25 @@
 require_once('data/CRMEntity.php');
 require_once('include/utils/utils.php');
 
-// Faq is used to store faq information.
+// Faq is used to store vtiger_faq information.
 class Faq extends CRMEntity {
 	var $log;
 	var $db;
 
-	// Stored fields
+	// Stored vtiger_fields
 	var $id;
 	var $mode;
 	
-	var $tab_name = Array('crmentity','faq','faqcomments');
-	var $tab_name_index = Array('crmentity'=>'crmid','faq'=>'id','faqcomments'=>'faqid');
+	var $tab_name = Array('vtiger_crmentity','vtiger_faq','vtiger_faqcomments');
+	var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_faq'=>'id','vtiger_faqcomments'=>'faqid');
 				
-	var $entity_table = "crmentity";
+	var $entity_table = "vtiger_crmentity";
 	
 	var $column_fields = Array();
 		
 	var $sortby_fields = Array('question','category','id');		
 
-	// This is the list of fields that are in the lists.
+	// This is the list of vtiger_fields that are in the lists.
 	var $list_fields = Array(
 				'FAQ Id'=>Array('faq'=>'id'),
 				'Question'=>Array('faq'=>'question'),
@@ -100,7 +100,7 @@
 		global $log;
 		$log->debug("Entering getFAQComments(".$faqid.") method ...");
 		global $mod_strings;
-		$sql = "select * from faqcomments where faqid=".$faqid;
+		$sql = "select * from vtiger_faqcomments where faqid=".$faqid;
 		$result = $this->db->query($sql);
 		$noofrows = $this->db->num_rows($result);
 

Modified: vtigercrm/trunk/modules/Faq/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Faq/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Faq/language/en_us.lang.php Mon Jun 12 14:26:25 2006
@@ -78,10 +78,10 @@
 'NTC_COPY_SHIPPING_ADDRESS'=>'Copy shipping address to billing address',
 'NTC_REMOVE_MEMBER_ORG_CONFIRMATION'=>'Are you sure you want to remove this record as a member organization?',
 'LBL_DUPLICATE'=>'Potential Duplicate Faq',
-'MSG_DUPLICATE' => 'Creating this account may potentialy create a duplicate account. You may either select an account from the list below or you may click on Create New Faq to continue creating a new account with the previously entered data.',
+'MSG_DUPLICATE' => 'Creating this vtiger_account may vtiger_potentialy create a duplicate vtiger_account. You may either select an vtiger_account from the list below or you may click on Create New Faq to continue creating a new vtiger_account with the previously entered data.',
 
 'LBL_INVITEE'=>'Contacts',
-'ERR_DELETE_RECORD'=>"A record number must be specified to delete the account.",
+'ERR_DELETE_RECORD'=>"A record number must be specified to delete the vtiger_account.",
 
 'LBL_SELECT_ACCOUNT'=>'Select Faq',
 'LBL_GENERAL_INFORMATION'=>'General Information',
@@ -110,7 +110,7 @@
 'Created Time'=>'Created Time',
 'Modified Time'=>'Modified Time',
 
-//Added fields after 4.2 alpha
+//Added vtiger_fields after 4.2 alpha
 'LBL_TICKETS'=>'Tickets',
 'LBL_FAQ'=>'FAQ',
 'Product Name'=>'Product Name',

Modified: vtigercrm/trunk/modules/HelpDesk/Convert.php
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/Convert.php (original)
+++ vtigercrm/trunk/modules/HelpDesk/Convert.php Mon Jun 12 14:26:25 2006
@@ -71,7 +71,7 @@
 $change='';
 if($_REQUEST['change_owner'])
 {
-	$change .= '<input type="hidden" name="change_owner" value="true"/><td width="20%" valign="top" class="dataLabel">'.$mod_strings['LBL_ASSIGNED_TO'].'<select tabindex="5" name="assigned_user_id" {ASSIGNED_USER_OPTIONS}</select> </td>';
+	$change .= '<input type="hidden" name="change_owner" value="true"/><td width="20%" valign="top" class="dataLabel">'.$mod_strings['LBL_ASSIGNED_TO'].'<select vtiger_tabindex="5" name="assigned_user_id" {ASSIGNED_USER_OPTIONS}</select> </td>';
 	$xtpl->assign("ASSIGNED_USER_OPTIONS",getComboValues("user_name","users","user_name","1",'--None--'));
 }
 if($_REQUEST['change_status'])

Modified: vtigercrm/trunk/modules/HelpDesk/ConvertAsFAQ.php
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/ConvertAsFAQ.php (original)
+++ vtigercrm/trunk/modules/HelpDesk/ConvertAsFAQ.php Mon Jun 12 14:26:25 2006
@@ -13,7 +13,7 @@
 
 $focus = new FAQ();
 
-//Map the fields like ticket column => faq column where ticket column is the troubletikcets field name & faq - column_fields
+//Map the vtiger_fields like ticket column => vtiger_faq column where ticket column is the troubletikcets vtiger_field name & vtiger_faq - column_fields
 $ticket_faq_mapping_fields = Array(
 			'title'=>'question',
 			'product_id'=>'product_id',
@@ -22,7 +22,7 @@
 			//'ticketcategories'=>'faqcategory'
 		   );
 
-$sql = "select ticketid, title, product_id, description, solution,status, category from troubletickets where ticketid=".$_REQUEST['record'];
+$sql = "select ticketid, title, product_id, description, solution,status, category from vtiger_troubletickets where ticketid=".$_REQUEST['record'];
 $res = $adb->query($sql);
 
 //set all the ticket values to FAQ
@@ -45,8 +45,8 @@
 		$answer .= '\r\n\r\nSOLUTION:\r\n'.$solution;
 	}
 
-	//Retrive the ticket comments from the ticketcomments table and added into the faq answer
-	$sql = "select ticketid, comments, createdtime from ticketcomments where ticketid=".$_REQUEST['record'];
+	//Retrive the ticket comments from the vtiger_ticketcomments vtiger_table and added into the vtiger_faq answer
+	$sql = "select ticketid, comments, createdtime from vtiger_ticketcomments where ticketid=".$_REQUEST['record'];
 	$res = $adb->query($sql);
 	$noofrows = $adb->num_rows($res);
 	$answer .= '\r\n\r\nCOMMENTS:';
@@ -59,7 +59,7 @@
 		}
 	}
 
-	$sql1 = "update faq set answer='".$answer."' where id=".$focus->id;
+	$sql1 = "update vtiger_faq set answer='".$answer."' where id=".$focus->id;
 	$adb->query($sql1);
 }
 

Modified: vtigercrm/trunk/modules/HelpDesk/ConvertToEntities.php
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/ConvertToEntities.php (original)
+++ vtigercrm/trunk/modules/HelpDesk/ConvertToEntities.php Mon Jun 12 14:26:25 2006
@@ -20,11 +20,11 @@
 $close_date = $_REQUEST["closedate"];
 $current_user_id = $_REQUEST["current_user_id"];
 
-//$id=$adb->query_result($adb->query('select * from users where user_name="'.$_REQUEST['assigned_user_id'].'"'),0,"id");
+//$id=$adb->query_result($adb->query('select * from vtiger_users where user_name="'.$_REQUEST['assigned_user_id'].'"'),0,"id");
 
 $idlist=split(';',$_REQUEST['idlist']);
 
-$query='select * from troubletickets';
+$query='select * from vtiger_troubletickets';
 $rs=$adb->query($query);
 for($i=0;$i<count($idlist);$i++)
 {
@@ -36,11 +36,11 @@
 	}
 	if(isset($_REQUEST['change_owner']))
 	{
-		$resultset=$adb->query('select * from users where user_name="'.$_REQUEST['assigned_user_id'].'"');
+		$resultset=$adb->query('select * from vtiger_users where user_name="'.$_REQUEST['assigned_user_id'].'"');
 		$changevalue=$adb->query_result($resultset,0,"id");
 		$changekey='assigned_user_id';
 	}
-	$sql="update troubletickets set ".$changekey." = '".$changevalue."' where id = '".$id."'";
+	$sql="update vtiger_troubletickets set ".$changekey." = '".$changevalue."' where id = '".$id."'";
 	$adb->query($sql);
 }
 header("Location: index.php?action=index&module=HelpDesk");

Modified: vtigercrm/trunk/modules/HelpDesk/Forms.php
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/Forms.php (original)
+++ vtigercrm/trunk/modules/HelpDesk/Forms.php Mon Jun 12 14:26:25 2006
@@ -26,7 +26,7 @@
 
 
 /**
- * Create HTML form to enter a new record with the minimum necessary fields.
+ * Create HTML form to enter a new record with the minimum necessary vtiger_fields.
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
  * All Rights Reserved.
  * Contributor(s): ______________________________________..
@@ -59,7 +59,7 @@
 	$qcreate_form = get_left_form_header($mod_strings['LBL_NEW_FORM_TITLE']);
 
 
-	$qcreate_get_field="select * from field where tabid=13 and quickcreate=0 order by quickcreatesequence";
+	$qcreate_get_field="select * from vtiger_field where vtiger_tabid=13 and quickcreate=0 order by quickcreatesequence";
 	$qcreate_get_result=$adb->query($qcreate_get_field);
 	$qcreate_get_noofrows=$adb->num_rows($qcreate_get_result);
 
@@ -141,9 +141,9 @@
 	$qcreate_form.='</form>';
 	$qcreate_form.='<script type="text/javascript">
 
-				var fieldname = new Array('.$fieldName.')
-				var fieldlabel = new Array('.$fieldLabel.')
-				var fielddatatype = new Array('.$fldDataType.')
+				var vtiger_fieldname = new Array('.$fieldName.')
+				var vtiger_fieldlabel = new Array('.$fieldLabel.')
+				var vtiger_fielddatatype = new Array('.$fldDataType.')
 
 			</script>';
 

Modified: vtigercrm/trunk/modules/HelpDesk/HelpDesk.php
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/HelpDesk.php (original)
+++ vtigercrm/trunk/modules/HelpDesk/HelpDesk.php Mon Jun 12 14:26:25 2006
@@ -25,12 +25,12 @@
 	var $db;
 
 
-	// Stored fields
+	// Stored vtiger_fields
 	var $id;
 	var $mode;
 
-	var $tab_name = Array('crmentity','troubletickets','seticketsrel','ticketcf','ticketcomments','attachments');
-	var $tab_name_index = Array('crmentity'=>'crmid','troubletickets'=>'ticketid','seticketsrel'=>'ticketid','ticketcf'=>'ticketid','ticketcomments'=>'ticketid','attachments'=>'attachmentsid');
+	var $tab_name = Array('vtiger_crmentity','vtiger_troubletickets','vtiger_seticketsrel','vtiger_ticketcf','vtiger_ticketcomments','vtiger_attachments');
+	var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_troubletickets'=>'ticketid','vtiger_seticketsrel'=>'ticketid','vtiger_ticketcf'=>'ticketid','vtiger_ticketcomments'=>'ticketid','vtiger_attachments'=>'attachmentsid');
 	var $column_fields = Array();
 
 	var $sortby_fields = Array('title','status','priority','crmid','firstname','smownerid');
@@ -104,7 +104,7 @@
 
 		$returnset = '&return_module=HelpDesk&return_action=DetailView&return_id='.$id;
 
-		$query = "SELECT activity.*, crmentity.crmid, contactdetails.contactid, contactdetails.lastname, contactdetails.firstname, recurringevents.recurringtype, 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 outer join recurringevents on recurringevents.activityid=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')";
+		$query = "SELECT vtiger_activity.*, vtiger_crmentity.crmid, vtiger_contactdetails.contactid, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_recurringevents.recurringtype, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid= vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and (activitytype='Task' or vtiger_activitytype='Call' or vtiger_activitytype='Meeting')";
 		$log->debug("Exiting get_activities method ...");
 		
 		return GetRelatedList('HelpDesk','Activities',$focus,$query,$button,$returnset);
@@ -123,7 +123,7 @@
 		global $log, $adb;
 		$log->debug("Entering into get_ticket_history($ticketid) method ...");
 
-		$query="select title,update_log from troubletickets where ticketid=".$ticketid;
+		$query="select title,update_log from vtiger_troubletickets where ticketid=".$ticketid;
 		$result=$adb->query($query);
 		$update_log = $adb->query_result($result,0,"update_log");
 
@@ -138,7 +138,7 @@
 		return $return_value;
 	}
 
-	/**	Function to form the query to get the list of attachments and notes
+	/**	Function to form the query to get the list of vtiger_attachments and vtiger_notes
 	 *	@param  int $id - ticket id
 	 *	@return void
 	 *	 but this function will call the function renderRelatedAttachments with parameters query and ticket id
@@ -147,31 +147,31 @@
 	{
 		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,
-			crm2.createdtime, notes.notecontent description, users.user_name
-		from notes
-			inner join senotesrel on senotesrel.notesid= notes.notesid
-			inner join crmentity on crmentity.crmid= senotesrel.crmid
-			inner join crmentity crm2 on crm2.crmid=notes.notesid and crm2.deleted=0
-			left join seattachmentsrel  on seattachmentsrel.crmid =notes.notesid
-			left join attachments on seattachmentsrel.attachmentsid = attachments.attachmentsid
-			inner join users on crm2.smcreatorid= users.id
-		where crmentity.crmid=".$id;
+		$query = "select vtiger_notes.title,'Notes      '  ActivityType, vtiger_notes.filename,
+		vtiger_attachments.type  FileType,crm2.modifiedtime lastmodified,
+		vtiger_seattachmentsrel.attachmentsid vtiger_attachmentsid, vtiger_notes.notesid crmid,
+			crm2.createdtime, vtiger_notes.notecontent description, vtiger_users.user_name
+		from vtiger_notes
+			inner join vtiger_senotesrel on vtiger_senotesrel.notesid= vtiger_notes.notesid
+			inner join vtiger_crmentity on vtiger_crmentity.crmid= vtiger_senotesrel.crmid
+			inner join vtiger_crmentity crm2 on crm2.crmid=vtiger_notes.notesid and crm2.deleted=0
+			left join vtiger_seattachmentsrel  on vtiger_seattachmentsrel.crmid =vtiger_notes.notesid
+			left join vtiger_attachments on vtiger_seattachmentsrel.attachmentsid = vtiger_attachments.attachmentsid
+			inner join vtiger_users on crm2.smcreatorid= vtiger_users.id
+		where vtiger_crmentity.crmid=".$id;
 
 		$query .= ' union all ';
 
-		$query .= "select attachments.description title ,'Attachments'  ActivityType,
-			attachments.name filename, attachments.type FileType,crm2.modifiedtime lastmodified,
-			attachments.attachmentsid attachmentsid, seattachmentsrel.attachmentsid crmid,
-			crm2.createdtime, attachments.description, users.user_name
-		from attachments
-			inner join seattachmentsrel on seattachmentsrel.attachmentsid= attachments.attachmentsid
-			inner join crmentity on crmentity.crmid= seattachmentsrel.crmid
-			inner join crmentity crm2 on crm2.crmid=attachments.attachmentsid
-			left join users on crm2.smcreatorid= users.id
-		where crmentity.crmid=".$id;	
+		$query .= "select vtiger_attachments.description title ,'Attachments'  ActivityType,
+		vtiger_attachments.name filename, vtiger_attachments.type FileType,crm2.modifiedtime lastmodified,
+		vtiger_attachments.attachmentsid vtiger_attachmentsid, vtiger_seattachmentsrel.attachmentsid crmid,
+			crm2.createdtime, vtiger_attachments.description, vtiger_users.user_name
+		from vtiger_attachments
+			inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid= vtiger_attachments.attachmentsid
+			inner join vtiger_crmentity on vtiger_crmentity.crmid= vtiger_seattachmentsrel.crmid
+			inner join vtiger_crmentity crm2 on crm2.crmid=vtiger_attachments.attachmentsid
+			left join vtiger_users on crm2.smcreatorid= vtiger_users.id
+		where vtiger_crmentity.crmid=".$id;	
 		$log->debug("Exiting get_attachments method ...");
 		return getAttachmentsAndNotes('HelpDesk',$query,$id);
 	}
@@ -189,7 +189,7 @@
 	{
 		global $log;
 		$log->debug("Entering get_ticket_comments_list(".$ticketid.") method ...");
-		 $sql = "select * from ticketcomments where ticketid=".$ticketid." order by createdtime DESC";
+		 $sql = "select * from vtiger_ticketcomments where ticketid=".$ticketid." order by createdtime DESC";
 		 $result = $this->db->query($sql);
 		 $noofrows = $this->db->num_rows($result);
 		 for($i=0;$i<$noofrows;$i++)
@@ -200,7 +200,7 @@
 				 $name = getUserName($ownerid);
 			 elseif($ownertype == 'customer')
 			 {
-				 $sql1 = 'select * from portalinfo where id='.$ownerid;
+				 $sql1 = 'select * from vtiger_portalinfo where id='.$ownerid;
 				 $name = $this->db->query_result($this->db->query($sql1),0,'user_name');
 			 }
 
@@ -224,7 +224,7 @@
 
 		$this->db->println("where ==> ".$where);
 
-		$query = "select crmentity.crmid, troubletickets.*, crmentity.smownerid, crmentity.createdtime, crmentity.modifiedtime, contactdetails.firstname, contactdetails.lastname, products.productid, products.productname, 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 products on products.productid = troubletickets.product_id left join users on crmentity.smownerid=users.id  where crmentity.deleted=0 and contactdetails.email='".$user_name."' and troubletickets.parent_id = '".$id."'";
+		$query = "select vtiger_crmentity.crmid, vtiger_troubletickets.*, vtiger_crmentity.smownerid, vtiger_crmentity.createdtime, vtiger_crmentity.modifiedtime, vtiger_contactdetails.firstname, vtiger_contactdetails.lastname, vtiger_products.productid, vtiger_products.productname, vtiger_ticketcf.* from vtiger_troubletickets inner join vtiger_ticketcf on vtiger_ticketcf.ticketid = vtiger_troubletickets.ticketid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_troubletickets.ticketid left join vtiger_contactdetails on vtiger_troubletickets.parent_id=vtiger_contactdetails.contactid left join vtiger_products on vtiger_products.productid = vtiger_troubletickets.product_id left join vtiger_users on vtiger_crmentity.smownerid=vtiger_users.id  where vtiger_crmentity.deleted=0 and vtiger_contactdetails.email='".$user_name."' and vtiger_troubletickets.parent_id = '".$id."'";
 
 		if(trim($where) != '')
 		{
@@ -260,10 +260,10 @@
 				$where_conditions = " and ( ".$where_conditions." ) ";
 
 			$query .= $where_conditions;
-			$this->db->println("where condition for customer portal tickets search : ".$where_conditions);
+			$this->db->println("where condition for customer vtiger_portal tickets search : ".$where_conditions);
 		}
 
-		$query .= " order by crmentity.crmid desc";
+		$query .= " order by vtiger_crmentity.crmid desc";
 		$log->debug("Exiting get_user_tickets_list method ...");
 		return $this->process_list_query($query);
 	}
@@ -317,14 +317,14 @@
 	        return $response;
 	}
 
-	/**	Function to get the HelpDesk field labels in caps letters without space
+	/**	Function to get the HelpDesk vtiger_field labels in caps letters without space
 	 *	return array $mergeflds - array(	key => val	)    where   key=0,1,2..n & val = ASSIGNEDTO,RELATEDTO, .,etc
 	**/
 	function getColumnNames_Hd()
 	{
 		global $log;
 		$log->debug("Entering getColumnNames_Hd() method ...");
-		$sql1 = "select fieldlabel from field where tabid=13 and block <> 6 ";
+		$sql1 = "select vtiger_fieldlabel from vtiger_field where vtiger_tabid=13 and block <> 6 ";
 		$result = $this->db->query($sql1);
 		$numRows = $this->db->num_rows($result);
 		for($i=0; $i < $numRows;$i++)
@@ -348,7 +348,7 @@
 		$log->debug("Entering getCommentInformation(".$ticketid.") method ...");
 		global $adb;
 		global $mod_strings;
-		$sql = "select * from ticketcomments where ticketid=".$ticketid;
+		$sql = "select * from vtiger_ticketcomments where ticketid=".$ticketid;
 		$result = $adb->query($sql);
 		$noofrows = $adb->num_rows($result);
 
@@ -389,7 +389,7 @@
 		return $list;
 	}
 
-	/**     Function to get the Customer Name who has made comment to the ticket from the portal
+	/**     Function to get the Customer Name who has made comment to the ticket from the vtiger_portal
 	 *      @param  int    $id   - Ticket id
 	 *      @return string $customername - The contact name
 	**/
@@ -398,7 +398,7 @@
 		global $log;
 		$log->debug("Entering getCustomerName(".$id.") method ...");
         	global $adb;
-	        $sql = "select * from portalinfo inner join troubletickets on troubletickets.parent_id = portalinfo.id where troubletickets.ticketid=".$id;
+	        $sql = "select * from vtiger_portalinfo inner join vtiger_troubletickets on vtiger_troubletickets.parent_id = vtiger_portalinfo.id where vtiger_troubletickets.ticketid=".$id;
         	$result = $adb->query($sql);
 	        $customername = $adb->query_result($result,0,'user_name');
 		$log->debug("Exiting getCustomerName method ...");

Modified: vtigercrm/trunk/modules/HelpDesk/ListTickets.php
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/ListTickets.php (original)
+++ vtigercrm/trunk/modules/HelpDesk/ListTickets.php Mon Jun 12 14:26:25 2006
@@ -24,18 +24,18 @@
 	$theme_path="themes/".$theme."/";
 	$image_path=$theme_path."images/";
 
-	$search_query="select troubletickets.ticketid, parent_id, priority, troubletickets.status, category, troubletickets.title, troubletickets.description, update_log, version_id,
-	crmentity.createdtime, crmentity.modifiedtime, 
-	contactdetails.firstname, contactdetails.lastname, 
-	account.accountid, account.accountname, 
-	users.user_name from 
-	troubletickets 
-	inner join crmentity on crmentity.crmid = troubletickets.ticketid 
-	inner join users on users.id = crmentity.smownerid 
-	left join contactdetails on troubletickets.parent_id = contactdetails.contactid 
-	left join account on account.accountid = troubletickets.parent_id 
-	left join seticketsrel on seticketsrel.ticketid = troubletickets.ticketid 
-	where crmentity.smownerid = ".$current_user->id." and crmentity.deleted = 0 and troubletickets.status <> 'Closed'  ORDER BY createdtime DESC";
+	$search_query="select vtiger_troubletickets.ticketid, parent_id, priority, vtiger_troubletickets.status, category, vtiger_troubletickets.title, vtiger_troubletickets.description, update_log, version_id,
+vtiger_crmentity.createdtime, vtiger_crmentity.modifiedtime, 
+vtiger_contactdetails.firstname, vtiger_contactdetails.lastname, 
+vtiger_account.accountid, vtiger_account.accountname, 
+vtiger_users.user_name from 
+	vtiger_troubletickets 
+	inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_troubletickets.ticketid 
+	inner join vtiger_users on vtiger_users.id = vtiger_crmentity.smownerid 
+	left join vtiger_contactdetails on vtiger_troubletickets.parent_id = vtiger_contactdetails.contactid 
+	left join vtiger_account on vtiger_account.accountid = vtiger_troubletickets.parent_id 
+	left join vtiger_seticketsrel on vtiger_seticketsrel.ticketid = vtiger_troubletickets.ticketid 
+	where vtiger_crmentity.smownerid = ".$current_user->id." and vtiger_crmentity.deleted = 0 and vtiger_troubletickets.status <> 'Closed'  ORDER BY createdtime DESC";
 
 	$resultcount = $adb->num_rows($adb->query($search_query));
 	if($resultcount > 0)
@@ -96,19 +96,19 @@
 	$log->debug("Entering getParentLink(".$parent_id.") method ...");
 	global $adb;
 
-	$sql = "select setype from crmentity where crmid=".$parent_id;
+	$sql = "select setype from vtiger_crmentity where crmid=".$parent_id;
 	$parent_module = $adb->query_result($adb->query($sql),0,'setype');
 
 	if($parent_module == 'Contacts')
 	{
-		$sql = "select firstname,lastname from contactdetails where contactid=".$parent_id;
+		$sql = "select firstname,lastname from vtiger_contactdetails where contactid=".$parent_id;
 		$parentname = $adb->query_result($adb->query($sql),0,'firstname');
 		$parentname .= ' '.$adb->query_result($adb->query($sql),0,'lastname');
 	        $parent_name = '<a href="index.php?action=DetailView&module='.$parent_module.'&record='.$parent_id.'">'.$parentname.'</a>';
 	}
 	if($parent_module == 'Accounts')
 	{
-		$sql = "select accountname from account where accountid=".$parent_id;
+		$sql = "select vtiger_accountname from vtiger_account where vtiger_accountid=".$parent_id;
 		$parentname = $adb->query_result($adb->query($sql),0,'accountname');
 	        $parent_name = '<a href="index.php?action=DetailView&module='.$parent_module.'&record='.$parent_id.'">'.$parentname.'</a>';
 	}

Modified: vtigercrm/trunk/modules/HelpDesk/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/ListView.php (original)
+++ vtigercrm/trunk/modules/HelpDesk/ListView.php Mon Jun 12 14:26:25 2006
@@ -134,7 +134,7 @@
 {
 	if($order_by == 'smownerid')
 	{
-		$list_query .= ' ORDER BY users.user_name '.$sorder;
+		$list_query .= ' ORDER BY vtiger_users.user_name '.$sorder;
 	}
 	else
 	{
@@ -146,7 +146,7 @@
 }
 else
 {
-	$list_query .= ' order by troubletickets.ticketid DESC';
+	$list_query .= ' order by vtiger_troubletickets.ticketid DESC';
 }
 
 

Modified: vtigercrm/trunk/modules/HelpDesk/Merge.php
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/Merge.php (original)
+++ vtigercrm/trunk/modules/HelpDesk/Merge.php Mon Jun 12 14:26:25 2006
@@ -35,7 +35,7 @@
 }
 //get the particular file from db and store it in the local hard disk.
 //store the path to the location where the file is stored and pass it  as parameter to the method 
-$sql = "select filename,data,filesize from wordtemplates where templateid=".$templateid;
+$sql = "select filename,data,filesize from vtiger_wordtemplates where templateid=".$templateid;
 
 $result = $adb->query($sql);
 $temparray = $adb->fetch_array($result);
@@ -71,7 +71,7 @@
 }
 
 //<<<<<<<<<<<<<<<<header for csv and select columns for query>>>>>>>>>>>>>>>>>>>>>>>>
-$query1="select tab.name,field.tablename,field.columnname,field.fieldlabel from field inner join tab on tab.tabid = field.tabid where field.tabid in (13,4,6) and field.uitype <> 61 and (field.tablename <>'CustomerDetails' and block <> 6 and block <> 75) and block <> 30 order by field.tablename";
+$query1="select vtiger_tab.name,vtiger_field.tablename,vtiger_field.columnname,vtiger_field.fieldlabel from vtiger_field inner join vtiger_tab on vtiger_tab.tabid = vtiger_field.tabid where vtiger_field.tabid in (13,4,6) and vtiger_field.uitype <> 61 and (vtiger_field.tablename <>'CustomerDetails' and block <> 6 and block <> 75) and block <> 30 order by vtiger_field.tablename";
 
 $result = $adb->query($query1);
 $y=$adb->num_rows($result);
@@ -86,7 +86,7 @@
 
 	if($columnname == "parent_id")
 	{
-		$column_name = "case crmentityRelHelpDesk.setype when 'Accounts' then accountRelHelpDesk.accountname when 'Contacts' then concat(contactdetailsRelHelpDesk.firstname,' ',contactdetailsRelHelpDesk.lastname) End";
+		$column_name = "case vtiger_crmentityRelHelpDesk.setype when 'Accounts' then vtiger_accountRelHelpDesk.accountname when 'Contacts' then concat(contactdetailsRelHelpDesk.firstname,' ',contactdetailsRelHelpDesk.lastname) End";
 	}
 	if($columnname == "product_id")
 	{
@@ -119,7 +119,7 @@
 		}
 		if($modulename == "HelpDesk")
 		{
-			$column_name = "concat(users.last_name,' ',users.first_name) as userhelpname,users.first_name,users.last_name,users.user_name,users.yahoo_id,users.title,users.phone_work,users.department,users.phone_mobile,users.phone_other,users.phone_fax,users.email1,users.phone_home,users.email2,users.address_street,users.address_city,users.address_state,users.address_postalcode,users.address_country";
+			$column_name = "concat(vtiger_users.last_name,' ',vtiger_users.first_name) as userhelpname,vtiger_users.first_name,vtiger_users.last_name,vtiger_users.user_name,vtiger_users.yahoo_id,vtiger_users.title,vtiger_users.phone_work,vtiger_users.department,vtiger_users.phone_mobile,vtiger_users.phone_other,vtiger_users.phone_fax,vtiger_users.email1,vtiger_users.phone_home,vtiger_users.email2,vtiger_users.address_street,vtiger_users.address_city,vtiger_users.address_state,vtiger_users.address_postalcode,vtiger_users.address_country";
 		}
 	}
 	if($columnname == "parentid")
@@ -162,31 +162,31 @@
 {
 	$selectcolumns = implode($querycolumns,",");
 
-	$query ="select ".$selectcolumns." from troubletickets
-			inner join crmentity on crmentity.crmid=troubletickets.ticketid
-			inner join ticketcf on ticketcf.ticketid = troubletickets.ticketid
-			left join crmentity as crmentityRelHelpDesk on crmentityRelHelpDesk.crmid = troubletickets.parent_id
-			left join account as accountRelHelpDesk on accountRelHelpDesk.accountid=crmentityRelHelpDesk.crmid
-			left join contactdetails as contactdetailsRelHelpDesk on contactdetailsRelHelpDesk.contactid= crmentityRelHelpDesk.crmid
-			left join products as productsRel on productsRel.productid = troubletickets.product_id
-			left join users on crmentity.smownerid=users.id
-			left join account on account.accountid = troubletickets.parent_id               
-			left join crmentity as crmentityAccounts on crmentityAccounts.crmid = account.accountid 
-			left join accountbillads on accountbillads.accountaddressid = account.accountid
-			left join accountshipads on accountshipads.accountaddressid = account.accountid
-			left join accountscf on accountbillads.accountaddressid = accountscf.accountid 
-			left join account as accountAccount on accountAccount.accountid = troubletickets.parent_id
-			left join users as usersAccounts on usersAccounts.id = crmentityAccounts.smownerid
-			left join contactdetails on contactdetails.contactid = troubletickets.parent_id               
-			left join crmentity as crmentityContacts on crmentityContacts.crmid = contactdetails.contactid 
-			left join contactaddress on contactdetails.contactid = contactaddress.contactaddressid 
-			left join contactsubdetails on contactdetails.contactid = contactsubdetails.contactsubscriptionid 
-			left join contactscf on contactdetails.contactid = contactscf.contactid 
-			left join contactdetails as contactdetailsContacts on contactdetailsContacts.contactid = contactdetails.reportsto
-			left join account as accountContacts on accountContacts.accountid = contactdetails.accountid 
-			left join users as usersContacts on usersContacts.id = crmentityContacts.smownerid
-			where crmentity.deleted=0 and ((crmentityContacts.deleted=0 || crmentityContacts.deleted is null)||(crmentityAccounts.deleted=0 || crmentityAccounts.deleted is null)) 
-			and troubletickets.ticketid in (".$mass_merge.")";
+	$query ="select ".$selectcolumns." from vtiger_troubletickets
+			inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_troubletickets.ticketid
+			inner join vtiger_ticketcf on vtiger_ticketcf.ticketid = vtiger_troubletickets.ticketid
+			left join vtiger_crmentity as vtiger_crmentityRelHelpDesk on vtiger_crmentityRelHelpDesk.crmid = vtiger_troubletickets.parent_id
+			left join vtiger_account as vtiger_accountRelHelpDesk on vtiger_accountRelHelpDesk.accountid=crmentityRelHelpDesk.crmid
+			left join vtiger_contactdetails as vtiger_contactdetailsRelHelpDesk on vtiger_contactdetailsRelHelpDesk.contactid= vtiger_crmentityRelHelpDesk.crmid
+			left join vtiger_products as vtiger_productsRel on vtiger_productsRel.productid = vtiger_troubletickets.product_id
+			left join vtiger_users on vtiger_crmentity.smownerid=vtiger_users.id
+			left join vtiger_account on vtiger_account.accountid = vtiger_troubletickets.parent_id               
+			left join vtiger_crmentity as vtiger_crmentityAccounts on vtiger_crmentityAccounts.crmid = vtiger_account.accountid 
+			left join vtiger_accountbillads on vtiger_accountbillads.accountaddressid = vtiger_account.accountid
+			left join vtiger_accountshipads on vtiger_accountshipads.accountaddressid = vtiger_account.accountid
+			left join vtiger_accountscf on vtiger_accountbillads.accountaddressid = vtiger_accountscf.accountid 
+			left join vtiger_account as vtiger_accountAccount on vtiger_accountAccount.accountid = vtiger_troubletickets.parent_id
+			left join vtiger_users as vtiger_usersAccounts on vtiger_usersAccounts.id = vtiger_crmentityAccounts.smownerid
+			left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_troubletickets.parent_id               
+			left join vtiger_crmentity as vtiger_crmentityContacts on vtiger_crmentityContacts.crmid = vtiger_contactdetails.contactid 
+			left join vtiger_contactaddress on vtiger_contactdetails.contactid = vtiger_contactaddress.contactaddressid 
+			left join vtiger_contactsubdetails on vtiger_contactdetails.contactid = vtiger_contactsubdetails.contactsubscriptionid 
+			left join vtiger_contactscf on vtiger_contactdetails.contactid = vtiger_contactscf.contactid 
+			left join vtiger_contactdetails as vtiger_contactdetailsContacts on vtiger_contactdetailsContacts.contactid = vtiger_contactdetails.reportsto
+			left join vtiger_account as vtiger_accountContacts on vtiger_accountContacts.accountid = vtiger_contactdetails.accountid 
+			left join vtiger_users as vtiger_usersContacts on vtiger_usersContacts.id = vtiger_crmentityContacts.smownerid
+			where vtiger_crmentity.deleted=0 and ((crmentityContacts.deleted=0 || vtiger_crmentityContacts.deleted is null)||(crmentityAccounts.deleted=0 || vtiger_crmentityAccounts.deleted is null)) 
+			and vtiger_troubletickets.ticketid in (".$mass_merge.")";
 
 	$result = $adb->query($query);
 
@@ -196,7 +196,7 @@
 		for($x=0; $x<$y; $x++)
 		{
 			$value = $columnValues[$x];
-			//<<<<<<<<<<<<<<<for blank fields>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+			//<<<<<<<<<<<<<<<for blank vtiger_fields>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 			if($value == "0")
 			{
 				$value = "";
@@ -221,7 +221,7 @@
 }
 else
 {
-	die("No fields to do Merge");
+	die("No vtiger_fields to do Merge");
 }	
 
 $handle = fopen($wordtemplatedownloadpath."datasrc.csv","wb");

Modified: vtigercrm/trunk/modules/HelpDesk/Save.php
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/Save.php (original)
+++ vtigercrm/trunk/modules/HelpDesk/Save.php Mon Jun 12 14:26:25 2006
@@ -48,13 +48,13 @@
 
 $emailoptout = 0;
 
-//To get the emailoptout field value and then decide whether send mail about the tickets or not
+//To get the emailoptout vtiger_field value and then decide whether send mail about the tickets or not
 if($focus->column_fields['parent_id'] != '')
 {
 	$parent_module = getSalesEntityType($focus->column_fields['parent_id']);
 	if($parent_module == 'Contacts')
 	{
-		$result = $adb->query("select * from contactdetails where contactid=".$focus->column_fields['parent_id']);
+		$result = $adb->query("select * from vtiger_contactdetails where contactid=".$focus->column_fields['parent_id']);
 		$emailoptout = $adb->query_result($result,0,'emailoptout');
 		$contactname = $adb->query_result($result,0,'firstname').' '.$adb->query_result($result,0,'lastname');
 		$parentname = $contactname;
@@ -62,16 +62,16 @@
 	}
 	if($parent_module == 'Accounts')
 	{
-		$result = $adb->query("select * from account where accountid=".$focus->column_fields['parent_id']);
+		$result = $adb->query("select * from vtiger_account where vtiger_accountid=".$focus->column_fields['parent_id']);
 		$emailoptout = $adb->query_result($result,0,'emailoptout');
 		$parentname = $adb->query_result($result,0,'accountname');
 	}
 }
 
-//Get the status of the portal user. if the customer is active then send the portal link in the mail
+//Get the status of the vtiger_portal user. if the customer is active then send the vtiger_portal link in the mail
 if($contact_mailid != '')
 {
-	$sql = "select * from portalinfo where user_name='".$contact_mailid."'";
+	$sql = "select * from vtiger_portalinfo where user_name='".$contact_mailid."'";
 	$isactive = $adb->query_result($adb->query($sql),0,'isactive');
 }
 if($isactive == 1)
@@ -103,7 +103,7 @@
 
 if($_REQUEST['product_id'] != '' && $focus->id != '' && $_REQUEST['mode'] != 'edit')
 {
-        $sql = 'insert into seticketsrel values('.$_REQUEST['product_id'].' , '.$focus->id.')';
+        $sql = 'insert into vtiger_seticketsrel values('.$_REQUEST['product_id'].' , '.$focus->id.')';
         $adb->query($sql);
 
 	if($_REQUEST['return_module'] == 'Products')
@@ -122,7 +122,7 @@
 {
 	$mail_status_str = "'".$to_email."'=0&&&";
 }
-//added condition to check the emailoptout(this is for contacts and accounts.)
+//added condition to check the emailoptout(this is for contacts and vtiger_accounts.)
 if($emailoptout == 0)
 {
 	//send mail to parent
@@ -159,7 +159,7 @@
 	global $adb;
 
 	$commentlist = '';
-	$sql = "select * from ticketcomments where ticketid=".$ticketid;
+	$sql = "select * from vtiger_ticketcomments where ticketid=".$ticketid;
 	$result = $adb->query($sql);
 	for($i=0;$i<$adb->num_rows($result);$i++)
 	{

Modified: vtigercrm/trunk/modules/HelpDesk/TicketStatisticsUtil.php
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/TicketStatisticsUtil.php (original)
+++ vtigercrm/trunk/modules/HelpDesk/TicketStatisticsUtil.php Mon Jun 12 14:26:25 2006
@@ -19,7 +19,7 @@
 	global $log;
 	$log->debug("Entering getTotalNoofTickets() method ...");
 	global $adb;
-	$query = "select count(*) as totalticketcount from troubletickets inner join crmentity on crmentity.crmid=troubletickets.ticketid where crmentity.deleted=0";
+	$query = "select count(*) as totalticketcount from vtiger_troubletickets inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_troubletickets.ticketid where vtiger_crmentity.deleted=0";
 	$result = $adb->query($query);
 	$totTickets = $adb->query_result($result,0,"totalticketcount");
 	$log->debug("Exiting getTotalNoofTickets method ...");
@@ -34,7 +34,7 @@
 	global $log;
 	$log->debug("Entering getTotalNoofOpenTickets() method ...");
 	global $adb;
-	$query = "select count(*) as totalopenticketcount from troubletickets inner join crmentity on crmentity.crmid=troubletickets.ticketid where crmentity.deleted=0 and troubletickets.status !='Closed'";
+	$query = "select count(*) as totalopenticketcount from vtiger_troubletickets inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_troubletickets.ticketid where vtiger_crmentity.deleted=0 and vtiger_troubletickets.status !='Closed'";
 	$result = $adb->query($query);
 	$totOpenTickets = $adb->query_result($result,0,"totalopenticketcount");
 	$log->debug("Exiting getTotalNoofOpenTickets method ...");
@@ -49,7 +49,7 @@
 	global $log;
 	$log->debug("Entering getTotalNoofClosedTickets() method ...");
 	global $adb;
-	$query = "select count(*) as totalclosedticketcount from troubletickets inner join crmentity on crmentity.crmid=troubletickets.ticketid where crmentity.deleted=0 and troubletickets.status ='Closed'";
+	$query = "select count(*) as totalclosedticketcount from vtiger_troubletickets inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_troubletickets.ticketid where vtiger_crmentity.deleted=0 and vtiger_troubletickets.status ='Closed'";
 	$result = $adb->query($query);
 	$totClosedTickets = $adb->query_result($result,0,"totalclosedticketcount");
 	$log->debug("Exiting getTotalNoofClosedTickets method ...");
@@ -170,7 +170,7 @@
 	
 }
 
-/**     Function to display the statistics based on the Users ie., will display all the users and the no. of tickets per user
+/**     Function to display the statistics based on the Users ie., will display all the vtiger_users and the no. of tickets per user
  *      @param  string $image_path - image path of the bar per theme basis
  *      @param  int $singleUnit - the single bar length value which is calculated as 80/total no. of tickets
  *      @return void.
@@ -218,8 +218,8 @@
 	
 }
 
-/**     Function to retrieve all values from the table which is passed as the parameter
- *      @param  string $tableName - table name in which we want to get the result
+/**     Function to retrieve all values from the vtiger_table which is passed as the parameter
+ *      @param  string $tableName - vtiger_table name in which we want to get the result
  *      @return result $result - the result of the query "select * from $tableName" will be return
 **/
 function getFromDB($tableName)
@@ -235,8 +235,8 @@
 
 /**     Function to get the number of tickets based on the User or Priority or Category which is passed as a parameter
  *      @param  string $mode - the status of the ticket ie., Open or Closed. if Total then all tickets count will be retrieved
- *      @param  string $priority_val - the value based on which we get tickets ie., id of the user or ticketcategories or ticketpriorities
- *      @param  int $critColName - smownerid or category or priority which is the fieldname of the table in which we check $priority_val
+ *      @param  string $priority_val - the value based on which we get tickets ie., id of the user or vtiger_ticketcategories or vtiger_ticketpriorities
+ *      @param  int $critColName - smownerid or category or vtiger_priority which is the vtiger_fieldname of the vtiger_table in which we check $priority_val
  *      @return void.
 **/
 function getTicketCount($mode, $priority_val, $critColName)
@@ -254,16 +254,16 @@
 	global $adb;
 	if($mode == 'Open')
 	{
-		$query = "select count(*) as count from troubletickets inner join crmentity on crmentity.crmid=troubletickets.ticketid where crmentity.deleted=0  and ".$table_name.".".$critColName."='".$priority_val."' and troubletickets.status !='Closed'";
+		$query = "select count(*) as count from vtiger_troubletickets inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_troubletickets.ticketid where vtiger_crmentity.deleted=0  and ".$table_name.".".$critColName."='".$priority_val."' and vtiger_troubletickets.status !='Closed'";
 		
 	}
 	elseif($mode == 'Closed')
 	{
-		$query = "select count(*) as count from troubletickets inner join crmentity on crmentity.crmid=troubletickets.ticketid where crmentity.deleted=0 and ".$table_name.".".$critColName."='".$priority_val."' and troubletickets.status ='Closed'";
+		$query = "select count(*) as count from vtiger_troubletickets inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_troubletickets.ticketid where vtiger_crmentity.deleted=0 and ".$table_name.".".$critColName."='".$priority_val."' and vtiger_troubletickets.status ='Closed'";
 	}
 	elseif($mode == 'Total')
 	{
-		$query = "select count(*) as count from troubletickets inner join crmentity on crmentity.crmid=troubletickets.ticketid where crmentity.deleted=0 and ".$table_name.".".$critColName."='".$priority_val."' and deleted='0'";
+		$query = "select count(*) as count from vtiger_troubletickets inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_troubletickets.ticketid where vtiger_crmentity.deleted=0 and ".$table_name.".".$critColName."='".$priority_val."' and deleted='0'";
 	}
 	$result = $adb->query($query);
 	$nooftickets = $adb->query_result($result,0,"count");

Modified: vtigercrm/trunk/modules/HelpDesk/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/HelpDesk/language/en_us.lang.php Mon Jun 12 14:26:25 2006
@@ -64,12 +64,12 @@
 'LBL_AUTHOR'=>'Author',
 'LBL_QUESTION'=>'Question',
 
-//Added fields for File Attachment and Mail send in Tickets
+//Added vtiger_fields for File Attachment and Mail send in Tickets
 'LBL_ATTACHMENTS'=>'Attachments',
 'LBL_NEW_ATTACHMENT'=>'New Attachment',
 'LBL_SEND_MAIL'=>'Send Mail',
 
-//Added fields for search option  in TicketsList -- 4Beta
+//Added vtiger_fields for search option  in TicketsList -- 4Beta
 'LBL_CREATED_DATE'=>'Created Date',
 'LBL_IS'=>'is',
 'LBL_IS_NOT'=>'is not',
@@ -96,21 +96,21 @@
 'LBL_TICKET_CATEGORY'=>'Category',
 'LBL_TICKET_PRIORITY'=>'Priority',
 
-//Added fields after 4 -- Beta
+//Added vtiger_fields after 4 -- Beta
 'LBL_NEW_TICKET'=>'New Ticket',
 'LBL_TICKET_INFORMATION'=>'Ticket Information',
 
 'LBL_LIST_FORM_TITLE'=>'Tickets List',
 'LBL_SEARCH_FORM_TITLE'=>'Ticket Search',
 
-//Added fields after RC1 - Release
+//Added vtiger_fields after RC1 - Release
 'LBL_CHOOSE_A_VIEW'=>'Choose a View...',
 'LBL_ALL'=>'All',
 'LBL_LOW'=>'Low',
 'LBL_MEDIUM'=>'Medium',
 'LBL_HIGH'=>'High',
 'LBL_CRITICAL'=>'Critical',
-//Added fields for 4GA
+//Added vtiger_fields for 4GA
 'Assigned To'=>'Assigned To',
 'Contact Name'=>'Contact Name',
 'Priority'=>'Priority',
@@ -132,7 +132,7 @@
 'LBL_PRIORITIES'=>'Priorities',
 'LBL_SUPPORTERS'=>'Supporters',
 
-//Added fields after 4_0_1
+//Added vtiger_fields after 4_0_1
 'LBL_TICKET_RESOLUTION'=>'Solution Information',
 'Solution'=>'Solution',
 'Add Comment'=>'Add Comment',

Modified: vtigercrm/trunk/modules/Home/Forms.php
==============================================================================
--- vtigercrm/trunk/modules/Home/Forms.php (original)
+++ vtigercrm/trunk/modules/Home/Forms.php Mon Jun 12 14:26:25 2006
@@ -15,7 +15,7 @@
 /*********************************************************************************
  * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Home/Forms.php,v 1.3 2005/03/04 15:18:47 jack Exp $
  * Description:  Contains a variety of utility functions used to display UI
- * components such as form headers and footers.  Intended to be modified on a per
+ * components such as form vtiger_headers and footers.  Intended to be modified on a per
  * theme basis.
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
  * All Rights Reserved.

Modified: vtigercrm/trunk/modules/Home/LastViewed.php
==============================================================================
--- vtigercrm/trunk/modules/Home/LastViewed.php (original)
+++ vtigercrm/trunk/modules/Home/LastViewed.php Mon Jun 12 14:26:25 2006
@@ -24,7 +24,7 @@
 $theme_path="themes/".$theme."/";
 $image_path=$theme_path."images/";
 
-// Create the head of the table.
+// Create the head of the vtiger_table.
 ?>
 		<table cellpadding="2" cellspacing="0" border="0">
 		<tbody>

Modified: vtigercrm/trunk/modules/Home/UnifiedSearch.php
==============================================================================
--- vtigercrm/trunk/modules/Home/UnifiedSearch.php (original)
+++ vtigercrm/trunk/modules/Home/UnifiedSearch.php Mon Jun 12 14:26:25 2006
@@ -91,11 +91,11 @@
 
 	
 		$listquery = getListQuery($module);
-		//Avoided the modules Faq and PriceBooks. we should remove this if when change the customview function
+		//Avoided the modules Faq and PriceBooks. we should remove this if when change the vtiger_customview function
 		$oCustomView = '';
 		if($module != 'Faq' && $module != 'PriceBooks')
 		{
-			//Added to get the default 'All' customview query
+			//Added to get the default 'All' vtiger_customview query
 			$oCustomView = new CustomView($module);
 			$viewid = $oCustomView->getViewId($module);
 
@@ -163,17 +163,17 @@
 	echo "<br><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<em>".$mod_strings['ERR_ONE_CHAR']."</em>";
 }
 
-/**	Function to get the where condition for a module based on the field table entries
+/**	Function to get the where condition for a module based on the vtiger_field vtiger_table entries
   *	@param  string $listquery  -- ListView query for the module 
   *	@param  string $module     -- module name
   *	@param  string $search_val -- entered search string value
-  *	@return string $where      -- where condition for the module based on field table entries
+  *	@return string $where      -- where condition for the module based on vtiger_field vtiger_table entries
   */
 function getUnifiedWhere($listquery,$module,$search_val)
 {
 	global $adb;
 
-	$query = "SELECT * FROM field WHERE tabid = ".getTabid($module);
+	$query = "SELECT * FROM vtiger_field WHERE vtiger_tabid = ".getTabid($module);
 	$result = $adb->query($query);
 	$noofrows = $adb->num_rows($result);
 
@@ -183,7 +183,7 @@
 		$columnname = $adb->query_result($result,$i,'columnname');
 		$tablename = $adb->query_result($result,$i,'tablename');
 
-		//Before form the where condition, check whether the table for the field has been added in the listview query
+		//Before form the where condition, check whether the vtiger_table for the vtiger_field has been added in the listview query
 		if(strstr($listquery,$tablename))
 		{
 			if($where != '')
@@ -198,7 +198,7 @@
 /**	Function to get the Tags where condition
   *	@param  string $search_val -- entered search string value
   *	@param  string $current_user_id     -- current user id
-  *	@return string $where      -- where condition with the list of crmids, will like crmentity.crmid in (1,3,4,etc.,)
+  *	@return string $where      -- where condition with the list of crmids, will like vtiger_crmentity.crmid in (1,3,4,etc.,)
   */
 function getTagWhere($search_val,$current_user_id)
 {
@@ -211,7 +211,7 @@
 	$where = '';
 	if(count($crmid_array) > 0)
 	{
-		$where = " crmentity.crmid IN (";
+		$where = " vtiger_crmentity.crmid IN (";
 		foreach($crmid_array as $index => $crmid)
 		{
 			$where .= $crmid.',';

Modified: vtigercrm/trunk/modules/Home/home_rss.php
==============================================================================
--- vtigercrm/trunk/modules/Home/home_rss.php (original)
+++ vtigercrm/trunk/modules/Home/home_rss.php Mon Jun 12 14:26:25 2006
@@ -40,7 +40,7 @@
 
 //retrieving notifications******************************
 //<<<<<<<<<<<<<<<< start of owner notify>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-$query = "select crmentity.setype,crmentity.crmid,crmentity.smcreatorid,crmentity.modifiedtime from crmentity inner join ownernotify on crmentity.crmid=ownernotify.crmid";
+$query = "select vtiger_crmentity.setype,vtiger_crmentity.crmid,vtiger_crmentity.smcreatorid,vtiger_crmentity.modifiedtime from vtiger_crmentity inner join vtiger_ownernotify on vtiger_crmentity.crmid=vtiger_ownernotify.crmid";
 
 $result = $adb->query($query);
 for($i=0;$i<$adb->num_rows($result);$i++)
@@ -48,77 +48,77 @@
 	    $mod_notify[$i] = $adb->fetch_array($result);
 		if($mod_notify[$i]['setype']=='Accounts')
 		{
-			$tempquery='select accountname from account where accountid='.$mod_notify[$i]['crmid'];
+			$tempquery='select vtiger_accountname from vtiger_account where vtiger_accountid='.$mod_notify[$i]['crmid'];
 			$tempresult=$adb->query($tempquery);
 			$account_name=$adb->fetch_array($tempresult);
 			$notify_values[$i]=$account_name['accountname'];	
 		}else if($mod_notify[$i]['setype']=='Potentials')
 		{
-			$tempquery='select potentialname from potential where potentialid='.$mod_notify[$i]['crmid'];
+			$tempquery='select vtiger_potentialname from vtiger_potential where vtiger_potentialid='.$mod_notify[$i]['crmid'];
 			$tempresult=$adb->query($tempquery);
 			$potential_name=$adb->fetch_array($tempresult);
 			$notify_values[$i]=$potential_name['potentialname'];
 		}else if($mod_notify[$i]['setype']=='Contacts')
 		{	
-			$tempquery='select lastname from contactdetails where contactid='.$mod_notify[$i]['crmid'];
+			$tempquery='select lastname from vtiger_contactdetails where contactid='.$mod_notify[$i]['crmid'];
 			$tempresult=$adb->query($tempquery);
 			$contact_name=$adb->fetch_array($tempresult);
 			$notify_values[$i]=$contact_name['lastname'];
 
 		}else if($mod_notify[$i]['setype']=='Leads')
 		{
-			$tempquery='select lastname from leaddetails where leadid='.$mod_notify[$i]['crmid'];
+			$tempquery='select lastname from vtiger_leaddetails where leadid='.$mod_notify[$i]['crmid'];
 			$tempresult=$adb->query($tempquery);
 			$lead_name=$adb->fetch_array($tempresult);
 			$notify_values[$i]=$lead_name['lastname'];
 		}else if($mod_notify[$i]['setype']=='SalesOrder')
 		{
-			$tempquery='select subject from salesorder where salesorderid='.$mod_notify[$i]['crmid'];
+			$tempquery='select subject from vtiger_salesorder where vtiger_salesorderid='.$mod_notify[$i]['crmid'];
 			$tempresult=$adb->query($tempquery);
 			$sales_subject=$adb->fetch_array($tempresult);
 			$notify_values[$i]=$sales_subject['subject'];
 
 		}else if($mod_notify[$i]['setype']=='Orders')
 		{
-			$tempquery='select subject from purchaseorder where purchaseorderid='.$mod_notify[$i]['crmid'];
+			$tempquery='select subject from vtiger_purchaseorder where vtiger_purchaseorderid='.$mod_notify[$i]['crmid'];
 			$tempresult=$adb->query($tempquery);
 			$purchase_subject=$adb->fetch_array($tempresult);
 			$notify_values[$i]=$purchase_subject['subject'];
 
 		}else if($mod_notify[$i]['setype']=='Products')
 		{
-			$tempquery='select productname from products where productid='.$mod_notify[$i]['crmid'];
+			$tempquery='select productname from vtiger_products where productid='.$mod_notify[$i]['crmid'];
 			$tempresult=$adb->query($tempquery);
 			$product_name=$adb->fetch_array($tempresult);
 			$notify_values[$i]=$product_name['productname'];
 		}else if($mod_notify[$i]['setype']=='Emails')
 		{
-			$tempquery='select subject from activity where activityid='.$mod_notify[$i]['crmid'];
+			$tempquery='select subject from vtiger_activity where vtiger_activityid='.$mod_notify[$i]['crmid'];
 			$tempresult=$adb->query($tempquery);
 			$email_subject=$adb->fetch_array($tempresult);
 			$notify_values[$i]=$email_subject['subject'];
 
 		}else if($mod_notify[$i]['setype']=='HelpDesk')
 		{
-			$tempquery='select title from troubletickets where ticketid='.$mod_notify[$i]['crmid'];
+			$tempquery='select title from vtiger_troubletickets where ticketid='.$mod_notify[$i]['crmid'];
 			$tempresult=$adb->query($tempquery);
 			$HelpDesk_title=$adb->fetch_array($tempresult);
 			$notify_values[$i]=$HelpDesk_title['title'];
 		}else if($mod_notify[$i]['setype']=='Activities')
 		{
-			$tempquery='select subject from activity where activityid='.$mod_notify[$i]['crmid'];
+			$tempquery='select subject from vtiger_activity where vtiger_activityid='.$mod_notify[$i]['crmid'];
 			$tempresult=$adb->query($tempquery);
 			$Activity_subject=$adb->fetch_array($tempresult);
 			$notify_values[$i]=$Activity_subject['subject'];
 		}else if($mod_notify[$i]['setype']=='Quotes')
 		{
-			$tempquery='select subject from quotes where quoteid='.$mod_notify[$i]['crmid'];
+			$tempquery='select subject from vtiger_quotes where quoteid='.$mod_notify[$i]['crmid'];
 			$tempresult=$adb->query($tempquery);
 			$quote_subject=$adb->fetch_array($tempresult);
 			$notify_values[$i]=$quote_subject['subject'];
 		}else if($mod_notify[$i]['setype']=='Invoice')
 		{
-			$tempquery='select subject from invoice where invoiceid='.$mod_notify[$i]['crmid'];
+			$tempquery='select subject from vtiger_invoice where vtiger_invoiceid='.$mod_notify[$i]['crmid'];
 			$tempresult=$adb->query($tempquery);
 			$invoice_subject=$adb->fetch_array($tempresult);
 			$notify_values[$i]=$invoice_subject['subject'];

Modified: vtigercrm/trunk/modules/Home/index.php
==============================================================================
--- vtigercrm/trunk/modules/Home/index.php (original)
+++ vtigercrm/trunk/modules/Home/index.php Mon Jun 12 14:26:25 2006
@@ -44,7 +44,7 @@
 global $adb;
 global $current_user;
 
-$query = "SELECT users.homeorder FROM users WHERE id=".$current_user->id;
+$query = "SELECT vtiger_users.homeorder FROM vtiger_users WHERE id=".$current_user->id;
 $result =& $adb->query($query, true,"Error getting home order");
 $row = $adb->fetchByAssoc($result);
 
@@ -140,14 +140,14 @@
 function getActivityType($id)
 {
 	global $adb;
-	$quer = "select activitytype from activity where activityid=".$id;
+	$quer = "select vtiger_activitytype from vtiger_activity where vtiger_activityid=".$id;
 	$res = $adb->query($quer);
 	$acti_type = $adb->query_result($res,0,"activitytype");
 	return $acti_type;
 
 }
 
-$query="select tagcloud from users where id=".$current_user->id;
+$query="select tagcloud from vtiger_users where id=".$current_user->id;
 $result=$adb->query($query);
 $tagcloud_js=$adb->query_result($result,0,'tagcloud');
 $smarty->assign("TAGCLOUD_JS",$tagcloud_js);
@@ -176,13 +176,13 @@
 	global $app_strings;
 	$i=0;
 	$userid= $current_user->id;
-	$query="select * from loginhistory inner join users on loginhistory.user_name=users.user_name where users.id=".$userid;
+	$query="select * from vtiger_loginhistory inner join vtiger_users on vtiger_loginhistory.user_name=vtiger_users.user_name where vtiger_users.id=".$userid;
 	$result=$adb->query($query);
 	$count=$adb->num_rows($result);
 	$logout_time=$adb->query_result($result,$count-2,'logout_time');
 	if($logout_time !='' && $logout_time != '0000-00-00 00:00:00' && $count >= 2)
 	{
-		$query ="select * from crmentity where modifiedtime > '".$logout_time."'and smownerid =".$userid;
+		$query ="select * from vtiger_crmentity where modifiedtime > '".$logout_time."'and smownerid =".$userid;
 		$result=$adb->query($query);
 		$entry_list=array();
 		for(;$i < $adb->num_rows($result);$i++)
@@ -210,15 +210,15 @@
 	$groupids = fetchUserGroupids($userid);
 	if($groupids !='')
 	{
-		//code modified to list the groups associates to a user om 21-11-05
+		//code modified to list the vtiger_groups associates to a user om 21-11-05
 		//Get the leads assigned to group
-		$query = "select leaddetails.leadid as id,leaddetails.lastname as name,leadgrouprelation.groupname as groupname, 'Leads     ' as Type from leaddetails inner join leadgrouprelation on leaddetails.leadid=leadgrouprelation.leadid inner join crmentity on crmentity.crmid = leaddetails.leadid inner join groups on leadgrouprelation.groupname=groups.groupname where  crmentity.deleted=0  and leadgrouprelation.groupname is not null and groups.groupid in (".$groupids.")";
+		$query = "select vtiger_leaddetails.leadid as id,vtiger_leaddetails.lastname as name,vtiger_leadgrouprelation.groupname as groupname, 'Leads     ' as Type from vtiger_leaddetails inner join vtiger_leadgrouprelation on vtiger_leaddetails.leadid=vtiger_leadgrouprelation.leadid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_leaddetails.leadid inner join vtiger_groups on vtiger_leadgrouprelation.groupname=vtiger_groups.groupname where  vtiger_crmentity.deleted=0  and vtiger_leadgrouprelation.groupname is not null and vtiger_groups.groupid in (".$groupids.")";
 		$query .= " union all ";
 		//Get the activities assigned to group
-		$query .= "select activity.activityid id,activity.subject,activitygrouprelation.groupname,'Activities' as Type from activity inner join activitygrouprelation on activitygrouprelation.activityid=activity.activityid inner join crmentity on crmentity.crmid = activity.activityid inner join groups on activitygrouprelation.groupname=groups.groupname where  crmentity.deleted=0 and ((activity.eventstatus !='held'and (activity.status is null or activity.status ='')) or (activity.status !='completed' and (activity.eventstatus is null or activity.eventstatus=''))) and activitygrouprelation.groupname is not null and groups.groupid in (".$groupids.")";
+		$query .= "select vtiger_activity.activityid id,vtiger_activity.subject,vtiger_activitygrouprelation.groupname,'Activities' as Type from vtiger_activity inner join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_activity.activityid inner join vtiger_groups on vtiger_activitygrouprelation.groupname=vtiger_groups.groupname where  vtiger_crmentity.deleted=0 and ((vtiger_activity.eventstatus !='held'and (vtiger_activity.status is null or vtiger_activity.status ='')) or (vtiger_activity.status !='completed' and (vtiger_activity.eventstatus is null or vtiger_activity.eventstatus=''))) and vtiger_activitygrouprelation.groupname is not null and vtiger_groups.groupid in (".$groupids.")";
 		$query .= " union all ";
 		//Get the tickets assigned to group (status not Closed -- hardcoded value)
-		$query .= "select troubletickets.ticketid,troubletickets.title,ticketgrouprelation.groupname,'Tickets   ' as Type from troubletickets inner join ticketgrouprelation on ticketgrouprelation.ticketid=troubletickets.ticketid inner join crmentity on crmentity.crmid = troubletickets.ticketid inner join groups on ticketgrouprelation.groupname=groups.groupname where crmentity.deleted=0 and troubletickets.status != 'Closed' and ticketgrouprelation.groupname is not null and groups.groupid in (".$groupids.")";
+		$query .= "select vtiger_troubletickets.ticketid,vtiger_troubletickets.title,vtiger_ticketgrouprelation.groupname,'Tickets   ' as Type from vtiger_troubletickets inner join vtiger_ticketgrouprelation on vtiger_ticketgrouprelation.ticketid=vtiger_troubletickets.ticketid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_troubletickets.ticketid inner join vtiger_groups on vtiger_ticketgrouprelation.groupname=vtiger_groups.groupname where vtiger_crmentity.deleted=0 and vtiger_troubletickets.status != 'Closed' and vtiger_ticketgrouprelation.groupname is not null and vtiger_groups.groupid in (".$groupids.")";
 
 
 		$log->info("Here is the where clause for the list view: $query");

Modified: vtigercrm/trunk/modules/Import/Forms.php
==============================================================================
--- vtigercrm/trunk/modules/Import/Forms.php (original)
+++ vtigercrm/trunk/modules/Import/Forms.php Mon Jun 12 14:26:25 2006
@@ -15,7 +15,7 @@
 /*********************************************************************************
  * $Header$
  * Description:  Contains a variety of utility functions used to display UI 
- * components such as form headers and footers.  Intended to be modified on a per 
+ * components such as form vtiger_headers and footers.  Intended to be modified on a per 
  * theme basis.
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
  * All Rights Reserved.
@@ -64,7 +64,7 @@
 			}
 			if ( hash[ form.elements[i].value ] == 1)
 			{
-				// got same field more than once
+				// got same vtiger_field more than once
 				isError = true;
 			}
 			hash[form.elements[i].value] = 1;
@@ -83,7 +83,7 @@
 		return false;
 	}
 
-	for(var field_name in required)
+	for(var vtiger_field_name in required)
 	{
 		// contacts hack to bypass errors if full_name is set
 		if (field_name == 'last_name' && 
@@ -91,7 +91,7 @@
 		{
 			continue;
 		}
-		if ( hash[ field_name ] != 1 )
+		if ( hash[ vtiger_field_name ] != 1 )
 		{
 				isError = true;
 				errorMessage += "$err_required " + required[field_name];
@@ -177,11 +177,11 @@
 function getFieldSelect(&$column_fields,$colnum,&$required_fields,$suggest_field,$translated_fields,$module)
 {
 /*
-echo '<br> column fields : ';print_r($column_fields);
+echo '<br> column vtiger_fields : ';print_r($column_fields);
 echo '<br> column  : '.$colnum;
-echo '<br> required fields : ';print_r($required_fields);
-echo '<br> suggest fields : '.$suggest_field;
-echo '<br> translated fields : ';print_r($translated_fields);
+echo '<br> required vtiger_fields : ';print_r($required_fields);
+echo '<br> suggest vtiger_fields : '.$suggest_field;
+echo '<br> translated vtiger_fields : ';print_r($translated_fields);
 */	global $mod_strings;
 	global $app_strings;
 	global $outlook_contacts_field_map;
@@ -238,7 +238,7 @@
 	{
 	$module ='contactdetails';
 	}	
-	$custquery = "select * from field where tablename='".$module."'";
+	$custquery = "select * from vtiger_field where vtiger_tablename='".$module."'";
 	$cust_result = $adb->query($custquery);
 	while($row = $adb->fetch_array($cust_result))
 	{

Modified: vtigercrm/trunk/modules/Import/ImportAccount.php
==============================================================================
--- vtigercrm/trunk/modules/Import/ImportAccount.php (original)
+++ vtigercrm/trunk/modules/Import/ImportAccount.php Mon Jun 12 14:26:25 2006
@@ -29,7 +29,7 @@
 require_once('modules/Accounts/Account.php');
 require_once('include/ComboUtil.php');
 
-// Account is used to store account information.
+// Account is used to store vtiger_account information.
 class ImportAccount extends Account {
 	 var $db;
 
@@ -39,7 +39,7 @@
 	//$comboFieldArray = getComboArray($comboFieldNames);
 
 
-	// This is the list of fields that are required.
+	// This is the list of vtiger_fields that are required.
 	var $required_fields =  array("accountname"=>1);
 	
 	// This is the list of the functions to run when importing
@@ -120,7 +120,7 @@
 	}
 
 
-	// This is the list of fields that are importable.
+	// This is the list of vtiger_fields that are importable.
 	// some if these do not map directly to database columns
 	/*var $importable_fields = Array(
 		"id"=>1

Modified: vtigercrm/trunk/modules/Import/ImportContact.php
==============================================================================
--- vtigercrm/trunk/modules/Import/ImportContact.php (original)
+++ vtigercrm/trunk/modules/Import/ImportContact.php Mon Jun 12 14:26:25 2006
@@ -29,9 +29,9 @@
 
 // Contact is used to store customer information.
 class ImportContact extends Contact {
-	// these are fields that may be set on import
+	// these are vtiger_fields that may be set on import
 	// but are to be processed and incorporated
-	// into fields of the parent class
+	// into vtiger_fields of the parent class
 	var $db;
 	var $full_name;
 	var $primary_address_street_2;
@@ -170,18 +170,18 @@
 
 		$query = '';
 
-		// if user is defining the account id to be associated with this contact..
-
-		//Modified to remove the spaces at first and last in account name -- after 4.2 patch 2
+		// if user is defining the vtiger_account id to be associated with this contact..
+
+		//Modified to remove the spaces at first and last in vtiger_account name -- after 4.2 patch 2
 		$acc_name = trim(addslashes($acc_name));
 
-		$query = "select crmentity.deleted, account.* from account,crmentity WHERE accountname='{$acc_name}' and crmentity.crmid =account.accountid";
+		$query = "select vtiger_crmentity.deleted, vtiger_account.* from vtiger_account,crmentity WHERE vtiger_accountname='{$acc_name}' and vtiger_crmentity.crmid =vtiger_account.accountid";
 
                 $result = $adb->query($query)	or die("Error selecting sugarbean: ".mysql_error());
 
                 $row = $this->db->fetchByAssoc($result, -1, false);
 
-		$adb->println("fetched account");
+		$adb->println("fetched vtiger_account");
 		$adb->println($row);
 
 		// we found a row with that id
@@ -191,14 +191,14 @@
                         if ( isset($row['deleted']) && $row['deleted'] == 1)
                         {
 				$adb->println("row exists - deleting");
-                                $query2 = "delete from crmentity WHERE crmid='". $row['accountid']."'";
+                                $query2 = "delete from vtiger_crmentity WHERE crmid='". $row['accountid']."'";
 
                                 $this->log->info($query2);
 
                                 $result2 = $adb->query($query2)	or die("Error deleting existing sugarbean: ".mysql_error());
 
                         }
-			// else just use this id to link the contact to the account
+			// else just use this id to link the contact to the vtiger_account
                         else
                         {				
                                 $focus->id = $row['accountid'];
@@ -206,10 +206,10 @@
                         }
                 }
 
-		// if we didnt find the account, so create it
+		// if we didnt find the vtiger_account, so create it
                 if (! isset($focus->id) || $focus->id == '')
                 {
-			$adb->println("Createing new account");
+			$adb->println("Createing new vtiger_account");
                         $focus->column_fields['accountname'] = $acc_name;
                         $focus->column_fields['assigned_user_id'] = $current_user->id;
                         $focus->column_fields['modified_user_id'] = $current_user->id;
@@ -223,8 +223,8 @@
 			// avoid duplicate mappings:
 			if (! isset( $imported_ids[$acc_id]) )
 			{
-				$adb->println("inserting users last import for accounts");
-				// save the new account as a users_last_import
+				$adb->println("inserting vtiger_users last import for vtiger_accounts");
+				// save the new vtiger_account as a vtiger_users_last_import
                 		$last_import = new UsersLastImport();
                 		$last_import->assigned_user_id = $current_user->id;
                 		$last_import->bean_type = "Accounts";
@@ -235,7 +235,7 @@
                 }
 
 		$adb->println("prev contact accid=".$this->column_fields["account_id"]);
-		// now just link the account
+		// now just link the vtiger_account
                 $this->column_fields["account_id"] = $focus->id;
 		$adb->println("curr contact accid=".$this->column_fields["account_id"]);
 
@@ -243,10 +243,10 @@
 
 	
 
-	// This is the list of fields that can be imported
+	// This is the list of vtiger_fields that can be imported
 	// some of these don't map directly to columns in the db
 
-	//we need to add two or more arrays as the columns are distributed across the tables now
+	//we need to add two or more arrays as the columns are distributed across the vtiger_tables now
 	/*var $importable_fields =  array(
 		"contactid"=>1,
 		"firstname"=>1,

Modified: vtigercrm/trunk/modules/Import/ImportLead.php
==============================================================================
--- vtigercrm/trunk/modules/Import/ImportLead.php (original)
+++ vtigercrm/trunk/modules/Import/ImportLead.php Mon Jun 12 14:26:25 2006
@@ -53,7 +53,7 @@
 		{
 			$this->db->println("searching and assigning ".$ass_user);
 
-			$result = $this->db->query("select id from users where user_name = '".$ass_user."'");
+			$result = $this->db->query("select id from vtiger_users where user_name = '".$ass_user."'");
 			if($this->db->num_rows($result)!=1)
 			{
 				$this->db->println("not exact records setting current userid");

Modified: vtigercrm/trunk/modules/Import/ImportMap.php
==============================================================================
--- vtigercrm/trunk/modules/Import/ImportMap.php (original)
+++ vtigercrm/trunk/modules/Import/ImportMap.php Mon Jun 12 14:26:25 2006
@@ -29,7 +29,7 @@
 	var $log;
 	var $db;
 
-	// Stored fields
+	// Stored vtiger_fields
 	var $id;
 	var $name;
 	var $module;

Modified: vtigercrm/trunk/modules/Import/ImportOpportunity.php
==============================================================================
--- vtigercrm/trunk/modules/Import/ImportOpportunity.php (original)
+++ vtigercrm/trunk/modules/Import/ImportOpportunity.php Mon Jun 12 14:26:25 2006
@@ -35,11 +35,11 @@
                       ,'sales_stage'=>'sales_stage_dom');
 $comboFieldArray = getComboArray($comboFieldNames);
 
-// Account is used to store account information.
+// Account is used to store vtiger_account information.
 class ImportOpportunity extends Potential {
 	 var $db;
 
-	// This is the list of fields that are required.
+	// This is the list of vtiger_fields that are required.
 	/*
 	var $required_fields =  array(
 					"potentialname"=>1,
@@ -133,9 +133,9 @@
 
 		$query = '';
 
-		// if user is defining the account id to be associated with this contact..
+		// if user is defining the vtiger_account id to be associated with this contact..
 		$acc_name = trim(addslashes($acc_name));
-		$query = "select crmentity.deleted, account.* from account,crmentity WHERE accountname='{$acc_name}' and crmentity.crmid =account.accountid";
+		$query = "select vtiger_crmentity.deleted, vtiger_account.* from vtiger_account,crmentity WHERE vtiger_accountname='{$acc_name}' and vtiger_crmentity.crmid =vtiger_account.accountid";
 
                 $this->log->info($query);
 
@@ -143,7 +143,7 @@
 
                 $row = $this->db->fetchByAssoc($result, -1, false);
 
-		$adb->println("fetched account");
+		$adb->println("fetched vtiger_account");
 		$adb->println($row);
 
 		// we found a row with that id
@@ -153,14 +153,14 @@
                         if ( isset($row['deleted']) && $row['deleted'] == 1)
                         {
 				$adb->println("row exists - deleting");
-                                $query2 = "delete from crmentity WHERE crmid='". $row['accountid']."'";
+                                $query2 = "delete from vtiger_crmentity WHERE crmid='". $row['accountid']."'";
 
                                 $this->log->info($query2);
 
                                 $result2 = $adb->query($query2)	or die("Error deleting existing sugarbean: ".mysql_error());
 
                         }
-			// else just use this id to link the contact to the account
+			// else just use this id to link the contact to the vtiger_account
                         else
                         {				
                                 $focus->id = $row['accountid'];
@@ -168,10 +168,10 @@
                         }
                 }
 
-		// if we didnt find the account, so create it
+		// if we didnt find the vtiger_account, so create it
                 if (! isset($focus->id) || $focus->id == '')
                 {
-			$adb->println("Createing new account");
+			$adb->println("Createing new vtiger_account");
                         $focus->column_fields['accountname'] = $acc_name;
                         $focus->column_fields['assigned_user_id'] = $current_user->id;
                         $focus->column_fields['modified_user_id'] = $current_user->id;
@@ -184,8 +184,8 @@
 			// avoid duplicate mappings:
 			if (! isset( $imported_ids[$acc_id]) )
 			{
-				$adb->println("inserting users last import for accounts");
-				// save the new account as a users_last_import
+				$adb->println("inserting vtiger_users last import for vtiger_accounts");
+				// save the new vtiger_account as a vtiger_users_last_import
                 		$last_import = new UsersLastImport();
                 		$last_import->assigned_user_id = $current_user->id;
                 		$last_import->bean_type = "Accounts";
@@ -196,7 +196,7 @@
                 }
 
 		$adb->println("prev contact accid=".$this->column_fields["account_id"]);
-		// now just link the account
+		// now just link the vtiger_account
                 $this->column_fields["account_id"] = $focus->id;
 		$adb->println("curr contact accid=".$this->column_fields["account_id"]);
 
@@ -213,7 +213,7 @@
 	}
 
 	
-	// This is the list of fields that are importable.
+	// This is the list of vtiger_fields that are importable.
 	// some if these do not map directly to database columns
 	/*var $importable_fields = Array(
 		"id"=>1

Modified: vtigercrm/trunk/modules/Import/ImportProduct.php
==============================================================================
--- vtigercrm/trunk/modules/Import/ImportProduct.php (original)
+++ vtigercrm/trunk/modules/Import/ImportProduct.php Mon Jun 12 14:26:25 2006
@@ -54,7 +54,7 @@
 		{
 			$this->db->println("searching and assigning ".$ass_user);
 
-			$result = $this->db->query("select id from users where user_name = '".$ass_user."'");
+			$result = $this->db->query("select id from vtiger_users where user_name = '".$ass_user."'");
 			if($this->db->num_rows($result)!=1)
 			{
 				$this->db->println("not exact records setting current userid");

Modified: vtigercrm/trunk/modules/Import/ImportSave.php
==============================================================================
--- vtigercrm/trunk/modules/Import/ImportSave.php (original)
+++ vtigercrm/trunk/modules/Import/ImportSave.php Mon Jun 12 14:26:25 2006
@@ -17,7 +17,7 @@
 	global $current_user;
 	global $adb;
 
-// MWC ** Getting users
+// MWC ** Getting vtiger_users
 $temp = get_user_array(FALSE);
 foreach ( $temp as $key=>$data)
 	$my_users[$data] = $key;
@@ -84,7 +84,7 @@
 
 	p("setting done");
 	
-	p("do save before req fields=".$do_save);
+	p("do save before req vtiger_fields=".$do_save);
 
 	$adb->println($focus->required_fields);
 
@@ -128,7 +128,7 @@
 			{
 				$_REQUEST['module']='contactdetails';
 			}
-			$dbquery="select * from field where tablename='".$_REQUEST['module']."'";
+			$dbquery="select * from vtiger_field where vtiger_tablename='".$_REQUEST['module']."'";
 			$custresult = $adb->query($dbquery);
 			if($adb->num_rows($custresult) != 0)
 			{

Modified: vtigercrm/trunk/modules/Import/ImportStep2.php
==============================================================================
--- vtigercrm/trunk/modules/Import/ImportStep2.php (original)
+++ vtigercrm/trunk/modules/Import/ImportStep2.php Mon Jun 12 14:26:25 2006
@@ -226,7 +226,7 @@
 
 $translated_column_fields = $mod_list_strings[$list_string_key];
 
-// adding custom fields translations
+// adding custom vtiger_fields translations
 getCustomFieldTrans($_REQUEST['module'],&$translated_column_fields);
 
 $cnt=1;
@@ -355,7 +355,7 @@
 {
 	var tagName;
 	var count = 0;
-	var field_count = "<?php echo $field_count; ?>";
+	var vtiger_field_count = "<?php echo $field_count; ?>";
 	var required_fields = new Array();
 	var required_fields_name = new Array();
 	var seq_string = '';
@@ -384,7 +384,7 @@
 			}
 			else
 			{
-				//if a field mapped more than once, alert the user and return
+				//if a vtiger_field mapped more than once, alert the user and return
 				alert("'"+tagName.options[tagName.selectedIndex].text+"' is mapped more than once. Please check the mapping.");
 				return false;
 			}
@@ -392,12 +392,12 @@
 
 	}
 
-	//check whether the mandatory fields have been mapped.
+	//check whether the mandatory vtiger_fields have been mapped.
 	for(inner_loop = 0; inner_loop<required_fields.length;inner_loop++)
 	{
 		if(seq_string.indexOf(required_fields[inner_loop]) == -1)
 		{
-			alert('Please map the mandatory field "'+required_fields_name[inner_loop]+'"');
+			alert('Please map the mandatory vtiger_field "'+required_fields_name[inner_loop]+'"');
 			return false;
 		}
 	}

Modified: vtigercrm/trunk/modules/Import/ImportStep3.php
==============================================================================
--- vtigercrm/trunk/modules/Import/ImportStep3.php (original)
+++ vtigercrm/trunk/modules/Import/ImportStep3.php Mon Jun 12 14:26:25 2006
@@ -112,13 +112,13 @@
 
 $focus = new $current_bean_type();
 
-//Constructing the custom field Array
+//Constructing the custom vtiger_field Array
 require_once('include/CustomFieldUtil.php');
 $custFldArray = getCustomFieldArray($_REQUEST['module']);
 p("IMP 3: custFldArray");
 p($custFldArray);
 
-//Initializing  an empty Array to store the custom field Column Name and Value
+//Initializing  an empty Array to store the custom vtiger_field Column Name and Value
 $resCustFldArray = Array();
 
 p("Getting from request");
@@ -137,13 +137,13 @@
 		continue;
 	}
 
-	// this value is a user defined field name
+	// this value is a user defined vtiger_field name
 	$user_field = $value;
 
-	// pull out the column position for this field name
+	// pull out the column position for this vtiger_field name
 	$pos = substr($name,6);
 
-	// make sure we haven't seen this field defined yet
+	// make sure we haven't seen this vtiger_field defined yet
 	if ( isset( $field_to_pos[$user_field]) )
 	{
 		show_error_import($mod_strings['LBL_ERROR_MULTIPLE']);
@@ -153,12 +153,12 @@
 
 	p("user_field=".$user_field." if=".$focus->importable_fields[$user_field]);
 	
-	// match up the "official" field to the user 
+	// match up the "official" vtiger_field to the user 
 	// defined one, and map to columm position: 
 	if ( isset( $focus->importable_fields[$user_field] ) || isset( $custFldArray[$user_field] ))
 	{
 		p("user_field SET=".$user_field);
-		// now mark that we've seen this field
+		// now mark that we've seen this vtiger_field
 		$field_to_pos[$user_field] = $pos;
 		$col_pos_to_field[$pos] = $user_field;
 	}
@@ -207,7 +207,7 @@
 	$firstrow = array_shift($datarows);
 }
 
-//Mark the last imported records as deleted which are imported by the current user in users_last_import table
+//Mark the last imported records as deleted which are imported by the current user in vtiger_users_last_import vtiger_table
 if(!isset($_REQUEST['startval']))
 {
 	$seedUsersLastImport = new UsersLastImport();

Modified: vtigercrm/trunk/modules/Import/UsersLastImport.php
==============================================================================
--- vtigercrm/trunk/modules/Import/UsersLastImport.php (original)
+++ vtigercrm/trunk/modules/Import/UsersLastImport.php Mon Jun 12 14:26:25 2006
@@ -32,7 +32,7 @@
 	var $log;
 	var $db;
 
-	// Stored fields
+	// Stored vtiger_fields
 	var $id;
 	var $assigned_user_id;
 	var $bean_type;
@@ -64,7 +64,7 @@
 	function mark_deleted_by_user_id($user_id)
         {
                 $query = "UPDATE $this->table_name set deleted=1 where assigned_user_id='$user_id'";
-                $this->db->query($query,true,"Error marking last imported accounts deleted: ");
+                $this->db->query($query,true,"Error marking last imported vtiger_accounts deleted: ");
         }
 
 
@@ -78,86 +78,86 @@
 		if ($this->bean_type == 'Contacts')
 		{
 				$query = "SELECT distinct crmid,
-				account.accountname as account_name,
-				contactdetails.contactid,
-				contactdetails.accountid,				
-				contactdetails.yahooid,
-				contactdetails.firstname,
-				contactdetails.lastname,
-				contactdetails.phone,
-				contactdetails.title,
-				contactdetails.email,
-				users.id as assigned_user_id,
+			vtiger_account.accountname as vtiger_account_name,
+			vtiger_contactdetails.contactid,
+			vtiger_contactdetails.accountid,				
+			vtiger_contactdetails.yahooid,
+			vtiger_contactdetails.firstname,
+			vtiger_contactdetails.lastname,
+			vtiger_contactdetails.phone,
+			vtiger_contactdetails.title,
+			vtiger_contactdetails.email,
+			vtiger_users.id as assigned_user_id,
 				smownerid,
-                                users.user_name as assigned_user_name
-				FROM contactdetails
-				left join users_last_import on users_last_import.bean_id=contactdetails.contactid
-				LEFT JOIN users ON contactdetails.contactid=users.id 
-				LEFT JOIN account  ON account.accountid=contactdetails.accountid 
-				inner join crmentity on crmentity.crmid=contactdetails.contactid  
-				WHERE users_last_import.assigned_user_id= '{$current_user->id}'  
-				AND users_last_import.bean_type='Contacts' 
-				AND users_last_import.deleted=0  AND crmentity.deleted=0";
+                                vtiger_users.user_name as assigned_user_name
+				FROM vtiger_contactdetails
+				left join vtiger_users_last_import on vtiger_users_last_import.bean_id=vtiger_contactdetails.contactid
+				LEFT JOIN vtiger_users ON vtiger_contactdetails.contactid=vtiger_users.id 
+				LEFT JOIN vtiger_account  ON vtiger_account.accountid=vtiger_contactdetails.accountid 
+				inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_contactdetails.contactid  
+				WHERE vtiger_users_last_import.assigned_user_id= '{$current_user->id}'  
+				AND vtiger_users_last_import.bean_type='Contacts' 
+				AND vtiger_users_last_import.deleted=0  AND vtiger_crmentity.deleted=0";
 			
 		} 
 		else if ($this->bean_type == 'Accounts')
 		{
-				$query = "SELECT distinct account.*, accountbillads.city,
-                                users.user_name assigned_user_name,
+				$query = "SELECT distinct vtiger_account.*, vtiger_accountbillads.city,
+                                vtiger_users.user_name assigned_user_name,
 				crmid, smownerid 
-				FROM account
-				inner join crmentity on crmentity.crmid=account.accountid
-				inner join accountbillads on crmentity.crmid=accountbillads.accountaddressid
-				left join users_last_import on users_last_import.bean_id=crmentity.crmid
-			       	left join users ON crmentity.smownerid=users.id
+				FROM vtiger_account
+				inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_account.accountid
+				inner join vtiger_accountbillads on vtiger_crmentity.crmid=vtiger_accountbillads.accountaddressid
+				left join vtiger_users_last_import on vtiger_users_last_import.bean_id=vtiger_crmentity.crmid
+			       	left join vtiger_users ON vtiger_crmentity.smownerid=vtiger_users.id
 				WHERE 
-				users_last_import.assigned_user_id=
+			vtiger_users_last_import.assigned_user_id=
 					'{$current_user->id}'
-				AND users_last_import.bean_type='Accounts'
-				AND users_last_import.deleted=0
-				AND crmentity.deleted=0
-				AND users.status='Active'";
+				AND vtiger_users_last_import.bean_type='Accounts'
+				AND vtiger_users_last_import.deleted=0
+				AND vtiger_crmentity.deleted=0
+				AND vtiger_users.status='Active'";
 		} 
 		else if ($this->bean_type == 'Potentials')
 		{
 		
 			$query = "SELECT distinct
-                                account.accountid account_id,
-                                account.accountname account_name,
-                                users.user_name assigned_user_name,
-				crmentity.crmid, smownerid,
-				potential.*
-                               FROM potential 
-			       inner join account on account.accountid=potential.accountid 
-			       inner join  crmentity on crmentity.crmid=potential.potentialid 
-			       left join users ON crmentity.smownerid=users.id 
-			       left join users_last_import on users_last_import.assigned_user_id=users.id 
-			       where users_last_import.assigned_user_id='{$current_user->id}'
-				AND users_last_import.bean_type='Potentials'
-				AND users_last_import.bean_id=crmentity.crmid
-				AND users_last_import.deleted=0
-				AND crmentity.deleted=0 
-				AND users.status='Active'";
+                                vtiger_account.accountid vtiger_account_id,
+                                vtiger_account.accountname vtiger_account_name,
+                                vtiger_users.user_name assigned_user_name,
+			vtiger_crmentity.crmid, smownerid,
+			vtiger_potential.*
+                               FROM vtiger_potential 
+			       inner join vtiger_account on vtiger_account.accountid=vtiger_potential.accountid 
+			       inner join  vtiger_crmentity on vtiger_crmentity.crmid=vtiger_potential.potentialid 
+			       left join vtiger_users ON vtiger_crmentity.smownerid=vtiger_users.id 
+			       left join vtiger_users_last_import on vtiger_users_last_import.assigned_user_id=vtiger_users.id 
+			       where vtiger_users_last_import.assigned_user_id='{$current_user->id}'
+				AND vtiger_users_last_import.bean_type='Potentials'
+				AND vtiger_users_last_import.bean_id=vtiger_crmentity.crmid
+				AND vtiger_users_last_import.deleted=0
+				AND vtiger_crmentity.deleted=0 
+				AND vtiger_users.status='Active'";
 
 		}
 		else if($this->bean_type == 'Leads')
 		{
-			$query = "SELECT distinct leaddetails.*, crmentity.crmid, leadaddress.phone,leadsubdetails.website,
-                                users.user_name assigned_user_name,
+			$query = "SELECT distinct vtiger_leaddetails.*, vtiger_crmentity.crmid, vtiger_leadaddress.phone,vtiger_leadsubdetails.website,
+                                vtiger_users.user_name assigned_user_name,
 				smownerid 
-				FROM leaddetails 
-				inner join crmentity on crmentity.crmid=leaddetails.leadid 
-				inner join leadaddress on crmentity.crmid=leadaddress.leadaddressid 
-				inner join leadsubdetails on crmentity.crmid=leadsubdetails.leadsubscriptionid 
-				left join users_last_import on users_last_import.bean_id=crmentity.crmid			       	
-				left join users ON crmentity.smownerid=users.id
+				FROM vtiger_leaddetails 
+				inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_leaddetails.leadid 
+				inner join vtiger_leadaddress on vtiger_crmentity.crmid=vtiger_leadaddress.leadaddressid 
+				inner join vtiger_leadsubdetails on vtiger_crmentity.crmid=vtiger_leadsubdetails.leadsubscriptionid 
+				left join vtiger_users_last_import on vtiger_users_last_import.bean_id=vtiger_crmentity.crmid			       	
+				left join vtiger_users ON vtiger_crmentity.smownerid=vtiger_users.id
 				WHERE 
-				users_last_import.assigned_user_id=
+			vtiger_users_last_import.assigned_user_id=
 					'{$current_user->id}'
-				AND users_last_import.bean_type='Leads'
-				AND users_last_import.deleted=0
-				AND crmentity.deleted=0
-				AND users.status='Active'";
+				AND vtiger_users_last_import.bean_type='Leads'
+				AND vtiger_users_last_import.deleted=0
+				AND vtiger_crmentity.deleted=0
+				AND vtiger_users.status='Active'";
 		}
 
 		
@@ -199,15 +199,15 @@
 	function undo_contacts($user_id)
 	{
 		$count = 0;
-		$query1 = "select bean_id from users_last_import where assigned_user_id='$user_id' AND bean_type='Contacts' AND deleted=0";
-
-		$this->log->info($query1); 
-
-		$result1 = $this->db->query($query1) or die("Error getting last import for undo: ".mysql_error()); 
-
-		while ( $row1 = $this->db->fetchByAssoc($result1))
-		{
-			$query2 = "update crmentity set deleted=1 where crmid='{$row1['bean_id']}'";
+		$query1 = "select bean_id from vtiger_users_last_import where assigned_user_id='$user_id' AND bean_type='Contacts' AND deleted=0";
+
+		$this->log->info($query1); 
+
+		$result1 = $this->db->query($query1) or die("Error getting last import for undo: ".mysql_error()); 
+
+		while ( $row1 = $this->db->fetchByAssoc($result1))
+		{
+			$query2 = "update vtiger_crmentity set deleted=1 where crmid='{$row1['bean_id']}'";
 
 			$this->log->info($query2); 
 
@@ -222,15 +222,15 @@
 	function undo_leads($user_id)
 	{
 		$count = 0;
-		$query1 = "select bean_id from users_last_import where assigned_user_id='$user_id' AND bean_type='Leads' AND deleted=0";
-
-		$this->log->info($query1); 
-
-		$result1 = $this->db->query($query1) or die("Error getting last import for undo: ".mysql_error()); 
-
-		while ( $row1 = $this->db->fetchByAssoc($result1))
-		{
-			$query2 = "update crmentity set deleted=1 where crmid='{$row1['bean_id']}'";
+		$query1 = "select bean_id from vtiger_users_last_import where assigned_user_id='$user_id' AND bean_type='Leads' AND deleted=0";
+
+		$this->log->info($query1); 
+
+		$result1 = $this->db->query($query1) or die("Error getting last import for undo: ".mysql_error()); 
+
+		while ( $row1 = $this->db->fetchByAssoc($result1))
+		{
+			$query2 = "update vtiger_crmentity set deleted=1 where crmid='{$row1['bean_id']}'";
 
 			$this->log->info($query2); 
 
@@ -246,15 +246,15 @@
 	{
 		// this should just be a loop foreach module type
 		$count = 0;
-		$query1 = "select bean_id from users_last_import where assigned_user_id='$user_id' AND bean_type='Accounts' AND deleted=0";
-
-		$this->log->info($query1); 
-
-		$result1 = $this->db->query($query1) or die("Error getting last import for undo: ".mysql_error()); 
-
-		while ( $row1 = $this->db->fetchByAssoc($result1))
-		{
-			$query2 = "update crmentity set deleted=1 where crmid='{$row1['bean_id']}'";
+		$query1 = "select bean_id from vtiger_users_last_import where assigned_user_id='$user_id' AND bean_type='Accounts' AND deleted=0";
+
+		$this->log->info($query1); 
+
+		$result1 = $this->db->query($query1) or die("Error getting last import for undo: ".mysql_error()); 
+
+		while ( $row1 = $this->db->fetchByAssoc($result1))
+		{
+			$query2 = "update vtiger_crmentity set deleted=1 where crmid='{$row1['bean_id']}'";
 
 			$this->log->info($query2); 
 
@@ -270,15 +270,15 @@
 	{
 		// this should just be a loop foreach module type
 		$count = 0;
-		$query1 = "select bean_id from users_last_import where assigned_user_id='$user_id' AND bean_type='Potentials' AND deleted=0";
-
-		$this->log->info($query1); 
-
-		$result1 = $this->db->query($query1) or die("Error getting last import for undo: ".mysql_error()); 
-
-		while ( $row1 = $this->db->fetchByAssoc($result1))
-		{
-			$query2 = "update crmentity set deleted=1 where crmid='{$row1['bean_id']}'";
+		$query1 = "select bean_id from vtiger_users_last_import where assigned_user_id='$user_id' AND bean_type='Potentials' AND deleted=0";
+
+		$this->log->info($query1); 
+
+		$result1 = $this->db->query($query1) or die("Error getting last import for undo: ".mysql_error()); 
+
+		while ( $row1 = $this->db->fetchByAssoc($result1))
+		{
+			$query2 = "update vtiger_crmentity set deleted=1 where crmid='{$row1['bean_id']}'";
 
 			$this->log->info($query2); 
 
@@ -293,15 +293,15 @@
 	function undo_products($user_id)
 	{
 		$count = 0;
-		$query1 = "select bean_id from users_last_import where assigned_user_id='$user_id' AND bean_type='Products' AND deleted=0";
-
-		$this->log->info($query1); 
-
-		$result1 = $this->db->query($query1) or die("Error getting last import for undo: ".mysql_error()); 
-
-		while ( $row1 = $this->db->fetchByAssoc($result1))
-		{
-			$query2 = "update crmentity set deleted=1 where crmid='{$row1['bean_id']}'";
+		$query1 = "select bean_id from vtiger_users_last_import where assigned_user_id='$user_id' AND bean_type='Products' AND deleted=0";
+
+		$this->log->info($query1); 
+
+		$result1 = $this->db->query($query1) or die("Error getting last import for undo: ".mysql_error()); 
+
+		while ( $row1 = $this->db->fetchByAssoc($result1))
+		{
+			$query2 = "update vtiger_crmentity set deleted=1 where crmid='{$row1['bean_id']}'";
 
 			$this->log->info($query2); 
 

Modified: vtigercrm/trunk/modules/Import/index.php
==============================================================================
--- vtigercrm/trunk/modules/Import/index.php (original)
+++ vtigercrm/trunk/modules/Import/index.php Mon Jun 12 14:26:25 2006
@@ -177,7 +177,7 @@
 
 
 /*
-ommited fields to map:
+ommited vtiger_fields to map:
 "Account Number"=>"",
 "Account Site"=>"",
 "Last Activity"=>"",

Modified: vtigercrm/trunk/modules/Import/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Import/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Import/language/en_us.lang.php Mon Jun 12 14:26:25 2006
@@ -25,18 +25,18 @@
 'LBL_IMPORT_MODULE_NO_DIRECTORY'=>'The directory ',
 'LBL_IMPORT_MODULE_NO_DIRECTORY_END'=>' does not exist or is not writable',
 'LBL_IMPORT_MODULE_ERROR_NO_UPLOAD'=>'File was not uploaded successfully, try again',
-'LBL_IMPORT_MODULE_ERROR_LARGE_FILE'=>'File is too large. Max:',
+'LBL_IMPORT_MODULE_ERROR_LARGE_FILE'=>'File is too vtiger_large. Max:',
 'LBL_IMPORT_MODULE_ERROR_LARGE_FILE_END'=>'Bytes. Change $upload_maxsize in config.php',
 'LBL_MODULE_NAME'=>'Import',
 'LBL_TRY_AGAIN'=>'Try Again',
 'LBL_ERROR'=>'Error:',
-'ERR_MULTIPLE'=>'Multiple columns have been defined with the same field name.',
-'ERR_MISSING_REQUIRED_FIELDS'=>'Missing required fields:',
+'ERR_MULTIPLE'=>'Multiple columns have been defined with the same vtiger_field name.',
+'ERR_MISSING_REQUIRED_FIELDS'=>'Missing required vtiger_fields:',
 'ERR_SELECT_FULL_NAME'=>'You cannot select Full Name when First Name and Last Name are selected.',
 'ERR_SELECT_FILE'=>'Select a file to upload.',
 'LBL_SELECT_FILE'=>'Select file:',
 'LBL_CUSTOM'=>'Custom',
-'LBL_DONT_MAP'=>'-- Do not map this field --',
+'LBL_DONT_MAP'=>'-- Do not map this vtiger_field --',
 'LBL_STEP_1_TITLE'=>'Step 1 of 4: Select Data Source',
 'LBL_WHAT_IS'=>'Please select a data source from the following:',
 'LBL_MICROSOFT_OUTLOOK'=>'Microsoft Outlook',
@@ -80,21 +80,21 @@
 'LBL_ACT_NUM_4'=>'Choose a filename and location for the exported data and click <b>Next</b>',
 'LBL_ACT_NUM_5'=>'Select <b>Contacts records only</b>',
 'LBL_ACT_NUM_6'=>'Click the <b>Options...</b> button',
-'LBL_ACT_NUM_7'=>'Select <b>Comma</b> as the field separator character',
-'LBL_ACT_NUM_8'=>'Check the <b>Yes, export field names</b> checkbox and click <b>OK</b>',
+'LBL_ACT_NUM_7'=>'Select <b>Comma</b> as the vtiger_field separator character',
+'LBL_ACT_NUM_8'=>'Check the <b>Yes, export vtiger_field names</b> checkbox and click <b>OK</b>',
 'LBL_ACT_NUM_9'=>'Click <b>Next</b>',
 'LBL_ACT_NUM_10'=>'Select <b>All Records</b> and then Click <b>Finish</b>',
 
 'LBL_IMPORT_SF_TITLE'=>'Salesforce.com can export data in the <b>Comma Separated Values</b> format which can be used to import data into the system. To export your data from Salesforce.com, follow the steps below:',
 'LBL_SF_NUM_1'=>'Open your browser, go to http://www.salesforce.com, and login with your email address and password',
-'LBL_SF_NUM_2'=>'Click on the <b>Reports</b> tab on the top menu',
+'LBL_SF_NUM_2'=>'Click on the <b>Reports</b> vtiger_tab on the top menu',
 'LBL_SF_NUM_3'=>'To export Accounts:</b> Click on the <b>Active Accounts</b> link<br><b>To export Contacts:</b> Click on the <b>Mailing List</b> link',
-'LBL_SF_NUM_4'=>'On <b>Step 1: Select your report type</b>, select <b>Tabular Report</b>click <b>Next</b>',
-'LBL_SF_NUM_5'=>'On <b>Step 2: Select the report columns</b>, choose the columns you want to export and click <b>Next</b>',
+'LBL_SF_NUM_4'=>'On <b>Step 1: Select your vtiger_report type</b>, select <b>Tabular Report</b>click <b>Next</b>',
+'LBL_SF_NUM_5'=>'On <b>Step 2: Select the vtiger_report columns</b>, choose the columns you want to export and click <b>Next</b>',
 'LBL_SF_NUM_6'=>'On <b>Step 3: Select the information to summarize</b>, just click <b>Next</b>',
-'LBL_SF_NUM_7'=>'On <b>Step 4: Order the report columns</b>, just click <b>Next</b>',
-'LBL_SF_NUM_8'=>'On <b>Step 5: Select your report criteria</b>, under <b>Start Date</b>, choose a date far enough in the past to include all your Accounts. You can also export a subset of Accounts using more advanced criteria. When you are done, click <b>Run Report</b>',
-'LBL_SF_NUM_9'=>'A report will be generated, and the page should display <b>Report Generation Status: Complete.</b> Now click <b>Export to Excel</b>',
+'LBL_SF_NUM_7'=>'On <b>Step 4: Order the vtiger_report columns</b>, just click <b>Next</b>',
+'LBL_SF_NUM_8'=>'On <b>Step 5: Select your vtiger_report criteria</b>, under <b>Start Date</b>, choose a date far enough in the past to include all your Accounts. You can also export a subset of Accounts using more advanced criteria. When you are done, click <b>Run Report</b>',
+'LBL_SF_NUM_9'=>'A vtiger_report will be generated, and the page should display <b>Report Generation Status: Complete.</b> Now click <b>Export to Excel</b>',
 'LBL_SF_NUM_10'=>'On <b>Export Report:</b>, for <b>Export File Format:</b>, choose <b>Comma Delimited .csv</b>. Click <b>Export</b>.',
 'LBL_SF_NUM_11'=>'A dialog will pop up for you to save the export file to your computer.',
 'LBL_IMPORT_CUSTOM_TITLE'=>'Many applications will allow you to export data into a <b>Comma Delimited text file (.csv)</b>. Generally most applications follow these general steps:',
@@ -105,9 +105,9 @@
 'LBL_STEP_3_TITLE'=>'Step 3 of 4: Confirm Fields and Import',
 'LBL_STEP_1'=>'Step 1 of 3 : ',
 'LBL_STEP_1_TITLE'=>'Select the .CSV File',
-'LBL_STEP_1_TEXT'=> ' vtiger CRM supports importing records from .csv (<b> Comma Separated Values</b> ) files. To start import, browse to locate the .CSV file and click on the Next button to Continue.',
-
-'LBL_SELECT_FIELDS_TO_MAP'=>'In the list below, select the fields in your import file that should be imported into each field in the system. When you are finished, click <b>Import Now</b>',
+'LBL_STEP_1_TEXT'=> ' vtiger CRM supports importing records from .csv (<b> Comma Separated Values</b> ) vtiger_files. To start import, browse to locate the .CSV file and click on the Next button to Continue.',
+
+'LBL_SELECT_FIELDS_TO_MAP'=>'In the list below, select the vtiger_fields in your import file that should be imported into each vtiger_field in the system. When you are finished, click <b>Import Now</b>',
 
 'LBL_DATABASE_FIELD'=>'Database Field',
 'LBL_HEADER_ROW'=>'Header Row',
@@ -119,15 +119,15 @@
 'LBL_CONTACTS_NOTE_4'=>'Fields ending in Address Street 2 and Address Street 3 are concatenated together with the main Address Street Field when inserted into the database.',
 'LBL_ACCOUNTS_NOTE_1'=>'Account Name must be mapped.',
 'LBL_ACCOUNTS_NOTE_2'=>'Fields ending in Address Street 2 and Address Street 3 are concatenated together with the main Address Street Field when inserted into the database.',
-'LBL_POTENTIALS_NOTE_1'=>'Potential Name, Account Name, Date Closed, and Sales Stage are required fields.',
-'LBL_OPPORTUNITIES_NOTE_1'=>'Opportunity Name, Account Name, Date Closed, and Sales Stage are required fields.',
+'LBL_POTENTIALS_NOTE_1'=>'Potential Name, Account Name, Date Closed, and Sales Stage are required vtiger_fields.',
+'LBL_OPPORTUNITIES_NOTE_1'=>'Opportunity Name, Account Name, Date Closed, and Sales Stage are required vtiger_fields.',
 'LBL_LEADS_NOTE_1'=>'Last Name must be mapped.',
 'LBL_LEADS_NOTE_2'=>'Company Name must be mapped.',
 'LBL_IMPORT_NOW'=>'Import Now',
 'LBL_'=>'',
 'LBL_'=>'',
 'LBL_CANNOT_OPEN'=>'Cannot open the imported file for reading',
-'LBL_NOT_SAME_NUMBER'=>'There were not the same number of fields per line in your file',
+'LBL_NOT_SAME_NUMBER'=>'There were not the same number of vtiger_fields per line in your file',
 'LBL_NO_LINES'=>'There were no lines in your import file',
 'LBL_FILE_ALREADY_BEEN_OR'=>'The import file has already been processed or does not exist',
 'LBL_SUCCESS'=>'Success! ',
@@ -135,7 +135,7 @@
 'LBL_LAST_IMPORT_UNDONE'=>'Your Last Import Was Undone',
 'LBL_NO_IMPORT_TO_UNDO'=>'There was no import to undo.',
 'LBL_FAIL'=>'Fail:',
-'LBL_RECORDS_SKIPPED'=>'records skipped because they were missing one or more required fields',
+'LBL_RECORDS_SKIPPED'=>'records skipped because they were missing one or more required vtiger_fields',
 'LBL_IDS_EXISTED_OR_LONGER'=>'records skipped because the id\'s either existed or where longer than 36 characters',
 'LBL_RESULTS'=>'Results',
 'LBL_IMPORT_MORE'=>'Import More',
@@ -143,7 +143,7 @@
 'LBL_UNDO_LAST_IMPORT'=>'Undo Last Import',
 
 'LBL_SUCCESS_1' => 'No. of Records Successfully Imported : ',
-'LBL_SKIPPED_1' => 'No. of Records Skipped as they were missing one or more required fields : ',
+'LBL_SKIPPED_1' => 'No. of Records Skipped as they were missing one or more required vtiger_fields : ',
 
 //Added for patch2 - Products Import Notes
 'LBL_PRODUCTS_NOTE_1'=>'Product Name must be mapped',
@@ -153,13 +153,13 @@
 'LBL_FILE_LOCATION'=>'File Location :',
 'LBL_STEP_2_3'=>'Step 2 of 3 :',
 'LBL_LIST_MAPPING'=>'List & Mapping',
-'LBL_STEP_2_MSG'=>'The following tables shows the imported',
+'LBL_STEP_2_MSG'=>'The following vtiger_tables shows the imported',
 'LBL_STEP_2_MSG1'=>'and other details.',
-'LBL_STEP_2_TXT'=>'To map the fields, Select the corresponding in combo boxes for each',
+'LBL_STEP_2_TXT'=>'To map the vtiger_fields, Select the corresponding in combo boxes for each',
 'LBL_USE_SAVED_MAPPING'=>'Use Saved Mapping :',
 'LBL_MAPPING'=>'Mapping',
 'LBL_HEADERS'=>'Headers :',
-'LBL_ERROR_MULTIPLE'=>'Same fields may be mapped twice. Please check the mapped fields.',
+'LBL_ERROR_MULTIPLE'=>'Same vtiger_fields may be mapped twice. Please check the mapped vtiger_fields.',
 
 );
 

Modified: vtigercrm/trunk/modules/Import/parse_utils.php
==============================================================================
--- vtigercrm/trunk/modules/Import/parse_utils.php (original)
+++ vtigercrm/trunk/modules/Import/parse_utils.php Mon Jun 12 14:26:25 2006
@@ -14,9 +14,9 @@
  ********************************************************************************/
 
 // takes a string and parses it into one record per line,
-// one field per delimiter, to a maximum number of lines
-// some files have a header, some dont.
-// keeps track of which fields are used
+// one vtiger_field per delimiter, to a maximum number of lines
+// some vtiger_files have a header, some dont.
+// keeps track of which vtiger_fields are used
 
 function parse_import($file_name,$delimiter,$max_lines,$has_header)
 {

Modified: vtigercrm/trunk/modules/Invoice/CreatePDF.php
==============================================================================
--- vtigercrm/trunk/modules/Invoice/CreatePDF.php (original)
+++ vtigercrm/trunk/modules/Invoice/CreatePDF.php Mon Jun 12 14:26:25 2006
@@ -15,7 +15,7 @@
 require_once('include/database/PearDatabase.php');
 
 global $adb,$app_strings,$products_per_page;
-$sql="select currency_symbol from currency_info";
+$sql="select vtiger_currency_symbol from vtiger_currency_info";
 $result = $adb->query($sql);
 $currency_symbol = $adb->query_result($result,0,'currency_symbol');
 
@@ -25,7 +25,7 @@
 
 $id = $_REQUEST['record'];
 
-//retreiving the invoice info
+//retreiving the vtiger_invoice info
 $focus = new Invoice();
 $focus->retrieve_entity_info($_REQUEST['record'],"Invoice");
 $account_name = getAccountName($focus->column_fields[account_id]);
@@ -60,7 +60,7 @@
 $status = $focus->column_fields["invoicestatus"];
 
 // Company information
-$add_query = "select * from organizationdetails";
+$add_query = "select * from vtiger_organizationdetails";
 $result = $adb->query($add_query);
 $num_rows = $adb->num_rows($result);
 
@@ -85,7 +85,7 @@
 $price_total = $currency_symbol.number_format(StripLastZero($focus->column_fields["hdnGrandTotal"]),2,'.',',');
 
 //getting the Product Data
-$query="select products.productname,products.unit_price,products.product_description,invoiceproductrel.* from invoiceproductrel inner join products on products.productid=invoiceproductrel.productid where invoiceid=".$id;
+$query="select vtiger_products.productname,vtiger_products.unit_price,vtiger_products.product_description,vtiger_invoiceproductrel.* from vtiger_invoiceproductrel inner join vtiger_products on vtiger_products.productid=vtiger_invoiceproductrel.productid where vtiger_invoiceid=".$id;
 
 global $result;
 $result = $adb->query($query);

Modified: vtigercrm/trunk/modules/Invoice/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/Invoice/EditView.php (original)
+++ vtigercrm/trunk/modules/Invoice/EditView.php Mon Jun 12 14:26:25 2006
@@ -47,7 +47,7 @@
 	$quote_focus->retrieve_entity_info($quoteid,"Quotes");
 	$focus = getConvertQuoteToInvoice($focus,$quote_focus,$quoteid);
 
-	//Added to display the Quote's associated products -- when we create invoice from Quotes DetailView 
+	//Added to display the Quote's associated vtiger_products -- when we create vtiger_invoice from Quotes DetailView 
 	$associated_prod = getAssociatedProducts("Quotes",$quote_focus);
 	$txtTax = (($quote_focus->column_fields['txtTax'] != '')?$quote_focus->column_fields['txtTax']:'0.000');
 	$txtAdj = (($quote_focus->column_fields['txtAdjustment'] != '')?$quote_focus->column_fields['txtAdjustment']:'0.000');
@@ -68,7 +68,7 @@
         $so_focus->retrieve_entity_info($soid,"SalesOrder");
         $focus = getConvertSoToInvoice($focus,$so_focus,$soid);
 
-	//Added to display the SalesOrder's associated products -- when we create invoice from SO DetailView
+	//Added to display the SalesOrder's associated vtiger_products -- when we create vtiger_invoice from SO DetailView
 	$associated_prod = getAssociatedProducts("SalesOrder",$so_focus);
 	$txtTax = (($so_focus->column_fields['txtTax'] != '')?$so_focus->column_fields['txtTax']:'0.000');
 	$txtAdj = (($so_focus->column_fields['txtAdjustment'] != '')?$so_focus->column_fields['txtAdjustment']:'0.000');
@@ -98,7 +98,7 @@
                 }
 
         }
-	//Handling for dateformat in invoicedate field
+	//Handling for dateformat in vtiger_invoicedate vtiger_field
         if($focus->column_fields['invoicedate'] != '')
         {
               $curr_due_date = $focus->column_fields['invoicedate'];
@@ -137,7 +137,7 @@
 			}
 
 		}
-		//Handling for dateformat in invoicedate field
+		//Handling for dateformat in vtiger_invoicedate vtiger_field
                 if($focus->column_fields['invoicedate'] != '')
                 {
                         $curr_due_date = $focus->column_fields['invoicedate'];

Modified: vtigercrm/trunk/modules/Invoice/Invoice.php
==============================================================================
--- vtigercrm/trunk/modules/Invoice/Invoice.php (original)
+++ vtigercrm/trunk/modules/Invoice/Invoice.php Mon Jun 12 14:26:25 2006
@@ -28,25 +28,25 @@
 require_once('data/CRMEntity.php');
 require_once('include/utils/utils.php');
 
-// Account is used to store account information.
+// Account is used to store vtiger_account information.
 class Invoice extends CRMEntity {
 	var $log;
 	var $db;
 
 
-	// Stored fields
+	// Stored vtiger_fields
 	var $id;
 	var $mode;
 	
 		
-	var $table_name = "invoice";
-	var $tab_name = Array('crmentity','invoice','invoicebillads','invoiceshipads','invoicecf');
-	var $tab_name_index = Array('crmentity'=>'crmid','invoice'=>'invoiceid','invoicebillads'=>'invoicebilladdressid','invoiceshipads'=>'invoiceshipaddressid','invoicecf'=>'invoiceid');
+	var $table_name = "vtiger_invoice";
+	var $tab_name = Array('vtiger_crmentity','vtiger_invoice','vtiger_invoicebillads','vtiger_invoiceshipads','vtiger_invoicecf');
+	var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_invoice'=>'invoiceid','vtiger_invoicebillads'=>'invoicebilladdressid','vtiger_invoiceshipads'=>'invoiceshipaddressid','vtiger_invoicecf'=>'invoiceid');
 				
 	
-	var $entity_table = "crmentity";
-	
-	var $billadr_table = "invoicebillads";
+	var $entity_table = "vtiger_crmentity";
+	
+	var $billadr_table = "vtiger_invoicebillads";
 
 	var $object_name = "Invoice";
 
@@ -58,10 +58,10 @@
 
 	var $sortby_fields = Array('subject','crmid','invoicestatus','smownerid');		
 
-	// This is used to retrieve related fields from form posts.
+	// This is used to retrieve related vtiger_fields from form posts.
 	var $additional_column_fields = Array('assigned_user_name', 'smownerid', 'opportunity_id', 'case_id', 'contact_id', 'task_id', 'note_id', 'meeting_id', 'call_id', 'email_id', 'parent_name', 'member_id' );
 
-	// This is the list of fields that are in the lists.
+	// This is the list of vtiger_fields that are in the lists.
 	var $list_fields = Array(
 				'Invoice Id'=>Array('crmentity'=>'crmid'),
 				'Subject'=>Array('invoice'=>'subject'),
@@ -95,7 +95,7 @@
 				        'Subject'=>'subject',
 				      );
 
-	// This is the list of fields that are required.
+	// This is the list of vtiger_fields that are required.
 	var $required_fields =  array("accountname"=>1);
 
 	//Added these variables which are used as default order by and sortorder in ListView
@@ -129,7 +129,7 @@
 
 		$returnset = '&return_module=Invoice&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')";
+		$query = "SELECT vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid, vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and (activitytype='Task' or vtiger_activitytype='Call' or vtiger_activitytype='Meeting') and vtiger_crmentity.deleted=0 and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Completed') and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Deferred') or (vtiger_activity.eventstatus != '' &&  vtiger_activity.eventstatus = 'Planned')";
 		$log->debug("Exiting get_activities method ...");
 		return  GetRelatedList('Invoice','Activities',$focus,$query,$button,$returnset);
 	}
@@ -137,20 +137,20 @@
 	{
 		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
-			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
-				inner join users on crmentity.smcreatorid= users.id
-				left join activitygrouprelation on activitygrouprelation.activityid=activity.activityid
-                                left join groups on groups.groupname=activitygrouprelation.groupname	
-			where (activity.activitytype = 'Meeting' or activity.activitytype='Call' or activity.activitytype='Task')
-				and (activity.status = 'Completed' or activity.status = 'Deferred' or (activity.eventstatus != 'Planned' and activity.eventstatus != ''))
-				and seactivityrel.crmid=".$id;
+		$query = "SELECT vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid,
+			vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime,
+			vtiger_crmentity.createdtime, vtiger_crmentity.description, vtiger_users.user_name
+			from vtiger_activity
+				inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid
+				inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid
+				left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid
+				left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid
+				inner join vtiger_users on vtiger_crmentity.smcreatorid= vtiger_users.id
+				left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_activity.activityid
+                                left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname	
+			where (vtiger_activity.activitytype = 'Meeting' or vtiger_activity.activitytype='Call' or vtiger_activity.activitytype='Task')
+				and (vtiger_activity.status = 'Completed' or vtiger_activity.status = 'Deferred' or (vtiger_activity.eventstatus != 'Planned' and vtiger_activity.eventstatus != ''))
+				and vtiger_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 ...");
@@ -161,35 +161,35 @@
 		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
-		$query = "select notes.title,'Notes      '  ActivityType, notes.filename,
-			attachments.type  FileType,crm2.modifiedtime lastmodified,
-			seattachmentsrel.attachmentsid attachmentsid, notes.notesid crmid,
-			crm2.createdtime, notes.notecontent description, users.user_name
-		from notes
-			inner join senotesrel on senotesrel.notesid= notes.notesid
-			inner join crmentity on crmentity.crmid= senotesrel.crmid
-			inner join crmentity crm2 on crm2.crmid=notes.notesid and crm2.deleted=0
-			left join seattachmentsrel  on seattachmentsrel.crmid =notes.notesid
-			left join attachments on seattachmentsrel.attachmentsid = attachments.attachmentsid
-			inner join users on crm2.smcreatorid= users.id
-		where crmentity.crmid=".$id;
+		// Desc: Inserted crm2.createdtime, vtiger_notes.notecontent description, vtiger_users.user_name
+		// Inserted inner join vtiger_users on crm2.smcreatorid= vtiger_users.id
+		$query = "select vtiger_notes.title,'Notes      '  ActivityType, vtiger_notes.filename,
+		vtiger_attachments.type  FileType,crm2.modifiedtime lastmodified,
+		vtiger_seattachmentsrel.attachmentsid vtiger_attachmentsid, vtiger_notes.notesid crmid,
+			crm2.createdtime, vtiger_notes.notecontent description, vtiger_users.user_name
+		from vtiger_notes
+			inner join vtiger_senotesrel on vtiger_senotesrel.notesid= vtiger_notes.notesid
+			inner join vtiger_crmentity on vtiger_crmentity.crmid= vtiger_senotesrel.crmid
+			inner join vtiger_crmentity crm2 on crm2.crmid=vtiger_notes.notesid and crm2.deleted=0
+			left join vtiger_seattachmentsrel  on vtiger_seattachmentsrel.crmid =vtiger_notes.notesid
+			left join vtiger_attachments on vtiger_seattachmentsrel.attachmentsid = vtiger_attachments.attachmentsid
+			inner join vtiger_users on crm2.smcreatorid= vtiger_users.id
+		where vtiger_crmentity.crmid=".$id;
 		$query .= ' union all ';
 		// Armando L?scher 18.10.2005 -> ?visibleDescription
-		// Desc: Inserted crm2.createdtime, attachments.description, users.user_name
-		// Inserted inner join users on crm2.smcreatorid= users.id
+		// Desc: Inserted crm2.createdtime, vtiger_attachments.description, vtiger_users.user_name
+		// Inserted inner join vtiger_users on crm2.smcreatorid= vtiger_users.id
 		// Inserted order by createdtime desc
-		$query .= "select attachments.description  title ,'Attachments'  ActivityType,
-			attachments.name filename, attachments.type FileType, crm2.modifiedtime lastmodified,
-			attachments.attachmentsid attachmentsid, seattachmentsrel.attachmentsid crmid,
-			crm2.createdtime, attachments.description, users.user_name
-		from attachments
-			inner join seattachmentsrel on seattachmentsrel.attachmentsid= attachments.attachmentsid
-			inner join crmentity on crmentity.crmid= seattachmentsrel.crmid
-			inner join crmentity crm2 on crm2.crmid=attachments.attachmentsid
-			inner join users on crm2.smcreatorid= users.id
-		where crmentity.crmid=".$id;
+		$query .= "select vtiger_attachments.description  title ,'Attachments'  ActivityType,
+		vtiger_attachments.name filename, vtiger_attachments.type FileType, crm2.modifiedtime lastmodified,
+		vtiger_attachments.attachmentsid vtiger_attachmentsid, vtiger_seattachmentsrel.attachmentsid crmid,
+			crm2.createdtime, vtiger_attachments.description, vtiger_users.user_name
+		from vtiger_attachments
+			inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid= vtiger_attachments.attachmentsid
+			inner join vtiger_crmentity on vtiger_crmentity.crmid= vtiger_seattachmentsrel.crmid
+			inner join vtiger_crmentity crm2 on crm2.crmid=vtiger_attachments.attachmentsid
+			inner join vtiger_users on crm2.smcreatorid= vtiger_users.id
+		where vtiger_crmentity.crmid=".$id;
 		$log->debug("Exiting get_attachments method ...");
 		return getAttachmentsAndNotes('Invoice',$query,$id);
 	}

Modified: vtigercrm/trunk/modules/Invoice/ListTopInvoice.php
==============================================================================
--- vtigercrm/trunk/modules/Invoice/ListTopInvoice.php (original)
+++ vtigercrm/trunk/modules/Invoice/ListTopInvoice.php Mon Jun 12 14:26:25 2006
@@ -52,7 +52,7 @@
 	$date_var = date('Y-m-d');
 
 	//Changed for Patch 2 by Don
-	$where = ' and crmentity.smownerid='.$current_user->id.' and  invoice.invoicestatus != \'Paid\' ORDER BY total DESC';
+	$where = ' and vtiger_crmentity.smownerid='.$current_user->id.' and  vtiger_invoice.invoicestatus != \'Paid\' ORDER BY total DESC';
 	$query = getListQuery("Invoice",$where);
 
 	//<<<<<<<<customview>>>>>>>>>

Modified: vtigercrm/trunk/modules/Invoice/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Invoice/Save.php (original)
+++ vtigercrm/trunk/modules/Invoice/Save.php Mon Jun 12 14:26:25 2006
@@ -34,11 +34,11 @@
 
 $focus->save("Invoice");
 
-//Checking if salesorderid is present and updating the quote status
+//Checking if vtiger_salesorderid is present and updating the quote status
 if($focus->column_fields["salesorder_id"] != '')
 {
         $so_id = $focus->column_fields["salesorder_id"];
-        $query1 = "update salesorder set sostatus='Approved' where salesorderid=".$so_id;
+        $query1 = "update vtiger_salesorder set vtiger_sostatus='Approved' where vtiger_salesorderid=".$so_id;
         $adb->query($query1);
 }
 
@@ -46,7 +46,7 @@
 $ext_prod_arr = Array();
 if($focus->mode == 'edit')
 {
-	$query2  = "select * from invoiceproductrel where invoiceid=".$focus->id;
+	$query2  = "select * from vtiger_invoiceproductrel where vtiger_invoiceid=".$focus->id;
 	$result2 = $adb->query($query2);
 	$num_rows = $adb->num_rows($result2);
 	for($i=0; $i<$num_rows;$i++)
@@ -56,7 +56,7 @@
 		$ext_prod_arr[$pro_id] = $pro_qty;	
 	}	
 
-        $query1 = "delete from invoiceproductrel where invoiceid=".$focus->id;
+        $query1 = "delete from vtiger_invoiceproductrel where vtiger_invoiceid=".$focus->id;
         $adb->query($query1);
 
 }
@@ -84,7 +84,7 @@
         if($prod_status != 'D')
         {
 
-                $query ="insert into invoiceproductrel values($focus->id, $prod_id, $qty, $listprice, $vat, $sales, $service)";
+                $query ="insert into vtiger_invoiceproductrel values($focus->id, $prod_id, $qty, $listprice, $vat, $sales, $service)";
                 $adb->query($query);
 		//Updating the Quantity in Stock in the Product Table
 		updateStk($prod_id,$qty,$focus->mode,$ext_prod_arr,'Invoice');

Modified: vtigercrm/trunk/modules/Invoice/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Invoice/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Invoice/language/en_us.lang.php Mon Jun 12 14:26:25 2006
@@ -83,10 +83,10 @@
 'NTC_COPY_SHIPPING_ADDRESS'=>'Copy shipping address to billing address',
 'NTC_REMOVE_MEMBER_ORG_CONFIRMATION'=>'Are you sure you want to remove this record as a member organization?',
 'LBL_DUPLICATE'=>'Potential Duplicate Accounts',
-'MSG_DUPLICATE' => 'Creating this account may potentialy create a duplicate account. You may either select an account from the list below or you may click on Create New Account to continue creating a new account with the previously entered data.',
+'MSG_DUPLICATE' => 'Creating this vtiger_account may vtiger_potentialy create a duplicate vtiger_account. You may either select an vtiger_account from the list below or you may click on Create New Account to continue creating a new vtiger_account with the previously entered data.',
 
 'LBL_INVITEE'=>'Contacts',
-'ERR_DELETE_RECORD'=>"A record number must be specified to delete the account.",
+'ERR_DELETE_RECORD'=>"A record number must be specified to delete the vtiger_account.",
 
 'LBL_SELECT_ACCOUNT'=>'Select Account',
 'LBL_GENERAL_INFORMATION'=>'General Information',
@@ -106,7 +106,7 @@
 'LBL_NEW_CONTACT'=>'New Contact',
 'LBL_CONTACT_TITLE'=>'Contacts',
 
-//Added fields after RC1 - Release
+//Added vtiger_fields after RC1 - Release
 'LBL_ALL'=>'All',
 'LBL_PROSPECT'=>'Prospect',
 'LBL_INVESTOR'=>'Investor',
@@ -120,7 +120,7 @@
 'Quote Name'=>'Quote Name',
 'Vendor Name'=>'Vendor Name',
 'Invoice Terms'=>'Invoice Terms',
-'Contact Name'=>'Contact Name',//to include contact name field in Invoice
+'Contact Name'=>'Contact Name',//to include contact name vtiger_field in Invoice
 'Invoice Date'=>'Invoice Date',
 'Sub Total'=>'Sub Total',
 'Due Date'=>'Due Date',

Modified: vtigercrm/trunk/modules/Invoice/pdf_templates/header.php
==============================================================================
--- vtigercrm/trunk/modules/Invoice/pdf_templates/header.php (original)
+++ vtigercrm/trunk/modules/Invoice/pdf_templates/header.php Mon Jun 12 14:26:25 2006
@@ -67,7 +67,7 @@
 $dueBlock=array("80","65");
 $pdf->addRecBlock($valid_till, "Due Date",$dueBlock);
 
-// invoice number block
+// vtiger_invoice number block
 $invBlock=array("145","65");
 $pdf->addRecBlock($id, "Invoice Number",$invBlock);
 

Modified: vtigercrm/trunk/modules/Leads/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/Leads/CallRelatedList.php Mon Jun 12 14:26:25 2006
@@ -47,7 +47,7 @@
        unset($_SESSION['rlvs']);
  }
 	
-$sql1 = $adb->query('select campaignid from leaddetails where leadid='.$focus->id);
+$sql1 = $adb->query('select vtiger_campaignid from vtiger_leaddetails where leadid='.$focus->id);
 $campaignid = $adb->query_result($sql1,0,'campaignid');
 if($campaignid == 0) $campaignid='';
 $smarty->assign("campaignid",$campaignid);

Modified: vtigercrm/trunk/modules/Leads/ConvertLead.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/ConvertLead.php (original)
+++ vtigercrm/trunk/modules/Leads/ConvertLead.php Mon Jun 12 14:26:25 2006
@@ -27,7 +27,7 @@
 }
 
 //Retreive lead details from database
-$sql = "SELECT firstname, lastname, company, smownerid from leaddetails inner join crmentity on crmentity.crmid=leaddetails.leadid where leaddetails.leadid =".$id;
+$sql = "SELECT firstname, lastname, company, smownerid from vtiger_leaddetails inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_leaddetails.leadid where vtiger_leaddetails.leadid =".$id;
 $result = $adb->query($sql);
 $row = $adb->fetch_array($result);
 
@@ -38,7 +38,7 @@
 $company = $row["company"];
 $log->debug(" the company is  ".$company);
 $potentialname = $row["company"] ."-";
-$log->debug(" the potentialname is ".$potentialname);
+$log->debug(" the vtiger_potentialname is ".$potentialname);
 $userid = $row["smownerid"];
 $log->debug(" the userid is ".$userid);
 
@@ -48,7 +48,7 @@
 
 $date_format = parse_calendardate($app_strings['NTC_DATE_FORMAT']);
 
-$sales_stage_query="select * from sales_stage";
+$sales_stage_query="select * from vtiger_sales_stage";
 $sales_stage_result = $adb->query($sales_stage_query);
 $noofsalesRows = $adb->num_rows($sales_stage_result);
 $sales_stage_fld = '';
@@ -114,13 +114,13 @@
 						<tr>
 							<td align="right" class="dvtCellLabel" width="50%"><font color="red">*</font>'.$mod_strings['LBL_POTENTIAL_NAME'].'</td>
 							<td class="dvtCellInfo" width="50%">
-							<input name="potential_name" value="'.$potentialname.'" tabindex="3">
+							<input name="potential_name" value="'.$potentialname.'" vtiger_tabindex="3">
                                                         </td>
 						</tr>
 						<tr>
 							<td align="right" class="dvtCellLabel"><font color="red">*</font>'.$mod_strings['LBL_POTENTIAL_CLOSE_DATE'].'</td>
 							<td class="dvtCellInfo">
-								<input name="closedate" class="dvtCellInfo" id="jscal_field" type="text" tabindex="4" size="10" maxlength="10" value="'.$focus->closedate.'">
+								<input name="closedate" class="dvtCellInfo" id="jscal_field" type="text" vtiger_tabindex="4" size="10" maxlength="10" value="'.$focus->closedate.'">
 								<font size=1><em old="(yyyy-mm-dd)">('.$current_user->date_format.')</em></font>
 							</td>
 						</tr>

Modified: vtigercrm/trunk/modules/Leads/Forms.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/Forms.php (original)
+++ vtigercrm/trunk/modules/Leads/Forms.php Mon Jun 12 14:26:25 2006
@@ -66,7 +66,7 @@
 }
 
 /**
- * Create HTML form to enter a new record with the minimum necessary fields.
+ * Create HTML form to enter a new record with the minimum necessary vtiger_fields.
  */
 
  
@@ -95,7 +95,7 @@
 
 $qcreate_form = get_left_form_header($mod_strings['LBL_NEW_FORM_TITLE']);
 
-$qcreate_get_field="select * from field where tabid=7 and quickcreate=0 order by quickcreatesequence";
+$qcreate_get_field="select * from vtiger_field where vtiger_tabid=7 and quickcreate=0 order by quickcreatesequence";
 $qcreate_get_result=$adb->query($qcreate_get_field);
 $qcreate_get_noofrows=$adb->num_rows($qcreate_get_result);
 
@@ -179,9 +179,9 @@
 $qcreate_form.='</form>';
 $qcreate_form.='<script type="text/javascript">
 		
-	var fieldname = new Array('.$fieldName.')
-	var fieldlabel = new Array('.$fieldLabel.')
-	var fielddatatype = new Array('.$fldDataType.')
+	var vtiger_fieldname = new Array('.$fieldName.')
+	var vtiger_fieldlabel = new Array('.$fieldLabel.')
+	var vtiger_fielddatatype = new Array('.$fldDataType.')
 
 		</script>';
 

Modified: vtigercrm/trunk/modules/Leads/Lead.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/Lead.php (original)
+++ vtigercrm/trunk/modules/Leads/Lead.php Mon Jun 12 14:26:25 2006
@@ -30,12 +30,12 @@
 
 	var $module_id = "leadid";
 
-	var $tab_name = Array('crmentity','leaddetails','leadsubdetails','leadaddress','leadscf');
-	var $tab_name_index = Array('crmentity'=>'crmid','leaddetails'=>'leadid','leadsubdetails'=>'leadsubscriptionid','leadaddress'=>'leadaddressid','leadscf'=>'leadid');
-
-
-	var $entity_table = "crmentity";
-	var $table_name = "leaddetails";
+	var $tab_name = Array('vtiger_crmentity','vtiger_leaddetails','vtiger_leadsubdetails','vtiger_leadaddress','vtiger_leadscf');
+	var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_leaddetails'=>'leadid','vtiger_leadsubdetails'=>'leadsubscriptionid','vtiger_leadaddress'=>'leadaddressid','vtiger_leadscf'=>'leadid');
+
+
+	var $entity_table = "vtiger_crmentity";
+	var $table_name = "vtiger_leaddetails";
 
 	var $object_name = "Lead";
 
@@ -53,10 +53,10 @@
 	,'rating'=>'rating_dom'
 	,'licencekey'=>'licensekey_dom');
 
-	// This is used to retrieve related fields from form posts.
+	// This is used to retrieve related vtiger_fields from form posts.
 	var $additional_column_fields = Array('smcreatorid', 'smownerid', 'contactid','potentialid' ,'crmid');
 
-	// This is the list of fields that are in the lists.
+	// This is the list of vtiger_fields that are in the lists.
 	var $list_fields = Array(
 		'Last Name'=>Array('leaddetails'=>'lastname'),
 		'First Name'=>Array('leaddetails'=>'firstname'),
@@ -138,36 +138,36 @@
 		{
 
 			$query = $this->constructCustomQueryAddendum('leadscf','Leads') . " 
-				leaddetails.*, ".$this->entity_table.".*, leadsubdetails.*,leadaddress.city city, leadaddress.state state,leadaddress.code code,leadaddress.country country, leadaddress.phone phone, users.user_name, users.status user_status
+			vtiger_leaddetails.*, ".$this->entity_table.".*, vtiger_leadsubdetails.*,vtiger_leadaddress.city city, vtiger_leadaddress.state state,vtiger_leadaddress.code code,vtiger_leadaddress.country country, vtiger_leadaddress.phone phone, vtiger_users.user_name, vtiger_users.status user_status
 				FROM ".$this->entity_table."
-				INNER JOIN leaddetails
-				ON crmentity.crmid=leaddetails.leadid
-				LEFT JOIN leadaddress 
-				ON leaddetails.leadid=leadaddress.leadaddressid
-				LEFT JOIN leadsubdetails
-				ON leaddetails.leadid=leadsubdetails.leadsubscriptionid
-				LEFT JOIN leadscf 
-				ON leadscf.leadid=leaddetails.leadid
-				LEFT JOIN users
-				ON crmentity.smownerid = users.id ";
+				INNER JOIN vtiger_leaddetails
+				ON vtiger_crmentity.crmid=vtiger_leaddetails.leadid
+				LEFT JOIN vtiger_leadaddress 
+				ON vtiger_leaddetails.leadid=vtiger_leadaddress.leadaddressid
+				LEFT JOIN vtiger_leadsubdetails
+				ON vtiger_leaddetails.leadid=vtiger_leadsubdetails.leadsubscriptionid
+				LEFT JOIN vtiger_leadscf 
+				ON vtiger_leadscf.leadid=vtiger_leaddetails.leadid
+				LEFT JOIN vtiger_users
+				ON vtiger_crmentity.smownerid = vtiger_users.id ";
 
 		}
 		else
 		{
 			$query = "SELECT 
-				leaddetails.*, ".$this->entity_table.".*, leadsubdetails.*,leadaddress.*,users.user_name, users.status user_status FROM ".$this->entity_table."
-				INNER JOIN leaddetails
-				ON crmentity.crmid=leaddetails.leadid
-				LEFT JOIN leadsubdetails
-				ON leaddetails.leadid = leadsubdetails.leadsubscriptionid
-				LEFT JOIN leadaddress
-				ON leaddetails.leadid=leadaddress.leadaddressid
-				LEFT JOIN users
-				ON crmentity.smownerid = users.id ";
+			vtiger_leaddetails.*, ".$this->entity_table.".*, vtiger_leadsubdetails.*,vtiger_leadaddress.*,vtiger_users.user_name, vtiger_users.status user_status FROM ".$this->entity_table."
+				INNER JOIN vtiger_leaddetails
+				ON vtiger_crmentity.crmid=vtiger_leaddetails.leadid
+				LEFT JOIN vtiger_leadsubdetails
+				ON vtiger_leaddetails.leadid = vtiger_leadsubdetails.leadsubscriptionid
+				LEFT JOIN vtiger_leadaddress
+				ON vtiger_leaddetails.leadid=vtiger_leadaddress.leadaddressid
+				LEFT JOIN vtiger_users
+				ON vtiger_crmentity.smownerid = vtiger_users.id ";
 		}
 
-		$where_auto = " users.status='Active'
-			AND crmentity.deleted=0 AND leaddetails.converted =0";
+		$where_auto = " vtiger_users.status='Active'
+			AND vtiger_crmentity.deleted=0 AND vtiger_leaddetails.converted =0";
 
 		if($where != "")
 			$query .= "where ($where) AND ".$where_auto;
@@ -203,7 +203,7 @@
 
 
 	// First, get the list of IDs.
-	$query = "SELECT contactdetails.lastname, contactdetails.firstname, contactdetails.contactid, 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 != 'Held')";
+	$query = "SELECT vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid, vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name,vtiger_recurringevents.recurringtype from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and (activitytype='Task' or vtiger_activitytype='Call' or vtiger_activitytype='Meeting') and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Completed') and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Deferred') or (vtiger_activity.eventstatus !='' && vtiger_activity.eventstatus != 'Held')";
 	$log->debug("Exiting get_activities method ...");
 	return  GetRelatedList('Leads','Activities',$focus,$query,$button,$returnset);
 }
@@ -228,7 +228,7 @@
 	}
 	$returnset = '&return_module=Leads&return_action=DetailView&return_id='.$id;
 
-	$query ="select activity.activityid, activity.subject, activity.semodule, activity.activitytype, activity.date_start, activity.status, activity.priority, 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 inner join users on  users.id=crmentity.smownerid where activity.activitytype='Emails' and crmentity.deleted=0 and seactivityrel.crmid=".$id;
+	$query ="select vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.semodule, vtiger_activity.activitytype, vtiger_activity.date_start, vtiger_activity.status, vtiger_activity.priority, vtiger_crmentity.crmid,vtiger_crmentity.smownerid,vtiger_crmentity.modifiedtime, vtiger_users.user_name from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid inner join vtiger_users on  vtiger_users.id=vtiger_crmentity.smownerid where vtiger_activity.activitytype='Emails' and vtiger_crmentity.deleted=0 and vtiger_seactivityrel.crmid=".$id;
 	$log->debug("Exiting get_emails method ...");
 	return GetRelatedList('Leads','Emails',$focus,$query,$button,$returnset);
 }
@@ -237,21 +237,21 @@
 {
 	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,
-		crmentity.createdtime, crmentity.description, users.user_name,activitygrouprelation.groupname
-			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 activitygrouprelation on activitygrouprelation.activityid=activity.activityid
-			left join groups on groups.groupname=activitygrouprelation.groupname 
-			left join users on crmentity.smownerid= users.id
-			where (activity.activitytype = 'Meeting' or activity.activitytype='Call' or activity.activitytype='Task')
-			and (activity.status = 'Completed' or activity.status = 'Deferred' or (activity.eventstatus = 'Held' and activity.eventstatus != ''))
-			and seactivityrel.crmid=".$id;
+	$query = "SELECT vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.status,
+	vtiger_activity.eventstatus, vtiger_activity.activitytype, vtiger_contactdetails.contactid,
+	vtiger_contactdetails.firstname, vtiger_contactdetails.lastname, vtiger_crmentity.modifiedtime,
+	vtiger_crmentity.createdtime, vtiger_crmentity.description, vtiger_users.user_name,vtiger_activitygrouprelation.groupname
+			from vtiger_activity
+			inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid
+			inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid
+			left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid
+			left join vtiger_contactdetails on vtiger_contactdetails.contactid= vtiger_cntactivityrel.contactid
+			left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_activity.activityid
+			left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname 
+			left join vtiger_users on vtiger_crmentity.smownerid= vtiger_users.id
+			where (vtiger_activity.activitytype = 'Meeting' or vtiger_activity.activitytype='Call' or vtiger_activity.activitytype='Task')
+			and (vtiger_activity.status = 'Completed' or vtiger_activity.status = 'Deferred' or (vtiger_activity.eventstatus = 'Held' and vtiger_activity.eventstatus != ''))
+			and vtiger_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 ...");
@@ -263,35 +263,35 @@
 	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
-	$query = "select notes.title,'Notes      ' ActivityType, notes.filename,
-		attachments.type  FileType,crm2.modifiedtime lastmodified,
-		seattachmentsrel.attachmentsid attachmentsid, notes.notesid crmid,
-		crm2.createdtime, notes.notecontent description, users.user_name
-			from notes
-			inner join senotesrel on senotesrel.notesid= notes.notesid
-			inner join crmentity on crmentity.crmid= senotesrel.crmid
-			inner join crmentity crm2 on crm2.crmid=notes.notesid and crm2.deleted=0
-			left join seattachmentsrel  on seattachmentsrel.crmid =notes.notesid
-			left join attachments on seattachmentsrel.attachmentsid = attachments.attachmentsid
-			inner join users on crm2.smcreatorid= users.id
-			where crmentity.crmid=".$id;
+	// Desc: Inserted crm2.createdtime, vtiger_notes.notecontent description, vtiger_users.user_name
+	// Inserted inner join vtiger_users on crm2.smcreatorid= vtiger_users.id
+	$query = "select vtiger_notes.title,'Notes      ' ActivityType, vtiger_notes.filename,
+	vtiger_attachments.type  FileType,crm2.modifiedtime lastmodified,
+	vtiger_seattachmentsrel.attachmentsid vtiger_attachmentsid, vtiger_notes.notesid crmid,
+		crm2.createdtime, vtiger_notes.notecontent description, vtiger_users.user_name
+			from vtiger_notes
+			inner join vtiger_senotesrel on vtiger_senotesrel.notesid= vtiger_notes.notesid
+			inner join vtiger_crmentity on vtiger_crmentity.crmid= vtiger_senotesrel.crmid
+			inner join vtiger_crmentity crm2 on crm2.crmid=vtiger_notes.notesid and crm2.deleted=0
+			left join vtiger_seattachmentsrel  on vtiger_seattachmentsrel.crmid =vtiger_notes.notesid
+			left join vtiger_attachments on vtiger_seattachmentsrel.attachmentsid = vtiger_attachments.attachmentsid
+			inner join vtiger_users on crm2.smcreatorid= vtiger_users.id
+			where vtiger_crmentity.crmid=".$id;
 	$query .= ' union all ';
 	// Armando L?scher 18.10.2005 -> ?visibleDescription
-	// Desc: Inserted crm2.createdtime, attachments.description, users.user_name
-	// Inserted inner join users on crm2.smcreatorid= users.id
+	// Desc: Inserted crm2.createdtime, vtiger_attachments.description, vtiger_users.user_name
+	// Inserted inner join vtiger_users on crm2.smcreatorid= vtiger_users.id
 	// Inserted order by createdtime desc
-	$query .= "select attachments.description title ,'Attachments' ActivityType,
-		attachments.name filename, attachments.type FileType,crm2.modifiedtime lastmodified,
-		attachments.attachmentsid attachmentsid, seattachmentsrel.attachmentsid crmid,
-		crm2.createdtime, attachments.description, users.user_name
-			from attachments
-			inner join seattachmentsrel on seattachmentsrel.attachmentsid= attachments.attachmentsid
-			inner join crmentity on crmentity.crmid= seattachmentsrel.crmid
-			inner join crmentity crm2 on crm2.crmid=attachments.attachmentsid
-			inner join users on crm2.smcreatorid= users.id
-			where crmentity.crmid=".$id."
+	$query .= "select vtiger_attachments.description title ,'Attachments' ActivityType,
+	vtiger_attachments.name filename, vtiger_attachments.type FileType,crm2.modifiedtime lastmodified,
+	vtiger_attachments.attachmentsid vtiger_attachmentsid, vtiger_seattachmentsrel.attachmentsid crmid,
+		crm2.createdtime, vtiger_attachments.description, vtiger_users.user_name
+			from vtiger_attachments
+			inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid= vtiger_attachments.attachmentsid
+			inner join vtiger_crmentity on vtiger_crmentity.crmid= vtiger_seattachmentsrel.crmid
+			inner join vtiger_crmentity crm2 on crm2.crmid=vtiger_attachments.attachmentsid
+			inner join vtiger_users on crm2.smcreatorid= vtiger_users.id
+			where vtiger_crmentity.crmid=".$id."
 			order by createdtime desc";
 
 	$log->debug("Exiting get_attachments method ...");
@@ -316,7 +316,7 @@
 	}
 	$returnset = '&return_module=Leads&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 from products inner join seproductsrel on products.productid = seproductsrel.productid inner join crmentity on crmentity.crmid = products.productid inner join leaddetails on leaddetails.leadid = seproductsrel.crmid  where leaddetails.leadid = '.$id.' and crmentity.deleted = 0';
+	$query = 'select vtiger_products.productid, vtiger_products.productname, vtiger_products.productcode, vtiger_products.commissionrate, vtiger_products.qty_per_unit, vtiger_products.unit_price, vtiger_crmentity.crmid, vtiger_crmentity.smownerid from vtiger_products inner join vtiger_seproductsrel on vtiger_products.productid = vtiger_seproductsrel.productid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_products.productid inner join vtiger_leaddetails on vtiger_leaddetails.leadid = vtiger_seproductsrel.crmid  where vtiger_leaddetails.leadid = '.$id.' and vtiger_crmentity.deleted = 0';
 	$log->debug("Exiting get_products method ...");
 	return  GetRelatedList('Leads','Products',$focus,$query,$button,$returnset);
 }
@@ -335,7 +335,7 @@
 {
 	global $log;
 	$log->debug("Entering getColumnNames_Lead() method ...");
-	$sql1 = "select fieldlabel from field where tabid=7";
+	$sql1 = "select vtiger_fieldlabel from vtiger_field where vtiger_tabid=7";
 	$result = $this->db->query($sql1);
 	$numRows = $this->db->num_rows($result);
 	for($i=0; $i < $numRows;$i++)

Modified: vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php (original)
+++ vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php Mon Jun 12 14:26:25 2006
@@ -40,7 +40,7 @@
 if($check_unit[1] == "")
         $potential_name = $check_unit[0];
 
-//Retrieve info from all the tables related to leads
+//Retrieve info from all the vtiger_tables related to leads
   $focus = new Lead();
  $focus->retrieve_entity_info($id,"Leads");
 
@@ -54,48 +54,48 @@
 
 $crmid = $adb->getUniqueID("crmentity");
 
-//function for getting the custom values from leads and saving to account/contact/potential custom fields -Jag
+//function for getting the custom values from leads and saving to vtiger_account/contact/potential custom vtiger_fields -Jag
 function getInsertValues($type,$type_id)
 {
 	global $id,$adb,$log;
 	$log->debug("Entering getInsertValues(".$type.",".$type_id.") method ...");
-	$sql_convert_lead="select * from convertleadmapping ";
+	$sql_convert_lead="select * from vtiger_convertleadmapping ";
 	$convert_result = $adb->query($sql_convert_lead);
 	$noofrows = $adb->num_rows($convert_result);
 
 	for($i=0;$i<$noofrows;$i++)
 	{
 		$flag="false";
-	 	$log->info("In convertleadmapping function");
+	 	$log->info("In vtiger_convertleadmapping function");
 		$lead_id=$adb->query_result($convert_result,$i,"leadfid");  
-		//Getting the relatd customfields for Accounts/Contact/potential from convertleadmapping table	
+		//Getting the relatd customfields for Accounts/Contact/potential from vtiger_convertleadmapping vtiger_table	
 		$account_id_val=$adb->query_result($convert_result,$i,"accountfid");
 		$contact_id_val=$adb->query_result($convert_result,$i,"contactfid");
 		$potential_id_val=$adb->query_result($convert_result,$i,"potentialfid");
 		
-		$sql_leads_column="select field.fieldid,field.columnname from field,tab where field.tabid=tab.tabid and generatedtype=2 and tab.name='Leads' and fieldid=".$lead_id; //getting the columnname for the customfield of the lead
-
-		 $log->debug("Lead's custom field coumn name is ".$sql_leads_column);
+		$sql_leads_column="select vtiger_field.fieldid,vtiger_field.columnname from vtiger_field,tab where vtiger_field.tabid=vtiger_tab.tabid and generatedtype=2 and vtiger_tab.name='Leads' and vtiger_fieldid=".$lead_id; //getting the columnname for the customfield of the lead
+
+		 $log->debug("Lead's custom vtiger_field coumn name is ".$sql_leads_column);
 
 		$lead_column_result = $adb->query($sql_leads_column);
 		$leads_no_rows = $adb->num_rows($lead_column_result);
 		if($leads_no_rows>0)
 		{
 			$lead_column_name=$adb->query_result($lead_column_result,0,"columnname");
-			$sql_leads_val="select ".$lead_column_name." from leadscf where leadid=".$id; //custom field value for lead
+			$sql_leads_val="select ".$lead_column_name." from vtiger_leadscf where leadid=".$id; //custom vtiger_field value for lead
 			$lead_val_result = $adb->query($sql_leads_val);
 			$lead_value=$adb->query_result($lead_val_result,0,$lead_column_name);
-			 $log->debug("Lead's custom field value is ".$lead_value);
+			 $log->debug("Lead's custom vtiger_field value is ".$lead_value);
 		}	
-		//Query for getting the column name for Accounts/Contacts/Potentials if custom field for lead is mappped
-		$sql_type="select field.fieldid,field.columnname from field,tab where field.tabid=tab.tabid and generatedtype=2 and tab.name="; 
+		//Query for getting the column name for Accounts/Contacts/Potentials if custom vtiger_field for lead is mappped
+		$sql_type="select vtiger_field.fieldid,vtiger_field.columnname from vtiger_field,tab where vtiger_field.tabid=vtiger_tab.tabid and generatedtype=2 and vtiger_tab.name="; 
 		if($type=="Accounts")
 		{
 			if($account_id_val!="" && $account_id_val!=0)	
 			{
 				$flag="true";
-				 $log->info("Getting the  Accounts custom field column name  ");
-				$sql_type.="'Accounts' and fieldid=".$account_id_val;
+				 $log->info("Getting the  Accounts custom vtiger_field column name  ");
+				$sql_type.="'Accounts' and vtiger_fieldid=".$account_id_val;
 			}
 		}
 		else if($type == "Contacts")
@@ -103,8 +103,8 @@
 			if($contact_id_val!="" && $contact_id_val!=0)	
 			{
 				$flag="true";
-				 $log->info("Getting the  Contacts custom field column name  ");
-				$sql_type.="'Contacts' and fieldid=".$contact_id_val;
+				 $log->info("Getting the  Contacts custom vtiger_field column name  ");
+				$sql_type.="'Contacts' and vtiger_fieldid=".$contact_id_val;
 			}
 		}
 		else if($type == "Potentials")
@@ -112,8 +112,8 @@
 			if($potential_id_val!="" && $potential_id_val!=0)
                         {
 				$flag="true";
-                                  $log->info("Getting the  Potentials custom field column name  ");
-				$sql_type.="'Potentials' and fieldid=".$potential_id_val;
+                                  $log->info("Getting the  Potentials custom vtiger_field column name  ");
+				$sql_type.="'Potentials' and vtiger_fieldid=".$potential_id_val;
                         }
 
 		}
@@ -145,7 +145,7 @@
 	global $adb,$log,$id;
 	$log->debug("Entering getRelatedNotesAttachments(".$id.",".$accountid.") method ...");
 	
-	$sql_lead_notes	="select * from senotesrel where crmid=".$id;
+	$sql_lead_notes	="select * from vtiger_senotesrel where crmid=".$id;
 	$lead_notes_result = $adb->query($sql_lead_notes);
 	$noofrows = $adb->num_rows($lead_notes_result);
 
@@ -154,14 +154,14 @@
 
 		$lead_related_note_id=$adb->query_result($lead_notes_result,$i,"notesid");
 		 $log->debug("Lead related note id ".$lead_related_note_id);
-		$sql_delete_lead_notes="delete from senotesrel where crmid=".$id;
+		$sql_delete_lead_notes="delete from vtiger_senotesrel where crmid=".$id;
 		$adb->query($sql_delete_lead_notes);
 
-		$sql_insert_account_notes="insert into senotesrel(crmid,notesid) values (".$accountid.",".$lead_related_note_id.")";
+		$sql_insert_account_notes="insert into vtiger_senotesrel(crmid,notesid) values (".$accountid.",".$lead_related_note_id.")";
 		$adb->query($sql_insert_account_notes);
 	}
 
-	$sql_lead_attachment="select * from seattachmentsrel where crmid=".$id;
+	$sql_lead_attachment="select * from vtiger_seattachmentsrel where crmid=".$id;
         $lead_attachment_result = $adb->query($sql_lead_attachment);
         $noofrows = $adb->num_rows($lead_attachment_result);
 
@@ -171,10 +171,10 @@
                 $lead_related_attachment_id=$adb->query_result($lead_attachment_result,$i,"attachmentsid");
 		 $log->debug("Lead related attachment id ".$lead_related_attachment_id);
 
-                $sql_delete_lead_attachment="delete from seattachmentsrel where crmid=".$id;
+                $sql_delete_lead_attachment="delete from vtiger_seattachmentsrel where crmid=".$id;
                 $adb->query($sql_delete_lead_attachment);
 
-                $sql_insert_account_attachment="insert into seattachmentsrel(crmid,attachmentsid) values (".$accountid.",".$lead_related_attachment_id.")";                        
+                $sql_insert_account_attachment="insert into vtiger_seattachmentsrel(crmid,attachmentsid) values (".$accountid.",".$lead_related_attachment_id.")";                        
                 $adb->query($sql_insert_account_attachment);
         }
 	$log->debug("Exiting getRelatedNotesAttachments method ...");
@@ -185,61 +185,61 @@
 {
 	global $adb,$log,$id;	
 	$log->debug("Entering getRelatedActivities(".$accountid.",".$contact_id.") method ...");
-	$sql_lead_activity="select * from seactivityrel where crmid=".$id;
+	$sql_lead_activity="select * from vtiger_seactivityrel where crmid=".$id;
 	$lead_activity_result = $adb->query($sql_lead_activity);
         $noofrows = $adb->num_rows($lead_activity_result);
         for($i=0;$i<$noofrows;$i++)
         {
 
                 $lead_related_activity_id=$adb->query_result($lead_activity_result,$i,"activityid");
-		 $log->debug("Lead related activity id ".$lead_related_activity_id);
-
-		$sql_type_email="select setype from crmentity where crmid=".$lead_related_activity_id;
+		 $log->debug("Lead related vtiger_activity id ".$lead_related_activity_id);
+
+		$sql_type_email="select setype from vtiger_crmentity where crmid=".$lead_related_activity_id;
 		$type_email_result = $adb->query($sql_type_email);
                 $type=$adb->query_result($type_email_result,0,"setype");
-		$log->debug("type of activity id ".$type);
-
-                $sql_delete_lead_activity="delete from seactivityrel where crmid=".$id;
+		$log->debug("type of vtiger_activity id ".$type);
+
+                $sql_delete_lead_activity="delete from vtiger_seactivityrel where crmid=".$id;
                 $adb->query($sql_delete_lead_activity);
 
 		if($type != "Emails")
 		{
-                	$sql_insert_account_activity="insert into seactivityrel(crmid,activityid) values (".$accountid.",".$lead_related_activity_id.")";
+                	$sql_insert_account_activity="insert into vtiger_seactivityrel(crmid,activityid) values (".$accountid.",".$lead_related_activity_id.")";
 	                $adb->query($sql_insert_account_activity);
 
-			$sql_insert_account_activity="insert into cntactivityrel(contactid,activityid) values (".$contact_id.",".$lead_related_activity_id.")";
+			$sql_insert_account_activity="insert into vtiger_cntactivityrel(contactid,activityid) values (".$contact_id.",".$lead_related_activity_id.")";
                 	$adb->query($sql_insert_account_activity);
 		}
 		else
 		{
-			 $sql_insert_account_activity="insert into seactivityrel(crmid,activityid) values (".$contact_id.",".$lead_related_activity_id.")";                                                                                     $adb->query($sql_insert_account_activity);
+			 $sql_insert_account_activity="insert into vtiger_seactivityrel(crmid,activityid) values (".$contact_id.",".$lead_related_activity_id.")";                                                                                     $adb->query($sql_insert_account_activity);
 		}
         }
 	$log->debug("Exiting getRelatedActivities method ...");
 	
 }
 
-$sql_crmentity = "insert into crmentity(crmid,smcreatorid,smownerid,setype,presence,createdtime,modifiedtime,deleted,description) values(".$crmid.",".$current_user_id.",".$assigned_user_id.",'Accounts',1,".$date_entered.",".$date_modified.",0,'".$row['description']."')";
+$sql_crmentity = "insert into vtiger_crmentity(crmid,smcreatorid,smownerid,setype,presence,createdtime,modifiedtime,deleted,description) values(".$crmid.",".$current_user_id.",".$assigned_user_id.",'Accounts',1,".$date_entered.",".$date_modified.",0,'".$row['description']."')";
 
 $adb->query($sql_crmentity);
 
 
-$sql_insert_account = "INSERT INTO account (accountid,accountname,industry,annualrevenue,phone,fax,rating,email1,website,employees) VALUES (".$crmid.",'".$accountname ."','".$row["industry"] ."','" .$row["annualrevenue"] ."','" .$row["phone"] ."','".$row["fax"] ."','" .$row["rating"] ."','" .$row["email"] ."','" .$row["website"] ."','" .$row["noofemployees"] ."')";
+$sql_insert_account = "INSERT INTO vtiger_account (accountid,accountname,industry,annualrevenue,phone,fax,rating,email1,website,employees) VALUES (".$crmid.",'".$accountname ."','".$row["industry"] ."','" .$row["annualrevenue"] ."','" .$row["phone"] ."','".$row["fax"] ."','" .$row["rating"] ."','" .$row["email"] ."','" .$row["website"] ."','" .$row["noofemployees"] ."')";
 
 
 $adb->query($sql_insert_account);
 
-$sql_insert_accountbillads = "INSERT INTO accountbillads (accountaddressid,city,code,country,state,street) VALUES (".$crmid.",'".$row["city"] ."','" .$row["code"] ."','" .$row["country"] ."','".$row["state"] ."','" .$row["lane"]."')";
+$sql_insert_accountbillads = "INSERT INTO vtiger_accountbillads (accountaddressid,city,code,country,state,street) VALUES (".$crmid.",'".$row["city"] ."','" .$row["code"] ."','" .$row["country"] ."','".$row["state"] ."','" .$row["lane"]."')";
 
  $adb->query($sql_insert_accountbillads);
 
 
-$sql_insert_accountshipads = "INSERT INTO accountshipads (accountaddressid,city,code,country,state,street) VALUES (".$crmid.",'".$row["city"] ."','" .$row["code"] ."','" .$row["country"] ."','".$row["state"] ."','" .$row["lane"]."')";
+$sql_insert_accountshipads = "INSERT INTO vtiger_accountshipads (accountaddressid,city,code,country,state,street) VALUES (".$crmid.",'".$row["city"] ."','" .$row["code"] ."','" .$row["country"] ."','".$row["state"] ."','" .$row["lane"]."')";
 
 
  $adb->query($sql_insert_accountshipads);
 
-//Getting the custom field values from leads and inserting into Accounts if the field is mapped - Jaguar
+//Getting the custom vtiger_field values from leads and inserting into Accounts if the vtiger_field is mapped - Jaguar
 $insert_value=$crmid;
 $insert_column="accountid";	
 $val= getInsertValues("Accounts",$insert_value);
@@ -250,7 +250,7 @@
 
 $insert_column.=$val[0];
 $insert_value.=$val[1];
-$sql_insert_accountcustomfield = "INSERT INTO accountscf (".$insert_column.") VALUES (".$insert_value.")";
+$sql_insert_accountcustomfield = "INSERT INTO vtiger_accountscf (".$insert_column.") VALUES (".$insert_value.")";
 
 $adb->query($sql_insert_accountcustomfield);
 
@@ -264,7 +264,7 @@
  $date_modified = date('YmdHis');
 
 $crmcontactid = $adb->getUniqueID("crmentity");
-$sql_crmentity1 = "insert into crmentity(crmid,smcreatorid,smownerid,setype,presence,deleted,description,createdtime) values(".$crmcontactid.",".$current_user_id.",".$assigned_user_id.",'Contacts',0,0,'".$row['description']."','".$date_entered."')";
+$sql_crmentity1 = "insert into vtiger_crmentity(crmid,smcreatorid,smownerid,setype,presence,deleted,description,createdtime) values(".$crmcontactid.",".$current_user_id.",".$assigned_user_id.",'Contacts',0,0,'".$row['description']."','".$date_entered."')";
 
 $adb->query($sql_crmentity1);
 
@@ -272,16 +272,16 @@
 $contact_id = $crmcontactid;
 $log->debug("contact id is ".$contact_id);
 
- $sql_insert_contact = "INSERT INTO contactdetails (contactid,accountid,salutation,firstname,lastname,email,phone,mobile,title,fax,yahooid) VALUES (".$contact_id.",".$crmid.",'".$row["salutationtype"] ."','" .$row["firstname"] ."','" .$row["lastname"] ."','" .$row["email"] ."','" .$row["phone"]. "','" .$row["mobile"] ."','" .$row["designation"] ."','".$row["fax"] ."','".$row['yahooid']."')";
+ $sql_insert_contact = "INSERT INTO vtiger_contactdetails (contactid,accountid,salutation,firstname,lastname,email,phone,mobile,title,fax,yahooid) VALUES (".$contact_id.",".$crmid.",'".$row["salutationtype"] ."','" .$row["firstname"] ."','" .$row["lastname"] ."','" .$row["email"] ."','" .$row["phone"]. "','" .$row["mobile"] ."','" .$row["designation"] ."','".$row["fax"] ."','".$row['yahooid']."')";
 
 $adb->query($sql_insert_contact);
 
 
- $sql_insert_contactsubdetails = "INSERT INTO contactsubdetails (contactsubscriptionid,homephone,otherphone,leadsource) VALUES (".$contact_id.",'','','".$row['leadsource']."')";
+ $sql_insert_contactsubdetails = "INSERT INTO vtiger_contactsubdetails (contactsubscriptionid,homephone,otherphone,leadsource) VALUES (".$contact_id.",'','','".$row['leadsource']."')";
 
 $adb->query($sql_insert_contactsubdetails);
 
- $sql_insert_contactaddress = "INSERT INTO contactaddress (contactaddressid,mailingcity,mailingstreet,mailingstate,mailingcountry,mailingzip) VALUES (".$contact_id.",'".$row["city"] ."','" .$row["lane"] ."','".$row['state']."','" .$row["country"] ."','".$row['code']."')";
+ $sql_insert_contactaddress = "INSERT INTO vtiger_contactaddress (contactaddressid,mailingcity,mailingstreet,mailingstate,mailingcountry,mailingzip) VALUES (".$contact_id.",'".$row["city"] ."','" .$row["lane"] ."','".$row['state']."','" .$row["country"] ."','".$row['code']."')";
 
 $adb->query($sql_insert_contactaddress);
 
@@ -298,7 +298,7 @@
 
 $insert_column.=$val[0];
 $insert_value.=$val[1];
-$sql_insert_contactcustomfield = "INSERT INTO contactscf (".$insert_column.") VALUES (".$insert_value.")";
+$sql_insert_contactcustomfield = "INSERT INTO vtiger_contactscf (".$insert_column.") VALUES (".$insert_value.")";
 
 $adb->query($sql_insert_contactcustomfield);
 //
@@ -313,7 +313,7 @@
   
 
   $oppid = $adb->getUniqueID("crmentity");
-  $sql_crmentity = "insert into crmentity(crmid,smcreatorid,smownerid,setype,presence,deleted,createdtime,description) values(".$oppid.",".$current_user_id.",".$assigned_user_id.",'Potentials',0,0,'".$date_entered."','".$row['description']."')";
+  $sql_crmentity = "insert into vtiger_crmentity(crmid,smcreatorid,smownerid,setype,presence,deleted,createdtime,description) values(".$oppid.",".$current_user_id.",".$assigned_user_id.",'Potentials',0,0,'".$date_entered."','".$row['description']."')";
   
   $adb->query($sql_crmentity);
 
@@ -323,7 +323,7 @@
 		$potential_amount=0;
         }
 
-	$sql_insert_opp = "INSERT INTO potential (potentialid,accountid,potentialname,leadsource,closingdate,sales_stage,amount) VALUES (".$oppid.",".$crmid .",'".$potential_name."','".$row['leadsource']."','".$close_date."','".$potential_sales_stage."',".$potential_amount.")";
+	$sql_insert_opp = "INSERT INTO vtiger_potential (potentialid,accountid,potentialname,leadsource,closingdate,sales_stage,amount) VALUES (".$oppid.",".$crmid .",'".$potential_name."','".$row['leadsource']."','".$close_date."','".$potential_sales_stage."',".$potential_amount.")";
 
 	$adb->query($sql_insert_opp);
 
@@ -339,23 +339,23 @@
 	$insert_column.=$val[0];
 	$insert_value.=$val[1];
 
-	$sql_insert_potentialcustomfield = "INSERT INTO potentialscf (".$insert_column.") VALUES (".$insert_value.")";
+	$sql_insert_potentialcustomfield = "INSERT INTO vtiger_potentialscf (".$insert_column.") VALUES (".$insert_value.")";
 //
 
 	$adb->query($sql_insert_potentialcustomfield);
-        $sql_insert2contpotentialrel ="insert into contpotentialrel values(".$contact_id.",".$oppid .")";
+        $sql_insert2contpotentialrel ="insert into vtiger_contpotentialrel values(".$contact_id.",".$oppid .")";
         
         $adb->query($sql_insert2contpotentialrel);
 
 	
 }
 
-//Deleting from the tracker
-$sql_delete_tracker= "DELETE from tracker where item_id='" .$id ."'";
+//Deleting from the vtiger_tracker
+$sql_delete_tracker= "DELETE from vtiger_tracker where item_id='" .$id ."'";
 $adb->query($sql_delete_tracker);
 
 //Updating the deleted status
-$sql_update_converted = "UPDATE leaddetails SET converted = 1 where leadid='" .$id ."'";
+$sql_update_converted = "UPDATE vtiger_leaddetails SET converted = 1 where leadid='" .$id ."'";
 $adb->query($sql_update_converted); 
 
 header("Location: index.php?action=DetailView&module=Accounts&record=$crmid");

Modified: vtigercrm/trunk/modules/Leads/ListViewTop.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/ListViewTop.php (original)
+++ vtigercrm/trunk/modules/Leads/ListViewTop.php Mon Jun 12 14:26:25 2006
@@ -44,7 +44,7 @@
 	require_once($theme_path.'layout_utils.php');
 	if($_REQUEST['lead_view']=='')
 	{	
-		$query = "select lead_view from users where id ='$current_user->id'";
+		$query = "select lead_view from vtiger_users where id ='$current_user->id'";
 		$result=$adb->query($query);
 		$lead_view=$adb->query_result($result,0,'lead_view');
 	}
@@ -66,7 +66,7 @@
 		$start_date = date("Y-m-d", strtotime("-1 week"));
 	}	
 
-	$list_query = 'select leaddetails.*,crmentity.createdtime,crmentity.description from leaddetails inner join crmentity on leaddetails.leadid = crmentity.crmid where crmentity.deleted =0 AND leaddetails.converted =0 AND crmentity.createdtime >='.$start_date.' AND crmentity.smownerid = '.$current_user->id; 
+	$list_query = 'select vtiger_leaddetails.*,vtiger_crmentity.createdtime,vtiger_crmentity.description from vtiger_leaddetails inner join vtiger_crmentity on vtiger_leaddetails.leadid = vtiger_crmentity.crmid where vtiger_crmentity.deleted =0 AND vtiger_leaddetails.converted =0 AND vtiger_crmentity.createdtime >='.$start_date.' AND vtiger_crmentity.smownerid = '.$current_user->id; 
 	
 	$list_result = $adb->query($list_query);
 	$noofrows = $adb->num_rows($list_result);

Modified: vtigercrm/trunk/modules/Leads/Merge.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/Merge.php (original)
+++ vtigercrm/trunk/modules/Leads/Merge.php Mon Jun 12 14:26:25 2006
@@ -38,7 +38,7 @@
 }
 //get the particular file from db and store it in the local hard disk.
 //store the path to the location where the file is stored and pass it  as parameter to the method 
-$sql = "select filename,data,filesize from wordtemplates where templateid=".$templateid;
+$sql = "select filename,data,filesize from vtiger_wordtemplates where templateid=".$templateid;
 
 $result = $adb->query($sql);
 $temparray = $adb->fetch_array($result);
@@ -74,7 +74,7 @@
 }
 
 //<<<<<<<<<<<<<<<<header for csv and select columns for query>>>>>>>>>>>>>>>>>>>>>>>>
-$query1="select tablename,columnname,fieldlabel from field where tabid=7 order by tablename";
+$query1="select vtiger_tablename,columnname,fieldlabel from vtiger_field where vtiger_tabid=7 order by vtiger_tablename";
 $result = $adb->query($query1);
 $y=$adb->num_rows($result);
 	
@@ -85,7 +85,7 @@
 	$querycolumns[$x] = $tablename.".".$columnname;
   if($columnname == "smownerid")
   {
-    $querycolumns[$x] = "concat(users.last_name,' ',users.first_name) as username,users.first_name,users.last_name,users.user_name,users.yahoo_id,users.title,users.phone_work,users.department,users.phone_mobile,users.phone_other,users.phone_fax,users.email1,users.phone_home,users.email2,users.address_street,users.address_city,users.address_state,users.address_postalcode,users.address_country";
+    $querycolumns[$x] = "concat(vtiger_users.last_name,' ',vtiger_users.first_name) as username,vtiger_users.first_name,vtiger_users.last_name,vtiger_users.user_name,vtiger_users.yahoo_id,vtiger_users.title,vtiger_users.phone_work,vtiger_users.department,vtiger_users.phone_mobile,vtiger_users.phone_other,vtiger_users.phone_fax,vtiger_users.email1,vtiger_users.phone_home,vtiger_users.email2,vtiger_users.address_street,vtiger_users.address_city,vtiger_users.address_state,vtiger_users.address_postalcode,vtiger_users.address_country";
   }
   $field_label[$x] = "LEAD_".strtoupper(str_replace(" ","",$adb->query_result($result,$x,"fieldlabel")));
 	if($columnname == "smownerid")
@@ -100,13 +100,13 @@
 {
 	$selectcolumns = implode($querycolumns,",");
 
-$query = "select ".$selectcolumns." 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 users on users.id = crmentity.smownerid
-  where crmentity.deleted=0 and leaddetails.leadid in (".$mass_merge.")";
+$query = "select ".$selectcolumns." from vtiger_leaddetails 
+  inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_leaddetails.leadid 
+  inner join vtiger_leadsubdetails on vtiger_leadsubdetails.leadsubscriptionid=vtiger_leaddetails.leadid 
+  inner join vtiger_leadaddress on vtiger_leadaddress.leadaddressid=vtiger_leadsubdetails.leadsubscriptionid 
+  inner join vtiger_leadscf on vtiger_leaddetails.leadid = vtiger_leadscf.leadid 
+  left join vtiger_users on vtiger_users.id = vtiger_crmentity.smownerid
+  where vtiger_crmentity.deleted=0 and vtiger_leaddetails.leadid in (".$mass_merge.")";
 		
 $result = $adb->query($query);
 	
@@ -140,7 +140,7 @@
 $csvdata = implode($mergevalue,"###");
 }else
 {
-	die("No fields to do Merge");
+	die("No vtiger_fields to do Merge");
 }	
 
 $handle = fopen($wordtemplatedownloadpath."datasrc.csv","wb");

Modified: vtigercrm/trunk/modules/Leads/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/Save.php (original)
+++ vtigercrm/trunk/modules/Leads/Save.php Mon Jun 12 14:26:25 2006
@@ -70,11 +70,11 @@
 if($_REQUEST['return_viewname'] != '')$return_viewname=$_REQUEST['return_viewname'];
 header("Location: index.php?action=$return_action&module=$return_module&record=$return_id&viewname=$return_viewname");
 
-//Code to save the custom field info into database
+//Code to save the custom vtiger_field info into database
 function save_customfields($entity_id)
 {
 	$log->debug("Entering save_customfields(".$entity_id.") method ...");
-	 $log->debug("save custom field invoked ".$entity_id);
+	 $log->debug("save custom vtiger_field invoked ".$entity_id);
 	global $adb;
 	$dbquery="select * from customfields where module='Leads'";
 	$result = $adb->query($dbquery);

Modified: vtigercrm/trunk/modules/Leads/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Leads/language/en_us.lang.php Mon Jun 12 14:26:25 2006
@@ -76,13 +76,13 @@
 
 'NTC_DELETE_CONFIRMATION'=>'Are you sure you want to delete this record?',
 'NTC_REMOVE_CONFIRMATION'=>'Are you sure you want to remove this contact from this case?',
-'NTC_REMOVE_DIRECT_REPORT_CONFIRMATION'=>'Are you sure you want to remove this record as a direct report?',
+'NTC_REMOVE_DIRECT_REPORT_CONFIRMATION'=>'Are you sure you want to remove this record as a direct vtiger_report?',
 'NTC_REMOVE_OPP_CONFIRMATION'=>'Are you sure you want to remove this contact from this opportunity?',
 'ERR_DELETE_RECORD'=>"en_us A record number must be specified to delete the contact.",
 'NTC_COPY_PRIMARY_ADDRESS'=>'Copy primary address to alternate address',
 'NTC_COPY_ALTERNATE_ADDRESS'=>'Copy alternate address to primary address',
 
-// Added fields in fetchfile.php, import.php -- crm4-Beta
+// Added vtiger_fields in fetchfile.php, import.php -- crm4-Beta
 'LBL_COLON'=>' : ', 
 'LBL_IMPORT_LEADS'=>'Import Leads',
 'LBL_LEADS_FILE_LIST'=>'Leads File List',
@@ -114,7 +114,7 @@
 'LBL_ATTACHMENT_TITLE'=>'Attachments',
 
 
-//Added fields after RC1 - Release 
+//Added vtiger_fields after RC1 - Release 
 'LBL_ALL'=>'All',
 'LBL_CONTACTED'=>'Contacted',
 'LBL_LOST'=>'Lost',

Modified: vtigercrm/trunk/modules/Migration/Migration.php
==============================================================================
--- vtigercrm/trunk/modules/Migration/Migration.php (original)
+++ vtigercrm/trunk/modules/Migration/Migration.php Mon Jun 12 14:26:25 2006
@@ -165,7 +165,7 @@
 	{
 		global $conn;
 
-		$sql = "select tabid from tab where name='".$module."'";
+		$sql = "select vtiger_tabid from vtiger_tab where name='".$module."'";
 		$result = $conn->query($sql);
 		$tabid=  $conn->query_result($result,0,"tabid");
 
@@ -207,7 +207,7 @@
 		$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
+		//Here we have to decide which vtiger_files should be included, where the vtiger_files will be added newly for every public release
 		//Handle Here -- Mickie
 		include("modules/Migration/ModifyDatabase/MigrationInfo.php");
 
@@ -289,16 +289,16 @@
 			$this->conn->println("Going to apply the old database dump to the new database.");
 			$this->applyDumpData($new_host_name,$new_mysql_port,$new_mysql_username,$new_mysql_password,$new_dbname,$dump_file);
 
-			//get the number of tables in new database 
+			//get the number of vtiger_tables in new database 
 			$new_tables_count = $this->getTablesCountInNewDatabase();
 
-			//get the number of tables in old database 
+			//get the number of vtiger_tables in old database 
 			$old_tables_count = $this->getTablesCountInOldDatabase();
 
-			//if tables are missing after apply the dump, then alert the user and quit
+			//if vtiger_tables are missing after apply the dump, then alert the user and quit
 			if(($new_tables_count != $old_tables_count && $option == 'dbsource') || ($new_tables_count < 180 && $option == 'dumpsource'))
 			{
-				$this->conn->println("New Database tables not equal to Old Database tables count. Reload the current database again and quit.");
+				$this->conn->println("New Database vtiger_tables not equal to Old Database vtiger_tables count. Reload the current database again and quit.");
 				
 				$continue_process = 0;
 				$msg = "The dump may not be applied correctly. Tables exist in 4.2.3 database : $old_tables_count. Tables exist in current database after apply the dump : $new_tables_count";

Modified: vtigercrm/trunk/modules/Migration/MigrationCheck.php
==============================================================================
--- vtigercrm/trunk/modules/Migration/MigrationCheck.php (original)
+++ vtigercrm/trunk/modules/Migration/MigrationCheck.php Mon Jun 12 14:26:25 2006
@@ -107,7 +107,7 @@
 
 	if($continue2 == 1)
 	{
-		//Check whether the table are exist in the databases or not
+		//Check whether the vtiger_table are exist in the databases or not
 		$old_tables = @mysql_num_rows(mysql_list_tables($old_dbname,$oldconn));
 		//$new_tables = @mysql_num_rows(mysql_list_tables($new_dbname));
 
@@ -289,7 +289,7 @@
 
 	if($continue2 == 1)
 	{
-		//Check whether the table are exist in the databases or not
+		//Check whether the vtiger_table are exist in the databases or not
 		$old_tables = @mysql_num_rows(mysql_list_tables($old_dbname,$oldconn));
 
 		if(!$old_tables)

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 Mon Jun 12 14:26:25 2006
@@ -22,7 +22,7 @@
 /****************** 5.0(Alpha) dev version 1 Database changes -- Starts*********************/
 
 
-//Added the announcement table creation to avoid the error
+//Added the vtiger_announcement vtiger_table creation to avoid the error
 $ann_query = "CREATE TABLE `announcement` (
 	  `creatorid` int(19) NOT NULL,
 	    `announcement` text,
@@ -33,41 +33,41 @@
 	    ) ENGINE=InnoDB DEFAULT CHARSET=latin1";
 Execute($ann_query);
 
-//Added Primay Keys for the left out tables
+//Added Primay Keys for the left out vtiger_tables
 $alter_array1 = Array(
-		"alter table activity_reminder ADD PRIMARY KEY (activity_id,recurringid)",
-		"alter table activitygrouprelation ADD PRIMARY KEY (activityid)",
-		"alter table cvadvfilter ADD PRIMARY KEY (cvid,columnindex)",
-		"alter table cvcolumnlist ADD PRIMARY KEY (cvid,columnindex)",
-		"alter table cvstdfilter ADD PRIMARY KEY (cvid)",
-		"alter table def_org_field ADD PRIMARY KEY (fieldid)",
-		"alter table leadgrouprelation ADD PRIMARY KEY (leadid)",
-		"alter table leadgrouprelation drop key leadgrouprelation_IDX0",
-		"alter table organizationdetails ADD PRIMARY KEY (organizationame)",
-		"alter table profile2field ADD PRIMARY KEY (profileid,fieldid)",
-		"alter table profile2standardpermissions ADD PRIMARY KEY (profileid,tabid,Operation)",
-		"alter table profile2standardpermissions drop index idx_prof2stad",
-		"alter table profile2utility ADD PRIMARY KEY (profileid,tabid,activityid)",
-		"alter table profile2utility drop index idx_prof2utility",
-		"alter table relcriteria ADD PRIMARY KEY (queryid,columnindex)",
-		"alter table reportdatefilter ADD PRIMARY KEY (datefilterid)",
-		"alter table reportdatefilter DROP INDEX reportdatefilter_IDX0",
-		"alter table reportsortcol ADD PRIMARY KEY (sortcolid,reportid)",
-		"alter table reportsummary ADD PRIMARY KEY (reportsummaryid,summarytype,columnname)",
-		"drop table role2action",
-		"drop table role2tab",
-		"alter table selectcolumn ADD PRIMARY KEY (queryid,columnindex)",
-		"alter table ticketgrouprelation ADD PRIMARY KEY (ticketid)",
-		"alter table ticketstracktime ADD PRIMARY KEY (ticket_id)",
-		"alter table users2group ADD PRIMARY KEY (groupname,userid)",
-		"alter table users2group DROP INDEX idx_users2group",
+		"alter vtiger_table vtiger_activity_reminder ADD PRIMARY KEY (activity_id,recurringid)",
+		"alter vtiger_table vtiger_activitygrouprelation ADD PRIMARY KEY (activityid)",
+		"alter vtiger_table vtiger_cvadvfilter ADD PRIMARY KEY (cvid,columnindex)",
+		"alter vtiger_table vtiger_cvcolumnlist ADD PRIMARY KEY (cvid,columnindex)",
+		"alter vtiger_table vtiger_cvstdfilter ADD PRIMARY KEY (cvid)",
+		"alter vtiger_table vtiger_def_org_field ADD PRIMARY KEY (fieldid)",
+		"alter vtiger_table vtiger_leadgrouprelation ADD PRIMARY KEY (leadid)",
+		"alter vtiger_table vtiger_leadgrouprelation drop key vtiger_leadgrouprelation_IDX0",
+		"alter vtiger_table vtiger_organizationdetails ADD PRIMARY KEY (organizationame)",
+		"alter vtiger_table vtiger_profile2field ADD PRIMARY KEY (profileid,fieldid)",
+		"alter vtiger_table vtiger_profile2standardpermissions ADD PRIMARY KEY (profileid,tabid,Operation)",
+		"alter vtiger_table vtiger_profile2standardpermissions drop index idx_prof2stad",
+		"alter vtiger_table vtiger_profile2utility ADD PRIMARY KEY (profileid,tabid,activityid)",
+		"alter vtiger_table vtiger_profile2utility drop index idx_prof2utility",
+		"alter vtiger_table vtiger_relcriteria ADD PRIMARY KEY (queryid,columnindex)",
+		"alter vtiger_table vtiger_reportdatefilter ADD PRIMARY KEY (datefilterid)",
+		"alter vtiger_table vtiger_reportdatefilter DROP INDEX vtiger_reportdatefilter_IDX0",
+		"alter vtiger_table vtiger_reportsortcol ADD PRIMARY KEY (sortcolid,reportid)",
+		"alter vtiger_table vtiger_reportsummary ADD PRIMARY KEY (reportsummaryid,summarytype,columnname)",
+		"drop vtiger_table vtiger_role2action",
+		"drop vtiger_table vtiger_role2tab",
+		"alter vtiger_table vtiger_selectcolumn ADD PRIMARY KEY (queryid,columnindex)",
+		"alter vtiger_table vtiger_ticketgrouprelation ADD PRIMARY KEY (ticketid)",
+		"alter vtiger_table vtiger_ticketstracktime ADD PRIMARY KEY (ticket_id)",
+		"alter vtiger_table vtiger_users2group ADD PRIMARY KEY (groupname,userid)",
+		"alter vtiger_table vtiger_users2group DROP INDEX idx_users2group",
 		);
 foreach($alter_array1 as $query)
 {
 	Execute($query);
 }
 
-//Tables profile2globalpermissions, actionmapping creation
+//Tables vtiger_profile2globalpermissions, vtiger_actionmapping creation
 
 $create_sql1 ="CREATE TABLE `profile2globalpermissions` (`profileid` int(19) NOT NULL, `globalactionid` int(19) NOT NULL, `globalactionpermission` int(19) default NULL, PRIMARY KEY  (`profileid`,`globalactionid`),  KEY `idx_profile2globalpermissions` (`profileid`,`globalactionid`)) ENGINE=InnoDB DEFAULT CHARSET=latin1";
 
@@ -81,8 +81,8 @@
 	) TYPE=InnoDB";
 Execute($create_sql2);
 
-//For all Profiles, insert the following entries into profile2global permissions table:
-$sql = 'select * from profile';
+//For all Profiles, insert the following entries into vtiger_profile2global permissions vtiger_table:
+$sql = 'select * from vtiger_profile';
 $res = $conn->query($sql);
 $noofprofiles = $conn->num_rows($res);
 
@@ -90,20 +90,20 @@
 {
 	$profile_id = $conn->query_result($res,$i,'profileid');
 
-	$sql1 = "insert into profile2globalpermissions values ($profile_id,1,0)";
-	$sql2 = "insert into profile2globalpermissions values ($profile_id,2,0)";
+	$sql1 = "insert into vtiger_profile2globalpermissions values ($profile_id,1,0)";
+	$sql2 = "insert into vtiger_profile2globalpermissions values ($profile_id,2,0)";
 
 	Execute($sql1);
 	Execute($sql2);
 }
 
 
-//Removing entries for Dashboard and Home module from profile2standardpermissions table
-$del_query1 = "delete from profile2standardpermissions where tabid in(1,3)";
+//Removing entries for Dashboard and Home module from vtiger_profile2standardpermissions vtiger_table
+$del_query1 = "delete from vtiger_profile2standardpermissions where vtiger_tabid in(1,3)";
 Execute($del_query1);
 
-//For all Profile do the following insert into profile2utility table:
-$sql = 'select * from profile';
+//For all Profile do the following insert into vtiger_profile2utility vtiger_table:
+$sql = 'select * from vtiger_profile';
 $res = $conn->query($sql);
 $noofprofiles = $conn->num_rows($res);
 
@@ -112,40 +112,40 @@
 {
 	$profile_id = $conn->query_result($res,$i,'profileid');
 
-	$sql1 = "insert into profile2utility values ($profile_id,4,7,0)";
-	$sql2 = "insert into profile2utility values ($profile_id,7,9,0)";
+	$sql1 = "insert into vtiger_profile2utility values ($profile_id,4,7,0)";
+	$sql2 = "insert into vtiger_profile2utility values ($profile_id,7,9,0)";
 
 	Execute($sql1);
 	Execute($sql2);
 }
 */
 
-//Insert Values into action mapping table:
+//Insert Values into action mapping vtiger_table:
 $actionmapping_array = Array(
-		"insert into actionmapping values(0,'Save',0)",
-		"insert into actionmapping values(1,'EditView',0)",
-		"insert into actionmapping values(2,'Delete',0)",
-		"insert into actionmapping values(3,'index',0)",
-		"insert into actionmapping values(4,'DetailView',0)",
-		"insert into actionmapping values(5,'Import',0)",
-		"insert into actionmapping values(6,'Export',0)",
-		"insert into actionmapping values(8,'Merge',0)",
-		"insert into actionmapping values(1,'VendorEditView',1)",
-		"insert into actionmapping values(4,'VendorDetailView',1)",
-		"insert into actionmapping values(0,'SaveVendor',1)",
-		"insert into actionmapping values(2,'DeleteVendor',1)",
-		"insert into actionmapping values(1,'PriceBookEditView',1)",
-		"insert into actionmapping values(4,'PriceBookDetailView',1)",
-		"insert into actionmapping values(0,'SavePriceBook',1)",
-		"insert into actionmapping values(2,'DeletePriceBook',1)",
-		"insert into actionmapping values(1,'SalesOrderEditView',1)",
-		"insert into actionmapping values(4,'SalesOrderDetailView',1)",
-		"insert into actionmapping values(0,'SaveSalesOrder',1)",
-		"insert into actionmapping values(2,'DeleteSalesOrder',1)",
-		"insert into actionmapping values(9,'ConvertLead',0)",
-		"insert into actionmapping values(1,'DetailViewAjax',1)",
-		"insert into actionmapping values(1,'QuickCreate',1)",
-		"insert into actionmapping values(4,'TagCloud',1)"
+		"insert into vtiger_actionmapping values(0,'Save',0)",
+		"insert into vtiger_actionmapping values(1,'EditView',0)",
+		"insert into vtiger_actionmapping values(2,'Delete',0)",
+		"insert into vtiger_actionmapping values(3,'index',0)",
+		"insert into vtiger_actionmapping values(4,'DetailView',0)",
+		"insert into vtiger_actionmapping values(5,'Import',0)",
+		"insert into vtiger_actionmapping values(6,'Export',0)",
+		"insert into vtiger_actionmapping values(8,'Merge',0)",
+		"insert into vtiger_actionmapping values(1,'VendorEditView',1)",
+		"insert into vtiger_actionmapping values(4,'VendorDetailView',1)",
+		"insert into vtiger_actionmapping values(0,'SaveVendor',1)",
+		"insert into vtiger_actionmapping values(2,'DeleteVendor',1)",
+		"insert into vtiger_actionmapping values(1,'PriceBookEditView',1)",
+		"insert into vtiger_actionmapping values(4,'PriceBookDetailView',1)",
+		"insert into vtiger_actionmapping values(0,'SavePriceBook',1)",
+		"insert into vtiger_actionmapping values(2,'DeletePriceBook',1)",
+		"insert into vtiger_actionmapping values(1,'SalesOrderEditView',1)",
+		"insert into vtiger_actionmapping values(4,'SalesOrderDetailView',1)",
+		"insert into vtiger_actionmapping values(0,'SaveSalesOrder',1)",
+		"insert into vtiger_actionmapping values(2,'DeleteSalesOrder',1)",
+		"insert into vtiger_actionmapping values(9,'ConvertLead',0)",
+		"insert into vtiger_actionmapping values(1,'DetailViewAjax',1)",
+		"insert into vtiger_actionmapping values(1,'QuickCreate',1)",
+		"insert into vtiger_actionmapping values(4,'TagCloud',1)"
 		);
 foreach($actionmapping_array as $query)
 {
@@ -153,10 +153,10 @@
 }
 
 
-//Added two columns in field table to construct the quickcreate form dynamically
+//Added two columns in vtiger_field vtiger_table to construct the quickcreate form dynamically
 $alter_array2 = Array(
-		"ALTER TABLE field ADD column quickcreate int(10) after typeofdata",
-		"ALTER TABLE field ADD column quickcreatesequence int(19) after quickcreate",
+		"ALTER TABLE vtiger_field ADD column quickcreate int(10) after typeofdata",
+		"ALTER TABLE vtiger_field ADD column quickcreatesequence int(19) after quickcreate",
 		);
 foreach($alter_array2 as $query)
 {
@@ -164,50 +164,50 @@
 }
 
 $update_array1 = Array(
-		"UPDATE field SET quickcreate = 1,quickcreatesequence = 0",
-
-		"UPDATE field SET quickcreate = 0,quickcreatesequence = 1 WHERE tabid = 2 and fieldlabel = 'Potential Name'",
-		"UPDATE field SET quickcreate = 0,quickcreatesequence = 2 WHERE tabid = 2 and fieldlabel = 'Account Name'",
-		"UPDATE field SET quickcreate = 0,quickcreatesequence = 3 WHERE tabid = 2 and fieldlabel = 'Expected Close Date'",
-		"UPDATE field SET quickcreate = 0,quickcreatesequence = 4 WHERE tabid = 2 and fieldlabel = 'Sales Stage'",
-		"UPDATE field SET quickcreate = 0,quickcreatesequence = 5 WHERE tabid = 2 and fieldlabel = 'Amount'",
-
-		"UPDATE field SET quickcreate = 0,quickcreatesequence = 1 WHERE tabid = 4 and fieldlabel = 'First Name'",
-		"UPDATE field SET quickcreate = 0,quickcreatesequence = 2 WHERE tabid = 4 and fieldlabel = 'Last Name'",
-		"UPDATE field SET quickcreate = 0,quickcreatesequence = 3 WHERE tabid = 4 and fieldlabel = 'Account Name'",
-		"UPDATE field SET quickcreate = 0,quickcreatesequence = 4 WHERE tabid = 4 and fieldlabel = 'Office Phone'",
-		"UPDATE field SET quickcreate = 0,quickcreatesequence = 5 WHERE tabid = 4 and fieldlabel = 'Email'",
-
-		"UPDATE field SET quickcreate = 0,quickcreatesequence = 1 WHERE tabid = 6 and fieldlabel = 'Account Name'",
-		"UPDATE field SET quickcreate = 0,quickcreatesequence = 2 WHERE tabid = 6 and fieldlabel = 'Phone'",
-		"UPDATE field SET quickcreate = 0,quickcreatesequence = 3 WHERE tabid = 6 and fieldlabel = 'Website'",
-
-		"UPDATE field SET quickcreate = 0,quickcreatesequence = 1 WHERE tabid = 7 and fieldlabel = 'First Name'",
-		"UPDATE field SET quickcreate = 0,quickcreatesequence = 2 WHERE tabid = 7 and fieldlabel = 'Last Name'",
-		"UPDATE field SET quickcreate = 0,quickcreatesequence = 3 WHERE tabid = 7 and fieldlabel = 'Company'",
-		"UPDATE field SET quickcreate = 0,quickcreatesequence = 4 WHERE tabid = 7 and fieldlabel = 'Phone'",
-		"UPDATE field SET quickcreate = 0,quickcreatesequence = 5 WHERE tabid = 7 and fieldlabel = 'Email'",
-
-		"UPDATE field SET quickcreate = 0,quickcreatesequence = 1 WHERE tabid = 8 and fieldlabel = 'Subject'",
-
-		"UPDATE field SET quickcreate = 0,quickcreatesequence = 1 WHERE tabid = 9 and fieldlabel = 'Subject'",
-		"UPDATE field SET quickcreate = 0,quickcreatesequence = 2 WHERE tabid = 9 and fieldlabel = 'Start Date & Time'",
-
-		"UPDATE field SET quickcreate = 0,quickcreatesequence = 1 WHERE tabid = 10 and fieldlabel = 'Subject'",
-		"UPDATE field SET quickcreate = 0,quickcreatesequence = 2 WHERE tabid = 10 and fieldlabel = 'Date & Time Sent'",
-
-		"UPDATE field SET quickcreate = 0,quickcreatesequence = 1 WHERE tabid = 13 and fieldlabel = 'Title'",
-		"UPDATE field SET quickcreate = 0,quickcreatesequence = 2 WHERE tabid = 13 and fieldlabel = 'Description'",
-		"UPDATE field SET quickcreate = 0,quickcreatesequence = 3 WHERE tabid = 13 and fieldlabel = 'Priority'",
-
-		"UPDATE field SET quickcreate = 0,quickcreatesequence = 1 WHERE tabid = 14 and fieldlabel = 'Product Name'",
-		"UPDATE field SET quickcreate = 0,quickcreatesequence = 2 WHERE tabid = 14 and fieldlabel = 'Product Code'",
-		"UPDATE field SET quickcreate = 0,quickcreatesequence = 3 WHERE tabid = 14 and fieldlabel = 'Product Category'",
-
-		"UPDATE field SET quickcreate = 0,quickcreatesequence = 1 WHERE tabid = 16 and fieldlabel = 'Subject'",
-		"UPDATE field SET quickcreate = 0,quickcreatesequence = 2 WHERE tabid = 16 and fieldlabel = 'Start Date & Time'",
-		"UPDATE field SET quickcreate = 0,quickcreatesequence = 3 WHERE tabid = 16 and fieldlabel = 'Activity Type'",
-		"UPDATE field SET quickcreate = 0,quickcreatesequence = 4 WHERE tabid = 16 and fieldlabel = 'Duration'",
+		"UPDATE vtiger_field SET quickcreate = 1,quickcreatesequence = 0",
+
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 1 WHERE vtiger_tabid = 2 and vtiger_fieldlabel = 'Potential Name'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 2 WHERE vtiger_tabid = 2 and vtiger_fieldlabel = 'Account Name'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 3 WHERE vtiger_tabid = 2 and vtiger_fieldlabel = 'Expected Close Date'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 4 WHERE vtiger_tabid = 2 and vtiger_fieldlabel = 'Sales Stage'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 5 WHERE vtiger_tabid = 2 and vtiger_fieldlabel = 'Amount'",
+
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 1 WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'First Name'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 2 WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'Last Name'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 3 WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'Account Name'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 4 WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'Office Phone'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 5 WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'Email'",
+
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 1 WHERE vtiger_tabid = 6 and vtiger_fieldlabel = 'Account Name'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 2 WHERE vtiger_tabid = 6 and vtiger_fieldlabel = 'Phone'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 3 WHERE vtiger_tabid = 6 and vtiger_fieldlabel = 'Website'",
+
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 1 WHERE vtiger_tabid = 7 and vtiger_fieldlabel = 'First Name'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 2 WHERE vtiger_tabid = 7 and vtiger_fieldlabel = 'Last Name'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 3 WHERE vtiger_tabid = 7 and vtiger_fieldlabel = 'Company'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 4 WHERE vtiger_tabid = 7 and vtiger_fieldlabel = 'Phone'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 5 WHERE vtiger_tabid = 7 and vtiger_fieldlabel = 'Email'",
+
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 1 WHERE vtiger_tabid = 8 and vtiger_fieldlabel = 'Subject'",
+
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 1 WHERE vtiger_tabid = 9 and vtiger_fieldlabel = 'Subject'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 2 WHERE vtiger_tabid = 9 and vtiger_fieldlabel = 'Start Date & Time'",
+
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 1 WHERE vtiger_tabid = 10 and vtiger_fieldlabel = 'Subject'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 2 WHERE vtiger_tabid = 10 and vtiger_fieldlabel = 'Date & Time Sent'",
+
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 1 WHERE vtiger_tabid = 13 and vtiger_fieldlabel = 'Title'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 2 WHERE vtiger_tabid = 13 and vtiger_fieldlabel = 'Description'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 3 WHERE vtiger_tabid = 13 and vtiger_fieldlabel = 'Priority'",
+
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 1 WHERE vtiger_tabid = 14 and vtiger_fieldlabel = 'Product Name'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 2 WHERE vtiger_tabid = 14 and vtiger_fieldlabel = 'Product Code'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 3 WHERE vtiger_tabid = 14 and vtiger_fieldlabel = 'Product Category'",
+
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 1 WHERE vtiger_tabid = 16 and vtiger_fieldlabel = 'Subject'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 2 WHERE vtiger_tabid = 16 and vtiger_fieldlabel = 'Start Date & Time'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 3 WHERE vtiger_tabid = 16 and vtiger_fieldlabel = 'Activity Type'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 4 WHERE vtiger_tabid = 16 and vtiger_fieldlabel = 'Duration'",
 		);
 foreach($update_array1 as $query)
 {
@@ -218,33 +218,33 @@
 $alter_query1 = "ALTER TABLE `users` ADD `cal_color` VARCHAR(25) DEFAULT '#E6FAD8' AFTER `user_hash`";
 Execute($alter_query1);
 
-//code contributed by Fredy for color priority
+//code contributed by Fredy for color vtiger_priority
 $newfieldid = $conn->getUniqueID("field");
-$insert_query1 = "insert into field values (16,".$newfieldid.",'priority','activity',1,15,'taskpriority','Priority',1,0,0,100,17,1,1,'V~O',1,'')";
+$insert_query1 = "insert into vtiger_field values (16,".$newfieldid.",'priority','activity',1,15,'taskpriority','Priority',1,0,0,100,17,1,1,'V~O',1,'')";
 Execute($insert_query1);
 
-//Added on 23-12-2005 which is missed from Fredy's contribution for Color priority
+//Added on 23-12-2005 which is missed from Fredy's contribution for Color vtiger_priority
 populateFieldForSecurity('16',$newfieldid);
-$activity_alter_query = "alter table activity add column priority varchar(150) default NULL";
+$activity_alter_query = "alter vtiger_table vtiger_activity add column vtiger_priority varchar(150) default NULL";
 Execute($activity_alter_query);
 
 //Code contributed by Raju for better emailing 
 /*
 $insert_array1 = Array(
-		"insert into field values (10,".$conn->getUniqueID("field").",'crmid','seactivityrel',1,'357','parent_id','Related To',1,0,0,100,1,2,1,'I~O',1,'')",
-		"insert into field values (10,".$conn->getUniqueID("field").",'subject','activity',1,'2','subject','Subject',1,0,0,100,1,3,1,'V~M',0,1)",
-		"insert into field values (10,".$conn->getUniqueID("field").",'filename','emails',1,'61','filename','Attachment',1,0,0,100,1,4,1,'V~O',1,'')",
-		"insert into field values (10,".$conn->getUniqueID("field").",'description','emails',1,'19','description','Description',1,0,0,100,1,5,1,'V~O',1,'')",
+		"insert into vtiger_field values (10,".$conn->getUniqueID("field").",'crmid','seactivityrel',1,'357','parent_id','Related To',1,0,0,100,1,2,1,'I~O',1,'')",
+		"insert into vtiger_field values (10,".$conn->getUniqueID("field").",'subject','activity',1,'2','subject','Subject',1,0,0,100,1,3,1,'V~M',0,1)",
+		"insert into vtiger_field values (10,".$conn->getUniqueID("field").",'filename','emails',1,'61','filename','Attachment',1,0,0,100,1,4,1,'V~O',1,'')",
+		"insert into vtiger_field values (10,".$conn->getUniqueID("field").",'description','emails',1,'19','description','Description',1,0,0,100,1,5,1,'V~O',1,'')",
 		);
 */
 //commented the above array as that queries are wrong queries -- changed on 23-12-2005
 $insert_array1 = array(
-			"update field set uitype='357' where tabid=10 and fieldname='parent_id' and tablename='seactivityrel'",
-			"update field set sequence=1 where tabid=10 and fieldname in ('parent_id','subject','filename','description')",
-			"update field set block=2 where tabid=10 and fieldname='parent_id'",
-			"update field set block=3 where tabid=10 and fieldname='subject'",
-			"update field set block=4 where tabid=10 and fieldname='filename'",
-			"update field set block=5 where tabid=10 and fieldname='description'",
+			"update vtiger_field set uitype='357' where vtiger_tabid=10 and vtiger_fieldname='parent_id' and vtiger_tablename='seactivityrel'",
+			"update vtiger_field set sequence=1 where vtiger_tabid=10 and vtiger_fieldname in ('parent_id','subject','filename','description')",
+			"update vtiger_field set block=2 where vtiger_tabid=10 and vtiger_fieldname='parent_id'",
+			"update vtiger_field set block=3 where vtiger_tabid=10 and vtiger_fieldname='subject'",
+			"update vtiger_field set block=4 where vtiger_tabid=10 and vtiger_fieldname='filename'",
+			"update vtiger_field set block=5 where vtiger_tabid=10 and vtiger_fieldname='description'",
 		      );
 foreach($insert_array1 as $query)
 {
@@ -252,40 +252,40 @@
 }
 
 //code contributed by mike to rearrange the home page
-$alter_query2 = "alter table users add column homeorder varchar(255) default 'ALVT,PLVT,QLTQ,CVLVT,HLT,OLV,GRT,OLTSO,ILTI' after date_format";
+$alter_query2 = "alter vtiger_table vtiger_users add column homeorder varchar(255) default 'ALVT,PLVT,QLTQ,CVLVT,HLT,OLV,GRT,OLTSO,ILTI' after date_format";
 Execute($alter_query2);
 
-//Added one column in invoice table to include 'Contact Name' field in Invoice module
-$alter_query3 = "ALTER TABLE invoice ADD column contactid int(19) after customerno";
+//Added one column in vtiger_invoice vtiger_table to include 'Contact Name' vtiger_field in Invoice module
+$alter_query3 = "ALTER TABLE vtiger_invoice ADD column contactid int(19) after customerno";
 Execute($alter_query3);
 
 $newfieldid = $conn->getUniqueID("field");
-$insert_query2 = "insert into field values (23,".$newfieldid.",'contactid','invoice',1,'57','contact_id','Contact Name',1,0,0,100,4,1,1,'I~O',1,'')";
+$insert_query2 = "insert into vtiger_field values (23,".$newfieldid.",'contactid','invoice',1,'57','contact_id','Contact Name',1,0,0,100,4,1,1,'I~O',1,'')";
 Execute($insert_query2);
-//Added on 23-12-2005 because we must populate field entries in profile2field and def_org_field if we add a field in field table
+//Added on 23-12-2005 because we must populate vtiger_field entries in vtiger_profile2field and vtiger_def_org_field if we add a vtiger_field in vtiger_field vtiger_table
 populateFieldForSecurity('23',$newfieldid);
 
 //changes made to fix the bug in Address Information block of Accounts and Contacs module
 $update_array2 = Array(
-		"UPDATE field SET fieldlabel='Billing City' WHERE tabid=6 and tablename='accountbillads' and fieldname='bill_city'",
-		"UPDATE field SET fieldlabel='Billing State' WHERE tabid=6 and tablename='accountbillads' and fieldname='bill_state'",
-		"UPDATE field SET fieldlabel='Billing Code' WHERE tabid=6 and tablename='accountbillads' and fieldname='bill_code'",
-		"UPDATE field SET fieldlabel='Billing Country' WHERE tabid=6 and tablename='accountbillads' and fieldname='bill_country'",
-
-		"UPDATE field SET fieldlabel='Shipping City' WHERE tabid=6 and tablename='accountshipads' and fieldname='ship_city'",
-		"UPDATE field SET fieldlabel='Shipping Country' WHERE tabid=6 and tablename='accountshipads' and fieldname='ship_country'",
-		"UPDATE field SET fieldlabel='Shipping State' WHERE tabid=6 and tablename='accountshipads' and fieldname='ship_state'",
-		"UPDATE field SET fieldlabel='Shipping Code' WHERE tabid=6 and tablename='accountshipads' and fieldname='ship_code'",
-
-		"UPDATE field SET fieldlabel='Mailing City' WHERE tabid=4 and tablename='contactaddress' and fieldname='mailingcity'",
-		"UPDATE field SET fieldlabel='Mailing State' WHERE tabid=4 and tablename='contactaddress' and fieldname='mailingstate'",
-		"UPDATE field SET fieldlabel='Mailing Zip' WHERE tabid=4 and tablename='contactaddress' and fieldname='mailingzip'",
-		"UPDATE field SET fieldlabel='Mailing Country' WHERE tabid=4 and tablename='contactaddress' and fieldname='mailingcountry'",
-
-		"UPDATE field SET fieldlabel='Other City' WHERE tabid=4 and tablename='contactaddress' and fieldname='othercity'",
-		"UPDATE field SET fieldlabel='Other State' WHERE tabid=4 and tablename='contactaddress' and fieldname='otherstate'",
-		"UPDATE field SET fieldlabel='Other Zip' WHERE tabid=4 and tablename='contactaddress' and fieldname='otherzip'",
-		"UPDATE field SET fieldlabel='Other Country' WHERE tabid=4 and tablename='contactaddress' and fieldname='othercountry'",
+		"UPDATE vtiger_field SET vtiger_fieldlabel='Billing City' WHERE vtiger_tabid=6 and vtiger_tablename='accountbillads' and vtiger_fieldname='bill_city'",
+		"UPDATE vtiger_field SET vtiger_fieldlabel='Billing State' WHERE vtiger_tabid=6 and vtiger_tablename='accountbillads' and vtiger_fieldname='bill_state'",
+		"UPDATE vtiger_field SET vtiger_fieldlabel='Billing Code' WHERE vtiger_tabid=6 and vtiger_tablename='accountbillads' and vtiger_fieldname='bill_code'",
+		"UPDATE vtiger_field SET vtiger_fieldlabel='Billing Country' WHERE vtiger_tabid=6 and vtiger_tablename='accountbillads' and vtiger_fieldname='bill_country'",
+
+		"UPDATE vtiger_field SET vtiger_fieldlabel='Shipping City' WHERE vtiger_tabid=6 and vtiger_tablename='accountshipads' and vtiger_fieldname='ship_city'",
+		"UPDATE vtiger_field SET vtiger_fieldlabel='Shipping Country' WHERE vtiger_tabid=6 and vtiger_tablename='accountshipads' and vtiger_fieldname='ship_country'",
+		"UPDATE vtiger_field SET vtiger_fieldlabel='Shipping State' WHERE vtiger_tabid=6 and vtiger_tablename='accountshipads' and vtiger_fieldname='ship_state'",
+		"UPDATE vtiger_field SET vtiger_fieldlabel='Shipping Code' WHERE vtiger_tabid=6 and vtiger_tablename='accountshipads' and vtiger_fieldname='ship_code'",
+
+		"UPDATE vtiger_field SET vtiger_fieldlabel='Mailing City' WHERE vtiger_tabid=4 and vtiger_tablename='contactaddress' and vtiger_fieldname='mailingcity'",
+		"UPDATE vtiger_field SET vtiger_fieldlabel='Mailing State' WHERE vtiger_tabid=4 and vtiger_tablename='contactaddress' and vtiger_fieldname='mailingstate'",
+		"UPDATE vtiger_field SET vtiger_fieldlabel='Mailing Zip' WHERE vtiger_tabid=4 and vtiger_tablename='contactaddress' and vtiger_fieldname='mailingzip'",
+		"UPDATE vtiger_field SET vtiger_fieldlabel='Mailing Country' WHERE vtiger_tabid=4 and vtiger_tablename='contactaddress' and vtiger_fieldname='mailingcountry'",
+
+		"UPDATE vtiger_field SET vtiger_fieldlabel='Other City' WHERE vtiger_tabid=4 and vtiger_tablename='contactaddress' and vtiger_fieldname='othercity'",
+		"UPDATE vtiger_field SET vtiger_fieldlabel='Other State' WHERE vtiger_tabid=4 and vtiger_tablename='contactaddress' and vtiger_fieldname='otherstate'",
+		"UPDATE vtiger_field SET vtiger_fieldlabel='Other Zip' WHERE vtiger_tabid=4 and vtiger_tablename='contactaddress' and vtiger_fieldname='otherzip'",
+		"UPDATE vtiger_field SET vtiger_fieldlabel='Other Country' WHERE vtiger_tabid=4 and vtiger_tablename='contactaddress' and vtiger_fieldname='othercountry'",
 		);
 foreach($update_array2 as $query)
 {
@@ -293,22 +293,22 @@
 }
 
 
-//Added field emailoptout in account table
+//Added vtiger_field emailoptout in vtiger_account vtiger_table
 $newfieldid = $conn->getUniqueID("field");
-$insert_query3 = "insert into field values (6,".$newfieldid.",'emailoptout','account',1,'56','emailoptout','Email Opt Out',1,0,0,100,17,1,1,'C~O',1,'')";
+$insert_query3 = "insert into vtiger_field values (6,".$newfieldid.",'emailoptout','account',1,'56','emailoptout','Email Opt Out',1,0,0,100,17,1,1,'C~O',1,'')";
 Execute($insert_query3);
 
-//Added on 23-12-2005 because we must populate field entries in profile2field and def_org_field if we add a field in field table
+//Added on 23-12-2005 because we must populate vtiger_field entries in vtiger_profile2field and vtiger_def_org_field if we add a vtiger_field in vtiger_field vtiger_table
 populateFieldForSecurity('6',$newfieldid);
 
 //Added on 22-12-2005
-$alter_query4 = "alter table account add column emailoptout varchar(3) default 0";
+$alter_query4 = "alter vtiger_table vtiger_account add column emailoptout varchar(3) default 0";
 Execute($alter_query4);
 
 $update_array3 = Array(
-		"update field set sequence=18 where tabid=6 and fieldname ='assigned_user_id'",
-		"update field set sequence=19 where tabid=6 and fieldname ='createdtime'",
-		"update field set sequence=19 where tabid=6 and fieldname ='modifiedtime'",
+		"update vtiger_field set sequence=18 where vtiger_tabid=6 and vtiger_fieldname ='assigned_user_id'",
+		"update vtiger_field set sequence=19 where vtiger_tabid=6 and vtiger_fieldname ='createdtime'",
+		"update vtiger_field set sequence=19 where vtiger_tabid=6 and vtiger_fieldname ='modifiedtime'",
 		);
 foreach($update_array3 as $query)
 {
@@ -316,7 +316,7 @@
 }
 
 
-//create table moduleowners to assign the module and corresponding owners
+//create vtiger_table vtiger_moduleowners to assign the module and corresponding owners
 $create_query2 = "CREATE TABLE `moduleowners` (
 	  `tabid` int(19) NOT NULL default '0',
 	    `user_id` varchar(11) NOT NULL,
@@ -335,7 +335,7 @@
 */
 Execute($create_query2);
 
-//Populated the default entries for moduleowners which is created newly
+//Populated the default entries for vtiger_moduleowners which is created newly
 $module_array = Array(
 		'Potentials',
 		'Contacts',
@@ -357,18 +357,18 @@
 		);
 foreach($module_array as $mod)
 {
-	$query = "insert into moduleowners values(".$this->localGetTabID($mod).",1)";
-	Execute($query);
-}
-
-
-//Changes made to include status field in Activity Quickcreate Form
+	$query = "insert into vtiger_moduleowners values(".$this->localGetTabID($mod).",1)";
+	Execute($query);
+}
+
+
+//Changes made to include status vtiger_field in Activity Quickcreate Form
 $update_array4 = Array(
-		"UPDATE field SET quickcreate=0,quickcreatesequence=3 WHERE tabid=16 and fieldname='eventstatus'",
-		"UPDATE field SET quickcreate=0,quickcreatesequence=4 WHERE tabid=16 and fieldname='activitytype'",
-		"UPDATE field SET quickcreate=0,quickcreatesequence=5 WHERE tabid=16 and fieldname='duration_hours'",
-
-		"UPDATE field SET quickcreate=0,quickcreatesequence=3 WHERE tabid=9 and fieldname='taskstatus'",
+		"UPDATE vtiger_field SET quickcreate=0,quickcreatesequence=3 WHERE vtiger_tabid=16 and vtiger_fieldname='eventstatus'",
+		"UPDATE vtiger_field SET quickcreate=0,quickcreatesequence=4 WHERE vtiger_tabid=16 and vtiger_fieldname='activitytype'",
+		"UPDATE vtiger_field SET quickcreate=0,quickcreatesequence=5 WHERE vtiger_tabid=16 and vtiger_fieldname='duration_hours'",
+
+		"UPDATE vtiger_field SET quickcreate=0,quickcreatesequence=3 WHERE vtiger_tabid=9 and vtiger_fieldname='taskstatus'",
 		);
 foreach($update_array4 as $query)
 {
@@ -378,10 +378,10 @@
 
 
 //Table 'inventory_tandc' added newly to include Inventory Terms &Conditions
-$create_query1 = "CREATE TABLE  inventory_tandc(id INT(19),type VARCHAR(30) NOT NULL,tandc LONGTEXT default NULL,PRIMARY KEY(id))";
+$create_query1 = "CREATE TABLE  vtiger_inventory_tandc(id INT(19),type VARCHAR(30) NOT NULL,tandc LONGTEXT default NULL,PRIMARY KEY(id))";
 Execute($create_query1);
 
-$insert_query4 = "insert into inventory_tandc values('".$conn->getUniqueID('inventory_tandc')."','Inventory','  ')";
+$insert_query4 = "insert into vtiger_inventory_tandc values('".$conn->getUniqueID('inventory_tandc')."','Inventory','  ')";
 Execute($insert_query4);
 
 /****************** 5.0(Alpha) dev version 1 Database changes -- Ends*********************/
@@ -397,17 +397,17 @@
 
 /****************** 5.0(Alpha) dev version 2 Database changes -- Starts*********************/
 
-$query1 = "ALTER TABLE leadaddress change lane lane varchar(250)";
+$query1 = "ALTER TABLE vtiger_leadaddress change lane lane varchar(250)";
 Execute($query1);
 
 $rename_table_array1 = Array(
-		"update field set tablename='customerdetails' where tabid=4 and fieldname in ('portal','support_start_date','support_end_date')",
-		"alter table PortalInfo drop foreign key fk_PortalInfo",
-		"rename table PortalInfo to portalinfo",
-		"alter table portalinfo add CONSTRAINT `fk_portalinfo` FOREIGN KEY (`id`) REFERENCES `contactdetails` (`contactid`) ON DELETE CASCADE",
-		"alter table CustomerDetails drop foreign key fk_CustomerDetails",
-		"rename table CustomerDetails to customerdetails",
-		"alter table customerdetails add CONSTRAINT `fk_customerdetails` FOREIGN KEY (`customerid`) REFERENCES `contactdetails` (`contactid`) ON DELETE CASCADE"
+		"update vtiger_field set vtiger_tablename='customerdetails' where vtiger_tabid=4 and vtiger_fieldname in ('portal','support_start_date','support_end_date')",
+		"alter vtiger_table PortalInfo drop foreign key fk_PortalInfo",
+		"rename vtiger_table PortalInfo to vtiger_portalinfo",
+		"alter vtiger_table vtiger_portalinfo add CONSTRAINT `fk_portalinfo` FOREIGN KEY (`id`) REFERENCES `contactdetails` (`contactid`) ON DELETE CASCADE",
+		"alter vtiger_table CustomerDetails drop foreign key fk_CustomerDetails",
+		"rename vtiger_table CustomerDetails to vtiger_customerdetails",
+		"alter vtiger_table vtiger_customerdetails add CONSTRAINT `fk_customerdetails` FOREIGN KEY (`customerid`) REFERENCES `contactdetails` (`contactid`) ON DELETE CASCADE"
 		);
 foreach($rename_table_array1 as $query)
 {
@@ -415,12 +415,12 @@
 }
 
 
-$query2 = "create table ownernotify(crmid int(19),smownerid int(19),flag int(3))";
+$query2 = "create vtiger_table vtiger_ownernotify(crmid int(19),smownerid int(19),flag int(3))";
 Execute($query2);
 
 
-//Form the role_map_array as roleid=>name mapping array
-$sql = "select * from role";
+//Form the vtiger_role_map_array as vtiger_roleid=>name mapping array
+$sql = "select * from vtiger_role";
 $res = $conn->query($sql);
 $role_map_array = Array();
 for($i=0;$i<$conn->num_rows($res);$i++)
@@ -429,10 +429,10 @@
 	$name = $conn->query_result($res,$i,'name');
 	$role_map_array[$roleid] = $name;
 }
-//echo '<pre> List of roles :';print_r($role_map_array);echo '</pre>';
-
-//Before delete the role take a backup array for the table user2role
-$sql = "select * from user2role";
+//echo '<pre> List of vtiger_roles :';print_r($role_map_array);echo '</pre>';
+
+//Before delete the vtiger_role take a backup array for the vtiger_table vtiger_user2role
+$sql = "select * from vtiger_user2role";
 $res = $conn->query($sql);
 $user2role_array = array();
 for($i=0;$i<$conn->num_rows($res);$i++)
@@ -441,23 +441,23 @@
 	$roleid = $conn->query_result($res,$i,'roleid');
 	$user2role_array[$userid] = $roleid;
 }
-//echo '<pre> List of user2role : (userid => roleid)';print_r($user2role_array);echo '</pre>';
-
-//Delete the role entries
-$sql = "truncate role";
+//echo '<pre> List of vtiger_user2role : (userid => vtiger_roleid)';print_r($user2role_array);echo '</pre>';
+
+//Delete the vtiger_role entries
+$sql = "truncate vtiger_role";
 Execute($sql);
 
 
-$query3 = "alter table user2role drop FOREIGN KEY fk_user2role2";
+$query3 = "alter vtiger_table vtiger_user2role drop FOREIGN KEY fk_user2role2";
 Execute($query3);
 
 //4,5 th are the Extra added queries
 $alter_query_array1 = Array(
-		"alter table user2role change roleid roleid varchar(255)",
-		"alter table role2profile change roleid roleid varchar(255)",
-		"alter table role CHANGE roleid roleid varchar(255)",
-		"alter table role2profile drop PRIMARY KEY",
-		"alter table role2profile ADD PRIMARY KEY (roleid,profileid)"
+		"alter vtiger_table vtiger_user2role change vtiger_roleid vtiger_roleid varchar(255)",
+		"alter vtiger_table vtiger_role2profile change vtiger_roleid vtiger_roleid varchar(255)",
+		"alter vtiger_table vtiger_role CHANGE vtiger_roleid vtiger_roleid varchar(255)",
+		"alter vtiger_table vtiger_role2profile drop PRIMARY KEY",
+		"alter vtiger_table vtiger_role2profile ADD PRIMARY KEY (roleid,profileid)"
 		);
 foreach($alter_query_array1 as $query)
 {
@@ -465,14 +465,14 @@
 }
 
 
-$query4 = "ALTER TABLE user2role ADD CONSTRAINT fk_user2role2 FOREIGN KEY (roleid) REFERENCES role(roleid) ON DELETE CASCADE";
+$query4 = "ALTER TABLE vtiger_user2role ADD CONSTRAINT fk_user2role2 FOREIGN KEY (roleid) REFERENCES vtiger_role(roleid) ON DELETE CASCADE";
 Execute($query4);
 
 $alter_query_array2 = Array(
-		"alter table role CHANGE name rolename varchar(200)",
-		"alter table role DROP description",
-		"alter table role add parentrole varchar(255)",
-		"alter table role add depth int(19)"
+		"alter vtiger_table vtiger_role CHANGE name vtiger_rolename varchar(200)",
+		"alter vtiger_table vtiger_role DROP description",
+		"alter vtiger_table vtiger_role add parentrole varchar(255)",
+		"alter vtiger_table vtiger_role add depth int(19)"
 		);
 foreach($alter_query_array2 as $query)
 {
@@ -481,17 +481,17 @@
 
 
 
-$query5 = "insert into role values('H1','Organisation','H1',0)";
+$query5 = "insert into vtiger_role values('H1','Organisation','H1',0)";
 Execute($query5);
 
 //include("include/utils/UserInfoUtil.php");
-//Create role based on role_map_array values and form the new_role_map_array with old roleid and new roleid
+//Create vtiger_role based on vtiger_role_map_array values and form the new_role_map_array with old vtiger_roleid and new vtiger_roleid
 foreach($role_map_array as $roleid => $rolename)
 {
 	$parentRole = 'H1';
 	if($rolename == 'standard_user')
 	{
-		$rs = $conn->query("select * from role where rolename='administrator'");
+		$rs = $conn->query("select * from vtiger_role where vtiger_rolename='administrator'");
 		$parentRole = $conn->query_result($rs,0,'roleid');
 	}
 	$empty_array = array(""=>"");
@@ -500,42 +500,42 @@
 }
 
 //Before insert the new entry we should remove the old entries -- added on 06-06-06
-$user2role_del = "truncate user2role";
+$user2role_del = "truncate vtiger_user2role";
 Execute($user2role_del);
 
-//First we will insert the old values from user2role_array to user2role table and then update the new role id
+//First we will insert the old values from vtiger_user2role_array to vtiger_user2role vtiger_table and then update the new vtiger_role id
 foreach($user2role_array as $userid => $roleid)
 {
-	$sql = "insert into user2role (userid, roleid) values(".$userid.",'".$new_role_map_array[$roleid]."')";
+	$sql = "insert into vtiger_user2role (userid, vtiger_roleid) values(".$userid.",'".$new_role_map_array[$roleid]."')";
 	Execute($sql);
 }
-//Commented the following loop as we have backup the user2role and insert the entries with the new rold id using new_role_map_array above
-//Update the user2role table with new roleid
+//Commented the following loop as we have backup the vtiger_user2role and insert the entries with the new rold id using new_role_map_array above
+//Update the vtiger_user2role vtiger_table with new vtiger_roleid
 /*
    foreach($new_role_map_array as $old_roleid => $new_roleid)
    {
-   $update_user2role = "update user2role set roleid='".$new_roleid."' where roleid=".$old_roleid;
+   $update_user2role = "update vtiger_user2role set vtiger_roleid='".$new_roleid."' where vtiger_roleid=".$old_roleid;
    Execute($update_user2role);
    }
  */
-//Update the role2profile table with new roleid
+//Update the vtiger_role2profile vtiger_table with new vtiger_roleid
 foreach($new_role_map_array as $old_roleid => $new_roleid)
 {
-	$update_role2profile = "update role2profile set roleid='".$new_roleid."' where roleid=".$old_roleid;
+	$update_role2profile = "update vtiger_role2profile set vtiger_roleid='".$new_roleid."' where vtiger_roleid=".$old_roleid;
 	Execute($update_role2profile);
 }
 
 
 
 //Group Migration:
-//Step 1 :  form and group_map_array as groupname => description from groups table
-//Step 2 :  form an users2group_map_array array as userid => groupname from users2group table
-//Step 3 :  delete all entries from groups table and enter new values from group_map_array
-//Step 4 :  drop the table users2group and create new table
-//Step 5 :  put entries to users2group table based on users2group_map_array. Here get the groupid from groups table based on groupname
+//Step 1 :  form and group_map_array as groupname => description from vtiger_groups vtiger_table
+//Step 2 :  form an vtiger_users2group_map_array array as userid => groupname from vtiger_users2group vtiger_table
+//Step 3 :  delete all entries from vtiger_groups vtiger_table and enter new values from group_map_array
+//Step 4 :  drop the vtiger_table vtiger_users2group and create new vtiger_table
+//Step 5 :  put entries to vtiger_users2group vtiger_table based on vtiger_users2group_map_array. Here get the groupid from vtiger_groups vtiger_table based on groupname
 
 //Step 1 : Form the group_map_array as groupname => description
-$sql = "select * from groups";
+$sql = "select * from vtiger_groups";
 $res = $conn->query($sql);
 $group_map_array = Array();
 for($i=0;$i<$conn->num_rows($res);$i++)
@@ -547,8 +547,8 @@
 //echo '<pre>List of Groups : ';print_r($group_map_array);echo '</pre>';
 
 
-//Step 2 : form an users2group_map_array array as userid => groupname from users2group table
-$sql = "select * from users2group";
+//Step 2 : form an vtiger_users2group_map_array array as userid => groupname from vtiger_users2group vtiger_table
+$sql = "select * from vtiger_users2group";
 $res = $conn->query($sql);
 $users2group_map_array = Array();
 for($i=0;$i<$conn->num_rows($res);$i++)
@@ -557,18 +557,18 @@
 	$userid = $conn->query_result($res,$i,'userid');
 	$users2group_map_array[$userid] = $groupname;
 }
-//echo '<pre>List of users2group : ';print_r($users2group_map_array);echo '</pre>';
-
-//Step 3 : delete all entries from groups table
-$sql = "truncate groups";
+//echo '<pre>List of vtiger_users2group : ';print_r($users2group_map_array);echo '</pre>';
+
+//Step 3 : delete all entries from vtiger_groups vtiger_table
+$sql = "truncate vtiger_groups";
 Execute($sql);
 
 $alter_query_array3 = Array(
-		"alter table users2group drop FOREIGN KEY fk_users2group",
-		"alter table leadgrouprelation drop FOREIGN KEY fk_leadgrouprelation2",
-		"alter table activitygrouprelation drop FOREIGN KEY fk_activitygrouprelation2",
-		"alter table ticketgrouprelation drop FOREIGN KEY fk_ticketgrouprelation2",
-		"alter table groups drop PRIMARY KEY"
+		"alter vtiger_table vtiger_users2group drop FOREIGN KEY fk_users2group",
+		"alter vtiger_table vtiger_leadgrouprelation drop FOREIGN KEY fk_leadgrouprelation2",
+		"alter vtiger_table vtiger_activitygrouprelation drop FOREIGN KEY fk_activitygrouprelation2",
+		"alter vtiger_table vtiger_ticketgrouprelation drop FOREIGN KEY fk_ticketgrouprelation2",
+		"alter vtiger_table vtiger_groups drop PRIMARY KEY"
 		);
 foreach($alter_query_array3 as $query)
 {
@@ -576,12 +576,12 @@
 }
 
 //2 nd query is the Extra added query
-//Adding columns in group table:
+//Adding columns in group vtiger_table:
 $alter_query_array4 = Array(
-		"alter table groups add column groupid int(19) FIRST",
-		"alter table groups change name  groupname varchar(100)",
-		"alter table groups ADD PRIMARY KEY (groupid)",
-		"alter table groups add index (groupname)"
+		"alter vtiger_table vtiger_groups add column groupid int(19) FIRST",
+		"alter vtiger_table vtiger_groups change name  groupname varchar(100)",
+		"alter vtiger_table vtiger_groups ADD PRIMARY KEY (groupid)",
+		"alter vtiger_table vtiger_groups add index (groupname)"
 		);
 foreach($alter_query_array4 as $query)
 {
@@ -589,7 +589,7 @@
 }
 
 
-//Moved the create table queries for group2grouprel, group2role, group2rs from the end of this block
+//Moved the create vtiger_table queries for vtiger_group2grouprel, vtiger_group2role, vtiger_group2rs from the end of this block
 //Added on 06-06-06
 $query8 = "CREATE TABLE `group2grouprel` (
 	  `groupid` int(19) NOT NULL,
@@ -641,7 +641,7 @@
 */
 Execute($query10);
 
-//Insert all the retrieved old values to the new groups table ie., create new groups
+//Insert all the retrieved old values to the new vtiger_groups vtiger_table ie., create new vtiger_groups
 foreach($group_map_array as $groupname => $description)
 {
 	$empty_array = array(
@@ -655,10 +655,10 @@
 }
 
 
-//Copy all mappings in a user2grop table in a array;
-
-//Step 4 : Drop and again create users2group
-$query6 = "drop table users2group";
+//Copy all mappings in a user2grop vtiger_table in a array;
+
+//Step 4 : Drop and again create vtiger_users2group
+$query6 = "drop vtiger_table vtiger_users2group";
 Execute($query6);
 
 //Added on 06-06-06
@@ -679,30 +679,30 @@
 */
 Execute($query7);
 
-//Step 5 : put entries to users2group table based on users2group_map_array. Here get the groupid from groups table based on groupname
+//Step 5 : put entries to vtiger_users2group vtiger_table based on vtiger_users2group_map_array. Here get the groupid from vtiger_groups vtiger_table based on groupname
 foreach($users2group_map_array as $userid => $groupname)
 {
-	//$groupid = $conn->query_result($conn->query("select * from groups where groupname='".$groupname."'"),0,'groupid');
-	$sql = "insert into users2group (groupid,userid) values(".$group_name_id_mapping[$groupname].",".$userid.")";
+	//$groupid = $conn->query_result($conn->query("select * from vtiger_groups where groupname='".$groupname."'"),0,'groupid');
+	$sql = "insert into vtiger_users2group (groupid,userid) values(".$group_name_id_mapping[$groupname].",".$userid.")";
 	Execute($sql);
 }
 
 
 $alter_query_array5 = Array(
-		"alter table leadgrouprelation ADD CONSTRAINT fk_leadgrouprelation2 FOREIGN KEY (groupname) REFERENCES groups(groupname) ON DELETE CASCADE",
-		"ALTER TABLE activitygrouprelation ADD CONSTRAINT fk_activitygrouprelation2 FOREIGN KEY (groupname) REFERENCES groups(groupname) ON DELETE CASCADE",
-		"ALTER TABLE ticketgrouprelation ADD CONSTRAINT fk_ticketgrouprelation2 FOREIGN KEY (groupname) REFERENCES groups(groupname) ON DELETE CASCADE"
+		"alter vtiger_table vtiger_leadgrouprelation ADD CONSTRAINT fk_leadgrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE",
+		"ALTER TABLE vtiger_activitygrouprelation ADD CONSTRAINT fk_activitygrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE",
+		"ALTER TABLE vtiger_ticketgrouprelation ADD CONSTRAINT fk_ticketgrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE"
 		);
 foreach($alter_query_array5 as $query)
 {
 	Execute($query);
 }
-//Moved the create table queries for group2grouprel, group2role, group2rs to before creatinf the Group ie., before call the createGroup
-
-
-/***Added to include decimal places for amount field in potential table  --by Mangai 15-Nov-2005***/
-
-$query11 = "ALTER TABLE potential change amount amount decimal(10,2)";
+//Moved the create vtiger_table queries for vtiger_group2grouprel, vtiger_group2role, vtiger_group2rs to before creatinf the Group ie., before call the createGroup
+
+
+/***Added to include decimal places for amount vtiger_field in vtiger_potential vtiger_table  --by Mangai 15-Nov-2005***/
+
+$query11 = "ALTER TABLE vtiger_potential change amount amount decimal(10,2)";
 Execute($query11);
 
 /****************** 5.0(Alpha) dev version 2 Database changes -- Ends*********************/
@@ -720,10 +720,10 @@
 
 /****************** 5.0(Alpha) dev version 3 Database changes -- Starts*********************/
 
-//Drop the column company_name from vendor table ---- modified by Mickie on 18-11-2005
-$altersql1 = "alter table vendor drop column company_name";
+//Drop the column company_name from vtiger_vendor vtiger_table ---- modified by Mickie on 18-11-2005
+$altersql1 = "alter vtiger_table vtiger_vendor drop column company_name";
 Execute($altersql1);
-//TODO (check): Remove this company_name entry from the field table if it already exists
+//TODO (check): Remove this company_name entry from the vtiger_field vtiger_table if it already exists
 
 //Migration for Default Organisation Share -- Added by Don on 20-11-2005
 
@@ -743,24 +743,24 @@
 Execute($query2);
 
 
-$query3 = "alter table def_org_share add column editstatus int(19)";
+$query3 = "alter vtiger_table vtiger_def_org_share add column editstatus int(19)";
 Execute($query3);
 
-$query4 = "delete from def_org_share where tabid in(8,14,15,18,19)";
+$query4 = "delete from vtiger_def_org_share where vtiger_tabid in(8,14,15,18,19)";
 Execute($query4);
 
 
 
 //Inserting values into org share action mapping
 $insert_query_array1 = Array(
-			"insert into org_share_action_mapping values(0,'Public: Read Only')",
-			"insert into org_share_action_mapping values(1,'Public:Read,Create/Edit')",
-			"insert into org_share_action_mapping values(2,'Public: Read, Create/Edit, Delete')",
-			"insert into org_share_action_mapping values(3,'Private')",
-			"insert into org_share_action_mapping values(4,'Hide Details')",
-			"insert into org_share_action_mapping values(5,'Hide Details and Add Events')",
-			"insert into org_share_action_mapping values(6,'Show Details')",
-			"insert into org_share_action_mapping values(7,'Show Details and Add Events')"
+			"insert into vtiger_org_share_action_mapping values(0,'Public: Read Only')",
+			"insert into vtiger_org_share_action_mapping values(1,'Public:Read,Create/Edit')",
+			"insert into vtiger_org_share_action_mapping values(2,'Public: Read, Create/Edit, Delete')",
+			"insert into vtiger_org_share_action_mapping values(3,'Private')",
+			"insert into vtiger_org_share_action_mapping values(4,'Hide Details')",
+			"insert into vtiger_org_share_action_mapping values(5,'Hide Details and Add Events')",
+			"insert into vtiger_org_share_action_mapping values(6,'Show Details')",
+			"insert into vtiger_org_share_action_mapping values(7,'Show Details and Add Events')"
 			);
 foreach($insert_query_array1 as $query)
 {
@@ -768,15 +768,15 @@
 }
 
 
-//Inserting for all tabs
+//Inserting for all vtiger_tabs
 $def_org_tabid=Array(2,4,6,7,9,10,13,16,20,21,22,23,26);
 foreach($def_org_tabid as $def_tabid)
 {
 	$insert_query_array2 = Array(
-			"insert into org_share_action2tab values(0,".$def_tabid.")",
-			"insert into org_share_action2tab values(1,".$def_tabid.")",
-			"insert into org_share_action2tab values(2,".$def_tabid.")",
-			"insert into org_share_action2tab values(3,".$def_tabid.")"
+			"insert into vtiger_org_share_action2tab values(0,".$def_tabid.")",
+			"insert into vtiger_org_share_action2tab values(1,".$def_tabid.")",
+			"insert into vtiger_org_share_action2tab values(2,".$def_tabid.")",
+			"insert into vtiger_org_share_action2tab values(3,".$def_tabid.")"
 			);
 	foreach($insert_query_array2 as $query)
 	{
@@ -785,10 +785,10 @@
 }
 
 $insert_query_array3 = Array(
-		"insert into org_share_action2tab values(4,17)",
-		"insert into org_share_action2tab values(5,17)",
-		"insert into org_share_action2tab values(6,17)",
-		"insert into org_share_action2tab values(7,17)"
+		"insert into vtiger_org_share_action2tab values(4,17)",
+		"insert into vtiger_org_share_action2tab values(5,17)",
+		"insert into vtiger_org_share_action2tab values(6,17)",
+		"insert into vtiger_org_share_action2tab values(7,17)"
 		);
 foreach($insert_query_array3 as $query)
 {
@@ -796,11 +796,11 @@
 }
 
 $query_array1 = Array(
-		"insert into def_org_share values(9,17,7,0)",
-		"update def_org_share set editstatus=0",
-		"update def_org_share set editstatus=2 where tabid=4",
-		"update def_org_share set editstatus=1 where tabid=9",
-		"update def_org_share set editstatus=2 where tabid=16"
+		"insert into vtiger_def_org_share values(9,17,7,0)",
+		"update vtiger_def_org_share set editstatus=0",
+		"update vtiger_def_org_share set editstatus=2 where vtiger_tabid=4",
+		"update vtiger_def_org_share set editstatus=1 where vtiger_tabid=9",
+		"update vtiger_def_org_share set editstatus=2 where vtiger_tabid=16"
 		);
 foreach($query_array1 as $query)
 {
@@ -814,8 +814,8 @@
 $conn->println("Database Modifications for 5.0(Alpha) Dev 3 ==> 5.0 Alpha starts here.");
 //echo "<br><br><b>Database Modifications for 5.0(Alpha) Dev3 ==> 5.0 Alpha starts here.....</b><br>";
 $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"
+				"ALTER TABLE vtiger_users ADD column vtiger_activity_view VARCHAR(25) DEFAULT 'Today' AFTER homeorder",
+				"ALTER TABLE vtiger_activity ADD column notime CHAR(3) DEFAULT '0' AFTER location"
 			   );
 foreach($alter_query_array6 as $query)
 {
@@ -823,8 +823,8 @@
 }
 
 $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,'')"
+				"Insert into vtiger_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 vtiger_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)
 {
@@ -832,20 +832,20 @@
 }
 
 $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"
+				"alter vtiger_table vtiger_vendor add column pobox varchar(30) after state",
+				"alter vtiger_table vtiger_leadaddress add column pobox varchar(30) after state",
+				"alter vtiger_table vtiger_accountbillads add column pobox varchar(30) after state",
+				"alter vtiger_table vtiger_accountshipads add column pobox varchar(30) after state",
+				"alter vtiger_table vtiger_contactaddress add column mailingpobox varchar(30) after mailingstate",
+				"alter vtiger_table vtiger_contactaddress add column otherpobox varchar(30) after otherstate",
+				"alter vtiger_table vtiger_quotesbillads add column bill_pobox varchar(30) after bill_street",
+				"alter vtiger_table vtiger_quotesshipads add column ship_pobox varchar(30) after ship_street",
+				"alter vtiger_table vtiger_pobillads add column bill_pobox varchar(30) after bill_street",
+				"alter vtiger_table vtiger_poshipads add column ship_pobox varchar(30) after ship_street",
+				"alter vtiger_table vtiger_sobillads add column bill_pobox varchar(30) after bill_street",
+				"alter vtiger_table vtiger_soshipads add column ship_pobox varchar(30) after ship_street",
+				"alter vtiger_table vtiger_invoicebillads add column bill_pobox varchar(30) after bill_street",
+				"alter vtiger_table vtiger_invoiceshipads add column ship_pobox varchar(30) after ship_street"
 			   );
 foreach($alter_query_array7 as $query)
 {
@@ -853,27 +853,27 @@
 }
 
 $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 vtiger_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 vtiger_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 vtiger_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 vtiger_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,'')"
+				"insert into vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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)
 {
@@ -892,7 +892,7 @@
 	$n = $n+5;
 	for($i = 0;$i < 5;$i++)
 	{
-		$query1 = "update field set sequence=".$sequence[$j]." where tablename='".$tablename[$n+$i]."' && fieldname='".$fieldname[$j]."'";
+		$query1 = "update vtiger_field set sequence=".$sequence[$j]." where vtiger_tablename='".$tablename[$n+$i]."' && vtiger_fieldname='".$fieldname[$j]."'";
 		Execute($query1);
 	}
 }
@@ -902,7 +902,7 @@
 $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]."'";
+	$query2 = "update vtiger_field set sequence=".$sequence[$i]." where vtiger_tablename='".$tablename."' && vtiger_fieldname='".$fieldname[$i]."'";
 	Execute($query2);
 }
 
@@ -912,7 +912,7 @@
 
 for($i = 0;$i < 4;$i++)
 {
-	$query3 = "update field set sequence=".$sequence[$i]." where tablename='".$tablename."' && fieldname='".$fieldname[$i]."'";
+	$query3 = "update vtiger_field set sequence=".$sequence[$i]." where vtiger_tablename='".$tablename."' && vtiger_fieldname='".$fieldname[$i]."'";
 	Execute($query3);
 }
 
@@ -922,43 +922,43 @@
 
 for($i = 0;$i < 8;$i++)
 {
-	$query = "update field set sequence=".$sequence[$i]." where tablename='".$tablename."' && fieldname='".$fieldname[$i]."'";
+	$query = "update vtiger_field set sequence=".$sequence[$i]." where vtiger_tablename='".$tablename."' && vtiger_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"
+			"update vtiger_field set vtiger_tablename='crmentity' where vtiger_tabid=10 and vtiger_fieldname='description'",
+			"update vtiger_field set vtiger_tablename='attachments' where vtiger_tabid=10 and vtiger_fieldname='filename'",
+			"drop vtiger_table emails",
+
+			"alter vtiger_table vtiger_activity drop column description",
+			"update vtiger_field set vtiger_tablename='crmentity' where vtiger_tabid in (9,16) and vtiger_fieldname='description'",
+
+			"update vtiger_tab set name='PurchaseOrder',tablabel='PurchaseOrder' where vtiger_tabid=21",
+			"update vtiger_tab set presence=0 where vtiger_tabid=22 and name='SalesOrder'",
+
+			"delete from vtiger_actionmapping where actionname='SalesOrderDetailView'",
+			"delete from vtiger_actionmapping where actionname='SalesOrderEditView'",
+			"delete from vtiger_actionmapping where actionname='SaveSalesOrder'",
+			"delete from vtiger_actionmapping where actionname='DeleteSalesOrder'",
+
+			"insert into vtiger_field values (13,".$conn->getUniqueID("field").",'filename','attachments',1,'61','filename','Attachment',1,0,0,100,12,2,1,'V~O',0,1)",
+
+			"alter vtiger_table vtiger_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))";
+$create_query3 = "create vtiger_table vtiger_parenttab(parenttabid int(19) not null, vtiger_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)";
+$create_query4 = "create vtiger_table vtiger_parenttabrel(parenttabid int(3) not null, vtiger_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), (2,6,2), (2,4,3) "
+				"insert into vtiger_parenttab values(1,'My Home Page',1,0),(2,'Marketing',2,0),(3,'Sales',3,0),(4,'Support',4,0),(5,'Analytics',5,0),(6,'Inventory',6,0), (7,'Tools',7,0),(8,'Settings',8,0)",
+				"insert into vtiger_parenttabrel values(1,9,2),(1,17,3),(1,10,4),(1,3,1),(3,7,1),(3,6,2),(3,4,3),(3,2,4),(3,20,5),(3,22,6),(3,23,7),(3,14,8),(3,19,9),(3,8,10),(4,13,1),(4,15,2),(4,6,3),(4,4,4),(4,14,5),(4,8,6),(5,1,1),(5,25,2),(6,14,1), (6,18,2), (6,19,3), (6,21,4), (6,22,5), (6,20,6), (6,23,7), (7,24,1), (7,27,2), (7,8,3), (2,26,1), (2,6,2), (2,4,3) "
 			    );
 foreach($insert_query_array4 as $query)
 {
@@ -966,100 +966,100 @@
 }
 
 
-$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))";
+$create_query5 = "CREATE TABLE vtiger_blocks ( blockid int(19) NOT NULL, vtiger_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",//Modified on 24-04-06
-				"update field set block=4 where tabid=4 and block=1",
-				"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",
+				"update vtiger_field set block=2 where vtiger_tabid=2 and block=5",
+				"update vtiger_field set block=3 where vtiger_tabid=2 and block=2",
+
+				//"update vtiger_field set block=4 where vtiger_tabid=4 and block=1",
+				"update vtiger_field set block=5 where vtiger_tabid=4 and block=5",
+				"update vtiger_field set block=6 where vtiger_tabid=4 and block=4",//Modified on 24-04-06
+				"update vtiger_field set block=4 where vtiger_tabid=4 and block=1",
+				"update vtiger_field set block=7 where vtiger_tabid=4 and block=2",
+				"update vtiger_field set block=8 where vtiger_tabid=4 and block=3",
+
+				"update vtiger_field set block=9 where vtiger_tabid=6 and block=1",
+				"update vtiger_field set block=10 where vtiger_tabid=6 and block=5",
+				"update vtiger_field set block=11 where vtiger_tabid=6 and block=2",
+				"update vtiger_field set block=12 where vtiger_tabid=6 and block=3",
+
+				"update vtiger_field set block=13 where vtiger_tabid=7 and block=1",
+				"update vtiger_field set block=14 where vtiger_tabid=7 and block=5",
+				"update vtiger_field set block=15 where vtiger_tabid=7 and block=2",
+				"update vtiger_field set block=16 where vtiger_tabid=7 and block=3",
+
+				"update vtiger_field set block=17 where vtiger_tabid=8 and block=1",
+				"update vtiger_field set block=17 where vtiger_tabid=8 and block=2",
+				"update vtiger_field set block=18 where vtiger_tabid=8 and block=3",
+
+				"update vtiger_field set block=19 where vtiger_tabid=9 and block=1",
+				"update vtiger_field set block=19 where vtiger_tabid=9 and block=7",
+				"update vtiger_field set block=20 where vtiger_tabid=9 and block=2",
+
+				"update vtiger_field set block=21 where vtiger_tabid=10 and block=1",
+				"update vtiger_field set block=22 where vtiger_tabid=10 and block=2",
+				"update vtiger_field set block=23 where vtiger_tabid=10 and block=3",
+				"update vtiger_field set block=23 where vtiger_tabid=10 and block=4",
+				"update vtiger_field set block=24 where vtiger_tabid=10 and block=5",
+
+				"update vtiger_field set block=25 where vtiger_tabid=13 and block=1",
+				"update vtiger_field set block=26 where vtiger_tabid=13 and block=2",
+				"update vtiger_field set block=27 where vtiger_tabid=13 and block=5",
+				"update vtiger_field set block=28 where vtiger_tabid=13 and block=3",
+				"update vtiger_field set block=29 where vtiger_tabid=13 and block=4",
+				"update vtiger_field set block=30 where vtiger_tabid=13 and block=6",
+
+				"update vtiger_field set block=31 where vtiger_tabid=14 and block=1",
+				"update vtiger_field set block=32 where vtiger_tabid=14 and block=2",
+				"update vtiger_field set block=33 where vtiger_tabid=14 and block=3",
+				"update vtiger_field set block=34 where vtiger_tabid=14 and block=5",
+				"update vtiger_field set block=35 where vtiger_tabid=14 and block=6",
+				"update vtiger_field set block=36 where vtiger_tabid=14 and block=4",
+
+				"update vtiger_field set block=37 where vtiger_tabid=15 and block=1",
+				"update vtiger_field set block=38 where vtiger_tabid=15 and block=2",
+				"update vtiger_field set block=39 where vtiger_tabid=15 and block=3",
+				"update vtiger_field set block=40 where vtiger_tabid=15 and block=4",
+
+				"update vtiger_field set block=41 where vtiger_tabid=16 and block=1",
+				"update vtiger_field set block=42 where vtiger_tabid=16 and block=7",
+				"update vtiger_field set block=43 where vtiger_tabid=16 and block=2",
+
+				"update vtiger_field set block=44 where vtiger_tabid=18 and block=1",
+				"update vtiger_field set block=45 where vtiger_tabid=18 and block=5",
+				"update vtiger_field set block=36 where vtiger_tabid=18 and block=2",
+				"update vtiger_field set block=47 where vtiger_tabid=18 and block=3",
+
+				"update vtiger_field set block=48 where vtiger_tabid=19 and block=1",
+				"update vtiger_field set block=49 where vtiger_tabid=19 and block=5",
+				"update vtiger_field set block=50 where vtiger_tabid=19 and block=2",
+
+				"update vtiger_field set block=51 where vtiger_tabid=20 and block=1",
+				"update vtiger_field set block=52 where vtiger_tabid=20 and block=5",
+				"update vtiger_field set block=53 where vtiger_tabid=20 and block=2",
+				"update vtiger_field set block=55 where vtiger_tabid=20 and block=6",
+				"update vtiger_field set block=56 where vtiger_tabid=20 and block=3",
+
+				"update vtiger_field set block=57 where vtiger_tabid=21 and block=1",
+				"update vtiger_field set block=58 where vtiger_tabid=21 and block=5",
+				"update vtiger_field set block=59 where vtiger_tabid=21 and block=2",
+				"update vtiger_field set block=61 where vtiger_tabid=21 and block=6",
+				"update vtiger_field set block=62 where vtiger_tabid=21 and block=3",
+
+				"update vtiger_field set block=63 where vtiger_tabid=22 and block=1",
+				"update vtiger_field set block=64 where vtiger_tabid=22 and block=5",
+				"update vtiger_field set block=65 where vtiger_tabid=22 and block=2",
+				"update vtiger_field set block=67 where vtiger_tabid=22 and block=6",
+				"update vtiger_field set block=68 where vtiger_tabid=22 and block=3",
+
+
+				"update vtiger_field set block=69 where vtiger_tabid=23 and block=1",
+				"update vtiger_field set block=70 where vtiger_tabid=23 and block=5",
+				"update vtiger_field set block=71 where vtiger_tabid=23 and block=2",
+				"update vtiger_field set block=73 where vtiger_tabid=23 and block=6",
+				"update vtiger_field set block=74 where vtiger_tabid=23 and block=3",
 			    );
 foreach($update_query_array1 as $query)
 {
@@ -1067,80 +1067,80 @@
 }
 
 $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)"
+				"insert into vtiger_blocks values (1,2,'LBL_OPPORTUNITY_INFORMATION',1,0,0,0,0,0)",
+				"insert into vtiger_blocks values (2,2,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)",
+				"insert into vtiger_blocks values (3,2,'LBL_DESCRIPTION_INFORMATION',3,0,0,0,0,0)",
+				"insert into vtiger_blocks values (4,4,'LBL_CONTACT_INFORMATION',1,0,0,0,0,0)",
+				"insert into vtiger_blocks values (5,4,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)",
+				"insert into vtiger_blocks values (6,4,'LBL_CUSTOMER_PORTAL_INFORMATION',3,0,0,0,0,0)",
+				"insert into vtiger_blocks values (7,4,'LBL_ADDRESS_INFORMATION',4,0,0,0,0,0)",
+				"insert into vtiger_blocks values (8,4,'LBL_DESCRIPTION_INFORMATION',5,0,0,0,0,0)",
+				"insert into vtiger_blocks values (9,6,'LBL_ACCOUNT_INFORMATION',1,0,0,0,0,0)",
+				"insert into vtiger_blocks values (10,6,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)",
+				"insert into vtiger_blocks values (11,6,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)",
+				"insert into vtiger_blocks values (12,6,'LBL_DESCRIPTION_INFORMATION',4,0,0,0,0,0)",
+				"insert into vtiger_blocks values (13,7,'LBL_LEAD_INFORMATION',1,0,0,0,0,0)",
+				"insert into vtiger_blocks values (14,7,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)",
+				"insert into vtiger_blocks values (15,7,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)",
+				"insert into vtiger_blocks values (16,7,'LBL_DESCRIPTION_INFORMATION',4,0,0,0,0,0)",
+				"insert into vtiger_blocks values (17,8,'LBL_NOTE_INFORMATION',1,0,0,0,0,0)",
+				"insert into vtiger_blocks values (18,8,'',2,1,0,0,0,0)",
+				"insert into vtiger_blocks values (19,9,'LBL_TASK_INFORMATION',1,0,0,0,0,0)",
+				"insert into vtiger_blocks values (20,9,'',2,1,0,0,0,0)",
+				"insert into vtiger_blocks values (21,10,'LBL_EMAIL_INFORMATION',1,0,0,0,0,0)",
+				"insert into vtiger_blocks values (22,10,'',2,1,0,0,0,0)",
+				"insert into vtiger_blocks values (23,10,'',3,1,0,0,0,0)",
+				"insert into vtiger_blocks values (24,10,'',4,1,0,0,0,0)",
+				"insert into vtiger_blocks values (25,13,'LBL_TICKET_INFORMATION',1,0,0,0,0,0)",
+				"insert into vtiger_blocks values (26,13,'',2,1,0,0,0,0)",
+				"insert into vtiger_blocks values (27,13,'LBL_CUSTOM_INFORMATION',3,0,0,0,0,0)",
+				"insert into vtiger_blocks values (28,13,'LBL_DESCRIPTION_INFORMATION',4,0,0,0,0,0)",
+				"insert into vtiger_blocks values (29,13,'LBL_TICKET_RESOLUTION',5,0,0,1,0,0)",
+				"insert into vtiger_blocks values (30,13,'LBL_COMMENTS',6,0,0,1,0,0)",
+				"insert into vtiger_blocks values (31,14,'LBL_PRODUCT_INFORMATION',1,0,0,0,0,0)",
+				"insert into vtiger_blocks values (32,14,'LBL_PRICING_INFORMATION',2,0,0,0,0,0)",
+				"insert into vtiger_blocks values (33,14,'LBL_STOCK_INFORMATION',3,0,0,0,0,0)",
+				"insert into vtiger_blocks values (34,14,'LBL_CUSTOM_INFORMATION',4,0,0,0,0,0)",
+				"insert into vtiger_blocks values (35,14,'LBL_IMAGE_INFORMATION',5,0,0,0,0,0)",
+				"insert into vtiger_blocks values (36,14,'LBL_DESCRIPTION_INFORMATION',6,0,0,0,0,0)",
+				"insert into vtiger_blocks values (37,15,'LBL_FAQ_INFORMATION',1,0,0,0,0,0)",
+				"insert into vtiger_blocks values (38,15,'',2,1,0,0,0,0)",
+				"insert into vtiger_blocks values (39,15,'',3,1,0,0,0,0)",
+				"insert into vtiger_blocks values (40,15,'LBL_COMMENT_INFORMATION',4,0,0,1,0,0)",
+				"insert into vtiger_blocks values (41,16,'LBL_EVENT_INFORMATION',1,0,0,0,0,0)",
+				"insert into vtiger_blocks values (42,16,'',2,1,0,0,0,0)",
+				"insert into vtiger_blocks values (43,16,'',3,1,0,0,0,0)",
+				"insert into vtiger_blocks values (44,18,'LBL_VENDOR_INFORMATION',1,0,0,0,0,0)",
+				"insert into vtiger_blocks values (45,18,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)",
+				"insert into vtiger_blocks values (46,18,'LBL_VENDOR_ADDRESS_INFORMATION',3,0,0,0,0,0)",
+				"insert into vtiger_blocks values (47,18,'LBL_DESCRIPTION_INFORMATION',4,0,0,0,0,0)",
+				"insert into vtiger_blocks values (48,19,'LBL_PRICEBOOK_INFORMATION',1,0,0,0,0,0)",
+				"insert into vtiger_blocks values (49,19,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)",
+				"insert into vtiger_blocks values (50,19,'LBL_DESCRIPTION_INFORMATION',3,0,0,0,0,0)",
+				"insert into vtiger_blocks values (51,20,'LBL_QUOTE_INFORMATION',1,0,0,0,0,0)",
+				"insert into vtiger_blocks values (52,20,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)",
+				"insert into vtiger_blocks values (53,20,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)",
+				"insert into vtiger_blocks values (54,20,'LBL_RELATED_PRODUCTS',4,0,0,0,0,0)",
+				"insert into vtiger_blocks values (55,20,'LBL_TERMS_INFORMATION',5,0,0,0,0,0)",
+				"insert into vtiger_blocks values (56,20,'LBL_DESCRIPTION_INFORMATION',6,0,0,0,0,0)",
+				"insert into vtiger_blocks values (57,21,'LBL_PO_INFORMATION',1,0,0,0,0,0)",
+				"insert into vtiger_blocks values (58,21,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)",
+				"insert into vtiger_blocks values (59,21,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)",
+				"insert into vtiger_blocks values (60,21,'LBL_RELATED_PRODUCTS',4,0,0,0,0,0)",
+				"insert into vtiger_blocks values (61,21,'LBL_TERMS_INFORMATION',5,0,0,0,0,0)",
+				"insert into vtiger_blocks values (62,21,'LBL_DESCRIPTION_INFORMATION',6,0,0,0,0,0)",
+				"insert into vtiger_blocks values (63,22,'LBL_SO_INFORMATION',1,0,0,0,0,0)",
+				"insert into vtiger_blocks values (64,22,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)",
+				"insert into vtiger_blocks values (65,22,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)",
+				"insert into vtiger_blocks values (66,22,'LBL_RELATED_PRODUCTS',4,0,0,0,0,0)",
+				"insert into vtiger_blocks values (67,22,'LBL_TERMS_INFORMATION',5,0,0,0,0,0)",
+				"insert into vtiger_blocks values (68,22,'LBL_DESCRIPTION_INFORMATION',6,0,0,0,0,0)",
+				"insert into vtiger_blocks values (69,23,'LBL_INVOICE_INFORMATION',1,0,0,0,0,0)",
+				"insert into vtiger_blocks values (70,23,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)",
+				"insert into vtiger_blocks values (71,23,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)",
+				"insert into vtiger_blocks values (72,23,'LBL_RELATED_PRODUCTS',4,0,0,0,0,0)",
+				"insert into vtiger_blocks values (73,23,'LBL_TERMS_INFORMATION',5,0,0,0,0,0)",
+				"insert into vtiger_blocks values (74,23,'LBL_DESCRIPTION_INFORMATION',6,0,0,0,0,0)"
 			    );
 foreach($insert_query_array5 as $query)
 {
@@ -1148,117 +1148,117 @@
 }
 
 $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"
+				"update vtiger_tab set name='Vendors', vtiger_tablabel='Vendors' where vtiger_tabid=18",
+				"update vtiger_tab set name='PriceBooks', vtiger_tablabel='PriceBooks' where vtiger_tabid=19",
+				"update vtiger_tab set presence=0 where vtiger_tabid in(18,19)",
+				"update vtiger_relatedlists set label='PriceBooks' where vtiger_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')";
+$delete_query1 = "delete from vtiger_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 vtiger_customview values(".$conn->getUniqueID('customview').",'All',1,0,'Leads')",
+			"insert into vtiger_customview values(".$conn->getUniqueID('customview').",'All',1,0,'Accounts')",
+			"insert into vtiger_customview values(".$conn->getUniqueID('customview').",'All',1,0,'Contacts')",
+			"insert into vtiger_customview values(".$conn->getUniqueID('customview').",'All',1,0,'Potentials')",
+			"insert into vtiger_customview values(".$conn->getUniqueID('customview').",'All',1,0,'HelpDesk')",
+			"insert into vtiger_customview values(".$conn->getUniqueID('customview').",'All',1,0,'Quotes')",
+			"insert into vtiger_customview values(".$conn->getUniqueID('customview').",'All',1,0,'Activities')",
+			"insert into vtiger_customview values(".$conn->getUniqueID('customview').",'All',1,0,'Emails')",
+			"insert into vtiger_customview values(".$conn->getUniqueID('customview').",'All',1,0,'Invoice')",
+			"insert into vtiger_customview values(".$conn->getUniqueID('customview').",'All',1,0,'Notes')",
+			"insert into vtiger_customview values(".$conn->getUniqueID('customview').",'All',1,0,'PriceBooks')",
+			"insert into vtiger_customview values(".$conn->getUniqueID('customview').",'All',1,0,'Products')",
+			"insert into vtiger_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')"
+			"insert into vtiger_customview values(".$conn->getUniqueID('customview').",'All',1,0,'SalesOrder')",
+			"insert into vtiger_customview values(".$conn->getUniqueID('customview').",'All',1,0,'Vendors')",
+			"insert into vtiger_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'");
+$res=$conn->query("select cvid from vtiger_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')"
+			"insert into vtiger_cvcolumnlist values ($cvid,0,'leaddetails:lastname:lastname:Leads_Last_Name:V')",
+			"insert into vtiger_cvcolumnlist values ($cvid,1,'leaddetails:firstname:firstname:Leads_First_Name:V')",
+			"insert into vtiger_cvcolumnlist values ($cvid,2,'leaddetails:company:company:Leads_Company:V')",
+			"insert into vtiger_cvcolumnlist values ($cvid,3,'leadaddress:phone:phone:Leads_Phone:V')",
+			"insert into vtiger_cvcolumnlist values ($cvid,4,'leadsubdetails:website:website:Leads_Website:V')",
+			"insert into vtiger_cvcolumnlist values ($cvid,5,'leaddetails:email:email:Leads_Email:V')",
+			"insert into vtiger_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'");
+$res=$conn->query("select cvid from vtiger_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:bill_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')"
+		"insert into vtiger_cvcolumnlist values ($cvid,0,'account:accountname:accountname:Accounts_Account_Name:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,1,'accountbillads:city:bill_city:Accounts_City:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,2,'account:website:website:Accounts_Website:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,3,'account:phone:phone:Accounts_Phone:V')",
+		"insert into vtiger_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'");
+$res=$conn->query("select cvid from vtiger_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')"
+		"insert into vtiger_cvcolumnlist values ($cvid,0,'contactdetails:firstname:firstname:Contacts_First_Name:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,1,'contactdetails:lastname:lastname:Contacts_Last_Name:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,2,'contactdetails:title:title:Contacts_Title:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,3,'account:accountname:accountname:Contacts_Account_Name:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,4,'contactdetails:email:email:Contacts_Email:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,5,'contactdetails:phone:phone:Contacts_Phone_Name:V')",
+		"insert into vtiger_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'");
+$res=$conn->query("select cvid from vtiger_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')"
+	"insert into vtiger_cvcolumnlist values ($cvid,0,'potential:potentialname:potentialname:Potentials_Potential_Name:V')",
+	"insert into vtiger_cvcolumnlist values ($cvid,1,'potential:accountid:account_id:Potentials_Account_Name:V')",
+	"insert into vtiger_cvcolumnlist values ($cvid,2,'potential:amount:amount:Potentials_Amount:N')",
+	"insert into vtiger_cvcolumnlist values ($cvid,3,'potential:closingdate:closingdate:Potentials_Expected_Close_Date:D')",
+	"insert into vtiger_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'");
+$res=$conn->query("select cvid from vtiger_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')"
+		"insert into vtiger_cvcolumnlist values ($cvid,0,'crmentity:crmid::HelpDesk_Ticket_ID:I')",
+		"insert into vtiger_cvcolumnlist values ($cvid,1,'troubletickets:title:ticket_title:HelpDesk_Title:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,2,'troubletickets:parent_id:parent_id:HelpDesk_Related_to:I')",
+		"insert into vtiger_cvcolumnlist values ($cvid,3,'troubletickets:status:ticketstatus:HelpDesk_Status:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,4,'troubletickets:priority:ticketpriorities:HelpDesk_Priority:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,5,'crmentity:smownerid:assigned_user_id:HelpDesk_Assigned_To:V')"
 			     );
 foreach($insert_query_array11 as $query)
 {
@@ -1266,35 +1266,35 @@
 }
 
 
-$res=$conn->query("select cvid from customview where viewname='All' and entitytype='Quotes'");
+$res=$conn->query("select cvid from vtiger_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')"
+		"insert into vtiger_cvcolumnlist values ($cvid,0,'crmentity:crmid::Quotes_Quote_ID:I')",
+		"insert into vtiger_cvcolumnlist values ($cvid,1,'quotes:subject:subject:Quotes_Subject:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,2,'quotes:quotestage:quotestage:Quotes_Quote_Stage:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,3,'quotes:potentialid:potential_id:Quotes_Potential_Name:I')",
+		"insert into vtiger_cvcolumnlist values ($cvid,4,'quotes:accountid:account_id:Quotes_Account_Name:I')",
+		"insert into vtiger_cvcolumnlist values ($cvid,5,'quotes:total:hdnGrandTotal:Quotes_Total:I')",
+		"insert into vtiger_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'");
+$res=$conn->query("select cvid from vtiger_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:taskstatus: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:crmid:parent_id: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')"
+		"insert into vtiger_cvcolumnlist values ($cvid,0,'activity:status:taskstatus:Activities_Status:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,1,'activity:activitytype:activitytype:Activities_Type:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,2,'activity:subject:subject:Activities_Subject:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,3,'contactdetails:lastname:lastname:Activities_Contact_Name:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,4,'seactivityrel:crmid:parent_id:Activities_Related_To:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,5,'activity:date_start:date_start:Activities_Start_Date:D')",
+		"insert into vtiger_cvcolumnlist values ($cvid,6,'activity:due_date:due_date:Activities_End_Date:D')",
+		"insert into vtiger_cvcolumnlist values ($cvid,7,'crmentity:smownerid:assigned_user_id:Activities_Assigned_To:V')"
 			     );
 foreach($insert_query_array13 as $query)
 {
@@ -1302,30 +1302,30 @@
 }
 
 
-$res=$conn->query("select cvid from customview where viewname='All' and entitytype='Emails'");
+$res=$conn->query("select cvid from vtiger_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:crmid:parent_id: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')"
+		"insert into vtiger_cvcolumnlist values ($cvid,0,'activity:subject:subject:Emails_Subject:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,1,'seactivityrel:crmid:parent_id:Emails_Related_To:I')",
+		"insert into vtiger_cvcolumnlist values ($cvid,2,'activity:date_start:date_start:Emails_Date_Sent:D')",
+		"insert into vtiger_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'");
+$res=$conn->query("select cvid from vtiger_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')"
+		"insert into vtiger_cvcolumnlist values ($cvid,0,'crmentity:crmid::Invoice_Invoice_Id:I')",
+		"insert into vtiger_cvcolumnlist values ($cvid,1,'invoice:subject:subject:Invoice_Subject:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,2,'invoice:salesorderid:salesorder_id:Invoice_Sales_Order:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,3,'invoice:invoicestatus:invoicestatus:Invoice_Status:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,4,'invoice:total:hdnGrandTotal:Invoice_Total:I')",
+		"insert into vtiger_cvcolumnlist values ($cvid,5,'crmentity:smownerid:assigned_user_id:Invoice_Assigned_To:V')"
 			     );
 foreach($insert_query_array15 as $query)
 {
@@ -1333,27 +1333,27 @@
 }
 
 	     
-$res=$conn->query("select cvid from customview where viewname='All' and entitytype='Notes'");
+$res=$conn->query("select cvid from vtiger_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')"
+		"insert into vtiger_cvcolumnlist values ($cvid,0,'notes:title:title:Notes_Title:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,1,'notes:contact_id:contact_id:Notes_Contact_Name:I')",
+		"insert into vtiger_cvcolumnlist values ($cvid,2,'senotesrel:crmid:crmid:Notes_Related_To:I')",
+		"insert into vtiger_cvcolumnlist values ($cvid,3,'notes:filename:filename:Notes_File:V')",
+		"insert into vtiger_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'");
+$res=$conn->query("select cvid from vtiger_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')"
+		"insert into vtiger_cvcolumnlist values ($cvid,1,'pricebook:bookname:bookname:PriceBooks_Price_Book_Name:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,2,'pricebook:active:active:PriceBooks_Active:V')"
 			     );
 foreach($insert_query_array17 as $query)
 {
@@ -1361,76 +1361,76 @@
 }
 
 
-$res=$conn->query("select cvid from customview where viewname='All' and entitytype='Products'");
+$res=$conn->query("select cvid from vtiger_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')"
+	"insert into vtiger_cvcolumnlist values ($cvid,0,'products:productname:productname:Products_Product_Name:V')",
+	"insert into vtiger_cvcolumnlist values ($cvid,1,'products:productcode:productcode:Products_Product_Code:V')",
+	"insert into vtiger_cvcolumnlist values ($cvid,2,'products:commissionrate:commissionrate:Products_Commission_Rate:V')",
+	"insert into vtiger_cvcolumnlist values ($cvid,3,'products:qty_per_unit:qty_per_unit:Products_Qty/Unit:V')",
+	"insert into vtiger_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'");
+$res=$conn->query("select cvid from vtiger_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')"
+	"insert into vtiger_cvcolumnlist values($cvid,0,'crmentity:crmid::PurchaseOrder_Order_Id:I')",
+	"insert into vtiger_cvcolumnlist values($cvid,1,'purchaseorder:subject:subject:PurchaseOrder_Subject:V')",
+	"insert into vtiger_cvcolumnlist values($cvid,2,'purchaseorder:vendorid:vendor_id:PurchaseOrder_Vendor_Name:I')",
+	"insert into vtiger_cvcolumnlist values($cvid,3,'purchaseorder:tracking_no:tracking_no:PurchaseOrder_Tracking_Number:V')",
+	"insert into vtiger_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'");
+$res=$conn->query("select cvid from vtiger_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')"
+		"insert into vtiger_cvcolumnlist values ($cvid,0,'crmentity:crmid::SalesOrder_Order_Id:I')",
+		"insert into vtiger_cvcolumnlist values ($cvid,1,'salesorder:subject:subject:SalesOrder_Subject:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,2,'account:accountid:account_id:SalesOrder_Account_Name:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,3,'quotes:quoteid:quote_id:SalesOrder_Quote_Name:I')",
+		"insert into vtiger_cvcolumnlist values ($cvid,4,'salesorder:total:hdnGrandTotal:SalesOrder_Total:V')",
+		"insert into vtiger_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'");
+$res=$conn->query("select cvid from vtiger_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')"
+			"insert into vtiger_cvcolumnlist values ($cvid,0,'vendor:vendorname:vendorname:Vendors_Vendor_Name:V')",
+			"insert into vtiger_cvcolumnlist values ($cvid,1,'vendor:phone:phone:Vendors_Phone:V')",
+			"insert into vtiger_cvcolumnlist values ($cvid,2,'vendor:email:email:Vendors_Email:V')",
+			"insert into vtiger_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'");
+$res=$conn->query("select cvid from vtiger_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')"
+		"insert into vtiger_cvcolumnlist values ($cvid,0,'faq:id::Faq_FAQ_Id:I')",
+		"insert into vtiger_cvcolumnlist values ($cvid,1,'faq:question:question:Faq_Question:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,2,'faq:category:faqcategories:Faq_Category:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,3,'faq:product_id:product_id:Faq_Product_Name:I')",
+		"insert into vtiger_cvcolumnlist values ($cvid,4,'crmentity:createdtime:createdtime:Faq_Created_Time:D')",
+		"insert into vtiger_cvcolumnlist values ($cvid,5,'crmentity:modifiedtime:modifiedtime:Faq_Modified_Time:D')"
 			     );
 foreach($insert_query_array22 as $query)
 {
@@ -1439,35 +1439,35 @@
 
 
 $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'"
+				"update vtiger_field set uitype=53 where vtiger_tabid=2 and columnname='smownerid'",
+				"update vtiger_field set uitype=53 where vtiger_tabid=4 and columnname='smownerid'",
+				"update vtiger_field set uitype=53 where vtiger_tabid=20 and columnname='smownerid'",
+				"update vtiger_field set uitype=53 where vtiger_tabid=22 and columnname='smownerid'",
+				"update vtiger_field set uitype=53 where vtiger_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`))";
+$create_query6 = "CREATE TABLE vtiger_accountgrouprelation ( vtiger_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"
+				"alter vtiger_table vtiger_accountgrouprelation ADD CONSTRAINT fk_accountgrouprelation FOREIGN KEY (accountid) REFERENCES vtiger_account(accountid) ON DELETE CASCADE",
+				"alter vtiger_table vtiger_accountgrouprelation ADD CONSTRAINT fk_accountgrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_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`))";
+$create_query7 = "CREATE TABLE vtiger_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"
+				"alter vtiger_table vtiger_contactgrouprelation ADD CONSTRAINT fk_contactgrouprelation FOREIGN KEY (contactid) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE",
+				"alter vtiger_table vtiger_contactgrouprelation ADD CONSTRAINT fk_contactgrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_groups(name) ON DELETE CASCADE"
 			   );
 foreach($alter_query_array9 as $query)
 {
@@ -1475,81 +1475,81 @@
 }
 
 
-$create_query10 = "CREATE TABLE potentialgrouprelation ( potentialid int(19) NOT NULL default '0', groupname varchar(100) default NULL, PRIMARY KEY  (`potentialid`))";
+$create_query10 = "CREATE TABLE vtiger_potentialgrouprelation ( vtiger_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"
+				"alter vtiger_table vtiger_potentialgrouprelation ADD CONSTRAINT fk_potentialgrouprelation FOREIGN KEY (potentialid) REFERENCES vtiger_potential(potentialid) ON DELETE CASCADE",
+				"alter vtiger_table vtiger_potentialgrouprelation ADD CONSTRAINT fk_potentialgrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_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`) )";
+$create_query11 = "CREATE TABLE vtiger_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"
+				"alter vtiger_table vtiger_quotegrouprelation ADD CONSTRAINT fk_quotegrouprelation FOREIGN KEY (quoteid) REFERENCES vtiger_quotes(quoteid) ON DELETE CASCADE",
+				"alter vtiger_table vtiger_quotegrouprelation ADD CONSTRAINT fk_quotegrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_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`) )";
+$create_query12 = "CREATE TABLE vtiger_sogrouprelation ( vtiger_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"
+				"alter vtiger_table vtiger_sogrouprelation ADD CONSTRAINT fk_sogrouprelation FOREIGN KEY (salesorderid) REFERENCES vtiger_salesorder(salesorderid) ON DELETE CASCADE",
+				"alter vtiger_table vtiger_sogrouprelation ADD CONSTRAINT fk_sogrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_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`))";
+$create_query13 = "CREATE TABLE vtiger_invoicegrouprelation ( vtiger_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"
+				"alter vtiger_table vtiger_invoicegrouprelation ADD CONSTRAINT fk_invoicegrouprelation FOREIGN KEY (invoiceid) REFERENCES vtiger_invoice(invoiceid) ON DELETE CASCADE",
+				"alter vtiger_table vtiger_invoicegrouprelation ADD CONSTRAINT fk_invoicegrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_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`))";
+$create_query14 = "CREATE TABLE vtiger_pogrouprelation ( vtiger_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"
+				"alter vtiger_table vtiger_pogrouprelation ADD CONSTRAINT fk_pogrouprelation FOREIGN KEY (purchaseorderid) REFERENCES vtiger_purchaseorder(purchaseorderid) ON DELETE CASCADE",
+				"alter vtiger_table vtiger_pogrouprelation ADD CONSTRAINT fk_productgrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_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";
+$alter_query1 = "ALTER TABLE vtiger_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'";
+$update_query1 = "update vtiger_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";
+$alter_query2 = "ALTER TABLE vtiger_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)";
+$alter_query3 = "alter vtiger_table vtiger_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)"
+				"alter vtiger_table vtiger_users add column imagename varchar(250)",
+				"alter vtiger_table vtiger_users add column tagcloud varchar(250)"
 			    );
 foreach($alter_query_array15 as $query)
 {
@@ -1557,8 +1557,8 @@
 }
 
 $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"
+			"alter vtiger_table vtiger_systems change column server server varchar(80) default NULL",
+			"alter vtiger_table vtiger_systems change column server_username server_username varchar(80) default NULL"
 			    );
 foreach($alter_query_array16 as $query)
 {
@@ -1566,71 +1566,71 @@
 }
 
 
-$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))";
+$create_query15 = "create vtiger_table vtiger_portal(portalid int(19), vtiger_portalname varchar(255) NOT NULL, vtiger_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"
+				"alter vtiger_table vtiger_attachments drop column vtiger_attachmentsize",
+				"alter vtiger_table vtiger_attachments drop column attachmentcontents"
 			    );
 foreach($alter_query_array as $query)
 {
 	Execute($query);
 }
 
-$alter_query = "ALTER TABLE field ADD column info_type varchar(20) default NULL after quickcreatesequence";
+$alter_query = "ALTER TABLE vtiger_field ADD column info_type varchar(20) default NULL after quickcreatesequence";
 Execute($alter_query);
 
-//$update_query2 = "UPDATE field SET fieldlabel = 'Reference' WHERE tabid = 4 and tablename = 'contactdetails' and fieldname='reference'";
-//changed in 24-04-06 because the reference has not been entered into the field table. 
-$update_query2 = "insert into field values (4,".$conn->getUniqueID("field").",'reference','contactdetails',1,'56','reference','Reference',1,0,0,10,23,4,1,'C~O',1,null,'ADV')";
+//$update_query2 = "UPDATE vtiger_field SET vtiger_fieldlabel = 'Reference' WHERE vtiger_tabid = 4 and vtiger_tablename = 'contactdetails' and vtiger_fieldname='reference'";
+//changed in 24-04-06 because the reference has not been entered into the vtiger_field vtiger_table. 
+$update_query2 = "insert into vtiger_field values (4,".$conn->getUniqueID("field").",'reference','contactdetails',1,'56','reference','Reference',1,0,0,10,23,4,1,'C~O',1,null,'ADV')";
 Execute($update_query2);
 
 $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'"
+				"UPDATE vtiger_field SET info_type = 'BAS'",
+
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 7 and vtiger_fieldlabel = 'Website'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 7 and vtiger_fieldlabel = 'Industry'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 7 and vtiger_fieldlabel = 'Annual Revenue'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 7 and vtiger_fieldlabel = 'No Of Employees'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 7 and vtiger_fieldlabel = 'Yahoo Id'",
+
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 6 and vtiger_fieldlabel = 'Ticker Symbol'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 6 and vtiger_fieldlabel = 'Other Phone'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 6 and vtiger_fieldlabel = 'Member Of'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 6 and vtiger_fieldlabel = 'Employees'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 6 and vtiger_fieldlabel = 'Other Email'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 6 and vtiger_fieldlabel = 'Ownership'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 6 and vtiger_fieldlabel = 'Rating'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 6 and vtiger_fieldlabel = 'industry'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 6 and vtiger_fieldlabel = 'SIC Code'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 6 and vtiger_fieldlabel = 'Type'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 6 and vtiger_fieldlabel = 'Annual Revenue'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 6 and vtiger_fieldlabel = 'Email Opt Out'",
+
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'Home Phone'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'Department'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'Birthdate'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'Email'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'Reports To'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'Assistant'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'Yahoo Id'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'Assistant Phone'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'Do Not Call'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'Email Opt Out'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'Reference'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'Portal User'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'Support Start Date'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'Support End Date'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'Contact Image'",
+
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 14 and vtiger_fieldlabel = 'Usage Unit'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 14 and vtiger_fieldlabel = 'Qty/Unit'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 14 and vtiger_fieldlabel = 'Qty In Stock'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 14 and vtiger_fieldlabel = 'Reorder Level'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 14 and vtiger_fieldlabel = 'Handler'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 14 and vtiger_fieldlabel = 'Qty In Demand'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 14 and vtiger_fieldlabel = 'Product Image'"
 			    );
 foreach($update_query_array4 as $query)
 {
@@ -1661,35 +1661,35 @@
 	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";
+$create_query20 = "CREATE TABLE vtiger_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`)
+$create_query21 = "CREATE TABLE vtiger_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";
+$alter_query4 = "alter vtiger_table vtiger_profile add column description text";
 Execute($alter_query4);
 
-$alter_query5 = "alter table contactdetails add column imagename varchar(250) after currency";
+$alter_query5 = "alter vtiger_table vtiger_contactdetails add column imagename varchar(250) after vtiger_currency";
 Execute($alter_query5);
 
-$alter_query = "ALTER TABLE contactdetails ADD column reference varchar(3) default NULL after imagename";
+$alter_query = "ALTER TABLE vtiger_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')"
+				"insert into vtiger_blocks values(75,4,'LBL_IMAGE_INFORMATION',5,0,0,0,0,0)",
+				"insert into vtiger_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 vtiger_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 vtiger_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";
+$alter_query6 = "alter vtiger_table vtiger_activity add column vtiger_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";
@@ -1699,42 +1699,42 @@
 $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)";
+$insert_query6 = "INSERT INTO vtiger_tab VALUES(26,'Campaigns',0,23,'Campaigns',null,null,1)";
 Execute($insert_query6);
-$insert_query7 = "INSERT INTO parenttabrel VALUES(2,26,1)";
+$insert_query7 = "INSERT INTO vtiger_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)";
+$insert_query8 = "insert into vtiger_blocks values(76,26,'LBL_CAMPAIGN_INFORMATION',1,0,0,0,0,0)";
 Execute($insert_query8);
-$insert_query8 = "insert into blocks values (77,26,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)";
+$insert_query8 = "insert into vtiger_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)";
+$insert_query9 = "insert into vtiger_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").",'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')"
+	"insert into vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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)
 {
@@ -1742,8 +1742,8 @@
 }
 
 $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)"
+	"insert into vtiger_relatedlists values (".$conn->getUniqueID('relatedlists').",".getTabid("Campaigns").",".getTabid("Contacts").",'get_contacts',1,'Contacts',0)",
+	"insert into vtiger_relatedlists values (".$conn->getUniqueID('relatedlists').",".getTabid("Campaigns").",".getTabid("Leads").",'get_leads',2,'Leads',0)"
 			     );
 foreach($insert_query_array25 as $query)
 {
@@ -1752,8 +1752,8 @@
 
 
 $insert_query_array26 = Array(
-	"insert into field values (7,".$conn->getUniqueID("field").",'campaignid','leaddetails',1,'51','campaignid','Campaign Name',1,0,0,100,6,13,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')"
+	"insert into vtiger_field values (7,".$conn->getUniqueID("field").",'campaignid','leaddetails',1,'51','campaignid','Campaign Name',1,0,0,100,6,13,3,'I~O',1,null,'BAS')",
+	"insert into vtiger_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)
 {
@@ -1858,11 +1858,11 @@
 Execute($create_table_query1);
 
 $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"
+				"alter vtiger_table vtiger_leaddetails add column vtiger_campaignid int(19) default NULL after leadid",
+				"alter vtiger_table vtiger_contactdetails add column  vtiger_campaignid int(19) default NULL after vtiger_accountid",
+				//"alter vtiger_table vtiger_notes drop PRIMARY KEY contact_id",
+				"alter vtiger_table vtiger_notes drop PRIMARY KEY , add primary key(notesid)",
+				"update vtiger_field set uitype=99 where vtiger_fieldname='update_log' and vtiger_tabid=13"
 			    );
 foreach($alter_query_array18 as $query)
 {
@@ -1871,8 +1871,8 @@
 
 
 
-//echo "<br><br><b>Database Modifications for Indexing and some missded tables starts here.....</b><br>";
-//Added queries which are for indexing and the missing tables - Mickie - on 06-04-2006
+//echo "<br><br><b>Database Modifications for Indexing and some missded vtiger_tables starts here.....</b><br>";
+//Added queries which are for indexing and the missing vtiger_tables - Mickie - on 06-04-2006
 
 $query_array = Array(
 
@@ -2605,7 +2605,7 @@
 "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` DROP INDEX vtiger_quotestage",
 "ALTER TABLE `quotes` ADD INDEX `quotestage` (`quoteid`)",
 "ALTER TABLE `quotes` ADD KEY `potentialid2` (`potentialid`)",
 "ALTER TABLE `quotes` ADD KEY `contactid` (`contactid`)",
@@ -2662,20 +2662,20 @@
 $conn->println("Database Modifications after 5.0(Alpha 5) starts here.");
 
 
-//Added on 22-04-06 - to add the Notify Owner field in Contacts and Accounts
+//Added on 22-04-06 - to add the Notify Owner vtiger_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'",
+	"update vtiger_field set sequence=26 where vtiger_tabid=4 and vtiger_fieldname='modifiedtime'",
+	"update vtiger_field set sequence=25 where vtiger_tabid=4 and vtiger_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 vtiger_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 vtiger_table vtiger_contactdetails add column notify_owner varchar(3) default 0 after reference",
+
+	"update vtiger_field set sequence=21 where vtiger_tabid=6 and vtiger_fieldname='modifiedtime'",
+	"update vtiger_field set sequence=20 where vtiger_tabid=6 and vtiger_fieldname='createdtime'",
+	"update vtiger_field set sequence=19 where vtiger_tabid=6 and vtiger_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"
+	"insert into vtiger_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 vtiger_table vtiger_account add column notify_owner varchar(3) default 0 after emailoptout"
 			   );
 foreach($notify_owner_array as $query)
 {
@@ -2683,17 +2683,17 @@
 }
 
 //Added for RSS entries
-$rss_insert_query = "insert into field values (24,".$conn->getUniqueID("field").",'rsscategory','rss',1,'15','rsscategory','rsscategory',1,0,0,255,13,null,1,'V~O',1,null,'BAS')";
+$rss_insert_query = "insert into vtiger_field values (24,".$conn->getUniqueID("field").",'rsscategory','rss',1,'15','rsscategory','rsscategory',1,0,0,255,13,null,1,'V~O',1,null,'BAS')";
 Execute($rss_insert_query);
 
 //Quick Create Feature added for Vendor & PriceBook
 $quickcreate_query = Array(
-	"UPDATE field SET quickcreate = 0,quickcreatesequence = 1 WHERE tabid = 18 and fieldname = 'vendorname'",
-	"UPDATE field SET quickcreate = 0,quickcreatesequence = 2 WHERE tabid = 18 and fieldname = 'phone'",
-	"UPDATE field SET quickcreate = 0,quickcreatesequence = 3 WHERE tabid = 18 and fieldname = 'email'",
-
-	"UPDATE field SET quickcreate = 0,quickcreatesequence = 1 WHERE tabid = 19 and fieldname = 'bookname'",
-	"UPDATE field SET quickcreate = 0,quickcreatesequence = 2 WHERE tabid = 19 and fieldname = 'active'"
+	"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 1 WHERE vtiger_tabid = 18 and vtiger_fieldname = 'vendorname'",
+	"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 2 WHERE vtiger_tabid = 18 and vtiger_fieldname = 'phone'",
+	"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 3 WHERE vtiger_tabid = 18 and vtiger_fieldname = 'email'",
+
+	"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 1 WHERE vtiger_tabid = 19 and vtiger_fieldname = 'bookname'",
+	"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 2 WHERE vtiger_tabid = 19 and vtiger_fieldname = 'active'"
 			  );
 foreach($quickcreate_query as $query)
 {
@@ -2701,24 +2701,24 @@
 }
 
 
-//Added on 24-04-06 to populate customview All for Campaign and webmails modules
+//Added on 24-04-06 to populate vtiger_customview All for Campaign and webmails modules
 $cvid1 = $conn->getUniqueID("customview");
 $cvid2 = $conn->getUniqueID("customview");
 $customview_query_array = Array(
-	"insert into customview(cvid,viewname,setdefault,setmetrics,entitytype) values(".$cvid1.",'All',1,0,'Campaigns')",
-	"insert into cvcolumnlist (cvid,columnindex,columnname) values (".$cvid1.",0,'campaign:campaignname:campaignname:Campaigns_Campaign_Name:V')",
-	"insert into cvcolumnlist (cvid,columnindex,columnname) values (".$cvid1.",1,'campaign:campaigntype:campaigntype:Campaigns_Campaign_Type:N')",
-	"insert into cvcolumnlist (cvid,columnindex,columnname) values (".$cvid1.",2,'campaign:campaignstatus:campaignstatus:Campaigns_Campaign_Status:N')",
-	"insert into cvcolumnlist (cvid,columnindex,columnname) values (".$cvid1.",3,'campaign:expectedrevenue:expectedrevenue:Campaigns_Expected_Revenue:V')",
-	"insert into cvcolumnlist (cvid,columnindex,columnname) values (".$cvid1.",4,'campaign:closingdate:closingdate:Campaigns_Expected_Close_Date:D')",
-	"insert into cvcolumnlist (cvid,columnindex,columnname) values (".$cvid1.",5,'crmentity:smownerid:assigned_user_id:Campaigns_Assigned_To:V')",
-
-
-	"insert into customview(cvid,viewname,setdefault,setmetrics,entitytype) values(".$cvid2.",'All',1,0,'Webmails')",
-	"insert into cvcolumnlist (cvid,columnindex,columnname) values (".$cvid2.",0,'subject:subject:subject:Subject:V')",
-	"insert into cvcolumnlist (cvid,columnindex,columnname) values (".$cvid2.",1,'from:fromname:fromname:From:N')",
-	"insert into cvcolumnlist (cvid,columnindex,columnname) values (".$cvid2.",2,'to:tpname:toname:To:N')",
-	"insert into cvcolumnlist (cvid,columnindex,columnname) values (".$cvid2.",3,'body:body:body:Body:V')"
+	"insert into vtiger_customview(cvid,viewname,setdefault,setmetrics,entitytype) values(".$cvid1.",'All',1,0,'Campaigns')",
+	"insert into vtiger_cvcolumnlist (cvid,columnindex,columnname) values (".$cvid1.",0,'campaign:campaignname:campaignname:Campaigns_Campaign_Name:V')",
+	"insert into vtiger_cvcolumnlist (cvid,columnindex,columnname) values (".$cvid1.",1,'campaign:campaigntype:campaigntype:Campaigns_Campaign_Type:N')",
+	"insert into vtiger_cvcolumnlist (cvid,columnindex,columnname) values (".$cvid1.",2,'campaign:campaignstatus:campaignstatus:Campaigns_Campaign_Status:N')",
+	"insert into vtiger_cvcolumnlist (cvid,columnindex,columnname) values (".$cvid1.",3,'campaign:expectedrevenue:expectedrevenue:Campaigns_Expected_Revenue:V')",
+	"insert into vtiger_cvcolumnlist (cvid,columnindex,columnname) values (".$cvid1.",4,'campaign:closingdate:closingdate:Campaigns_Expected_Close_Date:D')",
+	"insert into vtiger_cvcolumnlist (cvid,columnindex,columnname) values (".$cvid1.",5,'crmentity:smownerid:assigned_user_id:Campaigns_Assigned_To:V')",
+
+
+	"insert into vtiger_customview(cvid,viewname,setdefault,setmetrics,entitytype) values(".$cvid2.",'All',1,0,'Webmails')",
+	"insert into vtiger_cvcolumnlist (cvid,columnindex,columnname) values (".$cvid2.",0,'subject:subject:subject:Subject:V')",
+	"insert into vtiger_cvcolumnlist (cvid,columnindex,columnname) values (".$cvid2.",1,'from:fromname:fromname:From:N')",
+	"insert into vtiger_cvcolumnlist (cvid,columnindex,columnname) values (".$cvid2.",2,'to:tpname:toname:To:N')",
+	"insert into vtiger_cvcolumnlist (cvid,columnindex,columnname) values (".$cvid2.",3,'body:body:body:Body:V')"
 
 			       );
 foreach($customview_query_array as $query)
@@ -2728,25 +2728,25 @@
 
 
 $query_array2 = Array(
-				"INSERT INTO parenttabrel VALUES(2,4,2)",
-				"INSERT INTO parenttabrel VALUES(2,6,3)",
-				"update cvcolumnlist set columnname ='crmentity:smownerid:assigned_user_id:Emails_Sender:V' where cvid=20 and columnindex=3",
-				"update field set sequence = 2 where columnname='filename' and tablename = 'attachments'",
-				"delete from cvcolumnlist where columnname = 'seactivityrel:crmid:parent_id:Emails_Related_To:I'",
-				"update cvcolumnlist set columnindex = 1 where cvid=3 and columnindex=3",
-				"update field set info_type='ADV' where tabid=18 and columnname in ('street','pobox','city','state','postalcode','country','description')",
-				"update field set info_type='ADV' where tabid in (20,21,22,23) and columnname in ('description','terms_conditions')",
-
-				"create table inventorytaxinfo (taxid int(3) NOT NULL auto_increment, taxname varchar(50) default NULL, percentage decimal(7,3) default NULL,  PRIMARY KEY  (taxid), KEY inventorytaxinfo_taxname_idx (taxname))",
-				"create table producttaxrel ( productid int(11) NOT NULL, taxid int(3) NOT NULL, taxpercentage decimal(7,3) default NULL, KEY producttaxrel_productid_idx (productid), KEY producttaxrel_taxid_idx (taxid))",
-
-				"insert into inventorytaxinfo values(".$conn->getUniqueID("inventorytaxinfo").",'VAT','4.5')",
-				"insert into inventorytaxinfo values(".$conn->getUniqueID("inventorytaxinfo").",'Sales','10')",
-				"insert into inventorytaxinfo values(".$conn->getUniqueID("inventorytaxinfo").",'Service','12.5')",
-				"update field set uitype=83, tablename='producttaxrel' where tabid=14 and fieldname='taxclass'",
-				"insert into moduleowners values(".$this->localGetTabID('Campaigns').",1)",
-
-				"alter table attachments add column path varchar(255) default NULL"
+				"INSERT INTO vtiger_parenttabrel VALUES(2,4,2)",
+				"INSERT INTO vtiger_parenttabrel VALUES(2,6,3)",
+				"update vtiger_cvcolumnlist set columnname ='crmentity:smownerid:assigned_user_id:Emails_Sender:V' where cvid=20 and columnindex=3",
+				"update vtiger_field set sequence = 2 where columnname='filename' and vtiger_tablename = 'attachments'",
+				"delete from vtiger_cvcolumnlist where columnname = 'seactivityrel:crmid:parent_id:Emails_Related_To:I'",
+				"update vtiger_cvcolumnlist set columnindex = 1 where cvid=3 and columnindex=3",
+				"update vtiger_field set info_type='ADV' where vtiger_tabid=18 and columnname in ('street','pobox','city','state','postalcode','country','description')",
+				"update vtiger_field set info_type='ADV' where vtiger_tabid in (20,21,22,23) and columnname in ('description','terms_conditions')",
+
+				"create vtiger_table vtiger_inventorytaxinfo (taxid int(3) NOT NULL auto_increment, taxname varchar(50) default NULL, percentage decimal(7,3) default NULL,  PRIMARY KEY  (taxid), KEY vtiger_inventorytaxinfo_taxname_idx (taxname))",
+				"create vtiger_table vtiger_producttaxrel ( productid int(11) NOT NULL, taxid int(3) NOT NULL, taxpercentage decimal(7,3) default NULL, KEY vtiger_producttaxrel_productid_idx (productid), KEY vtiger_producttaxrel_taxid_idx (taxid))",
+
+				"insert into vtiger_inventorytaxinfo values(".$conn->getUniqueID("inventorytaxinfo").",'VAT','4.5')",
+				"insert into vtiger_inventorytaxinfo values(".$conn->getUniqueID("inventorytaxinfo").",'Sales','10')",
+				"insert into vtiger_inventorytaxinfo values(".$conn->getUniqueID("inventorytaxinfo").",'Service','12.5')",
+				"update vtiger_field set uitype=83, vtiger_tablename='producttaxrel' where vtiger_tabid=14 and vtiger_fieldname='taxclass'",
+				"insert into vtiger_moduleowners values(".$this->localGetTabID('Campaigns').",1)",
+
+				"alter vtiger_table vtiger_attachments add column path varchar(255) default NULL"
 			     );
 
 foreach($query_array2 as $query)
@@ -2779,30 +2779,30 @@
 
 }
 
-$update_query3 = "update currency_info set conversion_rate=1, currency_status='Active', defaultid='-11' where id=1";
+$update_query3 = "update vtiger_currency_info set conversion_rate=1, vtiger_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'";
+$update_query4 = "update vtiger_relatedlists set label='Purchase Order' where vtiger_tabid=18 and name='get_purchase_orders'";
 Execute($update_query4);
 
 
 
 //Added on 27-05-06
 
-$create_query27 = "CREATE TABLE invitees (activityid int(19) NOT NULL, inviteeid int(19) NOT NULL, PRIMARY KEY (activityid,inviteeid))";
+$create_query27 = "CREATE TABLE vtiger_invitees (activityid int(19) NOT NULL, inviteeid int(19) NOT NULL, PRIMARY KEY (activityid,inviteeid))";
 Execute($create_query27);
 
 $alter_query_array17 = Array(
-				"ALTER TABLE users ADD column hour_format varchar(30) default 'am/pm' AFTER date_format",
-				"ALTER TABLE users ADD column start_hour varchar(30) default '10:00' AFTER hour_format",
-				"ALTER TABLE users ADD column end_hour varchar(30) default '23:00' AFTER start_hour"
+				"ALTER TABLE vtiger_users ADD column hour_format varchar(30) default 'am/pm' AFTER date_format",
+				"ALTER TABLE vtiger_users ADD column start_hour varchar(30) default '10:00' AFTER hour_format",
+				"ALTER TABLE vtiger_users ADD column end_hour varchar(30) default '23:00' AFTER start_hour"
 			    );
 foreach($alter_query_array17 as $query)
 {
 	Execute($query);
 }
 
-$create_query28 = "CREATE TABLE emaildetails (
+$create_query28 = "CREATE TABLE vtiger_emaildetails (
 			emailid int(19) NOT NULL,
 			from_email varchar(50) NOT NULL default '',
 			to_email text,
@@ -2817,12 +2817,12 @@
 
 
 $obj_array = Array('Leads'=>'leaddetails','Contacts'=>'contactdetails');
-$leadfieldid = $conn->query_result($conn->query("select fieldid from field where tabid=7 and fieldname='email'"),0,'fieldid');
-$contactfieldid = $conn->query_result($conn->query("select fieldid from field where tabid=4 and fieldname='email'"),0,'fieldid');
+$leadfieldid = $conn->query_result($conn->query("select vtiger_fieldid from vtiger_field where vtiger_tabid=7 and vtiger_fieldname='email'"),0,'fieldid');
+$contactfieldid = $conn->query_result($conn->query("select vtiger_fieldid from vtiger_field where vtiger_tabid=4 and vtiger_fieldname='email'"),0,'fieldid');
 $fieldid_array = Array("Leads"=>"$leadfieldid","Contacts"=>"$contactfieldid");
 $idname_array = Array("Leads"=>"leadid","Contacts"=>"contactid");
 
-$query = 'select * from seactivityrel where activityid in (select activityid from activity where activitytype="Emails")';
+$query = 'select * from vtiger_seactivityrel where vtiger_activityid in (select vtiger_activityid from vtiger_activity where vtiger_activitytype="Emails")';
 $result = $conn->query($query);
 $numofrows = $conn->num_rows($result);
 
@@ -2833,7 +2833,7 @@
 	$parentid = $conn->query_result($result,$i,'crmid');
 	$emailid = $conn->query_result($result,$i,'activityid');
 
-	$query = 'select setype from crmentity where crmid='.$parentid;
+	$query = 'select setype from vtiger_crmentity where crmid='.$parentid;
 	$result1 = $conn->query($query);
 	$module = $conn->query_result($result1,0,'setype');
 
@@ -2844,8 +2844,8 @@
 		$result2 = $conn->query("select lastname, firstname, email from $obj_array[$module] where $idname_array[$module] = $parentid");
 		$toemail = $conn->query_result($result2,0,'lastname').' '.$conn->query_result($result2,0,'firstname').'<'.$conn->query_result($result2,0,'email').'>###';
 
-		//insert this idlists and toemail values in emaildetails table
-		$sql = "insert into emaildetails values ($emailid,'',\"$toemail\",'','','',\"$idlists\",'SAVE')";
+		//insert this idlists and toemail values in vtiger_emaildetails vtiger_table
+		$sql = "insert into vtiger_emaildetails values ($emailid,'',\"$toemail\",'','','',\"$idlists\",'SAVE')";
 		Execute($sql);
 	}
 	else
@@ -2854,25 +2854,25 @@
 	}
 }
 
-$update_query5 = "update field set quickcreate=1, quickcreatesequence=NULL where tabid in (10,14)";
+$update_query5 = "update vtiger_field set quickcreate=1, quickcreatesequence=NULL where vtiger_tabid in (10,14)";
 Execute($update_query5);
 
 $alter_query_array18 = Array(
-				"alter table soproductrel add column vattax decimal(7,3) default NULL",
-				"alter table soproductrel add column salestax decimal(7,3) default NULL",
-				"alter table soproductrel add column servicetax decimal(7,3) default NULL",
+				"alter vtiger_table vtiger_soproductrel add column vattax decimal(7,3) default NULL",
+				"alter vtiger_table vtiger_soproductrel add column salestax decimal(7,3) default NULL",
+				"alter vtiger_table vtiger_soproductrel add column servicetax decimal(7,3) default NULL",
 				
-				"alter table poproductrel add column vattax decimal(7,3) default NULL",
-				"alter table poproductrel add column salestax decimal(7,3) default NULL",
-				"alter table poproductrel add column servicetax decimal(7,3) default NULL",
+				"alter vtiger_table vtiger_poproductrel add column vattax decimal(7,3) default NULL",
+				"alter vtiger_table vtiger_poproductrel add column salestax decimal(7,3) default NULL",
+				"alter vtiger_table vtiger_poproductrel add column servicetax decimal(7,3) default NULL",
 				
-				"alter table quotesproductrel add column vattax decimal(7,3) default NULL",
-				"alter table quotesproductrel add column salestax decimal(7,3) default NULL",
-				"alter table quotesproductrel add column servicetax decimal(7,3) default NULL",
+				"alter vtiger_table vtiger_quotesproductrel add column vattax decimal(7,3) default NULL",
+				"alter vtiger_table vtiger_quotesproductrel add column salestax decimal(7,3) default NULL",
+				"alter vtiger_table vtiger_quotesproductrel add column servicetax decimal(7,3) default NULL",
 				
-				"alter table invoiceproductrel add column vattax decimal(7,3) default NULL",
-				"alter table invoiceproductrel add column salestax decimal(7,3) default NULL",
-				"alter table invoiceproductrel add column servicetax decimal(7,3) default NULL",
+				"alter vtiger_table vtiger_invoiceproductrel add column vattax decimal(7,3) default NULL",
+				"alter vtiger_table vtiger_invoiceproductrel add column salestax decimal(7,3) default NULL",
+				"alter vtiger_table vtiger_invoiceproductrel add column servicetax decimal(7,3) default NULL",
 			    );
 foreach($alter_query_array18 as $query)
 {
@@ -2881,91 +2881,91 @@
 
 
 
-//Security profile and tab table handling by DON starts
-$sql_sec="select profileid from  profile";
+//Security vtiger_profile and vtiger_tab vtiger_table handling by DON starts
+$sql_sec="select vtiger_profileid from  vtiger_profile";
 $result_sec=$conn->query($sql_sec);
 $num_rows=$conn->num_rows($result_sec);
 for($i=0;$i<$num_row;$i++)
 {
 	$prof_id=$conn->query_result($result_sec,$i,'profileid');
-	$sql1_sec="insert into profile2utility values(".$prof_id.",13,8,0)";
+	$sql1_sec="insert into vtiger_profile2utility values(".$prof_id.",13,8,0)";
 	Execute($sql1_sec);
 
-	$sql2_sec="insert into profile2utility values(".$prof_id.",7,9,0)";
+	$sql2_sec="insert into vtiger_profile2utility values(".$prof_id.",7,9,0)";
 	Execute($sql2_sec);
 
-	$sql3_sec="insert into profile2tab values(".$prof_id.",26,0)";
+	$sql3_sec="insert into vtiger_profile2tab values(".$prof_id.",26,0)";
 	Execute($sql3_sec);
 
-	$sql4_sec="insert into profile2tab values(".$prof_id.",27,0)";
+	$sql4_sec="insert into vtiger_profile2tab values(".$prof_id.",27,0)";
 	Execute($sql4_sec);
 
-	$sql7_sec="insert into profile2standardpermissions values(".$prof_id.",26,0,0)";
+	$sql7_sec="insert into vtiger_profile2standardpermissions values(".$prof_id.",26,0,0)";
 	Execute($sql7_sec);
 
-	$sql8_sec="insert into profile2standardpermissions values(".$prof_id.",26,1,0)";
+	$sql8_sec="insert into vtiger_profile2standardpermissions values(".$prof_id.",26,1,0)";
 	Execute($sql8_sec);
 
-	$sql9_sec="insert into profile2standardpermissions values(".$prof_id.",26,2,0)";
+	$sql9_sec="insert into vtiger_profile2standardpermissions values(".$prof_id.",26,2,0)";
 	Execute($sql9_sec);
 
-	$sql10_sec="insert into profile2standardpermissions values(".$prof_id.",26,3,0)";
+	$sql10_sec="insert into vtiger_profile2standardpermissions values(".$prof_id.",26,3,0)";
 	Execute($sql10_sec);
 
-	$sql11_sec="insert into profile2standardpermissions values(".$prof_id.",26,4,0)";
+	$sql11_sec="insert into vtiger_profile2standardpermissions values(".$prof_id.",26,4,0)";
 	Execute($sql11_sec);	
 
 }
 
-//Inserting into tab tables
-$sec2="INSERT INTO tab VALUES (27,'Portal',0,24,'Portal',null,null,1)";
-$sec3="INSERT INTO tab VALUES (28,'Webmails',0,25,'Webmails',null,null,1)";
-
-//Insert into def_org_share tables
-$sec4="insert into def_org_share values (".$conn->getUniqueID('def_org_share').",26,2,0)";	
+//Inserting into vtiger_tab vtiger_tables
+$sec2="INSERT INTO vtiger_tab VALUES (27,'Portal',0,24,'Portal',null,null,1)";
+$sec3="INSERT INTO vtiger_tab VALUES (28,'Webmails',0,25,'Webmails',null,null,1)";
+
+//Insert into vtiger_def_org_share vtiger_tables
+$sec4="insert into vtiger_def_org_share values (".$conn->getUniqueID('def_org_share').",26,2,0)";	
 
 Execute($sec2);
 Execute($sec3);
 Execute($sec4);
 
-//Inserting into datashare related modules table
-
-Execute("insert into datashare_relatedmodules_seq values(1)");
+//Inserting into datashare related modules vtiger_table
+
+Execute("insert into vtiger_datashare_relatedmodules_seq values(1)");
 	
 //Lead Related Module
-Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",7,10)");
+Execute("insert into vtiger_datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",7,10)");
 
 //Account Related Module
-Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",6,2)");
-Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",6,13)");
-Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",6,20)");
-Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",6,22)");
-Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",6,23)");
-Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",6,10)");
+Execute("insert into vtiger_datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",6,2)");
+Execute("insert into vtiger_datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",6,13)");
+Execute("insert into vtiger_datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",6,20)");
+Execute("insert into vtiger_datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",6,22)");
+Execute("insert into vtiger_datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",6,23)");
+Execute("insert into vtiger_datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",6,10)");
 
 
 //Potential Related Module
-Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",2,20)");
-Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",2,22)");
+Execute("insert into vtiger_datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",2,20)");
+Execute("insert into vtiger_datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",2,22)");
 
 //Quote Related Module
-Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",20,22)");
+Execute("insert into vtiger_datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",20,22)");
 
 //SO Related Module
-Execute("insert into datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",22,23)");
+Execute("insert into vtiger_datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",22,23)");
 	
 
 //By Don Ends
 
-//Added the tabel mail_accounts which has been added by mmbrich
-$alter_query18 = "alter table mail_accounts add column int_mailer int(1) default '0'";
+//Added the vtiger_tabel vtiger_mail_accounts which has been added by mmbrich
+$alter_query18 = "alter vtiger_table vtiger_mail_accounts add column int_mailer int(1) default '0'";
 Execute($alter_query18);
 
 $update_query_array5 = Array(
-	"update field set info_type='BAS' where tabid=6 and fieldname in ('tickersymbol','account_id')",
-	"update relatedlists set label = 'Activity History' where tabid in (4,6,7,20,21,22,23) and label = 'History'",
-	"update relatedlists set label = 'Products' where tabid=2 and name='get_products' and label='History'",
-	"update relatedlists set label = 'Activity History' where tabid=2 and name='get_history' and label='History'"
+	"update vtiger_field set info_type='BAS' where vtiger_tabid=6 and vtiger_fieldname in ('tickersymbol','account_id')",
+	"update vtiger_relatedlists set label = 'Activity History' where vtiger_tabid in (4,6,7,20,21,22,23) and label = 'History'",
+	"update vtiger_relatedlists set label = 'Products' where vtiger_tabid=2 and name='get_products' and label='History'",
+	"update vtiger_relatedlists set label = 'Activity History' where vtiger_tabid=2 and name='get_history' and label='History'"
 			    );
 foreach($update_query_array5 as $query)
 {
@@ -2973,9 +2973,9 @@
 }
 
 $insert_query_array27 = Array(
-	"insert into relatedlists values(".$conn->getUniqueID('relatedlists').",13,0,'get_ticket_history',3,'Ticket History',0)",
-	"insert into parenttabrel values (2,10,4)",
-	"insert into parenttabrel values (4,10,7)"
+	"insert into vtiger_relatedlists values(".$conn->getUniqueID('relatedlists').",13,0,'get_ticket_history',3,'Ticket History',0)",
+	"insert into vtiger_parenttabrel values (2,10,4)",
+	"insert into vtiger_parenttabrel values (4,10,7)"
 			     );
 foreach($insert_query_array27 as $query)
 {
@@ -2996,14 +2996,14 @@
 		alert("Currency Changes has been made Successfully");
 	}
 
-	if(!confirm("Are you using Dollar $ as Currency? \n Click OK to remain as $, Cancel to change the currency conversion rate."))
+	if(!confirm("Are you using Dollar $ as Currency? \n Click OK to remain as $, Cancel to change the vtiger_currency conversion rate."))
 	{
 		getConversionRate('');
 	}
 
 	function getConversionRate(err)
 	{
-		var crate = prompt(err+"\nPlease enter the conversion rate of your currency");
+		var crate = prompt(err+"\nPlease enter the conversion rate of your vtiger_currency");
 
 		if(crate != 0 && crate > 0)
 		{
@@ -3051,21 +3051,21 @@
 	}
 }
 
-//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
+//Added on 23-12-2005 which is used to populate the vtiger_profile2field and vtiger_def_org_field vtiger_table entries for the vtiger_field per vtiger_tab
+//if we enter a vtiger_field in vtiger_field vtiger_table then we must populate that vtiger_field in these vtiger_table for security access
 function populateFieldForSecurity($tabid,$fieldid)
 {
 	global $conn;
 
-	$profileresult = $conn->query("select * from profile");
+	$profileresult = $conn->query("select * from vtiger_profile");
 	$countprofiles = $conn->num_rows($profileresult);
 	for ($i=0;$i<$countprofiles;$i++)
 	{
         	$profileid = $conn->query_result($profileresult,$i,'profileid');
-	        $sqlProf2FieldInsert[$i] = 'insert into profile2field values ('.$profileid.','.$tabid.','.$fieldid.',0,1)';
+	        $sqlProf2FieldInsert[$i] = 'insert into vtiger_profile2field values ('.$profileid.','.$tabid.','.$fieldid.',0,1)';
         	Execute($sqlProf2FieldInsert[$i]);
 	}
-	$def_query = "insert into def_org_field values (".$tabid.",".$fieldid.",0,1)";
+	$def_query = "insert into vtiger_def_org_field values (".$tabid.",".$fieldid.",0,1)";
 	Execute($def_query);
 }
 

Modified: vtigercrm/trunk/modules/Migration/ModifyDatabase/MigrationInfo.php
==============================================================================
--- vtigercrm/trunk/modules/Migration/ModifyDatabase/MigrationInfo.php (original)
+++ vtigercrm/trunk/modules/Migration/ModifyDatabase/MigrationInfo.php Mon Jun 12 14:26:25 2006
@@ -191,7 +191,7 @@
 						<b style="color:#006600">Migration Queries Log</b>
 						<div id="successLog" style="border:1px solid #666666;width:90%;position:relative;height:250px;overflow:auto;left:5%;top:10px;">
 							<!-- we should place the All queries executed-->
-							<!-- This table is designed to display all the queries (before this table a div tag is opened. so all these following queries will be put inside the div tab as a table format) -->
+							<!-- This vtiger_table is designed to display all the queries (before this vtiger_table a div tag is opened. so all these following queries will be put inside the div vtiger_tab as a vtiger_table format) -->
 							<style>
 								.MigInfo{
 									border-collapse:collapse;
@@ -238,7 +238,7 @@
 
 						<br /><br />
 
-						<!-- This table is to show the total, success and failed queries -->
+						<!-- This vtiger_table is to show the total, success and failed queries -->
 						<table width="35%" border="0" cellpadding="5" cellspacing="0" align="center" class="small">
 						   <tr>
 							<td width="75%" align="right" nowrap>

Modified: vtigercrm/trunk/modules/Migration/updateCurrency.php
==============================================================================
--- vtigercrm/trunk/modules/Migration/updateCurrency.php (original)
+++ vtigercrm/trunk/modules/Migration/updateCurrency.php Mon Jun 12 14:26:25 2006
@@ -20,10 +20,10 @@
 	$crate = $_REQUEST['crate'];
 	$conn->println('conversion rate = '.$crate);
 	
-	$query = "update currency_info set conversion_rate='".$_REQUEST['crate']."' where id=1";
+	$query = "update vtiger_currency_info set conversion_rate='".$_REQUEST['crate']."' where id=1";
 	$result = $conn->query($query);
 
-	//array should be id || fieldname => tablename
+	//array should be id || vtiger_fieldname => vtiger_tablename
 	$modules_array = Array(
 				"accountid||annualrevenue"	=>	"account",
 				

Modified: vtigercrm/trunk/modules/Notes/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/Notes/EditView.php (original)
+++ vtigercrm/trunk/modules/Notes/EditView.php Mon Jun 12 14:26:25 2006
@@ -170,7 +170,7 @@
 }
 
 if (isset($focus->parent_type) && $focus->parent_type != "") {
-        $change_parent_button = "<input title='".$app_strings['LBL_CHANGE_BUTTON_TITLE']."' accessKey='".$app_strings['LBL_CHANGE_BUTTON_KEY']."' tabindex='3' type='button' class='button' value='".$app_strings['LBL_CHANGE_BUTTON_LABEL']."' name='button' LANGUAGE=javascript onclick='return window.open(\"index.php?module=\"+ document.EditView.parent_type.value + \"&action=Popup&html=Popup_picker&form=TasksEditView\",\"test\",\"width=600,height=400,resizable=1,scrollbars=1\");'>";
+        $change_parent_button = "<input title='".$app_strings['LBL_CHANGE_BUTTON_TITLE']."' accessKey='".$app_strings['LBL_CHANGE_BUTTON_KEY']."' vtiger_tabindex='3' type='button' class='button' value='".$app_strings['LBL_CHANGE_BUTTON_LABEL']."' name='button' LANGUAGE=javascript onclick='return window.open(\"index.php?module=\"+ document.EditView.parent_type.value + \"&action=Popup&html=Popup_picker&form=TasksEditView\",\"test\",\"width=600,height=400,resizable=1,scrollbars=1\");'>";
         $smarty->assign("CHANGE_PARENT_BUTTON", $change_parent_button);
 }
 if ($focus->parent_type == "Account") $smarty->assign("DEFAULT_SEARCH", "&query=true&account_id=$focus->parent_id&account_name=".urlencode($focus->parent_name));

Modified: vtigercrm/trunk/modules/Notes/Forms.php
==============================================================================
--- vtigercrm/trunk/modules/Notes/Forms.php (original)
+++ vtigercrm/trunk/modules/Notes/Forms.php Mon Jun 12 14:26:25 2006
@@ -64,7 +64,7 @@
 }
 
 /**
- * Create HTML form to enter a new record with the minimum necessary fields.
+ * Create HTML form to enter a new record with the minimum necessary vtiger_fields.
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
  * All Rights Reserved.
  * Contributor(s): ______________________________________..
@@ -86,7 +86,7 @@
 
 $qcreate_form = get_left_form_header($mod_strings['LBL_NEW_FORM_TITLE']);
 
-$qcreate_get_field="select * from field where tabid=8 and quickcreate=0 order by quickcreatesequence";
+$qcreate_get_field="select * from vtiger_field where vtiger_tabid=8 and quickcreate=0 order by quickcreatesequence";
 $qcreate_get_result=$adb->query($qcreate_get_field);
 $qcreate_get_noofrows=$adb->num_rows($qcreate_get_result);
 $fieldName_array = Array();//for validation 
@@ -167,9 +167,9 @@
 $qcreate_form.='</form>';
 $qcreate_form.='<script type="text/javascript">
 		
-	var fieldname = new Array('.$fieldName.')
-	var fieldlabel = new Array('.$fieldLabel.')
-	var fielddatatype = new Array('.$fldDataType.')
+	var vtiger_fieldname = new Array('.$fieldName.')
+	var vtiger_fieldlabel = new Array('.$fieldLabel.')
+	var vtiger_fielddatatype = new Array('.$fldDataType.')
 
 		</script>';
 

Modified: vtigercrm/trunk/modules/Notes/Note.php
==============================================================================
--- vtigercrm/trunk/modules/Notes/Note.php (original)
+++ vtigercrm/trunk/modules/Notes/Note.php Mon Jun 12 14:26:25 2006
@@ -32,7 +32,7 @@
 	var $log;
 	var $db;
 
-	// Stored fields
+	// Stored vtiger_fields
 	var $id;
         var $mode;
 
@@ -49,11 +49,11 @@
 	var $contact_phone;
 	var $contact_email;
 	var $required_fields =  array("name"=>1);
-	var $default_note_name_dom = array('Meeting notes', 'Reminder');
+	var $default_note_name_dom = array('Meeting vtiger_notes', 'Reminder');
 
 	var $table_name = "notes";
-	var $tab_name = Array('crmentity','notes','senotesrel','attachments');
-	var $tab_name_index = Array('crmentity'=>'crmid','notes'=>'notesid','senotesrel'=>'notesid','attachments'=>'attachmentsid');
+	var $tab_name = Array('vtiger_crmentity','vtiger_notes','vtiger_senotesrel','vtiger_attachments');
+	var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_notes'=>'notesid','vtiger_senotesrel'=>'notesid','vtiger_attachments'=>'attachmentsid');
 
   	var $module_id = "notesid";
 	var $object_name = "Note";
@@ -62,10 +62,10 @@
 
         var $sortby_fields = Array('title','modifiedtime');		  
 
-	// This is used to retrieve related fields from form posts.
+	// This is used to retrieve related vtiger_fields from form posts.
 	var $additional_column_fields = Array('', '', '', '');
 
-	// This is the list of fields that are in the lists.
+	// This is the list of vtiger_fields that are in the lists.
 	var $list_fields = Array(
 				'Subject'=>Array('notes'=>'title'),
 				'Contact Name'=>Array('notes'=>'contact_id'),
@@ -101,11 +101,11 @@
 		global $log;
 		$log->debug("Entering create_export_query(".$order_by.",". $where.") method ...");
              $query = "SELECT
-                                        notes.*,
-                                        contactdetails.firstname,
-                                        contactdetails.lastname
-                                        FROM notes
-                                        LEFT JOIN contactdetails ON notes.contact_id=contactdetails.contactid inner join crmentity on crmentity.crmid=notes.notesid and crmentity.deleted=0 ";
+                                        vtiger_notes.*,
+                                        vtiger_contactdetails.firstname,
+                                        vtiger_contactdetails.lastname
+                                        FROM vtiger_notes
+                                        LEFT JOIN vtiger_contactdetails ON vtiger_notes.contact_id=vtiger_contactdetails.contactid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_notes.notesid and vtiger_crmentity.deleted=0 ";
 		$log->debug("Exiting create_export_query method ...");
                 return $query;
         }

Modified: vtigercrm/trunk/modules/Notes/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Notes/Save.php (original)
+++ vtigercrm/trunk/modules/Notes/Save.php Mon Jun 12 14:26:25 2006
@@ -40,16 +40,16 @@
 
 if (!isset($_REQUEST['date_due_flag'])) $focus->date_due_flag = 'off';
 
-//Added for retrieve the old existing attachments when duplicated without new attachment
+//Added for retrieve the old existing vtiger_attachments when duplicated without new attachment
 if($_FILES['filename']['name'] == '' && $_REQUEST['mode'] != 'edit' && $_REQUEST['old_id'] != '')
 {
-        $sql = "select attachments.attachmentsid from attachments inner join seattachmentsrel on seattachmentsrel.attachmentsid=attachments.attachmentsid where seattachmentsrel.crmid= ".$_REQUEST['old_id'];
+        $sql = "select vtiger_attachments.attachmentsid from vtiger_attachments inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid=vtiger_attachments.attachmentsid where vtiger_seattachmentsrel.crmid= ".$_REQUEST['old_id'];
         $result = $adb->query($sql);
         if($adb->num_rows($result) != 0)
                 $attachmentid = $adb->query_result($result,0,'attachmentsid');
 	        if($attachmentid != '')
 	        {
-	                $attachquery = "select * from attachments where attachmentsid = ".$attachmentid;
+	                $attachquery = "select * from vtiger_attachments where vtiger_attachmentsid = ".$attachmentid;
 	                $result = $adb->query($attachquery);
 	                $filename = $adb->query_result($result,0,'name');
 	                $filetype = $adb->query_result($result,0,'type');
@@ -58,8 +58,8 @@
 	                $_FILES['filename']['name'] = $filename;
 	                $_FILES['filename']['type'] = $filetype;
 
-			//we should read the file and calculate the size, without setting filesize, attachment will not save
-	                $filesize = filesize($filepath.$filename);
+			//we should read the file and calculate the size, without setting vtiger_filesize, attachment will not save
+	                $filesize = vtiger_filesize($filepath.$filename);
 	                $_FILES['filename']['size'] = $filesize;
 	        }
 }
@@ -85,7 +85,7 @@
 		$crmid = $_REQUEST['ticket_id'];
 	if($crmid != $_REQUEST['parent_id'])
 	{
-		$sql = "insert into senotesrel (notesid, crmid) values('".$focus->id."','".$crmid."')";
+		$sql = "insert into vtiger_senotesrel (notesid, crmid) values('".$focus->id."','".$crmid."')";
 		$adb->query($sql);
 	}
 }

Modified: vtigercrm/trunk/modules/Notes/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Notes/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Notes/language/en_us.lang.php Mon Jun 12 14:26:25 2006
@@ -42,7 +42,7 @@
 'LBL_EMAIL_ADDRESS'=>'Email Address:',
 'LBL_COLON'=>':',
 
-'ERR_DELETE_RECORD'=>"A record number must be specified to delete the account.",
+'ERR_DELETE_RECORD'=>"A record number must be specified to delete the vtiger_account.",
 'LBL_LIST_FILENAME'=>"File",
 
 // Added for Note(3.2-patch 3) 

Modified: vtigercrm/trunk/modules/Portal/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Portal/ListView.php (original)
+++ vtigercrm/trunk/modules/Portal/ListView.php Mon Jun 12 14:26:25 2006
@@ -21,7 +21,7 @@
 $current_module_strings = return_module_language($current_language, 'Portal');
 global $adb;
 	
-$query="select * from portal";
+$query="select * from vtiger_portal";
 $result=$adb->query($query);
 $no_of_portals=$adb->num_rows($result);
 $portal_info=array();

Modified: vtigercrm/trunk/modules/Portal/Popup.php
==============================================================================
--- vtigercrm/trunk/modules/Portal/Popup.php (original)
+++ vtigercrm/trunk/modules/Portal/Popup.php Mon Jun 12 14:26:25 2006
@@ -17,7 +17,7 @@
 if(isset($_REQUEST['record']) && $_REQUEST['record'] !='')
 {
 	$portalid = $_REQUEST['record'];
-	$query="select * from portal where portalid =$portalid";
+	$query="select * from vtiger_portal where vtiger_portalid =$portalid";
 	$result=$adb->query($query);
 	$portalname = $adb->query_result($result,0,'portalname');
         $portalurl = $adb->query_result($result,0,'portalurl');		

Modified: vtigercrm/trunk/modules/Portal/Portal.php
==============================================================================
--- vtigercrm/trunk/modules/Portal/Portal.php (original)
+++ vtigercrm/trunk/modules/Portal/Portal.php Mon Jun 12 14:26:25 2006
@@ -15,7 +15,7 @@
 	global $adb;
 	$adb->println("just entered the SavePortal method");
 	$portalid=$adb->getUniqueID('portal');
-	$query="insert into portal values(".$portalid.",'".$portalname."','".$portalurl."',0)";
+	$query="insert into vtiger_portal values(".$portalid.",'".$portalname."','".$portalurl."',0)";
 	$adb->println($query);
 	$result=$adb->query($query);
 	return $portalid;
@@ -25,7 +25,7 @@
 {
 	global $adb;
 	$adb->println("just entered the SavePortal method");
-	$query="update portal set portalname='$portalname' ,portalurl='$portalurl' where portalid=$portalid";
+	$query="update vtiger_portal set portalname='$portalname' ,portalurl='$portalurl' where portalid=$portalid";
 	$adb->println($query);
 	$result=$adb->query($query);
 	return $portalid;

Modified: vtigercrm/trunk/modules/Potentials/Charts.php
==============================================================================
--- vtigercrm/trunk/modules/Potentials/Charts.php (original)
+++ vtigercrm/trunk/modules/Potentials/Charts.php Mon Jun 12 14:26:25 2006
@@ -29,7 +29,7 @@
 
 class jpgraph {
 	/**
-	 * Creates opportunity pipeline image as a horizontal accumlated bar graph for multiple users.
+	 * Creates opportunity pipeline image as a horizontal accumlated bar graph for multiple vtiger_users.
 	 * param $datax- the month data to display in the x-axis
 	 * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc..
 	 * All Rights Reserved..
@@ -345,7 +345,7 @@
 		}
 		else {
 			$imgMap_fp = fopen($cache_file_name.'.map', "rb");
-			$imgMap = fread($imgMap_fp, filesize($cache_file_name.'.map'));
+			$imgMap = fread($imgMap_fp, vtiger_filesize($cache_file_name.'.map'));
 			fclose($imgMap_fp);
 		}
 		$fileModTime = filemtime($cache_file_name.'.map');
@@ -355,11 +355,11 @@
 	}
 
 	/**
-	 * Creates lead_source_by_outcome pipeline image as a horizontal accumlated bar graph for multiple users.
+	 * Creates lead_source_by_outcome pipeline image as a horizontal accumlated bar graph for multiple vtiger_users.
 	 * param $datay- the lead source data to display in the x-axis
 	 * param $date_start- the begin date of opps to find
 	 * param $date_end- the end date of opps to find
-	 * param $ids - list of assigned users of opps to find
+	 * param $ids - list of assigned vtiger_users of opps to find
 	 * param $cache_file_name - file name to write image to
 	 * param $refresh - boolean whether to rebuild image if exists
 	 * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc..
@@ -680,7 +680,7 @@
 		}
 		else {
 			$imgMap_fp = fopen($cache_file_name.'.map', "rb");
-			$imgMap = fread($imgMap_fp, filesize($cache_file_name.'.map'));
+			$imgMap = fread($imgMap_fp, vtiger_filesize($cache_file_name.'.map'));
 			fclose($imgMap_fp);
 		}
 		$fileModTime = filemtime($cache_file_name.'.map');
@@ -690,7 +690,7 @@
 	}
 
 	/**
-	 * Creates opportunity pipeline image as a horizontal accumlated bar graph for multiple users.
+	 * Creates opportunity pipeline image as a horizontal accumlated bar graph for multiple vtiger_users.
 	 * param $datax- the sales stage data to display in the x-axis
 	 * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc..
 	 * All Rights Reserved..
@@ -1001,7 +1001,7 @@
 		}
 		else {
 			$imgMap_fp = fopen($cache_file_name.'.map', "rb");
-			$imgMap = fread($imgMap_fp, filesize($cache_file_name.'.map'));
+			$imgMap = fread($imgMap_fp, vtiger_filesize($cache_file_name.'.map'));
 			fclose($imgMap_fp);
 		}
 		$fileModTime = filemtime($cache_file_name.'.map');
@@ -1103,7 +1103,7 @@
 					}
 					else
 					{
-						// put none in if the field is blank.
+						// put none in if the vtiger_field is blank.
 						array_push($visible_legends, $current_module_strings['NTC_NO_LEGENDS']);
 					}
 					array_push($aTargets, "index.php?module=Potentials&action=ListView&leadsource=".urlencode($lead_source_key)."&query=true&type=dbrd");
@@ -1229,7 +1229,7 @@
 		}
 		else {
 			$imgMap_fp = fopen($cache_file_name.'.map', "rb");
-			$imgMap = fread($imgMap_fp, filesize($cache_file_name.'.map'));
+			$imgMap = fread($imgMap_fp, vtiger_filesize($cache_file_name.'.map'));
 			fclose($imgMap_fp);
 		}
 		$fileModTime = filemtime($cache_file_name.'.map');

Modified: vtigercrm/trunk/modules/Potentials/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/Potentials/EditView.php (original)
+++ vtigercrm/trunk/modules/Potentials/EditView.php Mon Jun 12 14:26:25 2006
@@ -61,7 +61,7 @@
 $category = getParentTab();
 $smarty->assign("CATEGORY",$category);
 
-//needed when creating a new opportunity with a default account value passed in
+//needed when creating a new opportunity with a default vtiger_account value passed in
 if (isset($_REQUEST['accountname']) && is_null($focus->accountname)) {
 	$focus->accountname = $_REQUEST['accountname'];
 	
@@ -104,7 +104,7 @@
 
 
 
-// Unimplemented until jscalendar language files are fixed
+// Unimplemented until jscalendar language vtiger_files are fixed
 $smarty->assign("CALENDAR_LANG", $app_strings['LBL_JSCALENDAR_LANG']);
 $smarty->assign("CALENDAR_DATEFORMAT", parse_calendardate($app_strings['NTC_DATE_FORMAT']));
 

Modified: vtigercrm/trunk/modules/Potentials/Forms.php
==============================================================================
--- vtigercrm/trunk/modules/Potentials/Forms.php (original)
+++ vtigercrm/trunk/modules/Potentials/Forms.php Mon Jun 12 14:26:25 2006
@@ -15,7 +15,7 @@
 /*********************************************************************************
  * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Potentials/Forms.php,v 1.11 2005/04/20 20:25:13 ray Exp $
  * Description:  Contains a variety of utility functions used to display UI
- * components such as form headers and footers.  Intended to be modified on a per
+ * components such as form vtiger_headers and footers.  Intended to be modified on a per
  * theme basis.
  ********************************************************************************/
 
@@ -182,7 +182,7 @@
 }
 
 /**
- * Create HTML form to enter a new record with the minimum necessary fields.
+ * Create HTML form to enter a new record with the minimum necessary vtiger_fields.
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
  * All Rights Reserved.
  * Contributor(s): ______________________________________..
@@ -197,7 +197,7 @@
 global $current_user;
 global $adb;//for dynamic quickcreateform construction
 
-// Unimplemented until jscalendar language files are fixed
+// Unimplemented until jscalendar language vtiger_files are fixed
 // global $current_language;
 // global $default_language;
 // global $cal_codes;
@@ -214,7 +214,7 @@
 $lbl_save_button_key = $app_strings['LBL_SAVE_BUTTON_KEY'];
 $lbl_save_button_label = $app_strings['LBL_SAVE_BUTTON_LABEL'];
 $user_id = $current_user->id;
-// Unimplemented until jscalendar language files are fixed
+// Unimplemented until jscalendar language vtiger_files are fixed
 // $cal_lang = (empty($cal_codes[$current_language])) ? $cal_codes[$default_language] : $cal_codes[$current_language];
 $cal_lang = "en";
 $cal_dateformat = parse_calendardate($app_strings['NTC_DATE_FORMAT']);
@@ -227,7 +227,7 @@
 
 $qcreate_form = get_left_form_header($mod_strings['LBL_NEW_FORM_TITLE']);
 
-$qcreate_get_field="select * from field where tabid=2 and quickcreate=0 order by quickcreatesequence";
+$qcreate_get_field="select * from vtiger_field where vtiger_tabid=2 and quickcreate=0 order by quickcreatesequence";
 $qcreate_get_result=$adb->query($qcreate_get_field);
 $qcreate_get_noofrows=$adb->num_rows($qcreate_get_result);
 
@@ -317,9 +317,9 @@
 		Calendar.setup ({
 			inputField : "QCK_closingdate", ifFormat : "'.$cal_dateformat.'", showsTime : false, button : "jscal_trigger", singleClick : true, step : 1
 		});
-	var fieldname = new Array('.$fieldName.')
-	var fieldlabel = new Array('.$fieldLabel.')
-	var fielddatatype = new Array('.$fldDataType.')
+	var vtiger_fieldname = new Array('.$fieldName.')
+	var vtiger_fieldlabel = new Array('.$fieldLabel.')
+	var vtiger_fielddatatype = new Array('.$fldDataType.')
 
 
 		</script>';

Modified: vtigercrm/trunk/modules/Potentials/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Potentials/ListView.php (original)
+++ vtigercrm/trunk/modules/Potentials/ListView.php Mon Jun 12 14:26:25 2006
@@ -80,7 +80,7 @@
 	$smarty->assign("SEARCH_URL",$url_string);
 				
 	//Added for Custom Field Search
-/*	$sql="select * from field where tablename='potentialscf' order by fieldlabel";
+/*	$sql="select * from vtiger_field where vtiger_tablename='potentialscf' order by vtiger_fieldlabel";
 	$result=$adb->query($sql);
 	for($i=0;$i<$adb->num_rows($result);$i++)
 	{
@@ -92,11 +92,11 @@
 		if(isset($customfield[$i]) && $customfield[$i] != '')
 		{
 			if($uitype[$i] == 56)
-				$str = " potentialscf.".$column[$i]." = 1";
+				$str = " vtiger_potentialscf.".$column[$i]." = 1";
 			elseif($uitype[$i] == 15)//Added to handle the picklist customfield - after 4.2 patch2
-				$str = " potentialscf.".$column[$i]." = '".$customfield[$i]."'";
+				$str = " vtiger_potentialscf.".$column[$i]." = '".$customfield[$i]."'";
 			else
-				$str = " potentialscf.".$column[$i]." like '$customfield[$i]%'";
+				$str = " vtiger_potentialscf.".$column[$i]." like '$customfield[$i]%'";
 			array_push($where_clauses, $str);
 			$url_string .="&".$column[$i]."=".$customfield[$i];
 		}

Modified: vtigercrm/trunk/modules/Potentials/ListViewTop.php
==============================================================================
--- vtigercrm/trunk/modules/Potentials/ListViewTop.php (original)
+++ vtigercrm/trunk/modules/Potentials/ListViewTop.php Mon Jun 12 14:26:25 2006
@@ -38,7 +38,7 @@
 	$title[]='myTopOpenPotentials.gif';
 	$title[]=$current_module_strings['LBL_TOP_OPPORTUNITIES'];
 	$title[]='home_mypot';
-	$where = "AND potential.sales_stage <> '".$app_strings['LBL_CLOSE_WON']."' AND potential.sales_stage <> '".$app_strings['LBL_CLOSE_LOST']."' AND crmentity.smownerid='".$current_user->id."' ORDER BY amount DESC";
+	$where = "AND vtiger_potential.sales_stage <> '".$app_strings['LBL_CLOSE_WON']."' AND vtiger_potential.sales_stage <> '".$app_strings['LBL_CLOSE_LOST']."' AND vtiger_crmentity.smownerid='".$current_user->id."' ORDER BY amount DESC";
 	$header=array();
 	$header[]=$current_module_strings['LBL_LIST_OPPORTUNITY_NAME'];
 	$header[]=$current_module_strings['LBL_LIST_ACCOUNT_NAME'];

Modified: vtigercrm/trunk/modules/Potentials/Opportunity.php
==============================================================================
--- vtigercrm/trunk/modules/Potentials/Opportunity.php (original)
+++ vtigercrm/trunk/modules/Potentials/Opportunity.php Mon Jun 12 14:26:25 2006
@@ -31,7 +31,7 @@
 require_once('modules/Emails/Email.php');
 require_once('include/utils/utils.php');
 
-// potential is used to store customer information.
+// vtiger_potential is used to store customer information.
 class Potential extends CRMEntity {
 	var $log;
 	var $db;
@@ -43,15 +43,15 @@
 	var $module_id = "potentialid";
 	var $object_name = "potential";
 
-	var $tab_name = Array('crmentity','potential','potentialscf');
-	var $tab_name_index = Array('crmentity'=>'crmid','potential'=>'potentialid','potentialscf'=>'potentialid');
+	var $tab_name = Array('vtiger_crmentity','vtiger_potential','vtiger_potentialscf');
+	var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_potential'=>'potentialid','vtiger_potentialscf'=>'potentialid');
 
 	var $column_fields = Array();
 
 	var $sortby_fields = Array('potentialname','amount','closingdate','smownerid');
 
 
-	// This is the list of fields that are in the lists.
+	// This is the list of vtiger_fields that are in the lists.
 	var $list_fields = Array(
 			'Potential'=>Array('potential'=>'potentialname'),
 			'Account Name'=>Array('account'=>'accountname'),	  			
@@ -95,7 +95,7 @@
 	var $default_order_by = 'potentialname';
 	var $default_sort_order = 'ASC';
 
-	function potential() {
+	function Potential() {
 		$this->log = LoggerManager::getLogger('potential');
 		$this->db = new PearDatabase();
 		$this->column_fields = getColumnFields('Potentials');
@@ -107,18 +107,18 @@
 	{
 		global $log;
 		$log->debug("Entering create_list_query(".$order_by.",". $where.") method ...");
-		// Determine if the account name is present in the where clause.
+		// Determine if the vtiger_account name is present in the where clause.
 		$account_required = ereg("accounts\.name", $where);
 
 		if($account_required)
 		{
-			$query = "SELECT potential.potentialid,  potential.potentialname, potential.dateclosed FROM potential, account ";
-			$where_auto = "account.accountid = potential.accountid AND crmentity.deleted=0 ";
+			$query = "SELECT vtiger_potential.potentialid,  vtiger_potential.potentialname, vtiger_potential.dateclosed FROM vtiger_potential, vtiger_account ";
+			$where_auto = "account.accountid = vtiger_potential.accountid AND vtiger_crmentity.deleted=0 ";
 		}
 		else
 		{
-			$query = 'SELECT potentialid, potentialname, smcreatorid, closingdate FROM potential inner join crmentity on crmentity.crmid=potential.potentialid ';
-			$where_auto = 'AND crmentity.deleted=0';
+			$query = 'SELECT potentialid, potentialname, smcreatorid, closingdate FROM vtiger_potential inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_potential.potentialid ';
+			$where_auto = 'AND vtiger_crmentity.deleted=0';
 		}
 
 		if($where != "")
@@ -127,9 +127,9 @@
 			$query .= "where ".$where_auto;
 
 		if($order_by != "")
-			$query .= " ORDER BY potential.$order_by";
+			$query .= " ORDER BY vtiger_potential.$order_by";
 		else
-			$query .= " ORDER BY potential.potentialname";
+			$query .= " ORDER BY vtiger_potential.potentialname";
 
 
 
@@ -146,25 +146,25 @@
 		if($this->checkIfCustomTableExists('potentialscf'))
 		{
 			$query = $this->constructCustomQueryAddendum('potentialscf','Potentials') ."
-				potential.*,
-				account.accountname account_name,
-				users.user_name assigned_user_name
-					FROM potential
-					INNER JOIN crmentity
-					ON crmentity.crmid=potential.potentialid
-					LEFT JOIN account on potential.accountid=account.accountid
-					left join potentialscf on potentialscf.potentialid=potential.potentialid
-					left join users on crmentity.smownerid=users.id where crmentity.deleted=0 ";
+			vtiger_potential.*,
+			vtiger_account.accountname vtiger_account_name,
+			vtiger_users.user_name assigned_user_name
+					FROM vtiger_potential
+					INNER JOIN vtiger_crmentity
+					ON vtiger_crmentity.crmid=vtiger_potential.potentialid
+					LEFT JOIN vtiger_account on vtiger_potential.accountid=vtiger_account.accountid
+					left join vtiger_potentialscf on vtiger_potentialscf.potentialid=vtiger_potential.potentialid
+					left join vtiger_users on vtiger_crmentity.smownerid=vtiger_users.id where vtiger_crmentity.deleted=0 ";
 		}
 		else
 		{
 			$query = "SELECT
-				potential.*,
-				account.accountname account_name,
-				users.user_name assigned_user_name
-					FROM potential inner join crmentity on crmentity.crmid=potential.potentialid                                LEFT JOIN users
-					ON crmentity.smownerid=users.id
-					LEFT JOIN account on potential.accountid=account.accountid  LEFT JOIN potentialscf on potentialscf.potentialid=potential.potentialid where crmentity.deleted=0 ";
+			vtiger_potential.*,
+			vtiger_account.accountname vtiger_account_name,
+			vtiger_users.user_name assigned_user_name
+					FROM vtiger_potential inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_potential.potentialid                                LEFT JOIN vtiger_users
+					ON vtiger_crmentity.smownerid=vtiger_users.id
+					LEFT JOIN vtiger_account on vtiger_potential.accountid=vtiger_account.accountid  LEFT JOIN vtiger_potentialscf on vtiger_potentialscf.potentialid=vtiger_potential.potentialid where vtiger_crmentity.deleted=0 ";
 		}	
 
 		$log->debug("Exiting create_export_query method ...");
@@ -192,11 +192,11 @@
 		if(isPermitted("Contacts",3,"") == 'yes')
 		{
 
-			$button .= '<input title="Change" accessKey="" tabindex="2" type="button" class="button" value="'.$app_strings['LBL_SELECT_CONTACT_BUTTON_LABEL'].'" name="Button" LANGUAGE=javascript onclick=\'return window.open("index.php?module=Contacts&action=Popup&return_module=Potentials&popuptype=detailview&form=EditView&form_submit=false&recordid='.$_REQUEST["record"].'","test","width=600,height=400,resizable=1,scrollbars=1");\'>&nbsp;';
+			$button .= '<input title="Change" accessKey="" vtiger_tabindex="2" type="button" class="button" value="'.$app_strings['LBL_SELECT_CONTACT_BUTTON_LABEL'].'" name="Button" LANGUAGE=javascript onclick=\'return window.open("index.php?module=Contacts&action=Popup&return_module=Potentials&popuptype=detailview&form=EditView&form_submit=false&recordid='.$_REQUEST["record"].'","test","width=600,height=400,resizable=1,scrollbars=1");\'>&nbsp;';
 		}
 		$returnset = '&return_module=Potentials&return_action=DetailView&return_id='.$id;
 
-		$query = 'select contactdetails.accountid, users.user_name,groups.groupname,potential.potentialid, potential.potentialname, contactdetails.contactid, contactdetails.lastname, contactdetails.firstname, contactdetails.title, contactdetails.department, contactdetails.email, contactdetails.phone, crmentity.crmid, crmentity.smownerid, crmentity.modifiedtime from potential inner join contpotentialrel on contpotentialrel.potentialid = potential.potentialid inner join contactdetails on contpotentialrel.contactid = contactdetails.contactid inner join crmentity on crmentity.crmid = 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 potential.potentialid = '.$id.' and crmentity.deleted=0';
+		$query = 'select vtiger_contactdetails.accountid, vtiger_users.user_name,vtiger_groups.groupname,vtiger_potential.potentialid, vtiger_potential.potentialname, vtiger_contactdetails.contactid, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.title, vtiger_contactdetails.department, vtiger_contactdetails.email, vtiger_contactdetails.phone, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_potential inner join vtiger_contpotentialrel on vtiger_contpotentialrel.potentialid = vtiger_potential.potentialid inner join vtiger_contactdetails on vtiger_contpotentialrel.contactid = vtiger_contactdetails.contactid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid left join vtiger_groups on vtiger_groups.groupname=vtiger_contactgrouprelation.groupname left join vtiger_users on vtiger_crmentity.smownerid=vtiger_users.id where vtiger_potential.potentialid = '.$id.' and vtiger_crmentity.deleted=0';
 		
 		$log->debug("Exiting get_contacts method ...");
 		return GetRelatedList('Potentials','Contacts',$focus,$query,$button,$returnset);
@@ -225,7 +225,7 @@
 		}
 		$returnset = '&return_module=Potentials&return_action=DetailView&return_id='.$id;
 
-		$query = "SELECT activity.*,seactivityrel.*,crmentity.crmid, crmentity.smownerid, crmentity.modifiedtime, users.user_name, recurringevents.recurringtype, contactdetails.contactid, contactdetails.lastname, contactdetails.firstname from activity inner join seactivityrel on seactivityrel.activityid=activity.activityid inner join crmentity on crmentity.crmid=activity.activityid inner join potential on potential.potentialid=seactivityrel.crmid 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 left outer join recurringevents on recurringevents.activityid=activity.activityid 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 != 'Held')";
+		$query = "SELECT vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name, vtiger_recurringevents.recurringtype, vtiger_contactdetails.contactid, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid inner join vtiger_potential on vtiger_potential.potentialid=vtiger_seactivityrel.crmid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid= vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid where vtiger_seactivityrel.crmid=".$id." and (activitytype='Task' or vtiger_activitytype='Call' or vtiger_activitytype='Meeting') and vtiger_crmentity.deleted=0 and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Completed') and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Deferred') or (vtiger_activity.eventstatus != '' &&  vtiger_activity.eventstatus != 'Held')";
 		$log->debug("Exiting get_activities method ...");
 		return GetRelatedList('Potentials','Activities',$focus,$query,$button,$returnset);
 
@@ -251,11 +251,11 @@
 		}
 		if(isPermitted("Products",3,"") == 'yes')
 		{
-			$button .= '<input title="Change" accessKey="" tabindex="2" type="button" class="button" value="'.$app_strings['LBL_SELECT_PRODUCT_BUTTON_LABEL'].'" name="Button" LANGUAGE=javascript onclick=\'return window.open("index.php?module=Products&action=Popup&return_module=Potentials&popuptype=detailview&form=EditView&form_submit=false&recordid='.$_REQUEST["record"].'","test","width=600,height=400,resizable=1,scrollbars=1");\'>&nbsp;';
+			$button .= '<input title="Change" accessKey="" vtiger_tabindex="2" type="button" class="button" value="'.$app_strings['LBL_SELECT_PRODUCT_BUTTON_LABEL'].'" name="Button" LANGUAGE=javascript onclick=\'return window.open("index.php?module=Products&action=Popup&return_module=Potentials&popuptype=detailview&form=EditView&form_submit=false&recordid='.$_REQUEST["record"].'","test","width=600,height=400,resizable=1,scrollbars=1");\'>&nbsp;';
 		}
 		$returnset = '&return_module=Potentials&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 from products inner join seproductsrel on products.productid = seproductsrel.productid inner join crmentity on crmentity.crmid = products.productid inner join potential on potential.potentialid = seproductsrel.crmid  where potential.potentialid = '.$id.' and crmentity.deleted = 0';
+		$query = 'select vtiger_products.productid, vtiger_products.productname, vtiger_products.productcode, vtiger_products.commissionrate, vtiger_products.qty_per_unit, vtiger_products.unit_price, vtiger_crmentity.crmid, vtiger_crmentity.smownerid from vtiger_products inner join vtiger_seproductsrel on vtiger_products.productid = vtiger_seproductsrel.productid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_products.productid inner join vtiger_potential on vtiger_potential.potentialid = vtiger_seproductsrel.crmid  where vtiger_potential.potentialid = '.$id.' and vtiger_crmentity.deleted = 0';
 		$log->debug("Exiting get_products method ...");
 		return GetRelatedList('Potentials','Products',$focus,$query,$button,$returnset);
 	}
@@ -370,7 +370,7 @@
 
 		}
 
-		$query = 'select potstagehistory.*, potential.potentialname from potstagehistory inner join potential on potential.potentialid = potstagehistory.potentialid inner join crmentity on crmentity.crmid = potential.potentialid where crmentity.deleted = 0 and potential.potentialid = '.$id;
+		$query = 'select vtiger_potstagehistory.*, vtiger_potential.potentialname from vtiger_potstagehistory inner join vtiger_potential on vtiger_potential.potentialid = vtiger_potstagehistory.potentialid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_potential.potentialid where vtiger_crmentity.deleted = 0 and vtiger_potential.potentialid = '.$id;
 	 $log->debug("Exiting get_stage_history method ...");
 	}
 
@@ -378,21 +378,21 @@
 	{
 		 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,
-			crmentity.createdtime, crmentity.description, 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 activitygrouprelation on activitygrouprelation.activityid=activity.activityid
-				left join groups on groups.groupname=activitygrouprelation.groupname
-				inner join users on crmentity.smcreatorid= users.id
-				where (activity.activitytype = 'Meeting' or activity.activitytype='Call' or activity.activitytype='Task')
-				and (activity.status = 'Completed' or activity.status = 'Deferred' or (activity.eventstatus = 'Held' and activity.eventstatus != ''))
-				and seactivityrel.crmid=".$id;
+		$query = "SELECT vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.status,
+		vtiger_activity.eventstatus, vtiger_activity.activitytype, vtiger_contactdetails.contactid,
+		vtiger_contactdetails.firstname, vtiger_contactdetails.lastname, vtiger_crmentity.modifiedtime,
+		vtiger_crmentity.createdtime, vtiger_crmentity.description, vtiger_users.user_name
+				from vtiger_activity
+				inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid
+				inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid
+				left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid
+				left join vtiger_contactdetails on vtiger_contactdetails.contactid= vtiger_cntactivityrel.contactid
+				left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_activity.activityid
+				left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname
+				inner join vtiger_users on vtiger_crmentity.smcreatorid= vtiger_users.id
+				where (vtiger_activity.activitytype = 'Meeting' or vtiger_activity.activitytype='Call' or vtiger_activity.activitytype='Task')
+				and (vtiger_activity.status = 'Completed' or vtiger_activity.status = 'Deferred' or (vtiger_activity.eventstatus = 'Held' and vtiger_activity.eventstatus != ''))
+				and vtiger_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 ...");
@@ -404,35 +404,35 @@
 		 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
-		$query = "select notes.title,'Notes      '  ActivityType, notes.filename,
-			attachments.type  FileType, crm2.modifiedtime lastmodified,
-			seattachmentsrel.attachmentsid, notes.notesid crmid,
-			crm2.createdtime, notes.notecontent description, users.user_name
-				from notes
-				inner join senotesrel on senotesrel.notesid= notes.notesid
-				inner join crmentity on crmentity.crmid= senotesrel.crmid
-				inner join crmentity crm2 on crm2.crmid=notes.notesid and crm2.deleted=0
-				left join seattachmentsrel  on seattachmentsrel.crmid =notes.notesid
-				left join attachments on seattachmentsrel.attachmentsid = attachments.attachmentsid
-				inner join users on crm2.smcreatorid= users.id
-				where crmentity.crmid=".$id;
+		// Desc: Inserted crm2.createdtime, vtiger_notes.notecontent description, vtiger_users.user_name
+		// Inserted inner join vtiger_users on crm2.smcreatorid= vtiger_users.id
+		$query = "select vtiger_notes.title,'Notes      '  ActivityType, vtiger_notes.filename,
+		vtiger_attachments.type  FileType, crm2.modifiedtime lastmodified,
+		vtiger_seattachmentsrel.attachmentsid, vtiger_notes.notesid crmid,
+			crm2.createdtime, vtiger_notes.notecontent description, vtiger_users.user_name
+				from vtiger_notes
+				inner join vtiger_senotesrel on vtiger_senotesrel.notesid= vtiger_notes.notesid
+				inner join vtiger_crmentity on vtiger_crmentity.crmid= vtiger_senotesrel.crmid
+				inner join vtiger_crmentity crm2 on crm2.crmid=vtiger_notes.notesid and crm2.deleted=0
+				left join vtiger_seattachmentsrel  on vtiger_seattachmentsrel.crmid =vtiger_notes.notesid
+				left join vtiger_attachments on vtiger_seattachmentsrel.attachmentsid = vtiger_attachments.attachmentsid
+				inner join vtiger_users on crm2.smcreatorid= vtiger_users.id
+				where vtiger_crmentity.crmid=".$id;
 		$query .= ' union all ';
 		// Armando L?scher 18.10.2005 -> ?visibleDescription
-		// Desc: Inserted crm2.createdtime, attachments.description, users.user_name
-		// Inserted inner join users on crm2.smcreatorid= users.id
+		// Desc: Inserted crm2.createdtime, vtiger_attachments.description, vtiger_users.user_name
+		// Inserted inner join vtiger_users on crm2.smcreatorid= vtiger_users.id
 		// Inserted order by createdtime desc
-		$query .= "select attachments.description title ,'Attachments'  ActivityType,
-			attachments.name filename, attachments.type FileType,crm2.modifiedtime lastmodified,
-			attachments.attachmentsid, seattachmentsrel.attachmentsid crmid,
-			crm2.createdtime, attachments.description, users.user_name
-				from attachments
-				inner join seattachmentsrel on seattachmentsrel.attachmentsid= attachments.attachmentsid
-				inner join crmentity on crmentity.crmid= seattachmentsrel.crmid
-				inner join crmentity crm2 on crm2.crmid=attachments.attachmentsid
-				inner join users on crm2.smcreatorid= users.id
-				where crmentity.crmid=".$id."
+		$query .= "select vtiger_attachments.description title ,'Attachments'  ActivityType,
+		vtiger_attachments.name filename, vtiger_attachments.type FileType,crm2.modifiedtime lastmodified,
+		vtiger_attachments.attachmentsid, vtiger_seattachmentsrel.attachmentsid crmid,
+			crm2.createdtime, vtiger_attachments.description, vtiger_users.user_name
+				from vtiger_attachments
+				inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid= vtiger_attachments.attachmentsid
+				inner join vtiger_crmentity on vtiger_crmentity.crmid= vtiger_seattachmentsrel.crmid
+				inner join vtiger_crmentity crm2 on crm2.crmid=vtiger_attachments.attachmentsid
+				inner join vtiger_users on crm2.smcreatorid= vtiger_users.id
+				where vtiger_crmentity.crmid=".$id."
 				order by createdtime desc";
 
 		$log->debug("Exiting get_attachments method ...");
@@ -457,7 +457,7 @@
 		$returnset = '&return_module=Potentials&return_action=DetailView&return_id='.$id;
 
 
-		$query = "select crmentity.*, quotes.*, potential.potentialname, users.user_name from quotes inner join crmentity on crmentity.crmid=quotes.quoteid 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 left join users on users.id=crmentity.smownerid where crmentity.deleted=0 and potential.potentialid=".$id;
+		$query = "select vtiger_crmentity.*, vtiger_quotes.*, vtiger_potential.potentialname, vtiger_users.user_name from vtiger_quotes inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_quotes.quoteid left outer join vtiger_potential on vtiger_potential.potentialid=vtiger_quotes.potentialid left join vtiger_quotegrouprelation on vtiger_quotes.quoteid=vtiger_quotegrouprelation.quoteid left join vtiger_groups on vtiger_groups.groupname=vtiger_quotegrouprelation.groupname left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_crmentity.deleted=0 and vtiger_potential.potentialid=".$id;
 		$log->debug("Exiting get_quotes method ...");
 		return  GetRelatedList('Potentials','Quotes',$focus,$query,$button,$returnset);
 	}
@@ -480,7 +480,7 @@
 		$returnset = '&return_module=Potentials&return_action=DetailView&return_id='.$id;
 
 
-		$query = "select crmentity.*, salesorder.*, quotes.subject as quotename, account.accountname, potential.potentialname 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 potential on potential.potentialid=salesorder.potentialid left join sogrouprelation on salesorder.salesorderid=sogrouprelation.salesorderid left join groups on groups.groupname=sogrouprelation.groupname where crmentity.deleted=0 and potential.potentialid = ".$id;
+		$query = "select vtiger_crmentity.*, vtiger_salesorder.*, vtiger_quotes.subject as quotename, vtiger_account.accountname, vtiger_potential.potentialname from vtiger_salesorder inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_salesorder.salesorderid left outer join vtiger_quotes on vtiger_quotes.quoteid=vtiger_salesorder.quoteid left outer join vtiger_account on vtiger_account.accountid=vtiger_salesorder.accountid left outer join vtiger_potential on vtiger_potential.potentialid=vtiger_salesorder.potentialid left join vtiger_sogrouprelation on vtiger_salesorder.salesorderid=vtiger_sogrouprelation.salesorderid left join vtiger_groups on vtiger_groups.groupname=vtiger_sogrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_potential.potentialid = ".$id;
 		$log->debug("Exiting get_salesorder method ...");
 		return GetRelatedList('Potentials','SalesOrder',$focus,$query,$button,$returnset);
 

Modified: vtigercrm/trunk/modules/Potentials/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Potentials/Save.php (original)
+++ vtigercrm/trunk/modules/Potentials/Save.php Mon Jun 12 14:26:25 2006
@@ -56,7 +56,7 @@
 if($_REQUEST['return_viewname'] == '') $return_viewname='0';
 if($_REQUEST['return_viewname'] != '')$return_viewname=$_REQUEST['return_viewname'];
 
-//Added to send mail to the potential-owner about the Potential
+//Added to send mail to the vtiger_potential-owner about the Potential
 $status = sendNotificationToOwner('Potentials',&$focus);
 
 header("Location: index.php?action=$return_action&module=$return_module&record=$return_id&viewname=$return_viewname");

Modified: vtigercrm/trunk/modules/Potentials/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Potentials/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Potentials/language/en_us.lang.php Mon Jun 12 14:26:25 2006
@@ -85,7 +85,7 @@
 'LBL_NEW_CONTACT'=>'New Contact',
 'LBL_CONTACT_TITLE'=>'Contacts',
 
-//Added fields after RC1 - Release
+//Added vtiger_fields after RC1 - Release
 'LBL_ALL'=>'All',
 'LBL_WON'=>'Won',
 'LBL_LOST'=>'Lost',

Modified: vtigercrm/trunk/modules/Potentials/updateRelations.php
==============================================================================
--- vtigercrm/trunk/modules/Potentials/updateRelations.php (original)
+++ vtigercrm/trunk/modules/Potentials/updateRelations.php Mon Jun 12 14:26:25 2006
@@ -21,9 +21,9 @@
 	{
 		if($id != '')
 		{
-		$sql = "insert into contpotentialrel values (".$id.",".$_REQUEST["parentid"] .")";
+		$sql = "insert into vtiger_contpotentialrel values (".$id.",".$_REQUEST["parentid"] .")";
 		$adb->query($sql);
-		$sql = "insert into seproductsrel values (". $_REQUEST["parentid"] .",".$id.")";
+		$sql = "insert into vtiger_seproductsrel values (". $_REQUEST["parentid"] .",".$id.")";
 		$adb->query($sql);
 		}
 	}
@@ -31,9 +31,9 @@
 }
 elseif(isset($_REQUEST['entityid']) && $_REQUEST['entityid'] != '')
 {
-		$sql = "insert into contpotentialrel values (". $_REQUEST["entityid"] .",".$_REQUEST["parid"] .")";
+		$sql = "insert into vtiger_contpotentialrel values (". $_REQUEST["entityid"] .",".$_REQUEST["parid"] .")";
 		$adb->query($sql);
-		$sql = "insert into seproductsrel values (". $_REQUEST["parid"] .",".$_REQUEST["entityid"] .")";
+		$sql = "insert into vtiger_seproductsrel values (". $_REQUEST["parid"] .",".$_REQUEST["entityid"] .")";
 		$adb->query($sql);
  		header("Location: index.php?action=CallRelatedList&module=Potentials&record=".$_REQUEST["parid"]);
 }

Modified: vtigercrm/trunk/modules/PriceBooks/PriceBook.php
==============================================================================
--- vtigercrm/trunk/modules/PriceBooks/PriceBook.php (original)
+++ vtigercrm/trunk/modules/PriceBooks/PriceBook.php Mon Jun 12 14:26:25 2006
@@ -22,17 +22,17 @@
 	var $db;
 
 
-	// Stored fields
+	// Stored vtiger_fields
 	var $id;
 	var $mode;
 
-	var $tab_name = Array('crmentity','pricebook','pricebookcf');
-	var $tab_name_index = Array('crmentity'=>'crmid','pricebook'=>'pricebookid','pricebookcf'=>'pricebookid');
+	var $tab_name = Array('vtiger_crmentity','vtiger_pricebook','vtiger_pricebookcf');
+	var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_pricebook'=>'pricebookid','vtiger_pricebookcf'=>'pricebookid');
 	var $column_fields = Array();
 
 	var $sortby_fields = Array('bookname');		  
 
-        // This is the list of fields that are in the lists.
+        // This is the list of vtiger_fields that are in the lists.
 	var $list_fields = Array(
                                 'Price Book Name'=>Array('pricebook'=>'bookname'),
                                 'Active'=>Array('pricebook'=>'active')
@@ -78,7 +78,7 @@
 
 		$returnset = '&return_module=PriceBooks&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,pricebookproductrel.listprice from products inner join pricebookproductrel on products.productid = pricebookproductrel.productid inner join crmentity on crmentity.crmid = products.productid inner join pricebook on pricebook.pricebookid = pricebookproductrel.pricebookid  where pricebook.pricebookid = '.$id.' and crmentity.deleted = 0'; 
+		$query = 'select vtiger_products.productid, vtiger_products.productname, vtiger_products.productcode, vtiger_products.commissionrate, vtiger_products.qty_per_unit, vtiger_products.unit_price, vtiger_crmentity.crmid, vtiger_crmentity.smownerid,vtiger_pricebookproductrel.listprice from vtiger_products inner join vtiger_pricebookproductrel on vtiger_products.productid = vtiger_pricebookproductrel.productid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_products.productid inner join vtiger_pricebook on vtiger_pricebook.pricebookid = vtiger_pricebookproductrel.pricebookid  where vtiger_pricebook.pricebookid = '.$id.' and vtiger_crmentity.deleted = 0'; 
 		$log->debug("Exiting get_pricebook_products method ...");
 		return getPriceBookRelatedProducts($query,$focus,$returnset);
 	}
@@ -87,11 +87,11 @@
 		global $log;
 		$log->debug("Entering get_pricebook_noproduct(".$id.") method ...");
 		 
-		$query = "select crmentity.crmid, pricebook.* from pricebook inner join crmentity on crmentity.crmid=pricebook.pricebookid where crmentity.deleted=0";                                                                                                  $result = $this->db->query($query);
+		$query = "select vtiger_crmentity.crmid, vtiger_pricebook.* from vtiger_pricebook inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_pricebook.pricebookid where vtiger_crmentity.deleted=0";                                                                                                  $result = $this->db->query($query);
 		$no_count = $this->db->num_rows($result);
 		if($no_count !=0)
 		{
-       	 		$pb_query = 'select crmentity.crmid, pricebook.pricebookid,pricebookproductrel.productid from pricebook inner join crmentity on crmentity.crmid=pricebook.pricebookid inner join pricebookproductrel on pricebookproductrel.pricebookid=pricebook.pricebookid where crmentity.deleted=0 and pricebookproductrel.productid='.$id;
+       	 		$pb_query = 'select vtiger_crmentity.crmid, vtiger_pricebook.pricebookid,vtiger_pricebookproductrel.productid from vtiger_pricebook inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_pricebook.pricebookid inner join vtiger_pricebookproductrel on vtiger_pricebookproductrel.pricebookid=vtiger_pricebook.pricebookid where vtiger_crmentity.deleted=0 and vtiger_pricebookproductrel.productid='.$id;
 			$result_pb = $this->db->query($pb_query);
 			if($no_count == $this->db->num_rows($result_pb))
 			{

Modified: vtigercrm/trunk/modules/Products/AddProductToPriceBooks.php
==============================================================================
--- vtigercrm/trunk/modules/Products/AddProductToPriceBooks.php (original)
+++ vtigercrm/trunk/modules/Products/AddProductToPriceBooks.php Mon Jun 12 14:26:25 2006
@@ -50,16 +50,16 @@
 $list_query = getListQuery("PriceBooks");
 $xtpl->assign("PRICEBOOKLISTHEADER", get_form_header($current_module_strings['LBL_LIST_PRICEBOOK_FORM_TITLE'], $other_text, false ));
 
-$list_query .= ' ORDER BY pricebookid DESC ';
+$list_query .= ' ORDER BY vtiger_pricebookid DESC ';
 
 $list_result = $adb->query($list_query);
 $num_rows = $adb->num_rows($list_result);
 
 $record_string= "Total No of Rows: ".$num_rows;
 
-//Retreiving the array of already releated products;
+//Retreiving the array of already releated vtiger_products;
 
-$sql1="select crmentity.crmid, pricebookproductrel.pricebookid,products.unit_price from pricebookproductrel inner join crmentity on crmentity.crmid=pricebookproductrel.productid inner join products on products.productid=pricebookproductrel.productid where crmentity.deleted=0 and pricebookproductrel.productid=".$productid;
+$sql1="select vtiger_crmentity.crmid, vtiger_pricebookproductrel.pricebookid,vtiger_products.unit_price from vtiger_pricebookproductrel inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_pricebookproductrel.productid inner join vtiger_products on vtiger_products.productid=vtiger_pricebookproductrel.productid where vtiger_crmentity.deleted=0 and vtiger_pricebookproductrel.productid=".$productid;
 $res1 = $adb->query($sql1);
 $num_prod_rows = $adb->num_rows($res1);
 $pbk_array = Array();

Modified: vtigercrm/trunk/modules/Products/AddProductsToPriceBook.php
==============================================================================
--- vtigercrm/trunk/modules/Products/AddProductsToPriceBook.php (original)
+++ vtigercrm/trunk/modules/Products/AddProductsToPriceBook.php Mon Jun 12 14:26:25 2006
@@ -58,7 +58,7 @@
 
 	$where_clauses = Array();
 	//Added for Custom Field Search
-	$sql="select * from field where tablename='productcf' order by fieldlabel";
+	$sql="select * from vtiger_field where vtiger_tablename='productcf' order by vtiger_fieldlabel";
 	$result=$adb->query($sql);
 	for($i=0;$i<$adb->num_rows($result);$i++)
 	{
@@ -71,9 +71,9 @@
 	        if(isset($customfield[$i]) && $customfield[$i] != '')
 	        {
 			if($uitype[$i] == 56)
-                                $str=" productcf.".$column[$i]." = 1";
+                                $str=" vtiger_productcf.".$column[$i]." = 1";
                         else
-			        $str=" productcf.".$column[$i]." like '$customfield[$i]%'";
+			        $str=" vtiger_productcf.".$column[$i]." like '$customfield[$i]%'";
 		        array_push($where_clauses, $str);
 			$url_string .="&".$column[$i]."=".$customfield[$i];
 	        }
@@ -178,9 +178,9 @@
 
 $record_string= "Total No of Rows: ".$num_rows;
 
-//Retreiving the array of already releated products;
-
-$sql1 = "select productid from pricebookproductrel where pricebookid=".$pricebook_id;
+//Retreiving the array of already releated vtiger_products;
+
+$sql1 = "select productid from vtiger_pricebookproductrel where vtiger_pricebookid=".$pricebook_id;
 $res1 = $adb->query($sql1);
 $num_prod_rows = $adb->num_rows($res1);
 $prod_array = Array();
@@ -224,7 +224,7 @@
 for($i=0; $i<$num_rows; $i++)
 {
 	
-	 $log->info("Products :: Showing the List of products to be added in price book");
+	 $log->info("Products :: Showing the List of vtiger_products to be added in price book");
 	$entity_id = $adb->query_result($list_result,$i,"crmid");
 	if(! array_key_exists($entity_id, $prod_array))
 	{

Modified: vtigercrm/trunk/modules/Products/DeletePriceBookProductRel.php
==============================================================================
--- vtigercrm/trunk/modules/Products/DeletePriceBookProductRel.php (original)
+++ vtigercrm/trunk/modules/Products/DeletePriceBookProductRel.php Mon Jun 12 14:26:25 2006
@@ -18,13 +18,13 @@
 if($return_action !='' && $return_action=="DetailView")
 {
 	$log->info("Products :: Deleting Price Book");
-	$query = "delete from pricebookproductrel where pricebookid=".$record." and productid=".$return_id;
+	$query = "delete from vtiger_pricebookproductrel where vtiger_pricebookid=".$record." and productid=".$return_id;
 	$adb->query($query); 
 }
 else
 {
 	$log->info("Products :: Deleting Price Book");
-	$query = "delete from pricebookproductrel where pricebookid=".$return_id." and productid=".$record;
+	$query = "delete from vtiger_pricebookproductrel where vtiger_pricebookid=".$return_id." and productid=".$record;
 	$adb->query($query); 
 }
 

Modified: vtigercrm/trunk/modules/Products/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/Products/EditView.php (original)
+++ vtigercrm/trunk/modules/Products/EditView.php Mon Jun 12 14:26:25 2006
@@ -63,7 +63,7 @@
     	$focus->mode = ''; 	
 } 
 
-//needed when creating a new product with a default vendor name to passed 
+//needed when creating a new product with a default vtiger_vendor name to passed 
 if (isset($_REQUEST['name']) && is_null($focus->name)) {
 	$focus->name = $_REQUEST['name'];
 	

Modified: vtigercrm/trunk/modules/Products/Forms.php
==============================================================================
--- vtigercrm/trunk/modules/Products/Forms.php (original)
+++ vtigercrm/trunk/modules/Products/Forms.php Mon Jun 12 14:26:25 2006
@@ -15,7 +15,7 @@
 /*********************************************************************************
  * $Header: /advent/projects/wesat/vtiger_crm/vtigercrm/modules/Products/Forms.php,v 1.3 2005/03/04 17:06:55 saraj Exp $
  * Description:  Contains a variety of utility functions used to display UI
- * components such as form headers and footers.  Intended to be modified on a per
+ * components such as form vtiger_headers and footers.  Intended to be modified on a per
  * theme basis.
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
  * All Rights Reserved.
@@ -23,7 +23,7 @@
  ********************************************************************************/
 
 /**
- * Create HTML form to enter a new record with the minimum necessary fields.
+ * Create HTML form to enter a new record with the minimum necessary vtiger_fields.
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
  * All Rights Reserved.
  * Contributor(s): ______________________________________..
@@ -52,7 +52,7 @@
 $qcreate_form = get_left_form_header($mod_strings['LBL_NEW_FORM_TITLE']);
 
 
-$qcreate_get_field="select * from field where tabid=14 and quickcreate=0 order by quickcreatesequence";
+$qcreate_get_field="select * from vtiger_field where vtiger_tabid=14 and quickcreate=0 order by quickcreatesequence";
 $qcreate_get_result=$adb->query($qcreate_get_field);
 $qcreate_get_noofrows=$adb->num_rows($qcreate_get_result);
 
@@ -140,9 +140,9 @@
 $qcreate_form.='</form>';
 $qcreate_form.='<script type="text/javascript">
 		
-	var fieldname = new Array('.$fieldName.')
-	var fieldlabel = new Array('.$fieldLabel.')
-	var fielddatatype = new Array('.$fldDataType.')
+	var vtiger_fieldname = new Array('.$fieldName.')
+	var vtiger_fieldlabel = new Array('.$fieldLabel.')
+	var vtiger_fielddatatype = new Array('.$fldDataType.')
 
 		</script>';
 

Modified: vtigercrm/trunk/modules/Products/Product.php
==============================================================================
--- vtigercrm/trunk/modules/Products/Product.php (original)
+++ vtigercrm/trunk/modules/Products/Product.php Mon Jun 12 14:26:25 2006
@@ -22,7 +22,7 @@
 	var $db;
 
 
-	// Stored fields
+	// Stored vtiger_fields
 	var $id;
 	var $mode;
 
@@ -42,13 +42,13 @@
         );
 
 
-	var $tab_name = Array('crmentity','products','productcf','seproductsrel','producttaxrel','attachments');
-	var $tab_name_index = Array('crmentity'=>'crmid','products'=>'productid','productcf'=>'productid','seproductsrel'=>'productid','producttaxrel'=>'productid','attachments'=>'attachmentsid');
+	var $tab_name = Array('vtiger_crmentity','vtiger_products','vtiger_productcf','vtiger_seproductsrel','vtiger_producttaxrel','vtiger_attachments');
+	var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_products'=>'productid','vtiger_productcf'=>'productid','vtiger_seproductsrel'=>'productid','vtiger_producttaxrel'=>'productid','vtiger_attachments'=>'attachmentsid');
 	var $column_fields = Array();
 
 	var $sortby_fields = Array('productname','productcode','commissionrate');		  
 
-        // This is the list of fields that are in the lists.
+        // This is the list of vtiger_fields that are in the lists.
         var $list_fields = Array(
                                 'Product Name'=>Array('products'=>'productname'),
                                 'Product Code'=>Array('products'=>'productcode'),
@@ -100,50 +100,50 @@
 		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
-		$query = "SELECT notes.title, 'Notes      ' AS ActivityType,
-				notes.filename, attachments.type  AS FileType,
+		// Desc: Inserted vtiger_crmentity.createdtime, vtiger_notes.notecontent description, vtiger_users.user_name
+		// Inserted inner join vtiger_users on vtiger_crmentity.smcreatorid= vtiger_users.id
+		$query = "SELECT vtiger_notes.title, 'Notes      ' AS ActivityType,
+			vtiger_notes.filename, vtiger_attachments.type  AS FileType,
 				crm2.modifiedtime AS lastmodified,
-				seattachmentsrel.attachmentsid AS attachmentsid,
-				notes.notesid AS crmid, crmentity.createdtime,
-				notes.notecontent AS description,
-				users.user_name
-			FROM notes
-			INNER JOIN senotesrel
-				ON senotesrel.notesid = notes.notesid
-			INNER JOIN crmentity
-				ON crmentity.crmid = senotesrel.crmid
-			INNER JOIN crmentity AS crm2
-				ON crm2.crmid = notes.notesid
+			vtiger_seattachmentsrel.attachmentsid AS vtiger_attachmentsid,
+			vtiger_notes.notesid AS crmid, vtiger_crmentity.createdtime,
+			vtiger_notes.notecontent AS description,
+			vtiger_users.user_name
+			FROM vtiger_notes
+			INNER JOIN vtiger_senotesrel
+				ON vtiger_senotesrel.notesid = vtiger_notes.notesid
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_senotesrel.crmid
+			INNER JOIN vtiger_crmentity AS crm2
+				ON crm2.crmid = vtiger_notes.notesid
 				AND crm2.deleted = 0
-			LEFT JOIN seattachmentsrel
-				ON seattachmentsrel.crmid = notes.notesid
-			LEFT JOIN attachments
-				ON seattachmentsrel.attachmentsid = attachments.attachmentsid
-			INNER JOIN users
-				ON crmentity.smcreatorid = users.id
-			WHERE crmentity.crmid = ".$id."
+			LEFT JOIN vtiger_seattachmentsrel
+				ON vtiger_seattachmentsrel.crmid = vtiger_notes.notesid
+			LEFT JOIN vtiger_attachments
+				ON vtiger_seattachmentsrel.attachmentsid = vtiger_attachments.attachmentsid
+			INNER JOIN vtiger_users
+				ON vtiger_crmentity.smcreatorid = vtiger_users.id
+			WHERE vtiger_crmentity.crmid = ".$id."
 		UNION ALL
-			SELECT attachments.description AS title,
+			SELECT vtiger_attachments.description AS title,
 				'Attachments' AS ActivityType,
-				attachments.name AS filename,
-				attachments.type AS FileType,
+			vtiger_attachments.name AS filename,
+			vtiger_attachments.type AS FileType,
 				crm2.modifiedtime AS lastmodified,
-				attachments.attachmentsid AS attachmentsid,
-				seattachmentsrel.attachmentsid AS crmid,
-				crmentity.createdtime,
-				attachments.description, users.user_name
-			FROM attachments
-			INNER JOIN seattachmentsrel
-				ON seattachmentsrel.attachmentsid = attachments.attachmentsid
-			INNER JOIN crmentity
-				ON crmentity.crmid = seattachmentsrel.crmid
-			INNER JOIN crmentity AS crm2
-				ON crm2.crmid = attachments.attachmentsid
-			INNER JOIN users
-				ON crmentity.smcreatorid = users.id
-			WHERE crmentity.crmid = ".$id;	
+			vtiger_attachments.attachmentsid AS vtiger_attachmentsid,
+			vtiger_seattachmentsrel.attachmentsid AS crmid,
+			vtiger_crmentity.createdtime,
+			vtiger_attachments.description, vtiger_users.user_name
+			FROM vtiger_attachments
+			INNER JOIN vtiger_seattachmentsrel
+				ON vtiger_seattachmentsrel.attachmentsid = vtiger_attachments.attachmentsid
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_seattachmentsrel.crmid
+			INNER JOIN vtiger_crmentity AS crm2
+				ON crm2.crmid = vtiger_attachments.attachmentsid
+			INNER JOIN vtiger_users
+				ON vtiger_crmentity.smcreatorid = vtiger_users.id
+			WHERE vtiger_crmentity.crmid = ".$id;	
 
 		$log->debug("Exiting get_attachments method ...");
         	return getAttachmentsAndNotes('Products',$query,$id);
@@ -153,19 +153,19 @@
 	{
 		global $log;
 		$log->debug("Entering get_opportunities(".$id.") method ...");
-		$query = "SELECT potential.potentialid, potential.potentialname,
-				potential.potentialtype, products.productid,
-				products.productname, products.qty_per_unit,
-				products.unit_price, products.expiry_date
-			FROM potential
-			INNER JOIN products
-				ON potential.productid = products.productid
-			LEFT JOIN potentialgrouprelation
-				ON potential.potentialid = potentialgrouprelation.potentialid
-			LEFT JOIN groups
-				ON groups.groupname = potentialgrouprelation.groupname
-			WHERE crmentity.deleted = 0
-			AND products.productid = ".$id;
+		$query = "SELECT vtiger_potential.potentialid, vtiger_potential.potentialname,
+			vtiger_potential.potentialtype, vtiger_products.productid,
+			vtiger_products.productname, vtiger_products.qty_per_unit,
+			vtiger_products.unit_price, vtiger_products.expiry_date
+			FROM vtiger_potential
+			INNER JOIN vtiger_products
+				ON vtiger_potential.productid = vtiger_products.productid
+			LEFT JOIN vtiger_potentialgrouprelation
+				ON vtiger_potential.potentialid = vtiger_potentialgrouprelation.potentialid
+			LEFT JOIN vtiger_groups
+				ON vtiger_groups.groupname = vtiger_potentialgrouprelation.groupname
+			WHERE vtiger_crmentity.deleted = 0
+			AND vtiger_products.productid = ".$id;
 		$log->debug("Exiting get_opportunities method ...");
           renderRelatedPotentials($query);
         }
@@ -182,26 +182,26 @@
 
 		$returnset = '&return_module=Products&return_action=DetailView&return_id='.$id;
 
-		$query = "SELECT users.user_name, users.id,
-				products.productid, products.productname,
-				troubletickets.ticketid,
-				troubletickets.parent_id, troubletickets.title,
-				troubletickets.status, troubletickets.priority,
-				crmentity.crmid, crmentity.smownerid,
-				crmentity.modifiedtime
-			FROM troubletickets
-			INNER JOIN crmentity
-				ON crmentity.crmid = troubletickets.ticketid
-			LEFT JOIN products
-				ON products.productid = troubletickets.product_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 products.productid = ".$id;
+		$query = "SELECT vtiger_users.user_name, vtiger_users.id,
+			vtiger_products.productid, vtiger_products.productname,
+			vtiger_troubletickets.ticketid,
+			vtiger_troubletickets.parent_id, vtiger_troubletickets.title,
+			vtiger_troubletickets.status, vtiger_troubletickets.priority,
+			vtiger_crmentity.crmid, vtiger_crmentity.smownerid,
+			vtiger_crmentity.modifiedtime
+			FROM vtiger_troubletickets
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_troubletickets.ticketid
+			LEFT JOIN vtiger_products
+				ON vtiger_products.productid = vtiger_troubletickets.product_id
+			LEFT JOIN vtiger_users
+				ON vtiger_users.id = vtiger_crmentity.smownerid
+			LEFT JOIN vtiger_ticketgrouprelation
+				ON vtiger_troubletickets.ticketid = vtiger_ticketgrouprelation.ticketid
+			LEFT JOIN vtiger_groups
+				ON vtiger_groups.groupname = vtiger_ticketgrouprelation.groupname
+			WHERE vtiger_crmentity.deleted = 0
+			AND vtiger_products.productid = ".$id;
 	$log->debug("Exiting get_tickets method ...");
 		return GetRelatedList('Products','HelpDesk',$focus,$query,$button,$returnset);
 	}
@@ -223,36 +223,36 @@
 		$returnset = '&return_module=Products&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,
-				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."
+		$query = "SELECT vtiger_contactdetails.lastname,
+			vtiger_contactdetails.firstname,
+			vtiger_contactdetails.contactid,
+			vtiger_activity.*,
+			vtiger_seactivityrel.*,
+			vtiger_crmentity.crmid, vtiger_crmentity.smownerid,
+			vtiger_crmentity.modifiedtime,
+			vtiger_users.user_name,
+			vtiger_recurringevents.recurringtype
+			FROM vtiger_activity
+			INNER JOIN vtiger_seactivityrel
+				ON vtiger_seactivityrel.activityid = vtiger_activity.activityid
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid=vtiger_activity.activityid
+			LEFT JOIN vtiger_cntactivityrel
+				ON vtiger_cntactivityrel.activityid = vtiger_activity.activityid
+			LEFT JOIN vtiger_contactdetails
+				ON vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid
+			LEFT JOIN vtiger_users
+				ON vtiger_users.id = vtiger_crmentity.smownerid
+			LEFT OUTER JOIN vtiger_recurringevents
+				ON vtiger_recurringevents.activityid = vtiger_activity.activityid
+			LEFT JOIN vtiger_activitygrouprelation
+				ON vtiger_activitygrouprelation.activityid = vtiger_crmentity.crmid
+			LEFT JOIN vtiger_groups
+				ON vtiger_groups.groupname = vtiger_activitygrouprelation.groupname
+			WHERE vtiger_seactivityrel.crmid=".$id."
 			AND (activitytype = 'Task'
-				OR activitytype = 'Call'
-				OR activitytype = 'Meeting')";
+				OR vtiger_activitytype = 'Call'
+				OR vtiger_activitytype = 'Meeting')";
 		$log->debug("Exiting get_activities method ...");
 		return GetRelatedList('Products','Activities',$focus,$query,$button,$returnset);
 	}
@@ -268,26 +268,26 @@
 		$returnset = '&return_module=Products&return_action=DetailView&return_id='.$id;
 
 
-		$query = "SELECT crmentity.*,
-				quotes.*,
-				potential.potentialname,
-				account.accountname,
-				quotesproductrel.productid
-			FROM quotes
-			INNER JOIN crmentity
-				ON crmentity.crmid = quotes.quoteid
-			INNER JOIN quotesproductrel
-				ON quotesproductrel.quoteid = quotes.quoteid
-			LEFT OUTER JOIN account
-				ON account.accountid = quotes.accountid
-			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 quotesproductrel.productid = ".$id;
+		$query = "SELECT vtiger_crmentity.*,
+			vtiger_quotes.*,
+			vtiger_potential.potentialname,
+			vtiger_account.accountname,
+			vtiger_quotesproductrel.productid
+			FROM vtiger_quotes
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_quotes.quoteid
+			INNER JOIN vtiger_quotesproductrel
+				ON vtiger_quotesproductrel.quoteid = vtiger_quotes.quoteid
+			LEFT OUTER JOIN vtiger_account
+				ON vtiger_account.accountid = vtiger_quotes.accountid
+			LEFT OUTER JOIN vtiger_potential
+				ON vtiger_potential.potentialid = vtiger_quotes.potentialid
+			LEFT JOIN vtiger_quotegrouprelation
+				ON vtiger_quotes.quoteid = vtiger_quotegrouprelation.quoteid
+			LEFT JOIN vtiger_groups
+				ON vtiger_groups.groupname = vtiger_quotegrouprelation.groupname
+			WHERE vtiger_crmentity.deleted = 0
+			AND vtiger_quotesproductrel.productid = ".$id;
 		$log->debug("Exiting get_quotes method ...");
 		return GetRelatedList('Products','Quotes',$focus,$query,$button,$returnset);
 	}
@@ -303,23 +303,23 @@
 
 		$returnset = '&return_module=Products&return_action=DetailView&return_id='.$id;
 
-		$query = "SELECT crmentity.*,
-				purchaseorder.*,
-				products.productname,
-				poproductrel.productid
-			FROM purchaseorder
-			INNER JOIN crmentity
-				ON crmentity.crmid = purchaseorder.purchaseorderid
-			INNER JOIN poproductrel
-				ON poproductrel.purchaseorderid = purchaseorder.purchaseorderid
-			INNER JOIN products
-				ON products.productid = poproductrel.productid
-			LEFT JOIN pogrouprelation
-				ON purchaseorder.purchaseorderid = pogrouprelation.purchaseorderid
-			LEFT JOIN groups
-				ON groups.groupname = pogrouprelation.groupname
-			WHERE crmentity.deleted = 0
-			AND products.productid = ".$id;
+		$query = "SELECT vtiger_crmentity.*,
+			vtiger_purchaseorder.*,
+			vtiger_products.productname,
+			vtiger_poproductrel.productid
+			FROM vtiger_purchaseorder
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_purchaseorder.purchaseorderid
+			INNER JOIN vtiger_poproductrel
+				ON vtiger_poproductrel.purchaseorderid = vtiger_purchaseorder.purchaseorderid
+			INNER JOIN vtiger_products
+				ON vtiger_products.productid = vtiger_poproductrel.productid
+			LEFT JOIN vtiger_pogrouprelation
+				ON vtiger_purchaseorder.purchaseorderid = vtiger_pogrouprelation.purchaseorderid
+			LEFT JOIN vtiger_groups
+				ON vtiger_groups.groupname = vtiger_pogrouprelation.groupname
+			WHERE vtiger_crmentity.deleted = 0
+			AND vtiger_products.productid = ".$id;
 		$log->debug("Exiting get_purchase_orders method ...");
 		return GetRelatedList('Products','PurchaseOrder',$focus,$query,$button,$returnset);
 	}
@@ -334,25 +334,25 @@
 		$button = '';
 		$returnset = '&return_module=Products&return_action=DetailView&return_id='.$id;
 
-		$query = "SELECT crmentity.*,
-				salesorder.*,
-				products.productname AS productname,
-				account.accountname
-			FROM salesorder
-			INNER JOIN crmentity
-				ON crmentity.crmid = salesorder.salesorderid
-			INNER JOIN soproductrel
-				ON soproductrel.salesorderid = salesorder.salesorderid
-			INNER JOIN products
-				ON products.productid = soproductrel.productid
-			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 products.productid = ".$id;
+		$query = "SELECT vtiger_crmentity.*,
+			vtiger_salesorder.*,
+			vtiger_products.productname AS productname,
+			vtiger_account.accountname
+			FROM vtiger_salesorder
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_salesorder.salesorderid
+			INNER JOIN vtiger_soproductrel
+				ON vtiger_soproductrel.salesorderid = vtiger_salesorder.salesorderid
+			INNER JOIN vtiger_products
+				ON vtiger_products.productid = vtiger_soproductrel.productid
+			LEFT OUTER JOIN vtiger_account
+				ON vtiger_account.accountid = vtiger_salesorder.accountid
+			LEFT JOIN vtiger_sogrouprelation
+				ON vtiger_salesorder.salesorderid = vtiger_sogrouprelation.salesorderid
+			LEFT JOIN vtiger_groups
+				ON vtiger_groups.groupname = vtiger_sogrouprelation.groupname
+			WHERE vtiger_crmentity.deleted = 0
+			AND vtiger_products.productid = ".$id;
 		$log->debug("Exiting get_salesorder method ...");
 		return GetRelatedList('Products','SalesOrder',$focus,$query,$button,$returnset);
 	}
@@ -368,23 +368,23 @@
 		$returnset = '&return_module=Products&return_action=DetailView&return_id='.$id;
 
 
-		$query = "SELECT crmentity.*,
-				invoice.*,
-				invoiceproductrel.quantity,
-				account.accountname
-			FROM invoice
-			INNER JOIN crmentity
-				ON crmentity.crmid = invoice.invoiceid
-			LEFT OUTER JOIN account
-				ON account.accountid = invoice.accountid
-			INNER JOIN invoiceproductrel
-				ON invoiceproductrel.invoiceid = invoice.invoiceid
-			LEFT JOIN invoicegrouprelation
-				ON invoice.invoiceid = invoicegrouprelation.invoiceid
-			LEFT JOIN groups
-				ON groups.groupname = invoicegrouprelation.groupname
-			WHERE crmentity.deleted = 0
-			AND invoiceproductrel.productid = ".$id;
+		$query = "SELECT vtiger_crmentity.*,
+			vtiger_invoice.*,
+			vtiger_invoiceproductrel.quantity,
+			vtiger_account.accountname
+			FROM vtiger_invoice
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_invoice.invoiceid
+			LEFT OUTER JOIN vtiger_account
+				ON vtiger_account.accountid = vtiger_invoice.accountid
+			INNER JOIN vtiger_invoiceproductrel
+				ON vtiger_invoiceproductrel.invoiceid = vtiger_invoice.invoiceid
+			LEFT JOIN vtiger_invoicegrouprelation
+				ON vtiger_invoice.invoiceid = vtiger_invoicegrouprelation.invoiceid
+			LEFT JOIN vtiger_groups
+				ON vtiger_groups.groupname = vtiger_invoicegrouprelation.groupname
+			WHERE vtiger_crmentity.deleted = 0
+			AND vtiger_invoiceproductrel.productid = ".$id;
 		$log->debug("Exiting get_invoices method ...");
 		return GetRelatedList('Products','Invoice',$focus,$query,$button,$returnset);
 	}
@@ -399,16 +399,16 @@
 		$returnset = '&return_module=Products&return_action=DetailView&return_id='.$id;
 
 
-		$query = "SELECT crmentity.crmid,
-				pricebook.*,
-				pricebookproductrel.productid as prodid
-			FROM pricebook
-			INNER JOIN crmentity
-				ON crmentity.crmid = pricebook.pricebookid
-			INNER JOIN pricebookproductrel
-				ON pricebookproductrel.pricebookid = pricebook.pricebookid
-			WHERE crmentity.deleted = 0
-			AND pricebookproductrel.productid = ".$id; 
+		$query = "SELECT vtiger_crmentity.crmid,
+			vtiger_pricebook.*,
+			vtiger_pricebookproductrel.productid as prodid
+			FROM vtiger_pricebook
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_pricebook.pricebookid
+			INNER JOIN vtiger_pricebookproductrel
+				ON vtiger_pricebookproductrel.pricebookid = vtiger_pricebook.pricebookid
+			WHERE vtiger_crmentity.deleted = 0
+			AND vtiger_pricebookproductrel.productid = ".$id; 
 		$log->debug("Exiting get_product_pricebooks method ...");
 		return GetRelatedList('Products','PriceBooks',$focus,$query,$button,$returnset);
 	}
@@ -417,12 +417,12 @@
 	{
 		global $log;
 		$log->debug("Entering product_novendor() method ...");
-		$query = "SELECT products.productname, crmentity.deleted
-			FROM products
-			INNER JOIN crmentity
-				ON crmentity.crmid = products.productid
-			WHERE crmentity.deleted = 0
-			AND products.vendor_id = ''";
+		$query = "SELECT vtiger_products.productname, vtiger_crmentity.deleted
+			FROM vtiger_products
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_products.productid
+			WHERE vtiger_crmentity.deleted = 0
+			AND vtiger_products.vendor_id = ''";
 		$result=$this->db->query($query);
 		$log->debug("Exiting product_novendor method ...");
 		return $this->db->num_rows($result);
@@ -437,85 +437,85 @@
 		{
 
 		$query = $this->constructCustomQueryAddendum('productcf','Products') ."    
-				products.productid AS productid,
-				products.productname AS productname,
-				products.productcode AS productcode,
-				products.productcategory AS productcategory,
-				products.manufacturer AS manufacturer,
-				products.product_description AS product_description,
-				products.qty_per_unit AS qty_per_unit,
-				products.unit_price AS unit_price,
-				products.weight AS weight,
-				products.pack_size AS pack_size,
-				DATE_FORMAT(products.start_date, '%Y-%M-%D') AS start_date,
-				DATE_FORMAT(products.expiry_date, '%Y-%M-%D') AS expiry_date,
-				products.cost_factor AS cost_factor,
-				products.commissionrate AS commissionrate,
-				products.commissionmethod AS commissionmethod,
-				products.discontinued AS discontinued,
-				products.sales_start_date AS sales_start_date,
-				products.sales_end_date AS sales_end_date,
-				products.usageunit AS usageunit,
-				products.serialno AS serialno,
-				products.currency AS currency,
-				products.reorderlevel AS reorderlevel,
-				products.website AS website,
-				products.taxclass AS taxclass,
-				products.mfr_part_no AS mfr_part_no,
-				products.vendor_part_no AS vendor_part_no,
-				products.qtyinstock AS qtyinstock,
-				products.productsheet AS productsheet,
-				products.qtyindemand AS qtyindemand
+			vtiger_products.productid AS productid,
+			vtiger_products.productname AS productname,
+			vtiger_products.productcode AS productcode,
+			vtiger_products.productcategory AS vtiger_productcategory,
+			vtiger_products.manufacturer AS vtiger_manufacturer,
+			vtiger_products.product_description AS product_description,
+			vtiger_products.qty_per_unit AS qty_per_unit,
+			vtiger_products.unit_price AS unit_price,
+			vtiger_products.weight AS weight,
+			vtiger_products.pack_size AS pack_size,
+				DATE_FORMAT(vtiger_products.start_date, '%Y-%M-%D') AS start_date,
+				DATE_FORMAT(vtiger_products.expiry_date, '%Y-%M-%D') AS expiry_date,
+			vtiger_products.cost_factor AS cost_factor,
+			vtiger_products.commissionrate AS commissionrate,
+			vtiger_products.commissionmethod AS commissionmethod,
+			vtiger_products.discontinued AS discontinued,
+			vtiger_products.sales_start_date AS sales_start_date,
+			vtiger_products.sales_end_date AS sales_end_date,
+			vtiger_products.usageunit AS vtiger_usageunit,
+			vtiger_products.serialno AS serialno,
+			vtiger_products.currency AS vtiger_currency,
+			vtiger_products.reorderlevel AS reorderlevel,
+			vtiger_products.website AS website,
+			vtiger_products.taxclass AS vtiger_taxclass,
+			vtiger_products.mfr_part_no AS mfr_part_no,
+			vtiger_products.vendor_part_no AS vtiger_vendor_part_no,
+			vtiger_products.qtyinstock AS qtyinstock,
+			vtiger_products.productsheet AS vtiger_productsheet,
+			vtiger_products.qtyindemand AS qtyindemand
 			FROM ".$this->entity_table."
-			INNER JOIN products
-				ON crmentity.crmid = products.productid
-			INNER JOIN users
-				ON users.id = crmentity.smownerid 
-			LEFT JOIN productcf
-				ON productcf.productid = products.productid";
+			INNER JOIN vtiger_products
+				ON vtiger_crmentity.crmid = vtiger_products.productid
+			INNER JOIN vtiger_users
+				ON vtiger_users.id = vtiger_crmentity.smownerid 
+			LEFT JOIN vtiger_productcf
+				ON vtiger_productcf.productid = vtiger_products.productid";
 
 		}
 		else
 		{
-			$query = "SELECT products.productid AS productid,
-				products.productname AS productname,
-				products.productcode AS productcode,
-				products.productcategory AS productcategory,
-				products.manufacturer AS manufacturer,
-				products.product_description AS product_description,
-				products.qty_per_unit AS qty_per_unit,
-				products.unit_price AS unit_price,
-				products.weight AS weight,
-				products.pack_size AS pack_size,
-				DATE_FORMAT(products.start_date, '%Y-%M-%D') AS start_date,
-				DATE_FORMAT(products.expiry_date, '%Y-%M-%D') AS expiry_date,
-				products.cost_factor AS cost_factor,
-				products.commissionrate AS commissionrate,
-				products.commissionmethod AS commissionmethod,
-				products.discontinued AS discontinued,
-				products.sales_start_date AS sales_start_date,
-				products.sales_end_date AS sales_end_date,
-				products.usageunit AS usageunit,
-				products.serialno AS serialno,
-				products.currency AS currency,
-				products.reorderlevel AS reorderlevel,
-				products.website AS website,
-				products.taxclass AS taxclass,
-				products.mfr_part_no AS mfr_part_no,
-				products.vendor_part_no AS vendor_part_no,
-				products.qtyinstock AS qtyinstock,
-				products.productsheet AS productsheet,
-				products.qtyindemand AS qtyindemand
+			$query = "SELECT vtiger_products.productid AS productid,
+			vtiger_products.productname AS productname,
+			vtiger_products.productcode AS productcode,
+			vtiger_products.productcategory AS vtiger_productcategory,
+			vtiger_products.manufacturer AS vtiger_manufacturer,
+			vtiger_products.product_description AS product_description,
+			vtiger_products.qty_per_unit AS qty_per_unit,
+			vtiger_products.unit_price AS unit_price,
+			vtiger_products.weight AS weight,
+			vtiger_products.pack_size AS pack_size,
+				DATE_FORMAT(vtiger_products.start_date, '%Y-%M-%D') AS start_date,
+				DATE_FORMAT(vtiger_products.expiry_date, '%Y-%M-%D') AS expiry_date,
+			vtiger_products.cost_factor AS cost_factor,
+			vtiger_products.commissionrate AS commissionrate,
+			vtiger_products.commissionmethod AS commissionmethod,
+			vtiger_products.discontinued AS discontinued,
+			vtiger_products.sales_start_date AS sales_start_date,
+			vtiger_products.sales_end_date AS sales_end_date,
+			vtiger_products.usageunit AS vtiger_usageunit,
+			vtiger_products.serialno AS serialno,
+			vtiger_products.currency AS vtiger_currency,
+			vtiger_products.reorderlevel AS reorderlevel,
+			vtiger_products.website AS website,
+			vtiger_products.taxclass AS vtiger_taxclass,
+			vtiger_products.mfr_part_no AS mfr_part_no,
+			vtiger_products.vendor_part_no AS vtiger_vendor_part_no,
+			vtiger_products.qtyinstock AS qtyinstock,
+			vtiger_products.productsheet AS vtiger_productsheet,
+			vtiger_products.qtyindemand AS qtyindemand
 			FROM ".$this->table_name ."
-			INNER JOIN crmentity
-				ON crmentity.crmid = products.productid 
-			INNER JOIN users
-				ON users.id=crmentity.smownerid ";
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid = vtiger_products.productid 
+			INNER JOIN vtiger_users
+				ON vtiger_users.id=vtiger_crmentity.smownerid ";
 
 		}
 	
-		  $where_auto = " users.status = 'Active'
-                        AND crmentity.deleted = 0 ";
+		  $where_auto = " vtiger_users.status = 'Active'
+                        AND vtiger_crmentity.deleted = 0 ";
 
 
 

Modified: vtigercrm/trunk/modules/Products/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Products/Save.php (original)
+++ vtigercrm/trunk/modules/Products/Save.php Mon Jun 12 14:26:25 2006
@@ -171,7 +171,7 @@
 	{
 		if(isset($_REQUEST[$fieldname]))
 		{
-			 $log->debug("Assigning the previous values given for the product to respective fields ");
+			 $log->debug("Assigning the previous values given for the product to respective vtiger_fields ");
 			$field_values_passed.="&";
 			$value = $_REQUEST[$fieldname];
 			$focus->column_fields[$fieldname] = $value;
@@ -201,7 +201,7 @@
 {
 	$image_lists_db=implode("###",$image_lists);
 	$focus->column_fields['imagename']=$image_lists_db;
-	$log->debug("Assign the Image name to the field name ");
+	$log->debug("Assign the Image name to the vtiger_field name ");
 }
 //Saving the product
 if($image_error=="false")

Modified: vtigercrm/trunk/modules/Products/UpdateListPrice.php
==============================================================================
--- vtigercrm/trunk/modules/Products/UpdateListPrice.php (original)
+++ vtigercrm/trunk/modules/Products/UpdateListPrice.php Mon Jun 12 14:26:25 2006
@@ -15,7 +15,7 @@
 $product_id = $_REQUEST['product_id'];
 $listprice = $_REQUEST['list_price'];
 $return_action = $_REQUEST['return_action'];
-$query = "update pricebookproductrel set listprice=".$listprice." where pricebookid=".$pricebook_id." and productid=".$product_id;
+$query = "update vtiger_pricebookproductrel set listprice=".$listprice." where vtiger_pricebookid=".$pricebook_id." and productid=".$product_id;
 //echo $query;
 $adb->query($query); 
 

Modified: vtigercrm/trunk/modules/Products/addPbProductRelToDB.php
==============================================================================
--- vtigercrm/trunk/modules/Products/addPbProductRelToDB.php (original)
+++ vtigercrm/trunk/modules/Products/addPbProductRelToDB.php Mon Jun 12 14:26:25 2006
@@ -27,9 +27,9 @@
 		if($id != '') {
 			$lp_name = $id.'_listprice';
 			$list_price = $_REQUEST[$lp_name];
-			//Updating the pricebook product rel table
-			 $log->info("Products :: Inserting products to price book");
-			$query= "insert into pricebookproductrel (pricebookid,productid,listprice) values(".$pricebook_id.",".$id.",".$list_price.")";
+			//Updating the vtiger_pricebook product rel vtiger_table
+			 $log->info("Products :: Inserting vtiger_products to price book");
+			$query= "insert into vtiger_pricebookproductrel (pricebookid,productid,listprice) values(".$pricebook_id.",".$id.",".$list_price.")";
 			$adb->query($query);
 		}
 	}
@@ -44,9 +44,9 @@
 		if($id != '') {
 			$lp_name = $id.'_listprice';
 			$list_price = $_REQUEST[$lp_name];
-			//Updating the pricebook product rel table
+			//Updating the vtiger_pricebook product rel vtiger_table
 			 $log->info("Products :: Inserting PriceBooks to Product");
-			$query= "insert into pricebookproductrel (pricebookid,productid,listprice) values(".$id.",".$productid.",".$list_price.")";
+			$query= "insert into vtiger_pricebookproductrel (pricebookid,productid,listprice) values(".$id.",".$productid.",".$list_price.")";
 			$adb->query($query);
 		}
 	}

Modified: vtigercrm/trunk/modules/Products/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Products/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Products/language/en_us.lang.php Mon Jun 12 14:26:25 2006
@@ -85,7 +85,7 @@
 'LBL_NEW_ATTACHMENT'=>'New Attachment',
 'LBL_ATTACHMENT_TITLE'=>'Attachments',
 
-//Added fields after RC1 - Release
+//Added vtiger_fields after RC1 - Release
 'LBL_MANUFACTURER'=>'Manufacturer',
 'LBL_PRODUCTCATEGORY'=>'Product Category',
 'LBL_SUPPORT_START_DATE'=>'Support Start Date',
@@ -167,7 +167,7 @@
 'LBL_ADD_PRODUCTS_PRICEBOOK'=>'Add Products to PriceBook',
 
 //Added for 4.2 patch2 release
-'LBL_MAXIMUM_LIMIT_ERROR'=>'Sorry, the uploaded file exceeds the maximum filesize limit. Please try a file smaller than 800000 bytes',
+'LBL_MAXIMUM_LIMIT_ERROR'=>'Sorry, the uploaded file exceeds the maximum vtiger_filesize limit. Please try a file smaller than 800000 bytes',
 'LBL_UPLOAD_ERROR'=>'Problems in file upload. Please try again!',
 'LBL_IMAGE_ERROR'=>'The given file is not of type image(.gif/.jpg/.png)',
 'LBL_INVALID_IMAGE'=>'Invalid file OR File has no data',

Modified: vtigercrm/trunk/modules/Products/updateRelations.php
==============================================================================
--- vtigercrm/trunk/modules/Products/updateRelations.php (original)
+++ vtigercrm/trunk/modules/Products/updateRelations.php Mon Jun 12 14:26:25 2006
@@ -16,7 +16,7 @@
 {
 	if($_REQUEST['smodule']=='VENDOR')
 	{
-		$sql = "update products set vendor_id=".$_REQUEST['parid']." where productid=".$_REQUEST['entityid'];
+		$sql = "update vtiger_products set vtiger_vendor_id=".$_REQUEST['parid']." where productid=".$_REQUEST['entityid'];
 		$adb->query($sql);
 	}
 }
@@ -24,7 +24,7 @@
 {
 	if($_REQUEST['smodule']=='VENDOR')
 	{
-		$sql = "insert into vendorcontactrel values (".$_REQUEST['parid'].",".$_REQUEST['entityid'].")";
+		$sql = "insert into vtiger_vendorcontactrel values (".$_REQUEST['parid'].",".$_REQUEST['entityid'].")";
 		$adb->query($sql);
 	}
 }

Modified: vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php
==============================================================================
--- vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php (original)
+++ vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php Mon Jun 12 14:26:25 2006
@@ -15,7 +15,7 @@
 
 global $adb,$app_strings;
 
-$sql="select currency_symbol from currency_info";
+$sql="select vtiger_currency_symbol from vtiger_currency_info";
 $result = $adb->query($sql);
 $currency_symbol = $adb->query_result($result,0,'currency_symbol');
 
@@ -25,7 +25,7 @@
 $products_per_page="6";
 
 $id = $_REQUEST['record'];
-//retreiving the invoice info
+//retreiving the vtiger_invoice info
 $focus = new Order();
 $focus->retrieve_entity_info($_REQUEST['record'],"PurchaseOrder");
 $vendor_name = getVendorName($focus->column_fields[vendor_id]);
@@ -56,7 +56,7 @@
 $status = $focus->column_fields["postatus"];
 
 // Company information
-$add_query = "select * from organizationdetails";
+$add_query = "select * from vtiger_organizationdetails";
 $result = $adb->query($add_query);
 $num_rows = $adb->num_rows($result);
 
@@ -82,7 +82,7 @@
 $price_total = $currency_symbol.number_format(StripLastZero($focus->column_fields["hdnGrandTotal"]),2,'.',',');
 
 //getting the Product Data
-$query="select products.productname,products.unit_price,products.product_description,poproductrel.* from poproductrel inner join products on products.productid=poproductrel.productid where purchaseorderid=".$id;
+$query="select vtiger_products.productname,vtiger_products.unit_price,vtiger_products.product_description,vtiger_poproductrel.* from vtiger_poproductrel inner join vtiger_products on vtiger_products.productid=vtiger_poproductrel.productid where vtiger_purchaseorderid=".$id;
 
 global $result;
 $result = $adb->query($query);

Modified: vtigercrm/trunk/modules/PurchaseOrder/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/PurchaseOrder/EditView.php (original)
+++ vtigercrm/trunk/modules/PurchaseOrder/EditView.php Mon Jun 12 14:26:25 2006
@@ -55,7 +55,7 @@
         $associated_prod = getAssociatedProducts("Products",$focus,$focus->column_fields['product_id']);
 }
 
-// Get vendor address if vendorid is given
+// Get vtiger_vendor address if vtiger_vendorid is given
 if(isset($_REQUEST['vendor_id']) && $_REQUEST['vendor_id']!='' && $_REQUEST['record']==''){
 	require_once('modules/Vendors/Vendor.php');
 	$vend_focus = new Vendor();

Modified: vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php
==============================================================================
--- vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php (original)
+++ vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php Mon Jun 12 14:26:25 2006
@@ -28,25 +28,25 @@
 require_once('data/CRMEntity.php');
 require_once('include/utils/utils.php');
 
-// Account is used to store account information.
+// Account is used to store vtiger_account information.
 class Order extends CRMEntity {
 	var $log;
 	var $db;
 
 
-	// Stored fields
+	// Stored vtiger_fields
 	var $id;
 	var $mode;
 	
 		
 	var $table_name = "purchaseorder";
-	var $tab_name = Array('crmentity','purchaseorder','pobillads','poshipads','purchaseordercf');
-	var $tab_name_index = Array('crmentity'=>'crmid','purchaseorder'=>'purchaseorderid','pobillads'=>'pobilladdressid','poshipads'=>'poshipaddressid','purchaseordercf'=>'purchaseorderid');
+	var $tab_name = Array('vtiger_crmentity','vtiger_purchaseorder','vtiger_pobillads','vtiger_poshipads','vtiger_purchaseordercf');
+	var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_purchaseorder'=>'purchaseorderid','vtiger_pobillads'=>'pobilladdressid','vtiger_poshipads'=>'poshipaddressid','vtiger_purchaseordercf'=>'purchaseorderid');
 				
 	
-	var $entity_table = "crmentity";
-	
-	var $billadr_table = "pobillads";
+	var $entity_table = "vtiger_crmentity";
+	
+	var $billadr_table = "vtiger_pobillads";
 
 	var $object_name = "Order";
 
@@ -58,10 +58,10 @@
 
 	var $sortby_fields = Array('subject','tracking_no','smownerid');		
 
-	// This is used to retrieve related fields from form posts.
+	// This is used to retrieve related vtiger_fields from form posts.
 	var $additional_column_fields = Array('assigned_user_name', 'smownerid', 'opportunity_id', 'case_id', 'contact_id', 'task_id', 'note_id', 'meeting_id', 'call_id', 'email_id', 'parent_name', 'member_id' );
 
-	// This is the list of fields that are in the lists.
+	// This is the list of vtiger_fields that are in the lists.
 	var $list_fields = Array(
 				'Order Id'=>Array('crmentity'=>'crmid'),
 				'Subject'=>Array('purchaseorder'=>'subject'),
@@ -93,7 +93,7 @@
 				        'Subject'=>'subject',
 				      );
 
-	// This is the list of fields that are required.
+	// This is the list of vtiger_fields that are required.
 	var $required_fields =  array("accountname"=>1);
 
 	//Added these variables which are used as default order by and sortorder in ListView
@@ -126,7 +126,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')";
+		$query = "SELECT vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid,vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and (activitytype='Task' or vtiger_activitytype='Call' or vtiger_activitytype='Meeting') and vtiger_crmentity.deleted=0 and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Completed') and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Deferred') or (vtiger_activity.eventstatus != '' &&  vtiger_activity.eventstatus = 'Planned')";
 		$log->debug("Exiting get_activities method ...");
 		return GetRelatedList('PurchaseOrder','Activities',$focus,$query,$button,$returnset);
 	}
@@ -139,27 +139,27 @@
 	{
 		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
-			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
-				inner join users on crmentity.smcreatorid= users.id
-				left join activitygrouprelation on activitygrouprelation.activityid=activity.activityid
-                                left join groups on groups.groupname=activitygrouprelation.groupname
-			where (activity.activitytype = 'Meeting' or activity.activitytype='Call' or activity.activitytype='Task')
-				and (activity.status = 'Completed' or activity.status = 'Deferred' or (activity.eventstatus != 'Planned' and activity.eventstatus != '' ))
-				and seactivityrel.crmid=".$id;
+		$query = "SELECT vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid,
+			vtiger_activity.* ,vtiger_seactivityrel.*, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime,
+			vtiger_crmentity.createdtime, vtiger_crmentity.description, vtiger_users.user_name
+			from vtiger_activity
+				inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid
+				inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid
+				left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid
+				left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid
+				inner join vtiger_users on vtiger_crmentity.smcreatorid= vtiger_users.id
+				left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_activity.activityid
+                                left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname
+			where (vtiger_activity.activitytype = 'Meeting' or vtiger_activity.activitytype='Call' or vtiger_activity.activitytype='Task')
+				and (vtiger_activity.status = 'Completed' or vtiger_activity.status = 'Deferred' or (vtiger_activity.eventstatus != 'Planned' and vtiger_activity.eventstatus != '' ))
+				and vtiger_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);
 	}
 
-/** Function to get attachments associated with the id
+/** Function to get vtiger_attachments associated with the id
  *  This function accepts the id as arguments and execute the MySQL query using the id
  *  and sends the query and the id as arguments to renderRelatedAttachments() method.
 */
@@ -168,35 +168,35 @@
 		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
-		$query = "select notes.title, 'Notes      '  ActivityType, notes.filename,
-			attachments.type FileType, crm2.modifiedtime lastmodified,
-			seattachmentsrel.attachmentsid attachmentsid, notes.notesid crmid,
-			crm2.createdtime, notes.notecontent description, users.user_name
-		from notes
-			inner join senotesrel on senotesrel.notesid= notes.notesid
-			inner join crmentity on crmentity.crmid= senotesrel.crmid
-			inner join crmentity crm2 on crm2.crmid=notes.notesid and crm2.deleted=0
-			left join seattachmentsrel  on seattachmentsrel.crmid =notes.notesid
-			left join attachments on seattachmentsrel.attachmentsid = attachments.attachmentsid
-			inner join users on crm2.smcreatorid= users.id
-		where crmentity.crmid=".$id;
+		// Desc: Inserted crm2.createdtime, vtiger_notes.notecontent description, vtiger_users.user_name
+		// Inserted inner join vtiger_users on crm2.smcreatorid= vtiger_users.id
+		$query = "select vtiger_notes.title, 'Notes      '  ActivityType, vtiger_notes.filename,
+		vtiger_attachments.type FileType, crm2.modifiedtime lastmodified,
+		vtiger_seattachmentsrel.attachmentsid vtiger_attachmentsid, vtiger_notes.notesid crmid,
+			crm2.createdtime, vtiger_notes.notecontent description, vtiger_users.user_name
+		from vtiger_notes
+			inner join vtiger_senotesrel on vtiger_senotesrel.notesid= vtiger_notes.notesid
+			inner join vtiger_crmentity on vtiger_crmentity.crmid= vtiger_senotesrel.crmid
+			inner join vtiger_crmentity crm2 on crm2.crmid=vtiger_notes.notesid and crm2.deleted=0
+			left join vtiger_seattachmentsrel  on vtiger_seattachmentsrel.crmid =vtiger_notes.notesid
+			left join vtiger_attachments on vtiger_seattachmentsrel.attachmentsid = vtiger_attachments.attachmentsid
+			inner join vtiger_users on crm2.smcreatorid= vtiger_users.id
+		where vtiger_crmentity.crmid=".$id;
 		$query .= ' union all ';
 		// Armando L?scher 18.10.2005 -> ?visibleDescription
-		// Desc: Inserted crm2.createdtime, attachments.description, users.user_name
-		// Inserted inner join users on crm2.smcreatorid= users.id
+		// Desc: Inserted crm2.createdtime, vtiger_attachments.description, vtiger_users.user_name
+		// Inserted inner join vtiger_users on crm2.smcreatorid= vtiger_users.id
 		// Inserted order by createdtime desc
-		$query .= "select attachments.description  title ,'Attachments'  ActivityType,
-			attachments.name  filename, attachments.type  FileType, crm2.modifiedtime  lastmodified,
-			attachments.attachmentsid  attachmentsid, seattachmentsrel.attachmentsid crmid,
-			crm2.createdtime, attachments.description, users.user_name
-		from attachments
-			inner join seattachmentsrel on seattachmentsrel.attachmentsid= attachments.attachmentsid
-			inner join crmentity on crmentity.crmid= seattachmentsrel.crmid
-			inner join crmentity crm2 on crm2.crmid=attachments.attachmentsid
-			inner join users on crm2.smcreatorid= users.id
-		where crmentity.crmid=".$id."
+		$query .= "select vtiger_attachments.description  title ,'Attachments'  ActivityType,
+		vtiger_attachments.name  filename, vtiger_attachments.type  FileType, crm2.modifiedtime  lastmodified,
+		vtiger_attachments.attachmentsid  vtiger_attachmentsid, vtiger_seattachmentsrel.attachmentsid crmid,
+			crm2.createdtime, vtiger_attachments.description, vtiger_users.user_name
+		from vtiger_attachments
+			inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid= vtiger_attachments.attachmentsid
+			inner join vtiger_crmentity on vtiger_crmentity.crmid= vtiger_seattachmentsrel.crmid
+			inner join vtiger_crmentity crm2 on crm2.crmid=vtiger_attachments.attachmentsid
+			inner join vtiger_users on crm2.smcreatorid= vtiger_users.id
+		where vtiger_crmentity.crmid=".$id."
 		order by createdtime desc";
 		$log->debug("Exiting get_attachments method ...");
 		return getAttachmentsAndNotes('PurchaseOrder',$query,$id,$sid='purchaseorderid');

Modified: vtigercrm/trunk/modules/PurchaseOrder/Save.php
==============================================================================
--- vtigercrm/trunk/modules/PurchaseOrder/Save.php (original)
+++ vtigercrm/trunk/modules/PurchaseOrder/Save.php Mon Jun 12 14:26:25 2006
@@ -46,7 +46,7 @@
 $focus->save("PurchaseOrder");
 if($focus->mode == 'edit')
 {
-        $query1 = "delete from poproductrel where purchaseorderid=".$focus->id;
+        $query1 = "delete from vtiger_poproductrel where vtiger_purchaseorderid=".$focus->id;
         $adb->query($query1);
 
 }
@@ -74,7 +74,7 @@
         if($prod_status != 'D')
         {
 
-                $query ="insert into poproductrel values($focus->id, $prod_id, $qty, $listprice, $vat, $sales, $service)";
+                $query ="insert into vtiger_poproductrel values($focus->id, $prod_id, $qty, $listprice, $vat, $sales, $service)";
                 $adb->query($query);
 		if($update_prod_stock == 'true')
                 {

Modified: vtigercrm/trunk/modules/PurchaseOrder/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/PurchaseOrder/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/PurchaseOrder/language/en_us.lang.php Mon Jun 12 14:26:25 2006
@@ -80,10 +80,10 @@
 'NTC_COPY_SHIPPING_ADDRESS'=>'Copy shipping address to billing address',
 'NTC_REMOVE_MEMBER_ORG_CONFIRMATION'=>'Are you sure you want to remove this record as a member organization?',
 'LBL_DUPLICATE'=>'Potential Duplicate Accounts',
-'MSG_DUPLICATE' => 'Creating this account may potentialy create a duplicate account. You may either select an account from the list below or you may click on Create New Account to continue creating a new account with the previously entered data.',
+'MSG_DUPLICATE' => 'Creating this vtiger_account may vtiger_potentialy create a duplicate vtiger_account. You may either select an vtiger_account from the list below or you may click on Create New Account to continue creating a new vtiger_account with the previously entered data.',
 
 'LBL_INVITEE'=>'Contacts',
-'ERR_DELETE_RECORD'=>"A record number must be specified to delete the account.",
+'ERR_DELETE_RECORD'=>"A record number must be specified to delete the vtiger_account.",
 
 'LBL_SELECT_ACCOUNT'=>'Select Account',
 'LBL_GENERAL_INFORMATION'=>'General Information',
@@ -103,7 +103,7 @@
 'LBL_NEW_CONTACT'=>'New Contact',
 'LBL_CONTACT_TITLE'=>'Contacts',
 
-//Added fields after RC1 - Release
+//Added vtiger_fields after RC1 - Release
 'LBL_ALL'=>'All',
 'LBL_PROSPECT'=>'Prospect',
 'LBL_INVESTOR'=>'Investor',

Modified: vtigercrm/trunk/modules/PurchaseOrder/pdf_templates/header.php
==============================================================================
--- vtigercrm/trunk/modules/PurchaseOrder/pdf_templates/header.php (original)
+++ vtigercrm/trunk/modules/PurchaseOrder/pdf_templates/header.php Mon Jun 12 14:26:25 2006
@@ -67,7 +67,7 @@
 $dueBlock=array("80","65");
 $pdf->addRecBlock($valid_till, "Due Date",$dueBlock);
 
-// invoice number block
+// vtiger_invoice number block
 $invBlock=array("145","65");
 $pdf->addRecBlock($id, "Order Number",$invBlock);
 

Modified: vtigercrm/trunk/modules/Quotes/CreatePDF.php
==============================================================================
--- vtigercrm/trunk/modules/Quotes/CreatePDF.php (original)
+++ vtigercrm/trunk/modules/Quotes/CreatePDF.php Mon Jun 12 14:26:25 2006
@@ -16,7 +16,7 @@
 
 global $adb,$app_strings;
 
-$sql="select currency_symbol from currency_info";
+$sql="select vtiger_currency_symbol from vtiger_currency_info";
 $result = $adb->query($sql);
 $currency_symbol = $adb->query_result($result,0,'currency_symbol');
 
@@ -52,7 +52,7 @@
 $status = $focus->column_fields["quotestage"];
 
 // Company information
-$add_query = "select * from organizationdetails";
+$add_query = "select * from vtiger_organizationdetails";
 $result = $adb->query($add_query);
 $num_rows = $adb->num_rows($result);
 
@@ -78,7 +78,7 @@
 $price_total = $currency_symbol.number_format(StripLastZero($focus->column_fields["hdnGrandTotal"]),2,'.',',');
 
 //getting the Product Data
-$query="select products.productname,products.unit_price,products.product_description,quotesproductrel.* from quotesproductrel inner join products on products.productid=quotesproductrel.productid where quoteid=".$quote_id;
+$query="select vtiger_products.productname,vtiger_products.unit_price,vtiger_products.product_description,vtiger_quotesproductrel.* from vtiger_quotesproductrel inner join vtiger_products on vtiger_products.productid=vtiger_quotesproductrel.productid where quoteid=".$quote_id;
 
 global $result;
 $result = $adb->query($query);

Modified: vtigercrm/trunk/modules/Quotes/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/Quotes/EditView.php (original)
+++ vtigercrm/trunk/modules/Quotes/EditView.php Mon Jun 12 14:26:25 2006
@@ -67,7 +67,7 @@
         $associated_prod = getAssociatedProducts("Products",$focus,$focus->column_fields['product_id']);
 }
 
-// Get Account address if account is given
+// Get Account address if vtiger_account is given
 if(isset($_REQUEST['account_id']) && $_REQUEST['account_id']!='' && $_REQUEST['record']==''){
 	require_once('modules/Accounts/Account.php');
 	$acct_focus = new Account();

Modified: vtigercrm/trunk/modules/Quotes/ListTopQuotes.php
==============================================================================
--- vtigercrm/trunk/modules/Quotes/ListTopQuotes.php (original)
+++ vtigercrm/trunk/modules/Quotes/ListTopQuotes.php Mon Jun 12 14:26:25 2006
@@ -56,7 +56,7 @@
 	//<<<<<<<<<customview>>>>>>>>>
 	$date_var = date('Y-m-d');
 
-	$where = ' and crmentity.smownerid='.$current_user->id.' and  quotes.validtill >= \''.$date_var.'\' ORDER BY total DESC';
+	$where = ' and vtiger_crmentity.smownerid='.$current_user->id.' and  vtiger_quotes.validtill >= \''.$date_var.'\' ORDER BY total DESC';
 	$query = getListQuery("Quotes",$where);
 
 	//<<<<<<<<customview>>>>>>>>>

Modified: vtigercrm/trunk/modules/Quotes/Quote.php
==============================================================================
--- vtigercrm/trunk/modules/Quotes/Quote.php (original)
+++ vtigercrm/trunk/modules/Quotes/Quote.php Mon Jun 12 14:26:25 2006
@@ -28,20 +28,20 @@
 require_once('data/CRMEntity.php');
 require_once('include/utils/utils.php');
 require_once('include/RelatedListView.php');
-// Account is used to store account information.
+// Account is used to store vtiger_account information.
 class Quote extends CRMEntity {
 	var $log;
 	var $db;
 
 
-	// Stored fields
+	// Stored vtiger_fields
 	var $id;
 	var $mode;
 	
 		
 	var $table_name = "quotes";
-	var $tab_name = Array('crmentity','quotes','quotesbillads','quotesshipads','quotescf');
-	var $tab_name_index = Array('crmentity'=>'crmid','quotes'=>'quoteid','quotesbillads'=>'quotebilladdressid','quotesshipads'=>'quoteshipaddressid','quotescf'=>'quoteid');
+	var $tab_name = Array('vtiger_crmentity','vtiger_quotes','vtiger_quotesbillads','vtiger_quotesshipads','vtiger_quotescf');
+	var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_quotes'=>'quoteid','vtiger_quotesbillads'=>'quotebilladdressid','vtiger_quotesshipads'=>'quoteshipaddressid','vtiger_quotescf'=>'quoteid');
 				
 	
 	var $entity_table = "crmentity";
@@ -58,10 +58,10 @@
 
 	var $sortby_fields = Array('subject','crmid','smownerid');		
 
-	// This is used to retrieve related fields from form posts.
+	// This is used to retrieve related vtiger_fields from form posts.
 	var $additional_column_fields = Array('assigned_user_name', 'smownerid', 'opportunity_id', 'case_id', 'contact_id', 'task_id', 'note_id', 'meeting_id', 'call_id', 'email_id', 'parent_name', 'member_id' );
 
-	// This is the list of fields that are in the lists.
+	// This is the list of vtiger_fields that are in the lists.
 	var $list_fields = Array(
 				'Quote Id'=>Array('crmentity'=>'crmid'),
 				'Subject'=>Array('quotes'=>'subject'),
@@ -101,7 +101,7 @@
 				        'Quote Stage'=>'quotestage',
 				      );
 
-	// This is the list of fields that are required.
+	// This is the list of vtiger_fields that are required.
 	var $required_fields =  array("accountname"=>1);
 
 	//Added these variables which are used as default order by and sortorder in ListView
@@ -125,7 +125,7 @@
 
 		$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;
+		$query = "select vtiger_crmentity.*, vtiger_salesorder.*, vtiger_quotes.subject as quotename, vtiger_account.accountname from vtiger_salesorder inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_salesorder.salesorderid left outer join vtiger_quotes on vtiger_quotes.quoteid=vtiger_salesorder.quoteid left outer join vtiger_account on vtiger_account.accountid=vtiger_salesorder.accountid left join vtiger_sogrouprelation on vtiger_salesorder.salesorderid=vtiger_sogrouprelation.salesorderid left join vtiger_groups on vtiger_groups.groupname=vtiger_sogrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_salesorder.quoteid = ".$id;
 		$log->debug("Exiting get_salesorder method ...");
 		return GetRelatedList('Quotes','SalesOrder',$focus,$query,$button,$returnset);
 	}
@@ -142,7 +142,7 @@
 
 		$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')";
+		$query = "SELECT vtiger_contactdetails.contactid, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name,vtiger_recurringevents.recurringtype from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and (activitytype='Task' or vtiger_activitytype='Call' or vtiger_activitytype='Meeting') and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Completed') and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Deferred') or (vtiger_activity.eventstatus !='' && vtiger_activity.eventstatus = 'Planned')";
 		$log->debug("Exiting get_activities method ...");
 		return GetRelatedList('Quotes','Activities',$focus,$query,$button,$returnset);
 	}
@@ -150,21 +150,21 @@
 	{
 		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,
-				crmentity.createdtime, crmentity.description, 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
-				inner join users on crmentity.smcreatorid= users.id
-				left join activitygrouprelation on activitygrouprelation.activityid=activity.activityid
-                                left join groups on groups.groupname=activitygrouprelation.groupname
-			where (activity.activitytype = 'Meeting' or activity.activitytype='Call' or activity.activitytype='Task')
-  				and (activity.status = 'Completed' or activity.status = 'Deferred' or (activity.eventstatus !='Planned' and activity.eventstatus != ''))
-	 	        	and seactivityrel.crmid=".$id;
+		$query = "SELECT vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.status,
+			vtiger_activity.eventstatus, vtiger_activity.activitytype, vtiger_contactdetails.contactid,
+			vtiger_contactdetails.firstname,vtiger_contactdetails.lastname, vtiger_crmentity.modifiedtime,
+			vtiger_crmentity.createdtime, vtiger_crmentity.description, vtiger_users.user_name
+			from vtiger_activity
+				inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid
+				inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid
+				left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid
+				left join vtiger_contactdetails on vtiger_contactdetails.contactid= vtiger_cntactivityrel.contactid
+				inner join vtiger_users on vtiger_crmentity.smcreatorid= vtiger_users.id
+				left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_activity.activityid
+                                left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname
+			where (vtiger_activity.activitytype = 'Meeting' or vtiger_activity.activitytype='Call' or vtiger_activity.activitytype='Task')
+  				and (vtiger_activity.status = 'Completed' or vtiger_activity.status = 'Deferred' or (vtiger_activity.eventstatus !='Planned' and vtiger_activity.eventstatus != ''))
+	 	        	and vtiger_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 ...");

Modified: vtigercrm/trunk/modules/Quotes/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Quotes/Save.php (original)
+++ vtigercrm/trunk/modules/Quotes/Save.php Mon Jun 12 14:26:25 2006
@@ -42,7 +42,7 @@
 $ext_prod_arr = Array();
 if($focus->mode == 'edit')
 {	
-	$query2  = "select * from quotesproductrel where quoteid=".$focus->id;
+	$query2  = "select * from vtiger_quotesproductrel where quoteid=".$focus->id;
 	$result2 = $adb->query($query2);
 	$num_rows = $adb->num_rows($result2);
 	for($i=0; $i<$num_rows;$i++)
@@ -52,8 +52,8 @@
 		$ext_prod_arr[$pro_id] = $pro_qty;	
 	}
 	
-	 $log->debug("Deleting from quotesproductrel table ");
-	$query1 = "delete from quotesproductrel where quoteid=".$focus->id;
+	 $log->debug("Deleting from vtiger_quotesproductrel vtiger_table ");
+	$query1 = "delete from vtiger_quotesproductrel where quoteid=".$focus->id;
 	$adb->query($query1);
 
 }
@@ -82,7 +82,7 @@
 	if($prod_status != 'D')
 	{
 		
-		$query ="insert into quotesproductrel values($focus->id, $prod_id, $qty, $listprice, $vat, $sales, $service)";
+		$query ="insert into vtiger_quotesproductrel values($focus->id, $prod_id, $qty, $listprice, $vat, $sales, $service)";
 		$adb->query($query);
 		//Checking the re-order level and sending mail	
 		updateStk($prod_id,$qty,$focus->mode,$ext_prod_arr,'Quotes');

Modified: vtigercrm/trunk/modules/Quotes/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Quotes/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Quotes/language/en_us.lang.php Mon Jun 12 14:26:25 2006
@@ -79,10 +79,10 @@
 'NTC_COPY_SHIPPING_ADDRESS'=>'Copy shipping address to billing address',
 'NTC_REMOVE_MEMBER_ORG_CONFIRMATION'=>'Are you sure you want to remove this record as a member organization?',
 'LBL_DUPLICATE'=>'Potential Duplicate Accounts',
-'MSG_DUPLICATE' => 'Creating this account may potentialy create a duplicate account. You may either select an account from the list below or you may click on Create New Account to continue creating a new account with the previously entered data.',
+'MSG_DUPLICATE' => 'Creating this vtiger_account may vtiger_potentialy create a duplicate vtiger_account. You may either select an vtiger_account from the list below or you may click on Create New Account to continue creating a new vtiger_account with the previously entered data.',
 
 'LBL_INVITEE'=>'Contacts',
-'ERR_DELETE_RECORD'=>"A record number must be specified to delete the account.",
+'ERR_DELETE_RECORD'=>"A record number must be specified to delete the vtiger_account.",
 
 'LBL_SELECT_ACCOUNT'=>'Select Account',
 'LBL_GENERAL_INFORMATION'=>'General Information',
@@ -102,7 +102,7 @@
 'LBL_NEW_CONTACT'=>'New Contact',
 'LBL_CONTACT_TITLE'=>'Contacts',
 
-//Added fields after RC1 - Release
+//Added vtiger_fields after RC1 - Release
 'LBL_ALL'=>'All',
 'LBL_PROSPECT'=>'Prospect',
 'LBL_INVESTOR'=>'Investor',

Modified: vtigercrm/trunk/modules/Quotes/pdf_templates/header.php
==============================================================================
--- vtigercrm/trunk/modules/Quotes/pdf_templates/header.php (original)
+++ vtigercrm/trunk/modules/Quotes/pdf_templates/header.php Mon Jun 12 14:26:25 2006
@@ -62,7 +62,7 @@
 $dueBlock=array("80","65");
 $pdf->addRecBlock($valid_till, "Valid Till",$dueBlock);
 
-// invoice number block
+// vtiger_invoice number block
 $invBlock=array("147","65");
 $pdf->addRecBlock($quote_id, "Quote Number",$invBlock);
 

Modified: vtigercrm/trunk/modules/Reports/ChangeFolder.php
==============================================================================
--- vtigercrm/trunk/modules/Reports/ChangeFolder.php (original)
+++ vtigercrm/trunk/modules/Reports/ChangeFolder.php Mon Jun 12 14:26:25 2006
@@ -32,7 +32,7 @@
 function ChangeFolder($reportid,$folderid)
 {
 	global $adb;
-	$imovereportsql = "update report set folderid=".$folderid." where reportid=".$reportid;
+	$imovereportsql = "update vtiger_report set folderid=".$folderid." where vtiger_reportid=".$reportid;
 	$imovereportsqlresult = $adb->query($imovereportsql);
 }
 ?>

Modified: vtigercrm/trunk/modules/Reports/Delete.php
==============================================================================
--- vtigercrm/trunk/modules/Reports/Delete.php (original)
+++ vtigercrm/trunk/modules/Reports/Delete.php Mon Jun 12 14:26:25 2006
@@ -31,10 +31,10 @@
 function DeleteReport($reportid)
 {
 	global $adb;
-	$idelreportsql = "delete from selectquery where queryid=".$reportid;
+	$idelreportsql = "delete from vtiger_selectquery where queryid=".$reportid;
 	$idelreportsqlresult = $adb->query($idelreportsql);
 
-	$ireportsql = "delete from report where reportid=".$reportid;
+	$ireportsql = "delete from vtiger_report where vtiger_reportid=".$reportid;
     $ireportsqlresult = $adb->query($ireportsql);
 }
 ?>

Modified: vtigercrm/trunk/modules/Reports/DeleteReportFolder.php
==============================================================================
--- vtigercrm/trunk/modules/Reports/DeleteReportFolder.php (original)
+++ vtigercrm/trunk/modules/Reports/DeleteReportFolder.php Mon Jun 12 14:26:25 2006
@@ -17,7 +17,7 @@
 $rfid = $_REQUEST['record'];
 if($rfid != "")
 {
-	$sql .= "delete from reportfolder where folderid=".$rfid;
+	$sql .= "delete from vtiger_reportfolder where folderid=".$rfid;
 	$result = $adb->query($sql);
 	if($result!=false)
 	{

Modified: vtigercrm/trunk/modules/Reports/PopulateReports.php
==============================================================================
--- vtigercrm/trunk/modules/Reports/PopulateReports.php (original)
+++ vtigercrm/trunk/modules/Reports/PopulateReports.php Mon Jun 12 14:26:25 2006
@@ -274,7 +274,7 @@
 
 		 Array('reportname'=>'Quotes Detailed Report',
                        'reportfolder'=>'Quote Reports',
-                       'description'=>'Quotes detailed report',
+                       'description'=>'Quotes detailed vtiger_report',
                        'reporttype'=>'tabular',
                        'sortid'=>'','stdfilterid'=>'','advfilterid'=>''),
 
@@ -286,13 +286,13 @@
 
 		 Array('reportname'=>'PurchaseOrder Detailed Report',
                        'reportfolder'=>'PurchaseOrder Reports',
-                       'description'=>'PurchaseOrder detailed report',
+                       'description'=>'PurchaseOrder detailed vtiger_report',
                        'reporttype'=>'tabular',
                        'sortid'=>'','stdfilterid'=>'','advfilterid'=>''),
 
 		 Array('reportname'=>'Invoice Detailed Report',
                        'reportfolder'=>'Invoice Reports',
-                       'description'=>'Invoice detailed report',
+                       'description'=>'Invoice detailed vtiger_report',
                        'reporttype'=>'tabular',
                        'sortid'=>'','stdfilterid'=>'','advfilterid'=>'')
 
@@ -416,13 +416,13 @@
 function PopulateReportFolder($fldrname,$fldrdescription)
 {
 	global $adb;
-	$sql = "INSERT INTO reportfolder ";
+	$sql = "INSERT INTO vtiger_reportfolder ";
 	$sql .= "(FOLDERNAME,DESCRIPTION,STATE) ";
 	$sql .= "VALUES ('".$fldrname."','".$fldrdescription."','SAVED')";
 	$result = $adb->query($sql);
 }
 
-/** Function to add an entry in selestquery table 
+/** Function to add an entry in selestquery vtiger_table 
  *
  */
 
@@ -432,14 +432,14 @@
 	$genQueryId = $adb->getUniqueID("selectquery");
         if($genQueryId != "")
         {
-		$iquerysql = "insert into selectquery (QUERYID,STARTINDEX,NUMOFOBJECTS) values (".$genQueryId.",0,0)";
+		$iquerysql = "insert into vtiger_selectquery (QUERYID,STARTINDEX,NUMOFOBJECTS) values (".$genQueryId.",0,0)";
 		$iquerysqlresult = $adb->query($iquerysql);
 	}
 
 	return $genQueryId;
 }
 
-/** Function to store the field names selected for a report to a database
+/** Function to store the vtiger_field names selected for a vtiger_report to a database
  *  
  *  
  */
@@ -451,16 +451,16 @@
 	{
 		for($i=0;$i < count($columnname);$i++)
 		{
-			$icolumnsql = "insert into selectcolumn (QUERYID,COLUMNINDEX,COLUMNNAME) values (".$queryid.",".$i.",'".$columnname[$i]."')";
+			$icolumnsql = "insert into vtiger_selectcolumn (QUERYID,COLUMNINDEX,COLUMNNAME) values (".$queryid.",".$i.",'".$columnname[$i]."')";
 			$icolumnsqlresult = $adb->query($icolumnsql);	
 		}
 	}
 }
 
 
-/** Function to store the report details to database
+/** Function to store the vtiger_report details to database
  *  This function accepts queryid,folderid,reportname,description,reporttype
- *  as arguments and store the informations in report table
+ *  as arguments and store the informations in vtiger_report vtiger_table
  */
 
 function insertReports($queryid,$folderid,$reportname,$description,$reporttype)
@@ -468,15 +468,15 @@
 	global $adb;
 	if($queryid != "")
 	{
-		$ireportsql = "insert into report (REPORTID,FOLDERID,REPORTNAME,DESCRIPTION,REPORTTYPE,QUERYID,STATE)";
+		$ireportsql = "insert into vtiger_report (REPORTID,FOLDERID,REPORTNAME,DESCRIPTION,REPORTTYPE,QUERYID,STATE)";
                 $ireportsql .= " values (".$queryid.",".$folderid.",'".$reportname."','".$description."','".$reporttype."',".$queryid.",'SAVED')";
 		$ireportresult = $adb->query($ireportsql);
 	}
 }
 
-/** Function to store the report modules to database
+/** Function to store the vtiger_report modules to database
  *  This function accepts queryid,primary module and secondary module
- *  as arguments and store the informations in reportmodules table
+ *  as arguments and store the informations in vtiger_reportmodules vtiger_table
  */
 
 
@@ -485,16 +485,16 @@
 	global $adb;
 	if($queryid != "")
 	{
-		$ireportmodulesql = "insert into reportmodules (REPORTMODULESID,PRIMARYMODULE,SECONDARYMODULES) values (".$queryid.",'".$primarymodule."','".$secondarymodule."')";
+		$ireportmodulesql = "insert into vtiger_reportmodules (REPORTMODULESID,PRIMARYMODULE,SECONDARYMODULES) values (".$queryid.",'".$primarymodule."','".$secondarymodule."')";
 		$ireportmoduleresult = $adb->query($ireportmodulesql);
 	}
 }
 
 
-/** Function to store the report sortorder to database
+/** Function to store the vtiger_report sortorder to database
  *  This function accepts queryid,sortlists
  *  as arguments and store the informations sort columns and
- *  and sortorder in reportsortcol table
+ *  and sortorder in vtiger_reportsortcol vtiger_table
  */
 
 
@@ -505,7 +505,7 @@
 	{
 		foreach($sortlists as $i=>$sort)
                 {
-			$sort_bysql = "insert into reportsortcol (SORTCOLID,REPORTID,COLUMNNAME,SORTORDER) 
+			$sort_bysql = "insert into vtiger_reportsortcol (SORTCOLID,REPORTID,COLUMNNAME,SORTORDER) 
 					values (".($i+1).",".$queryid.",'".$sort['columnname']."','".$sort['sortorder']."')";
 			$sort_byresult = $adb->query($sort_bysql);
 		}
@@ -514,9 +514,9 @@
 }
 
 
-/** Function to store the report sort date details to database
+/** Function to store the vtiger_report sort date details to database
  *  This function accepts queryid,filtercolumn,datefilter,startdate,enddate
- *  as arguments and store the informations in reportdatefilter table
+ *  as arguments and store the informations in vtiger_reportdatefilter vtiger_table
  */
 
 
@@ -525,15 +525,15 @@
 	global $adb;
 	if($queryid != "")
 	{
-		$ireportmodulesql = "insert into reportdatefilter (DATEFILTERID,DATECOLUMNNAME,DATEFILTER,STARTDATE,ENDDATE) values (".$queryid.",'".$filtercolumn."','".$datefilter."','".$startdate."','".$enddate."')";
+		$ireportmodulesql = "insert into vtiger_reportdatefilter (DATEFILTERID,DATECOLUMNNAME,DATEFILTER,STARTDATE,ENDDATE) values (".$queryid.",'".$filtercolumn."','".$datefilter."','".$startdate."','".$enddate."')";
 		$ireportmoduleresult = $adb->query($ireportmodulesql);
 	}
 
 }
 
-/** Function to store the report conditions to database
+/** Function to store the vtiger_report conditions to database
  *  This function accepts queryid,filters
- *  as arguments and store the informations in relcriteria table
+ *  as arguments and store the informations in vtiger_relcriteria vtiger_table
  */
 
 
@@ -544,7 +544,7 @@
 	{
 		foreach($filters as $i=>$filter)
 		{
-		      $irelcriteriasql = "insert into relcriteria(QUERYID,COLUMNINDEX,COLUMNNAME,COMPARATOR,VALUE) 
+		      $irelcriteriasql = "insert into vtiger_relcriteria(QUERYID,COLUMNINDEX,COLUMNNAME,COMPARATOR,VALUE) 
 		      values (".$queryid.",".$i.",'".$filter['columnname']."','".$filter['comparator']."','".$filter['value']."')";
 		      $irelcriteriaresult = $adb->query($irelcriteriasql);
 		}

Modified: vtigercrm/trunk/modules/Reports/ReportColumns.php
==============================================================================
--- vtigercrm/trunk/modules/Reports/ReportColumns.php (original)
+++ vtigercrm/trunk/modules/Reports/ReportColumns.php Mon Jun 12 14:26:25 2006
@@ -52,9 +52,9 @@
 	
 }
 
-/** Function to formulate the fields for the primary modules 
+/** Function to formulate the vtiger_fields for the primary modules 
  *  This function accepts the module name 
- *  as arguments and generates the fields for the primary module as
+ *  as arguments and generates the vtiger_fields for the primary module as
  *  a HTML Combo values
  */
 
@@ -85,9 +85,9 @@
 	return $shtml;
 }
 
-/** Function to formulate the fields for the secondary modules
+/** Function to formulate the vtiger_fields for the secondary modules
  *  This function accepts the module name
- *  as arguments and generates the fields for the secondary module as
+ *  as arguments and generates the vtiger_fields for the secondary module as
  *  a HTML Combo values
  */
 

Modified: vtigercrm/trunk/modules/Reports/ReportRun.php
==============================================================================
--- vtigercrm/trunk/modules/Reports/ReportRun.php (original)
+++ vtigercrm/trunk/modules/Reports/ReportRun.php Mon Jun 12 14:26:25 2006
@@ -50,10 +50,10 @@
 		global $modules;
 		global $log;
 
-		$ssql = "select selectcolumn.* from report inner join selectquery on selectquery.queryid = report.queryid";
-                $ssql .= " left join selectcolumn on selectcolumn.queryid = selectquery.queryid";
-		$ssql .= " where report.reportid =".$reportid;
-                $ssql .= " order by selectcolumn.columnindex";
+		$ssql = "select vtiger_selectcolumn.* from vtiger_report inner join vtiger_selectquery on vtiger_selectquery.queryid = vtiger_report.queryid";
+                $ssql .= " left join vtiger_selectcolumn on vtiger_selectcolumn.queryid = vtiger_selectquery.queryid";
+		$ssql .= " where vtiger_report.reportid =".$reportid;
+                $ssql .= " order by vtiger_selectcolumn.columnindex";
 
                 $result = $adb->query($ssql);
 
@@ -82,15 +82,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 vtiger_crmentityRelHelpDesk.setype when 'Accounts' then vtiger_accountRelHelpDesk.accountname when 'Contacts' then vtiger_contactdetailsRelHelpDesk.lastname End"." '".$selectedfields[2]."', vtiger_crmentityRelHelpDesk.setype '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 vtiger_crmentityRelProducts.setype when 'Accounts' then vtiger_accountRelProducts.accountname when 'Leads' then vtiger_leaddetailsRelProducts.lastname when 'Potentials' then vtiger_potentialRelProducts.potentialname End"." '".$selectedfields[2]."', vtiger_crmentityRelProducts.setype '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 'PurchaseOrder' then purchaseorderRelActivities.subject when 'Invoice' then invoiceRelActivities.subject End"." '".$selectedfields[2]."', crmentityRelActivities.setype 'Entity_type'";
+				$querycolumn = "case vtiger_crmentityRelActivities.setype when 'Accounts' then vtiger_accountRelActivities.accountname when 'Leads' then vtiger_leaddetailsRelActivities.lastname when 'Potentials' then vtiger_potentialRelActivities.potentialname when 'Quotes' then vtiger_quotesRelActivities.subject when 'PurchaseOrder' then vtiger_purchaseorderRelActivities.subject when 'Invoice' then vtiger_invoiceRelActivities.subject End"." '".$selectedfields[2]."', vtiger_crmentityRelActivities.setype 'Entity_type'";
 			}
 		}
 		return $querycolumn;
@@ -103,9 +103,9 @@
 		global $modules;
 		global $log;
 		
-		$ssql = "select selectcolumn.* from report inner join selectquery on selectquery.queryid = report.queryid"; 
-		$ssql .= " left join selectcolumn on selectcolumn.queryid = selectquery.queryid where report.reportid =".$reportid; 
-		$ssql .= " order by selectcolumn.columnindex";
+		$ssql = "select vtiger_selectcolumn.* from vtiger_report inner join vtiger_selectquery on vtiger_selectquery.queryid = vtiger_report.queryid"; 
+		$ssql .= " left join vtiger_selectcolumn on vtiger_selectcolumn.queryid = vtiger_selectquery.queryid where vtiger_report.reportid =".$reportid; 
+		$ssql .= " order by vtiger_selectcolumn.columnindex";
 		
 		$result = $adb->query($ssql);
 		$noofrows = $adb->num_rows($result);
@@ -209,11 +209,11 @@
 		global $modules;
 		global $log;
 
-		$advfiltersql =  "select relcriteria.* from report";
-		$advfiltersql .= " inner join selectquery on selectquery.queryid = report.queryid";
-                $advfiltersql .= " left join relcriteria on relcriteria.queryid = selectquery.queryid";
-                $advfiltersql .= " where report.reportid =".$reportid;
-                $advfiltersql .= " order by relcriteria.columnindex";
+		$advfiltersql =  "select vtiger_relcriteria.* from vtiger_report";
+		$advfiltersql .= " inner join vtiger_selectquery on vtiger_selectquery.queryid = vtiger_report.queryid";
+                $advfiltersql .= " left join vtiger_relcriteria on vtiger_relcriteria.queryid = vtiger_selectquery.queryid";
+                $advfiltersql .= " where vtiger_report.reportid =".$reportid;
+                $advfiltersql .= " order by vtiger_relcriteria.columnindex";
 		
 		$result = $adb->query($advfiltersql);
 		while($advfilterrow = $adb->fetch_array($result))
@@ -253,9 +253,9 @@
 		global $modules;
 		global $log;
 
-		$stdfiltersql = "select reportdatefilter.* from report";
-		$stdfiltersql .= " inner join reportdatefilter on report.reportid = reportdatefilter.datefilterid";
-		$stdfiltersql .= " where report.reportid = ".$reportid;
+		$stdfiltersql = "select vtiger_reportdatefilter.* from vtiger_report";
+		$stdfiltersql .= " inner join vtiger_reportdatefilter on vtiger_report.reportid = vtiger_reportdatefilter.datefilterid";
+		$stdfiltersql .= " where vtiger_report.reportid = ".$reportid;
 
 		$result = $adb->query($stdfiltersql);
 		$stdfilterrow = $adb->fetch_array($result);
@@ -324,9 +324,9 @@
 		global $modules;
 		global $log;
 
-		$sreportstdfiltersql = "select reportdatefilter.* from report"; 
-		$sreportstdfiltersql .= " inner join reportdatefilter on report.reportid = reportdatefilter.datefilterid"; 
-		$sreportstdfiltersql .= " where report.reportid =".$reportid;
+		$sreportstdfiltersql = "select vtiger_reportdatefilter.* from vtiger_report"; 
+		$sreportstdfiltersql .= " inner join vtiger_reportdatefilter on vtiger_report.reportid = vtiger_reportdatefilter.datefilterid"; 
+		$sreportstdfiltersql .= " where vtiger_report.reportid =".$reportid;
 		
 		$result = $adb->query($sreportstdfiltersql);
 		$noofrows = $adb->num_rows($result);
@@ -568,9 +568,9 @@
 		global $modules;
 		global $log;
 
-		$sreportsortsql = "select reportsortcol.* from report";
-                $sreportsortsql .= " inner join reportsortcol on report.reportid = reportsortcol.reportid";
-                $sreportsortsql .= " where report.reportid =".$reportid." order by reportsortcol.sortcolid";
+		$sreportsortsql = "select vtiger_reportsortcol.* from vtiger_report";
+                $sreportsortsql .= " inner join vtiger_reportsortcol on vtiger_report.reportid = vtiger_reportsortcol.reportid";
+                $sreportsortsql .= " where vtiger_report.reportid =".$reportid." order by vtiger_reportsortcol.sortcolid";
 		
 		$result = $adb->query($sreportsortsql);
 
@@ -607,9 +607,9 @@
 		global $modules;
 		global $log;
 	
-		$sreportsortsql = "select reportsortcol.* from report"; 
-		$sreportsortsql .= " inner join reportsortcol on report.reportid = reportsortcol.reportid"; 
-		$sreportsortsql .= " where report.reportid =".$reportid." order by reportsortcol.sortcolid";
+		$sreportsortsql = "select vtiger_reportsortcol.* from vtiger_report"; 
+		$sreportsortsql .= " inner join vtiger_reportsortcol on vtiger_report.reportid = vtiger_reportsortcol.reportid"; 
+		$sreportsortsql .= " where vtiger_report.reportid =".$reportid." order by vtiger_reportsortcol.sortcolid";
 		
 		$result = $adb->query($sreportsortsql);
 		$noofrows = $adb->num_rows($result);
@@ -654,43 +654,43 @@
 		{
 			if($secmodule == "Accounts")
 			{
-				$query = "left join account on account.accountid = contactdetails.accountid
-                                left join crmentity as crmentityAccounts on crmentityAccounts.crmid=account.accountid
-                                left join accountbillads on account.accountid=accountbillads.accountaddressid
-                                left join accountshipads on account.accountid=accountshipads.accountaddressid
-                                left join accountscf on account.accountid = accountscf.accountid
-                                left join account as accountAccounts on accountAccounts.accountid = account.parentid
-                                left join users as usersAccounts on usersAccounts.id = crmentityAccounts.smownerid ";
+				$query = "left join vtiger_account on vtiger_account.accountid = vtiger_contactdetails.accountid
+                                left join vtiger_crmentity as vtiger_crmentityAccounts on vtiger_crmentityAccounts.crmid=vtiger_account.accountid
+                                left join vtiger_accountbillads on vtiger_account.accountid=vtiger_accountbillads.accountaddressid
+                                left join vtiger_accountshipads on vtiger_account.accountid=vtiger_accountshipads.accountaddressid
+                                left join vtiger_accountscf on vtiger_account.accountid = vtiger_accountscf.accountid
+                                left join vtiger_account as vtiger_accountAccounts on vtiger_accountAccounts.accountid = vtiger_account.parentid
+                                left join vtiger_users as vtiger_usersAccounts on vtiger_usersAccounts.id = vtiger_crmentityAccounts.smownerid ";
 			}
 			if($secmodule == "Potentials")
 			{
-				$query = "left join  potential on potential.accountid = contactdetails.accountid
-				left join crmentity as crmentityPotentials on crmentityPotentials.crmid=potential.potentialid
-				left join account as accountPotentials on potential.accountid = accountPotentials.accountid
-				left join potentialscf on potentialscf.potentialid = potential.potentialid
-				left join users as usersPotentials on usersPotentials.id = crmentityPotentials.smownerid ";
+				$query = "left join  vtiger_potential on vtiger_potential.accountid = vtiger_contactdetails.accountid
+				left join vtiger_crmentity as vtiger_crmentityPotentials on vtiger_crmentityPotentials.crmid=vtiger_potential.potentialid
+				left join vtiger_account as vtiger_accountPotentials on vtiger_potential.accountid = vtiger_accountPotentials.accountid
+				left join vtiger_potentialscf on vtiger_potentialscf.potentialid = vtiger_potential.potentialid
+				left join vtiger_users as vtiger_usersPotentials on vtiger_usersPotentials.id = vtiger_crmentityPotentials.smownerid ";
 			}
 			if($secmodule == "Quotes")
                         {
-                                $query = "left join quotes on quotes.contactid = contactdetails.contactid
-                                left join crmentity as crmentityQuotes on crmentityQuotes.crmid=quotes.quoteid
-                                left join quotesbillads on quotes.quoteid=quotesbillads.quotebilladdressid
-                                left join quotesshipads on quotes.quoteid=quotesshipads.quoteshipaddressid
-                                left join users as usersQuotes on usersQuotes.id = crmentityQuotes.smownerid
-                                left join users as usersRel1 on usersRel1.id = quotes.inventorymanager
-                                left join potential as potentialRel on potentialRel.potentialid = quotes.potentialid
-                                left join contactdetails as contactdetailsQuotes on contactdetailsQuotes.contactid = quotes.contactid
-                                left join account as accountQuotes on accountQuotes.accountid = quotes.accountid ";
+                                $query = "left join vtiger_quotes on vtiger_quotes.contactid = vtiger_contactdetails.contactid
+                                left join vtiger_crmentity as vtiger_crmentityQuotes on vtiger_crmentityQuotes.crmid=vtiger_quotes.quoteid
+                                left join vtiger_quotesbillads on vtiger_quotes.quoteid=vtiger_quotesbillads.quotebilladdressid
+                                left join vtiger_quotesshipads on vtiger_quotes.quoteid=vtiger_quotesshipads.quoteshipaddressid
+                                left join vtiger_users as vtiger_usersQuotes on vtiger_usersQuotes.id = vtiger_crmentityQuotes.smownerid
+                                left join vtiger_users as vtiger_usersRel1 on vtiger_usersRel1.id = vtiger_quotes.inventorymanager
+                                left join vtiger_potential as vtiger_potentialRel on vtiger_potentialRel.potentialid = vtiger_quotes.potentialid
+                                left join vtiger_contactdetails as vtiger_contactdetailsQuotes on vtiger_contactdetailsQuotes.contactid = vtiger_quotes.contactid
+                                left join vtiger_account as vtiger_accountQuotes on vtiger_accountQuotes.accountid = vtiger_quotes.accountid ";
                         }
                         if($secmodule == "PurchaseOrder")
                         {
-                                $query = "left join purchaseorder on purchaseorder.contactid = contactdetails.contactid
-                                left join crmentity as crmentityPurchaseOrder on crmentityPurchaseOrder.crmid=purchaseorder.purchaseorderid
-                                left join pobillads on purchaseorder.purchaseorderid=pobillads.pobilladdressid
-                                left join poshipads on purchaseorder.purchaseorderid=poshipads.poshipaddressid
-                                left join users as usersPurchaseOrder on usersPurchaseOrder.id = crmentityPurchaseOrder.smownerid
-                                left join vendor as vendorRel on vendorRel.vendorid = purchaseorder.vendorid
-                                left join contactdetails as contactdetailsPurchaseOrder on contactdetailsPurchaseOrder.contactid = purchaseorder.contactid ";
+                                $query = "left join vtiger_purchaseorder on vtiger_purchaseorder.contactid = vtiger_contactdetails.contactid
+                                left join vtiger_crmentity as vtiger_crmentityPurchaseOrder on vtiger_crmentityPurchaseOrder.crmid=vtiger_purchaseorder.purchaseorderid
+                                left join vtiger_pobillads on vtiger_purchaseorder.purchaseorderid=vtiger_pobillads.pobilladdressid
+                                left join vtiger_poshipads on vtiger_purchaseorder.purchaseorderid=vtiger_poshipads.poshipaddressid
+                                left join vtiger_users as vtiger_usersPurchaseOrder on vtiger_usersPurchaseOrder.id = vtiger_crmentityPurchaseOrder.smownerid
+                                left join vtiger_vendor as vtiger_vendorRel on vtiger_vendorRel.vendorid = vtiger_purchaseorder.vendorid
+                                left join vtiger_contactdetails as vtiger_contactdetailsPurchaseOrder on vtiger_contactdetailsPurchaseOrder.contactid = vtiger_purchaseorder.contactid ";
                         }
 
 		}
@@ -699,100 +699,100 @@
 		{
 			if($secmodule == "Potentials")
 			{
-				$query = "left join potential on potential.accountid = account.accountid
-				left join crmentity as crmentityPotentials on crmentityPotentials.crmid=potential.potentialid
-                                left join potentialscf on potentialscf.potentialid = potential.potentialid
-                                left join users as usersPotentials on usersPotentials.id = crmentityPotentials.smownerid ";
+				$query = "left join vtiger_potential on vtiger_potential.accountid = vtiger_account.accountid
+				left join vtiger_crmentity as vtiger_crmentityPotentials on vtiger_crmentityPotentials.crmid=vtiger_potential.potentialid
+                                left join vtiger_potentialscf on vtiger_potentialscf.potentialid = vtiger_potential.potentialid
+                                left join vtiger_users as vtiger_usersPotentials on vtiger_usersPotentials.id = vtiger_crmentityPotentials.smownerid ";
 
 			}
 			if($secmodule == "Contacts")
 			{
-				$query = "left join contactdetails on contactdetails.accountid = account.accountid
-				left join crmentity as crmentityContacts on crmentityContacts.crmid = contactdetails.contactid
-                                left join contactaddress on contactdetails.contactid = contactaddress.contactaddressid
-                                left join contactsubdetails on contactdetails.contactid = contactsubdetails.contactsubscriptionid
-				left join contactdetails as contactdetailsContacts on contactdetailsContacts.contactid = contactdetails.reportsto
-				left join account as accountContacts on accountContacts.accountid = contactdetails.accountid 
-                                left join contactscf on contactdetails.contactid = contactscf.contactid
-                                left join users as usersContacts on usersContacts.id = crmentityContacts.smownerid ";
+				$query = "left join vtiger_contactdetails on vtiger_contactdetails.accountid = vtiger_account.accountid
+				left join vtiger_crmentity as vtiger_crmentityContacts on vtiger_crmentityContacts.crmid = vtiger_contactdetails.contactid
+                                left join vtiger_contactaddress on vtiger_contactdetails.contactid = vtiger_contactaddress.contactaddressid
+                                left join vtiger_contactsubdetails on vtiger_contactdetails.contactid = vtiger_contactsubdetails.contactsubscriptionid
+				left join vtiger_contactdetails as vtiger_contactdetailsContacts on vtiger_contactdetailsContacts.contactid = vtiger_contactdetails.reportsto
+				left join vtiger_account as vtiger_accountContacts on vtiger_accountContacts.accountid = vtiger_contactdetails.accountid 
+                                left join vtiger_contactscf on vtiger_contactdetails.contactid = vtiger_contactscf.contactid
+                                left join vtiger_users as vtiger_usersContacts on vtiger_usersContacts.id = vtiger_crmentityContacts.smownerid ";
 			}
 			if($secmodule == "Quotes")
 			{
-				$query = "left join quotes on quotes.accountid = account.accountid
-                                left join crmentity as crmentityQuotes on crmentityQuotes.crmid=quotes.quoteid
-                                left join quotesbillads on quotes.quoteid=quotesbillads.quotebilladdressid
-                                left join quotesshipads on quotes.quoteid=quotesshipads.quoteshipaddressid
-                                left join users as usersQuotes on usersQuotes.id = crmentityQuotes.smownerid
-                                left join users as usersRel1 on usersRel1.id = quotes.inventorymanager
-                                left join potential as potentialRel on potentialRel.potentialid = quotes.potentialid
-                                left join contactdetails as contactdetailsQuotes on contactdetailsQuotes.contactid = quotes.contactid
-                                left join account as accountQuotes on accountQuotes.accountid = quotes.accountid ";
+				$query = "left join vtiger_quotes on vtiger_quotes.accountid = vtiger_account.accountid
+                                left join vtiger_crmentity as vtiger_crmentityQuotes on vtiger_crmentityQuotes.crmid=vtiger_quotes.quoteid
+                                left join vtiger_quotesbillads on vtiger_quotes.quoteid=vtiger_quotesbillads.quotebilladdressid
+                                left join vtiger_quotesshipads on vtiger_quotes.quoteid=vtiger_quotesshipads.quoteshipaddressid
+                                left join vtiger_users as vtiger_usersQuotes on vtiger_usersQuotes.id = vtiger_crmentityQuotes.smownerid
+                                left join vtiger_users as vtiger_usersRel1 on vtiger_usersRel1.id = vtiger_quotes.inventorymanager
+                                left join vtiger_potential as vtiger_potentialRel on vtiger_potentialRel.potentialid = vtiger_quotes.potentialid
+                                left join vtiger_contactdetails as vtiger_contactdetailsQuotes on vtiger_contactdetailsQuotes.contactid = vtiger_quotes.contactid
+                                left join vtiger_account as vtiger_accountQuotes on vtiger_accountQuotes.accountid = vtiger_quotes.accountid ";
 			}
 			if($secmodule == "PurchaseOrder")
 			{
-				$query = "left join purchaseorder on purchaseorder.accountid = account.accountid
-                                left join crmentity as crmentityPurchaseOrder on crmentityPurchaseOrder.crmid=purchaseorder.purchaseorderid
-                                left join pobillads on purchaseorder.purchaseorderid=pobillads.pobilladdressid
-                                left join poshipads on purchaseorder.purchaseorderid=poshipads.poshipaddressid
-                                left join users as usersPurchaseOrder on usersPurchaseOrder.id = crmentityPurchaseOrder.smownerid
-                                left join vendor as vendorRel on vendorRel.vendorid = purchaseorder.vendorid
-                                left join contactdetails as contactdetailsPurchaseOrder on contactdetailsPurchaseOrder.contactid = purchaseorder.contactid ";
+				$query = "left join vtiger_purchaseorder on vtiger_purchaseorder.accountid = vtiger_account.accountid
+                                left join vtiger_crmentity as vtiger_crmentityPurchaseOrder on vtiger_crmentityPurchaseOrder.crmid=vtiger_purchaseorder.purchaseorderid
+                                left join vtiger_pobillads on vtiger_purchaseorder.purchaseorderid=vtiger_pobillads.pobilladdressid
+                                left join vtiger_poshipads on vtiger_purchaseorder.purchaseorderid=vtiger_poshipads.poshipaddressid
+                                left join vtiger_users as vtiger_usersPurchaseOrder on vtiger_usersPurchaseOrder.id = vtiger_crmentityPurchaseOrder.smownerid
+                                left join vtiger_vendor as vtiger_vendorRel on vtiger_vendorRel.vendorid = vtiger_purchaseorder.vendorid
+                                left join vtiger_contactdetails as vtiger_contactdetailsPurchaseOrder on vtiger_contactdetailsPurchaseOrder.contactid = vtiger_purchaseorder.contactid ";
 			}
 			if($secmodule == "Invoice")
 			{
-				$query = "left join invoice on invoice.accountid = account.accountid
-                                left join crmentity as crmentityInvoice on crmentityInvoice.crmid=invoice.invoiceid
-                                left join invoicebillads on invoice.invoiceid=invoicebillads.invoicebilladdressid
-                                left join invoiceshipads on invoice.invoiceid=invoiceshipads.invoiceshipaddressid
-                                left join users as usersInvoice on usersInvoice.id = crmentityInvoice.smownerid
-                                left join account as accountInvoice on accountInvoice.accountid = invoice.accountid ";
+				$query = "left join vtiger_invoice on vtiger_invoice.accountid = vtiger_account.accountid
+                                left join vtiger_crmentity as vtiger_crmentityInvoice on vtiger_crmentityInvoice.crmid=vtiger_invoice.invoiceid
+                                left join vtiger_invoicebillads on vtiger_invoice.invoiceid=vtiger_invoicebillads.invoicebilladdressid
+                                left join vtiger_invoiceshipads on vtiger_invoice.invoiceid=vtiger_invoiceshipads.invoiceshipaddressid
+                                left join vtiger_users as vtiger_usersInvoice on vtiger_usersInvoice.id = vtiger_crmentityInvoice.smownerid
+                                left join vtiger_account as vtiger_accountInvoice on vtiger_accountInvoice.accountid = vtiger_invoice.accountid ";
 			}
 			if($secmodule == "Products")
 			{
-				$query = "left join seproductsrel on seproductsrel.crmid = account.accountid
-				left join products on products.productid = seproductsrel.productid
-                                left join crmentity as crmentityProducts on crmentityProducts.crmid=products.productid
-                                left join productcf on products.productid = productcf.productid
-                                left join users as usersProducts on usersProducts.id = crmentityProducts.smownerid
-                                left join contactdetails as contactdetailsProducts on contactdetailsProducts.contactid = products.contactid
-                                left join vendor as vendorRel on vendorRel.vendorid = products.vendor_id
-                                left join crmentity as crmentityRel on crmentityRel.crmid = seproductsrel.crmid
-                                left join account as accountRel on accountRel.accountid=crmentityRel.crmid
-                                left join leaddetails as leaddetailsRel on leaddetailsRel.leadid = crmentityRel.crmid
-                                left join potential as potentialRel on potentialRel.potentialid = crmentityRel.crmid ";
+				$query = "left join vtiger_seproductsrel on vtiger_seproductsrel.crmid = vtiger_account.accountid
+				left join vtiger_products on vtiger_products.productid = vtiger_seproductsrel.productid
+                                left join vtiger_crmentity as vtiger_crmentityProducts on vtiger_crmentityProducts.crmid=vtiger_products.productid
+                                left join vtiger_productcf on vtiger_products.productid = vtiger_productcf.productid
+                                left join vtiger_users as vtiger_usersProducts on vtiger_usersProducts.id = vtiger_crmentityProducts.smownerid
+                                left join vtiger_contactdetails as vtiger_contactdetailsProducts on vtiger_contactdetailsProducts.contactid = vtiger_products.contactid
+                                left join vtiger_vendor as vtiger_vendorRel on vtiger_vendorRel.vendorid = vtiger_products.vendor_id
+                                left join vtiger_crmentity as vtiger_crmentityRel on vtiger_crmentityRel.crmid = vtiger_seproductsrel.crmid
+                                left join vtiger_account as vtiger_accountRel on vtiger_accountRel.accountid=crmentityRel.crmid
+                                left join vtiger_leaddetails as vtiger_leaddetailsRel on vtiger_leaddetailsRel.leadid = vtiger_crmentityRel.crmid
+                                left join vtiger_potential as vtiger_potentialRel on vtiger_potentialRel.potentialid = vtiger_crmentityRel.crmid ";
 			}
 		}
 		if($module == "Quotes")
 		{
 			if($secmodule == "Accounts")
                         {
-                                $query = "left join account on account.accountid = quotes.accountid
-                                left join crmentity as crmentityAccounts on crmentityAccounts.crmid=account.accountid
-                                left join accountbillads on account.accountid=accountbillads.accountaddressid
-                                left join accountshipads on account.accountid=accountshipads.accountaddressid
-                                left join accountscf on account.accountid = accountscf.accountid
-                                left join account as accountAccounts on accountAccounts.accountid = account.parentid
-                                left join users as usersAccounts on usersAccounts.id = crmentityAccounts.smownerid ";
+                                $query = "left join vtiger_account on vtiger_account.accountid = vtiger_quotes.accountid
+                                left join vtiger_crmentity as vtiger_crmentityAccounts on vtiger_crmentityAccounts.crmid=vtiger_account.accountid
+                                left join vtiger_accountbillads on vtiger_account.accountid=vtiger_accountbillads.accountaddressid
+                                left join vtiger_accountshipads on vtiger_account.accountid=vtiger_accountshipads.accountaddressid
+                                left join vtiger_accountscf on vtiger_account.accountid = vtiger_accountscf.accountid
+                                left join vtiger_account as vtiger_accountAccounts on vtiger_accountAccounts.accountid = vtiger_account.parentid
+                                left join vtiger_users as vtiger_usersAccounts on vtiger_usersAccounts.id = vtiger_crmentityAccounts.smownerid ";
                         }
 			if($secmodule == "Potentials")
                         {
-                                $query = "left join potential on potential.potentialid = quotes.potentialid
-                                left join crmentity as crmentityPotentials on crmentityPotentials.crmid=potential.potentialid 
-				left join potentialscf on potentialscf.potentialid = potential.potentialid
-                                left join users as usersPotentials on usersPotentials.id = crmentityPotentials.smownerid ";
+                                $query = "left join vtiger_potential on vtiger_potential.potentialid = vtiger_quotes.potentialid
+                                left join vtiger_crmentity as vtiger_crmentityPotentials on vtiger_crmentityPotentials.crmid=vtiger_potential.potentialid 
+				left join vtiger_potentialscf on vtiger_potentialscf.potentialid = vtiger_potential.potentialid
+                                left join vtiger_users as vtiger_usersPotentials on vtiger_usersPotentials.id = vtiger_crmentityPotentials.smownerid ";
 
                         }
 			if($secmodule == "Contacts")
                         {
-                                $query = "left join contactdetails on contactdetails.contactid = quotes.contactid
-                                left join crmentity as crmentityContacts on crmentityContacts.crmid = contactdetails.contactid
-                                left join contactaddress on contactdetails.contactid = contactaddress.contactaddressid
-                                left join contactsubdetails on contactdetails.contactid = contactsubdetails.contactsubscriptionid
-                                left join contactdetails as contactdetailsContacts on contactdetailsContacts.contactid = contactdetails.reportsto
-                                left join account as accountContacts on accountContacts.accountid = contactdetails.accountid
-
-                                left join contactscf on contactdetails.contactid = contactscf.contactid
-                                left join users as usersContacts on usersContacts.id = crmentityContacts.smownerid ";
+                                $query = "left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_quotes.contactid
+                                left join vtiger_crmentity as vtiger_crmentityContacts on vtiger_crmentityContacts.crmid = vtiger_contactdetails.contactid
+                                left join vtiger_contactaddress on vtiger_contactdetails.contactid = vtiger_contactaddress.contactaddressid
+                                left join vtiger_contactsubdetails on vtiger_contactdetails.contactid = vtiger_contactsubdetails.contactsubscriptionid
+                                left join vtiger_contactdetails as vtiger_contactdetailsContacts on vtiger_contactdetailsContacts.contactid = vtiger_contactdetails.reportsto
+                                left join vtiger_account as vtiger_accountContacts on vtiger_accountContacts.accountid = vtiger_contactdetails.accountid
+
+                                left join vtiger_contactscf on vtiger_contactdetails.contactid = vtiger_contactscf.contactid
+                                left join vtiger_users as vtiger_usersContacts on vtiger_usersContacts.id = vtiger_crmentityContacts.smownerid ";
                         }
 
 		}
@@ -800,62 +800,62 @@
 		{
 			if($secmodule == "Accounts")
                         {
-                                $query = "left join account on account.accountid = purchaseorder.accountid
-                                left join crmentity as crmentityAccounts on crmentityAccounts.crmid=account.accountid
-                                left join accountbillads on account.accountid=accountbillads.accountaddressid
-                                left join accountshipads on account.accountid=accountshipads.accountaddressid
-                                left join accountscf on account.accountid = accountscf.accountid
-                                left join account as accountAccounts on accountAccounts.accountid = account.parentid
-                                left join users as usersAccounts on usersAccounts.id = crmentityAccounts.smownerid ";
+                                $query = "left join vtiger_account on vtiger_account.accountid = vtiger_purchaseorder.accountid
+                                left join vtiger_crmentity as vtiger_crmentityAccounts on vtiger_crmentityAccounts.crmid=vtiger_account.accountid
+                                left join vtiger_accountbillads on vtiger_account.accountid=vtiger_accountbillads.accountaddressid
+                                left join vtiger_accountshipads on vtiger_account.accountid=vtiger_accountshipads.accountaddressid
+                                left join vtiger_accountscf on vtiger_account.accountid = vtiger_accountscf.accountid
+                                left join vtiger_account as vtiger_accountAccounts on vtiger_accountAccounts.accountid = vtiger_account.parentid
+                                left join vtiger_users as vtiger_usersAccounts on vtiger_usersAccounts.id = vtiger_crmentityAccounts.smownerid ";
                         }
 			if($secmodule == "Contacts")
 			{
-				$query = "left join contactdetails on contactdetails.contactid = purchaseorder.contactid
-                                left join crmentity as crmentityContacts on crmentityContacts.crmid = contactdetails.contactid
-                                left join contactaddress on contactdetails.contactid = contactaddress.contactaddressid
-                                left join contactsubdetails on contactdetails.contactid = contactsubdetails.contactsubscriptionid
-                                left join contactdetails as contactdetailsContacts on contactdetailsContacts.contactid = contactdetails.reportsto
-                                left join account as accountContacts on accountContacts.accountid = contactdetails.accountid
-
-                                left join contactscf on contactdetails.contactid = contactscf.contactid
-                                left join users as usersContacts on usersContacts.id = crmentityContacts.smownerid ";
+				$query = "left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_purchaseorder.contactid
+                                left join vtiger_crmentity as vtiger_crmentityContacts on vtiger_crmentityContacts.crmid = vtiger_contactdetails.contactid
+                                left join vtiger_contactaddress on vtiger_contactdetails.contactid = vtiger_contactaddress.contactaddressid
+                                left join vtiger_contactsubdetails on vtiger_contactdetails.contactid = vtiger_contactsubdetails.contactsubscriptionid
+                                left join vtiger_contactdetails as vtiger_contactdetailsContacts on vtiger_contactdetailsContacts.contactid = vtiger_contactdetails.reportsto
+                                left join vtiger_account as vtiger_accountContacts on vtiger_accountContacts.accountid = vtiger_contactdetails.accountid
+
+                                left join vtiger_contactscf on vtiger_contactdetails.contactid = vtiger_contactscf.contactid
+                                left join vtiger_users as vtiger_usersContacts on vtiger_usersContacts.id = vtiger_crmentityContacts.smownerid ";
 			}
 		}
 		if($module == "Invoice")
 		{
 			if($secmodule == "Accounts")
 			{
-				$query = "left join account on account.accountid = invoice.accountid
-                                left join crmentity as crmentityAccounts on crmentityAccounts.crmid=account.accountid
-                                left join accountbillads on account.accountid=accountbillads.accountaddressid
-                                left join accountshipads on account.accountid=accountshipads.accountaddressid
-                                left join accountscf on account.accountid = accountscf.accountid
-                                left join account as accountAccounts on accountAccounts.accountid = account.parentid
-                                left join users as usersAccounts on usersAccounts.id = crmentityAccounts.smownerid ";
+				$query = "left join vtiger_account on vtiger_account.accountid = vtiger_invoice.accountid
+                                left join vtiger_crmentity as vtiger_crmentityAccounts on vtiger_crmentityAccounts.crmid=vtiger_account.accountid
+                                left join vtiger_accountbillads on vtiger_account.accountid=vtiger_accountbillads.accountaddressid
+                                left join vtiger_accountshipads on vtiger_account.accountid=vtiger_accountshipads.accountaddressid
+                                left join vtiger_accountscf on vtiger_account.accountid = vtiger_accountscf.accountid
+                                left join vtiger_account as vtiger_accountAccounts on vtiger_accountAccounts.accountid = vtiger_account.parentid
+                                left join vtiger_users as vtiger_usersAccounts on vtiger_usersAccounts.id = vtiger_crmentityAccounts.smownerid ";
 			}
 		}
 		if($module == "Products")
 		{
 			if($secmodule == "Accounts")
                         {
-                                $query = "left join account on account.accountid = crmentityRel.crmid
-                                left join crmentity as crmentityAccounts on crmentityAccounts.crmid=account.accountid
-                                left join accountbillads on account.accountid=accountbillads.accountaddressid
-                                left join accountshipads on account.accountid=accountshipads.accountaddressid
-                                left join accountscf on account.accountid = accountscf.accountid
-                                left join account as accountAccounts on accountAccounts.accountid = account.parentid
-                                left join users as usersAccounts on usersAccounts.id = crmentityAccounts.smownerid ";
+                                $query = "left join vtiger_account on vtiger_account.accountid = vtiger_crmentityRel.crmid
+                                left join vtiger_crmentity as vtiger_crmentityAccounts on vtiger_crmentityAccounts.crmid=vtiger_account.accountid
+                                left join vtiger_accountbillads on vtiger_account.accountid=vtiger_accountbillads.accountaddressid
+                                left join vtiger_accountshipads on vtiger_account.accountid=vtiger_accountshipads.accountaddressid
+                                left join vtiger_accountscf on vtiger_account.accountid = vtiger_accountscf.accountid
+                                left join vtiger_account as vtiger_accountAccounts on vtiger_accountAccounts.accountid = vtiger_account.parentid
+                                left join vtiger_users as vtiger_usersAccounts on vtiger_usersAccounts.id = vtiger_crmentityAccounts.smownerid ";
                         }
 			if($secmodule == "Contacts")
                         {
-                                $query = "left join contactdetails on contactdetails.contactid = products.contactid
-                                left join crmentity as crmentityContacts on crmentityContacts.crmid = contactdetails.contactid
-                                left join contactaddress on contactdetails.contactid = contactaddress.contactaddressid
-                                left join contactsubdetails on contactdetails.contactid = contactsubdetails.contactsubscriptionid
-                                left join contactdetails as contactdetailsContacts on contactdetailsContacts.contactid = contactdetails.reportsto
-                                left join account as accountContacts on accountContacts.accountid = contactdetails.accountid
-                                left join contactscf on contactdetails.contactid = contactscf.contactid
-                                left join users as usersContacts on usersContacts.id = crmentityContacts.smownerid ";
+                                $query = "left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_products.contactid
+                                left join vtiger_crmentity as vtiger_crmentityContacts on vtiger_crmentityContacts.crmid = vtiger_contactdetails.contactid
+                                left join vtiger_contactaddress on vtiger_contactdetails.contactid = vtiger_contactaddress.contactaddressid
+                                left join vtiger_contactsubdetails on vtiger_contactdetails.contactid = vtiger_contactsubdetails.contactsubscriptionid
+                                left join vtiger_contactdetails as vtiger_contactdetailsContacts on vtiger_contactdetailsContacts.contactid = vtiger_contactdetails.reportsto
+                                left join vtiger_account as vtiger_accountContacts on vtiger_accountContacts.accountid = vtiger_contactdetails.accountid
+                                left join vtiger_contactscf on vtiger_contactdetails.contactid = vtiger_contactscf.contactid
+                                left join vtiger_users as vtiger_usersContacts on vtiger_usersContacts.id = vtiger_crmentityContacts.smownerid ";
 
                         }
 
@@ -864,68 +864,68 @@
 		{
 			if($secmodule == "Accounts")
                         {
-                                $query = "left join account on account.accountid = potential.accountid
-                                left join crmentity as crmentityAccounts on crmentityAccounts.crmid=account.accountid
-                                left join accountbillads on account.accountid=accountbillads.accountaddressid
-                                left join accountshipads on account.accountid=accountshipads.accountaddressid
-                                left join accountscf on account.accountid = accountscf.accountid
-                                left join account as accountAccounts on accountAccounts.accountid = account.parentid
-                                left join users as usersAccounts on usersAccounts.id = crmentityAccounts.smownerid ";
+                                $query = "left join vtiger_account on vtiger_account.accountid = vtiger_potential.accountid
+                                left join vtiger_crmentity as vtiger_crmentityAccounts on vtiger_crmentityAccounts.crmid=vtiger_account.accountid
+                                left join vtiger_accountbillads on vtiger_account.accountid=vtiger_accountbillads.accountaddressid
+                                left join vtiger_accountshipads on vtiger_account.accountid=vtiger_accountshipads.accountaddressid
+                                left join vtiger_accountscf on vtiger_account.accountid = vtiger_accountscf.accountid
+                                left join vtiger_account as vtiger_accountAccounts on vtiger_accountAccounts.accountid = vtiger_account.parentid
+                                left join vtiger_users as vtiger_usersAccounts on vtiger_usersAccounts.id = vtiger_crmentityAccounts.smownerid ";
                         }
 			if($secmodule == "Contacts")
 			{
-				$query = "left join contactdetails on contactdetails.accountid = potential.accountid
-				left join crmentity as crmentityContacts on crmentityContacts.crmid = contactdetails.contactid
-				left join contactaddress on contactdetails.contactid = contactaddress.contactaddressid
-				left join contactsubdetails on contactdetails.contactid = contactsubdetails.contactsubscriptionid
-				left join contactdetails as contactdetailsContacts on contactdetailsContacts.contactid = contactdetails.reportsto
-				left join account as accountContacts on accountContacts.accountid = contactdetails.accountid
-				left join contactscf on contactdetails.contactid = contactscf.contactid
-				left join users as usersContacts on usersContacts.id = crmentityContacts.smownerid ";
+				$query = "left join vtiger_contactdetails on vtiger_contactdetails.accountid = vtiger_potential.accountid
+				left join vtiger_crmentity as vtiger_crmentityContacts on vtiger_crmentityContacts.crmid = vtiger_contactdetails.contactid
+				left join vtiger_contactaddress on vtiger_contactdetails.contactid = vtiger_contactaddress.contactaddressid
+				left join vtiger_contactsubdetails on vtiger_contactdetails.contactid = vtiger_contactsubdetails.contactsubscriptionid
+				left join vtiger_contactdetails as vtiger_contactdetailsContacts on vtiger_contactdetailsContacts.contactid = vtiger_contactdetails.reportsto
+				left join vtiger_account as vtiger_accountContacts on vtiger_accountContacts.accountid = vtiger_contactdetails.accountid
+				left join vtiger_contactscf on vtiger_contactdetails.contactid = vtiger_contactscf.contactid
+				left join vtiger_users as vtiger_usersContacts on vtiger_usersContacts.id = vtiger_crmentityContacts.smownerid ";
 
 			}
 			if($secmodule == "Quotes")
 			{
-				$query = "left join quotes on quotes.potentialid = potential.potentialid
-                                left join crmentity as crmentityQuotes on crmentityQuotes.crmid=quotes.quoteid
-                                left join quotesbillads on quotes.quoteid=quotesbillads.quotebilladdressid
-                                left join quotesshipads on quotes.quoteid=quotesshipads.quoteshipaddressid
-                                left join users as usersQuotes on usersQuotes.id = crmentityQuotes.smownerid
-                                left join users as usersRel1 on usersRel1.id = quotes.inventorymanager
-                                left join potential as potentialRel on potentialRel.potentialid = quotes.potentialid
-                                left join contactdetails as contactdetailsQuotes on contactdetailsQuotes.contactid = quotes.contactid
-                                left join account as accountQuotes on accountQuotes.accountid = quotes.accountid ";
+				$query = "left join vtiger_quotes on vtiger_quotes.potentialid = vtiger_potential.potentialid
+                                left join vtiger_crmentity as vtiger_crmentityQuotes on vtiger_crmentityQuotes.crmid=vtiger_quotes.quoteid
+                                left join vtiger_quotesbillads on vtiger_quotes.quoteid=vtiger_quotesbillads.quotebilladdressid
+                                left join vtiger_quotesshipads on vtiger_quotes.quoteid=vtiger_quotesshipads.quoteshipaddressid
+                                left join vtiger_users as vtiger_usersQuotes on vtiger_usersQuotes.id = vtiger_crmentityQuotes.smownerid
+                                left join vtiger_users as vtiger_usersRel1 on vtiger_usersRel1.id = vtiger_quotes.inventorymanager
+                                left join vtiger_potential as vtiger_potentialRel on vtiger_potentialRel.potentialid = vtiger_quotes.potentialid
+                                left join vtiger_contactdetails as vtiger_contactdetailsQuotes on vtiger_contactdetailsQuotes.contactid = vtiger_quotes.contactid
+                                left join vtiger_account as vtiger_accountQuotes on vtiger_accountQuotes.accountid = vtiger_quotes.accountid ";
 			}
 		}
 		if($module == "HelpDesk")
 		{
 			if($secmodule == "Products")
 			{
-				$query = "left join products on products.productid = troubletickets.product_id
-                                left join crmentity as crmentityProducts on crmentityProducts.crmid=products.productid
-                                left join productcf on products.productid = productcf.productid
-                                left join users as usersProducts on usersProducts.id = crmentityProducts.smownerid
-																left join contactdetails as contactdetailsProducts on contactdetailsProducts.contactid = products.contactid 
-                                left join vendor as vendorRel on vendorRel.vendorid = products.vendor_id
-                                left join seproductsrel on seproductsrel.productid = products.productid
-                                left join crmentity as crmentityRelProducts on crmentityRelProducts.crmid = seproductsrel.crmid
-                                left join account as accountRelProducts on accountRelProducts.accountid=seproductsrel.crmid
-                                left join leaddetails as leaddetailsRelProducts on leaddetailsRelProducts.leadid = seproductsrel.crmid
-                                left join potential as potentialRelProducts on potentialRelProducts.potentialid = seproductsrel.crmid ";
+				$query = "left join vtiger_products on vtiger_products.productid = vtiger_troubletickets.product_id
+                                left join vtiger_crmentity as vtiger_crmentityProducts on vtiger_crmentityProducts.crmid=vtiger_products.productid
+                                left join vtiger_productcf on vtiger_products.productid = vtiger_productcf.productid
+                                left join vtiger_users as vtiger_usersProducts on vtiger_usersProducts.id = vtiger_crmentityProducts.smownerid
+																left join vtiger_contactdetails as vtiger_contactdetailsProducts on vtiger_contactdetailsProducts.contactid = vtiger_products.contactid 
+                                left join vtiger_vendor as vtiger_vendorRel on vtiger_vendorRel.vendorid = vtiger_products.vendor_id
+                                left join vtiger_seproductsrel on vtiger_seproductsrel.productid = vtiger_products.productid
+                                left join vtiger_crmentity as vtiger_crmentityRelProducts on vtiger_crmentityRelProducts.crmid = vtiger_seproductsrel.crmid
+                                left join vtiger_account as vtiger_accountRelProducts on vtiger_accountRelProducts.accountid=vtiger_seproductsrel.crmid
+                                left join vtiger_leaddetails as vtiger_leaddetailsRelProducts on vtiger_leaddetailsRelProducts.leadid = vtiger_seproductsrel.crmid
+                                left join vtiger_potential as vtiger_potentialRelProducts on vtiger_potentialRelProducts.potentialid = vtiger_seproductsrel.crmid ";
 			}
 		}
 		if($module == "Activities")
 		{
 			if($secmodule == "Contacts")
 			{
-                                $query = "left join contactdetails on contactdetails.contactid = cntactivityrel.contactid 
-                                left join crmentity as crmentityContacts on crmentityContacts.crmid = contactdetails.contactid
-                                left join contactaddress on contactdetails.contactid = contactaddress.contactaddressid
-                                left join contactsubdetails on contactdetails.contactid = contactsubdetails.contactsubscriptionid
-                                left join contactdetails as contactdetailsContacts on contactdetailsContacts.contactid = contactdetails.reportsto
-                                left join account as accountContacts on accountContacts.accountid = contactdetails.accountid
-                                left join contactscf on contactdetails.contactid = contactscf.contactid
-                                left join users as usersContacts on usersContacts.id = crmentityContacts.smownerid ";
+                                $query = "left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid 
+                                left join vtiger_crmentity as vtiger_crmentityContacts on vtiger_crmentityContacts.crmid = vtiger_contactdetails.contactid
+                                left join vtiger_contactaddress on vtiger_contactdetails.contactid = vtiger_contactaddress.contactaddressid
+                                left join vtiger_contactsubdetails on vtiger_contactdetails.contactid = vtiger_contactsubdetails.contactsubscriptionid
+                                left join vtiger_contactdetails as vtiger_contactdetailsContacts on vtiger_contactdetailsContacts.contactid = vtiger_contactdetails.reportsto
+                                left join vtiger_account as vtiger_accountContacts on vtiger_accountContacts.accountid = vtiger_contactdetails.accountid
+                                left join vtiger_contactscf on vtiger_contactdetails.contactid = vtiger_contactscf.contactid
+                                left join vtiger_users as vtiger_usersContacts on vtiger_usersContacts.id = vtiger_crmentityContacts.smownerid ";
 			}
 		}
 		$log->info("ReportRun :: Successfully returned getRelatedModulesQuery".$secmodule);
@@ -936,143 +936,143 @@
 		global $log;
 		if($module == "Leads")
 		{
-			$query = "from leaddetails 
-				inner join crmentity as crmentityLeads on crmentityLeads.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 users as usersLeads on usersLeads.id = crmentityLeads.smownerid
-				where crmentityLeads.deleted=0 and leaddetails.converted=0";
+			$query = "from vtiger_leaddetails 
+				inner join vtiger_crmentity as vtiger_crmentityLeads on vtiger_crmentityLeads.crmid=vtiger_leaddetails.leadid 
+				inner join vtiger_leadsubdetails on vtiger_leadsubdetails.leadsubscriptionid=vtiger_leaddetails.leadid 
+				inner join vtiger_leadaddress on vtiger_leadaddress.leadaddressid=vtiger_leadsubdetails.leadsubscriptionid 
+				inner join vtiger_leadscf on vtiger_leaddetails.leadid = vtiger_leadscf.leadid 
+				left join vtiger_users as vtiger_usersLeads on vtiger_usersLeads.id = vtiger_crmentityLeads.smownerid
+				where vtiger_crmentityLeads.deleted=0 and vtiger_leaddetails.converted=0";
 		}
 
 		if($module == "Accounts")
                 {
-			$query = "from account 
-				inner join crmentity as crmentityAccounts on crmentityAccounts.crmid=account.accountid 
-				inner join accountbillads on account.accountid=accountbillads.accountaddressid 
-				inner join accountshipads on account.accountid=accountshipads.accountaddressid 
-				inner join accountscf on account.accountid = accountscf.accountid 
-				left join account as accountAccounts on accountAccounts.accountid = account.parentid
-				left join users as usersAccounts on usersAccounts.id = crmentityAccounts.smownerid
+			$query = "from vtiger_account 
+				inner join vtiger_crmentity as vtiger_crmentityAccounts on vtiger_crmentityAccounts.crmid=vtiger_account.accountid 
+				inner join vtiger_accountbillads on vtiger_account.accountid=vtiger_accountbillads.accountaddressid 
+				inner join vtiger_accountshipads on vtiger_account.accountid=vtiger_accountshipads.accountaddressid 
+				inner join vtiger_accountscf on vtiger_account.accountid = vtiger_accountscf.accountid 
+				left join vtiger_account as vtiger_accountAccounts on vtiger_accountAccounts.accountid = vtiger_account.parentid
+				left join vtiger_users as vtiger_usersAccounts on vtiger_usersAccounts.id = vtiger_crmentityAccounts.smownerid
 				".$this->getRelatedModulesQuery($module,$this->secondarymodule)."
-				where crmentityAccounts.deleted=0 ";
+				where vtiger_crmentityAccounts.deleted=0 ";
 		}
 
 		if($module == "Contacts")
                 {
-			$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
-				left join account as accountContacts on accountContacts.accountid = contactdetails.accountid 
-				left join users as usersContacts on usersContacts.id = crmentityContacts.smownerid
+			$query = "from vtiger_contactdetails
+				inner join vtiger_crmentity as vtiger_crmentityContacts on vtiger_crmentityContacts.crmid = vtiger_contactdetails.contactid 
+				inner join vtiger_contactaddress on vtiger_contactdetails.contactid = vtiger_contactaddress.contactaddressid 
+				inner join vtiger_customerdetails on vtiger_customerdetails.customerid = vtiger_contactdetails.contactid
+				inner join vtiger_contactsubdetails on vtiger_contactdetails.contactid = vtiger_contactsubdetails.contactsubscriptionid 
+				inner join vtiger_contactscf on vtiger_contactdetails.contactid = vtiger_contactscf.contactid 
+				left join vtiger_contactdetails as vtiger_contactdetailsContacts on vtiger_contactdetailsContacts.contactid = vtiger_contactdetails.reportsto
+				left join vtiger_account as vtiger_accountContacts on vtiger_accountContacts.accountid = vtiger_contactdetails.accountid 
+				left join vtiger_users as vtiger_usersContacts on vtiger_usersContacts.id = vtiger_crmentityContacts.smownerid
 				".$this->getRelatedModulesQuery($module,$this->secondarymodule)." 
-				where crmentityContacts.deleted=0";
+				where vtiger_crmentityContacts.deleted=0";
 		}
 
 		if($module == "Potentials")
 		{
-			$query = "from potential 
-				inner join crmentity as crmentityPotentials on crmentityPotentials.crmid=potential.potentialid 
-				inner join account as accountPotentials on potential.accountid = accountPotentials.accountid 
-				inner join potentialscf on potentialscf.potentialid = potential.potentialid
-				left join users as usersPotentials on usersPotentials.id = crmentityPotentials.smownerid  
+			$query = "from vtiger_potential 
+				inner join vtiger_crmentity as vtiger_crmentityPotentials on vtiger_crmentityPotentials.crmid=vtiger_potential.potentialid 
+				inner join vtiger_account as vtiger_accountPotentials on vtiger_potential.accountid = vtiger_accountPotentials.accountid 
+				inner join vtiger_potentialscf on vtiger_potentialscf.potentialid = vtiger_potential.potentialid
+				left join vtiger_users as vtiger_usersPotentials on vtiger_usersPotentials.id = vtiger_crmentityPotentials.smownerid  
 				".$this->getRelatedModulesQuery($module,$this->secondarymodule)."
-				where crmentityPotentials.deleted=0 ";
+				where vtiger_crmentityPotentials.deleted=0 ";
 		}
 		
 		if($module == "Products")
 		{
-			$query = "from products 
-				inner join crmentity as crmentityProducts on crmentityProducts.crmid=products.productid 
-				left join productcf on products.productid = productcf.productid 
-				left join users as usersProducts on usersProducts.id = crmentityProducts.smownerid 
-				left join contactdetails as contactdetailsProducts on contactdetailsProducts.contactid = products.contactid
-				left join vendor as vendorRel on vendorRel.vendorid = products.vendor_id  
-				left join seproductsrel on seproductsrel.productid = products.productid 
-				left join crmentity as crmentityRelProducts on crmentityRelProducts.crmid = seproductsrel.crmid 
-				left join account as accountRelProducts on accountRelProducts.accountid=crmentityRelProducts.crmid 
-				left join leaddetails as leaddetailsRelProducts on leaddetailsRelProducts.leadid = crmentityRelProducts.crmid 
-				left join potential as potentialRelProducts on potentialRelProducts.potentialid = crmentityRelProducts.crmid 
+			$query = "from vtiger_products 
+				inner join vtiger_crmentity as vtiger_crmentityProducts on vtiger_crmentityProducts.crmid=vtiger_products.productid 
+				left join vtiger_productcf on vtiger_products.productid = vtiger_productcf.productid 
+				left join vtiger_users as vtiger_usersProducts on vtiger_usersProducts.id = vtiger_crmentityProducts.smownerid 
+				left join vtiger_contactdetails as vtiger_contactdetailsProducts on vtiger_contactdetailsProducts.contactid = vtiger_products.contactid
+				left join vtiger_vendor as vtiger_vendorRel on vtiger_vendorRel.vendorid = vtiger_products.vendor_id  
+				left join vtiger_seproductsrel on vtiger_seproductsrel.productid = vtiger_products.productid 
+				left join vtiger_crmentity as vtiger_crmentityRelProducts on vtiger_crmentityRelProducts.crmid = vtiger_seproductsrel.crmid 
+				left join vtiger_account as vtiger_accountRelProducts on vtiger_accountRelProducts.accountid=crmentityRelProducts.crmid 
+				left join vtiger_leaddetails as vtiger_leaddetailsRelProducts on vtiger_leaddetailsRelProducts.leadid = vtiger_crmentityRelProducts.crmid 
+				left join vtiger_potential as vtiger_potentialRelProducts on vtiger_potentialRelProducts.potentialid = vtiger_crmentityRelProducts.crmid 
 				".$this->getRelatedModulesQuery($module,$this->secondarymodule)."
-				where crmentityProducts.deleted=0 ";
+				where vtiger_crmentityProducts.deleted=0 ";
 		}
 
 		if($module == "HelpDesk")
 		{
-			$query = "from troubletickets 
-				inner join crmentity as crmentityHelpDesk 
-				on crmentityHelpDesk.crmid=troubletickets.ticketid 
-				inner join ticketcf on ticketcf.ticketid = troubletickets.ticketid
-        left join crmentity as crmentityRelHelpDesk on crmentityRelHelpDesk.crmid = troubletickets.parent_id
-				left join account as accountRelHelpDesk on accountRelHelpDesk.accountid=crmentityRelHelpDesk.crmid 
-				left join contactdetails as contactdetailsRelHelpDesk on contactdetailsRelHelpDesk.contactid= crmentityRelHelpDesk.crmid
-				left join products as productsRel on productsRel.productid = crmentityRelHelpDesk.crmid
-				left join users as usersHelpDesk on crmentityHelpDesk.smownerid=usersHelpDesk.id 
+			$query = "from vtiger_troubletickets 
+				inner join vtiger_crmentity as vtiger_crmentityHelpDesk 
+				on vtiger_crmentityHelpDesk.crmid=vtiger_troubletickets.ticketid 
+				inner join vtiger_ticketcf on vtiger_ticketcf.ticketid = vtiger_troubletickets.ticketid
+        left join vtiger_crmentity as vtiger_crmentityRelHelpDesk on vtiger_crmentityRelHelpDesk.crmid = vtiger_troubletickets.parent_id
+				left join vtiger_account as vtiger_accountRelHelpDesk on vtiger_accountRelHelpDesk.accountid=crmentityRelHelpDesk.crmid 
+				left join vtiger_contactdetails as vtiger_contactdetailsRelHelpDesk on vtiger_contactdetailsRelHelpDesk.contactid= vtiger_crmentityRelHelpDesk.crmid
+				left join vtiger_products as vtiger_productsRel on vtiger_productsRel.productid = vtiger_crmentityRelHelpDesk.crmid
+				left join vtiger_users as vtiger_usersHelpDesk on vtiger_crmentityHelpDesk.smownerid=usersHelpDesk.id 
 				".$this->getRelatedModulesQuery($module,$this->secondarymodule)."
-				where crmentityHelpDesk.deleted=0 ";
+				where vtiger_crmentityHelpDesk.deleted=0 ";
 		}
 
 		if($module == "Activities")
 		{
-			$query = "from activity 
-				inner join crmentity as crmentityActivities on crmentityActivities.crmid=activity.activityid 
-				left join cntactivityrel on cntactivityrel.activityid= activity.activityid 
-				left join contactdetails as contactdetailsActivities on contactdetailsActivities.contactid= cntactivityrel.contactid
-				left join users as usersActivities on usersActivities.id = crmentityActivities.smownerid
-				left join seactivityrel on seactivityrel.activityid = activity.activityid
-				left join crmentity as crmentityRelActivities on crmentityRelActivities.crmid = seactivityrel.crmid
-				left join account as accountRelActivities on accountRelActivities.accountid=crmentityRelActivities.crmid
-				left join leaddetails as leaddetailsRelActivities on leaddetailsRelActivities.leadid = crmentityRelActivities.crmid
-				left join potential as potentialRelActivities on potentialRelActivities.potentialid = crmentityRelActivities.crmid
-				left join quotes as quotesRelActivities on quotesRelActivities.quoteid = crmentityRelActivities.crmid
-				left join purchaseorder as purchaseorderRelActivities on purchaseorderRelActivities.purchaseorderid = crmentityRelActivities.crmid
-				left join invoice as invoiceRelActivities on invoiceRelActivities.invoiceid = crmentityRelActivities.crmid
+			$query = "from vtiger_activity 
+				inner join vtiger_crmentity as vtiger_crmentityActivities on vtiger_crmentityActivities.crmid=vtiger_activity.activityid 
+				left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid 
+				left join vtiger_contactdetails as vtiger_contactdetailsActivities on vtiger_contactdetailsActivities.contactid= vtiger_cntactivityrel.contactid
+				left join vtiger_users as vtiger_usersActivities on vtiger_usersActivities.id = vtiger_crmentityActivities.smownerid
+				left join vtiger_seactivityrel on vtiger_seactivityrel.activityid = vtiger_activity.activityid
+				left join vtiger_crmentity as vtiger_crmentityRelActivities on vtiger_crmentityRelActivities.crmid = vtiger_seactivityrel.crmid
+				left join vtiger_account as vtiger_accountRelActivities on vtiger_accountRelActivities.accountid=crmentityRelActivities.crmid
+				left join vtiger_leaddetails as vtiger_leaddetailsRelActivities on vtiger_leaddetailsRelActivities.leadid = vtiger_crmentityRelActivities.crmid
+				left join vtiger_potential as vtiger_potentialRelActivities on vtiger_potentialRelActivities.potentialid = vtiger_crmentityRelActivities.crmid
+				left join vtiger_quotes as vtiger_quotesRelActivities on vtiger_quotesRelActivities.quoteid = vtiger_crmentityRelActivities.crmid
+				left join vtiger_purchaseorder as vtiger_purchaseorderRelActivities on vtiger_purchaseorderRelActivities.purchaseorderid = vtiger_crmentityRelActivities.crmid
+				left join vtiger_invoice as vtiger_invoiceRelActivities on vtiger_invoiceRelActivities.invoiceid = vtiger_crmentityRelActivities.crmid
 				".$this->getRelatedModulesQuery($module,$this->secondarymodule)."
-				WHERE crmentityActivities.deleted=0 and (activity.activitytype = 'Meeting' or activity.activitytype='Call' or activity.activitytype='Task')";
+				WHERE vtiger_crmentityActivities.deleted=0 and (vtiger_activity.activitytype = 'Meeting' or vtiger_activity.activitytype='Call' or vtiger_activity.activitytype='Task')";
 		}
 		
 		if($module == "Quotes")
 		{
-			$query = "from quotes 
-				inner join crmentity as crmentityQuotes on crmentityQuotes.crmid=quotes.quoteid 
-				inner join quotesbillads on quotes.quoteid=quotesbillads.quotebilladdressid 
-				inner join quotesshipads on quotes.quoteid=quotesshipads.quoteshipaddressid 
-				left join users as usersQuotes on usersQuotes.id = crmentityQuotes.smownerid
-				left join users as usersRel1 on usersRel1.id = quotes.inventorymanager
-				left join potential as potentialRel on potentialRel.potentialid = quotes.potentialid
-				left join contactdetails as contactdetailsQuotes on contactdetailsQuotes.contactid = quotes.contactid
-				left join account as accountQuotes on accountQuotes.accountid = quotes.accountid
+			$query = "from vtiger_quotes 
+				inner join vtiger_crmentity as vtiger_crmentityQuotes on vtiger_crmentityQuotes.crmid=vtiger_quotes.quoteid 
+				inner join vtiger_quotesbillads on vtiger_quotes.quoteid=vtiger_quotesbillads.quotebilladdressid 
+				inner join vtiger_quotesshipads on vtiger_quotes.quoteid=vtiger_quotesshipads.quoteshipaddressid 
+				left join vtiger_users as vtiger_usersQuotes on vtiger_usersQuotes.id = vtiger_crmentityQuotes.smownerid
+				left join vtiger_users as vtiger_usersRel1 on vtiger_usersRel1.id = vtiger_quotes.inventorymanager
+				left join vtiger_potential as vtiger_potentialRel on vtiger_potentialRel.potentialid = vtiger_quotes.potentialid
+				left join vtiger_contactdetails as vtiger_contactdetailsQuotes on vtiger_contactdetailsQuotes.contactid = vtiger_quotes.contactid
+				left join vtiger_account as vtiger_accountQuotes on vtiger_accountQuotes.accountid = vtiger_quotes.accountid
 				".$this->getRelatedModulesQuery($module,$this->secondarymodule)."
-				where crmentityQuotes.deleted=0";
+				where vtiger_crmentityQuotes.deleted=0";
 		}
 		
 		if($module == "PurchaseOrder")
 		{
-			$query = "from purchaseorder 
-				inner join crmentity as crmentityPurchaseOrder on crmentityPurchaseOrder.crmid=purchaseorder.purchaseorderid 
-				inner join pobillads on purchaseorder.purchaseorderid=pobillads.pobilladdressid 
-				inner join poshipads on purchaseorder.purchaseorderid=poshipads.poshipaddressid 
-				left join users as usersPurchaseOrder on usersPurchaseOrder.id = crmentityPurchaseOrder.smownerid 
-				left join vendor as vendorRel on vendorRel.vendorid = purchaseorder.vendorid 
-				left join contactdetails as contactdetailsPurchaseOrder on contactdetailsPurchaseOrder.contactid = purchaseorder.contactid 
+			$query = "from vtiger_purchaseorder 
+				inner join vtiger_crmentity as vtiger_crmentityPurchaseOrder on vtiger_crmentityPurchaseOrder.crmid=vtiger_purchaseorder.purchaseorderid 
+				inner join vtiger_pobillads on vtiger_purchaseorder.purchaseorderid=vtiger_pobillads.pobilladdressid 
+				inner join vtiger_poshipads on vtiger_purchaseorder.purchaseorderid=vtiger_poshipads.poshipaddressid 
+				left join vtiger_users as vtiger_usersPurchaseOrder on vtiger_usersPurchaseOrder.id = vtiger_crmentityPurchaseOrder.smownerid 
+				left join vtiger_vendor as vtiger_vendorRel on vtiger_vendorRel.vendorid = vtiger_purchaseorder.vendorid 
+				left join vtiger_contactdetails as vtiger_contactdetailsPurchaseOrder on vtiger_contactdetailsPurchaseOrder.contactid = vtiger_purchaseorder.contactid 
 				".$this->getRelatedModulesQuery($module,$this->secondarymodule)."
-				where crmentityPurchaseOrder.deleted=0";
+				where vtiger_crmentityPurchaseOrder.deleted=0";
 		}
 
 		if($module == "Invoice")
 		{
-			$query = "from invoice 
-				inner join crmentity as crmentityInvoice on crmentityInvoice.crmid=invoice.invoiceid 
-				inner join invoicebillads on invoice.invoiceid=invoicebillads.invoicebilladdressid 
-				inner join invoiceshipads on invoice.invoiceid=invoiceshipads.invoiceshipaddressid 
-				left join users as usersInvoice on usersInvoice.id = crmentityInvoice.smownerid
-				left join account as accountInvoice on accountInvoice.accountid = invoice.accountid
+			$query = "from vtiger_invoice 
+				inner join vtiger_crmentity as vtiger_crmentityInvoice on vtiger_crmentityInvoice.crmid=vtiger_invoice.invoiceid 
+				inner join vtiger_invoicebillads on vtiger_invoice.invoiceid=vtiger_invoicebillads.invoicebilladdressid 
+				inner join vtiger_invoiceshipads on vtiger_invoice.invoiceid=vtiger_invoiceshipads.invoiceshipaddressid 
+				left join vtiger_users as vtiger_usersInvoice on vtiger_usersInvoice.id = vtiger_crmentityInvoice.smownerid
+				left join vtiger_account as vtiger_accountInvoice on vtiger_accountInvoice.accountid = vtiger_invoice.accountid
 				".$this->getRelatedModulesQuery($module,$this->secondarymodule)."
-				where crmentityInvoice.deleted=0";
+				where vtiger_crmentityInvoice.deleted=0";
 		}
 		$log->info("ReportRun :: Successfully returned getReportsQuery".$module);
 		return $query;
@@ -1407,9 +1407,9 @@
 		global $modules;
 		global $log;
 
-		$coltotalsql = "select reportsummary.* from report";
-        $coltotalsql .= " inner join reportsummary on report.reportid = reportsummary.reportsummaryid";
-        $coltotalsql .= " where report.reportid =".$reportid;
+		$coltotalsql = "select vtiger_reportsummary.* from vtiger_report";
+        $coltotalsql .= " inner join vtiger_reportsummary on vtiger_report.reportid = vtiger_reportsummary.reportsummaryid";
+        $coltotalsql .= " where vtiger_report.reportid =".$reportid;
 
         $result = $adb->query($coltotalsql);
 		
@@ -1449,9 +1449,9 @@
 		global $modules;
 		global $log;
 
-		$sreportstdfiltersql = "select reportsummary.* from report"; 
-		$sreportstdfiltersql .= " inner join reportsummary on report.reportid = reportsummary.reportsummaryid"; 
-		$sreportstdfiltersql .= " where report.reportid =".$reportid;
+		$sreportstdfiltersql = "select vtiger_reportsummary.* from vtiger_report"; 
+		$sreportstdfiltersql .= " inner join vtiger_reportsummary on vtiger_report.reportid = vtiger_reportsummary.reportsummaryid"; 
+		$sreportstdfiltersql .= " where vtiger_report.reportid =".$reportid;
 		
 		$result = $adb->query($sreportstdfiltersql);
 		$noofrows = $adb->num_rows($result);

Modified: vtigercrm/trunk/modules/Reports/Reports.php
==============================================================================
--- vtigercrm/trunk/modules/Reports/Reports.php (original)
+++ vtigercrm/trunk/modules/Reports/Reports.php Mon Jun 12 14:26:25 2006
@@ -63,7 +63,7 @@
 
 /**
  * This class has the informations for Reports and inherits class CRMEntity and
- * has the variables required to generate,save,restore reports
+ * has the variables required to generate,save,restore vtiger_reports
  * and also the required functions for the same
  * Contributor(s): ______________________________________..
  */
@@ -119,9 +119,9 @@
 				 "Invoice"=>Array("Information"=>69,"Address"=>71,"Description"=>74,"Custom Information"=>5)
 				);
 
-/** Function to set primodule,secmodule,reporttype,reportname,reportdescription,folderid for given reportid
- *  This function accepts the reportid as argument
- *  It sets primodule,secmodule,reporttype,reportname,reportdescription,folderid for the given reportid
+/** Function to set primodule,secmodule,reporttype,reportname,reportdescription,folderid for given vtiger_reportid
+ *  This function accepts the vtiger_reportid as argument
+ *  It sets primodule,secmodule,reporttype,reportname,reportdescription,folderid for the given vtiger_reportid
  */
 			
 	function Reports($reportid="")
@@ -130,8 +130,8 @@
 
 		if($reportid != "")
 		{
-			$ssql = "select reportmodules.*,report.* from report inner join reportmodules on report.reportid = reportmodules.reportmodulesid";
-			$ssql .= " where report.reportid =".$reportid;
+			$ssql = "select vtiger_reportmodules.*,vtiger_report.* from vtiger_report inner join vtiger_reportmodules on vtiger_report.reportid = vtiger_reportmodules.reportmodulesid";
+			$ssql .= " where vtiger_report.reportid =".$reportid;
 			$result = $adb->query($ssql);
 		        $reportmodulesrow = $adb->fetch_array($result);
 			if($reportmodulesrow)
@@ -159,7 +159,7 @@
 		global $adb;
 		global $log;
 		$returndata = Array();
-		$sql = "select * from reportfolder order by folderid";
+		$sql = "select * from vtiger_reportfolder order by folderid";
 		$result = $adb->query($sql);
 		$reportfldrow = $adb->fetch_array($result);
 		if($mode != '')
@@ -190,7 +190,7 @@
 			}while($reportfldrow = $adb->fetch_array($result));
 		}
 
-		$log->info("Reports :: ListView->Successfully returned report folder HTML");
+		$log->info("Reports :: ListView->Successfully returned vtiger_report folder HTML");
 		return $returndata;
 	}
 
@@ -210,8 +210,8 @@
 		
 		require_once('include/utils/UserInfoUtil.php');
 		
-		$sql = "select report.*, reportmodules.* from report inner join reportfolder on reportfolder.folderid = report.folderid";
-		$sql .= " inner join reportmodules on reportmodules.reportmodulesid = report.reportid where reportfolder.folderid=".$rpt_fldr_id;
+		$sql = "select vtiger_report.*, vtiger_reportmodules.* from vtiger_report inner join vtiger_reportfolder on vtiger_reportfolder.folderid = vtiger_report.folderid";
+		$sql .= " inner join vtiger_reportmodules on vtiger_reportmodules.reportmodulesid = vtiger_report.reportid where vtiger_reportfolder.folderid=".$rpt_fldr_id;
 		$result = $adb->query($sql);
 		$report = $adb->fetch_array($result);
 		if(count($report)>0)
@@ -231,7 +231,7 @@
 					  }while($report = $adb->fetch_array($result));
 		}
 	
-		$log->info("Reports :: ListView->Successfully returned report details HTML");
+		$log->info("Reports :: ListView->Successfully returned vtiger_report details HTML");
 		return $returndata;
 	}
 
@@ -249,9 +249,9 @@
 		return $srptfldr_js;
 	}
 
-/** Function to set the Primary module fields for the given Report 
+/** Function to set the Primary module vtiger_fields for the given Report 
  *  This function sets the primary module columns for the given Report 
- *  It accepts the Primary module as the argument and set the fields of the module
+ *  It accepts the Primary module as the argument and set the vtiger_fields of the module
  *  to the varialbe pri_module_columnslist and returns true if sucess
  */
 
@@ -267,7 +267,7 @@
 
 /** Function to set the Secondary module fileds for the given Report
  *  This function sets the secondary module columns for the given module
- *  It accepts the module as the argument and set the fields of the module
+ *  It accepts the module as the argument and set the vtiger_fields of the module
  *  to the varialbe sec_module_columnslist and returns true if sucess
  */
 	
@@ -288,11 +288,11 @@
             return true;
         }
 
-/** Function to get fields for the given module and block
- *  This function gets the fields for the given module
+/** Function to get vtiger_fields for the given module and block
+ *  This function gets the vtiger_fields for the given module
  *  It accepts the module and the block as arguments and 
  *  returns the array column lists
- *  Array module_columnlist[ fieldtablename:fieldcolname:module_fieldlabel1:fieldname:fieldtypeofdata]=fieldlabel
+ *  Array module_columnlist[ vtiger_fieldtablename:fieldcolname:module_fieldlabel1:fieldname:fieldtypeofdata]=fieldlabel
  */
 
 	function getColumnsListbyBlock($module,$block)
@@ -308,12 +308,12 @@
 	//Security Check 
 	if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] ==0)
 	{
-		$sql = "select * from field where field.uitype != 50 and field.tabid=".$tabid." and field.block in (".$block .") and field.displaytype in (1,2) order by sequence";
+		$sql = "select * from vtiger_field where vtiger_field.uitype != 50 and vtiger_field.tabid=".$tabid." and vtiger_field.block in (".$block .") and vtiger_field.displaytype in (1,2) order by sequence";
 	}
 	else
 	{
 			
-        	$sql = "select * from field inner join profile2field on profile2field.fieldid=field.fieldid inner join def_org_field on def_org_field.fieldid=field.fieldid where field.uitype != 50 and field.tabid=".$tabid." and field.block in (".$block .") and field.displaytype in (1,2) and profile2field.visible=0 and def_org_field.visible=0 and profile2field.profileid in ".$profileList." group by field.fieldid order by sequence";
+        	$sql = "select * from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.uitype != 50 and vtiger_field.tabid=".$tabid." and vtiger_field.block in (".$block .") and vtiger_field.displaytype in (1,2) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList." group by vtiger_field.fieldid order by sequence";
 	}
         $result = $adb->query($sql);
         $noofrows = $adb->num_rows($result);
@@ -375,8 +375,8 @@
 		return $module_columnlist;
 	}
 	
-/** Function to set the standard filter fields for the given report
- *  This function gets the standard filter fields for the given report
+/** Function to set the standard filter vtiger_fields for the given vtiger_report
+ *  This function gets the standard filter vtiger_fields for the given vtiger_report
  *  and set the values to the corresponding variables
  *  It accepts the repordid as argument 
  */
@@ -384,7 +384,7 @@
 	function getSelectedStandardCriteria($reportid)
 	{
 		global $adb;
-		$sSQL = "select reportdatefilter.* from reportdatefilter inner join report on report.reportid = reportdatefilter.datefilterid where report.reportid=".$reportid;
+		$sSQL = "select vtiger_reportdatefilter.* from vtiger_reportdatefilter inner join vtiger_report on vtiger_report.reportid = vtiger_reportdatefilter.datefilterid where vtiger_report.reportid=".$reportid;
 
 		$result = $adb->query($sSQL);
 		$selectedstdfilter = $adb->fetch_array($result);
@@ -406,7 +406,7 @@
 	}
 
 /** Function to get the combo values for the standard filter
- *  This function get the combo values for the standard filter for the given report
+ *  This function get the combo values for the standard filter for the given vtiger_report
  *  and return a HTML string 
  */
 
@@ -441,7 +441,7 @@
 
 /** Function to get the selected standard filter columns 
  *  This function returns the selected standard filter criteria 
- *  which is selected for reports as an array
+ *  which is selected for vtiger_reports as an array
  *  Array stdcriteria_list[fieldtablename:fieldcolname:module_fieldlabel1]=fieldlabel
  */
 
@@ -461,12 +461,12 @@
 
 		if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0)
                 {
-			$sql = "select * from field where field.tabid=".$tabid." and (field.uitype =5 or field.displaytype=2) and field.block in (".$blockids.") order by field.sequence";
+			$sql = "select * from vtiger_field where vtiger_field.tabid=".$tabid." and (vtiger_field.uitype =5 or vtiger_field.displaytype=2) and vtiger_field.block in (".$blockids.") order by vtiger_field.sequence";
 		}
 		else
 		{
 			$profileList = getCurrentUserProfileList();			
-			$sql = "select * from field inner join tab on tab.tabid = field.tabid 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 (field.uitype =5 or field.displaytype=2) and profile2field.visible=0 and def_org_field.visible=0 and field.block in (".$blockids.") and profile2field.profileid in ".$profileList." order by field.sequence";
+			$sql = "select * from vtiger_field inner join vtiger_tab on vtiger_tab.tabid = vtiger_field.tabid inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid  where vtiger_field.tabid=".$tabid." and (vtiger_field.uitype =5 or vtiger_field.displaytype=2) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_field.block in (".$blockids.") and vtiger_profile2field.profileid in ".$profileList." order by vtiger_field.sequence";
 	
 		}
 		
@@ -720,7 +720,7 @@
 
 /** Function to set the order of grouping and to find the columns responsible
  *  to the grouping
- *  This function accepts the reportid as variable,sets the variable ascdescorder[] to the sort order and
+ *  This function accepts the vtiger_reportid as variable,sets the variable ascdescorder[] to the sort order and
  *  returns the array array_list which has the column responsible for the grouping
  *  Array array_list[0]=columnname
  */
@@ -732,9 +732,9 @@
 		global $adb;
 		global $log;
 
-    	$sreportsortsql = "select reportsortcol.* from report";
-		$sreportsortsql .= " inner join reportsortcol on report.reportid = reportsortcol.reportid";
-		$sreportsortsql .= " where report.reportid =".$reportid." order by reportsortcol.sortcolid";
+    	$sreportsortsql = "select vtiger_reportsortcol.* from vtiger_report";
+		$sreportsortsql .= " inner join vtiger_reportsortcol on vtiger_report.reportid = vtiger_reportsortcol.reportid";
+		$sreportsortsql .= " where vtiger_report.reportid =".$reportid." order by vtiger_reportsortcol.sortcolid";
 
 		$result = $adb->query($sreportsortsql);
 		$noofrows = $adb->num_rows($result);
@@ -751,9 +751,9 @@
 		return $array_list;
 	}
 	
-/** Function to get the selected columns list for a selected report
- *  This function accepts the reportid as the argument and get the selected columns
- *  for the given reportid and it forms a combo lists and returns
+/** Function to get the selected columns list for a selected vtiger_report
+ *  This function accepts the vtiger_reportid as the argument and get the selected columns
+ *  for the given vtiger_reportid and it forms a combo lists and returns
  *  HTML of the combo values
  */
 
@@ -764,9 +764,9 @@
 	    global $modules;
 		global $log;
 
-		$ssql = "select selectcolumn.* from report inner join selectquery on selectquery.queryid = report.queryid";
-		$ssql .= " left join selectcolumn on selectcolumn.queryid = selectquery.queryid where report.reportid =".$reportid;
-		$ssql .= " order by selectcolumn.columnindex";
+		$ssql = "select vtiger_selectcolumn.* from vtiger_report inner join vtiger_selectquery on vtiger_selectquery.queryid = vtiger_report.queryid";
+		$ssql .= " left join vtiger_selectcolumn on vtiger_selectcolumn.queryid = vtiger_selectquery.queryid where vtiger_report.reportid =".$reportid;
+		$ssql .= " order by vtiger_selectcolumn.columnindex";
 
 		$result = $adb->query($ssql);
 		$noofrows = $adb->num_rows($result);
@@ -785,8 +785,8 @@
 		return $shtml;
 	}
 
-/** Function to Set the selected columns for the advanced filter for the report
- *  This function accepts the reportid as the argument and get the selected columns
+/** Function to Set the selected columns for the advanced filter for the vtiger_report
+ *  This function accepts the vtiger_reportid as the argument and get the selected columns
  *  in the advanced filter and sets the values
  *  $this->advft_column[] = The column name
  *  $this->advft_option[] = The filter option
@@ -800,8 +800,8 @@
 		global $adb;
 		global $modules;
 		global $log;
-		$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";
+		$ssql = 'select vtiger_relcriteria.* from vtiger_report inner join vtiger_relcriteria on vtiger_relcriteria.queryid = vtiger_report.queryid left join vtiger_selectquery on vtiger_relcriteria.queryid = vtiger_selectquery.queryid';
+		$ssql.= " where vtiger_report.reportid =".$reportid." order by vtiger_relcriteria.columnindex";
 
 		$result = $adb->query($ssql);
 
@@ -817,8 +817,8 @@
 	}
 	//<<<<<<<<advanced filter>>>>>>>>>>>>>>
 	
-/** Function to get the list of report folders when Save and run  the report
- *  This function gets the report folders from database and form
+/** Function to get the list of vtiger_report folders when Save and run  the vtiger_report
+ *  This function gets the vtiger_report folders from database and form
  *  a combo values of the folders and return 
  *  HTML of the combo values
  */
@@ -828,7 +828,7 @@
 		global $adb;
 		global $log;
 
-		$sql = "select * from reportfolder order by folderid";
+		$sql = "select * from vtiger_reportfolder order by folderid";
 		$result = $adb->query($sql);
 		$reportfldrow = $adb->fetch_array($result);
 		$x = 0;
@@ -841,10 +841,10 @@
 		return $shtml;
 	}
 
-/** Function to get the column to total fields in Reports 
- *  This function gets columns to total field 
- *  and generated the html for that fields
- *  It returns the HTML of the fields along with the check boxes
+/** Function to get the column to total vtiger_fields in Reports 
+ *  This function gets columns to total vtiger_field 
+ *  and generated the html for that vtiger_fields
+ *  It returns the HTML of the vtiger_fields along with the check boxes
  */
 
 	function sgetColumntoTotal($primarymodule,$secondarymodule)
@@ -862,10 +862,10 @@
 		return $options;
 	}
 	
-/** Function to get the selected columns of total fields in Reports
- *  This function gets selected columns of total field
- *  and generated the html for that fields
- *  It returns the HTML of the fields along with the check boxes
+/** Function to get the selected columns of total vtiger_fields in Reports
+ *  This function gets selected columns of total vtiger_field
+ *  and generated the html for that vtiger_fields
+ *  It returns the HTML of the vtiger_fields along with the check boxes
  */
 	
 	
@@ -876,7 +876,7 @@
 		$options = Array();
 		if($reportid != "")
 		{
-			$ssql = "select reportsummary.* from reportsummary inner join report on report.reportid = reportsummary.reportsummaryid where report.reportid=".$reportid;
+			$ssql = "select vtiger_reportsummary.* from vtiger_reportsummary inner join vtiger_report on vtiger_report.reportid = vtiger_reportsummary.reportsummaryid where vtiger_report.reportid=".$reportid;
 			$result = $adb->query($ssql);
 			if($result)
 			{
@@ -906,14 +906,14 @@
 
 /** Function to form the HTML for columns to total	
  *  This function formulates the HTML format of the
- *  fields along with four checkboxes
- *  It returns the HTML of the fields along with the check boxes
+ *  vtiger_fields along with four checkboxes
+ *  It returns the HTML of the vtiger_fields along with the check boxes
  */
 	
 	
 	function sgetColumnstoTotalHTML($module)
 	{
-		//retreive the tabid	
+		//retreive the vtiger_tabid	
 		global $adb;
 		global $log;
 		global $current_user;
@@ -922,12 +922,12 @@
 		$escapedchars = Array('_SUM','_AVG','_MIN','_MAX');
 		if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] ==0)
 		{
-			$ssql = "select * from field inner join tab on tab.tabid = field.tabid where field.uitype != 50 and field.tabid=".$tabid." and field.displaytype = 1 order by sequence";
+			$ssql = "select * from vtiger_field inner join vtiger_tab on vtiger_tab.tabid = vtiger_field.tabid where vtiger_field.uitype != 50 and vtiger_field.tabid=".$tabid." and vtiger_field.displaytype = 1 order by sequence";
 		}
 		else
 		{
 			$profileList = getCurrentUserProfileList();
-			$ssql = "select * from field inner join tab on tab.tabid = field.tabid inner join def_org_field on def_org_field.fieldid=field.fieldid inner join profile2field on profile2field.fieldid=field.fieldid  where field.uitype != 50 and field.tabid=".$tabid." and field.displaytype = 1 and def_org_field.visible=0 and profile2field.visible=0 and profile2field.profileid in ".$profileList." order by sequence";
+			$ssql = "select * from vtiger_field inner join vtiger_tab on vtiger_tab.tabid = vtiger_field.tabid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid  where vtiger_field.uitype != 50 and vtiger_field.tabid=".$tabid." and vtiger_field.displaytype = 1 and vtiger_def_org_field.visible=0 and vtiger_profile2field.visible=0 and vtiger_profile2field.profileid in ".$profileList." order by sequence";
 		}
 		$result = $adb->query($ssql);
 		$columntototalrow = $adb->fetch_array($result);
@@ -1009,8 +1009,8 @@
 	}
 }
 
-/** Function to get the primary module list in reports
- *  This function generates the list of primary modules in reports
+/** Function to get the primary module list in vtiger_reports
+ *  This function generates the list of primary modules in vtiger_reports
  *  and returns an array of permitted modules 
  */
 
@@ -1038,8 +1038,8 @@
 	}
 	return $modules;
 }
-/** Function to get the Related module list in reports
- *  This function generates the list of secondary modules in reports
+/** Function to get the Related module list in vtiger_reports
+ *  This function generates the list of secondary modules in vtiger_reports
  *  and returns the related module as an Array 
  */
 

Modified: vtigercrm/trunk/modules/Reports/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Reports/Save.php (original)
+++ vtigercrm/trunk/modules/Reports/Save.php Mon Jun 12 14:26:25 2006
@@ -94,83 +94,83 @@
 	$genQueryId = $adb->getUniqueID("selectquery");
 	if($genQueryId != "")
 	{
-		$iquerysql = "insert into selectquery (QUERYID,STARTINDEX,NUMOFOBJECTS) values (".$genQueryId.",0,0)";
+		$iquerysql = "insert into vtiger_selectquery (QUERYID,STARTINDEX,NUMOFOBJECTS) values (".$genQueryId.",0,0)";
 		$iquerysqlresult = $adb->query($iquerysql);
-		 $log->info("Reports :: Save->Successfully saved selectquery");
+		 $log->info("Reports :: Save->Successfully saved vtiger_selectquery");
 		if($iquerysqlresult!=false)
 		{
-			//<<<<step2 selectcolumn>>>>>>>>
+			//<<<<step2 vtiger_selectcolumn>>>>>>>>
 			if($selectedcolumnstring != "")
 			{
 				$selectedcolumns = explode(";",$selectedcolumnstring);
 				for($i=0 ;$i< count($selectedcolumns) -1 ;$i++)
 				{
-					$icolumnsql = "insert into selectcolumn (QUERYID,COLUMNINDEX,COLUMNNAME) values (".$genQueryId.",".$i.",'".$selectedcolumns[$i]."')";
+					$icolumnsql = "insert into vtiger_selectcolumn (QUERYID,COLUMNINDEX,COLUMNNAME) values (".$genQueryId.",".$i.",'".$selectedcolumns[$i]."')";
 					$icolumnsqlresult = $adb->query($icolumnsql);
 				}
 			}
-			$log->info("Reports :: Save->Successfully saved selectcolumn");
-			//<<<<step2 selectcolumn>>>>>>>>
+			$log->info("Reports :: Save->Successfully saved vtiger_selectcolumn");
+			//<<<<step2 vtiger_selectcolumn>>>>>>>>
 
 		       //$genReportMId = $adb->getUniqueID("reportmodules");
 
 		       if($genQueryId != "")
 		       {
-				$ireportsql = "insert into report (REPORTID,FOLDERID,REPORTNAME,DESCRIPTION,REPORTTYPE,QUERYID,STATE)";
+				$ireportsql = "insert into vtiger_report (REPORTID,FOLDERID,REPORTNAME,DESCRIPTION,REPORTTYPE,QUERYID,STATE)";
 				$ireportsql .= " values (".$genQueryId.",".$folderid.",'".$reportname."','".$reportdescription."','".$reporttype."',".$genQueryId.",'CUSTOM')";
 				$ireportresult = $adb->query($ireportsql);
-			       	$log->info("Reports :: Save->Successfully saved report");
+			       	$log->info("Reports :: Save->Successfully saved vtiger_report");
 				if($ireportresult!=false)
 				{
 					//<<<<reportmodules>>>>>>>
-					$ireportmodulesql = "insert into reportmodules (REPORTMODULESID,PRIMARYMODULE,SECONDARYMODULES) values (".$genQueryId.",'".$pmodule."','".$smodule."')";
+					$ireportmodulesql = "insert into vtiger_reportmodules (REPORTMODULESID,PRIMARYMODULE,SECONDARYMODULES) values (".$genQueryId.",'".$pmodule."','".$smodule."')";
 					$ireportmoduleresult = $adb->query($ireportmodulesql);
-					$log->info("Reports :: Save->Successfully saved reportmodules");
+					$log->info("Reports :: Save->Successfully saved vtiger_reportmodules");
 					//<<<<reportmodules>>>>>>>
 
-					//<<<<step3 reportsortcol>>>>>>>
+					//<<<<step3 vtiger_reportsortcol>>>>>>>
 					if($sort_by1 != "")
 					{
-						$sort_by1sql = "insert into reportsortcol (SORTCOLID,REPORTID,COLUMNNAME,SORTORDER) values (1,".$genQueryId.",'".$sort_by1."','".$sort_order1."')";
+						$sort_by1sql = "insert into vtiger_reportsortcol (SORTCOLID,REPORTID,COLUMNNAME,SORTORDER) values (1,".$genQueryId.",'".$sort_by1."','".$sort_order1."')";
 						$sort_by1result = $adb->query($sort_by1sql);
 					}
 					if($sort_by2 != "")
 					{
-						$sort_by2sql = "insert into reportsortcol (SORTCOLID,REPORTID,COLUMNNAME,SORTORDER) values (2,".$genQueryId.",'".$sort_by2."','".$sort_order2."')";
+						$sort_by2sql = "insert into vtiger_reportsortcol (SORTCOLID,REPORTID,COLUMNNAME,SORTORDER) values (2,".$genQueryId.",'".$sort_by2."','".$sort_order2."')";
 						$sort_by2result = $adb->query($sort_by2sql);
 					}
 					if($sort_by3 != "")
 					{
-						$sort_by3sql = "insert into reportsortcol (SORTCOLID,REPORTID,COLUMNNAME,SORTORDER) values (3,".$genQueryId.",'".$sort_by3."','".$sort_order3."')";
+						$sort_by3sql = "insert into vtiger_reportsortcol (SORTCOLID,REPORTID,COLUMNNAME,SORTORDER) values (3,".$genQueryId.",'".$sort_by3."','".$sort_order3."')";
 						$sort_by3result = $adb->query($sort_by3sql);
 					}
-					$log->info("Reports :: Save->Successfully saved reportsortcol");
-					//<<<<step3 reportsortcol>>>>>>>
+					$log->info("Reports :: Save->Successfully saved vtiger_reportsortcol");
+					//<<<<step3 vtiger_reportsortcol>>>>>>>
 
 					//<<<<step5 standarfilder>>>>>>>
-					$ireportmodulesql = "insert into reportdatefilter (DATEFILTERID,DATECOLUMNNAME,DATEFILTER,STARTDATE,ENDDATE) values (".$genQueryId.",'".$stdDateFilterField."','".$stdDateFilter."','".$startdate."','".$enddate."')";
+					$ireportmodulesql = "insert into vtiger_reportdatefilter (DATEFILTERID,DATECOLUMNNAME,DATEFILTER,STARTDATE,ENDDATE) values (".$genQueryId.",'".$stdDateFilterField."','".$stdDateFilter."','".$startdate."','".$enddate."')";
 					$ireportmoduleresult = $adb->query($ireportmodulesql);
-					$log->info("Reports :: Save->Successfully saved reportdatefilter");
+					$log->info("Reports :: Save->Successfully saved vtiger_reportdatefilter");
 					//<<<<step5 standarfilder>>>>>>>
 
 					//<<<<step4 columnstototal>>>>>>>
 					for ($i=0;$i<count($columnstototal);$i++)
 					{
-						$ireportsummarysql = "insert into reportsummary (REPORTSUMMARYID,SUMMARYTYPE,COLUMNNAME) values (".$genQueryId.",".$i.",'".$columnstototal[$i]."')";
+						$ireportsummarysql = "insert into vtiger_reportsummary (REPORTSUMMARYID,SUMMARYTYPE,COLUMNNAME) values (".$genQueryId.",".$i.",'".$columnstototal[$i]."')";
 						$ireportsummaryresult = $adb->query($ireportsummarysql);
 					}
-					$log->info("Reports :: Save->Successfully saved reportsummary");
+					$log->info("Reports :: Save->Successfully saved vtiger_reportsummary");
 					//<<<<step4 columnstototal>>>>>>>
 
 					//<<<<step5 advancedfilter>>>>>>>
                                         for ($i=0;$i<count($adv_filter_col);$i++)
                                         {
-                                                $irelcriteriasql = "insert into relcriteria(QUERYID,COLUMNINDEX,COLUMNNAME,COMPARATOR,VALUE) values (".$genQueryId.",".$i.",'".$adv_filter_col[$i]."','".$adv_filter_option[$i]."','".$adv_filter_value[$i]."')";
+                                                $irelcriteriasql = "insert into vtiger_relcriteria(QUERYID,COLUMNINDEX,COLUMNNAME,COMPARATOR,VALUE) values (".$genQueryId.",".$i.",'".$adv_filter_col[$i]."','".$adv_filter_option[$i]."','".$adv_filter_value[$i]."')";
 						//echo $irelcriteriasql;
 
                                                 $irelcriteriaresult = $adb->query($irelcriteriasql);
                                         }
-					$log->info("Reports :: Save->Successfully saved relcriteria");
+					$log->info("Reports :: Save->Successfully saved vtiger_relcriteria");
                                         //<<<<step5 advancedfilter>>>>>>>
 
 				}else
@@ -198,7 +198,7 @@
 	{
 		if($selectedcolumnstring != "")
 		{
-			$idelcolumnsql = "delete from selectcolumn where queryid=".$reportid;
+			$idelcolumnsql = "delete from vtiger_selectcolumn where queryid=".$reportid;
 			$idelcolumnsqlresult = $adb->query($idelcolumnsql);
 			//echo $idelcolumnsql;
 			if($idelcolumnsqlresult != false)
@@ -206,83 +206,83 @@
 				$selectedcolumns = explode(";",$selectedcolumnstring);
 				for($i=0 ;$i< count($selectedcolumns) -1 ;$i++)
 				{
-					$icolumnsql = "insert into selectcolumn (QUERYID,COLUMNINDEX,COLUMNNAME) values (".$reportid.",".$i.",'".$selectedcolumns[$i]."')";
+					$icolumnsql = "insert into vtiger_selectcolumn (QUERYID,COLUMNINDEX,COLUMNNAME) values (".$reportid.",".$i.",'".$selectedcolumns[$i]."')";
 					$icolumnsqlresult = $adb->query($icolumnsql);
 					//echo $icolumnsql;
 				}
 			}
 		}
 
-		$ireportsql = "update report set";
+		$ireportsql = "update vtiger_report set";
 		$ireportsql .= " REPORTNAME='".$reportname."',";
 		$ireportsql .= " DESCRIPTION='".$reportdescription."',";
 		$ireportsql .= " REPORTTYPE='".$reporttype."'";
 		$ireportsql .= " where REPORTID=".$reportid;
 		$ireportresult = $adb->query($ireportsql);
-		$log->info("Reports :: Save->Successfully saved report");
+		$log->info("Reports :: Save->Successfully saved vtiger_report");
 		//echo $ireportsql;
 
-		$idelreportsortcolsql = "delete from reportsortcol where reportid=".$reportid;
+		$idelreportsortcolsql = "delete from vtiger_reportsortcol where vtiger_reportid=".$reportid;
 		$idelreportsortcolsqlresult = $adb->query($idelreportsortcolsql);
-		$log->info("Reports :: Save->Successfully deleted reportsortcol");
+		$log->info("Reports :: Save->Successfully deleted vtiger_reportsortcol");
 		//echo $idelreportsortcolsql;
 
 		if($idelreportsortcolsqlresult!=false)
 		{
-			//<<<<step3 reportsortcol>>>>>>>
+			//<<<<step3 vtiger_reportsortcol>>>>>>>
 			if($sort_by1 != "")
 			{
-				$sort_by1sql = "insert into reportsortcol (SORTCOLID,REPORTID,COLUMNNAME,SORTORDER) values (1,".$reportid.",'".$sort_by1."','".$sort_order1."')";
+				$sort_by1sql = "insert into vtiger_reportsortcol (SORTCOLID,REPORTID,COLUMNNAME,SORTORDER) values (1,".$reportid.",'".$sort_by1."','".$sort_order1."')";
 				$sort_by1result = $adb->query($sort_by1sql);
 				//echo $sort_by1sql;
 			}
 			if($sort_by2 != "")
 			{
-				$sort_by2sql = "insert into reportsortcol (SORTCOLID,REPORTID,COLUMNNAME,SORTORDER) values (2,".$reportid.",'".$sort_by2."','".$sort_order2."')";
+				$sort_by2sql = "insert into vtiger_reportsortcol (SORTCOLID,REPORTID,COLUMNNAME,SORTORDER) values (2,".$reportid.",'".$sort_by2."','".$sort_order2."')";
 				$sort_by2result = $adb->query($sort_by2sql);
 			}
 			if($sort_by3 != "")
 			{
-				$sort_by3sql = "insert into reportsortcol (SORTCOLID,REPORTID,COLUMNNAME,SORTORDER) values (3,".$reportid.",'".$sort_by3."','".$sort_order3."')";
+				$sort_by3sql = "insert into vtiger_reportsortcol (SORTCOLID,REPORTID,COLUMNNAME,SORTORDER) values (3,".$reportid.",'".$sort_by3."','".$sort_order3."')";
 				$sort_by3result = $adb->query($sort_by3sql);
 			}
-			$log->info("Reports :: Save->Successfully saved reportsortcol");
-			//<<<<step3 reportsortcol>>>>>>>
-
-			$idelreportdatefiltersql = "delete from reportdatefilter where datefilterid=".$reportid;
+			$log->info("Reports :: Save->Successfully saved vtiger_reportsortcol");
+			//<<<<step3 vtiger_reportsortcol>>>>>>>
+
+			$idelreportdatefiltersql = "delete from vtiger_reportdatefilter where datefilterid=".$reportid;
 			$idelreportdatefiltersqlresult = $adb->query($idelreportdatefiltersql);
 			//echo $idelreportsortcolsql;
 
 			//<<<<step5 standarfilder>>>>>>>
-			$ireportmodulesql = "insert into reportdatefilter (DATEFILTERID,DATECOLUMNNAME,DATEFILTER,STARTDATE,ENDDATE) values (".$reportid.",'".$stdDateFilterField."','".$stdDateFilter."','".$startdate."','".$enddate."')";
+			$ireportmodulesql = "insert into vtiger_reportdatefilter (DATEFILTERID,DATECOLUMNNAME,DATEFILTER,STARTDATE,ENDDATE) values (".$reportid.",'".$stdDateFilterField."','".$stdDateFilter."','".$startdate."','".$enddate."')";
 			$ireportmoduleresult = $adb->query($ireportmodulesql);
-			$log->info("Reports :: Save->Successfully saved reportdatefilter");
+			$log->info("Reports :: Save->Successfully saved vtiger_reportdatefilter");
 			//<<<<step5 standarfilder>>>>>>>
 
 			//<<<<step4 columnstototal>>>>>>>
-			$idelreportsummarysql = "delete from reportsummary where reportsummaryid=".$reportid;
+			$idelreportsummarysql = "delete from vtiger_reportsummary where vtiger_reportsummaryid=".$reportid;
 			$idelreportsummarysqlresult = $adb->query($idelreportsummarysql);
 
 			for ($i=0;$i<count($columnstototal);$i++)
 			{
-				$ireportsummarysql = "insert into reportsummary (REPORTSUMMARYID,SUMMARYTYPE,COLUMNNAME) values (".$reportid.",".$i.",'".$columnstototal[$i]."')";
+				$ireportsummarysql = "insert into vtiger_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 vtiger_reportsummary");
 			//<<<<step4 columnstototal>>>>>>>
 
 
 			//<<<<step5 advancedfilter>>>>>>>
 
-			$idelrelcriteriasql = "delete from relcriteria where queryid=".$reportid;
+			$idelrelcriteriasql = "delete from vtiger_relcriteria where queryid=".$reportid;
 			$idelrelcriteriasqlresult = $adb->query($idelrelcriteriasql);
 
 			for ($i=0;$i<count($adv_filter_col);$i++)
 			{
-				$irelcriteriasql = "insert into relcriteria(QUERYID,COLUMNINDEX,COLUMNNAME,COMPARATOR,VALUE) values (".$reportid.",".$i.",'".$adv_filter_col[$i]."','".$adv_filter_option[$i]."','".$adv_filter_value[$i]."')";
+				$irelcriteriasql = "insert into vtiger_relcriteria(QUERYID,COLUMNINDEX,COLUMNNAME,COMPARATOR,VALUE) values (".$reportid.",".$i.",'".$adv_filter_col[$i]."','".$adv_filter_option[$i]."','".$adv_filter_value[$i]."')";
 				$irelcriteriaresult = $adb->query($irelcriteriasql);
 			}
-			$log->info("Reports :: Save->Successfully saved relcriteria");
+			$log->info("Reports :: Save->Successfully saved vtiger_relcriteria");
 			//<<<<step5 advancedfilter>>>>>>>
 
 		}else

Modified: vtigercrm/trunk/modules/Reports/SaveAndRun.php
==============================================================================
--- vtigercrm/trunk/modules/Reports/SaveAndRun.php (original)
+++ vtigercrm/trunk/modules/Reports/SaveAndRun.php Mon Jun 12 14:26:25 2006
@@ -48,7 +48,7 @@
 
 	$list_report_form = new vtigerCRM_Smarty;
 	$ogReport->getSelectedStandardCriteria($reportid);
-	//commented to omit dashboards for reports
+	//commented to omit dashboards for vtiger_reports
 	//require_once('modules/Dashboard/ReportsCharts.php');
 	//$image = get_graph_by_type('Report','Report',$primarymodule,'',$sshtml[2]);
 	//$list_report_form->assign("GRAPH", $image);
@@ -176,7 +176,7 @@
 function getReportsinFolder($folderid)
 {
 	global $adb;
-	$query = 'select reportid,reportname from report where folderid='.$folderid;
+	$query = 'select vtiger_reportid,reportname from vtiger_report where folderid='.$folderid;
 	$result = $adb->query($query);
 	$reports_array = Array();
 	for($i=0;$i < $adb->num_rows($result);$i++)	

Modified: vtigercrm/trunk/modules/Reports/SaveReportFolder.php
==============================================================================
--- vtigercrm/trunk/modules/Reports/SaveReportFolder.php (original)
+++ vtigercrm/trunk/modules/Reports/SaveReportFolder.php Mon Jun 12 14:26:25 2006
@@ -27,7 +27,7 @@
 {
 	if($rfid=="")
 	{
-		$sql = "INSERT INTO reportfolder ";
+		$sql = "INSERT INTO vtiger_reportfolder ";
 		$sql .= "(FOLDERID,FOLDERNAME,DESCRIPTION,STATE) ";
 		$sql .= "VALUES ('','".$foldername."','".$folderdesc."','CUSTOMIZED')";
 		$result = $adb->query($sql);
@@ -47,7 +47,7 @@
 {
 	if($rfid != "")
 	{
-		$sql = "update reportfolder set ";
+		$sql = "update vtiger_reportfolder set ";
 		$sql .= "FOLDERNAME='".$foldername."', ";
 		$sql .= "DESCRIPTION='".$folderdesc."' ";
 		$sql .= "where folderid=".$rfid;

Modified: vtigercrm/trunk/modules/Reports/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Reports/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Reports/language/en_us.lang.php Mon Jun 12 14:26:25 2006
@@ -36,7 +36,7 @@
 'LBL_NEW_REP0_HDR3'=>'Note:',
 'LBL_NEW_REP0_HDR4'=>'Report Module and related module once selected cannot be modified later',
 'LBL_CONTINUE_BUTTON'=>'Continue',
-'LBL_NEW_REP1_HDR1'=>'Provide the following report information',
+'LBL_NEW_REP1_HDR1'=>'Provide the following vtiger_report information',
 'LBL_REPORT_TYPE'=>'Report Type',
 'LBL_SELECT_COLUMNS'=>'Select Columns',
 'LBL_SPECIFY_GROUPING'=>'Specify Grouping',
@@ -44,9 +44,9 @@
 'LBL_SPECIFY_CRITERIA'=>'Specify Criteria',
 'LBL_SAVERUN_BUTTON'=>'Save And Run',
 'LBL_TABULAT_REPORT'=>'Tabular Report',
-'LBL_REPORT_TYPE_HDR1'=>'Tabular reports are the simplest and fastest way to get a listing of your data.',
+'LBL_REPORT_TYPE_HDR1'=>'Tabular vtiger_reports are the simplest and fastest way to get a listing of your data.',
 'LBL_SUMMARY_REPORT'=>'Summary Report',
-'LBL_REPORT_TYPE_HDR2'=>'Summary reports allow you to view your data along with subtotals and other summary information.',
+'LBL_REPORT_TYPE_HDR2'=>'Summary vtiger_reports allow you to view your data along with subtotals and other summary information.',
 'LBL_AVAILABLE_COLUMNS'=>'Available Columns:',
 'LBL_SELECTED_COLUMNS'=>'Selected Columns:',
 'LBL_ADD_BUTTON'=>'Add',
@@ -79,15 +79,15 @@
 'LBL_EXPORTXL_BUTTON'=>'Export To Excel',
 
 //Added for 5 Beta
-'LBL_NO_PERMISSION'=>'Your profile dosen\'t allow you view the reports for one of the  module(s)',
-'LBL_SELECT_COLUMNS_TO_GENERATE_REPORTS'=>'Select columns to generate reports',
+'LBL_NO_PERMISSION'=>'Your vtiger_profile dosen\'t allow you view the vtiger_reports for one of the  module(s)',
+'LBL_SELECT_COLUMNS_TO_GENERATE_REPORTS'=>'Select columns to generate vtiger_reports',
 'LBL_AVAILABLE_FIELDS'=>'Available Fields',
 'LBL_SELECTED_FIELDS'=>'Selected Fields',
 'LBL_CALCULATIONS'=>'Calculations',
 'LBL_SELECT_COLUMNS_TO_TOTAL'=>'Select columns to Total',
 'LBL_SELECT_FILTERS_TO_STREAMLINE_REPORT_DATA'=>'Select Filters to Streamline Report Data',
 'LBL_SELECT_FILTERS'=>'Filters',
-'LBL_SELECT_COLUMNS_TO_GROUP_REPORTS'=>'Select columns to group reports',
+'LBL_SELECT_COLUMNS_TO_GROUP_REPORTS'=>'Select columns to group vtiger_reports',
 'LBL_BACK_TO_REPORTS'=>'Back to Reports',
 'LBL_SELECT_ANOTHER_REPORT'=>'Select Another Report',
 'LBL_SELECT_COLUMN'=>'Select Column',
@@ -101,7 +101,7 @@
 'LBL_REPORT_TYPE'=>'Report Type',
 'LBL_REPORT_DETAILS'=>'Report Details',
 'LBL_TYPE_THE_NAME'=>'Type the Name',
-'LBL_DESCRIPTION_FOR_REPORT'=>'Description for the report',
+'LBL_DESCRIPTION_FOR_REPORT'=>'Description for the vtiger_report',
 'LBL_REPORT_NAME'=>'Report Name',
 'LBL_DESCRIPTION'=>'Description',
 'LBL_TOOLS'=>'Tools',
@@ -112,7 +112,7 @@
 'LBL_SELECT_REPORT_TYPE_BELOW'=>'Select Report type Below',
 'LBL_TABULAR_FORMAT'=>'Tabular Format',
 'LBL_TABULAR_REPORTS_ARE_SIMPLEST'=>'Tabular Reports are the simplest and fastest way of getting your data',
-'LBL_SUMMARY_REPORT_VIEW_DATA_WITH_SUBTOTALS'=>'Summary reports allow you to view your data along with subtotals and other summary information',
+'LBL_SUMMARY_REPORT_VIEW_DATA_WITH_SUBTOTALS'=>'Summary vtiger_reports allow you to view your data along with subtotals and other summary information',
 'LBL_FILTERS'=>'Filters',
 
 )

Modified: vtigercrm/trunk/modules/Rss/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Rss/ListView.php (original)
+++ vtigercrm/trunk/modules/Rss/ListView.php Mon Jun 12 14:26:25 2006
@@ -70,7 +70,7 @@
 {
 	$rss_form->assign("TITLE",gerRssTitle());
 	$rss_html = $oRss->getStarredRssHTML();
-	$query = "select rssid from rss where starred=1";
+	$query = "select rssid from vtiger_rss where starred=1";
 	$result = $adb->query($query);
 	$recordid = $adb->query_result($result,0,'rssid');
 	$rss_form->assign("ID",$recordid);

Modified: vtigercrm/trunk/modules/Rss/Popup.php
==============================================================================
--- vtigercrm/trunk/modules/Rss/Popup.php (original)
+++ vtigercrm/trunk/modules/Rss/Popup.php Mon Jun 12 14:26:25 2006
@@ -19,9 +19,9 @@
 if(isset($_REQUEST["record"]))
 {
 	global $adb;
-	$query = 'update rss set starred=0';
+	$query = 'update vtiger_rss set starred=0';
 	$adb->query($query);
-	$query = 'update rss set starred=1 where rssid ='.$_REQUEST["record"]; 
+	$query = 'update vtiger_rss set starred=1 where vtiger_rssid ='.$_REQUEST["record"]; 
 	$adb->query($query);
 	echo $_REQUEST["record"];
 }

Modified: vtigercrm/trunk/modules/Rss/Rss.php
==============================================================================
--- vtigercrm/trunk/modules/Rss/Rss.php (original)
+++ vtigercrm/trunk/modules/Rss/Rss.php Mon Jun 12 14:26:25 2006
@@ -112,7 +112,7 @@
 				$rsstitle = $url;
 			}
 			$genRssId = $adb->getUniqueID("rss");
-			$sSQL = "insert into rss (RSSID,RSSURL,RSSTITLE,RSSTYPE,STARRED) values (".$genRssId.",'".addslashes($url);
+			$sSQL = "insert into vtiger_rss (RSSID,RSSURL,RSSTITLE,RSSTYPE,STARRED) values (".$genRssId.",'".addslashes($url);
 			$sSQL .= "','".addslashes($rsstitle)."',0,".$makestarred.")";
 			$result = $adb->query($sSQL);
 			if($result)
@@ -129,7 +129,7 @@
 		global $adb;
 		global $image_path;
 
-		$sSQL = "select * from rss where rsstype=1";
+		$sSQL = "select * from vtiger_rss where rsstype=1";
 		$result = $adb->query($sSQL);
 		while($allrssrow = $adb->fetch_array($result))
 		{
@@ -157,7 +157,7 @@
 		global $adb;
 		global $image_path;
 
-		$sSQL = "select * from rss where rsstype <> 1";
+		$sSQL = "select * from vtiger_rss where rsstype <> 1";
 		$result = $adb->query($sSQL);
 		while($allrssrow = $adb->fetch_array($result))	
 		{
@@ -179,8 +179,8 @@
 		return $shtml;
 	}
 
-	/** Function to get the rssurl for the given id  
-	  * This Function accepts the rssid as argument and returns the rssurl for that id
+	/** Function to get the vtiger_rssurl for the given id  
+	  * This Function accepts the vtiger_rssid as argument and returns the vtiger_rssurl for that id
 	 */
 	function getRssUrlfromId($rssid)
 	{
@@ -188,7 +188,7 @@
 
 		if($rssid != "")
 		{
-			$sSQL = "select * from rss where rssid=".$rssid;
+			$sSQL = "select * from vtiger_rss where rssid=".$rssid;
 			$result = $adb->query($sSQL);
 			$rssrow = $adb->fetch_array($result);
 
@@ -207,7 +207,7 @@
 
 		if($rssid != "")
 		{
-			$sSQL = "select * from rss where rssid=".$rssid;
+			$sSQL = "select * from vtiger_rss where rssid=".$rssid;
 			$result = $adb->query($sSQL);
 			$rssrow = $adb->fetch_array($result);
 
@@ -238,7 +238,7 @@
 		global $adb;
 		global $image_path;
 
-		$sSQL = "select * from rss where starred=1";
+		$sSQL = "select * from vtiger_rss where starred=1";
 		$result = $adb->query($sSQL);
 		$shtml .= "<img src=\"".$image_path."rss.gif\" border=\"0\" align=\"absmiddle\" hspace=\"2\"><a href=\"#\" onclick='window.open(\"index.php?module=Rss&action=Popup\",\"new\",\"width=500,height=300,resizable=1,scrollbars=1\");'>Add New Rss</a>";
 
@@ -250,8 +250,8 @@
 		return $shtml;
 	}
 	
-	/** Function to get the rssfeed lists for the starred Rss feeds  
-	  * This Function accepts no argument and returns the rss feeds of 
+	/** Function to get the vtiger_rssfeed lists for the starred Rss feeds  
+	  * This Function accepts no argument and returns the vtiger_rss feeds of 
 	  * the starred Feeds as HTML strings
 	 */
 	function getStarredRssHTML()
@@ -259,7 +259,7 @@
 		global $adb;
 		global $image_path,$mod_strings;
 
-		$sSQL = "select * from rss where starred=1";
+		$sSQL = "select * from vtiger_rss where starred=1";
 		$result = $adb->query($sSQL);
 		while($allrssrow = $adb->fetch_array($result))
 		{
@@ -298,15 +298,15 @@
 
 	}
 
-	/** Function to get the rssfeed lists for the given rssid  
-	  * This Function accepts the rssid as argument and returns the rss feeds as HTML strings
+	/** Function to get the vtiger_rssfeed lists for the given vtiger_rssid  
+	  * This Function accepts the vtiger_rssid as argument and returns the vtiger_rss feeds as HTML strings
 	 */
 	function getSelectedRssHTML($rssid)
 	{
 		global $adb;
 		global $image_path, $mod_strings;
 
-		$sSQL = "select * from rss where rssid=".$rssid;
+		$sSQL = "select * from vtiger_rss where rssid=".$rssid;
 		$result = $adb->query($sSQL);
 		while($allrssrow = $adb->fetch_array($result))
 		{
@@ -372,7 +372,7 @@
 		global $adb;
 		global $image_path;
 
-		$sSQL = "select * from rss";
+		$sSQL = "select * from vtiger_rss";
 		$result = $adb->query($sSQL);
 		while($allrssrow = $adb->fetch_array($result))
 		{
@@ -393,7 +393,7 @@
 
 	}
 
-	/** Function to get the rsscategories   
+	/** Function to get the vtiger_rsscategories   
 	* This Function accepts no argument and returns the categorylist as an array
 	*/
 
@@ -401,7 +401,7 @@
 	{
 		global $adb;
 		global $image_path;
-		$sSQL = "select * from rsscategory where presence = 1 order by sortorderid";
+		$sSQL = "select * from vtiger_rsscategory where presence = 1 order by sortorderid";
 		$result = $adb->query($sSQL);
 
 		while($categoryrow = $adb->fetch_array($result))
@@ -426,17 +426,17 @@
 	}
 }
 
-/** Function to get the rsstitle for the given rssid  
- * This Function accepts the rssid as an optional argument and returns the title
- * if no id is passed it will return the tittle of the starred rss
+/** Function to get the vtiger_rsstitle for the given vtiger_rssid  
+ * This Function accepts the vtiger_rssid as an optional argument and returns the title
+ * if no id is passed it will return the tittle of the starred vtiger_rss
  */
 function gerRssTitle($id='')
 {
 	global $adb;
 	if($id == '')
-		$query = 'select * from rss where starred=1';	 
+		$query = 'select * from vtiger_rss where starred=1';	 
 	else		
-		$query = 'select * from rss where rssid ='.$id;	 
+		$query = 'select * from vtiger_rss where rssid ='.$id;	 
 	$result = $adb->query($query);	
 	$title = $adb->query_result($result,0,'rsstitle');
 	return $title;

Modified: vtigercrm/trunk/modules/Rss/Star.php
==============================================================================
--- vtigercrm/trunk/modules/Rss/Star.php (original)
+++ vtigercrm/trunk/modules/Rss/Star.php Mon Jun 12 14:26:25 2006
@@ -18,7 +18,7 @@
 	if(!isset($_REQUEST[starred])) $starred = 0;
 	$starred = $_REQUEST[starred];
 	
-	$sSQL = "update rss set starred=".$starred." where rssid=".$recordid;
+	$sSQL = "update vtiger_rss set starred=".$starred." where vtiger_rssid=".$recordid;
 	$result = $adb->query($sSQL);
 }
 header("Location: index.php?module=Rss&action=index");

Modified: vtigercrm/trunk/modules/SalesOrder/CreateSOPDF.php
==============================================================================
--- vtigercrm/trunk/modules/SalesOrder/CreateSOPDF.php (original)
+++ vtigercrm/trunk/modules/SalesOrder/CreateSOPDF.php Mon Jun 12 14:26:25 2006
@@ -16,7 +16,7 @@
 
 global $adb,$app_strings,$products_per_page;
 
-$sql="select currency_symbol from currency_info";
+$sql="select vtiger_currency_symbol from vtiger_currency_info";
 $result = $adb->query($sql);
 $currency_symbol = $adb->query_result($result,0,'currency_symbol');
 
@@ -25,7 +25,7 @@
 $products_per_page="6";
 
 $id = $_REQUEST['record'];
-//retreiving the invoice info
+//retreiving the vtiger_invoice info
 $focus = new SalesOrder();
 $focus->retrieve_entity_info($_REQUEST['record'],"SalesOrder");
 $account_name = getAccountName($focus->column_fields[account_id]);
@@ -59,7 +59,7 @@
 $status = $focus->column_fields["sostatus"];
 
 // Company information
-$add_query = "select * from organizationdetails";
+$add_query = "select * from vtiger_organizationdetails";
 $result = $adb->query($add_query);
 $num_rows = $adb->num_rows($result);
 
@@ -85,7 +85,7 @@
 $price_total = $currency_symbol.number_format(StripLastZero($focus->column_fields["hdnGrandTotal"]),2,'.',',');
 
 //getting the Product Data
-$query="select products.productname,products.unit_price,products.product_description,soproductrel.* from soproductrel inner join products on products.productid=soproductrel.productid where salesorderid=".$id;
+$query="select vtiger_products.productname,vtiger_products.unit_price,vtiger_products.product_description,vtiger_soproductrel.* from vtiger_soproductrel inner join vtiger_products on vtiger_products.productid=vtiger_soproductrel.productid where vtiger_salesorderid=".$id;
 
 global $result;
 $result = $adb->query($query);

Modified: vtigercrm/trunk/modules/SalesOrder/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/SalesOrder/EditView.php (original)
+++ vtigercrm/trunk/modules/SalesOrder/EditView.php Mon Jun 12 14:26:25 2006
@@ -48,7 +48,7 @@
 	$focus = getConvertQuoteToSoObject($focus,$quote_focus,$quoteid);
 	$focus->id = $quoteid;
 
-	//Added to display the Quotes's associated products -- when we create SO from Quotes DetailView 
+	//Added to display the Quotes's associated vtiger_products -- when we create SO from Quotes DetailView 
 	$associated_prod = getAssociatedProducts("Quotes",$quote_focus);
 	$smarty->assign("ASSOCIATEDPRODUCTS", $associated_prod);
 	$smarty->assign("MODE", $quote_focus->mode);
@@ -72,7 +72,7 @@
         	}
 
 	}
-	//Handling for dateformat in due_date field
+	//Handling for dateformat in due_date vtiger_field
 	if($focus->column_fields['duedate'] != '')
 	{
 		$curr_due_date = $focus->column_fields['duedate'];
@@ -111,7 +111,7 @@
         		}
 
 		}
-		//Handling for dateformat in due_date field
+		//Handling for dateformat in due_date vtiger_field
 		if($focus->column_fields['duedate'] != '')
 		{
 			$curr_due_date = $focus->column_fields['duedate'];
@@ -123,7 +123,7 @@
 		$quote_focus->retrieve_entity_info($quoteid,"Quotes");
 		$focus = getConvertQuoteToSoObject($focus,$quote_focus,$quoteid);
 
-		//Added to display the Quotes's associated products -- when we select Quote in New SO page
+		//Added to display the Quotes's associated vtiger_products -- when we select Quote in New SO page
 		if(isset($_REQUEST['quote_id']) && $_REQUEST['quote_id'] !='')
 		{
 			$associated_prod = getAssociatedProducts("Quotes",$quote_focus,$focus->column_fields['quote_id']);
@@ -163,7 +163,7 @@
         $associated_prod = getAssociatedProducts("Products",$focus,$focus->column_fields['product_id']);
 }
 
-// Get Account address if account is given
+// Get Account address if vtiger_account is given
 if(isset($_REQUEST['account_id']) && $_REQUEST['record']=='' && $_REQUEST['account_id'] != ''){
 	require_once('modules/Accounts/Account.php');
 	$acct_focus = new Account();

Modified: vtigercrm/trunk/modules/SalesOrder/ListTopSalesOrder.php
==============================================================================
--- vtigercrm/trunk/modules/SalesOrder/ListTopSalesOrder.php (original)
+++ vtigercrm/trunk/modules/SalesOrder/ListTopSalesOrder.php Mon Jun 12 14:26:25 2006
@@ -51,7 +51,7 @@
 	//<<<<<<<<<customview>>>>>>>>>
 	$date_var = date('Y-m-d');
 
-	$where = ' and crmentity.smownerid='.$current_user->id.' and  salesorder.duedate >= \''.$date_var.'\' ORDER BY total DESC';
+	$where = ' and vtiger_crmentity.smownerid='.$current_user->id.' and  vtiger_salesorder.duedate >= \''.$date_var.'\' ORDER BY total DESC';
 	$query = getListQuery("SalesOrder",$where);
 
 	//<<<<<<<<customview>>>>>>>>>

Modified: vtigercrm/trunk/modules/SalesOrder/SalesOrder.php
==============================================================================
--- vtigercrm/trunk/modules/SalesOrder/SalesOrder.php (original)
+++ vtigercrm/trunk/modules/SalesOrder/SalesOrder.php Mon Jun 12 14:26:25 2006
@@ -28,20 +28,20 @@
 require_once('data/CRMEntity.php');
 require_once('include/utils/utils.php');
 
-// Account is used to store account information.
+// Account is used to store vtiger_account information.
 class SalesOrder extends CRMEntity {
 	var $log;
 	var $db;
 
 
-	// Stored fields
+	// Stored vtiger_fields
 	var $id;
 	var $mode;
 	
 		
 	var $table_name = "salesorder";
-	var $tab_name = Array('crmentity','salesorder','sobillads','soshipads','salesordercf');
-	var $tab_name_index = Array('crmentity'=>'crmid','salesorder'=>'salesorderid','sobillads'=>'sobilladdressid','soshipads'=>'soshipaddressid','salesordercf'=>'salesorderid');
+	var $tab_name = Array('vtiger_crmentity','vtiger_salesorder','vtiger_sobillads','vtiger_soshipads','vtiger_salesordercf');
+	var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_salesorder'=>'salesorderid','vtiger_sobillads'=>'sobilladdressid','vtiger_soshipads'=>'soshipaddressid','vtiger_salesordercf'=>'salesorderid');
 				
 	
 	var $entity_table = "crmentity";
@@ -58,10 +58,10 @@
 
 	var $sortby_fields = Array('subject','smownerid');		
 
-	// This is used to retrieve related fields from form posts.
+	// This is used to retrieve related vtiger_fields from form posts.
 	var $additional_column_fields = Array('assigned_user_name', 'smownerid', 'opportunity_id', 'case_id', 'contact_id', 'task_id', 'note_id', 'meeting_id', 'call_id', 'email_id', 'parent_name', 'member_id' );
 
-	// This is the list of fields that are in the lists.
+	// This is the list of vtiger_fields that are in the lists.
 	var $list_fields = Array(
 				'Order Id'=>Array('crmentity'=>'crmid'),
 				'Subject'=>Array('salesorder'=>'subject'),
@@ -99,7 +99,7 @@
 				        'Quote Name'=>'quote_id'
 				      );
 
-	// This is the list of fields that are required.
+	// This is the list of vtiger_fields that are required.
 	var $required_fields =  array("accountname"=>1);
 
 	//Added these variables which are used as default order by and sortorder in ListView
@@ -131,7 +131,7 @@
 		$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')";
+		$query = "SELECT vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid, vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and (activitytype='Task' or vtiger_activitytype='Call' or vtiger_activitytype='Meeting') and vtiger_crmentity.deleted=0 and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Completed') and (vtiger_activity.status is not NULL && vtiger_activity.status !='Deferred') or (vtiger_activity.eventstatus != '' &&  vtiger_activity.eventstatus = 'Planned')";
 		$log->debug("Exiting get_activities method ...");
 		return GetRelatedList('SalesOrder','Activities',$focus,$query,$button,$returnset);
 	}
@@ -144,27 +144,27 @@
 	{
 		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
-			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
-				inner join users on crmentity.smcreatorid=users.id
-				left join activitygrouprelation on activitygrouprelation.activityid=activity.activityid
-                                left join groups on groups.groupname=activitygrouprelation.groupname
-			where (activitytype='Task' or activitytype='Call' or activitytype='Meeting')
-				and (activity.status = 'Completed' or activity.status = 'Deferred' or (activity.eventstatus !='Planned' and activity.eventstatus != ''))
-				and seactivityrel.crmid=".$id;
+		$query = "SELECT vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid,
+			vtiger_activity.*, vtiger_seactivityrel.*, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime,
+			vtiger_crmentity.createdtime, vtiger_crmentity.description, vtiger_users.user_name
+			from vtiger_activity
+				inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid
+				inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid
+				left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid
+				left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid
+				inner join vtiger_users on vtiger_crmentity.smcreatorid=vtiger_users.id
+				left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_activity.activityid
+                                left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname
+			where (activitytype='Task' or vtiger_activitytype='Call' or vtiger_activitytype='Meeting')
+				and (vtiger_activity.status = 'Completed' or vtiger_activity.status = 'Deferred' or (vtiger_activity.eventstatus !='Planned' and vtiger_activity.eventstatus != ''))
+				and vtiger_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);
 	}
 
-/** Function to get attachments associated with the id
+/** Function to get vtiger_attachments associated with the id
  *  This function accepts the id as arguments and execute the MySQL query using the id
  *  and sends the query and the id as arguments to renderRelatedAttachments() method.
 */
@@ -173,41 +173,41 @@
 		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
-		$query = "select notes.title,'Notes      '  ActivityType, notes.filename,
-			attachments.type  FileType,crm2.modifiedtime lastmodified,
-			seattachmentsrel.attachmentsid attachmentsid, notes.notesid crmid,
-			crmentity.createdtime, notes.notecontent description, users.user_name
-		from notes
-			inner join senotesrel on senotesrel.notesid= notes.notesid
-			inner join crmentity on crmentity.crmid= senotesrel.crmid
-			inner join crmentity crm2 on crm2.crmid=notes.notesid and crm2.deleted=0
-			left join seattachmentsrel  on seattachmentsrel.crmid =notes.notesid
-			left join attachments on seattachmentsrel.attachmentsid = attachments.attachmentsid
-			inner join users on crmentity.smcreatorid= users.id
-		where crmentity.crmid=".$id;
+		// Desc: Inserted vtiger_crmentity.createdtime, vtiger_notes.notecontent description, vtiger_users.user_name
+		// Inserted inner join vtiger_users on vtiger_crmentity.smcreatorid= vtiger_users.id
+		$query = "select vtiger_notes.title,'Notes      '  ActivityType, vtiger_notes.filename,
+		vtiger_attachments.type  FileType,crm2.modifiedtime lastmodified,
+		vtiger_seattachmentsrel.attachmentsid vtiger_attachmentsid, vtiger_notes.notesid crmid,
+		vtiger_crmentity.createdtime, vtiger_notes.notecontent description, vtiger_users.user_name
+		from vtiger_notes
+			inner join vtiger_senotesrel on vtiger_senotesrel.notesid= vtiger_notes.notesid
+			inner join vtiger_crmentity on vtiger_crmentity.crmid= vtiger_senotesrel.crmid
+			inner join vtiger_crmentity crm2 on crm2.crmid=vtiger_notes.notesid and crm2.deleted=0
+			left join vtiger_seattachmentsrel  on vtiger_seattachmentsrel.crmid =vtiger_notes.notesid
+			left join vtiger_attachments on vtiger_seattachmentsrel.attachmentsid = vtiger_attachments.attachmentsid
+			inner join vtiger_users on vtiger_crmentity.smcreatorid= vtiger_users.id
+		where vtiger_crmentity.crmid=".$id;
 		$query .= ' union all ';
 		// Armando L?scher 18.10.2005 -> ?visibleDescription
-		// Desc: Inserted crmentity.createdtime, attachments.description, users.user_name
-		// Inserted inner join users on crmentity.smcreatorid= users.id
+		// Desc: Inserted vtiger_crmentity.createdtime, vtiger_attachments.description, vtiger_users.user_name
+		// Inserted inner join vtiger_users on vtiger_crmentity.smcreatorid= vtiger_users.id
 		// Inserted order by createdtime desc
-		$query .= "select attachments.description  title ,'Attachments'  ActivityType,
-			attachments.name  filename, attachments.type  FileType, crm2.modifiedtime lastmodified,
-			attachments.attachmentsid  attachmentsid, seattachmentsrel.attachmentsid crmid,
-			crmentity.createdtime, attachments.description, users.user_name
-		from attachments
-			inner join seattachmentsrel on seattachmentsrel.attachmentsid= attachments.attachmentsid
-			inner join crmentity on crmentity.crmid= seattachmentsrel.crmid
-			inner join crmentity crm2 on crm2.crmid=attachments.attachmentsid
-			inner join users on crmentity.smcreatorid= users.id
-		where crmentity.crmid=".$id."
+		$query .= "select vtiger_attachments.description  title ,'Attachments'  ActivityType,
+		vtiger_attachments.name  filename, vtiger_attachments.type  FileType, crm2.modifiedtime lastmodified,
+		vtiger_attachments.attachmentsid  vtiger_attachmentsid, vtiger_seattachmentsrel.attachmentsid crmid,
+		vtiger_crmentity.createdtime, vtiger_attachments.description, vtiger_users.user_name
+		from vtiger_attachments
+			inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid= vtiger_attachments.attachmentsid
+			inner join vtiger_crmentity on vtiger_crmentity.crmid= vtiger_seattachmentsrel.crmid
+			inner join vtiger_crmentity crm2 on crm2.crmid=vtiger_attachments.attachmentsid
+			inner join vtiger_users on vtiger_crmentity.smcreatorid= vtiger_users.id
+		where vtiger_crmentity.crmid=".$id."
 		order by createdtime desc";
 	$log->debug("Exiting get_attachments method ...");
 	return getAttachmentsAndNotes('SalesOrder',$query,$id,$sid='salesorderid');
 	}
 
-/** Function to get invoices associated with the id
+/** Function to get vtiger_invoices associated with the id
  *  This function accepts the id as arguments and execute the MySQL query using the id
  *  and sends the query and the id as arguments to renderRelatedInvoices() method.
 */
@@ -223,7 +223,7 @@
 		$returnset = '&return_module=SalesOrder&return_action=DetailView&return_id='.$id;
 
 
-		$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;
+		$query = "select vtiger_crmentity.*, vtiger_invoice.*, vtiger_account.accountname, vtiger_salesorder.subject as salessubject from vtiger_invoice inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_invoice.invoiceid left outer join vtiger_account on vtiger_account.accountid=vtiger_invoice.accountid inner join vtiger_salesorder on vtiger_salesorder.salesorderid=vtiger_invoice.salesorderid left join vtiger_invoicegrouprelation on vtiger_invoice.invoiceid=vtiger_invoicegrouprelation.invoiceid left join vtiger_groups on vtiger_groups.groupname=vtiger_invoicegrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_salesorder.salesorderid=".$id;
 		$log->debug("Exiting get_invoices method ...");
 		return GetRelatedList('SalesOrder','Invoice',$focus,$query,$button,$returnset);
 	

Modified: vtigercrm/trunk/modules/SalesOrder/Save.php
==============================================================================
--- vtigercrm/trunk/modules/SalesOrder/Save.php (original)
+++ vtigercrm/trunk/modules/SalesOrder/Save.php Mon Jun 12 14:26:25 2006
@@ -38,14 +38,14 @@
 if($focus->column_fields["quote_id"] != '')
 {
         $qt_id = $focus->column_fields["quote_id"];
-        $query1 = "update quotes set quotestage='Accepted' where quoteid=".$qt_id;
+        $query1 = "update vtiger_quotes set vtiger_quotestage='Accepted' where quoteid=".$qt_id;
         $adb->query($query1);
 }
 
 $ext_prod_arr = Array();
 if($focus->mode == 'edit')
 {
-	$query2  = "select * from soproductrel where salesorderid=".$focus->id;
+	$query2  = "select * from vtiger_soproductrel where vtiger_salesorderid=".$focus->id;
         $result2 = $adb->query($query2);
         $num_rows = $adb->num_rows($result2);
         for($i=0; $i<$num_rows;$i++)
@@ -56,7 +56,7 @@
         }
 
 	
-        $query1 = "delete from soproductrel where salesorderid=".$focus->id;
+        $query1 = "delete from vtiger_soproductrel where vtiger_salesorderid=".$focus->id;
         $adb->query($query1);
 
 }
@@ -84,7 +84,7 @@
         if($prod_status != 'D')
         {
 
-                $query ="insert into soproductrel values($focus->id, $prod_id , $qty, $listprice, $vat, $sales, $service)";
+                $query ="insert into vtiger_soproductrel values($focus->id, $prod_id , $qty, $listprice, $vat, $sales, $service)";
                 $adb->query($query);
 		updateStk($prod_id,$qty,$focus->mode,$ext_prod_arr,'SalesOrder');
         }

Modified: vtigercrm/trunk/modules/SalesOrder/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/SalesOrder/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/SalesOrder/language/en_us.lang.php Mon Jun 12 14:26:25 2006
@@ -81,10 +81,10 @@
 'NTC_COPY_SHIPPING_ADDRESS'=>'Copy shipping address to billing address',
 'NTC_REMOVE_MEMBER_ORG_CONFIRMATION'=>'Are you sure you want to remove this record as a member organization?',
 'LBL_DUPLICATE'=>'Potential Duplicate Accounts',
-'MSG_DUPLICATE' => 'Creating this account may potentialy create a duplicate account. You may either select an account from the list below or you may click on Create New Account to continue creating a new account with the previously entered data.',
+'MSG_DUPLICATE' => 'Creating this vtiger_account may vtiger_potentialy create a duplicate vtiger_account. You may either select an vtiger_account from the list below or you may click on Create New Account to continue creating a new vtiger_account with the previously entered data.',
 
 'LBL_INVITEE'=>'Contacts',
-'ERR_DELETE_RECORD'=>"A record number must be specified to delete the account.",
+'ERR_DELETE_RECORD'=>"A record number must be specified to delete the vtiger_account.",
 
 'LBL_SELECT_ACCOUNT'=>'Select Account',
 'LBL_GENERAL_INFORMATION'=>'General Information',
@@ -104,7 +104,7 @@
 'LBL_NEW_CONTACT'=>'New Contact',
 'LBL_CONTACT_TITLE'=>'Contacts',
 
-//Added fields after RC1 - Release
+//Added vtiger_fields after RC1 - Release
 'LBL_ALL'=>'All',
 'LBL_PROSPECT'=>'Prospect',
 'LBL_INVESTOR'=>'Investor',

Modified: vtigercrm/trunk/modules/SalesOrder/pdf_templates/header.php
==============================================================================
--- vtigercrm/trunk/modules/SalesOrder/pdf_templates/header.php (original)
+++ vtigercrm/trunk/modules/SalesOrder/pdf_templates/header.php Mon Jun 12 14:26:25 2006
@@ -67,7 +67,7 @@
 $dueBlock=array("80","65");
 $pdf->addRecBlock($valid_till, "Due Date",$dueBlock);
 
-// invoice number block
+// vtiger_invoice number block
 $invBlock=array("145","65");
 $pdf->addRecBlock($id, "Invoice Number",$invBlock);
 

Modified: vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php (original)
+++ vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php Mon Jun 12 14:26:25 2006
@@ -23,9 +23,9 @@
 }
 
 
-//checking if the user is trying to create a custom field which already exists  
-
-$checkquery="select * from field where tabid='".$tabid."'and fieldlabel='".$fldlabel."'";
+//checking if the user is trying to create a custom vtiger_field which already exists  
+
+$checkquery="select * from vtiger_field where vtiger_tabid='".$tabid."'and vtiger_fieldlabel='".$fldlabel."'";
 $checkresult=$adb->query($checkquery);
 
 if($adb->num_rows($checkresult) != 0)
@@ -72,7 +72,7 @@
 		$columnName = $max_fieldid;
 	}
   
-	//Assigning the table Name
+	//Assigning the vtiger_table Name
 	$tableName ='';
 	if($fldmodule == 'Leads')
 	{
@@ -228,8 +228,8 @@
 
         
 
-        //1. add the customfield table to the field table as Block4
-        //2. fetch the contents of the custom field and show in the UI
+        //1. add the customfield vtiger_table to the vtiger_field vtiger_table as Block4
+        //2. fetch the contents of the custom vtiger_field and show in the UI
         
 	//retreiving the sequence
 	if($_REQUEST['fieldid'] == '')
@@ -250,30 +250,30 @@
         {
 		if($_REQUEST['fieldid'] == '')
 		{
-			$query = "insert into field values(".$tabid.",".$custfld_fieldid.",'".$columnName."','".$tableName."',2,".$uitype.",'".$columnName."','".$fldlabel."',0,0,0,100,".$custfld_sequece.",$blockid,1,'".$uichekdata."',1,0,'BAS')";
+			$query = "insert into vtiger_field values(".$tabid.",".$custfld_fieldid.",'".$columnName."','".$tableName."',2,".$uitype.",'".$columnName."','".$fldlabel."',0,0,0,100,".$custfld_sequece.",$blockid,1,'".$uichekdata."',1,0,'BAS')";
 			$adb->query($query);
 			$adb->alterTable($tableName, $columnName." ".$type, "Add_Column");
 		}
 		else
 		{
-			$query = "update field set fieldlabel='".$fldlabel."',typeofdata='".$uichekdata."' where fieldid=".$_REQUEST['fieldid'];
+			$query = "update vtiger_field set vtiger_fieldlabel='".$fldlabel."',typeofdata='".$uichekdata."' where vtiger_fieldid=".$_REQUEST['fieldid'];
 			$adb->query($query);
 		}
-		//Inserting values into profile2field tables
+		//Inserting values into vtiger_profile2field vtiger_tables
 		if($_REQUEST['fieldid'] == '')
 		{
-			$sql1 = "select * from profile";
+			$sql1 = "select * from vtiger_profile";
 			$sql1_result = $adb->query($sql1);
 			$sql1_num = $adb->num_rows($sql1_result);
 			for($i=0; $i<$sql1_num; $i++)
 			{
 				$profileid = $adb->query_result($sql1_result,$i,"profileid");
-				$sql2 = "insert into profile2field values(".$profileid.", ".$tabid.", ".$custfld_fieldid.", 0, 1)";
+				$sql2 = "insert into vtiger_profile2field values(".$profileid.", ".$tabid.", ".$custfld_fieldid.", 0, 1)";
 				$adb->query($sql2);	 	
 			}
 
-			//Inserting values into def_org tables
-			$sql_def = "insert into def_org_field values(".$tabid.", ".$custfld_fieldid.", 0, 1)";
+			//Inserting values into def_org vtiger_tables
+			$sql_def = "insert into vtiger_def_org_field values(".$tabid.", ".$custfld_fieldid.", 0, 1)";
 			$adb->query($sql_def);
 		}
 
@@ -283,7 +283,7 @@
 			// Creating the PickList Table and Populating Values
 			$adb->createTable($columnName, $columnName." C(255)");
 			//Adding Primary Key
-			$qur = "ALTER table ".$columnName." ADD PRIMARY KEY (". $columnName.")";
+			$qur = "ALTER vtiger_table ".$columnName." ADD PRIMARY KEY (". $columnName.")";
 			$adb->query($qur);
 
 			$fldPickList =  $_REQUEST['fldPickList'];
@@ -299,11 +299,11 @@
 				}
 			}
 		}
-		//Inserting into LeadMapping table - Jaguar
+		//Inserting into LeadMapping vtiger_table - Jaguar
 		if($fldmodule == 'Leads')
 		{
 
-			$sql_def = "insert into convertleadmapping (leadfid) values(".$custfld_fieldid.")";
+			$sql_def = "insert into vtiger_convertleadmapping (leadfid) values(".$custfld_fieldid.")";
 			$adb->query($sql_def);
 		}
 	}

Modified: vtigercrm/trunk/modules/Settings/AddMailAccount.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/AddMailAccount.php (original)
+++ vtigercrm/trunk/modules/Settings/AddMailAccount.php Mon Jun 12 14:26:25 2006
@@ -30,7 +30,7 @@
 
 if(isset($_REQUEST['record']) && $_REQUEST['record']!='')
 {
-	$sql = "select * from mail_accounts where user_id=".$_REQUEST['record'];
+	$sql = "select * from vtiger_mail_accounts where user_id=".$_REQUEST['record'];
 	$result = $adb->query($sql);
 	$rowcount = $adb->num_rows($result);
 	

Modified: vtigercrm/trunk/modules/Settings/BackupServerConfig.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/BackupServerConfig.php (original)
+++ vtigercrm/trunk/modules/Settings/BackupServerConfig.php Mon Jun 12 14:26:25 2006
@@ -26,7 +26,7 @@
 {
 		$smarty->assign("ERROR_MSG",'<b><font color="purple">'.$_REQUEST["error"].'</font></b>');
 }
-$sql="select * from systems where server_type = 'backup'";
+$sql="select * from vtiger_systems where server_type = 'backup'";
 $result = $adb->query($sql);
 $server = $adb->query_result($result,0,'server');
 $server_username = $adb->query_result($result,0,'server_username');

Modified: vtigercrm/trunk/modules/Settings/CurrencyDelete.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/CurrencyDelete.php (original)
+++ vtigercrm/trunk/modules/Settings/CurrencyDelete.php Mon Jun 12 14:26:25 2006
@@ -11,9 +11,9 @@
 
 $del_id = $_REQUEST['delete_currency_id'];
 $tran_id = $_REQUEST['transfer_currency_id'];
-$sql0 = "update users set currency_id=".$tran_id." where currency_id=".$del_id;
+$sql0 = "update vtiger_users set vtiger_currency_id=".$tran_id." where vtiger_currency_id=".$del_id;
 $adb->query($sql0);
-$sql = "delete from currency_info where id =".$del_id;
+$sql = "delete from vtiger_currency_info where id =".$del_id;
 $adb->query($sql);
 header("Location: index.php?action=SettingsAjax&module=Settings&file=CurrencyListView&ajax=true");
 

Modified: vtigercrm/trunk/modules/Settings/CurrencyDeleteStep1.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/CurrencyDeleteStep1.php (original)
+++ vtigercrm/trunk/modules/Settings/CurrencyDeleteStep1.php Mon Jun 12 14:26:25 2006
@@ -15,7 +15,7 @@
 require_once('include/utils/utils.php');
 
 $delete_currency_id = $_REQUEST['id'];
-$sql = "select * from currency_info where id=".$delete_currency_id;
+$sql = "select * from vtiger_currency_info where id=".$delete_currency_id;
 $result = $adb->query($sql);
 $delete_currencyname = $adb->query_result($result,0,"currency_name");
 
@@ -48,7 +48,7 @@
 $output.='<select class="select" name="transfer_currency_id" id="transfer_currency_id">';
 	     
 		 global $adb;	
-         $sql = "select * from currency_info";
+         $sql = "select * from vtiger_currency_info";
          $result = $adb->query($sql);
          $temprow = $adb->fetch_array($result);
          do

Modified: vtigercrm/trunk/modules/Settings/CurrencyEditView.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/CurrencyEditView.php (original)
+++ vtigercrm/trunk/modules/Settings/CurrencyEditView.php Mon Jun 12 14:26:25 2006
@@ -18,10 +18,10 @@
 if(isset($_REQUEST['record']) && $_REQUEST['record']!='')
 {
         $tempid = $_REQUEST['record'];
-        $sql = "select * from currency_info where id=".$tempid;
+        $sql = "select * from vtiger_currency_info where id=".$tempid;
         $result = $adb->query($sql);
         $currencyResult = $adb->fetch_array($result);
-	$sql1 = "select * from users where currency_id=".$tempid;
+	$sql1 = "select * from vtiger_users where vtiger_currency_id=".$tempid;
 	$result1 = $adb->query($sql1);
 	$noofrows = $adb->num_rows($result1);
 	if($noofrows != 0)

Modified: vtigercrm/trunk/modules/Settings/CurrencyListView.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/CurrencyListView.php (original)
+++ vtigercrm/trunk/modules/Settings/CurrencyListView.php Mon Jun 12 14:26:25 2006
@@ -17,7 +17,7 @@
 $image_path=$theme_path."images/";
 $smarty=new vtigerCRM_Smarty;
    $parenttab = $_REQUEST['parenttab'];
-   $sql = "select * from currency_info";
+   $sql = "select * from vtiger_currency_info";
    $result = $adb->query($sql);
    $temprow = $adb->fetch_array($result);
    $cnt=1;

Modified: vtigercrm/trunk/modules/Settings/DeleteCustomField.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/DeleteCustomField.php (original)
+++ vtigercrm/trunk/modules/Settings/DeleteCustomField.php Mon Jun 12 14:26:25 2006
@@ -19,18 +19,18 @@
 $uitype = $_REQUEST["uitype"];
 
 //Deleting the CustomField from the Custom Field Table
-$query='delete from field where fieldid="'.$id.'"';
+$query='delete from vtiger_field where vtiger_fieldid="'.$id.'"';
 $adb->query($query);
 
-//Deleting from profile2field table
-$query='delete from profile2field where fieldid="'.$id.'"';
+//Deleting from vtiger_profile2field vtiger_table
+$query='delete from vtiger_profile2field where vtiger_fieldid="'.$id.'"';
 $adb->query($query);
 
-//Deleting from def_org_field table
-$query='delete from def_org_field where fieldid="'.$id.'"';
+//Deleting from vtiger_def_org_field vtiger_table
+$query='delete from vtiger_def_org_field where vtiger_fieldid="'.$id.'"';
 $adb->query($query);
 
-//Dropping the column in the module table
+//Dropping the column in the module vtiger_table
 if($fld_module == "Leads")
 {
 	$tableName = "leadscf";
@@ -57,20 +57,20 @@
 }
 //echo '<BR>';
 //echo $tableName;
-$dbquery = 'Alter table '.$tableName.' Drop Column '.$colName;
+$dbquery = 'Alter vtiger_table '.$tableName.' Drop Column '.$colName;
 $adb->query($dbquery);
 
-//Deleting from convert lead mapping table- Jaguar
+//Deleting from convert lead mapping vtiger_table- Jaguar
 if($fld_module=="Leads")
 {
-	$deletequery = 'delete from convertleadmapping where leadfid='.$id;
+	$deletequery = 'delete from vtiger_convertleadmapping where leadfid='.$id;
 	$adb->query($deletequery);
 }
 
 
 if($uitype == 15)
 {
-$deltablequery = 'drop table '.$colName;
+$deltablequery = 'drop vtiger_table '.$colName;
 $adb->query($deltablequery);
 }
 header("Location:index.php?module=Settings&action=CustomFieldList&fld_module=".$fld_module."&parenttab=Settings");

Modified: vtigercrm/trunk/modules/Settings/DeleteLeadCustomFieldMapping.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/DeleteLeadCustomFieldMapping.php (original)
+++ vtigercrm/trunk/modules/Settings/DeleteLeadCustomFieldMapping.php Mon Jun 12 14:26:25 2006
@@ -16,7 +16,7 @@
 
 if($id !='')
 {
-	$sql="update convertleadmapping set accountfid ='NULL',contactfid='NULL',potentialfid='NULL' where cfmid=".$id;
+	$sql="update vtiger_convertleadmapping set vtiger_accountfid ='NULL',contactfid='NULL',potentialfid='NULL' where cfmid=".$id;
 	$result = $adb->query($sql);
 }
 

Modified: vtigercrm/trunk/modules/Settings/DeleteMailAccount.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/DeleteMailAccount.php (original)
+++ vtigercrm/trunk/modules/Settings/DeleteMailAccount.php Mon Jun 12 14:26:25 2006
@@ -21,7 +21,7 @@
 {
 	if($account_id != '')
 	{
-		$query = "update mail_accounts set status=0 where account_id=".$account_id;
+		$query = "update vtiger_mail_accounts set status=0 where vtiger_account_id=".$account_id;
 		$adb->query($query);
 	}
 }

Modified: vtigercrm/trunk/modules/Settings/EditCompanyDetails.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/EditCompanyDetails.php (original)
+++ vtigercrm/trunk/modules/Settings/EditCompanyDetails.php Mon Jun 12 14:26:25 2006
@@ -28,7 +28,7 @@
 			$smarty->assign("ERRORFLAG","<font color='red'><B>Error Message<ul><li><font color='red'>Invalid file OR</font><li><font color='red'>File has no data</font></ul></B></font>");
 			break;
 		case 3:
-			$smarty->assign("ERRORFLAG","<B><font color='red'>Sorry, the uploaded file exceeds the maximum filesize limit. Please try a file smaller than 800000 bytes</font></B>");
+			$smarty->assign("ERRORFLAG","<B><font color='red'>Sorry, the uploaded file exceeds the maximum vtiger_filesize limit. Please try a file smaller than 800000 bytes</font></B>");
 			break;
 		case 4:
 			$smarty->assign("ERRORFLAG","<b>Problems in file upload. Please try again! </b><br>");
@@ -44,7 +44,7 @@
 $image_path=$theme_path."images/";
 require_once($theme_path.'layout_utils.php');
 
-$sql="select * from organizationdetails";
+$sql="select * from vtiger_organizationdetails";
 $result = $adb->query($sql);
 $organization_name = $adb->query_result($result,0,'organizationame');
 $organization_address= $adb->query_result($result,0,'address');

Modified: vtigercrm/trunk/modules/Settings/EditFieldBlock.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/EditFieldBlock.php (original)
+++ vtigercrm/trunk/modules/Settings/EditFieldBlock.php Mon Jun 12 14:26:25 2006
@@ -33,7 +33,7 @@
 	global $adb,$saveNames;
 
 	$b = array();	
-	$sql="select fieldid,fieldlabel,block from field,tab where field.tabid=tab.tabid and tab.tabid=$tabId order by block,sequence";
+	$sql="select vtiger_fieldid,fieldlabel,block from vtiger_field,tab where vtiger_field.tabid=vtiger_tab.tabid and vtiger_tab.tabid=$tabId order by block,sequence";
 	$result = $adb->query($sql);
 	$noofrows = $adb->num_rows($result);
 	
@@ -114,7 +114,7 @@
 		{
 			$item = mysql_escape_string($item);
 			$block  = mysql_escape_string($block);
-			$result = $adb->query("UPDATE field SET `block`='$block',`sequence`='$i' WHERE `fieldid`='$item' $col_check;");
+			$result = $adb->query("UPDATE vtiger_field SET `block`='$block',`sequence`='$i' WHERE `fieldid`='$item' $col_check;");
 			$i ++;
 		}
 	}
@@ -244,7 +244,7 @@
 	?>
 
 	<p align="left">
-		<b>Please review the notes at the bottom for things to keep in mind!<br></b>
+		<b>Please review the vtiger_notes at the bottom for things to keep in mind!<br></b>
 	</p>
 <script language="JavaScript" type="text/javascript" src="include/dd/dd_files/coordinates.js"></script>
 <script language="JavaScript" type="text/javascript" src="include/dd/dd_files/drag.js"></script>
@@ -289,16 +289,16 @@
 	</tr>
 </table>
 <p align="left">
-	1) &nbsp;If you move a field into a currently unused block, you will have to update the appropriate language file in
+	1) &nbsp;If you move a vtiger_field into a currently unused block, you will have to update the appropriate language file in
 	<b>modules/Potentials/language/en_us.lang.php</b>.<br>
-	2) &nbsp;Please see notes on arranging fields below:
+	2) &nbsp;Please see vtiger_notes on arranging vtiger_fields below:
 </p>
 <div align="left">
 	<table border="1" cellpadding="0" cellspacing="0" bordercolordark="white" bordercolorlight="black">
 		<tr>
 			<td width="325" align="right">
 				<p align="center">
-					The tabs are arrange in 2 columns as follows:
+					The vtiger_tabs are arrange in 2 columns as follows:
 				</p>
 			</td>
 			<td width="325" align="right">

Modified: vtigercrm/trunk/modules/Settings/EmailConfig.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/EmailConfig.php (original)
+++ vtigercrm/trunk/modules/Settings/EmailConfig.php Mon Jun 12 14:26:25 2006
@@ -28,7 +28,7 @@
 $image_path=$theme_path."images/";
 require_once($theme_path.'layout_utils.php');
 
-$sql="select * from systems where server_type = 'email'";
+$sql="select * from vtiger_systems where server_type = 'email'";
 $result = $adb->query($sql);
 $mail_server = $adb->query_result($result,0,'server');
 $mail_server_username = $adb->query_result($result,0,'server_username');

Modified: vtigercrm/trunk/modules/Settings/Forms.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/Forms.php (original)
+++ vtigercrm/trunk/modules/Settings/Forms.php Mon Jun 12 14:26:25 2006
@@ -15,7 +15,7 @@
 /*********************************************************************************
  * $Header$
  * Description:  Contains a variety of utility functions used to display UI
- * components such as form headers and footers.  Intended to be modified on a per
+ * components such as form vtiger_headers and footers.  Intended to be modified on a per
  * theme basis.
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
  * All Rights Reserved.
@@ -88,7 +88,7 @@
 }
 
 /**
- * Create HTML form to enter a new record with the minimum necessary fields.
+ * Create HTML form to enter a new record with the minimum necessary vtiger_fields.
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
  * All Rights Reserved.
  * Contributor(s): ______________________________________..
@@ -115,7 +115,7 @@
 $qcreate_form = get_left_form_header($mod_strings['LBL_NEW_FORM_TITLE']);
 
 
-$qcreate_get_field="select * from field where tabid=4 and quickcreate=0 order by quickcreatesequence";
+$qcreate_get_field="select * from vtiger_field where vtiger_tabid=4 and quickcreate=0 order by quickcreatesequence";
 $qcreate_get_result=$adb->query($qcreate_get_field);
 $qcreate_get_noofrows=$adb->num_rows($qcreate_get_result);
 
@@ -203,9 +203,9 @@
 $qcreate_form.='</form>';
 $qcreate_form.='<script type="text/javascript">
 
-        var fieldname = new Array('.$fieldName.')
-        var fieldlabel = new Array('.$fieldLabel.')
-        var fielddatatype = new Array('.$fldDataType.')
+        var vtiger_fieldname = new Array('.$fieldName.')
+        var vtiger_fieldlabel = new Array('.$fieldLabel.')
+        var vtiger_fielddatatype = new Array('.$fldDataType.')
 
                 </script>';
 

Modified: vtigercrm/trunk/modules/Settings/LeadCustomFieldMapping.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/LeadCustomFieldMapping.php (original)
+++ vtigercrm/trunk/modules/Settings/LeadCustomFieldMapping.php Mon Jun 12 14:26:25 2006
@@ -31,7 +31,7 @@
 {
 	global $adb;
 	$accountcf=Array();
-	$sql="select fieldid,fieldlabel from field,tab where field.tabid=tab.tabid and generatedtype=2 and tab.name='Accounts'";
+	$sql="select vtiger_fieldid,fieldlabel from vtiger_field,tab where vtiger_field.tabid=vtiger_tab.tabid and generatedtype=2 and vtiger_tab.name='Accounts'";
 	$result = $adb->query($sql);
 	$noofrows = $adb->num_rows($result);
 	
@@ -54,7 +54,7 @@
 {	
 	global $adb;	
 	$contactcf=Array();
-	$sql="select fieldid,fieldlabel from field,tab where field.tabid=tab.tabid and generatedtype=2 and tab.name='Contacts'";
+	$sql="select vtiger_fieldid,fieldlabel from vtiger_field,tab where vtiger_field.tabid=vtiger_tab.tabid and generatedtype=2 and vtiger_tab.name='Contacts'";
 	$result = $adb->query($sql);
 	$noofrows = $adb->num_rows($result);
 	for($i=0; $i<$noofrows; $i++)
@@ -76,7 +76,7 @@
 {
 	global $adb;	
 	$potentialcf=Array();
-	$sql="select fieldid,fieldlabel from field,tab where field.tabid=tab.tabid and generatedtype=2 and tab.name='Potentials'";
+	$sql="select vtiger_fieldid,fieldlabel from vtiger_field,tab where vtiger_field.tabid=vtiger_tab.tabid and generatedtype=2 and vtiger_tab.name='Potentials'";
 	$result = $adb->query($sql);
 	$noofrows = $adb->num_rows($result);
 	for($i=0; $i<$noofrows; $i++)
@@ -93,7 +93,7 @@
 	$potentialcf[$leadid.'_potential']=$potential_cfelement;
         return $potentialcf;
 }
-$lead_sql="select fieldid,fieldlabel from field,tab where field.tabid=tab.tabid and generatedtype=2 and tab.name='Leads'";
+$lead_sql="select vtiger_fieldid,fieldlabel from vtiger_field,tab where vtiger_field.tabid=vtiger_tab.tabid and generatedtype=2 and vtiger_tab.name='Leads'";
 $result = $adb->query($lead_sql);
 $noofrows = $adb->num_rows($result);
 
@@ -103,7 +103,7 @@
 {
 	$lead_field['fieldid']=$adb->query_result($result,$i,"fieldid");
 	$lead_field['fieldlabel']=$adb->query_result($result,$i,"fieldlabel");
-	$convert_sql="select * from convertleadmapping where leadfid=".$lead_field['fieldid'];
+	$convert_sql="select * from vtiger_convertleadmapping where leadfid=".$lead_field['fieldid'];
 	$convert_result = $adb->query($convert_sql);
 
 	$no_rows = $adb->num_rows($convert_result);

Modified: vtigercrm/trunk/modules/Settings/ListLeadCustomFieldMapping.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/ListLeadCustomFieldMapping.php (original)
+++ vtigercrm/trunk/modules/Settings/ListLeadCustomFieldMapping.php Mon Jun 12 14:26:25 2006
@@ -26,7 +26,7 @@
 function getListLeadMapping($image_path)
 {
 	global $adb;
-	$sql="select * from convertleadmapping";
+	$sql="select * from vtiger_convertleadmapping";
 	$result = $adb->query($sql);
 	$noofrows = $adb->num_rows($result);
 	for($i =0;$i <$noofrows;$i++)
@@ -38,20 +38,20 @@
 		$cfmid = $adb->query_result($result,$i,'cfmid');
 
 		$display_val .= '<tr height="20" class="Datafield">';
-		$sql1="select fieldlabel from field where fieldid ='".$leadid."'";
+		$sql1="select vtiger_fieldlabel from vtiger_field where vtiger_fieldid ='".$leadid."'";
 		$result1 = $adb->query($sql1);
 		$leadfield = $adb->query_result($result1,0,'fieldlabel');
 		$label['leadlabel'] = $leadfield;
-		$sql2="select fieldlabel from field where fieldid ='".$accountid."'";
+		$sql2="select vtiger_fieldlabel from vtiger_field where vtiger_fieldid ='".$accountid."'";
 		$result2 = $adb->query($sql2);
 		$accountfield = $adb->query_result($result2,0,'fieldlabel');
 		$label['accountlabel'] = $accountfield;
 		
-		$sql3="select fieldlabel from field where fieldid ='".$contactid."'";
+		$sql3="select vtiger_fieldlabel from vtiger_field where vtiger_fieldid ='".$contactid."'";
 		$result3 = $adb->query($sql3);
 		$contactfield = $adb->query_result($result3,0,'fieldlabel');
 		$label['contactlabel'] = $contactfield;
-		$sql4="select fieldlabel from field where fieldid ='".$potentialid."'";
+		$sql4="select vtiger_fieldlabel from vtiger_field where vtiger_fieldid ='".$potentialid."'";
 		$result4 = $adb->query($sql4);
 		$potentialfield = $adb->query_result($result4,0,'fieldlabel');
 		$label['potentiallabel'] = $potentialfield;

Modified: vtigercrm/trunk/modules/Settings/ListModuleOwners.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/ListModuleOwners.php (original)
+++ vtigercrm/trunk/modules/Settings/ListModuleOwners.php Mon Jun 12 14:26:25 2006
@@ -27,7 +27,7 @@
 		$tabid = getTabid($val);
 		if($tabid != '' && $userid != '')
 		{
-			$sql = 'update moduleowners set user_id = '.$userid.' where tabid = '.$tabid;
+			$sql = 'update vtiger_moduleowners set user_id = '.$userid.' where vtiger_tabid = '.$tabid;
 			$adb->query($sql);
 		}
 	}
@@ -81,7 +81,7 @@
 function getModuleOwner($tabid)
 {
 	global $adb;
-	$sql = "select * from moduleowners where tabid=".$tabid;
+	$sql = "select * from vtiger_moduleowners where vtiger_tabid=".$tabid;
 	$res = $adb->query($sql);
 	$userid = $adb->query_result($res,0,'user_id');
 
@@ -92,7 +92,7 @@
 {
 	global $adb;
 
-	$sql = "select moduleowners.*, tab.name from moduleowners inner join tab on moduleowners.tabid = tab.tabid order by tab.tabsequence";
+	$sql = "select vtiger_moduleowners.*, vtiger_tab.name from vtiger_moduleowners inner join vtiger_tab on vtiger_moduleowners.tabid = vtiger_tab.tabid order by vtiger_tab.tabsequence";
 	$res = $adb->query($sql);
 	$mod_array = Array();
 	while($row = $adb->fetchByAssoc($res))
@@ -106,7 +106,7 @@
 	global $adb;
 
 	$tabid = getTabid($name);
-	$sql = "select * from moduleowners where tabid=".$tabid;
+	$sql = "select * from vtiger_moduleowners where vtiger_tabid=".$tabid;
 	$res = $adb->query($sql);
 	$db_userid = $adb->query_result($res,0,'user_id');
 	

Modified: vtigercrm/trunk/modules/Settings/OrganizationConfig.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/OrganizationConfig.php (original)
+++ vtigercrm/trunk/modules/Settings/OrganizationConfig.php Mon Jun 12 14:26:25 2006
@@ -35,7 +35,7 @@
 
 $smarty = new vtigerCRM_Smarty;
 
-$sql="select * from organizationdetails";
+$sql="select * from vtiger_organizationdetails";
 $result = $adb->query($sql);
 $organization_name = $adb->query_result($result,0,'organizationame');
 $organization_address= $adb->query_result($result,0,'address');

Modified: vtigercrm/trunk/modules/Settings/PickList.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/PickList.php (original)
+++ vtigercrm/trunk/modules/Settings/PickList.php Mon Jun 12 14:26:25 2006
@@ -48,7 +48,7 @@
 	global $adb;
 	$user_fld = Array();
 	$tabid = getTabid($fldmodule);
-	$query = "select fieldlabel,generatedtype,columnname,fieldname from field where displaytype = 1 and (tabid = ".getTabid($fld_module)." AND uitype IN (15,16)) OR (tabid = ".getTabid($fld_module)." AND fieldname='salutationtype')";
+	$query = "select vtiger_fieldlabel,generatedtype,columnname,fieldname from vtiger_field where displaytype = 1 and (tabid = ".getTabid($fld_module)." AND uitype IN (15,16)) OR (tabid = ".getTabid($fld_module)." AND vtiger_fieldname='salutationtype')";
 	$result = $adb->query($query);
 	$noofrows = $adb->num_rows($result);
     if($noofrows > 0)
@@ -115,7 +115,7 @@
 function getPickListModules()
 {
 	global $adb;
-	$query = 'select distinct field.fieldname,field.tabid,tablabel from field inner join tab on tab.tabid=field.tabid where uitype IN (15,16)';
+	$query = 'select distinct vtiger_field.fieldname,vtiger_field.tabid,tablabel from vtiger_field inner join vtiger_tab on vtiger_tab.tabid=vtiger_field.tabid where uitype IN (15,16)';
 	$result = $adb->query($query);
 	while($row = $adb->fetch_array($result))
 	{

Modified: vtigercrm/trunk/modules/Settings/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/Save.php (original)
+++ vtigercrm/trunk/modules/Settings/Save.php Mon Jun 12 14:26:25 2006
@@ -21,17 +21,17 @@
 else
 	$smtp_auth = 'false';
 
-$sql="select * from systems where server_type = '".$server_type."'";
+$sql="select * from vtiger_systems where server_type = '".$server_type."'";
 $id=$adb->query_result($adb->query($sql),0,"id");
 
 
 if($id=='')
 {
 	$id = $adb->getUniqueID("systems");
-	$sql="insert into systems values(" .$id .",'".$server."','".$server_username."','".$server_password."','".$server_type."','".$smtp_auth."')";
+	$sql="insert into vtiger_systems values(" .$id .",'".$server."','".$server_username."','".$server_password."','".$server_type."','".$smtp_auth."')";
 }
 else
-	$sql="update systems set server = '".$server."', server_username = '".$server_username."', server_password = '".$server_password."', smtp_auth='".$smtp_auth."', server_type = '".$server_type."' where id = ".$id;
+	$sql="update vtiger_systems set server = '".$server."', server_username = '".$server_username."', server_password = '".$server_password."', smtp_auth='".$smtp_auth."', server_type = '".$server_type."' where id = ".$id;
 
 $adb->query($sql);
 if($server_type == 'backup')

Modified: vtigercrm/trunk/modules/Settings/SaveCompany.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/SaveCompany.php (original)
+++ vtigercrm/trunk/modules/Settings/SaveCompany.php Mon Jun 12 14:26:25 2006
@@ -22,17 +22,17 @@
 $organization_fax=$_REQUEST['organization_fax'];
 $organization_website=$_REQUEST['organization_website'];
 
-$sql="select * from organizationdetails where organizationame = '".$org_name."'";
+$sql="select * from vtiger_organizationdetails where organizationame = '".$org_name."'";
 $result = $adb->query($sql);
 $org_name = $adb->query_result($result,0,'organizationame');
 
 if($org_name=='')
 {
-	$sql="insert into organizationdetails values( '".$organization_name ."','".$organization_address."','". $organization_city."','".$organization_state."','".$organization_code."','".$organization_country."','".$organization_phone."','".$organization_fax."','".$organization_website."')";
+	$sql="insert into vtiger_organizationdetails values( '".$organization_name ."','".$organization_address."','". $organization_city."','".$organization_state."','".$organization_code."','".$organization_country."','".$organization_phone."','".$organization_fax."','".$organization_website."')";
 }
 else
 {
-	$sql="update organizationdetails set organizationame = '".$organization_name."', address = '".$organization_address."', city = '".$organization_city."', state = '".$organization_state."',  code = '".$organization_code."', country = '".$organization_country."' ,  phone = '".$organization_phone."' ,  fax = '".$organization_fax."',  website = '".$organization_website."' where organizationame = '".$org_name."'";
+	$sql="update vtiger_organizationdetails set organizationame = '".$organization_name."', address = '".$organization_address."', city = '".$organization_city."', state = '".$organization_state."',  code = '".$organization_code."', country = '".$organization_country."' ,  phone = '".$organization_phone."' ,  fax = '".$organization_fax."',  website = '".$organization_website."' where organizationame = '".$org_name."'";
 }	
 
 

Modified: vtigercrm/trunk/modules/Settings/SaveConvertLead.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/SaveConvertLead.php (original)
+++ vtigercrm/trunk/modules/Settings/SaveConvertLead.php Mon Jun 12 14:26:25 2006
@@ -15,7 +15,7 @@
 
 //echo"<h3> In Save</h3>";
 	
-	$sql="select fieldid from field, tab where field.tabid=tab.tabid and generatedtype=2 and tab.name='Leads';";	
+	$sql="select vtiger_fieldid from vtiger_field, vtiger_tab where vtiger_field.tabid=vtiger_tab.tabid and generatedtype=2 and vtiger_tab.name='Leads';";	
 //	echo $sql;	
 	$result = $adb->query($sql);
 	$noofrows = $adb->num_rows($result);
@@ -43,7 +43,7 @@
 		{
 			$potential_id_val="";
 		}
-		$update_sql="update convertleadmapping set accountfid='".$account_id_val."',contactfid='".$contact_id_val."',potentialfid='".$potential_id_val."' where leadfid=".$lead_id;
+		$update_sql="update vtiger_convertleadmapping set vtiger_accountfid='".$account_id_val."',contactfid='".$contact_id_val."',potentialfid='".$potential_id_val."' where leadfid=".$lead_id;
 
 		$adb->query($update_sql);
 	}

Modified: vtigercrm/trunk/modules/Settings/SaveCurrencyInfo.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/SaveCurrencyInfo.php (original)
+++ vtigercrm/trunk/modules/Settings/SaveCurrencyInfo.php Mon Jun 12 14:26:25 2006
@@ -20,11 +20,11 @@
 
 if(isset($_REQUEST['record']) && $_REQUEST['record']!='')
 {
-        $sql = "update currency_info set currency_name ='".$currency_name."', currency_code ='".$currency_code."', currency_symbol ='".$currency_symbol."', conversion_rate ='".$conversion_rate."',currency_status='".$currency_status."' where id =".$_REQUEST['record'];
+        $sql = "update vtiger_currency_info set vtiger_currency_name ='".$currency_name."', vtiger_currency_code ='".$currency_code."', vtiger_currency_symbol ='".$currency_symbol."', conversion_rate ='".$conversion_rate."',currency_status='".$currency_status."' where id =".$_REQUEST['record'];
 }
 else
 {
-        $sql = "insert into currency_info values(".$db->getUniqueID("currency_info").",'".$currency_name."','".$currency_code."','".$currency_symbol."','".$conversion_rate."','".$currency_status."','0')";
+        $sql = "insert into vtiger_currency_info values(".$db->getUniqueID("currency_info").",'".$currency_name."','".$currency_code."','".$currency_symbol."','".$conversion_rate."','".$currency_status."','0')";
 }
 $adb->query($sql);
 $loc = "Location: index.php?module=Settings&action=CurrencyListView&parenttab=".$_REQUEST['parenttab'];

Modified: vtigercrm/trunk/modules/Settings/SaveMailAccount.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/SaveMailAccount.php (original)
+++ vtigercrm/trunk/modules/Settings/SaveMailAccount.php Mon Jun 12 14:26:25 2006
@@ -28,17 +28,17 @@
 {
 	$id=$_REQUEST['record'];
 }
-#$sql="select * from systems where server_type = '".$server_type."'";
+#$sql="select * from vtiger_systems where server_type = '".$server_type."'";
 #$id=$adb->query_result($adb->query($sql),0,"id");
 
 if(isset($_REQUEST['edit']) && $_REQUEST['edit'] && $_REQUEST['record']!='')
 {
-	$sql="update mail_accounts set display_name = '".$displayname."', mail_id = '".$email."', account_name = '".$account_name."', mail_protocol = '".$mailprotocol."', mail_username = '".$server_username."', mail_password='".$server_password."', mail_servername='".$mail_servername."',  box_refresh='".$box_refresh."',  mails_per_page='".$mails_per_page."', ssltype='".$ssltype."' , sslmeth='".$sslmeth."', int_mailer='".$_REQUEST["int_mailer"]."' where user_id = '".$id."'";
+	$sql="update vtiger_mail_accounts set display_name = '".$displayname."', mail_id = '".$email."', vtiger_account_name = '".$account_name."', mail_protocol = '".$mailprotocol."', mail_username = '".$server_username."', mail_password='".$server_password."', mail_servername='".$mail_servername."',  box_refresh='".$box_refresh."',  mails_per_page='".$mails_per_page."', ssltype='".$ssltype."' , sslmeth='".$sslmeth."', int_mailer='".$_REQUEST["int_mailer"]."' where user_id = '".$id."'";
 }
 else
 {
 	$account_id = $adb->getUniqueID("mail_accounts");
-	$sql="insert into mail_accounts values(" .$account_id .",'".$current_user->id."','".$displayname."','".$email."','".$account_name."','".$mailprotocol."','".$server_username."','".$server_password."','".$mail_servername."','".$box_refresh."','".$mails_per_page."', '".$ssltype."', '".$sslmeth."', '".$_REQUEST["int_mailer"]."','1','0')";
+	$sql="insert into vtiger_mail_accounts values(" .$account_id .",'".$current_user->id."','".$displayname."','".$email."','".$account_name."','".$mailprotocol."','".$server_username."','".$server_password."','".$mail_servername."','".$box_refresh."','".$mails_per_page."', '".$ssltype."', '".$sslmeth."', '".$_REQUEST["int_mailer"]."','1','0')";
 }
 
 $adb->query($sql);

Modified: vtigercrm/trunk/modules/Settings/SettingsSubMenu.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/SettingsSubMenu.php (original)
+++ vtigercrm/trunk/modules/Settings/SettingsSubMenu.php Mon Jun 12 14:26:25 2006
@@ -88,7 +88,7 @@
 		global $theme;
 		$theme_path="themes/".$theme."/";
 		$image_path=$theme_path."images/";
-		$dbQuery = "select fieldid,columnname,fieldlabel,uitype,displaytype from field where tabid=".$tabid." and generatedtype=2 order by sequence";
+		$dbQuery = "select vtiger_fieldid,columnname,fieldlabel,uitype,displaytype from vtiger_field where vtiger_tabid=".$tabid." and generatedtype=2 order by sequence";
 		$result = $adb->query($dbQuery);
 		$row = $adb->fetch_array($result);
 		$count=1;

Modified: vtigercrm/trunk/modules/Settings/TaxConfig.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/TaxConfig.php (original)
+++ vtigercrm/trunk/modules/Settings/TaxConfig.php Mon Jun 12 14:26:25 2006
@@ -63,7 +63,7 @@
 	
 	foreach($taxes_array as $tax_type)
 	{
-		$res = $adb->query("select * from inventorytaxinfo where taxname=\"$tax_type\"");
+		$res = $adb->query("select * from vtiger_inventorytaxinfo where taxname=\"$tax_type\"");
 		$tax_percentages[$tax_type] = $adb->query_result($res,0,'percentage');	
 	}
 	
@@ -84,7 +84,7 @@
 	foreach($new_percentages as $tax_type => $new_val)
 	{
 		if($new_val != '')
-			$res = $adb->query("update inventorytaxinfo set percentage = \"$new_val\" where taxname=\"$tax_type\"");
+			$res = $adb->query("update vtiger_inventorytaxinfo set percentage = \"$new_val\" where taxname=\"$tax_type\"");
 	}
 
 	$log->debug("Exiting from the function updateTaxPercentages");

Modified: vtigercrm/trunk/modules/Settings/add2db.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/add2db.php (original)
+++ vtigercrm/trunk/modules/Settings/add2db.php Mon Jun 12 14:26:25 2006
@@ -99,7 +99,7 @@
 		if(!isset($organization_logoname))
 			$organization_logoname="";
 
-		$sql="SELECT * FROM organizationdetails WHERE organizationame = ".$adb->quote($org_name);
+		$sql="SELECT * FROM vtiger_organizationdetails WHERE organizationame = ".$adb->quote($org_name);
 		$result = $adb->query($sql);
 		$org_name = $adb->query_result($result,0,'organizationame');
 		$org_logo = $adb->query_result($result,0,'logoname'); 
@@ -107,7 +107,7 @@
 
 		if($org_name=='')
 		{
-			$sql="INSERT INTO organizationdetails
+			$sql="INSERT INTO vtiger_organizationdetails
 				(organizationame, address, city, state, code, country, phone, fax, website, logoname)
 				VALUES (".$adb->quote($organization_name).
 					",".$adb->quote($organization_address).
@@ -142,7 +142,7 @@
 				$organization_logoname=$org_logo;
 			}
 
-			$sql = "UPDATE organizationdetails
+			$sql = "UPDATE vtiger_organizationdetails
 				SET organizationame = ".$adb->quote($organization_name).",
 					address = ".$adb->quote($organization_address).",
 					city = ".$adb->quote($organization_city).",

Modified: vtigercrm/trunk/modules/Settings/downloadfile.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/downloadfile.php (original)
+++ vtigercrm/trunk/modules/Settings/downloadfile.php Mon Jun 12 14:26:25 2006
@@ -17,7 +17,7 @@
 
 $fileid = $_REQUEST['fileid'];
 
-//$dbQuery = "SELECT * from seattachmentsrel where crmid = '" .$fileid ."'";
+//$dbQuery = "SELECT * from vtiger_seattachmentsrel where crmid = '" .$fileid ."'";
 //$attachmentsid = $adb->query_result($adb->query($dbQuery),0,'attachmentsid');
 $attachmentsid = $fileid;
 
@@ -26,7 +26,7 @@
 if($_REQUEST['activity_type']=='Settings')
 	$attachmentsid=$fileid;
 
-$dbQuery = "SELECT * FROM organizationdetails ";
+$dbQuery = "SELECT * FROM vtiger_organizationdetails ";
 
 $result = $adb->query($dbQuery) or die("Couldn't get file list");
 if($adb->num_rows($result) == 1)

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 Jun 12 14:26:25 2006
@@ -62,7 +62,7 @@
 
 'LBL_EMAIL_ADDRESS'=>'Email',
 
-'LBL_TRANSCURR'=>'Transfer User currency to',
+'LBL_TRANSCURR'=>'Transfer User vtiger_currency to',
 
 'LBL_CURRDEL'=>'Currency to be Deleted',
 
@@ -273,7 +273,7 @@
 'LBL_TOOL'=>'Tool',
 
 
-//Added fields for Title Informations -- after 4 Beta
+//Added vtiger_fields for Title Informations -- after 4 Beta
 
 'LBL_EMAIL_CONFIG'=>'Outgoing Mail Server Configuration',
 
@@ -291,7 +291,7 @@
 
 
 
-//Added fields after RC1 - Release
+//Added vtiger_fields after RC1 - Release
 
 'LBL_MAIL_SERVER_INFO'=>'Mail Server Information',
 
@@ -337,13 +337,13 @@
 
 'LBL_ROLES'=>'Roles',
 
-'LBL_CREATE_AND_MANAGE_USER_ROLES'=>'- Create and Manage user roles (e.g., Administrator, Standard User, etc.)',
+'LBL_CREATE_AND_MANAGE_USER_ROLES'=>'- Create and Manage user vtiger_roles (e.g., Administrator, Standard User, etc.)',
 
 'LBL_PROFILES'=>'Profiles',
 
-'LBL_CREATE_AND_MANAGE_USER_PROFILES'=>'- Create and Manage user profiles (e.g., CEO, Sales Manager, etc.)',
-
-'LBL_CREATE_AND_MANAGE_USER_GROUPS'=>'- Create and Manage user groups',
+'LBL_CREATE_AND_MANAGE_USER_PROFILES'=>'- Create and Manage user vtiger_profiles (e.g., CEO, Sales Manager, etc.)',
+
+'LBL_CREATE_AND_MANAGE_USER_GROUPS'=>'- Create and Manage user vtiger_groups',
 
 'LBL_SHARING_ACCESS'=>'Sharing Access',
 
@@ -357,8 +357,8 @@
 
 'LBL_FIELD_ACCESSIBILITY'=>'Field Accessibility',
 
-'LBL_SETTING_FIELD_ACCESSIBILITY'=>' - Setting Field Accessibility for each profiles',
-//<<<<<<<<for edit ordering blocks>>>>>>
+'LBL_SETTING_FIELD_ACCESSIBILITY'=>' - Setting Field Accessibility for each vtiger_profiles',
+//<<<<<<<<for edit ordering vtiger_blocks>>>>>>
 'LBL_FIELD_ORDERING_DESC'=>' - Edit Field Order',
 
 'LBL_FIELD_ORDERING'=>'Edit Field Blocks',
@@ -393,7 +393,7 @@
 
 'LBL_CUSTOM_FIELD_SETTINGS'=>'Custom Field Settings',
 
-'LBL_CREATE_AND_MANAGE_USER_DEFINED_FIELDS'=>'Create and Manage user defined fields...',
+'LBL_CREATE_AND_MANAGE_USER_DEFINED_FIELDS'=>'Create and Manage user defined vtiger_fields...',
 
 'LBL_SELECT_MODULE'=>'Select Module',
 
@@ -403,7 +403,7 @@
 
 'LBL_PICKLIST_SETTINGS'=>'Picklist Settings',
 
-'LBL_EDIT_PICKLIST_VALUES'=>' - Edit values of Picklist fields',
+'LBL_EDIT_PICKLIST_VALUES'=>' - Edit values of Picklist vtiger_fields',
 
 'LBL_EDIT'=>'Editing',
 
@@ -433,7 +433,7 @@
 
 
 
-//Field Types for custom fields
+//Field Types for custom vtiger_fields
 
 'LBL_URL'=>'URL',
 
@@ -487,10 +487,10 @@
 'LBL_LIST_PASSWORD'=>'Password',
 'LBL_MAIL_SERVER_NAME'=>'Mail Server Name or IP',
 'LBL_MAIL_SERVER_SETTINGS'=>'Mail Server Settings',
-'LBL_TEST_SETTINGS'=>'Test my account setting immediately',
-'LBL_TEST_BUTTON_TITLE'=>'Test my account now! [Alt+T]',
+'LBL_TEST_SETTINGS'=>'Test my vtiger_account setting immediately',
+'LBL_TEST_BUTTON_TITLE'=>'Test my vtiger_account now! [Alt+T]',
 'LBL_TEST_BUTTON_KEY'=>'T',
-'LBL_TEST_BUTTON_LABEL'=>'Test my account now!',
+'LBL_TEST_BUTTON_LABEL'=>'Test my vtiger_account now!',
 'LBL_DEFAULT'=>'Default',
 'LBL_IMAP2'=>'IMAP2',
 'LBL_IMAP4'=>'IMAP4',
@@ -573,8 +573,8 @@
 
 //For Custom Fields
 'LBL_LEAD_MAP_CUSTOM_FIELD'=>'Mapping Lead Custom Fields',
-'leadCustomFieldDescription'=>'Map each of your organizations lead custom fields to each of your custom account
-,contact, or potential fields. These mappings will be used when you convert leads',
+'leadCustomFieldDescription'=>'Map each of your organizations lead custom vtiger_fields to each of your custom vtiger_account
+,contact, or vtiger_potential vtiger_fields. These mappings will be used when you convert leads',
 'LBL_MAPPING_INFO'=>'Mapping Information',
 'LBL_ACCOUNT_FIELD'=>'Account Custom Field',
 'LBL_CONTACT_FIELD'=>'Contact Custom Field',
@@ -584,10 +584,10 @@
 'LBL_LEAD_FIELD'=>'Lead Custom Field',
 //After 4.2 GA
 'LBL_TEXT_AREA'=>'Text Area',
-//for Edit ordering the blocks
+//for Edit ordering the vtiger_blocks
 'NOTESCUSTOMFIELDS'=>'Notes Custom Fields',
 
-//Added fields after 4.2 ptach 2
+//Added vtiger_fields after 4.2 ptach 2
 'LBL_ASSIGN_MODULE_OWNERS'=>'Assign Module Owners',
 'LBL_MODULE_OWNERS'=>'Module Owners',
 'LBL_ASSIGN_MODULE_OWNERS_INFO'=>' - Assign Owners for each modules',
@@ -601,12 +601,12 @@
 'LBL_USER_DESCRIPTION'=>'Manage Users list who access CRM',
 'LBL_ROLE_DESCRIPTION'=>'Define hierarchy of Roles and assign to Users',
 'LBL_PROFILE_DESCRIPTION'=>'Define Profiles to provide access rights to each Role',
-'LBL_GROUP_DESCRIPTION'=>'Define Groups based on roles, users, profiles etc',
+'LBL_GROUP_DESCRIPTION'=>'Define Groups based on vtiger_roles, vtiger_users, vtiger_profiles etc',
 'LBL_SHARING_ACCESS_DESCRIPTION'=>'Define privileges for each Role to access CRM modules',
-'LBL_SHARING_FIELDS_DESCRIPTION'=>'Show or hide fields in each CRM Module',
+'LBL_SHARING_FIELDS_DESCRIPTION'=>'Show or hide vtiger_fields in each CRM Module',
 'LBL_MODULE_OWNERS_DESCRIPTION'=>'Assign Owners for each CRM module',
 'LBL_ANNOUNCEMENT_DESCRIPTION'=>'Edit the contents of Announcements display',
-'LBL_CUSTOM_FIELDS_DESCRIPTION'=>'Create and Manage user-defined fields',
+'LBL_CUSTOM_FIELDS_DESCRIPTION'=>'Create and Manage user-defined vtiger_fields',
 'LBL_PICKLIST_DESCRIPTION'=>'Manage contents of Picklists in all CRM Modules',
 'LBL_EMAIL_TEMPLATE_DESCRIPTION'=>'Manage templates for E-Mail module',
 'LBL_MAIL_MERGE_DESCRIPTION'=>'Manage templates for Mail Merging',
@@ -621,11 +621,11 @@
 
 
 
-//Added fields after 5.0 Alpha
+//Added vtiger_fields after 5.0 Alpha
 'LBL_REQUIRE_SMTP_AUTHENTICATION'=>'Require SMTP Authentication?',
 'LBL_ANNOUNCEMENT'=>'Announcements',
 'LBL_SETTING_ANNOUNCEMENT'=>'Announcement',
-'LBL_ANNOUNCEMENT_INFO'=>'Type the announcement text below, and click the save button.',
+'LBL_ANNOUNCEMENT_INFO'=>'Type the vtiger_announcement text below, and click the save button.',
 'LBL_EMAIL_CONTENTS'=>'Email Contents',
 'LBL_SUBJECT'=>'Subject',
 'LBL_MESSAGE'=>'Message',

Modified: vtigercrm/trunk/modules/Users/Announcements.php
==============================================================================
--- vtigercrm/trunk/modules/Users/Announcements.php (original)
+++ vtigercrm/trunk/modules/Users/Announcements.php Mon Jun 12 14:26:25 2006
@@ -15,7 +15,7 @@
 global $theme;
 $theme_path="themes/".$theme."/";
 $image_path=$theme_path."images/";
-$query="select * from announcement where creatorid=".$current_user->id;
+$query="select * from vtiger_announcement where creatorid=".$current_user->id;
 $result=$adb->query($query);
 $announcement=$adb->query_result($result,0,'announcement');
 $title_prev=$adb->query_result($result,0,'title');

Modified: vtigercrm/trunk/modules/Users/Authenticate.php
==============================================================================
--- vtigercrm/trunk/modules/Users/Authenticate.php (original)
+++ vtigercrm/trunk/modules/Users/Authenticate.php Mon Jun 12 14:26:25 2006
@@ -55,7 +55,7 @@
 	//$rolename = fetchUserRole($focus->id);
 	//$profilename = fetchUserProfile($focus->id);
 	$profileid = fetchUserProfileId($focus->id);	
-	//setting the role into the session
+	//setting the vtiger_role into the session
 	//$_SESSION['authenticated_user_roleid'] = $profilename;
 
 	//Setting the Object in Session
@@ -128,7 +128,7 @@
         $log->debug("app_unique_key is $application_unique_key");
 
 	
-// Clear all uploaded import files for this user if it exists
+// Clear all uploaded import vtiger_files for this user if it exists
 
 	global $import_dir;
 

Modified: vtigercrm/trunk/modules/Users/ChangePassword.php
==============================================================================
--- vtigercrm/trunk/modules/Users/ChangePassword.php (original)
+++ vtigercrm/trunk/modules/Users/ChangePassword.php Mon Jun 12 14:26:25 2006
@@ -88,17 +88,17 @@
 <?php if (!is_admin($current_user)) {
 	echo "<tr>";
 	echo "<td width='40%' class='dvtCellLabel' align='right'><b>".$mod_strings['LBL_OLD_PASSWORD']."</b></td>\n";
-	echo "<td width='60%' class='dvtCellInfo'><input name='old_password' type='password' tabindex='1' size='15' maxlength='15'></td>\n";
+	echo "<td width='60%' class='dvtCellInfo'><input name='old_password' type='password' vtiger_tabindex='1' size='15' maxlength='15'></td>\n";
 	echo "<input name='is_admin' type='hidden' value='1'>";
 	echo "</tr><tr>\n";
 }
 else echo "<input name='old_password' type='hidden'><input name='is_admin' type='hidden' value='0'>";
 ?>
 <td width='40%' class='dvtCellLabel' nowrap align="right"><b><?php echo $mod_strings['LBL_NEW_PASSWORD']; ?></b></td>
-<td width='60%' class='dvtCellInfo'><input name='new_password' type='password' tabindex='1' size='15' maxlength='15'></td>
+<td width='60%' class='dvtCellInfo'><input name='new_password' type='password' vtiger_tabindex='1' size='15' maxlength='15'></td>
 </tr><tr>
 <td width='40%' class='dvtCellLabel' nowrap align="right"><b><?php echo $mod_strings['LBL_CONFIRM_PASSWORD']; ?></b></td>
-<td width='60%' class='dvtCellInfo'><input name='confirm_new_password' type='password' tabindex='1' size='15' maxlength='15'></td>
+<td width='60%' class='dvtCellInfo'><input name='confirm_new_password' type='password' vtiger_tabindex='1' size='15' maxlength='15'></td>
 </tr><tr>
 <td width='40%' class='dataLabel'></td>
 <td width='60%' class='dvtCellInfo'></td>

Modified: vtigercrm/trunk/modules/Users/CreateProfile.php
==============================================================================
--- vtigercrm/trunk/modules/Users/CreateProfile.php (original)
+++ vtigercrm/trunk/modules/Users/CreateProfile.php Mon Jun 12 14:26:25 2006
@@ -33,7 +33,7 @@
 if(isset($_REQUEST['profileid']) && $_REQUEST['profileid'] != '')
 {
 	global $adb;	
-	$sql = "select * from profile where profileid=".$_REQUEST['profileid'];
+	$sql = "select * from vtiger_profile where vtiger_profileid=".$_REQUEST['profileid'];
 	$profileResult = $adb->query($sql);
 	$profile_name = $adb->query_result($profileResult,0,"profilename");
 	$profile_description = $adb->query_result($profileResult,0,"description");

Modified: vtigercrm/trunk/modules/Users/CreateProfile1.php
==============================================================================
--- vtigercrm/trunk/modules/Users/CreateProfile1.php (original)
+++ vtigercrm/trunk/modules/Users/CreateProfile1.php Mon Jun 12 14:26:25 2006
@@ -18,7 +18,7 @@
 
 if(isset($_REQUEST['dup_check']) && $_REQUEST['dup_check']!='')
 {
-        $query = 'select profilename from profile where profilename="'.$profilename.'"';
+        $query = 'select vtiger_profilename from vtiger_profile where vtiger_profilename="'.$profilename.'"';
         $result = $adb->query($query);
 
         if($adb->num_rows($result) > 0)
@@ -55,7 +55,7 @@
 $smarty->assign("APP", $app_strings);
 $smarty->assign("CMOD", $mod_strings);
 
-$sql = "select * from profile";
+$sql = "select * from vtiger_profile";
 $result = $adb->query($sql);
 $profilelist = array();
 $temprow = $adb->fetch_array($result);

Modified: vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php
==============================================================================
--- vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php (original)
+++ vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php Mon Jun 12 14:26:25 2006
@@ -132,7 +132,7 @@
 
 			//Constructing the Related Module Sharing Array
 			$relModSharArr=Array();	
-			$query ="select * from datashare_relatedmodules";
+			$query ="select * from vtiger_datashare_relatedmodules";
                 	$result=$adb->query($query);
                 	$num_rows = $adb->num_rows($result);
                 	for($i=0;$i<$num_rows;$i++)
@@ -390,8 +390,8 @@
 		$rs_write_per=Array();
 		$grp_read_per=Array();
 		$grp_write_per=Array();
-		//Retreiving from role to role
-		$query="select datashare_role2role.* from datashare_role2role inner join datashare_module_rel on datashare_module_rel.shareid=datashare_role2role.shareid where datashare_module_rel.tabid=".$mod_tabid." and datashare_role2role.to_roleid='".$current_user_roles."'";
+		//Retreiving from vtiger_role to vtiger_role
+		$query="select vtiger_datashare_role2role.* from vtiger_datashare_role2role inner join vtiger_datashare_module_rel on vtiger_datashare_module_rel.shareid=vtiger_datashare_role2role.shareid where vtiger_datashare_module_rel.tabid=".$mod_tabid." and vtiger_datashare_role2role.to_roleid='".$current_user_roles."'";
 		$result=$adb->query($query);
 		$num_rows=$adb->num_rows($result);
 		for($i=0;$i<$num_rows;$i++)
@@ -439,14 +439,14 @@
 
 
 
-		//Retreiving from role to rs
+		//Retreiving from vtiger_role to rs
 		$parRoleList = "(";
 		foreach($parent_roles as $par_role_id)
 		{
 			$parRoleList .= "'".$par_role_id."',";		
 		}
 		$parRoleList .= "'".$current_user_roles."')";
-		$query="select datashare_role2rs.* from datashare_role2rs inner join datashare_module_rel on datashare_module_rel.shareid=datashare_role2rs.shareid where datashare_module_rel.tabid=".$mod_tabid." and datashare_role2rs.to_roleandsubid in ".$parRoleList;
+		$query="select vtiger_datashare_role2rs.* from vtiger_datashare_role2rs inner join vtiger_datashare_module_rel on vtiger_datashare_module_rel.shareid=vtiger_datashare_role2rs.shareid where vtiger_datashare_module_rel.tabid=".$mod_tabid." and vtiger_datashare_role2rs.to_roleandsubid in ".$parRoleList;
 		$result=$adb->query($query);
 		$num_rows=$adb->num_rows($result);
 		for($i=0;$i<$num_rows;$i++)
@@ -493,7 +493,7 @@
 		}
 
 
-		//Get roles from Role2Grp
+		//Get vtiger_roles from Role2Grp
 		$grpIterator=false;
 		$groupList = "(";
 		foreach($current_user_groups as $grp_id)
@@ -507,7 +507,7 @@
 		}
 		$groupList .= ")";
 
-		$query="select datashare_role2group.* from datashare_role2group inner join datashare_module_rel on datashare_module_rel.shareid=datashare_role2group.shareid where datashare_module_rel.tabid=".$mod_tabid." and datashare_role2group.to_groupid in ".$groupList;
+		$query="select vtiger_datashare_role2group.* from vtiger_datashare_role2group inner join vtiger_datashare_module_rel on vtiger_datashare_module_rel.shareid=vtiger_datashare_role2group.shareid where vtiger_datashare_module_rel.tabid=".$mod_tabid." and vtiger_datashare_role2group.to_groupid in ".$groupList;
 		$result=$adb->query($query);
 		$num_rows=$adb->num_rows($result);
 		for($i=0;$i<$num_rows;$i++)
@@ -554,8 +554,8 @@
 
 
 
-		//Retreiving from rs to role
-		$query="select datashare_rs2role.* from datashare_rs2role inner join datashare_module_rel on datashare_module_rel.shareid=datashare_rs2role.shareid where datashare_module_rel.tabid=".$mod_tabid." and datashare_rs2role.to_roleid='".$current_user_roles."'";
+		//Retreiving from rs to vtiger_role
+		$query="select vtiger_datashare_rs2role.* from vtiger_datashare_rs2role inner join vtiger_datashare_module_rel on vtiger_datashare_module_rel.shareid=vtiger_datashare_rs2role.shareid where vtiger_datashare_module_rel.tabid=".$mod_tabid." and vtiger_datashare_rs2role.to_roleid='".$current_user_roles."'";
 		$result=$adb->query($query);
 		$num_rows=$adb->num_rows($result);
 		for($i=0;$i<$num_rows;$i++)
@@ -614,7 +614,7 @@
 			$parRoleList .= "'".$par_role_id."',";		
 		}
 		$parRoleList .= "'".$current_user_roles."')";
-		$query="select datashare_rs2rs.* from datashare_rs2rs inner join datashare_module_rel on datashare_module_rel.shareid=datashare_rs2rs.shareid where datashare_module_rel.tabid=".$mod_tabid." and datashare_rs2rs.to_roleandsubid in ".$parRoleList;
+		$query="select vtiger_datashare_rs2rs.* from vtiger_datashare_rs2rs inner join vtiger_datashare_module_rel on vtiger_datashare_module_rel.shareid=vtiger_datashare_rs2rs.shareid where vtiger_datashare_module_rel.tabid=".$mod_tabid." and vtiger_datashare_rs2rs.to_roleandsubid in ".$parRoleList;
 		$result=$adb->query($query);
 		$num_rows=$adb->num_rows($result);
 		for($i=0;$i<$num_rows;$i++)
@@ -666,10 +666,10 @@
 		}
 
 
-		//Get roles from Rs2Grp
-
-
-		$query="select datashare_rs2grp.* from datashare_rs2grp inner join datashare_module_rel on datashare_module_rel.shareid=datashare_rs2grp.shareid where datashare_module_rel.tabid=".$mod_tabid." and datashare_rs2grp.to_groupid in ".$groupList;
+		//Get vtiger_roles from Rs2Grp
+
+
+		$query="select vtiger_datashare_rs2grp.* from vtiger_datashare_rs2grp inner join vtiger_datashare_module_rel on vtiger_datashare_module_rel.shareid=vtiger_datashare_rs2grp.shareid where vtiger_datashare_module_rel.tabid=".$mod_tabid." and vtiger_datashare_rs2grp.to_groupid in ".$groupList;
 		$result=$adb->query($query);
 		$num_rows=$adb->num_rows($result);
 		for($i=0;$i<$num_rows;$i++)
@@ -726,7 +726,7 @@
 		$mod_share_write_permission['ROLE']=$role_write_per;
 		
 		//Retreiving from the grp2role sharing
-		$query="select datashare_grp2role.* from datashare_grp2role inner join datashare_module_rel on datashare_module_rel.shareid=datashare_grp2role.shareid where datashare_module_rel.tabid=".$mod_tabid." and datashare_grp2role.to_roleid='".$current_user_roles."'";
+		$query="select vtiger_datashare_grp2role.* from vtiger_datashare_grp2role inner join vtiger_datashare_module_rel on vtiger_datashare_module_rel.shareid=vtiger_datashare_grp2role.shareid where vtiger_datashare_module_rel.tabid=".$mod_tabid." and vtiger_datashare_grp2role.to_roleid='".$current_user_roles."'";
 		$result=$adb->query($query);
 		$num_rows=$adb->num_rows($result);
 		for($i=0;$i<$num_rows;$i++)
@@ -817,7 +817,7 @@
 		//Retreiving from the grp2rs sharing
 
 
-		$query="select datashare_grp2rs.* from datashare_grp2rs inner join datashare_module_rel on datashare_module_rel.shareid=datashare_grp2rs.shareid where datashare_module_rel.tabid=".$mod_tabid." and datashare_grp2rs.to_roleandsubid in ".$parRoleList;
+		$query="select vtiger_datashare_grp2rs.* from vtiger_datashare_grp2rs inner join vtiger_datashare_module_rel on vtiger_datashare_module_rel.shareid=vtiger_datashare_grp2rs.shareid where vtiger_datashare_module_rel.tabid=".$mod_tabid." and vtiger_datashare_grp2rs.to_roleandsubid in ".$parRoleList;
 		$result=$adb->query($query);
 		$num_rows=$adb->num_rows($result);
 		for($i=0;$i<$num_rows;$i++)
@@ -907,7 +907,7 @@
 
 		//Retreiving from the grp2grp sharing
 
-		$query="select datashare_grp2grp.* from datashare_grp2grp inner join datashare_module_rel on datashare_module_rel.shareid=datashare_grp2grp.shareid where datashare_module_rel.tabid=".$mod_tabid." and datashare_grp2grp.to_groupid in ".$groupList;
+		$query="select vtiger_datashare_grp2grp.* from vtiger_datashare_grp2grp inner join vtiger_datashare_module_rel on vtiger_datashare_module_rel.shareid=vtiger_datashare_grp2grp.shareid where vtiger_datashare_module_rel.tabid=".$mod_tabid." and vtiger_datashare_grp2grp.to_groupid in ".$groupList;
 		$result=$adb->query($query);
 		$num_rows=$adb->num_rows($result);
 		for($i=0;$i<$num_rows;$i++)
@@ -1031,7 +1031,7 @@
 
 		foreach($mod_sharingrule_members as $sharingid => $sharingInfoArr)
 		{
-			$query = "select datashare_relatedmodule_permission.* from datashare_relatedmodule_permission inner join datashare_relatedmodules on datashare_relatedmodules.datashare_relatedmodule_id=datashare_relatedmodule_permission.datashare_relatedmodule_id where datashare_relatedmodule_permission.shareid=".$sharingid." and datashare_relatedmodules.tabid=".$par_mod_id." and datashare_relatedmodules.relatedto_tabid=".$share_mod_id;
+			$query = "select vtiger_datashare_relatedmodule_permission.* from vtiger_datashare_relatedmodule_permission inner join vtiger_datashare_relatedmodules on vtiger_datashare_relatedmodules.datashare_relatedmodule_id=vtiger_datashare_relatedmodule_permission.datashare_relatedmodule_id where vtiger_datashare_relatedmodule_permission.shareid=".$sharingid." and vtiger_datashare_relatedmodules.tabid=".$par_mod_id." and vtiger_datashare_relatedmodules.relatedto_tabid=".$share_mod_id;
 			$result = $adb->query($query);
 			$share_permission=$adb->query_result($result,0,'permission');	
 
@@ -1410,7 +1410,7 @@
 {
 	global $adb;
 	require('user_privileges/sharing_privileges_'.$userid.'.php');
-	//Deleting from the existing tables
+	//Deleting from the existing vtiger_tables
 	$table_arr=Array('tmp_read_user_sharing_per', 'tmp_write_user_sharing_per','tmp_read_group_sharing_per','tmp_write_group_sharing_per','tmp_read_user_rel_sharing_per','tmp_write_user_rel_sharing_per','tmp_read_group_rel_sharing_per','tmp_write_group_rel_sharing_per');
 	foreach($table_arr as $tabname)
 	{
@@ -1418,7 +1418,7 @@
 		$adb->query($query);
 	}
 
-	//Populating Values into the tmp sharing tables
+	//Populating Values into the tmp sharing vtiger_tables
 	$sharingArray=Array('Leads','Accounts','Contacts','Potentials','HelpDesk','Emails','Campaigns','Quotes','PurchaseOrder','SalesOrder','Invoice');
 	foreach($sharingArray as $module)
 	{
@@ -1427,7 +1427,7 @@
 		populateSharingPrivileges('GROUP',$userid,$module,'read');
 		populateSharingPrivileges('GROUP',$userid,$module,'write');
 	}
-	//Populating Values into the temp related sharing tables
+	//Populating Values into the temp related sharing vtiger_tables
 	foreach($related_module_share as $rel_tab_id => $tabid_arr)
 	{
 		$rel_tab_name=getTabname($rel_tab_id);

Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original)
+++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Mon Jun 12 14:26:25 2006
@@ -1,2118 +1,2118 @@
-<?php
-
-/*********************************************************************************
-** The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is:  vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
- ********************************************************************************/
-
-include_once('config.php');
-require_once('include/logging.php');
-require_once('include/database/PearDatabase.php');
-require_once('data/SugarBean.php');
-require_once('data/CRMEntity.php');
-require_once('include/utils/utils.php');
-
-class DefaultDataPopulator extends CRMEntity {
-		
-	function DefaultDataPopulator() {
-		$this->log = LoggerManager::getLogger('DefaultDataPopulator');
-		$this->db = new PearDatabase();
-	}
-
-	var $new_schema = true;
-
-	function create_tables () {
-		global $app_strings;
-
-		$role1_id = $this->db->getUniqueID("role");
-		$role2_id = $this->db->getUniqueID("role");
-		$role3_id = $this->db->getUniqueID("role");
-
-		$profile1_id = $this->db->getUniqueID("profile");
-		$profile2_id = $this->db->getUniqueID("profile");
-		$profile3_id = $this->db->getUniqueID("profile");
-		$profile4_id = $this->db->getUniqueID("profile");
-
-                $this->db->query("insert into role values('H".$role1_id."','Organisation','H".$role1_id."',0)");
-                $this->db->query("insert into role values('H".$role2_id."','administrator','H".$role1_id."::H".$role2_id."',1)");
-                $this->db->query("insert into role values('H".$role3_id."','standard_user','H".$role1_id."::H".$role2_id."::H".$role3_id."',2)");
-                
-
- $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',0,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,'Vendors',0,15,'Vendors',null,null,1)");
- $this->db->query("INSERT INTO tab VALUES (19,'PriceBooks',0,16,'PriceBooks',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,'PurchaseOrder',0,18,'PurchaseOrder',null,null,1)");
- $this->db->query("INSERT INTO tab VALUES (22,'SalesOrder',0,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)");
- $this->db->query("INSERT INTO tab VALUES (26,'Campaigns',0,23,'Campaigns',null,null,1)");
- $this->db->query("INSERT INTO tab VALUES (27,'Portal',0,24,'Portal',null,null,1)");
- $this->db->query("INSERT INTO tab VALUES (28,'Webmails',0,25,'Webmails',null,null,1)");
-
-// Populate the blocks table
-$this->db->query("insert into blocks values (1,2,'LBL_OPPORTUNITY_INFORMATION',1,0,0,0,0,0)");
-$this->db->query("insert into blocks values (2,2,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
-$this->db->query("insert into blocks values (3,2,'LBL_DESCRIPTION_INFORMATION',3,0,0,0,0,0)");
-$this->db->query("insert into blocks values (4,4,'LBL_CONTACT_INFORMATION',1,0,0,0,0,0)");
-$this->db->query("insert into blocks values (5,4,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
-$this->db->query("insert into blocks values (6,4,'LBL_CUSTOMER_PORTAL_INFORMATION',3,0,0,0,0,0)");
-$this->db->query("insert into blocks values (7,4,'LBL_ADDRESS_INFORMATION',4,0,0,0,0,0)");
-$this->db->query("insert into blocks values (8,4,'LBL_DESCRIPTION_INFORMATION',6,0,0,0,0,0)");
-$this->db->query("insert into blocks values (9,6,'LBL_ACCOUNT_INFORMATION',1,0,0,0,0,0)");
-$this->db->query("insert into blocks values (10,6,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
-$this->db->query("insert into blocks values (11,6,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)");
-$this->db->query("insert into blocks values (12,6,'LBL_DESCRIPTION_INFORMATION',4,0,0,0,0,0)");
-$this->db->query("insert into blocks values (13,7,'LBL_LEAD_INFORMATION',1,0,0,0,0,0)");
-$this->db->query("insert into blocks values (14,7,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
-$this->db->query("insert into blocks values (15,7,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)");
-$this->db->query("insert into blocks values (16,7,'LBL_DESCRIPTION_INFORMATION',4,0,0,0,0,0)");
-$this->db->query("insert into blocks values (17,8,'LBL_NOTE_INFORMATION',1,0,0,0,0,0)");
-$this->db->query("insert into blocks values (18,8,'',2,1,0,0,0,0)");
-$this->db->query("insert into blocks values (19,9,'LBL_TASK_INFORMATION',1,0,0,0,0,0)");
-$this->db->query("insert into blocks values (20,9,'',2,1,0,0,0,0)");
-$this->db->query("insert into blocks values (21,10,'LBL_EMAIL_INFORMATION',1,0,0,0,0,0)");
-$this->db->query("insert into blocks values (22,10,'',2,1,0,0,0,0)");
-$this->db->query("insert into blocks values (23,10,'',3,1,0,0,0,0)");
-$this->db->query("insert into blocks values (24,10,'',4,1,0,0,0,0)");
-$this->db->query("insert into blocks values (25,13,'LBL_TICKET_INFORMATION',1,0,0,0,0,0)");
-$this->db->query("insert into blocks values (26,13,'',2,1,0,0,0,0)");
-$this->db->query("insert into blocks values (27,13,'LBL_CUSTOM_INFORMATION',3,0,0,0,0,0)");
-$this->db->query("insert into blocks values (28,13,'LBL_DESCRIPTION_INFORMATION',4,0,0,0,0,0)");
-$this->db->query("insert into blocks values (29,13,'LBL_TICKET_RESOLUTION',5,0,0,1,0,0)");
-$this->db->query("insert into blocks values (30,13,'LBL_COMMENTS',6,0,0,1,0,0)");
-$this->db->query("insert into blocks values (31,14,'LBL_PRODUCT_INFORMATION',1,0,0,0,0,0)");
-$this->db->query("insert into blocks values (32,14,'LBL_PRICING_INFORMATION',2,0,0,0,0,0)");
-$this->db->query("insert into blocks values (33,14,'LBL_STOCK_INFORMATION',3,0,0,0,0,0)");
-$this->db->query("insert into blocks values (34,14,'LBL_CUSTOM_INFORMATION',4,0,0,0,0,0)");
-$this->db->query("insert into blocks values (35,14,'LBL_IMAGE_INFORMATION',5,0,0,0,0,0)");
-$this->db->query("insert into blocks values (36,14,'LBL_DESCRIPTION_INFORMATION',6,0,0,0,0,0)");
-$this->db->query("insert into blocks values (37,15,'LBL_FAQ_INFORMATION',1,0,0,0,0,0)");
-$this->db->query("insert into blocks values (38,15,'',2,1,0,0,0,0)");
-$this->db->query("insert into blocks values (39,15,'',3,1,0,0,0,0)");
-$this->db->query("insert into blocks values (40,15,'LBL_COMMENT_INFORMATION',4,0,0,1,0,0)");
-$this->db->query("insert into blocks values (41,16,'LBL_EVENT_INFORMATION',1,0,0,0,0,0)");
-$this->db->query("insert into blocks values (42,16,'',2,1,0,0,0,0)");
-$this->db->query("insert into blocks values (43,16,'',3,1,0,0,0,0)");
-$this->db->query("insert into blocks values (44,18,'LBL_VENDOR_INFORMATION',1,0,0,0,0,0)");
-$this->db->query("insert into blocks values (45,18,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
-$this->db->query("insert into blocks values (46,18,'LBL_VENDOR_ADDRESS_INFORMATION',3,0,0,0,0,0)");
-$this->db->query("insert into blocks values (47,18,'LBL_DESCRIPTION_INFORMATION',4,0,0,0,0,0)");
-$this->db->query("insert into blocks values (48,19,'LBL_PRICEBOOK_INFORMATION',1,0,0,0,0,0)");
-$this->db->query("insert into blocks values (49,19,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
-$this->db->query("insert into blocks values (50,19,'LBL_DESCRIPTION_INFORMATION',3,0,0,0,0,0)");
-$this->db->query("insert into blocks values (51,20,'LBL_QUOTE_INFORMATION',1,0,0,0,0,0)");
-$this->db->query("insert into blocks values (52,20,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
-$this->db->query("insert into blocks values (53,20,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)");
-$this->db->query("insert into blocks values (54,20,'LBL_RELATED_PRODUCTS',4,0,0,0,0,0)");
-$this->db->query("insert into blocks values (55,20,'LBL_TERMS_INFORMATION',5,0,0,0,0,0)");
-$this->db->query("insert into blocks values (56,20,'LBL_DESCRIPTION_INFORMATION',6,0,0,0,0,0)");
-$this->db->query("insert into blocks values (57,21,'LBL_PO_INFORMATION',1,0,0,0,0,0)");
-$this->db->query("insert into blocks values (58,21,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
-$this->db->query("insert into blocks values (59,21,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)");
-$this->db->query("insert into blocks values (60,21,'LBL_RELATED_PRODUCTS',4,0,0,0,0,0)");
-$this->db->query("insert into blocks values (61,21,'LBL_TERMS_INFORMATION',5,0,0,0,0,0)");
-$this->db->query("insert into blocks values (62,21,'LBL_DESCRIPTION_INFORMATION',6,0,0,0,0,0)");
-$this->db->query("insert into blocks values (63,22,'LBL_SO_INFORMATION',1,0,0,0,0,0)");
-$this->db->query("insert into blocks values (64,22,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
-$this->db->query("insert into blocks values (65,22,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)");
-$this->db->query("insert into blocks values (66,22,'LBL_RELATED_PRODUCTS',4,0,0,0,0,0)");
-$this->db->query("insert into blocks values (67,22,'LBL_TERMS_INFORMATION',5,0,0,0,0,0)");
-$this->db->query("insert into blocks values (68,22,'LBL_DESCRIPTION_INFORMATION',6,0,0,0,0,0)");
-$this->db->query("insert into blocks values (69,23,'LBL_INVOICE_INFORMATION',1,0,0,0,0,0)");
-$this->db->query("insert into blocks values (70,23,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
-$this->db->query("insert into blocks values (71,23,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)");
-$this->db->query("insert into blocks values (72,23,'LBL_RELATED_PRODUCTS',4,0,0,0,0,0)");
-$this->db->query("insert into blocks values (73,23,'LBL_TERMS_INFORMATION',5,0,0,0,0,0)");
-$this->db->query("insert into blocks values (74,23,'LBL_DESCRIPTION_INFORMATION',6,0,0,0,0,0)");
-$this->db->query("insert into blocks values (75,4,'LBL_IMAGE_INFORMATION',5,0,0,0,0,0)");
-$this->db->query("insert into blocks values (76,26,'LBL_CAMPAIGN_INFORMATION',1,0,0,0,0,0)");
-$this->db->query("insert into blocks values (77,26,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
-$this->db->query("insert into blocks values (78,26,'LBL_DESCRIPTION_INFORMATION',3,0,0,0,0,0)");
-
-//
-
-//Account Details -- START
- //Block9
-
-$this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'accountname','account',1,'2','accountname','Account Name',1,0,0,100,1,9,1,'V~M',0,1,'BAS')");	
- $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'phone','account',1,'11','phone','Phone',1,0,0,100,2,9,1,'V~O',0,2,'BAS')");	
- $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'website','account',1,'17','website','Website',1,0,0,100,3,9,1,'V~O',0,3,'BAS')");	
-
- $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'fax','account',1,'1','fax','Fax',1,0,0,100,4,9,1,'V~O',1,null,'BAS')");	
- $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'tickersymbol','account',1,'1','tickersymbol','Ticker Symbol',1,0,0,100,5,9,1,'V~O',1,null,'BAS')");	
- $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'otherphone','account',1,'11','otherphone','Other Phone',1,0,0,100,6,9,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'parentid','account',1,'51','account_id','Member Of',1,0,0,100,7,9,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'email1','account',1,'13','email1','Email',1,0,0,100,8,9,1,'E~O',1,null,'BAS')");
- $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'employees','account',1,'7','employees','Employees',1,0,0,100,9,9,1,'I~O',1,null,'ADV')");
- $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'email2','account',1,'13','email2','Other Email',1,0,0,100,10,9,1,'E~O',1,null,'ADV')");
-
- $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'ownership','account',1,'1','ownership','Ownership',1,0,0,100,11,9,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'rating','account',1,'1','rating','Rating',1,0,0,100,12,9,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'industry','account',1,'15','industry','industry',1,0,0,100,13,9,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'siccode','account',1,'1','siccode','SIC Code',1,0,0,100,14,9,1,'I~O',1,null,'ADV')");
- $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'account_type','account',1,'15','accounttype','Type',1,0,0,100,15,9,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'annualrevenue','account',1,'71','annual_revenue','Annual Revenue',1,0,0,100,16,9,1,'I~O',1,null,'ADV')");
- //Added field emailoptout for accounts -- after 4.2 patch2
- $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'emailoptout','account',1,'56','emailoptout','Email Opt Out',1,0,0,100,17,9,1,'C~O',1,null,'ADV')");
- $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'notify_owner','account',1,56,'notify_owner','Notify Owner',1,0,0,10,18,9,1,'C~O',1,NULL,'ADV')");
- $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,19,9,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,20,9,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,21,9,2,'T~O',1,null,'BAS')");
-
-
-
-
- //Block 11
-$this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'street','accountbillads',1,'21','bill_street','Billing Address',1,0,0,100,1,11,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'street','accountshipads',1,'21','ship_street','Shipping Address',1,0,0,100,2,11,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'city','accountbillads',1,'1','bill_city','Billing City',1,0,0,100,5,11,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'city','accountshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,11,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'state','accountbillads',1,'1','bill_state','Billing State',1,0,0,100,7,11,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'state','accountshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,11,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'code','accountbillads',1,'1','bill_code','Billing Code',1,0,0,100,9,11,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'code','accountshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,11,1,'V~O',1,null,'BAS')");
-
-
- $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'country','accountbillads',1,'1','bill_country','Billing Country',1,0,0,100,11,11,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'country','accountshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,11,1,'V~O',1,null,'BAS')");
-
-$this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'pobox','accountbillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,11,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'pobox','accountshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,11,1,'V~O',1,null,'BAS')");
-
-
- //Block12
-$this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,12,1,'V~O',1,null,'BAS')");
- 
-
-
-//Account Details -- END
-
-			
-//Lead Details --- START
-
-//Block13 -- Start
-
-$this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'salutation','leaddetails',1,'55','salutationtype','Salutation',1,0,0,100,1,13,3,'V~O',1,null,'BAS')");	
- $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'firstname','leaddetails',1,'55','firstname','First Name',1,0,0,100,2,13,1,'V~O',0,1,'BAS')");	
- $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'phone','leadaddress',1,'11','phone','Phone',1,0,0,100,3,13,1,'V~O',0,4,'BAS')");	
-
- $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'lastname','leaddetails',1,'2','lastname','Last Name',1,0,0,100,4,13,1,'V~M',0,2,'BAS')");	
- $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'mobile','leadaddress',1,'1','mobile','Mobile',1,0,0,100,5,13,1,'V~O',1,null,'BAS')");	
- $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'company','leaddetails',1,'2','company','Company',1,0,0,100,6,13,1,'V~M',0,3,'BAS')");
- $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'campaignid','leaddetails',1,'51','campaignid','Campaign Name',1,0,0,100,6,4,3,'I~O',1,null,'BAS')");
- $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'fax','leadaddress',1,'1','fax','Fax',1,0,0,100,7,13,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'designation','leaddetails',1,'1','designation','Designation',1,0,0,100,8,13,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'email','leaddetails',1,'13','email','Email',1,0,0,100,9,13,1,'E~O',0,5,'BAS')");
- $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'leadsource','leaddetails',1,'15','leadsource','Lead Source',1,0,0,100,10,13,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'website','leadsubdetails',1,'17','website','Website',1,0,0,100,11,13,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'industry','leaddetails',1,'15','industry','Industry',1,0,0,100,12,13,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'leadstatus','leaddetails',1,'15','leadstatus','Lead Status',1,0,0,100,13,13,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'annualrevenue','leaddetails',1,'71','annualrevenue','Annual Revenue',1,0,0,100,14,13,1,'I~O',1,null,'ADV')");
- $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'rating','leaddetails',1,'15','rating','Rating',1,0,0,100,15,13,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'noofemployees','leaddetails',1,'1','noofemployees','No Of Employees',1,0,0,100,16,13,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,17,13,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'yahooid','leaddetails',1,'13','yahooid','Yahoo Id',1,0,0,100,18,13,1,'V~O',1,null,'ADV')");
-$this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,19,13,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,20,13,2,'T~O',1,null,'BAS')");
-
-//Block13 -- End
-
-
-//Block15 -- Start
-
-$this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'lane','leadaddress',1,'21','lane','Street',1,0,0,100,1,15,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'code','leadaddress',1,'1','code','Postal Code',1,0,0,100,3,15,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'city','leadaddress',1,'1','city','City',1,0,0,100,4,15,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'country','leadaddress',1,'1','country','Country',1,0,0,100,5,15,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'state','leadaddress',1,'1','state','State',1,0,0,100,6,15,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'pobox','leadaddress',1,'1','pobox','Po Box',1,0,0,100,2,15,1,'V~O',1,null,'BAS')");
-
-//Block15 --End
-
-//Block16 -- Start
-
-$this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,16,1,'V~O',1,null,'BAS')");
-
-//Block16 -- End
-
-//Lead Details -- END
-
-
-//Contact Details -- START
-//Block4 -- Start
-
-$this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'salutation','contactdetails',1,'55','salutationtype','Salutation',1,0,0,100,1,4,3,'V~O',1,null,'BAS')");	
- $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'firstname','contactdetails',1,'55','firstname','First Name',1,0,0,100,2,4,1,'V~O',0,1,'BAS')");	
- $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'phone','contactdetails',1,'11','phone','Office Phone',1,0,0,100,3,4,1,'V~O',0,4,'BAS')");	
- $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'lastname','contactdetails',1,'2','lastname','Last Name',1,0,0,100,4,4,1,'V~M',0,2,'BAS')");	
- $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'mobile','contactdetails',1,'1','mobile','Mobile',1,0,0,100,5,4,1,'V~O',1,null,'BAS')");	
- $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'accountid','contactdetails',1,'51','account_id','Account Name',1,0,0,100,6,4,1,'I~O',0,3,'BAS')");	
- $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'campaignid','contactdetails',1,'51','campaignid','Campaign Name',1,0,0,100,6,4,3,'I~O',1,null,'BAS')");
- $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'homephone','contactsubdetails',1,'11','homephone','Home Phone',1,0,0,100,7,4,1,'V~O',1,null,'ADV')");	
- $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'leadsource','contactsubdetails',1,'15','leadsource','Lead Source',1,0,0,100,8,4,1,'V~O',1,null,'BAS')");	
- $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'otherphone','contactsubdetails',1,'11','otherphone','Phone',1,0,0,100,9,4,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'title','contactdetails',1,'1','title','Title',1,0,0,100,10,4,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'fax','contactdetails',1,'1','fax','Fax',1,0,0,100,11,4,1,'V~O',1,null,'BAS')");	
- $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'department','contactdetails',1,'1','department','Department',1,0,0,100,12,4,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'birthday','contactsubdetails',1,'5','birthday','Birthdate',1,0,0,100,14,4,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'email','contactdetails',1,'13','email','Email',1,0,0,100,15,4,1,'E~O',0,5,'ADV')");
- $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'reportsto','contactdetails',1,'57','contact_id','Reports To',1,0,0,100,16,4,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'assistant','contactsubdetails',1,'1','assistant','Assistant',1,0,0,100,17,4,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'yahooid','contactdetails',1,'13','yahooid','Yahoo Id',1,0,0,100,18,4,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'assistantphone','contactsubdetails',1,'11','assistantphone','Assistant Phone',1,0,0,100,19,4,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'donotcall','contactdetails',1,'56','donotcall','Do Not Call',1,0,0,100,20,4,1,'C~O',1,null,'ADV')");
- $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'emailoptout','contactdetails',1,'56','emailoptout','Email Opt Out',1,0,0,100,21,4,1,'C~O',1,null,'ADV')");
- $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,22,4,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'reference','contactdetails',1,'56','reference','Reference',1,0,0,10,23,4,1,'C~O',1,null,'ADV')");
- $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'notify_owner','contactdetails',1,'56','notify_owner','Notify Owner',1,0,0,10,24,4,1,'C~O',1,null,'ADV')");
- $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,25,4,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,26,4,2,'T~O',1,null,'BAS')");
-
-//Block4 -- End
-
-//Block6 - Begin Customer Portal
-
-$this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'portal','customerdetails',1,'56','portal','Portal User',1,0,0,100,1,6,1,'C~O',1,null,'ADV')");
-$this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'support_start_date','customerdetails',1,'5','support_start_date','Support Start Date',1,0,0,100,2,6,1,'D~O',1,null,'ADV')");
-$this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'support_end_date','customerdetails',1,'5','support_end_date','Support End Date',1,0,0,100,3,6,1,'D~O~OTH~GE~support_start_date~Support Start Date',1,null,'ADV')");
-
-//Block6 - End Customer Portal
-
-//Block 7 -- Start
-
-$this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'mailingstreet','contactaddress',1,'21','mailingstreet','Mailing Street',1,0,0,100,1,7,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'otherstreet','contactaddress',1,'21','otherstreet','Other Street',1,0,0,100,2,7,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'mailingcity','contactaddress',1,'1','mailingcity','Mailing City',1,0,0,100,5,7,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'othercity','contactaddress',1,'1','othercity','Other City',1,0,0,100,6,7,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'mailingstate','contactaddress',1,'1','mailingstate','Mailing State',1,0,0,100,7,7,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'otherstate','contactaddress',1,'1','otherstate','Other State',1,0,0,100,8,7,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'mailingzip','contactaddress',1,'1','mailingzip','Mailing Zip',1,0,0,100,9,7,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'otherzip','contactaddress',1,'1','otherzip','Other Zip',1,0,0,100,10,7,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'mailingcountry','contactaddress',1,'1','mailingcountry','Mailing Country',1,0,0,100,11,7,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'othercountry','contactaddress',1,'1','othercountry','Other Country',1,0,0,100,12,7,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'mailingpobox','contactaddress',1,'1','mailingpobox','Mailing Po Box',1,0,0,100,3,7,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'otherpobox','contactaddress',1,'1','otherpobox','Other Po Box',1,0,0,100,4,7,1,'V~O',1,null,'BAS')");
-//Block7 -- End
-
-//ContactImageInformation
- $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'imagename','contactdetails',1,'69','imagename','Contact Image',1,0,0,100,1,75,1,'V~O',1,null,'ADV')");
-
-
-//Block8 -- Start
-$this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,8,1,'V~O',1,null,'BAS')");
-//Block8 -- End
-//Contact Details -- END
-
-
-//Potential Details -- START
-//Block1 -- Start
-
-$this->db->query("insert into field values (2,".$this->db->getUniqueID("field").",'potentialname','potential',1,'2','potentialname','Potential Name',1,0,0,100,1,1,1,'V~M',0,1,'BAS')");	
- $this->db->query("insert into field values (2,".$this->db->getUniqueID("field").",'amount','potential',1,71,'amount','Amount',1,0,0,100,2,1,1,'N~O',0,5,'BAS')");	
- $this->db->query("insert into field values (2,".$this->db->getUniqueID("field").",'accountid','potential',1,'50','account_id','Account Name',1,0,0,100,3,1,1,'V~M',0,2,'BAS')");	
- $this->db->query("insert into field values (2,".$this->db->getUniqueID("field").",'closingdate','potential',1,'23','closingdate','Expected Close Date',1,0,0,100,5,1,1,'D~M',0,3,'BAS')");	
- $this->db->query("insert into field values (2,".$this->db->getUniqueID("field").",'potentialtype','potential',1,'15','opportunity_type','Type',1,0,0,100,6,1,1,'V~O',1,null,'BAS')");	
- $this->db->query("insert into field values (2,".$this->db->getUniqueID("field").",'nextstep','potential',1,'1','nextstep','Next Step',1,0,0,100,7,1,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (2,".$this->db->getUniqueID("field").",'leadsource','potential',1,'15','leadsource','Lead Source',1,0,0,100,8,1,1,'V~O',1,null,'BAS')");	
- $this->db->query("insert into field values (2,".$this->db->getUniqueID("field").",'sales_stage','potential',1,'16','sales_stage','Sales Stage',1,0,0,100,9,1,1,'V~O',0,4,'BAS')");
- $this->db->query("insert into field values (2,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,10,1,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into field values (2,".$this->db->getUniqueID("field").",'probability','potential',1,'9','probability','Probability',1,0,0,100,11,1,1,'N~O',1,null,'BAS')");
-$this->db->query("insert into field values (2,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,13,1,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into field values (2,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,14,1,2,'T~O',1,null,'BAS')");
-
-//Block1 -- End
-
-//Block3 -- Start
-
- $this->db->query("insert into field values (2,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,3,1,'V~O',1,null,'BAS')");
-
-//Block3 -- End
-//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
-
-
- $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'campaignname','campaign',1,'2','campaignname','Campaign Name',1,0,0,100,1,76,1,'V~M',0,1,'BAS')");
- $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'campaigntype','campaign',1,15,'campaigntype','Campaign Type',1,0,0,100,2,76,1,'V~O',0,5,'BAS')");
- $this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'product_id','campaign',1,59,'product_id','Product',1,0,0,100,3,76,1,'I~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,'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,'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,'15','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')");
-$this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'sponsor','campaign',1,'1','sponsor','Sponsor',1,0,0,100,12,76,1,'V~O',1,null,'BAS')");
-$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')");
-
-$this->db->query("insert into field values (26,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,78,1,'V~O',1,null,'BAS')");
-
-//Campaign entries end
-
-
-//Ticket Details -- START
-//Block25 -- Start
-
- $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,2,25,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'parent_id','troubletickets',1,'68','parent_id','Related To',1,0,0,100,4,25,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'priority','troubletickets',1,'15','ticketpriorities','Priority',1,0,0,100,5,25,1,'V~O',0,3,'BAS')");
- $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'product_id','troubletickets',1,'59','product_id','Product Name',1,0,0,100,6,25,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'severity','troubletickets',1,'15','ticketseverities','Severity',1,0,0,100,7,25,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'status','troubletickets',1,'15','ticketstatus','Status',1,0,0,100,8,25,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'category','troubletickets',1,'15','ticketcategories','Category',1,0,0,100,9,25,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'update_log','troubletickets',1,'15','update_log','Update History',1,0,0,100,9,25,3,'V~O',1,null,'BAS')");
-$this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,10,25,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,11,25,2,'T~O',1,null,'BAS')");
- //Added on 26-12-2005 to add attachment in ticket editview
- $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'filename','attachments',1,'61','filename','Attachment',1,0,0,100,12,26,1,'V~O',0,1,'BAS')");
-
- $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'title','troubletickets',1,'22','ticket_title','Title',1,0,0,100,1,26,1,'V~M',0,1,'BAS')");
- $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'description','troubletickets',1,'19','description','Description',1,0,0,100,1,28,1,'V~O',0,2,'BAS')");
- $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'solution','troubletickets',1,'19','solution','Solution',1,0,0,100,1,29,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (13,".$this->db->getUniqueID("field").",'comments','ticketcomments',1,'19','comments','Add Comment',1,0,0,100,1,30,1,'V~O',1,null,'BAS')");
-
-//Block25-30 -- End
-//Ticket Details -- END
-
-//Product Details -- START
-//Block31-36 -- Start
-
-$this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'productname','products',1,'2','productname','Product Name',1,0,0,100,1,31,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'productcode','products',1,'1','productcode','Product Code',1,0,0,100,2,31,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'discontinued','products',1,'56','discontinued','Product Active',1,0,0,100,3,31,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'manufacturer','products',1,'15','manufacturer','Manufacturer',1,0,0,100,4,1,31,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'productcategory','products',1,'15','productcategory','Product Category',1,0,0,100,4,31,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'sales_start_date','products',1,'5','sales_start_date','Sales Start Date',1,0,0,100,5,31,1,'D~O',1,null,'BAS')");
- $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'sales_end_date','products',1,'5','sales_end_date','Sales End Date',1,0,0,100,6,31,1,'D~O~OTH~GE~sales_start_date~Sales Start Date',1,null,'BAS')");
- $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'start_date','products',1,'5','start_date','Support Start Date',1,0,0,100,7,31,1,'D~O',1,null,'BAS')");
- $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'expiry_date','products',1,'5','expiry_date','Support Expiry Date',1,0,0,100,8,31,1,'D~O~OTH~GE~start_date~Start Date',1,null,'BAS')");
- 
-
- $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'crmid','seproductsrel',1,'66','parent_id','Related To',1,0,0,100,10,31,1,'I~O',1,null,'BAS')");
-
- $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'contactid','products',1,'57','contact_id','Contact Name',1,0,0,100,11,31,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'website','products',1,'17','website','Website',1,0,0,100,12,31,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'vendor_id','products',1,'75','vendor_id','Vendor Name',1,0,0,100,13,31,1,'I~O',1,null,'BAS')");
-$this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'mfr_part_no','products',1,'1','mfr_part_no','Mfr PartNo',1,0,0,100,14,31,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'vendor_part_no','products',1,'1','vendor_part_no','Vendor PartNo',1,0,0,100,15,31,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'serialno','products',1,'1','serial_no','Serial No',1,0,0,100,16,31,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'productsheet','products',1,'1','productsheet','Product Sheet',1,0,0,100,17,31,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'glacct','products',1,'15','glacct','GL Account',1,0,0,100,18,31,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,19,31,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,20,31,2,'T~O',1,null,'BAS')");
-
-
-//Block32 Pricing Information
-
-$this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'unit_price','products',1,'71','unit_price','Unit Price',1,0,0,100,1,32,1,'N~O',1,null,'BAS')"); 
- $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'commissionrate','products',1,'9','commissionrate','Commission Rate',1,0,0,100,2,32,1,'N~O',1,null,'BAS')"); 
- $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'taxclass','producttaxrel',1,'83','taxclass','Tax Class',1,0,0,100,4,32,1,'V~O',1,null,'BAS')");
-
-
-//Block 33 stock info
-
- $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'usageunit','products',1,'15','usageunit','Usage Unit',1,0,0,100,1,33,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'qty_per_unit','products',1,'1','qty_per_unit','Qty/Unit',1,0,0,100,2,33,1,'N~O',1,null,'ADV')");
- $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'qtyinstock','products',1,'1','qtyinstock','Qty In Stock',1,0,0,100,3,33,1,'I~O',1,null,'ADV')");
-$this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'reorderlevel','products',1,'1','reorderlevel','Reorder Level',1,0,0,100,4,33,1,'I~O',1,null,'ADV')");
- $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'handler','products',1,'52','assigned_user_id','Handler',1,0,0,100,5,33,1,'I~O',1,null,'ADV')");
- $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'qtyindemand','products',1,'1','qtyindemand','Qty In Demand',1,0,0,100,6,33,1,'I~O',1,null,'ADV')");
-
-
-//ProductImageInformation
-
- $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'imagename','products',1,'69','imagename','Product Image',1,0,0,100,1,35,1,'V~O',1,null,'ADV')");
-
-
-//Block 36 Description Info
- $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'product_description','products',1,'19','product_description','Description',1,0,0,100,1,36,1,'V~O',1,null,'BAS')");
-
-//Product Details -- END
-
-//Note Details -- START
-//Block17 -- Start
-
-$this->db->query("insert into field values (8,".$this->db->getUniqueID("field").",'contact_id','notes',1,'57','contact_id','Contact Name',1,0,0,100,1,17,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (8,".$this->db->getUniqueID("field").",'crmid','senotesrel',1,'62','parent_id','Related To',1,0,0,100,2,17,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into field values (8,".$this->db->getUniqueID("field").",'title','notes',1,'2','title','Subject',1,0,0,100,3,17,1,'V~M',0,1,'BAS')");
-$this->db->query("insert into field values (8,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,4,17,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into field values (8,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,5,17,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into field values (8,".$this->db->getUniqueID("field").",'filename','notes',1,'61','filename','Attachment',1,0,0,100,4,17,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (8,".$this->db->getUniqueID("field").",'notecontent','notes',1,'19','notecontent','Note',1,0,0,100,5,18,1,'V~O',1,null,'BAS')");
-
-//Block17 -- End
-//Note Details -- END
-
-//Email Details -- START
-//Block21 -- Start
-
-	$this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'date_start','activity',1,'6','date_start','Date & Time Sent',1,0,0,100,1,21,1,'DT~M~time_start~Time Start',1,null,'BAS')");
-	$this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'semodule','activity',1,'2','parent_type','Sales Enity Module',1,0,0,100,2,21,3,'',1,null,'BAS')");
-	$this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'activitytype','activity',1,'2','activitytype','Activtiy Type',1,0,0,100,3,21,3,'V~O',1,null,'BAS')");
-	$this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'crmid','seactivityrel',1,'357','parent_id','Related To',1,0,0,100,1,22,1,'I~O',1,null,'BAS')");
-	$this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,5,21,1,'V~M',1,null,'BAS')");
-	$this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'subject','activity',1,'2','subject','Subject',1,0,0,100,1,23,1,'V~M',1,null,'BAS')");
-	$this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'filename','attachments',1,'61','filename','Attachment',1,0,0,100,2,23,1,'V~O',1,null,'BAS')");
-	$this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,24,1,'V~O',1,null,'BAS')");
-	$this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'time_start','activity',1,'2','time_start','Time Start',1,0,0,100,9,1,23,'T~O',1,null,'BAS')");
-	$this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,10,1,22,'T~O',1,null,'BAS')");
- 	$this->db->query("insert into field values (10,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,11,21,2,'T~O',1,null,'BAS')");
-
-//Block21 -- End
-//Email Details -- END
-
-//Task Details --START
-//Block19 -- Start
-$this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'subject','activity',1,'2','subject','Subject',1,0,0,100,1,19,1,'V~M',0,1,'BAS')");
- $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,2,19,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'date_start','activity',1,'6','date_start','Start Date & Time',1,0,0,100,3,19,1,'DT~M~time_start',0,2,'BAS')");
- $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'time_start','activity',1,'2','time_start','Time Start',1,0,0,100,4,19,3,'T~O',1,null,'BAS')");
- $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'due_date','activity',1,'23','due_date','Due Date',1,0,0,100,5,19,1,'D~M~OTH~GE~date_start~Start Date & Time',1,null,'BAS')");
- $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'crmid','seactivityrel',1,'66','parent_id','Related To',1,0,0,100,7,19,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'contactid','cntactivityrel',1,'57','contact_id','Contact Name',1,0,0,100,8,19,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'status','activity',1,'15','taskstatus','Status',1,0,0,100,9,19,1,'V~O',0,3,'BAS')");
- $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'eventstatus','activity',1,'15','eventstatus','Status',1,0,0,100,9,19,3,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'priority','activity',1,'15','taskpriority','Priority',1,0,0,100,10,19,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'sendnotification','activity',1,'56','sendnotification','Send Notification',1,0,0,100,11,19,1,'C~O',1,null,'BAS')");
-$this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,14,19,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,15,19,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'activitytype','activity',1,'15','activitytype','Activity Type',1,0,0,100,16,19,3,'V~O',1,null,'BAS')");
- $this->db->query("Insert into field values (9,".$this->db->getUniqueID("field").",'visibility','activity',1,15,'visibility','Visibility',1,0,0,100,17,19,3,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,20,1,'V~O',1,null,'BAS')");
-
-
-$this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'duration_hours','activity',1,'63','duration_hours','Duration',1,0,0,100,17,19,3,'T~O',1,null,'BAS')");
- $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'duration_minutes','activity',1,'15','duration_minutes','Duration Minutes',1,0,0,100,18,19,3,'T~O',1,null,'BAS')");
- $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'location','activity',1,'1','location','Location',1,0,0,100,19,19,3,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'reminder_time','activity_reminder',1,'30','reminder_time','Send Reminder',1,0,0,100,1,19,3,'I~O',1,null,'BAS')");
- 
- $this->db->query("insert into field values (9,".$this->db->getUniqueID("field").",'recurringtype','recurringevents',1,'15','recurringtype','Recurrence',1,0,0,100,6,19,3,'O~O',1,null,'BAS')");
-
- $this->db->query("Insert into field values (9,".$this->db->getUniqueID("field").",'notime','activity',1,56,'notime','No Time',1,0,0,100,20,19,3,'C~O',1,null,'BAS')");
-//Block19 -- End
-//Task Details -- END
-
-//Event Details --START
-//Block41-43-- Start
- $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'subject','activity',1,'2','subject','Subject',1,0,0,100,1,41,1,'V~M',0,1,'BAS')");
- $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,2,41,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'date_start','activity',1,'6','date_start','Start Date & Time',1,0,0,100,3,41,1,'DT~M~time_start',0,2,'BAS')");
- $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'time_start','activity',1,'2','time_start','Time Start',1,0,0,100,4,41,3,'T~M',1,null,'BAS')");
-
- $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'due_date','activity',1,'23','due_date','End Date',1,0,0,100,5,41,1,'D~M~OTH~GE~date_start~Start Date & Time',1,null,'BAS')");
- $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'recurringtype','recurringevents',1,'15','recurringtype','Recurrence',1,0,0,100,6,41,1,'O~O',1,null,'BAS')");
-  
- $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'duration_hours','activity',1,'63','duration_hours','Duration',1,0,0,100,7,41,1,'I~M',0,5,'BAS')");
- $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'duration_minutes','activity',1,'15','duration_minutes','Duration Minutes',1,0,0,100,8,41,3,'O~O',1,null,'BAS')");
- $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'crmid','seactivityrel',1,'66','parent_id','Related To',1,0,0,100,9,41,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'contactid','cntactivityrel',1,'57','contact_id','Contact Name',1,0,0,100,10,41,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'eventstatus','activity',1,'15','eventstatus','Status',1,0,0,100,11,41,1,'V~O',0,3,'BAS')");
- $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'sendnotification','activity',1,'56','sendnotification','Send Notification',1,0,0,100,12,41,1,'C~O',1,null,'BAS')");
- $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'activitytype','activity',1,'15','activitytype','Activity Type',1,0,0,100,13,41,1,'V~O',0,4,'BAS')");
- $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'location','activity',1,'1','location','Location',1,0,0,100,14,41,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,15,41,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,16,41,2,'T~O',1,null,'BAS')");
- $this->db->query("Insert into field values (16,".$this->db->getUniqueID("field").",'priority','activity',1,15,'taskpriority','Priority',1,0,0,100,17,41,1,'V~O',1,null,'BAS')");
- $this->db->query("Insert into field values (16,".$this->db->getUniqueID("field").",'notime','activity',1,56,'notime','No Time',1,0,0,100,18,41,1,'C~O',1,null,'BAS')");
- $this->db->query("Insert into field values (16,".$this->db->getUniqueID("field").",'visibility','activity',1,15,'visibility','Visibility',1,0,0,100,19,41,1,'V~O',1,null,'BAS')");
- 
- $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,43,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (16,".$this->db->getUniqueID("field").",'reminder_time','activity_reminder',1,'30','reminder_time','Send Reminder',1,0,0,100,1,42,1,'I~O',1,null,'BAS')");
-//Block41-43 -- End
-//Event Details -- END
-
-//Faq Details -- START
-//Block37-40 -- Start
-
-$this->db->query("insert into field values (15,".$this->db->getUniqueID("field").",'product_id','faq',1,'59','product_id','Product Name',1,0,0,100,1,37,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into field values (15,".$this->db->getUniqueID("field").",'category','faq',1,'15','faqcategories','Category',1,0,0,100,2,37,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (15,".$this->db->getUniqueID("field").",'status','faq',1,'15','faqstatus','Status',1,0,0,100,3,37,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (15,".$this->db->getUniqueID("field").",'question','faq',1,'20','question','Question',1,0,0,100,1,38,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into field values (15,".$this->db->getUniqueID("field").",'answer','faq',1,'20','faq_answer','Answer',1,0,0,100,1,39,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into field values (15,".$this->db->getUniqueID("field").",'comments','faqcomments',1,'19','comments','Add Comment',1,0,0,100,1,40,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into field values (15,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,3,37,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into field values (15,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,4,37,2,'T~O',1,null,'BAS')");
-
-
-//Block37-40 -- End
-//Ticket Details -- END
-
-//Vendor Details --START
-//Block44-47
-
-$this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'vendorname','vendor',1,'2','vendorname','Vendor Name',1,0,0,100,1,44,1,'V~M',0,1,'BAS')");
- $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'phone','vendor',1,'1','phone','Phone',1,0,0,100,3,44,1,'V~O',0,2,'BAS')");
- $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'email','vendor',1,'13','email','Email',1,0,0,100,4,44,1,'E~O',0,3,'BAS')");
- $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'website','vendor',1,'17','website','Website',1,0,0,100,5,44,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'glacct','vendor',1,'15','glacct','GL Account',1,0,0,100,6,44,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'category','vendor',1,'1','category','Category',1,0,0,100,7,44,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,8,44,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,9,44,2,'T~O',1,null,'BAS')");
-
-//Block 46
-
-$this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'street','vendor',1,'21','street','Street',1,0,0,100,1,46,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'pobox','vendor',1,'1','pobox','Po Box',1,0,0,100,2,46,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'city','vendor',1,'1','city','City',1,0,0,100,3,46,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'state','vendor',1,'1','state','State',1,0,0,100,4,46,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'postalcode','vendor',1,'1','postalcode','Postal Code',1,0,0,100,5,46,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'country','vendor',1,'1','country','Country',1,0,0,100,6,46,1,'V~O',1,null,'ADV')");
-
-//Block 47
-
-$this->db->query("insert into field values (18,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,47,1,'V~O',1,null,'ADV')");
-
-//Vendor Details -- END
-
-//PriceBook Details Start
-//Block48
-
-$this->db->query("insert into field values (19,".$this->db->getUniqueID("field").",'bookname','pricebook',1,'2','bookname','Price Book Name',1,0,0,100,1,48,1,'V~M',0,1,'BAS')");
- $this->db->query("insert into field values (19,".$this->db->getUniqueID("field").",'active','pricebook',1,'56','active','Active',1,0,0,100,3,48,1,'V~O',0,2,'BAS')");
-$this->db->query("insert into field values (19,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,4,48,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into field values (19,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,5,48,2,'T~O',1,null,'BAS')");
-
-//Block50
-
-$this->db->query("insert into field values (19,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,50,1,'V~O',1,null,'BAS')");
-
-//PriceBook Details End
-
-
-//Quote Details -- START
- //Block51
-
-$this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'subject','quotes',1,'2','subject','Subject',1,0,0,100,1,51,1,'V~M',1,null,'BAS')");	
- $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'potentialid','quotes',1,'76','potential_id','Potential Name',1,0,0,100,2,51,1,'I~O',1,null,'BAS')");	
- $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'quotestage','quotes',1,'15','quotestage','Quote Stage',1,0,0,100,3,51,1,'V~O',1,null,'BAS')");	
-
- $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'validtill','quotes',1,'5','validtill','Valid Till',1,0,0,100,4,51,1,'D~O',1,null,'BAS')");	
- $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'team','quotes',1,'1','team','Team',1,0,0,100,5,51,1,'V~O',1,null,'BAS')");	
- $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'contactid','quotes',1,'57','contact_id','Contact Name',1,0,0,100,6,51,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'carrier','quotes',1,'15','carrier','Carrier',1,0,0,100,8,51,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'subtotal','quotes',1,'1','hdnSubTotal','Sub Total',1,0,0,100,9,51,3,'N~O',1,null,'BAS')");
- $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'shipping','quotes',1,'1','shipping','Shipping',1,0,0,100,10,51,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'inventorymanager','quotes',1,'77','assigned_user_id1','Inventory Manager',1,0,0,100,11,51,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'tax','quotes',1,'1','txtTax','Tax',1,0,0,100,13,51,3,'N~O',1,null,'BAS')");
- $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'adjustment','quotes',1,'1','txtAdjustment','Adjustment',1,0,0,100,20,51,3,'NN~O',1,null,'BAS')");
- $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'total','quotes',1,'1','hdnGrandTotal','Total',1,0,0,100,14,51,3,'N~O',1,null,'BAS')");
- $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'accountid','quotes',1,'73','account_id','Account Name',1,0,0,100,16,51,1,'I~M',1,null,'BAS')");
- $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,17,51,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,18,51,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,19,51,2,'T~O',1,null,'BAS')");
-
-
- //Block 53
-
-$this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'bill_street','quotesbillads',1,'24','bill_street','Billing Address',1,0,0,100,1,53,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'ship_street','quotesshipads',1,'24','ship_street','Shipping Address',1,0,0,100,2,53,1,'V~M',1,null,'BAS')");
-
- $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'bill_city','quotesbillads',1,'1','bill_city','Billing City',1,0,0,100,5,53,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'ship_city','quotesshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,53,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'bill_state','quotesbillads',1,'1','bill_state','Billing State',1,0,0,100,7,53,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'ship_state','quotesshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,53,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'bill_code','quotesbillads',1,'1','bill_code','Billing Code',1,0,0,100,9,53,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'ship_code','quotesshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,53,1,'V~O',1,null,'BAS')");
-
-
- $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'bill_country','quotesbillads',1,'1','bill_country','Billing Country',1,0,0,100,11,53,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'ship_country','quotesshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,53,1,'V~O',1,null,'BAS')");
-
-$this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'bill_pobox','quotesbillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,53,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'ship_pobox','quotesshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,53,1,'V~O',1,null,'BAS')");
- //Block55
-
-$this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,56,1,'V~O',1,null,'ADV')");
-
-//Block 56
-$this->db->query("insert into field values (20,".$this->db->getUniqueID("field").",'terms_conditions','quotes',1,'19','terms_conditions','Terms & Conditions',1,0,0,100,1,55,1,'V~O',1,null,'ADV')");
-
-
-//Quote Details -- END
-
-//Purchase Order Details -- START
- //Block57
- 
-$this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'subject','purchaseorder',1,'2','subject','Subject',1,0,0,100,1,57,1,'V~M',1,null,'BAS')");	
- $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'vendorid','purchaseorder',1,'81','vendor_id','Vendor Name',1,0,0,100,3,57,1,'I~M',1,null,'BAS')");	
- $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'requisition_no','purchaseorder',1,'1','requisition_no','Requisition No',1,0,0,100,4,57,1,'V~O',1,null,'BAS')");	
-
- $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'tracking_no','purchaseorder',1,'1','tracking_no','Tracking Number',1,0,0,100,5,57,1,'V~O',1,null,'BAS')");	
- $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'contactid','purchaseorder',1,'57','contact_id','Contact Name',1,0,0,100,6,57,1,'I~O',1,null,'BAS')");	
- $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'duedate','purchaseorder',1,'5','duedate','Due Date',1,0,0,100,7,57,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'carrier','purchaseorder',1,'15','carrier','Carrier',1,0,0,100,8,57,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'salestax','purchaseorder',1,'1','txtTax','Sales Tax',1,0,0,100,10,57,3,'N~O',1,null,'BAS')");
- $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'adjustment','purchaseorder',1,'1','txtAdjustment','Adjustment',1,0,0,100,10,57,3,'NN~O',1,null,'BAS')");
- $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'salescommission','purchaseorder',1,'1','salescommission','Sales Commission',1,0,0,100,11,57,1,'N~O',1,null,'BAS')");
- $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'exciseduty','purchaseorder',1,'1','exciseduty','Excise Duty',1,0,0,100,12,57,1,'N~O',1,null,'BAS')");
- $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'total','purchaseorder',1,'1','hdnGrandTotal','Total',1,0,0,100,13,57,3,'N~O',1,null,'BAS')");
- $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'subtotal','purchaseorder',1,'1','hdnSubTotal','Sub Total',1,0,0,100,14,57,3,'N~O',1,null,'BAS')");
- $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'postatus','purchaseorder',1,'15','postatus','Status',1,0,0,100,15,57,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,16,57,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,17,57,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,18,57,2,'T~O',1,null,'BAS')");
-
-
-
- //Block 59
-
-$this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'bill_street','pobillads',1,'24','bill_street','Billing Address',1,0,0,100,1,59,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'ship_street','poshipads',1,'24','ship_street','Shipping Address',1,0,0,100,2,59,1,'V~M',1,null,'BAS')");
-
- $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'bill_city','pobillads',1,'1','bill_city','Billing City',1,0,0,100,5,59,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'ship_city','poshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,59,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'bill_state','pobillads',1,'1','bill_state','Billing State',1,0,0,100,7,59,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'ship_state','poshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,59,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'bill_code','pobillads',1,'1','bill_code','Billing Code',1,0,0,100,9,59,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'ship_code','poshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,59,1,'V~O',1,null,'BAS')");
-
-
- $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'bill_country','pobillads',1,'1','bill_country','Billing Country',1,0,0,100,11,59,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'ship_country','poshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,59,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'bill_pobox','pobillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,59,1,'V~O',1,null,'BAS')");
-  $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'ship_pobox','poshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,59,1,'V~O',1,null,'BAS')");
-  
- //Block61
- $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,62,1,'V~O',1,null,'ADV')");
-
- //Block62
- $this->db->query("insert into field values (21,".$this->db->getUniqueID("field").",'terms_conditions','purchaseorder',1,'19','terms_conditions','Terms & Conditions',1,0,0,100,1,61,1,'V~O',1,null,'ADV')");
-
-//Purchase Order Details -- END
-
-//Sales Order Details -- START
- //Block63
- 
-$this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'subject','salesorder',1,'2','subject','Subject',1,0,0,100,1,63,1,'V~M',1,null,'BAS')");	
- $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'potentialid','salesorder',1,'76','potential_id','Potential Name',1,0,0,100,2,63,1,'I~O',1,null,'BAS')");	
- $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'customerno','salesorder',1,'1','customerno','Customer No',1,0,0,100,3,63,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'quoteid','salesorder',1,'78','quote_id','Quote Name',1,0,0,100,4,63,1,'I~O',1,null,'BAS')");	
-$this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'purchaseorder','salesorder',1,'1','purchaseorder','Purchase Order',1,0,0,100,4,63,1,'V~O',1,null,'BAS')");	
-
- $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'contactid','salesorder',1,'57','contact_id','Contact Name',1,0,0,100,6,63,1,'I~O',1,null,'BAS')");	
- $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'duedate','salesorder',1,'5','duedate','Due Date',1,0,0,100,8,63,1,'D~O',1,null,'BAS')");
- $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'carrier','salesorder',1,'15','carrier','Carrier',1,0,0,100,9,63,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'pending','salesorder',1,'1','pending','Pending',1,0,0,100,10,63,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'sostatus','salesorder',1,'15','sostatus','Status',1,0,0,100,11,63,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'salestax','salesorder',1,'1','txtTax','Sales Tax',1,0,0,100,12,63,3,'N~O',1,null,'BAS')");
- $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'adjustment','salesorder',1,'1','txtAdjustment','Sales Tax',1,0,0,100,12,63,3,'NN~O',1,null,'BAS')");
- $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'salescommission','salesorder',1,'1','salescommission','Sales Commission',1,0,0,100,13,63,1,'N~O',1,null,'BAS')");
- $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'exciseduty','salesorder',1,'1','exciseduty','Excise Duty',1,0,0,100,13,63,1,'N~O',1,null,'BAS')");
- $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'total','salesorder',1,'1','hdnGrandTotal','Total',1,0,0,100,14,63,3,'N~O',1,null,'BAS')");
- $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'subtotal','salesorder',1,'1','hdnSubTotal','Total',1,0,0,100,15,63,3,'N~O',1,null,'BAS')");
- $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'accountid','salesorder',1,'73','account_id','Account Name',1,0,0,100,16,63,1,'I~M',1,null,'BAS')");
- $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,17,63,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,18,63,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,19,63,2,'T~O',1,null,'BAS')");
-
-
-
- //Block 65
-
- $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'bill_street','sobillads',1,'24','bill_street','Billing Address',1,0,0,100,1,65,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'ship_street','soshipads',1,'24','ship_street','Shipping Address',1,0,0,100,2,65,1,'V~M',1,null,'BAS')");
-
- $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'bill_city','sobillads',1,'1','bill_city','Billing City',1,0,0,100,5,65,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'ship_city','soshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,65,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'bill_state','sobillads',1,'1','bill_state','Billing State',1,0,0,100,7,65,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'ship_state','soshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,65,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'bill_code','sobillads',1,'1','bill_code','Billing Code',1,0,0,100,9,65,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'ship_code','soshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,65,1,'V~O',1,null,'BAS')");
-
-
- $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'bill_country','sobillads',1,'1','bill_country','Billing Country',1,0,0,100,11,65,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'ship_country','soshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,65,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'bill_pobox','sobillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,65,1,'V~O',1,null,'BAS')");
-  $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'ship_pobox','soshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,65,1,'V~O',1,null,'BAS')");
-  
-//Block67
- $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,68,1,'V~O',1,null,'ADV')");
-
- //Block68
- $this->db->query("insert into field values (22,".$this->db->getUniqueID("field").",'terms_conditions','salesorder',1,'19','terms_conditions','Terms & Conditions',1,0,0,100,1,67,1,'V~O',1,null,'ADV')");
-
-
-//Sales Order Details -- END
-
-//Invoice Details -- START
- //Block69
-
-$this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'subject','invoice',1,'2','subject','Subject',1,0,0,100,1,69,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'salesorderid','invoice',1,'80','salesorder_id','Sales Order',1,0,0,100,2,69,1,'I~O',1,null,'BAS')");	
- $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'customerno','invoice',1,'1','customerno','Customer No',1,0,0,100,3,69,1,'V~O',1,null,'BAS')");	
-
- 
-//to include contact name field in Invoice-start
-$this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'contactid','invoice',1,'57','contact_id','Contact Name',1,0,0,100,4,69,1,'I~O',1,null,'BAS')");
-//end
-
-$this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'invoicedate','invoice',1,'5','invoicedate','Invoice Date',1,0,0,100,5,69,1,'D~O',1,null,'BAS')");
- $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'duedate','invoice',1,'5','duedate','Due Date',1,0,0,100,6,69,1,'D~O',1,null,'BAS')");
-$this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'purchaseorder','invoice',1,'1','purchaseorder','Purchase Order',1,0,0,100,8,69,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'salestax','invoice',1,'1','txtTax','Sales Tax',1,0,0,100,9,69,3,'N~O',1,null,'BAS')");
- $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'adjustment','invoice',1,'1','txtAdjustment','Sales Tax',1,0,0,100,9,69,3,'NN~O',1,null,'BAS')");
- $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'salescommission','invoice',1,'1','salescommission','Sales Commission',1,0,0,10,13,69,1,'N~O',1,null,'BAS')");
- $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'exciseduty','invoice',1,'1','exciseduty','Excise Duty',1,0,0,100,11,69,1,'N~O',1,null,'BAS')");
- $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'subtotal','invoice',1,'1','hdnSubTotal','Sub Total',1,0,0,100,12,69,3,'N~O',1,null,'BAS')");
- $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'total','invoice',1,'1','hdnGrandTotal','Total',1,0,0,100,13,69,3,'N~O',1,null,'BAS')");
-$this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'accountid','invoice',1,'73','account_id','Account Name',1,0,0,100,14,69,1,'I~M',1,null,'BAS')");
- $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'invoicestatus','invoice',1,'15','invoicestatus','Status',1,0,0,100,15,69,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,16,69,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,17,69,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,18,69,2,'T~O',1,null,'BAS')"); 
-
- //Block 71
-
-$this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'bill_street','invoicebillads',1,'24','bill_street','Billing Address',1,0,0,100,1,71,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'ship_street','invoiceshipads',1,'24','ship_street','Shipping Address',1,0,0,100,2,71,1,'V~M',1,null,'BAS')");
-
- $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'bill_city','invoicebillads',1,'1','bill_city','Billing City',1,0,0,100,5,71,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'ship_city','invoiceshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,71,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'bill_state','invoicebillads',1,'1','bill_state','Billing State',1,0,0,100,7,71,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'ship_state','invoiceshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,71,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'bill_code','invoicebillads',1,'1','bill_code','Billing Code',1,0,0,100,9,71,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'ship_code','invoiceshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,71,1,'V~O',1,null,'BAS')");
-
-
- $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'bill_country','invoicebillads',1,'1','bill_country','Billing Country',1,0,0,100,11,71,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'ship_country','invoiceshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,71,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'bill_pobox','invoicebillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,71,1,'V~O',1,null,'BAS')");
-  $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'ship_pobox','invoiceshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,71,1,'V~O',1,null,'BAS')");
-
-//Block73
- $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,74,1,'V~O',1,null,'ADV')");
- //Block74
- $this->db->query("insert into field values (23,".$this->db->getUniqueID("field").",'terms_conditions','invoice',1,'19','terms_conditions','Terms & Conditions',1,0,0,100,1,73,1,'V~O',1,null,'ADV')");
-
-
-//Invoice Details -- END
-
-
-
-                // Insert End
-                
-
-		//New Security Start
-		//Inserting into profile table
-		$this->db->query("insert into profile values ('".$profile1_id."','Administrator',null)");	
-		$this->db->query("insert into profile values ('".$profile2_id."','Sales Profile',null)");
-		$this->db->query("insert into profile values ('".$profile3_id."','Support Profile',null)");
-		$this->db->query("insert into profile values ('".$profile4_id."','Guest Profile',null)");
-		
-		//Inserting into profile2gloabal permissions
-		$this->db->query("insert into profile2globalpermissions values ('".$profile1_id."',1,0)");
-		$this->db->query("insert into profile2globalpermissions values ('".$profile1_id."',2,0)");
-		$this->db->query("insert into profile2globalpermissions values ('".$profile2_id."',1,1)");
-		$this->db->query("insert into profile2globalpermissions values ('".$profile2_id."',2,1)");
-		$this->db->query("insert into profile2globalpermissions values ('".$profile3_id."',1,1)");
-		$this->db->query("insert into profile2globalpermissions values ('".$profile3_id."',2,1)");
-		$this->db->query("insert into profile2globalpermissions values ('".$profile4_id."',1,1)");
-		$this->db->query("insert into profile2globalpermissions values ('".$profile4_id."',2,1)");
-
-		//Inserting into profile2tab
-		$this->db->query("insert into profile2tab values (".$profile1_id.",1,0)");
-		$this->db->query("insert into profile2tab values (".$profile1_id.",2,0)");
-		$this->db->query("insert into profile2tab values (".$profile1_id.",3,0)");
-		$this->db->query("insert into profile2tab values (".$profile1_id.",4,0)");
-		$this->db->query("insert into profile2tab values (".$profile1_id.",6,0)");
-		$this->db->query("insert into profile2tab values (".$profile1_id.",7,0)");
-		$this->db->query("insert into profile2tab values (".$profile1_id.",8,0)");
-		$this->db->query("insert into profile2tab values (".$profile1_id.",9,0)");
-		$this->db->query("insert into profile2tab values (".$profile1_id.",10,0)");
-		$this->db->query("insert into profile2tab values (".$profile1_id.",13,0)");
-		$this->db->query("insert into profile2tab values (".$profile1_id.",14,0)");
-		$this->db->query("insert into profile2tab values (".$profile1_id.",15,0)");
-		$this->db->query("insert into profile2tab values (".$profile1_id.",16,0)");
-		$this->db->query("insert into profile2tab values (".$profile1_id.",17,0)");
-		$this->db->query("insert into profile2tab values (".$profile1_id.",18,0)");
-		$this->db->query("insert into profile2tab values (".$profile1_id.",19,0)");
-		$this->db->query("insert into profile2tab values (".$profile1_id.",20,0)");
-		$this->db->query("insert into profile2tab values (".$profile1_id.",21,0)");
-		$this->db->query("insert into profile2tab values (".$profile1_id.",22,0)");
-		$this->db->query("insert into profile2tab values (".$profile1_id.",23,0)");
-		$this->db->query("insert into profile2tab values (".$profile1_id.",24,0)");
-		$this->db->query("insert into profile2tab values (".$profile1_id.",25,0)");
-       		$this->db->query("insert into profile2tab values (".$profile1_id.",26,0)");
-       		$this->db->query("insert into profile2tab values (".$profile1_id.",27,0)");
-
-		//Inserting into profile2tab
-		$this->db->query("insert into profile2tab values (".$profile2_id.",1,0)");
-		$this->db->query("insert into profile2tab values (".$profile2_id.",2,0)");
-		$this->db->query("insert into profile2tab values (".$profile2_id.",3,0)");
-		$this->db->query("insert into profile2tab values (".$profile2_id.",4,0)");
-		$this->db->query("insert into profile2tab values (".$profile2_id.",6,0)");
-		$this->db->query("insert into profile2tab values (".$profile2_id.",7,0)");
-		$this->db->query("insert into profile2tab values (".$profile2_id.",8,0)");
-		$this->db->query("insert into profile2tab values (".$profile2_id.",9,0)");
-		$this->db->query("insert into profile2tab values (".$profile2_id.",10,0)");
-		$this->db->query("insert into profile2tab values (".$profile2_id.",13,0)");
-		$this->db->query("insert into profile2tab values (".$profile2_id.",14,0)");
-		$this->db->query("insert into profile2tab values (".$profile2_id.",15,0)");
-		$this->db->query("insert into profile2tab values (".$profile2_id.",16,0)");
-		$this->db->query("insert into profile2tab values (".$profile2_id.",17,0)");
-		$this->db->query("insert into profile2tab values (".$profile2_id.",18,0)");
-		$this->db->query("insert into profile2tab values (".$profile2_id.",19,0)");
-		$this->db->query("insert into profile2tab values (".$profile2_id.",20,0)");
-		$this->db->query("insert into profile2tab values (".$profile2_id.",21,0)");
-		$this->db->query("insert into profile2tab values (".$profile2_id.",22,0)");
-		$this->db->query("insert into profile2tab values (".$profile2_id.",23,0)");
-		$this->db->query("insert into profile2tab values (".$profile2_id.",24,0)");
-		$this->db->query("insert into profile2tab values (".$profile2_id.",25,0)");
-        	$this->db->query("insert into profile2tab values (".$profile2_id.",26,0)");
-       		$this->db->query("insert into profile2tab values (".$profile2_id.",27,0)");
-
-		$this->db->query("insert into profile2tab values (".$profile3_id.",1,0)");
-		$this->db->query("insert into profile2tab values (".$profile3_id.",2,0)");
-		$this->db->query("insert into profile2tab values (".$profile3_id.",3,0)");
-		$this->db->query("insert into profile2tab values (".$profile3_id.",4,0)");
-		$this->db->query("insert into profile2tab values (".$profile3_id.",6,0)");
-		$this->db->query("insert into profile2tab values (".$profile3_id.",7,0)");
-		$this->db->query("insert into profile2tab values (".$profile3_id.",8,0)");
-		$this->db->query("insert into profile2tab values (".$profile3_id.",9,0)");
-		$this->db->query("insert into profile2tab values (".$profile3_id.",10,0)");
-		$this->db->query("insert into profile2tab values (".$profile3_id.",13,0)");
-		$this->db->query("insert into profile2tab values (".$profile3_id.",14,0)");
-		$this->db->query("insert into profile2tab values (".$profile3_id.",15,0)");
-		$this->db->query("insert into profile2tab values (".$profile3_id.",16,0)");
-		$this->db->query("insert into profile2tab values (".$profile3_id.",17,0)");
-		$this->db->query("insert into profile2tab values (".$profile3_id.",18,0)");
-		$this->db->query("insert into profile2tab values (".$profile3_id.",19,0)");
-		$this->db->query("insert into profile2tab values (".$profile3_id.",20,0)");
-		$this->db->query("insert into profile2tab values (".$profile3_id.",21,0)");
-		$this->db->query("insert into profile2tab values (".$profile3_id.",22,0)");
-		$this->db->query("insert into profile2tab values (".$profile3_id.",23,0)");
-		$this->db->query("insert into profile2tab values (".$profile3_id.",24,0)");
-		$this->db->query("insert into profile2tab values (".$profile3_id.",25,0)");
-        	$this->db->query("insert into profile2tab values (".$profile3_id.",26,0)");
-       		$this->db->query("insert into profile2tab values (".$profile3_id.",27,0)");
-        
-
-		$this->db->query("insert into profile2tab values (".$profile4_id.",1,0)");
-		$this->db->query("insert into profile2tab values (".$profile4_id.",2,0)");
-		$this->db->query("insert into profile2tab values (".$profile4_id.",3,0)");
-		$this->db->query("insert into profile2tab values (".$profile4_id.",4,0)");
-		$this->db->query("insert into profile2tab values (".$profile4_id.",6,0)");
-		$this->db->query("insert into profile2tab values (".$profile4_id.",7,0)");
-		$this->db->query("insert into profile2tab values (".$profile4_id.",8,0)");
-		$this->db->query("insert into profile2tab values (".$profile4_id.",9,0)");
-		$this->db->query("insert into profile2tab values (".$profile4_id.",10,0)");
-		$this->db->query("insert into profile2tab values (".$profile4_id.",13,0)");
-		$this->db->query("insert into profile2tab values (".$profile4_id.",14,0)");
-		$this->db->query("insert into profile2tab values (".$profile4_id.",15,0)");
-		$this->db->query("insert into profile2tab values (".$profile4_id.",16,0)");	
-		$this->db->query("insert into profile2tab values (".$profile4_id.",17,0)");
-		$this->db->query("insert into profile2tab values (".$profile4_id.",18,0)");
-		$this->db->query("insert into profile2tab values (".$profile4_id.",19,0)");
-		$this->db->query("insert into profile2tab values (".$profile4_id.",20,0)");
-		$this->db->query("insert into profile2tab values (".$profile4_id.",21,0)");
-		$this->db->query("insert into profile2tab values (".$profile4_id.",22,0)");
-		$this->db->query("insert into profile2tab values (".$profile4_id.",23,0)");
-		$this->db->query("insert into profile2tab values (".$profile4_id.",24,0)");
-		$this->db->query("insert into profile2tab values (".$profile4_id.",25,0)");
-		$this->db->query("insert into profile2tab values (".$profile4_id.",26,0)");
-		$this->db->query("insert into profile2tab values (".$profile4_id.",27,0)");
-		//Inserting into profile2standardpermissions  Adminsitrator
-		
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",2,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",2,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",2,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",2,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",2,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",4,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",4,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",4,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",4,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",4,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",6,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",6,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",6,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",6,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",6,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",7,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",7,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",7,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",7,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",7,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",8,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",8,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",8,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",8,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",8,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",9,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",9,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",9,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",9,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",9,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",10,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",10,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",10,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",10,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",10,4,0)");
-
-		
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",13,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",13,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",13,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",13,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",13,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",14,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",14,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",14,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",14,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",14,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",15,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",15,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",15,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",15,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",15,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",16,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",16,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",16,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",16,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",16,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",18,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",18,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",18,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",18,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",18,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",19,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",19,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",19,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",19,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",19,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",20,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",20,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",20,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",20,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",20,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",21,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",21,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",21,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",21,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",21,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",22,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",22,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",22,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",22,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",22,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",23,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",23,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",23,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",23,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",23,4,0)");
-
-
-
-        	$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",26,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",26,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",26,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",26,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile1_id.",26,4,0)");
-
-
-		//Insert into Profile 2 std permissions for Sales User  
-		//Help Desk Create/Delete not allowed. Read-Only	
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",2,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",2,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",2,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",2,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",2,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",4,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",4,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",4,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",4,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",4,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",6,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",6,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",6,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",6,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",6,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",7,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",7,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",7,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",7,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",7,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",8,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",8,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",8,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",8,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",8,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",9,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",9,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",9,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",9,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",9,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",10,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",10,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",10,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",10,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",10,4,0)");
-
-		
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",13,0,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",13,1,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",13,2,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",13,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",13,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",14,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",14,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",14,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",14,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",14,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",15,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",15,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",15,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",15,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",15,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",16,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",16,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",16,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",16,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",16,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",18,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",18,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",18,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",18,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",18,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",19,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",19,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",19,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",19,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",19,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",20,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",20,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",20,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",20,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",20,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",21,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",21,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",21,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",21,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",21,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",22,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",22,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",22,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",22,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",22,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",23,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",23,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",23,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",23,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",23,4,0)");
-
-
-        	$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",26,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",26,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",26,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",26,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile2_id.",26,4,0)");
-
-		//Inserting into profile2std for Support Profile
-		// Potential is read-only
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",2,0,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",2,1,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",2,2,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",2,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",2,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",4,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",4,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",4,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",4,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",4,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",6,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",6,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",6,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",6,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",6,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",7,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",7,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",7,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",7,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",7,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",8,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",8,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",8,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",8,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",8,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",9,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",9,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",9,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",9,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",9,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",10,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",10,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",10,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",10,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",10,4,0)");
-
-		
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",13,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",13,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",13,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",13,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",13,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",14,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",14,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",14,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",14,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",14,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",15,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",15,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",15,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",15,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",15,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",16,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",16,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",16,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",16,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",16,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",18,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",18,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",18,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",18,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",18,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",19,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",19,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",19,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",19,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",19,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",20,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",20,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",20,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",20,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",20,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",21,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",21,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",21,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",21,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",21,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",22,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",22,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",22,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",22,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",22,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",23,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",23,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",23,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",23,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",23,4,0)");
-
-
-        	$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",26,0,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",26,1,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",26,2,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",26,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile3_id.",26,4,0)");
-        
-		//Inserting into profile2stdper for Profile Guest Profile
-		//All Read-Only
-		
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",2,0,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",2,1,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",2,2,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",2,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",2,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",4,0,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",4,1,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",4,2,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",4,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",4,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",6,0,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",6,1,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",6,2,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",6,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",6,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",7,0,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",7,1,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",7,2,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",7,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",7,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",8,0,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",8,1,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",8,2,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",8,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",8,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",9,0,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",9,1,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",9,2,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",9,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",9,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",10,0,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",10,1,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",10,2,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",10,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",10,4,0)");
-
-		
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",13,0,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",13,1,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",13,2,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",13,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",13,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",14,0,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",14,1,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",14,2,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",14,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",14,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",15,0,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",15,1,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",15,2,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",15,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",15,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",16,0,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",16,1,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",16,2,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",16,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",16,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",18,0,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",18,1,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",18,2,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",18,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",18,4,0)");	
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",19,0,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",19,1,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",19,2,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",19,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",19,4,0)");	
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",20,0,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",20,1,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",20,2,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",20,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",20,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",21,0,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",21,1,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",21,2,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",21,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",21,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",22,0,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",22,1,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",22,2,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",22,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",22,4,0)");
-
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",23,0,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",23,1,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",23,2,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",23,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",23,4,0)");	
-
-
-        $this->db->query("insert into profile2standardpermissions values (".$profile4_id.",26,0,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",26,1,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",26,2,1)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",26,3,0)");
-		$this->db->query("insert into profile2standardpermissions values (".$profile4_id.",26,4,0)");
-
-		//Insert into role2profile
-		$this->db->query("insert into role2profile values ('H".$role2_id."',".$profile1_id.")");
-		$this->db->query("insert into role2profile values ('H".$role3_id."',".$profile2_id.")");
-	
-		//Insert into profile2field
-			
-                insertProfile2field($profile1_id);
-                insertProfile2field($profile2_id);	
-                insertProfile2field($profile3_id);	
-                insertProfile2field($profile4_id);
-
-		insert_def_org_field();	
-		
-
-		//Inserting into profile 2 utility Admin
-                $this->db->query("insert into profile2utility values (".$profile1_id.",2,5,0)");
-                $this->db->query("insert into profile2utility values (".$profile1_id.",2,6,0)");
-                $this->db->query("insert into profile2utility values (".$profile1_id.",4,5,0)");
-                $this->db->query("insert into profile2utility values (".$profile1_id.",4,6,0)");
-                $this->db->query("insert into profile2utility values (".$profile1_id.",6,5,0)");
-                $this->db->query("insert into profile2utility values (".$profile1_id.",6,6,0)");
-                $this->db->query("insert into profile2utility values (".$profile1_id.",7,5,0)");
-                $this->db->query("insert into profile2utility values (".$profile1_id.",7,6,0)");
-                $this->db->query("insert into profile2utility values (".$profile1_id.",8,6,0)");
-                //$this->db->query("insert into profile2utility values (".$profile1_id.",9,6,0)");
-                $this->db->query("insert into profile2utility values (".$profile1_id.",10,6,0)");
-		$this->db->query("insert into profile2utility values (".$profile1_id.",7,8,0)");
-                $this->db->query("insert into profile2utility values (".$profile1_id.",6,8,0)");
-                $this->db->query("insert into profile2utility values (".$profile1_id.",4,8,0)");
-                $this->db->query("insert into profile2utility values (".$profile1_id.",13,8,0)");
-		$this->db->query("insert into profile2utility values (".$profile1_id.",14,5,0)");
-                $this->db->query("insert into profile2utility values (".$profile1_id.",14,6,0)");
-                $this->db->query("insert into profile2utility values (".$profile1_id.",7,9,0)");
-
-		//Inserting into profile2utility Sales Profile
-		//Import Export Not Allowed.	
-		$this->db->query("insert into profile2utility values (".$profile2_id.",2,5,1)");
-                $this->db->query("insert into profile2utility values (".$profile2_id.",2,6,1)");
-                $this->db->query("insert into profile2utility values (".$profile2_id.",4,5,1)");
-                $this->db->query("insert into profile2utility values (".$profile2_id.",4,6,1)");
-                $this->db->query("insert into profile2utility values (".$profile2_id.",6,5,1)");
-                $this->db->query("insert into profile2utility values (".$profile2_id.",6,6,1)");
-                $this->db->query("insert into profile2utility values (".$profile2_id.",7,5,1)");
-                $this->db->query("insert into profile2utility values (".$profile2_id.",7,6,1)");
-                $this->db->query("insert into profile2utility values (".$profile2_id.",8,6,1)");
-                //$this->db->query("insert into profile2utility values (".$profile2_id.",9,6,1)");
-                $this->db->query("insert into profile2utility values (".$profile2_id.",10,6,1)");
-                $this->db->query("insert into profile2utility values (".$profile2_id.",7,8,0)");
-                $this->db->query("insert into profile2utility values (".$profile2_id.",6,8,0)");
-                $this->db->query("insert into profile2utility values (".$profile2_id.",4,8,0)");
-                $this->db->query("insert into profile2utility values (".$profile2_id.",13,8,0)");
-		$this->db->query("insert into profile2utility values (".$profile2_id.",14,5,1)");
-                $this->db->query("insert into profile2utility values (".$profile2_id.",14,6,1)");
-                $this->db->query("insert into profile2utility values (".$profile2_id.",7,9,0)");
-
-		//Inserting into profile2utility Support Profile
-		//Import Export Not Allowed.	
-		$this->db->query("insert into profile2utility values (".$profile3_id.",2,5,1)");
-                $this->db->query("insert into profile2utility values (".$profile3_id.",2,6,1)");
-                $this->db->query("insert into profile2utility values (".$profile3_id.",4,5,1)");
-                $this->db->query("insert into profile2utility values (".$profile3_id.",4,6,1)");
-                $this->db->query("insert into profile2utility values (".$profile3_id.",6,5,1)");
-                $this->db->query("insert into profile2utility values (".$profile3_id.",6,6,1)");
-                $this->db->query("insert into profile2utility values (".$profile3_id.",7,5,1)");
-                $this->db->query("insert into profile2utility values (".$profile3_id.",7,6,1)");
-                $this->db->query("insert into profile2utility values (".$profile3_id.",8,6,1)");
-                //$this->db->query("insert into profile2utility values (".$profile3_id.",9,6,1)");
-                $this->db->query("insert into profile2utility values (".$profile3_id.",10,6,1)");
-                $this->db->query("insert into profile2utility values (".$profile3_id.",7,8,0)");
-                $this->db->query("insert into profile2utility values (".$profile3_id.",6,8,0)");
-                $this->db->query("insert into profile2utility values (".$profile3_id.",4,8,0)");
-                $this->db->query("insert into profile2utility values (".$profile3_id.",13,8,0)");
-		$this->db->query("insert into profile2utility values (".$profile3_id.",14,5,1)");
-                $this->db->query("insert into profile2utility values (".$profile3_id.",14,6,1)");
-                $this->db->query("insert into profile2utility values (".$profile3_id.",7,9,0)");
-
-		//Inserting into profile2utility Guest Profile Read-Only
-		//Import Export BusinessCar Not Allowed.	
-		$this->db->query("insert into profile2utility values (".$profile4_id.",2,5,1)");
-                $this->db->query("insert into profile2utility values (".$profile4_id.",2,6,1)");
-                $this->db->query("insert into profile2utility values (".$profile4_id.",4,5,1)");
-                $this->db->query("insert into profile2utility values (".$profile4_id.",4,6,1)");
-                $this->db->query("insert into profile2utility values (".$profile4_id.",6,5,1)");
-                $this->db->query("insert into profile2utility values (".$profile4_id.",6,6,1)");
-                $this->db->query("insert into profile2utility values (".$profile4_id.",7,5,1)");
-                $this->db->query("insert into profile2utility values (".$profile4_id.",7,6,1)");
-                $this->db->query("insert into profile2utility values (".$profile4_id.",8,6,1)");
-                //$this->db->query("insert into profile2utility values (".$profile4_id.",9,6,1)");
-                $this->db->query("insert into profile2utility values (".$profile4_id.",10,6,1)");
-                $this->db->query("insert into profile2utility values (".$profile4_id.",7,8,1)");
-                $this->db->query("insert into profile2utility values (".$profile4_id.",6,8,1)");
-                $this->db->query("insert into profile2utility values (".$profile4_id.",4,8,1)");		
-                $this->db->query("insert into profile2utility values (".$profile4_id.",13,8,1)");		
-		$this->db->query("insert into profile2utility values (".$profile4_id.",14,5,1)");
-                $this->db->query("insert into profile2utility values (".$profile4_id.",14,6,1)");
-                $this->db->query("insert into profile2utility values (".$profile4_id.",7,9,0)");
-
-		//Inserting values into org share action mapping
-                $this->db->query("insert into org_share_action_mapping values(0,'Public: Read Only')");
-                $this->db->query("insert into org_share_action_mapping values(1,'Public: Read, Create/Edit')");
-                $this->db->query("insert into org_share_action_mapping values(2,'Public: Read, Create/Edit, Delete')");
-                $this->db->query("insert into org_share_action_mapping values(3,'Private')");
-
-                $this->db->query("insert into org_share_action_mapping values(4,'Hide Details')");
-                $this->db->query("insert into org_share_action_mapping values(5,'Hide Details and Add Events')");
-                $this->db->query("insert into org_share_action_mapping values(6,'Show Details')");
-                $this->db->query("insert into org_share_action_mapping values(7,'Show Details and Add Events')");
-
-
-		//Inserting for all tabs
-                $def_org_tabid= Array(2,4,6,7,9,10,13,16,20,21,22,23,26);
-
-                foreach($def_org_tabid as $def_tabid)
-                {
-                        $this->db->query("insert into org_share_action2tab values(0,".$def_tabid.")");
-                        $this->db->query("insert into org_share_action2tab values(1,".$def_tabid.")");
-                        $this->db->query("insert into org_share_action2tab values(2,".$def_tabid.")");
-                        $this->db->query("insert into org_share_action2tab values(3,".$def_tabid.")");
-                }
-
-                $this->db->query("insert into org_share_action2tab values(4,17)");
-                $this->db->query("insert into org_share_action2tab values(5,17)");
-                $this->db->query("insert into org_share_action2tab values(6,17)");
-                $this->db->query("insert into org_share_action2tab values(7,17)");
-
-		//Insert into default_org_sharingrule
-               $this->db->query("insert into def_org_share values (".$this->db->getUniqueID('def_org_share').",2,2,0)");
-
-               $this->db->query("insert into def_org_share values (".$this->db->getUniqueID('def_org_share').",4,2,2)");
-
-               $this->db->query("insert into def_org_share values (".$this->db->getUniqueID('def_org_share').",6,2,0)");
-
-               $this->db->query("insert into def_org_share values (".$this->db->getUniqueID('def_org_share').",7,2,0)");
-
-               $this->db->query("insert into def_org_share values (".$this->db->getUniqueID('def_org_share').",9,3,1)");
-               $this->db->query("insert into def_org_share values (".$this->db->getUniqueID('def_org_share').",10,2,0)");
-               $this->db->query("insert into def_org_share values (".$this->db->getUniqueID('def_org_share').",13,2,0)");
-               $this->db->query("insert into def_org_share values (".$this->db->getUniqueID('def_org_share').",16,3,2)");
-               $this->db->query("insert into def_org_share values (".$this->db->getUniqueID('def_org_share').",17,7,0)");
-               $this->db->query("insert into def_org_share values (".$this->db->getUniqueID('def_org_share').",20,2,0)");
-               $this->db->query("insert into def_org_share values (".$this->db->getUniqueID('def_org_share').",21,2,0)");
-               $this->db->query("insert into def_org_share values (".$this->db->getUniqueID('def_org_share').",22,2,0)");
-               $this->db->query("insert into def_org_share values (".$this->db->getUniqueID('def_org_share').",23,2,0)");
-               $this->db->query("insert into def_org_share values (".$this->db->getUniqueID('def_org_share').",26,2,0)");
-
-		//Populating the DataShare Related Modules
-
-		//Lead Related Module
-		$this->db->query("insert into datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",7,10)");
-
-		//Account Related Module
-		$this->db->query("insert into datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",6,2)");
-		$this->db->query("insert into datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",6,13)");
-		$this->db->query("insert into datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",6,20)");
-		$this->db->query("insert into datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",6,22)");
-		$this->db->query("insert into datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",6,23)");
-		$this->db->query("insert into datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",6,10)");
-
-		//Potential Related Module
-		$this->db->query("insert into datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",2,20)");
-		$this->db->query("insert into datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",2,22)");
-
-		//Quote Related Module
-		$this->db->query("insert into datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",20,22)");
-
-		//SO Related Module
-		$this->db->query("insert into datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",22,23)");	
-
-
-			
-					
-  // New Secutity End
-
-
-         //insert into the notificationscheduler table
-
-	//insert into related list table
-	//Inserting for account related lists
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("Potentials").",'get_opportunities',1,'Potentials',0)");	
-		
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("Contacts").",'get_contacts',2,'Contacts',0)");
-
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("Activities").",'get_activities',3,'Activities',0)");
-
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("HelpDesk").",'get_tickets',4,'HelpDesk',0)");
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("Activities").",'get_history',5,'Activity History',0)");
-
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",0,'get_attachments',6,'Attachments',0)");
-
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("Quotes").",'get_quotes',7,'Quotes',0)");
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("Invoice").",'get_invoices',8,'Invoice',0)");
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("SalesOrder").",'get_salesorder',9,'Sales Order',0)");
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("Products").",'get_products',10,'Products',0)");
-
-	//Inserting Lead Related Lists	
-
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Leads").",".getTabid("Activities").",'get_activities',1,'Activities',0)");
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Leads").",".getTabid("Emails").",'get_emails',2,'Emails',0)");
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Leads").",".getTabid("Activities").",'get_history',3,'Activity History',0)");
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Leads").",0,'get_attachments',4,'Attachments',0)");
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Leads").",".getTabid("Products").",'get_products',5,'Products',0)");
-
-	//Inserting for contact related lists
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Potentials").",'get_opportunities',1,'Potentials',0)");	
-		
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Activities").",'get_activities',2,'Activities',0)");
-
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Emails").",'get_emails',3,'Emails',0)");
-
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("HelpDesk").",'get_tickets',4,'HelpDesk',0)");
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Quotes").",'get_quotes',5,'Quotes',0)");
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("PurchaseOrder").",'get_purchase_orders',6,'Purchase Order',0)");
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("SalesOrder").",'get_salesorder',7,'Sales Order',0)");
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Products").",'get_products',8,'Products',0)");
-
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Activities").",'get_history',9,'Activity History',0)");
-
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",0,'get_attachments',10,'Attachments',0)");
-
-	//Inserting Potential Related Lists	
-
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",".getTabid("Activities").",'get_activities',1,'Activities',0)");
-
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",".getTabid("Contacts").",'get_contacts',2,'Contacts',0)");
-
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",".getTabid("Products").",'get_products',3,'Products',0)");
-
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",0,'get_stage_history',4,'Sales Stage History',0)");
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",0,'get_attachments',5,'Attachments',0)");
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",".getTabid("Quotes").",'get_Quotes',6,'Quotes',0)");
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",".getTabid("SalesOrder").",'get_salesorder',7,'Sales Order',0)");
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",".getTabid("Activities").",'get_history',8,'Activity History',0)");
-
-		//Inserting Product Related Lists	
-
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",".getTabid("HelpDesk").",'get_tickets',1,'HelpDesk',0)");
-
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",".getTabid("Activities").",'get_activities',2,'Activities',0)");
-
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",0,'get_attachments',3,'Attachments',0)");
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",".getTabid("Quotes").",'get_quotes',4,'Quotes',0)");
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",".getTabid("PurchaseOrder").",'get_purchase_orders',5,'Purchase Order',0)");
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",".getTabid("SalesOrder").",'get_salesorder',6,'Sales Order',0)");
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",".getTabid("Invoice").",'get_invoices',7,'Invoice',0)");
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",".getTabid("PriceBooks").",'get_product_pricebooks',8,'PriceBooks',0)");
-	
-		//Inserting Emails Related Lists	
-
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Emails").",".getTabid("Contacts").",'get_contacts',1,'Contacts',0)");
-
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Emails").",0,'get_users',2,'Users',0)");
-
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Emails").",0,'get_attachments',3,'Attachments',0)");
-
-		//Inserting HelpDesk Related Lists
-		
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("HelpDesk").",".getTabid("Activities").",'get_activities',1,'Activities',0)");
-
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("HelpDesk").",0,'get_attachments',2,'Attachments',0)");
-
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("HelpDesk").",0,'get_ticket_history',3,'Ticket History',0)");
-
-	//Inserting PriceBook Related Lists
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("PriceBooks").",14,'get_pricebook_products',2,'Products',0)");
-
-        // Inserting Vendor Related Lists
-        $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Vendors").",14,'get_products',1,'Products',0)");
-
-        $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Vendors").",21,'get_purchase_orders',2,'Purchase Order',0)");
-
-        $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Vendors").",4,'get_contacts',3,'Contacts',0)");
-
-	// Inserting Quotes Related Lists
-	
-        $this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Quotes").",".getTabid("Invoice").",'get_salesorder',1,'Sales Order',0)");
-        
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Quotes").",9,'get_activities',2,'Activities',0)");
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Quotes").",9,'get_history',3,'Activity History',0)");
-
-	// Inserting Purchase order Related Lists
-
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("PurchaseOrder").",9,'get_activities',1,'Activities',0)");
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("PurchaseOrder").",0,'get_attachments',2,'Attachments',0)");
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("PurchaseOrder").",".getTabid("Activities").",'get_history',3,'Activity History',0)");
-	
-	// Inserting Sales order Related Lists
-
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("SalesOrder").",9,'get_activities',1,'Activities',0)");
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("SalesOrder").",0,'get_attachments',2,'Attachments',0)");
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("SalesOrder").",".getTabid("Invoice").",'get_invoices',3,'Invoice',0)");
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("SalesOrder").",".getTabid("Activities").",'get_history',4,'Activity History',0)");
-	
-	// Inserting Invoice Related Lists
-
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Invoice").",9,'get_activities',1,'Activities',0)");
-	
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Invoice").",0,'get_attachments',2,'Attachments',0)");
-
-	$this->db->query("insert into relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Invoice").",".getTabid("Activities").",'get_history',3,'Activity History',0)");
-
-	// Inserting Activities Related Lists
-	
-	$this->db->query("insert into relatedlists values (".$this->db->getUniqueID('relatedlists').",".getTabid("Activities").",0,'get_users',1,'Users',0)");
-	$this->db->query("insert into relatedlists values (".$this->db->getUniqueID('relatedlists').",".getTabid("Activities").",4,'get_contacts',2,'Contacts',0)");
-
-	// Inserting Campaigns Related Lists
-
-         $this->db->query("insert into relatedlists values (".$this->db->getUniqueID('relatedlists').",".getTabid("Campaigns").",".getTabid("Contacts").",'get_contacts',1,'Contacts',0)");
-         $this->db->query("insert into relatedlists values (".$this->db->getUniqueID('relatedlists').",".getTabid("Campaigns").",".getTabid("Leads").",'get_leads',2,'Leads',0)");
-
-               $this->db->query("insert into notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("notificationscheduler").",'LBL_TASK_NOTIFICATION_DESCRITPION',1,'Task Delay Notification','Tasks delayed beyond 24 hrs ','LBL_TASK_NOTIFICATION')");
-
-
-                $this->db->query("insert into notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("notificationscheduler").",'LBL_BIG_DEAL_DESCRIPTION' ,1,'Big Deal notification','Success! A big deal has been won! ','LBL_BIG_DEAL')");
-
-
-                $this->db->query("insert into notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("notificationscheduler").",'LBL_TICKETS_DESCRIPTION',1,'Pending Tickets notification','Ticket pending please ','LBL_PENDING_TICKETS')");
-
-
-                $this->db->query("insert into notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("notificationscheduler").",'LBL_MANY_TICKETS_DESCRIPTION',1,'Too many tickets Notification','Too many tickets pending against this entity ','LBL_MANY_TICKETS')");
-
-
-                $this->db->query("insert into notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("notificationscheduler").",'LBL_START_DESCRIPTION' ,1,'Support Start Notification','Support starts please ','LBL_START_NOTIFICATION')");
-
-                $this->db->query("insert into notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("notificationscheduler").",'LBL_SUPPORT_DESCRIPTION',1,'Support ending please','Support Ending Notification','LBL_SUPPORT_NOTICIATION')");
-		
- 		$this->db->query("insert into notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("notificationscheduler").",'LBL_ACTIVITY_REMINDER_DESCRIPTION' ,1,'Activity Reminder Notication','This is a reminder notification for the Activity','LBL_ACTIVITY_NOTIFICATION')");
-
-		//Inserting Inventory Notifications
-	$invoice_body = 'Dear {HANDLER},
-
-The current stock of {PRODUCTNAME} in our warehouse is {CURRENTSTOCK}. Kindly procure required number of units as the stock level is below reorder level {REORDERLEVELVALUE}.
-
-Please treat this information as Urgent as the invoice is already sent  to the customer.
-
-Severity: Critical
-
-Thanks,
-{CURRENTUSER}';
-
-		
-               $this->db->query("insert into inventorynotification(notificationid,notificationname,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("inventorynotification").",'InvoiceNotification','{PRODUCTNAME} Stock Level is Low','".$invoice_body." ','InvoiceNotificationDescription')");
-
-		$quote_body = 'Dear {HANDLER},
-
-Quote is generated for {QUOTEQUANTITY} units of {PRODUCTNAME}. The current stock of {PRODUCTNAME} in our warehouse is {CURRENTSTOCK}. 
-
-Severity: Minor
-
-Thanks,
-{CURRENTUSER}';	
-		
-		
-               $this->db->query("insert into inventorynotification(notificationid,notificationname,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("inventorynotification").",'QuoteNotification','Quote given for {PRODUCTNAME}','".$quote_body." ','QuoteNotificationDescription')");
-
-		$so_body = 'Dear {HANDLER},
-
-SalesOrder is generated for {SOQUANTITY} units of {PRODUCTNAME}. The current stock of {PRODUCTNAME} in our warehouse is {CURRENTSTOCK}. 
-
-Please treat this information  with priority as the sales order is already generated.
-
-Severity: Major
-
-Thanks,
-{CURRENTUSER}';
-
-		
-               $this->db->query("insert into inventorynotification(notificationid,notificationname,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("inventorynotification").",'SalesOrderNotification','Sales Order generated for {PRODUCTNAME}','".$so_body." ','SalesOrderNotificationDescription')");
-
-		//Insert into currency table
-		$this->db->query("insert into currency_info values(".$this->db->getUniqueID("currency_info").",'U.S Dollar','USD','$',1,'Active','-11')");
-                
-
-
-
-//insert into email template table
-
-	$body='
-	Hello!
-
-	On behalf of the vtiger team,  I am pleased to announce the release of vtiger crm4.2 . This is a feature packed release including the mass email template handling, custom view feature, reports feature and a host of other utilities. vtiger runs on all platforms.
-
-	Notable Features of vtiger are :
-	-Email Client Integration
-	-Trouble Ticket Integration
-	-Invoice Management Integration
-	-Reports Integration
-	-Portal Integration
-	-Enhanced Word Plugin Support
-	-Custom View Integration
-
-	Known Issues:
-	-ABCD
-	-EFGH
-	-IJKL
-	-MNOP
-	-QRST';
-
-          $this->db->query("insert into emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Announcement for Release','Announcement for Release','Announcement of a release','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
-	
-
-
-$body='name
-street,
-city,
-state,
- zip)
- 
- Dear
- 
- Please check the following invoices that are yet to be paid by you:
- 
- No. Date      Amount
- 1   1/1/01    $4000
- 2   2/2//01   $5000
- 3   3/3/01    $10000
- 4   7/4/01    $23560
- 
- Kindly let us know if there are any issues that you feel are pending to be discussed.
- We will be more than happy to give you a call.
- We would like to continue our business with you.
- 
- Sincerely,
- name
- title';
-
-
-               $this->db->query("insert into emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Pending Invoices','Invoices Pending','Payment Due','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
-
-
-
-
-
-$body=' Dear
-
-Your proposal on the project XYZW has been reviewed by us
-and is acceptable in its entirety.
-
-We are eagerly looking forward to this project
-and are pleased about having the opportunity to work
-together. We look forward to a long standing relationship
-with your esteemed firm.
-
-I would like to take this opportunity to invite you
-to a game of golf on Wednesday morning 9am at the
-Cuff Links Ground. We will be waiting for you in the
-Executive Lounge.
-
-Looking forward to seeing you there.
-
-Sincerely,
-name
-title';
-	       
-               $this->db->query("insert into emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Acceptance Proposal','Acceptance Proposal','Acceptance of Proposal','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
-
-
-$body= ' The undersigned hereby acknowledges receipt and delivery
-of the goods.
-The undersigned will release the payment subject to the goods being discovered not satisfactory.
-
-Signed under seal this <date>
-
-Sincerely,
-name
-title';
-	       
-               $this->db->query("insert into emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Goods received acknowledgement','Goods received acknowledgement','Acknowledged Receipt of Goods','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
-
-
-	       $body= ' Dear
-	 We are in receipt of your order as contained in the
-   purchase order form.We consider this to be final and binding on both sides.
-If there be any exceptions noted, we shall consider them
-only if the objection is received within ten days of receipt of
-this notice.
-
-Thank you for your patronage.
-Sincerely,
-name
-title';
-
-
-	       
-               $this->db->query("insert into emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Accept Order','Accept Order','Acknowledgement/Acceptance of Order','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
-
-
-
-
-$body='Dear
-
-We are relocating our office to
-11111,XYZDEF Cross,
-UVWWX Circle
-The telephone number for this new location is (101) 1212-1328.
-
-Our Manufacturing Division will continue operations
-at 3250 Lovedale Square Avenue, in Frankfurt.
-
-We hope to keep in touch with you all.
-Please update your addressbooks.
-
-
-Thank You,
-name
-title';
-	       
-               $this->db->query("insert into emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Address Change','Change of Address','Address Change','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
-
-
-
-$body='Dear
-
-Thank you for extending us the opportunity to meet with
-you and members of your staff.
-
-I know that John Doe serviced your account
-for many years and made many friends at your firm. He has personally
-discussed with me the deep relationship that he had with your firm.
-While his presence will be missed, I can promise that we will
-continue to provide the fine service that was accorded by
-John to your firm.
-
-I was genuinely touched to receive such fine hospitality.
-
-Thank you once again.
-
-Sincerely,
-name
-title';
-
-
-	       
-               $this->db->query("insert into emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Follow Up','Follow Up','Follow Up of meeting','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
-
-
-
-$body='Congratulations!
-
-The numbers are in and I am proud to inform you that our
-total sales for the previous quarter
-amounts to $100,000,00.00!. This is the first time
-we have exceeded the target by almost 30%.
-We have also beat the previous quarter record by a
-whopping 75%!
-
-Let us meet at Smoking Joe for a drink in the evening!
-
-C you all there guys!
-
-Sincerely,
-name
-title';
-
-	       
-               $this->db->query("insert into emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Target Crossed!','Target Crossed!','Fantastic Sales Spree!','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
-
-$body='
-Dear
-
-Thank you for your confidence in our ability to serve you.
-We are glad to be given the chance to serve you.I look
-forward to establishing a long term partnership with you.
-Consider me as a friend.
-Should any need arise,please do give us a call.
-
-Sincerely,
-name
-title';
-
-	       
-               $this->db->query("insert into emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Thanks Note','Thanks Note','Note of thanks','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
-
-		
-	       //Insert into organizationdetails table 
-	       $this->db->query("insert into organizationdetails(organizationame,address,city,state,country,code,phone,fax,website,logoname) values ('vtiger',' 40-41-42, Sivasundar Apartments, Flat D-II, Shastri Street, Velachery','Chennai','Tamil Nadu','India','600 042','+91-44-5202-1990','+91-44-5202-1990','www.vtiger.com','vtiger-crm-logo.jpg')");
-
-  //Insert into inventory_tandc table
-               $this->db->query("insert into inventory_tandc values('".$this->db->getUniqueID('inventory_tandc')."','Inventory','')");
-
-	$this->db->query("insert into actionmapping values(0,'Save',0)");
-	$this->db->query("insert into actionmapping values(1,'EditView',0)");
-	$this->db->query("insert into actionmapping values(2,'Delete',0)");
-	$this->db->query("insert into actionmapping values(3,'index',0)");
-	$this->db->query("insert into actionmapping values(4,'DetailView',0)");
-	$this->db->query("insert into actionmapping values(5,'Import',0)");
-	$this->db->query("insert into actionmapping values(6,'Export',0)");
-	//$this->db->query("insert into actionmapping values(7,'AddBusinessCard',0)");
-	$this->db->query("insert into actionmapping values(8,'Merge',0)");
-	$this->db->query("insert into actionmapping values(1,'VendorEditView',1)");
-	$this->db->query("insert into actionmapping values(4,'VendorDetailView',1)");
-	$this->db->query("insert into actionmapping values(0,'SaveVendor',1)");
-	$this->db->query("insert into actionmapping values(2,'DeleteVendor',1)");
-	$this->db->query("insert into actionmapping values(1,'PriceBookEditView',1)");
-	$this->db->query("insert into actionmapping values(4,'PriceBookDetailView',1)");
-	$this->db->query("insert into actionmapping values(0,'SavePriceBook',1)");
-	$this->db->query("insert into actionmapping values(2,'DeletePriceBook',1)");
-	$this->db->query("insert into actionmapping values(9,'ConvertLead',0)");
-	$this->db->query("insert into actionmapping values(1,'DetailViewAjax',1)");
-	$this->db->query("insert into actionmapping values(4,'TagCloud',1)");
-	$this->db->query("insert into actionmapping values(1,'QuickCreate',1)");
-	$this->db->query("insert into actionmapping values(3,'Popup',1)");
-
-	//Insert values for moduleowners table which contains the modules and their users. default user id admin - after 4.2 patch 2
-	$module_array = Array('Potentials','Contacts','Accounts','Leads','Notes','Activities','Emails','HelpDesk','Products','Faq','Vendors','PriceBooks','Quotes','PurchaseOrder','SalesOrder','Invoice','Reports','Campaigns');
-	foreach($module_array as $mod)
-	{
-		$this->db->query("insert into moduleowners values(".getTabid($mod).",1)");
-	}
-	//added by jeri for category view from db
-	$this->db->query("insert into parenttab values (1,'My Home Page',1,0)");
-	$this->db->query("insert into parenttab values (2,'Marketing',2,0)");
-	$this->db->query("insert into parenttab values (3,'Sales',3,0)");
-	$this->db->query("insert into parenttab values (4,'Support',4,0)");
-	$this->db->query("insert into parenttab values (5,'Analytics',5,0)");
-	$this->db->query("insert into parenttab values (6,'Inventory',6,0)");
-	$this->db->query("insert into parenttab values (7,'Tools',7,0)");
-	$this->db->query("insert into parenttab values (8,'Settings',8,0)");
-
-	$this->db->query("insert into parenttabrel values (1,9,2)");
-	$this->db->query("insert into parenttabrel values (1,17,3)");
-	$this->db->query("insert into parenttabrel values (1,10,4)");
-	$this->db->query("insert into parenttabrel values (1,3,1)");
-	$this->db->query("insert into parenttabrel values (3,7,1)");
-	$this->db->query("insert into parenttabrel values (3,6,2)");
-	$this->db->query("insert into parenttabrel values (3,4,3)");
-	$this->db->query("insert into parenttabrel values (3,2,4)");
-	$this->db->query("insert into parenttabrel values (3,20,5)");
-	$this->db->query("insert into parenttabrel values (3,22,6)");
-	$this->db->query("insert into parenttabrel values (3,23,7)");
-	$this->db->query("insert into parenttabrel values (3,14,8)");
-	$this->db->query("insert into parenttabrel values (3,19,9)");
-	$this->db->query("insert into parenttabrel values (3,8,10)");
-	$this->db->query("insert into parenttabrel values (4,13,1)");
-	$this->db->query("insert into parenttabrel values (4,15,2)");
-	$this->db->query("insert into parenttabrel values (4,6,3)");
-	$this->db->query("insert into parenttabrel values (4,4,4)");
-	$this->db->query("insert into parenttabrel values (4,14,5)");
-	$this->db->query("insert into parenttabrel values (4,8,6)");
-	$this->db->query("insert into parenttabrel values (5,1,1)");
-	$this->db->query("insert into parenttabrel values (5,25,2)");
-	$this->db->query("insert into parenttabrel values (6,14,1)");
-	$this->db->query("insert into parenttabrel values (6,18,2)");
-	$this->db->query("insert into parenttabrel values (6,19,3)");
-	$this->db->query("insert into parenttabrel values (6,21,4)");
-	$this->db->query("insert into parenttabrel values (6,22,5)");
-	$this->db->query("insert into parenttabrel values (6,20,6)");
-	$this->db->query("insert into parenttabrel values (6,23,7)");
-	$this->db->query("insert into parenttabrel values (7,24,1)");
-	$this->db->query("insert into parenttabrel values (7,27,2)");
-	$this->db->query("insert into parenttabrel values (7,8,3)");
-	$this->db->query("insert into parenttabrel values (2,26,1)");
-	$this->db->query("insert into parenttabrel values (2,6,2)");
-	$this->db->query("insert into parenttabrel values (2,4,3)");
-	$this->db->query("insert into parenttabrel values (2,10,4)");
-	$this->db->query("insert into parenttabrel values (4,10,7)");
-
-	//Added to populate the default inventory tax informations
-	$this->db->query("insert into inventorytaxinfo values(".$this->db->getUniqueID("inventorytaxinfo").",'VAT','4.5')");
-	$this->db->query("insert into inventorytaxinfo values(".$this->db->getUniqueID("inventorytaxinfo").",'Sales','10')");
-	$this->db->query("insert into inventorytaxinfo values(".$this->db->getUniqueID("inventorytaxinfo").",'Service','12.5')");
-	
-	}
-}
-?>
+<?php
+
+/*********************************************************************************
+** The contents of this file are subject to the vtiger CRM Public License Version 1.0
+ * ("License"); You may not use this file except in compliance with the License
+ * The Original Code is:  vtiger CRM Open Source
+ * The Initial Developer of the Original Code is vtiger.
+ * Portions created by vtiger are Copyright (C) vtiger.
+ * All Rights Reserved.
+ ********************************************************************************/
+
+include_once('config.php');
+require_once('include/logging.php');
+require_once('include/database/PearDatabase.php');
+require_once('data/SugarBean.php');
+require_once('data/CRMEntity.php');
+require_once('include/utils/utils.php');
+
+class DefaultDataPopulator extends CRMEntity {
+		
+	function DefaultDataPopulator() {
+		$this->log = LoggerManager::getLogger('DefaultDataPopulator');
+		$this->db = new PearDatabase();
+	}
+
+	var $new_schema = true;
+
+	function create_tables () {
+		global $app_strings;
+
+		$role1_id = $this->db->getUniqueID("role");
+		$role2_id = $this->db->getUniqueID("role");
+		$role3_id = $this->db->getUniqueID("role");
+
+		$profile1_id = $this->db->getUniqueID("profile");
+		$profile2_id = $this->db->getUniqueID("profile");
+		$profile3_id = $this->db->getUniqueID("profile");
+		$profile4_id = $this->db->getUniqueID("profile");
+
+                $this->db->query("insert into vtiger_role values('H".$role1_id."','Organisation','H".$role1_id."',0)");
+                $this->db->query("insert into vtiger_role values('H".$role2_id."','administrator','H".$role1_id."::H".$role2_id."',1)");
+                $this->db->query("insert into vtiger_role values('H".$role3_id."','standard_user','H".$role1_id."::H".$role2_id."::H".$role3_id."',2)");
+                
+
+ $this->db->query("INSERT INTO vtiger_tab VALUES (3,'Home',0,1,'Home',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (7,'Leads',0,4,'Leads',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (6,'Accounts',0,5,'Accounts',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (4,'Contacts',0,6,'Contacts',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (2,'Potentials',0,7,'Potentials',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (8,'Notes',0,9,'Notes',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (9,'Activities',0,3,'Activities',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (10,'Emails',0,10,'Emails',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (13,'HelpDesk',0,11,'HelpDesk',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (14,'Products',0,8,'Products',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (1,'Dashboard',0,12,'Dashboards',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (15,'Faq',0,14,'Faq',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (16,'Events',2,13,'Events',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (17,'Calendar',0,2,'Calendar',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (18,'Vendors',0,15,'Vendors',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (19,'PriceBooks',0,16,'PriceBooks',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (20,'Quotes',0,17,'Quotes',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (21,'PurchaseOrder',0,18,'PurchaseOrder',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (22,'SalesOrder',0,19,'SalesOrder',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (23,'Invoice',0,20,'Invoice',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (24,'Rss',0,21,'Rss',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (25,'Reports',0,22,'Reports',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (26,'Campaigns',0,23,'Campaigns',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (27,'Portal',0,24,'Portal',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (28,'Webmails',0,25,'Webmails',null,null,1)");
+
+// Populate the vtiger_blocks vtiger_table
+$this->db->query("insert into vtiger_blocks values (1,2,'LBL_OPPORTUNITY_INFORMATION',1,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (2,2,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (3,2,'LBL_DESCRIPTION_INFORMATION',3,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (4,4,'LBL_CONTACT_INFORMATION',1,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (5,4,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (6,4,'LBL_CUSTOMER_PORTAL_INFORMATION',3,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (7,4,'LBL_ADDRESS_INFORMATION',4,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (8,4,'LBL_DESCRIPTION_INFORMATION',6,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (9,6,'LBL_ACCOUNT_INFORMATION',1,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (10,6,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (11,6,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (12,6,'LBL_DESCRIPTION_INFORMATION',4,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (13,7,'LBL_LEAD_INFORMATION',1,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (14,7,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (15,7,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (16,7,'LBL_DESCRIPTION_INFORMATION',4,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (17,8,'LBL_NOTE_INFORMATION',1,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (18,8,'',2,1,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (19,9,'LBL_TASK_INFORMATION',1,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (20,9,'',2,1,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (21,10,'LBL_EMAIL_INFORMATION',1,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (22,10,'',2,1,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (23,10,'',3,1,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (24,10,'',4,1,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (25,13,'LBL_TICKET_INFORMATION',1,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (26,13,'',2,1,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (27,13,'LBL_CUSTOM_INFORMATION',3,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (28,13,'LBL_DESCRIPTION_INFORMATION',4,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (29,13,'LBL_TICKET_RESOLUTION',5,0,0,1,0,0)");
+$this->db->query("insert into vtiger_blocks values (30,13,'LBL_COMMENTS',6,0,0,1,0,0)");
+$this->db->query("insert into vtiger_blocks values (31,14,'LBL_PRODUCT_INFORMATION',1,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (32,14,'LBL_PRICING_INFORMATION',2,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (33,14,'LBL_STOCK_INFORMATION',3,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (34,14,'LBL_CUSTOM_INFORMATION',4,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (35,14,'LBL_IMAGE_INFORMATION',5,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (36,14,'LBL_DESCRIPTION_INFORMATION',6,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (37,15,'LBL_FAQ_INFORMATION',1,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (38,15,'',2,1,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (39,15,'',3,1,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (40,15,'LBL_COMMENT_INFORMATION',4,0,0,1,0,0)");
+$this->db->query("insert into vtiger_blocks values (41,16,'LBL_EVENT_INFORMATION',1,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (42,16,'',2,1,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (43,16,'',3,1,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (44,18,'LBL_VENDOR_INFORMATION',1,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (45,18,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (46,18,'LBL_VENDOR_ADDRESS_INFORMATION',3,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (47,18,'LBL_DESCRIPTION_INFORMATION',4,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (48,19,'LBL_PRICEBOOK_INFORMATION',1,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (49,19,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (50,19,'LBL_DESCRIPTION_INFORMATION',3,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (51,20,'LBL_QUOTE_INFORMATION',1,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (52,20,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (53,20,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (54,20,'LBL_RELATED_PRODUCTS',4,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (55,20,'LBL_TERMS_INFORMATION',5,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (56,20,'LBL_DESCRIPTION_INFORMATION',6,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (57,21,'LBL_PO_INFORMATION',1,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (58,21,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (59,21,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (60,21,'LBL_RELATED_PRODUCTS',4,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (61,21,'LBL_TERMS_INFORMATION',5,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (62,21,'LBL_DESCRIPTION_INFORMATION',6,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (63,22,'LBL_SO_INFORMATION',1,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (64,22,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (65,22,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (66,22,'LBL_RELATED_PRODUCTS',4,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (67,22,'LBL_TERMS_INFORMATION',5,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (68,22,'LBL_DESCRIPTION_INFORMATION',6,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (69,23,'LBL_INVOICE_INFORMATION',1,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (70,23,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (71,23,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (72,23,'LBL_RELATED_PRODUCTS',4,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (73,23,'LBL_TERMS_INFORMATION',5,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (74,23,'LBL_DESCRIPTION_INFORMATION',6,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (75,4,'LBL_IMAGE_INFORMATION',5,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (76,26,'LBL_CAMPAIGN_INFORMATION',1,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (77,26,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (78,26,'LBL_DESCRIPTION_INFORMATION',3,0,0,0,0,0)");
+
+//
+
+//Account Details -- START
+ //Block9
+
+$this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'accountname','vtiger_account',1,'2','accountname','Account Name',1,0,0,100,1,9,1,'V~M',0,1,'BAS')");	
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'phone','vtiger_account',1,'11','phone','Phone',1,0,0,100,2,9,1,'V~O',0,2,'BAS')");	
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'website','vtiger_account',1,'17','website','Website',1,0,0,100,3,9,1,'V~O',0,3,'BAS')");	
+
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'fax','vtiger_account',1,'1','fax','Fax',1,0,0,100,4,9,1,'V~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'tickersymbol','vtiger_account',1,'1','tickersymbol','Ticker Symbol',1,0,0,100,5,9,1,'V~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'otherphone','vtiger_account',1,'11','otherphone','Other Phone',1,0,0,100,6,9,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'parentid','vtiger_account',1,'51','account_id','Member Of',1,0,0,100,7,9,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'email1','vtiger_account',1,'13','email1','Email',1,0,0,100,8,9,1,'E~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'employees','vtiger_account',1,'7','employees','Employees',1,0,0,100,9,9,1,'I~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'email2','vtiger_account',1,'13','email2','Other Email',1,0,0,100,10,9,1,'E~O',1,null,'ADV')");
+
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'ownership','vtiger_account',1,'1','ownership','Ownership',1,0,0,100,11,9,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'rating','vtiger_account',1,'1','rating','Rating',1,0,0,100,12,9,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'industry','vtiger_account',1,'15','industry','industry',1,0,0,100,13,9,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'siccode','vtiger_account',1,'1','siccode','SIC Code',1,0,0,100,14,9,1,'I~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'account_type','vtiger_account',1,'15','accounttype','Type',1,0,0,100,15,9,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'annualrevenue','vtiger_account',1,'71','annual_revenue','Annual Revenue',1,0,0,100,16,9,1,'I~O',1,null,'ADV')");
+ //Added vtiger_field emailoptout for vtiger_accounts -- after 4.2 patch2
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'emailoptout','vtiger_account',1,'56','emailoptout','Email Opt Out',1,0,0,100,17,9,1,'C~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'notify_owner','vtiger_account',1,56,'notify_owner','Notify Owner',1,0,0,10,18,9,1,'C~O',1,NULL,'ADV')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,19,9,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,20,9,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,21,9,2,'T~O',1,null,'BAS')");
+
+
+
+
+ //Block 11
+$this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'street','vtiger_accountbillads',1,'21','bill_street','Billing Address',1,0,0,100,1,11,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'street','vtiger_accountshipads',1,'21','ship_street','Shipping Address',1,0,0,100,2,11,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'city','vtiger_accountbillads',1,'1','bill_city','Billing City',1,0,0,100,5,11,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'city','vtiger_accountshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,11,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'state','vtiger_accountbillads',1,'1','bill_state','Billing State',1,0,0,100,7,11,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'state','vtiger_accountshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,11,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'code','vtiger_accountbillads',1,'1','bill_code','Billing Code',1,0,0,100,9,11,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'code','vtiger_accountshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,11,1,'V~O',1,null,'BAS')");
+
+
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'country','vtiger_accountbillads',1,'1','bill_country','Billing Country',1,0,0,100,11,11,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'country','vtiger_accountshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,11,1,'V~O',1,null,'BAS')");
+
+$this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'pobox','vtiger_accountbillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,11,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'pobox','vtiger_accountshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,11,1,'V~O',1,null,'BAS')");
+
+
+ //Block12
+$this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,12,1,'V~O',1,null,'BAS')");
+ 
+
+
+//Account Details -- END
+
+			
+//Lead Details --- START
+
+//Block13 -- Start
+
+$this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'salutation','vtiger_leaddetails',1,'55','salutationtype','Salutation',1,0,0,100,1,13,3,'V~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'firstname','vtiger_leaddetails',1,'55','firstname','First Name',1,0,0,100,2,13,1,'V~O',0,1,'BAS')");	
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'phone','vtiger_leadaddress',1,'11','phone','Phone',1,0,0,100,3,13,1,'V~O',0,4,'BAS')");	
+
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'lastname','vtiger_leaddetails',1,'2','lastname','Last Name',1,0,0,100,4,13,1,'V~M',0,2,'BAS')");	
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'mobile','vtiger_leadaddress',1,'1','mobile','Mobile',1,0,0,100,5,13,1,'V~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'company','vtiger_leaddetails',1,'2','company','Company',1,0,0,100,6,13,1,'V~M',0,3,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'campaignid','vtiger_leaddetails',1,'51','campaignid','Campaign Name',1,0,0,100,6,4,3,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'fax','vtiger_leadaddress',1,'1','fax','Fax',1,0,0,100,7,13,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'designation','vtiger_leaddetails',1,'1','designation','Designation',1,0,0,100,8,13,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'email','vtiger_leaddetails',1,'13','email','Email',1,0,0,100,9,13,1,'E~O',0,5,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'leadsource','vtiger_leaddetails',1,'15','leadsource','Lead Source',1,0,0,100,10,13,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'website','vtiger_leadsubdetails',1,'17','website','Website',1,0,0,100,11,13,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'industry','vtiger_leaddetails',1,'15','industry','Industry',1,0,0,100,12,13,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'leadstatus','vtiger_leaddetails',1,'15','leadstatus','Lead Status',1,0,0,100,13,13,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'annualrevenue','vtiger_leaddetails',1,'71','annualrevenue','Annual Revenue',1,0,0,100,14,13,1,'I~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'rating','vtiger_leaddetails',1,'15','rating','Rating',1,0,0,100,15,13,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'noofemployees','vtiger_leaddetails',1,'1','noofemployees','No Of Employees',1,0,0,100,16,13,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,17,13,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'yahooid','vtiger_leaddetails',1,'13','yahooid','Yahoo Id',1,0,0,100,18,13,1,'V~O',1,null,'ADV')");
+$this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,19,13,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,20,13,2,'T~O',1,null,'BAS')");
+
+//Block13 -- End
+
+
+//Block15 -- Start
+
+$this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'lane','vtiger_leadaddress',1,'21','lane','Street',1,0,0,100,1,15,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'code','vtiger_leadaddress',1,'1','code','Postal Code',1,0,0,100,3,15,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'city','vtiger_leadaddress',1,'1','city','City',1,0,0,100,4,15,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'country','vtiger_leadaddress',1,'1','country','Country',1,0,0,100,5,15,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'state','vtiger_leadaddress',1,'1','state','State',1,0,0,100,6,15,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'pobox','vtiger_leadaddress',1,'1','pobox','Po Box',1,0,0,100,2,15,1,'V~O',1,null,'BAS')");
+
+//Block15 --End
+
+//Block16 -- Start
+
+$this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,16,1,'V~O',1,null,'BAS')");
+
+//Block16 -- End
+
+//Lead Details -- END
+
+
+//Contact Details -- START
+//Block4 -- Start
+
+$this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'salutation','vtiger_contactdetails',1,'55','salutationtype','Salutation',1,0,0,100,1,4,3,'V~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'firstname','vtiger_contactdetails',1,'55','firstname','First Name',1,0,0,100,2,4,1,'V~O',0,1,'BAS')");	
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'phone','vtiger_contactdetails',1,'11','phone','Office Phone',1,0,0,100,3,4,1,'V~O',0,4,'BAS')");	
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'lastname','vtiger_contactdetails',1,'2','lastname','Last Name',1,0,0,100,4,4,1,'V~M',0,2,'BAS')");	
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'mobile','vtiger_contactdetails',1,'1','mobile','Mobile',1,0,0,100,5,4,1,'V~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'accountid','vtiger_contactdetails',1,'51','account_id','Account Name',1,0,0,100,6,4,1,'I~O',0,3,'BAS')");	
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'campaignid','vtiger_contactdetails',1,'51','campaignid','Campaign Name',1,0,0,100,6,4,3,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'homephone','vtiger_contactsubdetails',1,'11','homephone','Home Phone',1,0,0,100,7,4,1,'V~O',1,null,'ADV')");	
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'leadsource','vtiger_contactsubdetails',1,'15','leadsource','Lead Source',1,0,0,100,8,4,1,'V~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'otherphone','vtiger_contactsubdetails',1,'11','otherphone','Phone',1,0,0,100,9,4,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'title','vtiger_contactdetails',1,'1','title','Title',1,0,0,100,10,4,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'fax','vtiger_contactdetails',1,'1','fax','Fax',1,0,0,100,11,4,1,'V~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'department','vtiger_contactdetails',1,'1','department','Department',1,0,0,100,12,4,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'birthday','vtiger_contactsubdetails',1,'5','birthday','Birthdate',1,0,0,100,14,4,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'email','vtiger_contactdetails',1,'13','email','Email',1,0,0,100,15,4,1,'E~O',0,5,'ADV')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'reportsto','vtiger_contactdetails',1,'57','contact_id','Reports To',1,0,0,100,16,4,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'assistant','vtiger_contactsubdetails',1,'1','assistant','Assistant',1,0,0,100,17,4,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'yahooid','vtiger_contactdetails',1,'13','yahooid','Yahoo Id',1,0,0,100,18,4,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'assistantphone','vtiger_contactsubdetails',1,'11','assistantphone','Assistant Phone',1,0,0,100,19,4,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'donotcall','vtiger_contactdetails',1,'56','donotcall','Do Not Call',1,0,0,100,20,4,1,'C~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'emailoptout','vtiger_contactdetails',1,'56','emailoptout','Email Opt Out',1,0,0,100,21,4,1,'C~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,22,4,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'reference','vtiger_contactdetails',1,'56','reference','Reference',1,0,0,10,23,4,1,'C~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'notify_owner','vtiger_contactdetails',1,'56','notify_owner','Notify Owner',1,0,0,10,24,4,1,'C~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,25,4,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,26,4,2,'T~O',1,null,'BAS')");
+
+//Block4 -- End
+
+//Block6 - Begin Customer Portal
+
+$this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'portal','vtiger_customerdetails',1,'56','portal','Portal User',1,0,0,100,1,6,1,'C~O',1,null,'ADV')");
+$this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'support_start_date','vtiger_customerdetails',1,'5','support_start_date','Support Start Date',1,0,0,100,2,6,1,'D~O',1,null,'ADV')");
+$this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'support_end_date','vtiger_customerdetails',1,'5','support_end_date','Support End Date',1,0,0,100,3,6,1,'D~O~OTH~GE~support_start_date~Support Start Date',1,null,'ADV')");
+
+//Block6 - End Customer Portal
+
+//Block 7 -- Start
+
+$this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'mailingstreet','vtiger_contactaddress',1,'21','mailingstreet','Mailing Street',1,0,0,100,1,7,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'otherstreet','vtiger_contactaddress',1,'21','otherstreet','Other Street',1,0,0,100,2,7,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'mailingcity','vtiger_contactaddress',1,'1','mailingcity','Mailing City',1,0,0,100,5,7,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'othercity','vtiger_contactaddress',1,'1','othercity','Other City',1,0,0,100,6,7,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'mailingstate','vtiger_contactaddress',1,'1','mailingstate','Mailing State',1,0,0,100,7,7,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'otherstate','vtiger_contactaddress',1,'1','otherstate','Other State',1,0,0,100,8,7,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'mailingzip','vtiger_contactaddress',1,'1','mailingzip','Mailing Zip',1,0,0,100,9,7,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'otherzip','vtiger_contactaddress',1,'1','otherzip','Other Zip',1,0,0,100,10,7,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'mailingcountry','vtiger_contactaddress',1,'1','mailingcountry','Mailing Country',1,0,0,100,11,7,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'othercountry','vtiger_contactaddress',1,'1','othercountry','Other Country',1,0,0,100,12,7,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'mailingpobox','vtiger_contactaddress',1,'1','mailingpobox','Mailing Po Box',1,0,0,100,3,7,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'otherpobox','vtiger_contactaddress',1,'1','otherpobox','Other Po Box',1,0,0,100,4,7,1,'V~O',1,null,'BAS')");
+//Block7 -- End
+
+//ContactImageInformation
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'imagename','vtiger_contactdetails',1,'69','imagename','Contact Image',1,0,0,100,1,75,1,'V~O',1,null,'ADV')");
+
+
+//Block8 -- Start
+$this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,8,1,'V~O',1,null,'BAS')");
+//Block8 -- End
+//Contact Details -- END
+
+
+//Potential Details -- START
+//Block1 -- Start
+
+$this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'potentialname','vtiger_potential',1,'2','potentialname','Potential Name',1,0,0,100,1,1,1,'V~M',0,1,'BAS')");	
+ $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'amount','vtiger_potential',1,71,'amount','Amount',1,0,0,100,2,1,1,'N~O',0,5,'BAS')");	
+ $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'accountid','vtiger_potential',1,'50','account_id','Account Name',1,0,0,100,3,1,1,'V~M',0,2,'BAS')");	
+ $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'closingdate','vtiger_potential',1,'23','closingdate','Expected Close Date',1,0,0,100,5,1,1,'D~M',0,3,'BAS')");	
+ $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'potentialtype','vtiger_potential',1,'15','opportunity_type','Type',1,0,0,100,6,1,1,'V~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'nextstep','vtiger_potential',1,'1','nextstep','Next Step',1,0,0,100,7,1,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'leadsource','vtiger_potential',1,'15','leadsource','Lead Source',1,0,0,100,8,1,1,'V~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'sales_stage','vtiger_potential',1,'16','sales_stage','Sales Stage',1,0,0,100,9,1,1,'V~O',0,4,'BAS')");
+ $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,10,1,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'probability','vtiger_potential',1,'9','probability','Probability',1,0,0,100,11,1,1,'N~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,13,1,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,14,1,2,'T~O',1,null,'BAS')");
+
+//Block1 -- End
+
+//Block3 -- Start
+
+ $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,3,1,'V~O',1,null,'BAS')");
+
+//Block3 -- End
+//Potential Details -- END
+
+
+//Rss entries being added
+ $this->db->query("insert into vtiger_field values (24,".$this->db->getUniqueID("field").",'rsscategory','vtiger_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
+
+
+ $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'campaignname','vtiger_campaign',1,'2','campaignname','Campaign Name',1,0,0,100,1,76,1,'V~M',0,1,'BAS')");
+ $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'campaigntype','vtiger_campaign',1,15,'campaigntype','Campaign Type',1,0,0,100,2,76,1,'V~O',0,5,'BAS')");
+ $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'product_id','vtiger_campaign',1,59,'product_id','Product',1,0,0,100,3,76,1,'I~O',0,5,'BAS')");
+ $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'campaignstatus','vtiger_campaign',1,15,'campaignstatus','Campaign Status',1,0,0,100,4,76,1,'V~O',0,5,'BAS')");
+ $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'closingdate','vtiger_campaign',1,'23','closingdate','Expected Close Date',1,0,0,100,5,76,1,'D~M',0,3,'BAS')");
+ $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'expectedrevenue','vtiger_campaign',1,'1','expectedrevenue','Expected Revenue',1,0,0,100,6,76,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'budgetcost','vtiger_campaign',1,'1','budgetcost','Budget Cost',1,0,0,100,7,76,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'actualcost','vtiger_campaign',1,'1','actualcost','Actual Cost',1,0,0,100,8,76,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'expectedresponse','vtiger_campaign',1,'15','expectedresponse','Expected Response',1,0,0,100,9,76,1,'V~O',0,4,'BAS')");
+ $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'smownerid','vtiger_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 vtiger_field values (26,".$this->db->getUniqueID("field").",'numsent','vtiger_campaign',1,'9','numsent','Num Sent',1,0,0,100,11,76,1,'N~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'sponsor','vtiger_campaign',1,'1','sponsor','Sponsor',1,0,0,100,12,76,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'targetaudience','vtiger_campaign',1,'1','targetaudience','Target Audience',1,0,0,100,13,76,1,'V~O',1,null,'BAS')");
+
+$this->db->query("insert into vtiger_field values(26,".$this->db->getUniqueID("field").",'targetsize','vtiger_campaign',1,'1','targetsize','TargetSize',1,0,0,100,14,76,1,'N~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values(26,".$this->db->getUniqueID("field").",'expectedresponsecount','vtiger_campaign',1,'1','expectedresponsecount','Expected Response Count',1,0,0,100,17,76,1,'N~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values(26,".$this->db->getUniqueID("field").",'expectedsalescount','vtiger_campaign',1,'1','expectedsalescount','Expected Sales Count',1,0,0,100,15,76,1,'N~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values(26,".$this->db->getUniqueID("field").",'expectedroi','vtiger_campaign',1,'1','expectedroi','Expected ROI',1,0,0,100,19,76,1,'N~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values(26,".$this->db->getUniqueID("field").",'actualresponsecount','vtiger_campaign',1,'1','actualresponsecount','Actual Response Count',1,0,0,100,18,76,1,'N~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values(26,".$this->db->getUniqueID("field").",'actualsalescount','vtiger_campaign',1,'1','actualsalescount','Actual Sales Count',1,0,0,100,16,76,1,'N~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values(26,".$this->db->getUniqueID("field").",'actualroi','vtiger_campaign',1,'1','actualroi','Actual ROI',1,0,0,100,20,76,1,'N~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,15,76,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,16,76,2,'T~O',1,null,'BAS')");
+
+$this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,78,1,'V~O',1,null,'BAS')");
+
+//Campaign entries end
+
+
+//Ticket Details -- START
+//Block25 -- Start
+
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,2,25,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'parent_id','vtiger_troubletickets',1,'68','parent_id','Related To',1,0,0,100,4,25,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'priority','vtiger_troubletickets',1,'15','ticketpriorities','Priority',1,0,0,100,5,25,1,'V~O',0,3,'BAS')");
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'product_id','vtiger_troubletickets',1,'59','product_id','Product Name',1,0,0,100,6,25,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'severity','vtiger_troubletickets',1,'15','ticketseverities','Severity',1,0,0,100,7,25,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'status','vtiger_troubletickets',1,'15','ticketstatus','Status',1,0,0,100,8,25,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'category','vtiger_troubletickets',1,'15','ticketcategories','Category',1,0,0,100,9,25,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'update_log','vtiger_troubletickets',1,'15','update_log','Update History',1,0,0,100,9,25,3,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,10,25,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,11,25,2,'T~O',1,null,'BAS')");
+ //Added on 26-12-2005 to add attachment in ticket editview
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'filename','vtiger_attachments',1,'61','filename','Attachment',1,0,0,100,12,26,1,'V~O',0,1,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'title','vtiger_troubletickets',1,'22','ticket_title','Title',1,0,0,100,1,26,1,'V~M',0,1,'BAS')");
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'description','vtiger_troubletickets',1,'19','description','Description',1,0,0,100,1,28,1,'V~O',0,2,'BAS')");
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'solution','vtiger_troubletickets',1,'19','solution','Solution',1,0,0,100,1,29,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'comments','vtiger_ticketcomments',1,'19','comments','Add Comment',1,0,0,100,1,30,1,'V~O',1,null,'BAS')");
+
+//Block25-30 -- End
+//Ticket Details -- END
+
+//Product Details -- START
+//Block31-36 -- Start
+
+$this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'productname','vtiger_products',1,'2','productname','Product Name',1,0,0,100,1,31,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'productcode','vtiger_products',1,'1','productcode','Product Code',1,0,0,100,2,31,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'discontinued','vtiger_products',1,'56','discontinued','Product Active',1,0,0,100,3,31,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'manufacturer','vtiger_products',1,'15','manufacturer','Manufacturer',1,0,0,100,4,1,31,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'productcategory','vtiger_products',1,'15','productcategory','Product Category',1,0,0,100,4,31,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'sales_start_date','vtiger_products',1,'5','sales_start_date','Sales Start Date',1,0,0,100,5,31,1,'D~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'sales_end_date','vtiger_products',1,'5','sales_end_date','Sales End Date',1,0,0,100,6,31,1,'D~O~OTH~GE~sales_start_date~Sales Start Date',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'start_date','vtiger_products',1,'5','start_date','Support Start Date',1,0,0,100,7,31,1,'D~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'expiry_date','vtiger_products',1,'5','expiry_date','Support Expiry Date',1,0,0,100,8,31,1,'D~O~OTH~GE~start_date~Start Date',1,null,'BAS')");
+ 
+
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'crmid','vtiger_seproductsrel',1,'66','parent_id','Related To',1,0,0,100,10,31,1,'I~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'contactid','vtiger_products',1,'57','contact_id','Contact Name',1,0,0,100,11,31,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'website','vtiger_products',1,'17','website','Website',1,0,0,100,12,31,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'vendor_id','vtiger_products',1,'75','vendor_id','Vendor Name',1,0,0,100,13,31,1,'I~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'mfr_part_no','vtiger_products',1,'1','mfr_part_no','Mfr PartNo',1,0,0,100,14,31,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'vendor_part_no','vtiger_products',1,'1','vendor_part_no','Vendor PartNo',1,0,0,100,15,31,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'serialno','vtiger_products',1,'1','serial_no','Serial No',1,0,0,100,16,31,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'productsheet','vtiger_products',1,'1','productsheet','Product Sheet',1,0,0,100,17,31,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'glacct','vtiger_products',1,'15','glacct','GL Account',1,0,0,100,18,31,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,19,31,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,20,31,2,'T~O',1,null,'BAS')");
+
+
+//Block32 Pricing Information
+
+$this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'unit_price','vtiger_products',1,'71','unit_price','Unit Price',1,0,0,100,1,32,1,'N~O',1,null,'BAS')"); 
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'commissionrate','vtiger_products',1,'9','commissionrate','Commission Rate',1,0,0,100,2,32,1,'N~O',1,null,'BAS')"); 
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'taxclass','vtiger_producttaxrel',1,'83','taxclass','Tax Class',1,0,0,100,4,32,1,'V~O',1,null,'BAS')");
+
+
+//Block 33 stock info
+
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'usageunit','vtiger_products',1,'15','usageunit','Usage Unit',1,0,0,100,1,33,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'qty_per_unit','vtiger_products',1,'1','qty_per_unit','Qty/Unit',1,0,0,100,2,33,1,'N~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'qtyinstock','vtiger_products',1,'1','qtyinstock','Qty In Stock',1,0,0,100,3,33,1,'I~O',1,null,'ADV')");
+$this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'reorderlevel','vtiger_products',1,'1','reorderlevel','Reorder Level',1,0,0,100,4,33,1,'I~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'handler','vtiger_products',1,'52','assigned_user_id','Handler',1,0,0,100,5,33,1,'I~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'qtyindemand','vtiger_products',1,'1','qtyindemand','Qty In Demand',1,0,0,100,6,33,1,'I~O',1,null,'ADV')");
+
+
+//ProductImageInformation
+
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'imagename','vtiger_products',1,'69','imagename','Product Image',1,0,0,100,1,35,1,'V~O',1,null,'ADV')");
+
+
+//Block 36 Description Info
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'product_description','vtiger_products',1,'19','product_description','Description',1,0,0,100,1,36,1,'V~O',1,null,'BAS')");
+
+//Product Details -- END
+
+//Note Details -- START
+//Block17 -- Start
+
+$this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("field").",'contact_id','vtiger_notes',1,'57','contact_id','Contact Name',1,0,0,100,1,17,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("field").",'crmid','vtiger_senotesrel',1,'62','parent_id','Related To',1,0,0,100,2,17,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("field").",'title','vtiger_notes',1,'2','title','Subject',1,0,0,100,3,17,1,'V~M',0,1,'BAS')");
+$this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,4,17,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,5,17,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("field").",'filename','vtiger_notes',1,'61','filename','Attachment',1,0,0,100,4,17,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("field").",'notecontent','vtiger_notes',1,'19','notecontent','Note',1,0,0,100,5,18,1,'V~O',1,null,'BAS')");
+
+//Block17 -- End
+//Note Details -- END
+
+//Email Details -- START
+//Block21 -- Start
+
+	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'date_start','vtiger_activity',1,'6','date_start','Date & Time Sent',1,0,0,100,1,21,1,'DT~M~time_start~Time Start',1,null,'BAS')");
+	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'semodule','vtiger_activity',1,'2','parent_type','Sales Enity Module',1,0,0,100,2,21,3,'',1,null,'BAS')");
+	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'activitytype','vtiger_activity',1,'2','activitytype','Activtiy Type',1,0,0,100,3,21,3,'V~O',1,null,'BAS')");
+	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'crmid','vtiger_seactivityrel',1,'357','parent_id','Related To',1,0,0,100,1,22,1,'I~O',1,null,'BAS')");
+	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,5,21,1,'V~M',1,null,'BAS')");
+	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'subject','vtiger_activity',1,'2','subject','Subject',1,0,0,100,1,23,1,'V~M',1,null,'BAS')");
+	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'filename','vtiger_attachments',1,'61','filename','Attachment',1,0,0,100,2,23,1,'V~O',1,null,'BAS')");
+	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,24,1,'V~O',1,null,'BAS')");
+	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'time_start','vtiger_activity',1,'2','time_start','Time Start',1,0,0,100,9,1,23,'T~O',1,null,'BAS')");
+	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,10,1,22,'T~O',1,null,'BAS')");
+ 	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,11,21,2,'T~O',1,null,'BAS')");
+
+//Block21 -- End
+//Email Details -- END
+
+//Task Details --START
+//Block19 -- Start
+$this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'subject','vtiger_activity',1,'2','subject','Subject',1,0,0,100,1,19,1,'V~M',0,1,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,2,19,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'date_start','vtiger_activity',1,'6','date_start','Start Date & Time',1,0,0,100,3,19,1,'DT~M~time_start',0,2,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'time_start','vtiger_activity',1,'2','time_start','Time Start',1,0,0,100,4,19,3,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'due_date','vtiger_activity',1,'23','due_date','Due Date',1,0,0,100,5,19,1,'D~M~OTH~GE~date_start~Start Date & Time',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'crmid','vtiger_seactivityrel',1,'66','parent_id','Related To',1,0,0,100,7,19,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'contactid','vtiger_cntactivityrel',1,'57','contact_id','Contact Name',1,0,0,100,8,19,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'status','vtiger_activity',1,'15','taskstatus','Status',1,0,0,100,9,19,1,'V~O',0,3,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'eventstatus','vtiger_activity',1,'15','eventstatus','Status',1,0,0,100,9,19,3,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'priority','vtiger_activity',1,'15','taskpriority','Priority',1,0,0,100,10,19,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'sendnotification','vtiger_activity',1,'56','sendnotification','Send Notification',1,0,0,100,11,19,1,'C~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,14,19,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,15,19,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'activitytype','vtiger_activity',1,'15','activitytype','Activity Type',1,0,0,100,16,19,3,'V~O',1,null,'BAS')");
+ $this->db->query("Insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'visibility','activity',1,15,'visibility','Visibility',1,0,0,100,17,19,3,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,20,1,'V~O',1,null,'BAS')");
+
+
+$this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'duration_hours','vtiger_activity',1,'63','duration_hours','Duration',1,0,0,100,17,19,3,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'duration_minutes','vtiger_activity',1,'15','duration_minutes','Duration Minutes',1,0,0,100,18,19,3,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'location','vtiger_activity',1,'1','location','Location',1,0,0,100,19,19,3,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'reminder_time','vtiger_activity_reminder',1,'30','reminder_time','Send Reminder',1,0,0,100,1,19,3,'I~O',1,null,'BAS')");
+ 
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'recurringtype','vtiger_recurringevents',1,'15','recurringtype','Recurrence',1,0,0,100,6,19,3,'O~O',1,null,'BAS')");
+
+ $this->db->query("Insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'notime','activity',1,56,'notime','No Time',1,0,0,100,20,19,3,'C~O',1,null,'BAS')");
+//Block19 -- End
+//Task Details -- END
+
+//Event Details --START
+//Block41-43-- Start
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'subject','vtiger_activity',1,'2','subject','Subject',1,0,0,100,1,41,1,'V~M',0,1,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,2,41,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'date_start','vtiger_activity',1,'6','date_start','Start Date & Time',1,0,0,100,3,41,1,'DT~M~time_start',0,2,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'time_start','vtiger_activity',1,'2','time_start','Time Start',1,0,0,100,4,41,3,'T~M',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'due_date','vtiger_activity',1,'23','due_date','End Date',1,0,0,100,5,41,1,'D~M~OTH~GE~date_start~Start Date & Time',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'recurringtype','vtiger_recurringevents',1,'15','recurringtype','Recurrence',1,0,0,100,6,41,1,'O~O',1,null,'BAS')");
+  
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'duration_hours','vtiger_activity',1,'63','duration_hours','Duration',1,0,0,100,7,41,1,'I~M',0,5,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'duration_minutes','vtiger_activity',1,'15','duration_minutes','Duration Minutes',1,0,0,100,8,41,3,'O~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'crmid','vtiger_seactivityrel',1,'66','parent_id','Related To',1,0,0,100,9,41,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'contactid','vtiger_cntactivityrel',1,'57','contact_id','Contact Name',1,0,0,100,10,41,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'eventstatus','vtiger_activity',1,'15','eventstatus','Status',1,0,0,100,11,41,1,'V~O',0,3,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'sendnotification','vtiger_activity',1,'56','sendnotification','Send Notification',1,0,0,100,12,41,1,'C~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'activitytype','vtiger_activity',1,'15','activitytype','Activity Type',1,0,0,100,13,41,1,'V~O',0,4,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'location','vtiger_activity',1,'1','location','Location',1,0,0,100,14,41,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,15,41,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,16,41,2,'T~O',1,null,'BAS')");
+ $this->db->query("Insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'priority','activity',1,15,'taskpriority','Priority',1,0,0,100,17,41,1,'V~O',1,null,'BAS')");
+ $this->db->query("Insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'notime','activity',1,56,'notime','No Time',1,0,0,100,18,41,1,'C~O',1,null,'BAS')");
+ $this->db->query("Insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'visibility','activity',1,15,'visibility','Visibility',1,0,0,100,19,41,1,'V~O',1,null,'BAS')");
+ 
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,43,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'reminder_time','vtiger_activity_reminder',1,'30','reminder_time','Send Reminder',1,0,0,100,1,42,1,'I~O',1,null,'BAS')");
+//Block41-43 -- End
+//Event Details -- END
+
+//Faq Details -- START
+//Block37-40 -- Start
+
+$this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("field").",'product_id','vtiger_faq',1,'59','product_id','Product Name',1,0,0,100,1,37,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("field").",'category','vtiger_faq',1,'15','faqcategories','Category',1,0,0,100,2,37,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("field").",'status','vtiger_faq',1,'15','faqstatus','Status',1,0,0,100,3,37,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("field").",'question','vtiger_faq',1,'20','question','Question',1,0,0,100,1,38,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("field").",'answer','vtiger_faq',1,'20','faq_answer','Answer',1,0,0,100,1,39,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("field").",'comments','vtiger_faqcomments',1,'19','comments','Add Comment',1,0,0,100,1,40,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,3,37,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,4,37,2,'T~O',1,null,'BAS')");
+
+
+//Block37-40 -- End
+//Ticket Details -- END
+
+//Vendor Details --START
+//Block44-47
+
+$this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'vendorname','vtiger_vendor',1,'2','vendorname','Vendor Name',1,0,0,100,1,44,1,'V~M',0,1,'BAS')");
+ $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'phone','vtiger_vendor',1,'1','phone','Phone',1,0,0,100,3,44,1,'V~O',0,2,'BAS')");
+ $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'email','vtiger_vendor',1,'13','email','Email',1,0,0,100,4,44,1,'E~O',0,3,'BAS')");
+ $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'website','vtiger_vendor',1,'17','website','Website',1,0,0,100,5,44,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'glacct','vtiger_vendor',1,'15','glacct','GL Account',1,0,0,100,6,44,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'category','vtiger_vendor',1,'1','category','Category',1,0,0,100,7,44,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,8,44,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,9,44,2,'T~O',1,null,'BAS')");
+
+//Block 46
+
+$this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'street','vtiger_vendor',1,'21','street','Street',1,0,0,100,1,46,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'pobox','vtiger_vendor',1,'1','pobox','Po Box',1,0,0,100,2,46,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'city','vtiger_vendor',1,'1','city','City',1,0,0,100,3,46,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'state','vtiger_vendor',1,'1','state','State',1,0,0,100,4,46,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'postalcode','vtiger_vendor',1,'1','postalcode','Postal Code',1,0,0,100,5,46,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'country','vtiger_vendor',1,'1','country','Country',1,0,0,100,6,46,1,'V~O',1,null,'ADV')");
+
+//Block 47
+
+$this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,47,1,'V~O',1,null,'ADV')");
+
+//Vendor Details -- END
+
+//PriceBook Details Start
+//Block48
+
+$this->db->query("insert into vtiger_field values (19,".$this->db->getUniqueID("field").",'bookname','vtiger_pricebook',1,'2','bookname','Price Book Name',1,0,0,100,1,48,1,'V~M',0,1,'BAS')");
+ $this->db->query("insert into vtiger_field values (19,".$this->db->getUniqueID("field").",'active','vtiger_pricebook',1,'56','active','Active',1,0,0,100,3,48,1,'V~O',0,2,'BAS')");
+$this->db->query("insert into vtiger_field values (19,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,4,48,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (19,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,5,48,2,'T~O',1,null,'BAS')");
+
+//Block50
+
+$this->db->query("insert into vtiger_field values (19,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,50,1,'V~O',1,null,'BAS')");
+
+//PriceBook Details End
+
+
+//Quote Details -- START
+ //Block51
+
+$this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'subject','vtiger_quotes',1,'2','subject','Subject',1,0,0,100,1,51,1,'V~M',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'potentialid','vtiger_quotes',1,'76','potential_id','Potential Name',1,0,0,100,2,51,1,'I~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'quotestage','vtiger_quotes',1,'15','quotestage','Quote Stage',1,0,0,100,3,51,1,'V~O',1,null,'BAS')");	
+
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'validtill','vtiger_quotes',1,'5','validtill','Valid Till',1,0,0,100,4,51,1,'D~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'team','vtiger_quotes',1,'1','team','Team',1,0,0,100,5,51,1,'V~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'contactid','vtiger_quotes',1,'57','contact_id','Contact Name',1,0,0,100,6,51,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'carrier','vtiger_quotes',1,'15','carrier','Carrier',1,0,0,100,8,51,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'subtotal','vtiger_quotes',1,'1','hdnSubTotal','Sub Total',1,0,0,100,9,51,3,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'shipping','vtiger_quotes',1,'1','shipping','Shipping',1,0,0,100,10,51,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'inventorymanager','vtiger_quotes',1,'77','assigned_user_id1','Inventory Manager',1,0,0,100,11,51,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'tax','vtiger_quotes',1,'1','txtTax','Tax',1,0,0,100,13,51,3,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'adjustment','vtiger_quotes',1,'1','txtAdjustment','Adjustment',1,0,0,100,20,51,3,'NN~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'total','vtiger_quotes',1,'1','hdnGrandTotal','Total',1,0,0,100,14,51,3,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'accountid','vtiger_quotes',1,'73','account_id','Account Name',1,0,0,100,16,51,1,'I~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,17,51,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,18,51,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,19,51,2,'T~O',1,null,'BAS')");
+
+
+ //Block 53
+
+$this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'bill_street','vtiger_quotesbillads',1,'24','bill_street','Billing Address',1,0,0,100,1,53,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'ship_street','vtiger_quotesshipads',1,'24','ship_street','Shipping Address',1,0,0,100,2,53,1,'V~M',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'bill_city','vtiger_quotesbillads',1,'1','bill_city','Billing City',1,0,0,100,5,53,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'ship_city','vtiger_quotesshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,53,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'bill_state','vtiger_quotesbillads',1,'1','bill_state','Billing State',1,0,0,100,7,53,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'ship_state','vtiger_quotesshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,53,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'bill_code','vtiger_quotesbillads',1,'1','bill_code','Billing Code',1,0,0,100,9,53,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'ship_code','vtiger_quotesshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,53,1,'V~O',1,null,'BAS')");
+
+
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'bill_country','vtiger_quotesbillads',1,'1','bill_country','Billing Country',1,0,0,100,11,53,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'ship_country','vtiger_quotesshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,53,1,'V~O',1,null,'BAS')");
+
+$this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'bill_pobox','vtiger_quotesbillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,53,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'ship_pobox','vtiger_quotesshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,53,1,'V~O',1,null,'BAS')");
+ //Block55
+
+$this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,56,1,'V~O',1,null,'ADV')");
+
+//Block 56
+$this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'terms_conditions','vtiger_quotes',1,'19','terms_conditions','Terms & Conditions',1,0,0,100,1,55,1,'V~O',1,null,'ADV')");
+
+
+//Quote Details -- END
+
+//Purchase Order Details -- START
+ //Block57
+ 
+$this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'subject','vtiger_purchaseorder',1,'2','subject','Subject',1,0,0,100,1,57,1,'V~M',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'vendorid','vtiger_purchaseorder',1,'81','vendor_id','Vendor Name',1,0,0,100,3,57,1,'I~M',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'requisition_no','vtiger_purchaseorder',1,'1','requisition_no','Requisition No',1,0,0,100,4,57,1,'V~O',1,null,'BAS')");	
+
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'tracking_no','vtiger_purchaseorder',1,'1','tracking_no','Tracking Number',1,0,0,100,5,57,1,'V~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'contactid','vtiger_purchaseorder',1,'57','contact_id','Contact Name',1,0,0,100,6,57,1,'I~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'duedate','vtiger_purchaseorder',1,'5','duedate','Due Date',1,0,0,100,7,57,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'carrier','vtiger_purchaseorder',1,'15','carrier','Carrier',1,0,0,100,8,57,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'salestax','vtiger_purchaseorder',1,'1','txtTax','Sales Tax',1,0,0,100,10,57,3,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'adjustment','vtiger_purchaseorder',1,'1','txtAdjustment','Adjustment',1,0,0,100,10,57,3,'NN~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'salescommission','vtiger_purchaseorder',1,'1','salescommission','Sales Commission',1,0,0,100,11,57,1,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'exciseduty','vtiger_purchaseorder',1,'1','exciseduty','Excise Duty',1,0,0,100,12,57,1,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'total','vtiger_purchaseorder',1,'1','hdnGrandTotal','Total',1,0,0,100,13,57,3,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'subtotal','vtiger_purchaseorder',1,'1','hdnSubTotal','Sub Total',1,0,0,100,14,57,3,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'postatus','vtiger_purchaseorder',1,'15','postatus','Status',1,0,0,100,15,57,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,16,57,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,17,57,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,18,57,2,'T~O',1,null,'BAS')");
+
+
+
+ //Block 59
+
+$this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'bill_street','vtiger_pobillads',1,'24','bill_street','Billing Address',1,0,0,100,1,59,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'ship_street','vtiger_poshipads',1,'24','ship_street','Shipping Address',1,0,0,100,2,59,1,'V~M',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'bill_city','vtiger_pobillads',1,'1','bill_city','Billing City',1,0,0,100,5,59,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'ship_city','vtiger_poshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,59,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'bill_state','vtiger_pobillads',1,'1','bill_state','Billing State',1,0,0,100,7,59,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'ship_state','vtiger_poshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,59,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'bill_code','vtiger_pobillads',1,'1','bill_code','Billing Code',1,0,0,100,9,59,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'ship_code','vtiger_poshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,59,1,'V~O',1,null,'BAS')");
+
+
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'bill_country','vtiger_pobillads',1,'1','bill_country','Billing Country',1,0,0,100,11,59,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'ship_country','vtiger_poshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,59,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'bill_pobox','vtiger_pobillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,59,1,'V~O',1,null,'BAS')");
+  $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'ship_pobox','vtiger_poshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,59,1,'V~O',1,null,'BAS')");
+  
+ //Block61
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,62,1,'V~O',1,null,'ADV')");
+
+ //Block62
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'terms_conditions','vtiger_purchaseorder',1,'19','terms_conditions','Terms & Conditions',1,0,0,100,1,61,1,'V~O',1,null,'ADV')");
+
+//Purchase Order Details -- END
+
+//Sales Order Details -- START
+ //Block63
+ 
+$this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'subject','vtiger_salesorder',1,'2','subject','Subject',1,0,0,100,1,63,1,'V~M',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'potentialid','vtiger_salesorder',1,'76','potential_id','Potential Name',1,0,0,100,2,63,1,'I~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'customerno','vtiger_salesorder',1,'1','customerno','Customer No',1,0,0,100,3,63,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'quoteid','vtiger_salesorder',1,'78','quote_id','Quote Name',1,0,0,100,4,63,1,'I~O',1,null,'BAS')");	
+$this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'purchaseorder','vtiger_salesorder',1,'1','vtiger_purchaseorder','Purchase Order',1,0,0,100,4,63,1,'V~O',1,null,'BAS')");	
+
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'contactid','vtiger_salesorder',1,'57','contact_id','Contact Name',1,0,0,100,6,63,1,'I~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'duedate','vtiger_salesorder',1,'5','duedate','Due Date',1,0,0,100,8,63,1,'D~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'carrier','vtiger_salesorder',1,'15','carrier','Carrier',1,0,0,100,9,63,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'pending','vtiger_salesorder',1,'1','pending','Pending',1,0,0,100,10,63,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'sostatus','vtiger_salesorder',1,'15','sostatus','Status',1,0,0,100,11,63,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'salestax','vtiger_salesorder',1,'1','txtTax','Sales Tax',1,0,0,100,12,63,3,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'adjustment','vtiger_salesorder',1,'1','txtAdjustment','Sales Tax',1,0,0,100,12,63,3,'NN~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'salescommission','vtiger_salesorder',1,'1','salescommission','Sales Commission',1,0,0,100,13,63,1,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'exciseduty','vtiger_salesorder',1,'1','exciseduty','Excise Duty',1,0,0,100,13,63,1,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'total','vtiger_salesorder',1,'1','hdnGrandTotal','Total',1,0,0,100,14,63,3,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'subtotal','vtiger_salesorder',1,'1','hdnSubTotal','Total',1,0,0,100,15,63,3,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'accountid','vtiger_salesorder',1,'73','account_id','Account Name',1,0,0,100,16,63,1,'I~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,17,63,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,18,63,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,19,63,2,'T~O',1,null,'BAS')");
+
+
+
+ //Block 65
+
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'bill_street','vtiger_sobillads',1,'24','bill_street','Billing Address',1,0,0,100,1,65,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'ship_street','vtiger_soshipads',1,'24','ship_street','Shipping Address',1,0,0,100,2,65,1,'V~M',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'bill_city','vtiger_sobillads',1,'1','bill_city','Billing City',1,0,0,100,5,65,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'ship_city','vtiger_soshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,65,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'bill_state','vtiger_sobillads',1,'1','bill_state','Billing State',1,0,0,100,7,65,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'ship_state','vtiger_soshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,65,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'bill_code','vtiger_sobillads',1,'1','bill_code','Billing Code',1,0,0,100,9,65,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'ship_code','vtiger_soshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,65,1,'V~O',1,null,'BAS')");
+
+
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'bill_country','vtiger_sobillads',1,'1','bill_country','Billing Country',1,0,0,100,11,65,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'ship_country','vtiger_soshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,65,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'bill_pobox','vtiger_sobillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,65,1,'V~O',1,null,'BAS')");
+  $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'ship_pobox','vtiger_soshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,65,1,'V~O',1,null,'BAS')");
+  
+//Block67
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,68,1,'V~O',1,null,'ADV')");
+
+ //Block68
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'terms_conditions','vtiger_salesorder',1,'19','terms_conditions','Terms & Conditions',1,0,0,100,1,67,1,'V~O',1,null,'ADV')");
+
+
+//Sales Order Details -- END
+
+//Invoice Details -- START
+ //Block69
+
+$this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'subject','vtiger_invoice',1,'2','subject','Subject',1,0,0,100,1,69,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'salesorderid','vtiger_invoice',1,'80','salesorder_id','Sales Order',1,0,0,100,2,69,1,'I~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'customerno','vtiger_invoice',1,'1','customerno','Customer No',1,0,0,100,3,69,1,'V~O',1,null,'BAS')");	
+
+ 
+//to include contact name vtiger_field in Invoice-start
+$this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'contactid','vtiger_invoice',1,'57','contact_id','Contact Name',1,0,0,100,4,69,1,'I~O',1,null,'BAS')");
+//end
+
+$this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'invoicedate','vtiger_invoice',1,'5','invoicedate','Invoice Date',1,0,0,100,5,69,1,'D~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'duedate','vtiger_invoice',1,'5','duedate','Due Date',1,0,0,100,6,69,1,'D~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'purchaseorder','vtiger_invoice',1,'1','vtiger_purchaseorder','Purchase Order',1,0,0,100,8,69,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'salestax','vtiger_invoice',1,'1','txtTax','Sales Tax',1,0,0,100,9,69,3,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'adjustment','vtiger_invoice',1,'1','txtAdjustment','Sales Tax',1,0,0,100,9,69,3,'NN~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'salescommission','vtiger_invoice',1,'1','salescommission','Sales Commission',1,0,0,10,13,69,1,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'exciseduty','vtiger_invoice',1,'1','exciseduty','Excise Duty',1,0,0,100,11,69,1,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'subtotal','vtiger_invoice',1,'1','hdnSubTotal','Sub Total',1,0,0,100,12,69,3,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'total','vtiger_invoice',1,'1','hdnGrandTotal','Total',1,0,0,100,13,69,3,'N~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'accountid','vtiger_invoice',1,'73','account_id','Account Name',1,0,0,100,14,69,1,'I~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'invoicestatus','vtiger_invoice',1,'15','invoicestatus','Status',1,0,0,100,15,69,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,16,69,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,17,69,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,18,69,2,'T~O',1,null,'BAS')"); 
+
+ //Block 71
+
+$this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'bill_street','vtiger_invoicebillads',1,'24','bill_street','Billing Address',1,0,0,100,1,71,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'ship_street','vtiger_invoiceshipads',1,'24','ship_street','Shipping Address',1,0,0,100,2,71,1,'V~M',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'bill_city','vtiger_invoicebillads',1,'1','bill_city','Billing City',1,0,0,100,5,71,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'ship_city','vtiger_invoiceshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,71,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'bill_state','vtiger_invoicebillads',1,'1','bill_state','Billing State',1,0,0,100,7,71,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'ship_state','vtiger_invoiceshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,71,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'bill_code','vtiger_invoicebillads',1,'1','bill_code','Billing Code',1,0,0,100,9,71,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'ship_code','vtiger_invoiceshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,71,1,'V~O',1,null,'BAS')");
+
+
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'bill_country','vtiger_invoicebillads',1,'1','bill_country','Billing Country',1,0,0,100,11,71,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'ship_country','vtiger_invoiceshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,71,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'bill_pobox','vtiger_invoicebillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,71,1,'V~O',1,null,'BAS')");
+  $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'ship_pobox','vtiger_invoiceshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,71,1,'V~O',1,null,'BAS')");
+
+//Block73
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,74,1,'V~O',1,null,'ADV')");
+ //Block74
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'terms_conditions','vtiger_invoice',1,'19','terms_conditions','Terms & Conditions',1,0,0,100,1,73,1,'V~O',1,null,'ADV')");
+
+
+//Invoice Details -- END
+
+
+
+                // Insert End
+                
+
+		//New Security Start
+		//Inserting into vtiger_profile vtiger_table
+		$this->db->query("insert into vtiger_profile values ('".$profile1_id."','Administrator',null)");	
+		$this->db->query("insert into vtiger_profile values ('".$profile2_id."','Sales Profile',null)");
+		$this->db->query("insert into vtiger_profile values ('".$profile3_id."','Support Profile',null)");
+		$this->db->query("insert into vtiger_profile values ('".$profile4_id."','Guest Profile',null)");
+		
+		//Inserting into vtiger_profile2gloabal permissions
+		$this->db->query("insert into vtiger_profile2globalpermissions values ('".$profile1_id."',1,0)");
+		$this->db->query("insert into vtiger_profile2globalpermissions values ('".$profile1_id."',2,0)");
+		$this->db->query("insert into vtiger_profile2globalpermissions values ('".$profile2_id."',1,1)");
+		$this->db->query("insert into vtiger_profile2globalpermissions values ('".$profile2_id."',2,1)");
+		$this->db->query("insert into vtiger_profile2globalpermissions values ('".$profile3_id."',1,1)");
+		$this->db->query("insert into vtiger_profile2globalpermissions values ('".$profile3_id."',2,1)");
+		$this->db->query("insert into vtiger_profile2globalpermissions values ('".$profile4_id."',1,1)");
+		$this->db->query("insert into vtiger_profile2globalpermissions values ('".$profile4_id."',2,1)");
+
+		//Inserting into vtiger_profile2tab
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",1,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",2,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",3,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",4,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",6,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",7,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",8,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",9,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",10,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",13,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",14,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",15,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",16,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",17,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",18,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",19,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",20,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",21,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",22,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",23,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",24,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",25,0)");
+       		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",26,0)");
+       		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",27,0)");
+
+		//Inserting into vtiger_profile2tab
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",1,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",2,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",3,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",4,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",6,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",7,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",8,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",9,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",10,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",13,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",14,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",15,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",16,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",17,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",18,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",19,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",20,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",21,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",22,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",23,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",24,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",25,0)");
+        	$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",26,0)");
+       		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",27,0)");
+
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",1,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",2,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",3,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",4,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",6,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",7,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",8,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",9,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",10,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",13,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",14,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",15,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",16,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",17,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",18,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",19,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",20,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",21,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",22,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",23,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",24,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",25,0)");
+        	$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",26,0)");
+       		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",27,0)");
+        
+
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",1,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",2,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",3,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",4,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",6,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",7,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",8,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",9,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",10,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",13,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",14,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",15,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",16,0)");	
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",17,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",18,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",19,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",20,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",21,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",22,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",23,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",24,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",25,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",26,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",27,0)");
+		//Inserting into vtiger_profile2standardpermissions  Adminsitrator
+		
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",2,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",2,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",2,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",2,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",2,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",4,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",4,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",4,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",4,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",4,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",6,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",6,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",6,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",6,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",6,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",7,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",7,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",7,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",7,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",7,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",8,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",8,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",8,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",8,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",8,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",9,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",9,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",9,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",9,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",9,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",10,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",10,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",10,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",10,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",10,4,0)");
+
+		
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",13,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",13,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",13,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",13,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",13,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",14,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",14,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",14,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",14,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",14,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",15,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",15,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",15,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",15,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",15,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",16,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",16,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",16,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",16,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",16,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",18,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",18,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",18,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",18,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",18,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",19,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",19,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",19,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",19,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",19,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",20,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",20,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",20,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",20,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",20,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",21,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",21,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",21,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",21,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",21,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",22,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",22,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",22,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",22,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",22,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",23,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",23,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",23,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",23,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",23,4,0)");
+
+
+
+        	$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",26,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",26,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",26,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",26,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",26,4,0)");
+
+
+		//Insert into Profile 2 std permissions for Sales User  
+		//Help Desk Create/Delete not allowed. Read-Only	
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",2,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",2,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",2,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",2,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",2,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",4,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",4,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",4,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",4,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",4,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",6,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",6,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",6,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",6,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",6,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",7,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",7,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",7,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",7,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",7,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",8,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",8,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",8,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",8,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",8,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",9,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",9,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",9,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",9,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",9,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",10,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",10,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",10,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",10,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",10,4,0)");
+
+		
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",13,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",13,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",13,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",13,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",13,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",14,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",14,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",14,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",14,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",14,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",15,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",15,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",15,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",15,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",15,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",16,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",16,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",16,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",16,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",16,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",18,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",18,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",18,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",18,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",18,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",19,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",19,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",19,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",19,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",19,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",20,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",20,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",20,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",20,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",20,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",21,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",21,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",21,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",21,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",21,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",22,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",22,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",22,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",22,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",22,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",23,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",23,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",23,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",23,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",23,4,0)");
+
+
+        	$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",26,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",26,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",26,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",26,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",26,4,0)");
+
+		//Inserting into vtiger_profile2std for Support Profile
+		// Potential is read-only
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",2,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",2,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",2,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",2,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",2,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",4,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",4,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",4,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",4,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",4,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",6,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",6,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",6,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",6,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",6,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",7,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",7,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",7,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",7,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",7,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",8,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",8,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",8,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",8,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",8,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",9,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",9,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",9,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",9,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",9,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",10,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",10,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",10,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",10,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",10,4,0)");
+
+		
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",13,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",13,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",13,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",13,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",13,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",14,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",14,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",14,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",14,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",14,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",15,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",15,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",15,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",15,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",15,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",16,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",16,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",16,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",16,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",16,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",18,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",18,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",18,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",18,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",18,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",19,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",19,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",19,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",19,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",19,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",20,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",20,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",20,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",20,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",20,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",21,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",21,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",21,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",21,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",21,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",22,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",22,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",22,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",22,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",22,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",23,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",23,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",23,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",23,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",23,4,0)");
+
+
+        	$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",26,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",26,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",26,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",26,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",26,4,0)");
+        
+		//Inserting into vtiger_profile2stdper for Profile Guest Profile
+		//All Read-Only
+		
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",2,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",2,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",2,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",2,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",2,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",4,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",4,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",4,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",4,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",4,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",6,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",6,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",6,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",6,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",6,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",7,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",7,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",7,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",7,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",7,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",8,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",8,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",8,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",8,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",8,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",9,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",9,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",9,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",9,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",9,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",10,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",10,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",10,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",10,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",10,4,0)");
+
+		
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",13,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",13,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",13,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",13,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",13,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",14,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",14,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",14,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",14,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",14,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",15,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",15,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",15,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",15,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",15,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",16,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",16,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",16,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",16,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",16,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",18,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",18,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",18,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",18,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",18,4,0)");	
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",19,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",19,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",19,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",19,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",19,4,0)");	
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",20,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",20,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",20,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",20,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",20,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",21,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",21,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",21,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",21,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",21,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",22,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",22,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",22,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",22,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",22,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",23,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",23,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",23,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",23,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",23,4,0)");	
+
+
+        $this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",26,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",26,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",26,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",26,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",26,4,0)");
+
+		//Insert into vtiger_role2profile
+		$this->db->query("insert into vtiger_role2profile values ('H".$role2_id."',".$profile1_id.")");
+		$this->db->query("insert into vtiger_role2profile values ('H".$role3_id."',".$profile2_id.")");
+	
+		//Insert into vtiger_profile2field
+			
+                insertProfile2field($profile1_id);
+                insertProfile2field($profile2_id);	
+                insertProfile2field($profile3_id);	
+                insertProfile2field($profile4_id);
+
+		insert_def_org_field();	
+		
+
+		//Inserting into vtiger_profile 2 utility Admin
+                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",2,5,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",2,6,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",4,5,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",4,6,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",6,5,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",6,6,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",7,5,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",7,6,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",8,6,0)");
+                //$this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",9,6,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",10,6,0)");
+		$this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",7,8,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",6,8,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",4,8,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",13,8,0)");
+		$this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",14,5,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",14,6,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",7,9,0)");
+
+		//Inserting into vtiger_profile2utility Sales Profile
+		//Import Export Not Allowed.	
+		$this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",2,5,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",2,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",4,5,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",4,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",6,5,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",6,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",7,5,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",7,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",8,6,1)");
+                //$this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",9,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",10,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",7,8,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",6,8,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",4,8,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",13,8,0)");
+		$this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",14,5,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",14,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",7,9,0)");
+
+		//Inserting into vtiger_profile2utility Support Profile
+		//Import Export Not Allowed.	
+		$this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",2,5,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",2,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",4,5,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",4,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",6,5,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",6,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",7,5,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",7,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",8,6,1)");
+                //$this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",9,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",10,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",7,8,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",6,8,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",4,8,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",13,8,0)");
+		$this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",14,5,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",14,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",7,9,0)");
+
+		//Inserting into vtiger_profile2utility Guest Profile Read-Only
+		//Import Export BusinessCar Not Allowed.	
+		$this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",2,5,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",2,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",4,5,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",4,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",6,5,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",6,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",7,5,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",7,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",8,6,1)");
+                //$this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",9,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",10,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",7,8,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",6,8,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",4,8,1)");		
+                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",13,8,1)");		
+		$this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",14,5,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",14,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",7,9,0)");
+
+		//Inserting values into org share action mapping
+                $this->db->query("insert into vtiger_org_share_action_mapping values(0,'Public: Read Only')");
+                $this->db->query("insert into vtiger_org_share_action_mapping values(1,'Public: Read, Create/Edit')");
+                $this->db->query("insert into vtiger_org_share_action_mapping values(2,'Public: Read, Create/Edit, Delete')");
+                $this->db->query("insert into vtiger_org_share_action_mapping values(3,'Private')");
+
+                $this->db->query("insert into vtiger_org_share_action_mapping values(4,'Hide Details')");
+                $this->db->query("insert into vtiger_org_share_action_mapping values(5,'Hide Details and Add Events')");
+                $this->db->query("insert into vtiger_org_share_action_mapping values(6,'Show Details')");
+                $this->db->query("insert into vtiger_org_share_action_mapping values(7,'Show Details and Add Events')");
+
+
+		//Inserting for all vtiger_tabs
+                $def_org_tabid= Array(2,4,6,7,9,10,13,16,20,21,22,23,26);
+
+                foreach($def_org_tabid as $def_tabid)
+                {
+                        $this->db->query("insert into vtiger_org_share_action2tab values(0,".$def_tabid.")");
+                        $this->db->query("insert into vtiger_org_share_action2tab values(1,".$def_tabid.")");
+                        $this->db->query("insert into vtiger_org_share_action2tab values(2,".$def_tabid.")");
+                        $this->db->query("insert into vtiger_org_share_action2tab values(3,".$def_tabid.")");
+                }
+
+                $this->db->query("insert into vtiger_org_share_action2tab values(4,17)");
+                $this->db->query("insert into vtiger_org_share_action2tab values(5,17)");
+                $this->db->query("insert into vtiger_org_share_action2tab values(6,17)");
+                $this->db->query("insert into vtiger_org_share_action2tab values(7,17)");
+
+		//Insert into default_org_sharingrule
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",2,2,0)");
+
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",4,2,2)");
+
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",6,2,0)");
+
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",7,2,0)");
+
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",9,3,1)");
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",10,2,0)");
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",13,2,0)");
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",16,3,2)");
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",17,7,0)");
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",20,2,0)");
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",21,2,0)");
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",22,2,0)");
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",23,2,0)");
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",26,2,0)");
+
+		//Populating the DataShare Related Modules
+
+		//Lead Related Module
+		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",7,10)");
+
+		//Account Related Module
+		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",6,2)");
+		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",6,13)");
+		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",6,20)");
+		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",6,22)");
+		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",6,23)");
+		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",6,10)");
+
+		//Potential Related Module
+		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",2,20)");
+		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",2,22)");
+
+		//Quote Related Module
+		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",20,22)");
+
+		//SO Related Module
+		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",22,23)");	
+
+
+			
+					
+  // New Secutity End
+
+
+         //insert into the vtiger_notificationscheduler vtiger_table
+
+	//insert into related list vtiger_table
+	//Inserting for vtiger_account related lists
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("Potentials").",'get_opportunities',1,'Potentials',0)");	
+		
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("Contacts").",'get_contacts',2,'Contacts',0)");
+
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("Activities").",'get_activities',3,'Activities',0)");
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("HelpDesk").",'get_tickets',4,'HelpDesk',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("Activities").",'get_history',5,'Activity History',0)");
+
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",0,'get_attachments',6,'Attachments',0)");
+
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("Quotes").",'get_quotes',7,'Quotes',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("Invoice").",'get_invoices',8,'Invoice',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("SalesOrder").",'get_salesorder',9,'Sales Order',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("Products").",'get_products',10,'Products',0)");
+
+	//Inserting Lead Related Lists	
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Leads").",".getTabid("Activities").",'get_activities',1,'Activities',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Leads").",".getTabid("Emails").",'get_emails',2,'Emails',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Leads").",".getTabid("Activities").",'get_history',3,'Activity History',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Leads").",0,'get_attachments',4,'Attachments',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Leads").",".getTabid("Products").",'get_products',5,'Products',0)");
+
+	//Inserting for contact related lists
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Potentials").",'get_opportunities',1,'Potentials',0)");	
+		
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Activities").",'get_activities',2,'Activities',0)");
+
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Emails").",'get_emails',3,'Emails',0)");
+
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("HelpDesk").",'get_tickets',4,'HelpDesk',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Quotes").",'get_quotes',5,'Quotes',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("PurchaseOrder").",'get_purchase_orders',6,'Purchase Order',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("SalesOrder").",'get_salesorder',7,'Sales Order',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Products").",'get_products',8,'Products',0)");
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Activities").",'get_history',9,'Activity History',0)");
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",0,'get_attachments',10,'Attachments',0)");
+
+	//Inserting Potential Related Lists	
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",".getTabid("Activities").",'get_activities',1,'Activities',0)");
+
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",".getTabid("Contacts").",'get_contacts',2,'Contacts',0)");
+
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",".getTabid("Products").",'get_products',3,'Products',0)");
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",0,'get_stage_history',4,'Sales Stage History',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",0,'get_attachments',5,'Attachments',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",".getTabid("Quotes").",'get_Quotes',6,'Quotes',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",".getTabid("SalesOrder").",'get_salesorder',7,'Sales Order',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",".getTabid("Activities").",'get_history',8,'Activity History',0)");
+
+		//Inserting Product Related Lists	
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",".getTabid("HelpDesk").",'get_tickets',1,'HelpDesk',0)");
+
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",".getTabid("Activities").",'get_activities',2,'Activities',0)");
+
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",0,'get_attachments',3,'Attachments',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",".getTabid("Quotes").",'get_quotes',4,'Quotes',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",".getTabid("PurchaseOrder").",'get_purchase_orders',5,'Purchase Order',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",".getTabid("SalesOrder").",'get_salesorder',6,'Sales Order',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",".getTabid("Invoice").",'get_invoices',7,'Invoice',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",".getTabid("PriceBooks").",'get_product_pricebooks',8,'PriceBooks',0)");
+	
+		//Inserting Emails Related Lists	
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Emails").",".getTabid("Contacts").",'get_contacts',1,'Contacts',0)");
+
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Emails").",0,'get_users',2,'Users',0)");
+
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Emails").",0,'get_attachments',3,'Attachments',0)");
+
+		//Inserting HelpDesk Related Lists
+		
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("HelpDesk").",".getTabid("Activities").",'get_activities',1,'Activities',0)");
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("HelpDesk").",0,'get_attachments',2,'Attachments',0)");
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("HelpDesk").",0,'get_ticket_history',3,'Ticket History',0)");
+
+	//Inserting PriceBook Related Lists
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("PriceBooks").",14,'get_pricebook_products',2,'Products',0)");
+
+        // Inserting Vendor Related Lists
+        $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Vendors").",14,'get_products',1,'Products',0)");
+
+        $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Vendors").",21,'get_purchase_orders',2,'Purchase Order',0)");
+
+        $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Vendors").",4,'get_contacts',3,'Contacts',0)");
+
+	// Inserting Quotes Related Lists
+	
+        $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Quotes").",".getTabid("Invoice").",'get_salesorder',1,'Sales Order',0)");
+        
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Quotes").",9,'get_activities',2,'Activities',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Quotes").",9,'get_history',3,'Activity History',0)");
+
+	// Inserting Purchase order Related Lists
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("PurchaseOrder").",9,'get_activities',1,'Activities',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("PurchaseOrder").",0,'get_attachments',2,'Attachments',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("PurchaseOrder").",".getTabid("Activities").",'get_history',3,'Activity History',0)");
+	
+	// Inserting Sales order Related Lists
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("SalesOrder").",9,'get_activities',1,'Activities',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("SalesOrder").",0,'get_attachments',2,'Attachments',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("SalesOrder").",".getTabid("Invoice").",'get_invoices',3,'Invoice',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("SalesOrder").",".getTabid("Activities").",'get_history',4,'Activity History',0)");
+	
+	// Inserting Invoice Related Lists
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Invoice").",9,'get_activities',1,'Activities',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Invoice").",0,'get_attachments',2,'Attachments',0)");
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Invoice").",".getTabid("Activities").",'get_history',3,'Activity History',0)");
+
+	// Inserting Activities Related Lists
+	
+	$this->db->query("insert into vtiger_relatedlists values (".$this->db->getUniqueID('relatedlists').",".getTabid("Activities").",0,'get_users',1,'Users',0)");
+	$this->db->query("insert into vtiger_relatedlists values (".$this->db->getUniqueID('relatedlists').",".getTabid("Activities").",4,'get_contacts',2,'Contacts',0)");
+
+	// Inserting Campaigns Related Lists
+
+         $this->db->query("insert into vtiger_relatedlists values (".$this->db->getUniqueID('relatedlists').",".getTabid("Campaigns").",".getTabid("Contacts").",'get_contacts',1,'Contacts',0)");
+         $this->db->query("insert into vtiger_relatedlists values (".$this->db->getUniqueID('relatedlists').",".getTabid("Campaigns").",".getTabid("Leads").",'get_leads',2,'Leads',0)");
+
+               $this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("notificationscheduler").",'LBL_TASK_NOTIFICATION_DESCRITPION',1,'Task Delay Notification','Tasks delayed beyond 24 hrs ','LBL_TASK_NOTIFICATION')");
+
+
+                $this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("notificationscheduler").",'LBL_BIG_DEAL_DESCRIPTION' ,1,'Big Deal notification','Success! A big deal has been won! ','LBL_BIG_DEAL')");
+
+
+                $this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("notificationscheduler").",'LBL_TICKETS_DESCRIPTION',1,'Pending Tickets notification','Ticket pending please ','LBL_PENDING_TICKETS')");
+
+
+                $this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("notificationscheduler").",'LBL_MANY_TICKETS_DESCRIPTION',1,'Too many tickets Notification','Too many tickets pending against this entity ','LBL_MANY_TICKETS')");
+
+
+                $this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("notificationscheduler").",'LBL_START_DESCRIPTION' ,1,'Support Start Notification','Support starts please ','LBL_START_NOTIFICATION')");
+
+                $this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("notificationscheduler").",'LBL_SUPPORT_DESCRIPTION',1,'Support ending please','Support Ending Notification','LBL_SUPPORT_NOTICIATION')");
+		
+ 		$this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("notificationscheduler").",'LBL_ACTIVITY_REMINDER_DESCRIPTION' ,1,'Activity Reminder Notication','This is a reminder notification for the Activity','LBL_ACTIVITY_NOTIFICATION')");
+
+		//Inserting Inventory Notifications
+	$invoice_body = 'Dear {HANDLER},
+
+The current stock of {PRODUCTNAME} in our warehouse is {CURRENTSTOCK}. Kindly procure required number of units as the stock level is below reorder level {REORDERLEVELVALUE}.
+
+Please treat this information as Urgent as the vtiger_invoice is already sent  to the customer.
+
+Severity: Critical
+
+Thanks,
+{CURRENTUSER}';
+
+		
+               $this->db->query("insert into vtiger_inventorynotification(notificationid,notificationname,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("inventorynotification").",'InvoiceNotification','{PRODUCTNAME} Stock Level is Low','".$invoice_body." ','InvoiceNotificationDescription')");
+
+		$quote_body = 'Dear {HANDLER},
+
+Quote is generated for {QUOTEQUANTITY} units of {PRODUCTNAME}. The current stock of {PRODUCTNAME} in our warehouse is {CURRENTSTOCK}. 
+
+Severity: Minor
+
+Thanks,
+{CURRENTUSER}';	
+		
+		
+               $this->db->query("insert into vtiger_inventorynotification(notificationid,notificationname,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("inventorynotification").",'QuoteNotification','Quote given for {PRODUCTNAME}','".$quote_body." ','QuoteNotificationDescription')");
+
+		$so_body = 'Dear {HANDLER},
+
+SalesOrder is generated for {SOQUANTITY} units of {PRODUCTNAME}. The current stock of {PRODUCTNAME} in our warehouse is {CURRENTSTOCK}. 
+
+Please treat this information  with vtiger_priority as the sales order is already generated.
+
+Severity: Major
+
+Thanks,
+{CURRENTUSER}';
+
+		
+               $this->db->query("insert into vtiger_inventorynotification(notificationid,notificationname,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("inventorynotification").",'SalesOrderNotification','Sales Order generated for {PRODUCTNAME}','".$so_body." ','SalesOrderNotificationDescription')");
+
+		//Insert into vtiger_currency vtiger_table
+		$this->db->query("insert into vtiger_currency_info values(".$this->db->getUniqueID("currency_info").",'U.S Dollar','USD','$',1,'Active','-11')");
+                
+
+
+
+//insert into email template vtiger_table
+
+	$body='
+	Hello!
+
+	On behalf of the vtiger team,  I am pleased to announce the release of vtiger crm4.2 . This is a feature packed release including the mass email template handling, custom view feature, vtiger_reports feature and a host of other utilities. vtiger runs on all platforms.
+
+	Notable Features of vtiger are :
+	-Email Client Integration
+	-Trouble Ticket Integration
+	-Invoice Management Integration
+	-Reports Integration
+	-Portal Integration
+	-Enhanced Word Plugin Support
+	-Custom View Integration
+
+	Known Issues:
+	-ABCD
+	-EFGH
+	-IJKL
+	-MNOP
+	-QRST';
+
+          $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Announcement for Release','Announcement for Release','Announcement of a release','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
+	
+
+
+$body='name
+street,
+city,
+state,
+ zip)
+ 
+ Dear
+ 
+ Please check the following vtiger_invoices that are yet to be paid by you:
+ 
+ No. Date      Amount
+ 1   1/1/01    $4000
+ 2   2/2//01   $5000
+ 3   3/3/01    $10000
+ 4   7/4/01    $23560
+ 
+ Kindly let us know if there are any issues that you feel are pending to be discussed.
+ We will be more than happy to give you a call.
+ We would like to continue our business with you.
+ 
+ Sincerely,
+ name
+ title';
+
+
+               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Pending Invoices','Invoices Pending','Payment Due','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
+
+
+
+
+
+$body=' Dear
+
+Your proposal on the project XYZW has been reviewed by us
+and is acceptable in its entirety.
+
+We are eagerly looking forward to this project
+and are pleased about having the opportunity to work
+together. We look forward to a long standing relationship
+with your esteemed firm.
+
+I would like to take this opportunity to invite you
+to a game of golf on Wednesday morning 9am at the
+Cuff Links Ground. We will be waiting for you in the
+Executive Lounge.
+
+Looking forward to seeing you there.
+
+Sincerely,
+name
+title';
+	       
+               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Acceptance Proposal','Acceptance Proposal','Acceptance of Proposal','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
+
+
+$body= ' The undersigned hereby acknowledges receipt and delivery
+of the goods.
+The undersigned will release the payment subject to the goods being discovered not satisfactory.
+
+Signed under seal this <date>
+
+Sincerely,
+name
+title';
+	       
+               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Goods received acknowledgement','Goods received acknowledgement','Acknowledged Receipt of Goods','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
+
+
+	       $body= ' Dear
+	 We are in receipt of your order as contained in the
+   purchase order form.We consider this to be final and binding on both sides.
+If there be any exceptions noted, we shall consider them
+only if the objection is received within ten days of receipt of
+this notice.
+
+Thank you for your patronage.
+Sincerely,
+name
+title';
+
+
+	       
+               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Accept Order','Accept Order','Acknowledgement/Acceptance of Order','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
+
+
+
+
+$body='Dear
+
+We are relocating our office to
+11111,XYZDEF Cross,
+UVWWX Circle
+The telephone number for this new location is (101) 1212-1328.
+
+Our Manufacturing Division will continue operations
+at 3250 Lovedale Square Avenue, in Frankfurt.
+
+We hope to keep in touch with you all.
+Please update your addressbooks.
+
+
+Thank You,
+name
+title';
+	       
+               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Address Change','Change of Address','Address Change','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
+
+
+
+$body='Dear
+
+Thank you for extending us the opportunity to meet with
+you and members of your staff.
+
+I know that John Doe serviced your vtiger_account
+for many years and made many friends at your firm. He has personally
+discussed with me the deep relationship that he had with your firm.
+While his presence will be missed, I can promise that we will
+continue to provide the fine service that was accorded by
+John to your firm.
+
+I was genuinely touched to receive such fine hospitality.
+
+Thank you once again.
+
+Sincerely,
+name
+title';
+
+
+	       
+               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Follow Up','Follow Up','Follow Up of meeting','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
+
+
+
+$body='Congratulations!
+
+The numbers are in and I am proud to inform you that our
+total sales for the previous quarter
+amounts to $100,000,00.00!. This is the first time
+we have exceeded the target by almost 30%.
+We have also beat the previous quarter record by a
+whopping 75%!
+
+Let us meet at Smoking Joe for a drink in the evening!
+
+C you all there guys!
+
+Sincerely,
+name
+title';
+
+	       
+               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Target Crossed!','Target Crossed!','Fantastic Sales Spree!','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
+
+$body='
+Dear
+
+Thank you for your confidence in our ability to serve you.
+We are glad to be given the chance to serve you.I look
+forward to establishing a long term partnership with you.
+Consider me as a friend.
+Should any need arise,please do give us a call.
+
+Sincerely,
+name
+title';
+
+	       
+               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Thanks Note','Thanks Note','Note of thanks','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
+
+		
+	       //Insert into vtiger_organizationdetails vtiger_table 
+	       $this->db->query("insert into vtiger_organizationdetails(organizationame,address,city,state,country,code,phone,fax,website,logoname) values ('vtiger',' 40-41-42, Sivasundar Apartments, Flat D-II, Shastri Street, Velachery','Chennai','Tamil Nadu','India','600 042','+91-44-5202-1990','+91-44-5202-1990','www.vtiger.com','vtiger-crm-logo.jpg')");
+
+  //Insert into vtiger_inventory_tandc vtiger_table
+               $this->db->query("insert into vtiger_inventory_tandc values('".$this->db->getUniqueID('inventory_tandc')."','Inventory','')");
+
+	$this->db->query("insert into vtiger_actionmapping values(0,'Save',0)");
+	$this->db->query("insert into vtiger_actionmapping values(1,'EditView',0)");
+	$this->db->query("insert into vtiger_actionmapping values(2,'Delete',0)");
+	$this->db->query("insert into vtiger_actionmapping values(3,'index',0)");
+	$this->db->query("insert into vtiger_actionmapping values(4,'DetailView',0)");
+	$this->db->query("insert into vtiger_actionmapping values(5,'Import',0)");
+	$this->db->query("insert into vtiger_actionmapping values(6,'Export',0)");
+	//$this->db->query("insert into vtiger_actionmapping values(7,'AddBusinessCard',0)");
+	$this->db->query("insert into vtiger_actionmapping values(8,'Merge',0)");
+	$this->db->query("insert into vtiger_actionmapping values(1,'VendorEditView',1)");
+	$this->db->query("insert into vtiger_actionmapping values(4,'VendorDetailView',1)");
+	$this->db->query("insert into vtiger_actionmapping values(0,'SaveVendor',1)");
+	$this->db->query("insert into vtiger_actionmapping values(2,'DeleteVendor',1)");
+	$this->db->query("insert into vtiger_actionmapping values(1,'PriceBookEditView',1)");
+	$this->db->query("insert into vtiger_actionmapping values(4,'PriceBookDetailView',1)");
+	$this->db->query("insert into vtiger_actionmapping values(0,'SavePriceBook',1)");
+	$this->db->query("insert into vtiger_actionmapping values(2,'DeletePriceBook',1)");
+	$this->db->query("insert into vtiger_actionmapping values(9,'ConvertLead',0)");
+	$this->db->query("insert into vtiger_actionmapping values(1,'DetailViewAjax',1)");
+	$this->db->query("insert into vtiger_actionmapping values(4,'TagCloud',1)");
+	$this->db->query("insert into vtiger_actionmapping values(1,'QuickCreate',1)");
+	$this->db->query("insert into vtiger_actionmapping values(3,'Popup',1)");
+
+	//Insert values for vtiger_moduleowners vtiger_table which contains the modules and their vtiger_users. default user id admin - after 4.2 patch 2
+	$module_array = Array('Potentials','Contacts','Accounts','Leads','Notes','Activities','Emails','HelpDesk','Products','Faq','Vendors','PriceBooks','Quotes','PurchaseOrder','SalesOrder','Invoice','Reports','Campaigns');
+	foreach($module_array as $mod)
+	{
+		$this->db->query("insert into vtiger_moduleowners values(".getTabid($mod).",1)");
+	}
+	//added by jeri for category view from db
+	$this->db->query("insert into vtiger_parenttab values (1,'My Home Page',1,0)");
+	$this->db->query("insert into vtiger_parenttab values (2,'Marketing',2,0)");
+	$this->db->query("insert into vtiger_parenttab values (3,'Sales',3,0)");
+	$this->db->query("insert into vtiger_parenttab values (4,'Support',4,0)");
+	$this->db->query("insert into vtiger_parenttab values (5,'Analytics',5,0)");
+	$this->db->query("insert into vtiger_parenttab values (6,'Inventory',6,0)");
+	$this->db->query("insert into vtiger_parenttab values (7,'Tools',7,0)");
+	$this->db->query("insert into vtiger_parenttab values (8,'Settings',8,0)");
+
+	$this->db->query("insert into vtiger_parenttabrel values (1,9,2)");
+	$this->db->query("insert into vtiger_parenttabrel values (1,17,3)");
+	$this->db->query("insert into vtiger_parenttabrel values (1,10,4)");
+	$this->db->query("insert into vtiger_parenttabrel values (1,3,1)");
+	$this->db->query("insert into vtiger_parenttabrel values (3,7,1)");
+	$this->db->query("insert into vtiger_parenttabrel values (3,6,2)");
+	$this->db->query("insert into vtiger_parenttabrel values (3,4,3)");
+	$this->db->query("insert into vtiger_parenttabrel values (3,2,4)");
+	$this->db->query("insert into vtiger_parenttabrel values (3,20,5)");
+	$this->db->query("insert into vtiger_parenttabrel values (3,22,6)");
+	$this->db->query("insert into vtiger_parenttabrel values (3,23,7)");
+	$this->db->query("insert into vtiger_parenttabrel values (3,14,8)");
+	$this->db->query("insert into vtiger_parenttabrel values (3,19,9)");
+	$this->db->query("insert into vtiger_parenttabrel values (3,8,10)");
+	$this->db->query("insert into vtiger_parenttabrel values (4,13,1)");
+	$this->db->query("insert into vtiger_parenttabrel values (4,15,2)");
+	$this->db->query("insert into vtiger_parenttabrel values (4,6,3)");
+	$this->db->query("insert into vtiger_parenttabrel values (4,4,4)");
+	$this->db->query("insert into vtiger_parenttabrel values (4,14,5)");
+	$this->db->query("insert into vtiger_parenttabrel values (4,8,6)");
+	$this->db->query("insert into vtiger_parenttabrel values (5,1,1)");
+	$this->db->query("insert into vtiger_parenttabrel values (5,25,2)");
+	$this->db->query("insert into vtiger_parenttabrel values (6,14,1)");
+	$this->db->query("insert into vtiger_parenttabrel values (6,18,2)");
+	$this->db->query("insert into vtiger_parenttabrel values (6,19,3)");
+	$this->db->query("insert into vtiger_parenttabrel values (6,21,4)");
+	$this->db->query("insert into vtiger_parenttabrel values (6,22,5)");
+	$this->db->query("insert into vtiger_parenttabrel values (6,20,6)");
+	$this->db->query("insert into vtiger_parenttabrel values (6,23,7)");
+	$this->db->query("insert into vtiger_parenttabrel values (7,24,1)");
+	$this->db->query("insert into vtiger_parenttabrel values (7,27,2)");
+	$this->db->query("insert into vtiger_parenttabrel values (7,8,3)");
+	$this->db->query("insert into vtiger_parenttabrel values (2,26,1)");
+	$this->db->query("insert into vtiger_parenttabrel values (2,6,2)");
+	$this->db->query("insert into vtiger_parenttabrel values (2,4,3)");
+	$this->db->query("insert into vtiger_parenttabrel values (2,10,4)");
+	$this->db->query("insert into vtiger_parenttabrel values (4,10,7)");
+
+	//Added to populate the default inventory tax informations
+	$this->db->query("insert into vtiger_inventorytaxinfo values(".$this->db->getUniqueID("inventorytaxinfo").",'VAT','4.5')");
+	$this->db->query("insert into vtiger_inventorytaxinfo values(".$this->db->getUniqueID("inventorytaxinfo").",'Sales','10')");
+	$this->db->query("insert into vtiger_inventorytaxinfo values(".$this->db->getUniqueID("inventorytaxinfo").",'Service','12.5')");
+	
+	}
+}
+?>

Modified: vtigercrm/trunk/modules/Users/Delete.php
==============================================================================
--- vtigercrm/trunk/modules/Users/Delete.php (original)
+++ vtigercrm/trunk/modules/Users/Delete.php Mon Jun 12 14:26:25 2006
@@ -10,7 +10,7 @@
  ********************************************************************************/
 
 
-$sql= 'delete from salesmanactivityrel where smid='.$_REQUEST['record'].' and activityid = '.$_REQUEST['return_id'];
+$sql= 'delete from vtiger_salesmanactivityrel where smid='.$_REQUEST['record'].' and vtiger_activityid = '.$_REQUEST['return_id'];
 $adb->query($sql);
 
 if($_REQUEST['return_module'] == 'Activities')

Modified: vtigercrm/trunk/modules/Users/DeleteGroup.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DeleteGroup.php (original)
+++ vtigercrm/trunk/modules/Users/DeleteGroup.php Mon Jun 12 14:26:25 2006
@@ -13,7 +13,7 @@
 global $adb;
 $del_id =  $_REQUEST['groupId'];
 
-//Updating the user2 role table
+//Updating the user2 vtiger_role vtiger_table
 deleteGroup($del_id);
 
 header("Location: index.php?action=listgroups&module=Users&parenttab=Settings");

Modified: vtigercrm/trunk/modules/Users/DeleteUser.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DeleteUser.php (original)
+++ vtigercrm/trunk/modules/Users/DeleteUser.php Mon Jun 12 14:26:25 2006
@@ -13,46 +13,46 @@
 $del_id =  $_REQUEST['delete_user_id'];
 $tran_id = $_REQUEST['transfer_user_id'];
 
-//Updating the smcreatorid,smownerid, modifiedby in crmentity
-$sql1 = "update crmentity set smcreatorid=".$tran_id." where smcreatorid=".$del_id;
+//Updating the smcreatorid,smownerid, modifiedby in vtiger_crmentity
+$sql1 = "update vtiger_crmentity set smcreatorid=".$tran_id." where smcreatorid=".$del_id;
 $adb->query($sql1);
-$sql2 = "update crmentity set smownerid=".$tran_id." where smownerid=".$del_id;
+$sql2 = "update vtiger_crmentity set smownerid=".$tran_id." where smownerid=".$del_id;
 $adb->query($sql2);
-$sql3 = "update crmentity set modifiedby=".$tran_id." where modifiedby=".$del_id;
+$sql3 = "update vtiger_crmentity set modifiedby=".$tran_id." where modifiedby=".$del_id;
 $adb->query($sql3);
 
-//deleting from tracker
-$sql4 = "delete from tracker where user_id='".$del_id."'";
+//deleting from vtiger_tracker
+$sql4 = "delete from vtiger_tracker where user_id='".$del_id."'";
 $adb->query($sql4);
 
-//updating created by in lar table
-$sql5 = "update lar set createdby=".$tran_id." where createdby=".$del_id;
+//updating created by in vtiger_lar vtiger_table
+$sql5 = "update vtiger_lar set createdby=".$tran_id." where createdby=".$del_id;
 $adb->query($sql5);
 
-//updating the import_maps table
-$sql6 ="update import_maps set assigned_user_id='".$tran_id."' where assigned_user_id='".$del_id."'";
+//updating the vtiger_import_maps vtiger_table
+$sql6 ="update vtiger_import_maps set assigned_user_id='".$tran_id."' where assigned_user_id='".$del_id."'";
 $adb->query($sql6);
 
-//update assigned_user_id in files
-$sql7 ="update files set assigned_user_id='".$tran_id."' where assigned_user_id='".$del_id."'";
+//update assigned_user_id in vtiger_files
+$sql7 ="update vtiger_files set assigned_user_id='".$tran_id."' where assigned_user_id='".$del_id."'";
 $adb->query($sql7); 
 
 
-//update assigned_user_id in users_last_import
-$sql8 = "update users_last_import set assigned_user_id='".$tran_id."' where assigned_user_id='".$del_id."'";
+//update assigned_user_id in vtiger_users_last_import
+$sql8 = "update vtiger_users_last_import set assigned_user_id='".$tran_id."' where assigned_user_id='".$del_id."'";
 $adb->query($sql8);
 
-//delete from users to group table
-$sql9 = "delete from user2role where userid=".$del_id;
+//delete from vtiger_users to group vtiger_table
+$sql9 = "delete from vtiger_user2role where userid=".$del_id;
 $adb->query($sql9);
 
-//delete from users to role table
-$sql9 = "delete from users2group where userid=".$del_id;
+//delete from vtiger_users to vtiger_role vtiger_table
+$sql9 = "delete from vtiger_users2group where userid=".$del_id;
 $adb->query($sql9);
 
 
-//delete from user table;
-$sql9 = "delete from users where id=".$del_id;
+//delete from user vtiger_table;
+$sql9 = "delete from vtiger_users where id=".$del_id;
 $adb->query($sql9);
 header("Location: index.php?action=UsersAjax&module=Users&file=ListView&ajax=true");
 ?>

Modified: vtigercrm/trunk/modules/Users/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DetailView.php (original)
+++ vtigercrm/trunk/modules/Users/DetailView.php Mon Jun 12 14:26:25 2006
@@ -86,7 +86,7 @@
 $rolename =  getRoleName($role);
 $currencyid=fetchCurrency($focus->id);
 $currency=getCurrencyName($currencyid);
-//the user might belong to multiple groups
+//the user might belong to multiple vtiger_groups
 if($focus->id != 1)
 {
  $groupids = fetchUserGroupids($focus->id);
@@ -180,7 +180,7 @@
 	$buttons = "<input title='".$app_strings['LBL_DUPLICATE_BUTTON_TITLE']."' accessKey='".$app_strings['LBL_DUPLICATE_BUTTON_KEY']."' class='classBtn' onclick=\"this.form.return_module.value='Users'; this.form.return_action.value='DetailView'; this.form.isDuplicate.value=true; this.form.return_id.value='".$_REQUEST['record']."';this.form.action.value='EditView'\" type='submit' name='Duplicate' value=' ".$app_strings['LBL_DUPLICATE_BUTTON_LABEL']."'   >";
 	$smarty->assign('DUPLICATE_BUTTON',$buttons);
 	
-	//done so that only the admin user can see the customize tab button
+	//done so that only the admin user can see the customize vtiger_tab button
 	if($_REQUEST['record'] == $current_user->id)
 	{
 		$buttons = "<input title='".$app_strings['LBL_TABCUSTOMISE_BUTTON_TITLE']."' accessKey='".$app_strings['LBL_TABCUSTOMISE_BUTTON_KEY']."' class='classBtn' onclick=\"this.form.return_module.value='Users'; this.form.return_action.value='TabCustomise'; this.form.action.value='TabCustomise'\" type='submit' name='Customise' value=' ".$app_strings['LBL_TABCUSTOMISE_BUTTON_LABEL']." '>";
@@ -221,7 +221,7 @@
 //Getting the Group Lists
 $groupids = fetchUserGroupids($focus->id);
 if($groupids) {
-	$query ="select groupid,groupname from groups where groupid in (".$groupids.")";
+	$query ="select groupid,groupname from vtiger_groups where groupid in (".$groupids.")";
 	$result = $adb->query($query);
 	$num_rows = $adb->num_rows($result);
 } else {

Modified: vtigercrm/trunk/modules/Users/EditHomeOrder.php
==============================================================================
--- vtigercrm/trunk/modules/Users/EditHomeOrder.php (original)
+++ vtigercrm/trunk/modules/Users/EditHomeOrder.php Mon Jun 12 14:26:25 2006
@@ -35,7 +35,7 @@
 $record = $_REQUEST['record'];
 
 global $adb;
-$query = "SELECT users.homeorder FROM users WHERE id=$record";
+$query = "SELECT vtiger_users.homeorder FROM vtiger_users WHERE id=$record";
 $result =& $adb->query($query, false,"Error getting home order");
 $row = $adb->fetchByAssoc($result);
 
@@ -80,7 +80,7 @@
 	global $record,$log,$adb;
 	
 	$home_section_order = implode(",",$data['block']);
-	$sql = "UPDATE users SET homeorder='$home_section_order' WHERE id=$record";
+	$sql = "UPDATE vtiger_users SET homeorder='$home_section_order' WHERE id=$record";
 	$log->debug("Updating user $record with SQL=$sql");
 	$result =& $adb->query($sql, false,"Error getting home order");
     return $result;

Modified: vtigercrm/trunk/modules/Users/EditInventoryNotification.php
==============================================================================
--- vtigercrm/trunk/modules/Users/EditInventoryNotification.php (original)
+++ vtigercrm/trunk/modules/Users/EditInventoryNotification.php Mon Jun 12 14:26:25 2006
@@ -24,7 +24,7 @@
 if(isset($_REQUEST['record']) && $_REQUEST['record']!='') 
 {
     $id = $_REQUEST['record'];
-	$sql="select * from inventorynotification where notificationid = ".$id;
+	$sql="select * from vtiger_inventorynotification where notificationid = ".$id;
 	$result = $adb->query($sql);
 	if($adb->num_rows($result) ==1);
 	{

Modified: vtigercrm/trunk/modules/Users/EditNotification.php
==============================================================================
--- vtigercrm/trunk/modules/Users/EditNotification.php (original)
+++ vtigercrm/trunk/modules/Users/EditNotification.php Mon Jun 12 14:26:25 2006
@@ -25,7 +25,7 @@
 {
     $id = $_REQUEST['record'];
 	
-	$sql="select * from notificationscheduler where schedulednotificationid = ".$id;
+	$sql="select * from vtiger_notificationscheduler where schedulednotificationid = ".$id;
 	$result = $adb->query($sql);
 	if($adb->num_rows($result) ==1);
 	{

Modified: vtigercrm/trunk/modules/Users/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/Users/EditView.php (original)
+++ vtigercrm/trunk/modules/Users/EditView.php Mon Jun 12 14:26:25 2006
@@ -45,9 +45,9 @@
 	$mode='create';
 	$password='<tr>
 	   		   <td width="20%" class="dataLabel"><FONT class="required">*</FONT>Password</td>
-		       <td width="30%"><input name="new_password" type="password" tabindex="1" size="25" maxlength="25"></td>
+		       <td width="30%"><input name="new_password" type="password" vtiger_tabindex="1" size="25" maxlength="25"></td>
 			   <td width="20%" class="dataLabel"><FONT class="required">*</FONT>Confirm Password</td>
-			   <td width="30%"><input name="confirm_new_password" type="password" tabindex="2" size="25" maxlength="75"></td>
+			   <td width="30%"><input name="confirm_new_password" type="password" vtiger_tabindex="2" size="25" maxlength="75"></td>
 			  </tr>';
 }
 
@@ -57,9 +57,9 @@
 	$mode='create';
 	$password='<tr>
 	   		   <td width="20%" class="dataLabel"><FONT class="required">*</FONT>Password</td>
-		       <td width="30%"><input name="new_password" type="password" tabindex="1" size="25" maxlength="25"></td>
+		       <td width="30%"><input name="new_password" type="password" vtiger_tabindex="1" size="25" maxlength="25"></td>
 			   <td width="20%" class="dataLabel"><FONT class="required">*</FONT>Confirm Password</td>
-			   <td width="30%"><input name="confirm_new_password" type="password" tabindex="2" size="25" maxlength="75"></td>
+			   <td width="30%"><input name="confirm_new_password" type="password" vtiger_tabindex="2" size="25" maxlength="75"></td>
 			  </tr>';
 }
 
@@ -159,7 +159,7 @@
 $smarty->assign("DATE_FORMAT", $DATE_FORMAT_SELECT_OPTION);
 
 if (is_admin($current_user)) {
-	$status = "<td width='30%'>&nbsp;&nbsp;<select name='status' tabindex='1'";
+	$status = "<td width='30%'>&nbsp;&nbsp;<select name='status' vtiger_tabindex='1'";
 	if (isset($default_user_name)
 		&& $default_user_name != ""
 		&& $default_user_name == $focus->user_name
@@ -175,7 +175,7 @@
 }
 else
 {
-		$status = "<td width='30%'>&nbsp;&nbsp;<select name='status' tabindex='1' disabled>";
+		$status = "<td width='30%'>&nbsp;&nbsp;<select name='status' vtiger_tabindex='1' disabled>";
 		$status .= get_select_options_with_id($app_list_strings['user_status_dom'], $focus->status);
 		$status .= "</select></td>\n";
 		$smarty->assign("USER_STATUS_OPTIONS", $status);
@@ -210,15 +210,15 @@
 		$GROUP_SELECT_OPTION .= '<option value="">--None--</option>';
 		if($focus->id) {
 			$sql = "SELECT groupname
-				FROM users2group
-				INNER JOIN groups
-					ON groups.groupid = users2group.groupid
+				FROM vtiger_users2group
+				INNER JOIN vtiger_groups
+					ON vtiger_groups.groupid = vtiger_users2group.groupid
 				WHERE userid = '" .$focus->id ."'";
 			$result = $adb->query($sql);
 			$groupnameArray = $adb->fetch_array($result);
 		}
 		$groupselected = $groupnameArray["groupname"];
-		$sql2 = "SELECT groupname FROM groups";
+		$sql2 = "SELECT groupname FROM vtiger_groups";
                   $result_name = $adb->query($sql2);
                   $temprow = $adb->fetch_array($result_name);
                    do

Modified: vtigercrm/trunk/modules/Users/Forms.php
==============================================================================
--- vtigercrm/trunk/modules/Users/Forms.php (original)
+++ vtigercrm/trunk/modules/Users/Forms.php Mon Jun 12 14:26:25 2006
@@ -15,7 +15,7 @@
 /*********************************************************************************
  * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Users/Forms.php,v 1.3 2004/11/08 13:48:29 jack Exp $
  * Description:  Contains a variety of utility functions used to display UI
- * components such as form headers and footers.  Intended to be modified on a per
+ * components such as form vtiger_headers and footers.  Intended to be modified on a per
  * theme basis.
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
  * All Rights Reserved.
@@ -96,7 +96,7 @@
 		set_fieldfocus(errorMessage,form.email1);
 	}
 	if (trim(form.email2.value) != "" && !/^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,4})+$/.test(form.email2.value)) {
-		errorMessage='"' + form.email2.value + '" value in other email field is $err_invalid_email_address';
+		errorMessage='"' + form.email2.value + '" value in other email vtiger_field is $err_invalid_email_address';
 		set_fieldfocus(errorMessage,form.email2);
 	}
 	if(form.mode.value != 'edit')

Modified: vtigercrm/trunk/modules/Users/ListProfiles.php
==============================================================================
--- vtigercrm/trunk/modules/Users/ListProfiles.php (original)
+++ vtigercrm/trunk/modules/Users/ListProfiles.php Mon Jun 12 14:26:25 2006
@@ -24,7 +24,7 @@
 require_once($theme_path.'layout_utils.php');
 
 $smarty = new vtigerCRM_Smarty;
-$sql = "select * from profile";
+$sql = "select * from vtiger_profile";
 $profileListResult = $adb->query($sql);
 $noofrows = $adb->num_rows($profileListResult);
 $list_entries = array($mod_strings['LBL_OERATION'],$mod_strings['LBL_NEW_PROFILE_NAME'],$mod_strings['LBL_DESCRIPTION']);

Modified: vtigercrm/trunk/modules/Users/Listhistory.php
==============================================================================
--- vtigercrm/trunk/modules/Users/Listhistory.php (original)
+++ vtigercrm/trunk/modules/Users/Listhistory.php Mon Jun 12 14:26:25 2006
@@ -19,7 +19,7 @@
 
 
 
-	$dbQuery = "SELECT * from loginhistory order by login_id DESC";
+	$dbQuery = "SELECT * from vtiger_loginhistory order by login_id DESC";
 
 	//echo $dbQuery;
 

Modified: vtigercrm/trunk/modules/Users/Login.php
==============================================================================
--- vtigercrm/trunk/modules/Users/Login.php (original)
+++ vtigercrm/trunk/modules/Users/Login.php Mon Jun 12 14:26:25 2006
@@ -111,11 +111,11 @@
 													<li>Sexier Dashboards,Reports,Calendar</li>	 		
 													<li>Migration Support</li><br>	
 															How is 'vtiger-experience' ? <br>	
-													<li><a href='http://blogs.vtiger.com' tabindex="6">vtiger blogs </a></li>
-													<li><a href='http://www.bloglines.com' tabindex="7">bloglines </a></li>
-													<li><a href='http://technorati.com/' tabindex="8">technorati</a></li>
-													<li><a href='http://digg.com/' tabindex="9">digg</a></li>
-													<li><a href='http://www.blogger.com' tabindex="10">blogger</a></li>
+													<li><a href='http://blogs.vtiger.com' vtiger_tabindex="6">vtiger blogs </a></li>
+													<li><a href='http://www.bloglines.com' vtiger_tabindex="7">bloglines </a></li>
+													<li><a href='http://technorati.com/' vtiger_tabindex="8">technorati</a></li>
+													<li><a href='http://digg.com/' vtiger_tabindex="9">digg</a></li>
+													<li><a href='http://www.blogger.com' vtiger_tabindex="10">blogger</a></li>
 										</div>
 							</td>
 							<td valign="top"><br>
@@ -181,7 +181,7 @@
 																						<?php echo $current_module_strings['LBL_USER_NAME'] ?>
 																				</td>
 																				<td class="small">
-																						<input class="textbox" type="text"  name="user_name"   value="<?php echo $login_user_name ?>" tabindex="1">
+																						<input class="textbox" type="text"  name="user_name"   value="<?php echo $login_user_name ?>" vtiger_tabindex="1">
 																				</td>
 																	</tr>
 																	<tr>
@@ -189,7 +189,7 @@
 																							<?php echo $current_module_strings['LBL_PASSWORD'] ?>
 																				</td>
 																				<td class="small">
-																							<input class="textbox" type="password" size='20' name="user_password"  value="<?php echo $login_password ?>" tabindex="2">
+																							<input class="textbox" type="password" size='20' name="user_password"  value="<?php echo $login_password ?>" vtiger_tabindex="2">
 																				</td>
 																	</tr>
 																	<tr>
@@ -197,7 +197,7 @@
 																						<?php echo $current_module_strings['LBL_THEME'] ?>
 																				</td>
 																				<td class="small" style="background-color:#f5f5f5">
-																							<select class='small' name='login_theme' style="width:120px;" tabindex="3">
+																							<select class='small' name='login_theme' style="width:120px;" vtiger_tabindex="3">
 																									<?php echo get_select_options_with_id(get_themes(), $display_theme) ?>
 																							</select>
 																				</td>
@@ -207,7 +207,7 @@
 																							<?php echo $current_module_strings['LBL_LANGUAGE'] ?>
 																				</td>
 																				<td class="small" style="background-color:#f5f5f5">
-																							<select class='small' name='login_language' style="width:120px;" tabindex="4">
+																							<select class='small' name='login_language' style="width:120px;" vtiger_tabindex="4">
 																										<?php echo get_select_options_with_id(get_languages(), $display_language) ?>
 																								</select>
 																				  </td>
@@ -215,7 +215,7 @@
 																	<tr>
 																			<td></td>
 																			<td>
-																				<input class=small title="<?php echo $current_module_strings['LBL_LOGIN_BUTTON_TITLE'] ?>" accesskey="<?php echo $current_module_strings['LBL_LOGIN_BUTTON_TITLE'] ?>"  type="image" src="include/images/loginBtnSignin.gif" name="Login" value="  <?php echo $current_module_strings['LBL_LOGIN_BUTTON_LABEL'] ?>  "  tabindex="5">
+																				<input class=small title="<?php echo $current_module_strings['LBL_LOGIN_BUTTON_TITLE'] ?>" accesskey="<?php echo $current_module_strings['LBL_LOGIN_BUTTON_TITLE'] ?>"  type="image" src="include/images/loginBtnSignin.gif" name="Login" value="  <?php echo $current_module_strings['LBL_LOGIN_BUTTON_LABEL'] ?>  "  vtiger_tabindex="5">
 																				
 																			 </td>
 																	  </tr>

Modified: vtigercrm/trunk/modules/Users/LoginHistory.php
==============================================================================
--- vtigercrm/trunk/modules/Users/LoginHistory.php (original)
+++ vtigercrm/trunk/modules/Users/LoginHistory.php Mon Jun 12 14:26:25 2006
@@ -22,7 +22,7 @@
 	var $log;
 	var $db;
 
-	// Stored fields
+	// Stored vtiger_fields
 	var $login_id;
 	var $user_name;
 	var $user_ip;
@@ -51,7 +51,7 @@
 		$this->db = new PearDatabase();
 	}
 	
-	// This is the list of fields that are in the lists.
+	// This is the list of vtiger_fields that are in the lists.
 	var $list_fields = Array('login_id', 'user_name', 'user_ip', 'login_time', 'logout_time', 'status');	
 		
 	var $default_order_by = "login_id";
@@ -60,7 +60,7 @@
 	/** Records the Login info */
 	function user_login(&$usname,&$usip,&$intime)
 	{
-		$query = "Insert into loginhistory (user_name, user_ip, logout_time, login_time, status) values ('$usname','$usip',null,".$this->db->formatDate($intime).",'Signedin')";
+		$query = "Insert into vtiger_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());
 		
@@ -69,7 +69,7 @@
 	
 	function user_logout(&$usname,&$usip,&$outtime)
 	{
-		$logid_qry = "SELECT max(login_id) AS login_id from loginhistory where user_name='$usname' and user_ip='$usip'";
+		$logid_qry = "SELECT max(login_id) AS login_id from vtiger_loginhistory where user_name='$usname' and user_ip='$usip'";
 		$result = $this->db->query($logid_qry);
 		$loginid = $this->db->query_result($result,0,"login_id");
 		if ($loginid == '')
@@ -77,14 +77,14 @@
                         return;
                 }
 		// update the user login info.
-		$query = "Update loginhistory set logout_time =".$this->db->formatDate($outtime).", status='Signedoff' where login_id = $loginid";
+		$query = "Update vtiger_loginhistory set logout_time =".$this->db->formatDate($outtime).", status='Signedoff' where login_id = $loginid";
 		$result = $this->db->query($query)
                         or die("MySQL error: ".mysql_error());
 	}
 
   	function create_list_query(&$order_by, &$where)
   	{
-		// Determine if the account name is present in the where clause.
+		// Determine if the vtiger_account name is present in the where clause.
 		global $current_user;
 		$query = "SELECT user_name,user_ip, status,
 				".$this->db->getDBDateString("login_time")." AS login_time,

Modified: vtigercrm/trunk/modules/Users/Logout.php
==============================================================================
--- vtigercrm/trunk/modules/Users/Logout.php (original)
+++ vtigercrm/trunk/modules/Users/Logout.php Mon Jun 12 14:26:25 2006
@@ -30,7 +30,7 @@
 $ftpuser = '';
 $ftppassword = '';
 global $adb;
-$query = "select * from systems where server_type='backup'";
+$query = "select * from vtiger_systems where server_type='backup'";
 $result = $adb->query($query);
 $num_rows = $adb->num_rows($result);
 if($num_rows > 0)

Modified: vtigercrm/trunk/modules/Users/OrgSharingDetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Users/OrgSharingDetailView.php (original)
+++ vtigercrm/trunk/modules/Users/OrgSharingDetailView.php Mon Jun 12 14:26:25 2006
@@ -95,7 +95,7 @@
 	{
 
 		$colNameArr=explode("::",$colName);
-		$query = "select ".$table_name.".* from ".$table_name." inner join datashare_module_rel on ".$table_name.".shareid=datashare_module_rel.shareid where datashare_module_rel.tabid=".$tabid;
+		$query = "select ".$table_name.".* from ".$table_name." inner join vtiger_datashare_module_rel on ".$table_name.".shareid=vtiger_datashare_module_rel.shareid where vtiger_datashare_module_rel.tabid=".$tabid;
 		$result=$adb->query($query);
 		$num_rows=$adb->num_rows($result);
 

Modified: vtigercrm/trunk/modules/Users/OrganizationTermsandConditions.php
==============================================================================
--- vtigercrm/trunk/modules/Users/OrganizationTermsandConditions.php (original)
+++ vtigercrm/trunk/modules/Users/OrganizationTermsandConditions.php Mon Jun 12 14:26:25 2006
@@ -24,7 +24,7 @@
 require_once($theme_path.'layout_utils.php');
 
 $smarty = new vtigerCRM_Smarty;
-$sql="select * from inventory_tandc";
+$sql="select * from vtiger_inventory_tandc";
 $result = $adb->query($sql);
 $inventory_id = $adb->query_result($result,0,'id');
 $inventory_type = $adb->query_result($result,0,'type');

Modified: vtigercrm/trunk/modules/Users/ProfileDeleteStep1.php
==============================================================================
--- vtigercrm/trunk/modules/Users/ProfileDeleteStep1.php (original)
+++ vtigercrm/trunk/modules/Users/ProfileDeleteStep1.php Mon Jun 12 14:26:25 2006
@@ -44,7 +44,7 @@
 	<td align="left">';
 	$output.='<select class="select" name="transfer_prof_id">';
 	global $adb;	
-	$sql = "select * from profile";
+	$sql = "select * from vtiger_profile";
 	$result = $adb->query($sql);
 	$temprow = $adb->fetch_array($result);
 	do

Modified: vtigercrm/trunk/modules/Users/RoleDetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Users/RoleDetailView.php (original)
+++ vtigercrm/trunk/modules/Users/RoleDetailView.php Mon Jun 12 14:26:25 2006
@@ -32,9 +32,9 @@
 //Standard PickList Fields
 function getStdOutput($roleid)
 {
-	//Retreiving the related profiles
+	//Retreiving the related vtiger_profiles
 	$roleProfileArr=getRoleRelatedProfiles($roleid);
-	//Retreving the related users
+	//Retreving the related vtiger_users
 	$roleUserArr=getRoleUsers($roleid);
 
 	//Constructing the Profile list

Modified: vtigercrm/trunk/modules/Users/RoleDragDrop.php
==============================================================================
--- vtigercrm/trunk/modules/Users/RoleDragDrop.php (original)
+++ vtigercrm/trunk/modules/Users/RoleDragDrop.php Mon Jun 12 14:26:25 2006
@@ -15,7 +15,7 @@
 
 
 global $adb;
-$query = "select * from role where roleid='".$toid."'";
+$query = "select * from vtiger_role where vtiger_roleid='".$toid."'";
 $result=$adb->query($query);
 $parentRoleList=$adb->query_result($result,0,'parentrole');
 $replace_with=$parentRoleList;
@@ -50,7 +50,7 @@
 	$mvParString=$replace_with.$subPar[1];
 	$subDepth=$mvRoleInfo[2];
 	$mvDepth=$orgDepth+(($subDepth-$stdDepth)+1);
-	$query="update role set parentrole='".$mvParString."',depth=".$mvDepth." where roleid='".$mvRoleId."'";
+	$query="update vtiger_role set parentrole='".$mvParString."',depth=".$mvDepth." where vtiger_roleid='".$mvRoleId."'";
 	//echo $query;
 	$adb->query($query);
 		

Modified: vtigercrm/trunk/modules/Users/RolePopup.php
==============================================================================
--- vtigercrm/trunk/modules/Users/RolePopup.php (original)
+++ vtigercrm/trunk/modules/Users/RolePopup.php Mon Jun 12 14:26:25 2006
@@ -28,7 +28,7 @@
 
 
 //Retreiving the hierarchy
-$hquery = "select * from role order by parentrole asc";
+$hquery = "select * from vtiger_role order by parentrole asc";
 $hr_res = $adb->query($hquery);
 $num_rows = $adb->num_rows($hr_res);
 $hrarray= Array();
@@ -79,7 +79,7 @@
 }
 //Constructing the Roledetails array
 $role_det = getAllRoleDetails();
-$query = "select * from role";
+$query = "select * from vtiger_role";
 $result = $adb->query($query);
 $num_rows=$adb->num_rows($result);
 $mask_roleid='';
@@ -95,7 +95,7 @@
 	foreach($hrarray as $roleid => $value)
 	{
 	
-		//retreiving the role details
+		//retreiving the vtiger_role details
 		$role_det_arr=$role_det[$roleid];
 		$roleid_arr=$role_det_arr[2];
 		$rolename = $role_det_arr[0];

Modified: vtigercrm/trunk/modules/Users/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Users/Save.php (original)
+++ vtigercrm/trunk/modules/Users/Save.php Mon Jun 12 14:26:25 2006
@@ -29,7 +29,7 @@
 $user_name = $_REQUEST['userName'];
 if(isset($_REQUEST['dup_check']) && $_REQUEST['dup_check'] != '')
 {
-        $query = "SELECT user_name FROM users WHERE user_name ='".$user_name."'";
+        $query = "SELECT user_name FROM vtiger_users WHERE user_name ='".$user_name."'";
         $result = $adb->query($query);
         if($adb->num_rows($result) > 0)
         {
@@ -90,7 +90,7 @@
 	}
 	
 	if (!isset($_POST['is_admin'])) $focus->is_admin = 'off';
-	//Code contributed by mike crowe for rearrange the home page and tab
+	//Code contributed by mike crowe for rearrange the home page and vtiger_tab
 	if (!isset($_POST['deleted'])) $focus->deleted = '0';
 	if (!isset($_POST['homeorder']) || $_POST['homeorder'] == "" ) $focus->homeorder = 'ILTI,QLTQ,ALVT,PLVT,CVLVT,HLT,OLV,GRT,OLTSO';
 	

Modified: vtigercrm/trunk/modules/Users/SaveGroup.php
==============================================================================
--- vtigercrm/trunk/modules/Users/SaveGroup.php (original)
+++ vtigercrm/trunk/modules/Users/SaveGroup.php Mon Jun 12 14:26:25 2006
@@ -20,12 +20,12 @@
 {
         if($mode != 'edit')
         {
-                $query = 'select groupname from groups where groupname="'.$groupName.'"';
+                $query = 'select groupname from vtiger_groups where groupname="'.$groupName.'"';
         }
         else
         {
                 $groupid = $_REQUEST['groupid'];
-                $query = 'select groupname from groups  where groupname="'.$groupName.'" and groupid !='.$groupid;
+                $query = 'select groupname from vtiger_groups  where groupname="'.$groupName.'" and groupid !='.$groupid;
 
         }
         $result = $adb->query($query);

Modified: vtigercrm/trunk/modules/Users/SaveInventoryNotification.php
==============================================================================
--- vtigercrm/trunk/modules/Users/SaveInventoryNotification.php (original)
+++ vtigercrm/trunk/modules/Users/SaveInventoryNotification.php Mon Jun 12 14:26:25 2006
@@ -14,7 +14,7 @@
 
 if(isset($_REQUEST['record']) && $_REQUEST['record']!='')
 {
-	$query="UPDATE inventorynotification set notificationsubject='".$_REQUEST['notifysubject']."', notificationbody='".$_REQUEST['notifybody']."' where notificationid=".$_REQUEST['record'];
+	$query="UPDATE vtiger_inventorynotification set notificationsubject='".$_REQUEST['notifysubject']."', notificationbody='".$_REQUEST['notifybody']."' where notificationid=".$_REQUEST['record'];
 	$adb->query($query);	
 }
 $loc = "Location: index.php?action=UsersAjax&file=listinventorynotifications&module=Users&directmode=ajax";

Modified: vtigercrm/trunk/modules/Users/SaveNotification.php
==============================================================================
--- vtigercrm/trunk/modules/Users/SaveNotification.php (original)
+++ vtigercrm/trunk/modules/Users/SaveNotification.php Mon Jun 12 14:26:25 2006
@@ -14,7 +14,7 @@
 
 if(isset($_REQUEST['record']) && $_REQUEST['record']!='')
 {
-	$query="UPDATE notificationscheduler set notificationsubject='".$_REQUEST['notifysubject']."', notificationbody='".$_REQUEST['notifybody']."', active =".$_REQUEST['active']." where schedulednotificationid=".$_REQUEST['record'];
+	$query="UPDATE vtiger_notificationscheduler set notificationsubject='".$_REQUEST['notifysubject']."', notificationbody='".$_REQUEST['notifybody']."', active =".$_REQUEST['active']." where schedulednotificationid=".$_REQUEST['record'];
 	$adb->query($query);	
 }
 $loc = "Location: index.php?action=UsersAjax&file=listnotificationschedulers&module=Users&directmode=ajax";

Modified: vtigercrm/trunk/modules/Users/SaveOrgSharing.php
==============================================================================
--- vtigercrm/trunk/modules/Users/SaveOrgSharing.php (original)
+++ vtigercrm/trunk/modules/Users/SaveOrgSharing.php Mon Jun 12 14:26:25 2006
@@ -12,7 +12,7 @@
 require_once('include/database/PearDatabase.php');
 global $adb;
 
-$sql2 = "select * from def_org_share where editstatus=0";
+$sql2 = "select * from vtiger_def_org_share where editstatus=0";
 $result2 = $adb->query($sql2);
 $num_rows = $adb->num_rows($result2);
 
@@ -22,19 +22,19 @@
 	$tabid=$adb->query_result($result2,$i,'tabid');
 		$reqval = $tabid.'_per';	
 		$permission=$_REQUEST[$reqval];
-		$sql7="update def_org_share set permission=".$permission." where tabid=".$tabid." and ruleid=".$ruleid;
+		$sql7="update vtiger_def_org_share set permission=".$permission." where vtiger_tabid=".$tabid." and ruleid=".$ruleid;
 		$adb->query($sql7);
 
 		if($tabid == 6)
 		{
-			$sql8="update def_org_share set permission=".$permission." where tabid=4";
+			$sql8="update vtiger_def_org_share set permission=".$permission." where vtiger_tabid=4";
 			$adb->query($sql8);
 			
 		}
 
 		if($tabid == 9)
 		{
-			$sql8="update def_org_share set permission=".$permission." where tabid=16";
+			$sql8="update vtiger_def_org_share set permission=".$permission." where vtiger_tabid=16";
 			$adb->query($sql8);
 			
 		}

Modified: vtigercrm/trunk/modules/Users/SaveProfile.php
==============================================================================
--- vtigercrm/trunk/modules/Users/SaveProfile.php (original)
+++ vtigercrm/trunk/modules/Users/SaveProfile.php Mon Jun 12 14:26:25 2006
@@ -18,24 +18,24 @@
 $def_module = $_REQUEST['selected_module'];
 $def_tab = $_REQUEST['selected_tab'];
 //Inserting values into Profile Table
-$sql1 = "insert into profile values('','".$profilename."','".$description."')";
+$sql1 = "insert into vtiger_profile values('','".$profilename."','".$description."')";
 $adb->query($sql1);
 
-        //Retreiving the profileid
-        $sql2 = "select max(profileid) as current_id from profile";
+        //Retreiving the vtiger_profileid
+        $sql2 = "select max(profileid) as current_id from vtiger_profile";
         $result2 = $adb->query($sql2);
         $profileid = $adb->query_result($result2,0,'current_id');
 
 
-//Retreiving the tabs permission array
-$tab_perr_result = $adb->query("select * from profile2tab where profileid=1");
-$act_perr_result = $adb->query("select * from profile2standardpermissions where profileid=1");
-$act_utility_result = $adb->query("select * from profile2utility where profileid=1");
+//Retreiving the vtiger_tabs permission array
+$tab_perr_result = $adb->query("select * from vtiger_profile2tab where vtiger_profileid=1");
+$act_perr_result = $adb->query("select * from vtiger_profile2standardpermissions where vtiger_profileid=1");
+$act_utility_result = $adb->query("select * from vtiger_profile2utility where vtiger_profileid=1");
 $num_tab_per = $adb->num_rows($tab_perr_result);
 $num_act_per = $adb->num_rows($act_perr_result);
 $num_act_util_per = $adb->num_rows($act_utility_result);
 
-	//Updating profile2global permissons table
+	//Updating vtiger_profile2global permissons vtiger_table
 	$view_all_req=$_REQUEST['view_all'];
 	$view_all = getPermissionValue($view_all_req);
 
@@ -43,10 +43,10 @@
 	$edit_all = getPermissionValue($edit_all_req);
 
 
-	$sql4="insert into profile2globalpermissions values(".$profileid.",1, ".$view_all.")";
+	$sql4="insert into vtiger_profile2globalpermissions values(".$profileid.",1, ".$view_all.")";
         $adb->query($sql4);
 
-	$sql4="insert into profile2globalpermissions values(".$profileid.",2, ".$edit_all.")";
+	$sql4="insert into vtiger_profile2globalpermissions values(".$profileid.",2, ".$edit_all.")";
         $adb->query($sql4);
 
 	
@@ -66,23 +66,23 @@
 			{
 				$permission_value = 1;
 			}
-			$sql4="insert into profile2tab values(".$profileid.", ".$tab_id.", ".$permission_value.")";
+			$sql4="insert into vtiger_profile2tab values(".$profileid.", ".$tab_id.", ".$permission_value.")";
                 	$adb->query($sql4);
 
 			if($tab_id ==9)
 			{
-				$sql4="insert into profile2tab values(".$profileid.",16, ".$permission_value.")";
+				$sql4="insert into vtiger_profile2tab values(".$profileid.",16, ".$permission_value.")";
                         	$adb->query($sql4);	
 			}
 		}
 		elseif($tab_id == 13)
 		{
-			$sql4="insert into profile2tab values(".$profileid.",13,0)";
+			$sql4="insert into vtiger_profile2tab values(".$profileid.",13,0)";
                         $adb->query($sql4);
 		}
 		elseif($tab_id == 15)
 		{
-			$sql4="insert into profile2tab values(".$profileid.",15,0)";
+			$sql4="insert into vtiger_profile2tab values(".$profileid.",15,0)";
                         $adb->query($sql4);
 		}
 	}
@@ -118,12 +118,12 @@
 				$permission_value = 1;
 			}
 
-			$sql7="insert into profile2standardpermissions values(".$profileid.", ".$tab_id.", ".$action_id.", ".$permission_value.")";
+			$sql7="insert into vtiger_profile2standardpermissions values(".$profileid.", ".$tab_id.", ".$action_id.", ".$permission_value.")";
                 	$adb->query($sql7);
 
 			if($tab_id ==9)
 			{
-				$sql7="insert into profile2standardpermissions values(".$profileid.", 16, ".$action_id.", ".$permission_value.")";
+				$sql7="insert into vtiger_profile2standardpermissions values(".$profileid.", 16, ".$action_id.", ".$permission_value.")";
                         	$adb->query($sql7);
 			}
 
@@ -133,7 +133,7 @@
 		elseif($tab_id == 15)
 		{
 			
-                          $sql7="insert into profile2standardpermissions values(".$profileid.", 15, ".$action_id.",0)";
+                          $sql7="insert into vtiger_profile2standardpermissions values(".$profileid.", 15, ".$action_id.",0)";
                           $adb->query($sql7);
 		}
 	}
@@ -158,7 +158,7 @@
 			$permission_value = 1;
 		}
 
-		$sql9="insert into profile2utility values(".$profileid.", ".$tab_id.", ".$action_id.", ".$permission_value.")";
+		$sql9="insert into vtiger_profile2utility values(".$profileid.", ".$tab_id.", ".$action_id.", ".$permission_value.")";
                 $adb->query($sql9);
 
 	}
@@ -185,14 +185,14 @@
 		{
 			$visible_value = 1;
 		}
-		//Updating the Mandatory fields
+		//Updating the Mandatory vtiger_fields
 		$uitype = $adb->query_result($fieldListResult,$i,"uitype");
 		if($uitype == 2 || $uitype == 51 || $uitype == 6 || $uitype == 22 || $uitype == 73 || $uitype				== 24 || $uitype == 81 || $uitype == 50 || $uitype == 23 || $uitype == 16)
 		{
 			$visible_value = 0;
 		}
 		//Updating the database
-		$sql11="insert into profile2field values(".$profileid.", ".$tab_id.", ".$fieldid.", ".$visible_value.",1)";
+		$sql11="insert into vtiger_profile2field values(".$profileid.", ".$tab_id.", ".$fieldid.", ".$visible_value.",1)";
                 $adb->query($sql11);
 	}
 }

Modified: vtigercrm/trunk/modules/Users/SaveRole.php
==============================================================================
--- vtigercrm/trunk/modules/Users/SaveRole.php (original)
+++ vtigercrm/trunk/modules/Users/SaveRole.php Mon Jun 12 14:26:25 2006
@@ -17,12 +17,12 @@
 {
 	if($mode != 'edit')
 	{
-		$query = 'select rolename from role where rolename="'.$rolename.'"';
+		$query = 'select vtiger_rolename from vtiger_role where vtiger_rolename="'.$rolename.'"';
 	}
 	else
 	{
 		$roleid=$_REQUEST['roleid'];
-		$query = 'select rolename from role where rolename="'.$rolename.'" and roleid !="'.$roleid.'"';
+		$query = 'select vtiger_rolename from vtiger_role where vtiger_rolename="'.$rolename.'" and vtiger_roleid !="'.$roleid.'"';
 
 	}
 	$result = $adb->query($query);
@@ -51,7 +51,7 @@
 {
 	$selected_col_string = 	$_REQUEST['selectedColumnsString'];
 	$profile_array = explode(';',$selected_col_string);
-	//Inserting into role Table
+	//Inserting into vtiger_role Table
 	$roleId = createRole($rolename,$parentRoleId,$profile_array);
 	 	
 }

Modified: vtigercrm/trunk/modules/Users/TabCustomise.php
==============================================================================
--- vtigercrm/trunk/modules/Users/TabCustomise.php (original)
+++ vtigercrm/trunk/modules/Users/TabCustomise.php Mon Jun 12 14:26:25 2006
@@ -154,7 +154,7 @@
 </style>
 </head>
 <?
-		$tabavail="SELECT tabid,name from tab where presence !=2";
+		$tabavail="SELECT vtiger_tabid,name from vtiger_tab where presence !=2";
 		$tabrow=$adb->query($tabavail);
 		if($adb->num_rows($tabrow) != 0)
 		{
@@ -163,7 +163,7 @@
 				$availabletab[]=$result;
 			}
 		}	
-		$tabsel="SELECT tabid,name from tab where presence=0 order by tabsequence";
+		$tabsel="SELECT vtiger_tabid,name from vtiger_tab where presence=0 order by vtiger_tabsequence";
 		$tabrow=$adb->query($tabsel);
 		if($adb->num_rows($tabrow) != 0)
 		{
@@ -342,7 +342,7 @@
                 } else if (id.indexOf("fieldlist")>=0) {//if Field List
                         if (currSelItemObj.id.indexOf("fd")<0) {
                                 itemObj.style.cursor='move'
-                                itemObj.className='tableBorder mouseover'       //Hiliting Field List only when added fields are removed
+                                itemObj.className='tableBorder mouseover'       //Hiliting Field List only when added vtiger_fields are removed
                         }
                 }
         }

Modified: vtigercrm/trunk/modules/Users/UpdateDefaultFieldLevelAccess.php
==============================================================================
--- vtigercrm/trunk/modules/Users/UpdateDefaultFieldLevelAccess.php (original)
+++ vtigercrm/trunk/modules/Users/UpdateDefaultFieldLevelAccess.php Mon Jun 12 14:26:25 2006
@@ -32,7 +32,7 @@
 		{
 			$visible_value = 1;
 		}
-		//Updating the Mandatory fields
+		//Updating the Mandatory vtiger_fields
 		$uitype = $adb->query_result($fieldListResult,$i,"uitype");
 		if($uitype == 2 || $uitype == 51 || $uitype == 6 || $uitype == 22 || $uitype == 73 || $uitype == 24 || $uitype == 81 || $uitype == 50 || $uitype == 23 || $uitype == 16)
 		{
@@ -40,7 +40,7 @@
 		}		
 
 		//Updating the database
-		$update_query = "update def_org_field set visible=".$visible_value." where fieldid='".$fieldid."' and tabid=".$tab_id;
+		$update_query = "update vtiger_def_org_field set visible=".$visible_value." where vtiger_fieldid='".$fieldid."' and vtiger_tabid=".$tab_id;
 		$adb->query($update_query);
 
 	}

Modified: vtigercrm/trunk/modules/Users/UpdateProfileChanges.php
==============================================================================
--- vtigercrm/trunk/modules/Users/UpdateProfileChanges.php (original)
+++ vtigercrm/trunk/modules/Users/UpdateProfileChanges.php Mon Jun 12 14:26:25 2006
@@ -22,24 +22,24 @@
 else
 	$return_action = 'ListProfiles';
 
-//Retreiving the tabs permission array
-$tab_perr_result = $adb->query("select * from profile2tab where profileid=".$profileid);
-$act_perr_result = $adb->query("select * from profile2standardpermissions where profileid=".$profileid);
-$act_utility_result = $adb->query("select * from profile2utility where profileid=".$profileid);
+//Retreiving the vtiger_tabs permission array
+$tab_perr_result = $adb->query("select * from vtiger_profile2tab where vtiger_profileid=".$profileid);
+$act_perr_result = $adb->query("select * from vtiger_profile2standardpermissions where vtiger_profileid=".$profileid);
+$act_utility_result = $adb->query("select * from vtiger_profile2utility where vtiger_profileid=".$profileid);
 $num_tab_per = $adb->num_rows($tab_perr_result);
 $num_act_per = $adb->num_rows($act_perr_result);
 $num_act_util_per = $adb->num_rows($act_utility_result);
 
-	//Updating profile2global permissons table
+	//Updating vtiger_profile2global permissons vtiger_table
 	$view_all_req=$_REQUEST['view_all'];
 	$view_all = getPermissionValue($view_all_req);
 
 	$edit_all_req=$_REQUEST['edit_all'];
 	$edit_all = getPermissionValue($edit_all_req);
 
-	$update_query = "update  profile2globalpermissions set globalactionpermission=".$view_all." where globalactionid=1 and profileid=".$profileid;
+	$update_query = "update  vtiger_profile2globalpermissions set globalactionpermission=".$view_all." where globalactionid=1 and vtiger_profileid=".$profileid;
 	$adb->query($update_query);
-	$update_query = "update  profile2globalpermissions set globalactionpermission=".$edit_all." where globalactionid=2 and profileid=".$profileid;
+	$update_query = "update  vtiger_profile2globalpermissions set globalactionpermission=".$edit_all." where globalactionid=2 and vtiger_profileid=".$profileid;
 	$adb->query($update_query);
 
 	
@@ -59,11 +59,11 @@
 			{
 				$permission_value = 1;
 			}
-			$update_query = "update profile2tab set permissions=".$permission_value." where tabid=".$tab_id." and profileid=".$profileid;
+			$update_query = "update vtiger_profile2tab set permissions=".$permission_value." where vtiger_tabid=".$tab_id." and vtiger_profileid=".$profileid;
 			$adb->query($update_query);
 			if($tab_id ==9)
 			{
-				$update_query = "update profile2tab set permissions=".$permission_value." where tabid=16 and profileid=".$profileid;
+				$update_query = "update vtiger_profile2tab set permissions=".$permission_value." where vtiger_tabid=16 and vtiger_profileid=".$profileid;
 				$adb->query($update_query);
 			}
 		}
@@ -99,11 +99,11 @@
 			{
 				$permission_value = 1;
 			}
-			$update_query = "update profile2standardpermissions set permissions=".$permission_value." where tabid=".$tab_id." and Operation=".$action_id." and profileid=".$profileid;
+			$update_query = "update vtiger_profile2standardpermissions set permissions=".$permission_value." where vtiger_tabid=".$tab_id." and Operation=".$action_id." and vtiger_profileid=".$profileid;
 			$adb->query($update_query);
 			if($tab_id ==9)
 			{
-				$update_query = "update profile2standardpermissions set permissions=".$permission_value." where tabid=16 and Operation=".$action_id." and profileid=".$profileid;
+				$update_query = "update vtiger_profile2standardpermissions set permissions=".$permission_value." where vtiger_tabid=16 and Operation=".$action_id." and vtiger_profileid=".$profileid;
 				$adb->query($update_query);
 			}
 
@@ -132,7 +132,7 @@
 			$permission_value = 1;
 		}
 
-		$update_query = "update profile2utility set permission=".$permission_value." where tabid=".$tab_id." and activityid=".$action_id." and profileid=".$profileid;
+		$update_query = "update vtiger_profile2utility set permission=".$permission_value." where vtiger_tabid=".$tab_id." and vtiger_activityid=".$action_id." and vtiger_profileid=".$profileid;
 
 		$adb->query($update_query);
 
@@ -160,14 +160,14 @@
 		{
 			$visible_value = 1;
 		}
-		//Updating the Mandatory fields
+		//Updating the Mandatory vtiger_fields
 		$uitype = $adb->query_result($fieldListResult,$i,"uitype");
 		if($uitype == 2 || $uitype == 51 || $uitype == 6 || $uitype == 22 || $uitype == 73 || $uitype				== 24 || $uitype == 81 || $uitype == 50 || $uitype == 23 || $uitype == 16)
 		{
 			$visible_value = 0;
 		}
 		//Updating the database
-		$update_query = "update profile2field set visible=".$visible_value." where fieldid='".$fieldid."' and profileid=".$profileid." and tabid=".$tab_id;
+		$update_query = "update vtiger_profile2field set visible=".$visible_value." where vtiger_fieldid='".$fieldid."' and vtiger_profileid=".$profileid." and vtiger_tabid=".$tab_id;
 		$adb->query($update_query);
 
 	}

Modified: vtigercrm/trunk/modules/Users/UpdateTab.php
==============================================================================
--- vtigercrm/trunk/modules/Users/UpdateTab.php (original)
+++ vtigercrm/trunk/modules/Users/UpdateTab.php Mon Jun 12 14:26:25 2006
@@ -60,12 +60,12 @@
 	$xtpl->out("user_settings");
 }
 
-$sql_set = "update tab set presence=1 where presence !=2";
+$sql_set = "update vtiger_tab set presence=1 where presence !=2";
 $adb->query($sql_set);
 $j=1;
 foreach($_POST as $name=>$value)
 {
-  $sql="update tab set presence=0,tabsequence= " . $j . " where tabid = " .$value;
+  $sql="update vtiger_tab set presence=0,tabsequence= " . $j . " where vtiger_tabid = " .$value;
   $adb->query($sql);
   $j++;
 }

Modified: vtigercrm/trunk/modules/Users/User.php
==============================================================================
--- vtigercrm/trunk/modules/Users/User.php (original)
+++ vtigercrm/trunk/modules/Users/User.php Mon Jun 12 14:26:25 2006
@@ -37,7 +37,7 @@
 class User extends SugarBean {
 	var $log;
 	var $db;
-	// Stored fields
+	// Stored vtiger_fields
 	var $id;
 	var $user_name;
 	var $user_password;
@@ -85,7 +85,7 @@
 
 	var $module_id='id';
 	
-	var $table_name = "users";
+	var $table_name = "vtiger_users";
 	var $module_name = "Users";
 
 	var $object_name = "User";
@@ -144,10 +144,10 @@
 
 	var $encodeFields = Array("first_name", "last_name", "description");
 
-	// This is used to retrieve related fields from form posts.
+	// This is used to retrieve related vtiger_fields from form posts.
 	var $additional_column_fields = Array('reports_to_name');		
 	
-	// This is the list of fields that are in the lists.
+	// This is the list of vtiger_fields that are in the lists.
 	var $list_fields = Array('id', 'first_name', 'last_name', 'user_name', 'status', 'department', 'yahoo_id', 'is_admin', 'email1', 'phone_work');
 	//commented as we get issues with sugarbean
 	/*
@@ -359,7 +359,7 @@
 		$query = "SELECT * from $this->table_name where user_name='$this->user_name'";
 		$result = $this->db->requireSingleResult($query, false);
 
-		// Get the fields for the user
+		// Get the vtiger_fields for the user
 		$row = $this->db->fetchByAssoc($result);
 
 		$user_hash = strtolower(md5($user_password));
@@ -374,7 +374,7 @@
 			$this->db->query($query, true, "Error setting new hash for {$row['user_name']}: ");	
 		}
 		
-		// now fill in the fields.
+		// now fill in the vtiger_fields.
 		foreach($this->column_fields as $field)
 		{
 			//$this->log->info($field);
@@ -453,14 +453,14 @@
 
 	function retrieve_user_id($user_name)
 	{
-		$query = "SELECT id from users where user_name='$user_name' AND deleted=0";
+		$query = "SELECT id from vtiger_users where user_name='$user_name' AND deleted=0";
 		$result  =& $this->db->query($query, false,"Error retrieving user ID: ");
 		$row = $this->db->fetchByAssoc($result);
 		return $row['id'];
 	}
 	
 	/** 
-	 * @return -- returns a list of all users in the system.
+	 * @return -- returns a list of all vtiger_users in the system.
 	 * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc..
 	 * All Rights Reserved..
 	 * Contributor(s): ______________________________________..
@@ -469,12 +469,12 @@
 	{
 		global $mod_strings;
 		
-		$query = "SELECT user_name from users where user_name='$this->user_name' AND id<>'$this->id' AND deleted=0";
+		$query = "SELECT user_name from vtiger_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);
 		
-		$query = "SELECT user_name from users where is_admin = 'on' AND deleted=0";
-		$result =$this->db->query($query, true, "Error selecting possible duplicate users: ");
+		$query = "SELECT user_name from vtiger_users where is_admin = 'on' AND deleted=0";
+		$result =$this->db->query($query, true, "Error selecting possible duplicate vtiger_users: ");
 		$last_admin = $this->db->fetchByAssoc($result);
 
 		$this->log->debug("last admin length: ".count($last_admin));
@@ -507,7 +507,7 @@
 											 "CITY","STATE","POSTALCODE","COUNTRY");	
   	return $mergeflds;
   }
-		//function added for the listview of users for 5.0 beta
+		//function added for the listview of vtiger_users for 5.0 beta
 	function getUserListViewHeader()
 	{
 		global $mod_strings;
@@ -522,9 +522,9 @@
 	    	$theme_path="themes/".$theme."/";
 	    	$image_path=$theme_path."images/";
 		if($sorder != '' && $orderby !='')
-			$list_query = ' SELECT * from users where deleted=0 order by '.$orderby.' '.$sorder; 	
+			$list_query = ' SELECT * from vtiger_users where deleted=0 order by '.$orderby.' '.$sorder; 	
 		else
-			$list_query = "SELECT * from users where deleted=0 order by ".$this->default_order_by." ".$this->default_sort_order;
+			$list_query = "SELECT * from vtiger_users where deleted=0 order by ".$this->default_order_by." ".$this->default_sort_order;
 		$result =$adb->query($list_query);
 		$entries_list = array();
 		$roleinfo = getAllRoleDetails();
@@ -569,9 +569,9 @@
 	
 	function fill_in_additional_detail_fields()
 	{
-		//$query = "SELECT u1.first_name, u1.last_name from users as u1, users as u2 where u1.id = u2.reports_to_id AND u2.id = '$this->id' and u1.deleted=0";
-		$query = "SELECT u1.first_name, u1.last_name from users u1, users u2 where u1.id = u2.reports_to_id AND u2.id = '$this->id' and u1.deleted=0";
-		$result =$this->db->query($query, true, "Error filling in additional detail fields") ;
+		//$query = "SELECT u1.first_name, u1.last_name from vtiger_users as u1, vtiger_users as u2 where u1.id = u2.reports_to_id AND u2.id = '$this->id' and u1.deleted=0";
+		$query = "SELECT u1.first_name, u1.last_name from vtiger_users u1, vtiger_users u2 where u1.id = u2.reports_to_id AND u2.id = '$this->id' and u1.deleted=0";
+		$result =$this->db->query($query, true, "Error filling in additional detail vtiger_fields") ;
 		
 		$row = $this->db->fetchByAssoc($result);
 		$this->log->debug("additional detail query results: $row");

Modified: vtigercrm/trunk/modules/Users/UserDeleteStep1.php
==============================================================================
--- vtigercrm/trunk/modules/Users/UserDeleteStep1.php (original)
+++ vtigercrm/trunk/modules/Users/UserDeleteStep1.php Mon Jun 12 14:26:25 2006
@@ -46,7 +46,7 @@
 $output.='<select class="select" name="transfer_user_id" id="transfer_user_id">';
 	     
 		 global $adb;	
-         $sql = "select * from users";
+         $sql = "select * from vtiger_users";
          $result = $adb->query($sql);
          $temprow = $adb->fetch_array($result);
          do

Modified: vtigercrm/trunk/modules/Users/UsersAjax.php
==============================================================================
--- vtigercrm/trunk/modules/Users/UsersAjax.php (original)
+++ vtigercrm/trunk/modules/Users/UsersAjax.php Mon Jun 12 14:26:25 2006
@@ -23,7 +23,7 @@
 elseif(isset($_REQUEST['announce_rss']) && ($_REQUEST['announce_rss'] != ''))
 {
 	$announcement='';
-	$sql="select * from announcement order by time";
+	$sql="select * from vtiger_announcement order by time";
 	$result=$adb->query($sql);
 	for($i=0;$i<$adb->num_rows($result);$i++)
 	{
@@ -38,12 +38,12 @@
 	$date_var = date('YmdHis');
 	$announcement = $_REQUEST['announcement'];
 	$title = $_REQUEST['title_announcement'];
-	$sql="select * from announcement where creatorid=".$current_user->id;
+	$sql="select * from vtiger_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='announcement' where creatorid=".$current_user->id;
+		$query="update vtiger_announcement set vtiger_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).",'announcement','".$date_var."')";
+		$query="insert into vtiger_announcement values (".$current_user->id.",".$adb->formatString("announcement","announcement",$announcement).",'announcement','".$date_var."')";
 	$result=$adb->query($query);
 	echo $announcement;
 }

Modified: vtigercrm/trunk/modules/Users/add2db.php
==============================================================================
--- vtigercrm/trunk/modules/Users/add2db.php (original)
+++ vtigercrm/trunk/modules/Users/add2db.php Mon Jun 12 14:26:25 2006
@@ -67,7 +67,7 @@
 		if($genQueryId != '')
 		{
 			$module = $_REQUEST['target_module'];
-			$sql = "INSERT INTO wordtemplates ";
+			$sql = "INSERT INTO vtiger_wordtemplates ";
 			$sql .= "(templateid,module,date_entered,parent_type,data,description,filename,filesize,filetype) ";
 			$sql .= "VALUES (".$genQueryId.",'".$module."',".$adb->formatString('wordtemplates','date_entered',$date_entered).",'$parent_type',".$adb->getEmptyBlob().",'$strDescription',";
 			$sql .= "'$filename', '$filesize', '$filetype')";
@@ -108,8 +108,8 @@
   {
     include('themes/'.$theme.'/header.php');
     include "upload.php";
-    //$errormessage = "<B><font color='red'>Sorry, the uploaded file exceeds the maximum filesize limit. Please try a smaller file</font></B> <br>";
-	echo "<script>alert('Sorry, the uploaded file exceeds the maximum filesize limit. Please try a smaller file')</script>";	
+    //$errormessage = "<B><font color='red'>Sorry, the uploaded file exceeds the maximum vtiger_filesize limit. Please try a smaller file</font></B> <br>";
+	echo "<script>alert('Sorry, the uploaded file exceeds the maximum vtiger_filesize limit. Please try a smaller file')</script>";	
     //echo $errormessage;
     //echo $errorCode;
   }

Modified: vtigercrm/trunk/modules/Users/binaryfilelist.php
==============================================================================
--- vtigercrm/trunk/modules/Users/binaryfilelist.php (original)
+++ vtigercrm/trunk/modules/Users/binaryfilelist.php Mon Jun 12 14:26:25 2006
@@ -22,7 +22,7 @@
 
 	$dbQuery = "SELECT templateid, filename,filesize,filetype,description,module ";
 
-	$dbQuery .= "FROM wordtemplates" ;
+	$dbQuery .= "FROM vtiger_wordtemplates" ;
 
 	$dbQuery .= " ORDER BY filename ASC";
 

Modified: vtigercrm/trunk/modules/Users/createrole.php
==============================================================================
--- vtigercrm/trunk/modules/Users/createrole.php (original)
+++ vtigercrm/trunk/modules/Users/createrole.php Mon Jun 12 14:26:25 2006
@@ -29,7 +29,7 @@
 	$thisRoleDet=$roleInfo[$roleid];
 	$rolename = $thisRoleDet[0]; 
 	$parent = $thisRoleDet[3]; 
-	//retreiving the profileid
+	//retreiving the vtiger_profileid
 	$roleRelatedProfiles=getRoleRelatedProfiles($roleid);
 
 }

Modified: vtigercrm/trunk/modules/Users/deleteemailtemplate.php
==============================================================================
--- vtigercrm/trunk/modules/Users/deleteemailtemplate.php (original)
+++ vtigercrm/trunk/modules/Users/deleteemailtemplate.php Mon Jun 12 14:26:25 2006
@@ -14,7 +14,7 @@
 
 for($i=0;$i < count($id_array)-1;$i++)
 {
-		$sql = "delete from emailtemplates where templateid =".$id_array[$i];
+		$sql = "delete from vtiger_emailtemplates where templateid =".$id_array[$i];
 		$adb->query($sql);
 }
 

Modified: vtigercrm/trunk/modules/Users/deletewordtemplate.php
==============================================================================
--- vtigercrm/trunk/modules/Users/deletewordtemplate.php (original)
+++ vtigercrm/trunk/modules/Users/deletewordtemplate.php Mon Jun 12 14:26:25 2006
@@ -15,7 +15,7 @@
  for($i=0; $i < count($id_array)-1; $i++)
  {
 
-	         $sql = "delete from wordtemplates where templateid=".$id_array[$i];
+	         $sql = "delete from vtiger_wordtemplates where templateid=".$id_array[$i];
 	         $adb->query($sql);
 
  }

Modified: vtigercrm/trunk/modules/Users/detailviewemailtemplate.php
==============================================================================
--- vtigercrm/trunk/modules/Users/detailviewemailtemplate.php (original)
+++ vtigercrm/trunk/modules/Users/detailviewemailtemplate.php Mon Jun 12 14:26:25 2006
@@ -38,7 +38,7 @@
 {
 	$log->info("The templateid is set");
 	$tempid = $_REQUEST['templateid'];
-	$sql = "select * from emailtemplates where templateid=".$tempid;
+	$sql = "select * from vtiger_emailtemplates where templateid=".$tempid;
 	$result = $adb->query($sql);
 	$emailtemplateResult = $adb->fetch_array($result);
 }

Modified: vtigercrm/trunk/modules/Users/downloadfile.php
==============================================================================
--- vtigercrm/trunk/modules/Users/downloadfile.php (original)
+++ vtigercrm/trunk/modules/Users/downloadfile.php Mon Jun 12 14:26:25 2006
@@ -16,7 +16,7 @@
 
 $templateid = $_REQUEST['record'];
 $dbQuery = "SELECT filename,filetype, data ";
-$dbQuery .= "FROM wordtemplates ";
+$dbQuery .= "FROM vtiger_wordtemplates ";
 $dbQuery .= "WHERE templateid=" .$templateid;
 
 $result = $adb->query($dbQuery) or die("Couldn't get file list");

Modified: vtigercrm/trunk/modules/Users/editemailtemplate.php
==============================================================================
--- vtigercrm/trunk/modules/Users/editemailtemplate.php (original)
+++ vtigercrm/trunk/modules/Users/editemailtemplate.php Mon Jun 12 14:26:25 2006
@@ -31,7 +31,7 @@
 	$templateid = $_REQUEST['templateid'];
 	 $log->debug("the templateid is set to the value ".$templateid);
 }
-$sql = "select * from emailtemplates where templateid=".$templateid;
+$sql = "select * from vtiger_emailtemplates where templateid=".$templateid;
 $result = $adb->query($sql);
 $emailtemplateResult = $adb->fetch_array($result);
 

Modified: vtigercrm/trunk/modules/Users/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Users/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Users/language/en_us.lang.php Mon Jun 12 14:26:25 2006
@@ -123,7 +123,7 @@
 'ERR_LAST_ADMIN_1'=>'The user name ',
 'ERR_LAST_ADMIN_2'=>' is the last Admin user.  At least one user must be an Admin user.<br>Check the Admin user setting.',
 
-'ERR_DELETE_RECORD'=>"A record number must be specified to delete the account.",
+'ERR_DELETE_RECORD'=>"A record number must be specified to delete the vtiger_account.",
 
 // Additional Fields for i18n --- Release vtigerCRM 3.2 Patch 2
 // Users--listroles.php , createrole.php , ListPermissions.php , editpermissions.php
@@ -186,7 +186,7 @@
 'LBL_COLON'=>':',
 'LBL_EMAIL_TEMPLATE'=>'Email Template',
 'LBL_NEW_TEMPLATE'=>'New Template',
-'LBL_USE_MERGE_FIELDS_TO_EMAIL_CONTENT'=>'Use merge fields to personalize your email content.',
+'LBL_USE_MERGE_FIELDS_TO_EMAIL_CONTENT'=>'Use merge vtiger_fields to personalize your email content.',
 'LBL_AVAILABLE_MERGE_FIELDS'=>'Available Merge Fields',
 'LBL_SELECT_FIELD_TYPE'=>'Select Field Type :',
 'LBL_SELECT_FIELD'=>'Select Field :',
@@ -194,7 +194,7 @@
 'LBL_ACCOUNT_FIELDS'=>'Account Fields',
 'LBL_CONTACT_FIELDS'=>'Contact Fields',
 'LBL_LEAD_FIELDS'=>'Lead Fields',
-'LBL_COPY_AND_PASTE_MERGE_FIELD'=>'Copy and paste the merge field value into your template below.',
+'LBL_COPY_AND_PASTE_MERGE_FIELD'=>'Copy and paste the merge vtiger_field value into your template below.',
 'LBL_EMAIL_TEMPLATE_INFORMATION'=>'Communication Templates > Email Templates > Viewing',
 'LBL_FOLDER'=>'Folder',
 'LBL_PERSONAL'=>'Personal',
@@ -209,7 +209,7 @@
 'LBL_TEMPLATE_MESSAGE'=>'Email Message',
 
 
-// Added fields in createnewgroup.php
+// Added vtiger_fields in createnewgroup.php
 'LBL_CREATE_NEW_GROUP'=>'Create New Group',
 'LBL_NEW_GROUP'=>'New Group',
 'LBL_EDIT_GROUP'=>'Edit Group',
@@ -220,7 +220,7 @@
 'LBL_MEMBER_SELECTED'=>'Selected Member',
 'LBL_DESCRIPTION'=>'Description',
 
-// Added fields in detailViewmailtemplate.html,listgroupmembers.php,listgroups.php
+// Added vtiger_fields in detailViewmailtemplate.html,listgroupmembers.php,listgroups.php
 'LBL_DETAIL_VIEW_OF_EMAIL_TEMPLATE'=>'Detail View of Email Template',
 'LBL_DETAIL_VIEW'=>'Detail View of',
 'LBL_EDIT_VIEW'=>'Edit View of',
@@ -230,7 +230,7 @@
 'LBL_WORD_TEMPLATES'=>'Mail Merge Templates',
 'LBL_NEW_WORD_TEMPLATE'=>'New Template',
 
-// Added fields in TabCustomise.php,html and UpdateTab.php,html
+// Added vtiger_fields in TabCustomise.php,html and UpdateTab.php,html
 'LBL_CUSTOMISE_TABS'=>'Customize Tabs',
 'LBL_CHOOSE_TABS'=>'Choose Tabs',
 'LBL_AVAILABLE_TABS'=>'Available Tabs',
@@ -243,10 +243,10 @@
 'LBL_CHANGE_HOMEPAGE_LABEL'=>'Homepage Order',
 'LBL_CHANGE_HOMEPAGE_TITLE'=>'Homepage',
 
-// Added fields in binaryfilelist.php
+// Added vtiger_fields in binaryfilelist.php
 'LBL_OERATION'=>'Operation',
 
-// Added fields in CreateProfile.php
+// Added vtiger_fields in CreateProfile.php
 'LBL_PROFILE_NAME'=>'Create New Profile:',
 'LBL_NEW_PROFILE'=>'New Profile',
 'LBL_NEW_PROFILE_NAME'=>'Profile Name',
@@ -263,7 +263,7 @@
 'LBL_STANDARD_PRIVILEGES'=>'Standard Privileges',
 'LBL_UTILITY_PRIVILEGES'=>'Utility Privileges',
 'LBL_UTILITIES'=>'Utilities',
-'LBL_BASE_PROFILE_MESG'=>'I would like to setup a base profile and edit privileges <b>(Recommended)</b>',
+'LBL_BASE_PROFILE_MESG'=>'I would like to setup a base vtiger_profile and edit privileges <b>(Recommended)</b>',
 'LBL_BASE_PROFILE'=>'Base Profile:',
 'LBL_OR'=>'OR',
 'LBL_BASE_PROFILE_MESG_ADV'=>'I will choose the privileges from scratch <b>(Advanced Users)</b>',
@@ -275,19 +275,19 @@
 'LBL_MESG_VIEW'=>'to view all information / modules of vtiger CRM',
 'LBL_MESG_EDIT'=>'to edit all information / modules of vtiger CRM',
 'LBL_STD_MESG_OPTION'=>'Select the standard actions to be permitted',
-'LBL_TAB_MESG_OPTION'=>'Select the tabs/modules to be permitted',
+'LBL_TAB_MESG_OPTION'=>'Select the vtiger_tabs/modules to be permitted',
 'LBL_UTILITY_MESG_OPTION'=>'Select the utility actions to be permitted',
-'LBL_FIELD_MESG_OPTION'=>'Select the fields to be permitted',
+'LBL_FIELD_MESG_OPTION'=>'Select the vtiger_fields to be permitted',
 'LBL_FINISH_BUTTON'=>'Finish',
 'LBL_PROFILE_DETAIL_VIEW'=>'Detail View of Profile',
 
 
-//Added fields in createrole.php
+//Added vtiger_fields in createrole.php
 'LBL_HDR_ROLE_NAME'=>'Create New Role:',
 'LBL_TITLE_ROLE_NAME'=>'New Role',
 'LBL_ROLE_NAME'=>'Role Name',
 'LBL_ROLE_PROFILE_NAME'=>'Associate With Profile',
-'LBL_SPECIFY_ROLE_NAME'=>'Specify a name for new role :',
+'LBL_SPECIFY_ROLE_NAME'=>'Specify a name for new vtiger_role :',
 'LBL_ASSIGN_PROFILE'=>'Assign Profile(s)',
 'LBL_PROFILE_SELECT_TEXT'=>'Select the Profiles below and click on assign button',
 'LBL_PROFILES_AVLBL'=>'Profiles Available',
@@ -297,7 +297,7 @@
 'LBL_ASSOCIATED_USERS'=>'Associated Users :',
 
 
-//Added fields in OrgSharingDetailsView.php
+//Added vtiger_fields in OrgSharingDetailsView.php
 'LBL_ORG_SHARING_PRIVILEGES'=>'Organisation Sharing  Privileges',
 'LBL_EDIT_PERMISSIONS'=>'Edit Permissions',
 'LBL_SAVE_PERMISSIONS'=>'Save Permissions',
@@ -306,7 +306,7 @@
 'LBL_READ_CREATE_EDIT_DEL'=>'Public: Read, Create/Edit, Delete',
 'LBL_PRIVATE'=>'Private',
 
-//Added fields in listnotificationschedulers.php
+//Added vtiger_fields in listnotificationschedulers.php
 'LBL_HDR_EMAIL_SCHDS'=>'Users : Email Notifications',
 'LBL_EMAIL_SCHDS_DESC'=>'The following is the list of notifications that are activated automatically when the corresponding event has happened.',
 'LBL_ACTIVE'=>'Active',
@@ -327,13 +327,13 @@
 'LBL_BUTTON_UPDATE'=>'Update',
 'LBL_MODULENAMES'=>'Module',
 
-//Added fields in ListFieldPermissions.html
+//Added vtiger_fields in ListFieldPermissions.html
 'LBL_FIELD_PERMISSION_FIELD_NAME'=>'Field Name',
 'LBL_FIELD_PERMISSION_VISIBLE'=>'Visible',
 'LBL_FIELD_PERMISSIOM_TABLE_HEADER'=>'Standard Fields',
 'LBL_FIELD_LEVEL_ACCESS'=>'Field Level Access',
 
-//Added fields after 4.0.1
+//Added vtiger_fields after 4.0.1
 'LBL_SIGNATURE'=>'Signature',
 
 //Added for Event Reminder 4.2 Alpha release
@@ -352,9 +352,9 @@
 'Show Details'=>'Show Details',
 'Show Details and Add Events'=>'Show Details and Add Events',
 
-'LBL_USR_CANNOT_ACCESS'=>'Users cannot access other users ',
+'LBL_USR_CANNOT_ACCESS'=>'Users cannot access other vtiger_users ',
 'LBL_USR_CAN_ACCESS'=>'Users can ',
-'LBL_USR_OTHERS'=>' other users ',
+'LBL_USR_OTHERS'=>' other vtiger_users ',
 
 'Read Only '=>'Read Only ',
 'Read, Create/Edit, Delete '=>'Read, Create/Edit, Delete ',
@@ -432,7 +432,7 @@
 
 //given for calendar color for an user user
 'LBL_COLOR'=>'Color in Calendar',
-//added for activity view in home page
+//added for vtiger_activity view in home page
 'LBL_ACTIVITY_VIEW'=>'Default Activity View',
 //Added to change Home page order
 'LBL_HOMEPAGE_ORDER_UPDATE'=>'Update Home Page Block Order',
@@ -486,7 +486,7 @@
 'LBL_CREATE_RULE_MESG'=>'to create a new Rule',
 'LBL_SELECT_SCREEN'=>'Select the Screen / Module :',
 'LBL_FIELDS_AVLBL'=>'Fields Available in',
-'LBL_FIELDS_SELECT_DESELECT'=>'Select or De-Select fields to be shown',
+'LBL_FIELDS_SELECT_DESELECT'=>'Select or De-Select vtiger_fields to be shown',
 'LBL_ROLE_TO_BE_DELETED'=>'Role to be Deleted',
 'LBL_TRANSFER_USER_ROLE'=>'Transfer Users to Role',
 'LBL_DELETE_ROLE'=>'Delete Role'

Modified: vtigercrm/trunk/modules/Users/listemailtemplates.php
==============================================================================
--- vtigercrm/trunk/modules/Users/listemailtemplates.php (original)
+++ vtigercrm/trunk/modules/Users/listemailtemplates.php Mon Jun 12 14:26:25 2006
@@ -18,7 +18,7 @@
 
 $log->info("Inside Email Templates List View");
 
-   $sql = "select * from emailtemplates order by templateid DESC";
+   $sql = "select * from vtiger_emailtemplates order by templateid DESC";
    $result = $adb->query($sql);
    $temprow = $adb->fetch_array($result);
    

Modified: vtigercrm/trunk/modules/Users/listinventorynotifications.php
==============================================================================
--- vtigercrm/trunk/modules/Users/listinventorynotifications.php (original)
+++ vtigercrm/trunk/modules/Users/listinventorynotifications.php Mon Jun 12 14:26:25 2006
@@ -18,7 +18,7 @@
 $image_path=$theme_path."images/";
 
 $smarty = new vtigerCRM_Smarty;
-$query = "SELECT * FROM inventorynotification";
+$query = "SELECT * FROM vtiger_inventorynotification";
 $result = $adb->query($query);
 $num_rows = $adb->num_rows($result);
 $output = Array();

Modified: vtigercrm/trunk/modules/Users/listnotificationschedulers.php
==============================================================================
--- vtigercrm/trunk/modules/Users/listnotificationschedulers.php (original)
+++ vtigercrm/trunk/modules/Users/listnotificationschedulers.php Mon Jun 12 14:26:25 2006
@@ -16,7 +16,7 @@
 $image_path=$theme_path."images/";
 
 $smarty = new vtigerCRM_Smarty;
-$query = "SELECT * FROM notificationscheduler";
+$query = "SELECT * FROM vtiger_notificationscheduler";
 $result = $adb->query($query);
 if($adb->num_rows($result) >=1)
 {

Modified: vtigercrm/trunk/modules/Users/listroles.php
==============================================================================
--- vtigercrm/trunk/modules/Users/listroles.php (original)
+++ vtigercrm/trunk/modules/Users/listroles.php Mon Jun 12 14:26:25 2006
@@ -28,7 +28,7 @@
 
 
 //Retreiving the hierarchy
-$hquery = "select * from role order by parentrole asc";
+$hquery = "select * from vtiger_role order by parentrole asc";
 $hr_res = $adb->query($hquery);
 $num_rows = $adb->num_rows($hr_res);
 $hrarray= Array();
@@ -79,7 +79,7 @@
 }
 //Constructing the Roledetails array
 $role_det = getAllRoleDetails();
-$query = "select * from role";
+$query = "select * from vtiger_role";
 $result = $adb->query($query);
 $num_rows=$adb->num_rows($result);
 
@@ -93,7 +93,7 @@
 	foreach($hrarray as $roleid => $value)
 	{
 	
-		//retreiving the role details
+		//retreiving the vtiger_role details
 		$role_det_arr=$role_det[$roleid];
 		$roleid_arr=$role_det_arr[2];
 		$rolename = $role_det_arr[0];

Modified: vtigercrm/trunk/modules/Users/listwordtemplates.php
==============================================================================
--- vtigercrm/trunk/modules/Users/listwordtemplates.php (original)
+++ vtigercrm/trunk/modules/Users/listwordtemplates.php Mon Jun 12 14:26:25 2006
@@ -13,7 +13,7 @@
 require_once('include/database/PearDatabase.php');
 
    global $adb;
-   $sql = "select templateid, module, description, filename, filesize, filetype from wordtemplates order by filename ASC";
+   $sql = "select templateid, module, description, filename, vtiger_filesize, filetype from vtiger_wordtemplates order by filename ASC";
    $result = $adb->query($sql);
 
 $edit="Edit  ";

Modified: vtigercrm/trunk/modules/Users/lookupemailtemplates.php
==============================================================================
--- vtigercrm/trunk/modules/Users/lookupemailtemplates.php (original)
+++ vtigercrm/trunk/modules/Users/lookupemailtemplates.php Mon Jun 12 14:26:25 2006
@@ -36,7 +36,7 @@
                 <th width="65%" class="lvtCol"><b><?php echo $mod_strings['LBL_DESCRIPTION']; ?></b></td>
                 </tr>
 <?php
-   $sql = "select * from emailtemplates order by templateid desc";
+   $sql = "select * from vtiger_emailtemplates order by templateid desc";
    $result = $adb->query($sql);
    $temprow = $adb->fetch_array($result);
 $cnt=1;

Modified: vtigercrm/trunk/modules/Users/massChangeStatus.php
==============================================================================
--- vtigercrm/trunk/modules/Users/massChangeStatus.php (original)
+++ vtigercrm/trunk/modules/Users/massChangeStatus.php Mon Jun 12 14:26:25 2006
@@ -39,7 +39,7 @@
 }
 function updateStatus()
 {
-	var leadstatusvalue=document.setLeadStatus.lead_status.value
+	var vtiger_leadstatusvalue=document.setLeadStatus.lead_status.value
 	//alert(leadstatusvalue);
 	document.setLeadStatus.leadval.value=leadstatusvalue;
 	document.setLeadStatus.action="index.php?module=Users&action=updateLeadDBStatus"
@@ -96,7 +96,7 @@
 }
 elseif(isset($_REQUEST['change_owner']) && $_REQUEST['change_owner']=='true')
 {
-	$result=$adb->query("select * from users");
+	$result=$adb->query("select * from vtiger_users");
 	for($i=0;$i<$adb->num_rows($result);$i++)
 	{
 		$useridlist[$i]=$adb->query_result($result,$i,'id');

Modified: vtigercrm/trunk/modules/Users/massdelete.php
==============================================================================
--- vtigercrm/trunk/modules/Users/massdelete.php (original)
+++ vtigercrm/trunk/modules/Users/massdelete.php Mon Jun 12 14:26:25 2006
@@ -27,7 +27,7 @@
 {
         if(isPermitted($returnmodule,'Delete',$id) == 'yes')
         {
-                $sql="update crmentity set deleted=1 where crmid='" .$id ."'";
+                $sql="update vtiger_crmentity set deleted=1 where crmid='" .$id ."'";
                 $result = $adb->query($sql);
         }
         else

Modified: vtigercrm/trunk/modules/Users/populatetemplate.php
==============================================================================
--- vtigercrm/trunk/modules/Users/populatetemplate.php (original)
+++ vtigercrm/trunk/modules/Users/populatetemplate.php Mon Jun 12 14:26:25 2006
@@ -8,7 +8,7 @@
  * All Rights Reserved.
 *
  ********************************************************************************/
-//query the specific table and then get the data and write the data here 
+//query the specific vtiger_table and then get the data and write the data here 
 require_once('include/database/PearDatabase.php');
 include_once('modules/Contacts/Contact.php');
 include_once('modules/Leads/Lead.php');
@@ -16,7 +16,7 @@
 global $log;
 
 //download the template file and store it in some specific location
-$sql = "select templatename,body from emailtemplates where templateid='".$_REQUEST["templateid"] ."'";
+$sql = "select templatename,body from vtiger_emailtemplates where templateid='".$_REQUEST["templateid"] ."'";
 $tempresult = $adb->query($sql);
 $tempArray = $adb->fetch_array($tempresult);
 $fileContent = $tempArray["body"];
@@ -86,7 +86,7 @@
 
 global $current_user;
 global $adb;
-$query = 'select * from users where id= '.$current_user->id;
+$query = 'select * from vtiger_users where id= '.$current_user->id;
 $result = $adb->query($query);
 $res_row = $adb->fetchByAssoc($result);
 foreach ($res_row as $columnName=>$value)

Modified: vtigercrm/trunk/modules/Users/profilePrivileges.php
==============================================================================
--- vtigercrm/trunk/modules/Users/profilePrivileges.php (original)
+++ vtigercrm/trunk/modules/Users/profilePrivileges.php Mon Jun 12 14:26:25 2006
@@ -71,7 +71,7 @@
 
 
 
-//Initially setting the secondary selected tab
+//Initially setting the secondary selected vtiger_tab
 $mode=$_REQUEST['mode'];
 if($mode == 'create')
 {

Modified: vtigercrm/trunk/modules/Users/saveemailtemplate.php
==============================================================================
--- vtigercrm/trunk/modules/Users/saveemailtemplate.php (original)
+++ vtigercrm/trunk/modules/Users/saveemailtemplate.php Mon Jun 12 14:26:25 2006
@@ -33,7 +33,7 @@
 if(isset($templateid) && $templateid !='')
 {
 	$log->info("the templateid is set");  
-	$sql = "update emailtemplates set foldername = '".$folderName."', templatename ='".$templateName."', subject ='".$subject."', description ='".$description."', body ='".$body."' where templateid =".$templateid;
+	$sql = "update vtiger_emailtemplates set foldername = '".$folderName."', templatename ='".$templateName."', subject ='".$subject."', description ='".$description."', body ='".$body."' where templateid =".$templateid;
 	$adb->query($sql);
  
 	$log->info("about to invoke the detailviewemailtemplate file");  
@@ -42,7 +42,7 @@
 else
 {
 	$templateid = $db->getUniqueID('emailtemplates');
-	$sql = "insert into emailtemplates values ('". $folderName. "','".$templateName."','".$subject."','".$description."','".$body."',0,".$templateid.")";
+	$sql = "insert into vtiger_emailtemplates values ('". $folderName. "','".$templateName."','".$subject."','".$description."','".$body."',0,".$templateid.")";
 	$adb->query($sql);
 
 	 $log->info("added to the db the emailtemplate");

Modified: vtigercrm/trunk/modules/Users/savetermsandconditions.php
==============================================================================
--- vtigercrm/trunk/modules/Users/savetermsandconditions.php (original)
+++ vtigercrm/trunk/modules/Users/savetermsandconditions.php Mon Jun 12 14:26:25 2006
@@ -14,17 +14,17 @@
 $inv_type='Inventory';
 $inv_tandc=$_REQUEST['inventory_tandc'];
 
-$sql="select * from inventory_tandc where type='".$inv_type."'";
+$sql="select * from vtiger_inventory_tandc where type='".$inv_type."'";
 $result = $adb->query($sql);
 $inv_id = $adb->query_result($result,0,'id');
 if($inv_id == '')
 {
         $inv_id=$adb->getUniqueID('inventory_tandc');
-        $sql="insert into inventory_tandc values( '".$inv_id ."','".$inv_type."','". $inv_tandc."')";
+        $sql="insert into vtiger_inventory_tandc values( '".$inv_id ."','".$inv_type."','". $inv_tandc."')";
 }
 else
 {
-	$sql="update inventory_tandc set type = '".$inv_type."', tandc = '".$inv_tandc."' where id = ".$inv_id;
+	$sql="update vtiger_inventory_tandc set type = '".$inv_type."', tandc = '".$inv_tandc."' where id = ".$inv_id;
 }
 $adb->query($sql);
 

Modified: vtigercrm/trunk/modules/Users/updateLeadDBStatus.php
==============================================================================
--- vtigercrm/trunk/modules/Users/updateLeadDBStatus.php (original)
+++ vtigercrm/trunk/modules/Users/updateLeadDBStatus.php Mon Jun 12 14:26:25 2006
@@ -32,7 +32,7 @@
 		if(isPermitted($return_module,'EditView',$id) == 'yes')
 		{
 			if($id != '') {
-				$sql = "update crmentity set modifiedby=".$current_user->id.",smownerid='" .$idval ."', modifiedtime=".$adb->formatString("crmentity","modifiedtime",$date_var)." where crmid='" .$id."'";
+				$sql = "update vtiger_crmentity set modifiedby=".$current_user->id.",smownerid='" .$idval ."', modifiedtime=".$adb->formatString("crmentity","modifiedtime",$date_var)." where crmid='" .$id."'";
 				$result = $adb->query($sql);
 			}
 		}
@@ -49,9 +49,9 @@
 		if(isPermitted($return_module,'EditView',$id) == 'yes')
 		{
 			if($id != '') {
-				$sql = "update leaddetails set leadstatus='" .$leadstatusval ."' where leadid='" .$id."'";
+				$sql = "update vtiger_leaddetails set vtiger_leadstatus='" .$leadstatusval ."' where leadid='" .$id."'";
 				$result = $adb->query($sql);
-				$query = "update crmentity set modifiedby=".$current_user->id.",modifiedtime=".$adb->formatString("crmentity","modifiedtime",$date_var)." where crmid=".$id;
+				$query = "update vtiger_crmentity set modifiedby=".$current_user->id.",modifiedtime=".$adb->formatString("crmentity","modifiedtime",$date_var)." where crmid=".$id;
 				$result1 = $adb->query($query);
 			}
 		}

Modified: vtigercrm/trunk/modules/Users/updateNotificationSchedulers.php
==============================================================================
--- vtigercrm/trunk/modules/Users/updateNotificationSchedulers.php (original)
+++ vtigercrm/trunk/modules/Users/updateNotificationSchedulers.php Mon Jun 12 14:26:25 2006
@@ -23,7 +23,7 @@
 
 global $adb;
 $flag=0;
-//pass the table id as a parameter and then update directly instead of using the name field 
+//pass the vtiger_table id as a parameter and then update directly instead of using the name vtiger_field 
 for ($i=1;$i<10;$i++)
 {
   if($_POST[$i] == 'on')
@@ -34,7 +34,7 @@
   {
     $flag=0;
   }
- $sql = "update notificationscheduler set active=".$flag."  where schedulednotificationid=".$i;
+ $sql = "update vtiger_notificationscheduler set active=".$flag."  where schedulednotificationid=".$i;
  
  $adb->query($sql);
 }

Modified: vtigercrm/trunk/modules/Utilities/Merge.php
==============================================================================
--- vtigercrm/trunk/modules/Utilities/Merge.php (original)
+++ vtigercrm/trunk/modules/Utilities/Merge.php Mon Jun 12 14:26:25 2006
@@ -18,7 +18,7 @@
 $mergeFileName = $_REQUEST['mergefile'];
 //get the particular file from db and store it in the local hard disk.
 //store the path to the location where the file is stored and pass it  as parameter to the method 
-$sql = "select filename,data,filesize from wordtemplatestorage where filename='".$mergeFileName."'";
+$sql = "select filename,data,filesize from vtiger_wordtemplatestorage where filename='".$mergeFileName."'";
 
 $result = $adb->query($sql);
 $temparray = $adb->fetch_array($result);

Modified: vtigercrm/trunk/modules/Vendors/Vendor.php
==============================================================================
--- vtigercrm/trunk/modules/Vendors/Vendor.php (original)
+++ vtigercrm/trunk/modules/Vendors/Vendor.php Mon Jun 12 14:26:25 2006
@@ -22,17 +22,17 @@
 	var $db;
 
 
-	// Stored fields
+	// Stored vtiger_fields
 	var $id;
 	var $mode;
 
-	var $tab_name = Array('crmentity','vendor','vendorcf');
-	var $tab_name_index = Array('crmentity'=>'crmid','vendor'=>'vendorid','vendorcf'=>'vendorid');
+	var $tab_name = Array('vtiger_crmentity','vtiger_vendor','vtiger_vendorcf');
+	var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_vendor'=>'vendorid','vtiger_vendorcf'=>'vendorid');
 	var $column_fields = Array();
 
 	var $sortby_fields = Array('vendorname','category');		  
 
-        // This is the list of fields that are in the lists.
+        // This is the list of vtiger_fields that are in the lists.
 	var $list_fields = Array(
                                 'Vendor Name'=>Array('vendor'=>'vendorname'),
                                 'Phone'=>Array('vendor'=>'phone'),
@@ -84,7 +84,7 @@
 
 		$returnset = '&return_module=Vendors&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,vendor.vendorname from products inner join crmentity on crmentity.crmid = products.productid left outer join vendor on vendor.vendorid = products.vendor_id where vendor.vendorid = '.$id.' and crmentity.deleted = 0';
+		$query = 'select vtiger_products.productid, vtiger_products.productname, vtiger_products.productcode, vtiger_products.commissionrate, vtiger_products.qty_per_unit, vtiger_products.unit_price, vtiger_crmentity.crmid, vtiger_crmentity.smownerid,vtiger_vendor.vendorname from vtiger_products inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_products.productid left outer join vtiger_vendor on vtiger_vendor.vendorid = vtiger_products.vendor_id where vtiger_vendor.vendorid = '.$id.' and vtiger_crmentity.deleted = 0';
 		$log->debug("Exiting get_products method ...");
 		return GetRelatedList('Vendors','Products',$focus,$query,$button,$returnset);
 	}
@@ -100,7 +100,7 @@
 
 		$returnset = '&return_module=Vendors&return_action=DetailView&return_id='.$id;
 
-		$query = "select crmentity.*, purchaseorder.*,vendor.vendorname from purchaseorder inner join crmentity on crmentity.crmid=purchaseorder.purchaseorderid left outer join vendor on purchaseorder.vendorid=vendor.vendorid left join pogrouprelation on purchaseorder.purchaseorderid=pogrouprelation.purchaseorderid left join groups on groups.groupname=pogrouprelation.groupname where crmentity.deleted=0 and purchaseorder.vendorid=".$id;
+		$query = "select vtiger_crmentity.*, vtiger_purchaseorder.*,vtiger_vendor.vendorname from vtiger_purchaseorder inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_purchaseorder.purchaseorderid left outer join vtiger_vendor on vtiger_purchaseorder.vendorid=vtiger_vendor.vendorid left join vtiger_pogrouprelation on vtiger_purchaseorder.purchaseorderid=vtiger_pogrouprelation.purchaseorderid left join vtiger_groups on vtiger_groups.groupname=vtiger_pogrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_purchaseorder.vendorid=".$id;
 		$log->debug("Exiting get_purchase_orders method ...");
 		return GetRelatedList('Vendors','PurchaseOrder',$focus,$query,$button,$returnset);
 	}
@@ -115,7 +115,7 @@
 		$button = '';
 		$returnset = '&return_module=Vendors&return_action=DetailView&return_id='.$id;
 
-		$query = 'SELECT contactdetails.*, crmentity.crmid, crmentity.smownerid,vendorcontactrel.vendorid from contactdetails inner join crmentity on crmentity.crmid = contactdetails.contactid  inner join vendorcontactrel on vendorcontactrel.contactid=contactdetails.contactid left join contactgrouprelation on contactdetails.contactid=contactgrouprelation.contactid left join groups on groups.groupname=contactgrouprelation.groupname where crmentity.deleted=0 and vendorcontactrel.vendorid = '.$id;
+		$query = 'SELECT vtiger_contactdetails.*, vtiger_crmentity.crmid, vtiger_crmentity.smownerid,vtiger_vendorcontactrel.vendorid from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid  inner join vtiger_vendorcontactrel on vtiger_vendorcontactrel.contactid=vtiger_contactdetails.contactid left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid left join vtiger_groups on vtiger_groups.groupname=vtiger_contactgrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_vendorcontactrel.vendorid = '.$id;
 		$log->debug("Exiting get_contacts method ...");
 		return GetRelatedList('Vendor','Contacts',$focus,$query,$button,$returnset);
 

Modified: vtigercrm/trunk/modules/Vendors/updateRelations.php
==============================================================================
--- vtigercrm/trunk/modules/Vendors/updateRelations.php (original)
+++ vtigercrm/trunk/modules/Vendors/updateRelations.php Mon Jun 12 14:26:25 2006
@@ -21,9 +21,9 @@
 	{
 		if($id != '')
 		{
-			$sql = "insert into vendorcontactrel values (".$_REQUEST["parentid"].",".$id.")";
+			$sql = "insert into vtiger_vendorcontactrel values (".$_REQUEST["parentid"].",".$id.")";
 			$adb->query($sql);
-			$sql = "insert into seproductsrel values (". $_REQUEST["parentid"] .",".$id.")";
+			$sql = "insert into vtiger_seproductsrel values (". $_REQUEST["parentid"] .",".$id.")";
 			$adb->query($sql);
 		}
 	}
@@ -33,9 +33,9 @@
 elseif(isset($_REQUEST['entityid']) && $_REQUEST['entityid'] != '')
 {
 
-		$sql = "insert into vendorcontactrel values (".$_REQUEST['parid'].",".$_REQUEST['entityid'].")";
+		$sql = "insert into vtiger_vendorcontactrel values (".$_REQUEST['parid'].",".$_REQUEST['entityid'].")";
 		$adb->query($sql);
-		$sql = "insert into seproductsrel values (". $_REQUEST["parid"] .",".$_REQUEST["entityid"] .")";
+		$sql = "insert into vtiger_seproductsrel values (". $_REQUEST["parid"] .",".$_REQUEST["entityid"] .")";
 		$adb->query($sql);
  		header("Location:index.php?action=CallRelatedList&module=Vendors&record=".$_REQUEST["parid"]);
 }

Modified: vtigercrm/trunk/modules/Webmails/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/Webmails/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/Webmails/CallRelatedList.php Mon Jun 12 14:26:25 2006
@@ -52,21 +52,21 @@
 $block["Leads"]= "";
 global $adb;
 if($email->relationship != 0 && $email->relationship["type"] == "Leads") {
-	$q = "SELECT leaddetails.firstname, leaddetails.lastname, leaddetails.email, leaddetails.company, crmentity.smownerid from leaddetails left join crmentity on crmentity.crmid=leaddetails.leadid WHERE leaddetails.leadid='".$email->relationship["id"]."'";
+	$q = "SELECT vtiger_leaddetails.firstname, vtiger_leaddetails.lastname, vtiger_leaddetails.email, vtiger_leaddetails.company, vtiger_crmentity.smownerid from vtiger_leaddetails left join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_leaddetails.leadid WHERE vtiger_leaddetails.leadid='".$email->relationship["id"]."'";
 	$rs = $adb->query($q);
 	$block["Leads"]["header"]= array("0"=>"First Name","1"=>"Last Name","2"=>"Company Name","3"=>"Email Address","4"=>"Assigned To");
 	$block["Leads"]["entries"]= array("0"=>array($adb->query_result($rs,0,'firstname'),"1"=>$adb->query_result($rs,0,'lastname'),2=>$adb->query_result($rs,0,'company'),3=>$adb->query_result($rs,0,'email'),4=>$adb->query_result($rs,0,'smownerid')));
 }
 $block["Contacts"]= "";
 if($email->relationship != 0 && $email->relationship["type"] == "Contacts") {
-	$q = "SELECT contactdetails.firstname, contactdetails.lastname, contactdetails.email, contactdetails.title, crmentity.smownerid from contactdetails left join crmentity on crmentity.crmid=contactdetails.contactid WHERE contactdetails.contactid='".$email->relationship["id"]."'";
+	$q = "SELECT vtiger_contactdetails.firstname, vtiger_contactdetails.lastname, vtiger_contactdetails.email, vtiger_contactdetails.title, vtiger_crmentity.smownerid from vtiger_contactdetails left join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_contactdetails.contactid WHERE vtiger_contactdetails.contactid='".$email->relationship["id"]."'";
 	$rs = $adb->query($q);
 	$block["Contacts"]["header"]= array("0"=>"First Name","1"=>"Last Name","2"=>"Title","3"=>"Email Address","4"=>"Assigned To");
 	$block["Contacts"]["entries"]= array("0"=>array($adb->query_result($rs,0,'firstname'),"1"=>$adb->query_result($rs,0,'lastname'),2=>$adb->query_result($rs,0,'title'),3=>$adb->query_result($rs,0,'email'),4=>$adb->query_result($rs,0,'smownerid')));
 }
 $block["Accounts"]= "";
 if($email->relationship != 0 && $email->relationship["type"] == "Accounts") {
-	$q = "SELECT acccount.accountname, account.email1, account.website, account.industry, crmentity.smownerid from account left join crmentity on crmentity.crmid=account.accountid WHERE account.accountid='".$email->relationship["id"]."'";
+	$q = "SELECT acccount.accountname, vtiger_account.email1, vtiger_account.website, vtiger_account.industry, vtiger_crmentity.smownerid from vtiger_account left join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_account.accountid WHERE vtiger_account.accountid='".$email->relationship["id"]."'";
 	$rs = $adb->query($q);
 	$block["Accounts"]["header"]= array("0"=>"Account Name","1"=>"Email","2"=>"Web Site","3"=>"Industry","4"=>"Assigned To");
 	$block["Accounts"]["entries"]= array("0"=>array($adb->query_result($rs,0,'accountname'),"1"=>$adb->query_result($rs,0,'email'),2=>$adb->query_result($rs,0,'website'),3=>$adb->query_result($rs,0,'industry'),4=>$adb->query_result($rs,0,'smownerid')));

Modified: vtigercrm/trunk/modules/Webmails/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Webmails/ListView.php (original)
+++ vtigercrm/trunk/modules/Webmails/ListView.php Mon Jun 12 14:26:25 2006
@@ -150,7 +150,7 @@
  	global $mbox,$displayed_msgs,$show_hidden,$new_msgs;
 
   	$num = $mails[$start_message]->msgno;
-  	// TODO: scan the current db tables to find a
+  	// TODO: scan the current db vtiger_tables to find a
   	// matching email address that will make a good
   	// candidate for record_id
   	// this module will also need to be able to associate to any entity type

Modified: vtigercrm/trunk/modules/Webmails/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Webmails/Save.php (original)
+++ vtigercrm/trunk/modules/Webmails/Save.php Mon Jun 12 14:26:25 2006
@@ -76,8 +76,8 @@
 $focus->column_fields["description"]=$msgData;
 
 
-//to save the email details in emaildetails tables
-$fieldid = $adb->query_result($adb->query('select fieldid from field where tablename="contactdetails" and fieldname="email" and columnname="email"'),0,'fieldid');
+//to save the email details in vtiger_emaildetails vtiger_tables
+$fieldid = $adb->query_result($adb->query('select vtiger_fieldid from vtiger_field where vtiger_tablename="contactdetails" and vtiger_fieldname="email" and columnname="email"'),0,'fieldid');
 if($email->relationship != 0) {
 	$focus->column_fields['parent_id']=$email->relationship["id"].'@'.$fieldid.'|';
 
@@ -96,7 +96,7 @@
 }
 
 function add_attachment_to_contact($cid,$email) {
-	// add attachments to contact
+	// add vtiger_attachments to contact
 	global $adb,$current_user;
 	for($j=0;$j<2;$j++) {
 	    if($j==0)
@@ -113,16 +113,16 @@
         	$filetype= substr($filename,strstr($filename,"."),strlen($filename));
 		$filesize = $attachments[$i]["filesize"];
 
-                $query = "insert into crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime) values('";
+                $query = "insert into vtiger_crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime) values('";
                 $query .= $current_id."','".$current_user->id."','".$current_user->id."','Contacts Attachment','Uploaded from webmail during qualification','".$date_var."')";
                 $result = $adb->query($query);
 
-                $sql = "insert into attachments values(";
+                $sql = "insert into vtiger_attachments values(";
                 $sql .= $current_id.",'".$filename."','Uploaded ".$filename." from webmail','".$filetype."','".$upload_filepath."')";
 		echo $query;
                 $result = $adb->query($sql);
 
-                $sql1 = "insert into seattachmentsrel values('";
+                $sql1 = "insert into vtiger_seattachmentsrel values('";
                 $sql1 .= $cid."','".$current_id."')";
                 $result = $adb->query($sql1);
 
@@ -136,10 +136,10 @@
 $_REQUEST['parent_id'] = $focus->column_fields['parent_id'];
 $focus->save("Emails");
 
-//saving in emaildetails table
+//saving in vtiger_emaildetails vtiger_table
 $id_lists = $focus->column_fields['parent_id'].'@'.$fieldid;
 $all_to_ids = $email->from;
-$query = 'insert into emaildetails values ('.$focus->id.',"","'.$all_to_ids.'","","","","'.$id_lists.'","WEBMAIL")';
+$query = 'insert into vtiger_emaildetails values ('.$focus->id.',"","'.$all_to_ids.'","","","","'.$id_lists.'","WEBMAIL")';
 $adb->query($query);
 
 $return_id = $_REQUEST["mailid"];

Modified: vtigercrm/trunk/modules/Webmails/Webmail.php
==============================================================================
--- vtigercrm/trunk/modules/Webmails/Webmail.php (original)
+++ vtigercrm/trunk/modules/Webmails/Webmail.php Mon Jun 12 14:26:25 2006
@@ -137,21 +137,21 @@
 function find_relationships($db,$from) {
 
 	// leads search
-	$sql = "SELECT * from leaddetails left join crmentity on crmentity.crmid=leaddetails.leadid where leaddetails.email = '".$from."' AND crmentity.deleted='0'";
+	$sql = "SELECT * from vtiger_leaddetails left join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_leaddetails.leadid where vtiger_leaddetails.email = '".$from."' AND vtiger_crmentity.deleted='0'";
 	$res = $db->query($sql,true,"Error: "."<BR>$query");
 	$numRows = $db->num_rows($res);
 	if($numRows > 0)
 		return array('type'=>"Leads",'id'=>$db->query_result($res,0,"leadid"),'name'=>$db->query_result($res,0,"firstname")." ".$db->query_result($res,0,"lastname"));
 
 	// contacts search
-	$sql = "SELECT * from contactdetails left join crmentity on crmentity.crmid=contactdetails.contactid where contactdetails.email = '".$from."'  AND crmentity.deleted='0'";
+	$sql = "SELECT * from vtiger_contactdetails left join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_contactdetails.contactid where vtiger_contactdetails.email = '".$from."'  AND vtiger_crmentity.deleted='0'";
 	$res = $db->query($sql,true,"Error: "."<BR>$query");
 	$numRows = $db->num_rows($res);
 	if($numRows > 0)
 		return array('type'=>"Contacts",'id'=>$db->query_result($res,0,"contactid"),'name'=>$db->query_result($res,0,"firstname")." ".$db->query_result($res,0,"lastname"));
 
-	// accounts search
-	$sql = "SELECT * from account left join crmentity on crmentity.crmid=account.accountid where account.email1 = '".$from."' OR account.email1='".$from."'  AND crmentity.deleted='0'";
+	// vtiger_accounts search
+	$sql = "SELECT * from vtiger_account left join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_account.accountid where vtiger_account.email1 = '".$from."' OR vtiger_account.email1='".$from."'  AND vtiger_crmentity.deleted='0'";
 	$res = $db->query($sql,true,"Error: "."<BR>$query");
 	$numRows = $db->num_rows($res);
 	if($numRows > 0)
@@ -262,7 +262,7 @@
         $content = array();
         $i = 0;
         if (!$parts) { /* Simple message, only 1 piece */
-         $attachment = array(); /* No attachments */
+         $attachment = array(); /* No vtiger_attachments */
          $bod=imap_body($mbox, $mailid);
          if(preg_match("/\<br\>/",$bod))
                 	$content['body'] = $bod;

Modified: vtigercrm/trunk/modules/Webmails/dlAttachments.php
==============================================================================
--- vtigercrm/trunk/modules/Webmails/dlAttachments.php (original)
+++ vtigercrm/trunk/modules/Webmails/dlAttachments.php Mon Jun 12 14:26:25 2006
@@ -44,7 +44,7 @@
 	echo "</table><br><br>";
 
 } elseif (count(attachments) == 0 && count($inline) == 0) {
-	echo "<center><strong>No attachments for this email</strong></center><br><br>";
+	echo "<center><strong>No vtiger_attachments for this email</strong></center><br><br>";
 } else {
 
 global $root_directory;

Modified: vtigercrm/trunk/modules/Webmails/images/index.php
==============================================================================
--- vtigercrm/trunk/modules/Webmails/images/index.php (original)
+++ vtigercrm/trunk/modules/Webmails/images/index.php Mon Jun 12 14:26:25 2006
@@ -11,7 +11,7 @@
 /**
  ** index.php
  **
- ** This file simply takes any attempt to view source files
+ ** This file simply takes any attempt to view source vtiger_files
  ** and sends those people to the login screen. At this
  ** point no attempt is made to see if the person is logged
  ** or not.

Modified: vtigercrm/trunk/modules/Webmails/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Webmails/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Webmails/language/en_us.lang.php Mon Jun 12 14:26:25 2006
@@ -32,7 +32,7 @@
 'LBL_MOVE_TO'=>'Move To',
 'LBL_DELETE'=>'Delete',
 
-'ERR_DELETE_RECORD'=>"A record number must be specified to delete the account.",
+'ERR_DELETE_RECORD'=>"A record number must be specified to delete the vtiger_account.",
 'LBL_DATE_SENT'=>'Date Sent:',
 'LBL_SUBJECT'=>'Subject :',
 'LBL_DATE_AND_TIME'=>'Date & Time Sent:',
@@ -100,7 +100,7 @@
 'LBL_NEW_ACCOUNT'=>'New Account',
 'LBL_ACCOUNT_TITLE'=>'Accounts',
 
-// Added fields after vtiger4 - Beta
+// Added vtiger_fields after vtiger4 - Beta
 'LBL_USER_TITLE'=>'Users',
 'LBL_NEW_USER'=>'New User',
 

Modified: vtigercrm/trunk/soap/contactserialize.php
==============================================================================
--- vtigercrm/trunk/soap/contactserialize.php (original)
+++ vtigercrm/trunk/soap/contactserialize.php Mon Jun 12 14:26:25 2006
@@ -325,7 +325,7 @@
 
 //end code for mail merge
 
-//Field array for troubletickets
+//Field array for vtiger_troubletickets
 
 $server->wsdl->addComplexType(
 	'tickets_list_array',
@@ -1018,7 +1018,7 @@
 {
 	global $adb;
 	$output = Array();
-	$sql = "select * from products inner join crmentity on crmentity.crmid=products.productid where crmentity.deleted=0";
+	$sql = "select * from vtiger_products inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_products.productid where vtiger_crmentity.deleted=0";
 	$result = $adb->query($sql);
 	$noofrows = $adb->num_rows($result);
 	for($i=0;$i<$noofrows;$i++)
@@ -1027,26 +1027,26 @@
                 $output['productname']['productname'][$i] = $adb->query_result($result,$i,"productname");
         }
 
-	$result1 = $adb->query("select * from ticketpriorities");
+	$result1 = $adb->query("select * from vtiger_ticketpriorities");
 	for($i=0;$i<$adb->num_rows($result1);$i++)
 	{
 		$output['ticketpriorities']['ticketpriorities'][$i] = $adb->query_result($result1,$i,"ticketpriorities");
 	}
 
-        $result2 = $adb->query("select * from ticketseverities");
+        $result2 = $adb->query("select * from vtiger_ticketseverities");
         for($i=0;$i<$adb->num_rows($result2);$i++)
         {
                 $output['ticketseverities']['ticketseverities'][$i] = $adb->query_result($result2,$i,"ticketseverities");
         }
 
-        $result3 = $adb->query("select * from ticketcategories");
+        $result3 = $adb->query("select * from vtiger_ticketcategories");
         for($i=0;$i<$adb->num_rows($result3);$i++)
         {
                 $output['ticketcategories']['ticketcategories'][$i] = $adb->query_result($result3,$i,"ticketcategories");
         }
 
 	//Added to get the modules list -- september 10 2005
-        $sql2 = "select moduleowners.*,tab.name from moduleowners inner join tab on moduleowners.tabid = tab.tabid order by tab.tabsequence";
+        $sql2 = "select vtiger_moduleowners.*,vtiger_tab.name from vtiger_moduleowners inner join vtiger_tab on vtiger_moduleowners.tabid = vtiger_tab.tabid order by vtiger_tab.tabsequence";
         $result4 = $adb->query($sql2);
 	for($i=0;$i<$adb->num_rows($result4);$i++)
         {
@@ -1059,7 +1059,7 @@
 {
 	global $adb;
 
-	$category_query = "select * from faqcategories";
+	$category_query = "select * from vtiger_faqcategories";
 	$category_result = $adb->query($category_query);
 	$category_noofrows = $adb->num_rows($category_result);
 	for($j=0;$j<$category_noofrows;$j++)
@@ -1068,7 +1068,7 @@
 		$result['faqcategory'][$j] = $faqcategory;
 	}
 
-	$product_query = "select * from products inner join crmentity on crmentity.crmid=products.productid where crmentity.deleted=0";
+	$product_query = "select * from vtiger_products inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_products.productid where vtiger_crmentity.deleted=0";
         $product_result = $adb->query($product_query);
         $product_noofrows = $adb->num_rows($product_result);
         for($i=0;$i<$product_noofrows;$i++)
@@ -1079,7 +1079,7 @@
                 $result['product'][$i]['productname'] = $productname;
 	}
 
-	$faq_query = "select faq.*, crmentity.createdtime, crmentity.modifiedtime from faq inner join crmentity on crmentity.crmid=faq.id where crmentity.deleted=0 and faq.status='Published' order by crmentity.modifiedtime DESC";
+	$faq_query = "select vtiger_faq.*, vtiger_crmentity.createdtime, vtiger_crmentity.modifiedtime from vtiger_faq inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_faq.id where vtiger_crmentity.deleted=0 and vtiger_faq.status='Published' order by vtiger_crmentity.modifiedtime DESC";
 	$faq_result = $adb->query($faq_query);
 	$faq_noofrows = $adb->num_rows($faq_result);
 	for($k=0;$k<$faq_noofrows;$k++)
@@ -1093,7 +1093,7 @@
 		$result['faq'][$k]['faqcreatedtime'] = $adb->query_result($faq_result,$k,'createdtime');
 		$result['faq'][$k]['faqmodifiedtime'] = $adb->query_result($faq_result,$k,'modifiedtime');
 
-		$faq_comment_query = "select * from faqcomments where faqid=".$faqid;
+		$faq_comment_query = "select * from vtiger_faqcomments where vtiger_faqid=".$faqid;
 		$faq_comment_result = $adb->query($faq_comment_query);
 		$faq_comment_noofrows = $adb->num_rows($faq_comment_result);
 		for($l=0;$l<$faq_comment_noofrows;$l++)
@@ -1141,7 +1141,7 @@
 {
 	global $adb;
 	$createdtime = date('Y-m-d H:i:s');
-	$faq_query = "insert into faqcomments values('',".$faqid.",'".$comment."','".$createdtime."')";
+	$faq_query = "insert into vtiger_faqcomments values('',".$faqid.",'".$comment."','".$createdtime."')";
 	$adb->query($faq_query);
 	$result = get_KBase_details('');
 	return $result;
@@ -1689,12 +1689,12 @@
 	$ticket->column_fields[parent_id]=$parent_id;
 	$ticket->column_fields[product_id]=$product_id;
 
-	//Added to get the user based on module from moduleowners -- 10-11-2005
+	//Added to get the user based on module from vtiger_moduleowners -- 10-11-2005
 	global $adb;
 	$user_id = 1;//Default admin user id
 	if($module != '')
 	{
-		$res = $adb->query("select moduleowners.*, tab.name from moduleowners inner join tab on moduleowners.tabid = tab.tabid where name='".$module."'");
+		$res = $adb->query("select vtiger_moduleowners.*, vtiger_tab.name from vtiger_moduleowners inner join vtiger_tab on vtiger_moduleowners.tabid = vtiger_tab.tabid where name='".$module."'");
 		if($adb->num_rows($res) > 0)
 		{
 			$user_id = $adb->query_result($res,0,"user_id");
@@ -1710,18 +1710,18 @@
 	$contents = ' Ticket ID : '.$ticket->id.'<br> Ticket Title : '.$title.'<br><br>'.$description;
 
 	require_once('modules/Emails/mail.php');
-	//get the contact email id who creates the ticket from portal and use this email as from email id in email
-	$result = $adb->query("select email from contactdetails where contactid=".$parent_id);
+	//get the contact email id who creates the ticket from vtiger_portal and use this email as from email id in email
+	$result = $adb->query("select email from vtiger_contactdetails where contactid=".$parent_id);
 	$contact_email = $adb->query_result($result,0,'email');
 	$from_email = $contact_email;
 
 	//send mail to assigned to user
 	$to_email = getUserEmailId('id',$user_id);
-	$adb->println("Send mail to the user who is the owner of the module about the portal ticket");
+	$adb->println("Send mail to the user who is the owner of the module about the vtiger_portal ticket");
 	$mail_status = send_mail('HelpDesk',$to_email,'',$from_email,$subject,$contents);
 
-	//send mail to the customer(contact who creates the ticket from portal)
-	$adb->println("Send mail to the customer(contact) who creates the portal ticket");
+	//send mail to the customer(contact who creates the ticket from vtiger_portal)
+	$adb->println("Send mail to the customer(contact) who creates the vtiger_portal ticket");
 	$mail_status = send_mail('Contacts',$contact_email,'',$from_email,$subject,$contents);
 
 	$tickets_list =  get_tickets_list($user_name,$parent_id); 
@@ -1750,16 +1750,16 @@
 {
 	global $adb;
 	$servercreatedtime = date("Y-m-d H:i:s");
-	$sql = "insert into ticketcomments values('',".$ticketid.",'".$comments."','".$ownerid."','customer','".$servercreatedtime."')";
+	$sql = "insert into vtiger_ticketcomments values('',".$ticketid.",'".$comments."','".$ownerid."','customer','".$servercreatedtime."')";
 	$adb->query($sql);
 
-	$updatequery = "update crmentity set modifiedtime = '".$servercreatedtime."' where crmid=".$ticketid;
+	$updatequery = "update vtiger_crmentity set modifiedtime = '".$servercreatedtime."' where crmid=".$ticketid;
 	$adb->query($updatequery);
 }
 function close_current_ticket($ticketid)
 {
 	global $adb;
-	$sql = "update troubletickets set status='Closed' where ticketid=".$ticketid;
+	$sql = "update vtiger_troubletickets set status='Closed' where ticketid=".$ticketid;
 	$result = $adb->query($sql);
 	if($result)
 		return "<br><b>Ticket status is updated as 'Closed'.</b>";
@@ -1770,7 +1770,7 @@
 {
 	global $adb;
 	$current_date = date("Y-m-d");
-	$sql = "select id, user_name, user_password,last_login_time, support_start_date, support_end_date from portalinfo inner join customerdetails on portalinfo.id=customerdetails.customerid where user_name='".$username."' and user_password = '".$password."' and isactive=1 and customerdetails.support_end_date >= '".$current_date."'";
+	$sql = "select id, user_name, user_password,last_login_time, support_start_date, support_end_date from vtiger_portalinfo inner join vtiger_customerdetails on vtiger_portalinfo.id=vtiger_customerdetails.customerid where user_name='".$username."' and user_password = '".$password."' and isactive=1 and vtiger_customerdetails.support_end_date >= '".$current_date."'";
 	$result = $adb->query($sql);	
 	$list['id'] = $adb->query_result($result,0,'id');
 	$list['user_name'] = $adb->query_result($result,0,'user_name');
@@ -1784,7 +1784,7 @@
 function change_password($id,$username,$password)
 {
 	global $adb;
-	$sql = "update portalinfo set user_password='".$password."' where id=".$id." and user_name='".$username."'";
+	$sql = "update vtiger_portalinfo set user_password='".$password."' where id=".$id." and user_name='".$username."'";
 	$result = $adb->query($sql);
 
 	$list = authenticate_user($username,$password);
@@ -1798,17 +1798,17 @@
 
 	if($flag == 'login')
 	{
-	        $sql = "update portalinfo set login_time='".$current_time."' where id=".$id;
+	        $sql = "update vtiger_portalinfo set login_time='".$current_time."' where id=".$id;
 	        $result = $adb->query($sql);
 	}
 	elseif($flag == 'logout')
 	{
-		$sql = "select * from portalinfo where id=".$id;
+		$sql = "select * from vtiger_portalinfo where id=".$id;
                 $result = $adb->query($sql);
                 if($adb->num_rows($result) != 0)
                         $last_login = $adb->query_result($result,0,'login_time');
 
-		$sql = "update portalinfo set logout_time = '".$current_time."', last_login_time='".$last_login."' where id=".$id;
+		$sql = "update vtiger_portalinfo set logout_time = '".$current_time."', last_login_time='".$last_login."' where id=".$id;
 		$result = $adb->query($sql);
 	}
 
@@ -1819,12 +1819,12 @@
 	global $adb;
         include("modules/Emails/class.phpmailer.php");
 
-	$sql = "select * from portalinfo  where user_name='".$mailid."'";
+	$sql = "select * from vtiger_portalinfo  where user_name='".$mailid."'";
 	$user_name = $adb->query_result($adb->query($sql),0,'user_name');
 	$password = $adb->query_result($adb->query($sql),0,'user_password');
 	$isactive = $adb->query_result($adb->query($sql),0,'isactive');
 
-	$fromquery = "select users.user_name, users.email1 from users inner join crmentity on users.id = crmentity.smownerid inner join contactdetails on contactdetails.contactid=crmentity.crmid where contactdetails.email ='".$mailid."'";
+	$fromquery = "select vtiger_users.user_name, vtiger_users.email1 from vtiger_users inner join vtiger_crmentity on vtiger_users.id = vtiger_crmentity.smownerid inner join vtiger_contactdetails on vtiger_contactdetails.contactid=vtiger_crmentity.crmid where vtiger_contactdetails.email ='".$mailid."'";
 	$initialfrom = $adb->query_result($adb->query($fromquery),0,'user_name');
 	$from = $adb->query_result($adb->query($fromquery),0,'email1');
 
@@ -1838,7 +1838,7 @@
         $mail->Body    = $contents;
         $mail->IsSMTP();
 
-        $mailserverresult=$adb->query("select * from systems where server_type='email'");
+        $mailserverresult=$adb->query("select * from vtiger_systems where server_type='email'");
         $mail_server = $adb->query_result($mailserverresult,0,'server');
         $mail_server_username = $adb->query_result($mailserverresult,0,'server_username');
         $mail_server_password = $adb->query_result($mailserverresult,0,'server_password');
@@ -1875,7 +1875,7 @@
 		return "false@@@<b>Mail could not be sent</b>";
 	}
 	else
-		return "true@@@<b>Mail has been sent to your mail id with the customer portal login details</b>";
+		return "true@@@<b>Mail has been sent to your mail id with the customer vtiger_portal login details</b>";
 
 }
 
@@ -1915,7 +1915,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 vtiger_contactdetails.contactid as contactid from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_contactdetails.contactid where vtiger_crmentity.deleted=0 and vtiger_contactdetails.firstname like '".$first_name ."' and vtiger_contactdetails.lastname like '" .$last_name ."'";
 
 
 
@@ -1962,7 +1962,7 @@
         return null;
     }
 
-    $query = "select account.accountname accountname,account.accountid accountid from account inner join crmentity on crmentity.crmid=account.accountid where crmentity.deleted=0 and account.accountname='" .$account_name."'";
+    $query = "select vtiger_account.accountname vtiger_accountname,vtiger_account.accountid vtiger_accountid from vtiger_account inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_account.accountid where vtiger_crmentity.deleted=0 and vtiger_account.accountname='" .$account_name."'";
 
 
 	$db = new PearDatabase();
@@ -2000,7 +2000,7 @@
 {
 	//global $log;
 	
-	//todo make the activity body not be html encoded
+	//todo make the vtiger_activity body not be html encoded
 	//$log->fatal("In Create contact: username: $user_name first/last/email ($first_name, $last_name, $email_address)");
 	
 	global $current_user;

Modified: vtigercrm/trunk/soap/customerportal.php
==============================================================================
--- vtigercrm/trunk/soap/customerportal.php (original)
+++ vtigercrm/trunk/soap/customerportal.php Mon Jun 12 14:26:25 2006
@@ -25,7 +25,7 @@
 
 
 
-//Field array for troubletickets
+//Field array for vtiger_troubletickets
 $server->wsdl->addComplexType(
 	'tickets_list_array',
 	'complexType',
@@ -148,7 +148,7 @@
              )
 );
 
-//Added for ticket attachments
+//Added for ticket vtiger_attachments
 $server->wsdl->addComplexType(
         'get_ticket_attachments_array',
         'complexType',
@@ -291,7 +291,7 @@
 {
 	global $adb;
 	$output = Array();
-	$sql = "select * from products inner join crmentity on crmentity.crmid=products.productid where crmentity.deleted=0";
+	$sql = "select * from vtiger_products inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_products.productid where vtiger_crmentity.deleted=0";
 	$result = $adb->query($sql);
 	$noofrows = $adb->num_rows($result);
 	for($i=0;$i<$noofrows;$i++)
@@ -300,26 +300,26 @@
                 $output['productname']['productname'][$i] = $adb->query_result($result,$i,"productname");
         }
 
-	$result1 = $adb->query("select * from ticketpriorities");
+	$result1 = $adb->query("select * from vtiger_ticketpriorities");
 	for($i=0;$i<$adb->num_rows($result1);$i++)
 	{
 		$output['ticketpriorities']['ticketpriorities'][$i] = $adb->query_result($result1,$i,"ticketpriorities");
 	}
 
-        $result2 = $adb->query("select * from ticketseverities");
+        $result2 = $adb->query("select * from vtiger_ticketseverities");
         for($i=0;$i<$adb->num_rows($result2);$i++)
         {
                 $output['ticketseverities']['ticketseverities'][$i] = $adb->query_result($result2,$i,"ticketseverities");
         }
 
-        $result3 = $adb->query("select * from ticketcategories");
+        $result3 = $adb->query("select * from vtiger_ticketcategories");
         for($i=0;$i<$adb->num_rows($result3);$i++)
         {
                 $output['ticketcategories']['ticketcategories'][$i] = $adb->query_result($result3,$i,"ticketcategories");
         }
 
 	//Added to get the modules list -- september 10 2005
-        $sql2 = "select moduleowners.*,tab.name from moduleowners inner join tab on moduleowners.tabid = tab.tabid order by tab.tabsequence";
+        $sql2 = "select vtiger_moduleowners.*,vtiger_tab.name from vtiger_moduleowners inner join vtiger_tab on vtiger_moduleowners.tabid = vtiger_tab.tabid order by vtiger_tab.tabsequence";
         $result4 = $adb->query($sql2);
 	for($i=0;$i<$adb->num_rows($result4);$i++)
         {
@@ -332,7 +332,7 @@
 {
 	global $adb;
 
-	$category_query = "select * from faqcategories";
+	$category_query = "select * from vtiger_faqcategories";
 	$category_result = $adb->query($category_query);
 	$category_noofrows = $adb->num_rows($category_result);
 	for($j=0;$j<$category_noofrows;$j++)
@@ -341,7 +341,7 @@
 		$result['faqcategory'][$j] = $faqcategory;
 	}
 
-	$product_query = "select * from products inner join crmentity on crmentity.crmid=products.productid where crmentity.deleted=0";
+	$product_query = "select * from vtiger_products inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_products.productid where vtiger_crmentity.deleted=0";
         $product_result = $adb->query($product_query);
         $product_noofrows = $adb->num_rows($product_result);
         for($i=0;$i<$product_noofrows;$i++)
@@ -352,7 +352,7 @@
                 $result['product'][$i]['productname'] = $productname;
 	}
 
-	$faq_query = "select faq.*, crmentity.createdtime, crmentity.modifiedtime from faq inner join crmentity on crmentity.crmid=faq.id where crmentity.deleted=0 and faq.status='Published' order by crmentity.modifiedtime DESC";
+	$faq_query = "select vtiger_faq.*, vtiger_crmentity.createdtime, vtiger_crmentity.modifiedtime from vtiger_faq inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_faq.id where vtiger_crmentity.deleted=0 and vtiger_faq.status='Published' order by vtiger_crmentity.modifiedtime DESC";
 	$faq_result = $adb->query($faq_query);
 	$faq_noofrows = $adb->num_rows($faq_result);
 	for($k=0;$k<$faq_noofrows;$k++)
@@ -366,7 +366,7 @@
 		$result['faq'][$k]['faqcreatedtime'] = $adb->query_result($faq_result,$k,'createdtime');
 		$result['faq'][$k]['faqmodifiedtime'] = $adb->query_result($faq_result,$k,'modifiedtime');
 
-		$faq_comment_query = "select * from faqcomments where faqid=".$faqid." order by createdtime DESC";
+		$faq_comment_query = "select * from vtiger_faqcomments where vtiger_faqid=".$faqid." order by createdtime DESC";
 		$faq_comment_result = $adb->query($faq_comment_query);
 		$faq_comment_noofrows = $adb->num_rows($faq_comment_result);
 		for($l=0;$l<$faq_comment_noofrows;$l++)
@@ -389,7 +389,7 @@
 {
 	global $adb;
 	$createdtime = date('Y-m-d H:i:s');
-	$faq_query = "insert into faqcomments values('',".$faqid.",'".$comment."','".$createdtime."')";
+	$faq_query = "insert into vtiger_faqcomments values('',".$faqid.",'".$comment."','".$createdtime."')";
 	$adb->query($faq_query);
 	$result = get_KBase_details('');
 	return $result;
@@ -450,11 +450,11 @@
 	$ticket->column_fields[parent_id]=$parent_id;
 	$ticket->column_fields[product_id]=$product_id;
 
-	//Added to get the user based on module from moduleowners -- 10-11-2005
+	//Added to get the user based on module from vtiger_moduleowners -- 10-11-2005
 	$user_id = 1;//Default admin user id
 	if($module != '')
 	{
-		$res = $adb->query("select moduleowners.*, tab.name from moduleowners inner join tab on moduleowners.tabid = tab.tabid where name='".$module."'");
+		$res = $adb->query("select vtiger_moduleowners.*, vtiger_tab.name from vtiger_moduleowners inner join vtiger_tab on vtiger_moduleowners.tabid = vtiger_tab.tabid where name='".$module."'");
 		if($adb->num_rows($res) > 0)
 		{
 			$user_id = $adb->query_result($res,0,"user_id");
@@ -468,18 +468,18 @@
 	$subject = '[From Portal][ Ticket ID : '.$ticket->id.' ] '.$title;
 	$contents = ' Ticket ID : '.$ticket->id.'<br> Ticket Title : '.$title.'<br><br>'.$description;
 
-	//get the contact email id who creates the ticket from portal and use this email as from email id in email
-	$result = $adb->query("select email from contactdetails where contactid=".$parent_id);
+	//get the contact email id who creates the ticket from vtiger_portal and use this email as from email id in email
+	$result = $adb->query("select email from vtiger_contactdetails where contactid=".$parent_id);
 	$contact_email = $adb->query_result($result,0,'email');
 	$from_email = $contact_email;
 
 	//send mail to assigned to user
 	$to_email = getUserEmailId('id',$user_id);
-	$adb->println("Send mail to the user who is the owner of the module about the portal ticket");
+	$adb->println("Send mail to the user who is the owner of the module about the vtiger_portal ticket");
 	$mail_status = send_mail('HelpDesk',$to_email,'',$from_email,$subject,$contents);
 
-	//send mail to the customer(contact who creates the ticket from portal)
-	$adb->println("Send mail to the customer(contact) who creates the portal ticket");
+	//send mail to the customer(contact who creates the ticket from vtiger_portal)
+	$adb->println("Send mail to the customer(contact) who creates the vtiger_portal ticket");
 	$mail_status = send_mail('Contacts',$contact_email,'',$from_email,$subject,$contents);
 
 	$tickets_list =  get_tickets_list($user_name,$parent_id); 
@@ -508,17 +508,17 @@
 {
 	global $adb;
 	$servercreatedtime = date("Y-m-d H:i:s");
-	$sql = "insert into ticketcomments values('',".$ticketid.",'".$comments."','".$ownerid."','customer','".$servercreatedtime."')";
+	$sql = "insert into vtiger_ticketcomments values('',".$ticketid.",'".$comments."','".$ownerid."','customer','".$servercreatedtime."')";
 	$adb->query($sql);
 
-	$updatequery = "update crmentity set modifiedtime = '".$servercreatedtime."' where crmid=".$ticketid;
+	$updatequery = "update vtiger_crmentity set modifiedtime = '".$servercreatedtime."' where crmid=".$ticketid;
 	$adb->query($updatequery);
 }
 
 function close_current_ticket($ticketid)
 {
 	global $adb;
-	$sql = "update troubletickets set status='Closed' where ticketid=".$ticketid;
+	$sql = "update vtiger_troubletickets set status='Closed' where ticketid=".$ticketid;
 	$result = $adb->query($sql);
 	if($result)
 		return "<br><b>Ticket status is updated as 'Closed'.</b>";
@@ -529,7 +529,7 @@
 {
 	global $adb;
 	$current_date = date("Y-m-d");
-	$sql = "select id, user_name, user_password,last_login_time, support_start_date, support_end_date from portalinfo inner join customerdetails on portalinfo.id=customerdetails.customerid inner join crmentity on crmentity.crmid=portalinfo.id where crmentity.deleted=0 and user_name='".$username."' and user_password = '".$password."' and isactive=1 and customerdetails.support_end_date >= '".$current_date."'";
+	$sql = "select id, user_name, user_password,last_login_time, support_start_date, support_end_date from vtiger_portalinfo inner join vtiger_customerdetails on vtiger_portalinfo.id=vtiger_customerdetails.customerid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_portalinfo.id where vtiger_crmentity.deleted=0 and user_name='".$username."' and user_password = '".$password."' and isactive=1 and vtiger_customerdetails.support_end_date >= '".$current_date."'";
 	$result = $adb->query($sql);	
 	$list['id'] = $adb->query_result($result,0,'id');
 	$list['user_name'] = $adb->query_result($result,0,'user_name');
@@ -544,7 +544,7 @@
 function change_password($id,$username,$password)
 {
 	global $adb;
-	$sql = "update portalinfo set user_password='".$password."' where id=".$id." and user_name='".$username."'";
+	$sql = "update vtiger_portalinfo set user_password='".$password."' where id=".$id." and user_name='".$username."'";
 	$result = $adb->query($sql);
 
 	$list = authenticate_user($username,$password);
@@ -558,17 +558,17 @@
 
 	if($flag == 'login')
 	{
-	        $sql = "update portalinfo set login_time='".$current_time."' where id=".$id;
+	        $sql = "update vtiger_portalinfo set login_time='".$current_time."' where id=".$id;
 	        $result = $adb->query($sql);
 	}
 	elseif($flag == 'logout')
 	{
-		$sql = "select * from portalinfo where id=".$id;
+		$sql = "select * from vtiger_portalinfo where id=".$id;
                 $result = $adb->query($sql);
                 if($adb->num_rows($result) != 0)
                         $last_login = $adb->query_result($result,0,'login_time');
 
-		$sql = "update portalinfo set logout_time = '".$current_time."', last_login_time='".$last_login."' where id=".$id;
+		$sql = "update vtiger_portalinfo set logout_time = '".$current_time."', last_login_time='".$last_login."' where id=".$id;
 		$result = $adb->query($sql);
 	}
 
@@ -578,12 +578,12 @@
 {
 	global $adb;
 
-	$sql = "select * from portalinfo  where user_name='".$mailid."'";
+	$sql = "select * from vtiger_portalinfo  where user_name='".$mailid."'";
 	$user_name = $adb->query_result($adb->query($sql),0,'user_name');
 	$password = $adb->query_result($adb->query($sql),0,'user_password');
 	$isactive = $adb->query_result($adb->query($sql),0,'isactive');
 
-	$fromquery = "select users.user_name, users.email1 from users inner join crmentity on users.id = crmentity.smownerid inner join contactdetails on contactdetails.contactid=crmentity.crmid where contactdetails.email ='".$mailid."'";
+	$fromquery = "select vtiger_users.user_name, vtiger_users.email1 from vtiger_users inner join vtiger_crmentity on vtiger_users.id = vtiger_crmentity.smownerid inner join vtiger_contactdetails on vtiger_contactdetails.contactid=vtiger_crmentity.crmid where vtiger_contactdetails.email ='".$mailid."'";
 	$initialfrom = $adb->query_result($adb->query($fromquery),0,'user_name');
 	$from = $adb->query_result($adb->query($fromquery),0,'email1');
 
@@ -597,7 +597,7 @@
         $mail->Body    = $contents;
         $mail->IsSMTP();
 
-        $mailserverresult = $adb->query("select * from systems where server_type='email'");
+        $mailserverresult = $adb->query("select * from vtiger_systems where server_type='email'");
         $mail_server = $adb->query_result($mailserverresult,0,'server');
         $mail_server_username = $adb->query_result($mailserverresult,0,'server_username');
         $mail_server_password = $adb->query_result($mailserverresult,0,'server_password');
@@ -634,7 +634,7 @@
 		return "false@@@<b>Mail could not be sent</b>";
 	}
 	else
-		return "true@@@<b>Mail has been sent to your mail id with the customer portal login details</b>";
+		return "true@@@<b>Mail has been sent to your mail id with the customer vtiger_portal login details</b>";
 
 }
 
@@ -642,7 +642,7 @@
 {
 	global $adb;
 
-	$res = $adb->query("select smcreatorid from crmentity where crmid=".$ticketid);
+	$res = $adb->query("select smcreatorid from vtiger_crmentity where crmid=".$ticketid);
 	$creator = $adb->query_result($res,0,'smcreatorid');
 
 	return $creator;
@@ -663,13 +663,13 @@
 	return $picklist_array;
 }
 
-//Added function to get the attachments of the ticket
+//Added function to get the vtiger_attachments of the ticket
 function get_ticket_attachments($userid,$ticketid)
 {
 
 	global $adb;
 
-	$query = "select troubletickets.ticketid, attachments.* from troubletickets inner join seattachmentsrel on seattachmentsrel.crmid = troubletickets.ticketid inner join attachments on seattachmentsrel.attachmentsid = attachments.attachmentsid where troubletickets.ticketid=".$ticketid;
+	$query = "select vtiger_troubletickets.ticketid, vtiger_attachments.* from vtiger_troubletickets inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.crmid = vtiger_troubletickets.ticketid inner join vtiger_attachments on vtiger_seattachmentsrel.attachmentsid = vtiger_attachments.attachmentsid where vtiger_troubletickets.ticketid=".$ticketid;
 	$res = $adb->query($query);
 	$noofrows = $adb->num_rows($res);
 
@@ -678,7 +678,7 @@
 		$filename = $adb->query_result($res,$i,'name');
 		$filepath = $adb->query_result($res,$i,'path');
 
-		$filesize = filesize($filepath.$filename);
+		$filesize = vtiger_filesize($filepath.$filename);
 		$fileid = $adb->query_result($res,$i,'attachmentsid');
 		$filetype = $adb->query_result($res,$i,'type');
 
@@ -717,13 +717,13 @@
 	$date_var = date('YmdHis');
 	$description = 'CustomerPortal Attachment';
 
-	$crmquery = "insert into crmentity (crmid,setype,description,createdtime) values('".$attachmentid."','HelpDesk Attachment','".$description."','".$date_var."')";
+	$crmquery = "insert into vtiger_crmentity (crmid,setype,description,createdtime) values('".$attachmentid."','HelpDesk Attachment','".$description."','".$date_var."')";
 	$crmresult = $adb->query($crmquery);
 
-	$attachmentquery = "insert into attachments values(".$attachmentid.",'".$new_filename."','".$description."','".$filetype."','".$upload_filepath."')";
+	$attachmentquery = "insert into vtiger_attachments values(".$attachmentid.",'".$new_filename."','".$description."','".$filetype."','".$upload_filepath."')";
 	$attachmentreulst = $adb->query($attachmentquery);
 
-	$relatedquery = $sql1 = "insert into seattachmentsrel values('".$ticketid."','".$attachmentid."')";
+	$relatedquery = $sql1 = "insert into vtiger_seattachmentsrel values('".$ticketid."','".$attachmentid."')";
 	$relatedresult = $adb->query($relatedquery);
 
 }

Modified: vtigercrm/trunk/soap/vtigerolservice.php
==============================================================================
--- vtigercrm/trunk/soap/vtigerolservice.php (original)
+++ vtigercrm/trunk/soap/vtigerolservice.php Mon Jun 12 14:26:25 2006
@@ -314,13 +314,13 @@
           	$email->set_emails_contact_invitee_relationship($email->id,$contactid);
           	$email->set_emails_se_invitee_relationship($email->id,$contactid);
           	$email->set_emails_user_invitee_relationship($email->id,$user_id);
-		$sql = "select email from contactdetails inner join crmentity on crmentity.crmid = contactdetails.contactid where crmentity.deleted =0 and contactdetails.contactid='".$contactid."'";
+		$sql = "select email from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid where vtiger_crmentity.deleted =0 and vtiger_contactdetails.contactid='".$contactid."'";
 		$result = $adb->query($sql);
 		$camodulerow = $adb->fetch_array($result);
 		if(isset($camodulerow))
 		{
 			$emailid = $camodulerow["email"];
-			$query = 'insert into emaildetails values ('.$email->id.',"","'.$emailid.'","","","","'.$cotactid."@77|".'","OUTLOOK")';
+			$query = 'insert into vtiger_emaildetails values ('.$email->id.',"","'.$emailid.'","","","","'.$cotactid."@77|".'","OUTLOOK")';
 			$adb->query($query);
 		}
 		return $email->id;
@@ -380,7 +380,7 @@
      fwrite($handle,base64_decode($filedata),$filesize);
      fclose($handle);
 
-     $sql1 = "insert into crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime,modifiedtime) 
+     $sql1 = "insert into vtiger_crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime,modifiedtime) 
      values(".$crmid.",".$user_id.",".$user_id.",'Emails Attachment',' ',".$adb->formatString("crmentity","createdtime",$date_var).",".$adb->formatString("crmentity","modifiedtime",$date_var).")";
      
      $entityresult = $adb->query($sql1);	
@@ -388,12 +388,12 @@
      
      if($entityresult != false)
      {
-    	$sql2="insert into attachments(attachmentsid, name, description, type, path) 
+    	$sql2="insert into vtiger_attachments(attachmentsid, name, description, type, path) 
                values(".$crmid.",'".$filename."',' ','".$filetype."','".$upload_file_path."')";
     	    
         $result=$adb->query($sql2);
      
-        $sql3='insert into seattachmentsrel values('.$emailid.','.$crmid.')';
+        $sql3='insert into vtiger_seattachmentsrel values('.$emailid.','.$crmid.')';
         $adb->query($sql3);
      
         return $crmid;   
@@ -631,7 +631,7 @@
         return null;
     }
 
-    $query = "select account.accountname accountname,account.accountid accountid from account inner join crmentity on crmentity.crmid=account.accountid where crmentity.deleted=0 and account.accountname='" .$account_name."'";
+    $query = "select vtiger_account.accountname vtiger_accountname,vtiger_account.accountid vtiger_accountid from vtiger_account inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_account.accountid where vtiger_crmentity.deleted=0 and vtiger_account.accountname='" .$account_name."'";
 
 
 	  $db = new PearDatabase();

Modified: vtigercrm/trunk/soap/webforms.php
==============================================================================
--- vtigercrm/trunk/soap/webforms.php (original)
+++ vtigercrm/trunk/soap/webforms.php Mon Jun 12 14:26:25 2006
@@ -61,7 +61,7 @@
 	if($assigned_user_id == '')
 	{
 		//if the user id is empty then assign it to the admin user
-		$assigned_user_id = $adb->query_result($adb->query("select id from users where user_name='admin'"),0,'id');
+		$assigned_user_id = $adb->query_result($adb->query("select id from vtiger_users where user_name='admin'"),0,'id');
 	}
 
 	require_once("modules/Leads/Lead.php");
@@ -95,7 +95,7 @@
 	if($assigned_user_id == '')
 	{
 		//if the user id is empty then assign it to the admin user
-		$assigned_user_id = $adb->query_result($adb->query("select id from users where user_name='admin'"),0,'id');
+		$assigned_user_id = $adb->query_result($adb->query("select id from vtiger_users where user_name='admin'"),0,'id');
 	}
 
 	require_once('modules/Contacts/Contact.php');




From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 12 16:33:13 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 12 Jun 2006 20:33:13 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7004 -
	/vtigercrm/trunk/schema/DatabaseSchema.xml
Message-ID: <20060612203314.BBBEA7E8BE5@vtiger.fosslabs.com>

Author: don
Date: Mon Jun 12 14:33:10 2006
New Revision: 7004

Log:
prefixed vtiger_ in all table names

Modified:
    vtigercrm/trunk/schema/DatabaseSchema.xml

Modified: vtigercrm/trunk/schema/DatabaseSchema.xml
==============================================================================
--- vtigercrm/trunk/schema/DatabaseSchema.xml (original)
+++ vtigercrm/trunk/schema/DatabaseSchema.xml Mon Jun 12 14:33:10 2006
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <schema version="0.2">
 
-	<table name="users">
+	<table name="vtiger_users">
 		<field name="id" type="I" >
 			<key />
 			<autoincrement />
@@ -91,7 +91,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="crmentity">
+	<table name="vtiger_crmentity">
 		<field name="crmid" type="I" size="19">
 			<key />
 		</field>
@@ -152,7 +152,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="sharedcalendar">
+	<table name="vtiger_sharedcalendar">
 		<field name="userid" type="I" size="19">
 			<key />
 		</field>
@@ -161,7 +161,7 @@
 		</field>
 	</table>
 
-	<table name="tab">
+	<table name="vtiger_tab">
 		<field name="tabid" type="I" size="19">
 			<key />
 			<default value="0" />
@@ -194,7 +194,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="blocks">
+	<table name="vtiger_blocks">
 		<field name="blockid" type="I" size="19">
 			<key />
 			<notnull />
@@ -229,14 +229,14 @@
 		</index>
 	</table>
 
-	<table name="field">
+	<table name="vtiger_field">
 		<field name="tabid" type="I" size="19">
 			<notnull />
 		</field>
 		<field name="fieldid" type="I" size="19">
 			<key />
 			<autoincrement />
-			<constraint>REFERENCES tab(tabid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_tab(tabid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="columnname" type="C" size="30">
 			<notnull />
@@ -295,12 +295,12 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="account">
+	<table name="vtiger_account">
 		<field name="accountid" type="I" size="19">
 			<key />
 			<notnull />
 			<default value="0" />
-			<constraint>REFERENCES crmentity(crmid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="accountname" type="C" size="100">
 			<unique />
@@ -342,11 +342,11 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="accountbillads">
+	<table name="vtiger_accountbillads">
 		<field name="accountaddressid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES account(accountid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_account(accountid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="city" type="C" size="30" />
 		<field name="code" type="C" size="30" />
@@ -358,11 +358,11 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="accountshipads">
+	<table name="vtiger_accountshipads">
 		<field name="accountaddressid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES account(accountid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_account(accountid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="city" type="C" size="30" />
 		<field name="code" type="C" size="30" />
@@ -374,21 +374,21 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="accountscf">
+	<table name="vtiger_accountscf">
 		<field name="accountid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES account(accountid) ON DELETE CASCADE</constraint>
-		</field>
-
-		<opt platform="mysql">Type=InnoDB</opt>
-	</table>
-
-	<table name="contactdetails">
+			<constraint>REFERENCES vtiger_account(accountid) ON DELETE CASCADE</constraint>
+		</field>
+
+		<opt platform="mysql">Type=InnoDB</opt>
+	</table>
+
+	<table name="vtiger_contactdetails">
 		<field name="contactid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES crmentity(crmid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="accountid" type="I" size="19" />
 		<field name="campaignid" type="I" size="19" />
@@ -430,11 +430,11 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="contactsubdetails">
+	<table name="vtiger_contactsubdetails">
 		<field name="contactsubscriptionid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES contactdetails(contactid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="homephone" type="C" size="50" />
 		<field name="otherphone" type="C" size="50" />
@@ -452,11 +452,11 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="contactaddress">
+	<table name="vtiger_contactaddress">
 		<field name="contactaddressid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES contactdetails(contactid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="mailingcity" type="C" size="40" />
 		<field name="mailingstreet" type="C" size="250" />
@@ -474,20 +474,20 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="contactscf">
+	<table name="vtiger_contactscf">
 		<field name="contactid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES contactdetails(contactid) ON DELETE CASCADE</constraint>
-		</field>
-
-		<opt platform="mysql">Type=InnoDB</opt>
-	</table>
-
-	<table name="portalinfo">
+			<constraint>REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE</constraint>
+		</field>
+
+		<opt platform="mysql">Type=InnoDB</opt>
+	</table>
+
+	<table name="vtiger_portalinfo">
 		<field name="id" type="I" size="11">
 			<key />
-			<constraint>REFERENCES contactdetails(contactid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="user_name" type="C" size="50" />
 		<field name="user_password" type="C" size="30" />
@@ -504,20 +504,20 @@
 		<field name="isactive" type="I" size="1" />
 	</table>
 
-	<table name="customerdetails">
+	<table name="vtiger_customerdetails">
 		<field name="customerid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES contactdetails(contactid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="portal" type="C" size="3" />
 		<field name="support_start_date" type="D" />
 		<field name="support_end_date" type="D" />
 	</table>
 
-	<table name="leaddetails">
+	<table name="vtiger_leaddetails">
 		<field name="leadid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES crmentity(crmid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="campaignid" type="I" size="19" />
 		<field name="email" type="C" size="100" />
@@ -572,11 +572,11 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="leadsubdetails">
+	<table name="vtiger_leadsubdetails">
 		<field name="leadsubscriptionid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES leaddetails(leadid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_leaddetails(leadid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="currency" type="C" size="20">
 			<default value="Dollars" />
@@ -595,11 +595,11 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="leadaddress">
+	<table name="vtiger_leadaddress">
 		<field name="leadaddressid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES leaddetails(leadid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_leaddetails(leadid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="city" type="C" size="30" />
 		<field name="code" type="C" size="30" />
@@ -617,21 +617,21 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="leadscf">
+	<table name="vtiger_leadscf">
 		<field name="leadid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES leaddetails(leadid) ON DELETE CASCADE</constraint>
-		</field>
-
-		<opt platform="mysql">Type=InnoDB</opt>
-	</table>
-
-	<table name="notes">
+			<constraint>REFERENCES vtiger_leaddetails(leadid) ON DELETE CASCADE</constraint>
+		</field>
+
+		<opt platform="mysql">Type=InnoDB</opt>
+	</table>
+
+	<table name="vtiger_notes">
 		<field name="notesid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES crmentity(crmid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="contact_id" type="I" size="19">
 			<default value="0" />
@@ -654,11 +654,11 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="potential">
+	<table name="vtiger_potential">
 		<field name="potentialid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES crmentity(crmid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="accountid" type="I" size="19" />
 		<field name="potentialname" type="C" size="120">
@@ -711,14 +711,14 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="potstagehistory">
+	<table name="vtiger_potstagehistory">
 		<field name="historyid" type="I" size="19">
 			<key />
 			<autoincrement />
 		</field>
 		<field name="potentialid" type="I" size="19">
 			<notnull />
-			<constraint>REFERENCES potential(potentialid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_potential(potentialid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="amount" type="N" />
 		<field name="stage" type="C" size="100" />
@@ -733,21 +733,21 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="potentialscf">
+	<table name="vtiger_potentialscf">
 		<field name="potentialid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES potential(potentialid) ON DELETE CASCADE</constraint>
-		</field>
-
-		<opt platform="mysql">Type=InnoDB</opt>
-	</table>
-
-	<table name="activity">
+			<constraint>REFERENCES vtiger_potential(potentialid) ON DELETE CASCADE</constraint>
+		</field>
+
+		<opt platform="mysql">Type=InnoDB</opt>
+	</table>
+
+	<table name="vtiger_activity">
 		<field name="activityid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES crmentity(crmid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="subject" type="C" size="100">
 			<notnull />
@@ -807,10 +807,10 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="attachments">
+	<table name="vtiger_attachments">
 		<field name="attachmentsid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES crmentity(crmid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="name" type="C" size="100">
 			<notnull />
@@ -830,7 +830,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="seattachmentsrel">
+	<table name="vtiger_seattachmentsrel">
 		<field name="crmid" type="I" size="19">
 			<key />
 			<default value="0" />
@@ -838,7 +838,7 @@
 		<field name="attachmentsid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES attachments(attachmentsid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_attachments(attachmentsid) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="seattachmentsrel_attachmentsid_idx">
@@ -846,7 +846,7 @@
 		</index>
 		<index name="seattachmentsrel_crmid_idx">
 			<col>crmid</col>
-			<constraint>REFERENCES crmentity(crmid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE</constraint>
 		</index>
 		<index name="seattachmentsrel_attachmentsid_crmid_idx">
 			<col>attachmentsid</col>
@@ -855,7 +855,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="tracker">
+	<table name="vtiger_tracker">
 		<field name="id" type="I" size="11">
 			<key />
 			<autoincrement />
@@ -866,10 +866,10 @@
 		<field name="item_summary" type="C" size="255" />
 	</table>
 
-	<table name="competitor">
+	<table name="vtiger_competitor">
 		<field name="competitorid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES crmentity(crmid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="competitorname" type="C" size="100">
 			<notnull />
@@ -881,14 +881,14 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="potcompetitorrel">
+	<table name="vtiger_potcompetitorrel">
 		<field name="potentialid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES potential(potentialid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_potential(potentialid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="competitorid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES competitor(competitorid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_competitor(competitorid) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="potcompetitorrel_potentialid_idx">
@@ -900,12 +900,12 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="vendor">
+	<table name="vtiger_vendor">
 		<field name="vendorid" type="I" size="19">
 			<key />
 			<notnull />
 			<default value="0" />
-			<constraint>REFERENCES crmentity(crmid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="vendorname" type="C" size="100" />
 		<field name="phone" type="C" size="100" />
@@ -924,10 +924,10 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="products">
+	<table name="vtiger_products">
 		<field name="productid" type="I" size="11">
 			<key />
-			<constraint>REFERENCES crmentity(crmid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="productname" type="C" size="50">
 			<notnull />
@@ -970,7 +970,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="currency">
+	<table name="vtiger_currency">
 		<field name="currencyid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -994,7 +994,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="visibility">
+	<table name="vtiger_visibility">
 		<field name="visibilityid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -1018,7 +1018,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="manufacturer">
+	<table name="vtiger_manufacturer">
 		<field name="manufacturerid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -1042,10 +1042,10 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="productcollaterals">
+	<table name="vtiger_productcollaterals">
 		<field name="productid" type="I" size="11">
 			<key />
-			<constraint>REFERENCES products(productid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_products(productid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="date_entered" type="T">
 			<notnull />
@@ -1070,7 +1070,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="role">
+	<table name="vtiger_role">
 		<field name="roleid" type="C" size="255">
 			<key />
 		</field>
@@ -1081,14 +1081,14 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="user2role">
+	<table name="vtiger_user2role">
 		<field name="userid" type="I" size="11">
 			<key />
-			<constraint>REFERENCES users(id) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_users(id) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="roleid" type="C" size="255">
 			<notnull />
-			<constraint>REFERENCES role(roleid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_role(roleid) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="user2role_roleid_idx">
@@ -1097,7 +1097,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="groups">
+	<table name="vtiger_groups">
 		<field name="groupid" type="I" size="19">
 			<key />
 		</field>
@@ -1111,14 +1111,14 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="users2group">
+	<table name="vtiger_users2group">
 		<field name="groupid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES groups(groupid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_groups(groupid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="userid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES users(id) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_users(id) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="users2group_groupname_uerid_idx">
@@ -1127,51 +1127,51 @@
 		</index>
 	</table>
 
-	<table name="group2grouprel">
+	<table name="vtiger_group2grouprel">
 		<field name="groupid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES groups(groupid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_groups(groupid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="containsgroupid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES groups(groupid) ON DELETE CASCADE</constraint>
-		</field>
-
-		<opt platform="mysql">Type=InnoDB</opt>
-	</table>
-
-	<table name="group2role">
+			<constraint>REFERENCES vtiger_groups(groupid) ON DELETE CASCADE</constraint>
+		</field>
+
+		<opt platform="mysql">Type=InnoDB</opt>
+	</table>
+
+	<table name="vtiger_group2role">
 		<field name="groupid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES groups(groupid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_groups(groupid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="roleid" type="C" size="255">
 			<key />
-			<constraint>REFERENCES role(roleid) ON DELETE CASCADE</constraint>
-		</field>
-	</table>
-
-	<table name="group2rs">
+			<constraint>REFERENCES vtiger_role(roleid) ON DELETE CASCADE</constraint>
+		</field>
+	</table>
+
+	<table name="vtiger_group2rs">
 		<field name="groupid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES groups(groupid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_groups(groupid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="roleandsubid" type="C" size="255">
 			<key />
-			<constraint>REFERENCES role(roleid) ON DELETE CASCADE</constraint>
-		</field>
-	</table>
-
-	<table name="leadpotrel">
+			<constraint>REFERENCES vtiger_role(roleid) ON DELETE CASCADE</constraint>
+		</field>
+	</table>
+
+	<table name="vtiger_leadpotrel">
 		<field name="leadid" type="I" size="19">
 			<notnull />
 			<default value="0" />
-			<constraint>REFERENCES leaddetails(leadid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_leaddetails(leadid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="potentialid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES potential(potentialid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_potential(potentialid) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="leadpotrel_leadid_idx">
@@ -1181,7 +1181,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="campaign">
+	<table name="vtiger_campaign">
 		<field name="campaignname" type="C" size="255" />
 		<field name="campaigntype" type="C" size="255" />
 		<field name="campaignstatus" type="C" size="255" />
@@ -1217,26 +1217,26 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="campaignscf">
+	<table name="vtiger_campaignscf">
 		<field name="campaignid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES campaign(campaignid) ON DELETE CASCADE</constraint>
-		</field>
-
-		<opt platform="mysql">Type=InnoDB</opt>
-	</table>
-
-	<table name="campaigncontrel">
+			<constraint>REFERENCES vtiger_campaign(campaignid) ON DELETE CASCADE</constraint>
+		</field>
+
+		<opt platform="mysql">Type=InnoDB</opt>
+	</table>
+
+	<table name="vtiger_campaigncontrel">
 		<field name="campaignid" type="I" size="19">
 			<key />
 			<default value="0"/>
-			<constraint>REFERENCES campaign(campaignid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_campaign(campaignid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="contactid" type="I" size="19">
 			<notnull />
 			<default value="0"/>
-			<constraint>REFERENCES contactdetails(contactid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="campaigncontrel_contractid_idx">
@@ -1245,16 +1245,16 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="campaignleadrel">
+	<table name="vtiger_campaignleadrel">
 		<field name="campaignid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES campaign(campaignid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_campaign(campaignid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="leadid" type="I" size="19">
 			<notnull />
 			<default value="0" />
-			<constraint>REFERENCES leaddetails(leadid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_leaddetails(leadid) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="campaignleadrel_leadid_campaignid_idx">
@@ -1264,11 +1264,11 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="leadcontrel">
+	<table name="vtiger_leadcontrel">
 		<field name="leadid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES leaddetails(leadid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_leaddetails(leadid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="contactid" type="I" size="19">
 			<notnull />
@@ -1277,21 +1277,21 @@
 
 		<index name="leadcontrel_contactid_idx">
 			<col>contactid</col>
-			<constraint>REFERENCES contactdetails(contactid) ON DELETE CASCADE</constraint>
-		</index>
-		<opt platform="mysql">Type=InnoDB</opt>
-	</table>
-
-	<table name="leadacctrel">
+			<constraint>REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE</constraint>
+		</index>
+		<opt platform="mysql">Type=InnoDB</opt>
+	</table>
+
+	<table name="vtiger_leadacctrel">
 		<field name="leadid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES leaddetails(leadid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_leaddetails(leadid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="accountid" type="I" size="19">
 			<notnull />
 			<default value="0" />
-			<constraint>REFERENCES account(accountid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_account(accountid) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="leadacctrel_accountid_idx">
@@ -1300,17 +1300,17 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="contpotentialrel">
+	<table name="vtiger_contpotentialrel">
 		<field name="contactid" type="I" size="19">
 			<key />
 			<notnull />
 			<default value="0" />
-			<constraint>REFERENCES contactdetails(contactid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="potentialid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES potential(potentialid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_potential(potentialid) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="contpotentialrel_potentialid_idx">
@@ -1322,7 +1322,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="dealintimation">
+	<table name="vtiger_dealintimation">
 		<field name="dealintimationid" type="I" size="19">
 			<key />
 			<default value="0" />
@@ -1364,16 +1364,16 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="cntactivityrel">
+	<table name="vtiger_cntactivityrel">
 		<field name="contactid" type="I" size="19">
 			<notnull />
 			<default value="0" />
-			<constraint>REFERENCES contactdetails(contactid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="activityid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES activity(activityid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_activity(activityid) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="cntactivityrel_contactid_idx">
@@ -1383,7 +1383,7 @@
 	</table>
 
 	<!-- Lead Assignment Rule -->
-	<table name="lar">
+	<table name="vtiger_lar">
 		<field name="larid" type="I" size="19">
 			<key />
 			<default value="0" />
@@ -1394,7 +1394,7 @@
 		<field name="createdby" type="I" size="19">
 			<notnull />
 			<default value="0" />
-			<constraint>REFERENCES users(id) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_users(id) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="createdon" type="D">
 			<notnull />
@@ -1410,16 +1410,16 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="crmentitynotesrel">
+	<table name="vtiger_crmentitynotesrel">
 		<field name="crmid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES crmentity(crmid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="notesid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES notes(notesid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_notes(notesid) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="crmentitynotesrel_notesid_idx">
@@ -1431,10 +1431,10 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="troubletickets">
+	<table name="vtiger_troubletickets">
 		<field name="ticketid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES crmentity(crmid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="groupname" type="C" size="100" />
 		<field name="parent_id" type="C" size="100" />
@@ -1461,13 +1461,13 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="ticketcomments">
+	<table name="vtiger_ticketcomments">
 		<field name="commentid" type="I" size="19">
 			<key />
 			<autoincrement />
 		</field>
 		<field name="ticketid" type="I" size="19">
-			<constraint>REFERENCES troubletickets(ticketid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_troubletickets(ticketid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="comments" type="X" />
 		<field name="ownerid" type="I" size="19">
@@ -1485,16 +1485,16 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="salesmanactivityrel">
+	<table name="vtiger_salesmanactivityrel">
 		<field name="smid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES users(id) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_users(id) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="activityid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES activity(activityid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_activity(activityid) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="salesmanactivityrel_activityid_idx">
@@ -1506,16 +1506,16 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="vendorcontactrel">
+	<table name="vtiger_vendorcontactrel">
 		<field name="vendorid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES vendor(vendorid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_vendor(vendorid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="contactid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES contactdetails(contactid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="vendorcontactrel_vendorid_idx">
@@ -1527,16 +1527,16 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="salesmanticketrel">
+	<table name="vtiger_salesmanticketrel">
 		<field name="smid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES users(id) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_users(id) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="id" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES troubletickets(ticketid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_troubletickets(ticketid) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="salesmanticketrel_smid_idx">
@@ -1548,14 +1548,14 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="seactivityrel">
+	<table name="vtiger_seactivityrel">
 		<field name="crmid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES crmentity(crmid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="activityid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES activity(activityid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_activity(activityid) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="seactivityrel_activityid_idx">
@@ -1567,16 +1567,16 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="seproductsrel">
+	<table name="vtiger_seproductsrel">
 		<field name="crmid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES crmentity(crmid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="productid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES products(productid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_products(productid) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="seproductsrel_productid_idx">
@@ -1588,16 +1588,16 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="seticketsrel">
+	<table name="vtiger_seticketsrel">
 		<field name="crmid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES crmentity(crmid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="ticketid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES troubletickets(ticketid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_troubletickets(ticketid) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="seticketsrel_crmid_idx">
@@ -1609,7 +1609,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="headers">
+	<table name="vtiger_headers">
 		<field name="fileid" type="I" size="3">
 			<key />
 			<autoincrement />
@@ -1619,7 +1619,7 @@
 		</field>
 	</table>
 
-	<table name="import_maps">
+	<table name="vtiger_import_maps">
 		<field name="id" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -1661,13 +1661,13 @@
 		</index>
 	</table>
 
-	<table name="leadgrouprelation">
+	<table name="vtiger_leadgrouprelation">
 		<field name="leadid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES leaddetails(leadid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_leaddetails(leadid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="groupname" type="C" size="100">
-			<constraint>REFERENCES groups(groupname) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_groups(groupname) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="leadgrouprelation_leadid_idx">
@@ -1679,13 +1679,13 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="accountgrouprelation">
+	<table name="vtiger_accountgrouprelation">
 		<field name="accountid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES account(accountid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_account(accountid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="groupname" type="C" size="100">
-			<constraint>REFERENCES groups(groupname) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_groups(groupname) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="accountgrouprelation_groupname_idx">
@@ -1694,13 +1694,13 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="contactgrouprelation">
+	<table name="vtiger_contactgrouprelation">
 		<field name="contactid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES contactdetails(contactid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="groupname" type="C" size="100">
-			<constraint>REFERENCES groups(groupname) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_groups(groupname) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="contactgrouprelation_groupname_idx">
@@ -1709,13 +1709,13 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="potentialgrouprelation">
+	<table name="vtiger_potentialgrouprelation">
 		<field name="potentialid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES potential(potentialid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_potential(potentialid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="groupname" type="C" size="100">
-			<constraint>REFERENCES groups(groupname) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_groups(groupname) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="potentialgrouprelation_groupname_idx">
@@ -1724,13 +1724,13 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="campaigngrouprelation">
+	<table name="vtiger_campaigngrouprelation">
 		<field name="campaignid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES campaign(campaignid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_campaign(campaignid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="groupname" type="C" size="100">
-			<constraint>REFERENCES groups(groupname) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_groups(groupname) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="campaigngrouprelation_IDX1">
@@ -1739,13 +1739,13 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="activitygrouprelation">
+	<table name="vtiger_activitygrouprelation">
 		<field name="activityid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES activity(activityid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_activity(activityid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="groupname" type="C" size="100">
-			<constraint>REFERENCES groups(groupname) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_groups(groupname) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="activitygrouprelation_activityid_idx">
@@ -1757,13 +1757,13 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="ticketgrouprelation">
+	<table name="vtiger_ticketgrouprelation">
 		<field name="ticketid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES troubletickets(ticketid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_troubletickets(ticketid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="groupname" type="C" size="100">
-			<constraint>REFERENCES groups(groupname) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_groups(groupname) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="ticketgrouprelation_ticketid_idx">
@@ -1775,7 +1775,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="systems">
+	<table name="vtiger_systems">
 		<field name="id" type="I" size="19">
 			<key />
 		</field>
@@ -1786,7 +1786,7 @@
 		<field name="smtp_auth" type="C" size="5" />
 	</table>
 
-	<table name="currency_info">
+	<table name="vtiger_currency_info">
 		<field name="id" type="I" >
 			<key />
 			<autoincrement />
@@ -1803,10 +1803,10 @@
 		</field>
 	</table>
 
-	<table name="defaultcv">
+	<table name="vtiger_defaultcv">
 		<field name="tabid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES tab(tabid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_tab(tabid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="defaultviewname" type="C" size="50">
 			<notnull />
@@ -1814,7 +1814,7 @@
 		<field name="query" type="X" />
 	</table>
 
-	<table name="emailtemplates">
+	<table name="vtiger_emailtemplates">
 		<field name="foldername" type="C" size="100" />
 		<field name="templatename" type="C" size="100" />
 		<field name="subject" type="C" size="100" />
@@ -1836,11 +1836,11 @@
 		</index>
 	</table>
 
-	<table name="faq">
+	<table name="vtiger_faq">
 		<field name="id" type="I" size="11">
 			<key />
 			<autoincrement />
-			<constraint>REFERENCES crmentity(crmid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="product_id" type="C" size="100" />
 		<field name="question" type="X">
@@ -1860,13 +1860,13 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="faqcomments">
+	<table name="vtiger_faqcomments">
 		<field name="commentid" type="I" size="19">
 			<key />
 			<autoincrement />
 		</field>
 		<field name="faqid" type="I" size="19">
-			<constraint>REFERENCES faq(id) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_faq(id) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="comments" type="X" />
 		<field name="createdtime" type="T">
@@ -1879,7 +1879,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="files">
+	<table name="vtiger_files">
 		<field name="id" type="C" size="36">
 			<key />
 		</field>
@@ -1902,7 +1902,7 @@
 		</index>
 	</table>
 
-	<table name="loginhistory">
+	<table name="vtiger_loginhistory">
 		<field name="login_id" type="I" size="11">
 			<key />
 			<autoincrement />
@@ -1922,16 +1922,16 @@
 		<field name="status" type="C" size="25" />
 	</table>
 
-	<table name="senotesrel">
+	<table name="vtiger_senotesrel">
 		<field name="crmid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES crmentity(crmid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="notesid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES notes(notesid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_notes(notesid) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="senotesrel_notesid_idx">
@@ -1943,7 +1943,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="ticketstracktime">
+	<table name="vtiger_ticketstracktime">
 		<field name="ticket_id" type="I" size="11">
 			<key />
 			<notnull />
@@ -1966,27 +1966,27 @@
 		</index>
 	</table>
 
-	<table name="ticketcf">
+	<table name="vtiger_ticketcf">
 		<field name="ticketid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES troubletickets(ticketid) ON DELETE CASCADE</constraint>
-		</field>
-
-		<opt platform="mysql">Type=InnoDB</opt>
-	</table>
-
-	<table name="productcf">
+			<constraint>REFERENCES vtiger_troubletickets(ticketid) ON DELETE CASCADE</constraint>
+		</field>
+
+		<opt platform="mysql">Type=InnoDB</opt>
+	</table>
+
+	<table name="vtiger_productcf">
 		<field name="productid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES products(productid) ON DELETE CASCADE</constraint>
-		</field>
-
-		<opt platform="mysql">Type=InnoDB</opt>
-	</table>
-
-	<table name="users_last_import">
+			<constraint>REFERENCES vtiger_products(productid) ON DELETE CASCADE</constraint>
+		</field>
+
+		<opt platform="mysql">Type=InnoDB</opt>
+	</table>
+
+	<table name="vtiger_users_last_import">
 		<field name="id" type="I" size="36">
 			<autoincrement />
 			<key />
@@ -2004,7 +2004,7 @@
 		</index>
 	</table>
 
-	<table name="wordtemplates">
+	<table name="vtiger_wordtemplates">
 		<field name="templateid" type="I" size="19">
 			<key />
 		</field>
@@ -2038,7 +2038,7 @@
 	</table>
 
 	<!-- Dropdown fields -->
-	<table name="accountdepstatus">
+	<table name="vtiger_accountdepstatus">
 		<field name="deploymentstatusid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -2062,7 +2062,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="accountownership">
+	<table name="vtiger_accountownership">
 		<field name="acctownershipid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -2086,7 +2086,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="accountrating">
+	<table name="vtiger_accountrating">
 		<field name="accountratingid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -2110,7 +2110,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="accountregion">
+	<table name="vtiger_accountregion">
 		<field name="accountregionid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -2134,7 +2134,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="accounttype">
+	<table name="vtiger_accounttype">
 		<field name="accounttypeid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -2158,7 +2158,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="contacttype">
+	<table name="vtiger_contacttype">
 		<field name="contacttypeid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -2182,7 +2182,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="leadsource">
+	<table name="vtiger_leadsource">
 		<field name="leadsourceid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -2206,7 +2206,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="opportunity_type">
+	<table name="vtiger_opportunity_type">
 		<field name="opptypeid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -2230,7 +2230,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="leadstage">
+	<table name="vtiger_leadstage">
 		<field name="leadstageid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -2254,7 +2254,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="leadstatus">
+	<table name="vtiger_leadstatus">
 		<field name="leadstatusid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -2278,7 +2278,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="eventstatus">
+	<table name="vtiger_eventstatus">
 		<field name="eventstatusid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -2302,7 +2302,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="duration_minutes">
+	<table name="vtiger_duration_minutes">
 		<field name="minutesid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -2326,7 +2326,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="licencekeystatus">
+	<table name="vtiger_licencekeystatus">
 		<field name="licencekeystatusid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -2350,7 +2350,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="opportunitystage">
+	<table name="vtiger_opportunitystage">
 		<field name="potstageid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -2377,7 +2377,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="priority">
+	<table name="vtiger_priority">
 		<field name="priorityid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -2401,7 +2401,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="businesstype">
+	<table name="vtiger_businesstype">
 		<field name="businesstypeid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -2425,7 +2425,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="industry">
+	<table name="vtiger_industry">
 		<field name="industryid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -2449,7 +2449,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="revenuetype">
+	<table name="vtiger_revenuetype">
 		<field name="revenuetypeid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -2473,7 +2473,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="salutationtype">
+	<table name="vtiger_salutationtype">
 		<field name="salutationid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -2491,7 +2491,7 @@
 		</field>
 	</table>
 
-	<table name="taskpriority">
+	<table name="vtiger_taskpriority">
 		<field name="taskpriorityid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -2507,7 +2507,7 @@
 		</field>
 	</table>
 
-	<table name="taskstatus">
+	<table name="vtiger_taskstatus">
 		<field name="taskstatusid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -2523,7 +2523,7 @@
 		</field>
 	</table>
 
-	<table name="activitytype">
+	<table name="vtiger_activitytype">
 		<field name="activitytypeid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -2547,7 +2547,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="usertype">
+	<table name="vtiger_usertype">
 		<field name="usertypeid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -2571,7 +2571,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="sales_stage">
+	<table name="vtiger_sales_stage">
 		<field name="sales_stage_id" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -2588,7 +2588,7 @@
 		</field>
 	</table>
 
-	<table name="faqcategories">
+	<table name="vtiger_faqcategories">
 		<field name="faqcategories_id" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -2604,7 +2604,7 @@
 		</field>
 	</table>
 
-	<table name="faqstatus">
+	<table name="vtiger_faqstatus">
 		<field name="faqstatus_id" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -2620,7 +2620,7 @@
 		</field>
 	</table>
 
-	<table name="rating">
+	<table name="vtiger_rating">
 		<field name="rating_id" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -2636,7 +2636,7 @@
 		</field>
 	</table>
 
-	<table name="ticketcategories">
+	<table name="vtiger_ticketcategories">
 		<field name="ticketcategories_id" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -2652,7 +2652,7 @@
 		</field>
 	</table>
 
-	<table name="ticketpriorities">
+	<table name="vtiger_ticketpriorities">
 		<field name="ticketpriorities_id" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -2668,7 +2668,7 @@
 		</field>
 	</table>
 
-	<table name="ticketseverities">
+	<table name="vtiger_ticketseverities">
 		<field name="ticketseverities_id" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -2684,7 +2684,7 @@
 		</field>
 	</table>
 
-	<table name="ticketstatus">
+	<table name="vtiger_ticketstatus">
 		<field name="ticketstatus_id" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -2700,7 +2700,7 @@
 		</field>
 	</table>
 
-	<table name="activsubtype">
+	<table name="vtiger_activsubtype">
 		<field name="activesubtypeid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -2716,7 +2716,7 @@
 		</field>
 	</table>
 
-	<table name="downloadpurpose">
+	<table name="vtiger_downloadpurpose">
 		<field name="downloadpurposeid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -2740,7 +2740,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="durationhrs">
+	<table name="vtiger_durationhrs">
 		<field name="hrsid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -2756,7 +2756,7 @@
 		</field>
 	</table>
 
-	<table name="durationmins">
+	<table name="vtiger_durationmins">
 		<field name="minsid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -2772,7 +2772,7 @@
 		</field>
 	</table>
 
-	<table name="evaluationstatus">
+	<table name="vtiger_evaluationstatus">
 		<field name="evalstatusid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -2796,7 +2796,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="profile">
+	<table name="vtiger_profile">
 		<field name="profileid" type="I" size="10">
 			<key />
 			<autoincrement />
@@ -2809,10 +2809,10 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="profile2globalpermissions">
+	<table name="vtiger_profile2globalpermissions">
 		<field name="profileid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES profile(profileid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_profile(profileid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="globalactionid" type="I" size="19">
 			<key />
@@ -2826,7 +2826,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="profile2tab">
+	<table name="vtiger_profile2tab">
 		<field name="profileid" type="I" size="11" />
 		<field name="tabid" type="I" size="10" />
 		<field name="permissions" type="I" size="10">
@@ -2840,7 +2840,7 @@
 		</index>
 	</table>
 
-	<table name="profile2standardpermissions">
+	<table name="vtiger_profile2standardpermissions">
 		<field name="profileid" type="I" size="11">
 			<key />
 		</field>
@@ -2859,7 +2859,7 @@
 		</index>
 	</table>
 
-	<table name="profile2field">
+	<table name="vtiger_profile2field">
 		<field name="profileid" type="I" size="11">
 			<key />
 		</field>
@@ -2885,7 +2885,7 @@
 		</index>
 	</table>
 
-	<table name="role2profile">
+	<table name="vtiger_role2profile">
 		<field name="roleid" type="C" size="255">
 			<key />
 		</field>
@@ -2898,7 +2898,7 @@
 		</index>
 	</table>
 
-	<table name="org_share_action_mapping">
+	<table name="vtiger_org_share_action_mapping">
 		<field name="share_action_id" type="I" size="19">
 			<key />
 		</field>
@@ -2907,7 +2907,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="def_org_share">
+	<table name="vtiger_def_org_share">
 		<field name="ruleid" type="I" size="11">
 			<key />
 			<autoincrement />
@@ -2916,12 +2916,12 @@
 			<notnull />
 		</field>
 		<field name="permission" type="I" size="19">
-			<constraint>REFERENCES org_share_action_mapping(share_action_id) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_org_share_action_mapping(share_action_id) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="editstatus" type="I" size="19" />
 	</table>
 
-	<table name="def_org_field">
+	<table name="vtiger_def_org_field">
 		<field name="tabid" type="I" size="10" />
 		<field name="fieldid" type="I" size="19">
 			<key />
@@ -2942,7 +2942,7 @@
 		</index>
 	</table>
 
-	<table name="profile2utility">
+	<table name="vtiger_profile2utility">
 		<field name="profileid" type="I" size="11">
 			<key />
 		</field>
@@ -2961,7 +2961,7 @@
 		</index>
 	</table>
 
-	<table name="productcategory">
+	<table name="vtiger_productcategory">
 		<field name="productcategoryid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -2985,12 +2985,12 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="salesorder">
+	<table name="vtiger_salesorder">
 		<field name="salesorderid" type="I" size="19">
 			<key />
 			<notnull />
 			<default value="0" />
-			<constraint>REFERENCES crmentity(crmid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="subject" type="C" size="100" />
 		<field name="potentialid" type="I" size="19" />
@@ -2998,10 +2998,10 @@
 		<field name="quoteid" type="I" size="19" />
 		<field name="vendorterms" type="C" size="100" />
 		<field name="contactid" type="I" size="19">
-			<constraint>REFERENCES contactdetails(contactid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="vendorid" type="I" size="19">
-			<constraint>REFERENCES vendor(vendorid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_vendor(vendorid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="duedate" type="D" />
 		<field name="carrier" type="C" size='100' />
@@ -3027,13 +3027,13 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="sogrouprelation">
+	<table name="vtiger_sogrouprelation">
 		<field name="salesorderid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES salesorder(salesorderid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_salesorder(salesorderid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="groupname" type="C" size="100">
-			<constraint>REFERENCES groups(groupname) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_groups(groupname) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="sogrouprelation_groupname_idx">
@@ -3042,11 +3042,11 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="sobillads">
+	<table name="vtiger_sobillads">
 		<field name="sobilladdressid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES salesorder(salesorderid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_salesorder(salesorderid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="bill_city" type="C" size="30" />
 		<field name="bill_code" type="C" size="30" />
@@ -3058,11 +3058,11 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="soshipads">
+	<table name="vtiger_soshipads">
 		<field name="soshipaddressid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES salesorder(salesorderid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_salesorder(salesorderid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="ship_city" type="C" size="30" />
 		<field name="ship_code" type="C" size="30" />
@@ -3074,24 +3074,24 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="salesordercf">
+	<table name="vtiger_salesordercf">
 		<field name="salesorderid" type="I" size="19">
 			<key />
 			<default value="0"/>
-			<constraint>REFERENCES salesorder(salesorderid) ON DELETE CASCADE</constraint>
-		</field>
-
-		<opt platform="mysql">Type=InnoDB</opt>
-	</table>
-
-	<table name="soproductrel">
+			<constraint>REFERENCES vtiger_salesorder(salesorderid) ON DELETE CASCADE</constraint>
+		</field>
+
+		<opt platform="mysql">Type=InnoDB</opt>
+	</table>
+
+	<table name="vtiger_soproductrel">
 		<field name="salesorderid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES salesorder(salesorderid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_salesorder(salesorderid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="productid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES products(productid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_products(productid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="quantity" type="I" size="19" />
 		<field name="listprice" type="N" size="11.3" />
@@ -3108,7 +3108,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="notificationscheduler">
+	<table name="vtiger_notificationscheduler">
 		<field name="schedulednotificationid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -3126,16 +3126,16 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="activityproductrel">
+	<table name="vtiger_activityproductrel">
 		<field name="activityid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES activity(activityid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_activity(activityid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="productid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES products(productid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_products(productid) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="activityproductrel_activityid_idx">
@@ -3147,7 +3147,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="relatedlists">
+	<table name="vtiger_relatedlists">
 		<field name="relation_id" type="I" size="19">
 			<key />
 		</field>
@@ -3166,7 +3166,7 @@
 		</index>
 	</table>
 
-	<table name="rss">
+	<table name="vtiger_rss">
 		<field name="rssid" type="I" size="19">
 			<key />
 		</field>
@@ -3183,22 +3183,22 @@
 		</field>
 	</table>
 
-	<table name="vendorcf">
+	<table name="vtiger_vendorcf">
 		<field name="vendorid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES vendor(vendorid) ON DELETE CASCADE</constraint>
-		</field>
-
-		<opt platform="mysql">Type=InnoDB</opt>
-	</table>
-
-	<table name="pricebook">
+			<constraint>REFERENCES vtiger_vendor(vendorid) ON DELETE CASCADE</constraint>
+		</field>
+
+		<opt platform="mysql">Type=InnoDB</opt>
+	</table>
+
+	<table name="vtiger_pricebook">
 		<field name="pricebookid" type="I" size="19">
 			<key />
 			<notnull />
 			<default value="0" />
-			<constraint>REFERENCES crmentity(crmid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="bookname" type="C" size="100" />
 		<field name="active" type="I" size="1" />
@@ -3207,24 +3207,24 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="pricebookcf">
+	<table name="vtiger_pricebookcf">
 		<field name="pricebookid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES pricebook(pricebookid) ON DELETE CASCADE</constraint>
-		</field>
-
-		<opt platform="mysql">Type=InnoDB</opt>
-	</table>
-
-	<table name="pricebookproductrel">
+			<constraint>REFERENCES vtiger_pricebook(pricebookid) ON DELETE CASCADE</constraint>
+		</field>
+
+		<opt platform="mysql">Type=InnoDB</opt>
+	</table>
+
+	<table name="vtiger_pricebookproductrel">
 		<field name="pricebookid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES pricebook(pricebookid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_pricebook(pricebookid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="productid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES products(productid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_products(productid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="listprice" type="N" size="11.3" />
 
@@ -3237,7 +3237,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="mail_accounts">
+	<table name="vtiger_mail_accounts">
 		<field name="account_id" type="I" size="11">
 			<key />
 		</field>
@@ -3266,22 +3266,22 @@
 		<field name="set_default" type="I" size="2" />
 	</table>
 
-	<table name="quotes">
+	<table name="vtiger_quotes">
 		<field name="quoteid" type="I" size="19">
 			<key />
 			<notnull />
 			<default value="0" />
-			<constraint>REFERENCES crmentity(crmid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="subject" type="C" size="100" />
 		<field name="potentialid" type="I" size="19">
-			<constraint>REFERENCES potential(potentialid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_potential(potentialid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="quotestage" type="C" size="200" />
 		<field name="validtill" type="D" />
 		<field name="team" type="C" size="200" />
 		<field name="contactid" type="I" size="19">
-			<constraint>REFERENCES contactdetails(contactid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="currency" type="C" size="100" />
 		<field name="subtotal" type="N" size="11.3" />
@@ -3307,11 +3307,11 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="quotesbillads">
+	<table name="vtiger_quotesbillads">
 		<field name="quotebilladdressid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES quotes(quoteid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_quotes(quoteid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="bill_city" type="C" size="30" />
 		<field name="bill_code" type="C" size="30" />
@@ -3323,11 +3323,11 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="quotesshipads">
+	<table name="vtiger_quotesshipads">
 		<field name="quoteshipaddressid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES quotes(quoteid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_quotes(quoteid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="ship_city" type="C" size="30" />
 		<field name="ship_code" type="C" size="30" />
@@ -3339,13 +3339,13 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="quotegrouprelation">
+	<table name="vtiger_quotegrouprelation">
 		<field name="quoteid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES quotes(quoteid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_quotes(quoteid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="groupname" type="C" size="100">
-			<constraint>REFERENCES groups(groupname) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_groups(groupname) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="quotegrouprelation_groupname_idx">
@@ -3354,24 +3354,24 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="quotescf">
+	<table name="vtiger_quotescf">
 		<field name="quoteid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES quotes(quoteid) ON DELETE CASCADE</constraint>
-		</field>
-
-		<opt platform="mysql">Type=InnoDB</opt>
-	</table>
-
-	<table name="quotesproductrel">
+			<constraint>REFERENCES vtiger_quotes(quoteid) ON DELETE CASCADE</constraint>
+		</field>
+
+		<opt platform="mysql">Type=InnoDB</opt>
+	</table>
+
+	<table name="vtiger_quotesproductrel">
 		<field name="quoteid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES quotes(quoteid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_quotes(quoteid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="productid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES products(productid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_products(productid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="quantity" type="I" size="19" />
 		<field name="listprice" type="N" size="11.3" />
@@ -3388,24 +3388,24 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="purchaseorder">
+	<table name="vtiger_purchaseorder">
 		<field name="purchaseorderid" type="I" size="19">
 			<key />
 			<notnull />
 			<default value="0" />
-			<constraint>REFERENCES crmentity(crmid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="subject" type="C" size="100" />
 		<field name="quoteid" type="I" size="19">
-			<constraint>REFERENCES quotes(quoteid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_quotes(quoteid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="vendorid" type="I" size="19">
-			<constraint>REFERENCES vendor(vendorid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_vendor(vendorid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="requisition_no" type="C" size="100" />
 		<field name="tracking_no" type="C" size="100" />
 		<field name="contactid" type="I" size="19">
-			<constraint>REFERENCES contactdetails(contactid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="duedate" type="D" />
 		<field name="carrier" type="C" size='100' />
@@ -3431,13 +3431,13 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="pogrouprelation">
+	<table name="vtiger_pogrouprelation">
 		<field name="purchaseorderid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES purchaseorder(purchaseorderid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_purchaseorder(purchaseorderid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="groupname" type="C" size="100">
-			<constraint>REFERENCES groups(groupname) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_groups(groupname) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="pogrouprelation_groupname_purchaseorderid_idx">
@@ -3447,11 +3447,11 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="pobillads">
+	<table name="vtiger_pobillads">
 		<field name="pobilladdressid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES purchaseorder(purchaseorderid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_purchaseorder(purchaseorderid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="bill_city" type="C" size="30" />
 		<field name="bill_code" type="C" size="30" />
@@ -3463,11 +3463,11 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="poshipads">
+	<table name="vtiger_poshipads">
 		<field name="poshipaddressid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES purchaseorder(purchaseorderid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_purchaseorder(purchaseorderid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="ship_city" type="C" size="30" />
 		<field name="ship_code" type="C" size="30" />
@@ -3479,24 +3479,24 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="purchaseordercf">
+	<table name="vtiger_purchaseordercf">
 		<field name="purchaseorderid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES purchaseorder(purchaseorderid) ON DELETE CASCADE</constraint>
-		</field>
-
-		<opt platform="mysql">Type=InnoDB</opt>
-	</table>
-
-	<table name="poproductrel">
+			<constraint>REFERENCES vtiger_purchaseorder(purchaseorderid) ON DELETE CASCADE</constraint>
+		</field>
+
+		<opt platform="mysql">Type=InnoDB</opt>
+	</table>
+
+	<table name="vtiger_poproductrel">
 		<field name="purchaseorderid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES purchaseorder(purchaseorderid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_purchaseorder(purchaseorderid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="productid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES products(productid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_products(productid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="quantity" type="I" size="19" />
 		<field name="listprice" type="N" size="11.3" />
@@ -3513,16 +3513,16 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="invoice">
+	<table name="vtiger_invoice">
 		<field name="invoiceid" type="I" size="19">
 			<key />
 			<notnull />
 			<default value="0" />
-			<constraint>REFERENCES crmentity(crmid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="subject" type="C" size="100" />
 		<field name="salesorderid" type="I" size="19">
-			<constraint>REFERENCES salesorder(salesorderid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_salesorder(salesorderid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="customerno" type="C" size="100" />
 		<field name="contactid" type="I" size="19" />
@@ -3549,13 +3549,13 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="invoicegrouprelation">
+	<table name="vtiger_invoicegrouprelation">
 		<field name="invoiceid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES invoice(invoiceid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_invoice(invoiceid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="groupname" type="C" size="100">
-			<constraint>REFERENCES groups(groupname) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_groups(groupname) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="invoicegrouprelation_groupname_invoiceid_idx">
@@ -3565,11 +3565,11 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="invoicebillads">
+	<table name="vtiger_invoicebillads">
 		<field name="invoicebilladdressid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES invoice(invoiceid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_invoice(invoiceid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="bill_city" type="C" size="30" />
 		<field name="bill_code" type="C" size="30" />
@@ -3581,11 +3581,11 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="invoiceshipads">
+	<table name="vtiger_invoiceshipads">
 		<field name="invoiceshipaddressid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES invoice(invoiceid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_invoice(invoiceid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="ship_city" type="C" size="30" />
 		<field name="ship_code" type="C" size="30" />
@@ -3597,24 +3597,24 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="invoicecf">
+	<table name="vtiger_invoicecf">
 		<field name="invoiceid" type="I" size="19">
 			<key />
 			<default value="0" />
-			<constraint>REFERENCES invoice(invoiceid) ON DELETE CASCADE</constraint>
-		</field>
-
-		<opt platform="mysql">Type=InnoDB</opt>
-	</table>
-
-	<table name="invoiceproductrel">
+			<constraint>REFERENCES vtiger_invoice(invoiceid) ON DELETE CASCADE</constraint>
+		</field>
+
+		<opt platform="mysql">Type=InnoDB</opt>
+	</table>
+
+	<table name="vtiger_invoiceproductrel">
 		<field name="invoiceid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES invoice(invoiceid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_invoice(invoiceid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="productid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES products(productid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_products(productid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="quantity" type="I" size="19" />
 		<field name="listprice" type="N" size="11.3" />
@@ -3631,7 +3631,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="activity_reminder">
+	<table name="vtiger_activity_reminder">
 		<field name="activity_id" type="I" size="11">
 			<key />
 			<notnull />
@@ -3648,7 +3648,7 @@
 		</field>
 	</table>
 
-	<table name="customview">
+	<table name="vtiger_customview">
 		<field name="cvid" type="I" size="19">
 			<key />
 		</field>
@@ -3668,11 +3668,11 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="cvcolumnlist">
+	<table name="vtiger_cvcolumnlist">
 		<field name="cvid" type="I" size="19">
 			<key />
 			<notnull />
-			<constraint>REFERENCES customview (cvid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_customview (cvid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="columnindex" type="I" size="11">
 			<key />
@@ -3691,10 +3691,10 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="cvstdfilter">
+	<table name="vtiger_cvstdfilter">
 		<field name="cvid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES customview (cvid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_customview (cvid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="columnname" type="C" size="250">
 			<default value="" />
@@ -3715,10 +3715,10 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="cvadvfilter">
+	<table name="vtiger_cvadvfilter">
 		<field name="cvid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES customview (cvid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_customview (cvid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="columnindex" type="I" size="11">
 			<key />
@@ -3740,10 +3740,10 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="customaction">
+	<table name="vtiger_customaction">
 		<field name="cvid" type="I" size="19">
 			<notnull />
-			<constraint>REFERENCES customview (cvid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_customview (cvid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="subject" type="C" size="250">
 			<notnull />
@@ -3761,7 +3761,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="selectquery">
+	<table name="vtiger_selectquery">
 		<field name="queryid" type="I" size="19">
 			<key />
 		</field>
@@ -3778,10 +3778,10 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="selectcolumn">
+	<table name="vtiger_selectcolumn">
 		<field name="queryid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES selectquery (queryid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_selectquery (queryid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="columnindex" type="I" size="11">
 			<key />
@@ -3798,10 +3798,10 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="relcriteria">
+	<table name="vtiger_relcriteria">
 		<field name="queryid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES selectquery (queryid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_selectquery (queryid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="columnindex" type="I" size="11">
 			<key />
@@ -3823,7 +3823,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="reportfolder">
+	<table name="vtiger_reportfolder">
 		<field name="folderid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -3842,13 +3842,13 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="report">
+	<table name="vtiger_report">
 		<field name="reportid" type="I" size="19">
 			<key />
 		</field>
 		<field name="folderid" type="I" size="19">
 			<notnull />
-			<constraint>REFERENCES reportfolder (folderid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_reportfolder (folderid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="reportname" type="C" size="100">
 			<default value="" />
@@ -3862,7 +3862,7 @@
 		<field name="queryid" type="I" size="19">
 			<notnull />
 			<default value="0" />
-			<constraint>REFERENCES selectquery (queryid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_selectquery (queryid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="state" type="C" size="50">
 			<default value="SAVED" />
@@ -3883,10 +3883,10 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="reportmodules">
+	<table name="vtiger_reportmodules">
 		<field name="reportmodulesid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES report (reportid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_report (reportid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="primarymodule" type="C" size="50">
 			<notnull />
@@ -3899,13 +3899,13 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="reportsortcol">
+	<table name="vtiger_reportsortcol">
 		<field name="sortcolid" type="I" size="19">
 			<key />
 		</field>
 		<field name="reportid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES report (reportid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_report (reportid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="columnname" type="C" size="250">
 			<default value="" />
@@ -3917,10 +3917,10 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="reportdatefilter">
+	<table name="vtiger_reportdatefilter">
 		<field name="datefilterid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES report (reportid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_report (reportid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="datecolumnname" type="C" size="250">
 			<default value="" />
@@ -3941,10 +3941,10 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="reportsummary">
+	<table name="vtiger_reportsummary">
 		<field name="reportsummaryid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES report (reportid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_report (reportid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="summarytype" type="I" size="19">
 			<key />
@@ -3960,7 +3960,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="usageunit">
+	<table name="vtiger_usageunit">
 		<field name="usageunitid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -3984,7 +3984,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="glacct">
+	<table name="vtiger_glacct">
 		<field name="glacctid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -4008,7 +4008,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="quotestage">
+	<table name="vtiger_quotestage">
 		<field name="quotestageid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -4032,7 +4032,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="invoicestatus">
+	<table name="vtiger_invoicestatus">
 		<field name="inovicestatusid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -4056,7 +4056,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="postatus">
+	<table name="vtiger_postatus">
 		<field name="postatusid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -4080,7 +4080,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="sostatus">
+	<table name="vtiger_sostatus">
 		<field name="sostatusid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -4105,7 +4105,7 @@
 
 	</table>
 
-	<table name="carrier">
+	<table name="vtiger_carrier">
 		<field name="carrierid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -4129,7 +4129,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="taxclass">
+	<table name="vtiger_taxclass">
 		<field name="taxclassid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -4153,7 +4153,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="organizationdetails">
+	<table name="vtiger_organizationdetails">
 		<field name="organizationame" type="C" size="60">
 			<key />
 		</field>
@@ -4171,7 +4171,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="recurringtype">
+	<table name="vtiger_recurringtype">
 		<field name="recurringeventid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -4195,7 +4195,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="recurringevents">
+	<table name="vtiger_recurringevents">
 		<field name="recurringid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -4209,7 +4209,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="inventorynotification">
+	<table name="vtiger_inventorynotification">
 		<field name="notificationid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -4222,7 +4222,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="inventory_tandc">
+	<table name="vtiger_inventory_tandc">
 		<field name="id" type="I" size="19">
 			<key />
 		</field>
@@ -4232,7 +4232,7 @@
 		<field name="tandc" type="X" />
 	</table>
 
-	<table name="convertleadmapping">
+	<table name="vtiger_convertleadmapping">
 		<field name="cfmid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -4247,7 +4247,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="actionmapping">
+	<table name="vtiger_actionmapping">
 		<field name="actionid" type="I" size="19">
 			<key />
 		</field>
@@ -4259,25 +4259,25 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="org_share_action2tab">
+	<table name="vtiger_org_share_action2tab">
 		<field name="share_action_id" type="I" size="19">
 			<key />
-			<constraint>REFERENCES org_share_action_mapping(share_action_id) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_org_share_action_mapping(share_action_id) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="tabid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES tab(tabid) ON DELETE CASCADE</constraint>
-		</field>
-
-		<opt platform="mysql">Type=InnoDB</opt>
-	</table>
-
-	<table name="moduleowners">
+			<constraint>REFERENCES vtiger_tab(tabid) ON DELETE CASCADE</constraint>
+		</field>
+
+		<opt platform="mysql">Type=InnoDB</opt>
+	</table>
+
+	<table name="vtiger_moduleowners">
 		<field name="tabid" type="I" size="19">
 			<key />
 			<unique />
 			<default value="0" />
-			<constraint>REFERENCES tab(tabid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_tab(tabid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="user_id" type="C" size="11">
 			<notnull />
@@ -4289,7 +4289,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="ownernotify">
+	<table name="vtiger_ownernotify">
 		<field name="crmid" type="I" size="19" />
 		<field name="smownerid" type="I" size="19" />
 		<field name="flag" type="I" size="3" />
@@ -4301,13 +4301,13 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="datashare_module_rel">
+	<table name="vtiger_datashare_module_rel">
 		<field name="shareid" type="I" size="19">
 			<key />
 		</field>
 		<field name="tabid" type="I" size="19">
 			<notnull />
-			<constraint>REFERENCES tab(tabid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_tab(tabid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="relationtype" type="C" size="200">
 		</field>
@@ -4317,16 +4317,16 @@
 		</index>
 	</table>
 
-	<table name="datashare_grp2grp">
+	<table name="vtiger_datashare_grp2grp">
 		<field name="shareid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES datashare_module_rel(shareid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_datashare_module_rel(shareid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="share_groupid" type="I" size="19">
-			<constraint>REFERENCES groups(groupid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_groups(groupid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="to_groupid" type="I" size="19">
-			<constraint>REFERENCES groups(groupid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_groups(groupid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="permission" type="I" size="19" />
 
@@ -4339,16 +4339,16 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="datashare_grp2role">
+	<table name="vtiger_datashare_grp2role">
 		<field name="shareid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES datashare_module_rel(shareid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_datashare_module_rel(shareid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="share_groupid" type="I" size="19">
-			<constraint>REFERENCES groups(groupid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_groups(groupid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="to_roleid" type="C" size="255">
-			<constraint>REFERENCES role(roleid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_role(roleid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="permission" type="I" size="19" />
 
@@ -4361,16 +4361,16 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="datashare_grp2rs">
+	<table name="vtiger_datashare_grp2rs">
 		<field name="shareid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES datashare_module_rel(shareid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_datashare_module_rel(shareid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="share_groupid" type="I" size="19">
-			<constraint>REFERENCES groups(groupid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_groups(groupid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="to_roleandsubid" type="C" size="255">
-			<constraint>REFERENCES role(roleid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_role(roleid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="permission" type="I" size="19" />
 
@@ -4383,16 +4383,16 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="datashare_role2group">
+	<table name="vtiger_datashare_role2group">
 		<field name="shareid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES datashare_module_rel(shareid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_datashare_module_rel(shareid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="share_roleid" type="C" size="255">
-			<constraint>REFERENCES role(roleid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_role(roleid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="to_groupid" type="I" size="19">
-			<constraint>REFERENCES groups(groupid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_groups(groupid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="permission" type="I" size="19" />
 
@@ -4405,16 +4405,16 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="datashare_role2role">
+	<table name="vtiger_datashare_role2role">
 		<field name="shareid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES datashare_module_rel(shareid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_datashare_module_rel(shareid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="share_roleid" type="C" size="255">
-			<constraint>REFERENCES role(roleid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_role(roleid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="to_roleid" type="C" size="255">
-			<constraint>REFERENCES role(roleid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_role(roleid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="permission" type="I" size="19" />
 
@@ -4427,16 +4427,16 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="datashare_role2rs">
+	<table name="vtiger_datashare_role2rs">
 		<field name="shareid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES datashare_module_rel(shareid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_datashare_module_rel(shareid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="share_roleid" type="C" size="255">
-			<constraint>REFERENCES role(roleid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_role(roleid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="to_roleandsubid" type="C" size="255">
-			<constraint>REFERENCES role(roleid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_role(roleid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="permission" type="I" size="19" />
 
@@ -4449,16 +4449,16 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="datashare_rs2grp">
+	<table name="vtiger_datashare_rs2grp">
 		<field name="shareid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES datashare_module_rel(shareid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_datashare_module_rel(shareid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="share_roleandsubid" type="C" size="255">
-			<constraint>REFERENCES role(roleid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_role(roleid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="to_groupid" type="I" size="19">
-			<constraint>REFERENCES groups(groupid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_groups(groupid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="permission" type="I" size="19" />
 
@@ -4471,16 +4471,16 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="datashare_rs2role">
+	<table name="vtiger_datashare_rs2role">
 		<field name="shareid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES datashare_module_rel(shareid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_datashare_module_rel(shareid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="share_roleandsubid" type="C" size="255">
-			<constraint>REFERENCES role(roleid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_role(roleid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="to_roleid" type="C" size="255">
-			<constraint>REFERENCES role(roleid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_role(roleid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="permission" type="I" size="19" />
 
@@ -4493,16 +4493,16 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="datashare_rs2rs">
+	<table name="vtiger_datashare_rs2rs">
 		<field name="shareid" type="I" size="19">
 			<key />
-			<constraint>REFERENCES datashare_module_rel(shareid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_datashare_module_rel(shareid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="share_roleandsubid" type="C" size="255">
-			<constraint>REFERENCES role(roleid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_role(roleid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="to_roleandsubid" type="C" size="255">
-			<constraint>REFERENCES role(roleid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_role(roleid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="permission" type="I" size="19" />
 
@@ -4515,15 +4515,15 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="datashare_relatedmodules">
+	<table name="vtiger_datashare_relatedmodules">
 		<field name="datashare_relatedmodule_id" type="I" size="19">
 			<key />
 		</field>
 		<field name="tabid" type="I" size="19">
-			<constraint>REFERENCES tab(tabid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_tab(tabid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="relatedto_tabid" type="I" size="19">
-			<constraint>REFERENCES tab(tabid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_tab(tabid) ON DELETE CASCADE</constraint>
 		</field>
 		<index name="datashare_relatedmodules_tabid_idx">
 			<col>tabid</col>
@@ -4534,7 +4534,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="datashare_relatedmodule_permission">
+	<table name="vtiger_datashare_relatedmodule_permission">
 		<field name="shareid" type="I" size="19">
 			<key />
 		</field>
@@ -4550,7 +4550,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="parenttab">
+	<table name="vtiger_parenttab">
 		<field name="parenttabid" type="I" size="19">
 			<notnull />
 			<key />
@@ -4572,18 +4572,18 @@
 		</index>
 	</table>
 
-	<table name="tmp_read_user_sharing_per">
+	<table name="vtiger_tmp_read_user_sharing_per">
 		<field name="userid" type="I" size="11">
 			<key />
-			<constraint>REFERENCES users(id) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_users(id) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="tabid" type="I" size="11">
 			<key />
-			<constraint>REFERENCES tab(tabid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_tab(tabid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="shareduserid" type="I" size="11">
 			<key />
-			<constraint>REFERENCES users(id) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_users(id) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="tmp_read_user_sharing_per_userid_shareduserid_idx">
@@ -4593,18 +4593,18 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="tmp_read_group_sharing_per">
+	<table name="vtiger_tmp_read_group_sharing_per">
 		<field name="userid" type="I" size="11">
 			<key />
-			<constraint>REFERENCES users(id) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_users(id) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="tabid" type="I" size="11">
 			<key />
-			<constraint>REFERENCES tab(tabid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_tab(tabid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="sharedgroupid" type="I" size="11">
 			<key />
-			<constraint>REFERENCES groups(groupid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_groups(groupid) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="tmp_read_group_sharing_per_userid_sharedgroupid_idx">
@@ -4614,18 +4614,18 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="tmp_write_user_sharing_per">
+	<table name="vtiger_tmp_write_user_sharing_per">
 		<field name="userid" type="I" size="11">
 			<key />
-			<constraint>REFERENCES users(id) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_users(id) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="tabid" type="I" size="11">
 			<key />
-			<constraint>REFERENCES tab(tabid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_tab(tabid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="shareduserid" type="I" size="11">
 			<key />
-			<constraint>REFERENCES users(id) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_users(id) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="tmp_write_user_sharing_per_userid_shareduserid_idx">
@@ -4635,18 +4635,18 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="tmp_write_group_sharing_per">
+	<table name="vtiger_tmp_write_group_sharing_per">
 		<field name="userid" type="I" size="11">
 			<key />
-			<constraint>REFERENCES users(id) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_users(id) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="tabid" type="I" size="11">
 			<key />
-			<constraint>REFERENCES tab(tabid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_tab(tabid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="sharedgroupid" type="I" size="11">
 			<key />
-			<constraint>REFERENCES groups(groupid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_groups(groupid) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="tmp_write_group_sharing_per_UK1">
@@ -4656,22 +4656,22 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="tmp_read_user_rel_sharing_per">
+	<table name="vtiger_tmp_read_user_rel_sharing_per">
 		<field name="userid" type="I" size="11">
 			<key />
-			<constraint>REFERENCES users(id) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_users(id) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="tabid" type="I" size="11">
 			<key />
-			<constraint>REFERENCES tab(tabid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_tab(tabid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="relatedtabid" type="I" size="11">
 			<key />
-			<constraint>REFERENCES tab(tabid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_tab(tabid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="shareduserid" type="I" size="11">
 			<key />
-			<constraint>REFERENCES users(id) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_users(id) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="tmp_read_user_rel_sharing_per_userid_shared_reltabid_idx">
@@ -4682,22 +4682,22 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="tmp_read_group_rel_sharing_per">
+	<table name="vtiger_tmp_read_group_rel_sharing_per">
 		<field name="userid" type="I" size="11">
 			<key />
-			<constraint>REFERENCES users(id) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_users(id) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="tabid" type="I" size="11">
 			<key />
-			<constraint>REFERENCES tab(tabid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_tab(tabid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="relatedtabid" type="I" size="11">
 			<key />
-			<constraint>REFERENCES tab(tabid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_tab(tabid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="sharedgroupid" type="I" size="11">
 			<key />
-			<constraint>REFERENCES groups(groupid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_groups(groupid) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="tmp_read_group_rel_sharing_per_userid_sharedgroupid_tabid">
@@ -4708,22 +4708,22 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="tmp_write_user_rel_sharing_per">
+	<table name="vtiger_tmp_write_user_rel_sharing_per">
 		<field name="userid" type="I" size="11">
 			<key />
-			<constraint>REFERENCES users(id) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_users(id) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="tabid" type="I" size="11">
 			<key />
-			<constraint>REFERENCES tab(tabid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_tab(tabid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="relatedtabid" type="I" size="11">
 			<key />
-			<constraint>REFERENCES tab(tabid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_tab(tabid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="shareduserid" type="I" size="11">
 			<key />
-			<constraint>REFERENCES users(id) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_users(id) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="tmp_write_user_rel_sharing_per_userid_sharduserid_tabid_idx">
@@ -4734,22 +4734,22 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="tmp_write_group_rel_sharing_per">
+	<table name="vtiger_tmp_write_group_rel_sharing_per">
 		<field name="userid" type="I" size="11">
 			<key />
-			<constraint>REFERENCES users(id) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_users(id) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="tabid" type="I" size="11">
 			<key />
-			<constraint>REFERENCES tab(tabid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_tab(tabid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="relatedtabid" type="I" size="11">
 			<key />
-			<constraint>REFERENCES tab(tabid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_tab(tabid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="sharedgroupid" type="I" size="11">
 			<key />
-			<constraint>REFERENCES groups(groupid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_groups(groupid) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="tmp_write_group_rel_sharing_per_userid_sharedgroupid_tabid_idx">
@@ -4760,7 +4760,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="parenttabrel">
+	<table name="vtiger_parenttabrel">
 		<field name="parenttabid" type="I" size="3">
 			<notnull />
 		</field>
@@ -4778,7 +4778,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="campaigntype">
+	<table name="vtiger_campaigntype">
 		<field name="campaigntypeid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -4802,7 +4802,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="campaignstatus">
+	<table name="vtiger_campaignstatus">
 		<field name="campaignstatusid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -4825,7 +4825,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="expectedresponse">
+	<table name="vtiger_expectedresponse">
 		<field name="expectedresponseid" type="I" size="19">
 			<key />
 			<autoincrement />
@@ -4849,7 +4849,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="portal">
+	<table name="vtiger_portal">
 		<field name="portalid" type="I" size="19">
 			<key />
 		</field>
@@ -4869,7 +4869,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="announcement">
+	<table name="vtiger_announcement">
 		<field name="creatorid" type="I" size="19">
 			<key />
 		</field>
@@ -4885,7 +4885,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="chat_users">
+	<table name="vtiger_chat_users">
 		<field name="id" type="I" size="20">
 			<autoincrement />
 			<notnull />
@@ -4917,7 +4917,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="chat_msg">
+	<table name="vtiger_chat_msg">
 		<field name="id" type="I" size="20">
 			<autoincrement />
 			<notnull />
@@ -4926,7 +4926,7 @@
 		<field name="chat_from" type="I" size="20">
 			<default value="0" />
 			<notnull />
-			<constraint>REFERENCES chat_users(id) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_chat_users(id) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="chat_to" type="I" size="20">
 			<default value="0" />
@@ -4951,7 +4951,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="chat_pchat">
+	<table name="vtiger_chat_pchat">
 		<field name="id" type="I" size="20">
 			<autoincrement />
 			<notnull />
@@ -4959,7 +4959,7 @@
 		</field>
 		<field name="msg" type="I" size="20">
 			<default value="0"/>
-			<constraint>REFERENCES chat_msg(id) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_chat_msg(id) ON DELETE CASCADE</constraint>
 		</field>
 
 		<index name="chat_pchat_msg_idx">
@@ -4969,7 +4969,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="chat_pvchat">
+	<table name="vtiger_chat_pvchat">
 		<field name="id" type="I" size="20">
 			<autoincrement />
 			<notnull />
@@ -4977,7 +4977,7 @@
 		</field>
 		<field name="msg" type="I" size="20">
 			<default value="0"/>
-			<constraint>REFERENCES chat_msg(id) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_chat_msg(id) ON DELETE CASCADE</constraint>
 		</field>
 		<index name="chat_pvchat_msg_idx">
 			<col>msg</col>
@@ -4986,7 +4986,7 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="freetags">
+	<table name="vtiger_freetags">
 		<field name="id" type="I" size="19">
 			<notnull />
 			<key />
@@ -5001,7 +5001,7 @@
 		</field>
 	</table>
 
-	<table name="freetagged_objects">
+	<table name="vtiger_freetagged_objects">
 		<field name="tag_id" type="I" size="20">
 			<notnull />
 			<default value="0" />
@@ -5033,7 +5033,7 @@
 		</index>
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
-	<table name="emaildetails">
+	<table name="vtiger_emaildetails">
 		<field name="emailid" type="I" size="19">
 			<notnull />
 			<key />
@@ -5065,7 +5065,7 @@
 		</field>
 	</table>
 
-	<table name="invitees">
+	<table name="vtiger_invitees">
 		<field name="activityid" type="I" size="19">
 			<KEY/>
 		</field>
@@ -5074,7 +5074,7 @@
 		</field>
 	</table>
 
-	<table name="inventorytaxinfo">
+	<table name="vtiger_inventorytaxinfo">
 		<field name="taxid" type="I" size="3">
 			<KEY/>
 			<notnull />
@@ -5092,10 +5092,10 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
-	<table name="producttaxrel">
+	<table name="vtiger_producttaxrel">
 		<field name="productid" type="I" size="11">
 			<notnull />
-			<constraint>REFERENCES products(productid) ON DELETE CASCADE</constraint>
+			<constraint>REFERENCES vtiger_products(productid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="taxid" type="I" size="3">
 			<notnull />




From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 12 17:08:59 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 12 Jun 2006 21:08:59 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231297=3A?=
 =?utf-8?q?_alternative_database_backends=3F?=
Message-ID: <076.1f5ecc93726b0e4d2e62c44198f6448a@vtiger.fosslabs.com>

#1297: alternative database backends?
-------------------------------+--------------------------------------------
 Reporter:  martti at aplcomplfi  |       Owner:  developer
     Type:  enhancement        |      Status:  new      
 Priority:  major              |   Milestone:           
Component:  vtigercrm          |     Version:  5.0.0    
 Keywords:  mysql              |  
-------------------------------+--------------------------------------------
 Is it possible to replace mysql by another database mrg?
 Are the docs which I can make use of for that purpose.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1297>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 12 17:09:23 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 12 Jun 2006 21:09:23 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231297=3A?=
 =?utf-8?q?_alternative_database_backends=3F?=
In-Reply-To: <076.1f5ecc93726b0e4d2e62c44198f6448a@vtiger.fosslabs.com>
References: <076.1f5ecc93726b0e4d2e62c44198f6448a@vtiger.fosslabs.com>
Message-ID: <085.ed9f6ca7f7a3b7972a5df7f2eca02277@vtiger.fosslabs.com>

#1297: alternative database backends?
--------------------------------+-------------------------------------------
  Reporter:  martti at aplcomplfi  |       Owner:  developer
      Type:  enhancement        |      Status:  new      
  Priority:  major              |   Milestone:           
 Component:  vtigercrm          |     Version:  5.0.0    
Resolution:                     |    Keywords:  mysql    
--------------------------------+-------------------------------------------
-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1297>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 12 17:24:17 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 12 Jun 2006 21:24: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.c0517a3839346f3d4874b31469d8d63f@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 [7005]) Fixed issue with sub modules being rendered as related lists
 caused by changeset:5571, which messes up the row counts.  Refs #750.

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/750>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 12 17:24:18 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 12 Jun 2006 21:24:18 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7005 -
	/vtigercrm/branches/4.2/include/utils.php
Message-ID: <20060612212418.962687E8C1E@vtiger.fosslabs.com>

Author: allanbush
Date: Mon Jun 12 15:24:14 2006
New Revision: 7005

Log:
Fixed issue with sub modules being rendered as related lists caused by changeset:5571, which messes up the row counts.  Refs #750.

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 Mon Jun 12 15:24:14 2006
@@ -3050,7 +3050,7 @@
                 }
         }
 
-	$relmodule = $_REQUEST['module'] == $module || $_REQUEST['module'] == 'Home' ? '' : $module;
+	$relmodule = ($_REQUEST['module'] == $module || !$relatedlist) || $_REQUEST['module'] == 'Home' ? '' : $module;
 	$start = $relmodule.'start';
 	$end_val = $relmodule.'end_val'; 
 	for ($i=$navigation_array[$start]; $i<=$navigation_array[$end_val]; $i++)




From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 12 17:26:03 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 12 Jun 2006 21:26:03 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7006 -
 /vtigercrm/branches/4.2/modules/Products/addPbProductRelToDB.php
Message-ID: <20060612212603.0A5B07E8C1D@vtiger.fosslabs.com>

Author: allanbush
Date: Mon Jun 12 15:26:01 2006
New Revision: 7006

Log:
Fixed sql injection problems.

Modified:
    vtigercrm/branches/4.2/modules/Products/addPbProductRelToDB.php

Modified: vtigercrm/branches/4.2/modules/Products/addPbProductRelToDB.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Products/addPbProductRelToDB.php (original)
+++ vtigercrm/branches/4.2/modules/Products/addPbProductRelToDB.php Mon Jun 12 15:26:01 2006
@@ -16,19 +16,21 @@
 require_once('include/database/PearDatabase.php');
 $idlist = $_POST['idlist'];
 $returnmodule=$_REQUEST['return_module'];
-$pricebook_id=$_REQUEST['pricebook_id'];
-$productid=$_REQUEST['product_id'];
+$pricebook_id=(int)$_REQUEST['pricebook_id'];
+$productid=(int)$_REQUEST['product_id'];
 if(isset($_REQUEST['pricebook_id']) && $_REQUEST['pricebook_id']!='')
 {
 	//split the string and store in an array
 	$storearray = explode(";",$idlist);
+	array_filter($storearray);
 	foreach($storearray as $id)
 	{
+		$id = (int) $id;
 		$lp_name = $id.'_listprice';
 		$list_price = $_REQUEST[$lp_name];
 		//Updating the pricebook product rel table
 		$vtlog->logthis("Products :: Inserting products to price book","info");
-		$query= "insert into pricebookproductrel (pricebookid,productid,listprice) values(".$pricebook_id.",".$id.",".$list_price.")";
+		$query= "insert into pricebookproductrel (pricebookid,productid,listprice) values(".$pricebook_id.",".$id.",".$adb->quote($list_price).")";
 		$adb->query($query);
 	}
 	header("Location: index.php?module=Products&action=PriceBookDetailView&record=".$pricebook_id);
@@ -37,13 +39,15 @@
 {
 	//split the string and store in an array
 	$storearray = explode(";",$idlist);
+	array_filter($storearray);
 	foreach($storearray as $id)
 	{
+		$id = (int) $id;
 		$lp_name = $id.'_listprice';
 		$list_price = $_REQUEST[$lp_name];
 		//Updating the pricebook product rel table
 		$vtlog->logthis("Products :: Inserting PriceBooks to Product","info");
-		$query= "insert into pricebookproductrel (pricebookid,productid,listprice) values(".$id.",".$productid.",".$list_price.")";
+		$query= "insert into pricebookproductrel (pricebookid,productid,listprice) values(".$id.",".$productid.",".$adb->quote($list_price).")";
 		$adb->query($query);
 	}
 	header("Location: index.php?module=Products&action=DetailView&record=".$productid);




From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 12 19:13:12 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 12 Jun 2006 23:13:12 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231298=3A?=
 =?utf-8?q?_revert_r7003=3A7004_prefix_vtiger=5F_to_all_tablenames?=
Message-ID: <076.32456f312efcd1431e178d7f1df1ccb0@vtiger.fosslabs.com>

#1298: revert r7003:7004 prefix vtiger_ to all tablenames
-----------------------+----------------------------------------------------
 Reporter:  jeffk      |       Owner:  don  
     Type:  defect     |      Status:  new  
 Priority:  major      |   Milestone:  5.0.0
Component:  vtigercrm  |     Version:  5.0.0
 Keywords:  database   |  
-----------------------+----------------------------------------------------
 These are scary changesets, and I think they're going to break a lot of
 code in ways yet to be found. I'm not completely opposed to tablename
 prefixes, but there needs to be a consensus and a lot of eyeballs
 following the change.

 Please document (with a trac ticket) why we need these, and consider
 whether this amount of change can be sustained between beta 1 and beta2
 status.

 If you decided to revert the changesets, you want to undo r7003 and r7004,
 taking you back to r7002. In a working copy (aka checkout) of
 vtigercrm/trunk, the command would look something like this:
 {{{
 $ svn merge -r 7004:7002
 http://username at vtiger.fosslabs.com/svn/vtiger/vtigercrm/trunk
 }}}
 Then commit and ref this ticket.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1298>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 13 01:00:34 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 13 Jun 2006 05:00:34 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=2359=3A_r?=
 =?utf-8?q?eplace_jpgraph_by_Image=5Fgraph?=
In-Reply-To: <076.b821c43b0373542aacafa531d0ee60aa@vtiger.fosslabs.com>
References: <076.b821c43b0373542aacafa531d0ee60aa@vtiger.fosslabs.com>
Message-ID: <085.4c02e1684e810e5d7fc49e069e1e7c96@vtiger.fosslabs.com>

#59: replace jpgraph by Image_graph
------------------------+---------------------------------------------------
  Reporter:  fathi      |       Owner:  developer
      Type:  task       |      Status:  closed   
  Priority:  major      |   Milestone:  4.2.5    
 Component:  vtigercrm  |     Version:  4.2.3    
Resolution:  fixed      |    Keywords:           
------------------------+---------------------------------------------------
Changes (by allanbush):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 [6998] closes this as well.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/59>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 13 01:07:59 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 13 Jun 2006 05:07:59 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=2349=3A_R?=
 =?utf-8?q?emove_files_from_previous_versions_in_4=2E2?=
In-Reply-To: <076.3af4fecaf060a1d1e8bbd0759bce146e@vtiger.fosslabs.com>
References: <076.3af4fecaf060a1d1e8bbd0759bce146e@vtiger.fosslabs.com>
Message-ID: <085.064dfbf0adb82b7b777f8f3cc2172713@vtiger.fosslabs.com>

#49: Remove files from previous versions in 4.2
------------------------+---------------------------------------------------
  Reporter:  mfedyk     |       Owner:  developer
      Type:  defect     |      Status:  new      
  Priority:  trivial    |   Milestone:  4.2.5    
 Component:  vtigercrm  |     Version:  4.2.4rc2 
Resolution:             |    Keywords:           
------------------------+---------------------------------------------------
Comment (by allanbush):

 changetsets [6981], [6980] and [6978] should reference this.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/49>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 01:19:41 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 05:19:41 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7007 -
 /vtigercrm/branches/4.2/include/database/PearDatabase.php
Message-ID: <20060613051941.9BBC87E8C31@vtiger.fosslabs.com>

Author: allanbush
Date: Mon Jun 12 23:19:33 2006
New Revision: 7007

Log:
Undoing change committed in changeset:6981 as it including debugging information which doesn't need to be checked in.

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 Mon Jun 12 23:19:33 2006
@@ -15,8 +15,7 @@
 
 require_once('include/logging.php');
 include('adodb/adodb.inc.php');
-require_once("adodb/adodb-xmlschema03.inc.php");
-require_once("include/utils.php");
+require_once("adodb/adodb-xmlschema.inc.php");
 
 require_once('vtigerlogger.php');
 global $vtlog;
@@ -665,7 +664,7 @@
 		}
 		
 		$this->database = ADONewConnection($this->dbType);
-		$this->database->debug = true;
+		//$this->database->debug = true;
 		
 		$this->database->Connect($this->dbHostName, $this->userName, $this->userPassword, $this->dbName);
 		$this->database->LogSQL($this->enableSQLlog);




From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 13 01:24:43 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 13 Jun 2006 05:24:43 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=2340=3A_c?=
 =?utf-8?q?reate=5Fdefault=5Fusers=28=29_outputs_blank_line?=
In-Reply-To: <076.0ca26064fb8fcb73ccc115fc38d48ac3@vtiger.fosslabs.com>
References: <076.0ca26064fb8fcb73ccc115fc38d48ac3@vtiger.fosslabs.com>
Message-ID: <085.a98ca3789641ff7e0298ea3cb87634fa@vtiger.fosslabs.com>

#40: create_default_users() outputs blank line
------------------------+---------------------------------------------------
  Reporter:  mfedyk     |       Owner:  developer
      Type:  defect     |      Status:  closed   
  Priority:  trivial    |   Milestone:  4.2.5    
 Component:  vtigercrm  |     Version:  4.2.4rc1 
Resolution:  fixed      |    Keywords:           
------------------------+---------------------------------------------------
Changes (by allanbush):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/40>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 13 01:38:58 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 13 Jun 2006 05:38:58 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=2341=3A_P?=
 =?utf-8?q?eardatabase=2Ephp=2C_minor_erroneous_coding_in_createTables?=
In-Reply-To: <076.39e4a5f55adc4717e869543b8e6a41e1@vtiger.fosslabs.com>
References: <076.39e4a5f55adc4717e869543b8e6a41e1@vtiger.fosslabs.com>
Message-ID: <085.a6847eb6d427616d5791ba68277ef49b@vtiger.fosslabs.com>

#41: Peardatabase.php, minor erroneous coding in createTables
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  allanbush                
      Type:  defect     |      Status:  assigned                 
  Priority:  trivial    |   Milestone:  4.2.5                    
 Component:  vtigercrm  |     Version:  4.2.4rc1                 
Resolution:             |    Keywords:  peardatabase createtables
------------------------+---------------------------------------------------
Changes (by allanbush):

  * status:  new => assigned
  * owner:  developer => allanbush

Comment:

 Interesting it seems that what this patch fixes is the variable $schema
 and $sehema are being interchanged in this part of the code.  The end
 result is that adodb debug mode isn't being set here before loading the
 database schema.

 It looks like the debugging mode is too verbose (gives status reports as
 well as errors) so this attempt to set the debugging mode should be
 removed.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/41>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 13 01:43:02 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 13 Jun 2006 05:43:02 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=2341=3A_P?=
 =?utf-8?q?eardatabase=2Ephp=2C_minor_erroneous_coding_in_createTables?=
In-Reply-To: <076.39e4a5f55adc4717e869543b8e6a41e1@vtiger.fosslabs.com>
References: <076.39e4a5f55adc4717e869543b8e6a41e1@vtiger.fosslabs.com>
Message-ID: <085.12acabe85e13facca9d1ec4b65f809ae@vtiger.fosslabs.com>

#41: Peardatabase.php, minor erroneous coding in createTables
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  allanbush                
      Type:  defect     |      Status:  closed                   
  Priority:  trivial    |   Milestone:  4.2.5                    
 Component:  vtigercrm  |     Version:  4.2.4rc1                 
Resolution:  fixed      |    Keywords:  peardatabase createtables
------------------------+---------------------------------------------------
Changes (by allanbush):

  * resolution:  => fixed
  * status:  assigned => closed

Comment:

 (In [7008]) Fixed typo in variable name to set debugging mode on database
 creation and commented it out so debugging mode is not set by default.
 Closes #41.

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/41>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 01:43:02 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 05:43:02 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7008 -
 /vtigercrm/branches/4.2/include/database/PearDatabase.php
Message-ID: <20060613054302.9EB127E8C3D@vtiger.fosslabs.com>

Author: allanbush
Date: Mon Jun 12 23:42:58 2006
New Revision: 7008

Log:
Fixed typo in variable name to set debugging mode on database creation and commented it out so debugging mode is not set by default.  Closes #41.

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 Mon Jun 12 23:42:58 2006
@@ -807,12 +807,10 @@
 	//$db->debug = true;
 	
 
-	//$this->println("ADODB createTables connect status=".$db->Connect($this->dbHostName, $this->userName, $this->userPassword, $this->dbName));
 	$schema = new adoSchema( $db );
-	//Debug Adodb XML Schema
-	$sehema->XMLS_DEBUG = TRUE;
-	//Debug Adodb
-	$sehema->debug = true;
+	// Debug Adodb XML Schema
+	// $schema->XMLS_DEBUG = TRUE;
+	// $schema->debug = true;
 	$sql = $schema->ParseSchema( $schemaFile );
 
 	$this->println("--------------Starting the table creation------------------");




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 01:55:23 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 05:55:23 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7009 -
 /vtigercrm/branches/4.2/modules/Activities/OpenListView.html
Message-ID: <20060613055523.D30F17E8C37@vtiger.fosslabs.com>

Author: allanbush
Date: Mon Jun 12 23:55:21 2006
New Revision: 7009

Log:
Fixing mime-type properties.

Modified:
    vtigercrm/branches/4.2/modules/Activities/OpenListView.html   (props changed)




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 02:00:24 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 06:00:24 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7010 - in
 /vtigercrm/branches/4.2/modules: Activities/OpenListView.html
 Potentials/ListViewTop.html
Message-ID: <20060613060024.924187E8C41@vtiger.fosslabs.com>

Author: allanbush
Date: Tue Jun 13 00:00:22 2006
New Revision: 7010

Log:
Fixing mime-type properties.

Modified:
    vtigercrm/branches/4.2/modules/Activities/OpenListView.html   (props changed)
    vtigercrm/branches/4.2/modules/Potentials/ListViewTop.html   (props changed)




From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 13 02:02:25 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 13 Jun 2006 06:02:25 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231263=3A?=
 =?utf-8?q?_Miscellaneous_Formatting_Issues_on_Home_Page?=
In-Reply-To: <076.5f75ce96bab4ec540e83025d032a7109@vtiger.fosslabs.com>
References: <076.5f75ce96bab4ec540e83025d032a7109@vtiger.fosslabs.com>
Message-ID: <085.a040b8a842ac9cc622e5cb29fbc4416b@vtiger.fosslabs.com>

#1263: Miscellaneous Formatting Issues on Home Page
------------------------+---------------------------------------------------
  Reporter:  briand     |       Owner:  developer
      Type:  defect     |      Status:  closed   
  Priority:  minor      |   Milestone:  4.2.5    
 Component:  vtigercrm  |     Version:  4.2.4rc3 
Resolution:  fixed      |    Keywords:           
------------------------+---------------------------------------------------
Changes (by allanbush):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 (In [7011]) Applied patch from #1263, which cleans up the html under the
 home tab.  Closes #1263.

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1263>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 02:02:26 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 06:02:26 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7011 - in
 /vtigercrm/branches/4.2/modules: Accounts/ Activities/ Activities/language/
 Home/ Potentials/ Potentials/language/
Message-ID: <20060613060226.61DAD7E8C47@vtiger.fosslabs.com>

Author: allanbush
Date: Tue Jun 13 00:02:21 2006
New Revision: 7011

Log:
Applied patch from #1263, which cleans up the html under the home tab.  Closes #1263.

Modified:
    vtigercrm/branches/4.2/modules/Accounts/ListViewTop.html
    vtigercrm/branches/4.2/modules/Accounts/ListViewTop.php
    vtigercrm/branches/4.2/modules/Activities/OpenListView.html
    vtigercrm/branches/4.2/modules/Activities/language/en_us.lang.php
    vtigercrm/branches/4.2/modules/Home/index.php
    vtigercrm/branches/4.2/modules/Potentials/ListViewTop.html
    vtigercrm/branches/4.2/modules/Potentials/ListViewTop.php
    vtigercrm/branches/4.2/modules/Potentials/language/en_us.lang.php

Modified: vtigercrm/branches/4.2/modules/Accounts/ListViewTop.html
==============================================================================
--- vtigercrm/branches/4.2/modules/Accounts/ListViewTop.html (original)
+++ vtigercrm/branches/4.2/modules/Accounts/ListViewTop.html Tue Jun 13 00:02:21 2006
@@ -22,7 +22,7 @@
 <tr><td colspan=3 bgcolor="#000000" style="height:1px;"></td></tr>
 <tr><td colspan=3>
 <div id="home_myaccount" style="display:block;">
-<table cellpadding="0" cellspacing="0" width="100%" border="0" class="FormBorder"><tbody>
+<table cellpadding="0" cellspacing="0" width="100%" border="0"><tbody>
 	<tr height="20" class="moduleListTitle">
 	<td WIDTH="1" class="blackLine"><IMG SRC="{IMAGE_PATH}blank.gif">
 		<td width="70%" class="moduleListTitle">&nbsp;{MOD.LBL_LIST_ACCOUNT_NAME}</td>
@@ -40,13 +40,12 @@
     	<td WIDTH="1" class="blackLine"><IMG SRC="{IMAGE_PATH}blank.gif"></td>
 </tr>
 <!-- END: row -->
-<tr><td COLSPAN="9"></td></tr>
+<tr><td COLSPAN="9" class="blackLine"><IMG SRC="{IMAGE_PATH}blank.gif"></td></tr>
 </table>
 </div>
 </td></tr>
 </table>
-<BR><BR>
 <script language='Javascript'>
         var leftpanelistarray=new Array('home_myaccount');
-  setExpandCollapse_gen()</script
+  setExpandCollapse_gen()</script>
 <!-- END: main -->

Modified: vtigercrm/branches/4.2/modules/Accounts/ListViewTop.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Accounts/ListViewTop.php (original)
+++ vtigercrm/branches/4.2/modules/Accounts/ListViewTop.php Tue Jun 13 00:02:21 2006
@@ -82,9 +82,10 @@
 }
 
 $xtpl->parse("main");
-if (count($open_accounts_list)>0) $xtpl->out("main");
-else echo "<em>".$current_module_strings['NTC_NONE_SCHEDULED']."</em>";
-echo "<BR>";
+if (count($open_accounts_list)>0) {
+	$xtpl->out("main");
+	echo "<BR>";
+}
 // Stick on the form footer
 echo get_form_footer();
 

Modified: vtigercrm/branches/4.2/modules/Activities/OpenListView.html
==============================================================================
--- vtigercrm/branches/4.2/modules/Activities/OpenListView.html (original)
+++ vtigercrm/branches/4.2/modules/Activities/OpenListView.html Tue Jun 13 00:02:21 2006
@@ -46,7 +46,7 @@
 			<td width="10%" class="moduleListTitle">&nbsp;{MOD.LBL_LIST_RECURRING_TYPE}</td>
 	<td WIDTH="1" class="blackLine"><IMG SRC="{IMAGE_PATH}blank.gif">
 	  </tr>
-	<tr><td COLSPAN="17" class="blackLine"><IMG SRC="{IMAGE_PATH}/blank.gif"></td></tr>
+	<tr><td COLSPAN="17" class="blackLine"><IMG SRC="{IMAGE_PATH}blank.gif"></td></tr>
 
 
 <!-- BEGIN: row -->
@@ -77,7 +77,7 @@
 	  	<td WIDTH="1" class="blackLine"><IMG SRC="{IMAGE_PATH}blank.gif"></td>
 </tr>
 <!-- END: row -->
-	<tr><td COLSPAN="17" class="blackLine"><IMG SRC="{IMAGE_PATH}/blank.gif"></td></tr>
+	<tr><td COLSPAN="17" class="blackLine"><IMG SRC="{IMAGE_PATH}blank.gif"></td></tr>
 </table>
 </div>
 </td></tr>

Modified: vtigercrm/branches/4.2/modules/Activities/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Activities/language/en_us.lang.php (original)
+++ vtigercrm/branches/4.2/modules/Activities/language/en_us.lang.php Tue Jun 13 00:02:21 2006
@@ -66,7 +66,6 @@
 'LBL_LIST_RECURRING_TYPE'=>'Recurring Type',
 
 'ERR_DELETE_RECORD'=>"A record number must be specified to delete the account.",
-'NTC_NONE_SCHEDULED'=>'None scheduled.',
 
 // Added fields for Attachments in Activities/SubPanelView.php
 'LBL_ATTACHMENTS'=>'Attachments',

Modified: vtigercrm/branches/4.2/modules/Home/index.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Home/index.php (original)
+++ vtigercrm/branches/4.2/modules/Home/index.php Tue Jun 13 00:02:21 2006
@@ -68,7 +68,9 @@
 		include("modules/Accounts/ListViewTop.php");
 	}
 }
-	
+?>
+<br>
+<?php
 if($tab_per_Data[2] == 0)
 {
 	if($permissionData[2][3] == 0)

Modified: vtigercrm/branches/4.2/modules/Potentials/ListViewTop.html
==============================================================================
--- vtigercrm/branches/4.2/modules/Potentials/ListViewTop.html (original)
+++ vtigercrm/branches/4.2/modules/Potentials/ListViewTop.html Tue Jun 13 00:02:21 2006
@@ -22,7 +22,6 @@
 <tr><td colspan=3 bgcolor="#000000" style="height:1px;"></td></tr>
 <tr><td colspan=3>
 <div id="home_mypot" style="display:block;">
-<div id="{DIVID}" style="display:block;">
 <table cellpadding="0" cellspacing="0" width="100%" border="0"><tbody>
 	<tr height="20" class="moduleListTitle">
 	<td WIDTH="1" class="blackLine"><IMG SRC="{IMAGE_PATH}blank.gif">

Modified: vtigercrm/branches/4.2/modules/Potentials/ListViewTop.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Potentials/ListViewTop.php (original)
+++ vtigercrm/branches/4.2/modules/Potentials/ListViewTop.php Tue Jun 13 00:02:21 2006
@@ -93,9 +93,10 @@
 }
 
 $xtpl->parse("main");
-if (count($open_potentials_list)>0) $xtpl->out("main");
-else echo "<em>".$current_module_strings['NTC_NONE_SCHEDULED']."</em>";
-echo "<BR>";
+if (count($open_potentials_list)>0) {
+	$xtpl->out("main");
+	echo "<BR>";
+}
 // Stick on the form footer
 echo get_form_footer();
 

Modified: vtigercrm/branches/4.2/modules/Potentials/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Potentials/language/en_us.lang.php (original)
+++ vtigercrm/branches/4.2/modules/Potentials/language/en_us.lang.php Tue Jun 13 00:02:21 2006
@@ -57,8 +57,6 @@
 
 'NTC_REMOVE_OPP_CONFIRMATION'=>'Are you sure you want to remove this contact from this opportunity?',
 
-'NTC_NONE_SCHEDULED'=>'None scheduled.',
-
 'LBL_SELECT_OPPOPTUNITY'=>'Select Potential',
 'LBL_GENERAL_INFORMATION'=>'General Information',
 




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 03:05:01 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 07:05:01 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7012 - in /vtigercrm/trunk:
 include/utils/SearchUtils.php modules/Dashboard/Entity_charts.php
Message-ID: <20060613070503.CDFD57D809C@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 13 01:04:55 2006
New Revision: 7012

Log:
changes made to show proper records from dashboard

Modified:
    vtigercrm/trunk/include/utils/SearchUtils.php
    vtigercrm/trunk/modules/Dashboard/Entity_charts.php

Modified: vtigercrm/trunk/include/utils/SearchUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/SearchUtils.php (original)
+++ vtigercrm/trunk/include/utils/SearchUtils.php Tue Jun 13 01:04:55 2006
@@ -357,6 +357,12 @@
 			}
 		}
 	}
+	if($_REQUEST['type'] == 'entchar')
+	{
+		$search = array('Un Assigned','%','like');
+		$replace = array('','','=');
+		$where= str_replace($search,$replace,$where);
+	}
 	$log->debug("Exiting BasicSearch method ...");
 	return $where;
 }

Modified: vtigercrm/trunk/modules/Dashboard/Entity_charts.php
==============================================================================
--- vtigercrm/trunk/modules/Dashboard/Entity_charts.php (original)
+++ vtigercrm/trunk/modules/Dashboard/Entity_charts.php Tue Jun 13 01:04:55 2006
@@ -213,7 +213,7 @@
 
 					if($graph_for == "accountid") $graph_for = "account_id";
 					
-					$link_val="index.php?module=".$module."&action=index&search_text=".$name."&search_field=".$graph_for."&searchtype=BasicSearch&query=true";
+					$link_val="index.php?module=".$module."&action=index&search_text=".$name."&search_field=".$graph_for."&searchtype=BasicSearch&query=true&type=entchar";
 
 					if($graph_for == "account_id") $graph_for = "accountid";
 




From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 13 03:11:11 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 13 Jun 2006 07:11:11 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23308=3A_?=
 =?utf-8?q?Drilldown_for_leads_by_industry_shows_no_data?=
In-Reply-To: <076.5d99378440512439b590243aefe328d5@vtiger.fosslabs.com>
References: <076.5d99378440512439b590243aefe328d5@vtiger.fosslabs.com>
Message-ID: <085.7c9934b07444d505b39806ebbec80927@vtiger.fosslabs.com>

#308: Drilldown for leads by industry shows no data
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  philip
      Type:  defect     |      Status:  closed
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by anonymous):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/308>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 13 03:11:51 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 13 Jun 2006 07:11:51 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23311=3A_?=
 =?utf-8?q?SalesOrder_by_Accounts_on_drilldown_shows_list_view?=
In-Reply-To: <076.29219bf9f0339a70006794e41204abf3@vtiger.fosslabs.com>
References: <076.29219bf9f0339a70006794e41204abf3@vtiger.fosslabs.com>
Message-ID: <085.d0afad5261ad2ffe27be38f532f9295c@vtiger.fosslabs.com>

#311: SalesOrder by Accounts on drilldown shows list view
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  philip   
      Type:  defect     |      Status:  closed   
  Priority:  critical   |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:  fixed      |    Keywords:  dashboard
------------------------+---------------------------------------------------
Changes (by anonymous):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/311>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 13 03:12:38 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 13 Jun 2006 07:12:38 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231199=3A?=
 =?utf-8?q?_DashBoard_-_Leads_by_Industry_Issue?=
In-Reply-To: <076.3535dcc3d95c5df1eb70a7d4b867c8f6@vtiger.fosslabs.com>
References: <076.3535dcc3d95c5df1eb70a7d4b867c8f6@vtiger.fosslabs.com>
Message-ID: <085.d702bfa2e26cff4018d8f7b592300fc8@vtiger.fosslabs.com>

#1199: DashBoard - Leads by Industry Issue
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  philip
      Type:  defect     |      Status:  closed
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by anonymous):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1199>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 13 03:13:33 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 13 Jun 2006 07:13:33 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231296=3A?=
 =?utf-8?q?_Sort_order_hide_the_related_datas?=
In-Reply-To: <076.89346f6520426628c32e65be31646f8e@vtiger.fosslabs.com>
References: <076.89346f6520426628c32e65be31646f8e@vtiger.fosslabs.com>
Message-ID: <085.c6429fa38b3255449b7076713e4bd7a1@vtiger.fosslabs.com>

#1296: Sort order hide the related datas
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  developer                   
      Type:  defect     |      Status:  new                         
  Priority:  critical   |   Milestone:                              
 Component:  vtigercrm  |     Version:  5.0.0                       
Resolution:             |    Keywords:  related, data, sorder, order
------------------------+---------------------------------------------------
Comment (by abos):

 See on products, vendors, salesorders, quotes, account.... modules with
 the demo datas.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1296>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 13 03:13:55 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 13 Jun 2006 07:13:55 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231200=3A?=
 =?utf-8?q?_Dashboard_-_Sales_By_Account_Issue?=
In-Reply-To: <076.a611d6f1b0bc365b4af107afbcdf3dc9@vtiger.fosslabs.com>
References: <076.a611d6f1b0bc365b4af107afbcdf3dc9@vtiger.fosslabs.com>
Message-ID: <085.0405dab04a785c068ef026d5e16d9ac8@vtiger.fosslabs.com>

#1200: Dashboard - Sales By Account Issue
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  philip
      Type:  defect     |      Status:  closed
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by anonymous):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1200>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 05:57:26 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 09:57:26 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7013 -
	/vtigercrm/trunk/data/CRMEntity.php
Message-ID: <20060613095726.AE1D97E8C31@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 13 03:57:18 2006
New Revision: 7013

Log:
users module added in CRMEntity

Modified:
    vtigercrm/trunk/data/CRMEntity.php

Modified: vtigercrm/trunk/data/CRMEntity.php
==============================================================================
--- vtigercrm/trunk/data/CRMEntity.php (original)
+++ vtigercrm/trunk/data/CRMEntity.php Tue Jun 13 03:57:18 2006
@@ -45,7 +45,7 @@
 	global $current_user, $adb;//$adb added by raju for mass mailing
 	$insertion_mode = $this->mode;
 
-	$this->db->println("TRANS saveentity starts");
+	$this->db->println("TRANS saveentity starts $module");
 	$this->db->startTransaction();
 	
 	// Code included by Jaguar - starts    
@@ -197,15 +197,6 @@
 		}
 	}
 
-
-	/*if($module == 'Emails' || $module == 'Notes' || $module == 'HelpDesk')
-	{
-		if(isset($_FILES['filename']['name']) && $_FILES['filename']['name']!='')
-		{
-			$this->insertIntoAttachment($this->id,$module);
-		}
-	}*/
-
 	$this->db->completeTransaction();
         $this->db->println("TRANS saveentity ends");
   }
@@ -437,10 +428,6 @@
 		$this->id = $current_id;
 	}
 
-	//$sql = "insert into vtiger_crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime,modifiedtime) values(".$current_id.",".$current_user->id.",".$ownerid.",'".$module."','".$this->column_fields['description']."',".$adb->formatString("crmentity","createdtime",$date_var).",".$adb->formatString("crmentity","modifiedtime",$date_var).")";
-	//$adb->query($sql);
-	//echo $sql;
-	//$this->id = $current_id;
     }
 
 
@@ -543,6 +530,11 @@
 	  else
 	  {
 		  $column = $this->tab_name_index[$table_name];
+		  if($column == 'id' && $table_name == 'users')
+		  {
+		 	$currentuser_id = $adb->getUniqueID("users");
+			$this->id = $currentuser_id;
+		  }
 		  $value = $this->id;
 	  }
 
@@ -629,28 +621,7 @@
 			  }
 			  if($table_name == 'vtiger_products' && $columname == 'imagename')
 			  {
-			/*	  //Product Image Handling done
-				  if($_FILES['imagename']['name'] != '')
-				  {
-
-					  $prd_img_arr = upload_product_image_file("edit",$this->id);
-					  //print_r($prd_img_arr);
-					  if($prd_img_arr["status"] == "yes")
-					  {
-						  $fldvalue ="'".$prd_img_arr["file_name"]."'";
-					  }
-					  else
-					  {
-						  $fldvalue ="'".getProductImageName($this->id)."'";
-					  }	 
-
-
-				  }
-				  else
-				  {
-					  $fldvalue ="'".getProductImageName($this->id)."'";
-				  }
-		      */		  
+					  
 
 			  }
 			  if($table_name != 'vtiger_ticketcomments')
@@ -692,32 +663,6 @@
 				  $fldvalue = from_html($adb->formatString($table_name,$columname,$fldvalue),($insertion_mode == 'edit')?true:false);
 				  //echo ' updatevalue is ............. ' .$fldvalue;
 			  }
-			  elseif($table_name == 'vtiger_products' && $columname == 'imagename')
-			  {
-				  //Product Image Handling done
-			/*	  if($_FILES['imagename']['name'] != '')
-				  {
-
-					  $prd_img_arr = upload_product_image_file("create",$this->id);
-					  //print_r($prd_img_arr);
-					  if($prd_img_arr["status"] == "yes")
-					  {
-						  $fldvalue ="'".$prd_img_arr["file_name"]."'";
-					  }
-					  else
-					  {
-						  $fldvalue ="''";
-					  }	 
-
-
-				  }
-				  else
-				  {
-					  $fldvalue ="''";
-				  }
-			*/	  
-
-			  }
 			  //code by richie ends
 			  $column .= ", ".$columname;
 			  $value .= ", ".$fldvalue."";
@@ -733,13 +678,11 @@
 	  {
 		  if($_REQUEST['module'] == 'Potentials')
 		  {
-			  $dbquery = 'select vtiger_sales_stage from vtiger_potential where potentialid = '.$this->id;
+			  $dbquery = 'select sales_stage from vtiger_potential where potentialid = '.$this->id;
 			  $sales_stage = $adb->query_result($adb->query($dbquery),0,'sales_stage');
 			  if($sales_stage != $_REQUEST['sales_stage'])
 			  {
 				  $date_var = date('YmdHis');
-				  //$sql = "insert into vtiger_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).")";
-				  //Changed to insert the close date based on user date format - after 4.2 patch2
 				  $closingdate = getDBInsertDateValue($_REQUEST['closingdate']);
 				  $sql = "insert into vtiger_potstagehistory values('',".$this->id.",'".$_REQUEST['amount']."','".$sales_stage."','".$_REQUEST['probability']."',0,".$adb->formatString("vtiger_potstagehistory","closedate",$closingdate).",".$adb->formatString("vtiger_potstagehistory","lastmodified",$date_var).")";
 				  $adb->query($sql);
@@ -1153,36 +1096,12 @@
 	
   function retrieve_entity_info($record, $module)
   {
-    global $adb;
+    global $adb,$log;
     $result = Array();
     foreach($this->tab_name_index as $table_name=>$index)
     {
 	    $result[$table_name] = $adb->query("select * from ".$table_name." where ".$index."=".$record);
     }
-    //Integrated&Commented by Minnie -- as common query affecting detailview
-    /*$table_list = Array();
-    $table_index = Array();
-    $table_list = array_keys($this->tab_name_index);
-    $table_index = array_values($this->tab_name_index);
-    $detailview_query = "select ";
-    $j=0;
-    for($i=1;$i<count($table_list);$i++)
-    {
-	if($j != 0)
-	{
-		$detailview_query .= ", ";
-	}
-	$detailview_query .= $table_list[$i].".*";
-	$j++;
-    }
-    $detailview_query .=  ", ".$table_list[0].". * from ".$table_list[0];
-    for($i=1;$i<count($table_list);$i++)
-    {
-	$detailview_query .= " left join ".$table_list[$i]." on ".$table_list[$i].".".$table_index[$i]." = ";
-	$detailview_query .= $table_list[0].".".$table_index[0];
-    }
-    $detailview_query .= " where ".$table_list[0].".".$table_index[0]." = ".$record;
-    $result = $adb->query($detailview_query);*/
     $tabid = getTabid($module);
     $sql1 =  "select * from vtiger_field where tabid=".$tabid;
     $result1 = $adb->query($sql1);
@@ -1197,9 +1116,21 @@
       $this->column_fields[$fieldname] = $fld_value;
 				
     }
+	if($module == 'Users')
+	{
+		for($i=0; $i<$noofrows; $i++)
+		{
+			$fieldcolname = $adb->query_result($result1,$i,"columnname");
+			$tablename = $adb->query_result($result1,$i,"tablename");
+			$fieldname = $adb->query_result($result1,$i,"fieldname");
+			$fld_value = $adb->query_result($result[$tablename],0,$fieldcolname);
+			$this->$fieldname = $fld_value;
+
+		}
+	}
+		
     $this->column_fields["record_id"] = $record;
     $this->column_fields["record_module"] = $module;
-		
   }
 
 	function save($module_name) 




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 05:58:13 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 09:58:13 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7014 - in
 /vtigercrm/trunk/Smarty/templates: Buttons_List.tpl Buttons_List1.tpl
Message-ID: <20060613095813.847997E8C31@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 13 03:58:07 2006
New Revision: 7014

Log:
changes made to integrate googlemap

Modified:
    vtigercrm/trunk/Smarty/templates/Buttons_List.tpl
    vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl

Modified: vtigercrm/trunk/Smarty/templates/Buttons_List.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Buttons_List.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Buttons_List.tpl Tue Jun 13 03:58:07 2006
@@ -118,6 +118,16 @@
 				</tr>
 				</table>
 		</td>			
+		{if $MODULE eq 'Contacts' || $MODULE eq 'Leads' || $MODULE eq 'Accounts'}
+                        <td class="small">
+                                <!-- Google Map -->
+                                        <table border=0 cellspacing=0 cellpadding=5>
+                                                <tr>
+                                                        <td style="padding-left:10px;"><a href="#" onclick='window.open("index.php?module={$MODULE}&action=googlemap","test","width=600,height=400,resizable=1,scrollbars=1");'><img src="{$IMAGE_PATH}btnL3AllMenu.gif" alt="GoogleMap" title="GoogleMap" border="0"></a></td>
+                                                </tr>
+                                        </table>
+                        </td>
+                {/if}
 		</tr>
 		</table>
 	</td>

Modified: vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl Tue Jun 13 03:58:07 2006
@@ -114,6 +114,16 @@
 				</tr>
 				</table>
 		</td>			
+		{if $MODULE eq 'Contacts' || $MODULE eq 'Leads' || $MODULE eq 'Accounts'}
+                        <td class="small">
+                                <!-- Google Map -->
+                                        <table border=0 cellspacing=0 cellpadding=5>
+                                                <tr>
+                                                        <td style="padding-left:10px;"><a href="#" onclick='window.open("index.php?module={$MODULE}&action=googlemap&record={$ID}","test","width=600,height=400,resizable=1,scrollbars=1");'><img src="{$IMAGE_PATH}btnL3AllMenu.gif" alt="GoogleMap" title="GoogleMap" border="0"></a></td>
+                                                </tr>
+                                        </table>
+                        </td>
+                {/if}
 		</tr>
 		</table>
 	</td>




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 05:59:45 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 09:59:45 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7015 - in
 /vtigercrm/trunk/include/utils: CommonUtils.php EditViewUtils.php
Message-ID: <20060613095945.C65847E8C31@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 13 03:59:41 2006
New Revision: 7015

Log:
users module added in CRMEntity

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

Modified: vtigercrm/trunk/include/utils/CommonUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/CommonUtils.php (original)
+++ vtigercrm/trunk/include/utils/CommonUtils.php Tue Jun 13 03:59:41 2006
@@ -945,7 +945,7 @@
 			else
 			{
 				$profileList = getCurrentUserProfileList();
-				$sql = "select vtiger_field.* from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid  where vtiger_field.tabid=".$tabid." and vtiger_field.block in ".$blockid_list." and vtiger_field.displaytype=1 and info_type = '".$info_type."' and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList.=" group by vtiger_field.fieldid order by block,sequence";
+				$sql = "select vtiger_field.* from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid  where vtiger_field.tabid=".$tabid." and vtiger_field.block in ".$blockid_list." and vtiger_field.displaytype in (1,4) and info_type = '".$info_type."' and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList.=" group by vtiger_field.fieldid order by block,sequence";
 			}
 		}
 		else
@@ -957,7 +957,7 @@
 			else
 			{
 				$profileList = getCurrentUserProfileList();
-				$sql = "select vtiger_field.* from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid  where vtiger_field.tabid=".$tabid." and vtiger_field.block in ".$blockid_list." and vtiger_field.displaytype=1 and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList.=" group by vtiger_field.fieldid order by block,sequence";
+				$sql = "select vtiger_field.* from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid  where vtiger_field.tabid=".$tabid." and vtiger_field.block in ".$blockid_list." and vtiger_field.displaytype in (1,4) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList.=" group by vtiger_field.fieldid order by block,sequence";
 			}
 		}
 		$result = $adb->query($sql);

Modified: vtigercrm/trunk/include/utils/EditViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/EditViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/EditViewUtils.php Tue Jun 13 03:59:41 2006
@@ -1012,6 +1012,84 @@
 		$fieldvalue[] = array($SET_REM,$mod_strings['LBL_YES'],$mod_strings['LBL_NO']);
 		$SET_REM = '';
 	}
+	elseif($uitype == 115)
+	{
+		$editview_label[]=$mod_strings[$fieldlabel];
+		$pick_query="select * from ".$fieldname;
+		$pickListResult = $adb->query($pick_query);
+		$noofpickrows = $adb->num_rows($pickListResult);
+
+		//Mikecrowe fix to correctly default for custom pick lists
+		$options = array();
+		$found = false;
+		for($j = 0; $j < $noofpickrows; $j++)
+		{
+			$pickListValue=$adb->query_result($pickListResult,$j,strtolower($fieldname));
+
+			if($value == $pickListValue)
+			{
+				$chk_val = "selected";	
+				$found = true;
+			}
+			else
+			{	
+				$chk_val = '';
+			}
+			$options[] = array($pickListValue=>$chk_val );	
+		}
+		$fieldvalue [] = $options;
+	}
+	elseif($uitype == 116)
+	{
+		$editview_label[]=$mod_strings[$fieldlabel];
+		$pick_query="select * from currency_info";
+		$pickListResult = $adb->query($pick_query);
+		$noofpickrows = $adb->num_rows($pickListResult);
+
+		//Mikecrowe fix to correctly default for custom pick lists
+		$options = array();
+		$found = false;
+		for($j = 0; $j < $noofpickrows; $j++)
+		{
+			$pickListValue=$adb->query_result($pickListResult,$j,'currency_name');
+			$currency_id=$adb->query_result($pickListResult,$j,'id');
+			if($value == $pickListValue)
+			{
+				$chk_val = "selected";	
+				$found = true;
+			}
+			else
+			{	
+				$chk_val = '';
+			}
+			$options[$currency_id] = array($pickListValue=>$chk_val );	
+		}
+		$fieldvalue [] = $options;
+	}
+	elseif($uitype ==98)
+	{
+		$editview_label[]=$mod_strings[$fieldlabel];
+		$fieldvalue[]=$value;
+        $fieldvalue[]=getRoleName($value);
+	}
+	elseif($uitype == 105)
+	{
+		$editview_label[]=$mod_strings[$fieldlabel];
+			$query = "select attachments.path, attachments.name from contactdetails left join seattachmentsrel on seattachmentsrel.crmid=contactdetails.contactid inner join attachments on attachments.attachmentsid=seattachmentsrel.attachmentsid where contactdetails.imagename=attachments.name and contactid=".$col_fields['record_id'];
+		$result_image = $adb->query($query);
+		for($image_iter=0;$image_iter < $adb->num_rows($result_image);$image_iter++)	
+		{
+			$image_array[] = $adb->query_result($result_image,$image_iter,'name');	
+			$image_path_array[] = $adb->query_result($result_image,$image_iter,'path');	
+		}
+		if(is_array($image_array))
+			for($img_itr=0;$img_itr<count($image_array);$img_itr++)
+			{
+				$fieldvalue[] = array('name'=>$image_array[$img_itr],'path'=>$image_path_array[$img_itr]);
+			}
+		else
+			$fieldvalue[] = '';
+	}
 	else
 	{
 		//Added condition to set the subject if click Reply All from web mail




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 06:01:38 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 10:01:38 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7016 - in
 /vtigercrm/trunk/install: 5createTables.inc.php populateSeedData.php
Message-ID: <20060613100139.2B37F7E8C31@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 13 04:01:33 2006
New Revision: 7016

Log:
users module added in CRMEntity

Modified:
    vtigercrm/trunk/install/5createTables.inc.php
    vtigercrm/trunk/install/populateSeedData.php

Modified: vtigercrm/trunk/install/5createTables.inc.php
==============================================================================
--- vtigercrm/trunk/install/5createTables.inc.php (original)
+++ vtigercrm/trunk/install/5createTables.inc.php Tue Jun 13 04:01:33 2006
@@ -67,27 +67,35 @@
 
         // create default admin user
     	$user = new User();
-        $user->last_name = 'Administrator';
-        $user->user_name = 'admin';
-        $user->status = 'Active';
-        $user->is_admin = 'on';
-        $user->user_password = $user->encrypt_password($admin_password);
-        $user->tz = 'Europe/Berlin';
-        $user->holidays = 'de,en_uk,fr,it,us,';
-        $user->workdays = '0,1,2,3,4,5,6,';
-        $user->weekstart = '1';
-        $user->namedays = '';
-	$user->date_format = 'yyyy-mm-dd';
+        $user->column_fields["last_name"] = 'Administrator';
+        $user->column_fields["user_name"] = 'admin';
+        $user->column_fields["status"] = 'Active';
+        $user->column_fields["is_admin"] = 'on';
+        $user->column_fields["user_password"] = $user->encrypt_password($admin_password);
+        $user->column_fields["tz"] = 'Europe/Berlin';
+        $user->column_fields["holidays"] = 'de,en_uk,fr,it,us,';
+        $user->column_fields["workdays"] = '0,1,2,3,4,5,6,';
+        $user->column_fields["weekstart"] = '1';
+        $user->column_fields["namedays"] = '';
+        $user->column_fields["currency_id"] = 1;
+	$user->column_fields["date_format"] = 'yyyy-mm-dd';
 	// added by jeri to populate default image and tagcloud for admin	
-	$user->imagename = 'shanky.jpg';
-        $user->tagcloud = '';	
-        $user->activity_view = 'This Year';	
-	$user->defhomeview = 'home_metrics';
+	$user->column_fields["imagename"] = 'shanky.jpg';
+        $user->column_fields["tagcloud"] = '';	
+        $user->column_fields["activity_view"] = 'This Year';	
+	$user->column_fields["defhomeview"] = 'home_metrics';
         //added by philip for default default admin emailid
 	if($admin_email == '')
 	$admin_email ="admin at administrator.com";
-        $user->email = $admin_email;
-        $user->save();
+        $user->column_fields["email"] = $admin_email;
+	//to get the role id for standard_user	
+	$role_query = "select roleid from role where rolename='administrator'";
+	$db->database->SetFetchMode(ADODB_FETCH_ASSOC);
+	$role_result = $db->query($role_query);
+	$role_id = $db->query_result($role_result,0,"roleid");
+	$user->column_fields["roleid"] = $role_id;
+
+        $user->save("Users");
 
         // we need to change the admin user to a fixed id of 1.
         //$query = "update vtiger_users set id='1' where user_name='$user->user_name'";
@@ -95,70 +103,41 @@
 
         $log->info("Created ".$user->table_name." vtiger_table. for user $user->id");
 
-	/*
-        if($create_default_user) {
-                $default_user = new User();
-                $default_user->last_name = $default_user_name;
-                $default_user->user_name = $default_user_name;
-                $default_user->status = 'Active';
-
-		if (isset($default_user_is_admin) && $default_user_is_admin)
-			$default_user->is_admin = 'on';
-
-                $default_user->user_password = $default_user->encrypt_password($default_password);
-        	$default_user->tz = 'Europe/Berlin';
-	        $default_user->holidays = 'de,en_uk,fr,it,us,';
-        	$default_user->workdays = '0,1,2,3,4,5,6,';
-	        $default_user->weekstart = '1';
-        	$default_user->namedays = '';
-                $default_user->save();
-        }
-	*/
-
-	// insert values into vtiger_user2role vtiger_table
-	$role_query = "select roleid from vtiger_role where rolename='administrator'";
-	$db->database->SetFetchMode(ADODB_FETCH_ASSOC);
-	$role_result = $db->query($role_query);
-	$role_id = $db->query_result($role_result,0,"roleid");
-
-	$sql_stmt1 = "insert into vtiger_user2role values(".$user->id.",'".$role_id."')";
-	$db->query($sql_stmt1) or die($app_strings['ERR_CREATING_TABLE'].mysql_error());
-
-	//Creating the flat vtiger_files
+	//Creating the flat files
 	createUserPrivilegesfile($user->id);
         createUserSharingPrivilegesfile($user->id);
 
 
 	//Creating the Standard User
     	$user = new User();
-        $user->last_name = 'StandardUser';
-        $user->user_name = 'standarduser';
-        $user->status = 'Active';
-        $user->user_password = $user->encrypt_password('standarduser');
-        $user->tz = 'Europe/Berlin';
-        $user->holidays = 'de,en_uk,fr,it,us,';
-        $user->workdays = '0,1,2,3,4,5,6,';
-        $user->weekstart = '1';
-        $user->namedays = '';
-	$user->date_format = 'yyyy-mm-dd';
+        $user->column_fields["last_name"] = 'StandardUser';
+        $user->column_fields["user_name"] = 'standarduser';
+        $user->column_fields["status"] = 'Active';
+        $user->column_fields["user_password"] = $user->encrypt_password('standarduser');
+        $user->column_fields["tz"] = 'Europe/Berlin';
+        $user->column_fields["holidays"] = 'de,en_uk,fr,it,us,';
+        $user->column_fields["workdays"] = '0,1,2,3,4,5,6,';
+        $user->column_fields["weekstart"] = '1';
+        $user->column_fields["namedays"] = '';
+        $user->column_fields["currency_id"] = 1;
+	$user->column_fields["date_format"] = 'yyyy-mm-dd';
 	// added by jeri to populate default image and tagcloud for admin	
-	$user->imagename = 'ela.jpg';
-        $user->activity_view = 'This Year';	
-        $user->tagcloud = '';	
-	$user->defhomeview = 'home_metrics';
+	$user->column_fields["imagename"] = 'ela.jpg';
+        $user->column_fields["activity_view"] = 'This Year';	
+        $user->column_fields["tagcloud"] = '';	
+	$user->column_fields["defhomeview"] = 'home_metrics';
         //added by philip for default default admin emailid
 	if($admin_email == '')
 	$std_email ="standarduser at standarduser.com";
-        $user->email = $std_email;
-        $user->save();
-
+        $user->column_fields["email"] = $std_email;
+	//to get the role id for standard_user	
 	$role_query = "select roleid from vtiger_role where rolename='standard_user'";
 	$db->database->SetFetchMode(ADODB_FETCH_ASSOC);
 	$role_result = $db->query($role_query);
 	$role_id = $db->query_result($role_result,0,"roleid");
-
-	$sql_stmt2 = "insert into vtiger_user2role values(".$user->id.",'".$role_id."')";
-	$db->query($sql_stmt2) or die($app_strings['ERR_CREATING_TABLE'].mysql_error());
+	$user->column_fields["roleid"] = $role_id;
+
+        $user->save('Users');
 
 	//Creating the flat vtiger_files
 	createUserPrivilegesfile($user->id);
@@ -169,8 +148,8 @@
 //$startTime = microtime();
 $modules = array("DefaultDataPopulator");
 $focus=0;				
-// vtiger_tables creation
-eecho("Creating Core vtiger_tables: ");
+// tables creation
+eecho("Creating Core tables: ");
 $success = $db->createTables("schema/DatabaseSchema.xml");
 
 // TODO HTML
@@ -194,20 +173,20 @@
 //$db->query($sql_stmt1) or die($app_strings['ERR_CREATING_TABLE'].mysql_error());
 
 
-// create and populate combo vtiger_tables
+// create and populate combo tables
 require_once('include/PopulateComboValues.php');
 $combo = new PopulateComboValues();
 $combo->create_tables();
 
 create_default_users();
 
-// default vtiger_report population
+// default report population
 require_once('modules/Reports/PopulateReports.php');
 
-// default vtiger_customview population
+// default customview population
 require_once('modules/CustomView/PopulateCustomView.php');
 
-//Writing vtiger_tab data in flat file
+//Writing tab data in flat file
 create_tab_data_file();
 create_parenttab_data_file();
 

Modified: vtigercrm/trunk/install/populateSeedData.php
==============================================================================
--- vtigercrm/trunk/install/populateSeedData.php (original)
+++ vtigercrm/trunk/install/populateSeedData.php Tue Jun 13 04:01:33 2006
@@ -121,7 +121,7 @@
 global $current_user;
 
 $current_user = new User();
-$result = $current_user->retrieve($assigned_user_id);
+$result = $current_user->retrieve_entity_info($assigned_user_id,'Users');
 
 $tagkey = 1;
 
@@ -145,7 +145,7 @@
 	
 	$account_name = $company_name_array[$i];
 
-	// Create new vtiger_accounts.
+	// Create new accounts.
 	$account = new Account();
 	$account->column_fields["accountname"] = $account_name;
 	$account->column_fields["phone"] = create_phone_number();
@@ -227,7 +227,7 @@
 	
 	$opportunity_ids[] = $opp->id;
 
-//	$adb->println("PSD Potential [".$opp->id."] - vtiger_account[".$account->id."]");
+//	$adb->println("PSD Potential [".$opp->id."] - account[".$account->id."]");
 	
 }
 
@@ -297,10 +297,10 @@
 	//$query = "insert into opportunities_contacts set id='".create_guid()."', contact_id='$contact->id', contact_role='".$app_list_strings['opportunity_relationship_type_default_key']."', opportunity_id='".$opportunity_ids[$opportunity_key]."'";
 	//$db->query($query, true, "unable to create seed links between opportunities and contacts");
 
-	$query = "insert into vtiger_contpotentialrel ( contactid, vtiger_potentialid ) values (".$contact->id.",".$opportunity_ids[$opportunity_key].")";
+	$query = "insert into vtiger_contpotentialrel ( contactid, potentialid ) values (".$contact->id.",".$opportunity_ids[$opportunity_key].")";
 	$db->query($query);
 
-//	$adb->println("PSD Contact [".$contact->id."] - vtiger_account[".$account_ids[$account_key]."] - vtiger_potential[".$opportunity_ids[$opportunity_key]."]");
+//	$adb->println("PSD Contact [".$contact->id."] - account[".$account_ids[$account_key]."] - potential[".$opportunity_ids[$opportunity_key]."]");
 
 	//Create new tasks
 	/*$task = new Task();
@@ -396,7 +396,7 @@
 
 }
 
-// Temp fix since user is not logged in while populating data updating creatorid in vtiger_crmentity - GS
+// Temp fix since user is not logged in while populating data updating creatorid in crmentity - GS
 
 
 //Populating Vendor Data
@@ -544,7 +544,7 @@
 http://support.microsoft.com/default.aspx?scid=kb%3BEN-US%3B263074
 
 If you want to continue working with vtiger Outlook Plug-in, select the Allow access for check box and select the time from drop-down box.",
-	" Since, vtigerCRM & all plugins are open source, it is not signed up with third party vtiger_vendors and IE will ask to download even though the plugin are not signed.
+	" Since, vtigerCRM & all plugins are open source, it is not signed up with third party vendors and IE will ask to download even though the plugin are not signed.
 
 This message if produced by Microsoft Windows XP. I English Windows XP with the SP2 and the last updates. I told IE to accept installation of the ActiveX, but after it, this message has appeared. Provably there is a place where to tall to WinXP to not validate if the code is signed... but I don\'t know where.
 
@@ -633,7 +633,7 @@
 	$salesorder_ids[] = $so->id;
 	
 	$product_key = array_rand($product_ids);
-        $query = "insert into vtiger_soproductrel ( vtiger_salesorderid, productid, quantity, listprice ) values (".$so->id.",".$product_ids[$product_key].",12,499.000 )";
+        $query = "insert into vtiger_soproductrel ( salesorderid, productid, quantity, listprice ) values (".$so->id.",".$product_ids[$product_key].",12,499.000 )";
         $db->query($query);
 
 }
@@ -668,7 +668,7 @@
 	$purchaseorder_ids[] = $po->id;
 
 	$product_key = array_rand($product_ids);
-        $query = "insert into vtiger_poproductrel ( vtiger_purchaseorderid, productid, quantity, listprice ) values (".$po->id.",".$product_ids[$product_key].",15,1299.000 )";
+        $query = "insert into vtiger_poproductrel ( purchaseorderid, productid, quantity, listprice ) values (".$po->id.",".$product_ids[$product_key].",15,1299.000 )";
         $db->query($query);
 
 }
@@ -710,7 +710,7 @@
 	}
 
 	$product_key = array_rand($product_ids);
-        $query = "insert into vtiger_invoiceproductrel ( vtiger_invoiceid, productid, quantity, listprice ) values (".$invoice->id.",".$product_ids[$product_key].",18,269.000 )";
+        $query = "insert into vtiger_invoiceproductrel ( invoiceid, productid, quantity, listprice ) values (".$invoice->id.",".$product_ids[$product_key].",18,269.000 )";
         $db->query($query);
 	
 }
@@ -781,7 +781,7 @@
 	$notes_ids[] = $notes ->id;
 	
 	$product_key = array_rand($product_ids);
-        $query = "insert into vtiger_senotesrel (crmid, vtiger_notesid) values (".$product_ids[$product_key].", ".$notes->id.")";
+        $query = "insert into vtiger_senotesrel (crmid, notesid) values (".$product_ids[$product_key].", ".$notes->id.")";
 	$db->query($query);
 		
 }




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 06:03:59 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 10:03:59 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7017 -
	/vtigercrm/trunk/googlemap.php
Message-ID: <20060613100359.474367E8C4C@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 13 04:03:54 2006
New Revision: 7017

Log:
added for googlemap integration

Added:
    vtigercrm/trunk/googlemap.php




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 06:04:44 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 10:04:44 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7018 - in
 /vtigercrm/trunk/modules/Users: Authenticate.php
 CreateUserPrivilegeFile.php DetailView.php EditView.php Forms.php Save.php
 User.php
Message-ID: <20060613100444.D89D67E8C4C@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 13 04:04:34 2006
New Revision: 7018

Log:
users module added in CRMEntity

Modified:
    vtigercrm/trunk/modules/Users/Authenticate.php
    vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php
    vtigercrm/trunk/modules/Users/DetailView.php
    vtigercrm/trunk/modules/Users/EditView.php
    vtigercrm/trunk/modules/Users/Forms.php
    vtigercrm/trunk/modules/Users/Save.php
    vtigercrm/trunk/modules/Users/User.php

Modified: vtigercrm/trunk/modules/Users/Authenticate.php
==============================================================================
--- vtigercrm/trunk/modules/Users/Authenticate.php (original)
+++ vtigercrm/trunk/modules/Users/Authenticate.php Tue Jun 13 04:04:34 2006
@@ -31,7 +31,7 @@
 $focus = new User();
 
 // Add in defensive code here.
-$focus->user_name = to_html($_REQUEST['user_name']);
+$focus->column_fields["user_name"] = to_html($_REQUEST['user_name']);
 $user_password = $_REQUEST['user_password'];
 
 $focus->load_user($user_password);
@@ -43,33 +43,16 @@
         $intime=date("Y/m/d H:i:s");
         require_once('modules/Users/LoginHistory.php');
         $loghistory=new LoginHistory();
-        $Signin = $loghistory->user_login($focus->user_name,$usip,$intime);
-
-	//Authentication for tutos
-        //include('modules/Calendar/Authenticate.php');
+        $Signin = $loghistory->user_login($focus->column_fields["user_name"],$usip,$intime);
 
 	// save the user information into the session
 	// go to the home screen
 	//Security related entries start
 	require_once('include/utils/UserInfoUtil.php');
-	//$rolename = fetchUserRole($focus->id);
-	//$profilename = fetchUserProfile($focus->id);
 	$profileid = fetchUserProfileId($focus->id);	
-	//setting the vtiger_role into the session
-	//$_SESSION['authenticated_user_roleid'] = $profilename;
-
-	//Setting the Object in Session
-	/*
-	$accessObj = new AccessControl();
-	$accessObj->authenticated_user_profileid = $profileid;
-	$accessObj->tab_permission_set = setPermittedTabs2Session($profileid);
-	
-	$accessObj->action_permission_set = setPermittedActions2Session($profileid);
-	$_SESSION['access_privileges'] = $accessObj; 
-	*/
+	//setting the role into the session
 
 	createUserPrivilegesfile($focus->id);
-        //createUserSharingPrivilegesfile($focus->id);	
 		
 	$_SESSION['authenticated_user_profileid'] = $profileid;
 	setGlobalProfilePermission2Session($profileid);
@@ -128,7 +111,7 @@
         $log->debug("app_unique_key is $application_unique_key");
 
 	
-// Clear all uploaded import vtiger_files for this user if it exists
+// Clear all uploaded import files for this user if it exists
 
 	global $import_dir;
 
@@ -141,7 +124,7 @@
 }
 else
 {
-	$_SESSION['login_user_name'] = $focus->user_name;
+	$_SESSION['login_user_name'] = $focus->column_fields["user_name"];
 	$_SESSION['login_password'] = $user_password;
 	$_SESSION['login_error'] = $mod_strings['ERR_INVALID_PASSWORD'];
 	

Modified: vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php
==============================================================================
--- vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php (original)
+++ vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php Tue Jun 13 04:04:34 2006
@@ -30,9 +30,12 @@
 		$newbuf .="\n";		
 		$newbuf .= "//This is the access privilege file\n";
 		$user_focus= new User();
-		$user_focus->retrieve($userid);
+		$user_focus->retrieve_entity_info($userid,'Users');
+		
 		$userInfo=Array();
-		foreach($user_focus->column_fields as $field)
+		$user_focus->column_fields["id"] = '';
+		$user_focus->id = $userid; 
+		foreach($user_focus->column_fields as $field=>$value_iter)
         	{
                		$userInfo[$field]= $user_focus->$field;
         	}
@@ -113,7 +116,7 @@
 		$newbuf .="\n";		
 		$newbuf .= "//This is the sharing access privilege file\n";
 		$user_focus= new User();
-		$user_focus->retrieve($userid);
+		$user_focus->retrieve_entity_info($userid,'Users');
 		if($user_focus->is_admin == 'on')
 		{
 			$newbuf .= "\n";
@@ -439,7 +442,7 @@
 
 
 
-		//Retreiving from vtiger_role to rs
+		//Retreiving from role to rs
 		$parRoleList = "(";
 		foreach($parent_roles as $par_role_id)
 		{

Modified: vtigercrm/trunk/modules/Users/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DetailView.php (original)
+++ vtigercrm/trunk/modules/Users/DetailView.php Tue Jun 13 04:04:34 2006
@@ -32,18 +32,18 @@
 global $theme;
 global $default_language;
 global $adb;
-
+global $currentModule;
 global $app_strings;
 global $mod_strings;
 
 $focus = new User();
 
 if(!empty($_REQUEST['record'])) {
-        $focus->retrieve($_REQUEST['record']);
+	$focus->retrieve_entity_info($_REQUEST['record'],'Users');
+	$focus->id = $_REQUEST['record'];	
 }
 else
 {
- //       header("Location: index.php?module=Users&action=ListView");
 
     echo "
         <script type='text/javascript'>
@@ -82,11 +82,7 @@
 $image_path=$theme_path."images/";
 require_once($theme_path.'layout_utils.php');
 
-$role = fetchUserRole($focus->id);
-$rolename =  getRoleName($role);
-$currencyid=fetchCurrency($focus->id);
-$currency=getCurrencyName($currencyid);
-//the user might belong to multiple vtiger_groups
+//the user might belong to multiple groups
 if($focus->id != 1)
 {
  $groupids = fetchUserGroupids($focus->id);
@@ -107,13 +103,7 @@
 $smarty->assign("THEME", $theme);
 $smarty->assign("IMAGE_PATH", $image_path);$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']);
 $smarty->assign("ID", $focus->id);
-$smarty->assign("USER_NAME", $focus->user_name);
-$smarty->assign("FIRST_NAME", $focus->first_name);
-$smarty->assign("LAST_NAME", $focus->last_name);
 $smarty->assign("CATEGORY", $category);
-$smarty->assign("STATUS", $focus->status);
-$smarty->assign("YAHOO_ID", $focus->yahoo_id);
-$smarty->assign("DATE_FORMAT", $focus->date_format);
 if(isset($focus->imagename) && $focus->imagename!='')
 {
 	$imagestring="<div id='track1' style='margin: 4px 0pt 0pt 10px; width: 200px; background-image: url(themes/images/scaler_slider_track.gif); background-repeat: repeat-x; background-position: left center; height: 18px;'>
@@ -123,11 +113,9 @@
 
 	<div class='scale-image' style='padding: 10px; float: left; width: 83.415px;'><img src='test/user/".$focus->imagename."' width='100%'</div>
 	<p><script type='text/javascript' src='include/js/scale_demo.js'></script></p>";
-	$smarty->assign("USER_IMAGE",$imagestring);
+	//$smarty->assign("USER_IMAGE",$imagestring);
 }
 				
-if (isset($focus->yahoo_id) && $focus->yahoo_id !== "") $smarty->assign("YAHOO_MESSENGER", "<a href='http://edit.yahoo.com/config/send_webmesg?.target=".$focus->yahoo_id."'><img border=0 src='http://opi.yahoo.com/online?u=".$focus->yahoo_id."'&m=g&t=2'></a>");
-
 if(isset($_REQUEST['modechk']) && $_REQUEST['modechk'] != '' )
 {
 	$modepref = $_REQUEST['modechk'];
@@ -151,11 +139,8 @@
 	$buttons = "<input title='".$app_strings['LBL_EDIT_BUTTON_TITLE']."' accessKey='".$app_strings['LBL_EDIT_BUTTON_KEY']."' class='classBtn' onclick=\"this.form.return_module.value='Users'; this.form.return_action.value='DetailView'; this.form.return_id.value='$focus->id'; this.form.action.value='EditView'; this.form.parenttab.value='$parenttab'\" type='submit' name='Edit' value='  ".$app_strings['LBL_EDIT_BUTTON_LABEL']."  '>";
 	$smarty->assign('EDIT_BUTTON',$buttons);
 	
- //global $AUTHCFG;
- 	//if (strtoupper($AUTHCFG['authType']) == 'SQL') {
 		$buttons = "<input title='".$mod_strings['LBL_CHANGE_PASSWORD_BUTTON_TITLE']."' accessKey='".$mod_strings['LBL_CHANGE_PASSWORD_BUTTON_KEY']."' class='classBtn' LANGUAGE=javascript onclick='return window.open(\"index.php?module=Users&action=ChangePassword&form=DetailView\",\"test\",\"width=320,height=165,resizable=no,scrollbars=0, toolbar=no, titlebar=no, left=100, top=126, screenX=100, screenY=126\");' type='button' name='password' value='".$mod_strings['LBL_CHANGE_PASSWORD_BUTTON_LABEL']."'>";
 		$smarty->assign('CHANGE_PW_BUTTON',$buttons);
-	//}
 	
 	$buttons = "<input title='".$mod_strings['LBL_LOGIN_HISTORY_BUTTON_TITLE']."' accessKey='".$mod_strings['LBL_LOGIN_HISTORY_BUTTON_KEY']."' class='classBtn' onclick=\"this.form.return_module.value='Users'; this.form.return_action.value='ShowHistory'; this.form.return_id.value='$focus->id'; this.form.action.value='ShowHistory'\" type='submit' name='LoginHistory' value=' ".$mod_strings['LBL_LOGIN_HISTORY_BUTTON_LABEL']." '>";	
 	$smarty->assign('LOGIN_HISTORY_BUTTON',$buttons);
@@ -166,33 +151,18 @@
 
 	
 }
-/* Forum Display/Hide Button
-if($_REQUEST['forumDisplay'] == "true" || $displayForums == "true"){
-	$buttons .= "<input title='".$app_strings['LBL_FORUM_HIDE_BUTTON_TITLE']."' accessKey='".$app_strings['LBL_FORUM_HIDE_BUTTON_KEY']."' class='button' onclick=\"this.form.module.value='Users'; this.form.forumDisplay.value='false'; this.form.action.value='DetailView'\" type='submit' name='Display' value=' ".$app_strings['LBL_FORUM_HIDE_BUTTON_LABEL']." '></td>\n";
-}
-else
-{
-	$buttons .= "<input title='".$app_strings['LBL_FORUM_SHOW_BUTTON_TITLE']."' accessKey='".$app_strings['LBL_FORUM_SHOW_BUTTON_KEY']."' class='button' onclick=\"this.form.module.value='Users'; this.form.forumDisplay.value='true'; this.form.action.value='DetailView'\" type='submit' name='Display' value=' ".$app_strings['LBL_FORUM_SHOW_BUTTON_LABEL']." '></td>\n";
-}
-*/
 if (is_admin($current_user)) 
 {
 	$buttons = "<input title='".$app_strings['LBL_DUPLICATE_BUTTON_TITLE']."' accessKey='".$app_strings['LBL_DUPLICATE_BUTTON_KEY']."' class='classBtn' onclick=\"this.form.return_module.value='Users'; this.form.return_action.value='DetailView'; this.form.isDuplicate.value=true; this.form.return_id.value='".$_REQUEST['record']."';this.form.action.value='EditView'\" type='submit' name='Duplicate' value=' ".$app_strings['LBL_DUPLICATE_BUTTON_LABEL']."'   >";
 	$smarty->assign('DUPLICATE_BUTTON',$buttons);
 	
-	//done so that only the admin user can see the customize vtiger_tab button
-	if($_REQUEST['record'] == $current_user->id)
-	{
-		$buttons = "<input title='".$app_strings['LBL_TABCUSTOMISE_BUTTON_TITLE']."' accessKey='".$app_strings['LBL_TABCUSTOMISE_BUTTON_KEY']."' class='classBtn' onclick=\"this.form.return_module.value='Users'; this.form.return_action.value='TabCustomise'; this.form.action.value='TabCustomise'\" type='submit' name='Customise' value=' ".$app_strings['LBL_TABCUSTOMISE_BUTTON_LABEL']." '>";
-		$smarty->assign('TABCUSTOMIZE_BUTTON',$buttons);
-	}
+	//done so that only the admin user can see the customize tab button
 	if($_REQUEST['record'] != $current_user->id)
 	{
 		$buttons = "<input title='".$app_strings['LBL_DELETE_BUTTON_TITLE']."' accessKey='".$app_strings['LBL_DELETE_BUTTON_KEY']."' class='classBtn' onclick=\"deleteUser('$focus->id')\" type='button' name='Delete' value='  ".$app_strings['LBL_DELETE_BUTTON_LABEL']."  '>";
 		$smarty->assign('DELETE_BUTTON',$buttons);
 	}
 
-        //$buttons .= "<input title='".$app_strings['LBL_ROLES_BUTTON_TITLE']."' accessKey='".$app_strings['LBL_ROLES_BUTTON_KEY']."' class='button' onclick=\"this.form.return_module.value='Users'; this.form.return_action.value='TabCustomise'; this.form.action.value='ListPermissions'\" type='submit' name='ListPermissions' value=' ".$app_strings['LBL_ROLES_BUTTON_LABEL']." '></td>\n";
 	if($_SESSION['authenticated_user_roleid'] == 'administrator')
 	{
 		$buttons = "<input title='".$app_strings['LBL_LISTROLES_BUTTON_TITLE']."' accessKey='".$app_strings['LBL_LISTROLES_BUTTON_KEY']."' class='classBtn' onclick=\"this.form.return_module.value='Users'; this.form.return_action.value='TabCustomise'; this.form.action.value='listroles'; this.form.record.value= '". $current_user->id ."'\" type='submit' name='ListRoles' value=' ".$app_strings['LBL_LISTROLES_BUTTON_LABEL']." '>";
@@ -202,99 +172,12 @@
 }
 
 
-if ((is_admin($current_user) || $_REQUEST['record'] == $current_user->id) && $focus->is_admin == 'on') {
-	$smarty->assign("IS_ADMIN", "checked");
-}
 
-$smarty->assign("DESCRIPTION", nl2br($focus->description));
-if(is_admin($current_user))
-{
-	$smarty->assign("ROLEASSIGNED","<a href=index.php?module=Users&action=RoleDetailView&roleid=".$role .">" .$rolename ."</a>");
-}
-else
-{
-	$smarty->assign("ROLEASSIGNED",$rolename);
-}
+$smarty->assign("MODULE", 'Settings');
+$smarty->assign("BLOCKS", getBlocks($currentModule,"detail_view",'',$focus->column_fields));
 
-	$smarty->assign("CURRENCY_NAME",$currency);
-
-//Getting the Group Lists
-$groupids = fetchUserGroupids($focus->id);
-if($groupids) {
-	$query ="select groupid,groupname from vtiger_groups where groupid in (".$groupids.")";
-	$result = $adb->query($query);
-	$num_rows = $adb->num_rows($result);
-} else {
-	$num_rows = 0;
-}
-
-
-
-//Assigning the group lists
-if(is_admin($current_user))
-{
-	for($i=0;$i < $num_rows;$i++)
-	{
-		$groupid = $adb->query_result($result,$i,'groupid');
-		$groupname = $adb->query_result($result,$i,'groupname');
-		$grouplists[$i] ="<a href='index.php?module=Users&action=GroupDetailView&groupId=".$groupid."'>".$groupname."</a>";
-	}
-	if($grouplists != '')
-	{	
-		$group_lists = implode(",",$grouplists);
-	}	
-	$smarty->assign("GROUPASSIGNED",$group_lists);
-}
-else
-{
-	for($i=0;$i < $num_rows;$i++)
-	{
-		$groupname = $adb->query_result($result,$i,'groupname');
-		$grouplists[$i] =$groupname;
-	}
-	if($grouplists != '')
-	{	
-		$group_lists = implode(",",$grouplists);
-	}
-	$smarty->assign("GROUPASSIGNED",$group_lists);
-}
-$smarty->assign("COLORASSIGNED", "<div style='background-color:".$focus->cal_color.";'>".$focus->cal_color."</div>");
-if($focus->hour_format == 'am/pm')
-{
-	$smarty->assign("CAL_HRFORMAT", "11:00pm");
-}
-else
-{
-	$smarty->assign("CAL_HRFORMAT", "23:00");
-}
-$smarty->assign("CAL_HRDURATION", $focus->start_hour."&nbsp;ends at&nbsp;".$focus->end_hour);
-$smarty->assign("ACTIVITY_VIEW", $focus->activity_view);
-$smarty->assign("LEAD_VIEW", $focus->lead_view);
-$smarty->assign("TITLE", $focus->title);
-$smarty->assign("DEPARTMENT", $focus->department);
-$smarty->assign("REPORTS_TO_ID", $focus->reports_to_id);
-$smarty->assign("REPORTS_TO_NAME", $focus->reports_to_name);
-$smarty->assign("PHONE_HOME", $focus->phone_home);
-$smarty->assign("PHONE_MOBILE", $focus->phone_mobile);
-$smarty->assign("PHONE_WORK", $focus->phone_work);
-$smarty->assign("PHONE_OTHER", $focus->phone_other);
-$smarty->assign("PHONE_FAX", $focus->phone_fax);
-$smarty->assign("EMAIL1", $focus->email1);
-$smarty->assign("EMAIL2", $focus->email2);
-$smarty->assign("ADDRESS_STREET", $focus->address_street);
-$smarty->assign("ADDRESS_CITY", $focus->address_city);
-$smarty->assign("ADDRESS_STATE", $focus->address_state);
-$smarty->assign("ADDRESS_POSTALCODE", $focus->address_postalcode);
-$smarty->assign("ADDRESS_COUNTRY", $focus->address_country);
-$smarty->assign("SIGNATURE", nl2br($focus->signature));
-$smarty->assign("MODULE", 'Settings');
-
-
-$mode1 = 'pref';
-$smarty->assign("MODE1", $mode1);
 
         $smarty->display("UserDetailView.tpl");
 
-echo "</td></tr>\n";
 
 ?>

Modified: vtigercrm/trunk/modules/Users/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/Users/EditView.php (original)
+++ vtigercrm/trunk/modules/Users/EditView.php Tue Jun 13 04:04:34 2006
@@ -32,35 +32,26 @@
 global $app_strings;
 global $app_list_strings;
 global $mod_strings;
+global $currentModule;
 
 
+$smarty=new vtigerCRM_Smarty;
 $focus = new User();
 
 if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) {
+	$smarty->assign("ID",$_REQUEST['record']);
 	$mode='edit';
 	if (!is_admin($current_user) && $_REQUEST['record'] != $current_user->id) die ("Unauthorized access to user administration.");
-    $focus->retrieve($_REQUEST['record']);
+    $focus->retrieve_entity_info($_REQUEST['record'],'Users');
 }else
 {
 	$mode='create';
-	$password='<tr>
-	   		   <td width="20%" class="dataLabel"><FONT class="required">*</FONT>Password</td>
-		       <td width="30%"><input name="new_password" type="password" vtiger_tabindex="1" size="25" maxlength="25"></td>
-			   <td width="20%" class="dataLabel"><FONT class="required">*</FONT>Confirm Password</td>
-			   <td width="30%"><input name="confirm_new_password" type="password" vtiger_tabindex="2" size="25" maxlength="75"></td>
-			  </tr>';
 }
 
 if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') {
 	$focus->id = "";
 	$focus->user_name = "";
 	$mode='create';
-	$password='<tr>
-	   		   <td width="20%" class="dataLabel"><FONT class="required">*</FONT>Password</td>
-		       <td width="30%"><input name="new_password" type="password" vtiger_tabindex="1" size="25" maxlength="25"></td>
-			   <td width="20%" class="dataLabel"><FONT class="required">*</FONT>Confirm Password</td>
-			   <td width="30%"><input name="confirm_new_password" type="password" vtiger_tabindex="2" size="25" maxlength="75"></td>
-			  </tr>';
 }
 
 global $theme;
@@ -70,8 +61,8 @@
 
 $log->info("User edit view");
 
-$smarty=new vtigerCRM_Smarty;
 
+$smarty->assign("JAVASCRIPT", get_validate_record_js());
 $smarty->assign("UMOD", $mod_strings);
 global $current_language;
 $smod_strings = return_module_language($current_language,'Settings');
@@ -90,255 +81,18 @@
         $smarty->assign("RETURN_ACTION", $_REQUEST['return_action']);
         $RETURN_ACTION = $_REQUEST['return_action'];
 }
-if(isset($_REQUEST['activity_mode']))
-{
-	$smarty->assign("ACTIVITYMODE",$_REQUEST['activity_mode']);
-}
 if ($_REQUEST['isDuplicate'] != 'true' && isset($_REQUEST['return_id']))
 {
         $smarty->assign("RETURN_ID", $_REQUEST['return_id']);
         $RETURN_ID = $_REQUEST['return_id'];
 }
 
-$smarty->assign("JAVASCRIPT", get_validate_record_js());
-
 $smarty->assign("IMAGE_PATH", $image_path);$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']);
-$smarty->assign("ID", $focus->id);
-$smarty->assign("USER_NAME", $focus->user_name);
-$smarty->assign("FIRST_NAME", $focus->first_name);
-$smarty->assign("LAST_NAME", $focus->last_name);
-$smarty->assign("TITLE", $focus->title);
-$smarty->assign("DEPARTMENT", $focus->department);
-$smarty->assign("REPORTS_TO_ID", $focus->reports_to_id);
-$smarty->assign("REPORTS_TO_NAME", $focus->reports_to_name);
-$smarty->assign("PHONE_HOME", $focus->phone_home);
-$smarty->assign("PHONE_MOBILE", $focus->phone_mobile);
-$smarty->assign("PHONE_WORK", $focus->phone_work);
-$smarty->assign("PHONE_OTHER", $focus->phone_other);
-$smarty->assign("PHONE_FAX", $focus->phone_fax);
-$smarty->assign("EMAIL1", $focus->email1);
-$smarty->assign("EMAIL2", $focus->email2);
-$smarty->assign("YAHOO_ID", $focus->yahoo_id);
-if (isset($focus->yahoo_id) && $focus->yahoo_id !== "") $smarty->assign("YAHOO_MESSENGER", "<a href='http://edit.yahoo.com/config/send_webmesg?.target=".$focus->yahoo_id."'><img border=0 src='http://opi.yahoo.com/online?u=".$focus->yahoo_id."'&m=g&t=2'></a>");
-$smarty->assign("ADDRESS_STREET", $focus->address_street);
-$smarty->assign("ADDRESS_CITY", $focus->address_city);
-$smarty->assign("ADDRESS_STATE", $focus->address_state);
-$smarty->assign("ADDRESS_POSTALCODE", $focus->address_postalcode);
-$smarty->assign("ADDRESS_COUNTRY", $focus->address_country);
-$smarty->assign("SIGNATURE", $focus->signature);
-$smarty->assign("DESCRIPTION", $focus->description);
-$smarty->assign("USERIMAGE", $focus->imagename);
-$smarty->assign("MODE", $mode);
+$focus->mode = $mode;
+$disp_view = getView($focus->mode);
+$smarty->assign("BLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields));	
 $smarty->assign("MODULE", 'Settings');
-
-$DATE_FORMAT_SELECT_OPTION = '<select name="date_format">';
-		
-               
-if($focus->date_format == 'dd-mm-yyyy')
-{
-	$selected1 = 'selected';
-}
-elseif($focus->date_format == 'mm-dd-yyyy')
-{
-	$selected2 = 'selected';
-}
-elseif($focus->date_format == 'yyyy-mm-dd')
-{
-	$selected3 = 'selected';
-}
-$DATE_FORMAT_SELECT_OPTION .= '<option value="dd-mm-yyyy" '.$selected1.'>';
-$DATE_FORMAT_SELECT_OPTION .= 'dd-mm-yyyy';
-$DATE_FORMAT_SELECT_OPTION .= '</option>';
-$DATE_FORMAT_SELECT_OPTION .= '<option value="mm-dd-yyyy" '.$selected2.'>';
-$DATE_FORMAT_SELECT_OPTION .= 'mm-dd-yyyy';
-$DATE_FORMAT_SELECT_OPTION .= '</option>';
-$DATE_FORMAT_SELECT_OPTION .= '<option value="yyyy-mm-dd" '.$selected3.'>';
-$DATE_FORMAT_SELECT_OPTION .= 'yyyy-mm-dd';
-$DATE_FORMAT_SELECT_OPTION .= '</option>';	
-$DATE_FORMAT_SELECT_OPTION .= ' </select>';
-$smarty->assign("DATE_FORMAT", $DATE_FORMAT_SELECT_OPTION);
-
-if (is_admin($current_user)) {
-	$status = "<td width='30%'>&nbsp;&nbsp;<select name='status' vtiger_tabindex='1'";
-	if (isset($default_user_name)
-		&& $default_user_name != ""
-		&& $default_user_name == $focus->user_name
-		&& isset($lock_default_user_name)
-		&& $lock_default_user_name == true ) {
-		$status .= " disabled ";
-	}
-	$status .= ">";
-	$status .= get_select_options_with_id($app_list_strings['user_status_dom'], $focus->status);
-	$status .= "</select></td>\n";
-	$smarty->assign("USER_STATUS_OPTIONS", $status);
-
-}
-else
-{
-		$status = "<td width='30%'>&nbsp;&nbsp;<select name='status' vtiger_tabindex='1' disabled>";
-		$status .= get_select_options_with_id($app_list_strings['user_status_dom'], $focus->status);
-		$status .= "</select></td>\n";
-		$smarty->assign("USER_STATUS_OPTIONS", $status);
-
-}	
-
-if (is_admin($current_user)) {
-     
-               
-		 $opt =	'<a href="javascript:openPopup();"><img src="'.$image_path.'select.gif" border="0" align="absmiddle"></a>';
-                $smarty->assign("ROLEPOPUPBUTTON", $opt);
-	
-	}
-		
-        if($focus->id != '')
-        {
-
-		$roleselectedid=fetchUserRole($focus->id);
-		$roleselected=getRoleName($roleselectedid);
-                $smarty->assign("USERROLE", $roleselectedid);
-                $smarty->assign("ROLENAME", $roleselected);
-
-        }
-               
-		
-		 
-
-
-
-if (is_admin($current_user)) {                   
-        $GROUP_SELECT_OPTION = '<select name="group_name">';
-		$GROUP_SELECT_OPTION .= '<option value="">--None--</option>';
-		if($focus->id) {
-			$sql = "SELECT groupname
-				FROM vtiger_users2group
-				INNER JOIN vtiger_groups
-					ON vtiger_groups.groupid = vtiger_users2group.groupid
-				WHERE userid = '" .$focus->id ."'";
-			$result = $adb->query($sql);
-			$groupnameArray = $adb->fetch_array($result);
-		}
-		$groupselected = $groupnameArray["groupname"];
-		$sql2 = "SELECT groupname FROM vtiger_groups";
-                  $result_name = $adb->query($sql2);
-                  $temprow = $adb->fetch_array($result_name);
-                   do
-                   {
-          		  $selected = '';
-
-                    $groupname=$temprow["groupname"];
-		       if($groupselected != '' && $groupname == $groupselected)
-	        	{
-		                $selected = 'selected';
-        		}
-                    $GROUP_SELECT_OPTION .= '<option value="'.$groupname.'" '.$selected.'>';
-                    $GROUP_SELECT_OPTION .= $temprow["groupname"];
-                    $GROUP_SELECT_OPTION .= '</option>';
-                   }while($temprow = $adb->fetch_array($result_name));
-                                  
-                   $GROUP_SELECT_OPTION .= ' </select>';
-                   
-                   $smarty->assign("GROUP_NAME", $GROUP_SELECT_OPTION);
- }
-
-if (is_admin($current_user)) { 
-	$CURRENCY_SELECT_OPTION = '<select name="currency_id" class="small">';
-	}
-else
-{
-	$CURRENCY_SELECT_OPTION = '<select name="currency_id" class="small" disabled>';
-}
-	
-        if($focus->id != '')
-        {
-                $currencyselectedid=fetchCurrency($focus->id);
-                $currencyselected=getCurrencyName($currencyselectedid);
-        }
-        $allCurrency=getDisplayCurrency();
-        foreach($allCurrency as $id=>$currencyInfoArr)
-        {
-               $currencyname=$currencyInfoArr;
-               $selected = '';
-               if($currencyselected != '' && $currencyname == $currencyselected)
-               {
-                       $selected = 'selected';
-               }
-               $CURRENCY_SELECT_OPTION .= '<option value="'.$id .'" '.$selected .'>';
-               $CURRENCY_SELECT_OPTION .= $currencyname;
-               $CURRENCY_SELECT_OPTION .= '</option>';
-        }
-        $CURRENCY_SELECT_OPTION .= ' </select>';
-        $smarty->assign("CURRENCY_NAME", $CURRENCY_SELECT_OPTION);
-
-
-
-$smarty->assign("ACTIVITY_VIEW", getActivityVIew($focus->activity_view));
-$smarty->assign("CLOUD_TAG", $focus->tagcloud);
-
-$smarty->assign("LEAD_VIEW", getLeadVIew($focus->lead_view));
-
-		if($focus->cal_color == '') $focus->cal_color = '#E6FAD8';
-
- 		$smarty->assign("CAL_COLOR",'<INPUT TYPE="text" readonly NAME="cal_color" SIZE="10" VALUE="'.$focus->cal_color.'" style="background-color:'.$focus->cal_color.';"> <img src="include/images/bgcolor.gif" onClick="cp2.select(document.EditView.cal_color,\'pick2\');return false;" NAME="pick2" ID="pick2" align="middle">');
-		
-		$hrformat = '<select name="hour_format" class="small">';
-		if($focus->hour_format == '24')
-		{
-			$_24selected = 'selected';
-			$_ampmselected = '';
-		}
-		elseif($focus->hour_format == 'am/pm')
-		{
-			$_24selected = '';
-			$_ampmselected = 'selected';
-		}
-		$hrformat .= '<option value="24" '.$_24selected.'>23:00</option>';
-		$hrformat .= '<option value="am/pm" '.$_ampmselected.'>11:00pm</option>';
-		$hrformat .= '</select>';
-		$smarty->assign("CAL_HRFORMAT",$hrformat);
-
-		$stend_hour = '<select name="start_hour" class="small">';
-		for($i=0;$i<=15;$i++)
-		{
-			if($i == $focus->start_hour)
-				$selected = 'selected';
-			else
-				$selected = '';
-			if($i <= 9 && strlen(trim($i)) < 2)
-			{
-				$hrvalue= '0'.$i.':00';
-			}
-			else
-				$hrvalue= $i.':00';
-			$stend_hour .= '<option value="'.$hrvalue.'" '.$selected.'>'.$hrvalue.'</option>';
-		}
-		$stend_hour .= '</select>&nbsp;ends at:';
-		$stend_hour .= '<select name="end_hour" class="small">';
-		for($i=16;$i<=23;$i++)
-		{
-			if($i == $focus->end_hour)
-				$selected = 'selected';
-			else
-				$selected = '';
-			if($i <= 9 && strlen(trim($i)) < 2)
-			{
-				$hrvalue= '0'.$i.':00';
-			}
-			else
-				$hrvalue= $i.':00';
-			$stend_hour .= '<option value="'.$hrvalue.'" '.$selected.'>'.$hrvalue.'</option>';
-		}
-		$stend_hour .= '</select>&nbsp;';
-		$smarty->assign("CAL_HRDURATION",$stend_hour);
-
-if (isset($default_user_name)
-	&& $default_user_name != ""
-	&& $default_user_name == $focus->user_name
-	&& isset($lock_default_user_name)
-	&& $lock_default_user_name == true ) {
-	$status .= " disabled ";
-	$smarty->assign("DISABLED", "disabled");
-}
-
+$smarty->assign("MODE",$focus->mode);
 if ($_REQUEST['Edit'] == ' Edit ')
 {
 	$smarty->assign("READONLY", "readonly");
@@ -352,12 +106,6 @@
 
 
 
-if (is_admin($current_user) && $focus->is_admin == 'on') $smarty->assign("IS_ADMIN", "checked");
-elseif (is_admin($current_user) && $focus->is_admin != 'on') ;
-elseif (!is_admin($current_user) && $focus->is_admin == 'on') $smarty->assign("IS_ADMIN", "disabled checked");
-else $smarty->assign("IS_ADMIN", "disabled");
-
-//$smarty->assign("",$focus->getUserListViewHeader());
 
 $smarty->assign('PARENTTAB',$_REQUEST['parenttab']);
 

Modified: vtigercrm/trunk/modules/Users/Forms.php
==============================================================================
--- vtigercrm/trunk/modules/Users/Forms.php (original)
+++ vtigercrm/trunk/modules/Users/Forms.php Tue Jun 13 04:04:34 2006
@@ -54,7 +54,7 @@
 function verify_data(form) {
 	var isError = false;
 	var errorMessage = "";
-	if (trim(form.email1.value) == "") {
+	if (trim(form.email.value) == "") {
 		isError = true;
 		errorMessage += "\\n$lbl_user_email1";
 		oField_miss = form.email1;
@@ -71,15 +71,15 @@
 	}
 	if(form.mode.value !='edit')
 	{
-		if (trim(form.new_password.value) == "") {
+		if (trim(form.user_password.value) == "") {
 			isError = true;
 			errorMessage += "\\n$lbl_new_password";
-			oField_miss =form.new_password;
+			oField_miss =form.user_password;
 		}
-		if (trim(form.confirm_new_password.value) == "") {
+		if (trim(form.confirm_password.value) == "") {
 			isError = true;
 			errorMessage += "\\n$lbl_confirm_new_password";
-			oField_miss =form.confirm_new_password;
+			oField_miss =form.confirm_password;
 		}
 	}
 	if (trim(form.user_name.value) == "") {
@@ -91,19 +91,19 @@
 	if (isError == true) {
 		set_fieldfocus(errorMessage,oField_miss);
 	}
-	if (trim(form.email1.value) != "" && !/^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,4})+$/.test(form.email1.value)) {
-		errorMessage='"' + form.email1.value + '" is $err_invalid_email_address';
+	if (trim(form.email.value) != "" && !/^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,4})+$/.test(form.email.value)) {
+		errorMessage='"' + form.email.value + '" is $err_invalid_email_address';
 		set_fieldfocus(errorMessage,form.email1);
 	}
 	if (trim(form.email2.value) != "" && !/^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,4})+$/.test(form.email2.value)) {
-		errorMessage='"' + form.email2.value + '" value in other email vtiger_field is $err_invalid_email_address';
+		errorMessage='"' + form.email2.value + '" value in other email field is $err_invalid_email_address';
 		set_fieldfocus(errorMessage,form.email2);
 	}
 	if(form.mode.value != 'edit')
 	{
-		if(trim(form.new_password.value) != trim(form.confirm_new_password.value))
+		if(trim(form.user_password.value) != trim(form.confirm_password.value))
 		{
-			set_fieldfocus("The password does't match",form.form.new_password);
+			set_fieldfocus("The password does't match",form.user_password);
 		}
 		check_duplicate();
 	}else

Modified: vtigercrm/trunk/modules/Users/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Users/Save.php (original)
+++ vtigercrm/trunk/modules/Users/Save.php Tue Jun 13 04:04:34 2006
@@ -46,13 +46,16 @@
 elseif (!isset($_POST['record']) && !is_admin($current_user)) echo ("Unauthorized access to user administration.");
 
 $focus = new User();
-$focus->retrieve($_POST['record']);
-if(isset($focus->id) && $focus->id != '')
-    $mode='edit';
+if(isset($_REQUEST["record"]) && $_REQUEST["record"] != '')
+{
+    $focus->mode='edit';
+	$focus->id = $_REQUEST["record"];
+}
 else
-    $mode='';
+    $focus->mode='';
+	
 //save user Image
-$image_upload_array=SaveImage($_FILES,'user',$focus->id,$mode);
+$image_upload_array=SaveImage($_FILES,'user',$focus->id,$focus->mode);
 $focus->imagename = $image_upload_array['imagename'];
 $image_error = $image_upload_array['imageerror'];
 $errormessage = $image_upload_array['errormessage'];
@@ -69,61 +72,21 @@
 		exit;
 	}
 	
-	foreach($focus->column_fields as $field)
-	{
-		if(isset($_POST[$field]))
-		{
-			$value = $_POST[$field];
-			$focus->$field = $value;
 			
-		}
-	}
+	if (!isset($_POST['is_admin'])) $_REQUEST["is_admin"] = 'off';
+	//Code contributed by mike crowe for rearrange the home page and tab
+	if (!isset($_POST['deleted'])) $_REQUEST["deleted"] = '0';
+	if (!isset($_POST['homeorder']) || $_POST['homeorder'] == "" ) $_REQUEST["homeorder"] = 'ILTI,QLTQ,ALVT,PLVT,CVLVT,HLT,OLV,GRT,OLTSO';
 	
-	foreach($focus->additional_column_fields as $field)
-	{
-		if(isset($_POST[$field]))
-		{
-			$value = $_POST[$field];
-			$focus->$field = $value;
-			
-		}
-	}
-	
-	if (!isset($_POST['is_admin'])) $focus->is_admin = 'off';
-	//Code contributed by mike crowe for rearrange the home page and vtiger_tab
-	if (!isset($_POST['deleted'])) $focus->deleted = '0';
-	if (!isset($_POST['homeorder']) || $_POST['homeorder'] == "" ) $focus->homeorder = 'ILTI,QLTQ,ALVT,PLVT,CVLVT,HLT,OLV,GRT,OLTSO';
-	
-/*	if (!$focus->verify_data()) {
-		header("Location: index.php?action=Error&module=Users&error_string=".urlencode($focus->error_string));
-		exit;
-	}
-	else{	*/
+	setObjectValuesFromRequest(&$focus);
 		$focus->save("Users");
-//		include('modules/Calendar/user_ins.php');
-//		include("modules/Users/forum_register.php");	
 		$return_id = $focus->id;
-//	}
+
 if (isset($_POST['user_name']) && isset($_POST['new_password'])) {
-	/*	
-		//changing fourm password	
-		define('IN_PHPBB', 1);
-		
-		$phpbb_root_path = "modules/MessageBoard/";
-		require($phpbb_root_path . 'extension.inc');
-		include($phpbb_root_path . 'common.php');
-	*/	
 		$new_pass = $_POST['new_password'];
 		$new_passwd = $_POST['new_password'];
 		$new_pass = md5($new_pass);
 		$uname = $_POST['user_name'];
-		//$sql = "UPDATE " . USERS_TABLE . " SET user_password = '$new_pass' WHERE username = '$uname'";
-	/*
-		if (!($result = $db->sql_query($sql)) )
-		{
-			message_die(GENERAL_ERROR, 'Could not update user password', '', __LINE__, __FILE__, $sql);
-		}
-	*/
 		if (!$focus->change_password($_POST['confirm_new_password'], $_POST['new_password'])) {
 		
 			header("Location: index.php?action=Error&module=Users&error_string=".urlencode($focus->error_string));

Modified: vtigercrm/trunk/modules/Users/User.php
==============================================================================
--- vtigercrm/trunk/modules/Users/User.php (original)
+++ vtigercrm/trunk/modules/Users/User.php Tue Jun 13 04:04:34 2006
@@ -30,14 +30,14 @@
 
 require_once('include/logging.php');
 require_once('include/database/PearDatabase.php');
-require_once('data/SugarBean.php');
+require_once('data/CRMEntity.php');
 require_once('include/utils/UserInfoUtil.php');
 
 // User is used to store customer information.
-class User extends SugarBean {
+class User extends CRMEntity {
 	var $log;
 	var $db;
-	// Stored vtiger_fields
+	// Stored fields
 	var $id;
 	var $user_name;
 	var $user_password;
@@ -84,8 +84,22 @@
 	var $reports_to_id;
 
 	var $module_id='id';
-	
-	var $table_name = "vtiger_users";
+	var $tab_name = Array('vtiger_users','vtiger_attachments','vtiger_user2role');	
+	var $tab_name_index = Array('vtiger_users'=>'id','vtiger_attachments'=>'attachmentsid','vtiger_user2role'=>'userid');
+	var $column_fields = Array();
+	var $table_name = "users";
+	var $sortby_fields = Array();		  
+	
+    // This is the list of fields that are in the lists.
+    var $list_fields_name = Array();
+    var $list_link_field= '';
+
+	var $list_mode;
+	var $popup_type;
+
+	var $search_fields = Array();
+    var $search_fields_name = Array();
+	
 	var $module_name = "Users";
 
 	var $object_name = "User";
@@ -96,58 +110,13 @@
 	var $imagename;
 	var $defhomeview;
 	//var $sortby_fields = Array('user_name','email1','last_name','is_admin','status');	
-	var $column_fields = Array("id"
-		,"user_name"
-		,"user_password"
-		,"cal_color"
-		,"hour_format"
-		,"start_hour"
-		,"end_hour"
-		,"first_name"
-		,"last_name"
-		,"description"
-		,"date_entered"
-		,"date_modified"
-		,"modified_user_id"
-		,"title"
-		,"department"
-		,"is_admin"
-		,"currency_id"
-		,"phone_home"
-		,"phone_mobile"
-		,"phone_work"
-		,"phone_other"
-		,"phone_fax"
-		,"email1"
-		,"email2"
-		,"signature"
-		,"yahoo_id"
-		,"address_street"
-		,"address_city"
-		,"address_state"
-		,"address_postalcode"
-		,"address_country"
-		,"reports_to_id"
-		,"tz"
-		,"holidays"
-		,"namedays"
-		,"workdays"
-		,"weekstart"
-		,"status"
-		,"date_format"
-		,"activity_view"
-		,"lead_view"
-		,"tagcloud"
-		,"imagename"
-		,"defhomeview"
-		);
 
 	var $encodeFields = Array("first_name", "last_name", "description");
 
-	// This is used to retrieve related vtiger_fields from form posts.
+	// This is used to retrieve related fields from form posts.
 	var $additional_column_fields = Array('reports_to_name');		
 	
-	// This is the list of vtiger_fields that are in the lists.
+	// This is the list of fields that are in the lists.
 	var $list_fields = Array('id', 'first_name', 'last_name', 'user_name', 'status', 'department', 'yahoo_id', 'is_admin', 'email1', 'phone_work');
 	//commented as we get issues with sugarbean
 	/*
@@ -169,7 +138,10 @@
 
 	function User() {
 		$this->log = LoggerManager::getLogger('user');
+		$this->log->debug("Entering User() method ...");
 		$this->db = new PearDatabase();
+		$this->column_fields = getColumnFields('Users');
+		$this->log->debug("Exiting User() method ...");
 		
 	}
 
@@ -225,19 +197,20 @@
 	function encrypt_password($user_password)
 	{
 		// encrypt the password.
-		$salt = substr($this->user_name, 0, 2);
+		$salt = substr($this->column_fields["user_name"], 0, 2);
 		$encrypted_password = crypt($user_password, $salt);	
 
 		return $encrypted_password;
 	}
 	
 	function authenticate_user($password){
-	
-		$query = "SELECT * from $this->table_name where user_name='$this->user_name' AND user_hash='$password'";
+		$usr_name = $this->column_fields["user_name"];
+	
+		$query = "SELECT * from $this->table_name where user_name='$usr_name' AND user_hash='$password'";
 		$result = $this->db->requireSingleResult($query, false);
 
 		if(empty($result)){
-			$this->log->fatal("SECURITY: failed login by $this->user_name");
+			$this->log->fatal("SECURITY: failed login by $usr_name");
 			return false;
 		}
 
@@ -278,12 +251,13 @@
 	 */
 	function doLogin($user_password) {
 		global $AUTHCFG;
+		$usr_name = $this->column_fields["user_name"];
 	
 		switch (strtoupper($AUTHCFG['authType'])) {
 			case 'LDAP':
 				$this->log->debug("Using LDAP authentication");
 				require_once('modules/Users/authTypes/LDAP.php');
-				$result = ldapAuthenticate($this->user_name, $user_password);
+				$result = ldapAuthenticate($this->column_fields["user_name"], $user_password);
 				if ($result == NULL) {
 					return false;
 				} else {
@@ -295,7 +269,7 @@
 				$this->log->debug("Using Active Directory authentication");
 				require_once('modules/Users/authTypes/adLDAP.php');
 				$adldap = new adLDAP();
-				if ($adldap->authenticate($this->user_name,$user_password)) {
+				if ($adldap->authenticate($this->column_fields["user_name"],$user_password)) {
 					return true;
 				} else {
 					return false;
@@ -305,7 +279,7 @@
 			default:
 				$this->log->debug("Using integrated/SQL authentication");
 				$encrypted_password = $this->encrypt_password($user_password);
-				$query = "SELECT * from $this->table_name where user_name='$this->user_name' AND user_password='$encrypted_password'";
+				$query = "SELECT * from $this->table_name where user_name='$usr_name' AND user_password='$encrypted_password'";
 				$result = $this->db->requireSingleResult($query, false);
 				if (empty($result)) {
 					return false;
@@ -327,18 +301,19 @@
 	 */
 	function load_user($user_password)
 	{
+		$usr_name = $this->column_fields["user_name"];
 		if(isset($_SESSION['loginattempts'])){
 				 $_SESSION['loginattempts'] += 1;
 		}else{
 			$_SESSION['loginattempts'] = 1;	
 		}
 		if($_SESSION['loginattempts'] > 5){
-			$this->log->warn("SECURITY: " . $this->user_name . " has attempted to login ". 	$_SESSION['loginattempts'] . " times.");
-		}
-		$this->log->debug("Starting user load for $this->user_name");
+			$this->log->warn("SECURITY: " . $usr_name . " has attempted to login ". 	$_SESSION['loginattempts'] . " times.");
+		}
+		$this->log->debug("Starting user load for $usr_name");
 		$validation = 0;
 		unset($_SESSION['validation']);
-		if( !isset($this->user_name) || $this->user_name == "" || !isset($user_password) || $user_password == "")
+		if( !isset($this->column_fields["user_name"]) || $this->column_fields["user_name"] == "" || !isset($user_password) || $user_password == "")
 			return null;
 			
 		if($this->validation_check('aW5jbHVkZS9pbWFnZXMvc3VnYXJzYWxlc19tZC5naWY=','1a44d4ab8f2d6e15e0ff6ac1c2c87e6f', '866bba5ae0a15180e8613d33b0acc6bd') == -1)$validation = -1;
@@ -352,19 +327,18 @@
 		
 		if(!$authCheck)
 		{
-			$this->log->warn("User authentication for $this->user_name failed");
+			$this->log->warn("User authentication for $usr_name failed");
 			return null;
 		}
 		
-		$query = "SELECT * from $this->table_name where user_name='$this->user_name'";
+		$query = "SELECT * from $this->table_name where user_name='$usr_name'";
 		$result = $this->db->requireSingleResult($query, false);
 
-		// Get the vtiger_fields for the user
+		// Get the fields for the user
 		$row = $this->db->fetchByAssoc($result);
+		$this->id = $row['id'];	
 
 		$user_hash = strtolower(md5($user_password));
-		
-		
 		
 		
 		// If there is no user_hash is not present or is out of date, then create a new one.
@@ -372,19 +346,6 @@
 		{
 			$query = "UPDATE $this->table_name SET user_hash='$user_hash' where id='{$row['id']}'";
 			$this->db->query($query, true, "Error setting new hash for {$row['user_name']}: ");	
-		}
-		
-		// now fill in the vtiger_fields.
-		foreach($this->column_fields as $field)
-		{
-			//$this->log->info($field);
-			
-			if(isset($row[$field]))
-			{
-				$this->log->debug("=".$row[$field]);
-	
-				$this->$field = $row[$field];
-			}
 		}
 		$this->loadPreferencesFromDB($row['user_preferences']);
 		
@@ -408,9 +369,10 @@
 	*/
 	function change_password($user_password, $new_password)
 	{
+		$usr_name = $this->column_fields["user_name"];
 		global $mod_strings;
 		global $current_user;
-		$this->log->debug("Starting password change for $this->user_name");
+		$this->log->debug("Starting password change for $usr_name");
 		
 		if( !isset($new_password) || $new_password == "") {
 			$this->error_string = $mod_strings['ERR_PASSWORD_CHANGE_FAILED_1'].$user_name.$mod_strings['ERR_PASSWORD_CHANGE_FAILED_2'];
@@ -430,7 +392,7 @@
 	
 			if($row == null)
 			{
-				$this->log->warn("Incorrect old password for $this->user_name");
+				$this->log->warn("Incorrect old password for $usr_name");
 				$this->error_string = $mod_strings['ERR_PASSWORD_INCORRECT_OLD'];
 				return false;
 			}
@@ -441,7 +403,7 @@
 		
 		//set new password
 		$query = "UPDATE $this->table_name SET user_password='$encrypted_new_password', user_hash='$user_hash' where id='$this->id'";
-		$this->db->query($query, true, "Error setting new password for $this->user_name: ");	
+		$this->db->query($query, true, "Error setting new password for $usr_name: ");	
 		return true;
 	}
 	
@@ -460,16 +422,17 @@
 	}
 	
 	/** 
-	 * @return -- returns a list of all vtiger_users in the system.
+	 * @return -- returns a list of all users in the system.
 	 * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc..
 	 * All Rights Reserved..
 	 * Contributor(s): ______________________________________..
 	 */
 	function verify_data()
 	{
+		$usr_name = $this->column_fields["user_name"];
 		global $mod_strings;
 		
-		$query = "SELECT user_name from vtiger_users where user_name='$this->user_name' AND id<>'$this->id' AND deleted=0";
+		$query = "SELECT user_name from vtiger_users where user_name='$usr_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);
 		
@@ -478,20 +441,20 @@
 		$last_admin = $this->db->fetchByAssoc($result);
 
 		$this->log->debug("last admin length: ".count($last_admin));
-		$this->log->debug($last_admin['user_name']." == ".$this->user_name);
+		$this->log->debug($last_admin['user_name']." == ".$usr_name);
 
 		$verified = true;
 		if($dup_users != null)
 		{
-			$this->error_string .= $mod_strings['ERR_USER_NAME_EXISTS_1'].$this->user_name.$mod_strings['ERR_USER_NAME_EXISTS_2'];
+			$this->error_string .= $mod_strings['ERR_USER_NAME_EXISTS_1'].$usr_name.''.$mod_strings['ERR_USER_NAME_EXISTS_2'];
 			$verified = false;
 		}
 		if(!isset($_REQUEST['is_admin']) &&
 			count($last_admin) == 1 && 
-			$last_admin['user_name'] == $this->user_name) {
+			$last_admin['user_name'] == $usr_name) {
 			$this->log->debug("last admin length: ".count($last_admin));
 
-			$this->error_string .= $mod_strings['ERR_LAST_ADMIN_1'].$this->user_name.$mod_strings['ERR_LAST_ADMIN_2'];
+			$this->error_string .= $mod_strings['ERR_LAST_ADMIN_1'].$usr_name.$mod_strings['ERR_LAST_ADMIN_2'];
 			$verified = false;
 		}
 		
@@ -589,13 +552,14 @@
 	function retrieveCurrentUserInfoFromFile($userid)
 	{
 		require('user_privileges/user_privileges_'.$userid.'.php');
-		foreach($this->column_fields as $field)
+		foreach($this->column_fields as $field=>$value_iter)
                 {
                         if(isset($user_info[$field]))
                         {
                                 $this->$field = $user_info[$field];
                         }
                 }
+		$this->id = $userid;
 		return $this;
 		
 	}




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 06:06:34 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 10:06:34 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7019 - in
 /vtigercrm/trunk/Smarty/templates: DisplayFields.tpl UserDetailView.tpl
 UserEditView.tpl
Message-ID: <20060613100634.DA4A57E8C4C@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 13 04:06:27 2006
New Revision: 7019

Log:
users module added in CRMEntity


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

Modified: vtigercrm/trunk/Smarty/templates/DisplayFields.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DisplayFields.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DisplayFields.tpl Tue Jun 13 04:06:27 2006
@@ -452,6 +452,104 @@
 				<input name="{$fldname}"  type="file" value="{$secondvalue}"/>
 				<input type="hidden" name="id" value=""/>{$fldvalue}
 			</td>
+		{elseif $uitype eq 156}
+			<td width="20%" class="dvtCellLabel" align=right>
+				{$fldlabel}
+			</td>
+				{if $fldvalue eq 1}
+					<td width="30%" align=left class="dvtCellInfo">
+						<input name="{$fldname}" type="checkbox"  checked>
+					</td>
+				{else}
+					<td width="30%" align=left class="dvtCellInfo">
+						<input name="{$fldname}" type="checkbox">
+					</td>
+				{/if}
+		{elseif $uitype eq 98}<!-- Role Selection Popup -->		
+			<td width="20%" class="dvtCellLabel" align=right>
+			<font color="red">*</font>
+				{$fldlabel}
+			</td>
+			<td width="30%" align=left class="dvtCellInfo">
+			<input name="role_name" id="role_name" class="txtBox" value="{$secondvalue}" type="text">&nbsp;
+			<a href="javascript:openPopup();"><img src="{$IMAGE_PATH}select.gif" align="absmiddle" border="0"></a>
+			<input name="user_role" id="user_role" value="{$fldvalue}" type="hidden">
+			</td>
+		{elseif $uitype eq 104}<!-- Mandatory Email Fields -->			
+			 <td width=20% class="dvtCellLabel" align=right>
+			 <font color="red">*</font>
+			 {$fldlabel}
+			 </td>
+    	     <td width=30% align=left class="dvtCellInfo"><input type="text" name="{$fldname}" id ="{$fldname}" value="{$fldvalue}" class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'"></td>
+			{elseif $uitype eq 115}<!-- for Status field Disabled for nonadmin -->
+			<td width="20%" class="dvtCellLabel" align=right>
+				{$fldlabel}
+			</td>
+			<td width="30%" align=left class="dvtCellInfo">
+			   <select name="{$fldname}">
+				{foreach item=arr from=$fldvalue}
+					{foreach key=sel_value item=value from=$arr}
+						<option value="{$sel_value}" {$value}>{$sel_value}</option>
+					{/foreach}
+				{/foreach}
+			   </select>
+			</td>
+			{elseif $uitype eq 105}
+			<td width="20%" class="dvtCellLabel" align=right>
+				{$fldlabel}
+			</td>
+			<td width="30%" align=left class="dvtCellInfo">
+					<input name="{$fldname}"  type="file" value="{$maindata[3].0.name}"/>
+					<input type="hidden" name="id" value=""/>
+					{$maindata[3].0.name}
+			</td>
+			{elseif $uitype eq 103}
+			<td width="20%" class="dvtCellLabel" align=right>
+				{$fldlabel}
+			</td>
+			<td width="30%" colspan="3" align=left class="dvtCellInfo">
+				<input type="text" name="{$fldname}" value="{$fldvalue}" class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'">
+			</td>	
+			{elseif $uitype eq 101}<!-- for reportsto field USERS POPUP -->
+				<td width="20%" class="dvtCellLabel" align=right>
+			       {$fldlabel}
+	            </td>
+				<td width="30%" colspan="3" align=left class="dvtCellInfo">
+				<input readonly name='{$fldname}' class="small" type="text" value='{$fldvalue}'><input name='reports_to_id' type="hidden" value='{$fldvalue}'>&nbsp;<input title="Change [Alt+C]" accessKey="C" type="button" class="small" value='{$UMOD.LBL_CHANGE}' name=btn1 LANGUAGE=javascript onclick='return window.open("index.php?module=Users&action=Popup&form=UsersEditView&form_submit=false","test","width=640,height=522,resizable=0,scrollbars=0");'>
+	            </td>
+			{elseif $uitype eq 116}<!-- for currency in users details-->	
+			<td width="20%" class="dvtCellLabel" align=right>
+				{$fldlabel}
+			</td>
+			<td width="30%" align=left class="dvtCellInfo">
+			   <select name="{$fldname}">
+				{foreach item=arr key=uivalueid from=$fldvalue}
+					{foreach key=sel_value item=value from=$arr}
+						<option value="{$uivalueid}" {$value}>{$sel_value}</option>
+					{/foreach}
+				{/foreach}
+			   </select>
+			</td>
+			{elseif $uitype eq 106}
+			<td width=20% class="dvtCellLabel" align=right>
+				<font color="red">*</font>{$fldlabel}
+			</td>
+			<td width=30% align=left class="dvtCellInfo">
+				{if $MODE eq 'edit'}
+				<input type="text" readonly name="{$fldname}" value="{$fldvalue}" class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'">
+				{else}
+				<input type="text" name="{$fldname}" value="{$fldvalue}" class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'">
+				{/if}
+			</td>
+			{elseif $uitype eq 99}
+				{if $MODE eq 'create'}
+				<td width=20% class="dvtCellLabel" align=right>
+					<font color="red">*</font>{$fldlabel}
+				</td>
+				<td width=30% align=left class="dvtCellInfo">
+					<input type="password" name="{$fldname}" value="{$fldvalue}" class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'">
+				</td>
+				{/if}
 		{elseif $uitype eq 30}
 			<td width="20%" class="dvtCellLabel" align=right>
 				{$fldlabel}

Modified: vtigercrm/trunk/Smarty/templates/UserDetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/UserDetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/UserDetailView.tpl Tue Jun 13 04:06:27 2006
@@ -11,11 +11,12 @@
 -->*}
 <script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
 <script language="JavaScript" type="text/javascript" src="include/js/ColorPicker2.js"></script>
-<script language="JavaScript" type="text/javascript" src="include/js/prototype.js"></script>
-<script language="JavaScript" type="text/javascript" src="include/js/slider.js"></script>
-<script language="JavaScript" type="text/javascript" src="include/js/prototype_fade.js"></script>
-<script language="JavaScript" type="text/javascript" src="include/js/effectspack.js"></script>
 <script language="javascript" type="text/javascript" src="include/js/general.js"></script>
+<script language="JavaScript" type="text/javascript" src="include/js/dtlviewajax.js"></script>
+<span id="crmspanid" style="display:none;position:absolute;"  onmouseover="show('crmspanid');">
+   <a class="link"  align="right" href="javascript:;">Edit</a>
+</span>
+
 <style type="text/css">@import url(themes/blue/style.css);</style>
 
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
@@ -94,10 +95,8 @@
 			<td>
 			  <table class="small" border="0" cellpadding="3" cellspacing="0" width="100%">
 			  <tr >
+			        <td id="prof" width="25%" align="center" nowrap="nowrap" class="dvtSelectedCell" onClick="fnVis('prof')"><b>{$UMOD.LBL_USER_LOGIN_ROLE}</b></td>
 			     <td class="dvtTabCache" width="10" nowrap="nowrap">&nbsp;</td>
-			        <td id="prof" width="25%" align="center" nowrap="nowrap" class="dvtSelectedCell" onClick="fnVis('prof')"><b>{$UMOD.LBL_USER_LOGIN_ROLE}</b></td>
-				    <td id="more" width="25%" align="center" nowrap="nowrap" class="dvtUnSelectedCell" onClick="fnVis('more')"><b>{$UMOD.LBL_USER_MORE_INFN}</b></td>
-				    <td id="addr" width="25%" align="center" nowrap="nowrap" class="dvtUnSelectedCell" onClick="fnVis('addr')"><b>{$UMOD.LBL_USER_ADDR_INFN}</b></td>
 				    <td class="dvtTabCache" nowrap="nowrap" width="10">&nbsp;</td>
 			  </tr>
 			  </table>
@@ -105,162 +104,50 @@
 		  </tr>
 		  <tr>
 		  	<td align="left" valign="top">
-			<div id="mnuTab">
-				<table class="dvtContentSpace" border="0" cellpadding="0" cellspacing="0" width="100%">
-				<tr><td height="35">&nbsp;</td></tr>
-				<tr><td align="left">
-				<table width="99%"  border="0" cellspacing="0" cellpadding="5" align="center" class="small">
+				{foreach key=header item=detail from=$BLOCKS}
+				<table border=0 cellspacing=0 cellpadding=0 width=100% class="small">
   		    	<tr>
-				<td colspan="4" class="detailedViewHeader"><b>{$UMOD.LBL_USER_INFORMATION}</b></td>
+    	               <td>&nbsp;</td>
+        	           <td>&nbsp;</td>
+            	       <td>&nbsp;</td>
+                	   <td align=right>
 				</tr>  
 				<tr>
-				<td class="dvtCellLabel" align="right"><span class="style1"><font color='red'>{$APP.LBL_REQUIRED_SYMBOL}</font></span>{$UMOD.LBL_USER_NAME} </td>
-				<td class="dvtCellInfo">{$USER_NAME}&nbsp;</td>
-				<td class="dvtCellLabel" align="right">{$UMOD.LBL_ADMIN} </td>
-        	    <td class="dvtCellInfo"><input type="checkbox" name="is_admin" {$IS_ADMIN}/></td>
-				</tr>
-				{if $MODE eq 'edit'}
-				<tr>
-				<td class="dvtCellLabel" align="right" width="20%"><span class="style1"><font color='red'>{$APP.LBL_REQUIRED_SYMBOL}</font></span>{$UMOD.LBL_PASSWORD} </td>
-			    <td class="dvtCellInfo" width="20%"><input  name="new_password" type="password" class="detailedViewTextBox"  onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'" /></td>
-			    <td class="dvtCellLabel" width="20%" align="right"><span class="style1"><font color='red'>{$APP.LBL_REQUIRED_SYMBOL}</font></span>{$UMOD.LBL_CONFIRM_PASSWORD} </td>
-			    <td class="dvtCellInfo" width="20%"><input name="confirm_new_password" type="password" class="detailedViewTextBox"  onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'" /></td>
+						{strip}
+					     <td colspan=4 style="border-bottom:1px solid #999999;padding:5px;" bgcolor="#e5e5e5">
+							<b>	{$header}</b>
+						 </td>
+						 {/strip}
 			    </tr>
+					{foreach item=detail from=$detail}
+					<tr style="height:25px">
+							{foreach key=label item=data from=$detail}
+							   {assign var=keyid value=$data.ui}
+							   {assign var=keyval value=$data.value}
+							   {assign var=keytblname value=$data.tablename}
+							   {assign var=keyfldname value=$data.fldname}
+							   {assign var=keyoptions value=$data.options}
+							   {assign var=keysecid value=$data.secid}
+							   {assign var=keyseclink value=$data.link}
+							   {assign var=keycursymb value=$data.cursymb}
+							   {assign var=keysalut value=$data.salut}
+							   {assign var=keycntimage value=$data.cntimage}
+							   {assign var=keyadmin value=$data.isadmin}
+							   
+							   <input type="hidden" id="hdtxt_IsAdmin" value={$keyadmin}></input>
+							   	{if $label ne ''}
+									<td class="dvtCellLabel" align=right width=25%>{$label}</td>
+									{include file="DetailViewUI.tpl"}
+								{else}
+                                    <td class="dvtCellLabel" align=right>&nbsp;</td>
+                                    <td class="dvtCellInfo" align=left >&nbsp;</td>
 				{/if}	
-			    <tr>
-			    <td class="dvtCellLabel" align="right">{$UMOD.LBL_FIRST_NAME} </td>
-			    <td class="dvtCellInfo">{$FIRST_NAME}&nbsp;</td>
-			    <td class="dvtCellLabel" align="right"><span class="style1"><font color='red'>{$APP.LBL_REQUIRED_SYMBOL}</font></span>{$UMOD.LBL_LAST_NAME}</td>
-			    <td class="dvtCellInfo">{$LAST_NAME}&nbsp;</td>
+							{/foreach}
 			 	</tr>
-				<tr>
-				<td class="dvtCellLabel" align="right"><span class="style1"><font color='red'>{$APP.LBL_REQUIRED_SYMBOL}</font></span>{$UMOD.LBL_USER_ROLE}</td>
-				<td class="dvtCellInfo">{$ROLEASSIGNED}&nbsp;</td>							      <td class="dvtCellLabel" align="right">{$UMOD.LBL_GROUP_NAME}</td>
-				<td class="dvtCellInfo">{$GROUPASSIGNED}&nbsp;</td>
-			    </tr>
-				<tr>
-				<td class="dvtCellLabel" align="right"><span class="style1"><font color='red'>{$APP.LBL_REQUIRED_SYMBOL}</font></span>{$UMOD.LBL_EMAIL}</td>
-				<td class="dvtCellInfo"><a href="mailto:{$EMAIL1}" target="_blank">{$EMAIL1}</a>&nbsp;</td>
-				<td class="dvtCellLabel" align="right"><span class="style1"><font color='red'>{$APP.LBL_REQUIRED_SYMBOL}</font></span>{$UMOD.LBL_STATUS}</td>
+					{/foreach}
+					</table>
+				 {/foreach}
 
-				<td class="dvtCellInfo">{$STATUS}&nbsp;</td>
-				</tr>
-				<tr><td colspan="4" class="dvtCellInfo" height="30">&nbsp;</td></tr>
-				<tr>
-				<td class="dvtCellLabel" align="right">{$UMOD.LBL_ACTIVITY_VIEW}</td>
-				<td class="dvtCellInfo">{$ACTIVITY_VIEW}&nbsp;</td>
-				<td class="dvtCellLabel" align="right">{$UMOD.LBL_LEAD_VIEW}</td>
-				<td span class="dvtCellInfo">{$LEAD_VIEW}&nbsp;</td>
-				</tr>
-				<tr>
-				<td class="dvtCellLabel" align="right">{$UMOD.LBL_CURRENCY_NAME}</td>
-		                <td span class="dvtCellInfo">{$CURRENCY_NAME}&nbsp;</td>
-				<td class="dvtCellLabel" align="right"></td>
-				<td class="dvtCellInfo">&nbsp;</td>
-				</tr>
-				<tr><td colspan="4" height="30">&nbsp;</td></tr>
-				</table>
-				</td></tr>
-				</table>
-			</div>
-			<div id="mnuTab1" >
-			  	<table class="dvtContentSpace" border="0" cellpadding="0" cellspacing="0" width="100%">
-				<tr><td height="35">&nbsp;</td></tr>
-				<tr><td align="left">
-				<table width="99%"  border="0" cellspacing="0" cellpadding="5" align="center" class="small">
-				<tr>
-				<td colspan="4" class="detailedViewHeader"><b>{$UMOD.LBL_USER_MORE_INFN}</b></td>
-				</tr>  
-				<tr>
-				<td class="dvtCellLabel" align="right">{$UMOD.LBL_TITLE}</td>
-				<td class="dvtCellInfo">{$TITLE}&nbsp;</td>
-				<td class="dvtCellLabel" align="right">{$UMOD.LBL_OFFICE_PHONE}</td>
-         		<td class="dvtCellInfo">{$PHONE_WORK}&nbsp;</td>
-				</tr>
-				<tr>
-				<td class="dvtCellLabel" align="right" width="20%">{$UMOD.LBL_DEPARTMENT}</td>
-				<td class="dvtCellInfo" width="20%">{$DEPARTMENT}&nbsp;</td>
-				<td class="dvtCellLabel" width="20%" align="right">{$UMOD.LBL_MOBILE_PHONE}</td>
-				<td class="dvtCellInfo" width="20%">{$PHONE_MOBILE}&nbsp;</td>
-			    </tr>
-			    <tr>
-				<td class="dvtCellLabel" align="right">{$UMOD.LBL_REPORTS_TO}</td>
-				<td class="dvtCellInfo" width="20%">{$REPORTS_TO_NAME}{$REPORTS_TO_ID}&nbsp;</td>
-				<td class="dvtCellLabel" align="right">{$UMOD.LBL_OTHER_PHONE}</td>
-				<td class="dvtCellInfo">{$PHONE_OTHER}&nbsp;</td>
-				</tr>
-				<tr>
-				<td class="dvtCellLabel" align="right">{$UMOD.LBL_OTHER_EMAIL}</td>
-				<td class="dvtCellInfo">{$EMAIL2}&nbsp;</td>
-				<td class="dvtCellLabel" align="right">{$UMOD.LBL_FAX}</td>
-				<td class="dvtCellInfo">{$PHONE_FAX}&nbsp;</td>
-				</tr>
-				<tr>
-				<td class="dvtCellLabel" align="right">{$UMOD.LBL_YAHOO_ID}</td>
-				<td class="dvtCellInfo">{$YAHOO_ID}&nbsp;</td>
-				<td class="dvtCellLabel" align="right">{$UMOD.LBL_HOME_PHONE}</td>
-				<td class="dvtCellInfo">{$PHONE_HOME}&nbsp;</td>
-				</tr>
-				<tr>
-				<td class="dvtCellLabel" align="right">{$UMOD.LBL_DATE_FORMAT}</td>
-				<td class="dvtCellInfo" width="30%">{$DATE_FORMAT}&nbsp;</td>
-				<td class="dvtCellLabel" align="right">&nbsp;</td>
-				<td class="dvtCellInfo">&nbsp;</td>
-				</tr>
-				<tr>
-				<td class="dvtCellLabel" align="right">{$UMOD.LBL_SIGNATURE}</td>
-				<td class="dvtCellInfo">{$SIGNATURE}&nbsp;</td>
-				<td class="dvtCellLabel" align="right">{$UMOD.LBL_NOTES}</td>
-				<td span class="dvtCellInfo">{$DESCRIPTION}&nbsp;</td>
-				</tr>
-				<tr><td colspan="4" height="30">&nbsp;</td></tr>
-				</table>
-				</td></tr>
-				</table>
-			</div>
-		  	<div id="mnuTab2" >
- 			    <table class="dvtContentSpace" border="0" cellpadding="0" cellspacing="0" width="100%">
-			    <tr><td height="35">&nbsp;</td></tr>
-			    <tr><td align="left">
-				<table width="99%"  border="0" cellspacing="0" cellpadding="5" align="center" class="small">
-				<tr>
-				<td colspan="4" class="detailedViewHeader"><b>{$UMOD.LBL_USER_ADDR_INFN}</b></td>
-				</tr>  
-				<tr>
-				<td class="dvtCellLabel" align="right">{$UMOD.LBL_ADDRESS}</td>
-				<td class="dvtCellInfo">{$ADDRESS_STREET}&nbsp;</td>
-				<td class="dvtCellInfo" >&nbsp;</td>
-				<td class="dvtCellInfo">&nbsp;</td>
-				</tr>
-				<tr>
-				<td class="dvtCellLabel" align="right" width="20%">{$UMOD.LBL_CITY}</td>
-				<td class="dvtCellInfo" width="20%">{$ADDRESS_CITY}&nbsp;</td>
-				<td class="dvtCellInfo" width="20%">&nbsp;</td>
-				<td class="dvtCellInfo" width="20%">&nbsp;</td>
-				</tr>
-				<tr>
-				<td class="dvtCellLabel" align="right">{$UMOD.LBL_STATE}</td>
-				<td class="dvtCellInfo">{$ADDRESS_STATE}&nbsp;</td>
-				<td class="dvtCellInfo">&nbsp;</td>
-				<td class="dvtCellInfo">&nbsp;</td>
-				</tr>
-				<tr>
-				<td class="dvtCellLabel" align="right">{$UMOD.LBL_POSTAL_CODE}</td>
-				<td class="dvtCellInfo">{$ADDRESS_POSTALCODE}&nbsp;</td>
-			    <td class="dvtCellInfo">&nbsp;</td>
-			    <td class="dvtCellInfo">&nbsp;</td>
-				</tr>
-				<tr>
-			    <td class="dvtCellLabel" align="right">{$UMOD.LBL_COUNTRY}</td>
-			    <td class="dvtCellInfo">{$ADDRESS_COUNTRY}&nbsp;</td>
-			    <td class="dvtCellInfo" >&nbsp;</td>
-			    <td class="dvtCellInfo">&nbsp;</td>
-			    </tr>
-			    <tr><td colspan="4" height="30">&nbsp;</td></tr>
-				</table>
-				</td></tr>
-				</table>
-			</div>
 			</td>
 			</tr>
 			

Modified: vtigercrm/trunk/Smarty/templates/UserEditView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/UserEditView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/UserEditView.tpl Tue Jun 13 04:06:27 2006
@@ -115,11 +115,8 @@
 			<td>
 			  <table class="small" border="0" cellpadding="3" cellspacing="0" width="100%">
 			  <tr>
+			     <td id="prof" width="25%" align="center" nowrap="nowrap" class="dvtSelectedCell" onclick="fnVis('prof')" ><b>{$UMOD.LBL_USER_LOGIN_ROLE}</b></td>
 			     <td class="dvtTabCache" width="10" nowrap="nowrap">&nbsp;</td>
-			        <td id="prof" width="25%" align="center" nowrap="nowrap" class="dvtSelectedCell" onclick="fnVis('prof')" ><b>{$UMOD.LBL_USER_LOGIN_ROLE}</b></td>
-				 <td id="more" width="25%" align="center" nowrap="nowrap" class="dvtUnSelectedCell" onclick="fnVis('more')"><b>{$UMOD.LBL_USER_MORE_INFN}</b></td>
-				 <td id="addr" width="25%" align="center" nowrap="nowrap" class="dvtUnSelectedCell" onclick="fnVis('addr')"><b>{$UMOD.LBL_USER_ADDR_INFN}</b></td>
-				<td class="dvtTabCache" nowrap="nowrap" width="10">&nbsp;</td>
 			  </tr>
 			  </table>
 			</td>
@@ -131,194 +128,21 @@
 				        <tr><td height="35">&nbsp;</td></tr>
 					<tr><td align="left">
 					   <table width="99%"  border="0" cellspacing="0" cellpadding="5" align="center" class="small">
-  		                           <tr>
-						{if $MODE eq 'edit'}
-					           <td colspan="4" class="detailedViewHeader"><b>{$APP.LBL_EDIT} {$UMOD.LBL_USER_INFORMATION}</b></td>
-						{else}
-					           <td colspan="4" class="detailedViewHeader"><b>{$UMOD.LBL_NEW_FORM_TITLE}</b></td>
-						{/if}	
-					   </tr>  
-				<tr>
-				    <td class="dvtCellLabel" align="right"><span class="style1"><font color='red'>{$APP.LBL_REQUIRED_SYMBOL}</font></span>{$UMOD.LBL_USER_NAME} </td>
-				    <td class="dvtCellInfo"><input type="text" id="user_name" name="user_name" value='{$USER_NAME}' class="detailedViewTextBox"  onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'"{$USERNAME_READONLY} /></td>
-				     <td class="dvtCellLabel" align="right">{$UMOD.LBL_ADMIN} </td>
-                                     <td class="dvtCellInfo"><input type="checkbox" name="is_admin" {$DISABLED} {$IS_ADMIN}/></td>
-				</tr>
-				{if $MODE neq 'edit'}
-				<tr>
-				    <td class="dvtCellLabel" align="right" width="20%"><span class="style1"><font color='red'>{$APP.LBL_REQUIRED_SYMBOL}</font></span>{$UMOD.LBL_PASSWORD} </td>
-				    <td class="dvtCellInfo" width="20%"><input name="new_password" type="password" class="detailedViewTextBox"  onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'" /></td>
-				    <td class="dvtCellLabel" width="20%" align="right"><span class="style1"><font color='red'>{$APP.LBL_REQUIRED_SYMBOL}</font></span>{$UMOD.LBL_CONFIRM_PASSWORD} </td>
-				    <td class="dvtCellInfo" width="20%"><input name="confirm_new_password" type="password" class="detailedViewTextBox"  onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'" /></td>
-			        </tr>
-				{/if}	
-			        <tr>
-				    <td class="dvtCellLabel" align="right">{$UMOD.LBL_FIRST_NAME} </td>
-				    <td class="dvtCellInfo"><input type="text" name="first_name" value='{$FIRST_NAME}' class="detailedViewTextBox"  onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'" /></td>
-				    <td class="dvtCellLabel" align="right"><span class="style1"><font color='red'>{$APP.LBL_REQUIRED_SYMBOL}</font></span>{$UMOD.LBL_LAST_NAME}</td>
-				    <td class="dvtCellInfo"><input type="text" name="last_name" value='{$LAST_NAME}' class="detailedViewTextBox"  onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'" /></td>
-				 </tr>
-				 <tr>
-				    <td class="dvtCellLabel" align="right"><span class="style1"><font color='red'>{$APP.LBL_REQUIRED_SYMBOL}</font></span>{$UMOD.LBL_USER_ROLE}</td>
-				    <td class="dvtCellInfo"><!-- {$USER_ROLE} -->
-							<input type="text" name="role_name"  id="role_name" value="{$ROLENAME}" class="txtBox" readonly="readonly">&nbsp;
-							{$ROLEPOPUPBUTTON}
-							<input type="hidden" name="user_role" id="user_role" value="{$USERROLE}">
-					</td>
+
+									   {foreach key=header item=data from=$BLOCKS}
+					     <tr>
+											<td colspan=4 class="detailedViewHeader">
+											<b>{$header}</b>
+						</td>
+					     </tr>
+										<!-- Handle the ui types display -->
+										{include file="DisplayFields.tpl"}
+
+									   {/foreach}
 
 
-				   <td class="dvtCellLabel" align="right"><span class="style1"><font color='red'>{$APP.LBL_REQUIRED_SYMBOL}</font></span>{$UMOD.LBL_EMAIL}</td>
-                                    <td class="dvtCellInfo"><input type="text" name="email1" value='{$EMAIL1}' class="detailedViewTextBox"  onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'" /></td>
-			         </tr>
-				 <tr>
-
-				  <td class="dvtCellLabel" align="right"><span class="style1"><font color='red'>{$APP.LBL_REQUIRED_SYMBOL}</font></span>{$UMOD.LBL_STATUS}</td>
-				 {$USER_STATUS_OPTIONS}
-				<td class="dvtCellInfo" colspan="2" >&nbsp;</td>	
-				 </tr>
-				 <tr><td colspan="4" class="dvtCellInfo" height="30">&nbsp;</td></tr>
-				 <tr>
-				    <td class="dvtCellLabel" align="right">{$UMOD.LBL_ACTIVITY_VIEW}</td>
-				    <td class="dvtCellInfo">{$ACTIVITY_VIEW}</td>
-				    <td class="dvtCellLabel" align="right">{$UMOD.LBL_LEAD_VIEW}</td>
-				    <td span class="dvtCellInfo">{$LEAD_VIEW}</td>
-				 </tr>
-				 <tr>
-				   <td class="dvtCellLabel" align="right">{$UMOD.LBL_CURRENCY_NAME}</td>
-                                   <td span class="dvtCellInfo">{$CURRENCY_NAME}</td>
-				   <td class="dvtCellLabel" align="right"></td>
-			 	   <td class="dvtCellInfo">&nbsp;</td>
-				 </tr>
-				 <tr><td colspan="4" height="30">&nbsp;</td></tr>
-				 </table>
-				 </td></tr>
-				 </table>
-				  </div>
-					<div id="mnuTab1">
-					  <table class="dvtContentSpace" border="0" cellpadding="0" cellspacing="0" width="100%">
-					   <tr><td height="35">&nbsp;</td></tr>
-					   <tr><td align="left">
-					   <table width="99%"  border="0" cellspacing="0" cellpadding="5" align="center" class="small">
-					     <tr>
-						{if $MODE eq 'edit'}
-					           <td colspan="4" class="detailedViewHeader"><b>{$APP.LBL_EDIT} {$UMOD.LBL_USER_INFORMATION}</b></td>
-						{else}
-					           <td colspan="4" class="detailedViewHeader"><b>{$UMOD.LBL_NEW_FORM_TITLE}</b></td>
-						{/if}	
-					     </tr>  
-					     <tr>
-						<td class="dvtCellLabel" align="right">{$UMOD.LBL_TITLE}</td>
-						<td class="dvtCellInfo"><input type="text" name="title" value='{$TITLE}' class="detailedViewTextBox"  onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" /></td>
-						<td class="dvtCellLabel" align="right">{$UMOD.LBL_OFFICE_PHONE}</td>
-         					<td class="dvtCellInfo"><input type="text" name="phone_work" value='{$PHONE_WORK}' class="detailedViewTextBox"  onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'" /></td>
-					     </tr>
-					     <tr>
-						<td class="dvtCellLabel" align="right" width="20%">{$UMOD.LBL_DEPARTMENT}</td>
-						<td class="dvtCellInfo" width="20%"><input type="text" name="department" value='{$DEPARTMENT}' class="detailedViewTextBox"  onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'" /></td>
-						<td class="dvtCellLabel" width="20%" align="right">{$UMOD.LBL_MOBILE_PHONE}</td>
-
-						<td class="dvtCellInfo" width="20%"><input type="text" value='{$PHONE_MOBILE}' name="phone_mobile" class="detailedViewTextBox"  onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'" /></td>
-					     </tr>
-					     <tr>
-						<td class="dvtCellLabel" align="right">{$UMOD.LBL_REPORTS_TO}</td>
-						<td class="dvtCellInfo" width="20%"><input readonly name='reports_to_name' class="small" type="text" value='{$REPORTS_TO_NAME}'><input name='reports_to_id' type="hidden" value='{$REPORTS_TO_ID}'>&nbsp;<input title="Change [Alt+C]" accessKey="C" type="button" class="small" value='{$UMOD.LBL_CHANGE}' name=btn1 LANGUAGE=javascript onclick='return window.open("index.php?module=Users&action=Popup&form=UsersEditView&form_submit=false","test","width=640,height=522,resizable=0,scrollbars=0");'></td>
-						<td class="dvtCellLabel" align="right">{$UMOD.LBL_OTHER_PHONE}</td>
-						<td class="dvtCellInfo"><input type="text" name="phone_other" value='{$PHONE_OTHER}' class="detailedViewTextBox"  onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'" /></td>
-					     </tr>
-					     <tr>
-						<td class="dvtCellLabel" align="right">{$UMOD.LBL_OTHER_EMAIL}</td>
-						<td class="dvtCellInfo"><input type="text" name="email2" value='{$EMAIL2}' class="detailedViewTextBox"  onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'" /></td>
-						<td class="dvtCellLabel" align="right">{$UMOD.LBL_FAX}</td>
-						<td class="dvtCellInfo"><input type="text" name="phone_fax" value='{$PHONE_FAX}' class="detailedViewTextBox"  onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'" /></td>
-					     </tr>
-					     <tr>
-						<td class="dvtCellLabel" align="right">{$UMOD.LBL_YAHOO_ID}</td>
-						<td class="dvtCellInfo"><input type="text" name="yahoo_id" value='{$YAHOO_ID}' class="detailedViewTextBox"  onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'" /></td>
-						<td class="dvtCellLabel" align="right">{$UMOD.LBL_HOME_PHONE}</td>
-						<td class="dvtCellInfo"><input type="text" name="phone_home" value='{$PHONE_HOME}' class="detailedViewTextBox"  onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'" /></td>
-					     </tr>
-						
-					     <tr>
-					     <td class="dvtCellLabel" align="right">{$UMOD.LBL_USER_IMAGE}</td
->
-					<td class="dvtCellInfo"><input name="imagename" value="" type="file" class="small"></td>
-					<td class="dvtCellLabel" align="right">{$UMOD.LBL_DATE_FORMAT}</td>
-                    <td class="dvtCellInfo" width="30%">{$DATE_FORMAT}</td>
-				       	</tr>	
-						
-						
-						 <tr><td class="dvtCellLabel" align="right">
-						 {$UMOD.LBL_TAG_CLOUD}
-						 </td>
-						 <td colspan=3 class="dvtCellInfo"><input name='tagcloud' type="text" size='40' maxlength='250' value="{$CLOUD_TAG}" class="detailedViewTextBox"  onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'"></td>
-						 </tr>
-					     <tr>
-					    <td class="dvtCellLabel" align="right">{$UMOD.LBL_SIGNATURE}</td>
-						<td class="dvtCellInfo"><textarea name="signature" rows="3" class="detailedViewTextBox"  onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'" >{$SIGNATURE}</textarea></td>
-						<td class="dvtCellLabel" align="right">{$UMOD.LBL_NOTES}</td>
-						<td span class="dvtCellInfo"><textarea name="description" rows="3" class="detailedViewTextBox"  onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'" >{$DESCRIPTION}</textarea>
-						</td>
-					     </tr>
-					     <tr><td colspan="4" height="30">&nbsp;</td></tr>
-					     </table>
-					     </td></tr>
-					     </table>
-					       </div>
-
-						  <div id="mnuTab2">
- 						     <table class="dvtContentSpace" border="0" cellpadding="0" cellspacing="0" width="100%">
-						       <tr><td height="35">&nbsp;</td></tr>
-						       <tr><td align="left">
-							   <table width="99%"  border="0" cellspacing="0" cellpadding="5" align="center" class="small">
-						       <tr>
-							{if $MODE eq 'edit'}
-					           		<td colspan="4" class="detailedViewHeader"><b>{$APP.LBL_EDIT} {$UMOD.LBL_USER_INFORMATION}</b></td>
-							{else}
-					           		<td colspan="4" class="detailedViewHeader"><b>{$UMOD.LBL_NEW_FORM_TITLE}</b></td>
-							{/if}	
-						       </tr>  
-						       <tr>
-							   <td class="dvtCellLabel" align="right">{$UMOD.LBL_ADDRESS}</td>
-							   <td class="dvtCellInfo"><textarea name="address_street" rows="3" class="detailedViewTextBox"  onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'" >{$ADDRESS_STREET}</textarea></td>
-							   <td class="dvtCellInfo" >&nbsp;</td>
-							   <td class="dvtCellInfo">&nbsp;</td>
-							</tr>
-							<tr>
-							   <td class="dvtCellLabel" align="right" width="20%">{$UMOD.LBL_CITY}</td>
-							   <td class="dvtCellInfo" width="20%"><input type="text" name="address_city" value='{$ADDRESS_CITY}' class="detailedViewTextBox"  onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'" /></td>
-							   <td class="dvtCellInfo" width="20%">&nbsp;</td>
-							   <td class="dvtCellInfo" width="20%">&nbsp;</td>
-							</tr>
-							<tr>
-							   <td class="dvtCellLabel" align="right">{$UMOD.LBL_STATE}</td>
-							   <td class="dvtCellInfo"><input type="text" value='{$ADDRESS_STATE}' name="address_state" class="detailedViewTextBox"  onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'" /></td>
-							   <td class="dvtCellInfo">&nbsp;</td>
-							   <td class="dvtCellInfo">&nbsp;</td>
-							</tr>
-							<tr>
-							   <td class="dvtCellLabel" align="right">{$UMOD.LBL_POSTAL_CODE}</td>
-							   <td class="dvtCellInfo"><input type="text" value='{$ADDRESS_POSTALCODE}' name="address_postalcode" class="detailedViewTextBox"  onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'" /></td>
-
-							    <td class="dvtCellInfo">&nbsp;</td>
-							    <td class="dvtCellInfo">&nbsp;</td>
-							</tr>
-							<tr>
-							    <td class="dvtCellLabel" align="right">{$UMOD.LBL_COUNTRY}</td>
-							    <td class="dvtCellInfo"><input type="text" value='{$ADDRESS_COUNTRY}' name="address_country" class="detailedViewTextBox"  onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'" /></td>
-							    <td class="dvtCellInfo" >&nbsp;</td>
-							    <td class="dvtCellInfo">&nbsp;</td>
-							 </tr>
-							 <tr><td colspan="4" height="30">&nbsp;</td></tr>
-							 </table>
-						 	  </td></tr>
-							 </table>
-						</div>
-						    </td>
-						     </tr>
-
-							        <tr><td>&nbsp;</td></tr>
 							        <tr>
-							            <td><div align="center">
+							            <td colspan=4><div align="center">
 								    <input title="{$APP.LBL_SAVE_BUTTON_TITLE}" accesskey="{$APP.LBL_SAVE_BUTTON_KEY}" class="small"  name="button" value="  {$APP.LBL_SAVE_BUTTON_LABEL}  "  onclick="this.form.action.value='Save'; return verify_data(EditView)" style="width: 70px;" type="button" />
 								    <input title="{$APP.LBL_CANCEL_BUTTON_TITLE}" accesskey="{$APP.LBL_CANCEL_BUTTON_KEY}" class="small" name="button" value="  {$APP.LBL_CANCEL_BUTTON_LABEL}  " onclick="window.history.back()" style="width: 70px;" type="button" />
 								        </div></td>




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 06:31:45 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 10:31:45 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7020 -
	/vtigercrm/trunk/Smarty/templates/GlobalListView.tpl
Message-ID: <20060613103145.44E547E8C55@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 13 04:31:41 2006
New Revision: 7020

Log:
* Modified to display all the module search lists defaultly

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

Modified: vtigercrm/trunk/Smarty/templates/GlobalListView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/GlobalListView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/GlobalListView.tpl Tue Jun 13 04:31:41 2006
@@ -35,7 +35,7 @@
 {elseif $MODULE eq 'Contacts' && $SEARCH_MODULE eq ''}
 	<div id="global_list_{$MODULE}" style="display:block">
 {else}
-	<div id="global_list_{$MODULE}" style="display:none">
+	<div id="global_list_{$MODULE}" style="display:block">
 {/if}
 <table border=0 cellspacing=0 cellpadding=0 width=98% align=center>
      <form name="massdelete" method="POST">




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 06:33:46 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 10:33:46 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7021 -
	/vtigercrm/trunk/modules/Home/UnifiedSearch.php
Message-ID: <20060613103347.1840E7E8A6C@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 13 04:33:42 2006
New Revision: 7021

Log:
* Modified to get the mod_strings for all modules and display all module entries as default view

Modified:
    vtigercrm/trunk/modules/Home/UnifiedSearch.php

Modified: vtigercrm/trunk/modules/Home/UnifiedSearch.php
==============================================================================
--- vtigercrm/trunk/modules/Home/UnifiedSearch.php (original)
+++ vtigercrm/trunk/modules/Home/UnifiedSearch.php Tue Jun 13 04:33:42 2006
@@ -82,6 +82,9 @@
 
 		$smarty = new vtigerCRM_Smarty;
 
+		require_once("modules/$module/language/en_us.lang.php");
+		global $mod_strings;
+
 		$smarty->assign("MOD", $mod_strings);
 		$smarty->assign("APP", $app_strings);
 		$smarty->assign("IMAGE_PATH",$image_path);
@@ -91,11 +94,11 @@
 
 	
 		$listquery = getListQuery($module);
-		//Avoided the modules Faq and PriceBooks. we should remove this if when change the vtiger_customview function
+		//Avoided the modules Faq and PriceBooks. we should remove this if when change the customview function
 		$oCustomView = '';
 		if($module != 'Faq' && $module != 'PriceBooks')
 		{
-			//Added to get the default 'All' vtiger_customview query
+			//Added to get the default 'All' customview query
 			$oCustomView = new CustomView($module);
 			$viewid = $oCustomView->getViewId($module);
 
@@ -154,7 +157,7 @@
 	//Added to display the Total record count
 ?>
 	<script>
-		document.getElementById("global_search_total_count").innerHTML = "Total Number of Records : <b><?php echo $total_record_count; ?></b>";
+		document.getElementById("global_search_total_count").innerHTML = "Total Records found : <b><?php echo $total_record_count; ?></b>";
 	</script>
 <?php
 
@@ -163,17 +166,17 @@
 	echo "<br><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<em>".$mod_strings['ERR_ONE_CHAR']."</em>";
 }
 
-/**	Function to get the where condition for a module based on the vtiger_field vtiger_table entries
+/**	Function to get the where condition for a module based on the field table entries
   *	@param  string $listquery  -- ListView query for the module 
   *	@param  string $module     -- module name
   *	@param  string $search_val -- entered search string value
-  *	@return string $where      -- where condition for the module based on vtiger_field vtiger_table entries
+  *	@return string $where      -- where condition for the module based on field table entries
   */
 function getUnifiedWhere($listquery,$module,$search_val)
 {
 	global $adb;
 
-	$query = "SELECT * FROM vtiger_field WHERE vtiger_tabid = ".getTabid($module);
+	$query = "SELECT * FROM vtiger_field WHERE tabid = ".getTabid($module);
 	$result = $adb->query($query);
 	$noofrows = $adb->num_rows($result);
 
@@ -183,7 +186,7 @@
 		$columnname = $adb->query_result($result,$i,'columnname');
 		$tablename = $adb->query_result($result,$i,'tablename');
 
-		//Before form the where condition, check whether the vtiger_table for the vtiger_field has been added in the listview query
+		//Before form the where condition, check whether the table for the field has been added in the listview query
 		if(strstr($listquery,$tablename))
 		{
 			if($where != '')
@@ -267,7 +270,7 @@
 							$selected = '';
 							if($search_module != '' && $module == $search_module)
 								$selected = 'selected';
-							if($search_module == '' && $module == 'Contacts')
+							if($search_module == '' && $module == 'All')
 								$selected = 'selected';
 							?>
 							<option value="<?php echo $module; ?>" <?php echo $selected; ?> ><?php echo $module; ?></option>




From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 13 06:34:22 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 13 Jun 2006 10:34:22 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23963=3A_?=
 =?utf-8?q?Global_Search_-_In_potentials_column_title_is_empty?=
In-Reply-To: <076.a81342c95e46c46e8e51dc5866a915a2@vtiger.fosslabs.com>
References: <076.a81342c95e46c46e8e51dc5866a915a2@vtiger.fosslabs.com>
Message-ID: <085.5cb18df0bd483170fe8d6100dad57548@vtiger.fosslabs.com>

#963: Global Search - In potentials column title is empty
------------------------+---------------------------------------------------
  Reporter:  mickie     |       Owner:  mickie
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mickie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 This issue is fixed.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/963>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 13 06:35:45 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 13 Jun 2006 10:35:45 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23964=3A_?=
 =?utf-8?q?global_search_-_some_column_headers_are_empty?=
In-Reply-To: <076.66a0fea7b92031ee50f58920bde82d69@vtiger.fosslabs.com>
References: <076.66a0fea7b92031ee50f58920bde82d69@vtiger.fosslabs.com>
Message-ID: <085.2b8e4068acdfcbc76acb4be36b0142c6@vtiger.fosslabs.com>

#964: global search - some column headers are empty
------------------------+---------------------------------------------------
  Reporter:  mickie     |       Owner:  mickie
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mickie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 This issue is fixed.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/964>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 13 06:36:05 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 13 Jun 2006 10:36:05 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231271=3A?=
 =?utf-8?q?_Organisation_wont_save_when_containt_=27?=
In-Reply-To: <076.62b916cddc422a4f2f6a8828de68207a@vtiger.fosslabs.com>
References: <076.62b916cddc422a4f2f6a8828de68207a@vtiger.fosslabs.com>
Message-ID: <085.09e0ef4403cce39556229b5fda5d861d@vtiger.fosslabs.com>

#1271: Organisation wont save when containt '
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  allanbush          
      Type:  defect     |      Status:  reopened           
  Priority:  major      |   Milestone:  5.0.0              
 Component:  vtigercrm  |     Version:  5.0.0              
Resolution:             |    Keywords:  organisation, quote
------------------------+---------------------------------------------------
Changes (by abos):

  * resolution:  fixed =>
  * keywords:  => organisation, quote
  * status:  closed => reopened

Comment:

 Hi, very sorry to reopen this ticket, but $adb->quote("string") remove the
 quotes.

 If my address is "Jeanne d'Arc", i obtain "Jeanne DArc".
 It's better, but not perfect.
 A function addq(), which is analogous to addslashes(). Seem to exist in
 adodb, but i can't use with vtiger 5.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1271>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 06:48:56 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 10:48:56 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7022 - in
 /vtigercrm/trunk/include: ComboStrings.php PopulateComboValues.php
Message-ID: <20060613104856.74B797E8C59@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 13 04:48:52 2006
New Revision: 7022

Log:
picklist values are moved to databases for Users

Modified:
    vtigercrm/trunk/include/ComboStrings.php
    vtigercrm/trunk/include/PopulateComboValues.php

Modified: vtigercrm/trunk/include/ComboStrings.php
==============================================================================
--- vtigercrm/trunk/include/ComboStrings.php (original)
+++ vtigercrm/trunk/include/ComboStrings.php Tue Jun 13 04:48:52 2006
@@ -292,11 +292,26 @@
 			      'Average'=>'Average',
                               'Poor'=>'Poor'
 			      ),			      
-
-			    
+'status_dom' => Array('Active'=>'Active',
+			      'Inactive'=>'Inactive'
+			      ),
+'activity_view_dom' => Array('Today'=>'Today',
+			      'This Week'=>'This Week',
+			      'This Month'=>'This Month',
+			      'This Year'=>'This Year'
+		      ),
+'lead_view_dom' => Array('Today'=>'Today',
+			      'Last 2 Days'=>'Last 2 Days',
+                              'Last Week'=>'Last Week'
+		      ),
+'date_format_dom' => Array('dd-mm-yyyy'=>'dd-mm-yyyy',
+			      'mm-dd-yyyy'=>'mm-dd-yyyy',
+                              'yyyy-mm-dd'=>'yyyy-mm-dd'
+			      ),		      
 		
 );
 
+
 ?>
 
 

Modified: vtigercrm/trunk/include/PopulateComboValues.php
==============================================================================
--- vtigercrm/trunk/include/PopulateComboValues.php (original)
+++ vtigercrm/trunk/include/PopulateComboValues.php Tue Jun 13 04:48:52 2006
@@ -60,7 +60,7 @@
 				
 		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');
+		$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','status','activity_view','lead_view','date_format');
 
 		foreach ($comboTables as $comTab)
 		{




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 06:49:44 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 10:49:44 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7023 -
 /vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
Message-ID: <20060613104945.12CAF7E8A6C@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 13 04:49:34 2006
New Revision: 7023

Log:
picklist values are moved to databases for Users and the fields are added in field table

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

Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original)
+++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Tue Jun 13 04:49:34 2006
@@ -67,6 +67,7 @@
  $this->db->query("INSERT INTO vtiger_tab VALUES (26,'Campaigns',0,23,'Campaigns',null,null,1)");
  $this->db->query("INSERT INTO vtiger_tab VALUES (27,'Portal',0,24,'Portal',null,null,1)");
  $this->db->query("INSERT INTO vtiger_tab VALUES (28,'Webmails',0,25,'Webmails',null,null,1)");
+ $this->db->query("insert into vtiger_tab values (29,'Users',0,26,'Users',null,null,1)");
 
 // Populate the vtiger_blocks vtiger_table
 $this->db->query("insert into vtiger_blocks values (1,2,'LBL_OPPORTUNITY_INFORMATION',1,0,0,0,0,0)");
@@ -147,6 +148,9 @@
 $this->db->query("insert into vtiger_blocks values (76,26,'LBL_CAMPAIGN_INFORMATION',1,0,0,0,0,0)");
 $this->db->query("insert into vtiger_blocks values (77,26,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
 $this->db->query("insert into vtiger_blocks values (78,26,'LBL_DESCRIPTION_INFORMATION',3,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (79,29,'LBL_USERLOGIN_ROLE',1,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (80,29,'LBL_MORE_INFORMATION',2,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (81,29,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)");
 
 //
 
@@ -837,6 +841,41 @@
 
 
 //Invoice Details -- END
+ //users Details Starts Block 79,80,81
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'user_name','vtiger_users',1,'106','user_name','User Name',1,0,0,11,1,79,1,'V~M',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'is_admin','vtiger_users',1,'156','is_admin','Admin',1,0,0,3,2,79,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'user_password','vtiger_users',1,'99','user_password','Password',1,0,0,30,3,79,4,'P~M',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'confirm_password','vtiger_users',1,'99','confirm_password','Confirm Password',1,0,0,30,4,79,4,'P~M',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'first_name','vtiger_users',1,'1','first_name','First Name',1,0,0,30,5,79,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'last_name','vtiger_users',1,'2','last_name','Last Name',1,0,0,30,6,79,1,'V~M',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'roleid','vtiger_user2role',1,'98','roleid','Role',1,0,0,200,7,79,1,'V~M',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'email1','vtiger_users',1,'104','email','Email',1,0,0,100,9,79,1,'E~M',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'status','vtiger_users',1,'115','status','Status',1,0,0,100,10,79,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'activity_view','vtiger_users',1,'15','activity_view','Default Activity View',1,0,0,100,13,79,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'lead_view','vtiger_users',1,'15','lead_view','Default Lead View',1,0,0,100,12,79,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'currency_id','vtiger_users',1,'116','currency_id','Currency',1,0,0,100,11,79,1,'I~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'title','vtiger_users',1,'1','title','Title',1,0,0,50,1,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'phone_work','vtiger_users',1,'1','phone_work','Office Phone',1,0,0,50,2,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'department','vtiger_users',1,'1','department','Department',1,0,0,50,3,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'phone_mobile','vtiger_users',1,'1','phone_mobile','Mobile',1,0,0,50,4,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'reports_to_id','vtiger_users',1,'101','reports_to_id','Reports To',1,0,0,50,5,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'phone_other','vtiger_users',1,'1','phone_other','Other Phone',1,0,0,50,5,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'email2','vtiger_users',1,'13','email2','Other Email',1,0,0,100,6,80,1,'E~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'phone_fax','vtiger_users',1,'1','phone_fax','Fax',1,0,0,50,7,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'yahoo_id','vtiger_users',1,'13','yahoo_id','Yahoo id',1,0,0,100,7,80,1,'E~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'phone_home','vtiger_users',1,'1','phone_home','Home Phone',1,0,0,50,8,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'imagename','vtiger_users',1,'105','imagename','User Image',1,0,0,250,9,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'date_format','vtiger_users',1,'15','date_format','Date Format',1,0,0,30,10,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'tagcloud','vtiger_users',1,'103','tagcloud','Tag Cloud',1,0,0,250,13,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'signature','vtiger_users',1,'21','signature','Signature',1,0,0,250,11,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'description','vtiger_users',1,'21','description','Notes',1,0,0,250,12,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'address_street','vtiger_users',1,'21','address_street','Street Address',1,0,0,250,1,81,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'address_city','vtiger_users',1,'1','address_city','City',1,0,0,100,2,81,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'address_state','vtiger_users',1,'1','address_state','State',1,0,0,100,3,81,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'address_postalcode','vtiger_users',1,'1','address_postalcode','Postal Code',1,0,0,100,4,81,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'address_country','vtiger_users',1,'1','address_country','Country',1,0,0,100,5,81,1,'V~O',1,null,'BAS')");
+
+ //user Details End
 
 
 




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 06:51:26 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 10:51:26 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7024 -
	/vtigercrm/trunk/schema/DatabaseSchema.xml
Message-ID: <20060613105127.35A277E8C5A@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 13 04:51:23 2006
New Revision: 7024

Log:
picklist values are moved to databases for Users modules

Modified:
    vtigercrm/trunk/schema/DatabaseSchema.xml

Modified: vtigercrm/trunk/schema/DatabaseSchema.xml
==============================================================================
--- vtigercrm/trunk/schema/DatabaseSchema.xml (original)
+++ vtigercrm/trunk/schema/DatabaseSchema.xml Tue Jun 13 04:51:23 2006
@@ -81,6 +81,7 @@
 			<default value="0" />
 		</field>
 		<field name="defhomeview" type="C" size="100" />
+		<field name="confirm_password" type="C" size="30" />
 
 		<index name="user_user_name_idx">
 			<col>user_name</col>
@@ -5112,5 +5113,97 @@
 
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
-
+	<table name="vtiger_status">
+		<field name="statusid" type="I" size="19">
+			<key />
+			<autoincrement />
+		</field>
+		<field name="status" type="C" size="200">
+			<notnull />
+		</field>
+		<field name="sortorderid" type="I" size="19">
+			<notnull />
+			<default value="0" />
+		</field>
+		<field name="presence" type="I" size="1">
+			<notnull />
+			<default value="1" />
+		</field>
+
+		<index name="vtiger_status_status_idx">
+			<col>source</col>
+			<unique />
+		</index>
+		<opt platform="mysql">Type=InnoDB</opt>
+	</table>
+	<table name="vtiger_activity_view">
+		<field name="activity_viewid" type="I" size="19">
+			<key />
+			<autoincrement />
+		</field>
+		<field name="activity_view" type="C" size="200">
+			<notnull />
+		</field>
+		<field name="sortorderid" type="I" size="19">
+			<notnull />
+			<default value="0" />
+		</field>
+		<field name="presence" type="I" size="1">
+			<notnull />
+			<default value="1" />
+		</field>
+
+		<index name="vtiger_activity_view_status_idx">
+			<col>source</col>
+			<unique />
+		</index>
+		<opt platform="mysql">Type=InnoDB</opt>
+	</table>
+	<table name="vtiger_lead_view">
+		<field name="lead_viewid" type="I" size="19">
+			<key />
+			<autoincrement />
+		</field>
+		<field name="lead_view" type="C" size="200">
+			<notnull />
+		</field>
+		<field name="sortorderid" type="I" size="19">
+			<notnull />
+			<default value="0" />
+		</field>
+		<field name="presence" type="I" size="1">
+			<notnull />
+			<default value="1" />
+		</field>
+
+		<index name="vtiger_lead_viewstatus_idx">
+			<col>source</col>
+			<unique />
+		</index>
+		<opt platform="mysql">Type=InnoDB</opt>
+	</table>
+	<table name="vtiger_date_format">
+		<field name="date_formatid" type="I" size="19">
+			<key />
+			<autoincrement />
+		</field>
+		<field name="date_format" type="C" size="200">
+			<notnull />
+		</field>
+		<field name="sortorderid" type="I" size="19">
+			<notnull />
+			<default value="0" />
+		</field>
+		<field name="presence" type="I" size="1">
+			<notnull />
+			<default value="1" />
+		</field>
+
+		<index name="vtiger_date_format_status_idx">
+			<col>source</col>
+			<unique />
+		</index>
+		<opt platform="mysql">Type=InnoDB</opt>
+	</table>
+	
 </schema>




From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 13 06:51:43 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 13 Jun 2006 10:51:43 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231205=3A?=
 =?utf-8?q?_DashBoard_-_Purchase_Order_by_Status_gives_improper_results?=
In-Reply-To: <076.9e81b8c641a00ed7ecd42317cc381367@vtiger.fosslabs.com>
References: <076.9e81b8c641a00ed7ecd42317cc381367@vtiger.fosslabs.com>
Message-ID: <085.233e493e0480074cf89e00cc09d483fe@vtiger.fosslabs.com>

#1205: DashBoard - Purchase Order by Status gives improper results
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  philip
      Type:  defect     |      Status:  closed
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by saraj):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 (In [7025]) Status value Canceled changed to Cancelled. Fixes #1205

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1205>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 06:51:44 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 10:51:44 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7025 -
	/vtigercrm/trunk/include/ComboStrings.php
Message-ID: <20060613105144.6B9937E8C60@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 13 04:51:39 2006
New Revision: 7025

Log:
Status value Canceled changed to Cancelled. Fixes #1205

Modified:
    vtigercrm/trunk/include/ComboStrings.php

Modified: vtigercrm/trunk/include/ComboStrings.php
==============================================================================
--- vtigercrm/trunk/include/ComboStrings.php (original)
+++ vtigercrm/trunk/include/ComboStrings.php Tue Jun 13 04:51:39 2006
@@ -257,14 +257,14 @@
 'postatus_dom' => Array('Created'=>'Created',
 			'Approved'=>'Approved',
 			'Delivered'=>'Delivered',
-			'Canceled'=>'Canceled',
+			'Cancelled'=>'Cancelled',
 			'Received Shipment'=>'Received Shipment'
 			),
 
 'sostatus_dom' => Array('Created'=>'Created',
 			'Approved'=>'Approved',
 			'Delivered'=>'Delivered',
-			'Canceled'=>'Canceled'
+			'Cancelled'=>'Cancelled'
 			),
 
 'campaignstatus_dom' => Array(''=>'',




From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 13 06:52:54 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 13 Jun 2006 10:52:54 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231206=3A?=
 =?utf-8?q?_DashBoard_-_Quotes_by_Accounts_Search_gives_all_list_view_reco?=
 =?utf-8?q?rds?=
In-Reply-To: <076.2d93dc91ebb8c9d712cebc7da12b81a8@vtiger.fosslabs.com>
References: <076.2d93dc91ebb8c9d712cebc7da12b81a8@vtiger.fosslabs.com>
Message-ID: <085.3d298d4f4a1dd708b6c6a1f754871685@vtiger.fosslabs.com>

#1206: DashBoard - Quotes by Accounts Search gives all list view records
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  philip
      Type:  defect     |      Status:  closed
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by anonymous):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1206>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 07:05:17 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 11:05:17 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7026 -
	/vtigercrm/trunk/googlemap.php
Message-ID: <20060613110517.DCB017E8C62@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 13 05:05:11 2006
New Revision: 7026

Log:
googlemap.php has been deleted

Removed:
    vtigercrm/trunk/googlemap.php




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 07:09:00 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 11:09:00 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7027 - in
 /vtigercrm/trunk/Smarty/templates: Buttons_List.tpl Buttons_List1.tpl
Message-ID: <20060613110900.7BB007E8C62@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 13 05:08:53 2006
New Revision: 7027

Log:
googlemap code removed

Modified:
    vtigercrm/trunk/Smarty/templates/Buttons_List.tpl
    vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl

Modified: vtigercrm/trunk/Smarty/templates/Buttons_List.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Buttons_List.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Buttons_List.tpl Tue Jun 13 05:08:53 2006
@@ -118,16 +118,6 @@
 				</tr>
 				</table>
 		</td>			
-		{if $MODULE eq 'Contacts' || $MODULE eq 'Leads' || $MODULE eq 'Accounts'}
-                        <td class="small">
-                                <!-- Google Map -->
-                                        <table border=0 cellspacing=0 cellpadding=5>
-                                                <tr>
-                                                        <td style="padding-left:10px;"><a href="#" onclick='window.open("index.php?module={$MODULE}&action=googlemap","test","width=600,height=400,resizable=1,scrollbars=1");'><img src="{$IMAGE_PATH}btnL3AllMenu.gif" alt="GoogleMap" title="GoogleMap" border="0"></a></td>
-                                                </tr>
-                                        </table>
-                        </td>
-                {/if}
 		</tr>
 		</table>
 	</td>

Modified: vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl Tue Jun 13 05:08:53 2006
@@ -114,16 +114,6 @@
 				</tr>
 				</table>
 		</td>			
-		{if $MODULE eq 'Contacts' || $MODULE eq 'Leads' || $MODULE eq 'Accounts'}
-                        <td class="small">
-                                <!-- Google Map -->
-                                        <table border=0 cellspacing=0 cellpadding=5>
-                                                <tr>
-                                                        <td style="padding-left:10px;"><a href="#" onclick='window.open("index.php?module={$MODULE}&action=googlemap&record={$ID}","test","width=600,height=400,resizable=1,scrollbars=1");'><img src="{$IMAGE_PATH}btnL3AllMenu.gif" alt="GoogleMap" title="GoogleMap" border="0"></a></td>
-                                                </tr>
-                                        </table>
-                        </td>
-                {/if}
 		</tr>
 		</table>
 	</td>




From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 13 07:14:46 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 13 Jun 2006 11:14:46 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231208=3A?=
 =?utf-8?q?_DashBoard_-_Search_non_function_for_Invoice_by_Accounts?=
In-Reply-To: <076.ef725bada1eb2853037e604a524e0d12@vtiger.fosslabs.com>
References: <076.ef725bada1eb2853037e604a524e0d12@vtiger.fosslabs.com>
Message-ID: <085.8b5c159bf464f8d34f52088286b1a858@vtiger.fosslabs.com>

#1208: DashBoard - Search non function for Invoice by Accounts
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  philip
      Type:  defect     |      Status:  closed
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by saraj):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 (In [7028]) Invoice query modified to get accountname. Fixes #1208

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1208>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 07:14:46 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 11:14:46 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7028 -
	/vtigercrm/trunk/include/utils/ListViewUtils.php
Message-ID: <20060613111446.060FA7E8C68@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 13 05:14:23 2006
New Revision: 7028

Log:
Invoice query modified to get accountname. Fixes #1208

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 Jun 13 05:14:23 2006
@@ -1933,6 +1933,7 @@
 			vtiger_invoicebillads.*,
 			vtiger_invoiceshipads.*,
 			vtiger_salesorder.subject AS salessubject
+			vtiger_account.accountname
 			FROM vtiger_invoice
 			INNER JOIN vtiger_crmentity
 				ON vtiger_crmentity.crmid = vtiger_invoice.invoiceid
@@ -1942,6 +1943,8 @@
 				ON vtiger_invoice.invoiceid = vtiger_invoiceshipads.invoiceshipaddressid
 			LEFT OUTER JOIN vtiger_salesorder
 				ON vtiger_salesorder.salesorderid = vtiger_invoice.salesorderid
+			LEFT OUTER JOIN vtiger_account
+			        ON vtiger_account.accountid = vtiger_invoice.accountid
 			INNER JOIN vtiger_invoicecf
 				ON vtiger_invoice.invoiceid = vtiger_invoicecf.invoiceid
 			LEFT JOIN vtiger_invoicegrouprelation




From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 13 07:15:08 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 13 Jun 2006 11:15:08 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231250=3A?=
 =?utf-8?q?_Beta__Demo=3A_Sales_=3E_Leads_=3E_Detail_View_fatal_error?=
In-Reply-To: <076.78fe8716a71e90b18b5ac94f0c53cd10@vtiger.fosslabs.com>
References: <076.78fe8716a71e90b18b5ac94f0c53cd10@vtiger.fosslabs.com>
Message-ID: <085.70eb778b21ca63d7f4875ae23458a699@vtiger.fosslabs.com>

#1250: Beta  Demo: Sales > Leads > Detail View fatal error
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       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:

 Unable to reproduce

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1250>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 13 07:31:28 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 13 Jun 2006 11:31:28 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231299=3A?=
 =?utf-8?q?_MySQL_version_5=2E0=2E22_is_not_supported=2C_kindly_connect_to?=
 =?utf-8?q?_MySQL_4=2E1=2Ex_or_above?=
Message-ID: <076.bb406000b4b59efeb8cc8221dd00f6f4@vtiger.fosslabs.com>

#1299: MySQL version 5.0.22 is not supported, kindly connect to MySQL 4.1.x or
above
-----------------------+----------------------------------------------------
 Reporter:  fh         |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  major      |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:  Bug        |  
-----------------------+----------------------------------------------------
 Hello, I tried to install vtiger on the latest version of MySQL(5.0.22) on
 the third step of the installation i get an error message that i need 4.1
 or above! how can i fix that?

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1299>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 13 07:31:46 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 13 Jun 2006 11:31:46 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231299=3A?=
 =?utf-8?q?_MySQL_version_5=2E0=2E22_is_not_supported=2C_kindly_connect_to?=
 =?utf-8?q?_MySQL_4=2E1=2Ex_or_above?=
In-Reply-To: <076.bb406000b4b59efeb8cc8221dd00f6f4@vtiger.fosslabs.com>
References: <076.bb406000b4b59efeb8cc8221dd00f6f4@vtiger.fosslabs.com>
Message-ID: <085.8918426f9ccead6448e05bb98db4dbb7@vtiger.fosslabs.com>

#1299: MySQL version 5.0.22 is not supported, kindly connect to MySQL 4.1.x or
above
------------------------+---------------------------------------------------
  Reporter:  fh         |       Owner:  developer
      Type:  defect     |      Status:  new      
  Priority:  major      |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:             |    Keywords:  Bug      
------------------------+---------------------------------------------------
-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1299>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 07:32:36 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 11:32:36 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7029 -
	/vtigercrm/trunk/Smarty/templates/Header.tpl
Message-ID: <20060613113237.16F257E8C6D@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 13 05:32:32 2006
New Revision: 7029

Log:
added an anchor tag in Header file - 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 Tue Jun 13 05:32:32 2006
@@ -19,6 +19,7 @@
 	<style type="text/css">@import url("themes/{$THEME}/style.css");</style>
 </head>
 	<body leftmargin=0 topmargin=0 marginheight=0 marginwidth=0 class=small onLoad="Announcement_rss()">
+	<a name="top">
 	<!-- header -->
 	<!-- header-vtiger crm name & RSS -->
 	<script language="JavaScript" type="text/javascript" src="include/js/general.js"></script>




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 07:46:21 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 11:46:21 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7030 -
	/vtigercrm/trunk/modules/Users/User.php
Message-ID: <20060613114621.135867E8A6C@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 13 05:46:14 2006
New Revision: 7030

Log:
Updated the List Header & Entries function for New UI of UserListView - 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 Jun 13 05:46:14 2006
@@ -470,62 +470,64 @@
 											 "CITY","STATE","POSTALCODE","COUNTRY");	
   	return $mergeflds;
   }
-		//function added for the listview of vtiger_users for 5.0 beta
-	function getUserListViewHeader()
-	{
-		global $mod_strings;
-		$header_array=array($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_ADMIN'],$mod_strings['LBL_STATUS'],$mod_strings['LBL_LIST_TOOLS']);
-		return $header_array;
-	}
-
-	function getUserListViewEntries($navigation_array,$sorder='',$orderby='')
-	{
-		global $theme;
-		global $adb, $current_user;	
-	    	$theme_path="themes/".$theme."/";
-	    	$image_path=$theme_path."images/";
-		if($sorder != '' && $orderby !='')
-			$list_query = ' SELECT * from vtiger_users where deleted=0 order by '.$orderby.' '.$sorder; 	
-		else
-			$list_query = "SELECT * from vtiger_users where deleted=0 order by ".$this->default_order_by." ".$this->default_sort_order;
-		$result =$adb->query($list_query);
-		$entries_list = array();
-		$roleinfo = getAllRoleDetails();
-		
-		for($i = $navigation_array['start'];$i <= $navigation_array['end_val']; $i++)
-		{
-			$entries=array();
-			$id=$adb->query_result($result,$i-1,'id');
-			
-			$entries[]='<a href="index.php?action=DetailView&module=Users&parenttab=Settings&record='.$id.'">'.$this->db->query_result($result,$i-1,'user_name').'</a>';
-
-                        $rolecode= fetchUserRole($adb->query_result($result,$i-1,'id'));
-                        $entries[]='<a href="index.php?action=RoleDetailView&module=Users&parenttab=Settings&roleid='.$rolecode.'">'.$roleinfo[$rolecode][0];
-
-			$entries[]='<a href="mailto:'.$adb->query_result($result,$i-1,'email1').'">'.$adb->query_result($result,$i-1,'email1').' </a>';
-
-			$entries[]='<a href="index.php?action=DetailView&module=Users&parenttab=Settings&record='.$id.'">'. $this->db->query_result($result,$i-1,'last_name').' '.$adb->query_result($result,$i-1,'first_name').'</a>';
-
-			$entries[]=$adb->query_result($result,$i-1,'is_admin');
-			$entries[]=$adb->query_result($result,$i-1,'status');
-			if($adb->query_result($result,$i-1,'user_name') == 'admin' || $adb->query_result($result,$i-1,'user_name') == 'standarduser' )
-			{
-			      $entries[]='<a href="index.php?action=EditView&return_action=ListView&return_module=Users&module=Users&parenttab=Settings&record='.$id.'"><img src="'.$image_path.'editfield.gif" border="0" alt="Edit" title="Edit"/></a>&nbsp;&nbsp;';
-	                }
-			elseif($adb->query_result($result,$i-1,'id') == $current_user->id)
-                        {
-                              $entries[]='<a href="index.php?action=EditView&return_action=ListView&return_module=Users&module=Users&parenttab=Settings&record='.$id.'"><img src="'.$image_path.'editfield.gif" border="0" alt="Edit" title="Edit"/></a>&nbsp;&nbsp;';
-	                }
-		        else
-			  
-	    	              $entries[]='<a href="index.php?action=EditView&return_action=ListView&return_module=Users&module=Users&parenttab=Settings&record='.$id.'"><img src="'.$image_path.'editfield.gif" border="0" alt="Edit" title="Edit"/></a>&nbsp;&nbsp;<img src="'.$image_path.'delete.gif" onclick="deleteUser('.$id.')" border="0"  alt="Delete" title="Delete"/></a>';
-
-			$entries_list[]=$entries;
-													
-		}
-		return $entries_list;
-	}
-	function fill_in_additional_list_fields()
+
+//function added for the listview of vtiger_users for 5.0 beta
+  function getUserListViewHeader()
+  {
+	  global $mod_strings;
+	  $header_array=array($mod_strings['LBL_LIST_NO'],$mod_strings['LBL_LIST_TOOLS'],$mod_strings['LBL_LIST_USER_NAME_ROLE'],$mod_strings['LBL_LIST_EMAIL'],$mod_strings['LBL_LIST_PHONE'],$mod_strings['LBL_ADMIN'],$mod_strings['LBL_STATUS']);
+	  return $header_array;
+  }
+
+  function getUserListViewEntries($navigation_array,$sorder='',$orderby='')
+  {
+	  global $theme;
+	  global $adb, $current_user;
+	  $theme_path="themes/".$theme."/";
+	  $image_path=$theme_path."images/";
+	  if($sorder != '' && $orderby !='')
+	  $list_query = ' SELECT * from users where deleted=0 order by '.$orderby.' '.$sorder;
+	  else
+	  $list_query = "SELECT * from users where deleted=0 order by ".$this->default_order_by." ".$this->default_sort_order;
+	  $result =$adb->query($list_query);
+	  $entries_list = array();
+	  $roleinfo = getAllRoleDetails();
+
+	  for($i = $navigation_array['start'];$i <= $navigation_array['end_val']; $i++)
+	  {
+		  $entries=array();
+		  $id=$adb->query_result($result,$i-1,'id');
+
+		  $entries[]='<a href="index.php?action=DetailView&module=Users&parenttab=Settings&record='.$id.'">'.$this->db->query_result($result,$i-1,'user_name').'</a>';
+
+		  $rolecode= fetchUserRole($adb->query_result($result,$i-1,'id'));
+		  $entries[]='<a href="index.php?action=RoleDetailView&module=Users&parenttab=Settings&roleid='.$rolecode.'">'.$roleinfo[$rolecode][0];
+		  $entries[]='<a href="mailto:'.$adb->query_result($result,$i-1,'email1').'">'.$adb->query_result($result,$i-1,'email1').' </a>';
+
+		  $entries[]='<a href="index.php?action=DetailView&module=Users&parenttab=Settings&record='.$id.'">'. $this->db->query_result($result,$i-1,'last_name').' '.$adb->query_result($result,$i-1,'first_name').'</a>';
+
+		  $entries[]=$adb->query_result($result,$i-1,'is_admin');
+		  $entries[]=$adb->query_result($result,$i-1,'status');
+		  $entries[]=$adb->query_result($result,$i-1,'phone_work');
+		  if($adb->query_result($result,$i-1,'user_name') == 'admin' || $adb->query_result($result,$i-1,'user_name') == 'standarduser' )
+		  {
+			  $entries[]='<a href="index.php?action=EditView&return_action=ListView&return_module=Users&module=Users&parenttab=Settings&record='.$id.'"><img src="'.$image_path.'editfield.gif" border="0" alt="Edit" title="Edit"/></a>&nbsp;&nbsp;';
+			  }
+			  elseif($adb->query_result($result,$i-1,'id') == $current_user->id)
+			  {
+				  $entries[]='<a href="index.php?action=EditView&return_action=ListView&return_module=Users&module=Users&parenttab=Settings&record='.$id.'"><img src="'.$image_path.'editfield.gif" border="0" alt="Edit" title="Edit"/></a>&nbsp;&nbsp;';
+			  }
+			  else
+
+			  $entries[]='<a href="index.php?action=EditView&return_action=ListView&return_module=Users&module=Users&parenttab=Settings&record='.$id.'"><img src="'.$image_path.'editfield.gif" border="0" alt="Edit" title="Edit"/></a>&nbsp;&nbsp;<img src="'.$image_path.'delete.gif" onclick="deleteUser('.$id.')" border="0"  alt="Delete" title="Delete"/></a>';
+
+			  $entries_list[]=$entries;
+
+			  }
+			  return $entries_list;
+  }
+
+	  function fill_in_additional_list_fields()
 	{
 		$this->fill_in_additional_detail_fields();	
 	}




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 07:53:38 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 11:53:38 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7031 - in
 /vtigercrm/trunk/modules: Settings/language/en_us.lang.php
 Users/language/en_us.lang.php
Message-ID: <20060613115338.E8E437E8C6D@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 13 05:53:32 2006
New Revision: 7031

Log:
update language file

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

Modified: vtigercrm/trunk/modules/Settings/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Settings/language/en_us.lang.php Tue Jun 13 05:53:32 2006
@@ -62,7 +62,7 @@
 
 'LBL_EMAIL_ADDRESS'=>'Email',
 
-'LBL_TRANSCURR'=>'Transfer User vtiger_currency to',
+'LBL_TRANSCURR'=>'Transfer User currency to',
 
 'LBL_CURRDEL'=>'Currency to be Deleted',
 
@@ -273,7 +273,7 @@
 'LBL_TOOL'=>'Tool',
 
 
-//Added vtiger_fields for Title Informations -- after 4 Beta
+//Added fields for Title Informations -- after 4 Beta
 
 'LBL_EMAIL_CONFIG'=>'Outgoing Mail Server Configuration',
 
@@ -291,7 +291,7 @@
 
 
 
-//Added vtiger_fields after RC1 - Release
+//Added fields after RC1 - Release
 
 'LBL_MAIL_SERVER_INFO'=>'Mail Server Information',
 
@@ -333,17 +333,21 @@
 
 'LBL_USERS'=>'Users',
 
+'LBL_USERS_LIST'=>'Users List',
+
 'LBL_CREATE_AND_MANAGE_USERS'=>'- Create and Manage Users (e.g., admin)',
 
 'LBL_ROLES'=>'Roles',
 
-'LBL_CREATE_AND_MANAGE_USER_ROLES'=>'- Create and Manage user vtiger_roles (e.g., Administrator, Standard User, etc.)',
+'LBL_CREATE_AND_MANAGE_USER_ROLES'=>'- Create and Manage user roles (e.g., Administrator, Standard User, etc.)',
 
 'LBL_PROFILES'=>'Profiles',
 
-'LBL_CREATE_AND_MANAGE_USER_PROFILES'=>'- Create and Manage user vtiger_profiles (e.g., CEO, Sales Manager, etc.)',
-
-'LBL_CREATE_AND_MANAGE_USER_GROUPS'=>'- Create and Manage user vtiger_groups',
+'LBL_PROFILES_LIST'=>'Profiles List',
+
+'LBL_CREATE_AND_MANAGE_USER_PROFILES'=>'- Create and Manage user profiles (e.g., CEO, Sales Manager, etc.)',
+
+'LBL_CREATE_AND_MANAGE_USER_GROUPS'=>'- Create and Manage user groups',
 
 'LBL_SHARING_ACCESS'=>'Sharing Access',
 
@@ -357,8 +361,8 @@
 
 'LBL_FIELD_ACCESSIBILITY'=>'Field Accessibility',
 
-'LBL_SETTING_FIELD_ACCESSIBILITY'=>' - Setting Field Accessibility for each vtiger_profiles',
-//<<<<<<<<for edit ordering vtiger_blocks>>>>>>
+'LBL_SETTING_FIELD_ACCESSIBILITY'=>' - Setting Field Accessibility for each profiles',
+//<<<<<<<<for edit ordering blocks>>>>>>
 'LBL_FIELD_ORDERING_DESC'=>' - Edit Field Order',
 
 'LBL_FIELD_ORDERING'=>'Edit Field Blocks',
@@ -393,7 +397,7 @@
 
 'LBL_CUSTOM_FIELD_SETTINGS'=>'Custom Field Settings',
 
-'LBL_CREATE_AND_MANAGE_USER_DEFINED_FIELDS'=>'Create and Manage user defined vtiger_fields...',
+'LBL_CREATE_AND_MANAGE_USER_DEFINED_FIELDS'=>'Create and Manage user defined fields...',
 
 'LBL_SELECT_MODULE'=>'Select Module',
 
@@ -403,7 +407,7 @@
 
 'LBL_PICKLIST_SETTINGS'=>'Picklist Settings',
 
-'LBL_EDIT_PICKLIST_VALUES'=>' - Edit values of Picklist vtiger_fields',
+'LBL_EDIT_PICKLIST_VALUES'=>' - Edit values of Picklist fields',
 
 'LBL_EDIT'=>'Editing',
 
@@ -433,7 +437,7 @@
 
 
 
-//Field Types for custom vtiger_fields
+//Field Types for custom fields
 
 'LBL_URL'=>'URL',
 
@@ -487,10 +491,10 @@
 'LBL_LIST_PASSWORD'=>'Password',
 'LBL_MAIL_SERVER_NAME'=>'Mail Server Name or IP',
 'LBL_MAIL_SERVER_SETTINGS'=>'Mail Server Settings',
-'LBL_TEST_SETTINGS'=>'Test my vtiger_account setting immediately',
-'LBL_TEST_BUTTON_TITLE'=>'Test my vtiger_account now! [Alt+T]',
+'LBL_TEST_SETTINGS'=>'Test my account setting immediately',
+'LBL_TEST_BUTTON_TITLE'=>'Test my account now! [Alt+T]',
 'LBL_TEST_BUTTON_KEY'=>'T',
-'LBL_TEST_BUTTON_LABEL'=>'Test my vtiger_account now!',
+'LBL_TEST_BUTTON_LABEL'=>'Test my account now!',
 'LBL_DEFAULT'=>'Default',
 'LBL_IMAP2'=>'IMAP2',
 'LBL_IMAP4'=>'IMAP4',
@@ -559,6 +563,7 @@
 'LBL_INVENTORY_TERMSANDCONDITIONS'=>' - Edit Inventory Terms & Conditions',//newly added
 
 'LBL_OTHER_SETTINGS'=>'Other Settings',
+'LBL_SCROLL'=>'Scroll to Top',
 
 'LBL_INV_NOT_DESC'=>'The following is the list of notifications that are sent to the product handler regarding the demand and the current quantity in hand during the creation of a Quote, SalesOrder and Invoice.',
 
@@ -573,8 +578,8 @@
 
 //For Custom Fields
 'LBL_LEAD_MAP_CUSTOM_FIELD'=>'Mapping Lead Custom Fields',
-'leadCustomFieldDescription'=>'Map each of your organizations lead custom vtiger_fields to each of your custom vtiger_account
-,contact, or vtiger_potential vtiger_fields. These mappings will be used when you convert leads',
+'leadCustomFieldDescription'=>'Map each of your organizations lead custom fields to each of your custom account
+,contact, or potential fields. These mappings will be used when you convert leads',
 'LBL_MAPPING_INFO'=>'Mapping Information',
 'LBL_ACCOUNT_FIELD'=>'Account Custom Field',
 'LBL_CONTACT_FIELD'=>'Contact Custom Field',
@@ -584,10 +589,10 @@
 'LBL_LEAD_FIELD'=>'Lead Custom Field',
 //After 4.2 GA
 'LBL_TEXT_AREA'=>'Text Area',
-//for Edit ordering the vtiger_blocks
+//for Edit ordering the blocks
 'NOTESCUSTOMFIELDS'=>'Notes Custom Fields',
 
-//Added vtiger_fields after 4.2 ptach 2
+//Added fields after 4.2 ptach 2
 'LBL_ASSIGN_MODULE_OWNERS'=>'Assign Module Owners',
 'LBL_MODULE_OWNERS'=>'Module Owners',
 'LBL_ASSIGN_MODULE_OWNERS_INFO'=>' - Assign Owners for each modules',
@@ -601,12 +606,12 @@
 'LBL_USER_DESCRIPTION'=>'Manage Users list who access CRM',
 'LBL_ROLE_DESCRIPTION'=>'Define hierarchy of Roles and assign to Users',
 'LBL_PROFILE_DESCRIPTION'=>'Define Profiles to provide access rights to each Role',
-'LBL_GROUP_DESCRIPTION'=>'Define Groups based on vtiger_roles, vtiger_users, vtiger_profiles etc',
+'LBL_GROUP_DESCRIPTION'=>'Define Groups based on roles, users, profiles etc',
 'LBL_SHARING_ACCESS_DESCRIPTION'=>'Define privileges for each Role to access CRM modules',
-'LBL_SHARING_FIELDS_DESCRIPTION'=>'Show or hide vtiger_fields in each CRM Module',
+'LBL_SHARING_FIELDS_DESCRIPTION'=>'Show or hide fields in each CRM Module',
 'LBL_MODULE_OWNERS_DESCRIPTION'=>'Assign Owners for each CRM module',
 'LBL_ANNOUNCEMENT_DESCRIPTION'=>'Edit the contents of Announcements display',
-'LBL_CUSTOM_FIELDS_DESCRIPTION'=>'Create and Manage user-defined vtiger_fields',
+'LBL_CUSTOM_FIELDS_DESCRIPTION'=>'Create and Manage user-defined fields',
 'LBL_PICKLIST_DESCRIPTION'=>'Manage contents of Picklists in all CRM Modules',
 'LBL_EMAIL_TEMPLATE_DESCRIPTION'=>'Manage templates for E-Mail module',
 'LBL_MAIL_MERGE_DESCRIPTION'=>'Manage templates for Mail Merging',
@@ -621,11 +626,14 @@
 
 
 
-//Added vtiger_fields after 5.0 Alpha
+//Added fields after 5.0 Alpha
 'LBL_REQUIRE_SMTP_AUTHENTICATION'=>'Require SMTP Authentication?',
 'LBL_ANNOUNCEMENT'=>'Announcements',
 'LBL_SETTING_ANNOUNCEMENT'=>'Announcement',
-'LBL_ANNOUNCEMENT_INFO'=>'Type the vtiger_announcement text below, and click the save button.',
+'LBL_ANNOUNCE_TEXT'=>'Announcement Text',
+'LBL_UPDATE_BUTTON'=>'Update',
+'LBL_ANNOUNCEMENT_INFO'=>'Type the announcement text below, and click the Update button.',
+'LBL_ANNOUNCEMENT_DESC'=>'Change the text that appears in the announcement display on top of each page',
 'LBL_EMAIL_CONTENTS'=>'Email Contents',
 'LBL_SUBJECT'=>'Subject',
 'LBL_MESSAGE'=>'Message',

Modified: vtigercrm/trunk/modules/Users/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Users/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Users/language/en_us.lang.php Tue Jun 13 05:53:32 2006
@@ -31,11 +31,18 @@
 'LBL_LIST_LAST_NAME'=>'Last Name',
 'LBL_LIST_USER_NAME'=>'UserName',
 'LBL_LIST_DEPARTMENT'=>'Department',
-'LBL_LIST_EMAIL'=>'Email',
+'LBL_LIST_EMAIL'=>'E-Mail',
 'LBL_LIST_PRIMARY_PHONE'=>'Primary Phone',
 'LBL_LIST_ADMIN'=>'Admin',
 'LBL_LIST_PASSWORD'=>'Password',
 'LBL_LIST_CONFIRM_PASSWORD'=>'Confirm Password',
+'LBL_LIST_USER_NAME_ROLE'=>'User ID , Name & Role',
+'LBL_LIST_SELECT'=>'Select',
+'LBL_LIST_PHONE'=>'Phone',
+'LBL_LIST_NO'=>'#',
+
+'LBL_ADMINS'=>'Admins',
+'LBL_STD_USERS'=>'Standard Users',
 
 'UserName'=>'UserName',
 'Role'=>'Role',
@@ -123,7 +130,7 @@
 'ERR_LAST_ADMIN_1'=>'The user name ',
 'ERR_LAST_ADMIN_2'=>' is the last Admin user.  At least one user must be an Admin user.<br>Check the Admin user setting.',
 
-'ERR_DELETE_RECORD'=>"A record number must be specified to delete the vtiger_account.",
+'ERR_DELETE_RECORD'=>"A record number must be specified to delete the account.",
 
 // Additional Fields for i18n --- Release vtigerCRM 3.2 Patch 2
 // Users--listroles.php , createrole.php , ListPermissions.php , editpermissions.php
@@ -186,7 +193,7 @@
 'LBL_COLON'=>':',
 'LBL_EMAIL_TEMPLATE'=>'Email Template',
 'LBL_NEW_TEMPLATE'=>'New Template',
-'LBL_USE_MERGE_FIELDS_TO_EMAIL_CONTENT'=>'Use merge vtiger_fields to personalize your email content.',
+'LBL_USE_MERGE_FIELDS_TO_EMAIL_CONTENT'=>'Use merge fields to personalize your email content.',
 'LBL_AVAILABLE_MERGE_FIELDS'=>'Available Merge Fields',
 'LBL_SELECT_FIELD_TYPE'=>'Select Field Type :',
 'LBL_SELECT_FIELD'=>'Select Field :',
@@ -194,7 +201,7 @@
 'LBL_ACCOUNT_FIELDS'=>'Account Fields',
 'LBL_CONTACT_FIELDS'=>'Contact Fields',
 'LBL_LEAD_FIELDS'=>'Lead Fields',
-'LBL_COPY_AND_PASTE_MERGE_FIELD'=>'Copy and paste the merge vtiger_field value into your template below.',
+'LBL_COPY_AND_PASTE_MERGE_FIELD'=>'Copy and paste the merge field value into your template below.',
 'LBL_EMAIL_TEMPLATE_INFORMATION'=>'Communication Templates > Email Templates > Viewing',
 'LBL_FOLDER'=>'Folder',
 'LBL_PERSONAL'=>'Personal',
@@ -207,9 +214,10 @@
 'LBL_TEMPLATE_PRIVATE'=>'Private Access',
 'LBL_TEMPLATE_SUBJECT'=>'Email Subject',
 'LBL_TEMPLATE_MESSAGE'=>'Email Message',
-
-
-// Added vtiger_fields in createnewgroup.php
+'LBL_VIEWING'=>'Viewing',
+
+
+// Added fields in createnewgroup.php
 'LBL_CREATE_NEW_GROUP'=>'Create New Group',
 'LBL_NEW_GROUP'=>'New Group',
 'LBL_EDIT_GROUP'=>'Edit Group',
@@ -220,7 +228,7 @@
 'LBL_MEMBER_SELECTED'=>'Selected Member',
 'LBL_DESCRIPTION'=>'Description',
 
-// Added vtiger_fields in detailViewmailtemplate.html,listgroupmembers.php,listgroups.php
+// Added fields in detailViewmailtemplate.html,listgroupmembers.php,listgroups.php
 'LBL_DETAIL_VIEW_OF_EMAIL_TEMPLATE'=>'Detail View of Email Template',
 'LBL_DETAIL_VIEW'=>'Detail View of',
 'LBL_EDIT_VIEW'=>'Edit View of',
@@ -230,7 +238,7 @@
 'LBL_WORD_TEMPLATES'=>'Mail Merge Templates',
 'LBL_NEW_WORD_TEMPLATE'=>'New Template',
 
-// Added vtiger_fields in TabCustomise.php,html and UpdateTab.php,html
+// Added fields in TabCustomise.php,html and UpdateTab.php,html
 'LBL_CUSTOMISE_TABS'=>'Customize Tabs',
 'LBL_CHOOSE_TABS'=>'Choose Tabs',
 'LBL_AVAILABLE_TABS'=>'Available Tabs',
@@ -243,10 +251,10 @@
 'LBL_CHANGE_HOMEPAGE_LABEL'=>'Homepage Order',
 'LBL_CHANGE_HOMEPAGE_TITLE'=>'Homepage',
 
-// Added vtiger_fields in binaryfilelist.php
+// Added fields in binaryfilelist.php
 'LBL_OERATION'=>'Operation',
 
-// Added vtiger_fields in CreateProfile.php
+// Added fields in CreateProfile.php
 'LBL_PROFILE_NAME'=>'Create New Profile:',
 'LBL_NEW_PROFILE'=>'New Profile',
 'LBL_NEW_PROFILE_NAME'=>'Profile Name',
@@ -263,7 +271,7 @@
 'LBL_STANDARD_PRIVILEGES'=>'Standard Privileges',
 'LBL_UTILITY_PRIVILEGES'=>'Utility Privileges',
 'LBL_UTILITIES'=>'Utilities',
-'LBL_BASE_PROFILE_MESG'=>'I would like to setup a base vtiger_profile and edit privileges <b>(Recommended)</b>',
+'LBL_BASE_PROFILE_MESG'=>'I would like to setup a base profile and edit privileges <b>(Recommended)</b>',
 'LBL_BASE_PROFILE'=>'Base Profile:',
 'LBL_OR'=>'OR',
 'LBL_BASE_PROFILE_MESG_ADV'=>'I will choose the privileges from scratch <b>(Advanced Users)</b>',
@@ -275,19 +283,21 @@
 'LBL_MESG_VIEW'=>'to view all information / modules of vtiger CRM',
 'LBL_MESG_EDIT'=>'to edit all information / modules of vtiger CRM',
 'LBL_STD_MESG_OPTION'=>'Select the standard actions to be permitted',
-'LBL_TAB_MESG_OPTION'=>'Select the vtiger_tabs/modules to be permitted',
+'LBL_TAB_MESG_OPTION'=>'Select the tabs / modules to be shown',
 'LBL_UTILITY_MESG_OPTION'=>'Select the utility actions to be permitted',
-'LBL_FIELD_MESG_OPTION'=>'Select the vtiger_fields to be permitted',
+'LBL_FIELD_MESG_OPTION'=>'Select the fields to be permitted',
 'LBL_FINISH_BUTTON'=>'Finish',
 'LBL_PROFILE_DETAIL_VIEW'=>'Detail View of Profile',
-
-
-//Added vtiger_fields in createrole.php
+'LBL_PROFILE_MESG'=>'Viewing access privileges for',
+'LBL_PROFILE_M'=>'Profile',
+
+
+//Added fields in createrole.php
 'LBL_HDR_ROLE_NAME'=>'Create New Role:',
 'LBL_TITLE_ROLE_NAME'=>'New Role',
 'LBL_ROLE_NAME'=>'Role Name',
 'LBL_ROLE_PROFILE_NAME'=>'Associate With Profile',
-'LBL_SPECIFY_ROLE_NAME'=>'Specify a name for new vtiger_role :',
+'LBL_SPECIFY_ROLE_NAME'=>'Specify a name for new role :',
 'LBL_ASSIGN_PROFILE'=>'Assign Profile(s)',
 'LBL_PROFILE_SELECT_TEXT'=>'Select the Profiles below and click on assign button',
 'LBL_PROFILES_AVLBL'=>'Profiles Available',
@@ -297,7 +307,7 @@
 'LBL_ASSOCIATED_USERS'=>'Associated Users :',
 
 
-//Added vtiger_fields in OrgSharingDetailsView.php
+//Added fields in OrgSharingDetailsView.php
 'LBL_ORG_SHARING_PRIVILEGES'=>'Organisation Sharing  Privileges',
 'LBL_EDIT_PERMISSIONS'=>'Edit Permissions',
 'LBL_SAVE_PERMISSIONS'=>'Save Permissions',
@@ -306,7 +316,7 @@
 'LBL_READ_CREATE_EDIT_DEL'=>'Public: Read, Create/Edit, Delete',
 'LBL_PRIVATE'=>'Private',
 
-//Added vtiger_fields in listnotificationschedulers.php
+//Added fields in listnotificationschedulers.php
 'LBL_HDR_EMAIL_SCHDS'=>'Users : Email Notifications',
 'LBL_EMAIL_SCHDS_DESC'=>'The following is the list of notifications that are activated automatically when the corresponding event has happened.',
 'LBL_ACTIVE'=>'Active',
@@ -327,13 +337,13 @@
 'LBL_BUTTON_UPDATE'=>'Update',
 'LBL_MODULENAMES'=>'Module',
 
-//Added vtiger_fields in ListFieldPermissions.html
+//Added fields in ListFieldPermissions.html
 'LBL_FIELD_PERMISSION_FIELD_NAME'=>'Field Name',
 'LBL_FIELD_PERMISSION_VISIBLE'=>'Visible',
 'LBL_FIELD_PERMISSIOM_TABLE_HEADER'=>'Standard Fields',
 'LBL_FIELD_LEVEL_ACCESS'=>'Field Level Access',
 
-//Added vtiger_fields after 4.0.1
+//Added fields after 4.0.1
 'LBL_SIGNATURE'=>'Signature',
 
 //Added for Event Reminder 4.2 Alpha release
@@ -352,9 +362,9 @@
 'Show Details'=>'Show Details',
 'Show Details and Add Events'=>'Show Details and Add Events',
 
-'LBL_USR_CANNOT_ACCESS'=>'Users cannot access other vtiger_users ',
+'LBL_USR_CANNOT_ACCESS'=>'Users cannot access other users ',
 'LBL_USR_CAN_ACCESS'=>'Users can ',
-'LBL_USR_OTHERS'=>' other vtiger_users ',
+'LBL_USR_OTHERS'=>' other users ',
 
 'Read Only '=>'Read Only ',
 'Read, Create/Edit, Delete '=>'Read, Create/Edit, Delete ',
@@ -432,7 +442,7 @@
 
 //given for calendar color for an user user
 'LBL_COLOR'=>'Color in Calendar',
-//added for vtiger_activity view in home page
+//added for activity view in home page
 'LBL_ACTIVITY_VIEW'=>'Default Activity View',
 //Added to change Home page order
 'LBL_HOMEPAGE_ORDER_UPDATE'=>'Update Home Page Block Order',
@@ -452,7 +462,7 @@
 'MNL'=>'My New Leads',
 'LBL_LEAD_VIEW'=>'Default Lead View',
 'LBL_TAG_CLOUD'=>'Tag Cloud',
-'LBL_LIST_TOOLS'=>'Operations',
+'LBL_LIST_TOOLS'=>'Tools',
 'LBL_STATISTICS'=>'Statistics',
 'LBL_TOTAL'=>'Total :',
 'LBL_OTHERS'=>'Others :',
@@ -486,7 +496,7 @@
 'LBL_CREATE_RULE_MESG'=>'to create a new Rule',
 'LBL_SELECT_SCREEN'=>'Select the Screen / Module :',
 'LBL_FIELDS_AVLBL'=>'Fields Available in',
-'LBL_FIELDS_SELECT_DESELECT'=>'Select or De-Select vtiger_fields to be shown',
+'LBL_FIELDS_SELECT_DESELECT'=>'Select or De-Select fields to be shown',
 'LBL_ROLE_TO_BE_DELETED'=>'Role to be Deleted',
 'LBL_TRANSFER_USER_ROLE'=>'Transfer Users to Role',
 'LBL_DELETE_ROLE'=>'Delete Role'




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 07:58:18 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 11:58:18 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7032 -
	/vtigercrm/trunk/themes/blue/style.css
Message-ID: <20060613115818.023EF7E8A6C@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 13 05:58:15 2006
New Revision: 7032

Log:
style css updated

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 Tue Jun 13 05:58:15 2006
@@ -1570,7 +1570,7 @@
 }
 
 .prvPrfTexture {
-	background:url(../images/prvPrfTexture1.gif);
+	background:url(images/prvPrfTexture1.gif);
 
 }
 .prvPrfBgOn{
@@ -1589,19 +1589,19 @@
 }
 
 .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 {
@@ -2659,7 +2659,7 @@
 	background-color:#ffffff;
 	border-bottom:2px solid #aaaaaa;
 }
-.ColHeader{
+.colHeader{
 	background-color:#dadada;
 	border-left:1px solid #eaeaea;
 	border-top:1px solid #eaeaea;
@@ -2770,17 +2770,17 @@
 }
 
 .prvPrfSelectedTab {
-	background:url(../images/prvPrfSelectedTab.gif) repeat-x;
+	background:url(images/prvPrfSelectedTab.gif) repeat-x;
 
 }
 
 .prvPrfUnSelectedTab {
-	background:url(../images/prvPrfUnSelectedTab.gif) repeat-x;
+	background:url(images/prvPrfUnSelectedTab.gif) repeat-x;
 
 }
 
 .prvPrfTexture {
-	background:url(../images/prvPrfTexture1.gif);
+	background:url(images/prvPrfTexture1.gif);
 
 }
 .prvPrfBgOn{
@@ -2799,19 +2799,19 @@
 }
 
 .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 {




From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 13 07:59:31 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 13 Jun 2006 11:59:31 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231292=3A?=
	=?utf-8?q?_This_is_Spam?=
In-Reply-To: <076.3be71aaa1fa450bc94bdfa03d862bd31@vtiger.fosslabs.com>
References: <076.3be71aaa1fa450bc94bdfa03d862bd31@vtiger.fosslabs.com>
Message-ID: <085.c0961149b3cc1e1a329e883b17768ba7@vtiger.fosslabs.com>

#1292: This is Spam
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  developer                          
      Type:  defect     |      Status:  new                                
  Priority:  major      |   Milestone:                                     
 Component:  vtigercrm  |     Version:  5.0.0                              
Resolution:             |    Keywords:  Viagra,Ambien,Diazepam,Levitra,Soma
------------------------+---------------------------------------------------
Changes (by anonymous):

  * summary:  Buy Viagra => This is Spam

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1292>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 13 08:05:48 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 13 Jun 2006 12:05:48 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231202=3A?=
 =?utf-8?q?_DashBoard_-_Improper_Search_Result_for_=22Sales_Order_by_Accou?=
 =?utf-8?q?nts=22?=
In-Reply-To: <076.8281dc6ab2dd859b8af8651259da94b9@vtiger.fosslabs.com>
References: <076.8281dc6ab2dd859b8af8651259da94b9@vtiger.fosslabs.com>
Message-ID: <085.39b612acbdda9b1093f446f0aaf9a907@vtiger.fosslabs.com>

#1202: DashBoard - Improper Search Result for "Sales Order by Accounts"
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  philip
      Type:  defect     |      Status:  closed
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by anonymous):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1202>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 08:08:05 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 12:08:05 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7033 - in
 /vtigercrm/trunk/Smarty/templates: UserListView.tpl
 UserListViewContents.tpl
Message-ID: <20060613120805.D72457E8C6B@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 13 06:08:00 2006
New Revision: 7033

Log:
updated the user list view tpl file - ahmed

Modified:
    vtigercrm/trunk/Smarty/templates/UserListView.tpl
    vtigercrm/trunk/Smarty/templates/UserListViewContents.tpl

Modified: vtigercrm/trunk/Smarty/templates/UserListView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/UserListView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/UserListView.tpl Tue Jun 13 06:08:00 2006
@@ -1,120 +1,126 @@
-{*<!--
-/*********************************************************************************
-  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
-   * ("License"); You may not use this file except in compliance with the License
-   * The Original Code is:  vtiger CRM Open Source
-   * The Initial Developer of the Original Code is vtiger.
-   * Portions created by vtiger are Copyright (C) vtiger.
-   * All Rights Reserved.
-  *
- ********************************************************************************/
--->*}
-<script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
-<style type="text/css">@import url(themes/blue/style.css);</style>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-<tr>
-	{include file='SettingsMenu.tpl'}
-<td width="75%" valign="top" class="showPanelBg">
-		<form action="index.php" method="post" name="EditView" id="form">
-		<input type='hidden' name='module' value='Users'>
-<input type='hidden' name='action' value='EditView'>
-<input type='hidden' name='return_action' value='ListView'>
-<input type='hidden' name='return_module' value='Users'>
-<input type='hidden' name='parenttab' value='Settings'>
-		<table width="100%" border="0" cellpadding="0" cellspacing="0" class="small">
-			<tr>
-					<td colspan="2" style="padding:5px;">
-							<span class="lvtHeaderText">
-							<b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS} </a>
-									 > {$MOD.LBL_USER_MANAGEMENT} > {$MOD.LBL_USERS}</b></span>
-									<hr noshade="noshade" size="1" />
-					</td>
-			  </tr>
-			  <tr>
-					<td style="padding:5px;"> 
-							<table border="0" cellpadding="0" cellspacing="0" width="100%">
-								<tr>
-									<td colspan="2" align="left"><img src="{$IMAGE_PATH}user.gif" align="absmiddle">&nbsp;<span class="genHeaderGray">{$MOD.LBL_USER_MANAGEMENT}</span></td>
-									<td align="right" style="padding:5px; ">
-											<input title="{$CMOD.LBL_NEW_USER_BUTTON_TITLE}" accessyKey="{$CMOD.LBL_NEW_USER_BUTTON_KEY}" class='classBtn' type='submit' name='button' value="{$CMOD.LBL_NEW_USER_BUTTON_LABEL}" >
-								 	 </td>
-								</tr>
-								<tr><td colspan="3" style="border-bottom:1px dashed #CCCCCC;">&nbsp;</td></tr>
-							</table>
-					</td>
-					<td>&nbsp;</td>
-			</tr>
-			<tr><td colspan=2>
-					<div id="ListViewContents">
-						{include file="UserListViewContents.tpl"}
-					</div>
-					
-			</td>
-			</tr>
-		</table>
-	</form>
-</td>
-</tr>
-</table>
-
-</td>
-</tr>
-</table>
-<div id="tempdiv" style="display:block;position:absolute;left:350px;top:200px;"></div>
-{literal}
-<script>
-function getListViewEntries_js(module,url)
-{
-	$("status").style.display="inline";
-        new Ajax.Request(
-		'index.php',
-                {queue: {position: 'end', scope: 'command'},
-                        method: 'post',
-                        postBody: 'module=Users&action=UsersAjax&file=ListView&ajax=true&'+url,
-                        onComplete: function(response) {
-                                $("status").style.display="none";
-				$("ListViewContents").innerHTML= response.responseText;
-                        }
-                }
-        );
-}
-
-function deleteUser(userid)
-{
-	$("status").style.display="inline";
-        new Ajax.Request(
-                'index.php',
-                {queue: {position: 'end', scope: 'command'},
-                        method: 'post',
-                        postBody: 'action=UsersAjax&file=UserDeleteStep1&return_action=ListView&return_module=Users&module=Users&parenttab=Settings&record='+userid,
-                        onComplete: function(response) {
-                                $("status").style.display="none";
-				$("tempdiv").innerHTML= response.responseText;
-                        }
-                }
-        );
-}
-
-function transferUser(del_userid)
-{
-	$("status").style.display="inline";
-	$("DeleteLay").style.display="none";
-	var trans_userid=$('transfer_user_id').options[$('transfer_user_id').options.selectedIndex].value;
-        new Ajax.Request(
-                'index.php',
-                {queue: {position: 'end', scope: 'command'},
-                        method: 'post',
-                        postBody: 'module=Users&action=UsersAjax&file=DeleteUser&ajax=true&delete_user_id='+del_userid+'&transfer_user_id='+trans_userid,
-                        onComplete: function(response) {
-                                $("status").style.display="none";
-                                $("ListViewContents").innerHTML= response.responseText;
-                        }
-                }
-        );
-
-}
-</script>
-{/literal}
-
-	{include file='SettingsSubMenu.tpl'}
-
+{*<!--
+/*********************************************************************************
+  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
+   * ("License"); You may not use this file except in compliance with the License
+   * The Original Code is:  vtiger CRM Open Source
+   * The Initial Developer of the Original Code is vtiger.
+   * Portions created by vtiger are Copyright (C) vtiger.
+   * All Rights Reserved.
+  *
+ ********************************************************************************/
+-->*}
+
+<script language="JAVASCRIPT" type="text/javascript" src="include/js/smoothscroll.js"></script>
+
+<br>
+<table align="center" border="0" cellpadding="0" cellspacing="0" width="98%">
+<tbody><tr>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
+        <td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
+<form action="index.php" method="post" name="EditView" id="form">
+<input type='hidden' name='module' value='Users'>
+<input type='hidden' name='action' value='EditView'>
+<input type='hidden' name='return_action' value='ListView'>
+<input type='hidden' name='return_module' value='Users'>
+<input type='hidden' name='parenttab' value='Settings'>
+
+        <br>
+
+	<div align=center>
+			{include file='SetMenu.tpl'}
+				<!-- DISPLAY -->
+				<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
+				<tr>
+					<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}ico-users.gif" alt="{$MOD.LBL_USERS}" width="48" height="48" border=0 title="{$MOD.LBL_USERS}"></td>
+					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > {$MOD.LBL_USERS}</b></td>
+				</tr>
+				<tr>
+					<td valign=top class="small">{$MOD.LBL_USER_DESCRIPTION}</td>
+				</tr>
+				</table>
+				
+				<br>
+				<table border=0 cellspacing=0 cellpadding=10 width=100% >
+				<tr>
+				<td>
+					<div id="ListViewContents">
+						{include file="UserListViewContents.tpl"}
+					</div>	
+				</td>
+				</tr>
+				</table>
+			
+			
+			
+			</td>
+			</tr>
+			</table>
+		</td>
+	</tr>
+	</table>
+		
+	</div>
+
+</td>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
+   </tr>
+</tbody>
+</form>
+</table>
+
+<div id="tempdiv" style="display:block;position:absolute;left:350px;top:200px;"></div>
+{literal}
+<script>
+function getListViewEntries_js(module,url)
+{
+        $("status").style.display="inline";
+        new Ajax.Request(
+                'index.php',
+                {queue: {position: 'end', scope: 'command'},
+                        method: 'post',
+                        postBody: 'module=Users&action=UsersAjax&file=ListView&ajax=true&'+url,
+                        onComplete: function(response) {
+                                $("status").style.display="none";
+                                $("ListViewContents").innerHTML= response.responseText;
+                        }
+                }
+        );
+}
+
+function deleteUser(userid)
+{
+        $("status").style.display="inline";
+        new Ajax.Request(
+                'index.php',
+                {queue: {position: 'end', scope: 'command'},
+                        method: 'post',
+                        postBody: 'action=UsersAjax&file=UserDeleteStep1&return_action=ListView&return_module=Users&module=Users&parenttab=Settings&record='+userid,
+                        onComplete: function(response) {
+                                $("status").style.display="none";
+                                $("tempdiv").innerHTML= response.responseText;
+                        }
+                }
+        );
+}
+function transferUser(del_userid)
+{
+        $("status").style.display="inline";
+        $("DeleteLay").style.display="none";
+        var trans_userid=$('transfer_user_id').options[$('transfer_user_id').options.selectedIndex].value;
+        new Ajax.Request(
+                'index.php',
+                {queue: {position: 'end', scope: 'command'},
+                        method: 'post',
+                        postBody: 'module=Users&action=UsersAjax&file=DeleteUser&ajax=true&delete_user_id='+del_userid+'&transfer_user_id='+trans_userid,
+                        onComplete: function(response) {
+                                $("status").style.display="none";
+                                $("ListViewContents").innerHTML= response.responseText;
+                        }
+                }
+        );
+
+}
+</script>
+{/literal}
+
+

Modified: vtigercrm/trunk/Smarty/templates/UserListViewContents.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/UserListViewContents.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/UserListViewContents.tpl Tue Jun 13 06:08:00 2006
@@ -1,59 +1,41 @@
-{*<!--
-/*********************************************************************************
-  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
-   * ("License"); You may not use this file except in compliance with the License
-   * The Original Code is:  vtiger CRM Open Source
-   * The Initial Developer of the Original Code is vtiger.
-   * Portions created by vtiger are Copyright (C) vtiger.
-   * All Rights Reserved.
-  *
- ********************************************************************************/
--->*}
-<!-- BEGIN: main -->
-<table width="100%" border=0>
-					<tr>
-					<td width="75%" style="border-right:1px dashed #CCCCCC;padding:5px;">
-							<table width="100%" border="0">
-								<tr>
-									<td align="left" style="padding:5px;">{$RECORD_COUNTS}</td>
-									{$NAVIGATION}
-								</tr>
-							</table>
-							<table width="100%" border="0" cellpadding="5" cellspacing="1" class="small" style="background-color: rgb(204, 204, 204);">
-                          <tbody>
-                          	<tr>
-							{foreach item=header from=$LIST_HEADER}
-                              <td class="lvtCol">{$header}</td>
-							{/foreach}	
-                            </tr>
-							{section name=entries loop=$LIST_ENTRIES}
-             <tr  class="lvtColData" onmouseover="this.className='lvtColDataHover'" onmouseout="this.className='lvtColData'" bgcolor="white">
-             {foreach item=listvalues from=$LIST_ENTRIES[entries]}
-				  <td >{$listvalues}</td>
-             {/foreach}
-			 </tr>
-		{/section}	
-        </tbody>
-        </table>
-	</td>
-	<td width="25%" class="padTab" align="center" valign="top">
-		<div id="chPhoto" style="display:block;width:80%;">
-			<table width="100%"   cellspacing="0" cellpadding="5" class="small">
-				<tr><td align="left" colspan="2" style="border-bottom:1px dotted #CCCCCC;">
-					<b>{$CMOD.LBL_STATISTICS}</b></td>
-				</tr>
-				<tr><td align="right"><b>{$CMOD.LBL_TOTAL}</b></td>
-					<td  align="left">{$USER_COUNT.user} {$CMOD.LBL_USERS}</td>	
-				</tr>	
-				<tr><td  align="right"><b>{$CMOD.LBL_ADMIN} {$CMOD.LBL_COLON}</b></td>
-					<td  align="left">{$USER_COUNT.admin} {$CMOD.LBL_USERS}</td>	
-				</tr>	
-				<tr><td  align="right"><b>{$CMOD.LBL_OTHERS}</b></td>
-					<td  align="left">{$USER_COUNT.nonadmin} {$CMOD.LBL_USERS}</td>
-				</tr>	
-			</table>
-	    </div>
-	</td>
-	</tr>
+	
+<table border=0 cellspacing=0 cellpadding=5 width=100% class="tableHeading">
+<tr>
+	<td class="big"><strong>{$MOD.LBL_USERS_LIST}</strong></td>
+	<td class="small" align=right>{$CMOD.LBL_TOTAL} {$USER_COUNT.user} {$MOD.LBL_USERS} ({$USER_COUNT.admin} {$CMOD.LBL_ADMINS}, {$USER_COUNT.nonadmin} {$CMOD.LBL_STD_USERS})</td>
+</tr>
+</table>
+					
+<table border=0 cellspacing=0 cellpadding=5 width=100% class="listTableTopButtons">
+<tr>
+	<td class=small align=right><input title="{$CMOD.LBL_NEW_USER_BUTTON_TITLE}" accessyKey="{$CMOD.LBL_NEW_USER_BUTTON_KEY}" type="submit" name="button" value="{$CMOD.LBL_NEW_USER_BUTTON_LABEL}" class="crmButton create small"></td>
+</tr>
+</table>
+						
+<table border=0 cellspacing=0 cellpadding=5 width=100% class="listTable">
+<tr>
+	{foreach item=header from=$LIST_HEADER} 
+		<td class="colHeader small" valign=top>{$header}</td>
+	{/foreach}
+</tr>
+	{foreach name=userlist item=listvalues from=$LIST_ENTRIES}
+<tr>
+	<td class="listTableRow small" valign=top>{$smarty.foreach.userlist.iteration}</td>
+	<td class="listTableRow small" valign=top>{$listvalues.7}</td>
+	<td class="listTableRow small" valign=top><b>{$listvalues.0}</b><br>{$listvalues.3} <a> (</a>{$listvalues.1})</td>
+	<td class="listTableRow small" valign=top>{$listvalues.2}</td>
+	<td class="listTableRow small" valign=top>{$listvalues.6}</td>
+	<td class="listTableRow small" valign=top>{$listvalues.4}</td>
+	{if $listvalues.5 eq 'Active'}
+	<td class="listTableRow small active" valign=top>{$listvalues.5}</td>
+	{else}
+	<td class="listTableRow small inactive" valign=top>{$listvalues.5}</td>
+	{/if}	
+
+</tr>
+	{/foreach}
+</table>
+<table border=0 cellspacing=0 cellpadding=5 width=100% >
+	<tr><td class="small" nowrap align=right><a href="#top">{$MOD.LBL_SCROLL}</a></td></tr>
 </table>
 




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 08:09:49 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 12:09:49 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7034 -
	/vtigercrm/trunk/install/populateSeedData.php
Message-ID: <20060613120949.DDFBE7E8C68@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 13 06:09:46 2006
New Revision: 7034

Log:
value added in salesorder status array and in Invoice, accountid changed to account_id

Modified:
    vtigercrm/trunk/install/populateSeedData.php

Modified: vtigercrm/trunk/install/populateSeedData.php
==============================================================================
--- vtigercrm/trunk/install/populateSeedData.php (original)
+++ vtigercrm/trunk/install/populateSeedData.php Tue Jun 13 06:09:46 2006
@@ -607,7 +607,7 @@
 //Populate SalesOrder Data
 
 $subj_array = array ("SO_vtiger", "SO_zoho", "SO_vtiger5usrp", "SO_vt100usrpk", "SO_vendtl");
-$status_array = array ("Created",  "Delivered", "Approved" , "Cancelled");
+$status_array = array ("Created",  "Delivered", "Approved" , "Cancelled" , "Created");
 $sototal_array = array ("5988.000", "5988.000", "5988.000", "5988.000", "5988.000");
 $carrier_array = array ("FedEx", "UPS", "USPS", "DHL", "BlueDart");
 
@@ -685,7 +685,7 @@
 	
 	$invoice->column_fields["assigned_user_id"] = $assigned_user_id;
 	$account_key = array_rand($account_ids);
-	$invoice->column_fields["accountid"] = $account_ids[$account_key];
+	$invoice->column_fields["account_id"] = $account_ids[$account_key];
 	$so_key = array_rand($salesorder_ids);
 	$invoice->column_fields["salesorder_id"] = $salesorder_ids[$so_key];
 	$contact_key = array_rand($contact_ids);




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 08:10:55 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 12:10:55 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7035 -
	/vtigercrm/trunk/Smarty/templates/SetMenu.tpl
Message-ID: <20060613121055.D05407E8C6B@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 13 06:10:52 2006
New Revision: 7035

Log:
Added new settings menu tpl file - ahmed

Added:
    vtigercrm/trunk/Smarty/templates/SetMenu.tpl




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 08:20:40 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 12:20:40 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7036 -
	/vtigercrm/trunk/modules/Users/ListProfiles.php
Message-ID: <20060613122040.093167E8C6B@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 13 06:20:37 2006
New Revision: 7036

Log:
updated Profiles List.php - ahmed

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

Modified: vtigercrm/trunk/modules/Users/ListProfiles.php
==============================================================================
--- vtigercrm/trunk/modules/Users/ListProfiles.php (original)
+++ vtigercrm/trunk/modules/Users/ListProfiles.php Tue Jun 13 06:20:37 2006
@@ -27,7 +27,7 @@
 $sql = "select * from vtiger_profile";
 $profileListResult = $adb->query($sql);
 $noofrows = $adb->num_rows($profileListResult);
-$list_entries = array($mod_strings['LBL_OERATION'],$mod_strings['LBL_NEW_PROFILE_NAME'],$mod_strings['LBL_DESCRIPTION']);
+$list_entries = array($mod_strings['LBL_LIST_NO'],$mod_strings['LBL_LIST_TOOLS'],$mod_strings['LBL_NEW_PROFILE_NAME'],$mod_strings['LBL_DESCRIPTION']);
 
 //Standard PickList Fields
 function getStdOutput($profileListResult, $noofrows, $mod_strings)
@@ -60,10 +60,9 @@
 $smarty->assign("MOD", return_module_language($current_language,'Settings'));
 $smarty->assign("PROFILES", $standCustFld);
 $smarty->assign("IMAGE_PATH",$image_path);
+$smarty->assign("COUNT",$noofrows);
 $smarty->assign("APP", $app_strings);
 $smarty->assign("CMOD", $mod_strings);
 
-
-
-$smarty->display("UserProfile.tpl");
+$smarty->display("UserProfileList.tpl");
 ?>




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 08:22:09 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 12:22:09 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7037 -
	/vtigercrm/trunk/Smarty/templates/UserProfile.tpl
Message-ID: <20060613122209.5AED27E8C6B@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 13 06:22:05 2006
New Revision: 7037

Log:
Replaced the file with UserProfileList - ahmed

Removed:
    vtigercrm/trunk/Smarty/templates/UserProfile.tpl




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 08:22:57 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 12:22:57 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7038 -
 /vtigercrm/trunk/Smarty/templates/UserProfileList.tpl
Message-ID: <20060613122257.CC86F7E8C6B@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 13 06:22:53 2006
New Revision: 7038

Log:
Added profile list file for new ui - ahmed

Added:
    vtigercrm/trunk/Smarty/templates/UserProfileList.tpl




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 08:29:10 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 12:29:10 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7039 -
 /vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl
Message-ID: <20060613122911.7B3467E8AC7@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 13 06:29:05 2006
New Revision: 7039

Log:
Updated the detailview profile file for new ui - ahmed

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 Jun 13 06:29:05 2006
@@ -9,127 +9,191 @@
   *
  ********************************************************************************/
 -->*}
-<script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
-<style type="text/css">@import url(themes/blue/style.css);</style>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-<tr>
-	{include file='SettingsMenu.tpl'}
-<td width="75%" valign="top">
-
-<table width="100%" border="0" cellpadding="0" cellspacing="0" height="100%">
-<tr>
-<td class="showPanelBg" valign="top" width="100%" colspan="3" style="padding-left:20px; "><br />
-<span class="lvtHeaderText"><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS} </a> > {$MOD.LBL_USER_MANAGEMENT} > {$MOD.LBL_PROFILES}</b></span>
-<hr noshade="noshade" size="1" />
-</td>
-</tr>
-<tr>
-<td width="75%" style="padding-left:20px;" valign="top">
-	
-	<table width="75%" border="0" cellpadding="5" cellspacing="0" align="center">
-	<tr>
-															<td width="5%" style="border-bottom:1px dashed #CCCCCC;">
-																	<img src="{$IMAGE_PATH}profile.gif" align="absmiddle">
-															</td>
-															<td style="border-bottom:1px dashed #CCCCCC;"> 
-																	<span class="genHeaderGrayBig">{$CMOD.LBL_PROFILE_DETAIL_VIEW}</span><br>
-																	<span	class="genHeaderSmall">{$PROFILE_NAME}</span>
-															</td>
-													</tr>
-	<tr>
-	<td colspan="2"><table border="0" cellspacing="0" cellpadding="0" width="100%">
-	<tr class="small">
-	<td><img src="{$IMAGE_PATH}prvPrfTopLeft.gif" /></td>
-	<td class="prvPrfTopBg" width="100%" ></td>
-
-	<td><img src="{$IMAGE_PATH}prvPrfTopRight.gif" /></td>
-	</tr>
-	</table>
-	<form action="index.php" method="post" name="new" id="form">
-	<input type="hidden" name="module" value="Users">		
-	<input type="hidden" name="action" value="profilePrivileges">		
-	<input type="hidden" name="parenttab" value="Settings">
-	<input type="hidden" name="return_action" value="profilePrivileges">		
-	<input type="hidden" name="mode" value="edit">	
-	<input type="hidden" name="profileid" value="{$PROFILEID}">	
-	
-	<table border="0" cellspacing="0" cellpadding=	"0" width="100%" class="prvPrfOutline">
-	<tr>
-	<td>
-	<!-- tabs -->
-	<table border="0" cellspacing="0" cellpadding="5" width="100%" class="small">
-	<tr>
-	<td width="20%" id="prvPrfTab1" class="prvPrfUnSelectedTab" align="center" style="height:31px;" onClick="toggleshowhide('global_privileges','prvPrfTab1');">{$CMOD.LBL_GLOBAL_PRIVILEGES}</td>
-	<td width="20%" id="prvPrfTab2" class="prvPrfUnSelectedTab" align="center" onClick="toggleshowhide('tab_privileges','prvPrfTab2');">{$CMOD.LBL_TAB_PRIVILEGES}</td>
-	<td width="20%" id="prvPrfTab3" class="prvPrfUnSelectedTab" align="center" onClick="toggleshowhide('standard_privileges','prvPrfTab3');">{$CMOD.LBL_STANDARD_PRIVILEGES}</td>
-	<td width="20%" id="prvPrfTab4" class="prvPrfUnSelectedTab" align="center" onClick="toggleshowhide('field_privileges','prvPrfTab4');">{$CMOD.LBL_FIELD_PRIVILEGES}</td>
-	<td width="20%" id="prvPrfTab5" class="prvPrfUnSelectedTab" align="center" onClick="toggleshowhide('utility_privileges','prvPrfTab5');">{$CMOD.LBL_UTILITIES}</td>
-	</tr>
-	</table>
-		<div id="global_privileges" style="display:none;">
-		<!-- Headers -->
-		<table border="0" cellspacing="0" cellpadding="5" width="100%" class="prvPrfBgImgGlobal">
-		<tr>
-		<td>
-		<table border="0" cellspacing="0" cellpadding="5" width="100%" class="small">
-		<tr>
-		<td><!-- Module name heading -->
-		<table border="0" cellspacing="0" cellpadding="2" class="small">
-		<tr>
-		<td valign="top"><img src="{$IMAGE_PATH}prvPrfHdrArrow.gif"/> </td>
-	
-		<td class="prvPrfBigText"><b> {$CMOD.LBL_GLOBAL_PRIVILEGES} {$CMOD.LBL_FOR} "{$PROFILE_NAME}"</b> <br />
-		<font class="small">{$CMOD.LBL_GLOBAL_MESG_OPTION} </font> </td>
-		<td class="small" style="padding-left:10px" align="right"></td>
-		</tr>
-		</table></td>
-		<td align="right" valign="bottom">&nbsp; </td>
-
+
+<script language="JAVASCRIPT" type="text/javascript" src="include/js/smoothscroll.js"></script>
+
+<br>
+<table align="center" border="0" cellpadding="0" cellspacing="0" width="98%">
+<tbody><tr>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
+        <td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
+<br>
+	<div align=center>
+		{include file="SetMenu.tpl"}	
+				<!-- DISPLAY -->
+				<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
+				<tr>
+					<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}ico-profile.gif" alt="{$MOD.LBL_PROFILES}" width="48" height="48" border=0 title="{$MOD.LBL_PROFILES}"></td>
+					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&
+parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Users&action=ListProfiles&parenttab=Settings">{$CMOD.LBL_PROFILE_PRIVILEGES}</a> &gt; {$CMOD.LBL_VIEWING} &quot;{$PROFILE_NAME}&quot; </b></td>
+				</tr>
+				<tr>
+					<td valign=top class="small">{$CMOD.LBL_PROFILE_MESG} &quot;{$PROFILE_NAME}&quot;</td>
+				</tr>
+				</table>
+				
+				
+				<table border=0 cellspacing=0 cellpadding=10 width=100% >
+				<tr>
+				<td valign=top>
+					<table border="0" cellspacing="0" cellpadding="0" width="100%">
+                      <tr>
+                        <td><table border="0" cellspacing="0" cellpadding="0" width="100%">
+                            <tr class="small">
+                              <td><img src="{$IMAGE_PATH}prvPrfTopLeft.gif"></td>
+
+                              <td class="prvPrfTopBg" width="100%" ></td>
+                              <td><img src="{$IMAGE_PATH}prvPrfTopRight.gif"></td>
+                            </tr>
+                          </table>
+				<form action="index.php" method="post" name="new" id="form">
+			        <input type="hidden" name="module" value="Users">
+			        <input type="hidden" name="action" value="profilePrivileges">
+			        <input type="hidden" name="parenttab" value="Settings">
+			        <input type="hidden" name="return_action" value="profilePrivileges">
+			        <input type="hidden" name="mode" value="edit">
+			        <input type="hidden" name="profileid" value="{$PROFILEID}">
+	
+                            <table border="0" cellspacing="0" cellpadding="0" width="100%" class="prvPrfOutline">
+                              <tr>
+                                <td><!-- tabs -->
+                                    <table border="0" cellspacing="0" cellpadding="5" width="100%" class="small">
+                                      <tr>
+                                        <td width="20%" id="prvPrfTab1" class="prvPrfSelectedTab" align="center" style="height:31px;" onClick="toggleshowhide('global_privileges','prvPrfTab1');"><a href="#">{$CMOD.LBL_GLOBAL_PRIVILEGES}</a></td>
+                                        <td width="20%" id="prvPrfTab2" class="prvPrfUnSelectedTab" align="center" onClick="toggleshowhide('tab_privileges','prvPrfTab2');"><a href="#">{$CMOD.LBL_TAB_PRIVILEGES}</a></td>
+                                        <td width="20%" id="prvPrfTab3" class="prvPrfUnSelectedTab" align="center" onClick="toggleshowhide('standard_privileges','prvPrfTab3');"><a href="#">{$CMOD.LBL_STANDARD_PRIVILEGES}</a></td>
+                                        <td width="20%" id="prvPrfTab4" class="prvPrfUnSelectedTab" align="center" onClick="toggleshowhide('field_privileges','prvPrfTab4');"><a href="#">{$CMOD.LBL_FIELD_PRIVILEGES}</a></td>
+                                        <td width="20%" id="prvPrfTab5" class="prvPrfUnSelectedTab" align="center" onClick="toggleshowhide('utility_privileges','prvPrfTab5');" ><a href="#">{$CMOD.LBL_UTILITIES}</a></td>
+                                      </tr>
+                                    </table>
+				   <div id="global_privileges" style="display:none;">
+                                    <!-- Headers -->
+                                    <table border="0" cellspacing="0" cellpadding="5" width="100%" class="prvPrfBgImgGlobal">
+                                      <tr>
+                                        <td><table border="0" cellspacing="0" cellpadding="5" width="100%" class="small">
+                                            <tr>
+                                              <td><!-- Module name heading -->
+                                                  <table border="0" cellspacing="0" cellpadding="2" class="small">
+                                                    <tr>
+                                                      <td valign="top" ><img src="{$IMAGE_PATH}prvPrfHdrArrow.gif" /> </td>
+                                                      <td class="prvPrfBigText"><b> {$CMOD.LBL_GLOBAL_PRIVILEGES} {$CMOD.LBL_FOR} "{$PROFILE_NAME}"</b> <br />
+                                                          <font class="small">{$CMOD.LBL_GLOBAL_MESG_OPTION}</font></td>
+                                                      <td class="small" style="padding-left:10px" align="right"></td>
+                                                    </tr>
+                                                </table></td>
+                                              <td align="right" valign="bottom">
+						<input type="hidden" id="selected_tab" name="selected_tab" value="{$SELECTED_TAB}">
+					        <input type="hidden" id="selected_module" name="selected_module" value="{$SELECTED_MODULE}">
+						<input type="submit" value="{$APP.LBL_EDIT_BUTTON_LABEL}" class="crmButton small edit" name="edit"></td>
+                                            </tr>
+                                          </table>
+                                            <!-- privilege lists -->
+                                            <table border="0" cellspacing="0" cellpadding="0" width="100%" >
+                                              <tr>
+                                                <td align="center" style="height:10px"><img src="{$IMAGE_PATH}prvPrfLine.gif" style="width:100%;height:1px" /></td>
+                                              </tr>
+                                            </table>
+                                            <table border="0" cellspacing="0" cellpadding="10" width="100%">
+                                              <tr>
+                                                <td ><table border="0" cellspacing="0" cellpadding="5" width="90%" class="small" align="center">
+                                                  <tr>
+                                                    <td class="prvPrfTexture" style="width:20px">&nbsp;</td>
+                                                    <td width="97%" valign="top"><table border="0" cellspacing="0" cellpadding="2" width="100%" class="small">
+                                                        <tr id="gva">
+                                                          <td valign="top">{$GLOBAL_PRIV.0}</td>
+                                                          <td ><b>{$CMOD.LBL_VIEW_ALL}</b> </td>
+                                                        </tr>
+                                                        <tr >
+                                                          <td valign="top"></td>
+                                                          <td width="100%" >{$CMOD.LBL_ALLOW} "{$PROFILE_NAME}" {$CMOD.LBL_MESG_VIEW}</td>
+                                                        </tr>
+                                                        <tr>
+                                                          <td>&nbsp;</td>
+                                                        </tr>
+							<tr>
+							<td valign="top">{$GLOBAL_PRIV.1}</td>
+							<td ><b>{$CMOD.LBL_EDIT_ALL}</b> </td>
+							</tr>
+                                                        <tr>
+                                                          <td valign="top"></td>
+                                                          <td > {$CMOD.LBL_ALLOW} "{$PROFILE_NAME}" {$CMOD.LBL_MESG_EDIT}</td>
+                                                        </tr>
+                                                      </table>
+                                                     </td>
+                                                  </tr>
+                                                </table></td>
+                                              </tr>
+                                          </table></td>
+                                      </tr>
+                                  </table></td>
+                              </tr>
+                            </table>
+			    </div>		
+	
+		<div id="tab_privileges" style="display:none;">
+		<table border=0 cellspacing=0 cellpadding=5 width=100% >
+		<tr>
+		<td>
+		<table border=0 cellspacing=0 cellpadding=5 width=100% class=small>
+		<tr>
+		<td>
+		<!-- Module name heading -->
+		<table border=0 cellspacing=0 cellpadding=2 class=small>
+		<tr>
+		<td valign=top >
+		<img src="{$IMAGE_PATH}prvPrfHdrArrow.gif"></td>
+		<td class="prvPrfBigText">
+		<b> {$CMOD.LBL_TAB_PRIVILEGES} {$CMOD.LBL_FOR} "{$PROFILE_NAME}"</b> <br>
+		<font class=small>{$CMOD.LBL_TAB_MESG_OPTION} </font> 
+		</td>
+		</tr>
+		</table>
+		</td>
+		<td align=right valign=bottom>
+			<input type="hidden" id="selected_tab" name="selected_tab" value="{$SELECTED_TAB}">
+			<input type="hidden" id="selected_module" name="selected_module" value="{$SELECTED_MODULE}">
+			<input type="submit" value="{$APP.LBL_EDIT_BUTTON_LABEL}" class="crmButton small edit" name="edit">
+		</td>
 		</tr>
 		</table>
 		<!-- privilege lists -->
-		<table border="0" cellspacing="0" cellpadding="0" width="100%" >
-		<tr>
-		<td align="center" style="height:10px"><img src="{$IMAGE_PATH}prvPrfLine.gif" style="width:100%;height:1px" /></td>
-		</tr>
-		</table>
-		<table border="0" cellspacing="0" cellpadding="10" width="100%">
+		<table border=0 cellspacing=0 cellpadding=0 width=100% >
+		<tr>
+		<td align=center style="height:10px"><img src="{$IMAGE_PATH}prvPrfLine.gif" style="width:100%;height:1px"></td>
+		</tr>
+		</table>
+		<table border=0 cellspacing=0 cellpadding=10 width=100%>
 		<tr>
 		<td >
-		<table border="0" cellspacing="0" cellpadding="5" width="90%" class="small" align="center">
-		<tr>
+		<!-- Home tab -->
+		<table border=0 cellspacing=0 cellpadding=5 width=95% class=small align=center >
+		<tr>
+			<td valign=top width="25%" ><table border=0 cellspacing=0 cellpadding=5 width=100% class=small>
+		
+
+		{foreach item=value from=$TAB_PRIV}
+		<tr>
+		{foreach item=element from=$value}
 		<td class="prvPrfTexture" style="width:20px">&nbsp;</td>
-		<td width="97%" valign="top">
-		<table border="0" cellspacing="0" cellpadding="2" width="100%" class="small">
-		<tr id="gva">
-		<td valign="top">{$GLOBAL_PRIV.0}</td>
-		<td ><b>{$CMOD.LBL_VIEW_ALL}</b> </td>
-		</tr>
-		<tr >
-		<td valign="top"></td>
-		<td width="100%" >{$CMOD.LBL_ALLOW} "{$PROFILE_NAME}" {$CMOD.LBL_MESG_VIEW}</td>
-		</tr>
-		<tr>
-		<td>&nbsp;</td>
-		</tr>
-		<tr>
-		<td valign="top">{$GLOBAL_PRIV.1}</td>
-		<td ><b>{$CMOD.LBL_EDIT_ALL}</b> </td>
-		</tr>
-		<tr>
-		<td valign="top"></td>
-		<td > {$CMOD.LBL_ALLOW} "{$PROFILE_NAME}" {$CMOD.LBL_MESG_EDIT}</td>
-		</tr>
-		</table>
-		</td>
-		</tr>	
-		</table></td>
-		</tr>
-		</table></td>
-		</tr>
+		<td width=5% id="perm{$element.0}">{$element.1}</td>
+		<td width=30% nowrap onMouseOver="this.className='prvPrfHoverOn',$('perm{$element.0}').className='prvPrfHoverOn'" onMouseOut="this.className='prvPrfHoverOff',$('perm{$element.0}').className='prvPrfHoverOff'">{$APP[$element.0]}</td>
+		{/foreach}
+		</tr>
+		{/foreach}
+	
+		</table>
+		</td>
+		</tr>
+		</table>
+		</td>
+		</tr>
+		</table>
+		</td>
+		</tr>
+
 		</table>
 		</div>
-		
+	
 		<div id="standard_privileges" style="display:none;">
 		<table border=0 cellspacing=0 cellpadding=5 width=100% >
 		<tr>
@@ -150,9 +214,12 @@
 		</tr>
 		</table>
 		</td>
-		<td align=right valign=bottom>&nbsp;
-		
-		</td>
+		<td align=right valign=bottom>
+			<input type="hidden" id="selected_tab" name="selected_tab" value="{$SELECTED_TAB}">
+			<input type="hidden" id="selected_module" name="selected_module" value="{$SELECTED_MODULE}">
+			<input type="submit" value="{$APP.LBL_EDIT_BUTTON_LABEL}" class="crmButton small edit" name="edit">
+		</td>	
+
 		</tr>
 		</table>
 		<!-- privilege lists -->
@@ -167,10 +234,10 @@
 		<table border=0 cellspacing=0 cellpadding=5 width=90% class=small align=center >
 		<tr>
 		<td class="prvPrfTexture" style="width:20px">&nbsp;</td>
-		<td width=97% valign=top onMouseOver="this.className='prvPrfHoverOn'" onMouseOut="this.className='prvPrfHoverOff'" >
+		<td width=97% valign=top>
 		<table border=0 cellspacing=0 cellpadding=5 width=100% class=small>
 		
-		<tr>
+		<tr onMouseOver="this.className='prvPrfHoverOn'" onMouseOut="this.className='prvPrfHoverOff'">
 		<td><b>{$CMOD.LBL_ENTITY}</b></td>
 		<td><b>{$CMOD.LBL_CREATE_EDIT}</b></td>
 		<td><b>{$CMOD.LBL_DELETE}</b></td>
@@ -178,7 +245,7 @@
 		</tr>
 		
 		{foreach item=value from=$STANDARD_PRIV}
-		<tr>
+		<tr onMouseOver="this.className='prvPrfHoverOn'" onMouseOut="this.className='prvPrfHoverOff'">
 		<td>{$APP[$value.0]}</td>
 		<td>{$value.1}</td>
 		<td>{$value.2}</td>
@@ -198,70 +265,75 @@
 		</table>
 		</div>
 		
-		<div id="tab_privileges" style="display:none;">
-		<table border=0 cellspacing=0 cellpadding=5 width=100% >
-		<tr>
-		<td>
-		<table border=0 cellspacing=0 cellpadding=5 width=100% class=small>
-		<tr>
-		<td>
-		<!-- Module name heading -->
-		<table border=0 cellspacing=0 cellpadding=2 class=small>
-		<tr>
-		<td valign=top >
-		<img src="{$IMAGE_PATH}prvPrfHdrArrow.gif">
-		</td>
-		<td class="prvPrfBigText">
-		<b> {$CMOD.LBL_TAB_PRIVILEGES} {$CMOD.LBL_FOR} "{$PROFILE_NAME}"</b> <br>
-		<font class=small>{$CMOD.LBL_TAB_MESG_OPTION} </font> 
-		</td>
-		</tr>
-		</table>
-		</td>
-		<td align=right valign=bottom>&nbsp;
-		
-		</td>
+		<div id="field_privileges" style="display:none;">
+		<table border="0" cellspacing="0" cellpadding="5" width="100%" >
+		<tr>
+		<td><table border="0" cellspacing="0" cellpadding="5" width="100%" class="small">
+		<tr>
+		<td><!-- Module name heading -->
+		<table border="0" cellspacing="0" cellpadding="2" class="small">
+		<tr>
+		<td valign="top" ><img src="{$IMAGE_PATH}prvPrfHdrArrow.gif" /> </td>
+
+		<td class="prvPrfBigText"><b> {$CMOD.LBL_FIELD_PRIVILEGES} {$CMOD.LBL_FOR} "{$PROFILE_NAME}"</b> <br />
+		<font class="small">{$CMOD.LBL_FIELD_MESG_OPTION} </font> </td>
+		</tr>
+		</table></td>
+		<td align="right" valign="bottom">
+			<input type="hidden" id="selected_tab" name="selected_tab" value="{$SELECTED_TAB}">
+			<input type="hidden" id="selected_module" name="selected_module" value="{$SELECTED_MODULE}">
+			<input type="submit" value="{$APP.LBL_EDIT_BUTTON_LABEL}" class="crmButton small edit" name="edit">
+		</td>	
 		</tr>
 		</table>
 		<!-- privilege lists -->
-		<table border=0 cellspacing=0 cellpadding=0 width=100% >
-		<tr>
-		<td align=center style="height:10px"><img src="{$IMAGE_PATH}prvPrfLine.gif" style="width:100%;height:1px"></td>
-		</tr>
-		</table>
-		<table border=0 cellspacing=0 cellpadding=10 width=100%>
+		<table border="0" cellspacing="0" cellpadding="0" width="100%" >
+		<tr>
+		<td align="center" style="height:10px"><img src="{$IMAGE_PATH}prvPrfLine.gif" style="width:100%;height:1px" /></td>
+		</tr>
+
+		</table>
+		<table border="0" cellspacing="0" cellpadding="10" width="100%">
 		<tr>
 		<td >
-		<!-- Home tab -->
-		<table border=0 cellspacing=0 cellpadding=5 width=90% class=small align=center >
-		<tr>
-		<td class="prvPrfTexture" style="width:20px">&nbsp;</td>
-		<td width=97% valign=top onMouseOver="this.className='prvPrfHoverOn'" onMouseOut="this.className='prvPrfHoverOff'" >
-		<table border=0 cellspacing=0 cellpadding=5 width=100% class=small>
-		
-
-		{foreach item=value from=$TAB_PRIV}
-		<tr>
-		{foreach item=element from=$value}
-		<td width=35%>{$APP[$element.0]}</td>
-		<td width=15%>{$element.1}</td>
-		{/foreach}
-		</tr>
-		{/foreach}
-	
-		</table>
-		</td>
-		</tr>
-		</table>
-		</td>
-		</tr>
-		</table>
-		</td>
-		</tr>
-
+		<table border="0" cellspacing="0" cellpadding="5" width="100%" class="small">
+		<tr>
+		<td>
+		<select id="module_list" name="module_list" onchange="showmoduleperm(this)">
+		{foreach key=module item=label from=$PRI_FIELD_LIST}
+			<option value="{$label}">{$APP.$label}</option>
+		{/foreach}
+		</td>
+		<td width=50%>&nbsp;</td>
+		</tr>
+		<tr>
+		<td colspan=2>
+	
+		{foreach key=module item=value from=$FIELD_PRIVILEGES}
+		<div id="field_{$module}" style="display:none;">
+		<table border="0" cellspacing="0" cellpadding="5" width="100%" class="small">
+		{foreach item=row_value from=$value}
+		<tr>
+		{foreach item=element from=$row_value}
+		<td class="prvPrfTexture" style="width:5px">&nbsp;</td>
+		<td id="fldperm{$element.0}">{$element.1}</td>
+		<td onMouseOver="this.className='prvPrfHoverOn',$('fldperm{$element.0}').className='prvPrfHoverOn'" onMouseOut="this.className='prvPrfHoverOff',$('fldperm{$element.0}').className='prvPrfHoverOff' ">{$element.0}</td>
+		{/foreach}
+		</tr>
+		{/foreach}
 		</table>
 		</div>
-		
+		{/foreach}
+		
+		</td>
+		</tr>
+		</table></td>
+		</tr>
+		</table></td>
+		</tr>
+		</table>
+		</div>
+	
 		<div id="utility_privileges" style="display:none;">
 		<table border=0 cellspacing=0 cellpadding=5 width=100% >
 		<tr>
@@ -282,9 +354,10 @@
 		</tr>
 		</table>
 		</td>
-		<td align=right valign=bottom>&nbsp;
-		
-		</td>
+		<td align=right valign=bottom>
+			<input type="hidden" id="selected_tab" name="selected_tab" value="{$SELECTED_TAB}">
+		        <input type="hidden" id="selected_module" name="selected_module" value="{$SELECTED_MODULE}">
+			<input type="submit" value="{$APP.LBL_EDIT_BUTTON_LABEL}" class="crmButton small edit" name="edit"></td>
 		</tr>
 		</table>
 		<!-- privilege lists -->
@@ -330,114 +403,47 @@
 		</table>
 
 		</div>
-		
-		
-		<div id="field_privileges" style="display:none;">
-		<table border="0" cellspacing="0" cellpadding="5" width="100%" >
-		<tr>
-		<td><table border="0" cellspacing="0" cellpadding="5" width="100%" class="small">
-		<tr>
-		<td><!-- Module name heading -->
-		<table border="0" cellspacing="0" cellpadding="2" class="small">
-		<tr>
-		<td valign="top" ><img src="{$IMAGE_PATH}prvPrfHdrArrow.gif" /> </td>
-
-		<td class="prvPrfBigText"><b> {$CMOD.LBL_FIELD_PRIVILEGES} {$CMOD.LBL_FOR} "{$PROFILE_NAME}"</b> <br />
-		<font class="small">{$CMOD.LBL_FIELD_MESG_OPTION} </font> </td>
-		</tr>
-		</table></td>
-		<td align="right" valign="bottom">
-		</td>
-		</tr>
-		</table>
-		<!-- privilege lists -->
-		<table border="0" cellspacing="0" cellpadding="0" width="100%" >
-		<tr>
-		<td align="center" style="height:10px"><img src="{$IMAGE_PATH}prvPrfLine.gif" style="width:100%;height:1px" /></td>
-		</tr>
-
-		</table>
-		<table border="0" cellspacing="0" cellpadding="10" width="100%">
-		<tr>
-		<td >
-		<table border="0" cellspacing="0" cellpadding="5" width="100%" class="small">
-		<tr>
-		<td>
-		<select id="module_list" name="module_list" onchange="showmoduleperm(this)">
-		{foreach key=module item=label from=$PRI_FIELD_LIST}
-			<option value="{$label}">{$APP.$label}</option>
-		{/foreach}
-		</td>
-		<td width=50%>&nbsp;</td>
-		</tr>
-		<tr>
-		<td colspan=2>
-	
-		{foreach key=module item=value from=$FIELD_PRIVILEGES}
-		<div id="field_{$module}" style="display:none;">
-		<table border="0" cellspacing="0" cellpadding="5" width="100%" class="small">
-		{foreach item=row_value from=$value}
-		<tr>
-		{foreach item=element from=$row_value}
-		<td>{$element.0}</td>
-		<td>{$element.1}</td>
-		{/foreach}
-		</tr>
-		{/foreach}
-		</table>
-		</div>
-		{/foreach}
-		
-		</td>
-		</tr>
-		</table></td>
-		</tr>
-		</table></td>
-		</tr>
-		</table>
-		</div>
-		
-		</td>
+
+	
+
+                            <table border="0" cellspacing="0" cellpadding="0" width="100%" class="small">
+                              <tr>
+                                <td><img src="{$IMAGE_PATH}prvPrfBottomLeft.gif" /></td>
+                                <td class="prvPrfBottomBg" width="100%"></td>
+                                <td><img src="{$IMAGE_PATH}prvPrfBottomRight.gif" /></td>
+                              </tr>
+                          </table>
 			
-		</tr>
-		</table>
-	<table border="0" cellspacing="0" cellpadding="0" width="100%" class="small">
-	<tr>
-	<td><img src="{$IMAGE_PATH}prvPrfBottomLeft.gif" /></td>
-	<td class="prvPrfBottomBg" width="100%"></td>
-	<td><img src="{$IMAGE_PATH}prvPrfBottomRight.gif" /></td>
+			</td>
+                      </tr>
+                    </table>
+					<p>&nbsp;</p>
+					<table border=0 cellspacing=0 cellpadding=5 width=100% >
+					<tr><td class="small" nowrap align=right><a href="#top">{$MOD.LBL_SCROLL}</a></td></tr>
+					</table>
+				
+					
+					
+				</td>
+				</tr>
+				</table>
+			
+			
+			
+			</td>
+			</tr>
+			</table>
+		</td>
 	</tr>
-	</table></td>
-
-	</tr>
-	</table></td>
-	</tr>	
-	<tr><td colspan="2" style="border-bottom:1px dashed #CCCCCC;">&nbsp;</td></tr>
-	<tr><td colspan="2">&nbsp;</td></tr>
-	<tr>
-	<td colspan="2" align="center">
-	<input type="hidden" id="selected_tab" name="selected_tab" value="{$SELECTED_TAB}">		
-	<input type="hidden" id="selected_module" name="selected_module" value="{$SELECTED_MODULE}">		
-	<input type="submit" value=" {$APP.LBL_EDIT_BUTTON_LABEL} " onClick="page_submit(this);" name="edit" class="classBtn"/>&nbsp;&nbsp;
-	<input type="button" value=" {$APP.LBL_CANCEL_BUTTON_LABEL} " name="Cancel" onClick="window.history.back();" class="classBtn"/>
-
-	</td>
-	</tr>
-	<tr><td colspan="2">&nbsp;</td></tr>
-	<tr><td colspan="2" style="border-top:1px solid #CCCCCC;">&nbsp;</td></tr>
 	</table>
-	
+		
+	</div>
+
 </td>
-<td width="1%" style="border-right:1px dotted #CCCCCC;">&nbsp;</td>
-</tr>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
+   </tr>
+</tbody>
 </table>
-</td>
-</tr>
-</table>
-</td>
-</tr>
-</table>
-	{include file='SettingsSubMenu.tpl'}
 
 <script language="javascript" type="text/javascript">
 var Selected_div= '{$SELECTED_TAB}';




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 08:34:07 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 12:34:07 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7040 -
	/vtigercrm/trunk/modules/Users/profilePrivileges.php
Message-ID: <20060613123407.1F2F07E8B74@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 13 06:34:01 2006
New Revision: 7040

Log:
Update profile privelege file for new ui - ahmed

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

Modified: vtigercrm/trunk/modules/Users/profilePrivileges.php
==============================================================================
--- vtigercrm/trunk/modules/Users/profilePrivileges.php (original)
+++ vtigercrm/trunk/modules/Users/profilePrivileges.php Tue Jun 13 06:34:01 2006
@@ -290,7 +290,7 @@
 	}
 
 }
-$privileges_tab = array_chunk($privileges_tab, 2);
+$privileges_tab = array_chunk($privileges_tab, 4);
 $smarty->assign("TAB_PRIV",$privileges_tab);			
 
 //utilities privileges
@@ -412,7 +412,7 @@
 			$field=array();
 			if($fieldListResult[$module_name][$j][1] == 0)
 			{
-				$visible = "<img src=".$image_path."/yes.gif>";
+				$visible = "<img src=".$image_path."/prvPrfSelectedTick.gif>";
 			}
 			else
 			{
@@ -422,7 +422,7 @@
 			$field[]=$visible;
 			$field_module[]=$field;
 		}
-		$privilege_field[$module_name] = array_chunk($field_module,2);
+		$privilege_field[$module_name] = array_chunk($field_module,4);
 		next($fieldListResult);
 	}
 }
@@ -458,7 +458,7 @@
 			$field[]='<input type="checkbox" name="'.$fieldListResult[$module_name][$j][4].'" '.$visible.' '.$readonly.'>';
 			$field_module[]=$field;
 		}
-		$privilege_field[$module_name] = array_chunk($field_module,2);
+		$privilege_field[$module_name] = array_chunk($field_module,4);
 		next($fieldListResult);
 	}
 }
@@ -496,7 +496,7 @@
 				$field[]='<input type="checkbox" name="'.$fieldListResult[$module_name][$j][4].'" '.$visible.' '.$readonly.'>';
 				$field_module[]=$field;
 			}
-			$privilege_field[$module_name] = array_chunk($field_module,2);
+			$privilege_field[$module_name] = array_chunk($field_module,4);
 			next($fieldListResult);
 		}
 	}
@@ -525,7 +525,7 @@
 				$field[]='<input type="checkbox" name="'.$fieldListResult[$module_name][$j][4].'" '.$visible.' '.$readonly.'>';
 				$field_module[]=$field;
 			}
-			$privilege_field[$module_name] = array_chunk($field_module,2);
+			$privilege_field[$module_name] = array_chunk($field_module,4);
 			next($fieldListResult);
 		}	
 	}
@@ -548,7 +548,7 @@
 	}
 	elseif($id == 0)
 	{
-		$value = '<img src="'.$image_path.'yes.gif">';
+		$value = '<img src="'.$image_path.'prvPrfSelectedTick.gif">';
 	}
 	elseif($id == 1)
 	{
@@ -601,7 +601,7 @@
 	}
 	elseif($id == 0)
 	{
-		$value = '<img src="'.$image_path.'yes.gif">';
+		$value = '<img src="'.$image_path.'prvPrfSelectedTick.gif">';
 	}
 	elseif($id == 1)
 	{




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 08:51:40 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 12:51:40 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7041 -
	/vtigercrm/trunk/modules/Dashboard/index.php
Message-ID: <20060613125140.E9A277E8C68@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 13 06:51:36 2006
New Revision: 7041

Log:
changes made to include extra graphs

Modified:
    vtigercrm/trunk/modules/Dashboard/index.php

Modified: vtigercrm/trunk/modules/Dashboard/index.php
==============================================================================
--- vtigercrm/trunk/modules/Dashboard/index.php (original)
+++ vtigercrm/trunk/modules/Dashboard/index.php Tue Jun 13 06:51:36 2006
@@ -48,6 +48,8 @@
           "invoicebystatus" => $mod_strings['invoicebystatus'],
           "ticketsbystatus" => $mod_strings['ticketsbystatus'],
           "ticketsbypriority" => $mod_strings['ticketsbypriority'],
+	  "ticketsbycategory" => $mod_strings['ticketsbycategory'], 
+	  "ticketsbyowner" => $mod_strings['ticketsbyowner'],
           );
           
 $log = LoggerManager::getLogger('dashboard');




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 09:02:31 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 13:02:31 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7042 -
 /vtigercrm/trunk/modules/Dashboard/display_charts.php
Message-ID: <20060613130232.1E2CF7E8C84@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 13 07:02:28 2006
New Revision: 7042

Log:
changes made to include extra graphs

Modified:
    vtigercrm/trunk/modules/Dashboard/display_charts.php

Modified: vtigercrm/trunk/modules/Dashboard/display_charts.php
==============================================================================
--- vtigercrm/trunk/modules/Dashboard/display_charts.php (original)
+++ vtigercrm/trunk/modules/Dashboard/display_charts.php Tue Jun 13 07:02:28 2006
@@ -87,6 +87,8 @@
           "invoicebystatus" => $mod_strings['invoicebystatus'],
           "ticketsbystatus" => $mod_strings['ticketsbystatus'],
           "ticketsbypriority" => $mod_strings['ticketsbypriority'],
+	  "ticketsbycategory" => $mod_strings['ticketsbycategory'],
+	  "ticketsbyowner" => $mod_strings['ticketsbyowner'],
           );
 function get_graph_by_type($graph_by,$graph_title,$module,$where,$query)
 {
@@ -532,6 +534,26 @@
                             $query=$helpdesk_query;
                             echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
                     }
+		    //Tickets by Category
+		    elseif (($type == "ticketsbycategory") && (getFieldVisibilityPermission('HelpDesk',$user_id,'ticketcategory') == "0"))
+		    {
+			    $graph_by="category";
+			    $graph_title=$mod_strings['ticketsbycategory'];
+			    $module="HelpDesk";
+			    $where="";
+			    $query=$helpdesk_query;
+			    echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
+		    }
+		    //Tickets by Owner   
+		    elseif (($type == "ticketsbyowner") && (getFieldVisibilityPermission('HelpDesk',$user_id,'ticketowner') == "0"))
+		    {
+			    $graph_by="smownerid";
+			    $graph_title=$mod_strings['ticketsbyowner'];
+			    $module="HelpDesk";
+			    $where="";
+			    $query=$helpdesk_query;
+			    echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
+		    }
 		    else
                     {
                         echo $mod_strings['LBL_NO_PERMISSION_FIELD'];




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 09:05:17 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 13:05:17 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7043 -
	/vtigercrm/trunk/modules/Dashboard/Entity_charts.php
Message-ID: <20060613130517.055F17E8C84@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 13 07:05:14 2006
New Revision: 7043

Log:
changes made to include extra graphs

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 Tue Jun 13 07:05:14 2006
@@ -191,6 +191,12 @@
 				if($graph_for =="accountid")
 				{
 					$name_val=get_account_name($name);
+					if($name_val!="")
+						$name=$name_val;
+				}
+				if($graph_for =="smownerid")
+				{
+					$name_val=get_assigned_user_name($name);
 					if($name_val!="")
 						$name=$name_val;
 				}




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 09:08:02 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 13:08:02 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7044 -
 /vtigercrm/trunk/modules/Dashboard/language/en_us.lang.php
Message-ID: <20060613130803.17C327E8C5A@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 13 07:07:59 2006
New Revision: 7044

Log:
label added to include extra graphs

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

Modified: vtigercrm/trunk/modules/Dashboard/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Dashboard/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Dashboard/language/en_us.lang.php Tue Jun 13 07:07:59 2006
@@ -70,6 +70,8 @@
 "invoicebystatus" => "Invoices by Status",
 "ticketsbystatus" => "Tickets by Status",
 "ticketsbypriority" => "Tickets by Priority",
+"ticketsbycategory" => "Tickets by Category",
+"ticketsbyowner" => "Tickets by Owner",
 
 'LBL_DASHBRD_HOME'=>'Dashboard Home',
 'LBL_HORZ_BAR_CHART'=>'Horizontal Bar Chart',




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 09:35:45 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 13:35:45 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7045 - in
 /vtigercrm/trunk/themes/blue/images: prvPrfBgImgField.jpg
 prvPrfBgImgGlobal.jpg prvPrfBgImgStandard.jpg prvPrfBgImgTab.jpg
 prvPrfBgImgUtils.jpg
Message-ID: <20060613133545.720227E8B74@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 13 07:35:36 2006
New Revision: 7045

Log:
Added images for new UI of Settings - ahmed

Added:
    vtigercrm/trunk/themes/blue/images/prvPrfBgImgField.jpg   (with props)
    vtigercrm/trunk/themes/blue/images/prvPrfBgImgGlobal.jpg   (with props)
    vtigercrm/trunk/themes/blue/images/prvPrfBgImgStandard.jpg   (with props)
    vtigercrm/trunk/themes/blue/images/prvPrfBgImgTab.jpg   (with props)
    vtigercrm/trunk/themes/blue/images/prvPrfBgImgUtils.jpg   (with props)




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 09:55:57 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 13:55:57 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7046 - in
 /vtigercrm/trunk/modules: Leads/Lead.php Products/Product.php
Message-ID: <20060613135557.E5E817E8C8A@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 13 07:55:51 2006
New Revision: 7046

Log:
Removed the combofieldname var from module.php files - ahmed

Modified:
    vtigercrm/trunk/modules/Leads/Lead.php
    vtigercrm/trunk/modules/Products/Product.php

Modified: vtigercrm/trunk/modules/Leads/Lead.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/Lead.php (original)
+++ vtigercrm/trunk/modules/Leads/Lead.php Tue Jun 13 07:55:51 2006
@@ -36,22 +36,12 @@
 
 	var $entity_table = "vtiger_crmentity";
 	var $table_name = "vtiger_leaddetails";
-
 	var $object_name = "Lead";
-
 	var $new_schema = true;
 
 	//construct this from database;	
 	var $column_fields = Array();
-
 	var $sortby_fields = Array('lastname','firstname','email','phone','company','smownerid','website');
-
-	var $combofieldNames = Array('leadsource'=>'leadsource_dom'
-	,'salutation'=>'salutation_dom'
-	,'status'=>'leadstatus_dom'
-	,'industry'=>'industry_dom'
-	,'rating'=>'rating_dom'
-	,'licencekey'=>'licensekey_dom');
 
 	// This is used to retrieve related vtiger_fields from form posts.
 	var $additional_column_fields = Array('smcreatorid', 'smownerid', 'contactid','potentialid' ,'crmid');

Modified: vtigercrm/trunk/modules/Products/Product.php
==============================================================================
--- vtigercrm/trunk/modules/Products/Product.php (original)
+++ vtigercrm/trunk/modules/Products/Product.php Tue Jun 13 07:55:51 2006
@@ -80,9 +80,6 @@
                                         'Unit Price'=>'unit_price'
                                      );
 	
-	var $combofieldNames = Array('manufacturer'=>'manufacturer_dom'
-                      ,'productcategory'=>'productcategory_dom');
-
 	//Added these variables which are used as default order by and sortorder in ListView
 	var $default_order_by = 'productname';
 	var $default_sort_order = 'ASC';




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 10:03:02 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 14:03:02 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7047 -
	/vtigercrm/trunk/modules/Users/Announcements.php
Message-ID: <20060613140302.611B97E8C84@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 13 08:02:58 2006
New Revision: 7047

Log:
Updated the announcement file

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

Modified: vtigercrm/trunk/modules/Users/Announcements.php
==============================================================================
--- vtigercrm/trunk/modules/Users/Announcements.php (original)
+++ vtigercrm/trunk/modules/Users/Announcements.php Tue Jun 13 08:02:58 2006
@@ -9,7 +9,8 @@
  *
  ********************************************************************************/
 
-require_once('XTemplate/xtpl.php');
+require_once('Smarty_setup.php');
+
 global $adb;
 global $current_user;
 global $theme;
@@ -21,6 +22,8 @@
 $title_prev=$adb->query_result($result,0,'title');
 $id=$adb->query_result($result,0,'creatorid');
 
+$smarty = new vtigerCRM_Smarty;
+
 $smarty->assign("ANNOUNCE",$announcement);
 $smarty->assign("MOD", return_module_language($current_language,'Settings'));
 $smarty->assign("IMAGE_PATH",$image_path);




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 10:05:52 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 14:05:52 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7048 -
 /vtigercrm/trunk/Smarty/templates/Settings/Announcements.tpl
Message-ID: <20060613140552.019E67E8C92@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 13 08:05:48 2006
New Revision: 7048

Log:
updated the announcement tpl file - ahmed

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 Tue Jun 13 08:05:48 2006
@@ -1,114 +1,108 @@
-{*<!--
-/*********************************************************************************
-  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
-   * ("License"); You may not use this file except in compliance with the License
-   * The Original Code is:  vtiger CRM Open Source
-   * The Initial Developer of the Original Code is vtiger.
-   * Portions created by vtiger are Copyright (C) vtiger.
-   * All Rights Reserved.
-  *
- ********************************************************************************/
--->*}
-<script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
-{literal}
-<script>
-function Announcement()
-{
-	$("an_busy").style.display="inline";
-	var announcement=$("announcement").value;
-	new Ajax.Request(
-	'index.php',
-        {queue: {position: 'end', scope: 'command'},
-       		method: 'post',
-	        postBody: 'module=Users&action=UsersAjax&announcement='+announcement+'&announce_save=yes',
-	        onComplete: function(response) {
-					$("announcement").innerHTML=response.responseText;
-					$("an_busy").style.display="none";
-                        	}
-	        }
-	);
-}
-</script>
-{/literal}
-<style type="text/css">@import url(themes/blue/style.css);</style>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-<tr>
-	{include file='SettingsMenu.tpl'}
-<td width="75%" valign="top">
-
-<table width="100%" border="0" cellpadding="0" cellspacing="0" height="100%">
-<td class="showPanelBg" valign="top" width="100%" colspan="3" style="padding-left:20px; "><br/>
-<span class="lvtHeaderText"><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS} </a> > {$MOD.LBL_USER_MANAGEMENT} > {$MOD.LBL_ANNOUNCEMENT}</b><div id="an_busy" style="display:none;float:left;position:relative;"><img src="{$IMAGE_PATH}vtbusy.gif" align="right"></div></span>
-<hr noshade="noshade" size="1" />
-</td>
-</tr>
-<tr>
-<td width="75%" style="padding-left:20px;" valign="top">
-
-	<table align="center" border="0" cellpadding="0" cellspacing="0" width="95%">
-	<tbody><tr>
-	<td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif;" height="6" width="7"><img src="{$IMAGE_PATH}top_left.jpg" align="top"></td>
-	<td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif; height: 6px;" bgcolor="#ebebeb"></td>
-	<td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif;" height="6" width="8"><img src="{$IMAGE_PATH}top_right.jpg" align="top" height="6" width="8"></td>
-	</tr>
-	<tr>
-
-	<td bgcolor="#ebebeb" width="7"></td>
-	<td bgcolor="#ececec">
-	<table border="0" cellpadding="5" cellspacing="0" width="100%">
-	<tbody><tr bgcolor="#ffffff">
-	<td width="5%"><img src="include/images/announ.gif" align="absmiddle" hspace="5" vspace="5"></td>
-	<td width="95%">
-	<span class="genHeaderBig">{$MOD.LBL_SETTING_ANNOUNCEMENT}</span><br>
-	{$MOD.LBL_ANNOUNCEMENT_INFO}
-	</td>
-	
-	</tr>
-	<tr><td colspan="2">&nbsp;</td></tr>
-	<tr>
-	<td align="right" valign="top">&nbsp;</td>
-	<td align="left"><b>{$MOD.LBL_SETTING_ANNOUNCEMENT}</b><br>
-	<textarea id="announcement" name="announcement" class="detailedViewTextBox" rows="5">{$ANNOUNCE}</textarea>
-	</td>
-	</tr>	
-
-	<tr>
-	<td align="right" valign="top">&nbsp;</td>
-	<td align="center">
-	<input title="{$APP.LBL_SAVE_BUTTON_LABEL}" value=" &nbsp;{$APP.LBL_SAVE_BUTTON_LABEL}&nbsp; " accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="classBtn" onclick="javascript:Announcement();" type="button">
-	<input title="{$APP.LBL_CANCEL_BUTTON_LABEL}" value=" &nbsp;{$APP.LBL_CANCEL_BUTTON_LABEL}&nbsp; " accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" class="classBtn" onclick="window.history.back()" type="button">
-	</td>
-	</tr>
-	</tbody></table>
-	</td>
-	<td bgcolor="#ebebeb" width="8"></td>
-	
-	</tr>
-	<tr>
-	<td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif;" height="8" width="7"><img src="{$IMAGE_PATH}bottom_left.jpg" align="bottom"></td>
-	<td style="font-size: 1px;" bgcolor="#ececec" height="8"></td>
-	<td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif;" height="8" width="8"><img src="{$IMAGE_PATH}bottom_right.jpg" align="bottom"></td>
-	</tr>
-	</tbody></table>
-
-</td>
-<td width="1%" style="border-right:1px dotted #CCCCCC;">&nbsp;</td>
-</tr>
-</table>
-</td>
-</tr>
-</table>
-</td>
-</tr>
-</table>
-	{include file='SettingsSubMenu.tpl'}
-{literal}
-<script>
-function validate() {
-	if (!emptyCheck("server","ftp Server Name","text")) return false
-		if (!emptyCheck("server_username","ftp User Name","text")) return false
-			return true;
-
-}
-</script>
-{/literal}
+{*<!--
+/*********************************************************************************
+  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
+   * ("License"); You may not use this file except in compliance with the License
+   * The Original Code is:  vtiger CRM Open Source
+   * The Initial Developer of the Original Code is vtiger.
+   * Portions created by vtiger are Copyright (C) vtiger.
+   * All Rights Reserved.
+  *
+ ********************************************************************************/
+-->*}
+
+<script language="JAVASCRIPT" type="text/javascript" src="include/js/smoothscroll.js"></script>
+<script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
+{literal}
+<script>
+function Announcement()
+{
+	$("an_busy").style.display="inline";
+	var announcement=$("announcement").value;
+	new Ajax.Request(
+	'index.php',
+        {queue: {position: 'end', scope: 'command'},
+       		method: 'post',
+	        postBody: 'module=Users&action=UsersAjax&announcement='+announcement+'&announce_save=yes',
+	        onComplete: function(response) {
+					$("announcement").innerHTML=response.responseText;
+					$("an_busy").style.display="none";
+                        	}
+	        }
+	);
+}
+</script>
+{/literal}
+
+<br>
+<table align="center" border="0" cellpadding="0" cellspacing="0" width="98%">
+<tbody><tr>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
+        <td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
+<br>
+	<div align=center>
+	
+			{include file='SetMenu.tpl'}
+				<!-- DISPLAY -->
+				<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
+				<tr>
+					<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}announ.gif" width="48" height="48" border=0></td>
+					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > {$MOD.LBL_ANNOUNCEMENT} </b><div id="an_busy" style="display:none;float:left;position:relative;"><img src="{$IMAGE_PATH}vtbusy.gif" align="right"></div></td>
+				</tr>
+				<tr>
+					<td valign=top class="small">{$MOD.LBL_ANNOUNCEMENT_DESC} </td>
+				</tr>
+				</table>
+				
+				<br>
+				<table border=0 cellspacing=0 cellpadding=10 width=100% >
+				<tr>
+				<td>
+				
+					<table border=0 cellspacing=0 cellpadding=5 width=100% class="tableHeading">
+					<tr>
+						<td class="big"><strong>{$MOD.LBL_ANNOUNCE_TEXT}</strong></td>
+						<td class="small" align=right><input type="button" class="crmButton small save" value="{$MOD.LBL_UPDATE_BUTTON}" onclick="javascript:Announcement();"></td>
+					</tr>
+					</table>
+					
+					<table border=0 cellspacing=0 cellpadding=5 width=100% class="listTable">
+					<tr>
+						<td class="colHeader small" valign=top>{$MOD.LBL_ANNOUNCEMENT_INFO}</td>
+					  </tr>
+					<tr>
+						<td class="listTableRow small" valign=top><textarea class=small width=90% height=100px id="announcement" name="announcement">{$ANNOUNCE}</textarea></td>
+					  </tr>
+					</table>
+					<table border=0 cellspacing=0 cellpadding=5 width=100% >
+					<tr><td class="small" nowrap align=right><a href="#top">{$MOD.LBL_SCROLL}</a></td></tr>
+					</table>
+				</td>
+				</tr>
+				</table>
+			
+			
+			
+			</td>
+			</tr>
+			</table>
+		</td>
+	</tr>
+	</table>
+		
+	</div>
+
+</td>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
+   </tr>
+</tbody>
+</table>
+{literal}
+<script>
+function validate() {
+	if (!emptyCheck("server","ftp Server Name","text")) return false
+		if (!emptyCheck("server_username","ftp User Name","text")) return false
+			return true;
+
+}
+</script>
+{/literal}




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 10:28:02 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 14:28:02 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7049 - in
 /vtigercrm/trunk/modules: Activities/ Campaigns/ Emails/ Faq/ HelpDesk/
 Invoice/ Notes/ PriceBooks/ Products/ PurchaseOrder/ Quotes/ Rss/
 SalesOrder/ Vendors/
Message-ID: <20060613142802.727D47E8C84@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 13 08:27:44 2006
New Revision: 7049

Log:
Removed the junk variables from all module.php - ahmed

Modified:
    vtigercrm/trunk/modules/Activities/Activity.php
    vtigercrm/trunk/modules/Campaigns/Campaign.php
    vtigercrm/trunk/modules/Emails/Email.php
    vtigercrm/trunk/modules/Faq/Faq.php
    vtigercrm/trunk/modules/HelpDesk/HelpDesk.php
    vtigercrm/trunk/modules/Invoice/Invoice.php
    vtigercrm/trunk/modules/Notes/Note.php
    vtigercrm/trunk/modules/PriceBooks/PriceBook.php
    vtigercrm/trunk/modules/Products/Product.php
    vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php
    vtigercrm/trunk/modules/Quotes/Quote.php
    vtigercrm/trunk/modules/Rss/Rss.php
    vtigercrm/trunk/modules/SalesOrder/SalesOrder.php
    vtigercrm/trunk/modules/Vendors/Vendor.php

Modified: vtigercrm/trunk/modules/Activities/Activity.php
==============================================================================
--- vtigercrm/trunk/modules/Activities/Activity.php (original)
+++ vtigercrm/trunk/modules/Activities/Activity.php Tue Jun 13 08:27:44 2006
@@ -32,20 +32,6 @@
 	var $log;
 	var $db;
 
-	// Stored vtiger_fields
-  	var $eventid;
-	var $description;
-	var $firstname;
-	var $lastname;
-	var $setype;
-	var $status;
-	var $date_start;
-	var $time_start;
-	var $priority;
-   	var $sendnotification;
-	var $duration_hours;
-	var $duration_minutes;
-
 	var $table_name = "activity";
 	#var $object_name = "activity";	
 		// Mike Crowe Mod --------------------------------------------------------Renamed to match vtiger_tab
@@ -54,7 +40,6 @@
     var $base_table_name = "activity";
     var $cf_table_name = "";
 	var $module_id = "activityid";
-
 	
 	var $reminder_table = "activity_reminder";
 	

Modified: vtigercrm/trunk/modules/Campaigns/Campaign.php
==============================================================================
--- vtigercrm/trunk/modules/Campaigns/Campaign.php (original)
+++ vtigercrm/trunk/modules/Campaigns/Campaign.php Tue Jun 13 08:27:44 2006
@@ -25,9 +25,6 @@
 	var $log;
 	var $db;
 
-	// Stored vtiger_fields
-	var $id;
-	var $mode;
 
 	var $tab_name = Array('vtiger_crmentity','vtiger_campaign','vtiger_campaignscf');
 	var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_campaign'=>'campaignid','vtiger_campaignscf'=>'campaignid');

Modified: vtigercrm/trunk/modules/Emails/Email.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/Email.php (original)
+++ vtigercrm/trunk/modules/Emails/Email.php Tue Jun 13 08:27:44 2006
@@ -36,14 +36,6 @@
 	var $db;
 
 	// Stored vtiger_fields
-	var $id;
-	var $mode;
-
-	var $emailid;
-	var $description;
-	var $name;
-	var $date_start;
-	var $time_start;
   	var $module_id="emailid";
 
 	var $rel_users_table = "vtiger_salesmanactivityrel";

Modified: vtigercrm/trunk/modules/Faq/Faq.php
==============================================================================
--- vtigercrm/trunk/modules/Faq/Faq.php (original)
+++ vtigercrm/trunk/modules/Faq/Faq.php Tue Jun 13 08:27:44 2006
@@ -33,10 +33,6 @@
 	var $log;
 	var $db;
 
-	// Stored vtiger_fields
-	var $id;
-	var $mode;
-	
 	var $tab_name = Array('vtiger_crmentity','vtiger_faq','vtiger_faqcomments');
 	var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_faq'=>'id','vtiger_faqcomments'=>'faqid');
 				
@@ -65,9 +61,6 @@
 					'Modified Time'=>'modifiedtime' 
 				      );
 	var $list_link_field= 'question';
-
-	var $list_mode;
-        var $popup_type;
 
 	var $search_fields = Array(
 				'Account Name'=>Array('account'=>'accountname'),

Modified: vtigercrm/trunk/modules/HelpDesk/HelpDesk.php
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/HelpDesk.php (original)
+++ vtigercrm/trunk/modules/HelpDesk/HelpDesk.php Tue Jun 13 08:27:44 2006
@@ -23,11 +23,6 @@
 class HelpDesk extends CRMEntity {
 	var $log;
 	var $db;
-
-
-	// Stored vtiger_fields
-	var $id;
-	var $mode;
 
 	var $tab_name = Array('vtiger_crmentity','vtiger_troubletickets','vtiger_seticketsrel','vtiger_ticketcf','vtiger_ticketcomments','vtiger_attachments');
 	var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_troubletickets'=>'ticketid','vtiger_seticketsrel'=>'ticketid','vtiger_ticketcf'=>'ticketid','vtiger_ticketcomments'=>'ticketid','vtiger_attachments'=>'attachmentsid');

Modified: vtigercrm/trunk/modules/Invoice/Invoice.php
==============================================================================
--- vtigercrm/trunk/modules/Invoice/Invoice.php (original)
+++ vtigercrm/trunk/modules/Invoice/Invoice.php Tue Jun 13 08:27:44 2006
@@ -32,12 +32,6 @@
 class Invoice extends CRMEntity {
 	var $log;
 	var $db;
-
-
-	// Stored vtiger_fields
-	var $id;
-	var $mode;
-	
 		
 	var $table_name = "vtiger_invoice";
 	var $tab_name = Array('vtiger_crmentity','vtiger_invoice','vtiger_invoicebillads','vtiger_invoiceshipads','vtiger_invoicecf');
@@ -80,10 +74,6 @@
 				        'Assigned To'=>'assigned_user_id'
 				      );
 	var $list_link_field= 'subject';
-
-	var $record_id;
-	var $list_mode;
-        var $popup_type;
 
 	var $search_fields = Array(
 				'Invoice Id'=>Array('crmentity'=>'crmid'),

Modified: vtigercrm/trunk/modules/Notes/Note.php
==============================================================================
--- vtigercrm/trunk/modules/Notes/Note.php (original)
+++ vtigercrm/trunk/modules/Notes/Note.php Tue Jun 13 08:27:44 2006
@@ -32,22 +32,6 @@
 	var $log;
 	var $db;
 
-	// Stored vtiger_fields
-	var $id;
-        var $mode;
-
-	var $notesid;
-	var $description;
-	var $name;
-	var $filename;
-	var $parent_type;
-	var $parent_id;
-	var $contact_id;
-
-	var $parent_name;
-	var $contact_name;
-	var $contact_phone;
-	var $contact_email;
 	var $required_fields =  array("name"=>1);
 	var $default_note_name_dom = array('Meeting vtiger_notes', 'Reminder');
 

Modified: vtigercrm/trunk/modules/PriceBooks/PriceBook.php
==============================================================================
--- vtigercrm/trunk/modules/PriceBooks/PriceBook.php (original)
+++ vtigercrm/trunk/modules/PriceBooks/PriceBook.php Tue Jun 13 08:27:44 2006
@@ -21,11 +21,6 @@
 	var $log;
 	var $db;
 
-
-	// Stored vtiger_fields
-	var $id;
-	var $mode;
-
 	var $tab_name = Array('vtiger_crmentity','vtiger_pricebook','vtiger_pricebookcf');
 	var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_pricebook'=>'pricebookid','vtiger_pricebookcf'=>'pricebookid');
 	var $column_fields = Array();
@@ -42,10 +37,6 @@
                                         'Active'=>'active'
                                      );
         var $list_link_field= 'bookname';
-
-
-	var $list_mode;
-	var $popup_type;
 
 	var $search_fields = Array(
                                 'Price Book Name'=>Array('pricebook'=>'bookname')

Modified: vtigercrm/trunk/modules/Products/Product.php
==============================================================================
--- vtigercrm/trunk/modules/Products/Product.php (original)
+++ vtigercrm/trunk/modules/Products/Product.php Tue Jun 13 08:27:44 2006
@@ -21,17 +21,6 @@
 	var $log;
 	var $db;
 
-
-	// Stored vtiger_fields
-	var $id;
-	var $mode;
-
-	// These are related
-	var $name;
-	var $vendorid;
-	var $contactname;
-	var $contactid;
-	
 	 // Josh added for importing and exporting -added in patch2
         var $unit_price;
         var $table_name = "products";
@@ -64,10 +53,6 @@
                                         'Unit Price'=>'unit_price'
                                      );
         var $list_link_field= 'productname';
-
-
-	var $list_mode;
-	var $popup_type;
 
 	var $search_fields = Array(
                                 'Product Name'=>Array('products'=>'productname'),

Modified: vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php
==============================================================================
--- vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php (original)
+++ vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php Tue Jun 13 08:27:44 2006
@@ -32,17 +32,10 @@
 class Order extends CRMEntity {
 	var $log;
 	var $db;
-
-
-	// Stored vtiger_fields
-	var $id;
-	var $mode;
-	
 		
 	var $table_name = "purchaseorder";
 	var $tab_name = Array('vtiger_crmentity','vtiger_purchaseorder','vtiger_pobillads','vtiger_poshipads','vtiger_purchaseordercf');
 	var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_purchaseorder'=>'purchaseorderid','vtiger_pobillads'=>'pobilladdressid','vtiger_poshipads'=>'poshipaddressid','vtiger_purchaseordercf'=>'purchaseorderid');
-				
 	
 	var $entity_table = "vtiger_crmentity";
 	
@@ -78,10 +71,6 @@
 				        'Assigned To'=>'assigned_user_id'
 				      );
 	var $list_link_field= 'subject';
-
-	var $record_id;
-	var $list_mode;
-        var $popup_type;
 
 	var $search_fields = Array(
 				'Order Id'=>Array('crmentity'=>'crmid'),

Modified: vtigercrm/trunk/modules/Quotes/Quote.php
==============================================================================
--- vtigercrm/trunk/modules/Quotes/Quote.php (original)
+++ vtigercrm/trunk/modules/Quotes/Quote.php Tue Jun 13 08:27:44 2006
@@ -32,17 +32,10 @@
 class Quote extends CRMEntity {
 	var $log;
 	var $db;
-
-
-	// Stored vtiger_fields
-	var $id;
-	var $mode;
-	
 		
 	var $table_name = "quotes";
 	var $tab_name = Array('vtiger_crmentity','vtiger_quotes','vtiger_quotesbillads','vtiger_quotesshipads','vtiger_quotescf');
 	var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_quotes'=>'quoteid','vtiger_quotesbillads'=>'quotebilladdressid','vtiger_quotesshipads'=>'quoteshipaddressid','vtiger_quotescf'=>'quoteid');
-				
 	
 	var $entity_table = "crmentity";
 	
@@ -82,10 +75,6 @@
 				        'Assigned To'=>'assigned_user_id'
 				      );
 	var $list_link_field= 'subject';
-
-	var $record_id;
-	var $list_mode;
-        var $popup_type;
 
 	var $search_fields = Array(
 				'Quote Id'=>Array('crmentity'=>'crmid'),

Modified: vtigercrm/trunk/modules/Rss/Rss.php
==============================================================================
--- vtigercrm/trunk/modules/Rss/Rss.php (original)
+++ vtigercrm/trunk/modules/Rss/Rss.php Tue Jun 13 08:27:44 2006
@@ -27,12 +27,7 @@
 
 class vtigerRSS extends CRMEntity
 {
-	var $rss;
 	var $rsscache_time = 1200;
-	var $rss_object;
-	var $rss_title;
-	var $rss_link;
-
 	
 	/** Function to get the Rss Feeds from the Given URL 
 	  * This Function accepts the url string as the argument 

Modified: vtigercrm/trunk/modules/SalesOrder/SalesOrder.php
==============================================================================
--- vtigercrm/trunk/modules/SalesOrder/SalesOrder.php (original)
+++ vtigercrm/trunk/modules/SalesOrder/SalesOrder.php Tue Jun 13 08:27:44 2006
@@ -33,16 +33,9 @@
 	var $log;
 	var $db;
 
-
-	// Stored vtiger_fields
-	var $id;
-	var $mode;
-	
-		
 	var $table_name = "salesorder";
 	var $tab_name = Array('vtiger_crmentity','vtiger_salesorder','vtiger_sobillads','vtiger_soshipads','vtiger_salesordercf');
 	var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_salesorder'=>'salesorderid','vtiger_sobillads'=>'sobilladdressid','vtiger_soshipads'=>'soshipaddressid','vtiger_salesordercf'=>'salesorderid');
-				
 	
 	var $entity_table = "crmentity";
 	
@@ -80,10 +73,6 @@
 				        'Assigned To'=>'assigned_user_id'
 				      );
 	var $list_link_field= 'subject';
-
-	var $record_id;
-	var $list_mode;
-        var $popup_type;
 
 	var $search_fields = Array(
 				'Order Id'=>Array('crmentity'=>'crmid'),

Modified: vtigercrm/trunk/modules/Vendors/Vendor.php
==============================================================================
--- vtigercrm/trunk/modules/Vendors/Vendor.php (original)
+++ vtigercrm/trunk/modules/Vendors/Vendor.php Tue Jun 13 08:27:44 2006
@@ -21,11 +21,6 @@
 	var $log;
 	var $db;
 
-
-	// Stored vtiger_fields
-	var $id;
-	var $mode;
-
 	var $tab_name = Array('vtiger_crmentity','vtiger_vendor','vtiger_vendorcf');
 	var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_vendor'=>'vendorid','vtiger_vendorcf'=>'vendorid');
 	var $column_fields = Array();
@@ -46,10 +41,6 @@
                                         'Category'=>'category'
                                      );
         var $list_link_field= 'vendorname';
-
-
-	var $list_mode;
-	var $popup_type;
 
 	var $search_fields = Array(
                                 'Vendor Name'=>Array('vendor'=>'vendorname'),




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 10:59:28 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 14:59:28 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7050 - in /vtigercrm/trunk:
 data/CRMEntity.php index.php install/5createTables.inc.php
 modules/Users/User.php
Message-ID: <20060613145929.5CB9F7E8C98@vtiger.fosslabs.com>

Author: don
Date: Tue Jun 13 08:59:21 2006
New Revision: 7050

Log:
issues in users has been fixed

Modified:
    vtigercrm/trunk/data/CRMEntity.php
    vtigercrm/trunk/index.php
    vtigercrm/trunk/install/5createTables.inc.php
    vtigercrm/trunk/modules/Users/User.php

Modified: vtigercrm/trunk/data/CRMEntity.php
==============================================================================
--- vtigercrm/trunk/data/CRMEntity.php (original)
+++ vtigercrm/trunk/data/CRMEntity.php Tue Jun 13 08:59:21 2006
@@ -26,7 +26,7 @@
 require_once('include/utils/utils.php');
 require_once('include/utils/UserInfoUtil.php');
 
-class CRMEntity extends SugarBean
+class CRMEntity
 {
   /**
    * This method implements a generic insert and update logic for any SugarBean
@@ -526,20 +526,22 @@
 	  if($insertion_mode == 'edit')
 	  {
 		  $update = '';
+		  $tabid= getTabid($module);	
+		  $sql = "select * from vtiger_field where tabid=".$tabid." and tablename='".$table_name."' and displaytype in (1,3)"; 
 	  }
 	  else
 	  {
 		  $column = $this->tab_name_index[$table_name];
-		  if($column == 'id' && $table_name == 'users')
-		  {
-		 	$currentuser_id = $adb->getUniqueID("users");
+		  if($column == 'id' && $table_name == 'vtiger_users')
+		  {
+		 	$currentuser_id = $adb->getUniqueID("vtiger_users");
 			$this->id = $currentuser_id;
 		  }
 		  $value = $this->id;
+	  	  $tabid= getTabid($module);	
+		  $sql = "select * from vtiger_field where tabid=".$tabid." and tablename='".$table_name."' and displaytype in (1,3,4)"; 
 	  }
 
-	  $tabid= getTabid($module);	
-	  $sql = "select * from vtiger_field where tabid=".$tabid." and tablename='".$table_name."' and displaytype in (1,3)"; 
 	  $result = $adb->query($sql);
 	  $noofrows = $adb->num_rows($result);
 	  for($i=0; $i<$noofrows; $i++)

Modified: vtigercrm/trunk/index.php
==============================================================================
--- vtigercrm/trunk/index.php (original)
+++ vtigercrm/trunk/index.php Tue Jun 13 08:59:21 2006
@@ -482,7 +482,7 @@
 	if(isset($_REQUEST['record']) && $_REQUEST['record']!='' && $_REQUEST["module"] != "Webmails") 
         {
                 // Only track a viewing if the record was retrieved.
-                $focus->track_view($current_user->id, $actualModule,$_REQUEST['record']);
+                //$focus->track_view($current_user->id, $actualModule,$_REQUEST['record']);
         }
 
 }	

Modified: vtigercrm/trunk/install/5createTables.inc.php
==============================================================================
--- vtigercrm/trunk/install/5createTables.inc.php (original)
+++ vtigercrm/trunk/install/5createTables.inc.php Tue Jun 13 08:59:21 2006
@@ -89,7 +89,7 @@
 	$admin_email ="admin at administrator.com";
         $user->column_fields["email"] = $admin_email;
 	//to get the role id for standard_user	
-	$role_query = "select roleid from role where rolename='administrator'";
+	$role_query = "select roleid from vtiger_role where rolename='administrator'";
 	$db->database->SetFetchMode(ADODB_FETCH_ASSOC);
 	$role_result = $db->query($role_query);
 	$role_id = $db->query_result($role_result,0,"roleid");
@@ -160,7 +160,7 @@
 else
 	eecho("Tables Successfully created.\n");
 
-foreach ( $modules as $module ) 
+foreach ($modules as $module ) 
 {
 	$focus = new $module();
 	$focus->create_tables();
@@ -178,17 +178,18 @@
 $combo = new PopulateComboValues();
 $combo->create_tables();
 
-create_default_users();
-
-// default report population
-require_once('modules/Reports/PopulateReports.php');
-
-// default customview population
-require_once('modules/CustomView/PopulateCustomView.php');
-
 //Writing tab data in flat file
 create_tab_data_file();
 create_parenttab_data_file();
+
+create_default_users();
+
+// default report population
+require_once('modules/Reports/PopulateReports.php');
+
+// default customview population
+require_once('modules/CustomView/PopulateCustomView.php');
+
 
 // ensure required sequences are created (adodb creates them as needed, but if
 // creation occurs within a transaction we get problems

Modified: vtigercrm/trunk/modules/Users/User.php
==============================================================================
--- vtigercrm/trunk/modules/Users/User.php (original)
+++ vtigercrm/trunk/modules/Users/User.php Tue Jun 13 08:59:21 2006
@@ -87,7 +87,7 @@
 	var $tab_name = Array('vtiger_users','vtiger_attachments','vtiger_user2role');	
 	var $tab_name_index = Array('vtiger_users'=>'id','vtiger_attachments'=>'attachmentsid','vtiger_user2role'=>'userid');
 	var $column_fields = Array();
-	var $table_name = "users";
+	var $table_name = "vtiger_users";
 	var $sortby_fields = Array();		  
 	
     // This is the list of fields that are in the lists.
@@ -201,6 +201,7 @@
 		$encrypted_password = crypt($user_password, $salt);	
 
 		return $encrypted_password;
+
 	}
 	
 	function authenticate_user($password){
@@ -486,9 +487,9 @@
 	  $theme_path="themes/".$theme."/";
 	  $image_path=$theme_path."images/";
 	  if($sorder != '' && $orderby !='')
-	  $list_query = ' SELECT * from users where deleted=0 order by '.$orderby.' '.$sorder;
+	  $list_query = ' SELECT * from vtiger_users where deleted=0 order by '.$orderby.' '.$sorder;
 	  else
-	  $list_query = "SELECT * from users where deleted=0 order by ".$this->default_order_by." ".$this->default_sort_order;
+	  $list_query = "SELECT * from vtiger_users where deleted=0 order by ".$this->default_order_by." ".$this->default_sort_order;
 	  $result =$adb->query($list_query);
 	  $entries_list = array();
 	  $roleinfo = getAllRoleDetails();




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 11:01:02 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 15:01:02 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7051 -
	/vtigercrm/trunk/modules/Dashboard/index.php
Message-ID: <20060613150102.400127E8C98@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 13 09:00:58 2006
New Revision: 7051

Log:
changes made to include extra graphs

Modified:
    vtigercrm/trunk/modules/Dashboard/index.php

Modified: vtigercrm/trunk/modules/Dashboard/index.php
==============================================================================
--- vtigercrm/trunk/modules/Dashboard/index.php (original)
+++ vtigercrm/trunk/modules/Dashboard/index.php Tue Jun 13 09:00:58 2006
@@ -37,8 +37,11 @@
           "leadindustry" => $mod_strings['leadindustry'],
           "salesbyleadsource" => $mod_strings['salesbyleadsource'],
           "salesbyaccount" => $mod_strings['salesbyaccount'],
+	  "salesbyuser" => $mod_strings['salesbyuser'],
+	  "salesbyteam" => $mod_strings['salesbyteam'],
           "accountindustry" => $mod_strings['accountindustry'],
           "productcategory" => $mod_strings['productcategory'],
+	  "productbyqtyinstock" => $mod_strings['productbyqtyinstock'],
           "sobyaccounts" => $mod_strings['sobyaccounts'],
           "sobystatus" => $mod_strings['sobystatus'],
           "pobystatus" => $mod_strings['pobystatus'],
@@ -50,6 +53,7 @@
           "ticketsbypriority" => $mod_strings['ticketsbypriority'],
 	  "ticketsbycategory" => $mod_strings['ticketsbycategory'], 
 	  "ticketsbyowner" => $mod_strings['ticketsbyowner'],
+	  "ticketsbyproduct"=> $mod_strings['ticketsbyproduct'],
           );
           
 $log = LoggerManager::getLogger('dashboard');




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 11:04:32 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 15:04:32 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7052 -
 /vtigercrm/trunk/modules/Users/language/en_us.lang.php
Message-ID: <20060613150432.618CF7E8C9D@vtiger.fosslabs.com>

Author: don
Date: Tue Jun 13 09:04:28 2006
New Revision: 7052

Log:
language strings added

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

Modified: vtigercrm/trunk/modules/Users/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Users/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Users/language/en_us.lang.php Tue Jun 13 09:04:28 2006
@@ -499,8 +499,43 @@
 'LBL_FIELDS_SELECT_DESELECT'=>'Select or De-Select fields to be shown',
 'LBL_ROLE_TO_BE_DELETED'=>'Role to be Deleted',
 'LBL_TRANSFER_USER_ROLE'=>'Transfer Users to Role',
-'LBL_DELETE_ROLE'=>'Delete Role'
-
+'LBL_DELETE_ROLE'=>'Delete Role',
+'LBL_MORE_INFORMATION'=>'More Information',
+'LBL_USERLOGIN_ROLE'=>'User Login & Role',
+
+//Added for 5.0 for all fields
+'Role'=>'Role',
+'Email'=>'Email',
+'Admin'=>'Admin',
+'User Name'=>'User Name',
+'First Name'=>'First Name',
+'Last Name'=>'Last Name',
+'Status'=>'Status',
+'Default Activity View'=>'Default Activity View',
+'Default Lead View'=>'Default Lead View',
+'Currency'=>'Currency',
+'Title'=>'Title',
+'Office Phone'=>'Office Phone',
+'Department'=>'Department',
+'Mobile'=>'Mobile',
+'Reports To'=>'Reports To',
+'Other Phone'=>'Other Phone',
+'Other Email'=>'Other Email',
+'Fax'=>'Fax',
+'Yahoo id'=>'Yahoo id',
+'Home Phone'=>'Home Phone',
+'User Image'=>'User Image',
+'Date Format'=>'Date Format',
+'Tag Cloud'=>'Tag Cloud',
+'Signature'=>'Signature',
+'Notes'=>'Notes',
+'Street Address'=>'Street Address',
+'City'=>'City',
+'State'=>'State',
+'Postal Code'=>'Postal Code',
+'Country'=>'Country',
+'Password'=>'Password',
+'Confirm Password'=>'Confirm Password',
 
 );
 




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 11:10:55 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 15:10:55 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7053 -
 /vtigercrm/trunk/modules/Dashboard/display_charts.php
Message-ID: <20060613151055.98D0E7E8C84@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 13 09:10:52 2006
New Revision: 7053

Log:
changes made to include extra graphs

Modified:
    vtigercrm/trunk/modules/Dashboard/display_charts.php

Modified: vtigercrm/trunk/modules/Dashboard/display_charts.php
==============================================================================
--- vtigercrm/trunk/modules/Dashboard/display_charts.php (original)
+++ vtigercrm/trunk/modules/Dashboard/display_charts.php Tue Jun 13 09:10:52 2006
@@ -76,8 +76,11 @@
           "leadindustry" => $mod_strings['leadindustry'],
           "salesbyleadsource" => $mod_strings['salesbyleadsource'],
           "salesbyaccount" => $mod_strings['salesbyaccount'],
+	  "salesbyuser" => $mod_strings['salesbyuser'],
+	  "salesbyteam" => $mod_strings['salesbyteam'],
           "accountindustry" => $mod_strings['accountindustry'],
           "productcategory" => $mod_strings['productcategory'],
+	  "productbyqtyinstock" => $mod_strings['productbyqtyinstock'],
           "sobyaccounts" => $mod_strings['sobyaccounts'],
           "sobystatus" => $mod_strings['sobystatus'],
           "pobystatus" => $mod_strings['pobystatus'],
@@ -89,6 +92,7 @@
           "ticketsbypriority" => $mod_strings['ticketsbypriority'],
 	  "ticketsbycategory" => $mod_strings['ticketsbycategory'],
 	  "ticketsbyowner" => $mod_strings['ticketsbyowner'],
+	  "ticketsbyproduct"=> $mod_strings['ticketsbyproduct'],
           );
 function get_graph_by_type($graph_by,$graph_title,$module,$where,$query)
 {
@@ -424,6 +428,26 @@
                          $query=$potential_query;
                          echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
                     }
+		    //Sales by User
+		    elseif (($type == "salesbyuser") && (getFieldVisibilityPermission('Potentials',$user_id,'smownerid') == "0"))
+		    {
+			$graph_by="smownerid";
+			$graph_title=$mod_strings['salesbyuser'];
+			$module="Potentials";
+			$where="";
+			$query=$potential_query;
+			echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
+		    }
+		    //Sales by team
+		    elseif (($type == "salesbyteam") && (getFieldVisibilityPermission('Potentials',$user_id,'groupname') == "0"))
+		    {
+			$graph_by="groupname";
+			$graph_title=$mod_strings['salesbyteam'];
+			$module="Potentials";
+			$where="";
+			$query=$potential_query;
+			echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
+		    }
                     //Charts for Account by Industry
                     elseif (($type == "accountindustry") && (getFieldVisibilityPermission('Accounts',$user_id,'industry') == "0"))
                     {
@@ -444,6 +468,17 @@
                             $query=$products_query;
                             echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
                     }
+		    //Charts for Products by Quantity in stock
+		    elseif (($type == "productbyqtyinstock") && (getFieldVisibilityPermission('Products',$user_id,'productqtyinstock') == "0"))
+		    {
+			$graph_by="qtyinstock";
+			    $graph_title=$mod_strings['productbyqtyinstock'];
+			    $module="Products";
+			    $where="";
+			    $query=$products_query;
+			    echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
+		    }
+
                     // Sales Order by Accounts
                     elseif (($type == "sobyaccounts") && (getFieldVisibilityPermission('SalesOrder',$user_id,'account_id') == "0"))
                     {
@@ -554,6 +589,16 @@
 			    $query=$helpdesk_query;
 			    echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
 		    }
+		    //Tickets by Product
+		    elseif (($type == "ticketsbyproduct") && (getFieldVisibilityPermission('HelpDesk',$user_id,'ticketproduct') == "0"))
+		    {
+			    $graph_by="product_id";
+			    $graph_title=$mod_strings['ticketsbyproduct'];
+			    $module="HelpDesk";
+			    $where="";
+			    $query=$helpdesk_query;
+			    echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
+		    }
 		    else
                     {
                         echo $mod_strings['LBL_NO_PERMISSION_FIELD'];




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 11:15:56 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 15:15:56 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7054 -
	/vtigercrm/trunk/modules/Dashboard/Entity_charts.php
Message-ID: <20060613151556.C5C677E8CA5@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 13 09:15:53 2006
New Revision: 7054

Log:
changes made to include extra graphs

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 Tue Jun 13 09:15:53 2006
@@ -199,6 +199,14 @@
 					$name_val=get_assigned_user_name($name);
 					if($name_val!="")
 						$name=$name_val;
+				}
+				if($graph_for =="product_id")
+				{
+					$query = "SELECT productname FROM vtiger_products WHERE productid=".$name;
+					$result = $adb->query($query);
+					$name_val = $adb->query_result($result,0,"productname");
+					if($name_val!="")
+					$name=$name_val;
 				}
 				//Passing name to graph
 				if($mod_name_val!="") $mod_name_val.=",$name";




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 11:21:01 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 15:21:01 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7055 -
 /vtigercrm/trunk/modules/Dashboard/language/en_us.lang.php
Message-ID: <20060613152101.563327E8CAB@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 13 09:20:57 2006
New Revision: 7055

Log:
label added to include extra graphs

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

Modified: vtigercrm/trunk/modules/Dashboard/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Dashboard/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Dashboard/language/en_us.lang.php Tue Jun 13 09:20:57 2006
@@ -59,8 +59,11 @@
 "leadindustry" => "Leads By Industry",
 "salesbyleadsource" => "Sales by LeadSource",
 "salesbyaccount" => "Sales by Accounts",
+"salesbyuser" => "Sales by User",
+"salesbyteam"=>"Sales by Team",
 "accountindustry" => "Account By Industry",
 "productcategory" => "Products by Category",
+"productbyqtyinstock" => "Products by Quantity in stock",
 "sobyaccounts" => "Sales Order by Accounts",
 "sobystatus" => "Sales Order by Status",
 "pobystatus" => "Purchase Order by Status",
@@ -72,6 +75,7 @@
 "ticketsbypriority" => "Tickets by Priority",
 "ticketsbycategory" => "Tickets by Category",
 "ticketsbyowner" => "Tickets by Owner",
+"ticketsbyproduct"=>"Tickets by Product",
 
 'LBL_DASHBRD_HOME'=>'Dashboard Home',
 'LBL_HORZ_BAR_CHART'=>'Horizontal Bar Chart',




From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 13 12:10:00 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 13 Jun 2006 16:10:00 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231271=3A?=
 =?utf-8?q?_Organisation_wont_save_when_containt_=27?=
In-Reply-To: <076.62b916cddc422a4f2f6a8828de68207a@vtiger.fosslabs.com>
References: <076.62b916cddc422a4f2f6a8828de68207a@vtiger.fosslabs.com>
Message-ID: <085.dcf5c62f2bef382f7b7be11b55b002d3@vtiger.fosslabs.com>

#1271: Organisation wont save when containt '
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  allanbush          
      Type:  defect     |      Status:  closed             
  Priority:  major      |   Milestone:  5.0.0              
 Component:  vtigercrm  |     Version:  5.0.0              
Resolution:  fixed      |    Keywords:  organisation, quote
------------------------+---------------------------------------------------
Changes (by allanbush):

  * resolution:  => fixed
  * status:  reopened => closed

Comment:

 (In [7056]) Fixes #1271.  Using the instance quote method from adodb
 instead of the static one as the instance knows the database type and can
 do the correct thing.

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1271>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 12:10:01 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 16:10:01 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7056 - in
 /vtigercrm/branches/4.2: include/database/PearDatabase.php
 modules/Settings/add2db.php
Message-ID: <20060613161001.1AC507E8CB6@vtiger.fosslabs.com>

Author: allanbush
Date: Tue Jun 13 10:09:56 2006
New Revision: 7056

Log:
Fixes #1271.  Using the instance quote method from adodb instead of the static one as the instance knows the database type and can do the correct thing.

Modified:
    vtigercrm/branches/4.2/include/database/PearDatabase.php
    vtigercrm/branches/4.2/modules/Settings/add2db.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 Jun 13 10:09:56 2006
@@ -744,20 +744,8 @@
         }
 }
 
-/* ADODB converted	
 function quote($string){
-	global $dbconfig;
-	if($dbconfig['db_type'] == 'mysql'){
-		$string = mysql_escape_string($string);
-	}else {$string = quoteSmart($string);}
-	}else {$string = $this->database->qstr($string,get_magic_quotes_gpc());}
-	//$string = strtr($string, array('_' => '\_', '%'=>'\%'));
-	return $string;
-}*/
-
-
-function quote($string){
-	return ADOConnection::qstr($string);	
+	return $this->database->qstr($string);	
 }
 
 

Modified: vtigercrm/branches/4.2/modules/Settings/add2db.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Settings/add2db.php (original)
+++ vtigercrm/branches/4.2/modules/Settings/add2db.php Tue Jun 13 10:09:56 2006
@@ -112,7 +112,7 @@
 
 	$sql="SELECT * FROM organizationdetails WHERE organizationame = ".$adb->quote($org_name);
 	$result = $adb->query($sql);
-	$org_name = $adb->query_result($result,0,'organizationame');
+	$org_name = from_html($adb->query_result($result,0,'organizationame'));
 	$org_logo = $adb->query_result($result,0,'logoname'); 
 
 




From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 13 12:18:00 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 13 Jun 2006 16:18:00 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231271=3A?=
 =?utf-8?q?_Organisation_wont_save_when_containt_=27?=
In-Reply-To: <076.62b916cddc422a4f2f6a8828de68207a@vtiger.fosslabs.com>
References: <076.62b916cddc422a4f2f6a8828de68207a@vtiger.fosslabs.com>
Message-ID: <085.b29d7929aae0fa125a785c95707c503a@vtiger.fosslabs.com>

#1271: Organisation wont save when containt '
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  allanbush          
      Type:  defect     |      Status:  closed             
  Priority:  major      |   Milestone:  5.0.0              
 Component:  vtigercrm  |     Version:  5.0.0              
Resolution:  fixed      |    Keywords:  organisation, quote
------------------------+---------------------------------------------------
Comment (by allanbush):

 (In [7057]) Fixes #1271.  Using the instance quote method from adodb
 instead of the static one as the instance knows the database type and can
 do the correct thing.

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1271>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 12:18:00 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 16:18:00 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7057 - in /vtigercrm/trunk:
 include/database/PearDatabase.php modules/Settings/add2db.php
Message-ID: <20060613161801.176A47E8CBA@vtiger.fosslabs.com>

Author: allanbush
Date: Tue Jun 13 10:17:58 2006
New Revision: 7057

Log:
Fixes #1271.  Using the instance quote method from adodb instead of the static one as the instance knows the database type and can do the correct thing.

Modified:
    vtigercrm/trunk/include/database/PearDatabase.php
    vtigercrm/trunk/modules/Settings/add2db.php

Modified: vtigercrm/trunk/include/database/PearDatabase.php
==============================================================================
--- vtigercrm/trunk/include/database/PearDatabase.php (original)
+++ vtigercrm/trunk/include/database/PearDatabase.php Tue Jun 13 10:17:58 2006
@@ -742,20 +742,8 @@
         }
 }
 
-/* ADODB converted	
 function quote($string){
-	global $dbconfig;
-	if($dbconfig['db_type'] == 'mysql'){
-		$string = mysql_escape_string($string);
-	}else {$string = quoteSmart($string);}
-	}else {$string = $this->database->qstr($string,get_magic_quotes_gpc());}
-	//$string = strtr($string, array('_' => '\_', '%'=>'\%'));
-	return $string;
-}*/
-
-
-function quote($string){
-	return ADOConnection::qstr($string);	
+	return $this->database->qstr($string);	
 }
 
 

Modified: vtigercrm/trunk/modules/Settings/add2db.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/add2db.php (original)
+++ vtigercrm/trunk/modules/Settings/add2db.php Tue Jun 13 10:17:58 2006
@@ -101,7 +101,7 @@
 
 		$sql="SELECT * FROM vtiger_organizationdetails WHERE organizationame = ".$adb->quote($org_name);
 		$result = $adb->query($sql);
-		$org_name = $adb->query_result($result,0,'organizationame');
+		$org_name = from_html($adb->query_result($result,0,'organizationame'));
 		$org_logo = $adb->query_result($result,0,'logoname'); 
 
 




From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 13 12:36:31 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 13 Jun 2006 16:36:31 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231283=3A?=
 =?utf-8?q?_Issue_in_Related_List_Sorting?=
In-Reply-To: <076.eb979459170c63c66e73d114d83eb936@vtiger.fosslabs.com>
References: <076.eb979459170c63c66e73d114d83eb936@vtiger.fosslabs.com>
Message-ID: <085.4e81f262300e17a04febc9d035f550fe@vtiger.fosslabs.com>

#1283: Issue in Related List Sorting
------------------------+---------------------------------------------------
  Reporter:  saraj      |       Owner:  saraj               
      Type:  defect     |      Status:  closed              
  Priority:  major      |   Milestone:                      
 Component:  vtigercrm  |     Version:  5.0.0               
Resolution:  fixed      |    Keywords:  sorting related list
------------------------+---------------------------------------------------
Changes (by saraj):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 (In [7058]) Issue in related list sorting fixed. Fixes #1283

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1283>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 12:36:31 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 13 Jun 2006 16:36:31 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7058 - in
 /vtigercrm/trunk/modules: HelpDesk/ Invoice/ Potentials/ PriceBooks/
 Products/ PurchaseOrder/ Quotes/ SalesOrder/
Message-ID: <20060613163632.CBA527E8CBE@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 13 10:36:15 2006
New Revision: 7058

Log:
Issue in related list sorting fixed. Fixes #1283

Modified:
    vtigercrm/trunk/modules/HelpDesk/HelpDesk.php
    vtigercrm/trunk/modules/HelpDesk/ListView.php
    vtigercrm/trunk/modules/Invoice/Invoice.php
    vtigercrm/trunk/modules/Invoice/ListView.php
    vtigercrm/trunk/modules/Potentials/ListView.php
    vtigercrm/trunk/modules/Potentials/Opportunity.php
    vtigercrm/trunk/modules/PriceBooks/ListView.php
    vtigercrm/trunk/modules/PriceBooks/PriceBook.php
    vtigercrm/trunk/modules/Products/ListView.php
    vtigercrm/trunk/modules/Products/Product.php
    vtigercrm/trunk/modules/PurchaseOrder/ListView.php
    vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php
    vtigercrm/trunk/modules/Quotes/ListView.php
    vtigercrm/trunk/modules/Quotes/Quote.php
    vtigercrm/trunk/modules/SalesOrder/ListView.php
    vtigercrm/trunk/modules/SalesOrder/SalesOrder.php

Modified: vtigercrm/trunk/modules/HelpDesk/HelpDesk.php
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/HelpDesk.php (original)
+++ vtigercrm/trunk/modules/HelpDesk/HelpDesk.php Tue Jun 13 10:36:15 2006
@@ -80,6 +80,31 @@
 		$this->column_fields = getColumnFields('HelpDesk');
 		$this->log->debug("Exiting HelpDesk method ...");
 	}
+
+	// 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['HELPDESK_SORT_ORDER'] != '')?($_SESSION['HELPDESK_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['HELPDESK_ORDER_BY'] != '')?($_SESSION['HELPDESK_ORDER_BY']):($this->default_order_by));
+		$log->debug("Exiting getOrderBy method ...");
+		return $order_by;
+	}	
 
 	/**     Function to form the query to get the list of activities
          *      @param  int $id - ticket id

Modified: vtigercrm/trunk/modules/HelpDesk/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/ListView.php (original)
+++ vtigercrm/trunk/modules/HelpDesk/ListView.php Tue Jun 13 10:36:15 2006
@@ -53,15 +53,8 @@
 $url_string = ''; // assigning http url string
 
 //<<<<<<<<<<<<<<<<<<< sorting - stored in session >>>>>>>>>>>>>>>>>>>>
-if($_REQUEST['order_by'] != '')
-	$order_by = $_REQUEST['order_by'];
-else
-	$order_by = (($_SESSION['HELPDESK_ORDER_BY'] != '')?($_SESSION['HELPDESK_ORDER_BY']):($focus->default_order_by));
-
-if($_REQUEST['sorder'] != '')
-	$sorder = $_REQUEST['sorder'];
-else
-	$sorder = (($_SESSION['HELPDESK_SORT_ORDER'] != '')?($_SESSION['HELPDESK_SORT_ORDER']):($focus->default_sort_order));
+$sorder = $focus->getSortOrder();
+$order_by = $focus->getOrderBy();
 
 $_SESSION['HELPDESK_ORDER_BY'] = $order_by;
 $_SESSION['HELPDESK_SORT_ORDER'] = $sorder;

Modified: vtigercrm/trunk/modules/Invoice/Invoice.php
==============================================================================
--- vtigercrm/trunk/modules/Invoice/Invoice.php (original)
+++ vtigercrm/trunk/modules/Invoice/Invoice.php Tue Jun 13 10:36:15 2006
@@ -99,6 +99,31 @@
 		$this->column_fields = getColumnFields('Invoice');
 		$this->log->debug("Exiting Invoice method ...");
 	}
+
+	// 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['INVOICE_SORT_ORDER'] != '')?($_SESSION['INVOICE_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['INVOICE_ORDER_BY'] != '')?($_SESSION['INVOICE_ORDER_BY']):($this->default_order_by));
+		$log->debug("Exiting getOrderBy method ...");
+		return $order_by;
+	}	
 
 	function get_summary_text()
 	{

Modified: vtigercrm/trunk/modules/Invoice/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Invoice/ListView.php (original)
+++ vtigercrm/trunk/modules/Invoice/ListView.php Tue Jun 13 10:36:15 2006
@@ -55,15 +55,8 @@
         $smarty->assign("ERROR","");
 }
 //<<<<<<<<<<<<<<<<<<< sorting - stored in session >>>>>>>>>>>>>>>>>>>>
-if($_REQUEST['order_by'] != '')
-	$order_by = $_REQUEST['order_by'];
-else
-	$order_by = (($_SESSION['INVOICE_ORDER_BY'] != '')?($_SESSION['INVOICE_ORDER_BY']):($focus->default_order_by));
-
-if($_REQUEST['sorder'] != '')
-	$sorder = $_REQUEST['sorder'];
-else
-	$sorder = (($_SESSION['INVOICE_SORT_ORDER'] != '')?($_SESSION['INVOICE_SORT_ORDER']):($focus->default_sort_order));
+$sorder = $focus->getSortOrder();
+$order_by = $focus->getOrderBy();
 
 $_SESSION['INVOICE_ORDER_BY'] = $order_by;
 $_SESSION['INVOICE_SORT_ORDER'] = $sorder;

Modified: vtigercrm/trunk/modules/Potentials/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Potentials/ListView.php (original)
+++ vtigercrm/trunk/modules/Potentials/ListView.php Tue Jun 13 10:36:15 2006
@@ -57,15 +57,8 @@
         $smarty->assign("ERROR","");
 }
 //<<<<<<<<<<<<<<<<<<< sorting - stored in session >>>>>>>>>>>>>>>>>>>>
-if($_REQUEST['order_by'] != '')
-	$order_by = $_REQUEST['order_by'];
-else
-	$order_by = (($_SESSION['POTENTIALS_ORDER_BY'] != '')?($_SESSION['POTENTIALS_ORDER_BY']):($focus->default_order_by));
-
-if($_REQUEST['sorder'] != '')
-	$sorder = $_REQUEST['sorder'];
-else
-	$sorder = (($_SESSION['POTENTIALS_SORT_ORDER'] != '')?($_SESSION['POTENTIALS_SORT_ORDER']):($focus->default_sort_order));
+$sorder = $focus->getSortOrder();
+$order_by = $focus->getOrderBy();
 
 $_SESSION['POTENTIALS_ORDER_BY'] = $order_by;
 $_SESSION['POTENTIALS_SORT_ORDER'] = $sorder;

Modified: vtigercrm/trunk/modules/Potentials/Opportunity.php
==============================================================================
--- vtigercrm/trunk/modules/Potentials/Opportunity.php (original)
+++ vtigercrm/trunk/modules/Potentials/Opportunity.php Tue Jun 13 10:36:15 2006
@@ -102,6 +102,30 @@
 	}
 
 	var $new_schema = true;
+	
+	function getSortOrder()
+	{
+		global $log;
+                $log->debug("Entering getSortOrder() method ...");	
+		if(isset($_REQUEST['sorder'])) 
+			$sorder = $_REQUEST['sorder'];
+		else
+			$sorder = (($_SESSION['POTENTIALS_SORT_ORDER'] != '')?($_SESSION['POTENTIALS_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['POTENTIALS_ORDER_BY'] != '')?($_SESSION['POTENTIALS_ORDER_BY']):($this->default_order_by));
+		$log->debug("Exiting getOrderBy method ...");
+		return $order_by;
+	}	
 
 	function create_list_query($order_by, $where)
 	{

Modified: vtigercrm/trunk/modules/PriceBooks/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/PriceBooks/ListView.php (original)
+++ vtigercrm/trunk/modules/PriceBooks/ListView.php Tue Jun 13 10:36:15 2006
@@ -54,15 +54,8 @@
 if (!isset($where)) $where = "";
 
 //<<<<<<<<<<<<<<<<<<< sorting - stored in session >>>>>>>>>>>>>>>>>>>>
-if($_REQUEST['order_by'] != '')
-	$order_by = $_REQUEST['order_by'];
-else
-	$order_by = (($_SESSION['PRICEBOOK_ORDER_BY'] != '')?($_SESSION['PRICEBOOK_ORDER_BY']):($focus->default_order_by));
-
-if($_REQUEST['sorder'] != '')
-	$sorder = $_REQUEST['sorder'];
-else
-	$sorder = (($_SESSION['PRICEBOOK_SORT_ORDER'] != '')?($_SESSION['PRICEBOOK_SORT_ORDER']):($focus->default_sort_order));
+$sorder = $focus->getSortOrder();
+$order_by = $focus->getOrderBy();
 
 $_SESSION['PRICEBOOK_ORDER_BY'] = $order_by;
 $_SESSION['PRICEBOOK_SORT_ORDER'] = $sorder;

Modified: vtigercrm/trunk/modules/PriceBooks/PriceBook.php
==============================================================================
--- vtigercrm/trunk/modules/PriceBooks/PriceBook.php (original)
+++ vtigercrm/trunk/modules/PriceBooks/PriceBook.php Tue Jun 13 10:36:15 2006
@@ -57,6 +57,31 @@
 		$this->log->debug("Exiting PriceBook method ...");
 	}
 
+	// 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['PRICEBOOK_SORT_ORDER'] != '')?($_SESSION['PRICEBOOK_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['PRICEBOOK_ORDER_BY'] != '')?($_SESSION['PRICEBOOK_ORDER_BY']):($this->default_order_by));
+		$log->debug("Exiting getOrderBy method ...");
+		return $order_by;
+	}	
+
 	function get_pricebook_products($id)
 	{
 		global $log;

Modified: vtigercrm/trunk/modules/Products/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Products/ListView.php (original)
+++ vtigercrm/trunk/modules/Products/ListView.php Tue Jun 13 10:36:15 2006
@@ -59,15 +59,8 @@
 $focus = new Product();
 
 //<<<<<<<<<<<<<<<<<<< sorting - stored in session >>>>>>>>>>>>>>>>>>>>
-if($_REQUEST['order_by'] != '')
-	$order_by = $_REQUEST['order_by'];
-else
-	$order_by = (($_SESSION['PRODUCTS_ORDER_BY'] != '')?($_SESSION['PRODUCTS_ORDER_BY']):($focus->default_order_by));
-
-if($_REQUEST['sorder'] != '')
-	$sorder = $_REQUEST['sorder'];
-else
-	$sorder = (($_SESSION['PRODUCTS_SORT_ORDER'] != '')?($_SESSION['PRODUCTS_SORT_ORDER']):($focus->default_sort_order));
+$sorder = $focus->getSortOrder();
+$order_by = $focus->getOrderBy();
 
 $_SESSION['PRODUCTS_ORDER_BY'] = $order_by;
 $_SESSION['PRODUCTS_SORT_ORDER'] = $sorder;

Modified: vtigercrm/trunk/modules/Products/Product.php
==============================================================================
--- vtigercrm/trunk/modules/Products/Product.php (original)
+++ vtigercrm/trunk/modules/Products/Product.php Tue Jun 13 10:36:15 2006
@@ -75,6 +75,32 @@
 		$this->db = new PearDatabase();
 		$this->column_fields = getColumnFields('Products');
 		$this->log->debug("Exiting Product method ...");
+	}
+	
+	function getSortOrder()
+	{
+		global $log;
+		$log->debug("Entering getSortOrder() method ...");
+		if(isset($_REQUEST['sorder']))
+		$sorder = $_REQUEST['sorder'];
+		else
+		$sorder = (($_SESSION['PRODUCTS_SORT_ORDER'] != '')?($_SESSION['PRODUCTS_SORT_ORDER']):($this->defa
+		ult_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['PRODUCTS_ORDER_BY'] != '')?($_SESSION['PRODUCTS_ORDER_BY']):($this->defaul
+		t_order_by));
+		$log->debug("Exiting getOrderBy method ...");
+		return $order_by;
 	}
 
 	function get_attachments($id)

Modified: vtigercrm/trunk/modules/PurchaseOrder/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/PurchaseOrder/ListView.php (original)
+++ vtigercrm/trunk/modules/PurchaseOrder/ListView.php Tue Jun 13 10:36:15 2006
@@ -54,15 +54,8 @@
         $smarty->assign("ERROR","");
 }
 //<<<<<<<<<<<<<<<<<<< sorting - stored in session >>>>>>>>>>>>>>>>>>>>
-if($_REQUEST['order_by'] != '')
-	$order_by = $_REQUEST['order_by'];
-else
-	$order_by = (($_SESSION['PURCHASEORDER_ORDER_BY'] != '')?($_SESSION['PURCHASEORDER_ORDER_BY']):($focus->default_order_by));
-
-if($_REQUEST['sorder'] != '')
-	$sorder = $_REQUEST['sorder'];
-else
-	$sorder = (($_SESSION['PURCHASEORDER_SORT_ORDER'] != '')?($_SESSION['PURCHASEORDER_SORT_ORDER']):($focus->default_sort_order));
+$sorder = $focus->getSortOrder();
+$order_by = $focus->getOrderBy();
 
 $_SESSION['PURCHASEORDER_ORDER_BY'] = $order_by;
 $_SESSION['PURCHASEORDER_SORT_ORDER'] = $sorder;

Modified: vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php
==============================================================================
--- vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php (original)
+++ vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php Tue Jun 13 10:36:15 2006
@@ -98,6 +98,31 @@
 		$this->db = new PearDatabase();
 		$this->column_fields = getColumnFields('PurchaseOrder');
 	}
+
+	// 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['PURCHASEORDER_SORT_ORDER'] != '')?($_SESSION['PURCHASEORDER_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['PURCHASEORDER_ORDER_BY'] != '')?($_SESSION['PURCHASEORDER_ORDER_BY']):($this->default_order_by));
+		$log->debug("Exiting getOrderBy method ...");
+		return $order_by;
+	}	
 
 /** Function to get activities associated with the id
  *  This function accepts the id as arguments and execute the MySQL query using the id

Modified: vtigercrm/trunk/modules/Quotes/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Quotes/ListView.php (original)
+++ vtigercrm/trunk/modules/Quotes/ListView.php Tue Jun 13 10:36:15 2006
@@ -55,15 +55,8 @@
         $smarty->assign("ERROR","");
 }
 //<<<<<<<<<<<<<<<<<<< sorting - stored in session >>>>>>>>>>>>>>>>>>>>
-if($_REQUEST['order_by'] != '')
-	$order_by = $_REQUEST['order_by'];
-else
-	$order_by = (($_SESSION['QUOTES_ORDER_BY'] != '')?($_SESSION['QUOTES_ORDER_BY']):($focus->default_order_by));
-
-if($_REQUEST['sorder'] != '')
-	$sorder = $_REQUEST['sorder'];
-else
-	$sorder = (($_SESSION['QUOTES_SORT_ORDER'] != '')?($_SESSION['QUOTES_SORT_ORDER']):($focus->default_sort_order));
+$sorder = $focus->getSortOrder();
+$order_by = $focus->getOrderBy();
 
 $_SESSION['QUOTES_ORDER_BY'] = $order_by;
 $_SESSION['QUOTES_SORT_ORDER'] = $sorder;

Modified: vtigercrm/trunk/modules/Quotes/Quote.php
==============================================================================
--- vtigercrm/trunk/modules/Quotes/Quote.php (original)
+++ vtigercrm/trunk/modules/Quotes/Quote.php Tue Jun 13 10:36:15 2006
@@ -102,6 +102,32 @@
 		$this->db = new PearDatabase();
 		$this->column_fields = getColumnFields('Quotes');
 	}
+	
+	// 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['QUOTES_SORT_ORDER'] != '')?($_SESSION['QUOTES_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['QUOTES_ORDER_BY'] != '')?($_SESSION['QUOTES_ORDER_BY']):($this->default_order_by));
+		$log->debug("Exiting getOrderBy method ...");
+		return $order_by;
+	}	
+	// Mike Crowe Mod --------------------------------------------------------
 
 	function get_salesorder($id)
 	{

Modified: vtigercrm/trunk/modules/SalesOrder/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/SalesOrder/ListView.php (original)
+++ vtigercrm/trunk/modules/SalesOrder/ListView.php Tue Jun 13 10:36:15 2006
@@ -52,15 +52,8 @@
         $smarty->assign("ERROR","");
 }
 //<<<<<<<<<<<<<<<<<<< sorting - stored in session >>>>>>>>>>>>>>>>>>>>
-if($_REQUEST['order_by'] != '')
-	$order_by = $_REQUEST['order_by'];
-else
-	$order_by = (($_SESSION['SALESORDER_ORDER_BY'] != '')?($_SESSION['SALESORDER_ORDER_BY']):($focus->default_order_by));
-
-if($_REQUEST['sorder'] != '')
-	$sorder = $_REQUEST['sorder'];
-else
-	$sorder = (($_SESSION['SALESORDER_SORT_ORDER'] != '')?($_SESSION['SALESORDER_SORT_ORDER']):($focus->default_sort_order));
+$sorder = $focus->getSortOrder();
+$order_by = $focus->getOrderBy();
 
 $_SESSION['SALESORDER_ORDER_BY'] = $order_by;
 $_SESSION['SALESORDER_SORT_ORDER'] = $sorder;

Modified: vtigercrm/trunk/modules/SalesOrder/SalesOrder.php
==============================================================================
--- vtigercrm/trunk/modules/SalesOrder/SalesOrder.php (original)
+++ vtigercrm/trunk/modules/SalesOrder/SalesOrder.php Tue Jun 13 10:36:15 2006
@@ -104,6 +104,32 @@
 		$this->db = new PearDatabase();
 		$this->column_fields = getColumnFields('SalesOrder');
 	}
+	
+	// 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['SALESORDER_SORT_ORDER'] != '')?($_SESSION['SALESORDER_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['SALESORDER_ORDER_BY'] != '')?($_SESSION['SALESORDER_ORDER_BY']):($this->default_order_by));
+		$log->debug("Exiting getOrderBy method ...");
+		return $order_by;
+	}	
+	// Mike Crowe Mod --------------------------------------------------------
 
 /** Function to get activities associated with the id
  *  This function accepts the id as arguments and execute the MySQL query using the id




From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 13 13:21:58 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 13 Jun 2006 17:21:58 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231116=3A?=
 =?utf-8?q?_FCKeditor=3A_document_version_used=2C_merge_new_versions_as_re?=
 =?utf-8?q?leased?=
In-Reply-To: <076.23b59aa20444402e3e3f439012465746@vtiger.fosslabs.com>
References: <076.23b59aa20444402e3e3f439012465746@vtiger.fosslabs.com>
Message-ID: <085.a323be8f31988eda34f3223b95adb2ea@vtiger.fosslabs.com>

#1116: FCKeditor: document version used, merge new versions as released
------------------------+---------------------------------------------------
  Reporter:  jeffk      |       Owner:  jeffk                    
      Type:  defect     |      Status:  new                      
  Priority:  major      |   Milestone:  5.0.0                    
 Component:  vtigercrm  |     Version:  5.0.0                    
Resolution:             |    Keywords:  editor packaging snapshot
------------------------+---------------------------------------------------
Comment (by jeffk):

 FCKEditor 2.3 has been released. Since we are still in beta (not rc)
 status, I suggest integrating the new release version.

 "FCKeditor 2.3 released: The changes in this release are as follows:
 The "Extreme Fast Loading!" experience is now complete. The editor has
 been deeply tested, and is ready to be integrated into professional
 applications."

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1116>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 13 13:34:06 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 13 Jun 2006 17:34:06 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231300=3A?=
 =?utf-8?q?_Google_Maps_support_by_way_integrating_third-party_Google_Maps?=
 =?utf-8?q?_API_library?=
Message-ID: <076.caa8db848bf4889be2ed2b950d38a6e9@vtiger.fosslabs.com>

#1300: Google Maps support by way integrating third-party Google Maps API library
----------------------------------------------+-----------------------------
 Reporter:  jeffk                             |       Owner:  developer
     Type:  defect                            |      Status:  new      
 Priority:  major                             |   Milestone:  5.0.0    
Component:  vtigercrm                         |     Version:  5.0.0    
 Keywords:  maps google third-party snapshot  |  
----------------------------------------------+-----------------------------
 As discussed on the mailing list, there is a pending feature initiative to
 add Google Maps support to vtigercrm-5.x.

 Since the Google Maps service is a moving target (perpetual 'beta'
 status), it makes sense to choose and integrate a third-party PHP Google
 Maps API library, one which will track new features and API changes
 without any duplicated work on our part.

  * (GoogleMapAPI-2.0) http://www.phpinsider.com/php/code/GoogleMapAPI/
 (actively developed)

  * (Phoogle Maps 2.0) http://www.system7designs.com/codebase  (last
 release Nov 2005)

 Separate tickets will be introduced to suggest vtigercrm-integrated Google
 Maps features, this ticket is only to discuss/select the third-party
 library we should choose.

 As with vtiger's use of other third-party libraries, I'm OK with snapshot
 versions, but we need a standing policy to merge in new releases to our
 local snapshot, except at such times as vtigercrm is very close to final
 release candidate status.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1300>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 13 13:36:55 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 13 Jun 2006 17:36:55 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231287=3A?=
	=?utf-8?q?_Support_PHP_5?=
In-Reply-To: <076.34213a5e5121e9857e7ff28b81783537@vtiger.fosslabs.com>
References: <076.34213a5e5121e9857e7ff28b81783537@vtiger.fosslabs.com>
Message-ID: <085.6c09181a43321d7fd931190f64ea6f63@vtiger.fosslabs.com>

#1287: Support PHP 5
------------------------+---------------------------------------------------
  Reporter:  allanbush  |       Owner:  developer
      Type:  defect     |      Status:  new      
  Priority:  major      |   Milestone:  4.2.5    
 Component:  vtigercrm  |     Version:  4.2.4rc3 
Resolution:             |    Keywords:  php5     
------------------------+---------------------------------------------------
Comment (by jeffk):

 Echoing my mailing-list comment about a possible way to run PHP4 and PHP5
 simultaneously:

 How To Set Up suPHP With PHP4 And PHP5

 http://www.howtoforge.com/book/print/1341

 http://www.suphp.org

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1287>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 13 13:47:09 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 13 Jun 2006 17:47:09 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=2314=3A_T?=
 =?utf-8?q?oo_late_for_unit_testing=2C_consider_functional_testing_with_se?=
 =?utf-8?q?lenium?=
In-Reply-To: <076.80be249f77bed75d5430ff99ca979397@vtiger.fosslabs.com>
References: <076.80be249f77bed75d5430ff99ca979397@vtiger.fosslabs.com>
Message-ID: <085.c1cc8b60eb6b73d2d9ebb664932bfe02@vtiger.fosslabs.com>

#14: Too late for unit testing, consider functional testing with selenium
------------------------+---------------------------------------------------
  Reporter:  jeffk      |       Owner:  developer
      Type:  task       |      Status:  new      
  Priority:  major      |   Milestone:  5.0.0    
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:             |    Keywords:  testing  
------------------------+---------------------------------------------------
Changes (by jeffk):

  * milestone:  => 5.0.0
  * version:  => 5.0.0

Comment:

 The Firefox extension 'Selenium IDE' is a very powerful tool for recording
 Selenium tests.

 http://www.openqa.org/selenium-ide/

 Selenium tests can be recorded by anyone using an ordinary Firefox,
 browser, and attached to trac tickets or simply checked in to the
 repository.

 Selenium test can be run by anyone to report failures or verify success.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/14>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 13 14:08:54 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 13 Jun 2006 18:08:54 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231301=3A?=
	=?utf-8?q?_email_attachments?=
Message-ID: <076.501e7e6107480ab0a6afe33d21a7a29f@vtiger.fosslabs.com>

#1301: email attachments
-------------------------+--------------------------------------------------
 Reporter:  anonymous    |       Owner:  developer
     Type:  enhancement  |      Status:  new      
 Priority:  major        |   Milestone:           
Component:  vtigercrm    |     Version:  5.0.0    
 Keywords:               |  
-------------------------+--------------------------------------------------
 At Beta you can attach one file only at emails. You should be able to
 attach multiple files.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1301>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 13 14:14:16 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 13 Jun 2006 18:14:16 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231302=3A?=
 =?utf-8?q?_Update_to_new_adodb-4=2E90_release?=
Message-ID: <076.cfae0e78298741dfce9c6a4f41a70218@vtiger.fosslabs.com>

#1302: Update to new adodb-4.90 release
------------------------------------+---------------------------------------
 Reporter:  jeffk                   |       Owner:  jeffk
     Type:  defect                  |      Status:  new  
 Priority:  major                   |   Milestone:  5.0.0
Component:  vtigercrm               |     Version:  5.0.0
 Keywords:  adodb database package  |  
------------------------------------+---------------------------------------
 There is a new release of adodb-4.90. The changelog seems to have several
 useful features and fixes.

 http://phplens.com/lens/adodb/docs-adodb.htm#4.90

  * Changed adodb_countrec() in adodb-lib.inc.php to allow LIMIT to be used
 as a speedup to reduce no of records counted.

  * Added support for transaction modes for postgres and oci8 with
 SetTransactionMode(). These transaction modes affect all subsequent
 transactions of that connection. Thanks to Halmai Csongor for suggestion.

  * Removed $off = $fieldOffset - 1 line in db2 driver, FetchField(). Tx
 Larry Menard.

  * Added support for PHP5 objects as Execute() bind parameters using
 __toString (eg. Simple-XML). Thx Carl-Christian Salvesen.

  * Rounding in tohtml.inc.php did not work properly. Fixed.

  * MetaIndexes in postgres fails when fields are deleted then added in
 again because the attnum has gaps in it. See
 http://sourceforge.net/tracker/index.php?func=detail&aid=1451245&group_id=42718&atid=433976.
 Fixed.

  * MetaForeignkeys in mysql and mysqli did not work when
 fetchMode==ADODB_FETCH_ASSOC used. Fixed.

  * Reference error in AutoExecute() fixed.

  * Added macaddr postgres type to MetaType. Maps to 'C'.

  * Added to _connect() in adodb-ado5.inc.php support for $database and
 $dataProvider parameters. Thx Larry Menard.

  * Added support for sequences in adodb-ado_mssql.inc.php. Thx Larry
 Menard.

  * Added ADODB_SESSION_READONLY.

  * Added session expiryref support to crc32 mode, and in LOB code.

  * Clear _errorMsg in postgres7 driver, so that ErrorMsg() displays
 properly when no error occurs.

  * Added BindDate and BindTimeStamp

 I would like to update the snapshotted adodb in
 source:vtigercrm/trunk/adodb and source:vtigercrm/branches/4.2/adodb to be
 zero-diff with the release files of adodb-4.91.

 We have had good results with this snapshot update pattern previously.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1302>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 13 20:46:14 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 00:46:14 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231303=3A?=
 =?utf-8?q?_Invoice=2C_Sales_Orders=2C_Quotes?=
Message-ID: <076.3417cd31c74551f10ccb510284b2b2f8@vtiger.fosslabs.com>

#1303: Invoice, Sales Orders, Quotes
---------------------------------------+------------------------------------
 Reporter:  anthony11221               |       Owner:  developer
     Type:  defect                     |      Status:  new      
 Priority:  major                      |   Milestone:  5.0.0    
Component:  vtigercrm                  |     Version:  5.0.0    
 Keywords:  invoice sales order quote  |  
---------------------------------------+------------------------------------
 There isn't any way to delete an item from the list after you have created
 the invoice, sales order or quote.  This would be a necessity if the
 customer decided not to carry out a particular item.

 It doesn't seem possible to add the same product twice.  Although it is
 much appreciated that a warning is displayed that a duplicated product
 exists, it would be possible for someone to order a particular product at
 one price and several more at another price.

 It should also be possible to override the price (perhpas with the right
 access level) while entering the invoice, sales order, or quote.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1303>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 13 20:52:18 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 00:52:18 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231304=3A?=
 =?utf-8?q?_Invoice=2C_Sales_Orders=2C_Quotes?=
Message-ID: <076.169f9e55fd2e82b71a7818aafacbc6fa@vtiger.fosslabs.com>

#1304: Invoice, Sales Orders, Quotes
-------------------------+--------------------------------------------------
 Reporter:  anonymous    |       Owner:  developer
     Type:  enhancement  |      Status:  new      
 Priority:  major        |   Milestone:           
Component:  vtigercrm    |     Version:  5.0.0    
 Keywords:               |  
-------------------------+--------------------------------------------------
 Need an alternative method to entering items in these modules.  I
 understand the requirement to pull the product ID from the database
 tables, however for entering large numbers of invoices, waiting for screen
 updates in the pick list is too slow.  Perhaps being able to hand key in
 the product ID and doing a quick query to see if that ID exists or even
 preloading the products table and doing a string compare to find items
 matching a manually typed in string.  There are several examples of this
 in other areas of vtiger and SugarCRM.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1304>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 13 23:57:30 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 14 Jun 2006 03:57:30 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7059 -
	/vtigercrm/trunk/modules/Products/Product.php
Message-ID: <20060614035730.97AB77ECF7A@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 13 21:57:26 2006
New Revision: 7059

Log:
line break has been removed at line number 84 and 97

Modified:
    vtigercrm/trunk/modules/Products/Product.php

Modified: vtigercrm/trunk/modules/Products/Product.php
==============================================================================
--- vtigercrm/trunk/modules/Products/Product.php (original)
+++ vtigercrm/trunk/modules/Products/Product.php Tue Jun 13 21:57:26 2006
@@ -84,8 +84,7 @@
 		if(isset($_REQUEST['sorder']))
 		$sorder = $_REQUEST['sorder'];
 		else
-		$sorder = (($_SESSION['PRODUCTS_SORT_ORDER'] != '')?($_SESSION['PRODUCTS_SORT_ORDER']):($this->defa
-		ult_sort_order));
+		$sorder = (($_SESSION['PRODUCTS_SORT_ORDER'] != '')?($_SESSION['PRODUCTS_SORT_ORDER']):($this->default_sort_order));
 		$log->debug("Exiting getSortOrder() method ...");
 		return $sorder;
 	}
@@ -97,8 +96,7 @@
 		if (isset($_REQUEST['order_by']))
 		$order_by = $_REQUEST['order_by'];
 		else
-		$order_by = (($_SESSION['PRODUCTS_ORDER_BY'] != '')?($_SESSION['PRODUCTS_ORDER_BY']):($this->defaul
-		t_order_by));
+		$order_by = (($_SESSION['PRODUCTS_ORDER_BY'] != '')?($_SESSION['PRODUCTS_ORDER_BY']):($this->default_order_by));
 		$log->debug("Exiting getOrderBy method ...");
 		return $order_by;
 	}




From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 02:34:18 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 06:34:18 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23236=3A_?=
 =?utf-8?q?Scalability_Isse_in_All_link_in_list_view?=
In-Reply-To: <076.51adff6f3414f5a553ed4c62a54f0d49@vtiger.fosslabs.com>
References: <076.51adff6f3414f5a553ed4c62a54f0d49@vtiger.fosslabs.com>
Message-ID: <085.f868461c11215ffaed2a30e607714de2@vtiger.fosslabs.com>

#236: Scalability Isse in All link in list view
------------------------+---------------------------------------------------
  Reporter:  don        |       Owner:  philip
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  invalid    |    Keywords:        
------------------------+---------------------------------------------------
Changes (by saraj):

  * resolution:  => invalid
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/236>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 03:04:14 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 14 Jun 2006 07:04:14 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7060 -
	/vtigercrm/trunk/modules/Dashboard/index.php
Message-ID: <20060614070414.888947ECF7E@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 14 01:04:06 2006
New Revision: 7060

Log:
changes made to include extra graphs

Modified:
    vtigercrm/trunk/modules/Dashboard/index.php

Modified: vtigercrm/trunk/modules/Dashboard/index.php
==============================================================================
--- vtigercrm/trunk/modules/Dashboard/index.php (original)
+++ vtigercrm/trunk/modules/Dashboard/index.php Wed Jun 14 01:04:06 2006
@@ -42,6 +42,9 @@
           "accountindustry" => $mod_strings['accountindustry'],
           "productcategory" => $mod_strings['productcategory'],
 	  "productbyqtyinstock" => $mod_strings['productbyqtyinstock'],
+	  "productbypo" => $mod_strings['productbypo'],
+	  "productbyquotes" => $mod_strings['productbyquotes'],
+	  "productbyinvoice" => $mod_strings['productbyinvoice'],
           "sobyaccounts" => $mod_strings['sobyaccounts'],
           "sobystatus" => $mod_strings['sobystatus'],
           "pobystatus" => $mod_strings['pobystatus'],




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 03:07:21 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 14 Jun 2006 07:07:21 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7061 -
	/vtigercrm/trunk/modules/Products/Product.php
Message-ID: <20060614070721.997257ECF82@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 14 01:06:35 2006
New Revision: 7061

Log:
added tab space

Modified:
    vtigercrm/trunk/modules/Products/Product.php

Modified: vtigercrm/trunk/modules/Products/Product.php
==============================================================================
--- vtigercrm/trunk/modules/Products/Product.php (original)
+++ vtigercrm/trunk/modules/Products/Product.php Wed Jun 14 01:06:35 2006
@@ -82,9 +82,9 @@
 		global $log;
 		$log->debug("Entering getSortOrder() method ...");
 		if(isset($_REQUEST['sorder']))
-		$sorder = $_REQUEST['sorder'];
+			$sorder = $_REQUEST['sorder'];
 		else
-		$sorder = (($_SESSION['PRODUCTS_SORT_ORDER'] != '')?($_SESSION['PRODUCTS_SORT_ORDER']):($this->default_sort_order));
+			$sorder = (($_SESSION['PRODUCTS_SORT_ORDER'] != '')?($_SESSION['PRODUCTS_SORT_ORDER']):($this->default_sort_order));
 		$log->debug("Exiting getSortOrder() method ...");
 		return $sorder;
 	}
@@ -94,9 +94,9 @@
 		global $log;
 		$log->debug("Entering getOrderBy() method ...");
 		if (isset($_REQUEST['order_by']))
-		$order_by = $_REQUEST['order_by'];
+			$order_by = $_REQUEST['order_by'];
 		else
-		$order_by = (($_SESSION['PRODUCTS_ORDER_BY'] != '')?($_SESSION['PRODUCTS_ORDER_BY']):($this->default_order_by));
+			$order_by = (($_SESSION['PRODUCTS_ORDER_BY'] != '')?($_SESSION['PRODUCTS_ORDER_BY']):($this->default_order_by));
 		$log->debug("Exiting getOrderBy method ...");
 		return $order_by;
 	}




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 03:08:37 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 14 Jun 2006 07:08:37 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7062 -
	/vtigercrm/trunk/modules/Dashboard/Entity_charts.php
Message-ID: <20060614070837.454F47ECF7E@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 14 01:08:32 2006
New Revision: 7062

Log:
changes made to include extra graphs

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 Wed Jun 14 01:08:32 2006
@@ -202,11 +202,35 @@
 				}
 				if($graph_for =="product_id")
 				{
-					$query = "SELECT productname FROM vtiger_products WHERE productid=".$name;
+					$query = "SELECT productname FROM vtiger_products WHERE productid='".$name."'";
 					$result = $adb->query($query);
 					$name_val = $adb->query_result($result,0,"productname");
 					if($name_val!="")
-					$name=$name_val;
+						$name=$name_val;
+				}
+				if($graph_for =="purchaseorderid")
+				{
+					$query = "SELECT subject FROM purchaseorder WHERE purchaseorderid='".$name."'";
+					$result = $adb->query($query);
+					$name_val = $adb->query_result($result,0,"subject");
+					if($name_val!="")
+						$name=$name_val;
+				}
+				if($graph_for =="quoteid")
+				{
+					$query = "SELECT subject FROM quotes WHERE quoteid='".$name."'";
+					$result = $adb->query($query);
+					$name_val = $adb->query_result($result,0,"subject");
+					if($name_val!="")
+						$name=$name_val;
+				}
+				if($graph_for =="invoiceid")
+				{
+					$query = "SELECT subject FROM invoice WHERE invoiceid='".$name."'";
+					$result = $adb->query($query);
+					$name_val = $adb->query_result($result,0,"subject");
+					if($name_val!="")
+						$name=$name_val;
 				}
 				//Passing name to graph
 				if($mod_name_val!="") $mod_name_val.=",$name";




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 03:21:14 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 14 Jun 2006 07:21:14 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7063 -
 /vtigercrm/trunk/modules/Dashboard/display_charts.php
Message-ID: <20060614072115.3CB6B7ECF82@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 14 01:21:06 2006
New Revision: 7063

Log:
changes made to include extra graphs

Modified:
    vtigercrm/trunk/modules/Dashboard/display_charts.php

Modified: vtigercrm/trunk/modules/Dashboard/display_charts.php
==============================================================================
--- vtigercrm/trunk/modules/Dashboard/display_charts.php (original)
+++ vtigercrm/trunk/modules/Dashboard/display_charts.php Wed Jun 14 01:21:06 2006
@@ -43,7 +43,7 @@
 
 
 //Query For Products
-$products_query="select distinct(vtiger_crmentity.crmid),vtiger_crmentity.createdtime,vtiger_products.*, vtiger_productcf.* from vtiger_products inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_products.productid left join vtiger_productcf on vtiger_products.productid = vtiger_productcf.productid left join vtiger_seproductsrel on vtiger_seproductsrel.productid = vtiger_products.productid where vtiger_crmentity.deleted=0 ";
+$products_query="select distinct(vtiger_crmentity.crmid),vtiger_crmentity.createdtime,vtiger_products.*, vtiger_poproductrel.purchaseorderid, vtiger_quotesproductrel.quoteid, vtiger_invoiceproductrel.invoiceid,vtiger_productcf.* from vtiger_products inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_products.productid left join vtiger_poproductrel on vtiger_products.productid = vtiger_poproductrel.productid left join vtiger_quotesproductrel on vtiger_products.productid = vtiger_quotesproductrel.productid left join vtiger_invoiceproductrel on vtiger_products.productid = vtiger_invoiceproductrel.productid left join vtiger_productcf on vtiger_products.productid = vtiger_productcf.productid left join vtiger_seproductsrel on vtiger_seproductsrel.productid = vtiger_products.productid where vtiger_crmentity.deleted=0 ";
 
 //Query for Potential
 $potential_query= "select  vtiger_crmentity.*,vtiger_account.accountname, vtiger_potential.*, vtiger_potentialscf.* from vtiger_potential inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_potential.potentialid inner join vtiger_account on vtiger_potential.accountid = vtiger_account.accountid inner join vtiger_potentialscf on vtiger_potentialscf.potentialid = vtiger_potential.potentialid left join vtiger_potentialgrouprelation on vtiger_potential.potentialid=vtiger_potentialgrouprelation.potentialid left join vtiger_groups on vtiger_groups.groupname=vtiger_potentialgrouprelation.groupname left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_crmentity.deleted=0 ";
@@ -81,6 +81,9 @@
           "accountindustry" => $mod_strings['accountindustry'],
           "productcategory" => $mod_strings['productcategory'],
 	  "productbyqtyinstock" => $mod_strings['productbyqtyinstock'],
+	  "productbypo" => $mod_strings['productbypo'],
+	  "productbyquotes" => $mod_strings['productbyquotes'],
+	  "productbyinvoice" => $mod_strings['productbyinvoice'],
           "sobyaccounts" => $mod_strings['sobyaccounts'],
           "sobystatus" => $mod_strings['sobystatus'],
           "pobystatus" => $mod_strings['pobystatus'],
@@ -478,6 +481,36 @@
 			    $query=$products_query;
 			    echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
 		    }
+		    //Charts for Products by PO
+		    elseif (($type == "productbypo") && (getFieldVisibilityPermission('Products',$user_id,'productpurchaseorder') == "0"))
+		    { 
+			$graph_by="purchaseorderid";
+			    $graph_title=$mod_strings['productbypo'];
+			    $module="Products";
+			    $where="";
+			    $query=$products_query;
+			    echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
+		    }
+		    //Charts for Products by Quotes
+		    elseif (($type == "productbyquotes") && (getFieldVisibilityPermission('Products',$user_id,'productquotes') == "0"))
+		    { 
+                        $graph_by="quoteid";
+   			    $graph_title=$mod_strings['productbyquotes'];
+			    $module="Products";
+			    $where=""; 
+			    $query=$products_query;
+			    echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
+		    }
+		    //Charts for Products by Invoice
+		    elseif (($type == "productbyinvoice") && (getFieldVisibilityPermission('Products',$user_id,'productinvoice') == "0"))
+		    {
+		        $graph_by="invoiceid";
+			    $graph_title=$mod_strings['productbyinvoice'];
+			    $module="Products";
+			    $where="";
+			    $query=$products_query;
+			    echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
+		    }
 
                     // Sales Order by Accounts
                     elseif (($type == "sobyaccounts") && (getFieldVisibilityPermission('SalesOrder',$user_id,'account_id') == "0"))




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 03:22:36 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 14 Jun 2006 07:22:36 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7064 -
	/vtigercrm/trunk/modules/Dashboard/Entity_charts.php
Message-ID: <20060614072236.2D2047ECF82@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 14 01:22:32 2006
New Revision: 7064

Log:
changes made to include extra graphs

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 Wed Jun 14 01:22:32 2006
@@ -210,7 +210,7 @@
 				}
 				if($graph_for =="purchaseorderid")
 				{
-					$query = "SELECT subject FROM purchaseorder WHERE purchaseorderid='".$name."'";
+					$query = "SELECT subject FROM vtiger_purchaseorder WHERE purchaseorderid='".$name."'";
 					$result = $adb->query($query);
 					$name_val = $adb->query_result($result,0,"subject");
 					if($name_val!="")
@@ -218,7 +218,7 @@
 				}
 				if($graph_for =="quoteid")
 				{
-					$query = "SELECT subject FROM quotes WHERE quoteid='".$name."'";
+					$query = "SELECT subject FROM vtiger_quotes WHERE quoteid='".$name."'";
 					$result = $adb->query($query);
 					$name_val = $adb->query_result($result,0,"subject");
 					if($name_val!="")
@@ -226,7 +226,7 @@
 				}
 				if($graph_for =="invoiceid")
 				{
-					$query = "SELECT subject FROM invoice WHERE invoiceid='".$name."'";
+					$query = "SELECT subject FROM vtiger_invoice WHERE invoiceid='".$name."'";
 					$result = $adb->query($query);
 					$name_val = $adb->query_result($result,0,"subject");
 					if($name_val!="")




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 03:25:00 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 14 Jun 2006 07:25:00 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7065 -
 /vtigercrm/trunk/modules/Dashboard/language/en_us.lang.php
Message-ID: <20060614072500.A3B6B7ECF69@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 14 01:24:00 2006
New Revision: 7065

Log:
label added to include extra graphs

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

Modified: vtigercrm/trunk/modules/Dashboard/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Dashboard/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Dashboard/language/en_us.lang.php Wed Jun 14 01:24:00 2006
@@ -64,6 +64,9 @@
 "accountindustry" => "Account By Industry",
 "productcategory" => "Products by Category",
 "productbyqtyinstock" => "Products by Quantity in stock",
+"productbypo" => "Products by PurchaseOrder",
+"productbyquotes" => "Products by Quotes",
+"productbyinvoice" => "Products by Invoice",
 "sobyaccounts" => "Sales Order by Accounts",
 "sobystatus" => "Sales Order by Status",
 "pobystatus" => "Purchase Order by Status",




From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 03:29:55 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 07:29:55 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231284=3A?=
 =?utf-8?q?_Removal_of_commented-out_code_is_helpful?=
In-Reply-To: <076.1f009815df5e22f62e7a2c599acd3ebf@vtiger.fosslabs.com>
References: <076.1f009815df5e22f62e7a2c599acd3ebf@vtiger.fosslabs.com>
Message-ID: <085.b63024db017223e41acd9a49819a8455@vtiger.fosslabs.com>

#1284: Removal of commented-out code is helpful
------------------------+---------------------------------------------------
  Reporter:  jeffk      |       Owner:  developer
      Type:  defect     |      Status:  new      
  Priority:  minor      |   Milestone:  5.0.0    
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:             |    Keywords:           
------------------------+---------------------------------------------------
Comment (by richie):

 Exactly my thoughts. My logic is a little simpler.

 No code, no bugs. Less code, less bugs.
 Moreover, it annoys me no end to see big files.

 Caution: We need to take out all unwanted/junk/unused code totally but
 keep future-feature code in comments if needed.

 I encourage the community to identify junk code and help us in the
 process.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1284>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 03:30:11 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 07:30:11 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231290=3A?=
	=?utf-8?q?_Company_Information?=
In-Reply-To: <076.d72bc388560618f95d42b1de2961a633@vtiger.fosslabs.com>
References: <076.d72bc388560618f95d42b1de2961a633@vtiger.fosslabs.com>
Message-ID: <085.5adc591572d6758e1793bbd0953aba83@vtiger.fosslabs.com>

#1290: Company Information
------------------------+---------------------------------------------------
  Reporter:  daneswood  |       Owner:  jeri               
      Type:  defect     |      Status:  new                
  Priority:  minor      |   Milestone:                     
 Component:  vtigercrm  |     Version:  5.0.0              
Resolution:             |    Keywords:  company information
------------------------+---------------------------------------------------
Changes (by richie):

  * owner:  developer => jeri

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1290>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 03:30:26 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 07:30:26 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231295=3A?=
 =?utf-8?q?_Color_code_items_in_the_shared_calendar_view?=
In-Reply-To: <076.b4a0b4e8d19ce6073a31a3ecfcb23759@vtiger.fosslabs.com>
References: <076.b4a0b4e8d19ce6073a31a3ecfcb23759@vtiger.fosslabs.com>
Message-ID: <085.e50b45687f55f17a6a0650d9487b38bc@vtiger.fosslabs.com>

#1295: Color code items in the shared calendar view
--------------------------+-------------------------------------------------
  Reporter:  anonymous    |       Owner:  minnie  
      Type:  enhancement  |      Status:  new     
  Priority:  minor        |   Milestone:  5.0.0   
 Component:  vtigercrm    |     Version:  5.0.0   
Resolution:               |    Keywords:  calendar
--------------------------+-------------------------------------------------
Changes (by richie):

  * owner:  developer => minnie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1295>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 03:30:40 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 07:30:40 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231259=3A?=
	=?utf-8?q?_i18n_issues_with_Beta?=
In-Reply-To: <076.f7b53125520cc2d8322c4161c2676a8c@vtiger.fosslabs.com>
References: <076.f7b53125520cc2d8322c4161c2676a8c@vtiger.fosslabs.com>
Message-ID: <085.71d54f59ddad8fed51673d1def8ff952@vtiger.fosslabs.com>

#1259: i18n issues with Beta
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  ahmed
      Type:  defect     |      Status:  new  
  Priority:  minor      |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by richie):

  * owner:  developer => ahmed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1259>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 03:31:05 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 07:31:05 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231251=3A?=
 =?utf-8?q?_Chat_not_working=3F=3F?=
In-Reply-To: <076.c47ecc4624fe78215a43eca164a2c051@vtiger.fosslabs.com>
References: <076.c47ecc4624fe78215a43eca164a2c051@vtiger.fosslabs.com>
Message-ID: <085.6b797cdbadd32298cc48551fa4451f2b@vtiger.fosslabs.com>

#1251: Chat not working??
------------------------+---------------------------------------------------
  Reporter:             |       Owner:  richie
      Type:  defect     |      Status:  new   
  Priority:  minor      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * owner:  developer => richie

Comment:

 fixed in the cvs. Ajax.js renamed to vtiger_ajax.js

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1251>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 03:31:28 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 07:31:28 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231015=3A?=
 =?utf-8?q?_Add_select_week_to_calendar_pop-up=2C_navigates_directly_to_we?=
 =?utf-8?q?ek_view_calendar?=
In-Reply-To: <076.7a8ad8915c93d41df220001f2abd43de@vtiger.fosslabs.com>
References: <076.7a8ad8915c93d41df220001f2abd43de@vtiger.fosslabs.com>
Message-ID: <085.1bbbbbda2ab893603d2698e136299399@vtiger.fosslabs.com>

#1015: Add select week to calendar pop-up, navigates directly to week view
calendar
--------------------------+-------------------------------------------------
  Reporter:  jeffk        |       Owner:  minnie  
      Type:  enhancement  |      Status:  new     
  Priority:  minor        |   Milestone:  5.0.0   
 Component:  vtigercrm    |     Version:  5.0.0   
Resolution:               |    Keywords:  calendar
--------------------------+-------------------------------------------------
Changes (by richie):

  * owner:  developer => minnie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1015>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 03:31:36 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 07:31:36 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23951=3A_?=
 =?utf-8?q?Alphabetical_Search_Option_hidden_in_Advanced_Search_mode?=
In-Reply-To: <076.ffa1f6294657a1518192941039b69227@vtiger.fosslabs.com>
References: <076.ffa1f6294657a1518192941039b69227@vtiger.fosslabs.com>
Message-ID: <085.81c4c98985069ade305dee7ac2eade93@vtiger.fosslabs.com>

#951: Alphabetical Search Option hidden in Advanced Search mode
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  philip
      Type:  defect     |      Status:  new   
  Priority:  minor      |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by anonymous):

  * owner:  developer => philip

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/951>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 03:31:53 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 07:31:53 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23949=3A_?=
 =?utf-8?q?Advanced_Search_table_attached_to_List_View?=
In-Reply-To: <076.64fbeb656c1ed239c500613565fa6b30@vtiger.fosslabs.com>
References: <076.64fbeb656c1ed239c500613565fa6b30@vtiger.fosslabs.com>
Message-ID: <085.65a641ded9c0db5cd67c9f9a71449a5d@vtiger.fosslabs.com>

#949: Advanced Search table attached to List View
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  philip
      Type:  defect     |      Status:  new   
  Priority:  minor      |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * owner:  developer => philip

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/949>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 03:32:04 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 07:32:04 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23926=3A_?=
 =?utf-8?q?If_database_fails=2C_installation_script_loses_path_variable?=
In-Reply-To: <076.3dff578d41ed95759b327615c9ea781a@vtiger.fosslabs.com>
References: <076.3dff578d41ed95759b327615c9ea781a@vtiger.fosslabs.com>
Message-ID: <085.a48c067d8e0e22ae9f59258f4c4da205@vtiger.fosslabs.com>

#926: If database fails, installation script loses path variable
------------------------+---------------------------------------------------
  Reporter:  neofis     |       Owner:  jeri        
      Type:  defect     |      Status:  new         
  Priority:  minor      |   Milestone:              
 Component:  vtigercrm  |     Version:  5.0.0       
Resolution:             |    Keywords:  installation
------------------------+---------------------------------------------------
Changes (by richie):

  * owner:  developer => jeri

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/926>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 03:32:15 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 07:32:15 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23925=3A_?=
 =?utf-8?q?User_=26_Access_Mangement_=3E_Users?=
In-Reply-To: <076.985552b2efff10758471252d4d2fc42c@vtiger.fosslabs.com>
References: <076.985552b2efff10758471252d4d2fc42c@vtiger.fosslabs.com>
Message-ID: <085.86f4fd3b9fdd1013b233995c193da0a9@vtiger.fosslabs.com>

#925: User & Access Mangement > Users
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  don  
      Type:  defect     |      Status:  new  
  Priority:  minor      |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by anonymous):

  * owner:  developer => don

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/925>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 03:32:26 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 07:32:26 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23846=3A_?=
 =?utf-8?q?Member_Of_Field_can_be_moved_to_Basic_Information_Tab?=
In-Reply-To: <076.76722003fcd7d8c307a684829482c1f2@vtiger.fosslabs.com>
References: <076.76722003fcd7d8c307a684829482c1f2@vtiger.fosslabs.com>
Message-ID: <085.6cc4e86ed2d7b48d86e9e5a71901f37e@vtiger.fosslabs.com>

#846: Member Of Field can be moved to Basic Information Tab
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  don  
      Type:  defect     |      Status:  new  
  Priority:  minor      |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/846>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 03:32:33 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 07:32:33 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23843=3A_?=
 =?utf-8?q?Settings_=3E_Studio_=3E_Custom_Field_Settings_=3E_New_Custom_Fi?=
 =?utf-8?q?eld_Menu?=
In-Reply-To: <076.36c563ce6b93b6329417988edcf38a5b@vtiger.fosslabs.com>
References: <076.36c563ce6b93b6329417988edcf38a5b@vtiger.fosslabs.com>
Message-ID: <085.c3788204f0f5a0dc10eba54e0604c9ea@vtiger.fosslabs.com>

#843: Settings > Studio > Custom Field Settings > New Custom Field Menu
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  minnie
      Type:  defect     |      Status:  new   
  Priority:  minor      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by anonymous):

  * owner:  developer => minnie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/843>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 03:33:10 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 07:33:10 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=23784=3A_?=
	=?utf-8?q?My_Mail_Server_Details?=
In-Reply-To: <076.040e58efc5cbbc00df7731dcc0dafd9a@vtiger.fosslabs.com>
References: <076.040e58efc5cbbc00df7731dcc0dafd9a@vtiger.fosslabs.com>
Message-ID: <085.8c9a85143e4ea21538b5721e1ca4e13f@vtiger.fosslabs.com>

#784: My Mail Server Details
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  developer
      Type:  defect     |      Status:  closed   
  Priority:  minor      |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:  wontfix    |    Keywords:           
------------------------+---------------------------------------------------
Changes (by richie):

  * resolution:  => wontfix
  * status:  new => closed

Comment:

 This will not be handled as of now.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/784>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 03:33:23 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 07:33:23 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23778=3A_?=
 =?utf-8?q?Update_Home_Page_Block_Order?=
In-Reply-To: <076.1fa487f17244c9f4a65d58c7d48e16d4@vtiger.fosslabs.com>
References: <076.1fa487f17244c9f4a65d58c7d48e16d4@vtiger.fosslabs.com>
Message-ID: <085.b384f1708188701823b6a81a1f71b5e6@vtiger.fosslabs.com>

#778: Update Home Page Block Order
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  don  
      Type:  defect     |      Status:  new  
  Priority:  minor      |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by richie):

  * owner:  developer => don

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/778>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 03:33:35 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 07:33:35 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23770=3A_?=
 =?utf-8?q?More_intellegent_screen_placement_for_Add_Event_Popup?=
In-Reply-To: <076.7225c0eefa273e52db2513ebc3084433@vtiger.fosslabs.com>
References: <076.7225c0eefa273e52db2513ebc3084433@vtiger.fosslabs.com>
Message-ID: <085.04b2c9fb89c7fa894dc865c2204e25c4@vtiger.fosslabs.com>

#770: More intellegent screen placement for Add Event Popup
------------------------------+---------------------------------------------
  Reporter:  brian at awnow.com  |       Owner:  minnie  
      Type:  enhancement      |      Status:  new     
  Priority:  minor            |   Milestone:  5.0.0   
 Component:  vtigercrm        |     Version:  5.0.0   
Resolution:                   |    Keywords:  Calendar
------------------------------+---------------------------------------------
Changes (by richie):

  * owner:  developer => minnie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/770>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 03:33:56 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 07:33:56 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23396=3A_?=
 =?utf-8?q?Unable_to_sort_accounts_in_Contacts_List_View?=
In-Reply-To: <076.458c7d1acc4332636d7a3ab839407613@vtiger.fosslabs.com>
References: <076.458c7d1acc4332636d7a3ab839407613@vtiger.fosslabs.com>
Message-ID: <085.f12f74335c179f659f207dcda36efacd@vtiger.fosslabs.com>

#396: Unable to sort accounts in Contacts List View
------------------------+---------------------------------------------------
  Reporter:  don        |       Owner:  philip
      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 [7066]) Account Name sorting added. Fixes #396

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/396>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 03:33:57 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 14 Jun 2006 07:33:57 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7066 -
	/vtigercrm/trunk/modules/Contacts/Contact.php
Message-ID: <20060614073357.1DE117ECF8E@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 14 01:33:18 2006
New Revision: 7066

Log:
Account Name sorting added. Fixes #396

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 Wed Jun 14 01:33:18 2006
@@ -48,7 +48,7 @@
 
 	var $column_fields = Array();
 	
-	var $sortby_fields = Array('lastname','firstname','title','email','phone','smownerid');
+	var $sortby_fields = Array('lastname','firstname','title','email','phone','smownerid','accountid');
 
 	var $list_link_field= 'lastname';
 




From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 03:53:53 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 07:53:53 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23413=3A_?=
 =?utf-8?q?notes_can_not_shorted_by_Contact_name=2CRelated_to_and_File?=
In-Reply-To: <076.b0a80bc08839a88be787f3bb4694d7e2@vtiger.fosslabs.com>
References: <076.b0a80bc08839a88be787f3bb4694d7e2@vtiger.fosslabs.com>
Message-ID: <085.58b06dd3f28ed88c6d9b95263eb39528@vtiger.fosslabs.com>

#413: notes can not shorted by Contact name,Related to and File
--------------------------------+-------------------------------------------
  Reporter:  minnie at vtiger.com  |       Owner:  philip
      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 [7067]) Few more sorting in listview added. Fixes #413

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/413>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 03:53:54 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 14 Jun 2006 07:53:54 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7067 -
	/vtigercrm/trunk/modules/Notes/Note.php
Message-ID: <20060614075354.8824B7ECF92@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 14 01:53:50 2006
New Revision: 7067

Log:
Few more sorting in listview added. Fixes #413

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

Modified: vtigercrm/trunk/modules/Notes/Note.php
==============================================================================
--- vtigercrm/trunk/modules/Notes/Note.php (original)
+++ vtigercrm/trunk/modules/Notes/Note.php Wed Jun 14 01:53:50 2006
@@ -44,7 +44,7 @@
 
 	var $column_fields = Array();
 
-        var $sortby_fields = Array('title','modifiedtime');		  
+        var $sortby_fields = Array('title','modifiedtime','contact_id','filename');		  
 
 	// This is used to retrieve related vtiger_fields from form posts.
 	var $additional_column_fields = Array('', '', '', '');




From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 04:33:17 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 08:33:17 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231305=3A?=
	=?utf-8?q?_Total_taxes_not_auto?=
Message-ID: <076.952daacfec18eaf8adefbd4e7d778e41@vtiger.fosslabs.com>

#1305: Total taxes not auto
-------------------------------------------------------------------+--------
 Reporter:  abos                                                   |       Owner:  developer
     Type:  defect                                                 |      Status:  new      
 Priority:  minor                                                  |   Milestone:           
Component:  vtigercrm                                              |     Version:  5.0.0    
 Keywords:  quotes, invoices, sales order, so, purchase order, po  |  
-------------------------------------------------------------------+--------
 Hi, the total amount of taxes is not calculed in modules quotes, invoices,
 so,po. If the field Adjustment is not egal to something the grand total is
 NaN.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1305>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 04:40:07 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 08:40:07 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231306=3A?=
 =?utf-8?q?_Missing_fields_in_detailview_for_other_langs?=
Message-ID: <076.9fc5d3aab2b86e9e74117e8341c6ee53@vtiger.fosslabs.com>

#1306: Missing fields in detailview for other langs
------------------------------------+---------------------------------------
 Reporter:  abos                    |       Owner:  developer
     Type:  defect                  |      Status:  new      
 Priority:  minor                   |   Milestone:           
Component:  vtigercrm               |     Version:  5.0.0    
 Keywords:  detailview, tranlation  |  
------------------------------------+---------------------------------------
 Hi, for the detailview, in lot of module (leads is correct) we miss fields
 when using another language than english. See attached files for module
 products and accounts.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1306>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 05:02:20 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 14 Jun 2006 09:02:20 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7068 -
	/vtigercrm/trunk/data/SugarBean.php
Message-ID: <20060614090220.08FDA7ECF9A@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 14 03:01:43 2006
New Revision: 7068

Log:
commented out most of the SugarBean code. If all ok, 
then delete the commented code itself.

Modified:
    vtigercrm/trunk/data/SugarBean.php

Modified: vtigercrm/trunk/data/SugarBean.php
==============================================================================
--- vtigercrm/trunk/data/SugarBean.php (original)
+++ vtigercrm/trunk/data/SugarBean.php Wed Jun 14 03:01:43 2006
@@ -164,7 +164,6 @@
  * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
  * All Rights Reserved.
  * Contributor(s): ______________________________________..
-     */
 	 function retrieve($id = -1, $encodeThis=true) {
 		if ($id == -1) {
 			$id = $this->id;
@@ -193,11 +192,9 @@
 				$this->$field = $row[$field];
 			}
 		}
-
-		$this->fill_in_additional_detail_fields();
-
 		return $this;
 	}
+     */
 
 	function get_list($order_by = "", $where = "", $row_offset = 0, $limit=-1, $max=-1) {
 		$this->log->debug("get_list:  order_by = '$order_by' and where = '$where' and limit = '$limit'");
@@ -215,12 +212,6 @@
 	 */
 	function get_full_list($order_by = "", $where = "") {
 		$this->log->debug("get_full_list:  order_by = '$order_by' and where = '$where'");
-		$query = $this->create_list_query($order_by, $where);
-		return $this->process_full_list_query($query);
-	}
-
-	function create_list_query($order_by, $where)
-	{
 		$query = "SELECT * FROM $this->table_name ";
 		
 		if($where != "")
@@ -231,7 +222,45 @@
 		if(!empty($order_by))
 			$query .= " ORDER BY $order_by";
 
-		
+		$result =& $this->db->query($query, false);
+
+		if($this->db->getRowCount($result) > 0){
+		
+			// We have some data.
+			while ($row = $this->db->fetchByAssoc($result)) {
+				foreach($this->list_fields as $field)
+				{
+					if (isset($row[$field])) {
+						$this->$field = $row[$field];
+						
+						$this->log->debug("process_full_list: $this->object_name({$row['id']}): ".$field." = ".$this->$field);
+					}
+					else {
+ 	                                                $this->$field = '';   
+					}
+				}
+
+
+				$list[] = clone($this);         //added clone tosupport PHP5
+			}
+		}
+
+		if (isset($list)) return $list;
+		else return null;
+
+	}
+
+	function create_list_query($order_by, $where)
+	{
+		$query = "SELECT * FROM $this->table_name ";
+		
+		if($where != "")
+			$query .= "where ($where) AND deleted=0";
+		else
+			$query .= "where deleted=0";
+
+		if(!empty($order_by))
+			$query .= " ORDER BY $order_by";
 
 		return $query;
 	}
@@ -278,7 +307,6 @@
 					}
 				}
 
-				$this->fill_in_additional_list_fields();
 
 				$list[] = clone($this);   //added clone to support PHP5
 			}
@@ -293,37 +321,6 @@
 		return $response;
 	}
 
-	function process_full_list_query($query)
-	{
-		$this->log->debug("process_full_list_query: query is ".$query);
-		$result =& $this->db->query($query, false);
-		$this->log->debug("process_full_list_query: result is ".$result);
-
-		if($this->db->getRowCount($result) > 0){
-		
-			// We have some data.
-			while ($row = $this->db->fetchByAssoc($result)) {
-				foreach($this->list_fields as $field)
-				{
-					if (isset($row[$field])) {
-						$this->$field = $row[$field];
-						
-						$this->log->debug("process_full_list: $this->object_name({$row['id']}): ".$field." = ".$this->$field);
-					}
-					else {
- 	                                                $this->$field = '';   
-					}
-				}
-
-				$this->fill_in_additional_list_fields();
-
-				$list[] = clone($this);         //added clone tosupport PHP5
-			}
-		}
-
-		if (isset($list)) return $list;
-		else return null;
-	}
 	
 	/**
 	 * Track the viewing of a detail record.  This leverages get_summary_text() which is object specific
@@ -366,7 +363,7 @@
 	{
 	}
 	*/
-	/* This function assigns all of the values into the template for the list view */
+	/* This function assigns all of the values into the template for the list view 
 	function get_list_view_array(){
 		$return_array = Array();
 		
@@ -427,7 +424,6 @@
 				$this->$field = $row[$field];
 			}
 		} 
-		$this->fill_in_additional_detail_fields();
 		return $this;
 	}
 
@@ -447,6 +443,8 @@
 			} 
 		} 
 	}
+
+	*/
 }
 
 




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 05:08:49 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 14 Jun 2006 09:08:49 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7069 -
	/vtigercrm/trunk/database/DatabaseConnection.php
Message-ID: <20060614090850.8C0F77ECF9A@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 14 03:08:43 2006
New Revision: 7069

Log:
unwanted method removed

Modified:
    vtigercrm/trunk/database/DatabaseConnection.php

Modified: vtigercrm/trunk/database/DatabaseConnection.php
==============================================================================
--- vtigercrm/trunk/database/DatabaseConnection.php (original)
+++ vtigercrm/trunk/database/DatabaseConnection.php Wed Jun 14 03:08:43 2006
@@ -18,44 +18,7 @@
  ********************************************************************************/
 
 class DatabaseConnection {
-/*
-	var $connection;
 
-	function connect() {
-		global $dbconfig;
-		global $disable_persistent_connections;
-
-		$this->connection = false;
-		
-		if(!isset($disable_persistent_connections) || $disable_persistent_connections == false)
-		{
-			$this->connection = @mysql_pconnect($dbconfig['db_host_name'], $dbconfig['db_user_name'], 
-				$dbconfig['db_password']);
-				
-		}
-		
-		if($this->connection == false)
-		{
-			// We were unable to connect with pconnect.  Try connect	
-			$this->connection = mysql_connect($dbconfig['db_host_name'], 
-				$dbconfig['db_user_name'], 
-				$dbconfig['db_password']) 
-				or die("Could not connect to server ".$dbconfig['db_host_name']." as ".$dbconfig['db_user_name'].".".mysql_error());
-
-			if($this->connection == false && !isset($disable_persistent_connections) || $disable_persistent_connections == false)
-			{
-				
-				$_SESSION['administrator_error'] = "<B>Severe Performance Degradation: Persistent Database Connections not working.  Please set \$disable_persistent_connections to true in your config.php file</B>";  			
-			}
-
-		}
-			
-		mysql_select_db($dbconfig['db_name'],$this->connection)
-			or die("Could not select database. Reason: ".mysql_error());
-	}
-	function disconnect() {
-		mysql_close($this->connection);
-	}*/
 
 	function println($msg)
 	{
@@ -63,15 +26,7 @@
 	$log1 =& LoggerManager::getLogger('GS');
 	if(is_array($msg))
 	{
-		$log1->info("PearDatabse ->".print_r($msg,true));
-/*		$log1->fatal("PearDatabse ->".$this->getString($msg));
-		foreach ($msg as $str)
-		{
-			if(is_array($str)) 
-				$this->println($str);
-			else
-				$log1->fatal("PearDatabase ->".$str);
-		}*/		
+			$log1->fatal("PearDatabse ->".print_r($msg,true));
 	}
 	else
 	{




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 05:12:56 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 14 Jun 2006 09:12:56 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7070 -
	/vtigercrm/trunk/include/utils/export.php
Message-ID: <20060614091256.6F0887ECF93@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 14 03:12:52 2006
New Revision: 7070

Log:
passed an additional variable to the method

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 Wed Jun 14 03:12:52 2006
@@ -40,7 +40,7 @@
 
 if(isset($_SESSION['authenticated_user_id']))
 {
-        $result = $current_user->retrieve($_SESSION['authenticated_user_id']);
+        $result = $current_user->retrieve_entity_info($_SESSION['authenticated_user_id'],"users");
         if($result == null)
         {
 		session_destroy();




From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 06:15:11 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 10:15:11 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231307=3A?=
 =?utf-8?q?_Print_function_missing_in_Beta?=
Message-ID: <076.d87e178fda241c6536574413a592943f@vtiger.fosslabs.com>

#1307: Print function missing in Beta
-----------------------+----------------------------------------------------
 Reporter:  gopal      |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  major      |   Milestone:  5.0.0    
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 Print function is missing in v5 beta. We have to provide this option in
 GA.

 Thanks,
 Gopal

 Reported by: Frank in vtiger discussions.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1307>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 06:39:18 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 14 Jun 2006 10:39:18 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7071 -
	/vtigercrm/trunk/soap/contactserialize.php
Message-ID: <20060614103918.4568A7D7E4F@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 14 04:39:13 2006
New Revision: 7071

Log:
unwanted method removed

Modified:
    vtigercrm/trunk/soap/contactserialize.php

Modified: vtigercrm/trunk/soap/contactserialize.php
==============================================================================
--- vtigercrm/trunk/soap/contactserialize.php (original)
+++ vtigercrm/trunk/soap/contactserialize.php Wed Jun 14 04:39:13 2006
@@ -1330,50 +1330,6 @@
 	return "Success";	
 }
  
-function add_contacts_matching_email_address(&$output_list, $email_address, &$seed_contact)	
-{
-  //global $log;
-	$safe_email_address = addslashes($email_address);
-	
-	$where = "email1 like '$safe_email_address' OR email2 like '$safe_email_address'";
-	$response = $seed_contact->get_list("first_name,last_name,primary_address_city", $where, 0);
-	$contactList = $response['list'];
-	
-	//$log->fatal("Retrieved the list");
-	
-	// create a return array of names and email addresses.
-	foreach($contactList as $contact)
-	{
-		//$log->fatal("Adding another contact to the list: $contact-first_name");
-		$output_list[] = Array("first_name"	=> $contact->first_name,
-			"last_name" => $contact->last_name,
-                        "primary_address_city" => $contact->primary_address_city,
-                        "account_name" => $contact->account_name,
-			"id" => $contact->id,
-                        "email_address" => $contact->email1,
-                       "salutation"=>$contact->salutation,
-                       "title"=>$contact->title,
-                       "phone_mobile"=>$contact->phone_mobile,
-                      "reports_to_id"=>$contact->reports_to_id,
-                      "primary_address_street"=>$contact->primary_address_street,
-                     "primary_address_city"=>$contact->primary_address_city,
-                     "primary_address_state"=>$contact->primary_address_state ,
-                     "primary_address_postalcode"=>$contact->primary_address_postalcode,
-                     "primary_address_country"=>$contact->primary_address_country,
-                     "alt_address_city"=>$contact->alt_address_city,
-                    "alt_address_street"=>$contact->alt_address_street,
-                    "alt_address_city"=>$contact->alt_address_city,
-                   "alt_address_state"=>$contact->alt_address_state,
-                   "alt_address_postalcode"=>$contact->alt_address_postalcode,
-                   "alt_address_country"=>$contact->alt_address_country,
-);
-        }
-          }
-
-
-
-
-
 
 function delete_contact($user_name,$id)
 {
@@ -1393,60 +1349,6 @@
         return "Suceeded in deleting contact";
 }
 
-/*
-function sync_contact($user_name)
-{
-  return "synchronized contact successfully";
-}
-*/
-
-/*
-function contact_by_email($email_address) 
-{ 
-  //global $log;
-  //$this->log->debug("Contact by email called with: $email_address" .$email_address);
-	
-	$seed_contact = new Contact();
-	$output_list = Array();
-
-	$email_address_list = explode("; ", $email_address);
-
-	// remove duplicate email addresses
-	$non_duplicate_email_address_list = Array();
-	foreach( $email_address_list as $single_address)
-	{
-		// Check to see if the current address is a match of an existing address
-		$found_match = false;
-		foreach( $non_duplicate_email_address_list as $non_dupe_single)
-		{
-			if(strtolower($single_address) == $non_dupe_single)
-			{
-				$found_match = true;
-				break;
-			}
-		}	
-		
-		if($found_match == false)
-		{
-			$non_duplicate_email_address_list[] = strtolower($single_address);
-		}	
-	}
-	
-	// now copy over the non-duplicated list as the original list.
-	$email_address_list = &$non_duplicate_email_address_list;
-	
-	foreach( $email_address_list as $single_address)
-	{
-          add_contacts_matching_email_address($output_list, $single_address, $seed_contact);	
-	}
-
-	//to remove an erroneous compiler warning
-	$seed_contact = $seed_contact;
-	
-	//$log->debug("Contact by email returning");
-	return $output_list;
-}  
-*/
 function contact_by_search($name) 
 { 
 //	global $log;
@@ -1543,20 +1445,6 @@
 	return $email->id;
 }
 
-/*
-function sync_task($user_name)
-{
-  return "synchronized task successfully";
-}
-
-*/
-
-/*
-
-    array('user_name'=>'xsd:string', 'first_name'=>'xsd:string', 'last_name'=>'xsd:string', 'email_address'=>'xsd:string','account_name'=>'xsd:string', 'salutation'=>'xsd:string', 'title'=>'xsd:string', 'phone_mobile'=>'xsd:string' , 'reports_to_id'=>'xsd:string', 'primary_address_street'=>'xsd:string', 'primary_address_city'=>'xsd:string', 'primary_address_state'=>'xsd:string' , 'primary_address_postalcode'=>'xsd:string', 'primary_address_country'=>'xsd:string', 'alt_address_city'=>'xsd:string', 'alt_address_street'=>'xsd:string','alt_address_city'=>'xsd:string', 'alt_address_state'=>'xsd:string', 'alt_address_postalcode'=>'xsd:string', 'alt_address_country'=>'xsd:string'),
-
-
-*/
 
 function create_contact($user_name, $first_name, $last_name, $email_address ,$account_name , $salutation , $title, $phone_mobile, $reports_to,$primary_address_street,$primary_address_city,$primary_address_state,$primary_address_postalcode,$primary_address_country,$alt_address_city,$alt_address_street,$alt_address_state,$alt_address_postalcode,$alt_address_country,$office_phone="",$home_phone="",$fax="",$department="",$description="")
 {
@@ -2045,46 +1933,9 @@
 	
 	require_once('modules/Contacts/Contact.php');
 	$contact = new Contact();
-	/*
-        $contact->first_name = $first_name;
-	$contact->last_name = $last_name;
-	$contact->email1 = $email_address;
-        //$contact->account_name = $account_name;
-	$contact->account_id=retrieve_account_id($account_name,$user_id);
-        $contact->salutation = $salutation;
-        $contact->title = $title;
-        $contact->phone_mobile = $phone_mobile;
-        $contact->reports_to_id = retrievereportsto($reports_to,$user_id,$contact->account_id);  
-	$contact->primary_address_city = $primary_address_city;
-        $contact->primary_address_postalcode = $primary_address_postalcode;
-        $contact->primary_address_state = $primary_address_state;
-        $contact->primary_address_street = $primary_address_street;
-   $contact->primary_address_country = $primary_address_country; 
-        $contact->alt_address_country = $alt_address_country;
-        $contact->alt_address_postalcode = $alt_address_postalcode;
-        $contact->alt_address_state = $alt_address_state;
-        $contact->alt_address_street = $alt_address_street;
-
-  $contact->alt_address_city = $alt_address_city;
-
-	$contact->id=$id;
-
-	
-
-	$contact->save();
-	*/
 	
 	$contact->column_fields[firstname]=$first_name;
 	$contact->column_fields['lastname']=$last_name;
-	
-	/*if($account_name=='')
-	{
-		$account_name="Vtiger_Crm";
-	}
-	else if($account_name==null)
-	{
-		$account_name="Vtiger_Crm";
-	}*/
 	
 	$contact->column_fields[account_id]=retrieve_account_id($account_name,$user_id);// NULL value is not supported NEED TO FIX
 	
@@ -2580,10 +2431,6 @@
 }
 
 
-//calendar
-
-//$log->fatal("In soap.php");
-
 /* Begin the HTTP listener service and exit. */ 
 $server->service($HTTP_RAW_POST_DATA); 
 




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 06:46:18 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 14 Jun 2006 10:46:18 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7072 -
	/vtigercrm/trunk/modules/Dashboard/index.php
Message-ID: <20060614104618.AF9017D7E4F@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 14 04:46:14 2006
New Revision: 7072

Log:
changes made to include extra graph

Modified:
    vtigercrm/trunk/modules/Dashboard/index.php

Modified: vtigercrm/trunk/modules/Dashboard/index.php
==============================================================================
--- vtigercrm/trunk/modules/Dashboard/index.php (original)
+++ vtigercrm/trunk/modules/Dashboard/index.php Wed Jun 14 04:46:14 2006
@@ -55,7 +55,8 @@
           "ticketsbystatus" => $mod_strings['ticketsbystatus'],
           "ticketsbypriority" => $mod_strings['ticketsbypriority'],
 	  "ticketsbycategory" => $mod_strings['ticketsbycategory'], 
-	  "ticketsbyowner" => $mod_strings['ticketsbyowner'],
+	  "ticketsbyuser" => $mod_strings['ticketsbyuser'],
+	  "ticketsbyteam" => $mod_strings['ticketsbyteam'],
 	  "ticketsbyproduct"=> $mod_strings['ticketsbyproduct'],
           );
           




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 06:46:23 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 14 Jun 2006 10:46:23 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7073 -
	/vtigercrm/trunk/modules/Leads/ListViewTop.php
Message-ID: <20060614104623.42A337191B2@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 14 04:46:18 2006
New Revision: 7073

Log:
unwanted include removed

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

Modified: vtigercrm/trunk/modules/Leads/ListViewTop.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/ListViewTop.php (original)
+++ vtigercrm/trunk/modules/Leads/ListViewTop.php Wed Jun 14 04:46:18 2006
@@ -24,7 +24,6 @@
 {
 	global $log;
 	$log->debug("Entering getNewLeads() method ...");
-	require_once('XTemplate/xtpl.php');
 	require_once("data/Tracker.php");
 	require_once("include/utils/utils.php");
 




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 06:47:49 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 14 Jun 2006 10:47:49 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7074 -
 /vtigercrm/trunk/modules/Dashboard/language/en_us.lang.php
Message-ID: <20060614104749.440027D7E4F@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 14 04:47:45 2006
New Revision: 7074

Log:
label added to include extra graphs

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

Modified: vtigercrm/trunk/modules/Dashboard/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Dashboard/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Dashboard/language/en_us.lang.php Wed Jun 14 04:47:45 2006
@@ -77,7 +77,8 @@
 "ticketsbystatus" => "Tickets by Status",
 "ticketsbypriority" => "Tickets by Priority",
 "ticketsbycategory" => "Tickets by Category",
-"ticketsbyowner" => "Tickets by Owner",
+"ticketsbyuser"=>"Tickets by User",
+"ticketsbyteam"=>"Tickets by Team",
 "ticketsbyproduct"=>"Tickets by Product",
 
 'LBL_DASHBRD_HOME'=>'Dashboard Home',




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 06:50:05 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 14 Jun 2006 10:50:05 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7075 -
	/vtigercrm/trunk/modules/Activities/Activity.php
Message-ID: <20060614105006.0FD5D7ECFAD@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 14 04:50:01 2006
New Revision: 7075

Log:
unwanted method removed

Modified:
    vtigercrm/trunk/modules/Activities/Activity.php

Modified: vtigercrm/trunk/modules/Activities/Activity.php
==============================================================================
--- vtigercrm/trunk/modules/Activities/Activity.php (original)
+++ vtigercrm/trunk/modules/Activities/Activity.php Wed Jun 14 04:50:01 2006
@@ -149,7 +149,7 @@
 
 			if(isPermitted("Contacts",3,"") == 'yes')
 			{
-				$button .= '<input title="Change" accessKey="" vtiger_tabindex="2" type="button" class="button" value="'.$app_strings['LBL_SELECT_CONTACT_BUTTON_LABEL'].'" name="Button" LANGUAGE=javascript onclick=\'return window.open("index.php?module=Contacts&return_module=Activities&action=Popup&popuptype=detailview&form=EditView&form_submit=false&recordid='.$_REQUEST["record"].'","test","width=600,height=400,resizable=1,scrollbars=1");\'>&nbsp;';
+				$button .= '<input title="Change" accessKey="" tabindex="2" type="button" class="button" value="'.$app_strings['LBL_SELECT_CONTACT_BUTTON_LABEL'].'" name="Button" LANGUAGE=javascript onclick=\'return window.open("index.php?module=Contacts&return_module=Activities&action=Popup&popuptype=detailview&form=EditView&form_submit=false&recordid='.$_REQUEST["record"].'","test","width=600,height=400,resizable=1,scrollbars=1");\'>&nbsp;';
 			}
 			$returnset = '&return_module=Activities&return_action=DetailView&activity_mode=Events&return_id='.$id;
 
@@ -286,7 +286,6 @@
     $query = "select vtiger_crmentity.crmid,vtiger_crmentity.smownerid,vtiger_crmentity.setype, vtiger_activity.*, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid from vtiger_activity inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid= vtiger_cntactivityrel.contactid left join vtiger_seactivityrel on vtiger_seactivityrel.activityid = vtiger_activity.activityid WHERE vtiger_crmentity.deleted=0 ".$criteria;
     $result =& $this->db->query($query);
 	echo $query;
-    $this->log->debug("process_full_list_query: result is ".$result);
         
     if($this->db->getRowCount($result) > 0){
 		
@@ -409,7 +408,7 @@
         return $response;
     }
 		
-	function vtiger_activity_reminder($activity_id,$reminder_time,$reminder_sent=0,$recurid,$remindermode='')
+	function activity_reminder($activity_id,$reminder_time,$reminder_sent=0,$recurid,$remindermode='')
 	{
 		global $log;
 		$log->debug("Entering vtiger_activity_reminder(".$activity_id.",".$reminder_time.",".$reminder_sent.",".$recurid.",".$remindermode.") method ...");




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 06:50:46 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 14 Jun 2006 10:50:46 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7076 -
 /vtigercrm/trunk/modules/Activities/GroupAllocationView.php
Message-ID: <20060614105046.561B97ECFAD@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 14 04:50:42 2006
New Revision: 7076

Log:
unwanted include removed

Modified:
    vtigercrm/trunk/modules/Activities/GroupAllocationView.php

Modified: vtigercrm/trunk/modules/Activities/GroupAllocationView.php
==============================================================================
--- vtigercrm/trunk/modules/Activities/GroupAllocationView.php (original)
+++ vtigercrm/trunk/modules/Activities/GroupAllocationView.php Wed Jun 14 04:50:42 2006
@@ -20,7 +20,6 @@
  * Contributor(s): ______________________________________..
  ********************************************************************************/
 
-require_once('XTemplate/xtpl.php');
 require_once("data/Tracker.php");
 require_once('modules/Activities/Activity.php');
 require_once('themes/'.$theme.'/layout_utils.php');




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 06:51:32 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 14 Jun 2006 10:51:32 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7077 -
	/vtigercrm/trunk/modules/Activities/OpenListView.php
Message-ID: <20060614105132.45E477ECFAD@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 14 04:51:21 2006
New Revision: 7077

Log:
unwanted include removed

Modified:
    vtigercrm/trunk/modules/Activities/OpenListView.php

Modified: vtigercrm/trunk/modules/Activities/OpenListView.php
==============================================================================
--- vtigercrm/trunk/modules/Activities/OpenListView.php (original)
+++ vtigercrm/trunk/modules/Activities/OpenListView.php Wed Jun 14 04:51:21 2006
@@ -24,7 +24,6 @@
 {
 	global $log;
         $log->debug("Entering getPendingActivities() method ...");
-	require_once('XTemplate/xtpl.php');
 	require_once("data/Tracker.php");
 	require_once("include/utils/utils.php");
 
@@ -187,7 +186,6 @@
 		else
 			$activity_type = 'Task';
 
-		//$xtpl->assign("ACTIVITY", $activity_fields);
 
 
 		//Code included for showing Overdue Activities in Upcoming Activities -Jaguar




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 06:59:11 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 14 Jun 2006 10:59:11 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7079 - in
 /vtigercrm/trunk/cron: executecron.sh intimateTaskStatus.bat
Message-ID: <20060614105911.D340A7ECFAD@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 14 04:59:07 2006
New Revision: 7079

Log:
Path changed for intimateTaskStatus

Modified:
    vtigercrm/trunk/cron/executecron.sh
    vtigercrm/trunk/cron/intimateTaskStatus.bat

Modified: vtigercrm/trunk/cron/executecron.sh
==============================================================================
--- vtigercrm/trunk/cron/executecron.sh (original)
+++ vtigercrm/trunk/cron/executecron.sh Wed Jun 14 04:59:07 2006
@@ -1,1 +1,1 @@
-wget http://localhost:APACHEPORT/intimateTaskStatus.php -O intimatelog.txt
+wget http://localhost:APACHEPORT/cron/intimateTaskStatus.php -O intimatelog.txt

Modified: vtigercrm/trunk/cron/intimateTaskStatus.bat
==============================================================================
--- vtigercrm/trunk/cron/intimateTaskStatus.bat (original)
+++ vtigercrm/trunk/cron/intimateTaskStatus.bat Wed Jun 14 04:59:07 2006
@@ -1,3 +1,2 @@
 @echo off
-cd ..\
-..\..\..\php\php.exe intimateTaskStatus.php
+..\..\..\..\php\php.exe intimateTaskStatus.php




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 07:02:00 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 14 Jun 2006 11:02:00 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7080 -
	/vtigercrm/trunk/modules/Reports/SaveReport.php
Message-ID: <20060614110201.112477ECFAD@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 14 05:01:57 2006
New Revision: 7080

Log:
unwanted include removed

Modified:
    vtigercrm/trunk/modules/Reports/SaveReport.php

Modified: vtigercrm/trunk/modules/Reports/SaveReport.php
==============================================================================
--- vtigercrm/trunk/modules/Reports/SaveReport.php (original)
+++ vtigercrm/trunk/modules/Reports/SaveReport.php Wed Jun 14 05:01:57 2006
@@ -8,7 +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');




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 07:04:03 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 14 Jun 2006 11:04:03 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7081 -
 /vtigercrm/trunk/modules/Dashboard/display_charts.php
Message-ID: <20060614110403.62D287ECFB8@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 14 05:03:59 2006
New Revision: 7081

Log:
changes made to include extra graph

Modified:
    vtigercrm/trunk/modules/Dashboard/display_charts.php

Modified: vtigercrm/trunk/modules/Dashboard/display_charts.php
==============================================================================
--- vtigercrm/trunk/modules/Dashboard/display_charts.php (original)
+++ vtigercrm/trunk/modules/Dashboard/display_charts.php Wed Jun 14 05:03:59 2006
@@ -46,7 +46,7 @@
 $products_query="select distinct(vtiger_crmentity.crmid),vtiger_crmentity.createdtime,vtiger_products.*, vtiger_poproductrel.purchaseorderid, vtiger_quotesproductrel.quoteid, vtiger_invoiceproductrel.invoiceid,vtiger_productcf.* from vtiger_products inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_products.productid left join vtiger_poproductrel on vtiger_products.productid = vtiger_poproductrel.productid left join vtiger_quotesproductrel on vtiger_products.productid = vtiger_quotesproductrel.productid left join vtiger_invoiceproductrel on vtiger_products.productid = vtiger_invoiceproductrel.productid left join vtiger_productcf on vtiger_products.productid = vtiger_productcf.productid left join vtiger_seproductsrel on vtiger_seproductsrel.productid = vtiger_products.productid where vtiger_crmentity.deleted=0 ";
 
 //Query for Potential
-$potential_query= "select  vtiger_crmentity.*,vtiger_account.accountname, vtiger_potential.*, vtiger_potentialscf.* from vtiger_potential inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_potential.potentialid inner join vtiger_account on vtiger_potential.accountid = vtiger_account.accountid inner join vtiger_potentialscf on vtiger_potentialscf.potentialid = vtiger_potential.potentialid left join vtiger_potentialgrouprelation on vtiger_potential.potentialid=vtiger_potentialgrouprelation.potentialid left join vtiger_groups on vtiger_groups.groupname=vtiger_potentialgrouprelation.groupname left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_crmentity.deleted=0 ";
+$potential_query= "select  vtiger_crmentity.*,vtiger_account.accountname, vtiger_potential.*, vtiger_potentialscf.*, vtiger_potentialgrouprelation.groupname from vtiger_potential inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_potential.potentialid inner join vtiger_account on vtiger_potential.accountid = vtiger_account.accountid inner join vtiger_potentialscf on vtiger_potentialscf.potentialid = vtiger_potential.potentialid left join vtiger_potentialgrouprelation on vtiger_potential.potentialid=vtiger_potentialgrouprelation.potentialid left join vtiger_groups on vtiger_groups.groupname=vtiger_potentialgrouprelation.groupname left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_crmentity.deleted=0 ";
 
 //Query for Sales Order
 $so_query="select vtiger_crmentity.*,vtiger_salesorder.*,vtiger_account.accountid,vtiger_quotes.quoteid from vtiger_salesorder inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_salesorder.salesorderid inner join vtiger_sobillads on vtiger_salesorder.salesorderid=vtiger_sobillads.sobilladdressid inner join vtiger_soshipads on vtiger_salesorder.salesorderid=vtiger_soshipads.soshipaddressid left join vtiger_salesordercf on vtiger_salesordercf.salesorderid = vtiger_salesorder.salesorderid left outer join vtiger_quotes on vtiger_quotes.quoteid=vtiger_salesorder.quoteid left outer join vtiger_account on vtiger_account.accountid=vtiger_salesorder.accountid left join vtiger_sogrouprelation on vtiger_salesorder.salesorderid=vtiger_sogrouprelation.salesorderid left join vtiger_groups on vtiger_groups.groupname=vtiger_sogrouprelation.groupname left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_crmentity.deleted=0 ";
@@ -63,7 +63,7 @@
 $invoice_query="select vtiger_crmentity.*,vtiger_invoice.* from vtiger_invoice inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_invoice.invoiceid inner join vtiger_invoicebillads on vtiger_invoice.invoiceid=vtiger_invoicebillads.invoicebilladdressid inner join vtiger_invoiceshipads on vtiger_invoice.invoiceid=vtiger_invoiceshipads.invoiceshipaddressid left outer join vtiger_salesorder on vtiger_salesorder.salesorderid=vtiger_invoice.salesorderid inner join vtiger_invoicecf on vtiger_invoice.invoiceid = vtiger_invoicecf.invoiceid left join vtiger_invoicegrouprelation on vtiger_invoice.invoiceid=vtiger_invoicegrouprelation.invoiceid left join vtiger_groups on vtiger_groups.groupname=vtiger_invoicegrouprelation.groupname left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_crmentity.deleted=0 ";
 
 //Query for tickets
-$helpdesk_query=" select vtiger_troubletickets.status AS vtiger_ticketstatus, vtiger_troubletickets.*,vtiger_crmentity.* from vtiger_troubletickets inner join vtiger_ticketcf on vtiger_ticketcf.ticketid = vtiger_troubletickets.ticketid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_troubletickets.ticketid left join vtiger_ticketgrouprelation on vtiger_troubletickets.ticketid=vtiger_ticketgrouprelation.ticketid left join vtiger_groups on vtiger_groups.groupname=vtiger_ticketgrouprelation.groupname left join vtiger_contactdetails on vtiger_troubletickets.parent_id=vtiger_contactdetails.contactid left join vtiger_account on vtiger_account.accountid=vtiger_troubletickets.parent_id left join vtiger_users on vtiger_crmentity.smownerid=vtiger_users.id and vtiger_troubletickets.ticketid = vtiger_ticketcf.ticketid where vtiger_crmentity.deleted=0";
+$helpdesk_query=" select vtiger_troubletickets.status AS ticketstatus, vtiger_ticketgrouprelation.groupname AS ticketgroupname, vtiger_troubletickets.*,vtiger_crmentity.* from vtiger_troubletickets inner join vtiger_ticketcf on vtiger_ticketcf.ticketid = vtiger_troubletickets.ticketid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_troubletickets.ticketid left join vtiger_ticketgrouprelation on vtiger_troubletickets.ticketid=vtiger_ticketgrouprelation.ticketid left join vtiger_groups on vtiger_groups.groupname=vtiger_ticketgrouprelation.groupname left join vtiger_contactdetails on vtiger_troubletickets.parent_id=vtiger_contactdetails.contactid left join vtiger_account on vtiger_account.accountid=vtiger_troubletickets.parent_id left join vtiger_users on vtiger_crmentity.smownerid=vtiger_users.id and vtiger_troubletickets.ticketid = vtiger_ticketcf.ticketid where vtiger_crmentity.deleted=0";
 
  /**  This function returns  the values for the graph, for any type of graph needed	 
         * Portions created by vtiger are Copyright (C) vtiger.
@@ -94,7 +94,8 @@
           "ticketsbystatus" => $mod_strings['ticketsbystatus'],
           "ticketsbypriority" => $mod_strings['ticketsbypriority'],
 	  "ticketsbycategory" => $mod_strings['ticketsbycategory'],
-	  "ticketsbyowner" => $mod_strings['ticketsbyowner'],
+	  "ticketsbyuser" => $mod_strings['ticketsbyuser'],
+	  "ticketsbyteam" => $mod_strings['ticketsbyteam'],
 	  "ticketsbyproduct"=> $mod_strings['ticketsbyproduct'],
           );
 function get_graph_by_type($graph_by,$graph_title,$module,$where,$query)
@@ -437,7 +438,7 @@
 			$graph_by="smownerid";
 			$graph_title=$mod_strings['salesbyuser'];
 			$module="Potentials";
-			$where="";
+			$where=" and (crmentity.smownerid != NULL || crmentity.smownerid != ' ')";
 			$query=$potential_query;
 			echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
 		    }
@@ -447,7 +448,7 @@
 			$graph_by="groupname";
 			$graph_title=$mod_strings['salesbyteam'];
 			$module="Potentials";
-			$where="";
+			$where=" and (potentialgrouprelation.groupname != NULL || potentialgrouprelation.groupname != '')";
 			$query=$potential_query;
 			echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
 		    }
@@ -612,16 +613,26 @@
 			    $query=$helpdesk_query;
 			    echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
 		    }
-		    //Tickets by Owner   
-		    elseif (($type == "ticketsbyowner") && (getFieldVisibilityPermission('HelpDesk',$user_id,'ticketowner') == "0"))
+		    //Tickets by User   
+		    elseif (($type == "ticketsbyuser") && (getFieldVisibilityPermission('HelpDesk',$user_id,'ticketuser') == "0"))
 		    {
 			    $graph_by="smownerid";
 			    $graph_title=$mod_strings['ticketsbyowner'];
 			    $module="HelpDesk";
-			    $where="";
+			    $where=" and (crmentity.smownerid != NULL || crmentity.smownerid != ' ')";
 			    $query=$helpdesk_query;
 			    echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
 		    }
+		    //Tickets by Team
+		    elseif (($type == "ticketsbyteam") && (getFieldVisibilityPermission('HelpDesk',$user_id,'ticketteam') == "0"))
+		    {
+			    $graph_by="ticketgroupname";
+			    $graph_title=$mod_strings['ticketsbyteam'];
+			    $module="HelpDesk";
+			    $where=" and (ticketgrouprelation.groupname != NULL || ticketgrouprelation.groupname != ' ')";
+			    $query=$helpdesk_query;
+			    echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
+		    }    
 		    //Tickets by Product
 		    elseif (($type == "ticketsbyproduct") && (getFieldVisibilityPermission('HelpDesk',$user_id,'ticketproduct') == "0"))
 		    {




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 07:08:43 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 14 Jun 2006 11:08:43 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7082 -
 /vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php
Message-ID: <20060614110843.7E0147ECFB8@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 14 05:08:36 2006
New Revision: 7082

Log:
* Modified to handle the attachments

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 Jun 14 05:08:36 2006
@@ -1568,15 +1568,6 @@
 
 $create_query15 = "create vtiger_table vtiger_portal(portalid int(19), vtiger_portalname varchar(255) NOT NULL, vtiger_portalurl varchar(255) NOT NULL,sequence int(3) NOT NULL, PRIMARY KEY (portalid))";
 Execute($create_query15);
-
-$alter_query_array = Array( 
-				"alter vtiger_table vtiger_attachments drop column vtiger_attachmentsize",
-				"alter vtiger_table vtiger_attachments drop column attachmentcontents"
-			    );
-foreach($alter_query_array as $query)
-{
-	Execute($query);
-}
 
 $alter_query = "ALTER TABLE vtiger_field ADD column info_type varchar(20) default NULL after quickcreatesequence";
 Execute($alter_query);
@@ -2746,7 +2737,7 @@
 				"update vtiger_field set uitype=83, vtiger_tablename='producttaxrel' where vtiger_tabid=14 and vtiger_fieldname='taxclass'",
 				"insert into vtiger_moduleowners values(".$this->localGetTabID('Campaigns').",1)",
 
-				"alter vtiger_table vtiger_attachments add column path varchar(255) default NULL"
+				"alter table vtiger_attachments add column path varchar(255) default NULL"
 			     );
 
 foreach($query_array2 as $query)
@@ -2754,7 +2745,65 @@
 	Execute($query);
 }
 
-			     
+//This code will retrieve all the attachments from db and write it in a file
+$attach_query_result = $conn->query("select vtiger_crmentity.createdtime, vtiger_attachments.* from vtiger_attachments inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_attachments.attachmentsid");
+$noof_attachments = $conn->num_rows($attach_query_result);
+for($attach_count = 0;$attach_count < $noof_attachments ;$attach_count++)
+{
+	$attach_id   = $conn->query_result($attach_query_result,$attach_count,'attachmentsid');
+	$attach_name = $conn->query_result($attach_query_result,$attach_count,'name');
+	$attach_data = $conn->query_result($attach_query_result,$attach_count,'attachmentcontents');
+
+	$created_time = $conn->query_result($attach_query_result,$attach_count,'createdtime');
+	//$filepath = decideFilePath();
+
+	//Added to set the file path where to store the file based on the created time	
+	$date = explode(" ",$created_time);
+	$date_details = explode("-",$date[0]);
+
+	$year = $date_details[0];
+	$month = $date_details[1];
+	$day = $date_details[2];
+	
+	//this is used to convert the month from number to string ie., 03 - March, 04 - April, etc.,
+	$month = date("F", mktime(0, 0, 0, $month, $day, $year));
+
+	$week_no = floor(($day-1)/7)+1;//decide the week ie., 1-7 = week1, 8-14=week2, 15-21=week3, etc.,
+	$week = "week".$week_no;
+
+	$filepath = 'storage/';
+	
+	if(!is_dir($filepath.$year))
+		mkdir($filepath.$year);
+	if(!is_dir($filepath.$year."/".$month))
+		mkdir($filepath."$year/$month");
+	if(!is_dir($filepath.$year."/".$month."/".$week))
+		mkdir($filepath."$year/$month/$week");
+
+	$filepath = $filepath.$year."/".$month."/".$week."/";
+	$conn->println("File Path = $filepath");
+	//upto this added to set the file path based on attachment created time
+
+	//write the contents in the file
+	$handle = @fopen($filepath.$attach_name,'w');
+	fputs($handle, base64_decode($attach_data));
+	fclose($handle);
+
+	//update the path in the db
+	$update_attach = Execute("update vtiger_attachments set path='".$filepath."' where attachmentsid=$attach_id");
+}
+
+//Before drop these fields we had read the contents of the file from db and wrote it in a file.
+$alter_query_array = Array( 
+				"alter table vtiger_attachments drop column attachmentsize",
+				"alter table vtiger_attachments drop column attachmentcontents"
+			    );
+foreach($alter_query_array as $query)
+{
+	Execute($query);
+}
+
+
 //To populate the comboStrings for Campaigns module which are added newly
 require_once('include/ComboStrings.php');
 global $combo_strings;




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 07:09:07 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 14 Jun 2006 11:09:07 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7083 - in
 /vtigercrm/trunk/modules/Users: CreateUserPrivilegeFile.php
 EditDefOrgFieldLevelAccess.php ShowHistory.php TabCustomise.php
 UpdateTab.php
Message-ID: <20060614110907.F20357ECFA5@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 14 05:08:59 2006
New Revision: 7083

Log:
unwanted include removed
passed an additional variable to the method

Modified:
    vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php
    vtigercrm/trunk/modules/Users/EditDefOrgFieldLevelAccess.php
    vtigercrm/trunk/modules/Users/ShowHistory.php
    vtigercrm/trunk/modules/Users/TabCustomise.php
    vtigercrm/trunk/modules/Users/UpdateTab.php

Modified: vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php
==============================================================================
--- vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php (original)
+++ vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php Wed Jun 14 05:08:59 2006
@@ -30,8 +30,7 @@
 		$newbuf .="\n";		
 		$newbuf .= "//This is the access privilege file\n";
 		$user_focus= new User();
-		$user_focus->retrieve_entity_info($userid,'Users');
-		
+		$user_focus->retrieve_entity_info($userid,"Users");
 		$userInfo=Array();
 		$user_focus->column_fields["id"] = '';
 		$user_focus->id = $userid; 
@@ -116,7 +115,7 @@
 		$newbuf .="\n";		
 		$newbuf .= "//This is the sharing access privilege file\n";
 		$user_focus= new User();
-		$user_focus->retrieve_entity_info($userid,'Users');
+		$user_focus->retrieve_entity_info($userid,"Users");
 		if($user_focus->is_admin == 'on')
 		{
 			$newbuf .= "\n";
@@ -496,7 +495,7 @@
 		}
 
 
-		//Get vtiger_roles from Role2Grp
+		//Get roles from Role2Grp
 		$grpIterator=false;
 		$groupList = "(";
 		foreach($current_user_groups as $grp_id)
@@ -669,7 +668,7 @@
 		}
 
 
-		//Get vtiger_roles from Rs2Grp
+		//Get roles from Rs2Grp
 
 
 		$query="select vtiger_datashare_rs2grp.* from vtiger_datashare_rs2grp inner join vtiger_datashare_module_rel on vtiger_datashare_module_rel.shareid=vtiger_datashare_rs2grp.shareid where vtiger_datashare_module_rel.tabid=".$mod_tabid." and vtiger_datashare_rs2grp.to_groupid in ".$groupList;
@@ -1421,7 +1420,7 @@
 		$adb->query($query);
 	}
 
-	//Populating Values into the tmp sharing vtiger_tables
+	//Populating Values into the tmp sharing tables
 	$sharingArray=Array('Leads','Accounts','Contacts','Potentials','HelpDesk','Emails','Campaigns','Quotes','PurchaseOrder','SalesOrder','Invoice');
 	foreach($sharingArray as $module)
 	{
@@ -1430,7 +1429,7 @@
 		populateSharingPrivileges('GROUP',$userid,$module,'read');
 		populateSharingPrivileges('GROUP',$userid,$module,'write');
 	}
-	//Populating Values into the temp related sharing vtiger_tables
+	//Populating Values into the temp related sharing tables
 	foreach($related_module_share as $rel_tab_id => $tabid_arr)
 	{
 		$rel_tab_name=getTabname($rel_tab_id);

Modified: vtigercrm/trunk/modules/Users/EditDefOrgFieldLevelAccess.php
==============================================================================
--- vtigercrm/trunk/modules/Users/EditDefOrgFieldLevelAccess.php (original)
+++ vtigercrm/trunk/modules/Users/EditDefOrgFieldLevelAccess.php Wed Jun 14 05:08:59 2006
@@ -12,7 +12,6 @@
 
 
 require_once('include/database/PearDatabase.php');
-require_once('XTemplate/xtpl.php');
 require_once('themes/'.$theme.'/layout_utils.php');
 require_once('include/utils/UserInfoUtil.php');
 require_once('include/utils/utils.php');

Modified: vtigercrm/trunk/modules/Users/ShowHistory.php
==============================================================================
--- vtigercrm/trunk/modules/Users/ShowHistory.php (original)
+++ vtigercrm/trunk/modules/Users/ShowHistory.php Wed Jun 14 05:08:59 2006
@@ -38,7 +38,7 @@
 $focus = new User();
 
 if(isset($_REQUEST['record'])) {
-	$focus->retrieve($_REQUEST['record']);
+	$focus->retrieve_entity_info($_REQUEST['record'],"Users");
 }
 if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') {
 	$focus->id = "";

Modified: vtigercrm/trunk/modules/Users/TabCustomise.php
==============================================================================
--- vtigercrm/trunk/modules/Users/TabCustomise.php (original)
+++ vtigercrm/trunk/modules/Users/TabCustomise.php Wed Jun 14 05:08:59 2006
@@ -28,7 +28,7 @@
 $focus = new User();
 
 if(isset($_REQUEST['record'])) {
-	$focus->retrieve($_REQUEST['record']);
+	$focus->retrieve_entity_info($_REQUEST['record'],"Users");
 }
 if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') {
 	$focus->id = "";
@@ -342,7 +342,7 @@
                 } else if (id.indexOf("fieldlist")>=0) {//if Field List
                         if (currSelItemObj.id.indexOf("fd")<0) {
                                 itemObj.style.cursor='move'
-                                itemObj.className='tableBorder mouseover'       //Hiliting Field List only when added vtiger_fields are removed
+                                itemObj.className='tableBorder mouseover'       //Hiliting Field List only when added fields are removed
                         }
                 }
         }

Modified: vtigercrm/trunk/modules/Users/UpdateTab.php
==============================================================================
--- vtigercrm/trunk/modules/Users/UpdateTab.php (original)
+++ vtigercrm/trunk/modules/Users/UpdateTab.php Wed Jun 14 05:08:59 2006
@@ -25,7 +25,7 @@
 $focus = new User();
 
 if(isset($_REQUEST['record'])) {
-	$focus->retrieve($_REQUEST['record']);
+	$focus->retrieve_entity_info($_REQUEST['record'],"Users");
 }
 if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') {
 	$focus->id = "";
@@ -60,12 +60,12 @@
 	$xtpl->out("user_settings");
 }
 
-$sql_set = "update vtiger_tab set presence=1 where presence !=2";
+$sql_set = "update tab set presence=1 where presence !=2";
 $adb->query($sql_set);
 $j=1;
 foreach($_POST as $name=>$value)
 {
-  $sql="update vtiger_tab set presence=0,tabsequence= " . $j . " where vtiger_tabid = " .$value;
+  $sql="update tab set presence=0,tabsequence= " . $j . " where tabid = " .$value;
   $adb->query($sql);
   $j++;
 }




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 07:11:17 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 14 Jun 2006 11:11:17 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7084 -
	/vtigercrm/trunk/index.php
Message-ID: <20060614111118.1BA687ECFAD@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 14 05:11:14 2006
New Revision: 7084

Log:
uncommented track_view

Modified:
    vtigercrm/trunk/index.php

Modified: vtigercrm/trunk/index.php
==============================================================================
--- vtigercrm/trunk/index.php (original)
+++ vtigercrm/trunk/index.php Wed Jun 14 05:11:14 2006
@@ -15,7 +15,7 @@
 /*********************************************************************************
  * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/index.php,v 1.93 2005/04/21 16:17:25 ray Exp $
  * Description: Main file and starting point for the application.  Calls the 
- * theme header and footer vtiger_files defined for the user as well as the module as 
+ * theme header and footer files defined for the user as well as the module as 
  * defined by the input parameters.
  ********************************************************************************/
 
@@ -105,7 +105,7 @@
 if (isset($_REQUEST['PHPSESSID'])) $log->debug("****Starting for session ".$_REQUEST['PHPSESSID']);
 else $log->debug("****Starting for new session");
 
-// We use the REQUEST_URI later to construct dynamic URLs.  IIS does not pass this vtiger_field
+// We use the REQUEST_URI later to construct dynamic URLs.  IIS does not pass this field
 // to prevent an error, if it is not set, we will assign it to ''
 if(!isset($_SERVER['REQUEST_URI']))
 {
@@ -271,7 +271,7 @@
 			ereg("^Webmails",$module) ))
 	{
 		$skipHeaders=true;
-		//skip vtiger_headers for all these invocations as they are mostly popups
+		//skip headers for all these invocations as they are mostly popups
 		if(ereg("^Popup", $action) ||
 			ereg("^ChangePassword", $action) ||
 			ereg("^Export", $action) ||
@@ -319,7 +319,7 @@
 }
 else {
     // use $default_module and $default_action as set in config.php
-    // Redirect to the correct module with the correct action.  We need the URI to include these vtiger_fields.
+    // Redirect to the correct module with the correct action.  We need the URI to include these fields.
   
 
         header("Location: index.php?action=$default_action&module=$default_module");
@@ -482,7 +482,7 @@
 	if(isset($_REQUEST['record']) && $_REQUEST['record']!='' && $_REQUEST["module"] != "Webmails") 
         {
                 // Only track a viewing if the record was retrieved.
-                //$focus->track_view($current_user->id, $actualModule,$_REQUEST['record']);
+                $focus->track_view($current_user->id, $actualModule,$_REQUEST['record']);
         }
 
 }	
@@ -501,9 +501,9 @@
         setcookie('ck_login_language_vtiger', $_SESSION['authenticated_user_language']);
 }
 
-//skip vtiger_headers for popups, deleting, saving, importing and other actions
+//skip headers for popups, deleting, saving, importing and other actions
 if(!$skipHeaders) {
-	$log->debug("including vtiger_headers");
+	$log->debug("including headers");
 	if($use_current_login)
 	{
 		if(isset($_REQUEST['category']) && $_REQUEST['category'] !='')
@@ -522,7 +522,7 @@
 	if(isset($_SESSION['administrator_error']))
 	{
 		// only print DB errors once otherwise they will still look broken after they are fixed.
-		// Only print the errors for admin vtiger_users.
+		// Only print the errors for admin users.
 		if(is_admin($current_user)) 
 			echo $_SESSION['administrator_error'];
 		unset($_SESSION['administrator_error']);
@@ -531,7 +531,7 @@
 	echo "<!-- startscrmprint -->";
 }
 else {
-		$log->debug("skipping vtiger_headers");
+		$log->debug("skipping headers");
 }
 
 




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 07:48:59 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 14 Jun 2006 11:48:59 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7085 -
	/vtigercrm/trunk/include/utils/SearchUtils.php
Message-ID: <20060614114859.A8AA87ECFAD@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 14 05:48:55 2006
New Revision: 7085

Log:
table name prefixed with vtiger

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 Wed Jun 14 05:48:55 2006
@@ -288,7 +288,7 @@
 			$x=count($explode_column);	
 			if($x == 1 )
 			{
-				$where="$val like '%".$search_string ."%'";
+				$where=" $val like '%".$search_string ."%'";
 			}
 			else 
 			{
@@ -327,7 +327,7 @@
 	if($search_field =='crmid')
 	{
 		$column_name='crmid';
-		$table_name='crmentity';
+		$table_name='vtiger_crmentity';
 		$where="$table_name.$column_name like '%".$search_string."%'";	
 	}else
 	{	
@@ -339,11 +339,11 @@
 			$column_name=$adb->query_result($result,0,'columnname');
 			$table_name=$adb->query_result($result,0,'tablename');
 
-			if($table_name == "crmentity" && $column_name == "smownerid")
+			if($table_name == "vtiger_crmentity" && $column_name == "smownerid")
 			{
 				$where = get_usersid($table_name,$column_name,$search_string);
 			}
-			elseif($table_name == "activity" && $column_name == "status")
+			elseif($table_name == "vtiger_activity" && $column_name == "status")
 			{
 				$where="$table_name.$column_name like '%".$search_string."%' or vtiger_activity.eventstatus like '%".$search_string."%'";
 			}
@@ -555,17 +555,17 @@
 			$srch_val = $_REQUEST[$search_value];
 			list($tab_name,$column_name) = split("[.]",$tab_col);
 			$url_string .="&Fields".$i."=".$tab_col."&Condition".$i."=".$srch_cond."&Srch_value".$i."=".$srch_val;
-			if($tab_col == "crmentity.smownerid")
+			if($tab_col == "vtiger_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;	
 			}
-			elseif($tab_col == "activity.status")
+			elseif($tab_col == "vtiger_activity.status")
 			{
 				$adv_string .= " (".getSearch_criteria($srch_cond,$srch_val,'activity.status')." or";	
 				$adv_string .= " ".getSearch_criteria($srch_cond,$srch_val,'activity.eventstatus')." )".$matchtype;	
 			}
-			elseif($tab_col == "cntactivityrel.contactid")
+			elseif($tab_col == "vtiger_cntactivityrel.contactid")
 			{
 				$adv_string .= " (".getSearch_criteria($srch_cond,$srch_val,'contactdetails.firstname')." or";	
 				$adv_string .= " ".getSearch_criteria($srch_cond,$srch_val,'contactdetails.lastname')." )".$matchtype;	
@@ -614,7 +614,7 @@
 
 	if(isset($date_closed_start) && $date_closed_start != "" && isset($date_closed_end) && $date_closed_end != "")
 	{
-		array_push($where_clauses, "potential.closingdate >= ".$adb->quote($date_closed_start)." and vtiger_potential.closingdate <= ".$adb->quote($date_closed_end));
+		array_push($where_clauses, "vtiger_potential.closingdate >= ".$adb->quote($date_closed_start)." and vtiger_potential.closingdate <= ".$adb->quote($date_closed_end));
 		$url_string .= "&closingdate_start=".$date_closed_start."&closingdate_end=".$date_closed_end;
 	}
 	
@@ -622,16 +622,16 @@
 		if($sales_stage=='Other')
 		array_push($where_clauses, "(vtiger_potential.sales_stage <> 'Closed Won' and vtiger_potential.sales_stage <> 'Closed Lost')");
 		else
-		array_push($where_clauses, "potential.sales_stage = ".$adb->quote($sales_stage));
+		array_push($where_clauses, "vtiger_potential.sales_stage = ".$adb->quote($sales_stage));
 		$url_string .= "&sales_stage=".$sales_stage;
 	}
 	if(isset($lead_source) && $lead_source != "") {
-		array_push($where_clauses, "potential.leadsource = ".$adb->quote($lead_source));
+		array_push($where_clauses, "vtiger_potential.leadsource = ".$adb->quote($lead_source));
 		$url_string .= "&leadsource=".$lead_source;
 	}
 	
 	if(isset($date_closed) && $date_closed != "") {
-		array_push($where_clauses, $adb->getDBDateString("potential.closingdate")." like ".$adb->quote($date_closed.'%')."");
+		array_push($where_clauses, $adb->getDBDateString("vtiger_potential.closingdate")." like ".$adb->quote($date_closed.'%')."");
 		$url_string .= "&date_closed=".$date_closed;
 	}
 	$where = "";




From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 07:50:55 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 11:50:55 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=23851=3A_?=
	=?utf-8?q?advanced_search_issue?=
In-Reply-To: <076.b3d3e6e81efa7d100b1be9e497c241aa@vtiger.fosslabs.com>
References: <076.b3d3e6e81efa7d100b1be9e497c241aa@vtiger.fosslabs.com>
Message-ID: <085.6eeca5ce90183794282be76d10ba2224@vtiger.fosslabs.com>

#851: advanced search issue
------------------------+---------------------------------------------------
  Reporter:  mickie     |       Owner:  philip
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by saraj):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/851>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 07:57:42 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 11:57:42 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23852=3A_?=
 =?utf-8?q?basic_search_not_work_properly_when_come_from_advanced_issue?=
In-Reply-To: <076.638c4aad56664f1dab58e6c4b1cb0bf5@vtiger.fosslabs.com>
References: <076.638c4aad56664f1dab58e6c4b1cb0bf5@vtiger.fosslabs.com>
Message-ID: <085.5592b15c4e57cc0564f249e776c24f0f@vtiger.fosslabs.com>

#852: basic search not work properly when come from advanced issue
------------------------+---------------------------------------------------
  Reporter:  mickie     |       Owner:  philip
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by saraj):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/852>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 08:24:51 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 14 Jun 2006 12:24:51 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7086 -
 /vtigercrm/trunk/modules/Contacts/CallRelatedList.php
Message-ID: <20060614122451.D1BB67ECFCE@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 14 06:24:47 2006
New Revision: 7086

Log:
query has been modified

Modified:
    vtigercrm/trunk/modules/Contacts/CallRelatedList.php

Modified: vtigercrm/trunk/modules/Contacts/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/Contacts/CallRelatedList.php Wed Jun 14 06:24:47 2006
@@ -29,11 +29,11 @@
 }
 
 global $adb;
-$sql = $adb->query('select vtiger_accountid from vtiger_contactdetails where contactid='.$focus->id);
+$sql = $adb->query('select accountid from vtiger_contactdetails where contactid='.$focus->id);
 $accountid = $adb->query_result($sql,0,'accountid');
 if($accountid == 0) $accountid='';
 
-$sql1 = $adb->query('select vtiger_campaignid from vtiger_contactdetails where contactid='.$focus->id);
+$sql1 = $adb->query('select campaignid from vtiger_contactdetails where contactid='.$focus->id);
 $campaignid = $adb->query_result($sql1,0,'campaignid');
 if($campaignid == 0) $campaignid='';
 




From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 08:32:12 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 12:32:12 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23881=3A_?=
 =?utf-8?q?sort_by_is_not_working_in_relatedlist_headers?=
In-Reply-To: <076.f679ccaf4274fcb496a8ad40bcc9549c@vtiger.fosslabs.com>
References: <076.f679ccaf4274fcb496a8ad40bcc9549c@vtiger.fosslabs.com>
Message-ID: <085.d4d523312b10551c41cf3b825ddac20c@vtiger.fosslabs.com>

#881: sort by is not working in relatedlist headers
------------------------+---------------------------------------------------
  Reporter:  mickie     |       Owner:  philip
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by saraj):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/881>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 08:42:36 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 12:42:36 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231308=3A?=
 =?utf-8?q?_Role_security_issue_=28cf_=23599=29?=
Message-ID: <076.c439add42e557216aac6af17846b79b5@vtiger.fosslabs.com>

#1308: Role security issue (cf #599)
----------------------------+-----------------------------------------------
 Reporter:  anonymous       |       Owner:  developer
     Type:  defect          |      Status:  new      
 Priority:  critical        |   Milestone:  5.0.0    
Component:  vtigercrm       |     Version:  5.0.0    
 Keywords:  security roles  |  
----------------------------+-----------------------------------------------
 Settings  > Users & Access Management > Organisation Sharing Privileges
 Add Custom Privilege Rule
 related to issue 599

 if you give to a role A rights to read-only to a role B the role A can
 delete items associated to role B.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1308>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 09:34:36 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 13:34:36 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23913=3A_?=
 =?utf-8?q?parent_tab_selection_issue?=
In-Reply-To: <076.f8a21216a5bb1c53f9233d41dce8cc29@vtiger.fosslabs.com>
References: <076.f8a21216a5bb1c53f9233d41dce8cc29@vtiger.fosslabs.com>
Message-ID: <085.c9372e140558fe50cea52674d0875e47@vtiger.fosslabs.com>

#913: parent tab selection issue
------------------------+---------------------------------------------------
  Reporter:  mickie     |       Owner:  philip
      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 [7087]) Parent tab issue while deleting contact resolved. Fixes #913

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/913>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 09:34:37 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 14 Jun 2006 13:34:37 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7087 - in /vtigercrm/trunk:
 Smarty/templates/DetailView.tpl modules/Contacts/Delete.php
Message-ID: <20060614133437.5EB037ECFDB@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 14 07:34:30 2006
New Revision: 7087

Log:
Parent tab issue while deleting contact resolved. Fixes #913

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

Modified: vtigercrm/trunk/Smarty/templates/DetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DetailView.tpl Wed Jun 14 07:34:30 2006
@@ -64,6 +64,7 @@
 
 		{include file='Buttons_List1.tpl'}
 
+		<input type="hidden" name="parenttab" value={$CATEGORY}></input>
 <!-- Contents -->
 <table border=0 cellspacing=0 cellpadding=0 width=98% align=center>
 <tr>

Modified: vtigercrm/trunk/modules/Contacts/Delete.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/Delete.php (original)
+++ vtigercrm/trunk/modules/Contacts/Delete.php Wed Jun 14 07:34:30 2006
@@ -33,5 +33,7 @@
 //code added for returning back to the current view after delete from list view
 if($_REQUEST['return_viewname'] == '') $return_viewname='0';
 if($_REQUEST['return_viewname'] != '')$return_viewname=$_REQUEST['return_viewname'];
-header("Location: index.php?module=".$_REQUEST['return_module']."&action=".$_REQUEST['return_action']."&activity_mode=".$_REQUEST['activity_mode']."&record=".$_REQUEST['return_id']."&viewname=".$return_viewname);
+if(isset($_REQUEST['parenttab']) && $_REQUEST['parenttab'] != "") $parenttab = $_REQUEST['parenttab'];
+
+header("Location: index.php?module=".$_REQUEST['return_module']."&action=".$_REQUEST['return_action']."&parenttab=$parenttab&activity_mode=".$_REQUEST['activity_mode']."&record=".$_REQUEST['return_id']."&viewname=".$return_viewname);
 ?>




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 09:43:55 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 14 Jun 2006 13:43:55 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7088 - in
 /vtigercrm/trunk/include/utils: CommonUtils.php DetailViewUtils.php
 EditViewUtils.php
Message-ID: <20060614134355.6D2297ECFCA@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 14 07:43:50 2006
New Revision: 7088

Log:
Issues in Users UI types has been fixed

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

Modified: vtigercrm/trunk/include/utils/CommonUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/CommonUtils.php (original)
+++ vtigercrm/trunk/include/utils/CommonUtils.php Wed Jun 14 07:43:50 2006
@@ -245,7 +245,7 @@
 	global $log;
 	$log->debug("Entering getCurrencyName(".$currencyid.") method ...");
         global $adb;
-        $sql1 = "select * from currency_info where id=".$currencyid;
+        $sql1 = "select * from vtiger_currency_info where id=".$currencyid;
         $result = $adb->query($sql1);
         $currencyname = $adb->query_result($result,0,"currency_name");
         $curr_symbol = $adb->query_result($result,0,"currency_symbol");

Modified: vtigercrm/trunk/include/utils/DetailViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/DetailViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/DetailViewUtils.php Wed Jun 14 07:43:50 2006
@@ -55,12 +55,15 @@
 
         if($col_fields[$fieldname]=='--None--')
                 $col_fields[$fieldname]='';
-	
-	if($uitype == 13)
+	if($uitype == 116)
+	{
+		$label_fld[] = $mod_strings[$fieldlabel];
+                $label_fld[] = getCurrencyName($col_fields[$fieldname]);
+	}	
+	elseif($uitype == 13 || $uitype == 115)
 	{
 		$label_fld[] = $mod_strings[$fieldlabel];
 		$label_fld[] = $col_fields[$fieldname];
-		//$label_fld[] = '<a href="mailto:'.$col_fields[$fieldname].'">'.$col_fields[$fieldname].'</a>';
 	}
 	elseif($uitype == 15 || $uitype == 16)
 	{
@@ -808,6 +811,13 @@
                         $reminder_str= $rem_days.'&nbsp;'.$mod_strings['LBL_DAYS'].'&nbsp;'.$rem_hrs.'&nbsp;'.$mod_strings['LBL_HOURS'].'&nbsp;'.$rem_min.'&nbsp;'.$mod_strings['LBL_MINUTES'].'&nbsp;&nbsp;'.$mod_strings['LBL_BEFORE_EVENT'];
                 }
 		$label_fld[] = '&nbsp;'.$reminder_str;
+	}elseif($uitype == 98)
+	{
+	 	$label_fld[] =$mod_strings[$fieldlabel];
+		if(is_admin($current_user))
+			$label_fld[] = '<a href="index.php?module=Users&action=RoleDetailView&roldeid='.$col_fields[$fieldname].'">'.getRoleName($col_fields[$fieldname]).'</a>';
+		else
+			$label_fld[] = getRoleName($col_fields[$fieldname]);
 	}
 	else
 	{

Modified: vtigercrm/trunk/include/utils/EditViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/EditViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/EditViewUtils.php Wed Jun 14 07:43:50 2006
@@ -435,6 +435,12 @@
 		$editview_label[]=$mod_strings[$fieldlabel];
 		$date_format = parse_calendardate($app_strings['NTC_DATE_FORMAT']);
 		$fieldvalue[] = $value;
+	}
+	elseif($uitype == 156)
+	{
+		$editview_label[]=$mod_strings[$fieldlabel];
+		$fieldvalue[] = $value;	
+		$fieldvalue[] = $is_admin;
 	}
 	elseif($uitype == 56)
 	{
@@ -1015,7 +1021,7 @@
 	elseif($uitype == 115)
 	{
 		$editview_label[]=$mod_strings[$fieldlabel];
-		$pick_query="select * from ".$fieldname;
+		$pick_query="select * from vtiger_".$fieldname;
 		$pickListResult = $adb->query($pick_query);
 		$noofpickrows = $adb->num_rows($pickListResult);
 
@@ -1038,11 +1044,12 @@
 			$options[] = array($pickListValue=>$chk_val );	
 		}
 		$fieldvalue [] = $options;
+		$fieldvalue [] = $is_admin;
 	}
 	elseif($uitype == 116)
 	{
 		$editview_label[]=$mod_strings[$fieldlabel];
-		$pick_query="select * from currency_info";
+		$pick_query="select * from vtiger_currency_info";
 		$pickListResult = $adb->query($pick_query);
 		$noofpickrows = $adb->num_rows($pickListResult);
 
@@ -1065,12 +1072,14 @@
 			$options[$currency_id] = array($pickListValue=>$chk_val );	
 		}
 		$fieldvalue [] = $options;
+		$fieldvalue [] = $is_admin;
 	}
 	elseif($uitype ==98)
 	{
 		$editview_label[]=$mod_strings[$fieldlabel];
 		$fieldvalue[]=$value;
-        $fieldvalue[]=getRoleName($value);
+        	$fieldvalue[]=getRoleName($value);
+		$fieldvalue[]=$is_admin;
 	}
 	elseif($uitype == 105)
 	{




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 09:46:26 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 14 Jun 2006 13:46:26 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7089 - in
 /vtigercrm/trunk/Smarty/templates: DetailViewUI.tpl DisplayFields.tpl
Message-ID: <20060614134626.E10E47ECFCA@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 14 07:46:22 2006
New Revision: 7089

Log:
Issues in Users UI types has been fixed

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

Modified: vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl Wed Jun 14 07:46:22 2006
@@ -198,6 +198,8 @@
 							</td>
 	
 
-				{else}
+				{elseif $keyid eq 103}<!-- for Tag Cloud -->
+                                                  	<td class="dvtCellInfo" align="left" width=25%">{$keyval}</td>
+				{else}									
                                                   	<td class="dvtCellInfo" align="left" width=25%">{$keyval}</td>
 				{/if}

Modified: vtigercrm/trunk/Smarty/templates/DisplayFields.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DisplayFields.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DisplayFields.tpl Wed Jun 14 07:46:22 2006
@@ -27,6 +27,7 @@
 		{assign var="fldname" value="$maindata[2][0]"}
 		{assign var="fldvalue" value="$maindata[3][0]"}
 		{assign var="secondvalue" value="$maindata[3][1]"}
+		{assign var="thirdvalue" value="$maindata[3][2]"}
 
 		{if $uitype eq 2}
 			<td width=20% class="dvtCellLabel" align=right>
@@ -456,13 +457,18 @@
 			<td width="20%" class="dvtCellLabel" align=right>
 				{$fldlabel}
 			</td>
+				{if $secondvalue eq 1}
+					{assign var="disable_status" value=""}
+				{else}
+					{assign var="disable_status" value="disabled"}
+				{/if}	
 				{if $fldvalue eq 1}
 					<td width="30%" align=left class="dvtCellInfo">
-						<input name="{$fldname}" type="checkbox"  checked>
+						<input name="{$fldname}" {$disable_status} type="checkbox"  checked>
 					</td>
 				{else}
 					<td width="30%" align=left class="dvtCellInfo">
-						<input name="{$fldname}" type="checkbox">
+						<input name="{$fldname}" {$disable_status} type="checkbox">
 					</td>
 				{/if}
 		{elseif $uitype eq 98}<!-- Role Selection Popup -->		
@@ -471,8 +477,12 @@
 				{$fldlabel}
 			</td>
 			<td width="30%" align=left class="dvtCellInfo">
-			<input name="role_name" id="role_name" class="txtBox" value="{$secondvalue}" type="text">&nbsp;
-			<a href="javascript:openPopup();"><img src="{$IMAGE_PATH}select.gif" align="absmiddle" border="0"></a>
+			{if $thirdvalue eq 1}
+				<input name="role_name" id="role_name" class="txtBox" value="{$secondvalue}" type="text">&nbsp;
+				<a href="javascript:openPopup();"><img src="{$IMAGE_PATH}select.gif" align="absmiddle" border="0"></a>
+			{else}	
+				<input name="role_name" id="role_name" class="txtBox" readonly value="{$secondvalue}" type="text">&nbsp;
+			{/if}	
 			<input name="user_role" id="user_role" value="{$fldvalue}" type="hidden">
 			</td>
 		{elseif $uitype eq 104}<!-- Mandatory Email Fields -->			
@@ -486,7 +496,11 @@
 				{$fldlabel}
 			</td>
 			<td width="30%" align=left class="dvtCellInfo">
-			   <select name="{$fldname}">
+			   {if $secondvalue eq 1}
+			   	<select name="{$fldname}">
+			   {else}
+			   	<select disabled name="{$fldname}">
+			   {/if} 
 				{foreach item=arr from=$fldvalue}
 					{foreach key=sel_value item=value from=$arr}
 						<option value="{$sel_value}" {$value}>{$sel_value}</option>
@@ -514,7 +528,7 @@
 				<td width="20%" class="dvtCellLabel" align=right>
 			       {$fldlabel}
 	            </td>
-				<td width="30%" colspan="3" align=left class="dvtCellInfo">
+				<td width="30%" align=left class="dvtCellInfo">
 				<input readonly name='{$fldname}' class="small" type="text" value='{$fldvalue}'><input name='reports_to_id' type="hidden" value='{$fldvalue}'>&nbsp;<input title="Change [Alt+C]" accessKey="C" type="button" class="small" value='{$UMOD.LBL_CHANGE}' name=btn1 LANGUAGE=javascript onclick='return window.open("index.php?module=Users&action=Popup&form=UsersEditView&form_submit=false","test","width=640,height=522,resizable=0,scrollbars=0");'>
 	            </td>
 			{elseif $uitype eq 116}<!-- for currency in users details-->	
@@ -522,7 +536,12 @@
 				{$fldlabel}
 			</td>
 			<td width="30%" align=left class="dvtCellInfo">
-			   <select name="{$fldname}">
+			   {if $secondvalue eq 1}
+			   	<select name="{$fldname}">
+			   {else}
+			   	<select disabled name="{$fldname}">
+			   {/if} 
+
 				{foreach item=arr key=uivalueid from=$fldvalue}
 					{foreach key=sel_value item=value from=$arr}
 						<option value="{$uivalueid}" {$value}>{$sel_value}</option>




From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 10:04:11 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 14:04:11 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23939=3A_?=
 =?utf-8?q?username_not_displayed_in_contacts_table_in_activity_related_li?=
 =?utf-8?q?st_issue?=
In-Reply-To: <076.d5768cf75230f4a33c4c174f03d2da21@vtiger.fosslabs.com>
References: <076.d5768cf75230f4a33c4c174f03d2da21@vtiger.fosslabs.com>
Message-ID: <085.6b5c9263fb25f3f967f8cfddf6e4ebff@vtiger.fosslabs.com>

#939: username not displayed in contacts table in activity related list issue
------------------------+---------------------------------------------------
  Reporter:  mickie     |       Owner:  philip
      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 [7090]) username made to display in contact releated list. Fixes #939

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/939>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 10:04:12 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 14 Jun 2006 14:04:12 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7090 -
	/vtigercrm/trunk/modules/Activities/Activity.php
Message-ID: <20060614140412.78AFA7ECFE8@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 14 08:04:07 2006
New Revision: 7090

Log:
username made to display in contact releated list. Fixes #939

Modified:
    vtigercrm/trunk/modules/Activities/Activity.php

Modified: vtigercrm/trunk/modules/Activities/Activity.php
==============================================================================
--- vtigercrm/trunk/modules/Activities/Activity.php (original)
+++ vtigercrm/trunk/modules/Activities/Activity.php Wed Jun 14 08:04:07 2006
@@ -154,7 +154,7 @@
 			$returnset = '&return_module=Activities&return_action=DetailView&activity_mode=Events&return_id='.$id;
 
 
-			$query = 'select vtiger_contactdetails.accountid, vtiger_contactdetails.contactid, vtiger_contactdetails.firstname,vtiger_contactdetails.lastname, vtiger_contactdetails.department, vtiger_contactdetails.title, vtiger_contactdetails.email, vtiger_contactdetails.phone, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_contactdetails inner join vtiger_seactivityrel on vtiger_seactivityrel.crmid=vtiger_contactdetails.contactid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid where vtiger_seactivityrel.activityid='.$id.' and vtiger_crmentity.deleted=0';
+			$query = 'select vtiger_users.user_name,vtiger_contactdetails.accountid, vtiger_contactdetails.contactid, vtiger_contactdetails.firstname,vtiger_contactdetails.lastname, vtiger_contactdetails.department, vtiger_contactdetails.title, vtiger_contactdetails.email, vtiger_contactdetails.phone, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_contactdetails inner join vtiger_seactivityrel on vtiger_seactivityrel.crmid=vtiger_contactdetails.contactid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid left join vtiger_users on vtiger_users.id = vtiger_crmentity.smownerid where vtiger_seactivityrel.activityid='.$id.' and vtiger_crmentity.deleted=0';
 			$log->debug("Exiting get_contacts method ...");
 			return GetRelatedList('Activities','Contacts',$focus,$query,$button,$returnset);
         }




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 10:11:04 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 14 Jun 2006 14:11:04 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7091 -
 /vtigercrm/trunk/modules/Dashboard/display_charts.php
Message-ID: <20060614141104.86AE27ECFDE@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 14 08:11:00 2006
New Revision: 7091

Log:
query has been modified

Modified:
    vtigercrm/trunk/modules/Dashboard/display_charts.php

Modified: vtigercrm/trunk/modules/Dashboard/display_charts.php
==============================================================================
--- vtigercrm/trunk/modules/Dashboard/display_charts.php (original)
+++ vtigercrm/trunk/modules/Dashboard/display_charts.php Wed Jun 14 08:11:00 2006
@@ -438,7 +438,7 @@
 			$graph_by="smownerid";
 			$graph_title=$mod_strings['salesbyuser'];
 			$module="Potentials";
-			$where=" and (crmentity.smownerid != NULL || crmentity.smownerid != ' ')";
+			$where=" and (vtiger_crmentity.smownerid != NULL || vtiger_crmentity.smownerid != ' ')";
 			$query=$potential_query;
 			echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
 		    }
@@ -448,7 +448,7 @@
 			$graph_by="groupname";
 			$graph_title=$mod_strings['salesbyteam'];
 			$module="Potentials";
-			$where=" and (potentialgrouprelation.groupname != NULL || potentialgrouprelation.groupname != '')";
+			$where=" and (vtiger_potentialgrouprelation.groupname != NULL || vtiger_potentialgrouprelation.groupname != '')";
 			$query=$potential_query;
 			echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
 		    }
@@ -619,7 +619,7 @@
 			    $graph_by="smownerid";
 			    $graph_title=$mod_strings['ticketsbyowner'];
 			    $module="HelpDesk";
-			    $where=" and (crmentity.smownerid != NULL || crmentity.smownerid != ' ')";
+			    $where=" and (vtiger_crmentity.smownerid != NULL || vtiger_crmentity.smownerid != ' ')";
 			    $query=$helpdesk_query;
 			    echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
 		    }
@@ -629,7 +629,7 @@
 			    $graph_by="ticketgroupname";
 			    $graph_title=$mod_strings['ticketsbyteam'];
 			    $module="HelpDesk";
-			    $where=" and (ticketgrouprelation.groupname != NULL || ticketgrouprelation.groupname != ' ')";
+			    $where=" and (vtiger_ticketgrouprelation.groupname != NULL || vtiger_ticketgrouprelation.groupname != ' ')";
 			    $query=$helpdesk_query;
 			    echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
 		    }    




From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 10:37:14 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 14:37:14 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231020=3A?=
 =?utf-8?q?_FAQ_-_Search_throws_javascript_exception?=
In-Reply-To: <076.61b749f6e782dbb80d04322db36325d8@vtiger.fosslabs.com>
References: <076.61b749f6e782dbb80d04322db36325d8@vtiger.fosslabs.com>
Message-ID: <085.eedbd057c2a702d258a1a9912add8acc@vtiger.fosslabs.com>

#1020: FAQ - Search throws javascript exception
------------------------+---------------------------------------------------
  Reporter:  saraj      |       Owner:  philip    
      Type:  defect     |      Status:  closed    
  Priority:  major      |   Milestone:            
 Component:  vtigercrm  |     Version:  5.0.0     
Resolution:  fixed      |    Keywords:  faq search
------------------------+---------------------------------------------------
Changes (by saraj):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 (In [7092]) Faq search issue fixed. Fixes #1020

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1020>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 10:37:15 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 14 Jun 2006 14:37:15 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7092 -
	/vtigercrm/trunk/include/utils/SearchUtils.php
Message-ID: <20060614143715.5EFB67ECFFD@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 14 08:37:11 2006
New Revision: 7092

Log:
Faq search issue fixed. Fixes #1020

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 Wed Jun 14 08:37:11 2006
@@ -15,8 +15,8 @@
 require_once('include/ComboUtil.php'); //new
 require_once('include/utils/CommonUtils.php'); //new
 	
-$column_array=array('accountid','contact_id');
-$table_col_array=array('vtiger_account.accountname','vtiger_contactdetails.firstname,vtiger_contactdetails.lastname');
+$column_array=array('accountid','contact_id','product_id');
+$table_col_array=array('vtiger_account.accountname','vtiger_contactdetails.firstname,vtiger_contactdetails.lastname','vtiger_products.productname');
 
 /**This function is used to get the list view header values in a list view during search
 *Param $focus - module object




From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 10:40:26 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 14:40:26 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231033=3A?=
 =?utf-8?q?_Advanced_search_not_working?=
In-Reply-To: <076.1e3b2b27397659ad6ee116717f9fcc28@vtiger.fosslabs.com>
References: <076.1e3b2b27397659ad6ee116717f9fcc28@vtiger.fosslabs.com>
Message-ID: <085.b74d911de962a2cb8805d1946de88ab5@vtiger.fosslabs.com>

#1033: Advanced search not working
---------------------------+------------------------------------------------
  Reporter:  jerrydgeorge  |       Owner:  philip
      Type:  defect        |      Status:  closed
  Priority:  major         |   Milestone:        
 Component:  vtigercrm     |     Version:  5.0.0 
Resolution:  fixed         |    Keywords:        
---------------------------+------------------------------------------------
Changes (by saraj):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1033>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 10:44:31 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 14:44:31 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23951=3A_?=
 =?utf-8?q?Alphabetical_Search_Option_hidden_in_Advanced_Search_mode?=
In-Reply-To: <076.ffa1f6294657a1518192941039b69227@vtiger.fosslabs.com>
References: <076.ffa1f6294657a1518192941039b69227@vtiger.fosslabs.com>
Message-ID: <085.334f4eccb7c7fbadd5c7e4d1d8f83be8@vtiger.fosslabs.com>

#951: Alphabetical Search Option hidden in Advanced Search mode
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  philip
      Type:  defect     |      Status:  closed
  Priority:  minor      |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  wontfix    |    Keywords:        
------------------------+---------------------------------------------------
Changes (by saraj):

  * resolution:  => wontfix
  * status:  new => closed

Comment:

 We have provided alphabetical search only for basic search and not for
 advance. Also this a part of basic search.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/951>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 11:46:32 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 15:46:32 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231309=3A?=
 =?utf-8?q?_Insert_quote=3A_PearDatabase=2Ephp_on_line_440?=
Message-ID: <076.186c762880d05d8b6373c69434b073dc@vtiger.fosslabs.com>

#1309: Insert quote: PearDatabase.php on line 440
-----------------------------------------+----------------------------------
 Reporter:  michael at flooringdepot.co.za  |       Owner:  developer
     Type:  defect                       |      Status:  new      
 Priority:  critical                     |   Milestone:  4.2.4    
Component:  vtigercrm                    |     Version:  4.2.4rc3 
 Keywords:  PearDatabase.php  line 440   |  
-----------------------------------------+----------------------------------
 I seem to have a problem creating a quote. Once I have created a lead
 converted it and then viewed the account, I then create a quote. Once the
 quote has been created, it returns to the ACCOUNT LIST view. Where it then
 shows the error,
 Fatal error: Call to a member function on a non-object in
 C:\wamp\www\vtiger44\include\database\PearDatabase.php on line 440

 It seems that something is not hundreds when using SQL.
 It seems that this problem has remained from 4.2.3.
 This error does not appear in BETA 5, however I would prefer running the
 stable 4.2.4.

 I am using Apache/2.0.55 (Win32),
 PHP version : 4.4.2 Loaded extensions :standard, bcmath, calendar, ctype,
 com, ftp, mysql, odbc, overload, pcre, session, tokenizer, xml, wddx,
 zlib, apache2handler, mbstring, gd.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1309>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 12:46:00 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 14 Jun 2006 16:46:00 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7093 -
	/vtigercrm/trunk/modules/Leads/Lead.php
Message-ID: <20060614164601.7C3BF7ED163@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 14 10:45:55 2006
New Revision: 7093

Log:
Removed vtiger prefix from the column activitytype - ahmed

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

Modified: vtigercrm/trunk/modules/Leads/Lead.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/Lead.php (original)
+++ vtigercrm/trunk/modules/Leads/Lead.php Wed Jun 14 10:45:55 2006
@@ -193,7 +193,7 @@
 
 
 	// First, get the list of IDs.
-	$query = "SELECT vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid, vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name,vtiger_recurringevents.recurringtype from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and (activitytype='Task' or vtiger_activitytype='Call' or vtiger_activitytype='Meeting') and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Completed') and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Deferred') or (vtiger_activity.eventstatus !='' && vtiger_activity.eventstatus != 'Held')";
+	$query = "SELECT vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid, vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name,vtiger_recurringevents.recurringtype from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting') and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Completed') and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Deferred') or (vtiger_activity.eventstatus !='' && vtiger_activity.eventstatus != 'Held')";
 	$log->debug("Exiting get_activities method ...");
 	return  GetRelatedList('Leads','Activities',$focus,$query,$button,$returnset);
 }




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 12:47:21 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 14 Jun 2006 16:47:21 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7094 -
	/vtigercrm/trunk/modules/Leads/CallRelatedList.php
Message-ID: <20060614164721.D63A17ED163@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 14 10:47:18 2006
New Revision: 7094

Log:
removed the vtiger prefix from fieldname- ahmed

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

Modified: vtigercrm/trunk/modules/Leads/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/Leads/CallRelatedList.php Wed Jun 14 10:47:18 2006
@@ -47,7 +47,7 @@
        unset($_SESSION['rlvs']);
  }
 	
-$sql1 = $adb->query('select vtiger_campaignid from vtiger_leaddetails where leadid='.$focus->id);
+$sql1 = $adb->query('select campaignid from vtiger_leaddetails where leadid='.$focus->id);
 $campaignid = $adb->query_result($sql1,0,'campaignid');
 if($campaignid == 0) $campaignid='';
 $smarty->assign("campaignid",$campaignid);




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 14 12:49:26 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 14 Jun 2006 16:49:26 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7095 -
	/vtigercrm/trunk/modules/uploads/add2db.php
Message-ID: <20060614164926.E806E7ED163@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 14 10:49:23 2006
New Revision: 7095

Log:
Added the prefix vtiger to tables names - ahmed

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

Modified: vtigercrm/trunk/modules/uploads/add2db.php
==============================================================================
--- vtigercrm/trunk/modules/uploads/add2db.php (original)
+++ vtigercrm/trunk/modules/uploads/add2db.php Wed Jun 14 10:49:23 2006
@@ -58,16 +58,16 @@
 			$description = addslashes($desc);
 			$date_var = date('YmdHis');
 
-			$query = "insert into crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime) values('";
+			$query = "insert into vtiger_crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime) values('";
 			$query .= $current_id."','".$current_user->id."','".$current_user->id."','".$_REQUEST['return_module'].' Attachment'."','".$description."','".$date_var."')";
 			$result = $adb->query($query);
 
-			$sql = "insert into attachments values(";
+			$sql = "insert into vtiger_attachments values(";
 			$sql .= $current_id.",'".$filename."','".$description."','".$filetype."','".$upload_filepath."')";
 			$result = $adb->query($sql);
 
 
-			$sql1 = "insert into seattachmentsrel values('";
+			$sql1 = "insert into vtiger_seattachmentsrel values('";
 			$sql1 .= $crmid."','".$current_id."')";
 			$result = $adb->query($sql1);
 




From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 13:03:15 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 17:03:15 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231310=3A?=
 =?utf-8?q?_Translation_for_=22my_preference=22_=26_home_page?=
Message-ID: <076.a6a7ecaca440fce3cdf9dde7ec76ec0a@vtiger.fosslabs.com>

#1310: Translation for "my preference" & home page
---------------------------------------------------+------------------------
 Reporter:  abos                                   |       Owner:  developer
     Type:  defect                                 |      Status:  new      
 Priority:  minor                                  |   Milestone:           
Component:  vtigercrm                              |     Version:  5.0.0    
 Keywords:  translation, homepage, my preferences  |  
---------------------------------------------------+------------------------
 Hi,
 in homepage, and my preference,
 the strings This Year,This week, This day
 have to be translated.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1310>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 13:07:37 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 17:07:37 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231311=3A?=
	=?utf-8?q?_Error_on_report_module_link?=
Message-ID: <076.c88d9dad0e512beb782fc9feab6fceee@vtiger.fosslabs.com>

#1311: Error on report module link
----------------------------------+-----------------------------------------
 Reporter:  abos                  |       Owner:  developer
     Type:  defect                |      Status:  new      
 Priority:  major                 |   Milestone:           
Component:  vtigercrm             |     Version:  5.0.0    
 Keywords:  reports, translation  |  
----------------------------------+-----------------------------------------
 Hi,
 the links to create a report (the dropdown with module name) pass the
 translated name of the module, not the real name.
 So we obtain a Warning: Invalid argument supplied for foreach() in....

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1311>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 13:17:56 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 17:17:56 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231309=3A?=
 =?utf-8?q?_Insert_quote=3A_PearDatabase=2Ephp_on_line_440?=
In-Reply-To: <076.186c762880d05d8b6373c69434b073dc@vtiger.fosslabs.com>
References: <076.186c762880d05d8b6373c69434b073dc@vtiger.fosslabs.com>
Message-ID: <085.bbc04969878245434633c1e6ea1fbdd2@vtiger.fosslabs.com>

#1309: Insert quote: PearDatabase.php on line 440
------------------------------------------+---------------------------------
  Reporter:  michael at flooringdepot.co.za  |       Owner:  developer                 
      Type:  defect                       |      Status:  closed                    
  Priority:  critical                     |   Milestone:  4.2.4                     
 Component:  vtigercrm                    |     Version:  4.2.4rc3                  
Resolution:  duplicate                    |    Keywords:  PearDatabase.php  line 440
------------------------------------------+---------------------------------
Changes (by allanbush):

  * resolution:  => duplicate
  * status:  new => closed

Comment:

 This is the same problem as ticket #1281.

 People seems to be experiencing this a lot (I'm not sure why it wasn't
 discovered in 4.2.3 as it has the same bug) I think we should create a
 4.2.4.1 release to fix this issue.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1309>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 13:24:47 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 17:24:47 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231312=3A?=
	=?utf-8?q?_Lead_conversion_fails?=
Message-ID: <076.cad199d426a899437d6da0170c5b1684@vtiger.fosslabs.com>

#1312: Lead conversion fails
-----------------------+----------------------------------------------------
 Reporter:  allanbush  |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  major      |   Milestone:  4.2.4    
Component:  vtigercrm  |     Version:  4.2.4rc3 
 Keywords:  sql        |  
-----------------------+----------------------------------------------------
 There's an SQL query in lead conversion due to a double set of quotes
 around the leadsource when inserting into contactsubdetails.

 Depending on the database transaction support this either causes the
 entire conversion to fail or the contactsubdetails entry to be missing.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1312>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 13:25:56 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 17:25:56 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231313=3A?=
	=?utf-8?q?_Pop_up_size?=
Message-ID: <076.d5cfe0f287242a74ba422f819314f615@vtiger.fosslabs.com>

#1313: Pop up size
-----------------------------------+----------------------------------------
 Reporter:  abos                   |       Owner:  developer
     Type:  defect                 |      Status:  new      
 Priority:  major                  |   Milestone:           
Component:  vtigercrm              |     Version:  5.0.0    
 Keywords:  email, report, pop up  |  
-----------------------------------+----------------------------------------
 Hi, for some module, the pop up are too small.
 Report creation, email compose.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1313>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 13:42:44 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 17:42:44 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231314=3A?=
 =?utf-8?q?_Create_a_4=2E2=2E4=2E1_release?=
Message-ID: <076.0bb25652495a5800a354264247f65b15@vtiger.fosslabs.com>

#1314: Create a 4.2.4.1 release
-----------------------+----------------------------------------------------
 Reporter:  allanbush  |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  major      |   Milestone:  4.2.4    
Component:  vtigercrm  |     Version:  4.2.4rc3 
 Keywords:             |  
-----------------------+----------------------------------------------------
 I'm proposing a 4.2.4.1 release to the fix for ticket #1281 out.

 I propose we waiting until Monday (June 19th) to see if any other bugs
 come up and then release the update that day.

 To do this we should reopen the 4.2.4 branch and create the changes there
 and tag it as 4.2.4.1 before release.  I'm not sure what the proper way to
 do this is, I'm thinking we do svn merge -r 6963:6962
 http://vtiger.fosslabs.com/svn/vtgier/vtigercrm/branches/4.2.4

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1314>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 13:43:17 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 17:43:17 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231314=3A?=
 =?utf-8?q?_Create_a_4=2E2=2E4=2E1_release?=
In-Reply-To: <076.0bb25652495a5800a354264247f65b15@vtiger.fosslabs.com>
References: <076.0bb25652495a5800a354264247f65b15@vtiger.fosslabs.com>
Message-ID: <085.f675800880e6731d95a26f5c475320e9@vtiger.fosslabs.com>

#1314: Create a 4.2.4.1 release
------------------------+---------------------------------------------------
  Reporter:  allanbush  |       Owner:  developer
      Type:  defect     |      Status:  new      
  Priority:  major      |   Milestone:  4.2.4    
 Component:  vtigercrm  |     Version:  4.2.4rc3 
Resolution:             |    Keywords:           
------------------------+---------------------------------------------------
Comment (by allanbush):

 Ticket #1312 should be included in this release as well.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1314>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 14:20:40 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 18:20:40 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231315=3A?=
	=?utf-8?q?_security_default_settings?=
Message-ID: <076.a7f8c2b4c218135f5d494288a285aeb9@vtiger.fosslabs.com>

#1315: security default settings
-----------------------------+----------------------------------------------
 Reporter:  web at reponse.net  |       Owner:  developer
     Type:  enhancement      |      Status:  new      
 Priority:  major            |   Milestone:           
Component:  vtigercrm        |     Version:  5.0.0    
 Keywords:  security roles   |  
-----------------------------+----------------------------------------------
 Security Management - Test Cases     Author: Gopal

 Users at higher role can access  provided they have access privilege at
 profile level. For example, "VP Engineering" can access data of "Manager
 1" only if he/she has privilege to access all the modules "Manager 1" has.
 ----
 I think this should not be automatic, the GUI give a quick way to do that.
 For exemple, In my case i need for legal resons that the higher role can
 read but not modify other users data below their hierarchy.
 Actually we can manage nothing about that. (perhaps an option)
 :-)

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1315>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 14:50:27 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 18:50:27 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231314=3A?=
 =?utf-8?q?_Create_a_4=2E2=2E4=2E1_release?=
In-Reply-To: <076.0bb25652495a5800a354264247f65b15@vtiger.fosslabs.com>
References: <076.0bb25652495a5800a354264247f65b15@vtiger.fosslabs.com>
Message-ID: <085.05ae76a64a853c89bbcaa4d42c47d552@vtiger.fosslabs.com>

#1314: Create a 4.2.4.1 release
------------------------+---------------------------------------------------
  Reporter:  allanbush  |       Owner:  developer
      Type:  defect     |      Status:  new      
  Priority:  major      |   Milestone:  4.2.4    
 Component:  vtigercrm  |     Version:  4.2.4rc3 
Resolution:             |    Keywords:           
------------------------+---------------------------------------------------
Comment (by jeffk):

 You can copy the URL at REV to the same name, current rev. You're carrying
 that node across revision space and dropping it at current revision with a
 name you specify, which happens to be the same name in this case.

 The branch was removed by r6963, so copy the URL from one revision
 previous to that
 {{{

 svn cp -r 6962
 http://vtiger.fosslabs.com/svn/vtgier/vtigercrm/branches/4.2.4 \
 http://vtiger.fosslabs.com/svn/vtgier/vtigercrm/branches/4.2.4

 }}}

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1314>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 14 14:53:23 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 14 Jun 2006 18:53:23 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231314=3A?=
 =?utf-8?q?_Create_a_4=2E2=2E4=2E1_release?=
In-Reply-To: <076.0bb25652495a5800a354264247f65b15@vtiger.fosslabs.com>
References: <076.0bb25652495a5800a354264247f65b15@vtiger.fosslabs.com>
Message-ID: <085.fcf140227a33895440712ca713226a30@vtiger.fosslabs.com>

#1314: Create a 4.2.4.1 release
------------------------+---------------------------------------------------
  Reporter:  allanbush  |       Owner:  developer
      Type:  defect     |      Status:  new      
  Priority:  major      |   Milestone:  4.2.4    
 Component:  vtigercrm  |     Version:  4.2.4rc3 
Resolution:             |    Keywords:           
------------------------+---------------------------------------------------
Comment (by jeffk):

 Or, the seond URL in the svn cp could be given the name 4.2.4.1, which
 would be consistent with what the release is going to be named.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1314>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 01:13:27 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 05:13:27 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231316=3A?=
	=?utf-8?q?_Problem_in_VCRM_4=2E2=2E4?=
Message-ID: <076.bd13c28908a052328e19e2f345da9f18@vtiger.fosslabs.com>

#1316: Problem in VCRM 4.2.4
---------------------------------------+------------------------------------
 Reporter:  Simon                      |       Owner:  developer
     Type:  defect                     |      Status:  new      
 Priority:  major                      |   Milestone:  4.2.4    
Component:  vtigercrm                  |     Version:           
 Keywords:  email, quote, sales order  |  
---------------------------------------+------------------------------------
 Hi all,
 i am a new user to the vtiger crm, below is the error after i try install
 and use the VCRM (vtiger crm) 4.2.4 with the source files
 http://www.vtiger.com/download/vtigercrm-4.2.4.exe:-


 1. when creating a new event in module activity, the 'send notification'
 is still function error while my setting is configurated already.
 (Settings->Outgoing Mail Server Configuration, vtiger user who is assigned
 to the activity that is the one who will be getting the email has a valid
 email address entered in their user settings already, vtiger user has a
 valid email address entered in their user settings already).

 'Mail Error : Please check your outgoing mail server configuration in
 Settings->Outgoing Mail Server Configuration OR MailId for the present
 user is not Configured'

 2. When sending a email using [New Email], it cannot be sent, below is the
 error message,

 'Please Check the Mail Server Name...'

 3. when creating a sales order directly from a quote, it contains bug too.
 if you follows below step to create a sales order:-
 -create a quote using [New Quote], and save it
 -then open [Export To PDF] to view the quote in pdf
 -then create sales order directly from quote using [Create Sales Order]
 above the detail view of that quote and save it
 -then the bug occur which is the detail view of sales order is empty after
 save.

 4. i can't view module Quote (continue from no.3).

 'Fatal error: Call to a member function on a non-object in C:\Program
 Files\vtigerCRM4.2.4rc2\apache\htdocs\vtigerCRM\include\database\PearDatabase.php
 on line 440'

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1316>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 01:58:33 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 05:58:33 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=2343=3A_m?=
 =?utf-8?q?ysql5_support_for_4=2E2?=
In-Reply-To: <076.5bcca5c51fbf18f9d9447ba5444f5acd@vtiger.fosslabs.com>
References: <076.5bcca5c51fbf18f9d9447ba5444f5acd@vtiger.fosslabs.com>
Message-ID: <085.b4b2a35290be280e339c43d8e880a1f9@vtiger.fosslabs.com>

#43: mysql5 support for 4.2
--------------------------+-------------------------------------------------
  Reporter:  fathi        |       Owner:  developer
      Type:  enhancement  |      Status:  new      
  Priority:  major        |   Milestone:  4.2.5    
 Component:  vtigercrm    |     Version:  4.2.4rc1 
Resolution:               |    Keywords:  mysql    
--------------------------+-------------------------------------------------
Comment (by allanbush):

 As postgres support has landed it seems to me that most of these issues
 should be fixed now.

 I'm unsure of the timestamp problems.  This seems like a mysql bug (the
 generated table creation code is valid SQL) is it only present in certain
 version of mysql 5.0.x? I seem to remember the first couple being pretty
 buggy.

 Re Changing ON DELETE CASCADE to ON DELETE NO ACTION would simply
 determining and removing the circular references work instead?  If not
 can't we just leave the ON DELETE part out (I'm pretty sure NO ACTION must
 be the default on just about every database).

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/43>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 02:07:29 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 06:07:29 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=2348=3A_S?=
 =?utf-8?q?ales_Orders_Created_from_Quote_are_not_saved_and_do_not_retain_?=
 =?utf-8?q?associations?=
In-Reply-To: <076.6d585e55b32136b76a36642c5be35e19@vtiger.fosslabs.com>
References: <076.6d585e55b32136b76a36642c5be35e19@vtiger.fosslabs.com>
Message-ID: <085.0cf25ed16d48ef745af93cd6f21a335d@vtiger.fosslabs.com>

#48: Sales Orders Created from Quote are not saved and do not retain
associations
-----------------------------------------------+----------------------------
  Reporter:  onwealdandy <arodes at onweald.com>  |       Owner:  developer
      Type:  defect                            |      Status:  closed   
  Priority:  major                             |   Milestone:  4.2.5    
 Component:  vtigercrm                         |     Version:  4.2.3    
Resolution:  fixed                             |    Keywords:  order    
-----------------------------------------------+----------------------------
Changes (by allanbush):

  * resolution:  => fixed
  * status:  reopened => closed

Comment:

 I'm pretty sure that changeset:5080 fixed this issue (for invoices and
 orders as well as quotes).

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/48>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 02:12:12 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 06:12:12 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231317=3A?=
	=?utf-8?q?_Compose_Email_Page_Issue?=
Message-ID: <076.a9eeeed40174d2838271904b6989fe27@vtiger.fosslabs.com>

#1317: Compose Email Page Issue
--------------------------+-------------------------------------------------
 Reporter:  jerrydgeorge  |       Owner:  Ela  
     Type:  defect        |      Status:  new  
 Priority:  blocker       |   Milestone:       
Component:  vtigercrm     |     Version:  5.0.0
 Keywords:                |  
--------------------------+-------------------------------------------------
 Unable to find the Send Button

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1317>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 02:14:36 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 06:14:36 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7096 -
 /vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php
Message-ID: <20060615061437.1E6CE7ED1B9@vtiger.fosslabs.com>

Author: don
Date: Thu Jun 15 00:14:32 2006
New Revision: 7096

Log:
added vtiger_ prefix for table names

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

Modified: vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php (original)
+++ vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php Thu Jun 15 00:14:32 2006
@@ -25,7 +25,7 @@
 
 //checking if the user is trying to create a custom vtiger_field which already exists  
 
-$checkquery="select * from vtiger_field where vtiger_tabid='".$tabid."'and vtiger_fieldlabel='".$fldlabel."'";
+$checkquery="select * from vtiger_field where tabid='".$tabid."'and fieldlabel='".$fldlabel."'";
 $checkresult=$adb->query($checkquery);
 
 if($adb->num_rows($checkresult) != 0)
@@ -256,7 +256,7 @@
 		}
 		else
 		{
-			$query = "update vtiger_field set vtiger_fieldlabel='".$fldlabel."',typeofdata='".$uichekdata."' where vtiger_fieldid=".$_REQUEST['fieldid'];
+			$query = "update vtiger_field set fieldlabel='".$fldlabel."',typeofdata='".$uichekdata."' where fieldid=".$_REQUEST['fieldid'];
 			$adb->query($query);
 		}
 		//Inserting values into vtiger_profile2field vtiger_tables
@@ -283,7 +283,7 @@
 			// Creating the PickList Table and Populating Values
 			$adb->createTable($columnName, $columnName." C(255)");
 			//Adding Primary Key
-			$qur = "ALTER vtiger_table ".$columnName." ADD PRIMARY KEY (". $columnName.")";
+			$qur = "ALTER table ".$columnName." ADD PRIMARY KEY (". $columnName.")";
 			$adb->query($qur);
 
 			$fldPickList =  $_REQUEST['fldPickList'];




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 02:17:34 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 06:17:34 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7097 -
	/vtigercrm/trunk/modules/Settings/CurrencyDelete.php
Message-ID: <20060615061735.1C65F7ED1BD@vtiger.fosslabs.com>

Author: don
Date: Thu Jun 15 00:17:31 2006
New Revision: 7097

Log:
added vtiger_ prefix for table names

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

Modified: vtigercrm/trunk/modules/Settings/CurrencyDelete.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/CurrencyDelete.php (original)
+++ vtigercrm/trunk/modules/Settings/CurrencyDelete.php Thu Jun 15 00:17:31 2006
@@ -11,7 +11,7 @@
 
 $del_id = $_REQUEST['delete_currency_id'];
 $tran_id = $_REQUEST['transfer_currency_id'];
-$sql0 = "update vtiger_users set vtiger_currency_id=".$tran_id." where vtiger_currency_id=".$del_id;
+$sql0 = "update vtiger_users set currency_id=".$tran_id." where currency_id=".$del_id;
 $adb->query($sql0);
 $sql = "delete from vtiger_currency_info where id =".$del_id;
 $adb->query($sql);




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 02:19:14 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 06:19:14 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7098 -
 /vtigercrm/trunk/modules/Settings/CurrencyEditView.php
Message-ID: <20060615061914.EE5DE7ED1BD@vtiger.fosslabs.com>

Author: don
Date: Thu Jun 15 00:19:11 2006
New Revision: 7098

Log:
prefixed vtiger_ in all table names

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

Modified: vtigercrm/trunk/modules/Settings/CurrencyEditView.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/CurrencyEditView.php (original)
+++ vtigercrm/trunk/modules/Settings/CurrencyEditView.php Thu Jun 15 00:19:11 2006
@@ -21,7 +21,7 @@
         $sql = "select * from vtiger_currency_info where id=".$tempid;
         $result = $adb->query($sql);
         $currencyResult = $adb->fetch_array($result);
-	$sql1 = "select * from vtiger_users where vtiger_currency_id=".$tempid;
+	$sql1 = "select * from vtiger_users where currency_id=".$tempid;
 	$result1 = $adb->query($sql1);
 	$noofrows = $adb->num_rows($result1);
 	if($noofrows != 0)




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 02:22:45 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 06:22:45 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7099 -
 /vtigercrm/trunk/modules/Settings/DeleteCustomField.php
Message-ID: <20060615062245.88B137ED1BD@vtiger.fosslabs.com>

Author: don
Date: Thu Jun 15 00:22:41 2006
New Revision: 7099

Log:
prefixed vtiger_ in all table names

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

Modified: vtigercrm/trunk/modules/Settings/DeleteCustomField.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/DeleteCustomField.php (original)
+++ vtigercrm/trunk/modules/Settings/DeleteCustomField.php Thu Jun 15 00:22:41 2006
@@ -19,15 +19,15 @@
 $uitype = $_REQUEST["uitype"];
 
 //Deleting the CustomField from the Custom Field Table
-$query='delete from vtiger_field where vtiger_fieldid="'.$id.'"';
+$query='delete from vtiger_field where fieldid="'.$id.'"';
 $adb->query($query);
 
 //Deleting from vtiger_profile2field vtiger_table
-$query='delete from vtiger_profile2field where vtiger_fieldid="'.$id.'"';
+$query='delete from vtiger_profile2field where fieldid="'.$id.'"';
 $adb->query($query);
 
 //Deleting from vtiger_def_org_field vtiger_table
-$query='delete from vtiger_def_org_field where vtiger_fieldid="'.$id.'"';
+$query='delete from vtiger_def_org_field where fieldid="'.$id.'"';
 $adb->query($query);
 
 //Dropping the column in the module vtiger_table
@@ -57,7 +57,7 @@
 }
 //echo '<BR>';
 //echo $tableName;
-$dbquery = 'Alter vtiger_table '.$tableName.' Drop Column '.$colName;
+$dbquery = 'Alter table '.$tableName.' Drop Column '.$colName;
 $adb->query($dbquery);
 
 //Deleting from convert lead mapping vtiger_table- Jaguar
@@ -70,7 +70,7 @@
 
 if($uitype == 15)
 {
-$deltablequery = 'drop vtiger_table '.$colName;
+$deltablequery = 'drop table '.$colName;
 $adb->query($deltablequery);
 }
 header("Location:index.php?module=Settings&action=CustomFieldList&fld_module=".$fld_module."&parenttab=Settings");




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 02:41:14 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 06:41:14 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7100 -
 /vtigercrm/trunk/modules/Settings/DeleteLeadCustomFieldMapping.php
Message-ID: <20060615064114.9C47E7ED1B1@vtiger.fosslabs.com>

Author: don
Date: Thu Jun 15 00:41:11 2006
New Revision: 7100

Log:
prefixed vtiger_ in all table names

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

Modified: vtigercrm/trunk/modules/Settings/DeleteLeadCustomFieldMapping.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/DeleteLeadCustomFieldMapping.php (original)
+++ vtigercrm/trunk/modules/Settings/DeleteLeadCustomFieldMapping.php Thu Jun 15 00:41:11 2006
@@ -16,7 +16,7 @@
 
 if($id !='')
 {
-	$sql="update vtiger_convertleadmapping set vtiger_accountfid ='NULL',contactfid='NULL',potentialfid='NULL' where cfmid=".$id;
+	$sql="update vtiger_convertleadmapping set accountfid ='NULL',contactfid='NULL',potentialfid='NULL' where cfmid=".$id;
 	$result = $adb->query($sql);
 }
 




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 02:42:22 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 06:42:22 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7101 -
 /vtigercrm/trunk/modules/Settings/DeleteMailAccount.php
Message-ID: <20060615064222.19BC37ED1B1@vtiger.fosslabs.com>

Author: don
Date: Thu Jun 15 00:42:18 2006
New Revision: 7101

Log:
prefixed vtiger_ in all table names

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

Modified: vtigercrm/trunk/modules/Settings/DeleteMailAccount.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/DeleteMailAccount.php (original)
+++ vtigercrm/trunk/modules/Settings/DeleteMailAccount.php Thu Jun 15 00:42:18 2006
@@ -21,7 +21,7 @@
 {
 	if($account_id != '')
 	{
-		$query = "update vtiger_mail_accounts set status=0 where vtiger_account_id=".$account_id;
+		$query = "update vtiger_mail_accounts set status=0 where account_id=".$account_id;
 		$adb->query($query);
 	}
 }




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 02:44:08 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 06:44:08 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7102 -
	/vtigercrm/trunk/modules/Settings/EditComboField.php
Message-ID: <20060615064408.7131A7ED1AE@vtiger.fosslabs.com>

Author: don
Date: Thu Jun 15 00:44:04 2006
New Revision: 7102

Log:
prefixed vtiger_ in all table names

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

Modified: vtigercrm/trunk/modules/Settings/EditComboField.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/EditComboField.php (original)
+++ vtigercrm/trunk/modules/Settings/EditComboField.php Thu Jun 15 00:44:04 2006
@@ -23,7 +23,7 @@
 require_once($theme_path.'layout_utils.php');
 
 $smarty = new vtigerCRM_Smarty;
-$query = "select * from ".$tableName ;//." order by sortorderid";
+$query = "select * from vtiger_".$tableName ;//." order by sortorderid";
 $result = $adb->query($query);
 $fldVal='';
 




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 02:48:57 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 06:48:57 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7103 -
	/vtigercrm/trunk/modules/Settings/EditFieldBlock.php
Message-ID: <20060615064857.ACBB87ED1B6@vtiger.fosslabs.com>

Author: don
Date: Thu Jun 15 00:48:53 2006
New Revision: 7103

Log:
prefixed vtiger_ in all table names

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

Modified: vtigercrm/trunk/modules/Settings/EditFieldBlock.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/EditFieldBlock.php (original)
+++ vtigercrm/trunk/modules/Settings/EditFieldBlock.php Thu Jun 15 00:48:53 2006
@@ -33,7 +33,7 @@
 	global $adb,$saveNames;
 
 	$b = array();	
-	$sql="select vtiger_fieldid,fieldlabel,block from vtiger_field,tab where vtiger_field.tabid=vtiger_tab.tabid and vtiger_tab.tabid=$tabId order by block,sequence";
+	$sql="select fieldid,fieldlabel,block from vtiger_field,tab where vtiger_field.tabid=vtiger_tab.tabid and vtiger_tab.tabid=$tabId order by block,sequence";
 	$result = $adb->query($sql);
 	$noofrows = $adb->num_rows($result);
 	
@@ -244,7 +244,7 @@
 	?>
 
 	<p align="left">
-		<b>Please review the vtiger_notes at the bottom for things to keep in mind!<br></b>
+		<b>Please review the notes at the bottom for things to keep in mind!<br></b>
 	</p>
 <script language="JavaScript" type="text/javascript" src="include/dd/dd_files/coordinates.js"></script>
 <script language="JavaScript" type="text/javascript" src="include/dd/dd_files/drag.js"></script>
@@ -289,16 +289,16 @@
 	</tr>
 </table>
 <p align="left">
-	1) &nbsp;If you move a vtiger_field into a currently unused block, you will have to update the appropriate language file in
+	1) &nbsp;If you move a field into a currently unused block, you will have to update the appropriate language file in
 	<b>modules/Potentials/language/en_us.lang.php</b>.<br>
-	2) &nbsp;Please see vtiger_notes on arranging vtiger_fields below:
+	2) &nbsp;Please see notes on arranging fields below:
 </p>
 <div align="left">
 	<table border="1" cellpadding="0" cellspacing="0" bordercolordark="white" bordercolorlight="black">
 		<tr>
 			<td width="325" align="right">
 				<p align="center">
-					The vtiger_tabs are arrange in 2 columns as follows:
+					The tabs are arrange in 2 columns as follows:
 				</p>
 			</td>
 			<td width="325" align="right">




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 02:51:14 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 06:51:14 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7104 -
	/vtigercrm/trunk/modules/Settings/Forms.php
Message-ID: <20060615065114.D2E387ED1B6@vtiger.fosslabs.com>

Author: don
Date: Thu Jun 15 00:51:10 2006
New Revision: 7104

Log:
prefixed vtiger_ in all table names

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

Modified: vtigercrm/trunk/modules/Settings/Forms.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/Forms.php (original)
+++ vtigercrm/trunk/modules/Settings/Forms.php Thu Jun 15 00:51:10 2006
@@ -115,7 +115,7 @@
 $qcreate_form = get_left_form_header($mod_strings['LBL_NEW_FORM_TITLE']);
 
 
-$qcreate_get_field="select * from vtiger_field where vtiger_tabid=4 and quickcreate=0 order by quickcreatesequence";
+$qcreate_get_field="select * from vtiger_field where tabid=4 and quickcreate=0 order by quickcreatesequence";
 $qcreate_get_result=$adb->query($qcreate_get_field);
 $qcreate_get_noofrows=$adb->num_rows($qcreate_get_result);
 
@@ -203,9 +203,9 @@
 $qcreate_form.='</form>';
 $qcreate_form.='<script type="text/javascript">
 
-        var vtiger_fieldname = new Array('.$fieldName.')
-        var vtiger_fieldlabel = new Array('.$fieldLabel.')
-        var vtiger_fielddatatype = new Array('.$fldDataType.')
+        var fieldname = new Array('.$fieldName.')
+        var fieldlabel = new Array('.$fieldLabel.')
+        var fielddatatype = new Array('.$fldDataType.')
 
                 </script>';
 




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 03:08:48 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 07:08:48 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7105 -
 /vtigercrm/trunk/modules/Settings/LeadCustomFieldMapping.php
Message-ID: <20060615070848.56A307ED1CB@vtiger.fosslabs.com>

Author: don
Date: Thu Jun 15 01:08:44 2006
New Revision: 7105

Log:
prefixed vtiger_ in all table names

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

Modified: vtigercrm/trunk/modules/Settings/LeadCustomFieldMapping.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/LeadCustomFieldMapping.php (original)
+++ vtigercrm/trunk/modules/Settings/LeadCustomFieldMapping.php Thu Jun 15 01:08:44 2006
@@ -31,7 +31,7 @@
 {
 	global $adb;
 	$accountcf=Array();
-	$sql="select vtiger_fieldid,fieldlabel from vtiger_field,tab where vtiger_field.tabid=vtiger_tab.tabid and generatedtype=2 and vtiger_tab.name='Accounts'";
+	$sql="select fieldid,fieldlabel from vtiger_field,vtiger_tab where vtiger_field.tabid=vtiger_tab.tabid and generatedtype=2 and vtiger_tab.name='Accounts'";
 	$result = $adb->query($sql);
 	$noofrows = $adb->num_rows($result);
 	
@@ -54,7 +54,7 @@
 {	
 	global $adb;	
 	$contactcf=Array();
-	$sql="select vtiger_fieldid,fieldlabel from vtiger_field,tab where vtiger_field.tabid=vtiger_tab.tabid and generatedtype=2 and vtiger_tab.name='Contacts'";
+	$sql="select fieldid,fieldlabel from vtiger_field,vtiger_tab where vtiger_field.tabid=vtiger_tab.tabid and generatedtype=2 and vtiger_tab.name='Contacts'";
 	$result = $adb->query($sql);
 	$noofrows = $adb->num_rows($result);
 	for($i=0; $i<$noofrows; $i++)
@@ -76,7 +76,7 @@
 {
 	global $adb;	
 	$potentialcf=Array();
-	$sql="select vtiger_fieldid,fieldlabel from vtiger_field,tab where vtiger_field.tabid=vtiger_tab.tabid and generatedtype=2 and vtiger_tab.name='Potentials'";
+	$sql="select fieldid,fieldlabel from vtiger_field,vtiger_tab where vtiger_field.tabid=vtiger_tab.tabid and generatedtype=2 and vtiger_tab.name='Potentials'";
 	$result = $adb->query($sql);
 	$noofrows = $adb->num_rows($result);
 	for($i=0; $i<$noofrows; $i++)
@@ -93,7 +93,7 @@
 	$potentialcf[$leadid.'_potential']=$potential_cfelement;
         return $potentialcf;
 }
-$lead_sql="select vtiger_fieldid,fieldlabel from vtiger_field,tab where vtiger_field.tabid=vtiger_tab.tabid and generatedtype=2 and vtiger_tab.name='Leads'";
+$lead_sql="select vtiger_fieldid,fieldlabel from vtiger_field,vtiger_tab where vtiger_field.tabid=vtiger_tab.tabid and generatedtype=2 and vtiger_tab.name='Leads'";
 $result = $adb->query($lead_sql);
 $noofrows = $adb->num_rows($result);
 




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 03:11:01 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 07:11:01 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7106 -
 /vtigercrm/trunk/modules/Settings/ListLeadCustomFieldMapping.php
Message-ID: <20060615071101.B16BC7ED1BC@vtiger.fosslabs.com>

Author: don
Date: Thu Jun 15 01:10:57 2006
New Revision: 7106

Log:
prefixed vtiger_ in all table names

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

Modified: vtigercrm/trunk/modules/Settings/ListLeadCustomFieldMapping.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/ListLeadCustomFieldMapping.php (original)
+++ vtigercrm/trunk/modules/Settings/ListLeadCustomFieldMapping.php Thu Jun 15 01:10:57 2006
@@ -38,20 +38,20 @@
 		$cfmid = $adb->query_result($result,$i,'cfmid');
 
 		$display_val .= '<tr height="20" class="Datafield">';
-		$sql1="select vtiger_fieldlabel from vtiger_field where vtiger_fieldid ='".$leadid."'";
+		$sql1="select fieldlabel from vtiger_field where fieldid ='".$leadid."'";
 		$result1 = $adb->query($sql1);
 		$leadfield = $adb->query_result($result1,0,'fieldlabel');
 		$label['leadlabel'] = $leadfield;
-		$sql2="select vtiger_fieldlabel from vtiger_field where vtiger_fieldid ='".$accountid."'";
+		$sql2="select fieldlabel from vtiger_field where fieldid ='".$accountid."'";
 		$result2 = $adb->query($sql2);
 		$accountfield = $adb->query_result($result2,0,'fieldlabel');
 		$label['accountlabel'] = $accountfield;
 		
-		$sql3="select vtiger_fieldlabel from vtiger_field where vtiger_fieldid ='".$contactid."'";
+		$sql3="select fieldlabel from vtiger_field where fieldid ='".$contactid."'";
 		$result3 = $adb->query($sql3);
 		$contactfield = $adb->query_result($result3,0,'fieldlabel');
 		$label['contactlabel'] = $contactfield;
-		$sql4="select vtiger_fieldlabel from vtiger_field where vtiger_fieldid ='".$potentialid."'";
+		$sql4="select fieldlabel from vtiger_field where fieldid ='".$potentialid."'";
 		$result4 = $adb->query($sql4);
 		$potentialfield = $adb->query_result($result4,0,'fieldlabel');
 		$label['potentiallabel'] = $potentialfield;




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 03:13:09 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 07:13:09 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7107 -
 /vtigercrm/trunk/modules/Settings/ListModuleOwners.php
Message-ID: <20060615071309.B20357ED1C9@vtiger.fosslabs.com>

Author: don
Date: Thu Jun 15 01:13:06 2006
New Revision: 7107

Log:
prefixed vtiger_ in all table names

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 Thu Jun 15 01:13:06 2006
@@ -27,7 +27,7 @@
 		$tabid = getTabid($val);
 		if($tabid != '' && $userid != '')
 		{
-			$sql = 'update vtiger_moduleowners set user_id = '.$userid.' where vtiger_tabid = '.$tabid;
+			$sql = 'update vtiger_moduleowners set user_id = '.$userid.' where tabid = '.$tabid;
 			$adb->query($sql);
 		}
 	}
@@ -81,7 +81,7 @@
 function getModuleOwner($tabid)
 {
 	global $adb;
-	$sql = "select * from vtiger_moduleowners where vtiger_tabid=".$tabid;
+	$sql = "select * from vtiger_moduleowners where tabid=".$tabid;
 	$res = $adb->query($sql);
 	$userid = $adb->query_result($res,0,'user_id');
 
@@ -106,7 +106,7 @@
 	global $adb;
 
 	$tabid = getTabid($name);
-	$sql = "select * from vtiger_moduleowners where vtiger_tabid=".$tabid;
+	$sql = "select * from vtiger_moduleowners where tabid=".$tabid;
 	$res = $adb->query($sql);
 	$db_userid = $adb->query_result($res,0,'user_id');
 	




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 03:16:40 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 07:16:40 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7108 -
	/vtigercrm/trunk/modules/Settings/PickList.php
Message-ID: <20060615071640.48F9C7ED1C9@vtiger.fosslabs.com>

Author: don
Date: Thu Jun 15 01:16:36 2006
New Revision: 7108

Log:
prefixed vtiger_ in all table names

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

Modified: vtigercrm/trunk/modules/Settings/PickList.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/PickList.php (original)
+++ vtigercrm/trunk/modules/Settings/PickList.php Thu Jun 15 01:16:36 2006
@@ -48,7 +48,7 @@
 	global $adb;
 	$user_fld = Array();
 	$tabid = getTabid($fldmodule);
-	$query = "select vtiger_fieldlabel,generatedtype,columnname,fieldname from vtiger_field where displaytype = 1 and (tabid = ".getTabid($fld_module)." AND uitype IN (15,16)) OR (tabid = ".getTabid($fld_module)." AND vtiger_fieldname='salutationtype')";
+	$query = "select fieldlabel,generatedtype,columnname,fieldname from vtiger_field where displaytype = 1 and (tabid = ".getTabid($fld_module)." AND uitype IN (15,16)) OR (tabid = ".getTabid($fld_module)." AND fieldname='salutationtype')";
 	$result = $adb->query($query);
 	$noofrows = $adb->num_rows($result);
     if($noofrows > 0)
@@ -115,7 +115,7 @@
 function getPickListModules()
 {
 	global $adb;
-	$query = 'select distinct vtiger_field.fieldname,vtiger_field.tabid,tablabel from vtiger_field inner join vtiger_tab on vtiger_tab.tabid=vtiger_field.tabid where uitype IN (15,16)';
+	$query = 'select distinct field.fieldname,vtiger_field.tabid,tablabel from vtiger_field inner join vtiger_tab on vtiger_tab.tabid=vtiger_field.tabid where uitype IN (15,16)';
 	$result = $adb->query($query);
 	while($row = $adb->fetch_array($result))
 	{




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 03:21:57 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 07:21:57 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7109 -
 /vtigercrm/trunk/modules/Settings/SaveConvertLead.php
Message-ID: <20060615072157.5F3207ED1C9@vtiger.fosslabs.com>

Author: don
Date: Thu Jun 15 01:21:53 2006
New Revision: 7109

Log:
prefixed vtiger_ in all table names

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

Modified: vtigercrm/trunk/modules/Settings/SaveConvertLead.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/SaveConvertLead.php (original)
+++ vtigercrm/trunk/modules/Settings/SaveConvertLead.php Thu Jun 15 01:21:53 2006
@@ -15,7 +15,7 @@
 
 //echo"<h3> In Save</h3>";
 	
-	$sql="select vtiger_fieldid from vtiger_field, vtiger_tab where vtiger_field.tabid=vtiger_tab.tabid and generatedtype=2 and vtiger_tab.name='Leads';";	
+	$sql="select fieldid from vtiger_field, vtiger_tab where vtiger_field.tabid=vtiger_tab.tabid and generatedtype=2 and vtiger_tab.name='Leads';";	
 //	echo $sql;	
 	$result = $adb->query($sql);
 	$noofrows = $adb->num_rows($result);
@@ -43,7 +43,7 @@
 		{
 			$potential_id_val="";
 		}
-		$update_sql="update vtiger_convertleadmapping set vtiger_accountfid='".$account_id_val."',contactfid='".$contact_id_val."',potentialfid='".$potential_id_val."' where leadfid=".$lead_id;
+		$update_sql="update vtiger_convertleadmapping set accountfid='".$account_id_val."',contactfid='".$contact_id_val."',potentialfid='".$potential_id_val."' where leadfid=".$lead_id;
 
 		$adb->query($update_sql);
 	}




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 03:25:04 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 07:25:04 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7110 -
 /vtigercrm/trunk/modules/Settings/SaveCurrencyInfo.php
Message-ID: <20060615072504.49BDA7ED1C9@vtiger.fosslabs.com>

Author: don
Date: Thu Jun 15 01:24:59 2006
New Revision: 7110

Log:
prefixed vtiger_ in all table names

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

Modified: vtigercrm/trunk/modules/Settings/SaveCurrencyInfo.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/SaveCurrencyInfo.php (original)
+++ vtigercrm/trunk/modules/Settings/SaveCurrencyInfo.php Thu Jun 15 01:24:59 2006
@@ -20,7 +20,7 @@
 
 if(isset($_REQUEST['record']) && $_REQUEST['record']!='')
 {
-        $sql = "update vtiger_currency_info set vtiger_currency_name ='".$currency_name."', vtiger_currency_code ='".$currency_code."', vtiger_currency_symbol ='".$currency_symbol."', conversion_rate ='".$conversion_rate."',currency_status='".$currency_status."' where id =".$_REQUEST['record'];
+        $sql = "update vtiger_currency_info set currency_name ='".$currency_name."', currency_code ='".$currency_code."', currency_symbol ='".$currency_symbol."', conversion_rate ='".$conversion_rate."',currency_status='".$currency_status."' where id =".$_REQUEST['record'];
 }
 else
 {




From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 05:01:05 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 09:01:05 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231308=3A?=
 =?utf-8?q?_Role_security_issue_=28cf_=23599=29?=
In-Reply-To: <076.c439add42e557216aac6af17846b79b5@vtiger.fosslabs.com>
References: <076.c439add42e557216aac6af17846b79b5@vtiger.fosslabs.com>
Message-ID: <085.2b8191e4d6281cccc3e6b69566684f19@vtiger.fosslabs.com>

#1308: Role security issue (cf #599)
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  developer     
      Type:  defect     |      Status:  new           
  Priority:  critical   |   Milestone:                
 Component:  vtigercrm  |     Version:  5.0.0         
Resolution:             |    Keywords:  security roles
------------------------+---------------------------------------------------
Changes (by web at reponse.net):

  * milestone:  5.0.0 =>

Comment:

 Settings > Users & Access Management > Organisation Sharing Privileges Add
 Custom Privilege Rule related to issue 599

 if you give to a role A rights to read-only to a role B items, the role A
 can delete thems !

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1308>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 05:33:23 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 09:33:23 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7111 -
 /vtigercrm/trunk/modules/Settings/SaveMailAccount.php
Message-ID: <20060615093323.C521E7ED1C9@vtiger.fosslabs.com>

Author: don
Date: Thu Jun 15 03:33:19 2006
New Revision: 7111

Log:
prefixed vtiger_ in all table names

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

Modified: vtigercrm/trunk/modules/Settings/SaveMailAccount.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/SaveMailAccount.php (original)
+++ vtigercrm/trunk/modules/Settings/SaveMailAccount.php Thu Jun 15 03:33:19 2006
@@ -33,7 +33,7 @@
 
 if(isset($_REQUEST['edit']) && $_REQUEST['edit'] && $_REQUEST['record']!='')
 {
-	$sql="update vtiger_mail_accounts set display_name = '".$displayname."', mail_id = '".$email."', vtiger_account_name = '".$account_name."', mail_protocol = '".$mailprotocol."', mail_username = '".$server_username."', mail_password='".$server_password."', mail_servername='".$mail_servername."',  box_refresh='".$box_refresh."',  mails_per_page='".$mails_per_page."', ssltype='".$ssltype."' , sslmeth='".$sslmeth."', int_mailer='".$_REQUEST["int_mailer"]."' where user_id = '".$id."'";
+	$sql="update vtiger_mail_accounts set display_name = '".$displayname."', mail_id = '".$email."', account_name = '".$account_name."', mail_protocol = '".$mailprotocol."', mail_username = '".$server_username."', mail_password='".$server_password."', mail_servername='".$mail_servername."',  box_refresh='".$box_refresh."',  mails_per_page='".$mails_per_page."', ssltype='".$ssltype."' , sslmeth='".$sslmeth."', int_mailer='".$_REQUEST["int_mailer"]."' where user_id = '".$id."'";
 }
 else
 {




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 05:36:34 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 09:36:34 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7112 -
 /vtigercrm/trunk/modules/Settings/SettingsSubMenu.php
Message-ID: <20060615093634.233457ED1E5@vtiger.fosslabs.com>

Author: don
Date: Thu Jun 15 03:36:30 2006
New Revision: 7112

Log:
prefixed vtiger_ in all table names

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

Modified: vtigercrm/trunk/modules/Settings/SettingsSubMenu.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/SettingsSubMenu.php (original)
+++ vtigercrm/trunk/modules/Settings/SettingsSubMenu.php Thu Jun 15 03:36:30 2006
@@ -88,7 +88,7 @@
 		global $theme;
 		$theme_path="themes/".$theme."/";
 		$image_path=$theme_path."images/";
-		$dbQuery = "select vtiger_fieldid,columnname,fieldlabel,uitype,displaytype from vtiger_field where vtiger_tabid=".$tabid." and generatedtype=2 order by sequence";
+		$dbQuery = "select fieldid,columnname,fieldlabel,uitype,displaytype from vtiger_field where tabid=".$tabid." and generatedtype=2 order by sequence";
 		$result = $adb->query($dbQuery);
 		$row = $adb->fetch_array($result);
 		$count=1;




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 05:40:56 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 09:40:56 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7113 -
 /vtigercrm/trunk/modules/Settings/UpdateComboValues.php
Message-ID: <20060615094056.D10897ED1E5@vtiger.fosslabs.com>

Author: don
Date: Thu Jun 15 03:40:52 2006
New Revision: 7113

Log:
prefixed vtiger_ in all table names

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

Modified: vtigercrm/trunk/modules/Settings/UpdateComboValues.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/UpdateComboValues.php (original)
+++ vtigercrm/trunk/modules/Settings/UpdateComboValues.php Thu Jun 15 03:40:52 2006
@@ -14,7 +14,7 @@
 $fldPickList =  $_REQUEST['listarea'];
 
 //Deleting the already existing values
-$delquery="delete from ".$tableName;
+$delquery="delete from vtiger_".$tableName;
 $adb->query($delquery);
 
 $pickArray = explode("\n",$fldPickList);
@@ -31,9 +31,9 @@
 	if($pickArray[$i] != '')
 	{
 		if($custom)
-			$query = "insert into ".$tableName." values('".$pickArray[$i]."')";
+			$query = "insert into vtiger_".$tableName." values('".$pickArray[$i]."')";
 		else
-			$query = "insert into ".$tableName." values('','".$pickArray[$i]."',".$i.",1)";
+			$query = "insert into vtiger_".$tableName." values('','".$pickArray[$i]."',".$i.",1)";
         $adb->query($query);
 	}
 }




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 05:46:29 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 09:46:29 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7114 -
	/vtigercrm/trunk/include/CustomFieldUtil.php
Message-ID: <20060615094629.CE8D47ED1E9@vtiger.fosslabs.com>

Author: don
Date: Thu Jun 15 03:46:25 2006
New Revision: 7114

Log:
prefixed vtiger_ in all table names

Modified:
    vtigercrm/trunk/include/CustomFieldUtil.php

Modified: vtigercrm/trunk/include/CustomFieldUtil.php
==============================================================================
--- vtigercrm/trunk/include/CustomFieldUtil.php (original)
+++ vtigercrm/trunk/include/CustomFieldUtil.php Thu Jun 15 03:46:25 2006
@@ -91,7 +91,7 @@
 	global $log;
 	$log->debug("Entering getCustomFieldArray(".$module.") method ...");
 	global $adb;
-	$custquery = "select * from vtiger_field where vtiger_tablename='".$module."'";
+	$custquery = "select * from vtiger_field where tablename='".$module."'";
 	$custresult = $adb->query($custquery);
 	$custFldArray = Array();
 	$noofrows = $adb->num_rows($custresult);
@@ -117,7 +117,7 @@
 	$log->debug("Entering getCustomFieldTrans(".$module.",". $trans_array.") method ...");
 	global $adb;
 	$tab_id = getTabid($module);	
-	$custquery = "select columnname,fieldlabel from vtiger_field where generatedtype=2 and vtiger_tabid=".$tab_id;
+	$custquery = "select columnname,fieldlabel from vtiger_field where generatedtype=2 and tabid=".$tab_id;
 	$custresult = $adb->query($custquery);
 	$custFldArray = Array();
 	$noofrows = $adb->num_rows($custresult);
@@ -143,7 +143,7 @@
 	global $log;
 	$log->debug("Entering getCustomFieldData(".$tab.",".$id.",".$datatype.") method ...");
 	global $adb;
-	$query = "select * from vtiger_field where vtiger_tabid=".$tab." and vtiger_fieldid=".$id;
+	$query = "select * from vtiger_field where tabid=".$tab." and fieldid=".$id;
 	$result = $adb->query($query);
 	$return_data=$adb->fetch_array($result);
 	$log->debug("Exiting getCustomFieldData method ...");




From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 05:55:26 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 09:55:26 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231271=3A?=
 =?utf-8?q?_Organisation_wont_save_when_containt_=27?=
In-Reply-To: <076.62b916cddc422a4f2f6a8828de68207a@vtiger.fosslabs.com>
References: <076.62b916cddc422a4f2f6a8828de68207a@vtiger.fosslabs.com>
Message-ID: <085.7d2757daf0f7edafdbfebcff51e91a02@vtiger.fosslabs.com>

#1271: Organisation wont save when containt '
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  allanbush          
      Type:  defect     |      Status:  closed             
  Priority:  major      |   Milestone:  5.0.0              
 Component:  vtigercrm  |     Version:  5.0.0              
Resolution:  fixed      |    Keywords:  organisation, quote
------------------------+---------------------------------------------------
Comment (by abos):

 Working now, nopb.
 Thanks, and sorry.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1271>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 06:14:50 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 10:14:50 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7116 -
 /vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php
Message-ID: <20060615101451.3FB967ED1C9@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 15 04:14:47 2006
New Revision: 7116

Log:
* Modified the crmid to parent_id which throws error in Notes Listview

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 Thu Jun 15 04:14:47 2006
@@ -1339,7 +1339,7 @@
 $insert_query_array16 = Array(
 		"insert into vtiger_cvcolumnlist values ($cvid,0,'notes:title:title:Notes_Title:V')",
 		"insert into vtiger_cvcolumnlist values ($cvid,1,'notes:contact_id:contact_id:Notes_Contact_Name:I')",
-		"insert into vtiger_cvcolumnlist values ($cvid,2,'senotesrel:crmid:crmid:Notes_Related_To:I')",
+		"insert into vtiger_cvcolumnlist values ($cvid,2,'senotesrel:crmid:parent_id:Notes_Related_to:I')",
 		"insert into vtiger_cvcolumnlist values ($cvid,3,'notes:filename:filename:Notes_File:V')",
 		"insert into vtiger_cvcolumnlist values ($cvid,4,'crmentity:modifiedtime:modifiedtime:Notes_Modified_Time:V')"
 			     );




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 06:24:44 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 10:24:44 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7118 -
 /vtigercrm/trunk/modules/Settings/CreateCustomField.php
Message-ID: <20060615102444.C565F7ED1E9@vtiger.fosslabs.com>

Author: don
Date: Thu Jun 15 04:24:40 2006
New Revision: 7118

Log:
prefixed vtiger_ in all table names

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

Modified: vtigercrm/trunk/modules/Settings/CreateCustomField.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/CreateCustomField.php (original)
+++ vtigercrm/trunk/modules/Settings/CreateCustomField.php Thu Jun 15 04:24:40 2006
@@ -61,7 +61,7 @@
 	$readonly = "readonly";
 	if($fieldtype == '7' || $fieldtype == '11')
 	{
-		$query = "select * from ".$customfield_columnname;
+		$query = "select * from vtiger_".$customfield_columnname;
 		$result = $adb->query($query);
 		$fldVal='';
 		while($row = $adb->fetch_array($result))




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 06:27:49 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 10:27:49 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7119 -
	/vtigercrm/trunk/modules/Settings/PickList.php
Message-ID: <20060615102749.2EB027D7FF0@vtiger.fosslabs.com>

Author: don
Date: Thu Jun 15 04:27:45 2006
New Revision: 7119

Log:
prefixed vtiger_ in all table names

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

Modified: vtigercrm/trunk/modules/Settings/PickList.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/PickList.php (original)
+++ vtigercrm/trunk/modules/Settings/PickList.php Thu Jun 15 04:27:45 2006
@@ -115,7 +115,7 @@
 function getPickListModules()
 {
 	global $adb;
-	$query = 'select distinct field.fieldname,vtiger_field.tabid,tablabel from vtiger_field inner join vtiger_tab on vtiger_tab.tabid=vtiger_field.tabid where uitype IN (15,16)';
+	$query = 'select distinct vtiger_field.fieldname,vtiger_field.tabid,tablabel from vtiger_field inner join vtiger_tab on vtiger_tab.tabid=vtiger_field.tabid where uitype IN (15,16)';
 	$result = $adb->query($query);
 	while($row = $adb->fetch_array($result))
 	{




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 06:36:36 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 10:36:36 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7120 -
 /vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php
Message-ID: <20060615103637.321FC7D7FF0@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 15 04:36:33 2006
New Revision: 7120

Log:
* Added queries to modify the wordtemplates table when the user migrates from 4.2 Patch 2 instead of 4.2.3

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 Thu Jun 15 04:36:33 2006
@@ -17,6 +17,20 @@
 global $success_query_array, $failure_query_array;
 
 $conn->println("Database Modifications for 4.2 Patch2 ==> 5.0(Alpha) Dev 3 Starts here.");
+
+
+
+//These changes have been made in 4.2.3. The following queries have been included who has run the migration from 4.2 Patch2
+$wordtemplate_query1 = "alter table wordtemplates DROP PRIMARY KEY";
+Execute($wordtemplate_query1);
+
+$wordtemplate_query2 = "alter table wordtemplates DROP templateid";//this will fail if 4.2 Patch 2.
+$conn->query($wordtemplate_query2);
+
+$wordtemplate_query3 = "alter table wordtemplates add column templateid integer(19) unsigned auto_increment primary key FIRST";
+Execute($wordtemplate_query3);
+//upto this added to modify the wordtemplates table which will be in the case of migrate from 4.2 Path2.
+
 
 
 /****************** 5.0(Alpha) dev version 1 Database changes -- Starts*********************/




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 06:37:43 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 10:37:43 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7121 -
	/vtigercrm/trunk/modules/Settings/PickList.php
Message-ID: <20060615103743.84F587D7FF0@vtiger.fosslabs.com>

Author: don
Date: Thu Jun 15 04:37:39 2006
New Revision: 7121

Log:
prefixed vtiger_ in all table names

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

Modified: vtigercrm/trunk/modules/Settings/PickList.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/PickList.php (original)
+++ vtigercrm/trunk/modules/Settings/PickList.php Thu Jun 15 04:37:39 2006
@@ -103,7 +103,7 @@
 function getPickListValues($tablename)
 {
 	global $adb;	
-	$query = "select * from ".$tablename." order by sortorderid";
+	$query = "select * from vtiger_".$tablename." order by sortorderid";
 	$result = $adb->query($query);
 	$fldVal = Array();
 	while($row = $adb->fetch_array($result))




From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 06:53:19 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 10:53:19 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231318=3A?=
	=?utf-8?q?_Outlook_Connector_Bugs?=
Message-ID: <076.efa3e47083b3f3c62106837df2debdd5@vtiger.fosslabs.com>

#1318: Outlook Connector Bugs
---------------------------+------------------------------------------------
 Reporter:  arosewarne     |       Owner:  developer
     Type:  defect         |      Status:  new      
 Priority:  major          |   Milestone:           
Component:  outlookplugin  |     Version:  5.0.0    
 Keywords:                 |  
---------------------------+------------------------------------------------
 Outlook
 - When associating an email the search doesn't find anything for any
 search string of more than one character
 - When uploading incoming emails they are stored in vTiger as sent to the
 contact you choose. I can't see a way to upload mails to the inbox.
 - In the contact view emails uploaded show as related to multiple even
 though they were uploaded as related to a single item
 - Tasks from outlook are not uploading to vTiger - works fine the other
 way.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1318>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 06:53:50 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 10:53:50 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231319=3A?=
	=?utf-8?q?_Thunderbird_Connector_Bugs?=
Message-ID: <076.6c811b9cd61da3ae39b454241d719204@vtiger.fosslabs.com>

#1319: Thunderbird Connector Bugs
-----------------------------+----------------------------------------------
 Reporter:  anonymous        |       Owner:  developer
     Type:  defect           |      Status:  new      
 Priority:  major            |   Milestone:           
Component:  thunderbirdextn  |     Version:  5.0.0    
 Keywords:                   |  
-----------------------------+----------------------------------------------
 Thunderbird
 - When importing emails no sender or receiver is set although the
 association is correct.
 - The related to field on the contact screen is set to Multiple. Same with
 the outlook plug in.
 - Attachments don't seem to be supported, unlike the outlook plugin.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1319>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 07:00:35 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 11:00:35 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231320=3A?=
 =?utf-8?q?_Adding_Products_in_Internet_Explorer?=
Message-ID: <076.5033f28ff91a008f6982f96dac47c920@vtiger.fosslabs.com>

#1320: Adding Products in Internet Explorer
------------------------+---------------------------------------------------
 Reporter:  arosewarne  |       Owner:  developer
     Type:  defect      |      Status:  new      
 Priority:  major       |   Milestone:           
Component:  vtigercrm   |     Version:  5.0.0    
 Keywords:              |  
------------------------+---------------------------------------------------
 When adding Products to Quotes or Sales Orders using Internet Explorer 6
 if you do a search based on either the text box or alphabet buttons you
 get a 'HTTP 404 - File not found' error when selecting a product.
 (Pop Up Blocker turned on or off)

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1320>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 07:05:31 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 11:05:31 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7122 - in
 /vtigercrm/trunk/modules/uploads: add2db.php downloadfile.php
Message-ID: <20060615110531.B99337ED201@vtiger.fosslabs.com>

Author: don
Date: Thu Jun 15 05:05:27 2006
New Revision: 7122

Log:
prefixed vtiger_ in all table names

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

Modified: vtigercrm/trunk/modules/uploads/add2db.php
==============================================================================
--- vtigercrm/trunk/modules/uploads/add2db.php (original)
+++ vtigercrm/trunk/modules/uploads/add2db.php Thu Jun 15 05:05:27 2006
@@ -53,7 +53,7 @@
 
 		if($filesize != 0)	
 		{
-			$current_id = $adb->getUniqueID("crmentity");
+			$current_id = $adb->getUniqueID("vtiger_crmentity");
 			$desc = $_REQUEST['txtDescription'];
 			$description = addslashes($desc);
 			$date_var = date('YmdHis');

Modified: vtigercrm/trunk/modules/uploads/downloadfile.php
==============================================================================
--- vtigercrm/trunk/modules/uploads/downloadfile.php (original)
+++ vtigercrm/trunk/modules/uploads/downloadfile.php Thu Jun 15 05:05:27 2006
@@ -20,7 +20,7 @@
 
 $returnmodule=$_REQUEST['return_module'];
 
-$dbQuery = "SELECT * FROM attachments WHERE attachmentsid = " .$attachmentsid ;
+$dbQuery = "SELECT * FROM vtiger_attachments WHERE attachmentsid = " .$attachmentsid ;
 
 $result = $adb->query($dbQuery) or die("Couldn't get file list");
 if($adb->num_rows($result) == 1)




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 07:10:56 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 11:10:56 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7123 -
 /vtigercrm/trunk/modules/Settings/LeadCustomFieldMapping.php
Message-ID: <20060615111056.880D67ED201@vtiger.fosslabs.com>

Author: don
Date: Thu Jun 15 05:10:52 2006
New Revision: 7123

Log:
prefixed vtiger_ in all table names

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

Modified: vtigercrm/trunk/modules/Settings/LeadCustomFieldMapping.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/LeadCustomFieldMapping.php (original)
+++ vtigercrm/trunk/modules/Settings/LeadCustomFieldMapping.php Thu Jun 15 05:10:52 2006
@@ -93,7 +93,7 @@
 	$potentialcf[$leadid.'_potential']=$potential_cfelement;
         return $potentialcf;
 }
-$lead_sql="select vtiger_fieldid,fieldlabel from vtiger_field,vtiger_tab where vtiger_field.tabid=vtiger_tab.tabid and generatedtype=2 and vtiger_tab.name='Leads'";
+$lead_sql="select fieldid,fieldlabel from vtiger_field,vtiger_tab where vtiger_field.tabid=vtiger_tab.tabid and generatedtype=2 and vtiger_tab.name='Leads'";
 $result = $adb->query($lead_sql);
 $noofrows = $adb->num_rows($result);
 




From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 07:58:01 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 11:58:01 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23919=3A_?=
 =?utf-8?q?Delayed_Task_Notification_scheduler_is_not_working?=
In-Reply-To: <076.2696d2b97fde7410db77fba51c909ec3@vtiger.fosslabs.com>
References: <076.2696d2b97fde7410db77fba51c909ec3@vtiger.fosslabs.com>
Message-ID: <085.d07571887d535976534e93f1ab219e31@vtiger.fosslabs.com>

#919: Delayed Task Notification scheduler is not working
------------------------+---------------------------------------------------
  Reporter:  mangai     |       Owner:  philip
      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 [7124]) problem in sending mail in schedule task fixed. Fixes #919

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/919>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 07:58:02 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 11:58:02 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7124 -
	/vtigercrm/trunk/cron/intimateTaskStatus.php
Message-ID: <20060615115802.1EE897ED209@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 15 05:57:57 2006
New Revision: 7124

Log:
problem in sending mail in schedule task fixed. Fixes #919

Modified:
    vtigercrm/trunk/cron/intimateTaskStatus.php

Modified: vtigercrm/trunk/cron/intimateTaskStatus.php
==============================================================================
--- vtigercrm/trunk/cron/intimateTaskStatus.php (original)
+++ vtigercrm/trunk/cron/intimateTaskStatus.php Thu Jun 15 05:57:57 2006
@@ -2,8 +2,8 @@
 require('send_mail.php');
 require_once('../config.php');
 
-$dbhost = $dbconfig['db_host_name'];
-$dbuser =$dbconfig['db_user_name']; 
+$dbhost = $dbconfig['db_hostname'];
+$dbuser =$dbconfig['db_username']; 
 $dbpass = $dbconfig['db_password'];
 $db = mysql_connect($dbhost, $dbuser, $dbpass) or die ('Error connecting to mysql');
 if (!$db) {
@@ -45,7 +45,7 @@
   $status=$myrow[0];
   if($status != 'Completed')
   {
-	 sendmail($emailaddress,$emailaddress,"test mail","Not completed task",$mailserver,$mailuname,$mailpwd,"");	
+	 sendmail($emailaddress,$emailaddress,"Task Not completed","Not completed task",$mailserver,$mailuname,$mailpwd,"");	
   }
 }
 }
@@ -86,8 +86,7 @@
   if($status != 'Completed')
   {
 
-    echo 'mail sent';
-    sendmail($emailaddress,$emailaddress,"test mail","Ticket number ".$ticketid ." yet to be closed",$mailserver,$mailuname,$mailpwd,"");	
+    sendmail($emailaddress,$emailaddress,"Pending Ticket notification","Ticket number ".$ticketid ." yet to be closed",$mailserver,$mailuname,$mailpwd,"");	
   }
 }
 
@@ -107,8 +106,7 @@
 {
   $status=$myrow[0];
   $ticketid = $myrow[1];
-  echo 'mail sent';
-  sendmail($emailaddress,$emailaddress,"Too many pending tickets","Too many pending tickets ".$ticketid ." too many pending tickets",$mailserver,$mailuname,$mailpwd,"");	
+  sendmail($emailaddress,$emailaddress,"Too many pending tickets","Too many tickets pending",$mailserver,$mailuname,$mailpwd,"");	
 }
 
 }
@@ -120,11 +118,11 @@
 $activevalue = mysql_fetch_row($result);
 if($activevalue[0] == 1)
 {
-$result = mysql_query("SELECT start_date FROM vtiger_products",$db);
+$result = mysql_query("SELECT productname FROM vtiger_products where start_date like '".date('Y-m-d')."%'",$db);
 while ($myrow = mysql_fetch_row($result))
 {
-  $status=$myrow[0];
-  sendmail($emailaddress,$emailaddress,"Support starting","Support Starting ".$ticketid ."Congratulations! Your support starts from today",$mailserver,$mailuname,$mailpwd,"");	
+  $productname=$myrow[0];
+  sendmail($emailaddress,$emailaddress,"Support starting","Support Starts for ".$productname ."\n Congratulations! Your support starts from today",$mailserver,$mailuname,$mailpwd,"");	
 }
 
 }
@@ -137,11 +135,11 @@
 if($activevalue[0] == 1)
 {
 
-$result = mysql_query("SELECT expiry_date from vtiger_products",$db);
+$result = mysql_query("SELECT productname from vtiger_products where expiry_date like '".date('Y-m-d')."%'",$db);
 while ($myrow = mysql_fetch_row($result))
 {
-  $status=$myrow[0];
-  sendmail($emailaddress,$emailaddress,"Support Ending","Support Ending ".$ticketid ." Renew support please",$mailserver,$mailuname,$mailpwd,"");	
+  $productname=$myrow[0];
+  sendmail($emailaddress,$emailaddress,"Support Ending","Support Ends for ".$productname ."\n Renew support please",$mailserver,$mailuname,$mailpwd,"");	
 }
 
 }




From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 08:05:37 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 12:05:37 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23953=3A_?=
 =?utf-8?q?Inconsistency_in_Global_Search_function?=
In-Reply-To: <076.0e9f83b845f7f23e047d6bd25f0184d0@vtiger.fosslabs.com>
References: <076.0e9f83b845f7f23e047d6bd25f0184d0@vtiger.fosslabs.com>
Message-ID: <085.3f31fe7e70bc6feb3c51bac6992a91b5@vtiger.fosslabs.com>

#953: Inconsistency in Global Search function
------------------------+---------------------------------------------------
  Reporter:  Gopal      |       Owner:  mickie
      Type:  defect     |      Status:  new   
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/953>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 08:06:44 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 12:06:44 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=23955=3A_?=
	=?utf-8?q?Horizontal_Scrolling?=
In-Reply-To: <076.a9ffd2be9e68b865905be8a48c3dc0a1@vtiger.fosslabs.com>
References: <076.a9ffd2be9e68b865905be8a48c3dc0a1@vtiger.fosslabs.com>
Message-ID: <085.5a498506d07cc23b5a74a201bf9a0b48@vtiger.fosslabs.com>

#955: Horizontal Scrolling
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  ela  
      Type:  defect     |      Status:  new  
  Priority:  critical   |   Milestone:  5.0.0
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => ela

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/955>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 08:08:16 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 12:08:16 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231105=3A?=
	=?utf-8?q?_Calendar_Issue?=
In-Reply-To: <076.828097aad950dc3eaa698a08d3117831@vtiger.fosslabs.com>
References: <076.828097aad950dc3eaa698a08d3117831@vtiger.fosslabs.com>
Message-ID: <085.30719dc55ea1f01de8bc57a696d567d2@vtiger.fosslabs.com>

#1105: Calendar Issue
---------------------------+------------------------------------------------
  Reporter:  jerrydgeorge  |       Owner:  mangai
      Type:  defect        |      Status:  new   
  Priority:  critical      |   Milestone:        
 Component:  vtigercrm     |     Version:  5.0.0 
Resolution:                |    Keywords:        
---------------------------+------------------------------------------------
Changes (by don):

  * owner:  developer => mangai

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1105>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 08:11:29 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 12:11:29 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231151=3A?=
 =?utf-8?q?_Error_message_in_Installer=2E=2E?=
In-Reply-To: <076.5644658cbeac029416aebb3b898c0527@vtiger.fosslabs.com>
References: <076.5644658cbeac029416aebb3b898c0527@vtiger.fosslabs.com>
Message-ID: <085.d827fddde0842f522dfd75ed115b57af@vtiger.fosslabs.com>

#1151: Error message in Installer..
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  jeri 
      Type:  defect     |      Status:  new  
  Priority:  critical   |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => jeri

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1151>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 08:12:03 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 12:12:03 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7125 -
	/vtigercrm/trunk/modules/Users/about_us.php
Message-ID: <20060615121204.1E3767ED1FE@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 15 06:11:58 2006
New Revision: 7125

Log:
contributors name made to display properly

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

Modified: vtigercrm/trunk/modules/Users/about_us.php
==============================================================================
--- vtigercrm/trunk/modules/Users/about_us.php (original)
+++ vtigercrm/trunk/modules/Users/about_us.php Thu Jun 15 06:11:58 2006
@@ -102,8 +102,9 @@
 										<tr><td>Mike Crowe </td></tr>
 										<tr><td>Allan Bush</td></tr>
 										<tr><td>Frank Piepiorra</td></tr>
-										<tr><td>Dino Eberle and Jamie Jackson</td></tr>
-										<tr><td>B??la??d A??ssa</td></tr>
+										<tr><td>Dino Eberle </td></tr>
+										<tr><td>Jamie Jackson</td></tr>
+										<tr><td>Aissa Belaid</td></tr>
 										<tr><td>Sergio A. Kessler</td></tr>
 										<tr><td>Jeff Kowalczyk</td></tr>
 										<tr><td>Brian Devendorf</td></tr>
@@ -116,6 +117,8 @@
 										<tr><td>Mike Fedyk</td></tr>
 										<tr><td>&nbsp;</td></tr>
 										<tr><td><b>And vtiger Community</b></td></tr>
+										<tr><td>&nbsp;</td></tr>
+										<tr><td>&nbsp;</td></tr>
 								</table>
 						</marquee>
 				</td>




From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 08:13:24 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 12:13:24 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231161=3A?=
 =?utf-8?q?_Roles_link_-_JavaScript_error_in_IE_6?=
In-Reply-To: <076.1d3f81da3d97d1c4e9f35cf771595b2d@vtiger.fosslabs.com>
References: <076.1d3f81da3d97d1c4e9f35cf771595b2d@vtiger.fosslabs.com>
Message-ID: <085.772ab999844c0c6bae6bb2ae3b149f19@vtiger.fosslabs.com>

#1161: Roles link - JavaScript error in IE 6
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  ela  
      Type:  defect     |      Status:  new  
  Priority:  critical   |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => ela

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1161>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 08:16:32 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 12:16:32 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231168=3A?=
	=?utf-8?q?_Inconsistent_buttons?=
In-Reply-To: <076.9785f194df3f213625826a4d8c4e3b59@vtiger.fosslabs.com>
References: <076.9785f194df3f213625826a4d8c4e3b59@vtiger.fosslabs.com>
Message-ID: <085.9e60c968e3dfd4004286f5a4af5dfb17@vtiger.fosslabs.com>

#1168: Inconsistent buttons
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  ela  
      Type:  defect     |      Status:  new  
  Priority:  critical   |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => ela

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1168>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 08:22:36 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 12:22:36 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231238=3A?=
 =?utf-8?q?_To_do_UI_flow_need_to_be_improved?=
In-Reply-To: <076.c26502e33442e4fe1e9904d1a3d2b8a5@vtiger.fosslabs.com>
References: <076.c26502e33442e4fe1e9904d1a3d2b8a5@vtiger.fosslabs.com>
Message-ID: <085.36a0189dd48d4e2543a8adcb718d53bc@vtiger.fosslabs.com>

#1238: To do UI flow need to be improved
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  saint
      Type:  defect     |      Status:  new  
  Priority:  critical   |   Milestone:  5.0.0
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => saint

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1238>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 08:23:49 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 12:23:49 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231239=3A?=
 =?utf-8?q?_Calendar_Settings_-_Horizontal_Scrolling?=
In-Reply-To: <076.44abdc0a6dba43610981769125583aec@vtiger.fosslabs.com>
References: <076.44abdc0a6dba43610981769125583aec@vtiger.fosslabs.com>
Message-ID: <085.50546b8d3f06c0dd24050894cab5c55d@vtiger.fosslabs.com>

#1239: Calendar Settings - Horizontal Scrolling
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  ela  
      Type:  defect     |      Status:  new  
  Priority:  critical   |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => ela

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1239>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 08:25:16 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 12:25:16 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231245=3A?=
 =?utf-8?q?_edit_and_del_links_are_not_exist_in_listview_and_relatedlists?=
In-Reply-To: <076.4ddff9b4349d2a2ad1f3163458b73b34@vtiger.fosslabs.com>
References: <076.4ddff9b4349d2a2ad1f3163458b73b34@vtiger.fosslabs.com>
Message-ID: <085.9ec751c35080fbd97eb4e722439a0495@vtiger.fosslabs.com>

#1245: edit and del links are not exist in listview and relatedlists
------------------------+---------------------------------------------------
  Reporter:  mickie     |       Owner:  ahmed
      Type:  defect     |      Status:  new  
  Priority:  critical   |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => ahmed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1245>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 08:26:45 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 12:26:45 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231252=3A?=
 =?utf-8?q?_Ticket_-_Activity_-_Relation?=
In-Reply-To: <076.f54f7a210a2bc06ab7c96747af544498@vtiger.fosslabs.com>
References: <076.f54f7a210a2bc06ab7c96747af544498@vtiger.fosslabs.com>
Message-ID: <085.58ba5fd6773e5def7173bc4699fbdc19@vtiger.fosslabs.com>

#1252: Ticket - Activity - Relation
------------------------+---------------------------------------------------
  Reporter:  eberled    |       Owner:  mickie
      Type:  defect     |      Status:  new   
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1252>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 08:28:12 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 12:28:12 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231288=3A?=
 =?utf-8?q?_Calendar_Creating_new_task?=
In-Reply-To: <076.273e3446e6cf906546860e7682d35c38@vtiger.fosslabs.com>
References: <076.273e3446e6cf906546860e7682d35c38@vtiger.fosslabs.com>
Message-ID: <085.ed4be51247b777e73068824ee6e25b6b@vtiger.fosslabs.com>

#1288: Calendar Creating new task
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  mangai
      Type:  defect     |      Status:  new   
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => mangai

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1288>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 08:29:05 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 12:29:05 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231289=3A?=
 =?utf-8?q?_Edit/Del_links_are_must_in_relatedlists?=
In-Reply-To: <076.c2484dcccdec49e5b30c79bee458fec5@vtiger.fosslabs.com>
References: <076.c2484dcccdec49e5b30c79bee458fec5@vtiger.fosslabs.com>
Message-ID: <085.faec8e0c8062bc96f7caf2237c8415e1@vtiger.fosslabs.com>

#1289: Edit/Del links are must in relatedlists
------------------------+---------------------------------------------------
  Reporter:  mickie     |       Owner:  ahmed
      Type:  task       |      Status:  new  
  Priority:  critical   |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  don => ahmed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1289>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 08:29:56 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 12:29:56 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231296=3A?=
 =?utf-8?q?_Sort_order_hide_the_related_datas?=
In-Reply-To: <076.89346f6520426628c32e65be31646f8e@vtiger.fosslabs.com>
References: <076.89346f6520426628c32e65be31646f8e@vtiger.fosslabs.com>
Message-ID: <085.af76d568f74f43dee7cfa66af6616c91@vtiger.fosslabs.com>

#1296: Sort order hide the related datas
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  philip                      
      Type:  defect     |      Status:  new                         
  Priority:  critical   |   Milestone:                              
 Component:  vtigercrm  |     Version:  5.0.0                       
Resolution:             |    Keywords:  related, data, sorder, order
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => philip

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1296>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 08:30:47 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 12:30:47 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231308=3A?=
 =?utf-8?q?_Role_security_issue_=28cf_=23599=29?=
In-Reply-To: <076.c439add42e557216aac6af17846b79b5@vtiger.fosslabs.com>
References: <076.c439add42e557216aac6af17846b79b5@vtiger.fosslabs.com>
Message-ID: <085.cc4f5d48557b6dec180c1852fe821ce5@vtiger.fosslabs.com>

#1308: Role security issue (cf #599)
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  don           
      Type:  defect     |      Status:  new           
  Priority:  critical   |   Milestone:                
 Component:  vtigercrm  |     Version:  5.0.0         
Resolution:             |    Keywords:  security roles
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => don

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1308>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 08:12:03 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 12:12:03 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231157=3A?=
 =?utf-8?q?_Wrong_display_of_Roles_in_Roles_Home?=
In-Reply-To: <076.0042ce49f00228b56312a0bfc5ea57d9@vtiger.fosslabs.com>
References: <076.0042ce49f00228b56312a0bfc5ea57d9@vtiger.fosslabs.com>
Message-ID: <085.17b060f06ad11355c178a5f4bf08a052@vtiger.fosslabs.com>

#1157: Wrong display of Roles in Roles Home
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  don  
      Type:  defect     |      Status:  new  
  Priority:  critical   |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => don

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1157>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 08:38:38 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 12:38:38 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23795=3A_?=
 =?utf-8?q?Reformat_long_queries_to_span_multiple_lines?=
In-Reply-To: <076.1fdfe4f34a2d2496c7c18911ad082758@vtiger.fosslabs.com>
References: <076.1fdfe4f34a2d2496c7c18911ad082758@vtiger.fosslabs.com>
Message-ID: <085.6c96be613ef340a7af4f46fb3d7134ae@vtiger.fosslabs.com>

#795: Reformat long queries to span multiple lines
------------------------+---------------------------------------------------
  Reporter:  allanbush  |       Owner:  developer 
      Type:  defect     |      Status:  new       
  Priority:  minor      |   Milestone:  5.0.0     
 Component:  vtigercrm  |     Version:  5.0.1     
Resolution:             |    Keywords:  formatting
------------------------+---------------------------------------------------
Changes (by don):

  * version:  5.0.0 => 5.0.1

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/795>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 08:39:16 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 12:39:16 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23532=3A_?=
 =?utf-8?q?Vtiger_beta=2C_Invoice_template=2C_VAT_and_products?=
In-Reply-To: <076.123c9f47c472bc36773dd906f577728f@vtiger.fosslabs.com>
References: <076.123c9f47c472bc36773dd906f577728f@vtiger.fosslabs.com>
Message-ID: <085.63cc69728de935df4dee115b9bc13b72@vtiger.fosslabs.com>

#532: Vtiger beta, Invoice template, VAT and products
-----------------------------+----------------------------------------------
  Reporter:  maxx292 at web.de  |       Owner:  mickie          
      Type:  enhancement     |      Status:  new             
  Priority:  major           |   Milestone:                  
 Component:  vtigercrm       |     Version:  5.0.0           
Resolution:                  |    Keywords:  Invoice template
-----------------------------+----------------------------------------------
Changes (by saraj):

  * owner:  developer => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/532>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 08:40:32 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 12:40:32 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23926=3A_?=
 =?utf-8?q?If_database_fails=2C_installation_script_loses_path_variable?=
In-Reply-To: <076.3dff578d41ed95759b327615c9ea781a@vtiger.fosslabs.com>
References: <076.3dff578d41ed95759b327615c9ea781a@vtiger.fosslabs.com>
Message-ID: <085.78f7e83ba7bbdab8cab6110466f6b21a@vtiger.fosslabs.com>

#926: If database fails, installation script loses path variable
------------------------+---------------------------------------------------
  Reporter:  neofis     |       Owner:  jeri        
      Type:  defect     |      Status:  new         
  Priority:  critical   |   Milestone:              
 Component:  vtigercrm  |     Version:  5.0.0       
Resolution:             |    Keywords:  installation
------------------------+---------------------------------------------------
Changes (by don):

  * priority:  minor => critical

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/926>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 08:42:39 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 12:42:39 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231159=3A?=
 =?utf-8?q?_Roles_-_Expand_icon_is_not_intuitive?=
In-Reply-To: <076.baaaff1e8853707e998ecfdccb70cd44@vtiger.fosslabs.com>
References: <076.baaaff1e8853707e998ecfdccb70cd44@vtiger.fosslabs.com>
Message-ID: <085.a58aa0f755d7967681a7cb83f58977e0@vtiger.fosslabs.com>

#1159: Roles - Expand icon is not intuitive
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  ela  
      Type:  defect     |      Status:  new  
  Priority:  minor      |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => ela

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1159>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 08:43:53 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 12:43:53 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231226=3A?=
 =?utf-8?q?_Currency_configuration_-_image_for_international_currencies?=
In-Reply-To: <076.623ba2470db6ef6e32b001dae6f27356@vtiger.fosslabs.com>
References: <076.623ba2470db6ef6e32b001dae6f27356@vtiger.fosslabs.com>
Message-ID: <085.6037e8e3dec8207ec7642fb42884c3e5@vtiger.fosslabs.com>

#1226: Currency configuration - image for international currencies
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  ela  
      Type:  defect     |      Status:  new  
  Priority:  minor      |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => ela

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1226>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 08:44:51 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 12:44:51 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23763=3A_?=
 =?utf-8?q?Inventory_Terms_=26_Conditions_can_be_moved_to_different_sectio?=
 =?utf-8?q?n?=
In-Reply-To: <076.afaed639175411364f6ac75d41b10dd1@vtiger.fosslabs.com>
References: <076.afaed639175411364f6ac75d41b10dd1@vtiger.fosslabs.com>
Message-ID: <085.0d79e78ab45fed7bcb948bb9e10c15b0@vtiger.fosslabs.com>

#763: Inventory Terms & Conditions can be moved to different section
--------------------------+-------------------------------------------------
  Reporter:  gopal        |       Owner:  jerrydgeorge
      Type:  enhancement  |      Status:  new         
  Priority:  major        |   Milestone:  5.0.0       
 Component:  vtigercrm    |     Version:  5.0.0       
Resolution:               |    Keywords:              
--------------------------+-------------------------------------------------
Changes (by saraj):

  * owner:  developer => jerrydgeorge

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/763>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 08:45:24 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 12:45:24 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23953=3A_?=
 =?utf-8?q?Inconsistency_in_Global_Search_function?=
In-Reply-To: <076.0e9f83b845f7f23e047d6bd25f0184d0@vtiger.fosslabs.com>
References: <076.0e9f83b845f7f23e047d6bd25f0184d0@vtiger.fosslabs.com>
Message-ID: <085.e5e489fd05799b8152814a6cf0049e65@vtiger.fosslabs.com>

#953: Inconsistency in Global Search function
------------------------+---------------------------------------------------
  Reporter:  Gopal      |       Owner:  mickie
      Type:  defect     |      Status:  closed
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mickie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 when we do global search, all modules will be searched and defaultly we
 showed the contact module result only. when we change the module from
 combo box the corresponding result will be shown.
 Now we have changed to show all module results as default.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/953>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 08:45:59 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 12:45:59 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=23774=3A_?=
	=?utf-8?q?Theme_error?=
In-Reply-To: <076.cace9562acb121b40381ab28bed91baf@vtiger.fosslabs.com>
References: <076.cace9562acb121b40381ab28bed91baf@vtiger.fosslabs.com>
Message-ID: <085.b8e9e4d62eace0a2d68131dc9d40fb5e@vtiger.fosslabs.com>

#774: Theme error
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       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

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/774>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 08:46:10 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 12:46:10 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231237=3A?=
 =?utf-8?q?_Usage_of_todos=2C_to-do=2C_To_Do?=
In-Reply-To: <076.cd52e3648a156e2549605fdddbbfdc7b@vtiger.fosslabs.com>
References: <076.cd52e3648a156e2549605fdddbbfdc7b@vtiger.fosslabs.com>
Message-ID: <085.b4b30df9757b5fc49020733f3efbf515@vtiger.fosslabs.com>

#1237: Usage of todos, to-do, To Do
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  ahmed
      Type:  defect     |      Status:  new  
  Priority:  minor      |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => ahmed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1237>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 08:50:04 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 12:50:04 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=23781=3A_?=
	=?utf-8?q?My_Preferences?=
In-Reply-To: <076.de29f722ccd714a4c6614d03a0a6957f@vtiger.fosslabs.com>
References: <076.de29f722ccd714a4c6614d03a0a6957f@vtiger.fosslabs.com>
Message-ID: <085.b349878beaa707841da10ee47e4a16dc@vtiger.fosslabs.com>

#781: My Preferences
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  jerrydgeorge
      Type:  defect     |      Status:  new         
  Priority:  major      |   Milestone:              
 Component:  vtigercrm  |     Version:  5.0.0       
Resolution:             |    Keywords:              
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => jerrydgeorge

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/781>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 08:50:20 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 12:50:20 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23532=3A_?=
 =?utf-8?q?Vtiger_beta=2C_Invoice_template=2C_VAT_and_products?=
In-Reply-To: <076.123c9f47c472bc36773dd906f577728f@vtiger.fosslabs.com>
References: <076.123c9f47c472bc36773dd906f577728f@vtiger.fosslabs.com>
Message-ID: <085.d2c87705b7248aa0e2341d58b97ccc06@vtiger.fosslabs.com>

#532: Vtiger beta, Invoice template, VAT and products
-----------------------------+----------------------------------------------
  Reporter:  maxx292 at web.de  |       Owner:  mickie          
      Type:  enhancement     |      Status:  new             
  Priority:  major           |   Milestone:                  
 Component:  vtigercrm       |     Version:  5.0.0           
Resolution:                  |    Keywords:  Invoice template
-----------------------------+----------------------------------------------
Comment (by mickie):

 we have released Beta on 31 st May. i think you have told about the Pre-
 Beta release. Before beta the inventory was not worked. we have changed
 the inventory as working in our Beta release.
 So the reported issues are working and if you still face any issues please
 do post.
 Print option will be provided in our GA release.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/532>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 08:59:48 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 12:59:48 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231323=3A?=
 =?utf-8?q?_Performance_Issue_in_ListView?=
Message-ID: <076.1ec7598e9f7965c44699ac918e5801a3@vtiger.fosslabs.com>

#1323: Performance Issue in ListView
--------------------------+-------------------------------------------------
 Reporter:  jerrydgeorge  |       Owner:  philip
     Type:  defect        |      Status:  new   
 Priority:  critical      |   Milestone:        
Component:  vtigercrm     |     Version:  5.0.0 
 Keywords:                |  
--------------------------+-------------------------------------------------
 In ListView all records are queried from database and we are showing some
 x records.This should be optimised

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1323>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 08:59:42 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 12:59:42 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231322=3A?=
 =?utf-8?q?_issue_in_customfield_picklist?=
Message-ID: <076.0444d61c632efd55ca5f5274820cefee@vtiger.fosslabs.com>

#1322: issue in customfield picklist
-----------------------+----------------------------------------------------
 Reporter:  mangai     |       Owner:  mangai
     Type:  defect     |      Status:  new   
 Priority:  blocker    |   Milestone:  5.0.0 
Component:  vtigercrm  |     Version:  5.0.0 
 Keywords:             |  
-----------------------+----------------------------------------------------
 could not edit customfield picklist thro picklist edit

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1322>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 09:03:34 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 13:03:34 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231007=3A?=
 =?utf-8?q?_undo_last_import_issue?=
In-Reply-To: <076.b72fd0c8557c71f7c763fc0c271c8112@vtiger.fosslabs.com>
References: <076.b72fd0c8557c71f7c763fc0c271c8112@vtiger.fosslabs.com>
Message-ID: <085.6bc72f7b7121767a809bc38f796a515d@vtiger.fosslabs.com>

#1007: undo last import issue
------------------------+---------------------------------------------------
  Reporter:  mickie     |       Owner:  mickie
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mickie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 This issue has been fixed.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1007>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 09:04:05 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 13:04:05 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23791=3A_?=
 =?utf-8?q?config=2Einc=2Ephp_altered_by_install_process=2C_should_only_al?=
 =?utf-8?q?ter_files_not_under_source_control?=
In-Reply-To: <076.151bf2d07dee39290c0944d7c7eb5ff2@vtiger.fosslabs.com>
References: <076.151bf2d07dee39290c0944d7c7eb5ff2@vtiger.fosslabs.com>
Message-ID: <085.67afecaa01c5d060bf33fd64f7c4cb56@vtiger.fosslabs.com>

#791: config.inc.php altered by install process, should only alter files not
under source control
------------------------+---------------------------------------------------
  Reporter:  jeffk      |       Owner:  developer         
      Type:  defect     |      Status:  new               
  Priority:  major      |   Milestone:  5.0.0             
 Component:  vtigercrm  |     Version:  5.0.1             
Resolution:             |    Keywords:  install repository
------------------------+---------------------------------------------------
Changes (by saraj):

  * version:  5.0.0 => 5.0.1

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/791>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 08:43:03 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 12:43:03 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23752=3A_?=
 =?utf-8?q?Add_postgresql_support_to_trunk?=
In-Reply-To: <076.ca4a4f28d7793b630896001aef3c1d00@vtiger.fosslabs.com>
References: <076.ca4a4f28d7793b630896001aef3c1d00@vtiger.fosslabs.com>
Message-ID: <085.29276cbb01b66c91848133cb75124097@vtiger.fosslabs.com>

#752: Add postgresql support to trunk
--------------------------+-------------------------------------------------
  Reporter:  jeffk        |       Owner:  developer                
      Type:  enhancement  |      Status:  new                      
  Priority:  major        |   Milestone:  5.0.0                    
 Component:  vtigercrm    |     Version:  5.0.0                    
Resolution:               |    Keywords:  adodb postgresql database
--------------------------+-------------------------------------------------
Changes (by saraj):

  * type:  defect => enhancement

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/752>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 08:42:52 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 12:42:52 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231321=3A?=
 =?utf-8?q?_Inconsistent_pagination_behaviour_in_Related_Lists_of_Leads_Mo?=
 =?utf-8?q?dule?=
Message-ID: <076.6915ecc3787751002b5c1b5587a1f1a7@vtiger.fosslabs.com>

#1321: Inconsistent pagination behaviour in Related Lists of Leads Module
-----------------------+----------------------------------------------------
 Reporter:  ahmed      |       Owner:  saraj
     Type:  defect     |      Status:  new  
 Priority:  critical   |   Milestone:       
Component:  vtigercrm  |     Version:  5.0.0
 Keywords:             |  
-----------------------+----------------------------------------------------
 Sometimes the pagination is displayed properly, at other times it doesn't

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1321>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 09:12:06 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 13:12:06 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=23797=3A_?=
	=?utf-8?q?Import_Accounts_step_3?=
In-Reply-To: <076.84e3b6e50e6005621030121ec2b4f656@vtiger.fosslabs.com>
References: <076.84e3b6e50e6005621030121ec2b4f656@vtiger.fosslabs.com>
Message-ID: <085.9d2f0d52d2c163da99c05170c2cd2b1c@vtiger.fosslabs.com>

#797: Import Accounts step 3
------------------------+---------------------------------------------------
  Reporter:  Balduin    |       Owner:  mickie
      Type:  defect     |      Status:  closed
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mickie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 In Beta we have fixed this issues. if you still face this issue please let
 us know.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/797>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 09:13:10 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 13:13:10 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23794=3A_?=
 =?utf-8?q?remove_subversion_id_tags?=
In-Reply-To: <076.7ed6822a7672e8340718bd63738879ea@vtiger.fosslabs.com>
References: <076.7ed6822a7672e8340718bd63738879ea@vtiger.fosslabs.com>
Message-ID: <085.91ad98a4fc60c64e440f72a0c5241098@vtiger.fosslabs.com>

#794: remove subversion id tags
------------------------+---------------------------------------------------
  Reporter:  jeffk      |       Owner:  developer          
      Type:  defect     |      Status:  new                
  Priority:  major      |   Milestone:  5.0.0              
 Component:  vtigercrm  |     Version:  5.0.1              
Resolution:             |    Keywords:  repository keywords
------------------------+---------------------------------------------------
Changes (by saraj):

  * version:  5.0.0 => 5.0.1

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/794>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 09:14:45 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 13:14:45 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231286=3A?=
 =?utf-8?q?_Getting_a_warning_message_in_the_week_view_of_the_calendar?=
In-Reply-To: <076.09b3d19c2818c145cad7974f71d66816@vtiger.fosslabs.com>
References: <076.09b3d19c2818c145cad7974f71d66816@vtiger.fosslabs.com>
Message-ID: <085.8cd035f23be8292d3ddb2a6d0551c08d@vtiger.fosslabs.com>

#1286: Getting a warning message in the week view of the calendar
------------------------+---------------------------------------------------
  Reporter:  Jaguar     |       Owner:  mangai
      Type:  defect     |      Status:  new   
  Priority:  minor      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => mangai

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1286>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 09:15:03 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 13:15:03 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23807=3A_?=
 =?utf-8?q?Enhance_Contacts_List_Navigation?=
In-Reply-To: <076.b4ed0b9a47318420c8b67dcb5e05ecbb@vtiger.fosslabs.com>
References: <076.b4ed0b9a47318420c8b67dcb5e05ecbb@vtiger.fosslabs.com>
Message-ID: <085.aa38552599facda558f75e890f1f4019@vtiger.fosslabs.com>

#807: Enhance Contacts List Navigation
--------------------------------+-------------------------------------------
  Reporter:  kenlyle at yahoo.com  |       Owner:  developer             
      Type:  enhancement        |      Status:  new                   
  Priority:  major              |   Milestone:                        
 Component:  vtigercrm          |     Version:  5.0.1                 
Resolution:                     |    Keywords:  scroll, navigate, list
--------------------------------+-------------------------------------------
Changes (by saraj):

  * version:  5.0.0 => 5.0.1

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/807>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 09:15:25 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 13:15:25 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231305=3A?=
	=?utf-8?q?_Total_taxes_not_auto?=
In-Reply-To: <076.952daacfec18eaf8adefbd4e7d778e41@vtiger.fosslabs.com>
References: <076.952daacfec18eaf8adefbd4e7d778e41@vtiger.fosslabs.com>
Message-ID: <085.9fcb5ff97fe0b99053821a44fada3654@vtiger.fosslabs.com>

#1305: Total taxes not auto
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  mickie                                               
      Type:  defect     |      Status:  new                                                  
  Priority:  minor      |   Milestone:                                                       
 Component:  vtigercrm  |     Version:  5.0.0                                                
Resolution:             |    Keywords:  quotes, invoices, sales order, so, purchase order, po
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1305>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 09:16:21 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 13:16:21 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231001=3A?=
 =?utf-8?q?_issue_in_display_imported_records_in_last_step?=
In-Reply-To: <076.75256648969123de1075c72421e06edd@vtiger.fosslabs.com>
References: <076.75256648969123de1075c72421e06edd@vtiger.fosslabs.com>
Message-ID: <085.f25773d1f4c103b92ba51030ecf97216@vtiger.fosslabs.com>

#1001: issue in display imported records in last step
------------------------+---------------------------------------------------
  Reporter:  mickie     |       Owner:  mickie
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mickie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 This issue has been fixed.now all the records are displayed when we have
 more than 500 records

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1001>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 09:16:19 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 13:16:19 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23808=3A_?=
 =?utf-8?q?Recently_Used_-_Contacts=2C_Leads=2C_Emails=2C_etc=2E?=
In-Reply-To: <076.732df8a9c67d4b57a254501f77c190bf@vtiger.fosslabs.com>
References: <076.732df8a9c67d4b57a254501f77c190bf@vtiger.fosslabs.com>
Message-ID: <085.f85518a693f158397f9b8663e6efacdb@vtiger.fosslabs.com>

#808: Recently Used - Contacts, Leads, Emails, etc.
--------------------------------+-------------------------------------------
  Reporter:  kenlyle at yahoo.com  |       Owner:  jerrydgeorge         
      Type:  enhancement        |      Status:  new                  
  Priority:  major              |   Milestone:                       
 Component:  vtigercrm          |     Version:  5.0.0                
Resolution:                     |    Keywords:  recent, recently used
--------------------------------+-------------------------------------------
Changes (by saraj):

  * owner:  developer => jerrydgeorge

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/808>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 09:16:43 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 13:16:43 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231306=3A?=
 =?utf-8?q?_Missing_fields_in_detailview_for_other_langs?=
In-Reply-To: <076.9fc5d3aab2b86e9e74117e8341c6ee53@vtiger.fosslabs.com>
References: <076.9fc5d3aab2b86e9e74117e8341c6ee53@vtiger.fosslabs.com>
Message-ID: <085.bd4f491440665fc10e567209c79ea9e2@vtiger.fosslabs.com>

#1306: Missing fields in detailview for other langs
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  ahmed                 
      Type:  defect     |      Status:  new                   
  Priority:  minor      |   Milestone:                        
 Component:  vtigercrm  |     Version:  5.0.0                 
Resolution:             |    Keywords:  detailview, tranlation
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => ahmed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1306>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 09:18:40 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 13:18:40 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231310=3A?=
 =?utf-8?q?_Translation_for_=22my_preference=22_=26_home_page?=
In-Reply-To: <076.a6a7ecaca440fce3cdf9dde7ec76ec0a@vtiger.fosslabs.com>
References: <076.a6a7ecaca440fce3cdf9dde7ec76ec0a@vtiger.fosslabs.com>
Message-ID: <085.c63502cc1ab843879250d2be1ef54daf@vtiger.fosslabs.com>

#1310: Translation for "my preference" & home page
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  ahmed                                
      Type:  defect     |      Status:  new                                  
  Priority:  minor      |   Milestone:                                       
 Component:  vtigercrm  |     Version:  5.0.0                                
Resolution:             |    Keywords:  translation, homepage, my preferences
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => ahmed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1310>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 09:19:31 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 13:19:31 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23811=3A_?=
 =?utf-8?q?Recurring_Events_Functionality_Issue?=
In-Reply-To: <076.8585fb4bdf941329df8632100a82d2cd@vtiger.fosslabs.com>
References: <076.8585fb4bdf941329df8632100a82d2cd@vtiger.fosslabs.com>
Message-ID: <085.fb38adc5cd5d97eaf44fd93eda245e6f@vtiger.fosslabs.com>

#811: Recurring Events Functionality Issue
----------------------------------+-----------------------------------------
  Reporter:  sganendra at yahoo.com  |       Owner:  mangai                  
      Type:  defect               |      Status:  new                     
  Priority:  major                |   Milestone:  5.0.0                   
 Component:  vtigercrm            |     Version:  5.0.1                   
Resolution:                       |    Keywords:  recurring, events, tasks
----------------------------------+-----------------------------------------
Changes (by saraj):

  * version:  5.0.0 => 5.0.1
  * owner:  developer => mangai

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/811>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 09:19:42 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 13:19:42 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23355=3A_?=
 =?utf-8?q?Option_can_be_provided_to_convert_a_lead_from_leads_list_view_i?=
 =?utf-8?q?tself?=
In-Reply-To: <076.723759bda055b76b6a827d918860919f@vtiger.fosslabs.com>
References: <076.723759bda055b76b6a827d918860919f@vtiger.fosslabs.com>
Message-ID: <085.227e9f6a2712fe606a1989edb39fafa2@vtiger.fosslabs.com>

#355: Option can be provided to convert a lead from leads list view itself
--------------------------+-------------------------------------------------
  Reporter:  don          |       Owner:  saint
      Type:  enhancement  |      Status:  new  
  Priority:  major        |   Milestone:       
 Component:  vtigercrm    |     Version:  5.0.0
Resolution:               |    Keywords:       
--------------------------+-------------------------------------------------
Changes (by richie):

  * type:  defect => enhancement

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/355>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 09:19:46 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 13:19:46 -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.01a2f50cf14b30a22e65f45e0510b8cf@vtiger.fosslabs.com>

#146: labels not in single line
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  ela      
      Type:  defect     |      Status:  new      
  Priority:  trivial    |   Milestone:  5.0.0    
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:             |    Keywords:  staggered
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  saint => ela

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/146>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 09:20:56 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 13:20:56 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23779=3A_?=
 =?utf-8?q?Update_Home_Page_Block_Order_Terms?=
In-Reply-To: <076.211ee58adeeafe8bd16e6d4f4857e285@vtiger.fosslabs.com>
References: <076.211ee58adeeafe8bd16e6d4f4857e285@vtiger.fosslabs.com>
Message-ID: <085.73082c1dc354f0753d536e3cf464c346@vtiger.fosslabs.com>

#779: Update Home Page Block Order Terms
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  don  
      Type:  defect     |      Status:  new  
  Priority:  trivial    |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => don

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/779>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 09:22:21 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 13:22:21 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231251=3A?=
 =?utf-8?q?_Chat_not_working=3F=3F?=
In-Reply-To: <076.c47ecc4624fe78215a43eca164a2c051@vtiger.fosslabs.com>
References: <076.c47ecc4624fe78215a43eca164a2c051@vtiger.fosslabs.com>
Message-ID: <085.c455043001410fd44dc156db0e2e67b7@vtiger.fosslabs.com>

#1251: Chat not working??
------------------------+---------------------------------------------------
  Reporter:             |       Owner:  jeri  
      Type:  defect     |      Status:  closed
  Priority:  minor      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by anonymous):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1251>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 09:22:34 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 13:22:34 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=23813=3A_?=
	=?utf-8?q?New_Quote?=
In-Reply-To: <076.3772e0ff3b6afff03f74ea9a4892bb7f@vtiger.fosslabs.com>
References: <076.3772e0ff3b6afff03f74ea9a4892bb7f@vtiger.fosslabs.com>
Message-ID: <085.6493f8f64b0a6107e963e0937c1f9349@vtiger.fosslabs.com>

#813: New Quote
------------------------+---------------------------------------------------
  Reporter:  Balduin    |       Owner:  mickie
      Type:  defect     |      Status:  new   
  Priority:  trivial    |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/813>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 09:23:11 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 13:23:11 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=23814=3A_?=
	=?utf-8?q?RSS_image?=
In-Reply-To: <076.272628496df02a123a203fa1bf2cbdb1@vtiger.fosslabs.com>
References: <076.272628496df02a123a203fa1bf2cbdb1@vtiger.fosslabs.com>
Message-ID: <085.28e74d940e4feeb0a8df0aea490b3616@vtiger.fosslabs.com>

#814: RSS image
------------------------+---------------------------------------------------
  Reporter:  Balduin    |       Owner:  ela  
      Type:  defect     |      Status:  new  
  Priority:  trivial    |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => ela

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/814>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 09:23:29 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 13:23:29 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23839=3A_?=
 =?utf-8?q?Settings_=3E_CommunicationsTemplates_=3E_Mail_Merge_Template=2C?=
 =?utf-8?q?_Edit?=
In-Reply-To: <076.0201dd774bc7d66d5dc9d197e1979c28@vtiger.fosslabs.com>
References: <076.0201dd774bc7d66d5dc9d197e1979c28@vtiger.fosslabs.com>
Message-ID: <085.dd14243fcbc9ce5e44cbec2e48e56ee1@vtiger.fosslabs.com>

#839: Settings > CommunicationsTemplates > Mail Merge Template, Edit
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  ela  
      Type:  defect     |      Status:  new  
  Priority:  trivial    |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => ela

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/839>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 09:23:40 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 13:23:40 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231077=3A?=
 =?utf-8?q?_Inventory_=3E_Products=2C_Step_2_spelling_error?=
In-Reply-To: <076.afa5672c1a2f342659af400a47199461@vtiger.fosslabs.com>
References: <076.afa5672c1a2f342659af400a47199461@vtiger.fosslabs.com>
Message-ID: <085.8aff243ed1b2c690ad0588a818180ef5@vtiger.fosslabs.com>

#1077: Inventory > Products, Step 2 spelling error
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  mickie
      Type:  defect     |      Status:  new   
  Priority:  trivial    |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1077>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 09:24:01 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 13:24:01 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=23923=3A_?=
	=?utf-8?q?Studio_=3E_Picklist?=
In-Reply-To: <076.b4e0e1396a2feb913df180b7b4a56c2c@vtiger.fosslabs.com>
References: <076.b4e0e1396a2feb913df180b7b4a56c2c@vtiger.fosslabs.com>
Message-ID: <085.85b7130df9540148e5e07be1823bb812@vtiger.fosslabs.com>

#923: Studio > Picklist
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  ela  
      Type:  defect     |      Status:  new  
  Priority:  trivial    |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => ela

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/923>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 09:24:08 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 13:24:08 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231302=3A?=
 =?utf-8?q?_Update_to_new_adodb-4=2E90_release?=
In-Reply-To: <076.cfae0e78298741dfce9c6a4f41a70218@vtiger.fosslabs.com>
References: <076.cfae0e78298741dfce9c6a4f41a70218@vtiger.fosslabs.com>
Message-ID: <085.8e4fd2e0c9f75f91b535d3ea57eb9327@vtiger.fosslabs.com>

#1302: Update to new adodb-4.90 release
------------------------+---------------------------------------------------
  Reporter:  jeffk      |       Owner:  jeffk                 
      Type:  defect     |      Status:  new                   
  Priority:  major      |   Milestone:  5.0.0                 
 Component:  vtigercrm  |     Version:  5.0.0                 
Resolution:             |    Keywords:  adodb database package
------------------------+---------------------------------------------------
Comment (by richie):

 go ahead JeffK.
 I think you do have the permission. Put in a word to Allan Bush as he is
 the maintainer.
 Do you suggest the same for 5.0 too?

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1302>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 09:28:11 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 13:28:11 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231298=3A?=
 =?utf-8?q?_revert_r7003=3A7004_prefix_vtiger=5F_to_all_tablenames?=
In-Reply-To: <076.32456f312efcd1431e178d7f1df1ccb0@vtiger.fosslabs.com>
References: <076.32456f312efcd1431e178d7f1df1ccb0@vtiger.fosslabs.com>
Message-ID: <085.a6cbb632d17d6cc88f202ed129ed1d2f@vtiger.fosslabs.com>

#1298: revert r7003:7004 prefix vtiger_ to all tablenames
------------------------+---------------------------------------------------
  Reporter:  jeffk      |       Owner:  don     
      Type:  defect     |      Status:  new     
  Priority:  major      |   Milestone:  5.0.0   
 Component:  vtigercrm  |     Version:  5.0.0   
Resolution:             |    Keywords:  database
------------------------+---------------------------------------------------
Comment (by richie):

 We are in the process of testing and fixing the breakages.
 We are in the process of making enmasse changes to all the other plugins
 too.
 We are automating the testing to ensure that we cover most of the areas.

 This will not be reverted.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1298>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 09:28:53 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 13:28:53 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231292=3A?=
	=?utf-8?q?_This_is_Spam?=
In-Reply-To: <076.3be71aaa1fa450bc94bdfa03d862bd31@vtiger.fosslabs.com>
References: <076.3be71aaa1fa450bc94bdfa03d862bd31@vtiger.fosslabs.com>
Message-ID: <085.8945ae323cfa7ca5be67cfcb84f60a42@vtiger.fosslabs.com>

#1292: This is Spam
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  developer                          
      Type:  defect     |      Status:  closed                             
  Priority:  major      |   Milestone:                                     
 Component:  vtigercrm  |     Version:  5.0.0                              
Resolution:  duplicate  |    Keywords:  Viagra,Ambien,Diazepam,Levitra,Soma
------------------------+---------------------------------------------------
Changes (by anonymous):

  * resolution:  => duplicate
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1292>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 09:31:24 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 13:31:24 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=23840=3A_?=
	=?utf-8?q?Email_templates?=
In-Reply-To: <076.532bdc25e39b6eb5497600f7e0581cdd@vtiger.fosslabs.com>
References: <076.532bdc25e39b6eb5497600f7e0581cdd@vtiger.fosslabs.com>
Message-ID: <085.6ff1d3792901f8338eb988e80099855d@vtiger.fosslabs.com>

#840: Email templates
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  developer
      Type:  defect     |      Status:  closed   
  Priority:  major      |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:  invalid    |    Keywords:           
------------------------+---------------------------------------------------
Changes (by saraj):

  * resolution:  => invalid
  * status:  new => closed

Comment:

 Yes, we can't assign personal templates (private) to users expect it is
 public. We allow only public templates to be assigned to other users.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/840>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 09:33:08 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 13:33:08 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23912=3A_?=
 =?utf-8?q?Calendar_-_Yearly_View_-_List_View?=
In-Reply-To: <076.61f66c44706ccd2abe1008172c1eb65b@vtiger.fosslabs.com>
References: <076.61f66c44706ccd2abe1008172c1eb65b@vtiger.fosslabs.com>
Message-ID: <085.4fa90ad1ddb4b1b14e6b2c748691911d@vtiger.fosslabs.com>

#912: Calendar - Yearly View - List View
--------------------------+-------------------------------------------------
  Reporter:  anonymous    |       Owner:  developer
      Type:  enhancement  |      Status:  new      
  Priority:  major        |   Milestone:           
 Component:  vtigercrm    |     Version:  5.0.0    
Resolution:               |    Keywords:           
--------------------------+-------------------------------------------------
Changes (by saraj):

  * cc:  => mangai

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/912>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 09:34:02 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 13:34:02 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7126 - in
 /vtigercrm/trunk/modules/Import: ImportMap.php UsersLastImport.php
Message-ID: <20060615133402.5660B7ED222@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 15 07:33:57 2006
New Revision: 7126

Log:
* Removed the vtiger prefix which have been added for the table's columnnames

Modified:
    vtigercrm/trunk/modules/Import/ImportMap.php
    vtigercrm/trunk/modules/Import/UsersLastImport.php

Modified: vtigercrm/trunk/modules/Import/ImportMap.php
==============================================================================
--- vtigercrm/trunk/modules/Import/ImportMap.php (original)
+++ vtigercrm/trunk/modules/Import/ImportMap.php Thu Jun 15 07:33:57 2006
@@ -41,7 +41,7 @@
 	var $assigned_user_id;
 	var $is_published;
 
-	var $table_name = "import_maps";
+	var $table_name = "vtiger_import_maps";
 	var $object_name = "ImportMap";
 	var $module_id="id";
 	

Modified: vtigercrm/trunk/modules/Import/UsersLastImport.php
==============================================================================
--- vtigercrm/trunk/modules/Import/UsersLastImport.php (original)
+++ vtigercrm/trunk/modules/Import/UsersLastImport.php Thu Jun 15 07:33:57 2006
@@ -38,7 +38,7 @@
 	var $bean_type;
 	var $bean_id;
 
-	var $table_name = "users_last_import";
+	var $table_name = "vtiger_users_last_import";
 	var $object_name = "UsersLastImport";
 	var $column_fields = Array(
 					"id"




From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 09:35:15 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 13:35:15 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23912=3A_?=
 =?utf-8?q?Calendar_-_Yearly_View_-_List_View?=
In-Reply-To: <076.61f66c44706ccd2abe1008172c1eb65b@vtiger.fosslabs.com>
References: <076.61f66c44706ccd2abe1008172c1eb65b@vtiger.fosslabs.com>
Message-ID: <085.0d110b557572f291bb52f179878bbf9e@vtiger.fosslabs.com>

#912: Calendar - Yearly View - List View
--------------------------+-------------------------------------------------
  Reporter:  anonymous    |       Owner:  mangai
      Type:  enhancement  |      Status:  new   
  Priority:  major        |   Milestone:        
 Component:  vtigercrm    |     Version:  5.0.0 
Resolution:               |    Keywords:        
--------------------------+-------------------------------------------------
Changes (by saraj):

  * owner:  developer => mangai
  * cc:  mangai =>

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/912>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 09:36:14 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 13:36:14 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23914=3A_?=
 =?utf-8?q?Sales_=3E_Quotes_=3E_Detail_View?=
In-Reply-To: <076.51b57cd15fe20b42398ea79fb1064f23@vtiger.fosslabs.com>
References: <076.51b57cd15fe20b42398ea79fb1064f23@vtiger.fosslabs.com>
Message-ID: <085.2bf2bcac4fb2910871d20bee6249d01a@vtiger.fosslabs.com>

#914: Sales > Quotes > Detail View
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  mickie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/914>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 09:37:45 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 13:37:45 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23918=3A_?=
 =?utf-8?q?Global_search_function_shows_wrong_results?=
In-Reply-To: <076.a484dea87ad7ce51b1edd92f46c3ba8a@vtiger.fosslabs.com>
References: <076.a484dea87ad7ce51b1edd92f46c3ba8a@vtiger.fosslabs.com>
Message-ID: <085.a55b71cc64f85bbcb2ab28ba4eb9eb7c@vtiger.fosslabs.com>

#918: Global search function shows wrong results
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  mickie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/918>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 09:22:00 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 13:22:00 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23824=3A_?=
 =?utf-8?q?Quotes_still_don=27t_display_product_info_on_edit?=
In-Reply-To: <076.45312decf82d04fd634c43e6cb09ed21@vtiger.fosslabs.com>
References: <076.45312decf82d04fd634c43e6cb09ed21@vtiger.fosslabs.com>
Message-ID: <085.14387b893af07de35c45dad459d70fc9@vtiger.fosslabs.com>

#824: Quotes still don't display product info on edit
-----------------------------------+----------------------------------------
  Reporter:  jay at forecasttech.com  |       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:

 This has been fixed from vtigercrm 5 beta onwards.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/824>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 09:13:00 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 13:13:00 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231284=3A?=
 =?utf-8?q?_Removal_of_commented-out_code_is_helpful?=
In-Reply-To: <076.1f009815df5e22f62e7a2c599acd3ebf@vtiger.fosslabs.com>
References: <076.1f009815df5e22f62e7a2c599acd3ebf@vtiger.fosslabs.com>
Message-ID: <085.cd5b7f13f1fecce9f20ab328097d4625@vtiger.fosslabs.com>

#1284: Removal of commented-out code is helpful
------------------------+---------------------------------------------------
  Reporter:  jeffk      |       Owner:  developer
      Type:  defect     |      Status:  new      
  Priority:  minor      |   Milestone:  5.0.0    
 Component:  vtigercrm  |     Version:  5.0.1    
Resolution:             |    Keywords:           
------------------------+---------------------------------------------------
Changes (by don):

  * version:  5.0.0 => 5.0.1

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1284>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 09:41:35 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 13:41:35 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23927=3A_?=
 =?utf-8?q?Shortcut_=22New_Account=22_doesn=27t_work?=
In-Reply-To: <076.97aed0717bb7c14bc4216213f908cd2e@vtiger.fosslabs.com>
References: <076.97aed0717bb7c14bc4216213f908cd2e@vtiger.fosslabs.com>
Message-ID: <085.61127374c8f3fcca9048c3af13419d32@vtiger.fosslabs.com>

#927: Shortcut "New Account" doesn't work
------------------------+---------------------------------------------------
  Reporter:  neofis     |       Owner:  ahmed           
      Type:  defect     |      Status:  new             
  Priority:  major      |   Milestone:                  
 Component:  vtigercrm  |     Version:  5.0.0           
Resolution:             |    Keywords:  New Account menu
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => ahmed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/927>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 09:43:35 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 13:43:35 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23945=3A_?=
 =?utf-8?q?Marketing_-_Acccounts_link_may_not_require?=
In-Reply-To: <076.b7fed829ea74af680063f59f27e9abdb@vtiger.fosslabs.com>
References: <076.b7fed829ea74af680063f59f27e9abdb@vtiger.fosslabs.com>
Message-ID: <085.4cf29b699fed29cdd5cd08ae05544cb6@vtiger.fosslabs.com>

#945: Marketing - Acccounts link may not require
--------------------------+-------------------------------------------------
  Reporter:  gopal        |       Owner:  jerrydgeorge
      Type:  enhancement  |      Status:  new         
  Priority:  major        |   Milestone:  5.0.0       
 Component:  vtigercrm    |     Version:  5.0.0       
Resolution:               |    Keywords:              
--------------------------+-------------------------------------------------
Changes (by saraj):

  * owner:  developer => jerrydgeorge

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/945>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 09:44:09 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 13:44:09 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23946=3A_?=
 =?utf-8?q?Enable_Sorting_for_all_fields_in_List_Views?=
In-Reply-To: <076.0eef908f7d31c54e7a8ca30ca48b0825@vtiger.fosslabs.com>
References: <076.0eef908f7d31c54e7a8ca30ca48b0825@vtiger.fosslabs.com>
Message-ID: <085.f4a83f186ecb1a7eb016e9687c0ba0ad@vtiger.fosslabs.com>

#946: Enable Sorting for all fields in List Views
--------------------------+-------------------------------------------------
  Reporter:  gopal        |       Owner:  saraj
      Type:  enhancement  |      Status:  new  
  Priority:  major        |   Milestone:  5.0.0
 Component:  vtigercrm    |     Version:  5.0.0
Resolution:               |    Keywords:       
--------------------------+-------------------------------------------------
Changes (by saraj):

  * owner:  developer => saraj

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/946>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 09:47:11 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 13:47:11 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23959=3A_?=
 =?utf-8?q?=22Invoice=22_Tab_name_change_to_=22Invoices=22?=
In-Reply-To: <076.d7d8ff8c07778d7ac5419325b92b757a@vtiger.fosslabs.com>
References: <076.d7d8ff8c07778d7ac5419325b92b757a@vtiger.fosslabs.com>
Message-ID: <085.d503a24bcc8fcfc4426ebe4cabf5fc4a@vtiger.fosslabs.com>

#959: "Invoice" Tab name change to "Invoices"
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  saraj
      Type:  defect     |      Status:  new  
  Priority:  major      |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => saraj

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/959>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 09:48:17 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 13:48:17 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=23965=3A_?= =?utf-8?q?FAQ?=
In-Reply-To: <076.6d8684c7a7aea333e48cd0c6ba6467b4@vtiger.fosslabs.com>
References: <076.6d8684c7a7aea333e48cd0c6ba6467b4@vtiger.fosslabs.com>
Message-ID: <085.ee7f70640ade35e38514903763e0d1c4@vtiger.fosslabs.com>

#965: FAQ
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  mickie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/965>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 09:53:28 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 13:53:28 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23968=3A_?=
 =?utf-8?q?Quick_Edit_of_Assigned_Group_not_functional?=
In-Reply-To: <076.66451d79109fe79c040c7aba7d66b2ee@vtiger.fosslabs.com>
References: <076.66451d79109fe79c040c7aba7d66b2ee@vtiger.fosslabs.com>
Message-ID: <085.e61d4629bb832be1747dc96409ffd2f5@vtiger.fosslabs.com>

#968: Quick Edit of Assigned Group not functional
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  jerrydgeorge
      Type:  defect     |      Status:  new         
  Priority:  major      |   Milestone:              
 Component:  vtigercrm  |     Version:  5.0.0       
Resolution:             |    Keywords:              
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => jerrydgeorge

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/968>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 09:37:22 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 13:37:22 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23918=3A_?=
 =?utf-8?q?Global_search_function_shows_wrong_results?=
In-Reply-To: <076.a484dea87ad7ce51b1edd92f46c3ba8a@vtiger.fosslabs.com>
References: <076.a484dea87ad7ce51b1edd92f46c3ba8a@vtiger.fosslabs.com>
Message-ID: <085.63c9b386d4538f2a3aa00ca0b366b16d@vtiger.fosslabs.com>

#918: Global search function shows wrong results
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  mickie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/918>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 10:04:50 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 14:04:50 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7127 -
	/vtigercrm/trunk/Popup.php
Message-ID: <20060615140450.33E0D7ED1BF@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 15 08:04:46 2006
New Revision: 7127

Log:
campaign popup has been integrated

Modified:
    vtigercrm/trunk/Popup.php

Modified: vtigercrm/trunk/Popup.php
==============================================================================
--- vtigercrm/trunk/Popup.php (original)
+++ vtigercrm/trunk/Popup.php Thu Jun 15 08:04:46 2006
@@ -48,6 +48,18 @@
 		if (isset($_REQUEST['select'])) $smarty->assign("SELECT",'enable');
 		$alphabetical = AlphabeticalSearch($currentModule,'Popup','lastname','true','basic',$popuptype,"","","");
 		break;
+	case 'Campaigns':
+		require_once("modules/$currentModule/Campaign.php");
+		$focus = new Campaign();
+		$log = LoggerManager::getLogger('campaign_list');
+		$comboFieldNames = Array('campaignstatus'=>'campaignstatus_dom',
+					 'campaigntype'=>'campaigntype_dom');
+		$comboFieldArray = getComboArray($comboFieldNames);
+		$smarty->assign("SINGLE_MOD",'Campaign');
+		if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] !='')
+			$smarty->assign("RETURN_MODULE",$_REQUEST['return_module']);
+		$alphabetical = AlphabeticalSearch($currentModule,'Popup','campaignname','true','basic',$popuptype,"","","");
+		break;
 	case 'Accounts':
 		require_once("modules/$currentModule/Account.php");
 		$focus = new Account();




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 10:11:29 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 14:11:29 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7128 -
	/vtigercrm/trunk/modules/Campaigns/Campaign.js
Message-ID: <20060615141129.3F9A57ED1D8@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 15 08:11:25 2006
New Revision: 7128

Log:
js function set_return_specific_campaign has been included

Modified:
    vtigercrm/trunk/modules/Campaigns/Campaign.js

Modified: vtigercrm/trunk/modules/Campaigns/Campaign.js
==============================================================================
--- vtigercrm/trunk/modules/Campaigns/Campaign.js (original)
+++ vtigercrm/trunk/modules/Campaigns/Campaign.js Thu Jun 15 08:11:25 2006
@@ -1,0 +1,17 @@
+/*********************************************************************************
+
+** The contents of this file are subject to the vtiger CRM Public License Version 1.0
+ * ("License"); You may not use this file except in compliance with the License
+ * The Original Code is:  vtiger CRM Open Source
+ * The Initial Developer of the Original Code is vtiger.
+ * Portions created by vtiger are Copyright (C) vtiger.
+ * All Rights Reserved.
+ ********************************************************************************/
+
+
+
+function set_return_specific_campaign(campaign_id, campaign_name) {
+        window.opener.document.EditView.campaignname.value = campaign_name;
+        window.opener.document.EditView.campaignid.value = campaign_id;
+}
+




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 10:22:49 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 14:22:49 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7129 -
	/vtigercrm/trunk/modules/Campaigns/Campaign.php
Message-ID: <20060615142249.5AF877ED209@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 15 08:22:45 2006
New Revision: 7129

Log:
changes made to integrate campaign related list

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 Jun 15 08:22:45 2006
@@ -49,6 +49,16 @@
 	var $default_order_by = 'crmid';
 	var $default_sort_order = 'DESC';
 
+	var $search_fields = Array(
+			'Campaign Name'=>Array('vtiger_campaign'=>'campaignname'),
+			'Campaign Type'=>Array('vtiger_campaign'=>'campaigntype'),
+			);
+
+	var $search_fields_name = Array(
+			'Campaign Name'=>'campaignname',
+			'Campaign Type'=>'campaigntype',
+			);
+
 	function Campaign() 
 	{
 		$this->log =LoggerManager::getLogger('campaign');
@@ -65,8 +75,9 @@
                 $focus = new Contact();
                 $button = '';
                 $returnset = '&return_module=Campaigns&return_action=DetailView&return_id='.$id;
+		$query = 'select vtiger_contactdetails.accountid, vtiger_users.user_name,vtiger_groups.groupname,vtiger_campaign.campaignid, vtiger_campaign.campaignname, vtiger_contactdetails.contactid, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.title, vtiger_contactdetails.department, vtiger_contactdetails.email, vtiger_contactdetails.phone, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_campaign inner join vtiger_campaigncontrel on vtiger_campaigncontrel.campaignid = vtiger_campaign.campaignid inner join vtiger_contactdetails on vtiger_campaigncontrel.contactid = vtiger_contactdetails.contactid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid left join vtiger_groups on vtiger_groups.groupname=vtiger_contactgrouprelation.groupname left join vtiger_users on vtiger_crmentity.smownerid=vtiger_users.id where vtiger_campaign.campaignid = '.$id.' and vtiger_crmentity.deleted=0';
 
-		$query = 'SELECT vtiger_contactdetails.*, vtiger_crmentity.crmid, vtiger_users.user_name, vtiger_groups.groupname, vtiger_crmentity.smownerid from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid left join vtiger_users on vtiger_crmentity.smownerid = vtiger_users.id left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid left join vtiger_groups on vtiger_groups.groupname=vtiger_contactgrouprelation.groupname  where vtiger_crmentity.deleted=0 and vtiger_contactdetails.campaignid = '.$id;
+		//$query = 'SELECT vtiger_contactdetails.*, vtiger_crmentity.crmid, vtiger_users.user_name, vtiger_groups.groupname, vtiger_crmentity.smownerid from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid left join vtiger_users on vtiger_crmentity.smownerid = vtiger_users.id left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid left join vtiger_groups on vtiger_groups.groupname=vtiger_contactgrouprelation.groupname  where vtiger_crmentity.deleted=0 and vtiger_contactdetails.campaignid = '.$id;
 		$log->debug("Exiting get_contacts method ...");
                 return GetRelatedList('Campaigns','Contacts',$focus,$query,$button,$returnset);
         }
@@ -85,6 +96,23 @@
 		$log->debug("Exiting get_leads method ...");
                 return GetRelatedList('Campaigns','Leads',$focus,$query,$button,$returnset);
         }
+	function get_opportunities($id)
+	{
+		global $log;
+		$log->debug("Entering get_opportunities(".$id.") method ...");
+		global $mod_strings;
+
+		$focus = new Potential();
+
+		$button = '';
+		$returnset = '&return_module=Campaigns&return_action=DetailView&return_id='.$id;
+
+		$query = 'select vtiger_users.user_name,vtiger_groups.groupname, vtiger_potential.potentialid, vtiger_potential.potentialname, vtiger_potential.potentialtype, vtiger_potential.sales_stage, vtiger_potential.amount, vtiger_potential.closingdate, vtiger_crmentity.crmid, vtiger_crmentity.smownerid from vtiger_campaign inner join vtiger_potential on vtiger_campaign.campaignid = vtiger_potential.campaignid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_potential.potentialid left join vtiger_potentialgrouprelation on vtiger_potential.potentialid=vtiger_potentialgrouprelation.potentialid left join vtiger_groups on vtiger_groups.groupname=vtiger_potentialgrouprelation.groupname left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_campaign.campaignid = '.$id.' and vtiger_crmentity.deleted=0';
+		if($this->column_fields['account_id'] != 0)
+		$log->debug("Exiting get_opportunities method ...");
+		return GetRelatedList('Campaigns','Potentials',$focus,$query,$button,$returnset);
+
+	}
 
 }
 ?>




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 10:29:27 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 14:29:27 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7130 -
	/vtigercrm/trunk/modules/Campaigns/Popup.php
Message-ID: <20060615142927.53A437ED21B@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 15 08:29:23 2006
New Revision: 7130

Log:
Campaign popup has been integrated

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




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 10:33:26 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 14:33:26 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7131 -
 /vtigercrm/trunk/modules/Campaigns/updateRelations.php
Message-ID: <20060615143326.63B887ED20C@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 15 08:33:19 2006
New Revision: 7131

Log:
changes made to integrate campaign related list

Added:
    vtigercrm/trunk/modules/Campaigns/updateRelations.php




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 10:43:39 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 14:43:39 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7132 - in
 /vtigercrm/trunk/modules: Invoice/Save.php PurchaseOrder/Save.php
 SalesOrder/Save.php
Message-ID: <20060615144340.646327ED20C@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 15 08:43:30 2006
New Revision: 7132

Log:
* Removed the vtiger prefix which have been added for the table's columnnames

Modified:
    vtigercrm/trunk/modules/Invoice/Save.php
    vtigercrm/trunk/modules/PurchaseOrder/Save.php
    vtigercrm/trunk/modules/SalesOrder/Save.php

Modified: vtigercrm/trunk/modules/Invoice/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Invoice/Save.php (original)
+++ vtigercrm/trunk/modules/Invoice/Save.php Thu Jun 15 08:43:30 2006
@@ -38,7 +38,7 @@
 if($focus->column_fields["salesorder_id"] != '')
 {
         $so_id = $focus->column_fields["salesorder_id"];
-        $query1 = "update vtiger_salesorder set vtiger_sostatus='Approved' where vtiger_salesorderid=".$so_id;
+        $query1 = "update vtiger_salesorder set sostatus='Approved' where salesorderid=".$so_id;
         $adb->query($query1);
 }
 
@@ -46,7 +46,7 @@
 $ext_prod_arr = Array();
 if($focus->mode == 'edit')
 {
-	$query2  = "select * from vtiger_invoiceproductrel where vtiger_invoiceid=".$focus->id;
+	$query2  = "select * from vtiger_invoiceproductrel where invoiceid=".$focus->id;
 	$result2 = $adb->query($query2);
 	$num_rows = $adb->num_rows($result2);
 	for($i=0; $i<$num_rows;$i++)
@@ -56,7 +56,7 @@
 		$ext_prod_arr[$pro_id] = $pro_qty;	
 	}	
 
-        $query1 = "delete from vtiger_invoiceproductrel where vtiger_invoiceid=".$focus->id;
+        $query1 = "delete from vtiger_invoiceproductrel where invoiceid=".$focus->id;
         $adb->query($query1);
 
 }

Modified: vtigercrm/trunk/modules/PurchaseOrder/Save.php
==============================================================================
--- vtigercrm/trunk/modules/PurchaseOrder/Save.php (original)
+++ vtigercrm/trunk/modules/PurchaseOrder/Save.php Thu Jun 15 08:43:30 2006
@@ -46,7 +46,7 @@
 $focus->save("PurchaseOrder");
 if($focus->mode == 'edit')
 {
-        $query1 = "delete from vtiger_poproductrel where vtiger_purchaseorderid=".$focus->id;
+        $query1 = "delete from vtiger_poproductrel where purchaseorderid=".$focus->id;
         $adb->query($query1);
 
 }

Modified: vtigercrm/trunk/modules/SalesOrder/Save.php
==============================================================================
--- vtigercrm/trunk/modules/SalesOrder/Save.php (original)
+++ vtigercrm/trunk/modules/SalesOrder/Save.php Thu Jun 15 08:43:30 2006
@@ -38,14 +38,14 @@
 if($focus->column_fields["quote_id"] != '')
 {
         $qt_id = $focus->column_fields["quote_id"];
-        $query1 = "update vtiger_quotes set vtiger_quotestage='Accepted' where quoteid=".$qt_id;
+        $query1 = "update vtiger_quotes set quotestage='Accepted' where quoteid=".$qt_id;
         $adb->query($query1);
 }
 
 $ext_prod_arr = Array();
 if($focus->mode == 'edit')
 {
-	$query2  = "select * from vtiger_soproductrel where vtiger_salesorderid=".$focus->id;
+	$query2  = "select * from vtiger_soproductrel where salesorderid=".$focus->id;
         $result2 = $adb->query($query2);
         $num_rows = $adb->num_rows($result2);
         for($i=0; $i<$num_rows;$i++)
@@ -56,7 +56,7 @@
         }
 
 	
-        $query1 = "delete from vtiger_soproductrel where vtiger_salesorderid=".$focus->id;
+        $query1 = "delete from vtiger_soproductrel where salesorderid=".$focus->id;
         $adb->query($query1);
 
 }




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 10:54:20 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 14:54:20 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7133 -
 /vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
Message-ID: <20060615145420.2D3537ED22E@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 15 08:54:13 2006
New Revision: 7133

Log:
campaign related list has been integrated

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

Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original)
+++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Thu Jun 15 08:54:13 2006
@@ -225,7 +225,6 @@
  $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'lastname','vtiger_leaddetails',1,'2','lastname','Last Name',1,0,0,100,4,13,1,'V~M',0,2,'BAS')");	
  $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'mobile','vtiger_leadaddress',1,'1','mobile','Mobile',1,0,0,100,5,13,1,'V~O',1,null,'BAS')");	
  $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'company','vtiger_leaddetails',1,'2','company','Company',1,0,0,100,6,13,1,'V~M',0,3,'BAS')");
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'campaignid','vtiger_leaddetails',1,'51','campaignid','Campaign Name',1,0,0,100,6,4,3,'I~O',1,null,'BAS')");
  $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'fax','vtiger_leadaddress',1,'1','fax','Fax',1,0,0,100,7,13,1,'V~O',1,null,'BAS')");
  $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'designation','vtiger_leaddetails',1,'1','designation','Designation',1,0,0,100,8,13,1,'V~O',1,null,'BAS')");
  $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'email','vtiger_leaddetails',1,'13','email','Email',1,0,0,100,9,13,1,'E~O',0,5,'BAS')");
@@ -237,6 +236,7 @@
  $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'rating','vtiger_leaddetails',1,'15','rating','Rating',1,0,0,100,15,13,1,'V~O',1,null,'ADV')");
  $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'noofemployees','vtiger_leaddetails',1,'1','noofemployees','No Of Employees',1,0,0,100,16,13,1,'V~O',1,null,'ADV')");
  $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,17,13,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'campaignid','vtiger_leaddetails',1,'58','campaignid','Campaign Source',1,0,0,100,18,13,1,'I~O',1,null,'BAS')");
  $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'yahooid','vtiger_leaddetails',1,'13','yahooid','Yahoo Id',1,0,0,100,18,13,1,'V~O',1,null,'ADV')");
 $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,19,13,2,'T~O',1,null,'BAS')");
  $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,20,13,2,'T~O',1,null,'BAS')");
@@ -273,7 +273,7 @@
  $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'lastname','vtiger_contactdetails',1,'2','lastname','Last Name',1,0,0,100,4,4,1,'V~M',0,2,'BAS')");	
  $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'mobile','vtiger_contactdetails',1,'1','mobile','Mobile',1,0,0,100,5,4,1,'V~O',1,null,'BAS')");	
  $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'accountid','vtiger_contactdetails',1,'51','account_id','Account Name',1,0,0,100,6,4,1,'I~O',0,3,'BAS')");	
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'campaignid','vtiger_contactdetails',1,'51','campaignid','Campaign Name',1,0,0,100,6,4,3,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'campaignid','vtiger_contactdetails',1,'58','campaignid','Campaign Source',1,0,0,100,6,4,1,'I~O',1,null,'BAS')");
  $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'homephone','vtiger_contactsubdetails',1,'11','homephone','Home Phone',1,0,0,100,7,4,1,'V~O',1,null,'ADV')");	
  $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'leadsource','vtiger_contactsubdetails',1,'15','leadsource','Lead Source',1,0,0,100,8,4,1,'V~O',1,null,'BAS')");	
  $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'otherphone','vtiger_contactsubdetails',1,'11','otherphone','Phone',1,0,0,100,9,4,1,'V~O',1,null,'BAS')");
@@ -343,6 +343,7 @@
  $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'sales_stage','vtiger_potential',1,'16','sales_stage','Sales Stage',1,0,0,100,9,1,1,'V~O',0,4,'BAS')");
  $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,10,1,1,'V~M',1,null,'BAS')");
  $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'probability','vtiger_potential',1,'9','probability','Probability',1,0,0,100,11,1,1,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'campaignid','vtiger_potential',1,'58','campaignid','Campaign Source',1,0,0,100,12,1,1,'N~O',1,null,'BAS')");
 $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,13,1,2,'T~O',1,null,'BAS')");
  $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,14,1,2,'T~O',1,null,'BAS')");
 
@@ -1799,6 +1800,7 @@
 
          $this->db->query("insert into vtiger_relatedlists values (".$this->db->getUniqueID('relatedlists').",".getTabid("Campaigns").",".getTabid("Contacts").",'get_contacts',1,'Contacts',0)");
          $this->db->query("insert into vtiger_relatedlists values (".$this->db->getUniqueID('relatedlists').",".getTabid("Campaigns").",".getTabid("Leads").",'get_leads',2,'Leads',0)");
+	 $this->db->query("insert into vtiger_relatedlists values (".$this->db->getUniqueID('relatedlists').",".getTabid("Campaigns").",".getTabid("Potentials").",'get_opportunities',3,'Potentials',0)");
 
                $this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("notificationscheduler").",'LBL_TASK_NOTIFICATION_DESCRITPION',1,'Task Delay Notification','Tasks delayed beyond 24 hrs ','LBL_TASK_NOTIFICATION')");
 




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 10:56:25 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 14:56:25 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7134 - in /vtigercrm/trunk:
 Smarty/templates/Header.tpl include/language/en_us.lang.php
Message-ID: <20060615145625.F0DAA7ED20C@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 15 08:56:18 2006
New Revision: 7134

Log:
Added the default value quick create in the combo options - ahmed

Modified:
    vtigercrm/trunk/Smarty/templates/Header.tpl
    vtigercrm/trunk/include/language/en_us.lang.php

Modified: vtigercrm/trunk/Smarty/templates/Header.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Header.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Header.tpl Thu Jun 15 08:56:18 2006
@@ -75,12 +75,14 @@
 			<td style="padding-left:10px" nowrap>
 			{if $CNT eq 1}
                                 <select class=small style="width:120px" title="Create New" onclick="QCreate(this);">
+					<option value="none">{$APP.LBL_QUICK_CREATE}</option>
                         {foreach  item=detail from=$QCMODULE}
                                         <option value="{$detail.1}">{$APP[$detail.0]}</option>
                         {/foreach}
                                 </select>
                         {else}
                                 <select class=small style="width:120px" title="Create New" onchange="QCreate(this);">
+					<option value="none">{$APP.LBL_QUICK_CREATE}</option>
                         {foreach  item=detail from=$QCMODULE}
                                         <option value="{$detail.1}">{$APP[$detail.0]}</option>
                         {/foreach}
@@ -201,8 +203,10 @@
 
 function QCreate(qcoptions)
 {ldelim}
+	var module = qcoptions.options[qcoptions.options.selectedIndex].value;
+	if(module != 'none')
+	{ldelim}
 	$("status").style.display="inline";
-	var module = qcoptions.options[qcoptions.options.selectedIndex].value;
 	if(module == 'Events')
 	{ldelim}
 		module = 'Activities';
@@ -225,6 +229,9 @@
                                         {rdelim}
                 {rdelim}
         );
+	{rdelim}
+	else
+		hide('qcform');
 {rdelim}
 
 </script>

Modified: vtigercrm/trunk/include/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/include/language/en_us.lang.php (original)
+++ vtigercrm/trunk/include/language/en_us.lang.php Thu Jun 15 08:56:18 2006
@@ -360,6 +360,8 @@
 'LBL_EXPORT'=>'Export',
 
 'LBL_EXPORT_ALL'=>'Export All',
+
+'LBL_QUICK_CREATE'=>'Quick Create...',
 
 'Export'=>'Export',
 'Import'=>'Import',




From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 10:57:47 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 14:57:47 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231066=3A?=
 =?utf-8?q?_Parse_version_from_a_version=2Etxt_file_for_formatted_display_?=
 =?utf-8?q?in_templates?=
In-Reply-To: <076.429749330f6d0cb63095ac82d78c73a9@vtiger.fosslabs.com>
References: <076.429749330f6d0cb63095ac82d78c73a9@vtiger.fosslabs.com>
Message-ID: <085.d72c213f5b3d232dc27faeeb5829c061@vtiger.fosslabs.com>

#1066: Parse version from a version.txt file for formatted display in templates
------------------------+---------------------------------------------------
  Reporter:  jeffk      |       Owner:  saraj               
      Type:  defect     |      Status:  new                 
  Priority:  major      |   Milestone:  5.0.0               
 Component:  vtigercrm  |     Version:  5.0.0               
Resolution:             |    Keywords:  versioning packaging
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => saraj

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1066>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 11:00:12 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 15:00:12 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7135 - in
 /vtigercrm/trunk/modules: Contacts/language/en_us.lang.php
 Leads/language/en_us.lang.php Potentials/language/en_us.lang.php
Message-ID: <20060615150012.AD1087ED20C@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 15 09:00:04 2006
New Revision: 7135

Log:
label added

Modified:
    vtigercrm/trunk/modules/Contacts/language/en_us.lang.php
    vtigercrm/trunk/modules/Leads/language/en_us.lang.php
    vtigercrm/trunk/modules/Potentials/language/en_us.lang.php

Modified: vtigercrm/trunk/modules/Contacts/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Contacts/language/en_us.lang.php Thu Jun 15 09:00:04 2006
@@ -158,6 +158,7 @@
 'Do Not Call'=>'Do Not Call',
 'Email Opt Out'=>'Email Opt Out',
 'Assigned To'=>'Assigned To',
+'Campaign Source'=>'Campaign Source',
 'Reference' =>'Reference',
 'Created Time'=>'Created Time',
 'Modified Time'=>'Modified Time',

Modified: vtigercrm/trunk/modules/Leads/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Leads/language/en_us.lang.php Thu Jun 15 09:00:04 2006
@@ -154,6 +154,7 @@
 'State'=>'State',
 'Description'=>'Description',
 'Po Box'=>'Po Box',
+'Campaign Source'=>'Campaign Source',
 //Added for CustomView 4.2 Release
 'Name'=>'Name',
 'LBL_NEW_LEADS'=>'My New Leads',

Modified: vtigercrm/trunk/modules/Potentials/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Potentials/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Potentials/language/en_us.lang.php Thu Jun 15 09:00:04 2006
@@ -106,6 +106,7 @@
 'Sales Stage'=>'Sales Stage',
 'Assigned To'=>'Assigned To',
 'Probability'=>'Probability (%)',
+'Campaign Source'=>'Campaign Source',
 'Description'=>'Description',
 'Created Time'=>'Created Time',
 'Modified Time'=>'Modified Time',




From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 11:00:10 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 15:00:10 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231068=3A?=
 =?utf-8?q?_Gray_color_Arch_-_missing?=
In-Reply-To: <076.28808b1bbcb52a79f7663717dd8edd08@vtiger.fosslabs.com>
References: <076.28808b1bbcb52a79f7663717dd8edd08@vtiger.fosslabs.com>
Message-ID: <085.104c575451507cb10591a6f7c31ca212@vtiger.fosslabs.com>

#1068: Gray color Arch - missing
------------------------+---------------------------------------------------
  Reporter:  ela        |       Owner:  developer
      Type:  defect     |      Status:  closed   
  Priority:  major      |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:  fixed      |    Keywords:  UI       
------------------------+---------------------------------------------------
Changes (by saraj):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1068>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 11:00:34 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 15:00:34 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231070=3A?=
	=?utf-8?q?_Quote_PDF_Output?=
In-Reply-To: <076.38772bdb8ba951744608d634ceddc572@vtiger.fosslabs.com>
References: <076.38772bdb8ba951744608d634ceddc572@vtiger.fosslabs.com>
Message-ID: <085.479fedfe8ae606e45d34bbf27bcc3897@vtiger.fosslabs.com>

#1070: Quote PDF Output
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  mickie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1070>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 11:00:54 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 15:00:54 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231071=3A?=
 =?utf-8?q?_FAQ_Detail_View_=22Save=22_not_working?=
In-Reply-To: <076.651331afa5aa806fc7b30ae0e7a3feb5@vtiger.fosslabs.com>
References: <076.651331afa5aa806fc7b30ae0e7a3feb5@vtiger.fosslabs.com>
Message-ID: <085.b1646a88842a1f5d6bbfc696bf7f52d8@vtiger.fosslabs.com>

#1071: FAQ Detail View "Save" not working
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  mickie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1071>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 11:05:49 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 15:05:49 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7136 -
 /vtigercrm/trunk/Smarty/templates/Inventory/InventoryDetailView.tpl
Message-ID: <20060615150549.178097ED236@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 15 09:05:45 2006
New Revision: 7136

Log:
Commented Export to PDF, Convert to SO and Convert to Invoice  buttons in DetailView because these buttons have been given as links

Modified:
    vtigercrm/trunk/Smarty/templates/Inventory/InventoryDetailView.tpl

Modified: vtigercrm/trunk/Smarty/templates/Inventory/InventoryDetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Inventory/InventoryDetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Inventory/InventoryDetailView.tpl Thu Jun 15 09:05:45 2006
@@ -112,6 +112,7 @@
 		{if $DELETE eq 'permitted'}
 			<input title="{$APP.LBL_DELETE_BUTTON_TITLE}" accessKey="{$APP.LBL_DELETE_BUTTON_KEY}" class="small" onclick="this.form.return_module.value='{$MODULE}'; this.form.return_action.value='index'; this.form.action.value='Delete'; return confirm('{$APP.NTC_DELETE_CONFIRMATION}')" type="submit" name="Delete" value="{$APP.LBL_DELETE_BUTTON_LABEL}">&nbsp;
 		{/if}
+		<!-- Commented the buttons in DetailView because these buttons have been given as links
 		{if $MODULE eq 'Quotes' || $MODULE eq 'PurchaseOrder' || $MODULE eq 'SalesOrder' || $MODULE eq 'Invoice'}
 			{if $CREATEPDF eq 'permitted'}
 				<input title="Export To PDF" accessKey="Alt+e" class="small" onclick="this.form.return_module.value='{$MODULE}'; this.form.return_action.value='DetailView'; this.form.return_id.value='{$ID}'; this.form.module.value='{$MODULE}'; {if $MODULE eq 'SalesOrder'} this.form.action.value='CreateSOPDF'" {else} this.form.action.value='CreatePDF'" {/if} type="submit" name="Export To PDF" value="{$APP.LBL_EXPORT_TO_PDF}">&nbsp;
@@ -127,6 +128,7 @@
 				<input title="{$APP.LBL_CONVERTINVOICE_BUTTON_TITLE}" accessKey="{$APP.LBL_CONVERTINVOICE_BUTTON_KEY}" class="small" onclick="this.form.return_module.value='{$MODULE}'; this.form.return_action.value='DetailView'; this.form.return_id.value='{$ID}';this.form.convertmode.value='{$CONVERTMODE}';this.form.module.value='Invoice'; this.form.action.value='EditView'" type="submit" name="Convert To Invoice" value="{$APP.LBL_CONVERTINVOICE_BUTTON_LABEL}">&nbsp;
 			{/if}
 		{/if}
+		-->
 	</td>
    </tr>
    {/strip}




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 11:06:23 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 15:06:23 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7137 -
 /vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php
Message-ID: <20060615150623.4097D7ED236@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 15 09:06:19 2006
New Revision: 7137

Log:
changes made to handle campaign source during lead conversion

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

Modified: vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php (original)
+++ vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php Thu Jun 15 09:06:19 2006
@@ -272,7 +272,7 @@
 $contact_id = $crmcontactid;
 $log->debug("contact id is ".$contact_id);
 
- $sql_insert_contact = "INSERT INTO vtiger_contactdetails (contactid,accountid,salutation,firstname,lastname,email,phone,mobile,title,fax,yahooid) VALUES (".$contact_id.",".$crmid.",'".$row["salutationtype"] ."','" .$row["firstname"] ."','" .$row["lastname"] ."','" .$row["email"] ."','" .$row["phone"]. "','" .$row["mobile"] ."','" .$row["designation"] ."','".$row["fax"] ."','".$row['yahooid']."')";
+ $sql_insert_contact = "INSERT INTO vtiger_contactdetails (contactid,accountid,campaignid,salutation,firstname,lastname,email,phone,mobile,title,fax,yahooid) VALUES (".$contact_id.",".$crmid."," .$row["campaignid"]. ",'".$row["salutationtype"] ."','" .$row["firstname"] ."','" .$row["lastname"] ."','" .$row["email"] ."','" .$row["phone"]. "','" .$row["mobile"] ."','" .$row["designation"] ."','".$row["fax"] ."','".$row['yahooid']."')";
 
 $adb->query($sql_insert_contact);
 
@@ -323,7 +323,7 @@
 		$potential_amount=0;
         }
 
-	$sql_insert_opp = "INSERT INTO vtiger_potential (potentialid,accountid,potentialname,leadsource,closingdate,sales_stage,amount) VALUES (".$oppid.",".$crmid .",'".$potential_name."','".$row['leadsource']."','".$close_date."','".$potential_sales_stage."',".$potential_amount.")";
+	$sql_insert_opp = "INSERT INTO vtiger_potential (potentialid,accountid,campaignid,potentialname,leadsource,closingdate,sales_stage,amount) VALUES (".$oppid.",".$crmid .",".$row["campaignid"]. ",'".$potential_name."','".$row['leadsource']."','".$close_date."','".$potential_sales_stage."',".$potential_amount.")";
 
 	$adb->query($sql_insert_opp);
 




From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 11:09:17 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 15:09:17 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231073=3A?=
 =?utf-8?q?_Inventory_=3E_Vendors_=3E_Products?=
In-Reply-To: <076.6756be513a6a47a241a70293fa5e1bbe@vtiger.fosslabs.com>
References: <076.6756be513a6a47a241a70293fa5e1bbe@vtiger.fosslabs.com>
Message-ID: <085.ed9ee87bfb039f24a6837430ce63ae60@vtiger.fosslabs.com>

#1073: Inventory > Vendors > Products
--------------------------+-------------------------------------------------
  Reporter:  anonymous    |       Owner:  jerrydgeorge
      Type:  enhancement  |      Status:  new         
  Priority:  major        |   Milestone:              
 Component:  vtigercrm    |     Version:  5.0.0       
Resolution:               |    Keywords:              
--------------------------+-------------------------------------------------
Changes (by saraj):

  * owner:  developer => jerrydgeorge

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1073>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 11:09:24 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 15:09:24 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231299=3A?=
 =?utf-8?q?_MySQL_version_5=2E0=2E22_is_not_supported=2C_kindly_connect_to?=
 =?utf-8?q?_MySQL_4=2E1=2Ex_or_above?=
In-Reply-To: <076.bb406000b4b59efeb8cc8221dd00f6f4@vtiger.fosslabs.com>
References: <076.bb406000b4b59efeb8cc8221dd00f6f4@vtiger.fosslabs.com>
Message-ID: <085.6f4a93427473aea31b6345d166537ca3@vtiger.fosslabs.com>

#1299: MySQL version 5.0.22 is not supported, kindly connect to MySQL 4.1.x or
above
------------------------+---------------------------------------------------
  Reporter:  fh         |       Owner:  developer
      Type:  defect     |      Status:  closed   
  Priority:  major      |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:  fixed      |    Keywords:  Bug      
------------------------+---------------------------------------------------
Changes (by anonymous):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1299>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 11:11:24 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 15:11:24 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231074=3A?=
 =?utf-8?q?_Document_file_permissions_needed_for_install?=
In-Reply-To: <076.dfa8cdb6063a10bf60cc34f2fe53fa59@vtiger.fosslabs.com>
References: <076.dfa8cdb6063a10bf60cc34f2fe53fa59@vtiger.fosslabs.com>
Message-ID: <085.869ac01db5224eec6019638bbfc1c7b7@vtiger.fosslabs.com>

#1074: Document file permissions needed for install
------------------------+---------------------------------------------------
  Reporter:  jeffk      |       Owner:  richie 
      Type:  defect     |      Status:  new    
  Priority:  major      |   Milestone:  5.0.0  
 Component:  vtigercrm  |     Version:  5.0.0  
Resolution:             |    Keywords:  install
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => richie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1074>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 11:14:05 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 15:14:05 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231085=3A?=
 =?utf-8?q?_Copyright_message_missed_in_Installer?=
In-Reply-To: <076.ca4f7110cd4c9640e7ef0f709ef932b5@vtiger.fosslabs.com>
References: <076.ca4f7110cd4c9640e7ef0f709ef932b5@vtiger.fosslabs.com>
Message-ID: <085.e3cc095cd1325f9c368a130cebfc317c@vtiger.fosslabs.com>

#1085: Copyright message missed in Installer
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  saraj
      Type:  defect     |      Status:  new  
  Priority:  major      |   Milestone:  5.0.0
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => saraj

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1085>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 11:14:25 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 15:14:25 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231091=3A?=
 =?utf-8?q?_My_Preferences_-_Photo_does_not_work?=
In-Reply-To: <076.0a340fe4771c5eb83733cd4065926089@vtiger.fosslabs.com>
References: <076.0a340fe4771c5eb83733cd4065926089@vtiger.fosslabs.com>
Message-ID: <085.df4ef91bb537ca4869a2be49a74efe5a@vtiger.fosslabs.com>

#1091: My Preferences - Photo does not work
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  jerrydgeorge
      Type:  defect     |      Status:  new         
  Priority:  major      |   Milestone:              
 Component:  vtigercrm  |     Version:  5.0.0       
Resolution:             |    Keywords:              
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => jerrydgeorge

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1091>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 11:15:10 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 15:15:10 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7138 -
	/vtigercrm/trunk/include/utils/CommonUtils.php
Message-ID: <20060615151510.574DE7ED246@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 15 09:15:06 2006
New Revision: 7138

Log:
getCampaignName function included

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 Jun 15 09:15:06 2006
@@ -410,6 +410,27 @@
 	$log->debug("Exiting getContactName method ...");
         return $contact_name;
 }
+
+/**
+ * Function to get the Campaign Name when a campaign id is given
+ * Takes the input as $campaign_id - campaign id
+ * returns the Campaign Name in string format.
+ */
+
+function getCampaignName($campaign_id)
+{
+	global $log;
+	$log->debug("Entering getCampaignName(".$campaign_id.") method ...");
+	$log->info("in getCampaignName ".$campaign_id);
+
+	global $adb;
+	$sql = "select * from vtiger_campaign where campaignid=".$campaign_id;
+	$result = $adb->query($sql);
+	$campaign_name = $adb->query_result($result,0,"campaignname");
+	$log->debug("Exiting getCampaignName method ...");
+	return $campaign_name;
+}
+
 
 /**
  * Function to get the Vendor Name when a vtiger_vendor id is given 




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 11:15:43 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 15:15:43 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7139 -
	/vtigercrm/trunk/include/utils/ListViewUtils.php
Message-ID: <20060615151543.60CCD7ED246@vtiger.fosslabs.com>

Author: richie
Date: Thu Jun 15 09:15:38 2006
New Revision: 7139

Log:
User List view from getListViewEntries fn

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 Thu Jun 15 09:15:38 2006
@@ -145,19 +145,6 @@
 						{
 							$temp_sorder = 'ASC';
 						}
-					/*	if($relatedlist !='')
-						{
-							if($app_strings[$name])
-							{
-								$name = $app_strings[$name];
-							}
-							else
-							{
-								$name = $mod_strings[$name];
-							}
-						}
-						else
-						{*/
 							if($app_strings[$name])
 							{
 								$lbl_name = $app_strings[$name];
@@ -176,10 +163,11 @@
 							}
 							if($relatedlist !='')
 								$name = "<a href='index.php?module=".$relatedmodule."&action=CallRelatedList&relmodule=".$module."&order_by=".$col."&record=".$relatedlist."&sorder=".$temp_sorder."' class='listFormHeaderLinks'>".$lbl_name."&nbsp;".$arrow."</a>";
+							elseif($module == 'Users' && $name == 'User Name')
+								$name = "<a href='javascript:;' onClick='getListViewEntries_js(\"".$module."\",\"order_by=".$col."&sorder=".$temp_sorder."".$sort_qry."\");' class='listFormHeaderLinks'>".$mod_strings['LBL_LIST_USER_NAME_ROLE']."&nbsp;".$arrow."</a>";
 							else
 								$name = "<a href='javascript:;' onClick='getListViewEntries_js(\"".$module."\",\"order_by=".$col."&sorder=".$temp_sorder."".$sort_qry."\");' class='listFormHeaderLinks'>".$lbl_name."&nbsp;".$arrow."</a>";
 							$arrow = '';
-						//}
 					}
 					else
 					{       if($app_strings[$name])
@@ -418,6 +406,7 @@
 	$navigation_array['verylast'] =$paging;
 	$log->debug("Exiting getNavigationValues method ...");
 	return $navigation_array;
+	
 }
 
 
@@ -527,9 +516,14 @@
 	{
 		$list_header =Array();
 		//Getting the entityid
-		$entity_id = $adb->query_result($list_result,$i-1,"crmid");
-		$owner_id = $adb->query_result($list_result,$i-1,"smownerid");
-
+		if($module != 'Users')
+		{
+			$entity_id = $adb->query_result($list_result,$i-1,"crmid");
+			$owner_id = $adb->query_result($list_result,$i-1,"smownerid");
+		}else
+		{
+			$entity_id = $adb->query_result($list_result,$i-1,"id");
+		}	
 		// Fredy Klammsteiner, 4.8.2005: changes from 4.0.1 migrated to 4.2
 		// begin: Armando L??scher 05.07.2005 -> ??priority
 		// Code contri buted by fredy Desc: Set Priority color
@@ -953,7 +947,6 @@
 	foreach($uicolarr as $key=>$value)
 	{
 		$uitype = $key;
-	
 		$colname = $value;
         }
 
@@ -964,12 +957,10 @@
 	}
 	//Ends
 	$temp_val = $adb->query_result($list_result,$list_result_count,$colname);
-
 	if(strlen($temp_val) > 40)
         {
                 $temp_val = substr($temp_val,0,40).'...';
         }
-		
 	if($uitype == 52 || $uitype == 53 || $uitype == 77)
 	{
 		$value = $adb->query_result($list_result,$list_result_count,'user_name');
@@ -1238,9 +1229,13 @@
 		else
 			$value='';
         }
+	elseif($uitype == 98)
+	{
+		$value = '<a href="index.php?action=RoleDetailView&module=Users&parenttab=Settings&roleid='.$temp_val.'">'.getRoleName($temp_val).'</a>';  
+	}
 	else
 	{
-	
+
 		if($fieldname == $focus->list_link_field)
 		{
 			if($mode == "search")
@@ -1248,29 +1243,29 @@
 				if($popuptype == "specific")
 				{
 					// Added for get the first name of contact in Popup window
-                                        if($colname == "lastname" && $module == 'Contacts')
+					if($colname == "lastname" && $module == 'Contacts')
 					{
-                                               $firstname=$adb->query_result($list_result,$list_result_count,'firstname');
-                                        	$temp_val =$temp_val.' '.$firstname;
+						$firstname=$adb->query_result($list_result,$list_result_count,'firstname');
+						$temp_val =$temp_val.' '.$firstname;
 					}
 
 					$temp_val = str_replace("'",'\"',$temp_val);
-			
+
 					//Added to avoid the error when select SO from Invoice through AjaxEdit
 					if($module == 'SalesOrder')
 						$value = '<a href="a" LANGUAGE=javascript onclick=\'set_return_specific("'.$entity_id.'", "'.br2nl($temp_val).'","'.$_REQUEST['form'].'"); window.close()\'>'.$temp_val.'</a>';
 					else
-					$value = '<a href="a" LANGUAGE=javascript onclick=\'set_return_specific("'.$entity_id.'", "'.br2nl($temp_val).'"); window.close()\'>'.$temp_val.'</a>';
+						$value = '<a href="a" LANGUAGE=javascript onclick=\'set_return_specific("'.$entity_id.'", "'.br2nl($temp_val).'"); window.close()\'>'.$temp_val.'</a>';
 				}
 				elseif($popuptype == "detailview")
-                                {
-                                        if($colname == "lastname" && $module == 'Contacts')
-                                               $firstname=$adb->query_result($list_result,$list_result_count,'firstname');
-                                        $temp_val =$temp_val.' '.$firstname;
+				{
+					if($colname == "lastname" && $module == 'Contacts')
+						$firstname=$adb->query_result($list_result,$list_result_count,'firstname');
+					$temp_val =$temp_val.' '.$firstname;
 
 					$focus->record_id = $_REQUEST['recordid'];
-                                        $value = '<a href="a" LANGUAGE=javascript onclick=\'add_data_to_relatedlist("'.$entity_id.'","'.$focus->record_id.'"); window.close()\'>'.$temp_val.'</a>';
-                                }
+					$value = '<a href="a" LANGUAGE=javascript onclick=\'add_data_to_relatedlist("'.$entity_id.'","'.$focus->record_id.'"); window.close()\'>'.$temp_val.'</a>';
+				}
 				elseif($popuptype == "formname_specific")
 				{
 					$value = '<a href="a" LANGUAGE=javascript onclick=\'set_return_formname_specific("'.$_REQUEST['form'].'", "'.$entity_id.'", "'.br2nl($temp_val).'"); window.close()\'>'.$temp_val.'</a>';
@@ -1304,7 +1299,7 @@
 					$prod_id = $_REQUEST['productid'];
 					$flname =  $_REQUEST['fldname'];
 					$listprice=getListPrice($prod_id,$entity_id);	
-					
+
 					$value = '<a href="a" LANGUAGE=javascript onclick=\'set_return_inventory_pb("'.$listprice.'", "'.$flname.'"); window.close()\'>'.$temp_val.'</a>';
 				}
 				elseif($popuptype == "specific_account_address")
@@ -1312,32 +1307,32 @@
 					require_once('modules/Accounts/Account.php');
 					$acct_focus = new Account();
 					$acct_focus->retrieve_entity_info($entity_id,"Accounts");
-					
+
 					$value = '<a href="a" LANGUAGE=javascript onclick=\'set_return_address("'.$entity_id.'", "'.br2nl($temp_val).'", "'.br2nl($acct_focus->column_fields['bill_street']).'", "'.br2nl($acct_focus->column_fields['ship_street']).'", "'.br2nl($acct_focus->column_fields['bill_city']).'", "'.br2nl($acct_focus->column_fields['ship_city']).'", "'.br2nl($acct_focus->column_fields['bill_state']).'", "'.br2nl($acct_focus->column_fields['ship_state']).'", "'.br2nl($acct_focus->column_fields['bill_code']).'", "'.br2nl($acct_focus->column_fields['ship_code']).'", "'.br2nl($acct_focus->column_fields['bill_country']).'", "'.br2nl($acct_focus->column_fields['ship_country']).'","'.br2nl($acct_focus->column_fields['bill_pobox']).'", "'.br2nl($acct_focus->column_fields['ship_pobox']).'"); window.close()\'>'.$temp_val.'</a>';
 
 				}
 				elseif($popuptype == "specific_contact_account_address")
-                                {
-                                        require_once('modules/Accounts/Account.php');
-                                        $acct_focus = new Account();
-                                        $acct_focus->retrieve_entity_info($entity_id,"Accounts");
-
-                                        $value = '<a href="a" LANGUAGE=javascript onclick=\'set_return_contact_address("'.$entity_id.'", "'.br2nl($temp_val).'", "'.br2nl($acct_focus->column_fields['bill_street']).'", "'.br2nl($acct_focus->column_fields['ship_street']).'", "'.br2nl($acct_focus->column_fields['bill_city']).'", "'.br2nl($acct_focus->column_fields['ship_city']).'", "'.br2nl($acct_focus->column_fields['bill_state']).'", "'.br2nl($acct_focus->column_fields['ship_state']).'", "'.br2nl($acct_focus->column_fields['bill_code']).'", "'.br2nl($acct_focus->column_fields['ship_code']).'", "'.br2nl($acct_focus->column_fields['bill_country']).'", "'.br2nl($acct_focus->column_fields['ship_country']).'","'.br2nl($acct_focus->column_fields['bill_pobox']).'", "'.br2nl($acct_focus->column_fields['ship_pobox']).'"); window.close()\'>'.$temp_val.'</a>';
-
-                                }
+				{
+					require_once('modules/Accounts/Account.php');
+					$acct_focus = new Account();
+					$acct_focus->retrieve_entity_info($entity_id,"Accounts");
+
+					$value = '<a href="a" LANGUAGE=javascript onclick=\'set_return_contact_address("'.$entity_id.'", "'.br2nl($temp_val).'", "'.br2nl($acct_focus->column_fields['bill_street']).'", "'.br2nl($acct_focus->column_fields['ship_street']).'", "'.br2nl($acct_focus->column_fields['bill_city']).'", "'.br2nl($acct_focus->column_fields['ship_city']).'", "'.br2nl($acct_focus->column_fields['bill_state']).'", "'.br2nl($acct_focus->column_fields['ship_state']).'", "'.br2nl($acct_focus->column_fields['bill_code']).'", "'.br2nl($acct_focus->column_fields['ship_code']).'", "'.br2nl($acct_focus->column_fields['bill_country']).'", "'.br2nl($acct_focus->column_fields['ship_country']).'","'.br2nl($acct_focus->column_fields['bill_pobox']).'", "'.br2nl($acct_focus->column_fields['ship_pobox']).'"); window.close()\'>'.$temp_val.'</a>';
+
+				}
 
 				elseif($popuptype == "specific_potential_account_address")
-                                {
-                                        $acntid = $adb->query_result($list_result,$list_result_count,"accountid");
-                                        require_once('modules/Accounts/Account.php');
-                                        $acct_focus = new Account();
-                                        $acct_focus->retrieve_entity_info($acntid,"Accounts");
-                                        $account_name = getAccountName($acntid);
-
-                                        $value = '<a href="a" LANGUAGE=javascript onclick=\'set_return_address("'.$entity_id.'", "'.br2nl($temp_val).'", "'.$acntid.'", "'.br2nl($account_name).'", "'.br2nl($acct_focus->column_fields['bill_street']).'", "'.br2nl($acct_focus->column_fields['ship_street']).'", "'.br2nl($acct_focus->column_fields['bill_city']).'", "'.br2nl($acct_focus->column_fields['ship_city']).'", "'.br2nl($acct_focus->column_fields['bill_state']).'", "'.br2nl($acct_focus->column_fields['ship_state']).'", "'.br2nl($acct_focus->column_fields['bill_code']).'", "'.br2nl($acct_focus->column_fields['ship_code']).'", "'.br2nl($acct_focus->column_fields['bill_country']).'", "'.br2nl($acct_focus->column_fields['ship_country']).'","'.br2nl($acct_focus->column_fields['bill_pobox']).'", "'.br2nl($acct_focus->column_fields['ship_pobox']).'"); window.close()\'>'.$temp_val.'</a>';
-
-                                }
-//added by rdhital/Raju for better emails 
+				{
+					$acntid = $adb->query_result($list_result,$list_result_count,"accountid");
+					require_once('modules/Accounts/Account.php');
+					$acct_focus = new Account();
+					$acct_focus->retrieve_entity_info($acntid,"Accounts");
+					$account_name = getAccountName($acntid);
+
+					$value = '<a href="a" LANGUAGE=javascript onclick=\'set_return_address("'.$entity_id.'", "'.br2nl($temp_val).'", "'.$acntid.'", "'.br2nl($account_name).'", "'.br2nl($acct_focus->column_fields['bill_street']).'", "'.br2nl($acct_focus->column_fields['ship_street']).'", "'.br2nl($acct_focus->column_fields['bill_city']).'", "'.br2nl($acct_focus->column_fields['ship_city']).'", "'.br2nl($acct_focus->column_fields['bill_state']).'", "'.br2nl($acct_focus->column_fields['ship_state']).'", "'.br2nl($acct_focus->column_fields['bill_code']).'", "'.br2nl($acct_focus->column_fields['ship_code']).'", "'.br2nl($acct_focus->column_fields['bill_country']).'", "'.br2nl($acct_focus->column_fields['ship_country']).'","'.br2nl($acct_focus->column_fields['bill_pobox']).'", "'.br2nl($acct_focus->column_fields['ship_pobox']).'"); window.close()\'>'.$temp_val.'</a>';
+
+				}
+				//added by rdhital/Raju for better emails 
 				elseif($popuptype == "set_return_emails")
 				{	
 					if ($module=='Accounts')
@@ -1381,19 +1376,19 @@
 					require_once('modules/Vendors/Vendor.php');
 					$acct_focus = new Vendor();
 					$acct_focus->retrieve_entity_info($entity_id,"Vendors");
-					
+
 					$value = '<a href="a" LANGUAGE=javascript onclick=\'set_return_address("'.$entity_id.'", "'.br2nl($temp_val).'", "'.br2nl($acct_focus->column_fields['treet']).'", "'.br2nl($acct_focus->column_fields['city']).'", "'.br2nl($acct_focus->column_fields['state']).'", "'.br2nl($acct_focus->column_fields['postalcode']).'", "'.br2nl($acct_focus->column_fields['country']).'","'.br2nl($acct_focus->column_fields['pobox']).'"); window.close()\'>'.$temp_val.'</a>';
 
 				}
 				else
 				{
 					if($colname == "lastname")
-                                                $firstname=$adb->query_result($list_result,$list_result_count,'firstname');
-                                        $temp_val =$temp_val.' '.$firstname;
+						$firstname=$adb->query_result($list_result,$list_result_count,'firstname');
+					$temp_val =$temp_val.' '.$firstname;
 
 					$temp_val = str_replace("'",'\"',$temp_val);
-	
-$log->debug("Exiting getValue method ...");
+
+					$log->debug("Exiting getValue method ...");
 					$value = '<a href="a" LANGUAGE=javascript onclick=\'set_return("'.$entity_id.'", "'.br2nl($temp_val).'"); window.close()\'>'.$temp_val.'</a>';
 				}
 			}
@@ -1402,58 +1397,58 @@
 				if(($module == "Leads" && $colname == "lastname") || ($module == "Contacts" && $colname == "lastname"))
 				{
 					if($module == "Contacts")
-                                        {
-                                                 $query="SELECT vtiger_contactdetails.imagename FROM vtiger_contactdetails WHERE lastname='".$temp_val."'";
-                                                //echo $query;
-                                                 $result = $adb->query($query);
-                                                 $imagename=$adb->query_result($result,0,'imagename');
-                                                 if($imagename != '')
-                                                 {
-                                                         $imgpath = "test/contact/".$imagename;
-                                                         $contact_image='<img align="absmiddle" src="'.$imgpath.'" width="20" height="20" border="0" onMouseover=modifyimage("dynloadarea","'.$imgpath.'"); onMouseOut=fnhide("dynloadarea");>';
-                                                 }
+					{
+						$query="SELECT vtiger_contactdetails.imagename FROM vtiger_contactdetails WHERE lastname='".$temp_val."'";
+						//echo $query;
+						$result = $adb->query($query);
+						$imagename=$adb->query_result($result,0,'imagename');
+						if($imagename != '')
+						{
+							$imgpath = "test/contact/".$imagename;
+							$contact_image='<img align="absmiddle" src="'.$imgpath.'" width="20" height="20" border="0" onMouseover=modifyimage("dynloadarea","'.$imgpath.'"); onMouseOut=fnhide("dynloadarea");>';
+						}
 						$value = '<table width=100% border=0 cellpadding=0 cellspacing=0><tr><td align="left"><a href="index.php?action=DetailView&module='.$module.'&record='.$entity_id.'&parenttab='.$tabname.'">'.$temp_val.'</a></td><td align="right">'.$contact_image.'</td></tr></table>';
 					}else
 					{
-					//Commented to give link even to the first name - Jaguar
-					$value = $contact_image.'<a href="index.php?action=DetailView&module='.$module.'&record='.$entity_id.'&parenttab='.$tabname.'">'.$temp_val.'</a>';
+						//Commented to give link even to the first name - Jaguar
+						$value = $contact_image.'<a href="index.php?action=DetailView&module='.$module.'&record='.$entity_id.'&parenttab='.$tabname.'">'.$temp_val.'</a>';
 					}
 				}
 				elseif($module == "Activities")
-                                {
-                                        $actvity_type = $adb->query_result($list_result,$list_result_count,'activitytype');
-                                        if($actvity_type == "Task")
-                                        {
-                                               $value = '<a href="index.php?action=DetailView&module='.$module.'&record='.$entity_id.'&activity_mode=Task">'.$temp_val.'</a>';
-                                        }
-                                        else
-                                        {
-                                                $value = '<a href="index.php?action=DetailView&module='.$module.'&record='.$entity_id.'&activity_mode=Events">'.$temp_val.'</a>';
-                                        }
-                                }
+				{
+					$actvity_type = $adb->query_result($list_result,$list_result_count,'activitytype');
+					if($actvity_type == "Task")
+					{
+						$value = '<a href="index.php?action=DetailView&module='.$module.'&record='.$entity_id.'&activity_mode=Task">'.$temp_val.'</a>';
+					}
+					else
+					{
+						$value = '<a href="index.php?action=DetailView&module='.$module.'&record='.$entity_id.'&activity_mode=Events">'.$temp_val.'</a>';
+					}
+				}
 				elseif($module == "Vendors")
 				{
-						
-                                        $value = '<a href="index.php?action=DetailView&module=Vendors&record='.$entity_id.'&parenttab='.$tabname.'">'.$temp_val.'</a>';
+
+					$value = '<a href="index.php?action=DetailView&module=Vendors&record='.$entity_id.'&parenttab='.$tabname.'">'.$temp_val.'</a>';
 				}
 				elseif($module == "PriceBooks")
 				{
-						
-                                        $value = '<a href="index.php?action=DetailView&module=PriceBooks&record='.$entity_id.'&parenttab='.$tabname.'">'.$temp_val.'</a>';
+
+					$value = '<a href="index.php?action=DetailView&module=PriceBooks&record='.$entity_id.'&parenttab='.$tabname.'">'.$temp_val.'</a>';
 				}
 				elseif($module == "SalesOrder")
 				{
-						
-                                        $value = '<a href="index.php?action=DetailView&module=SalesOrder&record='.$entity_id.'&parenttab='.$tabname.'">'.$temp_val.'</a>';
+
+					$value = '<a href="index.php?action=DetailView&module=SalesOrder&record='.$entity_id.'&parenttab='.$tabname.'">'.$temp_val.'</a>';
 				}
 				elseif($module == 'Emails')
 				{
 					$value = $temp_val;
 				}
-                else
-                {
-                   	$value = '<a href="index.php?action=DetailView&module='.$module.'&record='.$entity_id.'&parenttab='.$tabname.'">'.$temp_val.'</a>';
-                }
+				else
+				{
+					$value = '<a href="index.php?action=DetailView&module='.$module.'&record='.$entity_id.'&parenttab='.$tabname.'">'.$temp_val.'</a>';
+				}
 			}
 		}
 		else
@@ -1982,6 +1977,10 @@
 			$query .= $sec_parameter;	
 		}
 	}
+	if($module == "Users")
+	{
+		$query = "select id,user_name,roleid,first_name,last_name,email1,phone_mobile,phone_work,is_admin,status from vtiger_users inner join vtiger_user2role on vtiger_user2role.userid=vtiger_users.id where deleted=0";
+	}
 	
 
 	$log->debug("Exiting getListQuery method ...");




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 11:17:37 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 15:17:37 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7140 - in
 /vtigercrm/trunk/modules/Users: Forms.php ListView.php Save.php User.php
Message-ID: <20060615151737.848D87ED245@vtiger.fosslabs.com>

Author: richie
Date: Thu Jun 15 09:17:31 2006
New Revision: 7140

Log:
User List view from getListViewEntries fn

Modified:
    vtigercrm/trunk/modules/Users/Forms.php
    vtigercrm/trunk/modules/Users/ListView.php
    vtigercrm/trunk/modules/Users/Save.php
    vtigercrm/trunk/modules/Users/User.php

Modified: vtigercrm/trunk/modules/Users/Forms.php
==============================================================================
--- vtigercrm/trunk/modules/Users/Forms.php (original)
+++ vtigercrm/trunk/modules/Users/Forms.php Thu Jun 15 09:17:31 2006
@@ -54,7 +54,7 @@
 function verify_data(form) {
 	var isError = false;
 	var errorMessage = "";
-	if (trim(form.email.value) == "") {
+	if (trim(form.email1.value) == "") {
 		isError = true;
 		errorMessage += "\\n$lbl_user_email1";
 		oField_miss = form.email1;
@@ -91,8 +91,8 @@
 	if (isError == true) {
 		set_fieldfocus(errorMessage,oField_miss);
 	}
-	if (trim(form.email.value) != "" && !/^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,4})+$/.test(form.email.value)) {
-		errorMessage='"' + form.email.value + '" is $err_invalid_email_address';
+	if (trim(form.email1.value) != "" && !/^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,4})+$/.test(form.email1.value)) {
+		errorMessage='"' + form.email1.value + '" is $err_invalid_email_address';
 		set_fieldfocus(errorMessage,form.email1);
 	}
 	if (trim(form.email2.value) != "" && !/^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,4})+$/.test(form.email2.value)) {

Modified: vtigercrm/trunk/modules/Users/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Users/ListView.php (original)
+++ vtigercrm/trunk/modules/Users/ListView.php Thu Jun 15 09:17:31 2006
@@ -19,6 +19,8 @@
 global $mod_strings;
 global $currentModule;
 global $theme;
+$theme_path="themes/".$theme."/";
+$image_path=$theme_path."images/";
 global $current_language;
 $mod_strings = return_module_language($current_language,'Users');
 $category = getParentTab();
@@ -37,31 +39,39 @@
 else
 	$start=1;
 
+$list_query = getListQuery("Users"); 
+
 $_SESSION['user_pagestart'] = $start;
 if($_REQUEST['sorder'] !='')
-	$sortorder = $_REQUEST['sorder'];
+	$sorder = $_REQUEST['sorder'];
+elseif($_SESSION['user_sorder'] != '')
+	$sorder = $_SESSION['user_sorder'];
 else
-	$sortorder = $_SESSION['user_sorder'];
-$_SESSION['user_sorder'] = $sortorder;
+	$sorder = 'ASC';
+$_SESSION['user_sorder'] = $sorder;
 if($_REQUEST['order_by'] != '')
-	$sortby = $_REQUEST['order_by'];
+	$order_by = $_REQUEST['order_by'];
+elseif($_SESSION['user_orderby'] != '')
+	$order_by = $_SESSION['user_orderby'];
 else
-	$sortby = $_SESSION['user_orderby'];
-$_SESSION['user_orderby'] = $sortby;
-
+	$order_by = 'last_name';
+$_SESSION['user_orderby'] = $orderby;
+$list_query .= ' ORDER BY '.$order_by.' '.$sorder;
+$list_result = $adb->query($list_query);
 //Retreive the Navigation array
 $navigation_array = getNavigationValues($start, $no_of_users['user'], '10');
 $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] ." ".$no_of_users['user'];
+
 $navigationOutput = getTableHeaderNavigation($navigation_array, $url_string,"Administration","index",'');
 $smarty->assign("MOD", return_module_language($current_language,'Settings'));
 $smarty->assign("CMOD", $mod_strings);
 $smarty->assign("APP", $app_strings);
 $smarty->assign("IMAGE_PATH",$image_path);
 $smarty->assign("CATEGORY",$category);
-$smarty->assign("LIST_HEADER",$focus->getUserListViewHeader());
-$smarty->assign("LIST_ENTRIES",$focus->getUserListViewEntries($navigation_array,$sortorder,$sortby));
+$smarty->assign("LIST_HEADER",getListViewHeader($focus,"Users",$url_string,$sorder,$order_by,"",""));
+$smarty->assign("LIST_ENTRIES",getListViewEntries($focus,"Users",$list_result,$navigation_array,"","","EditView","Delete",""));
 $smarty->assign("USER_COUNT",$no_of_users);
 $smarty->assign("RECORD_COUNTS", $record_string);
 $smarty->assign("NAVIGATION", $navigationOutput);

Modified: vtigercrm/trunk/modules/Users/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Users/Save.php (original)
+++ vtigercrm/trunk/modules/Users/Save.php Thu Jun 15 09:17:31 2006
@@ -79,8 +79,8 @@
 	if (!isset($_POST['homeorder']) || $_POST['homeorder'] == "" ) $_REQUEST["homeorder"] = 'ILTI,QLTQ,ALVT,PLVT,CVLVT,HLT,OLV,GRT,OLTSO';
 	
 	setObjectValuesFromRequest(&$focus);
-		$focus->save("Users");
-		$return_id = $focus->id;
+	$focus->saveentity("Users");
+	$return_id = $focus->id;
 
 if (isset($_POST['user_name']) && isset($_POST['new_password'])) {
 		$new_pass = $_POST['new_password'];
@@ -91,7 +91,7 @@
 		
 			header("Location: index.php?action=Error&module=Users&error_string=".urlencode($focus->error_string));
 		exit;
-	}
+}
 }  
 
 if(isset($focus->id) && $focus->id != '')
@@ -134,9 +134,9 @@
 createUserSharingPrivilegesfile($focus->id);
 
 if($_REQUEST['modechk'] == 'prefview')
-header("Location: index.php?action=$return_action&module=$return_module&record=$return_id");
+	header("Location: index.php?action=$return_action&module=$return_module&record=$return_id");
 else
-header("Location: index.php?action=$return_action&module=$return_module&record=$return_id&parenttab=$parenttab");
+	header("Location: index.php?action=$return_action&module=$return_module&record=$return_id&parenttab=$parenttab");
 
 
 ?>

Modified: vtigercrm/trunk/modules/Users/User.php
==============================================================================
--- vtigercrm/trunk/modules/Users/User.php (original)
+++ vtigercrm/trunk/modules/Users/User.php Thu Jun 15 09:17:31 2006
@@ -34,7 +34,7 @@
 require_once('include/utils/UserInfoUtil.php');
 
 // User is used to store customer information.
-class User extends CRMEntity {
+class User {
 	var $log;
 	var $db;
 	// Stored fields
@@ -79,7 +79,7 @@
 	var $date_format;
 	var $deleted;
 	var $homeorder;
-	
+
 	var $reports_to_name;
 	var $reports_to_id;
 
@@ -88,18 +88,17 @@
 	var $tab_name_index = Array('vtiger_users'=>'id','vtiger_attachments'=>'attachmentsid','vtiger_user2role'=>'userid');
 	var $column_fields = Array();
 	var $table_name = "vtiger_users";
-	var $sortby_fields = Array();		  
-	
-    // This is the list of fields that are in the lists.
-    var $list_fields_name = Array();
-    var $list_link_field= '';
+
+	// This is the list of fields that are in the lists.
+	var $list_fields_name = Array();
+	var $list_link_field= '';
 
 	var $list_mode;
 	var $popup_type;
 
 	var $search_fields = Array();
-    var $search_fields_name = Array();
-	
+	var $search_fields_name = Array();
+
 	var $module_name = "Users";
 
 	var $object_name = "User";
@@ -115,21 +114,34 @@
 
 	// This is used to retrieve related fields from form posts.
 	var $additional_column_fields = Array('reports_to_name');		
-	
+
+	var $sortby_fields = Array('status','email1','phone_work','is_admin','user_name');	  
+
+	var $default_order_by = 'lastname';
+	var $default_sort_order = 'ASC';
+	// This is the list of vtiger_fields that are in the lists.
+	var $list_fields = Array(
+		'First Name'=>Array('vtiger_users'=>'first_name'),
+		'Last Name'=>Array('vtiger_users'=>'last_name'),
+		'Role Name'=>Array('vtiger_user2role'=>'roleid'),
+		'User Name'=>Array('vtiger_users'=>'user_name'),
+		'Status'=>Array('vtiger_users'=>'status'),
+		'Email'=>Array('vtiger_users'=>'email1'),
+		'Admin'=>Array('vtiger_users'=>'is_admin'),
+		'Phone'=>Array('vtiger_users'=>'phone_work')
+	);
+	var $list_fields_name = Array(
+		'Last Name'=>'last_name',
+		'First Name'=>'first_name',
+		'Role Name'=>'roleid',
+		'User Name'=>'user_name',
+		'Status'=>'status',
+		'Email'=>'email1',	
+		'Admin'=>'is_admin',	
+		'Phone'=>'phone_work'	
+	);
+
 	// This is the list of fields that are in the lists.
-	var $list_fields = Array('id', 'first_name', 'last_name', 'user_name', 'status', 'department', 'yahoo_id', 'is_admin', 'email1', 'phone_work');
-	//commented as we get issues with sugarbean
-	/*
-	var $list_fields = Array(
-		'UserName'=>Array('users'=>'user_name'),
-		'Role'=>Array(''=>''),
-		'Email'=>Array('users'=>'email1'),
-		'Name'=>Array('users'=>'last_name'),
-		'Admin'=>Array('users'=>'is_admin'),
-		'Status'=>Array('users'=>'status'),
-		'Tools'=>Array(''=>''),
-	);*/	
-		
 	var $default_order_by = "user_name";
 	var $default_sort_order = 'ASC';
 
@@ -142,27 +154,27 @@
 		$this->db = new PearDatabase();
 		$this->column_fields = getColumnFields('Users');
 		$this->log->debug("Exiting User() method ...");
-		
+
 	}
 
 	function setPreference($name, $value){
-			if(!isset($this->user_preferences)){
-				if(isset($_SESSION["USER_PREFERENCES"]))
-					$this->user_preferences = $_SESSION["USER_PREFERENCES"];
-				else 
-					$this->user_preferences = array();	
-			}
-			if(!array_key_exists($name,$this->user_preferences )|| $this->user_preferences[$name] != $value){
-				$this->log->debug("Saving To Preferences:". $name."=".$value);
-				$this->user_preferences[$name] = $value;
-				$this->savePreferecesToDB();	
-				
-			}
-			$_SESSION[$name] = $value;
-
-			
-	}
-	
+		if(!isset($this->user_preferences)){
+			if(isset($_SESSION["USER_PREFERENCES"]))
+				$this->user_preferences = $_SESSION["USER_PREFERENCES"];
+			else 
+				$this->user_preferences = array();	
+		}
+		if(!array_key_exists($name,$this->user_preferences )|| $this->user_preferences[$name] != $value){
+			$this->log->debug("Saving To Preferences:". $name."=".$value);
+			$this->user_preferences[$name] = $value;
+			$this->savePreferecesToDB();	
+
+		}
+		$_SESSION[$name] = $value;
+
+
+	}
+
 	function savePreferecesToDB(){
 		$data = base64_encode(serialize($this->user_preferences));
 		$query = "UPDATE $this->table_name SET user_preferences='$data' where id='$this->id'";
@@ -171,29 +183,29 @@
 		$_SESSION["USER_PREFERENCES"] = $this->user_preferences;
 	}
 	function loadPreferencesFromDB($value){
-		
-			if(isset($value) && !empty($value)){
-				$this->log->debug("LOADING :PREFERENCES SIZE ". strlen($value));
-				$this->user_preferences = unserialize(base64_decode($value));
-				$_SESSION = array_merge($this->user_preferences, $_SESSION);
-				$this->log->debug("Finished Loading");
-				$_SESSION["USER_PREFERENCES"] = $this->user_preferences;
-		
-				
-		}
-		
-	}
-	
-	
+
+		if(isset($value) && !empty($value)){
+			$this->log->debug("LOADING :PREFERENCES SIZE ". strlen($value));
+			$this->user_preferences = unserialize(base64_decode($value));
+			$_SESSION = array_merge($this->user_preferences, $_SESSION);
+			$this->log->debug("Finished Loading");
+			$_SESSION["USER_PREFERENCES"] = $this->user_preferences;
+
+
+		}
+
+	}
+
+
 	/**
-	* @return string encrypted password for storage in DB and comparison against DB password.
-	* @param string $user_name - Must be non null and at least 2 characters
-	* @param string $user_password - Must be non null and at least 1 character.
-	* @desc Take an unencrypted username and password and return the encrypted password
+	 * @return string encrypted password for storage in DB and comparison against DB password.
+	 * @param string $user_name - Must be non null and at least 2 characters
+	 * @param string $user_password - Must be non null and at least 1 character.
+	 * @desc Take an unencrypted username and password and return the encrypted password
 	 * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc..
 	 * All Rights Reserved..
 	 * Contributor(s): ______________________________________..
-	*/
+	 */
 	function encrypt_password($user_password)
 	{
 		// encrypt the password.
@@ -203,10 +215,10 @@
 		return $encrypted_password;
 
 	}
-	
+
 	function authenticate_user($password){
 		$usr_name = $this->column_fields["user_name"];
-	
+
 		$query = "SELECT * from $this->table_name where user_name='$usr_name' AND user_hash='$password'";
 		$result = $this->db->requireSingleResult($query, false);
 
@@ -227,11 +239,11 @@
 			return -1;
 
 		}else{
-				return -1;
-		}
-	
-	}
-	
+			return -1;
+		}
+
+	}
+
 	function authorization_check($validate, $authkey, $i){
 		$validate = base64_decode($validate);
 		$authkey = base64_decode($authkey);
@@ -240,11 +252,11 @@
 			if(substr_count($buffer, $authkey) < $i)
 				return -1;
 		}else{
-				return -1;
-		}
-		
-	}
-/**
+			return -1;
+		}
+
+	}
+	/**
 	 * Checks the config.php AUTHCFG value for login type and forks off to the proper module
 	 *
 	 * @param string $user_password - The password of the user to authenticate
@@ -253,7 +265,7 @@
 	function doLogin($user_password) {
 		global $AUTHCFG;
 		$usr_name = $this->column_fields["user_name"];
-	
+
 		switch (strtoupper($AUTHCFG['authType'])) {
 			case 'LDAP':
 				$this->log->debug("Using LDAP authentication");
@@ -265,7 +277,7 @@
 					return true;
 				}
 				break;
-				
+
 			case 'AD':
 				$this->log->debug("Using Active Directory authentication");
 				require_once('modules/Users/authTypes/adLDAP.php');
@@ -276,7 +288,7 @@
 					return false;
 				}
 				break;
-				
+
 			default:
 				$this->log->debug("Using integrated/SQL authentication");
 				$encrypted_password = $this->encrypt_password($user_password);
@@ -304,7 +316,7 @@
 	{
 		$usr_name = $this->column_fields["user_name"];
 		if(isset($_SESSION['loginattempts'])){
-				 $_SESSION['loginattempts'] += 1;
+			$_SESSION['loginattempts'] += 1;
 		}else{
 			$_SESSION['loginattempts'] = 1;	
 		}
@@ -316,22 +328,22 @@
 		unset($_SESSION['validation']);
 		if( !isset($this->column_fields["user_name"]) || $this->column_fields["user_name"] == "" || !isset($user_password) || $user_password == "")
 			return null;
-			
+
 		if($this->validation_check('aW5jbHVkZS9pbWFnZXMvc3VnYXJzYWxlc19tZC5naWY=','1a44d4ab8f2d6e15e0ff6ac1c2c87e6f', '866bba5ae0a15180e8613d33b0acc6bd') == -1)$validation = -1;
 		//if($this->validation_check('aW5jbHVkZS9pbWFnZXMvc3VnYXJzYWxlc19tZC5naWY=','1a44d4ab8f2d6e15e0ff6ac1c2c87e6f') == -1)$validation = -1;
 		if($this->validation_check('aW5jbHVkZS9pbWFnZXMvcG93ZXJlZF9ieV9zdWdhcmNybS5naWY=' , '3d49c9768de467925daabf242fe93cce') == -1)$validation = -1;
 		if($this->authorization_check('aW5kZXgucGhw' , 'PEEgaHJlZj0naHR0cDovL3d3dy5zdWdhcmNybS5jb20nIHRhcmdldD0nX2JsYW5rJz48aW1nIGJvcmRlcj0nMCcgc3JjPSdpbmNsdWRlL2ltYWdlcy9wb3dlcmVkX2J5X3N1Z2FyY3JtLmdpZicgYWx0PSdQb3dlcmVkIEJ5IFN1Z2FyQ1JNJz48L2E+', 1) == -1)$validation = -1;
 		$encrypted_password = $this->encrypt_password($user_password);
-	
+
 		$authCheck = false;
 		$authCheck = $this->doLogin($user_password);
-		
+
 		if(!$authCheck)
 		{
 			$this->log->warn("User authentication for $usr_name failed");
 			return null;
 		}
-		
+
 		$query = "SELECT * from $this->table_name where user_name='$usr_name'";
 		$result = $this->db->requireSingleResult($query, false);
 
@@ -340,8 +352,8 @@
 		$this->id = $row['id'];	
 
 		$user_hash = strtolower(md5($user_password));
-		
-		
+
+
 		// If there is no user_hash is not present or is out of date, then create a new one.
 		if(!isset($row['user_hash']) || $row['user_hash'] != $user_hash)
 		{
@@ -349,37 +361,37 @@
 			$this->db->query($query, true, "Error setting new hash for {$row['user_name']}: ");	
 		}
 		$this->loadPreferencesFromDB($row['user_preferences']);
-		
-		
+
+
 		if ($this->status != "Inactive") $this->authenticated = true;
-		
+
 		unset($_SESSION['loginattempts']);
 		return $this;
 	}		
 
-	
+
 	/**
-	* @param string $user name - Must be non null and at least 1 character.
-	* @param string $user_password - Must be non null and at least 1 character.
-	* @param string $new_password - Must be non null and at least 1 character.
-	* @return boolean - If passwords pass verification and query succeeds, return true, else return false.
-	* @desc Verify that the current password is correct and write the new password to the DB.
+	 * @param string $user name - Must be non null and at least 1 character.
+	 * @param string $user_password - Must be non null and at least 1 character.
+	 * @param string $new_password - Must be non null and at least 1 character.
+	 * @return boolean - If passwords pass verification and query succeeds, return true, else return false.
+	 * @desc Verify that the current password is correct and write the new password to the DB.
 	 * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc..
 	 * All Rights Reserved..
 	 * Contributor(s): ______________________________________..
-	*/
+	 */
 	function change_password($user_password, $new_password)
 	{
 		$usr_name = $this->column_fields["user_name"];
 		global $mod_strings;
 		global $current_user;
 		$this->log->debug("Starting password change for $usr_name");
-		
+
 		if( !isset($new_password) || $new_password == "") {
 			$this->error_string = $mod_strings['ERR_PASSWORD_CHANGE_FAILED_1'].$user_name.$mod_strings['ERR_PASSWORD_CHANGE_FAILED_2'];
 			return false;
 		}
-		
+
 		$encrypted_password = $this->encrypt_password($user_password);
 		$encrypted_new_password = $this->encrypt_password($new_password);
 
@@ -390,7 +402,7 @@
 			$row = $this->db->fetchByAssoc($result);
 			$this->log->debug("select old password query: $query");
 			$this->log->debug("return result of $row");
-	
+
 			if($row == null)
 			{
 				$this->log->warn("Incorrect old password for $usr_name");
@@ -399,20 +411,20 @@
 			}
 		}		
 
-		
+
 		$user_hash = strtolower(md5($new_password));
-		
+
 		//set new password
 		$query = "UPDATE $this->table_name SET user_password='$encrypted_new_password', user_hash='$user_hash' where id='$this->id'";
 		$this->db->query($query, true, "Error setting new password for $usr_name: ");	
 		return true;
 	}
-	
+
 	function is_authenticated()
 	{
 		return $this->authenticated;
 	}
-	
+
 
 	function retrieve_user_id($user_name)
 	{
@@ -421,7 +433,7 @@
 		$row = $this->db->fetchByAssoc($result);
 		return $row['id'];
 	}
-	
+
 	/** 
 	 * @return -- returns a list of all users in the system.
 	 * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc..
@@ -432,11 +444,11 @@
 	{
 		$usr_name = $this->column_fields["user_name"];
 		global $mod_strings;
-		
+
 		$query = "SELECT user_name from vtiger_users where user_name='$usr_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);
-		
+
 		$query = "SELECT user_name from vtiger_users where is_admin = 'on' AND deleted=0";
 		$result =$this->db->query($query, true, "Error selecting possible duplicate vtiger_users: ");
 		$last_admin = $this->db->fetchByAssoc($result);
@@ -451,97 +463,42 @@
 			$verified = false;
 		}
 		if(!isset($_REQUEST['is_admin']) &&
-			count($last_admin) == 1 && 
-			$last_admin['user_name'] == $usr_name) {
+				count($last_admin) == 1 && 
+				$last_admin['user_name'] == $usr_name) {
 			$this->log->debug("last admin length: ".count($last_admin));
 
 			$this->error_string .= $mod_strings['ERR_LAST_ADMIN_1'].$usr_name.$mod_strings['ERR_LAST_ADMIN_2'];
 			$verified = false;
 		}
-		
+
 		return $verified;
 	}
-	
+
 	function getColumnNames_User()
-  {
-  	
-  	$mergeflds = array("FIRSTNAME","LASTNAME","USERNAME","YAHOOID","TITLE","OFFICEPHONE","DEPARTMENT",
-											 "MOBILE","OTHERPHONE","FAX","EMAIL",
-											 "HOMEPHONE","OTHEREMAIL","PRIMARYADDRESS",
-											 "CITY","STATE","POSTALCODE","COUNTRY");	
-  	return $mergeflds;
-  }
-
-//function added for the listview of vtiger_users for 5.0 beta
-  function getUserListViewHeader()
-  {
-	  global $mod_strings;
-	  $header_array=array($mod_strings['LBL_LIST_NO'],$mod_strings['LBL_LIST_TOOLS'],$mod_strings['LBL_LIST_USER_NAME_ROLE'],$mod_strings['LBL_LIST_EMAIL'],$mod_strings['LBL_LIST_PHONE'],$mod_strings['LBL_ADMIN'],$mod_strings['LBL_STATUS']);
-	  return $header_array;
-  }
-
-  function getUserListViewEntries($navigation_array,$sorder='',$orderby='')
-  {
-	  global $theme;
-	  global $adb, $current_user;
-	  $theme_path="themes/".$theme."/";
-	  $image_path=$theme_path."images/";
-	  if($sorder != '' && $orderby !='')
-	  $list_query = ' SELECT * from vtiger_users where deleted=0 order by '.$orderby.' '.$sorder;
-	  else
-	  $list_query = "SELECT * from vtiger_users where deleted=0 order by ".$this->default_order_by." ".$this->default_sort_order;
-	  $result =$adb->query($list_query);
-	  $entries_list = array();
-	  $roleinfo = getAllRoleDetails();
-
-	  for($i = $navigation_array['start'];$i <= $navigation_array['end_val']; $i++)
-	  {
-		  $entries=array();
-		  $id=$adb->query_result($result,$i-1,'id');
-
-		  $entries[]='<a href="index.php?action=DetailView&module=Users&parenttab=Settings&record='.$id.'">'.$this->db->query_result($result,$i-1,'user_name').'</a>';
-
-		  $rolecode= fetchUserRole($adb->query_result($result,$i-1,'id'));
-		  $entries[]='<a href="index.php?action=RoleDetailView&module=Users&parenttab=Settings&roleid='.$rolecode.'">'.$roleinfo[$rolecode][0];
-		  $entries[]='<a href="mailto:'.$adb->query_result($result,$i-1,'email1').'">'.$adb->query_result($result,$i-1,'email1').' </a>';
-
-		  $entries[]='<a href="index.php?action=DetailView&module=Users&parenttab=Settings&record='.$id.'">'. $this->db->query_result($result,$i-1,'last_name').' '.$adb->query_result($result,$i-1,'first_name').'</a>';
-
-		  $entries[]=$adb->query_result($result,$i-1,'is_admin');
-		  $entries[]=$adb->query_result($result,$i-1,'status');
-		  $entries[]=$adb->query_result($result,$i-1,'phone_work');
-		  if($adb->query_result($result,$i-1,'user_name') == 'admin' || $adb->query_result($result,$i-1,'user_name') == 'standarduser' )
-		  {
-			  $entries[]='<a href="index.php?action=EditView&return_action=ListView&return_module=Users&module=Users&parenttab=Settings&record='.$id.'"><img src="'.$image_path.'editfield.gif" border="0" alt="Edit" title="Edit"/></a>&nbsp;&nbsp;';
-			  }
-			  elseif($adb->query_result($result,$i-1,'id') == $current_user->id)
-			  {
-				  $entries[]='<a href="index.php?action=EditView&return_action=ListView&return_module=Users&module=Users&parenttab=Settings&record='.$id.'"><img src="'.$image_path.'editfield.gif" border="0" alt="Edit" title="Edit"/></a>&nbsp;&nbsp;';
-			  }
-			  else
-
-			  $entries[]='<a href="index.php?action=EditView&return_action=ListView&return_module=Users&module=Users&parenttab=Settings&record='.$id.'"><img src="'.$image_path.'editfield.gif" border="0" alt="Edit" title="Edit"/></a>&nbsp;&nbsp;<img src="'.$image_path.'delete.gif" onclick="deleteUser('.$id.')" border="0"  alt="Delete" title="Delete"/></a>';
-
-			  $entries_list[]=$entries;
-
-			  }
-			  return $entries_list;
-  }
-
-	  function fill_in_additional_list_fields()
+	{
+
+		$mergeflds = array("FIRSTNAME","LASTNAME","USERNAME","YAHOOID","TITLE","OFFICEPHONE","DEPARTMENT",
+				"MOBILE","OTHERPHONE","FAX","EMAIL",
+				"HOMEPHONE","OTHEREMAIL","PRIMARYADDRESS",
+				"CITY","STATE","POSTALCODE","COUNTRY");	
+		return $mergeflds;
+	}
+
+
+	function fill_in_additional_list_fields()
 	{
 		$this->fill_in_additional_detail_fields();	
 	}
-	
+
 	function fill_in_additional_detail_fields()
 	{
 		//$query = "SELECT u1.first_name, u1.last_name from vtiger_users as u1, vtiger_users as u2 where u1.id = u2.reports_to_id AND u2.id = '$this->id' and u1.deleted=0";
 		$query = "SELECT u1.first_name, u1.last_name from vtiger_users u1, vtiger_users u2 where u1.id = u2.reports_to_id AND u2.id = '$this->id' and u1.deleted=0";
 		$result =$this->db->query($query, true, "Error filling in additional detail vtiger_fields") ;
-		
+
 		$row = $this->db->fetchByAssoc($result);
 		$this->log->debug("additional detail query results: $row");
-		
+
 		if($row != null)
 		{
 			$this->reports_to_name = stripslashes($row['first_name'].' '.$row['last_name']);
@@ -556,21 +513,289 @@
 	{
 		require('user_privileges/user_privileges_'.$userid.'.php');
 		foreach($this->column_fields as $field=>$value_iter)
-                {
-                        if(isset($user_info[$field]))
-                        {
-                                $this->$field = $user_info[$field];
-                        }
-                }
+		{
+			if(isset($user_info[$field]))
+			{
+				$this->$field = $user_info[$field];
+				$this->column_fields[$field] = $user_info[$field];	
+			}
+		}
 		$this->id = $userid;
 		return $this;
+
+	}
+	function saveentity($module)
+	{
+		global $current_user, $adb;//$adb added by raju for mass mailing
+		$insertion_mode = $this->mode;
+
+		$this->db->println("TRANS saveentity starts $module");
+		$this->db->startTransaction();
+		foreach($this->tab_name as $table_name)
+		{
+			if($table_name == 'vtiger_attachments')
+			{
+				$this->insertIntoAttachment($this->id,$module);
+			}
+			else
+			{
+				$this->insertIntoEntityTable($table_name, $module);			
+			}
+		}
+
+		$this->db->completeTransaction();
+		$this->db->println("TRANS saveentity ends");
+	}
+	function insertIntoEntityTable($table_name, $module)
+	{
+		global $log;	
+		$log->info("function insertIntoEntityTable ".$module.' vtiger_table name ' .$table_name);
+		global $adb;
+		$insertion_mode = $this->mode;
+
+		//Checkin whether an entry is already is present in the vtiger_table to update
+		if($insertion_mode == 'edit')
+		{
+			$check_query = "select * from ".$table_name." where ".$this->tab_name_index[$table_name]."=".$this->id;
+			$check_result=$adb->query($check_query);
+
+			$num_rows = $adb->num_rows($check_result);
+
+			if($num_rows <= 0)
+			{
+				$insertion_mode = '';
+			}	 
+		}
+
+		if($insertion_mode == 'edit')
+		{
+			$update = '';
+			$tabid= getTabid($module);	
+			$sql = "select * from vtiger_field where tabid=".$tabid." and tablename='".$table_name."' and displaytype in (1,3)"; 
+		}
+		else
+		{
+			$column = $this->tab_name_index[$table_name];
+			if($column == 'id' && $table_name == 'vtiger_users')
+			{
+				$currentuser_id = $adb->getUniqueID("vtiger_users");
+				$this->id = $currentuser_id;
+			}
+			$value = $this->id;
+			$tabid= getTabid($module);	
+			$sql = "select * from vtiger_field where tabid=".$tabid." and tablename='".$table_name."' and displaytype in (1,3,4)"; 
+		}
+
+		$result = $adb->query($sql);
+		$noofrows = $adb->num_rows($result);
+		for($i=0; $i<$noofrows; $i++)
+		{
+			$fieldname=$adb->query_result($result,$i,"fieldname");
+			$columname=$adb->query_result($result,$i,"columnname");
+			$uitype=$adb->query_result($result,$i,"uitype");
+			if(isset($this->column_fields[$fieldname]))
+			{
+				if($uitype == 56)
+				{
+					if($this->column_fields[$fieldname] == 'on' || $this->column_fields[$fieldname] == 1)
+					{
+						$fldvalue = 1;
+					}
+					else
+					{
+						$fldvalue = 0;
+					}
+
+				}
+				elseif($uitype == 33)
+				{
+					$j = 0;
+					$field_list = '';
+					if(is_array($this->column_fields[$fieldname]) && count($this->column_fields[$fieldname]) > 0)
+					{
+						foreach($this->column_fields[$fieldname] as $key=>$multivalue)
+						{
+							if($j != 0)
+							{
+								$field_list .= ' , ';
+							}
+							$field_list .= $multivalue;
+							$j++;
+						}
+					}
+					$fldvalue = $field_list;
+				}
+				else
+				{
+					$fldvalue = $this->column_fields[$fieldname]; 
+					$fldvalue = stripslashes($fldvalue);
+				}
+				$fldvalue = from_html($adb->formatString($table_name,$columname,$fldvalue),($insertion_mode == 'edit')?true:false);
+
+
+
+			}
+			else
+			{
+				$fldvalue = '';
+			}
+			if($fldvalue=='') $fldvalue ="NULL";
+			if($insertion_mode == 'edit')
+			{
+				if($i == 0)
+				{
+					$update = $columname."=".$fldvalue."";
+				}
+				else
+				{
+					$update .= ', '.$columname."=".$fldvalue."";
+				}
+			}
+			else
+			{
+				$column .= ", ".$columname;
+				$value .= ", ".$fldvalue."";
+			}
+
+		}
+
+
+
+
+
+		if($insertion_mode == 'edit')
+		{
+			//Check done by Don. If update is empty the the query fails
+			if(trim($update) != '')
+			{
+				$sql1 = "update ".$table_name." set ".$update." where ".$this->tab_name_index[$table_name]."=".$this->id;
+
+				$adb->query($sql1); 
+			}
+
+		}
+		else
+		{	
+			$sql1 = "insert into ".$table_name." (".$column.") values(".$value.")";
+			$adb->query($sql1); 
+		}
+
+	}
+	function insertIntoAttachment($id,$module)
+	{
+		global $log, $adb;
+		$log->debug("Entering into insertIntoAttachment($id,$module) method.");
+
+		foreach($_FILES as $fileindex => $files)
+		{
+			if($files['name'] != '' && $files['size'] > 0)
+			{
+				$this->uploadAndSaveFile($id,$module,$files);
+			}
+		}
+
+		$log->debug("Exiting from insertIntoAttachment($id,$module) method.");
+	}
+
+	function retrieve_entity_info($record, $module)
+	{
+		global $adb,$log;
+		$result = Array();
+		foreach($this->tab_name_index as $table_name=>$index)
+		{
+			$result[$table_name] = $adb->query("select * from ".$table_name." where ".$index."=".$record);
+		}
+		$tabid = getTabid($module);
+		$sql1 =  "select * from vtiger_field where tabid=".$tabid;
+		$result1 = $adb->query($sql1);
+		$noofrows = $adb->num_rows($result1);
+		for($i=0; $i<$noofrows; $i++)
+		{
+			$fieldcolname = $adb->query_result($result1,$i,"columnname");
+			$tablename = $adb->query_result($result1,$i,"tablename");
+			$fieldname = $adb->query_result($result1,$i,"fieldname");
+
+			$fld_value = $adb->query_result($result[$tablename],0,$fieldcolname);
+			$this->column_fields[$fieldname] = $fld_value;
+			$this->$fieldname = $fld_value;
+
+		}
+		$this->column_fields["record_id"] = $record;
+		$this->column_fields["record_module"] = $module;
+	}
+	function uploadAndSaveFile($id,$module,$file_details)
+	{
+		global $log;
+		$log->debug("Entering into uploadAndSaveFile($id,$module,$file_details) method.");
 		
-	}
+		global $adb, $current_user;
+		global $upload_badext;
+
+		$date_var = date('YmdHis');
+
+		//to get the owner id
+		$ownerid = $this->column_fields['assigned_user_id'];
+		if(!isset($ownerid) || $ownerid=='')
+			$ownerid = $current_user->id;
 
 	
+		// Arbitrary File Upload Vulnerability fix - Philip
+		$binFile = $file_details['name'];
+		$ext_pos = strrpos($binFile, ".");
+
+		$ext = substr($binFile, $ext_pos + 1);
+
+		if (in_array($ext, $upload_badext))
+		{
+			$binFile .= ".txt";
+		}
+		// Vulnerability fix ends
+
+		$filename = basename($binFile);
+		$filetype= $file_details['type'];
+		$filesize = $file_details['size'];
+		$filetmp_name = $file_details['tmp_name'];
+		
+		//get the file path inwhich folder we want to upload the file
+		$upload_file_path = decideFilePath();
+		//upload the file in server
+		$upload_status = move_uploaded_file($filetmp_name,$upload_file_path.$binFile);
+
+		$save_file = 'true';
+		//only images are allowed for these modules
+		if($module == 'Users')
+		{
+			$save_file = validateImageFile(&$file_details);
+		}
+		if($save_file == 'true')
+		{
+			$current_id = $adb->getUniqueID("vtiger_crmentity");
+
+			$sql1 = "insert into vtiger_crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime,modifiedtime) values(".$current_id.",".$current_user->id.",".$ownerid.",'".$module." Attachment','".$this->column_fields['description']."',".$adb->formatString("vtiger_crmentity","createdtime",$date_var).",".$adb->formatString("vtiger_crmentity","modifiedtime",$date_var).")";
+			$adb->query($sql1);
+
+			$sql2="insert into vtiger_attachments(attachmentsid, name, description, type, path) values(".$current_id.",'".$filename."','".$this->column_fields['description']."','".$filetype."','".$upload_file_path."')";
+			$result=$adb->query($sql2);
+
+			if($_REQUEST['mode'] == 'edit')
+			{
+				if($id != '' && $_REQUEST['fileid'] != '')
+				{
+					$delquery = 'delete from vtiger_seattachmentsrel where crmid = '.$id.' and attachmentsid = '.$_REQUEST['fileid'];
+					$adb->query($delquery);
+				}
+			}
+			$sql3='insert into vtiger_seattachmentsrel values('.$id.','.$current_id.')';
+			$adb->query($sql3);
+		}
+		else
+		{
+			$log->debug("Skip the save attachment process.");
+		}
+		$log->debug("Exiting from uploadAndSaveFile($id,$module,$file_details) method.");
+
+		return;
+	}
+
 }
-
-	
-
-
 ?>




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 11:20:15 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 15:20:15 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7141 - in
 /vtigercrm/trunk/Smarty/templates: DisplayFields.tpl
 UserListViewContents.tpl
Message-ID: <20060615152015.2A0427ED24F@vtiger.fosslabs.com>

Author: richie
Date: Thu Jun 15 09:20:10 2006
New Revision: 7141

Log:
User List view from custom view fn

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

Modified: vtigercrm/trunk/Smarty/templates/DisplayFields.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DisplayFields.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DisplayFields.tpl Thu Jun 15 09:20:10 2006
@@ -462,7 +462,7 @@
 				{else}
 					{assign var="disable_status" value="disabled"}
 				{/if}	
-				{if $fldvalue eq 1}
+				{if $fldvalue eq 'on'}
 					<td width="30%" align=left class="dvtCellInfo">
 						<input name="{$fldname}" {$disable_status} type="checkbox"  checked>
 					</td>

Modified: vtigercrm/trunk/Smarty/templates/UserListViewContents.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/UserListViewContents.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/UserListViewContents.tpl Thu Jun 15 09:20:10 2006
@@ -14,22 +14,30 @@
 						
 <table border=0 cellspacing=0 cellpadding=5 width=100% class="listTable">
 <tr>
-	{foreach item=header from=$LIST_HEADER} 
-		<td class="colHeader small" valign=top>{$header}</td>
-	{/foreach}
+	<td class="colHeader small" valign=top>#</td>
+	<td class="colHeader small" valign=top>{$APP.Tools}</td>
+	<td class="colHeader small" valign=top>{$LIST_HEADER.3}</td>
+	<td class="colHeader small" valign=top>{$LIST_HEADER.5}</td>
+	<td class="colHeader small" valign=top>{$LIST_HEADER.7}</td>
+	<td class="colHeader small" valign=top>{$LIST_HEADER.6}</td>
+	<td class="colHeader small" valign=top>{$LIST_HEADER.4}</td>
 </tr>
-	{foreach name=userlist item=listvalues from=$LIST_ENTRIES}
+	{foreach name=userlist item=listvalues key=userid from=$LIST_ENTRIES}
 <tr>
 	<td class="listTableRow small" valign=top>{$smarty.foreach.userlist.iteration}</td>
+	<td class="listTableRow small" valign=top><a href="index.php?action=EditView&return_action=ListView&return_module=Users&module=Users&parenttab=Settings&record={$userid}"><img src="{$IMAGE_PATH}editfield.gif" alt="Edit" title="Edit" border="0"></a>&nbsp;
+	{if $userid neq 1 && $userid neq 2}	
+	<img src="{$IMAGE_PATH}delete.gif" onclick="deleteUser('{$userid}')" border="0"  alt="Delete" title="Delete"/></a>
+	{/if}
+&nbsp;</td>
+	<td class="listTableRow small" valign=top><b><a href="index.php?module=Users&action=DetailView&parenttab=Settings&record={$userid}"> {$listvalues.3} </a></b><br><a href="index.php?module=Users&action=DetailView&parenttab=Settings&record={$userid}"> {$listvalues.1} {$listvalues.0}</a> ({$listvalues.2})</td>
+	<td class="listTableRow small" valign=top>{$listvalues.5}</td>
 	<td class="listTableRow small" valign=top>{$listvalues.7}</td>
-	<td class="listTableRow small" valign=top><b>{$listvalues.0}</b><br>{$listvalues.3} <a> (</a>{$listvalues.1})</td>
-	<td class="listTableRow small" valign=top>{$listvalues.2}</td>
 	<td class="listTableRow small" valign=top>{$listvalues.6}</td>
-	<td class="listTableRow small" valign=top>{$listvalues.4}</td>
-	{if $listvalues.5 eq 'Active'}
-	<td class="listTableRow small active" valign=top>{$listvalues.5}</td>
+	{if $listvalues.4 eq 'Active'}
+	<td class="listTableRow small active" valign=top>{$listvalues.4}</td>
 	{else}
-	<td class="listTableRow small inactive" valign=top>{$listvalues.5}</td>
+	<td class="listTableRow small inactive" valign=top>{$listvalues.4}</td>
 	{/if}	
 
 </tr>




From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 11:21:41 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 15:21:41 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231111=3A?=
	=?utf-8?q?_Unit_price_alignment?=
In-Reply-To: <076.200736e54b6b9a89af6abc5d64dea244@vtiger.fosslabs.com>
References: <076.200736e54b6b9a89af6abc5d64dea244@vtiger.fosslabs.com>
Message-ID: <085.1eb5dcff469826ecb86063c57156a0a9@vtiger.fosslabs.com>

#1111: Unit price alignment
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  ela       
      Type:  defect     |      Status:  new       
  Priority:  major      |   Milestone:            
 Component:  vtigercrm  |     Version:  5.0.0     
Resolution:             |    Keywords:  unit price
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => ela

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1111>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 11:23:22 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 15:23:22 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231114=3A?=
 =?utf-8?q?_tax_split_up_shows_only_upon_clicking_on_button?=
In-Reply-To: <076.e0fc7e9f8cb228797d775f33694000ad@vtiger.fosslabs.com>
References: <076.e0fc7e9f8cb228797d775f33694000ad@vtiger.fosslabs.com>
Message-ID: <085.d9b73e742a251e2364a826c81d603290@vtiger.fosslabs.com>

#1114: tax split up shows only upon clicking on button
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  mickie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1114>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 11:23:45 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 15:23:45 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231128=3A?=
 =?utf-8?q?_too_high_reaction_time_in_using_inventory?=
In-Reply-To: <076.209b6cc7a2151c8fd5ca32cfa5df69e2@vtiger.fosslabs.com>
References: <076.209b6cc7a2151c8fd5ca32cfa5df69e2@vtiger.fosslabs.com>
Message-ID: <085.f1dcceee3b24470f0829c99864d57bff@vtiger.fosslabs.com>

#1128: too high reaction time in using inventory
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  saraj      
      Type:  defect     |      Status:  new        
  Priority:  major      |   Milestone:             
 Component:  vtigercrm  |     Version:  5.0.0      
Resolution:             |    Keywords:  performance
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => saraj

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1128>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 11:24:42 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 15:24:42 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231130=3A?=
 =?utf-8?q?_more_information_tab_ajaxified?=
In-Reply-To: <076.d1ddb83143327b9a11f01d548facd399@vtiger.fosslabs.com>
References: <076.d1ddb83143327b9a11f01d548facd399@vtiger.fosslabs.com>
Message-ID: <085.e02ddd4d571956c1ce55cc0b23e1545f@vtiger.fosslabs.com>

#1130: more information tab ajaxified
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  jerrydgeorge
      Type:  defect     |      Status:  new         
  Priority:  major      |   Milestone:              
 Component:  vtigercrm  |     Version:  5.0.1       
Resolution:             |    Keywords:  performance 
------------------------+---------------------------------------------------
Changes (by saraj):

  * version:  5.0.0 => 5.0.1
  * owner:  developer => jerrydgeorge

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1130>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 11:26:41 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 15:26:41 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7142 -
	/vtigercrm/trunk/include/utils/ListViewUtils.php
Message-ID: <20060615152641.4010E7ED254@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 15 09:26:37 2006
New Revision: 7142

Log:
changes made to get CampaignName 

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 Thu Jun 15 09:26:37 2006
@@ -1031,6 +1031,21 @@
 		else
 			$value='';
 	}
+	//Added by Minnie to get Campaign Source
+	elseif($uitype == 58)
+	{
+		global $adb;
+		if($temp_val != '')
+		{
+			$sql="SELECT * FROM vtiger_campaign WHERE campaignid=".$temp_val;
+			$result=$adb->query($sql);
+			$campaignname=$adb->query_result($result,0,"campaignname");
+			$value= '<a href=index.php?module=Campaigns&action=DetailView&record='.$temp_val.'>'.$campaignname.'</a>';
+		}
+		else
+			$value='';
+	}
+	//End
 	//Added By *Raj* for the Issue ProductName not displayed in CustomView of HelpDesk
 	elseif($uitype == 59)
 	{
@@ -1379,6 +1394,10 @@
 
 					$value = '<a href="a" LANGUAGE=javascript onclick=\'set_return_address("'.$entity_id.'", "'.br2nl($temp_val).'", "'.br2nl($acct_focus->column_fields['treet']).'", "'.br2nl($acct_focus->column_fields['city']).'", "'.br2nl($acct_focus->column_fields['state']).'", "'.br2nl($acct_focus->column_fields['postalcode']).'", "'.br2nl($acct_focus->column_fields['country']).'","'.br2nl($acct_focus->column_fields['pobox']).'"); window.close()\'>'.$temp_val.'</a>';
 
+				}
+				elseif($popuptype == "specific_campaign")
+				{
+					$value = '<a href="a" LANGUAGE=javascript onclick=\'set_return_specific_campaign("'.$entity_id.'", "'.br2nl($temp_val).'"); window.close()\'>'.$temp_val.'</a>';
 				}
 				else
 				{




From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 11:26:45 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 15:26:45 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231133=3A?=
 =?utf-8?q?_in_related_list_note_can_be_shown_in_a_different_color?=
In-Reply-To: <076.2f01c0cdb39b0c84bd3ed216997c2d77@vtiger.fosslabs.com>
References: <076.2f01c0cdb39b0c84bd3ed216997c2d77@vtiger.fosslabs.com>
Message-ID: <085.ffcc268c88106e21273fd153fb69e178@vtiger.fosslabs.com>

#1133: in related list note can be shown in a different color
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  developer
      Type:  defect     |      Status:  new      
  Priority:  major      |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.1    
Resolution:             |    Keywords:           
------------------------+---------------------------------------------------
Changes (by saraj):

  * version:  5.0.0 => 5.0.1

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1133>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 11:29:09 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 15:29:09 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231135=3A?=
 =?utf-8?q?_The_History_of_the_Purchase_Order_not_getting_displayed?=
In-Reply-To: <076.70a50c265764e891dd51a97dd8390af4@vtiger.fosslabs.com>
References: <076.70a50c265764e891dd51a97dd8390af4@vtiger.fosslabs.com>
Message-ID: <085.fef20c173b258cb03a89ebc2198d8a42@vtiger.fosslabs.com>

#1135: The History of the Purchase Order not getting displayed
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  mickie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1135>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 11:29:14 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 15:29:14 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7143 -
	/vtigercrm/trunk/include/utils/EditViewUtils.php
Message-ID: <20060615152914.6D0777ED25A@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 15 09:29:10 2006
New Revision: 7143

Log:
changes made to get CampaignName 

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

Modified: vtigercrm/trunk/include/utils/EditViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/EditViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/EditViewUtils.php Thu Jun 15 09:29:10 2006
@@ -474,6 +474,32 @@
 		$fieldvalue[] = $contact_name;
 		$fieldvalue[] = $value;
 	}
+
+	elseif($uitype == 58)
+	{
+
+		if($value != '')
+		{
+			$campaign_name = getCampaignName($value);
+		}
+		elseif(isset($_REQUEST['campaignid']) && $_REQUEST['campaignid'] != '')
+		{
+			if($_REQUEST['module'] == 'Campaigns' && $fieldname = 'campaignid')
+			{
+				$campaign_name = '';
+			}
+			else
+			{
+				$value = $_REQUEST['campaignid'];
+				$campaign_name = getCampaignName($value);
+			}
+
+		}
+		$editview_label[]=$mod_strings[$fieldlabel];
+		$fieldvalue[]=$campaign_name;
+		$fieldvalue[] = $value;
+	}
+	
 	elseif($uitype == 61)
 	{
 		global $current_user;




From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 11:29:32 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 15:29:32 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231141=3A?=
 =?utf-8?q?_mandatory_shown_but_not_so?=
In-Reply-To: <076.02fcc522483405a938931a6090a37b4c@vtiger.fosslabs.com>
References: <076.02fcc522483405a938931a6090a37b4c@vtiger.fosslabs.com>
Message-ID: <085.2cc963bec46838f6a3f85ae4088c0b7c@vtiger.fosslabs.com>

#1141: mandatory shown but not so
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  mickie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:  PO    
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1141>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 11:31:25 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 15:31:25 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7144 -
	/vtigercrm/trunk/include/utils/DetailViewUtils.php
Message-ID: <20060615153125.EB26A7ED25D@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 15 09:31:22 2006
New Revision: 7144

Log:
changes made to get CampaignName 

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 Thu Jun 15 09:31:22 2006
@@ -318,6 +318,19 @@
 		$label_fld["secid"] = $contact_id;
 		$label_fld["link"] = "index.php?module=Contacts&action=DetailView&record=".$contact_id; 
         }
+	elseif($uitype == 58)
+	{
+		$label_fld[] =$mod_strings[$fieldlabel];
+		$campaign_id = $col_fields[$fieldname];
+		if($campaign_id != '')
+		{
+			$campaign_name = getCampaignName($campaign_id);
+		}
+		$label_fld[] = $campaign_name;
+		$label_fld["secid"] = $campaign_id;
+		$label_fld["link"] = "index.php?module=Campaigns&action=DetailView&record=".$campaign_id;
+
+	}
 	elseif($uitype == 59)
 	{
 		$label_fld[] =$mod_strings[$fieldlabel];




From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 11:32:08 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 15:32:08 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231145=3A?=
 =?utf-8?q?_in_edit_view_of_inventory=2C_the_right_hand_side_options_are_h?=
 =?utf-8?q?ardcoded?=
In-Reply-To: <076.0e62778b6100dd068d2df9182121005c@vtiger.fosslabs.com>
References: <076.0e62778b6100dd068d2df9182121005c@vtiger.fosslabs.com>
Message-ID: <085.92041fcfeff5c3c40d7181caddca2312@vtiger.fosslabs.com>

#1145: in edit view of inventory, the right hand side options are hardcoded
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  mickie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1145>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 11:32:15 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 15:32:15 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231324=3A?=
	=?utf-8?q?_Fatal_error_orders=3Csales?=
Message-ID: <076.020fb265047737595a1c038934006563@vtiger.fosslabs.com>

#1324: Fatal error orders<sales
-----------------------------------------+----------------------------------
 Reporter:  sansnailmail (at) xs4all.nl  |       Owner:  developer
     Type:  defect                       |      Status:  new      
 Priority:  major                        |   Milestone:           
Component:  vtigercrm                    |     Version:  4.2.4rc3 
 Keywords:                               |  
-----------------------------------------+----------------------------------
 This bug is related to ticket #1281: After applying Changeset 6964
 (utils.php) the quote problem is solved (thanks!)

 New problem: After converting the (now visible) quote to a sales order
 with the "Create  Salesorder" button, the sales order appears fine in the
 edit view of sales. However, when i click Orders<Sales there is a fatal
 error code, the same as in #1281:
 ----
 Fatal error: Call to a member function on a non-object in
 /Library/WebServer/Documents/include/database/PearDatabase.php on line 440
 ----


 mysql 4.0.20
 apache 1.3
 php 4.?

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1324>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 11:13:14 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 15:13:14 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231081=3A?=
 =?utf-8?q?_Yahoo_ID_at_mails_from_contacts?=
In-Reply-To: <076.559e47f8ca8be49e3698d4378d040b16@vtiger.fosslabs.com>
References: <076.559e47f8ca8be49e3698d4378d040b16@vtiger.fosslabs.com>
Message-ID: <085.86b12f7879ef49338eb0fc33d3441406@vtiger.fosslabs.com>

#1081: Yahoo ID at mails from contacts
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  ahmed
      Type:  defect     |      Status:  new  
  Priority:  major      |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => ahmed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1081>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 11:09:56 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 15:09:56 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231073=3A?=
 =?utf-8?q?_Inventory_=3E_Vendors_=3E_Products?=
In-Reply-To: <076.6756be513a6a47a241a70293fa5e1bbe@vtiger.fosslabs.com>
References: <076.6756be513a6a47a241a70293fa5e1bbe@vtiger.fosslabs.com>
Message-ID: <085.71a496dcedaf72fa74b458347c4c228e@vtiger.fosslabs.com>

#1073: Inventory > Vendors > Products
--------------------------+-------------------------------------------------
  Reporter:  anonymous    |       Owner:  mickie
      Type:  enhancement  |      Status:  new   
  Priority:  major        |   Milestone:        
 Component:  vtigercrm    |     Version:  5.0.0 
Resolution:               |    Keywords:        
--------------------------+-------------------------------------------------
Changes (by saraj):

  * owner:  jerrydgeorge => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1073>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 11:10:56 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 15:10:56 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231299=3A?=
 =?utf-8?q?_MySQL_version_5=2E0=2E22_is_not_supported=2C_kindly_connect_to?=
 =?utf-8?q?_MySQL_4=2E1=2Ex_or_above?=
In-Reply-To: <076.bb406000b4b59efeb8cc8221dd00f6f4@vtiger.fosslabs.com>
References: <076.bb406000b4b59efeb8cc8221dd00f6f4@vtiger.fosslabs.com>
Message-ID: <085.3dfda9c4deabf66ec6600a807c9a673e@vtiger.fosslabs.com>

#1299: MySQL version 5.0.22 is not supported, kindly connect to MySQL 4.1.x or
above
------------------------+---------------------------------------------------
  Reporter:  fh         |       Owner:  developer
      Type:  defect     |      Status:  closed   
  Priority:  major      |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:  fixed      |    Keywords:  Bug      
------------------------+---------------------------------------------------
Comment (by jerrydgeorge):

 Check made for version less than 4.1

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1299>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 11:36:31 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 15:36:31 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231146=3A?=
 =?utf-8?q?_PriceBook_Popup_screen_too_big?=
In-Reply-To: <076.30e2595c2b37b1575bee462504899f2f@vtiger.fosslabs.com>
References: <076.30e2595c2b37b1575bee462504899f2f@vtiger.fosslabs.com>
Message-ID: <085.fe028f938eb410150ffe1a95b6029f9d@vtiger.fosslabs.com>

#1146: PriceBook Popup screen too big
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  developer
      Type:  defect     |      Status:  closed   
  Priority:  major      |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:  wontfix    |    Keywords:           
------------------------+---------------------------------------------------
Changes (by saraj):

  * resolution:  => wontfix
  * status:  new => closed

Comment:

 Since we need to get more information while adding product to a price
 book, we are showing a new page instead of popup.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1146>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 11:37:11 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 15:37:11 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7145 -
	/vtigercrm/trunk/Smarty/templates/DisplayFields.tpl
Message-ID: <20060615153711.AF8417ED23B@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 15 09:37:07 2006
New Revision: 7145

Log:
changes made to get CampaignName 

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

Modified: vtigercrm/trunk/Smarty/templates/DisplayFields.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DisplayFields.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DisplayFields.tpl Thu Jun 15 09:37:07 2006
@@ -224,6 +224,14 @@
 			</td>
 			<td width="30%" align=left class="dvtCellInfo">
 				<input name="contact_name" readonly type="text" style="border:1px solid #bababa;" value="{$fldvalue}"><input name="{$fldname}" type="hidden" value="{$secondvalue}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Contacts&action=Popup&html=Popup_picker&popuptype=specific&form=EditView","test","width=640,height=565,resizable=0,scrollbars=0");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.contact_id.value=''; this.form.contact_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
+			</td>
+		
+		{elseif $uitype eq 58}
+			<td width="20%" class="dvtCellLabel" align=right>
+				{$fldlabel}
+			</td>
+			<td width="30%" align=left class="dvtCellInfo">
+				<input name="campaignname" readonly type="text" style="border:1px solid #bababa;" value="{$fldvalue}"><input name="{$fldname}" type="hidden" value="{$secondvalue}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Campaigns&action=Popup&html=Popup_picker&popuptype=specific_campaign&form=EditView","test","width=640,height=565,resizable=0,scrollbars=0");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.campaignid.value=''; this.form.campaignname.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
 			</td>
 
 		{elseif $uitype eq 80}




From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 11:38:00 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 15:38:00 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231147=3A?=
 =?utf-8?q?_Vendor_Popup_screen_too_big?=
In-Reply-To: <076.0794d0812b807cd905b48ff6aa59084a@vtiger.fosslabs.com>
References: <076.0794d0812b807cd905b48ff6aa59084a@vtiger.fosslabs.com>
Message-ID: <085.9751df0958538cf9af710f5771b80892@vtiger.fosslabs.com>

#1147: Vendor Popup screen too big
------------------------+---------------------------------------------------
  Reporter:  richie     |       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

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1147>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 11:42:44 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 15:42:44 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231148=3A?=
 =?utf-8?q?_category_not_drop_down_in_pricebook_creation?=
In-Reply-To: <076.e7a68cf911647e37fc94092599e028b4@vtiger.fosslabs.com>
References: <076.e7a68cf911647e37fc94092599e028b4@vtiger.fosslabs.com>
Message-ID: <085.e4f812a500691b35463a4bb01e3a3379@vtiger.fosslabs.com>

#1148: category not drop down in pricebook creation
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  developer
      Type:  defect     |      Status:  closed   
  Priority:  major      |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:  invalid    |    Keywords:           
------------------------+---------------------------------------------------
Changes (by saraj):

  * resolution:  => invalid
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1148>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 11:46:31 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 15:46:31 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231150=3A?=
 =?utf-8?q?_related_list_not_gettng_populated?=
In-Reply-To: <076.4e1f98aeb67bc6258cc11f40272f4eef@vtiger.fosslabs.com>
References: <076.4e1f98aeb67bc6258cc11f40272f4eef@vtiger.fosslabs.com>
Message-ID: <085.ab72886fd66fb749a2d02497cec5dede@vtiger.fosslabs.com>

#1150: related list not gettng populated
------------------------+---------------------------------------------------
  Reporter:  richie     |       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

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1150>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 11:47:28 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 15:47:28 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231152=3A?=
 =?utf-8?q?_cannot_go_to_different_months/years__from_popup_calendar?=
In-Reply-To: <076.305f67d0510043ae0fbe7bd653f4aa48@vtiger.fosslabs.com>
References: <076.305f67d0510043ae0fbe7bd653f4aa48@vtiger.fosslabs.com>
Message-ID: <085.3f54778fa4edc57548236900becaba20@vtiger.fosslabs.com>

#1152: cannot go to different months/years  from popup calendar
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  mangai
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => mangai

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1152>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 11:49:05 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 15:49:05 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231156=3A?=
 =?utf-8?q?_can_create_invoice_without_specifying_product_quantity?=
In-Reply-To: <076.92edb3c9cf4881a366e5a914f7e21365@vtiger.fosslabs.com>
References: <076.92edb3c9cf4881a366e5a914f7e21365@vtiger.fosslabs.com>
Message-ID: <085.25d1a6449d2c9c878eaf7d731a240dca@vtiger.fosslabs.com>

#1156: can create invoice without specifying product quantity
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  mickie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1156>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 11:51:51 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 15:51:51 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231160=3A?=
 =?utf-8?q?_Improper_Navigation_links?=
In-Reply-To: <076.04585a3838305ae5eda12ac53ec9b7cd@vtiger.fosslabs.com>
References: <076.04585a3838305ae5eda12ac53ec9b7cd@vtiger.fosslabs.com>
Message-ID: <085.344801405fb5e227e47b2d496d84a892@vtiger.fosslabs.com>

#1160: Improper Navigation links
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  developer
      Type:  defect     |      Status:  new      
  Priority:  major      |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.1    
Resolution:             |    Keywords:           
------------------------+---------------------------------------------------
Changes (by saraj):

  * version:  5.0.0 => 5.0.1

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1160>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 11:25:32 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 15:25:32 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231132=3A?=
 =?utf-8?q?_creation_of_related_entities_ought_to_be_ajaxified?=
In-Reply-To: <076.343f75f8c959bb0da4c9f8e348afe0b2@vtiger.fosslabs.com>
References: <076.343f75f8c959bb0da4c9f8e348afe0b2@vtiger.fosslabs.com>
Message-ID: <085.ab7ad26676e28d30a951655a90c5001c@vtiger.fosslabs.com>

#1132: creation of related entities ought to be ajaxified
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  jerrydgeorge
      Type:  defect     |      Status:  new         
  Priority:  major      |   Milestone:              
 Component:  vtigercrm  |     Version:  5.0.1       
Resolution:             |    Keywords:  performance 
------------------------+---------------------------------------------------
Changes (by saraj):

  * version:  5.0.0 => 5.0.1
  * owner:  developer => jerrydgeorge

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1132>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 11:28:27 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 15:28:27 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231134=3A?=
 =?utf-8?q?_unable_to_change_state_of_purchase_order_using_ajax_feature?=
In-Reply-To: <076.6b6e1bdd6d4cf54f7a2bce3761f03794@vtiger.fosslabs.com>
References: <076.6b6e1bdd6d4cf54f7a2bce3761f03794@vtiger.fosslabs.com>
Message-ID: <085.a0d55d27a61f8b46e569a98eea2db7e1@vtiger.fosslabs.com>

#1134: unable to change state of purchase order using ajax feature
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  jerrydgeorge
      Type:  defect     |      Status:  new         
  Priority:  major      |   Milestone:              
 Component:  vtigercrm  |     Version:  5.0.0       
Resolution:             |    Keywords:              
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => jerrydgeorge

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1134>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 11:22:22 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 15:22:22 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231112=3A?=
 =?utf-8?q?_copy_shipping_to_billing_and_vice-versa_not_supported?=
In-Reply-To: <076.7b8b2189052f43a7391dbcc8289cc21c@vtiger.fosslabs.com>
References: <076.7b8b2189052f43a7391dbcc8289cc21c@vtiger.fosslabs.com>
Message-ID: <085.d6002a226c1e31090665c563a33d8ef1@vtiger.fosslabs.com>

#1112: copy shipping to billing and vice-versa not supported
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  mangai       
      Type:  defect     |      Status:  new          
  Priority:  major      |   Milestone:               
 Component:  vtigercrm  |     Version:  5.0.0        
Resolution:             |    Keywords:  product,quote
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => mangai

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1112>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 11:53:17 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 15:53:17 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231162=3A?=
 =?utf-8?q?_navigation_issue_from_Calendar?=
In-Reply-To: <076.be19fd30fd8c810bee45f8361c2c8b04@vtiger.fosslabs.com>
References: <076.be19fd30fd8c810bee45f8361c2c8b04@vtiger.fosslabs.com>
Message-ID: <085.7f221a0b6e34397a346eeb0d54114f5c@vtiger.fosslabs.com>

#1162: navigation issue from Calendar
------------------------+---------------------------------------------------
  Reporter:  richie     |       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

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1162>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 11:54:45 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 15:54:45 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7147 -
	/vtigercrm/trunk/include/js/Inventory.js
Message-ID: <20060615155445.464D67ED255@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 15 09:54:41 2006
New Revision: 7147

Log:
* Added validation for Tax and Adjustment where as previously if we give empty or alphabetic value then the total comes as Nan. now this will occur

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

Modified: vtigercrm/trunk/include/js/Inventory.js
==============================================================================
--- vtigercrm/trunk/include/js/Inventory.js (original)
+++ vtigercrm/trunk/include/js/Inventory.js Thu Jun 15 09:54:41 2006
@@ -285,15 +285,22 @@
 }
 
 function calcGrandTotal() {
-	var subTotal=0,grandTotal=0;
+	var subTotal=0, grandTotal=0, txtTaxVal = 0, txtAdjVal = 0;
+
 	for (var i=1;i<=rowCnt;i++) {
 		if (getObj("hdnTotal"+i).value=="") 
 			getObj("hdnTotal"+i).value=0
 		if (!isNaN(getObj("hdnTotal"+i).value)) 
 			subTotal+=parseFloat(getObj("hdnTotal"+i).value)
 	}
-	
-	grandTotal=subTotal+parseFloat(getObj("txtTax").value)+parseFloat(getObj("txtAdjustment").value)
+
+	//Tax and Adjustment values will be taken when they are valid integer or decimal values
+	if(/^-?(0|[1-9]{1}\d{0,})(\.(\d{1}\d{0,}))?$/.test(document.getElementById("txtTax").value))
+		txtTaxVal = parseFloat(getObj("txtTax").value);	
+	if(/^-?(0|[1-9]{1}\d{0,})(\.(\d{1}\d{0,}))?$/.test(document.getElementById("txtAdjustment").value))
+		txtAdjVal = parseFloat(getObj("txtAdjustment").value);
+
+	grandTotal=subTotal+txtTaxVal+txtAdjVal
 	
 	getObj("subTotal").value=getObj("hdnSubTotal").value=roundValue(subTotal.toString())
 	getObj("grandTotal").value=getObj("hdnGrandTotal").value=roundValue(grandTotal.toString())




From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 11:56:20 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 15:56:20 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231163=3A?=
 =?utf-8?q?_unable_to_save_Ajaxified_Terms_and_Conditions_field_in_Invoice?=
In-Reply-To: <076.81406a0d124351606d1fccac357d6e5d@vtiger.fosslabs.com>
References: <076.81406a0d124351606d1fccac357d6e5d@vtiger.fosslabs.com>
Message-ID: <085.f927be864b55207e7e9542f111ce6163@vtiger.fosslabs.com>

#1163: unable to save Ajaxified Terms and Conditions field in Invoice
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  jerrydgeorge
      Type:  defect     |      Status:  new         
  Priority:  major      |   Milestone:              
 Component:  vtigercrm  |     Version:  5.0.0       
Resolution:             |    Keywords:              
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => jerrydgeorge

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1163>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 11:56:55 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 15:56:55 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231164=3A?=
 =?utf-8?q?_unable_to_save_Ajaxified_Description_field_in_Invoice?=
In-Reply-To: <076.b0bc283a60909e304007e4b26726e2ef@vtiger.fosslabs.com>
References: <076.b0bc283a60909e304007e4b26726e2ef@vtiger.fosslabs.com>
Message-ID: <085.486f64c30c3bccafbe208c0dcee327ce@vtiger.fosslabs.com>

#1164: unable to save Ajaxified Description field in Invoice
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  jerrydgeorge
      Type:  defect     |      Status:  new         
  Priority:  major      |   Milestone:              
 Component:  vtigercrm  |     Version:  5.0.0       
Resolution:             |    Keywords:              
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => jerrydgeorge

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1164>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 11:58:55 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 15:58:55 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231167=3A?=
 =?utf-8?q?_able_to_store_negative_value_in_stock_while_creation_of_invoic?=
 =?utf-8?q?e?=
In-Reply-To: <076.90681771b7b03afd5ee26a72d90bd95f@vtiger.fosslabs.com>
References: <076.90681771b7b03afd5ee26a72d90bd95f@vtiger.fosslabs.com>
Message-ID: <085.8f9a28fe4e7c4fb7f3af9e24ff26f3c7@vtiger.fosslabs.com>

#1167: able to store negative value in stock while creation of invoice
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  developer
      Type:  defect     |      Status:  closed   
  Priority:  major      |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:  wontfix    |    Keywords:           
------------------------+---------------------------------------------------
Changes (by saraj):

  * resolution:  => wontfix
  * status:  new => closed

Comment:

 Expected behaviour.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1167>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 12:02:33 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 16:02:33 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231169=3A?=
 =?utf-8?q?_unable_to_relate_Quote_to_SalesOrder?=
In-Reply-To: <076.bec9bdcd41de51d9a21b66c7a45dbe9a@vtiger.fosslabs.com>
References: <076.bec9bdcd41de51d9a21b66c7a45dbe9a@vtiger.fosslabs.com>
Message-ID: <085.35d0bcb74fa1306664ed68948d3d65fe@vtiger.fosslabs.com>

#1169: unable to relate Quote to SalesOrder
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  mickie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1169>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 12:03:27 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 16:03:27 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231172=3A?=
 =?utf-8?q?_unable_to_store_any_Ajax_edited_value?=
In-Reply-To: <076.626fce50467ea4fac0273a3fb6aad256@vtiger.fosslabs.com>
References: <076.626fce50467ea4fac0273a3fb6aad256@vtiger.fosslabs.com>
Message-ID: <085.48cdd772bec3d2bb096aaa30d5c60b35@vtiger.fosslabs.com>

#1172: unable to store any Ajax edited value
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  jerrydgeorge
      Type:  defect     |      Status:  new         
  Priority:  major      |   Milestone:              
 Component:  vtigercrm  |     Version:  5.0.0       
Resolution:             |    Keywords:              
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => jerrydgeorge

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1172>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 12:05:21 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 16:05:21 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231173=3A?=
	=?utf-8?q?_unable_to_veiw_pdf?=
In-Reply-To: <076.2f691fd08704f9500476c37cc5e5685c@vtiger.fosslabs.com>
References: <076.2f691fd08704f9500476c37cc5e5685c@vtiger.fosslabs.com>
Message-ID: <085.a8c3834b3a803308aa36ada83b505a8f@vtiger.fosslabs.com>

#1173: unable to veiw pdf
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  jerrydgeorge
      Type:  defect     |      Status:  new         
  Priority:  major      |   Milestone:              
 Component:  vtigercrm  |     Version:  5.0.0       
Resolution:             |    Keywords:              
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => jerrydgeorge

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1173>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 12:05:42 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 16:05:42 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231174=3A?=
 =?utf-8?q?_unable_to_change_months/years_from_mini-calendar?=
In-Reply-To: <076.2ef668b0f99e11dc546be8a077110184@vtiger.fosslabs.com>
References: <076.2ef668b0f99e11dc546be8a077110184@vtiger.fosslabs.com>
Message-ID: <085.e3f3ac927d7c0332655588594a7640af@vtiger.fosslabs.com>

#1174: unable to change months/years from mini-calendar
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  mangai
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => mangai

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1174>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 12:05:47 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 16:05:47 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23748=3A_?=
 =?utf-8?q?Eliminate_php_notice_errors?=
In-Reply-To: <076.c75696aed703c24c8b151bd87264b9e6@vtiger.fosslabs.com>
References: <076.c75696aed703c24c8b151bd87264b9e6@vtiger.fosslabs.com>
Message-ID: <085.a413b215a284f9f1e3b2ab8c8c622653@vtiger.fosslabs.com>

#748: Eliminate php notice errors
------------------------+---------------------------------------------------
  Reporter:  allanbush  |       Owner:  jrydbeck
      Type:  task       |      Status:  new     
  Priority:  minor      |   Milestone:  4.2.5   
 Component:  vtigercrm  |     Version:  4.2.4rc3
Resolution:             |    Keywords:          
------------------------+---------------------------------------------------
Changes (by jrydbeck):

  * owner:  developer => jrydbeck

Comment:

 Taking this over for cleanup in the 4.2.4 codebase, ideally for release as
 4.2.4.1 or 4.2.5.  This will be an ongoing effort so anyone with
 contributions please dive in.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/748>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 12:06:00 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 16:06:00 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231175=3A?=
 =?utf-8?q?_add_products_to_pricebook_UI_is_old?=
In-Reply-To: <076.88a213b6789fd810420b69633d85a7ad@vtiger.fosslabs.com>
References: <076.88a213b6789fd810420b69633d85a7ad@vtiger.fosslabs.com>
Message-ID: <085.0ef14b00fd1372d700baff54025d3595@vtiger.fosslabs.com>

#1175: add products to pricebook UI is old
------------------------+---------------------------------------------------
  Reporter:  richie     |       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

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1175>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 12:08:28 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 16:08:28 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7148 - in
 /vtigercrm/branches/4.2: include/ListView/ListView.php include/utils.php
 install/2setConfig.php modules/Contacts/ListView.php
 modules/CustomView/CustomView.php themes/blue/header.php
Message-ID: <20060615160829.378767ED265@vtiger.fosslabs.com>

Author: jrydbeck
Date: Thu Jun 15 10:08:20 2006
New Revision: 7148

Log:
Begin fixing variable undefined errors for bug #748.  This is an ongoing effort so fixes will be incremental.

Modified:
    vtigercrm/branches/4.2/include/ListView/ListView.php
    vtigercrm/branches/4.2/include/utils.php
    vtigercrm/branches/4.2/install/2setConfig.php
    vtigercrm/branches/4.2/modules/Contacts/ListView.php
    vtigercrm/branches/4.2/modules/CustomView/CustomView.php
    vtigercrm/branches/4.2/themes/blue/header.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 Jun 15 10:08:20 2006
@@ -597,20 +597,20 @@
 		break;
 }
 
-session_start();
+//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]"];
+} elseif (isset($_SESSION['ListViewOrder']) && $_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]"];
+		        $_SESSION['ListViewOrder[$currentModule_name][1]'] = $sorder;
+} elseif (isset($_SESSION['ListViewOrder']) && $_SESSION['ListViewOrder[$currentModule_name][1]'] != '') {
+	        $sorder = $_SESSION['ListViewOrder[$currentModule_name][1]'];
 }
 
 

Modified: vtigercrm/branches/4.2/include/utils.php
==============================================================================
--- vtigercrm/branches/4.2/include/utils.php (original)
+++ vtigercrm/branches/4.2/include/utils.php Thu Jun 15 10:08:20 2006
@@ -4160,28 +4160,51 @@
 //parameter $viewid added for customview 27/5
 function AlphabeticalSearch($module,$action,$fieldname,$query,$type,$popuptype='',$recordid='',$return_module='',$append_url='',$viewid='')
 {
-  /* for access to alphabetical_search values stored in /include/$lang.language.php */
-  global $app_list_strings;
+	/* for access to alphabetical_search values stored in /include/$lang.language.php */
+	global $app_list_strings;
   
 	if($type=='advanced')
-		$flag='&advanced=true';
+	{
+		$flag = '&advanced=true';
+	}
+	else
+	{
+		$flag = '';
+	}
 
 	if($popuptype != '')
-		$popuptypevalue = "&popuptype=".$popuptype;
-
-        if($recordid != '')
-                $returnvalue = '&recordid='.$recordid;
-        if($return_module != '')
-                $returnvalue .= '&return_module='.$return_module;
+	{
+		$popuptypevalue = '&popuptype='.$popuptype;
+	}
+	else
+	{
+		$popuptypevalue = '';
+	}
+
+    if($return_module != '')
+    {
+    	$returnvalue .= '&return_module='.$return_module;
+    }
+    elseif($recordid != '')
+    {
+    	$returnvalue = '&recordid='.$recordid;
+    }
+    else
+    {
+    	$returnvalue = '';
+    }
+    
 	// gettin' values
 	$alphabetical_search_values = & $app_list_strings['alphabetical_search_values'];
 	/* world alphabets has different count of letters. Plus we can add "special" (multucharacter) values in alphabetical seach bar */
-  $count = count($alphabetical_search_values);
+	$count = count($alphabetical_search_values);
   
 	// building alphabetical search bar from array values
-  for($i =0;$i<=$count;$i++)
-		$list .= '<td class="alphaBg"><a href="index.php?module='.$module.'&action='.$action.'&viewname='.$viewid.'&query='.$query.'&'.$fieldname.'='.$alphabetical_search_values[$i].$flag.$popuptypevalue.$returnvalue.$append_url.'">'.$alphabetical_search_values[$i].'</a></td>';
-
+	for($i =0;$i<$count;$i++)
+	{
+		$list = '<td class="alphaBg"><a href="index.php?module='.$module.'&action='.$action.'&viewname='.$viewid.'&query='.$query.'&'.$fieldname.'='.$alphabetical_search_values[$i].$flag.$popuptypevalue.$returnvalue.$append_url.'">'.$alphabetical_search_values[$i].'</a></td>';
+	}
+	
 	return $list;
 }
 

Modified: vtigercrm/branches/4.2/install/2setConfig.php
==============================================================================
--- vtigercrm/branches/4.2/install/2setConfig.php (original)
+++ vtigercrm/branches/4.2/install/2setConfig.php Thu Jun 15 10:08:20 2006
@@ -344,6 +344,7 @@
 	        <select class="dataInput" name="dbtype">
 		  <option value="mysql" <?php echo $dbconfig['db_type'] == 'mysql' ? 'selected' : '' ?>>MySQL</option>
 		  <option value="pgsql" <?php echo $dbconfig['db_type'] == 'pgsql' ? 'selected' : '' ?>>Postgresql</option>
+		  <option value="oci8" <?php echo $dbconfig['db_type'] == 'oci8' ? 'selected' : '' ?>>Oracle 8+</option>
 	        </select>
 	      </td>
 	    </tr>

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 Jun 15 10:08:20 2006
@@ -219,13 +219,21 @@
 	$search_form->assign("MOD", $current_module_strings);
 	$search_form->assign("APP", $app_strings);
 
-	if ($order_by !='') $search_form->assign("ORDER_BY", $order_by);
-	if ($sorder !='') $search_form->assign("SORDER", $sorder);
+	if (isset($order_by) && $order_by !='')
+	{
+		$search_form->assign("ORDER_BY", $order_by);
+	}
+	
+	if ($sorder !='')
+	{
+		$search_form->assign("SORDER", $sorder);
+	}
 	
 	$search_form->assign("VIEWID",$viewid);
-
 	$search_form->assign("JAVASCRIPT", get_clear_form_js());
-	if($order_by != '') {
+	
+	if(isset($order_by) && $order_by != '')
+	{
 		$ordby = "&order_by=".$order_by;
 	}
 	else

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 Thu Jun 15 10:08:20 2006
@@ -97,14 +97,15 @@
 	function getCustomViewCombo()
 	{
 		global $adb;
-                $tabid = getTabid($this->customviewmodule);
-                $ssql = "select customview.* from customview inner join tab on tab.name = customview.entitytype";
-                $ssql .= " where tab.tabid=".$tabid;
-		//echo $ssql;
-                $result = $adb->query($ssql);
-                while($cvrow=$adb->fetch_array($result))
-                {
-                        if($cvrow['setdefault'] == 1)
+        $tabid = getTabid($this->customviewmodule);
+        $ssql = "select customview.* from customview inner join tab on tab.name = customview.entitytype";
+        $ssql .= " where tab.tabid=".$tabid;
+        $result = $adb->query($ssql);
+        $shtml = '';
+        
+        while($cvrow=$adb->fetch_array($result))
+        {
+			if($cvrow['setdefault'] == 1)
 			{
 				$shtml .= "<option selected value=\"".$cvrow['cvid']."\">".$cvrow['viewname']."</option>";
 				$this->setdefaultviewid = $cvrow['cvid'];
@@ -113,9 +114,8 @@
 			{
 				$shtml .= "<option value=\"".$cvrow['cvid']."\">".$cvrow['viewname']."</option>";
 			}
-                }
-		//echo $shtml;
-                return $shtml;
+        }
+        return $shtml;
 	}
 	function getColumnsListbyBlock($module,$block)
         {

Modified: vtigercrm/branches/4.2/themes/blue/header.php
==============================================================================
--- vtigercrm/branches/4.2/themes/blue/header.php (original)
+++ vtigercrm/branches/4.2/themes/blue/header.php Thu Jun 15 10:08:20 2006
@@ -254,15 +254,19 @@
 
 		$xtpl->assign("RECENT_LABEL",$row['item_summary']);
 
-                if($row['module_name']=='Activities')
-                {
-                        $sql = 'select activitytype from activity where activityid = '.$row['item_id'];
-                        $activitytype = $adb->query_result($adb->query($sql),0,'activitytype');
-                        if($activitytype == 'Task')
-                                $activity_mode = '&activity_mode=Task';
-                        elseif($activitytype == 'Call' || $activitytype == 'Meeting')
-                                $activity_mode = '&activity_mode=Events';
-                }
+        if($row['module_name']=='Activities')
+        {
+                $sql = 'select activitytype from activity where activityid = '.$row['item_id'];
+                $activitytype = $adb->query_result($adb->query($sql),0,'activitytype');
+                if($activitytype == 'Task')
+                        $activity_mode = '&activity_mode=Task';
+                elseif($activitytype == 'Call' || $activitytype == 'Meeting')
+                        $activity_mode = '&activity_mode=Events';
+        }
+        else
+        {
+        	$activity_mode = null;          
+        }
 
 		$url_module = $row['module_name'];
 		$url_action = 'DetailView';




From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 11:11:55 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 15:11:55 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231078=3A?=
 =?utf-8?q?_Import_Products=2C_last_step?=
In-Reply-To: <076.057c37e4d4720839331492b5e07b914c@vtiger.fosslabs.com>
References: <076.057c37e4d4720839331492b5e07b914c@vtiger.fosslabs.com>
Message-ID: <085.b25c00416406b220a6bd2a25c5c8721c@vtiger.fosslabs.com>

#1078: Import Products, last step
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  mickie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1078>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 11:48:46 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 15:48:46 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231155=3A?=
 =?utf-8?q?_Home_page_-_not_much_informative?=
In-Reply-To: <076.df32a5a4f009111920e73e95331da209@vtiger.fosslabs.com>
References: <076.df32a5a4f009111920e73e95331da209@vtiger.fosslabs.com>
Message-ID: <085.f7856fae22e40f962a63f2818ccc736d@vtiger.fosslabs.com>

#1155: Home page - not much informative
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  developer
      Type:  defect     |      Status:  new      
  Priority:  major      |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.1    
Resolution:             |    Keywords:           
------------------------+---------------------------------------------------
Changes (by saraj):

  * version:  5.0.0 => 5.0.1

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1155>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 11:47:54 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 15:47:54 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231153=3A?=
 =?utf-8?q?_Source_Installer=3A_data_in_=22Path=22_field_disappears?=
In-Reply-To: <076.a6308f317cdefba138949240f46f1aae@vtiger.fosslabs.com>
References: <076.a6308f317cdefba138949240f46f1aae@vtiger.fosslabs.com>
Message-ID: <085.c9ed74e3b5400b4328bffe6a8d2d6148@vtiger.fosslabs.com>

#1153: Source Installer: data in "Path" field disappears
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  saraj
      Type:  defect     |      Status:  new  
  Priority:  major      |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => saraj

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1153>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 12:10:44 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 16:10:44 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231180=3A?=
 =?utf-8?q?_pricebook_related_list_shows_products_which_cannot_be_deleted_?=
 =?utf-8?q?from_related_list?=
In-Reply-To: <076.0271cde3695160584f02fe99d754d59c@vtiger.fosslabs.com>
References: <076.0271cde3695160584f02fe99d754d59c@vtiger.fosslabs.com>
Message-ID: <085.f3b86095ab96fc49dee6154944a5c8de@vtiger.fosslabs.com>

#1180: pricebook related list shows products which cannot be deleted from related
list
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  mickie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1180>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 12:11:45 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 16:11:45 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231184=3A?=
 =?utf-8?q?_system_configuration_page_needs_css_implementation?=
In-Reply-To: <076.147d86285bbc713c647806428425b67d@vtiger.fosslabs.com>
References: <076.147d86285bbc713c647806428425b67d@vtiger.fosslabs.com>
Message-ID: <085.f4c532e430aba557734bf19b3afac0ac@vtiger.fosslabs.com>

#1184: system configuration page needs css implementation
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  ela  
      Type:  defect     |      Status:  new  
  Priority:  major      |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => ela

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1184>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 12:12:09 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 16:12:09 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231186=3A?=
 =?utf-8?q?_webmails_not_working_in_linux_systems?=
In-Reply-To: <076.f90486e13eb47978a671c1ca4ead62d2@vtiger.fosslabs.com>
References: <076.f90486e13eb47978a671c1ca4ead62d2@vtiger.fosslabs.com>
Message-ID: <085.b0e06a876a6a7f629dbe4f3915fcb0a5@vtiger.fosslabs.com>

#1186: webmails not working in linux systems
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  richie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => richie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1186>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 12:13:32 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 16:13:32 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231271=3A?=
 =?utf-8?q?_Organisation_wont_save_when_containt_=27?=
In-Reply-To: <076.62b916cddc422a4f2f6a8828de68207a@vtiger.fosslabs.com>
References: <076.62b916cddc422a4f2f6a8828de68207a@vtiger.fosslabs.com>
Message-ID: <085.2470494dc9558909019a61b276f74945@vtiger.fosslabs.com>

#1271: Organisation wont save when containt '
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  allanbush          
      Type:  defect     |      Status:  closed             
  Priority:  major      |   Milestone:  5.0.0              
 Component:  vtigercrm  |     Version:  5.0.0              
Resolution:  fixed      |    Keywords:  organisation, quote
------------------------+---------------------------------------------------
Comment (by allanbush):

 Don't be sorry, without good bug reports the problems would never be
 found.  You've just help make the product better for everyone.  We should
 be thanking you.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1271>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 12:14:18 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 16:14:18 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231210=3A?=
 =?utf-8?q?_Compose_Email_-_Part_of_the_RHS_is_hidden?=
In-Reply-To: <076.53700680c5c774c5e8324a16ab813603@vtiger.fosslabs.com>
References: <076.53700680c5c774c5e8324a16ab813603@vtiger.fosslabs.com>
Message-ID: <085.ab3898121da0ccd75ee1cada46ae7331@vtiger.fosslabs.com>

#1210: Compose Email - Part of the RHS is hidden
------------------------+---------------------------------------------------
  Reporter:  gopal      |       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

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1210>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 12:18:42 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 16:18:42 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231216=3A?=
 =?utf-8?q?_Event/Meeting_-_Start_Date_Pop-up_not_working?=
In-Reply-To: <076.3f1ce92c2f0a821d660e0302d0052d6f@vtiger.fosslabs.com>
References: <076.3f1ce92c2f0a821d660e0302d0052d6f@vtiger.fosslabs.com>
Message-ID: <085.3be9c927b544e3298f4b1fe42c069ff1@vtiger.fosslabs.com>

#1216: Event/Meeting - Start Date Pop-up not working
------------------------+---------------------------------------------------
  Reporter:  gopal      |       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

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1216>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 12:22:00 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 16:22:00 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231219=3A?=
 =?utf-8?q?_from_Activities_list_view_must_have_facility_to_directly_see_i?=
 =?utf-8?q?n_Calendar=2C_Show_in_Calendar_feature?=
In-Reply-To: <076.5c77d473768220f38634c6a8fcae7177@vtiger.fosslabs.com>
References: <076.5c77d473768220f38634c6a8fcae7177@vtiger.fosslabs.com>
Message-ID: <085.657384c767ac5c3541a5a456a47c5ace@vtiger.fosslabs.com>

#1219: from Activities list view must have facility to directly see in Calendar,
Show in Calendar feature
--------------------------+-------------------------------------------------
  Reporter:  richie       |       Owner:  developer
      Type:  enhancement  |      Status:  new      
  Priority:  major        |   Milestone:           
 Component:  vtigercrm    |     Version:  5.0.1    
Resolution:               |    Keywords:           
--------------------------+-------------------------------------------------
Changes (by saraj):

  * version:  5.0.0 => 5.0.1

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1219>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 11:52:37 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 15:52:37 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7146 -
	/vtigercrm/trunk/schema/DatabaseSchema.xml
Message-ID: <20060615155238.3E5C17ED24A@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 15 09:52:32 2006
New Revision: 7146

Log:
changes made to integrate campaign relatedlist

Modified:
    vtigercrm/trunk/schema/DatabaseSchema.xml

Modified: vtigercrm/trunk/schema/DatabaseSchema.xml
==============================================================================
--- vtigercrm/trunk/schema/DatabaseSchema.xml (original)
+++ vtigercrm/trunk/schema/DatabaseSchema.xml Thu Jun 15 09:52:32 2006
@@ -671,7 +671,6 @@
 		<field name="currency" type="C" size="20" />
 		<field name="closingdate" type="D" />
 		<field name="typeofrevenue" type="C" size="50" />
-		<field name="campaignsource" type="C" size="30" />
 		<field name="nextstep" type="C" size="100" />
 		<field name="private" type="I" size="1">
 			<default value="0" />
@@ -679,6 +678,7 @@
 		<field name="probability" type="N" size="7.3">
 			<default value="0" />
 		</field>
+		<field name="campaignid" type="I" size="19" />
 		<field name="sales_stage" type="C" size="50" />
 		<field name="potentialtype" type="C" size="50" />
 		<field name="leadsource" type="C" size="50" />
@@ -1235,6 +1235,7 @@
 			<constraint>REFERENCES vtiger_campaign(campaignid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="contactid" type="I" size="19">
+			<key />
 			<notnull />
 			<default value="0"/>
 			<constraint>REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE</constraint>
@@ -1253,6 +1254,7 @@
 			<constraint>REFERENCES vtiger_campaign(campaignid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="leadid" type="I" size="19">
+			<key />
 			<notnull />
 			<default value="0" />
 			<constraint>REFERENCES vtiger_leaddetails(leadid) ON DELETE CASCADE</constraint>




From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 12:03:00 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 16:03:00 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231170=3A?=
 =?utf-8?q?_PO_related_to_SO_does_not_have_assigned_to_value?=
In-Reply-To: <076.846167eef3e3ff8046106f91876e5bb5@vtiger.fosslabs.com>
References: <076.846167eef3e3ff8046106f91876e5bb5@vtiger.fosslabs.com>
Message-ID: <085.880e80800c3d5480681863df76285257@vtiger.fosslabs.com>

#1170: PO related to SO does not have assigned to value
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  saraj
      Type:  defect     |      Status:  new  
  Priority:  major      |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => saraj

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1170>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 12:27:41 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 16:27:41 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231221=3A?=
 =?utf-8?q?_Usage_of_Sub-tabs_for_single_section?=
In-Reply-To: <076.2f323372d07ad5631728b02fb41df643@vtiger.fosslabs.com>
References: <076.2f323372d07ad5631728b02fb41df643@vtiger.fosslabs.com>
Message-ID: <085.4836c7f37641b7fccd1d30dee2714629@vtiger.fosslabs.com>

#1221: Usage of Sub-tabs for single section
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  developer
      Type:  defect     |      Status:  closed   
  Priority:  major      |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:  duplicate  |    Keywords:           
------------------------+---------------------------------------------------
Changes (by saraj):

  * resolution:  => duplicate
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1221>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 12:28:17 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 16:28:17 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231221=3A?=
 =?utf-8?q?_Usage_of_Sub-tabs_for_single_section?=
In-Reply-To: <076.2f323372d07ad5631728b02fb41df643@vtiger.fosslabs.com>
References: <076.2f323372d07ad5631728b02fb41df643@vtiger.fosslabs.com>
Message-ID: <085.390e4ff2a038f64e394541e43c70388a@vtiger.fosslabs.com>

#1221: Usage of Sub-tabs for single section
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  developer
      Type:  defect     |      Status:  reopened 
  Priority:  major      |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:             |    Keywords:           
------------------------+---------------------------------------------------
Changes (by saraj):

  * resolution:  duplicate =>
  * status:  closed => reopened

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1221>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 12:28:35 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 16:28:35 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231220=3A?=
 =?utf-8?q?_Usage_of_Sub-tabs_for_single_section?=
In-Reply-To: <076.0cb5c9c15de16babde2de07049fd9221@vtiger.fosslabs.com>
References: <076.0cb5c9c15de16babde2de07049fd9221@vtiger.fosslabs.com>
Message-ID: <085.bd6263906ed708a977a5db30178516a0@vtiger.fosslabs.com>

#1220: Usage of Sub-tabs for single section
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  saraj 
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  duplicate  |    Keywords:        
------------------------+---------------------------------------------------
Changes (by saraj):

  * resolution:  => duplicate
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1220>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 12:32:22 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 16:32:22 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231227=3A?=
 =?utf-8?q?_ListView_of_Events/Tasks_accessible_only_from_Calendar?=
In-Reply-To: <076.fdf1e38f077c44a77d796a91336823d8@vtiger.fosslabs.com>
References: <076.fdf1e38f077c44a77d796a91336823d8@vtiger.fosslabs.com>
Message-ID: <085.09628d77dcc4b18f8c7f46458f66b7bd@vtiger.fosslabs.com>

#1227: ListView of Events/Tasks accessible only from Calendar
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  developer
      Type:  defect     |      Status:  closed   
  Priority:  major      |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:  invalid    |    Keywords:           
------------------------+---------------------------------------------------
Changes (by saraj):

  * resolution:  => invalid
  * status:  new => closed

Comment:

 It is also be access from Activities ListView.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1227>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 12:35:28 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 16:35:28 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231228=3A?=
 =?utf-8?q?_AddEvent_mouseover_persists_for_long?=
In-Reply-To: <076.8a08c7ad8c090a6fc574e4ebe19bc6b1@vtiger.fosslabs.com>
References: <076.8a08c7ad8c090a6fc574e4ebe19bc6b1@vtiger.fosslabs.com>
Message-ID: <085.7baf9782017d7c99853f6a450d9276d2@vtiger.fosslabs.com>

#1228: AddEvent mouseover persists for long
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  ela  
      Type:  defect     |      Status:  new  
  Priority:  major      |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1228>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 12:37:51 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 16:37:51 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231240=3A?=
 =?utf-8?q?_Office_Plugin_-_Change_Splash_screen?=
In-Reply-To: <076.25c934e0f37ff93790a99a1672638afb@vtiger.fosslabs.com>
References: <076.25c934e0f37ff93790a99a1672638afb@vtiger.fosslabs.com>
Message-ID: <085.332aba67358d9a6b057c648cd5ca5a40@vtiger.fosslabs.com>

#1240: Office Plugin - Change Splash screen
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  jerrydgeorge
      Type:  defect     |      Status:  new         
  Priority:  major      |   Milestone:              
 Component:  vtigercrm  |     Version:  5.0.0       
Resolution:             |    Keywords:              
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => jerrydgeorge

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1240>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 12:39:34 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 16:39:34 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231242=3A?=
 =?utf-8?q?_Activities_history_is_missing_in_Product_relatedlist?=
In-Reply-To: <076.4b9590790acecb205e8103ff0f8ca3a2@vtiger.fosslabs.com>
References: <076.4b9590790acecb205e8103ff0f8ca3a2@vtiger.fosslabs.com>
Message-ID: <085.e33e2d99d3db7e54e586b743fe718648@vtiger.fosslabs.com>

#1242: Activities history is missing in Product relatedlist
--------------------------+-------------------------------------------------
  Reporter:  mickie       |       Owner:  saraj
      Type:  enhancement  |      Status:  new  
  Priority:  major        |   Milestone:       
 Component:  vtigercrm    |     Version:  5.0.1
Resolution:               |    Keywords:       
--------------------------+-------------------------------------------------
Changes (by saraj):

  * version:  5.0.0 => 5.0.1
  * owner:  developer => saraj

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1242>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 12:40:14 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 16:40:14 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231244=3A?=
 =?utf-8?q?_Support_=3E_HelpDesk_-_Ticket_Comments?=
In-Reply-To: <076.37c737bcf82ff17f40eb1ca85dac14f6@vtiger.fosslabs.com>
References: <076.37c737bcf82ff17f40eb1ca85dac14f6@vtiger.fosslabs.com>
Message-ID: <085.7fb1dd8b3e480dc363a982e99e905d7c@vtiger.fosslabs.com>

#1244: Support > HelpDesk - Ticket Comments
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  mickie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1244>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 12:21:16 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 16:21:16 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231218=3A?=
 =?utf-8?q?_CSS_not_applied_properly_in_Event_Creation_page?=
In-Reply-To: <076.44fb062ecefa40ef28af880bc5b9aae0@vtiger.fosslabs.com>
References: <076.44fb062ecefa40ef28af880bc5b9aae0@vtiger.fosslabs.com>
Message-ID: <085.1e06d1076ba26705b178902afb8643f8@vtiger.fosslabs.com>

#1218: CSS not applied properly in Event Creation page
------------------------+---------------------------------------------------
  Reporter:  gopal      |       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

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1218>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 12:43:41 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 16:43:41 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231246=3A?=
 =?utf-8?q?_email_not_displayed_in_contact_related_list?=
In-Reply-To: <076.bb51c9882ca3da9b29e43b10d6709695@vtiger.fosslabs.com>
References: <076.bb51c9882ca3da9b29e43b10d6709695@vtiger.fosslabs.com>
Message-ID: <085.f87569cddaeef7190cd6e946d95e0a22@vtiger.fosslabs.com>

#1246: email not displayed in contact related list
------------------------+---------------------------------------------------
  Reporter:  mickie     |       Owner:  richie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => richie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1246>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 12:51:19 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 16:51:19 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231247=3A?=
 =?utf-8?q?_dashboard_not_printable?=
In-Reply-To: <076.a3fd81704060a1a7525a1879e6b6b088@vtiger.fosslabs.com>
References: <076.a3fd81704060a1a7525a1879e6b6b088@vtiger.fosslabs.com>
Message-ID: <085.8d74d4abf73a56edbd2c762e100b3b0a@vtiger.fosslabs.com>

#1247: dashboard not printable
-------------------------+--------------------------------------------------
  Reporter:  anonymous   |       Owner:  developer
      Type:  defect      |      Status:  closed   
  Priority:  major       |   Milestone:           
 Component:  vtigercrm   |     Version:  5.0.0    
Resolution:  worksforme  |    Keywords:  dashboard
-------------------------+--------------------------------------------------
Changes (by saraj):

  * resolution:  => worksforme
  * status:  new => closed

Comment:

 It works (mozilla 1.7.3 / linux mandriva)

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1247>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 15 12:51:24 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 15 Jun 2006 16:51:24 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7150 - in
 /vtigercrm/trunk/modules/Emails: Choose.php ChooseEmail.php EditView.php
 ListView.php class.phpmailer.php mailSelect.php mailbox.php mailsend.php
Message-ID: <20060615165125.26A787ED23B@vtiger.fosslabs.com>

Author: don
Date: Thu Jun 15 10:51:15 2006
New Revision: 7150

Log:
prefixed vtiger_ in all table names

Modified:
    vtigercrm/trunk/modules/Emails/Choose.php
    vtigercrm/trunk/modules/Emails/ChooseEmail.php
    vtigercrm/trunk/modules/Emails/EditView.php
    vtigercrm/trunk/modules/Emails/ListView.php
    vtigercrm/trunk/modules/Emails/class.phpmailer.php
    vtigercrm/trunk/modules/Emails/mailSelect.php
    vtigercrm/trunk/modules/Emails/mailbox.php
    vtigercrm/trunk/modules/Emails/mailsend.php

Modified: vtigercrm/trunk/modules/Emails/Choose.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/Choose.php (original)
+++ vtigercrm/trunk/modules/Emails/Choose.php Thu Jun 15 10:51:15 2006
@@ -16,15 +16,15 @@
 
 if ($pmodule=='Accounts')
 {
-	$querystr="select vtiger_fieldid,fieldlabel,columnname,tablename from vtiger_field where vtiger_tabid=6 and uitype=13;"; 
+	$querystr="select fieldid,fieldlabel,columnname,tablename from vtiger_field where tabid=6 and uitype=13;"; 
 }
 elseif ($pmodule=='Contacts')
 {
-	$querystr="select vtiger_fieldid,fieldlabel,columnname from vtiger_field where vtiger_tabid=4 and uitype=13;";
+	$querystr="select fieldid,fieldlabel,columnname from vtiger_field where tabid=4 and uitype=13;";
 }
 elseif ($pmodule=='Leads')
 {
-	$querystr="select vtiger_fieldid,fieldlabel,columnname from vtiger_field where vtiger_tabid=7 and uitype=13;";
+	$querystr="select fieldid,fieldlabel,columnname from vtiger_field where tabid=7 and uitype=13;";
 }
 
 $result=$adb->query($querystr);

Modified: vtigercrm/trunk/modules/Emails/ChooseEmail.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/ChooseEmail.php (original)
+++ vtigercrm/trunk/modules/Emails/ChooseEmail.php Thu Jun 15 10:51:15 2006
@@ -14,15 +14,15 @@
 
 if ($pmodule=='Accounts')
 {
-	$querystr="select vtiger_fieldid,fieldlabel,columnname,tablename from vtiger_field where vtiger_tabid=6 and uitype=13;"; 
+	$querystr="select fieldid,fieldlabel,columnname,tablename from vtiger_field where tabid=6 and uitype=13;"; 
 }
 elseif ($pmodule=='Contacts')
 {
-	$querystr="select vtiger_fieldid,fieldlabel,columnname from vtiger_field where vtiger_tabid=4 and uitype=13;";
+	$querystr="select fieldid,fieldlabel,columnname from vtiger_field where tabid=4 and uitype=13;";
 }
 elseif ($pmodule=='Leads')
 {
-	$querystr="select vtiger_fieldid,fieldlabel,columnname from vtiger_field where vtiger_tabid=7 and uitype=13;";
+	$querystr="select fieldid,fieldlabel,columnname from vtiger_field where tabid=7 and uitype=13;";
 }
 $result=$adb->query($querystr);
 $numrows = $adb->num_rows($result);

Modified: vtigercrm/trunk/modules/Emails/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/EditView.php (original)
+++ vtigercrm/trunk/modules/Emails/EditView.php Thu Jun 15 10:51:15 2006
@@ -96,7 +96,7 @@
 		elseif ($type == "Contacts")
 			$q = "select email as email1 from vtiger_contactdetails where contactid='".$rec_id."'";
 		elseif ($type == "Accounts")
-			$q = "select email1,email2 from vtiger_account where vtiger_accountid='".$rec_id."'";
+			$q = "select email1,email2 from vtiger_account where accountid='".$rec_id."'";
 
 		$email1 = $adb->query_result($adb->query($q),0,"email1");
 	} elseif ($rec_type == "email_addy") {
@@ -252,7 +252,7 @@
 
 if(isset($focus->parent_type) && $focus->parent_type != "") 
 {
-	$change_parent_button = "<input title='".$app_strings['LBL_CHANGE_BUTTON_TITLE']."' vtiger_tabindex='2' accessKey='".$app_strings['LBL_CHANGE_BUTTON_KEY']."' type='button' class='button' value='".$app_strings['LBL_CHANGE_BUTTON_LABEL']."' name='button' LANGUAGE=javascript onclick='return window.open(\"index.php?module=\"+ document.EditView.parent_type.value + \"&action=Popup&html=Popup_picker&form=TasksEditView\",\"test\",\"width=600,height=400,resizable=1,scrollbars=1\");'>";
+	$change_parent_button = "<input title='".$app_strings['LBL_CHANGE_BUTTON_TITLE']."' tabindex='2' accessKey='".$app_strings['LBL_CHANGE_BUTTON_KEY']."' type='button' class='button' value='".$app_strings['LBL_CHANGE_BUTTON_LABEL']."' name='button' LANGUAGE=javascript onclick='return window.open(\"index.php?module=\"+ document.EditView.parent_type.value + \"&action=Popup&html=Popup_picker&form=TasksEditView\",\"test\",\"width=600,height=400,resizable=1,scrollbars=1\");'>";
 	$smarty->assign("CHANGE_PARENT_BUTTON", $change_parent_button);
 }
 

Modified: vtigercrm/trunk/modules/Emails/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/ListView.php (original)
+++ vtigercrm/trunk/modules/Emails/ListView.php Thu Jun 15 10:51:15 2006
@@ -122,7 +122,7 @@
 }
 if($_REQUEST['folderid'] =='3')
 {
-	$list_query .= "AND vtiger_seactivityrel.crmid in (select vtiger_accountid from vtiger_account)";	
+	$list_query .= "AND vtiger_seactivityrel.crmid in (select accountid from vtiger_account)";	
 }
 if($_REQUEST['folderid'] =='4')
 {

Modified: vtigercrm/trunk/modules/Emails/class.phpmailer.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/class.phpmailer.php (original)
+++ vtigercrm/trunk/modules/Emails/class.phpmailer.php Thu Jun 15 10:51:15 2006
@@ -1089,7 +1089,7 @@
         }
         $magic_quotes = get_magic_quotes_runtime();
         set_magic_quotes_runtime(0);
-        $file_buffer = fread($fd, vtiger_filesize($path));
+        $file_buffer = fread($fd, filesize($path));
         $file_buffer = $this->EncodeString($file_buffer, $encoding);
         fclose($fd);
         set_magic_quotes_runtime($magic_quotes);
@@ -1496,4 +1496,4 @@
     }
 }
 
-?>
+?>

Modified: vtigercrm/trunk/modules/Emails/mailSelect.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/mailSelect.php (original)
+++ vtigercrm/trunk/modules/Emails/mailSelect.php Thu Jun 15 10:51:15 2006
@@ -24,15 +24,15 @@
 $smarty = new vtigerCRM_Smarty;
 if ($pmodule=='Accounts')
 {
-	$querystr="select vtiger_fieldid,fieldlabel,columnname,tablename from vtiger_field where vtiger_tabid=6 and uitype=13;"; 
+	$querystr="select fieldid,fieldlabel,columnname,tablename from vtiger_field where tabid=6 and uitype=13;"; 
 }
 elseif ($pmodule=='Contacts')
 {
-	$querystr="select vtiger_fieldid,fieldlabel,columnname from vtiger_field where vtiger_tabid=4 and uitype=13;";
+	$querystr="select fieldid,fieldlabel,columnname from vtiger_field where tabid=4 and uitype=13;";
 }
 elseif ($pmodule=='Leads')
 {
-	$querystr="select vtiger_fieldid,fieldlabel,columnname from vtiger_field where vtiger_tabid=7 and uitype=13;";
+	$querystr="select fieldid,fieldlabel,columnname from vtiger_field where tabid=7 and uitype=13;";
 }
 $result=$adb->query($querystr);
 $numrows = $adb->num_rows($result);

Modified: vtigercrm/trunk/modules/Emails/mailbox.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/mailbox.php (original)
+++ vtigercrm/trunk/modules/Emails/mailbox.php Thu Jun 15 10:51:15 2006
@@ -73,7 +73,7 @@
 	      
 	   function handleFile(nr) {
 	   	if (b != "ie") {
- 	      		alert("This feature is currently only available for Microsoft Internet Explorer 5.5+ vtiger_users\n\nWait for an update!");
+ 	      		alert("This feature is currently only available for Microsoft Internet Explorer 5.5+ users\n\nWait for an update!");
 	   	} else {
 	   		check = confirm("Do you want to download the file ?");
 			if (check) {

Modified: vtigercrm/trunk/modules/Emails/mailsend.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/mailsend.php (original)
+++ vtigercrm/trunk/modules/Emails/mailsend.php Thu Jun 15 10:51:15 2006
@@ -120,7 +120,7 @@
 		for ($j=1;$j<$nemail;$j++)
 		{
 			$temp=$realid[$j];
-			$myquery='Select columnname from vtiger_field where vtiger_fieldid='.$adb->quote($temp);
+			$myquery='Select columnname from vtiger_field where fieldid='.$adb->quote($temp);
 			$fresult=$adb->query($myquery);			
 			if ($pmodule=='Contacts')
 			{
@@ -180,7 +180,7 @@
 {
 	global $adb;
 	$date_var = date('Ymd');
-	$query = 'update vtiger_activity set date_start ='.$date_var.' where vtiger_activityid = '.$returnid;
+	$query = 'update vtiger_activity set date_start ='.$date_var.' where activityid = '.$returnid;
 	$adb->query($query);
 }
 //The following function call is used to parse and form a encoded error message and then pass to result page




From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 12:27:14 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 16:27:14 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231220=3A?=
 =?utf-8?q?_Usage_of_Sub-tabs_for_single_section?=
In-Reply-To: <076.0cb5c9c15de16babde2de07049fd9221@vtiger.fosslabs.com>
References: <076.0cb5c9c15de16babde2de07049fd9221@vtiger.fosslabs.com>
Message-ID: <085.69181a598d34a6bfba6a94e22ca22524@vtiger.fosslabs.com>

#1220: Usage of Sub-tabs for single section
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  saraj
      Type:  defect     |      Status:  new  
  Priority:  major      |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => saraj

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1220>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 12:35:46 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 16:35:46 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231229=3A?=
 =?utf-8?q?_LHS_panel_missing_for_System_Information=2E?=
In-Reply-To: <076.9948487d1aec14088b1363d9ae418188@vtiger.fosslabs.com>
References: <076.9948487d1aec14088b1363d9ae418188@vtiger.fosslabs.com>
Message-ID: <085.b48de2862ab17c9c821760f561a5bf19@vtiger.fosslabs.com>

#1229: LHS panel missing for System Information.
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  saraj
      Type:  defect     |      Status:  new  
  Priority:  major      |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => saraj

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1229>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 12:36:44 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 16:36:44 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231230=3A?=
 =?utf-8?q?_need_to_have_user_related_list?=
In-Reply-To: <076.425eb57365ab50184f38cc4f63b6a400@vtiger.fosslabs.com>
References: <076.425eb57365ab50184f38cc4f63b6a400@vtiger.fosslabs.com>
Message-ID: <085.c4162eb820dfb9cfaa8a7f4196753465@vtiger.fosslabs.com>

#1230: need to have user related list
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  developer
      Type:  defect     |      Status:  new      
  Priority:  major      |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.1    
Resolution:             |    Keywords:           
------------------------+---------------------------------------------------
Changes (by saraj):

  * version:  5.0.0 => 5.0.1

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1230>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 13:13:35 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 17:13:35 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231248=3A?=
	=?utf-8?q?_Invoice_/_SO_/_PO?=
In-Reply-To: <076.e4d8f1e341c634b1bfe89089253ec586@vtiger.fosslabs.com>
References: <076.e4d8f1e341c634b1bfe89089253ec586@vtiger.fosslabs.com>
Message-ID: <085.43dc5463509e77de0b80010b71f95d50@vtiger.fosslabs.com>

#1248: Invoice / SO / PO
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  mickie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1248>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 13:14:51 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 17:14:51 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231320=3A?=
 =?utf-8?q?_Adding_Products_in_Internet_Explorer?=
In-Reply-To: <076.5033f28ff91a008f6982f96dac47c920@vtiger.fosslabs.com>
References: <076.5033f28ff91a008f6982f96dac47c920@vtiger.fosslabs.com>
Message-ID: <085.b003d018a0666c487e35d3f8d35377e5@vtiger.fosslabs.com>

#1320: Adding Products in Internet Explorer
-------------------------+--------------------------------------------------
  Reporter:  arosewarne  |       Owner:  ela  
      Type:  defect      |      Status:  new  
  Priority:  major       |   Milestone:       
 Component:  vtigercrm   |     Version:  5.0.0
Resolution:              |    Keywords:       
-------------------------+--------------------------------------------------
Changes (by don):

  * owner:  developer => ela

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1320>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 13:21:47 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 17:21:47 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231319=3A?=
 =?utf-8?q?_Thunderbird_Connector_Bugs?=
In-Reply-To: <076.6c811b9cd61da3ae39b454241d719204@vtiger.fosslabs.com>
References: <076.6c811b9cd61da3ae39b454241d719204@vtiger.fosslabs.com>
Message-ID: <085.87e642387f0888c0149872cafa104172@vtiger.fosslabs.com>

#1319: Thunderbird Connector Bugs
------------------------------+---------------------------------------------
  Reporter:  anonymous        |       Owner:  mangai
      Type:  defect           |      Status:  new   
  Priority:  major            |   Milestone:        
 Component:  thunderbirdextn  |     Version:  5.0.0 
Resolution:                   |    Keywords:        
------------------------------+---------------------------------------------
Changes (by don):

  * owner:  developer => mangai

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1319>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 13:22:49 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 17:22:49 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231318=3A?=
 =?utf-8?q?_Outlook_Connector_Bugs?=
In-Reply-To: <076.efa3e47083b3f3c62106837df2debdd5@vtiger.fosslabs.com>
References: <076.efa3e47083b3f3c62106837df2debdd5@vtiger.fosslabs.com>
Message-ID: <085.596faf898c86ffb0802eddb996375b5e@vtiger.fosslabs.com>

#1318: Outlook Connector Bugs
----------------------------+-----------------------------------------------
  Reporter:  arosewarne     |       Owner:  sraj 
      Type:  defect         |      Status:  new  
  Priority:  major          |   Milestone:       
 Component:  outlookplugin  |     Version:  5.0.0
Resolution:                 |    Keywords:       
----------------------------+-----------------------------------------------
Changes (by don):

  * owner:  developer => sraj

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1318>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 13:23:06 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 17:23:06 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231313=3A?=
	=?utf-8?q?_Pop_up_size?=
In-Reply-To: <076.d5cfe0f287242a74ba422f819314f615@vtiger.fosslabs.com>
References: <076.d5cfe0f287242a74ba422f819314f615@vtiger.fosslabs.com>
Message-ID: <085.cee740ab570de66ae0adafa2ed0791af@vtiger.fosslabs.com>

#1313: Pop up size
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  ela                  
      Type:  defect     |      Status:  new                  
  Priority:  major      |   Milestone:                       
 Component:  vtigercrm  |     Version:  5.0.0                
Resolution:             |    Keywords:  email, report, pop up
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => ela

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1313>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 13:26:22 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 17:26:22 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231249=3A?=
	=?utf-8?q?_Task_Information?=
In-Reply-To: <076.e46a01212fb9981d78bbf6e6e2673af6@vtiger.fosslabs.com>
References: <076.e46a01212fb9981d78bbf6e6e2673af6@vtiger.fosslabs.com>
Message-ID: <085.b1eacd5cd246ba293ac02458f74df04e@vtiger.fosslabs.com>

#1249: Task Information
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  saraj
      Type:  defect     |      Status:  new  
  Priority:  major      |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => saraj

Comment:

 Expected

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1249>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 13:26:42 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 17:26:42 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231253=3A?=
 =?utf-8?q?_Campaigns_Cannot_Assign_To_Existing_Contacts=2C_Leads_or_Accou?=
 =?utf-8?q?nts?=
In-Reply-To: <076.329f0bfa1e61cd49791cee91bbc8d6ba@vtiger.fosslabs.com>
References: <076.329f0bfa1e61cd49791cee91bbc8d6ba@vtiger.fosslabs.com>
Message-ID: <085.ce59151b2bce41c060ebefeafd974893@vtiger.fosslabs.com>

#1253: Campaigns Cannot Assign To Existing Contacts, Leads or Accounts
------------------------------------+---------------------------------------
  Reporter:  robbie-w at boston.ac.uk  |       Owner:  mangai
      Type:  task                   |      Status:  new   
  Priority:  major                  |   Milestone:        
 Component:  vtigercrm              |     Version:  5.0.0 
Resolution:                         |    Keywords:        
------------------------------------+---------------------------------------
Changes (by saraj):

  * owner:  developer => mangai

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1253>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 13:27:14 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 17:27:14 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231303=3A?=
 =?utf-8?q?_Invoice=2C_Sales_Orders=2C_Quotes?=
In-Reply-To: <076.3417cd31c74551f10ccb510284b2b2f8@vtiger.fosslabs.com>
References: <076.3417cd31c74551f10ccb510284b2b2f8@vtiger.fosslabs.com>
Message-ID: <085.b4b6f14e6ce0be6a42fc067437768b8b@vtiger.fosslabs.com>

#1303: Invoice, Sales Orders, Quotes
---------------------------+------------------------------------------------
  Reporter:  anthony11221  |       Owner:  mickie                   
      Type:  defect        |      Status:  new                      
  Priority:  major         |   Milestone:  5.0.0                    
 Component:  vtigercrm     |     Version:  5.0.0                    
Resolution:                |    Keywords:  invoice sales order quote
---------------------------+------------------------------------------------
Changes (by don):

  * owner:  developer => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1303>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 13:27:34 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 17:27:34 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231311=3A?=
 =?utf-8?q?_Error_on_report_module_link?=
In-Reply-To: <076.c88d9dad0e512beb782fc9feab6fceee@vtiger.fosslabs.com>
References: <076.c88d9dad0e512beb782fc9feab6fceee@vtiger.fosslabs.com>
Message-ID: <085.27ae10d8dc1e9e3be363fe8e0265e944@vtiger.fosslabs.com>

#1311: Error on report module link
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  jeri                
      Type:  defect     |      Status:  new                 
  Priority:  major      |   Milestone:                      
 Component:  vtigercrm  |     Version:  5.0.0               
Resolution:             |    Keywords:  reports, translation
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => jeri

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1311>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 13:29:23 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 17:29:23 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231255=3A?=
 =?utf-8?q?_Adding_products_to_leads=2C_contacts_or_potentials_-_should_se?=
 =?utf-8?q?lect_from_a_list_of_existing?=
In-Reply-To: <076.deb11edc283ea7cd73ede48a39d03e8e@vtiger.fosslabs.com>
References: <076.deb11edc283ea7cd73ede48a39d03e8e@vtiger.fosslabs.com>
Message-ID: <085.e895aac02174c3d7cff7412780dbb228@vtiger.fosslabs.com>

#1255: Adding products to leads, contacts or potentials - should select from a
list of existing
-------------------------+--------------------------------------------------
  Reporter:  arosewarne  |       Owner:  saraj
      Type:  defect      |      Status:  new  
  Priority:  major       |   Milestone:       
 Component:  vtigercrm   |     Version:  5.0.1
Resolution:              |    Keywords:       
-------------------------+--------------------------------------------------
Changes (by saraj):

  * version:  5.0.0 => 5.0.1
  * owner:  developer => saraj

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1255>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 13:30:40 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 17:30:40 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231258=3A?=
 =?utf-8?q?_Can=27t_create_custom_fields?=
In-Reply-To: <076.e2de34810640366206140549ecde537d@vtiger.fosslabs.com>
References: <076.e2de34810640366206140549ecde537d@vtiger.fosslabs.com>
Message-ID: <085.64755780a1ececf4113964f821544821@vtiger.fosslabs.com>

#1258: Can't create custom fields
------------------------+---------------------------------------------------
  Reporter:  nik        |       Owner:  mangai
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => mangai

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1258>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 13:31:28 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 17:31:28 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231294=3A?=
 =?utf-8?q?_Picklist_/_Custom_Fields_Error?=
In-Reply-To: <076.0f035f4d3e1919336e3dcf1142be6790@vtiger.fosslabs.com>
References: <076.0f035f4d3e1919336e3dcf1142be6790@vtiger.fosslabs.com>
Message-ID: <085.ee200880f70e021cd087c05cd0b022da@vtiger.fosslabs.com>

#1294: Picklist / Custom Fields Error
------------------------+---------------------------------------------------
  Reporter:  JHoevel    |       Owner:  mangai
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => mangai

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1294>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 13:32:36 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 17:32:36 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231293=3A?=
 =?utf-8?q?_Select_Products_missing_from_Activities_in_5=2E0?=
In-Reply-To: <076.0fa458c2ddcf4a4ee4262524258defbd@vtiger.fosslabs.com>
References: <076.0fa458c2ddcf4a4ee4262524258defbd@vtiger.fosslabs.com>
Message-ID: <085.ef1ddb0ed2167ae859669050490b76ab@vtiger.fosslabs.com>

#1293: Select Products missing from Activities in 5.0
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  ahmed
      Type:  defect     |      Status:  new  
  Priority:  major      |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => ahmed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1293>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 13:32:52 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 17:32:52 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231282=3A?=
 =?utf-8?q?_Problems_with_graphs_-_Sales_Orders_by_Account?=
In-Reply-To: <076.9cc8264925ac84b43a6a0aafbcf08aae@vtiger.fosslabs.com>
References: <076.9cc8264925ac84b43a6a0aafbcf08aae@vtiger.fosslabs.com>
Message-ID: <085.3d536bd3c47e52d99b8880f0fc3be705@vtiger.fosslabs.com>

#1282: Problems with graphs - Sales Orders by Account
-------------------------+--------------------------------------------------
  Reporter:  arosewarne  |       Owner:  mangai         
      Type:  defect      |      Status:  new            
  Priority:  major       |   Milestone:                 
 Component:  vtigercrm   |     Version:  5.0.0          
Resolution:              |    Keywords:  analytics graph
-------------------------+--------------------------------------------------
Changes (by don):

  * owner:  developer => mangai

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1282>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 13:32:49 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 17:32:49 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231260=3A?=
 =?utf-8?q?_i18n_issue_at_activities?=
In-Reply-To: <076.bf2281a02d95e6f032d828d0839694a6@vtiger.fosslabs.com>
References: <076.bf2281a02d95e6f032d828d0839694a6@vtiger.fosslabs.com>
Message-ID: <085.f479553389ff918b255a27de56ac07aa@vtiger.fosslabs.com>

#1260: i18n issue at activities
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  mangai
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by saraj):

  * owner:  developer => mangai

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1260>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 13:33:13 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 17:33:13 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231279=3A?=
 =?utf-8?q?_database_creation_error_problems_afterword?=
In-Reply-To: <076.fb2022c8962a6bd349bf1145132bfaa6@vtiger.fosslabs.com>
References: <076.fb2022c8962a6bd349bf1145132bfaa6@vtiger.fosslabs.com>
Message-ID: <085.97fc6e2b3eac50414a23e775e635db03@vtiger.fosslabs.com>

#1279: database creation error problems afterword
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  jeri 
      Type:  defect     |      Status:  new  
  Priority:  major      |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => jeri

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1279>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 13:33:33 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 17:33:33 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231277=3A?=
 =?utf-8?q?_Can=27t_translate_term_close_without_problem?=
In-Reply-To: <076.d518c5251779ede24caf171d8d809788@vtiger.fosslabs.com>
References: <076.d518c5251779ede24caf171d8d809788@vtiger.fosslabs.com>
Message-ID: <085.cccc46759238f7c12441c4856e819eea@vtiger.fosslabs.com>

#1277: Can't translate term close without problem
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  ahmed
      Type:  defect     |      Status:  new  
  Priority:  major      |   Milestone:  5.0.0
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => ahmed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1277>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 13:33:44 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 17:33:44 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231270=3A?=
 =?utf-8?q?_Picklist_editor_not_exist_for_invoices?=
In-Reply-To: <076.9bd0e7d72add51e29114ababf0f13b67@vtiger.fosslabs.com>
References: <076.9bd0e7d72add51e29114ababf0f13b67@vtiger.fosslabs.com>
Message-ID: <085.ed29814e1607c7d286ab9e82a77efe77@vtiger.fosslabs.com>

#1270: Picklist editor not exist for invoices
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  mangai            
      Type:  defect     |      Status:  new               
  Priority:  major      |   Milestone:  5.0.0             
 Component:  vtigercrm  |     Version:  5.0.0             
Resolution:             |    Keywords:  invoices, picklist
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => mangai

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1270>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 13:33:59 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 17:33:59 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231265=3A?=
 =?utf-8?q?_Global_Search_Function_throws_error?=
In-Reply-To: <076.76671c46776deb9518824e095947cbde@vtiger.fosslabs.com>
References: <076.76671c46776deb9518824e095947cbde@vtiger.fosslabs.com>
Message-ID: <085.d2ef5f6739f1cb98fbe3948c6d2352bf@vtiger.fosslabs.com>

#1265: Global Search Function throws error
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  mickie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1265>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 13:34:00 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 17:34:00 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231262=3A?=
 =?utf-8?q?_Products_not_being_listed_against_Accounts_when_Sales_Order/In?=
 =?utf-8?q?voice_created?=
In-Reply-To: <076.fd68f0c276cf51384c7c588eeaea61be@vtiger.fosslabs.com>
References: <076.fd68f0c276cf51384c7c588eeaea61be@vtiger.fosslabs.com>
Message-ID: <085.8a2543332b718d7a2d21167cdf5d2234@vtiger.fosslabs.com>

#1262: Products not being listed against Accounts when Sales Order/Invoice created
----------------------------------+-----------------------------------------
  Reporter:  thealbs at yahoo.co.uk  |       Owner:  saraj   
      Type:  defect               |      Status:  new     
  Priority:  major                |   Milestone:          
 Component:  vtigercrm            |     Version:  5.0.0   
Resolution:                       |    Keywords:  products
----------------------------------+-----------------------------------------
Changes (by saraj):

  * owner:  developer => saraj

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1262>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 13:34:28 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 17:34:28 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231264=3A?=
 =?utf-8?q?_MsSql_and_IIS_--_Please?=
In-Reply-To: <076.38e4ee7739ea23c2b97e6055bc35f7d1@vtiger.fosslabs.com>
References: <076.38e4ee7739ea23c2b97e6055bc35f7d1@vtiger.fosslabs.com>
Message-ID: <085.71a7268c7d134faa7a780277fd4896aa@vtiger.fosslabs.com>

#1264: MsSql and IIS -- Please
-------------------------------------------+--------------------------------
  Reporter:  joe.green at heartlandfarms.com  |       Owner:  developer
      Type:  defect                        |      Status:  new      
  Priority:  major                         |   Milestone:           
 Component:  vtigercrm                     |     Version:  5.0.1    
Resolution:                                |    Keywords:           
-------------------------------------------+--------------------------------
Changes (by saraj):

  * version:  5.0.0 => 5.0.1

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1264>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 13:34:56 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 17:34:56 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231269=3A?=
 =?utf-8?q?_Picklist_editing_impossible_when_customfield_created?=
In-Reply-To: <076.0ac8352198014e97e1e06ac4c87ba236@vtiger.fosslabs.com>
References: <076.0ac8352198014e97e1e06ac4c87ba236@vtiger.fosslabs.com>
Message-ID: <085.9dbf90fa6577f948acbbcbab59cc94c7@vtiger.fosslabs.com>

#1269: Picklist editing impossible when customfield created
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  mangai
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => mangai

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1269>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 13:34:57 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 17:34:57 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231265=3A?=
 =?utf-8?q?_Global_Search_Function_throws_error?=
In-Reply-To: <076.76671c46776deb9518824e095947cbde@vtiger.fosslabs.com>
References: <076.76671c46776deb9518824e095947cbde@vtiger.fosslabs.com>
Message-ID: <085.aa9d2fd0167e59d87beeb82b70601af9@vtiger.fosslabs.com>

#1265: Global Search Function throws error
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  mickie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1265>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 13:35:26 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 17:35:26 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231266=3A?=
 =?utf-8?q?_Email_Opt-out_missing_in_Leads?=
In-Reply-To: <076.98612190c9a98af18e148b6e53d138fc@vtiger.fosslabs.com>
References: <076.98612190c9a98af18e148b6e53d138fc@vtiger.fosslabs.com>
Message-ID: <085.89be2cdd21716f42489bc7dedbfb3c19@vtiger.fosslabs.com>

#1266: Email Opt-out missing in Leads
--------------------------+-------------------------------------------------
  Reporter:  gopal        |       Owner:  developer
      Type:  enhancement  |      Status:  new      
  Priority:  major        |   Milestone:           
 Component:  vtigercrm    |     Version:  5.0.1    
Resolution:               |    Keywords:           
--------------------------+-------------------------------------------------
Changes (by saraj):

  * version:  5.0.0 => 5.0.1

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1266>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 13:36:43 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 17:36:43 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=23789=3A_?=
	=?utf-8?q?Picklist_Settings?=
In-Reply-To: <076.cbf12ece226925b117517ea71d90b26b@vtiger.fosslabs.com>
References: <076.cbf12ece226925b117517ea71d90b26b@vtiger.fosslabs.com>
Message-ID: <085.08f48df1650dded28b2d7e129fe11888@vtiger.fosslabs.com>

#789: Picklist Settings
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  developer
      Type:  defect     |      Status:  new      
  Priority:  major      |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.1    
Resolution:             |    Keywords:           
------------------------+---------------------------------------------------
Changes (by saraj):

  * version:  5.0.0 => 5.0.1

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/789>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 13:45:27 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 17:45:27 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231325=3A?=
 =?utf-8?q?_reference_all_clanups_of_vtiger=5F_table_prefix_to_trac_ticket?=
Message-ID: <076.dc2b0777399119340aa2cb60903488d4@vtiger.fosslabs.com>

#1325: reference all clanups of vtiger_ table prefix to trac ticket
-----------------------+----------------------------------------------------
 Reporter:  jeffk      |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  major      |   Milestone:  5.0.0    
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:  database   |  
-----------------------+----------------------------------------------------
 The vtiger_ table prefix introduced in r7003 and r7004, will necessitate
 many cleanups. The following checkins should have referenced a bug like
 this one. Future checkins please use 'refs #1325', so we can collect these
 related changesets.

  * r7150
  * r7149
  * r7132
  * r7126
  * r7123
  * r7122
  * r7121
  * r7119
  * r7118
  * r7117
  * r7114
  * r7113
  * r7112
  * r7111
  * r7110
  * r7109
  * r7108
  * r7107
  * r7106
  * r7105
  * r7104
  * r7103
  * r7102
  * r7101
  * r7100
  * r7099
  * r7098
  * r7097
  * r7096
  * r7095
  * r7094
  * r7093
  * r7085
  * r7004
  * r7003

 Ticket to question wisdom of changeset is deprecated, but not yet closed.
 Configurable prefixing using adodb features may be discussed there.

 #1298: revert r7003:7004 prefix vtiger_ to all tablenames

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1325>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 13:48:30 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 17:48:30 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23842=3A_?=
 =?utf-8?q?Settings_=3E_Studio_=3E_Edit_Field_Blocks_=3E_Lead_Field_Access?=
In-Reply-To: <076.d63efdd85ec6ace106fdc96d0c6667d5@vtiger.fosslabs.com>
References: <076.d63efdd85ec6ace106fdc96d0c6667d5@vtiger.fosslabs.com>
Message-ID: <085.47c3b321ee164c9a9df623fba60d2cd5@vtiger.fosslabs.com>

#842: Settings > Studio > Edit Field Blocks > Lead Field Access
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  anonymous
      Type:  defect     |      Status:  assigned 
  Priority:  major      |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.1    
Resolution:             |    Keywords:           
------------------------+---------------------------------------------------
Changes (by don):

  * version:  5.0.0 => 5.0.1

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/842>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 13:28:16 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 17:28:16 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231300=3A?=
 =?utf-8?q?_Google_Maps_support_by_way_integrating_third-party_Google_Maps?=
 =?utf-8?q?_API_library?=
In-Reply-To: <076.caa8db848bf4889be2ed2b950d38a6e9@vtiger.fosslabs.com>
References: <076.caa8db848bf4889be2ed2b950d38a6e9@vtiger.fosslabs.com>
Message-ID: <085.5e0834253b006def9b80cbc82333924b@vtiger.fosslabs.com>

#1300: Google Maps support by way integrating third-party Google Maps API library
------------------------+---------------------------------------------------
  Reporter:  jeffk      |       Owner:  developer                       
      Type:  defect     |      Status:  new                             
  Priority:  major      |   Milestone:  5.0.0                           
 Component:  vtigercrm  |     Version:  5.0.1                           
Resolution:             |    Keywords:  maps google third-party snapshot
------------------------+---------------------------------------------------
Changes (by don):

  * version:  5.0.0 => 5.0.1

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1300>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 13:30:15 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 17:30:15 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231257=3A?=
 =?utf-8?q?_calender-_time_display_should_start_earlier_instead_of_10=2E00?=
 =?utf-8?q?_am?=
In-Reply-To: <076.d27bacbd23f52c8c928d56ba5872fc60@vtiger.fosslabs.com>
References: <076.d27bacbd23f52c8c928d56ba5872fc60@vtiger.fosslabs.com>
Message-ID: <085.4a9db32961ed85041a0e0b241ac02c60@vtiger.fosslabs.com>

#1257: calender- time display should start earlier instead of 10.00 am
--------------------------+-------------------------------------------------
  Reporter:  ftc          |       Owner:  mangai
      Type:  enhancement  |      Status:  new   
  Priority:  major        |   Milestone:        
 Component:  vtigercrm    |     Version:  5.0.0 
Resolution:               |    Keywords:        
--------------------------+-------------------------------------------------
Changes (by saraj):

  * owner:  developer => mangai

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1257>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 13:27:51 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 17:27:51 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231307=3A?=
 =?utf-8?q?_Print_function_missing_in_Beta?=
In-Reply-To: <076.d87e178fda241c6536574413a592943f@vtiger.fosslabs.com>
References: <076.d87e178fda241c6536574413a592943f@vtiger.fosslabs.com>
Message-ID: <085.7c4d9d0617f31fb0e8ae0bbbc050f2e3@vtiger.fosslabs.com>

#1307: Print function missing in Beta
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  ahmed
      Type:  defect     |      Status:  new  
  Priority:  major      |   Milestone:  5.0.0
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => ahmed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1307>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 13:49:05 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 17:49:05 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231325=3A?=
 =?utf-8?q?_reference_all_clanups_of_vtiger=5F_table_prefix_to_trac_ticket?=
In-Reply-To: <076.dc2b0777399119340aa2cb60903488d4@vtiger.fosslabs.com>
References: <076.dc2b0777399119340aa2cb60903488d4@vtiger.fosslabs.com>
Message-ID: <085.1088b5959a4d0032eab01ff9b158cef6@vtiger.fosslabs.com>

#1325: reference all clanups of vtiger_ table prefix to trac ticket
------------------------+---------------------------------------------------
  Reporter:  jeffk      |       Owner:  don     
      Type:  defect     |      Status:  new     
  Priority:  major      |   Milestone:  5.0.0   
 Component:  vtigercrm  |     Version:  5.0.0   
Resolution:             |    Keywords:  database
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => don

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1325>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 13:49:42 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 17:49:42 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=2319=3A_v?=
 =?utf-8?q?tiger_team_start_to_merge_relevant_branches/4=2E2_changes?=
In-Reply-To: <076.daa670ff81a40e9078f708efc9d0a64f@vtiger.fosslabs.com>
References: <076.daa670ff81a40e9078f708efc9d0a64f@vtiger.fosslabs.com>
Message-ID: <085.86f248140a4cd658a2a97fdd1ee52931@vtiger.fosslabs.com>

#19: vtiger team start to merge relevant branches/4.2 changes
------------------------+---------------------------------------------------
  Reporter:  jeffk      |       Owner:  developer
      Type:  task       |      Status:  new      
  Priority:  major      |   Milestone:  5.0.0    
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:             |    Keywords:  process  
------------------------+---------------------------------------------------
Changes (by don):

  * type:  defect => task

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/19>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 13:50:03 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 17:50:03 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231096=3A?=
 =?utf-8?q?_Change_=22My_Home_Page=22_to_=22Home=22?=
In-Reply-To: <076.50f200c2a1dbfab77f88a21e59e45693@vtiger.fosslabs.com>
References: <076.50f200c2a1dbfab77f88a21e59e45693@vtiger.fosslabs.com>
Message-ID: <085.347f40631729b0d6f94e9384bb61e408@vtiger.fosslabs.com>

#1096: Change "My Home Page" to "Home"
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  ahmed
      Type:  defect     |      Status:  new  
  Priority:  minor      |   Milestone:  5.0.0
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => ahmed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1096>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 15:28:05 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 19:28:05 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231302=3A?=
 =?utf-8?q?_Update_to_new_adodb-4=2E90_release?=
In-Reply-To: <076.cfae0e78298741dfce9c6a4f41a70218@vtiger.fosslabs.com>
References: <076.cfae0e78298741dfce9c6a4f41a70218@vtiger.fosslabs.com>
Message-ID: <085.513790e7117ea060d946d1cb93ae6280@vtiger.fosslabs.com>

#1302: Update to new adodb-4.90 release
------------------------+---------------------------------------------------
  Reporter:  jeffk      |       Owner:  jeffk                 
      Type:  defect     |      Status:  new                   
  Priority:  major      |   Milestone:  5.0.0                 
 Component:  vtigercrm  |     Version:  5.0.0                 
Resolution:             |    Keywords:  adodb database package
------------------------+---------------------------------------------------
Comment (by allanbush):

 I'd go ahead and do this on both the 4.2 branch and the trunk.  I don't
 see anything that will help us in particular but nothing should break.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1302>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 15:43:22 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 19:43:22 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23748=3A_?=
 =?utf-8?q?Eliminate_php_notice_errors?=
In-Reply-To: <076.c75696aed703c24c8b151bd87264b9e6@vtiger.fosslabs.com>
References: <076.c75696aed703c24c8b151bd87264b9e6@vtiger.fosslabs.com>
Message-ID: <085.fe7e8288b0785396ce85fbd413e44b97@vtiger.fosslabs.com>

#748: Eliminate php notice errors
------------------------+---------------------------------------------------
  Reporter:  allanbush  |       Owner:  anonymous
      Type:  task       |      Status:  assigned 
  Priority:  minor      |   Milestone:  4.2.5    
 Component:  vtigercrm  |     Version:  4.2.4rc3 
Resolution:             |    Keywords:           
------------------------+---------------------------------------------------
Changes (by anonymous):

  * status:  new => assigned
  * owner:  jrydbeck => anonymous

Comment:

 Uploaded initial changeset [7148].  A significant number of changes are
 similar to the following case:
 {{{
 function iAmAnExample($x)
 {
   if ($x == 2)
   {
     $var = 123;
   }

   return ($var + 4);  // error thrown here if $x wasn't 2; $var wasn't
 initialized
 }
 }}}

 This stuff throws errors in PHP; presuming the 'IF' block didn't test true
 and execute, $var hasn't been initialized.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/748>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 16:42:23 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 15 Jun 2006 20:42:23 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231326=3A?=
 =?utf-8?q?_Auto_Tax_and_quote_workflow_improvement?=
Message-ID: <076.151dc33d86c777ebfd974d4b1529c9ea@vtiger.fosslabs.com>

#1326: Auto Tax and quote workflow improvement
--------------------------------------+-------------------------------------
 Reporter:  mvhman                    |       Owner:  developer
     Type:  defect                    |      Status:  new      
 Priority:  major                     |   Milestone:  5.0.0    
Component:  vtigercrm                 |     Version:  5.0.0    
 Keywords:  auto tax improved quotes  |  
--------------------------------------+-------------------------------------
 I do not understand how quotes work in vtiger5beta. There seems to be
 complex pricing books, but when it comes to adding discounts, automatic
 tax and adjustments, it does not seem to cover the basics of a quote. As
 well as when printing to PDF, the quotes come out with the tax included in
 line items but excluded from subtotal. Not structured.
 Maybe someone could clear this up for me, as I am not sure whether it is
 vtiger or me thats confused.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1326>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 20:35:14 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 00:35:14 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231314=3A?=
 =?utf-8?q?_Create_a_4=2E2=2E4=2E1_release?=
In-Reply-To: <076.0bb25652495a5800a354264247f65b15@vtiger.fosslabs.com>
References: <076.0bb25652495a5800a354264247f65b15@vtiger.fosslabs.com>
Message-ID: <085.35d802460cb9e920e456717cfabfde8a@vtiger.fosslabs.com>

#1314: Create a 4.2.4.1 release
------------------------+---------------------------------------------------
  Reporter:  allanbush  |       Owner:  developer
      Type:  defect     |      Status:  new      
  Priority:  major      |   Milestone:  4.2.4    
 Component:  vtigercrm  |     Version:  4.2.4rc3 
Resolution:             |    Keywords:           
------------------------+---------------------------------------------------
Comment (by allanbush):

 Apparently I'm not authorized to create a branch.

 Could someone with the proper access please do this.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1314>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 23:54:02 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 03:54:02 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231036=3A?=
 =?utf-8?q?_campaign_-_contact=2C_lead_relatedlist_issue?=
In-Reply-To: <076.8fe1163333beca0ce17a56ea62d1f555@vtiger.fosslabs.com>
References: <076.8fe1163333beca0ce17a56ea62d1f555@vtiger.fosslabs.com>
Message-ID: <085.f9ae503633af6a3788e93a6520b185b7@vtiger.fosslabs.com>

#1036: campaign - contact, lead relatedlist issue
--------------------------+-------------------------------------------------
  Reporter:  mickie       |       Owner:  mangai
      Type:  enhancement  |      Status:  new   
  Priority:  major        |   Milestone:        
 Component:  vtigercrm    |     Version:  5.0.0 
Resolution:               |    Keywords:        
--------------------------+-------------------------------------------------
Comment (by mangai):

 fixed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1036>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 15 23:54:22 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 03:54:22 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231036=3A?=
 =?utf-8?q?_campaign_-_contact=2C_lead_relatedlist_issue?=
In-Reply-To: <076.8fe1163333beca0ce17a56ea62d1f555@vtiger.fosslabs.com>
References: <076.8fe1163333beca0ce17a56ea62d1f555@vtiger.fosslabs.com>
Message-ID: <085.c154f0209c4fa2fe1d47818c03233760@vtiger.fosslabs.com>

#1036: campaign - contact, lead relatedlist issue
--------------------------+-------------------------------------------------
  Reporter:  mickie       |       Owner:  mangai
      Type:  enhancement  |      Status:  closed
  Priority:  major        |   Milestone:        
 Component:  vtigercrm    |     Version:  5.0.0 
Resolution:  fixed        |    Keywords:        
--------------------------+-------------------------------------------------
Changes (by mangai):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1036>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 00:54:44 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 04:54:44 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231269=3A?=
 =?utf-8?q?_Picklist_editing_impossible_when_customfield_created?=
In-Reply-To: <076.0ac8352198014e97e1e06ac4c87ba236@vtiger.fosslabs.com>
References: <076.0ac8352198014e97e1e06ac4c87ba236@vtiger.fosslabs.com>
Message-ID: <085.4f354fb8d9ba5c05e6695f62d0596b8a@vtiger.fosslabs.com>

#1269: Picklist editing impossible when customfield created
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  mangai
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  duplicate  |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mangai):

  * resolution:  => duplicate
  * status:  new => closed

Comment:

 id:1294

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1269>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 00:56:16 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 04:56:16 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231294=3A?=
 =?utf-8?q?_Picklist_/_Custom_Fields_Error?=
In-Reply-To: <076.0f035f4d3e1919336e3dcf1142be6790@vtiger.fosslabs.com>
References: <076.0f035f4d3e1919336e3dcf1142be6790@vtiger.fosslabs.com>
Message-ID: <085.3af3c73c3a2b0687f104d85c36eba991@vtiger.fosslabs.com>

#1294: Picklist / Custom Fields Error
------------------------+---------------------------------------------------
  Reporter:  JHoevel    |       Owner:  mangai
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  duplicate  |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mangai):

  * resolution:  => duplicate
  * status:  new => closed

Comment:

 Id:1322

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1294>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 00:58:11 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 04:58:11 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231174=3A?=
 =?utf-8?q?_unable_to_change_months/years_from_mini-calendar?=
In-Reply-To: <076.2ef668b0f99e11dc546be8a077110184@vtiger.fosslabs.com>
References: <076.2ef668b0f99e11dc546be8a077110184@vtiger.fosslabs.com>
Message-ID: <085.d8376802844c22814701ec3ce70ac807@vtiger.fosslabs.com>

#1174: unable to change months/years from mini-calendar
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  mangai
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  duplicate  |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mangai):

  * resolution:  => duplicate
  * status:  new => closed

Comment:

 Id:1030

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1174>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 01:03:49 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 05:03:49 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231152=3A?=
 =?utf-8?q?_cannot_go_to_different_months/years__from_popup_calendar?=
In-Reply-To: <076.305f67d0510043ae0fbe7bd653f4aa48@vtiger.fosslabs.com>
References: <076.305f67d0510043ae0fbe7bd653f4aa48@vtiger.fosslabs.com>
Message-ID: <085.932eabc3587c6f33f47ce18865d15d31@vtiger.fosslabs.com>

#1152: cannot go to different months/years  from popup calendar
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  mangai
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mangai):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 Id:1030

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1152>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 01:06:40 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 05:06:40 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231035=3A?=
 =?utf-8?q?_parent_not_shown_in_new_contact_page_from_campaigns?=
In-Reply-To: <076.c9bee8e3710559047c6624af68bf079e@vtiger.fosslabs.com>
References: <076.c9bee8e3710559047c6624af68bf079e@vtiger.fosslabs.com>
Message-ID: <085.918cbed9bdce9b5dd94eb6c4ef992f25@vtiger.fosslabs.com>

#1035: parent not shown in new contact page from campaigns
--------------------------+-------------------------------------------------
  Reporter:  mickie       |       Owner:  mangai
      Type:  enhancement  |      Status:  closed
  Priority:  major        |   Milestone:        
 Component:  vtigercrm    |     Version:  5.0.0 
Resolution:  fixed        |    Keywords:        
--------------------------+-------------------------------------------------
Changes (by mangai):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 fixed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1035>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 01:27:54 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 05:27:54 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23914=3A_?=
 =?utf-8?q?Sales_=3E_Quotes_=3E_Detail_View?=
In-Reply-To: <076.51b57cd15fe20b42398ea79fb1064f23@vtiger.fosslabs.com>
References: <076.51b57cd15fe20b42398ea79fb1064f23@vtiger.fosslabs.com>
Message-ID: <085.01c00b3f422fefdeb8ca27761bc0a5a4@vtiger.fosslabs.com>

#914: Sales > Quotes > Detail View
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  mickie
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mickie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 This issue has been fixed as now we have remove the buttons and provided
 the links. In the mean time we have removed the links which are non
 functional. we will provide these links once we have made that work in
 future relases.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/914>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 01:34:28 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 05:34:28 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=23965=3A_?= =?utf-8?q?FAQ?=
In-Reply-To: <076.6d8684c7a7aea333e48cd0c6ba6467b4@vtiger.fosslabs.com>
References: <076.6d8684c7a7aea333e48cd0c6ba6467b4@vtiger.fosslabs.com>
Message-ID: <085.874431e7d550d1a9e4592f24414c921e@vtiger.fosslabs.com>

#965: FAQ
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  mickie
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mickie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 This issue has been fixed and is available from 5.0Beta.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/965>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 01:34:41 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 05:34:41 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7151 -
	/vtigercrm/trunk/Smarty/templates/RelatedLists.tpl
Message-ID: <20060616053441.A5E917ED2CE@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 15 23:34:37 2006
New Revision: 7151

Log:
select contact has been included in campaign related list

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

Modified: vtigercrm/trunk/Smarty/templates/RelatedLists.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/RelatedLists.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/RelatedLists.tpl Thu Jun 15 23:34:37 2006
@@ -91,7 +91,7 @@
 							{elseif $header eq 'Leads'}
                                                         <input title="{$APP.LBL_ADD_NEW} {$APP.Lead}" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='Leads'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Lead}"></td>
 							{elseif $header eq 'Contacts' }
-							{if $MODULE eq 'Activities' || $MODULE eq 'Potentials' || $MODULE eq 'Vendors'}
+							{if $MODULE eq 'Activities' || $MODULE eq 'Potentials' || $MODULE eq 'Vendors' || $MODULE eq 'Campaigns'}
                                                         <input title="Change" accessKey="" class="small" value="{$APP.LBL_SELECT_BUTTON_LABEL} {$APP.Contact}" LANGUAGE=javascript onclick='return window.open("index.php?module=Contacts&return_module={$MODULE}&action=Popup&popuptype=detailview&select=enable&form=EditView&form_submit=false&recordid={$ID}","test","width=640,height=570,resizable=0,scrollbars=0");' type="button"  name="button"></td>
 							{elseif $MODULE eq 'Emails'}
 							<input title="{$APP.LBL_BULK_MAILS}" accessykey="F" class="small" onclick="this.form.action.value='sendmail';this.form.return_action.value='DetailView';this.form.module.value='Emails';this.form.return_module.value='Emails';" name="button" value="{$APP.LBL_BULK_MAILS}" type="submit">&nbsp;




From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 01:45:21 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 05:45:21 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231071=3A?=
 =?utf-8?q?_FAQ_Detail_View_=22Save=22_not_working?=
In-Reply-To: <076.651331afa5aa806fc7b30ae0e7a3feb5@vtiger.fosslabs.com>
References: <076.651331afa5aa806fc7b30ae0e7a3feb5@vtiger.fosslabs.com>
Message-ID: <085.2ed47753e846aed7f141af2cbe6e1569@vtiger.fosslabs.com>

#1071: FAQ Detail View "Save" not working
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  mickie
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mickie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 This issue has been fixed and you can find it working in 5.0 Beta

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1071>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 01:46:25 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 05:46:25 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231078=3A?=
 =?utf-8?q?_Import_Products=2C_last_step?=
In-Reply-To: <076.057c37e4d4720839331492b5e07b914c@vtiger.fosslabs.com>
References: <076.057c37e4d4720839331492b5e07b914c@vtiger.fosslabs.com>
Message-ID: <085.2af571daefa91b651fe9635a4484ea6e@vtiger.fosslabs.com>

#1078: Import Products, last step
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  mickie
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mickie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 In 5.0Beta we have fixed these issues. if you still face this problem then
 please let us know and reopen this ticket.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1078>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 01:56:21 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 05:56:21 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7152 - in
 /vtigercrm/trunk/modules: Invoice/CreatePDF.php PurchaseOrder/CreatePDF.php
 Quotes/CreatePDF.php SalesOrder/CreateSOPDF.php
Message-ID: <20060616055622.1E0F07ED2CC@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 15 23:56:15 2006
New Revision: 7152

Log:
* Removed the vtiger prefix which have been added for the table's columnnames

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

Modified: vtigercrm/trunk/modules/Invoice/CreatePDF.php
==============================================================================
--- vtigercrm/trunk/modules/Invoice/CreatePDF.php (original)
+++ vtigercrm/trunk/modules/Invoice/CreatePDF.php Thu Jun 15 23:56:15 2006
@@ -15,7 +15,7 @@
 require_once('include/database/PearDatabase.php');
 
 global $adb,$app_strings,$products_per_page;
-$sql="select vtiger_currency_symbol from vtiger_currency_info";
+$sql="select currency_symbol from vtiger_currency_info";
 $result = $adb->query($sql);
 $currency_symbol = $adb->query_result($result,0,'currency_symbol');
 

Modified: vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php
==============================================================================
--- vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php (original)
+++ vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php Thu Jun 15 23:56:15 2006
@@ -15,7 +15,7 @@
 
 global $adb,$app_strings;
 
-$sql="select vtiger_currency_symbol from vtiger_currency_info";
+$sql="select currency_symbol from vtiger_currency_info";
 $result = $adb->query($sql);
 $currency_symbol = $adb->query_result($result,0,'currency_symbol');
 

Modified: vtigercrm/trunk/modules/Quotes/CreatePDF.php
==============================================================================
--- vtigercrm/trunk/modules/Quotes/CreatePDF.php (original)
+++ vtigercrm/trunk/modules/Quotes/CreatePDF.php Thu Jun 15 23:56:15 2006
@@ -16,7 +16,7 @@
 
 global $adb,$app_strings;
 
-$sql="select vtiger_currency_symbol from vtiger_currency_info";
+$sql="select currency_symbol from vtiger_currency_info";
 $result = $adb->query($sql);
 $currency_symbol = $adb->query_result($result,0,'currency_symbol');
 

Modified: vtigercrm/trunk/modules/SalesOrder/CreateSOPDF.php
==============================================================================
--- vtigercrm/trunk/modules/SalesOrder/CreateSOPDF.php (original)
+++ vtigercrm/trunk/modules/SalesOrder/CreateSOPDF.php Thu Jun 15 23:56:15 2006
@@ -16,7 +16,7 @@
 
 global $adb,$app_strings,$products_per_page;
 
-$sql="select vtiger_currency_symbol from vtiger_currency_info";
+$sql="select currency_symbol from vtiger_currency_info";
 $result = $adb->query($sql);
 $currency_symbol = $adb->query_result($result,0,'currency_symbol');
 




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 01:58:21 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 05:58:21 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7153 -
	/vtigercrm/trunk/modules/Users/User.php
Message-ID: <20060616055821.93CD87ED2D0@vtiger.fosslabs.com>

Author: don
Date: Thu Jun 15 23:58:17 2006
New Revision: 7153

Log:
Issue in user save has been fixed

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 Thu Jun 15 23:58:17 2006
@@ -90,7 +90,6 @@
 	var $table_name = "vtiger_users";
 
 	// This is the list of fields that are in the lists.
-	var $list_fields_name = Array();
 	var $list_link_field= '';
 
 	var $list_mode;
@@ -108,7 +107,6 @@
 	var $tagcloud;
 	var $imagename;
 	var $defhomeview;
-	//var $sortby_fields = Array('user_name','email1','last_name','is_admin','status');	
 
 	var $encodeFields = Array("first_name", "last_name", "description");
 
@@ -117,8 +115,6 @@
 
 	var $sortby_fields = Array('status','email1','phone_work','is_admin','user_name');	  
 
-	var $default_order_by = 'lastname';
-	var $default_sort_order = 'ASC';
 	// This is the list of vtiger_fields that are in the lists.
 	var $list_fields = Array(
 		'First Name'=>Array('vtiger_users'=>'first_name'),
@@ -796,6 +792,13 @@
 
 		return;
 	}
+	function save($module_name) 
+	{
+		global $log;
+	        $log->debug("module name is ".$module_name);
+		//GS Save entity being called with the modulename as parameter
+		$this->saveentity($module_name);
+	}
 
 }
 ?>




From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 01:59:14 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 05:59:14 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231145=3A?=
 =?utf-8?q?_in_edit_view_of_inventory=2C_the_right_hand_side_options_are_h?=
 =?utf-8?q?ardcoded?=
In-Reply-To: <076.0e62778b6100dd068d2df9182121005c@vtiger.fosslabs.com>
References: <076.0e62778b6100dd068d2df9182121005c@vtiger.fosslabs.com>
Message-ID: <085.b8f413ad1b47ccba02c4a5d90ea2b897@vtiger.fosslabs.com>

#1145: in edit view of inventory, the right hand side options are hardcoded
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  mickie
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mickie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 These hardcoded values have beem i18n-ed in 5.0Beta

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1145>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 02:05:59 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 06:05:59 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7154 -
 /vtigercrm/trunk/modules/Import/language/en_us.lang.php
Message-ID: <20060616060559.1CB217ED2DC@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 16 00:05:56 2006
New Revision: 7154

Log:
* Corrected the information displayed in step 2 of import

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

Modified: vtigercrm/trunk/modules/Import/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Import/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Import/language/en_us.lang.php Fri Jun 16 00:05:56 2006
@@ -155,7 +155,7 @@
 'LBL_LIST_MAPPING'=>'List & Mapping',
 'LBL_STEP_2_MSG'=>'The following vtiger_tables shows the imported',
 'LBL_STEP_2_MSG1'=>'and other details.',
-'LBL_STEP_2_TXT'=>'To map the vtiger_fields, Select the corresponding in combo boxes for each',
+'LBL_STEP_2_TXT'=>'To map the fields, select the corresponding in combo boxes for each',
 'LBL_USE_SAVED_MAPPING'=>'Use Saved Mapping :',
 'LBL_MAPPING'=>'Mapping',
 'LBL_HEADERS'=>'Headers :',




From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 02:06:55 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 06:06:55 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231077=3A?=
 =?utf-8?q?_Inventory_=3E_Products=2C_Step_2_spelling_error?=
In-Reply-To: <076.afa5672c1a2f342659af400a47199461@vtiger.fosslabs.com>
References: <076.afa5672c1a2f342659af400a47199461@vtiger.fosslabs.com>
Message-ID: <085.a738703e6ea3a8106d05dc18cb6e3403@vtiger.fosslabs.com>

#1077: Inventory > Products, Step 2 spelling error
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  mickie
      Type:  defect     |      Status:  closed
  Priority:  trivial    |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mickie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 This issue has been fixed.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1077>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 02:10:07 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 06:10:07 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231305=3A?=
	=?utf-8?q?_Total_taxes_not_auto?=
In-Reply-To: <076.952daacfec18eaf8adefbd4e7d778e41@vtiger.fosslabs.com>
References: <076.952daacfec18eaf8adefbd4e7d778e41@vtiger.fosslabs.com>
Message-ID: <085.848b1af49dd57d2b08e40d872fca257a@vtiger.fosslabs.com>

#1305: Total taxes not auto
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  mickie                                               
      Type:  defect     |      Status:  closed                                               
  Priority:  minor      |   Milestone:                                                       
 Component:  vtigercrm  |     Version:  5.0.0                                                
Resolution:  fixed      |    Keywords:  quotes, invoices, sales order, so, purchase order, po
------------------------+---------------------------------------------------
Changes (by mickie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 the total amount has been calculated even if the tax and adjustment may be
 anything like alphabetical and all. if tax and adjustment are valid then
 it will be added in total otherwise it will be rejected and the total will
 not come as NaN.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1305>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 02:12:02 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 06:12:02 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231156=3A?=
 =?utf-8?q?_can_create_invoice_without_specifying_product_quantity?=
In-Reply-To: <076.92edb3c9cf4881a366e5a914f7e21365@vtiger.fosslabs.com>
References: <076.92edb3c9cf4881a366e5a914f7e21365@vtiger.fosslabs.com>
Message-ID: <085.365755e5eab6fa5c741761e97cbcac5b@vtiger.fosslabs.com>

#1156: can create invoice without specifying product quantity
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  mickie
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mickie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 This issue has been fixed in 5.0Beta itself.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1156>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 02:20:27 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 06:20:27 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7155 - in /vtigercrm/trunk:
 Smarty/templates/UserEditView.tpl include/utils/CommonUtils.php
Message-ID: <20060616062028.30CDB7ED2D7@vtiger.fosslabs.com>

Author: don
Date: Fri Jun 16 00:20:22 2006
New Revision: 7155

Log:
display type =4 for create view has been added

Modified:
    vtigercrm/trunk/Smarty/templates/UserEditView.tpl
    vtigercrm/trunk/include/utils/CommonUtils.php

Modified: vtigercrm/trunk/Smarty/templates/UserEditView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/UserEditView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/UserEditView.tpl Fri Jun 16 00:20:22 2006
@@ -31,7 +31,7 @@
 <script language="javascript">
 function check_duplicate()
 {ldelim}
-	var user_name = $('user_name').value;
+	var user_name = window.document.EditView.user_name.value;
 	new Ajax.Request(
                 'index.php',
                 {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},

Modified: vtigercrm/trunk/include/utils/CommonUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/CommonUtils.php (original)
+++ vtigercrm/trunk/include/utils/CommonUtils.php Fri Jun 16 00:20:22 2006
@@ -939,6 +939,13 @@
 		$block_label[$blockid] = $adb->query_result($result,$i,"blocklabel");
 	}
 	$blockid_list .= ')';
+	if($mode == 'edit')	
+	{
+		$display_type_check = 'vtiger_field.displaytype = 1';
+	}else
+	{
+		$display_type_check = 'vtiger_field.displaytype in (1,4)';
+	}
 	//retreive the vtiger_profileList from database
 	require('user_privileges/user_privileges_'.$current_user->id.'.php');
 	if($disp_view == "detail_view")
@@ -961,7 +968,7 @@
 		{
 			if($is_admin==true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2]== 0)
 			{
-				$sql = "select vtiger_field.* from vtiger_field where vtiger_field.tabid=".$tabid." and vtiger_field.block in ".$blockid_list ." and vtiger_field.displaytype=1 and info_type = '".$info_type."' order by block,sequence";
+				$sql = "select vtiger_field.* from vtiger_field where vtiger_field.tabid=".$tabid." and vtiger_field.block in ".$blockid_list ." and ".$display_type_check." and info_type = '".$info_type."' order by block,sequence";
 			}
 			else
 			{
@@ -973,7 +980,7 @@
 		{
 			if($is_admin==true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0)
 			{
-				$sql = "select vtiger_field.* from vtiger_field where vtiger_field.tabid=".$tabid." and vtiger_field.block in ".$blockid_list." and vtiger_field.displaytype=1 order by block,sequence";
+				$sql = "select vtiger_field.* from vtiger_field where vtiger_field.tabid=".$tabid." and vtiger_field.block in ".$blockid_list." and ".$display_type_check." order by block,sequence";
 			}
 			else
 			{




From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 02:41:46 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 06:41:46 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231074=3A?=
 =?utf-8?q?_Document_file_permissions_needed_for_install?=
In-Reply-To: <076.dfa8cdb6063a10bf60cc34f2fe53fa59@vtiger.fosslabs.com>
References: <076.dfa8cdb6063a10bf60cc34f2fe53fa59@vtiger.fosslabs.com>
Message-ID: <085.d6cb2cfc4ab8f4de519601e5224c1a9c@vtiger.fosslabs.com>

#1074: Document file permissions needed for install
-------------------------+--------------------------------------------------
  Reporter:  jeffk       |       Owner:  richie 
      Type:  defect      |      Status:  closed 
  Priority:  major       |   Milestone:  5.0.0  
 Component:  vtigercrm   |     Version:  5.0.0  
Resolution:  worksforme  |    Keywords:  install
-------------------------+--------------------------------------------------
Changes (by richie):

  * resolution:  => worksforme
  * status:  new => closed

Comment:

 I am closing this issue Jeff. Feel free to reopen if you get the issue
 again.
 I have not been able to reproduce this for sometime now.

 Richie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1074>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 02:42:25 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 06:42:25 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231186=3A?=
 =?utf-8?q?_webmails_not_working_in_linux_systems?=
In-Reply-To: <076.f90486e13eb47978a671c1ca4ead62d2@vtiger.fosslabs.com>
References: <076.f90486e13eb47978a671c1ca4ead62d2@vtiger.fosslabs.com>
Message-ID: <085.4f29f10624476e5ab275fd462b509b7f@vtiger.fosslabs.com>

#1186: webmails not working in linux systems
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  richie
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  wontfix    |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * resolution:  => wontfix
  * status:  new => closed

Comment:

 This is due to improper php compilation. imap must be enabled during php
 compilation.

 Richie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1186>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 02:44:11 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 06:44:11 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231140=3A?=
	=?utf-8?q?_Issue_in_Emails?=
In-Reply-To: <076.a35124f4112b6efc1ce3a64ae8820aed@vtiger.fosslabs.com>
References: <076.a35124f4112b6efc1ce3a64ae8820aed@vtiger.fosslabs.com>
Message-ID: <085.8ba8673479a1567de0e9dcffebfa8f6f@vtiger.fosslabs.com>

#1140: Issue in Emails
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  richie
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  wontfix    |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * resolution:  => wontfix
  * status:  new => closed

Comment:

 This will not be fixed as it is a low priority. Moreover, it will be
 better if you have a consensus on this issue.

 Richie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1140>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 02:44:50 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 06:44:50 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231246=3A?=
 =?utf-8?q?_email_not_displayed_in_contact_related_list?=
In-Reply-To: <076.bb51c9882ca3da9b29e43b10d6709695@vtiger.fosslabs.com>
References: <076.bb51c9882ca3da9b29e43b10d6709695@vtiger.fosslabs.com>
Message-ID: <085.d466f1aa8b776bae35c136092ea32edf@vtiger.fosslabs.com>

#1246: email not displayed in contact related list
------------------------+---------------------------------------------------
  Reporter:  mickie     |       Owner:  richie
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  duplicate  |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * resolution:  => duplicate
  * status:  new => closed

Comment:

 1211

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1246>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 02:49:16 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 06:49:16 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231127=3A?=
	=?utf-8?q?_Issue_in_Emaol?=
In-Reply-To: <076.5f2796ef1febe6076fd5ba3545997e71@vtiger.fosslabs.com>
References: <076.5f2796ef1febe6076fd5ba3545997e71@vtiger.fosslabs.com>
Message-ID: <085.9fba6fcde33886661ca2de6d2154c9d9@vtiger.fosslabs.com>

#1127: Issue in Emaol
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  richie
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  wontfix    |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * resolution:  => wontfix
  * status:  new => closed

Comment:

 This is not the behaviour with respect to any mail client.
 This will not be fixed.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1127>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 03:04:24 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 07:04:24 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7156 -
	/vtigercrm/trunk/install/0welcome.php
Message-ID: <20060616070424.5C7A47ED2DA@vtiger.fosslabs.com>

Author: richie
Date: Fri Jun 16 01:04:19 2006
New Revision: 7156

Log:
message updated

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

Modified: vtigercrm/trunk/install/0welcome.php
==============================================================================
--- vtigercrm/trunk/install/0welcome.php (original)
+++ vtigercrm/trunk/install/0welcome.php Fri Jun 16 01:04:19 2006
@@ -77,7 +77,7 @@
 <p>This is a product of pure teamwork, passion, and fanaticism!</p>
 <p>We are not perfect and neither do we seek perfection; but we do seek excellence. Yes, there will be issues in the product, but we will fix them too. Your help will be invaluable for the same.</p>
 <p><b>vtiger is 100% pure Open Source.</b> <em>You do not have to pay anything to use the product. If you do subscribe to the support package though, you will be able to get time-bound answers to all your queries</em>. We do provide telephone-support for paid customers only.<b><a href="http://vtiger.com/index.php?option=com_content&task=view&id=19&Itemid=37">Click here</a></b> for subscribing to the Support.</p>
-<p>vtiger believes in word of mouth alone, in fact, vtiger is nearing 0.30 million downloads without any advertisement whatsoever.</p>
+<p>vtiger believes in word of mouth alone, in fact, vtiger has been downloaded more than 0.30 million times without any advertisement whatsoever.</p>
 <p align="center">We do believe that <b>YOU</b> can and will make a difference.</p>
 <p>If you feel we have lived up to your expectations,  do consider spreading the word about vtiger by whichever means convenient to you.</p>
 <p>Please find mentioned below some information about us that you could utilize:<p>




From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 03:17:51 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 07:17:51 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231327=3A?=
 =?utf-8?q?_not_smartified=2C_still_in_xtemplate?=
Message-ID: <076.14a4dc55fd3e2cc898c582ff8d811185@vtiger.fosslabs.com>

#1327: not smartified, still in xtemplate
-----------------------+----------------------------------------------------
 Reporter:  mickie     |       Owner:  mangai
     Type:  defect     |      Status:  new   
 Priority:  major      |   Milestone:        
Component:  vtigercrm  |     Version:  5.0.0 
 Keywords:             |  
-----------------------+----------------------------------------------------
 In PriceBook relatedlist we have Products table where for each products we
 have edit link which goes to modules/Products/EditListPrice.php file which
 is not smartified ie., this file is still using the XTemplate.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1327>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 03:21:16 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 07:21:16 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23949=3A_?=
 =?utf-8?q?Advanced_Search_table_attached_to_List_View?=
In-Reply-To: <076.64fbeb656c1ed239c500613565fa6b30@vtiger.fosslabs.com>
References: <076.64fbeb656c1ed239c500613565fa6b30@vtiger.fosslabs.com>
Message-ID: <085.67a8a7c280df40113bc66ece5f6765ab@vtiger.fosslabs.com>

#949: Advanced Search table attached to List View
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  philip
      Type:  defect     |      Status:  closed
  Priority:  minor      |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by saraj):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 (In [7157]) changes made to have space between search box and listview.
 Fixes #949

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/949>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 03:21:17 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 07:21:17 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7157 -
	/vtigercrm/trunk/Smarty/templates/ListView.tpl
Message-ID: <20060616072117.5DACA7ED2E3@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 16 01:21:13 2006
New Revision: 7157

Log:
changes made to have space between search box and listview. Fixes #949

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 Fri Jun 16 01:21:13 2006
@@ -110,7 +110,33 @@
 </div>
 {/if}
 <!-- Activity createlink layer end  -->
-<!-- SIMPLE SEARCH -->
+
+                                <div id="searchingUI" style="display:none;">
+                                        <table border=0 cellspacing=0 cellpadding=0 width=100%>
+                                        <tr>
+                                                <td align=center>
+                                                <img src="images/searching.gif" alt="Searching... please wait"  title="Searching... please wait">
+                                                </td>
+                                        </tr>
+                                        </table>
+
+                                </div>
+                        </td>
+                </tr>
+                </table>
+        </td>
+</tr>
+</table>
+</form>
+</div>
+
+{*<!-- Contents -->*}
+<table border=0 cellspacing=0 cellpadding=0 width=98% align=center>
+     <tr>
+        <td valign=top><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
+
+	<td class="showPanelBg" valign="top" width=100% style="padding:10px;">
+	 <!-- SIMPLE SEARCH -->
 <div id="searchAcc" style="z-index:1;display:none;position:relative;">
 <form name="basicSearch" action="index.php">
 <table width="80%" cellpadding="5" cellspacing="0" style="border:1px dashed #CCCCCC;" class="small" align="center">
@@ -189,31 +215,7 @@
 	</table>
 </div>		
 {*<!-- Searching UI -->*}
-                                <div id="searchingUI" style="display:none;">
-                                        <table border=0 cellspacing=0 cellpadding=0 width=100%>
-                                        <tr>
-                                                <td align=center>
-                                                <img src="images/searching.gif" alt="Searching... please wait"  title="Searching... please wait">
-                                                </td>
-                                        </tr>
-                                        </table>
-
-                                </div>
-                        </td>
-                </tr>
-                </table>
-        </td>
-</tr>
-</table>
-</form>
-</div>
-
-{*<!-- Contents -->*}
-<table border=0 cellspacing=0 cellpadding=0 width=98% align=center>
-     <tr>
-        <td valign=top><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
-
-	<td class="showPanelBg" valign="top" width=100% style="padding:10px;">
+	 <br>
 	   <!-- PUBLIC CONTENTS STARTS-->
 	   <div id="ListViewContents" class="small" style="width:100%;position:relative;">
 	<input name='search_url' id="search_url" type='hidden' value='{$SEARCH_URL}'>




From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 03:32:59 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 07:32:59 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231143=3A?=
	=?utf-8?q?_Issue_in_Email_Search?=
In-Reply-To: <076.602112a95e47edfea50fc9b4ff0606e7@vtiger.fosslabs.com>
References: <076.602112a95e47edfea50fc9b4ff0606e7@vtiger.fosslabs.com>
Message-ID: <085.7f193d1b709e5d97c91cf867a2bd8f0f@vtiger.fosslabs.com>

#1143: Issue in Email Search
------------------------+---------------------------------------------------
  Reporter:  don        |       Owner:  richie
      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: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1143>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 03:49:58 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 07:49:58 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7158 -
	/vtigercrm/trunk/modules/Users/Users.js
Message-ID: <20060616074958.000EB7ED2CF@vtiger.fosslabs.com>

Author: don
Date: Fri Jun 16 01:49:55 2006
New Revision: 7158

Log:
js file added for users

Added:
    vtigercrm/trunk/modules/Users/Users.js




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 03:50:38 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 07:50:38 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7159 -
	/vtigercrm/trunk/modules/Products/EditListPrice.html
Message-ID: <20060616075038.D37057ED2CF@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 16 01:50:34 2006
New Revision: 7159

Log:
* Modified the cancel button action to history back

Modified:
    vtigercrm/trunk/modules/Products/EditListPrice.html

Modified: vtigercrm/trunk/modules/Products/EditListPrice.html
==============================================================================
--- vtigercrm/trunk/modules/Products/EditListPrice.html (original)
+++ vtigercrm/trunk/modules/Products/EditListPrice.html Fri Jun 16 01:50:34 2006
@@ -38,7 +38,7 @@
 	<tr>
 	         <td align="center">
 			<input title="{APP.LBL_SAVE_BUTTON_LABEL}" accessKey="{APP.LBL_SAVE_BUTTON_KEY}" class="button" onclick="this.form.action.value='UpdateListPrice'; return verify_data(EditView)" type="submit" name="button" value="{APP.LBL_SAVE_BUTTON_LABEL}" >
-	                <input title="{APP.LBL_CANCEL_BUTTON_LABEL}>" accessKey="{APP.LBL_CANCEL_BUTTON_KEY}" class="button" onclick="this.form.action.value='DetailView'; this.form.module.value='PriceBooks'; this.form.return_action.value='DetailView'; this.form.return_module.value='PriceBooks';" type="submit" name="button" value="{APP.LBL_CANCEL_BUTTON_LABEL}"></td>
+	                <input title="{APP.LBL_CANCEL_BUTTON_LABEL}>" accessKey="{APP.LBL_CANCEL_BUTTON_KEY}" class="button" onclick="window.history.back()" type="submit" name="button" value="{APP.LBL_CANCEL_BUTTON_LABEL}"></td>
 	</tr>
 	</form>
 </table>




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 03:53:42 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 07:53:42 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7160 -
	/vtigercrm/trunk/modules/Campaigns/Campaign.php
Message-ID: <20060616075342.E6E987ED2CF@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 16 01:53:39 2006
New Revision: 7160

Log:
task included as relatedlist for campaign

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 Fri Jun 16 01:53:39 2006
@@ -75,9 +75,9 @@
                 $focus = new Contact();
                 $button = '';
                 $returnset = '&return_module=Campaigns&return_action=DetailView&return_id='.$id;
-		$query = 'select vtiger_contactdetails.accountid, vtiger_users.user_name,vtiger_groups.groupname,vtiger_campaign.campaignid, vtiger_campaign.campaignname, vtiger_contactdetails.contactid, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.title, vtiger_contactdetails.department, vtiger_contactdetails.email, vtiger_contactdetails.phone, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_campaign inner join vtiger_campaigncontrel on vtiger_campaigncontrel.campaignid = vtiger_campaign.campaignid inner join vtiger_contactdetails on vtiger_campaigncontrel.contactid = vtiger_contactdetails.contactid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid left join vtiger_groups on vtiger_groups.groupname=vtiger_contactgrouprelation.groupname left join vtiger_users on vtiger_crmentity.smownerid=vtiger_users.id where vtiger_campaign.campaignid = '.$id.' and vtiger_crmentity.deleted=0';
+		//$query = 'select vtiger_contactdetails.accountid, vtiger_users.user_name,vtiger_groups.groupname,vtiger_campaign.campaignid, vtiger_campaign.campaignname, vtiger_contactdetails.contactid, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.title, vtiger_contactdetails.department, vtiger_contactdetails.email, vtiger_contactdetails.phone, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_campaign inner join vtiger_campaigncontrel on vtiger_campaigncontrel.campaignid = vtiger_campaign.campaignid inner join vtiger_contactdetails on vtiger_campaigncontrel.contactid = vtiger_contactdetails.contactid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid left join vtiger_groups on vtiger_groups.groupname=vtiger_contactgrouprelation.groupname left join vtiger_users on vtiger_crmentity.smownerid=vtiger_users.id where vtiger_campaign.campaignid = '.$id.' and vtiger_crmentity.deleted=0';
 
-		//$query = 'SELECT vtiger_contactdetails.*, vtiger_crmentity.crmid, vtiger_users.user_name, vtiger_groups.groupname, vtiger_crmentity.smownerid from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid left join vtiger_users on vtiger_crmentity.smownerid = vtiger_users.id left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid left join vtiger_groups on vtiger_groups.groupname=vtiger_contactgrouprelation.groupname  where vtiger_crmentity.deleted=0 and vtiger_contactdetails.campaignid = '.$id;
+		$query = 'SELECT vtiger_contactdetails.*, vtiger_crmentity.crmid, vtiger_users.user_name, vtiger_groups.groupname, vtiger_crmentity.smownerid from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid left join vtiger_users on vtiger_crmentity.smownerid = vtiger_users.id left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid left join vtiger_groups on vtiger_groups.groupname=vtiger_contactgrouprelation.groupname  where vtiger_crmentity.deleted=0 and vtiger_contactdetails.campaignid = '.$id;
 		$log->debug("Exiting get_contacts method ...");
                 return GetRelatedList('Campaigns','Contacts',$focus,$query,$button,$returnset);
         }
@@ -113,6 +113,53 @@
 		return GetRelatedList('Campaigns','Potentials',$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();
+
+		$button = '';
+
+		$returnset = '&return_module=Products&return_action=DetailView&return_id='.$id;
+
+		$query = "SELECT vtiger_contactdetails.lastname,
+			vtiger_contactdetails.firstname,
+			vtiger_contactdetails.contactid,
+			vtiger_activity.*,
+			vtiger_seactivityrel.*,
+			vtiger_crmentity.crmid, vtiger_crmentity.smownerid,
+			vtiger_crmentity.modifiedtime,
+			vtiger_users.user_name,
+			vtiger_recurringevents.recurringtype
+			FROM vtiger_activity
+			INNER JOIN vtiger_seactivityrel
+				ON vtiger_seactivityrel.activityid = vtiger_activity.activityid
+			INNER JOIN vtiger_crmentity
+				ON vtiger_crmentity.crmid=vtiger_activity.activityid
+			LEFT JOIN vtiger_cntactivityrel
+				ON vtiger_cntactivityrel.activityid = vtiger_activity.activityid
+			LEFT JOIN vtiger_contactdetails
+				ON vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid
+			LEFT JOIN vtiger_users
+				ON vtiger_users.id = vtiger_crmentity.smownerid
+			LEFT OUTER JOIN vtiger_recurringevents
+				ON vtiger_recurringevents.activityid = vtiger_activity.activityid
+			LEFT JOIN vtiger_activitygrouprelation
+				ON vtiger_activitygrouprelation.activityid = vtiger_crmentity.crmid
+			LEFT JOIN vtiger_groups
+				ON vtiger_groups.groupname = vtiger_activitygrouprelation.groupname
+			WHERE vtiger_seactivityrel.crmid=".$id."
+			AND (activitytype = 'Task'
+				OR activitytype = 'Call'
+				OR activitytype = 'Meeting')";
+		$log->debug("Exiting get_activities method ...");
+		return GetRelatedList('Campaigns','Activities',$focus,$query,$button,$returnset);
+	}
 
 }
 ?>




From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 03:55:34 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 07:55:34 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231180=3A?=
 =?utf-8?q?_pricebook_related_list_shows_products_which_cannot_be_deleted_?=
 =?utf-8?q?from_related_list?=
In-Reply-To: <076.0271cde3695160584f02fe99d754d59c@vtiger.fosslabs.com>
References: <076.0271cde3695160584f02fe99d754d59c@vtiger.fosslabs.com>
Message-ID: <085.1c9bad5eeae5bbda4de1d564bc3beaa2@vtiger.fosslabs.com>

#1180: pricebook related list shows products which cannot be deleted from related
list
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  mickie
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mickie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 This issue has been fixed and the edit and delete links are working and
 the control will return the relatedlist.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1180>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 03:55:55 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 07:55:55 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7162 -
 /vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
Message-ID: <20060616075556.14CAE7ED2CF@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 16 01:55:52 2006
New Revision: 7162

Log:
task included as relatedlist for campaign

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

Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original)
+++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Fri Jun 16 01:55:52 2006
@@ -1801,6 +1801,7 @@
          $this->db->query("insert into vtiger_relatedlists values (".$this->db->getUniqueID('relatedlists').",".getTabid("Campaigns").",".getTabid("Contacts").",'get_contacts',1,'Contacts',0)");
          $this->db->query("insert into vtiger_relatedlists values (".$this->db->getUniqueID('relatedlists').",".getTabid("Campaigns").",".getTabid("Leads").",'get_leads',2,'Leads',0)");
 	 $this->db->query("insert into vtiger_relatedlists values (".$this->db->getUniqueID('relatedlists').",".getTabid("Campaigns").",".getTabid("Potentials").",'get_opportunities',3,'Potentials',0)");
+	 $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Campaigns").",9,'get_activities',4,'Activities',0)");
 
                $this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("notificationscheduler").",'LBL_TASK_NOTIFICATION_DESCRITPION',1,'Task Delay Notification','Tasks delayed beyond 24 hrs ','LBL_TASK_NOTIFICATION')");
 




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 03:56:28 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 07:56:28 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7163 - in /vtigercrm/trunk:
 Popup.php Smarty/templates/DisplayFields.tpl
 include/utils/EditViewUtils.php include/utils/ListViewUtils.php
 modules/Users/Popup.php modules/Users/User.php
Message-ID: <20060616075629.1689218189C@vtiger.fosslabs.com>

Author: don
Date: Fri Jun 16 01:56:18 2006
New Revision: 7163

Log:
user popup from Popup.php

Modified:
    vtigercrm/trunk/Popup.php
    vtigercrm/trunk/Smarty/templates/DisplayFields.tpl
    vtigercrm/trunk/include/utils/EditViewUtils.php
    vtigercrm/trunk/include/utils/ListViewUtils.php
    vtigercrm/trunk/modules/Users/Popup.php
    vtigercrm/trunk/modules/Users/User.php

Modified: vtigercrm/trunk/Popup.php
==============================================================================
--- vtigercrm/trunk/Popup.php (original)
+++ vtigercrm/trunk/Popup.php Fri Jun 16 01:56:18 2006
@@ -174,6 +174,14 @@
 		}
 		$alphabetical = AlphabeticalSearch($currentModule,'Popup','bookname','true','basic',$popuptype,"","","");
 		break;
+	case 'Users':
+                require_once("modules/$currentModule/User.php");
+                $focus = new User();
+                $smarty->assign("SINGLE_MOD",'Users');
+                if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] !='')
+                    $smarty->assign("RETURN_MODULE",$_REQUEST['return_module']);
+                $alphabetical = AlphabeticalSearch($currentModule,'Popup','user_name','true','basic',$popuptype,"","","");
+                break;	
 
 
 }

Modified: vtigercrm/trunk/Smarty/templates/DisplayFields.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DisplayFields.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DisplayFields.tpl Fri Jun 16 01:56:18 2006
@@ -537,7 +537,7 @@
 			       {$fldlabel}
 	            </td>
 				<td width="30%" align=left class="dvtCellInfo">
-				<input readonly name='{$fldname}' class="small" type="text" value='{$fldvalue}'><input name='reports_to_id' type="hidden" value='{$fldvalue}'>&nbsp;<input title="Change [Alt+C]" accessKey="C" type="button" class="small" value='{$UMOD.LBL_CHANGE}' name=btn1 LANGUAGE=javascript onclick='return window.open("index.php?module=Users&action=Popup&form=UsersEditView&form_submit=false","test","width=640,height=522,resizable=0,scrollbars=0");'>
+				<input readonly name='reports_to_name' class="small" type="text" value='{$fldvalue}'><input name='reports_to_id' type="hidden" value='{$secondvalue}'>&nbsp;<input title="Change [Alt+C]" accessKey="C" type="button" class="small" value='{$UMOD.LBL_CHANGE}' name=btn1 LANGUAGE=javascript onclick='return window.open("index.php?module=Users&action=Popup&form=UsersEditView&form_submit=false","test","width=640,height=522,resizable=0,scrollbars=0");'>
 	            </td>
 			{elseif $uitype eq 116}<!-- for currency in users details-->	
 			<td width="20%" class="dvtCellLabel" align=right>

Modified: vtigercrm/trunk/include/utils/EditViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/EditViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/EditViewUtils.php Fri Jun 16 01:56:18 2006
@@ -1124,6 +1124,11 @@
 			}
 		else
 			$fieldvalue[] = '';
+	}elseif($uitype == 101)
+	{
+		$editview_label[]=$mod_strings[$fieldlabel];
+        $fieldvalue[] = getUserName($value);
+        $fieldvalue[] = $value;
 	}
 	else
 	{

Modified: vtigercrm/trunk/include/utils/ListViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/ListViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/ListViewUtils.php Fri Jun 16 01:56:18 2006
@@ -828,7 +828,14 @@
 		{
 
 			//Getting the entityid
-			$entity_id = $adb->query_result($list_result,$i-1,"crmid");
+			if($module != 'Users')	
+			{
+				$entity_id = $adb->query_result($list_result,$i-1,"crmid");
+			}else
+			{
+				$entity_id = $adb->query_result($list_result,$i-1,"id");
+			}	
+				
 			$list_header=Array();
 
 			foreach($focus->search_fields as $name=>$tableinfo)
@@ -949,7 +956,6 @@
 		$uitype = $key;
 		$colname = $value;
         }
-
 	//added for getting event status in Custom view - Jaguar
 	if($module == 'Activities' && $colname == "status")
 	{
@@ -997,7 +1003,7 @@
 	{
 		$value = '<a href="http://'.$temp_val.'" target="_blank">'.$temp_val.'</a>';
 	}
-	elseif($uitype == 13)
+	elseif($uitype == 13 || $uitype == 104)
         {
 		if(useInternalMailer() == 1)
                 	$value = '<a href="javascript:InternalMailer('.$entity_id.',\'record_id\')">'.$temp_val.'</a>';
@@ -1354,7 +1360,6 @@
 					{
 						$name = $adb->query_result($list_result,$list_result_count,'accountname');
 						$accid =$adb->query_result($list_result,$list_result_count,'accountid');
-						//$value = '<a href="javascript: submitform('.$accid.');">'.$temp_val.'</a>';
 						$emailaddress=$adb->query_result($list_result,$list_result_count,"email1");
 						if($emailaddress == '')
 							$emailaddress=$adb->query_result($list_result,$list_result_count,"email2");
@@ -1380,11 +1385,19 @@
 						//Change this index 0 - to get the vtiger_fieldid based on email or yahooid
 						$fieldid = $adb->query_result($queryres,0,'fieldid');
 
-						//$value = '<a href="javascript: submitform('.$entity_id.');">'.$name.'</a>';
 						$value = '<a href="a" LANGUAGE=javascript onclick=\'return set_return_emails('.$entity_id.','.$fieldid.',"'.$name.'","'.$emailaddress.'"); \'>'.$name.'</a>';
 
-
+					}else
+					{
+						$firstname=$adb->query_result($list_result,$list_result_count,"first_name");
+						$lastname=$adb->query_result($list_result,$list_result_count,"last_name");
+						$name=$lastname.' '.$firstname;
+						$emailaddress=$adb->query_result($list_result,$list_result_count,"email1");
+
+						$value = '<a href="a" LANGUAGE=javascript onclick=\'return set_return_emails('.$entity_id.',-1,"'.$name.'","'.$emailaddress.'"); \'>'.$name.'</a>';
+						
 					}
+						
 				}	
 				elseif($popuptype == "specific_vendor_address")
 				{

Modified: vtigercrm/trunk/modules/Users/Popup.php
==============================================================================
--- vtigercrm/trunk/modules/Users/Popup.php (original)
+++ vtigercrm/trunk/modules/Users/Popup.php Fri Jun 16 01:56:18 2006
@@ -1,180 +1,20 @@
-<?php
-/*********************************************************************************
- * The contents of this file are subject to the SugarCRM Public License Version 1.1.2
- * ("License"); You may not use this file except in compliance with the 
- * License. You may obtain a copy of the License at http://www.sugarcrm.com/SPL
- * Software distributed under the License is distributed on an  "AS IS"  basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
- * the specific language governing rights and limitations under the License.
- * The Original Code is:  SugarCRM Open Source
- * The Initial Developer of the Original Code is SugarCRM, Inc.
- * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.;
- * All Rights Reserved.
- * Contributor(s): ______________________________________.
- ********************************************************************************/
-/*********************************************************************************
- * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Users/Popup.php,v 1.5 2005/04/27 09:51:34 rank Exp $
- * Description:  TODO: To be written.
- * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
- * All Rights Reserved.
- * Contributor(s): ______________________________________..
- ********************************************************************************/
-// This file is used for all popups on this module
-// The popup_picker.html file is used for generating a list from which to find and choose one instance.
-
-global $theme;
-require_once('modules/Users/User.php');
-require_once('themes/'.$theme.'/layout_utils.php');
-require_once('include/logging.php');
-require_once('XTemplate/xtpl.php');
-require_once('include/utils/utils.php');
-require_once('include/ListView/ListView.php');
-
-global $mod_strings;
-global $app_strings;
-
-global $list_max_entries_per_page;
-global $urlPrefix;
-global $currentModule;
-
-$log = LoggerManager::getLogger('user');
-
-$seed_object = new User();
-
-
-$where = "";
-if(isset($_REQUEST['query']))
-{
-	$search_fields = Array("first_name", "last_name", "user_name");
-
-	$where_clauses = Array();
-
-	append_where_clause($where_clauses, "first_name", "users.first_name");
-	append_where_clause($where_clauses, "last_name", "users.last_name");
-	append_where_clause($where_clauses, "user_name", "users.user_name");
-
-	$where = generate_where_statement($where_clauses);
-}
-
-
-$image_path = 'themes/'.$theme.'/images';
-
-////////////////////////////////////////////////////////
-// Start the output
-////////////////////////////////////////////////////////
-if (!isset($_REQUEST['html'])) {
-	if($_REQUEST['popuptype'] != 'set_return_emails')
-		$form =new XTemplate ('modules/Users/Popup_picker.html');
-	else
-		$form =new XTemplate ('modules/Users/Popup_picker_emails.html');
-	$log->debug("using file modules/Users/Popup_picker.html");
-}
-else {
-	if($_REQUEST['popuptype'] != 'set_return_emails')
-		$form =new XTemplate ('modules/Users/'.$_REQUEST['html'].'.html');
-	else
-		$form =new XTemplate ('modules/Users/Popup_picker_emails.html');
-	$log->debug("using file modules/Users/".$_REQUEST['html'].'.html');
-	$log->debug("_REQUEST['html'] is ".$_REQUEST['html']);
-}
-	$form->assign("POPUPTYPE",$_REQUEST['popuptype']);
-
-$form->assign("MOD", $mod_strings);
-$form->assign("IMAGE_PATH", $image_path);
-$form->assign("APP", $app_strings);
-
-// the form key is required
-if(!isset($_REQUEST['form']))
-	die("Missing 'form' parameter");
-
-
-// This code should always return an answer.
-// The form name should be made into a parameter and not be hard coded in this file.
-if(isset($_REQUEST['form_submit']) && $_REQUEST['popuptype'] == 'detailview' && $_REQUEST['form_submit'] == 'true')
-{
-	$the_javascript  = "<script type='text/javascript' language='JavaScript'>\n";
-	$the_javascript .= "function set_return(user_id, user_name) {\n";
-	//$the_javascript .= 'opener.document.location.href="index.php?module='.$return_module.'&action=updateRelations&entityid="+user_id+"&parid='.$recordid.'"; \n';
-	$the_javascript .= "	window.opener.document.form.user_id.value = user_id; \n";
-	$the_javascript .= "	window.opener.document.form.return_module.value = window.opener.document.form.return_module.value; \n";
-	//$the_javascript .= "	window.opener.document.DetailView.return_action.value = 'DetailView'; \n";
-	$the_javascript .= "	window.opener.document.form.return_id.value = window.opener.document.form.record.value; \n";
-	$the_javascript .= "   window.opener.document.form.module.value = window.opener.document.form.return_module.value; \n";
-	$the_javascript .= "	window.opener.document.form.action.value = 'updateRelations'; \n";
-	$the_javascript .= "	window.opener.document.form.submit(); \n";
-	$the_javascript .= "}\n";
-	$the_javascript .= "</script>\n";
-}
-elseif ($_REQUEST['form'] == 'UsersEditView') 
-{
-	$the_javascript  = "<script type='text/javascript' language='JavaScript'>\n";
-	$the_javascript .= "function set_return(user_id, user_name) {\n";
-	$the_javascript .= "	window.opener.document.EditView.reports_to_name.value = user_name;\n";
-	$the_javascript .= "	window.opener.document.EditView.reports_to_id.value = user_id;\n";
-	$the_javascript .= "}\n";
-	$the_javascript .= "</script>\n";
-}
-elseif($_REQUEST['popuptype'] == 'set_return_emails')
-{
-	$the_javascript = "<script type='text/javascript' src='include/js/Mail.js'></script>";	
-}
-else // ($_REQUEST['form'] == 'EditView') 
-{
-	$the_javascript  = "<script type='text/javascript' language='JavaScript'>\n";
-	$the_javascript .= "function set_return(user_id, user_name) {\n";
-	$the_javascript .= "	window.opener.document.EditView.user_name.value = user_name;\n";
-	$the_javascript .= "	window.opener.document.EditView.user_id.value = user_id;\n";
-	$the_javascript .= "}\n";
-	$the_javascript .= "</script>\n";
-}	
-
-$form->assign("SET_RETURN_JS", $the_javascript);
-
-$form->assign("THEME", $theme);
-$form->assign("IMAGE_PATH", $image_path);
-$form->assign("MODULE_NAME", $currentModule);
-$form->assign("FORM_SUBMIT", $_REQUEST['form_submit']);
-$form->assign("FORM", $_REQUEST['form']);
-
-insert_popup_header($theme);
-
-// Quick search.
-echo "<form>";
-echo get_form_header($mod_strings['LBL_SEARCH_FORM_TITLE'], "", false);
-
-if (isset($_REQUEST['first_name'])) $last_search['FIRST_NAME'] = $_REQUEST['first_name'];
-if (isset($_REQUEST['last_name'])) $last_search['LAST_NAME'] = $_REQUEST['last_name'];
-if (isset($_REQUEST['user_name'])) $last_search['USER_NAME'] = $_REQUEST['user_name'];
-if (isset($last_search)) $form->assign("LAST_SEARCH", $last_search);
-
-$form->parse("main.SearchHeader");
-$form->out("main.SearchHeader");
-
-echo get_form_footer();
-
-$form->parse("main.SearchHeaderEnd");
-$form->out("main.SearchHeaderEnd");
-
-// Reset the sections that are already in the page so that they do not print again later.
-$form->reset("main.SearchHeader");
-$form->reset("main.SearchHeaderEnd");
-
-// start the form before the form header to avoid creating a gap in IE
-$button  = "<table cellspacing='0' cellpadding='1' border='0'><form border='0' action='index.php' method='post' name='form' id='form'>\n";
-$button .= "<tr><td>&nbsp;</td>";
-/*if ($_REQUEST['form_submit'] != 'true') $button .= "<td><input title='".$app_strings['LBL_CLEAR_BUTTON_TITLE']."' accessyKey='".$app_strings['LBL_CLEAR_BUTTON_KEY']."' class='button' LANGUAGE=javascript onclick=\"window.opener.document.EditView.account_name.value = '';window.opener.document.EditView.account_id.value = ''; window.close()\" type='submit' name='button' value='  Clear  '></td>\n";
-$button .= "<td><input title='".$app_strings['LBL_CANCEL_BUTTON_TITLE']."' accessyKey='".$app_strings['LBL_CANCEL_BUTTON_KEY']."' class='button' LANGUAGE=javascript onclick=\"window.close()\" type='submit' name='button' value='  ".$app_strings['LBL_CANCEL_BUTTON_LABEL']."  '></td>\n";
-$button .= "</tr></form></table>\n";
-*/
-
-$ListView = new ListView();
-$ListView->setXTemplate($form);
-$ListView->setHeaderTitle($mod_strings['LBL_LIST_FORM_TITLE']);
-//$ListView->setHeaderText($button);
-$ListView->setQuery($where, "", "user_name", "USER");
-$ListView->setModStrings($mod_strings);
-$ListView->processListView($seed_object, "main", "USER");
-
-
-
-?>
+<?php
+/*********************************************************************************
+ * The contents of this file are subject to the SugarCRM Public License Version 1.1.2
+ * ("License"); You may not use this file except in compliance with the 
+ * License. You may obtain a copy of the License at http://www.sugarcrm.com/SPL
+ * Software distributed under the License is distributed on an  "AS IS"  basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
+ * the specific language governing rights and limitations under the License.
+ * The Original Code is:  SugarCRM Open Source
+ * The Initial Developer of the Original Code is SugarCRM, Inc.
+ * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.;
+ * All Rights Reserved.
+ * Contributor(s): ______________________________________.
+ ********************************************************************************/
+/*********************************************************************************
+ * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Leads/Popup.php,v 1.7 2005/03/23 14:19:48 samk Exp $
+ * Description:  TODO: To be written.
+ ********************************************************************************/
+require_once('Popup.php');
+?>

Modified: vtigercrm/trunk/modules/Users/User.php
==============================================================================
--- vtigercrm/trunk/modules/Users/User.php (original)
+++ vtigercrm/trunk/modules/Users/User.php Fri Jun 16 01:56:18 2006
@@ -90,13 +90,19 @@
 	var $table_name = "vtiger_users";
 
 	// This is the list of fields that are in the lists.
-	var $list_link_field= '';
+	var $list_link_field= 'last_name';
 
 	var $list_mode;
 	var $popup_type;
 
-	var $search_fields = Array();
-	var $search_fields_name = Array();
+	var $search_fields = Array(
+		'Name'=>Array('vtiger_users'=>'last_name'),
+		'Email'=>Array('vtiger_users'=>'email1')
+	);
+	var $search_fields_name = Array(
+		'Name'=>'last_name',
+		'Email'=>'email1'
+	);
 
 	var $module_name = "Users";
 
@@ -113,7 +119,7 @@
 	// This is used to retrieve related fields from form posts.
 	var $additional_column_fields = Array('reports_to_name');		
 
-	var $sortby_fields = Array('status','email1','phone_work','is_admin','user_name');	  
+	var $sortby_fields = Array('status','email1','phone_work','is_admin','user_name','last_name');	  
 
 	// This is the list of vtiger_fields that are in the lists.
 	var $list_fields = Array(




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 03:56:58 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 07:56:58 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7164 -
	/vtigercrm/trunk/install/2setConfig.php
Message-ID: <20060616075658.AAACE638FE3@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 16 01:56:54 2006
New Revision: 7164

Log:
changes made to display path name. Fixes #1153

Modified:
    vtigercrm/trunk/install/2setConfig.php

Modified: vtigercrm/trunk/install/2setConfig.php
==============================================================================
--- vtigercrm/trunk/install/2setConfig.php (original)
+++ vtigercrm/trunk/install/2setConfig.php Fri Jun 16 01:56:54 2006
@@ -110,11 +110,9 @@
 	$site_URL = $site_URL;
 	else $site_URL = $web_root;
 
-	if (! isset($_REQUEST['root_directory']))
-	{
-	 	$root_directory = $current_dir;
-	}
-
+	if(isset($_REQUEST['root_directory'])) $root_directory = $_REQUEST['root_directory'];
+	else $root_directory = $current_dir;
+	    
 	if (isset($_REQUEST['cache_dir']))
 	$cache_dir= $_REQUEST['cache_dir'];
 




From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 03:56:57 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 07:56:57 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231153=3A?=
 =?utf-8?q?_Source_Installer=3A_data_in_=22Path=22_field_disappears?=
In-Reply-To: <076.a6308f317cdefba138949240f46f1aae@vtiger.fosslabs.com>
References: <076.a6308f317cdefba138949240f46f1aae@vtiger.fosslabs.com>
Message-ID: <085.4d6a543a6e744b30e6b6c6a5095be4b1@vtiger.fosslabs.com>

#1153: Source Installer: data in "Path" field disappears
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  saraj 
      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 [7164]) changes made to display path name. Fixes #1153

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1153>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 03:57:16 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 07:57:16 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7165 - in
 /vtigercrm/trunk/modules/Users: Popup_picker.html Popup_picker_emails.html
Message-ID: <20060616075716.457DA18189C@vtiger.fosslabs.com>

Author: don
Date: Fri Jun 16 01:57:12 2006
New Revision: 7165

Log:
smartified so removed

Removed:
    vtigercrm/trunk/modules/Users/Popup_picker.html
    vtigercrm/trunk/modules/Users/Popup_picker_emails.html




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 03:58:40 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 07:58:40 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7166 -
	/vtigercrm/trunk/Smarty/templates/Popup.tpl
Message-ID: <20060616075840.8853449A299@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 16 01:58:36 2006
New Revision: 7166

Log:
js function add_leaddata_to_relatedlist included

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

Modified: vtigercrm/trunk/Smarty/templates/Popup.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Popup.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Popup.tpl Fri Jun 16 01:58:36 2006
@@ -20,6 +20,10 @@
 function add_data_to_relatedlist(entity_id,recordid) {ldelim}
 
         opener.document.location.href="index.php?module={$RETURN_MODULE}&action=updateRelations&destination_module=Contacts&entityid="+entity_id+"&parid="+recordid;
+{rdelim}
+
+function add_leaddata_to_relatedlist(entity_id,recordid) {ldelim}
+        opener.document.location.href="index.php?module={$RETURN_MODULE}&action=updateRelations&destination_module=Leads&entityid="+entity_id+"&parid="+recordid;
 {rdelim}
 </script>
 <body class="small" marginwidth=0 marginheight=0 leftmargin=0 topmargin=0 bottommargin=0 rigthmargin=0>




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 04:00:48 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 08:00:48 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7167 -
	/vtigercrm/trunk/include/utils/DetailViewUtils.php
Message-ID: <20060616080048.B948618189C@vtiger.fosslabs.com>

Author: don
Date: Fri Jun 16 02:00:45 2006
New Revision: 7167

Log:
link displayed for username in reports to field in users

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 Fri Jun 16 02:00:45 2006
@@ -125,7 +125,7 @@
 		$label_fld["secid"] = $account_id;
 		$label_fld["link"] = "index.php?module=Accounts&action=DetailView&record=".$account_id;
 	}
-	elseif($uitype == 52 || $uitype == 77)
+	elseif($uitype == 52 || $uitype == 77  || $uitype == 101)
 	{
 		$label_fld[] = $mod_strings[$fieldlabel];
 		$user_id = $col_fields[$fieldname];




From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 04:02:14 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 08:02:14 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231235=3A?=
 =?utf-8?q?_Outgoing_VS_OutGoing_-_Maili_Server_config=2E?=
In-Reply-To: <076.9f4f1255a0b8a49b0a0a3ec2cdef0c20@vtiger.fosslabs.com>
References: <076.9f4f1255a0b8a49b0a0a3ec2cdef0c20@vtiger.fosslabs.com>
Message-ID: <085.7bca0f118dd241fae85351a62fc4fccd@vtiger.fosslabs.com>

#1235: Outgoing VS OutGoing - Maili Server config.
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  saraj 
      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 [7168]) 'OutGoing' changed to 'Outgoing'. Fixes #1235

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1235>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 04:02:15 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 08:02:15 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7168 -
 /vtigercrm/trunk/modules/Settings/language/en_us.lang.php
Message-ID: <20060616080215.3C3F07ED2ED@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 16 02:02:11 2006
New Revision: 7168

Log:
'OutGoing' changed to 'Outgoing'. Fixes #1235

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 Fri Jun 16 02:02:11 2006
@@ -295,11 +295,11 @@
 
 'LBL_MAIL_SERVER_INFO'=>'Mail Server Information',
 
-'LBL_OUTGOING_MAIL_SERVER'=>'OutGoing Mail Server',
-
-'LBL_OUTGOING_MAIL_SERVER_LOGIN_USER_NAME'=>'OutGoing Mail Server Login User Name',
-
-'LBL_OUTGOING_MAIL_SERVER_PASSWORD'=>'OutGoing Mail Server Password',
+'LBL_OUTGOING_MAIL_SERVER'=>'Outgoing Mail Server',
+
+'LBL_OUTGOING_MAIL_SERVER_LOGIN_USER_NAME'=>'Outgoing Mail Server Login User Name',
+
+'LBL_OUTGOING_MAIL_SERVER_PASSWORD'=>'Outgoing Mail Server Password',
 
 'LBL_MAIL_SERVER_SMTP'=>'Mail Server (SMTP)',
 




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 04:04:11 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 08:04:11 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7169 -
	/vtigercrm/trunk/Smarty/templates/RelatedLists.tpl
Message-ID: <20060616080411.6065249A299@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 16 02:04:06 2006
New Revision: 7169

Log:
js function add_leaddata_to_relatedlist included

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

Modified: vtigercrm/trunk/Smarty/templates/RelatedLists.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/RelatedLists.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/RelatedLists.tpl Fri Jun 16 02:04:06 2006
@@ -89,19 +89,25 @@
 							<input title="{$APP.LBL_ADD_NEW} {$APP.Product}" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='Products';this.form.return_module.value='{$MODULE}';this.form.return_action.value='CallRelatedList'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Product}"></td>				
 							{/if}	
 							{elseif $header eq 'Leads'}
+							{if $MODULE eq 'Campaigns'}
+                                                        <input title="Change" accessKey="" class="small" value="{$APP.LBL_SELECT_BUTTON_LABEL} {$APP.Lead}" LANGUAGE=javascript onclick='return window.open("index.php?module=Leads&return_module={$MODULE}&action=Popup&popuptype=detailview&select=enable&form=EditView&form_submit=false&recordid={$ID}","test","width=640,height=570,resizable=0,scrollbars=0");' type="button"  name="button">
+                                                        {/if}
                                                         <input title="{$APP.LBL_ADD_NEW} {$APP.Lead}" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='Leads'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Lead}"></td>
 							{elseif $header eq 'Contacts' }
-							{if $MODULE eq 'Activities' || $MODULE eq 'Potentials' || $MODULE eq 'Vendors' || $MODULE eq 'Campaigns'}
+							{if $MODULE eq 'Activities' || $MODULE eq 'Potentials' || $MODULE eq 'Vendors'}
                                                         <input title="Change" accessKey="" class="small" value="{$APP.LBL_SELECT_BUTTON_LABEL} {$APP.Contact}" LANGUAGE=javascript onclick='return window.open("index.php?module=Contacts&return_module={$MODULE}&action=Popup&popuptype=detailview&select=enable&form=EditView&form_submit=false&recordid={$ID}","test","width=640,height=570,resizable=0,scrollbars=0");' type="button"  name="button"></td>
 							{elseif $MODULE eq 'Emails'}
 							<input title="{$APP.LBL_BULK_MAILS}" accessykey="F" class="small" onclick="this.form.action.value='sendmail';this.form.return_action.value='DetailView';this.form.module.value='Emails';this.form.return_module.value='Emails';" name="button" value="{$APP.LBL_BULK_MAILS}" type="submit">&nbsp;
                                                         <input title="Change" accessKey="" class="small" value="{$APP.LBL_SELECT_BUTTON_LABEL} {$APP.Contact}" LANGUAGE=javascript onclick='return window.open("index.php?module=Contacts&return_module=Emails&action=Popup&popuptype=detailview&form=EditView&form_submit=false&recordid={$ID}","test","width=640,height=570,resizable=0,scrollbars=0");' type="button"  name="button"></td>
+							{elseif $MODULE eq 'Campaigns'}
+                                                        <input title="Change" accessKey="" class="small" value="{$APP.LBL_SELECT_BUTTON_LABEL} {$APP.Contact}" LANGUAGE=javascript onclick='return window.open("index.php?module=Contacts&return_module={$MODULE}&action=Popup&popuptype=detailview&select=enable&form=EditView&form_submit=false&recordid={$ID}","test","width=640,height=570,resizable=0,scrollbars=0");' type="button"  name="button">
+                                                        <input title="{$APP.LBL_ADD_NEW} {$APP.Contact}" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='Contacts'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Contact}"></td>
 							{else}
                                                         <input title="{$APP.LBL_ADD_NEW} {$APP.Contact}" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='Contacts'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Contact}"></td>
                                                         {/if}
 
 							{elseif $header eq 'Activities'}
-							{if $MODULE eq 'PurchaseOrder' || $MODULE eq 'Invoice' || $MODULE eq 'SalesOrder' || $MODULE eq 'Quotes'}	
+							{if $MODULE eq 'PurchaseOrder' || $MODULE eq 'Invoice' || $MODULE eq 'SalesOrder' || $MODULE eq 'Quotes' || $MODULE eq 'Campaigns'}	
 							<input type="hidden" name="activity_mode">
 							<input title="{$APP.LBL_ADD_NEW} {$APP.Task}" accessyKey="F" class="small" onclick="this.form.action.value='EditView'; this.form.return_action.value='CallRelatedList'; this.form.module.value='Activities'; this.form.return_module.value='{$MODULE}'; this.form.activity_mode.value='Task'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Task}"></td>
 							{else}




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 04:06:35 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 08:06:35 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7170 -
	/vtigercrm/trunk/Smarty/templates/AddMailAccount.tpl
Message-ID: <20060616080635.8465649A299@vtiger.fosslabs.com>

Author: don
Date: Fri Jun 16 02:06:31 2006
New Revision: 7170

Log:
announcement issue has been fixed

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

Modified: vtigercrm/trunk/Smarty/templates/AddMailAccount.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/AddMailAccount.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/AddMailAccount.tpl Fri Jun 16 02:06:31 2006
@@ -10,11 +10,6 @@
  ********************************************************************************/
 -->*}
 <script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
-<script language="JavaScript" type="text/javascript" src="include/js/ColorPicker2.js"></script>
-<script language="JavaScript" type="text/javascript" src="include/js/prototype.js"></script>
-<script language="JavaScript" type="text/javascript" src="include/js/slider.js"></script>
-<script language="JavaScript" type="text/javascript" src="include/js/prototype_fade.js"></script>
-<script language="JavaScript" type="text/javascript" src="include/js/effectspack.js"></script>
 <style type="text/css">@import url(themes/blue/style.css);</style>
 
 




From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 04:09:17 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 08:09:17 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231233=3A?=
 =?utf-8?q?_ftp_Server_Name_-_Usage_of_language?=
In-Reply-To: <076.8bacf82bf2e5bf63cfebb5dfb0157357@vtiger.fosslabs.com>
References: <076.8bacf82bf2e5bf63cfebb5dfb0157357@vtiger.fosslabs.com>
Message-ID: <085.1131803ce9b936a55baa40949bba507a@vtiger.fosslabs.com>

#1233: ftp Server Name - Usage of language
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  saraj 
      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 [7171]) 'ftp' changed to 'FTP'. Fixes #1233

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1233>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 04:09:17 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 08:09:17 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7171 -
 /vtigercrm/trunk/modules/Settings/language/en_us.lang.php
Message-ID: <20060616080917.DAA1C7ED2F9@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 16 02:09:13 2006
New Revision: 7171

Log:
'ftp' changed to 'FTP'. Fixes #1233

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 Fri Jun 16 02:09:13 2006
@@ -305,11 +305,11 @@
 
 'LBL_BACKUP_SERVER_CONFIG'=>'Backup Server Configuration',
 
-'LBL_FTP_SERVER_NAME'=>'ftp Server Name',
-
-'LBL_FTP_USER_NAME'=>'ftp User Name',
-
-'LBL_FTP_PASSWORD'=>'ftp Password',
+'LBL_FTP_SERVER_NAME'=>'FTP Server Name',
+
+'LBL_FTP_USER_NAME'=>'FTP User Name',
+
+'LBL_FTP_PASSWORD'=>'FTP Password',
 
 'LBL_SYSTEM_CONFIG'=>'System Configuration',
 




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 04:10:30 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 08:10:30 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7172 -
	/vtigercrm/trunk/include/utils/ListViewUtils.php
Message-ID: <20060616081031.1557749A299@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 16 02:10:27 2006
New Revision: 7172

Log:
changes made for leads popup

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 Fri Jun 16 02:10:27 2006
@@ -1282,10 +1282,15 @@
 				{
 					if($colname == "lastname" && $module == 'Contacts')
 						$firstname=$adb->query_result($list_result,$list_result_count,'firstname');
+					elseif($colname == "lastname" && $module == 'Leads')
+						$firstname=$adb->query_result($list_result,$list_result_count,'firstname');
 					$temp_val =$temp_val.' '.$firstname;
 
 					$focus->record_id = $_REQUEST['recordid'];
-					$value = '<a href="a" LANGUAGE=javascript onclick=\'add_data_to_relatedlist("'.$entity_id.'","'.$focus->record_id.'"); window.close()\'>'.$temp_val.'</a>';
+					if($module == 'Leads')
+						$value = '<a href="a" LANGUAGE=javascript onclick=\'add_leaddata_to_relatedlist("'.$entity_id.'","'.$focus->record_id.'"); window.close()\'>'.$temp_val.'</a>';
+					else
+						$value = '<a href="a" LANGUAGE=javascript onclick=\'add_data_to_relatedlist("'.$entity_id.'","'.$focus->record_id.'"); window.close()\'>'.$temp_val.'</a>';
 				}
 				elseif($popuptype == "formname_specific")
 				{




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 04:55:47 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 08:55:47 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7173 -
 /vtigercrm/trunk/modules/Campaigns/updateRelations.php
Message-ID: <20060616085548.1C6557ED2FA@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 16 02:55:44 2006
New Revision: 7173

Log:
changes made to update lead data in campaign RL

Modified:
    vtigercrm/trunk/modules/Campaigns/updateRelations.php

Modified: vtigercrm/trunk/modules/Campaigns/updateRelations.php
==============================================================================
--- vtigercrm/trunk/modules/Campaigns/updateRelations.php (original)
+++ vtigercrm/trunk/modules/Campaigns/updateRelations.php Fri Jun 16 02:55:44 2006
@@ -12,7 +12,19 @@
 require_once('include/database/PearDatabase.php');
 global $adb;
 $idlist = $_REQUEST['idlist'];
-$returnmodule = $_REQUEST['return_module'];
+$update_mod = $_REQUEST['destination_module'];
+if($update_mod == 'Leads')
+{
+	$rel_table = 'vtiger_campaignleadrel';
+	$mod_table = 'vtiger_leaddetails';
+	$mod_field = 'leadid';
+}
+elseif($update_mod == 'Contacts')
+{
+	$rel_table = 'vtiger_campaigncontrel';
+	$mod_table = 'vtiger_contactdetails';
+	$mod_field = 'contactid';
+}
 if(isset($_REQUEST['idlist']) && $_REQUEST['idlist'] != '')
 {
 	//split the string and store in an array
@@ -21,9 +33,9 @@
 	{
 		if($id != '')
 		{
-		    $sql = "insert into  vtiger_campaigncontrel values(".$_REQUEST["parentid"]." , ".$id.")";
+		    $sql = "insert into  ".$rel_table." values(".$_REQUEST["parentid"]." , ".$id.")";
 	            $adb->query($sql);
-		    $sql = "update vtiger_contactdetails set campaignid = ".$_REQUEST["parentid"]." where contactid = ".$id;
+		    $sql = "update ".$mod_table." set campaignid = ".$_REQUEST["parentid"]." where ".$mod_field." = ".$id;
                     $adb->query($sql);
 		}
 	}
@@ -31,9 +43,9 @@
 }
 elseif(isset($_REQUEST['entityid']) && $_REQUEST['entityid'] != '')
 {	
-		$sql = "insert into vtiger_campaigncontrel values(".$_REQUEST["parid"].",".$_REQUEST["entityid"].")";
+		$sql = "insert into ".$rel_table." values(".$_REQUEST["parid"].",".$_REQUEST["entityid"].")";
 		$adb->query($sql);
-		$sql = "update vtiger_contactdetails set campaignid = ".$_REQUEST["parid"]." where contactid = ".$_REQUEST["entityid"];
+		$sql = "update ".$mod_table." set campaignid = ".$_REQUEST["parid"]." where ".$mod_field." = ".$_REQUEST["entityid"];
                 $adb->query($sql);
  		header("Location: index.php?action=CallRelatedList&module=Campaigns&record=".$_REQUEST["parid"]);
 }




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 04:59:41 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 08:59:41 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7174 -
	/vtigercrm/trunk/modules/Emails/Email.php
Message-ID: <20060616085941.33A2A7ED2FA@vtiger.fosslabs.com>

Author: richie
Date: Fri Jun 16 02:59:36 2006
New Revision: 7174

Log:
corrected proper field name

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

Modified: vtigercrm/trunk/modules/Emails/Email.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/Email.php (original)
+++ vtigercrm/trunk/modules/Emails/Email.php Fri Jun 16 02:59:36 2006
@@ -304,7 +304,7 @@
 function get_to_emailids($module)
 {
 	global $adb;
-	$query = 'select columnname,fieldid from vtiger_field where vtiger_fieldid in('.ereg_replace(':',',',$_REQUEST["field_lists"]).')';
+	$query = 'select columnname,fieldid from vtiger_field where fieldid in('.ereg_replace(':',',',$_REQUEST["field_lists"]).')';
     $result = $adb->query($query);
 	$columns = Array();
 	$idlists = '';




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 05:02:59 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 09:02:59 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7175 -
 /vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php
Message-ID: <20060616090259.E0A547ED305@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 16 03:02:56 2006
New Revision: 7175

Log:
changes made to update campaign data while converting lead

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

Modified: vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php (original)
+++ vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php Fri Jun 16 03:02:56 2006
@@ -272,7 +272,7 @@
 $contact_id = $crmcontactid;
 $log->debug("contact id is ".$contact_id);
 
- $sql_insert_contact = "INSERT INTO vtiger_contactdetails (contactid,accountid,salutation,firstname,lastname,email,phone,mobile,title,fax,yahooid) VALUES (".$contact_id.",".$crmid.",'".$row["salutationtype"] ."','" .$row["firstname"] ."','" .$row["lastname"] ."','" .$row["email"] ."','" .$row["phone"]. "','" .$row["mobile"] ."','" .$row["designation"] ."','".$row["fax"] ."','".$row['yahooid']."')";
+ $sql_insert_contact = "INSERT INTO vtiger_contactdetails (contactid,accountid,campaignid,salutation,firstname,lastname,email,phone,mobile,title,fax,yahooid) VALUES (".$contact_id.",".$crmid."," .$row["campaignid"]. ",'".$row["salutationtype"] ."','" .$row["firstname"] ."','" .$row["lastname"] ."','" .$row["email"] ."','" .$row["phone"]. "','" .$row["mobile"] ."','" .$row["designation"] ."','".$row["fax"] ."','".$row['yahooid']."')";
 
 $adb->query($sql_insert_contact);
 
@@ -323,7 +323,7 @@
 		$potential_amount=0;
         }
 
-	$sql_insert_opp = "INSERT INTO vtiger_potential (potentialid,accountid,potentialname,leadsource,closingdate,sales_stage,amount) VALUES (".$oppid.",".$crmid .",'".$potential_name."','".$row['leadsource']."','".$close_date."','".$potential_sales_stage."',".$potential_amount.")";
+	$sql_insert_opp = "INSERT INTO vtiger_potential (potentialid,accountid,campaignid,potentialname,leadsource,closingdate,sales_stage,amount) VALUES (".$oppid.",".$crmid .",".$row["campaignid"]. ",'".$potential_name."','".$row['leadsource']."','".$close_date."','".$potential_sales_stage."',".$potential_amount.")";
 
 	$adb->query($sql_insert_opp);
 




From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 05:05:27 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 09:05:27 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231211=3A?=
 =?utf-8?q?_emails_related_to_contact_not_shown_in_contact_related_list?=
In-Reply-To: <076.68324496101fd75efdb14aeacd9abb05@vtiger.fosslabs.com>
References: <076.68324496101fd75efdb14aeacd9abb05@vtiger.fosslabs.com>
Message-ID: <085.bc42ca152b54b48c106c0471ad9e7fa2@vtiger.fosslabs.com>

#1211: emails related to contact not shown in contact related list
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  richie
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 (In [7176]) Fixes #1211

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1211>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 05:05:28 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 09:05:28 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7176 -
	/vtigercrm/trunk/modules/Emails/mailsend.php
Message-ID: <20060616090528.5C9D87ED30B@vtiger.fosslabs.com>

Author: richie
Date: Fri Jun 16 03:05:23 2006
New Revision: 7176

Log:
Fixes #1211

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

Modified: vtigercrm/trunk/modules/Emails/mailsend.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/mailsend.php (original)
+++ vtigercrm/trunk/modules/Emails/mailsend.php Fri Jun 16 03:05:23 2006
@@ -188,8 +188,8 @@
 $adb->println("Mail Sending Process has been finished.\n\n");
 if(isset($_REQUEST['popupaction']) && $_REQUEST['popupaction'] != '')
 {
-	//$inputs="<script>window.opener.location.href=window.opener.location.href;window.self.close();</script>";
-	$inputs="<script>window.self.close();</script>";
+	//this will fix #1211
+	$inputs="<script>window.opener.location.href=window.opener.location.href;window.self.close();</script>";
 	echo $inputs;
 }
 //header("Location:index.php?module=$returnmodule&action=$returnaction&record=$returnid&$returnset&$mail_error_str");




From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 05:08:45 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 09:08:45 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=23810=3A_?=
	=?utf-8?q?Creating_New_Potential?=
In-Reply-To: <076.b82f5ddc46ef8a0cb2806330580b0dba@vtiger.fosslabs.com>
References: <076.b82f5ddc46ef8a0cb2806330580b0dba@vtiger.fosslabs.com>
Message-ID: <085.7637c510e7289737655ff2a86f72e192@vtiger.fosslabs.com>

#810: Creating New Potential
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  richie
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  invalid    |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * resolution:  => invalid
  * status:  assigned => closed

Comment:

 closing this as no info to follow up on

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/810>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 05:12:14 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 09:12:14 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23958=3A_?=
 =?utf-8?q?Form_Validation_in_Potential_not_Proper?=
In-Reply-To: <076.b9e85f1cd53d96e1ff34954b81dc868e@vtiger.fosslabs.com>
References: <076.b9e85f1cd53d96e1ff34954b81dc868e@vtiger.fosslabs.com>
Message-ID: <085.673a657550a9402e6373fb1d40faa650@vtiger.fosslabs.com>

#958: Form Validation in Potential not Proper
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  mangai
      Type:  defect     |      Status:  closed
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  wontfix    |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * resolution:  => wontfix
  * status:  new => closed

Comment:

 will not b fixed. let us wait for community reaction to this issue.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/958>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 05:15:07 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 09:15:07 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=23224=3A_?=
	=?utf-8?q?Validation_not_proper?=
In-Reply-To: <076.8342f02ae6134b90ef70026e212bd85e@vtiger.fosslabs.com>
References: <076.8342f02ae6134b90ef70026e212bd85e@vtiger.fosslabs.com>
Message-ID: <085.1a7287c8f1a02fd6e62c642ff584533f@vtiger.fosslabs.com>

#224: Validation not proper
---------------------------+------------------------------------------------
  Reporter:  jerrydgeorge  |       Owner:  mangai    
      Type:  defect        |      Status:  closed    
  Priority:  major         |   Milestone:            
 Component:  vtigercrm     |     Version:  5.0.0     
Resolution:  wontfix       |    Keywords:  validation
---------------------------+------------------------------------------------
Changes (by richie):

  * resolution:  => wontfix
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/224>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 05:15:17 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 09:15:17 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=23227=3A_?=
	=?utf-8?q?Validation_not_proper?=
In-Reply-To: <076.4d0af3665d7fb13a9e1f2ab8cf2d2a62@vtiger.fosslabs.com>
References: <076.4d0af3665d7fb13a9e1f2ab8cf2d2a62@vtiger.fosslabs.com>
Message-ID: <085.d3549934109932229067bffebc23370c@vtiger.fosslabs.com>

#227: Validation not proper
---------------------------+------------------------------------------------
  Reporter:  jerrydgeorge  |       Owner:  mangai    
      Type:  defect        |      Status:  closed    
  Priority:  major         |   Milestone:            
 Component:  vtigercrm     |     Version:  5.0.0     
Resolution:  wontfix       |    Keywords:  validation
---------------------------+------------------------------------------------
Changes (by richie):

  * resolution:  => wontfix
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/227>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 05:15:33 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 09:15:33 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=23650=3A_?=
	=?utf-8?q?Create_View_Issue?=
In-Reply-To: <076.533f9bf1a724614bf3d2b0408f730475@vtiger.fosslabs.com>
References: <076.533f9bf1a724614bf3d2b0408f730475@vtiger.fosslabs.com>
Message-ID: <085.9d5c056e20e0a17ee6c2986d2dd02492@vtiger.fosslabs.com>

#650: Create View Issue
---------------------------+------------------------------------------------
  Reporter:  jerrydgeorge  |       Owner:  mangai     
      Type:  defect        |      Status:  closed     
  Priority:  major         |   Milestone:             
 Component:  vtigercrm     |     Version:  5.0.0      
Resolution:  fixed         |    Keywords:  Create View
---------------------------+------------------------------------------------
Changes (by minnie):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/650>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 05:15:41 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 09:15:41 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23749=3A_?=
 =?utf-8?q?Bugs_with_apostrophes_in_Lead_conversion_and_Helpdesk_ticket?=
In-Reply-To: <076.6c5a8e4857db1ceb5cdfe4078eda9b17@vtiger.fosslabs.com>
References: <076.6c5a8e4857db1ceb5cdfe4078eda9b17@vtiger.fosslabs.com>
Message-ID: <085.a8d3390a09b90cfdf36415d39edeb2af@vtiger.fosslabs.com>

#749: Bugs with apostrophes in Lead conversion and Helpdesk ticket
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  mickie               
      Type:  defect     |      Status:  new                  
  Priority:  major      |   Milestone:                       
 Component:  vtigercrm  |     Version:  5.0.0                
Resolution:             |    Keywords:  apostrophe conversion
------------------------+---------------------------------------------------
Changes (by richie):

  * owner:  mangai => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/749>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 05:15:58 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 09:15:58 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23902=3A_?=
 =?utf-8?q?yahoo_id_is_not_validated_in_create_contact?=
In-Reply-To: <076.4b5ea1d99ba4583cebb1764d6707acbf@vtiger.fosslabs.com>
References: <076.4b5ea1d99ba4583cebb1764d6707acbf@vtiger.fosslabs.com>
Message-ID: <085.737fef1201f535f268eb7295667d7d35@vtiger.fosslabs.com>

#902: yahoo id is not validated in create contact
------------------------+---------------------------------------------------
  Reporter:  mickie     |       Owner:  mangai
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  wontfix    |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * resolution:  => wontfix
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/902>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 05:16:06 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 09:16:06 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23936=3A_?=
 =?utf-8?q?validation_not_performed_in_chat_window?=
In-Reply-To: <076.4a509e9ad2dcb708710e1319ff1b284e@vtiger.fosslabs.com>
References: <076.4a509e9ad2dcb708710e1319ff1b284e@vtiger.fosslabs.com>
Message-ID: <085.4af6f48cb428b04a674e0d8cff664e7c@vtiger.fosslabs.com>

#936: validation not performed in chat window
------------------------+---------------------------------------------------
  Reporter:  mickie     |       Owner:  mangai
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  wontfix    |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * resolution:  => wontfix
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/936>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 05:16:20 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 09:16:20 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231101=3A?=
 =?utf-8?q?_UI_issue_View_Names_for_Calendar?=
In-Reply-To: <076.b7a056cbb88a5a06ee49d953312cc2d3@vtiger.fosslabs.com>
References: <076.b7a056cbb88a5a06ee49d953312cc2d3@vtiger.fosslabs.com>
Message-ID: <085.76d6045cd5601d6986f0be626b8c4d9b@vtiger.fosslabs.com>

#1101: UI issue View Names for Calendar
---------------------------+------------------------------------------------
  Reporter:  jerrydgeorge  |       Owner:  saint
      Type:  defect        |      Status:  new  
  Priority:  major         |   Milestone:       
 Component:  vtigercrm     |     Version:  5.0.0
Resolution:                |    Keywords:       
---------------------------+------------------------------------------------
Changes (by richie):

  * owner:  mangai => saint

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1101>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 05:17:57 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 09:17:57 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231253=3A?=
 =?utf-8?q?_Campaigns_Cannot_Assign_To_Existing_Contacts=2C_Leads_or_Accou?=
 =?utf-8?q?nts?=
In-Reply-To: <076.329f0bfa1e61cd49791cee91bbc8d6ba@vtiger.fosslabs.com>
References: <076.329f0bfa1e61cd49791cee91bbc8d6ba@vtiger.fosslabs.com>
Message-ID: <085.c0fb630606d59771667deafc62b9121b@vtiger.fosslabs.com>

#1253: Campaigns Cannot Assign To Existing Contacts, Leads or Accounts
------------------------------------+---------------------------------------
  Reporter:  robbie-w at boston.ac.uk  |       Owner:  mangai
      Type:  task                   |      Status:  closed
  Priority:  major                  |   Milestone:        
 Component:  vtigercrm              |     Version:  5.0.0 
Resolution:  fixed                  |    Keywords:        
------------------------------------+---------------------------------------
Changes (by minnie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 Accounts will not be related as of now.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1253>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 05:24:13 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 09:24:13 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7177 -
	/vtigercrm/trunk/install.php
Message-ID: <20060616092413.DF7247ED311@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 16 03:24:09 2006
New Revision: 7177

Log:
copyright info added in installation pages. Fixes #1085

Modified:
    vtigercrm/trunk/install.php

Modified: vtigercrm/trunk/install.php
==============================================================================
--- vtigercrm/trunk/install.php (original)
+++ vtigercrm/trunk/install.php Fri Jun 16 03:24:09 2006
@@ -49,4 +49,25 @@
 
 include("install/".$the_file);
 
+echo "<style>
+		.bggray
+		{
+			background-color: #dfdfdf;
+		}
+	.bgwhite
+	{
+		background-color: #FFFFFF;
+	}
+	.copy
+	{
+		font-size:9px;
+		font-family: Verdana, Arial, Helvetica, Sans-serif;
+	}
+	</style>
+	<script language = 'JavaScript' type='text/javascript' src = 'include/js/popup.js'></script>
+	<table width=20% border=0 cellspacing=1 cellpadding=0 class=\"bggray\" align=center><tr><td align=center>\n
+	<table width=100% border=0 cellspacing=1 cellpadding=0 class=\"bgwhite\" align=center><tr><td align=center class=\"copy\">\n
+	&copy; Click <a href ='javascript:mypopup()'>here</a> for Copyright details.<br>
+	</td></tr></table></td></tr></table>\n";
+
 ?>




From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 05:24:13 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 09:24:13 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231085=3A?=
 =?utf-8?q?_Copyright_message_missed_in_Installer?=
In-Reply-To: <076.ca4f7110cd4c9640e7ef0f709ef932b5@vtiger.fosslabs.com>
References: <076.ca4f7110cd4c9640e7ef0f709ef932b5@vtiger.fosslabs.com>
Message-ID: <085.2581f1fd0cef89945bac805265287832@vtiger.fosslabs.com>

#1085: Copyright message missed in Installer
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  saraj 
      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 [7177]) copyright info added in installation pages. Fixes #1085

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1085>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 05:25:18 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 09:25:18 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23639=3A_?=
 =?utf-8?q?issue_in_notification_schedular?=
In-Reply-To: <076.f200a972484f8418950e2e27d65d4d44@vtiger.fosslabs.com>
References: <076.f200a972484f8418950e2e27d65d4d44@vtiger.fosslabs.com>
Message-ID: <085.d2865d94fa80e301097d57b8baa718ca@vtiger.fosslabs.com>

#639: issue in notification schedular
--------------------------------+-------------------------------------------
  Reporter:  minnie at vtiger.com  |       Owner:  philip
      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

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/639>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 05:40:06 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 09:40:06 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231303=3A?=
 =?utf-8?q?_Invoice=2C_Sales_Orders=2C_Quotes?=
In-Reply-To: <076.3417cd31c74551f10ccb510284b2b2f8@vtiger.fosslabs.com>
References: <076.3417cd31c74551f10ccb510284b2b2f8@vtiger.fosslabs.com>
Message-ID: <085.aed0b9517d349c50c5636f26823790e7@vtiger.fosslabs.com>

#1303: Invoice, Sales Orders, Quotes
---------------------------+------------------------------------------------
  Reporter:  anthony11221  |       Owner:  mickie                   
      Type:  defect        |      Status:  new                      
  Priority:  major         |   Milestone:  5.0.0                    
 Component:  vtigercrm     |     Version:  5.0.1                    
Resolution:                |    Keywords:  invoice sales order quote
---------------------------+------------------------------------------------
Changes (by mickie):

  * version:  5.0.0 => 5.0.1

Comment:

 Delete for the first row in Product Details will not be given. if you want
 to delete that product in first row then you should select another product
 ie., overwrite with another product because if we deleted that first row
 we cannot validate whether the product has been given or not where as
 product is mandatory to create PO, SO, Quotes and Invoice.

 Regarding add same product more than once and override the ListPrice value
 we will look into that and then take in our future release.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1303>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 05:41:46 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 09:41:46 -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.932bd0333a6727d659b20d1c6ebf81be@vtiger.fosslabs.com>

#474: UI issue in global search
------------------------+---------------------------------------------------
  Reporter:  don        |       Owner:  mickie
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  wontfix    |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * resolution:  => wontfix
  * status:  assigned => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/474>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 05:48:06 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 09:48:06 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7178 - in
 /vtigercrm/trunk/modules/Accounts: Account.php ListViewTop.php Merge.php
 Popup_picker.php
Message-ID: <20060616094806.5D6EB7ED307@vtiger.fosslabs.com>

Author: don
Date: Fri Jun 16 03:48:00 2006
New Revision: 7178

Log:
Fixed issues in vtiger_ prefixing in table names

Modified:
    vtigercrm/trunk/modules/Accounts/Account.php
    vtigercrm/trunk/modules/Accounts/ListViewTop.php
    vtigercrm/trunk/modules/Accounts/Merge.php
    vtigercrm/trunk/modules/Accounts/Popup_picker.php

Modified: vtigercrm/trunk/modules/Accounts/Account.php
==============================================================================
--- vtigercrm/trunk/modules/Accounts/Account.php (original)
+++ vtigercrm/trunk/modules/Accounts/Account.php Fri Jun 16 03:48:00 2006
@@ -38,7 +38,7 @@
 	var $log;
 	var $db;
 
-	var $table_name = "account";
+	var $table_name = "vtiger_account";
 	var $tab_name = Array('vtiger_crmentity','vtiger_account','vtiger_accountbillads','vtiger_accountshipads','vtiger_accountscf');
 	var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_account'=>'accountid','vtiger_accountbillads'=>'accountaddressid','vtiger_accountshipads'=>'accountaddressid','vtiger_accountscf'=>'accountid');
 
@@ -258,8 +258,8 @@
 				ON vtiger_groups.groupname = vtiger_activitygrouprelation.groupname
 			WHERE vtiger_seactivityrel.crmid = ".$id."
 			AND (activitytype='Task'
-				OR vtiger_activitytype='Call'
-				OR vtiger_activitytype='Meeting')
+				OR activitytype='Call'
+				OR activitytype='Meeting')
 			AND vtiger_crmentity.deleted = 0
 			AND ((vtiger_activity.status IS NOT NULL
 					AND vtiger_activity.status != 'Completed')
@@ -669,7 +669,7 @@
 	{
 		global $log;
                 $log->debug("Entering getColumnNames_Acnt() method ...");
-		$sql1 = "SELECT vtiger_fieldlabel FROM vtiger_field WHERE vtiger_tabid = 6";
+		$sql1 = "SELECT fieldlabel FROM vtiger_field WHERE tabid = 6";
 		$result = $this->db->query($sql1);
 		$numRows = $this->db->num_rows($result);
 		for($i=0; $i < $numRows;$i++)

Modified: vtigercrm/trunk/modules/Accounts/ListViewTop.php
==============================================================================
--- vtigercrm/trunk/modules/Accounts/ListViewTop.php (original)
+++ vtigercrm/trunk/modules/Accounts/ListViewTop.php Fri Jun 16 03:48:00 2006
@@ -21,7 +21,7 @@
  ********************************************************************************/
 function getTopAccounts()
 {
-	$log = LoggerManager::getLogger('top vtiger_accounts_list');
+	$log = LoggerManager::getLogger('top accounts_list');
 	$log->debug("Entering getTopAccounts() method ...");
 	require_once("data/Tracker.php");
 	require_once('modules/Potentials/Opportunity.php');

Modified: vtigercrm/trunk/modules/Accounts/Merge.php
==============================================================================
--- vtigercrm/trunk/modules/Accounts/Merge.php (original)
+++ vtigercrm/trunk/modules/Accounts/Merge.php Fri Jun 16 03:48:00 2006
@@ -87,7 +87,7 @@
 if(count($deleted_id) > 0)
 {
 	$deleted_id = implode(",",$deleted_id);
-	$update_query = "update vtiger_contactdetails set vtiger_accountid = 0 where contactid in (".$deleted_id.")";
+	$update_query = "update vtiger_contactdetails set accountid = 0 where contactid in (".$deleted_id.")";
 	$result = $adb->query($update_query);
 }
 //End setting vtiger_accountid=0 for the contacts which are deleted
@@ -209,7 +209,7 @@
 $csvdata = implode($mergevalue,"###");
 }else
 {
-	die("No vtiger_fields to do Merge");
+	die("No fields to do Merge");
 }
 
 $handle = fopen($wordtemplatedownloadpath."datasrc.csv","wb");

Modified: vtigercrm/trunk/modules/Accounts/Popup_picker.php
==============================================================================
--- vtigercrm/trunk/modules/Accounts/Popup_picker.php (original)
+++ vtigercrm/trunk/modules/Accounts/Popup_picker.php Fri Jun 16 03:48:00 2006
@@ -99,9 +99,9 @@
 if($_REQUEST['form'] == 'TasksEditView')
 {
 	$the_javascript  = "<script type='text/javascript' language='JavaScript'>\n";
-	$the_javascript .= "function set_return(account_id, vtiger_account_name) {\n";
-	$the_javascript .= "	window.opener.document.EditView.parent_name.value = vtiger_account_name;\n";
-	$the_javascript .= "	window.opener.document.EditView.parent_id.value = vtiger_account_id;\n";
+	$the_javascript .= "function set_return(account_id, account_name) {\n";
+	$the_javascript .= "	window.opener.document.EditView.parent_name.value = account_name;\n";
+	$the_javascript .= "	window.opener.document.EditView.parent_id.value = account_id;\n";
 	$the_javascript .= "}\n";
 	$the_javascript .= "</script>\n";
 	$button  = "<table cellspacing='0' cellpadding='1' border='0'><form border='0' action='index.php' method='post' name='form' id='form'>\n";
@@ -113,9 +113,9 @@
 elseif($_REQUEST['form'] == 'HelpDeskEditView')
 {
 	$the_javascript  = "<script type='text/javascript' language='JavaScript'>\n";
-	$the_javascript .= "function set_return(account_id, vtiger_account_name) {\n";
-	$the_javascript .= "	window.opener.document.EditView.parent_name.value = vtiger_account_name;\n";
-	$the_javascript .= "	window.opener.document.EditView.parent_id.value = vtiger_account_id;\n";
+	$the_javascript .= "function set_return(account_id, account_name) {\n";
+	$the_javascript .= "	window.opener.document.EditView.parent_name.value = account_name;\n";
+	$the_javascript .= "	window.opener.document.EditView.parent_id.value = account_id;\n";
 	$the_javascript .= "}\n";
 	$the_javascript .= "</script>\n";
 	$button  = "<table cellspacing='0' cellpadding='1' border='0'><form border='0' action='index.php' method='post' name='form' id='form'>\n";
@@ -127,8 +127,8 @@
 elseif(isset($_REQUEST['form_submit']) && $_REQUEST['form'] == 'AccountDetailView' && $_REQUEST['form_submit'] == 'true')
 {
 	$the_javascript  = "<script type='text/javascript' language='JavaScript'>\n";
-	$the_javascript .= "function set_return(account_id, vtiger_account_name) {\n";
-	$the_javascript .= "	window.opener.document.DetailView.member_id.value = vtiger_account_id; \n";
+	$the_javascript .= "function set_return(account_id, account_name) {\n";
+	$the_javascript .= "	window.opener.document.DetailView.member_id.value = account_id; \n";
 	$the_javascript .= "	window.opener.document.DetailView.return_module.value = window.opener.document.DetailView.module.value; \n";
 	$the_javascript .= "	window.opener.document.DetailView.return_action.value = 'DetailView'; \n";
 	$the_javascript .= "	window.opener.document.DetailView.return_id.value = window.opener.document.DetailView.record.value; \n";
@@ -144,9 +144,9 @@
 elseif ($_REQUEST['form'] == 'EditView') 
 {
 	$the_javascript  = "<script type='text/javascript' language='JavaScript'>\n";
-	$the_javascript .= "function set_return(account_id, vtiger_account_name) {\n";
-	$the_javascript .= "	window.opener.document.EditView.account_name.value = vtiger_account_name;\n";
-	$the_javascript .= "	window.opener.document.EditView.account_id.value = vtiger_account_id;\n";
+	$the_javascript .= "function set_return(account_id, account_name) {\n";
+	$the_javascript .= "	window.opener.document.EditView.account_name.value = account_name;\n";
+	$the_javascript .= "	window.opener.document.EditView.account_id.value = account_id;\n";
 	$the_javascript .= "}\n";
 	$the_javascript .= "</script>\n";
 	$button  = "<table cellspacing='0' cellpadding='1' border='0'><form border='0' action='index.php' method='post' name='form' id='form'>\n";




From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 05:49:54 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 09:49:54 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231248=3A?=
	=?utf-8?q?_Invoice_/_SO_/_PO?=
In-Reply-To: <076.e4d8f1e341c634b1bfe89089253ec586@vtiger.fosslabs.com>
References: <076.e4d8f1e341c634b1bfe89089253ec586@vtiger.fosslabs.com>
Message-ID: <085.629740a5432ae0f5abe3bef73dfb9c11@vtiger.fosslabs.com>

#1248: Invoice / SO / PO
--------------------------+-------------------------------------------------
  Reporter:  anonymous    |       Owner:  mickie
      Type:  enhancement  |      Status:  new   
  Priority:  major        |   Milestone:        
 Component:  vtigercrm    |     Version:  5.0.1 
Resolution:               |    Keywords:        
--------------------------+-------------------------------------------------
Changes (by mickie):

  * version:  5.0.0 => 5.0.1
  * type:  defect => enhancement

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1248>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 05:55:28 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 09:55:28 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23857=3A_?=
 =?utf-8?q?Links_in_Communication_Templates_Headings?=
In-Reply-To: <076.b701bab91b5663913e5b005347f8c28e@vtiger.fosslabs.com>
References: <076.b701bab91b5663913e5b005347f8c28e@vtiger.fosslabs.com>
Message-ID: <085.b21519426280561c2c7ccd127391a834@vtiger.fosslabs.com>

#857: Links in Communication Templates Headings
--------------------------+-------------------------------------------------
  Reporter:  mangai       |       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 is fixed with New UI for Settings.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/857>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 06:00:11 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 10:00:11 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23927=3A_?=
 =?utf-8?q?Shortcut_=22New_Account=22_doesn=27t_work?=
In-Reply-To: <076.97aed0717bb7c14bc4216213f908cd2e@vtiger.fosslabs.com>
References: <076.97aed0717bb7c14bc4216213f908cd2e@vtiger.fosslabs.com>
Message-ID: <085.c1f3070f3fa36cb0b0047531daa0eb64@vtiger.fosslabs.com>

#927: Shortcut "New Account" doesn't work
------------------------+---------------------------------------------------
  Reporter:  neofis     |       Owner:  ahmed           
      Type:  defect     |      Status:  closed          
  Priority:  major      |   Milestone:                  
 Component:  vtigercrm  |     Version:  5.0.0           
Resolution:  fixed      |    Keywords:  New Account menu
------------------------+---------------------------------------------------
Changes (by ahmed):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 Issue Fixed - Now we have a dummy Quick Create text as the 1st select
 option.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/927>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 06:00:33 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 10:00:33 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231141=3A?=
 =?utf-8?q?_mandatory_shown_but_not_so?=
In-Reply-To: <076.02fcc522483405a938931a6090a37b4c@vtiger.fosslabs.com>
References: <076.02fcc522483405a938931a6090a37b4c@vtiger.fosslabs.com>
Message-ID: <085.233a620b7bb0cf931b22ef1a2e257459@vtiger.fosslabs.com>

#1141: mandatory shown but not so
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  mickie
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:  PO    
------------------------+---------------------------------------------------
Changes (by mickie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 Product Details are validated correctly in 5.0Beta.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1141>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 06:02:46 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 10:02:46 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231138=3A?=
 =?utf-8?q?_could_be_made_more_usable?=
In-Reply-To: <076.6260faca7a3dab8756ec45d2be226913@vtiger.fosslabs.com>
References: <076.6260faca7a3dab8756ec45d2be226913@vtiger.fosslabs.com>
Message-ID: <085.c0fac00f5fd7f0fcaa1c1d9cdec05bf2@vtiger.fosslabs.com>

#1138: could be made more usable
--------------------------+-------------------------------------------------
  Reporter:  richie       |       Owner:  mickie
      Type:  enhancement  |      Status:  new   
  Priority:  major        |   Milestone:        
 Component:  vtigercrm    |     Version:  5.0.1 
Resolution:               |    Keywords:        
--------------------------+-------------------------------------------------
Changes (by mickie):

  * version:  5.0.0 => 5.0.1
  * type:  defect => enhancement

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1138>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 06:03:57 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 10:03:57 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231064=3A?=
 =?utf-8?q?_Check_for_uploading_only_=2Edoc_=26_=2Ertf_files_missing?=
In-Reply-To: <076.eba850e718f7a468f321f45d292974b7@vtiger.fosslabs.com>
References: <076.eba850e718f7a468f321f45d292974b7@vtiger.fosslabs.com>
Message-ID: <085.214505e29bb3cb671beb39c53530877b@vtiger.fosslabs.com>

#1064: Check for uploading only .doc & .rtf files missing
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  ahmed 
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  duplicate  |    Keywords:        
------------------------+---------------------------------------------------
Changes (by anonymous):

  * resolution:  => duplicate
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1064>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 06:04:46 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 10:04:46 -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.34cf4cffb556c3e9b9fb18b523c165e6@vtiger.fosslabs.com>

#459: Highliting of the search criteria in global search
--------------------------+-------------------------------------------------
  Reporter:  don          |       Owner:  mickie  
      Type:  enhancement  |      Status:  assigned
  Priority:  major        |   Milestone:  5.0.0   
 Component:  vtigercrm    |     Version:  5.0.1   
Resolution:               |    Keywords:          
--------------------------+-------------------------------------------------
Changes (by richie):

  * type:  defect => enhancement

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/459>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 06:04:36 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 10:04:36 -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.79fa6b27be71a9adf592eadca896d156@vtiger.fosslabs.com>

#455: Pagination is not supported in global search
--------------------------+-------------------------------------------------
  Reporter:  don          |       Owner:  mickie  
      Type:  enhancement  |      Status:  assigned
  Priority:  major        |   Milestone:          
 Component:  vtigercrm    |     Version:  5.0.1   
Resolution:               |    Keywords:          
--------------------------+-------------------------------------------------
Changes (by richie):

  * type:  defect => enhancement

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/455>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 06:06:02 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 10:06:02 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231259=3A?=
	=?utf-8?q?_i18n_issues_with_Beta?=
In-Reply-To: <076.f7b53125520cc2d8322c4161c2676a8c@vtiger.fosslabs.com>
References: <076.f7b53125520cc2d8322c4161c2676a8c@vtiger.fosslabs.com>
Message-ID: <085.5959be52873ed2fda2134312d312f0dc@vtiger.fosslabs.com>

#1259: i18n issues with Beta
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       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:

 Issues fixed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1259>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 06:06:39 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 10:06:39 -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.b11c74cb5f35be1e1d0033cb8102ae25@vtiger.fosslabs.com>

#470: Enhancement in Global Search
--------------------------+-------------------------------------------------
  Reporter:  don          |       Owner:  mickie  
      Type:  enhancement  |      Status:  assigned
  Priority:  major        |   Milestone:  5.0.0   
 Component:  vtigercrm    |     Version:  5.0.1   
Resolution:               |    Keywords:          
--------------------------+-------------------------------------------------
Changes (by anonymous):

  * type:  defect => enhancement

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/470>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 06:07:28 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 10:07:28 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23918=3A_?=
 =?utf-8?q?Global_search_function_shows_wrong_results?=
In-Reply-To: <076.a484dea87ad7ce51b1edd92f46c3ba8a@vtiger.fosslabs.com>
References: <076.a484dea87ad7ce51b1edd92f46c3ba8a@vtiger.fosslabs.com>
Message-ID: <085.3fad67b1bc90f8af4fa21ac09ed775ac@vtiger.fosslabs.com>

#918: Global search function shows wrong results
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  richie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * owner:  mickie => richie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/918>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 06:07:38 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 10:07:38 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231265=3A?=
 =?utf-8?q?_Global_Search_Function_throws_error?=
In-Reply-To: <076.76671c46776deb9518824e095947cbde@vtiger.fosslabs.com>
References: <076.76671c46776deb9518824e095947cbde@vtiger.fosslabs.com>
Message-ID: <085.0117b548c0234d1e33e8feacf6555b18@vtiger.fosslabs.com>

#1265: Global Search Function throws error
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  richie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * owner:  mickie => richie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1265>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 06:08:21 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 10:08:21 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231081=3A?=
 =?utf-8?q?_Yahoo_ID_at_mails_from_contacts?=
In-Reply-To: <076.559e47f8ca8be49e3698d4378d040b16@vtiger.fosslabs.com>
References: <076.559e47f8ca8be49e3698d4378d040b16@vtiger.fosslabs.com>
Message-ID: <085.443fae7a8ec2c5d11a3a37915c92b727@vtiger.fosslabs.com>

#1081: Yahoo ID at mails from contacts
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  ahmed 
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  wontfix    |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * resolution:  => wontfix
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1081>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 06:11:23 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 10:11:23 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231289=3A?=
 =?utf-8?q?_Edit/Del_links_are_must_in_relatedlists?=
In-Reply-To: <076.c2484dcccdec49e5b30c79bee458fec5@vtiger.fosslabs.com>
References: <076.c2484dcccdec49e5b30c79bee458fec5@vtiger.fosslabs.com>
Message-ID: <085.971d378126729ca30737aabc0f03e9ec@vtiger.fosslabs.com>

#1289: Edit/Del links are must in relatedlists
------------------------+---------------------------------------------------
  Reporter:  mickie     |       Owner:  mickie
      Type:  task       |      Status:  new   
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * owner:  ahmed => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1289>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 06:12:03 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 10:12:03 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23540=3A_?=
 =?utf-8?q?No_Parenttab_for_attachments?=
In-Reply-To: <076.797e4af97597407a1eca0a9f8d46ceb4@vtiger.fosslabs.com>
References: <076.797e4af97597407a1eca0a9f8d46ceb4@vtiger.fosslabs.com>
Message-ID: <085.e82a7a549f4e92358f200ae624dc6e4b@vtiger.fosslabs.com>

#540: No Parenttab for attachments
---------------------------+------------------------------------------------
  Reporter:  jerrydgeorge  |       Owner:  ahmed 
      Type:  defect        |      Status:  closed
  Priority:  major         |   Milestone:        
 Component:  vtigercrm     |     Version:  5.0.0 
Resolution:  fixed         |    Keywords:  UI    
---------------------------+------------------------------------------------
Changes (by richie):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/540>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 06:12:35 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 10:12:35 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23895=3A_?=
 =?utf-8?q?inconsistency_attachment_=26_notes_in_relatedlist?=
In-Reply-To: <076.79c7c9588e335e83363cae55ee4ba916@vtiger.fosslabs.com>
References: <076.79c7c9588e335e83363cae55ee4ba916@vtiger.fosslabs.com>
Message-ID: <085.30754082ed36e860b3ae61ceae30f410@vtiger.fosslabs.com>

#895: inconsistency attachment & notes in relatedlist
------------------------+---------------------------------------------------
  Reporter:  mickie     |       Owner:  mickie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * owner:  ahmed => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/895>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 06:13:10 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 10:13:10 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231307=3A?=
 =?utf-8?q?_Print_function_missing_in_Beta?=
In-Reply-To: <076.d87e178fda241c6536574413a592943f@vtiger.fosslabs.com>
References: <076.d87e178fda241c6536574413a592943f@vtiger.fosslabs.com>
Message-ID: <085.ef67e710c0f870b397dac156e5e5b68a@vtiger.fosslabs.com>

#1307: Print function missing in Beta
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  philip
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * owner:  ahmed => philip

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1307>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 06:13:21 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 10:13:21 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23169=3A_?=
 =?utf-8?q?missing_parent_tab_in_import_steps?=
In-Reply-To: <076.fa0e7db7145b84cd9df79a70a28c175a@vtiger.fosslabs.com>
References: <076.fa0e7db7145b84cd9df79a70a28c175a@vtiger.fosslabs.com>
Message-ID: <085.fd999fdc328044160eb6bd9bfb8db8aa@vtiger.fosslabs.com>

#169: missing parent tab in import steps
---------------------------+------------------------------------------------
  Reporter:  jerrydgeorge  |       Owner:  mickie
      Type:  defect        |      Status:  new   
  Priority:  minor         |   Milestone:  5.0.0 
 Component:  vtigercrm     |     Version:  5.0.0 
Resolution:                |    Keywords:  import
---------------------------+------------------------------------------------
Changes (by richie):

  * owner:  ahmed => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/169>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 06:13:54 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 10:13:54 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231096=3A?=
 =?utf-8?q?_Change_=22My_Home_Page=22_to_=22Home=22?=
In-Reply-To: <076.50f200c2a1dbfab77f88a21e59e45693@vtiger.fosslabs.com>
References: <076.50f200c2a1dbfab77f88a21e59e45693@vtiger.fosslabs.com>
Message-ID: <085.2793eef0fe3b0812fe2d2327dee2ce65@vtiger.fosslabs.com>

#1096: Change "My Home Page" to "Home"
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  ahmed 
      Type:  defect     |      Status:  closed
  Priority:  minor      |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  wontfix    |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * resolution:  => wontfix
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1096>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 06:15:21 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 10:15:21 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231188=3A?=
 =?utf-8?q?_default_email_population_not_proper?=
In-Reply-To: <076.c8af4af2b612afa73930163d3526615a@vtiger.fosslabs.com>
References: <076.c8af4af2b612afa73930163d3526615a@vtiger.fosslabs.com>
Message-ID: <085.b7d54ea1bd8cd02403eaf7e13a65ed4a@vtiger.fosslabs.com>

#1188: default email population not proper
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  richie
      Type:  defect     |      Status:  new   
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * owner:  ahmed => richie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1188>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 06:15:36 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 10:15:36 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231277=3A?=
 =?utf-8?q?_Can=27t_translate_term_close_without_problem?=
In-Reply-To: <076.d518c5251779ede24caf171d8d809788@vtiger.fosslabs.com>
References: <076.d518c5251779ede24caf171d8d809788@vtiger.fosslabs.com>
Message-ID: <085.74c2e249e7bcc5fab6fb9faa35df6a52@vtiger.fosslabs.com>

#1277: Can't translate term close without problem
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  richie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * owner:  ahmed => richie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1277>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 06:16:39 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 10:16:39 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7179 - in
 /vtigercrm/trunk/modules/HelpDesk: Convert.php HelpDesk.php ListTickets.php
 Merge.php Save.php
Message-ID: <20060616101639.037387ED31A@vtiger.fosslabs.com>

Author: don
Date: Fri Jun 16 04:16:33 2006
New Revision: 7179

Log:
Fixed issues in vtiger_ prefixing in table names

Modified:
    vtigercrm/trunk/modules/HelpDesk/Convert.php
    vtigercrm/trunk/modules/HelpDesk/HelpDesk.php
    vtigercrm/trunk/modules/HelpDesk/ListTickets.php
    vtigercrm/trunk/modules/HelpDesk/Merge.php
    vtigercrm/trunk/modules/HelpDesk/Save.php

Modified: vtigercrm/trunk/modules/HelpDesk/Convert.php
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/Convert.php (original)
+++ vtigercrm/trunk/modules/HelpDesk/Convert.php Fri Jun 16 04:16:33 2006
@@ -71,7 +71,7 @@
 $change='';
 if($_REQUEST['change_owner'])
 {
-	$change .= '<input type="hidden" name="change_owner" value="true"/><td width="20%" valign="top" class="dataLabel">'.$mod_strings['LBL_ASSIGNED_TO'].'<select vtiger_tabindex="5" name="assigned_user_id" {ASSIGNED_USER_OPTIONS}</select> </td>';
+	$change .= '<input type="hidden" name="change_owner" value="true"/><td width="20%" valign="top" class="dataLabel">'.$mod_strings['LBL_ASSIGNED_TO'].'<select tabindex="5" name="assigned_user_id" {ASSIGNED_USER_OPTIONS}</select> </td>';
 	$xtpl->assign("ASSIGNED_USER_OPTIONS",getComboValues("user_name","users","user_name","1",'--None--'));
 }
 if($_REQUEST['change_status'])

Modified: vtigercrm/trunk/modules/HelpDesk/HelpDesk.php
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/HelpDesk.php (original)
+++ vtigercrm/trunk/modules/HelpDesk/HelpDesk.php Fri Jun 16 04:16:33 2006
@@ -124,7 +124,7 @@
 
 		$returnset = '&return_module=HelpDesk&return_action=DetailView&return_id='.$id;
 
-		$query = "SELECT vtiger_activity.*, vtiger_crmentity.crmid, vtiger_contactdetails.contactid, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_recurringevents.recurringtype, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid= vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and (activitytype='Task' or vtiger_activitytype='Call' or vtiger_activitytype='Meeting')";
+		$query = "SELECT vtiger_activity.*, vtiger_crmentity.crmid, vtiger_contactdetails.contactid, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_recurringevents.recurringtype, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid= vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting')";
 		$log->debug("Exiting get_activities method ...");
 		
 		return GetRelatedList('HelpDesk','Activities',$focus,$query,$button,$returnset);
@@ -169,7 +169,7 @@
 		$log->debug("Entering get_attachments(".$id.") method ...");
 		$query = "select vtiger_notes.title,'Notes      '  ActivityType, vtiger_notes.filename,
 		vtiger_attachments.type  FileType,crm2.modifiedtime lastmodified,
-		vtiger_seattachmentsrel.attachmentsid vtiger_attachmentsid, vtiger_notes.notesid crmid,
+		vtiger_seattachmentsrel.attachmentsid attachmentsid, vtiger_notes.notesid crmid,
 			crm2.createdtime, vtiger_notes.notecontent description, vtiger_users.user_name
 		from vtiger_notes
 			inner join vtiger_senotesrel on vtiger_senotesrel.notesid= vtiger_notes.notesid
@@ -184,7 +184,7 @@
 
 		$query .= "select vtiger_attachments.description title ,'Attachments'  ActivityType,
 		vtiger_attachments.name filename, vtiger_attachments.type FileType,crm2.modifiedtime lastmodified,
-		vtiger_attachments.attachmentsid vtiger_attachmentsid, vtiger_seattachmentsrel.attachmentsid crmid,
+		vtiger_attachments.attachmentsid attachmentsid, vtiger_seattachmentsrel.attachmentsid crmid,
 			crm2.createdtime, vtiger_attachments.description, vtiger_users.user_name
 		from vtiger_attachments
 			inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid= vtiger_attachments.attachmentsid
@@ -344,7 +344,7 @@
 	{
 		global $log;
 		$log->debug("Entering getColumnNames_Hd() method ...");
-		$sql1 = "select vtiger_fieldlabel from vtiger_field where vtiger_tabid=13 and block <> 6 ";
+		$sql1 = "select fieldlabel from vtiger_field where tabid=13 and block <> 6 ";
 		$result = $this->db->query($sql1);
 		$numRows = $this->db->num_rows($result);
 		for($i=0; $i < $numRows;$i++)

Modified: vtigercrm/trunk/modules/HelpDesk/ListTickets.php
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/ListTickets.php (original)
+++ vtigercrm/trunk/modules/HelpDesk/ListTickets.php Fri Jun 16 04:16:33 2006
@@ -108,7 +108,7 @@
 	}
 	if($parent_module == 'Accounts')
 	{
-		$sql = "select vtiger_accountname from vtiger_account where vtiger_accountid=".$parent_id;
+		$sql = "select accountname from vtiger_account where accountid=".$parent_id;
 		$parentname = $adb->query_result($adb->query($sql),0,'accountname');
 	        $parent_name = '<a href="index.php?action=DetailView&module='.$parent_module.'&record='.$parent_id.'">'.$parentname.'</a>';
 	}

Modified: vtigercrm/trunk/modules/HelpDesk/Merge.php
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/Merge.php (original)
+++ vtigercrm/trunk/modules/HelpDesk/Merge.php Fri Jun 16 04:16:33 2006
@@ -86,7 +86,7 @@
 
 	if($columnname == "parent_id")
 	{
-		$column_name = "case vtiger_crmentityRelHelpDesk.setype when 'Accounts' then vtiger_accountRelHelpDesk.accountname when 'Contacts' then concat(contactdetailsRelHelpDesk.firstname,' ',contactdetailsRelHelpDesk.lastname) End";
+		$column_name = "case crmentityRelHelpDesk.setype when 'Accounts' then accountRelHelpDesk.accountname when 'Contacts' then concat(contactdetailsRelHelpDesk.firstname,' ',contactdetailsRelHelpDesk.lastname) End";
 	}
 	if($columnname == "product_id")
 	{
@@ -165,27 +165,27 @@
 	$query ="select ".$selectcolumns." from vtiger_troubletickets
 			inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_troubletickets.ticketid
 			inner join vtiger_ticketcf on vtiger_ticketcf.ticketid = vtiger_troubletickets.ticketid
-			left join vtiger_crmentity as vtiger_crmentityRelHelpDesk on vtiger_crmentityRelHelpDesk.crmid = vtiger_troubletickets.parent_id
-			left join vtiger_account as vtiger_accountRelHelpDesk on vtiger_accountRelHelpDesk.accountid=crmentityRelHelpDesk.crmid
-			left join vtiger_contactdetails as vtiger_contactdetailsRelHelpDesk on vtiger_contactdetailsRelHelpDesk.contactid= vtiger_crmentityRelHelpDesk.crmid
-			left join vtiger_products as vtiger_productsRel on vtiger_productsRel.productid = vtiger_troubletickets.product_id
+			left join vtiger_crmentity as crmentityRelHelpDesk on crmentityRelHelpDesk.crmid = vtiger_troubletickets.parent_id
+			left join vtiger_account as accountRelHelpDesk on accountRelHelpDesk.accountid=crmentityRelHelpDesk.crmid
+			left join vtiger_contactdetails as contactdetailsRelHelpDesk on contactdetailsRelHelpDesk.contactid= crmentityRelHelpDesk.crmid
+			left join vtiger_products as productsRel on productsRel.productid = vtiger_troubletickets.product_id
 			left join vtiger_users on vtiger_crmentity.smownerid=vtiger_users.id
 			left join vtiger_account on vtiger_account.accountid = vtiger_troubletickets.parent_id               
-			left join vtiger_crmentity as vtiger_crmentityAccounts on vtiger_crmentityAccounts.crmid = vtiger_account.accountid 
+			left join vtiger_crmentity as _crmentityAccounts on crmentityAccounts.crmid = vtiger_account.accountid 
 			left join vtiger_accountbillads on vtiger_accountbillads.accountaddressid = vtiger_account.accountid
 			left join vtiger_accountshipads on vtiger_accountshipads.accountaddressid = vtiger_account.accountid
 			left join vtiger_accountscf on vtiger_accountbillads.accountaddressid = vtiger_accountscf.accountid 
-			left join vtiger_account as vtiger_accountAccount on vtiger_accountAccount.accountid = vtiger_troubletickets.parent_id
-			left join vtiger_users as vtiger_usersAccounts on vtiger_usersAccounts.id = vtiger_crmentityAccounts.smownerid
+			left join vtiger_account as accountAccount on accountAccount.accountid = vtiger_troubletickets.parent_id
+			left join vtiger_users as usersAccounts on usersAccounts.id = crmentityAccounts.smownerid
 			left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_troubletickets.parent_id               
-			left join vtiger_crmentity as vtiger_crmentityContacts on vtiger_crmentityContacts.crmid = vtiger_contactdetails.contactid 
+			left join vtiger_crmentity as crmentityContacts on crmentityContacts.crmid = vtiger_contactdetails.contactid 
 			left join vtiger_contactaddress on vtiger_contactdetails.contactid = vtiger_contactaddress.contactaddressid 
 			left join vtiger_contactsubdetails on vtiger_contactdetails.contactid = vtiger_contactsubdetails.contactsubscriptionid 
 			left join vtiger_contactscf on vtiger_contactdetails.contactid = vtiger_contactscf.contactid 
-			left join vtiger_contactdetails as vtiger_contactdetailsContacts on vtiger_contactdetailsContacts.contactid = vtiger_contactdetails.reportsto
-			left join vtiger_account as vtiger_accountContacts on vtiger_accountContacts.accountid = vtiger_contactdetails.accountid 
-			left join vtiger_users as vtiger_usersContacts on vtiger_usersContacts.id = vtiger_crmentityContacts.smownerid
-			where vtiger_crmentity.deleted=0 and ((crmentityContacts.deleted=0 || vtiger_crmentityContacts.deleted is null)||(crmentityAccounts.deleted=0 || vtiger_crmentityAccounts.deleted is null)) 
+			left join vtiger_contactdetails as contactdetailsContacts on contactdetailsContacts.contactid = vtiger_contactdetails.reportsto
+			left join vtiger_account as accountContacts on accountContacts.accountid = vtiger_contactdetails.accountid 
+			left join vtiger_users as usersContacts on usersContacts.id = crmentityContacts.smownerid
+			where vtiger_crmentity.deleted=0 and ((crmentityContacts.deleted=0 || crmentityContacts.deleted is null)||(crmentityAccounts.deleted=0 || crmentityAccounts.deleted is null)) 
 			and vtiger_troubletickets.ticketid in (".$mass_merge.")";
 
 	$result = $adb->query($query);
@@ -221,7 +221,7 @@
 }
 else
 {
-	die("No vtiger_fields to do Merge");
+	die("No fields to do Merge");
 }	
 
 $handle = fopen($wordtemplatedownloadpath."datasrc.csv","wb");

Modified: vtigercrm/trunk/modules/HelpDesk/Save.php
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/Save.php (original)
+++ vtigercrm/trunk/modules/HelpDesk/Save.php Fri Jun 16 04:16:33 2006
@@ -62,7 +62,7 @@
 	}
 	if($parent_module == 'Accounts')
 	{
-		$result = $adb->query("select * from vtiger_account where vtiger_accountid=".$focus->column_fields['parent_id']);
+		$result = $adb->query("select * from vtiger_account where accountid=".$focus->column_fields['parent_id']);
 		$emailoptout = $adb->query_result($result,0,'emailoptout');
 		$parentname = $adb->query_result($result,0,'accountname');
 	}




From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 06:06:33 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 10:06:33 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=23305=3A_?=
	=?utf-8?q?Global_Search_issue?=
In-Reply-To: <076.5981abe1cf9dd755f16174b0b5441e02@vtiger.fosslabs.com>
References: <076.5981abe1cf9dd755f16174b0b5441e02@vtiger.fosslabs.com>
Message-ID: <085.dad98c8f0641fcb7ddc0e6bec8356f4e@vtiger.fosslabs.com>

#305: Global Search issue
---------------------------+------------------------------------------------
  Reporter:  jerrydgeorge  |       Owner:  mickie       
      Type:  enhancement   |      Status:  assigned     
  Priority:  major         |   Milestone:               
 Component:  vtigercrm     |     Version:  5.0.1        
Resolution:                |    Keywords:  global search
---------------------------+------------------------------------------------
Changes (by anonymous):

  * type:  defect => enhancement

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/305>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 06:38:01 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 10:38:01 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23959=3A_?=
 =?utf-8?q?=22Invoice=22_Tab_name_change_to_=22Invoices=22?=
In-Reply-To: <076.d7d8ff8c07778d7ac5419325b92b757a@vtiger.fosslabs.com>
References: <076.d7d8ff8c07778d7ac5419325b92b757a@vtiger.fosslabs.com>
Message-ID: <085.d0069af55942503d0bc15fea5eb50b37@vtiger.fosslabs.com>

#959: "Invoice" Tab name change to "Invoices"
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  saraj 
      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 [7180]) tab names modified. Fixes #959

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/959>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 06:38:02 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 10:38:02 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7180 -
	/vtigercrm/trunk/include/language/en_us.lang.php
Message-ID: <20060616103802.2C4A47ED31C@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 16 04:37:56 2006
New Revision: 7180

Log:
tab names modified. Fixes #959

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

Modified: vtigercrm/trunk/include/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/include/language/en_us.lang.php (original)
+++ vtigercrm/trunk/include/language/en_us.lang.php Fri Jun 16 04:37:56 2006
@@ -737,7 +737,7 @@
 'PriceBook'=>'Price Books',
 'PurchaseOrder'=>'Purchase Order',
 'SalesOrder'=> 'Sales Order',
-'Invoice'=>'Invoice',
+'Invoice'=>'Invoices',
 'Calendar'=>'Calendar',
 'Home'=>'Home',
 'Campaigns'=>'Campaigns',
@@ -795,7 +795,7 @@
 'SalesOrder'=> 'Sales Order',
 'Campaign'=>'Campaign',
 'Note'=>'Note',
-'Dashboard'=>'Dashboard',
+'Dashboard'=>'Dashboards',
 'Report'=>'Report',
 'Vendor'=>'Vendor',
 'Webmail'=>'Webmail',
@@ -838,8 +838,8 @@
 'Start Date'=>'Start Date',
 'Related to'=>'Related To',
 'Recurring Type'=> 'Recurring Type',
-'SalesOrder'=> 'Sales Order',
-'PurchaseOrder'=> 'Purchase Order',
+'SalesOrder'=> 'Sales Orders',
+'PurchaseOrder'=> 'Purchase Orders',
 'LBL_QUOTE_NAME'=>'Quote Name',
  //Added Orders in activity parent type selection / Related list
 'LBL_NEW_QUOTE_BUTTON_TITLE'=>'New Quote [Alt+Q]',




From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 06:12:19 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 10:12:19 -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.da3993981a6af659e5ea13509a51aab6@vtiger.fosslabs.com>

#723: Parent tab not highlighted
------------------------+---------------------------------------------------
  Reporter:  saraj      |       Owner:  mickie    
      Type:  defect     |      Status:  new       
  Priority:  major      |   Milestone:  5.0.0     
 Component:  vtigercrm  |     Version:  5.0.0     
Resolution:             |    Keywords:  Parent tab
------------------------+---------------------------------------------------
Changes (by richie):

  * owner:  ahmed => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/723>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 06:12:54 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 10:12:54 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231293=3A?=
 =?utf-8?q?_Select_Products_missing_from_Activities_in_5=2E0?=
In-Reply-To: <076.0fa458c2ddcf4a4ee4262524258defbd@vtiger.fosslabs.com>
References: <076.0fa458c2ddcf4a4ee4262524258defbd@vtiger.fosslabs.com>
Message-ID: <085.55a87fb26c06d2efc15c29876c6bfd0a@vtiger.fosslabs.com>

#1293: Select Products missing from Activities in 5.0
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  minnie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * owner:  ahmed => minnie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1293>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 07:10:15 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 11:10:15 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7181 -
	/vtigercrm/trunk/Popup.php
Message-ID: <20060616111015.F16607ED2DA@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 16 05:10:11 2006
New Revision: 7181

Log:
multiselect is enable for lead popup

Modified:
    vtigercrm/trunk/Popup.php

Modified: vtigercrm/trunk/Popup.php
==============================================================================
--- vtigercrm/trunk/Popup.php (original)
+++ vtigercrm/trunk/Popup.php Fri Jun 16 05:10:11 2006
@@ -84,6 +84,7 @@
 				,'industry'=>'industry_dom');
 		$comboFieldArray = getComboArray($comboFieldNames);
 		$smarty->assign("SINGLE_MOD",'Lead');
+		if (isset($_REQUEST['select'])) $smarty->assign("SELECT",'enable');
 		if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] !='')
 			$smarty->assign("RETURN_MODULE",$_REQUEST['return_module']);
 		else




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 07:15:35 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 11:15:35 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7182 -
	/vtigercrm/trunk/modules/Contacts/Contact.js
Message-ID: <20060616111535.50E7F7ED312@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 16 05:15:30 2006
New Revision: 7182

Log:
url string has been modified

Modified:
    vtigercrm/trunk/modules/Contacts/Contact.js

Modified: vtigercrm/trunk/modules/Contacts/Contact.js
==============================================================================
--- vtigercrm/trunk/modules/Contacts/Contact.js (original)
+++ vtigercrm/trunk/modules/Contacts/Contact.js Fri Jun 16 05:15:30 2006
@@ -106,7 +106,7 @@
 	}
 		if(confirm("Are you sure you want to add the selected "+xx+" records ?"))
 		{
-		opener.document.location.href="index.php?module="+module+"&parentid="+entity_id+"&action=updateRelations&return_module=Potentials&return_action=CallRelatedList&idlist="+idstring;
+		opener.document.location.href="index.php?module="+module+"&parentid="+entity_id+"&action=updateRelations&destination_module=Contacts&idlist="+idstring;
 		self.close();
 		}
 		else




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 07:20:22 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 11:20:22 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7183 -
	/vtigercrm/trunk/modules/Leads/Lead.js
Message-ID: <20060616112022.30AB57ED2FF@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 16 05:20:18 2006
New Revision: 7183

Log:
js function SelectAll has been included

Modified:
    vtigercrm/trunk/modules/Leads/Lead.js

Modified: vtigercrm/trunk/modules/Leads/Lead.js
==============================================================================
--- vtigercrm/trunk/modules/Leads/Lead.js (original)
+++ vtigercrm/trunk/modules/Leads/Lead.js Fri Jun 16 05:20:18 2006
@@ -65,7 +65,60 @@
 
 }
 
+//Function added for Mass select in Popup - Philip
+function SelectAll()
+{
 
+        x = document.selectall.selected_id.length;
+        var entity_id = window.opener.document.getElementById('parent_id').value
+        var module = window.opener.document.getElementById('return_module').value
+        document.selectall.action.value='updateRelations'
+        idstring = "";
+
+        if ( x == undefined)
+        {
+
+                if (document.selectall.selected_id.checked)
+                {
+                        document.selectall.idlist.value=document.selectall.selected_id.value;
+                }
+                else
+                {
+                        alert("Please select atleast one entity");
+                        return false;
+                }
+        }
+        else
+        {
+                xx = 0;
+                for(i = 0; i < x ; i++)
+                {
+                        if(document.selectall.selected_id[i].checked)
+                        {
+                                idstring = document.selectall.selected_id[i].value +";"+idstring
+                        xx++
+                        }
+                }
+                if (xx != 0)
+                {
+                        document.selectall.idlist.value=idstring;
+                }
+		else
+                {
+                        alert("Please select atleast one entity");
+                        return false;
+                }
+        }
+        if(confirm("Are you sure you want to add the selected "+xx+" records ?"))
+        {
+                opener.document.location.href="index.php?module="+module+"&parentid="+entity_id+"&action=updateRelations&destination_module=Leads&idlist="+idstring;
+                self.close();
+        }
+        else
+        {
+                return false;
+        }
+}
 
 function set_return(product_id, product_name) {
         window.opener.document.EditView.parent_name.value = product_name;




From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 07:20:58 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 11:20:58 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=23508=3A_?=
	=?utf-8?q?validation_for_search?=
In-Reply-To: <076.937f1cb0969bd6cc06f852196b3b683b@vtiger.fosslabs.com>
References: <076.937f1cb0969bd6cc06f852196b3b683b@vtiger.fosslabs.com>
Message-ID: <085.871d6402b7a582f4ea40f9507ada108a@vtiger.fosslabs.com>

#508: validation for search
--------------------------------+-------------------------------------------
  Reporter:  minnie at vtiger.com  |       Owner:  richie
      Type:  defect             |      Status:  new   
  Priority:  major              |   Milestone:        
 Component:  vtigercrm          |     Version:  5.0.0 
Resolution:                     |    Keywords:        
--------------------------------+-------------------------------------------
Changes (by richie):

  * owner:  philip => richie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/508>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 07:21:11 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 11:21:11 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23940=3A_?=
 =?utf-8?q?contact_not_displayed_in_activity_relatedlit?=
In-Reply-To: <076.65ef01ee3bf555e0572b3067a1b9889c@vtiger.fosslabs.com>
References: <076.65ef01ee3bf555e0572b3067a1b9889c@vtiger.fosslabs.com>
Message-ID: <085.ec599642e1b394b36816dc52ba695a3c@vtiger.fosslabs.com>

#940: contact not displayed in activity relatedlit
------------------------+---------------------------------------------------
  Reporter:  mickie     |       Owner:  minnie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * owner:  philip => minnie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/940>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 07:21:22 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 11:21:22 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23457=3A_?=
 =?utf-8?q?Inconsistency_in_List_Views?=
In-Reply-To: <076.62f80fd69dd6508b4f16ec9faaf586f8@vtiger.fosslabs.com>
References: <076.62f80fd69dd6508b4f16ec9faaf586f8@vtiger.fosslabs.com>
Message-ID: <085.484c7304813590903fa66a1d11dcc50e@vtiger.fosslabs.com>

#457: Inconsistency in List Views
--------------------------+-------------------------------------------------
  Reporter:  don          |       Owner:  saraj
      Type:  enhancement  |      Status:  new  
  Priority:  critical     |   Milestone:  5.0.0
 Component:  vtigercrm    |     Version:  5.0.0
Resolution:               |    Keywords:       
--------------------------+-------------------------------------------------
Changes (by richie):

  * type:  defect => enhancement

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/457>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 07:21:55 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 11:21:55 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231128=3A?=
 =?utf-8?q?_too_high_reaction_time_in_using_inventory?=
In-Reply-To: <076.209b6cc7a2151c8fd5ca32cfa5df69e2@vtiger.fosslabs.com>
References: <076.209b6cc7a2151c8fd5ca32cfa5df69e2@vtiger.fosslabs.com>
Message-ID: <085.500dca906c6a6d8a26b182f28a70dcef@vtiger.fosslabs.com>

#1128: too high reaction time in using inventory
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  mickie     
      Type:  defect     |      Status:  new        
  Priority:  major      |   Milestone:             
 Component:  vtigercrm  |     Version:  5.0.0      
Resolution:             |    Keywords:  performance
------------------------+---------------------------------------------------
Changes (by richie):

  * owner:  saraj => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1128>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 07:22:10 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 11:22:10 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231170=3A?=
 =?utf-8?q?_PO_related_to_SO_does_not_have_assigned_to_value?=
In-Reply-To: <076.846167eef3e3ff8046106f91876e5bb5@vtiger.fosslabs.com>
References: <076.846167eef3e3ff8046106f91876e5bb5@vtiger.fosslabs.com>
Message-ID: <085.dc63b10458b665ca77539e4624b37d17@vtiger.fosslabs.com>

#1170: PO related to SO does not have assigned to value
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  mickie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * owner:  saraj => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1170>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 07:22:15 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 11:22:15 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231262=3A?=
 =?utf-8?q?_Products_not_being_listed_against_Accounts_when_Sales_Order/In?=
 =?utf-8?q?voice_created?=
In-Reply-To: <076.fd68f0c276cf51384c7c588eeaea61be@vtiger.fosslabs.com>
References: <076.fd68f0c276cf51384c7c588eeaea61be@vtiger.fosslabs.com>
Message-ID: <085.33e3ee21dd9aeb7ac1bc00e711d54e7b@vtiger.fosslabs.com>

#1262: Products not being listed against Accounts when Sales Order/Invoice created
----------------------------------+-----------------------------------------
  Reporter:  thealbs at yahoo.co.uk  |       Owner:  saraj   
      Type:  defect               |      Status:  new     
  Priority:  major                |   Milestone:          
 Component:  vtigercrm            |     Version:  5.0.1   
Resolution:                       |    Keywords:  products
----------------------------------+-----------------------------------------
Changes (by saraj):

  * version:  5.0.0 => 5.0.1

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1262>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 07:22:25 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 11:22:25 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231207=3A?=
 =?utf-8?q?_products_related_to_lead_are_not_carried_over_when_lead_is_con?=
 =?utf-8?q?verted?=
In-Reply-To: <076.029392e9fc29e5d7b21c662647a73612@vtiger.fosslabs.com>
References: <076.029392e9fc29e5d7b21c662647a73612@vtiger.fosslabs.com>
Message-ID: <085.d7dfb25580ef19914444eb96bc4fb700@vtiger.fosslabs.com>

#1207: products related to lead are not carried over when lead is converted
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  mickie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mickie):

  * owner:  saraj => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1207>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 07:22:40 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 11:22:40 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231229=3A?=
 =?utf-8?q?_LHS_panel_missing_for_System_Information=2E?=
In-Reply-To: <076.9948487d1aec14088b1363d9ae418188@vtiger.fosslabs.com>
References: <076.9948487d1aec14088b1363d9ae418188@vtiger.fosslabs.com>
Message-ID: <085.6095172ee24db4fc35d03a35e794758b@vtiger.fosslabs.com>

#1229: LHS panel missing for System Information.
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  saint
      Type:  defect     |      Status:  new  
  Priority:  major      |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by richie):

  * owner:  saraj => saint

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1229>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 07:22:56 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 11:22:56 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231249=3A?=
	=?utf-8?q?_Task_Information?=
In-Reply-To: <076.e46a01212fb9981d78bbf6e6e2673af6@vtiger.fosslabs.com>
References: <076.e46a01212fb9981d78bbf6e6e2673af6@vtiger.fosslabs.com>
Message-ID: <085.0b04af1f378cb9bd70d3a72ab903e9d5@vtiger.fosslabs.com>

#1249: Task Information
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  minnie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * owner:  saraj => minnie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1249>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 07:39:20 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 11:39:20 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231245=3A?=
 =?utf-8?q?_edit_and_del_links_are_not_exist_in_listview_and_relatedlists?=
In-Reply-To: <076.4ddff9b4349d2a2ad1f3163458b73b34@vtiger.fosslabs.com>
References: <076.4ddff9b4349d2a2ad1f3163458b73b34@vtiger.fosslabs.com>
Message-ID: <085.53230406c9d396e38f1ef215f6d32f0a@vtiger.fosslabs.com>

#1245: edit and del links are not exist in listview and relatedlists
------------------------+---------------------------------------------------
  Reporter:  mickie     |       Owner:  mickie
      Type:  defect     |      Status:  new   
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * owner:  ahmed => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1245>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 07:39:50 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 11:39:50 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231268=3A?=
 =?utf-8?q?_Error_in_Email_language_file?=
In-Reply-To: <076.e552d828a7b238f9e865edf84f9ad995@vtiger.fosslabs.com>
References: <076.e552d828a7b238f9e865edf84f9ad995@vtiger.fosslabs.com>
Message-ID: <085.085b931478bee9be799deeda8e0882a7@vtiger.fosslabs.com>

#1268: Error in Email language file
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  ahmed 
      Type:  defect     |      Status:  closed
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  wontfix    |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * resolution:  => wontfix
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1268>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 07:42:04 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 11:42:04 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231031=3A?=
 =?utf-8?q?_could_not_create_customview?=
In-Reply-To: <076.6bcaa1e937849dde732bcec957022b60@vtiger.fosslabs.com>
References: <076.6bcaa1e937849dde732bcec957022b60@vtiger.fosslabs.com>
Message-ID: <085.1825c7221c30574108d83e82016312ac@vtiger.fosslabs.com>

#1031: could not create customview
------------------------+---------------------------------------------------
  Reporter:  mangai     |       Owner:  philip
      Type:  defect     |      Status:  new   
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by saraj):

  * summary:  could not create custom field => could not create customview

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1031>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 07:44:17 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 11:44:17 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231276=3A?=
 =?utf-8?q?_Language_file_issue_/include/language?=
In-Reply-To: <076.705db0ccf0fb3c7495be9bad38dc724d@vtiger.fosslabs.com>
References: <076.705db0ccf0fb3c7495be9bad38dc724d@vtiger.fosslabs.com>
Message-ID: <085.d45af841ba8c2971b22961f08278e5c3@vtiger.fosslabs.com>

#1276: Language file issue /include/language
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  ahmed 
      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: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1276>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 07:48:43 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 11:48:43 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7184 - in
 /vtigercrm/trunk/modules/Contacts: Contact.php Merge.php
Message-ID: <20060616114843.1649E7ED31F@vtiger.fosslabs.com>

Author: don
Date: Fri Jun 16 05:48:39 2006
New Revision: 7184

Log:
Fixed issues in vtiger_ prefixing in table names

Modified:
    vtigercrm/trunk/modules/Contacts/Contact.php
    vtigercrm/trunk/modules/Contacts/Merge.php

Modified: vtigercrm/trunk/modules/Contacts/Contact.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/Contact.php (original)
+++ vtigercrm/trunk/modules/Contacts/Contact.php Fri Jun 16 05:48:39 2006
@@ -184,7 +184,7 @@
     {   
 	global $log;
 	$log->debug("Entering get_contacts(".$user_name.",".$from_index.",".$offset.") method ...");
-      $query = "select vtiger_users.user_name,vtiger_groups.groupname,vtiger_contactdetails.department department, vtiger_contactdetails.phone office_phone, vtiger_contactdetails.fax fax, vtiger_contactsubdetails.assistant assistant_name, vtiger_contactsubdetails.otherphone other_phone, vtiger_contactsubdetails.homephone home_phone,vtiger_contactsubdetails.birthday birthdate, vtiger_contactdetails.lastname last_name,vtiger_contactdetails.firstname first_name,vtiger_contactdetails.contactid as id, vtiger_contactdetails.salutation as salutation, vtiger_contactdetails.email as email1,vtiger_contactdetails.title as title,vtiger_contactdetails.mobile as phone_mobile,vtiger_account.accountname as vtiger_account_name,vtiger_account.accountid as vtiger_account_id, vtiger_contactaddress.mailingcity as primary_address_city,vtiger_contactaddress.mailingstreet as primary_address_street, vtiger_contactaddress.mailingcountry as primary_address_country,vtiger_contactaddress.mailingstate as primary_address_state, vtiger_contactaddress.mailingzip as primary_address_postalcode,   vtiger_contactaddress.othercity as alt_address_city,vtiger_contactaddress.otherstreet as alt_address_street, vtiger_contactaddress.othercountry as alt_address_country,vtiger_contactaddress.otherstate as alt_address_state, vtiger_contactaddress.otherzip as alt_address_postalcode  from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_contactdetails.contactid inner join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_account on vtiger_account.accountid=vtiger_contactdetails.accountid left join vtiger_contactaddress on vtiger_contactaddress.contactaddressid=vtiger_contactdetails.contactid left join vtiger_contactsubdetails on vtiger_contactsubdetails.contactsubscriptionid = vtiger_contactdetails.contactid left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid left join vtiger_groups on vtiger_groups.groupname=vtiger_contactgrouprelation.groupname left join vtiger_users on vtiger_crmentity.smownerid=vtiger_users.id where user_name='" .$user_name ."' and vtiger_crmentity.deleted=0 limit " .$from_index ."," .$offset;
+      $query = "select vtiger_users.user_name,vtiger_groups.groupname,vtiger_contactdetails.department department, vtiger_contactdetails.phone office_phone, vtiger_contactdetails.fax fax, vtiger_contactsubdetails.assistant assistant_name, vtiger_contactsubdetails.otherphone other_phone, vtiger_contactsubdetails.homephone home_phone,vtiger_contactsubdetails.birthday birthdate, vtiger_contactdetails.lastname last_name,vtiger_contactdetails.firstname first_name,vtiger_contactdetails.contactid as id, vtiger_contactdetails.salutation as salutation, vtiger_contactdetails.email as email1,vtiger_contactdetails.title as title,vtiger_contactdetails.mobile as phone_mobile,vtiger_account.accountname as account_name,vtiger_account.accountid as account_id, vtiger_contactaddress.mailingcity as primary_address_city,vtiger_contactaddress.mailingstreet as primary_address_street, vtiger_contactaddress.mailingcountry as primary_address_country,vtiger_contactaddress.mailingstate as primary_address_state, vtiger_contactaddress.mailingzip as primary_address_postalcode,   vtiger_contactaddress.othercity as alt_address_city,vtiger_contactaddress.otherstreet as alt_address_street, vtiger_contactaddress.othercountry as alt_address_country,vtiger_contactaddress.otherstate as alt_address_state, vtiger_contactaddress.otherzip as alt_address_postalcode  from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_contactdetails.contactid inner join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_account on vtiger_account.accountid=vtiger_contactdetails.accountid left join vtiger_contactaddress on vtiger_contactaddress.contactaddressid=vtiger_contactdetails.contactid left join vtiger_contactsubdetails on vtiger_contactsubdetails.contactsubscriptionid = vtiger_contactdetails.contactid left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid left join vtiger_groups on vtiger_groups.groupname=vtiger_contactgrouprelation.groupname left join vtiger_users on vtiger_crmentity.smownerid=vtiger_users.id where user_name='" .$user_name ."' and vtiger_crmentity.deleted=0 limit " .$from_index ."," .$offset;
       
 	$log->debug("Exiting get_contacts method ...");
       return $this->process_list_query1($query);
@@ -356,7 +356,7 @@
 		$query .= " union all ";
 		$query .= "select vtiger_attachments.description AS title,'Attachments' AS ActivityType,
 		vtiger_attachments.name AS filename, vtiger_attachments.type AS FileType,crm2.modifiedtime AS lastmodified,
-		vtiger_attachments.attachmentsid AS vtiger_attachmentsid, vtiger_seattachmentsrel.attachmentsid AS crmid,
+		vtiger_attachments.attachmentsid AS attachmentsid, vtiger_seattachmentsrel.attachmentsid AS crmid,
 			crm2.createdtime, vtiger_attachments.description, vtiger_users.user_name
 		from vtiger_attachments
 			inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid= vtiger_attachments.attachmentsid
@@ -493,7 +493,7 @@
 		{
 			$query =  $this->constructCustomQueryAddendum('contactscf','Contacts') ."
                                 vtiger_contactdetails.*, vtiger_contactaddress.*,
-                                vtiger_account.accountname vtiger_account_name,
+                                vtiger_account.accountname account_name,
                                 vtiger_users.user_name assigned_user_name
                                 FROM vtiger_contactdetails
 				inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_contactdetails.contactid
@@ -507,7 +507,7 @@
 		{
                   	 $query = "SELECT
                                 vtiger_contactdetails.*, vtiger_contactaddress.*,
-                                vtiger_account.accountname vtiger_account_name,
+                                vtiger_account.accountname account_name,
                                 vtiger_users.user_name assigned_user_name
                                 FROM vtiger_contactdetails
                                 inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_contactdetails.contactid
@@ -528,7 +528,7 @@
 {
 	global $log;
 	$log->debug("Entering getColumnNames() method ...");
-	$sql1 = "select vtiger_fieldlabel from vtiger_field where vtiger_tabid=4 and block <> 6 and block <> 75";
+	$sql1 = "select fieldlabel from vtiger_field where tabid=4 and block <> 6 and block <> 75";
 	$result = $this->db->query($sql1);
 	$numRows = $this->db->num_rows($result);
 	for($i=0; $i < $numRows;$i++)

Modified: vtigercrm/trunk/modules/Contacts/Merge.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/Merge.php (original)
+++ vtigercrm/trunk/modules/Contacts/Merge.php Fri Jun 16 05:48:39 2006
@@ -151,16 +151,16 @@
 				inner join vtiger_contactaddress on vtiger_contactdetails.contactid = vtiger_contactaddress.contactaddressid 
 				inner join vtiger_contactsubdetails on vtiger_contactdetails.contactid = vtiger_contactsubdetails.contactsubscriptionid 
 				inner join vtiger_contactscf on vtiger_contactdetails.contactid = vtiger_contactscf.contactid 
-				left join vtiger_contactdetails as vtiger_contactdetailsContacts on vtiger_contactdetailsContacts.contactid = vtiger_contactdetails.reportsto
-				left join vtiger_account as vtiger_accountContacts on vtiger_accountContacts.accountid = vtiger_contactdetails.accountid 
+				left join vtiger_contactdetails as contactdetailsContacts on contactdetailsContacts.contactid = vtiger_contactdetails.reportsto
+				left join vtiger_account as accountContacts on accountContacts.accountid = contactdetails.accountid 
 				left join vtiger_users on vtiger_users.id = vtiger_crmentity.smownerid
 				left join vtiger_account on vtiger_account.accountid = vtiger_contactdetails.accountid
-				left join vtiger_crmentity as vtiger_crmentityAccounts on vtiger_crmentityAccounts.crmid=vtiger_account.accountid
+				left join vtiger_crmentity as crmentityAccounts on crmentityAccounts.crmid=vtiger_account.accountid
 				left join vtiger_accountbillads on vtiger_account.accountid=vtiger_accountbillads.accountaddressid
 				left join vtiger_accountshipads on vtiger_account.accountid=vtiger_accountshipads.accountaddressid
 				left join vtiger_accountscf on vtiger_account.accountid = vtiger_accountscf.accountid
-				left join vtiger_account as vtiger_accountAccounts on vtiger_accountAccounts.accountid = vtiger_account.parentid
-				left join vtiger_users as vtiger_usersAccounts on vtiger_usersAccounts.id = vtiger_crmentityAccounts.smownerid 
+				left join vtiger_account as accountAccounts on accountAccounts.accountid = vtiger_account.parentid
+				left join vtiger_users as usersAccounts on usersAccounts.id = crmentityAccounts.smownerid 
 				where vtiger_crmentity.deleted=0 and (crmentityAccounts.deleted <> 1) and vtiger_contactdetails.contactid in(".$mass_merge.")";
 				
 
@@ -197,7 +197,7 @@
 $csvdata = implode($mergevalue,"###");
 }else
 {
-	die("No vtiger_fields to do Merge");
+	die("No fields to do Merge");
 }	
 
 $handle = fopen($wordtemplatedownloadpath."datasrc.csv","wb");




From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 07:49:28 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 11:49:28 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=2379=3A_A?=
	=?utf-8?q?ddress_inheritance?=
In-Reply-To: <076.cc7367ebe2ccb8423599b01e9c951b5c@vtiger.fosslabs.com>
References: <076.cc7367ebe2ccb8423599b01e9c951b5c@vtiger.fosslabs.com>
Message-ID: <085.1494e168568fc0c83275eed8dea8f03d@vtiger.fosslabs.com>

#79: Address inheritance
-------------------------------+--------------------------------------------
  Reporter:  eberle.d at 4net.ch  |       Owner:  saraj
      Type:  enhancement       |      Status:  new  
  Priority:  critical          |   Milestone:  5.0.0
 Component:  vtigercrm         |     Version:  5.0.1
Resolution:                    |    Keywords:       
-------------------------------+--------------------------------------------
Changes (by saraj):

  * version:  5.0.0 => 5.0.1

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/79>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 08:05:03 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 12:05:03 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231330=3A?=
 =?utf-8?q?_Admin_changed_to_non-admin_throws_exception?=
Message-ID: <076.0c85df12391add0bf2240fd158a748fe@vtiger.fosslabs.com>

#1330: Admin changed to non-admin throws exception
-----------------------+----------------------------------------------------
 Reporter:  saraj      |       Owner:  don  
     Type:  defect     |      Status:  new  
 Priority:  major      |   Milestone:  5.0.0
Component:  vtigercrm  |     Version:  5.0.0
 Keywords:             |  
-----------------------+----------------------------------------------------
 Created a profile with following permissions and assigned it to a role.

 Global Privileges: no permission

 Tab Privileges: All modules permitted

 Standard Privileges: All opration permitted

 Field Privileges: All

 Utility Privileges: All

 Default Organization Sharing Access: Prinvate Default Organization Fields
 Access:All

 Assigned this role to admin user (having user id 1) and unchecked the
 admin option, after recalulating and relogin, got the following exception.

 Parse error: parse error, unexpected ';' in
 /home/jerijohn/vtigeralpha2/vtigerbeta20_03/vtigerCRM5_beta/apache/htdocs/vtigerCRM/jun14/user_privileges/user_privileges_1.php
 on line 15

 P.S found out that in user_privileges/user_privileges_1.php file the line
 no. 15 looks like this $profileTabsPermission=;

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1330>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 08:23:09 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 12:23:09 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231265=3A?=
 =?utf-8?q?_Global_Search_Function_throws_error?=
In-Reply-To: <076.76671c46776deb9518824e095947cbde@vtiger.fosslabs.com>
References: <076.76671c46776deb9518824e095947cbde@vtiger.fosslabs.com>
Message-ID: <085.079a2def53b5acc20383cc5191085fe2@vtiger.fosslabs.com>

#1265: Global Search Function throws error
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  richie
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1265>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 08:23:33 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 12:23:33 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23918=3A_?=
 =?utf-8?q?Global_search_function_shows_wrong_results?=
In-Reply-To: <076.a484dea87ad7ce51b1edd92f46c3ba8a@vtiger.fosslabs.com>
References: <076.a484dea87ad7ce51b1edd92f46c3ba8a@vtiger.fosslabs.com>
Message-ID: <085.db971ff4d9cd364a01dae93078656d6c@vtiger.fosslabs.com>

#918: Global search function shows wrong results
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  richie
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 unable to reproduce this.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/918>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 08:24:09 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 12:24:09 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231277=3A?=
 =?utf-8?q?_Can=27t_translate_term_close_without_problem?=
In-Reply-To: <076.d518c5251779ede24caf171d8d809788@vtiger.fosslabs.com>
References: <076.d518c5251779ede24caf171d8d809788@vtiger.fosslabs.com>
Message-ID: <085.26869a3d9e1fb75255099ae46b2403d1@vtiger.fosslabs.com>

#1277: Can't translate term close without problem
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  richie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Comment (by richie):

 need more info in this. The image too is not proper.
 Kindly provide proper image please.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1277>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 08:25:59 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 12:25:59 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=23508=3A_?=
	=?utf-8?q?validation_for_search?=
In-Reply-To: <076.937f1cb0969bd6cc06f852196b3b683b@vtiger.fosslabs.com>
References: <076.937f1cb0969bd6cc06f852196b3b683b@vtiger.fosslabs.com>
Message-ID: <085.71fd4786685b03e2f4206dfcbe824045@vtiger.fosslabs.com>

#508: validation for search
--------------------------------+-------------------------------------------
  Reporter:  minnie at vtiger.com  |       Owner:  richie
      Type:  defect             |      Status:  closed
  Priority:  major              |   Milestone:        
 Component:  vtigercrm          |     Version:  5.0.0 
Resolution:  fixed              |    Keywords:        
--------------------------------+-------------------------------------------
Changes (by richie):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/508>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 08:36:24 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 12:36:24 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231222=3A?=
 =?utf-8?q?_Usage_of_Sub-tabs_for_single_section?=
In-Reply-To: <076.78247280d8dd9123017382a76f8fea10@vtiger.fosslabs.com>
References: <076.78247280d8dd9123017382a76f8fea10@vtiger.fosslabs.com>
Message-ID: <085.71b2681dc58096c1305bd07b69b0dbe2@vtiger.fosslabs.com>

#1222: Usage of Sub-tabs for single section
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  saraj 
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  wontfix    |    Keywords:        
------------------------+---------------------------------------------------
Changes (by saraj):

  * resolution:  => wontfix
  * status:  new => closed

Comment:

 Hi Gopal,

 To have a consistent view across the modules and sections, even we have
 single section we are showing it in tabbed view.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1222>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 09:04:06 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 13:04:06 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231302=3A?=
 =?utf-8?q?_Update_to_new_adodb-4=2E90_release?=
In-Reply-To: <076.cfae0e78298741dfce9c6a4f41a70218@vtiger.fosslabs.com>
References: <076.cfae0e78298741dfce9c6a4f41a70218@vtiger.fosslabs.com>
Message-ID: <085.1ebf649ac611c45407409eadc8738dfa@vtiger.fosslabs.com>

#1302: Update to new adodb-4.90 release
------------------------+---------------------------------------------------
  Reporter:  jeffk      |       Owner:  jeffk                 
      Type:  defect     |      Status:  new                   
  Priority:  major      |   Milestone:  5.0.0                 
 Component:  vtigercrm  |     Version:  5.0.0                 
Resolution:             |    Keywords:  adodb database package
------------------------+---------------------------------------------------
Comment (by jeffk):

 (In [7185]) refs #1302. update adodb-4.81 to adodb-4.90

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1302>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 09:04:06 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 13:04:06 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7185 - in
 /vtigercrm/branches/4.2/adodb: ./ datadict/ drivers/ perf/ session/
 session/old/ tests/
Message-ID: <20060616130408.EAA6D7ED334@vtiger.fosslabs.com>

Author: jeffk
Date: Fri Jun 16 07:03:47 2006
New Revision: 7185

Log:
refs #1302. update adodb-4.81 to adodb-4.90

Modified:
    vtigercrm/branches/4.2/adodb/adodb-active-record.inc.php
    vtigercrm/branches/4.2/adodb/adodb-csvlib.inc.php
    vtigercrm/branches/4.2/adodb/adodb-datadict.inc.php
    vtigercrm/branches/4.2/adodb/adodb-error.inc.php
    vtigercrm/branches/4.2/adodb/adodb-errorhandler.inc.php
    vtigercrm/branches/4.2/adodb/adodb-errorpear.inc.php
    vtigercrm/branches/4.2/adodb/adodb-exceptions.inc.php
    vtigercrm/branches/4.2/adodb/adodb-iterator.inc.php
    vtigercrm/branches/4.2/adodb/adodb-lib.inc.php
    vtigercrm/branches/4.2/adodb/adodb-pager.inc.php
    vtigercrm/branches/4.2/adodb/adodb-pear.inc.php
    vtigercrm/branches/4.2/adodb/adodb-perf.inc.php
    vtigercrm/branches/4.2/adodb/adodb-php4.inc.php
    vtigercrm/branches/4.2/adodb/adodb.inc.php
    vtigercrm/branches/4.2/adodb/datadict/datadict-access.inc.php
    vtigercrm/branches/4.2/adodb/datadict/datadict-db2.inc.php
    vtigercrm/branches/4.2/adodb/datadict/datadict-firebird.inc.php
    vtigercrm/branches/4.2/adodb/datadict/datadict-generic.inc.php
    vtigercrm/branches/4.2/adodb/datadict/datadict-ibase.inc.php
    vtigercrm/branches/4.2/adodb/datadict/datadict-informix.inc.php
    vtigercrm/branches/4.2/adodb/datadict/datadict-mssql.inc.php
    vtigercrm/branches/4.2/adodb/datadict/datadict-mysql.inc.php
    vtigercrm/branches/4.2/adodb/datadict/datadict-oci8.inc.php
    vtigercrm/branches/4.2/adodb/datadict/datadict-postgres.inc.php
    vtigercrm/branches/4.2/adodb/datadict/datadict-sybase.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-access.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-ado.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-ado5.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-ado_access.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-ado_mssql.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-borland_ibase.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-csv.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-db2.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-fbsql.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-firebird.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-ibase.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-informix.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-informix72.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-ldap.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-mssql.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-mssqlpo.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-mysql.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-mysqli.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-mysqlt.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-netezza.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-oci8.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-oci805.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-oci8po.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-odbc.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-odbc_db2.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-odbc_mssql.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-odbc_oracle.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-odbtp.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-odbtp_unicode.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-oracle.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-pdo.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-pdo_mssql.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-pdo_mysql.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-pdo_oci.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-pdo_pgsql.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-postgres.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-postgres64.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-postgres7.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-postgres8.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-proxy.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-sapdb.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-sqlanywhere.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-sqlite.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-sqlitepo.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-sybase.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-sybase_ase.inc.php
    vtigercrm/branches/4.2/adodb/drivers/adodb-vfp.inc.php
    vtigercrm/branches/4.2/adodb/perf/perf-db2.inc.php
    vtigercrm/branches/4.2/adodb/perf/perf-informix.inc.php
    vtigercrm/branches/4.2/adodb/perf/perf-mssql.inc.php
    vtigercrm/branches/4.2/adodb/perf/perf-mysql.inc.php
    vtigercrm/branches/4.2/adodb/perf/perf-oci8.inc.php
    vtigercrm/branches/4.2/adodb/perf/perf-postgres.inc.php
    vtigercrm/branches/4.2/adodb/pivottable.inc.php
    vtigercrm/branches/4.2/adodb/rsfilter.inc.php
    vtigercrm/branches/4.2/adodb/server.php
    vtigercrm/branches/4.2/adodb/session/adodb-compress-bzip2.php
    vtigercrm/branches/4.2/adodb/session/adodb-compress-gzip.php
    vtigercrm/branches/4.2/adodb/session/adodb-cryptsession.php
    vtigercrm/branches/4.2/adodb/session/adodb-encrypt-mcrypt.php
    vtigercrm/branches/4.2/adodb/session/adodb-encrypt-md5.php
    vtigercrm/branches/4.2/adodb/session/adodb-encrypt-secret.php
    vtigercrm/branches/4.2/adodb/session/adodb-session-clob.php
    vtigercrm/branches/4.2/adodb/session/adodb-session.php
    vtigercrm/branches/4.2/adodb/session/old/adodb-cryptsession.php
    vtigercrm/branches/4.2/adodb/session/old/adodb-session-clob.php
    vtigercrm/branches/4.2/adodb/session/old/adodb-session.php
    vtigercrm/branches/4.2/adodb/tests/test-active-recs2.php
    vtigercrm/branches/4.2/adodb/tests/test.php
    vtigercrm/branches/4.2/adodb/tests/testdatabases.inc.php
    vtigercrm/branches/4.2/adodb/toexport.inc.php
    vtigercrm/branches/4.2/adodb/tohtml.inc.php

Modified: vtigercrm/branches/4.2/adodb/adodb-active-record.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/adodb-active-record.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/adodb-active-record.inc.php Fri Jun 16 07:03:47 2006
@@ -1,7 +1,7 @@
 <?php
 /*
 
- at version V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ at version V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Latest version is available at http://adodb.sourceforge.net
  
   Released under both BSD license and Lesser GPL library license. 
@@ -10,7 +10,7 @@
   
   Active Record implementation. Superset of Zend Framework's.
   
-  Version 0.03
+  Version 0.04
   
   See http://www-128.ibm.com/developerworks/java/library/j-cb03076/?ca=dgr-lnxw01ActiveRecord 
   	for info on Ruby on Rails Active Record implementation
@@ -56,7 +56,7 @@
 
 class ADODB_Active_Record {
 	var $_dbat; // associative index pointing to ADODB_Active_DB eg. $ADODB_Active_DBS[_dbat]
-	var $_table; // tablename
+	var $_table; // tablename, if set in class definition then use it as table name
 	var $_tableat; // associative index pointing to ADODB_Active_Table, eg $ADODB_Active_DBS[_dbat]->tables[$this->_tableat]
 	var $_where; // where clause set in Load()
 	var $_saved = false; // indicates whether data is already inserted.
@@ -85,8 +85,10 @@
 			$pkeyarr = false;
 		}
 		
-		if (!$table) $table = $this->_pluralize(get_class($this));
-		
+		if (!$table) { 
+			if (!empty($this->_table)) $table = $this->_table;
+			else $table = $this->_pluralize(get_class($this));
+		}
 		if ($db) {
 			$this->_dbat = ADODB_Active_Record::SetDatabaseAdapter($db);
 		} else
@@ -455,6 +457,13 @@
 		$db->Execute($sql);
 	}
 	
+	// returns an array of active record objects
+	function &Find($whereOrderBy,$bindarr=false,$pkeysArr=false)
+	{
+		$db =& $this->DB(); if (!$db || empty($this->_table)) return false;
+		$arr =& $db->GetActiveRecordsClass(get_class($this),$this->_table, $whereOrderBy,$bindarr,$pkeysArr);
+		return $arr;
+	}
 	
 	// returns 0 on error, 1 on update, 2 on insert
 	function Replace()

Modified: vtigercrm/branches/4.2/adodb/adodb-csvlib.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/adodb-csvlib.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/adodb-csvlib.inc.php Fri Jun 16 07:03:47 2006
@@ -8,7 +8,7 @@
 
 /* 
 
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. See License.txt. 

Modified: vtigercrm/branches/4.2/adodb/adodb-datadict.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/adodb-datadict.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/adodb-datadict.inc.php Fri Jun 16 07:03:47 2006
@@ -1,7 +1,7 @@
 <?php
 
 /**
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/branches/4.2/adodb/adodb-error.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/adodb-error.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/adodb-error.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /** 
- * @version V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ * @version V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
  * Released under both BSD license and Lesser GPL library license. 
  * Whenever there is any discrepancy between the two licenses, 
  * the BSD license will take precedence. 

Modified: vtigercrm/branches/4.2/adodb/adodb-errorhandler.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/adodb-errorhandler.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/adodb-errorhandler.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ * @version V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
  * Released under both BSD license and Lesser GPL library license.
  * Whenever there is any discrepancy between the two licenses,
  * the BSD license will take precedence.

Modified: vtigercrm/branches/4.2/adodb/adodb-errorpear.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/adodb-errorpear.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/adodb-errorpear.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /** 
- * @version V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ * @version V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
  * Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. 

Modified: vtigercrm/branches/4.2/adodb/adodb-exceptions.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/adodb-exceptions.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/adodb-exceptions.inc.php Fri Jun 16 07:03:47 2006
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @version V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ * @version V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
  * Released under both BSD license and Lesser GPL library license.
  * Whenever there is any discrepancy between the two licenses,
  * the BSD license will take precedence.

Modified: vtigercrm/branches/4.2/adodb/adodb-iterator.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/adodb-iterator.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/adodb-iterator.inc.php Fri Jun 16 07:03:47 2006
@@ -1,7 +1,7 @@
 <?php
 
 /*
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

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 Fri Jun 16 07:03:47 2006
@@ -7,7 +7,7 @@
 $ADODB_INCLUDED_LIB = 1;
 
 /* 
- @version V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim\@natsoft.com.my). All rights reserved.
+ @version V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim\@natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. See License.txt. 
@@ -325,6 +325,8 @@
 		$rewritesql = preg_replace(
 					'/^\s*SELECT\s.*\s+FROM\s/Uis','SELECT COUNT(*) FROM ',$sql);
 
+		
+		
 		// fix by alexander zhukov, alex#unipack.ru, because count(*) and 'order by' fails 
 		// with mssql, access and postgresql. Also a good speedup optimization - skips sorting!
 		// also see http://phplens.com/lens/lensforum/msgs.php?id=12752
@@ -332,10 +334,13 @@
 			$rewritesql = preg_replace('/(\sORDER\s+BY\s.*)/is','',$rewritesql);
 		else
 			$rewritesql = preg_replace('/(\sORDER\s+BY\s[^)]*)/is','',$rewritesql);
+	}
+	
+	
+	
+	if (isset($rewritesql) && $rewritesql != $sql) {
+		if (preg_match('/\sLIMIT\s+[0-9]+/i',$sql,$limitarr)) $rewritesql .= $limitarr[1];
 		 
-	}
-	
-	if (isset($rewritesql) && $rewritesql != $sql) {
 		if ($secs2cache) {
 			// we only use half the time of secs2cache because the count can quickly
 			// become inaccurate if new records are added
@@ -354,6 +359,8 @@
 	if (preg_match('/\s*UNION\s*/is', $sql)) $rewritesql = $sql;
 	else $rewritesql = preg_replace('/(\sORDER\s+BY\s.*)/is','',$sql); 
 	
+	if (preg_match('/\sLIMIT\s+[0-9]+/i',$sql,$limitarr)) $rewritesql .= $limitarr[0];
+		
 	$rstest = &$zthis->Execute($rewritesql,$inputarr);
 	if (!$rstest) $rstest = $zthis->Execute($sql,$inputarr);
 	
@@ -1017,5 +1024,47 @@
 	
 	return $s;
 }
+/*
+function _adodb_find_from($sql) 
+{
+
+	$sql = str_replace(array("\n","\r"), ' ', $sql);
+	$charCount = strlen($sql);
+	
+	$inString = false;
+	$quote = '';
+	$parentheseCount = 0;
+	$prevChars = '';
+	$nextChars = '';
+	
+
+	for($i = 0; $i < $charCount; $i++) {
+
+    	$char = substr($sql,$i,1);
+	    $prevChars = substr($sql,0,$i);
+    	$nextChars = substr($sql,$i+1);
+
+		if((($char == "'" || $char == '"' || $char == '`') && substr($prevChars,-1,1) != '\\') && $inString === false) {
+			$quote = $char;
+			$inString = true;
+		}
+
+		elseif((($char == "'" || $char == '"' || $char == '`') && substr($prevChars,-1,1) != '\\') && $inString === true && $quote == $char) {
+			$quote = "";
+			$inString = false;
+		}
+
+		elseif($char == "(" && $inString === false)
+			$parentheseCount++;
+
+		elseif($char == ")" && $inString === false && $parentheseCount > 0)
+			$parentheseCount--;
+
+		elseif($parentheseCount <= 0 && $inString === false && $char == " " && strtoupper(substr($prevChars,-5,5)) == " FROM")
+			return $i;
+
+	}
+}
+*/
 
 ?>

Modified: vtigercrm/branches/4.2/adodb/adodb-pager.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/adodb-pager.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/adodb-pager.inc.php Fri Jun 16 07:03:47 2006
@@ -1,7 +1,7 @@
 <?php
 
 /*
-	V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+	V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
 	  Released under both BSD license and Lesser GPL library license. 
 	  Whenever there is any discrepancy between the two licenses, 
 	  the BSD license will take precedence. 

Modified: vtigercrm/branches/4.2/adodb/adodb-pear.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/adodb-pear.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/adodb-pear.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /** 
- * @version V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ * @version V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
  * Released under both BSD license and Lesser GPL library license. 
  * Whenever there is any discrepancy between the two licenses, 
  * the BSD license will take precedence. 

Modified: vtigercrm/branches/4.2/adodb/adodb-perf.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/adodb-perf.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/adodb-perf.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. See License.txt. 

Modified: vtigercrm/branches/4.2/adodb/adodb-php4.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/adodb-php4.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/adodb-php4.inc.php Fri Jun 16 07:03:47 2006
@@ -1,7 +1,7 @@
 <?php
 
 /*
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

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 Fri Jun 16 07:03:47 2006
@@ -14,7 +14,7 @@
 /**
 	\mainpage 	
 	
-	 @version V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+	 @version V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
 
 	Released under both BSD license and Lesser GPL library license. You can choose which license
 	you prefer.
@@ -171,7 +171,7 @@
 		/**
 		 * ADODB version as a string.
 		 */
-		$ADODB_vers = 'V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved. Released BSD & LGPL.';
+		$ADODB_vers = 'V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved. Released BSD & LGPL.';
 	
 		/**
 		 * Determines whether recordset->RecordCount() is used. 
@@ -314,6 +314,7 @@
 	var $_evalAll = false;
 	var $_affected = false;
 	var $_logsql = false;
+	var $_transmode = ''; // transaction mode
 	
 	/**
 	 * Constructor
@@ -823,7 +824,10 @@
 							$sql .= str_replace(',','.',$v); // locales fix so 1.1 does not get converted to 1,1
 						else if ($typ == 'boolean')
 							$sql .= $v ? $this->true : $this->false;
-						else if ($v === null)
+						else if ($typ == 'object') {
+							if (method_exists($v, '__toString')) $sql .= $this->qstr($v->__toString());
+							else $sql .= $this->qstr((string) $v);
+						} else if ($v === null)
 							$sql .= 'NULL';
 						else
 							$sql .= $v;
@@ -1732,15 +1736,16 @@
 	 */
 	function& AutoExecute($table, $fields_values, $mode = 'INSERT', $where = FALSE, $forceUpdate=true, $magicq=false) 
 	{
+		$false = false;
 		$sql = 'SELECT * FROM '.$table;  
 		if ($where!==FALSE) $sql .= ' WHERE '.$where;
 		else if ($mode == 'UPDATE' || $mode == 2 /* DB_AUTOQUERY_UPDATE */) {
 			ADOConnection::outp('AutoExecute: Illegal mode=UPDATE with empty WHERE clause');
-			return false;
+			return $false;
 		}
 
 		$rs =& $this->SelectLimit($sql,1);
-		if (!$rs) return false; // table does not exist
+		if (!$rs) return $false; // table does not exist
 		$rs->tableName = $table;
 		
 		switch((string) $mode) {
@@ -1754,7 +1759,7 @@
 			break;
 		default:
 			ADOConnection::outp("AutoExecute: Unknown mode=$mode");
-			return false;
+			return $false;
 		}
 		$ret = false;
 		if ($sql) $ret = $this->Execute($sql);
@@ -2017,6 +2022,57 @@
 	 */
 	function BeginTrans() {return false;}
 	
+	/* set transaction mode */
+	function SetTransactionMode( $transaction_mode ) 
+	{
+		$transaction_mode = $this->MetaTransaction($transaction_mode, $this->dataProvider);
+		$this->_transmode  = $transaction_mode;
+	}
+/*
+http://msdn2.microsoft.com/en-US/ms173763.aspx
+http://dev.mysql.com/doc/refman/5.0/en/innodb-transaction-isolation.html
+http://www.postgresql.org/docs/8.1/interactive/sql-set-transaction.html
+http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_10005.htm
+*/
+	function MetaTransaction($mode,$db)
+	{
+		$mode = strtoupper($mode);
+		$mode = str_replace('ISOLATION LEVEL ','',$mode);
+		
+		switch($mode) {
+
+		case 'READ UNCOMMITTED':
+			switch($db) { 
+			case 'oci8':
+			case 'oracle':
+				return 'ISOLATION LEVEL READ COMMITTED';
+			default:
+				return 'ISOLATION LEVEL READ UNCOMMITTED';
+			}
+			break;
+					
+		case 'READ COMMITTED':
+				return 'ISOLATION LEVEL READ COMMITTED';
+			break;
+			
+		case 'REPEATABLE READ':
+			switch($db) {
+			case 'oci8':
+			case 'oracle':
+				return 'ISOLATION LEVEL SERIALIZABLE';
+			default:
+				return 'ISOLATION LEVEL REPEATABLE READ';
+			}
+			break;
+			
+		case 'SERIALIZABLE':
+				return 'ISOLATION LEVEL SERIALIZABLE';
+			break;
+			
+		default:
+			return $mode;
+		}
+	}
 	
 	/**
 	 * If database does not support transactions, always return true as data always commited
@@ -2208,7 +2264,7 @@
 	 *
 	 * @return  array of column names for current table.
 	 */ 
-	function &MetaColumnNames($table, $numIndexes=false) 
+	function &MetaColumnNames($table, $numIndexes=false,$useattnum=false /* only for postgres */) 
 	{
 		$objarr =& $this->MetaColumns($table);
 		if (!is_array($objarr)) {
@@ -2218,7 +2274,12 @@
 		$arr = array();
 		if ($numIndexes) {
 			$i = 0;
-			foreach($objarr as $v) $arr[$i++] = $v->name;
+			if ($useattnum) {
+				foreach($objarr as $v) 
+					$arr[$v->attnum] = $v->name;
+				
+			} else
+				foreach($objarr as $v) $arr[$i++] = $v->name;
 		} else
 			foreach($objarr as $v) $arr[strtoupper($v->name)] = $v->name;
 		
@@ -2260,6 +2321,22 @@
 		}
 
 		return adodb_date($this->fmtDate,$d);
+	}
+	
+	function BindDate($d)
+	{
+		$d = $this->DBDate($d);
+		if (strncmp($d,"'",1)) return $d;
+		
+		return substr($d,1,strlen($d)-2);
+	}
+	
+	function BindTimeStamp($d)
+	{
+		$d = $this->DBTimeStamp($d);
+		if (strncmp($d,"'",1)) return $d;
+		
+		return substr($d,1,strlen($d)-2);
 	}
 	
 	
@@ -3361,6 +3438,7 @@
 		'BPCHAR' => 'C',
 		'CHARACTER' => 'C',
 		'INTERVAL' => 'C',  # Postgres
+		'MACADDR' => 'C', # postgres
 		##
 		'LONGCHAR' => 'X',
 		'TEXT' => 'X',
@@ -3387,6 +3465,7 @@
 		'DATETIME' => 'T',
 		'TIMESTAMPTZ' => 'T',
 		'T' => 'T',
+		'TIMESTAMP WITHOUT TIME ZONE' => 'T', // postgresql
 		##
 		'BOOL' => 'L',
 		'BOOLEAN' => 'L', 

Modified: vtigercrm/branches/4.2/adodb/datadict/datadict-access.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/datadict/datadict-access.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/datadict/datadict-access.inc.php Fri Jun 16 07:03:47 2006
@@ -1,7 +1,7 @@
 <?php
 
 /**
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/branches/4.2/adodb/datadict/datadict-db2.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/datadict/datadict-db2.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/datadict/datadict-db2.inc.php Fri Jun 16 07:03:47 2006
@@ -1,7 +1,7 @@
 <?php
 
 /**
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/branches/4.2/adodb/datadict/datadict-firebird.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/datadict/datadict-firebird.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/datadict/datadict-firebird.inc.php Fri Jun 16 07:03:47 2006
@@ -1,7 +1,7 @@
 <?php
 
 /**
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/branches/4.2/adodb/datadict/datadict-generic.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/datadict/datadict-generic.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/datadict/datadict-generic.inc.php Fri Jun 16 07:03:47 2006
@@ -1,7 +1,7 @@
 <?php
 
 /**
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/branches/4.2/adodb/datadict/datadict-ibase.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/datadict/datadict-ibase.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/datadict/datadict-ibase.inc.php Fri Jun 16 07:03:47 2006
@@ -1,7 +1,7 @@
 <?php
 
 /**
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/branches/4.2/adodb/datadict/datadict-informix.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/datadict/datadict-informix.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/datadict/datadict-informix.inc.php Fri Jun 16 07:03:47 2006
@@ -1,7 +1,7 @@
 <?php
 
 /**
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/branches/4.2/adodb/datadict/datadict-mssql.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/datadict/datadict-mssql.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/datadict/datadict-mssql.inc.php Fri Jun 16 07:03:47 2006
@@ -1,7 +1,7 @@
 <?php
 
 /**
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/branches/4.2/adodb/datadict/datadict-mysql.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/datadict/datadict-mysql.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/datadict/datadict-mysql.inc.php Fri Jun 16 07:03:47 2006
@@ -1,7 +1,7 @@
 <?php
 
 /**
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/branches/4.2/adodb/datadict/datadict-oci8.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/datadict/datadict-oci8.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/datadict/datadict-oci8.inc.php Fri Jun 16 07:03:47 2006
@@ -1,7 +1,7 @@
 <?php
 
 /**
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/branches/4.2/adodb/datadict/datadict-postgres.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/datadict/datadict-postgres.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/datadict/datadict-postgres.inc.php Fri Jun 16 07:03:47 2006
@@ -1,7 +1,7 @@
 <?php
 
 /**
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/branches/4.2/adodb/datadict/datadict-sybase.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/datadict/datadict-sybase.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/datadict/datadict-sybase.inc.php Fri Jun 16 07:03:47 2006
@@ -1,7 +1,7 @@
 <?php
 
 /**
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-access.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-access.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-access.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. See License.txt. 

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-ado.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-ado.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-ado.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. 

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-ado5.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-ado5.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-ado5.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. 
@@ -58,8 +58,22 @@
 	// you can also pass a connection string like this:
 	//
 	// $DB->Connect('USER ID=sa;PASSWORD=pwd;SERVER=mangrove;DATABASE=ai',false,false,'SQLOLEDB');
-	function _connect($argHostname, $argUsername, $argPassword, $argProvider= 'MSDASQL')
-	{
+	function _connect($argHostname, $argUsername, $argPassword,$argDBorProvider, $argProvider= '')
+	{
+	// two modes
+	//	-	if $argProvider is empty, we assume that $argDBorProvider holds provider -- this is for backward compat
+	//	- 	if $argProvider is not empty, then $argDBorProvider holds db
+	
+		
+		 if ($argProvider) {
+		 	$argDatabasename = $argDBorProvider;
+		 } else {
+		 	$argDatabasename = '';
+		 	if ($argDBorProvider) $argProvider = $argDBorProvider;
+			else $argProvider = 'MSDASQL';
+		}
+		
+		
 		try {
 		$u = 'UID';
 		$p = 'PWD';
@@ -86,7 +100,11 @@
 			$argProvider = "Microsoft.Jet.OLEDB.4.0"; // Microsoft Jet Provider
 		
 		if ($argProvider) $dbc->Provider = $argProvider;	
-		
+
+		if ($argProvider) $argHostname = "PROVIDER=$argProvider;DRIVER={SQL Server};SERVER=$argHostname";	
+		
+
+		if ($argDatabasename) $argHostname .= ";DATABASE=$argDatabasename";		
 		if ($argUsername) $argHostname .= ";$u=$argUsername";
 		if ($argPassword)$argHostname .= ";$p=$argPassword";
 		
@@ -205,9 +223,6 @@
 		return $arr;
 	}
 	
-
-
-	
 	/* returns queryID or false */
 	function &_query($sql,$inputarr=false) 
 	{
@@ -251,7 +266,8 @@
 		if ($rs->State == 0) {
 			$true = true;
 			return $true; // 0 = adStateClosed means no records returned
-		} return $rs;
+		}
+		return $rs;
 		
 		} catch (exception $e) {
 			
@@ -296,11 +312,17 @@
 	function ErrorMsg() 
 	{
 		if (!$this->_connectionID) return "No connection established";
-		$errc = $this->_connectionID->Errors;
-		if (!$errc) return "No Errors object found";
-		if ($errc->Count == 0) return '';
-		$err = $errc->Item($errc->Count-1);
-		return $err->Description;
+		$errmsg = '';
+		
+		try {
+			$errc = $this->_connectionID->Errors;
+			if (!$errc) return "No Errors object found";
+			if ($errc->Count == 0) return '';
+			$err = $errc->Item($errc->Count-1);
+			$errmsg = $err->Description;
+		}catch(exception $e) {
+		}
+		return $errmsg;
 	}
 	
 	function ErrorNo() 

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-ado_access.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-ado_access.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-ado_access.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
 Released under both BSD license and Lesser GPL library license. 
 Whenever there is any discrepancy between the two licenses, 
 the BSD license will take precedence. See License.txt. 

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-ado_mssql.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-ado_mssql.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-ado_mssql.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. 
@@ -11,8 +11,8 @@
   Microsoft SQL Server ADO data driver. Requires ADO and MSSQL client. 
   Works only on MS Windows.
   
-  It is normally better to use the mssql driver directly because it is much faster. 
-  This file is only a technology demonstration and for test purposes.
+  Warning: Some versions of PHP (esp PHP4) leak memory when ADO/COM is used. 
+  Please check http://bugs.php.net/ for more info.
 */
 
 // security - hide paths
@@ -53,6 +53,17 @@
 	        return $this->GetOne('select @@rowcount');
 	}
 	
+	function SetTransactionMode( $transaction_mode ) 
+	{
+		$this->_transmode  = $transaction_mode;
+		if (empty($transaction_mode)) {
+			$this->Execute('SET TRANSACTION ISOLATION LEVEL READ COMMITTED');
+			return;
+		}
+		if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
+		$this->Execute("SET TRANSACTION ".$transaction_mode);
+	}
+	
 	function MetaColumns($table)
 	{
         $table = strtoupper($table);
@@ -84,6 +95,44 @@
 		return empty($arr) ? $false : $arr;
 	}
 	
+	function CreateSequence($seq='adodbseq',$start=1)
+	{
+		
+		$this->Execute('BEGIN TRANSACTION adodbseq');
+		$start -= 1;
+		$this->Execute("create table $seq (id float(53))");
+		$ok = $this->Execute("insert into $seq with (tablock,holdlock) values($start)");
+		if (!$ok) {
+				$this->Execute('ROLLBACK TRANSACTION adodbseq');
+				return false;
+		}
+		$this->Execute('COMMIT TRANSACTION adodbseq'); 
+		return true;
+	}
+
+	function GenID($seq='adodbseq',$start=1)
+	{
+		//$this->debug=1;
+		$this->Execute('BEGIN TRANSACTION adodbseq');
+		$ok = $this->Execute("update $seq with (tablock,holdlock) set id = id + 1");
+		if (!$ok) {
+			$this->Execute("create table $seq (id float(53))");
+			$ok = $this->Execute("insert into $seq with (tablock,holdlock) values($start)");
+			if (!$ok) {
+				$this->Execute('ROLLBACK TRANSACTION adodbseq');
+				return false;
+			}
+			$this->Execute('COMMIT TRANSACTION adodbseq'); 
+			return $start;
+		}
+		$num = $this->GetOne("select id from $seq");
+		$this->Execute('COMMIT TRANSACTION adodbseq'); 
+		return $num;
+		
+		// in old implementation, pre 1.90, we returned GUID...
+		//return $this->GetOne("SELECT CONVERT(varchar(255), NEWID()) AS 'Char'");
+	}
+	
 	} // end class 
 	
 	class  ADORecordSet_ado_mssql extends ADORecordSet_ado {        

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-borland_ibase.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-borland_ibase.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-borland_ibase.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. 

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-csv.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-csv.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-csv.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-db2.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-db2.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-db2.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-  V4.81 3 May 2006  (c) 2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2006 John Lim (jlim#natsoft.com.my). All rights reserved.
 
 This is a version of the ADODB driver for DB2.  It uses the 'ibm_db2' PECL extension for PHP
   (http://pecl.php.net/package/ibm_db2), which in turn requires DB2 V8.2.2.
@@ -25,7 +25,14 @@
 class ADODB_db2 extends ADOConnection {
 	var $databaseType = "db2";	
 	var $fmtDate = "'Y-m-d'";
-	var $fmtTimeStamp = "'Y-m-d, h:i:sA'";
+	var $concat_operator = '||';
+	
+	var $sysTime = 'CURRENT TIME';
+	var $sysDate = 'CURRENT DATE';
+	var $sysTimeStamp = 'CURRENT TIMESTAMP';
+	
+	var $fmtTimeStamp = "'Y-m-d-H.i.s'";
+	#var $fmtTimeStamp = "'Y-m-d, h:i:sA'";
 	var $replaceQuote = "''"; // string to use to replace quotes
 	var $dataProvider = "db2";
 	var $hasAffectedRows = true;
@@ -40,6 +47,12 @@
 	var $_haserrorfunctions = true;
 	var $_lastAffectedRows = 0;
 	var $uCaseTables = true; // for meta* functions, uppercase table names
+	var $hasInsertID = true;
+	
+    function _insertid()
+    {
+        return ADOConnection::GetOne('VALUES IDENTITY_VAL_LOCAL()');
+    }
 	
 	function ADODB_db2() 
 	{ 	
@@ -103,6 +116,61 @@
 		return $this->_connectionID != false;
 	}
 
+	
+	// Format date column in sql string given an input format that understands Y M D
+	function SQLDate($fmt, $col=false)
+	{	
+	// use right() and replace() ?
+		if (!$col) $col = $this->sysDate;
+		$s = '';
+		
+		$len = strlen($fmt);
+		for ($i=0; $i < $len; $i++) {
+			if ($s) $s .= $this->concat_operator;
+			$ch = $fmt[$i];
+			switch($ch) {
+			case 'Y':
+			case 'y':
+				$s .= "char(year($col))";
+				break;
+			case 'M':
+				$s .= "substr(monthname($col),1,3)";
+				break;
+			case 'm':
+				$s .= "right(digits(month($col)),2)";
+				break;
+			case 'D':
+			case 'd':
+				$s .= "right(digits(day($col)),2)";
+				break;
+			case 'H':
+			case 'h':
+				if ($col != $this->sysDate) $s .= "right(digits(hour($col)),2)";	
+				else $s .= "''";
+				break;
+			case 'i':
+			case 'I':
+				if ($col != $this->sysDate)
+					$s .= "right(digits(minute($col)),2)";
+					else $s .= "''";
+				break;
+			case 'S':
+			case 's':
+				if ($col != $this->sysDate)
+					$s .= "right(digits(second($col)),2)";
+				else $s .= "''";
+				break;
+			default:
+				if ($ch == '\\') {
+					$i++;
+					$ch = substr($fmt,$i,1);
+				}
+				$s .= $this->qstr($ch);
+			}
+		}
+		return $s;
+	} 
+ 
 	
 	function ServerInfo()
 	{
@@ -575,15 +643,12 @@
 
 
 	// returns the field object
-	function &FetchField($fieldOffset = -1) 
-	{
-		
-		$off=$fieldOffset+1; // offsets begin at 1
-		
+	function &FetchField($offset = -1) 
+	{
 		$o= new ADOFieldObject();
-		$o->name = @db2_field_name($this->_queryID,$off);
-		$o->type = @db2_field_type($this->_queryID,$off);
-		$o->max_length = db2_field_width($this->_queryID,$off);
+		$o->name = @db2_field_name($this->_queryID,$offset);
+		$o->type = @db2_field_type($this->_queryID,$offset);
+		$o->max_length = db2_field_width($this->_queryID,$offset);
 		if (ADODB_ASSOC_CASE == 0) $o->name = strtolower($o->name);
 		else if (ADODB_ASSOC_CASE == 1) $o->name = strtoupper($o->name);
 		return $o;

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-fbsql.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-fbsql.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-fbsql.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /*
- @version V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ @version V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
  Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. 

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-firebird.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-firebird.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-firebird.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. 

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-ibase.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-ibase.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-ibase.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.  
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.  
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-informix.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-informix.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-informix.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+* @version V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
 * Released under both BSD license and Lesser GPL library license.
 * Whenever there is any discrepancy between the two licenses,
 * the BSD license will take precedence.

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-informix72.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-informix72.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-informix72.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim. All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim. All rights reserved.
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-ldap.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-ldap.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-ldap.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /*
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
    Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-mssql.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-mssql.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-mssql.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. 
@@ -296,6 +296,17 @@
 		return true;
 	}
 	
+	function SetTransactionMode( $transaction_mode ) 
+	{
+		$this->_transmode  = $transaction_mode;
+		if (empty($transaction_mode)) {
+			$this->Execute('SET TRANSACTION ISOLATION LEVEL READ COMMITTED');
+			return;
+		}
+		if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
+		$this->Execute("SET TRANSACTION ".$transaction_mode);
+	}
+	
 	/*
 		Usage:
 		

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-mssqlpo.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-mssqlpo.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-mssqlpo.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+* @version V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
 * Released under both BSD license and Lesser GPL library license.
 * Whenever there is any discrepancy between the two licenses,
 * the BSD license will take precedence.

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 Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.
@@ -542,6 +542,9 @@
 	// "Innox - Juan Carlos Gonzalez" <jgonzalez#innox.com.mx>
 	function MetaForeignKeys( $table, $owner = FALSE, $upper = FALSE, $associative = FALSE )
      {
+	 global $ADODB_FETCH_MODE;
+		if ($ADODB_FETCH_MODE == ADODB_FETCH_ASSOC || $this->fetchMode == ADODB_FETCH_ASSOC) $associative = true;
+
          if ( !empty($owner) ) {
             $table = "$owner.$table";
          }

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-mysqli.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-mysqli.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-mysqli.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.
@@ -58,6 +58,16 @@
 	    
 	}
 	
+	function SetTransactionMode( $transaction_mode ) 
+	{
+		$this->_transmode  = $transaction_mode;
+		if (empty($transaction_mode)) {
+			$this->Execute('SET SESSION TRANSACTION ISOLATION LEVEL REPEATABLE READ');
+			return;
+		}
+		if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
+		$this->Execute("SET SESSION TRANSACTION ".$transaction_mode);
+	}
 
 	// returns true or false
 	// To add: parameter int $port,
@@ -445,6 +455,10 @@
 	// "Innox - Juan Carlos Gonzalez" <jgonzalez#innox.com.mx>
 	function MetaForeignKeys( $table, $owner = FALSE, $upper = FALSE, $associative = FALSE )
 	{
+	 global $ADODB_FETCH_MODE;
+		
+		if ($ADODB_FETCH_MODE == ADODB_FETCH_ASSOC || $this->fetchMode == ADODB_FETCH_ASSOC) $associative = true;
+		
 	    if ( !empty($owner) ) {
 	       $table = "$owner.$table";
 	    }

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-mysqlt.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-mysqlt.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-mysqlt.inc.php Fri Jun 16 07:03:47 2006
@@ -1,7 +1,7 @@
 <?php
 
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.
@@ -28,6 +28,23 @@
 	function ADODB_mysqlt() 
 	{			
 	global $ADODB_EXTENSION; if ($ADODB_EXTENSION) $this->rsPrefix .= 'ext_';
+	}
+	
+	/* set transaction mode
+	
+	SET [GLOBAL | SESSION] TRANSACTION ISOLATION LEVEL
+{ READ UNCOMMITTED | READ COMMITTED | REPEATABLE READ | SERIALIZABLE }
+
+	*/
+	function SetTransactionMode( $transaction_mode ) 
+	{
+		$this->_transmode  = $transaction_mode;
+		if (empty($transaction_mode)) {
+			$this->Execute('SET SESSION TRANSACTION ISOLATION LEVEL REPEATABLE READ');
+			return;
+		}
+		if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
+		$this->Execute("SET SESSION TRANSACTION ".$transaction_mode);
 	}
 	
 	function BeginTrans()

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-netezza.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-netezza.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-netezza.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /*
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
  
   First cut at the Netezza Driver by Josh Eldridge joshuae74#hotmail.com
  Based on the previous postgres drivers.

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-oci8.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-oci8.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-oci8.inc.php Fri Jun 16 07:03:47 2006
@@ -1,7 +1,7 @@
 <?php
 /*
 
-  version V4.81 3 May 2006 (c) 2000-2006 John Lim. All rights reserved.
+  version V4.90 8 June 2006 (c) 2000-2006 John Lim. All rights reserved.
 
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
@@ -278,6 +278,21 @@
 		return "TO_DATE(".adodb_date($this->fmtDate,$d).",'".$this->NLS_DATE_FORMAT."')";
 	}
 
+	function BindDate($d)
+	{
+		$d = ADOConnection::DBDate($d);
+		if (strncmp($d,"'",1)) return $d;
+		
+		return substr($d,1,strlen($d)-2);
+	}
+	
+	function BindTimeStamp($d)
+	{
+		$d = ADOConnection::DBTimeStamp($d);
+		if (strncmp($d,"'",1)) return $d;
+		
+		return substr($d,1,strlen($d)-2);
+	}
 	
 	// format and return date string in database timestamp format
 	function DBTimeStamp($ts)
@@ -381,6 +396,8 @@
 		$this->transCnt += 1;
 		$this->autoCommit = false;
 		$this->_commit = OCI_DEFAULT;
+		
+		if ($this->_transmode) $this->Execute("SET TRANSACTION ".$this->_transmode);
 		return true;
 	}
 	

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-oci805.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-oci805.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-oci805.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /** 
- * @version V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ * @version V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
  * Released under both BSD license and Lesser GPL library license. 
  * Whenever there is any discrepancy between the two licenses, 
  * the BSD license will take precedence. 

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-oci8po.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-oci8po.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-oci8po.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim. All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim. All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-odbc.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-odbc.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-odbc.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. 

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-odbc_db2.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-odbc_db2.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-odbc_db2.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. 
@@ -60,7 +60,7 @@
 ========================
 To set SQL_CUR_USE_ODBC for drivers that require it, do this:
 
-$db = NewADOConnection('db2');
+$db = NewADOConnection('odbc_db2');
 $db->curMode = SQL_CUR_USE_ODBC;
 $db->Connect($dsn, $userid, $pwd);
 
@@ -80,6 +80,10 @@
 > In case of DB2 I had to swap the first and last arguments in order to connect properly. 
 
 
+System Error 5
+==============
+IF you get a System Error 5 when trying to Connect/Load, it could be a permission problem. Give the user connecting
+to DB2 full rights to the DB2 SQLLIB directory, and place the user in the DBUSERS group.
 */
 
 // security - hide paths
@@ -88,13 +92,14 @@
 if (!defined('_ADODB_ODBC_LAYER')) {
 	include(ADODB_DIR."/drivers/adodb-odbc.inc.php");
 }
-if (!defined('ADODB_DB2')){
-define('ADODB_DB2',1);
-
-class ADODB_DB2 extends ADODB_odbc {
+if (!defined('ADODB_ODBC_DB2')){
+define('ADODB_ODBC_DB2',1);
+
+class ADODB_ODBC_DB2 extends ADODB_odbc {
 	var $databaseType = "db2";	
 	var $concat_operator = '||';
-	var $sysDate = 'CURRENT_DATE';
+	var $sysTime = 'CURRENT TIME';
+	var $sysDate = 'CURRENT DATE';
 	var $sysTimeStamp = 'CURRENT TIMESTAMP';
 	// The complete string representation of a timestamp has the form 
 	// yyyy-mm-dd-hh.mm.ss.nnnnnn.
@@ -103,6 +108,7 @@
 	var $identitySQL = 'values IDENTITY_VAL_LOCAL()';
 	var $_bindInputArray = true;
 	 var $hasInsertID = true;
+	var $rsPrefix = 'ADORecordset_odbc_';
 	
 	function ADODB_DB2()
 	{
@@ -294,7 +300,7 @@
 };
  
 
-class  ADORecordSet_db2 extends ADORecordSet_odbc {	
+class  ADORecordSet_odbc_db2 extends ADORecordSet_odbc {	
 	
 	var $databaseType = "db2";		
 	

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-odbc_mssql.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-odbc_mssql.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-odbc_mssql.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. 
@@ -142,6 +142,17 @@
 		return ADODB_odbc::_query($sql,$inputarr);
 	}
 	
+	function SetTransactionMode( $transaction_mode ) 
+	{
+		$this->_transmode  = $transaction_mode;
+		if (empty($transaction_mode)) {
+			$this->Execute('SET TRANSACTION ISOLATION LEVEL READ COMMITTED');
+			return;
+		}
+		if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
+		$this->Execute("SET TRANSACTION ".$transaction_mode);
+	}
+	
 	// "Stein-Aksel Basma" <basma at accelero.no>
 	// tested with MSSQL 2000
 	function &MetaPrimaryKeys($table)

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-odbc_oracle.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-odbc_oracle.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-odbc_oracle.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. 

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-odbtp.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-odbtp.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-odbtp.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /*
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence. See License.txt.

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-odbtp_unicode.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-odbtp_unicode.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-odbtp_unicode.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /*
-	V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+	V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence. See License.txt.

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-oracle.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-oracle.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-oracle.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.
@@ -45,6 +45,24 @@
 		if (is_string($ts)) $d = ADORecordSet::UnixTimeStamp($ts);
 		return 'TO_DATE('.adodb_date($this->fmtTimeStamp,$ts).",'RRRR-MM-DD, HH:MI:SS AM')";
 	}
+	
+	
+	function BindDate($d)
+	{
+		$d = ADOConnection::DBDate($d);
+		if (strncmp($d,"'",1)) return $d;
+		
+		return substr($d,1,strlen($d)-2);
+	}
+	
+	function BindTimeStamp($d)
+	{
+		$d = ADOConnection::DBTimeStamp($d);
+		if (strncmp($d,"'",1)) return $d;
+		
+		return substr($d,1,strlen($d)-2);
+	}
+	
 
 	
 	function BeginTrans()

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-pdo.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-pdo.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-pdo.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. 

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-pdo_mssql.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-pdo_mssql.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-pdo_mssql.inc.php Fri Jun 16 07:03:47 2006
@@ -2,7 +2,7 @@
 
 
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.
@@ -36,6 +36,17 @@
 		return $ret;
 	}
 	
+	function SetTransactionMode( $transaction_mode ) 
+	{
+		$this->_transmode  = $transaction_mode;
+		if (empty($transaction_mode)) {
+			$this->Execute('SET TRANSACTION ISOLATION LEVEL READ COMMITTED');
+			return;
+		}
+		if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
+		$this->Execute("SET TRANSACTION ".$transaction_mode);
+	}
+	
 	function MetaTables()
 	{
 		return false;

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-pdo_mysql.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-pdo_mysql.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-pdo_mysql.inc.php Fri Jun 16 07:03:47 2006
@@ -2,7 +2,7 @@
 
 
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.
@@ -48,6 +48,17 @@
 		
 		$this->metaTablesSQL = $save;
 		return $ret;
+	}
+	
+	function SetTransactionMode( $transaction_mode ) 
+	{
+		$this->_transmode  = $transaction_mode;
+		if (empty($transaction_mode)) {
+			$this->Execute('SET TRANSACTION ISOLATION LEVEL REPEATABLE READ');
+			return;
+		}
+		if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
+		$this->Execute("SET SESSION TRANSACTION ".$transaction_mode);
 	}
 	
  	function &MetaColumns($table) 

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-pdo_oci.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-pdo_oci.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-pdo_oci.inc.php Fri Jun 16 07:03:47 2006
@@ -2,7 +2,7 @@
 
 
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-pdo_pgsql.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-pdo_pgsql.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-pdo_pgsql.inc.php Fri Jun 16 07:03:47 2006
@@ -1,7 +1,7 @@
 <?php
 
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-postgres.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-postgres.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-postgres.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /*
- V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-postgres64.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-postgres64.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-postgres64.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /*
- V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.
@@ -174,7 +174,7 @@
 	{
 		if ($this->transOff) return true;
 		$this->transCnt += 1;
-		return @pg_Exec($this->_connectionID, "begin");
+		return @pg_Exec($this->_connectionID, "begin ".$this->_transmode);
 	}
 	
 	function RowLock($tables,$where,$flds='1 as ignore') 
@@ -532,6 +532,8 @@
 			$fld->name = $rs->fields[0];
 			$fld->type = $rs->fields[1];
 			$fld->max_length = $rs->fields[2];
+			$fld->attnum = $rs->fields[6];
+			
 			if ($fld->max_length <= 0) $fld->max_length = $rs->fields[3]-4;
 			if ($fld->max_length <= 0) $fld->max_length = -1;
 			if ($fld->type == 'numeric') {
@@ -617,12 +619,14 @@
 					return $false;
                 }
 				
-                $col_names = $this->MetaColumnNames($table,true);
+                $col_names = $this->MetaColumnNames($table,true,true); 
+				//3rd param is use attnum, 
+				// see http://sourceforge.net/tracker/index.php?func=detail&aid=1451245&group_id=42718&atid=433976
                 $indexes = array();
                 while ($row = $rs->FetchRow()) {
                         $columns = array();
                         foreach (explode(' ', $row[2]) as $col) {
-                                $columns[] = $col_names[$col - 1];
+                                $columns[] = $col_names[$col];
                         }
                         
                         $indexes[$row[0]] = array(
@@ -701,7 +705,7 @@
 	// returns queryID or false
 	function _query($sql,$inputarr)
 	{
-		
+		$this->_errorMsg = false;
 		if ($inputarr) {
 		/*
 			It appears that PREPARE/EXECUTE is slower for many queries.
@@ -730,6 +734,7 @@
 			
 			if ($execp) $exsql = "EXECUTE $plan ($execp)";
 			else $exsql = "EXECUTE $plan";
+			
 			
 			$rez = @pg_exec($this->_connectionID,$exsql);
 			if (!$rez) {
@@ -756,12 +761,11 @@
 				$s = "PREPARE $plan ($params) AS ".substr($sql,0,strlen($sql)-2);		
 				//adodb_pr($s);
 				pg_exec($this->_connectionID,$s);
-				echo $this->ErrorMsg();
+				//echo $this->ErrorMsg();
 			}
 			
 			$rez = pg_exec($this->_connectionID,$exsql);
 		} else {
-			$this->_errorMsg = false;
 			//adodb_backtrace();
 			$rez = pg_exec($this->_connectionID,$sql);
 		}
@@ -1000,6 +1004,7 @@
 		   		case 'BPCHAR':
 				case '_VARCHAR':
 				case 'INET':
+				case 'MACADDR':
 					if ($len <= $this->blobSize) return 'C';
 				
 				case 'TEXT':
@@ -1019,6 +1024,8 @@
 				case 'DATE':
 					return 'D';
 				
+				
+				case 'TIMESTAMP WITHOUT TIME ZONE':
 				case 'TIME':
 				case 'DATETIME':
 				case 'TIMESTAMP':

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-postgres7.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-postgres7.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-postgres7.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /*
- V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.
@@ -55,6 +55,7 @@
 		return $sql;
 	}
  	*/
+
 
 	// from  Edward Jaramilla, improved version - works on pg 7.4
 	function MetaForeignKeys($table, $owner=false, $upper=false)
@@ -96,6 +97,7 @@
 			// We don't have native support for parameterized queries, so let's emulate it at the parent
 			return ADODB_postgres64::_query($sql, $inputarr);
 		}
+		$this->_errorMsg = false;
 		// -- added Cristiano da Cunha Duarte
 		if ($inputarr) {
 			$sqlarr = explode('?',trim($sql));

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-postgres8.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-postgres8.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-postgres8.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /*
- V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-proxy.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-proxy.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-proxy.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-sapdb.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-sapdb.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-sapdb.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. 

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-sqlanywhere.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-sqlanywhere.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-sqlanywhere.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-version V4.81 3 May 2006 (c) 2000-2006  John Lim (jlim#natsoft.com.my).  All rights
+version V4.90 8 June 2006 (c) 2000-2006  John Lim (jlim#natsoft.com.my).  All rights
 reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-sqlite.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-sqlite.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-sqlite.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-sqlitepo.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-sqlitepo.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-sqlitepo.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-sybase.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-sybase.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-sybase.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim. All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim. All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. 

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-sybase_ase.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-sybase_ase.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-sybase_ase.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /*
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-vfp.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/drivers/adodb-vfp.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/drivers/adodb-vfp.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. 

Modified: vtigercrm/branches/4.2/adodb/perf/perf-db2.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/perf/perf-db2.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/perf/perf-db2.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. See License.txt. 

Modified: vtigercrm/branches/4.2/adodb/perf/perf-informix.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/perf/perf-informix.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/perf/perf-informix.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. See License.txt. 

Modified: vtigercrm/branches/4.2/adodb/perf/perf-mssql.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/perf/perf-mssql.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/perf/perf-mssql.inc.php Fri Jun 16 07:03:47 2006
@@ -1,7 +1,7 @@
 <?php
 
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. See License.txt. 

Modified: vtigercrm/branches/4.2/adodb/perf/perf-mysql.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/perf/perf-mysql.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/perf/perf-mysql.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. See License.txt. 

Modified: vtigercrm/branches/4.2/adodb/perf/perf-oci8.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/perf/perf-oci8.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/perf/perf-oci8.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. See License.txt. 

Modified: vtigercrm/branches/4.2/adodb/perf/perf-postgres.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/perf/perf-postgres.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/perf/perf-postgres.inc.php Fri Jun 16 07:03:47 2006
@@ -1,7 +1,7 @@
 <?php
 
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. See License.txt. 

Modified: vtigercrm/branches/4.2/adodb/pivottable.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/pivottable.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/pivottable.inc.php Fri Jun 16 07:03:47 2006
@@ -1,15 +1,12 @@
 <?php
 /** 
- * @version V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ * @version V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
  * Released under both BSD license and Lesser GPL library license. 
  * Whenever there is any discrepancy between the two licenses, 
  * the BSD license will take precedence. 
  *
  * Set tabs to 4 for best viewing.
  * 
- * Latest version is available at http://php.weblogs.com
- *
- * Requires PHP4.01pl2 or later because it uses include_once
 */
 
 /*
@@ -38,7 +35,7 @@
 	else $hidecnt = false;
 	
 	$iif = strpos($db->databaseType,'access') !== false; 
-		// note - vfp still doesn' work even with IIF enabled || $db->databaseType == 'vfp';
+		// note - vfp 6 still doesn' work even with IIF enabled || $db->databaseType == 'vfp';
 	
 	//$hidecnt = false;
 	
@@ -95,7 +92,12 @@
 	else
 		$sel = substr($sel,0,strlen($sel)-2);
 	
+	
+	// Strip aliases
+	$rowfields = preg_replace('/ AS (\w+)/i', '', $rowfields);
+	
 	$sql = "SELECT $sel \nFROM $tables $where \nGROUP BY $rowfields";
+	
 	return $sql;
  }
 

Modified: vtigercrm/branches/4.2/adodb/rsfilter.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/rsfilter.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/rsfilter.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /** 
- * @version V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ * @version V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
  * Released under both BSD license and Lesser GPL library license. 
  * Whenever there is any discrepancy between the two licenses, 
  * the BSD license will take precedence. 

Modified: vtigercrm/branches/4.2/adodb/server.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/server.php (original)
+++ vtigercrm/branches/4.2/adodb/server.php Fri Jun 16 07:03:47 2006
@@ -1,7 +1,7 @@
 <?php
 
 /** 
- * @version V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ * @version V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
  * Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. 

Modified: vtigercrm/branches/4.2/adodb/session/adodb-compress-bzip2.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/session/adodb-compress-bzip2.php (original)
+++ vtigercrm/branches/4.2/adodb/session/adodb-compress-bzip2.php Fri Jun 16 07:03:47 2006
@@ -1,7 +1,7 @@
 <?php
 
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
          Contributed by Ross Smith (adodb at netebb.com). 
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,

Modified: vtigercrm/branches/4.2/adodb/session/adodb-compress-gzip.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/session/adodb-compress-gzip.php (original)
+++ vtigercrm/branches/4.2/adodb/session/adodb-compress-gzip.php Fri Jun 16 07:03:47 2006
@@ -2,7 +2,7 @@
 
 
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
          Contributed by Ross Smith (adodb at netebb.com). 
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,

Modified: vtigercrm/branches/4.2/adodb/session/adodb-cryptsession.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/session/adodb-cryptsession.php (original)
+++ vtigercrm/branches/4.2/adodb/session/adodb-cryptsession.php Fri Jun 16 07:03:47 2006
@@ -2,7 +2,7 @@
 
 
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
          Contributed by Ross Smith (adodb at netebb.com). 
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,

Modified: vtigercrm/branches/4.2/adodb/session/adodb-encrypt-mcrypt.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/session/adodb-encrypt-mcrypt.php (original)
+++ vtigercrm/branches/4.2/adodb/session/adodb-encrypt-mcrypt.php Fri Jun 16 07:03:47 2006
@@ -2,7 +2,7 @@
 
 
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
          Contributed by Ross Smith (adodb at netebb.com). 
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,

Modified: vtigercrm/branches/4.2/adodb/session/adodb-encrypt-md5.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/session/adodb-encrypt-md5.php (original)
+++ vtigercrm/branches/4.2/adodb/session/adodb-encrypt-md5.php Fri Jun 16 07:03:47 2006
@@ -1,7 +1,7 @@
 <?php
 
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
          Contributed by Ross Smith (adodb at netebb.com). 
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,

Modified: vtigercrm/branches/4.2/adodb/session/adodb-encrypt-secret.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/session/adodb-encrypt-secret.php (original)
+++ vtigercrm/branches/4.2/adodb/session/adodb-encrypt-secret.php Fri Jun 16 07:03:47 2006
@@ -1,7 +1,7 @@
 <?php
 
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
          Contributed by Ross Smith (adodb at netebb.com). 
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,

Modified: vtigercrm/branches/4.2/adodb/session/adodb-session-clob.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/session/adodb-session-clob.php (original)
+++ vtigercrm/branches/4.2/adodb/session/adodb-session-clob.php Fri Jun 16 07:03:47 2006
@@ -2,7 +2,7 @@
 
 
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
          Contributed by Ross Smith (adodb at netebb.com). 
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,

Modified: vtigercrm/branches/4.2/adodb/session/adodb-session.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/session/adodb-session.php (original)
+++ vtigercrm/branches/4.2/adodb/session/adodb-session.php Fri Jun 16 07:03:47 2006
@@ -2,7 +2,7 @@
 
 
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
          Contributed by Ross Smith (adodb at netebb.com). 
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,
@@ -492,6 +492,19 @@
 	/////////////////////
 	// public methods
 	/////////////////////
+	
+	function config($driver, $host, $user, $password, $database=false,$options=false)
+	{
+		ADODB_Session::driver($driver);
+		ADODB_Session::host($host);
+		ADODB_Session::user($user);
+		ADODB_Session::password($password);
+		ADODB_Session::database($database);
+		
+		if (isset($options['table'])) ADODB_Session::table($options['table']);
+		if (isset($options['clob'])) ADODB_Session::table($options['clob']);
+		if (isset($options['field'])) ADODB_Session::dataFieldName($options['field']);
+	}
 
 	/*!
 		Create the connection to the database.
@@ -523,7 +536,6 @@
 #		assert('$driver');
 #		assert('$host');
 
-		// cannot use =& below - do not know why...
 		$conn =& ADONewConnection($driver);
 
 		if ($debug) {
@@ -618,6 +630,10 @@
 		If the data has not been modified since the last read(), we do not write.
 	*/
 	function write($key, $val) {
+	global $ADODB_SESSION_READONLY;
+	
+		if (!empty($ADODB_SESSION_READONLY)) return;
+		
 		$clob			= ADODB_Session::clob();
 		$conn			=& ADODB_Session::_conn();
 		$crc			= ADODB_Session::_crc();
@@ -646,12 +662,19 @@
 			if ($debug) {
 				echo '<p>Session: Only updating date - crc32 not changed</p>';
 			}
-			$sql = "UPDATE $table SET expiry = ".$conn->Param('0')." WHERE $binary sesskey = ".$conn->Param('1')." AND expiry >= ".$conn->Param('2');
-			$rs =& $conn->Execute($sql,array($expiry,$key,time()));
-			ADODB_Session::_dumprs($rs);
-			if ($rs) {
-				$rs->Close();
-			}
+			
+			$expirevar = '';
+			if ($expire_notify) {
+				$var = reset($expire_notify);
+				global $$var;
+				if (isset($$var)) {
+					$expirevar = $$var;
+				}
+			}
+			
+			
+			$sql = "UPDATE $table SET expiry = ".$conn->Param('0').",expireref=".$conn->Param('1')." WHERE $binary sesskey = ".$conn->Param('2')." AND expiry >= ".$conn->Param('3');
+			$rs =& $conn->Execute($sql,array($expiry,$expirevar,$key,time()));
 			return true;
 		}
 		$val = rawurlencode($val);
@@ -673,7 +696,7 @@
 		if (!$clob) {	// no lobs, simply use replace()
 			$arr[$data] = $conn->qstr($val);
 			$rs = $conn->Replace($table, $arr, 'sesskey', $autoQuote = true);
-			ADODB_Session::_dumprs($rs);
+			
 		} else {
 			// what value shall we insert/update for lob row?
 			switch ($driver) {
@@ -691,13 +714,13 @@
 					break;
 			}
 			
+			$expiryref = $conn->qstr($arr['expireref']);
 			// do we insert or update? => as for sesskey
 			$rs =& $conn->Execute("SELECT COUNT(*) AS cnt FROM $table WHERE $binary sesskey = $qkey");
-			ADODB_Session::_dumprs($rs);
 			if ($rs && reset($rs->fields) > 0) {
-				$sql = "UPDATE $table SET expiry = $expiry, $data = $lob_value WHERE  sesskey = $qkey";
+				$sql = "UPDATE $table SET expiry = $expiry, $data = $lob_value, expireref=$expiryref WHERE  sesskey = $qkey";
 			} else {
-				$sql = "INSERT INTO $table (expiry, $data, sesskey) VALUES ($expiry, $lob_value, $qkey)";
+				$sql = "INSERT INTO $table (expiry, $data, sesskey,expireref) VALUES ($expiry, $lob_value, $qkey,$expiryref)";
 			}
 			if ($rs) {
 				$rs->Close();
@@ -705,12 +728,11 @@
 
 			$err = '';
 			$rs1 =& $conn->Execute($sql);
-			ADODB_Session::_dumprs($rs1);
 			if (!$rs1) {
 				$err = $conn->ErrorMsg()."\n";
 			}
 			$rs2 =& $conn->UpdateBlob($table, $data, $val, " sesskey=$qkey", strtoupper($clob));
-			ADODB_Session::_dumprs($rs2);
+			
 			if (!$rs2) {
 				$err .= $conn->ErrorMsg()."\n";
 			}
@@ -901,7 +923,8 @@
 }
 
 ADODB_Session::_init();
-register_shutdown_function('session_write_close');
+if (empty($ADODB_SESSION_READONLY))
+	register_shutdown_function('session_write_close');
 
 // for backwards compatability only
 function adodb_sess_open($save_path, $session_name, $persist = true) {
@@ -914,4 +937,4 @@
 	return ADODB_Session::gc($t);
 }
 
-?>
+?>

Modified: vtigercrm/branches/4.2/adodb/session/old/adodb-cryptsession.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/session/old/adodb-cryptsession.php (original)
+++ vtigercrm/branches/4.2/adodb/session/old/adodb-cryptsession.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/branches/4.2/adodb/session/old/adodb-session-clob.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/session/old/adodb-session-clob.php (original)
+++ vtigercrm/branches/4.2/adodb/session/old/adodb-session-clob.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /*
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/branches/4.2/adodb/session/old/adodb-session.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/session/old/adodb-session.php (original)
+++ vtigercrm/branches/4.2/adodb/session/old/adodb-session.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/branches/4.2/adodb/tests/test-active-recs2.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/tests/test-active-recs2.php (original)
+++ vtigercrm/branches/4.2/adodb/tests/test-active-recs2.php Fri Jun 16 07:03:47 2006
@@ -29,9 +29,11 @@
 
 
 
+
 $rec = new ADODB_Active_Record('photos');
 
 $rec = new ADODB_Active_Record('products');
+
 
 adodb_pr($rec->getAttributeNames());
 

Modified: vtigercrm/branches/4.2/adodb/tests/test.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/tests/test.php (original)
+++ vtigercrm/branches/4.2/adodb/tests/test.php Fri Jun 16 07:03:47 2006
@@ -747,7 +747,14 @@
 		where id=".$db->Param('zid')." and created>=".$db->Param('ZDATE')."",
 		$array);
 	if ($id != 1) Err("Bad bind; id=$id");
-	else echo "<br>Bind date/integer passed";
+	else echo "<br>Bind date/integer 1 passed";
+	
+	$array =array(1,$db->BindDate(time()));
+	$id = $db->GetOne("select id from ADOXYZ 
+		where id=".$db->Param('0')." and created>=".$db->Param('1')."",
+		$array);
+	if ($id != 1) Err("Bad bind; id=$id");
+	else echo "<br>Bind date/integer 2 passed";
 	
 	$db->debug = false;
 	$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
@@ -1327,13 +1334,16 @@
 	$date = $db->SQLDate('d-m-M-Y-\QQ h:i:s A',$db->DBDate("1974-02-25"));
 	$sql = "SELECT $date from ADOXYZ";
 	print "<p>Test SQLDate: ".htmlspecialchars($sql)."</p>";
+	$db->debug=1;
 	$rs = $db->SelectLimit($sql,1);
 	$ts = ADOConnection::UnixDate('1974-02-25');
 	$d = date('d-m-M-Y-',$ts).'Q'.(ceil(date('m',$ts)/3.0)).date(' h:i:s A',$ts);
 	if (!$rs) {
 		Err("SQLDate query returned no recordset");
 		echo $db->ErrorMsg(),'<br>';
-	} else if ($d != $rs->fields[0]) Err("SQLDate 2 failed expected: <br>act:$d <br>sql:".$rs->fields[0]);
+	} else if ($d != reset($rs->fields)) {
+		Err("SQLDate 2 failed expected: <br>act:$d <br>sql:".$rs->fields[0].' <br>'.$db->ErrorMsg());
+	}
 	
 	
 	print "<p>Test Filter</p>";
@@ -1504,9 +1514,11 @@
 	flush();
 	
 	if ($db->hasTransactions) {
-		//$db->debug=1;
+		$db->debug=1;
 		echo "<p>Testing StartTrans CompleteTrans</p>";
 		$db->raiseErrorFn = false;
+		
+		$db->SetTransactionMode('SERIALIZABLE');
 		$db->StartTrans();
 		$rs = $db->Execute('select * from notable');
 			$db->StartTrans();
@@ -1515,6 +1527,8 @@
 				$db->CommitTrans();
 			$db->CompleteTrans();
 		$rez = $db->CompleteTrans();
+		$db->SetTransactionMode('');
+		$db->debug=0;
 		if ($rez !== false) {
 			if (is_null($rez)) Err("Error: _transOK not modified");
 			else Err("Error: CompleteTrans (1) should have failed");

Modified: vtigercrm/branches/4.2/adodb/tests/testdatabases.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/tests/testdatabases.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/tests/testdatabases.inc.php Fri Jun 16 07:03:47 2006
@@ -314,17 +314,28 @@
 
 }
 
-ADOLoadCode("db2"); // no longer supported
-if (!empty($testdb2)) { 
-	$db = ADONewConnection();
-	print "<h1>Connecting $db->databaseType...</h1>";
-	
-	$dsn = "db2_sample";
-	$dsn = "driver={IBM db2 odbc DRIVER};Database=sample;hostname=localhost;port=50000;protocol=TCPIP; uid=root; pwd=natsoft";
-	if ($db->Connect($dsn)) {
-	//	testdb($db,"create table ADOXYZ (id int, firstname varchar(24), lastname varchar(24),created date)");
-	} else print "ERROR: DB2 test requires an server setup with odbc data source db2_sample".'<BR>'.$db->ErrorMsg();
-
+ADOLoadCode("odbc_db2"); // no longer supported
+if (!empty($testdb2)) {
+	if (PHP_VERSION>=5.1) {
+		$db = ADONewConnection("db2");
+		print "<h1>Connecting $db->databaseType...</h1>";
+		
+		#$db->curMode = SQL_CUR_USE_ODBC;
+		#$dsn = "driver={IBM db2 odbc DRIVER};Database=test;hostname=localhost;port=50000;protocol=TCPIP; uid=natsoft; pwd=guest";
+		if ($db->Connect('localhost','natsoft','guest','test')) {
+			testdb($db,"create table ADOXYZ (id int, firstname varchar(24), lastname varchar(24),created date)");
+		} else print "ERROR: DB2 test requires an server setup with odbc data source db2_sample".'<BR>'.$db->ErrorMsg();
+	} else { 
+		$db = ADONewConnection("odbc_db2");
+		print "<h1>Connecting $db->databaseType...</h1>";
+		
+		$dsn = "db2test";
+		#$db->curMode = SQL_CUR_USE_ODBC;
+		#$dsn = "driver={IBM db2 odbc DRIVER};Database=test;hostname=localhost;port=50000;protocol=TCPIP; uid=natsoft; pwd=guest";
+		if ($db->Connect($dsn)) {
+			testdb($db,"create table ADOXYZ (id int, firstname varchar(24), lastname varchar(24),created date)");
+		} else print "ERROR: DB2 test requires an server setup with odbc data source db2_sample".'<BR>'.$db->ErrorMsg();
+	}
 echo "<hr />";
 flush();
 	$dsn = "driver={IBM db2 odbc DRIVER};Database=sample;hostname=localhost;port=50000;protocol=TCPIP; uid=root; pwd=natsoft";

Modified: vtigercrm/branches/4.2/adodb/toexport.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/toexport.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/toexport.inc.php Fri Jun 16 07:03:47 2006
@@ -1,7 +1,7 @@
 <?php
 
 /** 
- * @version V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ * @version V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
  * Released under both BSD license and Lesser GPL library license. 
  * Whenever there is any discrepancy between the two licenses, 
  * the BSD license will take precedence. 

Modified: vtigercrm/branches/4.2/adodb/tohtml.inc.php
==============================================================================
--- vtigercrm/branches/4.2/adodb/tohtml.inc.php (original)
+++ vtigercrm/branches/4.2/adodb/tohtml.inc.php Fri Jun 16 07:03:47 2006
@@ -1,6 +1,6 @@
 <?php 
 /*
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.
@@ -95,7 +95,7 @@
 			break;
 			
 			case 'N':
-				if (abs($v) - round($v,0) < 0.00000001)
+				if (abs(abs($v) - round($v,0)) < 0.00000001)
 					$v = round($v);
 				else
 					$v = round($v,$ADODB_ROUND);




From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 09:06:48 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 13:06:48 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231302=3A?=
 =?utf-8?q?_Update_to_new_adodb-4=2E90_release?=
In-Reply-To: <076.cfae0e78298741dfce9c6a4f41a70218@vtiger.fosslabs.com>
References: <076.cfae0e78298741dfce9c6a4f41a70218@vtiger.fosslabs.com>
Message-ID: <085.887164ea1764a31bc31d5687b8afdc49@vtiger.fosslabs.com>

#1302: Update to new adodb-4.90 release
------------------------+---------------------------------------------------
  Reporter:  jeffk      |       Owner:  jeffk                 
      Type:  defect     |      Status:  closed                
  Priority:  major      |   Milestone:  5.0.0                 
 Component:  vtigercrm  |     Version:  5.0.0                 
Resolution:  fixed      |    Keywords:  adodb database package
------------------------+---------------------------------------------------
Changes (by jeffk):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 (In [7186]) closes #1302. update adodb-4.81 to adodb-4.90

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1302>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 09:06:48 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 13:06:48 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7186 - in
 /vtigercrm/trunk/adodb: ./ datadict/ drivers/ perf/ session/ session/old/
 tests/
Message-ID: <20060616130650.06FC07ED33A@vtiger.fosslabs.com>

Author: jeffk
Date: Fri Jun 16 07:06:09 2006
New Revision: 7186

Log:
closes #1302. update adodb-4.81 to adodb-4.90

Modified:
    vtigercrm/trunk/adodb/adodb-active-record.inc.php
    vtigercrm/trunk/adodb/adodb-csvlib.inc.php
    vtigercrm/trunk/adodb/adodb-datadict.inc.php
    vtigercrm/trunk/adodb/adodb-error.inc.php
    vtigercrm/trunk/adodb/adodb-errorhandler.inc.php
    vtigercrm/trunk/adodb/adodb-errorpear.inc.php
    vtigercrm/trunk/adodb/adodb-exceptions.inc.php
    vtigercrm/trunk/adodb/adodb-iterator.inc.php
    vtigercrm/trunk/adodb/adodb-lib.inc.php
    vtigercrm/trunk/adodb/adodb-pager.inc.php
    vtigercrm/trunk/adodb/adodb-pear.inc.php
    vtigercrm/trunk/adodb/adodb-perf.inc.php
    vtigercrm/trunk/adodb/adodb-php4.inc.php
    vtigercrm/trunk/adodb/adodb.inc.php
    vtigercrm/trunk/adodb/datadict/datadict-access.inc.php
    vtigercrm/trunk/adodb/datadict/datadict-db2.inc.php
    vtigercrm/trunk/adodb/datadict/datadict-firebird.inc.php
    vtigercrm/trunk/adodb/datadict/datadict-generic.inc.php
    vtigercrm/trunk/adodb/datadict/datadict-ibase.inc.php
    vtigercrm/trunk/adodb/datadict/datadict-informix.inc.php
    vtigercrm/trunk/adodb/datadict/datadict-mssql.inc.php
    vtigercrm/trunk/adodb/datadict/datadict-mysql.inc.php
    vtigercrm/trunk/adodb/datadict/datadict-oci8.inc.php
    vtigercrm/trunk/adodb/datadict/datadict-postgres.inc.php
    vtigercrm/trunk/adodb/datadict/datadict-sybase.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-access.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-ado.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-ado5.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-ado_access.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-ado_mssql.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-borland_ibase.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-csv.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-db2.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-fbsql.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-firebird.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-ibase.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-informix.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-informix72.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-ldap.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-mssql.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-mssqlpo.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-mysql.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-mysqli.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-mysqlt.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-netezza.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-oci8.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-oci805.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-oci8po.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-odbc.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-odbc_db2.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-odbc_mssql.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-odbc_oracle.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-odbtp.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-odbtp_unicode.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-oracle.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-pdo.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-pdo_mssql.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-pdo_mysql.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-pdo_oci.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-pdo_pgsql.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-postgres.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-postgres64.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-postgres7.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-postgres8.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-proxy.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-sapdb.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-sqlanywhere.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-sqlite.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-sqlitepo.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-sybase.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-sybase_ase.inc.php
    vtigercrm/trunk/adodb/drivers/adodb-vfp.inc.php
    vtigercrm/trunk/adodb/perf/perf-db2.inc.php
    vtigercrm/trunk/adodb/perf/perf-informix.inc.php
    vtigercrm/trunk/adodb/perf/perf-mssql.inc.php
    vtigercrm/trunk/adodb/perf/perf-mysql.inc.php
    vtigercrm/trunk/adodb/perf/perf-oci8.inc.php
    vtigercrm/trunk/adodb/perf/perf-postgres.inc.php
    vtigercrm/trunk/adodb/pivottable.inc.php
    vtigercrm/trunk/adodb/rsfilter.inc.php
    vtigercrm/trunk/adodb/server.php
    vtigercrm/trunk/adodb/session/adodb-compress-bzip2.php
    vtigercrm/trunk/adodb/session/adodb-compress-gzip.php
    vtigercrm/trunk/adodb/session/adodb-cryptsession.php
    vtigercrm/trunk/adodb/session/adodb-encrypt-mcrypt.php
    vtigercrm/trunk/adodb/session/adodb-encrypt-md5.php
    vtigercrm/trunk/adodb/session/adodb-encrypt-secret.php
    vtigercrm/trunk/adodb/session/adodb-session-clob.php
    vtigercrm/trunk/adodb/session/adodb-session.php
    vtigercrm/trunk/adodb/session/old/adodb-cryptsession.php
    vtigercrm/trunk/adodb/session/old/adodb-session-clob.php
    vtigercrm/trunk/adodb/session/old/adodb-session.php
    vtigercrm/trunk/adodb/tests/test-active-recs2.php
    vtigercrm/trunk/adodb/tests/test.php
    vtigercrm/trunk/adodb/tests/testdatabases.inc.php
    vtigercrm/trunk/adodb/toexport.inc.php
    vtigercrm/trunk/adodb/tohtml.inc.php

Modified: vtigercrm/trunk/adodb/adodb-active-record.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/adodb-active-record.inc.php (original)
+++ vtigercrm/trunk/adodb/adodb-active-record.inc.php Fri Jun 16 07:06:09 2006
@@ -1,7 +1,7 @@
 <?php
 /*
 
- at version V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ at version V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Latest version is available at http://adodb.sourceforge.net
  
   Released under both BSD license and Lesser GPL library license. 
@@ -10,7 +10,7 @@
   
   Active Record implementation. Superset of Zend Framework's.
   
-  Version 0.03
+  Version 0.04
   
   See http://www-128.ibm.com/developerworks/java/library/j-cb03076/?ca=dgr-lnxw01ActiveRecord 
   	for info on Ruby on Rails Active Record implementation
@@ -56,7 +56,7 @@
 
 class ADODB_Active_Record {
 	var $_dbat; // associative index pointing to ADODB_Active_DB eg. $ADODB_Active_DBS[_dbat]
-	var $_table; // tablename
+	var $_table; // tablename, if set in class definition then use it as table name
 	var $_tableat; // associative index pointing to ADODB_Active_Table, eg $ADODB_Active_DBS[_dbat]->tables[$this->_tableat]
 	var $_where; // where clause set in Load()
 	var $_saved = false; // indicates whether data is already inserted.
@@ -85,8 +85,10 @@
 			$pkeyarr = false;
 		}
 		
-		if (!$table) $table = $this->_pluralize(get_class($this));
-		
+		if (!$table) { 
+			if (!empty($this->_table)) $table = $this->_table;
+			else $table = $this->_pluralize(get_class($this));
+		}
 		if ($db) {
 			$this->_dbat = ADODB_Active_Record::SetDatabaseAdapter($db);
 		} else
@@ -455,6 +457,13 @@
 		$db->Execute($sql);
 	}
 	
+	// returns an array of active record objects
+	function &Find($whereOrderBy,$bindarr=false,$pkeysArr=false)
+	{
+		$db =& $this->DB(); if (!$db || empty($this->_table)) return false;
+		$arr =& $db->GetActiveRecordsClass(get_class($this),$this->_table, $whereOrderBy,$bindarr,$pkeysArr);
+		return $arr;
+	}
 	
 	// returns 0 on error, 1 on update, 2 on insert
 	function Replace()

Modified: vtigercrm/trunk/adodb/adodb-csvlib.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/adodb-csvlib.inc.php (original)
+++ vtigercrm/trunk/adodb/adodb-csvlib.inc.php Fri Jun 16 07:06:09 2006
@@ -8,7 +8,7 @@
 
 /* 
 
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. See License.txt. 

Modified: vtigercrm/trunk/adodb/adodb-datadict.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/adodb-datadict.inc.php (original)
+++ vtigercrm/trunk/adodb/adodb-datadict.inc.php Fri Jun 16 07:06:09 2006
@@ -1,7 +1,7 @@
 <?php
 
 /**
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/trunk/adodb/adodb-error.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/adodb-error.inc.php (original)
+++ vtigercrm/trunk/adodb/adodb-error.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /** 
- * @version V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ * @version V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
  * Released under both BSD license and Lesser GPL library license. 
  * Whenever there is any discrepancy between the two licenses, 
  * the BSD license will take precedence. 

Modified: vtigercrm/trunk/adodb/adodb-errorhandler.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/adodb-errorhandler.inc.php (original)
+++ vtigercrm/trunk/adodb/adodb-errorhandler.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ * @version V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
  * Released under both BSD license and Lesser GPL library license.
  * Whenever there is any discrepancy between the two licenses,
  * the BSD license will take precedence.

Modified: vtigercrm/trunk/adodb/adodb-errorpear.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/adodb-errorpear.inc.php (original)
+++ vtigercrm/trunk/adodb/adodb-errorpear.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /** 
- * @version V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ * @version V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
  * Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. 

Modified: vtigercrm/trunk/adodb/adodb-exceptions.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/adodb-exceptions.inc.php (original)
+++ vtigercrm/trunk/adodb/adodb-exceptions.inc.php Fri Jun 16 07:06:09 2006
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @version V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ * @version V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
  * Released under both BSD license and Lesser GPL library license.
  * Whenever there is any discrepancy between the two licenses,
  * the BSD license will take precedence.

Modified: vtigercrm/trunk/adodb/adodb-iterator.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/adodb-iterator.inc.php (original)
+++ vtigercrm/trunk/adodb/adodb-iterator.inc.php Fri Jun 16 07:06:09 2006
@@ -1,7 +1,7 @@
 <?php
 
 /*
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/trunk/adodb/adodb-lib.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/adodb-lib.inc.php (original)
+++ vtigercrm/trunk/adodb/adodb-lib.inc.php Fri Jun 16 07:06:09 2006
@@ -7,7 +7,7 @@
 $ADODB_INCLUDED_LIB = 1;
 
 /* 
- @version V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim\@natsoft.com.my). All rights reserved.
+ @version V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim\@natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. See License.txt. 
@@ -325,6 +325,8 @@
 		$rewritesql = preg_replace(
 					'/^\s*SELECT\s.*\s+FROM\s/Uis','SELECT COUNT(*) FROM ',$sql);
 
+		
+		
 		// fix by alexander zhukov, alex#unipack.ru, because count(*) and 'order by' fails 
 		// with mssql, access and postgresql. Also a good speedup optimization - skips sorting!
 		// also see http://phplens.com/lens/lensforum/msgs.php?id=12752
@@ -332,10 +334,13 @@
 			$rewritesql = preg_replace('/(\sORDER\s+BY\s.*)/is','',$rewritesql);
 		else
 			$rewritesql = preg_replace('/(\sORDER\s+BY\s[^)]*)/is','',$rewritesql);
+	}
+	
+	
+	
+	if (isset($rewritesql) && $rewritesql != $sql) {
+		if (preg_match('/\sLIMIT\s+[0-9]+/i',$sql,$limitarr)) $rewritesql .= $limitarr[1];
 		 
-	}
-	
-	if (isset($rewritesql) && $rewritesql != $sql) {
 		if ($secs2cache) {
 			// we only use half the time of secs2cache because the count can quickly
 			// become inaccurate if new records are added
@@ -354,6 +359,8 @@
 	if (preg_match('/\s*UNION\s*/is', $sql)) $rewritesql = $sql;
 	else $rewritesql = preg_replace('/(\sORDER\s+BY\s.*)/is','',$sql); 
 	
+	if (preg_match('/\sLIMIT\s+[0-9]+/i',$sql,$limitarr)) $rewritesql .= $limitarr[0];
+		
 	$rstest = &$zthis->Execute($rewritesql,$inputarr);
 	if (!$rstest) $rstest = $zthis->Execute($sql,$inputarr);
 	
@@ -1017,5 +1024,47 @@
 	
 	return $s;
 }
+/*
+function _adodb_find_from($sql) 
+{
+
+	$sql = str_replace(array("\n","\r"), ' ', $sql);
+	$charCount = strlen($sql);
+	
+	$inString = false;
+	$quote = '';
+	$parentheseCount = 0;
+	$prevChars = '';
+	$nextChars = '';
+	
+
+	for($i = 0; $i < $charCount; $i++) {
+
+    	$char = substr($sql,$i,1);
+	    $prevChars = substr($sql,0,$i);
+    	$nextChars = substr($sql,$i+1);
+
+		if((($char == "'" || $char == '"' || $char == '`') && substr($prevChars,-1,1) != '\\') && $inString === false) {
+			$quote = $char;
+			$inString = true;
+		}
+
+		elseif((($char == "'" || $char == '"' || $char == '`') && substr($prevChars,-1,1) != '\\') && $inString === true && $quote == $char) {
+			$quote = "";
+			$inString = false;
+		}
+
+		elseif($char == "(" && $inString === false)
+			$parentheseCount++;
+
+		elseif($char == ")" && $inString === false && $parentheseCount > 0)
+			$parentheseCount--;
+
+		elseif($parentheseCount <= 0 && $inString === false && $char == " " && strtoupper(substr($prevChars,-5,5)) == " FROM")
+			return $i;
+
+	}
+}
+*/
 
 ?>

Modified: vtigercrm/trunk/adodb/adodb-pager.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/adodb-pager.inc.php (original)
+++ vtigercrm/trunk/adodb/adodb-pager.inc.php Fri Jun 16 07:06:09 2006
@@ -1,7 +1,7 @@
 <?php
 
 /*
-	V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+	V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
 	  Released under both BSD license and Lesser GPL library license. 
 	  Whenever there is any discrepancy between the two licenses, 
 	  the BSD license will take precedence. 

Modified: vtigercrm/trunk/adodb/adodb-pear.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/adodb-pear.inc.php (original)
+++ vtigercrm/trunk/adodb/adodb-pear.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /** 
- * @version V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ * @version V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
  * Released under both BSD license and Lesser GPL library license. 
  * Whenever there is any discrepancy between the two licenses, 
  * the BSD license will take precedence. 

Modified: vtigercrm/trunk/adodb/adodb-perf.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/adodb-perf.inc.php (original)
+++ vtigercrm/trunk/adodb/adodb-perf.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. See License.txt. 

Modified: vtigercrm/trunk/adodb/adodb-php4.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/adodb-php4.inc.php (original)
+++ vtigercrm/trunk/adodb/adodb-php4.inc.php Fri Jun 16 07:06:09 2006
@@ -1,7 +1,7 @@
 <?php
 
 /*
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/trunk/adodb/adodb.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/adodb.inc.php (original)
+++ vtigercrm/trunk/adodb/adodb.inc.php Fri Jun 16 07:06:09 2006
@@ -14,7 +14,7 @@
 /**
 	\mainpage 	
 	
-	 @version V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+	 @version V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
 
 	Released under both BSD license and Lesser GPL library license. You can choose which license
 	you prefer.
@@ -171,7 +171,7 @@
 		/**
 		 * ADODB version as a string.
 		 */
-		$ADODB_vers = 'V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved. Released BSD & LGPL.';
+		$ADODB_vers = 'V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved. Released BSD & LGPL.';
 	
 		/**
 		 * Determines whether recordset->RecordCount() is used. 
@@ -314,6 +314,7 @@
 	var $_evalAll = false;
 	var $_affected = false;
 	var $_logsql = false;
+	var $_transmode = ''; // transaction mode
 	
 	/**
 	 * Constructor
@@ -823,7 +824,10 @@
 							$sql .= str_replace(',','.',$v); // locales fix so 1.1 does not get converted to 1,1
 						else if ($typ == 'boolean')
 							$sql .= $v ? $this->true : $this->false;
-						else if ($v === null)
+						else if ($typ == 'object') {
+							if (method_exists($v, '__toString')) $sql .= $this->qstr($v->__toString());
+							else $sql .= $this->qstr((string) $v);
+						} else if ($v === null)
 							$sql .= 'NULL';
 						else
 							$sql .= $v;
@@ -1732,15 +1736,16 @@
 	 */
 	function& AutoExecute($table, $fields_values, $mode = 'INSERT', $where = FALSE, $forceUpdate=true, $magicq=false) 
 	{
+		$false = false;
 		$sql = 'SELECT * FROM '.$table;  
 		if ($where!==FALSE) $sql .= ' WHERE '.$where;
 		else if ($mode == 'UPDATE' || $mode == 2 /* DB_AUTOQUERY_UPDATE */) {
 			ADOConnection::outp('AutoExecute: Illegal mode=UPDATE with empty WHERE clause');
-			return false;
+			return $false;
 		}
 
 		$rs =& $this->SelectLimit($sql,1);
-		if (!$rs) return false; // table does not exist
+		if (!$rs) return $false; // table does not exist
 		$rs->tableName = $table;
 		
 		switch((string) $mode) {
@@ -1754,7 +1759,7 @@
 			break;
 		default:
 			ADOConnection::outp("AutoExecute: Unknown mode=$mode");
-			return false;
+			return $false;
 		}
 		$ret = false;
 		if ($sql) $ret = $this->Execute($sql);
@@ -2017,6 +2022,57 @@
 	 */
 	function BeginTrans() {return false;}
 	
+	/* set transaction mode */
+	function SetTransactionMode( $transaction_mode ) 
+	{
+		$transaction_mode = $this->MetaTransaction($transaction_mode, $this->dataProvider);
+		$this->_transmode  = $transaction_mode;
+	}
+/*
+http://msdn2.microsoft.com/en-US/ms173763.aspx
+http://dev.mysql.com/doc/refman/5.0/en/innodb-transaction-isolation.html
+http://www.postgresql.org/docs/8.1/interactive/sql-set-transaction.html
+http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_10005.htm
+*/
+	function MetaTransaction($mode,$db)
+	{
+		$mode = strtoupper($mode);
+		$mode = str_replace('ISOLATION LEVEL ','',$mode);
+		
+		switch($mode) {
+
+		case 'READ UNCOMMITTED':
+			switch($db) { 
+			case 'oci8':
+			case 'oracle':
+				return 'ISOLATION LEVEL READ COMMITTED';
+			default:
+				return 'ISOLATION LEVEL READ UNCOMMITTED';
+			}
+			break;
+					
+		case 'READ COMMITTED':
+				return 'ISOLATION LEVEL READ COMMITTED';
+			break;
+			
+		case 'REPEATABLE READ':
+			switch($db) {
+			case 'oci8':
+			case 'oracle':
+				return 'ISOLATION LEVEL SERIALIZABLE';
+			default:
+				return 'ISOLATION LEVEL REPEATABLE READ';
+			}
+			break;
+			
+		case 'SERIALIZABLE':
+				return 'ISOLATION LEVEL SERIALIZABLE';
+			break;
+			
+		default:
+			return $mode;
+		}
+	}
 	
 	/**
 	 * If database does not support transactions, always return true as data always commited
@@ -2208,7 +2264,7 @@
 	 *
 	 * @return  array of column names for current table.
 	 */ 
-	function &MetaColumnNames($table, $numIndexes=false) 
+	function &MetaColumnNames($table, $numIndexes=false,$useattnum=false /* only for postgres */) 
 	{
 		$objarr =& $this->MetaColumns($table);
 		if (!is_array($objarr)) {
@@ -2218,7 +2274,12 @@
 		$arr = array();
 		if ($numIndexes) {
 			$i = 0;
-			foreach($objarr as $v) $arr[$i++] = $v->name;
+			if ($useattnum) {
+				foreach($objarr as $v) 
+					$arr[$v->attnum] = $v->name;
+				
+			} else
+				foreach($objarr as $v) $arr[$i++] = $v->name;
 		} else
 			foreach($objarr as $v) $arr[strtoupper($v->name)] = $v->name;
 		
@@ -2260,6 +2321,22 @@
 		}
 
 		return adodb_date($this->fmtDate,$d);
+	}
+	
+	function BindDate($d)
+	{
+		$d = $this->DBDate($d);
+		if (strncmp($d,"'",1)) return $d;
+		
+		return substr($d,1,strlen($d)-2);
+	}
+	
+	function BindTimeStamp($d)
+	{
+		$d = $this->DBTimeStamp($d);
+		if (strncmp($d,"'",1)) return $d;
+		
+		return substr($d,1,strlen($d)-2);
 	}
 	
 	
@@ -3361,6 +3438,7 @@
 		'BPCHAR' => 'C',
 		'CHARACTER' => 'C',
 		'INTERVAL' => 'C',  # Postgres
+		'MACADDR' => 'C', # postgres
 		##
 		'LONGCHAR' => 'X',
 		'TEXT' => 'X',
@@ -3387,6 +3465,7 @@
 		'DATETIME' => 'T',
 		'TIMESTAMPTZ' => 'T',
 		'T' => 'T',
+		'TIMESTAMP WITHOUT TIME ZONE' => 'T', // postgresql
 		##
 		'BOOL' => 'L',
 		'BOOLEAN' => 'L', 

Modified: vtigercrm/trunk/adodb/datadict/datadict-access.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/datadict/datadict-access.inc.php (original)
+++ vtigercrm/trunk/adodb/datadict/datadict-access.inc.php Fri Jun 16 07:06:09 2006
@@ -1,7 +1,7 @@
 <?php
 
 /**
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/trunk/adodb/datadict/datadict-db2.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/datadict/datadict-db2.inc.php (original)
+++ vtigercrm/trunk/adodb/datadict/datadict-db2.inc.php Fri Jun 16 07:06:09 2006
@@ -1,7 +1,7 @@
 <?php
 
 /**
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/trunk/adodb/datadict/datadict-firebird.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/datadict/datadict-firebird.inc.php (original)
+++ vtigercrm/trunk/adodb/datadict/datadict-firebird.inc.php Fri Jun 16 07:06:09 2006
@@ -1,7 +1,7 @@
 <?php
 
 /**
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/trunk/adodb/datadict/datadict-generic.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/datadict/datadict-generic.inc.php (original)
+++ vtigercrm/trunk/adodb/datadict/datadict-generic.inc.php Fri Jun 16 07:06:09 2006
@@ -1,7 +1,7 @@
 <?php
 
 /**
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/trunk/adodb/datadict/datadict-ibase.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/datadict/datadict-ibase.inc.php (original)
+++ vtigercrm/trunk/adodb/datadict/datadict-ibase.inc.php Fri Jun 16 07:06:09 2006
@@ -1,7 +1,7 @@
 <?php
 
 /**
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/trunk/adodb/datadict/datadict-informix.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/datadict/datadict-informix.inc.php (original)
+++ vtigercrm/trunk/adodb/datadict/datadict-informix.inc.php Fri Jun 16 07:06:09 2006
@@ -1,7 +1,7 @@
 <?php
 
 /**
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/trunk/adodb/datadict/datadict-mssql.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/datadict/datadict-mssql.inc.php (original)
+++ vtigercrm/trunk/adodb/datadict/datadict-mssql.inc.php Fri Jun 16 07:06:09 2006
@@ -1,7 +1,7 @@
 <?php
 
 /**
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/trunk/adodb/datadict/datadict-mysql.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/datadict/datadict-mysql.inc.php (original)
+++ vtigercrm/trunk/adodb/datadict/datadict-mysql.inc.php Fri Jun 16 07:06:09 2006
@@ -1,7 +1,7 @@
 <?php
 
 /**
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/trunk/adodb/datadict/datadict-oci8.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/datadict/datadict-oci8.inc.php (original)
+++ vtigercrm/trunk/adodb/datadict/datadict-oci8.inc.php Fri Jun 16 07:06:09 2006
@@ -1,7 +1,7 @@
 <?php
 
 /**
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/trunk/adodb/datadict/datadict-postgres.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/datadict/datadict-postgres.inc.php (original)
+++ vtigercrm/trunk/adodb/datadict/datadict-postgres.inc.php Fri Jun 16 07:06:09 2006
@@ -1,7 +1,7 @@
 <?php
 
 /**
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/trunk/adodb/datadict/datadict-sybase.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/datadict/datadict-sybase.inc.php (original)
+++ vtigercrm/trunk/adodb/datadict/datadict-sybase.inc.php Fri Jun 16 07:06:09 2006
@@ -1,7 +1,7 @@
 <?php
 
 /**
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/trunk/adodb/drivers/adodb-access.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-access.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-access.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. See License.txt. 

Modified: vtigercrm/trunk/adodb/drivers/adodb-ado.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-ado.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-ado.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. 

Modified: vtigercrm/trunk/adodb/drivers/adodb-ado5.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-ado5.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-ado5.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. 
@@ -58,8 +58,22 @@
 	// you can also pass a connection string like this:
 	//
 	// $DB->Connect('USER ID=sa;PASSWORD=pwd;SERVER=mangrove;DATABASE=ai',false,false,'SQLOLEDB');
-	function _connect($argHostname, $argUsername, $argPassword, $argProvider= 'MSDASQL')
-	{
+	function _connect($argHostname, $argUsername, $argPassword,$argDBorProvider, $argProvider= '')
+	{
+	// two modes
+	//	-	if $argProvider is empty, we assume that $argDBorProvider holds provider -- this is for backward compat
+	//	- 	if $argProvider is not empty, then $argDBorProvider holds db
+	
+		
+		 if ($argProvider) {
+		 	$argDatabasename = $argDBorProvider;
+		 } else {
+		 	$argDatabasename = '';
+		 	if ($argDBorProvider) $argProvider = $argDBorProvider;
+			else $argProvider = 'MSDASQL';
+		}
+		
+		
 		try {
 		$u = 'UID';
 		$p = 'PWD';
@@ -86,7 +100,11 @@
 			$argProvider = "Microsoft.Jet.OLEDB.4.0"; // Microsoft Jet Provider
 		
 		if ($argProvider) $dbc->Provider = $argProvider;	
-		
+
+		if ($argProvider) $argHostname = "PROVIDER=$argProvider;DRIVER={SQL Server};SERVER=$argHostname";	
+		
+
+		if ($argDatabasename) $argHostname .= ";DATABASE=$argDatabasename";		
 		if ($argUsername) $argHostname .= ";$u=$argUsername";
 		if ($argPassword)$argHostname .= ";$p=$argPassword";
 		
@@ -205,9 +223,6 @@
 		return $arr;
 	}
 	
-
-
-	
 	/* returns queryID or false */
 	function &_query($sql,$inputarr=false) 
 	{
@@ -251,7 +266,8 @@
 		if ($rs->State == 0) {
 			$true = true;
 			return $true; // 0 = adStateClosed means no records returned
-		} return $rs;
+		}
+		return $rs;
 		
 		} catch (exception $e) {
 			
@@ -296,11 +312,17 @@
 	function ErrorMsg() 
 	{
 		if (!$this->_connectionID) return "No connection established";
-		$errc = $this->_connectionID->Errors;
-		if (!$errc) return "No Errors object found";
-		if ($errc->Count == 0) return '';
-		$err = $errc->Item($errc->Count-1);
-		return $err->Description;
+		$errmsg = '';
+		
+		try {
+			$errc = $this->_connectionID->Errors;
+			if (!$errc) return "No Errors object found";
+			if ($errc->Count == 0) return '';
+			$err = $errc->Item($errc->Count-1);
+			$errmsg = $err->Description;
+		}catch(exception $e) {
+		}
+		return $errmsg;
 	}
 	
 	function ErrorNo() 

Modified: vtigercrm/trunk/adodb/drivers/adodb-ado_access.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-ado_access.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-ado_access.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
 Released under both BSD license and Lesser GPL library license. 
 Whenever there is any discrepancy between the two licenses, 
 the BSD license will take precedence. See License.txt. 

Modified: vtigercrm/trunk/adodb/drivers/adodb-ado_mssql.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-ado_mssql.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-ado_mssql.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. 
@@ -11,8 +11,8 @@
   Microsoft SQL Server ADO data driver. Requires ADO and MSSQL client. 
   Works only on MS Windows.
   
-  It is normally better to use the mssql driver directly because it is much faster. 
-  This file is only a technology demonstration and for test purposes.
+  Warning: Some versions of PHP (esp PHP4) leak memory when ADO/COM is used. 
+  Please check http://bugs.php.net/ for more info.
 */
 
 // security - hide paths
@@ -53,6 +53,17 @@
 	        return $this->GetOne('select @@rowcount');
 	}
 	
+	function SetTransactionMode( $transaction_mode ) 
+	{
+		$this->_transmode  = $transaction_mode;
+		if (empty($transaction_mode)) {
+			$this->Execute('SET TRANSACTION ISOLATION LEVEL READ COMMITTED');
+			return;
+		}
+		if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
+		$this->Execute("SET TRANSACTION ".$transaction_mode);
+	}
+	
 	function MetaColumns($table)
 	{
         $table = strtoupper($table);
@@ -84,6 +95,44 @@
 		return empty($arr) ? $false : $arr;
 	}
 	
+	function CreateSequence($seq='adodbseq',$start=1)
+	{
+		
+		$this->Execute('BEGIN TRANSACTION adodbseq');
+		$start -= 1;
+		$this->Execute("create table $seq (id float(53))");
+		$ok = $this->Execute("insert into $seq with (tablock,holdlock) values($start)");
+		if (!$ok) {
+				$this->Execute('ROLLBACK TRANSACTION adodbseq');
+				return false;
+		}
+		$this->Execute('COMMIT TRANSACTION adodbseq'); 
+		return true;
+	}
+
+	function GenID($seq='adodbseq',$start=1)
+	{
+		//$this->debug=1;
+		$this->Execute('BEGIN TRANSACTION adodbseq');
+		$ok = $this->Execute("update $seq with (tablock,holdlock) set id = id + 1");
+		if (!$ok) {
+			$this->Execute("create table $seq (id float(53))");
+			$ok = $this->Execute("insert into $seq with (tablock,holdlock) values($start)");
+			if (!$ok) {
+				$this->Execute('ROLLBACK TRANSACTION adodbseq');
+				return false;
+			}
+			$this->Execute('COMMIT TRANSACTION adodbseq'); 
+			return $start;
+		}
+		$num = $this->GetOne("select id from $seq");
+		$this->Execute('COMMIT TRANSACTION adodbseq'); 
+		return $num;
+		
+		// in old implementation, pre 1.90, we returned GUID...
+		//return $this->GetOne("SELECT CONVERT(varchar(255), NEWID()) AS 'Char'");
+	}
+	
 	} // end class 
 	
 	class  ADORecordSet_ado_mssql extends ADORecordSet_ado {        

Modified: vtigercrm/trunk/adodb/drivers/adodb-borland_ibase.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-borland_ibase.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-borland_ibase.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. 

Modified: vtigercrm/trunk/adodb/drivers/adodb-csv.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-csv.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-csv.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/trunk/adodb/drivers/adodb-db2.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-db2.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-db2.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-  V4.81 3 May 2006  (c) 2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2006 John Lim (jlim#natsoft.com.my). All rights reserved.
 
 This is a version of the ADODB driver for DB2.  It uses the 'ibm_db2' PECL extension for PHP
   (http://pecl.php.net/package/ibm_db2), which in turn requires DB2 V8.2.2.
@@ -25,7 +25,14 @@
 class ADODB_db2 extends ADOConnection {
 	var $databaseType = "db2";	
 	var $fmtDate = "'Y-m-d'";
-	var $fmtTimeStamp = "'Y-m-d, h:i:sA'";
+	var $concat_operator = '||';
+	
+	var $sysTime = 'CURRENT TIME';
+	var $sysDate = 'CURRENT DATE';
+	var $sysTimeStamp = 'CURRENT TIMESTAMP';
+	
+	var $fmtTimeStamp = "'Y-m-d-H.i.s'";
+	#var $fmtTimeStamp = "'Y-m-d, h:i:sA'";
 	var $replaceQuote = "''"; // string to use to replace quotes
 	var $dataProvider = "db2";
 	var $hasAffectedRows = true;
@@ -40,6 +47,12 @@
 	var $_haserrorfunctions = true;
 	var $_lastAffectedRows = 0;
 	var $uCaseTables = true; // for meta* functions, uppercase table names
+	var $hasInsertID = true;
+	
+    function _insertid()
+    {
+        return ADOConnection::GetOne('VALUES IDENTITY_VAL_LOCAL()');
+    }
 	
 	function ADODB_db2() 
 	{ 	
@@ -103,6 +116,61 @@
 		return $this->_connectionID != false;
 	}
 
+	
+	// Format date column in sql string given an input format that understands Y M D
+	function SQLDate($fmt, $col=false)
+	{	
+	// use right() and replace() ?
+		if (!$col) $col = $this->sysDate;
+		$s = '';
+		
+		$len = strlen($fmt);
+		for ($i=0; $i < $len; $i++) {
+			if ($s) $s .= $this->concat_operator;
+			$ch = $fmt[$i];
+			switch($ch) {
+			case 'Y':
+			case 'y':
+				$s .= "char(year($col))";
+				break;
+			case 'M':
+				$s .= "substr(monthname($col),1,3)";
+				break;
+			case 'm':
+				$s .= "right(digits(month($col)),2)";
+				break;
+			case 'D':
+			case 'd':
+				$s .= "right(digits(day($col)),2)";
+				break;
+			case 'H':
+			case 'h':
+				if ($col != $this->sysDate) $s .= "right(digits(hour($col)),2)";	
+				else $s .= "''";
+				break;
+			case 'i':
+			case 'I':
+				if ($col != $this->sysDate)
+					$s .= "right(digits(minute($col)),2)";
+					else $s .= "''";
+				break;
+			case 'S':
+			case 's':
+				if ($col != $this->sysDate)
+					$s .= "right(digits(second($col)),2)";
+				else $s .= "''";
+				break;
+			default:
+				if ($ch == '\\') {
+					$i++;
+					$ch = substr($fmt,$i,1);
+				}
+				$s .= $this->qstr($ch);
+			}
+		}
+		return $s;
+	} 
+ 
 	
 	function ServerInfo()
 	{
@@ -575,15 +643,12 @@
 
 
 	// returns the field object
-	function &FetchField($fieldOffset = -1) 
-	{
-		
-		$off=$fieldOffset+1; // offsets begin at 1
-		
+	function &FetchField($offset = -1) 
+	{
 		$o= new ADOFieldObject();
-		$o->name = @db2_field_name($this->_queryID,$off);
-		$o->type = @db2_field_type($this->_queryID,$off);
-		$o->max_length = db2_field_width($this->_queryID,$off);
+		$o->name = @db2_field_name($this->_queryID,$offset);
+		$o->type = @db2_field_type($this->_queryID,$offset);
+		$o->max_length = db2_field_width($this->_queryID,$offset);
 		if (ADODB_ASSOC_CASE == 0) $o->name = strtolower($o->name);
 		else if (ADODB_ASSOC_CASE == 1) $o->name = strtoupper($o->name);
 		return $o;

Modified: vtigercrm/trunk/adodb/drivers/adodb-fbsql.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-fbsql.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-fbsql.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /*
- @version V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ @version V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
  Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. 

Modified: vtigercrm/trunk/adodb/drivers/adodb-firebird.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-firebird.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-firebird.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. 

Modified: vtigercrm/trunk/adodb/drivers/adodb-ibase.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-ibase.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-ibase.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.  
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.  
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/trunk/adodb/drivers/adodb-informix.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-informix.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-informix.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+* @version V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
 * Released under both BSD license and Lesser GPL library license.
 * Whenever there is any discrepancy between the two licenses,
 * the BSD license will take precedence.

Modified: vtigercrm/trunk/adodb/drivers/adodb-informix72.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-informix72.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-informix72.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim. All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim. All rights reserved.
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.

Modified: vtigercrm/trunk/adodb/drivers/adodb-ldap.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-ldap.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-ldap.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /*
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
    Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/trunk/adodb/drivers/adodb-mssql.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-mssql.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-mssql.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. 
@@ -296,6 +296,17 @@
 		return true;
 	}
 	
+	function SetTransactionMode( $transaction_mode ) 
+	{
+		$this->_transmode  = $transaction_mode;
+		if (empty($transaction_mode)) {
+			$this->Execute('SET TRANSACTION ISOLATION LEVEL READ COMMITTED');
+			return;
+		}
+		if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
+		$this->Execute("SET TRANSACTION ".$transaction_mode);
+	}
+	
 	/*
 		Usage:
 		

Modified: vtigercrm/trunk/adodb/drivers/adodb-mssqlpo.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-mssqlpo.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-mssqlpo.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+* @version V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
 * Released under both BSD license and Lesser GPL library license.
 * Whenever there is any discrepancy between the two licenses,
 * the BSD license will take precedence.

Modified: vtigercrm/trunk/adodb/drivers/adodb-mysql.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-mysql.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-mysql.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.
@@ -542,6 +542,9 @@
 	// "Innox - Juan Carlos Gonzalez" <jgonzalez#innox.com.mx>
 	function MetaForeignKeys( $table, $owner = FALSE, $upper = FALSE, $associative = FALSE )
      {
+	 global $ADODB_FETCH_MODE;
+		if ($ADODB_FETCH_MODE == ADODB_FETCH_ASSOC || $this->fetchMode == ADODB_FETCH_ASSOC) $associative = true;
+
          if ( !empty($owner) ) {
             $table = "$owner.$table";
          }

Modified: vtigercrm/trunk/adodb/drivers/adodb-mysqli.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-mysqli.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-mysqli.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.
@@ -58,6 +58,16 @@
 	    
 	}
 	
+	function SetTransactionMode( $transaction_mode ) 
+	{
+		$this->_transmode  = $transaction_mode;
+		if (empty($transaction_mode)) {
+			$this->Execute('SET SESSION TRANSACTION ISOLATION LEVEL REPEATABLE READ');
+			return;
+		}
+		if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
+		$this->Execute("SET SESSION TRANSACTION ".$transaction_mode);
+	}
 
 	// returns true or false
 	// To add: parameter int $port,
@@ -445,6 +455,10 @@
 	// "Innox - Juan Carlos Gonzalez" <jgonzalez#innox.com.mx>
 	function MetaForeignKeys( $table, $owner = FALSE, $upper = FALSE, $associative = FALSE )
 	{
+	 global $ADODB_FETCH_MODE;
+		
+		if ($ADODB_FETCH_MODE == ADODB_FETCH_ASSOC || $this->fetchMode == ADODB_FETCH_ASSOC) $associative = true;
+		
 	    if ( !empty($owner) ) {
 	       $table = "$owner.$table";
 	    }

Modified: vtigercrm/trunk/adodb/drivers/adodb-mysqlt.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-mysqlt.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-mysqlt.inc.php Fri Jun 16 07:06:09 2006
@@ -1,7 +1,7 @@
 <?php
 
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.
@@ -28,6 +28,23 @@
 	function ADODB_mysqlt() 
 	{			
 	global $ADODB_EXTENSION; if ($ADODB_EXTENSION) $this->rsPrefix .= 'ext_';
+	}
+	
+	/* set transaction mode
+	
+	SET [GLOBAL | SESSION] TRANSACTION ISOLATION LEVEL
+{ READ UNCOMMITTED | READ COMMITTED | REPEATABLE READ | SERIALIZABLE }
+
+	*/
+	function SetTransactionMode( $transaction_mode ) 
+	{
+		$this->_transmode  = $transaction_mode;
+		if (empty($transaction_mode)) {
+			$this->Execute('SET SESSION TRANSACTION ISOLATION LEVEL REPEATABLE READ');
+			return;
+		}
+		if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
+		$this->Execute("SET SESSION TRANSACTION ".$transaction_mode);
 	}
 	
 	function BeginTrans()

Modified: vtigercrm/trunk/adodb/drivers/adodb-netezza.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-netezza.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-netezza.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /*
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
  
   First cut at the Netezza Driver by Josh Eldridge joshuae74#hotmail.com
  Based on the previous postgres drivers.

Modified: vtigercrm/trunk/adodb/drivers/adodb-oci8.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-oci8.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-oci8.inc.php Fri Jun 16 07:06:09 2006
@@ -1,7 +1,7 @@
 <?php
 /*
 
-  version V4.81 3 May 2006 (c) 2000-2006 John Lim. All rights reserved.
+  version V4.90 8 June 2006 (c) 2000-2006 John Lim. All rights reserved.
 
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
@@ -278,6 +278,21 @@
 		return "TO_DATE(".adodb_date($this->fmtDate,$d).",'".$this->NLS_DATE_FORMAT."')";
 	}
 
+	function BindDate($d)
+	{
+		$d = ADOConnection::DBDate($d);
+		if (strncmp($d,"'",1)) return $d;
+		
+		return substr($d,1,strlen($d)-2);
+	}
+	
+	function BindTimeStamp($d)
+	{
+		$d = ADOConnection::DBTimeStamp($d);
+		if (strncmp($d,"'",1)) return $d;
+		
+		return substr($d,1,strlen($d)-2);
+	}
 	
 	// format and return date string in database timestamp format
 	function DBTimeStamp($ts)
@@ -381,6 +396,8 @@
 		$this->transCnt += 1;
 		$this->autoCommit = false;
 		$this->_commit = OCI_DEFAULT;
+		
+		if ($this->_transmode) $this->Execute("SET TRANSACTION ".$this->_transmode);
 		return true;
 	}
 	

Modified: vtigercrm/trunk/adodb/drivers/adodb-oci805.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-oci805.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-oci805.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /** 
- * @version V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ * @version V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
  * Released under both BSD license and Lesser GPL library license. 
  * Whenever there is any discrepancy between the two licenses, 
  * the BSD license will take precedence. 

Modified: vtigercrm/trunk/adodb/drivers/adodb-oci8po.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-oci8po.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-oci8po.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim. All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim. All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/trunk/adodb/drivers/adodb-odbc.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-odbc.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-odbc.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. 

Modified: vtigercrm/trunk/adodb/drivers/adodb-odbc_db2.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-odbc_db2.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-odbc_db2.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. 
@@ -60,7 +60,7 @@
 ========================
 To set SQL_CUR_USE_ODBC for drivers that require it, do this:
 
-$db = NewADOConnection('db2');
+$db = NewADOConnection('odbc_db2');
 $db->curMode = SQL_CUR_USE_ODBC;
 $db->Connect($dsn, $userid, $pwd);
 
@@ -80,6 +80,10 @@
 > In case of DB2 I had to swap the first and last arguments in order to connect properly. 
 
 
+System Error 5
+==============
+IF you get a System Error 5 when trying to Connect/Load, it could be a permission problem. Give the user connecting
+to DB2 full rights to the DB2 SQLLIB directory, and place the user in the DBUSERS group.
 */
 
 // security - hide paths
@@ -88,13 +92,14 @@
 if (!defined('_ADODB_ODBC_LAYER')) {
 	include(ADODB_DIR."/drivers/adodb-odbc.inc.php");
 }
-if (!defined('ADODB_DB2')){
-define('ADODB_DB2',1);
-
-class ADODB_DB2 extends ADODB_odbc {
+if (!defined('ADODB_ODBC_DB2')){
+define('ADODB_ODBC_DB2',1);
+
+class ADODB_ODBC_DB2 extends ADODB_odbc {
 	var $databaseType = "db2";	
 	var $concat_operator = '||';
-	var $sysDate = 'CURRENT_DATE';
+	var $sysTime = 'CURRENT TIME';
+	var $sysDate = 'CURRENT DATE';
 	var $sysTimeStamp = 'CURRENT TIMESTAMP';
 	// The complete string representation of a timestamp has the form 
 	// yyyy-mm-dd-hh.mm.ss.nnnnnn.
@@ -103,6 +108,7 @@
 	var $identitySQL = 'values IDENTITY_VAL_LOCAL()';
 	var $_bindInputArray = true;
 	 var $hasInsertID = true;
+	var $rsPrefix = 'ADORecordset_odbc_';
 	
 	function ADODB_DB2()
 	{
@@ -294,7 +300,7 @@
 };
  
 
-class  ADORecordSet_db2 extends ADORecordSet_odbc {	
+class  ADORecordSet_odbc_db2 extends ADORecordSet_odbc {	
 	
 	var $databaseType = "db2";		
 	

Modified: vtigercrm/trunk/adodb/drivers/adodb-odbc_mssql.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-odbc_mssql.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-odbc_mssql.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. 
@@ -142,6 +142,17 @@
 		return ADODB_odbc::_query($sql,$inputarr);
 	}
 	
+	function SetTransactionMode( $transaction_mode ) 
+	{
+		$this->_transmode  = $transaction_mode;
+		if (empty($transaction_mode)) {
+			$this->Execute('SET TRANSACTION ISOLATION LEVEL READ COMMITTED');
+			return;
+		}
+		if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
+		$this->Execute("SET TRANSACTION ".$transaction_mode);
+	}
+	
 	// "Stein-Aksel Basma" <basma at accelero.no>
 	// tested with MSSQL 2000
 	function &MetaPrimaryKeys($table)

Modified: vtigercrm/trunk/adodb/drivers/adodb-odbc_oracle.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-odbc_oracle.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-odbc_oracle.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. 

Modified: vtigercrm/trunk/adodb/drivers/adodb-odbtp.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-odbtp.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-odbtp.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /*
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence. See License.txt.

Modified: vtigercrm/trunk/adodb/drivers/adodb-odbtp_unicode.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-odbtp_unicode.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-odbtp_unicode.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /*
-	V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+	V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence. See License.txt.

Modified: vtigercrm/trunk/adodb/drivers/adodb-oracle.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-oracle.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-oracle.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.
@@ -45,6 +45,24 @@
 		if (is_string($ts)) $d = ADORecordSet::UnixTimeStamp($ts);
 		return 'TO_DATE('.adodb_date($this->fmtTimeStamp,$ts).",'RRRR-MM-DD, HH:MI:SS AM')";
 	}
+	
+	
+	function BindDate($d)
+	{
+		$d = ADOConnection::DBDate($d);
+		if (strncmp($d,"'",1)) return $d;
+		
+		return substr($d,1,strlen($d)-2);
+	}
+	
+	function BindTimeStamp($d)
+	{
+		$d = ADOConnection::DBTimeStamp($d);
+		if (strncmp($d,"'",1)) return $d;
+		
+		return substr($d,1,strlen($d)-2);
+	}
+	
 
 	
 	function BeginTrans()

Modified: vtigercrm/trunk/adodb/drivers/adodb-pdo.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-pdo.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-pdo.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. 

Modified: vtigercrm/trunk/adodb/drivers/adodb-pdo_mssql.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-pdo_mssql.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-pdo_mssql.inc.php Fri Jun 16 07:06:09 2006
@@ -2,7 +2,7 @@
 
 
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.
@@ -36,6 +36,17 @@
 		return $ret;
 	}
 	
+	function SetTransactionMode( $transaction_mode ) 
+	{
+		$this->_transmode  = $transaction_mode;
+		if (empty($transaction_mode)) {
+			$this->Execute('SET TRANSACTION ISOLATION LEVEL READ COMMITTED');
+			return;
+		}
+		if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
+		$this->Execute("SET TRANSACTION ".$transaction_mode);
+	}
+	
 	function MetaTables()
 	{
 		return false;

Modified: vtigercrm/trunk/adodb/drivers/adodb-pdo_mysql.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-pdo_mysql.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-pdo_mysql.inc.php Fri Jun 16 07:06:09 2006
@@ -2,7 +2,7 @@
 
 
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.
@@ -48,6 +48,17 @@
 		
 		$this->metaTablesSQL = $save;
 		return $ret;
+	}
+	
+	function SetTransactionMode( $transaction_mode ) 
+	{
+		$this->_transmode  = $transaction_mode;
+		if (empty($transaction_mode)) {
+			$this->Execute('SET TRANSACTION ISOLATION LEVEL REPEATABLE READ');
+			return;
+		}
+		if (!stristr($transaction_mode,'isolation')) $transaction_mode = 'ISOLATION LEVEL '.$transaction_mode;
+		$this->Execute("SET SESSION TRANSACTION ".$transaction_mode);
 	}
 	
  	function &MetaColumns($table) 

Modified: vtigercrm/trunk/adodb/drivers/adodb-pdo_oci.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-pdo_oci.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-pdo_oci.inc.php Fri Jun 16 07:06:09 2006
@@ -2,7 +2,7 @@
 
 
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/trunk/adodb/drivers/adodb-pdo_pgsql.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-pdo_pgsql.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-pdo_pgsql.inc.php Fri Jun 16 07:06:09 2006
@@ -1,7 +1,7 @@
 <?php
 
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/trunk/adodb/drivers/adodb-postgres.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-postgres.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-postgres.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /*
- V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/trunk/adodb/drivers/adodb-postgres64.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-postgres64.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-postgres64.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /*
- V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.
@@ -174,7 +174,7 @@
 	{
 		if ($this->transOff) return true;
 		$this->transCnt += 1;
-		return @pg_Exec($this->_connectionID, "begin");
+		return @pg_Exec($this->_connectionID, "begin ".$this->_transmode);
 	}
 	
 	function RowLock($tables,$where,$flds='1 as ignore') 
@@ -532,6 +532,8 @@
 			$fld->name = $rs->fields[0];
 			$fld->type = $rs->fields[1];
 			$fld->max_length = $rs->fields[2];
+			$fld->attnum = $rs->fields[6];
+			
 			if ($fld->max_length <= 0) $fld->max_length = $rs->fields[3]-4;
 			if ($fld->max_length <= 0) $fld->max_length = -1;
 			if ($fld->type == 'numeric') {
@@ -617,12 +619,14 @@
 					return $false;
                 }
 				
-                $col_names = $this->MetaColumnNames($table,true);
+                $col_names = $this->MetaColumnNames($table,true,true); 
+				//3rd param is use attnum, 
+				// see http://sourceforge.net/tracker/index.php?func=detail&aid=1451245&group_id=42718&atid=433976
                 $indexes = array();
                 while ($row = $rs->FetchRow()) {
                         $columns = array();
                         foreach (explode(' ', $row[2]) as $col) {
-                                $columns[] = $col_names[$col - 1];
+                                $columns[] = $col_names[$col];
                         }
                         
                         $indexes[$row[0]] = array(
@@ -701,7 +705,7 @@
 	// returns queryID or false
 	function _query($sql,$inputarr)
 	{
-		
+		$this->_errorMsg = false;
 		if ($inputarr) {
 		/*
 			It appears that PREPARE/EXECUTE is slower for many queries.
@@ -730,6 +734,7 @@
 			
 			if ($execp) $exsql = "EXECUTE $plan ($execp)";
 			else $exsql = "EXECUTE $plan";
+			
 			
 			$rez = @pg_exec($this->_connectionID,$exsql);
 			if (!$rez) {
@@ -756,12 +761,11 @@
 				$s = "PREPARE $plan ($params) AS ".substr($sql,0,strlen($sql)-2);		
 				//adodb_pr($s);
 				pg_exec($this->_connectionID,$s);
-				echo $this->ErrorMsg();
+				//echo $this->ErrorMsg();
 			}
 			
 			$rez = pg_exec($this->_connectionID,$exsql);
 		} else {
-			$this->_errorMsg = false;
 			//adodb_backtrace();
 			$rez = pg_exec($this->_connectionID,$sql);
 		}
@@ -1000,6 +1004,7 @@
 		   		case 'BPCHAR':
 				case '_VARCHAR':
 				case 'INET':
+				case 'MACADDR':
 					if ($len <= $this->blobSize) return 'C';
 				
 				case 'TEXT':
@@ -1019,6 +1024,8 @@
 				case 'DATE':
 					return 'D';
 				
+				
+				case 'TIMESTAMP WITHOUT TIME ZONE':
 				case 'TIME':
 				case 'DATETIME':
 				case 'TIMESTAMP':

Modified: vtigercrm/trunk/adodb/drivers/adodb-postgres7.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-postgres7.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-postgres7.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /*
- V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.
@@ -55,6 +55,7 @@
 		return $sql;
 	}
  	*/
+
 
 	// from  Edward Jaramilla, improved version - works on pg 7.4
 	function MetaForeignKeys($table, $owner=false, $upper=false)
@@ -96,6 +97,7 @@
 			// We don't have native support for parameterized queries, so let's emulate it at the parent
 			return ADODB_postgres64::_query($sql, $inputarr);
 		}
+		$this->_errorMsg = false;
 		// -- added Cristiano da Cunha Duarte
 		if ($inputarr) {
 			$sqlarr = explode('?',trim($sql));

Modified: vtigercrm/trunk/adodb/drivers/adodb-postgres8.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-postgres8.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-postgres8.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /*
- V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/trunk/adodb/drivers/adodb-proxy.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-proxy.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-proxy.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/trunk/adodb/drivers/adodb-sapdb.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-sapdb.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-sapdb.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. 

Modified: vtigercrm/trunk/adodb/drivers/adodb-sqlanywhere.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-sqlanywhere.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-sqlanywhere.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-version V4.81 3 May 2006 (c) 2000-2006  John Lim (jlim#natsoft.com.my).  All rights
+version V4.90 8 June 2006 (c) 2000-2006  John Lim (jlim#natsoft.com.my).  All rights
 reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 

Modified: vtigercrm/trunk/adodb/drivers/adodb-sqlite.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-sqlite.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-sqlite.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/trunk/adodb/drivers/adodb-sqlitepo.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-sqlitepo.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-sqlitepo.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.

Modified: vtigercrm/trunk/adodb/drivers/adodb-sybase.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-sybase.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-sybase.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim. All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim. All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. 

Modified: vtigercrm/trunk/adodb/drivers/adodb-sybase_ase.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-sybase_ase.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-sybase_ase.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /*
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/trunk/adodb/drivers/adodb-vfp.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-vfp.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-vfp.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. 

Modified: vtigercrm/trunk/adodb/perf/perf-db2.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/perf/perf-db2.inc.php (original)
+++ vtigercrm/trunk/adodb/perf/perf-db2.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. See License.txt. 

Modified: vtigercrm/trunk/adodb/perf/perf-informix.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/perf/perf-informix.inc.php (original)
+++ vtigercrm/trunk/adodb/perf/perf-informix.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. See License.txt. 

Modified: vtigercrm/trunk/adodb/perf/perf-mssql.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/perf/perf-mssql.inc.php (original)
+++ vtigercrm/trunk/adodb/perf/perf-mssql.inc.php Fri Jun 16 07:06:09 2006
@@ -1,7 +1,7 @@
 <?php
 
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. See License.txt. 

Modified: vtigercrm/trunk/adodb/perf/perf-mysql.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/perf/perf-mysql.inc.php (original)
+++ vtigercrm/trunk/adodb/perf/perf-mysql.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. See License.txt. 

Modified: vtigercrm/trunk/adodb/perf/perf-oci8.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/perf/perf-oci8.inc.php (original)
+++ vtigercrm/trunk/adodb/perf/perf-oci8.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. See License.txt. 

Modified: vtigercrm/trunk/adodb/perf/perf-postgres.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/perf/perf-postgres.inc.php (original)
+++ vtigercrm/trunk/adodb/perf/perf-postgres.inc.php Fri Jun 16 07:06:09 2006
@@ -1,7 +1,7 @@
 <?php
 
 /* 
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. See License.txt. 

Modified: vtigercrm/trunk/adodb/pivottable.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/pivottable.inc.php (original)
+++ vtigercrm/trunk/adodb/pivottable.inc.php Fri Jun 16 07:06:09 2006
@@ -1,15 +1,12 @@
 <?php
 /** 
- * @version V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ * @version V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
  * Released under both BSD license and Lesser GPL library license. 
  * Whenever there is any discrepancy between the two licenses, 
  * the BSD license will take precedence. 
  *
  * Set tabs to 4 for best viewing.
  * 
- * Latest version is available at http://php.weblogs.com
- *
- * Requires PHP4.01pl2 or later because it uses include_once
 */
 
 /*
@@ -38,7 +35,7 @@
 	else $hidecnt = false;
 	
 	$iif = strpos($db->databaseType,'access') !== false; 
-		// note - vfp still doesn' work even with IIF enabled || $db->databaseType == 'vfp';
+		// note - vfp 6 still doesn' work even with IIF enabled || $db->databaseType == 'vfp';
 	
 	//$hidecnt = false;
 	
@@ -95,7 +92,12 @@
 	else
 		$sel = substr($sel,0,strlen($sel)-2);
 	
+	
+	// Strip aliases
+	$rowfields = preg_replace('/ AS (\w+)/i', '', $rowfields);
+	
 	$sql = "SELECT $sel \nFROM $tables $where \nGROUP BY $rowfields";
+	
 	return $sql;
  }
 

Modified: vtigercrm/trunk/adodb/rsfilter.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/rsfilter.inc.php (original)
+++ vtigercrm/trunk/adodb/rsfilter.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /** 
- * @version V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ * @version V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
  * Released under both BSD license and Lesser GPL library license. 
  * Whenever there is any discrepancy between the two licenses, 
  * the BSD license will take precedence. 

Modified: vtigercrm/trunk/adodb/server.php
==============================================================================
--- vtigercrm/trunk/adodb/server.php (original)
+++ vtigercrm/trunk/adodb/server.php Fri Jun 16 07:06:09 2006
@@ -1,7 +1,7 @@
 <?php
 
 /** 
- * @version V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ * @version V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
  * Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence. 

Modified: vtigercrm/trunk/adodb/session/adodb-compress-bzip2.php
==============================================================================
--- vtigercrm/trunk/adodb/session/adodb-compress-bzip2.php (original)
+++ vtigercrm/trunk/adodb/session/adodb-compress-bzip2.php Fri Jun 16 07:06:09 2006
@@ -1,7 +1,7 @@
 <?php
 
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
          Contributed by Ross Smith (adodb at netebb.com). 
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,

Modified: vtigercrm/trunk/adodb/session/adodb-compress-gzip.php
==============================================================================
--- vtigercrm/trunk/adodb/session/adodb-compress-gzip.php (original)
+++ vtigercrm/trunk/adodb/session/adodb-compress-gzip.php Fri Jun 16 07:06:09 2006
@@ -2,7 +2,7 @@
 
 
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
          Contributed by Ross Smith (adodb at netebb.com). 
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,

Modified: vtigercrm/trunk/adodb/session/adodb-cryptsession.php
==============================================================================
--- vtigercrm/trunk/adodb/session/adodb-cryptsession.php (original)
+++ vtigercrm/trunk/adodb/session/adodb-cryptsession.php Fri Jun 16 07:06:09 2006
@@ -2,7 +2,7 @@
 
 
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
          Contributed by Ross Smith (adodb at netebb.com). 
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,

Modified: vtigercrm/trunk/adodb/session/adodb-encrypt-mcrypt.php
==============================================================================
--- vtigercrm/trunk/adodb/session/adodb-encrypt-mcrypt.php (original)
+++ vtigercrm/trunk/adodb/session/adodb-encrypt-mcrypt.php Fri Jun 16 07:06:09 2006
@@ -2,7 +2,7 @@
 
 
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
          Contributed by Ross Smith (adodb at netebb.com). 
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,

Modified: vtigercrm/trunk/adodb/session/adodb-encrypt-md5.php
==============================================================================
--- vtigercrm/trunk/adodb/session/adodb-encrypt-md5.php (original)
+++ vtigercrm/trunk/adodb/session/adodb-encrypt-md5.php Fri Jun 16 07:06:09 2006
@@ -1,7 +1,7 @@
 <?php
 
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
          Contributed by Ross Smith (adodb at netebb.com). 
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,

Modified: vtigercrm/trunk/adodb/session/adodb-encrypt-secret.php
==============================================================================
--- vtigercrm/trunk/adodb/session/adodb-encrypt-secret.php (original)
+++ vtigercrm/trunk/adodb/session/adodb-encrypt-secret.php Fri Jun 16 07:06:09 2006
@@ -1,7 +1,7 @@
 <?php
 
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
          Contributed by Ross Smith (adodb at netebb.com). 
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,

Modified: vtigercrm/trunk/adodb/session/adodb-session-clob.php
==============================================================================
--- vtigercrm/trunk/adodb/session/adodb-session-clob.php (original)
+++ vtigercrm/trunk/adodb/session/adodb-session-clob.php Fri Jun 16 07:06:09 2006
@@ -2,7 +2,7 @@
 
 
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
          Contributed by Ross Smith (adodb at netebb.com). 
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,

Modified: vtigercrm/trunk/adodb/session/adodb-session.php
==============================================================================
--- vtigercrm/trunk/adodb/session/adodb-session.php (original)
+++ vtigercrm/trunk/adodb/session/adodb-session.php Fri Jun 16 07:06:09 2006
@@ -2,7 +2,7 @@
 
 
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
          Contributed by Ross Smith (adodb at netebb.com). 
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,
@@ -492,6 +492,19 @@
 	/////////////////////
 	// public methods
 	/////////////////////
+	
+	function config($driver, $host, $user, $password, $database=false,$options=false)
+	{
+		ADODB_Session::driver($driver);
+		ADODB_Session::host($host);
+		ADODB_Session::user($user);
+		ADODB_Session::password($password);
+		ADODB_Session::database($database);
+		
+		if (isset($options['table'])) ADODB_Session::table($options['table']);
+		if (isset($options['clob'])) ADODB_Session::table($options['clob']);
+		if (isset($options['field'])) ADODB_Session::dataFieldName($options['field']);
+	}
 
 	/*!
 		Create the connection to the database.
@@ -523,7 +536,6 @@
 #		assert('$driver');
 #		assert('$host');
 
-		// cannot use =& below - do not know why...
 		$conn =& ADONewConnection($driver);
 
 		if ($debug) {
@@ -618,6 +630,10 @@
 		If the data has not been modified since the last read(), we do not write.
 	*/
 	function write($key, $val) {
+	global $ADODB_SESSION_READONLY;
+	
+		if (!empty($ADODB_SESSION_READONLY)) return;
+		
 		$clob			= ADODB_Session::clob();
 		$conn			=& ADODB_Session::_conn();
 		$crc			= ADODB_Session::_crc();
@@ -646,12 +662,19 @@
 			if ($debug) {
 				echo '<p>Session: Only updating date - crc32 not changed</p>';
 			}
-			$sql = "UPDATE $table SET expiry = ".$conn->Param('0')." WHERE $binary sesskey = ".$conn->Param('1')." AND expiry >= ".$conn->Param('2');
-			$rs =& $conn->Execute($sql,array($expiry,$key,time()));
-			ADODB_Session::_dumprs($rs);
-			if ($rs) {
-				$rs->Close();
-			}
+			
+			$expirevar = '';
+			if ($expire_notify) {
+				$var = reset($expire_notify);
+				global $$var;
+				if (isset($$var)) {
+					$expirevar = $$var;
+				}
+			}
+			
+			
+			$sql = "UPDATE $table SET expiry = ".$conn->Param('0').",expireref=".$conn->Param('1')." WHERE $binary sesskey = ".$conn->Param('2')." AND expiry >= ".$conn->Param('3');
+			$rs =& $conn->Execute($sql,array($expiry,$expirevar,$key,time()));
 			return true;
 		}
 		$val = rawurlencode($val);
@@ -673,7 +696,7 @@
 		if (!$clob) {	// no lobs, simply use replace()
 			$arr[$data] = $conn->qstr($val);
 			$rs = $conn->Replace($table, $arr, 'sesskey', $autoQuote = true);
-			ADODB_Session::_dumprs($rs);
+			
 		} else {
 			// what value shall we insert/update for lob row?
 			switch ($driver) {
@@ -691,13 +714,13 @@
 					break;
 			}
 			
+			$expiryref = $conn->qstr($arr['expireref']);
 			// do we insert or update? => as for sesskey
 			$rs =& $conn->Execute("SELECT COUNT(*) AS cnt FROM $table WHERE $binary sesskey = $qkey");
-			ADODB_Session::_dumprs($rs);
 			if ($rs && reset($rs->fields) > 0) {
-				$sql = "UPDATE $table SET expiry = $expiry, $data = $lob_value WHERE  sesskey = $qkey";
+				$sql = "UPDATE $table SET expiry = $expiry, $data = $lob_value, expireref=$expiryref WHERE  sesskey = $qkey";
 			} else {
-				$sql = "INSERT INTO $table (expiry, $data, sesskey) VALUES ($expiry, $lob_value, $qkey)";
+				$sql = "INSERT INTO $table (expiry, $data, sesskey,expireref) VALUES ($expiry, $lob_value, $qkey,$expiryref)";
 			}
 			if ($rs) {
 				$rs->Close();
@@ -705,12 +728,11 @@
 
 			$err = '';
 			$rs1 =& $conn->Execute($sql);
-			ADODB_Session::_dumprs($rs1);
 			if (!$rs1) {
 				$err = $conn->ErrorMsg()."\n";
 			}
 			$rs2 =& $conn->UpdateBlob($table, $data, $val, " sesskey=$qkey", strtoupper($clob));
-			ADODB_Session::_dumprs($rs2);
+			
 			if (!$rs2) {
 				$err .= $conn->ErrorMsg()."\n";
 			}
@@ -901,7 +923,8 @@
 }
 
 ADODB_Session::_init();
-register_shutdown_function('session_write_close');
+if (empty($ADODB_SESSION_READONLY))
+	register_shutdown_function('session_write_close');
 
 // for backwards compatability only
 function adodb_sess_open($save_path, $session_name, $persist = true) {
@@ -914,4 +937,4 @@
 	return ADODB_Session::gc($t);
 }
 
-?>
+?>

Modified: vtigercrm/trunk/adodb/session/old/adodb-cryptsession.php
==============================================================================
--- vtigercrm/trunk/adodb/session/old/adodb-cryptsession.php (original)
+++ vtigercrm/trunk/adodb/session/old/adodb-cryptsession.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/trunk/adodb/session/old/adodb-session-clob.php
==============================================================================
--- vtigercrm/trunk/adodb/session/old/adodb-session-clob.php (original)
+++ vtigercrm/trunk/adodb/session/old/adodb-session-clob.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /*
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/trunk/adodb/session/old/adodb-session.php
==============================================================================
--- vtigercrm/trunk/adodb/session/old/adodb-session.php (original)
+++ vtigercrm/trunk/adodb/session/old/adodb-session.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php
 /*
-V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.

Modified: vtigercrm/trunk/adodb/tests/test-active-recs2.php
==============================================================================
--- vtigercrm/trunk/adodb/tests/test-active-recs2.php (original)
+++ vtigercrm/trunk/adodb/tests/test-active-recs2.php Fri Jun 16 07:06:09 2006
@@ -29,9 +29,11 @@
 
 
 
+
 $rec = new ADODB_Active_Record('photos');
 
 $rec = new ADODB_Active_Record('products');
+
 
 adodb_pr($rec->getAttributeNames());
 

Modified: vtigercrm/trunk/adodb/tests/test.php
==============================================================================
--- vtigercrm/trunk/adodb/tests/test.php (original)
+++ vtigercrm/trunk/adodb/tests/test.php Fri Jun 16 07:06:09 2006
@@ -747,7 +747,14 @@
 		where id=".$db->Param('zid')." and created>=".$db->Param('ZDATE')."",
 		$array);
 	if ($id != 1) Err("Bad bind; id=$id");
-	else echo "<br>Bind date/integer passed";
+	else echo "<br>Bind date/integer 1 passed";
+	
+	$array =array(1,$db->BindDate(time()));
+	$id = $db->GetOne("select id from ADOXYZ 
+		where id=".$db->Param('0')." and created>=".$db->Param('1')."",
+		$array);
+	if ($id != 1) Err("Bad bind; id=$id");
+	else echo "<br>Bind date/integer 2 passed";
 	
 	$db->debug = false;
 	$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
@@ -1327,13 +1334,16 @@
 	$date = $db->SQLDate('d-m-M-Y-\QQ h:i:s A',$db->DBDate("1974-02-25"));
 	$sql = "SELECT $date from ADOXYZ";
 	print "<p>Test SQLDate: ".htmlspecialchars($sql)."</p>";
+	$db->debug=1;
 	$rs = $db->SelectLimit($sql,1);
 	$ts = ADOConnection::UnixDate('1974-02-25');
 	$d = date('d-m-M-Y-',$ts).'Q'.(ceil(date('m',$ts)/3.0)).date(' h:i:s A',$ts);
 	if (!$rs) {
 		Err("SQLDate query returned no recordset");
 		echo $db->ErrorMsg(),'<br>';
-	} else if ($d != $rs->fields[0]) Err("SQLDate 2 failed expected: <br>act:$d <br>sql:".$rs->fields[0]);
+	} else if ($d != reset($rs->fields)) {
+		Err("SQLDate 2 failed expected: <br>act:$d <br>sql:".$rs->fields[0].' <br>'.$db->ErrorMsg());
+	}
 	
 	
 	print "<p>Test Filter</p>";
@@ -1504,9 +1514,11 @@
 	flush();
 	
 	if ($db->hasTransactions) {
-		//$db->debug=1;
+		$db->debug=1;
 		echo "<p>Testing StartTrans CompleteTrans</p>";
 		$db->raiseErrorFn = false;
+		
+		$db->SetTransactionMode('SERIALIZABLE');
 		$db->StartTrans();
 		$rs = $db->Execute('select * from notable');
 			$db->StartTrans();
@@ -1515,6 +1527,8 @@
 				$db->CommitTrans();
 			$db->CompleteTrans();
 		$rez = $db->CompleteTrans();
+		$db->SetTransactionMode('');
+		$db->debug=0;
 		if ($rez !== false) {
 			if (is_null($rez)) Err("Error: _transOK not modified");
 			else Err("Error: CompleteTrans (1) should have failed");

Modified: vtigercrm/trunk/adodb/tests/testdatabases.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/tests/testdatabases.inc.php (original)
+++ vtigercrm/trunk/adodb/tests/testdatabases.inc.php Fri Jun 16 07:06:09 2006
@@ -314,17 +314,28 @@
 
 }
 
-ADOLoadCode("db2"); // no longer supported
-if (!empty($testdb2)) { 
-	$db = ADONewConnection();
-	print "<h1>Connecting $db->databaseType...</h1>";
-	
-	$dsn = "db2_sample";
-	$dsn = "driver={IBM db2 odbc DRIVER};Database=sample;hostname=localhost;port=50000;protocol=TCPIP; uid=root; pwd=natsoft";
-	if ($db->Connect($dsn)) {
-	//	testdb($db,"create table ADOXYZ (id int, firstname varchar(24), lastname varchar(24),created date)");
-	} else print "ERROR: DB2 test requires an server setup with odbc data source db2_sample".'<BR>'.$db->ErrorMsg();
-
+ADOLoadCode("odbc_db2"); // no longer supported
+if (!empty($testdb2)) {
+	if (PHP_VERSION>=5.1) {
+		$db = ADONewConnection("db2");
+		print "<h1>Connecting $db->databaseType...</h1>";
+		
+		#$db->curMode = SQL_CUR_USE_ODBC;
+		#$dsn = "driver={IBM db2 odbc DRIVER};Database=test;hostname=localhost;port=50000;protocol=TCPIP; uid=natsoft; pwd=guest";
+		if ($db->Connect('localhost','natsoft','guest','test')) {
+			testdb($db,"create table ADOXYZ (id int, firstname varchar(24), lastname varchar(24),created date)");
+		} else print "ERROR: DB2 test requires an server setup with odbc data source db2_sample".'<BR>'.$db->ErrorMsg();
+	} else { 
+		$db = ADONewConnection("odbc_db2");
+		print "<h1>Connecting $db->databaseType...</h1>";
+		
+		$dsn = "db2test";
+		#$db->curMode = SQL_CUR_USE_ODBC;
+		#$dsn = "driver={IBM db2 odbc DRIVER};Database=test;hostname=localhost;port=50000;protocol=TCPIP; uid=natsoft; pwd=guest";
+		if ($db->Connect($dsn)) {
+			testdb($db,"create table ADOXYZ (id int, firstname varchar(24), lastname varchar(24),created date)");
+		} else print "ERROR: DB2 test requires an server setup with odbc data source db2_sample".'<BR>'.$db->ErrorMsg();
+	}
 echo "<hr />";
 flush();
 	$dsn = "driver={IBM db2 odbc DRIVER};Database=sample;hostname=localhost;port=50000;protocol=TCPIP; uid=root; pwd=natsoft";

Modified: vtigercrm/trunk/adodb/toexport.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/toexport.inc.php (original)
+++ vtigercrm/trunk/adodb/toexport.inc.php Fri Jun 16 07:06:09 2006
@@ -1,7 +1,7 @@
 <?php
 
 /** 
- * @version V4.81 3 May 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+ * @version V4.90 8 June 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
  * Released under both BSD license and Lesser GPL library license. 
  * Whenever there is any discrepancy between the two licenses, 
  * the BSD license will take precedence. 

Modified: vtigercrm/trunk/adodb/tohtml.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/tohtml.inc.php (original)
+++ vtigercrm/trunk/adodb/tohtml.inc.php Fri Jun 16 07:06:09 2006
@@ -1,6 +1,6 @@
 <?php 
 /*
-  V4.81 3 May 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
   the BSD license will take precedence.
@@ -95,7 +95,7 @@
 			break;
 			
 			case 'N':
-				if (abs($v) - round($v,0) < 0.00000001)
+				if (abs(abs($v) - round($v,0)) < 0.00000001)
 					$v = round($v);
 				else
 					$v = round($v,$ADODB_ROUND);




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 09:08:13 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 13:08:13 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7187 -
	/vtigercrm/trunk/install/populateSeedData.php
Message-ID: <20060616130814.148EC7ED33C@vtiger.fosslabs.com>

Author: richie
Date: Fri Jun 16 07:08:09 2006
New Revision: 7187

Log:
Fixes #1188

Modified:
    vtigercrm/trunk/install/populateSeedData.php

Modified: vtigercrm/trunk/install/populateSeedData.php
==============================================================================
--- vtigercrm/trunk/install/populateSeedData.php (original)
+++ vtigercrm/trunk/install/populateSeedData.php Fri Jun 16 07:08:09 2006
@@ -722,9 +722,15 @@
 
 //Populate Email Data
 
-$esubj_array =  array ("Vtiger Releases 5.0 Alpha4", "Try Zoho Writer", "Hi There!!!", "Welcome to Open Source", "SOS Vtiger");
+$esubj_array =  array ("Vtiger Beta Released", "Try vtigercrm!", "Hi There!!!", "Welcome to Open Source", "Help needed in customization of Vtiger");
 $startdate_array =  array ("2006-1-2","2003-3-4","2003-4-5","2001-2-1","2005-8-8");
 $filename_array = array ("vtiger5alpha.tar.gz", "zohowriter.zip", "hi.doc", "welcome.pps", "sos.doc");
+
+$to_array = array("a at a.com","b at b.com", "tester at testvtiger.com","xanth at yaz.com","violet at bing.com");
+$cc_array = array("andrewa at a.com","casterb at b.com", "indomine at variancevtiger.com","becker at nosbest.com","electra at violet.com");
+$bcc_array = array("nathan at nathantests.com","jeff at karl1.com", "isotope at uranium.com","bunny at bugs.com","explosive at dud.com");
+$from_array = array("harvest at zss.com","rain at sunshine.com", "gloom at rainyday.com");
+$body_array = array("This is a good product! Have a go at it! ","Nice to have you visit us, very nice of you. Stay for sometime and have a look at our product. I am sure you will like it", "This will take some time to fix. Can you provide me more details please?","What a cool tool! I wish I had found it earlier. Oh it has a lot of my friends name in it too! I too can contribute. But how?","Urgent. I need this done last week! Guys, you are the ones I am depending on. Do something!");
 
 for($i=0;$i<5;$i++)
 {
@@ -738,11 +744,12 @@
 	$email->column_fields["date_start"] = $startdate_array[$i];
 	$email->column_fields["semodule"] = 'Tasks';
 	$email->column_fields["activitytype"] = 'Emails';
-	
+	$email->column_fields["description"] = $body_array[$i];	
 	$email->save("Emails");
-
 	$email_ids[] = $email->id;
 	
+	$query = "insert into vtiger_emaildetails(emailid,from_email,to_email,cc_email,bcc_email) values (".$email->id.", '".$from_array[$i]."', '".$to_array[$i]."','".$cc_array[$i]."','".$bcc_array[$i] ."')";
+		$res = $adb->query($query);
 }
 
 




From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 09:08:13 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 13:08:13 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231188=3A?=
 =?utf-8?q?_default_email_population_not_proper?=
In-Reply-To: <076.c8af4af2b612afa73930163d3526615a@vtiger.fosslabs.com>
References: <076.c8af4af2b612afa73930163d3526615a@vtiger.fosslabs.com>
Message-ID: <085.15046dc44551a573d15450ab637c86fc@vtiger.fosslabs.com>

#1188: default email population not proper
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  richie
      Type:  defect     |      Status:  closed
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 (In [7187]) Fixes #1188

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1188>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 09:38:32 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 13:38:32 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231314=3A?=
 =?utf-8?q?_Create_a_4=2E2=2E4=2E1_release?=
In-Reply-To: <076.0bb25652495a5800a354264247f65b15@vtiger.fosslabs.com>
References: <076.0bb25652495a5800a354264247f65b15@vtiger.fosslabs.com>
Message-ID: <085.dc069c808dd1334564ee181475ba30e0@vtiger.fosslabs.com>

#1314: Create a 4.2.4.1 release
------------------------+---------------------------------------------------
  Reporter:  allanbush  |       Owner:  developer
      Type:  defect     |      Status:  new      
  Priority:  major      |   Milestone:  4.2.4    
 Component:  vtigercrm  |     Version:  4.2.4rc3 
Resolution:             |    Keywords:           
------------------------+---------------------------------------------------
Comment (by jeffk):

 The full command to try is:
 {{{
  # svn cp -r 6962 \
  (repos)/vtigercrm/branches/4.2.4 \
  (repos)/vtigercrm/branches/4.2.4.1 \
  -m 'refs #1314. resurrect 4.2.4 branch for 4.2.4.1 bugfix release'
 }}}
 subsitute (repos) based on your local or http access method, obviously.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1314>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 09:42:46 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 13:42:46 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23901=3A_?=
 =?utf-8?q?module_and_picklist_mismatch?=
In-Reply-To: <076.4ab5d2daa3e1fd4b360860bc41a84b82@vtiger.fosslabs.com>
References: <076.4ab5d2daa3e1fd4b360860bc41a84b82@vtiger.fosslabs.com>
Message-ID: <085.1d6aa013d50509874cb7cddf22bc0123@vtiger.fosslabs.com>

#901: module and picklist mismatch
------------------------+---------------------------------------------------
  Reporter:  mangai     |       Owner:  mangai
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mangai):

  * owner:  jeri => mangai

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/901>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 09:44:18 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 13:44:18 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23865=3A_?=
 =?utf-8?q?missing_label_and_image?=
In-Reply-To: <076.cbba2af40571aeadb462b203aa78494a@vtiger.fosslabs.com>
References: <076.cbba2af40571aeadb462b203aa78494a@vtiger.fosslabs.com>
Message-ID: <085.04019129b41cdc5d1e0738dc5ec4d8a3@vtiger.fosslabs.com>

#865: missing label and image
------------------------+---------------------------------------------------
  Reporter:  mangai     |       Owner:  mangai
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mangai):

  * owner:  jeri => mangai

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/865>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 10:10:52 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 14:10:52 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231325=3A?=
 =?utf-8?q?_reference_all_clanups_of_vtiger=5F_table_prefix_to_trac_ticket?=
In-Reply-To: <076.dc2b0777399119340aa2cb60903488d4@vtiger.fosslabs.com>
References: <076.dc2b0777399119340aa2cb60903488d4@vtiger.fosslabs.com>
Message-ID: <085.ff8b432780451741ff38e101985bc8ed@vtiger.fosslabs.com>

#1325: reference all clanups of vtiger_ table prefix to trac ticket
------------------------+---------------------------------------------------
  Reporter:  jeffk      |       Owner:  don     
      Type:  defect     |      Status:  new     
  Priority:  major      |   Milestone:  5.0.0   
 Component:  vtigercrm  |     Version:  5.0.0   
Resolution:             |    Keywords:  database
------------------------+---------------------------------------------------
Comment (by jeffk):

 Thanks, Don. More changesets:

  * r7184
  * r7179
  * r7178
  * r7152

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1325>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 10:14:05 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 14:14:05 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7188 - in
 /vtigercrm/trunk/Smarty/templates: ImportStep1.tpl ImportStep2.tpl
 Importerror.tpl
Message-ID: <20060616141405.032C97ED2DA@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 16 08:14:01 2006
New Revision: 7188

Log:
* Modified to display the second level tabs ie., add, search, import and export buttons and passed the parenttab value

Modified:
    vtigercrm/trunk/Smarty/templates/ImportStep1.tpl
    vtigercrm/trunk/Smarty/templates/ImportStep2.tpl
    vtigercrm/trunk/Smarty/templates/Importerror.tpl

Modified: vtigercrm/trunk/Smarty/templates/ImportStep1.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ImportStep1.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ImportStep1.tpl Fri Jun 16 08:14:01 2006
@@ -14,17 +14,7 @@
 <script type="text/javascript" src="modules/{$MODULE}/{$SINGLE_MOD}.js"></script>
 
 <!-- header - level 2 tabs -->
-<br>
-<table class="small" border="0" cellpadding="0" cellspacing="0" width="100%">
-   <tbody>
-   <tr>
-	<td style="height: 2px;"></td>
-   </tr>
-   <tr>
-	<td style="padding-left:10px;padding-right:10px" class="moduleName" nowrap>{$CATEGORY} > <a class="hdrLink" href="index.php?action=ListView&module={$MODULE}">{$MODULE}</a></td>
-   </tr>
-   </tbody>
-</table>
+{include file='Buttons_List1.tpl'}	
 
 <table align="center" border="0" cellpadding="0" cellspacing="0" width="98%" class="small">
    <tbody>
@@ -44,6 +34,7 @@
 				<input type="hidden" name="return_module" value="{$RETURN_MODULE}">
 				<input type="hidden" name="return_id" value="{$RETURN_ID}">
 				<input type="hidden" name="return_action" value="{$RETURN_ACTION}">
+				<input type="hidden" name="parenttab" value="{$CATEGORY}">
 
 				<!-- IMPORT LEADS STARTS HERE  -->
 				<br />

Modified: vtigercrm/trunk/Smarty/templates/ImportStep2.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ImportStep2.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ImportStep2.tpl Fri Jun 16 08:14:01 2006
@@ -32,17 +32,7 @@
 
 </script>
 <!-- header - level 2 tabs -->
-<br>
-<table class="small" border="0" cellpadding="0" cellspacing="0" width="100%">
-   <tbody>
-   <tr>
-	<td style="height: 2px;"></td>
-   </tr>
-   <tr>
-	<td style="padding-left:10px;padding-right:10px" class="moduleName" nowrap>{$CATEGORY} > <a class="hdrLink" href="index.php?action=ListView&module={$MODULE}">{$MODULE}</a></td>
-   </tr>
-   </tbody>
-</table>
+{include file='Buttons_List1.tpl'}	
 
 <table align="center" border="0" cellpadding="0" cellspacing="0" width="98%" class="small">
 <tbody>
@@ -63,6 +53,7 @@
 				<input type="hidden" name="return_module" value="{$RETURN_MODULE}">
 				<input type="hidden" name="return_id" value="{$RETURN_ID}">
 				<input type="hidden" name="return_action" value="{$RETURN_ACTION}">
+				<input type="hidden" name="parenttab" value="{$CATEGORY}">
 
 				<!-- IMPORT LEADS STARTS HERE  -->
 				<br />

Modified: vtigercrm/trunk/Smarty/templates/Importerror.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Importerror.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Importerror.tpl Fri Jun 16 08:14:01 2006
@@ -9,6 +9,9 @@
   *
  ********************************************************************************/
 -->*}
+
+{include file='Buttons_List1.tpl'}	
+
 <table  cellpadding="0" cellspacing="0" width="100%">
    <tr>
 	<td width="75%" valign=top>




From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 10:20:09 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 14:20:09 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=23890=3A_?=
	=?utf-8?q?Email_popup_issue?=
In-Reply-To: <076.af87ee9fab4462c5b5f953df35dd36b6@vtiger.fosslabs.com>
References: <076.af87ee9fab4462c5b5f953df35dd36b6@vtiger.fosslabs.com>
Message-ID: <085.ab748027f3f0f93ce53ea4dab055186d@vtiger.fosslabs.com>

#890: Email popup issue
------------------------+---------------------------------------------------
  Reporter:  mickie     |       Owner:  ela  
      Type:  defect     |      Status:  new  
  Priority:  major      |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by richie):

  * owner:  jeri => ela

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/890>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 10:20:21 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 14:20:21 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231121=3A?=
	=?utf-8?q?_Picklist_UI_is_broken?=
In-Reply-To: <076.aefce13e2b710220e208efde54caf14e@vtiger.fosslabs.com>
References: <076.aefce13e2b710220e208efde54caf14e@vtiger.fosslabs.com>
Message-ID: <085.4ae95296a7c070d6c108d68918c9d6b3@vtiger.fosslabs.com>

#1121: Picklist UI is broken
------------------------+---------------------------------------------------
  Reporter:  mangai     |       Owner:  mangai
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * owner:  jeri => mangai

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1121>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 10:21:41 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 14:21:41 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7189 - in
 /vtigercrm/trunk/modules/Import: ImportStep1.php ImportStep2.php
Message-ID: <20060616142142.10BDC7ED2DA@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 16 08:21:37 2006
New Revision: 7189

Log:
* Modified to set the parent tab from request value

Modified:
    vtigercrm/trunk/modules/Import/ImportStep1.php
    vtigercrm/trunk/modules/Import/ImportStep2.php

Modified: vtigercrm/trunk/modules/Import/ImportStep1.php
==============================================================================
--- vtigercrm/trunk/modules/Import/ImportStep1.php (original)
+++ vtigercrm/trunk/modules/Import/ImportStep1.php Fri Jun 16 08:21:37 2006
@@ -40,8 +40,7 @@
 $smarty->assign("APP", $app_strings);
 $smarty->assign("IMP", $import_mod_strings);
 
-$category = getParenttab();
-$smarty->assign("CATEGORY", $category);
+$smarty->assign("CATEGORY", $_REQUEST['parenttab']);
 
 $import_object_array = Array(
 				"Leads"=>"ImportLead",

Modified: vtigercrm/trunk/modules/Import/ImportStep2.php
==============================================================================
--- vtigercrm/trunk/modules/Import/ImportStep2.php (original)
+++ vtigercrm/trunk/modules/Import/ImportStep2.php Fri Jun 16 08:21:37 2006
@@ -341,10 +341,8 @@
 }
 
 $smarty->assign("MODULE", $_REQUEST['module']);
-
-$category = getParenttab();
-$smarty->assign('CATEGORY' , $category);
-
+$smarty->assign('CATEGORY' , $_REQUEST['parenttab']);
+@$_SESSION['import_parenttab'] = $_REQUEST['parenttab'];
 $smarty->assign("JAVASCRIPT2", get_readonly_js() );
 
 $smarty->display('ImportStep2.tpl');
@@ -355,7 +353,7 @@
 {
 	var tagName;
 	var count = 0;
-	var vtiger_field_count = "<?php echo $field_count; ?>";
+	var field_count = "<?php echo $field_count; ?>";
 	var required_fields = new Array();
 	var required_fields_name = new Array();
 	var seq_string = '';




From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 10:22:26 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 14:22:26 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231224=3A?=
 =?utf-8?q?_LHS_Settings_panel_missing_for_=22Migrate_From_Previous_Versio?=
 =?utf-8?q?n=3A_page?=
In-Reply-To: <076.7d8220c17518a7cddc64da5e5a35272f@vtiger.fosslabs.com>
References: <076.7d8220c17518a7cddc64da5e5a35272f@vtiger.fosslabs.com>
Message-ID: <085.dd2389926e03423982e0be924ba5d3c8@vtiger.fosslabs.com>

#1224: LHS Settings panel missing for "Migrate From Previous Version: page
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  ela  
      Type:  defect     |      Status:  new  
  Priority:  major      |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by richie):

  * owner:  jerrydgeorge => ela

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1224>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 10:27:25 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 14:27:25 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7190 - in
 /vtigercrm/trunk/modules/Potentials: Charts.php Opportunity.php
Message-ID: <20060616142725.099477E89E6@vtiger.fosslabs.com>

Author: don
Date: Fri Jun 16 08:27:21 2006
New Revision: 7190

Log:
Fixed issues in vtiger_ prefixing in table names

Modified:
    vtigercrm/trunk/modules/Potentials/Charts.php
    vtigercrm/trunk/modules/Potentials/Opportunity.php

Modified: vtigercrm/trunk/modules/Potentials/Charts.php
==============================================================================
--- vtigercrm/trunk/modules/Potentials/Charts.php (original)
+++ vtigercrm/trunk/modules/Potentials/Charts.php Fri Jun 16 08:27:21 2006
@@ -345,7 +345,7 @@
 		}
 		else {
 			$imgMap_fp = fopen($cache_file_name.'.map', "rb");
-			$imgMap = fread($imgMap_fp, vtiger_filesize($cache_file_name.'.map'));
+			$imgMap = fread($imgMap_fp, filesize($cache_file_name.'.map'));
 			fclose($imgMap_fp);
 		}
 		$fileModTime = filemtime($cache_file_name.'.map');
@@ -680,7 +680,7 @@
 		}
 		else {
 			$imgMap_fp = fopen($cache_file_name.'.map', "rb");
-			$imgMap = fread($imgMap_fp, vtiger_filesize($cache_file_name.'.map'));
+			$imgMap = fread($imgMap_fp, filesize($cache_file_name.'.map'));
 			fclose($imgMap_fp);
 		}
 		$fileModTime = filemtime($cache_file_name.'.map');
@@ -1001,7 +1001,7 @@
 		}
 		else {
 			$imgMap_fp = fopen($cache_file_name.'.map', "rb");
-			$imgMap = fread($imgMap_fp, vtiger_filesize($cache_file_name.'.map'));
+			$imgMap = fread($imgMap_fp, filesize($cache_file_name.'.map'));
 			fclose($imgMap_fp);
 		}
 		$fileModTime = filemtime($cache_file_name.'.map');
@@ -1229,7 +1229,7 @@
 		}
 		else {
 			$imgMap_fp = fopen($cache_file_name.'.map', "rb");
-			$imgMap = fread($imgMap_fp, vtiger_filesize($cache_file_name.'.map'));
+			$imgMap = fread($imgMap_fp, filesize($cache_file_name.'.map'));
 			fclose($imgMap_fp);
 		}
 		$fileModTime = filemtime($cache_file_name.'.map');

Modified: vtigercrm/trunk/modules/Potentials/Opportunity.php
==============================================================================
--- vtigercrm/trunk/modules/Potentials/Opportunity.php (original)
+++ vtigercrm/trunk/modules/Potentials/Opportunity.php Fri Jun 16 08:27:21 2006
@@ -37,9 +37,9 @@
 	var $db;
 
 	var $module_name="Potentials";
-	var $table_name = "potential";
-	var $rel_product_table = "seproductsrel";
-	var $rel_opportunity_table = "contpotentialrel";
+	var $table_name = "vtiger_potential";
+	var $rel_product_table = "vtiger_seproductsrel";
+	var $rel_opportunity_table = "vtiger_contpotentialrel";
 	var $module_id = "potentialid";
 	var $object_name = "potential";
 
@@ -171,7 +171,7 @@
 		{
 			$query = $this->constructCustomQueryAddendum('potentialscf','Potentials') ."
 			vtiger_potential.*,
-			vtiger_account.accountname vtiger_account_name,
+			vtiger_account.accountname account_name,
 			vtiger_users.user_name assigned_user_name
 					FROM vtiger_potential
 					INNER JOIN vtiger_crmentity
@@ -216,7 +216,7 @@
 		if(isPermitted("Contacts",3,"") == 'yes')
 		{
 
-			$button .= '<input title="Change" accessKey="" vtiger_tabindex="2" type="button" class="button" value="'.$app_strings['LBL_SELECT_CONTACT_BUTTON_LABEL'].'" name="Button" LANGUAGE=javascript onclick=\'return window.open("index.php?module=Contacts&action=Popup&return_module=Potentials&popuptype=detailview&form=EditView&form_submit=false&recordid='.$_REQUEST["record"].'","test","width=600,height=400,resizable=1,scrollbars=1");\'>&nbsp;';
+			$button .= '<input title="Change" accessKey="" tabindex="2" type="button" class="button" value="'.$app_strings['LBL_SELECT_CONTACT_BUTTON_LABEL'].'" name="Button" LANGUAGE=javascript onclick=\'return window.open("index.php?module=Contacts&action=Popup&return_module=Potentials&popuptype=detailview&form=EditView&form_submit=false&recordid='.$_REQUEST["record"].'","test","width=600,height=400,resizable=1,scrollbars=1");\'>&nbsp;';
 		}
 		$returnset = '&return_module=Potentials&return_action=DetailView&return_id='.$id;
 
@@ -275,7 +275,7 @@
 		}
 		if(isPermitted("Products",3,"") == 'yes')
 		{
-			$button .= '<input title="Change" accessKey="" vtiger_tabindex="2" type="button" class="button" value="'.$app_strings['LBL_SELECT_PRODUCT_BUTTON_LABEL'].'" name="Button" LANGUAGE=javascript onclick=\'return window.open("index.php?module=Products&action=Popup&return_module=Potentials&popuptype=detailview&form=EditView&form_submit=false&recordid='.$_REQUEST["record"].'","test","width=600,height=400,resizable=1,scrollbars=1");\'>&nbsp;';
+			$button .= '<input title="Change" accessKey="" tabindex="2" type="button" class="button" value="'.$app_strings['LBL_SELECT_PRODUCT_BUTTON_LABEL'].'" name="Button" LANGUAGE=javascript onclick=\'return window.open("index.php?module=Products&action=Popup&return_module=Potentials&popuptype=detailview&form=EditView&form_submit=false&recordid='.$_REQUEST["record"].'","test","width=600,height=400,resizable=1,scrollbars=1");\'>&nbsp;';
 		}
 		$returnset = '&return_module=Potentials&return_action=DetailView&return_id='.$id;
 




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 10:33:54 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 14:33:54 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7191 -
	/vtigercrm/trunk/modules/Potentials/Opportunity.php
Message-ID: <20060616143354.0A04B7ED342@vtiger.fosslabs.com>

Author: don
Date: Fri Jun 16 08:33:50 2006
New Revision: 7191

Log:
Fixed issues in vtiger_ prefixing in table names

Modified:
    vtigercrm/trunk/modules/Potentials/Opportunity.php

Modified: vtigercrm/trunk/modules/Potentials/Opportunity.php
==============================================================================
--- vtigercrm/trunk/modules/Potentials/Opportunity.php (original)
+++ vtigercrm/trunk/modules/Potentials/Opportunity.php Fri Jun 16 08:33:50 2006
@@ -249,7 +249,7 @@
 		}
 		$returnset = '&return_module=Potentials&return_action=DetailView&return_id='.$id;
 
-		$query = "SELECT vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name, vtiger_recurringevents.recurringtype, vtiger_contactdetails.contactid, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid inner join vtiger_potential on vtiger_potential.potentialid=vtiger_seactivityrel.crmid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid= vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid where vtiger_seactivityrel.crmid=".$id." and (activitytype='Task' or vtiger_activitytype='Call' or vtiger_activitytype='Meeting') and vtiger_crmentity.deleted=0 and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Completed') and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Deferred') or (vtiger_activity.eventstatus != '' &&  vtiger_activity.eventstatus != 'Held')";
+		$query = "SELECT vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name, vtiger_recurringevents.recurringtype, vtiger_contactdetails.contactid, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid inner join vtiger_potential on vtiger_potential.potentialid=vtiger_seactivityrel.crmid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid= vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid where vtiger_seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting') and vtiger_crmentity.deleted=0 and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Completed') and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Deferred') or (vtiger_activity.eventstatus != '' &&  vtiger_activity.eventstatus != 'Held')";
 		$log->debug("Exiting get_activities method ...");
 		return GetRelatedList('Potentials','Activities',$focus,$query,$button,$returnset);
 




From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 10:34:13 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 14:34:13 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231289=3A?=
 =?utf-8?q?_Edit/Del_links_are_must_in_relatedlists?=
In-Reply-To: <076.c2484dcccdec49e5b30c79bee458fec5@vtiger.fosslabs.com>
References: <076.c2484dcccdec49e5b30c79bee458fec5@vtiger.fosslabs.com>
Message-ID: <085.ebe7604e16638613f5d28191f34c8688@vtiger.fosslabs.com>

#1289: Edit/Del links are must in relatedlists
------------------------+---------------------------------------------------
  Reporter:  mickie     |       Owner:  mickie
      Type:  task       |      Status:  closed
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  duplicate  |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mickie):

  * resolution:  => duplicate
  * status:  new => closed

Comment:

 This is already posted in ticket 1245

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1289>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 10:35:15 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 14:35:15 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231267=3A?=
 =?utf-8?q?_Reports_for_Management?=
In-Reply-To: <076.7d4de1023a5c8c54e4e4d481bd7635f2@vtiger.fosslabs.com>
References: <076.7d4de1023a5c8c54e4e4d481bd7635f2@vtiger.fosslabs.com>
Message-ID: <085.c60971a03995bcdd5fc52b81726b36b9@vtiger.fosslabs.com>

#1267: Reports for Management
--------------------------+-------------------------------------------------
  Reporter:  anonymous    |       Owner:  developer
      Type:  enhancement  |      Status:  closed   
  Priority:  major        |   Milestone:           
 Component:  vtigercrm    |     Version:  5.0.0    
Resolution:  fixed        |    Keywords:           
--------------------------+-------------------------------------------------
Changes (by richie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 This will be addressed by the Security Audit feature in a way.
 Though I do concede that it is more a deductive methodology but it will do
 the job.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1267>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 10:43:37 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 14:43:37 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231170=3A?=
 =?utf-8?q?_PO_related_to_SO_does_not_have_assigned_to_value?=
In-Reply-To: <076.846167eef3e3ff8046106f91876e5bb5@vtiger.fosslabs.com>
References: <076.846167eef3e3ff8046106f91876e5bb5@vtiger.fosslabs.com>
Message-ID: <085.5e77587d583618952b3752a7c6d481ab@vtiger.fosslabs.com>

#1170: PO related to SO does not have assigned to value
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  mickie
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  invalid    |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mickie):

  * resolution:  => invalid
  * status:  new => closed

Comment:

 PO and SO does not have relationship.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1170>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 11:08:22 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 15:08:22 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7192 -
	/vtigercrm/trunk/modules/Quotes/Quote.php
Message-ID: <20060616150822.983E07ED350@vtiger.fosslabs.com>

Author: don
Date: Fri Jun 16 09:08:18 2006
New Revision: 7192

Log:
Fixed issues in vtiger_ prefixing in table names

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 Jun 16 09:08:18 2006
@@ -37,9 +37,9 @@
 	var $tab_name = Array('vtiger_crmentity','vtiger_quotes','vtiger_quotesbillads','vtiger_quotesshipads','vtiger_quotescf');
 	var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_quotes'=>'quoteid','vtiger_quotesbillads'=>'quotebilladdressid','vtiger_quotesshipads'=>'quoteshipaddressid','vtiger_quotescf'=>'quoteid');
 	
-	var $entity_table = "crmentity";
+	var $entity_table = "vtiger_crmentity";
 	
-	var $billadr_table = "quotesbillads";
+	var $billadr_table = "vtiger_quotesbillads";
 
 	var $object_name = "Quote";
 
@@ -157,7 +157,7 @@
 
 		$returnset = '&return_module=Quotes&return_action=DetailView&return_id='.$id;
 
-		$query = "SELECT vtiger_contactdetails.contactid, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name,vtiger_recurringevents.recurringtype from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and (activitytype='Task' or vtiger_activitytype='Call' or vtiger_activitytype='Meeting') and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Completed') and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Deferred') or (vtiger_activity.eventstatus !='' && vtiger_activity.eventstatus = 'Planned')";
+		$query = "SELECT vtiger_contactdetails.contactid, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name,vtiger_recurringevents.recurringtype from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting') and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Completed') and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Deferred') or (vtiger_activity.eventstatus !='' && vtiger_activity.eventstatus = 'Planned')";
 		$log->debug("Exiting get_activities method ...");
 		return GetRelatedList('Quotes','Activities',$focus,$query,$button,$returnset);
 	}




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 11:15:36 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 15:15:36 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7193 -
	/vtigercrm/trunk/modules/Import/ImportSteplast.php
Message-ID: <20060616151536.0194B7ED342@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 16 09:15:32 2006
New Revision: 7193

Log:
* Added code to display the add, search, import, export, etc., buttons

Modified:
    vtigercrm/trunk/modules/Import/ImportSteplast.php

Modified: vtigercrm/trunk/modules/Import/ImportSteplast.php
==============================================================================
--- vtigercrm/trunk/modules/Import/ImportSteplast.php (original)
+++ vtigercrm/trunk/modules/Import/ImportSteplast.php Fri Jun 16 09:15:32 2006
@@ -33,31 +33,49 @@
 global $app_list_strings;
 global $app_strings;
 global $current_user;
+
+if (! isset( $_REQUEST['module']))
+{
+	$_REQUEST['module'] = 'Home';
+}
+
+if (! isset( $_REQUEST['return_id']))
+{
+	$_REQUEST['return_id'] = '';
+}
+if (! isset( $_REQUEST['return_module']))
+{
+	$_REQUEST['return_module'] = '';
+}
+
+if (! isset( $_REQUEST['return_action']))
+{
+	$_REQUEST['return_action'] = '';
+}
+
 global $theme;
-if (! isset( $_REQUEST['module']))
-{
-	$_REQUEST['module'] = 'Home';
-}
-
-if (! isset( $_REQUEST['return_id']))
-{
-	$_REQUEST['return_id'] = '';
-}
-if (! isset( $_REQUEST['return_module']))
-{
-	$_REQUEST['return_module'] = '';
-}
-
-if (! isset( $_REQUEST['return_action']))
-{
-	$_REQUEST['return_action'] = '';
-}
-
 $theme_path="themes/".$theme."/";
 $image_path=$theme_path."images/";
 require_once($theme_path.'layout_utils.php');
 
 $log->info("Import Step last");
+
+//This Buttons_List1.tpl is is called to display the add, search, import and export buttons ie., second level tabs
+$smarty = new vtigerCRM_Smarty;
+
+$smarty->assign("MOD", $mod_strings);
+$smarty->assign("APP", $app_strings);
+$smarty->assign("IMP", $import_mod_strings);
+$smarty->assign("THEME", $theme);
+$smarty->assign("IMAGE_PATH", $image_path);
+
+$smarty->assign("MODULE", $_REQUEST['modulename']);
+$smarty->assign("SINGLE_MOD", $_REQUEST['modulename']);
+$smarty->assign("CATEGORY", $_SESSION['import_parenttab']);
+//@session_unregister("import_parenttab");
+
+$smarty->display("Buttons_List1.tpl");
+
 
 if ( isset($_REQUEST['message']))
 {




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 11:17:18 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 15:17:18 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7194 -
	/vtigercrm/branches/4.2.4.1/
Message-ID: <20060616151718.C5DD97ED352@vtiger.fosslabs.com>

Author: jeffk
Date: Fri Jun 16 09:17:16 2006
New Revision: 7194

Log:
refs #1314. resurrect 4.2.4 branch for 4.2.4.1 bugfix release

Added:
    vtigercrm/branches/4.2.4.1/
      - copied from r6962, vtigercrm/branches/4.2.4/




From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 11:17:18 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 15:17:18 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231314=3A?=
 =?utf-8?q?_Create_a_4=2E2=2E4=2E1_release?=
In-Reply-To: <076.0bb25652495a5800a354264247f65b15@vtiger.fosslabs.com>
References: <076.0bb25652495a5800a354264247f65b15@vtiger.fosslabs.com>
Message-ID: <085.4cd75637eb0b92c4a9158f37502fc6c7@vtiger.fosslabs.com>

#1314: Create a 4.2.4.1 release
------------------------+---------------------------------------------------
  Reporter:  allanbush  |       Owner:  developer
      Type:  defect     |      Status:  new      
  Priority:  major      |   Milestone:  4.2.4    
 Component:  vtigercrm  |     Version:  4.2.4rc3 
Resolution:             |    Keywords:           
------------------------+---------------------------------------------------
Comment (by jeffk):

 (In [7194]) refs #1314. resurrect 4.2.4 branch for 4.2.4.1 bugfix release

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1314>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 11:18:32 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 15:18:32 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7195 -
	/vtigercrm/trunk/modules/Import/ImportSave.php
Message-ID: <20060616151833.149A37ED356@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 16 09:18:29 2006
New Revision: 7195

Log:
Passed the parent tab value to highlight the parent tab name

Modified:
    vtigercrm/trunk/modules/Import/ImportSave.php

Modified: vtigercrm/trunk/modules/Import/ImportSave.php
==============================================================================
--- vtigercrm/trunk/modules/Import/ImportSave.php (original)
+++ vtigercrm/trunk/modules/Import/ImportSave.php Fri Jun 16 09:18:29 2006
@@ -212,7 +212,7 @@
 setTimeout("b()",1000);
 function b()
 {
-        document.location.href="index.php?action=<?php echo $action?>&module=<?php echo $module?>&modulename=<?php echo $modulename?>&startval=<?php echo $end?>&recordcount=<?php echo $RECORDCOUNT?>&noofrows=<?php echo $totalnoofrows?>&message=<?php echo $message?>&skipped_record_count=<?php echo $skip_required_count?>";
+	document.location.href="index.php?action=<?php echo $action?>&module=<?php echo $module?>&modulename=<?php echo $modulename?>&startval=<?php echo $end?>&recordcount=<?php echo $RECORDCOUNT?>&noofrows=<?php echo $totalnoofrows?>&message=<?php echo $message?>&skipped_record_count=<?php echo $skip_required_count?>&parenttab=<?php echo $_SESSION['import_parenttab']?>";
 }
 </script>
 




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 11:19:43 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 15:19:43 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7196 -
	/vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl
Message-ID: <20060616151943.C5A867ED342@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 16 09:19:40 2006
New Revision: 7196

Log:
* Modified the step value for Import

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

Modified: vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl Fri Jun 16 09:19:40 2006
@@ -81,7 +81,7 @@
 			<tr>
 			{if $MODULE eq 'Contacts' || $MODULE eq 'Leads' || $MODULE eq 'Accounts' || $MODULE eq 'Potentials' || $MODULE eq 'Products' }
 		   		{if $CHECK.Import eq 'yes'}	
-					<td style="padding-right:0px;padding-left:10px;"><a href="index.php?module={$MODULE}&action=Import&step=2&return_module={$MODULE}&return_action=index&parenttab={$CATEGORY}"><img src="{$IMAGE_PATH}tbarImport.gif" alt="{$APP.LBL_IMPORT} {$APP.$MODULE}" title="{$APP.LBL_IMPORT} {$APP.$MODULE}" border="0"></a></td>	
+					<td style="padding-right:0px;padding-left:10px;"><a href="index.php?module={$MODULE}&action=Import&step=1&return_module={$MODULE}&return_action=index&parenttab={$CATEGORY}"><img src="{$IMAGE_PATH}tbarImport.gif" alt="{$APP.LBL_IMPORT} {$APP.$MODULE}" title="{$APP.LBL_IMPORT} {$APP.$MODULE}" border="0"></a></td>	
 				{else}	
 					<td style="padding-right:0px;padding-left:10px;"><img src="{$IMAGE_PATH}tbarImport-Faded.gif" alt="{$APP.LBL_IMPORT} {$APP.$MODULE}" title="{$APP.LBL_IMPORT} {$APP.$MODULE}" border="0"></td>	
 				{/if}	




From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 11:20:36 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 15:20:36 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231181=3A?=
 =?utf-8?q?_header_buttons_missing_from_Import_Products_screen?=
In-Reply-To: <076.4f57062275dd6f6a01adeebb79425762@vtiger.fosslabs.com>
References: <076.4f57062275dd6f6a01adeebb79425762@vtiger.fosslabs.com>
Message-ID: <085.8475f137d7a9c48ec4799bc934a21b82@vtiger.fosslabs.com>

#1181: header buttons missing from Import Products screen
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  mickie
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mickie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 This issue has been fixed.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1181>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 11:21:28 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 15:21:28 -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.7206c1d450847ef744129a5021ac4809@vtiger.fosslabs.com>

#723: Parent tab not highlighted
------------------------+---------------------------------------------------
  Reporter:  saraj      |       Owner:  mickie    
      Type:  defect     |      Status:  closed    
  Priority:  major      |   Milestone:  5.0.0     
 Component:  vtigercrm  |     Version:  5.0.0     
Resolution:  fixed      |    Keywords:  Parent tab
------------------------+---------------------------------------------------
Changes (by mickie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 This issue is fixed and now in the step3 the parent tab will be
 highlighted and the module name list will be displayed.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/723>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 11:22:11 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 15:22:11 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23169=3A_?=
 =?utf-8?q?missing_parent_tab_in_import_steps?=
In-Reply-To: <076.fa0e7db7145b84cd9df79a70a28c175a@vtiger.fosslabs.com>
References: <076.fa0e7db7145b84cd9df79a70a28c175a@vtiger.fosslabs.com>
Message-ID: <085.9556bfac4e2d7ee2d4863604e2223c23@vtiger.fosslabs.com>

#169: missing parent tab in import steps
---------------------------+------------------------------------------------
  Reporter:  jerrydgeorge  |       Owner:  mickie
      Type:  defect        |      Status:  closed
  Priority:  minor         |   Milestone:  5.0.0 
 Component:  vtigercrm     |     Version:  5.0.0 
Resolution:  fixed         |    Keywords:  import
---------------------------+------------------------------------------------
Changes (by mickie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 This issue has been fixed and now when we do import the parent tab and the
 module name will be selected.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/169>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 12:01:03 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 16:01:03 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7197 -
	/vtigercrm/trunk/modules/CustomView/CustomView.php
Message-ID: <20060616160103.891147ED35C@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 16 10:00:56 2006
New Revision: 7197

Log:
changes made to display status

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 Fri Jun 16 10:00:56 2006
@@ -678,7 +678,7 @@
 					{
 						if($list[1] == "status")
 						{
-							$sqllist_column = "case when (vtiger_activity.status not like '') then vtiger_activity.status else vtiger_activity.eventstatus end as vtiger_activitystatus";
+							$sqllist_column = "case when (vtiger_activity.status not like '') then vtiger_activity.status else vtiger_activity.eventstatus end as activitystatus";
 						}
 					}
 					$sqllist[] = $sqllist_column;




From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 12:39:26 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 16:39:26 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231331=3A?=
 =?utf-8?q?_rename_PearDatabase_to_signify_adodb_wrapper=2C_update_source?=
Message-ID: <076.b5a070e4cc46d3aaf4b69d4eea42547e@vtiger.fosslabs.com>

#1331: rename PearDatabase to signify adodb wrapper, update source
---------------------------------+------------------------------------------
 Reporter:  jeffk                |       Owner:  developer
     Type:  defect               |      Status:  new      
 Priority:  major                |   Milestone:  5.0.0    
Component:  vtigercrm            |     Version:  5.0.0    
 Keywords:  database adodb pear  |  
---------------------------------+------------------------------------------
 To clarify the primacy of adodb in the vtigercrm codebase, rename the
 PearDatabase file and class to something that properly indicates its adodb
 wrapper function.

 I'll leave suggested names up to someone who knows more about
 PearDatabase's function and origin.

 Please include 'refs #1331' in checkin messages, and 'closes #1331' when
 finished.
 {{{
 (in vtigercrm/trunk working copy)
 $ grep -R PearDatabase --exclude=*.svn* *
 Popup.php:require_once('include/database/PearDatabase.php');
 SendReminder.php:require_once("include/database/PearDatabase.php");
 data/Tracker.php:require_once('include/database/PearDatabase.php');
 data/Tracker.php:       //$this->db = new PearDatabase();
 data/SugarBean.php:require_once('include/database/PearDatabase.php');
 database/DatabaseConnection.php:                $log1->info("PearDatabase
 ->".$msg);
 include/database/.svn/entries:   name="PearDatabase.php"
 include/database/PearDatabase.php:class PearDatabase{
 include/database/PearDatabase.php:
 $log1->info("PearDatabase ->".$msg);
 include/database/PearDatabase.php:      function PearDatabase(){
 include/database/PearDatabase.php:
 //$this->println("PearDatabase");
 include/database/PearDatabase.php:                      $this->log =&
 LoggerManager::getLogger('PearDatabase_'. $currentModule);
 include/database/PearDatabase.php:      function
 PearDatabase($dbtype='',$host='',$dbname='',$username='',$passwd=''){
 include/database/PearDatabase.php:
 //$this->println("PearDatabase");
 include/database/PearDatabase.php:                      $this->log =&
 LoggerManager::getLogger('PearDatabase_'. $currentModule);
 include/database/PearDatabase.php:$adb = new PearDatabase();
 include/RelatedListView.php:
 require_once('include/database/PearDatabase.php');
 include/utils/ListViewUtils.php:require_once('include/database/PearDatabase.php');
 include/utils/DetailViewUtils.php:require_once('include/database/PearDatabase.php');
 include/utils/SearchUtils.php:require_once('include/database/PearDatabase.php');
 include/utils/UserInfoUtil.php:require_once('include/database/PearDatabase.php');
 include/utils/EditViewUtils.php:require_once('include/database/PearDatabase.php');
 include/utils/export.php:require_once('include/database/PearDatabase.php');
 include/utils/export.php:       $db = new PearDatabase();
 include/utils/CommonUtils.php:
 require_once('include/database/PearDatabase.php');
 include/utils/utils.php:
 require_once('include/database/PearDatabase.php');
 include/utils/utils.php:
 require_once('include/database/PearDatabase.php');
 include/utils/utils.php:                $db = new PearDatabase();
 include/ComboUtil.php:require_once('include/database/PearDatabase.php');
 include/PopulateComboValues.php:require_once('include/database/PearDatabase.php');
 include/CustomFieldUtil.php:require_once('include/database/PearDatabase.php');
 include/db_backup/backup.php:require_once("include/database/PearDatabase.php");
 install/5createTables.inc.php:require_once('include/database/PearDatabase.php');
 install/5createTables.inc.php:$db = new PearDatabase();
 install/populateSeedData.php:require_once('include/database/PearDatabase.php');
 install/populateSeedData.php: $db = new PearDatabase();
 modules/Faq/DetailView.php:require_once('include/database/PearDatabase.php');
 modules/Faq/ListView.php:require_once('include/database/PearDatabase.php');
 modules/Faq/DetailViewAjax.php:require_once('include/database/PearDatabase.php');
 modules/Faq/Faq.php:require_once('include/database/PearDatabase.php');
 modules/Faq/Faq.php:            $this->db = new PearDatabase();
 modules/Faq/Save.php:require_once('include/database/PearDatabase.php');
 modules/Rss/Star.php:require_once('include/database/PearDatabase.php');
 modules/Rss/Rss.php:require_once('include/database/PearDatabase.php');
 modules/Home/UnifiedSearch.php:require_once('include/database/PearDatabase.php');
 modules/Home/home_rss.php:require_once('include/database/PearDatabase.php');
 modules/Home/home_rss.php:$db = new PearDatabase();
 modules/Home/index.php:require_once('include/database/PearDatabase.php');
 modules/Vendors/updateRelations.php:require_once('include/database/PearDatabase.php');
 modules/Vendors/Vendor.php:require_once('include/database/PearDatabase.php');
 modules/Vendors/Vendor.php:             $this->db = new PearDatabase();
 modules/Vendors/DetailView.php:require_once('include/database/PearDatabase.php');
 modules/Vendors/EditView.php:require_once('include/database/PearDatabase.php');
 modules/Vendors/ListView.php:require_once('include/database/PearDatabase.php');
 modules/Vendors/DetailViewAjax.php:require_once('include/database/PearDatabase.php');
 modules/Vendors/Save.php:require_once('include/database/PearDatabase.php');
 modules/CustomView/PopulateCustomView.php:require_once('include/database/PearDatabase.php');
 modules/CustomView/Forms.php:
 require_once('include/database/PearDatabase.php');
 modules/CustomView/Forms.php:
 require_once("include/database/PearDatabase.php");
 modules/CustomView/CustomView.php:require_once('include/database/PearDatabase.php');
 modules/CustomView/SaveAction.php:require_once('include/database/PearDatabase.php');
 modules/CustomView/SendMailAction.php:require_once('include/database/PearDatabase.php');
 modules/CustomView/Delete.php:require_once('include/database/PearDatabase.php');
 modules/CustomView/Save.php:require_once('include/database/PearDatabase.php');
 modules/Emails/updateRelations.php:require_once('include/database/PearDatabase.php');
 modules/Emails/DetailView.php:require_once('include/database/PearDatabase.php');
 modules/Emails/Choose.php:require_once('include/database/PearDatabase.php');
 modules/Emails/sendmail.php:require_once('include/database/PearDatabase.php');
 modules/Emails/EmailsAjax.php:require_once('include/database/PearDatabase.php');
 modules/Emails/mailSelect.php:require_once('include/database/PearDatabase.php');
 modules/Emails/Save.php:require_once('include/database/PearDatabase.php');
 modules/Emails/Email.php:require_once('include/database/PearDatabase.php');
 modules/Emails/Email.php:               $this->db = new PearDatabase();
 modules/Migration/MigrationCheck.php:           $conn = new
 PearDatabase("mysql",$new_host_name,$new_dbname,$new_mysql_username,$new_mysql_password);
 modules/Migration/MigrationCheck.php:           $conn = new
 PearDatabase("mysql",$new_host_name,$new_dbname,$new_mysql_username,$new_mysql_password);
 modules/Migration/MigrationCheck.php:           $conn = new
 PearDatabase("mysql",$old_host_name.":".$old_mysql_port,$old_dbname,$old_mysql_username,$old_mysql_password);
 modules/Migration/updateCurrency.php:require_once("include/database/PearDatabase.php");
 modules/Migration/updateCurrency.php:$conn = new PearDatabase();
 modules/Accounts/Merge.php:require_once('include/database/PearDatabase.php');
 modules/Accounts/DetailView.php:require_once('include/database/PearDatabase.php');
 modules/Accounts/ListView.php:require_once('include/database/PearDatabase.php');
 modules/Accounts/DetailViewAjax.php:require_once('include/database/PearDatabase.php');
 modules/Accounts/Account.php:require_once('include/database/PearDatabase.php');
 modules/Accounts/Account.php:           $this->db = new PearDatabase();
 modules/Accounts/Save.php:require_once('include/database/PearDatabase.php');
 modules/Leads/Merge.php:require_once('include/database/PearDatabase.php');
 modules/Leads/ConvertLead.php:require_once('include/database/PearDatabase.php');
 modules/Leads/DetailView.php:require_once('include/database/PearDatabase.php');
 modules/Leads/EditView.php:require_once('include/database/PearDatabase.php');
 modules/Leads/ListView.php:require_once('include/database/PearDatabase.php');
 modules/Leads/DetailViewAjax.php:require_once('include/database/PearDatabase.php');
 modules/Leads/result.php:require_once('include/database/PearDatabase.php');
 modules/Leads/Save.php:require_once('include/database/PearDatabase.php');
 modules/Leads/LeadConvertToEntities.php:require_once('include/database/PearDatabase.php');
 modules/Leads/Lead.php:require_once('include/database/PearDatabase.php');
 modules/Leads/Lead.php:         $this->db = new PearDatabase();
 modules/Notes/DetailViewAjax.php:require_once('include/database/PearDatabase.php');
 modules/Notes/Note.php:require_once('include/database/PearDatabase.php');
 modules/Notes/Note.php:         $this->db = new PearDatabase();
 modules/Calendar/disable_sharing.php:require_once('include/database/PearDatabase.php');
 modules/Calendar/updateCalendarSharing.php:require_once('include/database/PearDatabase.php');
 modules/Calendar/calendar_share.php:require_once('include/database/PearDatabase.php');
 modules/Calendar/Appointment.php:require_once('include/database/PearDatabase.php');
 modules/Calendar/TodoSave.php:require_once('include/database/PearDatabase.php');
 modules/Calendar/calendarLayout.php:require_once('include/database/PearDatabase.php');
 modules/Calendar/CalendarCommon.php:require_once('include/database/PearDatabase.php');
 modules/Import/ImportAccount.php:require_once('include/database/PearDatabase.php');
 modules/Import/ImportAccount.php:               $this->db = new
 PearDatabase();
 modules/Import/ImportLead.php:require_once('include/database/PearDatabase.php');
 modules/Import/ImportLead.php:          $this->db = new PearDatabase();
 modules/Import/ImportStep2.php:require_once('include/database/PearDatabase.php');
 modules/Import/ImportStep3.php:require_once('include/database/PearDatabase.php');
 modules/Import/Forms.php:
 require_once('include/database/PearDatabase.php');
 modules/Import/Forms.php:
 require_once("include/database/PearDatabase.php");
 modules/Import/UsersLastImport.php:require_once('include/database/PearDatabase.php');
 modules/Import/UsersLastImport.php:             $this->db = new
 PearDatabase();
 modules/Import/ImportMap.php:require_once('include/database/PearDatabase.php');
 modules/Import/ImportMap.php:           $this->db = new PearDatabase();
 modules/Import/ImportOpportunity.php:require_once('include/database/PearDatabase.php');
 modules/Import/ImportOpportunity.php:           $this->db = new
 PearDatabase();
 modules/Import/ImportContact.php:require_once('include/database/PearDatabase.php');
 modules/Import/ImportContact.php:               $this->db = new
 PearDatabase();
 modules/Import/ImportProduct.php:require_once('include/database/PearDatabase.php');
 modules/Import/ImportProduct.php:               $this->db = new
 PearDatabase();
 modules/Users/UpdateProfileChanges.php:require_once('include/database/PearDatabase.php');
 modules/Users/SaveSharingRule.php:require_once('include/database/PearDatabase.php');
 modules/Users/savetermsandconditions.php:require_once('include/database/PearDatabase.php');
 modules/Users/add2db.php:require_once('include/database/PearDatabase.php');
 modules/Users/RoleDeleteStep1.php:require_once('include/database/PearDatabase.php');
 modules/Users/listwordtemplates.php:require_once('include/database/PearDatabase.php');
 modules/Users/CreateProfile.php:require_once('include/database/PearDatabase.php');
 modules/Users/listemailtemplates.php:require_once('include/database/PearDatabase.php');
 modules/Users/UpdateTab.php:require_once('include/database/PearDatabase.php');
 modules/Users/DefaultDataPopulator.php:require_once('include/database/PearDatabase.php');
 modules/Users/DefaultDataPopulator.php:         $this->db = new
 PearDatabase();
 modules/Users/binaryfilelist.php:require_once('include/database/PearDatabase.php');
 modules/Users/listgroups.php:require_once('include/database/PearDatabase.php');
 modules/Users/lookupemailtemplates.php:require_once('include/database/PearDatabase.php');
 modules/Users/EditDefOrgFieldLevelAccess.php:require_once('include/database/PearDatabase.php');
 modules/Users/updateLeadDBStatus.php:require_once('include/database/PearDatabase.php');
 modules/Users/DetailView.php:require_once('include/database/PearDatabase.php');
 modules/Users/DefaultFieldPermissions.php:require_once('include/database/PearDatabase.php');
 modules/Users/UpdateDefaultFieldLevelAccess.php:require_once('include/database/PearDatabase.php');
 modules/Users/EditView.php:require_once('include/database/PearDatabase.php');
 modules/Users/populatetemplate.php:require_once('include/database/PearDatabase.php');
 modules/Users/CreateProfile1.php:require_once('include/database/PearDatabase.php');
 modules/Users/createemailtemplate.php:require_once('include/database/PearDatabase.php');
 modules/Users/SaveRole.php:require_once('include/database/PearDatabase.php');
 modules/Users/SaveOrgSharing.php:require_once('include/database/PearDatabase.php');
 modules/Users/SaveInventoryNotification.php:require_once('include/database/PearDatabase.php');
 modules/Users/User.php:require_once('include/database/PearDatabase.php');
 modules/Users/User.php:         $this->db = new PearDatabase();
 modules/Users/ShowHistory.php:require_once('include/database/PearDatabase.php');
 modules/Users/OrganizationTermsandConditions.php:require_once('include/database/PearDatabase.php');
 modules/Users/createrole.php:require_once('include/database/PearDatabase.php');
 modules/Users/saveemailtemplate.php:require_once('include/database/PearDatabase.php');
 modules/Users/saveemailtemplate.php:$db = new PearDatabase();
 modules/Users/UserDeleteStep1.php:require_once('include/database/PearDatabase.php');
 modules/Users/upload.php:require_once('include/database/PearDatabase.php');
 modules/Users/editemailtemplate.php:require_once('include/database/PearDatabase.php');
 modules/Users/detailviewemailtemplate.php:require_once('include/database/PearDatabase.php');
 modules/Users/createnewgroup.php:require_once('include/database/PearDatabase.php');
 modules/Users/ListProfiles.php:require_once('include/database/PearDatabase.php');
 modules/Users/GroupDetailView.php:require_once('include/database/PearDatabase.php');
 modules/Users/RoleDetailView.php:require_once('include/database/PearDatabase.php');
 modules/Users/SaveProfile.php:require_once('include/database/PearDatabase.php');
 modules/Users/SaveGroup.php:require_once('include/database/PearDatabase.php');
 modules/Users/Logout.php:require_once('include/database/PearDatabase.php');
 modules/Users/about_us.php:require_once('include/database/PearDatabase.php');
 modules/Users/CreateSharingRule.php:require_once('include/database/PearDatabase.php');
 modules/Users/listinventorynotifications.php:require_once('include/database/PearDatabase.php');
 modules/Users/downloadfile.php:require_once('include/database/PearDatabase.php');
 modules/Users/LoginHistory.php:require_once('include/database/PearDatabase.php');
 modules/Users/LoginHistory.php:         $this->db = new PearDatabase();
 modules/Users/SaveNotification.php:require_once('include/database/PearDatabase.php');
 modules/Users/massdelete.php:require_once('include/database/PearDatabase.php');
 modules/Users/TabCustomise.php:require_once('include/database/PearDatabase.php');
 modules/Users/ProfileDeleteStep1.php:require_once('include/database/PearDatabase.php');
 modules/Users/listnotificationschedulers.php:require_once('include/database/PearDatabase.php');
 modules/SalesOrder/CreateSOPDF.php:require_once('include/database/PearDatabase.php');
 modules/SalesOrder/DetailView.php:require_once('include/database/PearDatabase.php');
 modules/SalesOrder/ListView.php:require_once('include/database/PearDatabase.php');
 modules/SalesOrder/DetailViewAjax.php:require_once('include/database/PearDatabase.php');
 modules/SalesOrder/ListTopSalesOrder.php:
 require_once('include/database/PearDatabase.php');
 modules/SalesOrder/Save.php:require_once('include/database/PearDatabase.php');
 modules/SalesOrder/SalesOrder.php:require_once('include/database/PearDatabase.php');
 modules/SalesOrder/SalesOrder.php: *  creates an instance for PearDatabase
 class and get values for column_fields array of SalesOrder class.
 modules/SalesOrder/SalesOrder.php:              $this->db = new
 PearDatabase();
 modules/Contacts/Merge.php:require_once('include/database/PearDatabase.php');
 modules/Contacts/chat.php:require_once('include/database/PearDatabase.php');
 modules/Contacts/DetailView.php:require_once('include/database/PearDatabase.php');
 modules/Contacts/DetailViewAjax.php:require_once('include/database/PearDatabase.php');
 modules/Contacts/contactSeedData.php:require_once('include/database/PearDatabase.php');
 modules/Contacts/Contact.php:require_once('include/database/PearDatabase.php');
 modules/Contacts/Contact.php:           $this->db = new PearDatabase();
 modules/Contacts/Save.php:require_once('include/database/PearDatabase.php');
 modules/Quotes/DetailView.php:require_once('include/database/PearDatabase.php');
 modules/Quotes/ListTopQuotes.php:
 require_once('include/database/PearDatabase.php');
 modules/Quotes/ListView.php:require_once('include/database/PearDatabase.php');
 modules/Quotes/DetailViewAjax.php:require_once('include/database/PearDatabase.php');
 modules/Quotes/CreatePDF.php:require_once('include/database/PearDatabase.php');
 modules/Quotes/Save.php:require_once('include/database/PearDatabase.php');
 modules/Quotes/Quote.php:require_once('include/database/PearDatabase.php');
 modules/Quotes/Quote.php:               $this->db = new PearDatabase();
 modules/Potentials/updateRelations.php:require_once('include/database/PearDatabase.php');
 modules/Potentials/DetailViewAjax.php:require_once('include/database/PearDatabase.php');
 modules/Potentials/Opportunity.php:require_once('include/database/PearDatabase.php');
 modules/Potentials/Opportunity.php:             $this->db = new
 PearDatabase();
 modules/Potentials/Save.php:require_once('include/database/PearDatabase.php');
 modules/Invoice/ListTopInvoice.php:
 require_once('include/database/PearDatabase.php');
 modules/Invoice/DetailView.php:require_once('include/database/PearDatabase.php');
 modules/Invoice/ListView.php:require_once('include/database/PearDatabase.php');
 modules/Invoice/DetailViewAjax.php:require_once('include/database/PearDatabase.php');
 modules/Invoice/Invoice.php:require_once('include/database/PearDatabase.php');
 modules/Invoice/Invoice.php:            $this->db = new PearDatabase();
 modules/Invoice/CreatePDF.php:require_once('include/database/PearDatabase.php');
 modules/Invoice/Save.php:require_once('include/database/PearDatabase.php');
 modules/Activities/updateRelations.php:require_once('include/database/PearDatabase.php');
 modules/Activities/Event.php:require_once('include/database/PearDatabase.php');
 modules/Activities/Event.php:           $this->db = new PearDatabase();
 modules/Activities/Activity.php:require_once('include/database/PearDatabase.php');
 modules/Activities/Activity.php:                $this->db = new
 PearDatabase();
 modules/Activities/DetailView.php:require_once('include/database/PearDatabase.php');
 modules/Activities/EditView.php:require_once('include/database/PearDatabase.php');
 modules/Activities/ListView.php:require_once('include/database/PearDatabase.php');
 modules/Activities/DetailViewAjax.php:require_once('include/database/PearDatabase.php');
 modules/Activities/Save.php:require_once('include/database/PearDatabase.php');
 modules/PurchaseOrder/DetailView.php:require_once('include/database/PearDatabase.php');
 modules/PurchaseOrder/ListView.php:require_once('include/database/PearDatabase.php');
 modules/PurchaseOrder/DetailViewAjax.php:require_once('include/database/PearDatabase.php');
 modules/PurchaseOrder/PurchaseOrder.php:require_once('include/database/PearDatabase.php');
 modules/PurchaseOrder/PurchaseOrder.php: *  creates an instance for
 PearDatabase class and get values for column_fields array of Order class.
 modules/PurchaseOrder/PurchaseOrder.php:                $this->db = new
 PearDatabase();
 modules/PurchaseOrder/CreatePDF.php:require_once('include/database/PearDatabase.php');
 modules/PurchaseOrder/Save.php:require_once('include/database/PearDatabase.php');
 modules/Reports/ChangeFolder.php:require_once('include/database/PearDatabase.php');
 modules/Reports/ReportGrouping.php:require_once('include/database/PearDatabase.php');
 modules/Reports/SaveReport0.php:require_once('include/database/PearDatabase.php');
 modules/Reports/PopulateReports.php:require_once('include/database/PearDatabase.php');
 modules/Reports/DeleteReportFolder.php:require_once('include/database/PearDatabase.php');
 modules/Reports/ReportType.php:require_once('include/database/PearDatabase.php');
 modules/Reports/ReportColumnsTotal.php:require_once('include/database/PearDatabase.php');
 modules/Reports/Delete.php:require_once('include/database/PearDatabase.php');
 modules/Reports/SaveAndRun.php:require_once('include/database/PearDatabase.php');
 modules/Reports/ReportRun.php:require_once('include/database/PearDatabase.php');
 modules/Reports/ReportColumns.php:require_once('include/database/PearDatabase.php');
 modules/Reports/ReportFilters.php:require_once('include/database/PearDatabase.php');
 modules/Reports/Reports.php:require_once('include/database/PearDatabase.php');
 modules/Reports/Save.php:require_once('include/database/PearDatabase.php');
 modules/Reports/SaveReportFolder.php:require_once('include/database/PearDatabase.php');
 modules/Campaigns/updateRelations.php:require_once('include/database/PearDatabase.php');
 modules/Campaigns/DetailView.php:require_once('include/database/PearDatabase.php');
 modules/Campaigns/Campaign.php:require_once('include/database/PearDatabase.php');
 modules/Campaigns/Campaign.php:         $this->db = new PearDatabase();
 modules/Campaigns/EditView.php:require_once('include/database/PearDatabase.php');
 modules/Campaigns/ListView.php:require_once('include/database/PearDatabase.php');
 modules/Campaigns/DetailViewAjax.php:require_once('include/database/PearDatabase.php');
 modules/Campaigns/Save.php:require_once('include/database/PearDatabase.php');
 modules/Settings/add2db.php:require_once('include/database/PearDatabase.php');
 modules/Settings/SaveConvertLead.php:require_once('include/database/PearDatabase.php');
 modules/Settings/PickList.php:require_once('include/database/PearDatabase.php');
 modules/Settings/ListMailAccount.php:require_once('include/database/PearDatabase.php');
 modules/Settings/SaveMailAccount.php:require_once("include/database/PearDatabase.php");
 modules/Settings/DeleteLeadCustomFieldMapping.php:require_once('include/database/PearDatabase.php');
 modules/Settings/UpdateComboValues.php:require_once('include/database/PearDatabase.php');
 modules/Settings/EditComboField.php:require_once('include/database/PearDatabase.php');
 modules/Settings/SaveCompany.php:require_once("include/database/PearDatabase.php");
 modules/Settings/DeleteCustomField.php:require_once('include/database/PearDatabase.php');
 modules/Settings/CurrencyDeleteStep1.php:require_once('include/database/PearDatabase.php');
 modules/Settings/CustomFieldList.php:require_once('include/database/PearDatabase.php');
 modules/Settings/AddCustomFieldToDB.php:require_once('include/database/PearDatabase.php');
 modules/Settings/Save.php:require_once("include/database/PearDatabase.php");
 modules/Settings/downloadfile.php:require_once('include/database/PearDatabase.php');
 modules/Settings/SaveCurrencyInfo.php:require_once('include/database/PearDatabase.php');
 modules/Settings/SaveCurrencyInfo.php:$db = new PearDatabase();
 modules/Settings/CurrencyListView.php:require_once('include/database/PearDatabase.php');
 modules/Products/updateRelations.php:require_once('include/database/PearDatabase.php');
 modules/Products/DetailView.php:require_once('include/database/PearDatabase.php');
 modules/Products/EditView.php:require_once('include/database/PearDatabase.php');
 modules/Products/AddProductToPriceBooks.php:require_once('include/database/PearDatabase.php');
 modules/Products/ListView.php:require_once('include/database/PearDatabase.php');
 modules/Products/AddProductsToPriceBook.php:require_once('include/database/PearDatabase.php');
 modules/Products/DetailViewAjax.php:require_once('include/database/PearDatabase.php');
 modules/Products/addPbProductRelToDB.php:require_once('include/database/PearDatabase.php');
 modules/Products/Product.php:require_once('include/database/PearDatabase.php');
 modules/Products/Product.php:           $this->db = new PearDatabase();
 modules/Products/Save.php:require_once('include/database/PearDatabase.php');
 modules/Webmails/Webmail.php:require_once('include/database/PearDatabase.php');
 modules/Webmails/Webmail.php:           $this->db = new PearDatabase();
 modules/Webmails/CallRelatedList.php:require_once('include/database/PearDatabase.php');
 modules/Webmails/Save.php:require_once('include/database/PearDatabase.php');
 modules/Webmails/WebmailsAjax.php:require_once('include/database/PearDatabase.php');
 modules/Utilities/Merge.php:require_once('include/database/PearDatabase.php');
 modules/uploads/add2db.php:require_once('include/database/PearDatabase.php');
 modules/uploads/deleteattachments.php:require_once('include/database/PearDatabase.php');
 modules/uploads/downloadfile.php:require_once('include/database/PearDatabase.php');
 modules/HelpDesk/TicketStatisticsUtil.php:require_once('include/database/PearDatabase.php');
 modules/HelpDesk/CumulStatistics.php:require_once('include/database/PearDatabase.php');
 modules/HelpDesk/Merge.php:require_once('include/database/PearDatabase.php');
 modules/HelpDesk/DetailView.php:require_once('include/database/PearDatabase.php');
 modules/HelpDesk/EditView.php:require_once('include/database/PearDatabase.php');
 modules/HelpDesk/ListView.php:require_once('include/database/PearDatabase.php');
 modules/HelpDesk/DetailViewAjax.php:require_once('include/database/PearDatabase.php');
 modules/HelpDesk/Convert.php:require_once('include/database/PearDatabase.php');
 modules/HelpDesk/HelpDesk.php:require_once('include/database/PearDatabase.php');
 modules/HelpDesk/HelpDesk.php:          $this->db = new PearDatabase();
 modules/HelpDesk/Save.php:require_once('include/database/PearDatabase.php');
 modules/HelpDesk/ConvertToEntities.php:require_once('include/database/PearDatabase.php');
 modules/Dashboard/Entity_charts.php:require_once('include/database/PearDatabase.php');
 modules/PriceBooks/DetailView.php:require_once('include/database/PearDatabase.php');
 modules/PriceBooks/EditView.php:require_once('include/database/PearDatabase.php');
 modules/PriceBooks/ListView.php:require_once('include/database/PearDatabase.php');
 modules/PriceBooks/DetailViewAjax.php:require_once('include/database/PearDatabase.php');
 modules/PriceBooks/PriceBook.php:require_once('include/database/PearDatabase.php');
 modules/PriceBooks/PriceBook.php:               $this->db = new
 PearDatabase();
 modules/PriceBooks/Save.php:require_once('include/database/PearDatabase.php');
 soap/vtigerolservice.php:require_once('include/database/PearDatabase.php');
 soap/vtigerolservice.php:         $db = new PearDatabase();
 soap/contactserialize.php:require_once('include/database/PearDatabase.php');
 soap/contactserialize.php:    $db = new PearDatabase();
 soap/contactserialize.php:      $db = new PearDatabase();
 soap/webforms.php:require_once('include/database/PearDatabase.php');
 }}}

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1331>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 16:31:15 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 20:31:15 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23748=3A_?=
 =?utf-8?q?Eliminate_php_notice_errors?=
In-Reply-To: <076.c75696aed703c24c8b151bd87264b9e6@vtiger.fosslabs.com>
References: <076.c75696aed703c24c8b151bd87264b9e6@vtiger.fosslabs.com>
Message-ID: <085.a7b9cec150407e651633c58d16007b4e@vtiger.fosslabs.com>

#748: Eliminate php notice errors
------------------------+---------------------------------------------------
  Reporter:  allanbush  |       Owner:  jrydbeck
      Type:  task       |      Status:  new     
  Priority:  minor      |   Milestone:  4.2.5   
 Component:  vtigercrm  |     Version:  4.2.4rc3
Resolution:             |    Keywords:          
------------------------+---------------------------------------------------
Changes (by jrydbeck):

  * status:  assigned => new
  * owner:  anonymous => jrydbeck

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/748>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 16:31:42 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 20:31:42 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23748=3A_?=
 =?utf-8?q?Eliminate_php_notice_errors?=
In-Reply-To: <076.c75696aed703c24c8b151bd87264b9e6@vtiger.fosslabs.com>
References: <076.c75696aed703c24c8b151bd87264b9e6@vtiger.fosslabs.com>
Message-ID: <085.365107f52bd89862eaa4e23f9e6e9f53@vtiger.fosslabs.com>

#748: Eliminate php notice errors
------------------------+---------------------------------------------------
  Reporter:  allanbush  |       Owner:  jrydbeck
      Type:  task       |      Status:  assigned
  Priority:  minor      |   Milestone:  4.2.5   
 Component:  vtigercrm  |     Version:  4.2.4rc3
Resolution:             |    Keywords:          
------------------------+---------------------------------------------------
Changes (by jrydbeck):

  * status:  new => assigned

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/748>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 17:12:31 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 21:12:31 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7199 - in
 /vtigercrm/branches/4.2: include/database/PearDatabase.php
 include/utils.php modules/Activities/OpenListView.php
 modules/CustomView/CustomView.php modules/Users/UserInfoUtil.php
 themes/blue/header.php themes/orange/header.php
Message-ID: <20060616211232.488BF7ED396@vtiger.fosslabs.com>

Author: jrydbeck
Date: Fri Jun 16 15:12:22 2006
New Revision: 7199

Log:
Multiple-file update to remove notices. There's still a ways to go, but this is starting to wrap up bug #748. Header files for other themes will need these updates.

Modified:
    vtigercrm/branches/4.2/include/database/PearDatabase.php
    vtigercrm/branches/4.2/include/utils.php
    vtigercrm/branches/4.2/modules/Activities/OpenListView.php
    vtigercrm/branches/4.2/modules/CustomView/CustomView.php
    vtigercrm/branches/4.2/modules/Users/UserInfoUtil.php
    vtigercrm/branches/4.2/themes/blue/header.php
    vtigercrm/branches/4.2/themes/orange/header.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 Fri Jun 16 15:12:22 2006
@@ -437,15 +437,17 @@
 
 	function query_result(&$result, $row, $col=0)
 	{		
-		//$this->println("ADODB query_result r=".$row." c=".$col);
-		$result->Move($row);
-		$rowdata = $this->change_key_case($result->FetchRow());
-		//$this->println($rowdata);
-		$coldata = to_html($rowdata[$col]);
-		//$this->println("ADODB query_result ". $coldata);
-		return $coldata;
-	}
-	
+		if($result->_numOfRows > $row)
+		{
+			$result->Move($row);
+			$rowdata = $this->change_key_case($result->FetchRow());
+			return to_html($rowdata[$col]);
+		}
+		else
+		{
+			return to_html(null);
+		}
+	}
 
 	/* ADODB Converted	
 	function getAffectedRowCount(&$result){

Modified: vtigercrm/branches/4.2/include/utils.php
==============================================================================
--- vtigercrm/branches/4.2/include/utils.php (original)
+++ vtigercrm/branches/4.2/include/utils.php Fri Jun 16 15:12:22 2006
@@ -3029,8 +3029,8 @@
 //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 $app_strings;
+	global $adb, $theme, $app_strings;
+	
 	$noofrows = $adb->num_rows($list_result);
 	$list_header = '<script>
 			function confirmdelete(url)
@@ -3041,32 +3041,35 @@
 				}
 			}
 		</script>';
-	global $theme;
-	$evt_status;
 	$theme_path="themes/".$theme."/";
 	$image_path=$theme_path."images/";
 
 	//getting the fieldtable entries from database
 	$tabid = getTabid($module);
-	
+
 	//added for customview 27/5
 	if($oCv)
-        {
-                if(isset($oCv->list_fields))
-                {
-                        $focus->list_fields = $oCv->list_fields;
-                }
-        }
+	{
+		if(isset($oCv->list_fields))
+		{
+			$focus->list_fields = $oCv->list_fields;
+		}
+	}
 
 	$relmodule = ($_REQUEST['module'] == $module || !$relatedlist) || $_REQUEST['module'] == 'Home' ? '' : $module;
 	$start = $relmodule.'start';
-	$end_val = $relmodule.'end_val'; 
+	$end_val = $relmodule.'end_val';
+	
 	for ($i=$navigation_array[$start]; $i<=$navigation_array[$end_val]; $i++)
 	{
 		if (($i%2)==0)
+		{
 			$list_header .= '<tr height=20 class=evenListRow>';
+		}
 		else
+		{
 			$list_header .= '<tr height=20 class=oddListRow>';
+		}
 
 		//Getting the entityid
 		$entity_id = $adb->query_result($list_result,$i-1,"crmid");
@@ -3079,163 +3082,163 @@
 		}
 		$list_header .= '<td WIDTH="1" class="blackLine"><IMG SRC="'.$image_path.'blank.gif"></td>';
 		$names = get_field_list($focus, $oCv, $tabid);
-			
+
 
 		foreach($names as $fieldname=>$data) {
 			list($name, $is_column) = $data;
 
 			if($is_column)
+			{
+				$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");
+					if($status == '')
+					$status = $adb->query_result($list_result,$i-1,"eventstatus");
+					if ($name=='Related to')
+					$value=getRelatedTo($module,$list_result,$i-1);
+					if($name=='Contact Name')
+
 					{
-				$value = $adb->query_result($list_result,$i-1,$fieldname);
+						$first_name = $adb->query_result($list_result,$i-1,"firstname");
+						$last_name = $adb->query_result($list_result,$i-1,"lastname");
+						$contact_id = $adb->query_result($list_result,$i-1,"contactid");
+						$contact_name = "";
+						$value="";
+						if($last_name != 'NULL')
+						$contact_name .= $last_name;
+						if($first_name != 'NULL')
+						$contact_name .= " ".$first_name;
+						//Added to get the contactname for activities custom view - t=2190
+						if($contact_id != '' && $last_name == '')
+						{
+							$contact_name = getContactName($contact_id);
+						}
+
+						if(($contact_name != "") && ($contact_id !='NULL'))
+						$value =  "<a href='index.php?module=Contacts&action=DetailView&record=".$contact_id."'>".$contact_name."</a>";
+					}
+					if ($name == 'Close')
+
+					{
+						if($status =='Deferred' || $status == 'Completed' || $status == 'Held' || $status == '')
+						{
+							$value="";
+						}
+						else
+						{
+							$activityid = $adb->query_result($list_result,$i-1,"activityid");
+							$activitytype = $adb->query_result($list_result,$i-1,"activitytype");
+							if($activitytype=='Task')
+							$evt_status='&status=Completed';
+							else
+							$evt_status='&eventstatus=Held';
+							if(isPermitted("Activities",1,$activityid) == 'yes')
+
+							{
+								$value = "<a href='index.php?return_module=Activities&return_action=index&return_id=".$activityid."&action=Save&module=Activities&record=".$activityid."&change_status=true".$evt_status."'>X</a>";
+							}
+							else
+							{
+								$value = "";
+							}
+						}
+					}
+				}
+				elseif($module == "Products" && $name == "Related to")
+				{
+					$value=getRelatedTo($module,$list_result,$i-1);
+				}
+				elseif($module == 'Notes' && $name=='Related to')
+				{
+					$value=getRelatedTo($module,$list_result,$i-1);
+				}
+				elseif($name=='Account Name')
+				{
+					//modified for customview 27/5
+					if($module == 'Accounts')
+					{
+						$account_id = $adb->query_result($list_result,$i-1,"crmid");
+						$account_name = getAccountName($account_id);
+						$value = '<a href="index.php?module=Accounts&action=DetailView&record='.$account_id.'">'.$account_name.'</a>';
+					}else
+					{
+						$account_id = $adb->query_result($list_result,$i-1,"accountid");
+						$account_name = getAccountName($account_id);
+						$value = '<a href="index.php?module=Accounts&action=DetailView&record='.$account_id.'">'.$account_name.'</a>';
+					}
+				}
+				elseif(($module == 'HelpDesk' || $module == 'PriceBook' || $module == 'Quotes' || $module == 'Orders' || $module == 'Faq') && $name == 'Product Name')
+				{
+					if($module == 'HelpDesk' || $module == 'Faq')
+					$product_id = $adb->query_result($list_result,$i-1,"product_id");
+					else
+					$product_id = $adb->query_result($list_result,$i-1,"productid");
+
+					if($product_id != '')
+					$product_name = getProductName($product_id);
+					else
+					$product_name = '';
+
+					$value = '<a href="index.php?module=Products&action=DetailView&record='.$product_id.'">'.$product_name.'</a>';
+				}
+				elseif($module == 'Quotes' && $name == 'Potential Name')
+				{
+					$potential_id = $adb->query_result($list_result,$i-1,"potentialid");
+					if('' != $potential_id) {
+						$potential_name = getPotentialName($potential_id);
+						$value = '<a href="index.php?module=Potentials&action=DetailView&record='.$potential_id.'">'.$potential_name.'</a>';
+					}
+				}
+				elseif($owner_id == 0 && $name == 'Assigned To')
+				{
+					$value = getGroupName($entity_id, $module);
 				}
 				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");
-						if($status == '')
-                                                $status = $adb->query_result($list_result,$i-1,"eventstatus");
-						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");
-							$contact_id = $adb->query_result($list_result,$i-1,"contactid");
-							$contact_name = "";
-							$value="";
-							if($last_name != 'NULL')
-								$contact_name .= $last_name;
-							if($first_name != 'NULL')
-								$contact_name .= " ".$first_name;
-							//Added to get the contactname for activities custom view - t=2190
-                                                        if($contact_id != '' && $last_name == '')
-                                                        {
-                                                                $contact_name = getContactName($contact_id);
-                                                        }
-							
-							if(($contact_name != "") && ($contact_id !='NULL'))
-								$value =  "<a href='index.php?module=Contacts&action=DetailView&record=".$contact_id."'>".$contact_name."</a>";
-						}
-						if ($name == 'Close')
-
-						{
-							if($status =='Deferred' || $status == 'Completed' || $status == 'Held' || $status == '')
-							{
-								$value="";
-							}
-							else
-							{
-								$activityid = $adb->query_result($list_result,$i-1,"activityid");
-								$activitytype = $adb->query_result($list_result,$i-1,"activitytype");
-                                                                if($activitytype=='Task')
-                                                                $evt_status='&status=Completed';
-                                                                else
-                                                                $evt_status='&eventstatus=Held';
-								if(isPermitted("Activities",1,$activityid) == 'yes')
-
-                        					{
-                                                                	$value = "<a href='index.php?return_module=Activities&return_action=index&return_id=".$activityid."&action=Save&module=Activities&record=".$activityid."&change_status=true".$evt_status."'>X</a>";
-								}
-								else
-								{
-									$value = "";
-								}
-							}
-						}
-					}
-					elseif($module == "Products" && $name == "Related to")
-                                        {
-                                                $value=getRelatedTo($module,$list_result,$i-1);
-                                        }
-					elseif($module == 'Notes' && $name=='Related to')
-					{
-						$value=getRelatedTo($module,$list_result,$i-1);
-					}
-					elseif($name=='Account Name')
-					{
-						//modified for customview 27/5
-						if($module == 'Accounts')
-                                                {
-                                                	$account_id = $adb->query_result($list_result,$i-1,"crmid");
-                                                	$account_name = getAccountName($account_id);
-                                                	$value = '<a href="index.php?module=Accounts&action=DetailView&record='.$account_id.'">'.$account_name.'</a>';
-                                                }else
-                                                {
-                                                	$account_id = $adb->query_result($list_result,$i-1,"accountid");
-                                                	$account_name = getAccountName($account_id);
-                                                	$value = '<a href="index.php?module=Accounts&action=DetailView&record='.$account_id.'">'.$account_name.'</a>';
-                                                }
-					}
-					elseif(($module == 'HelpDesk' || $module == 'PriceBook' || $module == 'Quotes' || $module == 'Orders' || $module == 'Faq') && $name == 'Product Name')
-					{
-						if($module == 'HelpDesk' || $module == 'Faq')
-							$product_id = $adb->query_result($list_result,$i-1,"product_id");
-						else
-							$product_id = $adb->query_result($list_result,$i-1,"productid");
-
-						if($product_id != '')
-							$product_name = getProductName($product_id);
-						else
-                                                        $product_name = '';
-
-						$value = '<a href="index.php?module=Products&action=DetailView&record='.$product_id.'">'.$product_name.'</a>';
-					}
-					elseif($module == 'Quotes' && $name == 'Potential Name')
-					{
-						$potential_id = $adb->query_result($list_result,$i-1,"potentialid");
-						if('' != $potential_id) {
-							$potential_name = getPotentialName($potential_id);
-							$value = '<a href="index.php?module=Potentials&action=DetailView&record='.$potential_id.'">'.$potential_name.'</a>';
-						}
-					}
-					elseif($owner_id == 0 && $name == 'Assigned To')
-                                        {
-                                               $value = getGroupName($entity_id, $module);
-                                       }
-				       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 == "<a href='index.php?return_module=Activities&return_action=index&return_id=".$activityid."&action=Save&module=Activities&record=".$activityid."&change_status=true&status=Completed'>X</a>")
-				if($name == $app_strings['Close'] && $relatedlist != '')
-				{
-					$list_header .= '';
-				}
-				else
-				{
-					$list_header .= '<td height="21" style="padding:0px 3px 0px 3px;">'.$value.'</td>';
-					$list_header .='<td WIDTH="1" class="blackLine" NOWRAP><IMG SRC="'.$image_path.'blank.gif"></td>';
-				}
-				if($fieldname=='filename')
-				{
-					$filename = $adb->query_result($list_result,$list_result_count,$fieldname);
+					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 == "<a href='index.php?return_module=Activities&return_action=index&return_id=".$activityid."&action=Save&module=Activities&record=".$activityid."&change_status=true&status=Completed'>X</a>")
+			if($name == $app_strings['Close'] && $relatedlist != '')
+			{
+				$list_header .= '';
+			}
+			else
+			{
+				$list_header .= '<td height="21" style="padding:0px 3px 0px 3px;">'.$value.'</td>';
+				$list_header .='<td WIDTH="1" class="blackLine" NOWRAP><IMG SRC="'.$image_path.'blank.gif"></td>';
+			}
+			if($fieldname=='filename')
+			{
+				$filename = $adb->query_result($list_result,$list_result_count,$fieldname);
+			}
+		}
 
 		if($returnset=='')
-			$returnset = '&return_module='.$module.'&return_action=index';
+		$returnset = '&return_module='.$module.'&return_action=index';
 
 		if($module == 'Activities')
 		{
 			$actvity_type = $adb->query_result($list_result,$list_result_count,'activitytype');
 			if($actvity_type == 'Task')
-				$returnset .= '&activity_mode=Task';
+			$returnset .= '&activity_mode=Task';
 			else
-				$returnset .= '&activity_mode=Events';
+			$returnset .= '&activity_mode=Events';
 		}
 		$list_header .= '<td style="padding:0px 3px 0px 3px;">';
 		$mod_dir=getModuleDirName($module);
 		if(isPermitted($module,1,$entity_id) == 'yes')
 		{
-			
-			
+
+
 			$list_header .='<a href="index.php?action='.$edit_action.'&module='.$mod_dir.'&record='.$entity_id.$returnset.'&filename='.$filename.'">'.$app_strings['LNK_EDIT'].'</a>&nbsp;|&nbsp;';
 		}
 		if(isPermitted($module,2,$entity_id) == 'yes')
@@ -4130,24 +4133,25 @@
 
 function getQuickCreate($tabid,$actionid)
 {
-        $QuickCreateForm= 'true';
-
-        $profile_id = $_SESSION['authenticated_user_profileid'];
-        $tab_per_Data = getAllTabsPermission($profile_id);
-
-        $permissionData = $_SESSION['action_permission_set'];
-
-        if($tab_per_Data[$tabid] !=0)
-        {
-                $QuickCreateForm= 'false';
-        }
-        if($permissionData[$tabid][1] !=0)
-        {
-                $QuickCreateForm= 'false';
-        }
+	$QuickCreateForm= 'true';
+
+	$profile_id = $_SESSION['authenticated_user_profileid'];
+	$tab_per_Data = getAllTabsPermission($profile_id);
+
+	$permissionData = $_SESSION['action_permission_set'];
+
+	if(isset($tab_per_Data[$tabid]) && $tab_per_Data[$tabid] !=0)
+	{
+		$QuickCreateForm= 'false';
+	}
+	if(isset($permissionData[$tabid][1]) && $permissionData[$tabid][1] !=0)
+	{
+		$QuickCreateForm= 'false';
+	}
+
 	return $QuickCreateForm;
-
-}
+}
+
 function ChangeStatus($status,$activityid,$activity_mode='')
  {
 	global $vtlog;
@@ -4220,33 +4224,37 @@
 {
 	global $current_user;
 	$dat_fmt = $current_user->date_format;
+
+	if($dat_fmt == '')
+	{
+		$dat_fmt = 'dd-mm-yyyy';
+	}
+
+	$date_value = explode(' ',$cur_date_val);
+	$display_date = '--';
 	
-	if($dat_fmt == '')
-	{
-		$dat_fmt = 'dd-mm-yyyy';
-	}
-
-	$date_value = explode(' ',$cur_date_val);
-	list($y,$m,$d) = split('-',$date_value[0]);
-
-	if($dat_fmt == 'dd-mm-yyyy')
-	{
-		$display_date = $d.'-'.$m.'-'.$y;
-	}
-	elseif($dat_fmt == 'mm-dd-yyyy')
-	{
-		$display_date = $m.'-'.$d.'-'.$y;
-	}
-	elseif($dat_fmt == 'yyyy-mm-dd')
-	{
-		$display_date = $y.'-'.$m.'-'.$d;
-	}
-
-	if(isset($date_value[1]) && $date_value[1] != '')
-	{
-		$display_date = $display_date.' '.$date_value[1];
-	}
-	
+	if(isset($date_value[0]) && $date_value[0] != 0)
+	{
+		list($y,$m,$d) = split('-',$date_value[0]);
+
+		if($dat_fmt == 'dd-mm-yyyy')
+		{
+			$display_date = $d.'-'.$m.'-'.$y;
+		}
+		elseif($dat_fmt == 'mm-dd-yyyy')
+		{
+			$display_date = $m.'-'.$d.'-'.$y;
+		}
+		elseif($dat_fmt == 'yyyy-mm-dd')
+		{
+			$display_date = $y.'-'.$m.'-'.$d;
+		}
+
+		if(isset($date_value[1]) && $date_value[1] != '')
+		{
+			$display_date = $display_date.' '.$date_value[1];
+		}
+	}
 	return $display_date;
 }
 

Modified: vtigercrm/branches/4.2/modules/Activities/OpenListView.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Activities/OpenListView.php (original)
+++ vtigercrm/branches/4.2/modules/Activities/OpenListView.php Fri Jun 16 15:12:22 2006
@@ -94,7 +94,7 @@
 				     'date_start' => getDisplayDate($adb->query_result($list_result,$i,'date_start')),
 				     'time_start' => $adb->query_result($list_result,$i,'time_start'),
 				     'due_date' => getDisplayDate($adb->query_result($list_result,$i,'due_date')),
-				     'recurringtype' => getDisplayDate($adb->query_result($list_result,$i,'recurringtype')),
+				     'recurringtype' => $adb->query_result($list_result,$i,'recurringtype'),
 				     'recurringdate' => getDisplayDate($adb->query_result($list_result,$i,'recurringdate')),
 
 				     'parent'=> $parent_name,	

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 Fri Jun 16 15:12:22 2006
@@ -555,8 +555,9 @@
 	{
 		global $adb;
 
+		$stdfiltersql = '';
 		$stdfilterlist = $this->getStdFilterByCvid($cvid);
-		//print_r($stdfilterlist);
+
 		if(isset($stdfilterlist))
 		{
 			foreach($stdfilterlist as $columnname=>$value)
@@ -588,9 +589,10 @@
 				$stdfiltersql = $columns[0].".".$columns[1]." between '".$startdate." 00:00:00' and '".$enddate." 23:59:00'";
 			}
 		}
-		//echo $stdfiltersql;
+		
 		return $stdfiltersql;
 	}
+
 	function getCVAdvFilterSQL($cvid)
 	{
 		$advfilter = $this->getAdvFilterByCvid($cvid);

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 Fri Jun 16 15:12:22 2006
@@ -70,12 +70,11 @@
 function fetchUserGroups($userid)
 {
 	global $adb;
+
 	$sql= "select groupname from users2group where userid='" .$userid ."'";
-        //echo $sql;
-        $result = $adb->query($sql);
-        //store the groupnames in a comma separated string
-        //echo 'count is ' .count($result);
-	if($adb->num_rows($result)!=0)	$groupname=  $adb->query_result($result,0,"groupname");
+	$result = $adb->query($sql);
+	$groupname = $adb->query_result($result, 0, 'groupname');
+
 	return $groupname;
 }
 

Modified: vtigercrm/branches/4.2/themes/blue/header.php
==============================================================================
--- vtigercrm/branches/4.2/themes/blue/header.php (original)
+++ vtigercrm/branches/4.2/themes/blue/header.php Fri Jun 16 15:12:22 2006
@@ -124,45 +124,26 @@
 // For the current tab, parse a tab_on
 
 foreach($moduleList as $module_name)
-
-{
-
+{
 	$xtpl->assign("MODULE_NAME", $app_list_strings['moduleList'][$module_name]);
-
 	$xtpl->assign("MODULE_KEY", $module_name);
 
-	
-
 	if($module_name == $currentModule)
-
-	{
-
+	{
 		$xtpl->assign("TAB_CLASS", "currentTab");
-
 		$xtpl->assign("IMAGE_TABTILE", "menu_on_tile.gif");
-
 		$xtpl->assign("IMAGE_TABSTART", "menu_on_start.gif");
-
 		$xtpl->assign("IMAGE_TABEND", "menu_on_end.gif");
-
-	}
-
+	}
 	else
-
-	{
-
+	{
 		$xtpl->assign("TAB_CLASS", "otherTab");
-
 		$xtpl->assign("IMAGE_TABTILE", "menu_off_tile.gif");
-
 		$xtpl->assign("IMAGE_TABSTART", "menu_off_start.gif");
-
 		$xtpl->assign("IMAGE_TABEND", "menu_off_end.gif");
-
 	}
 
 	$xtpl->parse("main.tab");
-
 }
 
 

Modified: vtigercrm/branches/4.2/themes/orange/header.php
==============================================================================
--- vtigercrm/branches/4.2/themes/orange/header.php (original)
+++ vtigercrm/branches/4.2/themes/orange/header.php Fri Jun 16 15:12:22 2006
@@ -172,15 +172,27 @@
 		$xtpl->assign("ROW_NUMBER",$current_row);
 		$xtpl->assign("RECENT_LABEL",$row['item_summary']);
 
-                if($row['module_name']=='Activities')
-                {
-                        $sql = 'select activitytype from activity where activityid = '.$row['item_id'];
-                        $activitytype = $adb->query_result($adb->query($sql),0,'activitytype');
-                        if($activitytype == 'Task')
-                                $activity_mode = '&activity_mode=Task';
-                        elseif($activitytype == 'Call' || $activitytype == 'Meeting')
-                                $activity_mode = '&activity_mode=Events';
-                }
+        if($row['module_name']=='Activities')
+        {
+	        $sql = 'select activitytype from activity where activityid = '.$row['item_id'];
+	        $activitytype = $adb->query_result($adb->query($sql),0,'activitytype');
+	        if($activitytype == 'Task')
+	        {
+				$activity_mode = '&activity_mode=Task';
+	        }
+	        elseif($activitytype == 'Call' || $activitytype == 'Meeting')
+	        {
+				$activity_mode = '&activity_mode=Events';
+	        }
+	        else
+	        {
+	        	$activity_mode = '';
+	        }
+        }
+        else
+        {
+        	$activity_mode = '';
+        }
 
 		$url_module = $row['module_name'];
 		$url_action = 'DetailView';
@@ -212,8 +224,6 @@
 			$xtpl->assign("MODULE_IMAGE_NAME",$row['module_name']);
 		}
 
-		 
-
 		$xtpl->assign("RECENT_URL","index.php?module=$url_module&action=$url_action&record=$row[item_id]$activity_mode");	
 
 		$activity_mode = '';




From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 17:13:52 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 21:13:52 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23748=3A_?=
 =?utf-8?q?Eliminate_php_notice_errors?=
In-Reply-To: <076.c75696aed703c24c8b151bd87264b9e6@vtiger.fosslabs.com>
References: <076.c75696aed703c24c8b151bd87264b9e6@vtiger.fosslabs.com>
Message-ID: <085.e8990533c4cee9efdebbe02e59f2ff97@vtiger.fosslabs.com>

#748: Eliminate php notice errors
------------------------+---------------------------------------------------
  Reporter:  allanbush  |       Owner:  jrydbeck
      Type:  task       |      Status:  assigned
  Priority:  minor      |   Milestone:  4.2.5   
 Component:  vtigercrm  |     Version:  4.2.4rc3
Resolution:             |    Keywords:          
------------------------+---------------------------------------------------
Comment (by jrydbeck):

 Changesets [7198] & [7199] tackled a significant amount of this.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/748>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 17:18:41 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 21:18:41 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7200 -
	/vtigercrm/branches/4.2.4.1/include/utils.php
Message-ID: <20060616211842.170577ED39A@vtiger.fosslabs.com>

Author: allanbush
Date: Fri Jun 16 15:18:36 2006
New Revision: 7200

Log:
Fixes quote display problem.  Closes #1281.

Modified:
    vtigercrm/branches/4.2.4.1/include/utils.php

Modified: vtigercrm/branches/4.2.4.1/include/utils.php
==============================================================================
--- vtigercrm/branches/4.2.4.1/include/utils.php (original)
+++ vtigercrm/branches/4.2.4.1/include/utils.php Fri Jun 16 15:18:36 2006
@@ -2304,6 +2304,7 @@
 {
 global $vtlog;
 $vtlog->logthis("in getPotentialName ".$potential_id,'info');  
+	if(!$potential_id) return '';
 	global $adb;
 	$sql = "select potentialname from potential where potentialid=".$potential_id;
         $result = $adb->query($sql);




From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 17:18:41 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 21:18:41 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231281=3A?=
 =?utf-8?q?_Quotes_without_an_associated_potential_do_not_display_in_list_?=
 =?utf-8?q?views=2E?=
In-Reply-To: <076.8b6d308ffb189659226c108a73a27dea@vtiger.fosslabs.com>
References: <076.8b6d308ffb189659226c108a73a27dea@vtiger.fosslabs.com>
Message-ID: <085.5aa41417d130f690322169be50ae722b@vtiger.fosslabs.com>

#1281: Quotes without an associated potential do not display in list views.
---------------------------------------+------------------------------------
  Reporter:  sebastian_sw at hotmail.com  |       Owner:  allanbush
      Type:  defect                    |      Status:  closed   
  Priority:  critical                  |   Milestone:           
 Component:  vtigercrm                 |     Version:  4.2.4rc3 
Resolution:  fixed                     |    Keywords:           
---------------------------------------+------------------------------------
Changes (by allanbush):

  * resolution:  => fixed
  * status:  assigned => closed

Comment:

 (In [7200]) Fixes quote display problem.  Closes #1281.

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1281>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 16 16:52:37 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 16 Jun 2006 20:52:37 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231332=3A?=
 =?utf-8?q?_Settings/System_Configuration_shows_multiple_errors_if_run_in_?=
 =?utf-8?q?a_FreeBSD_4=2Ex_jail?=
Message-ID: <076.a93b6ad7676760fac679377c0350d918@vtiger.fosslabs.com>

#1332: Settings/System Configuration shows multiple errors if run in a FreeBSD 4.x
jail
------------------------------------------------+---------------------------
 Reporter:  m at greencampaigns.com                |       Owner:  developer
     Type:  defect                              |      Status:  new      
 Priority:  minor                               |   Milestone:  5.0.0    
Component:  vtigercrm                           |     Version:  5.0.1    
 Keywords:  Freebsd jail, system configuration  |  
------------------------------------------------+---------------------------
 The full text of the error:

 {{{
 Notice: Undefined index: free in
 /usr/local/www/greencampaigns.com/vtiger_crm/modules/System/includes/os/class.BSD.common.inc.php
 on line 244

 Notice: Undefined index: free in
 /usr/local/www/greencampaigns.com/vtiger_crm/modules/System/includes/os/class.BSD.common.inc.php
 on line 247

 Warning: Division by zero in
 /usr/local/www/greencampaigns.com/vtiger_crm/modules/System/includes/os/class.BSD.common.inc.php
 on line 279

 Warning: Invalid argument supplied for foreach() in
 /usr/local/www/greencampaigns.com/vtiger_crm/modules/System/includes/xml/memory.php
 on line 51
 ERRORS
 File    Line    Command         Message
 common_functions.php    176     /usr/bin/netstat        netstat: short
 read
 common_functions.php    176     /usr/bin/vmstat         vmstat: boottime:
 short read
 common_functions.php    176     /usr/sbin/swapinfo      swapinfo: cannot
 read nswdev: short read swapinfo: cannot read dmmax: short read swapinfo:
 cannot read sw: short read swapinfo: cannot read sw: short read swapinfo:
 cannot read swapblist: short read
 }}}

 This may apply to all FreeBSD 4.x systems. I have only tested it in a
 jail.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1332>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 17:20:26 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 21:20:26 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7201 -
 /vtigercrm/branches/4.2.4.1/modules/Leads/LeadConvertToEntities.php
Message-ID: <20060616212026.C70BA7ED399@vtiger.fosslabs.com>

Author: allanbush
Date: Fri Jun 16 15:20:23 2006
New Revision: 7201

Log:
Fixes query error when converting leads.  Closes #1312.

Modified:
    vtigercrm/branches/4.2.4.1/modules/Leads/LeadConvertToEntities.php

Modified: vtigercrm/branches/4.2.4.1/modules/Leads/LeadConvertToEntities.php
==============================================================================
--- vtigercrm/branches/4.2.4.1/modules/Leads/LeadConvertToEntities.php (original)
+++ vtigercrm/branches/4.2.4.1/modules/Leads/LeadConvertToEntities.php Fri Jun 16 15:20:23 2006
@@ -279,7 +279,7 @@
 $adb->query($sql_insert_contact);
 
 
-$sql_insert_contactsubdetails = "INSERT INTO contactsubdetails (contactsubscriptionid,homephone,otherphone,leadsource) VALUES (".$contact_id.",'','','".$adb->quote($row['leadsource'])."')";
+$sql_insert_contactsubdetails = "INSERT INTO contactsubdetails (contactsubscriptionid,homephone,otherphone,leadsource) VALUES (".$contact_id.",'','',".$adb->quote($row['leadsource']).")";
 
 $adb->query($sql_insert_contactsubdetails);
 




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 16 17:33:18 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 16 Jun 2006 21:33:18 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7202 - in
 /vtigercrm/branches/4.2: include/ListView/ListView.php include/utils.php
 modules/Accounts/ListView.php modules/Notes/ListView.php
Message-ID: <20060616213319.6ABBB7ED3A0@vtiger.fosslabs.com>

Author: jrydbeck
Date: Fri Jun 16 15:33:12 2006
New Revision: 7202

Log:
Continued work on bug #748.

Modified:
    vtigercrm/branches/4.2/include/ListView/ListView.php
    vtigercrm/branches/4.2/include/utils.php
    vtigercrm/branches/4.2/modules/Accounts/ListView.php
    vtigercrm/branches/4.2/modules/Notes/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 Fri Jun 16 15:33:12 2006
@@ -598,6 +598,7 @@
 }
 
 //session_start();
+$order_by = '';
 if (isset($_REQUEST['order_by'])) {
 	$order_by = $_REQUEST['order_by'];
 	$_SESSION["ListViewOrder[$currentModule_name][0]"] = $order_by;

Modified: vtigercrm/branches/4.2/include/utils.php
==============================================================================
--- vtigercrm/branches/4.2/include/utils.php (original)
+++ vtigercrm/branches/4.2/include/utils.php Fri Jun 16 15:33:12 2006
@@ -892,6 +892,7 @@
         $theme_path="themes/".$theme."/";
         $image_path=$theme_path."images/";
 	$fieldlabel = from_html($fieldlabel);
+	$filename = '';
 
 	//Commented for vulnerability fix as the convertion is added in Peardatabase - Philip
         //$value = htmlentities($col_fields[$fieldname]);
@@ -3030,6 +3031,7 @@
 function getListViewEntries($focus, $module,$list_result,$navigation_array,$relatedlist='',$returnset='',$edit_action='EditView',$del_action='Delete',$oCv='')
 {
 	global $adb, $theme, $app_strings;
+	$filename = '';
 	
 	$noofrows = $adb->num_rows($list_result);
 	$list_header = '<script>
@@ -3237,8 +3239,6 @@
 		$mod_dir=getModuleDirName($module);
 		if(isPermitted($module,1,$entity_id) == 'yes')
 		{
-
-
 			$list_header .='<a href="index.php?action='.$edit_action.'&module='.$mod_dir.'&record='.$entity_id.$returnset.'&filename='.$filename.'">'.$app_strings['LNK_EDIT'].'</a>&nbsp;|&nbsp;';
 		}
 		if(isPermitted($module,2,$entity_id) == 'yes')

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 Fri Jun 16 15:33:12 2006
@@ -233,8 +233,14 @@
 	$search_form->assign("MOD", $current_module_strings);
 	$search_form->assign("APP", $app_strings);
 
-	if ($order_by !='') $search_form->assign("ORDER_BY", $order_by);
-	if ($sorder !='') $search_form->assign("SORDER", $sorder);
+	if ($order_by !='')
+	{
+		$search_form->assign("ORDER_BY", $order_by);
+	}
+	if ($sorder !='')
+	{
+		$search_form->assign("SORDER", $sorder);
+	}
 
 	$search_form->assign("VIEWID",$viewid);
 	
@@ -325,7 +331,7 @@
 	<input name="viewname" type="hidden" value="'.$viewid.'">'; //give the viewid to hidden //customview
 if(isPermitted('Accounts',2,'') == 'yes')
 {
-        $other_text .=	'<td width="10"><input class="button" type="submit" value="'.$app_strings[LBL_MASS_DELETE].'" onclick="return massDelete()"/></td>';
+        $other_text .=	'<td width="10"><input class="button" type="submit" value="'.$app_strings['LBL_MASS_DELETE'].'" onclick="return massDelete()"/></td>';
 }
 if(isset($CActionDtls))
 {
@@ -357,9 +363,9 @@
 	<span class="sep">|</span>
 	<a href="index.php?module=Accounts&action=CustomView" class="link">'.$app_strings['LNK_CV_CREATEVIEW'].'</a>';
 }
-	$other_text .='<td align="right">'.$app_strings[LBL_VIEW].'
+	$other_text .='<td align="right">'.$app_strings['LBL_VIEW'].'
                         <SELECT NAME="view" onchange="showDefaultCustomView(this)">
-                                <OPTION VALUE="0">'.$mod_strings[LBL_ALL].'</option>
+                                <OPTION VALUE="0">'.$mod_strings['LBL_ALL'].'</option>
 				'.$customviewcombo_html.'
                         </SELECT>
 			'.$cvHTML.'
@@ -441,7 +447,7 @@
 $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;
+$record_string= $app_strings['LBL_SHOWING']." " .$start_rec." - ".$end_rec." " .$app_strings['LBL_LIST_OF'] ." ".$noofrows;
 
 //Retreive the List View Table Header
 if($viewid !='')

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 Fri Jun 16 15:33:12 2006
@@ -150,7 +150,7 @@
 	<td>';
 if(isPermitted('Notes',2,'') == 'yes')
 {
-        $other_text .='<input class="button" type="submit" value="'.$app_strings[LBL_MASS_DELETE].'" onclick="return massDelete()"/>';
+        $other_text .='<input class="button" type="submit" value="'.$app_strings['LBL_MASS_DELETE'].'" onclick="return massDelete()"/>';
 }
 
 if($viewid == 0)
@@ -168,9 +168,9 @@
 <a href="index.php?module=Notes&action=CustomView" class="link">'.$app_strings['LNK_CV_CREATEVIEW'].'</a>';
 }
 
-$other_text .='<td align="right">'.$app_strings[LBL_VIEW].'
+$other_text .='<td align="right">'.$app_strings['LBL_VIEW'].'
                         <SELECT NAME="view" onchange="showDefaultCustomView(this)">
-                                <OPTION VALUE="0">'.$mod_strings[LBL_ALL].'</option>
+                                <OPTION VALUE="0">'.$mod_strings['LBL_ALL'].'</option>
 				'.$customviewcombo_html.'
                         </SELECT>
 			'.$cvHTML.'
@@ -238,22 +238,27 @@
 	</script>";
 
 //Retreiving the start value from request
-if(isset($_REQUEST['start']) && $_REQUEST['start'] != '') {
-        $start = $_REQUEST['start'];
-} else {
-        $start = 1;
-}
+if(isset($_REQUEST['start']) && $_REQUEST['start'] != '')
+{
+	$start = $_REQUEST['start'];
+}
+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'];
 
-$record_string= $app_strings[LBL_SHOWING]." " .$start_rec." - ".$end_rec." " .$app_strings[LBL_LIST_OF] ." ".$noofrows;
-
+$record_string= $app_strings['LBL_SHOWING']." " .$start_rec." - ".$end_rec." " .$app_strings['LBL_LIST_OF'] ." ".$noofrows;
 
 //Retreive the List View Table Header
 if($viewid !='')
-$url_string .="&viewname=".$viewid;
+{
+	$url_string .="&viewname=".$viewid;
+}
 
 $listview_header = getListViewHeader($focus,"Notes",$url_string,$sorder,$order_by,"",$oCustomView);
 $xtpl->assign("LISTHEADER", $listview_header);
@@ -264,9 +269,13 @@
 $xtpl->assign("SELECT_SCRIPT", $view_script);
 
 if($order_by !='')
-$url_string .="&order_by=".$order_by;
+{
+	$url_string .="&order_by=".$order_by;
+}
 if($sorder !='')
-$url_string .="&sorder=".$sorder;
+{
+	$url_string .="&sorder=".$sorder;
+}
 
 $navigationOutput = getTableHeaderNavigation($navigation_array, $url_string,"Notes","index",$viewid);
 $xtpl->assign("NAVIGATION", $navigationOutput);
@@ -275,5 +284,4 @@
 $xtpl->parse("main");
 $xtpl->out("main");
 
-
 ?>




From vtiger-tickets at vtiger.fosslabs.com  Sat Jun 17 00:38:51 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sat, 17 Jun 2006 04:38:51 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23865=3A_?=
 =?utf-8?q?missing_label_and_image?=
In-Reply-To: <076.cbba2af40571aeadb462b203aa78494a@vtiger.fosslabs.com>
References: <076.cbba2af40571aeadb462b203aa78494a@vtiger.fosslabs.com>
Message-ID: <085.176926f09a0d59dd5161044e20efb51a@vtiger.fosslabs.com>

#865: missing label and image
------------------------+---------------------------------------------------
  Reporter:  mangai     |       Owner:  mangai
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mangai):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/865>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Sat Jun 17 00:40:16 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sat, 17 Jun 2006 04:40:16 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231121=3A?=
	=?utf-8?q?_Picklist_UI_is_broken?=
In-Reply-To: <076.aefce13e2b710220e208efde54caf14e@vtiger.fosslabs.com>
References: <076.aefce13e2b710220e208efde54caf14e@vtiger.fosslabs.com>
Message-ID: <085.a676b268a490f2c03178607acc078609@vtiger.fosslabs.com>

#1121: Picklist UI is broken
------------------------+---------------------------------------------------
  Reporter:  mangai     |       Owner:  mangai
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mangai):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1121>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Sat Jun 17 00:50:32 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sat, 17 Jun 2006 04:50:32 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23843=3A_?=
 =?utf-8?q?Settings_=3E_Studio_=3E_Custom_Field_Settings_=3E_New_Custom_Fi?=
 =?utf-8?q?eld_Menu?=
In-Reply-To: <076.36c563ce6b93b6329417988edcf38a5b@vtiger.fosslabs.com>
References: <076.36c563ce6b93b6329417988edcf38a5b@vtiger.fosslabs.com>
Message-ID: <085.433c2b1b637da08a2832a25ff4d9b6f7@vtiger.fosslabs.com>

#843: Settings > Studio > Custom Field Settings > New Custom Field Menu
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  minnie
      Type:  defect     |      Status:  closed
  Priority:  minor      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  wontfix    |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mangai):

  * resolution:  => wontfix
  * status:  new => closed

Comment:

 We are having type '''Text''' and '''Text Area''' for two different
 fields.

 Type:'''Text''' - allow maximum of 255 characters.so it is useful to
 create fields like First Name,Company Name etc.
 Type:'''Text Area''' - It is useful to create fields like
 Description,Terms and Conditions etc.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/843>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 17 01:14:59 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 05:14:59 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7203 -
	/vtigercrm/trunk/Smarty/templates/PopupContents.tpl
Message-ID: <20060617051459.AB6FC7ED3AC@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 16 23:14:55 2006
New Revision: 7203

Log:
select label has been modified

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

Modified: vtigercrm/trunk/Smarty/templates/PopupContents.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/PopupContents.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/PopupContents.tpl Fri Jun 16 23:14:55 2006
@@ -14,7 +14,7 @@
 <table width="100%" border="0" cellspacing="0" cellpadding="0" class="small">
 	<tr>
 	{if $SELECT eq 'enable'}
-		<td style="padding-left:10px;" align="left"><input class="small" type="button" value="Add Contacts" onclick="if(SelectAll()) window.close();"/></td>
+		<td style="padding-left:10px;" align="left"><input class="small" type="button" value="Add {$MODULE}" onclick="if(SelectAll()) window.close();"/></td>
 	{else}		
 		<td>&nbsp;</td>	
 	{/if}




From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 17 01:20:04 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 05:20:04 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7204 -
	/vtigercrm/trunk/themes/blue/style.css
Message-ID: <20060617052004.82CD27ED3AF@vtiger.fosslabs.com>

Author: richie
Date: Fri Jun 16 23:19:59 2006
New Revision: 7204

Log:
Updated the style.css file

Added:
    vtigercrm/trunk/themes/blue/style.css




From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 17 01:27:38 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 05:27:38 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7205 -
 /vtigercrm/trunk/modules/Settings/language/en_us.lang.php
Message-ID: <20060617052738.E323C7ED3A7@vtiger.fosslabs.com>

Author: richie
Date: Fri Jun 16 23:27:33 2006
New Revision: 7205

Log:
Updated the language file

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




From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 17 01:31:31 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 05:31:31 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7206 - in
 /vtigercrm/trunk/Smarty/templates/Settings: CompanyInfo.tpl EmailConfig.tpl
 InventoryTerms.tpl TaxConfig.tpl
Message-ID: <20060617053131.6E8477ED3A7@vtiger.fosslabs.com>

Author: richie
Date: Fri Jun 16 23:31:25 2006
New Revision: 7206

Log:
Updated the tpl files for new settings ui

Added:
    vtigercrm/trunk/Smarty/templates/Settings/CompanyInfo.tpl
    vtigercrm/trunk/Smarty/templates/Settings/EmailConfig.tpl
    vtigercrm/trunk/Smarty/templates/Settings/InventoryTerms.tpl
    vtigercrm/trunk/Smarty/templates/Settings/TaxConfig.tpl




From vtiger-tickets at vtiger.fosslabs.com  Sat Jun 17 02:41:16 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sat, 17 Jun 2006 06:41:16 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23268=3A_?=
 =?utf-8?q?Selection_in_multiple_pages_from_list_view_is_not_supported?=
In-Reply-To: <076.30c1b9af33fc83b78b78088399b52250@vtiger.fosslabs.com>
References: <076.30c1b9af33fc83b78b78088399b52250@vtiger.fosslabs.com>
Message-ID: <085.974ce894681c3e2c4d077d412b83f145@vtiger.fosslabs.com>

#268: Selection in multiple pages from list view is not supported
------------------------+---------------------------------------------------
  Reporter:  don        |       Owner:  philip
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.1 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by anonymous):

  * version:  5.0.0 => 5.0.1

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/268>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Sat Jun 17 02:54:39 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sat, 17 Jun 2006 06:54:39 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231333=3A?=
 =?utf-8?q?_Avoid_Usage_of_Plural_forms_for_Create_Record?=
Message-ID: <076.18d7de57d208fc4aee376b0dac1a75a7@vtiger.fosslabs.com>

#1333: Avoid Usage of Plural forms for Create Record
-----------------------+----------------------------------------------------
 Reporter:  gopal      |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  major      |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 Currently we are using Create Contacts, Create Leads, Create Campaigns
 etc..

 But in a single click we are creating a single Contact, Lead, or Campaign.
 Hence it is better to Change the Alt text to Create Contact, Create Lead,
 Create Campaign respectively.

 Gopal

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1333>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 17 03:03:01 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 07:03:01 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7207 - in
 /vtigercrm/trunk/Smarty/templates: Inventory/InventoryEditView.tpl
 salesEditView.tpl
Message-ID: <20060617070301.9CD7D7ED3B3@vtiger.fosslabs.com>

Author: saraj
Date: Sat Jun 17 01:02:57 2006
New Revision: 7207

Log:
changes made to fix the issue 1040

Modified:
    vtigercrm/trunk/Smarty/templates/Inventory/InventoryEditView.tpl
    vtigercrm/trunk/Smarty/templates/salesEditView.tpl

Modified: vtigercrm/trunk/Smarty/templates/Inventory/InventoryEditView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Inventory/InventoryEditView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Inventory/InventoryEditView.tpl Sat Jun 17 01:02:57 2006
@@ -80,7 +80,7 @@
 	                                        <td class="dvtTabCache" style="width:10px">&nbsp;</td>
 
         	                                {if $OP_MODE neq 'create_view'}
-	                                        <td class="dvtUnSelectedCell" align=center nowrap><a href="index.php?action=CallRelatedList&module={$MODULE}&record={$ID}&parenttab={$CATEGORY}" onclick="getRelatedLink()">{$APP.LBL_MORE} {$APP.LBL_INFORMATION}</a></td>
+	                                        <td class="dvtUnSelectedCell" align=center nowrap><a href="index.php?action=CallRelatedList&module={$MODULE}&record={$ID}&parenttab={$CATEGORY}&mode={$OP_MODE}" onclick="getRelatedLink()">{$APP.LBL_MORE} {$APP.LBL_INFORMATION}</a></td>
         	                                {/if}
 
                 	                        <td class="dvtTabCache" style="width:100%">&nbsp;</td>

Modified: vtigercrm/trunk/Smarty/templates/salesEditView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/salesEditView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/salesEditView.tpl Sat Jun 17 01:02:57 2006
@@ -82,7 +82,7 @@
 						<td class="dvtTabCache" style="width:10px">&nbsp;</td>
 
 	               	                        {if $OP_MODE neq 'create_view'}
-                				<td class="dvtUnSelectedCell" align=center nowrap><a href="index.php?action=CallRelatedList&module={$MODULE}&record={$ID}&parenttab={$CATEGORY}" onclick="getRelatedLink()">{$APP.LBL_MORE} {$APP.LBL_INFORMATION}</a></td>
+                				<td class="dvtUnSelectedCell" align=center nowrap><a href="index.php?action=CallRelatedList&module={$MODULE}&record={$ID}&parenttab={$CATEGORY}&mode={$OP_MODE}" onclick="getRelatedLink()">{$APP.LBL_MORE} {$APP.LBL_INFORMATION}</a></td>
 						{/if}
 
 						<td class="dvtTabCache" style="width:100%">&nbsp;</td>




From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 17 03:06:35 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 07:06:35 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7208 -
	/vtigercrm/trunk/Smarty/templates/RelatedLists.tpl
Message-ID: <20060617070635.D6ADE7ED3B7@vtiger.fosslabs.com>

Author: saraj
Date: Sat Jun 17 01:06:32 2006
New Revision: 7208

Log:
changes made to fix the issue 1040

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

Modified: vtigercrm/trunk/Smarty/templates/RelatedLists.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/RelatedLists.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/RelatedLists.tpl Sat Jun 17 01:06:32 2006
@@ -35,11 +35,16 @@
 			<td>
 				<table border=0 cellspacing=0 cellpadding=3 width=100% class="small">
 				<tr>
+					{if $OP_MODE eq 'edit_view'}
+                                                {assign var="action" value="EditView"}
+                                        {else}
+                                                {assign var="action" value="DetailView"}
+                                        {/if}
 					<td class="dvtTabCache" style="width:10px" nowrap>&nbsp;</td>
 					{if $MODULE eq 'Activities'}
-                                                <td class="dvtUnSelectedCell" align=center nowrap><a href="index.php?action=DetailView&module={$MODULE}&record={$ID}&activity_mode={$ACTIVITY_MODE}&parenttab={$CATEGORY}">{$SINGLE_MOD} {$APP.LBL_INFORMATION}</a></td>
+                                                <td class="dvtUnSelectedCell" align=center nowrap><a href="index.php?action={$action}&module={$MODULE}&record={$ID}&activity_mode={$ACTIVITY_MODE}&parenttab={$CATEGORY}">{$SINGLE_MOD} {$APP.LBL_INFORMATION}</a></td>
                                         {else}
-                                        <td class="dvtUnSelectedCell" align=center nowrap><a href="index.php?action=DetailView&module={$MODULE}&record={$ID}&parenttab={$CATEGORY}">{$SINGLE_MOD} {$APP.LBL_INFORMATION}</a></td>
+                                        <td class="dvtUnSelectedCell" align=center nowrap><a href="index.php?action={$action}&module={$MODULE}&record={$ID}&parenttab={$CATEGORY}">{$SINGLE_MOD} {$APP.LBL_INFORMATION}</a></td>
                                         {/if}
 					<td class="dvtTabCache" style="width:10px">&nbsp;</td>
 					<td class="dvtSelectedCell" align=center nowrap>{$APP.LBL_MORE} {$APP.LBL_INFORMATION}</td>




From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 17 03:15:11 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 07:15:11 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7209 - in
 /vtigercrm/trunk/modules: Accounts/CallRelatedList.php
 Activities/CallRelatedList.php Campaigns/CallRelatedList.php
 Contacts/CallRelatedList.php Emails/CallRelatedList.php
 HelpDesk/CallRelatedList.php
Message-ID: <20060617071511.E87687ED3B9@vtiger.fosslabs.com>

Author: saraj
Date: Sat Jun 17 01:15:02 2006
New Revision: 7209

Log:
changes made to fix the issue 1040

Modified:
    vtigercrm/trunk/modules/Accounts/CallRelatedList.php
    vtigercrm/trunk/modules/Activities/CallRelatedList.php
    vtigercrm/trunk/modules/Campaigns/CallRelatedList.php
    vtigercrm/trunk/modules/Contacts/CallRelatedList.php
    vtigercrm/trunk/modules/Emails/CallRelatedList.php
    vtigercrm/trunk/modules/HelpDesk/CallRelatedList.php

Modified: vtigercrm/trunk/modules/Accounts/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/Accounts/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/Accounts/CallRelatedList.php Sat Jun 17 01:15:02 2006
@@ -39,7 +39,9 @@
 if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') {
         $focus->id = "";
 }
-
+if(isset($_REQUEST['mode']) && $_REQUEST['mode'] != ' ') {
+	$smarty->assign("OP_MODE",$_REQUEST['mode']);
+}
  if(!$_SESSION['rlvs'][$module])
  {
        unset($_SESSION['rlvs']);

Modified: vtigercrm/trunk/modules/Activities/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/Activities/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/Activities/CallRelatedList.php Sat Jun 17 01:15:02 2006
@@ -41,7 +41,9 @@
 $smarty->assign("APP", $app_strings);
 $smarty->assign("UPDATEINFO",updateInfo($focus->id));
 if (isset($focus->name)) $smarty->assign("NAME", $focus->name);
-
+if(isset($_REQUEST['mode']) && $_REQUEST['mode'] != ' ') {
+	$smarty->assign("OP_MODE",$_REQUEST['mode']);
+}
 $related_array = getRelatedLists("Activities", $focus);
 $smarty->assign("id",$focus->id);
 $smarty->assign("RELATEDLISTS", $related_array);

Modified: vtigercrm/trunk/modules/Campaigns/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/Campaigns/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/Campaigns/CallRelatedList.php Sat Jun 17 01:15:02 2006
@@ -41,7 +41,9 @@
 if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') {
         $focus->id = "";
 }
-
+if(isset($_REQUEST['mode']) && $_REQUEST['mode'] != ' ') {
+	$smarty->assign("OP_MODE",$_REQUEST['mode']);
+}
 if (isset($focus->name)) $smarty->assign("NAME", $focus->name);
 $related_array=getRelatedLists($currentModule,$focus);
 $smarty->assign("RELATEDLISTS", $related_array);

Modified: vtigercrm/trunk/modules/Contacts/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/Contacts/CallRelatedList.php Sat Jun 17 01:15:02 2006
@@ -53,6 +53,9 @@
 if(isset($_request['isduplicate']) && $_request['isduplicate'] == 'true') {
         $focus->id = "";
 }
+if(isset($_REQUEST['mode']) && $_REQUEST['mode'] != ' ') {
+	$smarty->assign("OP_MODE",$_REQUEST['mode']);
+}
 $parent_email = getEmailParentsList('Contacts',$_REQUEST['record']);
         $smarty->assign("HIDDEN_PARENTS_LIST",$parent_email);
 $category = getparenttab();

Modified: vtigercrm/trunk/modules/Emails/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/Emails/CallRelatedList.php Sat Jun 17 01:15:02 2006
@@ -42,7 +42,9 @@
 $related_array=getRelatedLists($currentModule,$focus);
 $category = getParentTab();
 $smarty->assign("CATEGORY",$category);
-
+if(isset($_REQUEST['mode']) && $_REQUEST['mode'] != ' ') {
+        $smarty->assign("OP_MODE",$_REQUEST['mode']);
+}
 $smarty->assign("id",$focus->id);
 $smarty->assign("RELATEDLISTS", $related_array);
 $smarty->assign("ID",$RECORD );

Modified: vtigercrm/trunk/modules/HelpDesk/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/HelpDesk/CallRelatedList.php Sat Jun 17 01:15:02 2006
@@ -41,7 +41,9 @@
 if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') {
         $focus->id = "";
 }
-
+if(isset($_REQUEST['mode']) && $_REQUEST['mode'] != ' ') {
+        $smarty->assign("OP_MODE",$_REQUEST['mode']);
+}
 if (isset($focus->name)) $smarty->assign("NAME", $focus->name);
 $related_array=getRelatedLists($currentModule,$focus);
 $smarty->assign("RELATEDLISTS", $related_array);




From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 17 03:24:06 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 07:24:06 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7210 - in
 /vtigercrm/trunk/modules: Invoice/ Leads/ Potentials/ PriceBooks/ Products/
 PurchaseOrder/ Quotes/
Message-ID: <20060617072407.1535F7ED3B9@vtiger.fosslabs.com>

Author: saraj
Date: Sat Jun 17 01:23:56 2006
New Revision: 7210

Log:
changes made to fix the issue 1040

Modified:
    vtigercrm/trunk/modules/Invoice/CallRelatedList.php
    vtigercrm/trunk/modules/Leads/CallRelatedList.php
    vtigercrm/trunk/modules/Potentials/CallRelatedList.php
    vtigercrm/trunk/modules/PriceBooks/CallRelatedList.php
    vtigercrm/trunk/modules/Products/CallRelatedList.php
    vtigercrm/trunk/modules/PurchaseOrder/CallRelatedList.php
    vtigercrm/trunk/modules/Quotes/CallRelatedList.php

Modified: vtigercrm/trunk/modules/Invoice/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/Invoice/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/Invoice/CallRelatedList.php Sat Jun 17 01:23:56 2006
@@ -40,6 +40,9 @@
 $smarty->assign("RELATEDLISTS", $related_array);
 $category = getParentTab();
 $smarty->assign("CATEGORY",$category);
+if(isset($_REQUEST['mode']) && $_REQUEST['mode'] != ' ') {
+	$smarty->assign("OP_MODE",$_REQUEST['mode']);
+}
 
 $smarty->assign("id",$focus->id);
 $smarty->assign("ID",$RECORD );

Modified: vtigercrm/trunk/modules/Leads/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/Leads/CallRelatedList.php Sat Jun 17 01:23:56 2006
@@ -41,7 +41,10 @@
 if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') {
         $focus->id = "";
 }
-
+if(isset($_REQUEST['mode']) && $_REQUEST['mode'] != ' ') {
+	$smarty->assign("OP_MODE",$_REQUEST['mode']);
+}
+		
  if(!$_SESSION['rlvs'][$module])
  {
        unset($_SESSION['rlvs']);

Modified: vtigercrm/trunk/modules/Potentials/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/Potentials/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/Potentials/CallRelatedList.php Sat Jun 17 01:23:56 2006
@@ -37,6 +37,9 @@
 if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') {
         $focus->id = "";
 }
+if(isset($_REQUEST['mode']) && $_REQUEST['mode'] != ' ') {
+        $smarty->assign("OP_MODE",$_REQUEST['mode']);
+}
 if (isset($focus->name)) $smarty->assign("NAME", $focus->name);
 $related_array = getRelatedLists($currentModule,$focus);
 $smarty->assign("RELATEDLISTS", $related_array);

Modified: vtigercrm/trunk/modules/PriceBooks/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/PriceBooks/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/PriceBooks/CallRelatedList.php Sat Jun 17 01:23:56 2006
@@ -47,7 +47,9 @@
 	$smarty->assign("NAME", $focus->name);
 $category = getParentTab();
 $smarty->assign("CATEGORY",$category);
-
+if(isset($_REQUEST['mode']) && $_REQUEST['mode'] != ' ') {
+	$smarty->assign("OP_MODE",$_REQUEST['mode']);
+}
 $smarty->assign("id",$focus->id);
 $smarty->assign("ID",$RECORD );
 $smarty->assign("MODULE",$currentmodule);

Modified: vtigercrm/trunk/modules/Products/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/Products/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/Products/CallRelatedList.php Sat Jun 17 01:23:56 2006
@@ -37,7 +37,9 @@
 {
         $focus->id = "";
 }
-
+if(isset($_REQUEST['mode']) && $_REQUEST['mode'] != ' ') {
+	$smarty->assign("OP_MODE",$_REQUEST['mode']);
+}
 if (isset($focus->name)) $smarty->assign("NAME", $focus->name);
 $related_array=getRelatedLists($currentModule,$focus);
 $smarty->assign("RELATEDLISTS", $related_array);

Modified: vtigercrm/trunk/modules/PurchaseOrder/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/PurchaseOrder/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/PurchaseOrder/CallRelatedList.php Sat Jun 17 01:23:56 2006
@@ -37,7 +37,9 @@
 $smarty->assign("RELATEDLISTS", $related_array);
 $category = getParentTab();
 $smarty->assign("CATEGORY",$category);
-
+if(isset($_REQUEST['mode']) && $_REQUEST['mode'] != ' ') {
+	$smarty->assign("OP_MODE",$_REQUEST['mode']);
+}
 $smarty->assign("id",$focus->id);
 $smarty->assign("ID",$RECORD );
 $smarty->assign("MODULE",$currentmodule);

Modified: vtigercrm/trunk/modules/Quotes/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/Quotes/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/Quotes/CallRelatedList.php Sat Jun 17 01:23:56 2006
@@ -37,7 +37,9 @@
 $smarty->assign("RELATEDLISTS", $related_array);
 $category = getParentTab();
 $smarty->assign("CATEGORY",$category);
-
+if(isset($_REQUEST['mode']) && $_REQUEST['mode'] != ' ') {
+	$smarty->assign("OP_MODE",$_REQUEST['mode']);
+}
 $smarty->assign("id",$focus->id);
 $smarty->assign("ID",$RECORD );
 $smarty->assign("MODULE",$currentmodule);




From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 17 03:26:27 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 07:26:27 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7211 - in
 /vtigercrm/trunk/modules: SalesOrder/CallRelatedList.php
 Vendors/CallRelatedList.php
Message-ID: <20060617072627.569E87ED3B9@vtiger.fosslabs.com>

Author: saraj
Date: Sat Jun 17 01:26:21 2006
New Revision: 7211

Log:
changes made to fix the issue 1040

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

Modified: vtigercrm/trunk/modules/SalesOrder/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/SalesOrder/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/SalesOrder/CallRelatedList.php Sat Jun 17 01:26:21 2006
@@ -31,6 +31,9 @@
 
 $smarty = new vtigerCRM_Smarty;
 
+if(isset($_REQUEST['mode']) && $_REQUEST['mode'] != ' ') {
+        $smarty->assign("OP_MODE",$_REQUEST['mode']);
+}
 if (isset($focus->name)) $smarty->assign("NAME", $focus->name);
 $related_array=getRelatedLists($currentModule,$focus);
 $smarty->assign("RELATEDLISTS", $related_array);

Modified: vtigercrm/trunk/modules/Vendors/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/Vendors/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/Vendors/CallRelatedList.php Sat Jun 17 01:26:21 2006
@@ -45,6 +45,9 @@
 $category = getParentTab();
 $smarty->assign("CATEGORY",$category);
 
+if(isset($_REQUEST['mode']) && $_REQUEST['mode'] != ' ') {
+        $smarty->assign("OP_MODE",$_REQUEST['mode']);
+}
 if(isset($focus->name))
 $smarty->assign("UPDATEINFO",updateInfo($focus->id));
 $smarty->assign("NAME", $focus->name);




From vtiger-tickets at vtiger.fosslabs.com  Sat Jun 17 03:27:00 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sat, 17 Jun 2006 07:27:00 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231040=3A?=
 =?utf-8?q?_in_editview=2C_entiry_information_goes_to_detailview_after_cli?=
 =?utf-8?q?ck_on_more_information?=
In-Reply-To: <076.80dd04e6af4a83501512f60298676764@vtiger.fosslabs.com>
References: <076.80dd04e6af4a83501512f60298676764@vtiger.fosslabs.com>
Message-ID: <085.1e1f2a31c971eb5a64e6f9d71d9121dd@vtiger.fosslabs.com>

#1040: in editview, entiry information goes to detailview after click on more
information
--------------------------+-------------------------------------------------
  Reporter:  mickie       |       Owner:  mangai
      Type:  enhancement  |      Status:  closed
  Priority:  major        |   Milestone:        
 Component:  vtigercrm    |     Version:  5.0.0 
Resolution:  fixed        |    Keywords:        
--------------------------+-------------------------------------------------
Changes (by mangai):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 fixed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1040>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 17 03:33:10 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 07:33:10 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7212 -
	/vtigercrm/trunk/modules/SalesOrder/SalesOrder.php
Message-ID: <20060617073311.129217ED3B9@vtiger.fosslabs.com>

Author: don
Date: Sat Jun 17 01:33:05 2006
New Revision: 7212

Log:
Fixed issues in vtiger_ prefixing in table names

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

Modified: vtigercrm/trunk/modules/SalesOrder/SalesOrder.php
==============================================================================
--- vtigercrm/trunk/modules/SalesOrder/SalesOrder.php (original)
+++ vtigercrm/trunk/modules/SalesOrder/SalesOrder.php Sat Jun 17 01:33:05 2006
@@ -33,13 +33,13 @@
 	var $log;
 	var $db;
 
-	var $table_name = "salesorder";
+	var $table_name = "vtiger_salesorder";
 	var $tab_name = Array('vtiger_crmentity','vtiger_salesorder','vtiger_sobillads','vtiger_soshipads','vtiger_salesordercf');
 	var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_salesorder'=>'salesorderid','vtiger_sobillads'=>'sobilladdressid','vtiger_soshipads'=>'soshipaddressid','vtiger_salesordercf'=>'salesorderid');
 	
-	var $entity_table = "crmentity";
-	
-	var $billadr_table = "sobillads";
+	var $entity_table = "vtiger_crmentity";
+	
+	var $billadr_table = "vtiger_sobillads";
 
 	var $object_name = "SalesOrder";
 
@@ -146,7 +146,7 @@
 		$button = '';
 
 		$returnset = '&return_module=SalesOrder&return_action=DetailView&return_id='.$id;
-		$query = "SELECT vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid, vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and (activitytype='Task' or vtiger_activitytype='Call' or vtiger_activitytype='Meeting') and vtiger_crmentity.deleted=0 and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Completed') and (vtiger_activity.status is not NULL && vtiger_activity.status !='Deferred') or (vtiger_activity.eventstatus != '' &&  vtiger_activity.eventstatus = 'Planned')";
+		$query = "SELECT vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid, vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting') and vtiger_crmentity.deleted=0 and (vtiger_activity.status is not NULL && activity.status != 'Completed') and (vtiger_activity.status is not NULL && vtiger_activity.status !='Deferred') or (vtiger_activity.eventstatus != '' &&  vtiger_activity.eventstatus = 'Planned')";
 		$log->debug("Exiting get_activities method ...");
 		return GetRelatedList('SalesOrder','Activities',$focus,$query,$button,$returnset);
 	}
@@ -192,7 +192,7 @@
 		// Inserted inner join vtiger_users on vtiger_crmentity.smcreatorid= vtiger_users.id
 		$query = "select vtiger_notes.title,'Notes      '  ActivityType, vtiger_notes.filename,
 		vtiger_attachments.type  FileType,crm2.modifiedtime lastmodified,
-		vtiger_seattachmentsrel.attachmentsid vtiger_attachmentsid, vtiger_notes.notesid crmid,
+		vtiger_seattachmentsrel.attachmentsid attachmentsid, vtiger_notes.notesid crmid,
 		vtiger_crmentity.createdtime, vtiger_notes.notecontent description, vtiger_users.user_name
 		from vtiger_notes
 			inner join vtiger_senotesrel on vtiger_senotesrel.notesid= vtiger_notes.notesid
@@ -209,7 +209,7 @@
 		// Inserted order by createdtime desc
 		$query .= "select vtiger_attachments.description  title ,'Attachments'  ActivityType,
 		vtiger_attachments.name  filename, vtiger_attachments.type  FileType, crm2.modifiedtime lastmodified,
-		vtiger_attachments.attachmentsid  vtiger_attachmentsid, vtiger_seattachmentsrel.attachmentsid crmid,
+		vtiger_attachments.attachmentsid  attachmentsid, vtiger_seattachmentsrel.attachmentsid crmid,
 		vtiger_crmentity.createdtime, vtiger_attachments.description, vtiger_users.user_name
 		from vtiger_attachments
 			inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid= vtiger_attachments.attachmentsid




From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 17 03:37:46 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 07:37:46 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7213 -
	/vtigercrm/trunk/modules/SalesOrder/SalesOrder.php
Message-ID: <20060617073746.D17D57ED3B9@vtiger.fosslabs.com>

Author: don
Date: Sat Jun 17 01:37:43 2006
New Revision: 7213

Log:
Fixed issues in vtiger_ prefixing in table names

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

Modified: vtigercrm/trunk/modules/SalesOrder/SalesOrder.php
==============================================================================
--- vtigercrm/trunk/modules/SalesOrder/SalesOrder.php (original)
+++ vtigercrm/trunk/modules/SalesOrder/SalesOrder.php Sat Jun 17 01:37:43 2006
@@ -146,7 +146,7 @@
 		$button = '';
 
 		$returnset = '&return_module=SalesOrder&return_action=DetailView&return_id='.$id;
-		$query = "SELECT vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid, vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting') and vtiger_crmentity.deleted=0 and (vtiger_activity.status is not NULL && activity.status != 'Completed') and (vtiger_activity.status is not NULL && vtiger_activity.status !='Deferred') or (vtiger_activity.eventstatus != '' &&  vtiger_activity.eventstatus = 'Planned')";
+		$query = "SELECT vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid, vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting') and vtiger_crmentity.deleted=0 and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Completed') and (vtiger_activity.status is not NULL && vtiger_activity.status !='Deferred') or (vtiger_activity.eventstatus != '' &&  vtiger_activity.eventstatus = 'Planned')";
 		$log->debug("Exiting get_activities method ...");
 		return GetRelatedList('SalesOrder','Activities',$focus,$query,$button,$returnset);
 	}
@@ -170,7 +170,7 @@
 				inner join vtiger_users on vtiger_crmentity.smcreatorid=vtiger_users.id
 				left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_activity.activityid
                                 left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname
-			where (activitytype='Task' or vtiger_activitytype='Call' or vtiger_activitytype='Meeting')
+			where (activitytype='Task' or activitytype='Call' or activitytype='Meeting')
 				and (vtiger_activity.status = 'Completed' or vtiger_activity.status = 'Deferred' or (vtiger_activity.eventstatus !='Planned' and vtiger_activity.eventstatus != ''))
 				and vtiger_seactivityrel.crmid=".$id;
 		//Don't add order by, because, for security, one more condition will be added with this query in include/RelatedListView.php




From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 17 04:16:27 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 08:16:27 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7214 -
	/vtigercrm/trunk/include/js/smoothscroll.js
Message-ID: <20060617081627.08D7B7ED3B9@vtiger.fosslabs.com>

Author: richie
Date: Sat Jun 17 02:16:21 2006
New Revision: 7214

Log:
Added the smoothscroll.js for new settings ui

Added:
    vtigercrm/trunk/include/js/smoothscroll.js




From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 17 05:32:04 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 09:32:04 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7215 - in
 /vtigercrm/trunk/modules/Settings: AddCustomFieldToDB.php
 UpdateComboValues.php
Message-ID: <20060617093204.D461E7ED3CD@vtiger.fosslabs.com>

Author: saraj
Date: Sat Jun 17 03:31:59 2006
New Revision: 7215

Log:
changes made to fix the issue 1322 and 1285

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

Modified: vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php (original)
+++ vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php Sat Jun 17 03:31:59 2006
@@ -281,9 +281,13 @@
 		if($fldType == 'Picklist' || $fldType == 'MultiSelectCombo')
 		{
 			// Creating the PickList Table and Populating Values
-			$adb->createTable('vtiger_'.$columnName, $columnName." C(255)");
-			//Adding Primary Key
-			$qur = "ALTER table vtiger_".$columnName." ADD PRIMARY KEY (". $columnName.")";
+			$qur = "CREATE TABLE vtiger_".$columnName." (
+					".$columnName."id int(19) NOT NULL auto_increment,
+					".$columnName." varchar(200) NOT NULL,
+					sortorderid int(19) NOT NULL default '0',
+					presence int(1) NOT NULL default '1',
+				        PRIMARY KEY  (".$columnName."id)
+				)";
 			$adb->query($qur);
 
 			$fldPickList =  $_REQUEST['fldPickList'];
@@ -292,9 +296,10 @@
 			for($i = 0; $i < $count; $i++)
 			{
 				$pickArray[$i] = trim($pickArray[$i]);
+				$id = $adb->getUniqueID($columnName);
 				if($pickArray[$i] != '')
 				{
-					$query = "insert into vtiger_".$columnName." values('".$pickArray[$i]."')";
+					$query = "insert into vtiger_".$columnName." values(".$id.",'".$pickArray[$i]."',".$i.",1)";
 					$adb->query($query);
 				}
 			}

Modified: vtigercrm/trunk/modules/Settings/UpdateComboValues.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/UpdateComboValues.php (original)
+++ vtigercrm/trunk/modules/Settings/UpdateComboValues.php Sat Jun 17 03:31:59 2006
@@ -30,11 +30,8 @@
 	$pickArray[$i] = trim($pickArray[$i]);
 	if($pickArray[$i] != '')
 	{
-		if($custom)
-			$query = "insert into vtiger_".$tableName." values('".$pickArray[$i]."')";
-		else
-			$query = "insert into vtiger_".$tableName." values('','".$pickArray[$i]."',".$i.",1)";
-        $adb->query($query);
+		$query = "insert into vtiger_".$tableName." values('','".$pickArray[$i]."',".$i.",1)";
+	        $adb->query($query);
 	}
 }
 header("Location:index.php?action=SettingsAjax&module=Settings&directmode=ajax&file=PickList&fld_module=".$fld_module);




From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 17 05:33:40 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 09:33:40 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7216 -
	/vtigercrm/trunk/include/utils/EditViewUtils.php
Message-ID: <20060617093340.D00F67ED3CD@vtiger.fosslabs.com>

Author: saraj
Date: Sat Jun 17 03:33:37 2006
New Revision: 7216

Log:
vtiger_ updated

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

Modified: vtigercrm/trunk/include/utils/EditViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/EditViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/EditViewUtils.php Sat Jun 17 03:33:37 2006
@@ -139,10 +139,10 @@
 		$editview_label[]=$mod_strings[$fieldlabel];
 		$fieldvalue [] = $value;
 	}
-	elseif($uitype ==33)
-	{
-		$editview_label[]=$mod_strings[$fieldlabel];
-		$mulsel="select * from ".$fieldname;
+	elseif($uitype == 33)
+	{
+		$editview_label[]=$mod_strings[$fieldlabel];
+		$mulsel="select * from vtiger_".$fieldname;
 		$multiselect_result = $adb->query($mulsel);
 		$noofoptions = $adb->num_rows($multiselect_result);
 		$options = array();




From vtiger-tickets at vtiger.fosslabs.com  Sat Jun 17 05:34:20 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sat, 17 Jun 2006 09:34:20 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231322=3A?=
 =?utf-8?q?_issue_in_customfield_picklist?=
In-Reply-To: <076.0444d61c632efd55ca5f5274820cefee@vtiger.fosslabs.com>
References: <076.0444d61c632efd55ca5f5274820cefee@vtiger.fosslabs.com>
Message-ID: <085.a41a6c39a656e67cb9a09d1c0a1447c3@vtiger.fosslabs.com>

#1322: issue in customfield picklist
------------------------+---------------------------------------------------
  Reporter:  mangai     |       Owner:  mangai
      Type:  defect     |      Status:  closed
  Priority:  blocker    |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mangai):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 fixed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1322>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Sat Jun 17 05:36:45 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sat, 17 Jun 2006 09:36:45 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231285=3A?=
 =?utf-8?q?_picklist_-_custom_field?=
In-Reply-To: <076.d54873cd2f44419ccf2fc08db8faed61@vtiger.fosslabs.com>
References: <076.d54873cd2f44419ccf2fc08db8faed61@vtiger.fosslabs.com>
Message-ID: <085.e0fad10affc05c1034165e057b6f8cea@vtiger.fosslabs.com>

#1285: picklist - custom field
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  minnie
      Type:  defect     |      Status:  closed
  Priority:  blocker    |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mangai):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 fixed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1285>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Sat Jun 17 05:37:42 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sat, 17 Jun 2006 09:37:42 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231334=3A?=
	=?utf-8?q?_Calendar_translation?=
Message-ID: <076.9648d4b16d7e7ade09293afbcbfcb43e@vtiger.fosslabs.com>

#1334: Calendar translation
-----------------------------------+----------------------------------------
 Reporter:  abos                   |       Owner:  developer
     Type:  defect                 |      Status:  new      
 Priority:  minor                  |   Milestone:           
Component:  vtigercrm              |     Version:  5.0.0    
 Keywords:  calendar, translation  |  
-----------------------------------+----------------------------------------
 Hi,
 in calendar the term "View" (top of the calendar) is not translated,
 The dropdown for create events/task is too small for french,
 The term "None Scheduled" is not translated,
 Thanks

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1334>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 17 05:57:39 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 09:57:39 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7217 -
	/vtigercrm/trunk/modules/Invoice/Invoice.php
Message-ID: <20060617095739.C55387ED3CD@vtiger.fosslabs.com>

Author: don
Date: Sat Jun 17 03:57:35 2006
New Revision: 7217

Log:
Fixed issues in vtiger_ prefixing in table names

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

Modified: vtigercrm/trunk/modules/Invoice/Invoice.php
==============================================================================
--- vtigercrm/trunk/modules/Invoice/Invoice.php (original)
+++ vtigercrm/trunk/modules/Invoice/Invoice.php Sat Jun 17 03:57:35 2006
@@ -144,7 +144,7 @@
 
 		$returnset = '&return_module=Invoice&return_action=DetailView&return_id='.$id;
 
-		$query = "SELECT vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid, vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and (activitytype='Task' or vtiger_activitytype='Call' or vtiger_activitytype='Meeting') and vtiger_crmentity.deleted=0 and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Completed') and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Deferred') or (vtiger_activity.eventstatus != '' &&  vtiger_activity.eventstatus = 'Planned')";
+		$query = "SELECT vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid, vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or ativitytype='Meeting') and vtiger_crmentity.deleted=0 and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Completed') and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Deferred') or (vtiger_activity.eventstatus != '' &&  vtiger_activity.eventstatus = 'Planned')";
 		$log->debug("Exiting get_activities method ...");
 		return  GetRelatedList('Invoice','Activities',$focus,$query,$button,$returnset);
 	}
@@ -180,7 +180,7 @@
 		// Inserted inner join vtiger_users on crm2.smcreatorid= vtiger_users.id
 		$query = "select vtiger_notes.title,'Notes      '  ActivityType, vtiger_notes.filename,
 		vtiger_attachments.type  FileType,crm2.modifiedtime lastmodified,
-		vtiger_seattachmentsrel.attachmentsid vtiger_attachmentsid, vtiger_notes.notesid crmid,
+		vtiger_seattachmentsrel.attachmentsid attachmentsid, vtiger_notes.notesid crmid,
 			crm2.createdtime, vtiger_notes.notecontent description, vtiger_users.user_name
 		from vtiger_notes
 			inner join vtiger_senotesrel on vtiger_senotesrel.notesid= vtiger_notes.notesid




From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 17 06:34:11 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 10:34:11 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7218 -
	/vtigercrm/trunk/modules/Dashboard/Entity_charts.php
Message-ID: <20060617103412.280E37E8ABC@vtiger.fosslabs.com>

Author: saraj
Date: Sat Jun 17 04:34:07 2006
New Revision: 7218

Log:
vtiger_ updated

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 Sat Jun 17 04:34:07 2006
@@ -27,7 +27,7 @@
 {
 	global $adb;
 
-	$acc_qry="select vtiger_accountname from vtiger_account where vtiger_accountid =".$acc_id;
+	$acc_qry="select accountname from vtiger_account where vtiger_accountid =".$acc_id;
 	$acc_result=$adb->query($acc_qry);
 	$no_acc_rows=$adb->num_rows($acc_result);
 




From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 17 06:36:14 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 10:36:14 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7219 -
 /vtigercrm/trunk/modules/Dashboard/display_charts.php
Message-ID: <20060617103615.265D17E8ABC@vtiger.fosslabs.com>

Author: saraj
Date: Sat Jun 17 04:36:11 2006
New Revision: 7219

Log:
label has been changed

Modified:
    vtigercrm/trunk/modules/Dashboard/display_charts.php

Modified: vtigercrm/trunk/modules/Dashboard/display_charts.php
==============================================================================
--- vtigercrm/trunk/modules/Dashboard/display_charts.php (original)
+++ vtigercrm/trunk/modules/Dashboard/display_charts.php Sat Jun 17 04:36:11 2006
@@ -617,7 +617,7 @@
 		    elseif (($type == "ticketsbyuser") && (getFieldVisibilityPermission('HelpDesk',$user_id,'ticketuser') == "0"))
 		    {
 			    $graph_by="smownerid";
-			    $graph_title=$mod_strings['ticketsbyowner'];
+			    $graph_title=$mod_strings['ticketsbyuser'];
 			    $module="HelpDesk";
 			    $where=" and (vtiger_crmentity.smownerid != NULL || vtiger_crmentity.smownerid != ' ')";
 			    $query=$helpdesk_query;




From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 17 06:41:30 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 10:41:30 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7220 -
	/vtigercrm/trunk/modules/Dashboard/Entity_charts.php
Message-ID: <20060617104130.32B387ED3CA@vtiger.fosslabs.com>

Author: saraj
Date: Sat Jun 17 04:41:26 2006
New Revision: 7220

Log:
vtiger_ updated

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 Sat Jun 17 04:41:26 2006
@@ -27,7 +27,7 @@
 {
 	global $adb;
 
-	$acc_qry="select accountname from vtiger_account where vtiger_accountid =".$acc_id;
+	$acc_qry="select accountname from vtiger_account where accountid =".$acc_id;
 	$acc_result=$adb->query($acc_qry);
 	$no_acc_rows=$adb->num_rows($acc_result);
 




From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 17 06:45:49 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 10:45:49 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7221 -
	/vtigercrm/trunk/include/utils/ListViewUtils.php
Message-ID: <20060617104549.AADF07ED3CA@vtiger.fosslabs.com>

Author: saraj
Date: Sat Jun 17 04:45:45 2006
New Revision: 7221

Log:
* Modified to add the edit and del links in listview and related 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 Sat Jun 17 04:45:45 2006
@@ -202,6 +202,10 @@
 		}
 	}
      }
+
+	//Added for Action - edit and delete link header in listview
+	$list_header[] = $app_strings["LBL_ACTION"];
+
 	$log->debug("Exiting getListViewHeader method ...");
 	return $list_header;
 }
@@ -732,6 +736,23 @@
 			else
 				$varreturnset .= '&activity_mode=Events';
 		}
+
+		//Added for Actions ie., edit and delete links in listview 
+		$edit_link = getListViewEditLink($module,$entity_id,$relatedlist,$returnset);
+		$del_link = getListViewDeleteLink($module,$entity_id,$relatedlist,$returnset);
+
+		$list_header[] = "<a href=\"$edit_link\"> &nbsp;".$app_strings["LNK_EDIT"]." </a> | 
+				  <a href=\"javascript:;\" onclick=confirmdelete(\"$del_link\")> ".$app_strings["LNK_DELETE"]." </a>";
+		echo '<script>
+				function confirmdelete(url)
+		                {
+		                        if(confirm("Are you sure?"))
+		                        {
+		                                document.location.href=url;
+		                        }
+		                }
+		        </script>';
+
 		$list_block[$entity_id] = $list_header;
 
 	}
@@ -2609,5 +2630,56 @@
 		return $output;
 }
 
+/**	Function to get the Edit link details for ListView and RelatedListView
+ *	@param string 	$module 	- module name
+ *	@param int 	$entity_id 	- record id
+ *	@param string 	$relatedlist 	- string "relatedlist" or may be empty. if empty means ListView else relatedlist
+ *	@param string 	$returnset 	- may be empty in case of ListView. For relatedlists, return_module, return_action and return_id values will be passed like &return_module=Accounts&return_action=CallRelatedList&return_id=10
+ *	return string	$edit_link	- url string which cotains the editlink details (module, action, record, etc.,) like index.php?module=Accounts&action=EditView&record=10
+ */
+function getListViewEditLink($module,$entity_id,$relatedlist,$returnset)
+{
+	$edit_link = "index.php?module=$module&action=EditView&record=$entity_id";
+
+	//This is relatedlist listview
+	if($relatedlist == 'relatedlist')
+	{
+		$edit_link .= $returnset;
+	}
+	else
+	{
+		$edit_link .= "&return_module=$module&return_action=index";
+	}
+
+	$edit_link .= "&parenttab=".$_REQUEST["parenttab"];
+
+	return $edit_link;
+}
+
+/**	Function to get the Del link details for ListView and RelatedListView
+ *	@param string 	$module 	- module name
+ *	@param int 	$entity_id 	- record id
+ *	@param string 	$relatedlist 	- string "relatedlist" or may be empty. if empty means ListView else relatedlist
+ *	@param string 	$returnset 	- may be empty in case of ListView. For relatedlists, return_module, return_action and return_id values will be passed like &return_module=Accounts&return_action=CallRelatedList&return_id=10
+ *	return string	$del_link	- url string which cotains the editlink details (module, action, record, etc.,) like index.php?module=Accounts&action=Delete&record=10
+ */
+function getListViewDeleteLink($module,$entity_id,$relatedlist,$returnset)
+{
+	$del_link = "index.php?module=$module&action=Delete&record=$entity_id";
+
+	//This is added for relatedlist listview
+	if($relatedlist == 'relatedlist')
+	{
+		$del_link .= $returnset;
+	}
+	else
+	{
+		$del_link .= "&return_module=$module&return_action=index";
+	}
+
+	$del_link .= "&parenttab=".$_REQUEST["parenttab"];
+	
+	return $del_link;
+}
 
 ?>




From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 17 07:02:27 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 11:02:27 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7222 - in
 /vtigercrm/trunk/modules/Activities: Activity.php RenderRelatedListUI.php
Message-ID: <20060617110227.B51027ED3E5@vtiger.fosslabs.com>

Author: don
Date: Sat Jun 17 05:02:23 2006
New Revision: 7222

Log:
Fixed issues in vtiger_ prefixing in table names

Modified:
    vtigercrm/trunk/modules/Activities/Activity.php
    vtigercrm/trunk/modules/Activities/RenderRelatedListUI.php

Modified: vtigercrm/trunk/modules/Activities/Activity.php
==============================================================================
--- vtigercrm/trunk/modules/Activities/Activity.php (original)
+++ vtigercrm/trunk/modules/Activities/Activity.php Sat Jun 17 05:02:23 2006
@@ -32,16 +32,16 @@
 	var $log;
 	var $db;
 
-	var $table_name = "activity";
+	var $table_name = "vtiger_activity";
 	#var $object_name = "activity";	
 		// Mike Crowe Mod --------------------------------------------------------Renamed to match vtiger_tab
 	var $object_name = "Activities";
 	// Mike Crowe Mod --------------------------------------------------------added for general search
-    var $base_table_name = "activity";
+    var $base_table_name = "vtiger_activity";
     var $cf_table_name = "";
 	var $module_id = "activityid";
 	
-	var $reminder_table = "activity_reminder";
+	var $reminder_table = "vtiger_activity_reminder";
 	
 	var $tab_name = Array('vtiger_crmentity','vtiger_activity','vtiger_seactivityrel','vtiger_cntactivityrel','vtiger_salesmanactivityrel','vtiger_activity_reminder','vtiger_recurringevents','vtiger_invitees');
 
@@ -214,7 +214,7 @@
 				}
 
 			// To display the dates for the Group calendar starts -Jaguar
-			$recur_dates_qry='select distinct(recurringdate) from vtiger_recurringevents where vtiger_activityid='.$activity_id;
+			$recur_dates_qry='select distinct(recurringdate) from vtiger_recurringevents where activityid='.$activity_id;
 			$recur_result=$adb->query($recur_dates_qry);
 			$noofrows_recur = $adb->num_rows($recur_result);
 			if($noofrows_recur==0)
@@ -244,7 +244,7 @@
 					$owner=$row_owner['userid'];
 				}
 
-				$recur_dates_qry='select recurringdate from vtiger_recurringevents where vtiger_activityid ='.$activity_id;
+				$recur_dates_qry='select recurringdate from vtiger_recurringevents where activityid ='.$activity_id;
 				$recur_result=$adb->query($recur_dates_qry);
 				$noofrows_recur = $adb->num_rows($recur_result);
 				$userid=$row['id'];
@@ -359,7 +359,7 @@
     {   
 	global $log;
         $log->debug("Entering get_tasks(".$user_name.",".$from_index.",".$offset.") method ...");
-	 $query = "select vtiger_activity.subject as name,vtiger_crmentity.modifiedtime as date_modified, vtiger_activity.date_start start_date,vtiger_activity.activityid as id,vtiger_activity.status as status, vtiger_crmentity.description as description, vtiger_activity.priority as vtiger_priority, vtiger_activity.due_date as date_due ,vtiger_contactdetails.firstname cfn, vtiger_contactdetails.lastname cln from vtiger_activity inner join vtiger_salesmanactivityrel on vtiger_salesmanactivityrel.activityid=vtiger_activity.activityid inner join vtiger_users on vtiger_users.id=vtiger_salesmanactivityrel.smid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid=vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid=vtiger_cntactivityrel.contactid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid where user_name='" .$user_name ."' and vtiger_crmentity.deleted=0 and vtiger_activity.activitytype='Task' limit " .$from_index ."," .$offset;
+	 $query = "select vtiger_activity.subject as name,vtiger_crmentity.modifiedtime as date_modified, vtiger_activity.date_start start_date,vtiger_activity.activityid as id,vtiger_activity.status as status, vtiger_crmentity.description as description, vtiger_activity.priority as priority, vtiger_activity.due_date as date_due ,vtiger_contactdetails.firstname cfn, vtiger_contactdetails.lastname cln from vtiger_activity inner join vtiger_salesmanactivityrel on vtiger_salesmanactivityrel.activityid=vtiger_activity.activityid inner join vtiger_users on vtiger_users.id=vtiger_salesmanactivityrel.smid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid=vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid=vtiger_cntactivityrel.contactid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid where user_name='" .$user_name ."' and vtiger_crmentity.deleted=0 and vtiger_activity.activitytype='Task' limit " .$from_index ."," .$offset;
 	 $log->debug("Exiting get_tasks method ...");
     return $this->process_list_query1($query);
     
@@ -413,7 +413,7 @@
 		global $log;
 		$log->debug("Entering vtiger_activity_reminder(".$activity_id.",".$reminder_time.",".$reminder_sent.",".$recurid.",".$remindermode.") method ...");
 		//Check for vtiger_activityid already present in the reminder_table
-		$query_exist = "SELECT vtiger_activity_id FROM ".$this->reminder_table." WHERE vtiger_activity_id = ".$activity_id;
+		$query_exist = "SELECT activity_id FROM ".$this->reminder_table." WHERE activity_id = ".$activity_id;
 		$result_exist = $this->db->query($query_exist);
 
 		if($remindermode == 'edit')
@@ -422,7 +422,7 @@
 			{
 				$query = "UPDATE ".$this->reminder_table." SET";
 				$query .=" reminder_sent = ".$reminder_sent.",";
-				$query .=" reminder_time = ".$reminder_time." WHERE vtiger_activity_id =".$activity_id; 
+				$query .=" reminder_time = ".$reminder_time." WHERE activity_id =".$activity_id; 
 			}
 			else
 			{
@@ -431,7 +431,7 @@
 		}
 		elseif(($remindermode == 'delete') && ($this->db->num_rows($result_exist) == 1))
 		{
-			$query = "DELETE FROM ".$this->reminder_table." WHERE vtiger_activity_id = ".$activity_id;
+			$query = "DELETE FROM ".$this->reminder_table." WHERE activity_id = ".$activity_id;
 		}
 		else
 		{

Modified: vtigercrm/trunk/modules/Activities/RenderRelatedListUI.php
==============================================================================
--- vtigercrm/trunk/modules/Activities/RenderRelatedListUI.php (original)
+++ vtigercrm/trunk/modules/Activities/RenderRelatedListUI.php Sat Jun 17 05:02:23 2006
@@ -64,11 +64,11 @@
 		if( $owner != $userid)
 		{
 			
-			$usr_query="select vtiger_activityid,vtiger_activity.date_start,vtiger_activity.due_date, vtiger_activity.time_start,vtiger_activity.duration_hours,vtiger_activity.duration_minutes,vtiger_crmentity.smownerid from vtiger_activity,crmentity where vtiger_crmentity.crmid=vtiger_activity.activityid and ('".$avail_date."' like date_start) and vtiger_crmentity.smownerid=".$userid." and vtiger_activity.activityid !=".$activity_id."  and vtiger_crmentity.deleted=0";
+			$usr_query="select activityid,vtiger_activity.date_start,vtiger_activity.due_date, vtiger_activity.time_start,vtiger_activity.duration_hours,vtiger_activity.duration_minutes,vtiger_crmentity.smownerid from vtiger_activity,crmentity where vtiger_crmentity.crmid=vtiger_activity.activityid and ('".$avail_date."' like date_start) and vtiger_crmentity.smownerid=".$userid." and vtiger_activity.activityid !=".$activity_id."  and vtiger_crmentity.deleted=0";
 		}
 		else
 		{
-			$usr_query="select vtiger_activityid,vtiger_activity.date_start,vtiger_activity.due_date, vtiger_activity.time_start,vtiger_activity.duration_hours,vtiger_activity.duration_minutes,vtiger_crmentity.smownerid from vtiger_activity,crmentity where vtiger_crmentity.crmid=vtiger_activity.activityid and ('".$avail_date."' like date_start) and vtiger_crmentity.smownerid=".$userid." and vtiger_activity.activityid !=".$activity_id." and vtiger_crmentity.deleted=0";
+			$usr_query="select activityid,vtiger_activity.date_start,vtiger_activity.due_date, vtiger_activity.time_start,vtiger_activity.duration_hours,vtiger_activity.duration_minutes,vtiger_crmentity.smownerid from vtiger_activity,crmentity where vtiger_crmentity.crmid=vtiger_activity.activityid and ('".$avail_date."' like date_start) and vtiger_crmentity.smownerid=".$userid." and vtiger_activity.activityid !=".$activity_id." and vtiger_crmentity.deleted=0";
 		}
 		$result_cal=$adb->query($usr_query);   
 		$noofrows_cal = $adb->num_rows($result_cal);




From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 17 07:07:45 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 11:07:45 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7223 -
 /vtigercrm/trunk/Smarty/templates/CurrencyEditView.tpl
Message-ID: <20060617110745.9F4207ED3E5@vtiger.fosslabs.com>

Author: saraj
Date: Sat Jun 17 05:07:40 2006
New Revision: 7223

Log:
changes made to fix the issue 1122

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

Modified: vtigercrm/trunk/Smarty/templates/CurrencyEditView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/CurrencyEditView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/CurrencyEditView.tpl Sat Jun 17 05:07:40 2006
@@ -51,19 +51,19 @@
 							<hr /> </td>
 						</tr>
 					        <tr>
-							<td align="right" width="25%"><b>{$MOD.LBL_CURRENCY_NAME} : </b></td>
+							<td align="right" width="25%"><font color="red">*</font><b>{$MOD.LBL_CURRENCY_NAME} : </b></td>
 							<td width="50%" align="left" ><input type="text" name="currency_name" value="{$CURRENCY_NAME}" class="txtBox" /></td>
 						</tr>
 						<tr>
-							<td align="right"><b>{$MOD.LBL_CURRENCY_CODE} : </b></td>
+							<td align="right"><font color="red">*</font><b>{$MOD.LBL_CURRENCY_CODE} : </b></td>
 							<td><input type="text" name="currency_code" value="{$CURRENCY_CODE}" class="txtBox" /></td>
 						</tr>
 						<tr>
-							<td align="right"><b>{$MOD.LBL_CURRENCY_SYMBOL} : </b></td>
+							<td align="right"><font color="red">*</font><b>{$MOD.LBL_CURRENCY_SYMBOL} : </b></td>
 							<td><input type="text" name="currency_symbol" value="{$CURRENCY_SYMBOL}" class="txtBox" /></td>
 						</tr>
 						<tr>
-							<td align="right"><b>{$MOD.LBL_CURRENCY_CRATE}  : </b></td>
+							<td align="right"><font color="red">*</font><b>{$MOD.LBL_CURRENCY_CRATE}  : </b></td>
 							<td>
 								<input type="text" name="conversion_rate" value="{$CONVERSION_RATE}" class="txtBox" />
 								<br>(Eg: 1 U.S. Dollar equal to 0.78 Euro) 




From vtiger-tickets at vtiger.fosslabs.com  Sat Jun 17 07:08:47 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sat, 17 Jun 2006 11:08:47 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231122=3A?=
 =?utf-8?q?_required_symbol_in_currency_editview_is_missing?=
In-Reply-To: <076.e304b32450477f1ef20d72ae1c371e6d@vtiger.fosslabs.com>
References: <076.e304b32450477f1ef20d72ae1c371e6d@vtiger.fosslabs.com>
Message-ID: <085.5cc1f52512386b8ba41840cfd95458bb@vtiger.fosslabs.com>

#1122: required symbol in currency editview is missing
------------------------+---------------------------------------------------
  Reporter:  mangai     |       Owner:  mangai
      Type:  defect     |      Status:  closed
  Priority:  minor      |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mangai):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 fixed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1122>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 17 07:15:07 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 11:15:07 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7224 - in
 /vtigercrm/trunk/modules: Accounts/ Campaigns/ Contacts/ Emails/ HelpDesk/
 Leads/ Potentials/ PriceBooks/ Products/ PurchaseOrder/ Quotes/ Vendors/
Message-ID: <20060617111507.9BD9D7ED3E5@vtiger.fosslabs.com>

Author: saraj
Date: Sat Jun 17 05:14:50 2006
New Revision: 7224

Log:
* Modified the return module name in the returnset which will be used in the relatedlist

Modified:
    vtigercrm/trunk/modules/Accounts/Account.php
    vtigercrm/trunk/modules/Campaigns/Campaign.php
    vtigercrm/trunk/modules/Contacts/Contact.php
    vtigercrm/trunk/modules/Emails/Email.php
    vtigercrm/trunk/modules/HelpDesk/HelpDesk.php
    vtigercrm/trunk/modules/Leads/Lead.php
    vtigercrm/trunk/modules/Potentials/Opportunity.php
    vtigercrm/trunk/modules/PriceBooks/PriceBook.php
    vtigercrm/trunk/modules/Products/Product.php
    vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php
    vtigercrm/trunk/modules/Quotes/Quote.php
    vtigercrm/trunk/modules/Vendors/Vendor.php

Modified: vtigercrm/trunk/modules/Accounts/Account.php
==============================================================================
--- vtigercrm/trunk/modules/Accounts/Account.php (original)
+++ vtigercrm/trunk/modules/Accounts/Account.php Sat Jun 17 05:14:50 2006
@@ -146,7 +146,7 @@
 		{
 			$button .= '<input title="New Contact" accessyKey="F" class="button" onclick="this.form.action.value=\'EditView\';this.form.module.value=\'Contacts\'" type="submit" name="button" value="'.$mod_strings['LBL_NEW_CONTACT'].'">&nbsp;</td>';
 		}
-		$returnset = '&return_module=Accounts&return_action=DetailView&return_id='.$id;
+		$returnset = '&return_module=Accounts&return_action=CallRelatedList&return_id='.$id;
 
 		//SQL
 		$query = "SELECT vtiger_contactdetails.*,
@@ -186,7 +186,7 @@
 		{
 			$button .= '<input title="New Potential" accessyKey="F" class="button" onclick="this.form.action.value=\'EditView\';this.form.module.value=\'Potentials\'" type="submit" name="button" value="'.$mod_strings['LBL_NEW_POTENTIAL'].'">';
 		}
-		$returnset = '&return_module=Accounts&return_action=DetailView&return_id='.$id;
+		$returnset = '&return_module=Accounts&return_action=CallRelatedList&return_id='.$id;
 
 		$query = "SELECT vtiger_potential.potentialid, vtiger_potential.accountid,
 			vtiger_potential.potentialname, vtiger_potential.sales_stage,
@@ -229,7 +229,7 @@
 			$button .= '<input title="New Task" accessyKey="F" class="button" onclick="this.form.action.value=\'EditView\';this.form.return_action.value=\'DetailView\';this.form.module.value=\'Activities\';this.form.return_module.value=\'Accounts\';this.form.activity_mode.value=\'Task\'" type="submit" name="button" value="'.$mod_strings['LBL_NEW_TASK'].'">&nbsp;';
 			$button .= '<input title="New Event" accessyKey="F" class="button" onclick="this.form.action.value=\'EditView\';this.form.return_action.value=\'DetailView\';this.form.module.value=\'Activities\';this.form.return_module.value=\'Accounts\';this.form.activity_mode.value=\'Events\'" type="submit" name="button" value="'.$app_strings['LBL_NEW_EVENT'].'">&nbsp;</td>';
 		}
-		$returnset = '&return_module=Accounts&return_action=DetailView&return_id='.$id;
+		$returnset = '&return_module=Accounts&return_action=CallRelatedList&return_id='.$id;
 
 		$query = "SELECT vtiger_activity.*,
 			vtiger_seactivityrel.*,
@@ -378,8 +378,7 @@
 		{
 			$button .= '<input title="'.$app_strings['LBL_NEW_QUOTE_BUTTON_TITLE'].'" accessyKey="'.$app_strings['LBL_NEW_QUOTE_BUTTON_KEY'].'" class="button" onclick="this.form.action.value=\'EditView\';this.form.module.value=\'Quotes\'" type="submit" name="button" value="'.$app_strings['LBL_NEW_QUOTE_BUTTON'].'">&nbsp;</td>';
 		}
-		$returnset = '&return_module=Accounts&return_action=DetailView&return_id='.$id;
-
+		$returnset = '&return_module=Accounts&return_action=CallRelatedList&return_id='.$id;
 
 		$query = "SELECT vtiger_users.user_name,
 			vtiger_groups.groupname,
@@ -419,7 +418,7 @@
 		{
 			$button .= '<input title="'.$app_strings['LBL_NEW_INVOICE_BUTTON_TITLE'].'" accessyKey="'.$app_strings['LBL_NEW_INVOICE_BUTTON_KEY'].'" class="button" onclick="this.form.action.value=\'EditView\';this.form.module.value=\'Invoice\'" type="submit" name="button" value="'.$app_strings['LBL_NEW_INVOICE_BUTTON'].'">&nbsp;</td>';
 		}
-		$returnset = '&return_module=Accounts&return_action=DetailView&return_id='.$id;
+		$returnset = '&return_module=Accounts&return_action=CallRelatedList&return_id='.$id;
 
 		$query = "SELECT vtiger_users.user_name,
 			vtiger_groups.groupname,
@@ -460,7 +459,7 @@
 			$button .= '<input title="'.$app_strings['LBL_NEW_SORDER_BUTTON_TITLE'].'" accessyKey="'.$app_strings['LBL_NEW_SORDER_BUTTON_KEY'].'" class="button" onclick="this.form.action.value=\'EditView\';this.form.module.value=\'SalesOrder\'" type="submit" name="button" value="'.$app_strings['LBL_NEW_SORDER_BUTTON'].'">&nbsp;</td>';
 		}
 
-		$returnset = '&return_module=Accounts&return_action=DetailView&return_id='.$id;
+		$returnset = '&return_module=Accounts&return_action=CallRelatedList&return_id='.$id;
 
 		$query = "SELECT vtiger_crmentity.*,
 			vtiger_salesorder.*,
@@ -496,7 +495,7 @@
 		$button = '';
 
 		$button .= '<td valign="bottom" align="right"><input title="New TICKET" accessyKey="F" class="button" onclick="this.form.action.value=\'EditView\';this.form.module.value=\'HelpDesk\'" type="submit" name="button" value="'.$app_strings['LBL_NEW_TICKET'].'">&nbsp;</td>';
-		$returnset = '&return_module=Accounts&return_action=DetailView&return_id='.$id;
+		$returnset = '&return_module=Accounts&return_action=CallRelatedList&return_id='.$id;
 
 		$query = "SELECT vtiger_users.user_name, vtiger_users.id,
 			vtiger_troubletickets.title, vtiger_troubletickets.ticketid AS crmid,
@@ -567,7 +566,7 @@
 
 			$button .= '<input title="New Product" accessyKey="F" class="button" onclick="this.form.action.value=\'EditView\';this.form.module.value=\'Products\';this.form.return_module.value=\'Accounts\';this.form.return_action.value=\'DetailView\'" type="submit" name="button" value="'.$app_strings['LBL_NEW_PRODUCT'].'">&nbsp;';
 		}
-		$returnset = '&return_module=Accounts&return_action=DetailView&return_id='.$id;
+		$returnset = '&return_module=Accounts&return_action=CallRelatedList&return_id='.$id;
 
 		$query = "SELECT vtiger_products.productid, vtiger_products.productname,
 			vtiger_products.productcode, vtiger_products.commissionrate,

Modified: vtigercrm/trunk/modules/Campaigns/Campaign.php
==============================================================================
--- vtigercrm/trunk/modules/Campaigns/Campaign.php (original)
+++ vtigercrm/trunk/modules/Campaigns/Campaign.php Sat Jun 17 05:14:50 2006
@@ -74,7 +74,7 @@
 
                 $focus = new Contact();
                 $button = '';
-                $returnset = '&return_module=Campaigns&return_action=DetailView&return_id='.$id;
+                $returnset = '&return_module=Campaigns&return_action=CallRelatedList&return_id='.$id;
 		//$query = 'select vtiger_contactdetails.accountid, vtiger_users.user_name,vtiger_groups.groupname,vtiger_campaign.campaignid, vtiger_campaign.campaignname, vtiger_contactdetails.contactid, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.title, vtiger_contactdetails.department, vtiger_contactdetails.email, vtiger_contactdetails.phone, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_campaign inner join vtiger_campaigncontrel on vtiger_campaigncontrel.campaignid = vtiger_campaign.campaignid inner join vtiger_contactdetails on vtiger_campaigncontrel.contactid = vtiger_contactdetails.contactid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid left join vtiger_groups on vtiger_groups.groupname=vtiger_contactgrouprelation.groupname left join vtiger_users on vtiger_crmentity.smownerid=vtiger_users.id where vtiger_campaign.campaignid = '.$id.' and vtiger_crmentity.deleted=0';
 
 		$query = 'SELECT vtiger_contactdetails.*, vtiger_crmentity.crmid, vtiger_users.user_name, vtiger_groups.groupname, vtiger_crmentity.smownerid from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid left join vtiger_users on vtiger_crmentity.smownerid = vtiger_users.id left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid left join vtiger_groups on vtiger_groups.groupname=vtiger_contactgrouprelation.groupname  where vtiger_crmentity.deleted=0 and vtiger_contactdetails.campaignid = '.$id;
@@ -90,7 +90,7 @@
                 $focus = new Lead();
 
                 $button = '';
-                $returnset = '&return_module=Campaigns&return_action=DetailView&return_id='.$id;
+                $returnset = '&return_module=Campaigns&return_action=CallRelatedList&return_id='.$id;
 
 		$query = 'SELECT vtiger_leaddetails.*, vtiger_crmentity.crmid, vtiger_users.user_name, vtiger_groups.groupname, vtiger_crmentity.smownerid from vtiger_leaddetails inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_leaddetails.leadid left join vtiger_users on vtiger_crmentity.smownerid = vtiger_users.id left join vtiger_leadgrouprelation on vtiger_leaddetails.leadid=vtiger_leadgrouprelation.leadid left join vtiger_groups on vtiger_groups.groupname=vtiger_leadgrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_leaddetails.campaignid = '.$id;
 		$log->debug("Exiting get_leads method ...");
@@ -105,7 +105,7 @@
 		$focus = new Potential();
 
 		$button = '';
-		$returnset = '&return_module=Campaigns&return_action=DetailView&return_id='.$id;
+		$returnset = '&return_module=Campaigns&return_action=CallRelatedList&return_id='.$id;
 
 		$query = 'select vtiger_users.user_name,vtiger_groups.groupname, vtiger_potential.potentialid, vtiger_potential.potentialname, vtiger_potential.potentialtype, vtiger_potential.sales_stage, vtiger_potential.amount, vtiger_potential.closingdate, vtiger_crmentity.crmid, vtiger_crmentity.smownerid from vtiger_campaign inner join vtiger_potential on vtiger_campaign.campaignid = vtiger_potential.campaignid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_potential.potentialid left join vtiger_potentialgrouprelation on vtiger_potential.potentialid=vtiger_potentialgrouprelation.potentialid left join vtiger_groups on vtiger_groups.groupname=vtiger_potentialgrouprelation.groupname left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_campaign.campaignid = '.$id.' and vtiger_crmentity.deleted=0';
 		if($this->column_fields['account_id'] != 0)
@@ -125,7 +125,7 @@
 
 		$button = '';
 
-		$returnset = '&return_module=Products&return_action=DetailView&return_id='.$id;
+		$returnset = '&return_module=Products&return_action=CallRelatedList&return_id='.$id;
 
 		$query = "SELECT vtiger_contactdetails.lastname,
 			vtiger_contactdetails.firstname,

Modified: vtigercrm/trunk/modules/Contacts/Contact.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/Contact.php (original)
+++ vtigercrm/trunk/modules/Contacts/Contact.php Sat Jun 17 05:14:50 2006
@@ -256,7 +256,7 @@
 
 			$button .= '<input title="New Potential" accessyKey="F" class="button" onclick="this.form.action.value=\'EditView\';this.form.module.value=\'Potentials\'" type="submit" name="button" value="'.$mod_strings['LBL_NEW_POTENTIAL'].'">&nbsp;';
 		}
-		$returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id;
+		$returnset = '&return_module=Contacts&return_action=CallRelatedList&return_id='.$id;
 
 		$log->info("Potential Related List for Contact Displayed");
 
@@ -288,7 +288,7 @@
 		$button .= '<input title="New Task" accessyKey="F" class="button" onclick="this.form.action.value=\'EditView\';this.form.return_action.value=\'DetailView\';this.form.module.value=\'Activities\';this.form.activity_mode.value=\'Task\';this.form.return_module.value=\'Contacts\'" type="submit" name="button" value="'.$mod_strings['LBL_NEW_TASK'].'">&nbsp;';
 		$button .= '<input title="New Event" accessyKey="F" class="button" onclick="this.form.action.value=\'EditView\';this.form.return_action.value=\'DetailView\';this.form.module.value=\'Activities\';this.form.return_module.value=\'Contacts\';this.form.activity_mode.value=\'Events\'" type="submit" name="button" value="'.$app_strings['LBL_NEW_EVENT'].'">&nbsp;';
 		}
-		$returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id;
+		$returnset = '&return_module=Contacts&return_action=CallRelatedList&return_id='.$id;
 
 		$log->info("Activity Related List for Contact Displayed");
 
@@ -330,7 +330,7 @@
 		$focus = new HelpDesk();
 
 		$button = '<td valign="bottom" align="right"><input title="New Ticket" accessyKey="F" class="button" onclick="this.form.action.value=\'EditView\';this.form.module.value=\'HelpDesk\'" type="submit" name="button" value="'.$app_strings['LBL_NEW_TICKET'].'">&nbsp;</td>';
-		$returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id;
+		$returnset = '&return_module=Contacts&return_action=CallRelatedList&return_id='.$id;
 
 		$query = "select vtiger_users.user_name,vtiger_crmentity.crmid, vtiger_troubletickets.title, vtiger_contactdetails.contactid, vtiger_troubletickets.parent_id, vtiger_contactdetails.firstname, vtiger_contactdetails.lastname, vtiger_troubletickets.status, vtiger_troubletickets.priority, vtiger_crmentity.smownerid from vtiger_troubletickets inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_troubletickets.ticketid left join vtiger_contactdetails on vtiger_contactdetails.contactid=vtiger_troubletickets.parent_id left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_ticketgrouprelation on vtiger_troubletickets.ticketid=vtiger_ticketgrouprelation.ticketid left join vtiger_groups on vtiger_groups.groupname=vtiger_ticketgrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_contactdetails.contactid=".$id;
 		$log->info("Ticket Related List for Contact Displayed");
@@ -383,7 +383,7 @@
         {
 		$button .= '<input title="'.$app_strings['LBL_NEW_QUOTE_BUTTON_TITLE'].'" accessyKey="'.$app_strings['LBL_NEW_QUOTE_BUTTON_KEY'].'" class="button" onclick="this.form.action.value=\'EditView\';this.form.module.value=\'Quotes\'" type="submit" name="button" value="'.$app_strings['LBL_NEW_QUOTE_BUTTON'].'">&nbsp;</td>';
 		}
-		$returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id;
+		$returnset = '&return_module=Contacts&return_action=CallRelatedList&return_id='.$id;
 		$query = "select vtiger_users.user_name,vtiger_crmentity.*, vtiger_quotes.*,vtiger_potential.potentialname,vtiger_contactdetails.lastname from vtiger_quotes inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_quotes.quoteid left outer join vtiger_contactdetails on vtiger_contactdetails.contactid=vtiger_quotes.contactid left outer join vtiger_potential on vtiger_potential.potentialid=vtiger_quotes.potentialid  left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_quotegrouprelation on vtiger_quotes.quoteid=vtiger_quotegrouprelation.quoteid left join vtiger_groups on vtiger_groups.groupname=vtiger_quotegrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_contactdetails.contactid=".$id;
 		$log->debug("Exiting get_quotes method ...");
 		return GetRelatedList('Contacts','Quotes',$focus,$query,$button,$returnset);
@@ -403,7 +403,7 @@
 
 			 $button .= '<input title="'.$app_strings['LBL_NEW_SORDER_BUTTON_TITLE'].'" accessyKey="O" class="button" onclick="this.form.action.value=\'EditView\';this.form.module.value=\'SalesOrder\';this.form.return_module.value=\'Contacts\';this.form.return_action.value=\'DetailView\'" type="submit" name="button" value="'.$app_strings['LBL_NEW_SORDER_BUTTON'].'">&nbsp;';
 		 }
-		 $returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id;
+		 $returnset = '&return_module=Contacts&return_action=CallRelatedList&return_id='.$id;
 
 		 $query = "select vtiger_users.user_name,vtiger_crmentity.*, vtiger_salesorder.*, vtiger_quotes.subject as quotename, vtiger_account.accountname, vtiger_contactdetails.lastname from vtiger_salesorder inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_salesorder.salesorderid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left outer join vtiger_quotes on vtiger_quotes.quoteid=vtiger_salesorder.quoteid left outer join vtiger_account on vtiger_account.accountid=vtiger_salesorder.accountid left outer join vtiger_contactdetails on vtiger_contactdetails.contactid=vtiger_salesorder.contactid left join vtiger_sogrouprelation on vtiger_salesorder.salesorderid=vtiger_sogrouprelation.salesorderid left join vtiger_groups on vtiger_groups.groupname=vtiger_sogrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_salesorder.contactid = ".$id;
 		$log->debug("Exiting get_salesorder method ...");
@@ -424,7 +424,7 @@
 
 			 $button .= '<input title="'.$app_strings['LBL_NEW_PRODUCT'].'" accessyKey="F" class="button" onclick="this.form.action.value=\'EditView\';this.form.module.value=\'Products\';this.form.return_module.value=\'Contacts\';this.form.return_action.value=\'DetailView\'" type="submit" name="button" value="'.$app_strings['LBL_NEW_PRODUCT'].'">&nbsp;';
 		 }
-		 $returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id;
+		 $returnset = '&return_module=Contacts&return_action=CallRelatedList&return_id='.$id;
 
 		 $query = 'select vtiger_products.productid, vtiger_products.productname, vtiger_products.productcode, vtiger_products.commissionrate, vtiger_products.qty_per_unit, vtiger_products.unit_price, vtiger_crmentity.crmid, vtiger_crmentity.smownerid,vtiger_contactdetails.lastname from vtiger_products inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_products.productid left outer join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_products.contactid where vtiger_contactdetails.contactid = '.$id.' and vtiger_crmentity.deleted = 0';
 		$log->debug("Exiting get_products method ...");
@@ -446,7 +446,7 @@
 
 			 $button .= '<input title="'.$app_strings['LBL_PORDER_BUTTON_TITLE'].'" accessyKey="O" class="button" onclick="this.form.action.value=\'EditView\';this.form.module.value=\'PurchaseOrder\';this.form.return_module.value=\'Contacts\';this.form.return_action.value=\'DetailView\'" type="submit" name="button" value="'.$app_strings['LBL_PORDER_BUTTON'].'">&nbsp;';
 		 }
-		 $returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id;
+		 $returnset = '&return_module=Contacts&return_action=CallRelatedList&return_id='.$id;
 
 		 $query = "select vtiger_users.user_name,vtiger_crmentity.*, vtiger_purchaseorder.*,vtiger_vendor.vendorname,vtiger_contactdetails.lastname from vtiger_purchaseorder inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_purchaseorder.purchaseorderid left outer join vtiger_vendor on vtiger_purchaseorder.vendorid=vtiger_vendor.vendorid left outer join vtiger_contactdetails on vtiger_contactdetails.contactid=vtiger_purchaseorder.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_pogrouprelation on vtiger_purchaseorder.purchaseorderid=vtiger_pogrouprelation.purchaseorderid left join vtiger_groups on vtiger_groups.groupname=vtiger_pogrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_purchaseorder.contactid=".$id;
 		$log->debug("Exiting get_purchase_orders method ...");
@@ -472,7 +472,7 @@
 		{	
 			$button .= '<input title="New Email" accessyKey="F" class="button" onclick="this.form.action.value=\'EditView\';this.form.module.value=\'Emails\';this.form.email_directing_module.value=\'contacts\';this.form.record.value='.$id.';this.form.return_action.value=\'DetailView\'" type="submit" name="button" value="'.$mod_strings['LBL_NEW_EMAIL'].'">';
 		}
-		$returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id;
+		$returnset = '&return_module=Contacts&return_action=CallRelatedList&return_id='.$id;
 
 		$log->info("Email Related List for Contact Displayed");
 

Modified: vtigercrm/trunk/modules/Emails/Email.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/Email.php (original)
+++ vtigercrm/trunk/modules/Emails/Email.php Sat Jun 17 05:14:50 2006
@@ -99,7 +99,7 @@
 		$focus = new Contact();
 
 		$button = '';
-		$returnset = '&return_module=Emails&return_action=DetailView&return_id='.$id;
+		$returnset = '&return_module=Emails&return_action=CallRelatedList&return_id='.$id;
 
 		$query = 'select vtiger_contactdetails.accountid, vtiger_contactdetails.contactid, vtiger_contactdetails.firstname,vtiger_contactdetails.lastname, vtiger_contactdetails.department, vtiger_contactdetails.title, vtiger_contactdetails.email, vtiger_contactdetails.phone, vtiger_contactdetails.emailoptout, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_contactdetails inner join vtiger_cntactivityrel on vtiger_cntactivityrel.contactid=vtiger_contactdetails.contactid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid left join vtiger_groups on vtiger_groups.groupname=vtiger_contactgrouprelation.groupname where vtiger_cntactivityrel.activityid='.$adb->quote($id).' and vtiger_crmentity.deleted=0';
 		$log->info("Contact Related List for Email is Displayed");

Modified: vtigercrm/trunk/modules/HelpDesk/HelpDesk.php
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/HelpDesk.php (original)
+++ vtigercrm/trunk/modules/HelpDesk/HelpDesk.php Sat Jun 17 05:14:50 2006
@@ -122,7 +122,7 @@
 
 		$button = '';
 
-		$returnset = '&return_module=HelpDesk&return_action=DetailView&return_id='.$id;
+		$returnset = '&return_module=HelpDesk&return_action=CallRelatedList&return_id='.$id;
 
 		$query = "SELECT vtiger_activity.*, vtiger_crmentity.crmid, vtiger_contactdetails.contactid, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_recurringevents.recurringtype, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid= vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting')";
 		$log->debug("Exiting get_activities method ...");

Modified: vtigercrm/trunk/modules/Leads/Lead.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/Lead.php (original)
+++ vtigercrm/trunk/modules/Leads/Lead.php Sat Jun 17 05:14:50 2006
@@ -189,7 +189,7 @@
 		$button .= '<input title="New Task" accessyKey="F" class="button" onclick="this.form.action.value=\'EditView\';this.form.return_action.value=\'DetailView\';this.form.module.value=\'Activities\';i;this.form.return_module.value=\'Leads\';this.form.activity_mode.value=\'Task\'" type="submit" name="button" value="'.$mod_strings['LBL_NEW_TASK'].'">&nbsp;';
 		$button .= '<input title="New Event" accessyKey="F" class="button" onclick="this.form.action.value=\'EditView\';this.form.return_action.value=\'DetailView\';this.form.module.value=\'Activities\';this.form.return_module.value=\'Leads\';this.form.activity_mode.value=\'Events\'" type="submit" name="button" value="'.$app_strings['LBL_NEW_EVENT'].'">&nbsp;</td>';
 	}
-	$returnset = '&return_module=Leads&return_action=DetailView&return_id='.$id;
+	$returnset = '&return_module=Leads&return_action=CallRelatedList&return_id='.$id;
 
 
 	// First, get the list of IDs.
@@ -216,7 +216,7 @@
 
 		$button .= '<input title="New Email" accessyKey="F" class="button" onclick="this.form.action.value=\'EditView\';this.form.return_action.value=\'DetailView\';this.form.module.value=\'Emails\';this.form.email_directing_module.value=\'leads\';this.form.record.value='.$id.';this.form.return_action.value=\'DetailView\'" type="submit" name="button" value="'.$mod_strings['LBL_NEW_EMAIL'].'">&nbsp;';
 	}
-	$returnset = '&return_module=Leads&return_action=DetailView&return_id='.$id;
+	$returnset = '&return_module=Leads&return_action=CallRelatedList&return_id='.$id;
 
 	$query ="select vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.semodule, vtiger_activity.activitytype, vtiger_activity.date_start, vtiger_activity.status, vtiger_activity.priority, vtiger_crmentity.crmid,vtiger_crmentity.smownerid,vtiger_crmentity.modifiedtime, vtiger_users.user_name from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid inner join vtiger_users on  vtiger_users.id=vtiger_crmentity.smownerid where vtiger_activity.activitytype='Emails' and vtiger_crmentity.deleted=0 and vtiger_seactivityrel.crmid=".$id;
 	$log->debug("Exiting get_emails method ...");
@@ -304,7 +304,7 @@
 	{
 		$button .= '<input title="New Product" accessyKey="F" class="button" onclick="this.form.action.value=\'EditView\';this.form.module.value=\'Products\';this.form.return_module.value=\'Leads\';this.form.return_action.value=\'DetailView\'" type="submit" name="button" value="'.$app_strings['LBL_NEW_PRODUCT'].'">&nbsp;';
 	}
-	$returnset = '&return_module=Leads&return_action=DetailView&return_id='.$id;
+	$returnset = '&return_module=Leads&return_action=CallRelatedList&return_id='.$id;
 
 	$query = 'select vtiger_products.productid, vtiger_products.productname, vtiger_products.productcode, vtiger_products.commissionrate, vtiger_products.qty_per_unit, vtiger_products.unit_price, vtiger_crmentity.crmid, vtiger_crmentity.smownerid from vtiger_products inner join vtiger_seproductsrel on vtiger_products.productid = vtiger_seproductsrel.productid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_products.productid inner join vtiger_leaddetails on vtiger_leaddetails.leadid = vtiger_seproductsrel.crmid  where vtiger_leaddetails.leadid = '.$id.' and vtiger_crmentity.deleted = 0';
 	$log->debug("Exiting get_products method ...");

Modified: vtigercrm/trunk/modules/Potentials/Opportunity.php
==============================================================================
--- vtigercrm/trunk/modules/Potentials/Opportunity.php (original)
+++ vtigercrm/trunk/modules/Potentials/Opportunity.php Sat Jun 17 05:14:50 2006
@@ -218,7 +218,7 @@
 
 			$button .= '<input title="Change" accessKey="" tabindex="2" type="button" class="button" value="'.$app_strings['LBL_SELECT_CONTACT_BUTTON_LABEL'].'" name="Button" LANGUAGE=javascript onclick=\'return window.open("index.php?module=Contacts&action=Popup&return_module=Potentials&popuptype=detailview&form=EditView&form_submit=false&recordid='.$_REQUEST["record"].'","test","width=600,height=400,resizable=1,scrollbars=1");\'>&nbsp;';
 		}
-		$returnset = '&return_module=Potentials&return_action=DetailView&return_id='.$id;
+		$returnset = '&return_module=Potentials&return_action=CallRelatedList&return_id='.$id;
 
 		$query = 'select vtiger_contactdetails.accountid, vtiger_users.user_name,vtiger_groups.groupname,vtiger_potential.potentialid, vtiger_potential.potentialname, vtiger_contactdetails.contactid, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.title, vtiger_contactdetails.department, vtiger_contactdetails.email, vtiger_contactdetails.phone, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_potential inner join vtiger_contpotentialrel on vtiger_contpotentialrel.potentialid = vtiger_potential.potentialid inner join vtiger_contactdetails on vtiger_contpotentialrel.contactid = vtiger_contactdetails.contactid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid left join vtiger_groups on vtiger_groups.groupname=vtiger_contactgrouprelation.groupname left join vtiger_users on vtiger_crmentity.smownerid=vtiger_users.id where vtiger_potential.potentialid = '.$id.' and vtiger_crmentity.deleted=0';
 		
@@ -247,7 +247,7 @@
 			$button .= '<input title="New Task" accessyKey="F" class="button" onclick="this.form.action.value=\'EditView\';this.form.return_action.value=\'DetailView\';this.form.module.value=\'Activities\';this.form.activity_mode.value=\'Task\';this.form.return_module.value=\'Potentials\'" type="submit" name="button" value="'.$mod_strings['LBL_NEW_TASK'].'">&nbsp;';
 			$button .= '<input title="New Event" accessyKey="F" class="button" onclick="this.form.action.value=\'EditView\';this.form.return_action.value=\'DetailView\';this.form.module.value=\'Activities\';this.form.return_module.value=\'Potentials\';this.form.activity_mode.value=\'Events\'" type="submit" name="button" value="'.$app_strings['LBL_NEW_EVENT'].'">&nbsp;';
 		}
-		$returnset = '&return_module=Potentials&return_action=DetailView&return_id='.$id;
+		$returnset = '&return_module=Potentials&return_action=CallRelatedList&return_id='.$id;
 
 		$query = "SELECT vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name, vtiger_recurringevents.recurringtype, vtiger_contactdetails.contactid, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid inner join vtiger_potential on vtiger_potential.potentialid=vtiger_seactivityrel.crmid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid= vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid where vtiger_seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting') and vtiger_crmentity.deleted=0 and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Completed') and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Deferred') or (vtiger_activity.eventstatus != '' &&  vtiger_activity.eventstatus != 'Held')";
 		$log->debug("Exiting get_activities method ...");
@@ -277,7 +277,7 @@
 		{
 			$button .= '<input title="Change" accessKey="" tabindex="2" type="button" class="button" value="'.$app_strings['LBL_SELECT_PRODUCT_BUTTON_LABEL'].'" name="Button" LANGUAGE=javascript onclick=\'return window.open("index.php?module=Products&action=Popup&return_module=Potentials&popuptype=detailview&form=EditView&form_submit=false&recordid='.$_REQUEST["record"].'","test","width=600,height=400,resizable=1,scrollbars=1");\'>&nbsp;';
 		}
-		$returnset = '&return_module=Potentials&return_action=DetailView&return_id='.$id;
+		$returnset = '&return_module=Potentials&return_action=CallRelatedList&return_id='.$id;
 
 		$query = 'select vtiger_products.productid, vtiger_products.productname, vtiger_products.productcode, vtiger_products.commissionrate, vtiger_products.qty_per_unit, vtiger_products.unit_price, vtiger_crmentity.crmid, vtiger_crmentity.smownerid from vtiger_products inner join vtiger_seproductsrel on vtiger_products.productid = vtiger_seproductsrel.productid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_products.productid inner join vtiger_potential on vtiger_potential.potentialid = vtiger_seproductsrel.crmid  where vtiger_potential.potentialid = '.$id.' and vtiger_crmentity.deleted = 0';
 		$log->debug("Exiting get_products method ...");
@@ -478,7 +478,7 @@
 		{
 			$button .= '<input title="'.$app_strings['LBL_NEW_QUOTE_BUTTON_TITLE'].'" accessyKey="'.$app_strings['LBL_NEW_QUOTE_BUTTON_KEY'].'" class="button" onclick="this.form.action.value=\'EditView\';this.form.module.value=\'Quotes\'" type="submit" name="button" value="'.$app_strings['LBL_NEW_QUOTE_BUTTON'].'">&nbsp;</td>';
 		}
-		$returnset = '&return_module=Potentials&return_action=DetailView&return_id='.$id;
+		$returnset = '&return_module=Potentials&return_action=CallRelatedList&return_id='.$id;
 
 
 		$query = "select vtiger_crmentity.*, vtiger_quotes.*, vtiger_potential.potentialname, vtiger_users.user_name from vtiger_quotes inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_quotes.quoteid left outer join vtiger_potential on vtiger_potential.potentialid=vtiger_quotes.potentialid left join vtiger_quotegrouprelation on vtiger_quotes.quoteid=vtiger_quotegrouprelation.quoteid left join vtiger_groups on vtiger_groups.groupname=vtiger_quotegrouprelation.groupname left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_crmentity.deleted=0 and vtiger_potential.potentialid=".$id;
@@ -501,7 +501,7 @@
 			$button .= '<input title="'.$app_strings['LBL_NEW_SORDER_BUTTON_TITLE'].'" accessyKey="'.$app_strings['LBL_NEW_SORDER_BUTTON_KEY'].'" class="button" onclick="this.form.action.value=\'EditView\';this.form.module.value=\'SalesOrder\'" type="submit" name="button" value="'.$app_strings['LBL_NEW_SORDER_BUTTON'].'">&nbsp;</td>';
 		}
 
-		$returnset = '&return_module=Potentials&return_action=DetailView&return_id='.$id;
+		$returnset = '&return_module=Potentials&return_action=CallRelatedList&return_id='.$id;
 
 
 		$query = "select vtiger_crmentity.*, vtiger_salesorder.*, vtiger_quotes.subject as quotename, vtiger_account.accountname, vtiger_potential.potentialname from vtiger_salesorder inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_salesorder.salesorderid left outer join vtiger_quotes on vtiger_quotes.quoteid=vtiger_salesorder.quoteid left outer join vtiger_account on vtiger_account.accountid=vtiger_salesorder.accountid left outer join vtiger_potential on vtiger_potential.potentialid=vtiger_salesorder.potentialid left join vtiger_sogrouprelation on vtiger_salesorder.salesorderid=vtiger_sogrouprelation.salesorderid left join vtiger_groups on vtiger_groups.groupname=vtiger_sogrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_potential.potentialid = ".$id;

Modified: vtigercrm/trunk/modules/PriceBooks/PriceBook.php
==============================================================================
--- vtigercrm/trunk/modules/PriceBooks/PriceBook.php (original)
+++ vtigercrm/trunk/modules/PriceBooks/PriceBook.php Sat Jun 17 05:14:50 2006
@@ -92,7 +92,7 @@
 
 		$button = '';
 
-		$returnset = '&return_module=PriceBooks&return_action=DetailView&return_id='.$id;
+		$returnset = '&return_module=PriceBooks&return_action=CallRelatedList&return_id='.$id;
 
 		$query = 'select vtiger_products.productid, vtiger_products.productname, vtiger_products.productcode, vtiger_products.commissionrate, vtiger_products.qty_per_unit, vtiger_products.unit_price, vtiger_crmentity.crmid, vtiger_crmentity.smownerid,vtiger_pricebookproductrel.listprice from vtiger_products inner join vtiger_pricebookproductrel on vtiger_products.productid = vtiger_pricebookproductrel.productid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_products.productid inner join vtiger_pricebook on vtiger_pricebook.pricebookid = vtiger_pricebookproductrel.pricebookid  where vtiger_pricebook.pricebookid = '.$id.' and vtiger_crmentity.deleted = 0'; 
 		$log->debug("Exiting get_pricebook_products method ...");

Modified: vtigercrm/trunk/modules/Products/Product.php
==============================================================================
--- vtigercrm/trunk/modules/Products/Product.php (original)
+++ vtigercrm/trunk/modules/Products/Product.php Sat Jun 17 05:14:50 2006
@@ -186,7 +186,7 @@
 
 		$button = '';
 
-		$returnset = '&return_module=Products&return_action=DetailView&return_id='.$id;
+		$returnset = '&return_module=Products&return_action=CallRelatedList&return_id='.$id;
 
 		$query = "SELECT vtiger_users.user_name, vtiger_users.id,
 			vtiger_products.productid, vtiger_products.productname,
@@ -226,7 +226,7 @@
 
 		$button = '';
 
-		$returnset = '&return_module=Products&return_action=DetailView&return_id='.$id;
+		$returnset = '&return_module=Products&return_action=CallRelatedList&return_id='.$id;
 
 
 		$query = "SELECT vtiger_contactdetails.lastname,
@@ -271,7 +271,7 @@
 		$focus = new Quote();
 	
 		$button = '';
-		$returnset = '&return_module=Products&return_action=DetailView&return_id='.$id;
+		$returnset = '&return_module=Products&return_action=CallRelatedList&return_id='.$id;
 
 
 		$query = "SELECT vtiger_crmentity.*,
@@ -307,7 +307,7 @@
 
 		$button = '';
 
-		$returnset = '&return_module=Products&return_action=DetailView&return_id='.$id;
+		$returnset = '&return_module=Products&return_action=CallRelatedList&return_id='.$id;
 
 		$query = "SELECT vtiger_crmentity.*,
 			vtiger_purchaseorder.*,
@@ -335,10 +335,11 @@
 		$log->debug("Entering get_salesorder(".$id.") method ...");
 		global $app_strings;
 		require_once('modules/SalesOrder/SalesOrder.php');
-        $focus = new SalesOrder();
+
+	        $focus = new SalesOrder();
  
 		$button = '';
-		$returnset = '&return_module=Products&return_action=DetailView&return_id='.$id;
+		$returnset = '&return_module=Products&return_action=CallRelatedList&return_id='.$id;
 
 		$query = "SELECT vtiger_crmentity.*,
 			vtiger_salesorder.*,
@@ -371,7 +372,7 @@
 		$focus = new Invoice();
 
 		$button = '';
-		$returnset = '&return_module=Products&return_action=DetailView&return_id='.$id;
+		$returnset = '&return_module=Products&return_action=CallRelatedList&return_id='.$id;
 
 
 		$query = "SELECT vtiger_crmentity.*,
@@ -402,7 +403,7 @@
 		require_once('modules/PriceBooks/PriceBook.php');
 		$focus = new PriceBook();
 		$button = '';
-		$returnset = '&return_module=Products&return_action=DetailView&return_id='.$id;
+		$returnset = '&return_module=Products&return_action=CallRelatedList&return_id='.$id;
 
 
 		$query = "SELECT vtiger_crmentity.crmid,

Modified: vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php
==============================================================================
--- vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php (original)
+++ vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php Sat Jun 17 05:14:50 2006
@@ -138,7 +138,7 @@
 
 		$button = '';
 
-		$returnset = '&return_module=PurchaseOrder&return_action=DetailView&return_id='.$id;
+		$returnset = '&return_module=PurchaseOrder&return_action=CallRelatedList&return_id='.$id;
 
 		$query = "SELECT vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid,vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and (activitytype='Task' or vtiger_activitytype='Call' or vtiger_activitytype='Meeting') and vtiger_crmentity.deleted=0 and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Completed') and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Deferred') or (vtiger_activity.eventstatus != '' &&  vtiger_activity.eventstatus = 'Planned')";
 		$log->debug("Exiting get_activities method ...");

Modified: vtigercrm/trunk/modules/Quotes/Quote.php
==============================================================================
--- vtigercrm/trunk/modules/Quotes/Quote.php (original)
+++ vtigercrm/trunk/modules/Quotes/Quote.php Sat Jun 17 05:14:50 2006
@@ -138,7 +138,7 @@
  
 		$button = '';
 
-		$returnset = '&return_module=Quotes&return_action=DetailView&return_id='.$id;
+		$returnset = '&return_module=Quotes&return_action=CallRelatedList&return_id='.$id;
 
 		$query = "select vtiger_crmentity.*, vtiger_salesorder.*, vtiger_quotes.subject as quotename, vtiger_account.accountname from vtiger_salesorder inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_salesorder.salesorderid left outer join vtiger_quotes on vtiger_quotes.quoteid=vtiger_salesorder.quoteid left outer join vtiger_account on vtiger_account.accountid=vtiger_salesorder.accountid left join vtiger_sogrouprelation on vtiger_salesorder.salesorderid=vtiger_sogrouprelation.salesorderid left join vtiger_groups on vtiger_groups.groupname=vtiger_sogrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_salesorder.quoteid = ".$id;
 		$log->debug("Exiting get_salesorder method ...");
@@ -155,7 +155,7 @@
 
 		$button = '';
 
-		$returnset = '&return_module=Quotes&return_action=DetailView&return_id='.$id;
+		$returnset = '&return_module=Quotes&return_action=CallRelatedList&return_id='.$id;
 
 		$query = "SELECT vtiger_contactdetails.contactid, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name,vtiger_recurringevents.recurringtype from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting') and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Completed') and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Deferred') or (vtiger_activity.eventstatus !='' && vtiger_activity.eventstatus = 'Planned')";
 		$log->debug("Exiting get_activities method ...");

Modified: vtigercrm/trunk/modules/Vendors/Vendor.php
==============================================================================
--- vtigercrm/trunk/modules/Vendors/Vendor.php (original)
+++ vtigercrm/trunk/modules/Vendors/Vendor.php Sat Jun 17 05:14:50 2006
@@ -73,7 +73,7 @@
 
 		$button = '';
 
-		$returnset = '&return_module=Vendors&return_action=DetailView&return_id='.$id;
+		$returnset = '&return_module=Vendors&return_action=CallRelatedList&return_id='.$id;
 
 		$query = 'select vtiger_products.productid, vtiger_products.productname, vtiger_products.productcode, vtiger_products.commissionrate, vtiger_products.qty_per_unit, vtiger_products.unit_price, vtiger_crmentity.crmid, vtiger_crmentity.smownerid,vtiger_vendor.vendorname from vtiger_products inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_products.productid left outer join vtiger_vendor on vtiger_vendor.vendorid = vtiger_products.vendor_id where vtiger_vendor.vendorid = '.$id.' and vtiger_crmentity.deleted = 0';
 		$log->debug("Exiting get_products method ...");
@@ -89,7 +89,7 @@
 
 		$button = '';
 
-		$returnset = '&return_module=Vendors&return_action=DetailView&return_id='.$id;
+		$returnset = '&return_module=Vendors&return_action=CallRelatedList&return_id='.$id;
 
 		$query = "select vtiger_crmentity.*, vtiger_purchaseorder.*,vtiger_vendor.vendorname from vtiger_purchaseorder inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_purchaseorder.purchaseorderid left outer join vtiger_vendor on vtiger_purchaseorder.vendorid=vtiger_vendor.vendorid left join vtiger_pogrouprelation on vtiger_purchaseorder.purchaseorderid=vtiger_pogrouprelation.purchaseorderid left join vtiger_groups on vtiger_groups.groupname=vtiger_pogrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_purchaseorder.vendorid=".$id;
 		$log->debug("Exiting get_purchase_orders method ...");
@@ -104,7 +104,7 @@
 		$focus = new Contact();
 
 		$button = '';
-		$returnset = '&return_module=Vendors&return_action=DetailView&return_id='.$id;
+		$returnset = '&return_module=Vendors&return_action=CallRelatedList&return_id='.$id;
 
 		$query = 'SELECT vtiger_contactdetails.*, vtiger_crmentity.crmid, vtiger_crmentity.smownerid,vtiger_vendorcontactrel.vendorid from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid  inner join vtiger_vendorcontactrel on vtiger_vendorcontactrel.contactid=vtiger_contactdetails.contactid left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid left join vtiger_groups on vtiger_groups.groupname=vtiger_contactgrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_vendorcontactrel.vendorid = '.$id;
 		$log->debug("Exiting get_contacts method ...");




From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 17 07:17:01 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 11:17:01 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7225 - in
 /vtigercrm/trunk/modules: Invoice/Invoice.php SalesOrder/SalesOrder.php
Message-ID: <20060617111701.0E0D27ED3E5@vtiger.fosslabs.com>

Author: saraj
Date: Sat Jun 17 05:16:54 2006
New Revision: 7225

Log:
* Modified the return module name in the returnset which will be used in the relatedlist

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

Modified: vtigercrm/trunk/modules/Invoice/Invoice.php
==============================================================================
--- vtigercrm/trunk/modules/Invoice/Invoice.php (original)
+++ vtigercrm/trunk/modules/Invoice/Invoice.php Sat Jun 17 05:16:54 2006
@@ -142,7 +142,7 @@
 
 		$button = '';
 
-		$returnset = '&return_module=Invoice&return_action=DetailView&return_id='.$id;
+		$returnset = '&return_module=Invoice&return_action=CallRelatedList&return_id='.$id;
 
 		$query = "SELECT vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid, vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or ativitytype='Meeting') and vtiger_crmentity.deleted=0 and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Completed') and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Deferred') or (vtiger_activity.eventstatus != '' &&  vtiger_activity.eventstatus = 'Planned')";
 		$log->debug("Exiting get_activities method ...");

Modified: vtigercrm/trunk/modules/SalesOrder/SalesOrder.php
==============================================================================
--- vtigercrm/trunk/modules/SalesOrder/SalesOrder.php (original)
+++ vtigercrm/trunk/modules/SalesOrder/SalesOrder.php Sat Jun 17 05:16:54 2006
@@ -145,7 +145,8 @@
 
 		$button = '';
 
-		$returnset = '&return_module=SalesOrder&return_action=DetailView&return_id='.$id;
+		$returnset = '&return_module=SalesOrder&return_action=CallRelatedList&return_id='.$id;
+
 		$query = "SELECT vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid, vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting') and vtiger_crmentity.deleted=0 and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Completed') and (vtiger_activity.status is not NULL && vtiger_activity.status !='Deferred') or (vtiger_activity.eventstatus != '' &&  vtiger_activity.eventstatus = 'Planned')";
 		$log->debug("Exiting get_activities method ...");
 		return GetRelatedList('SalesOrder','Activities',$focus,$query,$button,$returnset);
@@ -235,7 +236,7 @@
 		$focus = new Invoice();
 	
 		$button = '';
-		$returnset = '&return_module=SalesOrder&return_action=DetailView&return_id='.$id;
+		$returnset = '&return_module=SalesOrder&return_action=CallRelatedList&return_id='.$id;
 
 
 		$query = "select vtiger_crmentity.*, vtiger_invoice.*, vtiger_account.accountname, vtiger_salesorder.subject as salessubject from vtiger_invoice inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_invoice.invoiceid left outer join vtiger_account on vtiger_account.accountid=vtiger_invoice.accountid inner join vtiger_salesorder on vtiger_salesorder.salesorderid=vtiger_invoice.salesorderid left join vtiger_invoicegrouprelation on vtiger_invoice.invoiceid=vtiger_invoicegrouprelation.invoiceid left join vtiger_groups on vtiger_groups.groupname=vtiger_invoicegrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_salesorder.salesorderid=".$id;




From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 17 07:57:25 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 11:57:25 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7226 -
	/vtigercrm/trunk/themes/blue/images/del_tag.gif
Message-ID: <20060617115725.4B65F7ED3F0@vtiger.fosslabs.com>

Author: don
Date: Sat Jun 17 05:57:21 2006
New Revision: 7226

Log:
image added for tag delete

Added:
    vtigercrm/trunk/themes/blue/images/del_tag.gif   (with props)




From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 17 08:00:57 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 12:00:57 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7227 - in /vtigercrm/trunk:
 Smarty/templates/DetailView.tpl include/Ajax/TagCloud.php
 include/freetag/freetag.class.php modules/Home/index.php
Message-ID: <20060617120057.C25597ED3FD@vtiger.fosslabs.com>

Author: don
Date: Sat Jun 17 06:00:49 2006
New Revision: 7227

Log:
Tag delete integrated

Modified:
    vtigercrm/trunk/Smarty/templates/DetailView.tpl
    vtigercrm/trunk/include/Ajax/TagCloud.php
    vtigercrm/trunk/include/freetag/freetag.class.php
    vtigercrm/trunk/modules/Home/index.php

Modified: vtigercrm/trunk/Smarty/templates/DetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DetailView.tpl Sat Jun 17 06:00:49 2006
@@ -12,8 +12,8 @@
 
 -->*}
 <script type="text/javascript" src="modules/{$MODULE}/{$SINGLE_MOD}.js"></script>
-
-
+<script src="include/scriptaculous/prototype.js" type="text/javascript"></script>
+<script src="include/scriptaculous/scriptaculous.js" type="text/javascript"></script>
 <script language="JavaScript" type="text/javascript" src="include/js/dtlviewajax.js"></script>
 <span id="crmspanid" style="display:none;position:absolute;"  onmouseover="show('crmspanid');">
    <a class="link"  align="right" href="javascript:;">{$APP.LBL_EDIT_BUTTON}</a>
@@ -51,6 +51,22 @@
 		alert("Please enter a tag");
 		return false;
 	{rdelim}
+{rdelim}
+function DeleteTag(id)
+{ldelim}
+	$("vtbusy_info").style.display="inline";
+	Effect.Fade('tag_'+id);
+	new Ajax.Request(
+		'index.php',
+                {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+                        method: 'post',
+                        postBody: "file=TagCloud&module={$MODULE}&action={$MODULE}Ajax&ajxaction=DELETETAG&tagid=" +id,
+                        onComplete: function(response) {ldelim}
+						getTagCloud();
+						$("vtbusy_info").style.display="none";
+                        {rdelim}
+                {rdelim}
+        );
 {rdelim}
 </script>
 
@@ -323,17 +339,21 @@
 {/if}
 
 <script>
+function getTagCloud()
+{ldelim}
 new Ajax.Request(
         'index.php',
         {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
         method: 'post',
-        postBody: 'module={$MODULE}&action={$MODULE}Ajax&file=TagCloud&ajxaction=GETTAGCLOUD',
+        postBody: 'module={$MODULE}&action={$MODULE}Ajax&file=TagCloud&ajxaction=GETTAGCLOUD&recordid={$ID}',
         onComplete: function(response) {ldelim}
                                 $("tagfields").innerHTML=response.responseText;
                                 $("txtbox_tagfields").value ='';
                         {rdelim}
         {rdelim}
 );
+{rdelim}
+getTagCloud();
 </script>
 <!-- added for validation -->
 <script language="javascript">

Modified: vtigercrm/trunk/include/Ajax/TagCloud.php
==============================================================================
--- vtigercrm/trunk/include/Ajax/TagCloud.php (original)
+++ vtigercrm/trunk/include/Ajax/TagCloud.php Sat Jun 17 06:00:49 2006
@@ -9,49 +9,45 @@
   *
   ********************************************************************************/
 $ajaxaction = $_REQUEST['ajxaction'];
+global $current_user;
+$crmid = $_REQUEST["recordid"];
+$module = $_REQUEST["module"];
+$userid = $current_user->id;
 if($ajaxaction == "SAVETAG")
 {
 	
 	require_once('include/freetag/freetag.class.php');
-	global $current_user;
-	$crmid = $_REQUEST["recordid"];
-	$module = $_REQUEST["module"];
 	$tagfields = $_REQUEST["tagfields"];
-	$userid = $current_user->id;
-    $freetag = new freetag();
+    	$freetag = new freetag();
 	if (isset($_REQUEST["tagfields"]) && trim($_REQUEST["tagfields"]) != "")
 	{
-	      $freetag->tag_object($userid,$crmid,$tagfields,$module);
-	 	  $tagcloud = $freetag->get_tag_cloud_html($module);
-		  echo $tagcloud;
+	      	$freetag->tag_object($userid,$crmid,$tagfields,$module);
+	  	$tagcloud = $freetag->get_tag_cloud_html($module,$userid,$crmid);
+	  	echo $tagcloud;
 	}
-	
+
 }
 elseif($ajaxaction == 'GETTAGCLOUD')
 {
 	require_once('include/freetag/freetag.class.php');
 	$freetag = new freetag();
-	$module = $_REQUEST["module"];
-	$useid = $current_user->id;
+	if(trim($module) != "")
+	{
+		$tagcloud = $freetag->get_tag_cloud_html($module,$userid,$crmid);
+		echo $tagcloud;
+	}else
+	{
+		$tagcloud = $freetag->get_tag_cloud_html("",$userid);
+		echo $tagcloud;
+	}
+}elseif($ajaxaction == 'DELETETAG')
+{
+	$tagid = $_REQUEST['tagid']; 
 	global $adb;
-	$query="select * from vtiger_freetagged_objects where module = '".$module ."'";
+	$query="delete from vtiger_freetagged_objects where tag_id=".$tagid;
 	$result=$adb->query($query);
-	if($adb->num_rows($result) > 0)
-	{
-		if(trim($module) != "")
-		{
-			$tagcloud = $freetag->get_tag_cloud_html($module);
-			echo $tagcloud;
-		}else
-		{
-			$tagcloud = $freetag->get_tag_cloud_html();
-			echo $tagcloud;
-		}
-	}
-	else
-	{
-		echo '';
-	}
+	$query="delete from vtiger_freetags where id=".$tagid;
+	$result=$adb->query($query);
+	echo 'SUCESS';
 }
-
 ?>

Modified: vtigercrm/trunk/include/freetag/freetag.class.php
==============================================================================
--- vtigercrm/trunk/include/freetag/freetag.class.php (original)
+++ vtigercrm/trunk/include/freetag/freetag.class.php Sat Jun 17 06:00:49 2006
@@ -894,13 +894,16 @@
 	 * @return string Returns an HTML snippet that can be used directly as a tag cloud.
 	 */
 
-	function get_tag_cloud_html($module="",$num_tags = 100, $min_font_size = 10, $max_font_size = 20, $font_units = 'px', $span_class = '', $tag_page_url = '/tag/', $tagger_id = NULL) {
-		$tag_list = $this->get_tag_cloud_tags($num_tags, $tagger_id,$module);
-		if(!$tag_list) return;
+	function get_tag_cloud_html($module="",$tagger_id = NULL,$obj_id= NULL,$num_tags = 100, $min_font_size = 10, $max_font_size = 20, $font_units = 'px', $span_class = '', $tag_page_url = '/tag/') {
+		global $theme;
+		$theme_path="themes/".$theme."/";
+		$image_path=$theme_path."images/";	
+		$tag_list = $this->get_tag_cloud_tags($num_tags, $tagger_id,$module,$obj_id);
+		if(!$tag_list[0]) return;
 		// Get the maximum qty of tagged objects in the set
-		$max_qty = max(array_values($tag_list));
+		$max_qty = max(array_values($tag_list[0]));
 		// Get the min qty of tagged objects in the set
-		$min_qty = min(array_values($tag_list));
+		$min_qty = min(array_values($tag_list[0]));
 
 		// For ever additional tagged object from min to max, we add
 		// $step to the font size.
@@ -920,11 +923,22 @@
 		include("config.php");
 		if($module =='')
 			$module = 'All';	
-		foreach ($tag_list as $tag => $qty) {
-          		$size = $min_font_size + ($qty - $min_qty) * 3;
-			$cloud_span[] = '<span class="' . $span_class . '"><a class="tagit" href="'.$site_URL.'/index.php?module=Home&action=UnifiedSearch&search_module='.$module.'&query_string='. $tag . '" style="font-size: '. $size . $font_units . '">' . htmlspecialchars(stripslashes($tag)) . '</a></span>';
-
-		}
+		if($module != 'All')	
+		{	
+			foreach($tag_list[0] as $tag => $qty) {
+				$size = $min_font_size + ($qty - $min_qty) * 3;
+				$cloud_span[] = '<span id="tag_'.$tag_list[1][$tag].'" class="' . $span_class . '" onMouseOver=$("tagspan_'.$tag_list[1][$tag].'").style.display="inline"; onMouseOut=$("tagspan_'.$tag_list[1][$tag].'").style.display="none";><a class="tagit" href="'.$site_URL.'/index.php?module=Home&action=UnifiedSearch&search_module='.$module.'&query_string='. $tag . '" style="font-size: '. $size . $font_units . '">' . htmlspecialchars(stripslashes($tag)) . '</a><span class="'. $span_class .'" id="tagspan_'.$tag_list[1][$tag].'" style="display:none;cursor:pointer;" onClick="DeleteTag('.$tag_list[1][$tag].');"><img src="'.$image_path.'del_tag.gif"></span></span>';
+
+			}
+		}else
+		{
+			foreach($tag_list[0] as $tag => $qty) {
+				$size = $min_font_size + ($qty - $min_qty) * 3;
+				$cloud_span[] = '<span class="' . $span_class . '"><a class="tagit" href="'.$site_URL.'/index.php?module=Home&action=UnifiedSearch&search_module='.$module.'&query_string='. $tag . '" style="font-size: '. $size . $font_units . '">' . htmlspecialchars(stripslashes($tag)) . '</a></span>';
+
+			}
+
+		}	
 		$cloud_html = join("\n ", $cloud_span);
 
 		return $cloud_html;
@@ -948,22 +962,28 @@
 	 * values are numeric quantity of objects tagged with that tag.
 	 */
 
-	function get_tag_cloud_tags($max = 100, $tagger_id = NULL,$module = "") {
+	function get_tag_cloud_tags($max = 100, $tagger_id = NULL,$module = "",$obj_id = NULL) {
 		global $adb;
 		if(isset($tagger_id) && ($tagger_id > 0)) {
-			$tagger_sql = "AND tagger_id = $tagger_id";
+			$tagger_sql = " AND tagger_id = $tagger_id";
 		} else {
 			$tagger_sql = "";
 		}
 
 		if($module != "") {
-			$tagger_sql .= "AND module = '$module'";
+			$tagger_sql .= " AND module = '$module'";
 		} else {
 			$tagger_sql .= "";
 		}
 
-		$prefix = $this->_table_prefix;
-		$sql = "SELECT tag, COUNT(object_id) AS quantity
+		if(isset($obj_id) && $obj_id > 0) {
+                        $tagger_sql .= " AND object_id = $obj_id";
+                } else {
+                        $tagger_sql .= "";
+                }
+
+		$prefix = $this->_table_prefix;
+		$sql = "SELECT tag,tag_id,COUNT(object_id) AS quantity
 			FROM ${prefix}freetags INNER JOIN ${prefix}freetagged_objects
 			ON (${prefix}freetags.id = tag_id)
 			WHERE 1=1
@@ -975,39 +995,15 @@
 		$retarr = array();
 		while(!$rs->EOF) {
 			$retarr[$rs->fields['tag']] = $rs->fields['quantity'];
+			$retarr1[$rs->fields['tag']] = $rs->fields['tag_id'];
 			$rs->MoveNext();
 		}
-
 		if($retarr) ksort($retarr);
-
-		return $retarr;
-
-	}
-
-
-	/**
-	 * silly_list
-	 *
-	 * silly_list is now deprecated in favor of using get_tag_cloud_tags. It's still
-	 * available for compatibility. If you're just looking to get a tag cloud going,
-	 * try get_tag_cloud_html().
-	 * 
-	 * This is a function built explicitly to set up a page with most popular tags
-	 * that contains an alphabetically sorted list of tags, which can then be sized
-	 * or colored by popularity.
-	 *
-	 * Also known more popularly as Tag Clouds!
-	 *
-	 * Here's the example case: http://upcoming.org/tag/
-	 *
-	 * @param int The maximum number of tags to return.
-	 *
-	 * @return array Returns an array where the keys are normalized tags, and the
-	 * values are numeric quantity of objects tagged with that tag.
-	 */
-
-	function silly_list($max = 100, $tagger_id = NULL) {
-		return $this->get_tag_cloud_tags($max, $tagger_id);
+		if($retarr1) ksort($retarr1);
+		$return_value[]=$retarr;
+		$return_value[]=$retarr1;
+		return $return_value;
+
 	}
 
 	/**

Modified: vtigercrm/trunk/modules/Home/index.php
==============================================================================
--- vtigercrm/trunk/modules/Home/index.php (original)
+++ vtigercrm/trunk/modules/Home/index.php Sat Jun 17 06:00:49 2006
@@ -166,7 +166,7 @@
 $smarty->assign("HOMEDEFAULTVIEW",DefHomeView());
 $smarty->assign("ACTIVITIES",$activities);
 $freetag = new freetag();
-$smarty->assign("ALL_TAG",$freetag->get_tag_cloud_html());
+$smarty->assign("ALL_TAG",$freetag->get_tag_cloud_html("",$current_user->id));
 $smarty->display("HomePage.tpl");
 
 function getLoginHistory()




From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 17 08:45:04 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 12:45:04 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7228 - in /vtigercrm/trunk:
 include/utils/DeleteUtils.php modules/Users/massdelete.php
Message-ID: <20060617124504.E6B6B7E8A8F@vtiger.fosslabs.com>

Author: don
Date: Sat Jun 17 06:44:56 2006
New Revision: 7228

Log:
deleting tag while deleting the entity

Modified:
    vtigercrm/trunk/include/utils/DeleteUtils.php
    vtigercrm/trunk/modules/Users/massdelete.php

Modified: vtigercrm/trunk/include/utils/DeleteUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/DeleteUtils.php (original)
+++ vtigercrm/trunk/include/utils/DeleteUtils.php Sat Jun 17 06:44:56 2006
@@ -289,13 +289,13 @@
 			$adb->query($del_query);
 	break;
 	endswitch;
-	global $current_user;
-	require_once('include/freetag/freetag.class.php');
-	$freetag=new freetag();
-	$freetag->delete_all_object_tags_for_user($current_user->id,$record);
 	
 	if($return_module == $module && $return_module !='Rss' && $return_module !='Portal')
 	{	
+		global $current_user;
+		require_once('include/freetag/freetag.class.php');
+		$freetag=new freetag();
+		$freetag->delete_all_object_tags_for_user($current_user->id,$record);
 		$focus->mark_deleted($record);
 	}
 	if($module != 'Faq')

Modified: vtigercrm/trunk/modules/Users/massdelete.php
==============================================================================
--- vtigercrm/trunk/modules/Users/massdelete.php (original)
+++ vtigercrm/trunk/modules/Users/massdelete.php Sat Jun 17 06:44:56 2006
@@ -27,6 +27,10 @@
 {
         if(isPermitted($returnmodule,'Delete',$id) == 'yes')
         {
+		global $current_user;
+                require_once('include/freetag/freetag.class.php');
+                $freetag=new freetag();
+                $freetag->delete_all_object_tags_for_user($current_user->id,$id);
                 $sql="update vtiger_crmentity set deleted=1 where crmid='" .$id ."'";
                 $result = $adb->query($sql);
         }




From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 17 08:51:43 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 12:51:43 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7229 - in /vtigercrm/trunk:
 Smarty/templates/DetailView.tpl Smarty/templates/DetailViewUI.tpl
 include/utils/DetailViewUtils.php
Message-ID: <20060617125143.568A27ED3B3@vtiger.fosslabs.com>

Author: don
Date: Sat Jun 17 06:51:36 2006
New Revision: 7229

Log:
fade effect for Contact image has been integrated

Modified:
    vtigercrm/trunk/Smarty/templates/DetailView.tpl
    vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl
    vtigercrm/trunk/include/utils/DetailViewUtils.php

Modified: vtigercrm/trunk/Smarty/templates/DetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DetailView.tpl Sat Jun 17 06:51:36 2006
@@ -12,6 +12,7 @@
 
 -->*}
 <script type="text/javascript" src="modules/{$MODULE}/{$SINGLE_MOD}.js"></script>
+<script type="text/javascript" src="reflection.js"></script>
 <script src="include/scriptaculous/prototype.js" type="text/javascript"></script>
 <script src="include/scriptaculous/scriptaculous.js" type="text/javascript"></script>
 <script language="JavaScript" type="text/javascript" src="include/js/dtlviewajax.js"></script>

Modified: vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl Sat Jun 17 06:51:36 2006
@@ -198,8 +198,8 @@
 							</td>
 	
 
-				{elseif $keyid eq 103}<!-- for Tag Cloud -->
-                                                  	<td class="dvtCellInfo" align="left" width=25%">{$keyval}</td>
+				{elseif $keyid eq 69}<!-- for Image Reflection -->
+                                                  	<td align="left" width=25%">{$keyval}</td>
 				{else}									
                                                   	<td class="dvtCellInfo" align="left" width=25%">{$keyval}</td>
 				{/if}

Modified: vtigercrm/trunk/include/utils/DetailViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/DetailViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/DetailViewUtils.php Sat Jun 17 06:51:36 2006
@@ -408,7 +408,7 @@
 		if($tabid==4)
 		{
 			$imgpath = getModuleFileStoragePath('Contacts').$col_fields[$fieldname];
-			$label_fld[] ='<img src="'.$imgpath.'" border="0">';
+			$label_fld[] ='<img src="'.$imgpath.'" class="reflect" width="450" height="300" alt="">';
 		}
 
 	}




From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 17 08:52:46 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 12:52:46 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7230 -
	/vtigercrm/trunk/Smarty/templates/DetailView.tpl
Message-ID: <20060617125246.766C27ED212@vtiger.fosslabs.com>

Author: don
Date: Sat Jun 17 06:52:42 2006
New Revision: 7230

Log:
reflect js moved to include/js

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 Sat Jun 17 06:52:42 2006
@@ -12,7 +12,7 @@
 
 -->*}
 <script type="text/javascript" src="modules/{$MODULE}/{$SINGLE_MOD}.js"></script>
-<script type="text/javascript" src="reflection.js"></script>
+<script type="text/javascript" src="include/js/reflection.js"></script>
 <script src="include/scriptaculous/prototype.js" type="text/javascript"></script>
 <script src="include/scriptaculous/scriptaculous.js" type="text/javascript"></script>
 <script language="JavaScript" type="text/javascript" src="include/js/dtlviewajax.js"></script>




From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 17 08:53:50 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 12:53:50 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7231 -
	/vtigercrm/trunk/include/js/reflection.js
Message-ID: <20060617125350.865937ED212@vtiger.fosslabs.com>

Author: don
Date: Sat Jun 17 06:53:46 2006
New Revision: 7231

Log:
js added for reflection effect

Added:
    vtigercrm/trunk/include/js/reflection.js




From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 17 09:26:03 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 13:26:03 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7232 -
	/vtigercrm/trunk/include/js/ajax.js
Message-ID: <20060617132603.A15FB7ED422@vtiger.fosslabs.com>

Author: don
Date: Sat Jun 17 07:25:59 2006
New Revision: 7232

Log:
file retained as it is used for migration and ajax chat

Added:
    vtigercrm/trunk/include/js/ajax.js




From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 17 10:31:01 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 14:31:01 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7233 -
 /vtigercrm/trunk/modules/Settings/language/en_us.lang.php
Message-ID: <20060617143101.ED5307ED428@vtiger.fosslabs.com>

Author: richie
Date: Sat Jun 17 08:30:56 2006
New Revision: 7233

Log:
Updated language file

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




From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 17 10:31:55 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 14:31:55 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7234 -
 /vtigercrm/trunk/modules/Users/language/en_us.lang.php
Message-ID: <20060617143155.EE1737ED428@vtiger.fosslabs.com>

Author: richie
Date: Sat Jun 17 08:31:51 2006
New Revision: 7234

Log:
update lang file

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

Modified: vtigercrm/trunk/modules/Users/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Users/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Users/language/en_us.lang.php Sat Jun 17 08:31:51 2006
@@ -320,6 +320,7 @@
 'LBL_HDR_EMAIL_SCHDS'=>'Users : Email Notifications',
 'LBL_EMAIL_SCHDS_DESC'=>'The following is the list of notifications that are activated automatically when the corresponding event has happened.',
 'LBL_ACTIVE'=>'Active',
+'LBL_INACTIVE'=>'Inactive',
 'LBL_NOTIFICATION'=>'Notification',
 'LBL_DESCRIPTION'=>'Description',
 'LBL_TASK_NOTIFICATION'=>'Delayed Task Notification',




From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 17 10:33:21 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 14:33:21 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7235 -
 /vtigercrm/trunk/modules/Users/listnotificationschedulers.php
Message-ID: <20060617143321.59BEF7ED428@vtiger.fosslabs.com>

Author: richie
Date: Sat Jun 17 08:33:17 2006
New Revision: 7235

Log:
Updated the file for new UI

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

Modified: vtigercrm/trunk/modules/Users/listnotificationschedulers.php
==============================================================================
--- vtigercrm/trunk/modules/Users/listnotificationschedulers.php (original)
+++ vtigercrm/trunk/modules/Users/listnotificationschedulers.php Sat Jun 17 08:33:17 2006
@@ -29,9 +29,9 @@
 		$result_data['id'] = $result_row['schedulednotificationid'];
 	
 		if($result_data['active'] != 1)	
-			$result_data['active'] = '<img src="'.$image_path.'no.gif">';
+			$result_data['active'] = $mod_strings['LBL_INACTIVE'];
 		else
-			$result_data['active'] = '<img src="'.$image_path.'yes.gif">';
+			$result_data['active'] = $mod_strings['LBL_ACTIVE'];
 			
 		$result_data['label'] = $mod_strings[$result_row['label']];
 		$notifiy_array []= $result_data;




From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 17 10:40:51 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 14:40:51 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7236 -
	/vtigercrm/trunk/Smarty/templates/Header.tpl
Message-ID: <20060617144051.5D0397E8A8F@vtiger.fosslabs.com>

Author: richie
Date: Sat Jun 17 08:40:47 2006
New Revision: 7236

Log:
Header template file updated

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

Modified: vtigercrm/trunk/Smarty/templates/Header.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Header.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Header.tpl Sat Jun 17 08:40:47 2006
@@ -10,9 +10,26 @@
  ********************************************************************************/
 -->*}
 <!-- BEGIN: main -->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>
+
+{literal}	
+<!--[if lte IE 6]>
+<STYLE type=text/css>HTML {
+	OVERFLOW: auto; HEIGHT: 100%
+}
+BODY {
+	margin:0 0 0 0;
+	OVERFLOW: auto; HEIGHT: 100%
+}
+DIV.fixedLay {
+	POSITION: absolute;
+}
+</STYLE>
+<![endif]-->
+{/literal}
+
 	<title>{$CURRENT_USER} - {$APP.$CATEGORY} - {$APP.$MODULE_NAME} - {$APP.LBL_BROWSER_TITLE}</title>
 	<link rel="stylesheet" type="text/css" href="style.css">
 	<link REL="SHORTCUT ICON" HREF="include/images/vtigercrm_icon.ico">	




From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 17 10:42:39 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 14:42:39 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7237 -
 /vtigercrm/trunk/Smarty/templates/Settings/BackupServer.tpl
Message-ID: <20060617144239.34D5A7ED41E@vtiger.fosslabs.com>

Author: richie
Date: Sat Jun 17 08:42:35 2006
New Revision: 7237

Log:
Updated tpl file for new UI

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 Sat Jun 17 08:42:35 2006
@@ -1,142 +1,145 @@
-{*<!--
-/*********************************************************************************
-  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
-   * ("License"); You may not use this file except in compliance with the License
-   * The Original Code is:  vtiger CRM Open Source
-   * The Initial Developer of the Original Code is vtiger.
-   * Portions created by vtiger are Copyright (C) vtiger.
-   * All Rights Reserved.
-  *
- ********************************************************************************/
--->*}
-<script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
-<style type="text/css">@import url(themes/blue/style.css);</style>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-<tr>
-	{include file='SettingsMenu.tpl'}
-<td width="75%" valign="top">
-
-<table width="100%" border="0" cellpadding="0" cellspacing="0" height="100%">
-<form action="index.php" method="post" name="tandc">
-<input type="hidden" name="server_type" value="backup">
-<input type="hidden" name="module" value="Settings">
-<input type="hidden" name="action" value="index">
-<input type="hidden" name="bkp_server_mode">
-<input type="hidden" name="server_type" value="backup">
-<input type="hidden" name="parenttab" value="Settings">
-<tr>
-<td class="showPanelBg" valign="top" width="100%" colspan="3" style="padding-left:20px; "><br/>
-<span class="lvtHeaderText"><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS} </a> > {$MOD.LBL_CONFIGURATION} > {$MOD.LBL_BACKUP_SERVER_CONFIG}</b></span>
-<hr noshade="noshade" size="1" />
-</td>
-</tr>
-<tr>
-<td width="75%" style="padding-left:20px;" valign="top">
-
-	<table align="center" border="0" cellpadding="0" cellspacing="0" width="95%">
-	<tbody><tr>
-	<td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif;" height="6" width="7"><img src="{$IMAGE_PATH}top_left.jpg" align="top"></td>
-	<td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif; height: 6px;" bgcolor="#ebebeb"></td>
-	<td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif;" height="6" width="8"><img src="{$IMAGE_PATH}top_right.jpg" align="top" height="6" width="8"></td>
-	</tr>
-	<tr>
-
-	<td bgcolor="#ebebeb" width="7"></td>
-	<td style="padding-left: 10px; padding-top: 10px; vertical-align: top;" bgcolor="#ececec">
-	<table border="0" cellpadding="10" cellspacing="0" width="100%" class="small">
-	<tbody><tr>
-	<td rowspan="6" bgcolor="#ffffff" width="30%" valign="bottom" background="{$IMAGE_PATH}BackupServer_top.gif" style="background-position:top right;background-repeat:no-repeat;">
-		<table width="100%" border="0" cellpadding="0" cellspacing="0">
-				<tr>
-						<td background="{$IMAGE_PATH}BackupServer_btm.gif" style="background-position:bottom right;background-repeat:no-repeat; " height="150">&nbsp;</td>
-				</tr>
-		</table>
-	</td>
-	{if $BKP_SERVER_MODE neq 'edit'}
-	<td colspan="2" style="padding-top: 0px;" align="right" width="70%">
-	<input title="{$APP.LBL_EDIT_BUTTON_TITLE}" accessKey="{$APP.LBL_EDIT_BUTTON_KEY}" class="classBtn" onclick="this.form.action.value='BackupServerConfig';this.form.bkp_server_mode.value='edit'" type="submit" name="Edit" value="{$APP.LBL_EDIT_BUTTON_LABEL}"><br><hr>
-	</td>
-	{else}	
-	<td colspan="2" style="padding-top: 0px;" align="left" width="75%">
-	<b>{$MOD.LBL_BACKUP_SERVER_INFO}</b>&nbsp;{$ERROR_MSG}<br><hr>
-	</td>
-	{/if}
-	</tr>
-	
-	{if $BKP_SERVER_MODE eq 'edit'}
-	<tr>
-		<td><font color="red">*</font>{$MOD.LBL_FTP_SERVER_NAME}:</td>
-		<td><input class="dataInput" type="text" name="server" value="{$FTPSERVER}" size="25" /></td>
-	</tr>
-	<tr>
-		<td><font color="red">*</font>{$MOD.LBL_FTP_USER_NAME}:</td>
-		<td><input class="dataInput" type="text" name="server_username" value="{$FTPUSER}" size="25" /></td>
-	</tr>
-	<tr>
-		<td><font color="red">*</font>{$MOD.LBL_FTP_PASSWORD}:</td>
-		<td><input class="dataInput" type="password" name="server_password" value="{$FTPPASSWORD}" size="25" /></td>
-	</tr>
-	{else}
-	<tr>
-		<td width=40%>{$MOD.LBL_FTP_SERVER_NAME}:</td>
-		<td>{$FTPSERVER}</td>
-	</tr>
-	<tr>
-		<td>{$MOD.LBL_FTP_USER_NAME}:</td>
-		<td>{$FTPUSER}</td>
-	</tr>
-	<tr>
-		<td>{$MOD.LBL_FTP_PASSWORD}:</td>
-		<td>
-		{if $FTPPASSWORD neq ''}
-		******
-		{/if}&nbsp;
-		</td>
-	</tr>
-	{/if}
-
-	<tr><td colspan="2" width="75%">&nbsp; </td></tr>
-	<tr><td colspan="2" align="center"width="75%"><hr> <br>
-	
-	{if $BKP_SERVER_MODE eq 'edit'}
-	<input title="{$APP.LBL_SAVE_BUTTON_LABEL}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="classBtn" type="submit" name="button" value="{$APP.LBL_SAVE_BUTTON_LABEL}" onclick="this.form.action.value='Save'; return validate()"">&nbsp;&nbsp;&nbsp;
-    <input title="{$APP.LBL_CANCEL_BUTTON_LABEL}" accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" class="classBtn" onclick="window.history.back()" type="button" name="button" value="{$APP.LBL_CANCEL_BUTTON_LABEL}">
-	{/if}	
-
-	</td></tr>
-	</tbody></table>
-	</td>
-	<td bgcolor="#ebebeb" width="8"></td>
-	</tr>
-
-	<tr>
-	<td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif;" height="8" width="7"><img src="{$IMAGE_PATH}bottom_left.jpg" align="bottom"></td>
-	<td style="font-size: 1px;" bgcolor="#ececec" height="8"></td>
-	
-	<td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif;" height="8" width="8"><img src="{$IMAGE_PATH}bottom_right.jpg" align="bottom"></td>
-	</tr>
-	</tbody></table>
-
-</td>
-<td width="1%" style="border-right:1px dotted #CCCCCC;">&nbsp;</td>
-</tr>
-</form>
-</table>
-</td>
-</tr>
-</table>
-</td>
-</tr>
-</table>
-	{include file='SettingsSubMenu.tpl'}
-{literal}
-<script>
-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;
-
-}
-</script>
-{/literal}
+{*<!--
+/*********************************************************************************
+  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
+   * ("License"); You may not use this file except in compliance with the License
+   * The Original Code is:  vtiger CRM Open Source
+   * The Initial Developer of the Original Code is vtiger.
+   * Portions created by vtiger are Copyright (C) vtiger.
+   * All Rights Reserved.
+  *
+ ********************************************************************************/
+-->*}
+<script language="JAVASCRIPT" type="text/javascript" src="include/js/smoothscroll.js"></script>
+<br>
+<table align="center" border="0" cellpadding="0" cellspacing="0" width="98%">
+<tbody><tr>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
+        <td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
+<br>
+	<div align=center>
+			{include file="SetMenu.tpl"}
+				<!-- DISPLAY -->
+				<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
+				<form action="index.php" method="post" name="tandc">
+				<input type="hidden" name="server_type" value="backup">
+				<input type="hidden" name="module" value="Settings">
+				<input type="hidden" name="action" value="index">
+				<input type="hidden" name="bkp_server_mode">
+				<input type="hidden" name="server_type" value="backup">
+				<input type="hidden" name="parenttab" value="Settings">
+				<tr>
+					<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}backupserver.gif" alt="Users" width="48" height="48" border=0 title="Users"></td>
+					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > {$MOD.LBL_BACKUP_SERVER_SETTINGS} </b></td>
+				</tr>
+				<tr>
+					<td valign=top class="small">{$MOD.LBL_BACKUP_SERVER_DESC} </td>
+				</tr>
+				</table>
+				
+				<br>
+				<table border=0 cellspacing=0 cellpadding=10 width=100% >
+				<tr>
+				<td>
+				
+					<table border=0 cellspacing=0 cellpadding=5 width=100% class="tableHeading">
+					<tr>
+						<td class="big"><strong>{$MOD.LBL_BACKUP_SERVER_SETTINGS} ({$MOD.LBL_FTP})<br>{$ERROR_MSG}</strong></td>
+						{if $BKP_SERVER_MODE neq 'edit'}
+						<td class="small" align=right>
+							<input title="{$APP.LBL_EDIT_BUTTON_TITLE}" accessKey="{$APP.LBL_EDIT_BUTTON_KEY}" class="crmButton small edit" onclick="this.form.action.value='BackupServerConfig';this.form.bkp_server_mode.value='edit'" type="submit" name="Edit" value="{$APP.LBL_EDIT_BUTTON_LABEL}">
+						</td>
+						{else}
+						<td class="small" align=right>
+							<input title="{$APP.LBL_SAVE_BUTTON_LABEL}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="crmButton small save" type="submit" name="button" value="{$APP.LBL_SAVE_BUTTON_LABEL}" onclick="this.form.action.value='Save'; return validate()">&nbsp;&nbsp;
+						    <input title="{$APP.LBL_CANCEL_BUTTON_LABEL}" accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" class="crmButton small cancel" onclick="window.history.back()" type="button" name="button" value="{$APP.LBL_CANCEL_BUTTON_LABEL}">
+						</td>
+						{/if}
+					</tr>
+					</table>
+				
+			{if $BKP_SERVER_MODE eq 'edit'}	
+			<table border=0 cellspacing=0 cellpadding=0 width=100% class="listRow">
+			<tr>
+      			    <td class="small" valign=top ><table width="100%"  border="0" cellspacing="0" cellpadding="5">
+                        <tr>
+                            <td width="20%" nowrap class="small cellLabel"><font color="red">*</font><strong>{$MOD.LBL_SERVER_ADDRESS} </strong></td>
+                            <td width="80%" class="small cellText">
+				<input type="text" class="detailedViewTextBox small" value="{$FTPSERVER}" name="server"></strong>
+			    </td>
+                          </tr>
+                          <tr valign="top">
+
+                            <td nowrap class="small cellLabel"><font color="red">*</font><strong>{$MOD.LBL_USERNAME}</strong></td>
+                            <td class="small cellText">
+				<input type="text" class="detailedViewTextBox small" value="{$FTPUSER}" name="server_username">
+			    </td>
+                          </tr>
+                          <tr>
+                            <td nowrap class="small cellLabel"><font color="red">*</font><strong>{$MOD.LBL_PASWRD}</strong></td>
+                            <td class="small cellText">
+				<input type="password" class="detailedViewTextBox small" value="{$FTPPASSWORD}" name="server_password">
+			    </td>
+                          </tr>
+                        </table>
+			{else}
+			<table border=0 cellspacing=0 cellpadding=0 width=100% class="listRow">
+			<tr>
+	         	    <td class="small" valign=top ><table width="100%"  border="0" cellspacing="0" cellpadding="5">
+                        <tr>
+                            <td width="20%" nowrap class="small cellLabel"><strong>{$MOD.LBL_SERVER_ADDRESS} </strong></td>
+                            <td width="80%" class="small cellText"><strong>{$FTPSERVER}</strong></td>
+                        </tr>
+                        <tr valign="top">
+                            <td nowrap class="small cellLabel"><strong>{$MOD.LBL_USERNAME}</strong></td>
+                            <td class="small cellText">{$FTPUSER}</td>
+                        </tr>
+                        <tr>
+                            <td nowrap class="small cellLabel"><strong>{$MOD.LBL_PASWRD}</strong></td>
+                            <td class="small cellText">
+				{if $FTPPASSWORD neq ''}
+				******
+				{/if}&nbsp;
+			    </td>
+                        </tr>
+                        </table>
+					
+			{/if}				
+						</td>
+					  </tr>
+					</table>
+					<table border=0 cellspacing=0 cellpadding=5 width=100% >
+					<tr>
+					  <td class="small" nowrap align=right><a href="#top">{$MOD.LBL_SCROLL}</a></td>
+					</tr>
+					</table>
+				</td>
+				</tr>
+				</table>
+			
+			
+			
+			</td>
+			</tr>
+			</table>
+		</td>
+	</tr>
+	</form>
+	</table>
+		
+	</div>
+</td>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
+   </tr>
+</tbody>
+</table>
+{literal}
+<script>
+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;
+
+}
+</script>
+{/literal}




From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 17 10:43:45 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 14:43:45 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7238 -
 /vtigercrm/trunk/Smarty/templates/Settings/EditCompanyInfo.tpl
Message-ID: <20060617144345.F1CF77ED41E@vtiger.fosslabs.com>

Author: richie
Date: Sat Jun 17 08:43:41 2006
New Revision: 7238

Log:
Update company info file according to new ui

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 Sat Jun 17 08:43:41 2006
@@ -9,134 +9,134 @@
   *
  ********************************************************************************/
 -->*}
+<script language="JAVASCRIPT" type="text/javascript" src="include/js/smoothscroll.js"></script>
 <script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
-<style type="text/css">@import url(themes/blue/style.css);</style>
-<table width="100%" border="0" cellpadding="0" cellspacing="0" class="small">
-<tr>
-	{include file='SettingsMenu.tpl'}
-<td width="75%" valign="top">
-
-<table width="100%" border="0" cellpadding="0" cellspacing="0" height="100%" class="small">
-<td class="showPanelBg" valign="top" width="100%" colspan="3" style="padding-left:20px; "><br/>
-<span class="lvtHeaderText"><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS} </a> > {$MOD.LBL_CONFIGURATION} > {$MOD.LBL_COMPANY_INFO}</b></span>
-<hr noshade="noshade" size="1" />
-</td>
-</tr>
-<tr>
-<td width="75%" style="padding-left:20px;" valign="top">
-	
+<br>
+<table align="center" border="0" cellpadding="0" cellspacing="0" width="98%">
+<tbody><tr>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
+        <td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
+<br>
 	<form action="index.php?module=Settings&action=add2db" method="post" name="index" enctype="multipart/form-data">
  	<input type="hidden" name="return_module" value="Settings">
  	<input type="hidden" name="parenttab" value="Settings">
-    <input type="hidden" name="return_action" value="OrganizationConfig">
-	<table align="center" border="0" cellpadding="0" cellspacing="0" width="95%" class="small">
-	<tbody><tr>
-	<td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif;" height="6" width="7"><img src="{$IMAGE_PATH}top_left.jpg" align="top"></td>
-	<td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif; height: 6px;" bgcolor="#ebebeb"></td>
-	<td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif;" height="6" width="8"><img src="{$IMAGE_PATH}top_right.jpg" align="top" height="6" width="8"></td>
+    	<input type="hidden" name="return_action" value="OrganizationConfig">
+	<div align=center>
+			{include file="SetMenu.tpl"}	
+				<!-- DISPLAY -->
+				<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
+				<tr>
+					<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}company.gif" width="48" height="48" border=0 ></td>
+					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > {$MOD.LBL_EDIT} {$MOD.LBL_COMPANY_DETAILS} </b></td>
+				</tr>
+				<tr>
+					<td valign=top class="small">{$MOD.LBL_COMPANY_DESC}</td>
+				</tr>
+				</table>
+				
+				<br>
+				<table border=0 cellspacing=0 cellpadding=10 width=100% >
+				<tr>
+				<td>
+				
+					<table border=0 cellspacing=0 cellpadding=5 width=100% class="tableHeading">
+					<tr>
+						<td class="big"><strong>{$MOD.LBL_COMPANY_DETAILS} </strong>
+						{$ERRORFLAG}<br>
+						</td>
+						<td class="small" align=right>
+							<input title="{$APP.LBL_SAVE_BUTTON_LABEL}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="crmButton small save" type="submit" name="button" value="{$APP.LBL_SAVE_BUTTON_LABEL}" onclick="return verify_data(form,'{$MOD.LBL_ORGANIZATION_NAME}');" >
+							<input title="{$APP.LBL_CANCEL_BUTTON_LABEL}" accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" class="crmButton small cancel" onclick="window.history.back()" type="button" name="button" value="{$APP.LBL_CANCEL_BUTTON_LABEL}">
+						</td>
+					</tr>
+					</table>
+					
+					<table border=0 cellspacing=0 cellpadding=0 width=100% class="listRow">
+					<tr>
+						<td class="small" valign=top ><table width="100%"  border="0" cellspacing="0" cellpadding="5">
+                          <tr>
+                            <td width="20%" class="small cellLabel"><font color="red">*</font><strong>{$MOD.LBL_ORGANIZATION_NAME}</strong></td>
+                            <td width="80%" class="small cellText">
+				<input type="text" name="organization_name" class="detailedViewTextBox small" value="{$ORGANIZATIONNAME}">
+				<input type="hidden" name="org_name" value="{$ORGANIZATIONNAME}">
+			    </strong></td>
+                          </tr>
+                          <tr valign="top">
+                            <td class="small cellLabel"><strong>{$MOD.LBL_ORGANIZATION_LOGO}</strong></td>
+			    {if $ORGANIZATIONLOGONAME neq ''}	
+                            <td class="small cellText" style="background-image: url(test/logo/{$ORGANIZATIONLOGONAME}); background-position: left; background-repeat: no-repeat;" width="48" height="48" border="0" >
+			    {else}
+                            <td class="small cellText" style="background-image: url(include/images/noimage.gif); background-position: left; background-repeat: no-repeat;" width="48" height="48" border="0" >
+			     {/if}	
+				<br><br><br><br>
+                             {$MOD.LBL_SELECT_LOGO} 
+				<INPUT TYPE="HIDDEN" NAME="MAX_FILE_SIZE" VALUE="800000">
+		                <INPUT TYPE="HIDDEN" NAME="PREV_FILE" VALUE="{$ORGANIZATIONLOGONAME}">	 
+                                <input type="file" name="binFile" class="small" value="{$ORGANIZATIONLOGONAME}">[{$ORGANIZATIONLOGONAME}]
+			      </td>
+                          </tr>
+                          <tr>
+                            <td class="small cellLabel"><strong>{$MOD.LBL_ORGANIZATION_ADDRESS}</strong></td>
+                            <td class="small cellText"><input type="text" name="organization_address" class="detailedViewTextBox small" value="{$ORGANIZATIONADDRESS}"></td>
+                          </tr>
+                          <tr> 
+                            <td class="small cellLabel"><strong>{$MOD.LBL_ORGANIZATION_CITY}</strong></td>
+                            <td class="small cellText"><input type="text" name="organization_city" class="detailedViewTextBox small" value="{$ORGANIZATIONCITY}"></td>
+                          </tr>
+                          <tr>
+                            <td class="small cellLabel"><strong>{$MOD.LBL_ORGANIZATION_STATE}</strong></td>
+                            <td class="small cellText"><input type="text" name="organization_state" class="detailedViewTextBox small" value="{$ORGANIZATIONSTATE}"></td>
+                          </tr>
+                          <tr>
+                            <td class="small cellLabel"><strong>{$MOD.LBL_ORGANIZATION_CODE}</strong></td>
+                            <td class="small cellText"><input type="text" name="organization_code" class="detailedViewTextBox small" value="{$ORGANIZATIONCODE}"></td>
+                          </tr>
+                          <tr>
+                            <td class="small cellLabel"><strong>{$MOD.LBL_ORGANIZATION_COUNTRY}</strong></td>
+                            <td class="small cellText"><input type="text" name="organization_country" class="detailedViewTextBox small" value="{$ORGANIZATIONCOUNTRY}"></td>
+
+                          </tr>
+                          <tr>
+                            <td class="small cellLabel"><strong>{$MOD.LBL_ORGANIZATION_PHONE}</strong></td>
+                            <td class="small cellText"><input type="text" name="organization_phone" class="detailedViewTextBox small" value="{$ORGANIZATIONPHONE}"></td>
+                          </tr>
+                          <tr>
+                            <td class="small cellLabel"><strong>{$MOD.LBL_ORGANIZATION_FAX}</strong></td>
+                            <td class="small cellText"><input type="text" name="organization_fax" class="detailedViewTextBox small" value="{$ORGANIZATIONFAX}"></td>
+                          </tr>
+                          <tr>
+                            <td class="small cellLabel"><strong>{$MOD.LBL_ORGANIZATION_WEBSITE}</strong></td>
+                            <td class="small cellText"><input type="text" name="organization_website" class="detailedViewTextBox small" value="{$ORGANIZATIONWEBSITE}"></td>
+                          </tr>
+                        </table>
+						
+						</td>
+					  </tr>
+					</table>
+					<table border=0 cellspacing=0 cellpadding=5 width=100% >
+					<tr>
+					  <td class="small" nowrap align=right><a href="#top">{$MOD.LBL_SCROLL}</a></td>
+					</tr>
+					</table>
+				</td>
+				</tr>
+				</table>
+			
+			
+			
+			</td>
+			</tr>
+			</table>
+		</td>
 	</tr>
-	<tr>
-
-	<td bgcolor="#ebebeb" width="7"></td>
-	<td style="padding-left: 10px; padding-top: 10px; vertical-align: top;" bgcolor="#ececec">
-	<table border="0" cellpadding="10" cellspacing="0" width="100%" class="small">
-	<tbody><tr>
-	{if $ORGANIZATIONLOGONAME neq ''}
-	<td rowspan="11" style="background-image: url(test/logo/{$ORGANIZATIONLOGONAME}); background-position: center; background-repeat: no-repeat;" bgcolor="#ffffff" width="25%">&nbsp;</td>
-	{else}
-	<td rowspan="11" style="background-image: url(include/images/noimage.gif); background-position: center; background-repeat: no-repeat;" bgcolor="#ffffff" width="25%">&nbsp;</td>
-	{/if}
-	<td colspan="2" class="genHeaderBig" width="75%">{$ORGANIZATIONNAME}
-	{$ERRORFLAG}
-	<br><hr> </td>
-	</tr>
-	<tr>
-
-	<td align="right" width="25%"><font color="red">*</font><b>{$MOD.LBL_ORGANIZATION_NAME} : </b></td>
-	<td align="left" width="50%"><input name="organization_name" class="txtBox" value="{$ORGANIZATIONNAME}" type="text">
-	<input type="hidden" name="org_name" value="{$ORGANIZATIONNAME}">
-	</td>
-	</tr>
-	<tr>
-	<td align="right"><b>{$MOD.LBL_ORGANIZATION_ADDRESS} : </b></td>
-	<td><input name="organization_address" class="txtBox" value="{$ORGANIZATIONADDRESS}" type="text"></td>
-	</tr>
-	<tr>
-
-	<td align="right"><b>{$MOD.LBL_ORGANIZATION_CITY} : </b></td>
-	<td><input name="organization_city" class="txtBox" value="{$ORGANIZATIONCITY}" type="text"></td>
-	</tr>
-	<tr>
-	<td align="right"><b>{$MOD.LBL_ORGANIZATION_STATE} : </b></td>
-	<td><input name="organization_state" class="txtBox" value="{$ORGANIZATIONSTATE}" type="text"></td>
-	</tr>
-	<tr>
-
-	<td align="right"><b>{$MOD.LBL_ORGANIZATION_CODE}  : </b></td>
-	<td><input name="organization_code" class="txtBox" value="{$ORGANIZATIONCODE}" type="text"></td>
-	</tr>
-	<tr>
-	<td align="right"><b>{$MOD.LBL_ORGANIZATION_COUNTRY} : </b></td>
-	<td><input name="organization_country" class="txtBox" value="{$ORGANIZATIONCOUNTRY}" type="text"></td>
-	</tr>
-	<tr>
-
-	<td colspan="2" style="padding-bottom: 0px; padding-top: 0px;" width="75%"><hr> </td>
-	</tr>
-	<tr>
-	<td colspan="2" style="padding: 0px;" width="75%">
-	<table border="0" cellpadding="5" cellspacing="0" width="100%" class="small">
-	<tbody><tr>
-	<td nowrap align="right" width="15%"><b>{$MOD.LBL_ORGANIZATION_PHONE} : </b></td>
-	<td width="40%"><input name="organization_phone" class="txtBox" value="{$ORGANIZATIONPHONE}" type="text"></td>
-
-	<td nowrap align="right" width="15%"><b>{$MOD.LBL_ORGANIZATION_WEBSITE} : </b></td>
-	<td width="30%"><input name="organization_website" class="txtBox" value="{$ORGANIZATIONWEBSITE}" type="text"></td>
-	</tr>
-	<tr>
-	<td nowrap align="right"><b>{$MOD.LBL_ORGANIZATION_FAX} : </b></td>
-	<td><input name="organization_fax" class="txtBox" value="{$ORGANIZATIONFAX}" type="text"></td>
-	<td nowrap align="right"><b>{$MOD.LBL_ORGANIZATION_LOGO} : </b></td>
-
-	<td><INPUT TYPE="HIDDEN" NAME="MAX_FILE_SIZE" VALUE="800000">
-	    <INPUT TYPE="HIDDEN" NAME="PREV_FILE" VALUE="{$ORGANIZATIONLOGONAME}">
-	    <input type="file" class="txtBox" name="binFile" value="{$ORGANIZATIONLOGONAME}">[{$ORGANIZATIONLOGONAME}]
-	</td>
-	</tr>
-	</tbody></table></td>
-	</tr>
-	<tr>
-	<td colspan="2" style="padding-top: 0px; padding-bottom: 0px;"><hr></td>
-	</tr>
-	<tr>
-	<td	colspan="2" align="center">
-	<input title="{$APP.LBL_SAVE_BUTTON_LABEL}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="classBtn" type="submit" name="button" value="{$APP.LBL_SAVE_BUTTON_LABEL}" onclick="return verify_data(form,'{$MOD.LBL_ORGANIZATION_NAME}');" >
-    <input title="{$APP.LBL_CANCEL_BUTTON_LABEL}" accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" class="classBtn" onclick="window.history.back()" type="button" name="button" value="{$APP.LBL_CANCEL_BUTTON_LABEL}"></td>
-	</td>
-	</tr>
-	</tbody></table>
-	</td>
-	<td bgcolor="#ebebeb" width="8"></td>
-	</tr>
-	<tr>
-	<td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif;" height="8" width="7"><img src="{$IMAGE_PATH}bottom_left.jpg" align="bottom"></td>
-	<td style="font-size: 1px;" bgcolor="#ececec" height="8"></td>
-	<td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif;" height="8" width="8"><img src="{$IMAGE_PATH}bottom_right.jpg" align="bottom"></td>
-	</tr>
-	</tbody></table>
-	</form>
-
+	</table>
+	</div>
+	</form>		
 </td>
-<td width="1%" style="border-right:1px dotted #CCCCCC;">&nbsp;</td>
-</tr>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
+   </tr>
+</tbody>
 </table>
-</td>
-</tr>
-</table>
-</td>
-</tr>
-</table>
-	{include file='SettingsSubMenu.tpl'}
 {literal}
 <script>
 function verify_data(form,company_name)
@@ -144,7 +144,8 @@
 	if (form.organization_name.value == "" )
 	{
 		alert(company_name +" cannot be none");
-		return false
+		form.organization_name.focus();
+		return false;
 
 	}
 	else if (form.organization_name.value.replace(/^\s+/g, '').replace(/\s+$/g, '').length==0)




From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 17 10:44:55 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 14:44:55 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7239 -
	/vtigercrm/trunk/Smarty/templates/Settings/
Message-ID: <20060617144455.271D47ED41E@vtiger.fosslabs.com>

Author: richie
Date: Sat Jun 17 08:44:46 2006
New Revision: 7239

Log:
Updated the tpl file for new UI

Modified:
    vtigercrm/trunk/Smarty/templates/Settings/EditEmailNotification.tpl
    vtigercrm/trunk/Smarty/templates/Settings/EditInventoryNotify.tpl
    vtigercrm/trunk/Smarty/templates/Settings/EmailNotification.tpl
    vtigercrm/trunk/Smarty/templates/Settings/EmailNotificationContents.tpl
    vtigercrm/trunk/Smarty/templates/Settings/InventoryNotify.tpl
    vtigercrm/trunk/Smarty/templates/Settings/InventoryNotifyContents.tpl
    vtigercrm/trunk/Smarty/templates/Settings/ModuleOwners.tpl
    vtigercrm/trunk/Smarty/templates/Settings/ModuleOwnersContents.tpl

Modified: vtigercrm/trunk/Smarty/templates/Settings/EditEmailNotification.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Settings/EditEmailNotification.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Settings/EditEmailNotification.tpl Sat Jun 17 08:44:46 2006
@@ -9,7 +9,7 @@
   *
  ********************************************************************************/
 -->*}
-<div id="orgLay">
+<div id="editnot" class="fixedLay">
 <table width="100%">
 <tbody>
 <tr>
@@ -50,8 +50,8 @@
 <tr><td colspan="2" style="border-bottom: 1px dashed rgb(204, 204, 204);">&nbsp;</td></tr>
 <tr>
 <td colspan="2" align="center">
-<input name="save" value=" &nbsp;Save&nbsp; " class="classBtn" type="button" onClick="fetchSaveNotify('{$NOTIFY_DETAILS.id}','{$NOTIFY_DETAILS.subject}','{$NOTIFY_DETAILS.body}')">
-<input name="cancel" value=" &nbsp;Cancel&nbsp; " class="classBtn" type="button" onClick="hide('editdiv');">
+<input name="save" value=" {$APP.LBL_SAVE_BUTTON_LABEL} " class="crmButton small save" type="button" onClick="fetchSaveNotify('{$NOTIFY_DETAILS.id}','{$NOTIFY_DETAILS.subject}','{$NOTIFY_DETAILS.body}')">
+<input name="cancel" value=" {$APP.LBL_CANCEL_BUTTON_LABEL} " class="crmButton small cancel" type="button" onClick="hide('editdiv');">
 </td>
 </tr>
 <tr><td colspan="2" style="border-top: 1px dashed rgb(204, 204, 204);">&nbsp;</td></tr>

Modified: vtigercrm/trunk/Smarty/templates/Settings/EditInventoryNotify.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Settings/EditInventoryNotify.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Settings/EditInventoryNotify.tpl Sat Jun 17 08:44:46 2006
@@ -9,7 +9,7 @@
   *
  ********************************************************************************/
 -->*}
-<div id="orgLay">
+<div id="EditInv" class="fixedLay">
 <table width="100%">
 	<tbody>
 	<tr>
@@ -37,8 +37,8 @@
 	<tr><td colspan="4" style="border-bottom: 1px dashed rgb(204, 204, 204);">&nbsp;</td></tr>
 	<tr>
 		<td colspan="4" align="center">
-	<input name="save" value=" &nbsp;Save&nbsp; " class="classBtn" type="button" onClick="fetchSaveNotify('{$NOTIFY_DETAILS.id}')">
-	<input name="cancel" value=" &nbsp;Cancel&nbsp; " class="classBtn" type="button" onClick="hide('editdiv');">
+	<input name="save" value="{$APP.LBL_SAVE_BUTTON_LABEL}" class="crmButton small save" type="button" onClick="fetchSaveNotify('{$NOTIFY_DETAILS.id}')">
+	<input name="cancel" value="{$APP.LBL_CANCEL_BUTTON_LABEL}" class="crmButton small cancel" type="button" onClick="hide('editdiv');">
 		</td>
 	</tr>
 	<tr><td colspan="4" style="border-top: 1px dashed rgb(204, 204, 204);">&nbsp;</td></tr>

Modified: vtigercrm/trunk/Smarty/templates/Settings/EmailNotification.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Settings/EmailNotification.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Settings/EmailNotification.tpl Sat Jun 17 08:44:46 2006
@@ -9,37 +9,93 @@
   *
  ********************************************************************************/
 -->*}
+<script language="JAVASCRIPT" type="text/javascript" src="include/js/smoothscroll.js"></script>
 <script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
-<style type="text/css">@import url(themes/blue/style.css);</style>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-<tr>
-	{include file='SettingsMenu.tpl'}
-<td width="75%" valign="top">
+{literal}
+<style>
+DIV.fixedLay{
+	border:3px solid #CCCCCC;
+	background-color:#FFFFFF;
+	width:500px;
+	position:fixed;
+	left:250px;
+	top:200px;
+	display:block;
+}
+</style>
+{/literal}
+{literal}
+<!--[if lte IE 6]>
+<STYLE type=text/css>
+DIV.fixedLay {
+	POSITION: absolute;
+}
+</STYLE>
+<![endif]-->
 
-<table width="100%" border="0" cellpadding="0" cellspacing="0" height="100%">
-<td class="showPanelBg" valign="top" width="100%" colspan="3" style="padding-left:20px; "><br/>
-<span class="lvtHeaderText"><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS} </a> > {$MOD.LBL_COMMUNICATION_TEMPLATES} > {$MOD.NOTIFICATIONSCHEDULERS}</b></span>
-<hr noshade="noshade" size="1" />
-</td>
-</tr>
-<tr>
-<td width="75%" style="padding-left:20px;" valign="top">
+{/literal}
+<br>
+<table align="center" border="0" cellpadding="0" cellspacing="0" width="98%">
+<tbody><tr>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
+        <td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
+<br>
+	<div align=center>
+	
+			{include file='SetMenu.tpl'}
+		
+			<!-- DISPLAY -->
+			<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
+			<tr>
+				<td width="50" rowspan="2" valign="top"><img src="{$IMAGE_PATH}notification.gif" alt="Users" width="48" height="48" border=0 title="Users"></td>
+				<td colspan="2" class="heading2" valign=bottom align="left"><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > {$MOD.NOTIFICATIONSCHEDULERS} </b></td>
+				<td rowspan=2 class="small" align=right>&nbsp;</td>
+			</tr>
+			<tr>
+				<td valign=top class="small" align="left">{$MOD.LBL_NOTIF_SCHED_DESCRIPTION}</td>
+			</tr>
+			</table>
+<table border=0 cellspacing=0 cellpadding=5 width=100% class="tableHeading">
+						<tr><td>&nbsp;</td></tr>
+				</table>
+
+				<table width="100%" border="0" cellpadding="5" cellspacing="0" class="listTableTopButtons">
+                  <tr >
+
+                    <td  style="padding-left:5px;" class="big">{$MOD.NOTIFICATIONSCHEDULERS}</td>
+                    <td align="right">&nbsp;</td>
+                  </tr>
+			  </table>
+
+
 	
 	<div id="notifycontents">
 	{include file='Settings/EmailNotificationContents.tpl'}
 	</div>
-	
+
+	<table border=0 cellspacing=0 cellpadding=5 width=100% >
+	<tr><td class="small" nowrap align=right><a href="#top">{$MOD.LBL_SCROLL}</a></td></tr>
+	</table>
+	</td>
+	</tr>
+	</table>
+			
+			
+			
+			</td>
+			</tr>
+			</table>
+		</td>
+	</tr>
+	</table>
+		
+	</div>
+
 </td>
-<td width="1%" style="border-right:1px dotted #CCCCCC;">&nbsp;</td>
-</tr>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
+   </tr>
+</tbody>
 </table>
-</td>
-</tr>
-</table>
-</td>
-</tr>
-</table>
-	{include file='SettingsSubMenu.tpl'}
 	<div id="editdiv" style="display:none;position:absolute;left:180px;top:30px;"></div>
 {literal}
 <script>

Modified: vtigercrm/trunk/Smarty/templates/Settings/EmailNotificationContents.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Settings/EmailNotificationContents.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Settings/EmailNotificationContents.tpl Sat Jun 17 08:44:46 2006
@@ -9,24 +9,26 @@
   *
  ********************************************************************************/
 -->*}
-<table style="background-color: rgb(204, 204, 204);" class="small" border="0" cellpadding="5" cellspacing="1" width="100%">
-	<tbody>
+<table width="100%" cellpadding="5" cellspacing="0" class="listTable" >
 	<tr>
-	<td class="lvtCol" width="5%">#</td>
-	<td class="lvtCol" width="35%">{$MOD.LBL_NOTIFICATION}</td>
-	<td class="lvtCol" width="50%">{$MOD.LBL_DESCRIPTION}</td>
-	<td class="lvtCol" width="10%">{$MOD.LBL_ACTIVE}</td>
-	<td class="lvtCol" width="10%">{$MOD.LBL_TOOL}</td>
+	<td class="colHeader small" width="5%">#</td>
+	<td class="colHeader small" width="35%">{$MOD.LBL_NOTIFICATION}</td>
+	<td class="colHeader small" width="50%">{$MOD.LBL_DESCRIPTION}</td>
+	<td class="colHeader small" width="10%">{$MOD.LBL_STATUS}</td>
+	<td class="colHeader small" width="10%">{$MOD.LBL_TOOL}</td>
 	</tr>
 	{foreach name=notifyfor item=elements from=$NOTIFICATION}
-	<tr class="lvtColData" onmouseover="this.className='lvtColDataHover'" onmouseout="this.className='lvtColData'" bgcolor="white">
-	<td>{$smarty.foreach.notifyfor.iteration}</td>
-	<td>{$elements.label}</td>
-	<td>{$elements.schedulename}</td>
-	<td>{$elements.active}</td>
-	<td onClick="fetchEditNotify('{$smarty.foreach.notifyfor.iteration}');"><img src="{$IMAGE_PATH}editfield.gif" title="edit"></td>
+	<tr>
+	<td class="listTableRow small">{$smarty.foreach.notifyfor.iteration}</td>
+	<td class="listTableRow small">{$elements.label}</td>
+	<td class="listTableRow small">{$elements.schedulename}</td>
+	{if $elements.active eq 'Active'}
+	<td class="listTableRow small active">{$elements.active}</td>
+	{else}
+	<td class="listTableRow small inactive">{$elements.active}</td>
+	{/if}
+	<td class="listTableRow small" onClick="fetchEditNotify('{$smarty.foreach.notifyfor.iteration}');"><img src="{$IMAGE_PATH}editfield.gif" title="edit"></td>
 	</tr>
 	{/foreach}
-	</tbody>
 	</table>
 

Modified: vtigercrm/trunk/Smarty/templates/Settings/InventoryNotify.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Settings/InventoryNotify.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Settings/InventoryNotify.tpl Sat Jun 17 08:44:46 2006
@@ -9,37 +9,88 @@
   *
  ********************************************************************************/
 -->*}
+<script language="JAVASCRIPT" type="text/javascript" src="include/js/smoothscroll.js"></script>
 <script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
-<style type="text/css">@import url(themes/blue/style.css);</style>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-<tr>
-	{include file='SettingsMenu.tpl'}
-<td width="75%" valign="top">
+{literal}
+<style>
+DIV.fixedLay{
+	border:3px solid #CCCCCC;
+	background-color:#FFFFFF;
+	width:500px;
+	position:fixed;
+	left:250px;
+	top:200px;
+	display:block;
+}
+</style>
+{/literal}
+{literal}
+<!--[if lte IE 6]>
+<STYLE type=text/css>
+DIV.fixedLay {
+	POSITION: absolute;
+}
+</STYLE>
+<![endif]-->
 
-<table width="100%" border="0" cellpadding="0" cellspacing="0" height="100%">
-<td class="showPanelBg" valign="top" width="100%" colspan="3" style="padding-left:20px; "><br/>
-<span class="lvtHeaderText"><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS} </a> > {$MOD.LBL_COMMUNICATION_TEMPLATES} > {$MOD.INVENTORYNOTIFICATION}</b></span>
-<hr noshade="noshade" size="1" />
-</td>
-</tr>
-<tr>
-<td width="75%" style="padding-left:20px;" valign="top">
+{/literal}
+<br>
+<table align="center" border="0" cellpadding="0" cellspacing="0" width="98%">
+<tbody><tr>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
+        <td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
+<br>
+	<div align=center>
+	
+			{include file='SetMenu.tpl'}
+
+			<!-- DISPLAY -->
+			<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
+			<tr>
+				<td width="50" rowspan="2" valign="top"><img src="{$IMAGE_PATH}inventory.gif" alt="Users" width="48" height="48" border=0 title="Users"></td>
+				<td colspan="2" class="heading2" valign=bottom align="left"><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > {$MOD.INVENTORYNOTIFICATION} </b></td>
+				<td rowspan=2 class="small" align=right>&nbsp;</td>
+			</tr>
+			<tr>
+				<td valign=top class="small" align="left">{$MOD.LBL_INV_NOTIF_DESCRIPTION}</td>
+			</tr>
+			</table>
+<table border=0 cellspacing=0 cellpadding=5 width=100% class="tableHeading">
+						<tr><td>&nbsp;</td></tr>
+				</table>
+
+				<table width="100%" border="0" cellpadding="5" cellspacing="0" class="listTableTopButtons">
+                  <tr >
+
+                    <td  style="padding-left:5px;" class="big">{$MOD.INVENTORYNOTIFICATION}</td>
+                    <td align="right">&nbsp;</td>
+                  </tr>
+			  </table>
 	
 	<div id="notifycontents">
 	{include file='Settings/InventoryNotifyContents.tpl'}
 	</div>
 	
+	<table border=0 cellspacing=0 cellpadding=5 width=100% >
+	<tr><td class="small" nowrap align=right><a href="#top">{$MOD.LBL_SCROLL}</a></td></tr>
+	</table>
+	</td>
+	</tr>
+	</table>
+	</td>
+	</tr>
+	</table>
+	</td>
+	</tr>
+	</table>
+		
+	</div>
+
 </td>
-<td width="1%" style="border-right:1px dotted #CCCCCC;">&nbsp;</td>
-</tr>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
+   </tr>
+</tbody>
 </table>
-</td>
-</tr>
-</table>
-</td>
-</tr>
-</table>
-	{include file='SettingsSubMenu.tpl'}
 	<div id="editdiv" style="display:none;position:absolute;left:180px;top:30px;"></div>
 {literal}
 <script>

Modified: vtigercrm/trunk/Smarty/templates/Settings/InventoryNotifyContents.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Settings/InventoryNotifyContents.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Settings/InventoryNotifyContents.tpl Sat Jun 17 08:44:46 2006
@@ -9,21 +9,21 @@
   *
  ********************************************************************************/
 -->*}
-<table style="background-color: rgb(204, 204, 204);" class="small" border="0" cellpadding="5" cellspacing="1" width="100%">
+<table width="100%" cellpadding="5" cellspacing="0" class="listTable" >
 	
 	<tbody>
 	<tr>
-	<td class="lvtCol" width="5%">#</td>
-	<td class="lvtCol" width="40%">{$CMOD.LBL_NOTIFICATION}</td>
-	<td class="lvtCol" width="50%">{$CMOD.LBL_DESCRIPTION}</td>
-	<td class="lvtCol" width="5%">{$CMOD.Tools}</td>
+	<td class="colHeader small" width="5%">#</td>
+	<td class="colHeader small" width="40%">{$CMOD.LBL_NOTIFICATION}</td>
+	<td class="colHeader small" width="50%">{$CMOD.LBL_DESCRIPTION}</td>
+	<td class="colHeader small" width="5%">{$CMOD.Tools}</td>
 	</tr>
 	{foreach name=notifyfor item=elements from=$NOTIFICATION}
-	<tr class="lvtColData" onmouseover="this.className='lvtColDataHover'" onmouseout="this.className='lvtColData'" bgcolor="white">
-	<td>{$smarty.foreach.notifyfor.iteration}</td>
-	<td>{$elements.notificationname}</td>
-	<td>{$elements.label}</td>
-	<td align="center" onClick="fetchEditNotify('{$elements.id}');"><img src="{$IMAGE_PATH}editfield.gif"></td>
+	<tr>
+	<td class="listTableRow small">{$smarty.foreach.notifyfor.iteration}</td>
+	<td class="listTableRow small">{$elements.notificationname}</td>
+	<td class="listTableRow small">{$elements.label}</td>
+	<td class="listTableRow small" align="center" onClick="fetchEditNotify('{$elements.id}');"><img src="{$IMAGE_PATH}editfield.gif"></td>
 	</tr>
 	{/foreach}
 	</tbody>

Modified: vtigercrm/trunk/Smarty/templates/Settings/ModuleOwners.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Settings/ModuleOwners.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Settings/ModuleOwners.tpl Sat Jun 17 08:44:46 2006
@@ -9,37 +9,60 @@
   *
  ********************************************************************************/
 -->*}
+<script language="JAVASCRIPT" type="text/javascript" src="include/js/smoothscroll.js"></script>
 <script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
-<style type="text/css">@import url(themes/blue/style.css);</style>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-<tr>
-	{include file='SettingsMenu.tpl'}
-<td width="75%" valign="top">
+<br>
+<table align="center" border="0" cellpadding="0" cellspacing="0" width="98%">
+<tbody><tr>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
+        <td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
+<br>
+	<div align=center>
+	
+			{include file='SetMenu.tpl'}
 
-<table width="100%" border="0" cellpadding="0" cellspacing="0" height="100%">
-<td class="showPanelBg" valign="top" width="100%" colspan="3" style="padding-left:20px; "><br/>
-<span class="lvtHeaderText"><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS} </a> > {$MOD.LBL_USER_MANAGEMENT} > {$MOD.LBL_ASSIGN_MODULE_OWNERS}</b></span>
-<hr noshade="noshade" size="1" />
+			<!-- DISPLAY -->
+			<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
+			<tr>
+					<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}assign.gif" alt="Users" width="48" height="48" border=0 title="Users"></td>
+				<td class="heading2" valign="bottom" ><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > {$MOD.LBL_MODULE_OWNERS} </b></td>
+			</tr>
+			<tr>
+				<td valign=top class="small">{$MOD.LBL_MODULE_OWNERS_DESCRIPTION}</td>
+			</tr>
+			</table>
+			<br>
+			<table border=0 cellspacing=0 cellpadding=10 width=100% >
+			<tr>
+			<td>
+
+					<div id="module_list_owner">	
+						{include file='Settings/ModuleOwnersContents.tpl'}
+					</div>
+	
+	<table border=0 cellspacing=0 cellpadding=5 width=100% >
+	<tr><td class="small" nowrap align=right><a href="#top">{$MOD.LBL_SCROLL}</a></td></tr>
+	</table>
+	</td>
+	</tr>
+	</table>
+	</td>
+	</tr>
+	</table>
+	</td>
+	</tr>
+	</form>
+	</table>
+		
+	</div>
+
 </td>
-</tr>
-<tr>
-<td width="75%" style="padding-left:20px;" valign="top">
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
+   </tr>
+</tbody>
+</table>
+
 	
-	<div id="module_list_owner">	
-	{include file='Settings/ModuleOwnersContents.tpl'}
-	</div>
-	
-</td>
-<td width="1%" style="border-right:1px dotted #CCCCCC;">&nbsp;</td>
-</tr>
-</table>
-</td>
-</tr>
-</table>
-</td>
-</tr>
-</table>
-	{include file='SettingsSubMenu.tpl'}
 {literal}
 <script>
 function assignmodulefn(mode)

Modified: vtigercrm/trunk/Smarty/templates/Settings/ModuleOwnersContents.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Settings/ModuleOwnersContents.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Settings/ModuleOwnersContents.tpl Sat Jun 17 08:44:46 2006
@@ -11,46 +11,47 @@
 -->*}
 <form name="support_owners" method="POST" action="index.php">
 	<input type="hidden" name="module" value="Settings">
+	<input type="hidden" name="parenttab" value="Settings">
 	<input type="hidden" name="action" value="SettingsAjax">
 	<input type="hidden" name="file" value="ListModuleOwners">
-	<table class="prdTab" align="center" cellpadding="3" cellspacing="0">
-	<tbody><tr><td colspan="3" style="border: 0px none ;">&nbsp;</td></tr>
+<table border=0 cellspacing=0 cellpadding=5 width=100% class="tableHeading">
+<tr>
+	<td class="big"><strong>{$MOD.LBL_MODULES_AND_OWNERS}</strong></td>
+	<td class="small" align=right>
+<div align="right">
+{if $MODULE_MODE neq 'edit'}
+		<input title="{$APP.LBL_EDIT_BUTTON_LABEL}" accessKey="{$APP.LBL_EDIT_BUTTON_KEY}" class="crmButton small edit" type="button" name="button" value="{$APP.LBL_EDIT_BUTTON_LABEL}" onClick="assignmodulefn('edit');">
+{else}
+		<input title="{$APP.LBL_SAVE_BUTTON_LABEL}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="crmButton small save" type="button" name="button" value="{$APP.LBL_SAVE_BUTTON_LABEL}" onClick="assignmodulefn('save');" >&nbsp;
+						<input title="{$APP.LBL_CANCEL_BUTTON_LABEL}" accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" class="crmButton small cancel" onclick="this.form.action.value='ListModuleOwners'; this.form.parenttab.value='Settings';" type="submit" name="button" value="{$APP.LBL_CANCEL_BUTTON_LABEL}" >
+{/if}
+</div>
+</td>
+</tr>
+					
+</table>
+	<table border=0 cellspacing=0 cellpadding=5 width=100% class="listTable">	
 	<tr>
-	<td style="border: 0px none ;" colspan="2" align="left">&nbsp;</td>
-	<td style="border: 0px none ;" align="right">
-	<div align="right">
-	{if $MODULE_MODE neq 'edit'}
-	<input title="{$APP.LBL_EDIT_BUTTON_LABEL}" accessKey="{$APP.LBL_EDIT_BUTTON_KEY}" class="classBtn" type="button" name="button" value="{$APP.LBL_EDIT_BUTTON_LABEL}" onClick="assignmodulefn('edit');">
-	{else}
-	<input title="{$APP.LBL_SAVE_BUTTON_LABEL}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="classBtn" type="button" name="button" value="{$APP.LBL_SAVE_BUTTON_LABEL}" onClick="assignmodulefn('save');" >
-	<input title="{$APP.LBL_CANCEL_BUTTON_LABEL}" accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" class="classBtn" onclick="this.form.action.value='ListModuleOwners';" type="submit" name="button" value="{$APP.LBL_CANCEL_BUTTON_LABEL}" >
-	{/if}
-	</div>
-	</td>
-	</tr>
-	<tr><td colspan="3" style="border: 0px none ;">&nbsp;</td></tr>
-	
-	<tr>
-	<th style="border-top: 1px solid rgb(204, 204, 204); height: 30px;" width="10%"><b>#</b></th>
-	<th style="border-top: 1px solid rgb(204, 204, 204);" width="45%"><b>{$MOD.LBL_MODULE}</b></th>
-	<th style="border-top: 1px solid rgb(204, 204, 204);" width="45%"><b>{$MOD.LBL_OWNER} </b></th>
+		<td class="colHeader small" width="2%">#</td>
+		<td class="colHeader small" width="30%">{$MOD.LBL_MODULE}</td>
+		<td class="colHeader small" width="65%">{$MOD.LBL_OWNER}</td>
 	</tr>
 	{if $MODULE_MODE neq 'edit'}
 	{foreach name=modulelists item=modules from=$USER_LIST}
-	<tr class="prvPrfHoverOff" onmouseover="this.className='prvPrfHoverOn'" onmouseout="this.className='prvPrfHoverOff'">
-		<td>{$smarty.foreach.modulelists.iteration}</td>
-		<td>{$APP[$modules.0]}</td>
-		<td><a href="index.php?module=Users&action=DetailView&record={$modules.1}">{$modules.2}</a></td>	
+	<tr>
+		<td class="listTableRow small" valign="top">{$smarty.foreach.modulelists.iteration}</td>
+		<td class="listTableRow small" valign="top">{$APP[$modules.0]}</td>
+		<td class="listTableRow small" valign="top"><a href="index.php?module=Users&action=DetailView&record={$modules.1}">{$modules.2}</a></td>	
 	</tr>
 	{/foreach}
 	{else}
 	{foreach name=modulelists item=modules from=$USER_LIST}
-	<tr class="prvPrfHoverOff">
-		<td>{$smarty.foreach.modulelists.iteration}</td>
-		<td>{$APP[$modules.0]}</td>
-		<td>{$modules.1}</td>	
+	<tr>
+		<td class="listTableRow small" valign="top">{$smarty.foreach.modulelists.iteration}</td>
+		<td class="listTableRow small" valign="top">{$APP[$modules.0]}</td>
+		<td class="listTableRow small" valign="top">{$modules.1}</td>	
 	</tr>
 	{/foreach}
 	{/if}
-	</tbody></table>
-	</form>
+	</table>
+</form>




From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 17 10:48:19 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 14:48:19 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7240 - in
 /vtigercrm/trunk/Smarty/templates: CurrencyListView.tpl
 CurrencyListViewEntries.tpl
Message-ID: <20060617144819.533E47ED41E@vtiger.fosslabs.com>

Author: richie
Date: Sat Jun 17 08:48:15 2006
New Revision: 7240

Log:
Updated the CurrencyListView.tpl CurrencyListViewEntries.tpl files

Modified:
    vtigercrm/trunk/Smarty/templates/CurrencyListView.tpl
    vtigercrm/trunk/Smarty/templates/CurrencyListViewEntries.tpl

Modified: vtigercrm/trunk/Smarty/templates/CurrencyListView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/CurrencyListView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/CurrencyListView.tpl Sat Jun 17 08:48:15 2006
@@ -1,5 +1,4 @@
 {*<!--
-
 /*********************************************************************************
 ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
  * ("License"); You may not use this file except in compliance with the License
@@ -9,8 +8,81 @@
  * All Rights Reserved.
 *
  ********************************************************************************/
+-->*}
+<script language="JAVASCRIPT" type="text/javascript" src="include/js/smoothscroll.js"></script>
+<script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
+<br>
+<table align="center" border="0" cellpadding="0" cellspacing="0" width="98%">
+<tbody><tr>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
+        <td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
+<br>
+	<div align=center>
+	
+			{include file='SetMenu.tpl'}
 
--->*}
+			<!-- DISPLAY -->
+			<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
+			<form action="index.php">
+			<input type="hidden" name="module" value="Settings">
+			<input type="hidden" name="action" value="CurrencyEditView">
+			<input type="hidden" name="parenttab" value="{$PARENTTAB}">
+			<tr>
+					<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}currency.gif" alt="Users" width="48" height="48" border=0 title="Users"></td>
+				<td class="heading2" valign="bottom" ><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > {$MOD.LBL_CURRENCY_SETTINGS} </b></td>
+			</tr>
+			<tr>
+				<td valign=top class="small">{$MOD.LBL_CURRENCY_DESCRIPTION}</td>
+			</tr>
+			</table>
+			<br>
+			<table border=0 cellspacing=0 cellpadding=10 width=100% >
+			<tr>
+			<td>
+
+			<table border=0 cellspacing=0 cellpadding=5 width=100% class="tableHeading">
+				<tr>
+					<td class="big"><strong>{$MOD.LBL_CURRENCY_LIST}</strong></td>
+                	       		<td class="small" align="right">&nbsp;</td>
+				</tr>
+			</table>
+
+			<table width="100%" border="0" cellpadding="5" cellspacing="0" class="listTableTopButtons">
+	                <tr>
+				<td class=small align=right>
+					<input type="submit" value="{$MOD.LBL_NEW_CURRENCY}" class="crmButton create small">
+				</td>
+	                </tr>
+	                </table>
+
+			<div id="CurrencyListViewContents">
+				{include file="CurrencyListViewEntries.tpl"}
+			</div>
+
+	<table border=0 cellspacing=0 cellpadding=5 width=100% >
+	<tr><td class="small" nowrap align=right><a href="#top">{$MOD.LBL_SCROLL}</a></td></tr>
+	</table>
+	</td>
+	</tr>
+	</table>
+	</td>
+	</tr>
+	</table>
+	</td>
+	</tr>
+	</form>
+	</table>
+		
+	</div>
+
+</td>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
+   </tr>
+</tbody>
+</table>
+
+<div id="currencydiv" style="display:block;position:absolute;left:350px;top:200px;"></div>
+
 {literal}
 <script>
 	function deleteCurrency(currid)
@@ -49,35 +121,3 @@
 </script>
 
 {/literal}
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-<tr>
-        {include file='SettingsMenu.tpl'}
-<td width="75%" valign="top">
-<form action="index.php">
-<input type="hidden" name="module" value="Settings">
-<input type="hidden" name="action" value="CurrencyEditView">
-<input type="hidden" name="parenttab" value="{$PARENTTAB}">
-<table width="100%" border="0" cellpadding="0" cellspacing="0" height="100%">
-	<tr>
-		<td class="showPanelBg" valign="top" width="90%"  style="padding-left:20px; "><br />
-			<span class="lvtHeaderText">{$MOD.LBL_MODULE_NAME} &gt;{$MOD.LBL_CONFIGURATION} &gt; {$MOD.LBL_CURRENCY_CONFIG}</span>
-			<hr noshade="noshade" size="1" />
-		</td>
-		<td width="10%" class="showPanelBg">&nbsp;</td>
-	</tr>
-	<tr>
-		<td width="90%" style="padding-left:20px;" valign="top">
-			<input type="submit" name="new" value="{$MOD.LBL_NEW_CURRENCY}" class="classBtn" /><br /><br />
-			<div id="CurrencyListViewContents">
-				{include file="CurrencyListViewEntries.tpl"}
-			</div>
-		</td>
-		<td>&nbsp;</td>
-	</tr>
-</table>
-</form>
-</td>
-</tr>
-</table>
-<div id="currencydiv" style="display:block;position:absolute;left:350px;top:200px;"></div>
-{include file='SettingsSubMenu.tpl'}

Modified: vtigercrm/trunk/Smarty/templates/CurrencyListViewEntries.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/CurrencyListViewEntries.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/CurrencyListViewEntries.tpl Sat Jun 17 08:48:15 2006
@@ -1,5 +1,4 @@
 {*<!--
-
 /*********************************************************************************
 ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
  * ("License"); You may not use this file except in compliance with the License
@@ -12,21 +11,29 @@
 
 -->*}
 
-
-<table style="background-color: rgb(204, 204, 204);" class="small" border="0" cellpadding="5" cellspacing="1" width="100%">
+<table width="100%" cellpadding="5" cellspacing="0" class="listTable" >
 	<tr>
-        	<td class="lvtCol" width="25%">{$MOD.LBL_CURRENCY_NAME}</td>
-                <td class="lvtCol" width="20%">{$MOD.LBL_CURRENCY_CODE}</td>
-                <td class="lvtCol" width="5%">{$MOD.LBL_CURRENCY_SYMBOL}</td>
-                <td class="lvtCol" width="20%">{$MOD.LBL_CURRENCY_CRATE}</td>
-                <td class="lvtCol" width="15%">{$MOD.LBL_CURRENCY_STATUS}</td>
-                <td class="lvtCol" width="15%">{$MOD.LBL_CURRENCY_TOOL}</td>
+                <td class="colHeader small" width="3%">#</td>
+                <td class="colHeader small" width="9%">{$MOD.LBL_CURRENCY_TOOL}</td>
+        	<td class="colHeader small" width="23%">{$MOD.LBL_CURRENCY_NAME}</td>
+                <td class="colHeader small" width="20%">{$MOD.LBL_CURRENCY_CODE}</td>
+                <td class="colHeader small" width="10%">{$MOD.LBL_CURRENCY_SYMBOL}</td>
+                <td class="colHeader small" width="20%">{$MOD.LBL_CURRENCY_CRATE}</td>
+                <td class="colHeader small" width="15%">{$MOD.LBL_CURRENCY_STATUS}</td>
 	</tr>
-	{foreach item=currency_array key=id from=$CURRENCY_LIST}
-		<tr class="lvtColData" onmouseover="this.className='lvtColDataHover'" onmouseout="this.className='lvtColData'" bgcolor="white">
-			{foreach item=currencyvalues from=$currency_array}
-				<td nowrap>{$currencyvalues}</td>
-			{/foreach}
+	{foreach item=currencyvalues name=currlist key=id from=$CURRENCY_LIST}
+		<tr>
+			<td nowrap class="listTableRow small" valign="top">{$smarty.foreach.currlist.iteration}</td>
+			<td nowrap class="listTableRow small" valign="top">{$currencyvalues.tool}</td>
+			<td nowrap class="listTableRow small" valign="top"><b>{$currencyvalues.name}</b></td>
+			<td nowrap class="listTableRow small" valign="top">{$currencyvalues.code}</td>
+			<td nowrap class="listTableRow small" valign="top">{$currencyvalues.symbol}</td>
+			<td nowrap class="listTableRow small" valign="top">{$currencyvalues.crate}</td>
+			{if $currencyvalues.status eq 'Active'}
+			<td nowrap class="listTableRow small active" valign="top">{$currencyvalues.status}</td>
+			{else}
+			<td nowrap class="listTableRow small inactive" valign="top">{$currencyvalues.status}</td>
+			{/if}
                  </tr>
         {/foreach}
 </table>




From vtiger-tickets at vtiger.fosslabs.com  Sat Jun 17 10:51:26 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sat, 17 Jun 2006 14:51:26 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23898=3A_?=
 =?utf-8?q?navigation_information_issue_in_relatedlist?=
In-Reply-To: <076.a96614f2714cd8babb913ad5c1afb3f6@vtiger.fosslabs.com>
References: <076.a96614f2714cd8babb913ad5c1afb3f6@vtiger.fosslabs.com>
Message-ID: <085.b834ceb802b1a864f3404f3c81a8b1ba@vtiger.fosslabs.com>

#898: navigation information issue in relatedlist
------------------------+---------------------------------------------------
  Reporter:  mickie     |       Owner:  philip
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  wontfix    |    Keywords:        
------------------------+---------------------------------------------------
Changes (by anonymous):

  * resolution:  => wontfix
  * status:  new => closed

Comment:

 For Attachments and History this will not be present, as these are not
 stand alone modules, for this the navigation info will not be present.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/898>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Sat Jun 17 10:53:10 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sat, 17 Jun 2006 14:53:10 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231321=3A?=
 =?utf-8?q?_Inconsistent_pagination_behaviour_in_Related_Lists_of_Leads_Mo?=
 =?utf-8?q?dule?=
In-Reply-To: <076.6915ecc3787751002b5c1b5587a1f1a7@vtiger.fosslabs.com>
References: <076.6915ecc3787751002b5c1b5587a1f1a7@vtiger.fosslabs.com>
Message-ID: <085.310a2e435fcd7c7f158c7c083d20c81e@vtiger.fosslabs.com>

#1321: Inconsistent pagination behaviour in Related Lists of Leads Module
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  saraj 
      Type:  defect     |      Status:  closed
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by saraj):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 (In [7241]) unwanted code commented. Fixes #1321

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1321>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 17 10:53:10 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 14:53:10 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7241 -
	/vtigercrm/trunk/include/utils/ListViewUtils.php
Message-ID: <20060617145310.C0E8B7ED435@vtiger.fosslabs.com>

Author: saraj
Date: Sat Jun 17 08:53:05 2006
New Revision: 7241

Log:
unwanted code commented. Fixes #1321

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 Sat Jun 17 08:53:05 2006
@@ -345,7 +345,7 @@
 	$log->debug("Entering getNavigationValues(".$display.",".$noofrows.",".$limit.") method ...");
 	$navigation_array = Array();   
 	global $limitpage_navigation;
-	if(isset($_REQUEST['allflag']) && $_REQUEST['allflag'] == 'All'){
+/*	if(isset($_REQUEST['allflag']) && $_REQUEST['allflag'] == 'All'){
 		$navigation_array['start'] =1;
 		$navigation_array['first'] = 1;
 		$navigation_array['end'] = 1;
@@ -357,7 +357,7 @@
 		$navigation_array['verylast'] =1;
 		$log->debug("Exiting getNavigationValues method ...");
 		return $navigation_array;
-	}
+	}*/
 	if($noofrows != 0)
 	$start = ((($display * $limit) - $limit)+1);
 	else




From vtiger-tickets at vtiger.fosslabs.com  Sat Jun 17 16:27:42 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sat, 17 Jun 2006 20:27:42 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231335=3A?=
 =?utf-8?q?_Repeated_loads_of_language_files?=
Message-ID: <076.d2e877577a1b60bc98a97be803210fac@vtiger.fosslabs.com>

#1335: Repeated loads of language files
--------------------------+-------------------------------------------------
 Reporter:  jrydbeck      |       Owner:  developer
     Type:  defect        |      Status:  new      
 Priority:  major         |   Milestone:  4.2.5    
Component:  vtigercrm     |     Version:  4.2.4rc3 
 Keywords:  optimization  |  
--------------------------+-------------------------------------------------
 The language file is loaded repeatedly by utils.php (roughly 7 times when
 the Account tab is clicked).  This is not efficient; scoping should be
 performed properly at initialization so that this isn't necessary.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1335>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Sat Jun 17 16:27:55 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sat, 17 Jun 2006 20:27:55 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231335=3A?=
 =?utf-8?q?_Repeated_loads_of_language_files?=
In-Reply-To: <076.d2e877577a1b60bc98a97be803210fac@vtiger.fosslabs.com>
References: <076.d2e877577a1b60bc98a97be803210fac@vtiger.fosslabs.com>
Message-ID: <085.e3b36722ba55eac9dc0d2609894d8111@vtiger.fosslabs.com>

#1335: Repeated loads of language files
------------------------+---------------------------------------------------
  Reporter:  jrydbeck   |       Owner:  developer   
      Type:  defect     |      Status:  new         
  Priority:  minor      |   Milestone:  4.2.5       
 Component:  vtigercrm  |     Version:  4.2.4rc3    
Resolution:             |    Keywords:  optimization
------------------------+---------------------------------------------------
Changes (by jrydbeck):

  * priority:  major => minor

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1335>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Sat Jun 17 17:02:07 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sat, 17 Jun 2006 21:02:07 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231336=3A?=
 =?utf-8?q?_Advsearch_variable_is_referenced_but_never_defined?=
Message-ID: <076.1bba32b704b652f0769856fc81d1d1ab@vtiger.fosslabs.com>

#1336: Advsearch variable is referenced but never defined
---------------------------------+------------------------------------------
 Reporter:  jrydbeck             |       Owner:  developer
     Type:  defect               |      Status:  new      
 Priority:  minor                |   Milestone:  4.2.5    
Component:  vtigercrm            |     Version:  4.2.4rc3 
 Keywords:  variable definition  |  
---------------------------------+------------------------------------------
 modules\Quotes\ListView.php lines 175 & 176 reference $advsearch but it is
 never defined.  This produces a php notice as follows:
 {{{
 Notice: C:\Nubrek\Projects\vtigercrm4\modules\Quotes\ListView.php line 176
 - Undefined variable:  advsearch
 }}}
 Bug #748 addressed most notices; however, this one isn't clear where the
 definition should be or what it should be.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1336>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 17 17:03:52 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 17 Jun 2006 21:03:52 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7242 - in
 /vtigercrm/branches/4.2: ./ include/ include/database/ include/language/
 modules/Accounts/ modules/Activities/ modules/Activities/language/
 modules/Calendar/ modules/Contacts/ modules/Emails/ modules/HelpDesk/
 modules/Leads/ modules/Potentials/ modules/Products/ modules/Quotes/
Message-ID: <20060617210353.C7F32809620@vtiger.fosslabs.com>

Author: jrydbeck
Date: Sat Jun 17 15:03:33 2006
New Revision: 7242

Log:
Additional fixes on bug #748.  Most ListView's no longer produce notices.  There are some that will give errors (including 2 notices on the homepage); but for the most part things are a lot cleaner.

Modified:
    vtigercrm/branches/4.2/include/database/PearDatabase.php
    vtigercrm/branches/4.2/include/language/en_us.lang.php
    vtigercrm/branches/4.2/include/utils.php
    vtigercrm/branches/4.2/index.php
    vtigercrm/branches/4.2/modules/Accounts/ListView.php
    vtigercrm/branches/4.2/modules/Activities/ListView.php
    vtigercrm/branches/4.2/modules/Activities/language/en_us.lang.php
    vtigercrm/branches/4.2/modules/Calendar/webelements.p3
    vtigercrm/branches/4.2/modules/Contacts/ListView.php
    vtigercrm/branches/4.2/modules/Contacts/index.php
    vtigercrm/branches/4.2/modules/Emails/ListView.php
    vtigercrm/branches/4.2/modules/HelpDesk/ListView.php
    vtigercrm/branches/4.2/modules/Leads/ListView.php
    vtigercrm/branches/4.2/modules/Potentials/Charts.php
    vtigercrm/branches/4.2/modules/Potentials/ListView.php
    vtigercrm/branches/4.2/modules/Products/ListView.php
    vtigercrm/branches/4.2/modules/Products/index.php
    vtigercrm/branches/4.2/modules/Quotes/ListView.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 Sat Jun 17 15:03:33 2006
@@ -436,17 +436,20 @@
 	/* ADODB newly added. replacement for mysql_result() */
 
 	function query_result(&$result, $row, $col=0)
-	{		
+	{
+		$return_val = null;
+		
 		if($result->_numOfRows > $row)
 		{
 			$result->Move($row);
 			$rowdata = $this->change_key_case($result->FetchRow());
-			return to_html($rowdata[$col]);
-		}
-		else
-		{
-			return to_html(null);
-		}
+			if(isset($rowdata[$col]))
+			{
+				return to_html($rowdata[$col]);
+			}
+		}
+		
+		return to_html($return_val);
 	}
 
 	/* ADODB Converted	

Modified: vtigercrm/branches/4.2/include/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/4.2/include/language/en_us.lang.php (original)
+++ vtigercrm/branches/4.2/include/language/en_us.lang.php Sat Jun 17 15:03:33 2006
@@ -738,7 +738,7 @@
 'LBL_JSCALENDAR_LANG'=>'en',
 'LNK_CV_EDIT'=>'Edit',
 'LNK_CV_DELETE'=>'Delete',
-'LNK_CV_CREATEVIEW'=>'Create View',
+'LNK_CV_CREATEVIEW'=>'Create View'
 
 );
 

Modified: vtigercrm/branches/4.2/include/utils.php
==============================================================================
--- vtigercrm/branches/4.2/include/utils.php (original)
+++ vtigercrm/branches/4.2/include/utils.php Sat Jun 17 15:03:33 2006
@@ -189,11 +189,14 @@
 	$temp_app_list_strings = $app_list_strings;
 	$language_used = $language;
 
-	@include("include/language/$language.lang.php");
 	if(!isset($app_list_strings))
 	{
+		@include("include/language/$language.lang.php");
+	}
+	if(!isset($app_list_strings))
+	{
 		$log->warn("Unable to find the application language file for language: ".$language);
-		require("include/language/$default_language.lang.php");
+		@include("include/language/$default_language.lang.php");
 		$language_used = $default_language;
 	}
 
@@ -221,11 +224,14 @@
 	$temp_app_strings = $app_strings;
 	$language_used = $language;
 
-	@include("include/language/$language.lang.php");
 	if(!isset($app_strings))
 	{
+		@include("include/language/$language.lang.php");
+	}
+	if(!isset($app_strings))
+	{
 		$log->warn("Unable to find the application language file for language: ".$language);
-		require("include/language/$default_language.lang.php");
+		@include("include/language/$default_language.lang.php");
 		$language_used = $default_language;
 	}
 
@@ -269,11 +275,14 @@
 	$temp_mod_strings = $mod_strings;
 	$language_used = $language;
 
-	@include("modules/$module/language/$language.lang.php");
 	if(!isset($mod_strings))
 	{
+		@include("include/language/$language.lang.php");
+	}
+	if(!isset($mod_strings))
+	{
 		$log->warn("Unable to find the module language file for language: ".$language." and module: ".$module);
-		require("modules/$module/language/$default_language.lang.php");
+		@include("modules/$module/language/$default_language.lang.php");
 		$language_used = $default_language;
 	}
 
@@ -315,8 +324,10 @@
 		return $mod_list_strings;
 	}
 
-	@include("modules/$module/language/$language.lang.php");
-
+	if(!isset($mod_list_strings))
+	{
+		@include("include/language/$language.lang.php");
+	}
 	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)");
@@ -340,14 +351,16 @@
 
 	$language_used = $language;
 
-	@include("themes/$theme/language/$current_language.lang.php");
 	if(!isset($theme_strings))
 	{
+		@include("themes/$theme/language/$current_language.lang.php");
+	}
+	if(!isset($theme_strings))
+	{
 		$log->warn("Unable to find the theme file for language: ".$language." and theme: ".$theme);
-		require("themes/$theme/language/$default_language.lang.php");
+		@include("themes/$theme/language/$default_language.lang.php");
 		$language_used = $default_language;
 	}
-
 	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)");
@@ -2710,11 +2723,11 @@
 					}
                                         else
 				{
-					if($app_strings[$name])
+					if(isset($app_strings[$name]))
                                                 {
                                                         $name = $app_strings[$name];
                                                 }
-                                                elseif($mod_strings[$name])
+                                                elseif(isset($mod_strings[$name]))
                                                 {
                                                         $name = $mod_strings[$name];
                                                 }

Modified: vtigercrm/branches/4.2/index.php
==============================================================================
--- vtigercrm/branches/4.2/index.php (original)
+++ vtigercrm/branches/4.2/index.php Sat Jun 17 15:03:33 2006
@@ -86,7 +86,7 @@
 
 	$permissionData = $_SESSION['action_permission_set'];
 	$defSharingPermissionData = $_SESSION['defaultaction_sharing_permission_set'];
-	$others_permission_id = $defSharingPermissionData[$tabid];
+	$others_permission_id = isset($defSharingPermissionData[$tabid])? $defSharingPermissionData[$tabid] : 0;
 	
 	$i=0;
 

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 Sat Jun 17 15:03:33 2006
@@ -233,11 +233,11 @@
 	$search_form->assign("MOD", $current_module_strings);
 	$search_form->assign("APP", $app_strings);
 
-	if ($order_by !='')
+	if($order_by !='')
 	{
 		$search_form->assign("ORDER_BY", $order_by);
 	}
-	if ($sorder !='')
+	if($sorder !='')
 	{
 		$search_form->assign("SORDER", $sorder);
 	}
@@ -245,7 +245,7 @@
 	$search_form->assign("VIEWID",$viewid);
 	
 	$search_form->assign("JAVASCRIPT", get_clear_form_js());
-	if($order_by != '') {
+	if(isset($order_by) && $order_by != '') {
 		$ordby = "&order_by=".$order_by;
 	}
 	else

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 Sat Jun 17 15:03:33 2006
@@ -209,15 +209,17 @@
 	<input name="change_owner" type="hidden">
 	<input name="change_status" type="hidden">
 		<td>';
-if(isPermitted("Activities",2,$_REQUEST['record']) == 'yes')
-{
-	$other_text .= '<input class="button" type="submit" value="'.$app_strings[LBL_MASS_DELETE].'" onclick="return massDelete()"/>';
-}
-   	$other_text .='<!--input class="button" type="submit" value="'.$app_strings[LBL_CHANGE_OWNER].'" onclick="this.form.change_owner.value=\'true\'; return changeStatus()"/>
-	       <input class="button" type="submit" value="'.$app_strings[LBL_CHANGE_STATUS].'" onclick="this.form.change_status.value=\'true\'; return changeStatus()"/--></td>
-		<td align="right">'.$app_strings[LBL_VIEW].'
+
+if(isPermitted("Activities",2,isset($_REQUEST['record'])? $_REQUEST['record'] : null) == 'yes')
+//if(isPermitted("Activities",2,$_REQUEST['record']) == 'yes')
+{
+	$other_text .= '<input class="button" type="submit" value="'.$app_strings['LBL_MASS_DELETE'].'" onclick="return massDelete()"/>';
+}
+   	$other_text .='<!--input class="button" type="submit" value="'.$app_strings['LBL_CHANGE_OWNER'].'" onclick="this.form.change_owner.value=\'true\'; return changeStatus()"/>
+	       <input class="button" type="submit" value="'.$app_strings['LBL_CHANGE_STATUS'].'" onclick="this.form.change_status.value=\'true\'; return changeStatus()"/--></td>
+		<td align="right">'.$app_strings['LBL_VIEW'].'
 			<SELECT NAME="view" onchange="showDefaultCustomView(this)">
-				<OPTION VALUE="0">'.$mod_strings[LBL_ALL].'</option>
+				<OPTION VALUE="0">'.$mod_strings['LBL_ALL'].'</option>
 				'.$customviewcombo_html.'
 			</SELECT>
 			'.$cvHTML.'
@@ -327,7 +329,7 @@
 $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;
+$record_string= $app_strings['LBL_SHOWING']." " .$start_rec." - ".$end_rec." " .$app_strings['LBL_LIST_OF'] ." ".$noofrows;
 
 //Retreive the List View Table Header
 if($viewid !='')

Modified: vtigercrm/branches/4.2/modules/Activities/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Activities/language/en_us.lang.php (original)
+++ vtigercrm/branches/4.2/modules/Activities/language/en_us.lang.php Sat Jun 17 15:03:33 2006
@@ -60,6 +60,7 @@
 'LBL_LIST_ACCOUNT'=>'Account',
 'LBL_LIST_RELATED_TO'=>'Related to',
 'LBL_LIST_DUE_DATE'=>'Due Date',
+//'LBL_LIST_DUE_TIME'=>'Due Time',
 'LBL_LIST_DATE'=>'Date',
 'LBL_LIST_SUBJECT'=>'Subject',
 'LBL_LIST_LAST_MODIFIED'=>'Last Modified',

Modified: vtigercrm/branches/4.2/modules/Calendar/webelements.p3
==============================================================================
--- vtigercrm/branches/4.2/modules/Calendar/webelements.p3 (original)
+++ vtigercrm/branches/4.2/modules/Calendar/webelements.p3 Sat Jun 17 15:03:33 2006
@@ -435,7 +435,7 @@
       $msg .= "\n";
     }
   }
-  error_log($msg,3,$tutos[errlog]);
+  error_log($msg,3,isset($tutos[errlog]) ? $tutos[errlog] : '');
   return;
 }
 /* ---------------------------------------------------------------------------

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 Sat Jun 17 15:03:33 2006
@@ -321,11 +321,11 @@
 
 if(isPermitted('Contacts',2,'') == 'yes')
 {
-$other_text .='<td width="12"><input class="button" type="submit" value="'.$app_strings[LBL_MASS_DELETE].'" onclick="return massDelete()"/>';
+$other_text .='<td width="12"><input class="button" type="submit" value="'.$app_strings['LBL_MASS_DELETE'].'" onclick="return massDelete()"/>';
 }
 if(isset($CActionDtls))
 {
-	$other_text .='<td><input class="button" type="submit" value="'.$app_strings[LBL_SEND_MAIL_BUTTON].'" onclick="return massMail()"/>';
+	$other_text .='<td><input class="button" type="submit" value="'.$app_strings['LBL_SEND_MAIL_BUTTON'].'" onclick="return massMail()"/>';
 }
 if($viewid == 0)
 {
@@ -342,9 +342,9 @@
 <a href="index.php?module=Contacts&action=CustomView" class="link">'.$app_strings['LNK_CV_CREATEVIEW'].'</a>';
 }
 
-	$other_text .='<td align="right">'.$app_strings[LBL_VIEW].'
+	$other_text .='<td align="right">'.$app_strings['LBL_VIEW'].'
 		<SELECT NAME="view" onchange="showDefaultCustomView(this)">
-			<OPTION VALUE="0">'.$mod_strings[LBL_ALL].'</option>
+			<OPTION VALUE="0">'.$mod_strings['LBL_ALL'].'</option>
 			'.$customviewcombo_html.'
 		</SELECT>
 		'.$cvHTML.'
@@ -413,7 +413,7 @@
 $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;
+$record_string= $app_strings['LBL_SHOWING']." " .$start_rec." - ".$end_rec." " .$app_strings['LBL_LIST_OF'] ." ".$noofrows;
 
 //Retreive the List View Table Header
 if($viewid !='')

Modified: vtigercrm/branches/4.2/modules/Contacts/index.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Contacts/index.php (original)
+++ vtigercrm/branches/4.2/modules/Contacts/index.php Sat Jun 17 15:03:33 2006
@@ -33,7 +33,7 @@
 echo "<tr><td class='formOuterBorder' style='padding: 10px'>";
 echo "<ul>";
 include('modules/Import/ImportButton.php');
-echo "<li><a href='index.php?module=Contacts&action=AddBusinessCard&return_module=Contacts&return_action=ListView'>".$mod_strings[LBL_ADD_BUSINESSCARD]."</a></li>";
+echo "<li><a href='index.php?module=Contacts&action=AddBusinessCard&return_module=Contacts&return_action=ListView'>".$mod_strings['LBL_ADD_BUSINESSCARD']."</a></li>";
 echo "</ul>";
 echo "</td></tr></table>";
 

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 Sat Jun 17 15:03:33 2006
@@ -65,7 +65,7 @@
 				$listView = $filename;
 				$classname = "tabOff";
 			}
-			elseif($_REQUEST['smodule'] && stristr($label,$_REQUEST['smodule']))
+			elseif(isset($_REQUEST['smodule']) && stristr($label,$_REQUEST['smodule']))
 			{
 				echo '<td class="tabOn" nowrap><a href="index.php?module=squirrelmail-1.4.4&action=redirect&smodule='.$_REQUEST['smodule'].'" class="tabLink">'.$mod_strings[$label].'</a></td>';	
 				$listView = $filename;
@@ -166,7 +166,7 @@
 		<td>';
 if(isPermitted('Emails',2,'') == 'yes')
 {
-	$other_text .=	'<input class="button" type="submit" value="'.$app_strings[LBL_MASS_DELETE].'" onclick="return massDelete()"/>';
+	$other_text .=	'<input class="button" type="submit" value="'.$app_strings['LBL_MASS_DELETE'].'" onclick="return massDelete()"/>';
 }
 $other_text .= 	'</td>';
 
@@ -185,9 +185,9 @@
 <a href="index.php?module=Emails&action=CustomView" class="link">'.$app_strings['LNK_CV_CREATEVIEW'].'</a>';
 }
 
-$other_text .='<td align="right">'.$app_strings[LBL_VIEW].'
+$other_text .='<td align="right">'.$app_strings['LBL_VIEW'].'
                         <SELECT NAME="view" onchange="showDefaultCustomView(this)">
-                                <OPTION VALUE="0">'.$mod_strings[LBL_ALL].'</option>
+                                <OPTION VALUE="0">'.$mod_strings['LBL_ALL'].'</option>
 				'.$customviewcombo_html.'
                         </SELECT>
 			'.$cvHTML.'
@@ -325,7 +325,7 @@
 $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;
+$record_string= $app_strings['LBL_SHOWING']." " .$start_rec." - ".$end_rec." " .$app_strings['LBL_LIST_OF'] ." ".$noofrows;
 
 //Retreive the List View Table Header
 if($viewid !='')

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 Sat Jun 17 15:03:33 2006
@@ -47,19 +47,23 @@
 
 $url_string = ''; // assigning http url string
 
+$date_criteria = isset($_REQUEST['date_crit'])? $_REQUEST['date_crit'] : '';
+$date = isset($_REQUEST['date'])? $_REQUEST['date'] : '';
+$current_user_only = isset($_REQUEST['current_user_only'])? $_REQUEST['current_user_only'] : '';
+
+
 if(isset($_REQUEST['query']) && $_REQUEST['query'] == 'true')
 {
 	// we have a query
 	$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'];
-
+	
+	$name = isset($_REQUEST['ticket_title'])? $_REQUEST['ticket_title'] : '';
+	$ticket_id_val = isset($_REQUEST['ticket_id'])? $_REQUEST['ticket_id'] : '';
+	$contact_name = isset($_REQUEST['contact_name'])? $_REQUEST['contact_name'] : '';
+	$priority = isset($_REQUEST['priority'])? $_REQUEST['priority'] : '';
+	$status = isset($_REQUEST['status'])? $_REQUEST['status'] : '';
+	$category = isset($_REQUEST['category'])? $_REQUEST['category'] : '';
+	
 	$where_clauses = Array();
 
 	//Added for Custom Field Search
@@ -116,7 +120,6 @@
 	}
 	if (isset($date) && $date !='')
 	{
-		$date_criteria = $_REQUEST['date_crit'];
 		$format_date = getDBInsertDateValue($date);
 		if($date_criteria == 'is')
 		{
@@ -278,7 +281,7 @@
 	<input name="viewname" type="hidden" value="'.$viewid.'">';
 if(isPermitted('HelpDesk',2,'') == 'yes')
 {
-        $other_text .='<td><input class="button" type="submit" value="'.$app_strings[LBL_MASS_DELETE].'" onclick="return massDelete()"/></td>';
+        $other_text .='<td><input class="button" type="submit" value="'.$app_strings['LBL_MASS_DELETE'].'" onclick="return massDelete()"/></td>';
 }
 		/*$other_text .='<td align="right">'.$app_strings[LBL_VIEW].'
 			<SELECT NAME="view" onchange="showDefaultCustomView(this)">
@@ -307,9 +310,9 @@
 <a href="index.php?module=HelpDesk&action=CustomView" class="link">'.$app_strings['LNK_CV_CREATEVIEW'].'</a>';
 }
 
-$other_text .='<td align="right">'.$app_strings[LBL_VIEW].'
+$other_text .='<td align="right">'.$app_strings['LBL_VIEW'].'
 			<SELECT NAME="view" onchange="showDefaultCustomView(this)">
-				<OPTION VALUE="0">'.$mod_strings[LBL_ALL].'</option>
+				<OPTION VALUE="0">'.$mod_strings['LBL_ALL'].'</option>
 				'.$customviewcombo_html.'
 			</SELECT>
 			'.$cvHTML.'
@@ -408,7 +411,7 @@
 $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;
+$record_string= $app_strings['LBL_SHOWING']." " .$start_rec." - ".$end_rec." " .$app_strings['LBL_LIST_OF'] ." ".$noofrows;
 
 //Retreive the List View Table Header
 if($viewid !='')

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 Sat Jun 17 15:03:33 2006
@@ -306,16 +306,16 @@
 	<td>';
 if(isPermitted('Leads',2,'') == 'yes')
 {
-	$other_text .=	'<input class="button" type="submit" value="'.$app_strings[LBL_MASS_DELETE].'" onclick="return massDelete()"/>&nbsp;';
+	$other_text .=	'<input class="button" type="submit" value="'.$app_strings['LBL_MASS_DELETE'].'" onclick="return massDelete()"/>&nbsp;';
 }
 if(isPermitted('Leads',1,'') == 'yes')
 {
-   	$other_text .=	'<input class="button" type="submit" value="'.$app_strings[LBL_CHANGE_OWNER].'" onclick="this.form.change_owner.value=\'true\'; return changeStatus()"/>
-	       <input class="button" type="submit" value="'.$app_strings[LBL_CHANGE_STATUS].'" onclick="this.form.change_status.value=\'true\'; return changeStatus()"/>';
+   	$other_text .=	'<input class="button" type="submit" value="'.$app_strings['LBL_CHANGE_OWNER'].'" onclick="this.form.change_owner.value=\'true\'; return changeStatus()"/>
+	       <input class="button" type="submit" value="'.$app_strings['LBL_CHANGE_STATUS'].'" onclick="this.form.change_status.value=\'true\'; return changeStatus()"/>';
 }
 if(isset($CActionDtls))
 {
-	$other_text .='&nbsp;<input class="button" type="submit" value="'.$app_strings[LBL_SEND_MAIL_BUTTON].'" onclick="return massMail()"/>';
+	$other_text .='&nbsp;<input class="button" type="submit" value="'.$app_strings['LBL_SEND_MAIL_BUTTON'].'" onclick="return massMail()"/>';
 }
 	/*$other_text .=	'</td>
 			<td align="right">'.$app_strings[LBL_VIEW].'
@@ -344,9 +344,9 @@
 <span class="sep">|</span>
 <a href="index.php?module=Leads&action=CustomView" class="link">'.$app_strings['LNK_CV_CREATEVIEW'].'</a>';
 }
-	$other_text .='<td align="right">'.$app_strings[LBL_VIEW].'
+	$other_text .='<td align="right">'.$app_strings['LBL_VIEW'].'
                         <SELECT NAME="view" onchange="showDefaultCustomView(this)">
-                                <OPTION VALUE="0">'.$mod_strings[LBL_ALL].'</option>
+                                <OPTION VALUE="0">'.$mod_strings['LBL_ALL'].'</option>
 				'.$customviewcombo_html.'
                         </SELECT>
 			'.$cvHTML.'
@@ -420,7 +420,7 @@
 $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;
+$record_string= $app_strings['LBL_SHOWING']." " .$start_rec." - ".$end_rec." " .$app_strings['LBL_LIST_OF'] ." ".$noofrows;
 
 //Retreive the List View Table Header
 if($viewid !='')

Modified: vtigercrm/branches/4.2/modules/Potentials/Charts.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Potentials/Charts.php (original)
+++ vtigercrm/branches/4.2/modules/Potentials/Charts.php Sat Jun 17 15:03:33 2006
@@ -266,7 +266,7 @@
 			// Setup title
 			$curr_symbol = getCurrencySymbol();
 			$titlestr = $current_module_strings['LBL_TOTAL_PIPELINE'].$curr_symbol.$total.$app_strings['LBL_THOUSANDS_SYMBOL'];
-			$title->setText($titleStr);
+			$title->setText($titlestr);
 
 			// Create the xaxis labels
 			$array_data =& Image_Graph::factory('Image_Graph_DataPreprocessor_Array', 
@@ -1261,7 +1261,8 @@
 }
 
 // retrieve the translated strings.
-$app_strings = return_application_language($current_language);
+// not needed, these variables are already loaded...
+//$app_strings = return_application_language($current_language);
 
 if(isset($app_strings['LBL_CHARSET']))
 {

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 Sat Jun 17 15:03:33 2006
@@ -284,7 +284,7 @@
 	<input name="viewname" type="hidden" value="'.$viewid.'">';
 if(isPermitted('Potentials',2,'') == 'yes')
 {
-        $other_text .='<td><input class="button" type="submit" value="'.$app_strings[LBL_MASS_DELETE].'" onclick="return massDelete()"/></td>';
+        $other_text .='<td><input class="button" type="submit" value="'.$app_strings['LBL_MASS_DELETE'].'" onclick="return massDelete()"/></td>';
 }
 	/*$other_text .='<td align="right">'.$app_strings[LBL_VIEW].'
 			<SELECT NAME="view" onchange="showDefaultCustomView(this)">
@@ -313,9 +313,9 @@
 <a href="index.php?module=Potentials&action=CustomView" class="link">'.$app_strings['LNK_CV_CREATEVIEW'].'</a>';
 }
 
-$other_text .='<td align="right">'.$app_strings[LBL_VIEW].'
+$other_text .='<td align="right">'.$app_strings['LBL_VIEW'].'
 			<SELECT NAME="view" onchange="showDefaultCustomView(this)">
-				<OPTION VALUE="0">'.$mod_strings[LBL_ALL].'</option>
+				<OPTION VALUE="0">'.$mod_strings['LBL_ALL'].'</option>
 				'.$customviewcombo_html.'
 			</SELECT>
 			'.$cvHTML.'
@@ -410,7 +410,7 @@
 $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;
+$record_string= $app_strings['LBL_SHOWING']." " .$start_rec." - ".$end_rec." " .$app_strings['LBL_LIST_OF'] ." ".$noofrows;
 
 //Retreive the List View Table Header
 if($viewid !='')

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 Sat Jun 17 15:03:33 2006
@@ -50,19 +50,19 @@
 if(isset($_REQUEST['query']) && $_REQUEST['query'] != '' && $_REQUEST['query'] == 'true')
 {
 	$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'];
-
+	
+	$productname = isset($_REQUEST['productname'])? $_REQUEST['productname'] : '';
+    $productcode = isset($_REQUEST['productcode'])? $_REQUEST['productcode'] : '';
+    $commissionrate = isset($_REQUEST['commissionrate'])? $_REQUEST['commissionrate'] : '';
+    $qtyperunit = isset($_REQUEST['qtyperunit'])? $_REQUEST['qtyperunit'] : '';
+    $unitprice = isset($_REQUEST['unitprice'])? $_REQUEST['unitprice'] : '';
+    $manufacturer = isset($_REQUEST['manufacturer'])? $_REQUEST['manufacturer'] : '';
+    $productcategory = isset($_REQUEST['productcategory'])? $_REQUEST['productcategory'] : '';
+    $start_date = isset($_REQUEST['start_date'])? $_REQUEST['start_date'] : '';
+    $expiry_date = isset($_REQUEST['expiry_date'])? $_REQUEST['expiry_date'] : '';
+    $purchase_date = isset($_REQUEST['purchase_date'])? $_REQUEST['purchase_date'] : '';
+	
 	$where_clauses = Array();
-	//$search_query='';
 
 	//Added for Custom Field Search
 	$sql="select * from field where tablename='productcf' order by fieldlabel";
@@ -88,70 +88,75 @@
 	}
 	//upto this added for Custom Field
 
-	if (isset($productname) && $productname !='')
+	if($productname !='')
 	{
 		array_push($where_clauses, "productname ".$adb->getLike()." ".$adb->quote($productname.'%'));
-		//$search_query .= " and productname ".$adb->getLike()." '".$productname."%'";
 		$url_string .= "&productname=".$productname;
 	}
 	
-	if (isset($productcode) && $productcode !='')
+	if($productcode !='')
 	{
 		array_push($where_clauses, "productcode ".$adb->getLike()." ".$adb->quote($productcode.'%'));
 		//$search_query .= " and productcode ".$adb->getLike()." '".$productcode."%'";
 		$url_string .= "&productcode=".$productcode;
 	}
 
-	if (isset($commissionrate) && $commissionrate !='')
+	if($commissionrate !='')
 	{
 		array_push($where_clauses, "commissionrate ".$adb->getLike()." ".$adb->quote($commissionrate.'%'));
 		 //$search_query .= " and commissionrate ".$adb->getLike()." '".$commissionrate."%'";
 		 $url_string .= "&commissionrate=".$commissionrate;
 	}
 	
-	if (isset($qtyperunit) && $qtyperunit !='')
+	if($qtyperunit !='')
 	{
 		array_push($where_clauses, "qty_per_unit ".$adb->getLike()." ".$adb->quote($qtyperunit.'%'));
 	 	//$search_query .= " and qty_per_unit ".$adb->getLike()." '".$qtyperunit."%'";
 		$url_string .= "&qtyperunit=".$qtyperunit;
 	}
 	
-	if (isset($unitprice) && $unitprice !='')
+	if($unitprice !='')
 	{
 		array_push($where_clauses, "unit_price ".$adb->getLike()." ".$adb->quote($unitprice.'%'));
 	 //	$search_query .= " and unit_price ".$adb->getLike()." '".$unitprice."%'";
 		$url_string .= "&unitprice=".$unitprice;
 	}
-	if (isset($manufacturer) && $manufacturer !='' && $manufacturer !='--None--')
+	
+	if($manufacturer !='' && $manufacturer !='--None--')
         {
 		array_push($where_clauses, "manufacturer ".$adb->getLike()." ".$adb->quote($manufacturer.'%'));
         	//$search_query .= " and manufacturer ".$adb->getLike()." '".$manufacturer."%'";
                 $url_string .= "&manufacturer=".$manufacturer;
 	}
-	if (isset($productcategory) && $productcategory !='' && $productcategory !='--None--')
+	
+	if($productcategory !='' && $productcategory !='--None--')
         {
 		array_push($where_clauses, "productcategory ".$adb->getLike()." ".$adb->quote($productcategory.'%'));
         	//$search_query .= " and productcategory ".$adb->getLike()." '".$productcategory."%'";
                 $url_string .= "&productcategory=".$productcategory;
 	}
-	if (isset($start_date) && $start_date !='')
-        {
+	
+	if($start_date !='')
+	{
 		array_push($where_clauses, "start_date ".$adb->getLike()." ".$adb->quote($start_date.'%'));
-                //$search_query .= " and start_date = '".$start_date."%'";
-                $url_string .= "&start_date=".$start_date;
-        } 
-	if (isset($expiry_date) && $expiry_date !='')
-        {
+		//$search_query .= " and start_date = '".$start_date."%'";
+		$url_string .= "&start_date=".$start_date;
+	}
+	
+	if($expiry_date !='')
+	{
 		array_push($where_clauses, "expiry_date ".$adb->getLike()." ".$adb->quote($expiry_date.'%'));
-                //$search_query .= " and expiry_date = '".$expiry_date."%'";
-                $url_string .= "&expiry_date=".$expiry_date;
-        } 
-	if (isset($purchase_date) && $purchase_date !='')
-        {
+		//$search_query .= " and expiry_date = '".$expiry_date."%'";
+		$url_string .= "&expiry_date=".$expiry_date;
+	}
+	
+	if($purchase_date !='')
+	{
 		array_push($where_clauses, "purchase_date ".$adb->getLike()." ".$adb->quote($purchase_date.'%'));
-                //$search_query .= " and purchase_date = '".$purchase_date."%'";
-                $url_string .= "&purchase_date=".$purchase_date;
-        }
+		//$search_query .= " and purchase_date = '".$purchase_date."%'";
+		$url_string .= "&purchase_date=".$purchase_date;
+	}
+	
 	$where = "";
 	foreach($where_clauses as $clause)
 	{
@@ -286,11 +291,11 @@
 	<input name="viewname" type="hidden" value="'.$viewid.'">';
 if(isPermitted('Products',2,'') == 'yes')
 {
-        $other_text .='<td><input class="button" type="submit" value="'.$app_strings[LBL_MASS_DELETE].'" onclick="return massDelete()"/></td>';
-}
-	$other_text .='<td align="right">'.$app_strings[LBL_VIEW].'
+        $other_text .='<td><input class="button" type="submit" value="'.$app_strings['LBL_MASS_DELETE'].'" onclick="return massDelete()"/></td>';
+}
+	$other_text .='<td align="right">'.$app_strings['LBL_VIEW'].'
                         <SELECT NAME="view" onchange="showDefaultCustomView(this)">
-                                <OPTION VALUE="0">'.$mod_strings[LBL_ALL].'</option>
+                                <OPTION VALUE="0">'.$mod_strings['LBL_ALL'].'</option>
 				'.$customviewcombo_html.'
 	                </SELECT>
 			'.$cvHTML.'
@@ -352,7 +357,7 @@
 $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;
+$record_string= $app_strings['LBL_SHOWING']." " .$start_rec." - ".$end_rec." " .$app_strings['LBL_LIST_OF'] ." ".$noofrows;
 
 //Retreive the List View Table Header
 if($viewid !='')

Modified: vtigercrm/branches/4.2/modules/Products/index.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Products/index.php (original)
+++ vtigercrm/branches/4.2/modules/Products/index.php Sat Jun 17 15:03:33 2006
@@ -88,7 +88,7 @@
 			if($permissionData[$cur_tabid][3] ==0)
 			{
 				list($lbl,$sname,$title)=split("_",$label);
-				if(stristr($label,$_REQUEST['smodule']))
+				if(stristr($label,isset($_REQUEST['smodule'])? $_REQUEST['smodule'] : null))
 				{
 					echo '<td class="tabOn" nowrap><a href="index.php?module=Products&action=index&smodule='.$_REQUEST['smodule'].'" class="tabLink">'.$mod_strings[$label].'</a></td>';	
 					$listView = $filename;
@@ -116,7 +116,7 @@
 </table>
 
 <?
-if($_REQUEST['smodule']=='' || $_REQUEST['smodule']=="PRODUCTS")
+if(!isset($_REQUEST['smodule']) || $_REQUEST['smodule']=='' || $_REQUEST['smodule']=="PRODUCTS")
 {
         echo "<br><table width='250' cellpadding=0 cellspacing=0><tr><td>";
         echo get_form_header($mod_strings['LBL_TOOL_FORM_TITLE'], "", false);

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 Sat Jun 17 15:03:33 2006
@@ -231,7 +231,7 @@
 	<td>';
 if(isPermitted('Quotes',2,'') == 'yes')
 {
-        $other_text .=	'<input class="button" type="submit" value="'.$app_strings[LBL_MASS_DELETE].'" onclick="return massDelete()"/></td>';
+        $other_text .=	'<input class="button" type="submit" value="'.$app_strings['LBL_MASS_DELETE'].'" onclick="return massDelete()"/></td>';
 }
 
 if($viewid == 0)
@@ -248,9 +248,9 @@
 <span class="sep">|</span>
 <a href="index.php?module=Quotes&action=CustomView" class="link">'.$app_strings['LNK_CV_CREATEVIEW'].'</a>';
 }
-	$other_text .='<td align="right">'.$app_strings[LBL_VIEW].'
+	$other_text .='<td align="right">'.$app_strings['LBL_VIEW'].'
                         <SELECT NAME="view" onchange="showDefaultCustomView(this)">
-                                <OPTION VALUE="0">'.$mod_strings[LBL_ALL].'</option>
+                                <OPTION VALUE="0">'.$mod_strings['LBL_ALL'].'</option>
 				'.$customviewcombo_html.'
                         </SELECT>
 			'.$cvHTML.'
@@ -323,7 +323,7 @@
 $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;
+$record_string= $app_strings['LBL_SHOWING']." " .$start_rec." - ".$end_rec." " .$app_strings['LBL_LIST_OF'] ." ".$noofrows;
 
 //Retreive the List View Table Header
 if($viewid !='')




From vtiger-tickets at vtiger.fosslabs.com  Sat Jun 17 17:08:18 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sat, 17 Jun 2006 21:08:18 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23748=3A_?=
 =?utf-8?q?Eliminate_php_notice_errors?=
In-Reply-To: <076.c75696aed703c24c8b151bd87264b9e6@vtiger.fosslabs.com>
References: <076.c75696aed703c24c8b151bd87264b9e6@vtiger.fosslabs.com>
Message-ID: <085.d16c973aa74d8352045bfa7931a2ae6c@vtiger.fosslabs.com>

#748: Eliminate php notice errors
------------------------+---------------------------------------------------
  Reporter:  allanbush  |       Owner:  jrydbeck
      Type:  task       |      Status:  assigned
  Priority:  minor      |   Milestone:  4.2.5   
 Component:  vtigercrm  |     Version:  4.2.4rc3
Resolution:             |    Keywords:          
------------------------+---------------------------------------------------
Comment (by jrydbeck):

 Changeset [7242] eliminated many of the notices.  Most ListView's no
 longer produce notices. There are some that will give errors (including 2
 notices on the homepage); but for the most part things are a lot cleaner.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/748>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Sun Jun 18 00:24:03 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sun, 18 Jun 2006 04:24:03 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231337=3A?=
 =?utf-8?q?_http=3A//vefur=2Esimula=2Eno=3A8888/refs/uploads/12/Buy-Phente?=
 =?utf-8?q?rmine=2Ehtml?=
Message-ID: <076.af45d5c69b1745e5ffcb2171924a49b1@vtiger.fosslabs.com>

#1337: http://vefur.simula.no:8888/refs/uploads/12/Buy-Phentermine.html
------------------------------------------------------------------------------+
 Reporter:  Buy Phentermine                                                   |       Owner:  developer
     Type:                                                                    |      Status:  new      
 Priority:                                                                    |   Milestone:           
Component:                                                                    |     Version:           
 Keywords:  http://vefur.simula.no:8888/refs/uploads/12/Buy-Phentermine.html  |  
------------------------------------------------------------------------------+
 Nice site... Cool guestbook...
  [URL= http://vefur.simula.no:8888/refs/uploads/12/Buy-Phentermine.html
 ]Buy Phentermine[/URL] [URL= http://vefur.simula.no:8888/refs/uploads/12
 /Buy-Fioricet.html ]Buy Fioricet[/URL] [URL=
 http://vefur.simula.no:8888/refs/uploads/12/Buy-Propecia.html ]Buy
 Propecia[/URL] [URL= http://vefur.simula.no:8888/refs/uploads/12/Buy-
 Hydrocodone.html ]Buy Hydrocodone[/URL] [URL=
 http://vefur.simula.no:8888/refs/uploads/12/Buy-Levitra.html ]Buy
 Levitra[/URL] [URL= http://vefur.simula.no:8888/refs/uploads/12/Buy-
 Tramadol.html ]Buy Tramadol[/URL] [URL=
 http://vefur.simula.no:8888/refs/uploads/12/Buy-Adipex.html ]Buy
 Adipex[/URL] [URL= http://vefur.simula.no:8888/refs/uploads/12/Buy-
 Xanax.html ]Buy Xanax[/URL] [URL=
 http://vefur.simula.no:8888/refs/uploads/12/Buy-Cialis.html ]Buy
 Cialis[/URL] [URL= http://vefur.simula.no:8888/refs/uploads/12/Buy-
 Ultram.html ]Buy Ultram[/URL]
  <a href="http://vefur.simula.no:8888/refs/uploads/12/Buy-Phentermine.html
 ">Buy Phentermine</a> <a href="http://vefur.simula.no:8888/refs/uploads/12
 /Buy-Fioricet.html ">Buy Fioricet</a> <a
 href="http://vefur.simula.no:8888/refs/uploads/12/Buy-Propecia.html ">Buy
 Propecia</a> <a href="http://vefur.simula.no:8888/refs/uploads/12/Buy-
 Hydrocodone.html ">Buy Hydrocodone</a> <a
 href="http://vefur.simula.no:8888/refs/uploads/12/Buy-Levitra.html ">Buy
 Levitra</a> <a href="http://vefur.simula.no:8888/refs/uploads/12/Buy-
 Tramadol.html ">Buy Tramadol</a> <a
 href="http://vefur.simula.no:8888/refs/uploads/12/Buy-Adipex.html ">Buy
 Adipex</a> <a href="http://vefur.simula.no:8888/refs/uploads/12/Buy-
 Xanax.html ">Buy Xanax</a> <a
 href="http://vefur.simula.no:8888/refs/uploads/12/Buy-Cialis.html ">Buy
 Cialis</a> <a href="http://vefur.simula.no:8888/refs/uploads/12/Buy-
 Ultram.html ">Buy Ultram</a>

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1337>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Sun Jun 18 12:16:10 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sun, 18 Jun 2006 16:16:10 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231338=3A?=
 =?utf-8?q?_Merging_duplicate_accounts_while_importing_contacts?=
Message-ID: <076.696913d7878e2f3bc89c15f694a0683e@vtiger.fosslabs.com>

#1338: Merging duplicate accounts while importing contacts
-----------------------+----------------------------------------------------
 Reporter:  gopal      |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  critical   |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 Currently new accounts are created while importing multiple contacts on
 the same account.

 Issue notified by one of the vtiger users in feedback. Functional wise it
 is critcal issue.

 Thanks,
 Gopal

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1338>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Sun Jun 18 14:18:36 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sun, 18 Jun 2006 18:18:36 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7243 - in
 /vtigercrm/branches/4.2: data/CRMEntity.php include/uifromdbutil.php
 include/utils.php modules/Accounts/DetailView.php
Message-ID: <20060618181836.F12A74DFAC7@vtiger.fosslabs.com>

Author: jrydbeck
Date: Sun Jun 18 12:18:31 2006
New Revision: 7243

Log:
Bug #748 - Account list, edit, & save do not produce notices during common-path execution

Modified:
    vtigercrm/branches/4.2/data/CRMEntity.php
    vtigercrm/branches/4.2/include/uifromdbutil.php
    vtigercrm/branches/4.2/include/utils.php
    vtigercrm/branches/4.2/modules/Accounts/DetailView.php

Modified: vtigercrm/branches/4.2/data/CRMEntity.php
==============================================================================
--- vtigercrm/branches/4.2/data/CRMEntity.php (original)
+++ vtigercrm/branches/4.2/data/CRMEntity.php Sun Jun 18 12:18:31 2006
@@ -260,9 +260,12 @@
     global $adb;
     global $current_user;
     global $vtlog;	
+    global $insertion_mode;
+    
+    $assigntype = isset($_REQUEST['assigntype'])? $_REQUEST['assigntype'] : '';
                 
     $date_var = $adb->database->DBTimeStamp(date('YmdHis'));
-    if($_REQUEST['assigntype'] == 'T')
+    if($assigntype == 'T')
     {
       $ownerid= 0;
     }
@@ -413,6 +416,10 @@
 	  $vtlog->logthis("function insertIntoCrmEntity ".$module.' table name ' .$table_name,'info');  
 	  global $adb;
 	  $insertion_mode = $this->mode;
+	  
+	  $assigntype = isset($_REQUEST['assigntype'])? $_REQUEST['assigntype'] : '';
+	  $groupname = isset($_REQUEST['assigned_group_name'])? $_REQUEST['assigned_group_name'] : '';
+
 
 	  //Checkin whether an entry is already is present in the table to update
 	  if($insertion_mode == 'edit')
@@ -546,7 +553,7 @@
 			  {
 				  global $current_user;
 				  $fldvalue = date("l dS F Y h:i:s A").' by '.$current_user->user_name;
-				  if($_REQUEST['assigned_group_name'] != '' && $_REQUEST['assigntype'] == 'T')
+				  if($_REQUEST['assigned_group_name'] != '' && $assigntype == 'T')
                                   {
                                         $group_name = $_REQUEST['assigned_group_name'];
                                   }
@@ -626,10 +633,8 @@
 
 		  	$adb->query($sql1); 
 		  }
-
-		  if($_REQUEST['assigntype'] == 'T')
+		  if($assigntype == 'T')
 		  {
-			  $groupname = $_REQUEST['assigned_group_name'];
 			  //echo 'about to update lead group relation';
 			  if($module == 'Leads' && $table_name == 'leaddetails')
 			  {
@@ -676,26 +681,23 @@
 	  {	
 		  $sql1 = "insert into ".$table_name." (".$column.") values(".$value.")";
 		  $adb->query($sql1); 
-		  $groupname = $_REQUEST['assigned_group_name'];
-		//Fix ref to undefined variable during lead import -mikefedyk
-		if (isset($_REQUEST['assigntype']))
-		{
-		  if($_REQUEST['assigntype'] == 'T' && $table_name == 'leaddetails')
+
+		  if($assigntype == 'T' && $table_name == 'leaddetails')
 		  {
 			  if($table_name == 'leaddetails')
 			  {
 				  insert2LeadGroupRelation($this->id,$groupname);
 			  }
 		  }
-		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'activity') 
+		  elseif($assigntype == 'T' && $table_name == 'activity') 
 		  {
 			  insert2ActivityGroupRelation($this->id,$groupname);
 		  }
-		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'troubletickets') 
+		  elseif($assigntype == 'T' && $table_name == 'troubletickets') 
 		  {
 			  insert2TicketGroupRelation($this->id,$groupname);
 		  }
-		}
+		
 	  }
 
   }
@@ -944,7 +946,7 @@
 
   function save($module_name) 
   {
-	global $vtlog;
+	global $vtlog, $migration;
 	$vtlog->logthis("module name is ".$module_name,'debug');  
     //GS Save entity being called with the modulename as parameter
       $this->saveentity($module_name,$migration);

Modified: vtigercrm/branches/4.2/include/uifromdbutil.php
==============================================================================
--- vtigercrm/branches/4.2/include/uifromdbutil.php (original)
+++ vtigercrm/branches/4.2/include/uifromdbutil.php Sun Jun 18 12:18:31 2006
@@ -24,6 +24,8 @@
         $result = $adb->query($sql);
 	$noofrows = $adb->num_rows($result);
 	$output='';
+	$mvAdd_flag = false;
+
 	if (($module == 'Accounts' || $module == 'Contacts' || $module == 'Quotes' || $module == 'Orders' || $module == 'SalesOrder'|| $module == 'Invoice') && $block == 2)
 	{
 		global $vtlog;
@@ -48,8 +50,12 @@
 		$output .= '<tr>';
 		$custfld = getOutputHtml($uitype, $fieldname, $fieldlabel, $maxlength, $col_fields,$generatedtype);
 		$output .= $custfld;	
+		
 		if ($mvAdd_flag == true)
-		$output .= $moveAddress;
+		{
+			$output .= $moveAddress;
+		}
+		
 		$mvAdd_flag = false;
 		$i++;
 		if($i<$noofrows)

Modified: vtigercrm/branches/4.2/include/utils.php
==============================================================================
--- vtigercrm/branches/4.2/include/utils.php (original)
+++ vtigercrm/branches/4.2/include/utils.php Sun Jun 18 12:18:31 2006
@@ -1162,12 +1162,15 @@
         }
 	elseif($uitype == 51 || $uitype == 50 || $uitype == 73)
 	{
-		if($_REQUEST['convertmode'] != 'update_quote_val' && $_REQUEST['convertmode'] != 'update_so_val')
+		$convertmode = isset($_REQUEST['convertmode']) ? $_REQUEST['convertmode'] : '';
+		
+		if($convertmode != 'update_quote_val' && $convertmode != 'update_so_val')
 		{
                 	if(isset($_REQUEST['account_id']) && $_REQUEST['account_id'] != '')
                         	$value = $_REQUEST['account_id'];	
 		}
-
+		
+		$account_name = '';
 		if($value != '')
 		{		
 			$account_name = getAccountName($value);	
@@ -1787,6 +1790,7 @@
 	elseif($uitype == 51 || $uitype == 50 || $uitype == 73)
 	{
 		$account_id = $col_fields[$fieldname];
+		$account_name = '';
 		if($account_id != '')
 		{
 			$account_name = getAccountName($account_id);

Modified: vtigercrm/branches/4.2/modules/Accounts/DetailView.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Accounts/DetailView.php (original)
+++ vtigercrm/branches/4.2/modules/Accounts/DetailView.php Sun Jun 18 12:18:31 2006
@@ -83,6 +83,7 @@
 $xtpl->assign("BLOCK3", $block_3);
 
 $block_5 = getDetailBlockInformation("Accounts",5,$focus->column_fields);
+$cust_fld = '';
 if(trim($block_5) != '')
 {
         $cust_fld = '<table width="100%" border="0" cellspacing="0" cellpadding="0" class="formOuterBorder">';
@@ -140,9 +141,10 @@
 	//$tempVal = mysql_fetch_array($wordTemplateResult);
 	$tempCount = $adb->num_rows($wordTemplateResult);
 	$tempVal = $adb->fetch_array($wordTemplateResult);
+	$optionString = '';
 	for($templateCount=0;$templateCount<$tempCount;$templateCount++)
 	{
-		$optionString .="<option value=\"".$tempVal["templateid"]."\">" .$tempVal["filename"] ."</option>";
+		$optionString ="<option value=\"".$tempVal["templateid"]."\">" .$tempVal["filename"] ."</option>";
 		$tempVal = $adb->fetch_array($wordTemplateResult);
 		//$tempVal = mysql_fetch_array($wordTemplateResult);
 	}




From vtiger-tickets at vtiger.fosslabs.com  Sun Jun 18 14:28:02 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sun, 18 Jun 2006 18:28:02 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23748=3A_?=
 =?utf-8?q?Eliminate_php_notice_errors?=
In-Reply-To: <076.c75696aed703c24c8b151bd87264b9e6@vtiger.fosslabs.com>
References: <076.c75696aed703c24c8b151bd87264b9e6@vtiger.fosslabs.com>
Message-ID: <085.acff05e0aaab29ebdd214fd40c8c2d9c@vtiger.fosslabs.com>

#748: Eliminate php notice errors
------------------------+---------------------------------------------------
  Reporter:  allanbush  |       Owner:  jrydbeck
      Type:  task       |      Status:  assigned
  Priority:  minor      |   Milestone:  4.2.5   
 Component:  vtigercrm  |     Version:  4.2.4rc3
Resolution:             |    Keywords:          
------------------------+---------------------------------------------------
Comment (by briand):

 One of the changes in r7242 caused most of the language files to not load
 for the Home module. I was able to resolve the error by reinserting a line
 into include/utils.php. I reinserted line #272 from r7202 between lines
 #277 & #278 in r7242. I expect this only to impact modules that contain
 sub-sections from other modules.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/748>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Sun Jun 18 17:23:24 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sun, 18 Jun 2006 21:23:24 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231339=3A?=
 =?utf-8?q?_Missing_translation_for_search_results?=
Message-ID: <076.612780845c117cf5a7ac9d62d25b957d@vtiger.fosslabs.com>

#1339: Missing translation for search results
-----------------------+----------------------------------------------------
 Reporter:  abos       |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  major      |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 In search result,

 "Show Results in"
 "Total Numbers of Records"
 "Search results for ..."
 "No data found"
 And the module dropdown....

 are in english

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1339>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Sun Jun 18 19:50:23 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sun, 18 Jun 2006 23:50:23 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=232=3A_Mi?=
 =?utf-8?q?lestone_names_may_need_to_include_the_full_package_name?=
In-Reply-To: <076.ed5d9f6804d803bfb3645ac7ebbf8a24@vtiger.fosslabs.com>
References: <076.ed5d9f6804d803bfb3645ac7ebbf8a24@vtiger.fosslabs.com>
Message-ID: <085.a6b2bece61971ce88d1faac60e504b6a@vtiger.fosslabs.com>

#2: Milestone names may need to include the full package name
------------------------+---------------------------------------------------
  Reporter:  jeffk      |       Owner:  mmbrich   
      Type:  defect     |      Status:  new       
  Priority:  major      |   Milestone:  4.2.5     
 Component:  vtigercrm  |     Version:            
Resolution:             |    Keywords:  versioning
------------------------+---------------------------------------------------
Comment (by jrydbeck):

 I prefer just the version as the label.  Components are portions of the
 version so I don't understand why we would need vtigercrm-4.2.5 --my vote
 would just be 4.2.5 as the milestone label.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/2>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Sun Jun 18 23:59:50 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 19 Jun 2006 03:59:50 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231340=3A?=
 =?utf-8?q?_Firefox_extension=3A_Uninstall_not_working?=
Message-ID: <076.9c4f4fefce1fedb98255e8bbe4dd1210@vtiger.fosslabs.com>

#1340: Firefox extension: Uninstall not working
---------------------------+------------------------------------------------
 Reporter:  gopal          |       Owner:  developer
     Type:  defect         |      Status:  new      
 Priority:  critical       |   Milestone:           
Component:  vtigertoolbar  |     Version:  5.0.0    
 Keywords:                 |  
---------------------------+------------------------------------------------
 Uninstall menu is not working. Since it is an extesnion, it is better to
 manage the unstallation from extensions menu itself rather providing a
 separate menu.

 Gopal

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1340>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 19 02:55:22 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 19 Jun 2006 06:55:22 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7244 -
	/vtigercrm/trunk/index.php
Message-ID: <20060619065522.E3EA083F0D4@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 19 00:55:17 2006
New Revision: 7244

Log:
track commented out

Modified:
    vtigercrm/trunk/index.php

Modified: vtigercrm/trunk/index.php
==============================================================================
--- vtigercrm/trunk/index.php (original)
+++ vtigercrm/trunk/index.php Mon Jun 19 00:55:17 2006
@@ -482,7 +482,7 @@
 	if(isset($_REQUEST['record']) && $_REQUEST['record']!='' && $_REQUEST["module"] != "Webmails") 
         {
                 // Only track a viewing if the record was retrieved.
-                $focus->track_view($current_user->id, $actualModule,$_REQUEST['record']);
+                //$focus->track_view($current_user->id, $actualModule,$_REQUEST['record']);
         }
 
 }	




From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 19 02:57:41 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 19 Jun 2006 06:57:41 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231197=3A?=
 =?utf-8?q?_Reports_-_Incorrect_Alert_Message?=
In-Reply-To: <076.a565900329edc9f32752c9b71a73baa9@vtiger.fosslabs.com>
References: <076.a565900329edc9f32752c9b71a73baa9@vtiger.fosslabs.com>
Message-ID: <085.c757f5e53a82cac366c428ccb158643b@vtiger.fosslabs.com>

#1197: Reports - Incorrect Alert Message
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  jerrydgeorge
      Type:  defect     |      Status:  closed      
  Priority:  minor      |   Milestone:              
 Component:  vtigercrm  |     Version:  5.0.0       
Resolution:  fixed      |    Keywords:              
------------------------+---------------------------------------------------
Changes (by anonymous):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1197>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 19 03:08:03 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 19 Jun 2006 07:08:03 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231136=3A?=
 =?utf-8?q?_parenttab_not_parsed_for_backup_server_configuration_save?=
In-Reply-To: <076.111cd820f71186cdd653f9d438341dd5@vtiger.fosslabs.com>
References: <076.111cd820f71186cdd653f9d438341dd5@vtiger.fosslabs.com>
Message-ID: <085.4d686ce903f95392aa8bed31cd54ee60@vtiger.fosslabs.com>

#1136: parenttab not parsed for backup server configuration save
------------------------+---------------------------------------------------
  Reporter:  mangai     |       Owner:  jeri  
      Type:  defect     |      Status:  closed
  Priority:  minor      |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by saraj):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 (In [7245]) Fixes #1136

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1136>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 19 03:08:03 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 19 Jun 2006 07:08:03 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7245 -
	/vtigercrm/trunk/modules/Settings/Save.php
Message-ID: <20060619070803.A3B2C83F171@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 19 01:07:59 2006
New Revision: 7245

Log:
Fixes #1136

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

Modified: vtigercrm/trunk/modules/Settings/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/Save.php (original)
+++ vtigercrm/trunk/modules/Settings/Save.php Mon Jun 19 01:07:59 2006
@@ -78,5 +78,5 @@
 	if($mail_status != 1)
 		$action = 'EmailConfig&emailconfig_mode=edit';
 }
-header("Location: index.php?module=Settings&action=$action&$error_str");
+header("Location: index.php?module=Settings&parenttab=Settings&action=$action&$error_str");
 ?>




From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 19 03:21:59 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 19 Jun 2006 07:21:59 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231311=3A?=
 =?utf-8?q?_Error_on_report_module_link?=
In-Reply-To: <076.c88d9dad0e512beb782fc9feab6fceee@vtiger.fosslabs.com>
References: <076.c88d9dad0e512beb782fc9feab6fceee@vtiger.fosslabs.com>
Message-ID: <085.de402a3b8b836fc88001b086add6133e@vtiger.fosslabs.com>

#1311: Error on report module link
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  jeri                
      Type:  defect     |      Status:  closed              
  Priority:  major      |   Milestone:                      
 Component:  vtigercrm  |     Version:  5.0.0               
Resolution:  fixed      |    Keywords:  reports, translation
------------------------+---------------------------------------------------
Changes (by saraj):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 (In [7246]) Fixes #1311

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1311>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 19 03:22:00 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 19 Jun 2006 07:22:00 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7246 - in /vtigercrm/trunk:
 Smarty/templates/Reports.tpl modules/Reports/Reports.php
Message-ID: <20060619072200.AB9ED64FC35@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 19 01:21:54 2006
New Revision: 7246

Log:
Fixes #1311

Modified:
    vtigercrm/trunk/Smarty/templates/Reports.tpl
    vtigercrm/trunk/modules/Reports/Reports.php

Modified: vtigercrm/trunk/Smarty/templates/Reports.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Reports.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Reports.tpl Mon Jun 19 01:21:54 2006
@@ -65,8 +65,8 @@
 	<tbody><tr><td style="border-bottom: 1px solid rgb(204, 204, 204); padding: 5px;"><b>{$MOD.LBL_CREATE_NEW} :</b></td></tr>
 	<tr>
 	<td>
-	{foreach item=modules from=$REPT_MODULES}
-	<a href="javascript:CreateReport('{$modules}');" class="reportMnu">- {$modules}</a>
+	{foreach item=modules key=modulename from=$REPT_MODULES}
+	<a href="javascript:CreateReport('{$modulename}');" class="reportMnu">- {$modules}</a>
 	{/foreach}
 	</td>
 	</tr>

Modified: vtigercrm/trunk/modules/Reports/Reports.php
==============================================================================
--- vtigercrm/trunk/modules/Reports/Reports.php (original)
+++ vtigercrm/trunk/modules/Reports/Reports.php Mon Jun 19 01:21:54 2006
@@ -1030,7 +1030,7 @@
 				if(isPermitted($key,'index') == "yes")
 				{
 					$count_flag = 1;
-					$modules [] = $value;
+					$modules [$key] = $value;
 				}
 			}
 		}




From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 19 03:33:42 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 19 Jun 2006 07:33:42 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231279=3A?=
 =?utf-8?q?_database_creation_error_problems_afterword?=
In-Reply-To: <076.fb2022c8962a6bd349bf1145132bfaa6@vtiger.fosslabs.com>
References: <076.fb2022c8962a6bd349bf1145132bfaa6@vtiger.fosslabs.com>
Message-ID: <085.a3a2c26f19b35b0ff82b80ad87b24e79@vtiger.fosslabs.com>

#1279: database creation error problems afterword
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  jeri  
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  invalid    |    Keywords:        
------------------------+---------------------------------------------------
Changes (by anonymous):

  * resolution:  => invalid
  * status:  new => closed

Comment:

 mysql 4.0.x is not supported

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1279>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 19 03:39:31 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 19 Jun 2006 07:39:31 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231341=3A?=
	=?utf-8?q?_Mail_Merge_Templates?=
Message-ID: <076.b35680daa00096d0d2e99844d8d6d426@vtiger.fosslabs.com>

#1341: Mail Merge Templates
-------------------------+--------------------------------------------------
 Reporter:  anonymous    |       Owner:  developer
     Type:  enhancement  |      Status:  new      
 Priority:  major        |   Milestone:           
Component:  vtigercrm    |     Version:  5.0.0    
 Keywords:               |  
-------------------------+--------------------------------------------------
 Currently mail merge templates are setup by the administrator. It would be
 requested that CRM user can upload and access user specific templates.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1341>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 19 03:46:37 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 19 Jun 2006 07:46:37 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7247 -
 /vtigercrm/trunk/modules/Products/DeletePriceBookProductRel.php
Message-ID: <20060619074637.D90575E30AD@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 19 01:46:33 2006
New Revision: 7247

Log:
DeletePriceBookProductRel has been ajaxified

Modified:
    vtigercrm/trunk/modules/Products/DeletePriceBookProductRel.php

Modified: vtigercrm/trunk/modules/Products/DeletePriceBookProductRel.php
==============================================================================
--- vtigercrm/trunk/modules/Products/DeletePriceBookProductRel.php (original)
+++ vtigercrm/trunk/modules/Products/DeletePriceBookProductRel.php Mon Jun 19 01:46:33 2006
@@ -30,5 +30,5 @@
 	$adb->query($query); 
 }
 
-header("Location: index.php?action=".$return_action."&module=PriceBooks&record=".$return_id);
+header("Location: index.php?module=".$return_module."&action=".$return_module."Ajax&file=$return_action&ajax=delpbprorel&record=".$return_id);
 ?>




From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 19 03:48:42 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 19 Jun 2006 07:48:42 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7248 -
 /vtigercrm/trunk/modules/Products/UpdateListPrice.php
Message-ID: <20060619074843.0D25A5E30AD@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 19 01:48:39 2006
New Revision: 7248

Log:
UpdateListPrice has been ajaxified

Modified:
    vtigercrm/trunk/modules/Products/UpdateListPrice.php

Modified: vtigercrm/trunk/modules/Products/UpdateListPrice.php
==============================================================================
--- vtigercrm/trunk/modules/Products/UpdateListPrice.php (original)
+++ vtigercrm/trunk/modules/Products/UpdateListPrice.php Mon Jun 19 01:48:39 2006
@@ -12,15 +12,14 @@
 global $adb;
 global $log;
 $log->debug("Going to update the ListPrice in (modules/Products/UpdateListPrice.php).");
-
 $record = $_REQUEST['record'];
 $pricebook_id = $_REQUEST['pricebook_id'];
 $product_id = $_REQUEST['product_id'];
 $listprice = $_REQUEST['list_price'];
 $return_action = $_REQUEST['return_action'];
+$return_module = $_REQUEST['return_module'];
 
 $query = "update vtiger_pricebookproductrel set listprice=".$listprice." where pricebookid=".$pricebook_id." and productid=".$product_id;
 $adb->query($query); 
-
-header("Location: index.php?action=$return_action&module=PriceBooks&record=$record");
+header("Location: index.php?module=$return_module&action=".$return_module."Ajax&file=$return_action&ajax=updatelistprice&record=$record");
 ?>




From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 19 03:56:28 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 19 Jun 2006 07:56:28 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7249 -
	/vtigercrm/trunk/modules/Products/EditListPrice.php
Message-ID: <20060619075628.B760383F121@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 19 01:56:25 2006
New Revision: 7249

Log:
EditListPrice has been smartified

Modified:
    vtigercrm/trunk/modules/Products/EditListPrice.php

Modified: vtigercrm/trunk/modules/Products/EditListPrice.php
==============================================================================
--- vtigercrm/trunk/modules/Products/EditListPrice.php (original)
+++ vtigercrm/trunk/modules/Products/EditListPrice.php Mon Jun 19 01:56:25 2006
@@ -9,15 +9,8 @@
 *
  ********************************************************************************/
 
-require_once('XTemplate/xtpl.php');
 global $mod_strings;
 global $app_strings;
-global $app_list_strings;
-
-echo get_module_title($mod_strings['LBL_MODULE_NAME'], 'PriceBook: Edit List Price', true);
-echo '<br><br>';
-
-global $adb;
 global $theme;
 $theme_path="themes/".$theme."/";
 $image_path=$theme_path."images/";
@@ -39,16 +32,40 @@
 	$return_action = "CallRelatedList";
 	$return_id = $_REQUEST['pricebook_id'];
 }
-$xtpl=new XTemplate ('modules/Products/EditListPrice.html');
-$xtpl->assign("MOD", $mod_strings);
-$xtpl->assign("APP", $app_strings);
-$xtpl->assign("PRICEBOOKID", $pricebook_id);
-$xtpl->assign("PRODUCTID", $product_id);
-$xtpl->assign("LISTPRICE", $listprice);
-$xtpl->assign("RETURN_ACTION", $return_action);
-$xtpl->assign("RETURN_ID", $return_id);
+$output='';
+$output ='<div id="EditListPriceLay">
+	<form action="index.php" name="index">
+	<input type="hidden" name="module" value="Products">
+	<input type="hidden" name="action" value="UpdateListPrice">
+	<input type="hidden" name="record" value="'.$return_id.'">
+	<input type="hidden" name="pricebook_id" value="'.$pricebook_id.'">
+	<input type="hidden" name="product_id" value="'.$product_id.'">
+	<table width="100%" border="0" cellpadding="3" cellspacing="0">
+	<tr>
+		<td class="genHeaderSmall" align="left" style="border-bottom:1px solid #CCCCCC;" width="50%">EditListPrice</td>
+		<td style="border-bottom:1px solid #CCCCCC;">&nbsp;</td>
+		<td align="right" style="border-bottom:1px solid #CCCCCC;" width="40%"><a href="#" onClick="document.getElementById(\'EditListPriceLay\').style.display=\'none\';">Close</a></td>
+	</tr>
+	<tr>
+		<td colspan="3">&nbsp;</td>
+	</tr>
+	<tr>
+		<td width="50%"><b>EditListPrice</b></td>
+		<td width="2%"><b>:</b></td>
+		<td width="48%" align="left" ><input class="dataInput" type="text" id="list_price" name="list_price" value="'.$listprice.'" /></td>
+	</tr>
+	<tr><td colspan="3" style="border-bottom:1px dashed #CCCCCC;">&nbsp;</td></tr>
+	<tr>
+		<td colspan="3" align="center">
+			<input type="button" onclick="gotoUpdateListPrice('.$return_id.','.$pricebook_id.','.$product_id.');return verify_data(EditView)" name="button" value="'.$app_strings["LBL_SAVE_BUTTON_LABEL"].'" class="small">
+			<input title="'.$app_strings["LBL_CANCEL_BUTTON_LABEL"].'" accessKey="'.$app_strings["LBL_CANCEL_BUTTON_KEY"].'" class="small" onClick="document.getElementById(\'EditListPriceLay\').style.display=\'none\';" type="button" name="button" value="'.$app_strings["LBL_CANCEL_BUTTON_LABEL"].'">
+		</td>
+		
+	</tr>
+	</table>
+</form>
+</div>';
 
-$xtpl->parse("main");
-$xtpl->out("main");
+echo $output;
 
 ?>




From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 19 03:57:25 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 19 Jun 2006 07:57:25 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7250 -
	/vtigercrm/trunk/modules/Products/EditListPrice.html
Message-ID: <20060619075725.956A183F128@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 19 01:57:22 2006
New Revision: 7250

Log:
xtemplate has been removed

Removed:
    vtigercrm/trunk/modules/Products/EditListPrice.html




From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 19 04:01:08 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 19 Jun 2006 08:01:08 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7251 -
	/vtigercrm/trunk/modules/PriceBooks/PriceBook.js
Message-ID: <20060619080108.6E34C83F16C@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 19 02:01:04 2006
New Revision: 7251

Log:
js function deletePriceBookProductRel has been included

Modified:
    vtigercrm/trunk/modules/PriceBooks/PriceBook.js

Modified: vtigercrm/trunk/modules/PriceBooks/PriceBook.js
==============================================================================
--- vtigercrm/trunk/modules/PriceBooks/PriceBook.js (original)
+++ vtigercrm/trunk/modules/PriceBooks/PriceBook.js Mon Jun 19 02:01:04 2006
@@ -150,4 +150,19 @@
 	window.opener.document.EditView.elements[fldname].focus();
 }
 
+function deletePriceBookProductRel(id,pbid)
+{
+        $("status").style.display="inline";
+        new Ajax.Request(
+		'index.php',
+		{queue: {position: 'end', scope: 'command'},
+			method: 'post',
+			postBody: 'module=Products&action=ProductsAjax&file=DeletePriceBookProductRel&ajax=true&return_action=CallRelatedList&return_module=PriceBooks&record='+id+'&pricebook_id='+pbid+'&return_id='+pbid,
+			onComplete: function(response) {
+					$("status").style.display="none";
+                                        $("RLContents").innerHTML= response.responseText;
+			}
+                }
+	);
+}
 




From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 19 04:03:42 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 19 Jun 2006 08:03:42 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7252 -
	/vtigercrm/trunk/themes/blue/style.css
Message-ID: <20060619080342.6C96683F16E@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 19 02:03:38 2006
New Revision: 7252

Log:
css for EditListPriceLay has been included

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 Jun 19 02:03:38 2006
@@ -2291,6 +2291,17 @@
 	padding:5px;
 }
 
+#EditListPriceLay{
+	font-family:Arial, Helvetica, sans-serif;
+	font-size:11px;
+	text-align:left;
+	width:300px;
+	border:3px solid #CCCCCC;
+	background-color:#FFFFFF;
+	padding:5px;
+}
+							
+
 
 /* For Report HTML Generation*/
 .rptCellLabel {




From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 19 04:11:16 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 19 Jun 2006 08:11:16 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7253 -
	/vtigercrm/trunk/Smarty/templates/RelatedLists.tpl
Message-ID: <20060619081116.C2F244DEFC7@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 19 02:11:12 2006
New Revision: 7253

Log:
changes made to smartify editlistprice from pricebooks relatedlist

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

Modified: vtigercrm/trunk/Smarty/templates/RelatedLists.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/RelatedLists.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/RelatedLists.tpl Mon Jun 19 02:11:12 2006
@@ -13,9 +13,46 @@
 -->*}
 <script language="JavaScript" type="text/javascript" src="modules/PriceBooks/PriceBook.js"></script>
 <script type="text/javascript" src="modules/{$MODULE}/{$SINGLE_MOD}.js"></script>
+{literal}
+<script>
+function editProductListPrice(id,pbid,price)
+{
+        $("status").style.display="inline";
+        new Ajax.Request(
+                'index.php',
+                {queue: {position: 'end', scope: 'command'},
+                        method: 'post',
+                        postBody: 'action=ProductsAjax&file=EditListPrice&return_action=CallRelatedList&return_module=PriceBooks&module=Products&parenttab=Settings&record='+id+'&pricebook_id='+pbid+'&listprice='+price,
+                        onComplete: function(response) {
+                                        $("status").style.display="none";
+                                        $("editlistprice").innerHTML= response.responseText;
+                        }
+                }
+        );
+}
+
+function gotoUpdateListPrice(id,pbid,proid)
+{
+        $("status").style.display="inline";
+        $("EditListPriceLay").style.display = "none";
+        var listprice=$("list_price").value;
+                new Ajax.Request(
+                        'index.php',
+                        {queue: {position: 'end', scope: 'command'},
+                                method: 'post',
+                                postBody: 'module=Products&action=ProductsAjax&file=UpdateListPrice&ajax=true&return_action=CallRelatedList&return_module=PriceBooks&record='+id+'&pricebook_id='+pbid+'&product_id='+proid+'&list_price='+listprice,
+                                onComplete: function(response) {
+                                        $("status").style.display="none";
+                                        $("RLContents").innerHTML= response.responseText;
+                                }
+                        }
+                );
+}
+</script>
+{/literal}
 	{include file='Buttons_List1.tpl'}
-
 <!-- Contents -->
+<div id="editlistprice" style="display:block;position:absolute;left:350px;top:200px;"></div>
 <table border=0 cellspacing=0 cellpadding=0 width=98% align=center>
 <tr>
 	<td valign=top><img src="themes/blue/images/showPanelTopLeft.gif"></td>
@@ -163,40 +200,10 @@
 							{/if}
 							</tr>
 						</table>	
-	                                        {if $detail ne ''} 
-				      	   	  {foreach key=header item=detail from=$detail}
-					      
-							{if $header eq 'header'}
-								<table border=0 cellspacing=1 cellpadding=3 width=100% style="background-color:#eaeaea;" class="small">
-								<tr style="height:25px" bgcolor=white>	
-							          {foreach key=header item=headerfields from=$detail}	
-								    <td class="lvtCol">{$headerfields}</td> 
-							          {/foreach}			
-								</tr>
-							{elseif $header eq 'entries'}	 
-					    			{foreach key=header item=detail from=$detail}
-								  <tr bgcolor=white>
-							            {foreach key=header item=listfields from=$detail}
-        	        	                                      <td>{$listfields}</td>
-                	        	                            {/foreach}		
-								  </tr>	
-								{/foreach}
-								</table>	 
-		                                        {/if}	
-						    {/foreach}
-						
-					   	{else}
-							<table style="background-color:#eaeaea;color:eeeeee" border="0" cellpadding="3" cellspacing="1" width="100%" class="small">
-							<tbody>
-								<tr style="height: 25px;" bgcolor="white">
-									<td><i>{$APP.LBL_NONE_INCLUDED}</i></td>
-								</tr>
-							</tbody>
-						
-							</table>
-								
-					   	{/if}		
-				  	  <br><br>
+						<div id="RLContents">
+                                                        {include file='RelatedListContents.tpl'}
+                                                </div>
+						<br><br>
 					{/foreach}
 						</form>
 				</table>			




From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 19 04:13:15 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 19 Jun 2006 08:13:15 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7254 -
 /vtigercrm/trunk/Smarty/templates/RelatedListContents.tpl
Message-ID: <20060619081315.02A0A4DF4AF@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 19 02:13:12 2006
New Revision: 7254

Log:
RelatedListContents.tpl added

Added:
    vtigercrm/trunk/Smarty/templates/RelatedListContents.tpl




From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 19 04:30:30 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 19 Jun 2006 08:30:30 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7255 - in /vtigercrm/trunk:
 Smarty/templates/ListView.tpl Smarty/templates/ListViewEntries.tpl
 modules/Users/updateLeadDBStatus.php
Message-ID: <20060619083030.45018836D2A@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 19 02:30:18 2006
New Revision: 7255

Log:
issue in mass delete,change owner,change status has been fixed

Modified:
    vtigercrm/trunk/Smarty/templates/ListView.tpl
    vtigercrm/trunk/Smarty/templates/ListViewEntries.tpl
    vtigercrm/trunk/modules/Users/updateLeadDBStatus.php

Modified: vtigercrm/trunk/Smarty/templates/ListView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ListView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ListView.tpl Mon Jun 19 02:30:18 2006
@@ -127,10 +127,10 @@
         </td>
 </tr>
 </table>
-</form>
 </div>
 
 {*<!-- Contents -->*}
+<form name="basicSearch" action="index.php">
 <table border=0 cellspacing=0 cellpadding=0 width=98% align=center>
      <tr>
         <td valign=top><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
@@ -138,7 +138,6 @@
 	<td class="showPanelBg" valign="top" width=100% style="padding:10px;">
 	 <!-- SIMPLE SEARCH -->
 <div id="searchAcc" style="z-index:1;display:none;position:relative;">
-<form name="basicSearch" action="index.php">
 <table width="80%" cellpadding="5" cellspacing="0" style="border:1px dashed #CCCCCC;" class="small" align="center">
 	<tr>
 		<td width="15%" class="dvtCellLabel" nowrap align="right"><img src="{$IMAGE_PATH}basicSearchLens.gif" align="absmiddle" alt="{$APP.LNK_BASIC_SEARCH}" title="{$APP.LNK_BASIC_SEARCH}" border=0>&nbsp;&nbsp;<b>{$APP.LBL_SEARCH_FOR}</b></td>
@@ -214,12 +213,13 @@
 		</tr>
 	</table>
 </div>		
+</form>
 {*<!-- Searching UI -->*}
 	 <br>
 	   <!-- PUBLIC CONTENTS STARTS-->
 	   <div id="ListViewContents" class="small" style="width:100%;position:relative;">
-	<input name='search_url' id="search_url" type='hidden' value='{$SEARCH_URL}'>
      <form name="massdelete" method="POST">
+     <input name='search_url' id="search_url" type='hidden' value='{$SEARCH_URL}'>
      <input name="idlist" type="hidden">
      <input name="change_owner" type="hidden">
      <input name="change_status" type="hidden">

Modified: vtigercrm/trunk/Smarty/templates/ListViewEntries.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ListViewEntries.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ListViewEntries.tpl Mon Jun 19 02:30:18 2006
@@ -11,13 +11,13 @@
 -->*}
 &#&#&#{$ERROR}&#&#&#
 
+     <form name="massdelete" method="POST">
      <input name='search_url' id="search_url" type='hidden' value='{$SEARCH_URL}'>
      <input name='allids' type='hidden' value='{$ALLIDS}'>
-     <form name="massdelete" method="POST">
      <input name="idlist" type="hidden">
      <input name="change_owner" type="hidden">
      <input name="change_status" type="hidden">
-<table border=0 cellspacing=1 cellpadding=0 width=100% class="lvtBg">
+	<table border=0 cellspacing=1 cellpadding=0 width=100% class="lvtBg">
 	            <tr style="background-color:#efefef">
 		      <td>
 		         <table border=0 cellspacing=0 cellpadding=2 width=100% class="small">
@@ -134,5 +134,5 @@
 		   </tr>
 		   
 	    </table>
-   </form>	
+  </form>	
 {$SELECT_SCRIPT}

Modified: vtigercrm/trunk/modules/Users/updateLeadDBStatus.php
==============================================================================
--- vtigercrm/trunk/modules/Users/updateLeadDBStatus.php (original)
+++ vtigercrm/trunk/modules/Users/updateLeadDBStatus.php Mon Jun 19 02:30:18 2006
@@ -20,7 +20,7 @@
 $return_module = $_REQUEST['return_module'];
 global $current_user;
 global $adb;
-$storearray = explode(";",$idlist);
+$storearray = explode(";",trim($idlist,';'));
 
 $ids_list = array();
 
@@ -32,7 +32,7 @@
 		if(isPermitted($return_module,'EditView',$id) == 'yes')
 		{
 			if($id != '') {
-				$sql = "update vtiger_crmentity set modifiedby=".$current_user->id.",smownerid='" .$idval ."', modifiedtime=".$adb->formatString("crmentity","modifiedtime",$date_var)." where crmid='" .$id."'";
+				$sql = "update vtiger_crmentity set modifiedby=".$current_user->id.",smownerid='" .$idval ."', modifiedtime=".$adb->formatString("vtiger_crmentity","modifiedtime",$date_var)." where crmid='" .$id."'";
 				$result = $adb->query($sql);
 			}
 		}
@@ -44,14 +44,15 @@
 }
 elseif(isset($_REQUEST['leadval']) && $_REQUEST['leadval']!='')
 {
+
 	foreach($storearray as $id)
 	{
 		if(isPermitted($return_module,'EditView',$id) == 'yes')
 		{
 			if($id != '') {
-				$sql = "update vtiger_leaddetails set vtiger_leadstatus='" .$leadstatusval ."' where leadid='" .$id."'";
+				$sql = "update vtiger_leaddetails set leadstatus='" .$leadstatusval ."' where leadid='" .$id."'";
 				$result = $adb->query($sql);
-				$query = "update vtiger_crmentity set modifiedby=".$current_user->id.",modifiedtime=".$adb->formatString("crmentity","modifiedtime",$date_var)." where crmid=".$id;
+				$query = "update vtiger_crmentity set modifiedby=".$current_user->id.",modifiedtime=".$adb->formatString("vtiger_crmentity","modifiedtime",$date_var)." where crmid=".$id;
 				$result1 = $adb->query($query);
 			}
 		}
@@ -62,13 +63,13 @@
 
 	}
 }
-$ret_owner = getEntityName($return_module,$ids_list);
-if(count($ret_owner) > 0)
+if(count($ids_list) > 0)
 {
-       $errormsg = implode(',',$ret_owner);
+	$ret_owner = getEntityName($return_module,$ids_list);
+        $errormsg = implode(',',$ret_owner);
 }else
 {
-       $errormsg = '';
+        $errormsg = '';
 }
 
 if($return_module == 'Calendar')




From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 19 05:21:04 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 19 Jun 2006 09:21:04 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7256 -
 /vtigercrm/trunk/modules/PriceBooks/CallRelatedList.php
Message-ID: <20060619092105.4923480C3F5@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 19 03:21:01 2006
New Revision: 7256

Log:
changes made for ajaxification

Modified:
    vtigercrm/trunk/modules/PriceBooks/CallRelatedList.php

Modified: vtigercrm/trunk/modules/PriceBooks/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/PriceBooks/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/PriceBooks/CallRelatedList.php Mon Jun 19 03:21:01 2006
@@ -63,6 +63,9 @@
 
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
-$smarty->display("RelatedLists.tpl");
+if(isset($_REQUEST['ajax']) && $_REQUEST['ajax'] != '')
+	$smarty->display("RelatedListContents.tpl");
+else
+	$smarty->display("RelatedLists.tpl");
 
 ?>




From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 19 05:27:46 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 19 Jun 2006 09:27:46 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7257 -
	/vtigercrm/trunk/include/RelatedListView.php
Message-ID: <20060619092746.B9857832CDE@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 19 03:27:42 2006
New Revision: 7257

Log:
changes made to integrate smarty for EditListPrice

Modified:
    vtigercrm/trunk/include/RelatedListView.php

Modified: vtigercrm/trunk/include/RelatedListView.php
==============================================================================
--- vtigercrm/trunk/include/RelatedListView.php (original)
+++ vtigercrm/trunk/include/RelatedListView.php Mon Jun 19 03:27:42 2006
@@ -575,7 +575,7 @@
 		$entries[] = $adb->query_result($list_result,$i,"productcode");
 		$entries[] = $unit_price;
 		$entries[] = $listprice;
-		$entries[] = '<a href="index.php?module=Products&action=EditListPrice&record='.$entity_id.'&pricebook_id='.$pricebook_id.'&listprice='.$listprice.'">edit</a>&nbsp;|&nbsp;<a href="index.php?module=Products&action=DeletePriceBookProductRel'.$returnset.'&record='.$entity_id.'&pricebook_id='.$pricebook_id.'&return_module=PriceBooks&return_action=CallRelatedList">del</a>';
+		$entries[] = '<img src="'.$image_path.'editfield.gif" border="0" onClick="editProductListPrice(\''.$entity_id.'\',\''.$pricebook_id.'\',\''.$listprice.'\')" alt="Edit" title="Edit"/><!--a href="index.php?module=Products&action=EditListPrice&record='.$entity_id.'&pricebook_id='.$pricebook_id.'&listprice='.$listprice.'">edit</a-->&nbsp;|&nbsp;<img src="'.$image_path.'delete.gif" onclick="if(confirm(\'Are you sure?\')) deletePriceBookProductRel('.$entity_id.','.$pricebook_id.');" alt="Delete" title="Delete" border="0">';
 
 		$entries_list[] = $entries;
 	}




From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 19 05:28:51 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 19 Jun 2006 09:28:51 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231327=3A?=
 =?utf-8?q?_not_smartified=2C_still_in_xtemplate?=
In-Reply-To: <076.14a4dc55fd3e2cc898c582ff8d811185@vtiger.fosslabs.com>
References: <076.14a4dc55fd3e2cc898c582ff8d811185@vtiger.fosslabs.com>
Message-ID: <085.2ab77d69a9f990e4a89b2ffebd936d1b@vtiger.fosslabs.com>

#1327: not smartified, still in xtemplate
------------------------+---------------------------------------------------
  Reporter:  mickie     |       Owner:  mangai
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mangai):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 smartified and integrated.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1327>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 19 06:18:23 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 19 Jun 2006 10:18:23 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7258 - in
 /vtigercrm/trunk/include/utils: DeleteUtils.php ListViewUtils.php
Message-ID: <20060619101823.025AF5E4DE7@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 19 04:18:18 2006
New Revision: 7258

Log:
* Modified to handle the del link in relatedlist which has some errors

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

Modified: vtigercrm/trunk/include/utils/DeleteUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/DeleteUtils.php (original)
+++ vtigercrm/trunk/include/utils/DeleteUtils.php Mon Jun 19 04:18:18 2006
@@ -11,7 +11,7 @@
 
 /**
  * This function returns no value but handles the delete functionality of each entity.
- * Input Parameter are $module - module name, $focus - module object, $record - entity id, $return_id - return entity id. 
+ * Input Parameter are $module - module name, $return_module - return module name, $focus - module object, $record - entity id, $return_id - return entity id. 
  */
 
 function DeleteEntity($module,$return_module,$focus,$record,$return_id)
@@ -19,8 +19,17 @@
 	global $log;
 	$log->debug("Entering DeleteEntity(".$module.",".$return_module.",".$focus.",".$record.",".$return_id.") method ...");
 	global $adb;
+	global $current_user;
+
+	//if we delete the entity from relatedlist then this if will be used ie., the relationship will be deleted otherwise if we delete the entiry from listview then the relationship will not be deleted where as total entity will be deleted 
+	if($module != $related_module)
+	{
 
 	switch($module):
+	case Leads:
+		$sql = 'delete from vtiger_seactivityrel where crmid = '.$record.' and activityid = '.$return_id;
+		$adb->query($sql);
+	break;
 	case Accounts:
 		if($return_id!='')
 		{
@@ -28,6 +37,40 @@
 			$adb->query($sql);
 		}
 	break;
+	case Contacts:
+		if($return_module == 'Accounts')
+		{
+			$sql = 'update vtiger_contactdetails set accountid = "" where contactid = '.$record;
+			$adb->query($sql);
+		}
+		if($return_module == 'Potentials' && $record != '' && $return_id != '')
+		{
+			$sql = 'delete from vtiger_contpotentialrel where contactid='.$record.' and potentialid='.$return_id;
+			$adb->query($sql);
+		}
+		if($record != '' && $return_id != '')
+		{
+			$sql = 'delete from vtiger_seactivityrel where crmid = '.$record.' and activityid = '.$return_id;
+			$adb->query($sql);
+			$sql_recentviewed ='delete from vtiger_tracker where user_id = '.$current_user->id.' and item_id = '.$record;
+			$adb->query($sql_recentviewed);
+		}
+		if($return_module == 'Products')
+		{
+			$sql = 'delete from vtiger_vendorcontactrel where contactid='.$record.' and vendorid='.$return_id;
+			$adb->query($sql);
+		}
+	break;
+	case Potentials:
+		if($return_module == 'Accounts')
+		{
+			//we can call $focus->mark_deleted($record)
+			$sql = 'update vtiger_crmentity set deleted = 1 where crmid = '.$record;
+			$adb->query($sql);
+		}
+		$sql ='delete from vtiger_seactivityrel where crmid = '.$record.' and activityid = '.$return_id;
+		$adb->query($sql);
+	break;
 	case Activities:
 		if($return_module == 'Contacts')
 		{
@@ -50,30 +93,6 @@
 
  		$sql = 'delete  from vtiger_recurringevents where activityid='.$record;
  		$adb->query($sql);
-	break;
-	case Contacts:
-		if($return_module == 'Accounts')
-		{
-			$sql = 'update vtiger_crmentity set deleted = 1 where crmid = '.$record;
-			$adb->query($sql);
-		}
-		if($return_module == 'Potentials' && $record != '' && $return_id != '')
-		{
-			$sql = 'delete from vtiger_contpotentialrel where contactid='.$record.' and potentialid='.$return_id;
-			$adb->query($sql);
-		}
-		if($record != '' && $return_id != '')
-		{
-			$sql = 'delete from vtiger_seactivityrel where crmid = '.$record.' and activityid = '.$return_id;
-			$adb->query($sql);
-			$sql_recentviewed ='delete from vtiger_tracker where user_id = '.$current_user->id.' and item_id = '.$record;
-			$adb->query($sql_recentviewed);
-		}
-		if($return_module == 'Products')
-		{
-			$sql = 'delete from vtiger_vendorcontactrel where contactid='.$record.' and vendorid='.$return_id;
-			$adb->query($sql);
-		}
 	break;
 	case Emails:
 		$sql='delete from vtiger_seactivityrel where activityid='.$adb->quote($record);
@@ -94,6 +113,163 @@
 			$adb->query($sql);
 		}
 	break;
+	case Notes:
+		if($return_module== 'Contacts')
+		{
+			$sql = 'update vtiger_notes set contact_id = 0 where notesid = '.$record;
+			$adb->query($sql);
+		}
+		$sql = 'delete from vtiger_senotesrel where notesid = '.$record. ' and crmid = '.$return_id;
+		$adb->query($sql);
+	break;
+	case Products:
+		if($record != '' && $return_id != '')
+		{
+			if($return_module == 'Activities')
+				$sql = 'delete from vtiger_seactivityrel where crmid = '.$record.' and activityid = '.$return_id;
+
+			if($return_module == 'Potentials' || $return_module == 'Accounts' || $return_module == 'Leads')
+				$sql = 'delete from vtiger_seproductsrel where crmid = '.$return_id.' and productid = '.$record;
+
+			$adb->query($sql);
+		}
+		if($return_module == "Contacts")
+		{
+			$sql = "UPDATE vtiger_products set contactid = '' where productid = ".$record;
+			$adb->query($sql);
+		}
+		if($return_module == "Vendors")
+		{
+			$sql = "update vtiger_products set vendor_id = '' where productid = $record";
+			$adb->query($sql);
+		}
+	break;
+	case PurchaseOrder:
+
+		if($return_module == "Vendors")
+		{
+			$sql_req ='update vtiger_crmentity set deleted = 1 where crmid= '.$record;
+			$adb->query($sql_req);
+		}
+		elseif($return_module == "Contacts")
+		{
+			$sql_req ='UPDATE vtiger_purchaseorder set contactid="" where purchaseorderid = '.$record;
+			$adb->query($sql_req);
+		}
+
+		//Following condition is commented because in Product Relatedlist we have PO which should not be deleted.
+		/*
+		elseif($return_module == "Products")
+		{
+			//Removing the relation from the po product rel
+			$po_query = "select * from vtiger_poproductrel where productid=".$return_id;
+			$result = $adb->query($po_query);
+			$num_rows = $adb->num_rows($result);
+			for($i=0; $i< $num_rows; $i++)
+			{
+				$po_id = $adb->query_result($result,$i,"purchaseorderid");
+				$qty = $adb->query_result($result,$i,"quantity");
+				$listprice = $adb->query_result($result,$i,"listprice");
+				$prod_total = $qty * $listprice;
+				//Handle here -- Tax calculations
+
+				//Get the current sub total from Quotes and update it with the new subtotal
+				updateSubTotal("PurchaseOrder","vtiger_purchaseorder","subtotal","total","purchaseorderid",$po_id,$prod_total);
+			}
+			//delete the relation from po product rel
+			$del_query = "delete from vtiger_poproductrel where productid=".$return_id." and purchaseorderid=".$record;
+			$adb->query($del_query);
+
+		}
+		*/
+	break;
+	case SalesOrder:
+		if($return_module == "Accounts")
+		{
+			$focus->mark_deleted($record);
+		}
+		elseif($return_module == "Quotes")
+		{
+			$relation_query = "UPDATE vtiger_salesorder set quoteid='' where salesorderid=".$record;
+			$adb->query($relation_query);
+		}
+		elseif($return_module == "Potentials")
+		{
+			$relation_query = "UPDATE vtiger_salesorder set potentialid='' where salesorderid=".$record;
+			$adb->query($relation_query);
+		}
+		elseif($return_module == "Contacts")
+		{
+			$relation_query = "UPDATE vtiger_salesorder set contactid='' where salesorderid=".$record;
+			$adb->query($relation_query);
+		}
+		//Following condition is commented because in Product Relatedlist we have SO which should not be deleted.
+		/*
+		elseif($return_module == "Products")
+		{
+			//Removing the relation from the so product rel
+			$so_query = "select * from vtiger_soproductrel where productid=".$return_id;
+			$result = $adb->query($so_query);
+			$num_rows = $adb->num_rows($result);
+			for($i=0; $i< $num_rows; $i++)
+			{
+				$so_id = $adb->query_result($result,$i,"salesorderid");
+				$qty = $adb->query_result($result,$i,"quantity");
+				$listprice = $adb->query_result($result,$i,"listprice");
+				$prod_total = $qty * $listprice;
+				//Handle here -- Tax calculations
+
+				//Get the current sub total from Quotes and update it with the new subtotal
+				updateSubTotal("SalesOrder","vtiger_salesorder","subtotal","total","salesorderid",$so_id,$prod_total);
+			}
+			//delete the relation from so product rel
+			$del_query = "delete from vtiger_soproductrel where productid=".$return_id." and salesorderid=".$record;
+			$adb->query($del_query);
+
+		}
+		*/
+	break;
+	case Quotes:	
+		if($return_module == "Accounts" )
+		{
+			$focus->mark_deleted($record);
+		}
+		elseif($return_module == "Potentials")
+		{
+			$relation_query = "UPDATE vtiger_quotes set potentialid='' where quoteid=".$record;
+			$adb->query($relation_query);
+		}
+		elseif($return_module == "Contacts")
+		{
+			$relation_query = "UPDATE vtiger_quotes set contactid='' where quoteid=".$record;
+			$adb->query($relation_query);
+		}
+		//Following condition is commented because in Product Relatedlist we have Quotes which should not be deleted.
+		/*
+		elseif($return_module == "Products")
+		{
+			//Removing the relation from the vtiger_quotes product rel
+			$qt_query = "select * from vtiger_quotesproductrel where productid=".$return_id;
+			$result = $adb->query($qt_query);
+			$num_rows = $adb->num_rows($result);
+			for($i=0; $i< $num_rows; $i++)
+			{
+				$quote_id = $adb->query_result($result,$i,"quoteid");
+				$qty = $adb->query_result($result,$i,"quantity");
+				$listprice = $adb->query_result($result,$i,"listprice");
+				$prod_total = $qty * $listprice;
+				//Handle here -- Tax calculation
+
+				//Get the current sub total from Quotes and update it with the new subtotal
+				updateSubTotal("Quotes","vtiger_quotes","subtotal","total","quoteid",$quote_id,$prod_total);
+			}
+			//delete the relation from vtiger_quotes product rel
+			$del_query = "delete from vtiger_quotesproductrel where productid=".$return_id." and quoteid=".$record;
+			$adb->query($del_query);
+
+		}
+		*/
+	break;
 	case Invoice:
 		if($return_module == "Accounts")
 		{
@@ -104,6 +280,8 @@
 			$relation_query = "UPDATE vtiger_invoice set salesorderid='' where invoiceid=".$record;
 			$adb->query($relation_query);
 		}
+		//Following condition is commented because in Product Relatedlist we have Invoice which should not be deleted.
+		/*
 		elseif($return_module=="Products")
 		{
 			//Removing the relation from the vtiger_quotes product rel
@@ -116,188 +294,38 @@
 				$qty = $adb->query_result($result,$i,"quantity");
 				$listprice = $adb->query_result($result,$i,"listprice");
 				$prod_total = $qty * $listprice;
+				//Handle here -- tax calculations should be handle here
 
 				//Get the current sub total from Quotes and update it with the new subtotal
-				updateSubTotal("Invoices","invoice","subtotal","total","invoiceid",$invoice_id,$prod_total);
+				updateSubTotal("Invoices","vtiger_invoice","subtotal","total","invoiceid",$invoice_id,$prod_total);
 			}
 			//delete the relation from vtiger_quotes product rel
 			$del_query = "delete from vtiger_invoiceproductrel where productid=".$return_id." and invoiceid=".$record;
 			$adb->query($del_query);
 		}
-	break;
-	case Leads:
-		$sql = 'delete from vtiger_seactivityrel where crmid = '.$record.' and activityid = '.$return_id;
-		$adb->query($sql);
-	break;
-	case Notes:
-		if($return_module== 'Contacts')
-		{
-			$sql = 'update vtiger_notes set contact_id = 0 where notesid = '.$record;
-			$adb->query($sql);
-		}
-		$sql = 'delete from vtiger_senotesrel where notesid = '.$record. ' and crmid = '.$return_id;
-		$adb->query($sql);
-
-	break;
-	case Potentials:
-		if($return_module == 'Accounts')
-		{
-			$sql = 'update vtiger_crmentity set deleted = 1 where crmid = '.$record;
-			$adb->query($sql);
-		}
-		$sql ='delete from vtiger_seactivityrel where crmid = '.$record.' and activityid = '.$return_id;
-		$adb->query($sql);
-	break;
-	case Products:
-		if($record != '' && $return_id != '')
-		{
-			if($return_module == 'Activities')
-				$sql = 'delete from vtiger_seactivityrel where crmid = '.$record.' and activityid = '.$return_id;
-
-			if($return_module == 'Potentials' || $return_module == 'Accounts' || $return_module == 'Leads')
-				$sql = 'delete from vtiger_seproductsrel where crmid = '.$return_id.' and productid = '.$record;
-
-			$adb->query($sql);
-		}
-		if($return_module == "Contacts")
-		{
-			$sql = "UPDATE vtiger_products set contactid = '' where productid = ".$record;
-			$adb->query($sql);
-		}
-	break;
-	case PurchaseOrder:
-
-		if($return_module == "Accounts")
-		{
-			$focus->mark_deleted($record);
-		}
-		elseif($return_module == "Vendors")
-		{
-			$sql_req ='DELETE from vtiger_purchaseorder where purchaseorderid= '.$record;
-			$adb->query($sql_req);
-		}
-		elseif($return_module == "Products")
-		{
-			//Removing the relation from the po product rel
-			$po_query = "select * from vtiger_poproductrel where productid=".$return_id;
-			$result = $adb->query($po_query);
-			$num_rows = $adb->num_rows($result);
-			for($i=0; $i< $num_rows; $i++)
-			{
-				$po_id = $adb->query_result($result,$i,"purchaseorderid");
-				$qty = $adb->query_result($result,$i,"quantity");
-				$listprice = $adb->query_result($result,$i,"listprice");
-				$prod_total = $qty * $listprice;
-				//Get the current sub total from Quotes and update it with the new subtotal
-				updateSubTotal("PurchaseOrder","purchaseorder","subtotal","total","purchaseorderid",$po_id,$prod_total);
-			}
-			//delete the relation from po product rel
-			$del_query = "delete from vtiger_poproductrel where productid=".$return_id." and purchaseorderid=".$record;
-			$adb->query($del_query);
-
-		}
-		elseif($return_module == "Contacts")
-		{
-			$sql_req ='UPDATE vtiger_purchaseorder set contactid="" where purchaseorderid = '.$record;
-			$adb->query($sql_req);
-		}
-	break;
-	case Quotes:	
-		if($return_module == "Accounts" )
-		{
-			$focus->mark_deleted($record);
-		}
-		elseif($return_module == "Potentials")
-		{
-			$relation_query = "UPDATE vtiger_quotes set potentialid='' where quoteid=".$record;
-			$adb->query($relation_query);
-		}
-		elseif($return_module == "Contacts")
-		{
-			$relation_query = "UPDATE vtiger_quotes set contactid='' where quoteid=".$record;
-			$adb->query($relation_query);
-		}
-		elseif($return_module == "Products")
-		{
-			//Removing the relation from the vtiger_quotes product rel
-			$qt_query = "select * from vtiger_quotesproductrel where productid=".$return_id;
-			$result = $adb->query($qt_query);
-			$num_rows = $adb->num_rows($result);
-			for($i=0; $i< $num_rows; $i++)
-			{
-				$quote_id = $adb->query_result($result,$i,"quoteid");
-				$qty = $adb->query_result($result,$i,"quantity");
-				$listprice = $adb->query_result($result,$i,"listprice");
-				$prod_total = $qty * $listprice;
-
-				//Get the current sub total from Quotes and update it with the new subtotal
-				updateSubTotal("Quotes","quotes","subtotal","total","quoteid",$quote_id,$prod_total);
-			}
-			//delete the relation from vtiger_quotes product rel
-			$del_query = "delete from vtiger_quotesproductrel where productid=".$return_id." and quoteid=".$record;
-			$adb->query($del_query);
-
-		}
-	case SalesOrder:
-		if($return_module == "Accounts")
-		{
-			$focus->mark_deleted($record);
-		}
-		elseif($return_module == "Quotes")
-		{
-			$relation_query = "UPDATE vtiger_salesorder set quoteid='' where salesorderid=".$record;
-			$adb->query($relation_query);
-		}
-		elseif($return_module == "Potentials")
-		{
-			$relation_query = "UPDATE vtiger_salesorder set potentialid='' where salesorderid=".$record;
-			$adb->query($relation_query);
-		}
-		elseif($return_module == "Contacts")
-		{
-			$relation_query = "UPDATE vtiger_salesorder set contactid='' where salesorderid=".$record;
-			$adb->query($relation_query);
-		}
-		elseif($return_module == "Products")
-		{
-			//Removing the relation from the so product rel
-			$so_query = "select * from vtiger_soproductrel where productid=".$return_id;
-			$result = $adb->query($so_query);
-			$num_rows = $adb->num_rows($result);
-			for($i=0; $i< $num_rows; $i++)
-			{
-				$so_id = $adb->query_result($result,$i,"salesorderid");
-				$qty = $adb->query_result($result,$i,"quantity");
-				$listprice = $adb->query_result($result,$i,"listprice");
-				$prod_total = $qty * $listprice;
-
-				//Get the current sub total from Quotes and update it with the new subtotal
-				updateSubTotal("SalesOrder","salesorder","subtotal","total","salesorderid",$so_id,$prod_total);
-			}
-			//delete the relation from so product rel
-			$del_query = "delete from vtiger_soproductrel where productid=".$return_id." and salesorderid=".$record;
-			$adb->query($del_query);
-
-		}
-	break;
-		case Rss:
-			$del_query = "delete from vtiger_rss where rssid=".$record;
-			$adb->query($del_query);
-	break;
-		case Portal:
-			$del_query = "delete from vtiger_portal where portalid=".$record;
-			$adb->query($del_query);
+		*/
+	break;
+	case Rss:
+		$del_query = "delete from vtiger_rss where rssid=".$record;
+		$adb->query($del_query);
+	break;
+	case Portal:
+		$del_query = "delete from vtiger_portal where portalid=".$record;
+		$adb->query($del_query);
 	break;
 	endswitch;
-	
+	}
+
+	//this is added to update the crmentity.deleted=1 when we delete from listview and not from relatedlist
 	if($return_module == $module && $return_module !='Rss' && $return_module !='Portal')
 	{	
-		global $current_user;
 		require_once('include/freetag/freetag.class.php');
 		$freetag=new freetag();
 		$freetag->delete_all_object_tags_for_user($current_user->id,$record);
 		$focus->mark_deleted($record);
 	}
+
+	//This is to delete the entity information from tracker ie., lastviewed 
 	if($module != 'Faq')
 	{	
 		$sql_recentviewed ='delete from vtiger_tracker where user_id = '.$current_user->id.' and item_id = '.$record;

Modified: vtigercrm/trunk/include/utils/ListViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/ListViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/ListViewUtils.php Mon Jun 19 04:18:18 2006
@@ -741,8 +741,12 @@
 		$edit_link = getListViewEditLink($module,$entity_id,$relatedlist,$returnset);
 		$del_link = getListViewDeleteLink($module,$entity_id,$relatedlist,$returnset);
 
-		$list_header[] = "<a href=\"$edit_link\"> &nbsp;".$app_strings["LNK_EDIT"]." </a> | 
-				  <a href=\"javascript:;\" onclick=confirmdelete(\"$del_link\")> ".$app_strings["LNK_DELETE"]." </a>";
+		$links_info = "<a href=\"$edit_link\"> &nbsp;".$app_strings["LNK_EDIT"]." </a> ";
+		if($del_link != '')
+			$links_info .=	" | <a href=\"javascript:;\" onclick=confirmdelete(\"$del_link\")> ".$app_strings["LNK_DELETE"]." </a>";
+
+		$list_header[] = $links_info;
+
 		echo '<script>
 				function confirmdelete(url)
 		                {
@@ -2665,6 +2669,16 @@
  */
 function getListViewDeleteLink($module,$entity_id,$relatedlist,$returnset)
 {
+	$current_module = $_REQUEST['module'];
+
+	//This is added to avoid the del link in Product related list for the following modules
+	$avoid_del_links = Array("PurchaseOrder","SalesOrder","Quotes","Invoice");
+
+	if($current_module == 'Products' && in_array($module,$avoid_del_links))
+	{
+		return '';
+	}
+
 	$del_link = "index.php?module=$module&action=Delete&record=$entity_id";
 
 	//This is added for relatedlist listview




From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 19 06:27:25 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 19 Jun 2006 10:27:25 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231245=3A?=
 =?utf-8?q?_edit_and_del_links_are_not_exist_in_listview_and_relatedlists?=
In-Reply-To: <076.4ddff9b4349d2a2ad1f3163458b73b34@vtiger.fosslabs.com>
References: <076.4ddff9b4349d2a2ad1f3163458b73b34@vtiger.fosslabs.com>
Message-ID: <085.ffe2fce9ca560f97fd3da6d62281eb2e@vtiger.fosslabs.com>

#1245: edit and del links are not exist in listview and relatedlists
------------------------+---------------------------------------------------
  Reporter:  mickie     |       Owner:  mickie
      Type:  defect     |      Status:  closed
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mickie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 This issue has been fixed as edit and delete links are provided in
 ListView and RelatedList where as in listview if we delete the entity then
 the entity will be deleted and in relatedlist if we click on delete link
 then the relationship will be deleted and the entity will be remained.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1245>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 19 06:55:54 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 19 Jun 2006 10:55:54 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7259 -
	/vtigercrm/trunk/data/CRMEntity.php
Message-ID: <20060619105555.4415783F126@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 19 04:55:51 2006
New Revision: 7259

Log:
* Modified to handle the comments information save using Ajax edit where as previously when we save using ajax (from detailview) it wont save because in this case the request value is empty

Modified:
    vtigercrm/trunk/data/CRMEntity.php

Modified: vtigercrm/trunk/data/CRMEntity.php
==============================================================================
--- vtigercrm/trunk/data/CRMEntity.php (original)
+++ vtigercrm/trunk/data/CRMEntity.php Mon Jun 19 04:55:51 2006
@@ -905,9 +905,14 @@
 	else
 		$ownertype = 'customer';
 
-	if($_REQUEST['comments'] != '')
-	{
-		$comment = addslashes($_REQUEST['comments']);
+	if($this->column_fields['comments'] != '')
+		$comment = $this->column_fields['comments'];
+	else
+		$comment = $_REQUEST['comments'];
+
+	if($comment != '')
+	{
+		$comment = addslashes($comment);
 		$sql = "insert into vtiger_ticketcomments values('',".$this->id.",'".$comment."','".$current_user->id."','".$ownertype."','".$current_time."')";
 	        $adb->query($sql);
 	}




From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 19 06:56:40 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 19 Jun 2006 10:56:40 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231244=3A?=
 =?utf-8?q?_Support_=3E_HelpDesk_-_Ticket_Comments?=
In-Reply-To: <076.37c737bcf82ff17f40eb1ca85dac14f6@vtiger.fosslabs.com>
References: <076.37c737bcf82ff17f40eb1ca85dac14f6@vtiger.fosslabs.com>
Message-ID: <085.bf0b38ae2ed5635cf6c8803840483232@vtiger.fosslabs.com>

#1244: Support > HelpDesk - Ticket Comments
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  mickie
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mickie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 This issue is fixed.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1244>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 19 07:10:26 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 19 Jun 2006 11:10:26 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7260 -
 /vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
Message-ID: <20060619111027.5187F2B7C92@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 19 05:10:22 2006
New Revision: 7260

Log:
hour_format,end_hour and start_hour fields have been included in field table for user

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

Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original)
+++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Mon Jun 19 05:10:22 2006
@@ -855,6 +855,9 @@
 $this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'activity_view','vtiger_users',1,'15','activity_view','Default Activity View',1,0,0,100,13,79,1,'V~O',1,null,'BAS')");
 $this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'lead_view','vtiger_users',1,'15','lead_view','Default Lead View',1,0,0,100,12,79,1,'V~O',1,null,'BAS')");
 $this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'currency_id','vtiger_users',1,'116','currency_id','Currency',1,0,0,100,11,79,1,'I~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'hour_format','vtiger_users',1,'116','hour_format','Calendar Hour Format',1,0,0,100,13,79,3,'I~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'end_hour','vtiger_users',1,'116','end_hour','Day ends at',1,0,0,100,15,79,3,'I~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'start_hour','vtiger_users',1,'116','start_hour','Day starts at',1,0,0,100,14,79,3,'I~O',1,null,'BAS')");
 $this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'title','vtiger_users',1,'1','title','Title',1,0,0,50,1,80,1,'V~O',1,null,'BAS')");
 $this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'phone_work','vtiger_users',1,'1','phone_work','Office Phone',1,0,0,50,2,80,1,'V~O',1,null,'BAS')");
 $this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'department','vtiger_users',1,'1','department','Department',1,0,0,50,3,80,1,'V~O',1,null,'BAS')");




From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 19 07:12:40 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 19 Jun 2006 11:12:40 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7261 -
	/vtigercrm/trunk/install/5createTables.inc.php
Message-ID: <20060619111240.5CA765CE174@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 19 05:12:35 2006
New Revision: 7261

Log:
default data has been given for hour_format,start_hour and end_hour

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 Jun 19 05:12:35 2006
@@ -79,6 +79,9 @@
         $user->column_fields["namedays"] = '';
         $user->column_fields["currency_id"] = 1;
 	$user->column_fields["date_format"] = 'yyyy-mm-dd';
+	$user->column_fields["hour_format"] = 'am/pm';
+	$user->column_fields["start_hour"] = '08:00';
+	$user->column_fields["end_hour"] = '23:00';
 	// added by jeri to populate default image and tagcloud for admin	
 	$user->column_fields["imagename"] = 'shanky.jpg';
         $user->column_fields["tagcloud"] = '';	




From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 19 07:13:48 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 19 Jun 2006 11:13:48 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231257=3A?=
 =?utf-8?q?_calender-_time_display_should_start_earlier_instead_of_10=2E00?=
 =?utf-8?q?_am?=
In-Reply-To: <076.d27bacbd23f52c8c928d56ba5872fc60@vtiger.fosslabs.com>
References: <076.d27bacbd23f52c8c928d56ba5872fc60@vtiger.fosslabs.com>
Message-ID: <085.4ceca578fc97e34b243058e50ca31173@vtiger.fosslabs.com>

#1257: calender- time display should start earlier instead of 10.00 am
--------------------------+-------------------------------------------------
  Reporter:  ftc          |       Owner:  mangai
      Type:  enhancement  |      Status:  closed
  Priority:  major        |   Milestone:        
 Component:  vtigercrm    |     Version:  5.0.0 
Resolution:  fixed        |    Keywords:        
--------------------------+-------------------------------------------------
Changes (by mangai):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 fixed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1257>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 19 07:19:25 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 19 Jun 2006 11:19:25 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231342=3A?=
	=?utf-8?b?IFtVTktd?=
Message-ID: <076.97f27bff752ea9480bafe55e13c1a680@vtiger.fosslabs.com>

#1342: [UNK]
-------------------------------+--------------------------------------------
 Reporter:  buy adipex online  |       Owner:  developer
     Type:                     |      Status:  new      
 Priority:                     |   Milestone:           
Component:                     |     Version:           
 Keywords:  [UNK]              |  
-------------------------------+--------------------------------------------
 <a href="http://gvm.bitacoras.com/order-adipex.html ">order adipex</a>

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1342>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 19 09:58:35 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 19 Jun 2006 13:58:35 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7262 -
 /vtigercrm/trunk/modules/Settings/CreateCustomField.php
Message-ID: <20060619135835.01EA783F166@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 19 07:58:32 2006
New Revision: 7262

Log:
changes made to fix the issue 1118

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

Modified: vtigercrm/trunk/modules/Settings/CreateCustomField.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/CreateCustomField.php (original)
+++ vtigercrm/trunk/modules/Settings/CreateCustomField.php Mon Jun 19 07:58:32 2006
@@ -21,6 +21,10 @@
 
 $tabid=$_REQUEST['tabid'];
 $fieldid=$_REQUEST['fieldid'];
+if(isset($_REQUEST['uitype']) && $_REQUEST['uitype'] != '')
+	$uitype=$_REQUEST['uitype'];
+else
+	$uitype=1;
 $readonly = '';
 $smarty = new vtigerCRM_Smarty;
 $cfimagecombo = Array($image_path."text.gif",
@@ -55,7 +59,7 @@
 	$customfield_columnname=getCustomFieldData($tabid,$fieldid,'columnname');
 	$customfield_typeofdata=getCustomFieldData($tabid,$fieldid,'typeofdata');
 	$customfield_fieldlabel=getCustomFieldData($tabid,$fieldid,'fieldlabel');
-	$customfield_typename=getCustomFieldTypeName($_REQUEST['uitype']);
+	$customfield_typename=getCustomFieldTypeName($uitype);
 	$fieldtype_lengthvalue=getFldTypeandLengthValue($customfield_typename,$customfield_typeofdata);
 	list($fieldtype,$fieldlength,$decimalvalue)= explode(";",$fieldtype_lengthvalue);
 	$readonly = "readonly";
@@ -141,8 +145,43 @@
 						<tr>
 							<td class="dataLabel" nowrap="nowrap" align="right"><b>'.$mod_strings['LBL_LABEL'].' </b></td>
 							<td align="left"><input name="fldLabel" value="'.$customfield_fieldlabel.'" type="text" class="txtBox"></td>
-						</tr>
-						<tr id="lengthdetails">
+						</tr>';
+					if($mode == 'edit')
+					{
+						switch($uitype)
+						{
+							case 1:
+								$output .= '<tr id="lengthdetails">
+									<td class="dataLabel" nowrap="nowrap" align="right"><b>'.$mod_strings['LBL_LENGTH'].'</b></td>
+									<td align="left"><input type="text" name="fldLength" value="'.$fieldlength.'" '.$readonly.' class="txtBox"></td>
+								</tr>';
+								break;
+							case 71:
+							case 9:
+							case 7:
+								$output .= '<tr id="lengthdetails">
+									<td class="dataLabel" nowrap="nowrap" align="right"><b>'.$mod_strings['LBL_LENGTH'].'</b></td>
+									<td align="left"><input type="text" name="fldLength" value="'.$fieldlength.'" '.$readonly.' class="txtBox"></td>
+								</tr>';
+								$output .= '<tr id="decimaldetails">
+									<td class="dataLabel" nowrap="nowrap" align="right"><b>'.$mod_strings['LBL_DECIMAL_PLACES'].'</b></td>
+									<td align="left"><input type="text" name="fldDecimal" value="'.$decimalvalue.'" '.$readonly.' class="txtBox"></td>
+								</tr>';
+								break;
+							case 33:
+							case 15:
+								$output .= '<tr id="picklist">
+									<td class="dataLabel" nowrap="nowrap" align="right" valign="top"><b>'.$mod_strings['LBL_PICK_LIST_VALUES'].'</b></td>
+									<td align="left" valign="top"><textarea name="fldPickList" rows="10" class="txtBox" '.$readonly.'>'.$fldVal.'</textarea></td>
+									<!--td style="padding-left:10px"><img src="themes/Aqua/images/picklist_hint.gif"/></td-->
+								</tr>';
+								break;
+								
+						}
+					}
+					else
+					{
+						$output .= '<tr id="lengthdetails">
 							<td class="dataLabel" nowrap="nowrap" align="right"><b>'.$mod_strings['LBL_LENGTH'].'</b></td>
 							<td align="left"><input type="text" name="fldLength" value="'.$fieldlength.'" '.$readonly.' class="txtBox"></td>
 						</tr>
@@ -154,7 +193,9 @@
 							<td class="dataLabel" nowrap="nowrap" align="right" valign="top"><b>'.$mod_strings['LBL_PICK_LIST_VALUES'].'</b></td>
 							<td align="left" valign="top"><textarea name="fldPickList" rows="10" class="txtBox" '.$readonly.'>'.$fldVal.'</textarea></td>
 							<!--td style="padding-left:10px"><img src="themes/Aqua/images/picklist_hint.gif"/></td-->
-						</tr>
+						</tr>';
+					}
+				$output .= '	
 					</table>
 				</td>
 			</tr>




From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 19 10:01:09 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 19 Jun 2006 14:01:09 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7263 -
	/vtigercrm/trunk/include/CustomFieldUtil.php
Message-ID: <20060619140109.77E0783F1C6@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 19 08:01:05 2006
New Revision: 7263

Log:
changes made to fix the issue 1118

Modified:
    vtigercrm/trunk/include/CustomFieldUtil.php

Modified: vtigercrm/trunk/include/CustomFieldUtil.php
==============================================================================
--- vtigercrm/trunk/include/CustomFieldUtil.php (original)
+++ vtigercrm/trunk/include/CustomFieldUtil.php Mon Jun 19 08:01:05 2006
@@ -37,10 +37,6 @@
 	{
 		$fldname = 'Percent';
 	}
-	elseif($uitype == 3)
-	{
-		$fldname = 'Currency';
-	}
 	elseif($uitype == 5)
 	{
 		$fldname = 'Date';
@@ -185,7 +181,7 @@
 	{
 		$types = explode("~",$typeofdata);
 		$data_decimal = explode(",",$types[2]);
-		$data_array=array('3',$data_decimal);
+		$data_array=array('71',$data_decimal[0],$data_decimal[1]);
 		$fieldtype = implode(";",$data_array);
 	}
 	elseif($label == 'Date')




From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 19 10:03:25 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 19 Jun 2006 14:03:25 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231118=3A?=
	=?utf-8?q?_issue_in_custom_field?=
In-Reply-To: <076.b7ca86dba4ffe927aca5a0856f25df73@vtiger.fosslabs.com>
References: <076.b7ca86dba4ffe927aca5a0856f25df73@vtiger.fosslabs.com>
Message-ID: <085.fd7805328dfd5f5d80ea3fcc368cf29f@vtiger.fosslabs.com>

#1118: issue in custom field
------------------------+---------------------------------------------------
  Reporter:  mangai     |       Owner:  mangai
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mangai):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 fixed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1118>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 19 10:27:35 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 19 Jun 2006 14:27:35 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23901=3A_?=
 =?utf-8?q?module_and_picklist_mismatch?=
In-Reply-To: <076.4ab5d2daa3e1fd4b360860bc41a84b82@vtiger.fosslabs.com>
References: <076.4ab5d2daa3e1fd4b360860bc41a84b82@vtiger.fosslabs.com>
Message-ID: <085.6ed80e13ab7cda3e5c83f5f335a75117@vtiger.fosslabs.com>

#901: module and picklist mismatch
------------------------+---------------------------------------------------
  Reporter:  mangai     |       Owner:  mangai
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mangai):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 fixed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/901>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 19 11:01:11 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 19 Jun 2006 15:01:11 -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.9231d8dbce18c5bb42c94e051d929bc3@vtiger.fosslabs.com>

#727: Tab order is wrong
-------------------------+--------------------------------------------------
  Reporter:  OnwealdTim  |       Owner:  philip      
      Type:  defect      |      Status:  closed      
  Priority:  critical    |   Milestone:  5.0.0       
 Component:  vtigercrm   |     Version:  5.0.0       
Resolution:  fixed       |    Keywords:  ui tab order
-------------------------+--------------------------------------------------
Changes (by saraj):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 (In [7264]) Changes made to have logical cursor crawling in the form
 fields. Fixes #727 and #78, and refs #78 and #727.

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/727>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 19 11:01:12 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 19 Jun 2006 15:01:12 -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.6d3cc3264c50fdc9e792db64b985b4d0@vtiger.fosslabs.com>

#78: Input tab field order for contacts
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  philip
      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 [7264]) Changes made to have logical cursor crawling in the form
 fields. Fixes #727 and #78, and refs #78 and #727.

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/78>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 19 11:01:13 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 19 Jun 2006 15:01:13 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7264 - in /vtigercrm/trunk:
 Smarty/templates/DisplayFields.tpl include/utils/CommonUtils.php
Message-ID: <20060619150113.8619583F1EF@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 19 09:01:04 2006
New Revision: 7264

Log:
Changes made to have logical cursor crawling in the form fields. Fixes #727 and #78, and refs #78 and #727.

Modified:
    vtigercrm/trunk/Smarty/templates/DisplayFields.tpl
    vtigercrm/trunk/include/utils/CommonUtils.php

Modified: vtigercrm/trunk/Smarty/templates/DisplayFields.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DisplayFields.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DisplayFields.tpl Mon Jun 19 09:01:04 2006
@@ -28,25 +28,26 @@
 		{assign var="fldvalue" value="$maindata[3][0]"}
 		{assign var="secondvalue" value="$maindata[3][1]"}
 		{assign var="thirdvalue" value="$maindata[3][2]"}
+		{assign var="vt_tab" value="$maindata[4][0]"}
 
 		{if $uitype eq 2}
 			<td width=20% class="dvtCellLabel" align=right>
 				<font color="red">*</font>{$fldlabel}
 			</td>
 			<td width=30% align=left class="dvtCellInfo">
-				<input type="text" name="{$fldname}" value="{$fldvalue}" class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'">
+				<input type="text" name="{$fldname}" tabindex="{$vt_tab}" value="{$fldvalue}" tabindex="{$vt_tab}" class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'">
 			</td>
 		{elseif $uitype eq 11 || $uitype eq 1 || $uitype eq 13 || $uitype eq 7 || $uitype eq 9}
 			<td width=20% class="dvtCellLabel" align=right>{$fldlabel}</td>
 
 			{if $fldname eq 'tickersymbol' && $MODULE eq 'Accounts'}
 				<td width=30% align=left class="dvtCellInfo">
-					<input type="text" name="{$fldname}" id ="{$fldname}" value="{$fldvalue}" class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn';" onBlur="this.className='detailedViewTextBox';{if $fldname eq 'tickersymbol' && $MODULE eq 'Accounts'}sensex_info(){/if}">
+					<input type="text" name="{$fldname}" tabindex="{$vt_tab}" id ="{$fldname}" value="{$fldvalue}" class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn';" onBlur="this.className='detailedViewTextBox';{if $fldname eq 'tickersymbol' && $MODULE eq 'Accounts'}sensex_info(){/if}">
 					<span id="vtbusy_info" style="display:none;">
 						<img src="themes/blue/images/vtbusy.gif" border="0"></span>
 				</td>
 			{else}
-				<td width=30% align=left class="dvtCellInfo"><input type="text" name="{$fldname}" id ="{$fldname}" value="{$fldvalue}" class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'"></td>
+				<td width=30% align=left class="dvtCellInfo"><input type="text" tabindex="{$vt_tab}" name="{$fldname}" id ="{$fldname}" value="{$fldvalue}" class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'"></td>
 			{/if}
 		{elseif $uitype eq 19 || $uitype eq 20}
 			<!-- In Add Comment are we should not display anything -->
@@ -60,7 +61,7 @@
 				{$fldlabel}
 			</td>
 			<td colspan=3>
-				<textarea class="detailedViewTextBox" onFocus="this.className='detailedViewTextBoxOn'" name="{$fldname}"  onBlur="this.className='detailedViewTextBox'" cols="90" rows="8">{$fldvalue}</textarea>
+				<textarea class="detailedViewTextBox" tabindex="{$vt_tab}" onFocus="this.className='detailedViewTextBoxOn'" name="{$fldname}"  onBlur="this.className='detailedViewTextBox'" cols="90" rows="8">{$fldvalue}</textarea>
 			</td>
 		{elseif $uitype eq 21 || $uitype eq 24}
 			<td width=20% class="dvtCellLabel" align=right>
@@ -70,7 +71,7 @@
 				{$fldlabel}
 			</td>
 			<td width=30% align=left class="dvtCellInfo">
-				<textarea value="{$fldvalue}" name="{$fldname}"  class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" rows=2>{$fldvalue}</textarea>
+				<textarea value="{$fldvalue}" name="{$fldname}" tabindex="{$vt_tab}" class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" rows=2>{$fldvalue}</textarea>
 			</td>
 		{elseif $uitype eq 15 || $uitype eq 16}
 			<td width="20%" class="dvtCellLabel" align=right>
@@ -80,7 +81,7 @@
 				{$fldlabel}
 			</td>
 			<td width="30%" align=left class="dvtCellInfo">
-			   <select name="{$fldname}">
+			   <select name="{$fldname}" tabindex="{$vt_tab}" >
 				{foreach item=arr from=$fldvalue}
 					{foreach key=sel_value item=value from=$arr}
 						<option value="{$sel_value}" {$value}>{$sel_value}</option>
@@ -93,7 +94,7 @@
 				{$fldlabel}
 			</td>
 			<td width="30%" align=left class="dvtCellInfo">
-			   <select MULTIPLE name="{$fldname}[]" size="2">
+			   <select MULTIPLE name="{$fldname}[]" size="2" tabindex="{$vt_tab}" >
 				{foreach item=arr from=$fldvalue}
 					{foreach key=sel_value item=value from=$arr}
 						<option value="{$sel_value}" {$value}>{$sel_value}</option>
@@ -128,7 +129,7 @@
 					{assign var=style_group value='display:block'}
 				{/if}
 
-				<input type="radio" name="assigntype" {$select_user} value="U" onclick="toggleAssignType(this.value)">&nbsp;User
+				<input type="radio" tabindex="{$vt_tab}" name="assigntype" {$select_user} value="U" onclick="toggleAssignType(this.value)">&nbsp;User
 
 				{if $secondvalue neq ''}
 					<input type="radio" name="assigntype" {$select_group} value="T" onclick="toggleAssignType(this.value)">&nbsp;Group
@@ -163,9 +164,9 @@
 				{if $uitype eq 52}
 					<select name="assigned_user_id">
 				{elseif $uitype eq 77}
-					<select name="assigned_user_id1">
-				{else}
-					<select name="{$fldname}">
+					<select name="assigned_user_id1" tabindex="{$vt_tab}" >
+				{else}
+					<select name="{$fldname}" tabindex="{$vt_tab}" >
 				{/if}
 
 				{foreach key=key_one item=arr from=$fldvalue}
@@ -185,7 +186,7 @@
 				{$fldlabel}
 			</td>
 			<td width="30%" align=left class="dvtCellInfo">
-				<input readonly name="account_name" style="border:1px solid #bababa;" type="text" value="{$fldvalue}"><input name="{$fldname}" type="hidden" value="{$secondvalue}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Accounts&action=Popup&popuptype={$popuptype}&form=TasksEditView&form_submit=false","test","width=640,height=565,resizable=0,scrollbars=0");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.account_id.value=''; this.form.account_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
+				<input readonly name="account_name" style="border:1px solid #bababa;" type="text" value="{$fldvalue}"><input name="{$fldname}" type="hidden" value="{$secondvalue}">&nbsp;<img tabindex="{$vt_tab}" src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Accounts&action=Popup&popuptype={$popuptype}&form=TasksEditView&form_submit=false","test","width=640,height=565,resizable=0,scrollbars=0");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.account_id.value=''; this.form.account_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
 			</td>
 
 		{elseif $uitype eq 50}
@@ -215,7 +216,7 @@
 			<td width="30%" align=left class="dvtCellInfo">
 				<input name="vendor_name" readonly type="text" style="border:1px solid #bababa;" value="{$fldvalue}"><input name="{$fldname}" type="hidden" value="{$secondvalue}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Vendors&action=Popup&html=Popup_picker&popuptype={$pop_type}&form=EditView","test","width=640,height=565,resizable=0,scrollbars=0");' align="absmiddle" style='cursor:hand;cursor:pointer'>
 				{if $uitype eq 75}
-					&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.vendor_id.value='';this.form.vendor_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
+					&nbsp;<input type="image" tabindex="{$vt_tab}" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.vendor_id.value='';this.form.vendor_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
 				{/if}
 			</td>
 		{elseif $uitype eq 57}
@@ -223,7 +224,7 @@
 				{$fldlabel}
 			</td>
 			<td width="30%" align=left class="dvtCellInfo">
-				<input name="contact_name" readonly type="text" style="border:1px solid #bababa;" value="{$fldvalue}"><input name="{$fldname}" type="hidden" value="{$secondvalue}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Contacts&action=Popup&html=Popup_picker&popuptype=specific&form=EditView","test","width=640,height=565,resizable=0,scrollbars=0");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.contact_id.value=''; this.form.contact_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
+				<input name="contact_name" readonly type="text" style="border:1px solid #bababa;" value="{$fldvalue}"><input name="{$fldname}" type="hidden" value="{$secondvalue}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Contacts&action=Popup&html=Popup_picker&popuptype=specific&form=EditView","test","width=640,height=565,resizable=0,scrollbars=0");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" tabindex="{$vt_tab}" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.contact_id.value=''; this.form.contact_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
 			</td>
 		
 		{elseif $uitype eq 58}
@@ -231,7 +232,7 @@
 				{$fldlabel}
 			</td>
 			<td width="30%" align=left class="dvtCellInfo">
-				<input name="campaignname" readonly type="text" style="border:1px solid #bababa;" value="{$fldvalue}"><input name="{$fldname}" type="hidden" value="{$secondvalue}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Campaigns&action=Popup&html=Popup_picker&popuptype=specific_campaign&form=EditView","test","width=640,height=565,resizable=0,scrollbars=0");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.campaignid.value=''; this.form.campaignname.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
+				<input name="campaignname" readonly type="text" style="border:1px solid #bababa;" value="{$fldvalue}"><input name="{$fldname}" type="hidden" value="{$secondvalue}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Campaigns&action=Popup&html=Popup_picker&popuptype=specific_campaign&form=EditView","test","width=640,height=565,resizable=0,scrollbars=0");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" tabindex="{$vt_tab}" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.campaignid.value=''; this.form.campaignname.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
 			</td>
 
 		{elseif $uitype eq 80}
@@ -239,7 +240,7 @@
 				{$fldlabel}
 			</td>
 			<td width="30%" align=left class="dvtCellInfo">
-				<input name="salesorder_name" readonly type="text" style="border:1px solid #bababa;" value="{$fldvalue}"><input name="{$fldname}" type="hidden" value="{$secondvalue}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=SalesOrder&action=Popup&html=Popup_picker&popuptype=specific&form=EditView","test","width=640,height=565,resizable=0,scrollbars=0");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.salesorder_id.value=''; this.form.salesorder_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
+				<input name="salesorder_name" readonly type="text" style="border:1px solid #bababa;" value="{$fldvalue}"><input name="{$fldname}" type="hidden" value="{$secondvalue}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=SalesOrder&action=Popup&html=Popup_picker&popuptype=specific&form=EditView","test","width=640,height=565,resizable=0,scrollbars=0");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" tabindex="{$vt_tab}" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.salesorder_id.value=''; this.form.salesorder_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
 			</td>
 
 		{elseif $uitype eq 78}
@@ -247,7 +248,7 @@
 				{$fldlabel}
 			</td>
 			<td width="30%" align=left class="dvtCellInfo">
-				<input name="quote_name" readonly type="text" style="border:1px solid #bababa;" value="{$fldvalue}"><input name="{$fldname}" type="hidden" value="{$ID}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Quotes&action=Popup&html=Popup_picker&popuptype=specific&form=EditView","test","width=640,height=565,resizable=0,scrollbars=0");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.quote_id.value=''; this.form.quote_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
+				<input name="quote_name" readonly type="text" style="border:1px solid #bababa;" value="{$fldvalue}"><input name="{$fldname}" type="hidden" value="{$ID}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Quotes&action=Popup&html=Popup_picker&popuptype=specific&form=EditView","test","width=640,height=565,resizable=0,scrollbars=0");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" tabindex="{$vt_tab}" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.quote_id.value=''; this.form.quote_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
 			</td>
 
 		{elseif $uitype eq 76}
@@ -255,7 +256,7 @@
 				{$fldlabel}
 			</td>
 			<td width="30%" align=left class="dvtCellInfo">
-				<input name="potential_name" readonly type="text" style="border:1px solid #bababa;" value="{$fldvalue}"><input name="{$fldname}" type="hidden" value="{$secondvalue}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Potentials&action=Popup&html=Popup_picker&popuptype=specific_potential_account_address&form=EditView","test","width=640,height=565,resizable=0,scrollbars=0");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.potential_id.value=''; this.form.potential_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
+				<input name="potential_name" readonly type="text" style="border:1px solid #bababa;" value="{$fldvalue}"><input name="{$fldname}" type="hidden" value="{$secondvalue}">&nbsp;<img tabindex="{$vt_tab}" src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Potentials&action=Popup&html=Popup_picker&popuptype=specific_potential_account_address&form=EditView","test","width=640,height=565,resizable=0,scrollbars=0");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.potential_id.value=''; this.form.potential_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
 			</td>
 
 		{elseif $uitype eq 17}
@@ -264,7 +265,7 @@
 			</td>
 			<td width="30%" align=left class="dvtCellInfo">
 				&nbsp;&nbsp;http://&nbsp;
-				<input type="text" name="{$fldname}" style="border:1px solid #bababa;" size="27" onFocus="this.className='detailedViewTextBoxOn'"onBlur="this.className='detailedViewTextBox'" value="{$fldvalue}">
+				<input type="text" tabindex="{$vt_tab}" name="{$fldname}" style="border:1px solid #bababa;" size="27" onFocus="this.className='detailedViewTextBoxOn'"onBlur="this.className='detailedViewTextBox'" value="{$fldvalue}">
 			</td>
 
 		{elseif $uitype eq 71 || $uitype eq 72}
@@ -275,7 +276,7 @@
 				{$fldlabel}
 			</td>
 			<td width="30%" align=left class="dvtCellInfo">
-				<input name="{$fldname}" type="text" class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'"  value="{$fldvalue}">
+				<input name="{$fldname}" tabindex="{$vt_tab}" type="text" class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'"  value="{$fldvalue}">
 			</td>
 
 		{elseif $uitype eq 56}
@@ -285,21 +286,21 @@
 			{if $fldname eq 'notime' && $ACTIVITY_MODE eq 'Events'}
 				{if $fldvalue eq 1}
 					<td width="30%" align=left class="dvtCellInfo">
-						<input name="{$fldname}" type="checkbox"  onclick="toggleTime()" checked>
+						<input name="{$fldname}" type="checkbox" tabindex="{$vt_tab}" onclick="toggleTime()" checked>
 					</td>
 				{else}
 					<td width="30%" align=left class="dvtCellInfo">
-						<input name="{$fldname}" type="checkbox" onclick="toggleTime()" >
+						<input name="{$fldname}" tabindex="{$vt_tab}" type="checkbox" onclick="toggleTime()" >
 					</td>
 				{/if}
 			{else}
 				{if $fldvalue eq 1}
 					<td width="30%" align=left class="dvtCellInfo">
-						<input name="{$fldname}" type="checkbox"  checked>
+						<input name="{$fldname}" type="checkbox" tabindex="{$vt_tab}" checked>
 					</td>
 				{else}
 					<td width="30%" align=left class="dvtCellInfo">
-						<input name="{$fldname}" type="checkbox">
+						<input name="{$fldname}" tabindex="{$vt_tab}" type="checkbox">
 					</td>
 				{/if}
 			{/if}
@@ -313,11 +314,11 @@
 					{assign var=time_val value="$time_value"}
 				{/foreach}
 
-				<input name="{$fldname}" id="jscal_field_{$fldname}" type="text" style="border:1px solid #bababa;" size="11" maxlength="10" value="{$date_val}">
+				<input name="{$fldname}" tabindex="{$vt_tab}" id="jscal_field_{$fldname}" type="text" style="border:1px solid #bababa;" size="11" maxlength="10" value="{$date_val}">
 				<img src="{$IMAGE_PATH}calendar.gif" id="jscal_trigger_{$fldname}">
 
 				{if $uitype eq 6}
-					<input name="time_start" style="border:1px solid #bababa;" size="5" maxlength="5" type="text" value="{$time_val}">
+					<input name="time_start" tabindex="{$vt_tab}" style="border:1px solid #bababa;" size="5" maxlength="5" type="text" value="{$time_val}">
 				{/if}
 
 				{foreach key=date_format item=date_str from=$secondvalue}
@@ -345,8 +346,8 @@
 				{$fldlabel}
 			</td>
 			<td width="30%" align=left class="dvtCellInfo">
-				<input name="{$fldname}" type="text" size="2" value="{$fldvalue}">&nbsp;
-				<select name="duration_minutes">
+				<input name="{$fldname}" type="text" size="2" value="{$fldvalue}" tabindex="{$vt_tab}" >&nbsp;
+				<select name="duration_minutes" tabindex="{$vt_tab}" >
 					{foreach key=labelval item=selectval from=$secondvalue}
 						<option value="{$labelval}" {$selectval}>{$labelval}</option>
 					{/foreach}
@@ -363,7 +364,7 @@
 			<td width="30%" align=left class="dvtCellInfo">
 				<input name="{$fldname}" type="hidden" value="{$secondvalue}">
 				<input name="parent_name" readonly type="text" style="border:1px solid #bababa;" value="{$fldvalue}">
-				&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module="+ document.EditView.parent_type.value +"&action=Popup&html=Popup_picker&form=HelpDeskEditView","test","width=640,height=565,resizable=0,scrollbars=0,top=150,left=200");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.parent_id.value=''; this.form.parent_name.value=''; return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
+				&nbsp;<img src="{$IMAGE_PATH}select.gif" tabindex="{$vt_tab}" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module="+ document.EditView.parent_type.value +"&action=Popup&html=Popup_picker&form=HelpDeskEditView","test","width=640,height=565,resizable=0,scrollbars=0,top=150,left=200");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.parent_id.value=''; this.form.parent_name.value=''; return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
 			</td>
 
 		{elseif $uitype eq 357}
@@ -376,7 +377,7 @@
 						<option value="{$labelval}" {$selectval}>{$labelval}</option>
 					{/foreach}
 				</select>
-				&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module="+ document.EditView.parent_type.value +"&action=Popup&html=Popup_picker&form=HelpDeskEditView","test","width=640,height=565,resizable=0,scrollbars=0,top=150,left=200");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.parent_id.value=''; this.form.parent_name.value=''; return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
+				&nbsp;<img tabindex="{$vt_tab}" src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module="+ document.EditView.parent_type.value +"&action=Popup&html=Popup_picker&form=HelpDeskEditView","test","width=640,height=565,resizable=0,scrollbars=0,top=150,left=200");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.parent_id.value=''; this.form.parent_name.value=''; return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
 			</td>
 		   <tr style="height:25px">
 			<td width="20%" class="dvtCellLabel" align=right>CC:&nbsp;</td>	
@@ -395,7 +396,7 @@
 			</td>
 			<td width="30%" align=left class="dvtCellInfo">
 				<input name="{$fldname}" type="hidden" value="{$secondvalue}">
-				<input name="product_name" readonly type="text" value="{$fldvalue}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Products&action=Popup&html=Popup_picker&form=HelpDeskEditView&popuptype=specific","test","width=640,height=565,resizable=0,scrollbars=0,top=150,left=200");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.product_id.value=''; this.form.product_name.value=''; return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
+				<input name="product_name" readonly type="text" value="{$fldvalue}">&nbsp;<img tabindex="{$vt_tab}" src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Products&action=Popup&html=Popup_picker&form=HelpDeskEditView&popuptype=specific","test","width=640,height=565,resizable=0,scrollbars=0,top=150,left=200");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.product_id.value=''; this.form.product_name.value=''; return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
 			</td>
 
 		{elseif $uitype eq 55} 
@@ -408,7 +409,7 @@
 						{/foreach}
 					{/foreach}
 				</select>
-				<input type="text" name="{$fldname}"  class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" value= "{$secondvalue}">
+				<input type="text" name="{$fldname}" tabindex="{$vt_tab}" class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" value= "{$secondvalue}">
 			</td>
 
 		{elseif $uitype eq 22}
@@ -416,7 +417,7 @@
 				<font color="red">*</font>{$fldlabel}
 			</td>
 			<td width="30%" align=left class="dvtCellInfo">
-				<textarea name="{$fldname}" cols="30" rows="2">{$fldvalue}</textarea>
+				<textarea name="{$fldname}" cols="30" tabindex="{$vt_tab}" rows="2">{$fldvalue}</textarea>
 			</td>
 
 		{elseif $uitype eq 69}
@@ -427,7 +428,7 @@
 				{if $MODULE eq 'Products'}
 					<input name="del_file_list" type="hidden" value="">
 					<div id="files_list" style="border: 1px solid grey; width: 500px; padding: 5px; background: rgb(255, 255, 255) none repeat scroll 0%; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial; font-size: x-small">Files Maximum 6
-						<input id="my_file_element" type="file" name="file_1" >
+						<input id="my_file_element" type="file" name="file_1" tabindex="{$vt_tab}" >
 						{assign var=image_count value=0}
 						{if $maindata[3].0.name neq ''}
 						   {foreach name=image_loop key=num item=image_details from=$maindata[3]}
@@ -447,7 +448,7 @@
 						multi_selector.addElement( document.getElementById( 'my_file_element' ) );
 					</script>
 				{else}
-					<input name="{$fldname}"  type="file" value="{$maindata[3].0.name}"/>
+					<input name="{$fldname}"  type="file" value="{$maindata[3].0.name}" tabindex="{$vt_tab}" />
 					<input type="hidden" name="id" value=""/>
 					{$maindata[3].0.name}
 				{/if}
@@ -458,7 +459,7 @@
 				{$fldlabel}
 			</td>
 			<td colspan="3" width="30%" align=left class="dvtCellInfo">
-				<input name="{$fldname}"  type="file" value="{$secondvalue}"/>
+				<input name="{$fldname}"  type="file" value="{$secondvalue}" tabindex="{$vt_tab}" />
 				<input type="hidden" name="id" value=""/>{$fldvalue}
 			</td>
 		{elseif $uitype eq 156}
@@ -472,11 +473,11 @@
 				{/if}	
 				{if $fldvalue eq 'on'}
 					<td width="30%" align=left class="dvtCellInfo">
-						<input name="{$fldname}" {$disable_status} type="checkbox"  checked>
+						<input name="{$fldname}" {$disable_status} tabindex="{$vt_tab}" type="checkbox"  checked>
 					</td>
 				{else}
 					<td width="30%" align=left class="dvtCellInfo">
-						<input name="{$fldname}" {$disable_status} type="checkbox">
+						<input name="{$fldname}" {$disable_status} tabindex="{$vt_tab}" type="checkbox">
 					</td>
 				{/if}
 		{elseif $uitype eq 98}<!-- Role Selection Popup -->		
@@ -486,10 +487,10 @@
 			</td>
 			<td width="30%" align=left class="dvtCellInfo">
 			{if $thirdvalue eq 1}
-				<input name="role_name" id="role_name" class="txtBox" value="{$secondvalue}" type="text">&nbsp;
+				<input name="role_name" id="role_name" class="txtBox" tabindex="{$vt_tab}" value="{$secondvalue}" type="text">&nbsp;
 				<a href="javascript:openPopup();"><img src="{$IMAGE_PATH}select.gif" align="absmiddle" border="0"></a>
 			{else}	
-				<input name="role_name" id="role_name" class="txtBox" readonly value="{$secondvalue}" type="text">&nbsp;
+				<input name="role_name" id="role_name" tabindex="{$vt_tab}" class="txtBox" readonly value="{$secondvalue}" type="text">&nbsp;
 			{/if}	
 			<input name="user_role" id="user_role" value="{$fldvalue}" type="hidden">
 			</td>
@@ -498,14 +499,14 @@
 			 <font color="red">*</font>
 			 {$fldlabel}
 			 </td>
-    	     <td width=30% align=left class="dvtCellInfo"><input type="text" name="{$fldname}" id ="{$fldname}" value="{$fldvalue}" class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'"></td>
+    	     <td width=30% align=left class="dvtCellInfo"><input type="text" name="{$fldname}" id ="{$fldname}" value="{$fldvalue}" tabindex="{$vt_tab}" class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'"></td>
 			{elseif $uitype eq 115}<!-- for Status field Disabled for nonadmin -->
 			<td width="20%" class="dvtCellLabel" align=right>
 				{$fldlabel}
 			</td>
 			<td width="30%" align=left class="dvtCellInfo">
 			   {if $secondvalue eq 1}
-			   	<select name="{$fldname}">
+			   	<select name="{$fldname}" tabindex="{$vt_tab}" >
 			   {else}
 			   	<select disabled name="{$fldname}">
 			   {/if} 
@@ -521,7 +522,7 @@
 				{$fldlabel}
 			</td>
 			<td width="30%" align=left class="dvtCellInfo">
-					<input name="{$fldname}"  type="file" value="{$maindata[3].0.name}"/>
+					<input name="{$fldname}"  type="file" value="{$maindata[3].0.name}" tabindex="{$vt_tab}" />
 					<input type="hidden" name="id" value=""/>
 					{$maindata[3].0.name}
 			</td>
@@ -530,14 +531,14 @@
 				{$fldlabel}
 			</td>
 			<td width="30%" colspan="3" align=left class="dvtCellInfo">
-				<input type="text" name="{$fldname}" value="{$fldvalue}" class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'">
+				<input type="text" name="{$fldname}" value="{$fldvalue}" tabindex="{$vt_tab}" class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'">
 			</td>	
 			{elseif $uitype eq 101}<!-- for reportsto field USERS POPUP -->
 				<td width="20%" class="dvtCellLabel" align=right>
 			       {$fldlabel}
 	            </td>
 				<td width="30%" align=left class="dvtCellInfo">
-				<input readonly name='reports_to_name' class="small" type="text" value='{$fldvalue}'><input name='reports_to_id' type="hidden" value='{$secondvalue}'>&nbsp;<input title="Change [Alt+C]" accessKey="C" type="button" class="small" value='{$UMOD.LBL_CHANGE}' name=btn1 LANGUAGE=javascript onclick='return window.open("index.php?module=Users&action=Popup&form=UsersEditView&form_submit=false","test","width=640,height=522,resizable=0,scrollbars=0");'>
+				<input readonly name='reports_to_name' class="small" type="text" value='{$fldvalue}' tabindex="{$vt_tab}" ><input name='reports_to_id' type="hidden" value='{$secondvalue}'>&nbsp;<input title="Change [Alt+C]" accessKey="C" type="button" class="small" value='{$UMOD.LBL_CHANGE}' name=btn1 LANGUAGE=javascript onclick='return window.open("index.php?module=Users&action=Popup&form=UsersEditView&form_submit=false","test","width=640,height=522,resizable=0,scrollbars=0");'>
 	            </td>
 			{elseif $uitype eq 116}<!-- for currency in users details-->	
 			<td width="20%" class="dvtCellLabel" align=right>
@@ -545,9 +546,9 @@
 			</td>
 			<td width="30%" align=left class="dvtCellInfo">
 			   {if $secondvalue eq 1}
-			   	<select name="{$fldname}">
+			   	<select name="{$fldname}" tabindex="{$vt_tab}" >
 			   {else}
-			   	<select disabled name="{$fldname}">
+			   	<select disabled name="{$fldname}" tabindex="{$vt_tab}" >
 			   {/if} 
 
 				{foreach item=arr key=uivalueid from=$fldvalue}
@@ -563,9 +564,9 @@
 			</td>
 			<td width=30% align=left class="dvtCellInfo">
 				{if $MODE eq 'edit'}
-				<input type="text" readonly name="{$fldname}" value="{$fldvalue}" class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'">
-				{else}
-				<input type="text" name="{$fldname}" value="{$fldvalue}" class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'">
+				<input type="text" readonly name="{$fldname}" value="{$fldvalue}" tabindex="{$vt_tab}" class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'">
+				{else}
+				<input type="text" name="{$fldname}" value="{$fldvalue}" tabindex="{$vt_tab}" class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'">
 				{/if}
 			</td>
 			{elseif $uitype eq 99}
@@ -574,7 +575,7 @@
 					<font color="red">*</font>{$fldlabel}
 				</td>
 				<td width=30% align=left class="dvtCellInfo">
-					<input type="password" name="{$fldname}" value="{$fldvalue}" class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'">
+					<input type="password" name="{$fldname}" tabindex="{$vt_tab}" value="{$fldvalue}" class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'">
 				</td>
 				{/if}
 		{elseif $uitype eq 30}
@@ -586,7 +587,7 @@
 				{assign var=yes_val value=$secondvalue[1]}
 				{assign var=no_val value=$secondvalue[2]}
 
-				<input type="radio" name="set_reminder" value="Yes" {$check}>&nbsp;{$yes_val}&nbsp;
+				<input type="radio" name="set_reminder" tabindex="{$vt_tab}" value="Yes" {$check}>&nbsp;{$yes_val}&nbsp;
 				<input type="radio" name="set_reminder" value="No">&nbsp;{$no_val}&nbsp;
 
 				{foreach item=val_arr from=$fldvalue}

Modified: vtigercrm/trunk/include/utils/CommonUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/CommonUtils.php (original)
+++ vtigercrm/trunk/include/utils/CommonUtils.php Mon Jun 19 09:01:04 2006
@@ -992,6 +992,30 @@
                 $getBlockInfo=getBlockInformation($module,$result,$col_fields,$tabid,$block_label);	
 	}
 	$log->debug("Exiting getBlocks method ...");
+	$index_count =1;
+	$max_index =0;
+	foreach($getBlockInfo as $label=>$contents)
+	{
+			$no_rows = count($contents);	
+			$index_count = $max_index+1;
+		foreach($contents as $block_row => $elements)
+		{
+			$max_index= $no_rows+$index_count;
+			
+			for($i=0;$i<count($elements);$i++)
+			{	
+				if(sizeof($getBlockInfo[$label][$block_row][$i])!=0)
+				{
+					if($i==0)
+					$getBlockInfo[$label][$block_row][$i][]=array($index_count);
+					else
+					$getBlockInfo[$label][$block_row][$i][]=array($max_index);
+				}
+			}
+			$index_count++;
+			
+		}
+	}
 	return $getBlockInfo;
 }	
 /**




From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 19 11:02:03 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 19 Jun 2006 15:02:03 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7265 -
	/vtigercrm/trunk/include/utils/EditViewUtils.php
Message-ID: <20060619150203.5948883F1EB@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 19 09:01:59 2006
New Revision: 7265

Log:
cahnges made to fix the issue 1260

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

Modified: vtigercrm/trunk/include/utils/EditViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/EditViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/EditViewUtils.php Mon Jun 19 09:01:59 2006
@@ -1035,12 +1035,10 @@
 		$rem_hrs = floor(($col_fields[$fieldname]-$rem_days*24*60)/60);
 		$rem_min = ($col_fields[$fieldname]-$rem_days*24*60)%60;
 		$editview_label[]=$mod_strings[$fieldlabel];
-		$custfld .= '<td valign="top" colspan=3>&nbsp;<input type="radio" name="set_reminder" value="Yes" '.$SET_REM.'>&nbsp;'.$mod_strings['LBL_YES'].'&nbsp;<input type="radio" name="set_reminder" value="No">&nbsp;'.$mod_strings['LBL_NO'].'&nbsp;';
 		$day_options = getReminderSelectOption(0,31,'remdays',$rem_days);
 		$hr_options = getReminderSelectOption(0,23,'remhrs',$rem_hrs);
 		$min_options = getReminderSelectOption(1,59,'remmin',$rem_min);
-		$custfld .= '&nbsp;&nbsp;'.$day_options.' &nbsp;'.$mod_strings['LBL_DAYS'].'&nbsp;&nbsp;'.$hr_options.'&nbsp;'.$mod_strings['LBL_HOURS'].'&nbsp;&nbsp;'.$min_options.'&nbsp;'.$mod_strings['LBL_MINUTES'].'&nbsp;&nbsp;'.$mod_strings['LBL_BEFORE_EVENT'].'</td>';
-		$fieldvalue[] = array(array(0,32,'remdays','days',$rem_days),array(0,24,'remhrs','hours',$rem_hrs),array(1,60,'remmin','minutes  before event',$rem_min));
+		$fieldvalue[] = array(array(0,32,'remdays',$mod_strings['LBL_DAYS'],$rem_days),array(0,24,'remhrs',$mod_strings['LBL_HOURS'],$rem_hrs),array(1,60,'remmin',$mod_strings['LBL_MINUTES'].'&nbsp;&nbsp;'.$mod_strings['LBL_BEFORE_EVENT'],$rem_min));
 		$fieldvalue[] = array($SET_REM,$mod_strings['LBL_YES'],$mod_strings['LBL_NO']);
 		$SET_REM = '';
 	}




From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 19 11:03:18 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 19 Jun 2006 15:03:18 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231260=3A?=
 =?utf-8?q?_i18n_issue_at_activities?=
In-Reply-To: <076.bf2281a02d95e6f032d828d0839694a6@vtiger.fosslabs.com>
References: <076.bf2281a02d95e6f032d828d0839694a6@vtiger.fosslabs.com>
Message-ID: <085.5f9e494a495a1db24843508f559e34ec@vtiger.fosslabs.com>

#1260: i18n issue at activities
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  mangai
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mangai):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 Fixed.
 Some of the picklist can not edit through picklist editor due to query
 check.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1260>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 19 11:25:39 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 19 Jun 2006 15:25:39 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7266 -
 /vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php
Message-ID: <20060619152539.EEF6B83F1B0@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 19 09:25:35 2006
New Revision: 7266

Log:
* Modified to handle the special characters in account name and potential name when convert the lead.

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

Modified: vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php (original)
+++ vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php Mon Jun 19 09:25:35 2006
@@ -41,8 +41,8 @@
         $potential_name = $check_unit[0];
 
 //Retrieve info from all the vtiger_tables related to leads
-  $focus = new Lead();
- $focus->retrieve_entity_info($id,"Leads");
+$focus = new Lead();
+$focus->retrieve_entity_info($id,"Leads");
 
 //get all the lead related columns 
 $row = $focus->column_fields;
@@ -52,7 +52,7 @@
 $date_entered = date('YmdHis');
 $date_modified = date('YmdHis');
 
-$crmid = $adb->getUniqueID("crmentity");
+$crmid = $adb->getUniqueID("vtiger_crmentity");
 
 //function for getting the custom values from leads and saving to vtiger_account/contact/potential custom vtiger_fields -Jag
 function getInsertValues($type,$type_id)
@@ -132,10 +132,11 @@
 		}
 
 	}
-	 $log->debug("columns to be inserted are ".$type_insert_column);
+	$log->debug("columns to be inserted are ".$type_insert_column);
         $log->debug("columns to be inserted are ".$insert_value);
 	$values = array ($type_insert_column,$insert_value);
 	$log->debug("Exiting getInsertValues method ...");
+
 	return $values;	
 }
 //function Ends
@@ -216,28 +217,27 @@
 		}
         }
 	$log->debug("Exiting getRelatedActivities method ...");
-	
+
 }
 
+//Saving Account - starts
 $sql_crmentity = "insert into vtiger_crmentity(crmid,smcreatorid,smownerid,setype,presence,createdtime,modifiedtime,deleted,description) values(".$crmid.",".$current_user_id.",".$assigned_user_id.",'Accounts',1,".$date_entered.",".$date_modified.",0,'".$row['description']."')";
 
 $adb->query($sql_crmentity);
 
-
-$sql_insert_account = "INSERT INTO vtiger_account (accountid,accountname,industry,annualrevenue,phone,fax,rating,email1,website,employees) VALUES (".$crmid.",'".$accountname ."','".$row["industry"] ."','" .$row["annualrevenue"] ."','" .$row["phone"] ."','".$row["fax"] ."','" .$row["rating"] ."','" .$row["email"] ."','" .$row["website"] ."','" .$row["noofemployees"] ."')";
-
+$sql_insert_account = "INSERT INTO vtiger_account (accountid,accountname,industry,annualrevenue,phone,fax,rating,email1,website,employees) VALUES (".$crmid.",'".addslashes($accountname)."','".$row["industry"] ."','" .$row["annualrevenue"] ."','" .$row["phone"] ."','".$row["fax"] ."','" .$row["rating"] ."','" .$row["email"] ."','" .$row["website"] ."','" .$row["noofemployees"] ."')";
 
 $adb->query($sql_insert_account);
 
 $sql_insert_accountbillads = "INSERT INTO vtiger_accountbillads (accountaddressid,city,code,country,state,street) VALUES (".$crmid.",'".$row["city"] ."','" .$row["code"] ."','" .$row["country"] ."','".$row["state"] ."','" .$row["lane"]."')";
 
- $adb->query($sql_insert_accountbillads);
+$adb->query($sql_insert_accountbillads);
 
 
 $sql_insert_accountshipads = "INSERT INTO vtiger_accountshipads (accountaddressid,city,code,country,state,street) VALUES (".$crmid.",'".$row["city"] ."','" .$row["code"] ."','" .$row["country"] ."','".$row["state"] ."','" .$row["lane"]."')";
 
 
- $adb->query($sql_insert_accountshipads);
+$adb->query($sql_insert_accountshipads);
 
 //Getting the custom vtiger_field values from leads and inserting into Accounts if the vtiger_field is mapped - Jaguar
 $insert_value=$crmid;
@@ -253,35 +253,33 @@
 $sql_insert_accountcustomfield = "INSERT INTO vtiger_accountscf (".$insert_column.") VALUES (".$insert_value.")";
 
 $adb->query($sql_insert_accountcustomfield);
-
-//
-
+//Saving Account - ends
 
 $acccount_id=$crmid;
 getRelatedNotesAttachments($id,$crmid); //To Convert Related Notes & Attachments -Jaguar
 
- $date_entered = date('YmdHis');
- $date_modified = date('YmdHis');
-
-$crmcontactid = $adb->getUniqueID("crmentity");
+$date_entered = date('YmdHis');
+$date_modified = date('YmdHis');
+
+//Saving Contact - starts
+$crmcontactid = $adb->getUniqueID("vtiger_crmentity");
 $sql_crmentity1 = "insert into vtiger_crmentity(crmid,smcreatorid,smownerid,setype,presence,deleted,description,createdtime) values(".$crmcontactid.",".$current_user_id.",".$assigned_user_id.",'Contacts',0,0,'".$row['description']."','".$date_entered."')";
 
 $adb->query($sql_crmentity1);
-
 
 $contact_id = $crmcontactid;
 $log->debug("contact id is ".$contact_id);
 
- $sql_insert_contact = "INSERT INTO vtiger_contactdetails (contactid,accountid,campaignid,salutation,firstname,lastname,email,phone,mobile,title,fax,yahooid) VALUES (".$contact_id.",".$crmid."," .$row["campaignid"]. ",'".$row["salutationtype"] ."','" .$row["firstname"] ."','" .$row["lastname"] ."','" .$row["email"] ."','" .$row["phone"]. "','" .$row["mobile"] ."','" .$row["designation"] ."','".$row["fax"] ."','".$row['yahooid']."')";
+$sql_insert_contact = "INSERT INTO vtiger_contactdetails (contactid,accountid,campaignid,salutation,firstname,lastname,email,phone,mobile,title,fax,yahooid) VALUES (".$contact_id.",".$crmid.",'".$row["campaignid"]. "','".$row["salutationtype"] ."','" .$row["firstname"] ."','" .$row["lastname"] ."','" .$row["email"] ."','" .$row["phone"]. "','" .$row["mobile"] ."','" .$row["designation"] ."','".$row["fax"] ."','".$row['yahooid']."')";
 
 $adb->query($sql_insert_contact);
 
 
- $sql_insert_contactsubdetails = "INSERT INTO vtiger_contactsubdetails (contactsubscriptionid,homephone,otherphone,leadsource) VALUES (".$contact_id.",'','','".$row['leadsource']."')";
+$sql_insert_contactsubdetails = "INSERT INTO vtiger_contactsubdetails (contactsubscriptionid,homephone,otherphone,leadsource) VALUES (".$contact_id.",'','','".$row['leadsource']."')";
 
 $adb->query($sql_insert_contactsubdetails);
 
- $sql_insert_contactaddress = "INSERT INTO vtiger_contactaddress (contactaddressid,mailingcity,mailingstreet,mailingstate,mailingcountry,mailingzip) VALUES (".$contact_id.",'".$row["city"] ."','" .$row["lane"] ."','".$row['state']."','" .$row["country"] ."','".$row['code']."')";
+$sql_insert_contactaddress = "INSERT INTO vtiger_contactaddress (contactaddressid,mailingcity,mailingstreet,mailingstate,mailingcountry,mailingzip) VALUES (".$contact_id.",'".$row["city"] ."','" .$row["lane"] ."','".$row['state']."','" .$row["country"] ."','".$row['code']."')";
 
 $adb->query($sql_insert_contactaddress);
 
@@ -301,21 +299,22 @@
 $sql_insert_contactcustomfield = "INSERT INTO vtiger_contactscf (".$insert_column.") VALUES (".$insert_value.")";
 
 $adb->query($sql_insert_contactcustomfield);
-//
+//Saving Contact - ends
 
 getRelatedActivities($acccount_id,$contact_id); //To convert relates Activites  and Email -Jaguar
 
+//Saving Potential - starts
 if(! isset($createpotential) || ! $createpotential == "on")
 {
-   $log->info("createpotential is not set");
-  $date_entered = date('YmdHis');
-  $date_modified = date('YmdHis');
+	$log->info("createpotential is not set");
+	$date_entered = date('YmdHis');
+	$date_modified = date('YmdHis');
   
 
-  $oppid = $adb->getUniqueID("crmentity");
-  $sql_crmentity = "insert into vtiger_crmentity(crmid,smcreatorid,smownerid,setype,presence,deleted,createdtime,description) values(".$oppid.",".$current_user_id.",".$assigned_user_id.",'Potentials',0,0,'".$date_entered."','".$row['description']."')";
+	$oppid = $adb->getUniqueID("vtiger_crmentity");
+	$sql_crmentity = "insert into vtiger_crmentity(crmid,smcreatorid,smownerid,setype,presence,deleted,createdtime,description) values(".$oppid.",".$current_user_id.",".$assigned_user_id.",'Potentials',0,0,'".$date_entered."','".$row['description']."')";
   
-  $adb->query($sql_crmentity);
+	$adb->query($sql_crmentity);
 
 
 	if(!isset($potential_amount) || $potential_amount == null)
@@ -323,11 +322,11 @@
 		$potential_amount=0;
         }
 
-	$sql_insert_opp = "INSERT INTO vtiger_potential (potentialid,accountid,campaignid,potentialname,leadsource,closingdate,sales_stage,amount) VALUES (".$oppid.",".$crmid .",".$row["campaignid"]. ",'".$potential_name."','".$row['leadsource']."','".$close_date."','".$potential_sales_stage."',".$potential_amount.")";
+	$sql_insert_opp = "INSERT INTO vtiger_potential (potentialid,accountid,campaignid,potentialname,leadsource,closingdate,sales_stage,amount) VALUES (".$oppid.",".$crmid .",'".$row["campaignid"]. "','".addslashes($potential_name)."','".$row['leadsource']."','".$close_date."','".$potential_sales_stage."',".$potential_amount.")";
 
 	$adb->query($sql_insert_opp);
 
-//Getting the customfield values from leads and inserting into the respected PotentialCustomfield to which it is mapped - Jaguar
+	//Getting the customfield values from leads and inserting into the respected PotentialCustomfield to which it is mapped - Jaguar
 	$insert_column="potentialid";
 	$insert_value=$oppid;
 	$val= getInsertValues("Potentials",$oppid);
@@ -340,15 +339,14 @@
 	$insert_value.=$val[1];
 
 	$sql_insert_potentialcustomfield = "INSERT INTO vtiger_potentialscf (".$insert_column.") VALUES (".$insert_value.")";
-//
 
 	$adb->query($sql_insert_potentialcustomfield);
-        $sql_insert2contpotentialrel ="insert into vtiger_contpotentialrel values(".$contact_id.",".$oppid .")";
-        
+
+	$sql_insert2contpotentialrel ="insert into vtiger_contpotentialrel values(".$contact_id.",".$oppid .")";
         $adb->query($sql_insert2contpotentialrel);
-
-	
 }
+//Saving Potential - ends
+
 
 //Deleting from the vtiger_tracker
 $sql_delete_tracker= "DELETE from vtiger_tracker where item_id='" .$id ."'";




From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 19 11:27:07 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 19 Jun 2006 15:27:07 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23749=3A_?=
 =?utf-8?q?Bugs_with_apostrophes_in_Lead_conversion_and_Helpdesk_ticket?=
In-Reply-To: <076.6c5a8e4857db1ceb5cdfe4078eda9b17@vtiger.fosslabs.com>
References: <076.6c5a8e4857db1ceb5cdfe4078eda9b17@vtiger.fosslabs.com>
Message-ID: <085.aa08b51171ca38866b604bd9bfeedfbc@vtiger.fosslabs.com>

#749: Bugs with apostrophes in Lead conversion and Helpdesk ticket
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  mickie               
      Type:  defect     |      Status:  closed               
  Priority:  major      |   Milestone:                       
 Component:  vtigercrm  |     Version:  5.0.0                
Resolution:  fixed      |    Keywords:  apostrophe conversion
------------------------+---------------------------------------------------
Changes (by mickie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 These issues have been fixed.Now we can save account and contact with
 special characters in convert lead.

 Also in ticket module we can save the comments event the title contains
 special characters.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/749>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 19 11:50:05 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 19 Jun 2006 15:50:05 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7267 -
	/vtigercrm/trunk/modules/Users/add2db.php
Message-ID: <20060619155005.374DB83F084@vtiger.fosslabs.com>

Author: richie
Date: Mon Jun 19 09:48:57 2006
New Revision: 7267

Log:
fixed vtiger_ table prefixing issues

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

Modified: vtigercrm/trunk/modules/Users/add2db.php
==============================================================================
--- vtigercrm/trunk/modules/Users/add2db.php (original)
+++ vtigercrm/trunk/modules/Users/add2db.php Mon Jun 19 09:48:57 2006
@@ -108,8 +108,8 @@
   {
     include('themes/'.$theme.'/header.php');
     include "upload.php";
-    //$errormessage = "<B><font color='red'>Sorry, the uploaded file exceeds the maximum vtiger_filesize limit. Please try a smaller file</font></B> <br>";
-	echo "<script>alert('Sorry, the uploaded file exceeds the maximum vtiger_filesize limit. Please try a smaller file')</script>";	
+    //$errormessage = "<B><font color='red'>Sorry, the uploaded file exceeds the maximum filesize limit. Please try a smaller file</font></B> <br>";
+	echo "<script>alert('Sorry, the uploaded file exceeds the maximum filesize limit. Please try a smaller file')</script>";	
     //echo $errormessage;
     //echo $errorCode;
   }




From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 19 11:59:13 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 19 Jun 2006 15:59:13 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7268 -
	/vtigercrm/trunk/modules/Users/ChangePassword.php
Message-ID: <20060619155913.09530802E29@vtiger.fosslabs.com>

Author: richie
Date: Mon Jun 19 09:58:59 2006
New Revision: 7268

Log:
fixed vtiger_ prefixing issues

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

Modified: vtigercrm/trunk/modules/Users/ChangePassword.php
==============================================================================
--- vtigercrm/trunk/modules/Users/ChangePassword.php (original)
+++ vtigercrm/trunk/modules/Users/ChangePassword.php Mon Jun 19 09:58:59 2006
@@ -88,17 +88,17 @@
 <?php if (!is_admin($current_user)) {
 	echo "<tr>";
 	echo "<td width='40%' class='dvtCellLabel' align='right'><b>".$mod_strings['LBL_OLD_PASSWORD']."</b></td>\n";
-	echo "<td width='60%' class='dvtCellInfo'><input name='old_password' type='password' vtiger_tabindex='1' size='15' maxlength='15'></td>\n";
+	echo "<td width='60%' class='dvtCellInfo'><input name='old_password' type='password' tabindex='1' size='15' maxlength='15'></td>\n";
 	echo "<input name='is_admin' type='hidden' value='1'>";
 	echo "</tr><tr>\n";
 }
 else echo "<input name='old_password' type='hidden'><input name='is_admin' type='hidden' value='0'>";
 ?>
 <td width='40%' class='dvtCellLabel' nowrap align="right"><b><?php echo $mod_strings['LBL_NEW_PASSWORD']; ?></b></td>
-<td width='60%' class='dvtCellInfo'><input name='new_password' type='password' vtiger_tabindex='1' size='15' maxlength='15'></td>
+<td width='60%' class='dvtCellInfo'><input name='new_password' type='password' tabindex='1' size='15' maxlength='15'></td>
 </tr><tr>
 <td width='40%' class='dvtCellLabel' nowrap align="right"><b><?php echo $mod_strings['LBL_CONFIRM_PASSWORD']; ?></b></td>
-<td width='60%' class='dvtCellInfo'><input name='confirm_new_password' type='password' vtiger_tabindex='1' size='15' maxlength='15'></td>
+<td width='60%' class='dvtCellInfo'><input name='confirm_new_password' type='password' tabindex='1' size='15' maxlength='15'></td>
 </tr><tr>
 <td width='40%' class='dataLabel'></td>
 <td width='60%' class='dvtCellInfo'></td>




From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 19 12:17:37 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 19 Jun 2006 16:17:37 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7269 - in
 /vtigercrm/trunk/modules/Users: CreateProfile.php CreateProfile1.php
Message-ID: <20060619161737.76F3C433AD7@vtiger.fosslabs.com>

Author: richie
Date: Mon Jun 19 10:17:26 2006
New Revision: 7269

Log:
fixed vtiger_ issues

Modified:
    vtigercrm/trunk/modules/Users/CreateProfile.php
    vtigercrm/trunk/modules/Users/CreateProfile1.php

Modified: vtigercrm/trunk/modules/Users/CreateProfile.php
==============================================================================
--- vtigercrm/trunk/modules/Users/CreateProfile.php (original)
+++ vtigercrm/trunk/modules/Users/CreateProfile.php Mon Jun 19 10:17:26 2006
@@ -33,7 +33,7 @@
 if(isset($_REQUEST['profileid']) && $_REQUEST['profileid'] != '')
 {
 	global $adb;	
-	$sql = "select * from vtiger_profile where vtiger_profileid=".$_REQUEST['profileid'];
+	$sql = "select * from vtiger_profile where profileid=".$_REQUEST['profileid'];
 	$profileResult = $adb->query($sql);
 	$profile_name = $adb->query_result($profileResult,0,"profilename");
 	$profile_description = $adb->query_result($profileResult,0,"description");

Modified: vtigercrm/trunk/modules/Users/CreateProfile1.php
==============================================================================
--- vtigercrm/trunk/modules/Users/CreateProfile1.php (original)
+++ vtigercrm/trunk/modules/Users/CreateProfile1.php Mon Jun 19 10:17:26 2006
@@ -18,7 +18,7 @@
 
 if(isset($_REQUEST['dup_check']) && $_REQUEST['dup_check']!='')
 {
-        $query = 'select vtiger_profilename from vtiger_profile where vtiger_profilename="'.$profilename.'"';
+        $query = 'select profilename from vtiger_profile where profilename="'.$profilename.'"';
         $result = $adb->query($query);
 
         if($adb->num_rows($result) > 0)




From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 19 12:20:48 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 19 Jun 2006 16:20:48 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7270 -
 /vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php
Message-ID: <20060619162048.E85C9433AD7@vtiger.fosslabs.com>

Author: richie
Date: Mon Jun 19 10:20:38 2006
New Revision: 7270

Log:
fixed vtiger_prefix issues

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

Modified: vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php
==============================================================================
--- vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php (original)
+++ vtigercrm/trunk/modules/Users/CreateUserPrivilegeFile.php Mon Jun 19 10:20:38 2006
@@ -1413,7 +1413,7 @@
 	global $adb;
 	require('user_privileges/sharing_privileges_'.$userid.'.php');
 	//Deleting from the existing vtiger_tables
-	$table_arr=Array('tmp_read_user_sharing_per', 'tmp_write_user_sharing_per','tmp_read_group_sharing_per','tmp_write_group_sharing_per','tmp_read_user_rel_sharing_per','tmp_write_user_rel_sharing_per','tmp_read_group_rel_sharing_per','tmp_write_group_rel_sharing_per');
+	$table_arr=Array('vtiger_tmp_read_user_sharing_per', 'vtiger_tmp_write_user_sharing_per','vtiger_tmp_read_group_sharing_per','vtiger_tmp_write_group_sharing_per','vtiger_tmp_read_user_rel_sharing_per','vtiger_tmp_write_user_rel_sharing_per','vtiger_tmp_read_group_rel_sharing_per','vtiger_tmp_write_group_rel_sharing_per');
 	foreach($table_arr as $tabname)
 	{
 		$query = "delete from ".$tabname." where userid=".$userid;
@@ -1454,12 +1454,12 @@
 	{
 		if($pertype =='read')
 		{
-			$table_name='tmp_read_user_sharing_per';
+			$table_name='vtiger_tmp_read_user_sharing_per';
 			$var_name=$module.'_share_read_permission';
 		}
 		elseif($pertype == 'write')
 		{
-			$table_name='tmp_write_user_sharing_per';
+			$table_name='vtiger_tmp_write_user_sharing_per';
 			$var_name=$module.'_share_write_permission';
 		}
 		$var_name_arr=$$var_name;	
@@ -1502,12 +1502,12 @@
 	{
 		if($pertype =='read')
 		{
-			$table_name='tmp_read_group_sharing_per';
+			$table_name='vtiger_tmp_read_group_sharing_per';
 			$var_name=$module.'_share_read_permission';
 		}
 		elseif($pertype == 'write')
 		{
-			$table_name='tmp_write_group_sharing_per';
+			$table_name='vtiger_tmp_write_group_sharing_per';
 			$var_name=$module.'_share_write_permission';
 		}
 		$var_name_arr=$$var_name;
@@ -1542,12 +1542,12 @@
 	{
 		if($pertype =='read')
 		{
-			$table_name='tmp_read_user_rel_sharing_per';
+			$table_name='vtiger_tmp_read_user_rel_sharing_per';
 			$var_name=$module.'_'.$relmodule.'_share_read_permission';
 		}
 		elseif($pertype == 'write')
 		{
-			$table_name='tmp_write_user_rel_sharing_per';
+			$table_name='vtiger_tmp_write_user_rel_sharing_per';
 			$var_name=$module.'_'.$relmodule.'_share_write_permission';
 		}
 		$var_name_arr=$$var_name;	
@@ -1590,12 +1590,12 @@
 	{
 		if($pertype =='read')
 		{
-			$table_name='tmp_read_group_rel_sharing_per';
+			$table_name='vtiger_tmp_read_group_rel_sharing_per';
 			$var_name=$module.'_'.$relmodule.'_share_read_permission';
 		}
 		elseif($pertype == 'write')
 		{
-			$table_name='tmp_write_group_rel_sharing_per';
+			$table_name='vtiger_tmp_write_group_rel_sharing_per';
 			$var_name=$module.'_'.$relmodule.'_share_write_permission';
 		}
 		$var_name_arr=$$var_name;




From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 19 12:22:15 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 19 Jun 2006 16:22:15 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7271 -
	/vtigercrm/trunk/modules/Users/Delete.php
Message-ID: <20060619162215.754725E3B9C@vtiger.fosslabs.com>

Author: richie
Date: Mon Jun 19 10:22:03 2006
New Revision: 7271

Log:
fixed vtiger_ prefix issues

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

Modified: vtigercrm/trunk/modules/Users/Delete.php
==============================================================================
--- vtigercrm/trunk/modules/Users/Delete.php (original)
+++ vtigercrm/trunk/modules/Users/Delete.php Mon Jun 19 10:22:03 2006
@@ -10,7 +10,7 @@
  ********************************************************************************/
 
 
-$sql= 'delete from vtiger_salesmanactivityrel where smid='.$_REQUEST['record'].' and vtiger_activityid = '.$_REQUEST['return_id'];
+$sql= 'delete from vtiger_salesmanactivityrel where smid='.$_REQUEST['record'].' and activityid = '.$_REQUEST['return_id'];
 $adb->query($sql);
 
 if($_REQUEST['return_module'] == 'Activities')




From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 19 12:29:14 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 19 Jun 2006 16:29:14 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7272 - in
 /vtigercrm/trunk/modules/Users: LoginHistory.php RoleDragDrop.php
 SaveOrgSharing.php SaveProfile.php SaveRole.php TabCustomise.php
 UpdateDefaultFieldLevelAccess.php UpdateProfileChanges.php UsersAjax.php
 massChangeStatus.php
Message-ID: <20060619162915.7A7CC5E3B9C@vtiger.fosslabs.com>

Author: richie
Date: Mon Jun 19 10:28:50 2006
New Revision: 7272

Log:
fixed the vtiger_ prefix issues

Modified:
    vtigercrm/trunk/modules/Users/LoginHistory.php
    vtigercrm/trunk/modules/Users/RoleDragDrop.php
    vtigercrm/trunk/modules/Users/SaveOrgSharing.php
    vtigercrm/trunk/modules/Users/SaveProfile.php
    vtigercrm/trunk/modules/Users/SaveRole.php
    vtigercrm/trunk/modules/Users/TabCustomise.php
    vtigercrm/trunk/modules/Users/UpdateDefaultFieldLevelAccess.php
    vtigercrm/trunk/modules/Users/UpdateProfileChanges.php
    vtigercrm/trunk/modules/Users/UsersAjax.php
    vtigercrm/trunk/modules/Users/massChangeStatus.php

Modified: vtigercrm/trunk/modules/Users/LoginHistory.php
==============================================================================
--- vtigercrm/trunk/modules/Users/LoginHistory.php (original)
+++ vtigercrm/trunk/modules/Users/LoginHistory.php Mon Jun 19 10:28:50 2006
@@ -31,7 +31,7 @@
 	var $status;
 	var $module_name = "Users";
 
-	var $table_name = "loginhistory";
+	var $table_name = "vtiger_loginhistory";
 
 	var $object_name = "LoginHistory";
 	

Modified: vtigercrm/trunk/modules/Users/RoleDragDrop.php
==============================================================================
--- vtigercrm/trunk/modules/Users/RoleDragDrop.php (original)
+++ vtigercrm/trunk/modules/Users/RoleDragDrop.php Mon Jun 19 10:28:50 2006
@@ -15,7 +15,7 @@
 
 
 global $adb;
-$query = "select * from vtiger_role where vtiger_roleid='".$toid."'";
+$query = "select * from vtiger_role where roleid='".$toid."'";
 $result=$adb->query($query);
 $parentRoleList=$adb->query_result($result,0,'parentrole');
 $replace_with=$parentRoleList;
@@ -50,7 +50,7 @@
 	$mvParString=$replace_with.$subPar[1];
 	$subDepth=$mvRoleInfo[2];
 	$mvDepth=$orgDepth+(($subDepth-$stdDepth)+1);
-	$query="update vtiger_role set parentrole='".$mvParString."',depth=".$mvDepth." where vtiger_roleid='".$mvRoleId."'";
+	$query="update vtiger_role set parentrole='".$mvParString."',depth=".$mvDepth." where roleid='".$mvRoleId."'";
 	//echo $query;
 	$adb->query($query);
 		

Modified: vtigercrm/trunk/modules/Users/SaveOrgSharing.php
==============================================================================
--- vtigercrm/trunk/modules/Users/SaveOrgSharing.php (original)
+++ vtigercrm/trunk/modules/Users/SaveOrgSharing.php Mon Jun 19 10:28:50 2006
@@ -22,19 +22,19 @@
 	$tabid=$adb->query_result($result2,$i,'tabid');
 		$reqval = $tabid.'_per';	
 		$permission=$_REQUEST[$reqval];
-		$sql7="update vtiger_def_org_share set permission=".$permission." where vtiger_tabid=".$tabid." and ruleid=".$ruleid;
+		$sql7="update vtiger_def_org_share set permission=".$permission." where tabid=".$tabid." and ruleid=".$ruleid;
 		$adb->query($sql7);
 
 		if($tabid == 6)
 		{
-			$sql8="update vtiger_def_org_share set permission=".$permission." where vtiger_tabid=4";
+			$sql8="update vtiger_def_org_share set permission=".$permission." where tabid=4";
 			$adb->query($sql8);
 			
 		}
 
 		if($tabid == 9)
 		{
-			$sql8="update vtiger_def_org_share set permission=".$permission." where vtiger_tabid=16";
+			$sql8="update vtiger_def_org_share set permission=".$permission." where tabid=16";
 			$adb->query($sql8);
 			
 		}

Modified: vtigercrm/trunk/modules/Users/SaveProfile.php
==============================================================================
--- vtigercrm/trunk/modules/Users/SaveProfile.php (original)
+++ vtigercrm/trunk/modules/Users/SaveProfile.php Mon Jun 19 10:28:50 2006
@@ -28,9 +28,9 @@
 
 
 //Retreiving the vtiger_tabs permission array
-$tab_perr_result = $adb->query("select * from vtiger_profile2tab where vtiger_profileid=1");
-$act_perr_result = $adb->query("select * from vtiger_profile2standardpermissions where vtiger_profileid=1");
-$act_utility_result = $adb->query("select * from vtiger_profile2utility where vtiger_profileid=1");
+$tab_perr_result = $adb->query("select * from vtiger_profile2tab where profileid=1");
+$act_perr_result = $adb->query("select * from vtiger_profile2standardpermissions where profileid=1");
+$act_utility_result = $adb->query("select * from vtiger_profile2utility where profileid=1");
 $num_tab_per = $adb->num_rows($tab_perr_result);
 $num_act_per = $adb->num_rows($act_perr_result);
 $num_act_util_per = $adb->num_rows($act_utility_result);

Modified: vtigercrm/trunk/modules/Users/SaveRole.php
==============================================================================
--- vtigercrm/trunk/modules/Users/SaveRole.php (original)
+++ vtigercrm/trunk/modules/Users/SaveRole.php Mon Jun 19 10:28:50 2006
@@ -17,12 +17,12 @@
 {
 	if($mode != 'edit')
 	{
-		$query = 'select vtiger_rolename from vtiger_role where vtiger_rolename="'.$rolename.'"';
+		$query = 'select rolename from vtiger_role where rolename="'.$rolename.'"';
 	}
 	else
 	{
 		$roleid=$_REQUEST['roleid'];
-		$query = 'select vtiger_rolename from vtiger_role where vtiger_rolename="'.$rolename.'" and vtiger_roleid !="'.$roleid.'"';
+		$query = 'select rolename from vtiger_role where rolename="'.$rolename.'" and roleid !="'.$roleid.'"';
 
 	}
 	$result = $adb->query($query);

Modified: vtigercrm/trunk/modules/Users/TabCustomise.php
==============================================================================
--- vtigercrm/trunk/modules/Users/TabCustomise.php (original)
+++ vtigercrm/trunk/modules/Users/TabCustomise.php Mon Jun 19 10:28:50 2006
@@ -154,7 +154,7 @@
 </style>
 </head>
 <?
-		$tabavail="SELECT vtiger_tabid,name from vtiger_tab where presence !=2";
+		$tabavail="SELECT tabid,name from vtiger_tab where presence !=2";
 		$tabrow=$adb->query($tabavail);
 		if($adb->num_rows($tabrow) != 0)
 		{
@@ -163,7 +163,7 @@
 				$availabletab[]=$result;
 			}
 		}	
-		$tabsel="SELECT vtiger_tabid,name from vtiger_tab where presence=0 order by vtiger_tabsequence";
+		$tabsel="SELECT tabid,name from vtiger_tab where presence=0 order by tabsequence";
 		$tabrow=$adb->query($tabsel);
 		if($adb->num_rows($tabrow) != 0)
 		{

Modified: vtigercrm/trunk/modules/Users/UpdateDefaultFieldLevelAccess.php
==============================================================================
--- vtigercrm/trunk/modules/Users/UpdateDefaultFieldLevelAccess.php (original)
+++ vtigercrm/trunk/modules/Users/UpdateDefaultFieldLevelAccess.php Mon Jun 19 10:28:50 2006
@@ -40,7 +40,7 @@
 		}		
 
 		//Updating the database
-		$update_query = "update vtiger_def_org_field set visible=".$visible_value." where vtiger_fieldid='".$fieldid."' and vtiger_tabid=".$tab_id;
+		$update_query = "update vtiger_def_org_field set visible=".$visible_value." where fieldid='".$fieldid."' and tabid=".$tab_id;
 		$adb->query($update_query);
 
 	}

Modified: vtigercrm/trunk/modules/Users/UpdateProfileChanges.php
==============================================================================
--- vtigercrm/trunk/modules/Users/UpdateProfileChanges.php (original)
+++ vtigercrm/trunk/modules/Users/UpdateProfileChanges.php Mon Jun 19 10:28:50 2006
@@ -23,9 +23,9 @@
 	$return_action = 'ListProfiles';
 
 //Retreiving the vtiger_tabs permission array
-$tab_perr_result = $adb->query("select * from vtiger_profile2tab where vtiger_profileid=".$profileid);
-$act_perr_result = $adb->query("select * from vtiger_profile2standardpermissions where vtiger_profileid=".$profileid);
-$act_utility_result = $adb->query("select * from vtiger_profile2utility where vtiger_profileid=".$profileid);
+$tab_perr_result = $adb->query("select * from vtiger_profile2tab where profileid=".$profileid);
+$act_perr_result = $adb->query("select * from vtiger_profile2standardpermissions where profileid=".$profileid);
+$act_utility_result = $adb->query("select * from vtiger_profile2utility where profileid=".$profileid);
 $num_tab_per = $adb->num_rows($tab_perr_result);
 $num_act_per = $adb->num_rows($act_perr_result);
 $num_act_util_per = $adb->num_rows($act_utility_result);
@@ -37,9 +37,9 @@
 	$edit_all_req=$_REQUEST['edit_all'];
 	$edit_all = getPermissionValue($edit_all_req);
 
-	$update_query = "update  vtiger_profile2globalpermissions set globalactionpermission=".$view_all." where globalactionid=1 and vtiger_profileid=".$profileid;
+	$update_query = "update  vtiger_profile2globalpermissions set globalactionpermission=".$view_all." where globalactionid=1 and profileid=".$profileid;
 	$adb->query($update_query);
-	$update_query = "update  vtiger_profile2globalpermissions set globalactionpermission=".$edit_all." where globalactionid=2 and vtiger_profileid=".$profileid;
+	$update_query = "update  vtiger_profile2globalpermissions set globalactionpermission=".$edit_all." where globalactionid=2 and profileid=".$profileid;
 	$adb->query($update_query);
 
 	
@@ -59,11 +59,11 @@
 			{
 				$permission_value = 1;
 			}
-			$update_query = "update vtiger_profile2tab set permissions=".$permission_value." where vtiger_tabid=".$tab_id." and vtiger_profileid=".$profileid;
+			$update_query = "update vtiger_profile2tab set permissions=".$permission_value." where tabid=".$tab_id." and profileid=".$profileid;
 			$adb->query($update_query);
 			if($tab_id ==9)
 			{
-				$update_query = "update vtiger_profile2tab set permissions=".$permission_value." where vtiger_tabid=16 and vtiger_profileid=".$profileid;
+				$update_query = "update vtiger_profile2tab set permissions=".$permission_value." where tabid=16 and profileid=".$profileid;
 				$adb->query($update_query);
 			}
 		}
@@ -99,11 +99,11 @@
 			{
 				$permission_value = 1;
 			}
-			$update_query = "update vtiger_profile2standardpermissions set permissions=".$permission_value." where vtiger_tabid=".$tab_id." and Operation=".$action_id." and vtiger_profileid=".$profileid;
+			$update_query = "update vtiger_profile2standardpermissions set permissions=".$permission_value." where tabid=".$tab_id." and Operation=".$action_id." and profileid=".$profileid;
 			$adb->query($update_query);
 			if($tab_id ==9)
 			{
-				$update_query = "update vtiger_profile2standardpermissions set permissions=".$permission_value." where vtiger_tabid=16 and Operation=".$action_id." and vtiger_profileid=".$profileid;
+				$update_query = "update vtiger_profile2standardpermissions set permissions=".$permission_value." where tabid=16 and Operation=".$action_id." and profileid=".$profileid;
 				$adb->query($update_query);
 			}
 
@@ -132,7 +132,7 @@
 			$permission_value = 1;
 		}
 
-		$update_query = "update vtiger_profile2utility set permission=".$permission_value." where vtiger_tabid=".$tab_id." and vtiger_activityid=".$action_id." and vtiger_profileid=".$profileid;
+		$update_query = "update vtiger_profile2utility set permission=".$permission_value." where tabid=".$tab_id." and activityid=".$action_id." and profileid=".$profileid;
 
 		$adb->query($update_query);
 
@@ -167,7 +167,7 @@
 			$visible_value = 0;
 		}
 		//Updating the database
-		$update_query = "update vtiger_profile2field set visible=".$visible_value." where vtiger_fieldid='".$fieldid."' and vtiger_profileid=".$profileid." and vtiger_tabid=".$tab_id;
+		$update_query = "update vtiger_profile2field set visible=".$visible_value." where fieldid='".$fieldid."' and profileid=".$profileid." and tabid=".$tab_id;
 		$adb->query($update_query);
 
 	}

Modified: vtigercrm/trunk/modules/Users/UsersAjax.php
==============================================================================
--- vtigercrm/trunk/modules/Users/UsersAjax.php (original)
+++ vtigercrm/trunk/modules/Users/UsersAjax.php Mon Jun 19 10:28:50 2006
@@ -41,7 +41,7 @@
 	$sql="select * from vtiger_announcement where creatorid=".$current_user->id;
 	$is_announce=$adb->query($sql);
 	if($adb->num_rows($is_announce) > 0)
-		$query="update vtiger_announcement set vtiger_announcement=".$adb->formatString("announcement","announcement",$announcement).",time=".$adb->formatString("announcement","time",$date_var).",title='announcement' where creatorid=".$current_user->id;
+		$query="update vtiger_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 vtiger_announcement values (".$current_user->id.",".$adb->formatString("announcement","announcement",$announcement).",'announcement','".$date_var."')";
 	$result=$adb->query($query);

Modified: vtigercrm/trunk/modules/Users/massChangeStatus.php
==============================================================================
--- vtigercrm/trunk/modules/Users/massChangeStatus.php (original)
+++ vtigercrm/trunk/modules/Users/massChangeStatus.php Mon Jun 19 10:28:50 2006
@@ -39,7 +39,7 @@
 }
 function updateStatus()
 {
-	var vtiger_leadstatusvalue=document.setLeadStatus.lead_status.value
+	var leadstatusvalue=document.setLeadStatus.lead_status.value
 	//alert(leadstatusvalue);
 	document.setLeadStatus.leadval.value=leadstatusvalue;
 	document.setLeadStatus.action="index.php?module=Users&action=updateLeadDBStatus"




From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 19 13:44:30 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 19 Jun 2006 17:44:30 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23895=3A_?=
 =?utf-8?q?inconsistency_attachment_=26_notes_in_relatedlist?=
In-Reply-To: <076.79c7c9588e335e83363cae55ee4ba916@vtiger.fosslabs.com>
References: <076.79c7c9588e335e83363cae55ee4ba916@vtiger.fosslabs.com>
Message-ID: <085.9f6772222233b71bd842700e408d402b@vtiger.fosslabs.com>

#895: inconsistency attachment & notes in relatedlist
------------------------+---------------------------------------------------
  Reporter:  mickie     |       Owner:  mickie
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mickie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 Edit and delete links are provided for all modules.

 Regarding subject column, for attachment we have only desctiption and the
 Attachments string is displayed in Type column. so there is no need to
 display the string Attachments in the subject column.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/895>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 19 15:09:51 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 19 Jun 2006 19:09:51 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7273 -
 /vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php
Message-ID: <20060619190951.29BE3298FCE@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 19 13:09:47 2006
New Revision: 7273

Log:
* Modified to related all the lead related products to account, contact and potential

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

Modified: vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php (original)
+++ vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php Mon Jun 19 13:09:47 2006
@@ -27,14 +27,7 @@
 $potential_sales_stage = $_REQUEST['potential_sales_stage'];
 
 global $log;
-$log->debug("id is ".$id);
-$log->debug("assigned_user_id is ".$assigned_user_id);
-$log->debug("createpotential is ".$createpotential);
-$log->debug("close date is ".$close_date);
-$log->debug("current user id is ".$current_user_id);
-$log->debug("assigned user id is ".$assigned_user_id);
-$log->debug("accountname is ".$accountname);
-$log->debug("module is ".$module);
+$log->debug("id = $id \n assigned_user_id = $assigned_user_id \n createpotential = $createpotential \n close date = $close_date \n current user id = $current_user_id \n accountname = $accountname \n module = $module");
 
 $check_unit = explode("-",$potential_name);
 if($check_unit[1] == "")
@@ -46,13 +39,9 @@
 
 //get all the lead related columns 
 $row = $focus->column_fields;
-$date_entered;
-$date_modified;
 
 $date_entered = date('YmdHis');
 $date_modified = date('YmdHis');
-
-$crmid = $adb->getUniqueID("vtiger_crmentity");
 
 //function for getting the custom values from leads and saving to vtiger_account/contact/potential custom vtiger_fields -Jag
 function getInsertValues($type,$type_id)
@@ -220,23 +209,48 @@
 
 }
 
+/**	Function used to save the lead related products with other entities Account, Contact and Potential
+ *	$leadid - leadid
+ *	$relatedid - related entity id (accountid/contactid/potentialid)
+ *	$relatedmodule - related entity module name - optional, but for contacts we have to pass Contact because we have to update contactid in vtiger_products table.
+ */
+function saveLeadRelatedProducts($leadid, $relatedid, $relatedmodule = '')
+{
+	global $adb, $log;
+	$log->debug("Entering into function saveLeadRelatedProducts($leadid, $relatedid, \"$relatedmodule\")");
+
+	$product_result = $adb->query("select * from vtiger_seproductsrel where crmid=$leadid");
+	$noofproducts = $adb->num_rows($product_result);
+	for($i = 0; $i < $noofproducts; $i++)
+	{
+		$productid = $adb->query_result($product_result,$i,'productid');
+
+		$adb->query("insert into vtiger_seproductsrel (productid, crmid) values($productid, $relatedid)");
+
+		if($relatedmodule == 'Contacts')
+		{
+			//update contactid in products table then only the products will be shown in contact relatedlist
+			$adb->query("update vtiger_products set contactid=$relatedid where productid=$productid");
+		}
+	}
+
+	$log->debug("Exit from function saveLeadRelatedProducts.");
+}
+
+$crmid = $adb->getUniqueID("vtiger_crmentity");
+
 //Saving Account - starts
 $sql_crmentity = "insert into vtiger_crmentity(crmid,smcreatorid,smownerid,setype,presence,createdtime,modifiedtime,deleted,description) values(".$crmid.",".$current_user_id.",".$assigned_user_id.",'Accounts',1,".$date_entered.",".$date_modified.",0,'".$row['description']."')";
-
 $adb->query($sql_crmentity);
 
 $sql_insert_account = "INSERT INTO vtiger_account (accountid,accountname,industry,annualrevenue,phone,fax,rating,email1,website,employees) VALUES (".$crmid.",'".addslashes($accountname)."','".$row["industry"] ."','" .$row["annualrevenue"] ."','" .$row["phone"] ."','".$row["fax"] ."','" .$row["rating"] ."','" .$row["email"] ."','" .$row["website"] ."','" .$row["noofemployees"] ."')";
-
 $adb->query($sql_insert_account);
 
 $sql_insert_accountbillads = "INSERT INTO vtiger_accountbillads (accountaddressid,city,code,country,state,street) VALUES (".$crmid.",'".$row["city"] ."','" .$row["code"] ."','" .$row["country"] ."','".$row["state"] ."','" .$row["lane"]."')";
-
 $adb->query($sql_insert_accountbillads);
 
 
 $sql_insert_accountshipads = "INSERT INTO vtiger_accountshipads (accountaddressid,city,code,country,state,street) VALUES (".$crmid.",'".$row["city"] ."','" .$row["code"] ."','" .$row["country"] ."','".$row["state"] ."','" .$row["lane"]."')";
-
-
 $adb->query($sql_insert_accountshipads);
 
 //Getting the custom vtiger_field values from leads and inserting into Accounts if the vtiger_field is mapped - Jaguar
@@ -251,12 +265,18 @@
 $insert_column.=$val[0];
 $insert_value.=$val[1];
 $sql_insert_accountcustomfield = "INSERT INTO vtiger_accountscf (".$insert_column.") VALUES (".$insert_value.")";
-
 $adb->query($sql_insert_accountcustomfield);
 //Saving Account - ends
 
-$acccount_id=$crmid;
+$account_id=$crmid;
 getRelatedNotesAttachments($id,$crmid); //To Convert Related Notes & Attachments -Jaguar
+
+//Retrieve the lead related products and relate them with this new account
+saveLeadRelatedProducts($id, $crmid);
+
+//Up to this, Account related data save finshed
+
+
 
 $date_entered = date('YmdHis');
 $date_modified = date('YmdHis');
@@ -301,7 +321,16 @@
 $adb->query($sql_insert_contactcustomfield);
 //Saving Contact - ends
 
-getRelatedActivities($acccount_id,$contact_id); //To convert relates Activites  and Email -Jaguar
+getRelatedActivities($account_id,$contact_id); //To convert relates Activites  and Email -Jaguar
+
+//Retrieve the lead related products and relate them with this new contact
+saveLeadRelatedProducts($id, $contact_id, "Contacts");
+
+//Up to this, Contact related data save finshed
+
+
+
+
 
 //Saving Potential - starts
 if(! isset($createpotential) || ! $createpotential == "on")
@@ -344,8 +373,13 @@
 
 	$sql_insert2contpotentialrel ="insert into vtiger_contpotentialrel values(".$contact_id.",".$oppid .")";
         $adb->query($sql_insert2contpotentialrel);
+
+	//Retrieve the lead related products and relate them with this new potential
+	saveLeadRelatedProducts($id, $oppid);
+
 }
 //Saving Potential - ends
+//Up to this, Potential related data save finshed
 
 
 //Deleting from the vtiger_tracker




From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 19 15:11:11 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 19 Jun 2006 19:11:11 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231207=3A?=
 =?utf-8?q?_products_related_to_lead_are_not_carried_over_when_lead_is_con?=
 =?utf-8?q?verted?=
In-Reply-To: <076.029392e9fc29e5d7b21c662647a73612@vtiger.fosslabs.com>
References: <076.029392e9fc29e5d7b21c662647a73612@vtiger.fosslabs.com>
Message-ID: <085.28a5c18403be1e6e839acf0b5100ad2b@vtiger.fosslabs.com>

#1207: products related to lead are not carried over when lead is converted
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  mickie
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mickie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 This issue is fixed as now the products related to lead will be carried
 ie., related to account, contact and potential on Lead conversion.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1207>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 19 16:37:53 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 19 Jun 2006 20:37:53 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7274 - in
 /vtigercrm/trunk/modules: Contacts/Contact.php Emails/Email.php
 Invoice/Invoice.php Products/Product.php PurchaseOrder/PurchaseOrder.php
Message-ID: <20060619203754.3FEF98181FA@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 19 14:37:42 2006
New Revision: 7274

Log:
* Modified the fieldname vtiger_attachmentsid to attachmentsid which is used to get the relatedlist fileid

Modified:
    vtigercrm/trunk/modules/Contacts/Contact.php
    vtigercrm/trunk/modules/Emails/Email.php
    vtigercrm/trunk/modules/Invoice/Invoice.php
    vtigercrm/trunk/modules/Products/Product.php
    vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php

Modified: vtigercrm/trunk/modules/Contacts/Contact.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/Contact.php (original)
+++ vtigercrm/trunk/modules/Contacts/Contact.php Mon Jun 19 14:37:42 2006
@@ -344,7 +344,7 @@
 		$log->debug("Entering get_attachments(".$id.") method ...");
 		$query = "select vtiger_notes.title,'Notes      ' AS ActivityType,
 		vtiger_notes.filename, vtiger_attachments.type AS FileType,crm2.modifiedtime AS lastmodified,
-		vtiger_seattachmentsrel.attachmentsid AS vtiger_attachmentsid, vtiger_notes.notesid AS crmid,
+		vtiger_seattachmentsrel.attachmentsid AS attachmentsid, vtiger_notes.notesid AS crmid,
 			crm2.createdtime, vtiger_notes.notecontent AS description, vtiger_users.user_name
 		from vtiger_notes
 			inner join vtiger_crmentity on vtiger_crmentity.crmid= vtiger_notes.contact_id

Modified: vtigercrm/trunk/modules/Emails/Email.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/Email.php (original)
+++ vtigercrm/trunk/modules/Emails/Email.php Mon Jun 19 14:37:42 2006
@@ -219,7 +219,7 @@
 		$log->debug("Entering get_attachments(".$id.") method ...");
 		$query = "select vtiger_notes.title,'Notes      '  ActivityType, vtiger_notes.filename,
 		vtiger_attachments.type  FileType,crm2.modifiedtime lastmodified,
-		vtiger_seattachmentsrel.attachmentsid vtiger_attachmentsid, vtiger_notes.notesid crmid,
+		vtiger_seattachmentsrel.attachmentsid attachmentsid, vtiger_notes.notesid crmid,
 			crm2.createdtime, vtiger_notes.notecontent description, vtiger_users.user_name
 		from vtiger_notes
 			inner join vtiger_senotesrel on vtiger_senotesrel.notesid= vtiger_notes.notesid
@@ -232,7 +232,7 @@
 		$query .= ' union all ';
 		$query .= "select vtiger_attachments.description title ,'Attachments'  ActivityType,
 		vtiger_attachments.name filename, vtiger_attachments.type FileType,crm2.modifiedtime lastmodified,
-		vtiger_attachments.attachmentsid  vtiger_attachmentsid,vtiger_seattachmentsrel.attachmentsid crmid,
+		vtiger_attachments.attachmentsid  attachmentsid,vtiger_seattachmentsrel.attachmentsid crmid,
 			crm2.createdtime, vtiger_attachments.description, vtiger_users.user_name
 		from vtiger_attachments
 			inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid= vtiger_attachments.attachmentsid

Modified: vtigercrm/trunk/modules/Invoice/Invoice.php
==============================================================================
--- vtigercrm/trunk/modules/Invoice/Invoice.php (original)
+++ vtigercrm/trunk/modules/Invoice/Invoice.php Mon Jun 19 14:37:42 2006
@@ -197,7 +197,7 @@
 		// Inserted order by createdtime desc
 		$query .= "select vtiger_attachments.description  title ,'Attachments'  ActivityType,
 		vtiger_attachments.name filename, vtiger_attachments.type FileType, crm2.modifiedtime lastmodified,
-		vtiger_attachments.attachmentsid vtiger_attachmentsid, vtiger_seattachmentsrel.attachmentsid crmid,
+		vtiger_attachments.attachmentsid attachmentsid, vtiger_seattachmentsrel.attachmentsid crmid,
 			crm2.createdtime, vtiger_attachments.description, vtiger_users.user_name
 		from vtiger_attachments
 			inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid= vtiger_attachments.attachmentsid

Modified: vtigercrm/trunk/modules/Products/Product.php
==============================================================================
--- vtigercrm/trunk/modules/Products/Product.php (original)
+++ vtigercrm/trunk/modules/Products/Product.php Mon Jun 19 14:37:42 2006
@@ -111,7 +111,7 @@
 		$query = "SELECT vtiger_notes.title, 'Notes      ' AS ActivityType,
 			vtiger_notes.filename, vtiger_attachments.type  AS FileType,
 				crm2.modifiedtime AS lastmodified,
-			vtiger_seattachmentsrel.attachmentsid AS vtiger_attachmentsid,
+			vtiger_seattachmentsrel.attachmentsid AS attachmentsid,
 			vtiger_notes.notesid AS crmid, vtiger_crmentity.createdtime,
 			vtiger_notes.notecontent AS description,
 			vtiger_users.user_name
@@ -136,7 +136,7 @@
 			vtiger_attachments.name AS filename,
 			vtiger_attachments.type AS FileType,
 				crm2.modifiedtime AS lastmodified,
-			vtiger_attachments.attachmentsid AS vtiger_attachmentsid,
+			vtiger_attachments.attachmentsid AS attachmentsid,
 			vtiger_seattachmentsrel.attachmentsid AS crmid,
 			vtiger_crmentity.createdtime,
 			vtiger_attachments.description, vtiger_users.user_name

Modified: vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php
==============================================================================
--- vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php (original)
+++ vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php Mon Jun 19 14:37:42 2006
@@ -186,7 +186,7 @@
 		// Inserted inner join vtiger_users on crm2.smcreatorid= vtiger_users.id
 		$query = "select vtiger_notes.title, 'Notes      '  ActivityType, vtiger_notes.filename,
 		vtiger_attachments.type FileType, crm2.modifiedtime lastmodified,
-		vtiger_seattachmentsrel.attachmentsid vtiger_attachmentsid, vtiger_notes.notesid crmid,
+		vtiger_seattachmentsrel.attachmentsid attachmentsid, vtiger_notes.notesid crmid,
 			crm2.createdtime, vtiger_notes.notecontent description, vtiger_users.user_name
 		from vtiger_notes
 			inner join vtiger_senotesrel on vtiger_senotesrel.notesid= vtiger_notes.notesid
@@ -203,7 +203,7 @@
 		// Inserted order by createdtime desc
 		$query .= "select vtiger_attachments.description  title ,'Attachments'  ActivityType,
 		vtiger_attachments.name  filename, vtiger_attachments.type  FileType, crm2.modifiedtime  lastmodified,
-		vtiger_attachments.attachmentsid  vtiger_attachmentsid, vtiger_seattachmentsrel.attachmentsid crmid,
+		vtiger_attachments.attachmentsid  attachmentsid, vtiger_seattachmentsrel.attachmentsid crmid,
 			crm2.createdtime, vtiger_attachments.description, vtiger_users.user_name
 		from vtiger_attachments
 			inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid= vtiger_attachments.attachmentsid




From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 19 19:13:36 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 19 Jun 2006 23:13:36 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7275 - in /vtigercrm/trunk:
 Smarty/templates/ modules/Reports/
Message-ID: <20060619231337.3938D83F1B0@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 19 17:13:26 2006
New Revision: 7275

Log:
issues in reports has been fixed

Modified:
    vtigercrm/trunk/Smarty/templates/ReportFilters.tpl
    vtigercrm/trunk/modules/Reports/Delete.php
    vtigercrm/trunk/modules/Reports/Report.js
    vtigercrm/trunk/modules/Reports/ReportColumns.php
    vtigercrm/trunk/modules/Reports/ReportRun.php
    vtigercrm/trunk/modules/Reports/Reports.php
    vtigercrm/trunk/modules/Reports/Save.php
    vtigercrm/trunk/modules/Reports/SaveAndRun.php

Modified: vtigercrm/trunk/Smarty/templates/ReportFilters.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ReportFilters.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ReportFilters.tpl Mon Jun 19 17:13:26 2006
@@ -159,7 +159,7 @@
 		</tbody>
 	</table>
 	</td></tr>
-	<tr><td colspan="2" height="63">&nbsp;</td></tr>
+	<tr><td colspan="2" height="40">&nbsp;</td></tr>
 	</tbody>
 </table>
 {literal}

Modified: vtigercrm/trunk/modules/Reports/Delete.php
==============================================================================
--- vtigercrm/trunk/modules/Reports/Delete.php (original)
+++ vtigercrm/trunk/modules/Reports/Delete.php Mon Jun 19 17:13:26 2006
@@ -34,7 +34,7 @@
 	$idelreportsql = "delete from vtiger_selectquery where queryid=".$reportid;
 	$idelreportsqlresult = $adb->query($idelreportsql);
 
-	$ireportsql = "delete from vtiger_report where vtiger_reportid=".$reportid;
+	$ireportsql = "delete from vtiger_report where reportid=".$reportid;
     $ireportsqlresult = $adb->query($ireportsql);
 }
 ?>

Modified: vtigercrm/trunk/modules/Reports/Report.js
==============================================================================
--- vtigercrm/trunk/modules/Reports/Report.js (original)
+++ vtigercrm/trunk/modules/Reports/Report.js Mon Jun 19 17:13:26 2006
@@ -7,7 +7,6 @@
  * All Rights Reserved.
  *
  ********************************************************************************/
-
 var typeofdata = new Array();
 typeofdata['V'] = ['e','n','s','c','k'];
 typeofdata['N'] = ['e','n','l','g','m','h'];
@@ -159,287 +158,184 @@
 }
 
 function setObjects() 
-        {
-            availListObj=getObj("availList")
-            selectedColumnsObj=getObj("selectedColumns")
-
-            moveupLinkObj=getObj("moveup_link")
-            moveupDisabledObj=getObj("moveup_disabled")
-            movedownLinkObj=getObj("movedown_link")
-            movedownDisabledObj=getObj("movedown_disabled")
-        }
-
-        function addColumn() 
-        {
-            for (i=0;i<selectedColumnsObj.length;i++) 
-            {
-                selectedColumnsObj.options[i].selected=false
-            }
-
-            for (i=0;i<availListObj.length;i++) 
-            {
-                if (availListObj.options[i].selected==true) 
-                {
-                    for (j=0;j<selectedColumnsObj.length;j++) 
-                    {
-                        if (selectedColumnsObj.options[j].value==availListObj.options[i].value) 
-                        {
-                            var rowFound=true
-                            var existingObj=selectedColumnsObj.options[j]
-                            break
-                        }
-                    }
-
-                    if (rowFound!=true) 
-                    {
-                        var newColObj=document.createElement("OPTION")
-                        newColObj.value=availListObj.options[i].value
-                        if (browser_ie) newColObj.innerText=availListObj.options[i].innerText
-                        else if (browser_nn4 || browser_nn6) newColObj.text=availListObj.options[i].text
-                        selectedColumnsObj.appendChild(newColObj)
-                        availListObj.options[i].selected=false
-                        newColObj.selected=true
-                        rowFound=false
-                    } 
-                    else 
-                    {
-                        existingObj.selected=true
-                    }
-                }
-            }
-        }
-
-        function delColumn() 
-        {
-            for (i=0;i<=selectedColumnsObj.options.length;i++) 
-            {
-                if (selectedColumnsObj.options.selectedIndex>=0)
-                selectedColumnsObj.remove(selectedColumnsObj.options.selectedIndex)
-            }
-        }
-                        
-        function formSelectColumnString()
-        {
-            var selectedColStr = "";
-            for (i=0;i<selectedColumnsObj.options.length;i++) 
-            {
-                selectedColStr += selectedColumnsObj.options[i].value + ";";
-            }
-            document.NewReport.selectedColumnsString.value = selectedColStr;
-        }
+{
+	availListObj=getObj("availList")
+	selectedColumnsObj=getObj("selectedColumns")
+
+	moveupLinkObj=getObj("moveup_link")
+	moveupDisabledObj=getObj("moveup_disabled")
+	movedownLinkObj=getObj("movedown_link")
+	movedownDisabledObj=getObj("movedown_disabled")
+}
+
+function addColumn() 
+{
+	for (i=0;i<selectedColumnsObj.length;i++) 
+	{
+		selectedColumnsObj.options[i].selected=false
+	}
+
+	for (i=0;i<availListObj.length;i++) 
+	{
+		if (availListObj.options[i].selected==true) 
+		{
+			for (j=0;j<selectedColumnsObj.length;j++) 
+			{
+				if (selectedColumnsObj.options[j].value==availListObj.options[i].value) 
+				{
+					var rowFound=true
+						var existingObj=selectedColumnsObj.options[j]
+						break
+				}
+			}
+
+			if (rowFound!=true) 
+			{
+				var newColObj=document.createElement("OPTION")
+					newColObj.value=availListObj.options[i].value
+					if (browser_ie) newColObj.innerText=availListObj.options[i].innerText
+					else if (browser_nn4 || browser_nn6) newColObj.text=availListObj.options[i].text
+						selectedColumnsObj.appendChild(newColObj)
+							availListObj.options[i].selected=false
+							newColObj.selected=true
+							rowFound=false
+			} 
+			else 
+			{
+				existingObj.selected=true
+			}
+		}
+	}
+}
+
+function delColumn() 
+{
+	for (i=0;i<=selectedColumnsObj.options.length;i++) 
+	{
+		if (selectedColumnsObj.options.selectedIndex>=0)
+			selectedColumnsObj.remove(selectedColumnsObj.options.selectedIndex)
+	}
+}
+
+function formSelectColumnString()
+{
+	var selectedColStr = "";
+	for (i=0;i<selectedColumnsObj.options.length;i++) 
+	{
+		selectedColStr += selectedColumnsObj.options[i].value + ";";
+	}
+	document.NewReport.selectedColumnsString.value = selectedColStr;
+}
+
+function moveUp() 
+{
+	var currpos=selectedColumnsObj.options.selectedIndex
+		if (currpos>0) 
+		{
+			var prevpos=selectedColumnsObj.options.selectedIndex-1
+
+				if (browser_ie) 
+				{
+					temp=selectedColumnsObj.options[prevpos].innerText
+						selectedColumnsObj.options[prevpos].innerText=selectedColumnsObj.options[currpos].innerText
+						selectedColumnsObj.options[currpos].innerText=temp     
+				} 
+				else if (browser_nn4 || browser_nn6) 
+				{
+					temp=selectedColumnsObj.options[prevpos].text
+						selectedColumnsObj.options[prevpos].text=selectedColumnsObj.options[currpos].text
+						selectedColumnsObj.options[currpos].text=temp
+				}
+			temp=selectedColumnsObj.options[prevpos].value
+				selectedColumnsObj.options[prevpos].value=selectedColumnsObj.options[currpos].value
+				selectedColumnsObj.options[currpos].value=temp
+
+				selectedColumnsObj.options[prevpos].selected=true
+				selectedColumnsObj.options[currpos].selected=false
+		}
+}
+
+function moveDown() 
+{
+	var currpos=selectedColumnsObj.options.selectedIndex
+		if (currpos<selectedColumnsObj.options.length-1)	
+		{
+			var nextpos=selectedColumnsObj.options.selectedIndex+1
+
+				if (browser_ie) 
+				{	
+					temp=selectedColumnsObj.options[nextpos].innerText
+						selectedColumnsObj.options[nextpos].innerText=selectedColumnsObj.options[currpos].innerText
+						selectedColumnsObj.options[currpos].innerText=temp
+				}
+				else if (browser_nn4 || browser_nn6) 
+				{
+					temp=selectedColumnsObj.options[nextpos].text
+						selectedColumnsObj.options[nextpos].text=selectedColumnsObj.options[currpos].text
+						selectedColumnsObj.options[currpos].text=temp
+				}
+			temp=selectedColumnsObj.options[nextpos].value
+				selectedColumnsObj.options[nextpos].value=selectedColumnsObj.options[currpos].value
+				selectedColumnsObj.options[currpos].value=temp
+
+				selectedColumnsObj.options[nextpos].selected=true
+				selectedColumnsObj.options[currpos].selected=false
+		}
+}
+
+function disableMove() 
+{
+	var cnt=0
+		for (i=0;i<selectedColumnsObj.options.length;i++) 
+		{
+			if (selectedColumnsObj.options[i].selected==true)
+				cnt++
+		}
+
+	if (cnt>1) 
+	{
+		moveupLinkObj.style.display=movedownLinkObj.style.display="none"
+			moveupDisabledObj.style.display=movedownDisabledObj.style.display="block"
+	}
+	else 
+	{
+		moveupLinkObj.style.display=movedownLinkObj.style.display="block"
+			moveupDisabledObj.style.display=movedownDisabledObj.style.display="none"
+	}
+}        
+
+
+function hideTabs()
+{
+	var objreportType = getObj('reportType');
+	if(objreportType[0].checked == true)
+	{
+		divarray = new Array('step1','step2','step4','step5');
+	}
+	else
+	{
+		divarray = new Array('step1','step2','step3','step4','step5');
+	}
+}
         
-        function moveUp() 
-        {
-            var currpos=selectedColumnsObj.options.selectedIndex
-            if (currpos>0) 
-            {
-                var prevpos=selectedColumnsObj.options.selectedIndex-1
-		
-                if (browser_ie) 
-                {
-                    temp=selectedColumnsObj.options[prevpos].innerText
-                    selectedColumnsObj.options[prevpos].innerText=selectedColumnsObj.options[currpos].innerText
-                    selectedColumnsObj.options[currpos].innerText=temp     
-                } 
-                else if (browser_nn4 || browser_nn6) 
-                {
-                    temp=selectedColumnsObj.options[prevpos].text
-                    selectedColumnsObj.options[prevpos].text=selectedColumnsObj.options[currpos].text
-                    selectedColumnsObj.options[currpos].text=temp
-                }
-                temp=selectedColumnsObj.options[prevpos].value
-                selectedColumnsObj.options[prevpos].value=selectedColumnsObj.options[currpos].value
-                selectedColumnsObj.options[currpos].value=temp
-	
-            selectedColumnsObj.options[prevpos].selected=true
-            selectedColumnsObj.options[currpos].selected=false
-            }
-        }
-
-        function moveDown() 
-        {
-            var currpos=selectedColumnsObj.options.selectedIndex
-            if (currpos<selectedColumnsObj.options.length-1)	
-            {
-                var nextpos=selectedColumnsObj.options.selectedIndex+1
-
-                if (browser_ie) 
-                {	
-                    temp=selectedColumnsObj.options[nextpos].innerText
-                    selectedColumnsObj.options[nextpos].innerText=selectedColumnsObj.options[currpos].innerText
-                    selectedColumnsObj.options[currpos].innerText=temp
-                }
-                else if (browser_nn4 || browser_nn6) 
-                {
-                    temp=selectedColumnsObj.options[nextpos].text
-                    selectedColumnsObj.options[nextpos].text=selectedColumnsObj.options[currpos].text
-                    selectedColumnsObj.options[currpos].text=temp
-                }
-                temp=selectedColumnsObj.options[nextpos].value
-                selectedColumnsObj.options[nextpos].value=selectedColumnsObj.options[currpos].value
-                selectedColumnsObj.options[currpos].value=temp
-                    
-                selectedColumnsObj.options[nextpos].selected=true
-                selectedColumnsObj.options[currpos].selected=false
-            }
-        }
-
-        function disableMove() 
-        {
-            var cnt=0
-            for (i=0;i<selectedColumnsObj.options.length;i++) 
-            {
-                if (selectedColumnsObj.options[i].selected==true)
-                cnt++
-            }
-
-            if (cnt>1) 
-            {
-                moveupLinkObj.style.display=movedownLinkObj.style.display="none"
-                moveupDisabledObj.style.display=movedownDisabledObj.style.display="block"
-            }
-            else 
-            {
-                moveupLinkObj.style.display=movedownLinkObj.style.display="block"
-                moveupDisabledObj.style.display=movedownDisabledObj.style.display="none"
-            }
-        }        
+function showSaveDialog()
+{    
+	url = "index.php?module=Reports&action=SaveReport";
+	window.open(url,"Save_Report","width=550,height=350,top=20,left=20;toolbar=no,status=no,menubar=no,directories=no,resizable=yes,scrollbar=no")
+}
+    
+function saveAndRunReport()
+{
+	if(selectedColumnsObj.options.length == 0)
+	{
+		alert("Selected Columns cannot be empty");
+		return false;
+	}
+
+	formSelectColumnString();
+	document.NewReport.submit();
+}       
         
-        function selectAction( url )
-        {
-            formSelectColumnString();
-            document.NewReport.action = url;
-            document.NewReport.submit();
-        }
-
-function getOpenerObj(n) {
-
-   return getObj(n,opener.document)
-
-}
-function saveReport( dlgType )
-    {
-       if( !emptyCheck( "reportName", "Report Name" ) )
-       return false;    
-                
-        var repNameObj = getObj( "reportName" );
-        var repDescObj = getObj( "reportDesc" );
-        var folderObj = getObj( "folder" );
-        var actionObj = getObj( "actionItem" );
-        var formObj = getObj( "NewReport" );
-		alert(repNameObj+'=='+repDescObj+'=='+folderObj+'=='+actionObj+'=='+formObj);
-        if( dlgType == "save" )
-        {
-           formObj = getObj( "NewReport" );
-            if( getObj( 'reportId' ) != null )
-            {
-                formObj.removeChild( getOpenerObj( 'reportId' ) );
-            }
-        }
-        else
-        {
-//            formObj = getOpenerObj( "SaveAsForm" );
-            actionObj.value = "saveAs";
-        }
-        
-        repNameObj.value = document.NewReport.reportName.value;
-        repDescObj.value = document.NewReport.reportDesc.value;
-        folderObj.value = document.NewReport.folder.value;        
-        formObj.submit();
-        
-        window.self.close();
-        return false;
-    }   
-		function switchToStep( num )
-        {
-            if( num == 1 )
-            {
-                document.StepOne.submit();
-            }
-        }
-        
-        function hideTabs()
-        {
-	    var objreportType = getObj('reportType');
-            if(objreportType[0].checked == true)
-            {
-		divarray = new Array('step1','step2','step4','step5');
-            }
-            else
-            {
-		divarray = new Array('step1','step2','step3','step4','step5');
-            }
-        }
-        
-        function showSaveDialog()
-        {    
-            url = "index.php?module=Reports&action=SaveReport";
-            window.open(url,"Save_Report","width=550,height=350,top=20,left=20;toolbar=no,status=no,menubar=no,directories=no,resizable=yes,scrollbar=no")
-        }
-    
-        function saveAndRunReport()
-        {
-            if(selectedColumnsObj.options.length == 0)
-            {
-                alert("Selected Columns cannot be empty");
-                return false;
-            }
-
-	    		formSelectColumnString();
-            if( trim(getObj( 'record' ).value) == "" )
-            {
-				saveReport( 'save' );
-            }
-            else
-            {
-		    	document.NewReport.submit();
-            }
-        }       
-        
-        function saveAsNewAndRunReport()
-        {
-            formSelectColumnString();
-            showSaveDialog();
-        }       
-        
-        function cancelWizard()
-        {
-	    document.location.href = "index.php?module=Reports&action=index";		
-        }       
-        function updateYAxisFields( colToTotalField, value, bool )
-        {
-        }
-        
-        function updateXAxisFields( value, label )
-        {
-        }
-        
-        function displayStep( num )
-        {
-            if( num == 3 || num == 6 )
-            {
-		var typeObj = getObj( 'reportType' );
-                if( typeObj[0].checked == true )
-                {
-                    return;
-                }
-            }
-            
-            for( i=1; i <= 5; i++ )
-            {
-                var stepId = "step" + i;
-                var tabId = "tab" + i;
-                if( i != num )
-                {                    
-                    getObj( stepId ).style.display = "none";
-                }
-                else
-                {
-                    getObj( stepId ).style.display = "block";
-                }
-            }            
-        }
-
 function changeSteps1() 
 {
 	if(getObj('step5').style.display != 'none')
@@ -486,16 +382,6 @@
 		}
 	}
 }
-function saveAndRunReport()
-{
-	if(selectedColumnsObj.options.length == 0)
-	{
-		alert("Selected Columns cannot be empty");
-		return false;
-	}
-	formSelectColumnString();
-	document.NewReport.submit();
-}
 function changeSteps()
 {
 	if(getObj('step1').style.display != 'none')

Modified: vtigercrm/trunk/modules/Reports/ReportColumns.php
==============================================================================
--- vtigercrm/trunk/modules/Reports/ReportColumns.php (original)
+++ vtigercrm/trunk/modules/Reports/ReportColumns.php Mon Jun 19 17:13:26 2006
@@ -35,21 +35,21 @@
 $report_column->assign("IMAGE_PATH",$image_path);
 if(isset($_REQUEST["record"]))
 {
-        $recordid = $_REQUEST["record"];
-        $oReport = new Reports($recordid);
+	$recordid = $_REQUEST["record"];
+	$oReport = new Reports($recordid);
 	$BLOCK1 = getPrimaryColumnsHTML($oReport->primodule);
 	$BLOCK1 .= getSecondaryColumnsHTML($oReport->secmodule);
-        $BLOCK2 = $oReport->getSelectedColumnsList($recordid);
+	$BLOCK2 = $oReport->getSelectedColumnsList($recordid);
 	$report_column->assign("BLOCK1",$BLOCK1);
 	$report_column->assign("BLOCK2",$BLOCK2);
 }else
 {
 	$primarymodule = $_REQUEST["primarymodule"];
-        $secondarymodule = $_REQUEST["secondarymodule"];
+	$secondarymodule = $_REQUEST["secondarymodule"];
 	$BLOCK1 = getPrimaryColumnsHTML($primarymodule);
 	$BLOCK1 .= getSecondaryColumnsHTML($secondarymodule);
 	$report_column->assign("BLOCK1",$BLOCK1);
-	
+
 }
 
 /** Function to formulate the vtiger_fields for the primary modules 
@@ -60,28 +60,28 @@
 
 function getPrimaryColumnsHTML($module)
 {
-        global $ogReport;
+	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 .= "<optgroup label=\"".$app_list_strings['moduleList'][$module]." ".$key."\" class=\"select\" style=\"border:none\">";
-	    if(isset($ogReport->pri_module_columnslist[$module][$key]))
-	    {
-		foreach($ogReport->pri_module_columnslist[$module][$key] as $field=>$fieldlabel)
+	{
+		if(isset($ogReport->pri_module_columnslist[$module][$key]))
 		{
-			if(isset($mod_strings[$fieldlabel]))
+			$shtml .= "<optgroup label=\"".$app_list_strings['moduleList'][$module]." ".$key."\" class=\"select\" style=\"border:none\">";
+			foreach($ogReport->pri_module_columnslist[$module][$key] as $field=>$fieldlabel)
 			{
-				$shtml .= "<option value=\"".$field."\">".$mod_strings[$fieldlabel]."</option>";
-			}else
-			{
-				$shtml .= "<option value=\"".$field."\">".$fieldlabel."</option>";
+				if(isset($mod_strings[$fieldlabel]))
+				{
+					$shtml .= "<option value=\"".$field."\">".$mod_strings[$fieldlabel]."</option>";
+				}else
+				{
+					$shtml .= "<option value=\"".$field."\">".$fieldlabel."</option>";
+				}
 			}
 		}
-	    }
-        }
+	}
 	return $shtml;
 }
 
@@ -100,30 +100,30 @@
 
 	if($module != "")
 	{
-        $secmodule = explode(":",$module);
-        for($i=0;$i < count($secmodule) ;$i++)
-        {
-		$mod_strings = return_module_language($current_language,$secmodule[$i]);
-	       	foreach($ogReport->module_list[$secmodule[$i]] as $key=>$value)
-        	{
-            		$shtml .= "<optgroup label=\"".$app_list_strings['moduleList'][$secmodule[$i]]." ".$key."\" class=\"select\" style=\"border:none\">";
-			if(isset($ogReport->sec_module_columnslist[$secmodule[$i]][$key]))
+		$secmodule = explode(":",$module);
+		for($i=0;$i < count($secmodule) ;$i++)
+		{
+			$mod_strings = return_module_language($current_language,$secmodule[$i]);
+			foreach($ogReport->module_list[$secmodule[$i]] as $key=>$value)
 			{
-				foreach($ogReport->sec_module_columnslist[$secmodule[$i]][$key] as $field=>$fieldlabel)
+				if(isset($ogReport->sec_module_columnslist[$secmodule[$i]][$key]))
 				{
-					if(isset($mod_strings[$fieldlable]))
+					$shtml .= "<optgroup label=\"".$app_list_strings['moduleList'][$secmodule[$i]]." ".$key."\" class=\"select\" style=\"border:none\">";
+					foreach($ogReport->sec_module_columnslist[$secmodule[$i]][$key] as $field=>$fieldlabel)
 					{
-					$shtml .= "<option value=\"".$field."\">".$mod_strings[$fieldlabel]."</option>";
-					}else
-					{
-	  			        $shtml .= "<option value=\"".$field."\">".$fieldlabel."</option>";
+						if(isset($mod_strings[$fieldlable]))
+						{
+							$shtml .= "<option value=\"".$field."\">".$mod_strings[$fieldlabel]."</option>";
+						}else
+						{
+							$shtml .= "<option value=\"".$field."\">".$fieldlabel."</option>";
+						}
 					}
 				}
 			}
-        	}
+		}
 	}
-	}
-        return $shtml;
+	return $shtml;
 }
 
 $report_column->display("ReportColumns.tpl");

Modified: vtigercrm/trunk/modules/Reports/ReportRun.php
==============================================================================
--- vtigercrm/trunk/modules/Reports/ReportRun.php (original)
+++ vtigercrm/trunk/modules/Reports/ReportRun.php Mon Jun 19 17:13:26 2006
@@ -30,7 +30,7 @@
 
 	var $selectcolumns;
 	var $groupbylist;
-    var $reporttype;
+	var $reporttype;
 	var $reportname;
 	var $totallist;
 
@@ -43,7 +43,7 @@
 		$this->reporttype = $oReport->reporttype;
 		$this->reportname = $oReport->reportname;
 	}
-	
+
 	function getQueryColumnsList($reportid)
 	{
 		global $adb;
@@ -51,11 +51,11 @@
 		global $log;
 
 		$ssql = "select vtiger_selectcolumn.* from vtiger_report inner join vtiger_selectquery on vtiger_selectquery.queryid = vtiger_report.queryid";
-                $ssql .= " left join vtiger_selectcolumn on vtiger_selectcolumn.queryid = vtiger_selectquery.queryid";
+		$ssql .= " left join vtiger_selectcolumn on vtiger_selectcolumn.queryid = vtiger_selectquery.queryid";
 		$ssql .= " where vtiger_report.reportid =".$reportid;
-                $ssql .= " order by vtiger_selectcolumn.columnindex";
-
-                $result = $adb->query($ssql);
+		$ssql .= " order by vtiger_selectcolumn.columnindex";
+
+		$result = $adb->query($ssql);
 
 		while($columnslistrow = $adb->fetch_array($result))
 		{
@@ -95,18 +95,18 @@
 		}
 		return $querycolumn;
 	}
-	
+
 	function getSelectedColumnsList($reportid)
 	{
-	
+
 		global $adb;
 		global $modules;
 		global $log;
-		
+
 		$ssql = "select vtiger_selectcolumn.* from vtiger_report inner join vtiger_selectquery on vtiger_selectquery.queryid = vtiger_report.queryid"; 
 		$ssql .= " left join vtiger_selectcolumn on vtiger_selectcolumn.queryid = vtiger_selectquery.queryid where vtiger_report.reportid =".$reportid; 
 		$ssql .= " order by vtiger_selectcolumn.columnindex";
-		
+
 		$result = $adb->query($ssql);
 		$noofrows = $adb->num_rows($result);
 
@@ -114,7 +114,7 @@
 		{
 			$sSQL .= $this->orderbylistsql.", ";	
 		}
-				
+
 		for($i=0; $i<$noofrows; $i++)
 		{
 			$fieldcolname = $adb->query_result($result,$i,"columnname");
@@ -140,69 +140,69 @@
 			}
 		}
 		$sSQL .= implode(",",$sSQLList);
-		
-		 $log->info("ReportRun :: Successfully returned getSelectedColumnsList".$reportid);
+
+		$log->info("ReportRun :: Successfully returned getSelectedColumnsList".$reportid);
 		return $sSQL;
 	}
-	
+
 	function getAdvComparator($comparator,$value)
-        {
+	{
 
 		global $log,$adb;
 
 		if($comparator == "e")
-                {
-                        if(trim($value) != "")
+		{
+			if(trim($value) != "")
 			{
 				$rtvalue = " = ".$adb->quote($value);
 			}else
 			{
 				$rtvalue = " is NULL";
 			}
-                }
-                if($comparator == "n")
-                {
-                        if(trim($value) != "")
+		}
+		if($comparator == "n")
+		{
+			if(trim($value) != "")
 			{
 				$rtvalue = " <> ".$adb->quote($value);
 			}else
 			{
 				$rtvalue = " is NOT NULL";
 			}
-                }
-                if($comparator == "s")
-                {
-                        $rtvalue = " like ".$adb->quote($value."%");
-                }
-                if($comparator == "c")
-                {
-                        $rtvalue = " like ".$adb->quote("%".$value."%");
-                }
-                if($comparator == "k")
-                {
-                        $rtvalue = " not like ".$adb->quote("%".$value."%");
-                }
-                if($comparator == "l")
-                {
-                        $rtvalue = " < ".$adb->quote($value);
-                }
-                if($comparator == "g")
-								{
-                        $rtvalue = " > ".$adb->quote($value);
-                }
-                if($comparator == "m")
-                {
-                        $rtvalue = " <= ".$adb->quote($value);
-                }
-                if($comparator == "h")
-                {
-                        $rtvalue = " >= ".$adb->quote($value);
-                }
-
-		 $log->info("ReportRun :: Successfully returned getAdvComparator");
+		}
+		if($comparator == "s")
+		{
+			$rtvalue = " like ".$adb->quote($value."%");
+		}
+		if($comparator == "c")
+		{
+			$rtvalue = " like ".$adb->quote("%".$value."%");
+		}
+		if($comparator == "k")
+		{
+			$rtvalue = " not like ".$adb->quote("%".$value."%");
+		}
+		if($comparator == "l")
+		{
+			$rtvalue = " < ".$adb->quote($value);
+		}
+		if($comparator == "g")
+		{
+			$rtvalue = " > ".$adb->quote($value);
+		}
+		if($comparator == "m")
+		{
+			$rtvalue = " <= ".$adb->quote($value);
+		}
+		if($comparator == "h")
+		{
+			$rtvalue = " >= ".$adb->quote($value);
+		}
+
+		$log->info("ReportRun :: Successfully returned getAdvComparator");
 		return $rtvalue;
-        }
-	
+	}
+
 	function getAdvFilterList($reportid)
 	{
 		global $adb;
@@ -211,37 +211,37 @@
 
 		$advfiltersql =  "select vtiger_relcriteria.* from vtiger_report";
 		$advfiltersql .= " inner join vtiger_selectquery on vtiger_selectquery.queryid = vtiger_report.queryid";
-                $advfiltersql .= " left join vtiger_relcriteria on vtiger_relcriteria.queryid = vtiger_selectquery.queryid";
-                $advfiltersql .= " where vtiger_report.reportid =".$reportid;
-                $advfiltersql .= " order by vtiger_relcriteria.columnindex";
-		
+		$advfiltersql .= " left join vtiger_relcriteria on vtiger_relcriteria.queryid = vtiger_selectquery.queryid";
+		$advfiltersql .= " where vtiger_report.reportid =".$reportid;
+		$advfiltersql .= " order by vtiger_relcriteria.columnindex";
+
 		$result = $adb->query($advfiltersql);
 		while($advfilterrow = $adb->fetch_array($result))
 		{
-		     $fieldcolname = $advfilterrow["columnname"];
-		     $comparator = $advfilterrow["comparator"];
-		     $value = $advfilterrow["value"];
-		     
-		     if($fieldcolname != "" && $comparator != "")
-		     {
-			$selectedfields = explode(":",$fieldcolname);
-			$valuearray = explode(",",trim($value));
-                        if(isset($valuearray) && count($valuearray) > 1)
-                        {
-				$advorsql = "";
-				for($n=0;$n<count($valuearray);$n++)
-				{
-					$advorsql[] = $selectedfields[0].".".$selectedfields[1].$this->getAdvComparator($comparator,trim($valuearray[$n]));
-				}
-				$advorsqls = implode(" or ",$advorsql);
-				$fieldvalue = " (".$advorsqls.") ";
-			}else
-			{
-				$fieldvalue = $selectedfields[0].".".$selectedfields[1].$this->getAdvComparator($comparator,trim($value));
-			}
-			$advfilterlist[$fieldcolname] = $fieldvalue;		
-		     }
-	    						
+			$fieldcolname = $advfilterrow["columnname"];
+			$comparator = $advfilterrow["comparator"];
+			$value = $advfilterrow["value"];
+
+			if($fieldcolname != "" && $comparator != "")
+			{
+				$selectedfields = explode(":",$fieldcolname);
+				$valuearray = explode(",",trim($value));
+				if(isset($valuearray) && count($valuearray) > 1)
+				{
+					$advorsql = "";
+					for($n=0;$n<count($valuearray);$n++)
+					{
+						$advorsql[] = $selectedfields[0].".".$selectedfields[1].$this->getAdvComparator($comparator,trim($valuearray[$n]));
+					}
+					$advorsqls = implode(" or ",$advorsql);
+					$fieldvalue = " (".$advorsqls.") ";
+				}else
+				{
+					$fieldvalue = $selectedfields[0].".".$selectedfields[1].$this->getAdvComparator($comparator,trim($value));
+				}
+				$advfilterlist[$fieldcolname] = $fieldvalue;		
+			}
+
 		}
 		$log->info("ReportRun :: Successfully returned getAdvFilterList".$reportid);
 		return $advfilterlist;
@@ -269,21 +269,21 @@
 			if($fieldcolname != "none")
 			{
 				if($datefilter == "custom")
-                                {
-                                        if($startdate != "0000-00-00" && $enddate != "0000-00-00")
-                                        {
-                                                $selectedfields = explode(":",$fieldcolname);
-                                                $stdfilterlist[$fieldcolname] = $selectedfields[0].".".$selectedfields[1]." between '".$startdate."' and '".$enddate."'";
-                                        }
-                                }else
-                                {
-                                        $selectedfields = explode(":",$fieldcolname);
-                                        $startenddate = $this->getStandarFiltersStartAndEndDate($datefilter);
-                                        if($startenddate[0] != "" && $startenddate[1] != "")
-                                        {
-                                                $stdfilterlist[$fieldcolname] = $selectedfields[0].".".$selectedfields[1]." between '".$startenddate[0]." 00:00:00' and '".$startenddate[1]." 23:59:00'";
-                                        }
-                                }
+				{
+					if($startdate != "0000-00-00" && $enddate != "0000-00-00")
+					{
+						$selectedfields = explode(":",$fieldcolname);
+						$stdfilterlist[$fieldcolname] = $selectedfields[0].".".$selectedfields[1]." between '".$startdate."' and '".$enddate."'";
+					}
+				}else
+				{
+					$selectedfields = explode(":",$fieldcolname);
+					$startenddate = $this->getStandarFiltersStartAndEndDate($datefilter);
+					if($startenddate[0] != "" && $startenddate[1] != "")
+					{
+						$stdfilterlist[$fieldcolname] = $selectedfields[0].".".$selectedfields[1]." between '".$startenddate[0]." 00:00:00' and '".$startenddate[1]." 23:59:00'";
+					}
+				}
 
 			}		
 		}
@@ -304,13 +304,13 @@
 			}else
 			{
 				if($startdate != "" && $enddate != "")
-                                {
-				$selectedfields = explode(":",$filtercolumn);
-				$startenddate = $this->getStandarFiltersStartAndEndDate($filter);
-				if($startenddate[0] != "" && $startenddate[1] != "")
-				{
-					$stdfilterlist[$filtercolumn] = $selectedfields[0].".".$selectedfields[1]." between '".$startenddate[0]." 00:00:00' and '".$startenddate[1]." 23:59:00'";
-				}
+				{
+					$selectedfields = explode(":",$filtercolumn);
+					$startenddate = $this->getStandarFiltersStartAndEndDate($filter);
+					if($startenddate[0] != "" && $startenddate[1] != "")
+					{
+						$stdfilterlist[$filtercolumn] = $selectedfields[0].".".$selectedfields[1]." between '".$startenddate[0]." 00:00:00' and '".$startenddate[1]." 23:59:00'";
+					}
 				}
 			}
 
@@ -327,17 +327,17 @@
 		$sreportstdfiltersql = "select vtiger_reportdatefilter.* from vtiger_report"; 
 		$sreportstdfiltersql .= " inner join vtiger_reportdatefilter on vtiger_report.reportid = vtiger_reportdatefilter.datefilterid"; 
 		$sreportstdfiltersql .= " where vtiger_report.reportid =".$reportid;
-		
+
 		$result = $adb->query($sreportstdfiltersql);
 		$noofrows = $adb->num_rows($result);
-	
+
 		for($i=0; $i<$noofrows; $i++)
 		{
 			$fieldcolname = $adb->query_result($result,$i,"datecolumnname");
 			$datefilter = $adb->query_result($result,$i,"datefilter");
 			$startdate = $adb->query_result($result,$i,"startdate");
 			$enddate = $adb->query_result($result,$i,"enddate");
-			
+
 			if($fieldcolname != "none")
 			{
 				if($datefilter == "custom")
@@ -358,208 +358,208 @@
 				}
 			}
 		}
-		 $log->info("ReportRun :: Successfully returned getStandardCriterialSql".$reportid);
+		$log->info("ReportRun :: Successfully returned getStandardCriterialSql".$reportid);
 		return $sSQL;
 	}
 
 	function getStandarFiltersStartAndEndDate($type)
 	{
-			$today = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d"), date("Y")));
-			$tomorrow  = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d")+1, date("Y")));
-			$yesterday  = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d")-1, date("Y")));
-			
-			$currentmonth0 = date("Y-m-d",mktime(0, 0, 0, date("m"), "01",   date("Y")));
-			$currentmonth1 = date("Y-m-t");
-			$lastmonth0 = date("Y-m-d",mktime(0, 0, 0, date("m")-1, "01",   date("Y")));
-			$lastmonth1 = date("Y-m-t", strtotime("-1 Month"));
-			$nextmonth0 = date("Y-m-d",mktime(0, 0, 0, date("m")+1, "01",   date("Y")));
-			$nextmonth1 = date("Y-m-t", strtotime("+1 Month"));
-			
-			$lastweek0 = date("Y-m-d",strtotime("-2 week Sunday"));
-			$lastweek1 = date("Y-m-d",strtotime("-1 week Saturday"));
-			
-			$thisweek0 = date("Y-m-d",strtotime("-1 week Sunday"));
-			$thisweek1 = date("Y-m-d",strtotime("this Saturday"));
-			
-			$nextweek0 = date("Y-m-d",strtotime("this Sunday"));
-			$nextweek1 = date("Y-m-d",strtotime("+1 week Saturday"));
-			
-			$next7days = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d")+6, date("Y")));
-			$next30days = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d")+29, date("Y")));
-			$next60days = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d")+59, date("Y")));
-			$next90days = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d")+89, date("Y")));
-			$next120days = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d")+119, date("Y")));
-			
-			$last7days = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d")-6, date("Y")));
-			$last30days = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d")-29, date("Y")));
-			$last60days = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d")-59, date("Y")));
-			$last90days = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d")-89, date("Y")));
-			$last120days = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d")-119, date("Y")));
-			
-			$currentFY0 = date("Y-m-d",mktime(0, 0, 0, "01", "01",   date("Y")));
-			$currentFY1 = date("Y-m-t",mktime(0, 0, 0, "12", date("d"),   date("Y")));
-			$lastFY0 = date("Y-m-d",mktime(0, 0, 0, "01", "01",   date("Y")-1));
-			$lastFY1 = date("Y-m-t", mktime(0, 0, 0, "12", date("d"), date("Y")-1));
-			$nextFY0 = date("Y-m-d",mktime(0, 0, 0, "01", "01",   date("Y")+1));
-			$nextFY1 = date("Y-m-t", mktime(0, 0, 0, "12", date("d"), date("Y")+1));
-			
-			if($type == "today" )
-			{
-			
+		$today = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d"), date("Y")));
+		$tomorrow  = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d")+1, date("Y")));
+		$yesterday  = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d")-1, date("Y")));
+
+		$currentmonth0 = date("Y-m-d",mktime(0, 0, 0, date("m"), "01",   date("Y")));
+		$currentmonth1 = date("Y-m-t");
+		$lastmonth0 = date("Y-m-d",mktime(0, 0, 0, date("m")-1, "01",   date("Y")));
+		$lastmonth1 = date("Y-m-t", strtotime("-1 Month"));
+		$nextmonth0 = date("Y-m-d",mktime(0, 0, 0, date("m")+1, "01",   date("Y")));
+		$nextmonth1 = date("Y-m-t", strtotime("+1 Month"));
+
+		$lastweek0 = date("Y-m-d",strtotime("-2 week Sunday"));
+		$lastweek1 = date("Y-m-d",strtotime("-1 week Saturday"));
+
+		$thisweek0 = date("Y-m-d",strtotime("-1 week Sunday"));
+		$thisweek1 = date("Y-m-d",strtotime("this Saturday"));
+
+		$nextweek0 = date("Y-m-d",strtotime("this Sunday"));
+		$nextweek1 = date("Y-m-d",strtotime("+1 week Saturday"));
+
+		$next7days = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d")+6, date("Y")));
+		$next30days = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d")+29, date("Y")));
+		$next60days = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d")+59, date("Y")));
+		$next90days = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d")+89, date("Y")));
+		$next120days = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d")+119, date("Y")));
+
+		$last7days = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d")-6, date("Y")));
+		$last30days = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d")-29, date("Y")));
+		$last60days = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d")-59, date("Y")));
+		$last90days = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d")-89, date("Y")));
+		$last120days = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d")-119, date("Y")));
+
+		$currentFY0 = date("Y-m-d",mktime(0, 0, 0, "01", "01",   date("Y")));
+		$currentFY1 = date("Y-m-t",mktime(0, 0, 0, "12", date("d"),   date("Y")));
+		$lastFY0 = date("Y-m-d",mktime(0, 0, 0, "01", "01",   date("Y")-1));
+		$lastFY1 = date("Y-m-t", mktime(0, 0, 0, "12", date("d"), date("Y")-1));
+		$nextFY0 = date("Y-m-d",mktime(0, 0, 0, "01", "01",   date("Y")+1));
+		$nextFY1 = date("Y-m-t", mktime(0, 0, 0, "12", date("d"), date("Y")+1));
+
+		if($type == "today" )
+		{
+
 			$datevalue[0] = $today;
 			$datevalue[1] = $today;
-			}
-			elseif($type == "yesterday" )
-			{
-			    
+		}
+		elseif($type == "yesterday" )
+		{
+
 			$datevalue[0] = $yesterday;
 			$datevalue[1] = $yesterday;
-			}
-			elseif($type == "tomorrow" )
-			{
-			    
+		}
+		elseif($type == "tomorrow" )
+		{
+
 			$datevalue[0] = $tomorrow;
 			$datevalue[1] = $tomorrow;
-			}        
-			elseif($type == "thisweek" )
-			{
-			    
+		}        
+		elseif($type == "thisweek" )
+		{
+
 			$datevalue[0] = $thisweek0;
 			$datevalue[1] = $thisweek1;
-			}                
-			elseif($type == "lastweek" )
-			{
-			    
+		}                
+		elseif($type == "lastweek" )
+		{
+
 			$datevalue[0] = $lastweek0;
 			$datevalue[1] = $lastweek1;
-			}                
-			elseif($type == "nextweek" )
-			{
-			    
+		}                
+		elseif($type == "nextweek" )
+		{
+
 			$datevalue[0] = $nextweek0;
 			$datevalue[1] = $nextweek1;
-			}                
-			elseif($type == "thismonth" )
-			{
-			    
+		}                
+		elseif($type == "thismonth" )
+		{
+
 			$datevalue[0] =$currentmonth0;
 			$datevalue[1] = $currentmonth1;
-			}                
-			
-			elseif($type == "lastmonth" )
-			{
-			    
+		}                
+
+		elseif($type == "lastmonth" )
+		{
+
 			$datevalue[0] = $lastmonth0;
 			$datevalue[1] = $lastmonth1;
-			}             
-			elseif($type == "nextmonth" )
-			{
-			    
+		}             
+		elseif($type == "nextmonth" )
+		{
+
 			$datevalue[0] = $nextmonth0;
 			$datevalue[1] = $nextmonth1;
-			}           
-			elseif($type == "next7days" )
-			{
-			    
+		}           
+		elseif($type == "next7days" )
+		{
+
 			$datevalue[0] = $today;
 			$datevalue[1] = $next7days;
-			}                
-			elseif($type == "next30days" )
-			{
-			    
+		}                
+		elseif($type == "next30days" )
+		{
+
 			$datevalue[0] =$today;
 			$datevalue[1] =$next30days;
-			}                
-			elseif($type == "next60days" )
-			{
-			    
+		}                
+		elseif($type == "next60days" )
+		{
+
 			$datevalue[0] = $today;
 			$datevalue[1] = $next60days;
-			}                
-			elseif($type == "next90days" )
-			{
-			    
+		}                
+		elseif($type == "next90days" )
+		{
+
 			$datevalue[0] = $today;
 			$datevalue[1] = $next90days;
-			}        
-			elseif($type == "next120days" )
-			{
-			    
+		}        
+		elseif($type == "next120days" )
+		{
+
 			$datevalue[0] = $today;
 			$datevalue[1] = $next120days;
-			}        
-			elseif($type == "last7days" )
-			{
-			    
+		}        
+		elseif($type == "last7days" )
+		{
+
 			$datevalue[0] = $last7days;
 			$datevalue[1] = $today;
-			}                        
-			elseif($type == "last30days" )
-			{
-			    
+		}                        
+		elseif($type == "last30days" )
+		{
+
 			$datevalue[0] = $last30days;
 			$datevalue[1] =  $today;
-			}                
-			elseif($type == "last60days" )
-			{
-			    
+		}                
+		elseif($type == "last60days" )
+		{
+
 			$datevalue[0] = $last60days;
 			$datevalue[1] = $today;
-			}        
-			else if($type == "last90days" )
-			{
-			    
+		}        
+		else if($type == "last90days" )
+		{
+
 			$datevalue[0] = $last90days;
 			$datevalue[1] = $today;
-			}        
-			elseif($type == "last120days" )
-			{
-			    
+		}        
+		elseif($type == "last120days" )
+		{
+
 			$datevalue[0] = $last120days;
 			$datevalue[1] = $today;
-			}        
-			elseif($type == "thisfy" )
-			{
-			    
+		}        
+		elseif($type == "thisfy" )
+		{
+
 			$datevalue[0] = $currentFY0;
 			$datevalue[1] = $currentFY1;
-			}                
-			elseif($type == "prevfy" )
-			{
-			    
+		}                
+		elseif($type == "prevfy" )
+		{
+
 			$datevalue[0] = $lastFY0;
 			$datevalue[1] = $lastFY1;
-			}                
-			elseif($type == "nextfy" )
-			{
-			    
+		}                
+		elseif($type == "nextfy" )
+		{
+
 			$datevalue[0] = $nextFY0;
 			$datevalue[1] = $nextFY1;
-			}                
-			elseif($type == "nextfq" )
-			{
-			    
+		}                
+		elseif($type == "nextfq" )
+		{
+
 			$datevalue[0] = "2005-07-01";
 			$datevalue[1] = "2005-09-30";
-			}                        
-			elseif($type == "prevfq" )
-			{
-			    
+		}                        
+		elseif($type == "prevfq" )
+		{
+
 			$datevalue[0] = "2005-01-01";
 			$datevalue[1] = "2005-03-31";
-			}                
-			elseif($type == "thisfq" )
-			{
+		}                
+		elseif($type == "thisfq" )
+		{
 			$datevalue[0] = "2005-04-01";
 			$datevalue[1] = "2005-06-30";
-			}                
-			else
-			{
+		}                
+		else
+		{
 			$datevalue[0] = "";
 			$datevalue[1] = "";
-			}
-
-			return $datevalue;
+		}
+
+		return $datevalue;
 	}
 
 	function getGroupingList($reportid)
@@ -569,16 +569,16 @@
 		global $log;
 
 		$sreportsortsql = "select vtiger_reportsortcol.* from vtiger_report";
-                $sreportsortsql .= " inner join vtiger_reportsortcol on vtiger_report.reportid = vtiger_reportsortcol.reportid";
-                $sreportsortsql .= " where vtiger_report.reportid =".$reportid." order by vtiger_reportsortcol.sortcolid";
-		
+		$sreportsortsql .= " inner join vtiger_reportsortcol on vtiger_report.reportid = vtiger_reportsortcol.reportid";
+		$sreportsortsql .= " where vtiger_report.reportid =".$reportid." order by vtiger_reportsortcol.sortcolid";
+
 		$result = $adb->query($sreportsortsql);
 
 		while($reportsortrow = $adb->fetch_array($result))
 		{
 			$fieldcolname = $reportsortrow["columnname"];
 			$sortorder = $reportsortrow["sortorder"];
-			
+
 			if($sortorder == "Ascending")
 			{
 				$sortorder = "ASC";
@@ -587,7 +587,7 @@
 			{
 				$sortorder = "DESC";
 			}
-			
+
 			if($fieldcolname != "none")
 			{
 				$selectedfields = explode(":",$fieldcolname);
@@ -596,29 +596,29 @@
 				$this->groupbylist[$fieldcolname] = $selectedfields[0].".".$selectedfields[1]." ".$selectedfields[2];
 			}
 		}
-		 $log->info("ReportRun :: Successfully returned getGroupingList".$reportid);
+		$log->info("ReportRun :: Successfully returned getGroupingList".$reportid);
 		return $grouplist;
 	}
 
 	function getSelectedOrderbyList($reportid)
 	{
-	
+
 		global $adb;
 		global $modules;
 		global $log;
-	
+
 		$sreportsortsql = "select vtiger_reportsortcol.* from vtiger_report"; 
 		$sreportsortsql .= " inner join vtiger_reportsortcol on vtiger_report.reportid = vtiger_reportsortcol.reportid"; 
 		$sreportsortsql .= " where vtiger_report.reportid =".$reportid." order by vtiger_reportsortcol.sortcolid";
-		
+
 		$result = $adb->query($sreportsortsql);
 		$noofrows = $adb->num_rows($result);
-	
+
 		for($i=0; $i<$noofrows; $i++)
 		{
 			$fieldcolname = $adb->query_result($result,$i,"columnname");
 			$sortorder = $adb->query_result($result,$i,"sortorder");
-			
+
 			if($sortorder == "Ascending")
 			{
 				$sortorder = "ASC";
@@ -627,7 +627,7 @@
 			{
 				$sortorder = "DESC";
 			}
-			
+
 			if($fieldcolname != "none")
 			{
 				$this->orderbylistcolumns[] = $fieldcolname;
@@ -655,43 +655,45 @@
 			if($secmodule == "Accounts")
 			{
 				$query = "left join vtiger_account on vtiger_account.accountid = vtiger_contactdetails.accountid
-                                left join vtiger_crmentity as vtiger_crmentityAccounts on vtiger_crmentityAccounts.crmid=vtiger_account.accountid
-                                left join vtiger_accountbillads on vtiger_account.accountid=vtiger_accountbillads.accountaddressid
-                                left join vtiger_accountshipads on vtiger_account.accountid=vtiger_accountshipads.accountaddressid
-                                left join vtiger_accountscf on vtiger_account.accountid = vtiger_accountscf.accountid
-                                left join vtiger_account as vtiger_accountAccounts on vtiger_accountAccounts.accountid = vtiger_account.parentid
-                                left join vtiger_users as vtiger_usersAccounts on vtiger_usersAccounts.id = vtiger_crmentityAccounts.smownerid ";
+					left join vtiger_crmentity as vtiger_crmentityAccounts on vtiger_crmentityAccounts.crmid=vtiger_account.accountid
+					left join vtiger_accountbillads on vtiger_account.accountid=vtiger_accountbillads.accountaddressid
+					left join vtiger_accountshipads on vtiger_account.accountid=vtiger_accountshipads.accountaddressid
+					left join vtiger_accountscf on vtiger_account.accountid = vtiger_accountscf.accountid
+					left join vtiger_account as vtiger_accountAccounts on vtiger_accountAccounts.accountid = vtiger_account.parentid
+					left join vtiger_users as vtiger_usersAccounts on vtiger_usersAccounts.id = vtiger_crmentityAccounts.smownerid ";
 			}
 			if($secmodule == "Potentials")
 			{
 				$query = "left join  vtiger_potential on vtiger_potential.accountid = vtiger_contactdetails.accountid
-				left join vtiger_crmentity as vtiger_crmentityPotentials on vtiger_crmentityPotentials.crmid=vtiger_potential.potentialid
-				left join vtiger_account as vtiger_accountPotentials on vtiger_potential.accountid = vtiger_accountPotentials.accountid
-				left join vtiger_potentialscf on vtiger_potentialscf.potentialid = vtiger_potential.potentialid
-				left join vtiger_users as vtiger_usersPotentials on vtiger_usersPotentials.id = vtiger_crmentityPotentials.smownerid ";
+					left join vtiger_crmentity as vtiger_crmentityPotentials on vtiger_crmentityPotentials.crmid=vtiger_potential.potentialid
+					left join vtiger_account as vtiger_accountPotentials on vtiger_potential.accountid = vtiger_accountPotentials.accountid
+					left join vtiger_potentialscf on vtiger_potentialscf.potentialid = vtiger_potential.potentialid
+					left join vtiger_users as vtiger_usersPotentials on vtiger_usersPotentials.id = vtiger_crmentityPotentials.smownerid ";
 			}
 			if($secmodule == "Quotes")
-                        {
-                                $query = "left join vtiger_quotes on vtiger_quotes.contactid = vtiger_contactdetails.contactid
-                                left join vtiger_crmentity as vtiger_crmentityQuotes on vtiger_crmentityQuotes.crmid=vtiger_quotes.quoteid
-                                left join vtiger_quotesbillads on vtiger_quotes.quoteid=vtiger_quotesbillads.quotebilladdressid
-                                left join vtiger_quotesshipads on vtiger_quotes.quoteid=vtiger_quotesshipads.quoteshipaddressid
-                                left join vtiger_users as vtiger_usersQuotes on vtiger_usersQuotes.id = vtiger_crmentityQuotes.smownerid
-                                left join vtiger_users as vtiger_usersRel1 on vtiger_usersRel1.id = vtiger_quotes.inventorymanager
-                                left join vtiger_potential as vtiger_potentialRel on vtiger_potentialRel.potentialid = vtiger_quotes.potentialid
-                                left join vtiger_contactdetails as vtiger_contactdetailsQuotes on vtiger_contactdetailsQuotes.contactid = vtiger_quotes.contactid
-                                left join vtiger_account as vtiger_accountQuotes on vtiger_accountQuotes.accountid = vtiger_quotes.accountid ";
-                        }
-                        if($secmodule == "PurchaseOrder")
-                        {
-                                $query = "left join vtiger_purchaseorder on vtiger_purchaseorder.contactid = vtiger_contactdetails.contactid
-                                left join vtiger_crmentity as vtiger_crmentityPurchaseOrder on vtiger_crmentityPurchaseOrder.crmid=vtiger_purchaseorder.purchaseorderid
-                                left join vtiger_pobillads on vtiger_purchaseorder.purchaseorderid=vtiger_pobillads.pobilladdressid
-                                left join vtiger_poshipads on vtiger_purchaseorder.purchaseorderid=vtiger_poshipads.poshipaddressid
-                                left join vtiger_users as vtiger_usersPurchaseOrder on vtiger_usersPurchaseOrder.id = vtiger_crmentityPurchaseOrder.smownerid
-                                left join vtiger_vendor as vtiger_vendorRel on vtiger_vendorRel.vendorid = vtiger_purchaseorder.vendorid
-                                left join vtiger_contactdetails as vtiger_contactdetailsPurchaseOrder on vtiger_contactdetailsPurchaseOrder.contactid = vtiger_purchaseorder.contactid ";
-                        }
+			{
+				$query = "left join vtiger_quotes on vtiger_quotes.contactid = vtiger_contactdetails.contactid
+					left join vtiger_quotescf on vtiger_quotes.quoteid = vtiger_quotescf.quoteid 
+					left join vtiger_crmentity as vtiger_crmentityQuotes on vtiger_crmentityQuotes.crmid=vtiger_quotes.quoteid
+					left join vtiger_quotesbillads on vtiger_quotes.quoteid=vtiger_quotesbillads.quotebilladdressid
+					left join vtiger_quotesshipads on vtiger_quotes.quoteid=vtiger_quotesshipads.quoteshipaddressid
+					left join vtiger_users as vtiger_usersQuotes on vtiger_usersQuotes.id = vtiger_crmentityQuotes.smownerid
+					left join vtiger_users as vtiger_usersRel1 on vtiger_usersRel1.id = vtiger_quotes.inventorymanager
+					left join vtiger_potential as vtiger_potentialRel on vtiger_potentialRel.potentialid = vtiger_quotes.potentialid
+					left join vtiger_contactdetails as vtiger_contactdetailsQuotes on vtiger_contactdetailsQuotes.contactid = vtiger_quotes.contactid
+					left join vtiger_account as vtiger_accountQuotes on vtiger_accountQuotes.accountid = vtiger_quotes.accountid ";
+			}
+			if($secmodule == "PurchaseOrder")
+			{
+				$query = "left join vtiger_purchaseorder on vtiger_purchaseorder.contactid = vtiger_contactdetails.contactid
+					left join vtiger_purchaseordercf on vtiger_purchaseorder.purchaseorderid = vtiger_purchaseordercf.purchaseorderid  
+					left join vtiger_crmentity as vtiger_crmentityPurchaseOrder on vtiger_crmentityPurchaseOrder.crmid=vtiger_purchaseorder.purchaseorderid
+					left join vtiger_pobillads on vtiger_purchaseorder.purchaseorderid=vtiger_pobillads.pobilladdressid
+					left join vtiger_poshipads on vtiger_purchaseorder.purchaseorderid=vtiger_poshipads.poshipaddressid
+					left join vtiger_users as vtiger_usersPurchaseOrder on vtiger_usersPurchaseOrder.id = vtiger_crmentityPurchaseOrder.smownerid
+					left join vtiger_vendor as vtiger_vendorRel on vtiger_vendorRel.vendorid = vtiger_purchaseorder.vendorid
+					left join vtiger_contactdetails as vtiger_contactdetailsPurchaseOrder on vtiger_contactdetailsPurchaseOrder.contactid = vtiger_purchaseorder.contactid ";
+			}
 
 		}
 
@@ -700,125 +702,131 @@
 			if($secmodule == "Potentials")
 			{
 				$query = "left join vtiger_potential on vtiger_potential.accountid = vtiger_account.accountid
-				left join vtiger_crmentity as vtiger_crmentityPotentials on vtiger_crmentityPotentials.crmid=vtiger_potential.potentialid
-                                left join vtiger_potentialscf on vtiger_potentialscf.potentialid = vtiger_potential.potentialid
-                                left join vtiger_users as vtiger_usersPotentials on vtiger_usersPotentials.id = vtiger_crmentityPotentials.smownerid ";
+					left join vtiger_crmentity as vtiger_crmentityPotentials on vtiger_crmentityPotentials.crmid=vtiger_potential.potentialid
+					left join vtiger_potentialscf on vtiger_potentialscf.potentialid = vtiger_potential.potentialid
+					left join vtiger_users as vtiger_usersPotentials on vtiger_usersPotentials.id = vtiger_crmentityPotentials.smownerid ";
 
 			}
 			if($secmodule == "Contacts")
 			{
 				$query = "left join vtiger_contactdetails on vtiger_contactdetails.accountid = vtiger_account.accountid
-				left join vtiger_crmentity as vtiger_crmentityContacts on vtiger_crmentityContacts.crmid = vtiger_contactdetails.contactid
-                                left join vtiger_contactaddress on vtiger_contactdetails.contactid = vtiger_contactaddress.contactaddressid
-                                left join vtiger_contactsubdetails on vtiger_contactdetails.contactid = vtiger_contactsubdetails.contactsubscriptionid
-				left join vtiger_contactdetails as vtiger_contactdetailsContacts on vtiger_contactdetailsContacts.contactid = vtiger_contactdetails.reportsto
-				left join vtiger_account as vtiger_accountContacts on vtiger_accountContacts.accountid = vtiger_contactdetails.accountid 
-                                left join vtiger_contactscf on vtiger_contactdetails.contactid = vtiger_contactscf.contactid
-                                left join vtiger_users as vtiger_usersContacts on vtiger_usersContacts.id = vtiger_crmentityContacts.smownerid ";
+					left join vtiger_crmentity as vtiger_crmentityContacts on vtiger_crmentityContacts.crmid = vtiger_contactdetails.contactid
+					left join vtiger_contactaddress on vtiger_contactdetails.contactid = vtiger_contactaddress.contactaddressid
+					left join vtiger_contactsubdetails on vtiger_contactdetails.contactid = vtiger_contactsubdetails.contactsubscriptionid
+					left join vtiger_contactdetails as vtiger_contactdetailsContacts on vtiger_contactdetailsContacts.contactid = vtiger_contactdetails.reportsto
+					left join vtiger_customerdetails on vtiger_customerdetails.customerid = vtiger_contactdetails.contactid
+					left join vtiger_account as vtiger_accountContacts on vtiger_accountContacts.accountid = vtiger_contactdetails.accountid 
+					left join vtiger_contactscf on vtiger_contactdetails.contactid = vtiger_contactscf.contactid
+					left join vtiger_users as vtiger_usersContacts on vtiger_usersContacts.id = vtiger_crmentityContacts.smownerid ";
 			}
 			if($secmodule == "Quotes")
 			{
 				$query = "left join vtiger_quotes on vtiger_quotes.accountid = vtiger_account.accountid
-                                left join vtiger_crmentity as vtiger_crmentityQuotes on vtiger_crmentityQuotes.crmid=vtiger_quotes.quoteid
-                                left join vtiger_quotesbillads on vtiger_quotes.quoteid=vtiger_quotesbillads.quotebilladdressid
-                                left join vtiger_quotesshipads on vtiger_quotes.quoteid=vtiger_quotesshipads.quoteshipaddressid
-                                left join vtiger_users as vtiger_usersQuotes on vtiger_usersQuotes.id = vtiger_crmentityQuotes.smownerid
-                                left join vtiger_users as vtiger_usersRel1 on vtiger_usersRel1.id = vtiger_quotes.inventorymanager
-                                left join vtiger_potential as vtiger_potentialRel on vtiger_potentialRel.potentialid = vtiger_quotes.potentialid
-                                left join vtiger_contactdetails as vtiger_contactdetailsQuotes on vtiger_contactdetailsQuotes.contactid = vtiger_quotes.contactid
-                                left join vtiger_account as vtiger_accountQuotes on vtiger_accountQuotes.accountid = vtiger_quotes.accountid ";
+					left join vtiger_quotescf on vtiger_quotes.quoteid = vtiger_quotescf.quoteid 
+					left join vtiger_crmentity as vtiger_crmentityQuotes on vtiger_crmentityQuotes.crmid=vtiger_quotes.quoteid
+					left join vtiger_quotesbillads on vtiger_quotes.quoteid=vtiger_quotesbillads.quotebilladdressid
+					left join vtiger_quotesshipads on vtiger_quotes.quoteid=vtiger_quotesshipads.quoteshipaddressid
+					left join vtiger_users as vtiger_usersQuotes on vtiger_usersQuotes.id = vtiger_crmentityQuotes.smownerid
+					left join vtiger_users as vtiger_usersRel1 on vtiger_usersRel1.id = vtiger_quotes.inventorymanager
+					left join vtiger_potential as vtiger_potentialRel on vtiger_potentialRel.potentialid = vtiger_quotes.potentialid
+					left join vtiger_contactdetails as vtiger_contactdetailsQuotes on vtiger_contactdetailsQuotes.contactid = vtiger_quotes.contactid
+					left join vtiger_account as vtiger_accountQuotes on vtiger_accountQuotes.accountid = vtiger_quotes.accountid ";
 			}
 			if($secmodule == "PurchaseOrder")
 			{
 				$query = "left join vtiger_purchaseorder on vtiger_purchaseorder.accountid = vtiger_account.accountid
-                                left join vtiger_crmentity as vtiger_crmentityPurchaseOrder on vtiger_crmentityPurchaseOrder.crmid=vtiger_purchaseorder.purchaseorderid
-                                left join vtiger_pobillads on vtiger_purchaseorder.purchaseorderid=vtiger_pobillads.pobilladdressid
-                                left join vtiger_poshipads on vtiger_purchaseorder.purchaseorderid=vtiger_poshipads.poshipaddressid
-                                left join vtiger_users as vtiger_usersPurchaseOrder on vtiger_usersPurchaseOrder.id = vtiger_crmentityPurchaseOrder.smownerid
-                                left join vtiger_vendor as vtiger_vendorRel on vtiger_vendorRel.vendorid = vtiger_purchaseorder.vendorid
-                                left join vtiger_contactdetails as vtiger_contactdetailsPurchaseOrder on vtiger_contactdetailsPurchaseOrder.contactid = vtiger_purchaseorder.contactid ";
+					left join vtiger_purchaseordercf on vtiger_purchaseorder.purchaseorderid = vtiger_purchaseordercf.purchaseorderid  
+					left join vtiger_crmentity as vtiger_crmentityPurchaseOrder on vtiger_crmentityPurchaseOrder.crmid=vtiger_purchaseorder.purchaseorderid
+					left join vtiger_pobillads on vtiger_purchaseorder.purchaseorderid=vtiger_pobillads.pobilladdressid
+					left join vtiger_poshipads on vtiger_purchaseorder.purchaseorderid=vtiger_poshipads.poshipaddressid
+					left join vtiger_users as vtiger_usersPurchaseOrder on vtiger_usersPurchaseOrder.id = vtiger_crmentityPurchaseOrder.smownerid
+					left join vtiger_vendor as vtiger_vendorRel on vtiger_vendorRel.vendorid = vtiger_purchaseorder.vendorid
+					left join vtiger_contactdetails as vtiger_contactdetailsPurchaseOrder on vtiger_contactdetailsPurchaseOrder.contactid = vtiger_purchaseorder.contactid ";
 			}
 			if($secmodule == "Invoice")
 			{
 				$query = "left join vtiger_invoice on vtiger_invoice.accountid = vtiger_account.accountid
-                                left join vtiger_crmentity as vtiger_crmentityInvoice on vtiger_crmentityInvoice.crmid=vtiger_invoice.invoiceid
-                                left join vtiger_invoicebillads on vtiger_invoice.invoiceid=vtiger_invoicebillads.invoicebilladdressid
-                                left join vtiger_invoiceshipads on vtiger_invoice.invoiceid=vtiger_invoiceshipads.invoiceshipaddressid
-                                left join vtiger_users as vtiger_usersInvoice on vtiger_usersInvoice.id = vtiger_crmentityInvoice.smownerid
-                                left join vtiger_account as vtiger_accountInvoice on vtiger_accountInvoice.accountid = vtiger_invoice.accountid ";
+					left join vtiger_invoicecf on vtiger_invoice.invoiceid = vtiger_invoicecf.invoiceid 
+					left join vtiger_crmentity as vtiger_crmentityInvoice on vtiger_crmentityInvoice.crmid=vtiger_invoice.invoiceid
+					left join vtiger_invoicebillads on vtiger_invoice.invoiceid=vtiger_invoicebillads.invoicebilladdressid
+					left join vtiger_invoiceshipads on vtiger_invoice.invoiceid=vtiger_invoiceshipads.invoiceshipaddressid
+					left join vtiger_users as vtiger_usersInvoice on vtiger_usersInvoice.id = vtiger_crmentityInvoice.smownerid
+					left join vtiger_account as vtiger_accountInvoice on vtiger_accountInvoice.accountid = vtiger_invoice.accountid ";
 			}
 			if($secmodule == "Products")
 			{
 				$query = "left join vtiger_seproductsrel on vtiger_seproductsrel.crmid = vtiger_account.accountid
-				left join vtiger_products on vtiger_products.productid = vtiger_seproductsrel.productid
-                                left join vtiger_crmentity as vtiger_crmentityProducts on vtiger_crmentityProducts.crmid=vtiger_products.productid
-                                left join vtiger_productcf on vtiger_products.productid = vtiger_productcf.productid
-                                left join vtiger_users as vtiger_usersProducts on vtiger_usersProducts.id = vtiger_crmentityProducts.smownerid
-                                left join vtiger_contactdetails as vtiger_contactdetailsProducts on vtiger_contactdetailsProducts.contactid = vtiger_products.contactid
-                                left join vtiger_vendor as vtiger_vendorRel on vtiger_vendorRel.vendorid = vtiger_products.vendor_id
-                                left join vtiger_crmentity as vtiger_crmentityRel on vtiger_crmentityRel.crmid = vtiger_seproductsrel.crmid
-                                left join vtiger_account as vtiger_accountRel on vtiger_accountRel.accountid=crmentityRel.crmid
-                                left join vtiger_leaddetails as vtiger_leaddetailsRel on vtiger_leaddetailsRel.leadid = vtiger_crmentityRel.crmid
-                                left join vtiger_potential as vtiger_potentialRel on vtiger_potentialRel.potentialid = vtiger_crmentityRel.crmid ";
+					left join vtiger_products on vtiger_products.productid = vtiger_seproductsrel.productid
+					left join vtiger_crmentity as vtiger_crmentityProducts on vtiger_crmentityProducts.crmid=vtiger_products.productid
+					left join vtiger_productcf on vtiger_products.productid = vtiger_productcf.productid
+					left join vtiger_users as vtiger_usersProducts on vtiger_usersProducts.id = vtiger_crmentityProducts.smownerid
+					left join vtiger_contactdetails as vtiger_contactdetailsProducts on vtiger_contactdetailsProducts.contactid = vtiger_products.contactid
+					left join vtiger_vendor as vtiger_vendorRel on vtiger_vendorRel.vendorid = vtiger_products.vendor_id
+					left join vtiger_crmentity as vtiger_crmentityRel on vtiger_crmentityRel.crmid = vtiger_seproductsrel.crmid
+					left join vtiger_account as vtiger_accountRel on vtiger_accountRel.accountid=crmentityRel.crmid
+					left join vtiger_leaddetails as vtiger_leaddetailsRel on vtiger_leaddetailsRel.leadid = vtiger_crmentityRel.crmid
+					left join vtiger_potential as vtiger_potentialRel on vtiger_potentialRel.potentialid = vtiger_crmentityRel.crmid ";
 			}
 		}
 		if($module == "Quotes")
 		{
 			if($secmodule == "Accounts")
-                        {
-                                $query = "left join vtiger_account on vtiger_account.accountid = vtiger_quotes.accountid
-                                left join vtiger_crmentity as vtiger_crmentityAccounts on vtiger_crmentityAccounts.crmid=vtiger_account.accountid
-                                left join vtiger_accountbillads on vtiger_account.accountid=vtiger_accountbillads.accountaddressid
-                                left join vtiger_accountshipads on vtiger_account.accountid=vtiger_accountshipads.accountaddressid
-                                left join vtiger_accountscf on vtiger_account.accountid = vtiger_accountscf.accountid
-                                left join vtiger_account as vtiger_accountAccounts on vtiger_accountAccounts.accountid = vtiger_account.parentid
-                                left join vtiger_users as vtiger_usersAccounts on vtiger_usersAccounts.id = vtiger_crmentityAccounts.smownerid ";
-                        }
+			{
+				$query = "left join vtiger_account on vtiger_account.accountid = vtiger_quotes.accountid
+					left join vtiger_crmentity as vtiger_crmentityAccounts on vtiger_crmentityAccounts.crmid=vtiger_account.accountid
+					left join vtiger_accountbillads on vtiger_account.accountid=vtiger_accountbillads.accountaddressid
+					left join vtiger_accountshipads on vtiger_account.accountid=vtiger_accountshipads.accountaddressid
+					left join vtiger_accountscf on vtiger_account.accountid = vtiger_accountscf.accountid
+					left join vtiger_account as vtiger_accountAccounts on vtiger_accountAccounts.accountid = vtiger_account.parentid
+					left join vtiger_users as vtiger_usersAccounts on vtiger_usersAccounts.id = vtiger_crmentityAccounts.smownerid ";
+			}
 			if($secmodule == "Potentials")
-                        {
-                                $query = "left join vtiger_potential on vtiger_potential.potentialid = vtiger_quotes.potentialid
-                                left join vtiger_crmentity as vtiger_crmentityPotentials on vtiger_crmentityPotentials.crmid=vtiger_potential.potentialid 
-				left join vtiger_potentialscf on vtiger_potentialscf.potentialid = vtiger_potential.potentialid
-                                left join vtiger_users as vtiger_usersPotentials on vtiger_usersPotentials.id = vtiger_crmentityPotentials.smownerid ";
-
-                        }
+			{
+				$query = "left join vtiger_potential on vtiger_potential.potentialid = vtiger_quotes.potentialid
+					left join vtiger_crmentity as vtiger_crmentityPotentials on vtiger_crmentityPotentials.crmid=vtiger_potential.potentialid 
+					left join vtiger_potentialscf on vtiger_potentialscf.potentialid = vtiger_potential.potentialid
+					left join vtiger_users as vtiger_usersPotentials on vtiger_usersPotentials.id = vtiger_crmentityPotentials.smownerid ";
+
+			}
 			if($secmodule == "Contacts")
-                        {
-                                $query = "left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_quotes.contactid
-                                left join vtiger_crmentity as vtiger_crmentityContacts on vtiger_crmentityContacts.crmid = vtiger_contactdetails.contactid
-                                left join vtiger_contactaddress on vtiger_contactdetails.contactid = vtiger_contactaddress.contactaddressid
-                                left join vtiger_contactsubdetails on vtiger_contactdetails.contactid = vtiger_contactsubdetails.contactsubscriptionid
-                                left join vtiger_contactdetails as vtiger_contactdetailsContacts on vtiger_contactdetailsContacts.contactid = vtiger_contactdetails.reportsto
-                                left join vtiger_account as vtiger_accountContacts on vtiger_accountContacts.accountid = vtiger_contactdetails.accountid
-
-                                left join vtiger_contactscf on vtiger_contactdetails.contactid = vtiger_contactscf.contactid
-                                left join vtiger_users as vtiger_usersContacts on vtiger_usersContacts.id = vtiger_crmentityContacts.smownerid ";
-                        }
+			{
+				$query = "left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_quotes.contactid
+					left join vtiger_crmentity as vtiger_crmentityContacts on vtiger_crmentityContacts.crmid = vtiger_contactdetails.contactid
+					left join vtiger_contactaddress on vtiger_contactdetails.contactid = vtiger_contactaddress.contactaddressid
+					left join vtiger_contactsubdetails on vtiger_contactdetails.contactid = vtiger_contactsubdetails.contactsubscriptionid
+					left join vtiger_contactdetails as vtiger_contactdetailsContacts on vtiger_contactdetailsContacts.contactid = vtiger_contactdetails.reportsto
+					left join vtiger_customerdetails on vtiger_customerdetails.customerid = vtiger_contactdetails.contactid
+					left join vtiger_account as vtiger_accountContacts on vtiger_accountContacts.accountid = vtiger_contactdetails.accountid
+
+					left join vtiger_contactscf on vtiger_contactdetails.contactid = vtiger_contactscf.contactid
+					left join vtiger_users as vtiger_usersContacts on vtiger_usersContacts.id = vtiger_crmentityContacts.smownerid ";
+			}
 
 		}
 		if($module == "PurchaseOrder")
 		{
 			if($secmodule == "Accounts")
-                        {
-                                $query = "left join vtiger_account on vtiger_account.accountid = vtiger_purchaseorder.accountid
-                                left join vtiger_crmentity as vtiger_crmentityAccounts on vtiger_crmentityAccounts.crmid=vtiger_account.accountid
-                                left join vtiger_accountbillads on vtiger_account.accountid=vtiger_accountbillads.accountaddressid
-                                left join vtiger_accountshipads on vtiger_account.accountid=vtiger_accountshipads.accountaddressid
-                                left join vtiger_accountscf on vtiger_account.accountid = vtiger_accountscf.accountid
-                                left join vtiger_account as vtiger_accountAccounts on vtiger_accountAccounts.accountid = vtiger_account.parentid
-                                left join vtiger_users as vtiger_usersAccounts on vtiger_usersAccounts.id = vtiger_crmentityAccounts.smownerid ";
-                        }
+			{
+				$query = "left join vtiger_account on vtiger_account.accountid = vtiger_purchaseorder.accountid
+					left join vtiger_crmentity as vtiger_crmentityAccounts on vtiger_crmentityAccounts.crmid=vtiger_account.accountid
+					left join vtiger_accountbillads on vtiger_account.accountid=vtiger_accountbillads.accountaddressid
+					left join vtiger_accountshipads on vtiger_account.accountid=vtiger_accountshipads.accountaddressid
+					left join vtiger_accountscf on vtiger_account.accountid = vtiger_accountscf.accountid
+					left join vtiger_account as vtiger_accountAccounts on vtiger_accountAccounts.accountid = vtiger_account.parentid
+					left join vtiger_users as vtiger_usersAccounts on vtiger_usersAccounts.id = vtiger_crmentityAccounts.smownerid ";
+			}
 			if($secmodule == "Contacts")
 			{
 				$query = "left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_purchaseorder.contactid
-                                left join vtiger_crmentity as vtiger_crmentityContacts on vtiger_crmentityContacts.crmid = vtiger_contactdetails.contactid
-                                left join vtiger_contactaddress on vtiger_contactdetails.contactid = vtiger_contactaddress.contactaddressid
-                                left join vtiger_contactsubdetails on vtiger_contactdetails.contactid = vtiger_contactsubdetails.contactsubscriptionid
-                                left join vtiger_contactdetails as vtiger_contactdetailsContacts on vtiger_contactdetailsContacts.contactid = vtiger_contactdetails.reportsto
-                                left join vtiger_account as vtiger_accountContacts on vtiger_accountContacts.accountid = vtiger_contactdetails.accountid
-
-                                left join vtiger_contactscf on vtiger_contactdetails.contactid = vtiger_contactscf.contactid
-                                left join vtiger_users as vtiger_usersContacts on vtiger_usersContacts.id = vtiger_crmentityContacts.smownerid ";
+					left join vtiger_crmentity as vtiger_crmentityContacts on vtiger_crmentityContacts.crmid = vtiger_contactdetails.contactid
+					left join vtiger_contactaddress on vtiger_contactdetails.contactid = vtiger_contactaddress.contactaddressid
+					left join vtiger_contactsubdetails on vtiger_contactdetails.contactid = vtiger_contactsubdetails.contactsubscriptionid
+					left join vtiger_contactdetails as vtiger_contactdetailsContacts on vtiger_contactdetailsContacts.contactid = vtiger_contactdetails.reportsto
+					left join vtiger_customerdetails on vtiger_customerdetails.customerid = vtiger_contactdetails.contactid
+					left join vtiger_account as vtiger_accountContacts on vtiger_accountContacts.accountid = vtiger_contactdetails.accountid
+
+					left join vtiger_contactscf on vtiger_contactdetails.contactid = vtiger_contactscf.contactid
+					left join vtiger_users as vtiger_usersContacts on vtiger_usersContacts.id = vtiger_crmentityContacts.smownerid ";
 			}
 		}
 		if($module == "Invoice")
@@ -826,75 +834,77 @@
 			if($secmodule == "Accounts")
 			{
 				$query = "left join vtiger_account on vtiger_account.accountid = vtiger_invoice.accountid
-                                left join vtiger_crmentity as vtiger_crmentityAccounts on vtiger_crmentityAccounts.crmid=vtiger_account.accountid
-                                left join vtiger_accountbillads on vtiger_account.accountid=vtiger_accountbillads.accountaddressid
-                                left join vtiger_accountshipads on vtiger_account.accountid=vtiger_accountshipads.accountaddressid
-                                left join vtiger_accountscf on vtiger_account.accountid = vtiger_accountscf.accountid
-                                left join vtiger_account as vtiger_accountAccounts on vtiger_accountAccounts.accountid = vtiger_account.parentid
-                                left join vtiger_users as vtiger_usersAccounts on vtiger_usersAccounts.id = vtiger_crmentityAccounts.smownerid ";
+					left join vtiger_crmentity as vtiger_crmentityAccounts on vtiger_crmentityAccounts.crmid=vtiger_account.accountid
+					left join vtiger_accountbillads on vtiger_account.accountid=vtiger_accountbillads.accountaddressid
+					left join vtiger_accountshipads on vtiger_account.accountid=vtiger_accountshipads.accountaddressid
+					left join vtiger_accountscf on vtiger_account.accountid = vtiger_accountscf.accountid
+					left join vtiger_account as vtiger_accountAccounts on vtiger_accountAccounts.accountid = vtiger_account.parentid
+					left join vtiger_users as vtiger_usersAccounts on vtiger_usersAccounts.id = vtiger_crmentityAccounts.smownerid ";
 			}
 		}
 		if($module == "Products")
 		{
 			if($secmodule == "Accounts")
-                        {
-                                $query = "left join vtiger_account on vtiger_account.accountid = vtiger_crmentityRel.crmid
-                                left join vtiger_crmentity as vtiger_crmentityAccounts on vtiger_crmentityAccounts.crmid=vtiger_account.accountid
-                                left join vtiger_accountbillads on vtiger_account.accountid=vtiger_accountbillads.accountaddressid
-                                left join vtiger_accountshipads on vtiger_account.accountid=vtiger_accountshipads.accountaddressid
-                                left join vtiger_accountscf on vtiger_account.accountid = vtiger_accountscf.accountid
-                                left join vtiger_account as vtiger_accountAccounts on vtiger_accountAccounts.accountid = vtiger_account.parentid
-                                left join vtiger_users as vtiger_usersAccounts on vtiger_usersAccounts.id = vtiger_crmentityAccounts.smownerid ";
-                        }
+			{
+				$query = "left join vtiger_account on vtiger_account.accountid = vtiger_crmentityRel.crmid
+					left join vtiger_crmentity as vtiger_crmentityAccounts on vtiger_crmentityAccounts.crmid=vtiger_account.accountid
+					left join vtiger_accountbillads on vtiger_account.accountid=vtiger_accountbillads.accountaddressid
+					left join vtiger_accountshipads on vtiger_account.accountid=vtiger_accountshipads.accountaddressid
+					left join vtiger_accountscf on vtiger_account.accountid = vtiger_accountscf.accountid
+					left join vtiger_account as vtiger_accountAccounts on vtiger_accountAccounts.accountid = vtiger_account.parentid
+					left join vtiger_users as vtiger_usersAccounts on vtiger_usersAccounts.id = vtiger_crmentityAccounts.smownerid ";
+			}
 			if($secmodule == "Contacts")
-                        {
-                                $query = "left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_products.contactid
-                                left join vtiger_crmentity as vtiger_crmentityContacts on vtiger_crmentityContacts.crmid = vtiger_contactdetails.contactid
-                                left join vtiger_contactaddress on vtiger_contactdetails.contactid = vtiger_contactaddress.contactaddressid
-                                left join vtiger_contactsubdetails on vtiger_contactdetails.contactid = vtiger_contactsubdetails.contactsubscriptionid
-                                left join vtiger_contactdetails as vtiger_contactdetailsContacts on vtiger_contactdetailsContacts.contactid = vtiger_contactdetails.reportsto
-                                left join vtiger_account as vtiger_accountContacts on vtiger_accountContacts.accountid = vtiger_contactdetails.accountid
-                                left join vtiger_contactscf on vtiger_contactdetails.contactid = vtiger_contactscf.contactid
-                                left join vtiger_users as vtiger_usersContacts on vtiger_usersContacts.id = vtiger_crmentityContacts.smownerid ";
-
-                        }
+			{
+				$query = "left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_products.contactid
+					left join vtiger_crmentity as vtiger_crmentityContacts on vtiger_crmentityContacts.crmid = vtiger_contactdetails.contactid
+					left join vtiger_contactaddress on vtiger_contactdetails.contactid = vtiger_contactaddress.contactaddressid
+					left join vtiger_contactsubdetails on vtiger_contactdetails.contactid = vtiger_contactsubdetails.contactsubscriptionid
+					left join vtiger_contactdetails as vtiger_contactdetailsContacts on vtiger_contactdetailsContacts.contactid = vtiger_contactdetails.reportsto
+					left join vtiger_customerdetails on vtiger_customerdetails.customerid = vtiger_contactdetails.contactid
+					left join vtiger_account as vtiger_accountContacts on vtiger_accountContacts.accountid = vtiger_contactdetails.accountid
+					left join vtiger_contactscf on vtiger_contactdetails.contactid = vtiger_contactscf.contactid
+					left join vtiger_users as vtiger_usersContacts on vtiger_usersContacts.id = vtiger_crmentityContacts.smownerid ";
+
+			}
 
 		}
 		if($module == "Potentials")
 		{
 			if($secmodule == "Accounts")
-                        {
-                                $query = "left join vtiger_account on vtiger_account.accountid = vtiger_potential.accountid
-                                left join vtiger_crmentity as vtiger_crmentityAccounts on vtiger_crmentityAccounts.crmid=vtiger_account.accountid
-                                left join vtiger_accountbillads on vtiger_account.accountid=vtiger_accountbillads.accountaddressid
-                                left join vtiger_accountshipads on vtiger_account.accountid=vtiger_accountshipads.accountaddressid
-                                left join vtiger_accountscf on vtiger_account.accountid = vtiger_accountscf.accountid
-                                left join vtiger_account as vtiger_accountAccounts on vtiger_accountAccounts.accountid = vtiger_account.parentid
-                                left join vtiger_users as vtiger_usersAccounts on vtiger_usersAccounts.id = vtiger_crmentityAccounts.smownerid ";
-                        }
+			{
+				$query = "left join vtiger_account on vtiger_account.accountid = vtiger_potential.accountid
+					left join vtiger_crmentity as vtiger_crmentityAccounts on vtiger_crmentityAccounts.crmid=vtiger_account.accountid
+					left join vtiger_accountbillads on vtiger_account.accountid=vtiger_accountbillads.accountaddressid
+					left join vtiger_accountshipads on vtiger_account.accountid=vtiger_accountshipads.accountaddressid
+					left join vtiger_accountscf on vtiger_account.accountid = vtiger_accountscf.accountid
+					left join vtiger_account as vtiger_accountAccounts on vtiger_accountAccounts.accountid = vtiger_account.parentid
+					left join vtiger_users as vtiger_usersAccounts on vtiger_usersAccounts.id = vtiger_crmentityAccounts.smownerid ";
+			}
 			if($secmodule == "Contacts")
 			{
 				$query = "left join vtiger_contactdetails on vtiger_contactdetails.accountid = vtiger_potential.accountid
-				left join vtiger_crmentity as vtiger_crmentityContacts on vtiger_crmentityContacts.crmid = vtiger_contactdetails.contactid
-				left join vtiger_contactaddress on vtiger_contactdetails.contactid = vtiger_contactaddress.contactaddressid
-				left join vtiger_contactsubdetails on vtiger_contactdetails.contactid = vtiger_contactsubdetails.contactsubscriptionid
-				left join vtiger_contactdetails as vtiger_contactdetailsContacts on vtiger_contactdetailsContacts.contactid = vtiger_contactdetails.reportsto
-				left join vtiger_account as vtiger_accountContacts on vtiger_accountContacts.accountid = vtiger_contactdetails.accountid
-				left join vtiger_contactscf on vtiger_contactdetails.contactid = vtiger_contactscf.contactid
-				left join vtiger_users as vtiger_usersContacts on vtiger_usersContacts.id = vtiger_crmentityContacts.smownerid ";
+					left join vtiger_crmentity as vtiger_crmentityContacts on vtiger_crmentityContacts.crmid = vtiger_contactdetails.contactid
+					left join vtiger_contactaddress on vtiger_contactdetails.contactid = vtiger_contactaddress.contactaddressid
+					left join vtiger_customerdetails on vtiger_customerdetails.customerid = vtiger_contactdetails.contactid
+					left join vtiger_contactsubdetails on vtiger_contactdetails.contactid = vtiger_contactsubdetails.contactsubscriptionid
+					left join vtiger_contactdetails as vtiger_contactdetailsContacts on vtiger_contactdetailsContacts.contactid = vtiger_contactdetails.reportsto
+					left join vtiger_account as vtiger_accountContacts on vtiger_accountContacts.accountid = vtiger_contactdetails.accountid
+					left join vtiger_contactscf on vtiger_contactdetails.contactid = vtiger_contactscf.contactid
+					left join vtiger_users as vtiger_usersContacts on vtiger_usersContacts.id = vtiger_crmentityContacts.smownerid ";
 
 			}
 			if($secmodule == "Quotes")
 			{
 				$query = "left join vtiger_quotes on vtiger_quotes.potentialid = vtiger_potential.potentialid
-                                left join vtiger_crmentity as vtiger_crmentityQuotes on vtiger_crmentityQuotes.crmid=vtiger_quotes.quoteid
-                                left join vtiger_quotesbillads on vtiger_quotes.quoteid=vtiger_quotesbillads.quotebilladdressid
-                                left join vtiger_quotesshipads on vtiger_quotes.quoteid=vtiger_quotesshipads.quoteshipaddressid
-                                left join vtiger_users as vtiger_usersQuotes on vtiger_usersQuotes.id = vtiger_crmentityQuotes.smownerid
-                                left join vtiger_users as vtiger_usersRel1 on vtiger_usersRel1.id = vtiger_quotes.inventorymanager
-                                left join vtiger_potential as vtiger_potentialRel on vtiger_potentialRel.potentialid = vtiger_quotes.potentialid
-                                left join vtiger_contactdetails as vtiger_contactdetailsQuotes on vtiger_contactdetailsQuotes.contactid = vtiger_quotes.contactid
-                                left join vtiger_account as vtiger_accountQuotes on vtiger_accountQuotes.accountid = vtiger_quotes.accountid ";
+					left join vtiger_crmentity as vtiger_crmentityQuotes on vtiger_crmentityQuotes.crmid=vtiger_quotes.quoteid
+					left join vtiger_quotesbillads on vtiger_quotes.quoteid=vtiger_quotesbillads.quotebilladdressid
+					left join vtiger_quotesshipads on vtiger_quotes.quoteid=vtiger_quotesshipads.quoteshipaddressid
+					left join vtiger_users as vtiger_usersQuotes on vtiger_usersQuotes.id = vtiger_crmentityQuotes.smownerid
+					left join vtiger_users as vtiger_usersRel1 on vtiger_usersRel1.id = vtiger_quotes.inventorymanager
+					left join vtiger_potential as vtiger_potentialRel on vtiger_potentialRel.potentialid = vtiger_quotes.potentialid
+					left join vtiger_contactdetails as vtiger_contactdetailsQuotes on vtiger_contactdetailsQuotes.contactid = vtiger_quotes.contactid
+					left join vtiger_account as vtiger_accountQuotes on vtiger_accountQuotes.accountid = vtiger_quotes.accountid ";
 			}
 		}
 		if($module == "HelpDesk")
@@ -902,30 +912,31 @@
 			if($secmodule == "Products")
 			{
 				$query = "left join vtiger_products on vtiger_products.productid = vtiger_troubletickets.product_id
-                                left join vtiger_crmentity as vtiger_crmentityProducts on vtiger_crmentityProducts.crmid=vtiger_products.productid
-                                left join vtiger_productcf on vtiger_products.productid = vtiger_productcf.productid
-                                left join vtiger_users as vtiger_usersProducts on vtiger_usersProducts.id = vtiger_crmentityProducts.smownerid
-																left join vtiger_contactdetails as vtiger_contactdetailsProducts on vtiger_contactdetailsProducts.contactid = vtiger_products.contactid 
-                                left join vtiger_vendor as vtiger_vendorRel on vtiger_vendorRel.vendorid = vtiger_products.vendor_id
-                                left join vtiger_seproductsrel on vtiger_seproductsrel.productid = vtiger_products.productid
-                                left join vtiger_crmentity as vtiger_crmentityRelProducts on vtiger_crmentityRelProducts.crmid = vtiger_seproductsrel.crmid
-                                left join vtiger_account as vtiger_accountRelProducts on vtiger_accountRelProducts.accountid=vtiger_seproductsrel.crmid
-                                left join vtiger_leaddetails as vtiger_leaddetailsRelProducts on vtiger_leaddetailsRelProducts.leadid = vtiger_seproductsrel.crmid
-                                left join vtiger_potential as vtiger_potentialRelProducts on vtiger_potentialRelProducts.potentialid = vtiger_seproductsrel.crmid ";
+					left join vtiger_crmentity as vtiger_crmentityProducts on vtiger_crmentityProducts.crmid=vtiger_products.productid
+					left join vtiger_productcf on vtiger_products.productid = vtiger_productcf.productid
+					left join vtiger_users as vtiger_usersProducts on vtiger_usersProducts.id = vtiger_crmentityProducts.smownerid
+					left join vtiger_contactdetails as vtiger_contactdetailsProducts on vtiger_contactdetailsProducts.contactid = vtiger_products.contactid 
+					left join vtiger_vendor as vtiger_vendorRel on vtiger_vendorRel.vendorid = vtiger_products.vendor_id
+					left join vtiger_seproductsrel on vtiger_seproductsrel.productid = vtiger_products.productid
+					left join vtiger_crmentity as vtiger_crmentityRelProducts on vtiger_crmentityRelProducts.crmid = vtiger_seproductsrel.crmid
+					left join vtiger_account as vtiger_accountRelProducts on vtiger_accountRelProducts.accountid=vtiger_seproductsrel.crmid
+					left join vtiger_leaddetails as vtiger_leaddetailsRelProducts on vtiger_leaddetailsRelProducts.leadid = vtiger_seproductsrel.crmid
+					left join vtiger_potential as vtiger_potentialRelProducts on vtiger_potentialRelProducts.potentialid = vtiger_seproductsrel.crmid ";
 			}
 		}
 		if($module == "Activities")
 		{
 			if($secmodule == "Contacts")
 			{
-                                $query = "left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid 
-                                left join vtiger_crmentity as vtiger_crmentityContacts on vtiger_crmentityContacts.crmid = vtiger_contactdetails.contactid
-                                left join vtiger_contactaddress on vtiger_contactdetails.contactid = vtiger_contactaddress.contactaddressid
-                                left join vtiger_contactsubdetails on vtiger_contactdetails.contactid = vtiger_contactsubdetails.contactsubscriptionid
-                                left join vtiger_contactdetails as vtiger_contactdetailsContacts on vtiger_contactdetailsContacts.contactid = vtiger_contactdetails.reportsto
-                                left join vtiger_account as vtiger_accountContacts on vtiger_accountContacts.accountid = vtiger_contactdetails.accountid
-                                left join vtiger_contactscf on vtiger_contactdetails.contactid = vtiger_contactscf.contactid
-                                left join vtiger_users as vtiger_usersContacts on vtiger_usersContacts.id = vtiger_crmentityContacts.smownerid ";
+				$query = "left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid 
+					left join vtiger_crmentity as vtiger_crmentityContacts on vtiger_crmentityContacts.crmid = vtiger_contactdetails.contactid
+					left join vtiger_contactaddress on vtiger_contactdetails.contactid = vtiger_contactaddress.contactaddressid
+					left join vtiger_customerdetails on vtiger_customerdetails.customerid = vtiger_contactdetails.contactid
+					left join vtiger_contactsubdetails on vtiger_contactdetails.contactid = vtiger_contactsubdetails.contactsubscriptionid
+					left join vtiger_contactdetails as vtiger_contactdetailsContacts on vtiger_contactdetailsContacts.contactid = vtiger_contactdetails.reportsto
+					left join vtiger_account as vtiger_accountContacts on vtiger_accountContacts.accountid = vtiger_contactdetails.accountid
+					left join vtiger_contactscf on vtiger_contactdetails.contactid = vtiger_contactscf.contactid
+					left join vtiger_users as vtiger_usersContacts on vtiger_usersContacts.id = vtiger_crmentityContacts.smownerid ";
 			}
 		}
 		$log->info("ReportRun :: Successfully returned getRelatedModulesQuery".$secmodule);
@@ -944,9 +955,8 @@
 				left join vtiger_users as vtiger_usersLeads on vtiger_usersLeads.id = vtiger_crmentityLeads.smownerid
 				where vtiger_crmentityLeads.deleted=0 and vtiger_leaddetails.converted=0";
 		}
-
 		if($module == "Accounts")
-                {
+		{
 			$query = "from vtiger_account 
 				inner join vtiger_crmentity as vtiger_crmentityAccounts on vtiger_crmentityAccounts.crmid=vtiger_account.accountid 
 				inner join vtiger_accountbillads on vtiger_account.accountid=vtiger_accountbillads.accountaddressid 
@@ -959,7 +969,7 @@
 		}
 
 		if($module == "Contacts")
-                {
+		{
 			$query = "from vtiger_contactdetails
 				inner join vtiger_crmentity as vtiger_crmentityContacts on vtiger_crmentityContacts.crmid = vtiger_contactdetails.contactid 
 				inner join vtiger_contactaddress on vtiger_contactdetails.contactid = vtiger_contactaddress.contactaddressid 
@@ -983,7 +993,7 @@
 				".$this->getRelatedModulesQuery($module,$this->secondarymodule)."
 				where vtiger_crmentityPotentials.deleted=0 ";
 		}
-		
+
 		if($module == "Products")
 		{
 			$query = "from vtiger_products 
@@ -1007,7 +1017,7 @@
 				inner join vtiger_crmentity as vtiger_crmentityHelpDesk 
 				on vtiger_crmentityHelpDesk.crmid=vtiger_troubletickets.ticketid 
 				inner join vtiger_ticketcf on vtiger_ticketcf.ticketid = vtiger_troubletickets.ticketid
-        left join vtiger_crmentity as vtiger_crmentityRelHelpDesk on vtiger_crmentityRelHelpDesk.crmid = vtiger_troubletickets.parent_id
+				left join vtiger_crmentity as vtiger_crmentityRelHelpDesk on vtiger_crmentityRelHelpDesk.crmid = vtiger_troubletickets.parent_id
 				left join vtiger_account as vtiger_accountRelHelpDesk on vtiger_accountRelHelpDesk.accountid=crmentityRelHelpDesk.crmid 
 				left join vtiger_contactdetails as vtiger_contactdetailsRelHelpDesk on vtiger_contactdetailsRelHelpDesk.contactid= vtiger_crmentityRelHelpDesk.crmid
 				left join vtiger_products as vtiger_productsRel on vtiger_productsRel.productid = vtiger_crmentityRelHelpDesk.crmid
@@ -1025,7 +1035,7 @@
 				left join vtiger_users as vtiger_usersActivities on vtiger_usersActivities.id = vtiger_crmentityActivities.smownerid
 				left join vtiger_seactivityrel on vtiger_seactivityrel.activityid = vtiger_activity.activityid
 				left join vtiger_crmentity as vtiger_crmentityRelActivities on vtiger_crmentityRelActivities.crmid = vtiger_seactivityrel.crmid
-				left join vtiger_account as vtiger_accountRelActivities on vtiger_accountRelActivities.accountid=crmentityRelActivities.crmid
+				left join vtiger_account as vtiger_accountRelActivities on vtiger_accountRelActivities.accountid=vtiger_crmentityRelActivities.crmid
 				left join vtiger_leaddetails as vtiger_leaddetailsRelActivities on vtiger_leaddetailsRelActivities.leadid = vtiger_crmentityRelActivities.crmid
 				left join vtiger_potential as vtiger_potentialRelActivities on vtiger_potentialRelActivities.potentialid = vtiger_crmentityRelActivities.crmid
 				left join vtiger_quotes as vtiger_quotesRelActivities on vtiger_quotesRelActivities.quoteid = vtiger_crmentityRelActivities.crmid
@@ -1034,13 +1044,14 @@
 				".$this->getRelatedModulesQuery($module,$this->secondarymodule)."
 				WHERE vtiger_crmentityActivities.deleted=0 and (vtiger_activity.activitytype = 'Meeting' or vtiger_activity.activitytype='Call' or vtiger_activity.activitytype='Task')";
 		}
-		
+
 		if($module == "Quotes")
 		{
 			$query = "from vtiger_quotes 
 				inner join vtiger_crmentity as vtiger_crmentityQuotes on vtiger_crmentityQuotes.crmid=vtiger_quotes.quoteid 
 				inner join vtiger_quotesbillads on vtiger_quotes.quoteid=vtiger_quotesbillads.quotebilladdressid 
-				inner join vtiger_quotesshipads on vtiger_quotes.quoteid=vtiger_quotesshipads.quoteshipaddressid 
+				inner join vtiger_quotesshipads on vtiger_quotes.quoteid=vtiger_quotesshipads.quoteshipaddressid  
+				left join vtiger_quotescf on vtiger_quotes.quoteid = vtiger_quotescf.quoteid 
 				left join vtiger_users as vtiger_usersQuotes on vtiger_usersQuotes.id = vtiger_crmentityQuotes.smownerid
 				left join vtiger_users as vtiger_usersRel1 on vtiger_usersRel1.id = vtiger_quotes.inventorymanager
 				left join vtiger_potential as vtiger_potentialRel on vtiger_potentialRel.potentialid = vtiger_quotes.potentialid
@@ -1049,13 +1060,14 @@
 				".$this->getRelatedModulesQuery($module,$this->secondarymodule)."
 				where vtiger_crmentityQuotes.deleted=0";
 		}
-		
+
 		if($module == "PurchaseOrder")
 		{
 			$query = "from vtiger_purchaseorder 
 				inner join vtiger_crmentity as vtiger_crmentityPurchaseOrder on vtiger_crmentityPurchaseOrder.crmid=vtiger_purchaseorder.purchaseorderid 
 				inner join vtiger_pobillads on vtiger_purchaseorder.purchaseorderid=vtiger_pobillads.pobilladdressid 
 				inner join vtiger_poshipads on vtiger_purchaseorder.purchaseorderid=vtiger_poshipads.poshipaddressid 
+				left join vtiger_purchaseordercf on vtiger_purchaseorder.purchaseorderid = vtiger_purchaseordercf.purchaseorderid  
 				left join vtiger_users as vtiger_usersPurchaseOrder on vtiger_usersPurchaseOrder.id = vtiger_crmentityPurchaseOrder.smownerid 
 				left join vtiger_vendor as vtiger_vendorRel on vtiger_vendorRel.vendorid = vtiger_purchaseorder.vendorid 
 				left join vtiger_contactdetails as vtiger_contactdetailsPurchaseOrder on vtiger_contactdetailsPurchaseOrder.contactid = vtiger_purchaseorder.contactid 
@@ -1069,11 +1081,28 @@
 				inner join vtiger_crmentity as vtiger_crmentityInvoice on vtiger_crmentityInvoice.crmid=vtiger_invoice.invoiceid 
 				inner join vtiger_invoicebillads on vtiger_invoice.invoiceid=vtiger_invoicebillads.invoicebilladdressid 
 				inner join vtiger_invoiceshipads on vtiger_invoice.invoiceid=vtiger_invoiceshipads.invoiceshipaddressid 
+				left join vtiger_invoicecf on vtiger_invoice.invoiceid = vtiger_invoicecf.invoiceid 
 				left join vtiger_users as vtiger_usersInvoice on vtiger_usersInvoice.id = vtiger_crmentityInvoice.smownerid
 				left join vtiger_account as vtiger_accountInvoice on vtiger_accountInvoice.accountid = vtiger_invoice.accountid
 				".$this->getRelatedModulesQuery($module,$this->secondarymodule)."
 				where vtiger_crmentityInvoice.deleted=0";
 		}
+		if($module == "SalesOrder")
+		{
+			$query = "from vtiger_salesorder 
+				inner join vtiger_crmentity as vtiger_crmentitySalesOrder on vtiger_crmentitySalesOrder.crmid=vtiger_salesorder.salesorderid 
+				inner join vtiger_sobillads on vtiger_salesorder.salesorderid=vtiger_sobillads.sobilladdressid 
+				inner join vtiger_soshipads on vtiger_salesorder.salesorderid=vtiger_soshipads.soshipaddressid 
+				left join vtiger_salesordercf on vtiger_salesorder.salesorderid = vtiger_salesordercf.salesorderid  
+				left join vtiger_contactdetails as vtiger_contactdetailsSalesOrder on vtiger_contactdetailsSalesOrder.contactid = vtiger_salesorder.contactid 
+				left join vtiger_quotes as vtiger_quotesSalesOrder on vtiger_quotesSalesOrder.quoteid = vtiger_salesorder.quoteid				
+				left join vtiger_account as vtiger_accountSalesOrder on vtiger_accountSalesOrder.accountid = vtiger_salesorder.accountid
+				left join vtiger_potential as vtiger_potentialRel on vtiger_potentialRel.potentialid = vtiger_salesorder.potentialid 
+				left join vtiger_users as vtiger_usersSalesOrder on vtiger_usersSalesOrder.id = vtiger_crmentitySalesOrder.smownerid 
+				where vtiger_crmentitySalesOrder.deleted=0";
+
+
+		}	
 		$log->info("ReportRun :: Successfully returned getReportsQuery".$module);
 		return $query;
 	}
@@ -1114,13 +1143,12 @@
 		{
 			$groupsquery = implode(", ",$groupslist);
 		}
-		
+
 		//standard list
 		if(isset($stdfilterlist))
 		{
 			$stdfiltersql = implode(", ",$stdfilterlist);
 		}
-		//print_r($filterlist);
 		if(isset($filterlist))
 		{
 			$stdfiltersql = implode(", ",$filterlist);
@@ -1128,7 +1156,7 @@
 		//columns to total list
 		if(isset($columnstotallist))
 		{
-	       $columnstotalsql = implode(", ",$columnstotallist);
+			$columnstotalsql = implode(", ",$columnstotallist);
 		}
 		//advanced filterlist
 		if(isset($advfilterlist))
@@ -1141,11 +1169,11 @@
 		}
 		if($advfiltersql != "")
 		{
-				$wheresql .= " and ".$advfiltersql;
-		}
-		
+			$wheresql .= " and ".$advfiltersql;
+		}
+
 		$reportquery = $this->getReportsQuery($this->primarymodule);
-			
+
 		if($type == 'COLUMNSTOTOTAL')
 		{
 			if(trim($groupsquery) != "")
@@ -1178,9 +1206,9 @@
 
 	function GenerateReport($outputformat,$filterlist)
 	{
-                 global $adb;
-         	 global $modules;
-		 global $mod_strings;
+		global $adb;
+		global $modules;
+		global $mod_strings;
 
 		if($outputformat == "HTML")
 		{
@@ -1195,7 +1223,7 @@
 					$fld = $adb->field_name($result, $x);
 					$header .= "<td class='rptCellLabel'>".str_replace($modules," ",$fld->name)."</td>";
 				}
-				
+
 				$noofrows = $adb->num_rows($result);
 				$custom_field_values = $adb->fetch_array($result);
 				$groupslist = $this->getGroupingList($this->reportid);
@@ -1213,18 +1241,18 @@
 					}elseif(count($groupslist) == 3)
 					{
 						$newvalue = $custom_field_values[0];
-                                                $snewvalue = $custom_field_values[1];
+						$snewvalue = $custom_field_values[1];
 						$tnewvalue = $custom_field_values[2];
 					}
-					
+
 					if($newvalue == "") $newvalue = "-";
 
 					if($snewvalue == "") $snewvalue = "-";
 
 					if($tnewvalue == "") $tnewvalue = "-";
- 
+
 					$valtemplate .= "<tr>";
-					
+
 					for ($i=0; $i<$y; $i++)
 					{
 						$fld = $adb->field_name($result, $i);
@@ -1273,22 +1301,22 @@
 								$valtemplate .= "<td class='rptGrpHead'>".$fieldvalue."</td>";
 							}
 						}
-					  }
-					 $valtemplate .= "</tr>";
-					 $lastvalue = $newvalue;
-					 $secondvalue = $snewvalue;
-					 $thirdvalue = $tnewvalue;
-				$arr_val[] = $arraylists;
+					}
+					$valtemplate .= "</tr>";
+					$lastvalue = $newvalue;
+					$secondvalue = $snewvalue;
+					$thirdvalue = $tnewvalue;
+					$arr_val[] = $arraylists;
 				}while($custom_field_values = $adb->fetch_array($result));
-				
-				 $sHTML ='<table cellpadding="5" cellspacing="0" align="center" class="rptTable">
-				  <tr>'. 
-				   $header
-				  .'<!-- BEGIN values -->
-				  <tr>'. 
-				   $valtemplate
-				  .'</tr>
-				</table>';
+
+				$sHTML ='<table cellpadding="5" cellspacing="0" align="center" class="rptTable">
+					<tr>'. 
+					$header
+					.'<!-- BEGIN values -->
+					<tr>'. 
+					$valtemplate
+					.'</tr>
+					</table>';
 				//<<<<<<<<construct HTML>>>>>>>>>>>>
 				$return_data[] = $sHTML;
 				$return_data[] = $noofrows;
@@ -1297,7 +1325,7 @@
 			}
 		}elseif($outputformat == "PDF")
 		{
-			
+
 			$sSQL = $this->sGetSQLforReport($this->reportid,$filterlist);
 			$result = $adb->query($sSQL);
 			$y=$adb->num_fields($result);
@@ -1306,7 +1334,7 @@
 			{
 				$noofrows = $adb->num_rows($result);
 				$custom_field_values = $adb->fetch_array($result);
-				
+
 				do
 				{
 					$arraylists = Array();
@@ -1316,7 +1344,7 @@
 						$fieldvalue = $custom_field_values[$i];
 						if($fieldvalue == "" )
 						{
-						   $fieldvalue = "-";
+							$fieldvalue = "-";
 						}
 						$arraylists[str_replace($modules," ",$fld->name)] = $fieldvalue;
 					}
@@ -1352,7 +1380,7 @@
 					}
 					foreach($totclmnflds as $key=>$value)
 					{
-						
+
 						$coltotalhtml .= '<tr class="rptGrpHead" valign=top><td class="rptData">'.str_replace($modules," ",$value).'</td>';
 						$arraykey = trim($value).'_SUM';
 						if(isset($keyhdr[$arraykey]))
@@ -1399,7 +1427,7 @@
 			return $coltotalhtml;
 		}
 	}
-	
+
 	//<<<<<<<new>>>>>>>>>>
 	function getColumnsTotal($reportid)
 	{
@@ -1408,34 +1436,34 @@
 		global $log;
 
 		$coltotalsql = "select vtiger_reportsummary.* from vtiger_report";
-        $coltotalsql .= " inner join vtiger_reportsummary on vtiger_report.reportid = vtiger_reportsummary.reportsummaryid";
-        $coltotalsql .= " where vtiger_report.reportid =".$reportid;
-
-        $result = $adb->query($coltotalsql);
-		
+		$coltotalsql .= " inner join vtiger_reportsummary on vtiger_report.reportid = vtiger_reportsummary.reportsummaryid";
+		$coltotalsql .= " where vtiger_report.reportid =".$reportid;
+
+		$result = $adb->query($coltotalsql);
+
 		while($coltotalrow = $adb->fetch_array($result))
 		{
 			$fieldcolname = $coltotalrow["columnname"];
-			
+
 			if($fieldcolname != "none")
 			{
-					$fieldlist = explode(":",$fieldcolname);
-					if($fieldlist[4] == 2)
-					{
-					  $stdfilterlist[$fieldcolname] = "sum(".$fieldlist[1].".".$fieldlist[2].") ".$fieldlist[3];
-					}
-					if($fieldlist[4] == 3)
-					{
-					  $stdfilterlist[$fieldcolname] = "avg(".$fieldlist[1].".".$fieldlist[2].") ".$fieldlist[3];
-					}
-					if($fieldlist[4] == 4)
-					{
-					  $stdfilterlist[$fieldcolname] = "min(".$fieldlist[1].".".$fieldlist[2].") ".$fieldlist[3];
-					}
-					if($fieldlist[4] == 5)
-					{
-					  $stdfilterlist[$fieldcolname] = "max(".$fieldlist[1].".".$fieldlist[2].") ".$fieldlist[3];
-					}
+				$fieldlist = explode(":",$fieldcolname);
+				if($fieldlist[4] == 2)
+				{
+					$stdfilterlist[$fieldcolname] = "sum(".$fieldlist[1].".".$fieldlist[2].") ".$fieldlist[3];
+				}
+				if($fieldlist[4] == 3)
+				{
+					$stdfilterlist[$fieldcolname] = "avg(".$fieldlist[1].".".$fieldlist[2].") ".$fieldlist[3];
+				}
+				if($fieldlist[4] == 4)
+				{
+					$stdfilterlist[$fieldcolname] = "min(".$fieldlist[1].".".$fieldlist[2].") ".$fieldlist[3];
+				}
+				if($fieldlist[4] == 5)
+				{
+					$stdfilterlist[$fieldcolname] = "max(".$fieldlist[1].".".$fieldlist[2].") ".$fieldlist[3];
+				}
 			}
 		}
 		$log->info("ReportRun :: Successfully returned getColumnsTotal".$reportid);
@@ -1452,14 +1480,14 @@
 		$sreportstdfiltersql = "select vtiger_reportsummary.* from vtiger_report"; 
 		$sreportstdfiltersql .= " inner join vtiger_reportsummary on vtiger_report.reportid = vtiger_reportsummary.reportsummaryid"; 
 		$sreportstdfiltersql .= " where vtiger_report.reportid =".$reportid;
-		
+
 		$result = $adb->query($sreportstdfiltersql);
 		$noofrows = $adb->num_rows($result);
-	
+
 		for($i=0; $i<$noofrows; $i++)
 		{
 			$fieldcolname = $adb->query_result($result,$i,"columnname");
-			
+
 			if($fieldcolname != "none")
 			{
 				$fieldlist = explode(":",$fieldcolname);

Modified: vtigercrm/trunk/modules/Reports/Reports.php
==============================================================================
--- vtigercrm/trunk/modules/Reports/Reports.php (original)
+++ vtigercrm/trunk/modules/Reports/Reports.php Mon Jun 19 17:13:26 2006
@@ -36,7 +36,7 @@
 			   );
 
 $report_modules = Array('Leads','Accounts','Contacts','Potentials','Products',
-			'HelpDesk','Quotes','PurchaseOrder','Invoice','Activities'
+			'HelpDesk','Quotes','PurchaseOrder','Invoice','Activities','SalesOrder'
 		       );
 
 $related_modules = Array('Leads'=>Array(),
@@ -48,6 +48,7 @@
 			 'HelpDesk'=>Array('Products'),
 			 'Quotes'=>Array('Accounts','Contacts','Potentials'),
 			 'PurchaseOrder'=>Array('Contacts'),
+			 'SalesOrder'=>Array(),
 			 'Invoice'=>Array('Accounts')
 			);
 
@@ -61,12 +62,12 @@
 
 
 
-/**
- * This class has the informations for Reports and inherits class CRMEntity and
- * has the variables required to generate,save,restore vtiger_reports
- * and also the required functions for the same
- * Contributor(s): ______________________________________..
- */
+	/**
+	 * This class has the informations for Reports and inherits class CRMEntity and
+	 * has the variables required to generate,save,restore vtiger_reports
+	 * and also the required functions for the same
+	 * Contributor(s): ______________________________________..
+	 */
 
 
 	var $srptfldridjs;
@@ -102,28 +103,29 @@
 	var $sec_module_columnslist;
 
 	var $advft_column;
-        var $advft_option;
-        var $advft_value;
-
-	var $module_list = Array("Leads"=>Array("Information"=>13,"Address"=>15,"Description"=>16,"Custom Information"=>5),
-	 			 "Contacts"=>Array("Information"=>4,"- Portal Information"=>6,"Address"=>7,"Description"=>8,"Custom Information"=>5),
-				 "Accounts"=>Array("Information"=>9,"Address"=>11,"Description"=>12,"Custom Information"=>5),
-				 "Potentials"=>Array("Information"=>1,"Description"=>3,"Custom Information"=>5),
-				 "Activities"=>Array("Information"=>19,"Description"=>20),
-				 "Products"=>Array("Information"=>31,"Description"=>36,"Custom Information"=>5),
-				 "Notes"=>Array("Information"=>17,"Description"=>18),
-				 "Emails"=>Array("Information"=>1,"Description"=>24),
-				 "HelpDesk"=>Array("Information"=>'25,26',"Custom Information"=>5,"Description"=>28,"Solution"=>29),//patch2
-				 "Quotes"=>Array("Information"=>51,"Address"=>53,"Description"=>56,"Custom Information"=>5),
-				 "PurchaseOrder"=>Array("Information"=>57,"Address"=>59,"Description"=>61,"Custom Information"=>5),
-				 "Invoice"=>Array("Information"=>69,"Address"=>71,"Description"=>74,"Custom Information"=>5)
-				);
-
-/** Function to set primodule,secmodule,reporttype,reportname,reportdescription,folderid for given vtiger_reportid
- *  This function accepts the vtiger_reportid as argument
- *  It sets primodule,secmodule,reporttype,reportname,reportdescription,folderid for the given vtiger_reportid
- */
-			
+	var $advft_option;
+	var $advft_value;
+
+	var $module_list = Array("Leads"=>Array("Information"=>13,"Address"=>15,"Description"=>16,"Custom Information"=>14),
+							"Contacts"=>Array("Information"=>4,"- Portal Information"=>6,"Address"=>7,"Description"=>8,"Custom Information"=>5),
+							"Accounts"=>Array("Information"=>9,"Address"=>11,"Description"=>12,"Custom Information"=>10),
+							"Potentials"=>Array("Information"=>1,"Description"=>3,"Custom Information"=>2),
+							"Activities"=>Array("Information"=>19,"Description"=>20),
+							"Products"=>Array("Information"=>31,"Description"=>36,"Custom Information"=>34),
+							"Notes"=>Array("Information"=>17,"Description"=>18),
+							"Emails"=>Array("Information"=>21,"Description"=>24),
+							"HelpDesk"=>Array("Information"=>'25,26',"Custom Information"=>27,"Description"=>28,"Solution"=>29),//patch2
+							"Quotes"=>Array("Information"=>51,"Address"=>53,"Description"=>56,"Custom Information"=>52),
+							"PurchaseOrder"=>Array("Information"=>57,"Address"=>59,"Description"=>61,"Custom Information"=>58),
+							"SalesOrder"=>Array("Information"=>63,"Address"=>65,"Description"=>68,"Custom Information"=>64),
+							"Invoice"=>Array("Information"=>69,"Address"=>71,"Description"=>74,"Custom Information"=>70)
+					);
+
+	/** Function to set primodule,secmodule,reporttype,reportname,reportdescription,folderid for given vtiger_reportid
+	 *  This function accepts the vtiger_reportid as argument
+	 *  It sets primodule,secmodule,reporttype,reportname,reportdescription,folderid for the given vtiger_reportid
+	 */
+
 	function Reports($reportid="")
 	{
 		global $adb;
@@ -133,7 +135,7 @@
 			$ssql = "select vtiger_reportmodules.*,vtiger_report.* from vtiger_report inner join vtiger_reportmodules on vtiger_report.reportid = vtiger_reportmodules.reportmodulesid";
 			$ssql .= " where vtiger_report.reportid =".$reportid;
 			$result = $adb->query($ssql);
-		        $reportmodulesrow = $adb->fetch_array($result);
+			$reportmodulesrow = $adb->fetch_array($result);
 			if($reportmodulesrow)
 			{
 				$this->primodule = $reportmodulesrow["primarymodule"];
@@ -147,12 +149,12 @@
 	}
 
 
-/** Function to get the Listview of Reports
- *  This function accepts no argument
- *  This generate the Reports view page and returns a string
- *  contains HTML 
- */
-	
+	/** Function to get the Listview of Reports
+	 *  This function accepts no argument
+	 *  This generate the Reports view page and returns a string
+	 *  contains HTML 
+	 */
+
 	function sgetRptFldr($mode='')
 	{
 
@@ -194,11 +196,11 @@
 		return $returndata;
 	}
 
-/** Function to get the Reports inside each modules
- *  This function accepts the folderid
- *  This Generates the Reports under each Reports module 
- *  This Returns a HTML sring
- */
+	/** Function to get the Reports inside each modules
+	 *  This function accepts the folderid
+	 *  This Generates the Reports under each Reports module 
+	 *  This Returns a HTML sring
+	 */
 
 	function sgetRptsforFldr($rpt_fldr_id)
 	{
@@ -207,53 +209,53 @@
 		global $log;
 		global $mod_strings;
 		$returndata = Array();
-		
+
 		require_once('include/utils/UserInfoUtil.php');
-		
+
 		$sql = "select vtiger_report.*, vtiger_reportmodules.* from vtiger_report inner join vtiger_reportfolder on vtiger_reportfolder.folderid = vtiger_report.folderid";
 		$sql .= " inner join vtiger_reportmodules on vtiger_reportmodules.reportmodulesid = vtiger_report.reportid where vtiger_reportfolder.folderid=".$rpt_fldr_id;
 		$result = $adb->query($sql);
 		$report = $adb->fetch_array($result);
 		if(count($report)>0)
 		{
-					  do
-					  {
-						  	$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));
-		}
-	
+			do
+			{
+				$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));
+		}
+
 		$log->info("Reports :: ListView->Successfully returned vtiger_report details HTML");
 		return $returndata;
 	}
 
-/** Function to get the array of ids
- *  This function forms the array for the ExpandCollapse
- *  Javascript
- *  It returns the array of ids
- *  Array('1RptFldr','2RptFldr',........,'9RptFldr','10RptFldr')
- */
+	/** Function to get the array of ids
+	 *  This function forms the array for the ExpandCollapse
+	 *  Javascript
+	 *  It returns the array of ids
+	 *  Array('1RptFldr','2RptFldr',........,'9RptFldr','10RptFldr')
+	 */
 
 	function sgetJsRptFldr()
 	{
 		$srptfldr_js = "var ReportListArray=new Array(".$this->srptfldridjs.")
-		setExpandCollapse()";
+			setExpandCollapse()";
 		return $srptfldr_js;
 	}
 
-/** Function to set the Primary module vtiger_fields for the given Report 
- *  This function sets the primary module columns for the given Report 
- *  It accepts the Primary module as the argument and set the vtiger_fields of the module
- *  to the varialbe pri_module_columnslist and returns true if sucess
- */
+	/** Function to set the Primary module vtiger_fields for the given Report 
+	 *  This function sets the primary module columns for the given Report 
+	 *  It accepts the Primary module as the argument and set the vtiger_fields of the module
+	 *  to the varialbe pri_module_columnslist and returns true if sucess
+	 */
 
 	function getPriModuleColumnsList($module)
 	{
@@ -265,121 +267,125 @@
 		return true;
 	}
 
-/** Function to set the Secondary module fileds for the given Report
- *  This function sets the secondary module columns for the given module
- *  It accepts the module as the argument and set the vtiger_fields of the module
- *  to the varialbe sec_module_columnslist and returns true if sucess
- */
-	
+	/** Function to set the Secondary module fileds for the given Report
+	 *  This function sets the secondary module columns for the given module
+	 *  It accepts the module as the argument and set the vtiger_fields of the module
+	 *  to the varialbe sec_module_columnslist and returns true if sucess
+	 */
+
 	function getSecModuleColumnsList($module)
-        {
-        	if($module != "")
-			{
-				$secmodule = explode(":",$module);
-               	for($i=0;$i < count($secmodule) ;$i++)
-               	{
-					foreach($this->module_list[$secmodule[$i]] as $key=>$value)
-               		{
-                       	$ret_module_list[$secmodule[$i]][$key] = $this->getColumnsListbyBlock($secmodule[$i],$value);
-               		}
+	{
+		if($module != "")
+		{
+			$secmodule = explode(":",$module);
+			for($i=0;$i < count($secmodule) ;$i++)
+			{
+				foreach($this->module_list[$secmodule[$i]] as $key=>$value)
+				{
+					$ret_module_list[$secmodule[$i]][$key] = $this->getColumnsListbyBlock($secmodule[$i],$value);
 				}
-               	$this->sec_module_columnslist = $ret_module_list;
-			}
-            return true;
-        }
-
-/** Function to get vtiger_fields for the given module and block
- *  This function gets the vtiger_fields for the given module
- *  It accepts the module and the block as arguments and 
- *  returns the array column lists
- *  Array module_columnlist[ vtiger_fieldtablename:fieldcolname:module_fieldlabel1:fieldname:fieldtypeofdata]=fieldlabel
- */
+			}
+			$this->sec_module_columnslist = $ret_module_list;
+		}
+		return true;
+	}
+
+	/** Function to get vtiger_fields for the given module and block
+	 *  This function gets the vtiger_fields for the given module
+	 *  It accepts the module and the block as arguments and 
+	 *  returns the array column lists
+	 *  Array module_columnlist[ vtiger_fieldtablename:fieldcolname:module_fieldlabel1:fieldname:fieldtypeofdata]=fieldlabel
+	 */
 
 	function getColumnsListbyBlock($module,$block)
 	{
-        global $adb;
-	global $log;
-	global $profileList;
-	global $current_user;
-	
-
-        $tabid = getTabid($module);
-	
-	//Security Check 
-	if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] ==0)
-	{
-		$sql = "select * from vtiger_field where vtiger_field.uitype != 50 and vtiger_field.tabid=".$tabid." and vtiger_field.block in (".$block .") and vtiger_field.displaytype in (1,2) order by sequence";
-	}
-	else
-	{
-			
-        	$sql = "select * from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.uitype != 50 and vtiger_field.tabid=".$tabid." and vtiger_field.block in (".$block .") and vtiger_field.displaytype in (1,2) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList." group by vtiger_field.fieldid order by sequence";
-	}
-        $result = $adb->query($sql);
-        $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");
+		global $adb;
+		global $log;
+		global $profileList;
+		global $current_user;
+
+
+		$tabid = getTabid($module);
+
+		//Security Check 
+		if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] ==0)
+		{
+			$sql = "select * from vtiger_field where vtiger_field.uitype != 50 and vtiger_field.tabid=".$tabid." and vtiger_field.block in (".$block .") and vtiger_field.displaytype in (1,2) order by sequence";
+		}
+		else
+		{
+
+			$sql = "select * from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.uitype != 50 and vtiger_field.tabid=".$tabid." and vtiger_field.block in (".$block .") and vtiger_field.displaytype in (1,2) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList." group by vtiger_field.fieldid order by sequence";
+		}
+		$result = $adb->query($sql);
+		$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");
 			$fieldname = $adb->query_result($result,$i,"fieldname");
 			$fieldtype = $adb->query_result($result,$i,"typeofdata");
 			$fieldtype = explode("~",$fieldtype);
 			$fieldtypeofdata = $fieldtype[0];
-
-            if($fieldtablename == "crmentity")
-            {
-   	        	$fieldtablename = $fieldtablename.$module;
-            }
+			if($fieldtablename == "vtiger_crmentity")
+			{
+				$fieldtablename = $fieldtablename.$module;
+			}
 			if($fieldname == "assigned_user_id")
 			{
-			   $fieldtablename = "users".$module;
-			   $fieldcolname = "user_name";
+				$fieldtablename = "vtiger_users".$module;
+				$fieldcolname = "user_name";
 			}
 			if($fieldname == "account_id")
 			{
-				$fieldtablename = "account".$module;
+				$fieldtablename = "vtiger_account".$module;
 				$fieldcolname = "accountname";
 			}
 			if($fieldname == "contact_id")
 			{
-				$fieldtablename = "contactdetails".$module;
+				$fieldtablename = "vtiger_contactdetails".$module;
 				$fieldcolname = "lastname";
 			}
 			if($fieldname == "parent_id")
 			{
-  				$fieldtablename = "crmentityRel".$module;
-					$fieldcolname = "setype";
+				$fieldtablename = "vtiger_crmentityRel".$module;
+				$fieldcolname = "setype";
 			}
 			if($fieldname == "vendor_id")
-	        {
-               	$fieldtablename = "vendorRel";
+			{
+				$fieldtablename = "vtiger_vendorRel";
 				$fieldcolname = "vendorname";
-            }
-            if($fieldname == "potential_id")
-            {
-               	$fieldtablename = "potentialRel";
-			    $fieldcolname = "potentialname";
-            }
-            if($fieldname == "assigned_user_id1")
-            {
-               	$fieldtablename = "usersRel1";
-			    $fieldcolname = "user_name";
-            }
-
-            $fieldlabel = $adb->query_result($result,$i,"fieldlabel");
-            $fieldlabel1 = str_replace(" ","_",$fieldlabel);
-            $optionvalue = $fieldtablename.":".$fieldcolname.":".$module."_".$fieldlabel1.":".$fieldname.":".$fieldtypeofdata;
+			}
+			if($fieldname == "potential_id")
+			{
+				$fieldtablename = "vtiger_potentialRel";
+				$fieldcolname = "potentialname";
+			}
+			if($fieldname == "assigned_user_id1")
+			{
+				$fieldtablename = "vtiger_usersRel1";
+				$fieldcolname = "user_name";
+			}
+			if($fieldname == 'quote_id')
+			{
+				$fieldtablename = "vtiger_quotes".$module;
+				$fieldcolname = "subject";
+			}
+
+			$fieldlabel = $adb->query_result($result,$i,"fieldlabel");
+			$fieldlabel1 = str_replace(" ","_",$fieldlabel);
+			$optionvalue = $fieldtablename.":".$fieldcolname.":".$module."_".$fieldlabel1.":".$fieldname.":".$fieldtypeofdata;
 			$module_columnlist[$optionvalue] = $fieldlabel;
 		}
-        $log->info("Reports :: FieldColumns->Successfully returned ColumnslistbyBlock".$module.$block);
+		$log->info("Reports :: FieldColumns->Successfully returned ColumnslistbyBlock".$module.$block);
 		return $module_columnlist;
 	}
-	
-/** Function to set the standard filter vtiger_fields for the given vtiger_report
- *  This function gets the standard filter vtiger_fields for the given vtiger_report
- *  and set the values to the corresponding variables
- *  It accepts the repordid as argument 
- */
+
+	/** Function to set the standard filter vtiger_fields for the given vtiger_report
+	 *  This function gets the standard filter vtiger_fields for the given vtiger_report
+	 *  and set the values to the corresponding variables
+	 *  It accepts the repordid as argument 
+	 */
 
 	function getSelectedStandardCriteria($reportid)
 	{
@@ -390,8 +396,8 @@
 		$selectedstdfilter = $adb->fetch_array($result);
 
 		$this->stdselectedcolumn = $selectedstdfilter["datecolumnname"];
-	    $this->stdselectedfilter = $selectedstdfilter["datefilter"];
-		
+		$this->stdselectedfilter = $selectedstdfilter["datefilter"];
+
 		if($selectedstdfilter["datefilter"] == "custom")
 		{
 			if($selectedstdfilter["startdate"] != "0000-00-00")
@@ -405,26 +411,26 @@
 		}
 	}
 
-/** Function to get the combo values for the standard filter
- *  This function get the combo values for the standard filter for the given vtiger_report
- *  and return a HTML string 
- */
+	/** Function to get the combo values for the standard filter
+	 *  This function get the combo values for the standard filter for the given vtiger_report
+	 *  and return a HTML string 
+	 */
 
 	function getSelectedStdFilterCriteria($selecteddatefilter = "")
 	{
-		    
+
 		$datefiltervalue = Array("custom","prevfy","thisfy","nextfy","prevfq","thisfq","nextfq",
-                                 "yesterday","today","tomorrow","lastweek","thisweek","nextweek","lastmonth","thismonth",
-		                         "nextmonth","last7days","last30days", "last60days","last90days","last120days",
-		                         "next30days","next60days","next90days","next120days"
-								);
-		
+				"yesterday","today","tomorrow","lastweek","thisweek","nextweek","lastmonth","thismonth",
+				"nextmonth","last7days","last30days", "last60days","last90days","last120days",
+				"next30days","next60days","next90days","next120days"
+				);
+
 		$datefilterdisplay = Array("Custom","Previous FY", "Current FY","Next FY","Previous FQ","Current FQ","Next FQ","Yesterday",
-                                   "Today","Tomorrow","Last Week","Current Week","Next Week","Last Month","Current Month",
-                                   "Next Month","Last 7 Days","Last 30 Days","Last 60 Days","Last 90 Days","Last 120 Days",
-                                   "Next 7 Days","Next 30 Days","Next 60 Days","Next 90 Days","Next 120 Days"
-								  );
-						     
+				"Today","Tomorrow","Last Week","Current Week","Next Week","Last Month","Current Month",
+				"Next Month","Last 7 Days","Last 30 Days","Last 60 Days","Last 90 Days","Last 120 Days",
+				"Next 7 Days","Next 30 Days","Next 60 Days","Next 90 Days","Next 120 Days"
+				);
+
 		for($i=0;$i<count($datefiltervalue);$i++)
 		{
 			if($selecteddatefilter == $datefiltervalue[$i])
@@ -435,15 +441,15 @@
 				$sshtml .= "<option value='".$datefiltervalue[$i]."'>".$datefilterdisplay[$i]."</option>";
 			}
 		}
-			
+
 		return $sshtml;
 	}
 
-/** Function to get the selected standard filter columns 
- *  This function returns the selected standard filter criteria 
- *  which is selected for vtiger_reports as an array
- *  Array stdcriteria_list[fieldtablename:fieldcolname:module_fieldlabel1]=fieldlabel
- */
+	/** Function to get the selected standard filter columns 
+	 *  This function returns the selected standard filter criteria 
+	 *  which is selected for vtiger_reports as an array
+	 *  Array stdcriteria_list[fieldtablename:fieldcolname:module_fieldlabel1]=fieldlabel
+	 */
 
 	function getStdCriteriaByModule($module)
 	{	
@@ -460,270 +466,270 @@
 		$blockids = implode(",",$blockids);	
 
 		if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0)
-                {
+		{
 			$sql = "select * from vtiger_field where vtiger_field.tabid=".$tabid." and (vtiger_field.uitype =5 or vtiger_field.displaytype=2) and vtiger_field.block in (".$blockids.") order by vtiger_field.sequence";
 		}
 		else
 		{
 			$profileList = getCurrentUserProfileList();			
 			$sql = "select * from vtiger_field inner join vtiger_tab on vtiger_tab.tabid = vtiger_field.tabid inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid  where vtiger_field.tabid=".$tabid." and (vtiger_field.uitype =5 or vtiger_field.displaytype=2) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_field.block in (".$blockids.") and vtiger_profile2field.profileid in ".$profileList." order by vtiger_field.sequence";
-	
-		}
-		
-        $result = $adb->query($sql);
-
-        while($criteriatyperow = $adb->fetch_array($result))
-        {
+
+		}
+
+		$result = $adb->query($sql);
+
+		while($criteriatyperow = $adb->fetch_array($result))
+		{
 			$fieldtablename = $criteriatyperow["tablename"];
-            $fieldcolname = $criteriatyperow["columnname"];
-            $fieldlabel = $criteriatyperow["fieldlabel"];
-
-			if($fieldtablename == "crmentity")
-            {
-	            $fieldtablename = $fieldtablename.$module;
-            }
-            $fieldlabel1 = str_replace(" ","_",$fieldlabel);
-            $optionvalue = $fieldtablename.":".$fieldcolname.":".$module."_".$fieldlabel1;
+			$fieldcolname = $criteriatyperow["columnname"];
+			$fieldlabel = $criteriatyperow["fieldlabel"];
+
+			if($fieldtablename == "vtiger_crmentity")
+			{
+				$fieldtablename = $fieldtablename.$module;
+			}
+			$fieldlabel1 = str_replace(" ","_",$fieldlabel);
+			$optionvalue = $fieldtablename.":".$fieldcolname.":".$module."_".$fieldlabel1;
 			$stdcriteria_list[$optionvalue] = $fieldlabel;
 		}
-		
+
 		$log->info("Reports :: StdfilterColumns->Successfully returned Stdfilter for".$module);
 		return $stdcriteria_list;
-		
-	}
-	
-/** Function to form a javascript to determine the start date and end date for a standard filter 
- *  This function is to form a javascript to determine
- *  the start date and End date from the value selected in the combo lists
- */
+
+	}
+
+	/** Function to form a javascript to determine the start date and end date for a standard filter 
+	 *  This function is to form a javascript to determine
+	 *  the start date and End date from the value selected in the combo lists
+	 */
 
 	function getCriteriaJS()
 	{
 		$today = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d"), date("Y")));
 		$tomorrow  = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d")+1, date("Y")));
 		$yesterday  = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d")-1, date("Y")));
-		
+
 		$currentmonth0 = date("Y-m-d",mktime(0, 0, 0, date("m"), "01",   date("Y")));
 		$currentmonth1 = date("Y-m-t");
 		$lastmonth0 = date("Y-m-d",mktime(0, 0, 0, date("m")-1, "01",   date("Y")));
 		$lastmonth1 = date("Y-m-t", strtotime("-1 Month"));
 		$nextmonth0 = date("Y-m-d",mktime(0, 0, 0, date("m")+1, "01",   date("Y")));
 		$nextmonth1 = date("Y-m-t", strtotime("+1 Month"));
-		
+
 		$lastweek0 = date("Y-m-d",strtotime("-2 week Sunday"));
 		$lastweek1 = date("Y-m-d",strtotime("-1 week Saturday"));
-		
+
 		$thisweek0 = date("Y-m-d",strtotime("-1 week Sunday"));
 		$thisweek1 = date("Y-m-d",strtotime("this Saturday"));
-		
+
 		$nextweek0 = date("Y-m-d",strtotime("this Sunday"));
 		$nextweek1 = date("Y-m-d",strtotime("+1 week Saturday"));
-		
+
 		$next7days = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d")+6, date("Y")));
 		$next30days = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d")+29, date("Y")));
 		$next60days = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d")+59, date("Y")));
 		$next90days = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d")+89, date("Y")));
 		$next120days = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d")+119, date("Y")));
-		
+
 		$last7days = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d")-6, date("Y")));
 		$last30days = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d")-29, date("Y")));
 		$last60days = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d")-59, date("Y")));
 		$last90days = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d")-89, date("Y")));
 		$last120days = date("Y-m-d",mktime(0, 0, 0, date("m")  , date("d")-119, date("Y")));
-		
+
 		$currentFY0 = date("Y-m-d",mktime(0, 0, 0, "01", "01",   date("Y")));
 		$currentFY1 = date("Y-m-t",mktime(0, 0, 0, "12", date("d"),   date("Y")));
 		$lastFY0 = date("Y-m-d",mktime(0, 0, 0, "01", "01",   date("Y")-1));
 		$lastFY1 = date("Y-m-t", mktime(0, 0, 0, "12", date("d"), date("Y")-1));
 		$nextFY0 = date("Y-m-d",mktime(0, 0, 0, "01", "01",   date("Y")+1));
 		$nextFY1 = date("Y-m-t", mktime(0, 0, 0, "12", date("d"), date("Y")+1));
-		
+
 
 		$sjsStr = '<script language="JavaScript" type="text/javaScript">
-		function showDateRange( type )
-		{
-			if (type!="custom")
-			{
-				document.NewReport.startdate.readOnly=true
-				document.NewReport.enddate.readOnly=true
-				getObj("jscal_trigger_date_start").style.visibility="hidden"
-				getObj("jscal_trigger_date_end").style.visibility="hidden"
-			}
-			else
-			{
-				document.NewReport.startdate.readOnly=false
-				document.NewReport.enddate.readOnly=false
-				getObj("jscal_trigger_date_start").style.visibility="visible"
-				getObj("jscal_trigger_date_end").style.visibility="visible"
-			}
-			if( type == "today" )
-			{
-			
-			document.NewReport.startdate.value = "'.$today.'";
-			document.NewReport.enddate.value = "'.$today.'";
-			}
-			else if( type == "yesterday" )
-			{
-			    
-			document.NewReport.startdate.value = "'.$yesterday.'";
-			document.NewReport.enddate.value = "'.$yesterday.'";
-			}
-			else if( type == "tomorrow" )
-			{
-			    
-			document.NewReport.startdate.value = "'.$tomorrow.'";
-			document.NewReport.enddate.value = "'.$tomorrow.'";
+			function showDateRange( type )
+			{
+				if (type!="custom")
+				{
+					document.NewReport.startdate.readOnly=true
+						document.NewReport.enddate.readOnly=true
+						getObj("jscal_trigger_date_start").style.visibility="hidden"
+						getObj("jscal_trigger_date_end").style.visibility="hidden"
+				}
+				else
+				{
+					document.NewReport.startdate.readOnly=false
+						document.NewReport.enddate.readOnly=false
+						getObj("jscal_trigger_date_start").style.visibility="visible"
+						getObj("jscal_trigger_date_end").style.visibility="visible"
+				}
+				if( type == "today" )
+				{
+
+					document.NewReport.startdate.value = "'.$today.'";
+					document.NewReport.enddate.value = "'.$today.'";
+				}
+				else if( type == "yesterday" )
+				{
+
+					document.NewReport.startdate.value = "'.$yesterday.'";
+					document.NewReport.enddate.value = "'.$yesterday.'";
+				}
+				else if( type == "tomorrow" )
+				{
+
+					document.NewReport.startdate.value = "'.$tomorrow.'";
+					document.NewReport.enddate.value = "'.$tomorrow.'";
+				}        
+				else if( type == "thisweek" )
+				{
+
+					document.NewReport.startdate.value = "'.$thisweek0.'";
+					document.NewReport.enddate.value = "'.$thisweek1.'";
+				}                
+				else if( type == "lastweek" )
+				{
+
+					document.NewReport.startdate.value = "'.$lastweek0.'";
+					document.NewReport.enddate.value = "'.$lastweek1.'";
+				}                
+				else if( type == "nextweek" )
+				{
+
+					document.NewReport.startdate.value = "'.$nextweek0.'";
+					document.NewReport.enddate.value = "'.$nextweek1.'";
+				}                
+
+				else if( type == "thismonth" )
+				{
+
+					document.NewReport.startdate.value = "'.$currentmonth0.'";
+					document.NewReport.enddate.value = "'.$currentmonth1.'";
+				}                
+
+				else if( type == "lastmonth" )
+				{
+
+					document.NewReport.startdate.value = "'.$lastmonth0.'";
+					document.NewReport.enddate.value = "'.$lastmonth1.'";
+				}             
+				else if( type == "nextmonth" )
+				{
+
+					document.NewReport.startdate.value = "'.$nextmonth0.'";
+					document.NewReport.enddate.value = "'.$nextmonth1.'";
+				}           
+				else if( type == "next7days" )
+				{
+
+					document.NewReport.startdate.value = "'.$today.'";
+					document.NewReport.enddate.value = "'.$next7days.'";
+				}                
+				else if( type == "next30days" )
+				{
+
+					document.NewReport.startdate.value = "'.$today.'";
+					document.NewReport.enddate.value = "'.$next30days.'";
+				}                
+				else if( type == "next60days" )
+				{
+
+					document.NewReport.startdate.value = "'.$today.'";
+					document.NewReport.enddate.value = "'.$next60days.'";
+				}                
+				else if( type == "next90days" )
+				{
+
+					document.NewReport.startdate.value = "'.$today.'";
+					document.NewReport.enddate.value = "'.$next90days.'";
+				}        
+				else if( type == "next120days" )
+				{
+
+					document.NewReport.startdate.value = "'.$today.'";
+					document.NewReport.enddate.value = "'.$next120days.'";
+				}        
+				else if( type == "last7days" )
+				{
+
+					document.NewReport.startdate.value = "'.$last7days.'";
+					document.NewReport.enddate.value =  "'.$today.'";
+				}                        
+				else if( type == "last30days" )
+				{
+
+					document.NewReport.startdate.value = "'.$last30days.'";
+					document.NewReport.enddate.value = "'.$today.'";
+				}                
+				else if( type == "last60days" )
+				{
+
+					document.NewReport.startdate.value = "'.$last60days.'";
+					document.NewReport.enddate.value = "'.$today.'";
+				}        
+				else if( type == "last90days" )
+				{
+
+					document.NewReport.startdate.value = "'.$last90days.'";
+					document.NewReport.enddate.value = "'.$today.'";
+				}        
+				else if( type == "last120days" )
+				{
+
+					document.NewReport.startdate.value = "'.$last120days.'";
+					document.NewReport.enddate.value = "'.$today.'";
+				}        
+				else if( type == "thisfy" )
+				{
+
+					document.NewReport.startdate.value = "'.$currentFY0.'";
+					document.NewReport.enddate.value = "'.$currentFY1.'";
+				}                
+				else if( type == "prevfy" )
+				{
+
+					document.NewReport.startdate.value = "'.$lastFY0.'";
+					document.NewReport.enddate.value = "'.$lastFY1.'";
+				}                
+				else if( type == "nextfy" )
+				{
+
+					document.NewReport.startdate.value = "'.$nextFY0.'";
+					document.NewReport.enddate.value = "'.$nextFY1.'";
+				}                
+				else if( type == "nextfq" )
+				{
+
+					document.NewReport.startdate.value = "2005-07-01";
+					document.NewReport.enddate.value = "2005-09-30";
+				}                        
+				else if( type == "prevfq" )
+				{
+
+					document.NewReport.startdate.value = "2005-01-01";
+					document.NewReport.enddate.value = "2005-03-31";
+				}                
+				else if( type == "thisfq" )
+				{
+					document.NewReport.startdate.value = "2005-04-01";
+					document.NewReport.enddate.value = "2005-06-30";
+				}                
+				else
+				{
+					document.NewReport.startdate.value = "";
+					document.NewReport.enddate.value = "";
+				}        
 			}        
-			else if( type == "thisweek" )
-			{
-			    
-			document.NewReport.startdate.value = "'.$thisweek0.'";
-			document.NewReport.enddate.value = "'.$thisweek1.'";
-			}                
-			else if( type == "lastweek" )
-			{
-			    
-			document.NewReport.startdate.value = "'.$lastweek0.'";
-			document.NewReport.enddate.value = "'.$lastweek1.'";
-			}                
-			else if( type == "nextweek" )
-			{
-			    
-			document.NewReport.startdate.value = "'.$nextweek0.'";
-			document.NewReport.enddate.value = "'.$nextweek1.'";
-			}                
-			
-			else if( type == "thismonth" )
-			{
-			    
-			document.NewReport.startdate.value = "'.$currentmonth0.'";
-			document.NewReport.enddate.value = "'.$currentmonth1.'";
-			}                
-			
-			else if( type == "lastmonth" )
-			{
-			    
-			document.NewReport.startdate.value = "'.$lastmonth0.'";
-			document.NewReport.enddate.value = "'.$lastmonth1.'";
-			}             
-			else if( type == "nextmonth" )
-			{
-			    
-			document.NewReport.startdate.value = "'.$nextmonth0.'";
-			document.NewReport.enddate.value = "'.$nextmonth1.'";
-			}           
-			else if( type == "next7days" )
-			{
-			    
-			document.NewReport.startdate.value = "'.$today.'";
-			document.NewReport.enddate.value = "'.$next7days.'";
-			}                
-			else if( type == "next30days" )
-			{
-			    
-			document.NewReport.startdate.value = "'.$today.'";
-			document.NewReport.enddate.value = "'.$next30days.'";
-			}                
-			else if( type == "next60days" )
-			{
-			    
-			document.NewReport.startdate.value = "'.$today.'";
-			document.NewReport.enddate.value = "'.$next60days.'";
-			}                
-			else if( type == "next90days" )
-			{
-			    
-			document.NewReport.startdate.value = "'.$today.'";
-			document.NewReport.enddate.value = "'.$next90days.'";
-			}        
-			else if( type == "next120days" )
-			{
-			    
-			document.NewReport.startdate.value = "'.$today.'";
-			document.NewReport.enddate.value = "'.$next120days.'";
-			}        
-			else if( type == "last7days" )
-			{
-			    
-			document.NewReport.startdate.value = "'.$last7days.'";
-			document.NewReport.enddate.value =  "'.$today.'";
-			}                        
-			else if( type == "last30days" )
-			{
-			    
-			document.NewReport.startdate.value = "'.$last30days.'";
-			document.NewReport.enddate.value = "'.$today.'";
-			}                
-			else if( type == "last60days" )
-			{
-			    
-			document.NewReport.startdate.value = "'.$last60days.'";
-			document.NewReport.enddate.value = "'.$today.'";
-			}        
-			else if( type == "last90days" )
-			{
-			    
-			document.NewReport.startdate.value = "'.$last90days.'";
-			document.NewReport.enddate.value = "'.$today.'";
-			}        
-			else if( type == "last120days" )
-			{
-			    
-			document.NewReport.startdate.value = "'.$last120days.'";
-			document.NewReport.enddate.value = "'.$today.'";
-			}        
-			else if( type == "thisfy" )
-			{
-			    
-			document.NewReport.startdate.value = "'.$currentFY0.'";
-			document.NewReport.enddate.value = "'.$currentFY1.'";
-			}                
-			else if( type == "prevfy" )
-			{
-			    
-			document.NewReport.startdate.value = "'.$lastFY0.'";
-			document.NewReport.enddate.value = "'.$lastFY1.'";
-			}                
-			else if( type == "nextfy" )
-			{
-			    
-			document.NewReport.startdate.value = "'.$nextFY0.'";
-			document.NewReport.enddate.value = "'.$nextFY1.'";
-			}                
-			else if( type == "nextfq" )
-			{
-			    
-			document.NewReport.startdate.value = "2005-07-01";
-			document.NewReport.enddate.value = "2005-09-30";
-			}                        
-			else if( type == "prevfq" )
-			{
-			    
-			document.NewReport.startdate.value = "2005-01-01";
-			document.NewReport.enddate.value = "2005-03-31";
-			}                
-			else if( type == "thisfq" )
-			{
-			document.NewReport.startdate.value = "2005-04-01";
-			document.NewReport.enddate.value = "2005-06-30";
-			}                
-			else
-			{
-			document.NewReport.startdate.value = "";
-			document.NewReport.enddate.value = "";
-			}        
-		}        
 		</script>';
-		
+
 		return $sjsStr;
 	}
 
-/** Function to set the order of grouping and to find the columns responsible
- *  to the grouping
- *  This function accepts the vtiger_reportid as variable,sets the variable ascdescorder[] to the sort order and
- *  returns the array array_list which has the column responsible for the grouping
- *  Array array_list[0]=columnname
- */
+	/** Function to set the order of grouping and to find the columns responsible
+	 *  to the grouping
+	 *  This function accepts the vtiger_reportid as variable,sets the variable ascdescorder[] to the sort order and
+	 *  returns the array array_list which has the column responsible for the grouping
+	 *  Array array_list[0]=columnname
+	 */
 
 
 	function getSelctedSortingColumns($reportid)
@@ -732,7 +738,7 @@
 		global $adb;
 		global $log;
 
-    	$sreportsortsql = "select vtiger_reportsortcol.* from vtiger_report";
+		$sreportsortsql = "select vtiger_reportsortcol.* from vtiger_report";
 		$sreportsortsql .= " inner join vtiger_reportsortcol on vtiger_report.reportid = vtiger_reportsortcol.reportid";
 		$sreportsortsql .= " where vtiger_report.reportid =".$reportid." order by vtiger_reportsortcol.sortcolid";
 
@@ -746,22 +752,22 @@
 			$this->ascdescorder[] = $sort_values;
 			$array_list[] = $fieldcolname;
 		}
-		
+
 		$log->info("Reports :: Successfully returned getSelctedSortingColumns");
 		return $array_list;
 	}
-	
-/** Function to get the selected columns list for a selected vtiger_report
- *  This function accepts the vtiger_reportid as the argument and get the selected columns
- *  for the given vtiger_reportid and it forms a combo lists and returns
- *  HTML of the combo values
- */
+
+	/** Function to get the selected columns list for a selected vtiger_report
+	 *  This function accepts the vtiger_reportid as the argument and get the selected columns
+	 *  for the given vtiger_reportid and it forms a combo lists and returns
+	 *  HTML of the combo values
+	 */
 
 	function getSelectedColumnsList($reportid)
 	{
 
 		global $adb;
-	    global $modules;
+		global $modules;
 		global $log;
 
 		$ssql = "select vtiger_selectcolumn.* from vtiger_report inner join vtiger_selectquery on vtiger_selectquery.queryid = vtiger_report.queryid";
@@ -785,14 +791,14 @@
 		return $shtml;
 	}
 
-/** Function to Set the selected columns for the advanced filter for the vtiger_report
- *  This function accepts the vtiger_reportid as the argument and get the selected columns
- *  in the advanced filter and sets the values
- *  $this->advft_column[] = The column name
- *  $this->advft_option[] = The filter option
- *  $this->advft_value[] = The value to be compared
- *	and returns true in sucess
- */
+	/** Function to Set the selected columns for the advanced filter for the vtiger_report
+	 *  This function accepts the vtiger_reportid as the argument and get the selected columns
+	 *  in the advanced filter and sets the values
+	 *  $this->advft_column[] = The column name
+	 *  $this->advft_option[] = The filter option
+	 *  $this->advft_value[] = The value to be compared
+	 *	and returns true in sucess
+	 */
 
 	//<<<<<<<<advanced filter>>>>>>>>>>>>>>
 	function getAdvancedFilterList($reportid)
@@ -816,13 +822,13 @@
 		return true;
 	}
 	//<<<<<<<<advanced filter>>>>>>>>>>>>>>
-	
-/** Function to get the list of vtiger_report folders when Save and run  the vtiger_report
- *  This function gets the vtiger_report folders from database and form
- *  a combo values of the folders and return 
- *  HTML of the combo values
- */
-	
+
+	/** Function to get the list of vtiger_report folders when Save and run  the vtiger_report
+	 *  This function gets the vtiger_report folders from database and form
+	 *  a combo values of the folders and return 
+	 *  HTML of the combo values
+	 */
+
 	function sgetRptFldrSaveReport()
 	{
 		global $adb;
@@ -832,20 +838,20 @@
 		$result = $adb->query($sql);
 		$reportfldrow = $adb->fetch_array($result);
 		$x = 0;
-        do
+		do
 		{
 			$shtml .= "<option value='".$reportfldrow['folderid']."'>".$reportfldrow['foldername']."</option>";
 		}while($reportfldrow = $adb->fetch_array($result));
-		
+
 		$log->info("Reports :: Successfully returned sgetRptFldrSaveReport");
 		return $shtml;
 	}
 
-/** Function to get the column to total vtiger_fields in Reports 
- *  This function gets columns to total vtiger_field 
- *  and generated the html for that vtiger_fields
- *  It returns the HTML of the vtiger_fields along with the check boxes
- */
+	/** Function to get the column to total vtiger_fields in Reports 
+	 *  This function gets columns to total vtiger_field 
+	 *  and generated the html for that vtiger_fields
+	 *  It returns the HTML of the vtiger_fields along with the check boxes
+	 */
 
 	function sgetColumntoTotal($primarymodule,$secondarymodule)
 	{
@@ -861,14 +867,14 @@
 		}
 		return $options;
 	}
-	
-/** Function to get the selected columns of total vtiger_fields in Reports
- *  This function gets selected columns of total vtiger_field
- *  and generated the html for that vtiger_fields
- *  It returns the HTML of the vtiger_fields along with the check boxes
- */
-	
-	
+
+	/** Function to get the selected columns of total vtiger_fields in Reports
+	 *  This function gets selected columns of total vtiger_field
+	 *  and generated the html for that vtiger_fields
+	 *  It returns the HTML of the vtiger_fields along with the check boxes
+	 */
+
+
 	function sgetColumntoTotalSelected($primarymodule,$secondarymodule,$reportid)
 	{
 		global $adb;
@@ -881,11 +887,11 @@
 			if($result)
 			{
 				$reportsummaryrow = $adb->fetch_array($result);
-				
+
 				do
 				{
 					$this->columnssummary[] = $reportsummaryrow["columnname"];
-					
+
 				}while($reportsummaryrow = $adb->fetch_array($result));
 			}
 		}	
@@ -898,19 +904,19 @@
 				$options []= $this->sgetColumnstoTotalHTML($secondarymodule[$i],($i+1));
 			}
 		}
-		
+
 		$log->info("Reports :: Successfully returned sgetColumntoTotalSelected");
 		return $options;
 	}
 
 
-/** Function to form the HTML for columns to total	
- *  This function formulates the HTML format of the
- *  vtiger_fields along with four checkboxes
- *  It returns the HTML of the vtiger_fields along with the check boxes
- */
-	
-	
+	/** Function to form the HTML for columns to total	
+	 *  This function formulates the HTML format of the
+	 *  vtiger_fields along with four checkboxes
+	 *  It returns the HTML of the vtiger_fields along with the check boxes
+	 */
+
+
 	function sgetColumnstoTotalHTML($module)
 	{
 		//retreive the vtiger_tabid	
@@ -935,15 +941,15 @@
 		do
 		{
 			$typeofdata = explode("~",$columntototalrow["typeofdata"]);
-		
-  		    if($typeofdata[0] == "N" || $typeofdata[0] == "I")
+
+			if($typeofdata[0] == "N" || $typeofdata[0] == "I")
 			{
 				$options = Array();
 				if(isset($this->columnssummary))
 				{
 					$selectedcolumn = "";
 					$selectedcolumn1 = "";
-					
+
 					for($i=0;$i < count($this->columnssummary) ;$i++)
 					{
 						$selectedcolumnarray = explode(":",$this->columnssummary[$i]);
@@ -957,41 +963,41 @@
 						{
 							$selectedcolumn1[$selectedcolumnarray[4]] = $this->columnssummary[$i];
 						}
-						
-      				          }
-
-$columntototalrow['fieldlabel'] = str_replace(" ","_",$columntototalrow['fieldlabel']);
+
+					}
+
+					$columntototalrow['fieldlabel'] = str_replace(" ","_",$columntototalrow['fieldlabel']);
 					$options []= $columntototalrow['tablabel'].' - '.$columntototalrow['fieldlabel'];
-						if($selectedcolumn1[2] == "cb:".$columntototalrow['tablename'].':'.$columntototalrow['columnname'].':'.$columntototalrow['fieldlabel']."_SUM:2")
-					    {
-					    $options []=  '<input checked name="cb:'.$columntototalrow['tablename'].':'.$columntototalrow['columnname'].':'.$columntototalrow['fieldlabel'].'_SUM:2" type="checkbox" value="">';					    
-						}else
-					    {
-						    $options []=  '<input name="cb:'.$columntototalrow['tablename'].':'.$columntototalrow['columnname'].':'.$columntototalrow['fieldlabel'].'_SUM:2" type="checkbox" value="">';
-					    }
-					    if($selectedcolumn1[3] == "cb:".$columntototalrow['tablename'].':'.$columntototalrow['columnname'].':'.$columntototalrow['fieldlabel']."_AVG:3")
-					    {
-						   $options []=  '<input checked name="cb:'.$columntototalrow['tablename'].':'.$columntototalrow['columnname'].':'.$columntototalrow['fieldlabel'].'_AVG:3" type="checkbox" value="">';
-					    }else
-					    {
-						    $options []=  '<input name="cb:'.$columntototalrow['tablename'].':'.$columntototalrow['columnname'].':'.$columntototalrow['fieldlabel'].'_AVG:3" type="checkbox" value="">';
-					    }
-
-					    if($selectedcolumn1[4] == "cb:".$columntototalrow['tablename'].':'.$columntototalrow['columnname'].':'.$columntototalrow['fieldlabel']."_MIN:4")
-					    {
-						   $options []=  '<input checked name="cb:'.$columntototalrow['tablename'].':'.$columntototalrow['columnname'].':'.$columntototalrow['fieldlabel'].'_MIN:4" type="checkbox" value="">';
-					    }else
-					    {
-						    $options []=  '<input name="cb:'.$columntototalrow['tablename'].':'.$columntototalrow['columnname'].':'.$columntototalrow['fieldlabel'].'_MIN:4" type="checkbox" value="">';
-					    }
-
-					    if($selectedcolumn1[5] == "cb:".$columntototalrow['tablename'].':'.$columntototalrow['columnname'].':'.$columntototalrow['fieldlabel']."_MAX:5")
-					    {
-						   $options []=  '<input checked name="cb:'.$columntototalrow['tablename'].':'.$columntototalrow['columnname'].':'.$columntototalrow['fieldlabel'].'_MAX:5" type="checkbox" value="">';
-					    }else
-					    {
-						    $options []=  '<input name="cb:'.$columntototalrow['tablename'].':'.$columntototalrow['columnname'].':'.$columntototalrow['fieldlabel'].'_MAX:5" type="checkbox" value="">';
-					    }
+					if($selectedcolumn1[2] == "cb:".$columntototalrow['tablename'].':'.$columntototalrow['columnname'].':'.$columntototalrow['fieldlabel']."_SUM:2")
+					{
+						$options []=  '<input checked name="cb:'.$columntototalrow['tablename'].':'.$columntototalrow['columnname'].':'.$columntototalrow['fieldlabel'].'_SUM:2" type="checkbox" value="">';					    
+					}else
+					{
+						$options []=  '<input name="cb:'.$columntototalrow['tablename'].':'.$columntototalrow['columnname'].':'.$columntototalrow['fieldlabel'].'_SUM:2" type="checkbox" value="">';
+					}
+					if($selectedcolumn1[3] == "cb:".$columntototalrow['tablename'].':'.$columntototalrow['columnname'].':'.$columntototalrow['fieldlabel']."_AVG:3")
+					{
+						$options []=  '<input checked name="cb:'.$columntototalrow['tablename'].':'.$columntototalrow['columnname'].':'.$columntototalrow['fieldlabel'].'_AVG:3" type="checkbox" value="">';
+					}else
+					{
+						$options []=  '<input name="cb:'.$columntototalrow['tablename'].':'.$columntototalrow['columnname'].':'.$columntototalrow['fieldlabel'].'_AVG:3" type="checkbox" value="">';
+					}
+
+					if($selectedcolumn1[4] == "cb:".$columntototalrow['tablename'].':'.$columntototalrow['columnname'].':'.$columntototalrow['fieldlabel']."_MIN:4")
+					{
+						$options []=  '<input checked name="cb:'.$columntototalrow['tablename'].':'.$columntototalrow['columnname'].':'.$columntototalrow['fieldlabel'].'_MIN:4" type="checkbox" value="">';
+					}else
+					{
+						$options []=  '<input name="cb:'.$columntototalrow['tablename'].':'.$columntototalrow['columnname'].':'.$columntototalrow['fieldlabel'].'_MIN:4" type="checkbox" value="">';
+					}
+
+					if($selectedcolumn1[5] == "cb:".$columntototalrow['tablename'].':'.$columntototalrow['columnname'].':'.$columntototalrow['fieldlabel']."_MAX:5")
+					{
+						$options []=  '<input checked name="cb:'.$columntototalrow['tablename'].':'.$columntototalrow['columnname'].':'.$columntototalrow['fieldlabel'].'_MAX:5" type="checkbox" value="">';
+					}else
+					{
+						$options []=  '<input name="cb:'.$columntototalrow['tablename'].':'.$columntototalrow['columnname'].':'.$columntototalrow['fieldlabel'].'_MAX:5" type="checkbox" value="">';
+					}
 				}else
 				{
 					$options []= $columntototalrow['tablabel'].' - '.$columntototalrow['fieldlabel'];
@@ -1003,7 +1009,7 @@
 				$options_list [] = $options;
 			}
 		}while($columntototalrow = $adb->fetch_array($result));
-		
+
 		$log->info("Reports :: Successfully returned sgetColumnstoTotalHTML");
 		return $options_list;
 	}

Modified: vtigercrm/trunk/modules/Reports/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Reports/Save.php (original)
+++ vtigercrm/trunk/modules/Reports/Save.php Mon Jun 19 17:13:26 2006
@@ -11,10 +11,8 @@
 require_once('modules/Reports/Reports.php');
 require_once('include/logging.php');
 require_once('include/database/PearDatabase.php');
-
 global $adb;
 global $log;
-
 $reportid = $_REQUEST["record"];
 
 //<<<<<<<selectcolumn>>>>>>>>>
@@ -96,7 +94,7 @@
 	{
 		$iquerysql = "insert into vtiger_selectquery (QUERYID,STARTINDEX,NUMOFOBJECTS) values (".$genQueryId.",0,0)";
 		$iquerysqlresult = $adb->query($iquerysql);
-		 $log->info("Reports :: Save->Successfully saved vtiger_selectquery");
+		$log->info("Reports :: Save->Successfully saved vtiger_selectquery");
 		if($iquerysqlresult!=false)
 		{
 			//<<<<step2 vtiger_selectcolumn>>>>>>>>
@@ -112,14 +110,12 @@
 			$log->info("Reports :: Save->Successfully saved vtiger_selectcolumn");
 			//<<<<step2 vtiger_selectcolumn>>>>>>>>
 
-		       //$genReportMId = $adb->getUniqueID("reportmodules");
-
-		       if($genQueryId != "")
-		       {
+			if($genQueryId != "")
+			{
 				$ireportsql = "insert into vtiger_report (REPORTID,FOLDERID,REPORTNAME,DESCRIPTION,REPORTTYPE,QUERYID,STATE)";
 				$ireportsql .= " values (".$genQueryId.",".$folderid.",'".$reportname."','".$reportdescription."','".$reporttype."',".$genQueryId.",'CUSTOM')";
 				$ireportresult = $adb->query($ireportsql);
-			       	$log->info("Reports :: Save->Successfully saved vtiger_report");
+				$log->info("Reports :: Save->Successfully saved vtiger_report");
 				if($ireportresult!=false)
 				{
 					//<<<<reportmodules>>>>>>>
@@ -163,32 +159,30 @@
 					//<<<<step4 columnstototal>>>>>>>
 
 					//<<<<step5 advancedfilter>>>>>>>
-                                        for ($i=0;$i<count($adv_filter_col);$i++)
-                                        {
-                                                $irelcriteriasql = "insert into vtiger_relcriteria(QUERYID,COLUMNINDEX,COLUMNNAME,COMPARATOR,VALUE) values (".$genQueryId.",".$i.",'".$adv_filter_col[$i]."','".$adv_filter_option[$i]."','".$adv_filter_value[$i]."')";
-						//echo $irelcriteriasql;
-
-                                                $irelcriteriaresult = $adb->query($irelcriteriasql);
-                                        }
+					for ($i=0;$i<count($adv_filter_col);$i++)
+					{
+						$irelcriteriasql = "insert into vtiger_relcriteria(QUERYID,COLUMNINDEX,COLUMNNAME,COMPARATOR,VALUE) values (".$genQueryId.",".$i.",'".$adv_filter_col[$i]."','".$adv_filter_option[$i]."','".$adv_filter_value[$i]."')";
+						$irelcriteriaresult = $adb->query($irelcriteriasql);
+					}
 					$log->info("Reports :: Save->Successfully saved vtiger_relcriteria");
-                                        //<<<<step5 advancedfilter>>>>>>>
+					//<<<<step5 advancedfilter>>>>>>>
 
 				}else
 				{
-					include('themes/'.$theme.'/header.php');
 					$errormessage = "<font color='red'><B>Error Message<ul>
-					<li><font color='red'>Error while inserting the record</font>
-					</ul></B></font> <br>" ;
+						<li><font color='red'>Error while inserting the record</font>
+						</ul></B></font> <br>" ;
 					echo $errormessage;
+					die;
 				}
-		       }
+			}
 		}else
 		{
-			include('themes/'.$theme.'/header.php');
 			$errormessage = "<font color='red'><B>Error Message<ul>
-			<li><font color='red'>Error while inserting the record</font>
-			</ul></B></font> <br>" ;
+				<li><font color='red'>Error while inserting the record</font>
+				</ul></B></font> <br>" ;
 			echo $errormessage;
+			die;
 		}
 		echo '<script>window.opener.location.href =window.opener.location.href;self.close();</script>';
 	}
@@ -200,7 +194,6 @@
 		{
 			$idelcolumnsql = "delete from vtiger_selectcolumn where queryid=".$reportid;
 			$idelcolumnsqlresult = $adb->query($idelcolumnsql);
-			//echo $idelcolumnsql;
 			if($idelcolumnsqlresult != false)
 			{
 				$selectedcolumns = explode(";",$selectedcolumnstring);
@@ -208,7 +201,6 @@
 				{
 					$icolumnsql = "insert into vtiger_selectcolumn (QUERYID,COLUMNINDEX,COLUMNNAME) values (".$reportid.",".$i.",'".$selectedcolumns[$i]."')";
 					$icolumnsqlresult = $adb->query($icolumnsql);
-					//echo $icolumnsql;
 				}
 			}
 		}
@@ -220,12 +212,10 @@
 		$ireportsql .= " where REPORTID=".$reportid;
 		$ireportresult = $adb->query($ireportsql);
 		$log->info("Reports :: Save->Successfully saved vtiger_report");
-		//echo $ireportsql;
-
-		$idelreportsortcolsql = "delete from vtiger_reportsortcol where vtiger_reportid=".$reportid;
+
+		$idelreportsortcolsql = "delete from vtiger_reportsortcol where reportid=".$reportid;
 		$idelreportsortcolsqlresult = $adb->query($idelreportsortcolsql);
 		$log->info("Reports :: Save->Successfully deleted vtiger_reportsortcol");
-		//echo $idelreportsortcolsql;
 
 		if($idelreportsortcolsqlresult!=false)
 		{
@@ -234,7 +224,6 @@
 			{
 				$sort_by1sql = "insert into vtiger_reportsortcol (SORTCOLID,REPORTID,COLUMNNAME,SORTORDER) values (1,".$reportid.",'".$sort_by1."','".$sort_order1."')";
 				$sort_by1result = $adb->query($sort_by1sql);
-				//echo $sort_by1sql;
 			}
 			if($sort_by2 != "")
 			{
@@ -251,7 +240,6 @@
 
 			$idelreportdatefiltersql = "delete from vtiger_reportdatefilter where datefilterid=".$reportid;
 			$idelreportdatefiltersqlresult = $adb->query($idelreportdatefiltersql);
-			//echo $idelreportsortcolsql;
 
 			//<<<<step5 standarfilder>>>>>>>
 			$ireportmodulesql = "insert into vtiger_reportdatefilter (DATEFILTERID,DATECOLUMNNAME,DATEFILTER,STARTDATE,ENDDATE) values (".$reportid.",'".$stdDateFilterField."','".$stdDateFilter."','".$startdate."','".$enddate."')";
@@ -260,7 +248,7 @@
 			//<<<<step5 standarfilder>>>>>>>
 
 			//<<<<step4 columnstototal>>>>>>>
-			$idelreportsummarysql = "delete from vtiger_reportsummary where vtiger_reportsummaryid=".$reportid;
+			$idelreportsummarysql = "delete from vtiger_reportsummary where reportsummaryid=".$reportid;
 			$idelreportsummarysqlresult = $adb->query($idelreportsummarysql);
 
 			for ($i=0;$i<count($columnstototal);$i++)
@@ -287,20 +275,20 @@
 
 		}else
 		{
-			include('themes/'.$theme.'/header.php');
 			$errormessage = "<font color='red'><B>Error Message<ul>
 				<li><font color='red'>Error while inserting the record</font>
 				</ul></B></font> <br>" ;
 			echo $errormessage;
+			die;
 		}
 	}else
 	{
-		include('themes/'.$theme.'/header.php');
 		$errormessage = "<font color='red'><B>Error Message<ul>
-		<li><font color='red'>Error while inserting the record</font>
-		</ul></B></font> <br>" ;
+			<li><font color='red'>Error while inserting the record</font>
+			</ul></B></font> <br>" ;
 		echo $errormessage;
+		die;
 	}
-	echo '<script>window.opener.location.href =window.opener.location.href;self.close();</script>';
+	echo '<script>window.opener.location.href = window.opener.location.href;self.close();</script>';
 }
 ?>

Modified: vtigercrm/trunk/modules/Reports/SaveAndRun.php
==============================================================================
--- vtigercrm/trunk/modules/Reports/SaveAndRun.php (original)
+++ vtigercrm/trunk/modules/Reports/SaveAndRun.php Mon Jun 19 17:13:26 2006
@@ -176,11 +176,11 @@
 function getReportsinFolder($folderid)
 {
 	global $adb;
-	$query = 'select vtiger_reportid,reportname from vtiger_report where folderid='.$folderid;
+	$query = 'select reportid,reportname from vtiger_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; 




From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 19 19:14:39 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 19 Jun 2006 23:14:39 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=23656=3A_?=
	=?utf-8?q?Issue__in_reports?=
In-Reply-To: <076.9a50a711bb6613348988ceaefce9a4e7@vtiger.fosslabs.com>
References: <076.9a50a711bb6613348988ceaefce9a4e7@vtiger.fosslabs.com>
Message-ID: <085.7b03fddb07fd064987deec13c36ad558@vtiger.fosslabs.com>

#656: Issue  in reports
---------------------------+------------------------------------------------
  Reporter:  jerrydgeorge  |       Owner:  jerrydgeorge
      Type:  defect        |      Status:  closed      
  Priority:  major         |   Milestone:              
 Component:  vtigercrm     |     Version:  5.0.0       
Resolution:  fixed         |    Keywords:  Reports     
---------------------------+------------------------------------------------
Changes (by anonymous):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/656>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 19 19:15:36 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 19 Jun 2006 23:15:36 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=2345=3A_F?=
 =?utf-8?q?ix_for_=22Fatal_error=2E=2E=2E=22_by_reports_with_custom_field?=
In-Reply-To: <076.fa266ece6c0b08774a7c6b47ebf5d995@vtiger.fosslabs.com>
References: <076.fa266ece6c0b08774a7c6b47ebf5d995@vtiger.fosslabs.com>
Message-ID: <085.6ee8f9448e001847d0f4940cafe99418@vtiger.fosslabs.com>

#45: Fix for "Fatal error..." by reports with custom field
------------------------+---------------------------------------------------
  Reporter:  Kleo       |       Owner:  jerrydgeorge
      Type:  defect     |      Status:  closed      
  Priority:  major      |   Milestone:  4.2.5       
 Component:  vtigercrm  |     Version:  4.2.4rc1    
Resolution:  fixed      |    Keywords:              
------------------------+---------------------------------------------------
Changes (by anonymous):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/45>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 19 19:18:06 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 19 Jun 2006 23:18:06 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7276 - in /vtigercrm/trunk:
 data/ include/ include/utils/ modules/Contacts/ modules/Emails/
 modules/Products/ modules/uploads/
Message-ID: <20060619231807.0DB6783F1B0@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 19 17:17:55 2006
New Revision: 7276

Log:
* Changes made for handling the attachment as generic one

Modified:
    vtigercrm/trunk/data/CRMEntity.php
    vtigercrm/trunk/include/RelatedListView.php
    vtigercrm/trunk/include/utils/DetailViewUtils.php
    vtigercrm/trunk/modules/Contacts/Save.php
    vtigercrm/trunk/modules/Emails/mail.php
    vtigercrm/trunk/modules/Products/Save.php
    vtigercrm/trunk/modules/uploads/add2db.php
    vtigercrm/trunk/modules/uploads/deleteattachments.php
    vtigercrm/trunk/modules/uploads/downloadfile.php

Modified: vtigercrm/trunk/data/CRMEntity.php
==============================================================================
--- vtigercrm/trunk/data/CRMEntity.php (original)
+++ vtigercrm/trunk/data/CRMEntity.php Mon Jun 19 17:17:55 2006
@@ -255,13 +255,27 @@
 		global $log, $adb;
 		$log->debug("Entering into insertIntoAttachment($id,$module) method.");
 		
+		$file_saved = false;
+
+		//This is to added to store the existing attachment id of the contact where we should delete this when we give new image
+		if($module == 'Contacts')
+			$old_attachmentid = $adb->query_result($adb->query("select * from vtiger_seattachmentsrel where crmid=$id"),0,'attachmentsid');
+
 		foreach($_FILES as $fileindex => $files)
 		{
 			if($files['name'] != '' && $files['size'] > 0)
 			{
-				$this->uploadAndSaveFile($id,$module,$files);
-			}
-		}
+				$file_saved = $this->uploadAndSaveFile($id,$module,$files);
+			}
+		}
+
+		//This is to handle the delete image for contacts
+		if($module == 'Contacts' && $file_saved)
+		{
+			$del_res1 = $adb->query("delete from vtiger_attachments where attachmentsid=$old_attachmentid");
+			$del_res2 = $adb->query("delete from vtiger_seattachmentsrel where attachmentsid=$old_attachmentid");
+		}
+
 
 		//Remove the deleted vtiger_attachments from db - Products
 		if($module == 'Products' && $_REQUEST['del_file_list'] != '')
@@ -291,7 +305,7 @@
 	{
 		global $log;
 		$log->debug("Entering into uploadAndSaveFile($id,$module,$file_details) method.");
-		
+
 		global $adb, $current_user;
 		global $upload_badext;
 
@@ -315,16 +329,18 @@
 		}
 		// Vulnerability fix ends
 
+		$current_id = $adb->getUniqueID("vtiger_crmentity");
+
 		$filename = basename($binFile);
 		$filetype= $file_details['type'];
 		$filesize = $file_details['size'];
 		$filetmp_name = $file_details['tmp_name'];
-		
+
 		//get the file path inwhich folder we want to upload the file
 		$upload_file_path = decideFilePath();
 
 		//upload the file in server
-		$upload_status = move_uploaded_file($filetmp_name,$upload_file_path.$binFile);
+		$upload_status = move_uploaded_file($filetmp_name,$upload_file_path.$current_id."_".$binFile);
 
 		$save_file = 'true';
 		//only images are allowed for these modules
@@ -333,10 +349,8 @@
 			$save_file = validateImageFile(&$file_details);
 		}
 
-		if($save_file == 'true')
-		{
-			$current_id = $adb->getUniqueID("vtiger_crmentity");
-
+		if($save_file == 'true' && $upload_status == 'true')
+		{
 			//This is only to update the attached filename in the vtiger_notes vtiger_table for the Notes module
 			if($module=='Notes')
 			{
@@ -365,14 +379,14 @@
 			}
 			$sql3='insert into vtiger_seattachmentsrel values('.$id.','.$current_id.')';
 			$adb->query($sql3);
+
+			return true;
 		}
 		else
 		{
 			$log->debug("Skip the save attachment process.");
-		}
-		$log->debug("Exiting from uploadAndSaveFile($id,$module,$file_details) method.");
-
-		return;
+			return false;
+		}
 	}
 
 

Modified: vtigercrm/trunk/include/RelatedListView.php
==============================================================================
--- vtigercrm/trunk/include/RelatedListView.php (original)
+++ vtigercrm/trunk/include/RelatedListView.php Mon Jun 19 17:17:55 2006
@@ -259,7 +259,7 @@
 		}
 
 		$entries[] = nl2br($row['description']); 
-		$attachmentname = ltrim($row['filename'],$id.'_');//explode('_',$row['filename'],2);
+		$attachmentname = ltrim($row['filename'],$row['attachmentsid'].'_');//explode('_',$row['filename'],2);
 
 		$entries[] = '<a href="index.php?module=uploads&action=downloadfile&entityid='.$id.'&fileid='.$row['attachmentsid'].'">'.$attachmentname.'</a>';
 

Modified: vtigercrm/trunk/include/utils/DetailViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/DetailViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/DetailViewUtils.php Mon Jun 19 17:17:55 2006
@@ -372,10 +372,11 @@
 		if($tabid==14)
 		{
 			$images=array();
-			$query = 'select productname,vtiger_attachments.path,vtiger_attachments.name from vtiger_products left join vtiger_seattachmentsrel on vtiger_seattachmentsrel.crmid=vtiger_products.productid inner join vtiger_attachments on vtiger_attachments.attachmentsid=vtiger_seattachmentsrel.attachmentsid where productid='.$col_fields['record_id'];
+			$query = 'select productname, vtiger_attachments.path, vtiger_attachments.attachmentsid, vtiger_attachments.name from vtiger_products left join vtiger_seattachmentsrel on vtiger_seattachmentsrel.crmid=vtiger_products.productid inner join vtiger_attachments on vtiger_attachments.attachmentsid=vtiger_seattachmentsrel.attachmentsid where productid='.$col_fields['record_id'];
 			$result_image = $adb->query($query);
 			for($image_iter=0;$image_iter < $adb->num_rows($result_image);$image_iter++)	
 			{
+				$image_id_array[] = $adb->query_result($result_image,$image_iter,'attachmentsid');	
 				$image_array[] = $adb->query_result($result_image,$image_iter,'name');	
 				$imagepath_array[] = $adb->query_result($result_image,$image_iter,'path');	
 			}
@@ -392,13 +393,13 @@
 
 				for($image_iter=0;$image_iter < count($image_array);$image_iter++)
 				{
-					$images[]='"'.$imagepath_array[$image_iter].$image_array[$image_iter].'","'.$imagepath_array[$image_iter].$image_array[$image_iter].'"';
+					$images[]='"'.$imagepath_array[$image_iter].$image_id_array[$image_iter]."_".$image_array[$image_iter].'","'.$imagepath_array[$image_iter].$image_id_array[$image_iter]."_".$image_array[$image_iter].'"';
 				}	
 				$image_lists .=implode(',',$images).');</script>';
 				$label_fld[] =$image_lists;
 			}elseif(count($image_array)==1)
 			{
-				$label_fld[] ='<img src="'.$imagepath_array[0].$image_array[0].'" border="0" width="450" height="300">';
+				$label_fld[] ='<img src="'.$imagepath_array[0].$image_id_array[0]."_".$image_array[0].'" border="0" width="450" height="300">';
 			}else
 			{
 				$label_fld[] ='';
@@ -407,7 +408,13 @@
 		}	
 		if($tabid==4)
 		{
-			$imgpath = getModuleFileStoragePath('Contacts').$col_fields[$fieldname];
+			//$imgpath = getModuleFileStoragePath('Contacts').$col_fields[$fieldname];
+			$sql = "select vtiger_attachments.* from vtiger_attachments inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid = vtiger_attachments.attachmentsid where vtiger_seattachmentsrel.crmid=".$col_fields['record_id'];
+			$image_res = $adb->query($sql);
+			$image_id = $adb->query_result($image_res,0,'attachmentsid');
+			$image_path = $adb->query_result($image_res,0,'path');
+			$image_name = $adb->query_result($image_res,0,'name');
+			$imgpath = $image_path.$image_id."_".$image_name;
 			$label_fld[] ='<img src="'.$imgpath.'" class="reflect" width="450" height="300" alt="">';
 		}
 

Modified: vtigercrm/trunk/modules/Contacts/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/Save.php (original)
+++ vtigercrm/trunk/modules/Contacts/Save.php Mon Jun 19 17:17:55 2006
@@ -60,9 +60,9 @@
 if (!isset($_REQUEST['do_not_call'])) $focus->do_not_call = 'off';
 
 //Checking If image is given or not
-$image_upload_array=SaveImage($_FILES,'contact',$focus->id,$focus->mode);
+//$image_upload_array=SaveImage($_FILES,'contact',$focus->id,$focus->mode);
 $image_name_val=$image_upload_array['imagename'];
-$image_error=$image_upload_array['imageerror'];
+$image_error="false";
 $errormessage=$image_upload_array['errormessage'];
 $saveimage=$image_upload_array['saveimage'];
 

Modified: vtigercrm/trunk/modules/Emails/mail.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/mail.php (original)
+++ vtigercrm/trunk/modules/Emails/mail.php Mon Jun 19 17:17:55 2006
@@ -247,25 +247,16 @@
 
 	for($i=0;$i<$count;$i++)
 	{
+		$fileid = $adb->query_result($res,$i,'attachmentsid');
 		$filename = $adb->query_result($res,$i,'name');
-		$filewithpath = $root_directory."test/upload/".$filename;
+		$filepath = $adb->query_result($res,$i,'path');
+		$filewithpath = $root_directory.$filepath.$fileid."_".$filename;
 
 		//if the file is exist in test/upload directory then we will add directly
 		//else get the contents of the file and write it as a file and then attach (this will occur when we unlink the file)
 		if(is_file($filewithpath))
 		{
-			$mail->AddAttachment($filewithpath);
-		}
-		elseif($filename != '')
-		{
-			$contents = $adb->query_result($res,$i,'attachmentcontents');
-			$size = $adb->query_result($res,$i,'attachmentsize');
-
-			@$handle = fopen($filewithpath,'wb');
-			@fwrite($handle,base64_decode($contents),$size);
-			@fclose($handle);
-
-			$mail->AddAttachment($filewithpath);
+			$mail->AddAttachment($filewithpath,$filename);
 		}
 	}
 }

Modified: vtigercrm/trunk/modules/Products/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Products/Save.php (original)
+++ vtigercrm/trunk/modules/Products/Save.php Mon Jun 19 17:17:55 2006
@@ -56,104 +56,14 @@
 }
 
 //Checking If image is given or not 
-$uploaddir = $root_directory."test/product/" ;//set this to which location you need to give the product image
-$log->info("The Location to Save the Product Image is ".$uploaddir);
 $image_lists=array();
 $count=0;
 
 $saveimage = "true";
 $image_error = "false";
-/*
-foreach($_FILES as $files)
-{
-	$file_path_name = $files['name'];
-	$image_error="false";
-	$saveimage="true";
-	$file_name = basename($file_path_name);
-	//if the image is given
-	if($file_name!="")
-	{
-		$log->debug("Product Image is given for uploading");
-		$image_name_val=file_exist_fn($file_name,0);
-		$image_lists[]=$image_name_val;
-		$encode_field_values="";
-		$errormessage="";
-
-		$move_upload_status=move_uploaded_file($files["tmp_name"],$uploaddir.$image_name_val);
-		$image_error="false";
-
-		//if there is an error in the uploading of image
-
-		$filetype= $files['type'];
-		$filesize = $files['size'];
-
-		$filetype_array=explode("/",$filetype);
-
-		$file_type_val_image=strtolower($filetype_array[0]);
-		$file_type_val=strtolower($filetype_array[1]);
-		$log->info("The File type of the Product Image is :: ".$file_type_val);
-		//checking the uploaded image is if an image type or not
-		if(!$move_upload_status) //if any error during file uploading  
-		{
-			$log->debug("Error is present in uploading product Image.");	
-			$errorCode =  $files['error'];
-			if($errorCode == 4)
-			{
-				$errorcode="no-image";
-				$saveimage="false";
-				$image_error="true";
-			}
-			else if($errorCode == 2)
-			{
-				$errormessage = 2;
-				$saveimage="false";
-				$image_error="true";
-			}
-			else if($errorCode == 3 )
-			{
-				$errormessage = 3;
-				$saveimage="false";
-				$image_error="true";
-			}
-		}
-		else 
-		{
-			$log->debug("Successfully uploaded the product Image.");
-			if($filesize != 0)
-			{
-				if (($file_type_val == "jpeg" ) || ($file_type_val == "png") || ($file_type_val == "jpg" ) || ($file_type_val == "pjpeg" ) || ($file_type_val == "x-png") || ($file_type_val == "gif") ) //Checking whether the file is an image or not
-				{
-					$saveimage="true";
-					$image_error="false";
-				}
-				else
-				{
-					$savelogo="false";
-					$image_error="true";
-					$errormessage = "image";
-				}
-
-			}
-			else
-			{	$savelogo="false";
-				$image_error="true";
-				$errormessage = "invalid";
-			}
-
-		}
-	}
-}
-
-//added to retain the pictures from db
-if($mode=="edit" && $image_error=="false" )
-{
-		$image_lists[]= getProductImageName($record_id,$del_image_array);
-		$saveimage="true";
-}
-*/
 //end of code to retain the pictures from db
 
- //code added for returning back to the current view after edit from list view
+//code added for returning back to the current view after edit from list view
 if($_REQUEST['return_viewname'] == '') $return_viewname='0';
 if($_REQUEST['return_viewname'] != '')$return_viewname=$_REQUEST['return_viewname'];
 

Modified: vtigercrm/trunk/modules/uploads/add2db.php
==============================================================================
--- vtigercrm/trunk/modules/uploads/add2db.php (original)
+++ vtigercrm/trunk/modules/uploads/add2db.php Mon Jun 19 17:17:55 2006
@@ -14,17 +14,7 @@
 global $current_user;
 $vtigerpath = $_SERVER['REQUEST_URI'];
 $vtigerpath = str_replace("/index.php?module=uploads&action=add2db", "", $vtigerpath);
-$directory = $root_directory."/storage/user_".getUserName($current_user->id)."/attachments/";
 
-if(!is_dir($directory))
-{
-	if(!mkdirs($directory, 0777))	
-	{
-		echo "Access denined to create folder";
-		die;
-	}
-}
-$uploaddir = $directory;
 $crmid = $_REQUEST['return_id'];
 
 	// Arbitrary File Upload Vulnerability fix - Philip
@@ -45,15 +35,16 @@
 	//decide the file path where we should upload the file in the server
 	$upload_filepath = decideFilePath();
 
-	if(move_uploaded_file($_FILES["filename"]["tmp_name"],$upload_filepath.$crmid."_".$_FILES["filename"]["name"])) 
+	$current_id = $adb->getUniqueID("vtiger_crmentity");
+	
+	if(move_uploaded_file($_FILES["filename"]["tmp_name"],$upload_filepath.$current_id."_".$_FILES["filename"]["name"])) 
 	{
-		$filename = $crmid.'_'.basename($binFile);
+		$filename = basename($binFile);
 		$filetype= $_FILES['filename']['type'];
 		$filesize = $_FILES['filename']['size'];
 
 		if($filesize != 0)	
 		{
-			$current_id = $adb->getUniqueID("vtiger_crmentity");
 			$desc = $_REQUEST['txtDescription'];
 			$description = addslashes($desc);
 			$date_var = date('YmdHis');

Modified: vtigercrm/trunk/modules/uploads/deleteattachments.php
==============================================================================
--- vtigercrm/trunk/modules/uploads/deleteattachments.php (original)
+++ vtigercrm/trunk/modules/uploads/deleteattachments.php Mon Jun 19 17:17:55 2006
@@ -12,10 +12,10 @@
 
 $id=$_REQUEST['record'];
 
-$sql = "delete from seattachmentsrel where attachmentsid ='".$id."'";
+$sql = "delete from vtiger_seattachmentsrel where attachmentsid ='".$id."'";
 $adb->query($sql);
 
-$sql = "delete from attachments where attachmentsid ='".$id."'";
+$sql = "delete from vtiger_attachments where attachmentsid ='".$id."'";
 $adb->query($sql);
 
 header("Location:index.php?module=".$_REQUEST['return_module']."&action=".$_REQUEST['return_action']."&record=".$_REQUEST['return_id']);

Modified: vtigercrm/trunk/modules/uploads/downloadfile.php
==============================================================================
--- vtigercrm/trunk/modules/uploads/downloadfile.php (original)
+++ vtigercrm/trunk/modules/uploads/downloadfile.php Mon Jun 19 17:17:55 2006
@@ -29,15 +29,14 @@
 	$name = @$adb->query_result($result, 0, "name");
 	$filepath = @$adb->query_result($result, 0, "path");
 
-	$filesize = filesize($filepath.$name);
-	$fileContent = fread(fopen($filepath.$name, "r"), $filesize);
-
-	$org_filename = ltrim($name,$entityid.'_');
+	$saved_filename = $attachmentsid."_".$name;
+	$filesize = filesize($filepath.$saved_filename);
+	$fileContent = fread(fopen($filepath.$saved_filename, "r"), $filesize);
 
 	header("Content-type: $fileType");
 	header("Content-length: $filesize");
 	header("Cache-Control: private");
-	header("Content-Disposition: attachment; filename=$org_filename");
+	header("Content-Disposition: attachment; filename=$name");
 	header("Content-Description: PHP Generated Data");
 	echo $fileContent;
 }




From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 19 19:20:15 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 19 Jun 2006 23:20:15 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7277 -
	/vtigercrm/trunk/include/utils/EditViewUtils.php
Message-ID: <20060619232015.0408883F1B0@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 19 17:20:12 2006
New Revision: 7277

Log:
* Changes made for handling the attachment as generic one

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

Modified: vtigercrm/trunk/include/utils/EditViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/EditViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/EditViewUtils.php Mon Jun 19 17:20:12 2006
@@ -532,22 +532,23 @@
 		//This query is for Products only
 		if($module_name == 'Products')
 		{
-			$query = 'select vtiger_attachments.path,vtiger_attachments.name from vtiger_products left join vtiger_seattachmentsrel on vtiger_seattachmentsrel.crmid=vtiger_products.productid inner join vtiger_attachments on vtiger_attachments.attachmentsid=vtiger_seattachmentsrel.attachmentsid where productid='.$col_fields['record_id'];
+			$query = 'select vtiger_attachments.path, vtiger_attachments.attachmentsid, vtiger_attachments.name from vtiger_products left join vtiger_seattachmentsrel on vtiger_seattachmentsrel.crmid=vtiger_products.productid inner join vtiger_attachments on vtiger_attachments.attachmentsid=vtiger_seattachmentsrel.attachmentsid where productid='.$col_fields['record_id'];
 		}
 		else
 		{
-			$query = "select vtiger_attachments.path, vtiger_attachments.name from vtiger_contactdetails left join vtiger_seattachmentsrel on vtiger_seattachmentsrel.crmid=vtiger_contactdetails.contactid inner join vtiger_attachments on vtiger_attachments.attachmentsid=vtiger_seattachmentsrel.attachmentsid where vtiger_contactdetails.imagename=vtiger_attachments.name and contactid=".$col_fields['record_id'];
+			$query = "select vtiger_attachments.path, vtiger_attachments.attachmentsid, vtiger_attachments.name from vtiger_contactdetails left join vtiger_seattachmentsrel on vtiger_seattachmentsrel.crmid=vtiger_contactdetails.contactid inner join vtiger_attachments on vtiger_attachments.attachmentsid=vtiger_seattachmentsrel.attachmentsid where contactid=".$col_fields['record_id'];
 		}
 		$result_image = $adb->query($query);
 		for($image_iter=0;$image_iter < $adb->num_rows($result_image);$image_iter++)	
 		{
-			$image_array[] = $adb->query_result($result_image,$image_iter,'name');	
+			$image_id_array[] = $adb->query_result($result_image,$image_iter,'attachmentsid');
+			$image_array[] = $adb->query_result($result_image,$image_iter,'name');
 			$image_path_array[] = $adb->query_result($result_image,$image_iter,'path');	
 		}
 		if(is_array($image_array))
 			for($img_itr=0;$img_itr<count($image_array);$img_itr++)
 			{
-				$fieldvalue[] = array('name'=>$image_array[$img_itr],'path'=>$image_path_array[$img_itr]);
+				$fieldvalue[] = array('name'=>$image_array[$img_itr],'path'=>$image_path_array[$img_itr].$image_id_array[$img_itr]."_");
 			}
 		else
 			$fieldvalue[] = '';




From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 19 19:21:37 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 19 Jun 2006 23:21:37 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23893=3A_?=
 =?utf-8?q?attachment_inconsistency_in_server_side_coding?=
In-Reply-To: <076.ba62bb894b4c96ede7fdca75d2060c81@vtiger.fosslabs.com>
References: <076.ba62bb894b4c96ede7fdca75d2060c81@vtiger.fosslabs.com>
Message-ID: <085.c24fb4b0672eb9b6d290480823dd67ae@vtiger.fosslabs.com>

#893: attachment inconsistency in server side coding
------------------------+---------------------------------------------------
  Reporter:  mickie     |       Owner:  mickie
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mickie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 This issue has been fixed as now the attachments will be stored in a same
 manner as attachmentid_filename.ext

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/893>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 20 02:21:55 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 20 Jun 2006 06:21:55 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7278 - in
 /vtigercrm/trunk/modules/Users: add2db.php saveemailtemplate.php
Message-ID: <20060620062156.4CD7483F212@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 20 00:21:50 2006
New Revision: 7278

Log:
Parenttab for email templates & mailmerge templates made proper - ahmed

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

Modified: vtigercrm/trunk/modules/Users/add2db.php
==============================================================================
--- vtigercrm/trunk/modules/Users/add2db.php (original)
+++ vtigercrm/trunk/modules/Users/add2db.php Tue Jun 20 00:21:50 2006
@@ -75,9 +75,9 @@
 			$result = $adb->query($sql);
 			if($result!=false)
 			{
-			   $result = $adb->updateBlob('wordtemplates','data'," filename='".$filename."'",$data);
+			   $result = $adb->updateBlob('vtiger_wordtemplates','data'," filename='".$filename."'",$data);
 			   deleteFile($uploaddir,$filename);
-			   header("Location: index.php?action=listwordtemplates&module=Users");	
+			   header("Location: index.php?action=listwordtemplates&module=Users&parenttab=Settings");	
 			}
 			else
 			{

Modified: vtigercrm/trunk/modules/Users/saveemailtemplate.php
==============================================================================
--- vtigercrm/trunk/modules/Users/saveemailtemplate.php (original)
+++ vtigercrm/trunk/modules/Users/saveemailtemplate.php Tue Jun 20 00:21:50 2006
@@ -37,7 +37,7 @@
 	$adb->query($sql);
  
 	$log->info("about to invoke the detailviewemailtemplate file");  
-	header("Location:index.php?module=Users&action=detailviewemailtemplate&templateid=".$templateid);
+	header("Location:index.php?module=Users&action=detailviewemailtemplate&parenttab=Settings&templateid=".$templateid);
 }
 else
 {
@@ -46,6 +46,6 @@
 	$adb->query($sql);
 
 	 $log->info("added to the db the emailtemplate");
-	header("Location:index.php?module=Users&action=detailviewemailtemplate&templateid=".$templateid);
+	header("Location:index.php?module=Users&action=detailviewemailtemplate&parenttab=Settings&templateid=".$templateid);
 }
 ?>




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 20 02:23:53 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 20 Jun 2006 06:23:53 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7279 - in /vtigercrm/trunk:
 modules/Users/language/en_us.lang.php themes/blue/style.css
Message-ID: <20060620062354.3684083F212@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 20 00:23:48 2006
New Revision: 7279

Log:
updated user lang file and style css - ahmed

Modified:
    vtigercrm/trunk/modules/Users/language/en_us.lang.php
    vtigercrm/trunk/themes/blue/style.css

Modified: vtigercrm/trunk/modules/Users/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Users/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Users/language/en_us.lang.php Tue Jun 20 00:23:48 2006
@@ -53,7 +53,7 @@
 
 
 //added for patch2
-'LBL_GROUP_NAME'=>'Group',
+'LBL_GROUP'=>'Group',
 'LBL_CURRENCY_NAME'=>'Currency',
 
 'LBL_NEW_USER_BUTTON_TITLE'=>'New User [Alt+N]',
@@ -178,6 +178,7 @@
 'LBL_TEMPLATE_HEADER'=>'Template',
 'LBL_TEMPLATE_DETAILS'=>'Template Details',
 'LBL_EDIT_TEMPLATE'=>'Edit Template',
+'LBL_TEMPLATE_FILE'=>'Template File',
 'LBL_DESCRIPTION'=>'Description',
 'LBL_EMAIL_TEMPLATES_LIST'=>'Communication Templates > Email Templates',
 'LBL_MAILMERGE_TEMPLATES_LIST'=>' > Communication Templates > Mail Merge Templates',
@@ -187,15 +188,17 @@
 'LBL_SELECT_MODULE'=>'Select Module',
 'LBL_MERGE_FILE'=>'File : ',
 'LBL_MERGE_MSG'=>'Select a module to assign this Template',
-
+'LBL_MERGE_FIELDS'=>'Merge Fields',
+'LBL_COPY_PASTE'=>'Copy & Paste',
 'LNK_GO_TO_TOP'=>'Go to Page Top',
 'LNK_SAMPLE_EMAIL'=>'View Sample Email',
 'LBL_COLON'=>':',
 'LBL_EMAIL_TEMPLATE'=>'Email Template',
 'LBL_NEW_TEMPLATE'=>'New Template',
+'LBL_ADD_TEMPLATE'=>'Add Template',
 'LBL_USE_MERGE_FIELDS_TO_EMAIL_CONTENT'=>'Use merge fields to personalize your email content.',
 'LBL_AVAILABLE_MERGE_FIELDS'=>'Available Merge Fields',
-'LBL_SELECT_FIELD_TYPE'=>'Select Field Type :',
+'LBL_SELECT_FIELD_TYPE'=>'Select Field Type',
 'LBL_SELECT_FIELD'=>'Select Field :',
 'LBL_MERGE_FIELD_VALUE'=>'Copy Merge Field Value :',
 'LBL_ACCOUNT_FIELDS'=>'Account Fields',
@@ -215,6 +218,8 @@
 'LBL_TEMPLATE_SUBJECT'=>'Email Subject',
 'LBL_TEMPLATE_MESSAGE'=>'Email Message',
 'LBL_VIEWING'=>'Viewing',
+'LBL_PROPERTIES'=>'Properties of',
+
 
 
 // Added fields in createnewgroup.php
@@ -223,10 +228,14 @@
 'LBL_EDIT_GROUP'=>'Edit Group',
 'LBL_GROUP_NAME'=>'Group Name',
 'LBL_GROUP_DETAILS'=>'Group Details',
-'LBL_MEMBER_LIST'=>'Member List',
-'LBL_MEMBER_AVLBL'=>'Member Available',
-'LBL_MEMBER_SELECTED'=>'Selected Member',
+'LBL_MEMBER'=>'Members',
+'LBL_MEMBER_AVLBL'=>'Available Entities & Members',
+'LBL_MEMBER_SELECTED'=>'Selected Members',
 'LBL_DESCRIPTION'=>'Description',
+'LBL_GROUP_MESG1'=>'Groups are a flexible way to assign access rights, when complex access rights has to be defined. You can combine multiple entities like Roles, Users, profiles etc into a single group.',
+'LBL_GROUP_MESG2'=>'To add, select the Entity members from left and click the ">>" button.',
+'LBL_GROUP_MESG3'=>'To remove, select the group members from the right and click the "<<" button.',
+
 
 // Added fields in detailViewmailtemplate.html,listgroupmembers.php,listgroups.php
 'LBL_DETAIL_VIEW_OF_EMAIL_TEMPLATE'=>'Detail View of Email Template',
@@ -237,6 +246,8 @@
 'LBL_ADD_GROUP_BUTTON'=>'Add Group',
 'LBL_WORD_TEMPLATES'=>'Mail Merge Templates',
 'LBL_NEW_WORD_TEMPLATE'=>'New Template',
+'LBL_EMAIL_TEMPLATE_DESC'=>'Manage email templates used for Campaigns and Mass mailing',
+'LBL_NAME'=>'Name',
 
 // Added fields in TabCustomise.php,html and UpdateTab.php,html
 'LBL_CUSTOMISE_TABS'=>'Customize Tabs',
@@ -263,6 +274,7 @@
 'LBL_STEP_1_3'=>'Step 1 of 3',
 'LBL_STEP_2_3'=>'Step 2 of 3',
 'LBL_STEP_3_3'=>'Step 3 of 3',
+'LBL_STEP'=>'Step',
 'LBL_SELECT_BASE_PROFILE'=>'Select Base Profile',
 'LBL_PROFILE_PRIVILEGES'=>'Profile Privileges',
 'LBL_GLOBAL_PRIVILEGES'=>'Global Privileges',

Modified: vtigercrm/trunk/themes/blue/style.css
==============================================================================
--- vtigercrm/trunk/themes/blue/style.css (original)
+++ vtigercrm/trunk/themes/blue/style.css Tue Jun 20 00:23:48 2006
@@ -2291,17 +2291,6 @@
 	padding:5px;
 }
 
-#EditListPriceLay{
-	font-family:Arial, Helvetica, sans-serif;
-	font-size:11px;
-	text-align:left;
-	width:300px;
-	border:3px solid #CCCCCC;
-	background-color:#FFFFFF;
-	padding:5px;
-}
-							
-
 
 /* For Report HTML Generation*/
 .rptCellLabel {
@@ -2544,18 +2533,15 @@
 
 }
 
-
-
-
 ul {
-	list-style:none;
+	list-style:circle;
 	line-height:20px;
-	padding-left:20px;
-	margin-left:0px;
+	padding-left:5px;
+	margin-left:20px;
 	font-weight:normal;
-	border-top:1px dotted #dadada;
-
-}
+
+}
+
 	
 .branch {
 	list-style-image: url("secAdd.gif");
@@ -2835,3 +2821,28 @@
 	border-right:1px solid #a1a1a1;
 }
 
+.cellBottomDotLine {
+	border-bottom-width: 2px;
+	border-bottom-style: dotted;
+	border-bottom-color: #CCCCCC;
+	background-color:#ededed;
+}
+.crmFormList{
+	border:1px solid #cccccc;
+	width:90%;
+	height:120px;
+
+}
+.cellBottomDotLinePlain {
+	border-bottom-width: 2px;
+	border-bottom-style: dotted;
+	border-bottom-color: #CCCCCC;
+	
+}
+.crmFormDropDown {
+border-width:1px;
+}
+.thickBorder {
+	border: 2px solid #999999;
+}
+




From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 02:35:56 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 06:35:56 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231343=3A?=
	=?utf-8?q?_Inconsistance_in_Popups?=
Message-ID: <076.55f234b9e9de01eb9b601afafe3fd459@vtiger.fosslabs.com>

#1343: Inconsistance in Popups
-----------------------+----------------------------------------------------
 Reporter:  anonymous  |       Owner:  Ela  
     Type:  defect     |      Status:  new  
 Priority:  blocker    |   Milestone:       
Component:  vtigercrm  |     Version:  5.0.0
 Keywords:             |  
-----------------------+----------------------------------------------------
 Popups are not right.Most of the cases the buttons are hidded
 For example Reports,Emails ....

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1343>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 20 02:42:46 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 20 Jun 2006 06:42:46 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7283 -
 /vtigercrm/trunk/modules/Settings/language/en_us.lang.php
Message-ID: <20060620064246.4F17C83F20E@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 20 00:42:42 2006
New Revision: 7283

Log:
updated settings lang file - ahmed

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

Modified: vtigercrm/trunk/modules/Settings/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Settings/language/en_us.lang.php Tue Jun 20 00:42:42 2006
@@ -69,6 +69,8 @@
 'LBL_NEW_FORM_TITLE'=>'New Contact',
 
 'LBL_NEW_CURRENCY'=>'New Currency',
+
+'LBL_VIEWING'=>'Viewing',
 
 'LBL_CURRENCY_NAME'=>'Currency Name',
 
@@ -342,6 +344,7 @@
 'LBL_USERS'=>'Users',
 
 'LBL_USERS_LIST'=>'Users List',
+'LBL_GROUP_LIST'=>'Groups List',
 
 'LBL_CREATE_AND_MANAGE_USERS'=>'- Create and Manage Users (e.g., admin)',
 
@@ -359,7 +362,7 @@
 
 'LBL_SHARING_ACCESS'=>'Sharing Access',
 
-'LBL_FIELDS_ACCESS'=>'Fields',
+'LBL_FIELDS_ACCESS'=>'Fields Access',
 
 'LBL_DEFAULT_ORGANIZATION_FIELDS'=>'Default Organization Fields Access',
 
@@ -421,7 +424,7 @@
 
 'LBL_COMMUNICATION_TEMPLATES'=>'Communication Templates',
 
-'LBL_CREATE_EMAIL_TEMPLATES'=>'Creating Email Template',
+'LBL_CREATE_EMAIL_TEMPLATES'=>'New Email Template',
 
 'LBL_UPLOAD_MSWORD_TEMPLATES'=>' - Upload MS Word Templates for Mail Merge',
 
@@ -639,6 +642,8 @@
 'LBL_MAIL_SERVER_DESC'=>'Manage your Email Server Settings',
 'LBL_BACKUP_SERVER_DESC'=>'Manage your Backup Server Settings',
 'LBL_MODULES_AND_OWNERS'=>'Modules & Owners',
+'LBL_GROUP_DESC'=>'Manage User groups',
+'LBL_MAIL_MERGE_DESC'=>'Manage Mail Merge templates used in CRM modules',
 
 
 //Added fields after 5.0 Alpha




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 20 02:47:34 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 20 Jun 2006 06:47:34 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7284 - in
 /vtigercrm/trunk/Smarty/templates: GroupDetailview.tpl GroupEditView.tpl
 ListGroup.tpl
Message-ID: <20060620064735.2B52F83F225@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 20 00:47:29 2006
New Revision: 7284

Log:
Updated the groups tpl file -ahmed

Modified:
    vtigercrm/trunk/Smarty/templates/GroupDetailview.tpl
    vtigercrm/trunk/Smarty/templates/GroupEditView.tpl
    vtigercrm/trunk/Smarty/templates/ListGroup.tpl

Modified: vtigercrm/trunk/Smarty/templates/GroupDetailview.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/GroupDetailview.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/GroupDetailview.tpl Tue Jun 20 00:47:29 2006
@@ -9,121 +9,121 @@
   *
  ********************************************************************************/
 -->*}
-<script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
-<style type="text/css">@import url(themes/blue/style.css);</style>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-	<tr>
-			{include file='SettingsMenu.tpl'}
-<td width="75%" valign="top">
-	<form action="index.php" method="post" name="new" id="form">
-<input type="hidden" name="module" value="Users">
-<input type="hidden" name="action" value="createnewgroup">
-<input type="hidden" name="groupId" value="{$GROUPID}">
-<input type="hidden" name="mode" value="edit">
-<input type="hidden" name="parenttab" value="Settings">
-  <table width="100%" border="0" cellpadding="0" cellspacing="0" height="100%">
-    <tr>
-      <td class="showPanelBg" valign="top" width="95%"  style="padding-left:20px; "><br />
-          <span class="lvtHeaderText"><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS} </a> > {$MOD.LBL_USER_MANAGEMENT} > {$CMOD.LBL_GROUP_MEMBERS_LIST}</b> </span>
-          <hr noshade="noshade" size="1" />
-      </td>
-    </tr>
-    <tr>
-      <td>&nbsp;</td>
-    </tr>
-    <tr>
-      <td width="95%" style="padding-left:20px;" valign="top"><table width="95%" cellpadding="5" cellspacing="0" class="leadTable" align="center">
-          <tr>
-            <td style="padding:5px;border-bottom:2px dotted #CCCCCC;" width="5%" ><img src="{$IMAGE_PATH}groups.gif" width="48" height="48" align="absmiddle" /> </td>
-            <td style="padding:5px;border-bottom:2px dotted #AAAAAA;"><span class="genHeaderGrayBig">{$GROUPINFO.0.groupname} {$APP.LBL_GROUP}</span><br />
-                <span class="big">{$CMOD.LBL_DETAIL_VIEW} {$GROUPINFO.0.groupname} {$APP.LBL_GROUP}</span> </td>
-          </tr>
-          <tr>
-            <td colspan="2">&nbsp;</td>
-          </tr>
-          <tr>
-            <td colspan="2" ><table width="100%" cellpadding="5" cellspacing="0" border="0" >
-                <tr>
-                  <td colspan="4" class="detailedViewHeader"><b>{$CMOD.LBL_GROUP_DETAILS}</b></td>
-                </tr>
-                <tr>
-                  <td class="dvtCellLabel" width="5%">&nbsp;</td>
-				  <td class="dvtCellLabel" align="right" width="25%"><b>{$CMOD.LBL_GROUP_NAME} {$CMOD.LBL_COLON}</b></td>
-                  <td class="dvtCellInfo" align="left" width="25%">{$GROUPINFO.0.groupname}</td>
-                  <td class="dvtCellInfo" width="45%">&nbsp;</td>
-                </tr>
-                <tr>
-                  <td class="dvtCellLabel" width="5%">&nbsp;</td>
-				  <td class="dvtCellLabel" align="right"><b>{$CMOD.LBL_DESCRIPTION} {$CMOD.LBL_COLON}</b></td>
-                  <td colspan="2" align="left" class="dvtCellInfo">{$GROUPINFO.0.description}</td>
-                </tr>
-                <tr>
-                  <td colspan="4"  class="dvtCellInfo">&nbsp;</td>
-                </tr>
-                <tr>
-                  <td colspan="4"  class="detailedViewHeader"><b>{$CMOD.LBL_MEMBER_LIST}</b></td>
-                </tr>
-                <tr>
-                  	{foreach key=type item=details from=$GROUPINFO.1} 
-							{if $details.0 neq ''}		
-                      	  	<tr>
-								{if $type == "User"}
-								<td class="dvtCellLabel" valign="top" align="left" width="5%">
-										<img src="{$IMAGE_PATH}user_icon.gif" align="absmiddle">
-								</td>
-								{/if}
-								{if $type == "Role" }
-								<td class="dvtCellLabel" valign="top" align="left" width="5%">
-										<img src="{$IMAGE_PATH}roles_icon.gif" align="absmiddle">
-								</td>
-								{/if}
-								{if $type == "Role and Subordinates" }
-								<td class="dvtCellLabel" valign="top" align="left" width="5%">
-										<img src="{$IMAGE_PATH}roles_icon.gif" align="absmiddle">
-								</td>
-								{/if}
-								{if $type == "Group" }
-								<td class="dvtCellLabel" valign="top" align="left" width="5%">
-										<img src="{$IMAGE_PATH}groups_icon.gif" align="absmiddle">
-								</td>
-								{/if}
-								<td class="dvtCellLabel" valign="top" align="right" width="15%"><b>{$type} {$CMOD.LBL_COLON} </b></td>
-                          		<td class="dvtCellInfo" width="45%" colspan="2">
-									{foreach item=element from=$details}
-											<a href="index.php?module=Users&action={$element.memberaction}&{$element.actionparameter}={$element.memberid}">{$element.membername}</a><br />
-									{/foreach}
-                              </td>
-                        </tr>
-						{/if}
-						{/foreach}	
-                 <tr>
-                  <td colspan="4"  class="dvtCellInfo" align="center">
-				  	<!-- <input title="Back" accessKey="C" class="classBtn" onclick="window.history.back();" type="button" name="New" value=" <  Back " > &nbsp; -->
-					 <input value="   {$APP.LBL_EDIT_BUTTON_LABEL}   " title="{$APP.LBL_EDIT_BUTTON_TITLE}" accessKey="{$APP.LBL_EDIT_BUTTON_KEY}" class="classBtn" type="submit" name="Edit" >
-                    &nbsp;<input value=" {$APP.LBL_DELETE_BUTTON_LABEL} " title="{$APP.LBL_DELETE_BUTTON_TITLE}" accessKey="{$APP.LBL_DELETE_BUTTON_KEY}" class="classBtn" type="button" name="Delete" onClick="deletegroup('{$GROUPID}','{$GROUP_NAME}')";>	
+<script language="JAVASCRIPT" type="text/javascript" src="include/js/smoothscroll.js"></script>
+
+<br>
+<table align="center" border="0" cellpadding="0" cellspacing="0" width="98%">
+<tbody><tr>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
+        <td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
+        <br>
+
+	<div align=center>
+			{include file='SetMenu.tpl'}
+				<!-- DISPLAY -->
+				<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
+				<form action="index.php" method="post" name="new" id="form">
+				<input type="hidden" name="module" value="Users">
+				<input type="hidden" name="action" value="createnewgroup">
+				<input type="hidden" name="groupId" value="{$GROUPID}">
+				<input type="hidden" name="mode" value="edit">
+				<input type="hidden" name="parenttab" value="Settings">
+				<tr>
+					<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}ico-groups.gif" width="48" height="48" border=0 ></td>
+					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Users&action=listgroups&parenttab=Settings">{$CMOD.LBL_GROUPS}</a> &gt; {$CMOD.LBL_VIEWING} &quot;{$GROUPINFO.0.groupname}&quot; </b></td>
+				</tr>
+				<tr>
+					<td valign=top class="small">{$CMOD.LBL_VIEWING} {$CMOD.LBL_PROPERTIES} &quot;{$GROUPINFO.0.groupname}`&quot; {$CMOD.LBL_GROUP_NAME} </td>
+				</tr>
+				</table>
+				
+				<br>
+				<table border=0 cellspacing=0 cellpadding=10 width=100% >
+				<tr>
+				<td valign=top>
+					
+					<table border=0 cellspacing=0 cellpadding=5 width=100% class="tableHeading">
+					<tr>
+						<td class="big"><strong>{$CMOD.LBL_PROPERTIES} &quot;{$GROUPINFO.0.groupname}&quot; </strong></td>
+						<td><div align="right">
+					 	    <input value="   {$APP.LBL_EDIT_BUTTON_LABEL}   " title="{$APP.LBL_EDIT_BUTTON_TITLE}" accessKey="{$APP.LBL_EDIT_BUTTON_KEY}" class="crmButton small edit" type="submit" name="Edit" >
+						</div></td>
+					  </tr>
+					</table>
+					<table width="100%"  border="0" cellspacing="0" cellpadding="5">
+                      <tr class="small">
+                        <td width="15%" class="small cellLabel"><strong>{$CMOD.LBL_GROUP_NAME}</strong></td>
+                        <td width="85%" class="cellText" >{$GROUPINFO.0.groupname}</td>
+                      </tr>
+                      <tr class="small">
+                        <td class="small cellLabel"><strong>{$CMOD.LBL_DESCRIPTION}</strong></td>
+                        <td class="cellText">{$GROUPINFO.0.description}</td>
+                      </tr>
+                      <tr class="small">
+                        <td valign=top class="cellLabel"><strong>{$CMOD.LBL_MEMBER}</strong></td>
+                        <td class="cellText">
+						<table width="70%"  border="0" cellspacing="0" cellpadding="5">
+                          <tr class="small">
+                  		{foreach key=type item=details from=$GROUPINFO.1} 
+				{if $details.0 neq ''}		
+					{if $type == "User"}
+                            		<td colspan="2" class="cellBottomDotLine">
+						<div align="left"><strong>{$MOD.LBL_USERS}</strong></div>
+					</td>
+					{/if}	
+					{if $type == "Role"}
+                            		<td colspan="2" class="cellBottomDotLine">
+						<div align="left"><strong>{$MOD.LBL_ROLES}</strong></div>
+					</td>
+					{/if}	
+					{if $type == "Role and Subordinates"}
+                            		<td colspan="2" class="cellBottomDotLine">
+						<div align="left"><strong>{$type}</strong></div>
+					</td>
+					{/if}	
+					{if $type == "Group"}
+                            		<td colspan="2" class="cellBottomDotLine">
+						<div align="left"><strong>{$CMOD.LBL_GROUPS}</strong></div>
+					</td>
+					{/if}	
+                            </tr>
+                          <tr class="small">
+
+                            <td width="16"><div align="center"></div></td>
+                            <td>
+					{foreach item=element from=$details}
+						<a href="index.php?module=Users&action={$element.memberaction}&{$element.actionparameter}={$element.memberid}">{$element.membername}</a><br />
+					{/foreach}
+			    </td>  	 
+                          </tr>
+				{/if}
+				{/foreach}
+                        </table></td>
+                      </tr>
+                    </table>
+					<br>
+					<table border=0 cellspacing=0 cellpadding=5 width=100% >
+					<tr><td class="small" nowrap align=right><a href="#top">{$MOD.LBL_SCROLL}</a></td></tr>
+					</table>
+					
+					
 				</td>
-                </tr>
-            </table></td>
-          </tr>
-          <tr>
-            <td colspan="2">&nbsp;</td>
-          </tr>
-      </table></td>
-    </tr>
-  </table></td>
-</tr>
-</table></from>
+				</tr>
+				</table>
+			
+			
+			
+			</td>
+			</tr>
+			</table>
+		</td>
+	</tr>
+	</form>
+	</table>
+		
+	</div>
 </td>
-</tr>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
+   </tr>
+</tbody>
 </table>
-<script>
-function deletegroup(id,groupname)
-{ldelim}
-		if(confirm("Are you sure you want to delete the group "+groupname+" ?"))
-			document.location.href="index.php?module=Users&action=DeleteGroup&groupId="+id;	
-		else
-			return false;
-{rdelim}
-</script>
-	{include file='SettingsSubMenu.tpl'}
-

Modified: vtigercrm/trunk/Smarty/templates/GroupEditView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/GroupEditView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/GroupEditView.tpl Tue Jun 20 00:47:29 2006
@@ -9,8 +9,7 @@
   *
  ********************************************************************************/
 -->*}
-<script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
-<style type="text/css">@import url(themes/blue/style.css);</style>
+<script language="JAVASCRIPT" type="text/javascript" src="include/js/smoothscroll.js"></script>
 <script language="javascript">
 
 function dup_validation()
@@ -146,134 +145,160 @@
 {rdelim}
 </script>
 
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-<tr>
-	{include file='SettingsMenu.tpl'}
-<td width="75%" valign="top">
-
-<form name="newGroupForm" action="index.php" method="post">
-<input type="hidden" name="module" value="Users">
-<input type="hidden" name="action" value="SaveGroup">
-<input type="hidden" name="mode" value="{$MODE}">
-<input type="hidden" name="parenttab" value="Settings">
-<input type="hidden" name="groupId" value="{$GROUPID}">
-<table width="100%" border="0" cellpadding="0" cellspacing="0" height="100%">
-<tr>
-<td class="showPanelBg" valign="top" width="100%" style="padding-left:20px; "><br />
-{if $MODE eq 'edit'}
-	<span class="lvtHeaderText"><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS} </a> > {$MOD.LBL_USER_MANAGEMENT} > {$CMOD.LBL_EDIT_GROUP}</b></span>
-{else}
-	<span class="lvtHeaderText"><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS} </a> > {$MOD.LBL_USER_MANAGEMENT} > {$CMOD.LBL_CREATE_NEW_GROUP}</b></span>
-{/if}	
-<hr noshade="noshade" size="1"/>
-</td>
-</tr>
-<tr>
-<td width="75%" style="padding-left:20px;" valign="top">
-
-	<table align="center" border="0" cellpadding="5" cellspacing="0" width="100%" class="leadTable">
-	<tbody>
-	<tr>
-			<td align="left" style="padding:10px;border-bottom:1px dashed #CCCCCC;" colspan="3">
-					<img src="{$IMAGE_PATH}groups.gif" align="absmiddle">
+<br>
+<table align="center" border="0" cellpadding="0" cellspacing="0" width="98%">
+<tbody><tr>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
+        <td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
+        <br>
+
+	<div align=center>
+			{include file='SetMenu.tpl'}
+				<!-- DISPLAY -->
+				<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
+				<form name="newGroupForm" action="index.php" method="post">
+				<input type="hidden" name="module" value="Users">
+				<input type="hidden" name="action" value="SaveGroup">
+				<input type="hidden" name="mode" value="{$MODE}">
+				<input type="hidden" name="parenttab" value="Settings">
+				<input type="hidden" name="groupId" value="{$GROUPID}">
+				<tr>
+					<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}ico-groups.gif" alt="Groups" width="48" height="48" border=0 title="Roles"></td>
 					{if $MODE eq 'edit'}
-						<span class="genHeaderGray">{$CMOD.LBL_EDIT_GROUP}</span>
+					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Users&action=listgroups&parenttab=Settings">{$CMOD.LBL_GROUPS}</a> &gt; {$MOD.LBL_EDIT} &quot;{$GROUPNAME}&quot; </b></td>
+					{else}	
+					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Users&action=listgroups&parenttab=Settings">{$CMOD.LBL_GROUPS}</a> &gt; {$CMOD.LBL_CREATE_NEW_GROUP}</b></td>
+					{/if}
+				</tr>
+				<tr>
+					{if $MODE eq 'edit'}
+					<td valign=top class="small">{$MOD.LBL_EDIT} {$CMOD.LBL_PROPERTIES} &quot;{$GROUPNAME}&quot; {$CMOD.LBL_GROUP}</td>
 					{else}
-						<span class="genHeaderGray">{$CMOD.LBL_CREATE_NEW_GROUP}</span>
+					<td valign=top class="small">{$CMOD.LBL_NEW_GROUP}</td>
 					{/if}
+				</tr>
+				</table>
+				
+				<br>
+				<table border=0 cellspacing=0 cellpadding=10 width=100% >
+				<tr>
+				<td valign=top>
+					
+					<table border=0 cellspacing=0 cellpadding=5 width=100% class="tableHeading">
+					<tr>
+						{if $MODE eq 'edit'}
+						<td class="big"><strong>{$CMOD.LBL_PROPERTIES} &quot;{$GROUPNAME}&quot; </strong></td>
+						{else}
+						<td class="big"><strong>{$CMOD.LBL_NEW_GROUP}</strong></td>
+						{/if}
+						<td><div align="right">
+						{if $MODE eq 'edit'}
+							<input type="button" class="crmButton small save" name="add" value="  {$APP.LBL_SAVE_BUTTON_LABEL}  " onClick="return validate()">
+						{else}
+							<input type="button" class="crmButton create small" name="add" value="{$CMOD.LBL_ADD_GROUP_BUTTON}" onClick="return validate()">
+						{/if}
+						&nbsp;
+						<input type="button" class="crmButton cancel small" name="cancel" value="{$APP.LBL_CANCEL_BUTTON_LABEL}" onClick="window.history.back()">
+						</div></td>
+					  </tr>
+					</table>
+					<table width="100%"  border="0" cellspacing="0" cellpadding="5">
+                      <tr class="small">
+                        <td width="15%" class="small cellLabel"><font color="red">*</font><strong>{$CMOD.LBL_GROUP_NAME}</strong></td>
+                        <td width="85%" class="cellText" ><input id="groupName" name="groupName" type="text" value="{$GROUPNAME}" class="detailedViewTextBox"></td>
+                      </tr>
+                      <tr class="small">
+                        <td class="small cellLabel"><strong>{$CMOD.LBL_DESCRIPTION}</strong></td>
+                        <td class="cellText"><input name="description" type="text" value="{$DESCRIPTION}" class="detailedViewTextBox"> </td>
+                      </tr>
+                      <tr class="small">
+                        <td colspan="2" valign=top class="cellLabel"><strong>{$CMOD.LBL_MEMBER}</strong>						</td>
+                      </tr>
+                      <tr class="small">
+                        <td colspan="2" valign=top class="cellText"> 
+						<br>
+						<table width="95%"  border="0" align="center" cellpadding="5" cellspacing="0">
+                          <tr>
+                            <td width="40%" valign=top class="cellBottomDotLinePlain small"><strong>{$CMOD.LBL_MEMBER_AVLBL}</strong></td>
+                            <td width="10%">&nbsp;</td>
+                            <td width="40%" class="cellBottomDotLinePlain small"><strong>{$CMOD.LBL_MEMBER_SELECTED}</strong></td>
+                          </tr>
+                          <tr>
+                            <td valign=top class="small">
+				{$CMOD.LBL_ENTITY}:&nbsp;
+				<select id="memberType" name="memberType" class="small" onchange="showOptions()">
+				          <option value="groups" selected>{$CMOD.LBL_GROUPS}</option>
+				          <option value="roles">{$CMOD.LBL_ROLES}</option>
+				          <option value="rs">{$CMOD.LBL_ROLES_SUBORDINATES}</option>
+				          <option value="users">{$MOD.LBL_USERS}</option>
+				</select>
+		<input type="hidden" name="findStr" class="small">&nbsp;
+			    </td>
+                            <td width="50">&nbsp;</td>
+                            <td class="small">&nbsp;</td>
+                          </tr>
+                          <tr class=small>
+                            <td valign=top>{$CMOD.LBL_MEMBER} {$CMOD.LBL_OF} {$CMOD.LBL_ENTITY}<br>
+				<select id="availList" name="availList" multiple size="10" class="small crmFormList">
+				</select>
+				<input type="hidden" name="selectedColumnsString"/>
+							
+			    </td>
+                            <td width="50"><div align="center">
+				<input type="button" name="Button" value="&nbsp;&rsaquo;&rsaquo;&nbsp;" onClick="addColumn()" class="crmButton small"/><br /><br />
+				<input type="button" name="Button1" value="&nbsp;&lsaquo;&lsaquo;&nbsp;" onClick="delColumn()" class="crmButton small"/>
+                            	  </div></td>
+                            <td class="small" style="background-color:#ddFFdd" valign=top>{$CMOD.LBL_MEMBER} {$CMOD.LBL_OF} &quot;{$GROUPNAME}&quot; <br>
+			      <select id="selectedColumns" name="selectedColumns" multiple size="10" class="small crmFormList">
+				{foreach item=element from=$MEMBER}
+				<option value="{$element.0}">{$element.1}</option>
+				{/foreach}
+                              </select></td>
+                          </tr>
+						  <tr>
+						  	<td colspan=3>
+							<ul class=small>
+							<li>{$CMOD.LBL_GROUP_MESG1}</li>
+							<li>{$CMOD.LBL_GROUP_MESG2}</li>
+							<li>{$CMOD.LBL_GROUP_MESG3}</li>
+							</ul>
+							
+							</td>
+						</tr>
+                        </table>
+						
+						</td>
+                      </tr>
+                    </table>
+					<br>
+					<table border=0 cellspacing=0 cellpadding=5 width=100% >
+					<tr><td class="small" nowrap align=right><a href="#top">{$MOD.LBL_SCROLL}</a></td></tr>
+					</table>
+					
+					
+				</td>
+				</tr>
+				<tr>
+				  <td valign=top>&nbsp;</td>
+				  </tr>
+				</table>
+			
+			
+			
 			</td>
-	</tr>
-	<tr>
-	<td width="10%"></td>
-	<td width="10%">&nbsp;</td>
-	<td width="80%">&nbsp;</td>
-	</tr>
-	<tr>
-	<td align="right"><img src="{$IMAGE_PATH}one.gif" align="absmiddle"> </td>
-	<td style="padding-right: 10px;" align="right" width="20%">
-			<b>{$CMOD.LBL_GROUP_NAME} {$CMOD.LBL_COLON}</b></td>
-	<td style="padding-left: 10px;" align="left" width="80%">
-	<input id="groupName"  name="groupName" class="importBox" style="width:40%;" type="text" value="{$GROUPNAME}">
-	</td>
-	</tr>
-	<tr><td colspan="3">&nbsp;</td></tr>
-	<tr>
-	<td align="right"><img src="{$IMAGE_PATH}two.gif" align="absmiddle"></td>
-	<td style="padding-right: 10px;" align="right" valign="top">
-			<b>{$CMOD.LBL_DESCRIPTION} {$CMOD.LBL_COLON} </b></td>
-	<td style="padding-left: 10px;" align="left">
-	<textarea name="description"  class="txtBox" style="width:40%;" >{$DESCRIPTION}</textarea>
-	</td>
-	</tr>
-	<tr><td colspan="3">&nbsp;</td></tr>
-	<tr>
-		<td align="right"><img src="{$IMAGE_PATH}three.gif" align="absmiddle"></td>
-		<td style="padding-right: 10px;" align="right">
-			<b>{$APP.LBL_VIEW} </b></td>
-		<td><select id="memberType" name="memberType" onchange="showOptions()">
-          <option value="groups" selected>{$CMOD.LBL_GROUPS}</option>
-          <option value="roles">{$CMOD.LBL_ROLES}</option>
-          <option value="rs">{$CMOD.LBL_ROLES_SUBORDINATES}</option>
-          <option value="users">{$MOD.LBL_USERS}</option>
-        </select>&nbsp;&nbsp;
-		<input type="text" name="findStr">&nbsp;
-          <input type="button" name="Find" value="{$APP.LBL_FIND_BUTTON}" class="classBtn" onClick="showOptions()">
+			</tr>
+			</table>
 		</td>
 	</tr>
-	<tr><td colspan="3">&nbsp;</td></tr>
-	<tr>
-	<td	colspan="3">
-	<table align="center" border="0" cellpadding="0" cellspacing="0" width="75%">
-	<tbody>
-	<tr>
-	<td align="center"><b>{$CMOD.LBL_MEMBER_AVLBL}</b><br>
-	<select id="availList" name="availList" multiple size="10" style="width:200px; ">
-	</select>
-	<input type="hidden" name="selectedColumnsString"/>
-	</td>
-	<td align="center">
-	<input type="button" name="Button" value="&nbsp;&rsaquo;&rsaquo;&nbsp;" onClick="addColumn()" class="classBtn"/><br /><br />
-	<input type="button" name="Button1" value="&nbsp;&lsaquo;&lsaquo;&nbsp;" onClick="delColumn()" class="classBtn"/>
-	</td>
-	<td align="center"><b>{$CMOD.LBL_MEMBER_SELECTED}</b><br>
-	<select id="selectedColumns" name="selectedColumns" multiple size="10" style="width:200px; ">
-  	{foreach item=element from=$MEMBER}
-	<option value="{$element.0}">{$element.1}</option>
-	{/foreach}
-	</select>
-	
-	</td>
-	</tr>
-	</tbody></table></td>
-	</tr>
-
-	<tr>
-	<td colspan="3" style="border-bottom: 1px dashed rgb(204, 204, 204);">&nbsp;</td>
-	</tr>
-	<tr>
-	<td colspan="3" align="center"> 	
-	{if $MODE eq 'edit'}
-		<input type="button" class="classBtn" name="add" value="  {$APP.LBL_SAVE_BUTTON_LABEL}  " onClick="return validate()">
-	{else}
-		<input type="button" class="classBtn" name="add" value="{$CMOD.LBL_ADD_GROUP_BUTTON}" onClick="return validate()">
-	{/if}
-	&nbsp;&nbsp;
-	<input type="button" class="classBtn" name="cancel" value="{$APP.LBL_CANCEL_BUTTON_LABEL}" onClick="window.history.back()">
-	</td>
-	</tr>
-	</tbody></table>
-
-</tr>
-</table>
-</form>
+	</form>
+	</table>
+		
+	</div>
+
 </td>
-
-</tr>
-</table>
-		
-</td>
-<td width="1%" style="border-right:1px dotted #CCCCCC;">&nbsp;</td>
-</tr>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
+   </tr>
+</tbody>
 </table>
 <script language="JavaScript" type="text/JavaScript">    
 var moveupLinkObj,moveupDisabledObj,movedownLinkObj,movedownDisabledObj;
@@ -345,11 +370,3 @@
 setObjects();
 showOptions();
 </script>
-</td>
-</tr>
-</table>
-</td>
-</tr>
-</table>
-	{include file='SettingsSubMenu.tpl'}
-

Modified: vtigercrm/trunk/Smarty/templates/ListGroup.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ListGroup.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ListGroup.tpl Tue Jun 20 00:47:29 2006
@@ -9,73 +9,100 @@
   *
  ********************************************************************************/
 -->*}
-<script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
-<style type="text/css">@import url(themes/blue/style.css);</style>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-<tr>
-	{include file='SettingsMenu.tpl'}
-<td width="75%" valign="top">
+<script language="JAVASCRIPT" type="text/javascript" src="include/js/smoothscroll.js"></script>
 
-<table width="95%" border="0" cellpadding="0" cellspacing="0"  align="center">
-<form action="index.php" method="post" name="new" id="form">
-<input type="hidden" name="module" value="Users">
-<input type="hidden" name="action" value="createnewgroup">
-<input type="hidden" name="mode" value="create">
-<input type="hidden" name="parenttab" value="Settings">
-<tr>
-<td class="showPanelBg" valign="top" width="100%" colspan="3" style="padding-left:20px; "><br/>
-<span class="lvtHeaderText"><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS} </a> > {$MOD.LBL_USER_MANAGEMENT} > {$CMOD.LBL_GROUP_NAME}</b></span>
-<hr noshade="noshade" size="1" /><br>
-</td>
-</tr>
-<tr>
-<td valign="top" class="leadTable" style="padding:20px; ">
-<table width="100%" cellpadding="5" cellspacing="0" >
-	<tr>
-		<td style="border-bottom:1px dashed #CCCCCC;" width="50%">
-			<img src="{$IMAGE_PATH}groups.gif" align="absmiddle">&nbsp;<span class="genHeaderGrayBig">{$CMOD.LBL_GROUP_NAME}</span>
-		</td>
-		<td style="border-bottom:1px dashed #CCCCCC;" width="50%" align="right">
-			<input title="{$CMOD.LBL_NEW_GROUP}" class="classBtn" type="submit" name="New" value="{$CMOD.LBL_NEW_GROUP}"/>
+<br>
+<table align="center" border="0" cellpadding="0" cellspacing="0" width="98%">
+<tbody><tr>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
+        <td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
+        <br>
+
+	<div align=center>
+			{include file='SetMenu.tpl'}
+				<!-- DISPLAY -->
+				<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
+				<form action="index.php" method="post" name="new" id="form">
+				<input type="hidden" name="module" value="Users">
+				<input type="hidden" name="action" value="createnewgroup">
+				<input type="hidden" name="mode" value="create">
+				<input type="hidden" name="parenttab" value="Settings">
+				<tr>
+					<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}ico-groups.gif" alt="{$MOD.LBL_GROUPS}" width="48" height="48" border=0 title="{$MOD.LBL_GROUPS}"></td>
+					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > {$CMOD.LBL_GROUPS}</b></td>
+				</tr>
+				<tr>
+					<td valign=top class="small">{$MOD.LBL_GROUP_DESC}</td>
+				</tr>
+				</table>
+				<br>
+				<table border=0 cellspacing=0 cellpadding=10 width=100% >
+				<tr>
+
+				<td>
+				
+					<table border=0 cellspacing=0 cellpadding=5 width=100% class="tableHeading">
+					<tr>
+						<td class="big"><strong>{$MOD.LBL_GROUP_LIST}</strong></td>
+						<td class="small" align=right>{$CMOD.LBL_TOTAL} {$GRPCNT} {$CMOD.LBL_GROUPS} </td>
+					</tr>
+					</table>
+					<table border=0 cellspacing=0 cellpadding=5 width=100% class="listTableTopButtons">
+
+					<tr>
+					     <td class=small align=right>
+						<input title="{$CMOD.LBL_NEW_GROUP}" class="crmButton create small" type="submit" name="New" value="{$CMOD.LBL_NEW_GROUP}"/>
+					     </td>
+					</tr>
+					</table>
+						
+					<table border=0 cellspacing=0 cellpadding=5 width=100% class="listTable">
+					<tr>
+						<td class="colHeader small" valign=top width=2%>#</td>
+						<td class="colHeader small" valign=top width=8%>{$LIST_HEADER.0}</td>
+						<td class="colHeader small" valign=top width=30%>{$LIST_HEADER.1}</td>
+						<td class="colHeader small" valign=top width=60%>{$LIST_HEADER.2}</td>
+					  </tr>
+						{foreach name=grouplist item=groupvalues from=$LIST_ENTRIES}
+					  <tr>
+						<td class="listTableRow small" valign=top>{$smarty.foreach.grouplist.iteration}</td>
+						<td class="listTableRow small" valign=top>
+							  	<a href="index.php?module=Users&action=createnewgroup&returnaction=listgroups&parenttab=Settings&mode=edit&groupId={$groupvalues.groupid}"><img src="{$IMAGE_PATH}editfield.gif" alt="{$APP.LNK_EDIT}" title="{$APP.LNK_EDIT}" border="0" align="absmiddle"></a>&nbsp;|	
+								<a href="#" onClick="deletegroup('{$groupvalues.groupid}','{$groupvalues.groupname}')";><img src="{$IMAGE_PATH}delete.gif" alt="{$LNK_DELETE}" title="{$APP.LNK_DELETE}" border="0" align="absmiddle"></a>
+						</td>
+						<td class="listTableRow small" valign=top><strong>
+                              				<a href="index.php?module=Users&action=GroupDetailView&parenttab=Settings&groupId={$groupvalues.groupid}">{$groupvalues.groupname}</a></strong>
+						</td>
+						<td class="listTableRow small" valign=top>{$groupvalues.description}</td>
+					  </tr>
+					{/foreach}
+					</table>
+					<table border=0 cellspacing=0 cellpadding=5 width=100% >
+					<tr><td class="small" nowrap align=right><a href="#top">{$MOD.LBL_SCROLL}</a></td></tr>
+					</table>
+					
+					
+				</td>
+				</tr>
+				</table>
+			
+			
+			
+			</td>
+			</tr>
+			</table>
 		</td>
 	</tr>
-	<tr><td colspan="2">&nbsp;</td></tr>
-	<tr>
-		<td colspan="2" >
-			<table width="100%" border="0" cellpadding="5" cellspacing="1" class="small" style="background-color: rgb(204, 204, 204);">
-                          <tbody>
-                            <tr>
-                              <td class="lvtCol" width="35%">{$LIST_HEADER.1}</td>
-                              <td class="lvtCol" width="50%">{$LIST_HEADER.2}</td>
-							  <td class="lvtCol" width="15%">{$LIST_HEADER.0}</td>
-                            </tr>
-							{section name=entries loop=$LIST_ENTRIES}
-                            <tr  class="lvtColData" onmouseover="this.className='lvtColDataHover'" onmouseout="this.className='lvtColData'" bgcolor="white">
-                              <td ><a href="index.php?module=Users&action=GroupDetailView&parenttab=Settings&groupId={$LIST_ENTRIES[entries].groupid}">{$LIST_ENTRIES[entries].groupname}</a></td>
-                              <td >{$LIST_ENTRIES[entries].description}</td>
-							  <td align="center" >
-							  	<a href="index.php?module=Users&action=createnewgroup&returnaction=listgroups&parenttab=Settings&mode=edit&groupId={$LIST_ENTRIES[entries].groupid}">
-								<img src="{$IMAGE_PATH}editfield.gif" alt="{$APP.LNK_EDIT}" title="{$APP.LNK_EDIT}" border="0" align="absmiddle"></a>&nbsp;|	
-								<a href="#" onClick="deletegroup('{$LIST_ENTRIES[entries].groupid}','{$LIST_ENTRIES[entries].groupname}')";><img src="{$IMAGE_PATH}delete.gif" alt="{$LNK_DELETE}" title="{$APP.LNK_DELETE}" border="0" align="absmiddle"></a>
-							</td>
-                            </tr>
-							{/section}	
-                          </tbody>
-                        </table>
-			</td>
-	</tr>
+	</form>
+	</table>
+		
+	</div>
+</td>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
+   </tr>
+</tbody>
 </table>
 
-</td>
-
-</tr>
-</table>
-</td>
-</tr>
-</table>
-</td>
-</tr>
-</table>
 <script>
 function deletegroup(id,groupname)
 {ldelim}
@@ -85,23 +112,3 @@
 			return false;
 {rdelim}
 </script>
-	{include file='SettingsSubMenu.tpl'}
-
-<!-- 
-
-<td class="detailedViewHeader" width="15%"><b>{$LIST_HEADER.0}</b></td>
-	<td class="detailedViewHeader" width="35%"><b>{$LIST_HEADER.1}</b></td>
-	<td class="detailedViewHeader" width="50%"><b>{$LIST_HEADER.2}</b></td>
-	</tr>
-	
-	{section name=entries loop=$LIST_ENTRIES}
-		<tr class="{cycle values="dvtCellInfo,dvtCellLabel"}">
-		<td nowrap>&nbsp;
-		<img src="{$IMAGE_PATH}del.gif" alt="{$APP.LNK_DELETE}" title="{$APP.LNK_DELETE}" border="0" height="15" width="15" onClick="deletegroup('{$LIST_ENTRIES[entries].groupid}','{$LIST_ENTRIES[entries].groupname}')";>
-		<a href="index.php?module=Users&action=createnewgroup&returnaction=listgroups&mode=edit&groupId={$LIST_ENTRIES[entries].groupid}"><img src="{$IMAGE_PATH}edit.gif" alt="{$APP.LNK_EDIT}" title="{$APP.LNK_EDIT}" border="0"></a>
-		&nbsp;</td>
-		<td nowrap><a href="index.php?module=Users&action=GroupDetailView&groupId={$LIST_ENTRIES[entries].groupid}">{$LIST_ENTRIES[entries].groupname}</a></td>
-		<td nowrap>{$LIST_ENTRIES[entries].description}&nbsp;</td>
-		<tr>
-	{/section}	
- -->




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 20 02:50:02 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 20 Jun 2006 06:50:02 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7285 -
 /vtigercrm/trunk/Smarty/templates/CurrencyEditView.tpl
Message-ID: <20060620065002.11F1083F230@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 20 00:49:58 2006
New Revision: 7285

Log:
updated currency editview file - ahmed

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

Modified: vtigercrm/trunk/Smarty/templates/CurrencyEditView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/CurrencyEditView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/CurrencyEditView.tpl Tue Jun 20 00:49:58 2006
@@ -1,118 +1,125 @@
-{*
-
-/*********************************************************************************
-** The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is:  vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
-*
- ********************************************************************************/ *}
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-<tr>
-        {include file='SettingsMenu.tpl'}
-<td width="75%" valign="top">
-<form action="index.php" method="post" name="index" id="form">
-<input type="hidden" name="module" value="Settings">
-<input type="hidden" name="parenttab" value="{$PARENTTAB}">
-<input type="hidden" name="action" value="index">
-<input type="hidden" name="record" value="{$ID}">
-<table width="100%" border="0" cellpadding="0" cellspacing="0" height="100%">
-	<tr>
-		<td class="showPanelBg" valign="top" width="95%"  style="padding-left:20px; "><br />
-			<span class="lvtHeaderText"> {$MOD.LBL_MODULE_NAME} &gt; {$MOD.LBL_CONFIGURATION} &gt; {$MOD.LBL_CURRENCY_INFO} </span>
-			<hr noshade="noshade" size="1" />
-		</td>
-		<td width="5%" class="showPanelBg">&nbsp;</td>
-	</tr>
-	<tr>
-		<td width="98%" style="padding-left:20px;" valign="top">
-			<!-- module Select Table -->
-			<table width="95%"  border="0" cellspacing="0" cellpadding="0" align="center">
-				<tr>
-					<td width="7" height="6" style="font-size:1px;font-family:Arial, Helvetica, sans-serif;"><img src="{$IMAGE_PATH}top_left.jpg" align="top"  /></td>
-					<td bgcolor="#EBEBEB" style="font-size:1px;font-family:Arial, Helvetica, sans-serif;height:6px;"></td>
-					<td width="8" height="6" style="font-size:1px;font-family:Arial, Helvetica, sans-serif;"><img src="{$IMAGE_PATH}top_right.jpg" width="8" height="6" align="top" /></td>
-				</tr>
-				<tr>
-					<td bgcolor="#EBEBEB" width="7"></td>
-					<td bgcolor="#ECECEC" style="padding-left:10px;padding-top:10px;vertical-align:top;">
-					<table width="100%"  border="0" cellspacing="0" cellpadding="10" class="small">
-						<tr>
-							<td rowspan="11" bgcolor="#ffffff" width="30%" valign="bottom" background="{$IMAGE_PATH}CurrConfig_top.gif" style="background-position:top right;background-repeat:no-repeat;">
-		<table width="100%" border="0" cellpadding="0" cellspacing="0">
-				<tr>
-						<td background="{$IMAGE_PATH}CurrConfig_btm.gif" style="background-position:bottom right;background-repeat:no-repeat; " height="150">&nbsp;</td>
-				</tr>
-		</table>
-	</td>
-							<td colspan="2" class="genHeaderBig" width="70%">{$MOD.LBL_CURRENCY_TITLE}<br />
-							<hr /> </td>
-						</tr>
-					        <tr>
-							<td align="right" width="25%"><font color="red">*</font><b>{$MOD.LBL_CURRENCY_NAME} : </b></td>
-							<td width="50%" align="left" ><input type="text" name="currency_name" value="{$CURRENCY_NAME}" class="txtBox" /></td>
-						</tr>
-						<tr>
-							<td align="right"><font color="red">*</font><b>{$MOD.LBL_CURRENCY_CODE} : </b></td>
-							<td><input type="text" name="currency_code" value="{$CURRENCY_CODE}" class="txtBox" /></td>
-						</tr>
-						<tr>
-							<td align="right"><font color="red">*</font><b>{$MOD.LBL_CURRENCY_SYMBOL} : </b></td>
-							<td><input type="text" name="currency_symbol" value="{$CURRENCY_SYMBOL}" class="txtBox" /></td>
-						</tr>
-						<tr>
-							<td align="right"><font color="red">*</font><b>{$MOD.LBL_CURRENCY_CRATE}  : </b></td>
-							<td>
-								<input type="text" name="conversion_rate" value="{$CONVERSION_RATE}" class="txtBox" />
-								<br>(Eg: 1 U.S. Dollar equal to 0.78 Euro) 
-							</td>
-						</tr>
-						<tr>
-							<td align="right"><b>{$MOD.LBL_CURRENCY_STATUS} : </b></td>
-							<td><select name="currency_status" {$STATUS_DISABLE} class="importBox">
-								<option value="Active"  {$ACTSELECT}>{$MOD.LBL_ACTIVE}</option>
-					        	        <option value="Inactive" {$INACTSELECT}>{$MOD.LBL_INACTIVE}</option>
-					                    </select>
-							</td>
-						</tr>
-						<tr>
-							<td colspan="2"  width="75%" style="padding-bottom:0px;padding-top:0px; "><hr /> </td>
-						</tr>
-						<tr>
-							<td colspan="2" align="center">
-							<input title="{$APP.LBL_SAVE_BUTTON_LABEL}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="classBtn" onclick="this.form.action.value='SaveCurrencyInfo'; return validate()" type="submit" name="button" value="{$APP.LBL_SAVE_BUTTON_LABEL}" >&nbsp;&nbsp;
-							<input title="{$APP.LBL_CANCEL_BUTTON_LABEL}>" accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" class="classBtn" onclick="window.history.back()" type="button" name="button" value="{$APP.LBL_CANCEL_BUTTON_LABEL}">
-							</td>
-						</tr>
-					</table>
-					</td>
-					<td bgcolor="#EBEBEB" width="8"></td>
-				</tr>
-				<tr>
-					<td width="7" height="8" style="font-size:1px;font-family:Arial, Helvetica, sans-serif;"><img src="{$IMAGE_PATH}bottom_left.jpg" align="bottom"  /></td>
-					<td bgcolor="#ECECEC" height="8" style="font-size:1px;" ></td>
-					<td width="8" height="8" style="font-size:1px;font-family:Arial, Helvetica, sans-serif;"><img src="{$IMAGE_PATH}bottom_right.jpg" align="bottom" /></td>
-				</tr>
-			</table><br />
-		</td>
-		<td>&nbsp;</td>
-	</tr>
-</table>
-</form>
-</td>
-</tr>
-</table>
-<script>
-        function validate() {ldelim}
-                if (!emptyCheck("currency_name","Currency Name","text")) return false
-                        if (!emptyCheck("currency_code","Currency Code","text")) return false
-                                if (!emptyCheck("currency_symbol","Currency Symbol","text")) return false
-                                        if (!emptyCheck("conversion_rate","Conversion Rate","text")) return false
-                                                if (!emptyCheck("currency_status","Currency Status","text")) return false
-                                                        return true;
-
-        {rdelim}
-</script>
-{include file='SettingsSubMenu.tpl'}
+{*<!--
+/*********************************************************************************
+** The contents of this file are subject to the vtiger CRM Public License Version 1.0
+ * ("License"); You may not use this file except in compliance with the License
+ * The Original Code is:  vtiger CRM Open Source
+ * The Initial Developer of the Original Code is vtiger.
+ * Portions created by vtiger are Copyright (C) vtiger.
+ * All Rights Reserved.
+*
+ ********************************************************************************/
+-->*}
+<script language="JAVASCRIPT" type="text/javascript" src="include/js/smoothscroll.js"></script>
+<script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
+<br>
+<table align="center" border="0" cellpadding="0" cellspacing="0" width="98%">
+<tbody><tr>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
+        <td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
+<br>
+	<div align=center>
+			{include file='SetMenu.tpl'}
+			<!-- DISPLAY -->
+			<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
+			<form action="index.php" method="post" name="index" id="form">
+			<input type="hidden" name="module" value="Settings">
+			<input type="hidden" name="parenttab" value="{$PARENTTAB}">
+			<input type="hidden" name="action" value="index">
+			<input type="hidden" name="record" value="{$ID}">
+			<tr>
+				<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}currency.gif" alt="Users" width="48" height="48" border=0 title="Users"></td>
+				<td class="heading2" valign="bottom" ><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Settings&action=CurrencyListView&parenttab=Settings">{$MOD.LBL_CURRENCY_SETTINGS}</a> > {$MOD.LBL_EDIT} &quot;{$CURRENCY_NAME}&quot; </b></td>
+			</tr>
+			<tr>
+				<td valign=top class="small">{$MOD.LBL_CURRENCY_DESCRIPTION}</td>
+			</tr>
+			</table>
+				
+				<br>
+				<table border=0 cellspacing=0 cellpadding=10 width=100% >
+				<tr>
+				<td>
+				
+					<table border=0 cellspacing=0 cellpadding=5 width=100% class="tableHeading">
+					<tr>
+						<td class="big"><strong>{$MOD.LBL_SETTINGS} {$APP.LBL_FOR} &quot;{$CURRENCY_NAME}&quot;  </strong></td>
+						<td class="small" align=right>
+							<input title="{$APP.LBL_SAVE_BUTTON_LABEL}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="crmButton small save" onclick="this.form.action.value='SaveCurrencyInfo'; return validate()" type="submit" name="button" value="{$APP.LBL_SAVE_BUTTON_LABEL}" >&nbsp;&nbsp;
+							<input title="{$APP.LBL_CANCEL_BUTTON_LABEL}>" accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" class="crmButton small cancel" onclick="window.history.back()" type="button" name="button" value="{$APP.LBL_CANCEL_BUTTON_LABEL}">
+						</td>
+					</tr>
+					</table>
+					
+			<table border=0 cellspacing=0 cellpadding=0 width=100% class="listRow">
+			<tr>
+			<td class="small" valign=top >
+			<table width="100%"  border="0" cellspacing="0" cellpadding="5">
+			  <tr>
+                            <td width="20%" nowrap class="small cellLabel"><font color="red">*</font><strong>{$MOD.LBL_CURRENCY_NAME}</strong></td>
+                            <td width="80%" class="small cellText"><input type="text" class="detailedViewTextBox small" value="{$CURRENCY_NAME}" name="currency_name"></td>
+                          </tr>
+                          <tr valign="top">
+                            <td nowrap class="small cellLabel"><font color="red">*</font><strong>{$MOD.LBL_CURRENCY_CODE}</strong></td>
+                            <td class="small cellText"><input type="text" class="detailedViewTextBox small" value="{$CURRENCY_CODE}" name="currency_code"></td>
+                          </tr>
+                          <tr valign="top">
+                            <td nowrap class="small cellLabel"><font color="red">*</font><strong>{$MOD.LBL_CURRENCY_SYMBOL}</strong></td>
+                            <td class="small cellText"><input type="text" class="detailedViewTextBox small" value="{$CURRENCY_SYMBOL}" name="currency_symbol"></td>
+                          </tr>
+                          <tr valign="top">
+                            <td nowrap class="small cellLabel"><font color="red">*</font><strong>{$MOD.LBL_CURRENCY_CRATE}</strong></td>
+
+                            <td class="small cellText"><input type="text" class="detailedViewTextBox small" value="{$CONVERSION_RATE}" name="conversion_rate"></td>
+                          </tr>
+                          <tr>
+                            <td nowrap class="small cellLabel"><strong>{$MOD.LBL_CURRENCY_STATUS}</strong></td>
+                            <td class="small cellText">
+				<select name="currency_status" {$STATUS_DISABLE} class="importBox">
+					<option value="Active"  {$ACTSELECT}>{$MOD.LBL_ACTIVE}</option>
+		        	        <option value="Inactive" {$INACTSELECT}>{$MOD.LBL_INACTIVE}</option>
+              	                </select>
+			    </td>
+                          </tr>	
+                        </table>
+						
+						</td>
+					  </tr>
+					</table>
+					<table border=0 cellspacing=0 cellpadding=5 width=100% >
+					<tr>
+					  <td class="small" nowrap align=right><a href="#top">{$MOD.LBL_SCROLL}</a></td>
+					</tr>
+					</table>
+				</td>
+				</tr>
+				</table>
+			
+			
+			
+			</td>
+			</tr>
+			</table>
+		</td>
+	</tr>
+	</form>
+	</table>
+		
+	</div>
+</td>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
+   </tr>
+</tbody>
+</table>
+{literal}
+<script>
+        function validate() {
+                if (!emptyCheck("currency_name","Currency Name","text")) return false
+                        if (!emptyCheck("currency_code","Currency Code","text")) return false
+                                if (!emptyCheck("currency_symbol","Currency Symbol","text")) return false
+                                        if (!emptyCheck("conversion_rate","Conversion Rate","text")) return false
+                                                if (!emptyCheck("currency_status","Currency Status","text")) return false
+                                                        return true;
+
+        }
+</script>
+{/literal}




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 20 02:50:47 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 20 Jun 2006 06:50:47 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7286 -
 /vtigercrm/trunk/Smarty/templates/CurrencyDetailView.tpl
Message-ID: <20060620065047.F217A83F22E@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 20 00:50:43 2006
New Revision: 7286

Log:
Added the currency detailview file - ahmed

Added:
    vtigercrm/trunk/Smarty/templates/CurrencyDetailView.tpl




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 20 02:59:25 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 20 Jun 2006 06:59:25 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7287 - in
 /vtigercrm/trunk/Smarty/templates: CreateEmailTemplate.tpl
 DetailViewEmailTemplate.tpl ListEmailTemplates.tpl
Message-ID: <20060620065925.C9F8A83F230@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 20 00:59:19 2006
New Revision: 7287

Log:
Updated the tpl file for email templates - ahmed

Modified:
    vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl
    vtigercrm/trunk/Smarty/templates/DetailViewEmailTemplate.tpl
    vtigercrm/trunk/Smarty/templates/ListEmailTemplates.tpl

Modified: vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/CreateEmailTemplate.tpl Tue Jun 20 00:59:19 2006
@@ -1,325 +1,325 @@
-{*<!--
-/*********************************************************************************
-  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
-   * ("License"); You may not use this file except in compliance with the License
-   * The Original Code is:  vtiger CRM Open Source
-   * The Initial Developer of the Original Code is vtiger.
-   * Portions created by vtiger are Copyright (C) vtiger.
-   * All Rights Reserved.
-  *
- ********************************************************************************/
--->*}
-<script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
-<style type="text/css">@import url(../themes/blue/style.css);</style>
-
-<script language="JavaScript" type="text/javascript">
-    var allOptions = null;
-
-    function setAllOptions(inputOptions) 
-    {ldelim}
-        allOptions = inputOptions;
-    {rdelim}
-
-    function modifyMergeFieldSelect(cause, effect) 
-    {ldelim}
-        var selected = cause.options[cause.selectedIndex].value;  id="mergeFieldValue"
-        var s = allOptions[cause.selectedIndex];
-            
-        effect.length = s;
-        for (var i = 0; i < s; i++) 
-	{ldelim}
-            effect.options[i] = s[i];
-        {rdelim}
-        document.getElementById('mergeFieldValue').value = '';
-    {rdelim}
-{literal}
-    function init() 
-    {
-        var blankOption = new Option('--None--', '--None--');
-        var allOpts = new Object(0);
-        var options = null;
-            
-	    options = new Object(19);
-            options[0] = blankOption;
-            
-                
-                options[1] = new Option('Account: Account Name', '$accounts-accountname$'); 
-                options[2] = new Option('Account: Account Type', '$accounts-account_type$'); 
-                options[3] = new Option('Account: Industry', '$accounts-industry$'); 
-                options[4] = new Option('Account: Annual Revenue', '$accounts-annualrevenue$'); 
-                options[5] = new Option('Account: Phone', '$accounts-phone$'); 
-                options[6] = new Option('Account: Email', '$accounts-email1$'); 
-                options[7] = new Option('Account: Rating', '$accounts-rating$'); 
-                options[8] = new Option('Account: Website', '$accounts-website$'); 
-                options[9] = new Option('Account: Fax', '$accounts-fax$'); 
-            
-	        allOpts[1] = options;
-        
-            options = new Object(11);
-            options[0] = blankOption;
-                
-                options[1] = new Option('Contact: First Name', '$contacts-firstname$'); 
-                options[2] = new Option('Contact: Last Name', '$contacts-lastname$'); 
-                options[3] = new Option('Contact: Salutation', '$contacts-salutationtype$'); 
-                options[4] = new Option('Contact: Title', '$contacts-title$'); 
-                options[5] = new Option('Contact: Email', '$contacts-email$'); 
-                options[6] = new Option('Contact: Department', '$contacts-department$'); 
-                options[7] = new Option('Contact: Other Email','$contacts-otheremail$'); 
-                options[8] = new Option('Contact: Phone', '$contacts-phone$'); 
-                options[9] = new Option('Contact: Mobile', '$contacts-mobile$'); 
-                options[10] = new Option('Contact: Currency', '$contacts-currency$'); 
-                            
-            allOpts[2] = options;
-        
-            
-            options = new Object(19);
-            options[0] = blankOption;
-            
-                
-                options[1] = new Option('Lead: First Name', '$leads-firstname$'); 
-                options[2] = new Option('Lead: Last Name', '$leads-lastname$'); 
-                options[3] = new Option('Lead: Lead Source', '$leads-leadsource$'); 
-                options[4] = new Option('Lead: Status', '$leads-leadstatus$'); 
-                options[5] = new Option('Lead: Rating', '$leads-rating$'); 
-                options[6] = new Option('Lead: Industry', '$leads-industry$'); 
-                options[7] = new Option('Lead: Yahoo ID', '$leads-yahooid$'); 
-                options[8] = new Option('Lead: Email', '$leads-email$'); 
-                options[9] = new Option('Lead: Annual Revenue', '$leads-annualrevenue$'); 
-                options[10] = new Option('Lead: Title', '$leads-designation$'); 
-                options[11] = new Option('Lead: Salutation', '$leads-salutation$'); 
-            
-	        allOpts[3] = options;
-
-	        options = new Object(19);
-                options[0] = blankOption;
-            
-                options[1] = new Option('User: First Name', '$users-first_name$'); 
-                options[2] = new Option('User: Last Name', '$users-last_name$'); 
-		options[3] = new Option('User: Title', '$users-title$'); 
-		options[4] = new Option('User: Department', '$users-department$'); 
-		options[5] = new Option('User: HomePhone', '$users-phone_home$'); 
-		options[6] = new Option('User: Mobile', '$users-phone_mobile$'); 
-		options[7] = new Option('User: Signature', '$users-signature$'); 
-		options[8] = new Option('User: Email', '$users-email$'); 
-		options[9] = new Option('User: Street', '$users-address_street$'); 
-		options[10] = new Option('User: City', '$users-address_city$'); 
-		options[11] = new Option('User: State', '$users-address_state$'); 
-		options[11] = new Option('User: Country', '$users-address_country$'); 
-		options[11] = new Option('User: PostalCode', '$users-address_postalcode$'); 
-            
-            	allOpts[4] = options;
-	    
-        setAllOptions(allOpts);
-    }
-	
-	function cancelForm(frm)
-	{
-		frm.action.value='detailviewemailtemplate'
-		frm.submit()
-	}
-{/literal}
-</script>
-
-
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-<tr>
-	{include file='SettingsMenu.tpl'}
-<td width="75%" valign="top">
-<form action="index.php" method="post" name="templatecreate" onsubmit="return check4null(templatecreate);">  
-<input type="hidden" name="action">
-<input type="hidden" name="mode" value="{$MODE}">
-<input type="hidden" name="module" value="Users">
-<input type="hidden" name="templateid" value="{$TEMPLATEID}">
-
-<!-- EMAIL TEMPLATE PAGE STARTS HERE -->
-<table width="100%" border="0" cellpadding="0" cellspacing="0" height="100%" class="small">
-	<tr>
-		 <td class="showPanelBg" valign="top" width="90%"  style="padding-left:20px; "><br />
-			{if $EMODE eq 'edit'}
-        	        	<span class="lvtHeaderText"><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a>
-				<a href="index.php?module=Users&action=detailviewemailtemplate&templateid={$TEMPLATEID}"> &gt; {$MOD.LBL_COMMUNICATION_TEMPLATES} &gt; {$MOD.LBL_EDIT} {$MOD.EMAILTEMPLATES} &gt; {$TEMPLATENAME}</a></b></span>
-			{else}
-				<span class="lvtHeaderText"><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a>
-				<a href="index.php?module=Users&action=listemailtemplates">&gt; {$MOD.LBL_COMMUNICATION_TEMPLATES} &gt; {$MOD.LBL_CREATE_EMAIL_TEMPLATES} &gt; {$MOD.NEW}</a></b> </span>
-			{/if}
-            	    <hr noshade="noshade" size="1" />
-		</td>
-		<td width="10%" class="showPanelBg">&nbsp;</td>
-	</tr>
-	<tr>
-		<td width="90%" style="padding-left:20px;" valign="top">
-			<table width="100%"  border="0" cellspacing="0" cellpadding="0">
-			  <tr><td colspan="2">&nbsp;</td></tr>
-			  <tr>
-
-				<td colspan="2">
-					<table width="100%" border="0" cellpadding="0" cellspacing="0" class="small">
-						<tr>
-						  <td width="5%" valign="top" align="right" nowrap>
-								<img src="{$IMAGE_PATH}ViewTemplate.gif" align="left" />
-							</td>
-								<td width="5%" valign="top" align="right" nowrap>
-									<b><font color='red'>*</font>{$UMOD.LBL_TEMPLATE_NAME}</b><br />
-									<br />
-									<b>{$UMOD.LBL_DESCRIPTION}{$UMOD.LBL_COLON}</b><br />
-									<br /><br />
-									<b><font color='red'>{$APP.LBL_REQUIRED_SYMBOL}</font>{$UMOD.LBL_FOLDER}{$UMOD.LBL_COLON}</b>
-
-								</td>
-							<td width="85%" align="left" style="padding-left:10px;">
-								<input name="templatename" type="text" class="detailedViewTextBox" onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'" value="{$TEMPLATENAME}" tabindex="1"/>
-								<br />
-								<textarea name="description" cols="30" rows="3" class="detailedViewTextBox" onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'" tabindex="2" >{$DESCRIPTION}</textarea>
-								<br />
-								{if $EMODE eq 'edit'}
-									<select name="foldername" class="detailedViewTextBox" tabindex="3">
-                                                                {foreach item=arr from=$FOLDERNAME}
-
-                                                                 <option value="{$FOLDERNAME}" {$arr}>{$FOLDERNAME}</option>
-
-                                                                        {if $FOLDERNAME == 'Public'}
-                                                                                <option value="Personal">{$UMOD.LBL_PERSONAL}</option>
-                                                                        {else}
-                                                                                <option value="Public">{$UMOD.LBL_PUBLIC}</option>
-                                                                        {/if}
-
-                                                                {/foreach}
-                                                                </select>
-								{else}
-									<select name="foldername" class="detailedViewTextBox" tabindex="3" value="{$FOLDERNAME}">
-                	                                                        <option value="Personal">{$UMOD.LBL_PERSONAL}</option>
-                        	                                                <option value="Public" selected>{$UMOD.LBL_PUBLIC}</option>
-        	                                                        </select>
-								{/if}
-							</td>
-						</tr>
-					</table>
-
-				</td>
-			  </tr>
-			  <tr>
-				<td>&nbsp;</td>
-				<td>&nbsp;</td>
-			  </tr>
-			  <tr>
-			    <td colspan="2" style="border:2px solid #CCCCCC;">
-					<table width="100%" border="0" cellpadding="5" cellspacing="0" class="small">
-
-	                  <tr>
-    	                <td width="15%" align="right" bgcolor="#F6F6F6"><b><font color='red'>*</font>{$UMOD.LBL_TEMPLATE_SUBJECT}</b></td>
-        	            <td width="60%" style="border-right:1px dashed #CCCCCC;">
-							<input name="subject" type="text" class="detailedViewTextBox" value="{$SUBJECT}" onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'" tabindex="4"/></td>
-            	      	<td width="25%" rowspan="3" style="padding:5px;text-align:left;vertical-align:top;">
-							<table width="100%" border="0" cellpadding="0" cellspacing="0" class="small">
-								<tr><td style="color:#999999;">{$UMOD.LBL_USE_MERGE_FIELDS_TO_EMAIL_CONTENT}</td></tr>
-
-								<tr><td><b><u>{$UMOD.LBL_AVAILABLE_MERGE_FIELDS}</u></b></td></tr>
-								<tr><td>&nbsp;</td></tr>
-
-								<tr><td><b>{$UMOD.LBL_SELECT_FIELD_TYPE}</b></td></tr>
-								<tr><td><select class="detailedViewTextBox" id="entityType" ONCHANGE="modifyMergeFieldSelect(this, document.getElementById('mergeFieldSelect'));" tabindex="6">
-								<OPTION VALUE="0" selected>{$APP.LBL_NONE}                            
-								<OPTION VALUE="1">{$UMOD.LBL_ACCOUNT_FIELDS}                            
-                        				        <OPTION VALUE="2">{$UMOD.LBL_CONTACT_FIELDS}
-                            
-								<OPTION VALUE="3" >{$UMOD.LBL_LEAD_FIELDS}
-
-                                				<OPTION VALUE="4" >{$UMOD.LBL_USER_FIELDS}
-                            
-								</select></td></tr>
-								<tr><td>&nbsp;</td></tr>
-								<tr><td><b>{$UMOD.LBL_SELECT_FIELD}</b></td></tr>
-								<tr><td><select class="detailedViewTextBox" id="mergeFieldSelect" onchange="document.getElementById('mergeFieldValue').value=this.options[this.selectedIndex].value;" tabindex="7"><option value="0" selected>{$APP.LBL_NONE}</select></td></tr>
-								<tr><td>&nbsp;</td></tr>
-								<tr><td><b>{$UMOD.LBL_MERGE_FIELD_VALUE}</b></td></tr>
-
-								<tr><td><input type="text"  id="mergeFieldValue" name="variable" value="variable" class="detailedViewTextBoxOn" tabindex="8"/></td></tr>
-								<tr><td style="color:#999999;">({$UMOD.LBL_COPY_AND_PASTE_MERGE_FIELD})</td></tr>
-							</table>
-							<script>
-						                modifyMergeFieldSelect(document.getElementById('mergeTypeSelect'), document.getElementById('mergeFieldSelect'));
-						        </script>
-						
-						</td>
-
-					  </tr>
-					  <tr>
-					  	<td bgcolor="#F6F6F6">&nbsp;</td>
-
-					  	<td style="border-right:1px dashed #CCCCCC;">&nbsp;</td>
-					  </tr>
-	                  <tr>
-	                    <td  align="right" bgcolor="#F6F6F6" valign="top"><b>{$UMOD.LBL_TEMPLATE_MESSAGE}</b></td>
-	                    <td style="border-right:1px dashed #CCCCCC;" nowrap>
-				<textarea name="body" rows="10" class="detailedViewTextBox" onfocus="this.className='detailedViewTextBoxOn'" onblur="this.className='detailedViewTextBox'" tabindex="5">{$BODY}</textarea>
-			    </td>
-			  </tr>
-
-               	  </table>
-		      </td>
-		      </tr>
-			</table>
-		</td>
-		<td>&nbsp;</td>
-	</tr>
-	<tr><td colspan="2">&nbsp;</td></tr>
-	<tr>
-
-		<td align="center">
-			<input type="submit" value="{$APP.LBL_SAVE_BUTTON_LABEL}" class="small" onclick="this.form.action.value='saveemailtemplate'" tabindex="9"/>&nbsp;&nbsp;
-			{if $EMODE eq 'edit'}
-				<input type="submit" value="{$APP.LBL_CANCEL_BUTTON_LABEL}" class="small" onclick="cancelForm(this.form)" tabindex="10"/>
-			{else}
-				<input type="button" value="{$APP.LBL_CANCEL_BUTTON_LABEL}" class="small" onclick="window.history.back()" tabindex="10">
-			{/if}
-		</td>
-		<td>&nbsp;</td>
-	</tr>
-	
-</table>
-
-</form>
-</td>
-</tr>
-</table>
-
-<script>
-
-function check4null(form)
-{ldelim}
-
-        var isError = false;
-        var errorMessage = "";
-        // Here we decide whether to submit the form.
-        if (trim(form.templatename.value) =='') {ldelim}
-                isError = true;
-                errorMessage += "\n template name";
-                form.templatename.focus();
-        {rdelim}
-        if (trim(form.foldername.value) =='') {ldelim}
-                isError = true;
-                errorMessage += "\n folder name";
-                form.foldername.focus();
-        {rdelim}
-        if (trim(form.subject.value) =='') {ldelim}
-                isError = true;
-                errorMessage += "\n subject";
-                form.subject.focus();
-        {rdelim}
-
-        // Here we decide whether to submit the form.
-        if (isError == true) {ldelim}
-                alert("Missing required fields: " + errorMessage);
-                return false;
-        {rdelim}
- return true;
-
-{rdelim}
-
-init();
-
-</script>
-
-{$JAVASCRIPT}
-{include file='SettingsSubMenu.tpl'}
-
+{*<!--
+/*********************************************************************************
+  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
+   * ("License"); You may not use this file except in compliance with the License
+   * The Original Code is:  vtiger CRM Open Source
+   * The Initial Developer of the Original Code is vtiger.
+   * Portions created by vtiger are Copyright (C) vtiger.
+   * All Rights Reserved.
+  *
+ ********************************************************************************/
+-->*}
+<script language="JAVASCRIPT" type="text/javascript" src="include/js/smoothscroll.js"></script>
+<script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
+<style type="text/css">@import url(../themes/blue/style.css);</style>
+
+<script language="JavaScript" type="text/javascript">
+    var allOptions = null;
+
+    function setAllOptions(inputOptions) 
+    {ldelim}
+        allOptions = inputOptions;
+    {rdelim}
+
+    function modifyMergeFieldSelect(cause, effect) 
+    {ldelim}
+        var selected = cause.options[cause.selectedIndex].value;  id="mergeFieldValue"
+        var s = allOptions[cause.selectedIndex];
+            
+        effect.length = s;
+        for (var i = 0; i < s; i++) 
+	{ldelim}
+            effect.options[i] = s[i];
+        {rdelim}
+        document.getElementById('mergeFieldValue').value = '';
+    {rdelim}
+{literal}
+    function init() 
+    {
+        var blankOption = new Option('--None--', '--None--');
+        var allOpts = new Object(0);
+        var options = null;
+            
+	    options = new Object(19);
+            options[0] = blankOption;
+            
+                
+                options[1] = new Option('Account: Account Name', '$accounts-accountname$'); 
+                options[2] = new Option('Account: Account Type', '$accounts-account_type$'); 
+                options[3] = new Option('Account: Industry', '$accounts-industry$'); 
+                options[4] = new Option('Account: Annual Revenue', '$accounts-annualrevenue$'); 
+                options[5] = new Option('Account: Phone', '$accounts-phone$'); 
+                options[6] = new Option('Account: Email', '$accounts-email1$'); 
+                options[7] = new Option('Account: Rating', '$accounts-rating$'); 
+                options[8] = new Option('Account: Website', '$accounts-website$'); 
+                options[9] = new Option('Account: Fax', '$accounts-fax$'); 
+            
+	        allOpts[1] = options;
+        
+            options = new Object(11);
+            options[0] = blankOption;
+                
+                options[1] = new Option('Contact: First Name', '$contacts-firstname$'); 
+                options[2] = new Option('Contact: Last Name', '$contacts-lastname$'); 
+                options[3] = new Option('Contact: Salutation', '$contacts-salutationtype$'); 
+                options[4] = new Option('Contact: Title', '$contacts-title$'); 
+                options[5] = new Option('Contact: Email', '$contacts-email$'); 
+                options[6] = new Option('Contact: Department', '$contacts-department$'); 
+                options[7] = new Option('Contact: Other Email','$contacts-otheremail$'); 
+                options[8] = new Option('Contact: Phone', '$contacts-phone$'); 
+                options[9] = new Option('Contact: Mobile', '$contacts-mobile$'); 
+                options[10] = new Option('Contact: Currency', '$contacts-currency$'); 
+                            
+            allOpts[2] = options;
+        
+            
+            options = new Object(19);
+            options[0] = blankOption;
+            
+                
+                options[1] = new Option('Lead: First Name', '$leads-firstname$'); 
+                options[2] = new Option('Lead: Last Name', '$leads-lastname$'); 
+                options[3] = new Option('Lead: Lead Source', '$leads-leadsource$'); 
+                options[4] = new Option('Lead: Status', '$leads-leadstatus$'); 
+                options[5] = new Option('Lead: Rating', '$leads-rating$'); 
+                options[6] = new Option('Lead: Industry', '$leads-industry$'); 
+                options[7] = new Option('Lead: Yahoo ID', '$leads-yahooid$'); 
+                options[8] = new Option('Lead: Email', '$leads-email$'); 
+                options[9] = new Option('Lead: Annual Revenue', '$leads-annualrevenue$'); 
+                options[10] = new Option('Lead: Title', '$leads-designation$'); 
+                options[11] = new Option('Lead: Salutation', '$leads-salutation$'); 
+            
+	        allOpts[3] = options;
+
+	        options = new Object(19);
+                options[0] = blankOption;
+            
+                options[1] = new Option('User: First Name', '$users-first_name$'); 
+                options[2] = new Option('User: Last Name', '$users-last_name$'); 
+		options[3] = new Option('User: Title', '$users-title$'); 
+		options[4] = new Option('User: Department', '$users-department$'); 
+		options[5] = new Option('User: HomePhone', '$users-phone_home$'); 
+		options[6] = new Option('User: Mobile', '$users-phone_mobile$'); 
+		options[7] = new Option('User: Signature', '$users-signature$'); 
+		options[8] = new Option('User: Email', '$users-email$'); 
+		options[9] = new Option('User: Street', '$users-address_street$'); 
+		options[10] = new Option('User: City', '$users-address_city$'); 
+		options[11] = new Option('User: State', '$users-address_state$'); 
+		options[11] = new Option('User: Country', '$users-address_country$'); 
+		options[11] = new Option('User: PostalCode', '$users-address_postalcode$'); 
+            
+            	allOpts[4] = options;
+	    
+        setAllOptions(allOpts);
+    }
+	
+	function cancelForm(frm)
+	{
+		frm.action.value='detailviewemailtemplate';
+		frm.parenttab.value='Settings';
+		frm.submit();
+	}
+{/literal}
+</script>
+
+<br>
+<table align="center" border="0" cellpadding="0" cellspacing="0" width="98%">
+<tbody><tr>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
+        <td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
+<br>
+	<div align=center>
+	
+			{include file='SetMenu.tpl'}
+				<!-- DISPLAY -->
+				<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
+				<form action="index.php" method="post" name="templatecreate" onsubmit="return check4null(templatecreate);">  
+				<input type="hidden" name="action">
+				<input type="hidden" name="mode" value="{$EMODE}">
+				<input type="hidden" name="module" value="Users">
+				<input type="hidden" name="templateid" value="{$TEMPLATEID}">
+				<input type="hidden" name="parenttab" value="PARENTTAB}">
+				<tr>
+					<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}ViewTemplate.gif" alt="Users" width="45" height="60" border=0 title="Users"></td>
+				{if $EMODE eq 'edit'}
+					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Users&action=listemailtemplates&parenttab=Settings">{$UMOD.LBL_EMAIL_TEMPLATES}</a> &gt; {$MOD.LBL_EDIT} &quot;{$TEMPLATENAME}&quot; </b></td>
+				{else}
+					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Users&action=listemailtemplates&parenttab=Settings">{$UMOD.LBL_EMAIL_TEMPLATES}</a> &gt; {$MOD.LBL_CREATE_EMAIL_TEMPLATES} </b></td>
+				{/if}
+					
+				</tr>
+				<tr>
+					<td valign=top class="small">{$UMOD.LBL_EMAIL_TEMPLATE_DESC}</td>
+				</tr>
+				</table>
+				
+				<br>
+				<table border=0 cellspacing=0 cellpadding=10 width=100% >
+				<tr>
+				<td>
+				
+					<table border=0 cellspacing=0 cellpadding=5 width=100% class="tableHeading">
+					<tr>
+						{if $EMODE eq 'edit'}
+						<td class="big"><strong>{$UMOD.LBL_PROPERTIES} &quot;{$TEMPLATENAME}&quot; </strong></td>
+						{else}
+						<td class="big"><strong>{$MOD.LBL_CREATE_EMAIL_TEMPLATES}</strong></td>
+						{/if}
+						<td class="small" align=right>
+							<input type="submit" value="{$APP.LBL_SAVE_BUTTON_LABEL}" class="crmButton small save" onclick="this.form.action.value='saveemailtemplate'; this.form.parenttab.value='Settings'" >&nbsp;&nbsp;
+			{if $EMODE eq 'edit'}
+				<input type="submit" value="{$APP.LBL_CANCEL_BUTTON_LABEL}" class="crmButton small cancel" onclick="cancelForm(this.form)" />
+			{else}
+				<input type="button" value="{$APP.LBL_CANCEL_BUTTON_LABEL}" class="crmButton small cancel" onclick="window.history.back()" >
+			{/if}
+						</td>
+					</tr>
+					</table>
+					
+					<table border=0 cellspacing=0 cellpadding=5 width=100% >
+					<tr>
+						<td width=20% class="small cellLabel"><font color="red">*</font><strong>{$UMOD.LBL_NAME}</strong></td>
+						<td width=80% class="small cellText"><input name="templatename" type="text" value="{$TEMPLATENAME}" class="detailedViewTextBox" tabindex="1">&nbsp;</td>
+					  </tr>
+					<tr>
+						<td valign=top class="small cellLabel"><strong>{$UMOD.LBL_DESCRIPTION}</strong></td>
+						<td class="cellText small" valign=top><span class="small cellText">
+						  <input name="description" type="text" value="{$DESCRIPTION}" class="detailedViewTextBox" tabindex="2">
+						</span></td>
+					  </tr>
+					<tr>
+						<td valign=top class="small cellLabel"><strong>{$UMOD.LBL_FOLDER}</strong></td>
+						<td class="cellText small" valign=top>
+						{if $EMODE eq 'edit'}
+						<select name="foldername" class="small" tabindex="" style="width:100%" tabindex="3">
+                                                    {foreach item=arr from=$FOLDERNAME}
+                                                     <option value="{$FOLDERNAME}" {$arr}>{$FOLDERNAME}</option>
+                                                        {if $FOLDERNAME == 'Public'}
+                                                          <option value="Personal">{$UMOD.LBL_PERSONAL}</option>
+                                                        {else}
+                                                          <option value="Public">{$UMOD.LBL_PUBLIC}</option>
+                                                         {/if}
+                                                   {/foreach}
+                                                 </select>
+						{else}
+						<select name="foldername" class="small" tabindex="" value="{$FOLDERNAME}" style="width:100%" tabindex="3">
+                                                    <option value="Personal">{$UMOD.LBL_PERSONAL}</option>
+                                                    <option value="Public" selected>{$UMOD.LBL_PUBLIC}</option>
+        	                                </select>
+						{/if}
+					
+						</td>
+					  </tr>
+					
+					
+					<tr>
+					  <td colspan="2" valign=top class="cellText small"><table width="100%"  border="0" cellspacing="0" cellpadding="0" class="thickBorder">
+                        <tr>
+                          <td valign=top><table width="100%"  border="0" cellspacing="0" cellpadding="5" >
+                              <tr>
+                                <td colspan="3" valign="top" class="small" style="background-color:#cccccc"><strong>{$UMOD.LBL_EMAIL_TEMPLATE}</strong></td>
+                                </tr>
+                              <tr>
+                                <td width="15%" valign="top" class="cellLabel small"><font color='red'>*</font>{$UMOD.LBL_SUBJECT}</td>
+                                <td width="85%" colspan="2" class="cellText small"><span class="small cellText">
+                                  <input name="subject" type="text" value="{$SUBJECT}" class="detailedViewTextBox" tabindex="4">
+                                </span></td>
+                              </tr>
+                              <tr>
+                                <td valign="top" width=10% class="cellLabel small">{$UMOD.LBL_MESSAGE}</td>
+                                 <td valign="top" width=60% class="cellText small"><p><textarea name="body" style="width:90%;height:200px" class=small tabindex="5">{$BODY}</textarea></p>
+                                    </td>
+                                <td valign="top" width=30% class="cellText small" style="border-left:2px dotted #cccccc;"><table width="100%"  border="0" cellspacing="0" cellpadding="5" >
+                                  <tr>
+                                    <td class="small"><strong>{$UMOD.LBL_MERGE_FIELDS}<br>
+                                    </strong>{$UMOD.LBL_USE_MERGE_FIELDS_TO_EMAIL_CONTENT}</td>
+                                  </tr>
+                                  <tr>
+                                    <td class="small" nowrap><strong>{$UMOD.LBL_STEP} 1. {$UMOD.LBL_SELECT_FIELD_TYPE}</strong></td>
+                                  </tr>
+				<tr><td><select class="detailedViewTextBox" id="entityType" ONCHANGE="modifyMergeFieldSelect(this, document.getElementById('mergeFieldSelect'));" tabindex="6">
+					<OPTION VALUE="0" selected>{$APP.LBL_NONE}                            
+					<OPTION VALUE="1">{$UMOD.LBL_ACCOUNT_FIELDS}                            
+                        	        <OPTION VALUE="2">{$UMOD.LBL_CONTACT_FIELDS}
+                      			<OPTION VALUE="3" >{$UMOD.LBL_LEAD_FIELDS}
+               				<OPTION VALUE="4" >{$UMOD.LBL_USER_FIELDS}
+					</select></td></tr>
+                                  <tr>
+                                    <td class="small"><strong>{$UMOD.LBL_STEP} 2. {$UMOD.LBL_SELECT_FIELD} </strong></td>
+                                  </tr>
+					<tr><td><select class="detailedViewTextBox" id="mergeFieldSelect" onchange="document.getElementById('mergeFieldValue').value=this.options[this.selectedIndex].value;" tabindex="7"><option value="0" selected>{$APP.LBL_NONE}</select></td></tr>
+                                  <tr>
+                                    <td class="small"><strong>{$UMOD.LBL_STEP} 3. {$UMOD.LBL_COPY_PASTE} </strong></td>
+                                  </tr>
+					<tr><td><input type="text"  id="mergeFieldValue" name="variable" value="variable" class="detailedViewTextBoxOn" tabindex="8"/></td></tr>
+                                </table></td>
+                              </tr>
+                          </table></td>
+                          
+                        </tr>
+                      </table></td>
+					  </tr>
+					</table>
+					<br>
+					<table border=0 cellspacing=0 cellpadding=5 width=100% >
+					<tr>
+					  <td class="small" nowrap align=right><a href="#top">{$MOD.LBL_SCROLL}</a></td>
+					</tr>
+					</table>
+				</td>
+				</tr>
+				</table>
+			
+			
+			
+			</td>
+			</tr>
+			</table>
+		</td>
+	</tr>
+	</form>
+	</table>
+		
+	</div>
+
+</td>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
+   </tr>
+</tbody>
+</table>
+<script>
+
+function check4null(form)
+{ldelim}
+
+        var isError = false;
+        var errorMessage = "";
+        // Here we decide whether to submit the form.
+        if (trim(form.templatename.value) =='') {ldelim}
+                isError = true;
+                errorMessage += "\n template name";
+                form.templatename.focus();
+        {rdelim}
+        if (trim(form.foldername.value) =='') {ldelim}
+                isError = true;
+                errorMessage += "\n folder name";
+                form.foldername.focus();
+        {rdelim}
+        if (trim(form.subject.value) =='') {ldelim}
+                isError = true;
+                errorMessage += "\n subject";
+                form.subject.focus();
+        {rdelim}
+
+        // Here we decide whether to submit the form.
+        if (isError == true) {ldelim}
+                alert("Missing required fields: " + errorMessage);
+                return false;
+        {rdelim}
+ return true;
+
+{rdelim}
+
+init();
+
+</script>

Modified: vtigercrm/trunk/Smarty/templates/DetailViewEmailTemplate.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DetailViewEmailTemplate.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DetailViewEmailTemplate.tpl Tue Jun 20 00:59:19 2006
@@ -1,99 +1,117 @@
-{*<!--
-/*********************************************************************************
-  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
-   * ("License"); You may not use this file except in compliance with the License
-   * The Original Code is:  vtiger CRM Open Source
-   * The Initial Developer of the Original Code is vtiger.
-   * Portions created by vtiger are Copyright (C) vtiger.
-   * All Rights Reserved.
-  *
- ********************************************************************************/
--->*}
-<script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
-<style type="text/css">@import url(themes/blue/style.css);</style>
-
-<table width="100%" border="0" cellpadding="0" cellspacing="0" class="small">
-<tr>
-	{include file='SettingsMenu.tpl'}
-<td width="75%" valign="top">
-<!-- EMAIL TEMPLATE PAGE STARTS HERE -->
-<table width="100%" border="0" cellpadding="0" cellspacing="0" height="100%" class="small">
-	<tr>
-	   <td class="showPanelBg" valign="top" width="90%"  style="padding-left:20px; "><br />
-              <span class="lvtHeaderText"><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a>
-		<a href="index.php?module=Users&action=listemailtemplates&parenttab=Settings">&gt; {$UMOD.LBL_EMAIL_TEMPLATE_INFORMATION} &quot;{$TEMPLATENAME}&quot;</a></b></span>
-	        <hr noshade="noshade" size="1" />
-	   </td>
-		<td width="10%" class="showPanelBg">&nbsp;</td>
-	</tr>
-	 <tr>
-	     <td width="90%" style="padding-left:20px;" valign="top">
-		<table width="100%"  border="0" cellspacing="0" cellpadding="0">
-		    <form method="post" action="index.php" name="etemplatedetailview">  
-			<input type="hidden" name="action" >
-			<input type="hidden" name="module" value="Users">
-			<input type="hidden" name="templatename" value="{$TEMPLATENAME}">
-			<input type="hidden" name="templateid" value="{$TEMPLATEID}">
-			<input type="hidden" name="foldername" value="{$FOLDERNAME}">
-		    
-			<tr><td colspan="2">&nbsp;</td></tr>
-			<tr><td colspan="2">
-			    <table width="100%" border="0" cellpadding="0" cellspacing="0" class="small">
-				<tr><td width="75%" valign="middle" >
-					<img src="{$IMAGE_PATH}ViewTemplate.gif" align="left" />
-					<span class="genHeaderBig">{$TEMPLATENAME}</span><br />
-					<span class="dashMnuUnSel">{$TEMPLATENAME} {$UMOD.LBL_TEMPLATE_HEADER} </span> 
-				    </td>
-				    <td width="25%" align="right" valign="bottom"><input type="submit" name="Button" value="{$UMOD.LBL_EDIT_TEMPLATE}" class="small" onclick="this.form.action.value='editemailtemplate'"/></td>
-				</tr>
-			    </table>
-			    </td>
-			</tr>
-			  <tr>
-				<td>&nbsp;</td>
-				<td>&nbsp;</td>
-			  </tr>
-			  
-			  <tr>
-			    <td colspan="2" style="border:2px solid #CCCCCC;">
-				<table width="100%" border="0" cellpadding="5" cellspacing="0" class="small">
-			          <tr>
-			
-    	                		<td width="25%" align="right" bgcolor="#F6F6F6"><b>{$UMOD.LBL_FOLDER}</b></td>
-        	            		<td width="75%" class="mnuTab">{$FOLDERNAME}</td>
-            	      		  </tr>
-					  <tr><td bgcolor="#F6F6F6">&nbsp;</td>
-					  <td>&nbsp;</td></tr>
-	
-	                  	  <tr>
-			
-    	        		        <td width="25%" align="right" bgcolor="#F6F6F6"><b>{$UMOD.LBL_SUBJECT}</b></td>
-        	            		<td width="75%" class="mnuTab">{$SUBJECT}</td>
-            	      		  </tr>
-					  <tr><td bgcolor="#F6F6F6">&nbsp;</td>
-					  <td>&nbsp;</td></tr>
-
-	                  	  <tr>
-	                    		<td  align="right" bgcolor="#F6F6F6" valign="top"><b>{$UMOD.LBL_MESSAGE}</b></td>
-	                    		<td width="75%" valign="top" class="mnuTab">{$BODY}</td>
-                      		  </tr>
-                		</table>
-			   </td>
-		         </tr>
-		</table>
-		</td>
-		<td>&nbsp;</td>
-
-</form>	</tr>
-</table>
-<!-- END -->
-
-
-</td>
-</tr>
-</table>
-
-{$JAVASCRIPT}
-{include file='SettingsSubMenu.tpl'}
-
-
+{*<!--
+/*********************************************************************************
+  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
+   * ("License"); You may not use this file except in compliance with the License
+   * The Original Code is:  vtiger CRM Open Source
+   * The Initial Developer of the Original Code is vtiger.
+   * Portions created by vtiger are Copyright (C) vtiger.
+   * All Rights Reserved.
+  *
+ ********************************************************************************/
+-->*}
+<script language="JAVASCRIPT" type="text/javascript" src="include/js/smoothscroll.js"></script>
+<br>
+<table align="center" border="0" cellpadding="0" cellspacing="0" width="98%">
+<tbody><tr>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
+        <td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
+<br>
+	<div align=center>
+	
+			{include file='SetMenu.tpl'}
+
+				<!-- DISPLAY -->
+				<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
+		    		<form method="post" action="index.php" name="etemplatedetailview">  
+				<input type="hidden" name="action" value="editemailtemplate">
+				<input type="hidden" name="module" value="Users">
+				<input type="hidden" name="templatename" value="{$TEMPLATENAME}">
+				<input type="hidden" name="templateid" value="{$TEMPLATEID}">
+				<input type="hidden" name="foldername" value="{$FOLDERNAME}">
+				<input type="hidden" name="parenttab" value="{$PARENTTAB}">
+				<tr>
+					<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}ViewTemplate.gif" width="45" height="60" border=0 ></td>
+					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Users&action=listemailtemplates&parenttab=Settings">{$UMOD.LBL_EMAIL_TEMPLATES}</a> &gt; {$MOD.LBL_VIEWING} &quot;{$TEMPLATENAME}&quot; </b></td>
+				</tr>
+				<tr>
+					<td valign=top class="small">{$UMOD.LBL_EMAIL_TEMPLATE_DESC}</td>
+				</tr>
+				</table>
+				
+				<br>
+				<table border=0 cellspacing=0 cellpadding=10 width=100% >
+				<tr>
+				<td>
+				
+					<table border=0 cellspacing=0 cellpadding=5 width=100% class="tableHeading">
+					<tr>
+						<td class="big"><strong>{$UMOD.LBL_PROPERTIES} &quot;{$TEMPLATENAME}&quot; </strong></td>
+						<td class="small" align=right>						  &nbsp;&nbsp;
+						  <input class="crmButton edit small" type="submit" name="Button" value="{$APP.LBL_EDIT_BUTTON_LABEL}" class="small" onclick="this.form.action.value='editemailtemplate'; this.form.parenttab.value='Settings'">&nbsp;&nbsp;
+						</td>
+					</tr>
+					</table>
+					
+					<table border=0 cellspacing=0 cellpadding=5 width=100% >
+					<tr>
+						<td width=20% class="small cellLabel"><strong>{$UMOD.LBL_NAME}</strong></td>
+						<td width=80% class="small cellText"><strong>{$TEMPLATENAME}</strong></td>
+					  </tr>
+					<tr>
+						<td valign=top class="small cellLabel"><strong>{$UMOD.LBL_DESCRIPTION}</strong></td>
+						<td class="cellText small" valign=top>{$DESCRIPTION}</td>
+					  </tr>
+					<tr>
+						<td valign=top class="small cellLabel"><strong>{$UMOD.LBL_FOLDER}</strong></td>
+						<td class="cellText small" valign=top>{$FOLDERNAME}</td>
+					  </tr>
+					
+					
+					<tr>
+					  <td colspan="2" valign=top class="cellText small"><table width="100%"  border="0" cellspacing="0" cellpadding="0" class="thickBorder">
+                        <tr>
+                          <td valign=top><table width="100%"  border="0" cellspacing="0" cellpadding="5" >
+                              <tr>
+                                <td colspan="2" valign="top" class="small" style="background-color:#cccccc"><strong>{$UMOD.LBL_EMAIL_TEMPLATE}</strong></td>
+                                </tr>
+                              <tr>
+                                <td width="15%" valign="top" class="cellLabel small">{$UMOD.LBL_SUBJECT}</td>
+                                <td width="85%" class="cellText small">{$SUBJECT}</td>
+                              </tr>
+                              <tr>
+                                <td valign="top" class="cellLabel small">{$UMOD.LBL_MESSAGE}</td>
+                                <td class="cellText small">{$BODY}</td>
+                              </tr>
+                          </table></td>
+                          
+                        </tr>
+                      </table></td>
+					  </tr>
+					</table>
+					<br>
+					<table border=0 cellspacing=0 cellpadding=5 width=100% >
+					<tr>
+					  <td class="small" nowrap align=right><a href="#top">{$MOD.LBL_SCROLL}</a></td>
+					</tr>
+					</table>
+				</td>
+				</tr>
+				</table>
+			
+			
+			
+			</td>
+			</tr>
+			</table>
+		</td>
+	</tr>
+	</form>
+	</table>
+		
+	</div>
+
+</td>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
+   </tr>
+</tbody>
+</table>

Modified: vtigercrm/trunk/Smarty/templates/ListEmailTemplates.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ListEmailTemplates.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ListEmailTemplates.tpl Tue Jun 20 00:59:19 2006
@@ -1,155 +1,155 @@
-{*<!--
-/*********************************************************************************
-  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
-   * ("License"); You may not use this file except in compliance with the License
-   * The Original Code is:  vtiger CRM Open Source
-   * The Initial Developer of the Original Code is vtiger.
-   * Portions created by vtiger are Copyright (C) vtiger.
-   * All Rights Reserved.
-  *
- ********************************************************************************/
--->*}
-<script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
-<script language="JavaScript" type="text/javascript" src="modules/{$MODULE}/{$SINGLE_MOD}.js"></script>
-<style type="text/css">@import url(themes/blue/style.css);</style>
-
-<script>
-function massDelete()
-{ldelim}
-        x = document.massdelete.selected_id.length;
-        idstring = "";
-
-        if ( x == undefined)
-        {ldelim}
-
-                if (document.massdelete.selected_id.checked)
-               {ldelim}
-                        document.massdelete.idlist.value=document.massdelete.selected_id.value;
-                {rdelim}
-                else
-                {ldelim}
-                        alert("Please select atleast one entity");
-                        return false;
-                {rdelim}
-        {rdelim}
-        else
-        {ldelim}
-                xx = 0;
-                for(i = 0; i < x ; i++)
-                {ldelim}
-                        if(document.massdelete.selected_id[i].checked)
-                        {ldelim}
-                                idstring = document.massdelete.selected_id[i].value +";"+idstring
-                        xx++
-                        {rdelim}
-                {rdelim}
-                if (xx != 0)
-                {ldelim}
-                        document.massdelete.idlist.value=idstring;
-                {rdelim}
-               else
-                {ldelim}
-                        alert("Please select atleast one entity");
-                        return false;
-                {rdelim}
-       {rdelim}
-		if(confirm("Are you sure you want to delete the selected "+xx+" records ?"))
-		{ldelim}
-	        document.massdelete.action="index.php?module=Users&action=deleteemailtemplate&return_module=Users&return_action=listemailtemplates";
-		{rdelim}
-		else
-		{ldelim}
-			return false;
-		{rdelim}
-
-{rdelim}
-</script>
-
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-<tr>
-	{include file='SettingsMenu.tpl'}
-<td width="75%" valign="top">
-<!-- EMAIL TEMPLATE PAGE STARTS HERE -->
-<table width="100%" border="0" cellpadding="0" cellspacing="0" height="100%">
-	<tr>
-		 <td class="showPanelBg" valign="top" width="90%"  style="padding-left:20px; "><br />
-        	        <span class="lvtHeaderText"><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a>
-			 <a href="index.php?module=Users&action=listemailtemplates&parenttab=Settings">&gt; {$UMOD.LBL_EMAIL_TEMPLATES_LIST}</a></b></span>
-            	    <hr noshade="noshade" size="1" />
-		</td>
-
-		<td width="10%" class="showPanelBg">&nbsp;</td>
-	</tr>
-	<tr>
-		<td width="90%" style="padding-left:20px;" valign="top">
-			<table width="100%" cellpadding="3" cellspacing="0" border="0" class="small" >
-			<form  name="massdelete" method="POST">
-    			<input name="idlist" type="hidden">
-    			<input name="module" type="hidden" value="Users">
-    			<input name="action" type="hidden" value="deleteemailtemplate">
-				<tr><td colspan="4" style="border:0px;">&nbsp;</td></tr>
-				<tr>
-					<td colspan="2" align="left" style="border:0px;"><input type="submit" value="{$UMOD.LBL_DELETE}" onclick="return massDelete();" class="classBtn" /></td>
-					<td style="border:0px;">&nbsp;</td>
-
-					<td align="right" style="border:0px;">
-						<div align="right"><input type="submit" value="{$UMOD.LBL_NEW_TEMPLATE}" name="profile"  class="classBtn" onclick="this.form.action.value='createemailtemplate';this.form.parenttab.value='Settings';"/></div>
-					</td>
-				</tr>
-				<tr>{*<td colspan="4" style="border:0px;">&nbsp;</td>*}</tr>
-				<tr><td colspan="4">
-					<table style="background-color: rgb(204, 204, 204);" class="small" border="0" cellpadding="5" cellspacing="1" width="100%">
-						<tr>
-				  <th width="5%" class="lvtCol" ><input type="checkbox" name="selectall" onClick=toggleSelect(this.checked,"selected_id") ></th>
-				  <th width="20%" class="lvtCol"><b>{$UMOD.LBL_TEMPLATE_HEADER}</b></th>
-
-				  <th width="50%" class="lvtCol"><b>{$UMOD.LBL_DESCRIPTION}</b></th>
-				  <th width="25%" class="lvtCol"><b>{$UMOD.LBL_TEMPLATE_TOOLS}</b></th>
-			  </tr>
-				{foreach item=template from=$TEMPLATES}
-				<tr class="lvtColData" onmouseover="this.className='lvtColDataHover'" onmouseout="this.className='lvtColData'" bgcolor="white">
-				<td><input type="checkbox" name="selected_id" value="{$template.templateid}" onClick=toggleSelectAll(this.name,"selectall") /></td>
-				<td nowrap>
-				{if $template.foldername == "Public"}
-					<img src="{$IMAGE_PATH}public.gif" align="absmiddle" />
-				{else}
-					<img src="{$IMAGE_PATH}private.gif" align="absmiddle" />
-				{/if}				
-				&nbsp;<a href="index.php?module=Users&action=detailviewemailtemplate&parenttab=Settings&templateid={$template.templateid}" >{$template.templatename}</a></td>
-				<td>{$template.description}</td>
-				<td><a href="index.php?module=Users&action=detailviewemailtemplate&parenttab=Settings&templateid={$template.templateid}">{$UMOD.LNK_SAMPLE_EMAIL}</a></td>
-			  	</tr>
-				
-				{/foreach}
-				<tr>
-					</table>
-				</td></tr>
-				<tr>
-				  <td colspan="3" style="border:0px">
-
-				  	<img src="{$IMAGE_PATH}private.gif" align="absmiddle" />&nbsp;{$UMOD.LBL_TEMPLATE_PRIVATE}
-					&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-					<img src="{$IMAGE_PATH}public.gif" align="absmiddle"/>&nbsp;{$UMOD.LBL_TEMPLATE_PUBLIC}
-					
-				  </td>
-				  <td style="border:0px">
-				  	<div align="right"><a href="#">{$UMOD.LNK_GO_TO_TOP}</a></div>
-				  </td>
-			  	</tr>
-			</form>	
-			</table>
-			
-		</td>
-		<td>&nbsp;</td>
-	</tr>
-</table>
-<!-- END -->
-
-</td>
-</tr>
-</table>
-
-{$JAVASCRIPT}
-{include file='SettingsSubMenu.tpl'}
-
-
+{*<!--
+/*********************************************************************************
+  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
+   * ("License"); You may not use this file except in compliance with the License
+   * The Original Code is:  vtiger CRM Open Source
+   * The Initial Developer of the Original Code is vtiger.
+   * Portions created by vtiger are Copyright (C) vtiger.
+   * All Rights Reserved.
+  *
+ ********************************************************************************/
+-->*}
+<script language="JAVASCRIPT" type="text/javascript" src="include/js/smoothscroll.js"></script>
+<script>
+function massDelete()
+{ldelim}
+        x = document.massdelete.selected_id.length;
+        idstring = "";
+
+        if ( x == undefined)
+        {ldelim}
+
+                if (document.massdelete.selected_id.checked)
+               {ldelim}
+                        document.massdelete.idlist.value=document.massdelete.selected_id.value+';';
+			xx=1;
+                {rdelim}
+                else
+                {ldelim}
+                        alert("Please select atleast one entity");
+                        return false;
+                {rdelim}
+        {rdelim}
+        else
+        {ldelim}
+                xx = 0;
+                for(i = 0; i < x ; i++)
+                {ldelim}
+                        if(document.massdelete.selected_id[i].checked)
+                        {ldelim}
+                                idstring = document.massdelete.selected_id[i].value +";"+idstring
+                        xx++
+                        {rdelim}
+                {rdelim}
+                if (xx != 0)
+                {ldelim}
+                        document.massdelete.idlist.value=idstring;
+                {rdelim}
+               else
+                {ldelim}
+                        alert("Please select atleast one entity");
+                        return false;
+                {rdelim}
+       {rdelim}
+		if(confirm("Are you sure you want to delete the selected "+xx+" records ?"))
+		{ldelim}
+	        document.massdelete.action="index.php?module=Users&action=deleteemailtemplate&return_module=Users&return_action=listemailtemplates";
+		{rdelim}
+		else
+		{ldelim}
+			return false;
+		{rdelim}
+
+{rdelim}
+</script>
+<br>
+<table align="center" border="0" cellpadding="0" cellspacing="0" width="98%">
+<tbody><tr>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
+        <td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
+<br>
+	<div align=center>
+	
+			{include file='SetMenu.tpl'}
+
+				<!-- DISPLAY -->
+				<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
+				<form  name="massdelete" method="POST">
+	    			<input name="idlist" type="hidden">
+    				<input name="module" type="hidden" value="Users">
+    				<input name="action" type="hidden" value="deleteemailtemplate">
+				<tr>
+					<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}ViewTemplate.gif" width="45" height="60" border=0></td>
+					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > {$UMOD.LBL_EMAIL_TEMPLATES} </b></td>
+				</tr>
+				<tr>
+					<td valign=top class="small">{$UMOD.LBL_EMAIL_TEMPLATE_DESC}</td>
+				</tr>
+				</table>
+				
+				<br>
+				<table border=0 cellspacing=0 cellpadding=10 width=100% >
+				<tr>
+				<td>
+				
+					<table border=0 cellspacing=0 cellpadding=5 width=100% class="tableHeading">
+					<tr>
+						<td class="big"><strong>{$UMOD.LBL_EMAIL_TEMPLATES}</strong></td>
+						<td class="small" align=right>&nbsp;
+						</td>
+					</tr>
+					</table>
+					
+					<table border=0 cellspacing=0 cellpadding=5 width=100% class="listTableTopButtons">
+					<tr>
+						<td class=small><input type="submit" value="{$UMOD.LBL_DELETE}" onclick="return massDelete();" class="crmButton delete small"></td>
+						<td class=small align=right><input class="crmButton create small" type="submit" value="{$UMOD.LBL_NEW_TEMPLATE}" name="profile"  class="classBtn" onclick="this.form.action.value='createemailtemplate';this.form.parenttab.value='Settings';"></td>
+					</tr>
+					</table>
+					<table border="0" cellspacing="0" cellpadding="5" width="100%" class="listTable">
+					<tr>
+						<td width="2%" class="colHeader small">#</td>
+						<td width="3%" class="colHeader small">{$UMOD.LBL_LIST_SELECT}</td>
+						<td width="25%" class="colHeader small">{$UMOD.LBL_EMAIL_TEMPLATE}</td>
+						<td width="50%" class="colHeader small">{$UMOD.LBL_DESCRIPTION}</td>
+					        <td width="20%" class="colHeader small">{$UMOD.LBL_TEMPLATE_TOOLS}</td>
+					</tr>
+					{foreach name=emailtemplate item=template from=$TEMPLATES}
+					<tr>
+						<td class="listTableRow small" valign=top>{$smarty.foreach.emailtemplate.iteration}</td>
+						<td class="listTableRow small" valign=top><input type="checkbox" name="selected_id" value="{$template.templateid}" onClick=toggleSelectAll(this.name,"selectall") class=small></td>
+						<td class="listTableRow small" valign=top>
+							<a href="index.php?module=Users&action=detailviewemailtemplate&parenttab=Settings&templateid={$template.templateid}" ><b>{$template.templatename}</b></a>
+						</td>
+						<td class="listTableRow small" valign=top>{$template.description}</td>
+					        <td class="listTableRow small" valign=top>
+							<a href="index.php?module=Users&action=detailviewemailtemplate&parenttab=Settings&templateid={$template.templateid}">{$UMOD.LNK_SAMPLE_EMAIL}</a>
+						</td>
+					</tr>
+					{/foreach}	
+					</table>
+					<table border=0 cellspacing=0 cellpadding=5 width=100% >
+					<tr>
+					  <td class="small" nowrap align=right><a href="#top">{$MOD.LBL_SCROLL}</a></td>
+					</tr>
+					</table>
+				</td>
+				</tr>
+				</table>
+			
+			
+			
+			</td>
+			</tr>
+			</table>
+		</td>
+	</tr>
+	</form>
+	</table>
+		
+	</div>
+</td>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
+   </tr>
+</tbody>
+</table>




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 20 03:00:19 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 20 Jun 2006 07:00:19 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7288 - in
 /vtigercrm/trunk/Smarty/templates: CreateWordTemplate.tpl
 ListWordTemplates.tpl
Message-ID: <20060620070019.6E8112B0167@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 20 01:00:14 2006
New Revision: 7288

Log:
updated tpl file for mail merge templates - ahmed

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

Modified: vtigercrm/trunk/Smarty/templates/CreateWordTemplate.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/CreateWordTemplate.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/CreateWordTemplate.tpl Tue Jun 20 01:00:14 2006
@@ -1,118 +1,100 @@
-{*<!--
-/*********************************************************************************
-  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
-   * ("License"); You may not use this file except in compliance with the License
-   * The Original Code is:  vtiger CRM Open Source
-   * The Initial Developer of the Original Code is vtiger.
-   * Portions created by vtiger are Copyright (C) vtiger.
-   * All Rights Reserved.
-  *
- ********************************************************************************/
--->*}
-<script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
-<style type="text/css">@import url(themes/blue/style.css);</style>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-<tr>
-	{include file='SettingsMenu.tpl'}
-<td width="75%" valign="top">
-
-<!--  CREATE WORD TEMPLATES PAGE STARTS HERE -->
-<table width="100%" border="0" cellpadding="0" cellspacing="0" height="100%">
-<form action="index.php?module=Users&action=add2db" method="post" enctype="multipart/form-data">
-<input type="hidden" name="return_module" value="Settings">
-<input type="hidden" name="MAX_FILE_SIZE" value="100000">
-<input type="hidden" name="action">
-<tr>
-<td class="showPanelBg" valign="top" width="95%"  style="padding-left:20px; "><br />
-<span class="lvtHeaderText"><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS} </a> <a href="index.php?module=Users&action=listwordtemplates&parenttab=Settings">{$UMOD.LBL_MAILMERGE_TEMPLATES_ATTACHMENT}</a></b></span>
-<hr noshade="noshade" size="1" />
-</td>
-	<td width="5%" class="showPanelBg">&nbsp;</td>
-</tr>
-<tr>
-<td width="98%" style="padding-left:20px;" valign="top">
-<!-- module Select Table -->
-<table width="95%"  border="0" cellspacing="0" cellpadding="0" align="center">
-<tr>
-	<td width="7" height="6" style="font-size:1px;font-family:Arial, Helvetica, sans-serif;"><img src="{$IMAGE_PATH}top_left.jpg" align="top"  /></td>
-	<td bgcolor="#EBEBEB" style="font-size:1px;font-family:Arial, Helvetica, sans-serif;height:6px;"></td>
-	<td width="8" height="6" style="font-size:1px;font-family:Arial, Helvetica, sans-serif;"><img src="{$IMAGE_PATH}top_right.jpg" width="8" height="6" align="top" /></td>
-</tr>
-<tr>
-	<td bgcolor="#EBEBEB" width="7"></td>
-	<td bgcolor="#ECECEC" style="padding-left:10px;padding-top:10px;vertical-align:top;">
-		<table width="100%"  border="0" cellspacing="0" cellpadding="10" class="small">
-                <tr>
-                     <td rowspan="11" bgcolor="#ffffff" width="30%" valign="bottom" background="{$IMAGE_PATH}MailMerge_top.gif" style="background-position:top right;background-repeat:no-repeat;">
-		<table width="100%" border="0" cellpadding="0" cellspacing="0">
-				<tr>
-						<td background="{$IMAGE_PATH}MailMerge_btm.gif" style="background-position:bottom right;background-repeat:no-repeat; " height="150">&nbsp;</td>
-				</tr>
-		</table>
-	</td>
-                      <td colspan="2" class="genHeaderSmall" width="70%"><img src="{$IMAGE_PATH}fp1.gif" width="59" height="40" align="absmiddle" />{$UMOD.LBL_TEMPLATE_DETAILS} </td>
-               </tr>
-		<tr>
-                      <td align="right" valign="top"><b>{$UMOD.LBL_DESCRIPTION}  : </b></td>
-                      <td><textarea name="txtDescription" tabindex="1" class="txtBox" rows="3" value={$textDesc} /></textarea></td>
-                </tr>
-                <tr><td colspan="2"  width="75%" style="padding-bottom:0px;" ><hr /> </td></tr>
-
-		<tr>
-			<td  width="75%" colspan="2"  >
-				<img src="{$IMAGE_PATH}fp2.gif" width="59" height="40"  align="left"/>
-				<span class="genHeaderSmall">{$UMOD.LBL_SELECT_MODULE}</span><br />
-				 {$UMOD.LBL_MERGE_MSG}
-			</td>
-		</tr>
-		<tr>
-                      <td align="right"><b>{$UMOD.LBL_MODULENAMES} : </b></td>
-
-                      <td><select name="target_module" class="txtBox" tabindex="2">
-			<option value="Leads">{$APP.COMBO_LEADS}</option>	
-			<option value="Accounts">{$APP.COMBO_ACCOUNTS}</option>	
-			<option value="Contacts">{$APP.COMBO_CONTACTS}</option>	
-			<option value="HelpDesk">{$APP.COMBO_HELPDESK}</option>	
-                      </select></td>
-                </tr>
-		 <tr><td colspan="2"  width="75%" style="padding-bottom:0px;" ><hr /> </td></tr>
-		<tr>
-		      <td  width="75%" colspan="2" style="padding-bottom:0px;padding-top:0px; "  >
-			<img src="{$IMAGE_PATH}fp3.gif" width="59" height="40"  align="absmiddle"/>
-				<span class="genHeaderSmall">{$UMOD.LBL_UPLOAD} </span>
-		      </td>
-		</tr>
-		 <tr>
-                      <td align="right" valign="top"><font color="red">{$APP.LBL_REQUIRED_SYMBOL}</font><b>{$UMOD.LBL_MERGE_FILE}</b></td>
-                      <td><input type="file" name="binFile" size="40" tabindex="3" /><br />(Upload only <b>'.doc'</b> files)</td>
-		 </tr>
-		 <tr>
-		      <td colspan="2"  width="75%" style="border-top:1px dashed #CCCCCC;border-bottom:1px dashed #CCCCCC;"  align="center">
-			<input title="{$APP.LBL_SAVE_BUTTON_LABEL}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" type="submit" tabindex="4" name="button" value="{$APP.LBL_SAVE_BUTTON_LABEL}" onclick="this.form.action.value='add2db';" class="classBtn" />&nbsp;
-			&nbsp;<input title="{$APP.LBL_CANCEL_BUTTON_LABEL}" accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" tabindex="5"  onclick="window.history.back()" type="button" name="button" value="{$APP.LBL_CANCEL_BUTTON_LABEL}" class="classBtn" />
- 		      </td>
-		 </tr>
-		 <tr>
-		       <td colspan="2" style="padding-bottom:0px;" >&nbsp;</td>
-		 </tr>
-                 </table>
-		   </td>
-			<td bgcolor="#EBEBEB" width="8"></td>
-		  </tr>
-		  <tr>
-				<td width="7" height="8" style="font-size:1px;font-family:Arial, Helvetica, sans-serif;"><img src="{$IMAGE_PATH}bottom_left.jpg" align="bottom"  /></td>
-				<td bgcolor="#ECECEC" height="8" style="font-size:1px;" ></td>
-				<td width="8" height="8" style="font-size:1px;font-family:Arial, Helvetica, sans-serif;"><img src="{$IMAGE_PATH}bottom_right.jpg" align="bottom" /></td>
-		  </tr>
-		  </table><br />
-		</td>
-
-		<td>&nbsp;</td>
-	</tr>
-</form>
-</table>
-</td>
-</tr>
-</table>
-	{include file='SettingsSubMenu.tpl'}
-<!-- END -->
+{*<!--
+/*********************************************************************************
+  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
+   * ("License"); You may not use this file except in compliance with the License
+   * The Original Code is:  vtiger CRM Open Source
+   * The Initial Developer of the Original Code is vtiger.
+   * Portions created by vtiger are Copyright (C) vtiger.
+   * All Rights Reserved.
+  *
+ ********************************************************************************/
+-->*}
+<script language="JAVASCRIPT" type="text/javascript" src="include/js/smoothscroll.js"></script>
+<br>
+<table align="center" border="0" cellpadding="0" cellspacing="0" width="98%">
+<tbody><tr>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
+        <td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
+<br>
+	<div align=center>
+	
+			{include file='SetMenu.tpl'}
+
+				<!-- DISPLAY -->
+				<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
+				<form action="index.php?module=Users&action=add2db" method="post" enctype="multipart/form-data">
+				<input type="hidden" name="return_module" value="Settings">
+				<input type="hidden" name="parenttab" value="{$PARENTTAB}">
+				<input type="hidden" name="MAX_FILE_SIZE" value="100000">
+				<input type="hidden" name="action">
+				<tr>
+					<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}mailmarge.gif" alt="Users" width="48" height="48" border=0 title="Users"></td>
+					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Users&action=listwordtemplates&parenttab=Settings">{$UMOD.LBL_WORD_TEMPLATES}</a> > {$UMOD.LBL_NEW_TEMPLATE} </b></td>
+				</tr>
+				<tr>
+					<td valign=top class="small">{$MOD.LBL_MAIL_MERGE_DESC}</td>
+				</tr>
+				</table>
+				
+				<br>
+				<table border=0 cellspacing=0 cellpadding=10 width=100% >
+				<tr>
+				<td>
+				
+					<table border=0 cellspacing=0 cellpadding=5 width=100% class="tableHeading">
+					<tr>
+						<td class="big"><strong>{$UMOD.LBL_NEW_TEMPLATE}</strong></td>
+						<td class="small" align=right>
+							<input title="{$APP.LBL_SAVE_BUTTON_LABEL}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" type="submit" tabindex="4" name="button" value="{$APP.LBL_SAVE_BUTTON_LABEL}" onclick="this.form.action.value='add2db'; this.form.parenttab.value='Settings'" class="crmButton small save" />&nbsp;
+							&nbsp;<input title="{$APP.LBL_CANCEL_BUTTON_LABEL}" accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" tabindex="5"  onclick="window.history.back()" type="button" name="button" value="{$APP.LBL_CANCEL_BUTTON_LABEL}" class="crmButton small cancel" />
+						</td>
+					</tr>
+					</table>
+					
+					<table border=0 cellspacing=0 cellpadding=5 width=100% >
+					<tr valign="top">
+					  <td nowrap class="cellLabel small"><font color="red">*</font><strong>{$UMOD.LBL_NEW} {$UMOD.LBL_TEMPLATE_FILE}</strong></td>
+					  <td class="cellText small"><strong>
+					    <input type="file" name="binFile" class="small">
+					  </strong></td>
+					  </tr>
+					<tr>
+						<td valign=top class="small cellLabel"><strong>{$UMOD.LBL_DESCRIPTION}</strong></td>
+						<td class="cellText small" valign=top><textarea name="txtDescription" class=small style="width:90%;height:50px" value={$textDesc}></textarea></td>
+					  </tr>
+					<tr>
+						<td valign=top class="small cellLabel"><strong>{$UMOD.LBL_MODULENAMES}</strong></td>
+						<td class="cellText small" valign=top>
+						<select name="target_module" size=1 class="small" tabindex="3">
+							<option value="Leads">{$APP.COMBO_LEADS}</option>	
+							<option value="Accounts">{$APP.COMBO_ACCOUNTS}</option>	
+							<option value="Contacts">{$APP.COMBO_CONTACTS}</option>	
+							<option value="HelpDesk">{$APP.COMBO_HELPDESK}</option>	
+			                      </select>
+						</td>
+					  </tr>
+					</table>
+					<table border=0 cellspacing=0 cellpadding=5 width=100% >
+					<tr>
+					  <td class="small" nowrap align=right><a href="#top">[Scroll to Top]</a></td>
+					</tr>
+					</table>
+				</td>
+				</tr>
+				</table>
+			
+			
+			
+			</td>
+			</tr>
+			</table>
+		</td>
+	</tr>
+	</form>
+	</table>
+</div>		
+	</td>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
+   </tr>
+</tbody>
+</table>

Modified: vtigercrm/trunk/Smarty/templates/ListWordTemplates.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ListWordTemplates.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ListWordTemplates.tpl Tue Jun 20 01:00:14 2006
@@ -1,139 +1,155 @@
-{*<!--
-/*********************************************************************************
-  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
-   * ("License"); You may not use this file except in compliance with the License
-   * The Original Code is:  vtiger CRM Open Source
-   * The Initial Developer of the Original Code is vtiger.
-   * Portions created by vtiger are Copyright (C) vtiger.
-   * All Rights Reserved.
-  *
- ********************************************************************************/
--->*}
-<script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
-<script language="JavaScript" type="text/javascript" src="modules/{$MODULE}/{$SINGLE_MOD}.js"></script>
-<style type="text/css">@import url(../themes/blue/style.css);</style>
-
-<script>
-function massDelete()
-{ldelim}
-        x = document.massdelete.selected_id.length;
-        idstring = "";
-
-        if ( x == undefined)
-        {ldelim}
-
-                if (document.massdelete.selected_id.checked)
-               {ldelim}
-                        document.massdelete.idlist.value=document.massdelete.selected_id.value;
-                {rdelim}
-                else
-                {ldelim}
-                        alert("Please select atleast one entity");
-                        return false;
-                {rdelim}
-        {rdelim}
-        else
-        {ldelim}
-                xx = 0;
-                for(i = 0; i < x ; i++)
-                {ldelim}
-                        if(document.massdelete.selected_id[i].checked)
-                        {ldelim}
-                                idstring = document.massdelete.selected_id[i].value +";"+idstring
-                        xx++
-                        {rdelim}
-                {rdelim}
-                if (xx != 0)
-                {ldelim}
-                        document.massdelete.idlist.value=idstring;
-                {rdelim}
-               else
-                {ldelim}
-                        alert("Please select atleast one entity");
-                        return false;
-                {rdelim}
-       {rdelim}
-		if(confirm("Are you sure you want to delete the selected "+xx+" records ?"))
-		{ldelim}
-	        document.massdelete.action="index.php?module=Users&action=deletewordtemplate&return_module=Users&return_action=listwordtemplates";
-		{rdelim}
-		else
-		{ldelim}
-			return false;
-		{rdelim}
-
-{rdelim}
-</script>
-
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-<tr>
-	{include file='SettingsMenu.tpl'}
-<td width="75%" valign="top">
-<!-- MAIL MERGE TEMPLATE PAGE STARTS HERE -->
-<table width="100%" border="0" cellpadding="0" cellspacing="0" height="100%">
-	<tr>
-		 <td class="showPanelBg" valign="top" width="90%"  style="padding-left:20px; "><br />
-        	        <span class="lvtHeaderText"><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a><a href="index.php?module=Users&action=listwordtemplates&parenttab=Settings">{$UMOD.LBL_MAILMERGE_TEMPLATES_LIST}</a></b> </span>
-
-            	    <hr noshade="noshade" size="1" />
-		</td>
-
-		<td width="10%" class="showPanelBg">&nbsp;</td>
-	</tr>
-	<tr>
-		<td width="90%" style="padding-left:20px;" valign="top">
-			  <form  name="massdelete" method="POST">
-    			<input name="idlist" type="hidden">
-    			<input name="module" type="hidden" value="Users">
-    			<input name="action" type="hidden" value="deletewordtemplate">
-			<table width="100%" cellpadding="3" cellspacing="0" class="small" >
-			   
-				<tr><td colspan="6" style="border:0px;">&nbsp;</td></tr>
-				<tr>
-					<td colspan="2" align="left" style="border:0px;"><input type="submit" value="{$UMOD.LBL_DELETE}" onclick="return massDelete();" class="classBtn" /></td>
-					<td style="border:0px;">&nbsp;</td>
-
-					<td align="right" colspan="3" style="border:0px;">
-						<div align="right" ><input type="submit" value="{$UMOD.LBL_NEW_TEMPLATE}" name="profile"  class="classBtn" onclick="this.form.action.value='upload';"/></div>
-					</td>
-				</tr>
-				<tr>{*<td colspan="6" style="border:0px;">&nbsp;</td>*}</tr>
-				<tr>
-				<td colspan="6">
-					<table style="background-color: rgb(204, 204, 204);" class="small" border="0" cellpadding="5" cellspacing="1" width="100%">
-						<tr>
-						  <th width="5%" class="lvtCol" ><input type="checkbox" name="selectall" onClick=toggleSelect(this.checked,"selected_id") ></th>
-						  <th width="20%" nowrap class="lvtCol"><b>{$UMOD.LBL_FILE}</b></th>
-						  <th width="50%" nowrap class="lvtCol"><b>{$UMOD.LBL_DESCRIPTION}</b></th>
-						  <th width="25%"  nowrap class="lvtCol"><b>{$UMOD.LBL_MODULENAMES}</b></th>
-						  <th width="25%"  nowrap class="lvtCol"><b>{$UMOD.LBL_DOWNLOAD}</b></th>
-						  <th width="25%"  nowrap class="lvtCol"><b>{$UMOD.LBL_FILE_TYPE}</b></th>
-					  </tr>
-						{foreach item=template from=$WORDTEMPLATES}
-						<tr class="lvtColData" onmouseover="this.className='lvtColDataHover'" onmouseout="this.className='lvtColData'" bgcolor="white">
-							<td><input type="checkbox" name="selected_id" value="{$template.templateid}" onClick=toggleSelectAll(this.name,"selectall") /></td>
-							<td nowrap>{$template.filename}</td>
-							<td nowrap>{$template.description}</td>
-							<td nowrap>{$template.module}</td>
-							<td nowrap><a href="index.php?module=Users&action=downloadfile&record={$template.templateid}">{$UMOD.LBL_DOWNLOAD_NOW}</a></td>
-							<td nowrap>{$template.filetype}</td>	
-				  	</tr>
-					{/foreach}
-				</table>
-			</td>
-		</tr>	
-	</table>
-			</form>
-		</td>
-		<td>&nbsp;</td>
-	</tr>
-</table>
-<!-- END -->
-
-</td>
-</tr>
-</table>
-
-{$JAVASCRIPT}
-{include file='SettingsSubMenu.tpl'}
-
+{*<!--
+/*********************************************************************************
+  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
+   * ("License"); You may not use this file except in compliance with the License
+   * The Original Code is:  vtiger CRM Open Source
+   * The Initial Developer of the Original Code is vtiger.
+   * Portions created by vtiger are Copyright (C) vtiger.
+   * All Rights Reserved.
+  *
+ ********************************************************************************/
+-->*}
+<script language="JAVASCRIPT" type="text/javascript" src="include/js/smoothscroll.js"></script>
+<script>
+function massDelete()
+{ldelim}
+        x = document.massdelete.selected_id.length;
+        idstring = "";
+
+        if ( x == undefined)
+        {ldelim}
+
+                if (document.massdelete.selected_id.checked)
+               {ldelim}
+                        document.massdelete.idlist.value=document.massdelete.selected_id.value+';';
+			xx=1;
+                {rdelim}
+                else
+                {ldelim}
+                        alert("Please select atleast one entity");
+                        return false;
+                {rdelim}
+        {rdelim}
+        else
+        {ldelim}
+                xx = 0;
+                for(i = 0; i < x ; i++)
+                {ldelim}
+                        if(document.massdelete.selected_id[i].checked)
+                        {ldelim}
+                                idstring = document.massdelete.selected_id[i].value +";"+idstring
+                        xx++
+                        {rdelim}
+                {rdelim}
+                if (xx != 0)
+                {ldelim}
+                        document.massdelete.idlist.value=idstring;
+                {rdelim}
+               else
+                {ldelim}
+                        alert("Please select atleast one entity");
+                        return false;
+                {rdelim}
+       {rdelim}
+		if(confirm("Are you sure you want to delete the selected "+xx+" records ?"))
+		{ldelim}
+	        document.massdelete.action="index.php?module=Users&action=deletewordtemplate&return_module=Users&return_action=listwordtemplates";
+		{rdelim}
+		else
+		{ldelim}
+			return false;
+		{rdelim}
+
+{rdelim}
+</script>
+<br>
+<table align="center" border="0" cellpadding="0" cellspacing="0" width="98%">
+<tbody><tr>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
+        <td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
+<br>
+	<div align=center>
+	
+			{include file='SetMenu.tpl'}
+
+				<!-- DISPLAY -->
+				<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
+	               		<form  name="massdelete" method="POST">
+	    			<input name="idlist" type="hidden">
+    				<input name="module" type="hidden" value="Users">
+    				<input name="parenttab" type="hidden" value="Settings">
+    				<input name="action" type="hidden" value="deletewordtemplate">
+				<tr>
+					<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}mailmarge.gif" alt="Users" width="48" height="48" border=0 title="Users"></td>
+					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > {$UMOD.LBL_WORD_TEMPLATES} </b></td>
+				</tr>
+				<tr>
+					<td valign=top class="small">{$MOD.LBL_MAIL_MERGE_DESC}</td>
+				</tr>
+				</table>
+				
+				<br>
+				<table border=0 cellspacing=0 cellpadding=10 width=100% >
+				<tr>
+				<td>
+				
+					<table border=0 cellspacing=0 cellpadding=5 width=100% class="tableHeading">
+					<tr>
+						<td class="big"><strong>{$UMOD.LBL_WORD_TEMPLATES}</strong></td>
+						<td class="small" align=right>&nbsp;
+						</td>
+					</tr>
+					</table>
+					
+					<table border=0 cellspacing=0 cellpadding=5 width=100% class="listTableTopButtons">
+					<tr>
+						<td class=small><input type="submit" value="{$UMOD.LBL_DELETE}" onclick="return massDelete();" class="crmButton delete small"></td>
+						<td class=small align=right><input class="crmButton create small" type="submit" value="{$UMOD.LBL_ADD_TEMPLATE}" name="profile"  onclick="this.form.action.value='upload'; this.form.parenttab.value='Settings'">&nbsp;&nbsp;</td>
+					</tr>
+					</table>
+						
+					<table border=0 cellspacing=0 cellpadding=5 width=100% class="listTable">
+					<tr>
+						<td width=2% class="colHeader small">#</td>
+						<td width=3% class="colHeader small">{$UMOD.LBL_LIST_SELECT}</td>
+						<td width=20% class="colHeader small">{$UMOD.LBL_TEMPLATE_FILE}</td>
+						<td width=50% class="colHeader small">{$UMOD.LBL_DESCRIPTION}</td>
+				        <td width=15% class="colHeader small">{$UMOD.LBL_MODULENAMES}</td>
+				        <td width=15% class="colHeader small">{$UMOD.LBL_LIST_TOOLS}</td>
+			          </tr>
+					{foreach item=template name=mailmerge from=$WORDTEMPLATES}
+					<tr>
+						<td class="listTableRow small" valign=top>{$smarty.foreach.mailmerge.iteration}</td>
+						<td class="listTableRow small" valign=top><input type="checkbox" class=small name="selected_id" value="{$template.templateid}" onClick=toggleSelectAll(this.name,"selectall")></td>
+						<td class="listTableRow small" valign=top><b>{$template.filename}</b></a></td>
+						<td class="listTableRow small" valign=top>{$template.description}</td>
+				        <td class="listTableRow small" valign=top>{$template.module}</td>
+				        <td class="listTableRow small" valign=top><a href="index.php?module=Users&action=downloadfile&record={$template.templateid}">{$UMOD.LBL_DOWNLOAD}</a></td>
+			          </tr>
+					{/foreach}
+					</table>
+					<table border=0 cellspacing=0 cellpadding=5 width=100% >
+					<tr>
+					  <td class="small" nowrap align=right><a href="#top">{$MOD.LBL_SCROLL}</a></td>
+					</tr>
+					</table>
+				</td>
+				</tr>
+				</table>
+			
+			
+			
+			</td>
+			</tr>
+			</table>
+		</td>
+	</tr>
+	</form>
+	</table>
+		
+	</div>
+</td>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
+   </tr>
+</tbody>
+</table>




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 20 03:02:30 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 20 Jun 2006 07:02:30 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7289 - in
 /vtigercrm/trunk/Smarty/templates: OrgSharingDetailView.tpl
 OrgSharingEditView.tpl
Message-ID: <20060620070231.2A8245E4DC7@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 20 01:02:26 2006
New Revision: 7289

Log:
Updated the org sharing file - ahmed

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

Modified: vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl Tue Jun 20 01:02:26 2006
@@ -1,271 +1,232 @@
-{*<!--
-/*********************************************************************************
-  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
-   * ("License"); You may not use this file except in compliance with the License
-   * The Original Code is:  vtiger CRM Open Source
-   * The Initial Developer of the Original Code is vtiger.
-   * Portions created by vtiger are Copyright (C) vtiger.
-   * All Rights Reserved.
-  *
- ********************************************************************************/
--->*}
-<script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
-<style type="text/css">@import url(themes/blue/style.css);</style>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-<tr>
-	{include file='SettingsMenu.tpl'}
-<td width="75%" valign="top">
-
-<table width="100%" border="0" cellpadding="0" cellspacing="0" height="100%">
-<tr>
-<td class="showPanelBg" valign="top" width="100%" colspan="3" style="padding-left:20px; "><br/>
-<span class="lvtHeaderText"><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS} </a> > {$MOD.LBL_USER_MANAGEMENT} > {$CMOD.LBL_ORG_SHARING_PRIVILEGES}</b></span>
-<hr noshade="noshade" size="1" />
-</td>
-</tr>
-<tr>
-<td width="75%" style="padding-left:20px;" valign="top">
-	
-			<!-- module Select Table -->
-			<table border="0" cellpadding="0" cellspacing="0" width="100%">
-			  <tbody><tr>
-				<td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif;" height="6" width="7"><img src="{$IMAGE_PATH}top_left.jpg" align="top"></td>
-				<td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif; height: 6px;" bgcolor="#ebebeb"></td>
-				<td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif;" height="6" width="8"><img src="{$IMAGE_PATH}top_right.jpg" align="top" height="6" width="8"></td>
-			  </tr>
-
-			  <tr>
-				<td bgcolor="#ebebeb" width="7"></td>
-				<td style="padding-left: 10px; height: 20px; vertical-align: middle;" bgcolor="#ececec">
-						{$CMOD.LBL_VIEW} :&nbsp;<a href="javascript:show('customdiv');show('globaldiv');">{$CMOD.LBL_BOTH}</a>&nbsp;|&nbsp;<a href="javascript:hide('customdiv');show('globaldiv');" >{$CMOD.LBL_GLOBAL_ACCESS_PRIVILEGES}</a>&nbsp;|&nbsp;
-						<a href="javascript:show('customdiv');hide('globaldiv');">{$CMOD.LBL_CUSTOM_ACCESS_PRIVILEGES}</a>
-				</td>
-
-				<td bgcolor="#ebebeb" width="8"></td>
-			  </tr>
-			  <tr>
-				<td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif;" height="8" width="7"><img src="{$IMAGE_PATH}bottom_left.jpg" align="bottom"></td>
-				<td style="font-size: 1px;" bgcolor="#ececec" height="8"></td>
-				<td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif;" height="8" width="8"><img src="{$IMAGE_PATH}bottom_right.jpg" align="bottom"></td>
-			  </tr>
-		  </tbody></table><br>
-		  <!-- end of module select -->
-
-		  <!-- GLOBAL ACCESS MODULE -->
-		  	<div id="globaldiv">
-		  	  <table border="0" cellpadding="0" cellspacing="0" width="100%">
-			  <tbody><tr>
-				<td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif;" height="6" width="7"><img src="{$IMAGE_PATH}top_left.jpg" align="top"></td>
-				<td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif; height: 6px;" bgcolor="#ebebeb"></td>
-				<td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif;" height="6" width="8"><img src="{$IMAGE_PATH}top_right.jpg" align="top" height="6" width="8"></td>
-			  </tr>
-			  <tr>
-				<td bgcolor="#ebebeb" width="7"></td>
-
-				<td bgcolor="#ebebeb">	
-						<table border="0" cellpadding="3" cellspacing="0" width="100%">
-							<tbody>
-							<form action="index.php" method="post" name="new" id="form">
-							<input type="hidden" name="module" value="Users">
-							<input type="hidden" name="action" value="OrgSharingEditView">
-							<input type="hidden" name="parenttab" value="Settings">
-							<tr>
-								<td class="genHeaderSmall" height="25" valign="middle">{$CMOD.LBL_GLOBAL_ACCESS_PRIVILEGES}</td>
-								<td align="right"><input class=small title="{$CMOD.LBL_RECALCULATE_BUTTON}"  type="submit" name="recalculate" value="{$CMOD.LBL_RECALCULATE_BUTTON}" onclick="this.form.action.value='RecalculateSharingRules'; return confirm('Recalculate Sharing Rules will calculate the sharing rules for the whole organization. This Operation will take some time. Do you want to contunue? ')">	
-	&nbsp;<input class=small type="submit" name="Edit" value={$CMOD.LBL_EDIT_PERMISSIONS}></td>
-								
-							</tr>
-							<tr><td colspan="2"></td></tr>
-							 <tr>
-						  		<td colspan="2" style="padding: 0px 0px 0px 1px;" bgcolor="#ffffff">
-
-									<table class="globTab" cellpadding="0" cellspacing="0">
-									<tbody>
-									{foreach item=module from=$DEFAULT_SHARING}	
-										<tr class="prvPrfHoverOff" onmouseover="this.className='prvPrfHoverOn'" onmouseout="this.className='prvPrfHoverOff'">
-									    <th width="20%">{$APP[$module.0]}</th>
-									    <td width="30%">
-										{if $module.1 neq 'Private' && $module.1 neq 'Hide Details'}
-											<img src="{$IMAGE_PATH}public.gif" align="absmiddle">
-										{else}
-											<img src="{$IMAGE_PATH}private.gif" align="absmiddle">
-										{/if}
-										{$CMOD[$module.1]}</td>
-									    <td width="50%">{$module.2}</td>
-								      	</tr>
-								 	{/foreach} 
-								  	</tbody>
-									</table>
-								</td>
-						  </tr>
-						</form>
-						</tbody>
-						</table>
-						 <!-- End of Module Display -->
-			         </td>
-				<td bgcolor="#ebebeb" width="8"></td>
-			  </tr>
-
-			  <tr>
-				<td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif;" height="8" width="7"><img src="{$IMAGE_PATH}bottom_left.jpg" align="bottom"></td>
-				<td style="font-size: 1px;" bgcolor="#ebebeb" height="8"></td>
-				<td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif;" height="8" width="8"><img src="{$IMAGE_PATH}bottom_right.jpg" align="bottom"></td>
-			  </tr>
-		  </tbody></table><br>
-		</div>
-
-		  <!-- END OF GLOBAL -->
-		  
-		  
-		  <!-- Custom Access Module Display Table -->
-		  <div id="customdiv">
-		  <table border="0" cellpadding="0" cellspacing="0" width="100%">
-		  <tbody>
-		  <tr>
-		  	<td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif;" height="6" width="7"><img src="{$IMAGE_PATH}top_left.jpg" align="top"></td>
-			<td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif; height: 6px;" bgcolor="#ebebeb"></td>
-			<td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif;" height="6" width="8"><img src="{$IMAGE_PATH}top_right.jpg" align="top" height="6" width="8"></td>
-		 </tr>
-		 <tr>
-			<td bgcolor="#ebebeb" width="7"></td>
-			<td bgcolor="#ebebeb">	
-				<table border="0" cellpadding="3" cellspacing="0" width="100%">
-				<tbody>
-				<tr>
-					<td class="genHeaderSmall" colspan="2" height="25" valign="middle">{$CMOD.LBL_CUSTOM_ACCESS_PRIVILEGES}</td>
-				</tr>
-				<tr><td colspan="2"></td></tr>
-				<tr>
-					<td colspan="2" style="padding: 0px 0px 0px 1px;" bgcolor="#ebebeb">
-						
-				<!-- Start of Module Display -->
-						{foreach key=modulename item=details from=$MODSHARING}
-						<div align="right"><a href="#">{$CMOD.LBL_GO_TO_TOP}</a></div>
-						{if $details.0 neq ''}
-						<table class="orgTab" cellpadding="0" cellspacing="0">
-						<tbody>
-						<tr bgcolor="#cccccc">
-							<td colspan=3 style="border: 1px solid rgb(204, 204, 204); padding-left: 5px;">
-							<img src="{$IMAGE_PATH}arrow.jpg" align="absmiddle">&nbsp;
-							<b>{$APP.$modulename}</b>&nbsp; 
-							</td>
-							<td align="right" colspan=2><input title="New" class="small" type="button" name="Create" value="{$CMOD.LBL_ADD_PRIVILEGES_BUTTON}" onClick="callEditDiv('{$modulename}','create','')"></td>
-						</tr>
-					  	<tr>
-							<th class="lvtCol" nowrap width="9%">{$CMOD.LBL_RULE_NO}</th>
-							<th class="lvtCol" width="20%">{$APP.$modulename} {$CMOD.LBL_OF} </th>
-							<th class="lvtCol" width="25%">{$CMOD.LBL_CAN_BE_ACCESSED}</th>
-							<th class="lvtCol" width="40%">{$CMOD.LBL_PRIVILEGES}</th>
-							<th class="lvtCol" width="6%">{$APP.Tools}</th>
-						</tr>
-						{foreach key=sno item=elements from=$details}
-						<tr class="prvPrfHoverOut" onmouseover="this.className='prvPrfHoverOn'" onmouseout="this.className='prvPrfHoverOut'">
-							<td>{$sno+1}</td>
-							<td>{$elements.1}</td>
-							<td>{$elements.2}</td>
-							<td>{$elements.3}</td>
-							<td align="center"><a href="javascript:onClick=callEditDiv('{$modulename}','edit','{$elements.0}')"><img src="{$IMAGE_PATH}editfield.gif" title='edit' align="absmiddle" height="15" width="16" border=0></a>|<a href="index.php?module=Users&action=DeleteSharingRule&shareid={$elements.0}"><img src="{$IMAGE_PATH}delete.gif" title='del' align="absmiddle" height="15" width="16" border=0></a></td>
-					    </tr>
-						{/foreach}
-				  		</tbody></table>
-				<!-- End of Module Display -->
-					{else}
-				<!-- Start FOR NO DATA -->
-					<table border="0" cellpadding="3" cellspacing="0" width="100%">
-					<tbody>
-					<tr><td colspan="2"></td></tr>
-					<tr bgcolor="#cccccc">
-					  	<td style="border: 1px solid rgb(204, 204, 204); padding-left: 5px;">
-					  	<img src="{$IMAGE_PATH}arrow.jpg" align="absmiddle">&nbsp;
-						<b>{$APP.$modulename}</b>&nbsp;&nbsp; 
-						</td>
-					 	<td align="right"><input title="New" class="small" type="button" name="Create" value="{$APP.LBL_ADD_ITEM} {$CMOD.LBL_PRIVILEGES}" onClick="callEditDiv('{$modulename}','create','')"></td>
-				  	</tr>
-				  	<tr>
-				  		<td colspan="2" style="padding: 20px;" bgcolor="#ffffff" align="center">
-						{$CMOD.LBL_CUSTOM_ACCESS_MESG} 
-						<a href="javascript:onClick=callEditDiv('{$modulename}','create','')">{$CMOD.LNK_CLICK_HERE}</a>
-						{$CMOD.LBL_CREATE_RULE_MESG}
-					    </td>
-				  	</tr>
-					</tbody>
-					</table>
-			    <!-- END OF NO DATA -->
-					{/if}
-					<br><br>
-					{/foreach}
-					</td>
-					</tr>
-					</tbody></table>
-				</td>
-				<td bgcolor="#ebebeb" width="8"></td>
-			  </tr>
-			  <tr>
-				<td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif;" height="8" width="7"><img src="{$IMAGE_PATH}bottom_left.jpg" align="bottom"></td>
-				<td style="font-size: 1px;" bgcolor="#ebebeb" height="8"></td>
-				<td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif;" height="8" width="8"><img src="{$IMAGE_PATH}bottom_right.jpg" align="bottom"></td>
-			  </tr>
-		  </tbody></table><br>
-			</div>		
-		  		<!-- END OF CUSTOM ACCESS -->
-
-
-</td>
-<td width="1%" style="border-right:1px dotted #CCCCCC;">&nbsp;</td>
-</tr>
-</table>
-</td>
-</tr>
-</table>
-</td>
-</tr>
-</table>
-<div id="tempdiv" style="display:block;position:absolute;left:225px;top:150px;"></div>
-<script>
-
-function callEditDiv(modulename,mode,id)
-{ldelim}
-	$("status").style.display="inline";
-	new Ajax.Request(
-		'index.php',
-		{ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
-			method: 'post',
-			postBody: 'module=Users&action=UsersAjax&orgajax=true&mode='+mode+'&sharing_module='+modulename+'&shareid='+id,
-			onComplete: function(response) {ldelim}
-				$("status").style.display="none";
-				$("tempdiv").innerHTML=response.responseText;
-			{rdelim}
-		{rdelim}
-	);
-{rdelim}
-
-function fnwriteRules(module,related)
-{ldelim}
-		var modulelists = new Array();
-		modulelists = related.split('###');
-		var relatedstring ='';
-		var relatedtag;
-		var relatedselect;
-		var modulename;
-		for(i=0;i < modulelists.length-1;i++)
-		{ldelim}
-			modulename = modulelists[i]+"_accessopt";
-			relatedtag = document.getElementById(modulename);
-			relatedselect = relatedtag.options[relatedtag.selectedIndex].text;
-			relatedstring += modulelists[i]+':'+relatedselect+' ';
-		{rdelim}	
-		var tagName = document.getElementById(module+"_share");
-		var tagName2 = document.getElementById(module+"_access");
-		var tagName3 = document.getElementById('share_memberType');
-		var soucre =  document.getElementById("rules");
-		var soucre1 =  document.getElementById("relrules");
-		var select1 = tagName.options[tagName.selectedIndex].text;
-		var select2 = tagName2.options[tagName2.selectedIndex].text;
-		var select3 = tagName3.options[tagName3.selectedIndex].text;
-		soucre.innerHTML = module +" of <b>\"" + select1 + "\"</b> can be accessed by <b>\"" +select2 + "\"</b> in the permission "+select3;
-		soucre1.innerHTML = "<b>Related Module Rights</b> "+ relatedstring;
-{rdelim}
-
-</script>
-{include file='SettingsSubMenu.tpl'}
-
+{*<!--
+/*********************************************************************************
+  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
+   * ("License"); You may not use this file except in compliance with the License
+   * The Original Code is:  vtiger CRM Open Source
+   * The Initial Developer of the Original Code is vtiger.
+   * Portions created by vtiger are Copyright (C) vtiger.
+   * All Rights Reserved.
+  *
+ ********************************************************************************/
+-->*}
+<script language="JAVASCRIPT" type="text/javascript" src="include/js/smoothscroll.js"></script>
+{literal}
+<style>
+DIV.fixedLay{
+	border:3px solid #CCCCCC;
+	background-color:#FFFFFF;
+	width:500px;
+	position:fixed;
+	left:250px;
+	top:200px;
+	display:block;
+}
+</style>
+{/literal}
+{literal}
+<!--[if lte IE 6]>
+<STYLE type=text/css>
+DIV.fixedLay {
+	POSITION: absolute;
+}
+</STYLE>
+<![endif]-->
+
+{/literal}
+<br>
+<table align="center" border="0" cellpadding="0" cellspacing="0" width="98%">
+<tbody><tr>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
+        <td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
+        <br>
+
+	<div align=center>
+			{include file="SetMenu.tpl"}
+				<!-- DISPLAY -->
+				<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
+				<tr>
+					<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}shareaccess.gif" alt="Users" width="48" height="48" border=0 title="Users"></td>
+					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > {$MOD.LBL_SHARING_ACCESS} </b></td>
+					<td rowspan=2 class="small" align=right>&nbsp;</td>
+				</tr>
+				<tr>
+					<td valign=top class="small">{$MOD.LBL_SHARING_ACCESS_DESCRIPTION}</td>
+				</tr>
+				</table>
+
+				<br>
+			  	<!-- GLOBAL ACCESS MODULE -->
+		  		<div id="globaldiv">
+				<table border=0 cellspacing=0 cellpadding=5 width=100% class="tableHeading">
+				<form action="index.php" method="post" name="new" id="form">
+				<input type="hidden" name="module" value="Users">
+				<input type="hidden" name="action" value="OrgSharingEditView">
+				<input type="hidden" name="parenttab" value="Settings">
+				<tr>
+					<td class="big"><strong>1. {$CMOD.LBL_GLOBAL_ACCESS_PRIVILEGES}</strong></td>
+					<td class="small" align=right>
+						<input class="crmButton small cancel" title="{$CMOD.LBL_RECALCULATE_BUTTON}"  type="submit" name="recalculate" value="{$CMOD.LBL_RECALCULATE_BUTTON}" onclick="this.form.action.value='RecalculateSharingRules'; return confirm('Recalculate Sharing Rules will calculate the sharing rules for the whole organization. This Operation will take some time. Do you want to contunue? ')">	
+	&nbsp;<input class="crmButton small edit" type="submit" name="Edit" value="{$CMOD.LBL_CHANGE} {$CMOD.LBL_PRIVILEGES}" ></td>
+					</td>
+				</tr>
+				</table>
+				<table cellspacing="0" cellpadding="5" class="listTable" width="100%">
+				{foreach item=module from=$DEFAULT_SHARING}	
+                  <tr>
+                    <td width="20%" class="colHeader small" nowrap>{$APP[$module.0]}</td>
+                    <td width="30%" class="listTableRow small" nowrap>
+			{if $module.1 neq 'Private' && $module.1 neq 'Hide Details'}
+				<img src="{$IMAGE_PATH}public.gif" align="absmiddle">
+			{else}
+				<img src="{$IMAGE_PATH}private.gif" align="absmiddle">
+			{/if}
+				{$CMOD[$module.1]}
+		    </td>
+                    <td width="50%" class="listTableRow small" nowrap>{$module.2}</td>
+                  </tr>
+		  {/foreach}
+		</form>	
+              </table>
+		</div>	
+		  <!-- END OF GLOBAL -->
+				<br><br>
+		  <!-- Custom Access Module Display Table -->
+		  <div id="customdiv">
+				<table border=0 cellspacing=0 cellpadding=5 width=100% class="tableHeading">
+				<tr>
+					<td class="big"><strong>2. {$CMOD.LBL_CUSTOM_ACCESS_PRIVILEGES}</strong></td>
+					<td class="small" align=right>&nbsp;</td>
+				</tr>
+				</table>
+				<!-- Start of Module Display -->
+				{foreach  key=modulename item=details from=$MODSHARING}
+				{if $details.0 neq ''}
+				<table width="100%" border="0" cellpadding="5" cellspacing="0" class="listTableTopButtons">
+                  		<tr>
+		                    <td  style="padding-left:5px;" class="big"><img src="{$IMAGE_PATH}arrow.jpg" width="19" height="21" align="absmiddle" />&nbsp; <b>{$APP.$modulename}</b>&nbsp; </td>
+                		    <td align="right">
+					<input class="crmButton small save" type="button" name="Create" value="{$CMOD.LBL_ADD_PRIVILEGES_BUTTON}" onClick="callEditDiv('{$modulename}','create','')">
+				    </td>
+                  		</tr>
+			  	</table>
+				<table width="100%" cellpadding="5" cellspacing="0" class="listTable" >
+                    		<tr>
+                    		<td width="7%" class="colHeader small" nowrap>{$CMOD.LBL_RULE_NO}</td>
+                          	<td width="20%" class="colHeader small" nowrap>{$APP.$modulename} {$CMOD.LBL_OF}</td>
+                          	<td width="25%" class="colHeader small" nowrap>{$CMOD.LBL_CAN_BE_ACCESSED}</td>
+                          	<td width="40%" class="colHeader small" nowrap>{$CMOD.LBL_PRIVILEGES}</td>
+                          	<td width="8%" class="colHeader small" nowrap>{$APP.Tools}</td>
+                        	</tr>
+                        <tr >
+			  {foreach key=sno item=elements from=$details}
+                          <td class="listTableRow small">{$sno+1}</td>
+                          <td class="listTableRow small">{$elements.1}</td>
+                          <td class="listTableRow small">{$elements.2}</td>
+                          <td class="listTableRow small">{$elements.3}</td>
+                          <td align="center" class="listTableRow small">
+				<a href="javascript:onClick=callEditDiv('{$modulename}','edit','{$elements.0}')"><img src="{$IMAGE_PATH}editfield.gif" title='edit' align="absmiddle" height="15" width="16" border=0></a>|<a href="index.php?module=Users&action=DeleteSharingRule&shareid={$elements.0}"><img src="{$IMAGE_PATH}delete.gif" title='del' align="absmiddle" height="15" width="16" border=0></a></td>
+                        </tr>
+                     {/foreach} 
+                    </table>
+	<!-- End of Module Display -->
+	<!-- Start FOR NO DATA -->	
+			<table border=0 cellspacing=0 cellpadding=5 width=100% class="tableHeading">
+			<tr><td>&nbsp;</td></tr>
+			</table>
+		    {else}
+                    <table width="100%" cellpadding="0" cellspacing="0" class="listTable"><tr><td>
+		      <table width="100%" border="0" cellpadding="5" cellspacing="0" class="listTableTopButtons">
+                      <tr>
+                        <td  style="padding-left:5px;" class="big"><img src="{$IMAGE_PATH}arrow.jpg" width="19" height="21" align="absmiddle" />&nbsp; <b>{$APP.$modulename}</b>&nbsp; </td>
+                        <td align="right">
+				<input class="crmButton small save" type="button" name="Create" value="{$APP.LBL_ADD_ITEM} {$CMOD.LBL_PRIVILEGES}" onClick="callEditDiv('{$modulename}','create','')">
+			</td>
+                      </tr>
+			<table width="100%" cellpadding="5" cellspacing="0">
+			<tr>
+			<td colspan="2"  style="padding:20px ;" align="center" class="small">
+			   {$CMOD.LBL_CUSTOM_ACCESS_MESG} 
+			   <a href="javascript:onClick=callEditDiv('{$modulename}','create','')">{$CMOD.LNK_CLICK_HERE}</a>
+			   {$CMOD.LBL_CREATE_RULE_MESG}
+			</td>
+			</tr>
+		    </table>
+		    </table>	
+			<table border=0 cellspacing=0 cellpadding=5 width=100% class="tableHeading">
+			<tr><td>&nbsp;</td></tr>
+			</table>
+		    {/if}
+		    {/foreach}			
+		   </td></tr></table>
+				<br>
+		   </div>	
+				<!-- Edit Button -->
+				<table border=0 cellspacing=0 cellpadding=5 width=100% >
+				<tr><td class="small" ><div align=right><a href="#top">{$MOD.LBL_SCROLL}</a></div></td></tr>				</table>
+		 </td>
+                  </tr>
+				
+                </table>
+			
+			
+			
+			</td>
+			</tr>
+			</table>
+		</td>
+	</tr>
+	</table>
+		
+	</div>
+</td>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
+   </tr>
+</tbody>
+</table>
+<div id="tempdiv" style="display:block;position:absolute;left:225px;top:150px;"></div>
+<script>
+
+function callEditDiv(modulename,mode,id)
+{ldelim}
+	$("status").style.display="inline";
+	new Ajax.Request(
+		'index.php',
+		{ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+			method: 'post',
+			postBody: 'module=Users&action=UsersAjax&orgajax=true&mode='+mode+'&sharing_module='+modulename+'&shareid='+id,
+			onComplete: function(response) {ldelim}
+				$("status").style.display="none";
+				$("tempdiv").innerHTML=response.responseText;
+			{rdelim}
+		{rdelim}
+	);
+{rdelim}
+
+function fnwriteRules(module,related)
+{ldelim}
+		var modulelists = new Array();
+		modulelists = related.split('###');
+		var relatedstring ='';
+		var relatedtag;
+		var relatedselect;
+		var modulename;
+		for(i=0;i < modulelists.length-1;i++)
+		{ldelim}
+			modulename = modulelists[i]+"_accessopt";
+			relatedtag = document.getElementById(modulename);
+			relatedselect = relatedtag.options[relatedtag.selectedIndex].text;
+			relatedstring += modulelists[i]+':'+relatedselect+' ';
+		{rdelim}	
+		var tagName = document.getElementById(module+"_share");
+		var tagName2 = document.getElementById(module+"_access");
+		var tagName3 = document.getElementById('share_memberType');
+		var soucre =  document.getElementById("rules");
+		var soucre1 =  document.getElementById("relrules");
+		var select1 = tagName.options[tagName.selectedIndex].text;
+		var select2 = tagName2.options[tagName2.selectedIndex].text;
+		var select3 = tagName3.options[tagName3.selectedIndex].text;
+		soucre.innerHTML = module +" of <b>\"" + select1 + "\"</b> can be accessed by <b>\"" +select2 + "\"</b> in the permission "+select3;
+		soucre1.innerHTML = "<b>Related Module Rights</b> "+ relatedstring;
+{rdelim}
+
+</script>

Modified: vtigercrm/trunk/Smarty/templates/OrgSharingEditView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/OrgSharingEditView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/OrgSharingEditView.tpl Tue Jun 20 01:02:26 2006
@@ -9,67 +9,77 @@
   *
  ********************************************************************************/
 -->*}
-<script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
-<style type="text/css">@import url(themes/blue/style.css);</style>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-<tr>
-	{include file='SettingsMenu.tpl'}
-<td width="75%" valign="top">
+<script language="JAVASCRIPT" type="text/javascript" src="include/js/smoothscroll.js"></script>
+<br>
+<table align="center" border="0" cellpadding="0" cellspacing="0" width="98%">
+<tbody><tr>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
+        <td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
+        <br>
 
-<table width="100%" border="0" cellpadding="0" cellspacing="0" height="100%">
-<tr>
-<td class="showPanelBg" valign="top" width="100%" colspan="3" style="padding-left:20px; "><br/>
-<span class="lvtHeaderText"><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS} </a> > {$MOD.LBL_USER_MANAGEMENT} > {$CMOD.LBL_ORG_SHARING_PRIVILEGES}</b></span>
-<hr noshade="noshade" size="1" />
-</td>
-</tr>
-<tr><td height=20 colspan=3>&nbsp;</td></tr>
-<tr>
-<td width="75%" style="padding-left:20px;" valign="top">
+	<div align=center>
+			{include file="SetMenu.tpl"}
+				<!-- DISPLAY -->
+				<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
+				<form action="index.php" method="post" name="def_org_share" id="form">
+				<input type="hidden" name="module" value="Users">
+				<input type="hidden" name="action" value="SaveOrgSharing">
+				<input type="hidden" name="parenttab" value="Settings">
+				<tr>
+					<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}shareaccess.gif" alt="Users" width="48" height="48" border=0 title="Users"></td>
+					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > {$MOD.LBL_EDIT} {$MOD.LBL_SHARING_ACCESS} </b></td>
+					<td rowspan=2 class="small" align=right>&nbsp;</td>
+				</tr>
+				<tr>
+					<td valign=top class="small">{$MOD.LBL_SHARING_ACCESS_DESCRIPTION}</td>
+				</tr>
+				</table>
+
+				<br>
+				<table border=0 cellspacing=0 cellpadding=5 width=100% class="tableHeading">
+				<tr>
+					<td class="big"><strong>{$CMOD.LBL_GLOBAL_ACCESS_PRIVILEGES}</strong></td>
+					<td class="small" align=right>
+						<input class="crmButton small save" title="Save" accessKey="C" type="submit" name="Save" value="{$CMOD.LBL_SAVE_PERMISSIONS}">&nbsp;
+						<input class="crmButton small cancel" title="{$APP.LBL_CANCEL_BUTTON_TITLE}" accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" type="button" name="Cancel" value="{$APP.LBL_CANCEL_BUTTON_LABEL}" onClick="window.history.back();">
+					</td>
+				</tr>
+				</table>
+
 	
-	<table border="0" cellpadding="" cellspacing="0" width="75%">
-	<tbody>
-	<form action="index.php" method="post" name="def_org_share" id="form">
-	<input type="hidden" name="module" value="Users">
-	<input type="hidden" name="action" value="SaveOrgSharing">
-	<input type="hidden" name="parenttab" value="Settings">
-	<tr>
-	<td class="genHeaderSmall" height="25" valign="middle">{$CMOD.LBL_GLOBAL_ACCESS_PRIVILEGES}</td>
-	<td align="right"><input class="small" title="Save" accessKey="C" type="submit" name="Save" value="{$CMOD.LBL_SAVE_PERMISSIONS}"></td>
-	</tr>
-	<tr><td colspan="2" height="20">&nbsp;</td></tr>
-	<tr>
-	<td colspan="2" style="padding: 0px 0px 0px 1px;" bgcolor="#ffffff">
-
-	<table class="globTab" cellpadding="5" cellspacing="0">
-	<tbody>
-	{foreach item=elements from=$ORGINFO}	
-	<tr>
-	<th width="30%">{$APP[$elements.0]}</th>
-	<td width="70%">{$elements.2}</td>
-	<tr>
-	{/foreach}
-	</tbody>
-	</table>
-	</td>
-	</tr>
-	<tr><td colspan="2" height="20">&nbsp;</td></tr>
-	<tr>
-	<td align="center" colspan=2><input class="small" title="{$APP.LBL_CANCEL_BUTTON_TITLE}" accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" type="button" name="Cancel" value="{$APP.LBL_CANCEL_BUTTON_LABEL}" onClick="window.history.back();"></td>
-	</tr>
+				<table cellspacing="0" cellpadding="5" class="listTable" width="100%">
+				{foreach item=elements from=$ORGINFO}	
+				<tr>
+                    		    <td width="30%" class="colHeader small" nowrap>{$APP[$elements.0]}</td>
+				    <td width="70%" class="listTable small">{$elements.2}</td>
+				<tr>
+				{/foreach}
+				</table>
 	</form>
-	</tbody>
 	</table>
 
+				<table border=0 cellspacing=0 cellpadding=5 width=100% >
+				<tr><td class="small" ><div align=right><a href="#top">{$MOD.LBL_SCROLL}</a></div></td></tr>				</table>
+		 </td>
+                  </tr>
+				
+                </table>
+			
+			
+			
+			</td>
+			</tr>
+			</table>
+		</td>
+	</tr>
+	</table>
+		
+
+
 </td>
-<td width="1%" style="border-right:1px dotted #CCCCCC;">&nbsp;</td>
-</tr>
-</table>
-</td>
-</tr>
-</table>
-</td>
-</tr>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
+   </tr>
+</tbody>
 </table>
 <script>
 




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 20 03:06:53 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 20 Jun 2006 07:06:53 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7290 -
 /vtigercrm/trunk/modules/Users/listemailtemplates.php
Message-ID: <20060620070653.1364A5E4DC7@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 20 01:06:50 2006
New Revision: 7290

Log:
updated listemailtemplate.php

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

Modified: vtigercrm/trunk/modules/Users/listemailtemplates.php
==============================================================================
--- vtigercrm/trunk/modules/Users/listemailtemplates.php (original)
+++ vtigercrm/trunk/modules/Users/listemailtemplates.php Tue Jun 20 01:06:50 2006
@@ -42,8 +42,11 @@
 $smarty->assign("MOD", $smod_strings);
 $smarty->assign("MODULE", 'Settings');
 $smarty->assign("IMAGE_PATH", $image_path);
+$smarty->assign("PARENTTAB", $_REQUEST['parenttab']);
 
 $return_data=array();
+if ($temprow != null)
+{
 do
 {
   $templatearray=array();
@@ -54,6 +57,7 @@
   $return_data[]=$templatearray;
   $cnt++;
 }while($temprow = $adb->fetch_array($result));
+}
 
 $log->info("Exiting Email Templates List View");
 




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 20 03:11:20 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 20 Jun 2006 07:11:20 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7291 - in
 /vtigercrm/trunk/modules/Users: createemailtemplate.php
 editemailtemplate.php listwordtemplates.php upload.php
Message-ID: <20060620071120.A31C45E4D89@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 20 01:11:13 2006
New Revision: 7291

Log:
updated the files for mail & email templates - ahmed

Modified:
    vtigercrm/trunk/modules/Users/createemailtemplate.php
    vtigercrm/trunk/modules/Users/editemailtemplate.php
    vtigercrm/trunk/modules/Users/listwordtemplates.php
    vtigercrm/trunk/modules/Users/upload.php

Modified: vtigercrm/trunk/modules/Users/createemailtemplate.php
==============================================================================
--- vtigercrm/trunk/modules/Users/createemailtemplate.php (original)
+++ vtigercrm/trunk/modules/Users/createemailtemplate.php Tue Jun 20 01:11:13 2006
@@ -31,6 +31,7 @@
 $smarty->assign("IMAGE_PATH", $image_path);
 $smarty->assign("THEME_PATH", $theme_path);
 $smarty->assign("UMOD", $mod_strings);
+$smarty->assign("PARENTTAB", $_REQUEST['parenttab']);
 
 $smarty->assign("MOD", $smod_strings);
 $smarty->assign("MODULE", 'Settings');

Modified: vtigercrm/trunk/modules/Users/editemailtemplate.php
==============================================================================
--- vtigercrm/trunk/modules/Users/editemailtemplate.php (original)
+++ vtigercrm/trunk/modules/Users/editemailtemplate.php Tue Jun 20 01:11:13 2006
@@ -51,6 +51,7 @@
 $smarty->assign("SUBJECT", $emailtemplateResult["subject"]);
 $smarty->assign("BODY", $emailtemplateResult["body"]);
 $smarty->assign("MODULE", 'Settings');
+$smarty->assign("PARENTTAB", $_REQUEST['parenttab']);
 $smarty->assign("EMODE", $mode);
 
 $smarty->display("CreateEmailTemplate.tpl");

Modified: vtigercrm/trunk/modules/Users/listwordtemplates.php
==============================================================================
--- vtigercrm/trunk/modules/Users/listwordtemplates.php (original)
+++ vtigercrm/trunk/modules/Users/listwordtemplates.php Tue Jun 20 01:11:13 2006
@@ -48,6 +48,7 @@
 $smod_strings = return_module_language($current_language,'Settings');
 $smarty->assign("MOD", $smod_strings);
 $smarty->assign("UMOD", $mod_strings);
+$smarty->assign("PARENTTAB", $_REQUEST['parenttab']);
 $smarty->assign("IMAGE_PATH",$image_path);
 
 

Modified: vtigercrm/trunk/modules/Users/upload.php
==============================================================================
--- vtigercrm/trunk/modules/Users/upload.php (original)
+++ vtigercrm/trunk/modules/Users/upload.php Tue Jun 20 01:11:13 2006
@@ -31,6 +31,7 @@
 $smarty->assign("IMAGE_PATH",$image_path);
 $smarty->assign("APP", $app_strings);
 $smarty->assign("UMOD", $mod_strings);
+$smarty->assign("PARENTTAB", $_REQUEST['parenttab']);
 
 $smarty->display('CreateWordTemplate.tpl');
 




From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 03:19:44 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 07:19:44 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=23691=3A_?=
	=?utf-8?q?installation?=
In-Reply-To: <076.1bead8693dac1b3fa05155cdcb028a72@vtiger.fosslabs.com>
References: <076.1bead8693dac1b3fa05155cdcb028a72@vtiger.fosslabs.com>
Message-ID: <085.fb9f09987770069f6a5e03466cd12eb0@vtiger.fosslabs.com>

#691: installation
--------------------------+-------------------------------------------------
  Reporter:  mickie       |       Owner:  Richie      
      Type:  enhancement  |      Status:  new         
  Priority:  critical     |   Milestone:              
 Component:  vtigercrm    |     Version:  5.0.0       
Resolution:               |    Keywords:  installation
--------------------------+-------------------------------------------------
Changes (by anonymous):

  * owner:  jerrydgeorge => Richie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/691>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 03:19:59 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 07:19:59 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23926=3A_?=
 =?utf-8?q?If_database_fails=2C_installation_script_loses_path_variable?=
In-Reply-To: <076.3dff578d41ed95759b327615c9ea781a@vtiger.fosslabs.com>
References: <076.3dff578d41ed95759b327615c9ea781a@vtiger.fosslabs.com>
Message-ID: <085.9c02dc73e7a26bd127d9b091f4f12795@vtiger.fosslabs.com>

#926: If database fails, installation script loses path variable
------------------------+---------------------------------------------------
  Reporter:  neofis     |       Owner:  Richie      
      Type:  defect     |      Status:  new         
  Priority:  critical   |   Milestone:              
 Component:  vtigercrm  |     Version:  5.0.0       
Resolution:             |    Keywords:  installation
------------------------+---------------------------------------------------
Changes (by anonymous):

  * owner:  jeri => Richie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/926>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 03:20:15 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 07:20:15 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231151=3A?=
 =?utf-8?q?_Error_message_in_Installer=2E=2E?=
In-Reply-To: <076.5644658cbeac029416aebb3b898c0527@vtiger.fosslabs.com>
References: <076.5644658cbeac029416aebb3b898c0527@vtiger.fosslabs.com>
Message-ID: <085.bd0afc913027e74023881ee88071c535@vtiger.fosslabs.com>

#1151: Error message in Installer..
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  Richie
      Type:  defect     |      Status:  new   
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by anonymous):

  * owner:  jeri => Richie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1151>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 03:20:35 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 07:20:35 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231185=3A?=
 =?utf-8?q?_could_not_install_=2Ebin_with_default_apache_and_bundled_mysql?=
In-Reply-To: <076.6370e2d438c2565f58d0b5d3f57b00ec@vtiger.fosslabs.com>
References: <076.6370e2d438c2565f58d0b5d3f57b00ec@vtiger.fosslabs.com>
Message-ID: <085.bad9ec6dcf0cf845575c12c1d397c87e@vtiger.fosslabs.com>

#1185: could not install .bin with default apache and bundled mysql
------------------------+---------------------------------------------------
  Reporter:  mangai     |       Owner:  Richie
      Type:  defect     |      Status:  new   
  Priority:  critical   |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by anonymous):

  * owner:  jeri => Richie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1185>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 03:20:43 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 07:20:43 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231201=3A?=
 =?utf-8?q?_could_not_install_=2Ebin_with_default_apache_and_mysql?=
In-Reply-To: <076.a2a48d622de2b413e928bb5187dbd9ad@vtiger.fosslabs.com>
References: <076.a2a48d622de2b413e928bb5187dbd9ad@vtiger.fosslabs.com>
Message-ID: <085.ce7c34d483187d6683596682c0d5cef2@vtiger.fosslabs.com>

#1201: could not install .bin with default apache and mysql
------------------------+---------------------------------------------------
  Reporter:  mangai     |       Owner:  Richie
      Type:  defect     |      Status:  new   
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by anonymous):

  * owner:  jeri => Richie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1201>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 03:21:31 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 07:21:31 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23703=3A_?=
 =?utf-8?q?installation_issue_in_bin?=
In-Reply-To: <076.d5b75a39847faef3b46084de29b76436@vtiger.fosslabs.com>
References: <076.d5b75a39847faef3b46084de29b76436@vtiger.fosslabs.com>
Message-ID: <085.7c5d60e2df4633ab0a39bcb0c56c7e0c@vtiger.fosslabs.com>

#703: installation issue in bin
---------------------------+------------------------------------------------
  Reporter:  jerrydgeorge  |       Owner:  Richie      
      Type:  defect        |      Status:  new         
  Priority:  major         |   Milestone:              
 Component:  vtigercrm     |     Version:  5.0.0       
Resolution:                |    Keywords:  installation
---------------------------+------------------------------------------------
Changes (by anonymous):

  * owner:  jerrydgeorge => Richie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/703>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 03:24:49 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 07:24:49 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231258=3A?=
 =?utf-8?q?_Can=27t_create_custom_fields?=
In-Reply-To: <076.e2de34810640366206140549ecde537d@vtiger.fosslabs.com>
References: <076.e2de34810640366206140549ecde537d@vtiger.fosslabs.com>
Message-ID: <085.f542985ecd8b5aa81b84ee6ceb7ff841@vtiger.fosslabs.com>

#1258: Can't create custom fields
------------------------+---------------------------------------------------
  Reporter:  nik        |       Owner:  ela  
      Type:  defect     |      Status:  new  
  Priority:  major      |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by mangai):

  * owner:  mangai => ela

Comment:

 Ocurred in IE.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1258>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 03:26:01 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 07:26:01 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231119=3A?=
 =?utf-8?q?_custom_field_UI_not_proper_in_IE?=
In-Reply-To: <076.fd3163da175acd9436235ee85221b737@vtiger.fosslabs.com>
References: <076.fd3163da175acd9436235ee85221b737@vtiger.fosslabs.com>
Message-ID: <085.6b97ce8dcf311bd02bdb0a445988363d@vtiger.fosslabs.com>

#1119: custom field UI not proper in IE
------------------------+---------------------------------------------------
  Reporter:  mangai     |       Owner:  ela  
      Type:  defect     |      Status:  new  
  Priority:  major      |   Milestone:  5.0.0
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by mangai):

  * owner:  mangai => ela

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1119>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 20 03:37:25 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 20 Jun 2006 07:37:25 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7292 - in /vtigercrm/trunk:
 Smarty/templates/ComposeEmail.tpl Smarty/templates/Header.tpl
 modules/Emails/ListView.php modules/Emails/Save.php
Message-ID: <20060620073726.0D8CA83F257@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 20 01:37:17 2006
New Revision: 7292

Log:
mail server check has been added and float div integrated

Modified:
    vtigercrm/trunk/Smarty/templates/ComposeEmail.tpl
    vtigercrm/trunk/Smarty/templates/Header.tpl
    vtigercrm/trunk/modules/Emails/ListView.php
    vtigercrm/trunk/modules/Emails/Save.php

Modified: vtigercrm/trunk/Smarty/templates/ComposeEmail.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ComposeEmail.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ComposeEmail.tpl Tue Jun 20 01:37:17 2006
@@ -19,6 +19,7 @@
 <title>Compose Mail</title>
 <link REL="SHORTCUT ICON" HREF="include/images/vtigercrm_icon.ico">	
 <style type="text/css">@import url("themes/{$THEME}/style.css");</style>
+<script language="javascript" type="text/javascript" src="include/scriptaculous/prototype.js"></script>
 </head>
 <body marginheight="0" marginwidth="0" topmargin="0" bottommargin="0" leftmargin="0" rightmargin="0">
 <form name="EditView" method="POST" ENCTYPE="multipart/form-data" action="index.php">
@@ -107,7 +108,7 @@
 	{elseif $elements.2.0 eq 'description'}
    <tr>
 	<td colspan="3" align="center" height="320">
-        <input id="description___Config" value="" style="display: none;" type="hidden"><iframe id="description___Frame" src="include/fckeditor/editor/fckeditor.html?InstanceName=description&amp;Toolbar=Default" frameborder="no" height="400" scrolling="no" width="100%"></iframe>
+        <input id="description___Config" value="" style="display: none;" type="hidden"><iframe id="description___Frame" src="include/fckeditor/editor/fckeditor.html?InstanceName=description&amp;Toolbar=Default" frameborder="no" height="370" scrolling="no" width="100%"></iframe>
         {if $WEBMAIL eq 'true'}
                 <textarea style="display: none;" class="detailedViewTextBox" name="description" cols="90" rows="8">{$DESCRIPTION}</textarea>
         {else}
@@ -151,10 +152,35 @@
 	}
 	if(mode == 'send')
 	{
-		oform.send_mail.value='true';
+		server_check()	
+	}else
+	{
+		oform.action.value='Save';
+		oform.submit();
 	}
-	oform.action.value='Save';
-	oform.submit();
+}
+function server_check()
+{
+	var oform = window.document.EditView;
+        new Ajax.Request(
+        	'index.php',
+                {queue: {position: 'end', scope: 'command'},
+                	method: 'post',
+                        postBody:"module=Emails&action=EmailsAjax&file=Save&ajax=true&server_check=true",
+			onComplete: function(response) {
+			if(response.responseText == 'SUCESS')
+			{
+				oform.send_mail.value='true';
+				oform.action.value='Save';
+				oform.submit();
+			}else
+			{
+				alert('Please Configure Your Mail Server');
+				return false;
+			}
+               	    }
+                }
+        );
 }
 </script>
 {/literal}

Modified: vtigercrm/trunk/Smarty/templates/Header.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Header.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Header.tpl Tue Jun 20 01:37:17 2006
@@ -9,19 +9,22 @@
   *
  ********************************************************************************/
 -->*}
-<!-- BEGIN: main -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>
-
-{literal}	
+{literal}
+<style>
+DIV.fixedLay{
+	position:fixed;
+}
+</style>
 <!--[if lte IE 6]>
 <STYLE type=text/css>HTML {
-	OVERFLOW: auto; HEIGHT: 100%
+	OVERFLOW: auto; HEIGHT: 100%;
 }
-BODY {
+BODY {  
 	margin:0 0 0 0;
-	OVERFLOW: auto; HEIGHT: 100%
+	OVERFLOW: auto; HEIGHT: 100%;
 }
 DIV.fixedLay {
 	POSITION: absolute;
@@ -29,7 +32,6 @@
 </STYLE>
 <![endif]-->
 {/literal}
-
 	<title>{$CURRENT_USER} - {$APP.$CATEGORY} - {$APP.$MODULE_NAME} - {$APP.LBL_BROWSER_TITLE}</title>
 	<link rel="stylesheet" type="text/css" href="style.css">
 	<link REL="SHORTCUT ICON" HREF="include/images/vtigercrm_icon.ico">	
@@ -462,7 +464,7 @@
 </div>
 
 
-<div id="status" style="display:none;position:absolute;left:930px;top:90px;height:27px;white-space:nowrap;"><img src="{$IMAGEPATH}status.gif"></div>
+<div id="status" class="fixedLay" style="display:none;left:930px;top:88px;height:27px;white-space:nowrap;"><img src="{$IMAGEPATH}status.gif"></div>
 <script>
 function openwin()
 {ldelim}

Modified: vtigercrm/trunk/modules/Emails/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/ListView.php (original)
+++ vtigercrm/trunk/modules/Emails/ListView.php Tue Jun 20 01:37:17 2006
@@ -162,7 +162,7 @@
 
 //Retreive the Navigation array
 $_REQUEST['allflag'] = 'All';
-$navigation_array = getNavigationValues(1, $noofrows, $list_max_entries_per_page);
+$navigation_array = getNavigationValues(1, $noofrows, $noofrows);
 
 //Retreive the List View Table Header
 if($viewid !='')

Modified: vtigercrm/trunk/modules/Emails/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/Save.php (original)
+++ vtigercrm/trunk/modules/Emails/Save.php Tue Jun 20 01:37:17 2006
@@ -1,199 +1,210 @@
-<?php
-/*********************************************************************************
- * The contents of this file are subject to the SugarCRM Public License Version 1.1.2
- * ("License"); You may not use this file except in compliance with the 
- * License. You may obtain a copy of the License at http://www.sugarcrm.com/SPL
- * Software distributed under the License is distributed on an  "AS IS"  basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
- * the specific language governing rights and limitations under the License.
- * The Original Code is:  SugarCRM Open Source
- * The Initial Developer of the Original Code is SugarCRM, Inc.
- * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.;
- * All Rights Reserved.
- * Contributor(s): ______________________________________.
- ********************************************************************************/
-/*********************************************************************************
- * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Emails/Save.php,v 1.27 2005/04/29 08:54:38 rank Exp $
- * Description:  Saves an Account record and then redirects the browser to the 
- * defined return URL.
- * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
- * All Rights Reserved.
- * Contributor(s): ______________________________________..
- ********************************************************************************/
-
-//Added on 09-11-2005 to avoid loading the webmail vtiger_files in Email process
-if($_REQUEST['smodule'] != '')
-{
-	define('SM_PATH','modules/squirrelmail-1.4.4/');
-	/* SquirrelMail required vtiger_files. */
-	require_once(SM_PATH . 'functions/strings.php');
-	require_once(SM_PATH . 'functions/imap_general.php');
-	require_once(SM_PATH . 'functions/imap_messages.php');
-	require_once(SM_PATH . 'functions/i18n.php');
-	require_once(SM_PATH . 'functions/mime.php');
-	require_once(SM_PATH .'include/load_prefs.php');
-	//require_once(SM_PATH . 'class/mime/Message.class.php');
-	require_once(SM_PATH . 'class/mime.class.php');
-	sqgetGlobalVar('key',       $key,           SQ_COOKIE);
-	sqgetGlobalVar('username',  $username,      SQ_SESSION);
-	sqgetGlobalVar('onetimepad',$onetimepad,    SQ_SESSION);
-	$mailbox = 'INBOX';
-}
-
-require_once('modules/Emails/Email.php');
-require_once('include/logging.php');
-require_once('include/database/PearDatabase.php');
-
-$local_log =& LoggerManager::getLogger('index');
-
-$focus = new Email();
-
-global $current_user;
-setObjectValuesFromRequest(&$focus);
-//Check if the file is exist or not.
-if($_FILES["filename"]["size"] == 0 && $_FILES["filename"]["name"] != '')
-{
-        $file_upload_error = true;
-        $_FILES = '';
-}
-if((isset($_REQUEST['deletebox']) && $_REQUEST['deletebox'] != null) && $_REQUEST['addbox'] == null)
-{
-	imap_delete($mbox,$_REQUEST['deletebox']);
-	imap_expunge($mbox);
-	header("Location: index.php?module=Emails&action=index");
-	exit();
-}
-/*if(isset($_REQUEST['fromemail']) && $_REQUEST['fromemail'] != null)
-{
-	//get the list of data from the comma separated array
-	$emailids = explode(",",$_REQUEST['fromemail']);
-	$subjects = explode(",",$_REQUEST['subject']);
-	$ids = explode(",",$_REQUEST['idlist']);
-	$total = count($ids);
-	for($z=0;$z<$total;$z++)
-	{
-		$msgData='';
-		global $current_user;
-		require_once('include/utils/UserInfoUtil.php');
-		$mailInfo = getMailServerInfo($current_user);
-		$temprow = $adb->fetch_array($mailInfo);
-
-		$secretkey=$temprow["mail_password"];
-		$imapServerAddress=$temprow["mail_servername"];
-		$imapPort="143";
-
-		$key = OneTimePadEncrypt($secretkey, $onetimepad);
-		$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
-		$mbx_response=sqimap_mailbox_select($imapConnection, $mailbox);
-
-		$message = sqimap_get_message($imapConnection, $ids[$z], $mailbox);
-		$header = $message->rfc822_header;
-		$ent_ar = $message->findDisplayEntity(array(), array('text/plain'));
-		$cnt = count($ent_ar);
-		global $color;
-		for ($u = 0; $u < $cnt; $u++)
-		{
-			$messagebody .= formatBody($imapConnection, $message, $color, $wrap_at, $ent_ar[$u], $ids[$z], $mailbox);
-			$msgData = $messagebody;
-		}
-
-			$ctctExists = checkIfContactExists($emailids[$z]);
-			if($ctctExists > 0)
-			{
-				$focus->column_fields['parent_id']=$ctctExists;
-			}
-			global $current_user;
-
-			$focus->column_fields['subject']=$subjects[$z];
-			$focus->column_fields["activitytype"]="Emails";
-			//this line has been added to get the related list data in the contact description
-			$focus->column_fields["assigned_user_id"]=$current_user->id;
-			$focus->column_fields["date_start"]=$_REQUEST['adddate'];
-			$focus->column_fields["time_start"]=$_REQUEST['adddate'];
-
-			$focus->column_fields["description"]=$msgData;
-			$focus->save("Emails");
-			$return_id = $focus->id;
-			$return_module='Emails';	
-			$return_action='DetailView';	
-	}
-	header("Location: index.php?action=$return_action&module=$return_module&parent_id=$parent_id&record=$return_id&filename=$filename");
-	return;
-}*/
-
-/**	Function to check whether the contact is exist of not
- *	input  : contact id
- *	return : contact id if contact exist, else -1 will be return
- */
-function checkIfContactExists($mailid)
-{
-	global $log;
-	$log->debug("Entering checkIfContactExists(".$mailid.") method ...");
-	global $adb;
-	$sql = "select contactid from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_contactdetails.contactid where vtiger_crmentity.deleted=0 and email= ".$adb->quote($mailid);
-	$result = $adb->query($sql);
-	$numRows = $adb->num_rows($result);
-	if($numRows > 0)
-	{
-		$log->debug("Exiting checkIfContactExists method ...");
-		return $adb->query_result($result,0,"contactid");
-	}
-	else
-	{
-		$log->debug("Exiting checkIfContactExists method ...");
-		return -1;
-	}
-}
-//assign the focus values
-$focus->filename = $_REQUEST['file_name'];
-$focus->parent_id = $_REQUEST['parent_id'];
-$focus->parent_type = $_REQUEST['parent_type'];
-$focus->column_fields["assigned_user_id"]=$current_user->id;
-$focus->column_fields["activitytype"]="Emails";
-$focus->column_fields["date_start"]= date('Y-m-d');
-$focus->save("Emails");
-
-//saving the email details in vtiger_emaildetails vtiger_table
-$return_id = $focus->id;
-$email_id = $return_id;
-$query = 'select emailid from vtiger_emaildetails where emailid ='.$email_id;
-$result = $adb->query($query);
-if(isset($_REQUEST["hidden_toid"]) && $_REQUEST["hidden_toid"]!='')
-	$all_to_ids = ereg_replace(",","###",$_REQUEST["hidden_toid"]);
-if(isset($_REQUEST["saved_toid"]) && $_REQUEST["saved_toid"]!='')
-	$all_to_ids .= ereg_replace(",","###",$_REQUEST["saved_toid"]);
-	
-$all_cc_ids = ereg_replace(",","###",$_REQUEST["ccmail"]);
-$all_bcc_ids = ereg_replace(",","###",$_REQUEST["bccmail"]);
-if($adb->num_rows($result) > 0)
-{
-	$query = 'update vtiger_emaildetails set to_email="'.$all_to_ids.'",cc_email="'.$all_cc_ids.'",bcc_email="'.$all_bcc_ids.'",idlists="'.$_REQUEST["parent_id"].'",email_flag="SAVED" where emailid = '.$email_id;
-}else
-{
-	$query = 'insert into vtiger_emaildetails values ('.$email_id.',"","'.$all_to_ids.'","'.$all_cc_ids.'","'.$all_bcc_ids.'","","'.$_REQUEST["parent_id"].'","SAVED")';
-}
-$adb->query($query);
-
-
-$focus->retrieve_entity_info($return_id,"Emails");
-
-//this is to receive the data from the Select Users button
-if($_REQUEST['source_module'] == null)
-{
-	$module = 'users';
-}
-//this will be the case if the Select Contact button is chosen
-else
-{
-	$module = $_REQUEST['source_module'];
-}
-
-if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] != "") $return_module = $_REQUEST['return_module'];
-else $return_module = "Emails";
-if(isset($_REQUEST['return_action']) && $_REQUEST['return_action'] != "") $return_action = $_REQUEST['return_action'];
-else $return_action = "DetailView";
-if(isset($_REQUEST['return_id']) && $_REQUEST['return_id'] != "") $return_id = $_REQUEST['return_id'];
-if(isset($_REQUEST['filename']) && $_REQUEST['filename'] != "") $filename = $_REQUEST['filename'];
+<?php
+/*********************************************************************************
+ * The contents of this file are subject to the SugarCRM Public License Version 1.1.2
+ * ("License"); You may not use this file except in compliance with the 
+ * License. You may obtain a copy of the License at http://www.sugarcrm.com/SPL
+ * Software distributed under the License is distributed on an  "AS IS"  basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
+ * the specific language governing rights and limitations under the License.
+ * The Original Code is:  SugarCRM Open Source
+ * The Initial Developer of the Original Code is SugarCRM, Inc.
+ * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.;
+ * All Rights Reserved.
+ * Contributor(s): ______________________________________.
+ ********************************************************************************/
+/*********************************************************************************
+ * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Emails/Save.php,v 1.27 2005/04/29 08:54:38 rank Exp $
+ * Description:  Saves an Account record and then redirects the browser to the 
+ * defined return URL.
+ * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
+ * All Rights Reserved.
+ * Contributor(s): ______________________________________..
+ ********************************************************************************/
+ //check for mail server configuration thro ajax
+if(isset($_REQUEST['server_check']) && $_REQUEST['server_check'] == 'true')
+{
+	$sql="select * from vtiger_systems where server_type = 'email'";
+	$records=$adb->num_rows($adb->query($sql),0,"id");
+	if($records != '')
+		echo 'SUCESS';
+	else
+		echo 'FAILURE';	
+	die;	
+}
+
+//Added on 09-11-2005 to avoid loading the webmail vtiger_files in Email process
+if($_REQUEST['smodule'] != '')
+{
+	define('SM_PATH','modules/squirrelmail-1.4.4/');
+	/* SquirrelMail required vtiger_files. */
+	require_once(SM_PATH . 'functions/strings.php');
+	require_once(SM_PATH . 'functions/imap_general.php');
+	require_once(SM_PATH . 'functions/imap_messages.php');
+	require_once(SM_PATH . 'functions/i18n.php');
+	require_once(SM_PATH . 'functions/mime.php');
+	require_once(SM_PATH .'include/load_prefs.php');
+	//require_once(SM_PATH . 'class/mime/Message.class.php');
+	require_once(SM_PATH . 'class/mime.class.php');
+	sqgetGlobalVar('key',       $key,           SQ_COOKIE);
+	sqgetGlobalVar('username',  $username,      SQ_SESSION);
+	sqgetGlobalVar('onetimepad',$onetimepad,    SQ_SESSION);
+	$mailbox = 'INBOX';
+}
+
+require_once('modules/Emails/Email.php');
+require_once('include/logging.php');
+require_once('include/database/PearDatabase.php');
+
+$local_log =& LoggerManager::getLogger('index');
+
+$focus = new Email();
+
+global $current_user;
+setObjectValuesFromRequest(&$focus);
+//Check if the file is exist or not.
+if($_FILES["filename"]["size"] == 0 && $_FILES["filename"]["name"] != '')
+{
+        $file_upload_error = true;
+        $_FILES = '';
+}
+if((isset($_REQUEST['deletebox']) && $_REQUEST['deletebox'] != null) && $_REQUEST['addbox'] == null)
+{
+	imap_delete($mbox,$_REQUEST['deletebox']);
+	imap_expunge($mbox);
+	header("Location: index.php?module=Emails&action=index");
+	exit();
+}
+/*if(isset($_REQUEST['fromemail']) && $_REQUEST['fromemail'] != null)
+{
+	//get the list of data from the comma separated array
+	$emailids = explode(",",$_REQUEST['fromemail']);
+	$subjects = explode(",",$_REQUEST['subject']);
+	$ids = explode(",",$_REQUEST['idlist']);
+	$total = count($ids);
+	for($z=0;$z<$total;$z++)
+	{
+		$msgData='';
+		global $current_user;
+		require_once('include/utils/UserInfoUtil.php');
+		$mailInfo = getMailServerInfo($current_user);
+		$temprow = $adb->fetch_array($mailInfo);
+
+		$secretkey=$temprow["mail_password"];
+		$imapServerAddress=$temprow["mail_servername"];
+		$imapPort="143";
+
+		$key = OneTimePadEncrypt($secretkey, $onetimepad);
+		$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
+		$mbx_response=sqimap_mailbox_select($imapConnection, $mailbox);
+
+		$message = sqimap_get_message($imapConnection, $ids[$z], $mailbox);
+		$header = $message->rfc822_header;
+		$ent_ar = $message->findDisplayEntity(array(), array('text/plain'));
+		$cnt = count($ent_ar);
+		global $color;
+		for ($u = 0; $u < $cnt; $u++)
+		{
+			$messagebody .= formatBody($imapConnection, $message, $color, $wrap_at, $ent_ar[$u], $ids[$z], $mailbox);
+			$msgData = $messagebody;
+		}
+
+			$ctctExists = checkIfContactExists($emailids[$z]);
+			if($ctctExists > 0)
+			{
+				$focus->column_fields['parent_id']=$ctctExists;
+			}
+			global $current_user;
+
+			$focus->column_fields['subject']=$subjects[$z];
+			$focus->column_fields["activitytype"]="Emails";
+			//this line has been added to get the related list data in the contact description
+			$focus->column_fields["assigned_user_id"]=$current_user->id;
+			$focus->column_fields["date_start"]=$_REQUEST['adddate'];
+			$focus->column_fields["time_start"]=$_REQUEST['adddate'];
+
+			$focus->column_fields["description"]=$msgData;
+			$focus->save("Emails");
+			$return_id = $focus->id;
+			$return_module='Emails';	
+			$return_action='DetailView';	
+	}
+	header("Location: index.php?action=$return_action&module=$return_module&parent_id=$parent_id&record=$return_id&filename=$filename");
+	return;
+}*/
+
+/**	Function to check whether the contact is exist of not
+ *	input  : contact id
+ *	return : contact id if contact exist, else -1 will be return
+ */
+function checkIfContactExists($mailid)
+{
+	global $log;
+	$log->debug("Entering checkIfContactExists(".$mailid.") method ...");
+	global $adb;
+	$sql = "select contactid from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_contactdetails.contactid where vtiger_crmentity.deleted=0 and email= ".$adb->quote($mailid);
+	$result = $adb->query($sql);
+	$numRows = $adb->num_rows($result);
+	if($numRows > 0)
+	{
+		$log->debug("Exiting checkIfContactExists method ...");
+		return $adb->query_result($result,0,"contactid");
+	}
+	else
+	{
+		$log->debug("Exiting checkIfContactExists method ...");
+		return -1;
+	}
+}
+//assign the focus values
+$focus->filename = $_REQUEST['file_name'];
+$focus->parent_id = $_REQUEST['parent_id'];
+$focus->parent_type = $_REQUEST['parent_type'];
+$focus->column_fields["assigned_user_id"]=$current_user->id;
+$focus->column_fields["activitytype"]="Emails";
+$focus->column_fields["date_start"]= date('Y-m-d');
+$focus->save("Emails");
+
+//saving the email details in vtiger_emaildetails vtiger_table
+$return_id = $focus->id;
+$email_id = $return_id;
+$query = 'select emailid from vtiger_emaildetails where emailid ='.$email_id;
+$result = $adb->query($query);
+if(isset($_REQUEST["hidden_toid"]) && $_REQUEST["hidden_toid"]!='')
+	$all_to_ids = ereg_replace(",","###",$_REQUEST["hidden_toid"]);
+if(isset($_REQUEST["saved_toid"]) && $_REQUEST["saved_toid"]!='')
+	$all_to_ids .= ereg_replace(",","###",$_REQUEST["saved_toid"]);
+	
+$all_cc_ids = ereg_replace(",","###",$_REQUEST["ccmail"]);
+$all_bcc_ids = ereg_replace(",","###",$_REQUEST["bccmail"]);
+if($adb->num_rows($result) > 0)
+{
+	$query = 'update vtiger_emaildetails set to_email="'.$all_to_ids.'",cc_email="'.$all_cc_ids.'",bcc_email="'.$all_bcc_ids.'",idlists="'.$_REQUEST["parent_id"].'",email_flag="SAVED" where emailid = '.$email_id;
+}else
+{
+	$query = 'insert into vtiger_emaildetails values ('.$email_id.',"","'.$all_to_ids.'","'.$all_cc_ids.'","'.$all_bcc_ids.'","","'.$_REQUEST["parent_id"].'","SAVED")';
+}
+$adb->query($query);
+
+
+$focus->retrieve_entity_info($return_id,"Emails");
+
+//this is to receive the data from the Select Users button
+if($_REQUEST['source_module'] == null)
+{
+	$module = 'users';
+}
+//this will be the case if the Select Contact button is chosen
+else
+{
+	$module = $_REQUEST['source_module'];
+}
+
+if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] != "") $return_module = $_REQUEST['return_module'];
+else $return_module = "Emails";
+if(isset($_REQUEST['return_action']) && $_REQUEST['return_action'] != "") $return_action = $_REQUEST['return_action'];
+else $return_action = "DetailView";
+if(isset($_REQUEST['return_id']) && $_REQUEST['return_id'] != "") $return_id = $_REQUEST['return_id'];
+if(isset($_REQUEST['filename']) && $_REQUEST['filename'] != "") $filename = $_REQUEST['filename'];
 
 $local_log->debug("Saved record with id of ".$return_id);
 




From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 03:38:54 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 07:38:54 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231203=3A?=
 =?utf-8?q?_no_message_even_if_outgoing_mailserver_is_not_configured?=
In-Reply-To: <076.4a4c3a13204da7c369ab711a0ee59827@vtiger.fosslabs.com>
References: <076.4a4c3a13204da7c369ab711a0ee59827@vtiger.fosslabs.com>
Message-ID: <085.429d82c5ca80579b7407bbda937ff3f4@vtiger.fosslabs.com>

#1203: no message even if outgoing mailserver is not configured
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  jeri  
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by anonymous):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1203>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 20 02:26:14 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 20 Jun 2006 06:26:14 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7280 -
	/vtigercrm/trunk/modules/Users/CreateSharingRule.php
Message-ID: <20060620062614.836CC83F1E6@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 20 00:26:10 2006
New Revision: 7280

Log:
Updated the layer as fixed - ahmed

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

Modified: vtigercrm/trunk/modules/Users/CreateSharingRule.php
==============================================================================
--- vtigercrm/trunk/modules/Users/CreateSharingRule.php (original)
+++ vtigercrm/trunk/modules/Users/CreateSharingRule.php Tue Jun 20 00:26:10 2006
@@ -244,11 +244,11 @@
 <input type="hidden" name="shareId" value="'.$shareid.'">
 <input type="hidden" name="mode" value="'.$mode.'">
 
-<div id="orgLay" style="display:block;">
+<div id="sharingRule" class="fixedLay">
 <table width="100%" border="0" cellpadding="3" cellspacing="0">
 <tr>
 <td class="genHeaderSmall" align="left" style="border-bottom:1px solid #CCCCCC;" width="60%">'.$sharing_module.' - Add Custom Privilege Rule</td>
-<td align="right" style="border-bottom:1px solid #CCCCCC;" width="40%"><a href="javascript:onClick=hide(\'orgLay\')";>Close</a></td>
+<td align="right" style="border-bottom:1px solid #CCCCCC;" width="40%"><a href="javascript:onClick=hide(\'sharingRule\')";>Close</a></td>
 
 </tr>
 <tr><td colspan="2">&nbsp;</td></tr>
@@ -318,7 +318,7 @@
 </tr>
 <tr>
 <td colspan="2" align="center">
-<input type="submit" class="small" name="add" value="Add Rule" onClick="return validate()">&nbsp;&nbsp;
+<input type="submit" class="crmButton small save" name="add" value="Add Rule" onClick="return validate()">&nbsp;&nbsp;
 </td>
 </tr>
 </table>




From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 05:06:26 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 09:06:26 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=23735=3A_?=
	=?utf-8?q?Rss_UI_Issue?=
In-Reply-To: <076.edb4f5ce57d779b8540628d713305768@vtiger.fosslabs.com>
References: <076.edb4f5ce57d779b8540628d713305768@vtiger.fosslabs.com>
Message-ID: <085.5acd534c274c716531d7ed81fc36e308@vtiger.fosslabs.com>

#735: Rss UI Issue
---------------------------+------------------------------------------------
  Reporter:  jerrydgeorge  |       Owner:  ela  
      Type:  defect        |      Status:  new  
  Priority:  major         |   Milestone:       
 Component:  vtigercrm     |     Version:  5.0.0
Resolution:                |    Keywords:  UI   
---------------------------+------------------------------------------------
Changes (by jerrydgeorge):

  * owner:  jeri => ela

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/735>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 05:07:08 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 09:07:08 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=23734=3A_?=
	=?utf-8?q?Issue_in_Rss_UI?=
In-Reply-To: <076.e1e137b6d1056e18ee101a85754a710a@vtiger.fosslabs.com>
References: <076.e1e137b6d1056e18ee101a85754a710a@vtiger.fosslabs.com>
Message-ID: <085.eacbdc48d3ec79b1642a38d13566b15b@vtiger.fosslabs.com>

#734: Issue in Rss UI
---------------------------+------------------------------------------------
  Reporter:  jerrydgeorge  |       Owner:  ela  
      Type:  defect        |      Status:  new  
  Priority:  major         |   Milestone:       
 Component:  vtigercrm     |     Version:  5.0.0
Resolution:                |    Keywords:  UI   
---------------------------+------------------------------------------------
Changes (by jerrydgeorge):

  * owner:  jerrydgeorge => ela

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/734>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 05:08:02 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 09:08:02 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231290=3A?=
	=?utf-8?q?_Company_Information?=
In-Reply-To: <076.d72bc388560618f95d42b1de2961a633@vtiger.fosslabs.com>
References: <076.d72bc388560618f95d42b1de2961a633@vtiger.fosslabs.com>
Message-ID: <085.2716477c226a09a7854e9562a77c8eb5@vtiger.fosslabs.com>

#1290: Company Information
------------------------+---------------------------------------------------
  Reporter:  daneswood  |       Owner:  jeri               
      Type:  defect     |      Status:  closed             
  Priority:  minor      |   Milestone:                     
 Component:  vtigercrm  |     Version:  5.0.0              
Resolution:  fixed      |    Keywords:  company information
------------------------+---------------------------------------------------
Changes (by jerrydgeorge):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1290>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 05:27:11 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 09:27:11 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231344=3A?=
	=?utf-8?q?_database_not_created?=
Message-ID: <076.c1df5e53995fbd31873387aa402b9381@vtiger.fosslabs.com>

#1344: database not created
-----------------------+----------------------------------------------------
 Reporter:  anonymous  |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  major      |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 i installed vtigercrm4_2_4
 I put it in my /var/www/crm.vtiger.com
 i created user called vtiger and gave it granted on database
 vtigercrm4_2_4
 i go through all th steps in the browser succusfully
 I found that the database hasn't been created i don't know why

 also i don't like that i can just make installation once from the browser
 then i can't do it again as now i have to remove the whole folder of
 vtiger and untar it again so that i can try installation one more time

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1344>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 20 05:27:54 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 20 Jun 2006 09:27:54 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7293 -
 /vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
Message-ID: <20060620092754.E63D283F183@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 20 03:27:50 2006
New Revision: 7293

Log:
Activities and Leads added under Marketing

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

Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original)
+++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Tue Jun 20 03:27:50 2006
@@ -2152,6 +2152,8 @@
 	$this->db->query("insert into vtiger_parenttabrel values (2,4,3)");
 	$this->db->query("insert into vtiger_parenttabrel values (2,10,4)");
 	$this->db->query("insert into vtiger_parenttabrel values (4,10,7)");
+	$this->db->query("insert into vtiger_parenttabrel values (2,7,5)");
+	$this->db->query("insert into vtiger_parenttabrel values (4,9,6)");
 
 	//Added to populate the default inventory tax informations
 	$this->db->query("insert into vtiger_inventorytaxinfo values(".$this->db->getUniqueID("inventorytaxinfo").",'VAT','4.5')");




From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 05:30:19 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 09:30:19 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23945=3A_?=
 =?utf-8?q?Marketing_-_Acccounts_link_may_not_require?=
In-Reply-To: <076.b7fed829ea74af680063f59f27e9abdb@vtiger.fosslabs.com>
References: <076.b7fed829ea74af680063f59f27e9abdb@vtiger.fosslabs.com>
Message-ID: <085.c7986b6ed46c749971e3f9c3aa838b4a@vtiger.fosslabs.com>

#945: Marketing - Acccounts link may not require
--------------------------+-------------------------------------------------
  Reporter:  gopal        |       Owner:  jerrydgeorge
      Type:  enhancement  |      Status:  closed      
  Priority:  major        |   Milestone:  5.0.0       
 Component:  vtigercrm    |     Version:  5.0.0       
Resolution:  fixed        |    Keywords:              
--------------------------+-------------------------------------------------
Changes (by jerrydgeorge):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/945>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 05:31:42 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 09:31:42 -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.183e79324282d30b7428b3e26199b44b@vtiger.fosslabs.com>

#285: Usability issue in picklist edit
------------------------+---------------------------------------------------
  Reporter:  don        |       Owner:  minnie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by jerrydgeorge):

  * owner:  jerrydgeorge => minnie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/285>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 05:33:32 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 09:33:32 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=23781=3A_?=
	=?utf-8?q?My_Preferences?=
In-Reply-To: <076.de29f722ccd714a4c6614d03a0a6957f@vtiger.fosslabs.com>
References: <076.de29f722ccd714a4c6614d03a0a6957f@vtiger.fosslabs.com>
Message-ID: <085.2639eeb6a801ae971553e07d08423230@vtiger.fosslabs.com>

#781: My Preferences
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  Richie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by jerrydgeorge):

  * owner:  jerrydgeorge => Richie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/781>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 20 05:43:28 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 20 Jun 2006 09:43:28 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7294 -
	/vtigercrm/trunk/modules/Reports/Reports.php
Message-ID: <20060620094328.90BA983F193@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 20 03:43:24 2006
New Revision: 7294

Log:
security file included

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

Modified: vtigercrm/trunk/modules/Reports/Reports.php
==============================================================================
--- vtigercrm/trunk/modules/Reports/Reports.php (original)
+++ vtigercrm/trunk/modules/Reports/Reports.php Tue Jun 20 03:43:24 2006
@@ -307,6 +307,8 @@
 
 		$tabid = getTabid($module);
 
+		
+		require('user_privileges/user_privileges_'.$current_user->id.'.php');
 		//Security Check 
 		if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] ==0)
 		{




From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 06:26:17 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 10:26:17 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231088=3A?=
 =?utf-8?q?_Issue_in_Custom_view=2C_Reports=2C_Dashboard_Security_Implemen?=
 =?utf-8?q?tation?=
In-Reply-To: <076.80fe4e3b3d04da48f15c540f9a0bd179@vtiger.fosslabs.com>
References: <076.80fe4e3b3d04da48f15c540f9a0bd179@vtiger.fosslabs.com>
Message-ID: <085.1349cf220c8ad49ac1b6ab302d9cbc9c@vtiger.fosslabs.com>

#1088: Issue in Custom view, Reports, Dashboard Security Implementation
------------------------+---------------------------------------------------
  Reporter:  don        |       Owner:  philip  
      Type:  defect     |      Status:  reopened
  Priority:  critical   |   Milestone:          
 Component:  vtigercrm  |     Version:  5.0.0   
Resolution:             |    Keywords:          
------------------------+---------------------------------------------------
Changes (by don):

  * resolution:  fixed =>
  * status:  closed => reopened

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1088>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 06:41:54 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 10:41:54 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231144=3A?=
 =?utf-8?q?_Ajax_Quick_Edit_Fields_Retains_value_in_the_text_box_even_if_w?=
 =?utf-8?q?e_cancel_it=2E?=
In-Reply-To: <076.d0b610be5ddd2e2c4150bff5f9d0ced7@vtiger.fosslabs.com>
References: <076.d0b610be5ddd2e2c4150bff5f9d0ced7@vtiger.fosslabs.com>
Message-ID: <085.a0cb94f1391f98aad4455b432678e853@vtiger.fosslabs.com>

#1144: Ajax Quick Edit Fields Retains value in the text box even if we cancel it.
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  Jeri           
      Type:  defect     |      Status:  closed         
  Priority:  critical   |   Milestone:                 
 Component:  vtigercrm  |     Version:  5.0.0          
Resolution:  fixed      |    Keywords:  Quick Edit Ajax
------------------------+---------------------------------------------------
Changes (by richie):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1144>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 06:42:17 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 10:42:17 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231144=3A?=
 =?utf-8?q?_Ajax_Quick_Edit_Fields_Retains_value_in_the_text_box_even_if_w?=
 =?utf-8?q?e_cancel_it=2E?=
In-Reply-To: <076.d0b610be5ddd2e2c4150bff5f9d0ced7@vtiger.fosslabs.com>
References: <076.d0b610be5ddd2e2c4150bff5f9d0ced7@vtiger.fosslabs.com>
Message-ID: <085.9f3fc34fffd92298d78ec72a1e8dbb26@vtiger.fosslabs.com>

#1144: Ajax Quick Edit Fields Retains value in the text box even if we cancel it.
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  Jeri           
      Type:  defect     |      Status:  reopened       
  Priority:  critical   |   Milestone:                 
 Component:  vtigercrm  |     Version:  5.0.0          
Resolution:             |    Keywords:  Quick Edit Ajax
------------------------+---------------------------------------------------
Changes (by richie):

  * resolution:  fixed =>
  * status:  closed => reopened

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1144>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 07:22:53 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 11:22:53 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231293=3A?=
 =?utf-8?q?_Select_Products_missing_from_Activities_in_5=2E0?=
In-Reply-To: <076.0fa458c2ddcf4a4ee4262524258defbd@vtiger.fosslabs.com>
References: <076.0fa458c2ddcf4a4ee4262524258defbd@vtiger.fosslabs.com>
Message-ID: <085.e52ad900d1379daf681bded178d0e1e5@vtiger.fosslabs.com>

#1293: Select Products missing from Activities in 5.0
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  minnie
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  wontfix    |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mangai):

  * resolution:  => wontfix
  * status:  new => closed

Comment:

 If we relate a product with an activity, then the activity is specific to
 that product.
 So this relation will not be integrated.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1293>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 08:27:27 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 12:27:27 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23223=3A_?=
 =?utf-8?q?Issue_Entering_ticker_symbol?=
In-Reply-To: <076.77f0327f73033d13477d5b03eb082e2c@vtiger.fosslabs.com>
References: <076.77f0327f73033d13477d5b03eb082e2c@vtiger.fosslabs.com>
Message-ID: <085.6705236b56d375f88520683d747a2ccd@vtiger.fosslabs.com>

#223: Issue Entering ticker symbol
---------------------------+------------------------------------------------
  Reporter:  jerrydgeorge  |       Owner:  mangai       
      Type:  enhancement   |      Status:  new          
  Priority:  major         |   Milestone:               
 Component:  vtigercrm     |     Version:  5.0.0        
Resolution:                |    Keywords:  ticker symbol
---------------------------+------------------------------------------------
Changes (by mangai):

  * type:  defect => enhancement

Comment:

 This will be handled in proxy server settings.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/223>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 20 08:32:48 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 20 Jun 2006 12:32:48 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7295 -
 /vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
Message-ID: <20060620123248.54FF583F058@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 20 06:32:30 2006
New Revision: 7295

Log:
added proper default roles

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

Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original)
+++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Tue Jun 20 06:32:30 2006
@@ -31,6 +31,8 @@
 		$role1_id = $this->db->getUniqueID("role");
 		$role2_id = $this->db->getUniqueID("role");
 		$role3_id = $this->db->getUniqueID("role");
+		$role4_id = $this->db->getUniqueID("role");
+		$role5_id = $this->db->getUniqueID("role");
 
 		$profile1_id = $this->db->getUniqueID("profile");
 		$profile2_id = $this->db->getUniqueID("profile");
@@ -38,8 +40,10 @@
 		$profile4_id = $this->db->getUniqueID("profile");
 
                 $this->db->query("insert into vtiger_role values('H".$role1_id."','Organisation','H".$role1_id."',0)");
-                $this->db->query("insert into vtiger_role values('H".$role2_id."','administrator','H".$role1_id."::H".$role2_id."',1)");
-                $this->db->query("insert into vtiger_role values('H".$role3_id."','standard_user','H".$role1_id."::H".$role2_id."::H".$role3_id."',2)");
+                $this->db->query("insert into vtiger_role values('H".$role2_id."','CEO','H".$role1_id."::H".$role2_id."',1)");
+                $this->db->query("insert into vtiger_role values('H".$role3_id."','Vice President','H".$role1_id."::H".$role2_id."::H".$role3_id."',2)");
+                $this->db->query("insert into vtiger_role values('H".$role4_id."','Sales Manager','H".$role1_id."::H".$role2_id."::H".$role3_id."::H".$role4_id."',3)");
+                $this->db->query("insert into vtiger_role values('H".$role5_id."','Sales Man','H".$role1_id."::H".$role2_id."::H".$role3_id."::H".$role4_id."::H".$role5_id."',4)");
                 
 
  $this->db->query("INSERT INTO vtiger_tab VALUES (3,'Home',0,1,'Home',null,null,1)");




From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 08:42:02 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 12:42:02 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231296=3A?=
 =?utf-8?q?_Sort_order_hide_the_related_datas?=
In-Reply-To: <076.89346f6520426628c32e65be31646f8e@vtiger.fosslabs.com>
References: <076.89346f6520426628c32e65be31646f8e@vtiger.fosslabs.com>
Message-ID: <085.360e691bd16ab80dc371bfed9f3d3abb@vtiger.fosslabs.com>

#1296: Sort order hide the related datas
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  philip                      
      Type:  defect     |      Status:  closed                      
  Priority:  critical   |   Milestone:                              
 Component:  vtigercrm  |     Version:  5.0.0                       
Resolution:  fixed      |    Keywords:  related, data, sorder, order
------------------------+---------------------------------------------------
Changes (by saraj):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 (In [7296]) data disappears while sorting - issue fixed. Fixes #1296, and
 refs #1296

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1296>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 20 08:42:03 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 20 Jun 2006 12:42:03 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7296 -
	/vtigercrm/trunk/include/RelatedListView.php
Message-ID: <20060620124203.40F5C83F290@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 20 06:41:55 2006
New Revision: 7296

Log:
data disappears while sorting - issue fixed. Fixes #1296, and refs #1296

Modified:
    vtigercrm/trunk/include/RelatedListView.php

Modified: vtigercrm/trunk/include/RelatedListView.php
==============================================================================
--- vtigercrm/trunk/include/RelatedListView.php (original)
+++ vtigercrm/trunk/include/RelatedListView.php Tue Jun 20 06:41:55 2006
@@ -129,8 +129,8 @@
 	//Retreiving the no of rows
 	$noofrows = $adb->num_rows($list_result);
 	
-	//Storing Listview session object
-	if(isset($_REQUEST['relmodule']) && $_REQUEST['relmodule']!='')
+	//Setting Listview session object while sorting/pagination
+	if(isset($_REQUEST['relmodule']) && $_REQUEST['relmodule']!='' && $_REQUEST['relmodule'] == $relatedmodule)
 	{
 		$relmodule = $_REQUEST['relmodule'];
 		if($_SESSION['rlvs'][$module][$relmodule])




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 20 08:43:17 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 20 Jun 2006 12:43:17 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7297 -
	/vtigercrm/trunk/install/5createTables.inc.php
Message-ID: <20060620124318.19F3C83F293@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 20 06:43:04 2006
New Revision: 7297

Log:
populated valid roles

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 Tue Jun 20 06:43:04 2006
@@ -92,7 +92,7 @@
 	$admin_email ="admin at administrator.com";
         $user->column_fields["email"] = $admin_email;
 	//to get the role id for standard_user	
-	$role_query = "select roleid from vtiger_role where rolename='administrator'";
+	$role_query = "select roleid from vtiger_role where rolename='CEO'";
 	$db->database->SetFetchMode(ADODB_FETCH_ASSOC);
 	$role_result = $db->query($role_query);
 	$role_id = $db->query_result($role_result,0,"roleid");
@@ -134,7 +134,7 @@
 	$std_email ="standarduser at standarduser.com";
         $user->column_fields["email"] = $std_email;
 	//to get the role id for standard_user	
-	$role_query = "select roleid from vtiger_role where rolename='standard_user'";
+	$role_query = "select roleid from vtiger_role where rolename='Vice President'";
 	$db->database->SetFetchMode(ADODB_FETCH_ASSOC);
 	$role_result = $db->query($role_query);
 	$role_id = $db->query_result($role_result,0,"roleid");




From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 08:48:55 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 12:48:55 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231157=3A?=
 =?utf-8?q?_Wrong_display_of_Roles_in_Roles_Home?=
In-Reply-To: <076.0042ce49f00228b56312a0bfc5ea57d9@vtiger.fosslabs.com>
References: <076.0042ce49f00228b56312a0bfc5ea57d9@vtiger.fosslabs.com>
Message-ID: <085.20a7ca8fcf31c0ed620ff43556e56590@vtiger.fosslabs.com>

#1157: Wrong display of Roles in Roles Home
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  don   
      Type:  defect     |      Status:  closed
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by don):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1157>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 20 09:03:00 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 20 Jun 2006 13:03:00 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7298 -
	/vtigercrm/trunk/Popup.php
Message-ID: <20060620130300.C302183F2A0@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 20 07:02:55 2006
New Revision: 7298

Log:
changes made to have multiselect checkbox in users popup

Modified:
    vtigercrm/trunk/Popup.php

Modified: vtigercrm/trunk/Popup.php
==============================================================================
--- vtigercrm/trunk/Popup.php (original)
+++ vtigercrm/trunk/Popup.php Tue Jun 20 07:02:55 2006
@@ -22,10 +22,8 @@
 require_once('include/utils/utils.php');
 
 global $app_strings;
-global $current_language;
 global $currentModule;
 global $theme;
-$current_module_strings = return_module_language($current_language,$currentModule);
 $url_string = '';
 $smarty = new vtigerCRM_Smarty;
 if (!isset($where)) $where = "";
@@ -182,6 +180,7 @@
                 if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] !='')
                     $smarty->assign("RETURN_MODULE",$_REQUEST['return_module']);
                 $alphabetical = AlphabeticalSearch($currentModule,'Popup','user_name','true','basic',$popuptype,"","","");
+		if (isset($_REQUEST['select'])) $smarty->assign("SELECT",'enable');
                 break;	
 
 




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 20 09:08:06 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 20 Jun 2006 13:08:06 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7299 -
 /vtigercrm/trunk/modules/Activities/updateRelations.php
Message-ID: <20060620130806.A9BE883F2A0@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 20 07:08:02 2006
New Revision: 7299

Log:
changes made to have multiselect checkbox in users popup

Modified:
    vtigercrm/trunk/modules/Activities/updateRelations.php

Modified: vtigercrm/trunk/modules/Activities/updateRelations.php
==============================================================================
--- vtigercrm/trunk/modules/Activities/updateRelations.php (original)
+++ vtigercrm/trunk/modules/Activities/updateRelations.php Tue Jun 20 07:08:02 2006
@@ -13,7 +13,7 @@
 global $adb;
 $idlist = $_REQUEST['idlist'];
 
-if(isset($_REQUEST['idlist']) && $_REQUEST['idlist'] != '')
+if(isset($_REQUEST['idlist']) && $_REQUEST['idlist'] != '' && $_REQUEST['destination_module'] == 'Contacts')
 {
 	//split the string and store in an array
 	$storearray = explode (";",$idlist);
@@ -40,14 +40,29 @@
 
 
  
-//This if for adding the vtiger_users 
-if(isset($_REQUEST['user_id']) && $_REQUEST['user_id'] != '')
+//This if for adding the vtiger_users
+if(isset($_REQUEST['idlist']) && $_REQUEST['idlist'] != '' && $_REQUEST['destination_module'] == 'Users')
+{
+	//split the string and store in an array
+	$storearray = explode (";",$idlist);
+	foreach($storearray as $id)
+	{
+		if($id != '')
+		{
+			$record = $_REQUEST['parentid'];
+			$sql = "insert into vtiger_salesmanactivityrel values (".$id.",".$_REQUEST["parentid"].")";
+			$adb->query($sql);
+		}
+	}
+	header("Location: index.php?action=CallRelatedList&module=Activities&activity_mode=Events&record=".$record);
+}
+elseif(isset($_REQUEST['user_id']) && $_REQUEST['user_id'] != '')
 {
 	$record = $_REQUEST['record'];
 	$sql = "insert into vtiger_salesmanactivityrel values (". $_REQUEST["user_id"] .",".$_REQUEST["record"] .")";
 	$adb->query($sql);
 	header("Location: index.php?action=CallRelatedList&module=Activities&activity_mode=Events&record=".$record);
-
+	
 }
 
 




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 20 09:18:57 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 20 Jun 2006 13:18:57 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7300 -
	/vtigercrm/trunk/modules/Activities/Activity.php
Message-ID: <20060620131857.8A31C83F297@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 20 07:18:54 2006
New Revision: 7300

Log:
vtiger_ updended in activity owner query

Modified:
    vtigercrm/trunk/modules/Activities/Activity.php

Modified: vtigercrm/trunk/modules/Activities/Activity.php
==============================================================================
--- vtigercrm/trunk/modules/Activities/Activity.php (original)
+++ vtigercrm/trunk/modules/Activities/Activity.php Tue Jun 20 07:18:54 2006
@@ -154,7 +154,7 @@
 			$returnset = '&return_module=Activities&return_action=DetailView&activity_mode=Events&return_id='.$id;
 
 
-			$query = 'select vtiger_users.user_name,vtiger_contactdetails.accountid, vtiger_contactdetails.contactid, vtiger_contactdetails.firstname,vtiger_contactdetails.lastname, vtiger_contactdetails.department, vtiger_contactdetails.title, vtiger_contactdetails.email, vtiger_contactdetails.phone, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_contactdetails inner join vtiger_seactivityrel on vtiger_seactivityrel.crmid=vtiger_contactdetails.contactid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid left join vtiger_users on vtiger_users.id = vtiger_crmentity.smownerid where vtiger_seactivityrel.activityid='.$id.' and vtiger_crmentity.deleted=0';
+			$query = 'select vtiger_users.user_name,vtiger_contactdetails.accountid,vtiger_contactdetails.contactid, vtiger_contactdetails.firstname,vtiger_contactdetails.lastname, vtiger_contactdetails.department, vtiger_contactdetails.title, vtiger_contactdetails.email, vtiger_contactdetails.phone, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_contactdetails inner join vtiger_seactivityrel on vtiger_seactivityrel.crmid=vtiger_contactdetails.contactid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid left join vtiger_users on vtiger_users.id = vtiger_crmentity.smownerid where vtiger_seactivityrel.activityid='.$id.' and vtiger_crmentity.deleted=0';
 			$log->debug("Exiting get_contacts method ...");
 			return GetRelatedList('Activities','Contacts',$focus,$query,$button,$returnset);
         }
@@ -236,7 +236,7 @@
 				$activity_start_time=time_to_number($act_time_start);	
 				$activity_end_time=get_duration($act_time_start,$act_hour_dur,$act_mins_dur);	
 
-				$activity_owner_qry='select vtiger_users.user_name,vtiger_users.id AS userid from vtiger_users,crmentity where vtiger_users.id=vtiger_crmentity.smownerid and vtiger_crmentity.crmid='.$id;
+				$activity_owner_qry='select vtiger_users.user_name,vtiger_users.id AS userid from vtiger_users,vtiger_crmentity where vtiger_users.id=vtiger_crmentity.smownerid and vtiger_crmentity.crmid='.$id;
 				$result_owner=$adb->query($activity_owner_qry);
 
 				while($row_owner = $adb->fetch_array($result_owner))




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 20 09:53:55 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 20 Jun 2006 13:53:55 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7301 -
 /vtigercrm/trunk/Smarty/templates/RelatedListContents.tpl
Message-ID: <20060620135355.6C98883F2AC@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 20 07:53:51 2006
New Revision: 7301

Log:
related list buttons moved to RelatedListContents.tpl as it is creating problem while ajaxedit

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

Modified: vtigercrm/trunk/Smarty/templates/RelatedListContents.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/RelatedListContents.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/RelatedListContents.tpl Tue Jun 20 07:53:51 2006
@@ -12,6 +12,91 @@
 
 -->*}
 {foreach key=header item=detail from=$RELATEDLISTS}
+<table border=0 cellspacing=0 cellpadding=0 width=100% class="small" style="border-bottom:1px solid #999999;padding:5px;">
+        <tr>
+                <td  valign=bottom><b>{$APP.$header}</b></td>
+                {if $detail ne ''}
+                <td align=center>{$detail.navigation.0}</td>
+                {$detail.navigation.1}
+                {/if}
+                <td align=right>
+			{if $header eq 'Potentials'}
+                                <input title="{$APP.LBL_ADD_NEW} {$APP.Potential}" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='Potentials'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Potential}">
+                </td>
+                        {elseif $header eq 'PriceBooks'}
+                                {if $MODULE eq 'Products'}
+                                <input title="{$APP.LBL_ADD_TO} {$APP.PriceBook}" accessKey="" class="small" value="{$APP.LBL_ADD_TO} {$APP.PriceBook}" LANGUAGE=javascript onclick="this.form.action.value='AddProductToPriceBooks';this.form.module.value='Products'"  type="submit" name="button">
+                                {/if}
+                        {elseif $header eq 'Products'}
+                                {if $MODULE eq 'PriceBooks'}
+                                <input title="{$APP.LBL_SELECT_PRODUCT_BUTTON_LABEL}" accessKey="" class="small" value="{$APP.LBL_SELECT_PRODUCT_BUTTON_LABEL}" LANGUAGE=javascript onclick="this.form.action.value='AddProductsToPriceBook';this.form.module.value='Products';this.form.return_module.value='Products';this.form.return_action.value='PriceBookDetailView'"  type="submit" name="button"></td>
+                                {else}
+				<input title="{$APP.LBL_ADD_NEW} {$APP.Product}" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='Products';this.form.return_module.value='{$MODULE}';this.form.return_action.value='CallRelatedList'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Product}"></td>
+				{/if}
+			{elseif $header eq 'Leads'}
+				{if $MODULE eq 'Campaigns'}
+				<input title="Change" accessKey="" class="small" value="{$APP.LBL_SELECT_BUTTON_LABEL} {$APP.Lead}" LANGUAGE=javascript onclick='return window.open("index.php?module=Leads&return_module={$MODULE}&action=Popup&popuptype=detailview&select=enable&form=EditView&form_submit=false&recordid={$ID}","test","width=640,height=570,resizable=0,scrollbars=0");' type="button"  name="button">
+				{/if}
+				<input title="{$APP.LBL_ADD_NEW} {$APP.Lead}" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='Leads'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Lead}"></td>
+			{elseif $header eq 'Contacts' }
+				{if $MODULE eq 'Activities' || $MODULE eq 'Potentials' || $MODULE eq 'Vendors'}
+				<input title="Change" accessKey="" class="small" value="{$APP.LBL_SELECT_BUTTON_LABEL} {$APP.Contact}" LANGUAGE=javascript onclick='return window.open("index.php?module=Contacts&return_module={$MODULE}&action=Popup&popuptype=detailview&select=enable&form=EditView&form_submit=false&recordid={$ID}","test","width=640,height=570,resizable=0,scrollbars=0");' type="button"  name="button"></td>
+				{elseif $MODULE eq 'Emails'}
+				<input title="{$APP.LBL_BULK_MAILS}" accessykey="F" class="small" onclick="this.form.action.value='sendmail';this.form.return_action.value='DetailView';this.form.module.value='Emails';this.form.return_module.value='Emails';" name="button" value="{$APP.LBL_BULK_MAILS}" type="submit">&nbsp;
+				<input title="Change" accessKey="" class="small" value="{$APP.LBL_SELECT_BUTTON_LABEL} {$APP.Contact}" LANGUAGE=javascript onclick='return window.open("index.php?module=Contacts&return_module=Emails&action=Popup&popuptype=detailview&form=EditView&form_submit=false&recordid={$ID}","test","width=640,height=570,resizable=0,scrollbars=0");' type="button"  name="button"></td>
+				{elseif $MODULE eq 'Campaigns'}
+				<input title="Change" accessKey="" class="small" value="{$APP.LBL_SELECT_BUTTON_LABEL} {$APP.Contact}" LANGUAGE=javascript onclick='return window.open("index.php?module=Contacts&return_module={$MODULE}&action=Popup&popuptype=detailview&select=enable&form=EditView&form_submit=false&recordid={$ID}","test","width=640,height=570,resizable=0,scrollbars=0");' type="button"  name="button">
+				<input title="{$APP.LBL_ADD_NEW} {$APP.Contact}" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='Contacts'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Contact}"></td>
+				{else}
+				<input title="{$APP.LBL_ADD_NEW} {$APP.Contact}" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='Contacts'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Contact}"></td>
+				{/if}
+			{elseif $header eq 'Activities'}
+				{if $MODULE eq 'PurchaseOrder' || $MODULE eq 'Invoice' || $MODULE eq 'SalesOrder' || $MODULE eq 'Quotes' || $MODULE eq 'Campaigns'}
+				<input type="hidden" name="activity_mode">
+				<input title="{$APP.LBL_ADD_NEW} {$APP.Task}" accessyKey="F" class="small" onclick="this.form.action.value='EditView'; this.form.return_action.value='CallRelatedList'; this.form.module.value='Activities'; this.form.return_module.value='{$MODULE}'; this.form.activity_mode.value='Task'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Task}"></td>
+				{else}
+				<input type="hidden" name="activity_mode">
+				<input title="{$APP.LBL_ADD_NEW} {$APP.Task}" accessyKey="F" class="small" onclick="this.form.action.value='EditView'; this.form.return_action.value='CallRelatedList'; this.form.module.value='Activities'; this.form.return_module.value='{$MODULE}'; this.form.activity_mode.value='Task'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Task}">&nbsp;
+				<input title="{$APP.LBL_ADD_NEW} {$APP.Event}" accessyKey="F" class="small" onclick="this.form.action.value='EditView'; this.form.return_action.value='CallRelatedList'; this.form.module.value='Activities'; this.form.return_module.value='{$MODULE}'; this.form.activity_mode.value='Events'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Event}"></td>
+				{/if}
+			{elseif $header eq 'HelpDesk'}
+				<input title="{$APP.LBL_ADD_NEW} {$APP.Ticket}" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='HelpDesk'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Ticket}"></td>
+			{elseif $header eq 'Attachments'}
+				<input title="{$APP.LBL_ADD_NEW} {$APP.Note}" accessyKey="F" class="small" onclick="this.form.action.value='EditView'; this.form.return_action.value='CallRelatedList'; this.form.module.value='Notes'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Note}">&nbsp;
+				<input type="hidden" name="fileid">
+				<input title="{$APP.LBL_ADD_NEW} {$APP.LBL_ATTACHMENT}" accessyKey="F" class="small" onclick="OpenWindow('index.php?module=uploads&action=uploadsAjax&file=upload&return_action=CallRelatedList&return_module={$MODULE}&return_id={$id}');" type="button" name="button" value="{$APP.LBL_ADD_NEW} {$APP.LBL_ATTACHMENT}"></td>
+			{elseif $header eq 'Quotes'}
+				<input title="{$APP.LBL_ADD_NEW} {$APP.Quote}" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='Quotes'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Quote}"></td>
+			{elseif $header eq 'Invoice'}
+				{if $MODULE eq 'SalesOrder'}
+				<input type="hidden">
+				{else}
+				<input title="{$APP.LBL_ADD_NEW} {$APP.Invoice}" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='Invoice'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Invoice}"></td>
+				{/if}
+			{elseif $header eq 'Sales Order'}
+				{if $MODULE eq 'Quotes'}
+				<input type="hidden">
+				{else}
+				<input title="{$APP.LBL_ADD_NEW} {$APP.SalesOrder}" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='SalesOrder'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.SalesOrder}"></td>
+				{/if}
+			{elseif $header eq 'Purchase Order'}
+                                <input title="{$APP.LBL_ADD_NEW} {$APP.PurchaseOrder}" accessyKey="O" class="small" onclick="this.form.action.value='EditView'; this.form.module.value='PurchaseOrder'; this.form.return_module.value='{$MODULE}'; this.form.return_action.value='CallRelatedList'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.PurchaseOrder}"></td>
+                        {elseif $header eq 'Emails'}
+                                <input type="hidden" name="email_directing_module">
+                                <input type="hidden" name="record">
+                                <input title="{$APP.LBL_ADD_NEW} {$APP.Email}" accessyKey="F" class="small" onclick="fnvshobj(this,'sendmail_cont');sendmail('{$MODULE}',{$id});" type="button" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Email}"></td>
+			{elseif $header eq 'Users'}
+                                {if $MODULE eq 'Activities'}
+                                <input title="Change" accessKey="" tabindex="2" type="button" class="small" value="{$APP.LBL_SELECT_USER_BUTTON_LABEL}" name="button" LANGUAGE=javascript onclick='return window.open("index.php?module=Users&return_module=Activities&return_action=CallRelatedList&activity_mode=Events&action=Popup&popuptype=detailview&form=EditView&form_submit=true&select=enable&return_id={$id}&recordid={$ID}","test","width=640,height=525,resizable=0,scrollbars=0")';>
+                                {elseif $MODULE eq 'Emails'}
+                                <input title="{$APP.LBL_BULK_MAILS}" accessykey="F" class="small" onclick="this.form.action.value='sendmail';this.form.return_action.value='DetailView';this.form.module.value='Emails';this.form.return_module.value='Emails';" name="button" value="{$APP.LBL_BULK_MAILS}" type="submit">&nbsp;
+                                <input title="Change" accesskey="" tabindex="2" class="small" value="{$APP.LBL_SELECT_USER_BUTTON_LABEL}" name="Button" language="javascript" onclick='return window.open("index.php?module=Users&return_module=Emails&action=Popup&popuptype=detailview&select=enable&form=EditView&form_submit=true&return_id={$id}&recordid={$ID}","test","width=640,height=520,resizable=0,scrollbars=0");' type="button">&nbsp;</td>
+                                {/if}
+                        {elseif $header eq 'Activity History'}
+                                &nbsp;</td>
+                        {/if}
+        </tr>
+</table>
 {if $detail ne ''}
 	{foreach key=header item=detail from=$detail}
 		{if $header eq 'header'}
@@ -39,4 +124,5 @@
 		</tr>
 	</table>
 {/if}
+<br><br>
 {/foreach}




From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 09:58:34 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 13:58:34 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231080=3A?=
 =?utf-8?q?_Validation_to_be_done_for_installation_process?=
In-Reply-To: <076.3dd5e04163cef1f4be9c24ebc8011fad@vtiger.fosslabs.com>
References: <076.3dd5e04163cef1f4be9c24ebc8011fad@vtiger.fosslabs.com>
Message-ID: <085.115783aea885d9ed0df4d7de94d3f4a9@vtiger.fosslabs.com>

#1080: Validation to be done for installation process
---------------------------+------------------------------------------------
  Reporter:  jerrydgeorge  |       Owner:  Jerry 
      Type:  defect        |      Status:  closed
  Priority:  major         |   Milestone:        
 Component:  vtigercrm     |     Version:  5.0.0 
Resolution:  wontfix       |    Keywords:        
---------------------------+------------------------------------------------
Changes (by anonymous):

  * resolution:  => wontfix
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1080>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 20 10:05:34 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 20 Jun 2006 14:05:34 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7302 -
	/vtigercrm/trunk/Smarty/templates/RelatedLists.tpl
Message-ID: <20060620140534.523EA83F2B5@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 20 08:05:30 2006
New Revision: 7302

Log:
related list buttons moved to RelatedListContents.tpl as it is creating problem while ajaxedit

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

Modified: vtigercrm/trunk/Smarty/templates/RelatedLists.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/RelatedLists.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/RelatedLists.tpl Tue Jun 20 08:05:30 2006
@@ -61,175 +61,67 @@
 		<div class="small" style="padding:20px">
 		
 		
-		 <span class="lvtHeaderText"><font color="purple">[ {$ID} ] </font>{$NAME} -  {$SINGLE_MOD} {$APP.LBL_MORE} {$APP.LBL_INFORMATION}</span> <br>
-		 {$UPDATEINFO}
-		 <hr noshade size=1>
-		 <br> 
+			 <span class="lvtHeaderText"><font color="purple">[ {$ID} ] </font>{$NAME} -  {$SINGLE_MOD} {$APP.LBL_MORE} {$APP.LBL_INFORMATION}</span> <br>
+			 {$UPDATEINFO}
+			 <hr noshade size=1>
+			 <br> 
 		
-		<!-- Account details tabs -->
-		<table border=0 cellspacing=0 cellpadding=0 width=95% align=center>
-		<tr>
-			<td>
-				<table border=0 cellspacing=0 cellpadding=3 width=100% class="small">
-				<tr>
-					{if $OP_MODE eq 'edit_view'}
-                                                {assign var="action" value="EditView"}
-                                        {else}
-                                                {assign var="action" value="DetailView"}
-                                        {/if}
-					<td class="dvtTabCache" style="width:10px" nowrap>&nbsp;</td>
-					{if $MODULE eq 'Activities'}
-                                                <td class="dvtUnSelectedCell" align=center nowrap><a href="index.php?action={$action}&module={$MODULE}&record={$ID}&activity_mode={$ACTIVITY_MODE}&parenttab={$CATEGORY}">{$SINGLE_MOD} {$APP.LBL_INFORMATION}</a></td>
-                                        {else}
-                                        <td class="dvtUnSelectedCell" align=center nowrap><a href="index.php?action={$action}&module={$MODULE}&record={$ID}&parenttab={$CATEGORY}">{$SINGLE_MOD} {$APP.LBL_INFORMATION}</a></td>
-                                        {/if}
-					<td class="dvtTabCache" style="width:10px">&nbsp;</td>
-					<td class="dvtSelectedCell" align=center nowrap>{$APP.LBL_MORE} {$APP.LBL_INFORMATION}</td>
-					<td class="dvtTabCache" style="width:100%">&nbsp;</td>
-				</tr>
-				</table>
-			</td>
-		</tr>
-		<tr>
-			<td valign=top align=left >
-                           <table border=0 cellspacing=0 cellpadding=3 width=100% class="dvtContentSpace">
-				<tr>
-
-					<td align=left>
-					<!-- content cache -->
-					
-					<table border=0 cellspacing=0 cellpadding=0 width=100%>
-			                <tr>
-					<td style="padding:10px">
-					   <!-- General details -->
-				        <table border=0 cellspacing=0 cellpadding=0 width=100%>
-
-					{include file='RelatedListsHidden.tpl'}
-
-					  {foreach key=header item=detail from=$RELATEDLISTS}
-						<table border=0 cellspacing=0 cellpadding=0 width=100% class="small" style="border-bottom:1px solid #999999;padding:5px;">
-							<tr>
-							<td  valign=bottom><b>{$APP.$header}</b></td>
-							{if $detail ne ''}
-							<td align=center>{$detail.navigation.0}</td>
-							{$detail.navigation.1}
-							{/if}
-							<td align=right>
-							{if $header eq 'Potentials'}
-						
-							<input title="{$APP.LBL_ADD_NEW} {$APP.Potential}" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='Potentials'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Potential}"></td>
-							{elseif $header eq 'PriceBooks'}
-							{if $MODULE eq 'Products'}
-							<input title="{$APP.LBL_ADD_TO} {$APP.PriceBook}" accessKey="" class="small" value="{$APP.LBL_ADD_TO} {$APP.PriceBook}" LANGUAGE=javascript onclick="this.form.action.value='AddProductToPriceBooks';this.form.module.value='Products'"  type="submit" name="button">
-							{/if}
-							
-							{elseif $header eq 'Products'}
-							{if $MODULE eq 'PriceBooks'}
-							<input title="{$APP.LBL_SELECT_PRODUCT_BUTTON_LABEL}" accessKey="" class="small" value="{$APP.LBL_SELECT_PRODUCT_BUTTON_LABEL}" LANGUAGE=javascript onclick="this.form.action.value='AddProductsToPriceBook';this.form.module.value='Products';this.form.return_module.value='Products';this.form.return_action.value='PriceBookDetailView'"  type="submit" name="button"></td>
-
-							{else}
-							<input title="{$APP.LBL_ADD_NEW} {$APP.Product}" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='Products';this.form.return_module.value='{$MODULE}';this.form.return_action.value='CallRelatedList'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Product}"></td>				
-							{/if}	
-							{elseif $header eq 'Leads'}
-							{if $MODULE eq 'Campaigns'}
-                                                        <input title="Change" accessKey="" class="small" value="{$APP.LBL_SELECT_BUTTON_LABEL} {$APP.Lead}" LANGUAGE=javascript onclick='return window.open("index.php?module=Leads&return_module={$MODULE}&action=Popup&popuptype=detailview&select=enable&form=EditView&form_submit=false&recordid={$ID}","test","width=640,height=570,resizable=0,scrollbars=0");' type="button"  name="button">
-                                                        {/if}
-                                                        <input title="{$APP.LBL_ADD_NEW} {$APP.Lead}" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='Leads'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Lead}"></td>
-							{elseif $header eq 'Contacts' }
-							{if $MODULE eq 'Activities' || $MODULE eq 'Potentials' || $MODULE eq 'Vendors'}
-                                                        <input title="Change" accessKey="" class="small" value="{$APP.LBL_SELECT_BUTTON_LABEL} {$APP.Contact}" LANGUAGE=javascript onclick='return window.open("index.php?module=Contacts&return_module={$MODULE}&action=Popup&popuptype=detailview&select=enable&form=EditView&form_submit=false&recordid={$ID}","test","width=640,height=570,resizable=0,scrollbars=0");' type="button"  name="button"></td>
-							{elseif $MODULE eq 'Emails'}
-							<input title="{$APP.LBL_BULK_MAILS}" accessykey="F" class="small" onclick="this.form.action.value='sendmail';this.form.return_action.value='DetailView';this.form.module.value='Emails';this.form.return_module.value='Emails';" name="button" value="{$APP.LBL_BULK_MAILS}" type="submit">&nbsp;
-                                                        <input title="Change" accessKey="" class="small" value="{$APP.LBL_SELECT_BUTTON_LABEL} {$APP.Contact}" LANGUAGE=javascript onclick='return window.open("index.php?module=Contacts&return_module=Emails&action=Popup&popuptype=detailview&form=EditView&form_submit=false&recordid={$ID}","test","width=640,height=570,resizable=0,scrollbars=0");' type="button"  name="button"></td>
-							{elseif $MODULE eq 'Campaigns'}
-                                                        <input title="Change" accessKey="" class="small" value="{$APP.LBL_SELECT_BUTTON_LABEL} {$APP.Contact}" LANGUAGE=javascript onclick='return window.open("index.php?module=Contacts&return_module={$MODULE}&action=Popup&popuptype=detailview&select=enable&form=EditView&form_submit=false&recordid={$ID}","test","width=640,height=570,resizable=0,scrollbars=0");' type="button"  name="button">
-                                                        <input title="{$APP.LBL_ADD_NEW} {$APP.Contact}" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='Contacts'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Contact}"></td>
-							{else}
-                                                        <input title="{$APP.LBL_ADD_NEW} {$APP.Contact}" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='Contacts'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Contact}"></td>
-                                                        {/if}
-
-							{elseif $header eq 'Activities'}
-							{if $MODULE eq 'PurchaseOrder' || $MODULE eq 'Invoice' || $MODULE eq 'SalesOrder' || $MODULE eq 'Quotes' || $MODULE eq 'Campaigns'}	
-							<input type="hidden" name="activity_mode">
-							<input title="{$APP.LBL_ADD_NEW} {$APP.Task}" accessyKey="F" class="small" onclick="this.form.action.value='EditView'; this.form.return_action.value='CallRelatedList'; this.form.module.value='Activities'; this.form.return_module.value='{$MODULE}'; this.form.activity_mode.value='Task'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Task}"></td>
-							{else}
-							<input type="hidden" name="activity_mode">
-							<input title="{$APP.LBL_ADD_NEW} {$APP.Task}" accessyKey="F" class="small" onclick="this.form.action.value='EditView'; this.form.return_action.value='CallRelatedList'; this.form.module.value='Activities'; this.form.return_module.value='{$MODULE}'; this.form.activity_mode.value='Task'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Task}">&nbsp;
-							<input title="{$APP.LBL_ADD_NEW} {$APP.Event}" accessyKey="F" class="small" onclick="this.form.action.value='EditView'; this.form.return_action.value='CallRelatedList'; this.form.module.value='Activities'; this.form.return_module.value='{$MODULE}'; this.form.activity_mode.value='Events'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Event}"></td>
-							{/if}
-							{elseif $header eq 'HelpDesk'}
-							<input title="{$APP.LBL_ADD_NEW} {$APP.Ticket}" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='HelpDesk'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Ticket}"></td>
-							{elseif $header eq 'Attachments'}
-							<input title="{$APP.LBL_ADD_NEW} {$APP.Note}" accessyKey="F" class="small" onclick="this.form.action.value='EditView'; this.form.return_action.value='CallRelatedList'; this.form.module.value='Notes'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Note}">&nbsp;
-							<input type="hidden" name="fileid">
-							<input title="{$APP.LBL_ADD_NEW} {$APP.LBL_ATTACHMENT}" accessyKey="F" class="small" onclick="OpenWindow('index.php?module=uploads&action=uploadsAjax&file=upload&return_action=CallRelatedList&return_module={$MODULE}&return_id={$id}');" type="button" name="button" value="{$APP.LBL_ADD_NEW} {$APP.LBL_ATTACHMENT}"></td>
-							{elseif $header eq 'Quotes'}
-							<input title="{$APP.LBL_ADD_NEW} {$APP.Quote}" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='Quotes'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Quote}"></td>
-							
-							{elseif $header eq 'Invoice'}
-							{if $MODULE eq 'SalesOrder'}
-							<input type="hidden">
-							{else}
-							<input title="{$APP.LBL_ADD_NEW} {$APP.Invoice}" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='Invoice'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Invoice}"></td>
-							{/if}
-
-							{elseif $header eq 'Sales Order'}
-							{if $MODULE eq 'Quotes'}
-							<input type="hidden">
-							{else}
-							<input title="{$APP.LBL_ADD_NEW} {$APP.SalesOrder}" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='SalesOrder'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.SalesOrder}"></td>
-							{/if}
-
-							{elseif $header eq 'Purchase Order'}
-							<input title="{$APP.LBL_ADD_NEW} {$APP.PurchaseOrder}" accessyKey="O" class="small" onclick="this.form.action.value='EditView'; this.form.module.value='PurchaseOrder'; this.form.return_module.value='{$MODULE}'; this.form.return_action.value='CallRelatedList'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.PurchaseOrder}"></td>
-							
-							{elseif $header eq 'Emails'}
-							<input type="hidden" name="email_directing_module">
-							<input type="hidden" name="record">
-							<input title="{$APP.LBL_ADD_NEW} {$APP.Email}" accessyKey="F" class="small" onclick="fnvshobj(this,'sendmail_cont');sendmail('{$MODULE}',{$id});" type="button" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Email}"></td>
-							{elseif $header eq 'Users'}
-                                                                {if $MODULE eq 'Activities'}
-                                                                <input title="Change" accessKey="" tabindex="2" type="button" class="small" value="{$APP.LBL_SELECT_USER_BUTTON_LABEL}" name="button" LANGUAGE=javascript onclick='return window.open("index.php?module=Users&return_module=Activities&return_action=CallRelatedList&activity_mode=Events&action=Popup&popuptype=detailview&form=EditView&form_submit=true&return_id={$id}&recordid={$ID}","test","width=640,height=525,resizable=0,scrollbars=0")';>
-								{elseif $MODULE	eq 'Emails'}
-								<input title="{$APP.LBL_BULK_MAILS}" accessykey="F" class="small" onclick="this.form.action.value='sendmail';this.form.return_action.value='DetailView';this.form.module.value='Emails';this.form.return_module.value='Emails';" name="button" value="{$APP.LBL_BULK_MAILS}" type="submit">&nbsp;
-								<input title="Change" accesskey="" tabindex="2" class="small" value="{$APP.LBL_SELECT_USER_BUTTON_LABEL}" name="Button" language="javascript" onclick='return window.open("index.php?module=Users&return_module=Emails&action=Popup&popuptype=detailview&form=EditView&form_submit=true&return_id={$id}&recordid={$ID}","test","width=640,height=520,resizable=0,scrollbars=0");' type="button">&nbsp;</td>
-                                                                {/if}
-							{elseif $header eq 'Activity History'}
-                                                        &nbsp;</td>
-
-							{/if}
-							</tr>
-						</table>	
-						<div id="RLContents">
-                                                        {include file='RelatedListContents.tpl'}
-                                                </div>
-						<br><br>
-					{/foreach}
-						</form>
-				</table>			
-                    {*-- End of Blocks--*} 
-			</td>
-                </tr>
-		</table>
-		</td>
-				</tr>
-				</table>
-				
-			</td>
-		</tr>
-		</table>
-		
-			
-			
-		
+			<!-- Account details tabs -->
+			<table border=0 cellspacing=0 cellpadding=0 width=95% align=center>
+			<tr>
+				<td>
+					<table border=0 cellspacing=0 cellpadding=3 width=100% class="small">
+						<tr>
+							{if $OP_MODE eq 'edit_view'}
+		                                                {assign var="action" value="EditView"}
+                		                        {else}
+                                		                {assign var="action" value="DetailView"}
+		                                        {/if}
+							<td class="dvtTabCache" style="width:10px" nowrap>&nbsp;</td>
+							{if $MODULE eq 'Activities'}
+                                                	<td class="dvtUnSelectedCell" align=center nowrap><a href="index.php?action={$action}&module={$MODULE}&record={$ID}&activity_mode={$ACTIVITY_MODE}&parenttab={$CATEGORY}">{$SINGLE_MOD} {$APP.LBL_INFORMATION}</a></td>
+		                                        {else}
+                		                        <td class="dvtUnSelectedCell" align=center nowrap><a href="index.php?action={$action}&module={$MODULE}&record={$ID}&parenttab={$CATEGORY}">{$SINGLE_MOD} {$APP.LBL_INFORMATION}</a></td>
+                                		        {/if}
+							<td class="dvtTabCache" style="width:10px">&nbsp;</td>
+							<td class="dvtSelectedCell" align=center nowrap>{$APP.LBL_MORE} {$APP.LBL_INFORMATION}</td>
+							<td class="dvtTabCache" style="width:100%">&nbsp;</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+			<tr>
+				<td valign=top align=left >
+		                	<table border=0 cellspacing=0 cellpadding=3 width=100% class="dvtContentSpace">
+						<tr>
+							<td align=left>
+							<!-- content cache -->
+								<table border=0 cellspacing=0 cellpadding=0 width=100%>
+									<tr>
+										<td style="padding:10px">
+										   <!-- General details -->
+												{include file='RelatedListsHidden.tpl'}
+												<div id="RLContents">
+					                                                        {include file='RelatedListContents.tpl'}
+                                        						        </div>
+												</form>
+										  {*-- End of Blocks--*} 
+										</td>
+									</tr>
+								</table>
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+			</table>
 		</div>
-		<!-- PUBLIC CONTENTS STOPS-->
+	<!-- PUBLIC CONTENTS STOPS-->
 	</td>
 	<td align=right valign=top><img src="themes/blue/images/showPanelTopRight.gif"></td>
 </tr>
 </table>
 
-</td></tr></table>
 {if $MODULE eq 'Leads' or $MODULE eq 'Contacts' or $MODULE eq 'Accounts'}
 <div id="sendmail_cont" style="z-index:100001;position:absolute;width:310px;"></div>
 {/if}




From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 10:08:33 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 14:08:33 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231070=3A?=
	=?utf-8?q?_Quote_PDF_Output?=
In-Reply-To: <076.38772bdb8ba951744608d634ceddc572@vtiger.fosslabs.com>
References: <076.38772bdb8ba951744608d634ceddc572@vtiger.fosslabs.com>
Message-ID: <085.6cf140cb11256efeb74f9d71151bfd5f@vtiger.fosslabs.com>

#1070: Quote PDF Output
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  mickie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.1 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mickie):

  * version:  5.0.0 => 5.0.1

Comment:

 we should discuss about this and then take it in our future release.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1070>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 10:09:54 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 14:09:54 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231114=3A?=
 =?utf-8?q?_tax_split_up_shows_only_upon_clicking_on_button?=
In-Reply-To: <076.e0fc7e9f8cb228797d775f33694000ad@vtiger.fosslabs.com>
References: <076.e0fc7e9f8cb228797d775f33694000ad@vtiger.fosslabs.com>
Message-ID: <085.12c761aae3f73667b203bdc41979ac58@vtiger.fosslabs.com>

#1114: tax split up shows only upon clicking on button
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  mickie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.1 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mickie):

  * version:  5.0.0 => 5.0.1

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1114>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 10:11:05 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 14:11:05 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231139=3A?=
 =?utf-8?q?_could_be_made_more_usable2?=
In-Reply-To: <076.1772ef737aedfed24ad81cc9ac0c4e0f@vtiger.fosslabs.com>
References: <076.1772ef737aedfed24ad81cc9ac0c4e0f@vtiger.fosslabs.com>
Message-ID: <085.b428227030bc67a4c81191dcc08f73a3@vtiger.fosslabs.com>

#1139: could be made more usable2
--------------------------+-------------------------------------------------
  Reporter:  richie       |       Owner:  mickie
      Type:  enhancement  |      Status:  new   
  Priority:  major        |   Milestone:        
 Component:  vtigercrm    |     Version:  5.0.1 
Resolution:               |    Keywords:        
--------------------------+-------------------------------------------------
Changes (by mickie):

  * version:  5.0.0 => 5.0.1
  * type:  defect => enhancement

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1139>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 20 10:11:46 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 20 Jun 2006 14:11:46 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7304 -
 /vtigercrm/trunk/modules/Activities/RenderRelatedListUI.php
Message-ID: <20060620141146.26E7183F2C4@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 20 08:11:42 2006
New Revision: 7304

Log:
vtiger_ updated in the query

Modified:
    vtigercrm/trunk/modules/Activities/RenderRelatedListUI.php

Modified: vtigercrm/trunk/modules/Activities/RenderRelatedListUI.php
==============================================================================
--- vtigercrm/trunk/modules/Activities/RenderRelatedListUI.php (original)
+++ vtigercrm/trunk/modules/Activities/RenderRelatedListUI.php Tue Jun 20 08:11:42 2006
@@ -64,11 +64,11 @@
 		if( $owner != $userid)
 		{
 			
-			$usr_query="select activityid,vtiger_activity.date_start,vtiger_activity.due_date, vtiger_activity.time_start,vtiger_activity.duration_hours,vtiger_activity.duration_minutes,vtiger_crmentity.smownerid from vtiger_activity,crmentity where vtiger_crmentity.crmid=vtiger_activity.activityid and ('".$avail_date."' like date_start) and vtiger_crmentity.smownerid=".$userid." and vtiger_activity.activityid !=".$activity_id."  and vtiger_crmentity.deleted=0";
+			$usr_query="select activityid,vtiger_activity.date_start,vtiger_activity.due_date, vtiger_activity.time_start,vtiger_activity.duration_hours,vtiger_activity.duration_minutes,vtiger_crmentity.smownerid from vtiger_activity,vtiger_crmentity where vtiger_crmentity.crmid=vtiger_activity.activityid and ('".$avail_date."' like date_start) and vtiger_crmentity.smownerid=".$userid." and vtiger_activity.activityid !=".$activity_id."  and vtiger_crmentity.deleted=0";
 		}
 		else
 		{
-			$usr_query="select activityid,vtiger_activity.date_start,vtiger_activity.due_date, vtiger_activity.time_start,vtiger_activity.duration_hours,vtiger_activity.duration_minutes,vtiger_crmentity.smownerid from vtiger_activity,crmentity where vtiger_crmentity.crmid=vtiger_activity.activityid and ('".$avail_date."' like date_start) and vtiger_crmentity.smownerid=".$userid." and vtiger_activity.activityid !=".$activity_id." and vtiger_crmentity.deleted=0";
+			$usr_query="select activityid,vtiger_activity.date_start,vtiger_activity.due_date, vtiger_activity.time_start,vtiger_activity.duration_hours,vtiger_activity.duration_minutes,vtiger_crmentity.smownerid from vtiger_activity,vtiger_crmentity where vtiger_crmentity.crmid=vtiger_activity.activityid and ('".$avail_date."' like date_start) and vtiger_crmentity.smownerid=".$userid." and vtiger_activity.activityid !=".$activity_id." and vtiger_crmentity.deleted=0";
 		}
 		$result_cal=$adb->query($usr_query);   
 		$noofrows_cal = $adb->num_rows($result_cal);




From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 10:13:21 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 14:13:21 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231109=3A?=
 =?utf-8?q?_total_cost_calculation_in_quote_not_clear?=
In-Reply-To: <076.45e9bc14aab1f17446b516955f930775@vtiger.fosslabs.com>
References: <076.45e9bc14aab1f17446b516955f930775@vtiger.fosslabs.com>
Message-ID: <085.919aeeb60214bc77cab1a1b642019010@vtiger.fosslabs.com>

#1109: total cost calculation in quote not clear
--------------------------+-------------------------------------------------
  Reporter:  richie       |       Owner:  mickie
      Type:  enhancement  |      Status:  new   
  Priority:  critical     |   Milestone:        
 Component:  vtigercrm    |     Version:  5.0.0 
Resolution:               |    Keywords:  quote 
--------------------------+-------------------------------------------------
Changes (by mickie):

  * type:  defect => enhancement

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1109>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 20 10:35:20 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 20 Jun 2006 14:35:20 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7305 -
	/vtigercrm/trunk/include/utils/ListViewUtils.php
Message-ID: <20060620143521.407BB83F2C9@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 20 08:35:16 2006
New Revision: 7305

Log:
changes made to fix the issue 685 and 686

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 Jun 20 08:35:16 2006
@@ -1314,6 +1314,8 @@
 					$focus->record_id = $_REQUEST['recordid'];
 					if($module == 'Leads')
 						$value = '<a href="a" LANGUAGE=javascript onclick=\'add_leaddata_to_relatedlist("'.$entity_id.'","'.$focus->record_id.'"); window.close()\'>'.$temp_val.'</a>';
+					elseif($module == 'Users')
+						$value = '<a href="a" LANGUAGE=javascript onclick=\'add_userdata_to_relatedlist("'.$entity_id.'","'.$focus->record_id.'"); window.close()\'>'.$temp_val.'</a>';
 					else
 						$value = '<a href="a" LANGUAGE=javascript onclick=\'add_data_to_relatedlist("'.$entity_id.'","'.$focus->record_id.'"); window.close()\'>'.$temp_val.'</a>';
 				}
@@ -1690,7 +1692,7 @@
 			LEFT JOIN vtiger_users
 				ON vtiger_users.id = vtiger_crmentity.smownerid
 			WHERE vtiger_crmentity.deleted = 0
-			AND vtiger_leaddetails.converted = 0 ";
+			AND vtiger_leaddetails.converted = 0 ".$where;
                if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[$tab_id] == 3)
                 {
 			$sec_parameter=getListViewSecurityParameter($module);
@@ -2041,7 +2043,7 @@
 	}
 	if($module == "Users")
 	{
-		$query = "select id,user_name,roleid,first_name,last_name,email1,phone_mobile,phone_work,is_admin,status from vtiger_users inner join vtiger_user2role on vtiger_user2role.userid=vtiger_users.id where deleted=0";
+		$query = "select id,user_name,roleid,first_name,last_name,email1,phone_mobile,phone_work,is_admin,status from vtiger_users inner join vtiger_user2role on vtiger_user2role.userid=vtiger_users.id where deleted=0 ".$where ;
 	}
 	
 
@@ -2521,15 +2523,51 @@
 	global $adb;
 	$skip_id = Array();
 	$where_relquery = "";
-
 	if($currentmodule=="Contacts" && $returnmodule == "Potentials")
 	{
-		$query = "SELECT contactid FROM vtiger_contpotentialrel WHERE potentialid = ".$recordid;
+		$reltable = 'vtiger_contpotentialrel';
+		$condition = 'WHERE potentialid = '.$recordid;
+		$field = $selectfield = 'contactid';
+		$table = 'vtiger_contactdetails';
 	}
 	elseif($currentmodule=="Contacts" && $returnmodule == "Vendors")
 	{
-		$query = "SELECT contactid FROM vtiger_vendorcontactrel WHERE vendorid = ".$recordid;
-	}
+		$reltable = 'vtiger_vendorcontactrel';
+		$condition = 'WHERE vendorid = '.$recordid;
+		$field = $selectfield = 'contactid';
+		$table = 'vtiger_contactdetails';
+	}
+	elseif($currentmodule=="Contacts" && $returnmodule == "Campaigns")
+	{
+		$reltable = 'vtiger_campaigncontrel';
+		$condition = 'WHERE campaignid = '.$recordid;
+		$field = $selectfield = 'contactid';
+		$table = 'vtiger_contactdetails';
+	}
+	elseif($currentmodule=="Contacts" && $returnmodule == "Activities")
+	{
+		$reltable = 'vtiger_seactivityrel';
+		$condition = 'WHERE activityid = '.$recordid;
+		$selectfield = 'crmid';
+		$field = 'contactid';
+		$table = 'vtiger_contactdetails';
+	}
+	elseif($currentmodule=="Leads" && $returnmodule == "Campaigns")
+	{
+		$reltable = 'vtiger_campaignleadrel';
+		$condition = 'WHERE campaignid = '.$recordid;;
+		$field = $selectfield = 'leadid';
+		$table = 'vtiger_leaddetails';
+	}
+	elseif($currentmodule=="Users" && $returnmodule == "Activities")
+	{
+		$reltable = 'vtiger_salesmanactivityrel';
+		$condition = 'WHERE activityid = '.$recordid;;
+		$selectfield = 'smid';
+		$field = 'id';
+		$table = 'vtiger_users';
+	}
+	$query = "SELECT ".$selectfield." FROM ".$reltable." ".$condition;
 
 	if($query !='')
 	{
@@ -2538,10 +2576,10 @@
 		{
 			for($k=0;$k < $adb->num_rows($result);$k++)
 			{
-				$skip_id[]=$adb->query_result($result,$k,"contactid");
+				$skip_id[]=$adb->query_result($result,$k,$selectfield);
 			}
 			$skipids = constructList($skip_id,'INTEGER');
-			$where_relquery = "and vtiger_contactdetails.contactid not in ".$skipids;
+			$where_relquery = "and ".$table.".".$field." not in ".$skipids;
 		}
 	}
 	$log->debug("Exiting getRelCheckquery method ...");




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 20 10:37:50 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 20 Jun 2006 14:37:50 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7306 -
	/vtigercrm/trunk/Smarty/templates/Popup.tpl
Message-ID: <20060620143750.B596283F2C9@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 20 08:37:47 2006
New Revision: 7306

Log:
js function add_userdata_to_relatedlist has been included

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

Modified: vtigercrm/trunk/Smarty/templates/Popup.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Popup.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Popup.tpl Tue Jun 20 08:37:47 2006
@@ -24,6 +24,10 @@
 
 function add_leaddata_to_relatedlist(entity_id,recordid) {ldelim}
         opener.document.location.href="index.php?module={$RETURN_MODULE}&action=updateRelations&destination_module=Leads&entityid="+entity_id+"&parid="+recordid;
+{rdelim}
+
+function add_userdata_to_relatedlist(userid,recordid) {ldelim}
+        opener.document.location.href="index.php?module={$RETURN_MODULE}&action=updateRelations&destination_module=Users&user_id="+userid+"&record="+recordid;
 {rdelim}
 </script>
 <body class="small" marginwidth=0 marginheight=0 leftmargin=0 topmargin=0 bottommargin=0 rigthmargin=0>




From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 10:38:18 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 14:38:18 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23686=3A_?=
 =?utf-8?q?Issue_in_Event_Related_List?=
In-Reply-To: <076.27c045b660bb25d0ac07cff7335832fa@vtiger.fosslabs.com>
References: <076.27c045b660bb25d0ac07cff7335832fa@vtiger.fosslabs.com>
Message-ID: <085.b14cc6d1935f606071536b515de8ef5d@vtiger.fosslabs.com>

#686: Issue in Event Related List
------------------------+---------------------------------------------------
  Reporter:  don        |       Owner:  mangai
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Comment (by mangai):

 fixed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/686>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 10:38:28 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 14:38:28 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23686=3A_?=
 =?utf-8?q?Issue_in_Event_Related_List?=
In-Reply-To: <076.27c045b660bb25d0ac07cff7335832fa@vtiger.fosslabs.com>
References: <076.27c045b660bb25d0ac07cff7335832fa@vtiger.fosslabs.com>
Message-ID: <085.540677647bf7a1f98102a9d782f2536d@vtiger.fosslabs.com>

#686: Issue in Event Related List
------------------------+---------------------------------------------------
  Reporter:  don        |       Owner:  mangai
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mangai):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/686>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 10:39:18 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 14:39:18 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231249=3A?=
	=?utf-8?q?_Task_Information?=
In-Reply-To: <076.e46a01212fb9981d78bbf6e6e2673af6@vtiger.fosslabs.com>
References: <076.e46a01212fb9981d78bbf6e6e2673af6@vtiger.fosslabs.com>
Message-ID: <085.04820de44ddb653de32eddf90ecc57e8@vtiger.fosslabs.com>

#1249: Task Information
--------------------------+-------------------------------------------------
  Reporter:  anonymous    |       Owner:  minnie
      Type:  enhancement  |      Status:  new   
  Priority:  major        |   Milestone:        
 Component:  vtigercrm    |     Version:  5.0.0 
Resolution:               |    Keywords:        
--------------------------+-------------------------------------------------
Changes (by mangai):

  * type:  defect => enhancement

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1249>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 11:08:29 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 15:08:29 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231344=3A?=
	=?utf-8?q?_database_not_created?=
In-Reply-To: <076.c1df5e53995fbd31873387aa402b9381@vtiger.fosslabs.com>
References: <076.c1df5e53995fbd31873387aa402b9381@vtiger.fosslabs.com>
Message-ID: <085.a8e902c5bde5204cf192615fe92c68b0@vtiger.fosslabs.com>

#1344: database not created
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  developer
      Type:  defect     |      Status:  new      
  Priority:  major      |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:             |    Keywords:           
------------------------+---------------------------------------------------
Comment (by allanbush):

 Just trying to clarify a few points here.

 First are you using the 4.2.4 release or the 5.0 beta release?

 Second when you say the "database hasn't been created" do you mean that no
 tables were created within the database or that the database itself
 doesn't exist.  You'll have to create a database and a database user with
 full privileges on the database before installing vtigercrm and provide
 the installation process with those details.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1344>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 10:38:08 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 14:38:08 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23685=3A_?=
 =?utf-8?q?Issue_in_Event_Related_List?=
In-Reply-To: <076.280958420b347e62e2d9ab6619bf1962@vtiger.fosslabs.com>
References: <076.280958420b347e62e2d9ab6619bf1962@vtiger.fosslabs.com>
Message-ID: <085.9979a26323e0030fc55a7408d0a4f2cc@vtiger.fosslabs.com>

#685: Issue in Event Related List
------------------------+---------------------------------------------------
  Reporter:  don        |       Owner:  mangai
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mangai):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 fixed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/685>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 20 10:09:20 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 20 Jun 2006 14:09:20 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7303 -
	/vtigercrm/trunk/modules/Users/Users.js
Message-ID: <20060620140921.084C683F2BA@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 20 08:09:15 2006
New Revision: 7303

Log:
js function SelectAll has been included

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

Modified: vtigercrm/trunk/modules/Users/Users.js
==============================================================================
--- vtigercrm/trunk/modules/Users/Users.js (original)
+++ vtigercrm/trunk/modules/Users/Users.js Tue Jun 20 08:09:15 2006
@@ -16,3 +16,58 @@
 		window.opener.document.EditView.reports_to_id.value = user_id;
 }
 
+//Function added for Mass select in Popup - Philip
+function SelectAll()
+{
+
+        x = document.selectall.selected_id.length;
+        var entity_id = window.opener.document.getElementById('parent_id').value
+        var module = window.opener.document.getElementById('return_module').value
+        document.selectall.action.value='updateRelations'
+        idstring = "";
+
+        if ( x == undefined)
+        {
+
+                if (document.selectall.selected_id.checked)
+                {
+                        document.selectall.idlist.value=document.selectall.selected_id.value;
+                }
+                else
+                {
+                        alert("Please select atleast one entity");
+                        return false;
+                }
+        }
+        else
+        {
+                xx = 0;
+                for(i = 0; i < x ; i++)
+                {
+                        if(document.selectall.selected_id[i].checked)
+                        {
+                                idstring = document.selectall.selected_id[i].value +";"+idstring
+                        xx++
+                        }
+                }
+                if (xx != 0)
+                {
+                        document.selectall.idlist.value=idstring;
+                }
+                else
+                {
+			alert("Please select atleast one entity");
+	                return false;
+                }
+        }
+        if(confirm("Are you sure you want to add the selected "+xx+" records ?"))
+        {
+                opener.document.location.href="index.php?module="+module+"&parentid="+entity_id+"&action=updateRelations&destination_module=Users&idlist="+idstring;
+                self.close();
+        }
+        else
+        {
+        	return false;
+        }
+}
+




From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 11:09:50 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 15:09:50 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231217=3A?=
 =?utf-8?q?_issue_in_mysql_connection_parameters?=
In-Reply-To: <076.da1bfc197d7ae211c399f09a7c9dbece@vtiger.fosslabs.com>
References: <076.da1bfc197d7ae211c399f09a7c9dbece@vtiger.fosslabs.com>
Message-ID: <085.56f4b504eab8af77696b6b6669b60862@vtiger.fosslabs.com>

#1217: issue in mysql connection parameters
------------------------+---------------------------------------------------
  Reporter:  mangai     |       Owner:  jeri  
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * resolution:  => fixed
  * priority:  critical => major
  * status:  new => closed

Comment:

 A Unix socket file is used if you don't specify a hostname or if you
 specify the special hostname localhost.By default, while installing with
 installshield, localhost user is given all privileges. But in the other
 cases, the user needs to be given privileges to access the database.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1217>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 11:10:40 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 15:10:40 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231307=3A?=
 =?utf-8?q?_Print_function_missing_in_Beta?=
In-Reply-To: <076.d87e178fda241c6536574413a592943f@vtiger.fosslabs.com>
References: <076.d87e178fda241c6536574413a592943f@vtiger.fosslabs.com>
Message-ID: <085.bf61c3ae94c06030f965ed2e85d90879@vtiger.fosslabs.com>

#1307: Print function missing in Beta
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  philip
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.1 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by anonymous):

  * version:  5.0.0 => 5.0.1

Comment:

 UI team is working on the print page template without css.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1307>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 11:13:56 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 15:13:56 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231344=3A?=
	=?utf-8?q?_database_not_created?=
In-Reply-To: <076.c1df5e53995fbd31873387aa402b9381@vtiger.fosslabs.com>
References: <076.c1df5e53995fbd31873387aa402b9381@vtiger.fosslabs.com>
Message-ID: <085.a013ca32b7288361e6a1ec3f87d5556f@vtiger.fosslabs.com>

#1344: database not created
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  developer
      Type:  defect     |      Status:  new      
  Priority:  major      |   Milestone:           
 Component:  vtigercrm  |     Version:  4.2.4rc3 
Resolution:             |    Keywords:           
------------------------+---------------------------------------------------
Changes (by richie):

  * version:  5.0.0 => 4.2.4rc3

Comment:

 Hi Allan!

 I am changing the version to 4.2.4rc3.
 We need to change to proper version.

 Will post in mailing list.

 Richie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1344>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 20 11:31:42 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 20 Jun 2006 15:31:42 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7307 - in /vtigercrm/trunk:
 Smarty/templates/DisplayFields.tpl modules/SalesOrder/EditView.php
 modules/SalesOrder/Save.php
Message-ID: <20060620153142.A87EF83F2DD@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 20 09:31:33 2006
New Revision: 7307

Log:
* Modified to fix the quote value save in SalesOrder where as previously if we select the quote in SalesOrder creation then the quote did not saved

Modified:
    vtigercrm/trunk/Smarty/templates/DisplayFields.tpl
    vtigercrm/trunk/modules/SalesOrder/EditView.php
    vtigercrm/trunk/modules/SalesOrder/Save.php

Modified: vtigercrm/trunk/Smarty/templates/DisplayFields.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DisplayFields.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DisplayFields.tpl Tue Jun 20 09:31:33 2006
@@ -248,7 +248,7 @@
 				{$fldlabel}
 			</td>
 			<td width="30%" align=left class="dvtCellInfo">
-				<input name="quote_name" readonly type="text" style="border:1px solid #bababa;" value="{$fldvalue}"><input name="{$fldname}" type="hidden" value="{$ID}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Quotes&action=Popup&html=Popup_picker&popuptype=specific&form=EditView","test","width=640,height=565,resizable=0,scrollbars=0");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" tabindex="{$vt_tab}" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.quote_id.value=''; this.form.quote_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
+				<input name="quote_name" readonly type="text" style="border:1px solid #bababa;" value="{$fldvalue}"><input name="{$fldname}" type="hidden" value="{$QUOTE_ID}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Quotes&action=Popup&html=Popup_picker&popuptype=specific&form=EditView","test","width=640,height=565,resizable=0,scrollbars=0");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" tabindex="{$vt_tab}" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.quote_id.value=''; this.form.quote_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
 			</td>
 
 		{elseif $uitype eq 76}

Modified: vtigercrm/trunk/modules/SalesOrder/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/SalesOrder/EditView.php (original)
+++ vtigercrm/trunk/modules/SalesOrder/EditView.php Tue Jun 20 09:31:33 2006
@@ -80,6 +80,7 @@
 	}
 		
 	$quoteid = $focus->column_fields['quote_id'];
+	$smarty->assign("QUOTE_ID", $focus->column_fields['quote_id']);
 	$quote_focus = new Quote();
 	$quote_focus->id = $quoteid;
 	$quote_focus->retrieve_entity_info($quoteid,"Quotes");
@@ -129,6 +130,7 @@
 			$associated_prod = getAssociatedProducts("Quotes",$quote_focus,$focus->column_fields['quote_id']);
 		}
 
+		$smarty->assign("QUOTE_ID", $focus->column_fields['quote_id']);
 		$smarty->assign("ASSOCIATEDPRODUCTS", $associated_prod);
 		$smarty->assign("MODE", $quote_focus->mode);
 		$smarty->assign("TAXVALUE", $quote_focus->column_fields['txtTax']);

Modified: vtigercrm/trunk/modules/SalesOrder/Save.php
==============================================================================
--- vtigercrm/trunk/modules/SalesOrder/Save.php (original)
+++ vtigercrm/trunk/modules/SalesOrder/Save.php Tue Jun 20 09:31:33 2006
@@ -84,7 +84,7 @@
         if($prod_status != 'D')
         {
 
-                $query ="insert into vtiger_soproductrel values($focus->id, $prod_id , $qty, $listprice, $vat, $sales, $service)";
+                $query ="insert into vtiger_soproductrel values($focus->id, $prod_id , $qty, $listprice, \"$vat\", \"$sales\", \"$service\")";
                 $adb->query($query);
 		updateStk($prod_id,$qty,$focus->mode,$ext_prod_arr,'SalesOrder');
         }




From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 11:54:25 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 15:54:25 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23703=3A_?=
 =?utf-8?q?installation_issue_in_bin?=
In-Reply-To: <076.d5b75a39847faef3b46084de29b76436@vtiger.fosslabs.com>
References: <076.d5b75a39847faef3b46084de29b76436@vtiger.fosslabs.com>
Message-ID: <085.df658efddad3895e5b20a3ae373b1a86@vtiger.fosslabs.com>

#703: installation issue in bin
---------------------------+------------------------------------------------
  Reporter:  jerrydgeorge  |       Owner:  Richie      
      Type:  defect        |      Status:  closed      
  Priority:  major         |   Milestone:              
 Component:  vtigercrm     |     Version:  5.0.0       
Resolution:  fixed         |    Keywords:  installation
---------------------------+------------------------------------------------
Changes (by richie):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/703>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 12:03:55 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 16:03:55 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231169=3A?=
 =?utf-8?q?_unable_to_relate_Quote_to_SalesOrder?=
In-Reply-To: <076.bec9bdcd41de51d9a21b66c7a45dbe9a@vtiger.fosslabs.com>
References: <076.bec9bdcd41de51d9a21b66c7a45dbe9a@vtiger.fosslabs.com>
Message-ID: <085.c106fef810b7277367c89d54530687bb@vtiger.fosslabs.com>

#1169: unable to relate Quote to SalesOrder
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  mickie
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mickie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 This issue is fixed and previously quote is not saved in salesorder
 editview. now this issue also fixed.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1169>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 20 12:14:14 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 20 Jun 2006 16:14:14 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7309 -
	/vtigercrm/trunk/modules/Users/User.php
Message-ID: <20060620161414.A23C883F2F0@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 20 10:14:09 2006
New Revision: 7309

Log:
encrypt password added for user_password

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 Jun 20 10:14:09 2006
@@ -627,6 +627,10 @@
 					}
 					$fldvalue = $field_list;
 				}
+				elseif($uitype == 99)
+				{
+					$fldvalue = $this->encrypt_password($this->column_fields[$fieldname]);
+				}
 				else
 				{
 					$fldvalue = $this->column_fields[$fieldname]; 




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 20 12:14:15 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 20 Jun 2006 16:14:15 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7310 -
	/vtigercrm/trunk/include/utils/UserInfoUtil.php
Message-ID: <20060620161416.1A41C83F2AB@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 20 10:14:07 2006
New Revision: 7310

Log:
fixed the delete permission issue in security

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

Modified: vtigercrm/trunk/include/utils/UserInfoUtil.php
==============================================================================
--- vtigercrm/trunk/include/utils/UserInfoUtil.php (original)
+++ vtigercrm/trunk/include/utils/UserInfoUtil.php Tue Jun 20 10:14:07 2006
@@ -1355,6 +1355,7 @@
  */
 function isPermitted($module,$actionname,$record_id='')
 {
+
 	global $log;
 	$log->debug("Entering isPermitted(".$module.",".$actionname.",".$record_id.") method ...");
 
@@ -1576,6 +1577,11 @@
 			$log->debug("Exiting isPermitted method ...");
 			return $permission;	
 		}
+		elseif($actionid ==2)
+		{
+				$permission ="no";
+				return $permission;	
+		}		
 		else
 		{
 			$permission = "yes";
@@ -4209,9 +4215,9 @@
 
                         if(sizeof($current_user_groups) > 0)
                         {
-                              $sec_query .= "groups.groupid in".getCurrentUserGroupList()." or ";
+                              $sec_query .= "vtiger_groups.groupid in".getCurrentUserGroupList()." or ";
                         }
-                         $sec_query .= "groups.groupid in(select vtiger_tmp_read_group_sharing_per.sharedgroupid from vtiger_tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";	
+                         $sec_query .= "vtiger_groups.groupid in(select vtiger_tmp_read_group_sharing_per.sharedgroupid from vtiger_tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";	
 	}
 	elseif($module == 'Accounts')
 	{
@@ -4219,9 +4225,9 @@
 
                 if(sizeof($current_user_groups) > 0)
                 {
-                	$sec_query .= "groups.groupid in".getCurrentUserGroupList()." or ";
+                	$sec_query .= "vtiger_groups.groupid in".getCurrentUserGroupList()." or ";
                 }
-		$sec_query .= "groups.groupid in(select vtiger_tmp_read_group_sharing_per.sharedgroupid from vtiger_tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";			
+		$sec_query .= "vtiger_groups.groupid in(select vtiger_tmp_read_group_sharing_per.sharedgroupid from vtiger_tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";			
 	
 	}
 	elseif($module == 'Contacts')
@@ -4230,9 +4236,9 @@
 
                 if(sizeof($current_user_groups) > 0)
                 {
-                	$sec_query .= "groups.groupid in".getCurrentUserGroupList()." or ";
+                	$sec_query .= "vtiger_groups.groupid in".getCurrentUserGroupList()." or ";
                 }
-		$sec_query .= "groups.groupid in(select vtiger_tmp_read_group_sharing_per.sharedgroupid from vtiger_tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";			
+		$sec_query .= "vtiger_groups.groupid in(select vtiger_tmp_read_group_sharing_per.sharedgroupid from vtiger_tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";			
 	
 	}
 	elseif($module == 'Potentials')
@@ -4241,9 +4247,9 @@
 
                 if(sizeof($current_user_groups) > 0)
                 {
-                	$sec_query .= "groups.groupid in".getCurrentUserGroupList()." or ";
+                	$sec_query .= "vtiger_groups.groupid in".getCurrentUserGroupList()." or ";
                 }
-		$sec_query .= "groups.groupid in(select vtiger_tmp_read_group_sharing_per.sharedgroupid from vtiger_tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";			
+		$sec_query .= "vtiger_groups.groupid in(select vtiger_tmp_read_group_sharing_per.sharedgroupid from vtiger_tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";			
 	
 	}
 	elseif($module == 'HelpDesk')
@@ -4252,9 +4258,9 @@
 
                 if(sizeof($current_user_groups) > 0)
                 {
-                	$sec_query .= "groups.groupid in".getCurrentUserGroupList()." or ";
+                	$sec_query .= "vtiger_groups.groupid in".getCurrentUserGroupList()." or ";
                 }
-		$sec_query .= "groups.groupid in(select vtiger_tmp_read_group_sharing_per.sharedgroupid from vtiger_tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";			
+		$sec_query .= "vtiger_groups.groupid in(select vtiger_tmp_read_group_sharing_per.sharedgroupid from vtiger_tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";			
 	
 	}
 	elseif($module == 'Emails')
@@ -4273,9 +4279,9 @@
 
                 if(sizeof($current_user_groups) > 0)
                 {
-                	$sec_query .= "groups.groupid in".getCurrentUserGroupList()." or ";
+                	$sec_query .= "vtiger_groups.groupid in".getCurrentUserGroupList()." or ";
                 }
-		$sec_query .= "groups.groupid in(select vtiger_tmp_read_group_sharing_per.sharedgroupid from vtiger_tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";
+		$sec_query .= "vtiger_groups.groupid in(select vtiger_tmp_read_group_sharing_per.sharedgroupid from vtiger_tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";
 	
 	}
 	elseif($module == 'Activities')
@@ -4303,9 +4309,9 @@
 
                 if(sizeof($current_user_groups) > 0)
                 {
-                	$sec_query .= "groups.groupid in".getCurrentUserGroupList()." or ";
+                	$sec_query .= "vtiger_groups.groupid in".getCurrentUserGroupList()." or ";
                 }
-		$sec_query .= "groups.groupid in(select vtiger_tmp_read_group_sharing_per.sharedgroupid from vtiger_tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";			
+		$sec_query .= "vtiger_groups.groupid in(select vtiger_tmp_read_group_sharing_per.sharedgroupid from vtiger_tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";			
 	
 	}	
 	elseif($module == 'PurchaseOrder')
@@ -4314,9 +4320,9 @@
 
                 if(sizeof($current_user_groups) > 0)
                 {
-                	$sec_query .= "groups.groupid in".getCurrentUserGroupList()." or ";
+                	$sec_query .= "vtiger_groups.groupid in".getCurrentUserGroupList()." or ";
                 }
-		$sec_query .= "groups.groupid in(select vtiger_tmp_read_group_sharing_per.sharedgroupid from vtiger_tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";			
+		$sec_query .= "vtiger_groups.groupid in(select vtiger_tmp_read_group_sharing_per.sharedgroupid from vtiger_tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";			
 	
 	}
 	elseif($module == 'SalesOrder')
@@ -4336,9 +4342,9 @@
 
                 if(sizeof($current_user_groups) > 0)
                 {
-                	$sec_query .= "groups.groupid in".getCurrentUserGroupList()." or ";
+                	$sec_query .= "vtiger_groups.groupid in".getCurrentUserGroupList()." or ";
                 }
-		$sec_query .= "groups.groupid in(select vtiger_tmp_read_group_sharing_per.sharedgroupid from vtiger_tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";			
+		$sec_query .= "vtiger_groups.groupid in(select vtiger_tmp_read_group_sharing_per.sharedgroupid from vtiger_tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";			
 	
 	}
 	elseif($module == 'Invoice')
@@ -4356,9 +4362,9 @@
 
                 if(sizeof($current_user_groups) > 0)
                 {
-                	$sec_query .= "groups.groupid in".getCurrentUserGroupList()." or ";
+                	$sec_query .= "vtiger_groups.groupid in".getCurrentUserGroupList()." or ";
                 }
-		$sec_query .= "groups.groupid in(select vtiger_tmp_read_group_sharing_per.sharedgroupid from vtiger_tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";			
+		$sec_query .= "vtiger_groups.groupid in(select vtiger_tmp_read_group_sharing_per.sharedgroupid from vtiger_tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";			
 	
 	}
 	elseif($module == 'Campaigns')
@@ -4368,9 +4374,9 @@
 
 		if(sizeof($current_user_groups) > 0)
 		{
-			$sec_query .= "groups.groupid in".getCurrentUserGroupList()." or ";
+			$sec_query .= "vtiger_groups.groupid in".getCurrentUserGroupList()." or ";
 		}
-		$sec_query .= "groups.groupid in(select vtiger_tmp_read_group_sharing_per.sharedgroupid from vtiger_tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";
+		$sec_query .= "vtiger_groups.groupid in(select vtiger_tmp_read_group_sharing_per.sharedgroupid from vtiger_tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";
 
 			
 	}	




From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 12:20:58 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 20 Jun 2006 16:20:58 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231128=3A?=
 =?utf-8?q?_too_high_reaction_time_in_using_inventory?=
In-Reply-To: <076.209b6cc7a2151c8fd5ca32cfa5df69e2@vtiger.fosslabs.com>
References: <076.209b6cc7a2151c8fd5ca32cfa5df69e2@vtiger.fosslabs.com>
Message-ID: <085.2b656cb7ce44320c44bae97b416efa81@vtiger.fosslabs.com>

#1128: too high reaction time in using inventory
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  don        
      Type:  defect     |      Status:  new        
  Priority:  major      |   Milestone:             
 Component:  vtigercrm  |     Version:  5.0.0      
Resolution:             |    Keywords:  performance
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  mickie => don

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1128>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 20 12:33:00 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 20 Jun 2006 16:33:00 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7311 -
	/vtigercrm/trunk/include/utils/ListViewUtils.php
Message-ID: <20060620163300.6334583F2E9@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 20 10:32:50 2006
New Revision: 7311

Log:
fixed query issue in getListQuery() for Accounts

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 Jun 20 10:32:50 2006
@@ -1620,13 +1620,13 @@
 
                         if(sizeof($current_user_groups) > 0)
                         {
-                              $query .= "accountgrouprelation.groupname IN (
+                              $query .= "vtiger_accountgrouprelation.groupname IN (
 				      		SELECT groupname
 						FROM vtiger_groups
 						WHERE groupid IN ".getCurrentUserGroupList().")
 					OR ";
                         }
-                         $query .= "accountgrouprelation.groupname IN (
+                         $query .= "vtiger_accountgrouprelation.groupname IN (
 				 	SELECT vtiger_groups.groupname
 					FROM vtiger_tmp_read_group_sharing_per
 					INNER JOIN vtiger_groups




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 20 12:43:49 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 20 Jun 2006 16:43:49 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7312 -
	/vtigercrm/trunk/modules/Reports/PopulateReports.php
Message-ID: <20060620164349.B121483F2CE@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 20 10:43:36 2006
New Revision: 7312

Log:
fixed the vtiger_ issues

Modified:
    vtigercrm/trunk/modules/Reports/PopulateReports.php

Modified: vtigercrm/trunk/modules/Reports/PopulateReports.php
==============================================================================
--- vtigercrm/trunk/modules/Reports/PopulateReports.php (original)
+++ vtigercrm/trunk/modules/Reports/PopulateReports.php Tue Jun 20 10:43:36 2006
@@ -44,142 +44,142 @@
 		       Array('primarymodule'=>'Invoice','secondarymodule'=>'')
 		      );
 
-$selectcolumns = Array(Array('contactdetails:firstname:Contacts_First_Name:firstname:V',
-                             'contactdetails:lastname:Contacts_Last_Name:lastname:V',
-                             'contactsubdetails:leadsource:Contacts_Lead_Source:leadsource:V',
-                             'accountContacts:accountname:Contacts_Account_Name:account_id:I',
-			     'account:industry:Accounts_industry:industry:V',
-			     'contactdetails:email:Contacts_Email:email:V'),
-
-		       Array('contactdetails:firstname:Contacts_First_Name:firstname:V',
-                             'contactdetails:lastname:Contacts_Last_Name:lastname:V',
-                             'contactsubdetails:leadsource:Contacts_Lead_Source:leadsource:V',
-                             'accountContacts:accountname:Contacts_Account_Name:account_id:I',
-                             'account:industry:Accounts_industry:industry:V',
-                             'contactdetails:email:Contacts_Email:email:V'),
-
-		       Array('contactdetails:firstname:Contacts_First_Name:firstname:V',
-                             'contactdetails:lastname:Contacts_Last_Name:lastname:V',
-                             'accountContacts:accountname:Contacts_Account_Name:account_id:I',
-                             'contactdetails:email:Contacts_Email:email:V',
-                             'potential:potentialname:Potentials_Potential_Name:potentialname:V',
-                             'potential:sales_stage:Potentials_Sales_Stage:sales_stage:V'),
-
-		       Array('leaddetails:firstname:Leads_First_Name:firstname:V',
-			     'leaddetails:lastname:Leads_Last_Name:lastname:V',
-			     'leaddetails:company:Leads_Company:company:V',
-			     'leaddetails:email:Leads_Email:email:V'),
-
-		       Array('leaddetails:firstname:Leads_First_Name:firstname:V',
-                             'leaddetails:lastname:Leads_Last_Name:lastname:V',
-                             'leaddetails:company:Leads_Company:company:V',
-                             'leaddetails:email:Leads_Email:email:V',
-			     'leaddetails:leadsource:Leads_Lead_Source:leadsource:V'),
-
-		       Array('potential:potentialname:Potentials_Potential_Name:potentialname:V',
-                             'potential:amount:Potentials_Amount:amount:N',
-                             'potential:potentialtype:Potentials_Type:opportunity_type:V',
-                             'potential:leadsource:Potentials_Lead_Source:leadsource:V',
-                             'potential:sales_stage:Potentials_Sales_Stage:sales_stage:V'),
+$selectcolumns = Array(Array('vtiger_contactdetails:firstname:Contacts_First_Name:firstname:V',
+                             'vtiger_contactdetails:lastname:Contacts_Last_Name:lastname:V',
+                             'vtiger_contactsubdetails:leadsource:Contacts_Lead_Source:leadsource:V',
+                             'vtiger_accountContacts:accountname:Contacts_Account_Name:account_id:I',
+			     'vtiger_account:industry:Accounts_industry:industry:V',
+			     'vtiger_contactdetails:email:Contacts_Email:email:V'),
+
+		       Array('vtiger_contactdetails:firstname:Contacts_First_Name:firstname:V',
+                             'vtiger_contactdetails:lastname:Contacts_Last_Name:lastname:V',
+                             'vtiger_contactsubdetails:leadsource:Contacts_Lead_Source:leadsource:V',
+                             'vtiger_accountContacts:accountname:Contacts_Account_Name:account_id:I',
+                             'vtiger_account:industry:Accounts_industry:industry:V',
+                             'vtiger_contactdetails:email:Contacts_Email:email:V'),
+
+		       Array('vtiger_contactdetails:firstname:Contacts_First_Name:firstname:V',
+                             'vtiger_contactdetails:lastname:Contacts_Last_Name:lastname:V',
+                             'vtiger_accountContacts:accountname:Contacts_Account_Name:account_id:I',
+                             'vtiger_contactdetails:email:Contacts_Email:email:V',
+                             'vtiger_potential:potentialname:Potentials_Potential_Name:potentialname:V',
+                             'vtiger_potential:sales_stage:Potentials_Sales_Stage:sales_stage:V'),
+
+		       Array('vtiger_leaddetails:firstname:Leads_First_Name:firstname:V',
+			     'vtiger_leaddetails:lastname:Leads_Last_Name:lastname:V',
+			     'vtiger_leaddetails:company:Leads_Company:company:V',
+			     'vtiger_leaddetails:email:Leads_Email:email:V'),
+
+		       Array('vtiger_leaddetails:firstname:Leads_First_Name:firstname:V',
+                             'vtiger_leaddetails:lastname:Leads_Last_Name:lastname:V',
+                             'vtiger_leaddetails:company:Leads_Company:company:V',
+                             'vtiger_leaddetails:email:Leads_Email:email:V',
+			     'vtiger_leaddetails:leadsource:Leads_Lead_Source:leadsource:V'),
+
+		       Array('vtiger_potential:potentialname:Potentials_Potential_Name:potentialname:V',
+                             'vtiger_potential:amount:Potentials_Amount:amount:N',
+                             'vtiger_potential:potentialtype:Potentials_Type:opportunity_type:V',
+                             'vtiger_potential:leadsource:Potentials_Lead_Source:leadsource:V',
+                             'vtiger_potential:sales_stage:Potentials_Sales_Stage:sales_stage:V'),
   
-		       Array('potential:potentialname:Potentials_Potential_Name:potentialname:V',
-                             'potential:amount:Potentials_Amount:amount:N',
-                             'potential:potentialtype:Potentials_Type:opportunity_type:V',
-                             'potential:leadsource:Potentials_Lead_Source:leadsource:V',
-			     'potential:sales_stage:Potentials_Sales_Stage:sales_stage:V'),
-
-		       Array('activity:subject:Activities_Subject:subject:V',
-			     'contactdetailsActivities:lastname:Activities_Contact_Name:contact_id:I',
-                             'activity:status:Activities_Status:taskstatus:V',
-                             'activity:priority:Activities_Priority:taskpriority:V',
-                             'usersActivities:user_name:Activities_Assigned_To:assigned_user_id:V'),
-
-		       Array('activity:subject:Activities_Subject:subject:V',
-                             'contactdetailsActivities:lastname:Activities_Contact_Name:contact_id:I',
-                             'activity:status:Activities_Status:taskstatus:V',
-                             'activity:priority:Activities_Priority:taskpriority:V',
-                             'usersActivities:user_name:Activities_Assigned_To:assigned_user_id:V'),
-
-        	       Array('troubletickets:title:HelpDesk_Title:ticket_title:V',
-                             'troubletickets:status:HelpDesk_Status:ticketstatus:V',
-                             'products:productname:Products_Product_Name:productname:V',
-                             'products:discontinued:Products_Product_Active:discontinued:V',
-                             'products:productcategory:Products_Product_Category:productcategory:V',
-			     'products:manufacturer:Products_Manufacturer:manufacturer:V',
-			     'contactdetailsProducts:lastname:Products_Contact_Name:contact_id:I'),
-
- 		       Array('troubletickets:title:HelpDesk_Title:ticket_title:V',
-                             'troubletickets:priority:HelpDesk_Priority:ticketpriorities:V',
-                             'troubletickets:severity:HelpDesk_Severity:ticketseverities:V',
-                             'troubletickets:status:HelpDesk_Status:ticketstatus:V',
-                             'troubletickets:category:HelpDesk_Category:ticketcategories:V',
-                             'usersHelpDesk:user_name:HelpDesk_Assigned_To:assigned_user_id:V'),
-
-		       Array('troubletickets:title:HelpDesk_Title:ticket_title:V',
-                             'troubletickets:priority:HelpDesk_Priority:ticketpriorities:V',
-                             'troubletickets:severity:HelpDesk_Severity:ticketseverities:V',
-                             'troubletickets:status:HelpDesk_Status:ticketstatus:V',
-                             'troubletickets:category:HelpDesk_Category:ticketcategories:V',
-                             'usersHelpDesk:user_name:HelpDesk_Assigned_To:assigned_user_id:V'),
+		       Array('vtiger_potential:potentialname:Potentials_Potential_Name:potentialname:V',
+                             'vtiger_potential:amount:Potentials_Amount:amount:N',
+                             'vtiger_potential:potentialtype:Potentials_Type:opportunity_type:V',
+                             'vtiger_potential:leadsource:Potentials_Lead_Source:leadsource:V',
+			     'vtiger_potential:sales_stage:Potentials_Sales_Stage:sales_stage:V'),
+
+		       Array('vtiger_activity:subject:Activities_Subject:subject:V',
+			     'vtiger_contactdetailsActivities:lastname:Activities_Contact_Name:contact_id:I',
+                             'vtiger_activity:status:Activities_Status:taskstatus:V',
+                             'vtiger_activity:priority:Activities_Priority:taskpriority:V',
+                             'vtiger_usersActivities:user_name:Activities_Assigned_To:assigned_user_id:V'),
+
+		       Array('vtiger_activity:subject:Activities_Subject:subject:V',
+                             'vtiger_contactdetailsActivities:lastname:Activities_Contact_Name:contact_id:I',
+                             'vtiger_activity:status:Activities_Status:taskstatus:V',
+                             'vtiger_activity:priority:Activities_Priority:taskpriority:V',
+                             'vtiger_usersActivities:user_name:Activities_Assigned_To:assigned_user_id:V'),
+
+        	       Array('vtiger_troubletickets:title:HelpDesk_Title:ticket_title:V',
+                             'vtiger_troubletickets:status:HelpDesk_Status:ticketstatus:V',
+                             'vtiger_products:productname:Products_Product_Name:productname:V',
+                             'vtiger_products:discontinued:Products_Product_Active:discontinued:V',
+                             'vtiger_products:productcategory:Products_Product_Category:productcategory:V',
+			     'vtiger_products:manufacturer:Products_Manufacturer:manufacturer:V',
+			     'vtiger_contactdetailsProducts:lastname:Products_Contact_Name:contact_id:I'),
+
+ 		       Array('vtiger_troubletickets:title:HelpDesk_Title:ticket_title:V',
+                             'vtiger_troubletickets:priority:HelpDesk_Priority:ticketpriorities:V',
+                             'vtiger_troubletickets:severity:HelpDesk_Severity:ticketseverities:V',
+                             'vtiger_troubletickets:status:HelpDesk_Status:ticketstatus:V',
+                             'vtiger_troubletickets:category:HelpDesk_Category:ticketcategories:V',
+                             'vtiger_usersHelpDesk:user_name:HelpDesk_Assigned_To:assigned_user_id:V'),
+
+		       Array('vtiger_troubletickets:title:HelpDesk_Title:ticket_title:V',
+                             'vtiger_troubletickets:priority:HelpDesk_Priority:ticketpriorities:V',
+                             'vtiger_troubletickets:severity:HelpDesk_Severity:ticketseverities:V',
+                             'vtiger_troubletickets:status:HelpDesk_Status:ticketstatus:V',
+                             'vtiger_troubletickets:category:HelpDesk_Category:ticketcategories:V',
+                             'vtiger_usersHelpDesk:user_name:HelpDesk_Assigned_To:assigned_user_id:V'),
 		      
- 		       Array('products:productname:Products_Product_Name:productname:V',
-                             'products:productcode:Products_Product_Code:productcode:V',
-                             'products:discontinued:Products_Product_Active:discontinued:V',
-                             'products:productcategory:Products_Product_Category:productcategory:V',
-                             'contactdetailsProducts:lastname:Products_Contact_Name:contact_id:I',
-                             'products:website:Products_Website:website:V',
-			     'vendorRel:vendorname:Products_Vendor_Name:vendor_id:I',
-			     'products:mfr_part_no:Products_Mfr_PartNo:mfr_part_no:V'),
-
-		       Array('products:productname:Products_Product_Name:productname:V',
-                             'products:manufacturer:Products_Manufacturer:manufacturer:V',
-                             'products:productcategory:Products_Product_Category:productcategory:V',
-                             'contactdetails:firstname:Contacts_First_Name:firstname:V',
-                             'contactdetails:lastname:Contacts_Last_Name:lastname:V',
-                             'contactsubdetails:leadsource:Contacts_Lead_Source:leadsource:V'),
-
-		       Array('quotes:subject:Quotes_Subject:subject:V',
-                             'potentialRel:potentialname:Quotes_Potential_Name:potential_id:I',
-                             'quotes:quotestage:Quotes_Quote_Stage:quotestage:V',
-                             'contactdetailsQuotes:lastname:Quotes_Contact_Name:contact_id:V',
-                             'usersRel1:user_name:Quotes_Inventory_Manager:assigned_user_id1:I',
-                             'accountQuotes:accountname:Quotes_Account_Name:account_id:I'),
-
-		       Array('quotes:subject:Quotes_Subject:subject:V',
-                             'potentialRel:potentialname:Quotes_Potential_Name:potential_id:I',
-                             'quotes:quotestage:Quotes_Quote_Stage:quotestage:V',
-                             'contactdetailsQuotes:lastname:Quotes_Contact_Name:contact_id:V',	
-                             'usersRel1:user_name:Quotes_Inventory_Manager:assigned_user_id1:I',
-                             'accountQuotes:accountname:Quotes_Account_Name:account_id:I',
-			     'quotes:carrier:Quotes_Carrier:carrier:V',
-			     'quotes:shipping:Quotes_Shipping:shipping:V'),
-
-		       Array('purchaseorder:subject:PurchaseOrder_Subject:subject:V',
-			     'vendorRel:vendorname:PurchaseOrder_Vendor_Name:vendor_id:I',
-			     'purchaseorder:tracking_no:PurchaseOrder_Tracking_Number:tracking_no:V',
-			     'contactdetails:firstname:Contacts_First_Name:firstname:V',
-			     'contactdetails:lastname:Contacts_Last_Name:lastname:V',
-			     'contactsubdetails:leadsource:Contacts_Lead_Source:leadsource:V',
-			     'contactdetails:email:Contacts_Email:email:V'),
-
-		       Array('purchaseorder:subject:PurchaseOrder_Subject:subject:V',
-			     'vendorRel:vendorname:PurchaseOrder_Vendor_Name:vendor_id:I',
-			     'purchaseorder:requisition_no:PurchaseOrder_Requisition_No:requisition_no:V',
-                             'purchaseorder:tracking_no:PurchaseOrder_Tracking_Number:tracking_no:V',
-			     'contactdetailsPurchaseOrder:lastname:PurchaseOrder_Contact_Name:contact_id:I',
-			     'purchaseorder:carrier:PurchaseOrder_Carrier:carrier:V',
-			     'purchaseorder:salescommission:PurchaseOrder_Sales_Commission:salescommission:N',
-			     'purchaseorder:exciseduty:PurchaseOrder_Excise_Duty:exciseduty:N',
-                             'usersPurchaseOrder:user_name:PurchaseOrder_Assigned_To:assigned_user_id:V'),
-
-		       Array('invoice:subject:Invoice_Subject:subject:V',
-			     'invoice:salesorderid:Invoice_Sales_Order:salesorder_id:I',
-			     'invoice:customerno:Invoice_Customer_No:customerno:V',
-                             'invoice:notes:Invoice_Notes:notes:V',
-			     'invoice:invoiceterms:Invoice_Invoice_Terms:invoiceterms:V',
-			     'invoice:exciseduty:Invoice_Excise_Duty:exciseduty:N',
-			     'invoice:salescommission:Invoice_Sales_Commission:salescommission:N',
-			     'accountInvoice:accountname:Invoice_Account_Name:account_id:I')
+ 		       Array('vtiger_products:productname:Products_Product_Name:productname:V',
+                             'vtiger_products:productcode:Products_Product_Code:productcode:V',
+                             'vtiger_products:discontinued:Products_Product_Active:discontinued:V',
+                             'vtiger_products:productcategory:Products_Product_Category:productcategory:V',
+                             'vtiger_contactdetailsProducts:lastname:Products_Contact_Name:contact_id:I',
+                             'vtiger_products:website:Products_Website:website:V',
+			     'vtiger_vendorRel:vendorname:Products_Vendor_Name:vendor_id:I',
+			     'vtiger_products:mfr_part_no:Products_Mfr_PartNo:mfr_part_no:V'),
+
+		       Array('vtiger_products:productname:Products_Product_Name:productname:V',
+                             'vtiger_products:manufacturer:Products_Manufacturer:manufacturer:V',
+                             'vtiger_products:productcategory:Products_Product_Category:productcategory:V',
+                             'vtiger_contactdetails:firstname:Contacts_First_Name:firstname:V',
+                             'vtiger_contactdetails:lastname:Contacts_Last_Name:lastname:V',
+                             'vtiger_contactsubdetails:leadsource:Contacts_Lead_Source:leadsource:V'),
+
+		       Array('vtiger_quotes:subject:Quotes_Subject:subject:V',
+                             'vtiger_potentialRel:potentialname:Quotes_Potential_Name:potential_id:I',
+                             'vtiger_quotes:quotestage:Quotes_Quote_Stage:quotestage:V',
+                             'vtiger_contactdetailsQuotes:lastname:Quotes_Contact_Name:contact_id:V',
+                             'vtiger_usersRel1:user_name:Quotes_Inventory_Manager:assigned_user_id1:I',
+                             'vtiger_accountQuotes:accountname:Quotes_Account_Name:account_id:I'),
+
+		       Array('vtiger_quotes:subject:Quotes_Subject:subject:V',
+                             'vtiger_potentialRel:potentialname:Quotes_Potential_Name:potential_id:I',
+                             'vtiger_quotes:quotestage:Quotes_Quote_Stage:quotestage:V',
+                             'vtiger_contactdetailsQuotes:lastname:Quotes_Contact_Name:contact_id:V',	
+                             'vtiger_usersRel1:user_name:Quotes_Inventory_Manager:assigned_user_id1:I',
+                             'vtiger_accountQuotes:accountname:Quotes_Account_Name:account_id:I',
+			     'vtiger_quotes:carrier:Quotes_Carrier:carrier:V',
+			     'vtiger_quotes:shipping:Quotes_Shipping:shipping:V'),
+
+		       Array('vtiger_purchaseorder:subject:PurchaseOrder_Subject:subject:V',
+			     'vtiger_vendorRel:vendorname:PurchaseOrder_Vendor_Name:vendor_id:I',
+			     'vtiger_purchaseorder:tracking_no:PurchaseOrder_Tracking_Number:tracking_no:V',
+			     'vtiger_contactdetails:firstname:Contacts_First_Name:firstname:V',
+			     'vtiger_contactdetails:lastname:Contacts_Last_Name:lastname:V',
+			     'vtiger_contactsubdetails:leadsource:Contacts_Lead_Source:leadsource:V',
+			     'vtiger_contactdetails:email:Contacts_Email:email:V'),
+
+		       Array('vtiger_purchaseorder:subject:PurchaseOrder_Subject:subject:V',
+			     'vtiger_vendorRel:vendorname:PurchaseOrder_Vendor_Name:vendor_id:I',
+			     'vtiger_purchaseorder:requisition_no:PurchaseOrder_Requisition_No:requisition_no:V',
+                             'vtiger_purchaseorder:tracking_no:PurchaseOrder_Tracking_Number:tracking_no:V',
+			     'vtiger_contactdetailsPurchaseOrder:lastname:PurchaseOrder_Contact_Name:contact_id:I',
+			     'vtiger_purchaseorder:carrier:PurchaseOrder_Carrier:carrier:V',
+			     'vtiger_purchaseorder:salescommission:PurchaseOrder_Sales_Commission:salescommission:N',
+			     'vtiger_purchaseorder:exciseduty:PurchaseOrder_Excise_Duty:exciseduty:N',
+                             'vtiger_usersPurchaseOrder:user_name:PurchaseOrder_Assigned_To:assigned_user_id:V'),
+
+		       Array('vtiger_invoice:subject:Invoice_Subject:subject:V',
+			     'vtiger_invoice:salesorderid:Invoice_Sales_Order:salesorder_id:I',
+			     'vtiger_invoice:customerno:Invoice_Customer_No:customerno:V',
+                             'vtiger_invoice:notes:Invoice_Notes:notes:V',
+			     'vtiger_invoice:invoiceterms:Invoice_Invoice_Terms:invoiceterms:V',
+			     'vtiger_invoice:exciseduty:Invoice_Excise_Duty:exciseduty:N',
+			     'vtiger_invoice:salescommission:Invoice_Sales_Commission:salescommission:N',
+			     'vtiger_accountInvoice:accountname:Invoice_Account_Name:account_id:I')
 			);
 
 $reports = Array(Array('reportname'=>'Contacts by Accounts',
@@ -274,7 +274,7 @@
 
 		 Array('reportname'=>'Quotes Detailed Report',
                        'reportfolder'=>'Quote Reports',
-                       'description'=>'Quotes detailed vtiger_report',
+                       'description'=>'Quotes detailed report',
                        'reporttype'=>'tabular',
                        'sortid'=>'','stdfilterid'=>'','advfilterid'=>''),
 
@@ -286,13 +286,13 @@
 
 		 Array('reportname'=>'PurchaseOrder Detailed Report',
                        'reportfolder'=>'PurchaseOrder Reports',
-                       'description'=>'PurchaseOrder detailed vtiger_report',
+                       'description'=>'PurchaseOrder detailed report',
                        'reporttype'=>'tabular',
                        'sortid'=>'','stdfilterid'=>'','advfilterid'=>''),
 
 		 Array('reportname'=>'Invoice Detailed Report',
                        'reportfolder'=>'Invoice Reports',
-                       'description'=>'Invoice detailed vtiger_report',
+                       'description'=>'Invoice detailed report',
                        'reporttype'=>'tabular',
                        'sortid'=>'','stdfilterid'=>'','advfilterid'=>'')
 
@@ -300,33 +300,33 @@
 
 $sortorder = Array(
                    Array(
-                         Array('columnname'=>'leaddetails:leadsource:Leads_Lead_Source:leadsource:V',
+                         Array('columnname'=>'vtiger_leaddetails:leadsource:Leads_Lead_Source:leadsource:V',
                                'sortorder'=>'Ascending'
                               )
 			),
 		   Array(
-                         Array('columnname'=>'leaddetails:leadstatus:Leads_Lead_Status:leadstatus:V',
+                         Array('columnname'=>'vtiger_leaddetails:leadstatus:Leads_Lead_Status:leadstatus:V',
                                'sortorder'=>'Ascending'
                               )
                         ),
 		   Array(
-                         Array('columnname'=>'potential:sales_stage:Potentials_Sales_Stage:sales_stage:V',
+                         Array('columnname'=>'vtiger_potential:sales_stage:Potentials_Sales_Stage:sales_stage:V',
                                'sortorder'=>'Ascending'
                               )
                         ),
 		   Array(
-                         Array('columnname'=>'troubletickets:priority:HelpDesk_Priority:ticketpriorities:V',
+                         Array('columnname'=>'vtiger_troubletickets:priority:HelpDesk_Priority:ticketpriorities:V',
                                'sortorder'=>'Ascending'
                               )
                         )
                   );
 
-$stdfilters = Array(Array('columnname'=>'crmentityActivities:modifiedtime:Activities_Modified_Time',
+$stdfilters = Array(Array('columnname'=>'vtiger_crmentityActivities:modifiedtime:Activities_Modified_Time',
 			  'datefilter'=>'lastmonth',
 			  'startdate'=>'2005-05-01',
 			  'enddate'=>'2005-05-31'),
 
-		    Array('columnname'=>'crmentityActivities:modifiedtime:Activities_Modified_Time',
+		    Array('columnname'=>'vtiger_crmentityActivities:modifiedtime:Activities_Modified_Time',
                           'datefilter'=>'thismonth',
                           'startdate'=>'2005-06-01',
                           'enddate'=>'2005-06-30')
@@ -334,41 +334,41 @@
 
 $advfilters = Array(
                       Array(
-                            Array('columnname'=>'accountContacts:accountname:Contacts_Account_Name:account_id:I',
+                            Array('columnname'=>'vtiger_accountContacts:accountname:Contacts_Account_Name:account_id:I',
                                   'comparator'=>'n',
                                   'value'=>''
                                  )
                            ),
 		      Array(
-                            Array('columnname'=>'accountContacts:accountname:Contacts_Account_Name:account_id:I',
+                            Array('columnname'=>'vtiger_accountContacts:accountname:Contacts_Account_Name:account_id:I',
                                   'comparator'=>'e',
                                   'value'=>''
                                  )
                            ),
 		      Array(
-                            Array('columnname'=>'potential:potentialname:Potentials_Potential_Name:potentialname:V',
+                            Array('columnname'=>'vtiger_potential:potentialname:Potentials_Potential_Name:potentialname:V',
                                   'comparator'=>'n',
                                   'value'=>''
                                  )
                            ),
 		      Array(
-                            Array('columnname'=>'potential:sales_stage:Potentials_Sales_Stage:sales_stage:V',
+                            Array('columnname'=>'vtiger_potential:sales_stage:Potentials_Sales_Stage:sales_stage:V',
                                   'comparator'=>'e',
                                   'value'=>'Closed Won'
                                  )
                            ),
 		      Array(
-                            Array('columnname'=>'troubletickets:status:HelpDesk_Status:ticketstatus:V',
+                            Array('columnname'=>'vtiger_troubletickets:status:HelpDesk_Status:ticketstatus:V',
                                   'comparator'=>'n',
                                   'value'=>'Closed'
                                  )
                            ),
 		      Array(
-                            Array('columnname'=>'quotes:quotestage:Quotes_Quote_Stage:quotestage:V',
+                            Array('columnname'=>'vtiger_quotes:quotestage:Quotes_Quote_Stage:quotestage:V',
                                   'comparator'=>'n',
                                   'value'=>'Accepted'
                                  ),
-			    Array('columnname'=>'quotes:quotestage:Quotes_Quote_Stage:quotestage:V',
+			    Array('columnname'=>'vtiger_quotes:quotestage:Quotes_Quote_Stage:quotestage:V',
                                   'comparator'=>'n',
                                   'value'=>'Rejected'
                                  )




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 20 12:46:43 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 20 Jun 2006 16:46:43 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7313 -
 /vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
Message-ID: <20060620164643.BAD4F83F2E7@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 20 10:46:40 2006
New Revision: 7313

Log:
Activities added for Support parenttab

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

Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original)
+++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Tue Jun 20 10:46:40 2006
@@ -2158,7 +2158,8 @@
 	$this->db->query("insert into vtiger_parenttabrel values (4,10,7)");
 	$this->db->query("insert into vtiger_parenttabrel values (2,7,5)");
 	$this->db->query("insert into vtiger_parenttabrel values (4,9,6)");
-
+	$this->db->query("insert into vtiger_parenttabrel values (4,9,8)");
+		
 	//Added to populate the default inventory tax informations
 	$this->db->query("insert into vtiger_inventorytaxinfo values(".$this->db->getUniqueID("inventorytaxinfo").",'VAT','4.5')");
 	$this->db->query("insert into vtiger_inventorytaxinfo values(".$this->db->getUniqueID("inventorytaxinfo").",'Sales','10')");




From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 20:51:33 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 00:51:33 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231316=3A?=
 =?utf-8?q?_Problem_in_VCRM_4=2E2=2E4?=
In-Reply-To: <076.bd13c28908a052328e19e2f345da9f18@vtiger.fosslabs.com>
References: <076.bd13c28908a052328e19e2f345da9f18@vtiger.fosslabs.com>
Message-ID: <085.31967f7be92d906f7d30c35febc09b3a@vtiger.fosslabs.com>

#1316: Problem in VCRM 4.2.4
------------------------+---------------------------------------------------
  Reporter:  Simon      |       Owner:  developer                
      Type:  defect     |      Status:  new                      
  Priority:  major      |   Milestone:  4.2.4                    
 Component:  vtigercrm  |     Version:                           
Resolution:             |    Keywords:  email, quote, sales order
------------------------+---------------------------------------------------
Comment (by Simon):

 Hello,
 i just found the solution for no.3, when i change the source code of
 ..\modules\Quotes\CreatePDF.php"

 from (in the bottom of CreatePDF.php),
  $pdf->setProductDetails($iHeadDtls,$iDataDtls);
  $pdf->setTotal($price_total,$conditions);
  $pdf->Output('Quotes.pdf','D');
  exit;
  ?>

 to,

  $pdf->setProductDetails($iHeadDtls,$iDataDtls);
  $pdf->setTotal($price_total,$conditions);
  $pdf->Output();
  exit;
  ?>

 then the pdf file will open in the same window and the problem for this
 question is solved. the solution also need to apply in
 ..\modules\Orders\CreateSOPDF.php" because it contains same problem in
 module Quotes.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1316>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 22:27:17 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 02:27:17 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231345=3A?=
 =?utf-8?q?_Error_saving_the_sales_order?=
Message-ID: <076.2d41a315f9cfd034311ac755935afb51@vtiger.fosslabs.com>

#1345: Error saving the sales order
---------------------------------+------------------------------------------
 Reporter:  Simon                |       Owner:  developer
     Type:  defect               |      Status:  new      
 Priority:  major                |   Milestone:  5.0.0    
Component:  vtigercrm            |     Version:  5.0.0    
 Keywords:  quotes, sales order  |  
---------------------------------+------------------------------------------
 when creating a sales order directly from a quote, it contains bug. if you
 follows below step to create a sales order:-
 -create a quote using [New Quote], and save it
 -then open [Export To PDF] to view the quote in pdf
 -then create sales order directly from quote using [Create Sales Order]
 above the detail view of that quote and save it
 -then the bug occur which is the detail view of sales order is empty after
 save.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1345>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 20 22:31:05 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 02:31:05 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231346=3A?=
 =?utf-8?q?_Bug_in_sales_stage_history_with_date_format?=
Message-ID: <076.bab2ea728a9018419ac1466eb7e6303a@vtiger.fosslabs.com>

#1346: Bug in sales stage history with date format
-----------------------+----------------------------------------------------
 Reporter:  gopal      |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  blocker    |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 If it is used date format dd-mm-yyyy (commonly used in Poland) instead
 yyyy-mm-dd, in the sales stage history we receive wrong close date for
 potentials. Perhaps in the code for setting history record it is used
 fixed date format that doesn?t consider user date format set in user?s
 configuration.

 When is chosen yyyy-mm-dd date format, close date is set properly.

 Reported by: Pfilipkowski -
 http://forums.vtiger.com/viewtopic.php?p=26274#26274

 Thanks,

 Gopal

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1346>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 00:24:09 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 04:24:09 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7314 - in
 /vtigercrm/branches/4.2: data/ include/ modules/Accounts/ modules/Orders/
 modules/Settings/language/ modules/Users/
Message-ID: <20060621042410.19B6483F33D@vtiger.fosslabs.com>

Author: jrydbeck
Date: Tue Jun 20 22:23:57 2006
New Revision: 7314

Log:
Finished php notices bug #748.  This changeset will close-out the bug. Some noticies still appear, but should be bugged individually

Modified:
    vtigercrm/branches/4.2/data/SugarBean.php
    vtigercrm/branches/4.2/include/RelatedListView.php
    vtigercrm/branches/4.2/include/uifromdbutil.php
    vtigercrm/branches/4.2/include/utils.php
    vtigercrm/branches/4.2/modules/Accounts/RenderRelatedListUI.php
    vtigercrm/branches/4.2/modules/Orders/RenderRelatedListUI.php
    vtigercrm/branches/4.2/modules/Orders/SalesOrderDetailView.php
    vtigercrm/branches/4.2/modules/Orders/SalesOrderListView.php
    vtigercrm/branches/4.2/modules/Settings/language/en_us.lang.php
    vtigercrm/branches/4.2/modules/Users/DetailView.php
    vtigercrm/branches/4.2/modules/Users/EditView.php
    vtigercrm/branches/4.2/modules/Users/User.php

Modified: vtigercrm/branches/4.2/data/SugarBean.php
==============================================================================
--- vtigercrm/branches/4.2/data/SugarBean.php (original)
+++ vtigercrm/branches/4.2/data/SugarBean.php Tue Jun 20 22:23:57 2006
@@ -289,25 +289,25 @@
 		$rows_found =  $this->db->getRowCount($result);
 
 		$this->log->debug("Found $rows_found ".$this->object_name."s");
-                
+
 		$previous_offset = $row_offset - $max_per_page;
 		$next_offset = $row_offset + $max_per_page;
 
 		if($rows_found != 0)
 		{
-
 			// We have some data.
-
-			for($index = $row_offset , $row = $this->db->fetchByAssoc($result, $index); $row && ($index < $row_offset + $max_per_page || $max_per_page == -99) ;$index++, $row = $this->db->fetchByAssoc($result, $index)){
+			for($index = $row_offset , $row = $this->db->fetchByAssoc($result, $index); $row && ($index < $row_offset + $max_per_page || $max_per_page == -99) ;$index++, $row = $this->db->fetchByAssoc($result, $index))
+			{
 				foreach($this->list_fields as $field)
 				{
-					if (isset($row[$field])) {
+					if (isset($row[$field]))
+					{
 						$this->$field = $row[$field];
-						
-						
-						$this->log->debug("$this->object_name({$row['id']}): ".$field." = ".$this->$field);
+						// this used to display {$row['id']}, but that was broken and I'm
+						// 		not certain what that was supposed to display
+						$this->log->debug("$this->object_name(): ".$field." = ".$this->$field);
 					}
-					else 
+					else
 					{
 						$this->$field = "";
 					}

Modified: vtigercrm/branches/4.2/include/RelatedListView.php
==============================================================================
--- vtigercrm/branches/4.2/include/RelatedListView.php (original)
+++ vtigercrm/branches/4.2/include/RelatedListView.php Tue Jun 20 22:23:57 2006
@@ -1,670 +1,673 @@
-<?php
-require_once('modules/Users/UserInfoUtil.php');
-require_once("include/utils.php");
-
-function GetRelatedList($module,$relatedmodule,$focus,$query,$button,$returnset,$edit_val='',$del_val='')
-{
-
-require_once('XTemplate/xtpl.php');
-require_once("data/Tracker.php");
-require_once('include/database/PearDatabase.php');
-
-global $adb;
-global $app_strings;
-global $current_language;
-
-$mod_dir=getModuleDirName($module);
-$current_module_strings = return_module_language($current_language, $mod_dir);
-
-global $list_max_entries_per_page;
-global $urlPrefix;
-
-$log = LoggerManager::getLogger('account_list');
-
-global $currentModule;
-global $theme;
-global $theme_path;
-global $theme_path;
-
-// focus_list is the means of passing data to a ListView.
-global $focus_list;
-
-if (!isset($where)) $where = "";
-
-if (isset($_REQUEST['order_by'])) $order_by = $_REQUEST['order_by'];
-
-//if($module == 'Potentials')
-//	$focus = new Potential();
-
-echo '<br><br>';
-
-$button = '<table cellspacing=0 cellpadding=2><tr><td>'.$button.'</td></tr></table>';
-
-// Added to have Purchase Order as form Title
-if($relatedmodule == 'Orders') 
-{
-	echo get_form_header($app_strings['PurchaseOrder'],$button, false);
-}
-else
-{
-	echo get_form_header($app_strings[$relatedmodule],$button, false);
-}
-
-$xtpl=new XTemplate ('include/RelatedListView.html');
-require_once('themes/'.$theme.'/layout_utils.php');
-$theme_path="themes/".$theme."/";
-$image_path=$theme_path."images/";
-$xtpl->assign("MOD", $mod_strings);
-$xtpl->assign("APP", $app_strings);
-$xtpl->assign("IMAGE_PATH",$image_path);
-
-//Retreive the list from Database
-//$query = getListQuery("Accounts");
-
-//Appending the security parameter
-global $others_permission_id;
-global $current_user;
-$rel_tab_id = getTabid($relatedmodule);
-$defSharingPermissionData = $_SESSION['defaultaction_sharing_permission_set'];
-$others_rel_permission_id = $defSharingPermissionData[$rel_tab_id];
-if($others_rel_permission_id == 3 && $relatedmodule != 'Notes' && $relatedmodule != 'Products' && $relatedmodule != 'Faq' && $relatedmodule != 'PriceBook') //Security fix by Don
-{
-	 $query .= " and crmentity.smownerid in(".$current_user->id .",0)";
-}
-
-if(isset($where) && $where != '')
-{
-        $query .= ' and '.$where;
-}
-
-//Appending the group by for Jaguar/Don
-// group by won't work this way in postgres
-if($relatedmodule == 'Activities' && !$adb->isPostgres())
-{
-	$query .= ' group by crmentity.crmid';
-}
-
-
-//$url_qry = getURLstring($focus);
-
-if(isset($order_by) && $order_by != '')
-{
-        $query .= ' ORDER BY '.$order_by;
-        $url_qry .="&order_by=".$order_by;
-}
-
-$list_result = $adb->query($query);
-//Retreiving the no of rows
-$noofrows = $adb->num_rows($list_result);
-        
-//Retreiving the start value from request
-$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 = getRelatedNavigationValues($start, $noofrows, $list_max_entries_per_page, $relatedmodule);
-
-//Retreive the List View Table Header
-if($noofrows == 0)
-{
-	echo $app_strings['LBL_NONE_SCHEDULED'];
-}
-else
-{
-	$listview_header = getListViewHeader($focus,$relatedmodule,'','','','relatedlist');//"Accounts");
-	if ($navigation_array[$relatedmodule.'end_val'] - $navigation_array[$relatedmodule.'start'] > 15)
-	{
-		$xtpl->assign('SCROLLSTART','<div style="overflow:auto;height:315px;width:100%;">');
-		$xtpl->assign('SCROLLSTOP','</div>');
-	}
-	$xtpl->assign("LISTHEADER", $listview_header);
-
-	if($module == 'PriceBook' && $relatedmodule == 'Products')
-	{
-		$listview_entries = getListViewEntries($focus,$relatedmodule,$list_result,$navigation_array,'relatedlist',$returnset,$edit_val,$del_val);
-	}
-	if($module == 'Products' && $relatedmodule == 'PriceBook')
-	{
-		$listview_entries = getListViewEntries($focus,$relatedmodule,$list_result,$navigation_array,'relatedlist',$returnset,'EditListPrice','DeletePriceBookProductRel');
-	}
-	elseif($relatedmodule == 'SalesOrder')
-	{
-		$listview_entries = getListViewEntries($focus,$relatedmodule,$list_result,$navigation_array,'relatedlist',$returnset,'SalesOrderEditView','DeleteSalesOrder');
-	}else
-	{
-		$listview_entries = getListViewEntries($focus,$relatedmodule,$list_result,$navigation_array,'relatedlist',$returnset);
-	}
-
-	//$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, 'DetailView', '');
-	//echo $navigationOutput;
-
-	$navigationOutput = '
-<table  cellpadding="0" cellspacing="0" width="100%" border="0" class="FormBorder">
-        <tr height="20">
-                <td class="listFormHeaderLinks">
-                        <table border="0" cellpadding="0" cellspacing="0" width="100%">
-                        <tr>'.$navigationOutput.'</tr>
-                        </table>
-                </td>
-        </tr>
-</table>';
-
-
-	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");
-}
-
-}
-
-function getAttachmentsAndNotes($parentmodule,$query,$id,$sid='')
-{
-	global $theme;
-
-	$list = '<script>
-                        function confirmdelete(url)
-                        {
-                                if(confirm("Are you sure?"))
-                                {
-                                        document.location.href=url;
-                                }
-                        }
-                </script>';
-
-	$theme_path="themes/".$theme."/";
-	$image_path=$theme_path."images/";
-	require_once ($theme_path."layout_utils.php");
-
-	global $adb;
-	global $mod_strings;
-	global $app_strings;
-
-	$result=$adb->query($query);
-	$noofrows = $adb->num_rows($result);
-	if($sid=='salesorderid')
-	{
-		$return_action = "SalesOrderDetailView";
-	}
-	else
-	{
-		$return_action = "DetailView";
-	}
-	$button .= '<table cellspacing=0 cellpadding=2><tr><td>';
-	$button .= '<input type="hidden" name="fileid">';
-	$button .= '<input title="New Attachment" accessyKey="F" class="button" onclick="this.form.action.value=\'upload\';this.form.module.value=\'uploads\'" type="submit" name="button" value="'.$app_strings['LBL_NEW_ATTACHMENT'].'">&nbsp;';
-
-        if(isPermitted("Notes",1,"") == 'yes')
-        {
-	
-		$button .= '<input title="New Notes" accessyKey="F" class="button" onclick="this.form.action.value=\'EditView\';this.form.return_action.value=\''.$return_action.'\';this.form.module.value=\'Notes\'" type="submit" name="button" value="'.$app_strings['LBL_NEW_NOTE'].'">&nbsp;';
-	}
-	$button .= '</td></tr></table>';
-	
-
-echo '<br><br>';
-echo get_form_header($app_strings['LBL_ATTACHMENT_AND_NOTES'],$button, false);
-
-if($noofrows == 0)
-{
-	echo $app_strings['LBL_NONE_SCHEDULED'];
-}
-else
-{
+<?php
+require_once('modules/Users/UserInfoUtil.php');
+require_once("include/utils.php");
+
+function GetRelatedList($module,$relatedmodule,$focus,$query,$button,$returnset,$edit_val='',$del_val='')
+{
+
+require_once('XTemplate/xtpl.php');
+require_once("data/Tracker.php");
+require_once('include/database/PearDatabase.php');
+
+global $adb;
+global $app_strings;
+global $mod_strings;
+global $current_language;
+
+$mod_dir=getModuleDirName($module);
+$current_module_strings = return_module_language($current_language, $mod_dir);
+
+global $list_max_entries_per_page;
+global $urlPrefix;
+
+$log = LoggerManager::getLogger('account_list');
+
+global $currentModule;
+global $theme;
+global $theme_path;
+global $theme_path;
+
+// focus_list is the means of passing data to a ListView.
+global $focus_list;
+
+if (!isset($where)) $where = "";
+
+if (isset($_REQUEST['order_by'])) $order_by = $_REQUEST['order_by'];
+
+//if($module == 'Potentials')
+//	$focus = new Potential();
+
+echo '<br><br>';
+
+$button = '<table cellspacing=0 cellpadding=2><tr><td>'.$button.'</td></tr></table>';
+
+// Added to have Purchase Order as form Title
+if($relatedmodule == 'Orders') 
+{
+	echo get_form_header($app_strings['PurchaseOrder'],$button, false);
+}
+else
+{
+	echo get_form_header($app_strings[$relatedmodule],$button, false);
+}
+
+$xtpl=new XTemplate ('include/RelatedListView.html');
+require_once('themes/'.$theme.'/layout_utils.php');
+$theme_path="themes/".$theme."/";
+$image_path=$theme_path."images/";
+$xtpl->assign("MOD", $mod_strings);
+$xtpl->assign("APP", $app_strings);
+$xtpl->assign("IMAGE_PATH",$image_path);
+
+//Retreive the list from Database
+//$query = getListQuery("Accounts");
+
+//Appending the security parameter
+global $others_permission_id;
+global $current_user;
+$rel_tab_id = getTabid($relatedmodule);
+$defSharingPermissionData = $_SESSION['defaultaction_sharing_permission_set'];
+$others_rel_permission_id = $defSharingPermissionData[$rel_tab_id];
+if($others_rel_permission_id == 3 && $relatedmodule != 'Notes' && $relatedmodule != 'Products' && $relatedmodule != 'Faq' && $relatedmodule != 'PriceBook') //Security fix by Don
+{
+	 $query .= " and crmentity.smownerid in(".$current_user->id .",0)";
+}
+
+if(isset($where) && $where != '')
+{
+        $query .= ' and '.$where;
+}
+
+//Appending the group by for Jaguar/Don
+// group by won't work this way in postgres
+if($relatedmodule == 'Activities' && !$adb->isPostgres())
+{
+	$query .= ' group by crmentity.crmid';
+}
+
+
+//$url_qry = getURLstring($focus);
+
+if(isset($order_by) && $order_by != '')
+{
+        $query .= ' ORDER BY '.$order_by;
+        $url_qry .="&order_by=".$order_by;
+}
+
+$list_result = $adb->query($query);
+//Retreiving the no of rows
+$noofrows = $adb->num_rows($list_result);
+        
+//Retreiving the start value from request
+$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 = getRelatedNavigationValues($start, $noofrows, $list_max_entries_per_page, $relatedmodule);
+
+//Retreive the List View Table Header
+if($noofrows == 0)
+{
+	echo $app_strings['LBL_NONE_SCHEDULED'];
+}
+else
+{
+	$listview_header = getListViewHeader($focus,$relatedmodule,'','','','relatedlist');//"Accounts");
+	if ($navigation_array[$relatedmodule.'end_val'] - $navigation_array[$relatedmodule.'start'] > 15)
+	{
+		$xtpl->assign('SCROLLSTART','<div style="overflow:auto;height:315px;width:100%;">');
+		$xtpl->assign('SCROLLSTOP','</div>');
+	}
+	$xtpl->assign("LISTHEADER", $listview_header);
+
+	if($module == 'PriceBook' && $relatedmodule == 'Products')
+	{
+		$listview_entries = getListViewEntries($focus,$relatedmodule,$list_result,$navigation_array,'relatedlist',$returnset,$edit_val,$del_val);
+	}
+	if($module == 'Products' && $relatedmodule == 'PriceBook')
+	{
+		$listview_entries = getListViewEntries($focus,$relatedmodule,$list_result,$navigation_array,'relatedlist',$returnset,'EditListPrice','DeletePriceBookProductRel');
+	}
+	elseif($relatedmodule == 'SalesOrder')
+	{
+		$listview_entries = getListViewEntries($focus,$relatedmodule,$list_result,$navigation_array,'relatedlist',$returnset,'SalesOrderEditView','DeleteSalesOrder');
+	}else
+	{
+		$listview_entries = getListViewEntries($focus,$relatedmodule,$list_result,$navigation_array,'relatedlist',$returnset);
+	}
+
+	//$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, 'DetailView', '');
+	//echo $navigationOutput;
+
+	$navigationOutput = '
+<table  cellpadding="0" cellspacing="0" width="100%" border="0" class="FormBorder">
+        <tr height="20">
+                <td class="listFormHeaderLinks">
+                        <table border="0" cellpadding="0" cellspacing="0" width="100%">
+                        <tr>'.$navigationOutput.'</tr>
+                        </table>
+                </td>
+        </tr>
+</table>';
+
+
+	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");
+}
+
+}
+
+function getAttachmentsAndNotes($parentmodule,$query,$id,$sid='')
+{
+	global $theme;
+
+	$list = '<script>
+                        function confirmdelete(url)
+                        {
+                                if(confirm("Are you sure?"))
+                                {
+                                        document.location.href=url;
+                                }
+                        }
+                </script>';
+
+	$theme_path="themes/".$theme."/";
+	$image_path=$theme_path."images/";
+	require_once ($theme_path."layout_utils.php");
+
+	global $adb;
+	global $mod_strings;
+	global $app_strings;
+
+	$result=$adb->query($query);
+	$noofrows = $adb->num_rows($result);
+	
+	if($sid=='salesorderid')
+	{
+		$return_action = "SalesOrderDetailView";
+	}
+	else
+	{
+		$return_action = "DetailView";
+	}
+	
+	$button = '<table cellspacing=0 cellpadding=2><tr><td>';
+	$button .= '<input type="hidden" name="fileid">';
+	$button .= '<input title="New Attachment" accessyKey="F" class="button" onclick="this.form.action.value=\'upload\';this.form.module.value=\'uploads\'" type="submit" name="button" value="'.$app_strings['LBL_NEW_ATTACHMENT'].'">&nbsp;';
+
+        if(isPermitted("Notes",1,"") == 'yes')
+        {
+	
+		$button .= '<input title="New Notes" accessyKey="F" class="button" onclick="this.form.action.value=\'EditView\';this.form.return_action.value=\''.$return_action.'\';this.form.module.value=\'Notes\'" type="submit" name="button" value="'.$app_strings['LBL_NEW_NOTE'].'">&nbsp;';
+	}
+	$button .= '</td></tr></table>';
+	
+
+echo '<br><br>';
+echo get_form_header($app_strings['LBL_ATTACHMENT_AND_NOTES'],$button, false);
+
+if($noofrows == 0)
+{
+	echo $app_strings['LBL_NONE_SCHEDULED'];
+}
+else
+{
 // begin: Armando L?scher 15.07.2005 -> ?scrollableTables
 // Desc: class="blackLine" deleted because of vertical line in title <tr>
-	$list .= '<table border="0" cellpadding="0" cellspacing="0" class="FormBorder" width="100%">';
-	$list .= '<tr class="ModuleListTitle" height=20>';
-
-	$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-	$list .= '<td width="30%" class="moduleListTitle">';
-
-	$class_black="";
-	if($noofrows<15)
-	{
-		$class_black='class="blackLine"';
-	}
-	$list .= $app_strings['LBL_TITLE_OR_DESCRIPTION'].'</td>';
-	$list .= '<td WIDTH="1" '.$class_black .'><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-	$list .= '<td width="10%" class="moduleListTitle">';
-
-	$list .= $app_strings['LBL_ENTITY_TYPE'].'</td>';
-	$list .= '<td WIDTH="1" '.$class_black .'><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-	$list .= '<td width="15%" class="moduleListTitle">';
-
-	$list .= $app_strings['LBL_FILENAME'].'</td>';
-	$list .= '<td WIDTH="1" '.$class_black .'><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-	$list .= '<td width="15%" class="moduleListTitle">';
-
-	$list .= $app_strings['LBL_TYPE'].'</td>';
-	$list .= '<td WIDTH="1" '.$class_black .'><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-	$list .= '<td width="20%" class="moduleListTitle">';
-
-	$list .= $app_strings['LBL_LAST_MODIFIED'].'</td>';
-	$list .= '<td WIDTH="1" '.$class_black .'><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-	$list .= '<td width="10%" class="moduleListTitle" height="21">';
-
-	$list .= $app_strings['LBL_ACTION'].'</td>';
-	$list .= '<td WIDTH="1" '.$class_black .'><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-	$list .= '<td class="moduleListTitle">';
-
-	$list .= '</td>';
-	if($noofrows>15)
-	{
-		$list .= '<td style="width:20px">&nbsp;&nbsp&nbsp;&nbsp;</td>';
-	}
-
-	$list .= '</tr>';
-	$list .= '<tr><td COLSPAN="12" class="blackLine"><IMG SRC="themes/'.$theme.'/images//blank.gif"></td></tr>';
-//	$list .= '</table>';
-// end: Armando L?scher 15.07.2005 -> scrollableTables
-
-// begin: Armando L?scher 14.07.2005 -> ?scrollableTables
-// Desc: 'Y'
-//			 Insert new table with 1 cell where all entries are in a new table.
-//			 This cell will be scrollable when too many entries exist
-	$list .= ($noofrows>15) ? '<tr><td colspan="20"><div style="overflow:auto;height:315px;width:100%;"><table cellspacing="0" cellpadding="0" border="0" width="100%">':'';
-// end: Armando L?scher 14.07.2005 -> ?scrollableTables
-
-	$i=1;
-	while($row = $adb->fetch_array($result))
-	{
-        	if($row[1] == 'Notes')
-	        {
-        	        $module = 'Notes';
-                	$editaction = 'EditView';
-	                $deleteaction = 'Delete';
-        	}
-	        elseif($row[1] == 'Attachments')
-	        {
-	                $module = 'uploads';
-	                $editaction = 'upload';
-	                $deleteaction = 'deleteattachments';
-	        }
-
-		if ($i%2==0)
-			$trowclass = 'evenListRow';
-		else
-			$trowclass = 'oddListRow';
-
-		$list .= '<tr class="'. $trowclass.'">';
-
-		$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-
-		if($module == 'Notes')
-			$list .= '<td width="30%"><a href="index.php?module='.$module.'&action=DetailView&return_module='.$returnmodule.'&return_action='.$returnaction.'&record='.$row["crmid"] .'&return_id='.$_REQUEST['record'].'">'.$row[0].'</td>';
-		elseif($module == 'uploads')
-			$list .= '<td width="30%">'.$row[0].'</td>';
-
-		$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-		$list .= '<td width="10%" height="21" style="padding:0px 3px 0px 3px;">';
-		$list .= $row[1];
-		$list .= '</td>';
-
-		$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-		$list .= '<td width="15%" height="21" style="padding:0px 3px 0px 3px;">';
-		$list .= '<a href = "index.php?module=uploads&action=downloadfile&return_module=Accounts&activity_type=' . $row[1] . '&fileid=' . $row[5] . '&filename=' . urlencode($row[2]) . '">' . $row[2] . '</a>';
-		$list .= '</td>';
-
-		$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-		$list .= '<td width="15%" height="21" style="padding:0px 3px 0px 3px;">';
-		$list .= $row[3];
-		$list .= '</td>';
-
-		$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-		$list .= '<td width="20%" height="21" style="padding:0px 3px 0px 3px;">';
-
-		if($row[4] != '0000-00-00 00:00:00')
-			$list .= $row[4];
-		else
-                        $list .= '';
-
-		$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-		$list .= '<td width="10%" height="21" style="padding:0px 3px 0px 3px;">';
-
-		if($row[1] == 'Notes')
-			$list .= '<a href="index.php?module='.$module.'&action='.$editaction.'&return_module='.$parentmodule.'&return_action='.$return_action.'&record='.$row["crmid"].'&filename='.$row[2].'&fileid='.$row['attachmentsid'].'&return_id='.$_REQUEST["record"].'">'.$app_strings['LNK_EDIT'].'</a>  |  ';
-//		$list .= '<a href="index.php?module='.$module.'&action='.$deleteaction.'&return_module='.$parentmodule.'&return_action=DetailView&record='.$row["crmid"].'&filename='.$row[2].'&return_id='.$_REQUEST["record"].'">'.$app_strings['LNK_DELETE'].'</a>';
-		$del_param = 'index.php?module='.$module.'&action='.$deleteaction.'&return_module='.$parentmodule.'&return_action='.$return_action.'&record='.$row["crmid"].'&filename='.$row[2].'&return_id='.$_REQUEST["record"];
-                $list .= '<a href="javascript:confirmdelete(\''.$del_param.'\')">'.$app_strings['LNK_DELETE'].'</a>';
-
-		$list .= '</td>';
-
-		$list .= '</tr>';
-		$i++;
-	}
-	
-// begin: Armando L?scher 14.07.2005 -> ?scrollableTables
-// Desc: Close table from 'Y'
-		$list .= ($noofrows>15) ? '</table></div></td></tr>':'';
-// end: Armando L?scher 14.07.2005 -> scrollableTables
-
-	$list .= '<tr><td COLSPAN="12" class="blackLine"><IMG SRC="themes/'.$theme.'/images//blank.gif"></td></tr>';
-	$list .= '</table>';
-	echo $list;
-
-}
-}
-
-function getHistory($parentmodule,$query,$id)
-{
-	$parentaction = $_REQUEST['action'];
-	global $theme;
-	$theme_path="themes/".$theme."/";
-	$image_path=$theme_path."images/";
-	require_once ($theme_path."layout_utils.php");
-
-	global $adb;
-	global $mod_strings;
-	global $app_strings;
-
-	//Appending the security parameter
-	global $others_permission_id;
-	global $current_user;
-	$rel_tab_id = getTabid("Activities");
-	$defSharingPermissionData = $_SESSION['defaultaction_sharing_permission_set'];
-	$others_rel_permission_id = $defSharingPermissionData[$rel_tab_id];
-	if($others_rel_permission_id == 3) //Security fix by Don
-	{
-         	$query .= " and crmentity.smownerid in(".$current_user->id .",0)";
-	}
-
-	$result=$adb->query($query);
-	$noofrows = $adb->num_rows($result);
-	
-	$button .= '<table cellspacing=0 cellpadding=2><tr><td>';
-	$button .= '</td></tr></table>';
-
-	echo '<br><br>';
-	echo get_form_header($app_strings['LBL_HISTORY'],'', false);
-
-	if($noofrows == 0)
-	{
-		echo $app_strings['LBL_NONE_SCHEDULED'];
-	}
-	else
-	{
-		$list .= '<table border="0" cellpadding="0" cellspacing="0" class="FormBorder" width="100%" >';
-		$list .= '<tr class="ModuleListTitle" height=20>';
-
-		$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-		$list .= '<td width="4%" class="moduleListTitle"></td>';
-
-// Armando L?scher 15.07.2005 -> ?scrollableTables
-// Desc: class="blackLine" deleted because of vertical line in title <tr>
-
-//		$list .= $app_strings['LBL_ICON'].'Icon</td>';
-		$class_black="";
-		if($noofrows<15)
-		{
-			$class_black='class="blackLine"';	
-		}
-
-		$list .= '<td WIDTH="1" '.$class_black.'><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-		$list .= '<td width="25%" class="moduleListTitle" style="padding:0px 3px 0px 3px;">';
-	
-		$list .= $app_strings['LBL_SUBJECT'].'</td>';
-		$list .= '<td WIDTH="1" '.$class_black.'><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-		$list .= '<td width="10%" class="moduleListTitle" style="padding:0px 3px 0px 3px;">';
-	
-		$list .= $app_strings['LBL_STATUS'].'</td>';
-		$list .= '<td WIDTH="1" '.$class_black.'><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-		$list .= '<td width="18%" class="moduleListTitle" style="padding:0px 3px 0px 3px;">';
-	
-		$list .= $app_strings['LBL_LIST_CONTACT_NAME'].'</td>';
-		$list .= '<td WIDTH="1" '.$class_black.'><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-		$list .= '<td width="18%" class="moduleListTitle" style="padding:0px 3px 0px 3px;">';
-
-		$list .= $app_strings['LBL_RELATED_TO'].'</td>';
-		$list .= '<td WIDTH="1" '.$class_black.'><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-		$list .= '<td width="15%" class="moduleListTitle" style="padding:0px 3px 0px 3px;">';
-	
-		$list .= $app_strings['LBL_LAST_MODIFIED'].'</td>';
-		$list .= '<td WIDTH="1" '.$class_black.'><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-		$list .= '<td width="10%" class="moduleListTitle" height="21" style="padding:0px 3px 0px 3px;">';
-
-		$list .= $app_strings['LBL_ACTION'].'</td>';
-		$list .= '<td WIDTH="1" '.$class_black.'><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-		$list .= '<td class="moduleListTitle">';
-
-		$list .= '</td>';
-		if($noofrows>15)
-		{
-			$list .= '<td style="width:20px">&nbsp;&nbsp&nbsp;&nbsp;</td>';
-		}
-		$list .= '</tr>';
-	
-		$list .= '<tr><td COLSPAN="14" class="blackLine"><IMG SRC="themes/'.$theme.'/images//blank.gif"></td></tr>';
-
-// begin: Armando L?scher 14.07.2005 -> ?scrollableTables
-// Desc: 'X'
-//			 Insert new table with 1 cell where all entries are in a new table.
-//			 This cell will be scrollable when too many entries exist
-		$list .= ($noofrows>15) ? '<tr><td colspan="21"><div style="overflow:auto;height:315px;width:100%;"><table cellspacing="0" cellpadding="0" border="0" width="100%">':'';
-// end: Armando L?scher 14.07.2005 -> ?scrollableTablEs
-
-		$i=1;
-		while($row = $adb->fetch_array($result))
-		{
-			if($row['activitytype'] == 'Task')
-			{
-				$activitymode = 'Task';
-				$icon = 'Tasks.gif';
-				$status = $row['status'];
-			}
-			elseif($row['activitytype'] == 'Call' || $row['activitytype'] == 'Meeting')
-			{
-				$activitymode = 'Events';
-				$icon = 'Activities.gif';
-				$status = $row['eventstatus'];
-			}
-			if ($i%2==0)
-				$trowclass = 'evenListRow';
-			else
-				$trowclass = 'oddListRow';
-	
-			$list .= '<tr class="'. $trowclass.'">';
-	
-			$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-			$list .= '<td width="4%"><IMG SRC="'.$image_path.'/'.$icon.'"></td>';
-
-			$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-			$list .= '<td width="25%" height="21" style="padding:0px 3px 0px 3px;">';
-			$list .= '<a href="index.php?module=Activities&action=DetailView&return_module='.$parentmodule.'&return_action=DetailView&record='.$row["activityid"] .'&activity_mode='.$activitymode.'&return_id='.$_REQUEST['record'].'" title="'.$row['description'].'">'.$row['subject'].'</a></td>';
-			$list .= '</td>';
-	
-			$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-			$list .= '<td width="10%" height="21" style="padding:0px 3px 0px 3px;">';
-			$list .= $status;
-			$list .= '</td>';
-
-			if($row['firstname'] != 'NULL')	
-				$contactname = $row['firstname'].' ';
-			if($ros['lastname'] != 'NULL')
-				$contactname .= $row['lastname'];
-
-			$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-			$list .= '<td width="18%" height="21" style="padding:0px 3px 0px 3px;">';
-			$list .= '<a href="index.php?module=Contacts&action=DetailView&return_module='.$parentmodule.'&return_action=DetailView&record='.$row["contactid"].'&return_id='.$_REQUEST['record'].'">'.$contactname;
-			$list .= '</td>';
-
-			$parentname = getRelatedTo('Activities',$result,$i-1);
-
-			$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-			$list .= '<td width="18%" height="21" style="padding:0px 3px 0px 3px;">';
-			$list .= $parentname;
-			$list .= '</td>';
-	
-			$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-			$list .= '<td width="15%" height="21" style="padding:0px 3px 0px 3px;">';
-			$modifiedtime = getDisplayDate($row['modifiedtime']);
-			$list .= $modifiedtime;
-	
-			$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-			$list .= '<td width="10%" height="21" style="padding:0px 3px 0px 3px;">';
-
-			if(isPermitted("Activities",1,$row["activityid"]) == 'yes')
-                	{
-	
-				$list .= '<a href="index.php?module=Activities&action=EditView&return_module='.$parentmodule.'&return_action='.$parentaction.'&activity_mode='.$activitymode.'&record='.$row["activityid"].'&return_id='.$_REQUEST["record"].'">'.$app_strings['LNK_EDIT'].'</a>  |  ';
-			}
-	
-			if(isPermitted("Activities",2,$row["activityid"]) == 'yes')
-                	{
-				$list .= '<a href="index.php?module=Activities&action=Delete&return_module='.$parentmodule.'&return_action='.$parentaction.'&record='.$row["activityid"].'&return_id='.$_REQUEST["record"].'">'.$app_strings['LNK_DELETE'].'</a>';
-			}
-	
-			$list .= '</td>';
-			
-			$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-
-			$list .= '</tr>';
-			$i++;
-		}
-
-// begin: Armando L?scher 14.07.2005 -> ?scrollableTables
-// Desc: Close table from 
-		$list .= ($noofrows>15) ? '</table></div></td></tr>':'';
-// end: Armando L?scher 14.07.2005 -> ?scrollableTables
-
-		$list .= '<tr><td colspan="14" class="blackLine"></td></tr>';
-
-		$list .= '</table>';
-		echo $list;
-	}
-}
-
-function getPriceBookRelatedProducts($query,$focus,$returnset='')
-{
-	global $adb;
-	global $app_strings;
-	global $mod_strings;
-	global $current_language;
-	$current_module_strings = return_module_language($current_language, 'Products');
-
-	global $list_max_entries_per_page;
-	global $urlPrefix;
-
-
-	global $theme;
-	$pricebook_id = $_REQUEST['record'];
-	$theme_path="themes/".$theme."/";
-	$image_path=$theme_path."images/";
-	require_once($theme_path.'layout_utils.php');
-	$list_result = 	$adb->query($query);
-	$num_rows = $adb->num_rows($list_result);
-	$xtpl=new XTemplate('include/RelatedListView.html');
-	$xtpl->assign("MOD", $mod_strings);
-	$xtpl->assign("APP", $app_strings);
-	$xtpl->assign("IMAGE_PATH",$image_path);
-	echo '<BR>';
-	$other_text = '<table width="100%" border="0" cellpadding="1" cellspacing="0">
-	<form name="selectproduct" method="POST">
-	<tr>
-	<input name="action" type="hidden" value="AddProductsToPriceBook">
-	<input name="module" type="hidden" value="Products">
-	<input name="return_module" type="hidden" value="Products">
-	<input name="return_action" type="hidden" value="PriceBookDetailView">
-	<input name="pricebook_id" type="hidden" value="'.$_REQUEST["record"].'">';
-
-        $other_text .='<td><input title="Select Products" accessyKey="F" class="button" onclick="this.form.action.value=\'AddProductsToPriceBook\';this.form.module.value=\'Products\';this.form.return_module.value=\'Products\';this.form.return_action.value=\'PriceBookDetailView\'" type="submit" name="button" value="'.$app_strings["LBL_SELECT_PRODUCT_BUTTON_LABEL"].'"></td>';
-		$other_text .='</tr></table>';
-
-//Retreive the list from Database
-echo get_form_header($current_module_strings['LBL_LIST_FORM_TITLE'], $other_text, false );
-
-
-//echo $list_query;
-$list_result = $adb->query($query);
-$num_rows = $adb->num_rows($list_result);
-
-//Retreive the List View Table Header
-
-// Armando L?scher 15.07.2005 -> ?scrollableTables
-// Desc: class="blackLine" deleted because of vertical line in title <tr>
-
-//		$list .= $app_strings['LBL_ICON'].'Icon</td>';
-		$class_black="";
-		if($num_rows<15)
-		{
-			$class_black='class="blackLine"';	
-		}
-
-$list_header = '';
-$list_header .= '<tr class="moduleListTitle" height=20>';
-$list_header .= '<td WIDTH="1" class="blackLine"><IMG SRC="'.$image_path.'blank.gif"></td>';
-$list_header .= '<td width="40%" class="moduleListTitle" height="21" style="padding:0px 3px 0px 3px;">'.$mod_strings['LBL_LIST_PRODUCT_NAME'].'</td>';
-$list_header .='<td WIDTH="1" '.$class_black.' NOWRAP><IMG SRC="{IMAGE_PATH}blank.gif"></td>';
-$list_header .= '<td width="15%" class="moduleListTitle" height="21" style="padding:0px 3px 0px 3px;">'.$mod_strings['LBL_PRODUCT_CODE'].'</td>';
-$list_header .='<td WIDTH="1" '.$class_black.' NOWRAP><IMG SRC="{IMAGE_PATH}blank.gif"></td>';
-$list_header .= '<td width="15%" class="moduleListTitle" height="21" style="padding:0px 3px 0px 3px;">'.$mod_strings['LBL_PRODUCT_UNIT_PRICE'].'</td>';
-$list_header .='<td WIDTH="1" '.$class_black.' NOWRAP><IMG SRC="{IMAGE_PATH}blank.gif"></td>';
-$list_header .= '<td width="15%" class="moduleListTitle" height="21" style="padding:0px 3px 0px 3px;">'.$mod_strings['LBL_PB_LIST_PRICE'].'</td>';
-$list_header .='<td WIDTH="1" '.$class_black.' NOWRAP><IMG SRC="{IMAGE_PATH}blank.gif"></td>';
-$list_header .= '<td width="15%" class="moduleListTitle" height="21" style="padding:0px 3px 0px 3px;">Edit|Del</td>';
-$list_header .='<td WIDTH="1" class="blackLine" NOWRAP><IMG SRC="{IMAGE_PATH}blank.gif"></td>';
-
-$list_header .= '</tr>';
-
-$xtpl->assign("LISTHEADER", $list_header);
-
-$list_body ='';
-// begin: Armando L?scher 14.07.2005 -> ?scrollableTables
-// Desc: 'X'
-//			 Insert new table with 1 cell where all entries are in a new table.
-//			 This cell will be scrollable when too many entries exist
-		$list_body .= ($num_rows>15) ? '<tr><td colspan="12"><div style="overflow:auto;height:315px;width:100%;"><table cellspacing="0" cellpadding="0" border="0" width="100%">':'';
-// end: Armando L?scher 14.07.2005 -> ?scrollableTablEs
-
-for($i=0; $i<$num_rows; $i++)
-{
-	$entity_id = $adb->query_result($list_result,$i,"crmid");
-		if (($i%2)==0)
-			$list_body .= '<tr height=20 class=evenListRow>';
-		else
-			$list_body .= '<tr height=20 class=oddListRow>';
-
-		$unit_price = 	$adb->query_result($list_result,$i,"unit_price");
-		$listprice = $adb->query_result($list_result,$i,"listprice");
-		$field_name=$entity_id."_listprice";
-
-		$list_body .= '<td WIDTH="1" class="blackLine"><IMG SRC="'.$image_path.'blank.gif"></td>';
-		$list_body .= '<td width="40%" height="21" style="padding:0px 3px 0px 3px;">'.$adb->query_result($list_result,$i,"productname").'</td>';
-		$list_body .='<td WIDTH="1" class="blackLine" NOWRAP><IMG SRC="'.$image_path.'blank.gif"></td>';
-		$list_body .= '<td width="15%" height="21" style="padding:0px 3px 0px 3px;">'.$adb->query_result($list_result,$i,"productcode").'</td>';
-		$list_body .='<td WIDTH="1" class="blackLine" NOWRAP><IMG SRC="'.$image_path.'blank.gif"></td>';
-		$list_body .= '<td width="15%" height="21" style="padding:0px 3px 0px 3px;">'.$unit_price.'</td>';
-		$list_body .='<td WIDTH="1" class="blackLine" NOWRAP><IMG SRC="'.$image_path.'blank.gif"></td>';
-		$list_body .= '<td width="15%" height="21" style="padding:0px 3px 0px 3px;">'.$listprice.'</td>';
-		$list_body .='<td WIDTH="1" class="blackLine" NOWRAP><IMG SRC="'.$image_path.'blank.gif"></td>';
-		$list_body .= '<td width="15%" height="21" style="padding:0px 3px 0px 3px;"><a href="index.php?module=Products&action=EditListPrice&record='.$entity_id.'&pricebook_id='.$pricebook_id.'&listprice='.$listprice.'">edit</a>&nbsp;|&nbsp;<a href="index.php?module=Products&action=DeletePriceBookProductRel'.$returnset.'&record='.$entity_id.'&pricebook_id='.$pricebook_id.'">del</a></td>';
-	$list_body .='<td WIDTH="1" class="blackLine" NOWRAP><IMG SRC="'.$image_path.'blank.gif"></td></tr>';
-	
-}
-// begin: Armando L?scher 14.07.2005 -> ?scrollableTables
-// Desc: Close table from 
-		$list_body .= ($num_rows>15) ? '</table></div></td></tr>':'';
-// end: Armando L?scher 14.07.2005 -> ?scrollableTables
-
-	$list_body .= '<tr><td COLSPAN="12" class="blackLine"><IMG SRC="themes/'.$theme.'/images//blank.gif"></td></tr>';
-
-//$listview_entries = getListViewEntries($focus,"Products",$list_result,$navigation_array);
-
-$xtpl->assign("LISTENTITY", $list_body);
-
-$xtpl->parse("main");
-$xtpl->out("main");	
-
-}
-
-//echo '</form>';
-?>
+	$list .= '<table border="0" cellpadding="0" cellspacing="0" class="FormBorder" width="100%">';
+	$list .= '<tr class="ModuleListTitle" height=20>';
+
+	$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
+	$list .= '<td width="30%" class="moduleListTitle">';
+
+	$class_black="";
+	if($noofrows<15)
+	{
+		$class_black='class="blackLine"';
+	}
+	$list .= $app_strings['LBL_TITLE_OR_DESCRIPTION'].'</td>';
+	$list .= '<td WIDTH="1" '.$class_black .'><IMG SRC="themes/'.$theme.'/images/blank.gif">';
+	$list .= '<td width="10%" class="moduleListTitle">';
+
+	$list .= $app_strings['LBL_ENTITY_TYPE'].'</td>';
+	$list .= '<td WIDTH="1" '.$class_black .'><IMG SRC="themes/'.$theme.'/images/blank.gif">';
+	$list .= '<td width="15%" class="moduleListTitle">';
+
+	$list .= $app_strings['LBL_FILENAME'].'</td>';
+	$list .= '<td WIDTH="1" '.$class_black .'><IMG SRC="themes/'.$theme.'/images/blank.gif">';
+	$list .= '<td width="15%" class="moduleListTitle">';
+
+	$list .= $app_strings['LBL_TYPE'].'</td>';
+	$list .= '<td WIDTH="1" '.$class_black .'><IMG SRC="themes/'.$theme.'/images/blank.gif">';
+	$list .= '<td width="20%" class="moduleListTitle">';
+
+	$list .= $app_strings['LBL_LAST_MODIFIED'].'</td>';
+	$list .= '<td WIDTH="1" '.$class_black .'><IMG SRC="themes/'.$theme.'/images/blank.gif">';
+	$list .= '<td width="10%" class="moduleListTitle" height="21">';
+
+	$list .= $app_strings['LBL_ACTION'].'</td>';
+	$list .= '<td WIDTH="1" '.$class_black .'><IMG SRC="themes/'.$theme.'/images/blank.gif">';
+	$list .= '<td class="moduleListTitle">';
+
+	$list .= '</td>';
+	if($noofrows>15)
+	{
+		$list .= '<td style="width:20px">&nbsp;&nbsp&nbsp;&nbsp;</td>';
+	}
+
+	$list .= '</tr>';
+	$list .= '<tr><td COLSPAN="12" class="blackLine"><IMG SRC="themes/'.$theme.'/images//blank.gif"></td></tr>';
+//	$list .= '</table>';
+// end: Armando L?scher 15.07.2005 -> scrollableTables
+
+// begin: Armando L?scher 14.07.2005 -> ?scrollableTables
+// Desc: 'Y'
+//			 Insert new table with 1 cell where all entries are in a new table.
+//			 This cell will be scrollable when too many entries exist
+	$list .= ($noofrows>15) ? '<tr><td colspan="20"><div style="overflow:auto;height:315px;width:100%;"><table cellspacing="0" cellpadding="0" border="0" width="100%">':'';
+// end: Armando L?scher 14.07.2005 -> ?scrollableTables
+
+	$i=1;
+	while($row = $adb->fetch_array($result))
+	{
+        	if($row[1] == 'Notes')
+	        {
+        	        $module = 'Notes';
+                	$editaction = 'EditView';
+	                $deleteaction = 'Delete';
+        	}
+	        elseif($row[1] == 'Attachments')
+	        {
+	                $module = 'uploads';
+	                $editaction = 'upload';
+	                $deleteaction = 'deleteattachments';
+	        }
+
+		if ($i%2==0)
+			$trowclass = 'evenListRow';
+		else
+			$trowclass = 'oddListRow';
+
+		$list .= '<tr class="'. $trowclass.'">';
+
+		$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
+
+		if($module == 'Notes')
+			$list .= '<td width="30%"><a href="index.php?module='.$module.'&action=DetailView&return_module='.$returnmodule.'&return_action='.$returnaction.'&record='.$row["crmid"] .'&return_id='.$_REQUEST['record'].'">'.$row[0].'</td>';
+		elseif($module == 'uploads')
+			$list .= '<td width="30%">'.$row[0].'</td>';
+
+		$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
+		$list .= '<td width="10%" height="21" style="padding:0px 3px 0px 3px;">';
+		$list .= $row[1];
+		$list .= '</td>';
+
+		$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
+		$list .= '<td width="15%" height="21" style="padding:0px 3px 0px 3px;">';
+		$list .= '<a href = "index.php?module=uploads&action=downloadfile&return_module=Accounts&activity_type=' . $row[1] . '&fileid=' . $row[5] . '&filename=' . urlencode($row[2]) . '">' . $row[2] . '</a>';
+		$list .= '</td>';
+
+		$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
+		$list .= '<td width="15%" height="21" style="padding:0px 3px 0px 3px;">';
+		$list .= $row[3];
+		$list .= '</td>';
+
+		$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
+		$list .= '<td width="20%" height="21" style="padding:0px 3px 0px 3px;">';
+
+		if($row[4] != '0000-00-00 00:00:00')
+			$list .= $row[4];
+		else
+                        $list .= '';
+
+		$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
+		$list .= '<td width="10%" height="21" style="padding:0px 3px 0px 3px;">';
+
+		if($row[1] == 'Notes')
+			$list .= '<a href="index.php?module='.$module.'&action='.$editaction.'&return_module='.$parentmodule.'&return_action='.$return_action.'&record='.$row["crmid"].'&filename='.$row[2].'&fileid='.$row['attachmentsid'].'&return_id='.$_REQUEST["record"].'">'.$app_strings['LNK_EDIT'].'</a>  |  ';
+//		$list .= '<a href="index.php?module='.$module.'&action='.$deleteaction.'&return_module='.$parentmodule.'&return_action=DetailView&record='.$row["crmid"].'&filename='.$row[2].'&return_id='.$_REQUEST["record"].'">'.$app_strings['LNK_DELETE'].'</a>';
+		$del_param = 'index.php?module='.$module.'&action='.$deleteaction.'&return_module='.$parentmodule.'&return_action='.$return_action.'&record='.$row["crmid"].'&filename='.$row[2].'&return_id='.$_REQUEST["record"];
+                $list .= '<a href="javascript:confirmdelete(\''.$del_param.'\')">'.$app_strings['LNK_DELETE'].'</a>';
+
+		$list .= '</td>';
+
+		$list .= '</tr>';
+		$i++;
+	}
+	
+// begin: Armando L?scher 14.07.2005 -> ?scrollableTables
+// Desc: Close table from 'Y'
+		$list .= ($noofrows>15) ? '</table></div></td></tr>':'';
+// end: Armando L?scher 14.07.2005 -> scrollableTables
+
+	$list .= '<tr><td COLSPAN="12" class="blackLine"><IMG SRC="themes/'.$theme.'/images//blank.gif"></td></tr>';
+	$list .= '</table>';
+	echo $list;
+
+}
+}
+
+function getHistory($parentmodule,$query,$id)
+{
+	$parentaction = $_REQUEST['action'];
+	global $theme;
+	$theme_path="themes/".$theme."/";
+	$image_path=$theme_path."images/";
+	require_once ($theme_path."layout_utils.php");
+
+	global $adb;
+	global $mod_strings;
+	global $app_strings;
+
+	//Appending the security parameter
+	global $others_permission_id;
+	global $current_user;
+	$rel_tab_id = getTabid("Activities");
+	$defSharingPermissionData = $_SESSION['defaultaction_sharing_permission_set'];
+	$others_rel_permission_id = $defSharingPermissionData[$rel_tab_id];
+	if($others_rel_permission_id == 3) //Security fix by Don
+	{
+         	$query .= " and crmentity.smownerid in(".$current_user->id .",0)";
+	}
+
+	$result=$adb->query($query);
+	$noofrows = $adb->num_rows($result);
+	
+	$button = '<table cellspacing=0 cellpadding=2><tr><td>';
+	$button .= '</td></tr></table>';
+
+	echo '<br><br>';
+	echo get_form_header($app_strings['LBL_HISTORY'],'', false);
+
+	if($noofrows == 0)
+	{
+		echo $app_strings['LBL_NONE_SCHEDULED'];
+	}
+	else
+	{
+		$list .= '<table border="0" cellpadding="0" cellspacing="0" class="FormBorder" width="100%" >';
+		$list .= '<tr class="ModuleListTitle" height=20>';
+
+		$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
+		$list .= '<td width="4%" class="moduleListTitle"></td>';
+
+// Armando L?scher 15.07.2005 -> ?scrollableTables
+// Desc: class="blackLine" deleted because of vertical line in title <tr>
+
+//		$list .= $app_strings['LBL_ICON'].'Icon</td>';
+		$class_black="";
+		if($noofrows<15)
+		{
+			$class_black='class="blackLine"';	
+		}
+
+		$list .= '<td WIDTH="1" '.$class_black.'><IMG SRC="themes/'.$theme.'/images/blank.gif">';
+		$list .= '<td width="25%" class="moduleListTitle" style="padding:0px 3px 0px 3px;">';
+	
+		$list .= $app_strings['LBL_SUBJECT'].'</td>';
+		$list .= '<td WIDTH="1" '.$class_black.'><IMG SRC="themes/'.$theme.'/images/blank.gif">';
+		$list .= '<td width="10%" class="moduleListTitle" style="padding:0px 3px 0px 3px;">';
+	
+		$list .= $app_strings['LBL_STATUS'].'</td>';
+		$list .= '<td WIDTH="1" '.$class_black.'><IMG SRC="themes/'.$theme.'/images/blank.gif">';
+		$list .= '<td width="18%" class="moduleListTitle" style="padding:0px 3px 0px 3px;">';
+	
+		$list .= $app_strings['LBL_LIST_CONTACT_NAME'].'</td>';
+		$list .= '<td WIDTH="1" '.$class_black.'><IMG SRC="themes/'.$theme.'/images/blank.gif">';
+		$list .= '<td width="18%" class="moduleListTitle" style="padding:0px 3px 0px 3px;">';
+
+		$list .= $app_strings['LBL_RELATED_TO'].'</td>';
+		$list .= '<td WIDTH="1" '.$class_black.'><IMG SRC="themes/'.$theme.'/images/blank.gif">';
+		$list .= '<td width="15%" class="moduleListTitle" style="padding:0px 3px 0px 3px;">';
+	
+		$list .= $app_strings['LBL_LAST_MODIFIED'].'</td>';
+		$list .= '<td WIDTH="1" '.$class_black.'><IMG SRC="themes/'.$theme.'/images/blank.gif">';
+		$list .= '<td width="10%" class="moduleListTitle" height="21" style="padding:0px 3px 0px 3px;">';
+
+		$list .= $app_strings['LBL_ACTION'].'</td>';
+		$list .= '<td WIDTH="1" '.$class_black.'><IMG SRC="themes/'.$theme.'/images/blank.gif">';
+		$list .= '<td class="moduleListTitle">';
+
+		$list .= '</td>';
+		if($noofrows>15)
+		{
+			$list .= '<td style="width:20px">&nbsp;&nbsp&nbsp;&nbsp;</td>';
+		}
+		$list .= '</tr>';
+	
+		$list .= '<tr><td COLSPAN="14" class="blackLine"><IMG SRC="themes/'.$theme.'/images//blank.gif"></td></tr>';
+
+// begin: Armando L?scher 14.07.2005 -> ?scrollableTables
+// Desc: 'X'
+//			 Insert new table with 1 cell where all entries are in a new table.
+//			 This cell will be scrollable when too many entries exist
+		$list .= ($noofrows>15) ? '<tr><td colspan="21"><div style="overflow:auto;height:315px;width:100%;"><table cellspacing="0" cellpadding="0" border="0" width="100%">':'';
+// end: Armando L?scher 14.07.2005 -> ?scrollableTablEs
+
+		$i=1;
+		while($row = $adb->fetch_array($result))
+		{
+			if($row['activitytype'] == 'Task')
+			{
+				$activitymode = 'Task';
+				$icon = 'Tasks.gif';
+				$status = $row['status'];
+			}
+			elseif($row['activitytype'] == 'Call' || $row['activitytype'] == 'Meeting')
+			{
+				$activitymode = 'Events';
+				$icon = 'Activities.gif';
+				$status = $row['eventstatus'];
+			}
+			if ($i%2==0)
+				$trowclass = 'evenListRow';
+			else
+				$trowclass = 'oddListRow';
+	
+			$list .= '<tr class="'. $trowclass.'">';
+	
+			$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
+			$list .= '<td width="4%"><IMG SRC="'.$image_path.'/'.$icon.'"></td>';
+
+			$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
+			$list .= '<td width="25%" height="21" style="padding:0px 3px 0px 3px;">';
+			$list .= '<a href="index.php?module=Activities&action=DetailView&return_module='.$parentmodule.'&return_action=DetailView&record='.$row["activityid"] .'&activity_mode='.$activitymode.'&return_id='.$_REQUEST['record'].'" title="'.$row['description'].'">'.$row['subject'].'</a></td>';
+			$list .= '</td>';
+	
+			$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
+			$list .= '<td width="10%" height="21" style="padding:0px 3px 0px 3px;">';
+			$list .= $status;
+			$list .= '</td>';
+
+			if($row['firstname'] != 'NULL')	
+				$contactname = $row['firstname'].' ';
+			if($ros['lastname'] != 'NULL')
+				$contactname .= $row['lastname'];
+
+			$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
+			$list .= '<td width="18%" height="21" style="padding:0px 3px 0px 3px;">';
+			$list .= '<a href="index.php?module=Contacts&action=DetailView&return_module='.$parentmodule.'&return_action=DetailView&record='.$row["contactid"].'&return_id='.$_REQUEST['record'].'">'.$contactname;
+			$list .= '</td>';
+
+			$parentname = getRelatedTo('Activities',$result,$i-1);
+
+			$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
+			$list .= '<td width="18%" height="21" style="padding:0px 3px 0px 3px;">';
+			$list .= $parentname;
+			$list .= '</td>';
+	
+			$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
+			$list .= '<td width="15%" height="21" style="padding:0px 3px 0px 3px;">';
+			$modifiedtime = getDisplayDate($row['modifiedtime']);
+			$list .= $modifiedtime;
+	
+			$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
+			$list .= '<td width="10%" height="21" style="padding:0px 3px 0px 3px;">';
+
+			if(isPermitted("Activities",1,$row["activityid"]) == 'yes')
+                	{
+	
+				$list .= '<a href="index.php?module=Activities&action=EditView&return_module='.$parentmodule.'&return_action='.$parentaction.'&activity_mode='.$activitymode.'&record='.$row["activityid"].'&return_id='.$_REQUEST["record"].'">'.$app_strings['LNK_EDIT'].'</a>  |  ';
+			}
+	
+			if(isPermitted("Activities",2,$row["activityid"]) == 'yes')
+                	{
+				$list .= '<a href="index.php?module=Activities&action=Delete&return_module='.$parentmodule.'&return_action='.$parentaction.'&record='.$row["activityid"].'&return_id='.$_REQUEST["record"].'">'.$app_strings['LNK_DELETE'].'</a>';
+			}
+	
+			$list .= '</td>';
+			
+			$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
+
+			$list .= '</tr>';
+			$i++;
+		}
+
+// begin: Armando L?scher 14.07.2005 -> ?scrollableTables
+// Desc: Close table from 
+		$list .= ($noofrows>15) ? '</table></div></td></tr>':'';
+// end: Armando L?scher 14.07.2005 -> ?scrollableTables
+
+		$list .= '<tr><td colspan="14" class="blackLine"></td></tr>';
+
+		$list .= '</table>';
+		echo $list;
+	}
+}
+
+function getPriceBookRelatedProducts($query,$focus,$returnset='')
+{
+	global $adb;
+	global $app_strings;
+	global $mod_strings;
+	global $current_language;
+	$current_module_strings = return_module_language($current_language, 'Products');
+
+	global $list_max_entries_per_page;
+	global $urlPrefix;
+
+
+	global $theme;
+	$pricebook_id = $_REQUEST['record'];
+	$theme_path="themes/".$theme."/";
+	$image_path=$theme_path."images/";
+	require_once($theme_path.'layout_utils.php');
+	$list_result = 	$adb->query($query);
+	$num_rows = $adb->num_rows($list_result);
+	$xtpl=new XTemplate('include/RelatedListView.html');
+	$xtpl->assign("MOD", $mod_strings);
+	$xtpl->assign("APP", $app_strings);
+	$xtpl->assign("IMAGE_PATH",$image_path);
+	echo '<BR>';
+	$other_text = '<table width="100%" border="0" cellpadding="1" cellspacing="0">
+	<form name="selectproduct" method="POST">
+	<tr>
+	<input name="action" type="hidden" value="AddProductsToPriceBook">
+	<input name="module" type="hidden" value="Products">
+	<input name="return_module" type="hidden" value="Products">
+	<input name="return_action" type="hidden" value="PriceBookDetailView">
+	<input name="pricebook_id" type="hidden" value="'.$_REQUEST["record"].'">';
+
+        $other_text .='<td><input title="Select Products" accessyKey="F" class="button" onclick="this.form.action.value=\'AddProductsToPriceBook\';this.form.module.value=\'Products\';this.form.return_module.value=\'Products\';this.form.return_action.value=\'PriceBookDetailView\'" type="submit" name="button" value="'.$app_strings["LBL_SELECT_PRODUCT_BUTTON_LABEL"].'"></td>';
+		$other_text .='</tr></table>';
+
+//Retreive the list from Database
+echo get_form_header($current_module_strings['LBL_LIST_FORM_TITLE'], $other_text, false );
+
+
+//echo $list_query;
+$list_result = $adb->query($query);
+$num_rows = $adb->num_rows($list_result);
+
+//Retreive the List View Table Header
+
+// Armando L?scher 15.07.2005 -> ?scrollableTables
+// Desc: class="blackLine" deleted because of vertical line in title <tr>
+
+//		$list .= $app_strings['LBL_ICON'].'Icon</td>';
+		$class_black="";
+		if($num_rows<15)
+		{
+			$class_black='class="blackLine"';	
+		}
+
+$list_header = '';
+$list_header .= '<tr class="moduleListTitle" height=20>';
+$list_header .= '<td WIDTH="1" class="blackLine"><IMG SRC="'.$image_path.'blank.gif"></td>';
+$list_header .= '<td width="40%" class="moduleListTitle" height="21" style="padding:0px 3px 0px 3px;">'.$mod_strings['LBL_LIST_PRODUCT_NAME'].'</td>';
+$list_header .='<td WIDTH="1" '.$class_black.' NOWRAP><IMG SRC="{IMAGE_PATH}blank.gif"></td>';
+$list_header .= '<td width="15%" class="moduleListTitle" height="21" style="padding:0px 3px 0px 3px;">'.$mod_strings['LBL_PRODUCT_CODE'].'</td>';
+$list_header .='<td WIDTH="1" '.$class_black.' NOWRAP><IMG SRC="{IMAGE_PATH}blank.gif"></td>';
+$list_header .= '<td width="15%" class="moduleListTitle" height="21" style="padding:0px 3px 0px 3px;">'.$mod_strings['LBL_PRODUCT_UNIT_PRICE'].'</td>';
+$list_header .='<td WIDTH="1" '.$class_black.' NOWRAP><IMG SRC="{IMAGE_PATH}blank.gif"></td>';
+$list_header .= '<td width="15%" class="moduleListTitle" height="21" style="padding:0px 3px 0px 3px;">'.$mod_strings['LBL_PB_LIST_PRICE'].'</td>';
+$list_header .='<td WIDTH="1" '.$class_black.' NOWRAP><IMG SRC="{IMAGE_PATH}blank.gif"></td>';
+$list_header .= '<td width="15%" class="moduleListTitle" height="21" style="padding:0px 3px 0px 3px;">Edit|Del</td>';
+$list_header .='<td WIDTH="1" class="blackLine" NOWRAP><IMG SRC="{IMAGE_PATH}blank.gif"></td>';
+
+$list_header .= '</tr>';
+
+$xtpl->assign("LISTHEADER", $list_header);
+
+$list_body ='';
+// begin: Armando L?scher 14.07.2005 -> ?scrollableTables
+// Desc: 'X'
+//			 Insert new table with 1 cell where all entries are in a new table.
+//			 This cell will be scrollable when too many entries exist
+		$list_body .= ($num_rows>15) ? '<tr><td colspan="12"><div style="overflow:auto;height:315px;width:100%;"><table cellspacing="0" cellpadding="0" border="0" width="100%">':'';
+// end: Armando L?scher 14.07.2005 -> ?scrollableTablEs
+
+for($i=0; $i<$num_rows; $i++)
+{
+	$entity_id = $adb->query_result($list_result,$i,"crmid");
+		if (($i%2)==0)
+			$list_body .= '<tr height=20 class=evenListRow>';
+		else
+			$list_body .= '<tr height=20 class=oddListRow>';
+
+		$unit_price = 	$adb->query_result($list_result,$i,"unit_price");
+		$listprice = $adb->query_result($list_result,$i,"listprice");
+		$field_name=$entity_id."_listprice";
+
+		$list_body .= '<td WIDTH="1" class="blackLine"><IMG SRC="'.$image_path.'blank.gif"></td>';
+		$list_body .= '<td width="40%" height="21" style="padding:0px 3px 0px 3px;">'.$adb->query_result($list_result,$i,"productname").'</td>';
+		$list_body .='<td WIDTH="1" class="blackLine" NOWRAP><IMG SRC="'.$image_path.'blank.gif"></td>';
+		$list_body .= '<td width="15%" height="21" style="padding:0px 3px 0px 3px;">'.$adb->query_result($list_result,$i,"productcode").'</td>';
+		$list_body .='<td WIDTH="1" class="blackLine" NOWRAP><IMG SRC="'.$image_path.'blank.gif"></td>';
+		$list_body .= '<td width="15%" height="21" style="padding:0px 3px 0px 3px;">'.$unit_price.'</td>';
+		$list_body .='<td WIDTH="1" class="blackLine" NOWRAP><IMG SRC="'.$image_path.'blank.gif"></td>';
+		$list_body .= '<td width="15%" height="21" style="padding:0px 3px 0px 3px;">'.$listprice.'</td>';
+		$list_body .='<td WIDTH="1" class="blackLine" NOWRAP><IMG SRC="'.$image_path.'blank.gif"></td>';
+		$list_body .= '<td width="15%" height="21" style="padding:0px 3px 0px 3px;"><a href="index.php?module=Products&action=EditListPrice&record='.$entity_id.'&pricebook_id='.$pricebook_id.'&listprice='.$listprice.'">edit</a>&nbsp;|&nbsp;<a href="index.php?module=Products&action=DeletePriceBookProductRel'.$returnset.'&record='.$entity_id.'&pricebook_id='.$pricebook_id.'">del</a></td>';
+	$list_body .='<td WIDTH="1" class="blackLine" NOWRAP><IMG SRC="'.$image_path.'blank.gif"></td></tr>';
+	
+}
+// begin: Armando L?scher 14.07.2005 -> ?scrollableTables
+// Desc: Close table from 
+		$list_body .= ($num_rows>15) ? '</table></div></td></tr>':'';
+// end: Armando L?scher 14.07.2005 -> ?scrollableTables
+
+	$list_body .= '<tr><td COLSPAN="12" class="blackLine"><IMG SRC="themes/'.$theme.'/images//blank.gif"></td></tr>';
+
+//$listview_entries = getListViewEntries($focus,"Products",$list_result,$navigation_array);
+
+$xtpl->assign("LISTENTITY", $list_body);
+
+$xtpl->parse("main");
+$xtpl->out("main");	
+
+}
+
+//echo '</form>';
+?>

Modified: vtigercrm/branches/4.2/include/uifromdbutil.php
==============================================================================
--- vtigercrm/branches/4.2/include/uifromdbutil.php (original)
+++ vtigercrm/branches/4.2/include/uifromdbutil.php Tue Jun 20 22:23:57 2006
@@ -145,8 +145,10 @@
 	$image_path=$theme_path."images/";
 
 	$record = isset($_REQUEST['record']) ? $_REQUEST['record'] : '';
-	$relmodule = $_REQUEST['module'] == $module ? '' : $module;
-	$start = $relmodule.'start';
+	
+//	$relmodule = $_REQUEST['module'] == $module ? '' : $module;
+	$relmodule = '';
+$start = $relmodule.'start';
 	$end_val = $relmodule.'end_val';
 	$first = $relmodule.'first';
 	$end = $relmodule.'end';
@@ -157,6 +159,9 @@
 	$prev = $relmodule.'prev';
 	$dir_name = $_REQUEST['module'];
 
+	
+	
+	
 	$output = '<td align="right">';
 	$output .= '<a href="index.php?module='.$dir_name.'&record='.$record.'&action='.$action_val.$url_qry.'&'.$start.'=1&viewname='.$viewid.'&'.$allflag.'='.$navigation_array[$allflag].'" >'.$navigation_array[$allflag].'</a>&nbsp;';
 	if(($navigation_array[$prev]) != 0) {

Modified: vtigercrm/branches/4.2/include/utils.php
==============================================================================
--- vtigercrm/branches/4.2/include/utils.php (original)
+++ vtigercrm/branches/4.2/include/utils.php Tue Jun 20 22:23:57 2006
@@ -879,19 +879,34 @@
 {
 	global $adb, $vtlog;
 	static $res = null;
-	$vtlog->logthis("module  is ".$module,'info');  
-        
-	if(!is_null($res)) return $res[$module];
-
+	$vtlog->logthis("module is ".$module,'info');
+
+	// if we've already built static variable $res, let's not do it again...
+	if(sizeof($res) > 0)
+	{
+		if(isset($res[$module]))
+		{
+			return $res[$module];
+		}
+		else
+		{
+			return 0;
+		}
+	}
+
+	// ok, we must not have built $res; so let's grab the db data for a
 	$sql = "select tabid, name from tab";
 	$result = $adb->query($sql);
 	$tab_count = $adb->num_rows($result);
-	for($i=0; $i<$tab_count; $i++) {
+
+	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];
+	
+	return isset($res[$module])? $res[$module] : 0;
 }
 
 function getOutputHtml($uitype, $fieldname, $fieldlabel, $maxlength, $col_fields,$generatedtype)
@@ -1316,33 +1331,29 @@
 	}
 	elseif($uitype == 57)
 	{
-		//if(isset($_REQUEST['contact_id']) && $_REQUEST['contact_id'] != '')
-		//	$value = $_REQUEST['contact_id'];
-
-	       if($value != '')
-               {
-                       $contact_name = getContactName($value);
-               }
-	       elseif(isset($_REQUEST['contact_id']) && $_REQUEST['contact_id'] != '')
-	       {
+		$contact_name = '';
+		
+		if($value != '')
+		{
+			$contact_name = getContactName($value);
+		}
+		elseif(isset($_REQUEST['contact_id']) && $_REQUEST['contact_id'] != '')
+		{
 			if($_REQUEST['module'] == 'Contacts' && $fieldname = 'contact_id')
 			{
-				$contact_name = '';	
+				$contact_name = '';
 			}
 			else
 			{
 				$value = $_REQUEST['contact_id'];
-				$contact_name = getContactName($value);		
+				$contact_name = getContactName($value);
 			}
-			
-	       }
-	
-		//Checking for contacts duplicate
-					 	
+		}
+
 		$custfld .= '<td width="20%" valign="center" class="dataLabel">'.$mod_strings[$fieldlabel].'</td>';
 		$custfld .= '<td width="30%"><input name="contact_name" readonly type="text" value="'.$contact_name.'"><input name="contact_id" type="hidden" value="'.$value.'">&nbsp;<img src="'.$image_path.'select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick=\'return window.open("index.php?module=Contacts&action=Popup&html=Popup_picker&popuptype=specific&form=EditView","test","width=600,height=400,resizable=1,scrollbars=1");\' align="absmiddle" style=\'cursor:hand;cursor:pointer\'>&nbsp;<input type="image" src="'.$image_path.'clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.contact_id.value=\'\';this.form.contact_name.value=\'\';return false;" align="absmiddle" style=\'cursor:hand;cursor:pointer\'></td>';
 	}
-        elseif($uitype == 61 || $uitype == 69)
+	elseif($uitype == 61 || $uitype == 69)
         {
                 global $current_user;
                 if($value != '')
@@ -1653,31 +1664,31 @@
 	}
 	elseif($uitype == 76)
 	{
-
+		$potential_name = '';
 		if($value != '')
-               {
-                       $potential_name = getPotentialName($value);
-               }
-	       elseif(isset($_REQUEST['potential_id']) && $_REQUEST['potential_id'] != '')
-	       {
+		{
+			$potential_name = getPotentialName($value);
+		}
+		elseif(isset($_REQUEST['potential_id']) && $_REQUEST['potential_id'] != '')
+		{
 			$value = $_REQUEST['potental_id'];
 			$potential_name = getPotentialName($value);
-	       }		 	
+		}
 		$custfld .= '<td width="20%" valign="center" class="dataLabel">'.$mod_strings[$fieldlabel].'</td>';
 		$custfld .= '<td width="30%"><input name="potential_name" readonly type="text" value="'.$potential_name.'"><input name="potential_id" type="hidden" value="'.$value.'">&nbsp;<img src="'.$image_path.'select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick=\'return window.open("index.php?module=Potentials&action=Popup&html=Popup_picker&popuptype=specific_potential_account_address&form=EditView","test","width=600,height=400,resizable=1,scrollbars=1");\' align="absmiddle" style=\'cursor:hand;cursor:pointer\'>&nbsp;<input type="image" src="'.$image_path.'clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.potential_id.value=\'\';this.form.potential_name.value=\'\';return false;" align="absmiddle" style=\'cursor:hand;cursor:pointer\'></td>';
 	}
 	elseif($uitype == 78)
 	{
-
+		$quote_name = '';
 		if($value != '')
-               {
-                       $quote_name = getQuoteName($value);
-               }
-	       elseif(isset($_REQUEST['quote_id']) && $_REQUEST['quote_id'] != '')
-	       {
+		{
+			$quote_name = getQuoteName($value);
+		}
+		elseif(isset($_REQUEST['quote_id']) && $_REQUEST['quote_id'] != '')
+		{
 			$value = $_REQUEST['quote_id'];
 			$potential_name = getQuoteName($value);
-	       }		 	
+		}
 		$custfld .= '<td width="20%" valign="center" class="dataLabel">'.$mod_strings[$fieldlabel].'</td>';
 		$custfld .= '<td width="30%"><input name="quote_name" readonly type="text" value="'.$quote_name.'"><input name="quote_id" type="hidden" value="'.$value.'">&nbsp;<img src="'.$image_path.'select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick=\'return window.open("index.php?module=Quotes&action=Popup&html=Popup_picker&popuptype=specific&form=EditView","test","width=600,height=400,resizable=1,scrollbars=1");\' align="absmiddle" style=\'cursor:hand;cursor:pointer\'>&nbsp;<input type="image" src="'.$image_path.'clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.quote_id.value=\'\';this.form.quote_name.value=\'\';return false;" align="absmiddle" style=\'cursor:hand;cursor:pointer\'></td>';
 	}
@@ -1778,7 +1789,13 @@
 	elseif($uitype == 19)
 	{
 		$col_fields[$fieldname]=html_entity_decode(nl2br($col_fields[$fieldname]));
-		$custfld .= '<td width="20%" class="dataLabel" valign="top">'.$mod_strings[$fieldlabel].':</td>';
+		$custfld .= '<td width="20%" class="dataLabel" valign="top">';
+		// not all fields (e.g. Terms & Conditions) have a field label
+		if(isset($mod_strings[$fieldlabel]))
+		{
+			$custfld .= $mod_strings[$fieldlabel].':';
+		}
+		$custfld .= '&nbsp;</td>';
 		$custfld .= '<td colspan="3" valign="top">'.$col_fields[$fieldname].'</td>'; // Armando LC<scher 10.08.2005 -> B'descriptionSpan -> Desc: inserted colspan="3"
 	}
 	elseif($uitype == 20 || $uitype == 21 || $uitype == 22 || $uitype == 24) // Armando LC<scher 11.08.2005 -> B'descriptionSpan -> Desc: removed $uitype == 19 and made an aditional elseif above
@@ -1877,6 +1894,7 @@
         {
                 $custfld .= '<td width="20%" class="dataLabel">'.$mod_strings[$fieldlabel].':</td>';
                 $contact_id = $col_fields[$fieldname];
+                $contact_name = '';
                 if($contact_id != '')
                 {
                         $contact_name = getContactName($contact_id);
@@ -2217,6 +2235,7 @@
         {
                 $custfld .= '<td width="20%" class="dataLabel">'.$mod_strings[$fieldlabel].':</td>';
                 $potential_id = $col_fields[$fieldname];
+				$potential_name = '';
                 if($potential_id != '')
                 {
                         $potential_name = getPotentialName($potential_id);
@@ -2228,6 +2247,7 @@
         {
                 $custfld .= '<td width="20%" class="dataLabel">'.$mod_strings[$fieldlabel].':</td>';
                 $quote_id = $col_fields[$fieldname];
+                $quote_name = '';
                 if($quote_id != '')
                 {
                         $quote_name = getQuoteName($quote_id);
@@ -3049,6 +3069,7 @@
 {
 	global $adb, $theme, $app_strings;
 	$filename = '';
+	$potential_name = '';
 	
 	$noofrows = $adb->num_rows($list_result);
 	$list_header = '<script>
@@ -4597,6 +4618,7 @@
 {
 	global $adb;
 	global $theme;
+	global $app_strings;
 	global $vtlog;
         $theme_path="themes/".$theme."/";
         $image_path=$theme_path."images/";

Modified: vtigercrm/branches/4.2/modules/Accounts/RenderRelatedListUI.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Accounts/RenderRelatedListUI.php (original)
+++ vtigercrm/branches/4.2/modules/Accounts/RenderRelatedListUI.php Tue Jun 20 22:23:57 2006
@@ -19,7 +19,7 @@
 //	$image_path=$theme_path."images/";
 //	require_once ($theme_path."layout_utils.php");
 
-	$hidden .= '<form border="0" action="index.php" method="post" name="form" id="form">';
+	$hidden = '<form border="0" action="index.php" method="post" name="form" id="form">';
 	$hidden .= '<input type="hidden" name="module">';
 	$hidden .= '<input type="hidden" name="mode">';
 	$hidden .= '<input type="hidden" name="account_id" value="'.$id.'">';

Modified: vtigercrm/branches/4.2/modules/Orders/RenderRelatedListUI.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Orders/RenderRelatedListUI.php (original)
+++ vtigercrm/branches/4.2/modules/Orders/RenderRelatedListUI.php Tue Jun 20 22:23:57 2006
@@ -16,7 +16,7 @@
 
 function getHiddenValues($id,$sid='purchaseorderid')
 {
-        $hidden .= '<form border="0" action="index.php" method="post" name="form" id="form">';
+        $hidden = '<form border="0" action="index.php" method="post" name="form" id="form">';
         $hidden .= '<input type="hidden" name="module">';
         $hidden .= '<input type="hidden" name="mode">';
         $hidden .= '<input type="hidden" name="'.$sid.'" value="'.$id.'">';

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 Tue Jun 20 22:23:57 2006
@@ -90,6 +90,7 @@
 $xtpl->assign("BLOCK4", $block_4);
 
 $block_5 = getDetailBlockInformation("SalesOrder",5,$focus->column_fields);
+$cust_fld = '';
 if(trim($block_5) != '')
 {
         $cust_fld = '<table width="100%" border="0" cellspacing="0" cellpadding="0" class="formOuterBorder">';

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 Tue Jun 20 22:23:57 2006
@@ -46,16 +46,17 @@
 $focus = new SalesOrder();
 
 $url_string = '&smodule=SO'; // assigning http url string
-
-if(isset($_REQUEST['query']) && $_REQUEST['query'] != '' && $_REQUEST['query'] == 'true')
+	
+$query = isset($_REQUEST['query'])? $_REQUEST['query'] : '';
+$subject = isset($_REQUEST['subject'])? $_REQUEST['subject'] : '';
+$accountname = isset($_REQUEST['accountname'])? $_REQUEST['accountname'] : '';
+$quotename = isset($_REQUEST['quotename'])? $_REQUEST['quotename'] : '';
+	
+if($query == 'true')
 {
 	$url_string .="&query=true";
-	if (isset($_REQUEST['subject'])) $subject = $_REQUEST['subject'];
-        if (isset($_REQUEST['accountname'])) $accountname = $_REQUEST['accountname'];
-        if (isset($_REQUEST['quotename'])) $quotename = $_REQUEST['quotename'];
 
 	$where_clauses = Array();
-	//$search_query='';
 
 	//Added for Custom Field Search
 	$sql="select * from field where tablename='salesordercf' order by fieldlabel";
@@ -211,7 +212,7 @@
 	<td>';
 if(isPermitted('SalesOrder',2,'') == 'yes')
 {
-	$other_text .=	'<input class="button" type="submit" value="'.$app_strings[LBL_MASS_DELETE].'" onclick="return massDelete()"/>&nbsp;';
+	$other_text .=	'<input class="button" type="submit" value="'.$app_strings['LBL_MASS_DELETE'].'" onclick="return massDelete()"/>&nbsp;';
 }
 
 if($viewid == 0)
@@ -228,9 +229,9 @@
 <span class="sep">|</span>
 <a href="index.php?module=Orders&action=CustomView&smodule=SO" class="link">'.$app_strings['LNK_CV_CREATEVIEW'].'</a>';
 }
-	$other_text .='<td align="right">'.$app_strings[LBL_VIEW].'
+	$other_text .='<td align="right">'.$app_strings['LBL_VIEW'].'
                         <SELECT NAME="view" onchange="showDefaultCustomView(this)">
-                                <OPTION VALUE="0">'.$mod_strings[LBL_ALL].'</option>
+                                <OPTION VALUE="0">'.$mod_strings['LBL_ALL'].'</option>
 				'.$customviewcombo_html.'
                         </SELECT>
 			'.$cvHTML.'
@@ -293,7 +294,7 @@
 $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;
+$record_string= $app_strings['LBL_SHOWING']." " .$start_rec." - ".$end_rec." " .$app_strings['LBL_LIST_OF'] ." ".$noofrows;
 
 //Retreive the List View Table Header
 if($viewid !='')

Modified: vtigercrm/branches/4.2/modules/Settings/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Settings/language/en_us.lang.php (original)
+++ vtigercrm/branches/4.2/modules/Settings/language/en_us.lang.php Tue Jun 20 22:23:57 2006
@@ -257,6 +257,8 @@
 //Added fields after RC1 - Release
 
 'LBL_MAIL_SERVER_INFO'=>'Mail Server Information',
+
+'LBL_MAIL_UNAME'=>'',
 
 'LBL_OUTGOING_MAIL_SERVER'=>'OutGoing Mail Server',
 

Modified: vtigercrm/branches/4.2/modules/Users/DetailView.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Users/DetailView.php (original)
+++ vtigercrm/branches/4.2/modules/Users/DetailView.php Tue Jun 20 22:23:57 2006
@@ -59,9 +59,11 @@
 $role = fetchUserRole($focus->id);
 $rolename =  getRoleName($role);
 //the user might belong to multiple groups
+$group = '';
+
 if($focus->id != 1)
 {
- $group = fetchUserGroups($focus->id);
+	$group = fetchUserGroups($focus->id);
 }
 $log->info("User detail view");
 
@@ -103,25 +105,22 @@
 	$buttons .= "<td><input title='".$app_strings['LBL_FORUM_SHOW_BUTTON_TITLE']."' accessKey='".$app_strings['LBL_FORUM_SHOW_BUTTON_KEY']."' class='button' onclick=\"this.form.module.value='Users'; this.form.forumDisplay.value='true'; this.form.action.value='DetailView'\" type='submit' name='Display' value=' ".$app_strings['LBL_FORUM_SHOW_BUTTON_LABEL']." '></td>\n";
 }
 */
-if (is_admin($current_user)) 
+if (is_admin($current_user))
 {
 	$buttons .= "<td><input title='".$app_strings['LBL_DUPLICATE_BUTTON_TITLE']."' accessKey='".$app_strings['LBL_DUPLICATE_BUTTON_KEY']."' class='button' onclick=\"this.form.return_module.value='Users'; this.form.return_action.value='DetailView'; this.form.isDuplicate.value=true; this.form.return_id.value='".$_REQUEST['record']."';this.form.action.value='EditView'\" type='submit' name='Duplicate' value=' ".$app_strings['LBL_DUPLICATE_BUTTON_LABEL']."'   >&nbsp; </td>\n";
+
 	//done so that only the admin user can see the customize tab button
 	if($_REQUEST['record'] == $current_user->id)
 	{
 		$buttons .= "<td><input title='".$app_strings['LBL_TABCUSTOMISE_BUTTON_TITLE']."' accessKey='".$app_strings['LBL_TABCUSTOMISE_BUTTON_KEY']."' class='button' onclick=\"this.form.return_module.value='Users'; this.form.return_action.value='TabCustomise'; this.form.action.value='TabCustomise'\" type='submit' name='Customise' value=' ".$app_strings['LBL_TABCUSTOMISE_BUTTON_LABEL']." '></td>\n";
 	}
+
 	if($_REQUEST['record'] != $current_user->id)
 	{
-	$buttons .= "<td><input title='".$app_strings['LBL_DELETE_BUTTON_TITLE']."' accessKey='".$app_strings['LBL_DELETE_BUTTON_KEY']."' class='button' onclick=\"this.form.return_module.value='Users'; this.form.return_action.value='DetailView'; this.form.return_id.value='$focus->id'; this.form.action.value='UserDeleteStep1'\" type='submit' name='Delete' value='  ".$app_strings['LBL_DELETE_BUTTON_LABEL']."  '></td>\n";
+		$buttons .= "<td><input title='".$app_strings['LBL_DELETE_BUTTON_TITLE']."' accessKey='".$app_strings['LBL_DELETE_BUTTON_KEY']."' class='button' onclick=\"this.form.return_module.value='Users'; this.form.return_action.value='DetailView'; this.form.return_id.value='$focus->id'; this.form.action.value='UserDeleteStep1'\" type='submit' name='Delete' value='  ".$app_strings['LBL_DELETE_BUTTON_LABEL']."  '></td>\n";
 	}
 
-        //$buttons .= "<td><input title='".$app_strings['LBL_ROLES_BUTTON_TITLE']."' accessKey='".$app_strings['LBL_ROLES_BUTTON_KEY']."' class='button' onclick=\"this.form.return_module.value='Users'; this.form.return_action.value='TabCustomise'; this.form.action.value='ListPermissions'\" type='submit' name='ListPermissions' value=' ".$app_strings['LBL_ROLES_BUTTON_LABEL']." '></td>\n";
-	if($_SESSION['authenticated_user_roleid'] == 'administrator')
-	{
-	 $buttons .= "<td><input title='".$app_strings['LBL_LISTROLES_BUTTON_TITLE']."' accessKey='".$app_strings['LBL_LISTROLES_BUTTON_KEY']."' class='button' onclick=\"this.form.return_module.value='Users'; this.form.return_action.value='TabCustomise'; this.form.action.value='listroles'; this.form.record.value= '". $current_user->id ."'\" type='submit' name='ListRoles' value=' ".$app_strings['LBL_LISTROLES_BUTTON_LABEL']." '></td>\n";
-	}
-
+	//$buttons .= "<td><input title='".$app_strings['LBL_LISTROLES_BUTTON_TITLE']."' accessKey='".$app_strings['LBL_LISTROLES_BUTTON_KEY']."' class='button' onclick=\"this.form.return_module.value='Users'; this.form.return_action.value='TabCustomise'; this.form.action.value='listroles'; this.form.record.value= '". $current_user->id ."'\" type='submit' name='ListRoles' value=' ".$app_strings['LBL_LISTROLES_BUTTON_LABEL']." '></td>\n";
 }
 
  // $buttons .="<td width='100%'></td><TD  align='right' nowrap='nowrap'><a href='".$_SERVER['PHP_SELF'] .'?'.$_SERVER['QUERY_STRING']."&reset_preferences=true' >". $mod_strings['LBL_RESET_PREFERENCES']. " </a></td>";
@@ -167,7 +166,8 @@
 $xtpl->assign("ADDRESS_STATE", $focus->address_state);
 $xtpl->assign("ADDRESS_POSTALCODE", $focus->address_postalcode);
 $xtpl->assign("ADDRESS_COUNTRY", $focus->address_country);
-$xtpl->assign("SIGNATURE", nl2br($focus->signature));
+// signature doesn't exist in the Users class definition
+//$xtpl->assign("SIGNATURE", nl2br($focus->signature));
 $xtpl->assign("MAP_START", nl2br($focus->map_source));
 $xtpl->parse("user_info");
 $xtpl->out("user_info");

Modified: vtigercrm/branches/4.2/modules/Users/EditView.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Users/EditView.php (original)
+++ vtigercrm/branches/4.2/modules/Users/EditView.php Tue Jun 20 22:23:57 2006
@@ -96,7 +96,7 @@
 $xtpl->assign("ADDRESS_STATE", $focus->address_state);
 $xtpl->assign("ADDRESS_POSTALCODE", $focus->address_postalcode);
 $xtpl->assign("ADDRESS_COUNTRY", $focus->address_country);
-$xtpl->assign("SIGNATURE", $focus->signature);
+//$xtpl->assign("SIGNATURE", $focus->signature);
 $xtpl->assign("DESCRIPTION", $focus->description);
 
 $map_options = array('--None--', 'Home', 'Work');
@@ -109,27 +109,13 @@
 $xtpl->assign("MAP_START_OPTIONS", $map_start_options);
 
 $DATE_FORMAT_SELECT_OPTION = '<select name="date_format">';
-		
-               
-if($focus->date_format == 'dd-mm-yyyy')
-{
-	$selected1 = 'selected';
-}
-elseif($focus->date_format == 'mm-dd-yyyy')
-{
-	$selected2 = 'selected';
-}
-elseif($focus->date_format == 'yyyy-mm-dd')
-{
-	$selected3 = 'selected';
-}
-$DATE_FORMAT_SELECT_OPTION .= '<option value="dd-mm-yyyy" '.$selected1.'>';
+$DATE_FORMAT_SELECT_OPTION .= '<option value="dd-mm-yyyy" '.($focus->date_format == 'dd-mm-yyyy'? 'selected' : '') .'>';
 $DATE_FORMAT_SELECT_OPTION .= 'dd-mm-yyyy';
 $DATE_FORMAT_SELECT_OPTION .= '</option>';
-$DATE_FORMAT_SELECT_OPTION .= '<option value="mm-dd-yyyy" '.$selected2.'>';
+$DATE_FORMAT_SELECT_OPTION .= '<option value="mm-dd-yyyy" '.($focus->date_format == 'mm-dd-yyyy'? 'selected' : '').'>';
 $DATE_FORMAT_SELECT_OPTION .= 'mm-dd-yyyy';
 $DATE_FORMAT_SELECT_OPTION .= '</option>';
-$DATE_FORMAT_SELECT_OPTION .= '<option value="yyyy-mm-dd" '.$selected3.'>';
+$DATE_FORMAT_SELECT_OPTION .= '<option value="yyyy-mm-dd" '.($focus->date_format == 'yyyy-mm-dd'? 'selected' : '').'>';
 $DATE_FORMAT_SELECT_OPTION .= 'yyyy-mm-dd';
 $DATE_FORMAT_SELECT_OPTION .= '</option>';	
 $DATE_FORMAT_SELECT_OPTION .= ' </select>';

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 Tue Jun 20 22:23:57 2006
@@ -53,6 +53,7 @@
 	var $address_country;
 	var $tz;
 	var $holidays;
+	var $map_source;
 	var $namedays;
 	var $workdays;
 	var $weekstart;




From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 00:28:13 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 04:28:13 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23748=3A_?=
 =?utf-8?q?Eliminate_php_notice_errors?=
In-Reply-To: <076.c75696aed703c24c8b151bd87264b9e6@vtiger.fosslabs.com>
References: <076.c75696aed703c24c8b151bd87264b9e6@vtiger.fosslabs.com>
Message-ID: <085.2227872900126c80fc2a8ed321530a94@vtiger.fosslabs.com>

#748: Eliminate php notice errors
------------------------+---------------------------------------------------
  Reporter:  allanbush  |       Owner:  jrydbeck
      Type:  task       |      Status:  closed  
  Priority:  minor      |   Milestone:  4.2.5   
 Component:  vtigercrm  |     Version:  4.2.4rc3
Resolution:  fixed      |    Keywords:          
------------------------+---------------------------------------------------
Changes (by anonymous):

  * resolution:  => fixed
  * status:  assigned => closed

Comment:

 The majority of the notices have been remedied; final changeset [7314].
 Additional notices should be bugged individually/specifically.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/748>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 00:51:36 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 04:51:36 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7315 -
	/vtigercrm/trunk/install/5createTables.inc.php
Message-ID: <20060621045136.851E183F345@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 20 22:51:33 2006
New Revision: 7315

Log:
encrypt password during installation removed as it is handled in Save function

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 Tue Jun 20 22:51:33 2006
@@ -71,7 +71,7 @@
         $user->column_fields["user_name"] = 'admin';
         $user->column_fields["status"] = 'Active';
         $user->column_fields["is_admin"] = 'on';
-        $user->column_fields["user_password"] = $user->encrypt_password($admin_password);
+        $user->column_fields["user_password"] = $admin_password;
         $user->column_fields["tz"] = 'Europe/Berlin';
         $user->column_fields["holidays"] = 'de,en_uk,fr,it,us,';
         $user->column_fields["workdays"] = '0,1,2,3,4,5,6,';
@@ -115,8 +115,9 @@
     	$user = new User();
         $user->column_fields["last_name"] = 'StandardUser';
         $user->column_fields["user_name"] = 'standarduser';
+        $user->column_fields["is_admin"] = 'off';
         $user->column_fields["status"] = 'Active';
-        $user->column_fields["user_password"] = $user->encrypt_password('standarduser');
+        $user->column_fields["user_password"] = 'standarduser';
         $user->column_fields["tz"] = 'Europe/Berlin';
         $user->column_fields["holidays"] = 'de,en_uk,fr,it,us,';
         $user->column_fields["workdays"] = '0,1,2,3,4,5,6,';
@@ -140,7 +141,7 @@
 	$role_id = $db->query_result($role_result,0,"roleid");
 	$user->column_fields["roleid"] = $role_id;
 
-        $user->save('Users');
+    $user->save('Users');
 
 	//Creating the flat vtiger_files
 	createUserPrivilegesfile($user->id);
@@ -170,12 +171,6 @@
 }
 			
 
-// populate vtiger_users vtiger_table
-//$uid = $db->getUniqueID("users");
-//$sql_stmt1 = "insert into vtiger_users(id,user_name,user_password,last_name,email1,date_format) values(".$uid.",'standarduser','stX/AHHNK/Gkw','standarduser','standarduser at standard.user.com','yyyy-mm-dd')";
-//$db->query($sql_stmt1) or die($app_strings['ERR_CREATING_TABLE'].mysql_error());
-
-
 // create and populate combo tables
 require_once('include/PopulateComboValues.php');
 $combo = new PopulateComboValues();




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 00:56:43 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 04:56:43 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7316 -
 /vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
Message-ID: <20060621045644.1CB8E83F345@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 20 22:56:40 2006
New Revision: 7316

Log:
vtiger_ updated for activity table

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

Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original)
+++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Tue Jun 20 22:56:40 2006
@@ -524,7 +524,7 @@
 $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,14,19,2,'T~O',1,null,'BAS')");
  $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,15,19,2,'T~O',1,null,'BAS')");
  $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'activitytype','vtiger_activity',1,'15','activitytype','Activity Type',1,0,0,100,16,19,3,'V~O',1,null,'BAS')");
- $this->db->query("Insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'visibility','activity',1,15,'visibility','Visibility',1,0,0,100,17,19,3,'V~O',1,null,'BAS')");
+ $this->db->query("Insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'visibility','vtiger_activity',1,15,'visibility','Visibility',1,0,0,100,17,19,3,'V~O',1,null,'BAS')");
 
  $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,20,1,'V~O',1,null,'BAS')");
 
@@ -560,9 +560,9 @@
  $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'location','vtiger_activity',1,'1','location','Location',1,0,0,100,14,41,1,'V~O',1,null,'BAS')");
  $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,15,41,2,'T~O',1,null,'BAS')");
  $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,16,41,2,'T~O',1,null,'BAS')");
- $this->db->query("Insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'priority','activity',1,15,'taskpriority','Priority',1,0,0,100,17,41,1,'V~O',1,null,'BAS')");
- $this->db->query("Insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'notime','activity',1,56,'notime','No Time',1,0,0,100,18,41,1,'C~O',1,null,'BAS')");
- $this->db->query("Insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'visibility','activity',1,15,'visibility','Visibility',1,0,0,100,19,41,1,'V~O',1,null,'BAS')");
+ $this->db->query("Insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'priority','vtiger_activity',1,15,'taskpriority','Priority',1,0,0,100,17,41,1,'V~O',1,null,'BAS')");
+ $this->db->query("Insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'notime','vtiger_activity',1,56,'notime','No Time',1,0,0,100,18,41,1,'C~O',1,null,'BAS')");
+ $this->db->query("Insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'visibility','vtiger_activity',1,15,'visibility','Visibility',1,0,0,100,19,41,1,'V~O',1,null,'BAS')");
  
  $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,43,1,'V~O',1,null,'BAS')");
  $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'reminder_time','vtiger_activity_reminder',1,'30','reminder_time','Send Reminder',1,0,0,100,1,42,1,'I~O',1,null,'BAS')");




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 01:03:30 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 05:03:30 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7317 -
	/vtigercrm/trunk/Smarty/templates/Header.tpl
Message-ID: <20060621050330.C21D283F34A@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 20 23:03:27 2006
New Revision: 7317

Log:
anchor tag <a name=top> closed

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 Tue Jun 20 23:03:27 2006
@@ -38,7 +38,7 @@
 	<style type="text/css">@import url("themes/{$THEME}/style.css");</style>
 </head>
 	<body leftmargin=0 topmargin=0 marginheight=0 marginwidth=0 class=small onLoad="Announcement_rss()">
-	<a name="top">
+	<a name="top"></a>
 	<!-- header -->
 	<!-- header-vtiger crm name & RSS -->
 	<script language="JavaScript" type="text/javascript" src="include/js/general.js"></script>




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 01:16:47 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 05:16:47 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7318 -
	/vtigercrm/trunk/modules/Settings/PickList.php
Message-ID: <20060621051647.A145883F34A@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 20 23:16:44 2006
New Revision: 7318

Log:
check added not to show user PickList Values

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

Modified: vtigercrm/trunk/modules/Settings/PickList.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/PickList.php (original)
+++ vtigercrm/trunk/modules/Settings/PickList.php Tue Jun 20 23:16:44 2006
@@ -115,7 +115,7 @@
 function getPickListModules()
 {
 	global $adb;
-	$query = 'select distinct vtiger_field.fieldname,vtiger_field.tabid,tablabel from vtiger_field inner join vtiger_tab on vtiger_tab.tabid=vtiger_field.tabid where uitype IN (15,16)';
+	$query = 'select distinct vtiger_field.fieldname,vtiger_field.tabid,tablabel from vtiger_field inner join vtiger_tab on vtiger_tab.tabid=vtiger_field.tabid where uitype IN (15,16) and vtiger_field.tabid != 29';
 	$result = $adb->query($query);
 	while($row = $adb->fetch_array($result))
 	{




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 01:37:39 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 05:37:39 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7319 - in /vtigercrm/trunk:
 Smarty/templates/Rss.tpl modules/Rss/Delete.php modules/Rss/Popup.php
 modules/Rss/Rss.php modules/Rss/RssAjax.php
Message-ID: <20060621053740.22C9683F342@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 20 23:37:32 2006
New Revision: 7319

Log:
category removed from rss

Modified:
    vtigercrm/trunk/Smarty/templates/Rss.tpl
    vtigercrm/trunk/modules/Rss/Delete.php
    vtigercrm/trunk/modules/Rss/Popup.php
    vtigercrm/trunk/modules/Rss/Rss.php
    vtigercrm/trunk/modules/Rss/RssAjax.php

Modified: vtigercrm/trunk/Smarty/templates/Rss.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Rss.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Rss.tpl Tue Jun 20 23:37:32 2006
@@ -22,7 +22,7 @@
                 'index.php',
                 {queue: {position: 'end', scope: 'command'},
                         method: 'post',
-                        postBody: 'module=Rss&action=RssAjax&vtigerfile=ListView&directmode=ajax&record='+id,
+                        postBody: 'module=Rss&action=RssAjax&file=ListView&directmode=ajax&record='+id,
                         onComplete: function(response) {
                                 $("status").style.display="none";
 				$("rssfeedscont").innerHTML=response.responseText;
@@ -44,7 +44,7 @@
                 	'index.php',
         	        {queue: {position: 'end', scope: 'command'},
                         	method: 'post',
-	                        postBody: 'module=Rss&return_module=Rss&action=RssAjax&vtigerfile=Delete&directmode=ajax&record='+id,
+	                        postBody: 'module=Rss&return_module=Rss&action=RssAjax&file=Delete&directmode=ajax&record='+id,
         	                onComplete: function(response) {
 	        	                $("status").style.display="none";
                                 	$("rssfeedscont").innerHTML=response.responseText;
@@ -59,12 +59,11 @@
 	$("status").style.display="inline";
 	rssurl = $('rssurl').value;
 	rssurl = rssurl.replace(/&/gi,"##amp##");
-	var category = $('rsscategory')[$('rsscategory').selectedIndex].value;
 	new Ajax.Request(
 		'index.php',
 		{queue: {position: 'end', scope: 'command'},
 			method: 'post',
-			postBody:'module=Rss&action=RssAjax&vtigerfile=Popup&directmode=ajax&rsscategory='+category+'&rssurl='+rssurl, 
+			postBody:'module=Rss&action=RssAjax&file=Popup&directmode=ajax&rssurl='+rssurl, 
 			onComplete: function(response) {
 	
                                         $("status").style.display="none";
@@ -177,10 +176,6 @@
 	<td align="left" width="70%"><input type="text" id="rssurl" class="txtBox" /></td>
 	</tr>
 	
-	<tr>
-	<td align="right"><b>{$MOD.LBL_CATEGORY}</b></td>
-	<td align="left"><select id="rsscategory" class="importBox" style="width:100%">{$RSSCATEG}</select></td>
-	</tr>
 	<tr><td colspan="2" style="border-bottom:1px dashed #CCCCCC;">&nbsp;</td></tr>
 	<tr>
 	<td	colspan="2" align="center">
@@ -192,18 +187,6 @@
 	</div>
 
 <script type="text/javascript" language="Javascript">
-function toggleRSSFolder(id) {ldelim}
-	if (document.getElementById(id+"_feeds").style.display=="none") {ldelim}
-		document.getElementById(id+"_feeds").style.display="block"
-		document.getElementById(id+"_folder").src="{$IMAGE_PATH}rss_folder_opn.gif"
-		document.getElementById(id+"_toggle").src="{$IMAGE_PATH}minus.gif"
-	{rdelim} else {ldelim}
-		document.getElementById(id+"_feeds").style.display="none"
-		document.getElementById(id+"_folder").src="{$IMAGE_PATH}rss_folder_cls.gif"
-		document.getElementById(id+"_toggle").src="{$IMAGE_PATH}plus.gif"
-	{rdelim}
-
-{rdelim}
 function makedefaultRss(id)
 {ldelim}
 	if(id != '')
@@ -213,7 +196,7 @@
                 	'index.php',
 	                {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
         	                method: 'post',
-                	        postBody:'module=Rss&action=RssAjax&vtigerfile=Popup&directmode=ajax&record='+id, 
+                	        postBody:'module=Rss&action=RssAjax&file=Popup&directmode=ajax&record='+id, 
                         	onComplete: function(response) {ldelim}
                                 	$("status").style.display="none";
         				getrssfolders();
@@ -228,7 +211,7 @@
         	'index.php',
                 {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
                 	method: 'post',
-                        postBody:'module=Rss&action=RssAjax&vtigerfile=ListView&folders=true',
+                        postBody:'module=Rss&action=RssAjax&file=ListView&folders=true',
 			onComplete: function(response) {ldelim}
                         		$("status").style.display="none";
 					$("rssfolders").innerHTML=response.responseText;

Modified: vtigercrm/trunk/modules/Rss/Delete.php
==============================================================================
--- vtigercrm/trunk/modules/Rss/Delete.php (original)
+++ vtigercrm/trunk/modules/Rss/Delete.php Tue Jun 20 23:37:32 2006
@@ -25,5 +25,5 @@
 DeleteEntity($_REQUEST['module'],$_REQUEST['return_module'],'',$_REQUEST['record'],'');
 
  //code added for returning back to the current view after delete from list view
-header("Location: index.php?module=".$_REQUEST['return_module']."&action=RssAjax&vtigerfile=ListView&directmode=ajax");
+header("Location: index.php?module=".$_REQUEST['return_module']."&action=RssAjax&file=ListView&directmode=ajax");
 ?>

Modified: vtigercrm/trunk/modules/Rss/Popup.php
==============================================================================
--- vtigercrm/trunk/modules/Rss/Popup.php (original)
+++ vtigercrm/trunk/modules/Rss/Popup.php Tue Jun 20 23:37:32 2006
@@ -21,7 +21,7 @@
 	global $adb;
 	$query = 'update vtiger_rss set starred=0';
 	$adb->query($query);
-	$query = 'update vtiger_rss set starred=1 where vtiger_rssid ='.$_REQUEST["record"]; 
+	$query = 'update vtiger_rss set starred=1 where rssid ='.$_REQUEST["record"]; 
 	$adb->query($query);
 	echo $_REQUEST["record"];
 }

Modified: vtigercrm/trunk/modules/Rss/Rss.php
==============================================================================
--- vtigercrm/trunk/modules/Rss/Rss.php (original)
+++ vtigercrm/trunk/modules/Rss/Rss.php Tue Jun 20 23:37:32 2006
@@ -136,7 +136,7 @@
 			}else
 			{
 				$shtml .= "<td width=\"15\">
-					<img src=\"".$image_path."offstar.gif\" align=\"absmiddle\" onMouseOver=\"this.style.cursor='pointer'\" id=\"star-$allrssrow[rssid]\"></td>";
+					<img src=\"".$image_path."offstar.gif\" align=\"absmiddle\" onMouseOver=\"this.style.cursor='pointer'\" id=\"star-$allrssrow[rssid]\" onClick=\"makedefaultRss($allrssrow[rssid])\"></td>";
 			}
 			$shtml .= "<td class=\"rssTitle\"><a href=\"index.php?module=Rss&action=ListView&record=$allrssrow[rssid]
 				\" class=\"rssTitle\">".$allrssrow[rsstitle]."</a></td>";
@@ -164,7 +164,7 @@
 			}else
 			{		
 				$shtml .= "<td width=\"15\">
-					<img src=\"".$image_path."offstar.gif\" align=\"absmiddle\" onMouseOver=\"this.style.cursor='pointer'\" id=\"star-$allrssrow[rssid]\"></td>";
+					<img src=\"".$image_path."offstar.gif\" align=\"absmiddle\" onMouseOver=\"this.style.cursor='pointer'\" id=\"star-$allrssrow[rssid]\" onClick=\"makedefaultRss($allrssrow[rssid])\"></td>";
 			}
 			$shtml .= "<td class=\"rssTitle\"><a href=\"index.php?module=Rss&action=ListView&record=$allrssrow[rssid]\" class=\"rssTitle\">".$allrssrow[rsstitle]."</a></td><td>&nbsp;</td>";
 			$shtml .= "</tr>";
@@ -378,7 +378,7 @@
 				 	   $shtml .= "<img src=\"".$image_path."onstar.gif\" align=\"absmiddle\" onMouseOver=\"this.style.cursor='pointer'\" id=\"star-$allrssrow[rssid]\">";
 			}else
 			{
-				 	   $shtml .= "<img src=\"".$image_path."offstar.gif\" align=\"absmiddle\" onMouseOver=\"this.style.cursor='pointer'\" id=\"star-$allrssrow[rssid]\">";
+				 	   $shtml .= "<img src=\"".$image_path."offstar.gif\" align=\"absmiddle\" onMouseOver=\"this.style.cursor='pointer'\" id=\"star-$allrssrow[rssid]\"  onClick=\"makedefaultRss($allrssrow[rssid])\">";
 			}
 					   $shtml .= "</td>";
 			$shtml .= "<td class=\"rssTitle\" width=\"10%\" nowrap><a href=\"javascript:GetRssFeedList('$allrssrow[rssid]')\" class=\"rssTitle\">".$allrssrow[rsstitle]."</a></td><td>&nbsp;</td>";

Modified: vtigercrm/trunk/modules/Rss/RssAjax.php
==============================================================================
--- vtigercrm/trunk/modules/Rss/RssAjax.php (original)
+++ vtigercrm/trunk/modules/Rss/RssAjax.php Tue Jun 20 23:37:32 2006
@@ -10,5 +10,5 @@
   ********************************************************************************/
 	
 
-	require_once('modules/'.$_REQUEST['module'].'/'.$_REQUEST['vtigerfile'].'.php');
+	require_once('modules/'.$_REQUEST['module'].'/'.$_REQUEST['file'].'.php');
 ?>




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 01:38:53 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 05:38:53 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7320 -
 /vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
Message-ID: <20060621053853.3D0E883F342@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 20 23:38:49 2006
New Revision: 7320

Log:
rss category removed

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

Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original)
+++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Tue Jun 20 23:38:49 2006
@@ -361,10 +361,6 @@
 //Potential Details -- END
 
 
-//Rss entries being added
- $this->db->query("insert into vtiger_field values (24,".$this->db->getUniqueID("field").",'rsscategory','vtiger_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 vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 01:40:40 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 05:40:40 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7321 -
 /vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
Message-ID: <20060621054040.01EB883F33D@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 20 23:40:37 2006
New Revision: 7321

Log:
vtiger_ updated for activity table

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

Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original)
+++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Tue Jun 20 23:40:37 2006
@@ -532,7 +532,7 @@
  
  $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'recurringtype','vtiger_recurringevents',1,'15','recurringtype','Recurrence',1,0,0,100,6,19,3,'O~O',1,null,'BAS')");
 
- $this->db->query("Insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'notime','activity',1,56,'notime','No Time',1,0,0,100,20,19,3,'C~O',1,null,'BAS')");
+ $this->db->query("Insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'notime','vtiger_activity',1,56,'notime','No Time',1,0,0,100,20,19,3,'C~O',1,null,'BAS')");
 //Block19 -- End
 //Task Details -- END
 




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 01:45:09 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 05:45:09 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7322 -
	/vtigercrm/trunk/modules/Rss/Rss.php
Message-ID: <20060621054509.1362383F33D@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 20 23:45:06 2006
New Revision: 7322

Log:
fns related to rss category has been removed

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

Modified: vtigercrm/trunk/modules/Rss/Rss.php
==============================================================================
--- vtigercrm/trunk/modules/Rss/Rss.php (original)
+++ vtigercrm/trunk/modules/Rss/Rss.php Tue Jun 20 23:45:06 2006
@@ -388,37 +388,6 @@
 
 	}
 
-	/** Function to get the vtiger_rsscategories   
-	* This Function accepts no argument and returns the categorylist as an array
-	*/
-
-	function getRsscategory()
-	{
-		global $adb;
-		global $image_path;
-		$sSQL = "select * from vtiger_rsscategory where presence = 1 order by sortorderid";
-		$result = $adb->query($sSQL);
-
-		while($categoryrow = $adb->fetch_array($result))
-		{
-			$rsscategories[] = $categoryrow["rsscategory"];
-		}
-
-		return $rsscategories;
-	}
-	
-	function getRsscategory_html()
-	{
-		$rsscategory = $this->getRsscategory();
-		if(isset($rsscategory)) 
-		{
-			for($i=0;$i<count($rsscategory);$i++)
-			{
-				$shtml .= "<option value=\"$rsscategory[$i]\">$rsscategory[$i]</option>";
-			}
-		}
-		return $shtml;
-	}
 }
 
 /** Function to get the vtiger_rsstitle for the given vtiger_rssid  




From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 01:49:11 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 05:49:11 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231347=3A?=
 =?utf-8?q?_Potential_Sales_Stage_history_is_not_displayed?=
Message-ID: <076.aea73b50aece6d481e52ebcf4c8ca579@vtiger.fosslabs.com>

#1347: Potential Sales Stage history is not displayed
-----------------------+----------------------------------------------------
 Reporter:  mickie     |       Owner:  mickie
     Type:  defect     |      Status:  new   
 Priority:  major      |   Milestone:        
Component:  vtigercrm  |     Version:  5.0.0 
 Keywords:             |  
-----------------------+----------------------------------------------------
 In potential relatedlist we have Sales Stage history which does not
 display anything even there are entries in potstagehistory

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1347>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 01:52:45 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 05:52:45 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7323 - in
 /vtigercrm/trunk/include: ComboStrings.php PopulateComboValues.php
Message-ID: <20060621055245.65CAE83F35A@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 20 23:52:40 2006
New Revision: 7323

Log:
Rss category removed

Modified:
    vtigercrm/trunk/include/ComboStrings.php
    vtigercrm/trunk/include/PopulateComboValues.php

Modified: vtigercrm/trunk/include/ComboStrings.php
==============================================================================
--- vtigercrm/trunk/include/ComboStrings.php (original)
+++ vtigercrm/trunk/include/ComboStrings.php Tue Jun 20 23:52:40 2006
@@ -188,10 +188,6 @@
                           'Public'=>'Public'
 			 ),
 				     
-'rsscategory_dom' => Array('vtiger Discussions'=>'vtiger Discussions',
-                       'vtiger Wiki'=>'vtiger Wiki'
-                      ),
-
 'usageunit_dom' => Array('Box'=>'Box',
                         'Carton'=>'Carton',
                         'Caton'=>'Caton',

Modified: vtigercrm/trunk/include/PopulateComboValues.php
==============================================================================
--- vtigercrm/trunk/include/PopulateComboValues.php (original)
+++ vtigercrm/trunk/include/PopulateComboValues.php Tue Jun 20 23:52:40 2006
@@ -60,7 +60,7 @@
 				
 		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','status','activity_view','lead_view','date_format');
+		$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','usageunit','glacct','quotestage','carrier','taxclass','recurringtype','faqstatus','invoicestatus','postatus','sostatus','visibility','campaigntype','campaignstatus','expectedresponse','status','activity_view','lead_view','date_format');
 
 		foreach ($comboTables as $comTab)
 		{




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 02:00:33 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 06:00:33 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7324 -
	/vtigercrm/trunk/include/utils/ListViewUtils.php
Message-ID: <20060621060033.D61A483F35D@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 00:00:29 2006
New Revision: 7324

Log:
parenttab has been parsed in activities subjectlink

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 Jun 21 00:00:29 2006
@@ -1483,11 +1483,11 @@
 					$actvity_type = $adb->query_result($list_result,$list_result_count,'activitytype');
 					if($actvity_type == "Task")
 					{
-						$value = '<a href="index.php?action=DetailView&module='.$module.'&record='.$entity_id.'&activity_mode=Task">'.$temp_val.'</a>';
+						$value = '<a href="index.php?action=DetailView&module='.$module.'&record='.$entity_id.'&activity_mode=Task&parenttab=My Home Page">'.$temp_val.'</a>';
 					}
 					else
 					{
-						$value = '<a href="index.php?action=DetailView&module='.$module.'&record='.$entity_id.'&activity_mode=Events">'.$temp_val.'</a>';
+						$value = '<a href="index.php?action=DetailView&module='.$module.'&record='.$entity_id.'&activity_mode=Events&parenttab=My Home Page">'.$temp_val.'</a>';
 					}
 				}
 				elseif($module == "Vendors")
@@ -2567,7 +2567,9 @@
 		$field = 'id';
 		$table = 'vtiger_users';
 	}
-	$query = "SELECT ".$selectfield." FROM ".$reltable." ".$condition;
+	
+	if($reltable != null)
+		$query = "SELECT ".$selectfield." FROM ".$reltable." ".$condition;
 
 	if($query !='')
 	{




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 02:07:14 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 06:07:14 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7325 -
	/vtigercrm/trunk/include/magpierss/rss_fetch.inc
Message-ID: <20060621060714.56FB083F361@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 00:07:09 2006
New Revision: 7325

Log:
error msg changed

Modified:
    vtigercrm/trunk/include/magpierss/rss_fetch.inc

Modified: vtigercrm/trunk/include/magpierss/rss_fetch.inc
==============================================================================
--- vtigercrm/trunk/include/magpierss/rss_fetch.inc (original)
+++ vtigercrm/trunk/include/magpierss/rss_fetch.inc Wed Jun 21 00:07:09 2006
@@ -235,7 +235,7 @@
         if ( $errormsg ) {
             $errormsg = "MagpieRSS: $errormsg";
             $MAGPIE_ERROR = $errormsg;
-            trigger_error( $errormsg, $lvl);                
+            //trigger_error( $errormsg, $lvl);                
         }
 }
 




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 02:07:59 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 06:07:59 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7326 -
	/vtigercrm/trunk/modules/Potentials/Opportunity.php
Message-ID: <20060621060759.3C6BA83F361@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 00:07:55 2006
New Revision: 7326

Log:
* Modified the function get_stage_history to display the sales stage history where as previously it was not displayed

Modified:
    vtigercrm/trunk/modules/Potentials/Opportunity.php

Modified: vtigercrm/trunk/modules/Potentials/Opportunity.php
==============================================================================
--- vtigercrm/trunk/modules/Potentials/Opportunity.php (original)
+++ vtigercrm/trunk/modules/Potentials/Opportunity.php Wed Jun 21 00:07:55 2006
@@ -283,126 +283,55 @@
 		$log->debug("Exiting get_products method ...");
 		return GetRelatedList('Potentials','Products',$focus,$query,$button,$returnset);
 	}
+
+	/**	Function used to get the Sales Stage history of the Potential
+	 *	@param $id - potentialid
+	 *	return $return_data - array with header and the entries in format Array('header'=>$header,'entries'=>$entries_list) where as $header and $entries_list are array which contains all the column values of an row
+	 */
 	function get_stage_history($id)
 	{	
-		 global $log;
+		global $log;
 		$log->debug("Entering get_stage_history(".$id.") method ...");
-		global $theme;
-		$theme_path="themes/".$theme."/";
-		$image_path=$theme_path."images/";
-		require_once ($theme_path."layout_utils.php");
 
 		global $adb;
 		global $mod_strings;
 		global $app_strings;
 
+		$query = 'select vtiger_potstagehistory.*, vtiger_potential.potentialname from vtiger_potstagehistory inner join vtiger_potential on vtiger_potential.potentialid = vtiger_potstagehistory.potentialid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_potential.potentialid where vtiger_crmentity.deleted = 0 and vtiger_potential.potentialid = '.$id;
 		$result=$adb->query($query);
 		$noofrows = $adb->num_rows($result);
 
-
-		if($noofrows == 0)
-		{
-		}
-		else
-		{	
-			if ($noofrows > 15)
-			{
-				$list .= '<div style="overflow:auto;height:315px;width:100%;">';
-			}
-
-			$list .= '<table border="0" cellpadding="0" cellspacing="0" class="FormBorder" width="100%">';
-			$list .= '<tr class="ModuleListTitle" height=20>';
-
-			$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-			$list .= '<td class="moduleListTitle" height="21">';
-
-			$list .= $app_strings['LBL_AMOUNT'].'</td>';
-			$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-			$list .= '<td class="moduleListTitle">';
-
-			$list .= $app_strings['LBL_SALES_STAGE'].'</td>';
-			$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-			$list .= '<td class="moduleListTitle">';
-
-			$list .= $app_strings['LBL_PROBABILITY'].'</td>';
-			$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-			$list .= '<td class="moduleListTitle">';
-
-			$list .= $app_strings['LBL_CLOSE_DATE'].'</td>';
-			$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-			$list .= '<td class="moduleListTitle">';
-
-			$list .= $app_strings['LBL_LAST_MODIFIED'].'</td>';
-			$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-			$list .= '<td class="moduleListTitle">';
-
-			$list .= '</td>';
-			$list .= '</tr>';
-
-			$list .= '<tr><td COLSPAN="12" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif"></td></tr>';
-
-			$i=1;
-			while($row = $adb->fetch_array($result))
-			{
-
-				if ($i%2==0)
-					$trowclass = 'evenListRow';
-				else
-					$trowclass = 'oddListRow';
-
-				$list .= '<tr class="'. $trowclass.'">';
-
-				$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-				$list .= '<td width="15%">'.$row['amount'].'</td>';
-
-				$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-				$list .= '<td width="25%" height="21" style="padding:0px 3px 0px 3px;">';
-				$list .= $row['stage'];
-				$list .= '</td>';
-
-				$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-				$list .= '<td width="15%" height="21" style="padding:0px 3px 0px 3px;">';
-				$list .= $row['probability'];
-				$list .= '</td>';
-
-				$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-				$list .= '<td width="25%" height="21" style="padding:0px 3px 0px 3px;">';
-				//changed to show the close date as user date format -- after 4.2 patch2
-				$closedate = getDisplayDate($row['closedate']);
-				$list .= $closedate;
-				$list .= '</td>';
-
-				$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
-				$list .= '<td width="20%" height="21" style="padding:0px 3px 0px 3px;">';
-				//changed to show the last modified date as user date format -- after 4.2 patch2
-				$lastmodified = getDisplayDate($row['lastmodified']);
-				$list .= $lastmodified;
-				$list .= '</td>';
-
-				$list .= '</td>';
-
-				$list .= '</tr>';
-				$i++;
-			}
-
-			$list .= '<tr><td COLSPAN="12" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif"></td></tr>';
-			$list .= '</table>';
-			if ($noofrows > 15)
-			{
-				$list .= '</div>';
-			}
-
-		}
-
-		$query = 'select vtiger_potstagehistory.*, vtiger_potential.potentialname from vtiger_potstagehistory inner join vtiger_potential on vtiger_potential.potentialid = vtiger_potstagehistory.potentialid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_potential.potentialid where vtiger_crmentity.deleted = 0 and vtiger_potential.potentialid = '.$id;
-	 $log->debug("Exiting get_stage_history method ...");
-	}
-
-	function get_history($id)
-	{
-		 global $log;
-		$log->debug("Entering get_history(".$id.") method ...");
-		$query = "SELECT vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.status,
+		$header[] = $app_strings['LBL_AMOUNT'];
+		$header[] = $app_strings['LBL_SALES_STAGE'];
+		$header[] = $app_strings['LBL_PROBABILITY'];
+		$header[] = $app_strings['LBL_CLOSE_DATE'];
+		$header[] = $app_strings['LBL_LAST_MODIFIED'];
+
+		while($row = $adb->fetch_array($result))
+		{
+			$entries = Array();
+
+			$entries[] = $row['amount'];
+			$entries[] = $row['stage'];
+			$entries[] = $row['probability'];
+			$entries[] = getDisplayDate($row['closedate']);
+			$entries[] = getDisplayDate($row['lastmodified']);
+
+			$entries_list[] = $entries;
+		}
+
+		$return_data = Array('header'=>$header,'entries'=>$entries_list);
+
+	 	$log->debug("Exiting get_stage_history method ...");
+
+		return $return_data;
+	}
+
+		function get_history($id)
+		{
+			global $log;
+			$log->debug("Entering get_history(".$id.") method ...");
+			$query = "SELECT vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.status,
 		vtiger_activity.eventstatus, vtiger_activity.activitytype, vtiger_contactdetails.contactid,
 		vtiger_contactdetails.firstname, vtiger_contactdetails.lastname, vtiger_crmentity.modifiedtime,
 		vtiger_crmentity.createdtime, vtiger_crmentity.description, vtiger_users.user_name




From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 02:08:41 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 06:08:41 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231347=3A?=
 =?utf-8?q?_Potential_Sales_Stage_history_is_not_displayed?=
In-Reply-To: <076.aea73b50aece6d481e52ebcf4c8ca579@vtiger.fosslabs.com>
References: <076.aea73b50aece6d481e52ebcf4c8ca579@vtiger.fosslabs.com>
Message-ID: <085.f4c5c1a21e285de21dafc174a0245fc2@vtiger.fosslabs.com>

#1347: Potential Sales Stage history is not displayed
------------------------+---------------------------------------------------
  Reporter:  mickie     |       Owner:  mickie
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mickie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 This issue has been fixed.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1347>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 02:36:40 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 06:36:40 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7327 -
 /vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
Message-ID: <20060621063641.0F41B83F366@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 00:36:37 2006
New Revision: 7327

Log:
Activities added under marketing

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

Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original)
+++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Wed Jun 21 00:36:37 2006
@@ -2153,7 +2153,7 @@
 	$this->db->query("insert into vtiger_parenttabrel values (2,10,4)");
 	$this->db->query("insert into vtiger_parenttabrel values (4,10,7)");
 	$this->db->query("insert into vtiger_parenttabrel values (2,7,5)");
-	$this->db->query("insert into vtiger_parenttabrel values (4,9,6)");
+	$this->db->query("insert into vtiger_parenttabrel values (2,9,6)");
 	$this->db->query("insert into vtiger_parenttabrel values (4,9,8)");
 		
 	//Added to populate the default inventory tax informations




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 02:37:42 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 06:37:42 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7328 -
	/vtigercrm/trunk/include/utils/ListViewUtils.php
Message-ID: <20060621063743.17BCE83F365@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 00:37:39 2006
New Revision: 7328

Log:
parenttab has been parsed in activities subjectlink

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 Jun 21 00:37:39 2006
@@ -1483,11 +1483,11 @@
 					$actvity_type = $adb->query_result($list_result,$list_result_count,'activitytype');
 					if($actvity_type == "Task")
 					{
-						$value = '<a href="index.php?action=DetailView&module='.$module.'&record='.$entity_id.'&activity_mode=Task&parenttab=My Home Page">'.$temp_val.'</a>';
+						$value = '<a href="index.php?action=DetailView&module='.$module.'&record='.$entity_id.'&activity_mode=Task&parenttab='.$tabname.'">'.$temp_val.'</a>';
 					}
 					else
 					{
-						$value = '<a href="index.php?action=DetailView&module='.$module.'&record='.$entity_id.'&activity_mode=Events&parenttab=My Home Page">'.$temp_val.'</a>';
+						$value = '<a href="index.php?action=DetailView&module='.$module.'&record='.$entity_id.'&activity_mode=Events&parenttab='.$tabname.'">'.$temp_val.'</a>';
 					}
 				}
 				elseif($module == "Vendors")




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 02:53:21 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 06:53:21 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7329 - in /vtigercrm/trunk:
 Smarty/templates/Rss.tpl themes/blue/style.css
Message-ID: <20060621065321.767AA83F365@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 00:53:16 2006
New Revision: 7329

Log:
floating popup integrated

Modified:
    vtigercrm/trunk/Smarty/templates/Rss.tpl
    vtigercrm/trunk/themes/blue/style.css

Modified: vtigercrm/trunk/Smarty/templates/Rss.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Rss.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Rss.tpl Wed Jun 21 00:53:16 2006
@@ -112,7 +112,7 @@
 			<tr>
 			
 			<td style="padding:10px;vertical-align:middle;" width="28%">
-			<img src='{$IMAGE_PATH}rssroot.gif' align='absmiddle'/><a href="javascript:;" onClick="fnvshobj(this,'PopupLay');" title='{$APP.LBL_ADD_RSS_FEEDS}'>{$MOD.LBL_ADD_RSS_FEED}</a>
+			<img src='{$IMAGE_PATH}rssroot.gif' align='absmiddle'/><a href="javascript:;" onClick="fnvshobj(this,'PopupLay');$('rssurl').focus();" title='{$APP.LBL_ADD_RSS_FEEDS}'>{$MOD.LBL_ADD_RSS_FEED}</a>
 			</td>
 			<td width="2%">&nbsp;</td>
 			<td width="60%"><img src="{$IMAGE_PATH}rssimage.gif" width="176" height="44"  align="right"/></td>
@@ -164,7 +164,7 @@
 	<td>&nbsp;</td>
 	</tr>
 </table>
-	<div id="PopupLay">
+	<div id="PopupLay" class="fixedLay">
 	<table width="100%" border="0" cellpadding="5" cellspacing="0">
 	<tr>
 	<td class="genHeaderSmall" align="left"><img src="{$IMAGE_PATH}rssroot.gif" width="24" height="22" align="absmiddle" />&nbsp;{$MOD.LBL_ADD_RSS_FEED}</td>

Modified: vtigercrm/trunk/themes/blue/style.css
==============================================================================
--- vtigercrm/trunk/themes/blue/style.css (original)
+++ vtigercrm/trunk/themes/blue/style.css Wed Jun 21 00:53:16 2006
@@ -2369,7 +2369,6 @@
     background-color:#FFFFFF;
     padding:5px;
     display:none;
-    position:absolute;
     left:100px;
     top:100px;
 }




From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 02:57:42 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 06:57:42 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231348=3A?=
 =?utf-8?q?_deleted_records_displayed_in_global_search?=
Message-ID: <076.dd3d65454b07d2aac86bfb866aba2fa0@vtiger.fosslabs.com>

#1348: deleted records displayed in global search
-----------------------+----------------------------------------------------
 Reporter:  mickie     |       Owner:  mickie
     Type:  defect     |      Status:  new   
 Priority:  major      |   Milestone:        
Component:  vtigercrm  |     Version:  5.0.0 
 Keywords:             |  
-----------------------+----------------------------------------------------
 I am wondering why when doing a search it also include deleted records.
 Furthermore, when clicked on the searched record, it looks like it is
 still undeleted!!! Very confusing.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1348>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 03:05:54 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 07:05:54 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231308=3A?=
 =?utf-8?q?_Role_security_issue_=28cf_=23599=29?=
In-Reply-To: <076.c439add42e557216aac6af17846b79b5@vtiger.fosslabs.com>
References: <076.c439add42e557216aac6af17846b79b5@vtiger.fosslabs.com>
Message-ID: <085.47f84636802e19d00ae292bca849bb2d@vtiger.fosslabs.com>

#1308: Role security issue (cf #599)
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  don           
      Type:  defect     |      Status:  closed        
  Priority:  critical   |   Milestone:                
 Component:  vtigercrm  |     Version:  5.0.0         
Resolution:  fixed      |    Keywords:  security roles
------------------------+---------------------------------------------------
Changes (by anonymous):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1308>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 03:06:08 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 07:06:08 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7330 -
	/vtigercrm/trunk/modules/Home/UnifiedSearch.php
Message-ID: <20060621070608.3120B83F36C@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 01:06:04 2006
New Revision: 7330

Log:
* Modified to avoid the deleted records coming in the search result

Modified:
    vtigercrm/trunk/modules/Home/UnifiedSearch.php

Modified: vtigercrm/trunk/modules/Home/UnifiedSearch.php
==============================================================================
--- vtigercrm/trunk/modules/Home/UnifiedSearch.php (original)
+++ vtigercrm/trunk/modules/Home/UnifiedSearch.php Wed Jun 21 01:06:04 2006
@@ -117,7 +117,7 @@
 		}
 
 		if($where != '')
-			$listquery .= ' and '.$where;
+			$listquery .= ' and ('.$where.')';
 		
 		$list_result = $adb->query($listquery);
 		$noofrows = $adb->num_rows($list_result);




From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 03:11:27 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 07:11:27 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231348=3A?=
 =?utf-8?q?_deleted_records_displayed_in_global_search?=
In-Reply-To: <076.dd3d65454b07d2aac86bfb866aba2fa0@vtiger.fosslabs.com>
References: <076.dd3d65454b07d2aac86bfb866aba2fa0@vtiger.fosslabs.com>
Message-ID: <085.fb7471b1970b8558c7e15b19c06b6671@vtiger.fosslabs.com>

#1348: deleted records displayed in global search
------------------------+---------------------------------------------------
  Reporter:  mickie     |       Owner:  mickie
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mickie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 This issue has been fixed
 http://forums.vtiger.com/viewtopic.php?p=26326#26326

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1348>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 03:14:53 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 07:14:53 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231346=3A?=
 =?utf-8?q?_Bug_in_sales_stage_history_with_date_format?=
In-Reply-To: <076.bab2ea728a9018419ac1466eb7e6303a@vtiger.fosslabs.com>
References: <076.bab2ea728a9018419ac1466eb7e6303a@vtiger.fosslabs.com>
Message-ID: <085.c27c9478502c4926c427f2419299b150@vtiger.fosslabs.com>

#1346: Bug in sales stage history with date format
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  developer
      Type:  defect     |      Status:  new      
  Priority:  blocker    |   Milestone:           
 Component:  vtigercrm  |     Version:  4.2.4rc1 
Resolution:             |    Keywords:           
------------------------+---------------------------------------------------
Changes (by anonymous):

  * version:  5.0.0 => 4.2.4rc1

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1346>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 03:49:41 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 07:49:41 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7331 -
 /vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php
Message-ID: <20060621074942.2ECFA83F36F@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 01:49:37 2006
New Revision: 7331

Log:
* Added the db changes where as major part is users module fields are entered in field table

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 Jun 21 01:49:37 2006
@@ -3046,6 +3046,119 @@
 }
 
 
+//User fields added in field table
+$user_query_array = Array(
+
+"alter table vtiger_users add column confirm_password varchar(50)",
+"insert into vtiger_tab values (29,'Users',0,26,'Users',null,null,1)",
+
+"insert into vtiger_blocks values (79,29,'LBL_USERLOGIN_ROLE',1,0,0,0,0,0)",
+"insert into vtiger_blocks values (80,29,'LBL_MORE_INFORMATION',2,0,0,0,0,0)",
+"insert into vtiger_blocks values (81,29,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)",
+
+"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'user_name','vtiger_users',1,'106','user_name','User Name',1,0,0,11,1,79,1,'V~M',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'is_admin','vtiger_users',1,'156','is_admin','Admin',1,0,0,3,2,79,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'user_password','vtiger_users',1,'99','user_password','Password',1,0,0,30,3,79,4,'P~M',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'confirm_password','vtiger_users',1,'99','confirm_password','Confirm Password',1,0,0,30,4,79,4,'P~M',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'first_name','vtiger_users',1,'1','first_name','First Name',1,0,0,30,5,79,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'last_name','vtiger_users',1,'2','last_name','Last Name',1,0,0,30,6,79,1,'V~M',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'roleid','vtiger_user2role',1,'98','roleid','Role',1,0,0,200,7,79,1,'V~M',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'email1','vtiger_users',1,'104','email1','Email',1,0,0,100,9,79,1,'E~M',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'status','vtiger_users',1,'115','status','Status',1,0,0,100,10,79,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'activity_view','vtiger_users',1,'15','activity_view','Default Activity View',1,0,0,100,13,79,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'lead_view','vtiger_users',1,'15','lead_view','Default Lead View',1,0,0,100,12,79,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'currency_id','vtiger_users',1,'116','currency_id','Currency',1,0,0,100,11,79,1,'I~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'title','vtiger_users',1,'1','title','Title',1,0,0,50,1,80,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'phone_work','vtiger_users',1,'1','phone_work','Office Phone',1,0,0,50,2,80,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'department','vtiger_users',1,'1','department','Department',1,0,0,50,3,80,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'phone_mobile','vtiger_users',1,'1','phone_mobile','Mobile',1,0,0,50,4,80,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'reports_to_id','vtiger_users',1,'101','reports_to_id','Reports To',1,0,0,50,5,80,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'phone_other','vtiger_users',1,'1','phone_other','Other Phone',1,0,0,50,5,80,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'email2','vtiger_users',1,'13','email2','Other Email',1,0,0,100,6,80,1,'E~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'phone_fax','vtiger_users',1,'1','phone_fax','Fax',1,0,0,50,7,80,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'yahoo_id','vtiger_users',1,'13','yahoo_id','Yahoo id',1,0,0,100,7,80,1,'E~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'phone_home','vtiger_users',1,'1','phone_home','Home Phone',1,0,0,50,8,80,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'imagename','vtiger_users',1,'105','imagename','User Image',1,0,0,250,9,80,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'date_format','vtiger_users',1,'15','date_format','Date Format',1,0,0,30,10,80,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'tagcloud','vtiger_users',1,'103','tagcloud','Tag Cloud',1,0,0,250,13,80,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'signature','vtiger_users',1,'21','signature','Signature',1,0,0,250,11,80,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'description','vtiger_users',1,'21','description','Notes',1,0,0,250,12,80,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'address_street','vtiger_users',1,'21','address_street','Street Address',1,0,0,250,1,81,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'address_city','vtiger_users',1,'1','address_city','City',1,0,0,100,2,81,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'address_state','vtiger_users',1,'1','address_state','State',1,0,0,100,3,81,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'address_postalcode','vtiger_users',1,'1','address_postalcode','Postal Code',1,0,0,100,4,81,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'address_country','vtiger_users',1,'1','address_country','Country',1,0,0,100,5,81,1,'V~O',1,null,'BAS')",
+			 );
+foreach($user_query_array as $query)
+{
+	Execute($query);
+}
+
+$create_query29 = "CREATE TABLE vtiger_status (
+			`statusid` int(19) NOT NULL auto_increment,
+			`status` varchar(200) NOT NULL,
+			`sortorderid` int(19) NOT NULL default '0',
+			`presence` int(1) NOT NULL default '1',
+			PRIMARY KEY  (`statusid`)
+			)";
+Execute($create_query29);
+
+Execute("insert into vtiger_status values (1,'Active',0,1)");
+Execute("insert into vtiger_status values (2,'Inactive',1,1)");
+
+$create_query30 = "CREATE TABLE vtiger_activity_view (
+			`activity_viewid` int(19) NOT NULL auto_increment,
+			`activity_view` varchar(200) NOT NULL,
+			`sortorderid` int(19) NOT NULL default '0',
+			`presence` int(1) NOT NULL default '1',
+			PRIMARY KEY  (`activity_viewid`)
+			)";
+Execute($create_query30);
+
+Execute("insert into vtiger_activity_view values (1,'Today',0,1)");
+Execute("insert into vtiger_activity_view values (2,'This Week',1,1)");
+Execute("insert into vtiger_activity_view values (3,'This Month',2,1)");
+Execute("insert into vtiger_activity_view values (4,'This Year',3,1)");
+
+
+$create_query31 = "CREATE TABLE vtiger_lead_view (
+			`lead_viewid` int(19) NOT NULL auto_increment,
+			`lead_view` varchar(200) NOT NULL,
+			`sortorderid` int(19) NOT NULL default '0',
+			`presence` int(1) NOT NULL default '1',
+			PRIMARY KEY  (`lead_viewid`)
+			)";
+Execute($create_query31);
+
+Execute("insert into vtiger_lead_view values (1,'Today',0,1)");
+Execute("insert into vtiger_lead_view values (2,'Last 2 Days',1,1)");
+Execute("insert into vtiger_lead_view values (3,'Last Week',2,1)");
+
+
+$create_query32 = "CREATE TABLE vtiger_date_format (
+			`date_formatid` int(19) NOT NULL auto_increment,
+			`date_format` varchar(200) NOT NULL,
+			`sortorderid` int(19) NOT NULL default '0',
+			`presence` int(1) NOT NULL default '1',
+			PRIMARY KEY  (`date_formatid`)
+			)";
+Execute($create_query32);
+
+Execute("insert into vtiger_date_format values (1,'dd-mm-yyyy',0,1)");
+Execute("insert into vtiger_date_format values (2,'mm-dd-yyyy',1,1)");
+Execute("insert into vtiger_date_format values (3,'yyyy-mm-dd',2,1)");
+//end of User fields added in field table
+
+//Activities and Leads Added under Marketing
+Execute("insert into vtiger_parenttabrel values (2,7,5)");
+Execute("insert into vtiger_parenttabrel values (2,9,6)");
+Execute("insert into vtiger_parenttabrel values (4,9,8)");
+
+//Queries to remove the rss categories
+Execute("drop table vtiger_rsscategory");
+Execute("delete from vtiger_field where tabid=24");
+
+
 
 			     
 




From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 04:17:58 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 08:17:58 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231173=3A?=
	=?utf-8?q?_unable_to_veiw_pdf?=
In-Reply-To: <076.2f691fd08704f9500476c37cc5e5685c@vtiger.fosslabs.com>
References: <076.2f691fd08704f9500476c37cc5e5685c@vtiger.fosslabs.com>
Message-ID: <085.1f3359b110701a63b97b6960b1b62eb5@vtiger.fosslabs.com>

#1173: unable to veiw pdf
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  Richie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by anonymous):

  * owner:  jerrydgeorge => Richie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1173>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 04:18:23 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 08:18:23 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23440=3A_?=
 =?utf-8?q?not_able_to_delete_the_contact_image_from_contacts?=
In-Reply-To: <076.995242b6a5aeaa903d7e9a4ad6a99c1c@vtiger.fosslabs.com>
References: <076.995242b6a5aeaa903d7e9a4ad6a99c1c@vtiger.fosslabs.com>
Message-ID: <085.47f1aa71b92dd7b18aca9549b4959ff9@vtiger.fosslabs.com>

#440: not able to delete the contact image from contacts
------------------------+---------------------------------------------------
  Reporter:  don        |       Owner:  Richie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by anonymous):

  * owner:  jerrydgeorge => Richie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/440>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 04:41:20 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 08:41:20 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7332 -
	/vtigercrm/trunk/Smarty/templates/SetMenu.tpl
Message-ID: <20060621084120.CF76983F25B@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 02:41:16 2006
New Revision: 7332

Log:
Setting menu file updated - ahmed

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

Modified: vtigercrm/trunk/Smarty/templates/SetMenu.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/SetMenu.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/SetMenu.tpl Wed Jun 21 02:41:16 2006
@@ -7,34 +7,130 @@
 		<!--Left Side Navigation Table-->
 		<table border=0 cellspacing=0 cellpadding=0 width=100%>
 				<tr><td class="settingsTabHeader" nowrap>{$MOD.LBL_USER_MANAGEMENT}</td></tr>
-				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_USERS}</td></tr>
-				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=listroles&parenttab=Settings">{$MOD.LBL_ROLES}</a></td></tr>
-				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=ListProfiles&parenttab=Settings">{$MOD.LBL_PROFILES}</a></td></tr>
+				{if $smarty.request.action eq 'index' ||  $smarty.request.action eq 'DetailView' || $smarty.request.action eq 'EditView' }
+					<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_USERS}</td></tr>
+				{else}
+					<tr><td class="settingsTabList" nowrap><a href="index.php?module=Administration&action=index&parenttab=Settings">{$MOD.LBL_USERS}</a></td></tr>
+				{/if}
+
+				{if $smarty.request.action eq 'listroles' ||  $smarty.request.action eq 'RoleDetailView' ||  $smarty.request.action eq 'saverole' ||  $smarty.request.action eq 'createrole'} 		
+					<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_ROLES}</td></tr>
+				{else}	
+					<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=listroles&parenttab=Settings">{$MOD.LBL_ROLES}</a></td></tr>
+				{/if}
+
+				{if $smarty.request.action eq 'ListProfiles' || $smarty.request.action eq 'profilePrivileges' ||  $smarty.request.action eq 'CreateProfile' ||  $smarty.request.action eq 'SaveProfile' || $smarty.request.action eq 'UpdateProfileChanges' }
+					<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_PROFILES}</td></tr>
+				{else}
+					<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=ListProfiles&parenttab=Settings">{$MOD.LBL_PROFILES}</a></td></tr>
+				{/if}
+
+				{if $smarty.request.action eq 'listgroups' || $smarty.request.action eq 'GroupDetailView' || $smarty.request.action eq 'createnewgroup' || $smarty.request.action eq 'SaveGroup'}
+				<tr><td class="settingsTabSelected" nowrap>{$MOD.USERGROUPLIST}</td></tr>   	
+				{else}
 				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=listgroups&parenttab=Settings">{$MOD.USERGROUPLIST}</a></td></tr>
+				{/if}
+
+				{if  $smarty.request.action eq 'OrgSharingEditView' || $smarty.request.action eq 'OrgSharingDetailView' || $smarty.request.action eq 'SaveOrgSharing'}
+				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_SHARING_ACCESS}</td></tr>  	
+				{else}
 				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=OrgSharingDetailView&parenttab=Settings">{$MOD.LBL_SHARING_ACCESS}</a></td></tr>
+				{/if}
+
+				{if $smarty.request.action eq 'DefaultFieldPermissions' || $smarty.request.action eq 'UpdateDefaultFieldLevelAccess' || $smarty.request.action eq 'EditDefOrgFieldLevelAccess' }
+				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_FIELDS_ACCESS}</td></tr>
+				{else}
 				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=DefaultFieldPermissions&parenttab=Settings">{$MOD.LBL_FIELDS_ACCESS}</a></td></tr>
+				{/if}
+
+				{if $smarty.request.action eq 'ListModuleOwners' || $smarty.request.action eq 'SettingsAjax'}
+				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_MODULE_OWNERS}</td></tr>
+				{else}
 				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=ListModuleOwners&parenttab=Settings">{$MOD.LBL_MODULE_OWNERS}</a></td></tr>
+				{/if}
+
+				{if  $smarty.request.action eq 'Announcements' ||  $smarty.request.action eq 'UsersAjax' }
+				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_ANNOUNCEMENT}</td></tr>		
+				{else}
 				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=Announcements&parenttab=Settings">{$MOD.LBL_ANNOUNCEMENT}</a></td></tr>
+				{/if}
 	
 				<tr><td class="settingsTabHeader" nowrap>{$MOD.LBL_STUDIO}</td></tr>
 				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=SettingsSubMenu&type=CustomField&parenttab=Settings">{$MOD.LBL_CUSTOM_FIELDS}</a></td></tr>
+				
+				{if  $smarty.request.action eq 'PickList' ||  $smarty.request.action eq 'SettingsAjax'}
+				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_PICKLIST_EDITOR}</td></tr>						     {else}
 				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=PickList&parenttab=Settings">{$MOD.LBL_PICKLIST_EDITOR}</a></td></tr>
+				{/if}
 	
 				<tr><td class="settingsTabHeader" nowrap>{$MOD.LBL_COMMUNICATION_TEMPLATES}</td></tr>
+
+				{if $smarty.request.action eq 'listemailtemplates' || $smarty.request.action eq 'detailviewemailtemplate' || $smarty.request.action eq 'editemailtemplate' || $smarty.request.action eq 'saveemailtemplate' || $smarty.request.action eq 'deleteemailtemplate'}
+				<tr><td class="settingsTabSelected" nowrap>{$MOD.EMAILTEMPLATES}</td></tr>
+				{else}
 				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=listemailtemplates&parenttab=Settings">{$MOD.EMAILTEMPLATES}</a></td></tr>
+				{/if}
+
+				{if $smarty.request.action eq 'listwordtemplates' || $smarty.request.action eq 'add2db' || $smarty.request.action eq 'deletewordtemplate'}
+				<tr><td class="settingsTabSelected" nowrap>{$MOD.EMAILTEMPLATES}</td></tr>
+				
+				{else}	
 				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=listwordtemplates&parenttab=Settings">{$MOD.WORDINTEGRATION}</a></td></tr>
+				{/if}
+
+				{if $smarty.request.action eq 'listnotificationschedulers' || $smarty.request.action eq 'UsersAjax'}
+				<tr><td class="settingsTabSelected" nowrap>{$MOD.NOTIFICATIONSCHEDULERS}</td></tr>
+				{else}
 				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=listnotificationschedulers&parenttab=Settings">{$MOD.NOTIFICATIONSCHEDULERS}</a></td></tr>
+				{/if}
+				
+				{if $smarty.request.action eq 'listinventorynotifications' || $smarty.request.action eq 'UsersAjax'}
+				<tr><td class="settingsTabSelected" nowrap>{$MOD.INVENTORYNOTIFICATION}</td></tr>
+				{else}	
 				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=listinventorynotifications&parenttab=Settings">{$MOD.INVENTORYNOTIFICATION}</a></td></tr>
+				{/if} 	
+
+				{if $smarty.request.action eq 'OrganizationTermsandConditions' || $smarty.request.action eq 'savetermsandconditions'}
+				<tr><td class="settingsTabSelected" nowrap>{$MOD.INVENTORYNOTIFICATION}</td></tr>
+				{else}
 				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=OrganizationTermsandConditions&parenttab=Settings">{$MOD.INVENTORYTERMSANDCONDITIONS}</a></td></tr>
+				{/if}
+
 	
 				<tr><td class="settingsTabHeader" nowrap>{$MOD.LBL_OTHER_SETTINGS}</td></tr>
+				{if $smarty.request.action eq 'OrganizationConfig' || $smarty.request.action eq 'EditCompanyDetails' || $smarty.request.action eq 'add2db'}
+				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_COMPANY_DETAILS}</td></tr>
+				{else}	
 				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=OrganizationConfig&parenttab=Settings">{$MOD.LBL_COMPANY_DETAILS}</a></td></tr>
+				{/if}
+				
+				{if  $smarty.request.action eq 'EmailConfig' ||  $smarty.request.action eq 'Save' }
+				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_MAIL_SERVER_SETTINGS}</td></tr>
+				{else}
 				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=EmailConfig&parenttab=Settings">{$MOD.LBL_MAIL_SERVER_SETTINGS}</a></td></tr>
+				{/if}
+				
+				{if $smarty.request.action eq 'BackupServerConfig' || $smarty.request.action eq 'index' || $smarty.request.action eq 'Save'}
+				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_BACKUP_SERVER_SETTINGS}</td></tr>
+				{else}
 				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=BackupServerConfig&parenttab=Settings">{$MOD.LBL_BACKUP_SERVER_SETTINGS}</a></td></tr>
+				{/if}
+				
+				{if $smarty.request.action eq 'CurrencyListView' ||  $smarty.request.action eq 'CurrencyEditView' ||  $smarty.request.action eq 'index' ||  $smarty.request.action eq 'SaveCurrencyInfo'}
+				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_CURRENCY_SETTINGS}</td></tr>
+				{else}
 				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=CurrencyListView&parenttab=Settings">{$MOD.LBL_CURRENCY_SETTINGS}</a></td></tr>
+				{/if}
+				
+				{if $smarty.request.action eq 'TaxConfig'}
+				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_TAX_SETTINGS}</td></tr>
+				{else}
 				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=TaxConfig&parenttab=Settings">{$MOD.LBL_TAX_SETTINGS}</a></td></tr>
+				{/if}
 				</table>
 			</td>
 			<td width=90% class="small settingsSelectedUI" valign=top >
 
 
+
+




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 04:43:09 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 08:43:09 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7333 - in
 /vtigercrm/trunk/Smarty/templates: RoleDetailView.tpl RoleEditView.tpl
Message-ID: <20060621084309.0689983F261@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 02:43:05 2006
New Revision: 7333

Log:
Update role tpl file

Modified:
    vtigercrm/trunk/Smarty/templates/RoleDetailView.tpl
    vtigercrm/trunk/Smarty/templates/RoleEditView.tpl

Modified: vtigercrm/trunk/Smarty/templates/RoleDetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/RoleDetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/RoleDetailView.tpl Wed Jun 21 02:43:05 2006
@@ -9,117 +9,117 @@
   *
  ********************************************************************************/
 -->*}
-<script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
-<style type="text/css">@import url(themes/blue/style.css);</style>
+<script language="JAVASCRIPT" type="text/javascript" src="include/js/smoothscroll.js"></script>
 
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-<tr>
-	{include file='SettingsMenu.tpl'}
-<td width="75%" valign="top">
+<br>
+<table align="center" border="0" cellpadding="0" cellspacing="0" width="98%">
+<tbody><tr>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
+        <td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
+        <br>
 
-<form id="form" name="roleView" action="index.php" method="post">
-<input type="hidden" name="module" value="Users">
-<input type="hidden" name="action" value="createrole">
-<input type="hidden" name="parenttab" value="Settings">
-<input type="hidden" name="returnaction" value="RoleDetailView">
-<input type="hidden" name="roleid" value="{$ROLEID}">
-<input type="hidden" name="mode" value="edit">
+	<div align=center>
+			{include file='SetMenu.tpl'}
+				<!-- DISPLAY -->
+				<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
+				<form id="form" name="roleView" action="index.php" method="post">
+				<input type="hidden" name="module" value="Users">
+				<input type="hidden" name="action" value="createrole">
+				<input type="hidden" name="parenttab" value="Settings">
+				<input type="hidden" name="returnaction" value="RoleDetailView">
+				<input type="hidden" name="roleid" value="{$ROLEID}">
+				<input type="hidden" name="mode" value="edit">
+				<tr>
+					<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}ico-roles.gif" width="48" height="48" border=0 ></td>
+					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Users&action=listroles&parenttab=Settings">{$CMOD.LBL_ROLES}</a> &gt; {$CMOD.LBL_VIEWING} &quot;{$ROLE_NAME}&quot; </b></td>
+				</tr>
+				<tr>
+					<td valign=top class="small">{$CMOD.LBL_VIEWING} {$CMOD.LBL_PROPERTIES} &quot;{$ROLE_NAME}&quot; {$MOD.LBL_LIST_CONTACT_ROLE} </td>
+				</tr>
+				</table>
+				
+				<br>
+				<table border=0 cellspacing=0 cellpadding=10 width=100% >
+				<tr>
+				<td valign=top>
+					
+					<table border=0 cellspacing=0 cellpadding=5 width=100% class="tableHeading">
+					<tr>
+						<td class="big"><strong>{$CMOD.LBL_PROPERTIES} &quot;{$ROLE_NAME}&quot; </strong></td>
+						<td><div align="right">
+					 	    <input value="   {$APP.LBL_EDIT_BUTTON_LABEL}   " title="{$APP.LBL_EDIT_BUTTON_TITLE}" accessKey="{$APP.LBL_EDIT_BUTTON_KEY}" class="crmButton small edit" type="submit" name="Edit" >
+						</div></td>
+					  </tr>
+					</table>
+					<table width="100%"  border="0" cellspacing="0" cellpadding="5">
+                      <tr class="small">
+                        <td width="15%" class="small cellLabel"><strong>{$CMOD.LBL_ROLE_NAME}</strong></td>
+                        <td width="85%" class="cellText" >{$ROLE_NAME}</td>
+                      </tr>
+                      <tr class="small">
+                        <td class="small cellLabel"><strong>{$CMOD.LBL_REPORTS_TO}</strong></td>
+                        <td class="cellText">{$PARENTNAME}</td>
+                      </tr>
+                      <tr class="small">
+                        <td valign=top class="cellLabel"><strong>{$CMOD.LBL_MEMBER}</strong></td>
+                        <td class="cellText">
+						<table width="70%"  border="0" cellspacing="0" cellpadding="5">
+                          <tr class="small">
+                            		<td colspan="2" class="cellBottomDotLine">
+						<div align="left"><strong>{$CMOD.LBL_ASSOCIATED_PROFILES}</strong></div>
+					</td>
+                            </tr>
+			{foreach item=elements from=$ROLEINFO.profileinfo}
+                          <tr class="small">
 
-<table width="100%" border="0" cellpadding="0" cellspacing="0" height="100%">
-	<tr>
-		 <td class="showPanelBg" valign="top" width="95%"  style="padding-left:20px; "><br />
-        	        <span class="lvtHeaderText"><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS} </a> > {$MOD.LBL_USER_MANAGEMENT} > {$CMOD.LBL_USER_ROLE} of {$ROLE_NAME} </b></span>
-            	    <hr noshade="noshade" size="1" />
+                            <td width="16"><div align="center"></div></td>
+                            <td>
+										<a href="index.php?module=Users&action=profilePrivileges&parenttab=Settings&profileid={$elements.0}&mode=view">{$elements.1}</a><br>
+			    </td>  	 
+                          </tr>
+			{/foreach}
+   <tr class="small">
+                            		<td colspan="2" class="cellBottomDotLine">
+						<div align="left"><strong>{$CMOD.LBL_ASSOCIATED_USERS}</strong></div>
+					</td>
+                            </tr>
+				{if $ROLEINFO.userinfo.0 neq ''}
+			{foreach item=elements from=$ROLEINFO.userinfo}
+                          <tr class="small">
+
+                            <td width="16"><div align="center"></div></td>
+                            <td>
+				<a href="index.php?module=Users&action=DetailView&parenttab=Settings&record={$elements.0}">{$elements.1}</a><br>
+			    </td>  	 
+                          </tr>
+			{/foreach}	
+			{/if}
+                        </table></td>
+                      </tr>
+                    </table>
+					<br>
+					<table border=0 cellspacing=0 cellpadding=5 width=100% >
+					<tr><td class="small" nowrap align=right><a href="#top">{$MOD.LBL_SCROLL}</a></td></tr>
+					</table>
+					
+					
+				</td>
+				</tr>
+				</table>
+			
+			
+			
+			</td>
+			</tr>
+			</table>
 		</td>
 	</tr>
-	<tr><td>&nbsp;</td></tr>
-	<tr>
-		<td width="95%" style="padding-left:20px;" valign="top">	  <table width="95%" cellpadding="5" cellspacing="0" class="leadTable" align="center">
-          <tr>
-            <td style="padding:5px;border-bottom:2px dotted #CCCCCC;" width="5%" ><img src="{$IMAGE_PATH}roles.gif" align="absmiddle" /> </td>
-            <td style="padding:5px;border-bottom:2px dotted #AAAAAA;"><span class="genHeaderGrayBig">{$ROLE_NAME} {$CMOD.LBL_USER_ROLE}</span><br />
-                <span class="big">{$CMOD.LBL_DETAIL_VIEW} {$ROLE_NAME} {$CMOD.LBL_USER_ROLE}</span> </td>
-          </tr>
-          <tr><td colspan="2">&nbsp;</td></tr>
-           <tr>
-            <td colspan="2" >
-					<table width="100%" cellpadding="5" cellspacing="0" border="0" >
-							<tr>
-									<td colspan="4" class="detailedViewHeader"><b>{$CMOD.LBL_ROLE_DETAILS}</b></td>
-							</tr>
-							<tr>
-							  <td class="dvtCellLabel" width="5%">&nbsp;</td>
-							  <td class="dvtCellLabel" align="right" width="25%"><b>{$CMOD.LBL_ROLE_NAME} :</b></td>
-							  <td class="dvtCellInfo" align="left" width="25%">{$ROLE_NAME}</td>
-							  <td class="dvtCellInfo" width="45%">&nbsp;</td>
-					  </tr>
-					  <tr><td colspan="4"  class="dvtCellInfo">&nbsp;</td></tr>
-					   <tr>
-                  <td colspan="4"  class="detailedViewHeader"><b>{$CMOD.LBL_MEMBER_LIST}</b></td>
-                </tr>
-               
-				<tr>
-						<td class="dvtCellLabel" align="left"><img src="{$IMAGE_PATH}profile_icon.gif" align="top"></td>
-						<td class="dvtCellLabel" align="right" valign="top"><b>{$CMOD.LBL_ASSOCIATED_PROFILES}</b></td>
-						<td colspan="2" align="left" class="dvtCellInfo">
-								{foreach item=elements from=$ROLEINFO.profileinfo}
-										<a href="index.php?module=Users&action=profilePrivileges&parenttab=Settings&profileid={$elements.0}&mode=view">{$elements.1}</a><br>
-								{/foreach}	
-						</td>
-				</tr>
-				{if $ROLEINFO.userinfo.0 neq ''}
-				 <tr>
-						<td class="dvtCellLabel" align="left"><img src="{$IMAGE_PATH}user_icon.gif" align="top"></td>
-						<td class="dvtCellLabel" align="right" valign="top"><b>{$CMOD.LBL_ASSOCIATED_USERS}</b></td>
-						<td colspan="2" align="left" class="dvtCellInfo">
-								{foreach item=elements from=$ROLEINFO.userinfo}
-										<a href="index.php?module=Users&action=DetailView&parenttab=Settings&record={$elements.0}">{$elements.1}</a><br>
-								{/foreach}	
-						</td>
-				</tr>
-				{/if}
-				 <tr><td colspan="4"  class="dvtCellInfo">&nbsp;</td></tr>
-                 <tr>
-                  <td colspan="4"  class="dvtCellInfo" align="center">
-				  	<!-- <input title="Back" accessKey="C" class="classBtn" onclick="window.history.back();" type="button" name="New" value=" <  Back " > &nbsp; -->
-					 <input value="  {$APP.LBL_EDIT_BUTTON_LABEL}  " title="{$APP.LBL_EDIT_BUTTON_TITLE}" accessKey="{$APP.LBL_EDIT_BUTTON_KEY}" class="classBtn" type="submit" name="Edit" >
-                    &nbsp;
-					<input title="{$APP.LBL_DELETE_BUTTON_TITLE}" accessKey="{$APP.LBL_DELETE_BUTTON_KEY}" class="classBtn" onclick="DeleteRole()" type="button" name="Delete" value="{$APP.LBL_DELETE_BUTTON_LABEL}">
-				</td>
-                </tr>
-          <tr><td colspan="2">&nbsp;</td></tr>
-        </table></td>
+	</form>
+	</table>
 		
-	</tr>
+	</div>
+</td>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
+   </tr>
+</tbody>
 </table>
-</form>
-</td>
-
-</tr>
-</table>
-</td>
-<td width="1%" style="border-right:1px dotted #CCCCCC;">&nbsp;</td>
-</tr>
-</table>
-</td>
-</tr>
-</table>
-</td>
-</tr>
-</table>
-	
-	{include file='SettingsSubMenu.tpl'}
-<div id="tempdiv" style="display:block;position:absolute;left:350px;top:200px;"></div>
-<script>
-	function DeleteRole()
-	{ldelim}
-			document.roleView.action.value='RoleDeleteStep1';
-			document.roleView.submit();	
-	{rdelim}
-	
-	function ajaxSaveResponse(response)
-	{ldelim}
-   		document.getElementById("tempdiv").innerHTML=response.responseText;
-	{rdelim}
-</script>
-

Modified: vtigercrm/trunk/Smarty/templates/RoleEditView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/RoleEditView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/RoleEditView.tpl Wed Jun 21 02:43:05 2006
@@ -9,7 +9,7 @@
   *
  ********************************************************************************/
 -->*}
-<script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
+<script language="JAVASCRIPT" type="text/javascript" src="include/js/smoothscroll.js"></script>
 <script language="javascript">
 function dup_validation()
 {ldelim}
@@ -50,117 +50,148 @@
 	dup_validation();
 {rdelim}
 </script>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-		<tr>
-				{include file='SettingsMenu.tpl'}
-				<td width="75%" valign="top">
-						<form name="newRoleForm" action="index.php" method="post">
-						<input type="hidden" name="module" value="Users">
-						<input type="hidden" name="action" value="SaveRole">
-						<input type="hidden" name="parenttab" value="Settings">
-						<input type="hidden" name="returnaction" value="{$RETURN_ACTION}">
-						<input type="hidden" name="roleid" value="{$ROLEID}">
-						<input type="hidden" name="mode" value="{$MODE}">
-						<input type="hidden" name="parent" value="{$PARENT}">
-								<table width="100%" border="0" cellpadding="0" cellspacing="0" height="100%">
-										<tr>
-												<td class="showPanelBg" valign="top" width="100%" style="padding-left:20px; "><br />
-															<span class="lvtHeaderText"><b>
-															<a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS} </a>
-															 > {$MOD.LBL_USER_MANAGEMENT} > {$CMOD.LBL_CREATE_NEW_ROLE}</b></span>
-															<hr noshade="noshade" size="1"/>
-												</td>
-										</tr>
-																
-										<tr>
-												<td  valign="top" class="leadTable">
-														<table width="100%" cellpadding="0" cellspacing="0">
-																<tr>
-																		<td align="left" style="padding:10px;border-bottom:1px dashed #CCCCCC;">
-																				<img src="{$IMAGE_PATH}roles.gif" align="absmiddle">
-																				<span class="genHeaderGray">{$CMOD.LBL_CREATE_NEW_ROLE}</span>
-																		</td>
-																</tr>
-														</table>
-														<table align="center" border="0" cellpadding="5" cellspacing="0" width="95%">
-															<tbody>
-																<tr><td colspan="2">&nbsp;</td></tr>
-																<tr>
-																		<td class="genHeaderSmall" style="padding-right: 10px;" align="right" nowrap valign="top" width="15%">
-																				<img src="{$IMAGE_PATH}one.gif" align="absmiddle">
-																		 </td>
-																		<td align="left" nowrap="nowrap" width="85%"><b>{$CMOD.LBL_ROLE_NAME}</b><br>
-																					{$CMOD.LBL_SPECIFY_ROLE_NAME}&nbsp;
-																					<input type="text" id="rolename" name="roleName" class="importBox"  value="{$ROLENAME}">
-																		</td>
-																</tr>
-																<tr><td colspan="2">&nbsp;</td></tr>
-																<tr>
-																		<td class="genHeaderSmall" style="padding-right: 10px;" align="right" nowrap valign="top">
-																				<img src="{$IMAGE_PATH}two.gif" align="absmiddle">
-																		 </td>
-																		<td><b>{$CMOD.LBL_ASSIGN_PROFILE}</b><br>{$CMOD.LBL_PROFILE_SELECT_TEXT}</td>
-																</tr>
-																<tr>
-																		<td class="genHeaderSmall" style="padding-right: 10px;" align="right" valign="top">&nbsp;</td>
-																		<td>&nbsp;</td>
-																</tr>
-																<tr>
-																		<td class="genHeaderSmall" style="padding-right: 10px;" align="right" valign="top">&nbsp;</td>
-																		<td>
-																				<table align="center" border="0" cellpadding="0" cellspacing="0" width="75%">
-																					<tbody>
-																							<tr>
-																									<td align="center"><b>{$CMOD.LBL_PROFILES_AVLBL}</b><br>
-																												<select id="availList" name="availList" size="10" multiple style="width: 150px;">
-																												{foreach item=element from=$PROFILELISTS}
-																														<option value="{$element.0}">{$element.1}</option>
-																												{/foreach}
-																												</select>
-																									</td>
-																									<td align="center">
-																												<input type="hidden" name="selectedColumnsString"/>
-																												<input name="Button" value="&nbsp;&rsaquo;&rsaquo;&nbsp;" type="button" class="classBtn" onClick="addColumn()">
-																												<br><br>
-																												<input type="button" name="Button1" value="&nbsp;&lsaquo;&lsaquo;&nbsp;" class="classBtn" onClick="delColumn()">
-																									</td>
-																									<td align="center"><b>{$CMOD.LBL_ASSIGN_PROFILES}</b><br>
-																												<select id="selectedColumns" name="selectedColumns" multiple size="10" style="width: 150px;">
-																												{foreach item=element from=$SELPROFILELISTS}
-																													<option value="{$element.0}">{$element.1}</option>
-																												{/foreach}
-																												</select>
-																									</td>
-																							</tr>
-																					</tbody>
-																				</table>
-																			</td>
-																	</tr>
-																	<tr>
-																		<td class="genHeaderSmall" style="padding-right: 10px;" align="right" valign="top">&nbsp;</td>
-																		<td>&nbsp;</td>
-																</tr>
-																	<tr>
-																			<td align="right" nowrap><img src="{$IMAGE_PATH}three.gif" align="absmiddle"></td>
-																			<td><b>{$CMOD.LBL_REPORTS_TO_ROLE}</b><br>{$PARENTNAME}</td>
-																	</tr>
-																	<tr><td colspan="2" style="border-bottom: 1px dashed rgb(204, 204, 204);">&nbsp;</td></tr>
-																	<tr>
-																			<td colspan="2" align="center"> &nbsp;&nbsp;
-																						<input value=" {$APP.LBL_SAVE_BUTTON_LABEL} " name="Next" type="button" class="classBtn" onClick="return validate()" >&nbsp;&nbsp;
-																						<input value=" {$APP.LBL_CANCEL_BUTTON_LABEL} " name="Cancel" type="button" class="classBtn" onClick="window.history.back()">
-																			</td>
-																	</tr>
-																	
-																</tbody>
-															</table>
-														</td>
-												</tr>
-										</table>
-										</form>
-								</td>
-						</tr>
+<br>
+<table align="center" border="0" cellpadding="0" cellspacing="0" width="98%">
+<tbody><tr>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
+        <td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
+        <br>
+
+	<div align=center>
+			{include file='SetMenu.tpl'}
+				<!-- DISPLAY -->
+				<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
+				<form name="newRoleForm" action="index.php" method="post">
+				<input type="hidden" name="module" value="Users">
+				<input type="hidden" name="action" value="SaveRole">
+				<input type="hidden" name="parenttab" value="Settings">
+				<input type="hidden" name="returnaction" value="{$RETURN_ACTION}">
+				<input type="hidden" name="roleid" value="{$ROLEID}">
+				<input type="hidden" name="mode" value="{$MODE}">
+				<input type="hidden" name="parent" value="{$PARENT}">
+				<tr>
+					<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}ico-groups.gif" alt="Groups" width="48" height="48" border=0 title="Roles"></td>
+					{if $MODE eq 'edit'}
+					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Users&action=listroles&parenttab=Settings">{$CMOD.LBL_ROLES}</a> &gt; {$MOD.LBL_EDIT} &quot;{$ROLENAME}&quot; </b></td>
+					{else}	
+					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Users&action=listroles&parenttab=Settings">{$CMOD.LBL_ROLES}</a> &gt; {$CMOD.LBL_CREATE_NEW_ROLE}</b></td>
+					{/if}
+				</tr>
+				<tr>
+					{if $MODE eq 'edit'}
+					<td valign=top class="small">{$MOD.LBL_EDIT} {$CMOD.LBL_PROPERTIES} &quot;{$ROLENAME}&quot; {$MOD.LBL_LIST_CONTACT_ROLE}</td>
+					{else}
+					<td valign=top class="small">{$CMOD.LBL_NEW_ROLE}</td>
+					{/if}
+				</tr>
+				</table>
+				
+				<br>
+				<table border=0 cellspacing=0 cellpadding=10 width=100% >
+				<tr>
+				<td valign=top>
+					
+					<table border=0 cellspacing=0 cellpadding=5 width=100% class="tableHeading">
+					<tr>
+						{if $MODE eq 'edit'}
+						<td class="big"><strong>{$CMOD.LBL_PROPERTIES} &quot;{$ROLENAME}&quot; </strong></td>
+						{else}
+						<td class="big"><strong>{$CMOD.LBL_NEW_ROLE}</strong></td>
+						{/if}
+						<td><div align="right">
+							<input type="button" class="crmButton small save" name="add" value="  {$APP.LBL_SAVE_BUTTON_LABEL}  " onClick="return validate()">
+						
+						<input type="button" class="crmButton cancel small" name="cancel" value="{$APP.LBL_CANCEL_BUTTON_LABEL}" onClick="window.history.back()">
+						</div></td>
+					  </tr>
+					</table>
+					<table width="100%"  border="0" cellspacing="0" cellpadding="5">
+                      <tr class="small">
+                        <td width="15%" class="small cellLabel"><font color="red">*</font><strong>{$CMOD.LBL_ROLE_NAME}</strong></td>
+                        <td width="85%" class="cellText" ><input id="rolename" name="roleName" type="text" value="{$ROLENAME}" class="detailedViewTextBox"></td>
+                      </tr>
+                      <tr class="small">
+                        <td class="small cellLabel"><strong>{$CMOD.LBL_REPORTS_TO}</strong></td>
+                        <td class="cellText">{$PARENTNAME}</td>
+                      </tr>
+                      <tr class="small">
+                        <td colspan="2" valign=top class="cellLabel"><strong>{$CMOD.LBL_PROFILE_M}</strong>						</td>
+                      </tr>
+                      <tr class="small">
+                        <td colspan="2" valign=top class="cellText"> 
+						<br>
+						<table width="95%"  border="0" align="center" cellpadding="5" cellspacing="0">
+                          <tr>
+                            <td width="40%" valign=top class="cellBottomDotLinePlain small"><strong>{$CMOD.LBL_PROFILES_AVLBL}</strong></td>
+                            <td width="10%">&nbsp;</td>
+                            <td width="40%" class="cellBottomDotLinePlain small"><strong>{$CMOD.LBL_ASSIGN_PROFILES}</strong></td>
+                          </tr>
+
+			<tr class=small>
+	 	               <td valign=top>{$CMOD.LBL_PROFILES_M} {$CMOD.LBL_MEMBER} <br>
+				<select multiple id="availList" name="availList" class="small crmFormList" size=10 >
+																				{foreach item=element from=$PROFILELISTS}
+																					<option value="{$element.0}">{$element.1}</option>
+																				{/foreach}
+				</select>
+				</td>
+                        	<td width="50"><div align="center">
+																				<input type="hidden" name="selectedColumnsString"/>
+																					<input name="Button" value="&nbsp;&rsaquo;&rsaquo;&nbsp;" type="button" class="crmButton small" style="width:100%" onClick="addColumn()">
+                                  <br>
+                                  <br>
+																					<input type="button" name="Button1" value="&nbsp;&lsaquo;&lsaquo;&nbsp;" class="crmButton small" onClick="delColumn()" style="width:100%">
+				  <br>
+				  <br>
+                            	</div></td>
+                            <td class="small" style="background-color:#ddFFdd" valign=top>{$CMOD.LBL_MEMBER} of &quot;{$ROLENAME}&quot; <br>
+                             <select multiple id="selectedColumns" name="selectedColumns" class="small crmFormList" size=10 >
+																			{foreach item=element from=$SELPROFILELISTS}
+																				<option value="{$element.0}">{$element.1}</option>
+																			{/foreach}
+                	    </select></td>
+                       </tr>
+						  
+                        </table>
+						
+						</td>
+                      </tr>
+                        	 
+                        </table>
+						
+						</td>
+                      </tr>
+                    </table>
+					<br>
+					<table border=0 cellspacing=0 cellpadding=5 width=100% >
+					<tr><td class="small" nowrap align=right><a href="#top">{$MOD.LBL_SCROLL}</a></td></tr>
+					</table>
+					
+					
+				</td>
+				</tr>
+				<tr>
+				  <td valign=top>&nbsp;</td>
+				  </tr>
+				</table>
+			
+			
+			
+			</td>
+			</tr>
 			</table>
+		</td>
+	</tr>
+	</form>
+	</table>
+		
+	</div>
+
+</td>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
+   </tr>
+</tbody>
+</table>
 	
 <script language="JavaScript" type="text/JavaScript">    
         var moveupLinkObj,moveupDisabledObj,movedownLinkObj,movedownDisabledObj;
@@ -231,15 +262,3 @@
         {rdelim}
 	setObjects();			
 </script>	
-	
-</td>
-<td width="1%" style="border-right:1px dotted #CCCCCC;">&nbsp;</td>
-</tr>
-</table>
-</td>
-</tr>
-</table>
-</td>
-</tr>
-</table>
-	{include file='SettingsSubMenu.tpl'}




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 04:43:46 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 08:43:46 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7334 -
	/vtigercrm/trunk/Smarty/templates/ListRoles.tpl
Message-ID: <20060621084346.B13D983F261@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 02:43:42 2006
New Revision: 7334

Log:
Updated list roles file

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

Modified: vtigercrm/trunk/Smarty/templates/ListRoles.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ListRoles.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ListRoles.tpl Wed Jun 21 02:43:42 2006
@@ -9,6 +9,8 @@
   *
  ********************************************************************************/
 -->*}
+
+<script language="JAVASCRIPT" type="text/javascript" src="include/js/smoothscroll.js"></script>
 <style type="text/css">
 a.x {ldelim}
 		color:black;
@@ -82,57 +84,86 @@
 	{rdelim}
 
 </script>
-<table width="100%" border="0" cellpadding="0" cellspacing="0" onMouseMove="displayCoords(event)">
-		<tr>
-				{include file='SettingsMenu.tpl'}
-				<td width="75%" valign="top">
-					<table width="100%" border="0" cellpadding="0" cellspacing="0" height="100%">
-							<tr>
-									<td class="showPanelBg" valign="top" width="100%" style="padding-left:20px; "><br />
-															<span class="lvtHeaderText"><b>
-															<a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS} </a>
-															 > {$MOD.LBL_USER_MANAGEMENT} > {$CMOD.LBL_CREATE_NEW_ROLE}</b></span>
-															<hr noshade="noshade" size="1"/>
-									  </td>
-							 </tr>
-							 <tr>
-									<td  valign="top" class="leadTable">
-										<table width="100%" cellpadding="0" cellspacing="0">
-											 <tr>
-													<td align="left" style="padding:10px;border-bottom:1px dashed #CCCCCC;">
-																				<img src="{$IMAGE_PATH}roles.gif" align="absmiddle">
-																				<span class="genHeaderGray">Role List View</span>
-																		</td>
-																</tr>
-														</table>
-		<div id='RoleTreeFull'>
-			{include file='RoleTree.tpl'}
-		</div>
-
-		{*
-														<table width="100%" border="0" cellspacing="0" cellpadding="0" class="small">
-													   <tr>
-														    <td style="padding:10px;" valign="top">{$ROLETREE}</td>
-													  </tr>
-													</table> *}
-											  </td>
-											</tr>
-										</table>
-								</td>
-						</tr>
-		</table>
-	</td>
-<td width="1%" style="border-right:1px dotted #CCCCCC;">&nbsp;</td>
-</tr>
-</table>
+
+<br>
+<table align="center" border="0" cellpadding="0" cellspacing="0" width="98%">
+<tbody><tr>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
+        <td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
+	<div align=center>
+<br>
+	
+				{include file="SetMenu.tpl"}
+				<!-- DISPLAY -->
+				<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
+				<tr>
+					<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}ico-roles.gif" alt="Roles" width="48" height="48" border=0 title="Roles"></td>
+					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > {$MOD.LBL_ROLES}</b></td>
+				</tr>
+				<tr>
+					<td valign=top class="small">{$MOD.LBL_ROLE_DESCRIPTION}</td>
+				</tr>
+				</table>
+				
+				<br>
+				<table border=0 cellspacing=0 cellpadding=10 width=100% >
+				<tr>
+				<td>
+				
+					<table border=0 cellspacing=0 cellpadding=5 width=100% class="tableHeading">
+					<tr>
+						<td class="big"><strong>Roles & Hierarchy Tree</strong></td>
+						<td class="small" align=right>Total : 7 Roles </td>
+					</tr>
+					</table>
+
+					<div id='RoleTreeFull'>
+                			        {include file='RoleTree.tpl'}
+		                	</div>
+
+{*					<table border=0 cellspacing=0 cellpadding=20 width=100% >
+					<tr>
+						<td>
+							<!-- Home node -->
+							<table cellspacing=0 cellpadding=0 class="treeTable1"><tr><td><img src="images/treeHome.gif"></td><td class="small">&nbsp;<strong>Organization</strong></td><tr></table>
+							<table cellspacing=0 cellpadding=0 class="treeTable1"><tr><td><img src="images/treeExSubNode.gif"><img src="images/treePaper.gif"></td><td class="small">Administrator</td><tr></table>
+							<table cellspacing=0 cellpadding=0 class="treeTable1"><tr><td><img src="images/treeExSubNode.gif"><img src="images/treePaper.gif"></td><td class="small">CEO</td><tr></table>
+							<table cellspacing=0 cellpadding=0 class="treeTable1"><tr><td><img src="images/treeNorthSouth.gif"><img src="images/treeExSubNode.gif"><img src="images/treePaper.gif"></td><td class="small">Manager - Sales</td><tr></table>
+							<table cellspacing=0 cellpadding=0 class="treeTable1"><tr><td><img src="images/treeNorthSouth.gif"><img src="images/treeNorthSouth.gif"><img src="images/treeSubNode.gif"><img src="images/treePaper.gif"></td><td class="small">Asst Manager - Sales</td><tr></table>
+							<table cellspacing=0 cellpadding=0 class="treeTable1"><tr><td><img src="images/treeNorthSouth.gif"><img src="images/treeExSubNode.gif"><img src="images/treePaper.gif"></td><td class="small">Manager - Products</td><tr></table>
+							<table cellspacing=0 cellpadding=0 class="treeTable1"><tr><td><img src="images/treeNorthSouth.gif"><img src="images/treeNorthSouth.gif"><img src="images/treeSubNode.gif"><img src="images/treePaper.gif"></td><td class="small">Asst Manager - Products</td><tr></table>
+							<table cellspacing=0 cellpadding=0 class="treeTable1"><tr><td><img src="images/treeNorthSouth.gif"><img src="images/treeSubNode.gif"><img src="images/treePaper.gif"></td><td class="small">Manager - Office</td><tr></table>
+							<table cellspacing=0 cellpadding=0 class="treeTable1"><tr><td><img src="images/treeNorthSouth.gif"><img src="images/treeGap.gif"><img src="images/treeSubNode.gif"><img src="images/treePaper.gif"></td><td class="small">Asst Manager - Office</td><tr></table>
+							<table cellspacing=0 cellpadding=0 class="treeTable1"><tr><td><img src="images/treeSubNode.gif"><img src="images/treePaper.gif"></td><td class="small">CFO</td><tr></table>
+						</td>
+					</tr>
+					</table> *}
+					
+					
+					
+					
+					<table border=0 cellspacing=0 cellpadding=5 width=100% >
+					<tr><td class="small" nowrap align=right><a href="#top">Scroll to Top</a></td></tr>
+					</table>
+				</td>
+				</tr>
+				</table>
+			
+			
+			
+			</td>
+			</tr>
+			</table>
+		</td>
+	</tr>
+	</table>
+		
+	</div>
+
 </td>
-</tr>
-</table>
-</td>
-</tr>
-</table>
-	{include file='SettingsSubMenu.tpl'}
-	
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
+   </tr>
+</tbody>
 	<div id="Drag_content">&nbsp;</div>
 
 <script language="javascript" type="text/javascript">




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 04:44:40 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 08:44:40 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7335 - in
 /vtigercrm/trunk/Smarty/templates/Settings: EditPickList.tpl PickList.tpl
 PickListContents.tpl
Message-ID: <20060621084440.42E9083F25B@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 02:44:35 2006
New Revision: 7335

Log:
Updated Pick lIst files

Modified:
    vtigercrm/trunk/Smarty/templates/Settings/EditPickList.tpl
    vtigercrm/trunk/Smarty/templates/Settings/PickList.tpl
    vtigercrm/trunk/Smarty/templates/Settings/PickListContents.tpl

Modified: vtigercrm/trunk/Smarty/templates/Settings/EditPickList.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Settings/EditPickList.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Settings/EditPickList.tpl Wed Jun 21 02:44:35 2006
@@ -33,8 +33,8 @@
 	<tr><td style="border-bottom: 1px dashed rgb(204, 204, 204);" colspan="2">&nbsp;</td></tr>
 	<tr>
 	<td colspan="2" align="center">
-	<input name="save" value=" &nbsp;Save&nbsp; " class="classBtn" onClick="SavePickList('{$FIELDNAME}','{$MODULE}');" type="button">
-	<input name="cancel" value=" &nbsp;Cancel&nbsp; " class="classBtn" onClick="hide('editdiv');" type="button">
+	<input name="save" value=" &nbsp;Save&nbsp; " class="crmButton small save" onClick="SavePickList('{$FIELDNAME}','{$MODULE}');" type="button">
+	<input name="cancel" value=" &nbsp;Cancel&nbsp; " class="crmButton small cancel" onClick="hide('editdiv');" type="button">
 	</td>
 	</tr>
 	<tr><td colspan="2" style="border-top: 1px dashed rgb(204, 204, 204);">&nbsp;</td></tr>

Modified: vtigercrm/trunk/Smarty/templates/Settings/PickList.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Settings/PickList.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Settings/PickList.tpl Wed Jun 21 02:44:35 2006
@@ -1,212 +1,219 @@
-{*<!--
-/*********************************************************************************
-  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
-   * ("License"); You may not use this file except in compliance with the License
-   * The Original Code is:  vtiger CRM Open Source
-   * The Initial Developer of the Original Code is vtiger.
-   * Portions created by vtiger are Copyright (C) vtiger.
-   * All Rights Reserved.
-  *
- ********************************************************************************/
--->*}
-<script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
-<script src="include/scriptaculous/prototype.js" type="text/javascript"></script>
-<script src="include/scriptaculous/scriptaculous.js" type="text/javascript"></script>
-<script>
-{literal}
-function splitvalues() {
-	var picklistobj=getobj("listarea")
-	var picklistcontent=picklistobj.value
-	var picklistary=new array()
-	var i=0;
-	
-	//splitting up of values
-	if (picklistcontent.indexof("\n")!=-1) {
-		while(picklistcontent.indexof("\n")!=-1) {
-			if (picklistcontent.replace(/^\s+/g, '').replace(/\s+$/g, '').length>0) {
-				picklistary[i]=picklistcontent.substr(0,picklistcontent.indexof("\n")).replace(/^\s+/g, '').replace(/\s+$/g, '')
-				picklistcontent=picklistcontent.substr(picklistcontent.indexof("\n")+1,picklistcontent.length)
-				i++
-			} else break;
-		}
-	} else if (picklistcontent.replace(/^\s+/g, '').replace(/\s+$/g, '').length>0) {
-		picklistary[0]=picklistcontent.replace(/^\s+/g, '').replace(/\s+$/g, '')
-	}
-	
-	return picklistary;
-}
-function setdefaultlist() {
-	var picklistary=new array()
-	picklistary=splitvalues()
-	
-	getobj("defaultlist").innerhtml=""
-	
-	for (i=0;i<picklistary.length;i++) {
-		var objoption=document.createelement("option")
-		if (browser_ie) {
-			objoption.innertext=picklistary[i]
-			objoption.value=picklistary[i]
-		} else if (browser_nn4 || browser_nn6) {
-			objoption.text=picklistary[i]
-			objoption.setattribute("value",picklistary[i])
-		}
-	
-		getobj("defaultlist").appendchild(objoption)
-	}
-}
-function validate() {
-	if (emptycheck("listarea","picklist values"))	{
-		var picklistary=new array()
-		picklistary=splitvalues()
-		//empty check validation
-		for (i=0;i<picklistary.length;i++) {
-			if (picklistary[i]=="") {
-				alert("picklist value cannot be empty")
-				picklistobj.focus()
-				return false
-			}
-		}
-
-		//duplicate values' validation
-		for (i=0;i<picklistary.length;i++) {
-			for (j=i+1;j<picklistary.length;j++) {
-				if (picklistary[i]==picklistary[j]) {
-					alert("duplicate values found")
-					picklistobj.focus()
-					return false
-				}
-			}
-		}
-
-		return true;
-	}
-}
-
-{/literal}
-</script>
-<style type="text/css">@import url(themes/blue/style.css);</style>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-<tr>
-	{include file='SettingsMenu.tpl'}
-<td width="75%" valign="top">
-
-<table width="100%" border="0" cellpadding="0" cellspacing="0" height="100%">
-<td class="showPanelBg" valign="top" width="100%" colspan="3" style="padding-left:20px; "><br/>
-<span class="lvtHeaderText"><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS} </a> > {$MOD.LBL_STUDIO} > {$MOD.LBL_PICKLIST_SETTINGS}</b></span>
-<hr noshade="noshade" size="1" />
-</td>
-</tr>
-<tr>
-<td width="75%" style="padding-left:20px;" valign="top">
-	
-	<table class="leadTable" align="center" cellpadding="5" cellspacing="0" width="95%">
-	<tbody><tr>
-	<td style="border-bottom: 2px dotted rgb(204, 204, 204); padding: 5px;" width="5%">
-	<img src="{$IMAGE_PATH}picklistEditor.gif" align="left">
-	</td>
-	<td style="border-bottom: 2px dotted rgb(170, 170, 170); padding: 5px;">
-	<span class="genHeaderGrayBig">{$MOD.LBL_PICKLIST_EDITOR}</span><br>
-	
-	</td>
-	</tr>
-	<tr><td colspan="2">&nbsp;</td></tr>
-	<tr>
-	<td align="right"><img src="{$IMAGE_PATH}one.gif"></td>
-	<td><b class="lvtHeaderText">{$MOD.LBL_SELECT_MODULE}</b></td>
-	</tr>
-
-	<tr>
-	<td>&nbsp;</td>
-	<td>
-	{$MOD.LBL_SELECT_CRM_MODULE} :
-	<select name="pickmodule" class="importBox" onChange="changeModule(this);">
-	{foreach key=tabid item=module from=$MODULE_LISTS}
-	<option value="{$module}">{$module}</option>
-	{/foreach}
-	</select>
-	</td>
-	</tr>
-	<tr><td colspan="2">&nbsp;</td></tr>
-	<tr>
-
-	<td align="right" valign="top"><img src="{$IMAGE_PATH}two.gif" height="31" width="29"></td>
-	<td rowspan="2">
-	<div id="picklist_datas">	
-		{include file='Settings/PickListContents.tpl'}
-	</div>
-	</td>
-	</tr>
-	<tr>
-	<td>&nbsp;</td>
-	</tr>
-	<tr><td colspan="2">&nbsp;</td></tr>
-	</tbody>
-	</table>
-
-
-
-</td>
-<td width="1%" style="border-right:1px dotted #CCCCCC;">&nbsp;</td>
-</tr>
-</table>
-</td>
-</tr>
-</table>
-</td>
-</tr>
-</table>
-	{include file='SettingsSubMenu.tpl'}
-<div id="editdiv" style="display:block;position:absolute;width:510px;"></div>
-{literal}
-<script>
-function SavePickList(fieldname,module)
-{
-	$("status").style.display="inline";
-	Effect.Puff($('editdiv'),{duration:2});
-	var body = $("picklist_values").value;
-	new Ajax.Request(
-        	'index.php',
-	        {queue: {position: 'end', scope: 'command'},
-        		method: 'post',
-		        postBody: 'action=SettingsAjax&module=Settings&directmode=ajax&file=UpdateComboValues&table_name='+fieldname+'&fld_module='+module+'&listarea='+body,
-		        onComplete: function(response) {
-					$("status").style.display="none";
-        				$("picklist_datas").innerHTML=response.responseText;
-	                        }
-        	}
-	);
-}
-function changeModule(pickmodule)
-{
-	$("status").style.display="inline";
-	var module=pickmodule.options[pickmodule.options.selectedIndex].value;
-	new Ajax.Request(
-                'index.php',
-                {queue: {position: 'end', scope: 'command'},
-                        method: 'post',
-                        postBody: 'action=SettingsAjax&module=Settings&directmode=ajax&file=PickList&fld_module='+module,
-                        onComplete: function(response) {
-                                        $("status").style.display="none";
-                                        $("picklist_datas").innerHTML=response.responseText;
-                                }
-                }
-        );
-}
-function fetchEditPickList(module,fieldname)
-{
-	$("status").style.display="inline";
-	new Ajax.Request(
-                'index.php',
-                {queue: {position: 'end', scope: 'command'},
-                        method: 'post',
-                        postBody: 'action=SettingsAjax&module=Settings&mode=edit&file=EditComboField&fld_module='+module+'&fieldname='+fieldname,
-			onComplete: function(response) {
-                                        $("status").style.display="none";
-                                        $("editdiv").innerHTML=response.responseText;
-					Effect.Grow('editdiv');
-                	}
-                }
-        );
-}
-</script>
-{/literal}
+{*<!--
+/*********************************************************************************
+  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
+   * ("License"); You may not use this file except in compliance with the License
+   * The Original Code is:  vtiger CRM Open Source
+   * The Initial Developer of the Original Code is vtiger.
+   * Portions created by vtiger are Copyright (C) vtiger.
+   * All Rights Reserved.
+  *
+ ********************************************************************************/
+-->*}
+<script language="JAVASCRIPT" type="text/javascript" src="include/js/smoothscroll.js"></script>
+<script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
+<script src="include/scriptaculous/prototype.js" type="text/javascript"></script>
+<script src="include/scriptaculous/scriptaculous.js" type="text/javascript"></script>
+<script>
+{literal}
+function splitvalues() {
+	var picklistobj=getobj("listarea")
+	var picklistcontent=picklistobj.value
+	var picklistary=new array()
+	var i=0;
+	
+	//splitting up of values
+	if (picklistcontent.indexof("\n")!=-1) {
+		while(picklistcontent.indexof("\n")!=-1) {
+			if (picklistcontent.replace(/^\s+/g, '').replace(/\s+$/g, '').length>0) {
+				picklistary[i]=picklistcontent.substr(0,picklistcontent.indexof("\n")).replace(/^\s+/g, '').replace(/\s+$/g, '')
+				picklistcontent=picklistcontent.substr(picklistcontent.indexof("\n")+1,picklistcontent.length)
+				i++
+			} else break;
+		}
+	} else if (picklistcontent.replace(/^\s+/g, '').replace(/\s+$/g, '').length>0) {
+		picklistary[0]=picklistcontent.replace(/^\s+/g, '').replace(/\s+$/g, '')
+	}
+	
+	return picklistary;
+}
+function setdefaultlist() {
+	var picklistary=new array()
+	picklistary=splitvalues()
+	
+	getobj("defaultlist").innerhtml=""
+	
+	for (i=0;i<picklistary.length;i++) {
+		var objoption=document.createelement("option")
+		if (browser_ie) {
+			objoption.innertext=picklistary[i]
+			objoption.value=picklistary[i]
+		} else if (browser_nn4 || browser_nn6) {
+			objoption.text=picklistary[i]
+			objoption.setattribute("value",picklistary[i])
+		}
+	
+		getobj("defaultlist").appendchild(objoption)
+	}
+}
+function validate() {
+	if (emptycheck("listarea","picklist values"))	{
+		var picklistary=new array()
+		picklistary=splitvalues()
+		//empty check validation
+		for (i=0;i<picklistary.length;i++) {
+			if (picklistary[i]=="") {
+				alert("picklist value cannot be empty")
+				picklistobj.focus()
+				return false
+			}
+		}
+
+		//duplicate values' validation
+		for (i=0;i<picklistary.length;i++) {
+			for (j=i+1;j<picklistary.length;j++) {
+				if (picklistary[i]==picklistary[j]) {
+					alert("duplicate values found")
+					picklistobj.focus()
+					return false
+				}
+			}
+		}
+
+		return true;
+	}
+}
+
+{/literal}
+</script>
+<br>
+<table align="center" border="0" cellpadding="0" cellspacing="0" width="98%">
+<tbody><tr>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
+        <td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
+<br>
+	<div align=center>
+	
+			{include file='SetMenu.tpl'}
+				<!-- DISPLAY -->
+				<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
+				<tr>
+					<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}picklist.gif" width="48" height="48" border=0 ></td>
+					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > {$MOD.LBL_PICKLIST_EDITOR}</b></td>
+				</tr>
+				<tr>
+					<td valign=top class="small">{$MOD.LBL_PICKLIST_DESC}</td>
+				</tr>
+				</table>
+				
+				
+				<table border=0 cellspacing=0 cellpadding=10 width=100% >
+				<tr>
+				<td valign=top>
+				
+					<table border=0 cellspacing=0 cellpadding=5 width=100% class="tableHeading">
+					<tr>
+						<td class="big"><strong>1. {$MOD.LBL_SELECT_MODULE}</strong></td>
+						<td class="small" align=right>&nbsp;</td>
+					</tr>
+					</table>
+					<table width="100%" border="0" cellpadding="5" cellspacing="0" class="small">
+						<tr class="small">
+                        	<td width="35%" class="small cellLabel"><strong>{$MOD.LBL_SELECT_CRM_MODULE}</strong></td>
+	                        <td width="65%" class="cellText" >
+					<select name="pickmodule" class="detailedViewTextBox" onChange="changeModule(this);">
+					{foreach key=tabid item=module from=$MODULE_LISTS}
+						<option value="{$module}">{$APP.$module}</option>
+					{/foreach}
+					</select>
+				</td>
+                      </tr>
+					</table>
+					<br>
+				<table border=0 cellspacing=0 cellpadding=5 width=100% class="tableHeading">
+				<tr>
+				    <td class="big" rowspan="2">
+					<div id="picklist_datas">	
+						{include file='Settings/PickListContentsN.tpl'}
+					</div>
+				    </td>	
+				</td>
+				</tr>
+			    	</table>
+				<table border=0 cellspacing=0 cellpadding=5 width=100% >
+					<tr><td class="small" nowrap align=right><a href="#top">Scroll to Top</a></td></tr>
+				</table>
+				
+				</td>
+				</tr>
+				</table>
+			
+			
+			
+			</td>
+			</tr>
+			</table>
+		</td>
+	</tr>
+	</table>
+		
+	</div>
+
+</td>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
+   </tr>
+</tbody>
+</table>
+<div id="editdiv" style="display:block;position:absolute;width:510px;"></div>
+{literal}
+<script>
+function SavePickList(fieldname,module)
+{
+	$("status").style.display="inline";
+	Effect.Puff($('editdiv'),{duration:2});
+	var body = $("picklist_values").value;
+	new Ajax.Request(
+        	'index.php',
+	        {queue: {position: 'end', scope: 'command'},
+        		method: 'post',
+		        postBody: 'action=SettingsAjax&module=Settings&directmode=ajax&file=UpdateComboValues&table_name='+fieldname+'&fld_module='+module+'&listarea='+body,
+		        onComplete: function(response) {
+					$("status").style.display="none";
+        				$("picklist_datas").innerHTML=response.responseText;
+	                        }
+        	}
+	);
+}
+function changeModule(pickmodule)
+{
+	$("status").style.display="inline";
+	var module=pickmodule.options[pickmodule.options.selectedIndex].value;
+	new Ajax.Request(
+                'index.php',
+                {queue: {position: 'end', scope: 'command'},
+                        method: 'post',
+                        postBody: 'action=SettingsAjax&module=Settings&directmode=ajax&file=PickList&fld_module='+module,
+                        onComplete: function(response) {
+                                        $("status").style.display="none";
+                                        $("picklist_datas").innerHTML=response.responseText;
+                                }
+                }
+        );
+}
+function fetchEditPickList(module,fieldname)
+{
+	$("status").style.display="inline";
+	new Ajax.Request(
+                'index.php',
+                {queue: {position: 'end', scope: 'command'},
+                        method: 'post',
+                        postBody: 'action=SettingsAjax&module=Settings&mode=edit&file=EditComboField&fld_module='+module+'&fieldname='+fieldname,
+			onComplete: function(response) {
+                                        $("status").style.display="none";
+                                        $("editdiv").innerHTML=response.responseText;
+					Effect.Grow('editdiv');
+                	}
+                }
+        );
+}
+</script>
+{/literal}

Modified: vtigercrm/trunk/Smarty/templates/Settings/PickListContents.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Settings/PickListContents.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Settings/PickListContents.tpl Wed Jun 21 02:44:35 2006
@@ -1,46 +1,38 @@
-{*<!--
-/*********************************************************************************
-  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
-   * ("License"); You may not use this file except in compliance with the License
-   * The Original Code is:  vtiger CRM Open Source
-   * The Initial Developer of the Original Code is vtiger.
-   * Portions created by vtiger are Copyright (C) vtiger.
-   * All Rights Reserved.
-  *
- ********************************************************************************/
--->*}
-<b class="lvtHeaderText">{$MOD.LBL_PICKLIST_AVAIL} {$MODULE}</b><br>
-	{$MOD.LBL_PICKLIST_AVAILINFO1} {$MODULE} {$MOD.LBL_PICKLIST_AVAILINFO2}<br>
-	<table style="background-color: rgb(204, 204, 204);" class="small" border="0" cellpadding="5" cellspacing="1" width="90%"><tbody>
-		
-		{foreach item=picklists from=$PICKLIST_VALUES}
-		<tr>
-		{foreach item=picklistfields from=$picklists}
-		{if $picklistfields neq ''}
-		<td class="lvtCol" width="25%">{$picklistfields.fieldlabel}</td>
-		<td class="lvtCol" width="5%"><a href="javascript:;" onclick="fetchEditPickList('{$MODULE}','{$picklistfields.fieldname}');posLay(this,'editdiv');">{$MOD.LBL_EDIT}</a></td>
-		{else}
-		<td class="lvtCol" colspan="2">&nbsp;</td>
-		{/if}
-		{/foreach}
-		</tr>
-		
-		<tr bgcolor="#ffffff">
-		{foreach item=picklistelements from=$picklists}
-		{if $picklistelements neq ''}
-		<td colspan="2" valign="top">
-			<ul style="list-style-type: none;">
-			{foreach item=elements from=$picklistelements.value}
-			<li>{$elements}</li>
-			{/foreach}
-			</ul>		
-		</td>
-		{else}
-		<td colspan="2">&nbsp;</td>
-		{/if}
-		{/foreach}
-		</tr>
-		{/foreach}
-	
-	</tbody></table>
-
+	<strong>2. {$MOD.LBL_PICKLIST_AVAIL} {$MODULE} </strong></td>
+		<td class="small" align=right>&nbsp;</td>
+		</tr>
+	</table>
+	<table border=0 cellspacing=0 cellpadding=0 width=100% class="listTable">
+	<tr>
+		<td valign=top width="50%">
+		<table width="100%" class="listTable" cellpadding="5" cellspacing="0">
+		{foreach item=picklists from=$PICKLIST_VALUES}
+		<tr>
+		{foreach item=picklistfields from=$picklists}
+		{if $picklistfields neq ''}
+			<td class="listTableTopButtons small" valign="top" align="left"><b>{$picklistfields.fieldlabel}</b></td>
+			<td class="listTableTopButtons" valign="top" align="right">
+				<input type="button" value="Edit" class="crmButton small edit" onclick="fetchEditPickList('{$MODULE}','{$picklistfields.fieldname}');posLay(this,'editdiv');" > 
+			</td>
+		{else}
+			<td class="listTableTopButtons small" colspan="2">&nbsp;</td>
+		{/if}
+		{/foreach}
+		</tr>
+		<tr>
+		{foreach item=picklistelements from=$picklists}
+		{if $picklistelements neq ''}
+			<td colspan="2" valign="top">
+				<ul style="list-style-type: none;">
+					{foreach item=elements from=$picklistelements.value}
+						<li>{$elements}</li>
+					{/foreach}
+				</ul>	
+			</td>
+		{else}
+			<td colspan="2">&nbsp;</td>
+		{/if}
+		{/foreach}
+		</tr>
+		{/foreach}
+		</table> 




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 04:45:41 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 08:45:41 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7336 -
	/vtigercrm/trunk/modules/Users/RoleDetailView.php
Message-ID: <20060621084541.1D82183F261@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 02:45:37 2006
New Revision: 7336

Log:
Update role detail view

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

Modified: vtigercrm/trunk/modules/Users/RoleDetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Users/RoleDetailView.php (original)
+++ vtigercrm/trunk/modules/Users/RoleDetailView.php Wed Jun 21 02:45:37 2006
@@ -14,6 +14,7 @@
 require_once('include/database/PearDatabase.php');
 require_once('themes/'.$theme.'/layout_utils.php');
 require_once('include/utils/UserInfoUtil.php');
+require_once('include/utils/utils.php');
 
 global $mod_strings;
 global $app_strings;
@@ -26,7 +27,6 @@
 require_once($theme_path.'layout_utils.php');
 
 $smarty = new vtigerCRM_Smarty;
-
 $roleid= $_REQUEST['roleid'];
 
 //Standard PickList Fields
@@ -64,7 +64,19 @@
 	return $return_data;
 }
 
+if(isset($_REQUEST['roleid']) && $_REQUEST['roleid'] != '')
+{	
+	$roleid= $_REQUEST['roleid'];
+	$mode = $_REQUEST['mode'];
+	$roleInfo=getRoleInformation($roleid);
+	$thisRoleDet=$roleInfo[$roleid];
+	$rolename = $thisRoleDet[0]; 
+	$parent = $thisRoleDet[3]; 
+	//retreiving the vtiger_profileid
+	$roleRelatedProfiles=getRoleRelatedProfiles($roleid);
 
+}
+$parentname=getRoleName($parent);
 //Retreiving the Role Info
 $roleInfoArr=getRoleInformation($roleid);
 $rolename=$roleInfoArr[$roleid][0];
@@ -75,8 +87,9 @@
 $smarty->assign("APP", $app_strings);
 $smarty->assign("CMOD", $mod_strings);
 $smarty->assign("ROLEINFO",getStdOutput($roleid));
+$smarty->assign("PARENTNAME",$parentname);            
 
 
-$smarty->display("RoleDetailView.tpl");
+$smarty->display("RoleDetailViewN.tpl");
 
 ?>




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 05:22:54 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 09:22:54 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7337 -
	/vtigercrm/trunk/Smarty/templates/FieldAccess.tpl
Message-ID: <20060621092254.78FE45E4D10@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 03:22:50 2006
New Revision: 7337

Log:
Updated field access tpl file

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 Wed Jun 21 03:22:50 2006
@@ -1,159 +1,141 @@
-{*<!--
-/*********************************************************************************
-  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
-   * ("License"); You may not use this file except in compliance with the License
-   * The Original Code is:  vtiger CRM Open Source
-   * The Initial Developer of the Original Code is vtiger.
-   * Portions created by vtiger are Copyright (C) vtiger.
-   * All Rights Reserved.
-  *
- ********************************************************************************/
--->*}
-<script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
-<style type="text/css">@import url(themes/blue/style.css);</style>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-<tr>
-	{include file='SettingsMenu.tpl'}
-<td width="75%" valign="top">
-
-<table width="100%" border="0" cellpadding="0" cellspacing="0" height="100%">
-<tr>
-<td class="showPanelBg" valign="top" width="100%" colspan="3" style="padding-left:20px; "><br />
-<span class="lvtHeaderText"><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS} </a> > {$MOD.LBL_USER_MANAGEMENT} > {$MOD.LBL_DEFAULT_ORGANIZATION_FIELDS}</b></span>
-<hr noshade="noshade" size="1" />
-</td>
-</tr>
-<tr>
-<td width="75%" style="padding-left:20px;" valign="top">
-	
-		<table border="0" cellpadding="0" cellspacing="0" width="100%">
-		<form action="index.php" method="post" name="new" id="form">
-		<input type="hidden" name="module" value="Users">
-		<input type="hidden" name="parenttab" value="Settings">
-		<input type="hidden" name="fld_module" id="fld_module">
-		{if $MODE neq 'view'}
-		<input type="hidden" name="action" value="UpdateDefaultFieldLevelAccess">
-		{else}
-		<input type="hidden" name="action" value="EditDefOrgFieldLevelAccess">
-		{/if}	
-		<tbody><tr>
-		<td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif;" height="6" width="7"><img src="{$IMAGE_PATH}top_left.jpg" align="top"></td>
-		<td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif; height: 6px;" bgcolor="#ebebeb"></td>
-		<td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif;" height="6" width="8"><img src="{$IMAGE_PATH}top_right.jpg" align="top" height="6" width="8"></td>
-	 	</tr>
-		<tr>
-		<td bgcolor="#ebebeb" width="7"></td>
-		<td bgcolor="#ebebeb">	
-			<table border="0" cellpadding="3" cellspacing="0" width="100%">
-			<tbody><tr>
-			<td class="genHeaderSmall" height="25" valign="middle">{$CMOD.LBL_GLOBAL_FIELDS_MANAGER}</td>
-			<td align="right">&nbsp;</td>
-			</tr>
-			<tr><td colspan="2"></td></tr>
-		    <tr>
-			<td colspan="2" nowrap="nowrap">
-				
-				<table border="0" cellpadding="0" cellspacing="0" width="100%">
-				<tbody><tr bgcolor="#ffffff">
-				<td style="padding: 10px;" align="left">
-				<b>{$CMOD.LBL_SELECT_SCREEN}</b>
-				
-				<select name="selectmodule" style="width: 200px; font-size: 10px;" onChange="changemodules(this)">
-				{foreach item=module from=$FIELD_INFO}
-				{if $module == $DEF_MODULE}
-					<option selected value='{$module}'>{$APP.$module}</option>
-				{else}		
-					<option value='{$module}' >{$APP.$module}</option>
-				{/if}
-				{/foreach}
-				</select>
-				
-				</td>
-				<td style="padding-right: 10px;" align="right">&nbsp;
-				{if $MODE neq 'edit'}
-				<input title="Edit" accessKey="E" class="classBtn" type="submit" name="Edit" value="{$APP.LBL_EDIT_BUTTON}"></td>
-				{else}
-				<input title="save" accessKey="S" class="classBtn" type="submit" name="Save" value="{$APP.LBL_SAVE_LABEL}"></td>
-				{/if}
-			    </tr>
-				<tr><td colspan="2" height="7"></td></tr>
-				<tr bgcolor="#ffffff">
-				<td style="padding: 10px;" colspan="2">
-					
-					{foreach key=module item=info from=$FIELD_LISTS}
-					{if $module == $DEF_MODULE}
-					<div id="{$module}_fields" style="display:block">	
-					{else}
-					<div id="{$module}_fields" style="display:none">	
-					{/if}	
-					<table class="small" border="0" cellpadding="5" cellspacing="0" width="100%">
-	                <tbody><tr><td colspan="4" style="border-bottom: 1px dashed rgb(204, 204, 204);">
-					<b>{$CMOD.LBL_FIELDS_AVLBL} {$APP.$module} </b><br>
-	  				 {$CMOD.LBL_FIELDS_SELECT_DESELECT}
-				    </td></tr>
-					<tr><td colspan="4">&nbsp;</td></tr>
-					
-					{foreach item=elements from=$info}
-					<tr>
-					
-						{foreach item=elementinfo from=$elements}
-        	            <td width="5%">{$elementinfo.1}</td>
-						<td width="45%">{$elementinfo.0}</td>
-				   		{/foreach}
-						
-            	    </tr>
-					{/foreach}
-
-					<tr><td colspan="4">&nbsp;</td></tr>
-                	</tbody></table>
-					</div>
-					{/foreach}
-				
-				</td>
- 				</tr>
-				<tr><td colspan="2" style="border-top: 1px dashed rgb(204, 204, 204);padding:10px;" bgcolor="white" align="center">
-				<input name="Cancel" value=" {$APP.LBL_CANCEL_BUTTON_LABEL} " class="classBtn" type="button" onClick="window.history.back();">
-				</td></tr>
-				</tbody>
-				</table>
-
-			</td>
-		  	</tr>
-			</tbody></form></table>
-		 <!-- End of Module Display -->
-    </td>
-	<td bgcolor="#ebebeb" width="8"></td>
-    </tr>
- 	<tr>
-	<td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif;" height="8" width="7"><img src="{$IMAGE_PATH}bottom_left.jpg" align="bottom"></td>
-	<td style="font-size: 1px;" bgcolor="#ebebeb" height="8"></td>
-	<td style="font-size: 1px; font-family: Arial,Helvetica,sans-serif;" height="8" width="8"><img src="{$IMAGE_PATH}bottom_right.jpg" align="bottom"></td>
-	</tr>
-	</tbody></table>
-		  
-	
-</td>
-<td width="1%" style="border-right:1px dotted #CCCCCC;">&nbsp;</td>
-</tr>
-</table>
-</td>
-</tr>
-</table>
-</td>
-</tr>
-</table>
-	{include file='SettingsSubMenu.tpl'}
-<script>
-var def_field='{$DEF_MODULE}_fields';
-{literal}
-function changemodules(selectmodule)
-{
-	hide(def_field);
-	module=selectmodule.options[selectmodule.options.selectedIndex].value;
-	document.getElementById('fld_module').value = module; 
-	def_field = module+"_fields";
-	show(def_field);
-}
-</script>
-{/literal}
-
+{*<!--
+/*********************************************************************************
+** The contents of this file are subject to the vtiger CRM Public License Version 1.0
+ * ("License"); You may not use this file except in compliance with the License
+ * The Original Code is:  vtiger CRM Open Source
+ * The Initial Developer of the Original Code is vtiger.
+ * Portions created by vtiger are Copyright (C) vtiger.
+ * All Rights Reserved.
+*
+ ********************************************************************************/
+-->*}
+<script language="JAVASCRIPT" type="text/javascript" src="include/js/smoothscroll.js"></script>
+<script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
+<br>
+<table align="center" border="0" cellpadding="0" cellspacing="0" width="98%">
+<tbody><tr>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
+        <td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
+<br>
+	<div align=center>
+	
+			{include file='SetMenu.tpl'}
+				<!-- DISPLAY -->
+				<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
+				<form action="index.php" method="post" name="new" id="form">
+				<input type="hidden" name="module" value="Users">
+				<input type="hidden" name="parenttab" value="Settings">
+				<input type="hidden" name="fld_module" id="fld_module">
+				{if $MODE neq 'view'}
+				<input type="hidden" name="action" value="UpdateDefaultFieldLevelAccess">
+				{else}
+				<input type="hidden" name="action" value="EditDefOrgFieldLevelAccess">
+				{/if}	
+				<tr>
+					<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}orgshar.gif" alt="Users" width="48" height="48" border=0 title="Users"></td>
+					<td colspan=2 class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > {$MOD.LBL_FIELDS_ACCESS} </b></td>
+					<td rowspan=2 class="small" align=right>&nbsp;</td>
+				</tr>
+				<tr>
+					<td valign=top class="small">{$MOD.LBL_SHARING_FIELDS_DESCRIPTION}</td>
+				</tr>
+				</table>
+				<br>
+				<table border=0 cellspacing=0 cellpadding=5 width=100% class="tableHeading">
+				<tr>
+					<td class="big"><strong>{$CMOD.LBL_GLOBAL_FIELDS_MANAGER}</strong></td>
+					<td class="small" align=right>
+					{if $MODE neq 'edit'}
+						<input name="Edit" type="submit" class="crmButton small edit" value="{$APP.LBL_EDIT_BUTTON}" >									
+					{else}
+						<input title="save" accessKey="S" class="crmButton small save" type="submit" name="Save" value="{$APP.LBL_SAVE_LABEL}">
+						<input name="Cancel" value=" {$APP.LBL_CANCEL_BUTTON_LABEL} " class="crmButton small cancel" type="button" onClick="window.history.back();">
+					{/if}
+					</td>
+				</tr>
+				</table>
+				<table width="100%" border="0" cellpadding="5" cellspacing="0" class="listTableTopButtons">
+                  <tr >
+                    <td  style="padding-left:5px;" class="big">{$CMOD.LBL_SELECT_SCREEN}&nbsp; 
+			<select name="Screen" class="detailedViewTextBox" style="width:30%;"  onChange="changemodules(this)">
+				{foreach item=module from=$FIELD_INFO}
+				{if $module == $DEF_MODULE}
+					<option selected value='{$module}'>{$APP.$module}</option>
+				{else}		
+					<option value='{$module}' >{$APP.$module}</option>
+				{/if}
+				{/foreach}
+			</select>
+		    </td>
+                    <td align="right">&nbsp;</td>
+                  </tr>
+		  </table>
+				{foreach key=module item=info name=allmodules from=$FIELD_LISTS}
+				{$module}      {$DEF_MODULE}
+				{if $module == $DEF_MODULE}
+				<div id="{$module}_fields" style="display:block">	
+				{else}
+				<div id="{$module}_fields" style="display:none">	
+				{/if}
+				 <table cellspacing=0 cellpadding=5 width=100% class="listTable small">
+                   <tr>
+				   			<td colspan="2" class="listRow" valign="top" nowrap>
+								<b>{$CMOD.LBL_FIELDS_AVLBL} {$APP.$module}</b>
+							</td>
+				   </tr>
+				   <tr>
+                     <td valign=top width="25%" >
+		     <table border=0 cellspacing=0 cellpadding=5 width=100% class=small>
+			{foreach item=elements name=groupfields from=$info}
+                         <tr>
+				{foreach item=elementinfo name=curvalue from=$elements}
+                           <td class="prvPrfTexture" style="width:20px">&nbsp;</td>
+                           <td width="5%" id="{$smarty.foreach.allmodules.iteration}_{$smarty.foreach.groupfields.iteration}_{$smarty.foreach.curvalue.iteration}">{$elementinfo.1}</td>
+                           <td width="25%" nowrap  onMouseOver="this.className='prvPrfHoverOn',$('{$smarty.foreach.allmodules.iteration}_{$smarty.foreach.groupfields.iteration}_{$smarty.foreach.curvalue.iteration}').className='prvPrfHoverOn'" onMouseOut="this.className='prvPrfHoverOff',$('{$smarty.foreach.allmodules.iteration}_{$smarty.foreach.groupfields.iteration}_{$smarty.foreach.curvalue.iteration}').className='prvPrfHoverOff'">{$elementinfo.0}</td>
+				{/foreach}
+                         </tr>
+                         	{/foreach}
+                     </table>
+				</div>
+			</td>
+                   </tr>
+				{/foreach}
+                 </table></td>
+			</tr>
+                </table>
+				<br>
+				<br>
+				<table border=0 cellspacing=0 cellpadding=5 width=100% >
+				<tr><td class="small" ><div align=right><a href="#top">{$MOD.LBL_SCROLL}</a></div></td></tr>				</table>
+				
+			
+			
+			
+			</td>
+			</tr>
+			</table>
+		</td>
+	</tr>
+	</form>
+	</table>
+		
+	</div>
+</td>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
+   </tr>
+</tbody>
+</table>
+<script>
+var def_field='{$DEF_MODULE}_fields';
+{literal}
+function changemodules(selectmodule)
+{
+	hide(def_field);
+	module=selectmodule.options[selectmodule.options.selectedIndex].value;
+	document.getElementById('fld_module').value = module; 
+	def_field = module+"_fields";
+	show(def_field);
+}
+</script>
+{/literal}
+




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 05:34:53 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 09:34:53 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7338 - in /vtigercrm/trunk:
 Smarty/templates/DetailViewHidden.tpl Smarty/templates/DetailViewUI.tpl
 Smarty/templates/Inventory/InventoryDetailView.tpl
 include/js/dtlviewajax.js
Message-ID: <20060621093454.2475B83870D@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 03:34:46 2006
New Revision: 7338

Log:
Ajax edit has been fixed to retain values

Modified:
    vtigercrm/trunk/Smarty/templates/DetailViewHidden.tpl
    vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl
    vtigercrm/trunk/Smarty/templates/Inventory/InventoryDetailView.tpl
    vtigercrm/trunk/include/js/dtlviewajax.js

Modified: vtigercrm/trunk/Smarty/templates/DetailViewHidden.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DetailViewHidden.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DetailViewHidden.tpl Wed Jun 21 03:34:46 2006
@@ -149,7 +149,6 @@
         <input type="hidden" name="return_module">
         <input type="hidden" name="return_action">
         <input type="hidden" name="return_id">
-        <input type="hidden" name="contact_id">
         <input type="hidden" name="member_id">
         <input type="hidden" name="opportunity_id">
         <input type="hidden" name="case_id">
@@ -168,7 +167,6 @@
         <input type="hidden" name="return_module">
         <input type="hidden" name="return_action">
         <input type="hidden" name="return_id">
-        <input type="hidden" name="contact_id">
         <input type="hidden" name="member_id">
         <input type="hidden" name="opportunity_id">
         <input type="hidden" name="case_id">

Modified: vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl Wed Jun 21 03:34:46 2006
@@ -22,7 +22,7 @@
                                                         {/if}
                                                        <span id="dtlview_{$label}">{$keyval}</span>
                                               		<div id="editarea_{$label}" style="display:none;">
-                                              		  <input class="detailedViewTextBox" onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" type="text" id="txtbox_{$label}" name="textbox_{$label}" maxlength='100' value="{$keyval}"></input>
+                                              		  <input class="detailedViewTextBox" onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" type="text" id="txtbox_{$label}" name="{$keyfldname}" maxlength='100' value="{$keyval}"></input>
                                               		  <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
                                               		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                                                        </div>
@@ -30,7 +30,7 @@
                                              {elseif $keyid eq '13'} <!--Email-->
                                                   <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}"><a href="mailto:{$keyval}" target="_blank">{$keyval}</a></span>
                                               		<div id="editarea_{$label}" style="display:none;">
-                                              		  <input class="detailedViewTextBox" onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" type="text" id="txtbox_{$label}" name="textbox_{$label}" maxlength='100' value="{$keyval}"></input>
+                                              		  <input class="detailedViewTextBox" onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" type="text" id="txtbox_{$label}" name="{$keyfldname}" maxlength='100' value="{$keyval}"></input>
                                               		  <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
                                               		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                                                        </div>
@@ -52,7 +52,7 @@
                                              {elseif $keyid eq '17'} <!--WebSite-->
                                                   <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}"><a href="http://{$keyval}" target="_blank">{$keyval}</a></span>
                                               		<div id="editarea_{$label}" style="display:none;">
-                                              		  <input class="detailedViewTextBox" onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" type="text" id="txtbox_{$label}" name="textbox_{$label}" maxlength='100' value="{$keyval}"></input>
+                                              		  <input class="detailedViewTextBox" onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" type="text" id="txtbox_{$label}" name="{$keyfldname}" maxlength='100' value="{$keyval}"></input>
                                               		  <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
                                               		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                                                        </div>
@@ -60,7 +60,7 @@
                                              {elseif $keyid eq '19' || $keyid eq '20'} <!--TextArea/Description-->
                                                   <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}">{$keyval}</span>
                                               		<div id="editarea_{$label}" style="display:none;">
-                                              		  <textarea id="txtbox_{$label}" name="txtbox_{$label}"  class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'"onBlur="this.className='detailedViewTextBox'" cols="90" rows="8">{$keyval}</textarea>                                            		  
+                                              		  <textarea id="txtbox_{$label}" name="{$keyfldname}"  class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'"onBlur="this.className='detailedViewTextBox'" cols="90" rows="8">{$keyval}</textarea>                                            		  
                                               		  <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
                                               		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                                                        </div>
@@ -68,7 +68,7 @@
                                              {elseif $keyid eq '21' || $keyid eq '24' || $keyid eq '22'} <!--TextArea/Street-->
                                                   <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}">{$keyval}</span>
                                               		<div id="editarea_{$label}" style="display:none;">
-                                              		  <textarea id="txtbox_{$label}" name="txtbox_{$label}"  class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'"onBlur="this.className='detailedViewTextBox'" rows=2>{$keyval}</textarea>                                            		  
+                                              		  <textarea id="txtbox_{$label}" name="{$keyfldname}"  class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'"onBlur="this.className='detailedViewTextBox'" rows=2>{$keyval}</textarea>                                            		  
                                               		  <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
                                               		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                                                        </div>
@@ -136,6 +136,7 @@
                                                   </td>
 					{elseif $keyid eq '53'} <!--Assigned To-->
                     <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">
+				
                     <span id="dtlview_{$label}">
                     {if $keyseclink eq ''}
                         {$keyval}
@@ -162,9 +163,9 @@
                       <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onMouseOver="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}">{$keyval}&nbsp;</span>
                     	<div id="editarea_{$label}" style="display:none;">
                         {if $keyval eq 'yes'}                                              		  
-                            <input id="txtbox_{$label}" type="checkbox" style="border:1px solid #bababa;" checked value="1">
+                            <input id="txtbox_{$label}" name="{$keyfldname}" type="checkbox" style="border:1px solid #bababa;" checked value="1">
                         {else}
-                          <input id="txtbox_{$label}" type="checkbox" style="border:1px solid #bababa;" value="0">
+                          <input id="txtbox_{$label}" type="checkbox" name="{$keyfldname}" style="border:1px solid #bababa;" value="0">
                        	{/if}
                          <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');"/> or
                           <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>

Modified: vtigercrm/trunk/Smarty/templates/Inventory/InventoryDetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Inventory/InventoryDetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Inventory/InventoryDetailView.tpl Wed Jun 21 03:34:46 2006
@@ -14,6 +14,9 @@
 <script type="text/javascript" src="modules/{$MODULE}/{$SINGLE_MOD}.js"></script>
 <script language="JavaScript" type="text/javascript" src="include/js/dtlviewajax.js"></script>
 <div id="convertleaddiv" style="display:block;position:absolute;left:225px;top:150px;"></div>
+<span id="crmspanid" style="display:none;position:absolute;"  onmouseover="show('crmspanid');">
+   <a class="link"  align="right" href="javascript:;">{$APP.LBL_EDIT_BUTTON}</a>
+</span>
 <script>
 function tagvalidate()
 {ldelim}

Modified: vtigercrm/trunk/include/js/dtlviewajax.js
==============================================================================
--- vtigercrm/trunk/include/js/dtlviewajax.js (original)
+++ vtigercrm/trunk/include/js/dtlviewajax.js Wed Jun 21 03:34:46 2006
@@ -11,7 +11,9 @@
 var globaleditareaspanid = ""; 
 var globaltxtboxid = "";
 var itsonview=false;
-
+// to retain the old value if we cancel the ajax edit
+var globaltempvalue = '';
+var globaluitype = '';
 function showHide(showId, hideId)
 {
 	show(showId);
@@ -22,6 +24,16 @@
 {
 
   showHide(valuespanid,textareapanid);
+  if(globaluitype == '56')
+  {	  
+	  if(globaltempvalue == 1)
+	  	getObj(globaltxtboxid).checked = true; 
+	  else		
+	  	getObj(globaltxtboxid).checked = false; 
+  }
+  else		  
+	  getObj(globaltxtboxid).value = globaltempvalue; 
+  globaltempvalue = '';
   itsonview=false;
   return false;
 }
@@ -37,6 +49,7 @@
       }
       
       show("crmspanid");
+	  globaluitype = uitype;
       globaldtlviewspanid= "dtlview_"+ fieldLabel;//valuespanid;
       globaleditareaspanid="editarea_"+ fieldLabel;//textareapanid;
       globaltxtboxid="txtbox_"+ fieldLabel;//textboxpanid;
@@ -59,6 +72,7 @@
 {
      show(globaleditareaspanid) ;
      fnhide(globaldtlviewspanid);
+	 globaltempvalue = getObj(globaltxtboxid).value;
      getObj(globaltxtboxid).focus();
      fnhide('crmspanid');
      itsonview=true;
@@ -87,6 +101,7 @@
 	}
 
 
+	$("vtbusy_info").style.display="inline";
 	var isAdmin = document.getElementById("hdtxt_IsAdmin").value; 
 
 	var tagValue = trim(document.getElementById(txtBox).value);
@@ -105,7 +120,6 @@
 
 	var data = "file=DetailViewAjax&module=" + module + "&action=" + module + "Ajax&recordid=" + crmId ;
 	data = data + "&fldName=" + fieldName + "&fieldValue=" + escape(tagValue) + "&ajxaction=DETAILVIEW";
-	$("vtbusy_info").style.display="inline";
 	new Ajax.Request(
 		'index.php',
                 {queue: {position: 'end', scope: 'command'},
@@ -116,12 +130,12 @@
 				{
 					alert("Error while Editing");
 				}
-				else if(item.indexOf(":#:SUCCESS")>-1)
-     				{
+				else if(response.responseText.indexOf(":#:SUCCESS")>-1)
+    			{
 					$("vtbusy_info").style.display="none";
-     				}
-                       	}
-                }
+    			}
+           	}
+        }
         );
 	if(uitype == '13')
 	{




From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 05:35:32 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 09:35:32 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=23955=3A_?=
	=?utf-8?q?Horizontal_Scrolling?=
In-Reply-To: <076.a9ffd2be9e68b865905be8a48c3dc0a1@vtiger.fosslabs.com>
References: <076.a9ffd2be9e68b865905be8a48c3dc0a1@vtiger.fosslabs.com>
Message-ID: <085.aa2cfcda99ba690ccce512bf1ecf3594@vtiger.fosslabs.com>

#955: Horizontal Scrolling
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  ela  
      Type:  defect     |      Status:  new  
  Priority:  minor      |   Milestone:  5.0.0
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by richie):

  * priority:  critical => minor

Comment:

 Downgrading to minor.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/955>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 05:42:02 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 09:42:02 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7339 -
	/vtigercrm/trunk/include/utils/DetailViewUtils.php
Message-ID: <20060621094202.C925F83F018@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 03:41:59 2006
New Revision: 7339

Log:
issue in user detail view for role link has been fixed

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

Modified: vtigercrm/trunk/include/utils/DetailViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/DetailViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/DetailViewUtils.php Wed Jun 21 03:41:59 2006
@@ -835,7 +835,7 @@
 	{
 	 	$label_fld[] =$mod_strings[$fieldlabel];
 		if(is_admin($current_user))
-			$label_fld[] = '<a href="index.php?module=Users&action=RoleDetailView&roldeid='.$col_fields[$fieldname].'">'.getRoleName($col_fields[$fieldname]).'</a>';
+			$label_fld[] = '<a href="index.php?module=Users&action=RoleDetailView&roleid='.$col_fields[$fieldname].'">'.getRoleName($col_fields[$fieldname]).'</a>';
 		else
 			$label_fld[] = getRoleName($col_fields[$fieldname]);
 	}




From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 05:47:15 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 09:47:15 -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.2caf4aa1603f05d7b40162962bfb467d@vtiger.fosslabs.com>

#99: validation is not working for Notes module
------------------------+---------------------------------------------------
  Reporter:  Minnie     |       Owner:  mangai
      Type:  defect     |      Status:  new   
  Priority:  critical   |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by ahmed):

  * status:  reopened => new
  * owner:  ahmed => mangai

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/99>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 05:57:29 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 09:57:29 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7340 -
	/vtigertoolbar/trunk/firefox/install.rdf
Message-ID: <20060621095729.CE4A583F261@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 21 03:57:11 2006
New Revision: 7340

Log:
removed external reference

Modified:
    vtigertoolbar/trunk/firefox/install.rdf

Modified: vtigertoolbar/trunk/firefox/install.rdf
==============================================================================
Binary files - no diff available.




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 05:58:07 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 09:58:07 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7341 -
	/thunderbirdextn/trunk/install.rdf
Message-ID: <20060621095807.0162083F261@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 21 03:58:04 2006
New Revision: 7341

Log:
removed external reference

Modified:
    thunderbirdextn/trunk/install.rdf

Modified: thunderbirdextn/trunk/install.rdf
==============================================================================
Binary files - no diff available.




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 05:58:31 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 09:58:31 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7342 -
	/thunderbirdextn/trunk/install.js
Message-ID: <20060621095832.092F183F261@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 21 03:58:28 2006
New Revision: 7342

Log:
removed external reference

Modified:
    thunderbirdextn/trunk/install.js

Modified: thunderbirdextn/trunk/install.js
==============================================================================
Binary files - no diff available.




From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 06:01:31 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 10:01:31 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=23813=3A_?=
	=?utf-8?q?New_Quote?=
In-Reply-To: <076.3772e0ff3b6afff03f74ea9a4892bb7f@vtiger.fosslabs.com>
References: <076.3772e0ff3b6afff03f74ea9a4892bb7f@vtiger.fosslabs.com>
Message-ID: <085.88935463c0c81613f31dbcf832bf0615@vtiger.fosslabs.com>

#813: New Quote
------------------------+---------------------------------------------------
  Reporter:  Balduin    |       Owner:  ela  
      Type:  defect     |      Status:  new  
  Priority:  trivial    |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by mickie):

  * owner:  mickie => ela

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/813>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 06:08:59 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 10:08:59 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7343 -
	/vtigercrm/trunk/modules/Reports/ChangeFolder.php
Message-ID: <20060621100859.ABCDB83F373@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 04:08:56 2006
New Revision: 7343

Log:
docs added and query error has been fixed

Modified:
    vtigercrm/trunk/modules/Reports/ChangeFolder.php

Modified: vtigercrm/trunk/modules/Reports/ChangeFolder.php
==============================================================================
--- vtigercrm/trunk/modules/Reports/ChangeFolder.php (original)
+++ vtigercrm/trunk/modules/Reports/ChangeFolder.php Wed Jun 21 04:08:56 2006
@@ -29,10 +29,16 @@
 	header("Location: index.php?action=ReportsAjax&file=ListView&mode=ajaxdelete&module=Reports");
 }
 
+
+/** To Change the Report to another folder
+  * @param $reportid -- The report id
+  * @param $folderid -- The folderid the which the report to be moved
+  * @returns nothing 
+ */
 function ChangeFolder($reportid,$folderid)
 {
 	global $adb;
-	$imovereportsql = "update vtiger_report set folderid=".$folderid." where vtiger_reportid=".$reportid;
+	$imovereportsql = "update vtiger_report set folderid=".$folderid." where reportid=".$reportid;
 	$imovereportsqlresult = $adb->query($imovereportsql);
 }
 ?>




From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 06:16:43 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 10:16:43 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23861=3A_?=
 =?utf-8?q?parenttab_not_parsed_in_email_templates?=
In-Reply-To: <076.46779dbf4a572a77673e0793d5da5040@vtiger.fosslabs.com>
References: <076.46779dbf4a572a77673e0793d5da5040@vtiger.fosslabs.com>
Message-ID: <085.f3e2193d612137137328d0e4bf85199a@vtiger.fosslabs.com>

#861: parenttab not parsed in email templates
------------------------+---------------------------------------------------
  Reporter:  mangai     |       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 - parenttab is getting highlighted now in email templates

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/861>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 06:16:56 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 10:16:56 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231134=3A?=
 =?utf-8?q?_unable_to_change_state_of_purchase_order_using_ajax_feature?=
In-Reply-To: <076.6b6e1bdd6d4cf54f7a2bce3761f03794@vtiger.fosslabs.com>
References: <076.6b6e1bdd6d4cf54f7a2bce3761f03794@vtiger.fosslabs.com>
Message-ID: <085.2e1e7c45397781e5dd74e08d81cd9ffa@vtiger.fosslabs.com>

#1134: unable to change state of purchase order using ajax feature
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  jerrydgeorge
      Type:  defect     |      Status:  closed      
  Priority:  major      |   Milestone:              
 Component:  vtigercrm  |     Version:  5.0.0       
Resolution:  fixed      |    Keywords:              
------------------------+---------------------------------------------------
Changes (by anonymous):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1134>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 06:17:55 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 10:17:55 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231065=3A?=
 =?utf-8?q?_Unable_to_delete_the_last_record_in_the_list_view_of_Mail_Merg?=
 =?utf-8?q?e_templates?=
In-Reply-To: <076.9cc7a4889ab639885225e947a8d13e1c@vtiger.fosslabs.com>
References: <076.9cc7a4889ab639885225e947a8d13e1c@vtiger.fosslabs.com>
Message-ID: <085.6f642ccebb99fd2e0f5b723d793d3a31@vtiger.fosslabs.com>

#1065: Unable to delete the last record in the list view of Mail Merge templates
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  ahmed 
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by ahmed):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 Issue Fixed - Last record is getting deleted now

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1065>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 06:18:05 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 10:18:05 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231163=3A?=
 =?utf-8?q?_unable_to_save_Ajaxified_Terms_and_Conditions_field_in_Invoice?=
In-Reply-To: <076.81406a0d124351606d1fccac357d6e5d@vtiger.fosslabs.com>
References: <076.81406a0d124351606d1fccac357d6e5d@vtiger.fosslabs.com>
Message-ID: <085.b7ad675df334e9e12d460b0e26fd01cf@vtiger.fosslabs.com>

#1163: unable to save Ajaxified Terms and Conditions field in Invoice
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  jerrydgeorge
      Type:  defect     |      Status:  closed      
  Priority:  major      |   Milestone:              
 Component:  vtigercrm  |     Version:  5.0.0       
Resolution:  fixed      |    Keywords:              
------------------------+---------------------------------------------------
Changes (by anonymous):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1163>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 06:18:22 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 10:18:22 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231164=3A?=
 =?utf-8?q?_unable_to_save_Ajaxified_Description_field_in_Invoice?=
In-Reply-To: <076.b0bc283a60909e304007e4b26726e2ef@vtiger.fosslabs.com>
References: <076.b0bc283a60909e304007e4b26726e2ef@vtiger.fosslabs.com>
Message-ID: <085.9f4e55f0c9052c07cf72f427d975469d@vtiger.fosslabs.com>

#1164: unable to save Ajaxified Description field in Invoice
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  jerrydgeorge
      Type:  defect     |      Status:  closed      
  Priority:  major      |   Milestone:              
 Component:  vtigercrm  |     Version:  5.0.0       
Resolution:  fixed      |    Keywords:              
------------------------+---------------------------------------------------
Changes (by anonymous):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1164>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 06:22:32 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 10:22:32 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7344 - in
 /vtigercrm/trunk/modules/Accounts: DetailView.php EditView.php
Message-ID: <20060621102232.6257283F383@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 04:22:27 2006
New Revision: 7344

Log:
changes made to get validationdata

Modified:
    vtigercrm/trunk/modules/Accounts/DetailView.php
    vtigercrm/trunk/modules/Accounts/EditView.php

Modified: vtigercrm/trunk/modules/Accounts/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Accounts/DetailView.php (original)
+++ vtigercrm/trunk/modules/Accounts/DetailView.php Wed Jun 21 04:22:27 2006
@@ -95,9 +95,8 @@
         $smarty->assign("TOPTIONS",$optionString);
 }
 
-$account_tables = Array('account','crmentity','accountbillads','accountshipads','accountscf');
 $tabid = getTabid("Accounts");
-$validationData = getDBValidationData($account_tables,$tabid);
+$validationData = getDBValidationData($focus->tab_name,$tabid);
 $data = split_validationdataArray($validationData);
 
 $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']);

Modified: vtigercrm/trunk/modules/Accounts/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/Accounts/EditView.php (original)
+++ vtigercrm/trunk/modules/Accounts/EditView.php Wed Jun 21 04:22:27 2006
@@ -23,7 +23,6 @@
 require_once('Smarty_setup.php');
 require_once('data/Tracker.php');
 require_once('modules/Accounts/Account.php');
-require_once('modules/Accounts/Forms.php');
 require_once('include/CustomFieldUtil.php');
 require_once('include/ComboUtil.php');
 require_once('include/utils/utils.php');
@@ -101,9 +100,8 @@
 $smarty->assign("CALENDAR_LANG", $app_strings['LBL_JSCALENDAR_LANG']);
 $smarty->assign("CALENDAR_DATEFORMAT", parse_calendardate($app_strings['NTC_DATE_FORMAT']));
 
-$account_tables = Array('account','crmentity','accountbillads','accountshipads','accountscf'); 
  $tabid = getTabid("Accounts");
- $validationData = getDBValidationData($account_tables,$tabid);
+ $validationData = getDBValidationData($focus->tab_name,$tabid);
  $data = split_validationdataArray($validationData);
 
  $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']);




From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 06:23:51 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 10:23:51 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231324=3A?=
 =?utf-8?q?_Fatal_error_orders=3Csales?=
In-Reply-To: <076.020fb265047737595a1c038934006563@vtiger.fosslabs.com>
References: <076.020fb265047737595a1c038934006563@vtiger.fosslabs.com>
Message-ID: <085.b20072d5385f2daf77379e8b07d4c262@vtiger.fosslabs.com>

#1324: Fatal error orders<sales
------------------------------------------+---------------------------------
  Reporter:  sansnailmail (at) xs4all.nl  |       Owner:  developer
      Type:  defect                       |      Status:  closed   
  Priority:  major                        |   Milestone:           
 Component:  vtigercrm                    |     Version:  4.2.4rc3 
Resolution:  fixed                        |    Keywords:           
------------------------------------------+---------------------------------
Changes (by anonymous):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 After building a new vtiger 4.2.4 with only changesets 5080 and 7200 the
 problem is fixed. I probably over-patched the tiger with some old patches.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1324>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 06:24:47 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 10:24:47 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7345 -
	/vtigercrm/trunk/modules/Accounts/ListViewTop.php
Message-ID: <20060621102447.184E283F37C@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 04:24:43 2006
New Revision: 7345

Log:
onMouseOver event has been removed

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 Wed Jun 21 04:24:43 2006
@@ -70,7 +70,7 @@
 				'AMOUNT' => ($account['amount']),
 				);
 
-		$value[]='<a href="index.php?action=DetailView&module=Accounts&record='.$account['accountid'].'" onMouseOver=getHeadLines("'.$account['tickersymbol'].'")>'.$account['accountname'].'</a>';
+		$value[]='<a href="index.php?action=DetailView&module=Accounts&record='.$account['accountid'].'">'.$account['accountname'].'</a>';
 		$value[]=convertFromDollar($account['amount'],$rate);
 		$entries[$account['accountid']]=$value;	
 	}




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 06:26:08 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 10:26:08 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7346 -
	/vtigercrm/trunk/modules/Accounts/Forms.php
Message-ID: <20060621102608.EC0F86AB216@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 04:26:03 2006
New Revision: 7346

Log:
Forms.php has been removed

Removed:
    vtigercrm/trunk/modules/Accounts/Forms.php




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 06:27:17 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 10:27:17 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7347 -
	/vtigercrm/trunk/modules/Contacts/Forms.php
Message-ID: <20060621102717.A49717E85B1@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 04:27:14 2006
New Revision: 7347

Log:
Forms.php has been removed

Removed:
    vtigercrm/trunk/modules/Contacts/Forms.php




From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 06:33:52 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 10:33:52 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23644=3A_?=
 =?utf-8?q?logs_in_notification_schedular?=
In-Reply-To: <076.c1cfccb88b72051f409d50fc0c74708c@vtiger.fosslabs.com>
References: <076.c1cfccb88b72051f409d50fc0c74708c@vtiger.fosslabs.com>
Message-ID: <085.538242b971b5622f86d9d5fec72ac8b9@vtiger.fosslabs.com>

#644: logs in notification schedular
--------------------------------+-------------------------------------------
  Reporter:  minnie at vtiger.com  |       Owner:  minnie
      Type:  defect             |      Status:  new   
  Priority:  major              |   Milestone:  5.0.0 
 Component:  vtigercrm          |     Version:  5.0.0 
Resolution:                     |    Keywords:        
--------------------------------+-------------------------------------------
Changes (by don):

  * owner:  don => minnie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/644>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 06:35:19 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 10:35:19 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7348 - in
 /vtigercrm/trunk/modules/Contacts: DetailView.php EditView.php
Message-ID: <20060621103519.B85F783F1A1@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 04:35:15 2006
New Revision: 7348

Log:
changes made to get validationdata

Modified:
    vtigercrm/trunk/modules/Contacts/DetailView.php
    vtigercrm/trunk/modules/Contacts/EditView.php

Modified: vtigercrm/trunk/modules/Contacts/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/DetailView.php (original)
+++ vtigercrm/trunk/modules/Contacts/DetailView.php Wed Jun 21 04:35:15 2006
@@ -23,7 +23,6 @@
 require_once('Smarty_setup.php');
 require_once('data/Tracker.php');
 require_once('modules/Contacts/Contact.php');
-require_once('modules/Contacts/Forms.php');
 require_once('include/CustomFieldUtil.php');
 require_once('include/database/PearDatabase.php');
 require_once('include/utils/utils.php');
@@ -111,10 +110,8 @@
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
 
-$contact_tables =Array('contactdetails','crmentity','contactsubdetails','contactscf','contactaddress','customerdetails');
-
 $tabid = getTabid("Contacts");
-$validationData = getDBValidationData($contact_tables,$tabid);
+$validationData = getDBValidationData($focus->tab_name,$tabid);
 $data = split_validationdataArray($validationData);
 
 $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']);

Modified: vtigercrm/trunk/modules/Contacts/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/EditView.php (original)
+++ vtigercrm/trunk/modules/Contacts/EditView.php Wed Jun 21 04:35:15 2006
@@ -23,7 +23,6 @@
 require_once('Smarty_setup.php');
 require_once('data/Tracker.php');
 require_once('modules/Contacts/Contact.php');
-require_once('modules/Contacts/Forms.php');
 require_once('include/CustomFieldUtil.php');
 require_once('include/ComboUtil.php');
 require_once('include/utils/utils.php');
@@ -129,7 +128,6 @@
 $smarty->assign("MOD", $mod_strings);
 $smarty->assign("APP", $app_strings);
 $smarty->assign("NAME",$focus->lastname." ".$focus->firstname);
-$smarty->assign("JAVASCRIPT", get_set_focus_js().get_validate_record_js());
 if(isset($cust_fld))
 {
         $smarty->assign("CUSTOMFIELD", $cust_fld);
@@ -165,11 +163,8 @@
 $smarty->assign("IMAGE_PATH", $image_path);
 $smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']);
 
-
-$contact_tables = Array('contactdetails','crmentity','contactsubdetails','contactscf','contactaddress','customerdetails'); 
-
  $tabid = getTabid("Contacts");
- $validationData = getDBValidationData($contact_tables,$tabid);
+ $validationData = getDBValidationData($focus->tab_name,$tabid);
  $data = split_validationdataArray($validationData);
 
  $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']);




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 06:36:29 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 10:36:29 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7349 -
	/vtigercrm/trunk/modules/Activities/Forms.php
Message-ID: <20060621103629.C3EBB83F39C@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 04:36:25 2006
New Revision: 7349

Log:
Forms.php has been removed

Removed:
    vtigercrm/trunk/modules/Activities/Forms.php




From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 06:41:08 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 10:41:08 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231277=3A?=
 =?utf-8?q?_Can=27t_translate_term_close_without_problem?=
In-Reply-To: <076.d518c5251779ede24caf171d8d809788@vtiger.fosslabs.com>
References: <076.d518c5251779ede24caf171d8d809788@vtiger.fosslabs.com>
Message-ID: <085.8980bdf72d39e35e945e3d8ef4c6129b@vtiger.fosslabs.com>

#1277: Can't translate term close without problem
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  richie
      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

Comment:

 (In [7350]) Fixes #1277

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1277>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 06:41:08 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 10:41:08 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7350 -
	/vtigercrm/trunk/include/utils/ListViewUtils.php
Message-ID: <20060621104109.0EF1583F39C@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 21 04:41:04 2006
New Revision: 7350

Log:
Fixes #1277

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 Jun 21 04:41:04 2006
@@ -192,7 +192,7 @@
 		}
 
 		//Added condition to hide the close column in Related Lists
-		if($name == 'Close' && $relatedlist != '')
+		if($name == $app_strings['Close'] && $relatedlist != '')
 		{
 			// $list_header[] = '';
 		}




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 06:41:34 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 10:41:34 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7351 - in
 /vtigercrm/trunk/modules/Activities: DetailView.php EditView.php
Message-ID: <20060621104134.5D58C83F00B@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 04:41:30 2006
New Revision: 7351

Log:
forms.php has been removed

Modified:
    vtigercrm/trunk/modules/Activities/DetailView.php
    vtigercrm/trunk/modules/Activities/EditView.php

Modified: vtigercrm/trunk/modules/Activities/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Activities/DetailView.php (original)
+++ vtigercrm/trunk/modules/Activities/DetailView.php Wed Jun 21 04:41:30 2006
@@ -23,7 +23,6 @@
 require_once('Smarty_setup.php');
 require_once('data/Tracker.php');
 require_once('modules/Activities/Activity.php');
-require_once('modules/Activities/Forms.php');
 require_once('include/CustomFieldUtil.php');
 require_once('include/database/PearDatabase.php');
 require_once('include/utils/utils.php');
@@ -116,7 +115,6 @@
 $smarty->assign("THEME", $theme);
 $smarty->assign("IMAGE_PATH", $image_path);
 $smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string'].'&activity_mode='.$activity_mode);
-$smarty->assign("JAVASCRIPT", get_set_focus_js().get_validate_record_js());
 $smarty->assign("ID", $focus->id);
 $smarty->assign("NAME", $focus->name);
 
@@ -139,9 +137,8 @@
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
 
- $activities_tables = Array('activity','crmentity');
  $tabid = getTabid($tab_type);
- $validationData = getDBValidationData($activities_tables,$tabid);
+ $validationData = getDBValidationData($focus->tab_name,$tabid);
  $data = split_validationdataArray($validationData);
 
  $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']);

Modified: vtigercrm/trunk/modules/Activities/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/Activities/EditView.php (original)
+++ vtigercrm/trunk/modules/Activities/EditView.php Wed Jun 21 04:41:30 2006
@@ -23,7 +23,6 @@
 require_once('Smarty_setup.php');
 require_once('data/Tracker.php');
 require_once('modules/Activities/Activity.php');
-require_once('modules/Activities/Forms.php');
 require_once('include/database/PearDatabase.php');
 require_once('include/CustomFieldUtil.php');
 require_once('include/ComboUtil.php');
@@ -117,12 +116,10 @@
 $smarty->assign("THEME", $theme);
 $smarty->assign("IMAGE_PATH", $image_path);
 $smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']);
-$smarty->assign("JAVASCRIPT", get_set_focus_js().get_validate_record_js());
 $smarty->assign("ID", $focus->id);
 
- $activities_tables = Array('activity','crmentity'); 
  $tabid = getTabid($tab_type);
- $validationData = getDBValidationData($activities_tables,$tabid);
+ $validationData = getDBValidationData($focus->tab_name,$tabid);
  $data = split_validationdataArray($validationData);
 
  $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']);




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 06:44:47 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 10:44:47 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7352 - in
 /vtigercrm/trunk/modules/Campaigns: DetailView.php EditView.php
Message-ID: <20060621104447.4E67E83F00B@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 04:44:43 2006
New Revision: 7352

Log:
changes made to get validationdata

Modified:
    vtigercrm/trunk/modules/Campaigns/DetailView.php
    vtigercrm/trunk/modules/Campaigns/EditView.php

Modified: vtigercrm/trunk/modules/Campaigns/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Campaigns/DetailView.php (original)
+++ vtigercrm/trunk/modules/Campaigns/DetailView.php Wed Jun 21 04:44:43 2006
@@ -56,9 +56,8 @@
 $smarty->assign("ID", $_REQUEST['record']);
 
 
-$campaign_tables = Array('campaign','crmentity','campaignscf');
 $tabid = getTabid("Campaigns");
-$validationData = getDBValidationData($campaign_tables,$tabid);
+$validationData = getDBValidationData($focus->tab_name,$tabid);
 $data = split_validationdataArray($validationData);
 
 $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']);

Modified: vtigercrm/trunk/modules/Campaigns/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/Campaigns/EditView.php (original)
+++ vtigercrm/trunk/modules/Campaigns/EditView.php Wed Jun 21 04:44:43 2006
@@ -88,9 +88,8 @@
 $smarty->assign("IMAGE_PATH", $image_path);
 $smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']);
 
-$campaign_tables = Array('campaign','crmentity','campaignscf');
 $tabid = getTabid("Campaigns");
-$validationData = getDBValidationData($campaign_tables,$tabid);
+$validationData = getDBValidationData($focus->tab_name,$tabid);
 $data = split_validationdataArray($validationData);
 
 $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']);




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 06:46:56 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 10:46:56 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7353 -
 /vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
Message-ID: <20060621104657.4C5AB83F00B@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 21 04:46:45 2006
New Revision: 7353

Log:
fixed the role issue 

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

Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original)
+++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Wed Jun 21 04:46:45 2006
@@ -1459,7 +1459,9 @@
 		//Insert into vtiger_role2profile
 		$this->db->query("insert into vtiger_role2profile values ('H".$role2_id."',".$profile1_id.")");
 		$this->db->query("insert into vtiger_role2profile values ('H".$role3_id."',".$profile2_id.")");
-	
+	  $this->db->query("insert into vtiger_role2profile values ('H".$role4_id."',".$profile2_id.")");
+		$this->db->query("insert into vtiger_role2profile values ('H".$role5_id."',".$profile2_id.")"); 
+	   
 		//Insert into vtiger_profile2field
 			
                 insertProfile2field($profile1_id);




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 06:49:46 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 10:49:46 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7354 -
	/vtigercrm/trunk/modules/Emails/Forms.php
Message-ID: <20060621104946.078FA83F00B@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 04:49:43 2006
New Revision: 7354

Log:
forms.php has been removed

Removed:
    vtigercrm/trunk/modules/Emails/Forms.php




From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 06:50:28 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 10:50:28 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=23781=3A_?=
	=?utf-8?q?My_Preferences?=
In-Reply-To: <076.de29f722ccd714a4c6614d03a0a6957f@vtiger.fosslabs.com>
References: <076.de29f722ccd714a4c6614d03a0a6957f@vtiger.fosslabs.com>
Message-ID: <085.46ab0116d3d7d7b9576042dde780edb4@vtiger.fosslabs.com>

#781: My Preferences
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  Richie
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 This will be solved in a different manner.
 We are introducing the User Related List where this info will be displayed
 in a list format instead of in a comma separated format.

 I am closing this ticket. In case, you feel there be any issues,
 do feel free to reopen it.

 Richie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/781>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 06:53:17 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 10:53:17 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7355 - in
 /vtigercrm/trunk/modules/Emails: DetailView.php EditView.php
Message-ID: <20060621105317.840B983F3A7@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 04:53:13 2006
New Revision: 7355

Log:
forms.php has been removed

Modified:
    vtigercrm/trunk/modules/Emails/DetailView.php
    vtigercrm/trunk/modules/Emails/EditView.php

Modified: vtigercrm/trunk/modules/Emails/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/DetailView.php (original)
+++ vtigercrm/trunk/modules/Emails/DetailView.php Wed Jun 21 04:53:13 2006
@@ -23,7 +23,6 @@
 require_once('Smarty_setup.php');
 require_once('data/Tracker.php');
 require_once('modules/Emails/Email.php');
-require_once('modules/Emails/Forms.php');
 require_once('include/upload_file.php');
 require_once('include/database/PearDatabase.php');
 require_once('include/utils/utils.php');
@@ -143,7 +142,6 @@
 $smarty->assign("SINGLE_MOD",$app_strings['Email']);
 
 $smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']);
-$smarty->assign("JAVASCRIPT", get_set_focus_js().get_validate_record_js());
 
 if(isPermitted("Emails","EditView",$_REQUEST['record']) == 'yes')
 	$smarty->assign("EDIT_DUPLICATE","permitted");

Modified: vtigercrm/trunk/modules/Emails/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/EditView.php (original)
+++ vtigercrm/trunk/modules/Emails/EditView.php Wed Jun 21 04:53:13 2006
@@ -23,7 +23,6 @@
 require_once('Smarty_setup.php');
 require_once('data/Tracker.php');
 require_once('modules/Emails/Email.php');
-require_once('modules/Emails/Forms.php');
 require_once('include/utils/utils.php');
 require_once('include/utils/UserInfoUtil.php');
 require_once('include/FormValidationUtil.php');
@@ -233,7 +232,6 @@
 $smarty->assign("THEME", $theme);
 $smarty->assign("IMAGE_PATH", $image_path);
 $smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']);
-$smarty->assign("JAVASCRIPT", get_set_focus_js().get_validate_record_js());
 $smarty->assign("ID", $focus->id);
 $smarty->assign("ENTITY_ID", $_REQUEST["record"]);
 $smarty->assign("ENTITY_TYPE",$_REQUEST["email_directing_module"]);
@@ -255,9 +253,6 @@
 	$change_parent_button = "<input title='".$app_strings['LBL_CHANGE_BUTTON_TITLE']."' tabindex='2' accessKey='".$app_strings['LBL_CHANGE_BUTTON_KEY']."' type='button' class='button' value='".$app_strings['LBL_CHANGE_BUTTON_LABEL']."' name='button' LANGUAGE=javascript onclick='return window.open(\"index.php?module=\"+ document.EditView.parent_type.value + \"&action=Popup&html=Popup_picker&form=TasksEditView\",\"test\",\"width=600,height=400,resizable=1,scrollbars=1\");'>";
 	$smarty->assign("CHANGE_PARENT_BUTTON", $change_parent_button);
 }
-
-$email_tables = Array('emails','crmentity','activity'); 
-$tabid = getTabid("Emails");
 
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 06:54:20 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 10:54:20 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7356 -
	/vtigercrm/trunk/modules/Faq/Forms.php
Message-ID: <20060621105420.47DEA83F00B@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 04:54:16 2006
New Revision: 7356

Log:
forms.php has been removed

Removed:
    vtigercrm/trunk/modules/Faq/Forms.php




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 06:57:20 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 10:57:20 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7357 - in
 /vtigercrm/trunk/modules/Faq: DetailView.php EditView.php
Message-ID: <20060621105721.0F80C83F3A7@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 04:57:16 2006
New Revision: 7357

Log:
changes made to get validationdata

Modified:
    vtigercrm/trunk/modules/Faq/DetailView.php
    vtigercrm/trunk/modules/Faq/EditView.php

Modified: vtigercrm/trunk/modules/Faq/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Faq/DetailView.php (original)
+++ vtigercrm/trunk/modules/Faq/DetailView.php Wed Jun 21 04:57:16 2006
@@ -82,9 +82,8 @@
 
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
-
-$faq_tables = Array('faq');
-$validationData = getDBValidationData($faq_tables);
+$tabid = getTabid("Faq");
+$validationData = getDBValidationData($focus->tab_name,$tabid);
 $data = split_validationdataArray($validationData);
 
 $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']);

Modified: vtigercrm/trunk/modules/Faq/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/Faq/EditView.php (original)
+++ vtigercrm/trunk/modules/Faq/EditView.php Wed Jun 21 04:57:16 2006
@@ -95,10 +95,9 @@
 $smarty->assign("CALENDAR_DATEFORMAT", parse_calendardate($app_strings['NTC_DATE_FORMAT']));
 
 
-$faq_tables = Array('faq'); 
-
-$validationData = getDBValidationData($faq_tables);
- $data = split_validationdataArray($validationData);
+$tabid = getTabid("Faq");
+$validationData = getDBValidationData($focus->tab_name,$tabid);
+$data = split_validationdataArray($validationData);
 
  $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']);
  $smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']);




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 06:58:18 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 10:58:18 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7358 -
	/vtigercrm/trunk/modules/HelpDesk/Forms.php
Message-ID: <20060621105818.0FF3383F3A7@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 04:58:14 2006
New Revision: 7358

Log:
forms.php has been removed

Removed:
    vtigercrm/trunk/modules/HelpDesk/Forms.php




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 07:02:52 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 11:02:52 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7359 -
	/vtigercrm/trunk/Smarty/templates/GroupEditView.tpl
Message-ID: <20060621110252.0A9D883F3B3@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 21 05:02:40 2006
New Revision: 7359

Log:
fixed the group name validation issue

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

Modified: vtigercrm/trunk/Smarty/templates/GroupEditView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/GroupEditView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/GroupEditView.tpl Wed Jun 21 05:02:40 2006
@@ -133,6 +133,12 @@
 	formSelectColumnString();
 	if( !emptyCheck( "groupName", "Group Name" ) )
 		return false;
+
+	if(trim(document.newGroupForm.groupName.value) == "")
+	{ldelim}	
+		alert('Group Name cannot be none');
+		return false;		
+	{rdelim}
 
 	//alert(document.newGroupForm.selectedColumnsString.value);
 	if(document.newGroupForm.selectedColumnsString.value.replace(/^\s+/g, '').replace(/\s+$/g, '').length==0)




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 07:11:14 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 11:11:14 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7360 - in
 /vtigercrm/trunk/modules/HelpDesk: DetailView.php EditView.php
Message-ID: <20060621111114.AF15283F015@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 05:11:10 2006
New Revision: 7360

Log:
changes made to get validationdata and forms.php removed

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

Modified: vtigercrm/trunk/modules/HelpDesk/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/DetailView.php (original)
+++ vtigercrm/trunk/modules/HelpDesk/DetailView.php Wed Jun 21 05:11:10 2006
@@ -11,7 +11,6 @@
 
 require_once('include/database/PearDatabase.php');
 require_once('Smarty_setup.php');
-require_once('include/utils/utils.php');
 require_once('modules/HelpDesk/HelpDesk.php');
 require_once('include/utils/utils.php');
 
@@ -91,9 +90,8 @@
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
 
-$ticket_tables = Array('troubletickets','crmentity','ticketcf');
 $tabid = getTabid("HelpDesk");
-$validationData = getDBValidationData($ticket_tables,$tabid);
+$validationData = getDBValidationData($focus->tab_name,$tabid);
 $data = split_validationdataArray($validationData);
 $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']);
 $smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']);

Modified: vtigercrm/trunk/modules/HelpDesk/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/EditView.php (original)
+++ vtigercrm/trunk/modules/HelpDesk/EditView.php Wed Jun 21 05:11:10 2006
@@ -12,7 +12,6 @@
 require_once('Smarty_setup.php');
 require_once('include/utils/utils.php');
 require_once('modules/HelpDesk/HelpDesk.php');
-require_once('modules/HelpDesk/Forms.php');
 require_once('include/FormValidationUtil.php');
 
 global $app_strings,$mod_strings,$theme,$currentModule;
@@ -90,9 +89,8 @@
 $smarty->assign("IMAGE_PATH", $image_path);
 $smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']);
 
-$ticket_tables = Array('troubletickets','crmentity','ticketcf');
 $tabid = getTabid("HelpDesk");
-$validationData = getDBValidationData($ticket_tables,$tabid);
+$validationData = getDBValidationData($focus->tab_name,$tabid);
 $data = split_validationdataArray($validationData);
 
 $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']);




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 07:12:04 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 11:12:04 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7361 -
	/vtigercrm/trunk/modules/Invoice/Forms.php
Message-ID: <20060621111204.AAF317E85B1@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 05:12:01 2006
New Revision: 7361

Log:
forms.php has been removed

Removed:
    vtigercrm/trunk/modules/Invoice/Forms.php




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 07:19:24 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 11:19:24 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7362 - in
 /vtigercrm/trunk/modules/Invoice: DetailView.php EditView.php
Message-ID: <20060621111925.1F65283F015@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 05:19:20 2006
New Revision: 7362

Log:
changes made to get validationdata and forms.php removed

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

Modified: vtigercrm/trunk/modules/Invoice/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Invoice/DetailView.php (original)
+++ vtigercrm/trunk/modules/Invoice/DetailView.php Wed Jun 21 05:19:20 2006
@@ -81,9 +81,8 @@
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
 
-$invoice_tables = Array('invoice','invoicebillads','invoiceshipads','invoicecf');
 $tabid = getTabid("Invoice");
-$validationData = getDBValidationData($invoice_tables,$tabid);
+$validationData = getDBValidationData($focus->tab_name,$tabid);
 $data = split_validationdataArray($validationData);
 $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']);
 $smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']);

Modified: vtigercrm/trunk/modules/Invoice/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/Invoice/EditView.php (original)
+++ vtigercrm/trunk/modules/Invoice/EditView.php Wed Jun 21 05:19:20 2006
@@ -25,7 +25,6 @@
 require_once('modules/Invoice/Invoice.php');
 require_once('modules/Quotes/Quote.php');
 require_once('modules/SalesOrder/SalesOrder.php');
-require_once('modules/Invoice/Forms.php');
 require_once('modules/Potentials/Opportunity.php');
 require_once('include/CustomFieldUtil.php');
 require_once('include/ComboUtil.php');
@@ -316,9 +315,8 @@
 
 
 
-$invoice_tables = Array('invoice','invoicebillads','invoiceshipads','invoicecf'); 
  $tabid = getTabid("Invoice");
- $validationData = getDBValidationData($invoice_tables,$tabid);
+ $validationData = getDBValidationData($focus->tab_name,$tabid);
  $data = split_validationdataArray($validationData);
 $category = getParentTab();
 $smarty->assign("CATEGORY",$category);




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 07:20:38 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 11:20:38 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7363 -
	/vtigercrm/trunk/modules/Leads/Forms.php
Message-ID: <20060621112038.BDD497E85B1@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 05:20:35 2006
New Revision: 7363

Log:
forms.php has been removed

Removed:
    vtigercrm/trunk/modules/Leads/Forms.php




From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 07:22:32 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 11:22:32 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23429=3A_?=
 =?utf-8?q?gave_spacebar_in_groupname_and_saved_with_no_exception?=
In-Reply-To: <076.719b3ac02cf0867c6d11c2368958a786@vtiger.fosslabs.com>
References: <076.719b3ac02cf0867c6d11c2368958a786@vtiger.fosslabs.com>
Message-ID: <085.c291942d296445506a81966a81d91cc3@vtiger.fosslabs.com>

#429: gave spacebar in groupname and saved with no exception
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  don   
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:  group 
------------------------+---------------------------------------------------
Changes (by don):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/429>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 07:24:09 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 11:24:09 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23846=3A_?=
 =?utf-8?q?Member_Of_Field_can_be_moved_to_Basic_Information_Tab?=
In-Reply-To: <076.76722003fcd7d8c307a684829482c1f2@vtiger.fosslabs.com>
References: <076.76722003fcd7d8c307a684829482c1f2@vtiger.fosslabs.com>
Message-ID: <085.a39245539c0547105e59cd866565e24d@vtiger.fosslabs.com>

#846: Member Of Field can be moved to Basic Information Tab
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  mangai
      Type:  defect     |      Status:  new   
  Priority:  minor      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  don => mangai

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/846>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 07:24:59 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 11:24:59 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7364 - in
 /vtigercrm/trunk/modules/Leads: DetailView.php EditView.php
Message-ID: <20060621112500.12C0183F3BA@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 05:24:55 2006
New Revision: 7364

Log:
changes made to get validationdata and forms.php removed

Modified:
    vtigercrm/trunk/modules/Leads/DetailView.php
    vtigercrm/trunk/modules/Leads/EditView.php

Modified: vtigercrm/trunk/modules/Leads/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/DetailView.php (original)
+++ vtigercrm/trunk/modules/Leads/DetailView.php Wed Jun 21 05:24:55 2006
@@ -15,7 +15,6 @@
 require_once('Smarty_setup.php');
 require_once('data/Tracker.php');
 require_once('modules/Leads/Lead.php');
-require_once('modules/Leads/Forms.php');
 require_once('include/database/PearDatabase.php');
 require_once('include/CustomFieldUtil.php');
 require_once('include/utils/utils.php');
@@ -110,9 +109,8 @@
         $smarty->assign("TOPTIONS",$optionString);
 }
 
-$lead_tables = Array('leaddetails','crmentity','leadsubdetails','leadaddress','leadscf');
 $tabid = getTabid("Leads");
-$validationData = getDBValidationData($lead_tables,$tabid);
+$validationData = getDBValidationData($focus->tab_name,$tabid);
 $data = split_validationdataArray($validationData);
 
 $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']);

Modified: vtigercrm/trunk/modules/Leads/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/EditView.php (original)
+++ vtigercrm/trunk/modules/Leads/EditView.php Wed Jun 21 05:24:55 2006
@@ -15,7 +15,6 @@
 require_once('Smarty_setup.php');
 require_once('data/Tracker.php');
 require_once('modules/Leads/Lead.php');
-require_once('modules/Leads/Forms.php');
 require_once('include/database/PearDatabase.php');
 require_once('include/CustomFieldUtil.php');
 require_once('include/ComboUtil.php');
@@ -88,7 +87,6 @@
 $smarty->assign("RETURN_VIEWNAME", $_REQUEST['return_viewname']);
 $smarty->assign("THEME", $theme);
 $smarty->assign("IMAGE_PATH", $image_path);$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id());
-$smarty->assign("JAVASCRIPT", get_set_focus_js().get_validate_record_js());
 $smarty->assign("ID", $focus->id);
 $smarty->assign("MODULE",$currentModule);
 $smarty->assign("SINGLE_MOD",$app_strings['Lead']);
@@ -100,9 +98,8 @@
 $smarty->assign("CALENDAR_DATEFORMAT", parse_calendardate($app_strings['NTC_DATE_FORMAT']));
 
 
- $lead_tables = Array('leaddetails','crmentity','leadsubdetails','leadaddress','leadscf'); 
  $tabid = getTabid("Leads");
- $validationData = getDBValidationData($lead_tables,$tabid);
+ $validationData = getDBValidationData($focus->tab_name,$tabid);
  $data = split_validationdataArray($validationData);
 
  $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']);




From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 07:25:03 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 11:25:03 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23969=3A_?=
 =?utf-8?q?message_under_Global_Privileges_=3E_Edit_all?=
In-Reply-To: <076.454c7d3f6ef703a2e33c86300e860846@vtiger.fosslabs.com>
References: <076.454c7d3f6ef703a2e33c86300e860846@vtiger.fosslabs.com>
Message-ID: <085.27cb5fec0ead1a2a2d1f38df84cc0820@vtiger.fosslabs.com>

#969: message under Global Privileges > Edit all
------------------------+---------------------------------------------------
  Reporter:  mangai     |       Owner:  don   
      Type:  defect     |      Status:  closed
  Priority:  minor      |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  invalid    |    Keywords:        
------------------------+---------------------------------------------------
Changes (by don):

  * resolution:  => invalid
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/969>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 07:26:51 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 11:26:51 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7365 -
	/vtigercrm/trunk/modules/Products/Forms.php
Message-ID: <20060621112651.87C3483F1B7@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 05:26:48 2006
New Revision: 7365

Log:
forms.php has been removed

Removed:
    vtigercrm/trunk/modules/Products/Forms.php




From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 07:27:15 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 11:27:15 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23925=3A_?=
 =?utf-8?q?User_=26_Access_Mangement_=3E_Users?=
In-Reply-To: <076.985552b2efff10758471252d4d2fc42c@vtiger.fosslabs.com>
References: <076.985552b2efff10758471252d4d2fc42c@vtiger.fosslabs.com>
Message-ID: <085.ec873872a022bb5ad3b7d156ae66f035@vtiger.fosslabs.com>

#925: User & Access Mangement > Users
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  don   
      Type:  defect     |      Status:  closed
  Priority:  minor      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by don):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/925>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 07:30:24 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 11:30:24 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23778=3A_?=
 =?utf-8?q?Update_Home_Page_Block_Order?=
In-Reply-To: <076.1fa487f17244c9f4a65d58c7d48e16d4@vtiger.fosslabs.com>
References: <076.1fa487f17244c9f4a65d58c7d48e16d4@vtiger.fosslabs.com>
Message-ID: <085.b4d39668972e833a82b7830bda384593@vtiger.fosslabs.com>

#778: Update Home Page Block Order
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  don   
      Type:  defect     |      Status:  closed
  Priority:  minor      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by don):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/778>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 07:32:30 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 11:32:30 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7366 - in
 /vtigercrm/trunk/modules/Products: DetailView.php EditView.php
Message-ID: <20060621113230.D26EF83F3BA@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 05:32:26 2006
New Revision: 7366

Log:
changes made to get validationdata and forms.php removed

Modified:
    vtigercrm/trunk/modules/Products/DetailView.php
    vtigercrm/trunk/modules/Products/EditView.php

Modified: vtigercrm/trunk/modules/Products/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Products/DetailView.php (original)
+++ vtigercrm/trunk/modules/Products/DetailView.php Wed Jun 21 05:32:26 2006
@@ -10,7 +10,6 @@
  ********************************************************************************/
 require_once('include/database/PearDatabase.php');
 require_once('Smarty_setup.php');
-require_once('include/utils/utils.php');
 require_once('modules/Products/Product.php');
 require_once('include/utils/utils.php');
 
@@ -79,8 +78,8 @@
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
 
- $product_tables = Array('products','productcf','productcollaterals');
- $validationData = getDBValidationData($product_tables);
+ $tabid = getTabid("Products");
+ $validationData = getDBValidationData($focus->tab_name,$tabid);
  $data = split_validationdataArray($validationData);
  $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']);
  $smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']);

Modified: vtigercrm/trunk/modules/Products/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/Products/EditView.php (original)
+++ vtigercrm/trunk/modules/Products/EditView.php Wed Jun 21 05:32:26 2006
@@ -164,9 +164,8 @@
 
 
 
-$product_tables = Array('products','productcf','productcollaterals'); 
-
- $validationData = getDBValidationData($product_tables);
+ $tabid = getTabid("Products");
+ $validationData = getDBValidationData($focus->tab_name,$tabid);
  $data = split_validationdataArray($validationData);
 if($errormessage==2)
 {




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 07:35:56 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 11:35:56 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7367 - in
 /vtigercrm/trunk/modules/PriceBooks: DetailView.php EditView.php
Message-ID: <20060621113556.4FF8E83F3BA@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 05:35:51 2006
New Revision: 7367

Log:
changes made to get validationdata and forms.php removed

Modified:
    vtigercrm/trunk/modules/PriceBooks/DetailView.php
    vtigercrm/trunk/modules/PriceBooks/EditView.php

Modified: vtigercrm/trunk/modules/PriceBooks/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/PriceBooks/DetailView.php (original)
+++ vtigercrm/trunk/modules/PriceBooks/DetailView.php Wed Jun 21 05:35:51 2006
@@ -60,9 +60,8 @@
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
 
-$pb_tables = Array('pricebook','pricebookcf');
-
-$validationData = getDBValidationData($pb_tables);
+$tabid = getTabid("PriceBooks");
+$validationData = getDBValidationData($focus->tab_name,$tabid);
 $data = split_validationdataArray($validationData);
 $category = getParentTab();
 $smarty->assign("CATEGORY",$category);

Modified: vtigercrm/trunk/modules/PriceBooks/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/PriceBooks/EditView.php (original)
+++ vtigercrm/trunk/modules/PriceBooks/EditView.php Wed Jun 21 05:35:51 2006
@@ -78,9 +78,8 @@
 $smarty->assign("IMAGE_PATH", $image_path);$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']);
 
 
-$pb_tables = Array('pricebook','pricebookcf'); 
-
-$validationData = getDBValidationData($pb_tables);
+$tabid = getTabid("PriceBooks");
+$validationData = getDBValidationData($focus->tab_name,$tabid);
 $data = split_validationdataArray($validationData);
 $category = getParentTab();
 $smarty->assign("CATEGORY",$category);




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 07:36:24 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 11:36:24 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7368 -
 /vtigercrm/trunk/modules/Home/language/en_us.lang.php
Message-ID: <20060621113624.3A88D83F3BA@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 05:36:20 2006
New Revision: 7368

Log:
Updated language file for homepage

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

Modified: vtigercrm/trunk/modules/Home/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Home/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Home/language/en_us.lang.php Wed Jun 21 05:36:20 2006
@@ -43,8 +43,8 @@
 'LBL_LEADS_BY_SOURCE'=>'Leads By Source',
 'LBL_LEADS_BY_STATUS'=>'Leads By Status',
 
-'LBL_UPCOMING_EVENTS'=>'Upcoming Events',
-'LBL_PENDING_EVENTS'=>'Pending Events',
+'lBL_UPCOMING_EVENTS'=>'Upcoming Activities',
+'LBL_PENDING_EVENTS'=>'Pending Activities',
 'LBL_TODAYEVENT'=>'Events for Last Ten days',
 
 




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 07:36:56 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 11:36:56 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7369 -
	/vtigercrm/trunk/modules/Notes/Forms.php
Message-ID: <20060621113656.9474783F3BA@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 05:36:53 2006
New Revision: 7369

Log:
forms.php has been removed

Removed:
    vtigercrm/trunk/modules/Notes/Forms.php




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 07:38:20 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 11:38:20 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7370 -
	/vtigercrm/trunk/modules/Contacts/DelImage.php
Message-ID: <20060621113820.4EEBA83F3C8@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 21 05:38:16 2006
New Revision: 7370

Log:
file to delete the contact related image, fixes #440

Added:
    vtigercrm/trunk/modules/Contacts/DelImage.php




From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 07:39:03 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 11:39:03 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23440=3A_?=
 =?utf-8?q?not_able_to_delete_the_contact_image_from_contacts?=
In-Reply-To: <076.995242b6a5aeaa903d7e9a4ad6a99c1c@vtiger.fosslabs.com>
References: <076.995242b6a5aeaa903d7e9a4ad6a99c1c@vtiger.fosslabs.com>
Message-ID: <085.c632ffff4d5a1c05073d6713790cad20@vtiger.fosslabs.com>

#440: not able to delete the contact image from contacts
------------------------+---------------------------------------------------
  Reporter:  don        |       Owner:  Richie
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Comment (by richie):

 (In [7371]) fixes #440

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/440>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 07:39:03 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 11:39:03 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7371 -
	/vtigercrm/trunk/Smarty/templates/DisplayFields.tpl
Message-ID: <20060621113903.7FFCC83F3CD@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 21 05:38:58 2006
New Revision: 7371

Log:
fixes #440

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

Modified: vtigercrm/trunk/Smarty/templates/DisplayFields.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DisplayFields.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DisplayFields.tpl Wed Jun 21 05:38:58 2006
@@ -450,7 +450,11 @@
 				{else}
 					<input name="{$fldname}"  type="file" value="{$maindata[3].0.name}" tabindex="{$vt_tab}" />
 					<input type="hidden" name="id" value=""/>
-					{$maindata[3].0.name}
+					{ if $maindata[3].0.name != "" }
+						
+				<div id="replaceimage">[{$maindata[3].0.name}] <a href="javascript:;" onClick="delimage({$ID})">Del</a></div>
+					{/if}
+					
 				{/if}
 			</td>
 
@@ -681,5 +685,21 @@
 				alert("Please enter Valid TAX value");
 	{rdelim}	
 
+function delimage(id)
+{ldelim}
+	new Ajax.Request(
+		'index.php',
+		{ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+			method: 'post',
+			postBody: 'module=Contacts&action=ContactsAjax&file=DelImage&recordid='+id,
+			onComplete: function(response)
+				    {ldelim}
+					$("replaceimage").innerHTML=response.responseText;
+				    {rdelim}
+		{rdelim}
+	);
+
+{rdelim}
+
 
 </script>




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 07:42:16 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 11:42:16 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7372 - in
 /vtigercrm/trunk/modules/Notes: DetailView.php EditView.php
Message-ID: <20060621114216.D640383F3CA@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 05:42:12 2006
New Revision: 7372

Log:
changes made to get validationdata and forms.php removed

Modified:
    vtigercrm/trunk/modules/Notes/DetailView.php
    vtigercrm/trunk/modules/Notes/EditView.php

Modified: vtigercrm/trunk/modules/Notes/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Notes/DetailView.php (original)
+++ vtigercrm/trunk/modules/Notes/DetailView.php Wed Jun 21 05:42:12 2006
@@ -23,7 +23,6 @@
 require_once('data/Tracker.php');
 require_once('Smarty_setup.php');
 require_once('modules/Notes/Note.php');
-require_once('modules/Notes/Forms.php');
 require_once('include/upload_file.php');
 require_once('include/utils/utils.php');
 global $app_strings;
@@ -84,7 +83,6 @@
 
 $smarty->assign("THEME", $theme);
 $smarty->assign("IMAGE_PATH", $image_path);$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']);
-$smarty->assign("JAVASCRIPT", get_set_focus_js().get_validate_record_js());
 $smarty->assign("ID", $focus->id);
 $category = getParentTab();
 $smarty->assign("CATEGORY",$category);
@@ -105,6 +103,13 @@
 
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
+$tabid = getTabid("Notes");
+ $validationData = getDBValidationData($focus->tab_name,$tabid);
+ $data = split_validationdataArray($validationData);
+
+ $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']);
+ $smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']);
+ $smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']);
 
 $smarty->assign("MODULE",$currentModule);
 $smarty->display("DetailView.tpl");

Modified: vtigercrm/trunk/modules/Notes/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/Notes/EditView.php (original)
+++ vtigercrm/trunk/modules/Notes/EditView.php Wed Jun 21 05:42:12 2006
@@ -23,7 +23,6 @@
 require_once('Smarty_setup.php');
 require_once('data/Tracker.php');
 require_once('modules/Notes/Note.php');
-require_once('modules/Notes/Forms.php');
 require_once('include/utils/utils.php');
 
 global $app_strings,$app_list_strings,$mod_strings,$theme,$currentModule;
@@ -154,7 +153,6 @@
 $smarty->assign("THEME", $theme);
 $smarty->assign("IMAGE_PATH", $image_path);
 $smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']);
-$smarty->assign("JAVASCRIPT", get_set_focus_js().get_validate_record_js());
 $smarty->assign("ID", $focus->id);
 $smarty->assign("OLD_ID", $old_id );
 
@@ -177,6 +175,13 @@
 
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
+$tabid = getTabid("Notes");
+ $validationData = getDBValidationData($focus->tab_name,$tabid);
+ $data = split_validationdataArray($validationData);
+
+ $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']);
+ $smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']);
+ $smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']);
 
 if($focus->mode == 'edit')
 	$smarty->display("salesEditView.tpl");




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 07:45:34 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 11:45:34 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7373 - in
 /vtigercrm/trunk/modules/Vendors: DetailView.php EditView.php
Message-ID: <20060621114534.9D99C83F3CA@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 05:45:30 2006
New Revision: 7373

Log:
changes made to get validationdata

Modified:
    vtigercrm/trunk/modules/Vendors/DetailView.php
    vtigercrm/trunk/modules/Vendors/EditView.php

Modified: vtigercrm/trunk/modules/Vendors/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Vendors/DetailView.php (original)
+++ vtigercrm/trunk/modules/Vendors/DetailView.php Wed Jun 21 05:45:30 2006
@@ -62,8 +62,8 @@
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
 
-$vendor_tables = Array('vendor','vendorcf');
-$validationData = getDBValidationData($vendor_tables);
+$tabid = getTabid("Vendors");
+$validationData = getDBValidationData($focus->tab_name,$tabid);
 $data = split_validationdataArray($validationData);
 $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']);
 $smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']);

Modified: vtigercrm/trunk/modules/Vendors/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/Vendors/EditView.php (original)
+++ vtigercrm/trunk/modules/Vendors/EditView.php Wed Jun 21 05:45:30 2006
@@ -83,10 +83,8 @@
 $smarty->assign("THEME", $theme);
 $smarty->assign("IMAGE_PATH", $image_path);$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']);
 
-
-$vendor_tables = Array('vendor','vendorcf'); 
-
-$validationData = getDBValidationData($vendor_tables);
+$tabid = getTabid("Vendors");
+$validationData = getDBValidationData($focus->tab_name,$tabid);
 $data = split_validationdataArray($validationData);
 $category = getParentTab();
 $smarty->assign("CATEGORY",$category);




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 07:46:27 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 11:46:27 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7374 -
	/vtigercrm/trunk/modules/Quotes/Forms.php
Message-ID: <20060621114627.6FA2183F3CA@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 05:46:24 2006
New Revision: 7374

Log:
forms.php has been removed

Removed:
    vtigercrm/trunk/modules/Quotes/Forms.php




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 07:50:32 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 11:50:32 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7375 - in
 /vtigercrm/trunk/modules/Quotes: DetailView.php EditView.php
Message-ID: <20060621115032.B949383F3CA@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 05:50:28 2006
New Revision: 7375

Log:
changes made to get validationdata

Modified:
    vtigercrm/trunk/modules/Quotes/DetailView.php
    vtigercrm/trunk/modules/Quotes/EditView.php

Modified: vtigercrm/trunk/modules/Quotes/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Quotes/DetailView.php (original)
+++ vtigercrm/trunk/modules/Quotes/DetailView.php Wed Jun 21 05:50:28 2006
@@ -91,49 +91,13 @@
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
 
- $quote_tables = Array('quotes','quotesbillads','quotesshipads','quotescf'); 
  $tabid = getTabid("Quotes");
- $validationData = getDBValidationData($quote_tables,$tabid);
- $fieldName = '';
- $fieldLabel = '';
- $fldDataType = '';
+ $validationData = getDBValidationData($focus->tab_name,$tabid);
+ $data = split_validationdataArray($validationData);
 
- $rows = count($validationData);
- foreach($validationData as $fldName => $fldLabel_array)
- {
-   if($fieldName == '')
-   {
-     $fieldName="'".$fldName."'";
-   }
-   else
-   {
-     $fieldName .= ",'".$fldName ."'";
-   }
-   foreach($fldLabel_array as $fldLabel => $datatype)
-   {
-	if($fieldLabel == '')
-	{
-			
-     		$fieldLabel = "'".$fldLabel ."'";
-	}		
-      else
-       {
-      $fieldLabel .= ",'".$fldLabel ."'";
-        }
- 	if($fldDataType == '')
-         {
-      		$fldDataType = "'".$datatype ."'";
-    	}
-	 else
-        {
-       		$fldDataType .= ",'".$datatype ."'";
-     	}
-   }
- }
-
-$smarty->assign("VALIDATION_DATA_FIELDNAME",$fieldName);
-$smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$fldDataType);
-$smarty->assign("VALIDATION_DATA_FIELDLABEL",$fieldLabel);$quote_tables = Array('quotes','quotesbillads','quotesshipads'); 
+$smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']);
+$smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']);
+$smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']);
 
 $smarty->display("Inventory/InventoryDetailView.tpl");
 

Modified: vtigercrm/trunk/modules/Quotes/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/Quotes/EditView.php (original)
+++ vtigercrm/trunk/modules/Quotes/EditView.php Wed Jun 21 05:50:28 2006
@@ -203,9 +203,8 @@
 
 
 
-$quote_tables = Array('quotes','quotesbillads','quotesshipads','quotescf'); 
  $tabid = getTabid("Quotes");
- $validationData = getDBValidationData($quote_tables,$tabid);
+ $validationData = getDBValidationData($focus->tab_name,$tabid);
  $data = split_validationdataArray($validationData);
  
  $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']);




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 07:51:26 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 11:51:26 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7376 -
	/vtigercrm/trunk/modules/SalesOrder/Forms.php
Message-ID: <20060621115126.9B8C683F3CA@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 05:51:23 2006
New Revision: 7376

Log:
forms.php has been removed

Removed:
    vtigercrm/trunk/modules/SalesOrder/Forms.php




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 07:55:17 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 11:55:17 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7377 - in
 /vtigercrm/trunk/modules/SalesOrder: DetailView.php EditView.php
Message-ID: <20060621115517.EE62683F3CA@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 05:55:13 2006
New Revision: 7377

Log:
changes made to get validationdata

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

Modified: vtigercrm/trunk/modules/SalesOrder/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/SalesOrder/DetailView.php (original)
+++ vtigercrm/trunk/modules/SalesOrder/DetailView.php Wed Jun 21 05:55:13 2006
@@ -85,9 +85,8 @@
 //Get the associated Products and then display above Terms and Conditions
 $smarty->assign("ASSOCIATED_PRODUCTS",getDetailAssociatedProducts('SalesOrder',$focus));
 
- $so_tables = Array('salesorder','sobillads','soshipads','salesordercf');
  $tabid = getTabid("SalesOrder");
- $validationData = getDBValidationData($so_tables,$tabid);
+ $validationData = getDBValidationData($focus->tab_name,$tabid);
  $data = split_validationdataArray($validationData);
 
  $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']);

Modified: vtigercrm/trunk/modules/SalesOrder/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/SalesOrder/EditView.php (original)
+++ vtigercrm/trunk/modules/SalesOrder/EditView.php Wed Jun 21 05:55:13 2006
@@ -319,9 +319,8 @@
 
 
 
-$so_tables = Array('salesorder','sobillads','soshipads','salesordercf'); 
  $tabid = getTabid("SalesOrder");
- $validationData = getDBValidationData($so_tables,$tabid);
+ $validationData = getDBValidationData($focus->tab_name,$tabid);
  $data = split_validationdataArray($validationData);
 
  $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']);




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 07:55:53 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 11:55:53 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7378 -
	/vtigercrm/trunk/modules/Potentials/Forms.php
Message-ID: <20060621115553.EB0F683F3D6@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 05:55:50 2006
New Revision: 7378

Log:
forms.php has been removed

Removed:
    vtigercrm/trunk/modules/Potentials/Forms.php




From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 07:38:19 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 11:38:19 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23440=3A_?=
 =?utf-8?q?not_able_to_delete_the_contact_image_from_contacts?=
In-Reply-To: <076.995242b6a5aeaa903d7e9a4ad6a99c1c@vtiger.fosslabs.com>
References: <076.995242b6a5aeaa903d7e9a4ad6a99c1c@vtiger.fosslabs.com>
Message-ID: <085.b3af1c15f8b9b9e33a8080b62de9aab1@vtiger.fosslabs.com>

#440: not able to delete the contact image from contacts
------------------------+---------------------------------------------------
  Reporter:  don        |       Owner:  Richie
      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

Comment:

 (In [7370]) file to delete the contact related image, fixes #440

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/440>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 07:59:38 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 11:59:38 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7379 - in
 /vtigercrm/trunk/modules/Potentials: DetailView.php EditView.php
Message-ID: <20060621115938.144A683F3BA@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 05:59:34 2006
New Revision: 7379

Log:
changes made to get validationdata and forms.php removed

Modified:
    vtigercrm/trunk/modules/Potentials/DetailView.php
    vtigercrm/trunk/modules/Potentials/EditView.php

Modified: vtigercrm/trunk/modules/Potentials/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Potentials/DetailView.php (original)
+++ vtigercrm/trunk/modules/Potentials/DetailView.php Wed Jun 21 05:59:34 2006
@@ -23,7 +23,6 @@
 require_once('Smarty_setup.php');
 require_once('data/Tracker.php');
 require_once('modules/Potentials/Opportunity.php');
-require_once('modules/Potentials/Forms.php');
 require_once('include/CustomFieldUtil.php');
 require_once('include/utils/utils.php');
 
@@ -78,9 +77,8 @@
 if(isPermitted("Potentials","Delete",$_REQUEST['record']) == 'yes')
 	$smarty->assign("DELETE","permitted");
 
-$potential_tables = Array('potential','crmentity','potentialscf');
 $tabid = getTabid("Potentials");
-$validationData = getDBValidationData($potential_tables,$tabid);
+$validationData = getDBValidationData($focus->tab_name,$tabid);
 $data = split_validationdataArray($validationData);
 
 $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']);

Modified: vtigercrm/trunk/modules/Potentials/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/Potentials/EditView.php (original)
+++ vtigercrm/trunk/modules/Potentials/EditView.php Wed Jun 21 05:59:34 2006
@@ -23,7 +23,6 @@
 require_once('Smarty_setup.php');
 require_once('data/Tracker.php');
 require_once('modules/Potentials/Opportunity.php');
-require_once('modules/Potentials/Forms.php');
 require_once('include/CustomFieldUtil.php');
 require_once('include/ComboUtil.php');
 require_once('include/utils/utils.php');
@@ -118,15 +117,13 @@
 $smarty->assign("RETURN_VIEWNAME", $_REQUEST['return_viewname']);
 $smarty->assign("THEME", $theme);
 $smarty->assign("IMAGE_PATH", $image_path);$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']);
-$smarty->assign("JAVASCRIPT", get_set_focus_js().get_validate_record_js());
 $smarty->assign("ID", $focus->id);
 $smarty->assign("MODULE",$currentModule);
 $smarty->assign("SINGLE_MOD",$app_strings['Potential']);
 
 
- $potential_tables = Array('potential','crmentity','potentialscf'); 
  $tabid = getTabid("Potentials");
- $validationData = getDBValidationData($potential_tables,$tabid);
+ $validationData = getDBValidationData($focus->tab_name,$tabid);
  $data = split_validationdataArray($validationData);
 
  $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']);




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 08:14:16 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 12:14:16 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7380 -
	/vtigercrm/trunk/include/js/general.js
Message-ID: <20060621121416.7DC7683F3E1@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 06:14:12 2006
New Revision: 7380

Log:
unwanted js function has been removed

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 Wed Jun 21 06:14:12 2006
@@ -1076,26 +1076,6 @@
                 getObj("assign_team").style.display="block"
         }
 }
-//to display type of address for google map
-function showLocateMapMenu()
-    {
-            getObj("dropDownMenu").style.display="block"
-            getObj("dropDownMenu").style.left=findPosX(getObj("locateMap"))
-            getObj("dropDownMenu").style.top=findPosY(getObj("locateMap"))+getObj("locateMap").offsetHeight
-    }
-
-
-function hideLocateMapMenu(ev)
-    {
-            if (browser_ie)
-                    currElement=window.event.srcElement
-            else if (browser_nn4 || browser_nn6)
-                    currElement=ev.target
-
-            if (currElement.id!="locateMap")
-                    if (getObj("dropDownMenu").style.display=="block")
-                            getObj("dropDownMenu").style.display="none"
-    }
 /*
 * javascript function to display the div tag
 * @param divId :: div tag ID




From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 08:16:25 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 12:16:25 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231349=3A?=
	=?utf-8?q?_Dash_Boards_not_working?=
Message-ID: <076.8be5cac7416faf4b2b970e60d7f3e2ae@vtiger.fosslabs.com>

#1349: Dash Boards not working
-----------------------+----------------------------------------------------
 Reporter:  anonymous  |       Owner:  jerrydgeorge
     Type:  defect     |      Status:  new         
 Priority:  blocker    |   Milestone:              
Component:  vtigercrm  |     Version:  5.0.0       
 Keywords:             |  
-----------------------+----------------------------------------------------


-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1349>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 08:18:13 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 12:18:13 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231172=3A?=
 =?utf-8?q?_unable_to_store_any_Ajax_edited_value?=
In-Reply-To: <076.626fce50467ea4fac0273a3fb6aad256@vtiger.fosslabs.com>
References: <076.626fce50467ea4fac0273a3fb6aad256@vtiger.fosslabs.com>
Message-ID: <085.7f7f1a7a707e94901e0b3939b5cf2ab0@vtiger.fosslabs.com>

#1172: unable to store any Ajax edited value
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  Richie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by anonymous):

  * owner:  jerrydgeorge => Richie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1172>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 08:18:21 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 12:18:21 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231132=3A?=
 =?utf-8?q?_creation_of_related_entities_ought_to_be_ajaxified?=
In-Reply-To: <076.343f75f8c959bb0da4c9f8e348afe0b2@vtiger.fosslabs.com>
References: <076.343f75f8c959bb0da4c9f8e348afe0b2@vtiger.fosslabs.com>
Message-ID: <085.d6860ea13618ab21225f4f1a98716999@vtiger.fosslabs.com>

#1132: creation of related entities ought to be ajaxified
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  Richie     
      Type:  defect     |      Status:  new        
  Priority:  major      |   Milestone:             
 Component:  vtigercrm  |     Version:  5.0.1      
Resolution:             |    Keywords:  performance
------------------------+---------------------------------------------------
Changes (by anonymous):

  * owner:  jerrydgeorge => Richie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1132>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 08:18:28 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 12:18:28 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231130=3A?=
 =?utf-8?q?_more_information_tab_ajaxified?=
In-Reply-To: <076.d1ddb83143327b9a11f01d548facd399@vtiger.fosslabs.com>
References: <076.d1ddb83143327b9a11f01d548facd399@vtiger.fosslabs.com>
Message-ID: <085.89a72f959f65cc982664dea5a7b33e7d@vtiger.fosslabs.com>

#1130: more information tab ajaxified
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  Richie     
      Type:  defect     |      Status:  new        
  Priority:  major      |   Milestone:             
 Component:  vtigercrm  |     Version:  5.0.1      
Resolution:             |    Keywords:  performance
------------------------+---------------------------------------------------
Changes (by anonymous):

  * owner:  jerrydgeorge => Richie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1130>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 08:18:35 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 12:18:35 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23968=3A_?=
 =?utf-8?q?Quick_Edit_of_Assigned_Group_not_functional?=
In-Reply-To: <076.66451d79109fe79c040c7aba7d66b2ee@vtiger.fosslabs.com>
References: <076.66451d79109fe79c040c7aba7d66b2ee@vtiger.fosslabs.com>
Message-ID: <085.26934636e1cee29668d3ee6bea0f28a2@vtiger.fosslabs.com>

#968: Quick Edit of Assigned Group not functional
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  Richie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by anonymous):

  * owner:  jerrydgeorge => Richie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/968>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 08:18:43 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 12:18:43 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23763=3A_?=
 =?utf-8?q?Inventory_Terms_=26_Conditions_can_be_moved_to_different_sectio?=
 =?utf-8?q?n?=
In-Reply-To: <076.afaed639175411364f6ac75d41b10dd1@vtiger.fosslabs.com>
References: <076.afaed639175411364f6ac75d41b10dd1@vtiger.fosslabs.com>
Message-ID: <085.8f685dece59e6ad5f584ef0d86c10cd8@vtiger.fosslabs.com>

#763: Inventory Terms & Conditions can be moved to different section
--------------------------+-------------------------------------------------
  Reporter:  gopal        |       Owner:  Richie
      Type:  enhancement  |      Status:  new   
  Priority:  major        |   Milestone:  5.0.0 
 Component:  vtigercrm    |     Version:  5.0.0 
Resolution:               |    Keywords:        
--------------------------+-------------------------------------------------
Changes (by anonymous):

  * owner:  jerrydgeorge => Richie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/763>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 08:19:20 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 12:19:20 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23512=3A_?=
 =?utf-8?q?UI_issue_in_Organisation_Sharing_Privileges?=
In-Reply-To: <076.94fe2310a682ae79f7fc33244bb4f97f@vtiger.fosslabs.com>
References: <076.94fe2310a682ae79f7fc33244bb4f97f@vtiger.fosslabs.com>
Message-ID: <085.bb11fea09ec12287969da93c9e1a7aca@vtiger.fosslabs.com>

#512: UI issue in Organisation Sharing Privileges
---------------------------+------------------------------------------------
  Reporter:  jerrydgeorge  |       Owner:  Richie
      Type:  defect        |      Status:  new   
  Priority:  major         |   Milestone:        
 Component:  vtigercrm     |     Version:  5.0.0 
Resolution:                |    Keywords:  UI    
---------------------------+------------------------------------------------
Changes (by anonymous):

  * owner:  jerrydgeorge => Richie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/512>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 08:19:28 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 12:19:28 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23623=3A_?=
 =?utf-8?q?Issue_in_Activity_Quick_Edit?=
In-Reply-To: <076.0386d0bd11848a433f30ada206c92aa2@vtiger.fosslabs.com>
References: <076.0386d0bd11848a433f30ada206c92aa2@vtiger.fosslabs.com>
Message-ID: <085.52ba33a1bc03e51003f8593d5f4d1729@vtiger.fosslabs.com>

#623: Issue in Activity Quick Edit
------------------------+---------------------------------------------------
  Reporter:  don        |       Owner:  Richie
      Type:  defect     |      Status:  new   
  Priority:  critical   |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by anonymous):

  * owner:  jerrydgeorge => Richie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/623>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 08:19:36 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 12:19:36 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=23599=3A_?=
	=?utf-8?q?Profile_Issue?=
In-Reply-To: <076.c417ec60abd87aee2cbcbf16610fb0d5@vtiger.fosslabs.com>
References: <076.c417ec60abd87aee2cbcbf16610fb0d5@vtiger.fosslabs.com>
Message-ID: <085.b0933c711ba76fb1ee0fdeee33d8adb2@vtiger.fosslabs.com>

#599: Profile Issue
---------------------------+------------------------------------------------
  Reporter:  jerrydgeorge  |       Owner:  Richie  
      Type:  defect        |      Status:  new     
  Priority:  critical      |   Milestone:          
 Component:  vtigercrm     |     Version:  5.0.0   
Resolution:                |    Keywords:  Security
---------------------------+------------------------------------------------
Changes (by anonymous):

  * owner:  jerrydgeorge => Richie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/599>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 08:19:43 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 12:19:43 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23424=3A_?=
 =?utf-8?q?even_without_tab_privileges_standard_privileges_can_be_given?=
In-Reply-To: <076.d6748e5d43374a30e7084a0e578e5c4a@vtiger.fosslabs.com>
References: <076.d6748e5d43374a30e7084a0e578e5c4a@vtiger.fosslabs.com>
Message-ID: <085.c880e586d79dd00ca27db7236091128b@vtiger.fosslabs.com>

#424: even without tab privileges standard privileges can be given
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  Richie 
      Type:  defect     |      Status:  new    
  Priority:  critical   |   Milestone:         
 Component:  vtigercrm  |     Version:  5.0.0  
Resolution:             |    Keywords:  profile
------------------------+---------------------------------------------------
Changes (by anonymous):

  * owner:  jerrydgeorge => Richie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/424>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 08:19:50 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 12:19:50 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=23260=3A_?=
	=?utf-8?q?Issue_in_Change_Owner?=
In-Reply-To: <076.a1fa6304362146237625bdb76ef761ce@vtiger.fosslabs.com>
References: <076.a1fa6304362146237625bdb76ef761ce@vtiger.fosslabs.com>
Message-ID: <085.b199696cec60ffd269f63278e0c3f082@vtiger.fosslabs.com>

#260: Issue in Change Owner
------------------------+---------------------------------------------------
  Reporter:  don        |       Owner:  Richie
      Type:  defect     |      Status:  new   
  Priority:  critical   |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by anonymous):

  * owner:  jerrydgeorge => Richie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/260>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 08:25:19 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 12:25:19 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7381 -
	/vtigercrm/trunk/Smarty/templates/DetailView.tpl
Message-ID: <20060621122519.430007FDA7C@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 06:25:09 2006
New Revision: 7381

Log:
style has been modified for locate map

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 Wed Jun 21 06:25:09 2006
@@ -70,6 +70,26 @@
         );
 {rdelim}
 </script>
+{if $MODULE eq 'Accounts' || $MODULE eq 'Contacts' || $MODULE eq 'Leads'}
+        {if $MODULE eq 'Accounts'}
+                {assign var=address1 value='Billing'}
+                {assign var=address2 value='Shipping'}
+        {/if}
+        {if $MODULE eq 'Contacts'}
+                {assign var=address1 value='Mailing'}
+                {assign var=address2 value='Other'}
+        {/if}
+        <div id="locateMap" style="width: 125px; right: 159px; top: 260px; display: none; z-index:50" onmouseout="fninvsh('locateMap')" onmouseover="fnvshNrm('locateMap')">
+                <table bgcolor="#ffffff" border="0" cellpadding="0" cellspacing="0" width="100%">
+                        <tr>
+                                <td>
+                                        <a href="javascript:;" onClick="fninvsh('locateMap'); searchMapLocation( 'Main' );" class="calMnu">{$address1} {$APP.LBL_ADDRESS}</a>
+                                        <a href="javascript:;" onClick="fninvsh('locateMap'); searchMapLocation( 'Other' );" class="calMnu">{$address2} {$APP.LBL_ADDRESS}</a>
+                                </td>
+                        </tr>
+                </table>
+        </div>
+{/if}
 
 <table width="100%" cellpadding="2" cellspacing="0" border="0">
 <form action="index.php" method="post" name="DetailView" id="form">
@@ -189,32 +209,11 @@
                                                         <td align=right>
 							{if $header eq 'Address Information' && ($MODULE eq 'Accounts' || $MODULE eq 'Contacts' || $MODULE eq 'Leads') }
                                                         {if $MODULE eq 'Leads'}
-                                                        <input id="locateMap" name="locateMap" value="{$APP.LBL_LOCATE_MAP}" class="small" type="button" onClick="searchMapLocation( 'Main' )" title="{$APP.LBL_LOCATE_MAP}">
+                                                        <input name="mapbutton" value="{$APP.LBL_LOCATE_MAP}" class="small" type="button" onClick="searchMapLocation( 'Main' )" title="{$APP.LBL_LOCATE_MAP}">
                                                         {else}
-                                                                {if $MODULE eq 'Accounts'}
-                                                                       {assign var=address1 value='Billing'}
-                                                                       {assign var=address2 value='Shipping'}
-                                                                {/if}
-                                                                {if $MODULE eq 'Contacts'}
-                                                                       {assign var=address1 value='Mailing'}
-                                                                       {assign var=address2 value='Other'}
-                                                                {/if}
-                                                                <input id="locateMap" name="locateMap" value="{$APP.LBL_LOCATE_MAP}" class="small" type="button" onClick="javascript:showLocateMapMenu()" title="{$APP.LBL_LOCATE_MAP}">
-                                                        <div id="dropDownMenu" style="position:absolute;display:none;z-index:60">
-							<table border="0" cellspacing="0" cellpadding="4">
-                                                <tr bgcolor=white class="lvtColData" onMouseOver="this.className='lvtColDataHover'" style="cursor:pointer;" onMouseOut="this.className='lvtColData'" onClick="searchMapLocation( 'Main' )">
-                                                <td>{$address1} {$APP.LBL_ADDRESS}</td>
-                                                </tr>
-                                                <tr bgcolor=white class="lvtColData" onMouseOver="this.className='lvtColDataHover'" style="cursor:pointer;" onMouseOut="this.className='lvtColData'"  onClick="searchMapLocation( 'Other' )">
-                                                <td>{$address2} {$APP.LBL_ADDRESS}</td>
-                                                </tr>
-                                                </table>
-                                                </div>
-                                                {/if}
-                                                <script>
-                                                        document.onclick=hideLocateMapMenu;
-                                                </script>
-                                               {/if}
+                                                        <input name="mapbutton" value="{$APP.LBL_LOCATE_MAP}" class="small" type="button" onClick="fnvshobj(this,'locateMap');" onmouseout="fninvsh('locateMap');" title="{$APP.LBL_LOCATE_MAP}">
+							{/if}
+                                                        {/if}
                                                         </td>
                                                         </tr>
 




From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 08:49:20 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 12:49:20 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231132=3A?=
 =?utf-8?q?_creation_of_related_entities_ought_to_be_ajaxified?=
In-Reply-To: <076.343f75f8c959bb0da4c9f8e348afe0b2@vtiger.fosslabs.com>
References: <076.343f75f8c959bb0da4c9f8e348afe0b2@vtiger.fosslabs.com>
Message-ID: <085.5c510290c1e80f2216a30b421ec02115@vtiger.fosslabs.com>

#1132: creation of related entities ought to be ajaxified
--------------------------+-------------------------------------------------
  Reporter:  richie       |       Owner:  Richie     
      Type:  enhancement  |      Status:  new        
  Priority:  major        |   Milestone:             
 Component:  vtigercrm    |     Version:  5.0.1      
Resolution:               |    Keywords:  performance
--------------------------+-------------------------------------------------
Changes (by anonymous):

  * type:  defect => enhancement

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1132>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 08:49:32 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 12:49:32 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231130=3A?=
 =?utf-8?q?_more_information_tab_ajaxified?=
In-Reply-To: <076.d1ddb83143327b9a11f01d548facd399@vtiger.fosslabs.com>
References: <076.d1ddb83143327b9a11f01d548facd399@vtiger.fosslabs.com>
Message-ID: <085.25e0975431628118b93444046ed54433@vtiger.fosslabs.com>

#1130: more information tab ajaxified
--------------------------+-------------------------------------------------
  Reporter:  richie       |       Owner:  Richie     
      Type:  enhancement  |      Status:  new        
  Priority:  major        |   Milestone:             
 Component:  vtigercrm    |     Version:  5.0.1      
Resolution:               |    Keywords:  performance
--------------------------+-------------------------------------------------
Changes (by anonymous):

  * type:  defect => enhancement

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1130>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 08:53:29 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 12:53:29 -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.b164f16b1d2e91ec130131ea9f4b9145@vtiger.fosslabs.com>

#82: Ticket-Activity-Relation
-------------------------------+--------------------------------------------
  Reporter:  eberle.d at 4net.ch  |       Owner:  minnie
      Type:  enhancement       |      Status:  closed
  Priority:  critical          |   Milestone:        
 Component:  vtigercrm         |     Version:  5.0.1 
Resolution:  duplicate         |    Keywords:        
-------------------------------+--------------------------------------------
Changes (by jerrydgeorge):

  * resolution:  => duplicate
  * status:  new => closed

Comment:

 1252

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/82>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 08:56:54 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 12:56:54 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231270=3A?=
 =?utf-8?q?_Picklist_editor_not_exist_for_invoices?=
In-Reply-To: <076.9bd0e7d72add51e29114ababf0f13b67@vtiger.fosslabs.com>
References: <076.9bd0e7d72add51e29114ababf0f13b67@vtiger.fosslabs.com>
Message-ID: <085.f1ed3f5b2dac67d41916d0bfd7b8b182@vtiger.fosslabs.com>

#1270: Picklist editor not exist for invoices
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  mangai            
      Type:  defect     |      Status:  closed            
  Priority:  major      |   Milestone:  5.0.0             
 Component:  vtigercrm  |     Version:  5.0.0             
Resolution:  fixed      |    Keywords:  invoices, picklist
------------------------+---------------------------------------------------
Changes (by anonymous):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1270>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 09:00:34 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 13:00:34 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23644=3A_?=
 =?utf-8?q?logs_in_notification_schedular?=
In-Reply-To: <076.c1cfccb88b72051f409d50fc0c74708c@vtiger.fosslabs.com>
References: <076.c1cfccb88b72051f409d50fc0c74708c@vtiger.fosslabs.com>
Message-ID: <085.2480501775b94cface74bf676db38655@vtiger.fosslabs.com>

#644: logs in notification schedular
--------------------------------+-------------------------------------------
  Reporter:  minnie at vtiger.com  |       Owner:  minnie
      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: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/644>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 09:01:33 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 13:01:33 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23644=3A_?=
 =?utf-8?q?logs_in_notification_schedular?=
In-Reply-To: <076.c1cfccb88b72051f409d50fc0c74708c@vtiger.fosslabs.com>
References: <076.c1cfccb88b72051f409d50fc0c74708c@vtiger.fosslabs.com>
Message-ID: <085.d11d82a6292309c670936172b2ddbeaa@vtiger.fosslabs.com>

#644: logs in notification schedular
--------------------------------+-------------------------------------------
  Reporter:  minnie at vtiger.com  |       Owner:  minnie  
      Type:  defect             |      Status:  reopened
  Priority:  major              |   Milestone:  5.0.0   
 Component:  vtigercrm          |     Version:  5.0.0   
Resolution:                     |    Keywords:          
--------------------------------+-------------------------------------------
Changes (by anonymous):

  * resolution:  invalid =>
  * status:  closed => reopened

Comment:

 Post 5.0.0

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/644>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 09:03:12 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 13:03:12 -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.7d9b4ab012516307581656c9eab06f4a@vtiger.fosslabs.com>

#285: Usability issue in picklist edit
------------------------+---------------------------------------------------
  Reporter:  don        |       Owner:  ela  
      Type:  defect     |      Status:  new  
  Priority:  major      |   Milestone:  5.0.0
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by jerrydgeorge):

  * owner:  minnie => ela

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/285>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 09:03:59 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 13:03:59 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23846=3A_?=
 =?utf-8?q?Member_Of_Field_can_be_moved_to_Basic_Information_Tab?=
In-Reply-To: <076.76722003fcd7d8c307a684829482c1f2@vtiger.fosslabs.com>
References: <076.76722003fcd7d8c307a684829482c1f2@vtiger.fosslabs.com>
Message-ID: <085.a57fb6c2fa58fa335bbdeec19ddd8798@vtiger.fosslabs.com>

#846: Member Of Field can be moved to Basic Information Tab
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  jerrydgeorge
      Type:  defect     |      Status:  new         
  Priority:  minor      |   Milestone:              
 Component:  vtigercrm  |     Version:  5.0.0       
Resolution:             |    Keywords:              
------------------------+---------------------------------------------------
Changes (by anonymous):

  * owner:  mangai => jerrydgeorge

Comment:

 Not take

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/846>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 09:06:12 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 13:06:12 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23846=3A_?=
 =?utf-8?q?Member_Of_Field_can_be_moved_to_Basic_Information_Tab?=
In-Reply-To: <076.76722003fcd7d8c307a684829482c1f2@vtiger.fosslabs.com>
References: <076.76722003fcd7d8c307a684829482c1f2@vtiger.fosslabs.com>
Message-ID: <085.f3917a26b6beec906a731dd245f8a96a@vtiger.fosslabs.com>

#846: Member Of Field can be moved to Basic Information Tab
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  jerrydgeorge
      Type:  defect     |      Status:  closed      
  Priority:  minor      |   Milestone:              
 Component:  vtigercrm  |     Version:  5.0.0       
Resolution:  fixed      |    Keywords:              
------------------------+---------------------------------------------------
Changes (by anonymous):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/846>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 09:15:11 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 13:15:11 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23808=3A_?=
 =?utf-8?q?Recently_Used_-_Contacts=2C_Leads=2C_Emails=2C_etc=2E?=
In-Reply-To: <076.732df8a9c67d4b57a254501f77c190bf@vtiger.fosslabs.com>
References: <076.732df8a9c67d4b57a254501f77c190bf@vtiger.fosslabs.com>
Message-ID: <085.e465bec63b285d008382947bc4056faf@vtiger.fosslabs.com>

#808: Recently Used - Contacts, Leads, Emails, etc.
--------------------------------+-------------------------------------------
  Reporter:  kenlyle at yahoo.com  |       Owner:  don                  
      Type:  enhancement        |      Status:  new                  
  Priority:  major              |   Milestone:                       
 Component:  vtigercrm          |     Version:  5.0.0                
Resolution:                     |    Keywords:  recent, recently used
--------------------------------+-------------------------------------------
Changes (by anonymous):

  * owner:  jerrydgeorge => don

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/808>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 09:43:51 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 13:43:51 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7382 - in /vtigercrm/trunk:
 data/CRMEntity.php include/utils/CommonUtils.php
 include/utils/InventoryUtils.php schema/DatabaseSchema.xml
Message-ID: <20060621134351.DAC8683F41C@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 07:43:44 2006
New Revision: 7382

Log:
* Modified to handle the history of PO, SO, Quotes and Invoice

Modified:
    vtigercrm/trunk/data/CRMEntity.php
    vtigercrm/trunk/include/utils/CommonUtils.php
    vtigercrm/trunk/include/utils/InventoryUtils.php
    vtigercrm/trunk/schema/DatabaseSchema.xml

Modified: vtigercrm/trunk/data/CRMEntity.php
==============================================================================
--- vtigercrm/trunk/data/CRMEntity.php (original)
+++ vtigercrm/trunk/data/CRMEntity.php Wed Jun 21 07:43:44 2006
@@ -704,7 +704,29 @@
 				  $adb->query($sql);
 			  }
 		  }
-		
+		  elseif($_REQUEST['module'] == 'PurchaseOrder' || $_REQUEST['module'] == 'SalesOrder' || $_REQUEST['module'] == 'Quotes' || $_REQUEST['module'] == 'Invoice')
+		  {
+			  //added to update the history for PO, SO, Quotes and Invoice
+			  $history_field_array = Array(
+				  			"PurchaseOrder"=>"postatus",
+							"SalesOrder"=>"sostatus",
+							"Quotes"=>"quotestage",
+							"Invoice"=>"invoicestatus"
+						      );
+
+			  $inventory_module = $_REQUEST['module'];
+			  if($inventory_module == "PurchaseOrder")
+			  	$relatedname = $_REQUEST["vendor_name"];
+			  else
+			  	$relatedname = $_REQUEST["account_name"];
+
+			  $oldvalue = getSingleFieldValue($this->table_name,$history_field_array[$inventory_module],$this->module_id,$this->id);
+			  if($oldvalue != $this->column_fields["$history_field_array[$inventory_module]"])
+			  {
+				  addInventoryHistory($inventory_module, $this->id,$relatedname,$_REQUEST['grandTotal'],$this->column_fields["$history_field_array[$inventory_module]"]);
+			  }
+		  }
+
 		  //Check done by Don. If update is empty the the query fails
 		  if(trim($update) != '')
         	  {

Modified: vtigercrm/trunk/include/utils/CommonUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/CommonUtils.php (original)
+++ vtigercrm/trunk/include/utils/CommonUtils.php Wed Jun 21 07:43:44 2006
@@ -2390,5 +2390,23 @@
 	return $description;
 }
 
+/**	Function used to retrieve a single field value from database
+ *	@param string $tablename - tablename from which we will retrieve the field value
+ *	@param string $fieldname - fieldname to which we want to get the value from database
+ *	@param string $idname	 - idname which is the name of the entity id in the table like, inoviceid, quoteid, etc.,
+ *	@param int    $id	 - entity id
+ *	return string $fieldval  - field value of the needed fieldname from database will be returned
+ */
+function getSingleFieldValue($tablename, $fieldname, $idname, $id)
+{
+	global $log, $adb;
+	$log->debug("Entering into function getSingleFieldValue($tablename, $fieldname, $idname, $id)");
+
+	$fieldval = $adb->query_result($adb->query("select $fieldname from $tablename where $idname = $id"),0,$fieldname);
+
+	$log->debug("Exit from function getSingleFieldValue. return value ==> \"$fieldval\"");
+
+	return $fieldval;
+}
 
 ?>

Modified: vtigercrm/trunk/include/utils/InventoryUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/InventoryUtils.php (original)
+++ vtigercrm/trunk/include/utils/InventoryUtils.php Wed Jun 21 07:43:44 2006
@@ -315,5 +315,30 @@
 	return $taxpercentage;
 }
 
+/**	Function used to add the history entry in the relevant tables for PO, SO, Quotes and Invoice modules
+ *	@param string 	$module		- current module name
+ *	@param int 	$id		- entity id
+ *	@param string 	$relatedname	- parent name of the entity ie, required field venor name for PO and account name for SO, Quotes and Invoice
+ *	@param float 	$total		- grand total value of the product details included tax
+ *	@param string 	$history_fldval	- history field value ie., quotestage for Quotes and status for PO, SO and Invoice
+ */
+function addInventoryHistory($module, $id, $relatedname, $total, $history_fldval)
+{
+	global $log, $adb;
+	$log->debug("Entering into function addInventoryHistory($module, $id, $relatedname, $total, $history_fieldvalue)");
+
+	$history_table_array = Array(
+					"PurchaseOrder"=>"vtiger_postatushistory",
+					"SalesOrder"=>"vtiger_sostatushistory",
+					"Quotes"=>"vtiger_quotestagehistory",
+					"Invoice"=>"vtiger_invoicestatushistory"
+				    );
+
+	$modifiedtime = date('YmdHis');
+	$query = "insert into $history_table_array[$module] values('',$id,\"$relatedname\",\"$total\",\"$history_fldval\",\"$modifiedtime\")";
+	$adb->query($query);
+
+	$log->debug("Exit from function addInventoryHistory");
+}
 
 ?>

Modified: vtigercrm/trunk/schema/DatabaseSchema.xml
==============================================================================
--- vtigercrm/trunk/schema/DatabaseSchema.xml (original)
+++ vtigercrm/trunk/schema/DatabaseSchema.xml Wed Jun 21 07:43:44 2006
@@ -5207,5 +5207,82 @@
 		</index>
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
-	
+
+	<table name="vtiger_postatushistory">
+		<field name="historyid" type="I" size="19">
+			<key />
+			<autoincrement />
+		</field>
+		<field name="purchaseorderid" type="I" size="19">
+			<notnull />
+			<constraint>REFERENCES vtiger_purchaseorder(purchaseorderid) ON DELETE CASCADE</constraint>
+		</field>
+		<field name="vendorname" type="C" size="100" />
+		<field name="total" type="N" />
+		<field name="postatus" type="C" size="200" />
+		<field name="lastmodified" type="T" />
+
+		<index name="postatushistory_purchaseorderid_idx">
+			<col>purchaseorderid</col>
+		</index>
+		<opt platform="mysql">Type=InnoDB</opt>
+	</table>
+	<table name="vtiger_sostatushistory">
+		<field name="historyid" type="I" size="19">
+			<key />
+			<autoincrement />
+		</field>
+		<field name="salesorderid" type="I" size="19">
+			<notnull />
+			<constraint>REFERENCES vtiger_salesorder(salesorderid) ON DELETE CASCADE</constraint>
+		</field>
+		<field name="accountname" type="C" size="100" />
+		<field name="total" type="N" />
+		<field name="sostatus" type="C" size="200" />
+		<field name="lastmodified" type="T" />
+
+		<index name="sostatushistory_salesorderid_idx">
+			<col>salesorderid</col>
+		</index>
+		<opt platform="mysql">Type=InnoDB</opt>
+	</table>
+	<table name="vtiger_quotestagehistory">
+		<field name="historyid" type="I" size="19">
+			<key />
+			<autoincrement />
+		</field>
+		<field name="quoteid" type="I" size="19">
+			<notnull />
+			<constraint>REFERENCES vtiger_quotes(quoteid) ON DELETE CASCADE</constraint>
+		</field>
+		<field name="accountname" type="C" size="100" />
+		<field name="total" type="N" />
+		<field name="quotestage" type="C" size="200" />
+		<field name="lastmodified" type="T" />
+
+		<index name="quotestagehistory_quoteid_idx">
+			<col>quoteid</col>
+		</index>
+		<opt platform="mysql">Type=InnoDB</opt>
+	</table>
+	<table name="vtiger_invoicestatushistory">
+		<field name="historyid" type="I" size="19">
+			<key />
+			<autoincrement />
+		</field>
+		<field name="invoiceid" type="I" size="19">
+			<notnull />
+			<constraint>REFERENCES vtiger_invoice(invoiceid) ON DELETE CASCADE</constraint>
+		</field>
+		<field name="accountname" type="C" size="100" />
+		<field name="total" type="N" />
+		<field name="invoicestatus" type="C" size="200" />
+		<field name="lastmodified" type="T" />
+
+		<index name="invoicestatushistory_invoiceid_idx">
+			<col>invoiceid</col>
+		</index>
+		<opt platform="mysql">Type=InnoDB</opt>
+	</table>
+
 </schema>




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 09:44:41 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 13:44:41 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7383 - in
 /vtigercrm/trunk/modules: PurchaseOrder/PurchaseOrder.php Quotes/Quote.php
Message-ID: <20060621134441.BFCFF83F41C@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 07:44:36 2006
New Revision: 7383

Log:
* Modified the table_name property to the new table name

Modified:
    vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php
    vtigercrm/trunk/modules/Quotes/Quote.php

Modified: vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php
==============================================================================
--- vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php (original)
+++ vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php Wed Jun 21 07:44:36 2006
@@ -33,7 +33,7 @@
 	var $log;
 	var $db;
 		
-	var $table_name = "purchaseorder";
+	var $table_name = "vtiger_purchaseorder";
 	var $tab_name = Array('vtiger_crmentity','vtiger_purchaseorder','vtiger_pobillads','vtiger_poshipads','vtiger_purchaseordercf');
 	var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_purchaseorder'=>'purchaseorderid','vtiger_pobillads'=>'pobilladdressid','vtiger_poshipads'=>'poshipaddressid','vtiger_purchaseordercf'=>'purchaseorderid');
 	

Modified: vtigercrm/trunk/modules/Quotes/Quote.php
==============================================================================
--- vtigercrm/trunk/modules/Quotes/Quote.php (original)
+++ vtigercrm/trunk/modules/Quotes/Quote.php Wed Jun 21 07:44:36 2006
@@ -33,7 +33,7 @@
 	var $log;
 	var $db;
 		
-	var $table_name = "quotes";
+	var $table_name = "vtiger_quotes";
 	var $tab_name = Array('vtiger_crmentity','vtiger_quotes','vtiger_quotesbillads','vtiger_quotesshipads','vtiger_quotescf');
 	var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_quotes'=>'quoteid','vtiger_quotesbillads'=>'quotebilladdressid','vtiger_quotesshipads'=>'quoteshipaddressid','vtiger_quotescf'=>'quoteid');
 	




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 10:27:14 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 14:27:14 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7384 -
	/vtigercrm/trunk/Smarty/templates/DisplayFields.tpl
Message-ID: <20060621142714.4E8E883F425@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 21 08:27:05 2006
New Revision: 7384

Log:
now the logged in admin user cannot change him as non admin

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

Modified: vtigercrm/trunk/Smarty/templates/DisplayFields.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DisplayFields.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DisplayFields.tpl Wed Jun 21 08:27:05 2006
@@ -470,7 +470,7 @@
 			<td width="20%" class="dvtCellLabel" align=right>
 				{$fldlabel}
 			</td>
-				{if $secondvalue eq 1}
+				{if ($secondvalue eq 1 && $CURRENT_USERID != $smarty.request.record) || ($MODE == 'create')}
 					{assign var="disable_status" value=""}
 				{else}
 					{assign var="disable_status" value="disabled"}




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 10:30:44 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 14:30:44 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7385 -
	/vtigercrm/trunk/modules/Users/EditView.php
Message-ID: <20060621143044.3D8F683F427@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 21 08:30:35 2006
New Revision: 7385

Log:
now the admin user cannot change him to non admin by him self

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 Wed Jun 21 08:30:35 2006
@@ -67,7 +67,7 @@
 global $current_language;
 $smod_strings = return_module_language($current_language,'Settings');
 $smarty->assign("MOD", $smod_strings);
-
+$smarty->assign("CURRENT_USERID", $current_user->id);
 $smarty->assign("APP", $app_strings);
 
 if (isset($_REQUEST['error_string'])) $smarty->assign("ERROR_STRING", "<font class='error'>Error: ".$_REQUEST['error_string']."</font>");




From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 11:33:41 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 15:33:41 -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.ae91ba6d93f3b5ae7dbc6457a7399dde@vtiger.fosslabs.com>

#678: Home Page Security Support is not proper
---------------------------+------------------------------------------------
  Reporter:  jerrydgeorge  |       Owner:  saraj   
      Type:  defect        |      Status:  closed  
  Priority:  critical      |   Milestone:          
 Component:  vtigercrm     |     Version:  5.0.0   
Resolution:  fixed         |    Keywords:  Security
---------------------------+------------------------------------------------
Changes (by saraj):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/678>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 11:43:06 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 15:43:06 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231323=3A?=
 =?utf-8?q?_Performance_Issue_in_ListView?=
In-Reply-To: <076.1ec7598e9f7965c44699ac918e5801a3@vtiger.fosslabs.com>
References: <076.1ec7598e9f7965c44699ac918e5801a3@vtiger.fosslabs.com>
Message-ID: <085.d4c4195faeb430093adb406cf6bac2db@vtiger.fosslabs.com>

#1323: Performance Issue in ListView
---------------------------+------------------------------------------------
  Reporter:  jerrydgeorge  |       Owner:  philip
      Type:  defect        |      Status:  closed
  Priority:  critical      |   Milestone:        
 Component:  vtigercrm     |     Version:  5.0.0 
Resolution:  invalid       |    Keywords:        
---------------------------+------------------------------------------------
Changes (by saraj):

  * resolution:  => invalid
  * status:  new => closed

Comment:

 Listview query optimisation has been done, using limit query for
 pagination was found to have no improvement on the performance.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1323>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 11:54:49 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 15:54:49 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7386 -
	/vtigercrm/trunk/include/js/dtlviewajax.js
Message-ID: <20060621155449.EDA6F83F43E@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 21 09:54:40 2006
New Revision: 7386

Log:
record parsed in Ajax URL. So now the detail view ajax security check is working
 

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

Modified: vtigercrm/trunk/include/js/dtlviewajax.js
==============================================================================
--- vtigercrm/trunk/include/js/dtlviewajax.js (original)
+++ vtigercrm/trunk/include/js/dtlviewajax.js Wed Jun 21 09:54:40 2006
@@ -118,7 +118,7 @@
 		}
 	}
 
-	var data = "file=DetailViewAjax&module=" + module + "&action=" + module + "Ajax&recordid=" + crmId ;
+	var data = "file=DetailViewAjax&module=" + module + "&action=" + module + "Ajax&record=" + crmId+"&recordid=" + crmId ;
 	data = data + "&fldName=" + fieldName + "&fieldValue=" + escape(tagValue) + "&ajxaction=DETAILVIEW";
 	new Ajax.Request(
 		'index.php',




From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 12:24:31 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 16:24:31 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231350=3A?=
 =?utf-8?q?_Mass_Delete_not_working_for_the_only_record_in_List_View?=
Message-ID: <076.52d2f3cf1c5fb831b08c5d544f32f873@vtiger.fosslabs.com>

#1350: Mass Delete not working for the only record in List View
-----------------------+----------------------------------------------------
 Reporter:  ahmed      |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  critical   |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------


-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1350>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 12:24:53 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 16:24:53 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231350=3A?=
 =?utf-8?q?_Mass_Delete_not_working_for_the_only_record_in_List_View?=
In-Reply-To: <076.52d2f3cf1c5fb831b08c5d544f32f873@vtiger.fosslabs.com>
References: <076.52d2f3cf1c5fb831b08c5d544f32f873@vtiger.fosslabs.com>
Message-ID: <085.91dcdef3c615273429ff3140491c52f3@vtiger.fosslabs.com>

#1350: Mass Delete not working for the only record in List View
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  jeri 
      Type:  defect     |      Status:  new  
  Priority:  critical   |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by anonymous):

  * owner:  developer => jeri

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1350>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 12:26:41 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 16:26:41 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231351=3A?=
 =?utf-8?q?_Editing_Activity_in_Leads_Related_List_Shows_Warning?=
Message-ID: <076.23a2cbc68532eb6ef08e3d5e59241e8c@vtiger.fosslabs.com>

#1351: Editing Activity in Leads Related List Shows Warning
-----------------------+----------------------------------------------------
 Reporter:  ahmed      |       Owner:  mickie
     Type:  defect     |      Status:  new   
 Priority:  blocker    |   Milestone:        
Component:  vtigercrm  |     Version:  5.0.0 
 Keywords:             |  
-----------------------+----------------------------------------------------


-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1351>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 12:44:32 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 16:44:32 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7387 - in
 /vtigercrm/trunk/Smarty/templates: DetailView.tpl DetailViewFields.tpl
Message-ID: <20060621164432.828C9839FAF@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 21 10:44:07 2006
New Revision: 7387

Log:
Security Check added for ajax Edit in deltailview

Added:
    vtigercrm/trunk/Smarty/templates/DetailViewFields.tpl
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 Wed Jun 21 10:44:07 2006
@@ -259,18 +259,19 @@
 							   {assign var=keycntimage value=$data.cntimage}
 							   {assign var=keyadmin value=$data.isadmin}
 							   
-							   <input type="hidden" id="hdtxt_IsAdmin" value={$keyadmin}></input>
+							   
 							   
                            {if $label ne ''}
 	                        {if $keycntimage ne ''}
-					<td class="dvtCellLabel" align=right width=25%>{$keycntimage}</td>
+					<td class="dvtCellLabel" align=right width=25%><input type="hidden" id="hdtxt_IsAdmin" value={$keyadmin}></input>{$keycntimage}</td>
 				{elseif $keyid eq '71' || $keyid eq '72'}<!-- Currency symbol -->
-					<td class="dvtCellLabel" align=right width=25%>{$label} ({$keycursymb})</td>
+					<td class="dvtCellLabel" align=right width=25%>{$label}<input type="hidden" id="hdtxt_IsAdmin" value={$keyadmin}></input> ({$keycursymb})</td>
 				{else}
-					<td class="dvtCellLabel" align=right width=25%>{$label}</td>
+					<td class="dvtCellLabel" align=right width=25%><input type="hidden" id="hdtxt_IsAdmin" value={$keyadmin}></input>{$label}</td>
 				{/if}  
-
-										{include file="DetailViewUI.tpl"}
+{if $EDIT_PERMISSION eq 'yes'}							{include file="DetailViewUI.tpl"}
+{else}										{include file="DetailViewFields.tpl"}
+{/if}
 						   {else} 
                                           <td class="dvtCellLabel" align=right>&nbsp;</td>
                                            <td class="dvtCellInfo" align=left >&nbsp;</td>




From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 12:29:10 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 16:29:10 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231351=3A?=
 =?utf-8?q?_Editing_Activity_in_Leads_Related_List_Shows_Warning?=
In-Reply-To: <076.23a2cbc68532eb6ef08e3d5e59241e8c@vtiger.fosslabs.com>
References: <076.23a2cbc68532eb6ef08e3d5e59241e8c@vtiger.fosslabs.com>
Message-ID: <085.f8b2ebea23da26de2ec4051d8944c943@vtiger.fosslabs.com>

#1351: Editing Activity in Leads Related List Shows Warning
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  mickie
      Type:  defect     |      Status:  new   
  Priority:  blocker    |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Comment (by ahmed):

 Warning: Invalid argument supplied for foreach() in C:\Program
 Files\vtigercrm-5.0.0-beta\apache\htdocs\vtigerCRM\jun21\include\utils\EditViewUtils.php
 on line 1507

 Warning: Invalid argument supplied for foreach() in C:\Program
 Files\vtigercrm-5.0.0-beta\apache\htdocs\vtigerCRM\jun21\include\utils\CommonUtils.php
 on line 997

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1351>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 12:48:27 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 16:48:27 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7388 -
	/vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl
Message-ID: <20060621164827.5002183F41C@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 21 10:48:05 2006
New Revision: 7388

Log:
&nbsp; added for all cells

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

Modified: vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl Wed Jun 21 10:48:05 2006
@@ -20,7 +20,7 @@
                                          		      {elseif $keyid eq '71' || $keyid eq '72'}  <!--CurrencySymbol-->
                                          		            {$keycursymb}
                                                         {/if}
-                                                       <span id="dtlview_{$label}">{$keyval}</span>
+                                                       &nbsp;&nbsp;<span id="dtlview_{$label}">{$keyval}</span>
                                               		<div id="editarea_{$label}" style="display:none;">
                                               		  <input class="detailedViewTextBox" onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" type="text" id="txtbox_{$label}" name="{$keyfldname}" maxlength='100' value="{$keyval}"></input>
                                               		  <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
@@ -28,7 +28,7 @@
                                                        </div>
                                                   </td>
                                              {elseif $keyid eq '13'} <!--Email-->
-                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}"><a href="mailto:{$keyval}" target="_blank">{$keyval}</a></span>
+                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}"><a href="mailto:{$keyval}" target="_blank">{$keyval}</a></span>
                                               		<div id="editarea_{$label}" style="display:none;">
                                               		  <input class="detailedViewTextBox" onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" type="text" id="txtbox_{$label}" name="{$keyfldname}" maxlength='100' value="{$keyval}"></input>
                                               		  <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
@@ -36,7 +36,7 @@
                                                        </div>
                                                   </td>
                                              {elseif $keyid eq '15' || $keyid eq '16'} <!--ComboBox-->
-               							<td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}">{$keyval}</span>
+               							<td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}">{$keyval}</span>
                                               		<div id="editarea_{$label}" style="display:none;">
                     							   <select id="txtbox_{$label}" name="{$keyfldname}">
                     								{foreach item=arr from=$keyoptions}
@@ -50,7 +50,7 @@
                     							</div>
                							</td>
                                              {elseif $keyid eq '17'} <!--WebSite-->
-                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}"><a href="http://{$keyval}" target="_blank">{$keyval}</a></span>
+                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}"><a href="http://{$keyval}" target="_blank">{$keyval}</a></span>
                                               		<div id="editarea_{$label}" style="display:none;">
                                               		  <input class="detailedViewTextBox" onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" type="text" id="txtbox_{$label}" name="{$keyfldname}" maxlength='100' value="{$keyval}"></input>
                                               		  <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
@@ -58,7 +58,7 @@
                                                        </div>
                                                   </td>
                                              {elseif $keyid eq '19' || $keyid eq '20'} <!--TextArea/Description-->
-                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}">{$keyval}</span>
+                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}">{$keyval}</span>
                                               		<div id="editarea_{$label}" style="display:none;">
                                               		  <textarea id="txtbox_{$label}" name="{$keyfldname}"  class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'"onBlur="this.className='detailedViewTextBox'" cols="90" rows="8">{$keyval}</textarea>                                            		  
                                               		  <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
@@ -66,7 +66,7 @@
                                                        </div>
                                                   </td>
                                              {elseif $keyid eq '21' || $keyid eq '24' || $keyid eq '22'} <!--TextArea/Street-->
-                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}">{$keyval}</span>
+                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}">{$keyval}</span>
                                               		<div id="editarea_{$label}" style="display:none;">
                                               		  <textarea id="txtbox_{$label}" name="{$keyfldname}"  class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'"onBlur="this.className='detailedViewTextBox'" rows=2>{$keyval}</textarea>                                            		  
                                               		  <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
@@ -74,7 +74,7 @@
                                                        </div>
                                                   </td>
                                              {elseif $keyid eq '50' || $keyid eq '73' || $keyid eq '51'} <!--AccountPopup-->
-                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}"><a href="{$keyseclink}">{$keyval}</a></span>
+                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}"><a href="{$keyseclink}">{$keyval}</a></span>
                                               		<div id="editarea_{$label}" style="display:none;">                                              		  
                                                          <input readonly id="popuptxt_{$label}" name="account_name" type="text" value="{$keyval}"><input id="txtbox_{$label}" name="{$keyfldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Accounts&action=Popup&popuptype=specific&form=TasksEditView&form_submit=false","test","width=600,height=400,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'>
                                                          <!--AccountPopup/WithClear-->{if $keyid eq '51'} &nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.account_id.value=''; this.form.account_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>{/if} 
@@ -83,7 +83,7 @@
                                                        </div>
                                                   </td>
                                              {elseif $keyid eq '57'} <!--ContactPopup-->
-                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}"><a href="{$keyseclink}">{$keyval}</a></span>
+                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}"><a href="{$keyseclink}">{$keyval}</a></span>
                                               		<div id="editarea_{$label}" style="display:none;">                                              		  
                                                          <input id="popuptxt_{$label}" name="contact_name" readonly type="text" style="border:1px solid #bababa;" value="{$keyval}"><input id="txtbox_{$label}" name="{$keyfldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Contacts&action=Popup&html=Popup_picker&popuptype=specific&form=EditView","test","width=600,height=400,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.contact_id.value=''; this.form.contact_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
                                                          <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
@@ -91,7 +91,7 @@
                                                        </div>
                                                   </td>                                                  
                                              {elseif $keyid eq '59'} <!--ProductPopup-->
-                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}"><a href="{$keyseclink}">{$keyval}</a></span>
+                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}"><a href="{$keyseclink}">{$keyval}</a></span>
                                               		<div id="editarea_{$label}" style="display:none;">                                              		  
                                                          <input id="popuptxt_{$label}" name="product_name" readonly type="text" value="{$keyval}"><input id="txtbox_{$label}" name="{$keyfldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Products&action=Popup&html=Popup_picker&form=HelpDeskEditView&popuptype=specific","test","width=600,height=400,resizable=1,scrollbars=1,top=150,left=200");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.product_id.value=''; this.form.product_name.value=''; return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
                                                          <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
@@ -99,7 +99,7 @@
                                                        </div>
                                                   </td>
                                              {elseif $keyid eq '75' || $keyid eq '81'} <!--VendorPopup-->
-                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}"><a href="{$keyseclink}">{$keyval}</a></span>
+                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}"><a href="{$keyseclink}">{$keyval}</a></span>
                                               		<div id="editarea_{$label}" style="display:none;">
                                                          <input id="popuptxt_{$label}" name="vendor_name" readonly type="text" style="border:1px solid #bababa;" value="{$keyval}"><input id="txtbox_{$label}" name="{$fldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Vendors&action=Popup&html=Popup_picker&popuptype=specific&form=EditView","test","width=600,height=400,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'>
                                                          {if $uitype eq 75}&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.vendor_id.value='';this.form.vendor_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>{/if}                                              		  
@@ -108,7 +108,7 @@
                                                        </div>
                                                   </td>
                                              {elseif $keyid eq 76} <!--PotentialPopup-->
-                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}"><a href="{$keyseclink}">{$keyval}</a></span>
+                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}"><a href="{$keyseclink}">{$keyval}</a></span>
                                               		<div id="editarea_{$label}" style="display:none;">                                              		  
                                                          <input id="popuptxt_{$label}" name="potential_name" readonly type="text" style="border:1px solid #bababa;" value="{$keyval}"><input id="txtbox_{$label}" name="{$keyfldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Potentials&action=Popup&html=Popup_picker&popuptype=specific_potential_account_address&form=EditView","test","width=600,height=400,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.potential_id.value=''; this.form.potential_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
                                                          <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
@@ -116,7 +116,7 @@
                                                        </div>
                                                   </td>
                                              {elseif $keyid eq 78} <!--QuotePopup-->
-                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}"><a href="{$keyseclink}">{$keyval}</a></span>
+                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}"><a href="{$keyseclink}">{$keyval}</a></span>
                                               		<div id="editarea_{$label}" style="display:none;">                                              		  
                                                          <input id="popuptxt_{$label}" name="quote_name" readonly type="text" style="border:1px solid #bababa;" value="{$keyval}"><input id="txtbox_{$label}" name="{$keyfldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Quotes&action=Popup&html=Popup_picker&popuptype=specific&form=EditView","test","width=600,height=400,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.quote_id.value=''; this.form.quote_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
                                                          <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
@@ -127,7 +127,7 @@
                                                   <td colspan="3" width=100% class="dvtCellInfo" align="left"><div id="dtlview_{$label}" style="width:100%;height:200px;overflow:hidden;border:1px solid gray" class="detailedViewTextBox" onmouseover="this.className='detailedViewTextBoxOn'" onmouseout="this.className='detailedViewTextBox'">{$keyval}</div>
                                                   </td>
                                              {elseif $keyid eq 80} <!--SalesOrderPopup-->
-                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}"><a href="{$keyseclink}">{$keyval}</a></span>
+                                                  <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}"><a href="{$keyseclink}">{$keyval}</a></span>
                                               		<div id="editarea_{$label}" style="display:none;">                                              		  
                                                          <input id="popuptxt_{$label}" name="salesorder_name" readonly type="text" style="border:1px solid #bababa;" value="{$keyval}"><input id="txtbox_{$label}" name="{$keyfldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=SalesOrder&action=Popup&html=Popup_picker&popuptype=specific&form=EditView","test","width=600,height=400,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.salesorder_id.value=''; this.form.salesorder_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
                                                          <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
@@ -137,7 +137,7 @@
 					{elseif $keyid eq '53'} <!--Assigned To-->
                     <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">
 				
-                    <span id="dtlview_{$label}">
+                    &nbsp;<span id="dtlview_{$label}">
                     {if $keyseclink eq ''}
                         {$keyval}
                     {else}
@@ -160,7 +160,7 @@
                     </div>
                     </td>
 					    {elseif $keyid eq '56'} <!--CheckBox--> 
-                      <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onMouseOver="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"><span id="dtlview_{$label}">{$keyval}&nbsp;</span>
+                      <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onMouseOver="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}">{$keyval}&nbsp;</span>
                     	<div id="editarea_{$label}" style="display:none;">
                         {if $keyval eq 'yes'}                                              		  
                             <input id="txtbox_{$label}" name="{$keyfldname}" type="checkbox" style="border:1px solid #bababa;" checked value="1">




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 13:35:36 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 17:35:36 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7389 -
	/vtigercrm/trunk/modules/Leads/DetailView.php
Message-ID: <20060621173536.CD35983F434@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 21 11:35:28 2006
New Revision: 7389

Log:
security issue in detail view ajax fixed

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 Jun 21 11:35:28 2006
@@ -121,6 +121,7 @@
 $smarty->assign("CHECK", $check_button);
 
 $smarty->assign("MODULE", $currentModule);
+$smarty->assign("EDIT_PERMISSION",isPermitted($currentModule,'EditView',$_REQUEST[record]));
 $smarty->display("DetailView.tpl");
 
 ?>




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 13:37:09 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 17:37:09 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7390 -
	/vtigercrm/trunk/modules/Accounts/DetailView.php
Message-ID: <20060621173709.D35A283F434@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 21 11:37:01 2006
New Revision: 7390

Log:
fixed detail view ajax security issue

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

Modified: vtigercrm/trunk/modules/Accounts/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Accounts/DetailView.php (original)
+++ vtigercrm/trunk/modules/Accounts/DetailView.php Wed Jun 21 11:37:01 2006
@@ -108,5 +108,6 @@
 $smarty->assign("CHECK", $check_button);
 
 $smarty->assign("MODULE",$currentModule);
+$smarty->assign("EDIT_PERMISSION",isPermitted($currentModule,'EditView',$_REQUEST[record]));
 $smarty->display("DetailView.tpl");
 ?>




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 13:39:15 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 17:39:15 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7392 -
	/vtigercrm/trunk/modules/Campaigns/DetailView.php
Message-ID: <20060621173915.B8D8D64FD1A@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 21 11:39:07 2006
New Revision: 7392

Log:
fixed detail view ajax issue

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 Jun 21 11:39:07 2006
@@ -68,7 +68,9 @@
 $smarty->assign("CHECK", $check_button);
 
 $smarty->assign("MODULE",$currentModule);
+$smarty->assign("EDIT_PERMISSION",isPermitted($currentModule,'EditView',$_REQUEST[record]));
 $smarty->display("DetailView.tpl");
+
 $focus->id = $_REQUEST['record'];
 
 ?>




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 13:40:19 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 17:40:19 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7393 -
	/vtigercrm/trunk/modules/Contacts/DetailView.php
Message-ID: <20060621174019.7D98083F00B@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 21 11:40:11 2006
New Revision: 7393

Log:
fixed the detail view ajax issue

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

Modified: vtigercrm/trunk/modules/Contacts/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/DetailView.php (original)
+++ vtigercrm/trunk/modules/Contacts/DetailView.php Wed Jun 21 11:40:11 2006
@@ -119,6 +119,7 @@
 $smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']);
 
 $smarty->assign("MODULE",$currentModule);
+$smarty->assign("EDIT_PERMISSION",isPermitted($currentModule,'EditView',$_REQUEST[record]));
 $smarty->display("DetailView.tpl");
 ?>
 




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 13:43:06 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 17:43:06 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7394 -
	/vtigercrm/trunk/modules/Faq/DetailView.php
Message-ID: <20060621174306.8AB3683F3A7@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 21 11:42:58 2006
New Revision: 7394

Log:
fixed the detail view ajax issue

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

Modified: vtigercrm/trunk/modules/Faq/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Faq/DetailView.php (original)
+++ vtigercrm/trunk/modules/Faq/DetailView.php Wed Jun 21 11:42:58 2006
@@ -92,6 +92,6 @@
 
 //Added to display the Faq comments information
 $smarty->assign("COMMENT_BLOCK",$focus->getFAQComments($_REQUEST['record']));
-
+$smarty->assign("EDIT_PERMISSION",isPermitted($currentModule,'EditView',$_REQUEST[record]));
 $smarty->display("DetailView.tpl");
 ?>




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 13:44:04 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 17:44:04 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7395 -
	/vtigercrm/trunk/modules/HelpDesk/DetailView.php
Message-ID: <20060621174405.42A9D83F3A7@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 21 11:43:55 2006
New Revision: 7395

Log:
fixed the detail view ajax issue

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

Modified: vtigercrm/trunk/modules/HelpDesk/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/DetailView.php (original)
+++ vtigercrm/trunk/modules/HelpDesk/DetailView.php Wed Jun 21 11:43:55 2006
@@ -101,6 +101,7 @@
 $smarty->assign("COMMENT_BLOCK",$focus->getCommentInformation($_REQUEST['record']));
 
 $smarty->assign("MODULE",$currentModule);
+$smarty->assign("EDIT_PERMISSION",isPermitted($currentModule,'EditView',$_REQUEST[record]));
 $smarty->display("DetailView.tpl");
 $focus->id = $_REQUEST['record'];
 




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 13:56:15 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 17:56:15 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7396 -
 /vtigercrm/trunk/Smarty/templates/Inventory/InventoryDetailView.tpl
Message-ID: <20060621175615.DE8C783F462@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 21 11:56:06 2006
New Revision: 7396

Log:
fixed the detail view ajax edit issues

Modified:
    vtigercrm/trunk/Smarty/templates/Inventory/InventoryDetailView.tpl

Modified: vtigercrm/trunk/Smarty/templates/Inventory/InventoryDetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Inventory/InventoryDetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Inventory/InventoryDetailView.tpl Wed Jun 21 11:56:06 2006
@@ -185,7 +185,11 @@
 							<td class="dvtCellLabel" align=right width=25%>{$label}</td>
 						{/if}
 					{/if}  
-						{include file="DetailViewUI.tpl"}
+						{if $EDIT_PERMISSION eq 'yes'}
+							{include file="DetailViewUI.tpl"}
+						{else}
+							{include file="DetailViewFields.tpl"}
+						{/if}
 				{else} 
 					<td class="dvtCellLabel" align=right>&nbsp;</td>
 					<td class="dvtCellInfo" align=left >&nbsp;</td>




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 13:57:38 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 17:57:38 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7397 -
	/vtigercrm/trunk/modules/Invoice/DetailView.php
Message-ID: <20060621175738.0B23283F462@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 21 11:57:30 2006
New Revision: 7397

Log:
fixed the detail view ajax edit issues

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 Jun 21 11:57:30 2006
@@ -87,7 +87,7 @@
 $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']);
 $smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']);
 $smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']);
-
+$smarty->assign("EDIT_PERMISSION",isPermitted($currentModule,'EditView',$_REQUEST[record]));
 $smarty->display("Inventory/InventoryDetailView.tpl");
 
 ?>




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 14:00:03 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 18:00:03 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7399 -
	/vtigercrm/trunk/modules/Potentials/DetailView.php
Message-ID: <20060621180003.F2DAF83F462@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 21 11:59:53 2006
New Revision: 7399

Log:
fixed the detail view ajax edit issues

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

Modified: vtigercrm/trunk/modules/Potentials/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Potentials/DetailView.php (original)
+++ vtigercrm/trunk/modules/Potentials/DetailView.php Wed Jun 21 11:59:53 2006
@@ -90,5 +90,6 @@
 
 $smarty->assign("CONVERTMODE",'potentoinvoice');
 $smarty->assign("MODULE","Potentials");
+$smarty->assign("EDIT_PERMISSION",isPermitted($currentModule,'EditView',$_REQUEST[record]));
 $smarty->display("DetailView.tpl");
 ?>




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 14:00:39 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 18:00:39 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7400 -
	/vtigercrm/trunk/modules/PriceBooks/DetailView.php
Message-ID: <20060621180039.665B140A839@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 21 12:00:31 2006
New Revision: 7400

Log:
fixed the detail view ajax edit issues

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

Modified: vtigercrm/trunk/modules/PriceBooks/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/PriceBooks/DetailView.php (original)
+++ vtigercrm/trunk/modules/PriceBooks/DetailView.php Wed Jun 21 12:00:31 2006
@@ -72,5 +72,6 @@
 
 $smarty->assign("MODULE", $currentModule);
 $smarty->assign("SINGLE_MOD",$app_strings['PriceBook']);
+$smarty->assign("EDIT_PERMISSION",isPermitted($currentModule,'EditView',$_REQUEST[record]));
 $smarty->display("Inventory/InventoryDetailView.tpl");
 ?>




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 14:01:32 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 18:01:32 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7401 -
	/vtigercrm/trunk/modules/Products/DetailView.php
Message-ID: <20060621180132.8A03F40A839@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 21 12:01:24 2006
New Revision: 7401

Log:
fixed the detail view ajax edit issues

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 Jun 21 12:01:24 2006
@@ -87,6 +87,7 @@
 
 //Security check for related list
 $smarty->assign("MODULE", $currentModule);
+$smarty->assign("EDIT_PERMISSION",isPermitted($currentModule,'EditView',$_REQUEST[record]));
 $smarty->display("Inventory/InventoryDetailView.tpl");
 
 ?>




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 14:02:41 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 18:02:41 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7402 -
 /vtigercrm/trunk/modules/PurchaseOrder/DetailView.php
Message-ID: <20060621180242.1654883F46D@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 21 12:02:33 2006
New Revision: 7402

Log:
fixed the detail view ajax edit issues

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 Jun 21 12:02:33 2006
@@ -90,6 +90,7 @@
 
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
+$smarty->assign("EDIT_PERMISSION",isPermitted($currentModule,'EditView',$_REQUEST[record]));
 $smarty->display("Inventory/InventoryDetailView.tpl");
 
 




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 14:03:29 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 18:03:29 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7403 -
	/vtigercrm/trunk/modules/Quotes/DetailView.php
Message-ID: <20060621180329.A118283F46D@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 21 12:03:20 2006
New Revision: 7403

Log:
fixed the detail view ajax edit issues

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 Jun 21 12:03:20 2006
@@ -98,7 +98,7 @@
 $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']);
 $smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']);
 $smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']);
-
+$smarty->assign("EDIT_PERMISSION",isPermitted($currentModule,'EditView',$_REQUEST[record]));
 $smarty->display("Inventory/InventoryDetailView.tpl");
 
 ?>




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 14:05:35 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 18:05:35 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7405 -
	/vtigercrm/trunk/modules/Vendors/DetailView.php
Message-ID: <20060621180535.BC4B7298FA7@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 21 12:05:27 2006
New Revision: 7405

Log:
fixed the detail view ajax edit issues

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

Modified: vtigercrm/trunk/modules/Vendors/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Vendors/DetailView.php (original)
+++ vtigercrm/trunk/modules/Vendors/DetailView.php Wed Jun 21 12:05:27 2006
@@ -68,7 +68,7 @@
 $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']);
 $smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']);
 $smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']);
-
+$smarty->assign("EDIT_PERMISSION",isPermitted($currentModule,'EditView',$_REQUEST[record]));
 $smarty->display("Inventory/InventoryDetailView.tpl");
 
 ?>




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 13:38:11 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 21 Jun 2006 17:38:11 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7391 -
	/vtigercrm/trunk/modules/Activities/DetailView.php
Message-ID: <20060621173811.29CD283F434@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 21 11:38:03 2006
New Revision: 7391

Log:
fixed detail view ajax issue

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

Modified: vtigercrm/trunk/modules/Activities/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Activities/DetailView.php (original)
+++ vtigercrm/trunk/modules/Activities/DetailView.php Wed Jun 21 11:38:03 2006
@@ -146,6 +146,7 @@
  $smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']);
 
 $smarty->assign("MODULE",$currentModule);
+$smarty->assign("EDIT_PERMISSION",isPermitted($currentModule,'EditView',$_REQUEST[record]));
 $smarty->display("DetailView.tpl");
 
 ?>




From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 15:33:01 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 19:33:01 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231352=3A?=
 =?utf-8?q?_integrate_source_code_of_self_update_functionality_get_form_ga?=
 =?utf-8?b?bGxlcnkuc2YubmV0ICh2Mik=?=
Message-ID: <076.c9c005c06f2e1cab9b816c461bc143a2@vtiger.fosslabs.com>

#1352: integrate source code of self update functionality get form gallery.sf.net
(v2)
---------------------------------------+------------------------------------
 Reporter:  shimon at schoolportal.co.il  |       Owner:  developer
     Type:  defect                     |      Status:  new      
 Priority:  minor                      |   Milestone:  5.0.0    
Component:  vtigercrm                  |     Version:  5.0.0    
 Keywords:  update,                    |  
---------------------------------------+------------------------------------
 i think gallery 2 is a php gallery, has good update functionality and may
 be ulilized
 http://gllery.sf.net

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1352>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 15:34:40 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 19:34:40 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231352=3A?=
 =?utf-8?q?_integrate_source_code_of_self_update_functionality_get_form_ga?=
 =?utf-8?b?bGxlcnkuc2YubmV0ICh2Mik=?=
In-Reply-To: <076.c9c005c06f2e1cab9b816c461bc143a2@vtiger.fosslabs.com>
References: <076.c9c005c06f2e1cab9b816c461bc143a2@vtiger.fosslabs.com>
Message-ID: <085.7d8cb0584ff2ad4f8efe45e7f7e134b9@vtiger.fosslabs.com>

#1352: integrate source code of self update functionality get form gallery.sf.net
(v2)
----------------------------------------+-----------------------------------
  Reporter:  shimon at schoolportal.co.il  |       Owner:  developer
      Type:  defect                     |      Status:  new      
  Priority:  minor                      |   Milestone:  5.0.0    
 Component:  vtigercrm                  |     Version:  5.0.0    
Resolution:                             |    Keywords:  update,  
----------------------------------------+-----------------------------------
Comment (by shimon):

 http://gallery.sf.net

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1352>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 16:09:44 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 20:09:44 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231353=3A?=
 =?utf-8?q?_Modifications_for_translation?=
Message-ID: <076.5f6b63545ffb289da25a5900a96337fe@vtiger.fosslabs.com>

#1353: Modifications for translation
------------------------------------+---------------------------------------
 Reporter:  william.maes at wandoo.fr  |       Owner:  developer
     Type:  enhancement             |      Status:  new      
 Priority:  minor                   |   Milestone:  5.0.0    
Component:  vtigercrm               |     Version:  5.0.0    
 Keywords:  search engine           |  
------------------------------------+---------------------------------------
 Modifications for the search engine

 /modules/Home/UnifiedSearch.php
 -------------------------------

 Line 260 :
 document.getElementById("global_search_total_count").innerHTML =
 "$mod_strings['LBL_TRESULTS'] : <b><?php echo $total_record_count;
 ?></b>";

 Line 264 :
 <td nowrap align="right">$mod_strings['LBL_SRESULTS'] &nbsp;


 /modules/Home/language/en_us.lang.php
 -------------------------------------
 Add :
 'LBL_SRESULTS' =>'Show Results in',
 'LBL_TRESULTS' =>'Total Records found',

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1353>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 16:12:43 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 20:12:43 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231353=3A?=
 =?utf-8?q?_Modifications_for_translation?=
In-Reply-To: <076.5f6b63545ffb289da25a5900a96337fe@vtiger.fosslabs.com>
References: <076.5f6b63545ffb289da25a5900a96337fe@vtiger.fosslabs.com>
Message-ID: <085.6f278dedcb852dc44320697d1d865432@vtiger.fosslabs.com>

#1353: Modifications for translation
-------------------------------------+--------------------------------------
  Reporter:  william.maes at wandoo.fr  |       Owner:  developer    
      Type:  enhancement             |      Status:  new          
  Priority:  minor                   |   Milestone:  5.0.0        
 Component:  vtigercrm               |     Version:  5.0.0        
Resolution:                          |    Keywords:  search engine
-------------------------------------+--------------------------------------
-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1353>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 16:13:02 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 21 Jun 2006 20:13:02 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231353=3A?=
 =?utf-8?q?_Modifications_for_translation?=
In-Reply-To: <076.5f6b63545ffb289da25a5900a96337fe@vtiger.fosslabs.com>
References: <076.5f6b63545ffb289da25a5900a96337fe@vtiger.fosslabs.com>
Message-ID: <085.61c7295865d340718776e8a2da3f3e48@vtiger.fosslabs.com>

#1353: Modifications for translation
-------------------------------------+--------------------------------------
  Reporter:  william.maes at wandoo.fr  |       Owner:  anonymous    
      Type:  enhancement             |      Status:  assigned     
  Priority:  minor                   |   Milestone:  5.0.0        
 Component:  vtigercrm               |     Version:  5.0.0        
Resolution:                          |    Keywords:  search engine
-------------------------------------+--------------------------------------
Changes (by anonymous):

  * status:  new => assigned
  * owner:  developer => anonymous

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1353>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 23:51:26 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 22 Jun 2006 03:51:26 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7406 - in
 /vtigercrm/trunk/modules/PurchaseOrder: DetailView.php EditView.php
Message-ID: <20060622035127.506A583F4B1@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 21:51:21 2006
New Revision: 7406

Log:
changes made to get validationdata removed

Modified:
    vtigercrm/trunk/modules/PurchaseOrder/DetailView.php
    vtigercrm/trunk/modules/PurchaseOrder/EditView.php

Modified: vtigercrm/trunk/modules/PurchaseOrder/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/PurchaseOrder/DetailView.php (original)
+++ vtigercrm/trunk/modules/PurchaseOrder/DetailView.php Wed Jun 21 21:51:21 2006
@@ -79,9 +79,8 @@
 //Get the associated Products and then display above Terms and Conditions
 $smarty->assign("ASSOCIATED_PRODUCTS",getDetailAssociatedProducts('PurchaseOrder',$focus));
 
- $po_tables = Array('purchaseorder','pobillads','poshipads','purchaseordercf');
  $tabid = getTabid("PurchaseOrder");
- $validationData = getDBValidationData($po_tables,$tabid);
+ $validationData = getDBValidationData($focus->tab_name,$tabid);
  $data = split_validationdataArray($validationData);
 
  $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']);

Modified: vtigercrm/trunk/modules/PurchaseOrder/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/PurchaseOrder/EditView.php (original)
+++ vtigercrm/trunk/modules/PurchaseOrder/EditView.php Wed Jun 21 21:51:21 2006
@@ -193,9 +193,8 @@
 
 
 
-$po_tables = Array('purchaseorder','pobillads','poshipads','purchaseordercf'); 
  $tabid = getTabid("PurchaseOrder");
- $validationData = getDBValidationData($po_tables,$tabid);
+ $validationData = getDBValidationData($focus->tab_name,$tabid);
  $data = split_validationdataArray($validationData);
 
  $smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']);




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 21 23:52:10 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 22 Jun 2006 03:52:10 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7407 -
	/vtigercrm/trunk/modules/PurchaseOrder/Forms.php
Message-ID: <20060622035210.B2F8683F4B1@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 21:52:07 2006
New Revision: 7407

Log:
forms.php has been removed

Removed:
    vtigercrm/trunk/modules/PurchaseOrder/Forms.php




From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 21 23:52:49 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 22 Jun 2006 03:52:49 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23644=3A_?=
 =?utf-8?q?logs_in_notification_schedular?=
In-Reply-To: <076.c1cfccb88b72051f409d50fc0c74708c@vtiger.fosslabs.com>
References: <076.c1cfccb88b72051f409d50fc0c74708c@vtiger.fosslabs.com>
Message-ID: <085.14800fd061834203b3b5b101923fb7bc@vtiger.fosslabs.com>

#644: logs in notification schedular
--------------------------------+-------------------------------------------
  Reporter:  minnie at vtiger.com  |       Owner:  minnie
      Type:  defect             |      Status:  closed
  Priority:  major              |   Milestone:  5.0.0 
 Component:  vtigercrm          |     Version:  5.0.0 
Resolution:  fixed              |    Keywords:        
--------------------------------+-------------------------------------------
Changes (by mangai):

  * resolution:  => fixed
  * status:  reopened => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/644>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 22 00:20:20 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 22 Jun 2006 04:20:20 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7408 -
 /vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
Message-ID: <20060622042020.A04F383F4B7@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 22:20:16 2006
New Revision: 7408

Log:
contact has been removed from event editview

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

Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original)
+++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Wed Jun 21 22:20:16 2006
@@ -549,16 +549,15 @@
  $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'duration_hours','vtiger_activity',1,'63','duration_hours','Duration',1,0,0,100,7,41,1,'I~M',0,5,'BAS')");
  $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'duration_minutes','vtiger_activity',1,'15','duration_minutes','Duration Minutes',1,0,0,100,8,41,3,'O~O',1,null,'BAS')");
  $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'crmid','vtiger_seactivityrel',1,'66','parent_id','Related To',1,0,0,100,9,41,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'contactid','vtiger_cntactivityrel',1,'57','contact_id','Contact Name',1,0,0,100,10,41,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'eventstatus','vtiger_activity',1,'15','eventstatus','Status',1,0,0,100,11,41,1,'V~O',0,3,'BAS')");
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'sendnotification','vtiger_activity',1,'56','sendnotification','Send Notification',1,0,0,100,12,41,1,'C~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'activitytype','vtiger_activity',1,'15','activitytype','Activity Type',1,0,0,100,13,41,1,'V~O',0,4,'BAS')");
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'location','vtiger_activity',1,'1','location','Location',1,0,0,100,14,41,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,15,41,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,16,41,2,'T~O',1,null,'BAS')");
- $this->db->query("Insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'priority','vtiger_activity',1,15,'taskpriority','Priority',1,0,0,100,17,41,1,'V~O',1,null,'BAS')");
- $this->db->query("Insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'notime','vtiger_activity',1,56,'notime','No Time',1,0,0,100,18,41,1,'C~O',1,null,'BAS')");
- $this->db->query("Insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'visibility','vtiger_activity',1,15,'visibility','Visibility',1,0,0,100,19,41,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'eventstatus','vtiger_activity',1,'15','eventstatus','Status',1,0,0,100,10,41,1,'V~O',0,3,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'sendnotification','vtiger_activity',1,'56','sendnotification','Send Notification',1,0,0,100,11,41,1,'C~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'activitytype','vtiger_activity',1,'15','activitytype','Activity Type',1,0,0,100,12,41,1,'V~O',0,4,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'location','vtiger_activity',1,'1','location','Location',1,0,0,100,13,41,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,14,41,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,15,41,2,'T~O',1,null,'BAS')");
+ $this->db->query("Insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'priority','vtiger_activity',1,15,'taskpriority','Priority',1,0,0,100,16,41,1,'V~O',1,null,'BAS')");
+ $this->db->query("Insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'notime','vtiger_activity',1,56,'notime','No Time',1,0,0,100,17,41,1,'C~O',1,null,'BAS')");
+ $this->db->query("Insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'visibility','vtiger_activity',1,15,'visibility','Visibility',1,0,0,100,18,41,1,'V~O',1,null,'BAS')");
  
  $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,43,1,'V~O',1,null,'BAS')");
  $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'reminder_time','vtiger_activity_reminder',1,'30','reminder_time','Send Reminder',1,0,0,100,1,42,1,'I~O',1,null,'BAS')");




From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 22 00:21:14 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 22 Jun 2006 04:21:14 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23940=3A_?=
 =?utf-8?q?contact_not_displayed_in_activity_relatedlit?=
In-Reply-To: <076.65ef01ee3bf555e0572b3067a1b9889c@vtiger.fosslabs.com>
References: <076.65ef01ee3bf555e0572b3067a1b9889c@vtiger.fosslabs.com>
Message-ID: <085.f29de87baf0454d45acc03b2c6f62b94@vtiger.fosslabs.com>

#940: contact not displayed in activity relatedlit
------------------------+---------------------------------------------------
  Reporter:  mickie     |       Owner:  minnie
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mangai):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/940>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 22 00:27:46 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 22 Jun 2006 04:27:46 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7409 - in
 /vtigercrm/trunk/Smarty/templates: DetailViewUI.tpl UserDetailView.tpl
Message-ID: <20060622042746.3719583F48D@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 21 22:27:35 2006
New Revision: 7409

Log:
Ajax edit added for UserDetailView

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

Modified: vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl Wed Jun 21 22:27:35 2006
@@ -13,7 +13,7 @@
 -->*}
 
 <!-- This file is used to display the fields based on the ui type in detailview -->
-		{if $keyid eq '1' || $keyid eq 2 || $keyid eq '11' || $keyid eq '7' || $keyid eq '9' || $keyid eq '55' || $keyid eq '71' || $keyid eq '72'} <!--TextBox-->
+		{if $keyid eq '1' || $keyid eq 2 || $keyid eq '11' || $keyid eq '7' || $keyid eq '9' || $keyid eq '55' || $keyid eq '71' || $keyid eq '72' || $keyid eq '103'} <!--TextBox-->
                                          		<td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">
                                          		      {if $keyid eq '55'}<!--SalutationSymbol-->
                                          		            {$keysalut}
@@ -27,7 +27,7 @@
                                               		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                                                        </div>
                                                   </td>
-                                             {elseif $keyid eq '13'} <!--Email-->
+                                             {elseif $keyid eq '13' || $keyid eq '104'} <!--Email-->
                                                   <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}"><a href="mailto:{$keyval}" target="_blank">{$keyval}</a></span>
                                               		<div id="editarea_{$label}" style="display:none;">
                                               		  <input class="detailedViewTextBox" onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" type="text" id="txtbox_{$label}" name="{$keyfldname}" maxlength='100' value="{$keyval}"></input>
@@ -48,6 +48,45 @@
                     							   <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
                                               		   <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                     							</div>
+               							</td>
+						{elseif $keyid eq '115'} <!--ComboBox Status edit only for admin Users-->
+								{if $keyadmin eq 1}
+               							<td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}">{$keyval}</span>
+                                              		<div id="editarea_{$label}" style="display:none;">
+                    							   <select id="txtbox_{$label}" name="{$keyfldname}">
+                    								{foreach item=arr from=$keyoptions}
+                    									{foreach key=sel_value item=value from=$arr}
+                    										<option value="{$sel_value}" {$value}>{$sel_value}</option>
+                    									{/foreach}
+                    								{/foreach}
+                    							   </select>
+                    							   <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                              		   <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
+                    							</div>
+								{else}
+               							<td width=25% class="dvtCellInfo" align="left">{$keyval}
+								{/if}	
+								
+               							</td>
+						{elseif $keyid eq '116'} <!--ComboBox currency id edit only for admin Users-->
+								{if $keyadmin eq 1}
+               							<td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}">{$keyval}</span>
+								<div id="editarea_{$label}" style="display:none;">
+                    							   <select id="txtbox_{$label}" name="{$keyfldname}">
+									{foreach item=arr key=uivalueid from=$keyoptions}
+									{foreach key=sel_value item=value from=$arr}
+										<option value="{$uivalueid}" {$value}>{$sel_value}</option>	
+									{/foreach}
+									{/foreach}
+                    							   </select>
+                    							   <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                              		   <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
+                    							</div>
+								{else}
+               							<td width=25% class="dvtCellInfo" align="left">{$keyval}
+								{/if}	
+
+                                        		
                							</td>
                                              {elseif $keyid eq '17'} <!--WebSite-->
                                                   <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}"><a href="http://{$keyval}" target="_blank">{$keyval}</a></span>
@@ -170,7 +209,24 @@
                          <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');"/> or
                           <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                         </div>
-                        </td>     
+                        </td>    
+			{elseif $keyid eq '156'} <!--CheckBox for is admin-->
+			{if $smarty.request.record neq $CURRENT_USERID && $keyadmin eq 1} 
+                      <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onMouseOver="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}">{$keyval}&nbsp;</span>
+                    	<div id="editarea_{$label}" style="display:none;">
+                        {if $keyval eq 'on'}                                              		  
+                            <input id="txtbox_{$label}" name="{$keyfldname}" type="checkbox" style="border:1px solid #bababa;" checked value="1">
+                        {else}
+                          <input id="txtbox_{$label}" type="checkbox" name="{$keyfldname}" style="border:1px solid #bababa;" value="0">
+                       	{/if}
+                         <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');"/> or
+                          <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
+                        </div>
+			{else}
+				 <td width=25% class="dvtCellInfo" align="left">{$keyval}
+			{/if}
+                        </td>    
+			 
 						{elseif $keyid eq 83}<!-- Handle the Tax in Inventory -->
 							<td align="right" class="dvtCellLabel">
 							{$APP.LBL_VAT} {$APP.COVERED_PERCENTAGE}

Modified: vtigercrm/trunk/Smarty/templates/UserDetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/UserDetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/UserDetailView.tpl Wed Jun 21 22:27:35 2006
@@ -1,174 +1,183 @@
-{*<!--
-/*********************************************************************************
-  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
-   * ("License"); You may not use this file except in compliance with the License
-   * The Original Code is:  vtiger CRM Open Source
-   * The Initial Developer of the Original Code is vtiger.
-   * Portions created by vtiger are Copyright (C) vtiger.
-   * All Rights Reserved.
-  *
- ********************************************************************************/
--->*}
-<script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
-<script language="JavaScript" type="text/javascript" src="include/js/ColorPicker2.js"></script>
-<script language="javascript" type="text/javascript" src="include/js/general.js"></script>
-<script language="JavaScript" type="text/javascript" src="include/js/dtlviewajax.js"></script>
-<span id="crmspanid" style="display:none;position:absolute;"  onmouseover="show('crmspanid');">
-   <a class="link"  align="right" href="javascript:;">Edit</a>
-</span>
-
-<style type="text/css">@import url(themes/blue/style.css);</style>
-
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-<tr>
-{if $CATEGORY eq 'Settings'}
-	{include file='SettingsMenu.tpl'}
-{/if}
-<td width="75%" valign="top">
-<table width="100%"  border="0" cellspacing="0" cellpadding="0">
-	<tr><td class="padTab" align="left">
-		<table width="100%" border="0" cellpadding="0" cellspacing="0">
-		<form name="DetailView" method="POST" action="index.php" ENCTYPE="multipart/form-data" id="form">
-			<input type="hidden" name="module" value="Users">
-			<input type="hidden" name="record" value="{$ID}">
-			<input type="hidden" name="isDuplicate" value=false>
-			<input type="hidden" name="action">
-
-{if $CATEGORY eq 'Settings'}
-			<input type="hidden" name="modechk" value="prefview">
-{/if}
-			<input type="hidden" name="user_name" value="{$USER_NAME}">
-			<input type="hidden" name="old_password">
-			<input type="hidden" name="new_password">
-			<input type="hidden" name="return_module">
-			<input type="hidden" name="return_action">
-			<input type="hidden" name="return_id">
-			<input type="hidden" name="forumDisplay">
-{if $CATEGORY eq 'Settings'}
-			<input type="hidden" name="parenttab" value="{$PARENTTAB}">
-{/if}	
-
-			<tr>
-				<td style="border-bottom:1px dashed #CCCCCC;">
-					<table width="100%" cellpadding="5" cellspacing="0" border="0">
-					<tr>
-						<td colspan="2" style="padding:5px;">
-						{if $CATEGORY eq 'Settings'}
-							<span class="lvtHeaderText">
-							<b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS} </a> > {$MOD.LBL_USER_MANAGEMENT} > {$MOD.LBL_USERS}</b></span>
-						{else}
-							<span class="lvtHeaderText">	
-							<b>{$APP.LBL_MY_PREFERENCES}</b>
-							</span>
-						{/if}
-											
-				<hr noshade="noshade" size="1" />
-											</td>
-									  </tr>
-									<tr>
-											<td width="5%"><img src="{$IMAGE_PATH}user.gif" align="absmiddle"></td>
-											<td width="95%"><span class="genHeaderGrayBig">{$USER_NAME}</span><br>
-												<b class="small">{$UMOD.LBL_DETAIL_VIEW} {$FIRST_NAME} {$LAST_NAME}</b>
-											</td>
-									</tr>
-							</table>
-					</td>
-			</tr>
-			<tr><td>&nbsp;</td></tr>
-			<tr valign="center">
-			        <td class="small" align="center">
-					{$EDIT_BUTTON}
-				{$CHANGE_PW_BUTTON}
-				{$LOGIN_HISTORY_BUTTON}
-			{if $CATEGORY eq 'Settings'}
-				{$DUPLICATE_BUTTON}
-			{/if}	
-				{$CHANGE_HOMEPAGE_BUTTON}	
-				{$LISTROLES_BUTTON}
-	</td></tr>
-
-		<tr><td colspan="2">&nbsp;</td></tr>
-		<tr><td colspan="2">
-		<table align="center" border="0" cellpadding="0" cellspacing="0" width="99%">
-		  
-		  <tr>
-			<td>
-			  <table class="small" border="0" cellpadding="3" cellspacing="0" width="100%">
-			  <tr >
-			        <td id="prof" width="25%" align="center" nowrap="nowrap" class="dvtSelectedCell" onClick="fnVis('prof')"><b>{$UMOD.LBL_USER_LOGIN_ROLE}</b></td>
-			     <td class="dvtTabCache" width="10" nowrap="nowrap">&nbsp;</td>
-				    <td class="dvtTabCache" nowrap="nowrap" width="10">&nbsp;</td>
-			  </tr>
-			  </table>
-			</td>
-		  </tr>
-		  <tr>
-		  	<td align="left" valign="top">
-				{foreach key=header item=detail from=$BLOCKS}
-				<table border=0 cellspacing=0 cellpadding=0 width=100% class="small">
-  		    	<tr>
-    	               <td>&nbsp;</td>
-        	           <td>&nbsp;</td>
-            	       <td>&nbsp;</td>
-                	   <td align=right>
-				</tr>  
-				<tr>
-						{strip}
-					     <td colspan=4 style="border-bottom:1px solid #999999;padding:5px;" bgcolor="#e5e5e5">
-							<b>	{$header}</b>
-						 </td>
-						 {/strip}
-			    </tr>
-					{foreach item=detail from=$detail}
-					<tr style="height:25px">
-							{foreach key=label item=data from=$detail}
-							   {assign var=keyid value=$data.ui}
-							   {assign var=keyval value=$data.value}
-							   {assign var=keytblname value=$data.tablename}
-							   {assign var=keyfldname value=$data.fldname}
-							   {assign var=keyoptions value=$data.options}
-							   {assign var=keysecid value=$data.secid}
-							   {assign var=keyseclink value=$data.link}
-							   {assign var=keycursymb value=$data.cursymb}
-							   {assign var=keysalut value=$data.salut}
-							   {assign var=keycntimage value=$data.cntimage}
-							   {assign var=keyadmin value=$data.isadmin}
-							   
-							   <input type="hidden" id="hdtxt_IsAdmin" value={$keyadmin}></input>
-							   	{if $label ne ''}
-									<td class="dvtCellLabel" align=right width=25%>{$label}</td>
-									{include file="DetailViewUI.tpl"}
-								{else}
-                                    <td class="dvtCellLabel" align=right>&nbsp;</td>
-                                    <td class="dvtCellInfo" align=left >&nbsp;</td>
-				{/if}	
-							{/foreach}
-			 	</tr>
-					{/foreach}
-					</table>
-				 {/foreach}
-
-			</td>
-			</tr>
-			
-	        <tr><td>&nbsp;</td></tr>
-			
-	  </table>
-
-
-
-</td></tr>
-</table>
-</form>
-</td></tr>
-</table>
-</td></tr>
-</table>
-</td>
-</tr>
-</table>
-
-{$JAVASCRIPT}
-{if $CATEGORY eq 'Settings'}
-	{include file='SettingsSubMenu.tpl'}
-{/if}
+{*<!--
+/*********************************************************************************
+  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
+   * ("License"); You may not use this file except in compliance with the License
+   * The Original Code is:  vtiger CRM Open Source
+   * The Initial Developer of the Original Code is vtiger.
+   * Portions created by vtiger are Copyright (C) vtiger.
+   * All Rights Reserved.
+  *
+ ********************************************************************************/
+-->*}
+<script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
+<script language="JavaScript" type="text/javascript" src="include/js/ColorPicker2.js"></script>
+<script language="javascript" type="text/javascript" src="include/js/general.js"></script>
+<script language="JavaScript" type="text/javascript" src="include/js/dtlviewajax.js"></script>
+<span id="crmspanid" style="display:none;position:absolute;"  onmouseover="show('crmspanid');">
+   <a class="link"  align="right" href="javascript:;">Edit</a>
+</span>
+
+<style type="text/css">@import url(themes/blue/style.css);</style>
+
+<table width="100%" border="0" cellpadding="0" cellspacing="0">
+<tr>
+{if $CATEGORY eq 'Settings'}
+	{include file='SettingsMenu.tpl'}
+{/if}
+<td width="75%" valign="top">
+
+<table width="100%"  border="0" cellspacing="0" cellpadding="0">
+	<tr><td class="padTab" align="left">
+		<table width="100%" border="0" cellpadding="0" cellspacing="0">
+		<form name="DetailView" method="POST" action="index.php" ENCTYPE="multipart/form-data" id="form">
+			<input type="hidden" name="module" value="Users">
+			<input type="hidden" name="record" value="{$ID}">
+			<input type="hidden" name="isDuplicate" value=false>
+			<input type="hidden" name="action">
+
+{if $CATEGORY eq 'Settings'}
+			<input type="hidden" name="modechk" value="prefview">
+{/if}
+			<input type="hidden" name="user_name" value="{$USER_NAME}">
+			<input type="hidden" name="old_password">
+			<input type="hidden" name="new_password">
+			<input type="hidden" name="return_module">
+			<input type="hidden" name="return_action">
+			<input type="hidden" name="return_id">
+			<input type="hidden" name="forumDisplay">
+{if $CATEGORY eq 'Settings'}
+			<input type="hidden" name="parenttab" value="{$PARENTTAB}">
+{/if}	
+
+			<tr>
+				<td style="border-bottom:1px dashed #CCCCCC;">
+					<table width="100%" cellpadding="5" cellspacing="0" border="0">
+					<tr>
+						<td colspan=2 style="padding:5px;">
+						{if $CATEGORY eq 'Settings'}
+							<span class="lvtHeaderText">
+							<b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS} </a> > {$MOD.LBL_USER_MANAGEMENT} > {$MOD.LBL_USERS}</b></span>
+						{else}
+							<span class="lvtHeaderText">	
+							<b>{$APP.LBL_MY_PREFERENCES}</b>
+							</span>
+						{/if}
+						<span id="vtbusy_info" style="display:none;" valign="bottom"><img src="{$IMAGE_PATH}vtbusy.gif" border="0"></span>					
+				<hr noshade="noshade" size="1" />
+						</td>
+						<td align="right"><hr noshade="noshade" size="1" /></td>
+									  </tr>
+									<tr>
+											<td width="5%"><img src="{$IMAGE_PATH}user.gif" align="absmiddle"></td>
+											<td width="95%"><span class="genHeaderGrayBig">{$USER_NAME}</span><br>
+												<b class="small">{$UMOD.LBL_DETAIL_VIEW} {$FIRST_NAME} {$LAST_NAME}</b>
+											</td>
+									</tr>
+							</table>
+					</td>
+			</tr>
+			<tr><td>&nbsp;</td></tr>
+			<tr valign="center">
+			        <td class="small" align="center">
+					{$EDIT_BUTTON}
+				{$CHANGE_PW_BUTTON}
+				{$LOGIN_HISTORY_BUTTON}
+			{if $CATEGORY eq 'Settings'}
+				{$DUPLICATE_BUTTON}
+			{/if}	
+				{$CHANGE_HOMEPAGE_BUTTON}	
+				{$LISTROLES_BUTTON}
+	</td></tr>
+
+		<tr><td colspan="2">&nbsp;</td></tr>
+		<tr><td colspan="2">
+		<table align="center" border="0" cellpadding="0" cellspacing="0" width="99%">
+		  
+		  <tr>
+			<td>
+			  <table class="small" border="0" cellpadding="3" cellspacing="0" width="100%">
+			  <tr >
+			        <td id="prof" width="25%" align="center" nowrap="nowrap" class="dvtSelectedCell" onClick="fnVis('prof')"><b>{$UMOD.LBL_USER_LOGIN_ROLE}</b></td>
+			     <td class="dvtTabCache" width="10" nowrap="nowrap">&nbsp;</td>
+				    <td class="dvtTabCache" nowrap="nowrap" width="10">&nbsp;</td>
+			  </tr>
+			  </table>
+			</td>
+		  </tr>
+		  <tr>
+		  	<td align="left" valign="top">
+				{foreach key=header item=detail from=$BLOCKS}
+				<table border=0 cellspacing=0 cellpadding=0 width=100% class="small">
+  		    	<tr>
+    	               <td>&nbsp;</td>
+        	           <td>&nbsp;</td>
+            	       <td>&nbsp;</td>
+                	   <td align=right>
+				</tr>  
+				<tr>
+						{strip}
+					     <td colspan=4 style="border-bottom:1px solid #999999;padding:5px;" bgcolor="#e5e5e5">
+							<b>	{$header}</b>
+						 </td>
+						 {/strip}
+			    </tr>
+					{foreach item=detail from=$detail}
+					<tr style="height:25px">
+							{foreach key=label item=data from=$detail}
+							   {assign var=keyid value=$data.ui}
+							   {assign var=keyval value=$data.value}
+							   {assign var=keytblname value=$data.tablename}
+							   {assign var=keyfldname value=$data.fldname}
+							   {assign var=keyoptions value=$data.options}
+							   {assign var=keysecid value=$data.secid}
+							   {assign var=keyseclink value=$data.link}
+							   {assign var=keycursymb value=$data.cursymb}
+							   {assign var=keysalut value=$data.salut}
+							   {assign var=keycntimage value=$data.cntimage}
+							   {assign var=keyadmin value=$data.isadmin}
+							   
+							   <input type="hidden" id="hdtxt_IsAdmin" value={$keyadmin}></input>
+							   	{if $label ne ''}
+									<td class="dvtCellLabel" align=right width=25%>{$label}</td>
+									{include file="DetailViewUI.tpl"}
+								{else}
+                                    <td class="dvtCellLabel" align=right>&nbsp;</td>
+                                    <td class="dvtCellInfo" align=left >&nbsp;</td>
+				{/if}	
+							{/foreach}
+			 	</tr>
+					{/foreach}
+					</table>
+				 {/foreach}
+
+			</td>
+			</tr>
+			
+	        <tr><td>&nbsp;</td></tr>
+			
+	  </table>
+
+
+
+</td></tr>
+</table>
+</form>
+</td></tr>
+</table>
+</td></tr>
+</table>
+</td>
+</tr>
+</table>
+
+{$JAVASCRIPT}
+{if $CATEGORY eq 'Settings'}
+	{include file='SettingsSubMenu.tpl'}
+{/if}
+
+<!-- added for validation -->
+<script language="javascript">
+  var fieldname = new Array({$VALIDATION_DATA_FIELDNAME});
+  var fieldlabel = new Array({$VALIDATION_DATA_FIELDLABEL});
+  var fielddatatype = new Array({$VALIDATION_DATA_FIELDDATATYPE});
+</script>




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 22 00:33:34 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 22 Jun 2006 04:33:34 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7410 - in
 /vtigercrm/trunk/include/js: dtlviewajax.js general.js
Message-ID: <20060622043334.98BDF83F48D@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 21 22:33:24 2006
New Revision: 7410

Log:
Ajax edit added for UserDetailView

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

Modified: vtigercrm/trunk/include/js/dtlviewajax.js
==============================================================================
--- vtigercrm/trunk/include/js/dtlviewajax.js (original)
+++ vtigercrm/trunk/include/js/dtlviewajax.js Wed Jun 21 22:33:24 2006
@@ -117,6 +117,17 @@
 			tagValue = "0";
 		}
 	}
+	if(uitype == '156')
+	{
+		if(document.getElementById(txtBox).checked == true)
+		{
+			tagValue = "on";
+		}else
+		{
+			tagValue = "off";
+		}
+	}
+
 
 	var data = "file=DetailViewAjax&module=" + module + "&action=" + module + "Ajax&record=" + crmId+"&recordid=" + crmId ;
 	data = data + "&fldName=" + fieldName + "&fieldValue=" + escape(tagValue) + "&ajxaction=DETAILVIEW";
@@ -131,13 +142,13 @@
 					alert("Error while Editing");
 				}
 				else if(response.responseText.indexOf(":#:SUCCESS")>-1)
-    			{
+     				{
 					$("vtbusy_info").style.display="none";
-    			}
-           	}
-        }
+     				}
+                       	}
+                }
         );
-	if(uitype == '13')
+	if(uitype == '13' || uitype == '104')
 	{
 		getObj(dtlView).innerHTML = "<a href=\"mailto:"+ tagValue+"\" target=\"_blank\">"+tagValue+"&nbsp;</a>";
 	}
@@ -166,8 +177,10 @@
 			getObj(dtlView).innerHTML = "";
 		}
 
-	}
-
+	}else if(uitype == 116)
+	{
+			getObj(dtlView).innerHTML = document.getElementById(txtBox).options[document.getElementById(txtBox).selectedIndex].text; 
+	}
 	else if(getObj(popupTxt))
 	{
 		var popObj = getObj(popupTxt);
@@ -226,8 +239,7 @@
 		{
 			getObj(dtlView).innerHTML = popObj.value;
 		}
-	}
-	else
+	}else
 	{
 		getObj(dtlView).innerHTML = tagValue;
 	}

Modified: vtigercrm/trunk/include/js/general.js
==============================================================================
--- vtigercrm/trunk/include/js/general.js (original)
+++ vtigercrm/trunk/include/js/general.js Wed Jun 21 22:33:24 2006
@@ -1076,6 +1076,26 @@
                 getObj("assign_team").style.display="block"
         }
 }
+//to display type of address for google map
+function showLocateMapMenu()
+    {
+            getObj("dropDownMenu").style.display="block"
+            getObj("dropDownMenu").style.left=findPosX(getObj("locateMap"))
+            getObj("dropDownMenu").style.top=findPosY(getObj("locateMap"))+getObj("locateMap").offsetHeight
+    }
+
+
+function hideLocateMapMenu(ev)
+    {
+            if (browser_ie)
+                    currElement=window.event.srcElement
+            else if (browser_nn4 || browser_nn6)
+                    currElement=ev.target
+
+            if (currElement.id!="locateMap")
+                    if (getObj("dropDownMenu").style.display=="block")
+                            getObj("dropDownMenu").style.display="none"
+    }
 /*
 * javascript function to display the div tag
 * @param divId :: div tag ID




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 22 00:35:21 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 22 Jun 2006 04:35:21 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7411 - in
 /vtigercrm/trunk/modules/Users: DetailView.php DetailViewAjax.php
Message-ID: <20060622043521.9528283F48D@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 21 22:35:07 2006
New Revision: 7411

Log:
Ajax edit added for UserDetailView

Added:
    vtigercrm/trunk/modules/Users/DetailViewAjax.php
Modified:
    vtigercrm/trunk/modules/Users/DetailView.php

Modified: vtigercrm/trunk/modules/Users/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DetailView.php (original)
+++ vtigercrm/trunk/modules/Users/DetailView.php Wed Jun 21 22:35:07 2006
@@ -1,183 +1,191 @@
-<?php
-/*********************************************************************************
- * The contents of this file are subject to the SugarCRM Public License Version 1.1.2
- * ("License"); You may not use this file except in compliance with the
- * License. You may obtain a copy of the License at http://www.sugarcrm.com/SPL
- * Software distributed under the License is distributed on an  "AS IS"  basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
- * the specific language governing rights and limitations under the License.
- * The Original Code is:  SugarCRM Open Source
- * The Initial Developer of the Original Code is SugarCRM, Inc.
- * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.;
- * All Rights Reserved.
- * Contributor(s): ______________________________________.
- ********************************************************************************/
-/*********************************************************************************
- * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Users/DetailView.php,v 1.21 2005/04/19 14:44:02 ray Exp $
- * Description:  TODO: To be written.
- * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
- * All Rights Reserved.
- * Contributor(s): ______________________________________..
- ********************************************************************************/
-
-require_once('Smarty_setup.php');
-require_once('data/Tracker.php');
-require_once('modules/Users/User.php');
-require_once('include/utils/utils.php');
-require_once('include/utils/CommonUtils.php');
-require_once('include/utils/UserInfoUtil.php');
-require_once('include/database/PearDatabase.php');
-
-global $current_user;
-global $theme;
-global $default_language;
-global $adb;
-global $currentModule;
-global $app_strings;
-global $mod_strings;
-
-$focus = new User();
-
-if(!empty($_REQUEST['record'])) {
-	$focus->retrieve_entity_info($_REQUEST['record'],'Users');
-	$focus->id = $_REQUEST['record'];	
-}
-else
-{
-
-    echo "
-        <script type='text/javascript'>
-            window.location = 'index.php?module=Users&action=ListView';
-        </script>
-        ";
-}
-
-if( $focus->user_name == "" )
-{  
-   
-    echo "
-            <table>
-                <tr>
-                    <td>
-                        <b>User does not exist.</b>
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <a href='index.php?module=Users&action=ListView'>List Users</a>
-                    </td>
-                </tr>
-            </table>
-        ";
-    exit;  
-}
-
-
-if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') {
-	$focus->id = "";
-}
-
-global $theme;
-$theme_path="themes/".$theme."/";
-$image_path=$theme_path."images/";
-require_once($theme_path.'layout_utils.php');
-
-//the user might belong to multiple groups
-if($focus->id != 1)
-{
- $groupids = fetchUserGroupids($focus->id);
-}
-$log->info("User detail view");
-
-$category = getParenttab();
-
-$smarty = new vtigerCRM_Smarty;
-
-$smarty->assign("UMOD", $mod_strings);
-global $current_language;
-$smod_strings = return_module_language($current_language, 'Settings');
-$smarty->assign("MOD", $smod_strings);
-
-$smarty->assign("APP", $app_strings);
-
-$smarty->assign("THEME", $theme);
-$smarty->assign("IMAGE_PATH", $image_path);$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']);
-$smarty->assign("ID", $focus->id);
-$smarty->assign("CATEGORY", $category);
-if(isset($focus->imagename) && $focus->imagename!='')
-{
-	$imagestring="<div id='track1' style='margin: 4px 0pt 0pt 10px; width: 200px; background-image: url(themes/images/scaler_slider_track.gif); background-repeat: repeat-x; background-position: left center; height: 18px;'>
-	<div class='selected' id='handle1' style='width: 18px; height: 18px; position: relative; left: 145px;cursor:pointer;'><img src='themes/images/scaler_slider.gif'></div>
-	</div><script language='JavaScript' type='text/javascript' src='include/js/prototype.js'></script>
-<script language='JavaScript' type='text/javascript' src='include/js/slider.js'></script>
-
-	<div class='scale-image' style='padding: 10px; float: left; width: 83.415px;'><img src='test/user/".$focus->imagename."' width='100%'</div>
-	<p><script type='text/javascript' src='include/js/scale_demo.js'></script></p>";
-	//$smarty->assign("USER_IMAGE",$imagestring);
-}
-				
-if(isset($_REQUEST['modechk']) && $_REQUEST['modechk'] != '' )
-{
-	$modepref = $_REQUEST['modechk'];
-}
-	if($_REQUEST['modechk'] == 'prefview')
-		$parenttab = '';
-	else
-		$parenttab = 'Settings';
-
-$smarty->assign("PARENTTAB", $parenttab);
-
-if ((is_admin($current_user) || $_REQUEST['record'] == $current_user->id)
-		&& isset($default_user_name)
-		&& $default_user_name == $focus->user_name
-		&& isset($lock_default_user_name)
-		&& $lock_default_user_name == true	) {
-	$buttons = "<input title='".$app_strings['LBL_EDIT_BUTTON_TITLE']."' accessKey='".$app_strings['LBL_EDIT_BUTTON_KEY']."' class='classBtn' onclick=\"this.form.return_module.value='Users'; this.form.return_action.value='DetailView'; this.form.return_id.value='$focus->id'; this.form.action.value='EditView'; this.form.parenttab.value='$parenttab'\" type='submit' name='Edit' value='  ".$app_strings['LBL_EDIT_BUTTON_LABEL']."  '>";
-	$smarty->assign('EDIT_BUTTON',$buttons);
-}
-elseif (is_admin($current_user) || $_REQUEST['record'] == $current_user->id) {
-	$buttons = "<input title='".$app_strings['LBL_EDIT_BUTTON_TITLE']."' accessKey='".$app_strings['LBL_EDIT_BUTTON_KEY']."' class='classBtn' onclick=\"this.form.return_module.value='Users'; this.form.return_action.value='DetailView'; this.form.return_id.value='$focus->id'; this.form.action.value='EditView'; this.form.parenttab.value='$parenttab'\" type='submit' name='Edit' value='  ".$app_strings['LBL_EDIT_BUTTON_LABEL']."  '>";
-	$smarty->assign('EDIT_BUTTON',$buttons);
-	
-		$buttons = "<input title='".$mod_strings['LBL_CHANGE_PASSWORD_BUTTON_TITLE']."' accessKey='".$mod_strings['LBL_CHANGE_PASSWORD_BUTTON_KEY']."' class='classBtn' LANGUAGE=javascript onclick='return window.open(\"index.php?module=Users&action=ChangePassword&form=DetailView\",\"test\",\"width=320,height=165,resizable=no,scrollbars=0, toolbar=no, titlebar=no, left=100, top=126, screenX=100, screenY=126\");' type='button' name='password' value='".$mod_strings['LBL_CHANGE_PASSWORD_BUTTON_LABEL']."'>";
-		$smarty->assign('CHANGE_PW_BUTTON',$buttons);
-	
-	$buttons = "<input title='".$mod_strings['LBL_LOGIN_HISTORY_BUTTON_TITLE']."' accessKey='".$mod_strings['LBL_LOGIN_HISTORY_BUTTON_KEY']."' class='classBtn' onclick=\"this.form.return_module.value='Users'; this.form.return_action.value='ShowHistory'; this.form.return_id.value='$focus->id'; this.form.action.value='ShowHistory'\" type='submit' name='LoginHistory' value=' ".$mod_strings['LBL_LOGIN_HISTORY_BUTTON_LABEL']." '>";	
-	$smarty->assign('LOGIN_HISTORY_BUTTON',$buttons);
-	$buttons = "<input title='".$mod_strings['LBL_LIST_MAILSERVER_BUTTON_TITLE']."' accessKey='".$mod_strings['LBL_LIST_MAILSERVER_BUTTON_KEY']."' class='classBtn' onclick=\"this.form.return_module.value='Users'; this.form.return_action.value='ListMailAccount'; this.form.return_id.value='$focus->id'; this.form.module.value='Settings' ;this.form.action.value='ListMailAccount'\" type='submit' name='ListMailServerAccount' value=' ".$mod_strings['LBL_LIST_MAILSERVER_BUTTON_LABEL']." '>";
-	$smarty->assign('LIST_MAILSERVER_BUTTON',$buttons);
-	$buttons = "<input title='".$mod_strings['LBL_CHANGE_HOMEPAGE_TITLE']."' class='classBtn' align='center' onclick=\"this.form.return_module.value='Users';  this.form.return_action.value='DetailView';  this.form.action.value='EditHomeOrder';  this.form.record.value='$focus->id';\"  type='submit' name='EditHomeOrder'  value='  ".$mod_strings['LBL_CHANGE_HOMEPAGE_LABEL']."  '>";
-	$smarty->assign('CHANGE_HOMEPAGE_BUTTON',$buttons);
-
-	
-}
-if (is_admin($current_user)) 
-{
-	$buttons = "<input title='".$app_strings['LBL_DUPLICATE_BUTTON_TITLE']."' accessKey='".$app_strings['LBL_DUPLICATE_BUTTON_KEY']."' class='classBtn' onclick=\"this.form.return_module.value='Users'; this.form.return_action.value='DetailView'; this.form.isDuplicate.value=true; this.form.return_id.value='".$_REQUEST['record']."';this.form.action.value='EditView'\" type='submit' name='Duplicate' value=' ".$app_strings['LBL_DUPLICATE_BUTTON_LABEL']."'   >";
-	$smarty->assign('DUPLICATE_BUTTON',$buttons);
-	
-	//done so that only the admin user can see the customize tab button
-	if($_REQUEST['record'] != $current_user->id)
-	{
-		$buttons = "<input title='".$app_strings['LBL_DELETE_BUTTON_TITLE']."' accessKey='".$app_strings['LBL_DELETE_BUTTON_KEY']."' class='classBtn' onclick=\"deleteUser('$focus->id')\" type='button' name='Delete' value='  ".$app_strings['LBL_DELETE_BUTTON_LABEL']."  '>";
-		$smarty->assign('DELETE_BUTTON',$buttons);
-	}
-
-	if($_SESSION['authenticated_user_roleid'] == 'administrator')
-	{
-		$buttons = "<input title='".$app_strings['LBL_LISTROLES_BUTTON_TITLE']."' accessKey='".$app_strings['LBL_LISTROLES_BUTTON_KEY']."' class='classBtn' onclick=\"this.form.return_module.value='Users'; this.form.return_action.value='TabCustomise'; this.form.action.value='listroles'; this.form.record.value= '". $current_user->id ."'\" type='submit' name='ListRoles' value=' ".$app_strings['LBL_LISTROLES_BUTTON_LABEL']." '>";
-		$smarty->assign('LISTROLES_BUTTON',$buttons);
-	}
-
-}
-
-
-
-$smarty->assign("MODULE", 'Settings');
-$smarty->assign("BLOCKS", getBlocks($currentModule,"detail_view",'',$focus->column_fields));
-
-
-        $smarty->display("UserDetailView.tpl");
-
-
-?>
+<?php
+/*********************************************************************************
+ * The contents of this file are subject to the SugarCRM Public License Version 1.1.2
+ * ("License"); You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at http://www.sugarcrm.com/SPL
+ * Software distributed under the License is distributed on an  "AS IS"  basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
+ * the specific language governing rights and limitations under the License.
+ * The Original Code is:  SugarCRM Open Source
+ * The Initial Developer of the Original Code is SugarCRM, Inc.
+ * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.;
+ * All Rights Reserved.
+ * Contributor(s): ______________________________________.
+ ********************************************************************************/
+/*********************************************************************************
+ * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Users/DetailView.php,v 1.21 2005/04/19 14:44:02 ray Exp $
+ * Description:  TODO: To be written.
+ * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
+ * All Rights Reserved.
+ * Contributor(s): ______________________________________..
+ ********************************************************************************/
+
+require_once('Smarty_setup.php');
+require_once('data/Tracker.php');
+require_once('modules/Users/User.php');
+require_once('include/utils/utils.php');
+require_once('include/utils/CommonUtils.php');
+require_once('include/utils/UserInfoUtil.php');
+require_once('include/database/PearDatabase.php');
+
+global $current_user;
+global $theme;
+global $default_language;
+global $adb;
+global $currentModule;
+global $app_strings;
+global $mod_strings;
+
+$focus = new User();
+
+if(!empty($_REQUEST['record'])) {
+	$focus->retrieve_entity_info($_REQUEST['record'],'Users');
+	$focus->id = $_REQUEST['record'];	
+}
+else
+{
+
+    echo "
+        <script type='text/javascript'>
+            window.location = 'index.php?module=Users&action=ListView';
+        </script>
+        ";
+}
+
+if( $focus->user_name == "" )
+{  
+   
+    echo "
+            <table>
+                <tr>
+                    <td>
+                        <b>User does not exist.</b>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <a href='index.php?module=Users&action=ListView'>List Users</a>
+                    </td>
+                </tr>
+            </table>
+        ";
+    exit;  
+}
+
+
+if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') {
+	$focus->id = "";
+}
+
+global $theme;
+$theme_path="themes/".$theme."/";
+$image_path=$theme_path."images/";
+require_once($theme_path.'layout_utils.php');
+
+//the user might belong to multiple groups
+if($focus->id != 1)
+{
+ $groupids = fetchUserGroupids($focus->id);
+}
+$log->info("User detail view");
+
+$category = getParenttab();
+
+$smarty = new vtigerCRM_Smarty;
+
+$smarty->assign("UMOD", $mod_strings);
+global $current_language;
+$smod_strings = return_module_language($current_language, 'Settings');
+$smarty->assign("MOD", $smod_strings);
+
+$smarty->assign("APP", $app_strings);
+
+$smarty->assign("THEME", $theme);
+$smarty->assign("IMAGE_PATH", $image_path);$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']);
+$smarty->assign("ID", $focus->id);
+$smarty->assign("CATEGORY", $category);
+if(isset($focus->imagename) && $focus->imagename!='')
+{
+	$imagestring="<div id='track1' style='margin: 4px 0pt 0pt 10px; width: 200px; background-image: url(themes/images/scaler_slider_track.gif); background-repeat: repeat-x; background-position: left center; height: 18px;'>
+	<div class='selected' id='handle1' style='width: 18px; height: 18px; position: relative; left: 145px;cursor:pointer;'><img src='themes/images/scaler_slider.gif'></div>
+	</div><script language='JavaScript' type='text/javascript' src='include/js/prototype.js'></script>
+<script language='JavaScript' type='text/javascript' src='include/js/slider.js'></script>
+
+	<div class='scale-image' style='padding: 10px; float: left; width: 83.415px;'><img src='test/user/".$focus->imagename."' width='100%'</div>
+	<p><script type='text/javascript' src='include/js/scale_demo.js'></script></p>";
+	//$smarty->assign("USER_IMAGE",$imagestring);
+}
+				
+if(isset($_REQUEST['modechk']) && $_REQUEST['modechk'] != '' )
+{
+	$modepref = $_REQUEST['modechk'];
+}
+	if($_REQUEST['modechk'] == 'prefview')
+		$parenttab = '';
+	else
+		$parenttab = 'Settings';
+
+$smarty->assign("PARENTTAB", $parenttab);
+
+if ((is_admin($current_user) || $_REQUEST['record'] == $current_user->id)
+		&& isset($default_user_name)
+		&& $default_user_name == $focus->user_name
+		&& isset($lock_default_user_name)
+		&& $lock_default_user_name == true	) {
+	$buttons = "<input title='".$app_strings['LBL_EDIT_BUTTON_TITLE']."' accessKey='".$app_strings['LBL_EDIT_BUTTON_KEY']."' class='classBtn' onclick=\"this.form.return_module.value='Users'; this.form.return_action.value='DetailView'; this.form.return_id.value='$focus->id'; this.form.action.value='EditView'; this.form.parenttab.value='$parenttab'\" type='submit' name='Edit' value='  ".$app_strings['LBL_EDIT_BUTTON_LABEL']."  '>";
+	$smarty->assign('EDIT_BUTTON',$buttons);
+}
+elseif (is_admin($current_user) || $_REQUEST['record'] == $current_user->id) {
+	$buttons = "<input title='".$app_strings['LBL_EDIT_BUTTON_TITLE']."' accessKey='".$app_strings['LBL_EDIT_BUTTON_KEY']."' class='classBtn' onclick=\"this.form.return_module.value='Users'; this.form.return_action.value='DetailView'; this.form.return_id.value='$focus->id'; this.form.action.value='EditView'; this.form.parenttab.value='$parenttab'\" type='submit' name='Edit' value='  ".$app_strings['LBL_EDIT_BUTTON_LABEL']."  '>";
+	$smarty->assign('EDIT_BUTTON',$buttons);
+	
+		$buttons = "<input title='".$mod_strings['LBL_CHANGE_PASSWORD_BUTTON_TITLE']."' accessKey='".$mod_strings['LBL_CHANGE_PASSWORD_BUTTON_KEY']."' class='classBtn' LANGUAGE=javascript onclick='return window.open(\"index.php?module=Users&action=ChangePassword&form=DetailView\",\"test\",\"width=320,height=165,resizable=no,scrollbars=0, toolbar=no, titlebar=no, left=100, top=126, screenX=100, screenY=126\");' type='button' name='password' value='".$mod_strings['LBL_CHANGE_PASSWORD_BUTTON_LABEL']."'>";
+		$smarty->assign('CHANGE_PW_BUTTON',$buttons);
+	
+	$buttons = "<input title='".$mod_strings['LBL_LOGIN_HISTORY_BUTTON_TITLE']."' accessKey='".$mod_strings['LBL_LOGIN_HISTORY_BUTTON_KEY']."' class='classBtn' onclick=\"this.form.return_module.value='Users'; this.form.return_action.value='ShowHistory'; this.form.return_id.value='$focus->id'; this.form.action.value='ShowHistory'\" type='submit' name='LoginHistory' value=' ".$mod_strings['LBL_LOGIN_HISTORY_BUTTON_LABEL']." '>";	
+	$smarty->assign('LOGIN_HISTORY_BUTTON',$buttons);
+	$buttons = "<input title='".$mod_strings['LBL_LIST_MAILSERVER_BUTTON_TITLE']."' accessKey='".$mod_strings['LBL_LIST_MAILSERVER_BUTTON_KEY']."' class='classBtn' onclick=\"this.form.return_module.value='Users'; this.form.return_action.value='ListMailAccount'; this.form.return_id.value='$focus->id'; this.form.module.value='Settings' ;this.form.action.value='ListMailAccount'\" type='submit' name='ListMailServerAccount' value=' ".$mod_strings['LBL_LIST_MAILSERVER_BUTTON_LABEL']." '>";
+	$smarty->assign('LIST_MAILSERVER_BUTTON',$buttons);
+	$buttons = "<input title='".$mod_strings['LBL_CHANGE_HOMEPAGE_TITLE']."' class='classBtn' align='center' onclick=\"this.form.return_module.value='Users';  this.form.return_action.value='DetailView';  this.form.action.value='EditHomeOrder';  this.form.record.value='$focus->id';\"  type='submit' name='EditHomeOrder'  value='  ".$mod_strings['LBL_CHANGE_HOMEPAGE_LABEL']."  '>";
+	$smarty->assign('CHANGE_HOMEPAGE_BUTTON',$buttons);
+
+	
+}
+if (is_admin($current_user)) 
+{
+	$buttons = "<input title='".$app_strings['LBL_DUPLICATE_BUTTON_TITLE']."' accessKey='".$app_strings['LBL_DUPLICATE_BUTTON_KEY']."' class='classBtn' onclick=\"this.form.return_module.value='Users'; this.form.return_action.value='DetailView'; this.form.isDuplicate.value=true; this.form.return_id.value='".$_REQUEST['record']."';this.form.action.value='EditView'\" type='submit' name='Duplicate' value=' ".$app_strings['LBL_DUPLICATE_BUTTON_LABEL']."'   >";
+	$smarty->assign('DUPLICATE_BUTTON',$buttons);
+	
+	//done so that only the admin user can see the customize tab button
+	if($_REQUEST['record'] != $current_user->id)
+	{
+		$buttons = "<input title='".$app_strings['LBL_DELETE_BUTTON_TITLE']."' accessKey='".$app_strings['LBL_DELETE_BUTTON_KEY']."' class='classBtn' onclick=\"deleteUser('$focus->id')\" type='button' name='Delete' value='  ".$app_strings['LBL_DELETE_BUTTON_LABEL']."  '>";
+		$smarty->assign('DELETE_BUTTON',$buttons);
+	}
+
+	if($_SESSION['authenticated_user_roleid'] == 'administrator')
+	{
+		$buttons = "<input title='".$app_strings['LBL_LISTROLES_BUTTON_TITLE']."' accessKey='".$app_strings['LBL_LISTROLES_BUTTON_KEY']."' class='classBtn' onclick=\"this.form.return_module.value='Users'; this.form.return_action.value='TabCustomise'; this.form.action.value='listroles'; this.form.record.value= '". $current_user->id ."'\" type='submit' name='ListRoles' value=' ".$app_strings['LBL_LISTROLES_BUTTON_LABEL']." '>";
+		$smarty->assign('LISTROLES_BUTTON',$buttons);
+	}
+
+}
+
+
+$lead_tables = Array('vtiger_users','vtiger_user2role');
+$tabid = getTabid("Users");
+$validationData = getDBValidationData($lead_tables,$tabid);
+$data = split_validationdataArray($validationData);
+
+$smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']);
+$smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']);
+$smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']);
+$smarty->assign("MODULE", 'Users');
+$smarty->assign("CURRENT_USERID", $current_user->id);
+$smarty->assign("BLOCKS", getBlocks($currentModule,"detail_view",'',$focus->column_fields));
+
+
+        $smarty->display("UserDetailView.tpl");
+
+
+?>




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 22 00:37:27 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 22 Jun 2006 04:37:27 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7412 -
	/vtigercrm/trunk/include/utils/DetailViewUtils.php
Message-ID: <20060622043727.352B883F4BC@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 21 22:37:18 2006
New Revision: 7412

Log:
Ajax edit added for UserDetailView

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 Wed Jun 21 22:37:18 2006
@@ -59,13 +59,36 @@
 	{
 		$label_fld[] = $mod_strings[$fieldlabel];
                 $label_fld[] = getCurrencyName($col_fields[$fieldname]);
+		$pick_query="select * from vtiger_currency_info";
+		$pickListResult = $adb->query($pick_query);
+		$noofpickrows = $adb->num_rows($pickListResult);
+
+		//Mikecrowe fix to correctly default for custom pick lists
+		$options = array();
+		$found = false;
+		for($j = 0; $j < $noofpickrows; $j++)
+		{
+			$pickListValue=$adb->query_result($pickListResult,$j,'currency_name');
+			$currency_id=$adb->query_result($pickListResult,$j,'id');
+			if($col_fields[$fieldname] == $pickListValue)
+			{
+				$chk_val = "selected";	
+				$found = true;
+			}
+			else
+			{	
+				$chk_val = '';
+			}
+			$options[$currency_id] = array($pickListValue=>$chk_val );	
+		}
+		$label_fld ["options"] = $options;	
 	}	
-	elseif($uitype == 13 || $uitype == 115)
+	elseif($uitype == 13)
 	{
 		$label_fld[] = $mod_strings[$fieldlabel];
 		$label_fld[] = $col_fields[$fieldname];
 	}
-	elseif($uitype == 15 || $uitype == 16)
+	elseif($uitype == 15 || $uitype == 16 || $uitype == 115)
 	{
 	     $label_fld[] = $mod_strings[$fieldlabel];
 	     $label_fld[] = $col_fields[$fieldname];




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 22 00:57:41 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 22 Jun 2006 04:57:41 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7413 -
	/vtigercrm/trunk/modules/Notes/DetailView.php
Message-ID: <20060622045741.2141183F4C6@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 22:57:37 2006
New Revision: 7413

Log:
title has been changed to notes_title

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

Modified: vtigercrm/trunk/modules/Notes/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Notes/DetailView.php (original)
+++ vtigercrm/trunk/modules/Notes/DetailView.php Wed Jun 21 22:57:37 2006
@@ -34,7 +34,7 @@
 if(isset($_REQUEST['record'])) {
    $focus->retrieve_entity_info($_REQUEST['record'],"Notes");
    $focus->id = $_REQUEST['record'];
-   $focus->name=$focus->column_fields['title'];
+   $focus->name=$focus->column_fields['notes_title'];
 }
 if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') {
 	$focus->id = "";




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 22 01:01:55 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 22 Jun 2006 05:01:55 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7415 -
	/vtigercrm/trunk/modules/Notes/ListView.php
Message-ID: <20060622050155.743F47E864C@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 23:01:51 2006
New Revision: 7415

Log:
title has been changed to notes_title

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 Wed Jun 21 23:01:51 2006
@@ -190,7 +190,7 @@
 $smarty->assign("SELECT_SCRIPT", $view_script);
 
 $navigationOutput = getTableHeaderNavigation($navigation_array, $url_string,"Notes","index",$viewid);
-$alphabetical = AlphabeticalSearch($currentModule,'index','title','true','basic',"","","","",$viewid);
+$alphabetical = AlphabeticalSearch($currentModule,'index','notes_title','true','basic',"","","","",$viewid);
 $fieldnames = getAdvSearchfields($module);
 $criteria = getcriteria_options();
 $smarty->assign("CRITERIA", $criteria);




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 22 01:02:31 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 22 Jun 2006 05:02:31 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7416 -
	/vtigercrm/trunk/data/CRMEntity.php
Message-ID: <20060622050232.6468083F4CD@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 21 23:02:18 2006
New Revision: 7416

Log:
function get_full_list moved from SugarBean to display Charts

Modified:
    vtigercrm/trunk/data/CRMEntity.php

Modified: vtigercrm/trunk/data/CRMEntity.php
==============================================================================
--- vtigercrm/trunk/data/CRMEntity.php (original)
+++ vtigercrm/trunk/data/CRMEntity.php Wed Jun 21 23:02:18 2006
@@ -1,1463 +1,1509 @@
-<?php
-/*********************************************************************************
- * The contents of this file are subject to the SugarCRM Public License Version 1.1.2
- * ("License"); You may not use this file except in compliance with the 
- * License. You may obtain a copy of the License at http://www.sugarcrm.com/SPL
- * Software distributed under the License is distributed on an  "AS IS"  basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
- * the specific language governing rights and limitations under the License.
- * The Original Code is:  SugarCRM Open Source
- * The Initial Developer of the Original Code is SugarCRM, Inc.
- * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.;
- * All Rights Reserved.
- * Contributor(s): ______________________________________.
- ********************************************************************************/
-/*********************************************************************************
- * $Header: /advent/projects/wesat/vtiger_crm/vtigercrm/data/CRMEntity.php,v 1.16 2005/04/29 04:21:31 mickie Exp $
- * Description:  Defines the base class for all data entities used throughout the 
- * application.  The base class including its methods and variables is designed to 
- * be overloaded with module-specific methods and variables particular to the 
- * module's base entity class. 
- ********************************************************************************/
-
-include_once('config.php');
-require_once('include/logging.php');
-require_once('data/Tracker.php');
-require_once('include/utils/utils.php');
-require_once('include/utils/UserInfoUtil.php');
-
-class CRMEntity
-{
-  /**
-   * This method implements a generic insert and update logic for any SugarBean
-   * This method only works for subclasses that implement the same variable names.
-   * This method uses the presence of an id vtiger_field that is not null to signify and update.
-   * The id vtiger_field should not be set otherwise.
-   * todo - Add support for vtiger_field type validation and encoding of parameters.
-   * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
-   * All Rights Reserved.
-   * Contributor(s): ______________________________________..
-   */
-
-	
-  function saveentity($module)
-  {
-	global $current_user, $adb;//$adb added by raju for mass mailing
-	$insertion_mode = $this->mode;
-
-	$this->db->println("TRANS saveentity starts $module");
-	$this->db->startTransaction();
-	
-	// Code included by Jaguar - starts    
-	if(isset($_REQUEST['recurringtype']) && $_REQUEST['recurringtype']!='')
-		$recur_type = trim($_REQUEST['recurringtype']);
-	else
-    		$recur_type='';	
-	// Code included by Jaguar - Ends
-
-	//Code included by Minnie - Starts
-	if(isset($_REQUEST['inviteesid']) && $_REQUEST['inviteesid']!='')
-	{
-		$selected_users_string =  $_REQUEST['inviteesid'];
-		$invitees_array = explode(';',$selected_users_string);
-
-	}
-	else
-		$invitees_array='';
-	//Code included by Minnie - Ends	
-
-	foreach($this->tab_name as $table_name)
-	{
-		if($table_name == "vtiger_crmentity")
-		{
-			$this->insertIntoCrmEntity($module);
-		}
-		elseif($table_name == "vtiger_salesmanactivityrel")
-		{
-			$this->insertIntoSmActivityRel($module);
-		}
-		//added by raju
-		elseif($table_name=="vtiger_seactivityrel" )
-		{
-			if($module=="Emails" && $_REQUEST['smodule']!='webmails')
-			//modified by Richie as raju's implementation broke the feature for addition of webmail to vtiger_crmentity.need to be more careful in future while integrating code
-			//if($_REQUEST['smodule']!='webmails' && $_REQUEST['smodule'] != '')
-			{
-				if($_REQUEST['currentid']!='')
-				{
-					$actid=$_REQUEST['currentid'];
-				}
-				else 
-				{
-					$actid=$_REQUEST['record'];
-				}
-				$parentid=$_REQUEST['parent_id'];
-				if($_REQUEST['module'] != 'Emails' && $_REQUEST['module'] != 'Webmails')
-				{
-					if(!$parentid) {
-						$parentid = $adb->getUniqueID('vtiger_seactivityrel');
-					}
-					$mysql='insert into vtiger_seactivityrel values('.$parentid.','.$actid.')';
-					$adb->query($mysql);
-				}
-				else
-				{	  
-					$myids=explode("|",$parentid);  //2 at 71|
-					for ($i=0;$i<(count($myids)-1);$i++)
-					{
-						$realid=explode("@",$myids[$i]);
-						$mycrmid=$realid[0];
-						//added to handle the relationship of emails with vtiger_users
-						if($realid[1] == -1)
-							$mysql='insert into vtiger_salesmanactivityrel values('.$mycrmid.','.$actid.')';
-						else	
-							$mysql='insert into vtiger_seactivityrel values('.$mycrmid.','.$actid.')';
-						$adb->query($mysql);
-					}
-				}
-			}
-			else
-			{
-				if(isset($this->column_fields['parent_id']) && $this->column_fields['parent_id'] != '')
-				{
-					$this->insertIntoEntityTable($table_name, $module);
-				}
-				elseif($this->column_fields['parent_id']=='' && $insertion_mode=="edit")
-				{
-					$this->deleteRelation($table_name);
-				}
-			}			
-		}
-		elseif($table_name == "vtiger_seticketsrel" || $table_name ==  "vtiger_seproductsrel" || $table_name ==  "vtiger_senotesrel")
-		{
-			if(isset($this->column_fields['parent_id']) && $this->column_fields['parent_id'] != '')//raju - mass mailing ends
-			{
-				$this->insertIntoEntityTable($table_name, $module);
-			}
-			elseif($this->column_fields['parent_id']=='' && $insertion_mode=="edit")
-			{
-				$this->deleteRelation($table_name);
-			}
-		}
-		elseif($table_name ==  "vtiger_cntactivityrel")
-		{
-			if(isset($this->column_fields['contact_id']) && $this->column_fields['contact_id'] != '')
-			{
-				$this->insertIntoEntityTable($table_name, $module);
-			}
-			elseif($this->column_fields['contact_id'] =='' && $insertion_mode=="edit")
-			{
-				$this->deleteRelation($table_name);
-			}
-
-		}
-		elseif($table_name ==  "vtiger_ticketcomments")
-		{
-                	$this->insertIntoTicketCommentTable($table_name, $module);
-		}
-		elseif($table_name ==  "vtiger_faqcomments")
-		{
-                	$this->insertIntoFAQCommentTable($table_name, $module);
-		}
-		elseif($table_name == "vtiger_activity_reminder")
-		{
-			if($recur_type == "--None--")
-			{
-				$this->insertIntoReminderTable($table_name,$module,"");
-			}
-		}
-		elseif($table_name == "vtiger_recurringevents") // Code included by Jaguar -  starts
-		{
-			$recur_type = trim($_REQUEST['recurringtype']);
-			if($recur_type != "--None--"  && $recur_type != '')
-		      	{		   
-	      			$this->insertIntoRecurringTable($table_name,$module);
-			}		
-		}// Code included by Jaguar - Ends
-		// Code included by Minnie  -  starts	
-		elseif($table_name == "vtiger_invitees") 
-		{
-			if($invitees_array != '')
-			{
-				$this->insertIntoInviteeTable($table_name,$module,$invitees_array);
-			}
-		}
-		// Code included by Minnie  -  Ends
-		elseif($table_name == 'vtiger_producttaxrel')
-		{
-			$this->insertTaxInformation($table_name, $module);
-		}
-		elseif($table_name == 'vtiger_attachments')
-		{
-			$this->insertIntoAttachment($this->id,$module);
-		}
-		else
-		{
-			$this->insertIntoEntityTable($table_name, $module);			
-		}
-	}
-
-	$this->db->completeTransaction();
-        $this->db->println("TRANS saveentity ends");
-  }
-
-
-	function insertIntoAttachment1($id,$module,$filedata,$filename,$filesize,$filetype,$user_id)
-	{
-		$date_var = date('YmdHis');
-		global $current_user;
-		global $adb;
-		//global $root_directory;
-		global $log;
-
-		$ownerid = $user_id;
-		
-		if($filesize != 0)
-		{
-			$data = base64_encode(fread(fopen($filedata, "r"), $filesize));
-		}
-		
-		$current_id = $adb->getUniqueID("vtiger_crmentity");
-
-		if($module=='Emails') 
-		{ 
-			$log->info("module is ".$module);
-			$idname='emailid';      $tablename='emails';    $descname='description';
-		}
-		else     
-		{ 
-			$idname='notesid';      $tablename='notes';     $descname='notecontent';
-		}
-
-		$sql="update ".$tablename." set filename='".$filename."' where ".$idname."=".$id;
-		$adb->query($sql);
-
-		$sql1 = "insert into vtiger_crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime,modifiedtime) values(".$current_id.",".$current_user->id.",".$ownerid.",'".$module." Attachment','"."',".$adb->formatString("vtiger_crmentity","createdtime",$date_var).",".$adb->formatString("vtiger_crmentity","modifiedtime",$date_var).")";
-		$adb->query($sql1);
-
-		$sql2="insert into vtiger_attachments(attachmentsid, name, description, type) values(".$current_id.",'".$filename."','"."','".$filetype."')";
-		$result=$adb->query($sql2);
-
-		//TODO -- instead of put contents in db now we should store the file in harddisk
-
-		$sql3='insert into vtiger_seattachmentsrel values('.$id.','.$current_id.')';
-		$adb->query($sql3);
-	}
-
-
-	/**
-	 *      This function is used to add the vtiger_attachments. This will call the function uploadAndSaveFile which will upload the attachment into the server and save that attachment information in the database.
-	 *      @param int $id  - entity id to which the vtiger_files to be uploaded
-	 *      @param string $module  - the current module name
-	*/
-	function insertIntoAttachment($id,$module)
-	{
-		global $log, $adb;
-		$log->debug("Entering into insertIntoAttachment($id,$module) method.");
-		
-		$file_saved = false;
-
-		//This is to added to store the existing attachment id of the contact where we should delete this when we give new image
-		if($module == 'Contacts')
-			$old_attachmentid = $adb->query_result($adb->query("select * from vtiger_seattachmentsrel where crmid=$id"),0,'attachmentsid');
-
-		foreach($_FILES as $fileindex => $files)
-		{
-			if($files['name'] != '' && $files['size'] > 0)
-			{
-				$file_saved = $this->uploadAndSaveFile($id,$module,$files);
-			}
-		}
-
-		//This is to handle the delete image for contacts
-		if($module == 'Contacts' && $file_saved)
-		{
-			$del_res1 = $adb->query("delete from vtiger_attachments where attachmentsid=$old_attachmentid");
-			$del_res2 = $adb->query("delete from vtiger_seattachmentsrel where attachmentsid=$old_attachmentid");
-		}
-
-
-		//Remove the deleted vtiger_attachments from db - Products
-		if($module == 'Products' && $_REQUEST['del_file_list'] != '')
-		{
-			$del_file_list = explode("###",trim($_REQUEST['del_file_list'],"###"));
-			foreach($del_file_list as $del_file_name)
-			{
-				$attach_res = $adb->query("select vtiger_attachments.attachmentsid from vtiger_attachments inner join vtiger_seattachmentsrel on vtiger_attachments.attachmentsid=vtiger_seattachmentsrel.attachmentsid where crmid=$id and name=\"$del_file_name\"");
-				$attachments_id = $adb->query_result($attach_res,0,'attachmentsid');
-				
-				$del_res1 = $adb->query("delete from vtiger_attachments where attachmentsid=$attachments_id");
-				$del_res2 = $adb->query("delete from vtiger_seattachmentsrel where attachmentsid=$attachments_id");
-			}
-		}
-
-		$log->debug("Exiting from insertIntoAttachment($id,$module) method.");
-	}
-
-	/**
-	 *      This function is used to upload the attachment in the server and save that attachment information in db.
-	 *      @param int $id  - entity id to which the file to be uploaded
-	 *      @param string $module  - the current module name
-	 *      @param array $file_details  - array which contains the file information(name, type, size, tmp_name and error)
-	 *      return void
-	*/
-	function uploadAndSaveFile($id,$module,$file_details)
-	{
-		global $log;
-		$log->debug("Entering into uploadAndSaveFile($id,$module,$file_details) method.");
-
-		global $adb, $current_user;
-		global $upload_badext;
-
-		$date_var = date('YmdHis');
-
-		//to get the owner id
-		$ownerid = $this->column_fields['assigned_user_id'];
-		if(!isset($ownerid) || $ownerid=='')
-			$ownerid = $current_user->id;
-
-	
-		// Arbitrary File Upload Vulnerability fix - Philip
-		$binFile = $file_details['name'];
-		$ext_pos = strrpos($binFile, ".");
-
-		$ext = substr($binFile, $ext_pos + 1);
-
-		if (in_array($ext, $upload_badext))
-		{
-			$binFile .= ".txt";
-		}
-		// Vulnerability fix ends
-
-		$current_id = $adb->getUniqueID("vtiger_crmentity");
-
-		$filename = basename($binFile);
-		$filetype= $file_details['type'];
-		$filesize = $file_details['size'];
-		$filetmp_name = $file_details['tmp_name'];
-
-		//get the file path inwhich folder we want to upload the file
-		$upload_file_path = decideFilePath();
-
-		//upload the file in server
-		$upload_status = move_uploaded_file($filetmp_name,$upload_file_path.$current_id."_".$binFile);
-
-		$save_file = 'true';
-		//only images are allowed for these modules
-		if($module == 'Contacts' || $module == 'Products')
-		{
-			$save_file = validateImageFile(&$file_details);
-		}
-
-		if($save_file == 'true' && $upload_status == 'true')
-		{
-			//This is only to update the attached filename in the vtiger_notes vtiger_table for the Notes module
-			if($module=='Notes')
-			{
-				$sql="update vtiger_notes set filename='".$filename."' where notesid = ".$id;
-				$adb->query($sql);
-			}
-
-			$sql1 = "insert into vtiger_crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime,modifiedtime) values(".$current_id.",".$current_user->id.",".$ownerid.",'".$module." Attachment','".$this->column_fields['description']."',".$adb->formatString("vtiger_crmentity","createdtime",$date_var).",".$adb->formatString("vtiger_crmentity","modifiedtime",$date_var).")";
-			$adb->query($sql1);
-
-			$sql2="insert into vtiger_attachments(attachmentsid, name, description, type, path) values(".$current_id.",'".$filename."','".$this->column_fields['description']."','".$filetype."','".$upload_file_path."')";
-			$result=$adb->query($sql2);
-
-			if($_REQUEST['mode'] == 'edit')
-			{
-				if($id != '' && $_REQUEST['fileid'] != '')
-				{
-					$delquery = 'delete from vtiger_seattachmentsrel where crmid = '.$id.' and attachmentsid = '.$_REQUEST['fileid'];
-					$adb->query($delquery);
-				}
-			}
-			if($module == 'Notes')
-			{
-				$query = "delete from vtiger_seattachmentsrel where crmid = ".$id;
-				$adb->query($query);
-			}
-			$sql3='insert into vtiger_seattachmentsrel values('.$id.','.$current_id.')';
-			$adb->query($sql3);
-
-			return true;
-		}
-		else
-		{
-			$log->debug("Skip the save attachment process.");
-			return false;
-		}
-	}
-
-
-
-  function insertIntoCrmEntity($module)
-  {
-	global $adb;
-	global $current_user;
-	global $log;
-                
-	$date_var = date('YmdHis');
-	if($_REQUEST['assigntype'] == 'T')
-	{
-		$ownerid= 0;
-	}
-	else
-	{
-		$ownerid = $this->column_fields['assigned_user_id'];
-	}
-                
-	if($module == 'Products' || $module == 'Notes' || $module =='Faq' || $module == 'Vendors' || $module == 'PriceBooks')
-	{
-		$log->info("module is =".$module);
-		$ownerid = $current_user->id;
-	}
-	if($module == 'Events')
-	{
-		$module = 'Activities';
-	}
-	if($this->mode == 'edit')
-	{
-		$description_val = from_html($adb->formatString("vtiger_crmentity","description",$this->column_fields['description']),($insertion_mode == 'edit')?true:false);
-		$sql = "update vtiger_crmentity set smownerid=".$ownerid.",modifiedby=".$current_user->id.",description=".$description_val.", modifiedtime=".$adb->formatString("vtiger_crmentity","modifiedtime",$date_var)." where crmid=".$this->id;
-
-		$adb->query($sql);
-		$sql1 ="delete from vtiger_ownernotify where crmid=".$this->id;
-		$adb->query($sql1);
-		if($ownerid != $current_user->id)
-		{
-			$sql1 = "insert into vtiger_ownernotify values(".$this->id.",".$ownerid.",null)";
-			$adb->query($sql1);
-		}
-	}
-	else
-	{
-		//if this is the create mode and the group allocation is chosen, then do the following
-		$current_id = $adb->getUniqueID("vtiger_crmentity");
-		$_REQUEST['currentid']=$current_id;
-
-		$description_val = from_html($adb->formatString("vtiger_crmentity","description",$this->column_fields['description']),($insertion_mode == 'edit')?true:false);
-		$sql = "insert into vtiger_crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime,modifiedtime) values('".$current_id."','".$current_user->id."','".$ownerid."','".$module."',".$description_val.",".$adb->formatDate($date_var).",".$adb->formatDate($date_var).")";
-		$adb->query($sql);
-		$this->id = $current_id;
-	}
-
-    }
-
-
-
-  function insertIntoSmActivityRel($module)
-  {
-    global $adb;
-    global $current_user;
-    if($this->mode == 'edit')
-    {
-
-      $sql = "delete from vtiger_salesmanactivityrel where activityid=".$this->id." and smid = ".$this->column_fields['assigned_user_id']."";
-      $adb->query($sql);
-
-    }
-	$sql_qry = "insert into vtiger_salesmanactivityrel (smid,activityid) values(".$this->column_fields['assigned_user_id'].",".$this->id.")";
-    $adb->query($sql_qry);
-
-  }
-  //code added by richie starts
-  function constructUpdateLog($id)
-  {
-    global $adb;
-    global $current_user;
-    $ticketid = $id;
-    //Updating History
-    $tktresult = $adb->query("select * from vtiger_troubletickets where ticketid='".$ticketid."'");
-    $crmresult = $adb->query("select * from vtiger_crmentity where crmid='".$ticketid."'");
-    $updatelog = $adb->query_result($tktresult,0,"update_log");
-    $old_user_id = $adb->query_result($crmresult,0,"smownerid");
-    $old_status = $adb->query_result($tktresult,0,"status");
-    $old_priority = $adb->query_result($tktresult,0,"priority");
-    $old_severity = $adb->query_result($tktresult,0,"severity");
-    $old_category = $adb->query_result($tktresult,0,"category");
-    if($_REQUEST['old_smownerid'] != $old_user_id && $old_user_id != 0)
-    {
-      $user_name = getUserName($this->column_fields['assigned_user_id']);
-      $updatelog .= ' Transferred to '.$user_name.'\.';
-    }
-    elseif($old_user_id == 0)
-    {
-	$group_info = getGroupName($ticketid,'HelpDesk');	
-	$group_name = $group_info[0];	
-	if($group_name != $_REQUEST['assigned_group_name'])
-		$updatelog .= ' Transferred to group '.$_REQUEST['assigned_group_name'].'\.';
-    }
-    if($old_status != $this->column_fields['ticketstatus'])
-    {
-      $updatelog .= ' Status Changed to '.$this->column_fields['ticketstatus'].'\.';
-    }
-    if($old_priority != $this->column_fields['ticketpriorities'])
-    {
-      $updatelog .= ' Priority Changed to '.$this->column_fields['ticketpriorities'].'\.';
-    }
-    if($old_severity != $this->column_fields['ticketseverities'])
-    {
-      $updatelog .= ' Severity Changed to '.$this->column_fields['ticketseverities'].'\.';
-    }
-    if($old_category != $this->column_fields['ticketcategories'])
-    {
-      $updatelog .= ' Category Changed to '.$this->column_fields['ticketcategories'].'\.';
-    }
-    if($_REQUEST['old_smownerid'] != $old_user_id || $old_status != $this->column_fields['ticketstatus'] || $old_priority != $this->column_fields['ticketpriorities'] || $old_severity != $this->column_fields['ticketseverities'] || $old_category != $this->column_fields['ticketcategories'] || $old_userid == 0)
-    {
-      $updatelog .= ' -- '.date("l dS F Y h:i:s A").' by '.$current_user->user_name.'--//--';
-    }
-    else
-    {
-        $update_log .= '--//--';
-    }
-
-    return $updatelog;
-  }
-  //code added by richie ends
-  function insertIntoEntityTable($table_name, $module)
-  {
-	  global $log;	
-	   $log->info("function insertIntoCrmEntity ".$module.' vtiger_table name ' .$table_name);
-	  global $adb;
-	  $insertion_mode = $this->mode;
-
-	  //Checkin whether an entry is already is present in the vtiger_table to update
-	  if($insertion_mode == 'edit')
-	  {
-		  $check_query = "select * from ".$table_name." where ".$this->tab_name_index[$table_name]."=".$this->id;
-		  $check_result=$adb->query($check_query);
-
-		  $num_rows = $adb->num_rows($check_result);
-
-		  if($num_rows <= 0)
-		  {
-			  $insertion_mode = '';
-		  }	 
-	  }
-
-	  if($insertion_mode == 'edit')
-	  {
-		  $update = '';
-		  $tabid= getTabid($module);	
-		  $sql = "select * from vtiger_field where tabid=".$tabid." and tablename='".$table_name."' and displaytype in (1,3)"; 
-	  }
-	  else
-	  {
-		  $column = $this->tab_name_index[$table_name];
-		  if($column == 'id' && $table_name == 'vtiger_users')
-		  {
-		 	$currentuser_id = $adb->getUniqueID("vtiger_users");
-			$this->id = $currentuser_id;
-		  }
-		  $value = $this->id;
-	  	  $tabid= getTabid($module);	
-		  $sql = "select * from vtiger_field where tabid=".$tabid." and tablename='".$table_name."' and displaytype in (1,3,4)"; 
-	  }
-
-	  $result = $adb->query($sql);
-	  $noofrows = $adb->num_rows($result);
-	  for($i=0; $i<$noofrows; $i++)
-	  {
-		  $fieldname=$adb->query_result($result,$i,"fieldname");
-		  $columname=$adb->query_result($result,$i,"columnname");
-		  $uitype=$adb->query_result($result,$i,"uitype");
-		  if(isset($this->column_fields[$fieldname]))
-		  {
-			  if($uitype == 56)
-			  {
-				  if($this->column_fields[$fieldname] == 'on' || $this->column_fields[$fieldname] == 1)
-				  {
-					  $fldvalue = 1;
-				  }
-				  else
-				  {
-					  $fldvalue = 0;
-				  }
-
-			  }
-			  elseif($uitype == 33)
-			  {
-				$j = 0;
-				$field_list = '';
-				if(is_array($this->column_fields[$fieldname]) && count($this->column_fields[$fieldname]) > 0)
-				{
-					foreach($this->column_fields[$fieldname] as $key=>$multivalue)
-					{
-						if($j != 0)
-						{
-							$field_list .= ' , ';
-						}
-						$field_list .= $multivalue;
-						$j++;
-					}
-				}
-				$fldvalue = $field_list;
-			  }
-			  elseif($uitype == 5 || $uitype == 6 || $uitype ==23)
-			  {
-				  if($_REQUEST['action'] == 'Import')
-				  {
-					  $fldvalue = $this->column_fields[$fieldname];
-				  }
-				  else
-				  {
-					  $fldvalue = getDBInsertDateValue($this->column_fields[$fieldname]);
-				  }
-			  }
-			  else
-			  {
-				  $fldvalue = $this->column_fields[$fieldname]; 
-				  $fldvalue = stripslashes($fldvalue);
-			  }
-			  $fldvalue = from_html($adb->formatString($table_name,$columname,$fldvalue),($insertion_mode == 'edit')?true:false);
-
-
-
-		  }
-		  else
-		  {
-			  $fldvalue = '';
-		  }
-		  if($fldvalue=='') $fldvalue ="NULL";
-		  if($insertion_mode == 'edit')
-		  {
-			  //code by richie starts
-			  if(($table_name == "vtiger_troubletickets") && ($columname == "update_log"))
-			  {
-				  $fldvalue = $this->constructUpdateLog($this->id);
-				  $fldvalue = from_html($adb->formatString($table_name,$columname,$fldvalue),($insertion_mode == 'edit')?true:false);
-			  }
-			  //code by richie ends
-
-			  if($table_name == 'vtiger_notes' && $columname == 'filename' && $_FILES['filename']['name'] == '')
-			  {
-				  $fldvalue = $this->getOldFileName($this->id);
-			  }
-			  if($table_name == 'vtiger_products' && $columname == 'imagename')
-			  {
-					  
-
-			  }
-			  if($table_name != 'vtiger_ticketcomments')
-			  {
-				  if($i == 0)
-				  {
-					  $update = $columname."=".$fldvalue."";
-				  }
-				  else
-				  {
-					  $update .= ', '.$columname."=".$fldvalue."";
-				  }
-			  }
-		  }
-		  else
-		  {
-			  //code by richie starts
-			  if(($table_name == "vtiger_troubletickets") && ($columname == "update_log"))
-			  {
-				  global $current_user;
-				  $fldvalue = date("l dS F Y h:i:s A").' by '.$current_user->user_name;
-				  if($_REQUEST['assigned_group_name'] != '' && $_REQUEST['assigntype'] == 'T')
-                                  {
-                                        $group_name = $_REQUEST['assigned_group_name'];
-                                  }
-				  elseif($this->column_fields['assigned_user_id'] != '')
-				  {
-					  $tkt_ownerid = $this->column_fields['assigned_user_id'];
-				  }
-				  else
-				  {
-					  $tkt_ownerid = $current_user->id;
-				  }
-				  if($group_name != '')
-					  $tkt_ownername = $group_name;
-				  else
-					  $tkt_ownername = getUserName($tkt_ownerid);	
-				  $fldvalue = " Ticket created. Assigned to ".$tkt_ownername." -- ".$fldvalue."--//--";
-				  $fldvalue = from_html($adb->formatString($table_name,$columname,$fldvalue),($insertion_mode == 'edit')?true:false);
-				  //echo ' updatevalue is ............. ' .$fldvalue;
-			  }
-			  //code by richie ends
-			  $column .= ", ".$columname;
-			  $value .= ", ".$fldvalue."";
-		  }
-
-	  }
-
-
-
-
-
-	  if($insertion_mode == 'edit')
-	  {
-		  if($_REQUEST['module'] == 'Potentials')
-		  {
-			  $dbquery = 'select sales_stage from vtiger_potential where potentialid = '.$this->id;
-			  $sales_stage = $adb->query_result($adb->query($dbquery),0,'sales_stage');
-			  if($sales_stage != $_REQUEST['sales_stage'])
-			  {
-				  $date_var = date('YmdHis');
-				  $closingdate = getDBInsertDateValue($_REQUEST['closingdate']);
-				  $sql = "insert into vtiger_potstagehistory values('',".$this->id.",'".$_REQUEST['amount']."','".$sales_stage."','".$_REQUEST['probability']."',0,".$adb->formatString("vtiger_potstagehistory","closedate",$closingdate).",".$adb->formatString("vtiger_potstagehistory","lastmodified",$date_var).")";
-				  $adb->query($sql);
-			  }
-		  }
-		  elseif($_REQUEST['module'] == 'PurchaseOrder' || $_REQUEST['module'] == 'SalesOrder' || $_REQUEST['module'] == 'Quotes' || $_REQUEST['module'] == 'Invoice')
-		  {
-			  //added to update the history for PO, SO, Quotes and Invoice
-			  $history_field_array = Array(
-				  			"PurchaseOrder"=>"postatus",
-							"SalesOrder"=>"sostatus",
-							"Quotes"=>"quotestage",
-							"Invoice"=>"invoicestatus"
-						      );
-
-			  $inventory_module = $_REQUEST['module'];
-			  if($inventory_module == "PurchaseOrder")
-			  	$relatedname = $_REQUEST["vendor_name"];
-			  else
-			  	$relatedname = $_REQUEST["account_name"];
-
-			  $oldvalue = getSingleFieldValue($this->table_name,$history_field_array[$inventory_module],$this->module_id,$this->id);
-			  if($oldvalue != $this->column_fields["$history_field_array[$inventory_module]"])
-			  {
-				  addInventoryHistory($inventory_module, $this->id,$relatedname,$_REQUEST['grandTotal'],$this->column_fields["$history_field_array[$inventory_module]"]);
-			  }
-		  }
-
-		  //Check done by Don. If update is empty the the query fails
-		  if(trim($update) != '')
-        	  {
-		  	$sql1 = "update ".$table_name." set ".$update." where ".$this->tab_name_index[$table_name]."=".$this->id;
-
-		  	$adb->query($sql1); 
-		  }
-
-		  if($_REQUEST['assigntype'] == 'T')
-		  {
-			  $groupname = $_REQUEST['assigned_group_name'];
-			  //echo 'about to update lead group relation';
-			  if($module == 'Leads' && $table_name == 'vtiger_leaddetails')
-			  {
-				  updateLeadGroupRelation($this->id,$groupname);
-			  }
-                          elseif($module == 'Accounts' && $table_name == 'vtiger_account')
-			  {
-				  updateAccountGroupRelation($this->id,$groupname);
-			  }
-			  elseif($module == 'Contacts' && $table_name == 'vtiger_contactdetails')
-			  {
-				  updateContactGroupRelation($this->id,$groupname);
-			  }
-			  elseif($module == 'Potentials' && $table_name == 'vtiger_potential')
-			  {
-				  updatePotentialGroupRelation($this->id,$groupname);
-			  }
-			  elseif($module == 'Quotes' && $table_name == 'vtiger_quotes')
-			  {
-				  updateQuoteGroupRelation($this->id,$groupname);
-			  }
-			  elseif($module == 'SalesOrder' && $table_name == 'vtiger_salesorder')
-			  {
-				  updateSoGroupRelation($this->id,$groupname);
-			  }
-			  elseif($module == 'Invoice' && $table_name == 'vtiger_invoice')
-			  {
-				  updateInvoiceGroupRelation($this->id,$groupname);
-			  }
-			  elseif($module == 'PurchaseOrder' && $table_name == 'vtiger_purchaseorder')
-			  {
-				  updatePoGroupRelation($this->id,$groupname);
-			  }
-			  elseif($module == 'HelpDesk' && $table_name == 'vtiger_troubletickets')
-			  {
-				  updateTicketGroupRelation($this->id,$groupname);
-			  }
-			  elseif($module == 'Campaigns' && $table_name == 'vtiger_campaign')
-			  {
-				  updateCampaignGroupRelation($this->id,$groupname);
-			  }
-			  elseif($module =='Activities' || $module =='Events' || $module == 'Emails')
-			  {
-				 if($table_name == 'vtiger_activity')
-				 {
-				   updateActivityGroupRelation($this->id,$groupname);
-				 }
-			  }
-			   	
-
-		  }
-		  else
-		  {
-			  //echo 'about to update lead group relation again!';
-			  if($module == 'Leads' && $table_name == 'vtiger_leaddetails')
-			  {
-				  updateLeadGroupRelation($this->id,'');
-			  }
-			  elseif($module == 'Accounts' && $table_name == 'vtiger_account')
-			  {
-				  updateAccountGroupRelation($this->id,'');
-			  }
-			  elseif($module == 'Contacts' && $table_name == 'vtiger_contactdetails')
-			  {
-				  updateContactGroupRelation($this->id,'');
-			  }
-			  elseif($module == 'Potentials' && $table_name == 'vtiger_potential')
-			  {
-				  updatePotentialGroupRelation($this->id,'');
-			  }
-			  elseif($module == 'Quotes' && $table_name == 'vtiger_quotes')
-			  {
-				  updateQuoteGroupRelation($this->id,'');
-			  }
-			  elseif($module == 'SalesOrder' && $table_name == 'vtiger_salesorder')
-			  {
-				  updateSoGroupRelation($this->id,'');
-			  }
-			  elseif($module == 'Invoice' && $table_name == 'vtiger_invoice')
-			  {
-				  updateInvoiceGroupRelation($this->id,'');
-			  }
-			  elseif($module == 'PurchaseOrder' && $table_name == 'vtiger_purchaseorder')
-			  {
-				  updatePoGroupRelation($this->id,'');
-			  }
-			  elseif($module == 'HelpDesk' && $table_name == 'vtiger_troubletickets')
-			  {
-				  updateTicketGroupRelation($this->id,'');
-			  }
-			  elseif($module == 'Campaigns' && $table_name == 'vtiger_campaign')
-			  {
-				  updateCampaignGroupRelation($this->id,$groupname);
-			  }
-			  elseif($module =='Activities' || $module =='Events' || $module == 'Emails')
-			  {
-				  if($table_name == 'vtiger_activity')
-                                  {
-			             updateActivityGroupRelation($this->id,$groupname);
-				  }
-			  }
-			  	
-
-		  }
-
-	  }
-	  else
-	  {	
-		  $sql1 = "insert into ".$table_name." (".$column.") values(".$value.")";
-		  $adb->query($sql1); 
-		  $groupname = $_REQUEST['assigned_group_name'];
-		  if($_REQUEST['assigntype'] == 'T' && $table_name == 'vitger_leaddetails')
-		  {
-			  insert2LeadGroupRelation($this->id,$groupname);
-		  }
-		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'vitger_account')
-		  {
-			  insert2AccountGroupRelation($this->id,$groupname);
-		  }
-		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'vitger_contactdetails')
-		  {
-			  insert2ContactGroupRelation($this->id,$groupname);
-		  }
-		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'vitger_potential')
-		  {
-			  insert2PotentialGroupRelation($this->id,$groupname);
-		  }
-		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'vitger_quotes')
-		  {
-			  insert2QuoteGroupRelation($this->id,$groupname);
-		  }
-		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'vitger_salesorder')
-		  {
-			  insert2SoGroupRelation($this->id,$groupname);
-		  }
-		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'vitger_invoice')
-		  {
-			  insert2InvoiceGroupRelation($this->id,$groupname);
-		  }
-		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'vitger_purchaseorder')
-		  {
-			  insert2PoGroupRelation($this->id,$groupname);
-		  }
-		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'vitger_activity') 
-		  {
-			  insert2ActivityGroupRelation($this->id,$groupname);
-		  }
-		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'vitger_troubletickets') 
-		  {
-			  insert2TicketGroupRelation($this->id,$groupname);
-		  }
-		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'vitger_campaign')
-		  {
-			  insert2CampaignGroupRelation($this->id,$groupname);
-		  }
-
-	  }
-
-  }
-function deleteRelation($table_name)
-{
-         global $adb;
-         $check_query = "select * from ".$table_name." where ".$this->tab_name_index[$table_name]."=".$this->id;
-         $check_result=$adb->query($check_query);
-         $num_rows = $adb->num_rows($check_result);
-
-         if($num_rows == 1)
-         {
-                $del_query = "DELETE from ".$table_name." where ".$this->tab_name_index[$table_name]."=".$this->id;
-                $adb->query($del_query);
-         }
-
-}
-function getOldFileName($notesid)
-{
-	   global $log;
-$log->info("in getOldFileName  ".$notesid);
-	global $adb;
-	$query1 = "select * from vtiger_seattachmentsrel where crmid=".$notesid;
-	$result = $adb->query($query1);
-	$noofrows = $adb->num_rows($result);
-	if($noofrows != 0)
-		$attachmentid = $adb->query_result($result,0,'attachmentsid');
-	if($attachmentid != '')
-	{
-		$query2 = "select * from vtiger_attachments where attachmentsid=".$attachmentid;
-		$filename = $adb->query_result($adb->query($query2),0,'name');
-	}
-	return "'".$filename."'";
-}
-function insertIntoTicketCommentTable($table_name, $module)
-{
-	global $log;
-	$log->info("in insertIntoTicketCommentTable  ".$table_name."    module is  ".$module);
-        global $adb;
-	global $current_user;
-
-        $current_time = date('Y-m-d H:i:s');
-	if($_REQUEST['assigned_user_id'] != '')
-		$ownertype = 'user';
-	else
-		$ownertype = 'customer';
-
-	if($this->column_fields['comments'] != '')
-		$comment = $this->column_fields['comments'];
-	else
-		$comment = $_REQUEST['comments'];
-
-	if($comment != '')
-	{
-		$comment = addslashes($comment);
-		$sql = "insert into vtiger_ticketcomments values('',".$this->id.",'".$comment."','".$current_user->id."','".$ownertype."','".$current_time."')";
-	        $adb->query($sql);
-	}
-}
-function insertIntoFAQCommentTable($table_name, $module)
-{
-	 global $log;
-	$log->info("in insertIntoFAQCommentTable  ".$table_name."    module is  ".$module);
-        global $adb;
-
-        $current_time = date('Y-m-d H:i:s');
-
-	if($_REQUEST['comments'] != '')
-	{
-		$comment = addslashes($_REQUEST['comments']);
-		$sql = "insert into vtiger_faqcomments values('',".$this->id.",'".$comment."','".$current_time."')";
-		$adb->query($sql);
-	}
-}
-function insertIntoReminderTable($table_name,$module,$recurid)
-{
-	 global $log;
-$log->info("in insertIntoReminderTable  ".$table_name."    module is  ".$module);
-	if($_REQUEST['set_reminder'] == 'Yes')
-	{
-$log->debug("set reminder is set");
-		$rem_days = $_REQUEST['remdays'];
-$log->debug("rem_days is ".$rem_days);
-		$rem_hrs = $_REQUEST['remhrs'];
-$log->debug("rem_hrs is ".$rem_hrs);
-		$rem_min = $_REQUEST['remmin'];
-$log->debug("rem_minutes is ".$rem_min);
-		$reminder_time = $rem_days * 24 * 60 + $rem_hrs * 60 + $rem_min;
-$log->debug("reminder_time is ".$reminder_time);
-		if ($recurid == "")
-		{
-			if($_REQUEST['mode'] == 'edit')
-			{
-				$this->activity_reminder($this->id,$reminder_time,0,$recurid,'edit');
-			}
-			else
-			{
-				$this->activity_reminder($this->id,$reminder_time,0,$recurid,'');
-			}
-		}
-		else
-		{
-			$this->activity_reminder($this->id,$reminder_time,0,$recurid,'');
-		}
-	}
-	elseif($_REQUEST['set_reminder'] == 'No')
-	{
-		$this->activity_reminder($this->id,'0',0,$recurid,'delete');
-	}
-}
-
-// Code included by Minnie - starts
-function insertIntoInviteeTable($table_name,$module,$invitees_array)
-{
-	global $log,$adb;
-	$log->debug("Entering insertIntoInviteeTable(".$table_name.",".$module.",".$invitees_array.") method ...");
-	foreach($invitees_array as $inviteeid)
-	{
-		if($inviteeid != '')
-		{
-			$query="insert into vtiger_invitees values(".$this->id.",".$inviteeid.")";
-			$adb->query($query);
-		}
-	}
-	$log->debug("Exiting insertIntoInviteeTable method ...");
-
-}
-// Code included by Minnie - Ends
-
-// Code included by Jaguar - starts 
-function insertIntoRecurringTable($table_name,$module)
-{
-	global $log;
-$log->info("in insertIntoRecurringTable  ".$table_name."    module is  ".$module);
-        global $adb;
-        $st_date = getDBInsertDateValue($_REQUEST["date_start"]);
-$log->debug("st_date ".$st_date);
-        $end_date = getDBInsertDateValue($_REQUEST["due_date"]);
-$log->debug("end_date is set ".$end_date);
-        $st=explode("-",$st_date);
-$log->debug("exploding string is ".$st);
-        $end=explode("-",$end_date);
-$log->debug("exploding string again is ".$end);
-        $type = trim($_REQUEST['recurringtype']);
-$log->debug("type is ".$type);
-        $flag="true";
-
-	if($_REQUEST['mode'] == 'edit')
-	{
-		$activity_id=$this->id;
-
-		$sql='select min(recurringdate) AS min_date,max(recurringdate) AS max_date, recurringtype, activityid from vtiger_recurringevents where activityid='. $activity_id.' group by activityid, recurringtype';
-		
-		$result = $adb->query($sql);
-		$noofrows = $adb->num_rows($result);
-		for($i=0; $i<$noofrows; $i++)
-		{
-			$recur_type_b4_edit = $adb->query_result($result,$i,"recurringtype");
-			$date_start_b4edit = $adb->query_result($result,$i,"min_date");
-			$end_date_b4edit = $adb->query_result($result,$i,"max_date");
-		}
-		if(($st_date == $date_start_b4edit) && ($end_date==$end_date_b4edit) && ($type == $recur_type_b4_edit))
-		{
-			if($_REQUEST['set_reminder'] == 'Yes')
-			{
-				$sql = 'delete from vtiger_activity_reminder where activity_id='.$activity_id;
-				$adb->query($sql);
-				$sql = 'delete  from vtiger_recurringevents where activityid='.$activity_id;
-				$adb->query($sql);
-				$flag="true";
-			}
-			elseif($_REQUEST['set_reminder'] == 'No')
-			{
-				$sql = 'delete  from vtiger_activity_reminder where activity_id='.$activity_id;
-				$adb->query($sql);
-				$flag="false";
-			}
-			else
-				$flag="false";
-		}
-		else
-		{
-			$sql = 'delete from vtiger_activity_reminder where activity_id='.$activity_id;
-			$adb->query($sql);
-			$sql = 'delete  from vtiger_recurringevents where activityid='.$activity_id;
-			$adb->query($sql);
-		}
-	}
-	if($flag=="true")
-	{
-		$date_val=$st_date;
-		$date_array[]=$st_date;
-		if($type !=  "--None--")
-		{
-			while($date_val <= $end_date)
-			{
-				if($type == 'Daily')
-				{
-					$date_val = date("Y-m-d",mktime(0,0,0,date("$st[1]"),(date("$st[2]")+(1)),date("$st[0]")));
-				}
-				elseif($type == 'Weekly')
-				{
-					$date_val = date("Y-m-d",mktime(0,0,0,date("$st[1]"),(date("$st[2]")+(7)),date("$st[0]")));
-				}
-				elseif($type == 'Monthly' )
-				{
-					$date_val = date("Y-m-d",mktime(0,0,0,(date("$st[1]")+1),date("$st[2]"),date("$st[0]")));
-				}
-				elseif($type == 'Yearly')
-				{
-					$date_val = date("Y-m-d",mktime(0,0,0,date("$st[1]"),date("$st[2]"),(date("$st[0]")+1)));
-				}
-				$date_array[]=$date_val;
-				$st=explode("-",$date_val);
-			}
-			for($k=0; $k< count($date_array); $k++)
-			{
-				$tdate=$date_array[$k];
-				if($tdate <= $end_date)
-				{
-					$max_recurid_qry = 'select max(recurringid) AS recurid from vtiger_recurringevents;';
-					$result = $adb->query($max_recurid_qry);
-					$noofrows = $adb->num_rows($result);
-					for($i=0; $i<$noofrows; $i++)
-					{
-						$recur_id = $adb->query_result($result,$i,"recurid");
-					}
-					$current_id =$recur_id+1;
-					$recurring_insert = "insert into vtiger_recurringevents values ('".$current_id."','".$this->id."','".$tdate."','".$type."')";
-					$adb->query($recurring_insert);
-					if($_REQUEST['set_reminder'] == 'Yes')
-					{
-						$this->insertIntoReminderTable("activity_reminder",$module,$current_id,'');
-					}
-				}
-			}
-		}
-	}
-}
-
-// Code included by Jaguar - Ends 
-
-	
-  function retrieve_entity_info($record, $module)
-  {
-    global $adb,$log;
-    $result = Array();
-    foreach($this->tab_name_index as $table_name=>$index)
-    {
-	    $result[$table_name] = $adb->query("select * from ".$table_name." where ".$index."=".$record);
-    }
-    $tabid = getTabid($module);
-    $sql1 =  "select * from vtiger_field where tabid=".$tabid;
-    $result1 = $adb->query($sql1);
-    $noofrows = $adb->num_rows($result1);
-    for($i=0; $i<$noofrows; $i++)
-    {
-      $fieldcolname = $adb->query_result($result1,$i,"columnname");
-      $tablename = $adb->query_result($result1,$i,"tablename");
-      $fieldname = $adb->query_result($result1,$i,"fieldname");
-
-      $fld_value = $adb->query_result($result[$tablename],0,$fieldcolname);
-      $this->column_fields[$fieldname] = $fld_value;
-				
-    }
-	if($module == 'Users')
-	{
-		for($i=0; $i<$noofrows; $i++)
-		{
-			$fieldcolname = $adb->query_result($result1,$i,"columnname");
-			$tablename = $adb->query_result($result1,$i,"tablename");
-			$fieldname = $adb->query_result($result1,$i,"fieldname");
-			$fld_value = $adb->query_result($result[$tablename],0,$fieldcolname);
-			$this->$fieldname = $fld_value;
-
-		}
-	}
-		
-    $this->column_fields["record_id"] = $record;
-    $this->column_fields["record_module"] = $module;
-  }
-
-	function save($module_name) 
-	{
-		global $log;
-	        $log->debug("module name is ".$module_name);
-		//GS Save entity being called with the modulename as parameter
-		$this->saveentity($module_name);
-	}
-  
-	function process_list_query($query, $row_offset, $limit= -1, $max_per_page = -1)
-	{
-		global $list_max_entries_per_page;
-		$this->log->debug("process_list_query: ".$query);
-		if(!empty($limit) && $limit != -1){
-			$result =& $this->db->limitQuery($query, $row_offset + 0, $limit,true,"Error retrieving $this->object_name list: ");
-		}else{
-			$result =& $this->db->query($query,true,"Error retrieving $this->object_name list: ");
-		}
-
-		$list = Array();
-		if($max_per_page == -1){
-			$max_per_page 	= $list_max_entries_per_page;
-		}
-		$rows_found =  $this->db->getRowCount($result);
-
-		$this->log->debug("Found $rows_found ".$this->object_name."s");
-                
-		$previous_offset = $row_offset - $max_per_page;
-		$next_offset = $row_offset + $max_per_page;
-
-		if($rows_found != 0)
-		{
-
-			// We have some data.
-
-			for($index = $row_offset , $row = $this->db->fetchByAssoc($result, $index); $row && ($index < $row_offset + $max_per_page || $max_per_page == -99) ;$index++, $row = $this->db->fetchByAssoc($result, $index)){
-
-				
-				foreach($this->list_fields as $entry)
-				{
-
-					foreach($entry as $key=>$field) // this will be cycled only once
-					{						
-						if (isset($row[$field])) {
-							$this->column_fields[$this->list_fields_names[$key]] = $row[$field];
-						
-						
-							$this->log->debug("$this->object_name({$row['id']}): ".$field." = ".$this->$field);
-						}
-						else 
-						{
-							$this->column_fields[$this->list_fields_names[$key]] = "";
-						}
-					}
-				}
-
-
-				//$this->db->println("here is the bug");
-				
-
-				$list[] = clone($this);//added by Richie to support PHP5
-			}
-		}
-
-		$response = Array();
-		$response['list'] = $list;
-		$response['row_count'] = $rows_found;
-		$response['next_offset'] = $next_offset;
-		$response['previous_offset'] = $previous_offset;
-
-		return $response;
-	}
-
-	function process_full_list_query($query)
-	{
-		$this->log->debug("CRMEntity:process_full_list_query");
-		$result =& $this->db->query($query, false);
-		$this->log->debug("CRMEntity:process_full_list_query: result is ".$result);
-
-
-		if($this->db->getRowCount($result) > 0){
-		
-		//	$this->db->println("process_full mid=".$this->module_id." mname=".$this->module_name);
-			// We have some data.
-			while ($row = $this->db->fetchByAssoc($result)) {				
-				$rowid=$row[$this->module_id];
-
-				if(isset($rowid))
-			       		$this->retrieve_entity_info($rowid,$this->module_name);
-				else
-					$this->db->println("rowid not set unable to retrieve");
-				 
-				 
-				
-		//clone function added to resolvoe PHP5 compatibility issue in Dashboards
-		//If we do not use clone, while using PHP5, the memory address remains fixed but the
-	//data gets overridden hence all the rows that come in bear the same value. This in turn
-//provides a wrong display of the Dashboard graphs. The data is erroneously shown for a specific month alone
-//Added by Richie
-				$list[] = clone($this);//added by Richie to support PHP5
-			}
-		}
-
-		if (isset($list)) return $list;
-		else return null;
-	}
-	
-	/** This function should be overridden in each module.  It marks an item as deleted.
-	* If it is not overridden, then marking this type of item is not allowed
-	 * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc..
-	 * All Rights Reserved..
-	 * Contributor(s): ______________________________________..
-	*/
-	function mark_deleted($id)
-	{
-		$query = "UPDATE vtiger_crmentity set deleted=1 where crmid='$id'";
-		$this->db->query($query, true,"Error marking record deleted: ");
-
-
-	}
-
-
-	function retrieve_by_string_fields($fields_array, $encode=true) 
-	{ 
-		$where_clause = $this->get_where($fields_array);
-		
-		$query = "SELECT * FROM $this->table_name $where_clause";
-		$this->log->debug("Retrieve $this->object_name: ".$query);
-		$result =& $this->db->requireSingleResult($query, true, "Retrieving record $where_clause:");
-		if( empty($result)) 
-		{ 
-		 	return null; 
-		} 
-
-		 $row = $this->db->fetchByAssoc($result,-1, $encode);
-
-		foreach($this->column_fields as $field) 
-		{ 
-			if(isset($row[$field])) 
-			{ 
-				$this->$field = $row[$field];
-			}
-		} 
-		return $this;
-	}
-
-	// this method is called during an import before inserting a bean
-	// define an associative array called $special_fields
-	// the keys are user defined, and don't directly map to the bean's vtiger_fields
-	// the value is the method name within that bean that will do extra
-	// processing for that vtiger_field. example: 'full_name'=>'get_names_from_full_name'
-
-	function process_special_fields() 
-	{ 
-		foreach ($this->special_functions as $func_name) 
-		{ 
-			if ( method_exists($this,$func_name) ) 
-			{ 
-				$this->$func_name(); 
-			} 
-		} 
-	}
-
-	/**
-         * Function to check if the custom vtiger_field vtiger_table exists
-         * return true or false
-         */
-        function checkIfCustomTableExists($tablename)
-        {
-                $query = "select * from ".$tablename;
-                $result = $this->db->query($query);
-                $testrow = $this->db->num_fields($result);
-                if($testrow > 1)
-                {
-                        $exists=true;
-                }
-                else
-                {
-                        $exists=false;
-                }
-                return $exists;
-        }
-
-	/**
-	 * function to construct the query to fetch the custom vtiger_fields
-	 * return the query to fetch the custom vtiger_fields
-         */
-        function constructCustomQueryAddendum($tablename,$module)
-        {
-                global $adb;
-		$tabid=getTabid($module);		
-                $sql1 = "select columnname,fieldlabel from vtiger_field where generatedtype=2 and tabid=".$tabid;
-                $result = $adb->query($sql1);
-                $numRows = $adb->num_rows($result);
-                $sql3 = "select ";
-                for($i=0; $i < $numRows;$i++)
-                {
-                        $columnName = $adb->query_result($result,$i,"columnname");
-                        $fieldlable = $adb->query_result($result,$i,"fieldlabel");
-                        //construct query as below
-                        if($i == 0)
-                        {
-                                $sql3 .= $tablename.".".$columnName. " '" .$fieldlable."'";
-                        }
-                        else
-                        {
-                                $sql3 .= ", ".$tablename.".".$columnName. " '" .$fieldlable."'";
-                        }
-
-                }
-                if($numRows>0)
-                {
-                        $sql3=$sql3.',';
-                }
-                return $sql3;
-
-        }
-
-
-	/**	function to save the product tax information in producttarel vtiger_table
-	 *	@param string $tablename - vtiger_tablename to save the product tax relationship (producttaxrel)
-	 *	@param string $module	 - current module name
-	 *	$return void
-	*/
-	function insertTaxInformation($tablename, $module)
-	{
-		global $adb, $log;
-		$log->debug("Entering into insertTaxInformation($tablename, $module) method ...");
-
-		$tax_per = '';
-		//Save the Product - VAT tax relationship if VAT tax check box is enabled
-		//Delete the existing tax if any
-		if($this->mode == 'edit')
-		{
-			$tax_array = Array('VAT','Sales','Service');
-			foreach($tax_array as $tax_type)
-			{
-				$taxid = getTaxId($tax_type);
-				$sql = "delete from vtiger_producttaxrel where productid=$this->id and taxid=$taxid";
-				$adb->query($sql);
-			}
-		}
-		if($_REQUEST['vat_check'] == 'on' || $_REQUEST['vat_check'] == 1)
-		{
-			$taxid = getTaxId('VAT');
-			$tax_per = $_REQUEST['vat_tax'];
-			if($tax_per == '')
-				$tax_per = getTaxPercentage('VAT');
-
-			$log->debug("Going to save the Product - VAT tax relationship");
-
-			$sql = "insert into vtiger_producttaxrel values($this->id,$taxid,$tax_per)";
-			$adb->query($sql);
-		}
-		//Save the Product - Sales tax relationship if Sales tax check box is enabled
-		if($_REQUEST['sales_check'] == 'on' || $_REQUEST['sales_check'] == 1)
-		{
-			$taxid = getTaxId('Sales');
-			$tax_per = $_REQUEST['sales_tax'];
-			if($tax_per == '')
-				$tax_per = getTaxPercentage('Sales');
-
-			$log->debug("Going to save the Product - Sales tax relationship");
-
-			$sql = "insert into vtiger_producttaxrel values($this->id,$taxid,$tax_per)";
-			$adb->query($sql);
-		}
-		//Save the Product - Service tax relationship if Service tax check box is enabled
-		if($_REQUEST['service_check'] == 'on' || $_REQUEST['service_check'] == 1)
-		{
-			$taxid = getTaxId('Service');
-			$tax_per = $_REQUEST['service_tax'];
-			if($tax_per == '')
-				$tax_per = getTaxPercentage('Service');
-
-			$log->debug("Going to save the Product - Service tax relationship");
-
-			$sql = "insert into vtiger_producttaxrel values($this->id,$taxid,$tax_per)";
-			$adb->query($sql);
-		}
-
-		$log->debug("Exiting from insertTaxInformation($tablename, $module) method ...");
-	}	
-
-}
-?>
+<?php
+/*********************************************************************************
+ * The contents of this file are subject to the SugarCRM Public License Version 1.1.2
+ * ("License"); You may not use this file except in compliance with the 
+ * License. You may obtain a copy of the License at http://www.sugarcrm.com/SPL
+ * Software distributed under the License is distributed on an  "AS IS"  basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
+ * the specific language governing rights and limitations under the License.
+ * The Original Code is:  SugarCRM Open Source
+ * The Initial Developer of the Original Code is SugarCRM, Inc.
+ * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.;
+ * All Rights Reserved.
+ * Contributor(s): ______________________________________.
+ ********************************************************************************/
+/*********************************************************************************
+ * $Header: /advent/projects/wesat/vtiger_crm/vtigercrm/data/CRMEntity.php,v 1.16 2005/04/29 04:21:31 mickie Exp $
+ * Description:  Defines the base class for all data entities used throughout the 
+ * application.  The base class including its methods and variables is designed to 
+ * be overloaded with module-specific methods and variables particular to the 
+ * module's base entity class. 
+ ********************************************************************************/
+
+include_once('config.php');
+require_once('include/logging.php');
+require_once('data/Tracker.php');
+require_once('include/utils/utils.php');
+require_once('include/utils/UserInfoUtil.php');
+
+class CRMEntity
+{
+  /**
+   * This method implements a generic insert and update logic for any SugarBean
+   * This method only works for subclasses that implement the same variable names.
+   * This method uses the presence of an id vtiger_field that is not null to signify and update.
+   * The id vtiger_field should not be set otherwise.
+   * todo - Add support for vtiger_field type validation and encoding of parameters.
+   * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.
+   * All Rights Reserved.
+   * Contributor(s): ______________________________________..
+   */
+
+	
+  function saveentity($module)
+  {
+	global $current_user, $adb;//$adb added by raju for mass mailing
+	$insertion_mode = $this->mode;
+
+	$this->db->println("TRANS saveentity starts $module");
+	$this->db->startTransaction();
+	
+	// Code included by Jaguar - starts    
+	if(isset($_REQUEST['recurringtype']) && $_REQUEST['recurringtype']!='')
+		$recur_type = trim($_REQUEST['recurringtype']);
+	else
+    		$recur_type='';	
+	// Code included by Jaguar - Ends
+
+	//Code included by Minnie - Starts
+	if(isset($_REQUEST['inviteesid']) && $_REQUEST['inviteesid']!='')
+	{
+		$selected_users_string =  $_REQUEST['inviteesid'];
+		$invitees_array = explode(';',$selected_users_string);
+
+	}
+	else
+		$invitees_array='';
+	//Code included by Minnie - Ends	
+
+	foreach($this->tab_name as $table_name)
+	{
+		if($table_name == "vtiger_crmentity")
+		{
+			$this->insertIntoCrmEntity($module);
+		}
+		elseif($table_name == "vtiger_salesmanactivityrel")
+		{
+			$this->insertIntoSmActivityRel($module);
+		}
+		//added by raju
+		elseif($table_name=="vtiger_seactivityrel" )
+		{
+			if($module=="Emails" && $_REQUEST['smodule']!='webmails')
+			//modified by Richie as raju's implementation broke the feature for addition of webmail to vtiger_crmentity.need to be more careful in future while integrating code
+			//if($_REQUEST['smodule']!='webmails' && $_REQUEST['smodule'] != '')
+			{
+				if($_REQUEST['currentid']!='')
+				{
+					$actid=$_REQUEST['currentid'];
+				}
+				else 
+				{
+					$actid=$_REQUEST['record'];
+				}
+				$parentid=$_REQUEST['parent_id'];
+				if($_REQUEST['module'] != 'Emails' && $_REQUEST['module'] != 'Webmails')
+				{
+					if(!$parentid) {
+						$parentid = $adb->getUniqueID('vtiger_seactivityrel');
+					}
+					$mysql='insert into vtiger_seactivityrel values('.$parentid.','.$actid.')';
+					$adb->query($mysql);
+				}
+				else
+				{	  
+					$myids=explode("|",$parentid);  //2 at 71|
+					for ($i=0;$i<(count($myids)-1);$i++)
+					{
+						$realid=explode("@",$myids[$i]);
+						$mycrmid=$realid[0];
+						//added to handle the relationship of emails with vtiger_users
+						if($realid[1] == -1)
+							$mysql='insert into vtiger_salesmanactivityrel values('.$mycrmid.','.$actid.')';
+						else	
+							$mysql='insert into vtiger_seactivityrel values('.$mycrmid.','.$actid.')';
+						$adb->query($mysql);
+					}
+				}
+			}
+			else
+			{
+				if(isset($this->column_fields['parent_id']) && $this->column_fields['parent_id'] != '')
+				{
+					$this->insertIntoEntityTable($table_name, $module);
+				}
+				elseif($this->column_fields['parent_id']=='' && $insertion_mode=="edit")
+				{
+					$this->deleteRelation($table_name);
+				}
+			}			
+		}
+		elseif($table_name == "vtiger_seticketsrel" || $table_name ==  "vtiger_seproductsrel" || $table_name ==  "vtiger_senotesrel")
+		{
+			if(isset($this->column_fields['parent_id']) && $this->column_fields['parent_id'] != '')//raju - mass mailing ends
+			{
+				$this->insertIntoEntityTable($table_name, $module);
+			}
+			elseif($this->column_fields['parent_id']=='' && $insertion_mode=="edit")
+			{
+				$this->deleteRelation($table_name);
+			}
+		}
+		elseif($table_name ==  "vtiger_cntactivityrel")
+		{
+			if(isset($this->column_fields['contact_id']) && $this->column_fields['contact_id'] != '')
+			{
+				$this->insertIntoEntityTable($table_name, $module);
+			}
+			elseif($this->column_fields['contact_id'] =='' && $insertion_mode=="edit")
+			{
+				$this->deleteRelation($table_name);
+			}
+
+		}
+		elseif($table_name ==  "vtiger_ticketcomments")
+		{
+                	$this->insertIntoTicketCommentTable($table_name, $module);
+		}
+		elseif($table_name ==  "vtiger_faqcomments")
+		{
+                	$this->insertIntoFAQCommentTable($table_name, $module);
+		}
+		elseif($table_name == "vtiger_activity_reminder")
+		{
+			if($recur_type == "--None--")
+			{
+				$this->insertIntoReminderTable($table_name,$module,"");
+			}
+		}
+		elseif($table_name == "vtiger_recurringevents") // Code included by Jaguar -  starts
+		{
+			$recur_type = trim($_REQUEST['recurringtype']);
+			if($recur_type != "--None--"  && $recur_type != '')
+		      	{		   
+	      			$this->insertIntoRecurringTable($table_name,$module);
+			}		
+		}// Code included by Jaguar - Ends
+		// Code included by Minnie  -  starts	
+		elseif($table_name == "vtiger_invitees") 
+		{
+			if($invitees_array != '')
+			{
+				$this->insertIntoInviteeTable($table_name,$module,$invitees_array);
+			}
+		}
+		// Code included by Minnie  -  Ends
+		elseif($table_name == 'vtiger_producttaxrel')
+		{
+			$this->insertTaxInformation($table_name, $module);
+		}
+		elseif($table_name == 'vtiger_attachments')
+		{
+			$this->insertIntoAttachment($this->id,$module);
+		}
+		else
+		{
+			$this->insertIntoEntityTable($table_name, $module);			
+		}
+	}
+
+	$this->db->completeTransaction();
+        $this->db->println("TRANS saveentity ends");
+  }
+
+
+	function insertIntoAttachment1($id,$module,$filedata,$filename,$filesize,$filetype,$user_id)
+	{
+		$date_var = date('YmdHis');
+		global $current_user;
+		global $adb;
+		//global $root_directory;
+		global $log;
+
+		$ownerid = $user_id;
+		
+		if($filesize != 0)
+		{
+			$data = base64_encode(fread(fopen($filedata, "r"), $filesize));
+		}
+		
+		$current_id = $adb->getUniqueID("vtiger_crmentity");
+
+		if($module=='Emails') 
+		{ 
+			$log->info("module is ".$module);
+			$idname='emailid';      $tablename='emails';    $descname='description';
+		}
+		else     
+		{ 
+			$idname='notesid';      $tablename='notes';     $descname='notecontent';
+		}
+
+		$sql="update ".$tablename." set filename='".$filename."' where ".$idname."=".$id;
+		$adb->query($sql);
+
+		$sql1 = "insert into vtiger_crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime,modifiedtime) values(".$current_id.",".$current_user->id.",".$ownerid.",'".$module." Attachment','"."',".$adb->formatString("vtiger_crmentity","createdtime",$date_var).",".$adb->formatString("vtiger_crmentity","modifiedtime",$date_var).")";
+		$adb->query($sql1);
+
+		$sql2="insert into vtiger_attachments(attachmentsid, name, description, type) values(".$current_id.",'".$filename."','"."','".$filetype."')";
+		$result=$adb->query($sql2);
+
+		//TODO -- instead of put contents in db now we should store the file in harddisk
+
+		$sql3='insert into vtiger_seattachmentsrel values('.$id.','.$current_id.')';
+		$adb->query($sql3);
+	}
+
+
+	/**
+	 *      This function is used to add the vtiger_attachments. This will call the function uploadAndSaveFile which will upload the attachment into the server and save that attachment information in the database.
+	 *      @param int $id  - entity id to which the vtiger_files to be uploaded
+	 *      @param string $module  - the current module name
+	*/
+	function insertIntoAttachment($id,$module)
+	{
+		global $log, $adb;
+		$log->debug("Entering into insertIntoAttachment($id,$module) method.");
+		
+		$file_saved = false;
+
+		//This is to added to store the existing attachment id of the contact where we should delete this when we give new image
+		if($module == 'Contacts')
+			$old_attachmentid = $adb->query_result($adb->query("select * from vtiger_seattachmentsrel where crmid=$id"),0,'attachmentsid');
+
+		foreach($_FILES as $fileindex => $files)
+		{
+			if($files['name'] != '' && $files['size'] > 0)
+			{
+				$file_saved = $this->uploadAndSaveFile($id,$module,$files);
+			}
+		}
+
+		//This is to handle the delete image for contacts
+		if($module == 'Contacts' && $file_saved)
+		{
+			$del_res1 = $adb->query("delete from vtiger_attachments where attachmentsid=$old_attachmentid");
+			$del_res2 = $adb->query("delete from vtiger_seattachmentsrel where attachmentsid=$old_attachmentid");
+		}
+
+
+		//Remove the deleted vtiger_attachments from db - Products
+		if($module == 'Products' && $_REQUEST['del_file_list'] != '')
+		{
+			$del_file_list = explode("###",trim($_REQUEST['del_file_list'],"###"));
+			foreach($del_file_list as $del_file_name)
+			{
+				$attach_res = $adb->query("select vtiger_attachments.attachmentsid from vtiger_attachments inner join vtiger_seattachmentsrel on vtiger_attachments.attachmentsid=vtiger_seattachmentsrel.attachmentsid where crmid=$id and name=\"$del_file_name\"");
+				$attachments_id = $adb->query_result($attach_res,0,'attachmentsid');
+				
+				$del_res1 = $adb->query("delete from vtiger_attachments where attachmentsid=$attachments_id");
+				$del_res2 = $adb->query("delete from vtiger_seattachmentsrel where attachmentsid=$attachments_id");
+			}
+		}
+
+		$log->debug("Exiting from insertIntoAttachment($id,$module) method.");
+	}
+
+	/**
+	 *      This function is used to upload the attachment in the server and save that attachment information in db.
+	 *      @param int $id  - entity id to which the file to be uploaded
+	 *      @param string $module  - the current module name
+	 *      @param array $file_details  - array which contains the file information(name, type, size, tmp_name and error)
+	 *      return void
+	*/
+	function uploadAndSaveFile($id,$module,$file_details)
+	{
+		global $log;
+		$log->debug("Entering into uploadAndSaveFile($id,$module,$file_details) method.");
+
+		global $adb, $current_user;
+		global $upload_badext;
+
+		$date_var = date('YmdHis');
+
+		//to get the owner id
+		$ownerid = $this->column_fields['assigned_user_id'];
+		if(!isset($ownerid) || $ownerid=='')
+			$ownerid = $current_user->id;
+
+	
+		// Arbitrary File Upload Vulnerability fix - Philip
+		$binFile = $file_details['name'];
+		$ext_pos = strrpos($binFile, ".");
+
+		$ext = substr($binFile, $ext_pos + 1);
+
+		if (in_array($ext, $upload_badext))
+		{
+			$binFile .= ".txt";
+		}
+		// Vulnerability fix ends
+
+		$current_id = $adb->getUniqueID("vtiger_crmentity");
+
+		$filename = basename($binFile);
+		$filetype= $file_details['type'];
+		$filesize = $file_details['size'];
+		$filetmp_name = $file_details['tmp_name'];
+
+		//get the file path inwhich folder we want to upload the file
+		$upload_file_path = decideFilePath();
+
+		//upload the file in server
+		$upload_status = move_uploaded_file($filetmp_name,$upload_file_path.$current_id."_".$binFile);
+
+		$save_file = 'true';
+		//only images are allowed for these modules
+		if($module == 'Contacts' || $module == 'Products')
+		{
+			$save_file = validateImageFile(&$file_details);
+		}
+
+		if($save_file == 'true' && $upload_status == 'true')
+		{
+			//This is only to update the attached filename in the vtiger_notes vtiger_table for the Notes module
+			if($module=='Notes')
+			{
+				$sql="update vtiger_notes set filename='".$filename."' where notesid = ".$id;
+				$adb->query($sql);
+			}
+
+			$sql1 = "insert into vtiger_crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime,modifiedtime) values(".$current_id.",".$current_user->id.",".$ownerid.",'".$module." Attachment','".$this->column_fields['description']."',".$adb->formatString("vtiger_crmentity","createdtime",$date_var).",".$adb->formatString("vtiger_crmentity","modifiedtime",$date_var).")";
+			$adb->query($sql1);
+
+			$sql2="insert into vtiger_attachments(attachmentsid, name, description, type, path) values(".$current_id.",'".$filename."','".$this->column_fields['description']."','".$filetype."','".$upload_file_path."')";
+			$result=$adb->query($sql2);
+
+			if($_REQUEST['mode'] == 'edit')
+			{
+				if($id != '' && $_REQUEST['fileid'] != '')
+				{
+					$delquery = 'delete from vtiger_seattachmentsrel where crmid = '.$id.' and attachmentsid = '.$_REQUEST['fileid'];
+					$adb->query($delquery);
+				}
+			}
+			if($module == 'Notes')
+			{
+				$query = "delete from vtiger_seattachmentsrel where crmid = ".$id;
+				$adb->query($query);
+			}
+			$sql3='insert into vtiger_seattachmentsrel values('.$id.','.$current_id.')';
+			$adb->query($sql3);
+
+			return true;
+		}
+		else
+		{
+			$log->debug("Skip the save attachment process.");
+			return false;
+		}
+	}
+
+
+
+  function insertIntoCrmEntity($module)
+  {
+	global $adb;
+	global $current_user;
+	global $log;
+                
+	$date_var = date('YmdHis');
+	if($_REQUEST['assigntype'] == 'T')
+	{
+		$ownerid= 0;
+	}
+	else
+	{
+		$ownerid = $this->column_fields['assigned_user_id'];
+	}
+                
+	if($module == 'Products' || $module == 'Notes' || $module =='Faq' || $module == 'Vendors' || $module == 'PriceBooks')
+	{
+		$log->info("module is =".$module);
+		$ownerid = $current_user->id;
+	}
+	if($module == 'Events')
+	{
+		$module = 'Activities';
+	}
+	if($this->mode == 'edit')
+	{
+		$description_val = from_html($adb->formatString("vtiger_crmentity","description",$this->column_fields['description']),($insertion_mode == 'edit')?true:false);
+		$sql = "update vtiger_crmentity set smownerid=".$ownerid.",modifiedby=".$current_user->id.",description=".$description_val.", modifiedtime=".$adb->formatString("vtiger_crmentity","modifiedtime",$date_var)." where crmid=".$this->id;
+
+		$adb->query($sql);
+		$sql1 ="delete from vtiger_ownernotify where crmid=".$this->id;
+		$adb->query($sql1);
+		if($ownerid != $current_user->id)
+		{
+			$sql1 = "insert into vtiger_ownernotify values(".$this->id.",".$ownerid.",null)";
+			$adb->query($sql1);
+		}
+	}
+	else
+	{
+		//if this is the create mode and the group allocation is chosen, then do the following
+		$current_id = $adb->getUniqueID("vtiger_crmentity");
+		$_REQUEST['currentid']=$current_id;
+
+		$description_val = from_html($adb->formatString("vtiger_crmentity","description",$this->column_fields['description']),($insertion_mode == 'edit')?true:false);
+		$sql = "insert into vtiger_crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime,modifiedtime) values('".$current_id."','".$current_user->id."','".$ownerid."','".$module."',".$description_val.",".$adb->formatDate($date_var).",".$adb->formatDate($date_var).")";
+		$adb->query($sql);
+		$this->id = $current_id;
+	}
+
+    }
+
+
+
+  function insertIntoSmActivityRel($module)
+  {
+    global $adb;
+    global $current_user;
+    if($this->mode == 'edit')
+    {
+
+      $sql = "delete from vtiger_salesmanactivityrel where activityid=".$this->id." and smid = ".$this->column_fields['assigned_user_id']."";
+      $adb->query($sql);
+
+    }
+	$sql_qry = "insert into vtiger_salesmanactivityrel (smid,activityid) values(".$this->column_fields['assigned_user_id'].",".$this->id.")";
+    $adb->query($sql_qry);
+
+  }
+  //code added by richie starts
+  function constructUpdateLog($id)
+  {
+    global $adb;
+    global $current_user;
+    $ticketid = $id;
+    //Updating History
+    $tktresult = $adb->query("select * from vtiger_troubletickets where ticketid='".$ticketid."'");
+    $crmresult = $adb->query("select * from vtiger_crmentity where crmid='".$ticketid."'");
+    $updatelog = $adb->query_result($tktresult,0,"update_log");
+    $old_user_id = $adb->query_result($crmresult,0,"smownerid");
+    $old_status = $adb->query_result($tktresult,0,"status");
+    $old_priority = $adb->query_result($tktresult,0,"priority");
+    $old_severity = $adb->query_result($tktresult,0,"severity");
+    $old_category = $adb->query_result($tktresult,0,"category");
+    if($_REQUEST['old_smownerid'] != $old_user_id && $old_user_id != 0)
+    {
+      $user_name = getUserName($this->column_fields['assigned_user_id']);
+      $updatelog .= ' Transferred to '.$user_name.'\.';
+    }
+    elseif($old_user_id == 0)
+    {
+	$group_info = getGroupName($ticketid,'HelpDesk');	
+	$group_name = $group_info[0];	
+	if($group_name != $_REQUEST['assigned_group_name'])
+		$updatelog .= ' Transferred to group '.$_REQUEST['assigned_group_name'].'\.';
+    }
+    if($old_status != $this->column_fields['ticketstatus'])
+    {
+      $updatelog .= ' Status Changed to '.$this->column_fields['ticketstatus'].'\.';
+    }
+    if($old_priority != $this->column_fields['ticketpriorities'])
+    {
+      $updatelog .= ' Priority Changed to '.$this->column_fields['ticketpriorities'].'\.';
+    }
+    if($old_severity != $this->column_fields['ticketseverities'])
+    {
+      $updatelog .= ' Severity Changed to '.$this->column_fields['ticketseverities'].'\.';
+    }
+    if($old_category != $this->column_fields['ticketcategories'])
+    {
+      $updatelog .= ' Category Changed to '.$this->column_fields['ticketcategories'].'\.';
+    }
+    if($_REQUEST['old_smownerid'] != $old_user_id || $old_status != $this->column_fields['ticketstatus'] || $old_priority != $this->column_fields['ticketpriorities'] || $old_severity != $this->column_fields['ticketseverities'] || $old_category != $this->column_fields['ticketcategories'] || $old_userid == 0)
+    {
+      $updatelog .= ' -- '.date("l dS F Y h:i:s A").' by '.$current_user->user_name.'--//--';
+    }
+    else
+    {
+        $update_log .= '--//--';
+    }
+
+    return $updatelog;
+  }
+  //code added by richie ends
+  function insertIntoEntityTable($table_name, $module)
+  {
+	  global $log;	
+	   $log->info("function insertIntoCrmEntity ".$module.' vtiger_table name ' .$table_name);
+	  global $adb;
+	  $insertion_mode = $this->mode;
+
+	  //Checkin whether an entry is already is present in the vtiger_table to update
+	  if($insertion_mode == 'edit')
+	  {
+		  $check_query = "select * from ".$table_name." where ".$this->tab_name_index[$table_name]."=".$this->id;
+		  $check_result=$adb->query($check_query);
+
+		  $num_rows = $adb->num_rows($check_result);
+
+		  if($num_rows <= 0)
+		  {
+			  $insertion_mode = '';
+		  }	 
+	  }
+
+	  if($insertion_mode == 'edit')
+	  {
+		  $update = '';
+		  $tabid= getTabid($module);	
+		  $sql = "select * from vtiger_field where tabid=".$tabid." and tablename='".$table_name."' and displaytype in (1,3)"; 
+	  }
+	  else
+	  {
+		  $column = $this->tab_name_index[$table_name];
+		  if($column == 'id' && $table_name == 'vtiger_users')
+		  {
+		 	$currentuser_id = $adb->getUniqueID("vtiger_users");
+			$this->id = $currentuser_id;
+		  }
+		  $value = $this->id;
+	  	  $tabid= getTabid($module);	
+		  $sql = "select * from vtiger_field where tabid=".$tabid." and tablename='".$table_name."' and displaytype in (1,3,4)"; 
+	  }
+
+	  $result = $adb->query($sql);
+	  $noofrows = $adb->num_rows($result);
+	  for($i=0; $i<$noofrows; $i++)
+	  {
+		  $fieldname=$adb->query_result($result,$i,"fieldname");
+		  $columname=$adb->query_result($result,$i,"columnname");
+		  $uitype=$adb->query_result($result,$i,"uitype");
+		  if(isset($this->column_fields[$fieldname]))
+		  {
+			  if($uitype == 56)
+			  {
+				  if($this->column_fields[$fieldname] == 'on' || $this->column_fields[$fieldname] == 1)
+				  {
+					  $fldvalue = 1;
+				  }
+				  else
+				  {
+					  $fldvalue = 0;
+				  }
+
+			  }
+			  elseif($uitype == 33)
+			  {
+				$j = 0;
+				$field_list = '';
+				if(is_array($this->column_fields[$fieldname]) && count($this->column_fields[$fieldname]) > 0)
+				{
+					foreach($this->column_fields[$fieldname] as $key=>$multivalue)
+					{
+						if($j != 0)
+						{
+							$field_list .= ' , ';
+						}
+						$field_list .= $multivalue;
+						$j++;
+					}
+				}
+				$fldvalue = $field_list;
+			  }
+			  elseif($uitype == 5 || $uitype == 6 || $uitype ==23)
+			  {
+				  if($_REQUEST['action'] == 'Import')
+				  {
+					  $fldvalue = $this->column_fields[$fieldname];
+				  }
+				  else
+				  {
+					  $fldvalue = getDBInsertDateValue($this->column_fields[$fieldname]);
+				  }
+			  }
+			  else
+			  {
+				  $fldvalue = $this->column_fields[$fieldname]; 
+				  $fldvalue = stripslashes($fldvalue);
+			  }
+			  $fldvalue = from_html($adb->formatString($table_name,$columname,$fldvalue),($insertion_mode == 'edit')?true:false);
+
+
+
+		  }
+		  else
+		  {
+			  $fldvalue = '';
+		  }
+		  if($fldvalue=='') $fldvalue ="NULL";
+		  if($insertion_mode == 'edit')
+		  {
+			  //code by richie starts
+			  if(($table_name == "vtiger_troubletickets") && ($columname == "update_log"))
+			  {
+				  $fldvalue = $this->constructUpdateLog($this->id);
+				  $fldvalue = from_html($adb->formatString($table_name,$columname,$fldvalue),($insertion_mode == 'edit')?true:false);
+			  }
+			  //code by richie ends
+
+			  if($table_name == 'vtiger_notes' && $columname == 'filename' && $_FILES['filename']['name'] == '')
+			  {
+				  $fldvalue = $this->getOldFileName($this->id);
+			  }
+			  if($table_name == 'vtiger_products' && $columname == 'imagename')
+			  {
+					  
+
+			  }
+			  if($table_name != 'vtiger_ticketcomments')
+			  {
+				  if($i == 0)
+				  {
+					  $update = $columname."=".$fldvalue."";
+				  }
+				  else
+				  {
+					  $update .= ', '.$columname."=".$fldvalue."";
+				  }
+			  }
+		  }
+		  else
+		  {
+			  //code by richie starts
+			  if(($table_name == "vtiger_troubletickets") && ($columname == "update_log"))
+			  {
+				  global $current_user;
+				  $fldvalue = date("l dS F Y h:i:s A").' by '.$current_user->user_name;
+				  if($_REQUEST['assigned_group_name'] != '' && $_REQUEST['assigntype'] == 'T')
+                                  {
+                                        $group_name = $_REQUEST['assigned_group_name'];
+                                  }
+				  elseif($this->column_fields['assigned_user_id'] != '')
+				  {
+					  $tkt_ownerid = $this->column_fields['assigned_user_id'];
+				  }
+				  else
+				  {
+					  $tkt_ownerid = $current_user->id;
+				  }
+				  if($group_name != '')
+					  $tkt_ownername = $group_name;
+				  else
+					  $tkt_ownername = getUserName($tkt_ownerid);	
+				  $fldvalue = " Ticket created. Assigned to ".$tkt_ownername." -- ".$fldvalue."--//--";
+				  $fldvalue = from_html($adb->formatString($table_name,$columname,$fldvalue),($insertion_mode == 'edit')?true:false);
+				  //echo ' updatevalue is ............. ' .$fldvalue;
+			  }
+			  //code by richie ends
+			  $column .= ", ".$columname;
+			  $value .= ", ".$fldvalue."";
+		  }
+
+	  }
+
+
+
+
+
+	  if($insertion_mode == 'edit')
+	  {
+		  if($_REQUEST['module'] == 'Potentials')
+		  {
+			  $dbquery = 'select sales_stage from vtiger_potential where potentialid = '.$this->id;
+			  $sales_stage = $adb->query_result($adb->query($dbquery),0,'sales_stage');
+			  if($sales_stage != $_REQUEST['sales_stage'])
+			  {
+				  $date_var = date('YmdHis');
+				  $closingdate = getDBInsertDateValue($_REQUEST['closingdate']);
+				  $sql = "insert into vtiger_potstagehistory values('',".$this->id.",'".$_REQUEST['amount']."','".$sales_stage."','".$_REQUEST['probability']."',0,".$adb->formatString("vtiger_potstagehistory","closedate",$closingdate).",".$adb->formatString("vtiger_potstagehistory","lastmodified",$date_var).")";
+				  $adb->query($sql);
+			  }
+		  }
+		  elseif($_REQUEST['module'] == 'PurchaseOrder' || $_REQUEST['module'] == 'SalesOrder' || $_REQUEST['module'] == 'Quotes' || $_REQUEST['module'] == 'Invoice')
+		  {
+			  //added to update the history for PO, SO, Quotes and Invoice
+			  $history_field_array = Array(
+				  			"PurchaseOrder"=>"postatus",
+							"SalesOrder"=>"sostatus",
+							"Quotes"=>"quotestage",
+							"Invoice"=>"invoicestatus"
+						      );
+
+			  $inventory_module = $_REQUEST['module'];
+			  if($inventory_module == "PurchaseOrder")
+			  	$relatedname = $_REQUEST["vendor_name"];
+			  else
+			  	$relatedname = $_REQUEST["account_name"];
+
+			  $oldvalue = getSingleFieldValue($this->table_name,$history_field_array[$inventory_module],$this->module_id,$this->id);
+			  if($oldvalue != $this->column_fields["$history_field_array[$inventory_module]"])
+			  {
+				  addInventoryHistory($inventory_module, $this->id,$relatedname,$_REQUEST['grandTotal'],$this->column_fields["$history_field_array[$inventory_module]"]);
+			  }
+		  }
+
+		  //Check done by Don. If update is empty the the query fails
+		  if(trim($update) != '')
+        	  {
+		  	$sql1 = "update ".$table_name." set ".$update." where ".$this->tab_name_index[$table_name]."=".$this->id;
+
+		  	$adb->query($sql1); 
+		  }
+
+		  if($_REQUEST['assigntype'] == 'T')
+		  {
+			  $groupname = $_REQUEST['assigned_group_name'];
+			  //echo 'about to update lead group relation';
+			  if($module == 'Leads' && $table_name == 'vtiger_leaddetails')
+			  {
+				  updateLeadGroupRelation($this->id,$groupname);
+			  }
+                          elseif($module == 'Accounts' && $table_name == 'vtiger_account')
+			  {
+				  updateAccountGroupRelation($this->id,$groupname);
+			  }
+			  elseif($module == 'Contacts' && $table_name == 'vtiger_contactdetails')
+			  {
+				  updateContactGroupRelation($this->id,$groupname);
+			  }
+			  elseif($module == 'Potentials' && $table_name == 'vtiger_potential')
+			  {
+				  updatePotentialGroupRelation($this->id,$groupname);
+			  }
+			  elseif($module == 'Quotes' && $table_name == 'vtiger_quotes')
+			  {
+				  updateQuoteGroupRelation($this->id,$groupname);
+			  }
+			  elseif($module == 'SalesOrder' && $table_name == 'vtiger_salesorder')
+			  {
+				  updateSoGroupRelation($this->id,$groupname);
+			  }
+			  elseif($module == 'Invoice' && $table_name == 'vtiger_invoice')
+			  {
+				  updateInvoiceGroupRelation($this->id,$groupname);
+			  }
+			  elseif($module == 'PurchaseOrder' && $table_name == 'vtiger_purchaseorder')
+			  {
+				  updatePoGroupRelation($this->id,$groupname);
+			  }
+			  elseif($module == 'HelpDesk' && $table_name == 'vtiger_troubletickets')
+			  {
+				  updateTicketGroupRelation($this->id,$groupname);
+			  }
+			  elseif($module == 'Campaigns' && $table_name == 'vtiger_campaign')
+			  {
+				  updateCampaignGroupRelation($this->id,$groupname);
+			  }
+			  elseif($module =='Activities' || $module =='Events' || $module == 'Emails')
+			  {
+				 if($table_name == 'vtiger_activity')
+				 {
+				   updateActivityGroupRelation($this->id,$groupname);
+				 }
+			  }
+			   	
+
+		  }
+		  else
+		  {
+			  //echo 'about to update lead group relation again!';
+			  if($module == 'Leads' && $table_name == 'vtiger_leaddetails')
+			  {
+				  updateLeadGroupRelation($this->id,'');
+			  }
+			  elseif($module == 'Accounts' && $table_name == 'vtiger_account')
+			  {
+				  updateAccountGroupRelation($this->id,'');
+			  }
+			  elseif($module == 'Contacts' && $table_name == 'vtiger_contactdetails')
+			  {
+				  updateContactGroupRelation($this->id,'');
+			  }
+			  elseif($module == 'Potentials' && $table_name == 'vtiger_potential')
+			  {
+				  updatePotentialGroupRelation($this->id,'');
+			  }
+			  elseif($module == 'Quotes' && $table_name == 'vtiger_quotes')
+			  {
+				  updateQuoteGroupRelation($this->id,'');
+			  }
+			  elseif($module == 'SalesOrder' && $table_name == 'vtiger_salesorder')
+			  {
+				  updateSoGroupRelation($this->id,'');
+			  }
+			  elseif($module == 'Invoice' && $table_name == 'vtiger_invoice')
+			  {
+				  updateInvoiceGroupRelation($this->id,'');
+			  }
+			  elseif($module == 'PurchaseOrder' && $table_name == 'vtiger_purchaseorder')
+			  {
+				  updatePoGroupRelation($this->id,'');
+			  }
+			  elseif($module == 'HelpDesk' && $table_name == 'vtiger_troubletickets')
+			  {
+				  updateTicketGroupRelation($this->id,'');
+			  }
+			  elseif($module == 'Campaigns' && $table_name == 'vtiger_campaign')
+			  {
+				  updateCampaignGroupRelation($this->id,$groupname);
+			  }
+			  elseif($module =='Activities' || $module =='Events' || $module == 'Emails')
+			  {
+				  if($table_name == 'vtiger_activity')
+                                  {
+			             updateActivityGroupRelation($this->id,$groupname);
+				  }
+			  }
+			  	
+
+		  }
+
+	  }
+	  else
+	  {	
+		  $sql1 = "insert into ".$table_name." (".$column.") values(".$value.")";
+		  $adb->query($sql1); 
+		  $groupname = $_REQUEST['assigned_group_name'];
+		  if($_REQUEST['assigntype'] == 'T' && $table_name == 'vitger_leaddetails')
+		  {
+			  insert2LeadGroupRelation($this->id,$groupname);
+		  }
+		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'vitger_account')
+		  {
+			  insert2AccountGroupRelation($this->id,$groupname);
+		  }
+		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'vitger_contactdetails')
+		  {
+			  insert2ContactGroupRelation($this->id,$groupname);
+		  }
+		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'vitger_potential')
+		  {
+			  insert2PotentialGroupRelation($this->id,$groupname);
+		  }
+		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'vitger_quotes')
+		  {
+			  insert2QuoteGroupRelation($this->id,$groupname);
+		  }
+		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'vitger_salesorder')
+		  {
+			  insert2SoGroupRelation($this->id,$groupname);
+		  }
+		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'vitger_invoice')
+		  {
+			  insert2InvoiceGroupRelation($this->id,$groupname);
+		  }
+		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'vitger_purchaseorder')
+		  {
+			  insert2PoGroupRelation($this->id,$groupname);
+		  }
+		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'vitger_activity') 
+		  {
+			  insert2ActivityGroupRelation($this->id,$groupname);
+		  }
+		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'vitger_troubletickets') 
+		  {
+			  insert2TicketGroupRelation($this->id,$groupname);
+		  }
+		  elseif($_REQUEST['assigntype'] == 'T' && $table_name == 'vitger_campaign')
+		  {
+			  insert2CampaignGroupRelation($this->id,$groupname);
+		  }
+
+	  }
+
+  }
+function deleteRelation($table_name)
+{
+         global $adb;
+         $check_query = "select * from ".$table_name." where ".$this->tab_name_index[$table_name]."=".$this->id;
+         $check_result=$adb->query($check_query);
+         $num_rows = $adb->num_rows($check_result);
+
+         if($num_rows == 1)
+         {
+                $del_query = "DELETE from ".$table_name." where ".$this->tab_name_index[$table_name]."=".$this->id;
+                $adb->query($del_query);
+         }
+
+}
+function getOldFileName($notesid)
+{
+	   global $log;
+$log->info("in getOldFileName  ".$notesid);
+	global $adb;
+	$query1 = "select * from vtiger_seattachmentsrel where crmid=".$notesid;
+	$result = $adb->query($query1);
+	$noofrows = $adb->num_rows($result);
+	if($noofrows != 0)
+		$attachmentid = $adb->query_result($result,0,'attachmentsid');
+	if($attachmentid != '')
+	{
+		$query2 = "select * from vtiger_attachments where attachmentsid=".$attachmentid;
+		$filename = $adb->query_result($adb->query($query2),0,'name');
+	}
+	return "'".$filename."'";
+}
+function insertIntoTicketCommentTable($table_name, $module)
+{
+	global $log;
+	$log->info("in insertIntoTicketCommentTable  ".$table_name."    module is  ".$module);
+        global $adb;
+	global $current_user;
+
+        $current_time = date('Y-m-d H:i:s');
+	if($_REQUEST['assigned_user_id'] != '')
+		$ownertype = 'user';
+	else
+		$ownertype = 'customer';
+
+	if($this->column_fields['comments'] != '')
+		$comment = $this->column_fields['comments'];
+	else
+		$comment = $_REQUEST['comments'];
+
+	if($comment != '')
+	{
+		$comment = addslashes($comment);
+		$sql = "insert into vtiger_ticketcomments values('',".$this->id.",'".$comment."','".$current_user->id."','".$ownertype."','".$current_time."')";
+	        $adb->query($sql);
+	}
+}
+function insertIntoFAQCommentTable($table_name, $module)
+{
+	 global $log;
+	$log->info("in insertIntoFAQCommentTable  ".$table_name."    module is  ".$module);
+        global $adb;
+
+        $current_time = date('Y-m-d H:i:s');
+
+	if($_REQUEST['comments'] != '')
+	{
+		$comment = addslashes($_REQUEST['comments']);
+		$sql = "insert into vtiger_faqcomments values('',".$this->id.",'".$comment."','".$current_time."')";
+		$adb->query($sql);
+	}
+}
+function insertIntoReminderTable($table_name,$module,$recurid)
+{
+	 global $log;
+$log->info("in insertIntoReminderTable  ".$table_name."    module is  ".$module);
+	if($_REQUEST['set_reminder'] == 'Yes')
+	{
+$log->debug("set reminder is set");
+		$rem_days = $_REQUEST['remdays'];
+$log->debug("rem_days is ".$rem_days);
+		$rem_hrs = $_REQUEST['remhrs'];
+$log->debug("rem_hrs is ".$rem_hrs);
+		$rem_min = $_REQUEST['remmin'];
+$log->debug("rem_minutes is ".$rem_min);
+		$reminder_time = $rem_days * 24 * 60 + $rem_hrs * 60 + $rem_min;
+$log->debug("reminder_time is ".$reminder_time);
+		if ($recurid == "")
+		{
+			if($_REQUEST['mode'] == 'edit')
+			{
+				$this->activity_reminder($this->id,$reminder_time,0,$recurid,'edit');
+			}
+			else
+			{
+				$this->activity_reminder($this->id,$reminder_time,0,$recurid,'');
+			}
+		}
+		else
+		{
+			$this->activity_reminder($this->id,$reminder_time,0,$recurid,'');
+		}
+	}
+	elseif($_REQUEST['set_reminder'] == 'No')
+	{
+		$this->activity_reminder($this->id,'0',0,$recurid,'delete');
+	}
+}
+
+// Code included by Minnie - starts
+function insertIntoInviteeTable($table_name,$module,$invitees_array)
+{
+	global $log,$adb;
+	$log->debug("Entering insertIntoInviteeTable(".$table_name.",".$module.",".$invitees_array.") method ...");
+	foreach($invitees_array as $inviteeid)
+	{
+		if($inviteeid != '')
+		{
+			$query="insert into vtiger_invitees values(".$this->id.",".$inviteeid.")";
+			$adb->query($query);
+		}
+	}
+	$log->debug("Exiting insertIntoInviteeTable method ...");
+
+}
+// Code included by Minnie - Ends
+
+// Code included by Jaguar - starts 
+function insertIntoRecurringTable($table_name,$module)
+{
+	global $log;
+$log->info("in insertIntoRecurringTable  ".$table_name."    module is  ".$module);
+        global $adb;
+        $st_date = getDBInsertDateValue($_REQUEST["date_start"]);
+$log->debug("st_date ".$st_date);
+        $end_date = getDBInsertDateValue($_REQUEST["due_date"]);
+$log->debug("end_date is set ".$end_date);
+        $st=explode("-",$st_date);
+$log->debug("exploding string is ".$st);
+        $end=explode("-",$end_date);
+$log->debug("exploding string again is ".$end);
+        $type = trim($_REQUEST['recurringtype']);
+$log->debug("type is ".$type);
+        $flag="true";
+
+	if($_REQUEST['mode'] == 'edit')
+	{
+		$activity_id=$this->id;
+
+		$sql='select min(recurringdate) AS min_date,max(recurringdate) AS max_date, recurringtype, activityid from vtiger_recurringevents where activityid='. $activity_id.' group by activityid, recurringtype';
+		
+		$result = $adb->query($sql);
+		$noofrows = $adb->num_rows($result);
+		for($i=0; $i<$noofrows; $i++)
+		{
+			$recur_type_b4_edit = $adb->query_result($result,$i,"recurringtype");
+			$date_start_b4edit = $adb->query_result($result,$i,"min_date");
+			$end_date_b4edit = $adb->query_result($result,$i,"max_date");
+		}
+		if(($st_date == $date_start_b4edit) && ($end_date==$end_date_b4edit) && ($type == $recur_type_b4_edit))
+		{
+			if($_REQUEST['set_reminder'] == 'Yes')
+			{
+				$sql = 'delete from vtiger_activity_reminder where activity_id='.$activity_id;
+				$adb->query($sql);
+				$sql = 'delete  from vtiger_recurringevents where activityid='.$activity_id;
+				$adb->query($sql);
+				$flag="true";
+			}
+			elseif($_REQUEST['set_reminder'] == 'No')
+			{
+				$sql = 'delete  from vtiger_activity_reminder where activity_id='.$activity_id;
+				$adb->query($sql);
+				$flag="false";
+			}
+			else
+				$flag="false";
+		}
+		else
+		{
+			$sql = 'delete from vtiger_activity_reminder where activity_id='.$activity_id;
+			$adb->query($sql);
+			$sql = 'delete  from vtiger_recurringevents where activityid='.$activity_id;
+			$adb->query($sql);
+		}
+	}
+	if($flag=="true")
+	{
+		$date_val=$st_date;
+		$date_array[]=$st_date;
+		if($type !=  "--None--")
+		{
+			while($date_val <= $end_date)
+			{
+				if($type == 'Daily')
+				{
+					$date_val = date("Y-m-d",mktime(0,0,0,date("$st[1]"),(date("$st[2]")+(1)),date("$st[0]")));
+				}
+				elseif($type == 'Weekly')
+				{
+					$date_val = date("Y-m-d",mktime(0,0,0,date("$st[1]"),(date("$st[2]")+(7)),date("$st[0]")));
+				}
+				elseif($type == 'Monthly' )
+				{
+					$date_val = date("Y-m-d",mktime(0,0,0,(date("$st[1]")+1),date("$st[2]"),date("$st[0]")));
+				}
+				elseif($type == 'Yearly')
+				{
+					$date_val = date("Y-m-d",mktime(0,0,0,date("$st[1]"),date("$st[2]"),(date("$st[0]")+1)));
+				}
+				$date_array[]=$date_val;
+				$st=explode("-",$date_val);
+			}
+			for($k=0; $k< count($date_array); $k++)
+			{
+				$tdate=$date_array[$k];
+				if($tdate <= $end_date)
+				{
+					$max_recurid_qry = 'select max(recurringid) AS recurid from vtiger_recurringevents;';
+					$result = $adb->query($max_recurid_qry);
+					$noofrows = $adb->num_rows($result);
+					for($i=0; $i<$noofrows; $i++)
+					{
+						$recur_id = $adb->query_result($result,$i,"recurid");
+					}
+					$current_id =$recur_id+1;
+					$recurring_insert = "insert into vtiger_recurringevents values ('".$current_id."','".$this->id."','".$tdate."','".$type."')";
+					$adb->query($recurring_insert);
+					if($_REQUEST['set_reminder'] == 'Yes')
+					{
+						$this->insertIntoReminderTable("activity_reminder",$module,$current_id,'');
+					}
+				}
+			}
+		}
+	}
+}
+
+// Code included by Jaguar - Ends 
+
+	
+  function retrieve_entity_info($record, $module)
+  {
+    global $adb,$log;
+    $result = Array();
+    foreach($this->tab_name_index as $table_name=>$index)
+    {
+	    $result[$table_name] = $adb->query("select * from ".$table_name." where ".$index."=".$record);
+    }
+    $tabid = getTabid($module);
+    $sql1 =  "select * from vtiger_field where tabid=".$tabid;
+    $result1 = $adb->query($sql1);
+    $noofrows = $adb->num_rows($result1);
+    for($i=0; $i<$noofrows; $i++)
+    {
+      $fieldcolname = $adb->query_result($result1,$i,"columnname");
+      $tablename = $adb->query_result($result1,$i,"tablename");
+      $fieldname = $adb->query_result($result1,$i,"fieldname");
+
+      $fld_value = $adb->query_result($result[$tablename],0,$fieldcolname);
+      $this->column_fields[$fieldname] = $fld_value;
+				
+    }
+	if($module == 'Users')
+	{
+		for($i=0; $i<$noofrows; $i++)
+		{
+			$fieldcolname = $adb->query_result($result1,$i,"columnname");
+			$tablename = $adb->query_result($result1,$i,"tablename");
+			$fieldname = $adb->query_result($result1,$i,"fieldname");
+			$fld_value = $adb->query_result($result[$tablename],0,$fieldcolname);
+			$this->$fieldname = $fld_value;
+
+		}
+	}
+		
+    $this->column_fields["record_id"] = $record;
+    $this->column_fields["record_module"] = $module;
+  }
+
+	function save($module_name) 
+	{
+		global $log;
+	        $log->debug("module name is ".$module_name);
+		//GS Save entity being called with the modulename as parameter
+		$this->saveentity($module_name);
+	}
+  
+	function process_list_query($query, $row_offset, $limit= -1, $max_per_page = -1)
+	{
+		global $list_max_entries_per_page;
+		$this->log->debug("process_list_query: ".$query);
+		if(!empty($limit) && $limit != -1){
+			$result =& $this->db->limitQuery($query, $row_offset + 0, $limit,true,"Error retrieving $this->object_name list: ");
+		}else{
+			$result =& $this->db->query($query,true,"Error retrieving $this->object_name list: ");
+		}
+
+		$list = Array();
+		if($max_per_page == -1){
+			$max_per_page 	= $list_max_entries_per_page;
+		}
+		$rows_found =  $this->db->getRowCount($result);
+
+		$this->log->debug("Found $rows_found ".$this->object_name."s");
+                
+		$previous_offset = $row_offset - $max_per_page;
+		$next_offset = $row_offset + $max_per_page;
+
+		if($rows_found != 0)
+		{
+
+			// We have some data.
+
+			for($index = $row_offset , $row = $this->db->fetchByAssoc($result, $index); $row && ($index < $row_offset + $max_per_page || $max_per_page == -99) ;$index++, $row = $this->db->fetchByAssoc($result, $index)){
+
+				
+				foreach($this->list_fields as $entry)
+				{
+
+					foreach($entry as $key=>$field) // this will be cycled only once
+					{						
+						if (isset($row[$field])) {
+							$this->column_fields[$this->list_fields_names[$key]] = $row[$field];
+						
+						
+							$this->log->debug("$this->object_name({$row['id']}): ".$field." = ".$this->$field);
+						}
+						else 
+						{
+							$this->column_fields[$this->list_fields_names[$key]] = "";
+						}
+					}
+				}
+
+
+				//$this->db->println("here is the bug");
+				
+
+				$list[] = clone($this);//added by Richie to support PHP5
+			}
+		}
+
+		$response = Array();
+		$response['list'] = $list;
+		$response['row_count'] = $rows_found;
+		$response['next_offset'] = $next_offset;
+		$response['previous_offset'] = $previous_offset;
+
+		return $response;
+	}
+
+	function process_full_list_query($query)
+	{
+		$this->log->debug("CRMEntity:process_full_list_query");
+		$result =& $this->db->query($query, false);
+		$this->log->debug("CRMEntity:process_full_list_query: result is ".$result);
+
+
+		if($this->db->getRowCount($result) > 0){
+		
+		//	$this->db->println("process_full mid=".$this->module_id." mname=".$this->module_name);
+			// We have some data.
+			while ($row = $this->db->fetchByAssoc($result)) {				
+				$rowid=$row[$this->module_id];
+
+				if(isset($rowid))
+			       		$this->retrieve_entity_info($rowid,$this->module_name);
+				else
+					$this->db->println("rowid not set unable to retrieve");
+				 
+				 
+				
+		//clone function added to resolvoe PHP5 compatibility issue in Dashboards
+		//If we do not use clone, while using PHP5, the memory address remains fixed but the
+	//data gets overridden hence all the rows that come in bear the same value. This in turn
+//provides a wrong display of the Dashboard graphs. The data is erroneously shown for a specific month alone
+//Added by Richie
+				$list[] = clone($this);//added by Richie to support PHP5
+			}
+		}
+
+		if (isset($list)) return $list;
+		else return null;
+	}
+	
+	/** This function should be overridden in each module.  It marks an item as deleted.
+	* If it is not overridden, then marking this type of item is not allowed
+	 * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc..
+	 * All Rights Reserved..
+	 * Contributor(s): ______________________________________..
+	*/
+	function mark_deleted($id)
+	{
+		$query = "UPDATE vtiger_crmentity set deleted=1 where crmid='$id'";
+		$this->db->query($query, true,"Error marking record deleted: ");
+
+
+	}
+
+
+	function retrieve_by_string_fields($fields_array, $encode=true) 
+	{ 
+		$where_clause = $this->get_where($fields_array);
+		
+		$query = "SELECT * FROM $this->table_name $where_clause";
+		$this->log->debug("Retrieve $this->object_name: ".$query);
+		$result =& $this->db->requireSingleResult($query, true, "Retrieving record $where_clause:");
+		if( empty($result)) 
+		{ 
+		 	return null; 
+		} 
+
+		 $row = $this->db->fetchByAssoc($result,-1, $encode);
+
+		foreach($this->column_fields as $field) 
+		{ 
+			if(isset($row[$field])) 
+			{ 
+				$this->$field = $row[$field];
+			}
+		} 
+		return $this;
+	}
+
+	// this method is called during an import before inserting a bean
+	// define an associative array called $special_fields
+	// the keys are user defined, and don't directly map to the bean's vtiger_fields
+	// the value is the method name within that bean that will do extra
+	// processing for that vtiger_field. example: 'full_name'=>'get_names_from_full_name'
+
+	function process_special_fields() 
+	{ 
+		foreach ($this->special_functions as $func_name) 
+		{ 
+			if ( method_exists($this,$func_name) ) 
+			{ 
+				$this->$func_name(); 
+			} 
+		} 
+	}
+
+	/**
+         * Function to check if the custom vtiger_field vtiger_table exists
+         * return true or false
+         */
+        function checkIfCustomTableExists($tablename)
+        {
+                $query = "select * from ".$tablename;
+                $result = $this->db->query($query);
+                $testrow = $this->db->num_fields($result);
+                if($testrow > 1)
+                {
+                        $exists=true;
+                }
+                else
+                {
+                        $exists=false;
+                }
+                return $exists;
+        }
+
+	/**
+	 * function to construct the query to fetch the custom vtiger_fields
+	 * return the query to fetch the custom vtiger_fields
+         */
+        function constructCustomQueryAddendum($tablename,$module)
+        {
+                global $adb;
+		$tabid=getTabid($module);		
+                $sql1 = "select columnname,fieldlabel from vtiger_field where generatedtype=2 and tabid=".$tabid;
+                $result = $adb->query($sql1);
+                $numRows = $adb->num_rows($result);
+                $sql3 = "select ";
+                for($i=0; $i < $numRows;$i++)
+                {
+                        $columnName = $adb->query_result($result,$i,"columnname");
+                        $fieldlable = $adb->query_result($result,$i,"fieldlabel");
+                        //construct query as below
+                        if($i == 0)
+                        {
+                                $sql3 .= $tablename.".".$columnName. " '" .$fieldlable."'";
+                        }
+                        else
+                        {
+                                $sql3 .= ", ".$tablename.".".$columnName. " '" .$fieldlable."'";
+                        }
+
+                }
+                if($numRows>0)
+                {
+                        $sql3=$sql3.',';
+                }
+                return $sql3;
+
+        }
+
+
+	/**	function to save the product tax information in producttarel vtiger_table
+	 *	@param string $tablename - vtiger_tablename to save the product tax relationship (producttaxrel)
+	 *	@param string $module	 - current module name
+	 *	$return void
+	*/
+	function insertTaxInformation($tablename, $module)
+	{
+		global $adb, $log;
+		$log->debug("Entering into insertTaxInformation($tablename, $module) method ...");
+
+		$tax_per = '';
+		//Save the Product - VAT tax relationship if VAT tax check box is enabled
+		//Delete the existing tax if any
+		if($this->mode == 'edit')
+		{
+			$tax_array = Array('VAT','Sales','Service');
+			foreach($tax_array as $tax_type)
+			{
+				$taxid = getTaxId($tax_type);
+				$sql = "delete from vtiger_producttaxrel where productid=$this->id and taxid=$taxid";
+				$adb->query($sql);
+			}
+		}
+		if($_REQUEST['vat_check'] == 'on' || $_REQUEST['vat_check'] == 1)
+		{
+			$taxid = getTaxId('VAT');
+			$tax_per = $_REQUEST['vat_tax'];
+			if($tax_per == '')
+				$tax_per = getTaxPercentage('VAT');
+
+			$log->debug("Going to save the Product - VAT tax relationship");
+
+			$sql = "insert into vtiger_producttaxrel values($this->id,$taxid,$tax_per)";
+			$adb->query($sql);
+		}
+		//Save the Product - Sales tax relationship if Sales tax check box is enabled
+		if($_REQUEST['sales_check'] == 'on' || $_REQUEST['sales_check'] == 1)
+		{
+			$taxid = getTaxId('Sales');
+			$tax_per = $_REQUEST['sales_tax'];
+			if($tax_per == '')
+				$tax_per = getTaxPercentage('Sales');
+
+			$log->debug("Going to save the Product - Sales tax relationship");
+
+			$sql = "insert into vtiger_producttaxrel values($this->id,$taxid,$tax_per)";
+			$adb->query($sql);
+		}
+		//Save the Product - Service tax relationship if Service tax check box is enabled
+		if($_REQUEST['service_check'] == 'on' || $_REQUEST['service_check'] == 1)
+		{
+			$taxid = getTaxId('Service');
+			$tax_per = $_REQUEST['service_tax'];
+			if($tax_per == '')
+				$tax_per = getTaxPercentage('Service');
+
+			$log->debug("Going to save the Product - Service tax relationship");
+
+			$sql = "insert into vtiger_producttaxrel values($this->id,$taxid,$tax_per)";
+			$adb->query($sql);
+		}
+
+		$log->debug("Exiting from insertTaxInformation($tablename, $module) method ...");
+	}	
+
+	/**
+	 * This function returns a full (ie non-paged) list of the current object type.  
+	 * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc..
+	 * All Rights Reserved..
+	 * Contributor(s): ______________________________________..
+	 */
+	function get_full_list($order_by = "", $where = "") {
+		$this->log->debug("get_full_list:  order_by = '$order_by' and where = '$where'");
+		$query = "SELECT * FROM $this->table_name ";
+		
+		if($where != "")
+			$query .= "where ($where) AND deleted=0";
+		else
+			$query .= "where deleted=0";
+
+		if(!empty($order_by))
+			$query .= " ORDER BY $order_by";
+
+		$result =& $this->db->query($query, false);
+
+		if($this->db->getRowCount($result) > 0){
+		
+			// We have some data.
+			while ($row = $this->db->fetchByAssoc($result)) {
+				foreach($this->list_fields as $field)
+				{
+					if (isset($row[$field])) {
+						$this->$field = $row[$field];
+						
+						$this->log->debug("process_full_list: $this->object_name({$row['id']}): ".$field." = ".$this->$field);
+					}
+					else {
+ 	                                                $this->$field = '';   
+					}
+				}
+
+
+				$list[] = clone($this);         //added clone tosupport PHP5
+			}
+		}
+
+		if (isset($list)) return $list;
+		else return null;
+
+	}
+
+}
+?>




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 22 01:03:47 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 22 Jun 2006 05:03:47 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7417 -
	/vtigercrm/trunk/modules/Notes/Note.php
Message-ID: <20060622050347.C056083F4CD@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 23:03:43 2006
New Revision: 7417

Log:
title has been changed to notes_title

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

Modified: vtigercrm/trunk/modules/Notes/Note.php
==============================================================================
--- vtigercrm/trunk/modules/Notes/Note.php (original)
+++ vtigercrm/trunk/modules/Notes/Note.php Wed Jun 21 23:03:43 2006
@@ -44,27 +44,27 @@
 
 	var $column_fields = Array();
 
-        var $sortby_fields = Array('title','modifiedtime','contact_id','filename');		  
+        var $sortby_fields = Array('notes_title','modifiedtime','contact_id','filename');		  
 
 	// This is used to retrieve related vtiger_fields from form posts.
 	var $additional_column_fields = Array('', '', '', '');
 
 	// This is the list of vtiger_fields that are in the lists.
 	var $list_fields = Array(
-				'Subject'=>Array('notes'=>'title'),
+				'Subject'=>Array('notes'=>'notes_title'),
 				'Contact Name'=>Array('notes'=>'contact_id'),
 				'Related to'=>Array('senotesrel'=>'crmid'),
 				'File'=>Array('notes'=>'filename'),
 				'Last Modified'=>Array('crmentity'=>'modifiedtime')
 				);
 	var $list_fields_name = Array(
-					'Subject'=>'title',
+					'Subject'=>'notes_title',
 					'Contact Name'=>'contact_id',
 					'Related to'=>'crmid',
 					'File'=>'filename',
 					'Last Modified'=>'modifiedtime'
 				     );	
-	var $list_link_field= 'title';
+	var $list_link_field= 'notes_title';
 
 	//Added these variables which are used as default order by and sortorder in ListView
 	var $default_order_by = 'modifiedtime';




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 22 01:05:19 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 22 Jun 2006 05:05:19 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7418 -
	/vtigercrm/trunk/install/populateSeedData.php
Message-ID: <20060622050519.83C1A83F4D9@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 23:05:15 2006
New Revision: 7418

Log:
title has been changed to notes_title

Modified:
    vtigercrm/trunk/install/populateSeedData.php

Modified: vtigercrm/trunk/install/populateSeedData.php
==============================================================================
--- vtigercrm/trunk/install/populateSeedData.php (original)
+++ vtigercrm/trunk/install/populateSeedData.php Wed Jun 21 23:05:15 2006
@@ -782,7 +782,7 @@
 	$rand = array_rand($num_array);
 	$contact_key = array_rand($contact_ids);
         $notes->column_fields["contact_id"] 	= 	$contact_ids[$contact_key];
-	$notes->column_fields["title"]		=	$notes_array[$i];
+	$notes->column_fields["notes_title"]		=	$notes_array[$i];
 
 	$notes->save("Notes");
 	$notes_ids[] = $notes ->id;




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 22 01:06:29 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 22 Jun 2006 05:06:29 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7419 -
 /vtigercrm/trunk/modules/CustomView/PopulateCustomView.php
Message-ID: <20060622050629.BBF3983F4DE@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 23:06:26 2006
New Revision: 7419

Log:
title has been changed to notes_title

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 Jun 21 23:06:26 2006
@@ -277,7 +277,7 @@
                          'vtiger_invoice:total:hdnGrandTotal:Invoice_Total:I',
                          'vtiger_crmentity:smownerid:assigned_user_id:Invoice_Assigned_To:V'),
 		
-		  Array('vtiger_notes:title:title:Notes_Title:V',
+		  Array('vtiger_notes:title:notes_title:Notes_Title:V',
                         'vtiger_notes:contact_id:contact_id:Notes_Contact_Name:I',
                         'vtiger_senotesrel:crmid:parent_id:Notes_Related_to:I',
                         'vtiger_notes:filename:filename:Notes_File:V',




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 22 01:07:57 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 22 Jun 2006 05:07:57 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7420 -
 /vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
Message-ID: <20060622050757.9D92983F4DE@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 23:07:53 2006
New Revision: 7420

Log:
title has been changed to notes_title

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

Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original)
+++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Wed Jun 21 23:07:53 2006
@@ -477,7 +477,7 @@
 
 $this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("field").",'contact_id','vtiger_notes',1,'57','contact_id','Contact Name',1,0,0,100,1,17,1,'V~O',1,null,'BAS')");
  $this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("field").",'crmid','vtiger_senotesrel',1,'62','parent_id','Related To',1,0,0,100,2,17,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("field").",'title','vtiger_notes',1,'2','title','Subject',1,0,0,100,3,17,1,'V~M',0,1,'BAS')");
+ $this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("field").",'title','vtiger_notes',1,'2','notes_title','Subject',1,0,0,100,3,17,1,'V~M',0,1,'BAS')");
 $this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,4,17,2,'T~O',1,null,'BAS')");
  $this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,5,17,2,'T~O',1,null,'BAS')");
  $this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("field").",'filename','vtiger_notes',1,'61','filename','Attachment',1,0,0,100,4,17,1,'V~O',1,null,'BAS')");




From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 22 01:09:26 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 22 Jun 2006 05:09:26 -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.94f275e341f02fc3a995bb67f48c5c77@vtiger.fosslabs.com>

#99: validation is not working for Notes module
------------------------+---------------------------------------------------
  Reporter:  Minnie     |       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:

 fixed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/99>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 22 01:25:35 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 22 Jun 2006 05:25:35 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231349=3A?=
 =?utf-8?q?_Dash_Boards_not_working?=
In-Reply-To: <076.8be5cac7416faf4b2b970e60d7f3e2ae@vtiger.fosslabs.com>
References: <076.8be5cac7416faf4b2b970e60d7f3e2ae@vtiger.fosslabs.com>
Message-ID: <085.b64bed2defa878f0bd34e3ea9da4a728@vtiger.fosslabs.com>

#1349: Dash Boards not working
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  jerrydgeorge
      Type:  defect     |      Status:  closed      
  Priority:  blocker    |   Milestone:              
 Component:  vtigercrm  |     Version:  5.0.0       
Resolution:  fixed      |    Keywords:              
------------------------+---------------------------------------------------
Changes (by jerrydgeorge):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1349>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 22 01:26:31 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 22 Jun 2006 05:26:31 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231091=3A?=
 =?utf-8?q?_My_Preferences_-_Photo_does_not_work?=
In-Reply-To: <076.0a340fe4771c5eb83733cd4065926089@vtiger.fosslabs.com>
References: <076.0a340fe4771c5eb83733cd4065926089@vtiger.fosslabs.com>
Message-ID: <085.804d725b91532c4870b96294a000a898@vtiger.fosslabs.com>

#1091: My Preferences - Photo does not work
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  Mickie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by jerrydgeorge):

  * owner:  jerrydgeorge => Mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1091>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 22 01:00:09 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 22 Jun 2006 05:00:09 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7414 -
	/vtigercrm/trunk/modules/Notes/EditView.php
Message-ID: <20060622050010.93CB883F4C6@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 23:00:05 2006
New Revision: 7414

Log:
title has been changed to notes_title

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

Modified: vtigercrm/trunk/modules/Notes/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/Notes/EditView.php (original)
+++ vtigercrm/trunk/modules/Notes/EditView.php Wed Jun 21 23:00:05 2006
@@ -40,7 +40,7 @@
 	$focus->id = $_REQUEST['record'];
 	$focus->mode = 'edit';
 	$focus->retrieve_entity_info($_REQUEST['record'],"Notes");
-        $focus->name=$focus->column_fields['title'];
+        $focus->name=$focus->column_fields['notes_title'];
 }
 if(isset($_REQUEST['parent_id']))
 {




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 22 01:45:16 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 22 Jun 2006 05:45:16 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7421 -
 /vtigercrm/trunk/modules/Settings/CurrencyEditView.php
Message-ID: <20060622054516.C26E883F4B0@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 21 23:45:12 2006
New Revision: 7421

Log:
Updated the currency editview file - ahmed

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

Modified: vtigercrm/trunk/modules/Settings/CurrencyEditView.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/CurrencyEditView.php (original)
+++ vtigercrm/trunk/modules/Settings/CurrencyEditView.php Wed Jun 21 23:45:12 2006
@@ -52,6 +52,6 @@
 if(isset($_REQUEST['detailview']) && $_REQUEST['detailview'] != '')
 	$smarty->display('CurrencyDetailView.tpl');
 else
-	$smarty->display("CurrencyEditViewN.tpl");
+	$smarty->display("CurrencyEditView.tpl");
 
 ?>




From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 22 01:19:05 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 22 Jun 2006 05:19:05 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231120=3A?=
 =?utf-8?q?_alignment_not_proper_in_Customfield_listview?=
In-Reply-To: <076.4b884f803d6e52a23bdf4c14044cef75@vtiger.fosslabs.com>
References: <076.4b884f803d6e52a23bdf4c14044cef75@vtiger.fosslabs.com>
Message-ID: <085.c1a61dddd469101232731e5393571b90@vtiger.fosslabs.com>

#1120: alignment not proper in Customfield listview
------------------------+---------------------------------------------------
  Reporter:  mangai     |       Owner:  jeri 
      Type:  defect     |      Status:  new  
  Priority:  minor      |   Milestone:  5.0.0
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by mangai):

  * owner:  mangai => jeri

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1120>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 22 02:33:31 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 22 Jun 2006 06:33:31 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7422 - in /vtigercrm/trunk:
 include/language/en_us.lang.php modules/Invoice/Invoice.php
 modules/PurchaseOrder/PurchaseOrder.php modules/Quotes/Quote.php
 modules/SalesOrder/SalesOrder.php modules/Users/DefaultDataPopulator.php
Message-ID: <20060622063332.771FD842BFC@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 22 00:33:19 2006
New Revision: 7422

Log:
* Modified to add the Status History for Po, SO and Invoice and Stage History for Quotes

Modified:
    vtigercrm/trunk/include/language/en_us.lang.php
    vtigercrm/trunk/modules/Invoice/Invoice.php
    vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php
    vtigercrm/trunk/modules/Quotes/Quote.php
    vtigercrm/trunk/modules/SalesOrder/SalesOrder.php
    vtigercrm/trunk/modules/Users/DefaultDataPopulator.php

Modified: vtigercrm/trunk/include/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/include/language/en_us.lang.php (original)
+++ vtigercrm/trunk/include/language/en_us.lang.php Thu Jun 22 00:33:19 2006
@@ -756,7 +756,10 @@
 'Purchase Order'=>'Purchase Order',
 'Sales Stage History'=>'Sales Stage History',
 'Users'=>'Users',
-
+'PurchaseOrder Status History'=>'PurchaseOrder Status History',
+'SalesOrder Status History'=>'SalesOrder Status History',
+'Quote Stage History'=>'Quote Stage History',
+'Invoice Status History'=>'Invoice Status History',
 
 
 //Added language for Parent Tab
@@ -908,6 +911,10 @@
 
 'LBL_TAG_CLOUD'=>'Tag Cloud',
 'LBL_FOR'=>'for',
+'LBL_PO_STATUS'=>'PurchaseOrder Status',
+'LBL_SO_STATUS'=>'SalesOrder Status',
+'LBL_INVOICE_STATUS'=>'Invoice Status',
+
 );
 
 

Modified: vtigercrm/trunk/modules/Invoice/Invoice.php
==============================================================================
--- vtigercrm/trunk/modules/Invoice/Invoice.php (original)
+++ vtigercrm/trunk/modules/Invoice/Invoice.php Thu Jun 22 00:33:19 2006
@@ -209,6 +209,48 @@
 		return getAttachmentsAndNotes('Invoice',$query,$id);
 	}
 
+	/**	Function used to get the Status history of the Invoice
+	 *	@param $id - invoice id
+	 *	return $return_data - array with header and the entries in format Array('header'=>$header,'entries'=>$entries_list) where as $header and $entries_list are array which contains all the column values of an row
+	 */
+	function get_invoicestatushistory($id)
+	{	
+		global $log;
+		$log->debug("Entering get_invoicestatushistory(".$id.") method ...");
+
+		global $adb;
+		global $mod_strings;
+		global $app_strings;
+
+		$query = 'select vtiger_invoicestatushistory.*, vtiger_invoice.subject from vtiger_invoicestatushistory inner join vtiger_invoice on vtiger_invoice.invoiceid = vtiger_invoicestatushistory.invoiceid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_invoice.invoiceid where vtiger_crmentity.deleted = 0 and vtiger_invoice.invoiceid = '.$id;
+		$result=$adb->query($query);
+		$noofrows = $adb->num_rows($result);
+
+		$header[] = $app_strings['Invoice Id'];
+		$header[] = $app_strings['LBL_ACCOUNT_NAME'];
+		$header[] = $app_strings['LBL_AMOUNT'];
+		$header[] = $app_strings['LBL_INVOICE_STATUS'];
+		$header[] = $app_strings['LBL_LAST_MODIFIED'];
+
+		while($row = $adb->fetch_array($result))
+		{
+			$entries = Array();
+
+			$entries[] = $row['invoiceid'];
+			$entries[] = $row['accountname'];
+			$entries[] = $row['total'];
+			$entries[] = $row['invoicestatus'];
+			$entries[] = getDisplayDate($row['lastmodified']);
+
+			$entries_list[] = $entries;
+		}
+
+		$return_data = Array('header'=>$header,'entries'=>$entries_list);
+
+	 	$log->debug("Exiting get_invoicestatushistory method ...");
+
+		return $return_data;
+	}
 
 
 }

Modified: vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php
==============================================================================
--- vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php (original)
+++ vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.php Thu Jun 22 00:33:19 2006
@@ -216,6 +216,50 @@
 		return getAttachmentsAndNotes('PurchaseOrder',$query,$id,$sid='purchaseorderid');
 	}
 
+	/**	Function used to get the Status history of the Purchase Order
+	 *	@param $id - purchaseorder id
+	 *	return $return_data - array with header and the entries in format Array('header'=>$header,'entries'=>$entries_list) where as $header and $entries_list are array which contains all the column values of an row
+	 */
+	function get_postatushistory($id)
+	{	
+		global $log;
+		$log->debug("Entering get_postatushistory(".$id.") method ...");
+
+		global $adb;
+		global $mod_strings;
+		global $app_strings;
+
+		$query = 'select vtiger_postatushistory.*, vtiger_purchaseorder.subject from vtiger_postatushistory inner join vtiger_purchaseorder on vtiger_purchaseorder.purchaseorderid = vtiger_postatushistory.purchaseorderid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_purchaseorder.purchaseorderid where vtiger_crmentity.deleted = 0 and vtiger_purchaseorder.purchaseorderid = '.$id;
+		$result=$adb->query($query);
+		$noofrows = $adb->num_rows($result);
+
+		$header[] = $app_strings['Order Id'];
+		$header[] = $app_strings['Vendor Name'];
+		$header[] = $app_strings['LBL_AMOUNT'];
+		$header[] = $app_strings['LBL_PO_STATUS'];
+		$header[] = $app_strings['LBL_LAST_MODIFIED'];
+
+		while($row = $adb->fetch_array($result))
+		{
+			$entries = Array();
+
+			$entries[] = $row['purchaseorderid'];
+			$entries[] = $row['vendorname'];
+			$entries[] = $row['total'];
+			$entries[] = $row['postatus'];
+			$entries[] = getDisplayDate($row['lastmodified']);
+
+			$entries_list[] = $entries;
+		}
+
+		$return_data = Array('header'=>$header,'entries'=>$entries_list);
+
+	 	$log->debug("Exiting get_postatushistory method ...");
+
+		return $return_data;
+	}
+
+	
 }
 
 ?>

Modified: vtigercrm/trunk/modules/Quotes/Quote.php
==============================================================================
--- vtigercrm/trunk/modules/Quotes/Quote.php (original)
+++ vtigercrm/trunk/modules/Quotes/Quote.php Thu Jun 22 00:33:19 2006
@@ -185,6 +185,51 @@
 		$log->debug("Exiting get_history method ...");
 		return getHistory('Quotes',$query,$id);	
 	}
+
+
+	/**	Function used to get the Quote Stage history of the Quotes
+	 *	@param $id - quote id
+	 *	return $return_data - array with header and the entries in format Array('header'=>$header,'entries'=>$entries_list) where as $header and $entries_list are array which contains all the column values of an row
+	 */
+	function get_quotestagehistory($id)
+	{	
+		global $log;
+		$log->debug("Entering get_quotestagehistory(".$id.") method ...");
+
+		global $adb;
+		global $mod_strings;
+		global $app_strings;
+
+		$query = 'select vtiger_quotestagehistory.*, vtiger_quotes.subject from vtiger_quotestagehistory inner join vtiger_quotes on vtiger_quotes.quoteid = vtiger_quotestagehistory.quoteid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_quotes.quoteid where vtiger_crmentity.deleted = 0 and vtiger_quotes.quoteid = '.$id;
+		$result=$adb->query($query);
+		$noofrows = $adb->num_rows($result);
+
+		$header[] = $app_strings['Quote Id'];
+		$header[] = $app_strings['LBL_ACCOUNT_NAME'];
+		$header[] = $app_strings['LBL_AMOUNT'];
+		$header[] = $app_strings['Quote Stage'];
+		$header[] = $app_strings['LBL_LAST_MODIFIED'];
+
+		while($row = $adb->fetch_array($result))
+		{
+			$entries = Array();
+
+			$entries[] = $row['quoteid'];
+			$entries[] = $row['accountname'];
+			$entries[] = $row['total'];
+			$entries[] = $row['quotestage'];
+			$entries[] = getDisplayDate($row['lastmodified']);
+
+			$entries_list[] = $entries;
+		}
+
+		$return_data = Array('header'=>$header,'entries'=>$entries_list);
+
+	 	$log->debug("Exiting get_quotestagehistory method ...");
+
+		return $return_data;
+	}
+
 }
 
 ?>

Modified: vtigercrm/trunk/modules/SalesOrder/SalesOrder.php
==============================================================================
--- vtigercrm/trunk/modules/SalesOrder/SalesOrder.php (original)
+++ vtigercrm/trunk/modules/SalesOrder/SalesOrder.php Thu Jun 22 00:33:19 2006
@@ -245,6 +245,50 @@
 	
 	}
 
+	/**	Function used to get the Status history of the Sales Order
+	 *	@param $id - salesorder id
+	 *	return $return_data - array with header and the entries in format Array('header'=>$header,'entries'=>$entries_list) where as $header and $entries_list are array which contains all the column values of an row
+	 */
+	function get_sostatushistory($id)
+	{	
+		global $log;
+		$log->debug("Entering get_sostatushistory(".$id.") method ...");
+
+		global $adb;
+		global $mod_strings;
+		global $app_strings;
+
+		$query = 'select vtiger_sostatushistory.*, vtiger_salesorder.subject from vtiger_sostatushistory inner join vtiger_salesorder on vtiger_salesorder.salesorderid = vtiger_sostatushistory.salesorderid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_salesorder.salesorderid where vtiger_crmentity.deleted = 0 and vtiger_salesorder.salesorderid = '.$id;
+		$result=$adb->query($query);
+		$noofrows = $adb->num_rows($result);
+
+		$header[] = $app_strings['Order Id'];
+		$header[] = $app_strings['LBL_ACCOUNT_NAME'];
+		$header[] = $app_strings['LBL_AMOUNT'];
+		$header[] = $app_strings['LBL_SO_STATUS'];
+		$header[] = $app_strings['LBL_LAST_MODIFIED'];
+
+		while($row = $adb->fetch_array($result))
+		{
+			$entries = Array();
+
+			$entries[] = $row['salesorderid'];
+			$entries[] = $row['accountname'];
+			$entries[] = $row['total'];
+			$entries[] = $row['sostatus'];
+			$entries[] = getDisplayDate($row['lastmodified']);
+
+			$entries_list[] = $entries;
+		}
+
+		$return_data = Array('header'=>$header,'entries'=>$entries_list);
+
+	 	$log->debug("Exiting get_sostatushistory method ...");
+
+		return $return_data;
+	}
+
+	
 }
 
 ?>

Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original)
+++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Thu Jun 22 00:33:19 2006
@@ -1769,6 +1769,8 @@
 	
 	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Quotes").",9,'get_history',3,'Activity History',0)");
 
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Quotes").",0,'get_quotestagehistory',4,'Quote Stage History',0)");
+
 	// Inserting Purchase order Related Lists
 
 	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("PurchaseOrder").",9,'get_activities',1,'Activities',0)");
@@ -1777,6 +1779,8 @@
 	
 	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("PurchaseOrder").",".getTabid("Activities").",'get_history',3,'Activity History',0)");
 	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("PurchaseOrder").",0,'get_postatushistory',4,'PurchaseOrder Status History',0)");
+
 	// Inserting Sales order Related Lists
 
 	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("SalesOrder").",9,'get_activities',1,'Activities',0)");
@@ -1787,6 +1791,8 @@
 	
 	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("SalesOrder").",".getTabid("Activities").",'get_history',4,'Activity History',0)");
 	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("SalesOrder").",0,'get_sostatushistory',5,'SalesOrder Status History',0)");
+
 	// Inserting Invoice Related Lists
 
 	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Invoice").",9,'get_activities',1,'Activities',0)");
@@ -1794,6 +1800,8 @@
 	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Invoice").",0,'get_attachments',2,'Attachments',0)");
 
 	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Invoice").",".getTabid("Activities").",'get_history',3,'Activity History',0)");
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Invoice").",0,'get_invoicestatushistory',4,'Invoice Status History',0)");
 
 	// Inserting Activities Related Lists
 	




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 22 02:33:51 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 22 Jun 2006 06:33:51 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7423 -
 /vtigercrm/trunk/Smarty/templates/Settings/PickList.tpl
Message-ID: <20060622063351.508E9842BFC@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 22 00:33:47 2006
New Revision: 7423

Log:
updated picklist file

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 Thu Jun 22 00:33:47 2006
@@ -133,7 +133,7 @@
 				<tr>
 				    <td class="big" rowspan="2">
 					<div id="picklist_datas">	
-						{include file='Settings/PickListContentsN.tpl'}
+						{include file='Settings/PickListContents.tpl'}
 					</div>
 				    </td>	
 				</td>




From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 22 03:06:14 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 22 Jun 2006 07:06:14 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231330=3A?=
 =?utf-8?q?_Admin_changed_to_non-admin_throws_exception?=
In-Reply-To: <076.0c85df12391add0bf2240fd158a748fe@vtiger.fosslabs.com>
References: <076.0c85df12391add0bf2240fd158a748fe@vtiger.fosslabs.com>
Message-ID: <085.1003fad98503fcd89e584ebeee305a1d@vtiger.fosslabs.com>

#1330: Admin changed to non-admin throws exception
------------------------+---------------------------------------------------
  Reporter:  saraj      |       Owner:  don   
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by anonymous):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1330>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 22 03:08:08 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 22 Jun 2006 07:08:08 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231039=3A?=
 =?utf-8?q?_Read_only_data_can_be_able_to_edit_through_ajaxification?=
In-Reply-To: <076.1370d18e3a5ddade616d8ab946d7ce95@vtiger.fosslabs.com>
References: <076.1370d18e3a5ddade616d8ab946d7ce95@vtiger.fosslabs.com>
Message-ID: <085.880c9845c63d9ff36f1d70cca763c62e@vtiger.fosslabs.com>

#1039: Read only data can be able to edit through ajaxification
------------------------+---------------------------------------------------
  Reporter:  mangai     |       Owner:  don   
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by anonymous):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1039>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 22 03:19:15 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 22 Jun 2006 07:19:15 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231135=3A?=
 =?utf-8?q?_The_History_of_the_Purchase_Order_not_getting_displayed?=
In-Reply-To: <076.70a50c265764e891dd51a97dd8390af4@vtiger.fosslabs.com>
References: <076.70a50c265764e891dd51a97dd8390af4@vtiger.fosslabs.com>
Message-ID: <085.71edd5135ceaf4707011048b31d8ebd8@vtiger.fosslabs.com>

#1135: The History of the Purchase Order not getting displayed
--------------------------+-------------------------------------------------
  Reporter:  richie       |       Owner:  mickie
      Type:  enhancement  |      Status:  closed
  Priority:  major        |   Milestone:        
 Component:  vtigercrm    |     Version:  5.0.0 
Resolution:  fixed        |    Keywords:        
--------------------------+-------------------------------------------------
Changes (by mickie):

  * resolution:  => fixed
  * status:  new => closed
  * type:  defect => enhancement

Comment:

 Now we have provided PO Status History and also provided SalesOrder -
 Status History, Quotes - Stage History and Invoice - Status History

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1135>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 22 03:43:54 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 22 Jun 2006 07:43:54 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7424 - in
 /vtigercrm/trunk/modules/Dashboard: horizontal_bargraph.php pie_graph.php
 vertical_bargraph.php
Message-ID: <20060622074354.EF35F842A99@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 22 01:43:50 2006
New Revision: 7424

Log:
delimiter has been changed from , to :: as , causes issue in graph

Modified:
    vtigercrm/trunk/modules/Dashboard/horizontal_bargraph.php
    vtigercrm/trunk/modules/Dashboard/pie_graph.php
    vtigercrm/trunk/modules/Dashboard/vertical_bargraph.php

Modified: vtigercrm/trunk/modules/Dashboard/horizontal_bargraph.php
==============================================================================
--- vtigercrm/trunk/modules/Dashboard/horizontal_bargraph.php (original)
+++ vtigercrm/trunk/modules/Dashboard/horizontal_bargraph.php Thu Jun 22 01:43:50 2006
@@ -27,12 +27,12 @@
 
 	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  
+	$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);
+	$target=explode("::",$target_val);
 
 	$alts=array();
 	$temp=array();

Modified: vtigercrm/trunk/modules/Dashboard/pie_graph.php
==============================================================================
--- vtigercrm/trunk/modules/Dashboard/pie_graph.php (original)
+++ vtigercrm/trunk/modules/Dashboard/pie_graph.php Thu Jun 22 01:43:50 2006
@@ -27,11 +27,11 @@
 
 	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
+	$datay=explode("::",$referdata); // The datay values
+	$datax=explode("::",$refer_code); // The datax values
 
 	$target_val=urldecode($target_val);
-	$target=explode(",",$target_val);
+	$target=explode("::",$target_val);
 
 	$alts=array();
 	for($i=0;$i<count($datax); $i++)

Modified: vtigercrm/trunk/modules/Dashboard/vertical_bargraph.php
==============================================================================
--- vtigercrm/trunk/modules/Dashboard/vertical_bargraph.php (original)
+++ vtigercrm/trunk/modules/Dashboard/vertical_bargraph.php Thu Jun 22 01:43:50 2006
@@ -27,12 +27,12 @@
 
 	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  
+	$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);
+	$target=explode("::",$target_val);
 
 	$alts=array();
 	$temp=array();




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 22 03:44:40 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 22 Jun 2006 07:44:40 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7425 -
	/vtigercrm/trunk/modules/Dashboard/Entity_charts.php
Message-ID: <20060622074440.C0895842A99@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 22 01:44:37 2006
New Revision: 7425

Log:
delimiter has been changed from , to :: as , causes issue in graph

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 Thu Jun 22 01:44:37 2006
@@ -233,12 +233,12 @@
 						$name=$name_val;
 				}
 				//Passing name to graph
-				if($mod_name_val!="") $mod_name_val.=",$name";
+				if($mod_name_val!="") $mod_name_val.="::$name";
 				else $mod_name_val="$name";
 
 
 				//Passing count to graph
-				if($mod_cnt_val!="") $mod_cnt_val.=",$mod_count_val";
+				if($mod_cnt_val!="") $mod_cnt_val.="::$mod_count_val";
 				else $mod_cnt_val="$mod_count_val";	
 
 				if($module!="")
@@ -259,7 +259,7 @@
 					if($i==0)
 						$bar_target_val .=$link_val;
 					else
-						$bar_target_val .=",".$link_val;
+						$bar_target_val .="::".$link_val;
 				}
 				//The data as per given date
 				if($i==0)




From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 22 03:45:24 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 22 Jun 2006 07:45:24 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231282=3A?=
 =?utf-8?q?_Problems_with_graphs_-_Sales_Orders_by_Account?=
In-Reply-To: <076.9cc8264925ac84b43a6a0aafbcf08aae@vtiger.fosslabs.com>
References: <076.9cc8264925ac84b43a6a0aafbcf08aae@vtiger.fosslabs.com>
Message-ID: <085.46600dd267fdb20019882b9affe26a41@vtiger.fosslabs.com>

#1282: Problems with graphs - Sales Orders by Account
-------------------------+--------------------------------------------------
  Reporter:  arosewarne  |       Owner:  mangai         
      Type:  defect      |      Status:  closed         
  Priority:  major       |   Milestone:                 
 Component:  vtigercrm   |     Version:  5.0.0          
Resolution:  fixed       |    Keywords:  analytics graph
-------------------------+--------------------------------------------------
Changes (by mangai):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 fixed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1282>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 22 04:15:18 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 22 Jun 2006 08:15:18 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231354=3A?=
 =?utf-8?q?_Inconsistencies_in_List_View_Buttons_esp_Mass_Delete?=
Message-ID: <076.8202f24bc4ecea9fdc79cdca719ea624@vtiger.fosslabs.com>

#1354: Inconsistencies in List View Buttons esp Mass Delete
-----------------------+----------------------------------------------------
 Reporter:  ahmed      |       Owner:  jeri 
     Type:  defect     |      Status:  new  
 Priority:  blocker    |   Milestone:       
Component:  vtigercrm  |     Version:  5.0.0
 Keywords:             |  
-----------------------+----------------------------------------------------
 Sometimes the buttons in list view - Delete, Change Owner, Change Status,
 & Send Mail does not respond to Mouse Click & at other times it does when
 you perform some other operation or refresh the page.

 The assigned to Field also at times shows values and doesn't
 intermittently.

 Moreover the Mass Delete Button while deleting last record does not work
 and in Notes module it gave a javascript error as undefined.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1354>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 22 04:19:59 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 22 Jun 2006 08:19:59 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231355=3A?=
	=?utf-8?q?_Pricebook_value_is_readonly?=
Message-ID: <076.88e9291262713bf51b842aecd697a80a@vtiger.fosslabs.com>

#1355: Pricebook value is readonly
----------------------------------+-----------------------------------------
 Reporter:  cristian at nethesis.it  |       Owner:  developer
     Type:  defect                |      Status:  new      
 Priority:  major                 |   Milestone:           
Component:  vtigercrm             |     Version:  5.0.0    
 Keywords:                        |  
----------------------------------+-----------------------------------------
 Hi all
 when I insert a new product in a Sales Order, after selecting the product
 and the pricebook, I whould change the pricebook value (in 4.2.3 was
 passible)

 thanks
 cristian

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1355>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 22 05:11:27 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 22 Jun 2006 09:11:27 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23445=3A_?=
 =?utf-8?q?Improper_default_date_value?=
In-Reply-To: <076.94ebb94a2660abaa4c7dff766e8cb6c4@vtiger.fosslabs.com>
References: <076.94ebb94a2660abaa4c7dff766e8cb6c4@vtiger.fosslabs.com>
Message-ID: <085.9db8868be06485afde2962b1add51ee7@vtiger.fosslabs.com>

#445: Improper default date value
-------------------------+--------------------------------------------------
  Reporter:  don         |       Owner:  mangai
      Type:  defect      |      Status:  closed
  Priority:  major       |   Milestone:  5.0.0 
 Component:  vtigercrm   |     Version:  5.0.0 
Resolution:  worksforme  |    Keywords:        
-------------------------+--------------------------------------------------
Changes (by mangai):

  * resolution:  => worksforme
  * status:  new => closed

Comment:

 In latest build,current date is populated by default if date field is
 empty.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/445>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 22 05:23:01 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 22 Jun 2006 09:23:01 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231351=3A?=
 =?utf-8?q?_Editing_Activity_in_Leads_Related_List_Shows_Warning?=
In-Reply-To: <076.23a2cbc68532eb6ef08e3d5e59241e8c@vtiger.fosslabs.com>
References: <076.23a2cbc68532eb6ef08e3d5e59241e8c@vtiger.fosslabs.com>
Message-ID: <085.a2e2438b4b546fd2174f9ffd5dd5e9cc@vtiger.fosslabs.com>

#1351: Editing Activity in Leads Related List Shows Warning
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  mangai
      Type:  defect     |      Status:  new   
  Priority:  blocker    |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mickie):

  * owner:  mickie => mangai

Comment:

 This issue is in DetailView and EditView for Activities when we click on
 activity from Activity listivew.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1351>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 22 06:43:40 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 22 Jun 2006 10:43:40 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231356=3A?=
	=?utf-8?q?_Ajax_edit_issue?=
Message-ID: <076.f02a9fbd23d12bad75eedc90afaf903d@vtiger.fosslabs.com>

#1356: Ajax edit issue
--------------------------+-------------------------------------------------
 Reporter:  jerrydgeorge  |       Owner:  jerrydgeorge
     Type:  defect        |      Status:  new         
 Priority:  critical      |   Milestone:              
Component:  vtigercrm     |     Version:  5.0.0       
 Keywords:                |  
--------------------------+-------------------------------------------------
 During ajax edit in detail view if a entity is assigned to a group we cant
 edit it...

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1356>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 22 07:06:29 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 22 Jun 2006 11:06:29 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7426 -
	/vtigercrm/trunk/modules/Home/index.php
Message-ID: <20060622110629.D16D883F3A2@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 22 05:06:24 2006
New Revision: 7426

Log:
My group allocation - display fixed

Modified:
    vtigercrm/trunk/modules/Home/index.php

Modified: vtigercrm/trunk/modules/Home/index.php
==============================================================================
--- vtigercrm/trunk/modules/Home/index.php (original)
+++ vtigercrm/trunk/modules/Home/index.php Thu Jun 22 05:06:24 2006
@@ -57,6 +57,7 @@
 	$home_section_order = array("ALVT","PLVT","QLTQ","CVLVT","HLT","OLV","GRT","OLTSO","ILTI");
 }
 
+require('user_privileges/user_privileges_'.$current_user->id.'.php');
 foreach ( explode(",",$home_section_order) as $section )
 {
 	switch( $section )
@@ -102,7 +103,7 @@
 	{
 		$home_values['Activities']=getGroupTaskLists();	   
 	}
-   			break;
+   		break;
         case 'HLT':
         if(isPermitted('HelpDesk','index') == "yes")
         {
@@ -140,7 +141,7 @@
 function getActivityType($id)
 {
 	global $adb;
-	$quer = "select vtiger_activitytype from vtiger_activity where vtiger_activityid=".$id;
+	$quer = "select activitytype from vtiger_activity where activityid=".$id;
 	$res = $adb->query($quer);
 	$acti_type = $adb->query_result($res,0,"activitytype");
 	return $acti_type;
@@ -210,17 +211,28 @@
 	$groupids = fetchUserGroupids($userid);
 	if($groupids !='')
 	{
-		//code modified to list the vtiger_groups associates to a user om 21-11-05
-		//Get the leads assigned to group
-		$query = "select vtiger_leaddetails.leadid as id,vtiger_leaddetails.lastname as name,vtiger_leadgrouprelation.groupname as groupname, 'Leads     ' as Type from vtiger_leaddetails inner join vtiger_leadgrouprelation on vtiger_leaddetails.leadid=vtiger_leadgrouprelation.leadid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_leaddetails.leadid inner join vtiger_groups on vtiger_leadgrouprelation.groupname=vtiger_groups.groupname where  vtiger_crmentity.deleted=0  and vtiger_leadgrouprelation.groupname is not null and vtiger_groups.groupid in (".$groupids.")";
-		$query .= " union all ";
-		//Get the activities assigned to group
-		$query .= "select vtiger_activity.activityid id,vtiger_activity.subject,vtiger_activitygrouprelation.groupname,'Activities' as Type from vtiger_activity inner join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_activity.activityid inner join vtiger_groups on vtiger_activitygrouprelation.groupname=vtiger_groups.groupname where  vtiger_crmentity.deleted=0 and ((vtiger_activity.eventstatus !='held'and (vtiger_activity.status is null or vtiger_activity.status ='')) or (vtiger_activity.status !='completed' and (vtiger_activity.eventstatus is null or vtiger_activity.eventstatus=''))) and vtiger_activitygrouprelation.groupname is not null and vtiger_groups.groupid in (".$groupids.")";
-		$query .= " union all ";
-		//Get the tickets assigned to group (status not Closed -- hardcoded value)
-		$query .= "select vtiger_troubletickets.ticketid,vtiger_troubletickets.title,vtiger_ticketgrouprelation.groupname,'Tickets   ' as Type from vtiger_troubletickets inner join vtiger_ticketgrouprelation on vtiger_ticketgrouprelation.ticketid=vtiger_troubletickets.ticketid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_troubletickets.ticketid inner join vtiger_groups on vtiger_ticketgrouprelation.groupname=vtiger_groups.groupname where vtiger_crmentity.deleted=0 and vtiger_troubletickets.status != 'Closed' and vtiger_ticketgrouprelation.groupname is not null and vtiger_groups.groupid in (".$groupids.")";
-
-
+		$query = '';
+		if(isPermitted('Leads','index') == "yes")
+        	{
+			//code modified to list the vtiger_groups associates to a user om 21-11-05
+			//Get the leads assigned to group
+			$query = "select vtiger_leaddetails.leadid as id,vtiger_leaddetails.lastname as name,vtiger_leadgrouprelation.groupname as groupname, 'Leads     ' as Type from vtiger_leaddetails inner join vtiger_leadgrouprelation on vtiger_leaddetails.leadid=vtiger_leadgrouprelation.leadid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_leaddetails.leadid inner join vtiger_groups on vtiger_leadgrouprelation.groupname=vtiger_groups.groupname where  vtiger_crmentity.deleted=0  and vtiger_leadgrouprelation.groupname is not null and vtiger_groups.groupid in (".$groupids.")";
+		}
+		if(isPermitted('Activities','index') == "yes")
+        	{
+			if($query !='')
+			$query .= " union all ";
+			//Get the activities assigned to group
+			$query .= "select vtiger_activity.activityid id,vtiger_activity.subject,vtiger_activitygrouprelation.groupname,'Activities' as Type from vtiger_activity inner join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_activity.activityid inner join vtiger_groups on vtiger_activitygrouprelation.groupname=vtiger_groups.groupname where  vtiger_crmentity.deleted=0 and ((vtiger_activity.eventstatus !='held'and (vtiger_activity.status is null or vtiger_activity.status ='')) or (vtiger_activity.status !='completed' and (vtiger_activity.eventstatus is null or vtiger_activity.eventstatus=''))) and vtiger_activitygrouprelation.groupname is not null and vtiger_groups.groupid in (".$groupids.")";
+		}
+		if(isPermitted('HelpDesk','index') == "yes")
+                {
+			if($query !='')
+			$query .= " union all ";
+			//Get the tickets assigned to group (status not Closed -- hardcoded value)
+			$query .= "select vtiger_troubletickets.ticketid,vtiger_troubletickets.title,vtiger_ticketgrouprelation.groupname,'Tickets   ' as Type from vtiger_troubletickets inner join vtiger_ticketgrouprelation on vtiger_ticketgrouprelation.ticketid=vtiger_troubletickets.ticketid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_troubletickets.ticketid inner join vtiger_groups on vtiger_ticketgrouprelation.groupname=vtiger_groups.groupname where vtiger_crmentity.deleted=0 and vtiger_troubletickets.status != 'Closed' and vtiger_ticketgrouprelation.groupname is not null and vtiger_groups.groupid in (".$groupids.")";
+
+		}
 		$log->info("Here is the where clause for the list view: $query");
 		$result = $adb->limitquery($query,0,5) or die("Couldn't get the group listing");
 
@@ -245,6 +257,7 @@
 				if($row["type"] == "Tickets")
 				{	
 					$list = '<a href=index.php?module=HelpDesk';
+					$list .= '&action=DetailView&record='.$row["id"].'>'.$row["subject"].'</a>';
 				}
 				elseif($row["type"] == "Activities")
 				{
@@ -258,13 +271,14 @@
 					{
 						$list .= '&activity_mode=Events';
 					}
+					$list .= '&action=DetailView&record='.$row["id"].'>'.$row["subject"].'</a>';
 				}
 				else
 				{
 					$list = '<a href=index.php?module='.$row["type"];
+					$list .= '&action=DetailView&record='.$row["id"].'>'.$row["name"].'</a>';
 				}
 
-				$list .= '&action=DetailView&record='.$row["id"].'>'.$row["name"].'</a>';
 				$value[]=$list;	
 				$value[]= $row["groupname"];
 				$value[]= $row["type"];




From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 22 07:23:57 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 22 Jun 2006 11:23:57 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231353=3A?=
 =?utf-8?q?_Modifications_for_translation?=
In-Reply-To: <076.5f6b63545ffb289da25a5900a96337fe@vtiger.fosslabs.com>
References: <076.5f6b63545ffb289da25a5900a96337fe@vtiger.fosslabs.com>
Message-ID: <085.296a2f550455fd10c415e2161418c4a6@vtiger.fosslabs.com>

#1353: Modifications for translation
-------------------------------------+--------------------------------------
  Reporter:  william.maes at wandoo.fr  |       Owner:  developer    
      Type:  enhancement             |      Status:  new          
  Priority:  minor                   |   Milestone:  5.0.0        
 Component:  vtigercrm               |     Version:  5.0.0        
Resolution:                          |    Keywords:  search engine
-------------------------------------+--------------------------------------
Changes (by anonymous):

  * status:  assigned => new
  * owner:  anonymous => developer

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1353>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 22 07:55:31 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 22 Jun 2006 11:55:31 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7427 - in /vtigercrm/trunk:
 Smarty/templates/CreateProfile.tpl Smarty/templates/EditProfile.tpl
 Smarty/templates/ProfileDetailView.tpl modules/Users/CreateProfile.php
 modules/Users/profilePrivileges.php
Message-ID: <20060622115531.C25DC842C19@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 22 05:55:20 2006
New Revision: 7427

Log:
new UI integrated for profiles

Modified:
    vtigercrm/trunk/Smarty/templates/CreateProfile.tpl
    vtigercrm/trunk/Smarty/templates/EditProfile.tpl
    vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl
    vtigercrm/trunk/modules/Users/CreateProfile.php
    vtigercrm/trunk/modules/Users/profilePrivileges.php

Modified: vtigercrm/trunk/Smarty/templates/CreateProfile.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/CreateProfile.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/CreateProfile.tpl Thu Jun 22 05:55:20 2006
@@ -9,73 +9,169 @@
   *
  ********************************************************************************/
 -->*}
-<script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
-<style type="text/css">@import url(themes/blue/style.css);</style>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-		<tr>
-		{include file='SettingsMenu.tpl'}
-				<td width="75%" valign="top">
-						<form action="index.php" method="post" name="profileform" id="form">
-						<input type="hidden" name="module" value="Users">
-						<input type="hidden" name="mode" value="{$MODE}">
-						<input type="hidden" name="action" value="CreateProfile1">
-						<input type="hidden" name="parenttab" value="Settings">
-						<input type="hidden" name="parent_profile" value="{$PARENT_PROFILE}">
-						<input type="hidden" name="radio_button" value="{$RADIO_BUTTON}">
-						<input type="hidden" name="profile_name" value="{$PROFILE_NAME}">
-						<table width="95%" border="0" cellpadding="0" cellspacing="0"  align="center">
-							<tr>
-										<td class="showPanelBg" valign="top" width="100%" colspan="3" style="padding-left:20px; "><br />
-													<span class="lvtHeaderText">
-															<b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS} </a> > {$MOD.LBL_USER_MANAGEMENT} > {$MOD.LBL_PROFILES}</b></span>
-																<hr noshade="noshade" size="1" />
-										</td>
-							</tr>
-							<tr>
-										<td  valign="top" class="leadTable">
-													<table width="100%" border="0" cellpadding="5" cellspacing="0">
-														<tr>
-																<td width="5%" style="border-bottom:1px dashed #CCCCCC;">
-																		<img src="{$IMAGE_PATH}profile.gif" align="absmiddle">
-																</td>
-																<td style="border-bottom:1px dashed #CCCCCC;"> 
-																		<span class="genHeaderGrayBig">{$CMOD.LBL_BASIC_PROFILE_DETAILS}</span><br>
-																		<span	class="genHeaderSmall">{$CMOD.LBL_STEP_1_3}</span>
-
-																</td>
-														</tr>
-													</table>
-													<table width="95%" border="0" cellpadding="5" cellspacing="0" align="center">
-															<tr><td colspan="2">&nbsp;</td></tr>
-															<tr>
-																	<td align="right" width="25%" style="padding-right:10px;">
-																			<b style="color:#FF0000;font-size:16px;">{$APP.LBL_REQUIRED_SYMBOL}</b>&nbsp;<b>{$CMOD.LBL_NEW_PROFILE_NAME} : </b></td>
-																	<td width="75%" align="left" style="padding-left:10px;">
-																			<input type="text" name="profile_name" id="pobox" value="{$PROFILENAME}" class="txtBox" /></td>
-															</tr>
-															<tr><td colspan="2">&nbsp;</td></tr>
-															<tr>
-																	<td align="right" style="padding-right:10px;" valign="top"><b>{$CMOD.LBL_DESCRIPTION} : </b></td>
-																	<td align="left" style="padding-left:10px;"><textarea name="profile_description" class="txtBox">{$PROFILEDESC}</textarea></td>
-															</tr>
-															<tr><td colspan="2" style="border-bottom:1px dashed #CCCCCC;" height="75">&nbsp;</td></tr>
-															<tr>
-																	<td colspan="2" align="right">
-																					<input type="button" value=" &lsaquo; {$APP.LBL_BACK} " name="back" class="classBtnDisable" disabled />&nbsp;&nbsp;
-																					<input type="button" value=" {$APP.LNK_LIST_NEXT} &rsaquo; " class="classBtn" name="Next" onClick="rolevalidate();"/>&nbsp;&nbsp;
-																					<input type="button" value=" {$APP.LBL_CANCEL_BUTTON_LABEL} " title="{$APP.LBL_CANCEL_BUTTON_TITLE}" name="Cancel" onClick="window.history.back()"; class="classBtn"/>
-																	</td>
-															</tr>
-															
-												</table>
-										</td>
-									</tr>
-				</table></form>
-		</td>
-	</tr>
+
+<script language="JAVASCRIPT" type="text/javascript" src="include/js/smoothscroll.js"></script>
+
+<br>
+<table align="center" border="0" cellpadding="0" cellspacing="0" width="98%">
+<tbody><tr>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
+        <td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
+	<br>
+	<div align=center>
+				{include file='SetMenu.tpl'}
+				<form action="index.php" method="post" name="profileform" id="form">
+                                <input type="hidden" name="module" value="Users">
+                                <input type="hidden" name="mode" value="{$MODE}">
+                                <input type="hidden" name="action" value="profilePrivileges">
+                                <input type="hidden" name="parenttab" value="Settings">
+                                <input type="hidden" name="parent_profile" value="{$PARENT_PROFILE}">
+                                <input type="hidden" name="radio_button" value="{$RADIO_BUTTON}">
+	
+				<!-- DISPLAY -->
+				<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
+				<tr>
+					<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}ico-profile.gif" alt="{$MOD.LBL_PROFILES}" width="48" height="48" border=0 title="{$MOD.LBL_PROFILES}"></td>
+					<td class=heading2 valign=bottom><b> <a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Users&action=ListProfiles&parenttab=Settings">{$CMOD.LBL_PROFILE_PRIVILEGES}</a></b></td>
+				</tr>
+				<tr>
+					<td valign=top class="small">{$MOD.LBL_PROFILE_DESCRIPTION}</td>
+				</tr>
+				</table>
+				
+				
+				<table border=0 cellspacing=0 cellpadding=10 width=100% >
+				<tr>
+					<td valign="top">
+					<table border="0" cellpadding="0" cellspacing="0" width="100%">
+		                      	<tbody><tr>
+                			     <td>
+						<table border="0" cellpadding="0" cellspacing="0" width="100%">
+			                        <tbody><tr class="small">
+		                              <td><img src="{$IMAGE_PATH}prvPrfTopLeft.gif"></td>
+               			               <td class="prvPrfTopBg" width="100%"></td>
+		                              <td><img src="{$IMAGE_PATH}prvPrfTopRight.gif"></td>
+
+                	            </tr>
+                          </tbody></table>
+                            <table class="prvPrfOutline" border="0" cellpadding="0" cellspacing="0" width="100%">
+                              <tbody>
+				<tr>
+                                              <td><!-- Module name heading -->
+                                                  <table class="small" border="0" cellpadding="2" cellspacing="0">
+                                                    <tbody><tr>
+                                                      <td valign="top"><img src="{$IMAGE_PATH}prvPrfHdrArrow.gif"> </td>
+                                                      <td class="prvPrfBigText"><b> {$CMOD.LBL_STEP_1_2} : {$CMOD.LBL_WELCOME_PROFILE_CREATE} </b><br>
+                                                          <font class="small"> {$CMOD.LBL_SELECT_CHOICE_NEW_PROFILE} </font> </td>
+
+                                                      <td class="small" style="padding-left: 10px;" align="right"></td>
+                                                    </tr>
+                                                </tbody></table></td>
+                                              <td align="right" valign="bottom">&nbsp;											  </td>
+                                            </tr>
+				<tr>
+                                <td><!-- tabs -->
+					<table width="95%" border="0" cellpadding="5" cellspacing="0" align="center">
+					<tr><td colspan="2">&nbsp;</td></tr>
+					<tr>
+						<td align="right" width="25%" style="padding-right:10px;">
+						<b style="color:#FF0000;font-size:16px;">{$APP.LBL_REQUIRED_SYMBOL}</b>&nbsp;<b>{$CMOD.LBL_NEW_PROFILE_NAME} : </b></td>
+						<td width="75%" align="left" style="padding-left:10px;">
+						<input type="text" name="profile_name" id="pobox" value="{$PROFILENAME}" class="txtBox" /></td>
+					</tr>
+					<tr><td colspan="2">&nbsp;</td></tr>
+					<tr>
+						<td align="right" style="padding-right:10px;" valign="top"><b>{$CMOD.LBL_DESCRIPTION} : </b></td>
+						<td align="left" style="padding-left:10px;"><textarea name="profile_description" class="txtBox">{$PROFILEDESC}</textarea></td>
+					</tr>
+					<tr><td colspan="2" style="border-bottom:1px dashed #CCCCCC;" height="75">&nbsp;</td></tr>
+					<tr>
+						<td align="right" width="10%" style="padding-right:10px;">
+						{if  $RADIO_BUTTON neq 'newprofile'}
+						<input name="radiobutton" checked type="radio" value="baseprofile" />
+						{else}
+						<input name="radiobutton" type="radio"  value="baseprofile" />
+						{/if}
+						</td>
+						<td width="90%" align="left" style="padding-left:10px;">{$CMOD.LBL_BASE_PROFILE_MESG}</td>
+					</tr>
+					<tr>
+						<td align="right"  style="padding-right:10px;">&nbsp;</td>
+						<td align="left" style="padding-left:10px;">{$CMOD.LBL_BASE_PROFILE}
+						<select name="parentprofile" class="importBox">
+							{foreach item=combo from=$PROFILE_LISTS}
+							{if $PARENT_PROFILE eq $combo.1}
+								<option  selected value="{$combo.1}">{$combo.0}</option>
+							{else}
+								<option value="{$combo.1}">{$combo.0}</option>	
+							{/if}
+							{/foreach}
+						</select>
+						</td>
+					</tr>
+					<tr><td colspan="2">&nbsp;</td></tr>
+					<tr><td align="center" colspan="2"><b>(&nbsp;{$CMOD.LBL_OR}&nbsp;)</b></td></tr>
+					<tr><td colspan="2">&nbsp;</td></tr>
+					<tr>
+						<td align="right" style="padding-right:10px;">
+						{if  $RADIO_BUTTON eq 'newprofile'}
+						<input name="radiobutton" checked type="radio" value="newprofile" />
+						{else}
+						<input name="radiobutton" type="radio" value="newprofile" />
+						{/if}
+						</td>
+						<td  align="left" style="padding-left:10px;">{$CMOD.LBL_BASE_PROFILE_MESG_ADV}</td>
+					</tr>
+					<tr><td colspan="2" style="border-bottom:1px dashed #CCCCCC;" height="75">&nbsp;</td></tr>
+					<tr>
+						<td colspan="2" align="right">
+						<input type="button" value=" {$APP.LNK_LIST_NEXT} &rsaquo; " name="Next" class="crmButton small" onClick="rolevalidate();"/>&nbsp;&nbsp;
+						<input type="button" value=" {$APP.LBL_CANCEL_BUTTON_LABEL} " title="{$APP.LBL_CANCEL_BUTTON_TITLE}" name="Cancel" onClick="window.history.back();" class="crmButton small cancel"/>
+						</td>
+					</tr>
+					</table>
+
+                                </td></tr>  	  
+                            	<table class="small" border="0" cellpadding="0" cellspacing="0" width="100%">
+                              	<tbody><tr>
+                                <td><img src="{$IMAGE_PATH}prvPrfBottomLeft.gif"></td>
+                                <td class="prvPrfBottomBg" width="100%"></td>
+                                <td><img src="{$IMAGE_PATH}prvPrfBottomRight.gif"></td>
+                              </tr>
+                          </tbody></table></td>
+                      </tr>
+                    </tbody></table>
+
+					<p>&nbsp;</p>
+					<table border="0" cellpadding="5" cellspacing="0" width="100%">
+					<tbody><tr><td class="small" align="right" nowrap="nowrap"><a href="#top">Scroll to Top</a></td></tr>
+					</tbody></table>
+				
+				
+					
+					
+					
+					
+					
+				</td>
+				</table>
+
+
+
+				</td>
+				</tr>
+				</table>
+				</td>
+				</tr>
+				</table>
+
+				</div>
+				</td>
+				<td valign="top"><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
+				</form>
+   </tr>
+</tbody>
 </table>
-
-	{include file='SettingsSubMenu.tpl'}
 <script>
 function rolevalidate()
 {ldelim}
@@ -97,7 +193,7 @@
 		'index.php',
 		{ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
 			method: 'post',
-			postBody: 'module=Users&action=UsersAjax&file=CreateProfile1&ajax=true&dup_check=true&profile_name='+profilename,
+			postBody: 'module=Users&action=UsersAjax&file=CreateProfile&ajax=true&dup_check=true&profile_name='+profilename,
 			onComplete: function(response) {ldelim}
 					if(response.responseText == 'SUCESS')
 						document.profileform.submit();

Modified: vtigercrm/trunk/Smarty/templates/EditProfile.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/EditProfile.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/EditProfile.tpl Thu Jun 22 05:55:20 2006
@@ -9,509 +9,429 @@
   *
  ********************************************************************************/
 -->*}
-<script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
-<style type="text/css">@import url(themes/blue/style.css);</style>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-		<tr>
-				{include file='SettingsMenu.tpl'}
-				<td width="75%" valign="top">
-						<table width="100%" border="0" cellpadding="0" cellspacing="0" height="100%">
-								<tr>
-										<td class="showPanelBg" valign="top" width="100%" colspan="3" style="padding-left:20px; "><br />
-												<span class="lvtHeaderText"><b>
-														<a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS} </a> 
-														> {$MOD.LBL_USER_MANAGEMENT} > {$MOD.LBL_PROFILES}</b></span>
-														<hr noshade="noshade" size="1" />
-										</td>
-								</tr>
-								<tr>
-									{if $MODE neq "edit"}
-										<td  valign="top" class="leadTable" >
-												<table width="95%" border="0" cellpadding="5" cellspacing="0" align="center">
-												
-														<tr>
-															<td width="5%" style="border-bottom:1px dashed #CCCCCC;">
-																	<img src="{$IMAGE_PATH}profile.gif" align="absmiddle">
-															</td>
-															<td style="border-bottom:1px dashed #CCCCCC;"> 
-																	<span class="genHeaderGrayBig">{$CMOD.LBL_PROFILE_PRIVILEGES}</span><br>
-																	<span	class="genHeaderSmall">{$CMOD.LBL_STEP_3_3}</span>
-															</td>
-													</tr>
-													{else}
-															<td  valign="top" >
-												<table width="75%" border="0" cellpadding="5" cellspacing="0" align="center">
-												
-														<tr>
-															<td width="5%" style="border-bottom:1px dashed #CCCCCC;">
-																	<img src="{$IMAGE_PATH}profile.gif" align="absmiddle">
-															</td>
-															<td style="border-bottom:1px dashed #CCCCCC;"> 
-																	<span class="genHeaderGrayBig">{$CMOD.LBL_PROFILE_PRIVILEGES}</span><br>
-																	<span	class="genHeaderSmall">{$PROFILE_NAME}</span>
-															</td>
-													</tr>
-													{/if}
-																	<tr>
-																			<td colspan="2">
-																					<table border="0" cellspacing="0" cellpadding="0" width="100%">
-																							<tr>
-																								<td>
-																										<table border="0" cellspacing="0" cellpadding="0" width="100%">
-																												<tr class="small">
-																														<td><img src="{$IMAGE_PATH}prvPrfTopLeft.gif" /></td>
-																														<td class="prvPrfTopBg" width="100%" ></td>
-																														<td><img src="{$IMAGE_PATH}prvPrfTopRight.gif" /></td>
-																												</tr>
-																										</table>
-																										<form action="index.php" method="post" name="new" id="form">
-																										<input type="hidden" name="module" value="Users">		
-																										<input type="hidden" name="parenttab" value="Settings">
-																										<input type="hidden" name="action" value="{$ACTION}">		
-																										<input type="hidden" name="mode" value="{$MODE}">	
-																										<input type="hidden" name="profileid" value="{$PROFILEID}">
-																										<input type="hidden" name="profile_name" value="{$PROFILE_NAME}">
-																										<input type="hidden" name="profile_description" value="{$PROFILE_DESCRIPTION}">
-																										<input type="hidden" name="parent_profile" value="{$PARENTPROFILEID}">
-																										<input type="hidden" name="radio_button" value="{$RADIOBUTTON}">	
-																										<input type="hidden" name="return_action" value="{$RETURN_ACTION}">	
-																										<table border="0" cellspacing="0" cellpadding=	"0" width="100%" class="prvPrfOutline">
-																												<tr>
-																														<td>
-<!-- tabs -->
-																																<table border="0" cellspacing="0" cellpadding="5" width="100%" class="small">
-																																		<tr>
-																																				
-																																				<td width="20%" id="prvPrfTab1" class="prvPrfUnSelectedTab" align="center" style="height:31px;" onClick="toggleshowhide('global_privileges','prvPrfTab1');">{$CMOD.LBL_GLOBAL_PRIVILEGES}</td>
-																																				<td width="20%" id="prvPrfTab2" class="prvPrfUnSelectedTab" align="center" onClick="toggleshowhide('tab_privileges','prvPrfTab2');">{$CMOD.LBL_TAB_PRIVILEGES}</td>
-																																				<td width="20%" id="prvPrfTab3" class="prvPrfUnSelectedTab" align="center" onClick="toggleshowhide('standard_privileges','prvPrfTab3');">{$CMOD.LBL_STANDARD_PRIVILEGES}</td>
-																																				<td width="20%" id="prvPrfTab4" class="prvPrfUnSelectedTab" align="center" onClick="toggleshowhide('field_privileges','prvPrfTab4');">{$CMOD.LBL_FIELD_PRIVILEGES}</td>
-																																				<td width="20%" id="prvPrfTab5" class="prvPrfUnSelectedTab" align="center" onClick="toggleshowhide('utility_privileges','prvPrfTab5');">{$CMOD.LBL_UTILITIES}</td>
-																																		</tr>
-																																</table>
-																																<div id="global_privileges" style="display:none;">
-	<!-- Headers -->
-																																	<table border="0" cellspacing="0" cellpadding="5" width="100%" class="prvPrfBgImgGlobal">
-																																		<tr>
-																																				<td>
-																																						<table border="0" cellspacing="0" cellpadding="5" width="100%" class="small">
-																																							<tr>
-																																									<td><!-- Module name heading -->
-																																											<table border="0" cellspacing="0" cellpadding="2" class="small">
-																																													<tr>
-																																															<td valign="top"><img src="{$IMAGE_PATH}prvPrfHdrArrow.gif"/> </td>
-																																															<td class="prvPrfBigText"><b> {$CMOD.LBL_GLOBAL_PRIVILEGES} {$CMOD.LBL_FOR} "{$PROFILE_NAME}"</b> <br />
-																																																	<font class="small">{$CMOD.LBL_GLOBAL_MESG_OPTION} </font> </td>
-																																															<td class="small" style="padding-left:10px" align="right"></td>
-																																													</tr>
-																																											</table>
-																																									 </td>
-																																									<td align="right" valign="bottom">&nbsp;</td>
-																																							</tr>
-																																						</table>
-<!-- privilege lists -->
-																																						<table border="0" cellspacing="0" cellpadding="0" width="100%" >
-																																								<tr>
-																																										<td align="center" style="height:10px"><img src="{$IMAGE_PATH}prvPrfLine.gif" style="width:100%;height:1px" /></td>
-																																								</tr>
-																																						</table>
-																																						<table border="0" cellspacing="0" cellpadding="10" width="100%">
-																																							<tr>
-																																									<td >
-																																											<table border="0" cellspacing="0" cellpadding="5" width="90%" class="small" align="center">
-																																												<tr>
-																																													<td class="prvPrfTexture" style="width:20px">&nbsp;</td>
-																																													<td width="97%" valign="top">
-																																															<table border="0" cellspacing="0" cellpadding="2" width="100%" class="small">
-																																																	<tr id="gva">
-																																																			<td valign="top">{$GLOBAL_PRIV.0}</td>
-																																																					<td ><b>{$CMOD.LBL_VIEW_ALL}</b> </td>
-																																																	</tr>
-																																																	<tr >
-																																																			<td valign="top"></td>
-<td width="100%" >{$CMOD.LBL_ALLOW} "{$PROFILE_NAME}" {$CMOD.LBL_MESG_VIEW}</td>
-</tr>
-<tr>
-<td>&nbsp;</td>
-</tr>
-<tr>
-<td valign="top">{$GLOBAL_PRIV.1}</td>
-<td ><b>{$CMOD.LBL_EDIT_ALL}</b> </td>
-</tr>
-<tr>
-<td valign="top"></td>
-<td > {$CMOD.LBL_ALLOW} "{$PROFILE_NAME}" {$CMOD.LBL_MESG_EDIT}</td>
-</tr>
-</table>
-</td>
-</tr>	
-</table></td>
-</tr>
-</table></td>
-</tr>
-</table>
-</div>
-
-<div id="standard_privileges" style="display:none;">
-<table border=0 cellspacing=0 cellpadding=5 width=100% >
-<tr>
-<td>
-<table border=0 cellspacing=0 cellpadding=5 width=100% class=small>
-<tr>
-<td>
-<!-- Module name heading -->
-<table border=0 cellspacing=0 cellpadding=2 class=small>
-<tr>
-<td valign=top >
-<img src="{$IMAGE_PATH}prvPrfHdrArrow.gif">
-</td>
-<td class="prvPrfBigText">
-<b> {$CMOD.LBL_STANDARD_PRIVILEGES} {$CMOD.LBL_FOR} "{$PROFILE_NAME}"</b> <br>
-<font class=small>{$CMOD.LBL_STD_MESG_OPTION} </font> 
-</td>
-</tr>
-</table>
-</td>
-<td align=right valign=bottom>&nbsp;
-
-</td>
-</tr>
-</table>
-<!-- privilege lists -->
-<table border=0 cellspacing=0 cellpadding=0 width=100% >
-<tr>
-<td align=center style="height:10px"><img src="{$IMAGE_PATH}prvPrfLine.gif" style="width:100%;height:1px"></td>
-</tr>
-</table>
-<table border=0 cellspacing=0 cellpadding=10 width=100%>
-<tr>
-<td >
-<table border=0 cellspacing=0 cellpadding=5 width=90% class=small align=center >
-<tr>
-<td class="prvPrfTexture" style="width:20px">&nbsp;</td>
-<td width=97% valign=top onMouseOver="this.className='prvPrfHoverOn'" onMouseOut="this.className='prvPrfHoverOff'" >
-<table border=0 cellspacing=0 cellpadding=5 width=100% class=small>
-
-	<tr>
-	<td><b>{$CMOD.LBL_ENTITY}</b></td>
-	<td><b>{$CMOD.LBL_CREATE_EDIT}</b></td>
-	<td><b>{$CMOD.LBL_DELETE}</b></td>
-	<td><b>{$CMOD.LBL_VIEW}</b></td>
-	</tr>
-{foreach item=value from=$STANDARD_PRIV}
-<tr>
-<td>{$APP[$value.0]}</td>
-<td>{$value.1}</td>
-<td>{$value.2}</td>
-<td>{$value.3}</td>
-</tr>
-{/foreach}
-
-</table>
-</td>
-</tr>
-</table>
-</td>
-</tr>
-</table>
-</td>
-</tr>
-</table>
-</div>
-
-<div id="tab_privileges" style="display:none;">
-<table border=0 cellspacing=0 cellpadding=5 width=100% >
-<tr>
-<td>
-<table border=0 cellspacing=0 cellpadding=5 width=100% class=small>
-<tr>
-<td>
-<!-- Module name heading -->
-<table border=0 cellspacing=0 cellpadding=2 class=small>
-<tr>
-<td valign=top >
-<img src="{$IMAGE_PATH}prvPrfHdrArrow.gif">
-</td>
-<td class="prvPrfBigText">
-<b> {$CMOD.LBL_TAB_PRIVILEGES} {$CMOD.LBL_FOR} "{$PROFILE_NAME}"</b> <br>
-<font class=small>{$CMOD.LBL_TAB_MESG_OPTION}  </font> 
-</td>
-</tr>
-</table>
-</td>
-<td align=right valign=bottom>
-</td>
-</tr>
-</table>
-<!-- privilege lists -->
-<table border=0 cellspacing=0 cellpadding=0 width=100% >
-<tr>
-<td align=center style="height:10px"><img src="{$IMAGE_PATH}prvPrfLine.gif" style="width:100%;height:1px"></td>
-</tr>
-</table>
-<table border=0 cellspacing=0 cellpadding=10 width=100%>
-<tr>
-<td >
-<!-- Home tab -->
-<table border=0 cellspacing=0 cellpadding=5 width=90% class=small align=center >
-<tr>
-<td class="prvPrfTexture" style="width:20px">&nbsp;</td>
-<td width=97% valign=top onMouseOver="this.className='prvPrfHoverOn'" onMouseOut="this.className='prvPrfHoverOff'" >
-<table border=0 cellspacing=0 cellpadding=5 width=100% class=small>
-
-
-{foreach item=value from=$TAB_PRIV}
-<tr>
-{foreach item=element from=$value}
-<td width=35%>{$APP[$element.0]}</td>
-<td width=15%>{$element.1}</td>
-{/foreach}
-</tr>
-{/foreach}
-
-</table>
-</td>
-</tr>
-</table>
-</td>
-</tr>
-</table>
-</td>
-</tr>
-
-</table>
-</div>
-
-
-<div id="utility_privileges" style="display:none;">
-<table border=0 cellspacing=0 cellpadding=5 width=100% >
-<tr>
-<td>
-<table border=0 cellspacing=0 cellpadding=5 width=100% class=small>
-<tr>
-<td>
-<!-- Module name heading -->
-<table border=0 cellspacing=0 cellpadding=2 class=small>
-<tr>
-<td valign=top >
-<img src="{$IMAGE_PATH}prvPrfHdrArrow.gif">
-</td>
-<td class="prvPrfBigText">
-<b> {$CMOD.LBL_UTILITY_PRIVILEGES} {$CMOD.LBL_FOR} "{$PROFILE_NAME}"</b> <br>
-<font class=small>{$CMOD.LBL_UTILITY_MESG_OPTION} </font> 
-</td>
-</tr>
-</table>
-</td>
-<td align=right valign=bottom>&nbsp;
-
-</td>
-</tr>
-</table>
-<!-- privilege lists -->
-<table border=0 cellspacing=0 cellpadding=0 width=100% >
-<tr>
-<td align=center style="height:10px"><img src="{$IMAGE_PATH}prvPrfLine.gif" style="width:100%;height:1px"></td>
-</tr>
-</table>
-<table border=0 cellspacing=0 cellpadding=10 width=100%>
-<tr>
-<td >
-<!-- Home tab -->
-<table border="0" cellspacing="0" cellpadding="5" width="90%" class="small" align="center" >
-
-{foreach key=module item=value from=$UTILITIES_PRIV}
-<tr>
-<td colspan="4" style="border-bottom:1px solid #efefef"><b>{$APP.$module}</b></td>
-</tr>
-<tr>
-<td class="prvPrfTexture" style="width:20px">&nbsp;</td>
-<td width="97%" valign="top" onmouseover="this.className='prvPrfHoverOn'" onmouseout="this.className='prvPrfHoverOff'" >
-<table border="0" cellspacing="0" cellpadding="5" width="100%" class="small">
-{foreach item=element from=$value}
-<tr>
-<td width=25%>{$APP[$element.0.0]}</td>
-<td width=25%>{$element.0.1}</td>
-<td width=25%>{$APP[$element.1.0]}</td>
-<td width=25%>{$element.1.1}</td>
-{/foreach}
-</tr>
-</table>
-</td>
-</tr>
-
-{/foreach}
-</table>
-</td>
-</tr>
-</table>
-</td>
-</tr>
-
-</table>
-
-</div>
-
-
-<div id="field_privileges" style="display:none;">
-
-<table border="0" cellspacing="0" cellpadding="5" width="100%" >
-<tr>
-<td><table border="0" cellspacing="0" cellpadding="5" width="100%" class="small">
-<tr>
-<td><!-- Module name heading -->
-<table border="0" cellspacing="0" cellpadding="2" class="small">
-<tr>
-<td valign="top" ><img src="{$IMAGE_PATH}prvPrfHdrArrow.gif" /> </td>
-
-<td class="prvPrfBigText"><b> {$CMOD.LBL_FIELD_PRIVILEGES} {$CMOD.LBL_FOR} "{$PROFILE_NAME}"</b> <br />
-<font class="small">{$CMOD.LBL_FIELD_MESG_OPTION} </font> </td>
-</tr>
-</table></td>
-<td align="right" valign="bottom">
-</td>
-</tr>
-</table>
-<!-- privilege lists -->
-<table border="0" cellspacing="0" cellpadding="0" width="100%" >
-<tr>
-<td align="center" style="height:10px"><img src="{$IMAGE_PATH}prvPrfLine.gif" style="width:100%;height:1px" /></td>
-</tr>
-
-</table>
-<table border="0" cellspacing="0" cellpadding="10" width="100%">
-<tr>
-<td >
-<table border="0" cellspacing="0" cellpadding="5" width="100%" class="small">
-<tr>
-<td>
-<select id="module_list" name="module_list" onchange="showmoduleperm(this)">
-{foreach key=module item=label from=$PRI_FIELD_LIST}
-<option value="{$label}">{$APP.$label}</option>
-{/foreach}
-</td>
-<td width=50%>&nbsp;</td>
-</tr>
-<tr>
-<td colspan=2>
-
-{foreach key=module item=value from=$FIELD_PRIVILEGES}
-<div id="field_{$module}" style="display:none;">
-<table border="0" cellspacing="0" cellpadding="5" width="100%" class="small">
-{foreach item=row_value from=$value}
-<tr>
-{foreach item=element from=$row_value}
-<td>{$element.0}</td>
-<td>{$element.1}</td>
-{/foreach}
-</tr>
-{/foreach}
-</table>
-</div>
-{/foreach}
-
-</td>
-</tr>
-</table></td>
-</tr>
-</table></td>
-</tr>
-</table>
-</div>
-
-																														</td>
-																												</tr>
-																										</table>
-																										<table border="0" cellspacing="0" cellpadding="0" width="100%" class="small">
-																												<tr>
-																														<td><img src="{$IMAGE_PATH}prvPrfBottomLeft.gif" /></td>
-																														<td class="prvPrfBottomBg" width="100%"></td>
-																														<td><img src="{$IMAGE_PATH}prvPrfBottomRight.gif" /></td>
-																												</tr>
-																										</table>	
-																									</td>
-																								</tr>
-																						</table>
-																				</td>
-																			</tr>	
-																			<tr><td colspan="2" style="border-bottom:1px dashed #CCCCCC;">&nbsp;</td></tr>
-																			<tr>
-																				<td colspan="2" align="center">
-
-																					<input type="hidden" id="selected_tab" name="selected_tab" value="{$SELECTED_TAB}">		
-																					<input type="hidden" id="selected_module" name="selected_module" value="{$SELECTED_MODULE}">		
-																					{if $MODE neq "edit"}
-																					<input type="submit" value=" &lsaquo; {$APP.LBL_BACK} " name="back" onclick="this.form.action.value='CreateProfile1'" class="classBtn" />&nbsp;&nbsp;
-																					{/if}
-																					{if $ACTION eq 'SaveProfile'}
-																					<input type="submit" value=" {$CMOD.LBL_FINISH_BUTTON} " name="save" class="classBtn"/>&nbsp;&nbsp;
-																					{else}
-																					<input type="submit" value=" {$APP.LBL_SAVE_BUTTON_LABEL} " name="save" class="classBtn"/>&nbsp;&nbsp;
-																					{/if}
-																					<input type="button" value=" {$APP.LBL_CANCEL_BUTTON_LABEL} " name="Cancel" class="classBtn"onClick="window.history.back();" />
-																			</td>
-																	</tr>
-																	
-															</table></from>			
-														</td>
-												<td width="1%" style="border-right:1px dotted #CCCCCC;">&nbsp;</td>
-										</tr>
-								</table>
+{literal}
+<style>
+.showTable{
+	display:inline-table;
+}
+.hideTable{
+	display:none;
+}
+</style>
+{/literal}
+<script language="JAVASCRIPT" type="text/javascript" src="include/js/smoothscroll.js"></script>
+
+<br>
+<table align="center" border="0" cellpadding="0" cellspacing="0" width="98%">
+<tbody><tr>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
+        <td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
+        <br>
+	<div align=center>
+			{include file='SetMenu.tpl'}
+				<!-- DISPLAY -->
+				<form action="index.php" method="post" name="profileform" id="form">
+				<input type="hidden" name="module" value="Users">		
+				<input type="hidden" name="parenttab" value="Settings">
+				<input type="hidden" name="action" value="{$ACTION}">		
+				<input type="hidden" name="mode" value="{$MODE}">	
+				<input type="hidden" name="profileid" value="{$PROFILEID}">
+				<input type="hidden" name="profile_name" value="{$PROFILE_NAME}">
+				<input type="hidden" name="profile_description" value="{$PROFILE_DESCRIPTION}">
+				<input type="hidden" name="parent_profile" value="{$PARENTPROFILEID}">
+				<input type="hidden" name="radio_button" value="{$RADIOBUTTON}">	
+				<input type="hidden" name="return_action" value="{$RETURN_ACTION}">	
+
+				<table class="settingsSelUITopLine" border="0" cellpadding="5" cellspacing="0" width="100%">
+				<tbody><tr>
+					<td rowspan="2" valign="top" width="50"><img src="{$IMAGE_PATH}ico-profile.gif" alt="{$MOD.LBL_PROFILES}" title="{$MOD.LBL_PROFILES}" border="0" height="48" width="48"></td>
+					<td class="heading2" valign="bottom"><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Users&action=ListProfiles&parenttab=Settings">{$CMOD.LBL_PROFILE_PRIVILEGES}</a> &gt; {$CMOD.LBL_VIEWING} &quot;{$PROFILE_NAME}&quot;</b></td>
+				</tr>
+				<tr>
+					<td class="small" valign="top">{$CMOD.LBL_PROFILE_MESG} &quot;{$PROFILE_NAME}&quot; </td>
+				</tr>
+				</tbody></table>
+				
+				
+				<table border="0" cellpadding="10" cellspacing="0" width="100%">
+				<tbody><tr>
+				<td valign="top">
+					<table border="0" cellpadding="0" cellspacing="0" width="100%">
+                      <tbody><tr>
+                        <td><table border="0" cellpadding="0" cellspacing="0" width="100%">
+                            <tbody><tr class="small">
+                              <td><img src="{$IMAGE_PATH}prvPrfTopLeft.gif"></td>
+                              <td class="prvPrfTopBg" width="100%"></td>
+                              <td><img src="{$IMAGE_PATH}prvPrfTopRight.gif"></td>
+                            </tr>
+                          </tbody></table>
+                            <table class="prvPrfOutline" border="0" cellpadding="0" cellspacing="0" width="100%">
+                              <tbody><tr>
+                                <td><!-- tabs -->
+                                    
+                                    <!-- Headers -->
+                                    <table border="0" cellpadding="5" cellspacing="0" width="100%">
+                                      <tbody><tr>
+                                        <td><table class="small" border="0" cellpadding="5" cellspacing="0" width="100%">
+                                            <tbody><tr>
+                                              <td><!-- Module name heading -->
+                                                  <table class="small" border="0" cellpadding="2" cellspacing="0">
+                                                    <tbody><tr>
+                                                      <td valign="top"><img src="{$IMAGE_PATH}prvPrfHdrArrow.gif"> </td>
+                                                      <td class="prvPrfBigText"><b> {if $MODE eq 'create'}{$CMOD.LBL_STEP_2_2} : {/if}{$CMOD.LBL_DEFINE_PRIV_FOR} &lt;{$PROFILE_NAME}&gt; </b><br>
+                                                      <font class="small">{$CMOD.LBL_USE_OPTION_TO_SET_PRIV}</font> </td>
+                                                      <td class="small" style="padding-left: 10px;" align="right"></td>
+                                                    </tr>
+                                                </tbody></table></td>
+                                              <td align="right" valign="bottom">&nbsp;											 	{if $ACTION eq 'SaveProfile'}
+                                                <input type="submit" value=" {$CMOD.LBL_FINISH_BUTTON} " name="save" class="crmButton create small"/>&nbsp;&nbsp;
+                                                {else}
+                                                        <input type="submit" value=" {$APP.LBL_SAVE_BUTTON_LABEL} " name="save" class="crmButton small save"/>&nbsp;&nbsp;
+                                                {/if}
+                                                <input type="button" value=" {$APP.LBL_CANCEL_BUTTON_LABEL} " name="Cancel" class="crmButton cancel small"onClick="window.history.back();" /> 
 						</td>
-				</tr>
+                                            </tr>
+                                          </tbody></table>
+                                            <!-- privilege lists -->
+                                            <table border="0" cellpadding="0" cellspacing="0" width="100%">
+                                              <tbody><tr>
+                                                <td style="height: 10px;" align="center"><img src="{$IMAGE_PATH}prvPrfLine.gif" style="width: 100%; height: 1px;"></td>
+                                              </tr>
+                                            </tbody></table>
+                                            <table border="0" cellpadding="10" cellspacing="0" width="100%">
+                                              <tbody><tr>
+                                                <td>
+						<table border="0" cellpadding="5" cellspacing="0" width="100%">
+  						<tbody>
+							<tr>
+    							<td class="cellLabel big"> {$CMOD.LBL_SUPER_USER_PRIV} </td>
+						       </tr>
+						</tbody>
+						</table>
+						<table class="small" align="center" border="0" cellpadding="5" cellspacing="0" width="90%">
+                                                <tbody><tr>
+                                                    <td class="prvPrfTexture" style="width: 20px;">&nbsp;</td>
+                                                    <td valign="top" width="97%"><table class="small" border="0" cellpadding="2" cellspacing="0" width="100%">
+                                                      <tbody>
+				                         <tr id="gva">
+                                                          <td valign="top">{$GLOBAL_PRIV.0}</td>
+                                                          <td ><b>{$CMOD.LBL_VIEW_ALL}</b> </td>
+                                                        </tr>
+                                                        <tr>
+                                                          <td valign="top"></td>
+                                                          <td width="100%" >{$CMOD.LBL_ALLOW} "{$PROFILE_NAME}" {$CMOD.LBL_MESG_VIEW}</td>
+                                                        </tr>
+                                                        <tr>
+                                                          <td>&nbsp;</td>
+                                                        </tr>
+							<tr>
+							<td valign="top">{$GLOBAL_PRIV.1}</td>
+							<td ><b>{$CMOD.LBL_EDIT_ALL}</b> </td>
+							</tr>
+                                                        <tr>
+                                                          <td valign="top"></td>
+                                                          <td > {$CMOD.LBL_ALLOW} "{$PROFILE_NAME}" {$CMOD.LBL_MESG_EDIT}</td>
+                                                        </tr>
+
+                                                      </tbody></table>
+						</td>
+                                                  </tr>
+                                                </tbody></table>
+<br>
+
+			<table border="0" cellpadding="5" cellspacing="0" width="100%">
+			  <tbody><tr>
+			    <td class="cellLabel big"> {$CMOD.LBL_SET_PRIV_FOR_EACH_MODULE} </td>
+			  </tr>
+			</tbody></table>
+			<table class="small" align="center" border="0" cellpadding="5" cellspacing="0" width="90%">
+			  <tbody><tr>
+			    <td class="prvPrfTexture" style="width: 20px;">&nbsp;</td>
+			    <td valign="top" width="97%">
+				<table class="small listTable" border="0" cellpadding="5" cellspacing="0" width="100%">
+			        <tbody>
+				<tr id="gva">
+			          <td colspan="2" rowspan="2" class="small colHeader"><strong> {$CMOD.LBL_TAB_MESG_OPTION} </strong><strong></strong></td>
+			          <td colspan="3" class="small colHeader"><div align="center"><strong>{$CMOD.LBL_EDIT_PERMISSIONS}</strong></div></td>
+			          <td rowspan="2" class="small colHeader" nowrap="nowrap">{$CMOD.LBL_FIELDS_AND_TOOLS_SETTINGS}</td>
+			        </tr>
+			        <tr id="gva">
+			          <td class="small colHeader"><div align="center"><strong>
+		                Create/Edit
+			          </strong></div></td>
+			          <td class="small colHeader"> <div align="center"><strong>View </strong></div></td>
+			          <td class="small colHeader"> <div align="center"><strong>Delete</strong></div></td>
+			        </tr>
+					
+				<!-- module loops-->
+			        {foreach key=tabid item=elements from=$TAB_PRIV}	
+			        <tr>
+                                        {assign var=modulename value=$TAB_PRIV[$tabid][0]}
+			          <td class="small cellLabel" width="3%"><div align="right">
+					{$TAB_PRIV[$tabid][1]}
+			          </div></td>
+			          <td class="small cellLabel" width="40%"><p>{$APP[$modulename]}</p></td>
+			          <td class="small cellText" width="15%"><div align="center">
+					{$STANDARD_PRIV[$tabid][1]}
+			          </div></td>
+			          <td class="small cellText" width="15%"><div align="center">
+					{$STANDARD_PRIV[$tabid][3]}
+			          </div></td>
+			          <td class="small cellText" width="15%"><div align="center">
+					{$STANDARD_PRIV[$tabid][2]}
+        			  </div></td>
+			          <td class="small cellText" width="22%"><div align="center">
+				{if $FIELD_PRIVILEGES[$tabid] neq NULL}
+				<img src="{$IMAGE_PATH}showDown.gif" id="img_{$tabid}" alt="{$CMOD.LBL_SHOW_FIELDS}" onclick="fnToggleVIew('{$tabid}_view')" border="0" height="16" width="40" style="display:block;">
+				{/if}
+				</div></td>
+				  </tr>
+		                  <tr class="hideTable" id="{$tabid}_view" className="hideTable">
+				          <td colspan="6" class="small settingsSelectedUI">
+						<table class="small" border="0" cellpadding="2" cellspacing="0" width="100%">
+			        	    	<tbody>
+						<tr id="gva">
+				                	<td class="small colHeader" colspan="6" valign="top">{$CMOD.LBL_FIELDS_SELECT_DESELECT}</td>
+					        </tr>
+						{foreach item=row_values from=$FIELD_PRIVILEGES[$tabid]}
+				            	<tr id="gva">
+						      {foreach item=element from=$row_values}
+					              <td valign="top">{$element.1}</td>
+					              <td>{$element.0}</td>
+						      {/foreach}
+				                </tr>
+						{/foreach}
+					        <tr id="gva">
+					              <td colspan="6" class="small colHeader" valign="top">{$CMOD.LBL_TOOLS_TO_BE_SHOWN}</td>
+						</tr>
+							{foreach item=util_value from=$UTILITIES_PRIV[$tabid]}
+							<tr id="gva">
+							{foreach item=util_elements from=$util_value}
+					              		<td valign="top">{$util_elements.1}</td>
+						                <td>{$APP[$util_elements.0]}</td>
+							{/foreach}
+				                	</tr>
+							{/foreach}
+					        </tbody>
+						</table>
+					</td>
+			          </tr>
+				  {/foreach}	
+			    	  </tbody>
+				  </table>
+			  </td>
+			  </tr>
+                          </tbody>
 			</table>
 		</td>
+                </tr>
+		<tr>
+		<td style="border-top: 2px dotted rgb(204, 204, 204);" align="right">
+		<!-- wizard buttons -->
+		<table border="0" cellpadding="2" cellspacing="0">
+		<tbody>
+			<tr><td>
+				{if $ACTION eq 'SaveProfile'}
+					<input type="submit" value=" {$CMOD.LBL_FINISH_BUTTON} " name="save" class="crmButton create small"/>&nbsp;&nbsp;
+				{else}
+					<input type="submit" value=" {$APP.LBL_SAVE_BUTTON_LABEL} " name="save" class="crmButton small save"/>&nbsp;&nbsp;
+				{/if}
+				</td><td>
+					<input type="button" value=" {$APP.LBL_CANCEL_BUTTON_LABEL} " name="Cancel" class="crmButton cancel small"onClick="window.history.back();" /></td>
+
+				<td>&nbsp;</td>
+			</tr>
+		</tbody>
+		</table>
+		</td>
+		</tr>
+          </tbody>
+	  </table>
+	</td>
+        </tr>
+        </tbody>
+	</table>
+      </td>
+      </tr>
+      </tbody></table>
+      <table class="small" border="0" cellpadding="0" cellspacing="0" width="100%">
+           <tbody><tr>
+                <td><img src="{$IMAGE_PATH}prvPrfBottomLeft.gif"></td>
+                <td class="prvPrfBottomBg" width="100%"></td>
+                <td><img src="{$IMAGE_PATH}prvPrfBottomRight.gif"></td>
+                </tr>
+            </tbody>
+      </table></td>
+      </tr>
+      </tbody></table>
+	<p>&nbsp;</p>
+	<table border="0" cellpadding="5" cellspacing="0" width="100%">
+	<tbody><tr><td class="small" align="right" nowrap="nowrap"><a href="#top">{$MOD.LBL_SCROLL}</a></td></tr>
+	</tbody></table>
+					
+	</td>
 	</tr>
+	</tbody></table>
+	</form>	
+	<!-- End of Display -->
+	</td>
+	</tr>
+	</table>
+	</td>
+	</tr>
+	</table>
+	</div>
+
+	</td>
+	<td valign="top"><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
+	</tr>
+</tbody>
 </table>
-	{include file='SettingsSubMenu.tpl'}
-
 <script language="javascript" type="text/javascript">
-var Selected_div= '{$SELECTED_TAB}';
-divarray = new Array('global_privileges','tab_privileges','standard_privileges','field_privileges','utility_privileges'); 	
-tabarray = new Array('prvPrfTab1','prvPrfTab2','prvPrfTab3','prvPrfTab4','prvPrfTab5'); 	
-var defaultmodule = '{$SELECTED_MODULE}';
-function set_default()
-{ldelim}
-	show (Selected_div);
-	show (defaultmodule);
-	for(i = 0; i < divarray.length ;i++)
-	{ldelim}
-		if(divarray[i] == Selected_div)
-			break;	
-	{rdelim}
-	document.getElementById(tabarray[i]).className="prvPrfSelectedTab";
-	module_combo = document.getElementById('module_list');
-	module_combo_selected = defaultmodule.replace(/field_/gi,'')
-	for(i = 0; i < module_combo.length ;i++)
-	{ldelim}
-		if(module_combo.options[i].value == module_combo_selected)
-		{ldelim}	
-			module_combo.options[i].selected = true;	
-			break;	
-		{rdelim}	
-	{rdelim}
-{rdelim}
-set_default();
-function toggleshowhide(currentselecteddiv,currentselectedtab)
-{ldelim}
-	for(i = 0; i < divarray.length ;i++)
-	{ldelim}
-		if(Selected_div == divarray[i])
-			break;	
-	{rdelim}	
-	hide (Selected_div);
-	document.getElementById(tabarray[i]).className="prvPrfUnSelectedTab";
-	show (currentselecteddiv);
-	document.getElementById(currentselectedtab).className="prvPrfSelectedTab";
-	Selected_div = currentselecteddiv;
-	document.getElementById('selected_tab').value =	Selected_div; 	
-{rdelim}	
-function showmoduleperm(selectmodule_view)
-{ldelim}
-	hide(defaultmodule);
-	defaultmodule='field_'+selectmodule_view.options[selectmodule_view.options.selectedIndex].value;
-	show(defaultmodule);
-	document.getElementById('selected_module').value = defaultmodule;	
-{rdelim}	
-	
+{literal}
+var Imagid_array = new Array('img_2','img_4','img_6','img_7','img_8','img_9','img_10','img_13','img_14','img_18','img_19','img_20','img_21','img_22','img_23','img_26')
+function fnToggleVIew(obj){
+	var tagStyle = document.getElementById(obj).className;
+	if(tagStyle == 'hideTable' ){
+		document.getElementById(obj).className = 'showTable';
+	}
+	else
+		document.getElementById(obj).className = 'hideTable';
+}
+function invokeview_all()
+{
+	if($('view_all_chk').checked == true)
+	{
+		for(var i = 0;i < document.profileform.elements.length;i++)
+		{
+			if(document.profileform.elements[i].type == 'checkbox')
+			{
+				if(document.profileform.elements[i].id.indexOf('tab_chk_com_') != -1 || document.profileform.elements[i].id.indexOf('tab_chk_4') != -1 || document.profileform.elements[i].id.indexOf('_field_') != -1)
+					document.profileform.elements[i].checked = true; 
+			}
+		}	
+		showAllImages();
+	}
+}
+function showAllImages()
+{
+	for(var j=0;j < Imagid_array.length;j++)
+	{
+		$(Imagid_array[j]).style.display = 'block';	
+	}
+}
+function invokeedit_all()
+{
+	if($('edit_all_chk').checked == true)
+	{
+		$('view_all_chk').checked = true;
+		for(var i = 0;i < document.profileform.elements.length;i++)
+		{
+			if(document.profileform.elements[i].type == 'checkbox')
+			{
+				if(document.profileform.elements[i].id.indexOf('tab_chk_com_') != -1 || document.profileform.elements[i].id.indexOf('tab_chk_4') != -1 || document.profileform.elements[i].id.indexOf('tab_chk_1') != -1 || document.profileform.elements[i].id.indexOf('_field_') != -1)
+					document.profileform.elements[i].checked = true; 
+			}
+		}	
+		showAllImages();
+	}
+
+}
+function unselect_edit_all()
+{
+	$('edit_all_chk').checked = false;
+}
+function unselect_view_all()
+{
+	$('view_all_chk').checked = false;
+}
+function unSelectView(id)
+{
+	var createid = 'tab_chk_1_'+id;	
+	var deleteid = 'tab_chk_2_'+id;
+	if($('tab_chk_4_'+id).checked == false)
+	{
+		unselect_view_all();
+		unselect_edit_all();
+		$(createid).checked = false;
+		$(deleteid).checked = false;
+	}else
+	{
+		var imageid = 'img_'+id;
+		var viewid = 'tab_chk_4_'+id;	
+		$(imageid).style.display = 'block';
+		$('tab_chk_com_'+id).checked = true; 
+	}
+}
+function unSelectCreate(id)
+{
+	var viewid = 'tab_chk_4_'+id;	
+	if($('tab_chk_1_'+id).checked == false)
+	{
+		unselect_edit_all();
+	}else
+	{
+		var imageid = 'img_'+id;
+		var viewid = 'tab_chk_4_'+id;	
+		$(imageid).style.display = 'block';
+		$('tab_chk_com_'+id).checked = true;
+		$(viewid).checked = true;
+	}
+}
+function unSelectDelete(id)
+{	
+	var contid = id+'_view';
+	if($('tab_chk_2_'+id).checked == false)
+	{
+	}else
+	{
+		var imageid = 'img_'+id;
+		var viewid = 'tab_chk_4_'+id;	
+		$(imageid).style.display = 'block';
+		$('tab_chk_com_'+id).checked = true;
+		$(viewid).checked = true;
+	}
+
+}
+function hideTab(id)
+{
+	var createid = 'tab_chk_1_'+id;	
+	var viewid = 'tab_chk_4_'+id;	
+	var deleteid = 'tab_chk_2_'+id;
+	var imageid = 'img_'+id;
+	var contid = id+'_view';
+	if($('tab_chk_com_'+id).checked == false)
+	{
+		unselect_view_all();
+		unselect_edit_all();
+		$(imageid).style.display = 'none';
+		$(contid).className = 'hideTable';
+		$(createid).checked = false;
+		$(deleteid).checked = false;
+		$(viewid).checked = false;
+	}else
+	{
+		$(imageid).style.display = 'block';
+		$(createid).checked = true;
+		$(deleteid).checked = true;
+		$(viewid).checked = true;
+		var fieldid = id +'_field_';
+		for(var i = 0;i < document.profileform.elements.length;i++)
+                {
+                        if(document.profileform.elements[i].type == 'checkbox' && document.profileform.elements[i].id.indexOf(fieldid) != -1)
+                        {
+                                        document.profileform.elements[i].checked = true;
+                        }
+                }
+	}
+}
+function selectUnselect(oCheckbox)
+{
+	if(oCheckbox.checked == false)
+	{
+		unselect_view_all();
+		unselect_edit_all();
+	}
+}
+{/literal}
 </script>

Modified: vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ProfileDetailView.tpl Thu Jun 22 05:55:20 2006
@@ -9,7 +9,16 @@
   *
  ********************************************************************************/
 -->*}
-
+{literal}
+<style>
+.showTable{
+	display:inline-table;
+}
+.hideTable{
+	display:none;
+}
+</style>
+{/literal}
 <script language="JAVASCRIPT" type="text/javascript" src="include/js/smoothscroll.js"></script>
 
 <br>
@@ -17,35 +26,9 @@
 <tbody><tr>
         <td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
         <td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
-<br>
+        <br>
 	<div align=center>
-		{include file="SetMenu.tpl"}	
-				<!-- DISPLAY -->
-				<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
-				<tr>
-					<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}ico-profile.gif" alt="{$MOD.LBL_PROFILES}" width="48" height="48" border=0 title="{$MOD.LBL_PROFILES}"></td>
-					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&
-parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Users&action=ListProfiles&parenttab=Settings">{$CMOD.LBL_PROFILE_PRIVILEGES}</a> &gt; {$CMOD.LBL_VIEWING} &quot;{$PROFILE_NAME}&quot; </b></td>
-				</tr>
-				<tr>
-					<td valign=top class="small">{$CMOD.LBL_PROFILE_MESG} &quot;{$PROFILE_NAME}&quot;</td>
-				</tr>
-				</table>
-				
-				
-				<table border=0 cellspacing=0 cellpadding=10 width=100% >
-				<tr>
-				<td valign=top>
-					<table border="0" cellspacing="0" cellpadding="0" width="100%">
-                      <tr>
-                        <td><table border="0" cellspacing="0" cellpadding="0" width="100%">
-                            <tr class="small">
-                              <td><img src="{$IMAGE_PATH}prvPrfTopLeft.gif"></td>
-
-                              <td class="prvPrfTopBg" width="100%" ></td>
-                              <td><img src="{$IMAGE_PATH}prvPrfTopRight.gif"></td>
-                            </tr>
-                          </table>
+			{include file='SetMenu.tpl'}
 				<form action="index.php" method="post" name="new" id="form">
 			        <input type="hidden" name="module" value="Users">
 			        <input type="hidden" name="action" value="profilePrivileges">
@@ -53,53 +36,74 @@
 			        <input type="hidden" name="return_action" value="profilePrivileges">
 			        <input type="hidden" name="mode" value="edit">
 			        <input type="hidden" name="profileid" value="{$PROFILEID}">
-	
-                            <table border="0" cellspacing="0" cellpadding="0" width="100%" class="prvPrfOutline">
-                              <tr>
+				<!-- DISPLAY -->
+				<table class="settingsSelUITopLine" border="0" cellpadding="5" cellspacing="0" width="100%">
+				<tbody><tr>
+					<td rowspan="2" valign="top" width="50"><img src="{$IMAGE_PATH}ico-profile.gif" alt="{$MOD.LBL_PROFILES}" title="{$MOD.LBL_PROFILES}" border="0" height="48" width="48"></td>
+					<td class="heading2" valign="bottom"><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Users&action=ListProfiles&parenttab=Settings">{$CMOD.LBL_PROFILE_PRIVILEGES}</a> &gt; {$CMOD.LBL_VIEWING} &quot;{$PROFILE_NAME}&quot;</b></td>
+				</tr>
+				<tr>
+					<td class="small" valign="top">{$CMOD.LBL_PROFILE_MESG} &quot;{$PROFILE_NAME}&quot; </td>
+				</tr>
+				</tbody></table>
+				
+				
+				<table border="0" cellpadding="10" cellspacing="0" width="100%">
+				<tbody><tr>
+				<td valign="top">
+					<table border="0" cellpadding="0" cellspacing="0" width="100%">
+                      <tbody><tr>
+                        <td><table border="0" cellpadding="0" cellspacing="0" width="100%">
+                            <tbody><tr class="small">
+                              <td><img src="{$IMAGE_PATH}prvPrfTopLeft.gif"></td>
+                              <td class="prvPrfTopBg" width="100%"></td>
+                              <td><img src="{$IMAGE_PATH}prvPrfTopRight.gif"></td>
+                            </tr>
+                          </tbody></table>
+                            <table class="prvPrfOutline" border="0" cellpadding="0" cellspacing="0" width="100%">
+                              <tbody><tr>
                                 <td><!-- tabs -->
-                                    <table border="0" cellspacing="0" cellpadding="5" width="100%" class="small">
-                                      <tr>
-                                        <td width="20%" id="prvPrfTab1" class="prvPrfSelectedTab" align="center" style="height:31px;" onClick="toggleshowhide('global_privileges','prvPrfTab1');"><a href="#">{$CMOD.LBL_GLOBAL_PRIVILEGES}</a></td>
-                                        <td width="20%" id="prvPrfTab2" class="prvPrfUnSelectedTab" align="center" onClick="toggleshowhide('tab_privileges','prvPrfTab2');"><a href="#">{$CMOD.LBL_TAB_PRIVILEGES}</a></td>
-                                        <td width="20%" id="prvPrfTab3" class="prvPrfUnSelectedTab" align="center" onClick="toggleshowhide('standard_privileges','prvPrfTab3');"><a href="#">{$CMOD.LBL_STANDARD_PRIVILEGES}</a></td>
-                                        <td width="20%" id="prvPrfTab4" class="prvPrfUnSelectedTab" align="center" onClick="toggleshowhide('field_privileges','prvPrfTab4');"><a href="#">{$CMOD.LBL_FIELD_PRIVILEGES}</a></td>
-                                        <td width="20%" id="prvPrfTab5" class="prvPrfUnSelectedTab" align="center" onClick="toggleshowhide('utility_privileges','prvPrfTab5');" ><a href="#">{$CMOD.LBL_UTILITIES}</a></td>
-                                      </tr>
-                                    </table>
-				   <div id="global_privileges" style="display:none;">
+                                    
                                     <!-- Headers -->
-                                    <table border="0" cellspacing="0" cellpadding="5" width="100%" class="prvPrfBgImgGlobal">
-                                      <tr>
-                                        <td><table border="0" cellspacing="0" cellpadding="5" width="100%" class="small">
-                                            <tr>
+                                    <table border="0" cellpadding="5" cellspacing="0" width="100%">
+                                      <tbody><tr>
+                                        <td><table class="small" border="0" cellpadding="5" cellspacing="0" width="100%">
+                                            <tbody><tr>
                                               <td><!-- Module name heading -->
-                                                  <table border="0" cellspacing="0" cellpadding="2" class="small">
-                                                    <tr>
-                                                      <td valign="top" ><img src="{$IMAGE_PATH}prvPrfHdrArrow.gif" /> </td>
-                                                      <td class="prvPrfBigText"><b> {$CMOD.LBL_GLOBAL_PRIVILEGES} {$CMOD.LBL_FOR} "{$PROFILE_NAME}"</b> <br />
-                                                          <font class="small">{$CMOD.LBL_GLOBAL_MESG_OPTION}</font></td>
-                                                      <td class="small" style="padding-left:10px" align="right"></td>
+                                                  <table class="small" border="0" cellpadding="2" cellspacing="0">
+                                                    <tbody><tr>
+                                                      <td valign="top"><img src="{$IMAGE_PATH}prvPrfHdrArrow.gif"> </td>
+                                                      <td class="prvPrfBigText"><b> {$CMOD.LBL_DEFINE_PRIV_FOR} &lt;{$PROFILE_NAME}&gt; </b><br>
+                                                      <font class="small">{$CMOD.LBL_USE_OPTION_TO_SET_PRIV}</font> </td>
+                                                      <td class="small" style="padding-left: 10px;" align="right"></td>
+
                                                     </tr>
-                                                </table></td>
-                                              <td align="right" valign="bottom">
-						<input type="hidden" id="selected_tab" name="selected_tab" value="{$SELECTED_TAB}">
-					        <input type="hidden" id="selected_module" name="selected_module" value="{$SELECTED_MODULE}">
-						<input type="submit" value="{$APP.LBL_EDIT_BUTTON_LABEL}" class="crmButton small edit" name="edit"></td>
+                                                </tbody></table></td>
+                                              <td align="right" valign="bottom">&nbsp;<input type="submit" value="{$APP.LBL_EDIT_BUTTON_LABEL}" class="crmButton small edit" name="edit">											  </td>
                                             </tr>
-                                          </table>
+                                          </tbody></table>
                                             <!-- privilege lists -->
-                                            <table border="0" cellspacing="0" cellpadding="0" width="100%" >
-                                              <tr>
-                                                <td align="center" style="height:10px"><img src="{$IMAGE_PATH}prvPrfLine.gif" style="width:100%;height:1px" /></td>
+                                            <table border="0" cellpadding="0" cellspacing="0" width="100%">
+                                              <tbody><tr>
+                                                <td style="height: 10px;" align="center"><img src="{$IMAGE_PATH}prvPrfLine.gif" style="width: 100%; height: 1px;"></td>
                                               </tr>
-                                            </table>
-                                            <table border="0" cellspacing="0" cellpadding="10" width="100%">
-                                              <tr>
-                                                <td ><table border="0" cellspacing="0" cellpadding="5" width="90%" class="small" align="center">
-                                                  <tr>
-                                                    <td class="prvPrfTexture" style="width:20px">&nbsp;</td>
-                                                    <td width="97%" valign="top"><table border="0" cellspacing="0" cellpadding="2" width="100%" class="small">
-                                                        <tr id="gva">
+                                            </tbody></table>
+                                            <table border="0" cellpadding="10" cellspacing="0" width="100%">
+                                              <tbody><tr>
+                                                <td>
+						<table border="0" cellpadding="5" cellspacing="0" width="100%">
+  						<tbody>
+							<tr>
+    							<td class="cellLabel big"> {$CMOD.LBL_SUPER_USER_PRIV} </td>
+						       </tr>
+						</tbody>
+						</table>
+						<table class="small" align="center" border="0" cellpadding="5" cellspacing="0" width="90%">
+                                                <tbody><tr>
+                                                    <td class="prvPrfTexture" style="width: 20px;">&nbsp;</td>
+                                                    <td valign="top" width="97%"><table class="small" border="0" cellpadding="2" cellspacing="0" width="100%">
+                                                      <tbody>
+				                         <tr id="gva">
                                                           <td valign="top">{$GLOBAL_PRIV.0}</td>
                                                           <td ><b>{$CMOD.LBL_VIEW_ALL}</b> </td>
                                                         </tr>
@@ -118,380 +122,161 @@
                                                           <td valign="top"></td>
                                                           <td > {$CMOD.LBL_ALLOW} "{$PROFILE_NAME}" {$CMOD.LBL_MESG_EDIT}</td>
                                                         </tr>
-                                                      </table>
-                                                     </td>
+
+                                                      </tbody></table>
+						</td>
                                                   </tr>
-                                                </table></td>
-                                              </tr>
-                                          </table></td>
-                                      </tr>
-                                  </table></td>
-                              </tr>
-                            </table>
-			    </div>		
-	
-		<div id="tab_privileges" style="display:none;">
-		<table border=0 cellspacing=0 cellpadding=5 width=100% >
+                                                </tbody></table>
+<br>
+
+			<table border="0" cellpadding="5" cellspacing="0" width="100%">
+			  <tbody><tr>
+			    <td class="cellLabel big"> {$CMOD.LBL_SET_PRIV_FOR_EACH_MODULE} </td>
+			  </tr>
+			</tbody></table>
+			<table class="small" align="center" border="0" cellpadding="5" cellspacing="0" width="90%">
+			  <tbody><tr>
+			    <td class="prvPrfTexture" style="width: 20px;">&nbsp;</td>
+			    <td valign="top" width="97%">
+				<table class="small listTable" border="0" cellpadding="5" cellspacing="0" width="100%">
+			        <tbody>
+				<tr id="gva">
+			          <td colspan="2" rowspan="2" class="small colHeader"><strong> {$CMOD.LBL_TAB_MESG_OPTION} </strong><strong></strong></td>
+			          <td colspan="3" class="small colHeader"><div align="center"><strong> {$CMOD.LBL_EDIT_PERMISSIONS} </strong></div></td>
+			          <td rowspan="2" class="small colHeader" nowrap="nowrap"> {$CMOD.LBL_FIELDS_AND_TOOLS_SETTINGS} </td>
+			        </tr>
+			        <tr id="gva">
+			          <td class="small colHeader"><div align="center"><strong>{$CMOD.LBL_CREATE_EDIT}
+			          </strong></div></td>
+			          <td class="small colHeader"> <div align="center"><strong>{$CMOD.LBL_VIEW} </strong></div></td>
+			          <td class="small colHeader"> <div align="center"><strong>{$CMOD.LBL_DELETE}</strong></div></td>
+			        </tr>
+					
+				<!-- module loops-->
+			        {foreach key=tabid item=elements from=$TAB_PRIV}	
+			        <tr>
+                                        {assign var=modulename value=$TAB_PRIV[$tabid][0]}
+			          <td class="small cellLabel" width="3%"><div align="right">
+					{$TAB_PRIV[$tabid][1]}
+			          </div></td>
+			          <td class="small cellLabel" width="40%"><p>{$APP[$modulename]}</p></td>
+			          <td class="small cellText" width="15%"><div align="center">
+					{$STANDARD_PRIV[$tabid][1]}
+			          </div></td>
+			          <td class="small cellText" width="15%"><div align="center">
+					{$STANDARD_PRIV[$tabid][3]}
+			          </div></td>
+			          <td class="small cellText" width="15%"><div align="center">
+					{$STANDARD_PRIV[$tabid][2]}
+        			  </div></td>
+			          <td class="small cellText" width="22%"><div align="center">
+				{if $FIELD_PRIVILEGES[$tabid] neq NULL}
+				<img src="{$IMAGE_PATH}showDown.gif" alt="{$CMOD.LBL_SHOW_FIELDS}" onclick="fnToggleVIew('{$modulename}_view')" border="0" height="16" width="40">
+				{/if}
+				</div></td>
+				  </tr>
+		                  <tr class="hideTable" id="{$modulename}_view" className="hideTable">
+				          <td colspan="6" class="small settingsSelectedUI">
+						<table class="small" border="0" cellpadding="2" cellspacing="0" width="100%">
+			        	    	<tbody>
+						<tr id="gva">
+				                	<td class="small colHeader" colspan="6" valign="top">{$CMOD.LBL_FIELDS_SELECT_DESELECT}</td>
+					        </tr>
+						{foreach item=row_values from=$FIELD_PRIVILEGES[$tabid]}
+				            	<tr id="gva">
+						      {foreach item=element from=$row_values}
+					              <td valign="top">{$element.1}</td>
+					              <td>{$element.0}</td>
+						      {/foreach}
+				                </tr>
+						{/foreach}
+					        <tr id="gva">
+					              <td colspan="6" class="small colHeader" valign="top">{$CMOD.LBL_TOOLS_TO_BE_SHOWN} </td>
+						</tr>
+							{foreach item=util_value from=$UTILITIES_PRIV[$tabid]}
+							<tr id="gva">
+							{foreach item=util_elements from=$util_value}
+					              		<td valign="top">{$util_elements.1}</td>
+						                <td>{$APP[$util_elements.0]}</td>
+							{/foreach}
+				                	</tr>
+							{/foreach}
+					        </tbody>
+						</table>
+					</td>
+			          </tr>
+				  {/foreach}	
+			    	  </tbody>
+				  </table>
+			  </td>
+			  </tr>
+                          </tbody>
+			</table>
+		</td>
+                </tr>
 		<tr>
-		<td>
-		<table border=0 cellspacing=0 cellpadding=5 width=100% class=small>
-		<tr>
-		<td>
-		<!-- Module name heading -->
-		<table border=0 cellspacing=0 cellpadding=2 class=small>
-		<tr>
-		<td valign=top >
-		<img src="{$IMAGE_PATH}prvPrfHdrArrow.gif"></td>
-		<td class="prvPrfBigText">
-		<b> {$CMOD.LBL_TAB_PRIVILEGES} {$CMOD.LBL_FOR} "{$PROFILE_NAME}"</b> <br>
-		<font class=small>{$CMOD.LBL_TAB_MESG_OPTION} </font> 
-		</td>
-		</tr>
-		</table>
-		</td>
-		<td align=right valign=bottom>
-			<input type="hidden" id="selected_tab" name="selected_tab" value="{$SELECTED_TAB}">
-			<input type="hidden" id="selected_module" name="selected_module" value="{$SELECTED_MODULE}">
-			<input type="submit" value="{$APP.LBL_EDIT_BUTTON_LABEL}" class="crmButton small edit" name="edit">
-		</td>
-		</tr>
-		</table>
-		<!-- privilege lists -->
-		<table border=0 cellspacing=0 cellpadding=0 width=100% >
-		<tr>
-		<td align=center style="height:10px"><img src="{$IMAGE_PATH}prvPrfLine.gif" style="width:100%;height:1px"></td>
-		</tr>
-		</table>
-		<table border=0 cellspacing=0 cellpadding=10 width=100%>
-		<tr>
-		<td >
-		<!-- Home tab -->
-		<table border=0 cellspacing=0 cellpadding=5 width=95% class=small align=center >
-		<tr>
-			<td valign=top width="25%" ><table border=0 cellspacing=0 cellpadding=5 width=100% class=small>
-		
-
-		{foreach item=value from=$TAB_PRIV}
-		<tr>
-		{foreach item=element from=$value}
-		<td class="prvPrfTexture" style="width:20px">&nbsp;</td>
-		<td width=5% id="perm{$element.0}">{$element.1}</td>
-		<td width=30% nowrap onMouseOver="this.className='prvPrfHoverOn',$('perm{$element.0}').className='prvPrfHoverOn'" onMouseOut="this.className='prvPrfHoverOff',$('perm{$element.0}').className='prvPrfHoverOff'">{$APP[$element.0]}</td>
-		{/foreach}
-		</tr>
-		{/foreach}
-	
+		<td style="border-top: 2px dotted rgb(204, 204, 204);" align="right">
+		<!-- wizard buttons -->
+		<table border="0" cellpadding="2" cellspacing="0">
+		<tbody>
+			<tr>
+				<td><input type="submit" value="{$APP.LBL_EDIT_BUTTON_LABEL}" class="crmButton small edit" name="edit"></td>
+				<td>&nbsp;</td>
+			</tr>
+		</tbody>
 		</table>
 		</td>
 		</tr>
-		</table>
-		</td>
-		</tr>
-		</table>
-		</td>
-		</tr>
-
-		</table>
-		</div>
-	
-		<div id="standard_privileges" style="display:none;">
-		<table border=0 cellspacing=0 cellpadding=5 width=100% >
-		<tr>
-		<td>
-		<table border=0 cellspacing=0 cellpadding=5 width=100% class=small>
-		<tr>
-		<td>
-		<!-- Module name heading -->
-		<table border=0 cellspacing=0 cellpadding=2 class=small>
-		<tr>
-		<td valign=top >
-		<img src="{$IMAGE_PATH}prvPrfHdrArrow.gif">
-		</td>
-		<td class="prvPrfBigText">
-		<b> {$CMOD.LBL_STANDARD_PRIVILEGES} {$CMOD.LBL_FOR} "{$PROFILE_NAME}"</b> <br>
-		<font class=small>{$CMOD.LBL_STD_MESG_OPTION} </font> 
-		</td>
-		</tr>
-		</table>
-		</td>
-		<td align=right valign=bottom>
-			<input type="hidden" id="selected_tab" name="selected_tab" value="{$SELECTED_TAB}">
-			<input type="hidden" id="selected_module" name="selected_module" value="{$SELECTED_MODULE}">
-			<input type="submit" value="{$APP.LBL_EDIT_BUTTON_LABEL}" class="crmButton small edit" name="edit">
-		</td>	
-
-		</tr>
-		</table>
-		<!-- privilege lists -->
-		<table border=0 cellspacing=0 cellpadding=0 width=100% >
-		<tr>
-		<td align=center style="height:10px"><img src="{$IMAGE_PATH}prvPrfLine.gif" style="width:100%;height:1px"></td>
-		</tr>
-		</table>
-		<table border=0 cellspacing=0 cellpadding=10 width=100%>
-		<tr>
-		<td >
-		<table border=0 cellspacing=0 cellpadding=5 width=90% class=small align=center >
-		<tr>
-		<td class="prvPrfTexture" style="width:20px">&nbsp;</td>
-		<td width=97% valign=top>
-		<table border=0 cellspacing=0 cellpadding=5 width=100% class=small>
-		
-		<tr onMouseOver="this.className='prvPrfHoverOn'" onMouseOut="this.className='prvPrfHoverOff'">
-		<td><b>{$CMOD.LBL_ENTITY}</b></td>
-		<td><b>{$CMOD.LBL_CREATE_EDIT}</b></td>
-		<td><b>{$CMOD.LBL_DELETE}</b></td>
-		<td><b>{$CMOD.LBL_VIEW}</b></td>
-		</tr>
-		
-		{foreach item=value from=$STANDARD_PRIV}
-		<tr onMouseOver="this.className='prvPrfHoverOn'" onMouseOut="this.className='prvPrfHoverOff'">
-		<td>{$APP[$value.0]}</td>
-		<td>{$value.1}</td>
-		<td>{$value.2}</td>
-		<td>{$value.3}</td>
-		</tr>
-		{/foreach}
-		
-		</table>
-		</td>
-		</tr>
-		</table>
-		</td>
-		</tr>
-		</table>
-		</td>
-		</tr>
-		</table>
-		</div>
-		
-		<div id="field_privileges" style="display:none;">
-		<table border="0" cellspacing="0" cellpadding="5" width="100%" >
-		<tr>
-		<td><table border="0" cellspacing="0" cellpadding="5" width="100%" class="small">
-		<tr>
-		<td><!-- Module name heading -->
-		<table border="0" cellspacing="0" cellpadding="2" class="small">
-		<tr>
-		<td valign="top" ><img src="{$IMAGE_PATH}prvPrfHdrArrow.gif" /> </td>
-
-		<td class="prvPrfBigText"><b> {$CMOD.LBL_FIELD_PRIVILEGES} {$CMOD.LBL_FOR} "{$PROFILE_NAME}"</b> <br />
-		<font class="small">{$CMOD.LBL_FIELD_MESG_OPTION} </font> </td>
-		</tr>
-		</table></td>
-		<td align="right" valign="bottom">
-			<input type="hidden" id="selected_tab" name="selected_tab" value="{$SELECTED_TAB}">
-			<input type="hidden" id="selected_module" name="selected_module" value="{$SELECTED_MODULE}">
-			<input type="submit" value="{$APP.LBL_EDIT_BUTTON_LABEL}" class="crmButton small edit" name="edit">
-		</td>	
-		</tr>
-		</table>
-		<!-- privilege lists -->
-		<table border="0" cellspacing="0" cellpadding="0" width="100%" >
-		<tr>
-		<td align="center" style="height:10px"><img src="{$IMAGE_PATH}prvPrfLine.gif" style="width:100%;height:1px" /></td>
-		</tr>
-
-		</table>
-		<table border="0" cellspacing="0" cellpadding="10" width="100%">
-		<tr>
-		<td >
-		<table border="0" cellspacing="0" cellpadding="5" width="100%" class="small">
-		<tr>
-		<td>
-		<select id="module_list" name="module_list" onchange="showmoduleperm(this)">
-		{foreach key=module item=label from=$PRI_FIELD_LIST}
-			<option value="{$label}">{$APP.$label}</option>
-		{/foreach}
-		</td>
-		<td width=50%>&nbsp;</td>
-		</tr>
-		<tr>
-		<td colspan=2>
-	
-		{foreach key=module item=value from=$FIELD_PRIVILEGES}
-		<div id="field_{$module}" style="display:none;">
-		<table border="0" cellspacing="0" cellpadding="5" width="100%" class="small">
-		{foreach item=row_value from=$value}
-		<tr>
-		{foreach item=element from=$row_value}
-		<td class="prvPrfTexture" style="width:5px">&nbsp;</td>
-		<td id="fldperm{$element.0}">{$element.1}</td>
-		<td onMouseOver="this.className='prvPrfHoverOn',$('fldperm{$element.0}').className='prvPrfHoverOn'" onMouseOut="this.className='prvPrfHoverOff',$('fldperm{$element.0}').className='prvPrfHoverOff' ">{$element.0}</td>
-		{/foreach}
-		</tr>
-		{/foreach}
-		</table>
-		</div>
-		{/foreach}
-		
-		</td>
-		</tr>
-		</table></td>
-		</tr>
-		</table></td>
-		</tr>
-		</table>
-		</div>
-	
-		<div id="utility_privileges" style="display:none;">
-		<table border=0 cellspacing=0 cellpadding=5 width=100% >
-		<tr>
-		<td>
-		<table border=0 cellspacing=0 cellpadding=5 width=100% class=small>
-		<tr>
-		<td>
-		<!-- Module name heading -->
-		<table border=0 cellspacing=0 cellpadding=2 class=small>
-		<tr>
-		<td valign=top >
-		<img src="{$IMAGE_PATH}prvPrfHdrArrow.gif">
-		</td>
-		<td class="prvPrfBigText">
-		<b> {$CMOD.LBL_UTILITY_PRIVILEGES} {$CMOD.LBL_FOR} "{$PROFILE_NAME}"</b> <br>
-		<font class=small>{$CMOD.LBL_UTILITY_MESG_OPTION}  </font> 
-		</td>
-		</tr>
-		</table>
-		</td>
-		<td align=right valign=bottom>
-			<input type="hidden" id="selected_tab" name="selected_tab" value="{$SELECTED_TAB}">
-		        <input type="hidden" id="selected_module" name="selected_module" value="{$SELECTED_MODULE}">
-			<input type="submit" value="{$APP.LBL_EDIT_BUTTON_LABEL}" class="crmButton small edit" name="edit"></td>
-		</tr>
-		</table>
-		<!-- privilege lists -->
-		<table border=0 cellspacing=0 cellpadding=0 width=100% >
-		<tr>
-		<td align=center style="height:10px"><img src="{$IMAGE_PATH}prvPrfLine.gif" style="width:100%;height:1px"></td>
-		</tr>
-		</table>
-		<table border=0 cellspacing=0 cellpadding=10 width=100%>
-		<tr>
-		<td >
-		<!-- Home tab -->
-		<table border="0" cellspacing="0" cellpadding="5" width="90%" class="small" align="center" >
-		
-		{foreach key=module item=value from=$UTILITIES_PRIV}
-		<tr>
-		<td colspan="4" style="border-bottom:1px solid #efefef"><b>{$APP.$module}</b></td>
-		</tr>
-		<tr>
-		<td class="prvPrfTexture" style="width:20px">&nbsp;</td>
-		<td width="97%" valign="top" onmouseover="this.className='prvPrfHoverOn'" onmouseout="this.className='prvPrfHoverOff'" >
-		<table border="0" cellspacing="0" cellpadding="5" width="100%" class="small">
-		{foreach item=element from=$value}
-		<tr>
-		<td width=25%>{$APP[$element.0.0]}</td>
-		<td width=25%>{$element.0.1}</td>
-		<td width=25%>{$APP[$element.1.0]}</td>
-		<td width=25%>{$element.1.1}</td>
-		{/foreach}
-		</tr>
-		</table>
-		</td>
-		</tr>
-		
-		{/foreach}
-		</table>
-		</td>
-		</tr>
-		</table>
-		</td>
-		</tr>
-
-		</table>
-
-		</div>
-
-	
-
-                            <table border="0" cellspacing="0" cellpadding="0" width="100%" class="small">
-                              <tr>
-                                <td><img src="{$IMAGE_PATH}prvPrfBottomLeft.gif" /></td>
-                                <td class="prvPrfBottomBg" width="100%"></td>
-                                <td><img src="{$IMAGE_PATH}prvPrfBottomRight.gif" /></td>
-                              </tr>
-                          </table>
-			
-			</td>
-                      </tr>
-                    </table>
-					<p>&nbsp;</p>
-					<table border=0 cellspacing=0 cellpadding=5 width=100% >
-					<tr><td class="small" nowrap align=right><a href="#top">{$MOD.LBL_SCROLL}</a></td></tr>
-					</table>
-				
+          </tbody>
+	  </table>
+	</td>
+        </tr>
+        </tbody>
+	</table>
+      </td>
+      </tr>
+      </tbody></table>
+      <table class="small" border="0" cellpadding="0" cellspacing="0" width="100%">
+           <tbody><tr>
+                <td><img src="{$IMAGE_PATH}prvPrfBottomLeft.gif"></td>
+                <td class="prvPrfBottomBg" width="100%"></td>
+                <td><img src="{$IMAGE_PATH}prvPrfBottomRight.gif"></td>
+                </tr>
+            </tbody>
+      </table></td>
+      </tr>
+      </tbody></table>
+	<p>&nbsp;</p>
+	<table border="0" cellpadding="5" cellspacing="0" width="100%">
+	<tbody><tr><td class="small" align="right" nowrap="nowrap"><a href="#top">{$MOD.LBL_SCROLL}</a></td></tr>
+	</tbody></table>
 					
-					
-				</td>
-				</tr>
-				</table>
-			
-			
-			
-			</td>
-			</tr>
-			</table>
-		</td>
+	</td>
+	</tr>
+	</tbody></table>
+	</form>	
+	<!-- End of Display -->
+	</td>
 	</tr>
 	</table>
-		
+	</td>
+	</tr>
+	</table>
 	</div>
 
-</td>
-        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
-   </tr>
+	</td>
+	<td valign="top"><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
+	</tr>
 </tbody>
 </table>
-
 <script language="javascript" type="text/javascript">
-var Selected_div= '{$SELECTED_TAB}';
-divarray = new Array('global_privileges','tab_privileges','standard_privileges','field_privileges','utility_privileges'); 	
-tabarray = new Array('prvPrfTab1','prvPrfTab2','prvPrfTab3','prvPrfTab4','prvPrfTab5'); 	
-var defaultmodule = '{$SELECTED_MODULE}';
-function set_default()
-{ldelim}
-	show (Selected_div);
-	show (defaultmodule);
-	for(i = 0; i < divarray.length ;i++)
-	{ldelim}
-		if(divarray[i] == Selected_div)
-			break;	
-	{rdelim}
-	document.getElementById(tabarray[i]).className="prvPrfSelectedTab";
-	module_combo = document.getElementById('module_list');
-	module_combo_selected = defaultmodule.replace(/field_/gi,'')
-	for(i = 0; i < module_combo.length;i++)
-	{ldelim}
-		if(module_combo.options[i].value == module_combo_selected)
-		{ldelim}	
-			module_combo.options[i].selected = true;	
-			break;	
-		{rdelim}	
-	{rdelim}
-{rdelim}
-set_default();
-function toggleshowhide(currentselecteddiv,currentselectedtab)
-{ldelim}
-	for(i = 0; i < divarray.length ;i++)
-	{ldelim}
-		if(Selected_div == divarray[i])
-			break;	
-	{rdelim}	
-	hide (Selected_div);
-	document.getElementById(tabarray[i]).className="prvPrfUnSelectedTab";
-	show (currentselecteddiv);
-	document.getElementById(currentselectedtab).className="prvPrfSelectedTab";
-	Selected_div = currentselecteddiv;
-	document.getElementById('selected_tab').value =	Selected_div; 	
-{rdelim}	
-function showmoduleperm(selectmodule_view)
-{ldelim}
-	hide(defaultmodule);
-	defaultmodule='field_'+selectmodule_view.options[selectmodule_view.options.selectedIndex].value;
-	show(defaultmodule);
-	document.getElementById('selected_module').value = defaultmodule;	
-{rdelim}	
-	
+{literal}
+function fnToggleVIew(obj){
+	var tagStyle = document.getElementById(obj).className;
+	if(tagStyle == 'hideTable')
+		document.getElementById(obj).className = 'showTable';
+	else
+		document.getElementById(obj).className = 'hideTable';
+}
+{/literal}
 </script>

Modified: vtigercrm/trunk/modules/Users/CreateProfile.php
==============================================================================
--- vtigercrm/trunk/modules/Users/CreateProfile.php (original)
+++ vtigercrm/trunk/modules/Users/CreateProfile.php Thu Jun 22 05:55:20 2006
@@ -14,36 +14,57 @@
 require_once('include/database/PearDatabase.php');
 require_once('include/utils/utils.php');
 
+$profilename=$_REQUEST['profile_name'];
+
+if(isset($_REQUEST['dup_check']) && $_REQUEST['dup_check']!='')
+{
+        $query = 'select profilename from vtiger_profile where profilename="'.$profilename.'"';
+        $result = $adb->query($query);
+
+        if($adb->num_rows($result) > 0)
+        {
+                echo 'A Profile in the specified name "'.$profilename.'" already exists';
+                die;
+        }else
+        {
+                echo 'SUCESS';
+                die;
+        }
+
+}
+
+
 global $theme;
 $theme_path="themes/".$theme."/";
 $image_path=$theme_path."images/";
 $smarty = new vtigerCRM_Smarty;
+
 if(isset($_REQUEST['parent_profile']) && $_REQUEST['parent_profile'] != '')
 	$smarty->assign("PARENT_PROFILE",$_REQUEST['parent_profile']);
 if(isset($_REQUEST['radio_button']) && $_REQUEST['radio_button'] != '')
 	$smarty->assign("RADIO_BUTTON",$_REQUEST['radio_button']);
 if(isset($_REQUEST['profile_name']) && $_REQUEST['profile_name'] != '')
 	$smarty->assign("PROFILE_NAME",$_REQUEST['profile_name']);
+if(isset($_REQUEST['profile_description']) && $_REQUEST['profile_description'] != '')
+	$smarty->assign("PROFILE_DESCRIPTION",$_REQUEST['profile_description']);
 if(isset($_REQUEST['mode']) && $_REQUEST['mode'] != '')
 	$smarty->assign("MODE",$_REQUEST['mode']);
-if(isset($_REQUEST['profile_name']) && $_REQUEST['profile_name'] != '')
-	$smarty->assign("PROFILENAME",$_REQUEST['profile_name']);
-if(isset($_REQUEST['profile_description']) && $_REQUEST['profile_description'] != '')	
-	$smarty->assign("PROFILEDESC",$_REQUEST['profile_description']);
-if(isset($_REQUEST['profileid']) && $_REQUEST['profileid'] != '')
-{
-	global $adb;	
-	$sql = "select * from vtiger_profile where profileid=".$_REQUEST['profileid'];
-	$profileResult = $adb->query($sql);
-	$profile_name = $adb->query_result($profileResult,0,"profilename");
-	$profile_description = $adb->query_result($profileResult,0,"description");
-	$smarty->assign("PROFILE_NAME",$profile_name);
-	$smarty->assign("PROFILE_DESCRIPTION",$profile_description);
-}
 
 $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);
+
+$sql = "select * from vtiger_profile";
+$result = $adb->query($sql);
+$profilelist = array();
+$temprow = $adb->fetch_array($result);
+do
+{
+	$name=$temprow["profilename"];
+	$profileid=$temprow["profileid"];
+	$profilelist[] = array($name,$profileid); 
+}while($temprow = $adb->fetch_array($result));
+$smarty->assign("PROFILE_LISTS", $profilelist);
                     
 $smarty->display("CreateProfile.tpl");

Modified: vtigercrm/trunk/modules/Users/profilePrivileges.php
==============================================================================
--- vtigercrm/trunk/modules/Users/profilePrivileges.php (original)
+++ vtigercrm/trunk/modules/Users/profilePrivileges.php Thu Jun 22 05:55:20 2006
@@ -143,7 +143,7 @@
 		$stand[]=$tab_create_per;
 		$stand[]=$tab_delete_per;
 		$stand[]=$tab_view_per;
-		$privileges_stand[]=$stand;
+		$privileges_stand[$tabid]=$stand;
 	}
 }
 if($mode == 'edit')
@@ -167,7 +167,7 @@
 		$stand[]=$tab_create_per;
 		$stand[]=$tab_delete_per;
 		$stand[]=$tab_view_per;
-		$privileges_stand[]=$stand;
+		$privileges_stand[$tabid]=$stand;
 	}
 }
 if($mode == 'create')
@@ -193,7 +193,7 @@
 			$stand[]=$tab_create_per;
 			$stand[]=$tab_delete_per;
 			$stand[]=$tab_view_per;
-			$privileges_stand[]=$stand;
+			$privileges_stand[$tabid]=$stand;
 		}	
 	}
 	else
@@ -217,7 +217,7 @@
 			$stand[]=$tab_create_per;
 			$stand[]=$tab_delete_per;
 			$stand[]=$tab_view_per;
-			$privileges_stand[]=$stand;
+			$privileges_stand[$tabid]=$stand;
 		}
 	}
 
@@ -238,7 +238,7 @@
 		$tab_allow_per = getDisplayValue($tab_allow_per_id,$tabid,'');	
 		$tab[]=$entity_name;
 		$tab[]=$tab_allow_per;
-		$privileges_tab[]=$tab;
+		$privileges_tab[$tabid]=$tab;
 	}
 }
 if($mode == 'edit')
@@ -253,7 +253,7 @@
 		$tab_allow_per = getDisplayOutput($tab_allow_per_id,$tabid,'');	
 		$tab[]=$entity_name;
 		$tab[]=$tab_allow_per;
-		$privileges_tab[]=$tab;
+		$privileges_tab[$tabid]=$tab;
 	}
 }
 if($mode == 'create')
@@ -270,7 +270,7 @@
 			$tab_allow_per = getDisplayOutput($tab_allow_per_id,$tabid,'');	
 			$tab[]=$entity_name;
 			$tab[]=$tab_allow_per;
-			$privileges_tab[]=$tab;
+			$privileges_tab[$tabid]=$tab;
 		}
 	}
 	else
@@ -285,12 +285,11 @@
 			$tab_allow_per = getDisplayOutput(0,$tabid,'');	
 			$tab[]=$entity_name;
 			$tab[]=$tab_allow_per;
-			$privileges_tab[]=$tab;
-		}
-	}
-
-}
-$privileges_tab = array_chunk($privileges_tab, 4);
+			$privileges_tab[$tabid]=$tab;
+		}
+	}
+
+}
 $smarty->assign("TAB_PRIV",$privileges_tab);			
 
 //utilities privileges
@@ -312,8 +311,8 @@
 			$util[]=$tab_util_per;
 		}
 		$util=array_chunk($util,2);
-		$util=array_chunk($util,2);
-		$privilege_util[$entity_name] = $util;
+		$util=array_chunk($util,3);
+		$privilege_util[$tabid] = $util;
 	}
 }
 elseif($mode == 'edit')
@@ -333,8 +332,8 @@
 			$util[]=$tab_util_per;
 		}
 		$util=array_chunk($util,2);
-		$util=array_chunk($util,2);
-		$privilege_util[$entity_name] = $util;
+		$util=array_chunk($util,3);
+		$privilege_util[$tabid] = $util;
 	}
 }
 elseif($mode == 'create')
@@ -356,8 +355,8 @@
 				$util[]=$tab_util_per;
 			}
 			$util=array_chunk($util,2);
-			$util=array_chunk($util,2);
-			$privilege_util[$entity_name] = $util;
+			$util=array_chunk($util,3);
+			$privilege_util[$tabid] = $util;
 		}
 	}
 	else
@@ -377,8 +376,8 @@
 				$util[]=$tab_util_per;
 			}
 			$util=array_chunk($util,2);
-			$util=array_chunk($util,2);
-			$privilege_util[$entity_name] = $util;
+			$util=array_chunk($util,3);
+			$privilege_util[$tabid] = $util;
 		}
 
 	}
@@ -407,6 +406,7 @@
 	{
 		$field_module=array();
 		$module_name=key($fieldListResult);
+		$module_id = getTabid($module_name);
 		for($j=0; $j<count($fieldListResult[$module_name]); $j++)
 		{
 			$field=array();
@@ -422,7 +422,7 @@
 			$field[]=$visible;
 			$field_module[]=$field;
 		}
-		$privilege_field[$module_name] = array_chunk($field_module,4);
+		$privilege_field[$module_id] = array_chunk($field_module,3);
 		next($fieldListResult);
 	}
 }
@@ -433,6 +433,7 @@
 	{
 		$field_module=array();
 		$module_name=key($fieldListResult);
+		$module_id = getTabid($module_name);
 		for($j=0; $j<count($fieldListResult[$module_name]); $j++)
 		{
 			$fldLabel= $fieldListResult[$module_name][$j][0];
@@ -455,10 +456,10 @@
 				$visible = "";
 			}
 			$field[]=$mandatory.' '.$fldLabel;
-			$field[]='<input type="checkbox" name="'.$fieldListResult[$module_name][$j][4].'" '.$visible.' '.$readonly.'>';
+			$field[]='<input id="'.$module_id.'_field_'.$fieldListResult[$module_name][$j][4].'" onClick="selectUnselect(this);" type="checkbox" name="'.$fieldListResult[$module_name][$j][4].'" '.$visible.' '.$readonly.'>';
 			$field_module[]=$field;
 		}
-		$privilege_field[$module_name] = array_chunk($field_module,4);
+		$privilege_field[$module_id] = array_chunk($field_module,3);
 		next($fieldListResult);
 	}
 }
@@ -471,6 +472,7 @@
 		{
 			$field_module=array();
 			$module_name=key($fieldListResult);
+			$module_id = getTabid($module_name);
 			for($j=0; $j<count($fieldListResult[$module_name]); $j++)
 			{
 				$fldLabel= $fieldListResult[$module_name][$j][0];
@@ -493,10 +495,10 @@
 					$visible = "";
 				}
 				$field[]=$mandatory.' '.$fldLabel;
-				$field[]='<input type="checkbox" name="'.$fieldListResult[$module_name][$j][4].'" '.$visible.' '.$readonly.'>';
+				$field[]='<input type="checkbox" id="'.$module_id.'_field_'.$fieldListResult[$module_name][$j][4].'" onClick="selectUnselect(this);" name="'.$fieldListResult[$module_name][$j][4].'" '.$visible.' '.$readonly.'>';
 				$field_module[]=$field;
 			}
-			$privilege_field[$module_name] = array_chunk($field_module,4);
+			$privilege_field[$module_id] = array_chunk($field_module,3);
 			next($fieldListResult);
 		}
 	}
@@ -507,6 +509,7 @@
 		{
 			$field_module=array();
 			$module_name=key($fieldListResult);
+			$module_id = getTabid($module_name);
 			for($j=0; $j<count($fieldListResult[$module_name]); $j++)
 			{
 				$fldLabel= $fieldListResult[$module_name][$j][0];
@@ -522,10 +525,10 @@
 				}	
 				$visible = "checked";
 				$field[]=$mandatory.' '.$fldLabel;
-				$field[]='<input type="checkbox" name="'.$fieldListResult[$module_name][$j][4].'" '.$visible.' '.$readonly.'>';
+				$field[]='<input type="checkbox" id="'.$module_id.'_field_'.$fieldListResult[$module_name][$j][4].'"  onClick="selectUnselect(this);" name="'.$fieldListResult[$module_name][$j][4].'" '.$visible.' '.$readonly.'>';
 				$field_module[]=$field;
 			}
-			$privilege_field[$module_name] = array_chunk($field_module,4);
+			$privilege_field[$module_id] = array_chunk($field_module,3);
 			next($fieldListResult);
 		}	
 	}
@@ -581,11 +584,11 @@
 	}
 	elseif($id == 0)
 	{
-		$value = '<input type="checkbox" name="'.$name.'" checked>';
+		$value = '<input type="checkbox" id="'.$name.'_chk" onClick="invoke'.$name.'();" name="'.$name.'" checked>';
 	}
 	elseif($id == 1)
 	{
-		$value = '<input type="checkbox" name="'.$name.'">';
+		$value = '<input type="checkbox" id="'.$name.'_chk" onClick="invoke'.$name.'();" name="'.$name.'">';
 	}
 	return $value;
 
@@ -620,11 +623,25 @@
 	if($actionid == '')
 	{
 		$name = $tabid.'_tab';
+		$ckbox_id = 'tab_chk_com_'.$tabid; 
+		$jsfn = 'hideTab('.$tabid.')';
 	}
 	else
 	{
 		$temp_name = getActionname($actionid);
 		$name = $tabid.'_'.$temp_name;
+		$ckbox_id = 'tab_chk_'.$actionid.'_'.$tabid; 
+		if($actionid == 1)	
+			$jsfn = 'unSelectCreate('.$tabid.')'; 
+		elseif($actionid == 4)	
+			$jsfn = 'unSelectView('.$tabid.')';
+		elseif($actionid == 2)	
+			$jsfn = 'unSelectDelete('.$tabid.')';
+		else
+		{
+			$ckbox_id = $tabid.'_field_util_'.$actionid; 
+			$jsfn = 'javascript:';
+		}	
 	}
 
 
@@ -635,11 +652,11 @@
 	}
 	elseif($id == 0)
 	{
-		$value = '<input type="checkbox" name="'.$name.'" checked>';
+		$value = '<input type="checkbox" onClick="'.$jsfn.';" id="'.$ckbox_id.'" name="'.$name.'" checked>';
 	}
 	elseif($id == 1)
 	{
-		$value = '<input type="checkbox" name="'.$name.'">';
+		$value = '<input type="checkbox" onClick="'.$jsfn.';" id="'.$ckbox_id.'" name="'.$name.'">';
 	}
 	return $value;
 




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 22 08:15:51 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 22 Jun 2006 12:15:51 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7428 -
 /vtigercrm/trunk/modules/Users/language/en_us.lang.php
Message-ID: <20060622121552.AC35683F3A2@vtiger.fosslabs.com>

Author: richie
Date: Thu Jun 22 06:15:32 2006
New Revision: 7428

Log:
New UI Integrated for Profiles

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

Modified: vtigercrm/trunk/modules/Users/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Users/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Users/language/en_us.lang.php Thu Jun 22 06:15:32 2006
@@ -271,9 +271,8 @@
 'LBL_NEW_PROFILE_NAME'=>'Profile Name',
 'LBL_PARENT_PROFILE'=>'Parent Profile',
 'LBL_BASIC_PROFILE_DETAILS'=>'Basic details of Profile',
-'LBL_STEP_1_3'=>'Step 1 of 3',
-'LBL_STEP_2_3'=>'Step 2 of 3',
-'LBL_STEP_3_3'=>'Step 3 of 3',
+'LBL_STEP_1_2'=>'Step 1 of 2',
+'LBL_STEP_2_2'=>'Step 2 of 2',
 'LBL_STEP'=>'Step',
 'LBL_SELECT_BASE_PROFILE'=>'Select Base Profile',
 'LBL_PROFILE_PRIVILEGES'=>'Profile Privileges',
@@ -295,14 +294,22 @@
 'LBL_MESG_VIEW'=>'to view all information / modules of vtiger CRM',
 'LBL_MESG_EDIT'=>'to edit all information / modules of vtiger CRM',
 'LBL_STD_MESG_OPTION'=>'Select the standard actions to be permitted',
-'LBL_TAB_MESG_OPTION'=>'Select the tabs / modules to be shown',
+'LBL_TAB_MESG_OPTION'=>'modules to be shown',
 'LBL_UTILITY_MESG_OPTION'=>'Select the utility actions to be permitted',
 'LBL_FIELD_MESG_OPTION'=>'Select the fields to be permitted',
 'LBL_FINISH_BUTTON'=>'Finish',
 'LBL_PROFILE_DETAIL_VIEW'=>'Detail View of Profile',
 'LBL_PROFILE_MESG'=>'Viewing access privileges for',
 'LBL_PROFILE_M'=>'Profile',
-
+'LBL_DEFINE_PRIV_FOR'=>' Define Privileges for ',
+'LBL_USE_OPTION_TO_SET_PRIV'=>'Use the options below to set privileges',
+'LBL_SUPER_USER_PRIV'=>'Super User Privileges',
+'LBL_SET_PRIV_FOR_EACH_MODULE'=>'Set Privileges for each Module ',
+'LBL_FIELDS_AND_TOOLS_SETTINGS'=>'Fields & Tools Settings',
+'LBL_SHOW_FIELDS'=>'Show Fields',
+'LBL_TOOLS_TO_BE_SHOWN'=>'Tools to be shown',
+'LBL_WELCOME_PROFILE_CREATE'=>'Welcome to Privilege Profile Creator ',
+'LBL_SELECT_CHOICE_NEW_PROFILE'=>'Select your choice of creating the new profile',
 
 //Added fields in createrole.php
 'LBL_HDR_ROLE_NAME'=>'Create New Role:',
@@ -509,7 +516,7 @@
 'LBL_CREATE_RULE_MESG'=>'to create a new Rule',
 'LBL_SELECT_SCREEN'=>'Select the Screen / Module :',
 'LBL_FIELDS_AVLBL'=>'Fields Available in',
-'LBL_FIELDS_SELECT_DESELECT'=>'Select or De-Select fields to be shown',
+'LBL_FIELDS_SELECT_DESELECT'=>'Fields to be shown',
 'LBL_ROLE_TO_BE_DELETED'=>'Role to be Deleted',
 'LBL_TRANSFER_USER_ROLE'=>'Transfer Users to Role',
 'LBL_DELETE_ROLE'=>'Delete Role',




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 22 09:16:03 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 22 Jun 2006 13:16:03 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7429 -
	/vtigercrm/trunk/themes/blue/images/showDown.gif
Message-ID: <20060622131604.586DF83F4F7@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 22 07:15:58 2006
New Revision: 7429

Log:
image for profile has been added

Added:
    vtigercrm/trunk/themes/blue/images/showDown.gif   (with props)




From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 22 09:21:50 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 22 Jun 2006 13:21:50 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231357=3A?=
 =?utf-8?q?_Activity_History_missing_in_Products_and_HelpDesk_Related_List?=
Message-ID: <076.c812704daaa1c7137cf696dc99c6d8cd@vtiger.fosslabs.com>

#1357: Activity History missing in Products and HelpDesk Related List
-----------------------+----------------------------------------------------
 Reporter:  ahmed      |       Owner:  philip
     Type:  defect     |      Status:  new   
 Priority:  critical   |   Milestone:        
Component:  vtigercrm  |     Version:  5.0.0 
 Keywords:             |  
-----------------------+----------------------------------------------------


-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1357>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 22 09:41:55 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 22 Jun 2006 13:41:55 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7430 -
	/vtigercrm/trunk/Smarty/templates/DisplayFields.tpl
Message-ID: <20060622134155.7B69883F513@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 22 07:41:51 2006
New Revision: 7430

Log:
rolename made readonly

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

Modified: vtigercrm/trunk/Smarty/templates/DisplayFields.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DisplayFields.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DisplayFields.tpl Thu Jun 22 07:41:51 2006
@@ -491,7 +491,7 @@
 			</td>
 			<td width="30%" align=left class="dvtCellInfo">
 			{if $thirdvalue eq 1}
-				<input name="role_name" id="role_name" class="txtBox" tabindex="{$vt_tab}" value="{$secondvalue}" type="text">&nbsp;
+				<input name="role_name" id="role_name" readonly class="txtBox" tabindex="{$vt_tab}" value="{$secondvalue}" type="text">&nbsp;
 				<a href="javascript:openPopup();"><img src="{$IMAGE_PATH}select.gif" align="absmiddle" border="0"></a>
 			{else}	
 				<input name="role_name" id="role_name" tabindex="{$vt_tab}" class="txtBox" readonly value="{$secondvalue}" type="text">&nbsp;




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 22 09:55:51 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 22 Jun 2006 13:55:51 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7431 - in /vtigercrm/trunk:
 Smarty/templates/UserDetailView.tpl include/utils/CommonUtils.php
Message-ID: <20060622135551.159AD83F523@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 22 07:55:45 2006
New Revision: 7431

Log:
Issue in non admin user detailview has been fixed

Modified:
    vtigercrm/trunk/Smarty/templates/UserDetailView.tpl
    vtigercrm/trunk/include/utils/CommonUtils.php

Modified: vtigercrm/trunk/Smarty/templates/UserDetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/UserDetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/UserDetailView.tpl Thu Jun 22 07:55:45 2006
@@ -38,7 +38,6 @@
 {if $CATEGORY eq 'Settings'}
 			<input type="hidden" name="modechk" value="prefview">
 {/if}
-			<input type="hidden" name="user_name" value="{$USER_NAME}">
 			<input type="hidden" name="old_password">
 			<input type="hidden" name="new_password">
 			<input type="hidden" name="return_module">

Modified: vtigercrm/trunk/include/utils/CommonUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/CommonUtils.php (original)
+++ vtigercrm/trunk/include/utils/CommonUtils.php Thu Jun 22 07:55:45 2006
@@ -950,7 +950,7 @@
 	require('user_privileges/user_privileges_'.$current_user->id.'.php');
 	if($disp_view == "detail_view")
 	{
-		if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0)
+		if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0 || $module == "Users")
 		{
 			$sql = "select vtiger_field.* from vtiger_field where vtiger_field.tabid=".$tabid." and vtiger_field.block in $blockid_list and vtiger_field.displaytype in (1,2) order by block,sequence";
 		}
@@ -966,7 +966,7 @@
 	{
 		if ($info_type != '')
 		{
-			if($is_admin==true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2]== 0)
+			if($is_admin==true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2]== 0 || $module == 'Users')
 			{
 				$sql = "select vtiger_field.* from vtiger_field where vtiger_field.tabid=".$tabid." and vtiger_field.block in ".$blockid_list ." and ".$display_type_check." and info_type = '".$info_type."' order by block,sequence";
 			}
@@ -978,7 +978,7 @@
 		}
 		else
 		{
-			if($is_admin==true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0)
+			if($is_admin==true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0 || $module == 'Users')
 			{
 				$sql = "select vtiger_field.* from vtiger_field where vtiger_field.tabid=".$tabid." and vtiger_field.block in ".$blockid_list." and ".$display_type_check." order by block,sequence";
 			}




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 22 10:22:12 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 22 Jun 2006 14:22:12 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7432 -
 /vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php
Message-ID: <20060622142213.3129A83F4F7@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 22 08:22:08 2006
New Revision: 7432

Log:
* Fixed the vtiger prefix issue for tables

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 Thu Jun 22 08:22:08 2006
@@ -36,8 +36,8 @@
 /****************** 5.0(Alpha) dev version 1 Database changes -- Starts*********************/
 
 
-//Added the vtiger_announcement vtiger_table creation to avoid the error
-$ann_query = "CREATE TABLE `announcement` (
+//Added the vtiger_announcement table creation to avoid the error
+$ann_query = "CREATE TABLE vtiger_announcement (
 	  `creatorid` int(19) NOT NULL,
 	    `announcement` text,
 	      `title` varchar(255) default NULL,
@@ -47,34 +47,34 @@
 	    ) ENGINE=InnoDB DEFAULT CHARSET=latin1";
 Execute($ann_query);
 
-//Added Primay Keys for the left out vtiger_tables
+//Added Primay Keys for the left out tables
 $alter_array1 = Array(
-		"alter vtiger_table vtiger_activity_reminder ADD PRIMARY KEY (activity_id,recurringid)",
-		"alter vtiger_table vtiger_activitygrouprelation ADD PRIMARY KEY (activityid)",
-		"alter vtiger_table vtiger_cvadvfilter ADD PRIMARY KEY (cvid,columnindex)",
-		"alter vtiger_table vtiger_cvcolumnlist ADD PRIMARY KEY (cvid,columnindex)",
-		"alter vtiger_table vtiger_cvstdfilter ADD PRIMARY KEY (cvid)",
-		"alter vtiger_table vtiger_def_org_field ADD PRIMARY KEY (fieldid)",
-		"alter vtiger_table vtiger_leadgrouprelation ADD PRIMARY KEY (leadid)",
-		"alter vtiger_table vtiger_leadgrouprelation drop key vtiger_leadgrouprelation_IDX0",
-		"alter vtiger_table vtiger_organizationdetails ADD PRIMARY KEY (organizationame)",
-		"alter vtiger_table vtiger_profile2field ADD PRIMARY KEY (profileid,fieldid)",
-		"alter vtiger_table vtiger_profile2standardpermissions ADD PRIMARY KEY (profileid,tabid,Operation)",
-		"alter vtiger_table vtiger_profile2standardpermissions drop index idx_prof2stad",
-		"alter vtiger_table vtiger_profile2utility ADD PRIMARY KEY (profileid,tabid,activityid)",
-		"alter vtiger_table vtiger_profile2utility drop index idx_prof2utility",
-		"alter vtiger_table vtiger_relcriteria ADD PRIMARY KEY (queryid,columnindex)",
-		"alter vtiger_table vtiger_reportdatefilter ADD PRIMARY KEY (datefilterid)",
-		"alter vtiger_table vtiger_reportdatefilter DROP INDEX vtiger_reportdatefilter_IDX0",
-		"alter vtiger_table vtiger_reportsortcol ADD PRIMARY KEY (sortcolid,reportid)",
-		"alter vtiger_table vtiger_reportsummary ADD PRIMARY KEY (reportsummaryid,summarytype,columnname)",
-		"drop vtiger_table vtiger_role2action",
-		"drop vtiger_table vtiger_role2tab",
-		"alter vtiger_table vtiger_selectcolumn ADD PRIMARY KEY (queryid,columnindex)",
-		"alter vtiger_table vtiger_ticketgrouprelation ADD PRIMARY KEY (ticketid)",
-		"alter vtiger_table vtiger_ticketstracktime ADD PRIMARY KEY (ticket_id)",
-		"alter vtiger_table vtiger_users2group ADD PRIMARY KEY (groupname,userid)",
-		"alter vtiger_table vtiger_users2group DROP INDEX idx_users2group",
+		"alter table vtiger_activity_reminder ADD PRIMARY KEY (activity_id,recurringid)",
+		"alter table vtiger_activitygrouprelation ADD PRIMARY KEY (activityid)",
+		"alter table vtiger_cvadvfilter ADD PRIMARY KEY (cvid,columnindex)",
+		"alter table vtiger_cvcolumnlist ADD PRIMARY KEY (cvid,columnindex)",
+		"alter table vtiger_cvstdfilter ADD PRIMARY KEY (cvid)",
+		"alter table vtiger_def_org_field ADD PRIMARY KEY (fieldid)",
+		"alter table vtiger_leadgrouprelation ADD PRIMARY KEY (leadid)",
+		"alter table vtiger_leadgrouprelation drop key vtiger_leadgrouprelation_IDX0",
+		"alter table vtiger_organizationdetails ADD PRIMARY KEY (organizationame)",
+		"alter table vtiger_profile2field ADD PRIMARY KEY (profileid,fieldid)",
+		"alter table vtiger_profile2standardpermissions ADD PRIMARY KEY (profileid,tabid,Operation)",
+		"alter table vtiger_profile2standardpermissions drop index idx_prof2stad",
+		"alter table vtiger_profile2utility ADD PRIMARY KEY (profileid,tabid,activityid)",
+		"alter table vtiger_profile2utility drop index idx_prof2utility",
+		"alter table vtiger_relcriteria ADD PRIMARY KEY (queryid,columnindex)",
+		"alter table vtiger_reportdatefilter ADD PRIMARY KEY (datefilterid)",
+		"alter table vtiger_reportdatefilter DROP INDEX vtiger_reportdatefilter_IDX0",
+		"alter table vtiger_reportsortcol ADD PRIMARY KEY (sortcolid,reportid)",
+		"alter table vtiger_reportsummary ADD PRIMARY KEY (reportsummaryid,summarytype,columnname)",
+		"drop table vtiger_role2action",
+		"drop table vtiger_role2tab",
+		"alter table vtiger_selectcolumn ADD PRIMARY KEY (queryid,columnindex)",
+		"alter table vtiger_ticketgrouprelation ADD PRIMARY KEY (ticketid)",
+		"alter table vtiger_ticketstracktime ADD PRIMARY KEY (ticket_id)",
+		"alter table vtiger_users2group ADD PRIMARY KEY (groupname,userid)",
+		"alter table vtiger_users2group DROP INDEX idx_users2group",
 		);
 foreach($alter_array1 as $query)
 {
@@ -83,11 +83,11 @@
 
 //Tables vtiger_profile2globalpermissions, vtiger_actionmapping creation
 
-$create_sql1 ="CREATE TABLE `profile2globalpermissions` (`profileid` int(19) NOT NULL, `globalactionid` int(19) NOT NULL, `globalactionpermission` int(19) default NULL, PRIMARY KEY  (`profileid`,`globalactionid`),  KEY `idx_profile2globalpermissions` (`profileid`,`globalactionid`)) ENGINE=InnoDB DEFAULT CHARSET=latin1";
+$create_sql1 ="CREATE TABLE vtiger_profile2globalpermissions (`profileid` int(19) NOT NULL, `globalactionid` int(19) NOT NULL, `globalactionpermission` int(19) default NULL, PRIMARY KEY  (`profileid`,`globalactionid`),  KEY `idx_profile2globalpermissions` (`profileid`,`globalactionid`)) ENGINE=InnoDB DEFAULT CHARSET=latin1";
 
 Execute($create_sql1);
 
-$create_sql2 = "CREATE TABLE `actionmapping` (
+$create_sql2 = "CREATE TABLE vtiger_actionmapping (
 	`actionid` int(19) NOT NULL default '0',
 	`actionname` varchar(200) NOT NULL default '',
 	`securitycheck` int(19) default NULL,
@@ -95,7 +95,7 @@
 	) TYPE=InnoDB";
 Execute($create_sql2);
 
-//For all Profiles, insert the following entries into vtiger_profile2global permissions vtiger_table:
+//For all Profiles, insert the following entries into vtiger_profile2global permissions table:
 $sql = 'select * from vtiger_profile';
 $res = $conn->query($sql);
 $noofprofiles = $conn->num_rows($res);
@@ -112,11 +112,11 @@
 }
 
 
-//Removing entries for Dashboard and Home module from vtiger_profile2standardpermissions vtiger_table
+//Removing entries for Dashboard and Home module from vtiger_profile2standardpermissions table
 $del_query1 = "delete from vtiger_profile2standardpermissions where vtiger_tabid in(1,3)";
 Execute($del_query1);
 
-//For all Profile do the following insert into vtiger_profile2utility vtiger_table:
+//For all Profile do the following insert into vtiger_profile2utility table:
 $sql = 'select * from vtiger_profile';
 $res = $conn->query($sql);
 $noofprofiles = $conn->num_rows($res);
@@ -134,7 +134,7 @@
 }
 */
 
-//Insert Values into action mapping vtiger_table:
+//Insert Values into action mapping table:
 $actionmapping_array = Array(
 		"insert into vtiger_actionmapping values(0,'Save',0)",
 		"insert into vtiger_actionmapping values(1,'EditView',0)",
@@ -167,7 +167,7 @@
 }
 
 
-//Added two columns in vtiger_field vtiger_table to construct the quickcreate form dynamically
+//Added two columns in vtiger_field table to construct the quickcreate form dynamically
 $alter_array2 = Array(
 		"ALTER TABLE vtiger_field ADD column quickcreate int(10) after typeofdata",
 		"ALTER TABLE vtiger_field ADD column quickcreatesequence int(19) after quickcreate",
@@ -180,48 +180,48 @@
 $update_array1 = Array(
 		"UPDATE vtiger_field SET quickcreate = 1,quickcreatesequence = 0",
 
-		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 1 WHERE vtiger_tabid = 2 and vtiger_fieldlabel = 'Potential Name'",
-		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 2 WHERE vtiger_tabid = 2 and vtiger_fieldlabel = 'Account Name'",
-		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 3 WHERE vtiger_tabid = 2 and vtiger_fieldlabel = 'Expected Close Date'",
-		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 4 WHERE vtiger_tabid = 2 and vtiger_fieldlabel = 'Sales Stage'",
-		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 5 WHERE vtiger_tabid = 2 and vtiger_fieldlabel = 'Amount'",
-
-		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 1 WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'First Name'",
-		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 2 WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'Last Name'",
-		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 3 WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'Account Name'",
-		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 4 WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'Office Phone'",
-		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 5 WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'Email'",
-
-		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 1 WHERE vtiger_tabid = 6 and vtiger_fieldlabel = 'Account Name'",
-		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 2 WHERE vtiger_tabid = 6 and vtiger_fieldlabel = 'Phone'",
-		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 3 WHERE vtiger_tabid = 6 and vtiger_fieldlabel = 'Website'",
-
-		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 1 WHERE vtiger_tabid = 7 and vtiger_fieldlabel = 'First Name'",
-		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 2 WHERE vtiger_tabid = 7 and vtiger_fieldlabel = 'Last Name'",
-		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 3 WHERE vtiger_tabid = 7 and vtiger_fieldlabel = 'Company'",
-		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 4 WHERE vtiger_tabid = 7 and vtiger_fieldlabel = 'Phone'",
-		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 5 WHERE vtiger_tabid = 7 and vtiger_fieldlabel = 'Email'",
-
-		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 1 WHERE vtiger_tabid = 8 and vtiger_fieldlabel = 'Subject'",
-
-		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 1 WHERE vtiger_tabid = 9 and vtiger_fieldlabel = 'Subject'",
-		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 2 WHERE vtiger_tabid = 9 and vtiger_fieldlabel = 'Start Date & Time'",
-
-		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 1 WHERE vtiger_tabid = 10 and vtiger_fieldlabel = 'Subject'",
-		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 2 WHERE vtiger_tabid = 10 and vtiger_fieldlabel = 'Date & Time Sent'",
-
-		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 1 WHERE vtiger_tabid = 13 and vtiger_fieldlabel = 'Title'",
-		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 2 WHERE vtiger_tabid = 13 and vtiger_fieldlabel = 'Description'",
-		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 3 WHERE vtiger_tabid = 13 and vtiger_fieldlabel = 'Priority'",
-
-		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 1 WHERE vtiger_tabid = 14 and vtiger_fieldlabel = 'Product Name'",
-		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 2 WHERE vtiger_tabid = 14 and vtiger_fieldlabel = 'Product Code'",
-		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 3 WHERE vtiger_tabid = 14 and vtiger_fieldlabel = 'Product Category'",
-
-		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 1 WHERE vtiger_tabid = 16 and vtiger_fieldlabel = 'Subject'",
-		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 2 WHERE vtiger_tabid = 16 and vtiger_fieldlabel = 'Start Date & Time'",
-		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 3 WHERE vtiger_tabid = 16 and vtiger_fieldlabel = 'Activity Type'",
-		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 4 WHERE vtiger_tabid = 16 and vtiger_fieldlabel = 'Duration'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 1 WHERE tabid = 2 and fieldlabel = 'Potential Name'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 2 WHERE tabid = 2 and fieldlabel = 'Account Name'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 3 WHERE tabid = 2 and fieldlabel = 'Expected Close Date'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 4 WHERE tabid = 2 and fieldlabel = 'Sales Stage'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 5 WHERE tabid = 2 and fieldlabel = 'Amount'",
+
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 1 WHERE tabid = 4 and fieldlabel = 'First Name'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 2 WHERE tabid = 4 and fieldlabel = 'Last Name'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 3 WHERE tabid = 4 and fieldlabel = 'Account Name'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 4 WHERE tabid = 4 and fieldlabel = 'Office Phone'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 5 WHERE tabid = 4 and fieldlabel = 'Email'",
+
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 1 WHERE tabid = 6 and fieldlabel = 'Account Name'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 2 WHERE tabid = 6 and fieldlabel = 'Phone'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 3 WHERE tabid = 6 and fieldlabel = 'Website'",
+
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 1 WHERE tabid = 7 and fieldlabel = 'First Name'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 2 WHERE tabid = 7 and fieldlabel = 'Last Name'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 3 WHERE tabid = 7 and fieldlabel = 'Company'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 4 WHERE tabid = 7 and fieldlabel = 'Phone'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 5 WHERE tabid = 7 and fieldlabel = 'Email'",
+
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 1 WHERE tabid = 8 and fieldlabel = 'Subject'",
+
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 1 WHERE tabid = 9 and fieldlabel = 'Subject'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 2 WHERE tabid = 9 and fieldlabel = 'Start Date & Time'",
+
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 1 WHERE tabid = 10 and fieldlabel = 'Subject'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 2 WHERE tabid = 10 and fieldlabel = 'Date & Time Sent'",
+
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 1 WHERE tabid = 13 and fieldlabel = 'Title'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 2 WHERE tabid = 13 and fieldlabel = 'Description'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 3 WHERE tabid = 13 and fieldlabel = 'Priority'",
+
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 1 WHERE tabid = 14 and fieldlabel = 'Product Name'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 2 WHERE tabid = 14 and fieldlabel = 'Product Code'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 3 WHERE tabid = 14 and fieldlabel = 'Product Category'",
+
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 1 WHERE tabid = 16 and fieldlabel = 'Subject'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 2 WHERE tabid = 16 and fieldlabel = 'Start Date & Time'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 3 WHERE tabid = 16 and fieldlabel = 'Activity Type'",
+		"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 4 WHERE tabid = 16 and fieldlabel = 'Duration'",
 		);
 foreach($update_array1 as $query)
 {
@@ -239,7 +239,7 @@
 
 //Added on 23-12-2005 which is missed from Fredy's contribution for Color vtiger_priority
 populateFieldForSecurity('16',$newfieldid);
-$activity_alter_query = "alter vtiger_table vtiger_activity add column vtiger_priority varchar(150) default NULL";
+$activity_alter_query = "alter table vtiger_activity add column priority varchar(150) default NULL";
 Execute($activity_alter_query);
 
 //Code contributed by Raju for better emailing 
@@ -253,12 +253,12 @@
 */
 //commented the above array as that queries are wrong queries -- changed on 23-12-2005
 $insert_array1 = array(
-			"update vtiger_field set uitype='357' where vtiger_tabid=10 and vtiger_fieldname='parent_id' and vtiger_tablename='seactivityrel'",
-			"update vtiger_field set sequence=1 where vtiger_tabid=10 and vtiger_fieldname in ('parent_id','subject','filename','description')",
-			"update vtiger_field set block=2 where vtiger_tabid=10 and vtiger_fieldname='parent_id'",
-			"update vtiger_field set block=3 where vtiger_tabid=10 and vtiger_fieldname='subject'",
-			"update vtiger_field set block=4 where vtiger_tabid=10 and vtiger_fieldname='filename'",
-			"update vtiger_field set block=5 where vtiger_tabid=10 and vtiger_fieldname='description'",
+			"update vtiger_field set uitype='357' where tabid=10 and fieldname='parent_id' and tablename='seactivityrel'",
+			"update vtiger_field set sequence=1 where tabid=10 and fieldname in ('parent_id','subject','filename','description')",
+			"update vtiger_field set block=2 where tabid=10 and fieldname='parent_id'",
+			"update vtiger_field set block=3 where tabid=10 and fieldname='subject'",
+			"update vtiger_field set block=4 where tabid=10 and fieldname='filename'",
+			"update vtiger_field set block=5 where tabid=10 and fieldname='description'",
 		      );
 foreach($insert_array1 as $query)
 {
@@ -266,40 +266,40 @@
 }
 
 //code contributed by mike to rearrange the home page
-$alter_query2 = "alter vtiger_table vtiger_users add column homeorder varchar(255) default 'ALVT,PLVT,QLTQ,CVLVT,HLT,OLV,GRT,OLTSO,ILTI' after date_format";
+$alter_query2 = "alter table vtiger_users add column homeorder varchar(255) default 'ALVT,PLVT,QLTQ,CVLVT,HLT,OLV,GRT,OLTSO,ILTI' after date_format";
 Execute($alter_query2);
 
-//Added one column in vtiger_invoice vtiger_table to include 'Contact Name' vtiger_field in Invoice module
+//Added one column in vtiger_invoice table to include 'Contact Name' vtiger_field in Invoice module
 $alter_query3 = "ALTER TABLE vtiger_invoice ADD column contactid int(19) after customerno";
 Execute($alter_query3);
 
 $newfieldid = $conn->getUniqueID("field");
 $insert_query2 = "insert into vtiger_field values (23,".$newfieldid.",'contactid','invoice',1,'57','contact_id','Contact Name',1,0,0,100,4,1,1,'I~O',1,'')";
 Execute($insert_query2);
-//Added on 23-12-2005 because we must populate vtiger_field entries in vtiger_profile2field and vtiger_def_org_field if we add a vtiger_field in vtiger_field vtiger_table
+//Added on 23-12-2005 because we must populate vtiger_field entries in vtiger_profile2field and vtiger_def_org_field if we add a vtiger_field in vtiger_field table
 populateFieldForSecurity('23',$newfieldid);
 
 //changes made to fix the bug in Address Information block of Accounts and Contacs module
 $update_array2 = Array(
-		"UPDATE vtiger_field SET vtiger_fieldlabel='Billing City' WHERE vtiger_tabid=6 and vtiger_tablename='accountbillads' and vtiger_fieldname='bill_city'",
-		"UPDATE vtiger_field SET vtiger_fieldlabel='Billing State' WHERE vtiger_tabid=6 and vtiger_tablename='accountbillads' and vtiger_fieldname='bill_state'",
-		"UPDATE vtiger_field SET vtiger_fieldlabel='Billing Code' WHERE vtiger_tabid=6 and vtiger_tablename='accountbillads' and vtiger_fieldname='bill_code'",
-		"UPDATE vtiger_field SET vtiger_fieldlabel='Billing Country' WHERE vtiger_tabid=6 and vtiger_tablename='accountbillads' and vtiger_fieldname='bill_country'",
-
-		"UPDATE vtiger_field SET vtiger_fieldlabel='Shipping City' WHERE vtiger_tabid=6 and vtiger_tablename='accountshipads' and vtiger_fieldname='ship_city'",
-		"UPDATE vtiger_field SET vtiger_fieldlabel='Shipping Country' WHERE vtiger_tabid=6 and vtiger_tablename='accountshipads' and vtiger_fieldname='ship_country'",
-		"UPDATE vtiger_field SET vtiger_fieldlabel='Shipping State' WHERE vtiger_tabid=6 and vtiger_tablename='accountshipads' and vtiger_fieldname='ship_state'",
-		"UPDATE vtiger_field SET vtiger_fieldlabel='Shipping Code' WHERE vtiger_tabid=6 and vtiger_tablename='accountshipads' and vtiger_fieldname='ship_code'",
-
-		"UPDATE vtiger_field SET vtiger_fieldlabel='Mailing City' WHERE vtiger_tabid=4 and vtiger_tablename='contactaddress' and vtiger_fieldname='mailingcity'",
-		"UPDATE vtiger_field SET vtiger_fieldlabel='Mailing State' WHERE vtiger_tabid=4 and vtiger_tablename='contactaddress' and vtiger_fieldname='mailingstate'",
-		"UPDATE vtiger_field SET vtiger_fieldlabel='Mailing Zip' WHERE vtiger_tabid=4 and vtiger_tablename='contactaddress' and vtiger_fieldname='mailingzip'",
-		"UPDATE vtiger_field SET vtiger_fieldlabel='Mailing Country' WHERE vtiger_tabid=4 and vtiger_tablename='contactaddress' and vtiger_fieldname='mailingcountry'",
-
-		"UPDATE vtiger_field SET vtiger_fieldlabel='Other City' WHERE vtiger_tabid=4 and vtiger_tablename='contactaddress' and vtiger_fieldname='othercity'",
-		"UPDATE vtiger_field SET vtiger_fieldlabel='Other State' WHERE vtiger_tabid=4 and vtiger_tablename='contactaddress' and vtiger_fieldname='otherstate'",
-		"UPDATE vtiger_field SET vtiger_fieldlabel='Other Zip' WHERE vtiger_tabid=4 and vtiger_tablename='contactaddress' and vtiger_fieldname='otherzip'",
-		"UPDATE vtiger_field SET vtiger_fieldlabel='Other Country' WHERE vtiger_tabid=4 and vtiger_tablename='contactaddress' and vtiger_fieldname='othercountry'",
+		"UPDATE vtiger_field SET fieldlabel='Billing City' WHERE tabid=6 and tablename='accountbillads' and fieldname='bill_city'",
+		"UPDATE vtiger_field SET fieldlabel='Billing State' WHERE tabid=6 and tablename='accountbillads' and fieldname='bill_state'",
+		"UPDATE vtiger_field SET fieldlabel='Billing Code' WHERE tabid=6 and tablename='accountbillads' and fieldname='bill_code'",
+		"UPDATE vtiger_field SET fieldlabel='Billing Country' WHERE tabid=6 and tablename='accountbillads' and fieldname='bill_country'",
+
+		"UPDATE vtiger_field SET fieldlabel='Shipping City' WHERE tabid=6 and tablename='accountshipads' and fieldname='ship_city'",
+		"UPDATE vtiger_field SET fieldlabel='Shipping Country' WHERE tabid=6 and tablename='accountshipads' and fieldname='ship_country'",
+		"UPDATE vtiger_field SET fieldlabel='Shipping State' WHERE tabid=6 and tablename='accountshipads' and fieldname='ship_state'",
+		"UPDATE vtiger_field SET fieldlabel='Shipping Code' WHERE tabid=6 and tablename='accountshipads' and fieldname='ship_code'",
+
+		"UPDATE vtiger_field SET fieldlabel='Mailing City' WHERE tabid=4 and tablename='contactaddress' and fieldname='mailingcity'",
+		"UPDATE vtiger_field SET fieldlabel='Mailing State' WHERE tabid=4 and tablename='contactaddress' and fieldname='mailingstate'",
+		"UPDATE vtiger_field SET fieldlabel='Mailing Zip' WHERE tabid=4 and tablename='contactaddress' and fieldname='mailingzip'",
+		"UPDATE vtiger_field SET fieldlabel='Mailing Country' WHERE tabid=4 and tablename='contactaddress' and fieldname='mailingcountry'",
+
+		"UPDATE vtiger_field SET fieldlabel='Other City' WHERE tabid=4 and tablename='contactaddress' and fieldname='othercity'",
+		"UPDATE vtiger_field SET fieldlabel='Other State' WHERE tabid=4 and tablename='contactaddress' and fieldname='otherstate'",
+		"UPDATE vtiger_field SET fieldlabel='Other Zip' WHERE tabid=4 and tablename='contactaddress' and fieldname='otherzip'",
+		"UPDATE vtiger_field SET fieldlabel='Other Country' WHERE tabid=4 and tablename='contactaddress' and fieldname='othercountry'",
 		);
 foreach($update_array2 as $query)
 {
@@ -307,22 +307,22 @@
 }
 
 
-//Added vtiger_field emailoptout in vtiger_account vtiger_table
+//Added vtiger_field emailoptout in vtiger_account table
 $newfieldid = $conn->getUniqueID("field");
 $insert_query3 = "insert into vtiger_field values (6,".$newfieldid.",'emailoptout','account',1,'56','emailoptout','Email Opt Out',1,0,0,100,17,1,1,'C~O',1,'')";
 Execute($insert_query3);
 
-//Added on 23-12-2005 because we must populate vtiger_field entries in vtiger_profile2field and vtiger_def_org_field if we add a vtiger_field in vtiger_field vtiger_table
+//Added on 23-12-2005 because we must populate vtiger_field entries in vtiger_profile2field and vtiger_def_org_field if we add a vtiger_field in vtiger_field table
 populateFieldForSecurity('6',$newfieldid);
 
 //Added on 22-12-2005
-$alter_query4 = "alter vtiger_table vtiger_account add column emailoptout varchar(3) default 0";
+$alter_query4 = "alter table vtiger_account add column emailoptout varchar(3) default 0";
 Execute($alter_query4);
 
 $update_array3 = Array(
-		"update vtiger_field set sequence=18 where vtiger_tabid=6 and vtiger_fieldname ='assigned_user_id'",
-		"update vtiger_field set sequence=19 where vtiger_tabid=6 and vtiger_fieldname ='createdtime'",
-		"update vtiger_field set sequence=19 where vtiger_tabid=6 and vtiger_fieldname ='modifiedtime'",
+		"update vtiger_field set sequence=18 where tabid=6 and fieldname ='assigned_user_id'",
+		"update vtiger_field set sequence=19 where tabid=6 and fieldname ='createdtime'",
+		"update vtiger_field set sequence=19 where tabid=6 and fieldname ='modifiedtime'",
 		);
 foreach($update_array3 as $query)
 {
@@ -330,8 +330,8 @@
 }
 
 
-//create vtiger_table vtiger_moduleowners to assign the module and corresponding owners
-$create_query2 = "CREATE TABLE `moduleowners` (
+//create table vtiger_moduleowners to assign the module and corresponding owners
+$create_query2 = "CREATE TABLE vtiger_moduleowners (
 	  `tabid` int(19) NOT NULL default '0',
 	    `user_id` varchar(11) NOT NULL,
 	      PRIMARY KEY  (`tabid`),
@@ -339,7 +339,7 @@
 	) ENGINE=InnoDB";
 
 /*
-$create_query2 = "CREATE TABLE `moduleowners` 
+$create_query2 = "CREATE TABLE vtiger_moduleowners 
 (
  `tabid` int(19) NOT NULL default '0',
  `user_id` varchar(11) NOT NULL default '',
@@ -378,11 +378,11 @@
 
 //Changes made to include status vtiger_field in Activity Quickcreate Form
 $update_array4 = Array(
-		"UPDATE vtiger_field SET quickcreate=0,quickcreatesequence=3 WHERE vtiger_tabid=16 and vtiger_fieldname='eventstatus'",
-		"UPDATE vtiger_field SET quickcreate=0,quickcreatesequence=4 WHERE vtiger_tabid=16 and vtiger_fieldname='activitytype'",
-		"UPDATE vtiger_field SET quickcreate=0,quickcreatesequence=5 WHERE vtiger_tabid=16 and vtiger_fieldname='duration_hours'",
-
-		"UPDATE vtiger_field SET quickcreate=0,quickcreatesequence=3 WHERE vtiger_tabid=9 and vtiger_fieldname='taskstatus'",
+		"UPDATE vtiger_field SET quickcreate=0,quickcreatesequence=3 WHERE tabid=16 and fieldname='eventstatus'",
+		"UPDATE vtiger_field SET quickcreate=0,quickcreatesequence=4 WHERE tabid=16 and fieldname='activitytype'",
+		"UPDATE vtiger_field SET quickcreate=0,quickcreatesequence=5 WHERE tabid=16 and fieldname='duration_hours'",
+
+		"UPDATE vtiger_field SET quickcreate=0,quickcreatesequence=3 WHERE tabid=9 and fieldname='taskstatus'",
 		);
 foreach($update_array4 as $query)
 {
@@ -415,13 +415,13 @@
 Execute($query1);
 
 $rename_table_array1 = Array(
-		"update vtiger_field set vtiger_tablename='customerdetails' where vtiger_tabid=4 and vtiger_fieldname in ('portal','support_start_date','support_end_date')",
-		"alter vtiger_table PortalInfo drop foreign key fk_PortalInfo",
-		"rename vtiger_table PortalInfo to vtiger_portalinfo",
-		"alter vtiger_table vtiger_portalinfo add CONSTRAINT `fk_portalinfo` FOREIGN KEY (`id`) REFERENCES `contactdetails` (`contactid`) ON DELETE CASCADE",
-		"alter vtiger_table CustomerDetails drop foreign key fk_CustomerDetails",
-		"rename vtiger_table CustomerDetails to vtiger_customerdetails",
-		"alter vtiger_table vtiger_customerdetails add CONSTRAINT `fk_customerdetails` FOREIGN KEY (`customerid`) REFERENCES `contactdetails` (`contactid`) ON DELETE CASCADE"
+		"update vtiger_field set tablename='customerdetails' where tabid=4 and fieldname in ('portal','support_start_date','support_end_date')",
+		"alter table vtiger_PortalInfo drop foreign key fk_PortalInfo",
+		"rename table vtiger_PortalInfo to vtiger_portalinfo",
+		"alter table vtiger_portalinfo add CONSTRAINT `fk_portalinfo` FOREIGN KEY (`id`) REFERENCES `contactdetails` (`contactid`) ON DELETE CASCADE",
+		"alter table vtiger_CustomerDetails drop foreign key fk_CustomerDetails",
+		"rename table vtiger_CustomerDetails to vtiger_customerdetails",
+		"alter table vtiger_customerdetails add CONSTRAINT `fk_customerdetails` FOREIGN KEY (`customerid`) REFERENCES `contactdetails` (`contactid`) ON DELETE CASCADE"
 		);
 foreach($rename_table_array1 as $query)
 {
@@ -429,7 +429,7 @@
 }
 
 
-$query2 = "create vtiger_table vtiger_ownernotify(crmid int(19),smownerid int(19),flag int(3))";
+$query2 = "create table vtiger_ownernotify(crmid int(19),smownerid int(19),flag int(3))";
 Execute($query2);
 
 
@@ -445,7 +445,7 @@
 }
 //echo '<pre> List of vtiger_roles :';print_r($role_map_array);echo '</pre>';
 
-//Before delete the vtiger_role take a backup array for the vtiger_table vtiger_user2role
+//Before delete the vtiger_role take a backup array for the table vtiger_user2role
 $sql = "select * from vtiger_user2role";
 $res = $conn->query($sql);
 $user2role_array = array();
@@ -462,16 +462,16 @@
 Execute($sql);
 
 
-$query3 = "alter vtiger_table vtiger_user2role drop FOREIGN KEY fk_user2role2";
+$query3 = "alter table vtiger_user2role drop FOREIGN KEY fk_user2role2";
 Execute($query3);
 
 //4,5 th are the Extra added queries
 $alter_query_array1 = Array(
-		"alter vtiger_table vtiger_user2role change vtiger_roleid vtiger_roleid varchar(255)",
-		"alter vtiger_table vtiger_role2profile change vtiger_roleid vtiger_roleid varchar(255)",
-		"alter vtiger_table vtiger_role CHANGE vtiger_roleid vtiger_roleid varchar(255)",
-		"alter vtiger_table vtiger_role2profile drop PRIMARY KEY",
-		"alter vtiger_table vtiger_role2profile ADD PRIMARY KEY (roleid,profileid)"
+		"alter table vtiger_user2role change roleid roleid varchar(255)",
+		"alter table vtiger_role2profile change roleid roleid varchar(255)",
+		"alter table vtiger_role CHANGE roleid roleid varchar(255)",
+		"alter table vtiger_role2profile drop PRIMARY KEY",
+		"alter table vtiger_role2profile ADD PRIMARY KEY (roleid,profileid)"
 		);
 foreach($alter_query_array1 as $query)
 {
@@ -483,10 +483,10 @@
 Execute($query4);
 
 $alter_query_array2 = Array(
-		"alter vtiger_table vtiger_role CHANGE name vtiger_rolename varchar(200)",
-		"alter vtiger_table vtiger_role DROP description",
-		"alter vtiger_table vtiger_role add parentrole varchar(255)",
-		"alter vtiger_table vtiger_role add depth int(19)"
+		"alter table vtiger_role CHANGE name rolename varchar(200)",
+		"alter table vtiger_role DROP description",
+		"alter table vtiger_role add parentrole varchar(255)",
+		"alter table vtiger_role add depth int(19)"
 		);
 foreach($alter_query_array2 as $query)
 {
@@ -505,7 +505,7 @@
 	$parentRole = 'H1';
 	if($rolename == 'standard_user')
 	{
-		$rs = $conn->query("select * from vtiger_role where vtiger_rolename='administrator'");
+		$rs = $conn->query("select * from vtiger_role where rolename='administrator'");
 		$parentRole = $conn->query_result($rs,0,'roleid');
 	}
 	$empty_array = array(""=>"");
@@ -517,14 +517,14 @@
 $user2role_del = "truncate vtiger_user2role";
 Execute($user2role_del);
 
-//First we will insert the old values from vtiger_user2role_array to vtiger_user2role vtiger_table and then update the new vtiger_role id
+//First we will insert the old values from vtiger_user2role_array to vtiger_user2role table and then update the new vtiger_role id
 foreach($user2role_array as $userid => $roleid)
 {
-	$sql = "insert into vtiger_user2role (userid, vtiger_roleid) values(".$userid.",'".$new_role_map_array[$roleid]."')";
+	$sql = "insert into vtiger_user2role (userid, roleid) values(".$userid.",'".$new_role_map_array[$roleid]."')";
 	Execute($sql);
 }
 //Commented the following loop as we have backup the vtiger_user2role and insert the entries with the new rold id using new_role_map_array above
-//Update the vtiger_user2role vtiger_table with new vtiger_roleid
+//Update the vtiger_user2role table with new vtiger_roleid
 /*
    foreach($new_role_map_array as $old_roleid => $new_roleid)
    {
@@ -532,21 +532,21 @@
    Execute($update_user2role);
    }
  */
-//Update the vtiger_role2profile vtiger_table with new vtiger_roleid
+//Update the vtiger_role2profile table with new vtiger_roleid
 foreach($new_role_map_array as $old_roleid => $new_roleid)
 {
-	$update_role2profile = "update vtiger_role2profile set vtiger_roleid='".$new_roleid."' where vtiger_roleid=".$old_roleid;
+	$update_role2profile = "update vtiger_role2profile set roleid='".$new_roleid."' where roleid=".$old_roleid;
 	Execute($update_role2profile);
 }
 
 
 
 //Group Migration:
-//Step 1 :  form and group_map_array as groupname => description from vtiger_groups vtiger_table
-//Step 2 :  form an vtiger_users2group_map_array array as userid => groupname from vtiger_users2group vtiger_table
-//Step 3 :  delete all entries from vtiger_groups vtiger_table and enter new values from group_map_array
-//Step 4 :  drop the vtiger_table vtiger_users2group and create new vtiger_table
-//Step 5 :  put entries to vtiger_users2group vtiger_table based on vtiger_users2group_map_array. Here get the groupid from vtiger_groups vtiger_table based on groupname
+//Step 1 :  form and group_map_array as groupname => description from vtiger_groups table
+//Step 2 :  form an vtiger_users2group_map_array array as userid => groupname from vtiger_users2group table
+//Step 3 :  delete all entries from vtiger_groups table and enter new values from group_map_array
+//Step 4 :  drop the table vtiger_users2group and create new table
+//Step 5 :  put entries to vtiger_users2group table based on vtiger_users2group_map_array. Here get the groupid from vtiger_groups table based on groupname
 
 //Step 1 : Form the group_map_array as groupname => description
 $sql = "select * from vtiger_groups";
@@ -561,7 +561,7 @@
 //echo '<pre>List of Groups : ';print_r($group_map_array);echo '</pre>';
 
 
-//Step 2 : form an vtiger_users2group_map_array array as userid => groupname from vtiger_users2group vtiger_table
+//Step 2 : form an vtiger_users2group_map_array array as userid => groupname from vtiger_users2group table
 $sql = "select * from vtiger_users2group";
 $res = $conn->query($sql);
 $users2group_map_array = Array();
@@ -573,16 +573,16 @@
 }
 //echo '<pre>List of vtiger_users2group : ';print_r($users2group_map_array);echo '</pre>';
 
-//Step 3 : delete all entries from vtiger_groups vtiger_table
+//Step 3 : delete all entries from vtiger_groups table
 $sql = "truncate vtiger_groups";
 Execute($sql);
 
 $alter_query_array3 = Array(
-		"alter vtiger_table vtiger_users2group drop FOREIGN KEY fk_users2group",
-		"alter vtiger_table vtiger_leadgrouprelation drop FOREIGN KEY fk_leadgrouprelation2",
-		"alter vtiger_table vtiger_activitygrouprelation drop FOREIGN KEY fk_activitygrouprelation2",
-		"alter vtiger_table vtiger_ticketgrouprelation drop FOREIGN KEY fk_ticketgrouprelation2",
-		"alter vtiger_table vtiger_groups drop PRIMARY KEY"
+		"alter table vtiger_users2group drop FOREIGN KEY fk_users2group",
+		"alter table vtiger_leadgrouprelation drop FOREIGN KEY fk_leadgrouprelation2",
+		"alter table vtiger_activitygrouprelation drop FOREIGN KEY fk_activitygrouprelation2",
+		"alter table vtiger_ticketgrouprelation drop FOREIGN KEY fk_ticketgrouprelation2",
+		"alter table vtiger_groups drop PRIMARY KEY"
 		);
 foreach($alter_query_array3 as $query)
 {
@@ -590,12 +590,12 @@
 }
 
 //2 nd query is the Extra added query
-//Adding columns in group vtiger_table:
+//Adding columns in group table:
 $alter_query_array4 = Array(
-		"alter vtiger_table vtiger_groups add column groupid int(19) FIRST",
-		"alter vtiger_table vtiger_groups change name  groupname varchar(100)",
-		"alter vtiger_table vtiger_groups ADD PRIMARY KEY (groupid)",
-		"alter vtiger_table vtiger_groups add index (groupname)"
+		"alter table vtiger_groups add column groupid int(19) FIRST",
+		"alter table vtiger_groups change name  groupname varchar(100)",
+		"alter table vtiger_groups ADD PRIMARY KEY (groupid)",
+		"alter table vtiger_groups add index (groupname)"
 		);
 foreach($alter_query_array4 as $query)
 {
@@ -603,15 +603,15 @@
 }
 
 
-//Moved the create vtiger_table queries for vtiger_group2grouprel, vtiger_group2role, vtiger_group2rs from the end of this block
+//Moved the create table queries for vtiger_group2grouprel, vtiger_group2role, vtiger_group2rs from the end of this block
 //Added on 06-06-06
-$query8 = "CREATE TABLE `group2grouprel` (
+$query8 = "CREATE TABLE vtiger_group2grouprel (
 	  `groupid` int(19) NOT NULL,
 	    `containsgroupid` int(19) NOT NULL,
 	      PRIMARY KEY  (`groupid`,`containsgroupid`)
       ) ENGINE=InnoDB";
       /*
-$query8 = "CREATE TABLE `group2grouprel` 
+$query8 = "CREATE TABLE vtiger_group2grouprel 
 (
  `groupid` int(19) NOT NULL default '0',
  `containsgroupid` int(19) NOT NULL default '0',
@@ -622,13 +622,13 @@
 Execute($query8);
 
 //Added on 06-06-06
-$query9 = "CREATE TABLE `group2role` (
+$query9 = "CREATE TABLE vtiger_group2role (
 	  `groupid` int(19) NOT NULL,
 	    `roleid` varchar(255) NOT NULL,
 	      PRIMARY KEY  (`groupid`,`roleid`)
       ) ENGINE=InnoDB";
 /*
-$query9 = "CREATE TABLE `group2role` 
+$query9 = "CREATE TABLE vtiger_group2role 
 (
  `groupid` int(19) NOT NULL default '0',
  `roleid` varchar(255) NOT NULL default '',
@@ -639,13 +639,13 @@
 Execute($query9);
 
 //Added on 06-06-06
-$query10 = "CREATE TABLE `group2rs` (
+$query10 = "CREATE TABLE vtiger_group2rs (
 	  `groupid` int(19) NOT NULL,
 	    `roleandsubid` varchar(255) NOT NULL,
 	      PRIMARY KEY  (`groupid`,`roleandsubid`)
       ) ENGINE=InnoDB";
 /*
-$query10 = "CREATE TABLE `group2rs` 
+$query10 = "CREATE TABLE vtiger_group2rs 
 (
  `groupid` int(19) NOT NULL default '0',
  `roleandsubid` varchar(255) NOT NULL default '',
@@ -655,7 +655,7 @@
 */
 Execute($query10);
 
-//Insert all the retrieved old values to the new vtiger_groups vtiger_table ie., create new vtiger_groups
+//Insert all the retrieved old values to the new vtiger_groups table ie., create new vtiger_groups
 foreach($group_map_array as $groupname => $description)
 {
 	$empty_array = array(
@@ -669,21 +669,21 @@
 }
 
 
-//Copy all mappings in a user2grop vtiger_table in a array;
-
-//Step 4 : Drop and again create vtiger_users2group
-$query6 = "drop vtiger_table vtiger_users2group";
+//Copy all mappings in a user2grop table in a array;
+
+//Step 4 : Drop and again create users2group
+$query6 = "drop table vtiger_users2group";
 Execute($query6);
 
 //Added on 06-06-06
-$query7 = "CREATE TABLE `users2group` (
+$query7 = "CREATE TABLE vtiger_users2group (
 	  `groupid` int(19) NOT NULL,
 	    `userid` int(19) NOT NULL,
 	      PRIMARY KEY  (`groupid`,`userid`),
 	        KEY `users2group_groupname_uerid_idx` (`groupid`,`userid`)
 	) ENGINE=InnoDB";
 /*
-$query7 = "CREATE TABLE `users2group` 
+$query7 = "CREATE TABLE vtiger_users2group 
 (
  `groupid` int(19) NOT NULL default '0',
  `userid` int(19) NOT NULL default '0',
@@ -693,7 +693,7 @@
 */
 Execute($query7);
 
-//Step 5 : put entries to vtiger_users2group vtiger_table based on vtiger_users2group_map_array. Here get the groupid from vtiger_groups vtiger_table based on groupname
+//Step 5 : put entries to vtiger_users2group table based on vtiger_users2group_map_array. Here get the groupid from vtiger_groups table based on groupname
 foreach($users2group_map_array as $userid => $groupname)
 {
 	//$groupid = $conn->query_result($conn->query("select * from vtiger_groups where groupname='".$groupname."'"),0,'groupid');
@@ -703,7 +703,7 @@
 
 
 $alter_query_array5 = Array(
-		"alter vtiger_table vtiger_leadgrouprelation ADD CONSTRAINT fk_leadgrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE",
+		"alter table vtiger_leadgrouprelation ADD CONSTRAINT fk_leadgrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE",
 		"ALTER TABLE vtiger_activitygrouprelation ADD CONSTRAINT fk_activitygrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE",
 		"ALTER TABLE vtiger_ticketgrouprelation ADD CONSTRAINT fk_ticketgrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE"
 		);
@@ -711,10 +711,10 @@
 {
 	Execute($query);
 }
-//Moved the create vtiger_table queries for vtiger_group2grouprel, vtiger_group2role, vtiger_group2rs to before creatinf the Group ie., before call the createGroup
-
-
-/***Added to include decimal places for amount vtiger_field in vtiger_potential vtiger_table  --by Mangai 15-Nov-2005***/
+//Moved the create table queries for vtiger_group2grouprel, vtiger_group2role, vtiger_group2rs to before creatinf the Group ie., before call the createGroup
+
+
+/***Added to include decimal places for amount vtiger_field in vtiger_potential table  --by Mangai 15-Nov-2005***/
 
 $query11 = "ALTER TABLE vtiger_potential change amount amount decimal(10,2)";
 Execute($query11);
@@ -734,21 +734,21 @@
 
 /****************** 5.0(Alpha) dev version 3 Database changes -- Starts*********************/
 
-//Drop the column company_name from vtiger_vendor vtiger_table ---- modified by Mickie on 18-11-2005
-$altersql1 = "alter vtiger_table vtiger_vendor drop column company_name";
+//Drop the column company_name from vtiger_vendor table ---- modified by Mickie on 18-11-2005
+$altersql1 = "alter table vtiger_vendor drop column company_name";
 Execute($altersql1);
-//TODO (check): Remove this company_name entry from the vtiger_field vtiger_table if it already exists
+//TODO (check): Remove this company_name entry from the vtiger_field table if it already exists
 
 //Migration for Default Organisation Share -- Added by Don on 20-11-2005
 
-$query1 = "CREATE TABLE `org_share_action_mapping` (
+$query1 = "CREATE TABLE vtiger_org_share_action_mapping (
 `share_action_id` int(19) NOT NULL default '0',
 	`share_action_name` varchar(200) NOT NULL default '',
 PRIMARY KEY  (`share_action_id`,`share_action_name`)
 	) TYPE=InnoDB ";
 Execute($query1);
 
-$query2 = "CREATE TABLE `org_share_action2tab` (
+$query2 = "CREATE TABLE vtiger_org_share_action2tab (
 	`share_action_id` int(19) NOT NULL default '0',
 	`tabid` int(19) NOT NULL default '0',
 	PRIMARY KEY  (`share_action_id`,`tabid`),
@@ -757,10 +757,10 @@
 Execute($query2);
 
 
-$query3 = "alter vtiger_table vtiger_def_org_share add column editstatus int(19)";
+$query3 = "alter table vtiger_def_org_share add column editstatus int(19)";
 Execute($query3);
 
-$query4 = "delete from vtiger_def_org_share where vtiger_tabid in(8,14,15,18,19)";
+$query4 = "delete from vtiger_def_org_share where tabid in(8,14,15,18,19)";
 Execute($query4);
 
 
@@ -812,9 +812,9 @@
 $query_array1 = Array(
 		"insert into vtiger_def_org_share values(9,17,7,0)",
 		"update vtiger_def_org_share set editstatus=0",
-		"update vtiger_def_org_share set editstatus=2 where vtiger_tabid=4",
-		"update vtiger_def_org_share set editstatus=1 where vtiger_tabid=9",
-		"update vtiger_def_org_share set editstatus=2 where vtiger_tabid=16"
+		"update vtiger_def_org_share set editstatus=2 where tabid=4",
+		"update vtiger_def_org_share set editstatus=1 where tabid=9",
+		"update vtiger_def_org_share set editstatus=2 where tabid=16"
 		);
 foreach($query_array1 as $query)
 {
@@ -828,7 +828,7 @@
 $conn->println("Database Modifications for 5.0(Alpha) Dev 3 ==> 5.0 Alpha starts here.");
 //echo "<br><br><b>Database Modifications for 5.0(Alpha) Dev3 ==> 5.0 Alpha starts here.....</b><br>";
 $alter_query_array6 = Array(
-				"ALTER TABLE vtiger_users ADD column vtiger_activity_view VARCHAR(25) DEFAULT 'Today' AFTER homeorder",
+				"ALTER TABLE vtiger_users ADD column activity_view VARCHAR(25) DEFAULT 'Today' AFTER homeorder",
 				"ALTER TABLE vtiger_activity ADD column notime CHAR(3) DEFAULT '0' AFTER location"
 			   );
 foreach($alter_query_array6 as $query)
@@ -846,20 +846,20 @@
 }
 
 $alter_query_array7 = Array(
-				"alter vtiger_table vtiger_vendor add column pobox varchar(30) after state",
-				"alter vtiger_table vtiger_leadaddress add column pobox varchar(30) after state",
-				"alter vtiger_table vtiger_accountbillads add column pobox varchar(30) after state",
-				"alter vtiger_table vtiger_accountshipads add column pobox varchar(30) after state",
-				"alter vtiger_table vtiger_contactaddress add column mailingpobox varchar(30) after mailingstate",
-				"alter vtiger_table vtiger_contactaddress add column otherpobox varchar(30) after otherstate",
-				"alter vtiger_table vtiger_quotesbillads add column bill_pobox varchar(30) after bill_street",
-				"alter vtiger_table vtiger_quotesshipads add column ship_pobox varchar(30) after ship_street",
-				"alter vtiger_table vtiger_pobillads add column bill_pobox varchar(30) after bill_street",
-				"alter vtiger_table vtiger_poshipads add column ship_pobox varchar(30) after ship_street",
-				"alter vtiger_table vtiger_sobillads add column bill_pobox varchar(30) after bill_street",
-				"alter vtiger_table vtiger_soshipads add column ship_pobox varchar(30) after ship_street",
-				"alter vtiger_table vtiger_invoicebillads add column bill_pobox varchar(30) after bill_street",
-				"alter vtiger_table vtiger_invoiceshipads add column ship_pobox varchar(30) after ship_street"
+				"alter table vtiger_vendor add column pobox varchar(30) after state",
+				"alter table vtiger_leadaddress add column pobox varchar(30) after state",
+				"alter table vtiger_accountbillads add column pobox varchar(30) after state",
+				"alter table vtiger_accountshipads add column pobox varchar(30) after state",
+				"alter table vtiger_contactaddress add column mailingpobox varchar(30) after mailingstate",
+				"alter table vtiger_contactaddress add column otherpobox varchar(30) after otherstate",
+				"alter table vtiger_quotesbillads add column bill_pobox varchar(30) after bill_street",
+				"alter table vtiger_quotesshipads add column ship_pobox varchar(30) after ship_street",
+				"alter table vtiger_pobillads add column bill_pobox varchar(30) after bill_street",
+				"alter table vtiger_poshipads add column ship_pobox varchar(30) after ship_street",
+				"alter table vtiger_sobillads add column bill_pobox varchar(30) after bill_street",
+				"alter table vtiger_soshipads add column ship_pobox varchar(30) after ship_street",
+				"alter table vtiger_invoicebillads add column bill_pobox varchar(30) after bill_street",
+				"alter table vtiger_invoiceshipads add column ship_pobox varchar(30) after ship_street"
 			   );
 foreach($alter_query_array7 as $query)
 {
@@ -906,7 +906,7 @@
 	$n = $n+5;
 	for($i = 0;$i < 5;$i++)
 	{
-		$query1 = "update vtiger_field set sequence=".$sequence[$j]." where vtiger_tablename='".$tablename[$n+$i]."' && vtiger_fieldname='".$fieldname[$j]."'";
+		$query1 = "update vtiger_field set sequence=".$sequence[$j]." where tablename='".$tablename[$n+$i]."' && fieldname='".$fieldname[$j]."'";
 		Execute($query1);
 	}
 }
@@ -916,7 +916,7 @@
 $sequence = array(3,4,5,6);
 for($i = 0;$i < 4;$i++)
 {
-	$query2 = "update vtiger_field set sequence=".$sequence[$i]." where vtiger_tablename='".$tablename."' && vtiger_fieldname='".$fieldname[$i]."'";
+	$query2 = "update vtiger_field set sequence=".$sequence[$i]." where tablename='".$tablename."' && fieldname='".$fieldname[$i]."'";
 	Execute($query2);
 }
 
@@ -926,7 +926,7 @@
 
 for($i = 0;$i < 4;$i++)
 {
-	$query3 = "update vtiger_field set sequence=".$sequence[$i]." where vtiger_tablename='".$tablename."' && vtiger_fieldname='".$fieldname[$i]."'";
+	$query3 = "update vtiger_field set sequence=".$sequence[$i]." where tablename='".$tablename."' && fieldname='".$fieldname[$i]."'";
 	Execute($query3);
 }
 
@@ -936,20 +936,20 @@
 
 for($i = 0;$i < 8;$i++)
 {
-	$query = "update vtiger_field set sequence=".$sequence[$i]." where vtiger_tablename='".$tablename."' && vtiger_fieldname='".$fieldname[$i]."'";
+	$query = "update vtiger_field set sequence=".$sequence[$i]." where tablename='".$tablename."' && fieldname='".$fieldname[$i]."'";
 	Execute($query);
 }
 
 $query_array1 = Array(
-			"update vtiger_field set vtiger_tablename='crmentity' where vtiger_tabid=10 and vtiger_fieldname='description'",
-			"update vtiger_field set vtiger_tablename='attachments' where vtiger_tabid=10 and vtiger_fieldname='filename'",
-			"drop vtiger_table emails",
-
-			"alter vtiger_table vtiger_activity drop column description",
-			"update vtiger_field set vtiger_tablename='crmentity' where vtiger_tabid in (9,16) and vtiger_fieldname='description'",
-
-			"update vtiger_tab set name='PurchaseOrder',tablabel='PurchaseOrder' where vtiger_tabid=21",
-			"update vtiger_tab set presence=0 where vtiger_tabid=22 and name='SalesOrder'",
+			"update vtiger_field set tablename='crmentity' where tabid=10 and fieldname='description'",
+			"update vtiger_field set tablename='attachments' where tabid=10 and fieldname='filename'",
+			"drop table emails",
+
+			"alter table vtiger_activity drop column description",
+			"update vtiger_field set tablename='crmentity' where tabid in (9,16) and fieldname='description'",
+
+			"update vtiger_tab set name='PurchaseOrder',tablabel='PurchaseOrder' where tabid=21",
+			"update vtiger_tab set presence=0 where tabid=22 and name='SalesOrder'",
 
 			"delete from vtiger_actionmapping where actionname='SalesOrderDetailView'",
 			"delete from vtiger_actionmapping where actionname='SalesOrderEditView'",
@@ -958,16 +958,16 @@
 
 			"insert into vtiger_field values (13,".$conn->getUniqueID("field").",'filename','attachments',1,'61','filename','Attachment',1,0,0,100,12,2,1,'V~O',0,1)",
 
-			"alter vtiger_table vtiger_troubletickets add column filename varchar(50) default NULL after title"
+			"alter table vtiger_troubletickets add column filename varchar(50) default NULL after title"
 		     );
 foreach($query_array1 as $query)
 {
 	Execute($query);
 }
 
-$create_query3 = "create vtiger_table vtiger_parenttab(parenttabid int(19) not null, vtiger_parenttab_label varchar(100) not null, sequence int(10) not null, visible int(2) not null default '0', Primary Key(parenttabid))";
+$create_query3 = "create table vtiger_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 vtiger_table vtiger_parenttabrel(parenttabid int(3) not null, vtiger_tabid int(3) not null,sequence int(3) not null)";
+$create_query4 = "create table vtiger_parenttabrel(parenttabid int(3) not null, tabid int(3) not null,sequence int(3) not null)";
 Execute($create_query4);
 
 $insert_query_array4 = Array(
@@ -980,100 +980,100 @@
 }
 
 
-$create_query5 = "CREATE TABLE vtiger_blocks ( blockid int(19) NOT NULL, vtiger_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))";
+$create_query5 = "CREATE TABLE vtiger_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 vtiger_field set block=2 where vtiger_tabid=2 and block=5",
-				"update vtiger_field set block=3 where vtiger_tabid=2 and block=2",
-
-				//"update vtiger_field set block=4 where vtiger_tabid=4 and block=1",
-				"update vtiger_field set block=5 where vtiger_tabid=4 and block=5",
-				"update vtiger_field set block=6 where vtiger_tabid=4 and block=4",//Modified on 24-04-06
-				"update vtiger_field set block=4 where vtiger_tabid=4 and block=1",
-				"update vtiger_field set block=7 where vtiger_tabid=4 and block=2",
-				"update vtiger_field set block=8 where vtiger_tabid=4 and block=3",
-
-				"update vtiger_field set block=9 where vtiger_tabid=6 and block=1",
-				"update vtiger_field set block=10 where vtiger_tabid=6 and block=5",
-				"update vtiger_field set block=11 where vtiger_tabid=6 and block=2",
-				"update vtiger_field set block=12 where vtiger_tabid=6 and block=3",
-
-				"update vtiger_field set block=13 where vtiger_tabid=7 and block=1",
-				"update vtiger_field set block=14 where vtiger_tabid=7 and block=5",
-				"update vtiger_field set block=15 where vtiger_tabid=7 and block=2",
-				"update vtiger_field set block=16 where vtiger_tabid=7 and block=3",
-
-				"update vtiger_field set block=17 where vtiger_tabid=8 and block=1",
-				"update vtiger_field set block=17 where vtiger_tabid=8 and block=2",
-				"update vtiger_field set block=18 where vtiger_tabid=8 and block=3",
-
-				"update vtiger_field set block=19 where vtiger_tabid=9 and block=1",
-				"update vtiger_field set block=19 where vtiger_tabid=9 and block=7",
-				"update vtiger_field set block=20 where vtiger_tabid=9 and block=2",
-
-				"update vtiger_field set block=21 where vtiger_tabid=10 and block=1",
-				"update vtiger_field set block=22 where vtiger_tabid=10 and block=2",
-				"update vtiger_field set block=23 where vtiger_tabid=10 and block=3",
-				"update vtiger_field set block=23 where vtiger_tabid=10 and block=4",
-				"update vtiger_field set block=24 where vtiger_tabid=10 and block=5",
-
-				"update vtiger_field set block=25 where vtiger_tabid=13 and block=1",
-				"update vtiger_field set block=26 where vtiger_tabid=13 and block=2",
-				"update vtiger_field set block=27 where vtiger_tabid=13 and block=5",
-				"update vtiger_field set block=28 where vtiger_tabid=13 and block=3",
-				"update vtiger_field set block=29 where vtiger_tabid=13 and block=4",
-				"update vtiger_field set block=30 where vtiger_tabid=13 and block=6",
-
-				"update vtiger_field set block=31 where vtiger_tabid=14 and block=1",
-				"update vtiger_field set block=32 where vtiger_tabid=14 and block=2",
-				"update vtiger_field set block=33 where vtiger_tabid=14 and block=3",
-				"update vtiger_field set block=34 where vtiger_tabid=14 and block=5",
-				"update vtiger_field set block=35 where vtiger_tabid=14 and block=6",
-				"update vtiger_field set block=36 where vtiger_tabid=14 and block=4",
-
-				"update vtiger_field set block=37 where vtiger_tabid=15 and block=1",
-				"update vtiger_field set block=38 where vtiger_tabid=15 and block=2",
-				"update vtiger_field set block=39 where vtiger_tabid=15 and block=3",
-				"update vtiger_field set block=40 where vtiger_tabid=15 and block=4",
-
-				"update vtiger_field set block=41 where vtiger_tabid=16 and block=1",
-				"update vtiger_field set block=42 where vtiger_tabid=16 and block=7",
-				"update vtiger_field set block=43 where vtiger_tabid=16 and block=2",
-
-				"update vtiger_field set block=44 where vtiger_tabid=18 and block=1",
-				"update vtiger_field set block=45 where vtiger_tabid=18 and block=5",
-				"update vtiger_field set block=36 where vtiger_tabid=18 and block=2",
-				"update vtiger_field set block=47 where vtiger_tabid=18 and block=3",
-
-				"update vtiger_field set block=48 where vtiger_tabid=19 and block=1",
-				"update vtiger_field set block=49 where vtiger_tabid=19 and block=5",
-				"update vtiger_field set block=50 where vtiger_tabid=19 and block=2",
-
-				"update vtiger_field set block=51 where vtiger_tabid=20 and block=1",
-				"update vtiger_field set block=52 where vtiger_tabid=20 and block=5",
-				"update vtiger_field set block=53 where vtiger_tabid=20 and block=2",
-				"update vtiger_field set block=55 where vtiger_tabid=20 and block=6",
-				"update vtiger_field set block=56 where vtiger_tabid=20 and block=3",
-
-				"update vtiger_field set block=57 where vtiger_tabid=21 and block=1",
-				"update vtiger_field set block=58 where vtiger_tabid=21 and block=5",
-				"update vtiger_field set block=59 where vtiger_tabid=21 and block=2",
-				"update vtiger_field set block=61 where vtiger_tabid=21 and block=6",
-				"update vtiger_field set block=62 where vtiger_tabid=21 and block=3",
-
-				"update vtiger_field set block=63 where vtiger_tabid=22 and block=1",
-				"update vtiger_field set block=64 where vtiger_tabid=22 and block=5",
-				"update vtiger_field set block=65 where vtiger_tabid=22 and block=2",
-				"update vtiger_field set block=67 where vtiger_tabid=22 and block=6",
-				"update vtiger_field set block=68 where vtiger_tabid=22 and block=3",
-
-
-				"update vtiger_field set block=69 where vtiger_tabid=23 and block=1",
-				"update vtiger_field set block=70 where vtiger_tabid=23 and block=5",
-				"update vtiger_field set block=71 where vtiger_tabid=23 and block=2",
-				"update vtiger_field set block=73 where vtiger_tabid=23 and block=6",
-				"update vtiger_field set block=74 where vtiger_tabid=23 and block=3",
+				"update vtiger_field set block=2 where tabid=2 and block=5",
+				"update vtiger_field set block=3 where tabid=2 and block=2",
+
+				//"update vtiger_field set block=4 where tabid=4 and block=1",
+				"update vtiger_field set block=5 where tabid=4 and block=5",
+				"update vtiger_field set block=6 where tabid=4 and block=4",//Modified on 24-04-06
+				"update vtiger_field set block=4 where tabid=4 and block=1",
+				"update vtiger_field set block=7 where tabid=4 and block=2",
+				"update vtiger_field set block=8 where tabid=4 and block=3",
+
+				"update vtiger_field set block=9 where tabid=6 and block=1",
+				"update vtiger_field set block=10 where tabid=6 and block=5",
+				"update vtiger_field set block=11 where tabid=6 and block=2",
+				"update vtiger_field set block=12 where tabid=6 and block=3",
+
+				"update vtiger_field set block=13 where tabid=7 and block=1",
+				"update vtiger_field set block=14 where tabid=7 and block=5",
+				"update vtiger_field set block=15 where tabid=7 and block=2",
+				"update vtiger_field set block=16 where tabid=7 and block=3",
+
+				"update vtiger_field set block=17 where tabid=8 and block=1",
+				"update vtiger_field set block=17 where tabid=8 and block=2",
+				"update vtiger_field set block=18 where tabid=8 and block=3",
+
+				"update vtiger_field set block=19 where tabid=9 and block=1",
+				"update vtiger_field set block=19 where tabid=9 and block=7",
+				"update vtiger_field set block=20 where tabid=9 and block=2",
+
+				"update vtiger_field set block=21 where tabid=10 and block=1",
+				"update vtiger_field set block=22 where tabid=10 and block=2",
+				"update vtiger_field set block=23 where tabid=10 and block=3",
+				"update vtiger_field set block=23 where tabid=10 and block=4",
+				"update vtiger_field set block=24 where tabid=10 and block=5",
+
+				"update vtiger_field set block=25 where tabid=13 and block=1",
+				"update vtiger_field set block=26 where tabid=13 and block=2",
+				"update vtiger_field set block=27 where tabid=13 and block=5",
+				"update vtiger_field set block=28 where tabid=13 and block=3",
+				"update vtiger_field set block=29 where tabid=13 and block=4",
+				"update vtiger_field set block=30 where tabid=13 and block=6",
+
+				"update vtiger_field set block=31 where tabid=14 and block=1",
+				"update vtiger_field set block=32 where tabid=14 and block=2",
+				"update vtiger_field set block=33 where tabid=14 and block=3",
+				"update vtiger_field set block=34 where tabid=14 and block=5",
+				"update vtiger_field set block=35 where tabid=14 and block=6",
+				"update vtiger_field set block=36 where tabid=14 and block=4",
+
+				"update vtiger_field set block=37 where tabid=15 and block=1",
+				"update vtiger_field set block=38 where tabid=15 and block=2",
+				"update vtiger_field set block=39 where tabid=15 and block=3",
+				"update vtiger_field set block=40 where tabid=15 and block=4",
+
+				"update vtiger_field set block=41 where tabid=16 and block=1",
+				"update vtiger_field set block=42 where tabid=16 and block=7",
+				"update vtiger_field set block=43 where tabid=16 and block=2",
+
+				"update vtiger_field set block=44 where tabid=18 and block=1",
+				"update vtiger_field set block=45 where tabid=18 and block=5",
+				"update vtiger_field set block=36 where tabid=18 and block=2",
+				"update vtiger_field set block=47 where tabid=18 and block=3",
+
+				"update vtiger_field set block=48 where tabid=19 and block=1",
+				"update vtiger_field set block=49 where tabid=19 and block=5",
+				"update vtiger_field set block=50 where tabid=19 and block=2",
+
+				"update vtiger_field set block=51 where tabid=20 and block=1",
+				"update vtiger_field set block=52 where tabid=20 and block=5",
+				"update vtiger_field set block=53 where tabid=20 and block=2",
+				"update vtiger_field set block=55 where tabid=20 and block=6",
+				"update vtiger_field set block=56 where tabid=20 and block=3",
+
+				"update vtiger_field set block=57 where tabid=21 and block=1",
+				"update vtiger_field set block=58 where tabid=21 and block=5",
+				"update vtiger_field set block=59 where tabid=21 and block=2",
+				"update vtiger_field set block=61 where tabid=21 and block=6",
+				"update vtiger_field set block=62 where tabid=21 and block=3",
+
+				"update vtiger_field set block=63 where tabid=22 and block=1",
+				"update vtiger_field set block=64 where tabid=22 and block=5",
+				"update vtiger_field set block=65 where tabid=22 and block=2",
+				"update vtiger_field set block=67 where tabid=22 and block=6",
+				"update vtiger_field set block=68 where tabid=22 and block=3",
+
+
+				"update vtiger_field set block=69 where tabid=23 and block=1",
+				"update vtiger_field set block=70 where tabid=23 and block=5",
+				"update vtiger_field set block=71 where tabid=23 and block=2",
+				"update vtiger_field set block=73 where tabid=23 and block=6",
+				"update vtiger_field set block=74 where tabid=23 and block=3",
 			    );
 foreach($update_query_array1 as $query)
 {
@@ -1162,10 +1162,10 @@
 }
 
 $update_query_array2 = Array(
-				"update vtiger_tab set name='Vendors', vtiger_tablabel='Vendors' where vtiger_tabid=18",
-				"update vtiger_tab set name='PriceBooks', vtiger_tablabel='PriceBooks' where vtiger_tabid=19",
-				"update vtiger_tab set presence=0 where vtiger_tabid in(18,19)",
-				"update vtiger_relatedlists set label='PriceBooks' where vtiger_tabid=14 and related_tabid=19"
+				"update vtiger_tab set name='Vendors', tablabel='Vendors' where tabid=18",
+				"update vtiger_tab set name='PriceBooks', tablabel='PriceBooks' where tabid=19",
+				"update vtiger_tab set presence=0 where tabid in(18,19)",
+				"update vtiger_relatedlists set label='PriceBooks' where tabid=14 and related_tabid=19"
 			    );
 foreach($update_query_array2 as $query)
 {
@@ -1203,13 +1203,13 @@
 $cvid = $conn->query_result($res,0,"cvid");
 
 $insert_query_array7 = Array(
-			"insert into vtiger_cvcolumnlist values ($cvid,0,'leaddetails:lastname:lastname:Leads_Last_Name:V')",
-			"insert into vtiger_cvcolumnlist values ($cvid,1,'leaddetails:firstname:firstname:Leads_First_Name:V')",
-			"insert into vtiger_cvcolumnlist values ($cvid,2,'leaddetails:company:company:Leads_Company:V')",
-			"insert into vtiger_cvcolumnlist values ($cvid,3,'leadaddress:phone:phone:Leads_Phone:V')",
-			"insert into vtiger_cvcolumnlist values ($cvid,4,'leadsubdetails:website:website:Leads_Website:V')",
-			"insert into vtiger_cvcolumnlist values ($cvid,5,'leaddetails:email:email:Leads_Email:V')",
-			"insert into vtiger_cvcolumnlist values ($cvid,6,'crmentity:smownerid:assigned_user_id:Leads_Assigned_To:V')"
+			"insert into vtiger_cvcolumnlist values ($cvid,0,'vtiger_leaddetails:lastname:lastname:Leads_Last_Name:V')",
+			"insert into vtiger_cvcolumnlist values ($cvid,1,'vtiger_leaddetails:firstname:firstname:Leads_First_Name:V')",
+			"insert into vtiger_cvcolumnlist values ($cvid,2,'vtiger_leaddetails:company:company:Leads_Company:V')",
+			"insert into vtiger_cvcolumnlist values ($cvid,3,'vtiger_leadaddress:phone:phone:Leads_Phone:V')",
+			"insert into vtiger_cvcolumnlist values ($cvid,4,'vtiger_leadsubdetails:website:website:Leads_Website:V')",
+			"insert into vtiger_cvcolumnlist values ($cvid,5,'vtiger_leaddetails:email:email:Leads_Email:V')",
+			"insert into vtiger_cvcolumnlist values ($cvid,6,'vtiger_crmentity:smownerid:assigned_user_id:Leads_Assigned_To:V')"
 			    );
 foreach($insert_query_array7 as $query)
 {
@@ -1220,11 +1220,11 @@
 $cvid = $conn->query_result($res,0,"cvid");
 
 $insert_query_array8 = Array(
-		"insert into vtiger_cvcolumnlist values ($cvid,0,'account:accountname:accountname:Accounts_Account_Name:V')",
-		"insert into vtiger_cvcolumnlist values ($cvid,1,'accountbillads:city:bill_city:Accounts_City:V')",
-		"insert into vtiger_cvcolumnlist values ($cvid,2,'account:website:website:Accounts_Website:V')",
-		"insert into vtiger_cvcolumnlist values ($cvid,3,'account:phone:phone:Accounts_Phone:V')",
-		"insert into vtiger_cvcolumnlist values ($cvid,4,'crmentity:smownerid:assigned_user_id:Accounts_Assigned_To:V')"
+		"insert into vtiger_cvcolumnlist values ($cvid,0,'vtiger_account:accountname:accountname:Accounts_Account_Name:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,1,'vtiger_accountbillads:city:bill_city:Accounts_City:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,2,'vtiger_account:website:website:Accounts_Website:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,3,'vtiger_account:phone:phone:Accounts_Phone:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,4,'vtiger_crmentity:smownerid:assigned_user_id:Accounts_Assigned_To:V')"
 			    );
 foreach($insert_query_array8 as $query)
 {
@@ -1235,13 +1235,13 @@
 $cvid = $conn->query_result($res,0,"cvid");
 
 $insert_query_array9 = Array(
-		"insert into vtiger_cvcolumnlist values ($cvid,0,'contactdetails:firstname:firstname:Contacts_First_Name:V')",
-		"insert into vtiger_cvcolumnlist values ($cvid,1,'contactdetails:lastname:lastname:Contacts_Last_Name:V')",
-		"insert into vtiger_cvcolumnlist values ($cvid,2,'contactdetails:title:title:Contacts_Title:V')",
-		"insert into vtiger_cvcolumnlist values ($cvid,3,'account:accountname:accountname:Contacts_Account_Name:V')",
-		"insert into vtiger_cvcolumnlist values ($cvid,4,'contactdetails:email:email:Contacts_Email:V')",
-		"insert into vtiger_cvcolumnlist values ($cvid,5,'contactdetails:phone:phone:Contacts_Phone_Name:V')",
-		"insert into vtiger_cvcolumnlist values ($cvid,6,'crmentity:smownerid:assigned_user_id:Contacts_Assigned_To:V')"
+		"insert into vtiger_cvcolumnlist values ($cvid,0,'vtiger_contactdetails:firstname:firstname:Contacts_First_Name:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,1,'vtiger_contactdetails:lastname:lastname:Contacts_Last_Name:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,2,'vtiger_contactdetails:title:title:Contacts_Title:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,3,'vtiger_account:accountname:accountname:Contacts_Account_Name:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,4,'vtiger_contactdetails:email:email:Contacts_Email:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,5,'vtiger_contactdetails:phone:phone:Contacts_Phone_Name:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,6,'vtiger_crmentity:smownerid:assigned_user_id:Contacts_Assigned_To:V')"
 			    );
 foreach($insert_query_array9 as $query)
 {
@@ -1252,11 +1252,11 @@
 $cvid = $conn->query_result($res,0,"cvid");
 
 $insert_query_array10 = Array(
-	"insert into vtiger_cvcolumnlist values ($cvid,0,'potential:potentialname:potentialname:Potentials_Potential_Name:V')",
-	"insert into vtiger_cvcolumnlist values ($cvid,1,'potential:accountid:account_id:Potentials_Account_Name:V')",
-	"insert into vtiger_cvcolumnlist values ($cvid,2,'potential:amount:amount:Potentials_Amount:N')",
-	"insert into vtiger_cvcolumnlist values ($cvid,3,'potential:closingdate:closingdate:Potentials_Expected_Close_Date:D')",
-	"insert into vtiger_cvcolumnlist values ($cvid,4,'crmentity:smownerid:assigned_user_id:Potentials_Assigned_To:V')"
+	"insert into vtiger_cvcolumnlist values ($cvid,0,'vtiger_potential:potentialname:potentialname:Potentials_Potential_Name:V')",
+	"insert into vtiger_cvcolumnlist values ($cvid,1,'vtiger_potential:accountid:account_id:Potentials_Account_Name:V')",
+	"insert into vtiger_cvcolumnlist values ($cvid,2,'vtiger_potential:amount:amount:Potentials_Amount:N')",
+	"insert into vtiger_cvcolumnlist values ($cvid,3,'vtiger_potential:closingdate:closingdate:Potentials_Expected_Close_Date:D')",
+	"insert into vtiger_cvcolumnlist values ($cvid,4,'vtiger_crmentity:smownerid:assigned_user_id:Potentials_Assigned_To:V')"
 			     );
 foreach($insert_query_array10 as $query)
 {
@@ -1267,12 +1267,12 @@
 $cvid = $conn->query_result($res,0,"cvid");
 
 $insert_query_array11 = Array(
-		"insert into vtiger_cvcolumnlist values ($cvid,0,'crmentity:crmid::HelpDesk_Ticket_ID:I')",
-		"insert into vtiger_cvcolumnlist values ($cvid,1,'troubletickets:title:ticket_title:HelpDesk_Title:V')",
-		"insert into vtiger_cvcolumnlist values ($cvid,2,'troubletickets:parent_id:parent_id:HelpDesk_Related_to:I')",
-		"insert into vtiger_cvcolumnlist values ($cvid,3,'troubletickets:status:ticketstatus:HelpDesk_Status:V')",
-		"insert into vtiger_cvcolumnlist values ($cvid,4,'troubletickets:priority:ticketpriorities:HelpDesk_Priority:V')",
-		"insert into vtiger_cvcolumnlist values ($cvid,5,'crmentity:smownerid:assigned_user_id:HelpDesk_Assigned_To:V')"
+		"insert into vtiger_cvcolumnlist values ($cvid,0,'vtiger_crmentity:crmid::HelpDesk_Ticket_ID:I')",
+		"insert into vtiger_cvcolumnlist values ($cvid,1,'vtiger_troubletickets:title:ticket_title:HelpDesk_Title:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,2,'vtiger_troubletickets:parent_id:parent_id:HelpDesk_Related_to:I')",
+		"insert into vtiger_cvcolumnlist values ($cvid,3,'vtiger_troubletickets:status:ticketstatus:HelpDesk_Status:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,4,'vtiger_troubletickets:priority:ticketpriorities:HelpDesk_Priority:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,5,'vtiger_crmentity:smownerid:assigned_user_id:HelpDesk_Assigned_To:V')"
 			     );
 foreach($insert_query_array11 as $query)
 {
@@ -1284,13 +1284,13 @@
 $cvid = $conn->query_result($res,0,"cvid");
 
 $insert_query_array12 = Array(
-		"insert into vtiger_cvcolumnlist values ($cvid,0,'crmentity:crmid::Quotes_Quote_ID:I')",
-		"insert into vtiger_cvcolumnlist values ($cvid,1,'quotes:subject:subject:Quotes_Subject:V')",
-		"insert into vtiger_cvcolumnlist values ($cvid,2,'quotes:quotestage:quotestage:Quotes_Quote_Stage:V')",
-		"insert into vtiger_cvcolumnlist values ($cvid,3,'quotes:potentialid:potential_id:Quotes_Potential_Name:I')",
-		"insert into vtiger_cvcolumnlist values ($cvid,4,'quotes:accountid:account_id:Quotes_Account_Name:I')",
-		"insert into vtiger_cvcolumnlist values ($cvid,5,'quotes:total:hdnGrandTotal:Quotes_Total:I')",
-		"insert into vtiger_cvcolumnlist values ($cvid,6,'crmentity:smownerid:assigned_user_id:Quotes_Assigned_To:V')"
+		"insert into vtiger_cvcolumnlist values ($cvid,0,'vtiger_crmentity:crmid::Quotes_Quote_ID:I')",
+		"insert into vtiger_cvcolumnlist values ($cvid,1,'vtiger_quotes:subject:subject:Quotes_Subject:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,2,'vtiger_quotes:quotestage:quotestage:Quotes_Quote_Stage:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,3,'vtiger_quotes:potentialid:potential_id:Quotes_Potential_Name:I')",
+		"insert into vtiger_cvcolumnlist values ($cvid,4,'vtiger_quotes:accountid:account_id:Quotes_Account_Name:I')",
+		"insert into vtiger_cvcolumnlist values ($cvid,5,'vtiger_quotes:total:hdnGrandTotal:Quotes_Total:I')",
+		"insert into vtiger_cvcolumnlist values ($cvid,6,'vtiger_crmentity:smownerid:assigned_user_id:Quotes_Assigned_To:V')"
 			     );
 foreach($insert_query_array12 as $query)
 {
@@ -1301,14 +1301,14 @@
 $cvid = $conn->query_result($res,0,"cvid");
 
 $insert_query_array13 = Array(
-		"insert into vtiger_cvcolumnlist values ($cvid,0,'activity:status:taskstatus:Activities_Status:V')",
-		"insert into vtiger_cvcolumnlist values ($cvid,1,'activity:activitytype:activitytype:Activities_Type:V')",
-		"insert into vtiger_cvcolumnlist values ($cvid,2,'activity:subject:subject:Activities_Subject:V')",
-		"insert into vtiger_cvcolumnlist values ($cvid,3,'contactdetails:lastname:lastname:Activities_Contact_Name:V')",
-		"insert into vtiger_cvcolumnlist values ($cvid,4,'seactivityrel:crmid:parent_id:Activities_Related_To:V')",
-		"insert into vtiger_cvcolumnlist values ($cvid,5,'activity:date_start:date_start:Activities_Start_Date:D')",
-		"insert into vtiger_cvcolumnlist values ($cvid,6,'activity:due_date:due_date:Activities_End_Date:D')",
-		"insert into vtiger_cvcolumnlist values ($cvid,7,'crmentity:smownerid:assigned_user_id:Activities_Assigned_To:V')"
+		"insert into vtiger_cvcolumnlist values ($cvid,0,'vtiger_activity:status:taskstatus:Activities_Status:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,1,'vtiger_activity:activitytype:activitytype:Activities_Type:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,2,'vtiger_activity:subject:subject:Activities_Subject:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,3,'vtiger_contactdetails:lastname:lastname:Activities_Contact_Name:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,4,'vtiger_seactivityrel:crmid:parent_id:Activities_Related_To:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,5,'vtiger_activity:date_start:date_start:Activities_Start_Date:D')",
+		"insert into vtiger_cvcolumnlist values ($cvid,6,'vtiger_activity:due_date:due_date:Activities_End_Date:D')",
+		"insert into vtiger_cvcolumnlist values ($cvid,7,'vtiger_crmentity:smownerid:assigned_user_id:Activities_Assigned_To:V')"
 			     );
 foreach($insert_query_array13 as $query)
 {
@@ -1320,10 +1320,10 @@
 $cvid = $conn->query_result($res,0,"cvid");
 
 $insert_query_array14 = Array(
-		"insert into vtiger_cvcolumnlist values ($cvid,0,'activity:subject:subject:Emails_Subject:V')",
-		"insert into vtiger_cvcolumnlist values ($cvid,1,'seactivityrel:crmid:parent_id:Emails_Related_To:I')",
-		"insert into vtiger_cvcolumnlist values ($cvid,2,'activity:date_start:date_start:Emails_Date_Sent:D')",
-		"insert into vtiger_cvcolumnlist values ($cvid,3,'crmentity:smownerid:assigned_user_id:Emails_Assigned_To:V')"
+		"insert into vtiger_cvcolumnlist values ($cvid,0,'vtiger_activity:subject:subject:Emails_Subject:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,1,'vtiger_seactivityrel:crmid:parent_id:Emails_Related_To:I')",
+		"insert into vtiger_cvcolumnlist values ($cvid,2,'vtiger_activity:date_start:date_start:Emails_Date_Sent:D')",
+		"insert into vtiger_cvcolumnlist values ($cvid,3,'vtiger_crmentity:smownerid:assigned_user_id:Emails_Assigned_To:V')"
 			     );
 foreach($insert_query_array14 as $query)
 {
@@ -1334,12 +1334,12 @@
 $cvid = $conn->query_result($res,0,"cvid");
 
 $insert_query_array15 = Array(
-		"insert into vtiger_cvcolumnlist values ($cvid,0,'crmentity:crmid::Invoice_Invoice_Id:I')",
-		"insert into vtiger_cvcolumnlist values ($cvid,1,'invoice:subject:subject:Invoice_Subject:V')",
-		"insert into vtiger_cvcolumnlist values ($cvid,2,'invoice:salesorderid:salesorder_id:Invoice_Sales_Order:V')",
-		"insert into vtiger_cvcolumnlist values ($cvid,3,'invoice:invoicestatus:invoicestatus:Invoice_Status:V')",
-		"insert into vtiger_cvcolumnlist values ($cvid,4,'invoice:total:hdnGrandTotal:Invoice_Total:I')",
-		"insert into vtiger_cvcolumnlist values ($cvid,5,'crmentity:smownerid:assigned_user_id:Invoice_Assigned_To:V')"
+	"insert into vtiger_cvcolumnlist values ($cvid,0,'vtiger_crmentity:crmid::Invoice_Invoice_Id:I')",
+	"insert into vtiger_cvcolumnlist values ($cvid,1,'vtiger_invoice:subject:subject:Invoice_Subject:V')",
+	"insert into vtiger_cvcolumnlist values ($cvid,2,'vtiger_invoice:salesorderid:salesorder_id:Invoice_Sales_Order:V')",
+	"insert into vtiger_cvcolumnlist values ($cvid,3,'vtiger_invoice:invoicestatus:invoicestatus:Invoice_Status:V')",
+	"insert into vtiger_cvcolumnlist values ($cvid,4,'vtiger_invoice:total:hdnGrandTotal:Invoice_Total:I')",
+	"insert into vtiger_cvcolumnlist values ($cvid,5,'vtiger_crmentity:smownerid:assigned_user_id:Invoice_Assigned_To:V')"
 			     );
 foreach($insert_query_array15 as $query)
 {
@@ -1351,11 +1351,11 @@
 $cvid = $conn->query_result($res,0,"cvid");
 
 $insert_query_array16 = Array(
-		"insert into vtiger_cvcolumnlist values ($cvid,0,'notes:title:title:Notes_Title:V')",
-		"insert into vtiger_cvcolumnlist values ($cvid,1,'notes:contact_id:contact_id:Notes_Contact_Name:I')",
-		"insert into vtiger_cvcolumnlist values ($cvid,2,'senotesrel:crmid:parent_id:Notes_Related_to:I')",
-		"insert into vtiger_cvcolumnlist values ($cvid,3,'notes:filename:filename:Notes_File:V')",
-		"insert into vtiger_cvcolumnlist values ($cvid,4,'crmentity:modifiedtime:modifiedtime:Notes_Modified_Time:V')"
+		"insert into vtiger_cvcolumnlist values ($cvid,0,'vtiger_notes:title:title:Notes_Title:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,1,'vtiger_notes:contact_id:contact_id:Notes_Contact_Name:I')",
+		"insert into vtiger_cvcolumnlist values ($cvid,2,'vtiger_senotesrel:crmid:parent_id:Notes_Related_to:I')",
+		"insert into vtiger_cvcolumnlist values ($cvid,3,'vtiger_notes:filename:filename:Notes_File:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,4,'vtiger_crmentity:modifiedtime:modifiedtime:Notes_Modified_Time:V')"
 			     );
 foreach($insert_query_array16 as $query)
 {
@@ -1366,8 +1366,8 @@
 $cvid = $conn->query_result($res,0,"cvid");
 
 $insert_query_array17 = Array(
-		"insert into vtiger_cvcolumnlist values ($cvid,1,'pricebook:bookname:bookname:PriceBooks_Price_Book_Name:V')",
-		"insert into vtiger_cvcolumnlist values ($cvid,2,'pricebook:active:active:PriceBooks_Active:V')"
+		"insert into vtiger_cvcolumnlist values ($cvid,1,'vtiger_pricebook:bookname:bookname:PriceBooks_Price_Book_Name:V')",
+		"insert into vtiger_cvcolumnlist values ($cvid,2,'vtiger_pricebook:active:active:PriceBooks_Active:V')"
 			     );
 foreach($insert_query_array17 as $query)
 {
@@ -1379,11 +1379,11 @@
 $cvid = $conn->query_result($res,0,"cvid");
 
 $insert_query_array18 = Array(
-	"insert into vtiger_cvcolumnlist values ($cvid,0,'products:productname:productname:Products_Product_Name:V')",
-	"insert into vtiger_cvcolumnlist values ($cvid,1,'products:productcode:productcode:Products_Product_Code:V')",
-	"insert into vtiger_cvcolumnlist values ($cvid,2,'products:commissionrate:commissionrate:Products_Commission_Rate:V')",
-	"insert into vtiger_cvcolumnlist values ($cvid,3,'products:qty_per_unit:qty_per_unit:Products_Qty/Unit:V')",
-	"insert into vtiger_cvcolumnlist values ($cvid,4,'products:unit_price:unit_price:Products_Unit_Price:V')"
+	"insert into vtiger_cvcolumnlist values ($cvid,0,'vtiger_products:productname:productname:Products_Product_Name:V')",
+	"insert into vtiger_cvcolumnlist values ($cvid,1,'vtiger_products:productcode:productcode:Products_Product_Code:V')",
+	"insert into vtiger_cvcolumnlist values ($cvid,2,'vtiger_products:commissionrate:commissionrate:Products_Commission_Rate:V')",
+	"insert into vtiger_cvcolumnlist values ($cvid,3,'vtiger_products:qty_per_unit:qty_per_unit:Products_Qty/Unit:V')",
+	"insert into vtiger_cvcolumnlist values ($cvid,4,'vtiger_products:unit_price:unit_price:Products_Unit_Price:V')"
 			     );
 foreach($insert_query_array18 as $query)
 {
@@ -1394,11 +1394,11 @@
 $cvid = $conn->query_result($res,0,"cvid");
 
 $insert_query_array19 = Array(
-	"insert into vtiger_cvcolumnlist values($cvid,0,'crmentity:crmid::PurchaseOrder_Order_Id:I')",
-	"insert into vtiger_cvcolumnlist values($cvid,1,'purchaseorder:subject:subject:PurchaseOrder_Subject:V')",
-	"insert into vtiger_cvcolumnlist values($cvid,2,'purchaseorder:vendorid:vendor_id:PurchaseOrder_Vendor_Name:I')",
-	"insert into vtiger_cvcolumnlist values($cvid,3,'purchaseorder:tracking_no:tracking_no:PurchaseOrder_Tracking_Number:V')",
-	"insert into vtiger_cvcolumnlist values($cvid,4,'crmentity:smownerid:assigned_user_id:PurchaseOrder_Assigned_To:V')"
+	"insert into vtiger_cvcolumnlist values($cvid,0,'vtiger_crmentity:crmid::PurchaseOrder_Order_Id:I')",
+	"insert into vtiger_cvcolumnlist values($cvid,1,'vtiger_purchaseorder:subject:subject:PurchaseOrder_Subject:V')",
+	"insert into vtiger_cvcolumnlist values($cvid,2,'vtiger_purchaseorder:vendorid:vendor_id:PurchaseOrder_Vendor_Name:I')",
+	"insert into vtiger_cvcolumnlist values($cvid,3,'vtiger_purchaseorder:tracking_no:tracking_no:PurchaseOrder_Tracking_Number:V')",
+	"insert into vtiger_cvcolumnlist values($cvid,4,'vtiger_crmentity:smownerid:assigned_user_id:PurchaseOrder_Assigned_To:V')"
 			     );
 foreach($insert_query_array19 as $query)
 {
@@ -1409,12 +1409,12 @@
 $cvid = $conn->query_result($res,0,"cvid");
 
 $insert_query_array20 = Array(
-		"insert into vtiger_cvcolumnlist values ($cvid,0,'crmentity:crmid::SalesOrder_Order_Id:I')",
-		"insert into vtiger_cvcolumnlist values ($cvid,1,'salesorder:subject:subject:SalesOrder_Subject:V')",
-		"insert into vtiger_cvcolumnlist values ($cvid,2,'account:accountid:account_id:SalesOrder_Account_Name:V')",
-		"insert into vtiger_cvcolumnlist values ($cvid,3,'quotes:quoteid:quote_id:SalesOrder_Quote_Name:I')",
-		"insert into vtiger_cvcolumnlist values ($cvid,4,'salesorder:total:hdnGrandTotal:SalesOrder_Total:V')",
-		"insert into vtiger_cvcolumnlist values ($cvid,5,'crmentity:smownerid:assigned_user_id:SalesOrder_Assigned_To:V')"
+	"insert into vtiger_cvcolumnlist values ($cvid,0,'vtiger_crmentity:crmid::SalesOrder_Order_Id:I')",
+	"insert into vtiger_cvcolumnlist values ($cvid,1,'vtiger_salesorder:subject:subject:SalesOrder_Subject:V')",
+	"insert into vtiger_cvcolumnlist values ($cvid,2,'vtiger_account:accountid:account_id:SalesOrder_Account_Name:V')",
+	"insert into vtiger_cvcolumnlist values ($cvid,3,'vtiger_quotes:quoteid:quote_id:SalesOrder_Quote_Name:I')",
+	"insert into vtiger_cvcolumnlist values ($cvid,4,'vtiger_salesorder:total:hdnGrandTotal:SalesOrder_Total:V')",
+	"insert into vtiger_cvcolumnlist values ($cvid,5,'vtiger_crmentity:smownerid:assigned_user_id:SalesOrder_Assigned_To:V')"
 			     );
 foreach($insert_query_array20 as $query)
 {
@@ -1425,10 +1425,10 @@
 $cvid = $conn->query_result($res,0,"cvid");
 
 $insert_query_array21 = Array(
-			"insert into vtiger_cvcolumnlist values ($cvid,0,'vendor:vendorname:vendorname:Vendors_Vendor_Name:V')",
-			"insert into vtiger_cvcolumnlist values ($cvid,1,'vendor:phone:phone:Vendors_Phone:V')",
-			"insert into vtiger_cvcolumnlist values ($cvid,2,'vendor:email:email:Vendors_Email:V')",
-			"insert into vtiger_cvcolumnlist values ($cvid,3,'vendor:category:category:Vendors_Category:V')"
+	"insert into vtiger_cvcolumnlist values ($cvid,0,'vtiger_vendor:vendorname:vendorname:Vendors_Vendor_Name:V')",
+	"insert into vtiger_cvcolumnlist values ($cvid,1,'vtiger_vendor:phone:phone:Vendors_Phone:V')",
+	"insert into vtiger_cvcolumnlist values ($cvid,2,'vtiger_vendor:email:email:Vendors_Email:V')",
+	"insert into vtiger_cvcolumnlist values ($cvid,3,'vtiger_vendor:category:category:Vendors_Category:V')"
 			     );
 foreach($insert_query_array21 as $query)
 {
@@ -1439,12 +1439,12 @@
 $cvid = $conn->query_result($res,0,"cvid");
 
 $insert_query_array22 = Array(
-		"insert into vtiger_cvcolumnlist values ($cvid,0,'faq:id::Faq_FAQ_Id:I')",
-		"insert into vtiger_cvcolumnlist values ($cvid,1,'faq:question:question:Faq_Question:V')",
-		"insert into vtiger_cvcolumnlist values ($cvid,2,'faq:category:faqcategories:Faq_Category:V')",
-		"insert into vtiger_cvcolumnlist values ($cvid,3,'faq:product_id:product_id:Faq_Product_Name:I')",
-		"insert into vtiger_cvcolumnlist values ($cvid,4,'crmentity:createdtime:createdtime:Faq_Created_Time:D')",
-		"insert into vtiger_cvcolumnlist values ($cvid,5,'crmentity:modifiedtime:modifiedtime:Faq_Modified_Time:D')"
+	"insert into vtiger_cvcolumnlist values ($cvid,0,'vtiger_faq:id::Faq_FAQ_Id:I')",
+	"insert into vtiger_cvcolumnlist values ($cvid,1,'vtiger_faq:question:question:Faq_Question:V')",
+	"insert into vtiger_cvcolumnlist values ($cvid,2,'vtiger_faq:category:faqcategories:Faq_Category:V')",
+	"insert into vtiger_cvcolumnlist values ($cvid,3,'vtiger_faq:product_id:product_id:Faq_Product_Name:I')",
+	"insert into vtiger_cvcolumnlist values ($cvid,4,'vtiger_crmentity:createdtime:createdtime:Faq_Created_Time:D')",
+	"insert into vtiger_cvcolumnlist values ($cvid,5,'vtiger_crmentity:modifiedtime:modifiedtime:Faq_Modified_Time:D')"
 			     );
 foreach($insert_query_array22 as $query)
 {
@@ -1453,23 +1453,23 @@
 
 
 $update_query_array3 = Array(
-				"update vtiger_field set uitype=53 where vtiger_tabid=2 and columnname='smownerid'",
-				"update vtiger_field set uitype=53 where vtiger_tabid=4 and columnname='smownerid'",
-				"update vtiger_field set uitype=53 where vtiger_tabid=20 and columnname='smownerid'",
-				"update vtiger_field set uitype=53 where vtiger_tabid=22 and columnname='smownerid'",
-				"update vtiger_field set uitype=53 where vtiger_tabid=23 and columnname='smownerid'"
+				"update vtiger_field set uitype=53 where tabid=2 and columnname='smownerid'",
+				"update vtiger_field set uitype=53 where tabid=4 and columnname='smownerid'",
+				"update vtiger_field set uitype=53 where tabid=20 and columnname='smownerid'",
+				"update vtiger_field set uitype=53 where tabid=22 and columnname='smownerid'",
+				"update vtiger_field set uitype=53 where tabid=23 and columnname='smownerid'"
 			    );
 foreach($update_query_array3 as $query)
 {
 	Execute($query);
 }
 
-$create_query6 = "CREATE TABLE vtiger_accountgrouprelation ( vtiger_accountid int(19) NOT NULL default '0', groupname varchar(100) default NULL, PRIMARY KEY  (`accountid`))";
+$create_query6 = "CREATE TABLE vtiger_accountgrouprelation ( accountid int(19) NOT NULL default '0', groupname varchar(100) default NULL, PRIMARY KEY  (`accountid`))";
 Execute($create_query6);
 
 $alter_query_array8 = Array(
-				"alter vtiger_table vtiger_accountgrouprelation ADD CONSTRAINT fk_accountgrouprelation FOREIGN KEY (accountid) REFERENCES vtiger_account(accountid) ON DELETE CASCADE",
-				"alter vtiger_table vtiger_accountgrouprelation ADD CONSTRAINT fk_accountgrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_groups(name) ON DELETE CASCADE"
+				"alter table vtiger_accountgrouprelation ADD CONSTRAINT fk_accountgrouprelation FOREIGN KEY (accountid) REFERENCES vtiger_account(accountid) ON DELETE CASCADE",
+				"alter table vtiger_accountgrouprelation ADD CONSTRAINT fk_accountgrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_groups(name) ON DELETE CASCADE"
 			   );
 foreach($alter_query_array8 as $query)
 {
@@ -1480,8 +1480,8 @@
 Execute($create_query7);
 
 $alter_query_array9 = Array(
-				"alter vtiger_table vtiger_contactgrouprelation ADD CONSTRAINT fk_contactgrouprelation FOREIGN KEY (contactid) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE",
-				"alter vtiger_table vtiger_contactgrouprelation ADD CONSTRAINT fk_contactgrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_groups(name) ON DELETE CASCADE"
+				"alter table vtiger_contactgrouprelation ADD CONSTRAINT fk_contactgrouprelation FOREIGN KEY (contactid) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE",
+				"alter table vtiger_contactgrouprelation ADD CONSTRAINT fk_contactgrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_groups(name) ON DELETE CASCADE"
 			   );
 foreach($alter_query_array9 as $query)
 {
@@ -1489,12 +1489,12 @@
 }
 
 
-$create_query10 = "CREATE TABLE vtiger_potentialgrouprelation ( vtiger_potentialid int(19) NOT NULL default '0', groupname varchar(100) default NULL, PRIMARY KEY  (`potentialid`))";
+$create_query10 = "CREATE TABLE vtiger_potentialgrouprelation ( potentialid int(19) NOT NULL default '0', groupname varchar(100) default NULL, PRIMARY KEY  (`potentialid`))";
 Execute($create_query10);
 
 $alter_query_array10 = Array(
-				"alter vtiger_table vtiger_potentialgrouprelation ADD CONSTRAINT fk_potentialgrouprelation FOREIGN KEY (potentialid) REFERENCES vtiger_potential(potentialid) ON DELETE CASCADE",
-				"alter vtiger_table vtiger_potentialgrouprelation ADD CONSTRAINT fk_potentialgrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_groups(name) ON DELETE CASCADE"
+				"alter table vtiger_potentialgrouprelation ADD CONSTRAINT fk_potentialgrouprelation FOREIGN KEY (potentialid) REFERENCES vtiger_potential(potentialid) ON DELETE CASCADE",
+				"alter table vtiger_potentialgrouprelation ADD CONSTRAINT fk_potentialgrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_groups(name) ON DELETE CASCADE"
 			    );
 foreach($alter_query_array10 as $query)
 {
@@ -1505,44 +1505,44 @@
 Execute($create_query11);
 
 $alter_query_array11 = Array(
-				"alter vtiger_table vtiger_quotegrouprelation ADD CONSTRAINT fk_quotegrouprelation FOREIGN KEY (quoteid) REFERENCES vtiger_quotes(quoteid) ON DELETE CASCADE",
-				"alter vtiger_table vtiger_quotegrouprelation ADD CONSTRAINT fk_quotegrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_groups(name) ON DELETE CASCADE"
+				"alter table vtiger_quotegrouprelation ADD CONSTRAINT fk_quotegrouprelation FOREIGN KEY (quoteid) REFERENCES vtiger_quotes(quoteid) ON DELETE CASCADE",
+				"alter table vtiger_quotegrouprelation ADD CONSTRAINT fk_quotegrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_groups(name) ON DELETE CASCADE"
 			    );
 foreach($alter_query_array11 as $query)
 {
 	Execute($query);
 }
 
-$create_query12 = "CREATE TABLE vtiger_sogrouprelation ( vtiger_salesorderid int(19) NOT NULL default '0', groupname varchar(100) default NULL, PRIMARY KEY  (`salesorderid`) )";
+$create_query12 = "CREATE TABLE vtiger_sogrouprelation ( salesorderid int(19) NOT NULL default '0', groupname varchar(100) default NULL, PRIMARY KEY  (`salesorderid`) )";
 Execute($create_query12);
 
 $alter_query_array12 = Array(
-				"alter vtiger_table vtiger_sogrouprelation ADD CONSTRAINT fk_sogrouprelation FOREIGN KEY (salesorderid) REFERENCES vtiger_salesorder(salesorderid) ON DELETE CASCADE",
-				"alter vtiger_table vtiger_sogrouprelation ADD CONSTRAINT fk_sogrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_groups(name) ON DELETE CASCADE"
+				"alter table vtiger_sogrouprelation ADD CONSTRAINT fk_sogrouprelation FOREIGN KEY (salesorderid) REFERENCES vtiger_salesorder(salesorderid) ON DELETE CASCADE",
+				"alter table vtiger_sogrouprelation ADD CONSTRAINT fk_sogrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_groups(name) ON DELETE CASCADE"
 			    );
 foreach($alter_query_array12 as $query)
 {
 	Execute($query);
 }
 
-$create_query13 = "CREATE TABLE vtiger_invoicegrouprelation ( vtiger_invoiceid int(19) NOT NULL default '0',  groupname varchar(100) default NULL,  PRIMARY KEY  (`invoiceid`))";
+$create_query13 = "CREATE TABLE vtiger_invoicegrouprelation ( invoiceid int(19) NOT NULL default '0',  groupname varchar(100) default NULL,  PRIMARY KEY  (`invoiceid`))";
 Execute($create_query13);
 
 $alter_query_array13 = Array(
-				"alter vtiger_table vtiger_invoicegrouprelation ADD CONSTRAINT fk_invoicegrouprelation FOREIGN KEY (invoiceid) REFERENCES vtiger_invoice(invoiceid) ON DELETE CASCADE",
-				"alter vtiger_table vtiger_invoicegrouprelation ADD CONSTRAINT fk_invoicegrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_groups(name) ON DELETE CASCADE"
+				"alter table vtiger_invoicegrouprelation ADD CONSTRAINT fk_invoicegrouprelation FOREIGN KEY (invoiceid) REFERENCES vtiger_invoice(invoiceid) ON DELETE CASCADE",
+				"alter table vtiger_invoicegrouprelation ADD CONSTRAINT fk_invoicegrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_groups(name) ON DELETE CASCADE"
 			    );
 foreach($alter_query_array13 as $query)
 {
 	Execute($query);
 }
 
-$create_query14 = "CREATE TABLE vtiger_pogrouprelation ( vtiger_purchaseorderid int(19) NOT NULL default '0', groupname varchar(100) default NULL, PRIMARY KEY  (`purchaseorderid`))";
+$create_query14 = "CREATE TABLE vtiger_pogrouprelation ( purchaseorderid int(19) NOT NULL default '0', groupname varchar(100) default NULL, PRIMARY KEY  (`purchaseorderid`))";
 Execute($create_query14);
 
 $alter_query_array14 = Array(
-				"alter vtiger_table vtiger_pogrouprelation ADD CONSTRAINT fk_pogrouprelation FOREIGN KEY (purchaseorderid) REFERENCES vtiger_purchaseorder(purchaseorderid) ON DELETE CASCADE",
-				"alter vtiger_table vtiger_pogrouprelation ADD CONSTRAINT fk_productgrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_groups(name) ON DELETE CASCADE"
+				"alter table vtiger_pogrouprelation ADD CONSTRAINT fk_pogrouprelation FOREIGN KEY (purchaseorderid) REFERENCES vtiger_purchaseorder(purchaseorderid) ON DELETE CASCADE",
+				"alter table vtiger_pogrouprelation ADD CONSTRAINT fk_productgrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_groups(name) ON DELETE CASCADE"
 			    );
 foreach($alter_query_array14 as $query)
 {
@@ -1558,12 +1558,12 @@
 $alter_query2 = "ALTER TABLE vtiger_products change column imagename imagename text";
 Execute($alter_query2);
 
-$alter_query3 = "alter vtiger_table vtiger_systems modify server varchar(50), modify server_username varchar(50), modify server_password varchar(50), add column smtp_auth char(5)";
+$alter_query3 = "alter table vtiger_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 vtiger_table vtiger_users add column imagename varchar(250)",
-				"alter vtiger_table vtiger_users add column tagcloud varchar(250)"
+				"alter table vtiger_users add column imagename varchar(250)",
+				"alter table vtiger_users add column tagcloud varchar(250)"
 			    );
 foreach($alter_query_array15 as $query)
 {
@@ -1571,8 +1571,8 @@
 }
 
 $alter_query_array16 = Array(
-			"alter vtiger_table vtiger_systems change column server server varchar(80) default NULL",
-			"alter vtiger_table vtiger_systems change column server_username server_username varchar(80) default NULL"
+			"alter table vtiger_systems change column server server varchar(80) default NULL",
+			"alter table vtiger_systems change column server_username server_username varchar(80) default NULL"
 			    );
 foreach($alter_query_array16 as $query)
 {
@@ -1580,62 +1580,62 @@
 }
 
 
-$create_query15 = "create vtiger_table vtiger_portal(portalid int(19), vtiger_portalname varchar(255) NOT NULL, vtiger_portalurl varchar(255) NOT NULL,sequence int(3) NOT NULL, PRIMARY KEY (portalid))";
+$create_query15 = "create table vtiger_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 = "ALTER TABLE vtiger_field ADD column info_type varchar(20) default NULL after quickcreatesequence";
 Execute($alter_query);
 
-//$update_query2 = "UPDATE vtiger_field SET vtiger_fieldlabel = 'Reference' WHERE vtiger_tabid = 4 and vtiger_tablename = 'contactdetails' and vtiger_fieldname='reference'";
-//changed in 24-04-06 because the reference has not been entered into the vtiger_field vtiger_table. 
+//$update_query2 = "UPDATE vtiger_field SET fieldlabel = 'Reference' WHERE tabid = 4 and tablename = 'contactdetails' and fieldname='reference'";
+//changed in 24-04-06 because the reference has not been entered into the vtiger_field table. 
 $update_query2 = "insert into vtiger_field values (4,".$conn->getUniqueID("field").",'reference','contactdetails',1,'56','reference','Reference',1,0,0,10,23,4,1,'C~O',1,null,'ADV')";
 Execute($update_query2);
 
 $update_query_array4 = Array(
 				"UPDATE vtiger_field SET info_type = 'BAS'",
 
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 7 and vtiger_fieldlabel = 'Website'",
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 7 and vtiger_fieldlabel = 'Industry'",
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 7 and vtiger_fieldlabel = 'Annual Revenue'",
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 7 and vtiger_fieldlabel = 'No Of Employees'",
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 7 and vtiger_fieldlabel = 'Yahoo Id'",
-
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 6 and vtiger_fieldlabel = 'Ticker Symbol'",
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 6 and vtiger_fieldlabel = 'Other Phone'",
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 6 and vtiger_fieldlabel = 'Member Of'",
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 6 and vtiger_fieldlabel = 'Employees'",
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 6 and vtiger_fieldlabel = 'Other Email'",
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 6 and vtiger_fieldlabel = 'Ownership'",
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 6 and vtiger_fieldlabel = 'Rating'",
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 6 and vtiger_fieldlabel = 'industry'",
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 6 and vtiger_fieldlabel = 'SIC Code'",
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 6 and vtiger_fieldlabel = 'Type'",
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 6 and vtiger_fieldlabel = 'Annual Revenue'",
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 6 and vtiger_fieldlabel = 'Email Opt Out'",
-
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'Home Phone'",
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'Department'",
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'Birthdate'",
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'Email'",
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'Reports To'",
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'Assistant'",
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'Yahoo Id'",
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'Assistant Phone'",
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'Do Not Call'",
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'Email Opt Out'",
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'Reference'",
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'Portal User'",
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'Support Start Date'",
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'Support End Date'",
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 4 and vtiger_fieldlabel = 'Contact Image'",
-
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 14 and vtiger_fieldlabel = 'Usage Unit'",
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 14 and vtiger_fieldlabel = 'Qty/Unit'",
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 14 and vtiger_fieldlabel = 'Qty In Stock'",
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 14 and vtiger_fieldlabel = 'Reorder Level'",
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 14 and vtiger_fieldlabel = 'Handler'",
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 14 and vtiger_fieldlabel = 'Qty In Demand'",
-				"UPDATE vtiger_field SET info_type = 'ADV' WHERE vtiger_tabid = 14 and vtiger_fieldlabel = 'Product Image'"
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 7 and fieldlabel = 'Website'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 7 and fieldlabel = 'Industry'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 7 and fieldlabel = 'Annual Revenue'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 7 and fieldlabel = 'No Of Employees'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 7 and fieldlabel = 'Yahoo Id'",
+
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 6 and fieldlabel = 'Ticker Symbol'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 6 and fieldlabel = 'Other Phone'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 6 and fieldlabel = 'Member Of'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 6 and fieldlabel = 'Employees'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 6 and fieldlabel = 'Other Email'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 6 and fieldlabel = 'Ownership'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 6 and fieldlabel = 'Rating'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 6 and fieldlabel = 'industry'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 6 and fieldlabel = 'SIC Code'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 6 and fieldlabel = 'Type'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 6 and fieldlabel = 'Annual Revenue'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 6 and fieldlabel = 'Email Opt Out'",
+
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 4 and fieldlabel = 'Home Phone'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 4 and fieldlabel = 'Department'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 4 and fieldlabel = 'Birthdate'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 4 and fieldlabel = 'Email'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 4 and fieldlabel = 'Reports To'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 4 and fieldlabel = 'Assistant'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 4 and fieldlabel = 'Yahoo Id'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 4 and fieldlabel = 'Assistant Phone'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 4 and fieldlabel = 'Do Not Call'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 4 and fieldlabel = 'Email Opt Out'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 4 and fieldlabel = 'Reference'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 4 and fieldlabel = 'Portal User'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 4 and fieldlabel = 'Support Start Date'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 4 and fieldlabel = 'Support End Date'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 4 and fieldlabel = 'Contact Image'",
+
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 14 and fieldlabel = 'Usage Unit'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 14 and fieldlabel = 'Qty/Unit'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 14 and fieldlabel = 'Qty In Stock'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 14 and fieldlabel = 'Reorder Level'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 14 and fieldlabel = 'Handler'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 14 and fieldlabel = 'Qty In Demand'",
+				"UPDATE vtiger_field SET info_type = 'ADV' WHERE tabid = 14 and fieldlabel = 'Product Image'"
 			    );
 foreach($update_query_array4 as $query)
 {
@@ -1643,15 +1643,15 @@
 }
 
 
-$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";
+$create_query16 = "CREATE TABLE vtiger_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";
+$create_query17 = "CREATE TABLE vtiger_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";
+$create_query18 = "CREATE TABLE vtiger_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";
+$create_query19 = "CREATE TABLE vtiger_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(
@@ -1673,10 +1673,10 @@
 ) TYPE=MyISAM";
 Execute($create_query21);
   
-$alter_query4 = "alter vtiger_table vtiger_profile add column description text";
+$alter_query4 = "alter table vtiger_profile add column description text";
 Execute($alter_query4);
 
-$alter_query5 = "alter vtiger_table vtiger_contactdetails add column imagename varchar(250) after vtiger_currency";
+$alter_query5 = "alter table vtiger_contactdetails add column imagename varchar(250) after currency";
 Execute($alter_query5);
 
 $alter_query = "ALTER TABLE vtiger_contactdetails ADD column reference varchar(3) default NULL after imagename";
@@ -1694,14 +1694,14 @@
 	Execute($query);
 }
 
-$alter_query6 = "alter vtiger_table vtiger_activity add column vtiger_visibility varchar(50) NOT NULL after notime";
+$alter_query6 = "alter table vtiger_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";
+$create_query22 = "CREATE TABLE vtiger_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";
+$create_query23 = "CREATE TABLE vtiger_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 vtiger_tab VALUES(26,'Campaigns',0,23,'Campaigns',null,null,1)";
@@ -1766,7 +1766,7 @@
 }
 
 $create_query24 = "
-CREATE TABLE `campaign` (
+CREATE TABLE vtiger_campaign (
    `campaignname` varchar(255) default NULL,
    `campaigntype` varchar(255) default NULL,
    `campaignstatus` varchar(255) default NULL,
@@ -1797,14 +1797,14 @@
 
 
 //Added on 06-06-06
-$create_query25 = "CREATE TABLE `campaigncontrel` (
+$create_query25 = "CREATE TABLE vtiger_campaigncontrel (
 	  `campaignid` int(19) NOT NULL default '0',
 	    `contactid` int(19) NOT NULL default '0',
 	      PRIMARY KEY  (`campaignid`),
 	        KEY `campaigncontrel_contractid_idx` (`contactid`)
 	) ENGINE=InnoDB";
 /*
-$create_query25 = "CREATE TABLE `campaigncontrel` (
+$create_query25 = "CREATE TABLE vtiger_campaigncontrel (
   `campaignid` int(19) NOT NULL default '0',
   `contactid` int(19) NOT NULL default '0',
   PRIMARY KEY  (`campaignid`),
@@ -1816,7 +1816,7 @@
 Execute($create_query25);
 
 //Added on 06-06-06
-$create_table_query = "CREATE TABLE `campaigngrouprelation` (
+$create_table_query = "CREATE TABLE vtiger_campaigngrouprelation (
 	  `campaignid` int(19) NOT NULL,
 	    `groupname` varchar(100) default NULL,
 	      PRIMARY KEY  (`campaignid`),
@@ -1824,7 +1824,7 @@
 	) ENGINE=InnoDB";
 /*
 $create_table_query = "
-CREATE TABLE `campaigngrouprelation` (
+CREATE TABLE vtiger_campaigngrouprelation (
        `campaignid` int(19) NOT NULL,
        `groupname` varchar(100) default NULL,
 	PRIMARY KEY  (`campaignid`),
@@ -1837,14 +1837,14 @@
 
 
 //Added on 06-06-06
-$create_query26 = "CREATE TABLE `campaignleadrel` (
+$create_query26 = "CREATE TABLE vtiger_campaignleadrel (
 			`campaignid` int(19) NOT NULL default '0',
 			`leadid` int(19) NOT NULL default '0',
 			PRIMARY KEY  (`campaignid`),
 			KEY `campaignleadrel_leadid_campaignid_idx` (`leadid`,`campaignid`)
 		   ) ENGINE=InnoDB";
 /*
-$create_query26 = "CREATE TABLE `campaignleadrel` (
+$create_query26 = "CREATE TABLE vtiger_campaignleadrel (
   `campaignid` int(19) NOT NULL default '0',
   `leadid` int(19) NOT NULL default '0',
   PRIMARY KEY  (`campaignid`),
@@ -1855,7 +1855,7 @@
 */
 Execute($create_query26);
 
-$create_table_query1 = "CREATE TABLE `campaignscf` (
+$create_table_query1 = "CREATE TABLE vtiger_campaignscf (
   `campaignid` int(19) NOT NULL default '0',
    PRIMARY KEY  (`campaignid`),
    CONSTRAINT `fk_CampaignsCF` FOREIGN KEY (`campaignid`) REFERENCES `campaign` (`campaignid`) ON DELETE CASCADE
@@ -1863,11 +1863,11 @@
 Execute($create_table_query1);
 
 $alter_query_array18 = Array(
-				"alter vtiger_table vtiger_leaddetails add column vtiger_campaignid int(19) default NULL after leadid",
-				"alter vtiger_table vtiger_contactdetails add column  vtiger_campaignid int(19) default NULL after vtiger_accountid",
-				//"alter vtiger_table vtiger_notes drop PRIMARY KEY contact_id",
-				"alter vtiger_table vtiger_notes drop PRIMARY KEY , add primary key(notesid)",
-				"update vtiger_field set uitype=99 where vtiger_fieldname='update_log' and vtiger_tabid=13"
+			"alter table vtiger_leaddetails add column campaignid int(19) default NULL after leadid",
+			"alter table vtiger_contactdetails add column  campaignid int(19) default NULL after accountid",
+			//"alter table vtiger_notes drop PRIMARY KEY contact_id",
+			"alter table vtiger_notes drop PRIMARY KEY , add primary key(notesid)",
+			"update vtiger_field set uitype=99 where fieldname='update_log' and tabid=13"
 			    );
 foreach($alter_query_array18 as $query)
 {
@@ -1876,8 +1876,8 @@
 
 
 
-//echo "<br><br><b>Database Modifications for Indexing and some missded vtiger_tables starts here.....</b><br>";
-//Added queries which are for indexing and the missing vtiger_tables - Mickie - on 06-04-2006
+//echo "<br><br><b>Database Modifications for Indexing and some missded tables starts here.....</b><br>";
+//Added queries which are for indexing and the missing tables - Mickie - on 06-04-2006
 
 $query_array = Array(
 
@@ -1989,7 +1989,7 @@
 "ALTER TABLE `users_seq` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED",
 "ALTER TABLE `wordtemplates` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC",
 
-"CREATE TABLE `actualcost` (
+"CREATE TABLE vtiger_actualcost (
   `actualcostid` int(19) NOT NULL auto_increment,
   `actualcost` varchar(200) NOT NULL,
   `sortorderid` int(19) NOT NULL default '0',
@@ -1998,7 +1998,7 @@
   UNIQUE KEY `CampaignActCst_UK01` (`actualcost`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1",
 
-"CREATE TABLE `campaignstatus` (
+"CREATE TABLE vtiger_campaignstatus (
   `campaignstatusid` int(19) NOT NULL auto_increment,
   `campaignstatus` varchar(200) NOT NULL,
   `sortorderid` int(19) NOT NULL default '0',
@@ -2007,7 +2007,7 @@
   KEY `Campaignstatus_UK01` (`campaignstatus`)
 ) ENGINE=InnoDB",
 
-"CREATE TABLE `campaigntype` (
+"CREATE TABLE vtiger_campaigntype (
   `campaigntypeid` int(19) NOT NULL auto_increment,
   `campaigntype` varchar(200) NOT NULL,
   `sortorderid` int(19) NOT NULL default '0',
@@ -2016,11 +2016,11 @@
   UNIQUE KEY `Campaigntype_UK01` (`campaigntype`)
 ) ENGINE=InnoDB",
 
-"CREATE TABLE `currency_info_seq` (
+"CREATE TABLE vtiger_currency_info_seq (
   `id` int(11) NOT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1",
 
-"CREATE TABLE `datashare_module_rel` (
+"CREATE TABLE vtiger_datashare_module_rel (
   `shareid` int(19) NOT NULL,
   `tabid` int(19) NOT NULL,
   `relationtype` varchar(200) default NULL,
@@ -2029,7 +2029,7 @@
 ) ENGINE=InnoDB",
 
 //Added on 06-06-06
-"CREATE TABLE `datashare_grp2grp` (
+"CREATE TABLE vtiger_datashare_grp2grp (
 	  `shareid` int(19) NOT NULL,
 	    `share_groupid` int(19) default NULL,
 	      `to_groupid` int(19) default NULL,
@@ -2039,7 +2039,7 @@
 		      KEY `datashare_grp2grp_to_groupid_idx` (`to_groupid`)
 	      ) ENGINE=InnoDB",
 /*
-"CREATE TABLE `datashare_grp2grp` (
+"CREATE TABLE vtiger_datashare_grp2grp (
   `shareid` int(19) NOT NULL,
   `share_groupid` int(19) default NULL,
   `to_groupid` int(19) default NULL,
@@ -2053,7 +2053,7 @@
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1",
 */
 
-"CREATE TABLE `datashare_grp2role` (
+"CREATE TABLE vtiger_datashare_grp2role (
 	  `shareid` int(19) NOT NULL,
 	    `share_groupid` int(19) default NULL,
 	      `to_roleid` varchar(255) default NULL,
@@ -2063,7 +2063,7 @@
 		      KEY `idx_datashare_grp2role_to_roleid` (`to_roleid`)
 	      ) ENGINE=InnoDB",
 /*
-"CREATE TABLE `datashare_grp2role` (
+"CREATE TABLE vtiger_datashare_grp2role (
   `shareid` int(19) NOT NULL,
   `share_groupid` int(19) default NULL,
   `to_roleid` varchar(255) default NULL,
@@ -2078,7 +2078,7 @@
 */
 
 //Added on 06-06-06
-"CREATE TABLE `datashare_grp2rs` (
+"CREATE TABLE vtiger_datashare_grp2rs (
 	  `shareid` int(19) NOT NULL,
 	    `share_groupid` int(19) default NULL,
 	      `to_roleandsubid` varchar(255) default NULL,
@@ -2088,7 +2088,7 @@
 		      KEY `datashare_grp2rs_to_roleandsubid_idx` (`to_roleandsubid`)
 	      ) ENGINE=InnoDB",
 /*
-"CREATE TABLE `datashare_grp2rs` (
+"CREATE TABLE vtiger_datashare_grp2rs (
   `shareid` int(19) NOT NULL,
   `share_groupid` int(19) default NULL,
   `to_roleandsubid` varchar(255) default NULL,
@@ -2102,7 +2102,7 @@
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1",
 */
 
-"CREATE TABLE `datashare_relatedmodule_permission` (
+"CREATE TABLE vtiger_datashare_relatedmodule_permission (
   `shareid` int(19) NOT NULL,
   `datashare_relatedmodule_id` int(19) NOT NULL,
   `permission` int(19) default NULL,
@@ -2111,7 +2111,7 @@
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1",
 
 //Added on 06-06-06
-"CREATE TABLE `datashare_relatedmodules` (
+"CREATE TABLE vtiger_datashare_relatedmodules (
 	  `datashare_relatedmodule_id` int(19) NOT NULL,
 	    `tabid` int(19) default NULL,
 	      `relatedto_tabid` int(19) default NULL,
@@ -2120,7 +2120,7 @@
 		    KEY `datashare_relatedmodules_relatedto_tabid_idx` (`relatedto_tabid`)
 	    ) ENGINE=InnoDB",
 /*
-"CREATE TABLE `datashare_relatedmodules` (
+"CREATE TABLE vtiger_datashare_relatedmodules (
   `datashare_relatedmodule_id` int(19) NOT NULL,
   `tabid` int(19) default NULL,
   `relatedto_tabid` int(19) default NULL,
@@ -2132,12 +2132,12 @@
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1",
 */
 
-"CREATE TABLE `datashare_relatedmodules_seq` (
+"CREATE TABLE vtiger_datashare_relatedmodules_seq (
   `id` int(11) NOT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1",
 
 //Added on 06-06-06
-"CREATE TABLE `datashare_role2group` (
+"CREATE TABLE vtiger_datashare_role2group (
 	  `shareid` int(19) NOT NULL,
 	    `share_roleid` varchar(255) default NULL,
 	      `to_groupid` int(19) default NULL,
@@ -2147,7 +2147,7 @@
 		      KEY `idx_datashare_role2group_to_groupid` (`to_groupid`)
 	      ) ENGINE=InnoDB",
 /*
-"CREATE TABLE `datashare_role2group` (
+"CREATE TABLE vtiger_datashare_role2group (
   `shareid` int(19) NOT NULL,
   `share_roleid` varchar(255) default NULL,
   `to_groupid` int(19) default NULL,
@@ -2162,7 +2162,7 @@
 */
 
 //Added on 06-06-06
-"CREATE TABLE `datashare_role2role` (
+"CREATE TABLE vtiger_datashare_role2role (
 	  `shareid` int(19) NOT NULL,
 	    `share_roleid` varchar(255) default NULL,
 	      `to_roleid` varchar(255) default NULL,
@@ -2172,7 +2172,7 @@
 		      KEY `datashare_role2role_to_roleid_idx` (`to_roleid`)
 	      ) ENGINE=InnoDB",
 /*
-"CREATE TABLE `datashare_role2role` (
+"CREATE TABLE vtiger_datashare_role2role (
   `shareid` int(19) NOT NULL,
   `share_roleid` varchar(255) default NULL,
   `to_roleid` varchar(255) default NULL,
@@ -2187,7 +2187,7 @@
 */
 
 //Added on 06-06-06
-"CREATE TABLE `datashare_role2rs` (
+"CREATE TABLE vtiger_datashare_role2rs (
 	  `shareid` int(19) NOT NULL,
 	    `share_roleid` varchar(255) default NULL,
 	      `to_roleandsubid` varchar(255) default NULL,
@@ -2197,7 +2197,7 @@
 		      KEY `datashare_role2s_to_roleandsubid_idx` (`to_roleandsubid`)
 	      ) ENGINE=InnoDB",
 /*
-"CREATE TABLE `datashare_role2rs` (
+"CREATE TABLE vtiger_datashare_role2rs (
   `shareid` int(19) NOT NULL,
   `share_roleid` varchar(255) default NULL,
   `to_roleandsubid` varchar(255) default NULL,
@@ -2211,7 +2211,7 @@
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1",
 */
 
-"CREATE TABLE `datashare_rs2grp` (
+"CREATE TABLE vtiger_datashare_rs2grp (
   `shareid` int(19) NOT NULL,
   `share_roleandsubid` varchar(255) default NULL,
   `to_groupid` int(19) default NULL,
@@ -2221,7 +2221,7 @@
   KEY `datashare_rs2grp_to_groupid_idx` (`to_groupid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1",
 
-"CREATE TABLE `datashare_rs2role` (
+"CREATE TABLE vtiger_datashare_rs2role (
   `shareid` int(19) NOT NULL,
   `share_roleandsubid` varchar(255) default NULL,
   `to_roleid` varchar(255) default NULL,
@@ -2231,7 +2231,7 @@
   KEY `datashare_rs2role_to_roleid_idx` (`to_roleid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1",
 
-"CREATE TABLE `datashare_rs2rs` (
+"CREATE TABLE vtiger_datashare_rs2rs (
   `shareid` int(19) NOT NULL,
   `share_roleandsubid` varchar(255) default NULL,
   `to_roleandsubid` varchar(255) default NULL,
@@ -2241,7 +2241,7 @@
   KEY `idx_datashare_rs2rs_to_roleandsubid_idx` (`to_roleandsubid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1",
 
-"CREATE TABLE `expectedresponse` (
+"CREATE TABLE vtiger_expectedresponse (
   `expectedresponseid` int(19) NOT NULL auto_increment,
   `expectedresponse` varchar(200) NOT NULL,
   `sortorderid` int(19) NOT NULL default '0',
@@ -2250,7 +2250,7 @@
   UNIQUE KEY `CampaignExpRes_UK01` (`expectedresponse`)
 ) ENGINE=InnoDB",
 
-"CREATE TABLE `expectedrevenue` (
+"CREATE TABLE vtiger_expectedrevenue (
   `expectedrevenueid` int(19) NOT NULL auto_increment,
   `expectedrevenue` varchar(200) NOT NULL,
   `sortorderid` int(19) NOT NULL default '0',
@@ -2259,7 +2259,7 @@
   UNIQUE KEY `CampaignExpRev_UK01` (`expectedrevenue`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1",
 
-"CREATE TABLE `tmp_read_group_rel_sharing_per` (
+"CREATE TABLE vtiger_tmp_read_group_rel_sharing_per (
   `userid` int(11) NOT NULL,
   `tabid` int(11) NOT NULL,
   `relatedtabid` int(11) NOT NULL,
@@ -2268,7 +2268,7 @@
   KEY `tmp_read_group_rel_sharing_per_userid_sharedgroupid_tabid` (`userid`,`sharedgroupid`,`tabid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1",
 
-"CREATE TABLE `tmp_read_group_sharing_per` (
+"CREATE TABLE vtiger_tmp_read_group_sharing_per (
   `userid` int(11) NOT NULL,
   `tabid` int(11) NOT NULL,
   `sharedgroupid` int(11) NOT NULL,
@@ -2276,7 +2276,7 @@
   KEY `tmp_read_group_sharing_per_userid_sharedgroupid_idx` (`userid`,`sharedgroupid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1",
 
-"CREATE TABLE `tmp_read_user_rel_sharing_per` (
+"CREATE TABLE vtiger_tmp_read_user_rel_sharing_per (
   `userid` int(11) NOT NULL,
   `tabid` int(11) NOT NULL,
   `relatedtabid` int(11) NOT NULL,
@@ -2285,7 +2285,7 @@
   KEY `tmp_read_user_rel_sharing_per_userid_shared_reltabid_idx` (`userid`,`shareduserid`,`relatedtabid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1",
 
-"CREATE TABLE `tmp_read_user_sharing_per` (
+"CREATE TABLE vtiger_tmp_read_user_sharing_per (
   `userid` int(11) NOT NULL,
   `tabid` int(11) NOT NULL,
   `shareduserid` int(11) NOT NULL,
@@ -2293,7 +2293,7 @@
   KEY `tmp_read_user_sharing_per_userid_shareduserid_idx` (`userid`,`shareduserid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1",
 
-"CREATE TABLE `tmp_write_group_rel_sharing_per` (
+"CREATE TABLE vtiger_tmp_write_group_rel_sharing_per (
   `userid` int(11) NOT NULL,
   `tabid` int(11) NOT NULL,
   `relatedtabid` int(11) NOT NULL,
@@ -2302,7 +2302,7 @@
   KEY `tmp_write_group_rel_sharing_per_userid_sharedgroupid_tabid_idx` (`userid`,`sharedgroupid`,`tabid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1",
 
-"CREATE TABLE `tmp_write_group_sharing_per` (
+"CREATE TABLE vtiger_tmp_write_group_sharing_per (
   `userid` int(11) NOT NULL,
   `tabid` int(11) NOT NULL,
   `sharedgroupid` int(11) NOT NULL,
@@ -2310,7 +2310,7 @@
   KEY `tmp_write_group_sharing_per_UK1` (`userid`,`sharedgroupid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1",
 
-"CREATE TABLE `tmp_write_user_rel_sharing_per` (
+"CREATE TABLE vtiger_tmp_write_user_rel_sharing_per (
   `userid` int(11) NOT NULL,
   `tabid` int(11) NOT NULL,
   `relatedtabid` int(11) NOT NULL,
@@ -2319,7 +2319,7 @@
   KEY `tmp_write_user_rel_sharing_per_userid_sharduserid_tabid_idx` (`userid`,`shareduserid`,`tabid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1",
 
-"CREATE TABLE `tmp_write_user_sharing_per` (
+"CREATE TABLE vtiger_tmp_write_user_sharing_per (
   `userid` int(11) NOT NULL,
   `tabid` int(11) NOT NULL,
   `shareduserid` int(11) NOT NULL,
@@ -2669,18 +2669,18 @@
 
 //Added on 22-04-06 - to add the Notify Owner vtiger_field in Contacts and Accounts
 $notify_owner_array = Array(
-	"update vtiger_field set sequence=26 where vtiger_tabid=4 and vtiger_fieldname='modifiedtime'",
-	"update vtiger_field set sequence=25 where vtiger_tabid=4 and vtiger_fieldname='createdtime'",
+	"update vtiger_field set sequence=26 where tabid=4 and fieldname='modifiedtime'",
+	"update vtiger_field set sequence=25 where tabid=4 and fieldname='createdtime'",
 	
 	"insert into vtiger_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 vtiger_table vtiger_contactdetails add column notify_owner varchar(3) default 0 after reference",
-
-	"update vtiger_field set sequence=21 where vtiger_tabid=6 and vtiger_fieldname='modifiedtime'",
-	"update vtiger_field set sequence=20 where vtiger_tabid=6 and vtiger_fieldname='createdtime'",
-	"update vtiger_field set sequence=19 where vtiger_tabid=6 and vtiger_fieldname='assigned_user_id'",
+	"alter table vtiger_contactdetails add column notify_owner varchar(3) default 0 after reference",
+
+	"update vtiger_field set sequence=21 where tabid=6 and fieldname='modifiedtime'",
+	"update vtiger_field set sequence=20 where tabid=6 and fieldname='createdtime'",
+	"update vtiger_field set sequence=19 where tabid=6 and fieldname='assigned_user_id'",
 	
 	"insert into vtiger_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 vtiger_table vtiger_account add column notify_owner varchar(3) default 0 after emailoptout"
+	"alter table vtiger_account add column notify_owner varchar(3) default 0 after emailoptout"
 			   );
 foreach($notify_owner_array as $query)
 {
@@ -2693,12 +2693,12 @@
 
 //Quick Create Feature added for Vendor & PriceBook
 $quickcreate_query = Array(
-	"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 1 WHERE vtiger_tabid = 18 and vtiger_fieldname = 'vendorname'",
-	"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 2 WHERE vtiger_tabid = 18 and vtiger_fieldname = 'phone'",
-	"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 3 WHERE vtiger_tabid = 18 and vtiger_fieldname = 'email'",
-
-	"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 1 WHERE vtiger_tabid = 19 and vtiger_fieldname = 'bookname'",
-	"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 2 WHERE vtiger_tabid = 19 and vtiger_fieldname = 'active'"
+	"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 1 WHERE tabid = 18 and fieldname = 'vendorname'",
+	"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 2 WHERE tabid = 18 and fieldname = 'phone'",
+	"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 3 WHERE tabid = 18 and fieldname = 'email'",
+
+	"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 1 WHERE tabid = 19 and fieldname = 'bookname'",
+	"UPDATE vtiger_field SET quickcreate = 0,quickcreatesequence = 2 WHERE tabid = 19 and fieldname = 'active'"
 			  );
 foreach($quickcreate_query as $query)
 {
@@ -2711,12 +2711,12 @@
 $cvid2 = $conn->getUniqueID("customview");
 $customview_query_array = Array(
 	"insert into vtiger_customview(cvid,viewname,setdefault,setmetrics,entitytype) values(".$cvid1.",'All',1,0,'Campaigns')",
-	"insert into vtiger_cvcolumnlist (cvid,columnindex,columnname) values (".$cvid1.",0,'campaign:campaignname:campaignname:Campaigns_Campaign_Name:V')",
-	"insert into vtiger_cvcolumnlist (cvid,columnindex,columnname) values (".$cvid1.",1,'campaign:campaigntype:campaigntype:Campaigns_Campaign_Type:N')",
-	"insert into vtiger_cvcolumnlist (cvid,columnindex,columnname) values (".$cvid1.",2,'campaign:campaignstatus:campaignstatus:Campaigns_Campaign_Status:N')",
-	"insert into vtiger_cvcolumnlist (cvid,columnindex,columnname) values (".$cvid1.",3,'campaign:expectedrevenue:expectedrevenue:Campaigns_Expected_Revenue:V')",
-	"insert into vtiger_cvcolumnlist (cvid,columnindex,columnname) values (".$cvid1.",4,'campaign:closingdate:closingdate:Campaigns_Expected_Close_Date:D')",
-	"insert into vtiger_cvcolumnlist (cvid,columnindex,columnname) values (".$cvid1.",5,'crmentity:smownerid:assigned_user_id:Campaigns_Assigned_To:V')",
+	"insert into vtiger_cvcolumnlist (cvid,columnindex,columnname) values (".$cvid1.",0,'vtiger_campaign:campaignname:campaignname:Campaigns_Campaign_Name:V')",
+	"insert into vtiger_cvcolumnlist (cvid,columnindex,columnname) values (".$cvid1.",1,'vtiger_campaign:campaigntype:campaigntype:Campaigns_Campaign_Type:N')",
+	"insert into vtiger_cvcolumnlist (cvid,columnindex,columnname) values (".$cvid1.",2,'vtiger_campaign:campaignstatus:campaignstatus:Campaigns_Campaign_Status:N')",
+	"insert into vtiger_cvcolumnlist (cvid,columnindex,columnname) values (".$cvid1.",3,'vtiger_campaign:expectedrevenue:expectedrevenue:Campaigns_Expected_Revenue:V')",
+	"insert into vtiger_cvcolumnlist (cvid,columnindex,columnname) values (".$cvid1.",4,'vtiger_campaign:closingdate:closingdate:Campaigns_Expected_Close_Date:D')",
+	"insert into vtiger_cvcolumnlist (cvid,columnindex,columnname) values (".$cvid1.",5,'vtiger_crmentity:smownerid:assigned_user_id:Campaigns_Assigned_To:V')",
 
 
 	"insert into vtiger_customview(cvid,viewname,setdefault,setmetrics,entitytype) values(".$cvid2.",'All',1,0,'Webmails')",
@@ -2735,20 +2735,20 @@
 $query_array2 = Array(
 				"INSERT INTO vtiger_parenttabrel VALUES(2,4,2)",
 				"INSERT INTO vtiger_parenttabrel VALUES(2,6,3)",
-				"update vtiger_cvcolumnlist set columnname ='crmentity:smownerid:assigned_user_id:Emails_Sender:V' where cvid=20 and columnindex=3",
-				"update vtiger_field set sequence = 2 where columnname='filename' and vtiger_tablename = 'attachments'",
-				"delete from vtiger_cvcolumnlist where columnname = 'seactivityrel:crmid:parent_id:Emails_Related_To:I'",
+				"update vtiger_cvcolumnlist set columnname ='vtiger_crmentity:smownerid:assigned_user_id:Emails_Sender:V' where cvid=20 and columnindex=3",
+				"update vtiger_field set sequence = 2 where columnname='filename' and tablename = 'vtiger_attachments'",
+				"delete from vtiger_cvcolumnlist where columnname = 'vtiger_seactivityrel:crmid:parent_id:Emails_Related_To:I'",
 				"update vtiger_cvcolumnlist set columnindex = 1 where cvid=3 and columnindex=3",
-				"update vtiger_field set info_type='ADV' where vtiger_tabid=18 and columnname in ('street','pobox','city','state','postalcode','country','description')",
-				"update vtiger_field set info_type='ADV' where vtiger_tabid in (20,21,22,23) and columnname in ('description','terms_conditions')",
-
-				"create vtiger_table vtiger_inventorytaxinfo (taxid int(3) NOT NULL auto_increment, taxname varchar(50) default NULL, percentage decimal(7,3) default NULL,  PRIMARY KEY  (taxid), KEY vtiger_inventorytaxinfo_taxname_idx (taxname))",
-				"create vtiger_table vtiger_producttaxrel ( productid int(11) NOT NULL, taxid int(3) NOT NULL, taxpercentage decimal(7,3) default NULL, KEY vtiger_producttaxrel_productid_idx (productid), KEY vtiger_producttaxrel_taxid_idx (taxid))",
+				"update vtiger_field set info_type='ADV' where tabid=18 and columnname in ('street','pobox','city','state','postalcode','country','description')",
+				"update vtiger_field set info_type='ADV' where tabid in (20,21,22,23) and columnname in ('description','terms_conditions')",
+
+				"create table vtiger_inventorytaxinfo (taxid int(3) NOT NULL auto_increment, taxname varchar(50) default NULL, percentage decimal(7,3) default NULL,  PRIMARY KEY  (taxid), KEY vtiger_inventorytaxinfo_taxname_idx (taxname))",
+				"create table vtiger_producttaxrel ( productid int(11) NOT NULL, taxid int(3) NOT NULL, taxpercentage decimal(7,3) default NULL, KEY vtiger_producttaxrel_productid_idx (productid), KEY vtiger_producttaxrel_taxid_idx (taxid))",
 
 				"insert into vtiger_inventorytaxinfo values(".$conn->getUniqueID("inventorytaxinfo").",'VAT','4.5')",
 				"insert into vtiger_inventorytaxinfo values(".$conn->getUniqueID("inventorytaxinfo").",'Sales','10')",
 				"insert into vtiger_inventorytaxinfo values(".$conn->getUniqueID("inventorytaxinfo").",'Service','12.5')",
-				"update vtiger_field set uitype=83, vtiger_tablename='producttaxrel' where vtiger_tabid=14 and vtiger_fieldname='taxclass'",
+				"update vtiger_field set uitype=83, tablename='producttaxrel' where tabid=14 and fieldname='taxclass'",
 				"insert into vtiger_moduleowners values(".$this->localGetTabID('Campaigns').",1)",
 
 				"alter table vtiger_attachments add column path varchar(255) default NULL"
@@ -2842,10 +2842,10 @@
 
 }
 
-$update_query3 = "update vtiger_currency_info set conversion_rate=1, vtiger_currency_status='Active', defaultid='-11' where id=1";
+$update_query3 = "update vtiger_currency_info set conversion_rate=1, currency_status='Active', defaultid='-11' where id=1";
 Execute($update_query3);
 
-$update_query4 = "update vtiger_relatedlists set label='Purchase Order' where vtiger_tabid=18 and name='get_purchase_orders'";
+$update_query4 = "update vtiger_relatedlists set label='Purchase Order' where tabid=18 and name='get_purchase_orders'";
 Execute($update_query4);
 
 
@@ -2880,12 +2880,12 @@
 
 
 $obj_array = Array('Leads'=>'leaddetails','Contacts'=>'contactdetails');
-$leadfieldid = $conn->query_result($conn->query("select vtiger_fieldid from vtiger_field where vtiger_tabid=7 and vtiger_fieldname='email'"),0,'fieldid');
-$contactfieldid = $conn->query_result($conn->query("select vtiger_fieldid from vtiger_field where vtiger_tabid=4 and vtiger_fieldname='email'"),0,'fieldid');
+$leadfieldid = $conn->query_result($conn->query("select fieldid from vtiger_field where tabid=7 and fieldname='email'"),0,'fieldid');
+$contactfieldid = $conn->query_result($conn->query("select fieldid from vtiger_field where tabid=4 and fieldname='email'"),0,'fieldid');
 $fieldid_array = Array("Leads"=>"$leadfieldid","Contacts"=>"$contactfieldid");
 $idname_array = Array("Leads"=>"leadid","Contacts"=>"contactid");
 
-$query = 'select * from vtiger_seactivityrel where vtiger_activityid in (select vtiger_activityid from vtiger_activity where vtiger_activitytype="Emails")';
+$query = 'select * from vtiger_seactivityrel where activityid in (select activityid from vtiger_activity where activitytype="Emails")';
 $result = $conn->query($query);
 $numofrows = $conn->num_rows($result);
 
@@ -2907,7 +2907,7 @@
 		$result2 = $conn->query("select lastname, firstname, email from $obj_array[$module] where $idname_array[$module] = $parentid");
 		$toemail = $conn->query_result($result2,0,'lastname').' '.$conn->query_result($result2,0,'firstname').'<'.$conn->query_result($result2,0,'email').'>###';
 
-		//insert this idlists and toemail values in vtiger_emaildetails vtiger_table
+		//insert this idlists and toemail values in vtiger_emaildetails table
 		$sql = "insert into vtiger_emaildetails values ($emailid,'',\"$toemail\",'','','',\"$idlists\",'SAVE')";
 		Execute($sql);
 	}
@@ -2917,25 +2917,25 @@
 	}
 }
 
-$update_query5 = "update vtiger_field set quickcreate=1, quickcreatesequence=NULL where vtiger_tabid in (10,14)";
+$update_query5 = "update vtiger_field set quickcreate=1, quickcreatesequence=NULL where tabid in (10,14)";
 Execute($update_query5);
 
 $alter_query_array18 = Array(
-				"alter vtiger_table vtiger_soproductrel add column vattax decimal(7,3) default NULL",
-				"alter vtiger_table vtiger_soproductrel add column salestax decimal(7,3) default NULL",
-				"alter vtiger_table vtiger_soproductrel add column servicetax decimal(7,3) default NULL",
+				"alter table vtiger_soproductrel add column vattax decimal(7,3) default NULL",
+				"alter table vtiger_soproductrel add column salestax decimal(7,3) default NULL",
+				"alter table vtiger_soproductrel add column servicetax decimal(7,3) default NULL",
 				
-				"alter vtiger_table vtiger_poproductrel add column vattax decimal(7,3) default NULL",
-				"alter vtiger_table vtiger_poproductrel add column salestax decimal(7,3) default NULL",
-				"alter vtiger_table vtiger_poproductrel add column servicetax decimal(7,3) default NULL",
+				"alter table vtiger_poproductrel add column vattax decimal(7,3) default NULL",
+				"alter table vtiger_poproductrel add column salestax decimal(7,3) default NULL",
+				"alter table vtiger_poproductrel add column servicetax decimal(7,3) default NULL",
 				
-				"alter vtiger_table vtiger_quotesproductrel add column vattax decimal(7,3) default NULL",
-				"alter vtiger_table vtiger_quotesproductrel add column salestax decimal(7,3) default NULL",
-				"alter vtiger_table vtiger_quotesproductrel add column servicetax decimal(7,3) default NULL",
+				"alter table vtiger_quotesproductrel add column vattax decimal(7,3) default NULL",
+				"alter table vtiger_quotesproductrel add column salestax decimal(7,3) default NULL",
+				"alter table vtiger_quotesproductrel add column servicetax decimal(7,3) default NULL",
 				
-				"alter vtiger_table vtiger_invoiceproductrel add column vattax decimal(7,3) default NULL",
-				"alter vtiger_table vtiger_invoiceproductrel add column salestax decimal(7,3) default NULL",
-				"alter vtiger_table vtiger_invoiceproductrel add column servicetax decimal(7,3) default NULL",
+				"alter table vtiger_invoiceproductrel add column vattax decimal(7,3) default NULL",
+				"alter table vtiger_invoiceproductrel add column salestax decimal(7,3) default NULL",
+				"alter table vtiger_invoiceproductrel add column servicetax decimal(7,3) default NULL",
 			    );
 foreach($alter_query_array18 as $query)
 {
@@ -2944,8 +2944,8 @@
 
 
 
-//Security vtiger_profile and vtiger_tab vtiger_table handling by DON starts
-$sql_sec="select vtiger_profileid from  vtiger_profile";
+//Security vtiger_profile and vtiger_tab table handling by DON starts
+$sql_sec="select profileid from  vtiger_profile";
 $result_sec=$conn->query($sql_sec);
 $num_rows=$conn->num_rows($result_sec);
 for($i=0;$i<$num_row;$i++)
@@ -2980,18 +2980,18 @@
 
 }
 
-//Inserting into vtiger_tab vtiger_tables
+//Inserting into vtiger_tab tables
 $sec2="INSERT INTO vtiger_tab VALUES (27,'Portal',0,24,'Portal',null,null,1)";
 $sec3="INSERT INTO vtiger_tab VALUES (28,'Webmails',0,25,'Webmails',null,null,1)";
 
-//Insert into vtiger_def_org_share vtiger_tables
+//Insert into vtiger_def_org_share tables
 $sec4="insert into vtiger_def_org_share values (".$conn->getUniqueID('def_org_share').",26,2,0)";	
 
 Execute($sec2);
 Execute($sec3);
 Execute($sec4);
 
-//Inserting into datashare related modules vtiger_table
+//Inserting into datashare related modules table
 
 Execute("insert into vtiger_datashare_relatedmodules_seq values(1)");
 	
@@ -3021,14 +3021,14 @@
 //By Don Ends
 
 //Added the vtiger_tabel vtiger_mail_accounts which has been added by mmbrich
-$alter_query18 = "alter vtiger_table vtiger_mail_accounts add column int_mailer int(1) default '0'";
+$alter_query18 = "alter table vtiger_mail_accounts add column int_mailer int(1) default '0'";
 Execute($alter_query18);
 
 $update_query_array5 = Array(
-	"update vtiger_field set info_type='BAS' where vtiger_tabid=6 and vtiger_fieldname in ('tickersymbol','account_id')",
-	"update vtiger_relatedlists set label = 'Activity History' where vtiger_tabid in (4,6,7,20,21,22,23) and label = 'History'",
-	"update vtiger_relatedlists set label = 'Products' where vtiger_tabid=2 and name='get_products' and label='History'",
-	"update vtiger_relatedlists set label = 'Activity History' where vtiger_tabid=2 and name='get_history' and label='History'"
+	"update vtiger_field set info_type='BAS' where tabid=6 and fieldname in ('tickersymbol','account_id')",
+	"update vtiger_relatedlists set label = 'Activity History' where tabid in (4,6,7,20,21,22,23) and label = 'History'",
+	"update vtiger_relatedlists set label = 'Products' where tabid=2 and name='get_products' and label='History'",
+	"update vtiger_relatedlists set label = 'Activity History' where tabid=2 and name='get_history' and label='History'"
 			    );
 foreach($update_query_array5 as $query)
 {
@@ -3172,14 +3172,14 @@
 		alert("Currency Changes has been made Successfully");
 	}
 
-	if(!confirm("Are you using Dollar $ as Currency? \n Click OK to remain as $, Cancel to change the vtiger_currency conversion rate."))
+	if(!confirm("Are you using Dollar $ as Currency? \n Click OK to remain as $, Cancel to change the currency conversion rate."))
 	{
 		getConversionRate('');
 	}
 
 	function getConversionRate(err)
 	{
-		var crate = prompt(err+"\nPlease enter the conversion rate of your vtiger_currency");
+		var crate = prompt(err+"\nPlease enter the conversion rate of your currency");
 
 		if(crate != 0 && crate > 0)
 		{
@@ -3227,8 +3227,8 @@
 	}
 }
 
-//Added on 23-12-2005 which is used to populate the vtiger_profile2field and vtiger_def_org_field vtiger_table entries for the vtiger_field per vtiger_tab
-//if we enter a vtiger_field in vtiger_field vtiger_table then we must populate that vtiger_field in these vtiger_table for security access
+//Added on 23-12-2005 which is used to populate the vtiger_profile2field and vtiger_def_org_field table entries for the field per tab
+//if we enter a vtiger_field in vtiger_field table then we must populate that vtiger_field in these table for security access
 function populateFieldForSecurity($tabid,$fieldid)
 {
 	global $conn;




From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 22 10:26:44 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 22 Jun 2006 14:26:44 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231316=3A?=
 =?utf-8?q?_Problem_in_VCRM_4=2E2=2E4?=
In-Reply-To: <076.bd13c28908a052328e19e2f345da9f18@vtiger.fosslabs.com>
References: <076.bd13c28908a052328e19e2f345da9f18@vtiger.fosslabs.com>
Message-ID: <085.3c3909efe6c8b8e4a44c193bee04fc64@vtiger.fosslabs.com>

#1316: Problem in VCRM 4.2.4
------------------------+---------------------------------------------------
  Reporter:  Simon      |       Owner:  developer                
      Type:  defect     |      Status:  new                      
  Priority:  major      |   Milestone:  4.2.4                    
 Component:  vtigercrm  |     Version:                           
Resolution:             |    Keywords:  email, quote, sales order
------------------------+---------------------------------------------------
Comment (by machaven at gmail.com):

 Found same problem in vtiger 5 beta.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1316>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 22 11:28:09 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 22 Jun 2006 15:28:09 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7433 - in /vtigercrm/trunk:
 Smarty/templates/FieldAccess.tpl
 Smarty/templates/Settings/PickListContents.tpl
 modules/Users/DefaultFieldPermissions.php
Message-ID: <20060622152809.6EF2883F52D@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 22 09:28:02 2006
New Revision: 7433

Log:
issue in field access and PickList has been fixed

Modified:
    vtigercrm/trunk/Smarty/templates/FieldAccess.tpl
    vtigercrm/trunk/Smarty/templates/Settings/PickListContents.tpl
    vtigercrm/trunk/modules/Users/DefaultFieldPermissions.php

Modified: vtigercrm/trunk/Smarty/templates/FieldAccess.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/FieldAccess.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/FieldAccess.tpl Thu Jun 22 09:28:02 2006
@@ -16,110 +16,106 @@
 <tbody><tr>
         <td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
         <td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
-<br>
+	<br>
 	<div align=center>
 	
-			{include file='SetMenu.tpl'}
-				<!-- DISPLAY -->
-				<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
-				<form action="index.php" method="post" name="new" id="form">
-				<input type="hidden" name="module" value="Users">
-				<input type="hidden" name="parenttab" value="Settings">
-				<input type="hidden" name="fld_module" id="fld_module">
-				{if $MODE neq 'view'}
-				<input type="hidden" name="action" value="UpdateDefaultFieldLevelAccess">
-				{else}
-				<input type="hidden" name="action" value="EditDefOrgFieldLevelAccess">
-				{/if}	
-				<tr>
-					<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}orgshar.gif" alt="Users" width="48" height="48" border=0 title="Users"></td>
-					<td colspan=2 class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > {$MOD.LBL_FIELDS_ACCESS} </b></td>
-					<td rowspan=2 class="small" align=right>&nbsp;</td>
-				</tr>
-				<tr>
-					<td valign=top class="small">{$MOD.LBL_SHARING_FIELDS_DESCRIPTION}</td>
-				</tr>
-				</table>
-				<br>
-				<table border=0 cellspacing=0 cellpadding=5 width=100% class="tableHeading">
-				<tr>
-					<td class="big"><strong>{$CMOD.LBL_GLOBAL_FIELDS_MANAGER}</strong></td>
-					<td class="small" align=right>
-					{if $MODE neq 'edit'}
-						<input name="Edit" type="submit" class="crmButton small edit" value="{$APP.LBL_EDIT_BUTTON}" >									
-					{else}
-						<input title="save" accessKey="S" class="crmButton small save" type="submit" name="Save" value="{$APP.LBL_SAVE_LABEL}">
-						<input name="Cancel" value=" {$APP.LBL_CANCEL_BUTTON_LABEL} " class="crmButton small cancel" type="button" onClick="window.history.back();">
-					{/if}
-					</td>
-				</tr>
-				</table>
-				<table width="100%" border="0" cellpadding="5" cellspacing="0" class="listTableTopButtons">
-                  <tr >
-                    <td  style="padding-left:5px;" class="big">{$CMOD.LBL_SELECT_SCREEN}&nbsp; 
+	{include file='SetMenu.tpl'}
+		<!-- DISPLAY -->
+		<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
+		<form action="index.php" method="post" name="new" id="form">
+		<input type="hidden" name="module" value="Users">
+		<input type="hidden" name="parenttab" value="Settings">
+		<input type="hidden" name="fld_module" id="fld_module" value="{$DEF_MODULE}">
+		{if $MODE neq 'view'}
+			<input type="hidden" name="action" value="UpdateDefaultFieldLevelAccess">
+		{else}
+			<input type="hidden" name="action" value="EditDefOrgFieldLevelAccess">
+		{/if}	
+		<tr>
+			<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}orgshar.gif" alt="Users" width="48" height="48" border=0 title="Users"></td>
+			<td colspan=2 class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > {$MOD.LBL_FIELDS_ACCESS} </b></td>
+			<td rowspan=2 class="small" align=right>&nbsp;</td>
+		</tr>
+		<tr>
+			<td valign=top class="small">{$MOD.LBL_SHARING_FIELDS_DESCRIPTION}</td>
+		</tr>
+		</table>
+		<br>
+		<table border=0 cellspacing=0 cellpadding=5 width=100% class="tableHeading">
+		<tr>
+			<td class="big"><strong>{$CMOD.LBL_GLOBAL_FIELDS_MANAGER}</strong></td>
+			<td class="small" align=right>
+			{if $MODE neq 'edit'}
+				<input name="Edit" type="submit" class="crmButton small edit" value="{$APP.LBL_EDIT_BUTTON}" >									
+			{else}
+				<input title="save" accessKey="S" class="crmButton small save" type="submit" name="Save" value="{$APP.LBL_SAVE_LABEL}">
+				<input name="Cancel" value=" {$APP.LBL_CANCEL_BUTTON_LABEL} " class="crmButton small cancel" type="button" onClick="window.history.back();">
+			{/if}
+			</td>
+		</tr>
+		</table>
+		<table width="100%" border="0" cellpadding="5" cellspacing="0" class="listTableTopButtons">
+                <tr>
+        		<td  style="padding-left:5px;" class="big">{$CMOD.LBL_SELECT_SCREEN}&nbsp; 
 			<select name="Screen" class="detailedViewTextBox" style="width:30%;"  onChange="changemodules(this)">
-				{foreach item=module from=$FIELD_INFO}
+			{foreach item=module from=$FIELD_INFO}
 				{if $module == $DEF_MODULE}
 					<option selected value='{$module}'>{$APP.$module}</option>
 				{else}		
 					<option value='{$module}' >{$APP.$module}</option>
 				{/if}
-				{/foreach}
+			{/foreach}
 			</select>
-		    </td>
-                    <td align="right">&nbsp;</td>
-                  </tr>
-		  </table>
-				{foreach key=module item=info name=allmodules from=$FIELD_LISTS}
-				{$module}      {$DEF_MODULE}
-				{if $module == $DEF_MODULE}
-				<div id="{$module}_fields" style="display:block">	
-				{else}
-				<div id="{$module}_fields" style="display:none">	
-				{/if}
-				 <table cellspacing=0 cellpadding=5 width=100% class="listTable small">
-                   <tr>
-				   			<td colspan="2" class="listRow" valign="top" nowrap>
-								<b>{$CMOD.LBL_FIELDS_AVLBL} {$APP.$module}</b>
-							</td>
-				   </tr>
-				   <tr>
-                     <td valign=top width="25%" >
-		     <table border=0 cellspacing=0 cellpadding=5 width=100% class=small>
-			{foreach item=elements name=groupfields from=$info}
-                         <tr>
-				{foreach item=elementinfo name=curvalue from=$elements}
-                           <td class="prvPrfTexture" style="width:20px">&nbsp;</td>
-                           <td width="5%" id="{$smarty.foreach.allmodules.iteration}_{$smarty.foreach.groupfields.iteration}_{$smarty.foreach.curvalue.iteration}">{$elementinfo.1}</td>
-                           <td width="25%" nowrap  onMouseOver="this.className='prvPrfHoverOn',$('{$smarty.foreach.allmodules.iteration}_{$smarty.foreach.groupfields.iteration}_{$smarty.foreach.curvalue.iteration}').className='prvPrfHoverOn'" onMouseOut="this.className='prvPrfHoverOff',$('{$smarty.foreach.allmodules.iteration}_{$smarty.foreach.groupfields.iteration}_{$smarty.foreach.curvalue.iteration}').className='prvPrfHoverOff'">{$elementinfo.0}</td>
-				{/foreach}
-                         </tr>
+		    	</td>
+	                <td align="right">&nbsp;</td>
+                </tr>
+		</table>
+		{foreach key=module item=info name=allmodules from=$FIELD_LISTS}
+		{if $module eq $DEF_MODULE}
+			<div id="{$module}_fields" style="display:block">	
+		{else}
+			<div id="{$module}_fields" style="display:none">	
+		{/if}
+	 	<table cellspacing=0 cellpadding=5 width=100% class="listTable small">
+       		<tr>
+			<td colspan="2" class="listRow" valign="top" nowrap>
+			<b>{$CMOD.LBL_FIELDS_AVLBL} {$APP.$module}</b>
+			</td>
+		</tr>
+		<tr>
+                	<td valign=top width="25%" >
+		     	<table border=0 cellspacing=0 cellpadding=5 width=100% class=small>
+				{foreach item=elements name=groupfields from=$info}
+                        	<tr>
+					{foreach item=elementinfo name=curvalue from=$elements}
+                           		<td class="prvPrfTexture" style="width:20px">&nbsp;</td>
+                           		<td width="5%" id="{$smarty.foreach.allmodules.iteration}_{$smarty.foreach.groupfields.iteration}_{$smarty.foreach.curvalue.iteration}">{$elementinfo.1}</td>
+                           		<td width="25%" nowrap  onMouseOver="this.className='prvPrfHoverOn',$('{$smarty.foreach.allmodules.iteration}_{$smarty.foreach.groupfields.iteration}_{$smarty.foreach.curvalue.iteration}').className='prvPrfHoverOn'" onMouseOut="this.className='prvPrfHoverOff',$('{$smarty.foreach.allmodules.iteration}_{$smarty.foreach.groupfields.iteration}_{$smarty.foreach.curvalue.iteration}').className='prvPrfHoverOff'">{$elementinfo.0}</td>
+					{/foreach}
+                         	</tr>
                          	{/foreach}
-                     </table>
-				</div>
+                     	</table>
 			</td>
-                   </tr>
-				{/foreach}
-                 </table></td>
-			</tr>
+                </tr>
                 </table>
-				<br>
-				<br>
-				<table border=0 cellspacing=0 cellpadding=5 width=100% >
-				<tr><td class="small" ><div align=right><a href="#top">{$MOD.LBL_SCROLL}</a></div></td></tr>				</table>
-				
-			
-			
-			
-			</td>
-			</tr>
-			</table>
-		</td>
+		</div>
+		{/foreach}
+	</td>
 	</tr>
-	</form>
+        </table>
+	<br>
+	<br>
+	<table border=0 cellspacing=0 cellpadding=5 width=100% >
+		<tr><td class="small" ><div align=right><a href="#top">{$MOD.LBL_SCROLL}</a></div></td></tr>
 	</table>
-		
-	</div>
+</td>
+</tr>
+</table>
+</td>
+</tr>
+</form>
+</table>
+</div>
 </td>
         <td valign="top"><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
    </tr>

Modified: vtigercrm/trunk/Smarty/templates/Settings/PickListContents.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Settings/PickListContents.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Settings/PickListContents.tpl Thu Jun 22 09:28:02 2006
@@ -1,38 +1,40 @@
-	<strong>2. {$MOD.LBL_PICKLIST_AVAIL} {$MODULE} </strong></td>
+	<table  class="tableHeading" border="0" cellpadding="5" cellspacing="0" width="100%"><tr><td><strong>2. {$MOD.LBL_PICKLIST_AVAIL} {$MODULE} </strong></td>
 		<td class="small" align=right>&nbsp;</td>
 		</tr>
 	</table>
 	<table border=0 cellspacing=0 cellpadding=0 width=100% class="listTable">
 	<tr>
 		<td valign=top width="50%">
-		<table width="100%" class="listTable" cellpadding="5" cellspacing="0">
-		{foreach item=picklists from=$PICKLIST_VALUES}
-		<tr>
-		{foreach item=picklistfields from=$picklists}
-		{if $picklistfields neq ''}
-			<td class="listTableTopButtons small" valign="top" align="left"><b>{$picklistfields.fieldlabel}</b></td>
-			<td class="listTableTopButtons" valign="top" align="right">
-				<input type="button" value="Edit" class="crmButton small edit" onclick="fetchEditPickList('{$MODULE}','{$picklistfields.fieldname}');posLay(this,'editdiv');" > 
-			</td>
-		{else}
-			<td class="listTableTopButtons small" colspan="2">&nbsp;</td>
-		{/if}
-		{/foreach}
-		</tr>
-		<tr>
-		{foreach item=picklistelements from=$picklists}
-		{if $picklistelements neq ''}
-			<td colspan="2" valign="top">
-				<ul style="list-style-type: none;">
-					{foreach item=elements from=$picklistelements.value}
-						<li>{$elements}</li>
-					{/foreach}
-				</ul>	
-			</td>
-		{else}
-			<td colspan="2">&nbsp;</td>
-		{/if}
-		{/foreach}
-		</tr>
+			<table width="100%" class="listTable" cellpadding="5" cellspacing="0">
+			{foreach item=picklists from=$PICKLIST_VALUES}
+			<tr>
+				{foreach item=picklistfields from=$picklists}
+				{if $picklistfields neq ''}
+					<td class="listTableTopButtons small" valign="top" align="left"><b>{$picklistfields.fieldlabel}</b></td>
+					<td class="listTableTopButtons" valign="top" align="right">
+					<input type="button" value="Edit" class="crmButton small edit" onclick="fetchEditPickList('{$MODULE}','{$picklistfields.fieldname}');posLay(this,'editdiv');" > 
+					</td>
+				{else}
+					<td class="listTableTopButtons small" colspan="2">&nbsp;</td>
+				{/if}
+				{/foreach}
+			</tr>
+			<tr>
+				{foreach item=picklistelements from=$picklists}
+				{if $picklistelements neq ''}
+					<td colspan="2" valign="top">
+					<ul style="list-style-type: none;">
+						{foreach item=elements from=$picklistelements.value}
+							<li>{$elements}</li>
+						{/foreach}
+					</ul>	
+					</td>
+				{else}
+					<td colspan="2">&nbsp;</td>
+			{/if}
+			{/foreach}
+			</tr>
 		{/foreach}
 		</table> 
+		</td></tr>
+		</table>

Modified: vtigercrm/trunk/modules/Users/DefaultFieldPermissions.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DefaultFieldPermissions.php (original)
+++ vtigercrm/trunk/modules/Users/DefaultFieldPermissions.php Thu Jun 22 09:28:02 2006
@@ -58,7 +58,7 @@
 		
 		if($adb->query_result($fieldListResult,$i,"visible") == 0)
 		{
-			$visible = "<img src=".$image_path."/yes.gif>";
+			$visible = "<img src=".$image_path."/prvPrfSelectedTick.gif>";
 		}
 		else
 		{
@@ -67,7 +67,7 @@
 		$standCustFld []= $visible;
 	}
 	$standCustFld=array_chunk($standCustFld,2);	
-	$standCustFld=array_chunk($standCustFld,2);	
+	$standCustFld=array_chunk($standCustFld,4);	
 	return $standCustFld;
 }
 




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 22 23:48:44 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 03:48:44 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7434 -
 /vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
Message-ID: <20060623034845.C31DE7E8A2C@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 22 21:48:40 2006
New Revision: 7434

Log:
campaign added as relatedlist for contact and lead

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

Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original)
+++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Thu Jun 22 21:48:40 2006
@@ -240,7 +240,6 @@
  $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'rating','vtiger_leaddetails',1,'15','rating','Rating',1,0,0,100,15,13,1,'V~O',1,null,'ADV')");
  $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'noofemployees','vtiger_leaddetails',1,'1','noofemployees','No Of Employees',1,0,0,100,16,13,1,'V~O',1,null,'ADV')");
  $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,17,13,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'campaignid','vtiger_leaddetails',1,'58','campaignid','Campaign Source',1,0,0,100,18,13,1,'I~O',1,null,'BAS')");
  $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'yahooid','vtiger_leaddetails',1,'13','yahooid','Yahoo Id',1,0,0,100,18,13,1,'V~O',1,null,'ADV')");
 $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,19,13,2,'T~O',1,null,'BAS')");
  $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,20,13,2,'T~O',1,null,'BAS')");
@@ -277,7 +276,6 @@
  $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'lastname','vtiger_contactdetails',1,'2','lastname','Last Name',1,0,0,100,4,4,1,'V~M',0,2,'BAS')");	
  $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'mobile','vtiger_contactdetails',1,'1','mobile','Mobile',1,0,0,100,5,4,1,'V~O',1,null,'BAS')");	
  $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'accountid','vtiger_contactdetails',1,'51','account_id','Account Name',1,0,0,100,6,4,1,'I~O',0,3,'BAS')");	
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'campaignid','vtiger_contactdetails',1,'58','campaignid','Campaign Source',1,0,0,100,6,4,1,'I~O',1,null,'BAS')");
  $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'homephone','vtiger_contactsubdetails',1,'11','homephone','Home Phone',1,0,0,100,7,4,1,'V~O',1,null,'ADV')");	
  $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'leadsource','vtiger_contactsubdetails',1,'15','leadsource','Lead Source',1,0,0,100,8,4,1,'V~O',1,null,'BAS')");	
  $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'otherphone','vtiger_contactsubdetails',1,'11','otherphone','Phone',1,0,0,100,9,4,1,'V~O',1,null,'BAS')");
@@ -1670,6 +1668,8 @@
 	
 	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Leads").",".getTabid("Products").",'get_products',5,'Products',0)");
 
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Leads").",".getTabid("Campaigns").",'get_campaigns',6,'Campaigns',0)");
+
 	//Inserting for contact related lists
 	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Potentials").",'get_opportunities',1,'Potentials',0)");	
 		
@@ -1692,6 +1692,8 @@
 	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Activities").",'get_history',9,'Activity History',0)");
 
 	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",0,'get_attachments',10,'Attachments',0)");
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Campaigns").",'get_campaigns',11,'Campaigns',0)");
 
 	//Inserting Potential Related Lists	
 




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 22 23:51:12 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 03:51:12 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7435 -
	/vtigercrm/trunk/schema/DatabaseSchema.xml
Message-ID: <20060623035112.CF34E7E8A2C@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 22 21:51:08 2006
New Revision: 7435

Log:
campaignid has been removed from vtiger_contactdetails and vtiger_leaddetails tables

Modified:
    vtigercrm/trunk/schema/DatabaseSchema.xml

Modified: vtigercrm/trunk/schema/DatabaseSchema.xml
==============================================================================
--- vtigercrm/trunk/schema/DatabaseSchema.xml (original)
+++ vtigercrm/trunk/schema/DatabaseSchema.xml Thu Jun 22 21:51:08 2006
@@ -392,7 +392,6 @@
 			<constraint>REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE</constraint>
 		</field>
 		<field name="accountid" type="I" size="19" />
-		<field name="campaignid" type="I" size="19" />
 		<field name="salutation" type="C" size="50">
 			<default value="Mr" />
 		</field>
@@ -520,7 +519,6 @@
 			<key />
 			<constraint>REFERENCES vtiger_crmentity(crmid) ON DELETE CASCADE</constraint>
 		</field>
-		<field name="campaignid" type="I" size="19" />
 		<field name="email" type="C" size="100" />
 		<field name="interest" type="C" size="50" />
 		<field name="firstname" type="C" size="40" />




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 22 23:58:27 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 03:58:27 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7436 -
	/vtigercrm/trunk/modules/Leads/Lead.php
Message-ID: <20060623035827.09E2E83F725@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 22 21:58:24 2006
New Revision: 7436

Log:
changes made to include campaign as lead related list

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

Modified: vtigercrm/trunk/modules/Leads/Lead.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/Lead.php (original)
+++ vtigercrm/trunk/modules/Leads/Lead.php Thu Jun 22 21:58:24 2006
@@ -19,6 +19,7 @@
 require_once('data/SugarBean.php');
 require_once('data/CRMEntity.php');
 require_once('modules/Activities/Activity.php');
+require_once('modules/Campaigns/Campaign.php');
 require_once('modules/Notes/Note.php');
 require_once('modules/Emails/Email.php');
 require_once('include/ComboUtil.php');
@@ -197,6 +198,28 @@
 	$log->debug("Exiting get_activities method ...");
 	return  GetRelatedList('Leads','Activities',$focus,$query,$button,$returnset);
 }
+
+/** Returns a list of the associated Campaigns
+  * @param $id -- campaign id :: Type Integer
+  * @returns list of campaigns in array format
+  */
+function get_campaigns($id)
+{
+	global $log;
+	$log->debug("Entering get_campaigns(".$id.") method ...");
+	global $mod_strings;
+	$focus = new Campaign();
+	$button = '';
+
+	$returnset = '';
+	$log->info("Campaign Related List for Lead Displayed");
+	$query = "SELECT vtiger_users.user_name, vtiger_campaign.campaignid, vtiger_campaign.campaignname, vtiger_campaign.campaigntype, vtiger_campaign.campaignstatus, vtiger_campaign.expectedrevenue, vtiger_campaign.closingdate, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_campaign inner join vtiger_campaignleadrel on vtiger_campaignleadrel.campaignid=vtiger_campaign.campaignid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_campaign.campaignid left join vtiger_campaigngrouprelation on vtiger_campaign.campaignid=vtiger_campaigngrouprelation.campaignid left join vtiger_groups on vtiger_groups.groupname=vtiger_campaigngrouprelation.groupname left join vtiger_users on vtiger_users.id = vtiger_crmentity.smownerid where vtiger_campaignleadrel.leadid=".$id." and vtiger_crmentity.deleted=0";
+
+	$log->debug("Exiting get_emails method ...");
+	return GetRelatedList('Contacts','Campaigns',$focus,$query,$button,$returnset);
+
+}
+
 
 	/** Returns a list of the associated emails
 	*/




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 23 00:08:06 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 04:08:06 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7437 - in
 /vtigercrm/trunk/modules: Contacts/Contact.php Leads/Lead.php
Message-ID: <20060623040806.8B96183F72C@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 22 22:08:01 2006
New Revision: 7437

Log:
changes made to include campaign as lead related list

Modified:
    vtigercrm/trunk/modules/Contacts/Contact.php
    vtigercrm/trunk/modules/Leads/Lead.php

Modified: vtigercrm/trunk/modules/Contacts/Contact.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/Contact.php (original)
+++ vtigercrm/trunk/modules/Contacts/Contact.php Thu Jun 22 22:08:01 2006
@@ -27,6 +27,7 @@
 require_once('include/utils/utils.php');
 require_once('modules/Potentials/Opportunity.php');
 require_once('modules/Activities/Activity.php');
+require_once('modules/Campaigns/Campaign.php');
 require_once('modules/Notes/Note.php');
 require_once('modules/Emails/Email.php');
 require_once('modules/HelpDesk/HelpDesk.php');
@@ -476,12 +477,34 @@
 
 		$log->info("Email Related List for Contact Displayed");
 
-		$query = "select vtiger_activity.activityid, vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.activitytype, vtiger_users.user_name, vtiger_crmentity.modifiedtime, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_activity.date_start from vtiger_activity, vtiger_seactivityrel, vtiger_contactdetails, vtiger_users, vtiger_crmentity left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.activityid = vtiger_activity.activityid and vtiger_contactdetails.contactid = vtiger_seactivityrel.crmid and vtiger_users.id=vtiger_crmentity.smownerid and vtiger_crmentity.crmid = vtiger_activity.activityid  and vtiger_contactdetails.contactid = ".$id." and vtiger_activity.activitytype='Emails' and vtiger_crmentity.deleted = 0";
+		$query = "select vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.activitytype, vtiger_users.user_name, vtiger_crmentity.modifiedtime, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_activity.date_start from vtiger_activity, vtiger_seactivityrel, vtiger_contactdetails, vtiger_users, vtiger_crmentity left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.activityid = vtiger_activity.activityid and vtiger_contactdetails.contactid = vtiger_seactivityrel.crmid and vtiger_users.id=vtiger_crmentity.smownerid and vtiger_crmentity.crmid = vtiger_activity.activityid  and vtiger_contactdetails.contactid = ".$id." and vtiger_activity.activitytype='Emails' and vtiger_crmentity.deleted = 0";
 		$log->debug("Exiting get_emails method ...");
 		return GetRelatedList('Contacts','Emails',$focus,$query,$button,$returnset);
 	}
 
-	
+	/** Returns a list of the associated Campaigns
+	  * @param $id -- campaign id :: Type Integer
+	  * @returns list of campaigns in array format
+	  */
+	      
+	function get_campaigns($id)
+	{
+		global $log;
+		$log->debug("Entering get_campaigns(".$id.") method ...");
+		global $mod_strings;
+
+		$focus = new Campaign();
+		$button = '';
+
+		$returnset = '';
+		$log->info("Campaign Related List for Contact Displayed");
+		$query = "SELECT vtiger_users.user_name, vtiger_campaign.campaignid, vtiger_campaign.campaignname, vtiger_campaign.campaigntype, vtiger_campaign.campaignstatus, vtiger_campaign.expectedrevenue, vtiger_campaign.closingdate, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_campaign inner join vtiger_campaigncontrel on vtiger_campaigncontrel.campaignid=vtiger_campaign.campaignid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_campaign.campaignid left join vtiger_campaigngrouprelation on vtiger_campaign.campaignid=vtiger_campaigngrouprelation.campaignid left join vtiger_groups on vtiger_groups.groupname=vtiger_campaigngrouprelation.groupname left join vtiger_users on vtiger_users.id = vtiger_crmentity.smownerid where vtiger_campaigncontrel.contactid=".$id." and vtiger_crmentity.deleted=0";
+
+		$log->debug("Exiting get_campaigns method ...");
+		return GetRelatedList('Contacts','Campaigns',$focus,$query,$button,$returnset);
+
+	}
+
 
 
 

Modified: vtigercrm/trunk/modules/Leads/Lead.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/Lead.php (original)
+++ vtigercrm/trunk/modules/Leads/Lead.php Thu Jun 22 22:08:01 2006
@@ -215,7 +215,7 @@
 	$log->info("Campaign Related List for Lead Displayed");
 	$query = "SELECT vtiger_users.user_name, vtiger_campaign.campaignid, vtiger_campaign.campaignname, vtiger_campaign.campaigntype, vtiger_campaign.campaignstatus, vtiger_campaign.expectedrevenue, vtiger_campaign.closingdate, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_campaign inner join vtiger_campaignleadrel on vtiger_campaignleadrel.campaignid=vtiger_campaign.campaignid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_campaign.campaignid left join vtiger_campaigngrouprelation on vtiger_campaign.campaignid=vtiger_campaigngrouprelation.campaignid left join vtiger_groups on vtiger_groups.groupname=vtiger_campaigngrouprelation.groupname left join vtiger_users on vtiger_users.id = vtiger_crmentity.smownerid where vtiger_campaignleadrel.leadid=".$id." and vtiger_crmentity.deleted=0";
 
-	$log->debug("Exiting get_emails method ...");
+	$log->debug("Exiting get_campaigns method ...");
 	return GetRelatedList('Contacts','Campaigns',$focus,$query,$button,$returnset);
 
 }




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 23 00:15:34 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 04:15:34 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7438 -
	/vtigercrm/trunk/include/language/en_us.lang.php
Message-ID: <20060623041534.655AA83F72A@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 22 22:15:30 2006
New Revision: 7438

Log:
label included for campaign

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

Modified: vtigercrm/trunk/include/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/include/language/en_us.lang.php (original)
+++ vtigercrm/trunk/include/language/en_us.lang.php Thu Jun 22 22:15:30 2006
@@ -189,6 +189,8 @@
 'LBL_SELECT_CONTACT_BUTTON_KEY'=>'T',
 
 'LBL_SELECT_CONTACT_BUTTON_LABEL'=>'Select Contact',
+
+'LBL_SELECT_CAMPAIGN_BUTTON_LABEL'=>'Select Campaign',
 
 'LBL_SELECT_USER_BUTTON_TITLE'=>'Select User [Alt+U]',
 
@@ -900,6 +902,7 @@
 
 //Added after 5.0 Alpha5
 'Campaign Name'=>'Campaign Name',
+'Campaign Type'=>'Campaign Type',
 'LBL_ACTIONS'=>'Actions',
 'LBL_SEND'=>'Send',
 'LBL_VAT'=>'VAT',




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 23 00:18:47 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 04:18:47 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7439 - in
 /vtigercrm/trunk/modules: Contacts/CallRelatedList.php
 Leads/CallRelatedList.php
Message-ID: <20060623041847.276F883F72A@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 22 22:18:42 2006
New Revision: 7439

Log:
unwanted code has been removed

Modified:
    vtigercrm/trunk/modules/Contacts/CallRelatedList.php
    vtigercrm/trunk/modules/Leads/CallRelatedList.php

Modified: vtigercrm/trunk/modules/Contacts/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/Contacts/CallRelatedList.php Thu Jun 22 22:18:42 2006
@@ -33,10 +33,6 @@
 $accountid = $adb->query_result($sql,0,'accountid');
 if($accountid == 0) $accountid='';
 
-$sql1 = $adb->query('select campaignid from vtiger_contactdetails where contactid='.$focus->id);
-$campaignid = $adb->query_result($sql1,0,'campaignid');
-if($campaignid == 0) $campaignid='';
-
 global $mod_strings;
 global $app_strings;
 global $theme;
@@ -47,7 +43,6 @@
 
 $smarty = new vtigerCRM_Smarty;
 $smarty->assign("accountid",$accountid);
-$smarty->assign("campaignid",$campaignid);
 	
 
 if(isset($_request['isduplicate']) && $_request['isduplicate'] == 'true') {

Modified: vtigercrm/trunk/modules/Leads/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/Leads/CallRelatedList.php Thu Jun 22 22:18:42 2006
@@ -50,11 +50,6 @@
        unset($_SESSION['rlvs']);
  }
 	
-$sql1 = $adb->query('select campaignid from vtiger_leaddetails where leadid='.$focus->id);
-$campaignid = $adb->query_result($sql1,0,'campaignid');
-if($campaignid == 0) $campaignid='';
-$smarty->assign("campaignid",$campaignid);
-
 $category = getParentTab();
 $smarty->assign("CATEGORY",$category);
 $parent_email = getEmailParentsList('Leads',$focus->id);




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 23 00:22:07 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 04:22:07 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7440 -
	/vtigercrm/trunk/Popup.php
Message-ID: <20060623042208.1415583F72A@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 22 22:22:04 2006
New Revision: 7440

Log:
multiselect enabled in campaign popup

Modified:
    vtigercrm/trunk/Popup.php

Modified: vtigercrm/trunk/Popup.php
==============================================================================
--- vtigercrm/trunk/Popup.php (original)
+++ vtigercrm/trunk/Popup.php Thu Jun 22 22:22:04 2006
@@ -56,6 +56,7 @@
 		$smarty->assign("SINGLE_MOD",'Campaign');
 		if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] !='')
 			$smarty->assign("RETURN_MODULE",$_REQUEST['return_module']);
+		if (isset($_REQUEST['select'])) $smarty->assign("SELECT",'enable');
 		$alphabetical = AlphabeticalSearch($currentModule,'Popup','campaignname','true','basic',$popuptype,"","","");
 		break;
 	case 'Accounts':




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 23 00:40:35 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 04:40:35 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7441 -
	/vtigercrm/trunk/include/utils/ListViewUtils.php
Message-ID: <20060623044036.0DC1F83F723@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 22 22:40:32 2006
New Revision: 7441

Log:
changes made to get unselected campaigns in campaign popup

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 Thu Jun 22 22:40:32 2006
@@ -1312,12 +1312,7 @@
 					$temp_val =$temp_val.' '.$firstname;
 
 					$focus->record_id = $_REQUEST['recordid'];
-					if($module == 'Leads')
-						$value = '<a href="a" LANGUAGE=javascript onclick=\'add_leaddata_to_relatedlist("'.$entity_id.'","'.$focus->record_id.'"); window.close()\'>'.$temp_val.'</a>';
-					elseif($module == 'Users')
-						$value = '<a href="a" LANGUAGE=javascript onclick=\'add_userdata_to_relatedlist("'.$entity_id.'","'.$focus->record_id.'"); window.close()\'>'.$temp_val.'</a>';
-					else
-						$value = '<a href="a" LANGUAGE=javascript onclick=\'add_data_to_relatedlist("'.$entity_id.'","'.$focus->record_id.'"); window.close()\'>'.$temp_val.'</a>';
+					$value = '<a href="a" LANGUAGE=javascript onclick=\'add_data_to_relatedlist("'.$entity_id.'","'.$focus->record_id.'","'.$module.'"); window.close()\'>'.$temp_val.'</a>';
 				}
 				elseif($popuptype == "formname_specific")
 				{
@@ -2567,7 +2562,21 @@
 		$field = 'id';
 		$table = 'vtiger_users';
 	}
-	
+	elseif($currentmodule=="Campaigns" && $returnmodule == "Leads")
+	{
+		$reltable = 'vtiger_campaignleadrel';
+		$condition = 'WHERE leadid = '.$recordid;;
+		$field = $selectfield = 'campaignid';
+		$table = 'vtiger_campaign';
+	}
+	elseif($currentmodule=="Campaigns" && $returnmodule == "Contacts")
+	{
+		$reltable = 'vtiger_campaigncontrel';
+		$condition = 'WHERE contactid = '.$recordid;;
+		$field = $selectfield = 'campaignid';
+		$table = 'vtiger_campaign';
+	}
+
 	if($reltable != null)
 		$query = "SELECT ".$selectfield." FROM ".$reltable." ".$condition;
 




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 23 00:46:19 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 04:46:19 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7442 -
	/vtigercrm/trunk/modules/Campaigns/Campaign.php
Message-ID: <20060623044619.00A2283F749@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 22 22:46:15 2006
New Revision: 7442

Log:
query has been modified

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 Jun 22 22:46:15 2006
@@ -33,15 +33,21 @@
 	var $sortby_fields = Array('campaignname','smownerid','expectedcost');
 
 	var $list_fields = Array(
-					'Campaign ID'=>Array('crmentity'=>'crmid'),
 					'Campaign Name'=>Array('campaign'=>'campaignname'),
 					'Campaign Type'=>Array('campaign'=>'campaigntype'),
 					'Campaign Status'=>Array('campaign'=>'campaignstatus'),
+					'Expected Revenue'=>Array('campaign'=>'expectedrevenue'),
+					'Expected Close Date'=>Array('campaign'=>'closingdate'),
+					'Assigned To' => Array('crmentity'=>'smownerid')
 				);
 
 	var $list_fields_name = Array(
-					'Campaign ID'=>'',
 					'Campaign Name'=>'campaignname',
+					'Campaign Type'=>'campaigntype',
+					'Campaign Status'=>'campaignstatus',
+					'Expected Revenue'=>'expectedrevenue',
+					'Expected Close Date'=>'closingdate',
+					'Assigned To'=>'assigned_user_id'
 				     );	  			
 
 	var $list_link_field= 'campaignname';
@@ -75,9 +81,8 @@
                 $focus = new Contact();
                 $button = '';
                 $returnset = '&return_module=Campaigns&return_action=CallRelatedList&return_id='.$id;
-		//$query = 'select vtiger_contactdetails.accountid, vtiger_users.user_name,vtiger_groups.groupname,vtiger_campaign.campaignid, vtiger_campaign.campaignname, vtiger_contactdetails.contactid, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.title, vtiger_contactdetails.department, vtiger_contactdetails.email, vtiger_contactdetails.phone, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_campaign inner join vtiger_campaigncontrel on vtiger_campaigncontrel.campaignid = vtiger_campaign.campaignid inner join vtiger_contactdetails on vtiger_campaigncontrel.contactid = vtiger_contactdetails.contactid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid left join vtiger_groups on vtiger_groups.groupname=vtiger_contactgrouprelation.groupname left join vtiger_users on vtiger_crmentity.smownerid=vtiger_users.id where vtiger_campaign.campaignid = '.$id.' and vtiger_crmentity.deleted=0';
-
-		$query = 'SELECT vtiger_contactdetails.*, vtiger_crmentity.crmid, vtiger_users.user_name, vtiger_groups.groupname, vtiger_crmentity.smownerid from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid left join vtiger_users on vtiger_crmentity.smownerid = vtiger_users.id left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid left join vtiger_groups on vtiger_groups.groupname=vtiger_contactgrouprelation.groupname  where vtiger_crmentity.deleted=0 and vtiger_contactdetails.campaignid = '.$id;
+		$query = 'select vtiger_contactdetails.accountid, vtiger_users.user_name,vtiger_groups.groupname, vtiger_contactdetails.contactid, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.title, vtiger_contactdetails.department, vtiger_contactdetails.email, vtiger_contactdetails.phone, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_contactdetails inner join vtiger_campaigncontrel on vtiger_campaigncontrel.contactid = vtiger_contactdetails.contactid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid left join vtiger_groups on vtiger_groups.groupname=vtiger_contactgrouprelation.groupname left join vtiger_users on vtiger_crmentity.smownerid=vtiger_users.id where vtiger_campaigncontrel.campaignid = '.$id.' and vtiger_crmentity.deleted=0';
+		
 		$log->debug("Exiting get_contacts method ...");
                 return GetRelatedList('Campaigns','Contacts',$focus,$query,$button,$returnset);
         }
@@ -92,7 +97,7 @@
                 $button = '';
                 $returnset = '&return_module=Campaigns&return_action=CallRelatedList&return_id='.$id;
 
-		$query = 'SELECT vtiger_leaddetails.*, vtiger_crmentity.crmid, vtiger_users.user_name, vtiger_groups.groupname, vtiger_crmentity.smownerid from vtiger_leaddetails inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_leaddetails.leadid left join vtiger_users on vtiger_crmentity.smownerid = vtiger_users.id left join vtiger_leadgrouprelation on vtiger_leaddetails.leadid=vtiger_leadgrouprelation.leadid left join vtiger_groups on vtiger_groups.groupname=vtiger_leadgrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_leaddetails.campaignid = '.$id;
+		$query = 'SELECT vtiger_leaddetails.*, vtiger_crmentity.crmid, vtiger_users.user_name, vtiger_groups.groupname, vtiger_crmentity.smownerid from vtiger_leaddetails inner join vtiger_campaignleadrel on vtiger_campaignleadrel.leadid=vtiger_leaddetails.leadid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_leaddetails.leadid left join vtiger_users on vtiger_crmentity.smownerid = vtiger_users.id left join vtiger_leadgrouprelation on vtiger_leaddetails.leadid=vtiger_leadgrouprelation.leadid left join vtiger_groups on vtiger_groups.groupname=vtiger_leadgrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_campaignleadrel.campaignid = '.$id;
 		$log->debug("Exiting get_leads method ...");
                 return GetRelatedList('Campaigns','Leads',$focus,$query,$button,$returnset);
         }




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 23 00:50:12 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 04:50:12 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7443 - in
 /vtigercrm/trunk/modules: Contacts/updateRelations.php
 Leads/updateRelations.php
Message-ID: <20060623045012.2D0E329908F@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 22 22:50:06 2006
New Revision: 7443

Log:
file added to update the relation between lead/contact and campaign

Added:
    vtigercrm/trunk/modules/Contacts/updateRelations.php
    vtigercrm/trunk/modules/Leads/updateRelations.php




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 23 00:54:25 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 04:54:25 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7444 -
 /vtigercrm/trunk/Smarty/templates/RelatedListContents.tpl
Message-ID: <20060623045425.DF96B299091@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 22 22:54:22 2006
New Revision: 7444

Log:
select campaign button has been included

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

Modified: vtigercrm/trunk/Smarty/templates/RelatedListContents.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/RelatedListContents.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/RelatedListContents.tpl Thu Jun 22 22:54:22 2006
@@ -61,6 +61,8 @@
 				{/if}
 			{elseif $header eq 'HelpDesk'}
 				<input title="{$APP.LBL_ADD_NEW} {$APP.Ticket}" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='HelpDesk'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Ticket}"></td>
+			{elseif $header eq 'Campaigns'}
+                                <input title="Change" accessKey="" class="small" value="{$APP.LBL_SELECT_BUTTON_LABEL} {$APP.Campaign}" LANGUAGE=javascript onclick='return window.open("index.php?module=Campaigns&return_module={$MODULE}&action=Popup&popuptype=detailview&select=enable&form=EditView&form_submit=false&recordid={$ID}","test","width=640,height=570,resizable=0,scrollbars=0");' type="button"  name="button"></td>
 			{elseif $header eq 'Attachments'}
 				<input title="{$APP.LBL_ADD_NEW} {$APP.Note}" accessyKey="F" class="small" onclick="this.form.action.value='EditView'; this.form.return_action.value='CallRelatedList'; this.form.module.value='Notes'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Note}">&nbsp;
 				<input type="hidden" name="fileid">




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 23 00:57:06 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 04:57:06 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7445 -
	/vtigercrm/trunk/Smarty/templates/Popup.tpl
Message-ID: <20060623045706.A7A7C299091@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 22 22:57:00 2006
New Revision: 7445

Log:
unwanted js function has been removed

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

Modified: vtigercrm/trunk/Smarty/templates/Popup.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Popup.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Popup.tpl Thu Jun 22 22:57:00 2006
@@ -17,18 +17,11 @@
 <script language="JavaScript" type="text/javascript" src="modules/{$MODULE}/{$SINGLE_MOD}.js"></script>
 <script language="javascript" type="text/javascript" src="include/scriptaculous/prototype.js"></script>
 <script type="text/javascript">
-function add_data_to_relatedlist(entity_id,recordid) {ldelim}
+function add_data_to_relatedlist(entity_id,recordid,mod) {ldelim}
 
-        opener.document.location.href="index.php?module={$RETURN_MODULE}&action=updateRelations&destination_module=Contacts&entityid="+entity_id+"&parid="+recordid;
+        opener.document.location.href="index.php?module={$RETURN_MODULE}&action=updateRelations&destination_module="+mod+"&entityid="+entity_id+"&parid="+recordid;
 {rdelim}
 
-function add_leaddata_to_relatedlist(entity_id,recordid) {ldelim}
-        opener.document.location.href="index.php?module={$RETURN_MODULE}&action=updateRelations&destination_module=Leads&entityid="+entity_id+"&parid="+recordid;
-{rdelim}
-
-function add_userdata_to_relatedlist(userid,recordid) {ldelim}
-        opener.document.location.href="index.php?module={$RETURN_MODULE}&action=updateRelations&destination_module=Users&user_id="+userid+"&record="+recordid;
-{rdelim}
 </script>
 <body class="small" marginwidth=0 marginheight=0 leftmargin=0 topmargin=0 bottommargin=0 rigthmargin=0>
 <table width="100%" border="0" cellspacing="0" cellpadding="0" class="small">




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 23 01:19:27 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 05:19:27 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7446 - in
 /vtigercrm/trunk/Smarty/templates: DetailViewFields.tpl DetailViewUI.tpl
Message-ID: <20060623051927.45FA683F750@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 22 23:19:22 2006
New Revision: 7446

Log:
currency symbol has been removed fieldvalue as it is uppended in field label

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

Modified: vtigercrm/trunk/Smarty/templates/DetailViewFields.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DetailViewFields.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DetailViewFields.tpl Thu Jun 22 23:19:22 2006
@@ -17,8 +17,8 @@
                                          		<td width=25% class="dvtCellInfo" align="left">&nbsp;
                                          		      {if $keyid eq '55'}<!--SalutationSymbol-->
                                          		            {$keysalut}
-                                         		      {elseif $keyid eq '71' || $keyid eq '72'}  <!--CurrencySymbol-->
-                                         		            {$keycursymb}
+                                         		      {*elseif $keyid eq '71' || $keyid eq '72'}  <!--CurrencySymbol-->
+                                         		            {$keycursymb*}
                                                         	{/if}
                                                        {$keyval}
                                                   </td>

Modified: vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl Thu Jun 22 23:19:22 2006
@@ -17,8 +17,8 @@
                                          		<td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">
                                          		      {if $keyid eq '55'}<!--SalutationSymbol-->
                                          		            {$keysalut}
-                                         		      {elseif $keyid eq '71' || $keyid eq '72'}  <!--CurrencySymbol-->
-                                         		            {$keycursymb}
+                                         		      {*elseif $keyid eq '71' || $keyid eq '72'}  <!--CurrencySymbol-->
+                                         		            {$keycursymb*}
                                                         {/if}
                                                        &nbsp;&nbsp;<span id="dtlview_{$label}">{$keyval}</span>
                                               		<div id="editarea_{$label}" style="display:none;">




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 23 01:34:50 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 05:34:50 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7447 -
	/vtigercrm/trunk/include/utils/DetailViewUtils.php
Message-ID: <20060623053451.221A883F746@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 22 23:34:46 2006
New Revision: 7447

Log:
changes made to get currency symbol when no value is set

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 Thu Jun 22 23:34:46 2006
@@ -765,12 +765,12 @@
 	{
 		$label_fld[] =$mod_strings[$fieldlabel];
 		$display_val = '';
-		if($col_fields[$fieldname] != '' && $col_fields[$fieldname] != 0)
-		{
-		    $currencyid=fetchCurrency($current_user->id);
-		    $rate_symbol = getCurrencySymbolandCRate($currencyid);
-		    $rate = $rate_symbol['rate'];
-		    $curr_symbol = $rate_symbol['symbol'];
+		$currencyid=fetchCurrency($current_user->id);
+		$rate_symbol = getCurrencySymbolandCRate($currencyid);
+		$rate = $rate_symbol['rate'];
+		$curr_symbol = $rate_symbol['symbol'];
+	        if($col_fields[$fieldname] != '' && $col_fields[$fieldname] != 0)
+		{
 	 	    $amount_user_specific=convertFromDollar($col_fields[$fieldname],$rate);
                     $display_val = $amount_user_specific;	
 		}




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 23 01:52:12 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 05:52:12 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7448 -
	/vtigercrm/trunk/modules/Dashboard/index.php
Message-ID: <20060623055212.B9D7C83F745@vtiger.fosslabs.com>

Author: richie
Date: Thu Jun 22 23:52:09 2006
New Revision: 7448

Log:
added 3 additional dashboards

Modified:
    vtigercrm/trunk/modules/Dashboard/index.php

Modified: vtigercrm/trunk/modules/Dashboard/index.php
==============================================================================
--- vtigercrm/trunk/modules/Dashboard/index.php (original)
+++ vtigercrm/trunk/modules/Dashboard/index.php Thu Jun 22 23:52:09 2006
@@ -58,6 +58,9 @@
 	  "ticketsbyuser" => $mod_strings['ticketsbyuser'],
 	  "ticketsbyteam" => $mod_strings['ticketsbyteam'],
 	  "ticketsbyproduct"=> $mod_strings['ticketsbyproduct'],
+	  "contactbycampaign"=> $mod_strings['contactbycampaign'],
+	  "ticketsbyaccount"=> $mod_strings['ticketsbyaccount'],
+	  "ticketsbycontact"=> $mod_strings['ticketsbycontact'],
           );
           
 $log = LoggerManager::getLogger('dashboard');




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 23 01:55:30 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 05:55:30 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7449 -
 /vtigercrm/trunk/modules/Dashboard/display_charts.php
Message-ID: <20060623055530.7131583F750@vtiger.fosslabs.com>

Author: richie
Date: Thu Jun 22 23:55:26 2006
New Revision: 7449

Log:
added 3 additional dashboard related queries

Modified:
    vtigercrm/trunk/modules/Dashboard/display_charts.php

Modified: vtigercrm/trunk/modules/Dashboard/display_charts.php
==============================================================================
--- vtigercrm/trunk/modules/Dashboard/display_charts.php (original)
+++ vtigercrm/trunk/modules/Dashboard/display_charts.php Thu Jun 22 23:55:26 2006
@@ -65,7 +65,17 @@
 //Query for tickets
 $helpdesk_query=" select vtiger_troubletickets.status AS ticketstatus, vtiger_ticketgrouprelation.groupname AS ticketgroupname, vtiger_troubletickets.*,vtiger_crmentity.* from vtiger_troubletickets inner join vtiger_ticketcf on vtiger_ticketcf.ticketid = vtiger_troubletickets.ticketid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_troubletickets.ticketid left join vtiger_ticketgrouprelation on vtiger_troubletickets.ticketid=vtiger_ticketgrouprelation.ticketid left join vtiger_groups on vtiger_groups.groupname=vtiger_ticketgrouprelation.groupname left join vtiger_contactdetails on vtiger_troubletickets.parent_id=vtiger_contactdetails.contactid left join vtiger_account on vtiger_account.accountid=vtiger_troubletickets.parent_id left join vtiger_users on vtiger_crmentity.smownerid=vtiger_users.id and vtiger_troubletickets.ticketid = vtiger_ticketcf.ticketid where vtiger_crmentity.deleted=0";
 
- /**  This function returns  the values for the graph, for any type of graph needed	 
+//Query for campaigns
+$campaign_query=" select vtiger_campaign.*,vtiger_crmentity.* from vtiger_campaign inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_campaign.campaignid inner join vtiger_campaigncontrel where vtiger_campaigncontrel.campaignid=vtiger_campaign.campaignid and vtiger_crmentity.deleted=0";
+
+
+//Query for tickets by account
+$tickets_by_account="select vtiger_troubletickets.*, vtiger_account.* from vtiger_troubletickets inner join vtiger_account on vtiger_account.accountid=vtiger_troubletickets.parent_id";
+ 
+//Query for tickets by contact
+$tickets_by_contact="select vtiger_troubletickets.*, vtiger_contactdetails.* from vtiger_troubletickets inner join vtiger_contactdetails on vtiger_contactdetails.contactid=vtiger_troubletickets.parent_id";
+
+/**  This function returns  the values for the graph, for any type of graph needed	 
         * Portions created by vtiger are Copyright (C) vtiger.
         * All Rights Reserved.
         * Contributor(s): ______________________________________..
@@ -97,6 +107,9 @@
 	  "ticketsbyuser" => $mod_strings['ticketsbyuser'],
 	  "ticketsbyteam" => $mod_strings['ticketsbyteam'],
 	  "ticketsbyproduct"=> $mod_strings['ticketsbyproduct'],
+	  "contactbycampaign"=> $mod_strings['contactbycampaign'],
+	  "ticketsbyaccount"=> $mod_strings['ticketsbyaccount'],
+	  "ticketsbycontact"=> $mod_strings['ticketsbycontact'],
           );
 function get_graph_by_type($graph_by,$graph_title,$module,$where,$query)
 {
@@ -643,6 +656,36 @@
 			    $query=$helpdesk_query;
 			    echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
 		    }
+		    //Campaigns by Contact
+		    elseif (($type == "contactbycampaign") && (getFieldVisibilityPermission('Campaigns',$user_id,'campaignid') == "0"))
+		    {
+			    $graph_by="campaignid";
+			    $graph_title=$mod_strings['ticketsbycampaign'];
+			    $module="Campaigns";
+			    $where="";
+			    $query=$campaign_query;
+			    echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
+		    }
+		    //Tickets by Account
+		    elseif (($type == "ticketsbyaccount") && (getFieldVisibilityPermission('HelpDesk',$user_id,'accountid') == "0"))
+		    {
+			    $graph_by="accountid";
+			    $graph_title=$mod_strings['ticketsbyaccount'];
+			    $module="HelpDesk";
+			    $where="";
+			    $query=$tickets_by_account;
+			    echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
+		    }
+			    //Tickets by Contact
+			    elseif (($type == "ticketsbycontact") && (getFieldVisibilityPermission('HelpDesk',$user_id,'contactid') == "0"))
+			    {
+				    $graph_by="contactid";
+				    $graph_title=$mod_strings['ticketsbycontact'];
+				    $module="HelpDesk";
+				    $where="";
+				    $query=$tickets_by_contact;
+				    echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
+				    }
 		    else
                     {
                         echo $mod_strings['LBL_NO_PERMISSION_FIELD'];




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 23 01:56:07 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 05:56:07 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7450 -
 /vtigercrm/trunk/modules/Dashboard/language/en_us.lang.php
Message-ID: <20060623055607.3B90983F750@vtiger.fosslabs.com>

Author: richie
Date: Thu Jun 22 23:56:03 2006
New Revision: 7450

Log:
added 3 additional dashboard related entries

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

Modified: vtigercrm/trunk/modules/Dashboard/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Dashboard/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Dashboard/language/en_us.lang.php Thu Jun 22 23:56:03 2006
@@ -80,6 +80,9 @@
 "ticketsbyuser"=>"Tickets by User",
 "ticketsbyteam"=>"Tickets by Team",
 "ticketsbyproduct"=>"Tickets by Product",
+"contactbycampaign"=>"Contacts by Campaign",
+"ticketsbyaccount"=>"Tickets by Account",
+"ticketsbycontact"=>"Tickets by Contact",
 
 'LBL_DASHBRD_HOME'=>'Dashboard Home',
 'LBL_HORZ_BAR_CHART'=>'Horizontal Bar Chart',




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 23 01:58:00 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 05:58:00 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7451 -
 /vtigercrm/trunk/modules/Dashboard/horizontal_bargraph.php
Message-ID: <20060623055800.E957A83F750@vtiger.fosslabs.com>

Author: richie
Date: Thu Jun 22 23:57:57 2006
New Revision: 7451

Log:
14 changed to 44 to accomodate bigger names

Modified:
    vtigercrm/trunk/modules/Dashboard/horizontal_bargraph.php

Modified: vtigercrm/trunk/modules/Dashboard/horizontal_bargraph.php
==============================================================================
--- vtigercrm/trunk/modules/Dashboard/horizontal_bargraph.php (original)
+++ vtigercrm/trunk/modules/Dashboard/horizontal_bargraph.php Thu Jun 22 23:57:57 2006
@@ -43,7 +43,7 @@
 		$alts[]=$name."=%d";
 //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);
+                        $name=substr($name, 0, 44);
 		if($pos>=2)
 		{
 			$val=explode(" ",$name);




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 23 02:04:54 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 06:04:54 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7452 -
	/vtigercrm/trunk/modules/Dashboard/Entity_charts.php
Message-ID: <20060623060454.74D0D83F75F@vtiger.fosslabs.com>

Author: richie
Date: Fri Jun 23 00:04:50 2006
New Revision: 7452

Log:
additional 2 conditions added

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 Fri Jun 23 00:04:50 2006
@@ -232,6 +232,38 @@
 					if($name_val!="")
 						$name=$name_val;
 				}
+	if($graph_for =="campaignid")
+				{
+					//this will return the list of the names of the campaign``:w for the y-axis
+					$query = "SELECT campaignname FROM vtiger_campaign WHERE campaignid='".$name."'";
+					$result = $adb->query($query);
+					$name_val = $adb->query_result($result,0,"campaignname");
+					if($name_val!="")
+						$name=$name_val;
+				}
+			if($graph_for =="contactid")
+				{
+					$query = "SELECT lastname FROM vtiger_contactdetails WHERE contactid='".$name."'";
+					echo '>>>>>>>>>. '.$query;
+					$result = $adb->query($query);
+					$name_val = $adb->query_result($result,0,"lastname");
+					if($name_val!="")
+						$name=$name_val;
+				}
+
+
+
+
+
+
+
+
+
+
+
+
+
+				
 				//Passing name to graph
 				if($mod_name_val!="") $mod_name_val.="::$name";
 				else $mod_name_val="$name";




From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 02:09:11 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 06:09:11 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231358=3A?=
	=?utf-8?q?_uslmw_ifadpeny?=
Message-ID: <076.7fc082f0f31c48e750627c13eadbd4fd@vtiger.fosslabs.com>

#1358: uslmw ifadpeny
--------------------------+-------------------------------------------------
Reporter:  test at test.com  |       Owner:  uslmw ifadpeny
    Type:  defect         |      Status:  new           
Priority:  major          |   Component:  vtigercrm     
 Version:  5.0.0          |    Keywords:  uslmw ifadpeny
--------------------------+-------------------------------------------------
 hzdqb bman arskxj ienoxgqbh utcd uqkj fzvctp

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1358>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 02:09:21 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 06:09:21 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231359=3A?=
	=?utf-8?q?_nkmvswao_hrgxpcnj?=
Message-ID: <076.231caceb8d206fe629ab31edf63bacab@vtiger.fosslabs.com>

#1359: nkmvswao hrgxpcnj
--------------------------+-------------------------------------------------
Reporter:  test at test.com  |       Owner:  nkmvswao hrgxpcnj
    Type:  defect         |      Status:  new              
Priority:  major          |   Component:  vtigercrm        
 Version:  5.0.0          |    Keywords:  nkmvswao hrgxpcnj
--------------------------+-------------------------------------------------
 phqvesxdn otdsnk xzgw qxpzceb aysqdwj gremhpd cusdja
 http://www.esifukz.zsdlyxw.com

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1359>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 02:09:29 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 06:09:29 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231360=3A?=
	=?utf-8?q?_phajzen_gesf?=
Message-ID: <076.b8badd1330313fb32e243bd826d1a92f@vtiger.fosslabs.com>

#1360: phajzen gesf
--------------------------+-------------------------------------------------
Reporter:  test at test.com  |       Owner:  phajzen gesf
    Type:  defect         |      Status:  new         
Priority:  major          |   Component:  vtigercrm   
 Version:  5.0.0          |    Keywords:  phajzen gesf
--------------------------+-------------------------------------------------
 kfaldureq jtewkqcsd aoexzn vhuntfjl npgcw iuvafe cdwez <A
 href="http://www.gctau.pafhbq.com">lhiwfbxdg hcwuaqb</A>

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1360>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 02:09:38 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 06:09:38 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231361=3A?=
	=?utf-8?q?_kwxu_dgsbwtae?=
Message-ID: <076.1b75ad68cf558361fc44b91309481d8d@vtiger.fosslabs.com>

#1361: kwxu dgsbwtae
--------------------------+-------------------------------------------------
Reporter:  test at test.com  |       Owner:  kwxu dgsbwtae
    Type:  defect         |      Status:  new          
Priority:  major          |   Component:  vtigercrm    
 Version:  5.0.0          |    Keywords:  kwxu dgsbwtae
--------------------------+-------------------------------------------------
 sxguapml cjwlifq kudnr rlvnm cjfpny hwkjavpqg bhxc
 [URL=http://www.zvctprsn.qoyiau.com]bnsacfrdz yzdhvmo[/URL]

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1361>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 02:09:46 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 06:09:46 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231362=3A?=
	=?utf-8?q?_alrf_lmgo?=
Message-ID: <076.198951aac88d3004380ae68299abd85f@vtiger.fosslabs.com>

#1362: alrf lmgo
--------------------------+-------------------------------------------------
Reporter:  test at test.com  |       Owner:  alrf lmgo
    Type:  defect         |      Status:  new      
Priority:  major          |   Component:  vtigercrm
 Version:  5.0.0          |    Keywords:  alrf lmgo
--------------------------+-------------------------------------------------
 zxhd yweiqhb juynchvq aobml oeyqnvmw krvabso onklhw
 [URL]http://www.xlnymvwu.xvoe.com[/URL] yidnt mdhr

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1362>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 23 02:29:54 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 06:29:54 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7453 -
	/vtigercrm/trunk/modules/Users/RoleDetailView.php
Message-ID: <20060623062954.4A21C83F768@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 23 00:29:50 2006
New Revision: 7453

Log:
Updated roledetailview.php - ahmed

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

Modified: vtigercrm/trunk/modules/Users/RoleDetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Users/RoleDetailView.php (original)
+++ vtigercrm/trunk/modules/Users/RoleDetailView.php Fri Jun 23 00:29:50 2006
@@ -90,6 +90,6 @@
 $smarty->assign("PARENTNAME",$parentname);            
 
 
-$smarty->display("RoleDetailViewN.tpl");
+$smarty->display("RoleDetailView.tpl");
 
 ?>




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 23 02:30:02 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 06:30:02 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7454 -
	/vtigercrm/trunk/index.php
Message-ID: <20060623063002.55A552990A2@vtiger.fosslabs.com>

Author: richie
Date: Fri Jun 23 00:29:46 2006
New Revision: 7454

Log:
audit entry added

Modified:
    vtigercrm/trunk/index.php

Modified: vtigercrm/trunk/index.php
==============================================================================
--- vtigercrm/trunk/index.php (original)
+++ vtigercrm/trunk/index.php Fri Jun 23 00:29:46 2006
@@ -24,6 +24,7 @@
 global $category;
 require_once('include/utils/utils.php');
 
+
 if (version_compare(phpversion(), '5.0') < 0) {
     eval('
     function clone($object) {
@@ -189,6 +190,7 @@
 $skipSecurityCheck= false;
 //echo $module;
 // echo $action;
+
 if(isset($action) && isset($module))
 {
 	$log->info("About to take action ".$action);
@@ -311,16 +313,19 @@
 
 	$currentModuleFile = 'modules/'.$module.'/'.$action.'.php';
 	$currentModule = $module;
+	
+      	
 }
 elseif(isset($module))
 {
+	
 	$currentModule = $module;
 	$currentModuleFile = $moduleDefaultFile[$currentModule];
 }
 else {
     // use $default_module and $default_action as set in config.php
     // Redirect to the correct module with the correct action.  We need the URI to include these fields.
-  
+	  
 
         header("Location: index.php?action=$default_action&module=$default_module");
     exit();
@@ -547,6 +552,14 @@
 	$theme = $default_theme;
 }
 
+	
+
+//auditing
+$date_var = date('YmdHis');
+$query = "insert into vtiger_audit_trial values(".$adb->getUniqueID('vtiger_audit_trial').",".$current_user->id.",'".$module."','".$action."',$date_var)";
+$adb->query($query);
+
+
 //logging the security Information
 $seclog->debug('########  Module -->  '.$module.'  :: Action --> '.$action.' ::  UserID --> '.$current_user->id.'  #######');
 
@@ -555,8 +568,7 @@
 
 
 	require_once('include/utils/UserInfoUtil.php');
-
-        if(ereg('Ajax',$action))
+	if(ereg('Ajax',$action))
         {
                 $now_action=$_REQUEST['file'];
         }
@@ -564,6 +576,7 @@
         {
                 $now_action=$action;
         }
+        
 
         if(isset($_REQUEST['record']) && $_REQUEST['record'] != '')
         {




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 23 02:32:20 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 06:32:20 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7455 -
	/vtigercrm/trunk/modules/Users/Authenticate.php
Message-ID: <20060623063220.357C42990B4@vtiger.fosslabs.com>

Author: richie
Date: Fri Jun 23 00:32:03 2006
New Revision: 7455

Log:
insert into audit trial table done

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

Modified: vtigercrm/trunk/modules/Users/Authenticate.php
==============================================================================
--- vtigercrm/trunk/modules/Users/Authenticate.php (original)
+++ vtigercrm/trunk/modules/Users/Authenticate.php Fri Jun 23 00:32:03 2006
@@ -23,7 +23,7 @@
 require_once('modules/Users/User.php');
 require_once('modules/Users/CreateUserPrivilegeFile.php');
 require_once('include/logging.php');
-//require_once('modules/Users/AccessControl.php');
+
 
 global $mod_strings;
 
@@ -38,6 +38,13 @@
 
 if($focus->is_authenticated())
 {
+
+	$date_var = date('YmdHis');
+	$query = "insert into vtiger_audit_trial values(".$adb->getUniqueID('vtiger_audit_trial').",".$focus->id.",'Users','Authenticate',$date_var)";
+	$adb->query($query);
+
+
+	
 	// Recording the login info
         $usip=$_SERVER['REMOTE_ADDR'];
         $intime=date("Y/m/d H:i:s");




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 23 03:23:27 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 07:23:27 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7456 -
	/vtigercrm/trunk/schema/DatabaseSchema.xml
Message-ID: <20060623072328.2E2752990B9@vtiger.fosslabs.com>

Author: richie
Date: Fri Jun 23 01:23:09 2006
New Revision: 7456

Log:
add table vtiger_audit_trial

Modified:
    vtigercrm/trunk/schema/DatabaseSchema.xml

Modified: vtigercrm/trunk/schema/DatabaseSchema.xml
==============================================================================
--- vtigercrm/trunk/schema/DatabaseSchema.xml (original)
+++ vtigercrm/trunk/schema/DatabaseSchema.xml Fri Jun 23 01:23:09 2006
@@ -5283,4 +5283,15 @@
 		<opt platform="mysql">Type=InnoDB</opt>
 	</table>
 
+	<table name="vtiger_audit_trial">
+		<field name="auditid" type="I" size="19">
+			<key />
+		</field>
+		<field name="userid" type="I" size="19" />
+		<field name="module" type="C" size="255" />
+		<field name="action" type="C" size="255" />
+		<field name="actiondate" type="T"/>
+		<opt platform="mysql">Type=InnoDB</opt>
+	</table>
+
 </schema>




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 23 05:39:13 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 09:39:13 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7457 -
	/vtigercrm/trunk/modules/Reports/Reports.php
Message-ID: <20060623093913.9849F83F770@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 23 03:39:09 2006
New Revision: 7457

Log:
Added Profile check in query

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

Modified: vtigercrm/trunk/modules/Reports/Reports.php
==============================================================================
--- vtigercrm/trunk/modules/Reports/Reports.php (original)
+++ vtigercrm/trunk/modules/Reports/Reports.php Fri Jun 23 03:39:09 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",
@@ -316,7 +316,7 @@
 		}
 		else
 		{
-
+			
 			$sql = "select * from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.uitype != 50 and vtiger_field.tabid=".$tabid." and vtiger_field.block in (".$block .") and vtiger_field.displaytype in (1,2) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList." group by vtiger_field.fieldid order by sequence";
 		}
 		$result = $adb->query($sql);
@@ -458,6 +458,7 @@
 		global $adb;
 		global $log;
 		global $current_user;
+		global $profileList;
 		require('user_privileges/user_privileges_'.$current_user->id.'.php');		
 
 		$tabid = getTabid($module);
@@ -473,7 +474,6 @@
 		}
 		else
 		{
-			$profileList = getCurrentUserProfileList();			
 			$sql = "select * from vtiger_field inner join vtiger_tab on vtiger_tab.tabid = vtiger_field.tabid inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid  where vtiger_field.tabid=".$tabid." and (vtiger_field.uitype =5 or vtiger_field.displaytype=2) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_field.block in (".$blockids.") and vtiger_profile2field.profileid in ".$profileList." order by vtiger_field.sequence";
 
 		}
@@ -925,6 +925,7 @@
 		global $adb;
 		global $log;
 		global $current_user;
+		global $profileList;
 		require('user_privileges/user_privileges_'.$current_user->id.'.php');
 		$tabid = getTabid($module);
 		$escapedchars = Array('_SUM','_AVG','_MIN','_MAX');
@@ -934,7 +935,6 @@
 		}
 		else
 		{
-			$profileList = getCurrentUserProfileList();
 			$ssql = "select * from vtiger_field inner join vtiger_tab on vtiger_tab.tabid = vtiger_field.tabid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid  where vtiger_field.uitype != 50 and vtiger_field.tabid=".$tabid." and vtiger_field.displaytype = 1 and vtiger_def_org_field.visible=0 and vtiger_profile2field.visible=0 and vtiger_profile2field.profileid in ".$profileList." order by sequence";
 		}
 		$result = $adb->query($ssql);




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 23 06:00:15 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 10:00:15 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7458 -
	/vtigercrm/trunk/include/language/en_us.lang.php
Message-ID: <20060623100015.5276B83F796@vtiger.fosslabs.com>

Author: richie
Date: Fri Jun 23 03:59:52 2006
New Revision: 7458

Log:
New UI for Custom Field has been integrated

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

Modified: vtigercrm/trunk/include/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/include/language/en_us.lang.php (original)
+++ vtigercrm/trunk/include/language/en_us.lang.php Fri Jun 23 03:59:52 2006
@@ -917,7 +917,8 @@
 'LBL_PO_STATUS'=>'PurchaseOrder Status',
 'LBL_SO_STATUS'=>'SalesOrder Status',
 'LBL_INVOICE_STATUS'=>'Invoice Status',
-
+'LBL_NOTE'=>'Note',
+'LBL_MODULE'=>'Module',
 );
 
 




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 23 06:01:08 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 10:01:08 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7459 -
 /vtigercrm/trunk/modules/Settings/language/en_us.lang.php
Message-ID: <20060623100108.BB8C383F79D@vtiger.fosslabs.com>

Author: richie
Date: Fri Jun 23 04:00:47 2006
New Revision: 7459

Log:
Language strings added as New UI integrated for CustomField

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 Fri Jun 23 04:00:47 2006
@@ -408,11 +408,11 @@
 
 'LBL_CUSTOM_FIELD_SETTINGS'=>'Custom Field Settings',
 
-'LBL_CREATE_AND_MANAGE_USER_DEFINED_FIELDS'=>'Create and Manage user defined fields...',
+'LBL_CREATE_AND_MANAGE_USER_DEFINED_FIELDS'=>'Manage user defined fields...',
 
 'LBL_SELECT_MODULE'=>'Select Module',
 
-'LBL_SELECT_CF_TEXT'=>'Select the CRM module to show CustomFields :',
+'LBL_SELECT_CF_TEXT'=>'Select the CRM module:',
 
 
 
@@ -666,6 +666,10 @@
 'LBL_SELECT_CRM_MODULE'=>'Select crm module',
 'LBL_TAX_SETTINGS'=>'Tax Settings',
 'LBL_INVENTORY_TAX_CONFIG'=>'Inventory Tax Configuration',
+'LBL_CUSTOM_MAPP_INFO'=>'Only Leads module support mapping of fields with other modules.',
+'LBL_MAPPING_OTHER_MODULES'=>'Mapping with other Modules',
+'LBL_CUSTOM_FILED_IN'=>'Custom Fields in ',
+'LBL_EDIT_FIELD_MAPPING'=>'Editing Field Mapping',
 );
 
 




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 23 06:02:37 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 10:02:37 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7460 - in /vtigercrm/trunk:
 Smarty/templates/ modules/Settings/
Message-ID: <20060623100237.A574683F778@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 23 04:02:27 2006
New Revision: 7460

Log:
New UI Integrated for Custom Field

Modified:
    vtigercrm/trunk/Smarty/templates/CustomFieldEntries.tpl
    vtigercrm/trunk/Smarty/templates/CustomFieldList.tpl
    vtigercrm/trunk/Smarty/templates/CustomFieldMapping.tpl
    vtigercrm/trunk/Smarty/templates/SetMenu.tpl
    vtigercrm/trunk/Smarty/templates/Settings.tpl
    vtigercrm/trunk/modules/Settings/CustomFieldList.php
    vtigercrm/trunk/modules/Settings/LeadCustomFieldMapping.php
    vtigercrm/trunk/modules/Settings/SaveConvertLead.php

Modified: vtigercrm/trunk/Smarty/templates/CustomFieldEntries.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/CustomFieldEntries.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/CustomFieldEntries.tpl Fri Jun 23 04:02:27 2006
@@ -8,52 +8,53 @@
  * All Rights Reserved.
 *
  ********************************************************************************/ *}
-				<table width="100%"><tr>
-					<td align="right" valign="top" width="5%" rowspan="2"><img src="{$IMAGE_PATH}two.gif" width="29" height="31" /></td>
-					<td>
-						<b class="lvtHeaderText">{$MOD.CustomFields} in {$MODULE}</b>
-					</td>
+				<form action="index.php" method="post" name="form">
+				<input type="hidden" name="fld_module" value="{$MODULE}">
+				<input type="hidden" name="module" value="Settings">
+				<input type="hidden" name="parenttab" value="Settings">
+				<input type="hidden" name="mode">
+				<table class="listTableTopButtons" border="0" cellpadding="5" cellspacing="0" width="100%">
+				<tr>
+					<td class="small">&nbsp;</td>
+					<td class="small" align="right">&nbsp;&nbsp;
+					{if $MODULE eq 'Leads'}
+					&nbsp;&nbsp;<input input title="{$MOD.CUSTOMFIELDMAPPING}"  class="crmButton edit small" onclick="CustomFieldMapping();" type="button" name="ListLeadCustomFieldMapping" value="{$MOD.CUSTOMFIELDMAPPING}">
+					{/if}
+					<input type="button" value=" {$MOD.NewCustomField} " onClick="getCreateCustomFieldForm('{$MODULE}','','','')" class="crmButton create small"/>
 				</tr>
-				<tr>
-					<td>
-						<form action="index.php" method="post" name="form">
-						<input type="hidden" name="fld_module" value="{$MODULE}">
-						<input type="hidden" name="module" value="Settings">
-						<input type="hidden" name="parenttab" value="Settings">
-						<input type="hidden" name="mode">
-						<table width="95%" border="0" cellpadding="5" cellspacing="0">
-							<tr><td align="right"><input type="button" value=" {$MOD.NewCustomField} " onClick="getCreateCustomFieldForm('{$MODULE}','','','')" class="classBtn"/></td></tr>
-						</table>
-						<table style="background-color: rgb(204, 204, 204);" class="small" border="0" cellpadding="5" cellspacing="1" width="95%">
-						<tbody>
-							<tr>
-								<td class="lvtCol" width="5%">#</td>
-							        <td class="lvtCol" width="35%">{$MOD.FieldLabel}</td>
-							        <td class="lvtCol" width="50%">{$MOD.FieldType}</td>
-								<td class="lvtCol" width="10%">{$MOD.LBL_CURRENCY_TOOL}</td>
-							</tr>
-							{foreach item=entries key=id from=$CFENTRIES}
-							<tr class="lvtColData" onmouseover="this.className='lvtColDataHover'" onmouseout="this.className='lvtColData'" bgcolor="white">
-								{foreach item=value from=$entries}
-									<td nowrap>{$value}</td>
-								{/foreach}
-							</tr>
-							{/foreach}
-						</tbody>
-						</table><br />
-						{if $MODULE eq 'Leads'}
-						<table width="35%" style="border:1px dashed #CCCCCC;background-color:#FFFFEC;" cellpadding="5" cellspacing="0">
-							<tr>
-								<td style="padding:5px;" width="5%" >
-								<img src="{$IMAGE_PATH}mapping.gif" align="absmiddle" /> </td>
-								<td><span  class="genHeaderSmall">{$MOD.LBL_FIELD_MAPPING}</span><br />
-								{$MOD.LBL_FIELD_MAPPING} {$MOD.LBL_CUSTM_MSG} 
-								</td>
-							</tr>
-							<tr><td colspan="2" align="right"><input input title="{$MOD.CUSTOMFIELDMAPPING}"  class="classBtn" onclick="CustomFieldMapping();" type="button" name="ListLeadCustomFieldMapping" value="{$MOD.CUSTOMFIELDMAPPING}"></td></tr>
-						</table> 
-						{/if}
-					</form>
-					</td>
-				</tr></table>
+				</table>
 
+				<table class="listTable" border="0" cellpadding="5" cellspacing="0" width="100%">
+					{if $MODULE eq 'Leads'}
+					<tr>
+						<td rowspan="2" class="colHeader small" width="5%">#</td>
+					        <td rowspan="2" class="colHeader small" width="20%">{$MOD.FieldLabel}</td>
+					        <td rowspan="2" class="colHeader small" width="20%">{$MOD.FieldType}</td>
+							<td colspan="3" class="colHeader small" valign="top"><div align="center">{$MOD.LBL_MAPPING_OTHER_MODULES}</div></td>
+					        <td rowspan="2" class="colHeader small" width="20%">{$MOD.LBL_CURRENCY_TOOL}</td>
+				      </tr>
+
+					<tr>
+					  <td class="colHeader small" valign="top" width="18%">Accounts</td>
+					  <td class="colHeader small" valign="top" width="18%">Contacts</td>
+					  <td class="colHeader small" valign="top" width="19%">Potentials</td>
+					</tr>
+					{else}
+					<tr>
+                      	<td class="colHeader small" width="5%">#</td>
+                      	<td class="colHeader small" width="20%">{$MOD.FieldLabel}</td>
+                      	<td class="colHeader small" width="20%">{$MOD.FieldType}</td>
+                     	<td class="colHeader small" width="20%">{$MOD.LBL_CURRENCY_TOOL}</td>
+					</tr>
+					{/if}
+					{foreach item=entries key=id from=$CFENTRIES}
+					<tr>
+						{foreach item=value from=$entries}
+							<td class="listTableRow small" valign="top" nowrap>{$value}</td>
+						{/foreach}
+					</tr>
+					{/foreach}
+		</table>
+		</form>
+		<br>
+		<strong>{$APP.LBL_NOTE}: </strong> {$MOD.LBL_CUSTOM_MAPP_INFO}

Modified: vtigercrm/trunk/Smarty/templates/CustomFieldList.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/CustomFieldList.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/CustomFieldList.tpl Fri Jun 23 04:02:27 2006
@@ -10,23 +10,23 @@
  ********************************************************************************/ *}
 <script language="JavaScript" type="text/javascript" src="include/js/customview.js"></script>
 <script language="javascript">
-{literal}
-
 function getCustomFieldList(customField)
-{
+{ldelim}
 	var modulename = customField.options[customField.options.selectedIndex].value;
+	$('module_info').innerHTML = '{$MOD.LBL_CUSTOM_FILED_IN} "'+modulename+'" {$APP.LBL_MODULE}';
 	new Ajax.Request(
 		'index.php',
-		{queue: {position: 'end', scope: 'command'},
+		{ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
 			method: 'post',
 			postBody: 'module=Settings&action=SettingsAjax&file=CustomFieldList&fld_module='+modulename+'&parenttab=Settings&ajax=true',
-			onComplete: function(response) {
+			onComplete: function(response) {ldelim}
 				$("cfList").innerHTML=response.responseText;
-			}
-		}
+			{rdelim}
+		{rdelim}
 	);	
-}
+{rdelim}
 
+{literal}
 function deleteCustomField(id, fld_module, colName, uitype)
 {
         if(confirm("Are you sure?"))
@@ -60,49 +60,78 @@
 {/literal}
 </script>
 <div id="createcf" style="display:block;position:absolute;top:175px;left:275px;"></div>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-<tr>
-        {include file='SettingsMenu.tpl'}
-<td width="75%" valign="top">
-<b><font color=red>{$DUPLICATE_ERROR} </font></b>
-<table width="99%" border="0" cellpadding="0" cellspacing="0" align="center">
-	<tr>
-		<td class="showPanelBg" valign="top" style="padding-left:20px; "><br />
-	       	        <span class="lvtHeaderText">{$MOD.LBL_SETTINGS} &gt; {$MOD.LBL_STUDIO} &gt; {$MOD.LBL_CUSTOM_FIELD_SETTINGS} </span>
-        	        <hr noshade="noshade" size="1" />
+<br>
+<table align="center" border="0" cellpadding="0" cellspacing="0" width="98%">
+<tbody><tr>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
+        <td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
+        <br>
+
+	<div align=center>
+			{include file='SetMenu.tpl'}
+			<!-- DISPLAY -->
+			<b><font color=red>{$DUPLICATE_ERROR} </font></b>
+			
+				<table class="settingsSelUITopLine" border="0" cellpadding="5" cellspacing="0" width="100%">
+				<tbody><tr>
+					<td rowspan="2" valign="top" width="50"><img src="{$IMAGE_PATH}custom.gif" alt="Users" title="Users" border="0" height="48" width="48"></td>
+					<td class="heading2" valign="bottom"><b>{$MOD.LBL_SETTINGS} &gt; {$MOD.LBL_STUDIO} &gt; {$MOD.LBL_CUSTOM_FIELD_SETTINGS}</b></td>
+				</tr>
+
+				<tr>
+					<td class="small" valign="top">{$MOD.LBL_CREATE_AND_MANAGE_USER_DEFINED_FIELDS}</td>
+				</tr>
+				</tbody></table>
+				
+				<br>
+				<table border="0" cellpadding="10" cellspacing="0" width="100%">
+				<tbody><tr>
+				<td>
+
+				<table class="tableHeading" border="0" cellpadding="5" cellspacing="0" width="100%">
+				<tbody><tr>
+					<td class="big" nowrap><strong><span id="module_info">{$MOD.LBL_CUSTOM_FILED_IN} "{$APP.$MODULE}" {$APP.LBL_MODULE}</span></strong> </td>
+					<td class="small" align="right">
+					{$MOD.LBL_SELECT_CF_TEXT}
+		                	<select name="pick_module" class="importBox" onChange="getCustomFieldList(this)">
+                		        {foreach key=sel_value item=value from=$MODULES}
+		                        {if $MODULE eq $sel_value}
+                	                       	{assign var = "selected_val" value="selected"}
+		                        {else}
+                        	                {assign var = "selected_val" value=""}
+                                	{/if}
+	                                <option value="{$sel_value}" {$selected_val}>{$APP.$value}</option>
+        		                {/foreach}
+			                </select>
+					</td>
+					</tr>
+				</tbody>
+				</table>
+				<div id="cfList">
+                                {include file="CustomFieldEntries.tpl"}
+                </div>	
+			<table border="0" cellpadding="5" cellspacing="0" width="100%">
+			<tr>
+
+		  	<td class="small" align="right" nowrap="nowrap"><a href="#top">[Scroll to Top]</a></td>
+			</tr>
+			</table>
+			</td>
+			</tr>
+			</table>
+		<!-- End of Display -->
+		
 		</td>
-	</tr>
-	
-	<tr><td>&nbsp;</td></tr>
-	<tr>
-		<td>
-			<table width="95%" cellpadding="5" cellspacing="0" class="leadTable" align="center">
-				<tr>
-					<td style="padding:5px;border-bottom:2px dotted #CCCCCC;" width="5%" >
-						<img src="{$IMAGE_PATH}mapping.gif" align="left" />
-					</td>
-					<td style="padding:5px;border-bottom:2px dotted #AAAAAA;">
-						<span class="genHeaderGrayBig">{$MOD.LBL_CUSTOM_FIELD_SETTINGS}</span>
-						<br />
-						<span class="big">{$MOD.LBL_CREATE_AND_MANAGE_USER_DEFINED_FIELDS}</span>
-					</td>
-				</tr>
-				<tr><td colspan="2">&nbsp;</td></tr>
-				{include file="CustomFieldCombo.tpl"}
-				<tr><td colspan="2">&nbsp;</td></tr>
-				<tr><td colspan ="2">
-				
-						<div id="cfList">
-				{include file="CustomFieldEntries.tpl"}					
-						</div>
+        </tr>
+        </table>
+        </td>
+        </tr>
+        </table>
+        </div>
 
-				</td></tr>
-				<tr><td colspan="2">&nbsp;</td></tr>
-			</table>
-		</td>
-	</tr>
+        </td>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
+        </tr>
+</tbody>
 </table>
-</td>
-</tr>
-</table>
-        {include file='SettingsSubMenu.tpl'}
+<br>

Modified: vtigercrm/trunk/Smarty/templates/CustomFieldMapping.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/CustomFieldMapping.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/CustomFieldMapping.tpl Fri Jun 23 04:02:27 2006
@@ -9,100 +9,119 @@
 *
  ********************************************************************************/ *}
 <script language="JavaScript" type="text/javascript" src="include/js/customview.js"></script>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-	<tr>
-		{include file='SettingsMenu.tpl'}
-		<td width="75%" valign="top">
-		<table width="99%" border="0" cellpadding="0" cellspacing="0" align="center">
-			<tr>
-				<td class="showPanelBg" valign="top" style="padding-left:20px; "><br />
-				<span class="lvtHeaderText">{$MOD.LBL_SETTINGS} &gt; {$MOD.LBL_STUDIO} &gt; {$MOD.LBL_CUSTOM_FIELD_SETTINGS} </span>
-				<hr noshade="noshade" size="1" />
-				</td>
-			</tr>
-			<tr><td>&nbsp;</td></tr>
-			<tr>
-				</td>
+<br>
+<table align="center" border="0" cellpadding="0" cellspacing="0" width="98%">
+<tbody><tr>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
+        <td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
+        <br>
+
+		<div align=center>
+			{include file='SetMenu.tpl'}
+			<!-- DISPLAY -->
+				<table class="settingsSelUITopLine" border="0" cellpadding="5" cellspacing="0" width="100%">
+				<tr>
+					<td rowspan="2" valign="top" width="50"><img src="{$IMAGE_PATH}custom.gif" alt="Users" title="Users" border="0" height="48" width="48"></td>
+					<td class="heading2" valign="bottom"><b>{$MOD.LBL_SETTINGS} &gt; {$MOD.LBL_STUDIO} &gt; {$MOD.LBL_CUSTOM_FIELD_SETTINGS}</b></td>
+				</tr>
+
+				<tr>
+					<td class="small" valign="top">{$MOD.LBL_CREATE_AND_MANAGE_USER_DEFINED_FIELDS}</td>
+				</tr>
+				</table>
+				
+				<br>
 				<form action="index.php?module=Settings&action=SaveConvertLead" method="post" name="index">
-				<table class="leadTable" align="center" cellpadding="5" cellspacing="0" width="95%">
-					<tr>
-						<td style="border-bottom: 2px dotted rgb(204, 204, 204); padding: 5px;" width="5%">
-						<img src="{$IMAGE_PATH}mapping.gif" align="middle" height="48" width="48">
-						</td>
-						<td style="border-bottom: 2px dotted rgb(170, 170, 170); padding: 5px;">
-						<span class="genHeaderGrayBig">{$MOD.LBL_LEAD_MAP_CUSTOM_FIELD}</span><br>
-						<span>{$MOD.leadCustomFieldDescription}</span>
-						</td>
-					</tr>
-					<tr><td colspan="2">&nbsp;</td></tr>
-					<tr>
-						<td align="right">&nbsp;</td>
-						<td><b class="lvtHeaderText">{$MOD.LBL_MAPPING_INFO}</b></td>
-					</tr>
-					<tr>
-						<td>&nbsp;</td>
-						<td>
-							<table style="background-color: rgb(204, 204, 204);" class="small" border="0" cellpadding="5" cellspacing="1" width="95%">
-								<tr>
-									<td class="lvtCol" width="25%">{$MOD.LBL_LEAD_FIELD}</td>
-									<td class="lvtCol" width="25%">{$MOD.LBL_ACCOUNT_FIELD}</td>
-									<td class="lvtCol" width="25%">{$MOD.LBL_CONTACT_FIELD}</td>
-									<td class="lvtCol" width="25%">{$MOD.LBL_POTENTIAL_FIELD}</td>	
-								<tr>
-								{foreach key=leadcf item=cfarray from=$CUSTOMFIELDMAPPING}
-									<tr class="lvtColData" bgcolor="white">
-									<td bgcolor="#e1e1e1">{$leadcf}</td>
-									{foreach item=acc_cf key=fldnameacc from=$cfarray.account}
-										<td>
-										<select name='{$fldnameacc}'>
-										<option value='None'>{$APP.LBL_NONE}</option>
-										{foreach item=element from=$acc_cf}
-										<option value="{$element.fieldid}" {$element.selected}>{$element.fieldlabel}</option>
-										{/foreach}
-										</td>
-										</select>
-									{/foreach}
-									{foreach item=con_cf key=fldnamecon from=$cfarray.contact}
-                                                                                <td>
-                                                                                <select name='{$fldnamecon}'>
-										<option value='None'>{$APP.LBL_NONE}</option>
-										{foreach item=element from=$con_cf}
-										<option value="{$element.fieldid}" {$element.selected}>{$element.fieldlabel}</option>
-										{/foreach}
-										</td>
-                                                                                </select>                                                                                             {/foreach}
-									{foreach item=pot_cf key=fldnamepot from=$cfarray.potential}
-										<td>
-										<select name='{$fldnamepot}'>
-										<option value='None'>{$APP.LBL_NONE}</option>
-										{foreach item=element from=$pot_cf}
-										<option value="{$element.fieldid}" {$element.selected}>{$element.fieldlabel}</option>
-										{/foreach}
-										</td>
-                                                                                </select>                                                                                             {/foreach}
-									</tr>
-								{/foreach}
-							</table>
-						</td>
-					</tr>
-					<tr>
-						<td colspan="2" style="border-bottom: 2px dotted rgb(170, 170, 170); padding: 5px;">&nbsp;</td>
-					</tr>
-					<tr>
-						<td colspan="2" style="border-bottom: 2px dotted rgb(170, 170, 170); padding: 5px;" align="center">
-							<input title="{$APP.LBL_SAVE_BUTTON_LABEL}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" name="save" value=" &nbsp;{$APP.LBL_SAVE_BUTTON_LABEL}&nbsp; " class="classBtn" type="submit" onclick ="return validateCustomFieldAccounts();">&nbsp;
-							<input title="{$APP.LBL_CANCEL_BUTTON_LABEL}>" accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" name="cancel" value=" {$APP.LBL_CANCEL_BUTTON_LABEL} " onclick = "gotourl('index.php?action=CustomFieldList&module=Settings&fld_module=Leads&parenttab=Settings')"  class="classBtn" type="button">
-					  	</td>
-					</tr>
-					<tr>
-						<td colspan="2">&nbsp;</td>
-					</tr>
+				<table class="tableHeading" border="0" cellpadding="5" cellspacing="0" width="100%">
+				<tr>
+					<td class="big"><strong>{$MOD.LBL_EDIT_FIELD_MAPPING}</strong> </td>
+					<td class="small" align="right">&nbsp;
+					</td>
+				</tr>
+				</table>
+
+				<table class="listTableTopButtons" border="0" cellpadding="5" cellspacing="0" width="100%">
+				<tr>
+					<td class="small">&nbsp;</td>
+					<td class="small" align="right">&nbsp;&nbsp;
+					<input title="{$APP.LBL_SAVE_BUTTON_LABEL}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" name="save" value=" &nbsp;{$APP.LBL_SAVE_BUTTON_LABEL}&nbsp; " class="crmButton small save" type="submit" onclick ="return validateCustomFieldAccounts();">&nbsp;
+                     <input title="{$APP.LBL_CANCEL_BUTTON_LABEL}>" accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" name="cancel" value=" {$APP.LBL_CANCEL_BUTTON_LABEL} " onclick = "gotourl('index.php?action=CustomFieldList&module=Settings&fld_module=Leads&parenttab=Settings')"  class="crmButton small cancel" type="button">
+				</tr>
+				</table>
+				<table class="listTable" border="0" cellpadding="5" cellspacing="0" width="100%">
+				<tr>
+					<td rowspan="2" class="colHeader small" width="2%">#</td>
+					<td rowspan="2" class="colHeader small" width="15%">Field Label</td>
+					<td rowspan="2" class="colHeader small" width="15%">Field Type </td>
+					<td colspan="3" class="colHeader small" valign="top"><div align="center">{$MOD.LBL_MAPPING_OTHER_MODULES}</div></td>
+				</tr>
+				<tr>
+					<td class="colHeader small" valign="top" width="23%">{$APP.Accounts}</td>
+					<td class="colHeader small" valign="top" width="23%">{$APP.Contacts}</td>
+					<td class="colHeader small" valign="top" width="24%">{$APP.Potentials}</td>
+				</tr>
+				{foreach key=leadcf item=cfarray from=$CUSTOMFIELDMAPPING}
+				<tr>
+					<td class="listTableRow small">{$cfarray.sno}</td>
+					<td class="listTableRow small">{$cfarray.leadid}</td>
+					<td class="listTableRow small">{$cfarray.fieldtype}</td>
+					{foreach item=acc_cf key=fldnameacc from=$cfarray.account}
+					<td class="listTableRow small">
+						<select name='{$fldnameacc}'>
+						<option value='None'>{$APP.LBL_NONE}</option>
+						{foreach item=element from=$acc_cf}
+							<option value="{$element.fieldid}" {$element.selected}>{$element.fieldlabel}</option>
+						{/foreach}
+						</select>
+					</td>
+					{/foreach}
+					{foreach item=con_cf key=fldnamecon from=$cfarray.contact}
+                    <td class="listTableRow small">
+                        <select name='{$fldnamecon}'>
+						<option value='None'>{$APP.LBL_NONE}</option>
+						{foreach item=element from=$con_cf}
+							<option value="{$element.fieldid}" {$element.selected}>{$element.fieldlabel}</option>
+						{/foreach}
+                        </select>
+					</td>
+				  	{/foreach}
+					{foreach item=pot_cf key=fldnamepot from=$cfarray.potential}
+					<td class="listTableRow small">
+						<select name='{$fldnamepot}'>
+						<option value='None'>{$APP.LBL_NONE}</option>
+						{foreach item=element from=$pot_cf}
+							<option value="{$element.fieldid}" {$element.selected}>{$element.fieldlabel}</option>
+						{/foreach}
+                        </select>
+					</td>
+				    {/foreach}
+				</tr>
+				{/foreach}
+				</table>
+				<table border="0" cellpadding="5" cellspacing="0" width="100%">
+				<tr>
+					<td class="small">
+		        	<strong>{$APP.LBL_NOTE}: </strong> {$MOD.LBL_CUSTOM_MAPP_INFO}
+					</td>
+				</tr>
+				</table>
+				<table border="0" cellpadding="5" cellspacing="0" width="100%">
+				<tr>
+		  			<td class="small" align="right" nowrap="nowrap"><a href="#top">[Scroll to Top]</a></td>
+				</tr>
 				</table>
 				</form>
-			</td>
+				<br>
+		</td>
 		</tr>
-	</td>
-</tr></table>
-{include file='SettingsSubMenu.tpl'}			
-</td></tr></table>
-			
+		</table>
+        </td>
+        </tr>
+        </table>
+        </div>
+
+        </td>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
+        </tr>
+</tbody>
+</table>

Modified: vtigercrm/trunk/Smarty/templates/SetMenu.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/SetMenu.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/SetMenu.tpl Fri Jun 23 04:02:27 2006
@@ -56,7 +56,11 @@
 				{/if}
 	
 				<tr><td class="settingsTabHeader" nowrap>{$MOD.LBL_STUDIO}</td></tr>
-				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=SettingsSubMenu&type=CustomField&parenttab=Settings">{$MOD.LBL_CUSTOM_FIELDS}</a></td></tr>
+				{if  $smarty.request.action eq 'CustomFieldList' || $smarty.request.action eq 'LeadCustomFieldMapping'}
+				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_CUSTOM_FIELDS}</td></tr>
+				{else}
+				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=CustomFieldList&parenttab=Settings">{$MOD.LBL_CUSTOM_FIELDS}</a></td></tr>
+				{/if}
 				
 				{if  $smarty.request.action eq 'PickList' ||  $smarty.request.action eq 'SettingsAjax'}
 				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_PICKLIST_EDITOR}</td></tr>						     {else}
@@ -65,7 +69,7 @@
 	
 				<tr><td class="settingsTabHeader" nowrap>{$MOD.LBL_COMMUNICATION_TEMPLATES}</td></tr>
 
-				{if $smarty.request.action eq 'listemailtemplates' || $smarty.request.action eq 'detailviewemailtemplate' || $smarty.request.action eq 'editemailtemplate' || $smarty.request.action eq 'saveemailtemplate' || $smarty.request.action eq 'deleteemailtemplate'}
+				{if $smarty.request.action eq 'listemailtemplates' || $smarty.request.action eq 'detailviewemailtemplate' || $smarty.request.action eq 'editemailtemplate' || $smarty.request.action eq 'saveemailtemplate' || $smarty.request.action eq 'deleteemailtemplate' || $smarty.request.action eq 'createemailtemplate'}
 				<tr><td class="settingsTabSelected" nowrap>{$MOD.EMAILTEMPLATES}</td></tr>
 				{else}
 				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=listemailtemplates&parenttab=Settings">{$MOD.EMAILTEMPLATES}</a></td></tr>

Modified: vtigercrm/trunk/Smarty/templates/Settings.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Settings.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Settings.tpl Fri Jun 23 04:02:27 2006
@@ -182,8 +182,8 @@
 					<!-- icon 9-->
 						<table border=0 cellspacing=0 cellpadding=5 width=100%>
 						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=SettingsSubMenu&type=CustomField&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}custom.gif" alt="{$MOD.LBL_CUSTOM_FIELDS}" title="{$MOD.LBL_CUSTOM_FIELDS}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Settings&action=SettingsSubMenu&type=CustomField&parenttab=Settings">{$MOD.LBL_CUSTOM_FIELDS}</a></td>
+							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=CustomFieldList&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}custom.gif" alt="{$MOD.LBL_CUSTOM_FIELDS}" title="{$MOD.LBL_CUSTOM_FIELDS}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Settings&action=CustomFieldList&parenttab=Settings">{$MOD.LBL_CUSTOM_FIELDS}</a></td>
 						</tr>
 						<tr>
 

Modified: vtigercrm/trunk/modules/Settings/CustomFieldList.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/CustomFieldList.php (original)
+++ vtigercrm/trunk/modules/Settings/CustomFieldList.php Fri Jun 23 04:02:27 2006
@@ -9,15 +9,14 @@
 *
  ********************************************************************************/
 require_once('Smarty_setup.php');
-require_once('modules/Settings/SettingsSubMenu.php');
 require_once('include/database/PearDatabase.php');
 require_once('include/CustomFieldUtil.php');
+
 global $mod_strings;
+global $app_strings;
 $smarty=new vtigerCRM_Smarty;
-$fld_module = $_REQUEST['fld_module'];
-$smarty->assign("MODULE",$fld_module);
-$smarty->assign("CFENTRIES",getCFListEntries($fld_module));
 $smarty->assign("MOD",$mod_strings);
+$smarty->assign("APP",$app_strings);
 global $theme;
 $theme_path="themes/".$theme."/";
 $image_path=$theme_path."images/";
@@ -35,9 +34,45 @@
                         'SalesOrder'=>'SalesOrder',
                         'Quotes'=>'Quotes',
                         'Invoice'=>'Invoice',
-			'Campaigns'=>'Campaigns'
+						'Campaigns'=>'Campaigns'
                         );
+$cfimagecombo = Array($image_path."text.gif",
+$image_path."number.gif",
+$image_path."percent.gif",
+$image_path."currency.gif",
+$image_path."date.gif",
+$image_path."email.gif",
+$image_path."phone.gif",
+$image_path."picklist.gif",
+$image_path."url.gif",
+$image_path."checkbox.gif",
+$image_path."text.gif",
+$image_path."picklist.gif");
+
+$cftextcombo = Array($mod_strings['Text'],
+$mod_strings['Number'],
+$mod_strings['Percent'],
+$mod_strings['Currency'],
+$mod_strings['Date'],
+$mod_strings['Email'],
+$mod_strings['Phone'],
+$mod_strings['PickList'],
+$mod_strings['LBL_URL'],
+$mod_strings['LBL_CHECK_BOX'],
+$mod_strings['LBL_TEXT_AREA'],
+$mod_strings['LBL_MULTISELECT_COMBO']
+);
+
+
 $smarty->assign("MODULES",$module_array);
+$smarty->assign("CFTEXTCOMBO",$cftextcombo);
+$smarty->assign("CFIMAGECOMBO",$cfimagecombo);
+if($_REQUEST['fld_module'] !='')
+	$fld_module = $_REQUEST['fld_module'];
+else
+	$fld_module = 'Leads';
+$smarty->assign("MODULE",$fld_module);
+$smarty->assign("CFENTRIES",getCFListEntries($fld_module));
 if(isset($_REQUEST["duplicate"]) && $_REQUEST["duplicate"] == "yes")
 {
 	$error='Custom Field in the Name '.$_REQUEST["fldlabel"].' already exists. Please specify a different Label';
@@ -48,4 +83,71 @@
 else
 	$smarty->display('CustomFieldEntries.tpl');
 
+function getCFListEntries($module)
+{
+	$tabid = getTabid($module);
+	global $adb;
+	global $theme;
+	$theme_path="themes/".$theme."/";
+	$image_path=$theme_path."images/";
+	$dbQuery = "select fieldid,columnname,fieldlabel,uitype,displaytype,vtiger_convertleadmapping.cfmid from vtiger_field left join vtiger_convertleadmapping on  vtiger_convertleadmapping.leadfid = vtiger_field.fieldid where tabid=".$tabid." and generatedtype=2 order by sequence";
+	$result = $adb->query($dbQuery);
+	$row = $adb->fetch_array($result);
+	$count=1;
+	$cflist=Array();
+	if($row!='')
+	{
+		do
+		{
+			$cf_element=Array();
+			$cf_element['no']=$count;
+			$cf_element['label']=$row["fieldlabel"];
+			$fld_type_name = getCustomFieldTypeName($row["uitype"]);
+			$cf_element['type']=$fld_type_name;
+			if($module == 'Leads')
+			{
+				$mapping_details = getListLeadMapping($row["cfmid"]);
+				$cf_element[]= $mapping_details['accountlabel'];
+				$cf_element[]= $mapping_details['contactlabel'];
+				$cf_element[]= $mapping_details['potentiallabel'];
+			}
+			$cf_element['tool']='<img src="'.$image_path.'editfield.gif" border="0" onClick="getCreateCustomFieldForm(\''.$module.'\',\''.$row["fieldid"].'\',\''.$tabid.'\',\''.$row["uitype"].'\')" alt="Edit" title="Edit"/>&nbsp;|&nbsp;<a href="javascript:deleteCustomField('.$row["fieldid"].',\''.$module.'\', \''.$row["columnname"].'\', \''.$row["uitype"].'\')"><img src="'.$image_path.'delete.gif" border="0"  alt="Delete" title="Delete"/></a>';
+
+			$cflist[] = $cf_element;
+			$count++;
+		}while($row = $adb->fetch_array($result));
+	}
+	return $cflist;
+}
+function getListLeadMapping($cfid)
+{
+	global $adb;
+	$sql="select * from vtiger_convertleadmapping where cfmid =".$cfid;
+	$result = $adb->query($sql);
+	$noofrows = $adb->num_rows($result);
+	for($i =0;$i <$noofrows;$i++)
+	{
+		$leadid = $adb->query_result($result,$i,'leadfid');
+		$accountid = $adb->query_result($result,$i,'accountfid');
+		$contactid = $adb->query_result($result,$i,'contactfid');
+		$potentialid = $adb->query_result($result,$i,'potentialfid');
+		$cfmid = $adb->query_result($result,$i,'cfmid');
+
+		$sql2="select fieldlabel from vtiger_field where fieldid ='".$accountid."'";
+		$result2 = $adb->query($sql2);
+		$accountfield = $adb->query_result($result2,0,'fieldlabel');
+		$label['accountlabel'] = $accountfield;
+		
+		$sql3="select fieldlabel from vtiger_field where fieldid ='".$contactid."'";
+		$result3 = $adb->query($sql3);
+		$contactfield = $adb->query_result($result3,0,'fieldlabel');
+		$label['contactlabel'] = $contactfield;
+		$sql4="select fieldlabel from vtiger_field where fieldid ='".$potentialid."'";
+		$result4 = $adb->query($sql4);
+		$potentialfield = $adb->query_result($result4,0,'fieldlabel');
+		$label['potentiallabel'] = $potentialfield;
+	}
+	return $label;
+}
+
 ?>

Modified: vtigercrm/trunk/modules/Settings/LeadCustomFieldMapping.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/LeadCustomFieldMapping.php (original)
+++ vtigercrm/trunk/modules/Settings/LeadCustomFieldMapping.php Fri Jun 23 04:02:27 2006
@@ -8,24 +8,18 @@
 * All Rights Reserved.
 *
 ********************************************************************************/
-
-require_once('Smarty_setup.php');	
+require_once('Smarty_setup.php');
+require_once('include/database/PearDatabase.php');
+require_once('include/CustomFieldUtil.php');
 global $mod_strings;
 global $app_strings;
-global $app_list_strings;
-global $adb;
+
+$smarty=new vtigerCRM_Smarty;
 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", $mod_strings);
-$smarty->assign("APP", $app_strings);
 $smarty->assign("IMAGE_PATH", $image_path);
-
-$smarty->assign("RETURN_MODULE","Settings");
-$smarty->assign("RETURN_ACTION","");
 
 function getAccountCustomValues($leadid,$accountid)
 {
@@ -93,34 +87,36 @@
 	$potentialcf[$leadid.'_potential']=$potential_cfelement;
         return $potentialcf;
 }
-$lead_sql="select fieldid,fieldlabel from vtiger_field,vtiger_tab where vtiger_field.tabid=vtiger_tab.tabid and generatedtype=2 and vtiger_tab.name='Leads'";
-$result = $adb->query($lead_sql);
-$noofrows = $adb->num_rows($result);
 
-$display_val="<table border=0 cellspacing=1 cellpadding=2 width=75%>";
-$leadcf=Array();
-for($i=0; $i<$noofrows; $i++)
+function customFieldMappings()
 {
-	$lead_field['fieldid']=$adb->query_result($result,$i,"fieldid");
-	$lead_field['fieldlabel']=$adb->query_result($result,$i,"fieldlabel");
-	$convert_sql="select * from vtiger_convertleadmapping where leadfid=".$lead_field['fieldid'];
+	global $adb;
+
+	$convert_sql="select vtiger_convertleadmapping.*,uitype,fieldlabel from vtiger_convertleadmapping left join vtiger_field on vtiger_field.fieldid = vtiger_convertleadmapping.leadfid";
 	$convert_result = $adb->query($convert_sql);
 
 	$no_rows = $adb->num_rows($convert_result);
 	for($j=0; $j<$no_rows; $j++)
 	{
+		$leadid = $adb->query_result($convert_result,$j,"leadfid");
 		$accountid=$adb->query_result($convert_result,$j,"accountfid");
 		$contactid=$adb->query_result($convert_result,$j,"contactfid");
 		$potentialid=$adb->query_result($convert_result,$j,"potentialfid");
-	
-		
+		$lead_field['sno'] = $j+1;
+		$lead_field['leadid'] = $adb->query_result($convert_result,$j,"fieldlabel"); 
+		$lead_field['fieldtype'] = getCustomFieldTypeName($adb->query_result($convert_result,$j,"uitype"));; 
+		$lead_field['account'] = getAccountCustomValues($leadid,$accountid);
+		$lead_field['contact'] = getContactCustomValues($leadid,$contactid);
+		$lead_field['potential'] = getPotentialCustomValues($leadid,$potentialid);
+		$leadcf[]= $lead_field;
 	}
-	$lead_field['account']=getAccountCustomValues($lead_field['fieldid'],$accountid);
-	$lead_field['contact']=getContactCustomValues($lead_field['fieldid'],$contactid);
-	$lead_field['potential']=getPotentialCustomValues($lead_field['fieldid'],$potentialid);
-	$leadcf[$lead_field['fieldlabel']]= $lead_field;
+
+	return $leadcf;
 }
-$smarty->assign("CUSTOMFIELDMAPPING",$leadcf);
+
+$smarty->assign("MOD",$mod_strings);
+$smarty->assign("APP",$app_strings);
+$smarty->assign("CUSTOMFIELDMAPPING",customFieldMappings());
 
 $smarty->display("CustomFieldMapping.tpl");
 

Modified: vtigercrm/trunk/modules/Settings/SaveConvertLead.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/SaveConvertLead.php (original)
+++ vtigercrm/trunk/modules/Settings/SaveConvertLead.php Fri Jun 23 04:02:27 2006
@@ -13,10 +13,8 @@
 require_once('include/database/PearDatabase.php');
 require_once('include/utils/utils.php');
 
-//echo"<h3> In Save</h3>";
 	
 	$sql="select fieldid from vtiger_field, vtiger_tab where vtiger_field.tabid=vtiger_tab.tabid and generatedtype=2 and vtiger_tab.name='Leads';";	
-//	echo $sql;	
 	$result = $adb->query($sql);
 	$noofrows = $adb->num_rows($result);
 	
@@ -47,6 +45,6 @@
 
 		$adb->query($update_sql);
 	}
-	 header("Location: index.php?action=ListLeadCustomFieldMapping&module=Settings&parenttab=Settings");
+	 header("Location: index.php?action=CustomFieldList&module=Settings&parenttab=Settings");
 	
 ?>




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 23 06:04:39 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 10:04:39 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7461 - in /vtigercrm/trunk:
 Smarty/templates/ modules/Settings/ modules/Users/
Message-ID: <20060623100439.9BBA483F7AA@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 23 04:04:31 2006
New Revision: 7461

Log:
unwanted files deleted

Removed:
    vtigercrm/trunk/Smarty/templates/CreateProfile1.tpl
    vtigercrm/trunk/Smarty/templates/CustomFieldCombo.tpl
    vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl
    vtigercrm/trunk/Smarty/templates/SettingsSubMenu.tpl
    vtigercrm/trunk/modules/Settings/ListLeadCustomFieldMapping.php
    vtigercrm/trunk/modules/Settings/SettingsSubMenu.php
    vtigercrm/trunk/modules/Users/CreateProfile1.php




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 23 06:57:26 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 10:57:26 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7462 -
	/vtigercrm/trunk/include/language/en_us.lang.php
Message-ID: <20060623105726.8201983F776@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 23 04:57:22 2006
New Revision: 7462

Log:
Updated Add New with Add - ahmed

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

Modified: vtigercrm/trunk/include/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/include/language/en_us.lang.php (original)
+++ vtigercrm/trunk/include/language/en_us.lang.php Fri Jun 23 04:57:22 2006
@@ -441,8 +441,7 @@
 
 'LBL_ADD_ITEM'=>'Add',
 
-'LBL_ADD_NEW'=>'Add new',
-
+'LBL_ADD_NEW'=>'Add',
 //Added for version 5
 
 'LBL_CALENDAR_TITLE'=>'Open Calendar...',




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 23 07:03:47 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 11:03:47 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7463 -
	/vtigercrm/trunk/modules/Users/User.php
Message-ID: <20060623110348.CCA1083F7AA@vtiger.fosslabs.com>

Author: richie
Date: Fri Jun 23 05:03:43 2006
New Revision: 7463

Log:
added 3 functions to support user related list

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 Fri Jun 23 05:03:43 2006
@@ -32,6 +32,8 @@
 require_once('include/database/PearDatabase.php');
 require_once('data/CRMEntity.php');
 require_once('include/utils/UserInfoUtil.php');
+require_once('modules/Activities/Activity.php');
+require_once('modules/Contacts/Contact.php');
 
 // User is used to store customer information.
 class User {
@@ -802,6 +804,63 @@
 
 		return;
 	}
+
+
+
+
+
+
+
+
+//Function Call for Related List -- Start
+        function get_contacts($id)
+	{
+			global $log;
+                        $log->debug("Entering get_contacts(".$id.") method ...");
+			global $app_strings;
+
+			$focus = new Contact();
+
+			
+			
+			$button = '';
+			$query = 'select vtiger_contactdetails.*, vtiger_crmentity.* from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_contactdetails.contactid where vtiger_crmentity.smownerid='.$id.' and vtiger_crmentity.deleted=0';
+			$log->debug("Exiting get_contacts method ...");
+			return GetRelatedList('Users','Contacts',$focus,$query,$button,$returnset);
+        }
+
+
+
+
+//Function Call for Related List -- Start
+        function get_activities($id)
+	{
+			global $log;
+                        $log->debug("Entering get_contacts(".$id.") method ...");
+			global $app_strings;
+
+			$focus = new Activity();
+			
+			$button = '';
+			$query = 'select vtiger_activity.* from vtiger_activity inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid where vtiger_crmentity.smownerid='.$id.' and (vtiger_activity.activitytype="Meeting" || vtiger_activity.activitytype="Task" || vtiger_activity.activitytype="Call" ) and vtiger_crmentity.deleted=0';
+			$log->debug("Exiting get_contacts method ...");
+			return GetRelatedList('Users','Activities',$focus,$query,$button,$returnset);
+        }
+
+function get_user_groups($id)
+{
+		global $log;
+                        $log->debug("Entering get_contacts(".$id.") method ...");
+			global $app_strings;
+			$button = '';
+			$query = 'select vtiger_users.*,vtiger_groups.* from vtiger_users inner join vtiger_users2group on vtiger_users.id=vtiger_users2group.userid left join vtiger_groups on vtiger_groups.groupid=vtiger_users2group.groupid where vtiger_users.id='.$id;
+			$log->debug("Exiting get_contacts method ...");
+			echo '<pre>';print_r(getAllGroupInfo($query));echo '</pre>';
+			return getAllGroupInfo($query);
+			}
+
+
+	
 	function save($module_name) 
 	{
 		global $log;




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 23 07:04:49 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 11:04:49 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7464 -
	/vtigercrm/trunk/modules/Users/CallRelatedList.php
Message-ID: <20060623110449.8661583F7B5@vtiger.fosslabs.com>

Author: richie
Date: Fri Jun 23 05:04:44 2006
New Revision: 7464

Log:
init version

Added:
    vtigercrm/trunk/modules/Users/CallRelatedList.php   (with props)




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 23 07:16:59 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 11:16:59 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7465 -
	/vtigercrm/trunk/Smarty/templates/UserDetailView.tpl
Message-ID: <20060623111700.6694683F7B5@vtiger.fosslabs.com>

Author: richie
Date: Fri Jun 23 05:16:55 2006
New Revision: 7465

Log:
More Info Tab added

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

Modified: vtigercrm/trunk/Smarty/templates/UserDetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/UserDetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/UserDetailView.tpl Fri Jun 23 05:16:55 2006
@@ -98,6 +98,8 @@
 			  <tr >
 			        <td id="prof" width="25%" align="center" nowrap="nowrap" class="dvtSelectedCell" onClick="fnVis('prof')"><b>{$UMOD.LBL_USER_LOGIN_ROLE}</b></td>
 			     <td class="dvtTabCache" width="10" nowrap="nowrap">&nbsp;</td>
+
+			     <td class="dvtUnSelectedCell" align=center nowrap><a href="index.php?action=CallRelatedList&module={$MODULE}&record={$ID}&parenttab={$CATEGORY}">{$APP.LBL_MORE} {$APP.LBL_INFORMATION}</a></td>
 				    <td class="dvtTabCache" nowrap="nowrap" width="10">&nbsp;</td>
 			  </tr>
 			  </table>




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 23 07:19:39 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 11:19:39 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7466 -
 /vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
Message-ID: <20060623111939.D796583F7B5@vtiger.fosslabs.com>

Author: richie
Date: Fri Jun 23 05:19:35 2006
New Revision: 7466

Log:
Related List entries for User added

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

Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original)
+++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Fri Jun 23 05:19:35 2006
@@ -1817,6 +1817,15 @@
 	 $this->db->query("insert into vtiger_relatedlists values (".$this->db->getUniqueID('relatedlists').",".getTabid("Campaigns").",".getTabid("Potentials").",'get_opportunities',3,'Potentials',0)");
 	 $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Campaigns").",9,'get_activities',4,'Activities',0)");
 
+ //Inserting User Related Lists
+ 
+        $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Users").",".getTabid("Activities").",'get_activities',1,'Activities',0)");
+ 
+        $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Users").",".getTabid("Contacts").",'get_contacts',2,'Contacts',0)");
+ 
+        $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Users").",".getTabid("Users").",'get_user_groups',3,'Groups',0)");
+
+	 
                $this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("notificationscheduler").",'LBL_TASK_NOTIFICATION_DESCRITPION',1,'Task Delay Notification','Tasks delayed beyond 24 hrs ','LBL_TASK_NOTIFICATION')");
 
 




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 23 07:49:59 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 11:49:59 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7467 -
	/vtigercrm/trunk/modules/Users/listwordtemplates.php
Message-ID: <20060623114959.D067483F7C0@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 23 05:49:55 2006
New Revision: 7467

Log:
update listmail merge file

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 Fri Jun 23 05:49:55 2006
@@ -13,7 +13,7 @@
 require_once('include/database/PearDatabase.php');
 
    global $adb;
-   $sql = "select templateid, module, description, filename, vtiger_filesize, filetype from vtiger_wordtemplates order by filename ASC";
+   $sql = "select templateid, module, description, filename, filesize, filetype from vtiger_wordtemplates order by filename ASC";
    $result = $adb->query($sql);
 
 $edit="Edit  ";




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 23 08:01:56 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 12:01:56 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7468 -
	/vtigercrm/trunk/Smarty/templates/SetMenu.tpl
Message-ID: <20060623120156.0DEDC83F7C2@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 23 06:01:52 2006
New Revision: 7468

Log:
updated set menu tabs

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

Modified: vtigercrm/trunk/Smarty/templates/SetMenu.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/SetMenu.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/SetMenu.tpl Fri Jun 23 06:01:52 2006
@@ -76,7 +76,7 @@
 				{/if}
 
 				{if $smarty.request.action eq 'listwordtemplates' || $smarty.request.action eq 'add2db' || $smarty.request.action eq 'deletewordtemplate'}
-				<tr><td class="settingsTabSelected" nowrap>{$MOD.EMAILTEMPLATES}</td></tr>
+				<tr><td class="settingsTabSelected" nowrap>{$MOD.WORDINTEGRATION}</td></tr>
 				
 				{else}	
 				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=listwordtemplates&parenttab=Settings">{$MOD.WORDINTEGRATION}</a></td></tr>




From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 08:38:05 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 12:38:05 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231128=3A?=
 =?utf-8?q?_too_high_reaction_time_in_using_inventory?=
In-Reply-To: <076.209b6cc7a2151c8fd5ca32cfa5df69e2@vtiger.fosslabs.com>
References: <076.209b6cc7a2151c8fd5ca32cfa5df69e2@vtiger.fosslabs.com>
Message-ID: <085.0cc6976dc146a11020ced3365b2ee125@vtiger.fosslabs.com>

#1128: too high reaction time in using inventory
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  don        
      Type:  defect     |      Status:  new        
  Priority:  major      |   Milestone:             
 Component:  vtigercrm  |     Version:  5.0.1      
Resolution:             |    Keywords:  performance
------------------------+---------------------------------------------------
Changes (by don):

  * version:  5.0.0 => 5.0.1

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1128>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 08:38:05 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 12:38:05 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231120=3A?=
 =?utf-8?q?_alignment_not_proper_in_Customfield_listview?=
In-Reply-To: <076.4b884f803d6e52a23bdf4c14044cef75@vtiger.fosslabs.com>
References: <076.4b884f803d6e52a23bdf4c14044cef75@vtiger.fosslabs.com>
Message-ID: <085.48577f1bf0f56b9b36c659dde888d072@vtiger.fosslabs.com>

#1120: alignment not proper in Customfield listview
------------------------+---------------------------------------------------
  Reporter:  mangai     |       Owner:  jeri  
      Type:  defect     |      Status:  closed
  Priority:  minor      |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by anonymous):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1120>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 08:38:09 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 12:38:09 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231144=3A?=
 =?utf-8?q?_Ajax_Quick_Edit_Fields_Retains_value_in_the_text_box_even_if_w?=
 =?utf-8?q?e_cancel_it=2E?=
In-Reply-To: <076.d0b610be5ddd2e2c4150bff5f9d0ced7@vtiger.fosslabs.com>
References: <076.d0b610be5ddd2e2c4150bff5f9d0ced7@vtiger.fosslabs.com>
Message-ID: <085.f58cdc65a14b37db44c283df585cb241@vtiger.fosslabs.com>

#1144: Ajax Quick Edit Fields Retains value in the text box even if we cancel it.
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  Jeri           
      Type:  defect     |      Status:  closed         
  Priority:  critical   |   Milestone:                 
 Component:  vtigercrm  |     Version:  5.0.0          
Resolution:  fixed      |    Keywords:  Quick Edit Ajax
------------------------+---------------------------------------------------
Changes (by anonymous):

  * resolution:  => fixed
  * status:  reopened => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1144>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 08:38:58 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 12:38:58 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23779=3A_?=
 =?utf-8?q?Update_Home_Page_Block_Order_Terms?=
In-Reply-To: <076.211ee58adeeafe8bd16e6d4f4857e285@vtiger.fosslabs.com>
References: <076.211ee58adeeafe8bd16e6d4f4857e285@vtiger.fosslabs.com>
Message-ID: <085.f0fd0867a13472252fdcf5ba0e02b215@vtiger.fosslabs.com>

#779: Update Home Page Block Order Terms
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  jerrydgeorge
      Type:  defect     |      Status:  new         
  Priority:  trivial    |   Milestone:              
 Component:  vtigercrm  |     Version:  5.0.0       
Resolution:             |    Keywords:              
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  don => jerrydgeorge

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/779>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 08:39:41 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 12:39:41 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231231=3A?=
 =?utf-8?q?_Back-Up_image_need_to_be_changed_to_Backup?=
In-Reply-To: <076.c2941e2d8fa4d0dfe3444a70c45ff67b@vtiger.fosslabs.com>
References: <076.c2941e2d8fa4d0dfe3444a70c45ff67b@vtiger.fosslabs.com>
Message-ID: <085.d4e34ab8cd9e00122b366a5ddb942e7e@vtiger.fosslabs.com>

#1231: Back-Up image need to be changed to Backup
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  ela  
      Type:  defect     |      Status:  new  
  Priority:  minor      |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  don => ela

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1231>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 08:44:35 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 12:44:35 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231008=3A?=
 =?utf-8?q?_assigned_to_group_is_not_coming_properly_in_ajax_edit?=
In-Reply-To: <076.6de5891dfeb7d1d2214d1225f8d87438@vtiger.fosslabs.com>
References: <076.6de5891dfeb7d1d2214d1225f8d87438@vtiger.fosslabs.com>
Message-ID: <085.16c2e2f35197304f89382fd6bf605609@vtiger.fosslabs.com>

#1008: assigned to group is not coming properly in ajax edit
------------------------+---------------------------------------------------
  Reporter:  mangai     |       Owner:  jeri 
      Type:  defect     |      Status:  new  
  Priority:  major      |   Milestone:  5.0.0
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  suman => jeri

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1008>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 23 08:50:58 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 12:50:58 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7469 -
	/vtigercrm/trunk/include/js/ListView.js
Message-ID: <20060623125058.786A07D809C@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 23 06:50:54 2006
New Revision: 7469

Log:
#Fixes 1350

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

Modified: vtigercrm/trunk/include/js/ListView.js
==============================================================================
--- vtigercrm/trunk/include/js/ListView.js (original)
+++ vtigercrm/trunk/include/js/ListView.js Fri Jun 23 06:50:54 2006
@@ -18,7 +18,7 @@
 	
 		if (document.massdelete.selected_id.checked)
 		{
-			document.massdelete.idlist.value=document.massdelete.selected_id.value;
+			document.massdelete.idlist.value=document.massdelete.selected_id.value +";";
 		}
 		else 
 		{
@@ -60,7 +60,7 @@
 
                 if (document.massdelete.selected_id.checked)
                 {
-                        idstring = document.massdelete.selected_id.value+':';
+                        idstring = document.massdelete.selected_id.value+';';
                 		xx = 1;
                 }
                 else




From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 08:52:50 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 12:52:50 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231362=3A?=
	=?utf-8?q?_alrf_lmgo?=
In-Reply-To: <076.198951aac88d3004380ae68299abd85f@vtiger.fosslabs.com>
References: <076.198951aac88d3004380ae68299abd85f@vtiger.fosslabs.com>
Message-ID: <085.3a81271e1c25c30bf4ef20663dceaf4d@vtiger.fosslabs.com>

#1362: alrf lmgo
----------------------------+-----------------------------------------------
  Reporter:  test at test.com  |       Owner:  alrf lmgo
      Type:  defect         |      Status:  closed   
  Priority:  major          |   Milestone:           
 Component:  vtigercrm      |     Version:  5.0.0    
Resolution:  invalid        |    Keywords:  alrf lmgo
----------------------------+-----------------------------------------------
Changes (by anonymous):

  * resolution:  => invalid
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1362>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 08:53:05 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 12:53:05 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231361=3A?=
	=?utf-8?q?_kwxu_dgsbwtae?=
In-Reply-To: <076.1b75ad68cf558361fc44b91309481d8d@vtiger.fosslabs.com>
References: <076.1b75ad68cf558361fc44b91309481d8d@vtiger.fosslabs.com>
Message-ID: <085.fdaf747718ababe4e796407c1ba2c010@vtiger.fosslabs.com>

#1361: kwxu dgsbwtae
----------------------------+-----------------------------------------------
  Reporter:  test at test.com  |       Owner:  kwxu dgsbwtae
      Type:  defect         |      Status:  closed       
  Priority:  major          |   Milestone:               
 Component:  vtigercrm      |     Version:  5.0.0        
Resolution:  invalid        |    Keywords:  kwxu dgsbwtae
----------------------------+-----------------------------------------------
Changes (by anonymous):

  * resolution:  => invalid
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1361>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 08:53:16 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 12:53:16 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231360=3A?=
	=?utf-8?q?_phajzen_gesf?=
In-Reply-To: <076.b8badd1330313fb32e243bd826d1a92f@vtiger.fosslabs.com>
References: <076.b8badd1330313fb32e243bd826d1a92f@vtiger.fosslabs.com>
Message-ID: <085.cbb8b79761adb7814a24605aeae886b4@vtiger.fosslabs.com>

#1360: phajzen gesf
----------------------------+-----------------------------------------------
  Reporter:  test at test.com  |       Owner:  phajzen gesf
      Type:  defect         |      Status:  closed      
  Priority:  major          |   Milestone:              
 Component:  vtigercrm      |     Version:  5.0.0       
Resolution:  invalid        |    Keywords:  phajzen gesf
----------------------------+-----------------------------------------------
Changes (by anonymous):

  * resolution:  => invalid
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1360>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 09:02:53 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 13:02:53 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231338=3A?=
 =?utf-8?q?_Merging_duplicate_accounts_while_importing_contacts?=
In-Reply-To: <076.696913d7878e2f3bc89c15f694a0683e@vtiger.fosslabs.com>
References: <076.696913d7878e2f3bc89c15f694a0683e@vtiger.fosslabs.com>
Message-ID: <085.56b060c05b3e4929eb0faa22867a8799@vtiger.fosslabs.com>

#1338: Merging duplicate accounts while importing contacts
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  developer
      Type:  defect     |      Status:  new      
  Priority:  critical   |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.1    
Resolution:             |    Keywords:           
------------------------+---------------------------------------------------
Changes (by anonymous):

  * version:  5.0.0 => 5.0.1

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1338>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 09:06:50 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 13:06:50 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231313=3A?=
	=?utf-8?q?_Pop_up_size?=
In-Reply-To: <076.d5cfe0f287242a74ba422f819314f615@vtiger.fosslabs.com>
References: <076.d5cfe0f287242a74ba422f819314f615@vtiger.fosslabs.com>
Message-ID: <085.619433b87352233d90adeecf6a80543c@vtiger.fosslabs.com>

#1313: Pop up size
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  ela                  
      Type:  defect     |      Status:  closed               
  Priority:  major      |   Milestone:                       
 Component:  vtigercrm  |     Version:  5.0.0                
Resolution:  duplicate  |    Keywords:  email, report, pop up
------------------------+---------------------------------------------------
Changes (by anonymous):

  * resolution:  => duplicate
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1313>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 09:07:06 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 13:07:06 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231331=3A?=
 =?utf-8?q?_rename_PearDatabase_to_signify_adodb_wrapper=2C_update_source?=
In-Reply-To: <076.b5a070e4cc46d3aaf4b69d4eea42547e@vtiger.fosslabs.com>
References: <076.b5a070e4cc46d3aaf4b69d4eea42547e@vtiger.fosslabs.com>
Message-ID: <085.224122ce075c9b932a2d724ff8c98592@vtiger.fosslabs.com>

#1331: rename PearDatabase to signify adodb wrapper, update source
------------------------+---------------------------------------------------
  Reporter:  jeffk      |       Owner:  developer          
      Type:  defect     |      Status:  new                
  Priority:  major      |   Milestone:  5.0.0              
 Component:  vtigercrm  |     Version:  5.0.1              
Resolution:             |    Keywords:  database adodb pear
------------------------+---------------------------------------------------
Changes (by anonymous):

  * version:  5.0.0 => 5.0.1

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1331>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 09:07:14 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 13:07:14 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231333=3A?=
 =?utf-8?q?_Avoid_Usage_of_Plural_forms_for_Create_Record?=
In-Reply-To: <076.18d7de57d208fc4aee376b0dac1a75a7@vtiger.fosslabs.com>
References: <076.18d7de57d208fc4aee376b0dac1a75a7@vtiger.fosslabs.com>
Message-ID: <085.fa0ddf5e2d25680bfda5b2371c63b02d@vtiger.fosslabs.com>

#1333: Avoid Usage of Plural forms for Create Record
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  developer
      Type:  defect     |      Status:  new      
  Priority:  major      |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.1    
Resolution:             |    Keywords:           
------------------------+---------------------------------------------------
Changes (by anonymous):

  * version:  5.0.0 => 5.0.1

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1333>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 09:07:23 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 13:07:23 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231359=3A?=
	=?utf-8?q?_nkmvswao_hrgxpcnj?=
In-Reply-To: <076.231caceb8d206fe629ab31edf63bacab@vtiger.fosslabs.com>
References: <076.231caceb8d206fe629ab31edf63bacab@vtiger.fosslabs.com>
Message-ID: <085.31aa57d165d00bddb8535e128acbe083@vtiger.fosslabs.com>

#1359: nkmvswao hrgxpcnj
----------------------------+-----------------------------------------------
  Reporter:  test at test.com  |       Owner:  nkmvswao hrgxpcnj
      Type:  defect         |      Status:  closed           
  Priority:  major          |   Milestone:                   
 Component:  vtigercrm      |     Version:  5.0.0            
Resolution:  invalid        |    Keywords:  nkmvswao hrgxpcnj
----------------------------+-----------------------------------------------
Changes (by anonymous):

  * resolution:  => invalid
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1359>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 09:07:32 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 13:07:32 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231352=3A?=
 =?utf-8?q?_integrate_source_code_of_self_update_functionality_get_form_ga?=
 =?utf-8?b?bGxlcnkuc2YubmV0ICh2Mik=?=
In-Reply-To: <076.c9c005c06f2e1cab9b816c461bc143a2@vtiger.fosslabs.com>
References: <076.c9c005c06f2e1cab9b816c461bc143a2@vtiger.fosslabs.com>
Message-ID: <085.1c54e7c712a37cdf7e9d11e7f144f488@vtiger.fosslabs.com>

#1352: integrate source code of self update functionality get form gallery.sf.net
(v2)
----------------------------------------+-----------------------------------
  Reporter:  shimon at schoolportal.co.il  |       Owner:  developer
      Type:  defect                     |      Status:  new      
  Priority:  minor                      |   Milestone:  5.0.0    
 Component:  vtigercrm                  |     Version:  5.0.1    
Resolution:                             |    Keywords:  update,  
----------------------------------------+-----------------------------------
Changes (by anonymous):

  * version:  5.0.0 => 5.0.1

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1352>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 09:10:55 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 13:10:55 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231358=3A?=
	=?utf-8?q?_uslmw_ifadpeny?=
In-Reply-To: <076.7fc082f0f31c48e750627c13eadbd4fd@vtiger.fosslabs.com>
References: <076.7fc082f0f31c48e750627c13eadbd4fd@vtiger.fosslabs.com>
Message-ID: <085.e76398820938e4354f44543e1a97e25e@vtiger.fosslabs.com>

#1358: uslmw ifadpeny
----------------------------+-----------------------------------------------
  Reporter:  test at test.com  |       Owner:  uslmw ifadpeny
      Type:  defect         |      Status:  closed        
  Priority:  major          |   Milestone:                
 Component:  vtigercrm      |     Version:  5.0.0         
Resolution:  invalid        |    Keywords:  uslmw ifadpeny
----------------------------+-----------------------------------------------
Changes (by anonymous):

  * resolution:  => invalid
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1358>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 09:12:32 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 13:12:32 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231094=3A?=
 =?utf-8?q?_dvtCellLabel_-_Change_font_color=3A=23737373_to_=3A=23000000?=
In-Reply-To: <076.2a146cfd18ac3bf1c71688b22c5a081d@vtiger.fosslabs.com>
References: <076.2a146cfd18ac3bf1c71688b22c5a081d@vtiger.fosslabs.com>
Message-ID: <085.43622d9e421d156fa2bd8b1d8962f4f9@vtiger.fosslabs.com>

#1094: dvtCellLabel - Change font color:#737373 to :#000000
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  ela   
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  invalid    |    Keywords:        
------------------------+---------------------------------------------------
Changes (by anonymous):

  * resolution:  => invalid
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1094>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 23 09:23:58 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 13:23:58 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7470 -
	/vtigercrm/trunk/modules/Contacts/Contact.js
Message-ID: <20060623132358.0EA4483F7E9@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 23 07:23:55 2006
New Revision: 7470

Log:
SelectAll js function has been moved to general.js

Modified:
    vtigercrm/trunk/modules/Contacts/Contact.js

Modified: vtigercrm/trunk/modules/Contacts/Contact.js
==============================================================================
--- vtigercrm/trunk/modules/Contacts/Contact.js (original)
+++ vtigercrm/trunk/modules/Contacts/Contact.js Fri Jun 23 07:23:55 2006
@@ -60,62 +60,6 @@
 	}
 }
 
-//Function added for Mass select in Popup - Philip
-function SelectAll()
-{
-
-        x = document.selectall.selected_id.length;
-	var entity_id = window.opener.document.getElementById('parent_id').value
-	var module = window.opener.document.getElementById('return_module').value
-	document.selectall.action.value='updateRelations'
-        idstring = "";
-
-        if ( x == undefined)
-        {
-
-                if (document.selectall.selected_id.checked)
-                {
-                        document.selectall.idlist.value=document.selectall.selected_id.value;
-                }
-                else
-                {
-                        alert("Please select atleast one entity");
-                        return false;
-                }
-        }
-        else
-        {
-                xx = 0;
-                for(i = 0; i < x ; i++)
-                {
-                        if(document.selectall.selected_id[i].checked)
-                        {
-                                idstring = document.selectall.selected_id[i].value +";"+idstring
-                        xx++
-                        }
-                }
-                if (xx != 0)
-                {
-                        document.selectall.idlist.value=idstring;
-                }
-                else
-                {
-                        alert("Please select atleast one entity");
-                        return false;
-                }
-	}
-		if(confirm("Are you sure you want to add the selected "+xx+" records ?"))
-		{
-		opener.document.location.href="index.php?module="+module+"&parentid="+entity_id+"&action=updateRelations&destination_module=Contacts&idlist="+idstring;
-		self.close();
-		}
-		else
-		{
-			return false;
-		}
-}
-
-
 function set_return(product_id, product_name) {
         window.opener.document.EditView.parent_name.value = product_name;
         window.opener.document.EditView.parent_id.value = product_id;




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 23 09:25:16 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 13:25:16 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7471 -
	/vtigercrm/trunk/modules/Leads/Lead.js
Message-ID: <20060623132516.31D5A83F771@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 23 07:25:12 2006
New Revision: 7471

Log:
SelectAll js function has been moved to general.js

Modified:
    vtigercrm/trunk/modules/Leads/Lead.js

Modified: vtigercrm/trunk/modules/Leads/Lead.js
==============================================================================
--- vtigercrm/trunk/modules/Leads/Lead.js (original)
+++ vtigercrm/trunk/modules/Leads/Lead.js Fri Jun 23 07:25:12 2006
@@ -65,60 +65,6 @@
 
 }
 
-//Function added for Mass select in Popup - Philip
-function SelectAll()
-{
-
-        x = document.selectall.selected_id.length;
-        var entity_id = window.opener.document.getElementById('parent_id').value
-        var module = window.opener.document.getElementById('return_module').value
-        document.selectall.action.value='updateRelations'
-        idstring = "";
-
-        if ( x == undefined)
-        {
-
-                if (document.selectall.selected_id.checked)
-                {
-                        document.selectall.idlist.value=document.selectall.selected_id.value;
-                }
-                else
-                {
-                        alert("Please select atleast one entity");
-                        return false;
-                }
-        }
-        else
-        {
-                xx = 0;
-                for(i = 0; i < x ; i++)
-                {
-                        if(document.selectall.selected_id[i].checked)
-                        {
-                                idstring = document.selectall.selected_id[i].value +";"+idstring
-                        xx++
-                        }
-                }
-                if (xx != 0)
-                {
-                        document.selectall.idlist.value=idstring;
-                }
-		else
-                {
-                        alert("Please select atleast one entity");
-                        return false;
-                }
-        }
-        if(confirm("Are you sure you want to add the selected "+xx+" records ?"))
-        {
-                opener.document.location.href="index.php?module="+module+"&parentid="+entity_id+"&action=updateRelations&destination_module=Leads&idlist="+idstring;
-                self.close();
-        }
-        else
-        {
-                return false;
-        }
-}
 
 function set_return(product_id, product_name) {
         window.opener.document.EditView.parent_name.value = product_name;




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 23 09:29:58 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 13:29:58 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7472 -
	/vtigercrm/trunk/include/js/general.js
Message-ID: <20060623132958.9BDC683F7F0@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 23 07:29:54 2006
New Revision: 7472

Log:
SelectAll js function has been moved to general.js

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 Fri Jun 23 07:29:54 2006
@@ -1630,3 +1630,58 @@
 	openPopUp('xComposeEmail',this,url,'createemailWin',820,652,'menubar=no,toolbar=no,location=no,status=no,resizable=no');
 }
 
+//Function added for Mass select in Popup - Philip
+function SelectAll(mod)
+{
+
+        x = document.selectall.selected_id.length;
+        var entity_id = window.opener.document.getElementById('parent_id').value
+        var module = window.opener.document.getElementById('return_module').value
+        document.selectall.action.value='updateRelations'
+        idstring = "";
+
+        if ( x == undefined)
+        {
+
+                if (document.selectall.selected_id.checked)
+                {
+                        document.selectall.idlist.value=document.selectall.selected_id.value;
+                }
+                else
+		{
+                        alert("Please select atleast one entity");
+                        return false;
+                }
+        }
+        else
+        {
+                xx = 0;
+                for(i = 0; i < x ; i++)
+                {
+                        if(document.selectall.selected_id[i].checked)
+                        {
+                                idstring = document.selectall.selected_id[i].value +";"+idstring
+                        xx++
+                        }
+                }
+                if (xx != 0)
+                {
+                        document.selectall.idlist.value=idstring;
+                }
+                 else
+                {
+                        alert("Please select atleast one entity");
+                        return false;
+                }
+        }
+                if(confirm("Are you sure you want to add the selected "+xx+" records ?"))
+                {
+                        opener.document.location.href="index.php?module="+module+"&parentid="+entity_id+"&action=updateRelations&destination_module="+mod+"&idlist="+idstring;
+                self.close();
+                }
+		else
+                {
+                        return false;
+                }
+}
+




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 23 09:32:33 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 13:32:33 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7473 -
	/vtigercrm/trunk/Smarty/templates/PopupContents.tpl
Message-ID: <20060623133233.9E91E83F7F5@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 23 07:32:28 2006
New Revision: 7473

Log:
module has been passed to SelectAll js function

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

Modified: vtigercrm/trunk/Smarty/templates/PopupContents.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/PopupContents.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/PopupContents.tpl Fri Jun 23 07:32:28 2006
@@ -14,7 +14,7 @@
 <table width="100%" border="0" cellspacing="0" cellpadding="0" class="small">
 	<tr>
 	{if $SELECT eq 'enable'}
-		<td style="padding-left:10px;" align="left"><input class="small" type="button" value="Add {$MODULE}" onclick="if(SelectAll()) window.close();"/></td>
+		<td style="padding-left:10px;" align="left"><input class="small" type="button" value="Add {$MODULE}" onclick="if(SelectAll('{$MODULE}')) window.close();"/></td>
 	{else}		
 		<td>&nbsp;</td>	
 	{/if}




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 23 09:36:03 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 13:36:03 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7474 -
 /vtigercrm/trunk/modules/Users/language/en_us.lang.php
Message-ID: <20060623133603.4678983F7F5@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 23 07:35:58 2006
New Revision: 7474

Log:
#Fixes 779

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

Modified: vtigercrm/trunk/modules/Users/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Users/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Users/language/en_us.lang.php Fri Jun 23 07:35:58 2006
@@ -474,7 +474,7 @@
 'CVLVT'=>'Key Metrics',
 'HLT'=>'HelpDesk Top Tickets',
 'OLV'=>'Top Open Activities',
-'GRT'=>'Top Group Tasks',
+'GRT'=>'My Group Allocation',
 'OLTSO'=>'Top Sales Orders',
 'ILTI'=>'Top Invoices',
 //Added for 5.0 alpha




From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 09:36:20 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 13:36:20 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231350=3A?=
 =?utf-8?q?_Mass_Delete_not_working_for_the_only_record_in_List_View?=
In-Reply-To: <076.52d2f3cf1c5fb831b08c5d544f32f873@vtiger.fosslabs.com>
References: <076.52d2f3cf1c5fb831b08c5d544f32f873@vtiger.fosslabs.com>
Message-ID: <085.5c78f6dd9b134cd20e6ce539600b8742@vtiger.fosslabs.com>

#1350: Mass Delete not working for the only record in List View
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  jeri  
      Type:  defect     |      Status:  closed
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by anonymous):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1350>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 23 09:36:50 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 13:36:50 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7475 -
 /vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php
Message-ID: <20060623133650.265CF83F7F5@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 23 07:36:46 2006
New Revision: 7475

Log:
campaignid has been removed

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

Modified: vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php (original)
+++ vtigercrm/trunk/modules/Leads/LeadConvertToEntities.php Fri Jun 23 07:36:46 2006
@@ -290,7 +290,7 @@
 $contact_id = $crmcontactid;
 $log->debug("contact id is ".$contact_id);
 
-$sql_insert_contact = "INSERT INTO vtiger_contactdetails (contactid,accountid,campaignid,salutation,firstname,lastname,email,phone,mobile,title,fax,yahooid) VALUES (".$contact_id.",".$crmid.",'".$row["campaignid"]. "','".$row["salutationtype"] ."','" .$row["firstname"] ."','" .$row["lastname"] ."','" .$row["email"] ."','" .$row["phone"]. "','" .$row["mobile"] ."','" .$row["designation"] ."','".$row["fax"] ."','".$row['yahooid']."')";
+$sql_insert_contact = "INSERT INTO vtiger_contactdetails (contactid,accountid,salutation,firstname,lastname,email,phone,mobile,title,fax,yahooid) VALUES (".$contact_id.",".$crmid.",'".$row["salutationtype"] ."','" .$row["firstname"] ."','" .$row["lastname"] ."','" .$row["email"] ."','" .$row["phone"]. "','" .$row["mobile"] ."','" .$row["designation"] ."','".$row["fax"] ."','".$row['yahooid']."')";
 
 $adb->query($sql_insert_contact);
 
@@ -351,7 +351,7 @@
 		$potential_amount=0;
         }
 
-	$sql_insert_opp = "INSERT INTO vtiger_potential (potentialid,accountid,campaignid,potentialname,leadsource,closingdate,sales_stage,amount) VALUES (".$oppid.",".$crmid .",'".$row["campaignid"]. "','".addslashes($potential_name)."','".$row['leadsource']."','".$close_date."','".$potential_sales_stage."',".$potential_amount.")";
+	$sql_insert_opp = "INSERT INTO vtiger_potential (potentialid,accountid,potentialname,leadsource,closingdate,sales_stage,amount) VALUES (".$oppid.",".$crmid .",'".addslashes($potential_name)."','".$row['leadsource']."','".$close_date."','".$potential_sales_stage."',".$potential_amount.")";
 
 	$adb->query($sql_insert_opp);
 




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 23 09:41:46 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 13:41:46 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7476 - in
 /vtigercrm/trunk/modules: Contacts/Contact.php Leads/Lead.php
Message-ID: <20060623134146.79B90786347@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 23 07:41:41 2006
New Revision: 7476

Log:
returnset has been set

Modified:
    vtigercrm/trunk/modules/Contacts/Contact.php
    vtigercrm/trunk/modules/Leads/Lead.php

Modified: vtigercrm/trunk/modules/Contacts/Contact.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/Contact.php (original)
+++ vtigercrm/trunk/modules/Contacts/Contact.php Fri Jun 23 07:41:41 2006
@@ -494,6 +494,7 @@
 		global $mod_strings;
 
 		$focus = new Campaign();
+		$returnset = '&return_module=Contacts&return_action=CallRelatedList&return_id='.$id;
 		$button = '';
 
 		$returnset = '';

Modified: vtigercrm/trunk/modules/Leads/Lead.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/Lead.php (original)
+++ vtigercrm/trunk/modules/Leads/Lead.php Fri Jun 23 07:41:41 2006
@@ -211,7 +211,7 @@
 	$focus = new Campaign();
 	$button = '';
 
-	$returnset = '';
+	$returnset = '&return_module=Leads&return_action=CallRelatedList&return_id='.$id;
 	$log->info("Campaign Related List for Lead Displayed");
 	$query = "SELECT vtiger_users.user_name, vtiger_campaign.campaignid, vtiger_campaign.campaignname, vtiger_campaign.campaigntype, vtiger_campaign.campaignstatus, vtiger_campaign.expectedrevenue, vtiger_campaign.closingdate, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_campaign inner join vtiger_campaignleadrel on vtiger_campaignleadrel.campaignid=vtiger_campaign.campaignid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_campaign.campaignid left join vtiger_campaigngrouprelation on vtiger_campaign.campaignid=vtiger_campaigngrouprelation.campaignid left join vtiger_groups on vtiger_groups.groupname=vtiger_campaigngrouprelation.groupname left join vtiger_users on vtiger_users.id = vtiger_crmentity.smownerid where vtiger_campaignleadrel.leadid=".$id." and vtiger_crmentity.deleted=0";
 




From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 09:46:41 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 13:46:41 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231363=3A?=
 =?utf-8?q?_UI_for_add_Rss_is_not_proper?=
Message-ID: <076.6ee9312956ea784d7fa3bb9c14cb5dea@vtiger.fosslabs.com>

#1363: UI for add Rss is not proper
--------------------------+-------------------------------------------------
 Reporter:  jerrydgeorge  |       Owner:  ela  
     Type:  defect        |      Status:  new  
 Priority:  major         |   Milestone:       
Component:  vtigercrm     |     Version:  5.0.0
 Keywords:                |  
--------------------------+-------------------------------------------------


-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1363>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 09:46:52 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 13:46:52 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23779=3A_?=
 =?utf-8?q?Update_Home_Page_Block_Order_Terms?=
In-Reply-To: <076.211ee58adeeafe8bd16e6d4f4857e285@vtiger.fosslabs.com>
References: <076.211ee58adeeafe8bd16e6d4f4857e285@vtiger.fosslabs.com>
Message-ID: <085.9fffce71d36d250f069763fd9e5817e0@vtiger.fosslabs.com>

#779: Update Home Page Block Order Terms
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  jerrydgeorge
      Type:  defect     |      Status:  closed      
  Priority:  trivial    |   Milestone:              
 Component:  vtigercrm  |     Version:  5.0.0       
Resolution:  fixed      |    Keywords:              
------------------------+---------------------------------------------------
Changes (by anonymous):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/779>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 23 09:51:02 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 13:51:02 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7477 -
	/vtigercrm/trunk/include/utils/ListViewUtils.php
Message-ID: <20060623135103.3854483F803@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 23 07:50:58 2006
New Revision: 7477

Log:
changes made to fix the issue 1351

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 Fri Jun 23 07:50:58 2006
@@ -738,12 +738,12 @@
 		}
 
 		//Added for Actions ie., edit and delete links in listview 
-		$edit_link = getListViewEditLink($module,$entity_id,$relatedlist,$returnset);
-		$del_link = getListViewDeleteLink($module,$entity_id,$relatedlist,$returnset);
+		$edit_link = getListViewEditLink($module,$entity_id,$relatedlist,$varreturnset,$list_result,$list_result_count);
+		$del_link = getListViewDeleteLink($module,$entity_id,$relatedlist,$varreturnset);
 
 		$links_info = "<a href=\"$edit_link\"> &nbsp;".$app_strings["LNK_EDIT"]." </a> ";
 		if($del_link != '')
-			$links_info .=	" | <a href=\"javascript:;\" onclick=confirmdelete(\"$del_link\")> ".$app_strings["LNK_DELETE"]." </a>";
+			$links_info .=	" | <a href=\"javascript:;\" onclick='confirmdelete(\"$del_link\")'> ".$app_strings["LNK_DELETE"]." </a>";
 
 		$list_header[] = $links_info;
 
@@ -2690,8 +2690,9 @@
  *	@param string 	$returnset 	- may be empty in case of ListView. For relatedlists, return_module, return_action and return_id values will be passed like &return_module=Accounts&return_action=CallRelatedList&return_id=10
  *	return string	$edit_link	- url string which cotains the editlink details (module, action, record, etc.,) like index.php?module=Accounts&action=EditView&record=10
  */
-function getListViewEditLink($module,$entity_id,$relatedlist,$returnset)
+function getListViewEditLink($module,$entity_id,$relatedlist,$returnset,$result,$count)
 {
+	global $adb;
 	$edit_link = "index.php?module=$module&action=EditView&record=$entity_id";
 
 	//This is relatedlist listview
@@ -2701,6 +2702,14 @@
 	}
 	else
 	{
+		if($module == 'Activities')
+		{
+			$actvity_type = $adb->query_result($result,$count,'activitytype');
+			if($actvity_type == 'Task')
+				$edit_link .= '&activity_mode=Task';
+			else
+				$edit_link .= '&activity_mode=Events';
+		}
 		$edit_link .= "&return_module=$module&return_action=index";
 	}
 




From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 09:51:20 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 13:51:20 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231351=3A?=
 =?utf-8?q?_Editing_Activity_in_Leads_Related_List_Shows_Warning?=
In-Reply-To: <076.23a2cbc68532eb6ef08e3d5e59241e8c@vtiger.fosslabs.com>
References: <076.23a2cbc68532eb6ef08e3d5e59241e8c@vtiger.fosslabs.com>
Message-ID: <085.1bed0cfef798ea1fdb6a12da837a8041@vtiger.fosslabs.com>

#1351: Editing Activity in Leads Related List Shows Warning
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  mangai
      Type:  defect     |      Status:  closed
  Priority:  blocker    |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mangai):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 fixed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1351>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 09:57:39 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 13:57:39 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231317=3A?=
 =?utf-8?q?_Compose_Email_Page_Issue?=
In-Reply-To: <076.a9eeeed40174d2838271904b6989fe27@vtiger.fosslabs.com>
References: <076.a9eeeed40174d2838271904b6989fe27@vtiger.fosslabs.com>
Message-ID: <085.39491ddddd9aaf1177e01360ea6118f8@vtiger.fosslabs.com>

#1317: Compose Email Page Issue
---------------------------+------------------------------------------------
  Reporter:  jerrydgeorge  |       Owner:  Ela   
      Type:  defect        |      Status:  closed
  Priority:  blocker       |   Milestone:        
 Component:  vtigercrm     |     Version:  5.0.0 
Resolution:  duplicate     |    Keywords:        
---------------------------+------------------------------------------------
Changes (by richie):

  * resolution:  => duplicate
  * status:  new => closed

Comment:

 Duplicate 1343

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1317>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 09:59:25 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 13:59:25 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=23734=3A_?=
	=?utf-8?q?Issue_in_Rss_UI?=
In-Reply-To: <076.e1e137b6d1056e18ee101a85754a710a@vtiger.fosslabs.com>
References: <076.e1e137b6d1056e18ee101a85754a710a@vtiger.fosslabs.com>
Message-ID: <085.70fca018ffb9c2639a23f640c1397ccf@vtiger.fosslabs.com>

#734: Issue in Rss UI
---------------------------+------------------------------------------------
  Reporter:  jerrydgeorge  |       Owner:  ela   
      Type:  defect        |      Status:  closed
  Priority:  major         |   Milestone:        
 Component:  vtigercrm     |     Version:  5.0.0 
Resolution:  fixed         |    Keywords:  UI    
---------------------------+------------------------------------------------
Changes (by anonymous):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/734>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 09:59:29 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 13:59:29 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231274=3A?=
 =?utf-8?q?_customer_portal_5=2E0_missing?=
In-Reply-To: <076.709d4c1791ce9aaefba03d131eecd0c0@vtiger.fosslabs.com>
References: <076.709d4c1791ce9aaefba03d131eecd0c0@vtiger.fosslabs.com>
Message-ID: <085.7543921603d3482d28e5c49ff59a3c41@vtiger.fosslabs.com>

#1274: customer portal 5.0 missing
-----------------------------+----------------------------------------------
  Reporter:  anonymous       |       Owner:  mickie
      Type:  defect          |      Status:  closed
  Priority:  blocker         |   Milestone:        
 Component:  customerportal  |     Version:  5.0.0 
Resolution:  fixed           |    Keywords:        
-----------------------------+----------------------------------------------
Changes (by richie):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1274>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 09:59:57 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 13:59:57 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=23735=3A_?=
	=?utf-8?q?Rss_UI_Issue?=
In-Reply-To: <076.edb4f5ce57d779b8540628d713305768@vtiger.fosslabs.com>
References: <076.edb4f5ce57d779b8540628d713305768@vtiger.fosslabs.com>
Message-ID: <085.5793df84d10a491dd3c2b2ddaf6050a2@vtiger.fosslabs.com>

#735: Rss UI Issue
---------------------------+------------------------------------------------
  Reporter:  jerrydgeorge  |       Owner:  ela   
      Type:  defect        |      Status:  closed
  Priority:  major         |   Milestone:        
 Component:  vtigercrm     |     Version:  5.0.0 
Resolution:  fixed         |    Keywords:  UI    
---------------------------+------------------------------------------------
Changes (by anonymous):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/735>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 10:00:46 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 14:00:46 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231230=3A?=
 =?utf-8?q?_need_to_have_user_related_list?=
In-Reply-To: <076.425eb57365ab50184f38cc4f63b6a400@vtiger.fosslabs.com>
References: <076.425eb57365ab50184f38cc4f63b6a400@vtiger.fosslabs.com>
Message-ID: <085.b00b74a304fa0d050e6b097bf215f36c@vtiger.fosslabs.com>

#1230: need to have user related list
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  developer
      Type:  defect     |      Status:  closed   
  Priority:  major      |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.1    
Resolution:  fixed      |    Keywords:           
------------------------+---------------------------------------------------
Changes (by anonymous):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1230>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 10:01:36 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 14:01:36 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23486=3A_?=
 =?utf-8?q?table_indexing_is_not_proper_in_some_tables?=
In-Reply-To: <076.54bbc5aa9fb5a6e3cd2310cbda7781d8@vtiger.fosslabs.com>
References: <076.54bbc5aa9fb5a6e3cd2310cbda7781d8@vtiger.fosslabs.com>
Message-ID: <085.bc60409e4177d16605e9e89f92846fb6@vtiger.fosslabs.com>

#486: table indexing is not proper in some tables
------------------------+---------------------------------------------------
  Reporter:  don        |       Owner:  don  
      Type:  defect     |      Status:  new  
  Priority:  major      |   Milestone:  5.0.0
 Component:  vtigercrm  |     Version:  5.0.1
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by anonymous):

  * version:  5.0.0 => 5.0.1

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/486>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 10:02:25 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 14:02:25 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231116=3A?=
 =?utf-8?q?_FCKeditor=3A_document_version_used=2C_merge_new_versions_as_re?=
 =?utf-8?q?leased?=
In-Reply-To: <076.23b59aa20444402e3e3f439012465746@vtiger.fosslabs.com>
References: <076.23b59aa20444402e3e3f439012465746@vtiger.fosslabs.com>
Message-ID: <085.099dcf43fff40c9956d54950c6c4a57d@vtiger.fosslabs.com>

#1116: FCKeditor: document version used, merge new versions as released
------------------------+---------------------------------------------------
  Reporter:  jeffk      |       Owner:  gopal                    
      Type:  defect     |      Status:  assigned                 
  Priority:  major      |   Milestone:  5.0.0                    
 Component:  vtigercrm  |     Version:  5.0.1                    
Resolution:             |    Keywords:  editor packaging snapshot
------------------------+---------------------------------------------------
Changes (by gopal):

  * version:  5.0.0 => 5.0.1
  * status:  new => assigned
  * owner:  jeffk => gopal

Comment:

 Dear Jeff,

 I have tested the FCKEditor 2.3. I didn't noticied any significant
 difference. Hence we can wait for some more time upgrading to the latest
 version. BTW, our usage of editor is very limited.

 Thanks,
 Gopal

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1116>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 10:02:36 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 14:02:36 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23355=3A_?=
 =?utf-8?q?Option_can_be_provided_to_convert_a_lead_from_leads_list_view_i?=
 =?utf-8?q?tself?=
In-Reply-To: <076.723759bda055b76b6a827d918860919f@vtiger.fosslabs.com>
References: <076.723759bda055b76b6a827d918860919f@vtiger.fosslabs.com>
Message-ID: <085.cad5c979fddaafce5acac9f40558c620@vtiger.fosslabs.com>

#355: Option can be provided to convert a lead from leads list view itself
--------------------------+-------------------------------------------------
  Reporter:  don          |       Owner:  saint
      Type:  enhancement  |      Status:  new  
  Priority:  major        |   Milestone:       
 Component:  vtigercrm    |     Version:  5.0.1
Resolution:               |    Keywords:       
--------------------------+-------------------------------------------------
Changes (by anonymous):

  * version:  5.0.0 => 5.0.1

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/355>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 10:03:14 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 14:03:14 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231116=3A?=
 =?utf-8?q?_FCKeditor=3A_document_version_used=2C_merge_new_versions_as_re?=
 =?utf-8?q?leased?=
In-Reply-To: <076.23b59aa20444402e3e3f439012465746@vtiger.fosslabs.com>
References: <076.23b59aa20444402e3e3f439012465746@vtiger.fosslabs.com>
Message-ID: <085.797a6d72295c9b2973fbdfd509b8faa3@vtiger.fosslabs.com>

#1116: FCKeditor: document version used, merge new versions as released
------------------------+---------------------------------------------------
  Reporter:  jeffk      |       Owner:  jeffk                    
      Type:  defect     |      Status:  new                      
  Priority:  major      |   Milestone:  5.0.0                    
 Component:  vtigercrm  |     Version:  5.0.1                    
Resolution:             |    Keywords:  editor packaging snapshot
------------------------+---------------------------------------------------
Changes (by gopal):

  * status:  assigned => new
  * owner:  gopal => jeffk

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1116>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 10:06:52 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 14:06:52 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231319=3A?=
 =?utf-8?q?_Thunderbird_Connector_Bugs?=
In-Reply-To: <076.6c811b9cd61da3ae39b454241d719204@vtiger.fosslabs.com>
References: <076.6c811b9cd61da3ae39b454241d719204@vtiger.fosslabs.com>
Message-ID: <085.2fa59af313f83f935a5fb6e3398aef2b@vtiger.fosslabs.com>

#1319: Thunderbird Connector Bugs
------------------------------+---------------------------------------------
  Reporter:  anonymous        |       Owner:  mangai
      Type:  defect           |      Status:  new   
  Priority:  major            |   Milestone:        
 Component:  thunderbirdextn  |     Version:  5.0.1 
Resolution:                   |    Keywords:        
------------------------------+---------------------------------------------
Changes (by richie):

  * version:  5.0.0 => 5.0.1

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1319>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 10:10:12 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 14:10:12 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=23260=3A_?=
	=?utf-8?q?Issue_in_Change_Owner?=
In-Reply-To: <076.a1fa6304362146237625bdb76ef761ce@vtiger.fosslabs.com>
References: <076.a1fa6304362146237625bdb76ef761ce@vtiger.fosslabs.com>
Message-ID: <085.3c877bda3f80e8a84fa8c656da452f49@vtiger.fosslabs.com>

#260: Issue in Change Owner
------------------------+---------------------------------------------------
  Reporter:  don        |       Owner:  Richie
      Type:  defect     |      Status:  new   
  Priority:  critical   |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.1 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * version:  5.0.0 => 5.0.1

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/260>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 10:26:41 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 14:26:41 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23729=3A_?=
 =?utf-8?q?Need_appropriate_dashboard_for_sales_or_customer_service?=
In-Reply-To: <076.9c59a58160b093b88ed4ee9faba261b3@vtiger.fosslabs.com>
References: <076.9c59a58160b093b88ed4ee9faba261b3@vtiger.fosslabs.com>
Message-ID: <085.915216a1b0bd9e345e10984ce0ef8c77@vtiger.fosslabs.com>

#729: Need appropriate dashboard for sales or customer service
--------------------------+-------------------------------------------------
  Reporter:  OnwealdTim   |       Owner:  richie
      Type:  enhancement  |      Status:  new   
  Priority:  major        |   Milestone:        
 Component:  vtigercrm    |     Version:  5.0.0 
Resolution:               |    Keywords:        
--------------------------+-------------------------------------------------
Changes (by mangai):

  * owner:  mangai => richie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/729>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 10:31:09 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 14:31:09 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231356=3A?=
	=?utf-8?q?_Ajax_edit_issue?=
In-Reply-To: <076.f02a9fbd23d12bad75eedc90afaf903d@vtiger.fosslabs.com>
References: <076.f02a9fbd23d12bad75eedc90afaf903d@vtiger.fosslabs.com>
Message-ID: <085.e1ea8cd2d7f7669563d4cd6a45436f46@vtiger.fosslabs.com>

#1356: Ajax edit issue
---------------------------+------------------------------------------------
  Reporter:  jerrydgeorge  |       Owner:  jerrydgeorge
      Type:  defect        |      Status:  new         
  Priority:  critical      |   Milestone:              
 Component:  vtigercrm     |     Version:  5.0.1       
Resolution:                |    Keywords:              
---------------------------+------------------------------------------------
Changes (by richie):

  * version:  5.0.0 => 5.0.1

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1356>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 10:38:39 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 14:38:39 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23623=3A_?=
 =?utf-8?q?Issue_in_Activity_Quick_Edit?=
In-Reply-To: <076.0386d0bd11848a433f30ada206c92aa2@vtiger.fosslabs.com>
References: <076.0386d0bd11848a433f30ada206c92aa2@vtiger.fosslabs.com>
Message-ID: <085.fe04e5ef781b8b77c4d3dcb526b31b60@vtiger.fosslabs.com>

#623: Issue in Activity Quick Edit
------------------------+---------------------------------------------------
  Reporter:  don        |       Owner:  Richie
      Type:  defect     |      Status:  new   
  Priority:  critical   |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.1 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * version:  5.0.0 => 5.0.1

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/623>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 23 10:52:50 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 14:52:50 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7478 -
	/vtigercrm/trunk/Smarty/templates/ListView.tpl
Message-ID: <20060623145250.DB5B883F81E@vtiger.fosslabs.com>

Author: richie
Date: Fri Jun 23 08:52:45 2006
New Revision: 7478

Log:
Close button added for Search

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 Fri Jun 23 08:52:45 2006
@@ -127,7 +127,6 @@
         </td>
 </tr>
 </table>
-</div>
 
 {*<!-- Contents -->*}
 <form name="basicSearch" action="index.php">
@@ -156,10 +155,11 @@
 		<td width="35%" class="dvtCellLabel">
 			  <input name="submit" type="button" class="classBtn" onClick="callSearch('Basic');" value=" {$APP.LBL_SEARCH_NOW_BUTTON} ">&nbsp;
 			   <span class="hiliteBtn4Search"><a href="#" onClick="fnhide('searchAcc');show('advSearch');document.basicSearch.searchtype.value='advance';">{$APP.LBL_GO_TO} {$APP.LNK_ADVANCED_SEARCH}</a></span>	
-							</td>
+		</td>
+		<td valign="top" onMouseOver="this.style.cursor='pointer';" onclick="moveMe('searchAcc');searchshowhide('searchAcc','advSearch')">[x]</td>
 	</tr>
 	<tr>
-		<td colspan="4" align="center" class="dvtCellLabel">
+		<td colspan="5" align="center" class="dvtCellLabel">
 			<table border=0 cellspacing=0 cellpadding=0 width=100%>
 				<tr>
                                                 {$ALPHABETICAL}
@@ -177,6 +177,7 @@
 					<td nowrap width="30%" class="dvtCellLabel"><b><input name="matchtype" type="radio" value="all">&nbsp;{$APP.LBL_ADV_SEARCH_MSG_ALL}</b></td>
 					<td nowrap class="dvtCellLabel" width="30%"><b><input name="matchtype" type="radio" value="any" checked>&nbsp;{$APP.LBL_ADV_SEARCH_MSG_ANY}</b></td>
 					<td width="35%" class="dvtCellLabel"><span class="hiliteBtn4Search"><a href="#" onClick="show('searchAcc');fnhide('advSearch')">{$APP.LBL_GO_TO} {$APP.LNK_BASIC_SEARCH}</a></span></td>
+					<td valign="top" onMouseOver="this.style.cursor='pointer';" onclick="moveMe('searchAcc');searchshowhide('searchAcc','advSearch')">[x]</td>
 			</tr>
 		</table>
 		<table style="border-left:1px dashed #CCCCCC;border-right:1px dashed #CCCCCC;" cellpadding="2" cellspacing="0" width="80%" align="center" class="small">




From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 10:53:09 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 14:53:09 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=23877=3A_?=
	=?utf-8?q?Issue_in_Search_Window?=
In-Reply-To: <076.c156793a1b1426be51ed9260e43ba7b7@vtiger.fosslabs.com>
References: <076.c156793a1b1426be51ed9260e43ba7b7@vtiger.fosslabs.com>
Message-ID: <085.2bfd3c7fdf65c6dd5ca5594f4cd1ac7f@vtiger.fosslabs.com>

#877: Issue in Search Window
------------------------+---------------------------------------------------
  Reporter:  don        |       Owner:  ela   
      Type:  defect     |      Status:  closed
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by anonymous):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/877>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 10:53:54 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 14:53:54 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231008=3A?=
 =?utf-8?q?_assigned_to_group_is_not_coming_properly_in_ajax_edit?=
In-Reply-To: <076.6de5891dfeb7d1d2214d1225f8d87438@vtiger.fosslabs.com>
References: <076.6de5891dfeb7d1d2214d1225f8d87438@vtiger.fosslabs.com>
Message-ID: <085.bc29c6a64d4c71653411e29aa789bfd5@vtiger.fosslabs.com>

#1008: assigned to group is not coming properly in ajax edit
------------------------+---------------------------------------------------
  Reporter:  mangai     |       Owner:  jeri 
      Type:  defect     |      Status:  new  
  Priority:  major      |   Milestone:  5.0.0
 Component:  vtigercrm  |     Version:  5.0.1
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by anonymous):

  * version:  5.0.0 => 5.0.1

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1008>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 10:59:22 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 14:59:22 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=23923=3A_?=
	=?utf-8?q?Studio_=3E_Picklist?=
In-Reply-To: <076.b4e0e1396a2feb913df180b7b4a56c2c@vtiger.fosslabs.com>
References: <076.b4e0e1396a2feb913df180b7b4a56c2c@vtiger.fosslabs.com>
Message-ID: <085.418f9da5aced9e69f64820f04d8fef95@vtiger.fosslabs.com>

#923: Studio > Picklist
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  ela   
      Type:  defect     |      Status:  closed
  Priority:  trivial    |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by ela):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/923>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 11:01:20 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 15:01:20 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23839=3A_?=
 =?utf-8?q?Settings_=3E_CommunicationsTemplates_=3E_Mail_Merge_Template=2C?=
 =?utf-8?q?_Edit?=
In-Reply-To: <076.0201dd774bc7d66d5dc9d197e1979c28@vtiger.fosslabs.com>
References: <076.0201dd774bc7d66d5dc9d197e1979c28@vtiger.fosslabs.com>
Message-ID: <085.1d26d244127d63912e1ec129acf2d615@vtiger.fosslabs.com>

#839: Settings > CommunicationsTemplates > Mail Merge Template, Edit
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  ela   
      Type:  defect     |      Status:  closed
  Priority:  trivial    |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by ahmed):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/839>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 11:07:47 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 15:07:47 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23968=3A_?=
 =?utf-8?q?Quick_Edit_of_Assigned_Group_not_functional?=
In-Reply-To: <076.66451d79109fe79c040c7aba7d66b2ee@vtiger.fosslabs.com>
References: <076.66451d79109fe79c040c7aba7d66b2ee@vtiger.fosslabs.com>
Message-ID: <085.04dd6e9b35c21f8b8fcc2c409a5ca88a@vtiger.fosslabs.com>

#968: Quick Edit of Assigned Group not functional
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  Richie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.1 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * version:  5.0.0 => 5.0.1

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/968>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 11:10:31 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 15:10:31 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=23599=3A_?=
	=?utf-8?q?Profile_Issue?=
In-Reply-To: <076.c417ec60abd87aee2cbcbf16610fb0d5@vtiger.fosslabs.com>
References: <076.c417ec60abd87aee2cbcbf16610fb0d5@vtiger.fosslabs.com>
Message-ID: <085.e493f1524db0f119831c09491011009d@vtiger.fosslabs.com>

#599: Profile Issue
---------------------------+------------------------------------------------
  Reporter:  jerrydgeorge  |       Owner:  Richie  
      Type:  defect        |      Status:  closed  
  Priority:  critical      |   Milestone:          
 Component:  vtigercrm     |     Version:  5.0.0   
Resolution:  fixed         |    Keywords:  Security
---------------------------+------------------------------------------------
Changes (by richie):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/599>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 11:11:19 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 15:11:19 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23424=3A_?=
 =?utf-8?q?even_without_tab_privileges_standard_privileges_can_be_given?=
In-Reply-To: <076.d6748e5d43374a30e7084a0e578e5c4a@vtiger.fosslabs.com>
References: <076.d6748e5d43374a30e7084a0e578e5c4a@vtiger.fosslabs.com>
Message-ID: <085.3b8a5361d0fc0fc6b465b263c29ce344@vtiger.fosslabs.com>

#424: even without tab privileges standard privileges can be given
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  Richie 
      Type:  defect     |      Status:  closed 
  Priority:  critical   |   Milestone:         
 Component:  vtigercrm  |     Version:  5.0.0  
Resolution:  fixed      |    Keywords:  profile
------------------------+---------------------------------------------------
Changes (by richie):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/424>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 23 11:26:30 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 15:26:30 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7479 -
	/vtigercrm/trunk/Smarty/templates/DisplayFields.tpl
Message-ID: <20060623152630.E9BE77FDA81@vtiger.fosslabs.com>

Author: richie
Date: Fri Jun 23 09:26:27 2006
New Revision: 7479

Log:
picklist values obtained from language files if exists

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

Modified: vtigercrm/trunk/Smarty/templates/DisplayFields.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DisplayFields.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DisplayFields.tpl Fri Jun 23 09:26:27 2006
@@ -84,7 +84,13 @@
 			   <select name="{$fldname}" tabindex="{$vt_tab}" >
 				{foreach item=arr from=$fldvalue}
 					{foreach key=sel_value item=value from=$arr}
-						<option value="{$sel_value}" {$value}>{$sel_value}</option>
+						<option value="{$sel_value}" {$value}>
+                                                {if $APP[$sel_value] neq ''}
+                                                        {$APP[$sel_value]}
+                                                {else}
+                                                        {$sel_value}
+                                                {/if}
+                                                </option>
 					{/foreach}
 				{/foreach}
 			   </select>




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 23 11:30:45 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 15:30:45 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7480 -
	/vtigercrm/trunk/include/language/en_us.lang.php
Message-ID: <20060623153045.07CA87FDA81@vtiger.fosslabs.com>

Author: richie
Date: Fri Jun 23 09:30:42 2006
New Revision: 7480

Log:
language strings added for users PickList

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

Modified: vtigercrm/trunk/include/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/include/language/en_us.lang.php (original)
+++ vtigercrm/trunk/include/language/en_us.lang.php Fri Jun 23 09:30:42 2006
@@ -918,6 +918,15 @@
 'LBL_INVOICE_STATUS'=>'Invoice Status',
 'LBL_NOTE'=>'Note',
 'LBL_MODULE'=>'Module',
+'Active'=>'Active',
+'Inactive'=>'Inactive',
+'Today'=>'Today',
+'Last 2 Days'=>'Last 2 Days',
+'Last Week'=>'Last Week',
+'This Week'=>'This Week',
+'This Month'=>'This Month',
+'This Year'=>'This Year',
+
 );
 
 




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 23 11:31:31 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 15:31:31 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7481 -
	/vtigercrm/trunk/modules/Migration/Migration.php
Message-ID: <20060623153131.91E2C7FDA81@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 23 09:31:27 2006
New Revision: 7481

Log:
* changed the vtiger_prefix

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

Modified: vtigercrm/trunk/modules/Migration/Migration.php
==============================================================================
--- vtigercrm/trunk/modules/Migration/Migration.php (original)
+++ vtigercrm/trunk/modules/Migration/Migration.php Fri Jun 23 09:31:27 2006
@@ -165,7 +165,7 @@
 	{
 		global $conn;
 
-		$sql = "select vtiger_tabid from vtiger_tab where name='".$module."'";
+		$sql = "select tabid from vtiger_tab where name='".$module."'";
 		$result = $conn->query($sql);
 		$tabid=  $conn->query_result($result,0,"tabid");
 
@@ -207,7 +207,7 @@
 		$failure_query_array = Array();
 
 		//To handle the file includes for each and every version
-		//Here we have to decide which vtiger_files should be included, where the vtiger_files will be added newly for every public release
+		//Here we have to decide which files should be included, where the files will be added newly for every public release
 		//Handle Here -- Mickie
 		include("modules/Migration/ModifyDatabase/MigrationInfo.php");
 
@@ -289,16 +289,16 @@
 			$this->conn->println("Going to apply the old database dump to the new database.");
 			$this->applyDumpData($new_host_name,$new_mysql_port,$new_mysql_username,$new_mysql_password,$new_dbname,$dump_file);
 
-			//get the number of vtiger_tables in new database 
+			//get the number of tables in new database 
 			$new_tables_count = $this->getTablesCountInNewDatabase();
 
-			//get the number of vtiger_tables in old database 
+			//get the number of tables in old database 
 			$old_tables_count = $this->getTablesCountInOldDatabase();
 
-			//if vtiger_tables are missing after apply the dump, then alert the user and quit
+			//if tables are missing after apply the dump, then alert the user and quit
 			if(($new_tables_count != $old_tables_count && $option == 'dbsource') || ($new_tables_count < 180 && $option == 'dumpsource'))
 			{
-				$this->conn->println("New Database vtiger_tables not equal to Old Database vtiger_tables count. Reload the current database again and quit.");
+				$this->conn->println("New Database tables not equal to Old Database tables count. Reload the current database again and quit.");
 				
 				$continue_process = 0;
 				$msg = "The dump may not be applied correctly. Tables exist in 4.2.3 database : $old_tables_count. Tables exist in current database after apply the dump : $new_tables_count";




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 23 11:32:11 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 15:32:11 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7482 -
 /vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php
Message-ID: <20060623153211.07A177FDA81@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 23 09:32:07 2006
New Revision: 7482

Log:
* changed the vtiger_prefix and modified the queries which were failed

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 Jun 23 09:32:07 2006
@@ -16,19 +16,30 @@
 global $query_count, $success_query_count, $failure_query_count;
 global $success_query_array, $failure_query_array;
 
+//Added to put prefix vtiger_ in some of the columns in tables which are used for CV and Reports and field -- 23-06-06
+$conn->println("First we will rename the existing tables with prefix vtiger_");
+include("modules/Migration/ModifyDatabase/rename_tables.php");
+$conn->println("Renaming the existing tables with prefix vtiger_ has been finished");
+
+
+
+
+
+
 $conn->println("Database Modifications for 4.2 Patch2 ==> 5.0(Alpha) Dev 3 Starts here.");
 
 
 
 //These changes have been made in 4.2.3. The following queries have been included who has run the migration from 4.2 Patch2
-$wordtemplate_query1 = "alter table wordtemplates DROP PRIMARY KEY";
-Execute($wordtemplate_query1);
-
-$wordtemplate_query2 = "alter table wordtemplates DROP templateid";//this will fail if 4.2 Patch 2.
-$conn->query($wordtemplate_query2);
-
-$wordtemplate_query3 = "alter table wordtemplates add column templateid integer(19) unsigned auto_increment primary key FIRST";
-Execute($wordtemplate_query3);
+$wordtemp = $conn->getColumnNames("vtiger_wordtemplates");
+if(is_array($wordtemp) && !in_array("templateid",$wordtemp))
+{
+	$wordtemplate_query1 = "alter table vtiger_wordtemplates DROP PRIMARY KEY";
+	Execute($wordtemplate_query1);
+
+	$wordtemplate_query3 = "alter table vtiger_wordtemplates add column templateid integer(19) unsigned auto_increment primary key FIRST";
+	Execute($wordtemplate_query3);
+}
 //upto this added to modify the wordtemplates table which will be in the case of migrate from 4.2 Path2.
 
 
@@ -56,7 +67,7 @@
 		"alter table vtiger_cvstdfilter ADD PRIMARY KEY (cvid)",
 		"alter table vtiger_def_org_field ADD PRIMARY KEY (fieldid)",
 		"alter table vtiger_leadgrouprelation ADD PRIMARY KEY (leadid)",
-		"alter table vtiger_leadgrouprelation drop key vtiger_leadgrouprelation_IDX0",
+		"alter table vtiger_leadgrouprelation drop key leadgrouprelation_IDX0",
 		"alter table vtiger_organizationdetails ADD PRIMARY KEY (organizationame)",
 		"alter table vtiger_profile2field ADD PRIMARY KEY (profileid,fieldid)",
 		"alter table vtiger_profile2standardpermissions ADD PRIMARY KEY (profileid,tabid,Operation)",
@@ -65,7 +76,7 @@
 		"alter table vtiger_profile2utility drop index idx_prof2utility",
 		"alter table vtiger_relcriteria ADD PRIMARY KEY (queryid,columnindex)",
 		"alter table vtiger_reportdatefilter ADD PRIMARY KEY (datefilterid)",
-		"alter table vtiger_reportdatefilter DROP INDEX vtiger_reportdatefilter_IDX0",
+		"alter table vtiger_reportdatefilter DROP INDEX reportdatefilter_IDX0",
 		"alter table vtiger_reportsortcol ADD PRIMARY KEY (sortcolid,reportid)",
 		"alter table vtiger_reportsummary ADD PRIMARY KEY (reportsummaryid,summarytype,columnname)",
 		"drop table vtiger_role2action",
@@ -113,7 +124,7 @@
 
 
 //Removing entries for Dashboard and Home module from vtiger_profile2standardpermissions table
-$del_query1 = "delete from vtiger_profile2standardpermissions where vtiger_tabid in(1,3)";
+$del_query1 = "delete from vtiger_profile2standardpermissions where tabid in(1,3)";
 Execute($del_query1);
 
 //For all Profile do the following insert into vtiger_profile2utility table:
@@ -229,26 +240,29 @@
 }
 
 //Added for the "Color By User in Calendar " which has been contributed by Cesar
-$alter_query1 = "ALTER TABLE `users` ADD `cal_color` VARCHAR(25) DEFAULT '#E6FAD8' AFTER `user_hash`";
+$alter_query1 = "ALTER TABLE vtiger_users ADD cal_color VARCHAR(25) DEFAULT '#E6FAD8' AFTER user_hash";
 Execute($alter_query1);
 
 //code contributed by Fredy for color vtiger_priority
-$newfieldid = $conn->getUniqueID("field");
+$newfieldid = $conn->getUniqueID("vtiger_field");
 $insert_query1 = "insert into vtiger_field values (16,".$newfieldid.",'priority','activity',1,15,'taskpriority','Priority',1,0,0,100,17,1,1,'V~O',1,'')";
 Execute($insert_query1);
 
 //Added on 23-12-2005 which is missed from Fredy's contribution for Color vtiger_priority
 populateFieldForSecurity('16',$newfieldid);
-$activity_alter_query = "alter table vtiger_activity add column priority varchar(150) default NULL";
-Execute($activity_alter_query);
-
+$activity_cols = $conn->getColumnNames("vtiger_activity");
+if(is_array($activity_cols) && !in_array("priority",$activity_cols))
+{
+	$activity_alter_query = "alter table vtiger_activity add column priority varchar(150) default NULL";
+	Execute($activity_alter_query);
+}
 //Code contributed by Raju for better emailing 
 /*
 $insert_array1 = Array(
-		"insert into vtiger_field values (10,".$conn->getUniqueID("field").",'crmid','seactivityrel',1,'357','parent_id','Related To',1,0,0,100,1,2,1,'I~O',1,'')",
-		"insert into vtiger_field values (10,".$conn->getUniqueID("field").",'subject','activity',1,'2','subject','Subject',1,0,0,100,1,3,1,'V~M',0,1)",
-		"insert into vtiger_field values (10,".$conn->getUniqueID("field").",'filename','emails',1,'61','filename','Attachment',1,0,0,100,1,4,1,'V~O',1,'')",
-		"insert into vtiger_field values (10,".$conn->getUniqueID("field").",'description','emails',1,'19','description','Description',1,0,0,100,1,5,1,'V~O',1,'')",
+		"insert into vtiger_field values (10,".$conn->getUniqueID("vtiger_field").",'crmid','seactivityrel',1,'357','parent_id','Related To',1,0,0,100,1,2,1,'I~O',1,'')",
+		"insert into vtiger_field values (10,".$conn->getUniqueID("vtiger_field").",'subject','activity',1,'2','subject','Subject',1,0,0,100,1,3,1,'V~M',0,1)",
+		"insert into vtiger_field values (10,".$conn->getUniqueID("vtiger_field").",'filename','emails',1,'61','filename','Attachment',1,0,0,100,1,4,1,'V~O',1,'')",
+		"insert into vtiger_field values (10,".$conn->getUniqueID("vtiger_field").",'description','emails',1,'19','description','Description',1,0,0,100,1,5,1,'V~O',1,'')",
 		);
 */
 //commented the above array as that queries are wrong queries -- changed on 23-12-2005
@@ -273,7 +287,7 @@
 $alter_query3 = "ALTER TABLE vtiger_invoice ADD column contactid int(19) after customerno";
 Execute($alter_query3);
 
-$newfieldid = $conn->getUniqueID("field");
+$newfieldid = $conn->getUniqueID("vtiger_field");
 $insert_query2 = "insert into vtiger_field values (23,".$newfieldid.",'contactid','invoice',1,'57','contact_id','Contact Name',1,0,0,100,4,1,1,'I~O',1,'')";
 Execute($insert_query2);
 //Added on 23-12-2005 because we must populate vtiger_field entries in vtiger_profile2field and vtiger_def_org_field if we add a vtiger_field in vtiger_field table
@@ -308,7 +322,7 @@
 
 
 //Added vtiger_field emailoptout in vtiger_account table
-$newfieldid = $conn->getUniqueID("field");
+$newfieldid = $conn->getUniqueID("vtiger_field");
 $insert_query3 = "insert into vtiger_field values (6,".$newfieldid.",'emailoptout','account',1,'56','emailoptout','Email Opt Out',1,0,0,100,17,1,1,'C~O',1,'')";
 Execute($insert_query3);
 
@@ -395,7 +409,7 @@
 $create_query1 = "CREATE TABLE  vtiger_inventory_tandc(id INT(19),type VARCHAR(30) NOT NULL,tandc LONGTEXT default NULL,PRIMARY KEY(id))";
 Execute($create_query1);
 
-$insert_query4 = "insert into vtiger_inventory_tandc values('".$conn->getUniqueID('inventory_tandc')."','Inventory','  ')";
+$insert_query4 = "insert into vtiger_inventory_tandc values('".$conn->getUniqueID('vtiger_inventory_tandc')."','Inventory','  ')";
 Execute($insert_query4);
 
 /****************** 5.0(Alpha) dev version 1 Database changes -- Ends*********************/
@@ -837,8 +851,8 @@
 }
 
 $insert_field_array1 = Array(
-				"Insert into vtiger_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 vtiger_field values (16,".$conn->getUniqueID("field").",'notime','activity',1,56,'notime','No Time',1,0,0,100,18,1,1,'C~O',1,'')"
+				"Insert into vtiger_field values (9,".$conn->getUniqueID("vtiger_field").",'notime','activity',1,56,'notime','No Time',1,0,0,100,20,1,3,'C~O',1,'')",
+				"Insert into vtiger_field values (16,".$conn->getUniqueID("vtiger_field").",'notime','activity',1,56,'notime','No Time',1,0,0,100,18,1,1,'C~O',1,'')"
 			    );
 foreach($insert_field_array1 as $query)
 {
@@ -867,27 +881,27 @@
 }
 
 $insert_field_array2 = Array(
-				"insert into vtiger_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 vtiger_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 vtiger_field values (23,".$conn->getUniqueID("vtiger_field").",'bill_pobox','invoicebillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,2,1,'V~O',1,'')",
+				"insert into vtiger_field values (23,".$conn->getUniqueID("vtiger_field").",'ship_pobox','invoiceshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,2,1,'V~O',1,'')",
 				
-				"insert into vtiger_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 vtiger_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 vtiger_field values (6,".$conn->getUniqueID("vtiger_field").",'pobox','accountbillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,2,1,'V~O',1,'')",
+				"insert into vtiger_field values (6,".$conn->getUniqueID("vtiger_field").",'pobox','accountshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,2,1,'V~O',1,'')",
 				
-				"insert into vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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,'')"
+				"insert into vtiger_field values (7,".$conn->getUniqueID("vtiger_field").",'pobox','leadaddress',1,'1','pobox','Po Box',1,0,0,100,2,2,1,'V~O',1,'')",
+
+				"insert into vtiger_field values (4,".$conn->getUniqueID("vtiger_field").",'mailingpobox','contactaddress',1,'1','mailingpobox','Mailing Po Box',1,0,0,100,3,2,1,'V~O',1,'')",
+				"insert into vtiger_field values (4,".$conn->getUniqueID("vtiger_field").",'otherpobox','contactaddress',1,'1','otherpobox','Other Po Box',1,0,0,100,4,2,1,'V~O',1,'')",
+
+				"insert into vtiger_field values (18,".$conn->getUniqueID("vtiger_field").",'pobox','vendor',1,'1','pobox','Po Box',1,0,0,100,2,2,1,'V~O',1,'')",
+
+				"insert into vtiger_field values (20,".$conn->getUniqueID("vtiger_field").",'bill_pobox','quotesbillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,2,1,'V~O',1,'')",
+				"insert into vtiger_field values (20,".$conn->getUniqueID("vtiger_field").",'ship_pobox','quotesshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,2,1,'V~O',1,'')",
+
+				"insert into vtiger_field values (21,".$conn->getUniqueID("vtiger_field").",'bill_pobox','pobillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,2,1,'V~O',1,'')",
+				"insert into vtiger_field values (21,".$conn->getUniqueID("vtiger_field").",'ship_pobox','poshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,2,1,'V~O',1,'')",
+
+				"insert into vtiger_field values (22,".$conn->getUniqueID("vtiger_field").",'bill_pobox','sobillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,2,1,'V~O',1,'')",
+				"insert into vtiger_field values (22,".$conn->getUniqueID("vtiger_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)
 {
@@ -941,12 +955,12 @@
 }
 
 $query_array1 = Array(
-			"update vtiger_field set tablename='crmentity' where tabid=10 and fieldname='description'",
-			"update vtiger_field set tablename='attachments' where tabid=10 and fieldname='filename'",
-			"drop table emails",
+			"update vtiger_field set tablename='vtiger_crmentity' where tabid=10 and fieldname='description'",
+			"update vtiger_field set tablename='vtiger_attachments' where tabid=10 and fieldname='filename'",
+			"drop table vtiger_emails",
 
 			"alter table vtiger_activity drop column description",
-			"update vtiger_field set tablename='crmentity' where tabid in (9,16) and fieldname='description'",
+			"update vtiger_field set tablename='vtiger_crmentity' where tabid in (9,16) and fieldname='description'",
 
 			"update vtiger_tab set name='PurchaseOrder',tablabel='PurchaseOrder' where tabid=21",
 			"update vtiger_tab set presence=0 where tabid=22 and name='SalesOrder'",
@@ -956,7 +970,7 @@
 			"delete from vtiger_actionmapping where actionname='SaveSalesOrder'",
 			"delete from vtiger_actionmapping where actionname='DeleteSalesOrder'",
 
-			"insert into vtiger_field values (13,".$conn->getUniqueID("field").",'filename','attachments',1,'61','filename','Attachment',1,0,0,100,12,2,1,'V~O',0,1)",
+			"insert into vtiger_field values (13,".$conn->getUniqueID("vtiger_field").",'filename','vtiger_attachments',1,'61','filename','Attachment',1,0,0,100,12,2,1,'V~O',0,1)",
 
 			"alter table vtiger_troubletickets add column filename varchar(50) default NULL after title"
 		     );
@@ -1176,23 +1190,23 @@
 Execute($query);
 
 $insert_query_array6 = Array(
-			"insert into vtiger_customview values(".$conn->getUniqueID('customview').",'All',1,0,'Leads')",
-			"insert into vtiger_customview values(".$conn->getUniqueID('customview').",'All',1,0,'Accounts')",
-			"insert into vtiger_customview values(".$conn->getUniqueID('customview').",'All',1,0,'Contacts')",
-			"insert into vtiger_customview values(".$conn->getUniqueID('customview').",'All',1,0,'Potentials')",
-			"insert into vtiger_customview values(".$conn->getUniqueID('customview').",'All',1,0,'HelpDesk')",
-			"insert into vtiger_customview values(".$conn->getUniqueID('customview').",'All',1,0,'Quotes')",
-			"insert into vtiger_customview values(".$conn->getUniqueID('customview').",'All',1,0,'Activities')",
-			"insert into vtiger_customview values(".$conn->getUniqueID('customview').",'All',1,0,'Emails')",
-			"insert into vtiger_customview values(".$conn->getUniqueID('customview').",'All',1,0,'Invoice')",
-			"insert into vtiger_customview values(".$conn->getUniqueID('customview').",'All',1,0,'Notes')",
-			"insert into vtiger_customview values(".$conn->getUniqueID('customview').",'All',1,0,'PriceBooks')",
-			"insert into vtiger_customview values(".$conn->getUniqueID('customview').",'All',1,0,'Products')",
-			"insert into vtiger_customview values(".$conn->getUniqueID('customview').",'All',1,0,'PurchaseOrder')",
+			"insert into vtiger_customview values(".$conn->getUniqueID('vtiger_customview').",'All',1,0,'Leads')",
+			"insert into vtiger_customview values(".$conn->getUniqueID('vtiger_customview').",'All',1,0,'Accounts')",
+			"insert into vtiger_customview values(".$conn->getUniqueID('vtiger_customview').",'All',1,0,'Contacts')",
+			"insert into vtiger_customview values(".$conn->getUniqueID('vtiger_customview').",'All',1,0,'Potentials')",
+			"insert into vtiger_customview values(".$conn->getUniqueID('vtiger_customview').",'All',1,0,'HelpDesk')",
+			"insert into vtiger_customview values(".$conn->getUniqueID('vtiger_customview').",'All',1,0,'Quotes')",
+			"insert into vtiger_customview values(".$conn->getUniqueID('vtiger_customview').",'All',1,0,'Activities')",
+			"insert into vtiger_customview values(".$conn->getUniqueID('vtiger_customview').",'All',1,0,'Emails')",
+			"insert into vtiger_customview values(".$conn->getUniqueID('vtiger_customview').",'All',1,0,'Invoice')",
+			"insert into vtiger_customview values(".$conn->getUniqueID('vtiger_customview').",'All',1,0,'Notes')",
+			"insert into vtiger_customview values(".$conn->getUniqueID('vtiger_customview').",'All',1,0,'PriceBooks')",
+			"insert into vtiger_customview values(".$conn->getUniqueID('vtiger_customview').",'All',1,0,'Products')",
+			"insert into vtiger_customview values(".$conn->getUniqueID('vtiger_customview').",'All',1,0,'PurchaseOrder')",
 				
-			"insert into vtiger_customview values(".$conn->getUniqueID('customview').",'All',1,0,'SalesOrder')",
-			"insert into vtiger_customview values(".$conn->getUniqueID('customview').",'All',1,0,'Vendors')",
-			"insert into vtiger_customview values(".$conn->getUniqueID('customview').",'All',1,0,'Faq')"
+			"insert into vtiger_customview values(".$conn->getUniqueID('vtiger_customview').",'All',1,0,'SalesOrder')",
+			"insert into vtiger_customview values(".$conn->getUniqueID('vtiger_customview').",'All',1,0,'Vendors')",
+			"insert into vtiger_customview values(".$conn->getUniqueID('vtiger_customview').",'All',1,0,'Faq')"
 			    );
 foreach($insert_query_array6 as $query)
 {
@@ -1588,7 +1602,7 @@
 
 //$update_query2 = "UPDATE vtiger_field SET fieldlabel = 'Reference' WHERE tabid = 4 and tablename = 'contactdetails' and fieldname='reference'";
 //changed in 24-04-06 because the reference has not been entered into the vtiger_field table. 
-$update_query2 = "insert into vtiger_field values (4,".$conn->getUniqueID("field").",'reference','contactdetails',1,'56','reference','Reference',1,0,0,10,23,4,1,'C~O',1,null,'ADV')";
+$update_query2 = "insert into vtiger_field values (4,".$conn->getUniqueID("vtiger_field").",'reference','contactdetails',1,'56','reference','Reference',1,0,0,10,23,4,1,'C~O',1,null,'ADV')";
 Execute($update_query2);
 
 $update_query_array4 = Array(
@@ -1655,11 +1669,11 @@
 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"
+				"ALTER TABLE `vtiger_chat_msg`  ADD CONSTRAINT `chat_msg_ibfk_1` FOREIGN KEY (`chat_from`) REFERENCES `chat_users` (`id`) ON DELETE CASCADE",
+
+				"ALTER TABLE `vtiger_chat_pchat`  ADD CONSTRAINT `chat_pchat_ibfk_1` FOREIGN KEY (`msg`) REFERENCES `chat_msg` (`id`) ON DELETE CASCADE",
+
+				"ALTER TABLE `vtiger_chat_pvchat`  ADD CONSTRAINT `chat_pvchat_ibfk_1` FOREIGN KEY (`msg`) REFERENCES `chat_msg` (`id`) ON DELETE CASCADE"
 			    );
 foreach($alter_query_array17 as $query)
 {
@@ -1684,10 +1698,10 @@
 
 $insert_query_array23 = Array(
 				"insert into vtiger_blocks values(75,4,'LBL_IMAGE_INFORMATION',5,0,0,0,0,0)",
-				"insert into vtiger_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 vtiger_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 vtiger_field values(16,".$conn->getUniqueID("field").",'visibility','activity',1,15,'visibility','Visibility',1,0,0,100,19,41,1,'V~O',1,null,'BAS')"
+				"insert into vtiger_field values(4,".$conn->getUniqueID("vtiger_field").",'imagename','contactdetails',1,'69','imagename','Contact Image',1,0,0,100,1,75,1,'V~O',1,null,'ADV')",
+
+				"Insert into vtiger_field values(9,".$conn->getUniqueID("vtiger_field").",'visibility','activity',1,15,'visibility','Visibility',1,0,0,100,17,19,3,'V~O',1,null,'BAS')",
+				"Insert into vtiger_field values(16,".$conn->getUniqueID("vtiger_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)
 {
@@ -1717,29 +1731,29 @@
 Execute($insert_query9);
 
 $insert_query_array24 = Array(
-	"insert into vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_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 vtiger_field values (26,".$conn->getUniqueID("field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,78,1,'V~O',1,null,'BAS')"
+	"insert into vtiger_field values (26,".$conn->getUniqueID("vtiger_field").",'campaignname','campaign',1,'2','campaignname','Campaign Name',1,0,0,100,1,76,1,'V~M',0,1,'BAS')",
+	"insert into vtiger_field values (26,".$conn->getUniqueID("vtiger_field").",'campaigntype','campaign',1,15,'campaigntype','Campaign Type',1,0,0,100,2,76,1,'V~O',0,5,'BAS')",
+	"insert into vtiger_field values (26,".$conn->getUniqueID("vtiger_field").",'product_id','campaign',1,59,'product_id','Product',1,0,0,100,3,76,1,'I~O',0,5,'BAS')",
+	"insert into vtiger_field values (26,".$conn->getUniqueID("vtiger_field").",'campaignstatus','campaign',1,15,'campaignstatus','Campaign Status',1,0,0,100,4,76,1,'V~O',0,5,'BAS')",
+	"insert into vtiger_field values (26,".$conn->getUniqueID("vtiger_field").",'closingdate','campaign',1,'23','closingdate','Expected Close Date',1,0,0,100,5,76,1,'D~M',0,3,'BAS')",
+	"insert into vtiger_field values (26,".$conn->getUniqueID("vtiger_field").",'expectedrevenue','campaign',1,'1','expectedrevenue','Expected Revenue',1,0,0,100,6,76,1,'I~O',1,null,'BAS')",
+	"insert into vtiger_field values (26,".$conn->getUniqueID("vtiger_field").",'budgetcost','campaign',1,'1','budgetcost','Budget Cost',1,0,0,100,7,76,1,'I~O',1,null,'BAS')",
+	"insert into vtiger_field values (26,".$conn->getUniqueID("vtiger_field").",'actualcost','campaign',1,'1','actualcost','Actual Cost',1,0,0,100,8,76,1,'I~O',1,null,'BAS')",
+	"insert into vtiger_field values (26,".$conn->getUniqueID("vtiger_field").",'expectedresponse','campaign',1,'15','expectedresponse','Expected Response',1,0,0,100,9,76,1,'V~O',0,4,'BAS')",
+	"insert into vtiger_field values (26,".$conn->getUniqueID("vtiger_field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,10,76,1,'V~M',1,null,'BAS')",
+	"insert into vtiger_field values (26,".$conn->getUniqueID("vtiger_field").",'numsent','campaign',1,'9','numsent','Num Sent',1,0,0,100,11,76,1,'N~O',1,null,'BAS')",
+	"insert into vtiger_field values (26,".$conn->getUniqueID("vtiger_field").",'sponsor','campaign',1,'1','sponsor','Sponsor',1,0,0,100,12,76,1,'V~O',1,null,'BAS')",
+	"insert into vtiger_field values (26,".$conn->getUniqueID("vtiger_field").",'targetaudience','campaign',1,'1','targetaudience','Target Audience',1,0,0,100,13,76,1,'V~O',1,null,'BAS')",
+	"insert into vtiger_field values (26,".$conn->getUniqueID("vtiger_field").",'targetsize','campaign',1,'1','targetsize','TargetSize',1,0,0,100,14,76,1,'N~O',1,null,'BAS')",
+	"insert into vtiger_field values (26,".$conn->getUniqueID("vtiger_field").",'expectedresponsecount','campaign',1,'1','expectedresponsecount','Expected Response Count',1,0,0,100,17,76,1,'N~O',1,null,'BAS')",
+	"insert into vtiger_field values (26,".$conn->getUniqueID("vtiger_field").",'expectedsalescount','campaign',1,'1','expectedsalescount','Expected Sales Count',1,0,0,100,15,76,1,'N~O',1,null,'BAS')",
+	"insert into vtiger_field values (26,".$conn->getUniqueID("vtiger_field").",'expectedroi','campaign',1,'1','expectedroi','Expected ROI',1,0,0,100,19,76,1,'N~O',1,null,'BAS')",
+	"insert into vtiger_field values (26,".$conn->getUniqueID("vtiger_field").",'actualresponsecount','campaign',1,'1','actualresponsecount','Actual Response Count',1,0,0,100,18,76,1,'N~O',1,null,'BAS')",
+	"insert into vtiger_field values (26,".$conn->getUniqueID("vtiger_field").",'actualsalescount','campaign',1,'1','actualsalescount','Actual Sales Count',1,0,0,100,16,76,1,'N~O',1,null,'BAS')",
+	"insert into vtiger_field values (26,".$conn->getUniqueID("vtiger_field").",'actualroi','campaign',1,'1','actualroi','Actual ROI',1,0,0,100,20,76,1,'N~O',1,null,'BAS')",
+	"insert into vtiger_field values (26,".$conn->getUniqueID("vtiger_field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,15,76,2,'T~O',1,null,'BAS')",
+	"insert into vtiger_field values (26,".$conn->getUniqueID("vtiger_field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,16,76,2,'T~O',1,null,'BAS')",
+	"insert into vtiger_field values (26,".$conn->getUniqueID("vtiger_field").",'description','crmentity',1,'19','description','Description',1,0,0,100,1,78,1,'V~O',1,null,'BAS')"
 			     );
 foreach($insert_query_array24 as $query)
 {
@@ -1747,8 +1761,8 @@
 }
 
 $insert_query_array25 = Array(
-	"insert into vtiger_relatedlists values (".$conn->getUniqueID('relatedlists').",".getTabid("Campaigns").",".getTabid("Contacts").",'get_contacts',1,'Contacts',0)",
-	"insert into vtiger_relatedlists values (".$conn->getUniqueID('relatedlists').",".getTabid("Campaigns").",".getTabid("Leads").",'get_leads',2,'Leads',0)"
+	"insert into vtiger_relatedlists values (".$conn->getUniqueID('vtiger_relatedlists').",".getTabid("Campaigns").",".getTabid("Contacts").",'get_contacts',1,'Contacts',0)",
+	"insert into vtiger_relatedlists values (".$conn->getUniqueID('vtiger_relatedlists').",".getTabid("Campaigns").",".getTabid("Leads").",'get_leads',2,'Leads',0)"
 			     );
 foreach($insert_query_array25 as $query)
 {
@@ -1757,8 +1771,8 @@
 
 
 $insert_query_array26 = Array(
-	"insert into vtiger_field values (7,".$conn->getUniqueID("field").",'campaignid','leaddetails',1,'51','campaignid','Campaign Name',1,0,0,100,6,13,3,'I~O',1,null,'BAS')",
-	"insert into vtiger_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')"
+	"insert into vtiger_field values (7,".$conn->getUniqueID("vtiger_field").",'campaignid','leaddetails',1,'51','campaignid','Campaign Name',1,0,0,100,6,13,3,'I~O',1,null,'BAS')",
+	"insert into vtiger_field values (4,".$conn->getUniqueID("vtiger_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)
 {
@@ -1881,113 +1895,110 @@
 
 $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",
+//"ALTER TABLE `vtiger_accountgrouprelation` DROP INDEX `fk_accountgrouprelation2`",
+//"ALTER TABLE `vtiger_activity` DROP INDEX `status`",
+"ALTER TABLE `vtiger_carrier` DROP INDEX `carrier_UK0`",
+"ALTER TABLE `vtiger_chat_msg` DROP INDEX `chat_to`",
+"ALTER TABLE `vtiger_chat_msg` DROP INDEX `chat_from`",
+"ALTER TABLE `vtiger_chat_msg` DROP INDEX `born`",
+"ALTER TABLE `vtiger_chat_pchat` DROP INDEX `msg`",
+"ALTER TABLE `vtiger_chat_pvchat` DROP INDEX `msg`",
+"ALTER TABLE `vtiger_chat_users` DROP INDEX `session`",
+"ALTER TABLE `vtiger_chat_users` DROP INDEX `nick`",
+"ALTER TABLE `vtiger_chat_users` DROP INDEX `ping`",
+//"ALTER TABLE `vtiger_contactgrouprelation` DROP INDEX `fk_contactgrouprelation2`",
+//"ALTER TABLE `vtiger_customview` DROP INDEX `customview`",
+//"ALTER TABLE `vtiger_def_org_field` DROP INDEX `tabid`",
+//"ALTER TABLE `vtiger_field` DROP INDEX `tabid`",
+"ALTER TABLE `vtiger_freetagged_objects` DROP INDEX `tagger_id_index`",
+"ALTER TABLE `vtiger_freetagged_objects` DROP INDEX `object_id_index`",
+"ALTER TABLE `vtiger_groups` DROP INDEX `groupname`",
+//"ALTER TABLE `vtiger_invoicegrouprelation` DROP INDEX `fk_invoicegrouprelation2`",
+//"ALTER TABLE `vtiger_leadscf` DROP COLUMN `cf_354`",
+//"ALTER TABLE `vtiger_leadscf` DROP COLUMN `cf_358`",
+//"ALTER TABLE `vtiger_leadscf` DROP COLUMN `cf_360`",
+//"ALTER TABLE `vtiger_pogrouprelation` DROP INDEX `fk_productgrouprelation2`",
+//"ALTER TABLE `vtiger_potential` DROP INDEX `potentialid`",
+//"ALTER TABLE `vtiger_potentialgrouprelation` DROP INDEX `fk_potentialgrouprelation2`",
+//"ALTER TABLE `vtiger_profile2field` DROP INDEX `tabid`",
+"ALTER TABLE `vtiger_profile2tab` DROP INDEX `idx_profile2tab`",
+//"ALTER TABLE `vtiger_quotegrouprelation` DROP INDEX `fk_quotegrouprelation2`",
+"ALTER TABLE `vtiger_reportmodules` DROP INDEX `reportmodules_IDX0`",
+"ALTER TABLE `vtiger_reportsortcol` DROP INDEX `reportsortcol_IDX0`",
+"ALTER TABLE `vtiger_reportsummary` DROP INDEX `reportsummary_IDX0`",
+//"ALTER TABLE `vtiger_seattachmentsrel` DROP INDEX `attachmentsid`",
+//"ALTER TABLE `vtiger_sogrouprelation` DROP INDEX `fk_sogrouprelation2`",
+//"ALTER TABLE `vtiger_soproductrel` DROP COLUMN `shortdescription`",
+//"ALTER TABLE `vtiger_tab` DROP INDEX `tabid`",
+//"ALTER TABLE `vtiger_troubletickets` DROP INDEX `status`",
+"ALTER TABLE `vtiger_accountgrouprelation` TYPE=InnoDB, COMMENT='', ROW_FORMAT=COMPACT",
+"ALTER TABLE `vtiger_activity_reminder` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED",
+"ALTER TABLE `vtiger_activsubtype` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC",
+"ALTER TABLE `vtiger_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",
+"ALTER TABLE `vtiger_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",
+"ALTER TABLE `vtiger_customview_seq` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED",
+"ALTER TABLE `vtiger_def_org_field` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED",
+"ALTER TABLE `vtiger_def_org_share` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED",
+"ALTER TABLE `vtiger_def_org_share_seq` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED",
+"ALTER TABLE `vtiger_defaultcv` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC",
+"ALTER TABLE `vtiger_durationhrs` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC",
+"ALTER TABLE `vtiger_durationmins` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC",
+"ALTER TABLE `vtiger_emailtemplates` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC",
+"ALTER TABLE `vtiger_emailtemplates_seq` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED",
+"ALTER TABLE `vtiger_faqcategories` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC",
+"ALTER TABLE `vtiger_faqstatus` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC",
+"ALTER TABLE `vtiger_field_seq` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED",
+"ALTER TABLE `vtiger_files` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC",
+"ALTER TABLE `vtiger_freetagged_objects` TYPE=InnoDB, COMMENT='', ROW_FORMAT=COMPACT",
+"ALTER TABLE `vtiger_group2grouprel` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED",
+"ALTER TABLE `vtiger_group2role` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC",
+"ALTER TABLE `vtiger_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",
+"ALTER TABLE `vtiger_headers` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC",
+"ALTER TABLE `vtiger_import_maps` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC",
+"ALTER TABLE `vtiger_inventorynotification_seq` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED",
+"ALTER TABLE `vtiger_invoicegrouprelation` TYPE=InnoDB, COMMENT='', ROW_FORMAT=COMPACT",
+"ALTER TABLE `vtiger_loginhistory` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC",
+"ALTER TABLE `vtiger_mail_accounts` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC",
+"ALTER TABLE `vtiger_notificationscheduler_seq` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED",
+"ALTER TABLE `vtiger_ownernotify` TYPE=InnoDB, COMMENT='', ROW_FORMAT=COMPACT",
+"ALTER TABLE `vtiger_parenttabrel` TYPE=InnoDB, COMMENT='', ROW_FORMAT=COMPACT",
+"ALTER TABLE `vtiger_pogrouprelation` TYPE=InnoDB, COMMENT='', ROW_FORMAT=COMPACT",
+"ALTER TABLE `vtiger_portal` TYPE=InnoDB, COMMENT='', ROW_FORMAT=COMPACT",
+"ALTER TABLE `vtiger_portalinfo` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC",
+"ALTER TABLE `vtiger_potentialgrouprelation` TYPE=InnoDB, COMMENT='', ROW_FORMAT=COMPACT",
+"ALTER TABLE `vtiger_profile2field` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED",
+"ALTER TABLE `vtiger_profile2globalpermissions` TYPE=InnoDB, COMMENT='', ROW_FORMAT=COMPACT",
+"ALTER TABLE `vtiger_profile2standardpermissions` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED",
+"ALTER TABLE `vtiger_profile2tab` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED",
+"ALTER TABLE `vtiger_profile2utility` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED",
+"ALTER TABLE `vtiger_profile_seq` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED",
+"ALTER TABLE `vtiger_quotegrouprelation` TYPE=InnoDB, COMMENT='', ROW_FORMAT=COMPACT",
+"ALTER TABLE `vtiger_rating` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC",
+"ALTER TABLE `vtiger_relatedlists` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC",
+"ALTER TABLE `vtiger_relatedlists_seq` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED",
+"ALTER TABLE `vtiger_role2profile` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC",
+"ALTER TABLE `vtiger_role_seq` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED",
+"ALTER TABLE `vtiger_rss` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC",
+"ALTER TABLE `vtiger_sales_stage` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC",
+"ALTER TABLE `vtiger_salutationtype` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC",
+"ALTER TABLE `vtiger_selectquery_seq` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED",
+"ALTER TABLE `vtiger_sogrouprelation` TYPE=InnoDB, COMMENT='', ROW_FORMAT=COMPACT",
+"ALTER TABLE `vtiger_systems` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC",
+"ALTER TABLE `vtiger_taskpriority` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC",
+"ALTER TABLE `vtiger_taskstatus` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC",
+"ALTER TABLE `vtiger_ticketcategories` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC",
+"ALTER TABLE `vtiger_ticketpriorities` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC",
+"ALTER TABLE `vtiger_ticketseverities` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC",
+"ALTER TABLE `vtiger_ticketstatus` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC",
+"ALTER TABLE `vtiger_ticketstracktime` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED",
+"ALTER TABLE `vtiger_tracker` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC",
+"ALTER TABLE `vtiger_users2group` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED",
+"ALTER TABLE `vtiger_users_last_import` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC",
+"ALTER TABLE `vtiger_users_seq` TYPE=MyISAM, COMMENT='', ROW_FORMAT=FIXED",
+//"ALTER TABLE `vtiger_wordtemplates` TYPE=MyISAM, COMMENT='', ROW_FORMAT=DYNAMIC",
 
 "CREATE TABLE vtiger_actualcost (
   `actualcostid` int(19) NOT NULL auto_increment,
@@ -2016,16 +2027,12 @@
   UNIQUE KEY `Campaigntype_UK01` (`campaigntype`)
 ) ENGINE=InnoDB",
 
-"CREATE TABLE vtiger_currency_info_seq (
-  `id` int(11) NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1",
-
 "CREATE TABLE vtiger_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`),
+  KEY `idx_datashare_module_rel_tabid` (`tabid`)
 ) ENGINE=InnoDB",
 
 //Added on 06-06-06
@@ -2327,338 +2334,361 @@
   KEY `tmp_write_user_sharing_per_userid_shareduserid_idx` (`userid`,`shareduserid`)
 ) 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 `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 `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) DEFAULT NULL",
-"ALTER TABLE `mail_accounts` ADD COLUMN `sslmeth` VARCHAR(50) DEFAULT NULL",
-"ALTER TABLE `mail_accounts` ADD COLUMN `showbody` VARCHAR(10) 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 'home_metrics'",
-"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 `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` 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(10,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`)",
-"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 vtiger_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 `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"
+"ALTER TABLE `vtiger_account` MODIFY COLUMN `website` VARCHAR(100) COLLATE latin1_swedish_ci DEFAULT NULL",
+"ALTER TABLE `vtiger_account` MODIFY COLUMN `emailoptout` VARCHAR(3) COLLATE latin1_swedish_ci DEFAULT '0'",
+//"ALTER TABLE `vtiger_accountgrouprelation` MODIFY COLUMN `accountid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_actionmapping` MODIFY COLUMN `actionid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_activity` MODIFY COLUMN `date_start` DATE NOT NULL UNIQUE",
+"ALTER TABLE `vtiger_activity` MODIFY COLUMN `sendnotification` VARCHAR(3) COLLATE latin1_swedish_ci NOT NULL DEFAULT '0'",
+"ALTER TABLE `vtiger_activity` MODIFY COLUMN `duration_hours` VARCHAR(2) COLLATE latin1_swedish_ci DEFAULT NULL",
+"ALTER TABLE `vtiger_activity` MODIFY COLUMN `duration_minutes` VARCHAR(2) COLLATE latin1_swedish_ci DEFAULT NULL",
+"ALTER TABLE `vtiger_activity` MODIFY COLUMN `notime` VARCHAR(3) COLLATE latin1_swedish_ci NOT NULL DEFAULT '0'",
+//"ALTER TABLE `vtiger_activity_reminder` MODIFY COLUMN `activity_id` INTEGER(11) NOT NULL PRIMARY KEY",
+"ALTER TABLE `vtiger_activity_reminder` MODIFY COLUMN `reminder_time` INTEGER(11) NOT NULL",
+"ALTER TABLE `vtiger_activity_reminder` MODIFY COLUMN `reminder_sent` INTEGER(2) NOT NULL",
+//"ALTER TABLE `vtiger_activity_reminder` MODIFY COLUMN `recurringid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_activitygrouprelation` MODIFY COLUMN `activityid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_announcement` MODIFY COLUMN `creatorid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_attachments` MODIFY COLUMN `attachmentsid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_blocks` MODIFY COLUMN `blockid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_blocks` MODIFY COLUMN `tabid` INTEGER(19) NOT NULL UNIQUE",
+"ALTER TABLE `vtiger_blocks` MODIFY COLUMN `sequence` INTEGER(10) DEFAULT NULL",
+"ALTER TABLE `vtiger_blocks` MODIFY COLUMN `show_title` INTEGER(2) DEFAULT NULL",
+//"ALTER TABLE `vtiger_chat_msg` MODIFY COLUMN `id` INTEGER(20) NOT NULL AUTO_INCREMENT PRIMARY KEY",
+"ALTER TABLE `vtiger_chat_msg` MODIFY COLUMN `chat_from` INTEGER(20) NOT NULL DEFAULT '0' UNIQUE",
+"ALTER TABLE `vtiger_chat_msg` MODIFY COLUMN `chat_to` INTEGER(20) NOT NULL DEFAULT '0' UNIQUE",
+"ALTER TABLE `vtiger_chat_msg` MODIFY COLUMN `born` DATETIME DEFAULT '0000-00-00 00:00:00' UNIQUE",
+//"ALTER TABLE `vtiger_chat_pchat` MODIFY COLUMN `id` INTEGER(20) NOT NULL AUTO_INCREMENT PRIMARY KEY",
+"ALTER TABLE `vtiger_chat_pchat` MODIFY COLUMN `msg` INTEGER(20) DEFAULT '0'",
+//"ALTER TABLE `vtiger_chat_pvchat` MODIFY COLUMN `id` INTEGER(20) NOT NULL AUTO_INCREMENT PRIMARY KEY",
+"ALTER TABLE `vtiger_chat_pvchat` MODIFY COLUMN `msg` INTEGER(20) DEFAULT '0'",
+//"ALTER TABLE `vtiger_chat_users` MODIFY COLUMN `id` INTEGER(20) NOT NULL AUTO_INCREMENT PRIMARY KEY",
+"ALTER TABLE `vtiger_chat_users` MODIFY COLUMN `nick` VARCHAR(50) COLLATE latin1_swedish_ci NOT NULL UNIQUE",
+"ALTER TABLE `vtiger_chat_users` MODIFY COLUMN `session` VARCHAR(50) COLLATE latin1_swedish_ci NOT NULL UNIQUE",
+"ALTER TABLE `vtiger_chat_users` MODIFY COLUMN `ping` DATETIME DEFAULT '0000-00-00 00:00:00' UNIQUE",
+//"ALTER TABLE `vtiger_competitor` MODIFY COLUMN `competitorid` INTEGER(19) NOT NULL PRIMARY KEY",
+"ALTER TABLE `vtiger_contactdetails` MODIFY COLUMN `donotcall` VARCHAR(3) COLLATE latin1_swedish_ci DEFAULT NULL",
+"ALTER TABLE `vtiger_contactdetails` MODIFY COLUMN `emailoptout` VARCHAR(3) COLLATE latin1_swedish_ci DEFAULT '0'",
+"ALTER TABLE `vtiger_contactdetails` MODIFY COLUMN `imagename` VARCHAR(150) COLLATE latin1_swedish_ci DEFAULT NULL",
+"ALTER TABLE `vtiger_contactdetails` MODIFY COLUMN `reference` VARCHAR(3) COLLATE latin1_swedish_ci DEFAULT NULL",
+//"ALTER TABLE `vtiger_contactgrouprelation` MODIFY COLUMN `contactid` INTEGER(19) NOT NULL PRIMARY KEY",
+"ALTER TABLE `vtiger_convertleadmapping` MODIFY COLUMN `leadfid` INTEGER(19) NOT NULL",
+//"ALTER TABLE `vtiger_crmentity` MODIFY COLUMN `crmid` INTEGER(19) NOT NULL PRIMARY KEY",
+"ALTER TABLE `vtiger_crmentity` MODIFY COLUMN `description` TEXT COLLATE latin1_swedish_ci",
+"ALTER TABLE `vtiger_crmentity` MODIFY COLUMN `createdtime` DATETIME NOT NULL",
+"ALTER TABLE `vtiger_crmentity` MODIFY COLUMN `modifiedtime` DATETIME NOT NULL",
+"ALTER TABLE `vtiger_customaction` MODIFY COLUMN `cvid` INTEGER(19) NOT NULL UNIQUE",
+"ALTER TABLE `vtiger_customaction` MODIFY COLUMN `content` TEXT COLLATE latin1_swedish_ci",
+//"ALTER TABLE `vtiger_customerdetails` MODIFY COLUMN `customerid` INTEGER(19) NOT NULL PRIMARY KEY",
+"ALTER TABLE `vtiger_customerdetails` MODIFY COLUMN `portal` VARCHAR(3) COLLATE latin1_swedish_ci DEFAULT NULL",
+//"ALTER TABLE `vtiger_customview` MODIFY COLUMN `cvid` INTEGER(19) NOT NULL PRIMARY KEY",
+"ALTER TABLE `vtiger_customview_seq` MODIFY COLUMN `id` INTEGER(11) NOT NULL",
+//"ALTER TABLE `vtiger_cvadvfilter` MODIFY COLUMN `cvid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_cvadvfilter` MODIFY COLUMN `columnindex` INTEGER(11) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_cvcolumnlist` MODIFY COLUMN `cvid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_cvcolumnlist` MODIFY COLUMN `columnindex` INTEGER(11) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_cvstdfilter` MODIFY COLUMN `cvid` INTEGER(19) NOT NULL PRIMARY KEY",
+"ALTER TABLE `vtiger_dealintimation` MODIFY COLUMN `dealprobability` DECIMAL(3,2) NOT NULL DEFAULT '0.00'",
+//"ALTER TABLE `vtiger_def_org_field` MODIFY COLUMN `fieldid` INTEGER(19) NOT NULL PRIMARY KEY",
+"ALTER TABLE `vtiger_def_org_share` MODIFY COLUMN `tabid` INTEGER(11) NOT NULL",
+//"ALTER TABLE `vtiger_def_org_share` MODIFY COLUMN `permission` INTEGER(19) DEFAULT NULL UNIQUE",
+"ALTER TABLE `vtiger_def_org_share_seq` MODIFY COLUMN `id` INTEGER(11) NOT NULL",
+//"ALTER TABLE `vtiger_defaultcv` MODIFY COLUMN `tabid` INTEGER(19) NOT NULL PRIMARY KEY",
+"ALTER TABLE `vtiger_defaultcv` MODIFY COLUMN `query` TEXT COLLATE latin1_swedish_ci",
+"ALTER TABLE `vtiger_emailtemplates` MODIFY COLUMN `description` TEXT COLLATE latin1_swedish_ci",
+"ALTER TABLE `vtiger_emailtemplates` MODIFY COLUMN `body` TEXT COLLATE latin1_swedish_ci",
+"ALTER TABLE `vtiger_emailtemplates_seq` MODIFY COLUMN `id` INTEGER(11) NOT NULL",
+"ALTER TABLE `vtiger_faq` MODIFY COLUMN `question` TEXT COLLATE latin1_swedish_ci",
+"ALTER TABLE `vtiger_faq` MODIFY COLUMN `answer` TEXT COLLATE latin1_swedish_ci",
+"ALTER TABLE `vtiger_faqcomments` MODIFY COLUMN `comments` TEXT COLLATE latin1_swedish_ci",
+"ALTER TABLE `vtiger_faqcomments` MODIFY COLUMN `createdtime` DATETIME NOT NULL",
+//"ALTER TABLE `vtiger_field` MODIFY COLUMN `tabid` INTEGER(19) NOT NULL UNIQUE",
+"ALTER TABLE `vtiger_field` MODIFY COLUMN `readonly` INTEGER(1) NOT NULL",
+"ALTER TABLE `vtiger_field` MODIFY COLUMN `selected` INTEGER(1) NOT NULL",
+//"ALTER TABLE `vtiger_field` MODIFY COLUMN `block` INTEGER(19) DEFAULT NULL UNIQUE",
+//"ALTER TABLE `vtiger_field` MODIFY COLUMN `displaytype` INTEGER(19) DEFAULT NULL UNIQUE",
+"ALTER TABLE `vtiger_field` MODIFY COLUMN `quickcreate` INTEGER(10) NOT NULL DEFAULT '1'",
+"ALTER TABLE `vtiger_field_seq` MODIFY COLUMN `id` INTEGER(11) NOT NULL",
+//"ALTER TABLE `vtiger_freetagged_objects` MODIFY COLUMN `tag_id` INTEGER(20) NOT NULL DEFAULT '0' PRIMARY KEY",
+//"ALTER TABLE `vtiger_freetagged_objects` MODIFY COLUMN `tagger_id` INTEGER(20) NOT NULL DEFAULT '0' PRIMARY KEY",
+//"ALTER TABLE `vtiger_freetagged_objects` MODIFY COLUMN `object_id` INTEGER(20) NOT NULL DEFAULT '0' PRIMARY KEY",
+//"ALTER TABLE `vtiger_freetags` MODIFY COLUMN `id` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_group2grouprel` MODIFY COLUMN `groupid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_group2grouprel` MODIFY COLUMN `containsgroupid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_group2role` MODIFY COLUMN `groupid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_group2rs` MODIFY COLUMN `groupid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_groups` MODIFY COLUMN `groupid` INTEGER(19) NOT NULL PRIMARY KEY",
+"ALTER TABLE `vtiger_groups` MODIFY COLUMN `description` TEXT COLLATE latin1_swedish_ci",
+"ALTER TABLE `vtiger_import_maps` MODIFY COLUMN `is_published` VARCHAR(3) COLLATE latin1_swedish_ci NOT NULL DEFAULT 'no'",
+//"ALTER TABLE `vtiger_inventory_tandc` MODIFY COLUMN `id` INTEGER(19) NOT NULL PRIMARY KEY",
+"ALTER TABLE `vtiger_inventory_tandc` MODIFY COLUMN `tandc` TEXT COLLATE latin1_swedish_ci",
+"ALTER TABLE `vtiger_inventory_tandc_seq` MODIFY COLUMN `id` INTEGER(11) NOT NULL",
+"ALTER TABLE `vtiger_inventorynotification` MODIFY COLUMN `notificationbody` TEXT COLLATE latin1_swedish_ci",
+"ALTER TABLE `vtiger_inventorynotification_seq` MODIFY COLUMN `id` INTEGER(11) NOT NULL",
+//"ALTER TABLE `vtiger_invoice` MODIFY COLUMN `salesorderid` INTEGER(19) DEFAULT NULL UNIQUE",
+"ALTER TABLE `vtiger_invoice` MODIFY COLUMN `terms_conditions` TEXT COLLATE latin1_swedish_ci",
+//"ALTER TABLE `vtiger_invoicegrouprelation` MODIFY COLUMN `invoiceid` INTEGER(19) NOT NULL PRIMARY KEY",
+"ALTER TABLE `vtiger_invoiceproductrel` MODIFY COLUMN `invoiceid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_invoiceproductrel` MODIFY COLUMN `productid` INTEGER(19) NOT NULL PRIMARY KEY",
+"ALTER TABLE `vtiger_lar` MODIFY COLUMN `createdon` DATE NOT NULL",
+//"ALTER TABLE `vtiger_leaddetails` MODIFY COLUMN `leadid` INTEGER(19) NOT NULL PRIMARY KEY",
+"ALTER TABLE `vtiger_leaddetails` MODIFY COLUMN `comments` TEXT COLLATE latin1_swedish_ci",
+//"ALTER TABLE `vtiger_leadgrouprelation` MODIFY COLUMN `leadid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_mail_accounts` MODIFY COLUMN `account_id` INTEGER(11) NOT NULL PRIMARY KEY",
+"ALTER TABLE `vtiger_mail_accounts` MODIFY COLUMN `user_id` INTEGER(11) NOT NULL",
+"ALTER TABLE `vtiger_mail_accounts` ADD COLUMN `box_refresh` INTEGER(10) DEFAULT NULL",
+"ALTER TABLE `vtiger_mail_accounts` ADD COLUMN `mails_per_page` INTEGER(10) DEFAULT NULL",
+"ALTER TABLE `vtiger_mail_accounts` ADD COLUMN `ssltype` VARCHAR(50) DEFAULT NULL",
+"ALTER TABLE `vtiger_mail_accounts` ADD COLUMN `sslmeth` VARCHAR(50) DEFAULT NULL",
+"ALTER TABLE `vtiger_mail_accounts` ADD COLUMN `showbody` VARCHAR(10) DEFAULT NULL",
+"ALTER TABLE `vtiger_notes` MODIFY COLUMN `contact_id` INTEGER(19) DEFAULT '0'",
+"ALTER TABLE `vtiger_notes` MODIFY COLUMN `notecontent` TEXT COLLATE latin1_swedish_ci",
+"ALTER TABLE `vtiger_notificationscheduler` MODIFY COLUMN `notificationbody` TEXT COLLATE latin1_swedish_ci",
+"ALTER TABLE `vtiger_notificationscheduler_seq` MODIFY COLUMN `id` INTEGER(11) NOT NULL",
+"ALTER TABLE `vtiger_opportunitystage` MODIFY COLUMN `probability` DECIMAL(3,2) DEFAULT '0.00'",
+"ALTER TABLE `vtiger_org_share_action2tab` MODIFY COLUMN `share_action_id` INTEGER(19) NOT NULL PRIMARY KEY",
+"ALTER TABLE `vtiger_org_share_action2tab` MODIFY COLUMN `tabid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_org_share_action_mapping` MODIFY COLUMN `share_action_id` INTEGER(19) NOT NULL PRIMARY KEY",
+"ALTER TABLE `vtiger_organizationdetails` MODIFY COLUMN `website` VARCHAR(100) COLLATE latin1_swedish_ci DEFAULT NULL",
+"ALTER TABLE `vtiger_organizationdetails` MODIFY COLUMN `logo` TEXT COLLATE latin1_swedish_ci",
+"ALTER TABLE `vtiger_ownernotify` MODIFY COLUMN `crmid` INTEGER(19) DEFAULT NULL UNIQUE",
+//"ALTER TABLE `vtiger_parenttab` MODIFY COLUMN `parenttabid` INTEGER(19) NOT NULL PRIMARY KEY",
+"ALTER TABLE `vtiger_parenttab` MODIFY COLUMN `sequence` INTEGER(10) NOT NULL",
+"ALTER TABLE `vtiger_parenttabrel` MODIFY COLUMN `parenttabid` INTEGER(3) NOT NULL",
+//"ALTER TABLE `vtiger_parenttabrel` MODIFY COLUMN `tabid` INTEGER(3) NOT NULL UNIQUE",
+"ALTER TABLE `vtiger_parenttabrel` MODIFY COLUMN `sequence` INTEGER(3) NOT NULL",
+//"ALTER TABLE `vtiger_pogrouprelation` MODIFY COLUMN `purchaseorderid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_poproductrel` MODIFY COLUMN `purchaseorderid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_poproductrel` MODIFY COLUMN `productid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_portal` MODIFY COLUMN `portalid` INTEGER(19) NOT NULL PRIMARY KEY",
+"ALTER TABLE `vtiger_portal` MODIFY COLUMN `portalname` VARCHAR(200) COLLATE latin1_swedish_ci NOT NULL UNIQUE",
+"ALTER TABLE `vtiger_portal` MODIFY COLUMN `sequence` INTEGER(3) NOT NULL",
+//"ALTER TABLE `vtiger_portalinfo` MODIFY COLUMN `id` INTEGER(11) NOT NULL PRIMARY KEY",
+"ALTER TABLE `vtiger_portalinfo` MODIFY COLUMN `last_login_time` DATETIME NOT NULL",
+"ALTER TABLE `vtiger_portalinfo` MODIFY COLUMN `login_time` DATETIME NOT NULL",
+"ALTER TABLE `vtiger_portalinfo` MODIFY COLUMN `logout_time` DATETIME NOT NULL",
+//"ALTER TABLE `vtiger_potcompetitorrel` MODIFY COLUMN `potentialid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_potcompetitorrel` MODIFY COLUMN `competitorid` INTEGER(19) NOT NULL PRIMARY KEY",
+"ALTER TABLE `vtiger_potential` MODIFY COLUMN `amount` DECIMAL(10,2) DEFAULT '0.00'",
+"ALTER TABLE `vtiger_potential` MODIFY COLUMN `description` TEXT COLLATE latin1_swedish_ci",
+//"ALTER TABLE `vtiger_potentialgrouprelation` MODIFY COLUMN `potentialid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_potstagehistory` MODIFY COLUMN `potentialid` INTEGER(19) NOT NULL UNIQUE",
+"ALTER TABLE `vtiger_potstagehistory` MODIFY COLUMN `probability` DECIMAL(3,2) DEFAULT NULL",
+"ALTER TABLE `vtiger_potstagehistory` MODIFY COLUMN `lastmodified` DATETIME NOT NULL",
+"ALTER TABLE `vtiger_pricebook` MODIFY COLUMN `description` TEXT COLLATE latin1_swedish_ci",
+//"ALTER TABLE `vtiger_pricebookproductrel` MODIFY COLUMN `pricebookid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_pricebookproductrel` MODIFY COLUMN `productid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_productcollaterals` MODIFY COLUMN `productid` INTEGER(11) NOT NULL PRIMARY KEY",
+"ALTER TABLE `vtiger_productcollaterals` MODIFY COLUMN `description` TEXT COLLATE latin1_swedish_ci",
+//"ALTER TABLE `vtiger_products` MODIFY COLUMN `productid` INTEGER(11) NOT NULL PRIMARY KEY",
+"ALTER TABLE `vtiger_products` MODIFY COLUMN `product_description` TEXT COLLATE latin1_swedish_ci",
+"ALTER TABLE `vtiger_products` MODIFY COLUMN `commissionrate` DECIMAL(3,3) DEFAULT NULL",
+//"ALTER TABLE `vtiger_profile2field` MODIFY COLUMN `profileid` INTEGER(11) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_profile2field` MODIFY COLUMN `fieldid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_profile2globalpermissions` MODIFY COLUMN `profileid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_profile2globalpermissions` MODIFY COLUMN `globalactionid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_profile2standardpermissions` MODIFY COLUMN `profileid` INTEGER(11) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_profile2standardpermissions` MODIFY COLUMN `tabid` INTEGER(10) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_profile2standardpermissions` MODIFY COLUMN `Operation` INTEGER(10) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_profile2utility` MODIFY COLUMN `profileid` INTEGER(11) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_profile2utility` MODIFY COLUMN `tabid` INTEGER(11) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_profile2utility` MODIFY COLUMN `activityid` INTEGER(11) NOT NULL PRIMARY KEY",
+"ALTER TABLE `vtiger_profile_seq` MODIFY COLUMN `id` INTEGER(11) NOT NULL",
+//"ALTER TABLE `vtiger_purchaseorder` MODIFY COLUMN `quoteid` INTEGER(19) DEFAULT NULL UNIQUE",
+//"ALTER TABLE `vtiger_purchaseorder` MODIFY COLUMN `vendorid` INTEGER(19) DEFAULT NULL UNIQUE",
+//"ALTER TABLE `vtiger_purchaseorder` MODIFY COLUMN `contactid` INTEGER(19) DEFAULT NULL UNIQUE",
+"ALTER TABLE `vtiger_purchaseorder` MODIFY COLUMN `terms_conditions` TEXT COLLATE latin1_swedish_ci",
+//"ALTER TABLE `vtiger_quotegrouprelation` MODIFY COLUMN `quoteid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_quotes` MODIFY COLUMN `potentialid` INTEGER(19) DEFAULT NULL UNIQUE",
+"ALTER TABLE `vtiger_quotes` MODIFY COLUMN `quotestage` VARCHAR(200) COLLATE latin1_swedish_ci DEFAULT NULL",
+//"ALTER TABLE `vtiger_quotes` MODIFY COLUMN `contactid` INTEGER(19) DEFAULT NULL UNIQUE",
+"ALTER TABLE `vtiger_quotes` MODIFY COLUMN `terms_conditions` TEXT COLLATE latin1_swedish_ci",
+//"ALTER TABLE `vtiger_quotesproductrel` MODIFY COLUMN `quoteid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_quotesproductrel` MODIFY COLUMN `productid` INTEGER(19) NOT NULL PRIMARY KEY",
+"ALTER TABLE `vtiger_recurringevents` MODIFY COLUMN `activityid` INTEGER(19) NOT NULL",
+//"ALTER TABLE `vtiger_relatedlists` MODIFY COLUMN `relation_id` INTEGER(19) NOT NULL PRIMARY KEY",
+"ALTER TABLE `vtiger_relatedlists_seq` MODIFY COLUMN `id` INTEGER(11) NOT NULL",
+//"ALTER TABLE `vtiger_relcriteria` MODIFY COLUMN `queryid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_relcriteria` MODIFY COLUMN `columnindex` INTEGER(11) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_report` MODIFY COLUMN `reportid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_report` MODIFY COLUMN `folderid` INTEGER(19) NOT NULL UNIQUE",
+//"ALTER TABLE `vtiger_reportdatefilter` MODIFY COLUMN `datefilterid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_reportmodules` MODIFY COLUMN `reportmodulesid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_reportsortcol` MODIFY COLUMN `sortcolid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_reportsortcol` MODIFY COLUMN `reportid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_reportsummary` MODIFY COLUMN `reportsummaryid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_reportsummary` MODIFY COLUMN `summarytype` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_role2profile` MODIFY COLUMN `profileid` INTEGER(11) NOT NULL PRIMARY KEY",
+"ALTER TABLE `vtiger_role_seq` MODIFY COLUMN `id` INTEGER(11) NOT NULL",
+//"ALTER TABLE `vtiger_rss` MODIFY COLUMN `rssid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_salesorder` MODIFY COLUMN `contactid` INTEGER(19) DEFAULT NULL UNIQUE",
+"ALTER TABLE `vtiger_salesorder` MODIFY COLUMN `vendorid` INTEGER(19) DEFAULT NULL UNIQUE",
+"ALTER TABLE `vtiger_salesorder` MODIFY COLUMN `terms_conditions` TEXT COLLATE latin1_swedish_ci",
+//"ALTER TABLE `vtiger_seactivityrel` MODIFY COLUMN `crmid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_seactivityrel` MODIFY COLUMN `activityid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_selectcolumn` MODIFY COLUMN `queryid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_selectquery` MODIFY COLUMN `queryid` INTEGER(19) NOT NULL PRIMARY KEY",
+"ALTER TABLE `vtiger_selectquery_seq` MODIFY COLUMN `id` INTEGER(11) NOT NULL",
+//"ALTER TABLE `vtiger_sharedcalendar` MODIFY COLUMN `userid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_sharedcalendar` MODIFY COLUMN `sharedid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_sogrouprelation` MODIFY COLUMN `salesorderid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_soproductrel` MODIFY COLUMN `salesorderid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_soproductrel` MODIFY COLUMN `productid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_systems` MODIFY COLUMN `id` INTEGER(19) NOT NULL PRIMARY KEY",
+"ALTER TABLE `vtiger_systems` MODIFY COLUMN `server` VARCHAR(30) COLLATE latin1_swedish_ci DEFAULT NULL",
+"ALTER TABLE `vtiger_systems` MODIFY COLUMN `server_username` VARCHAR(30) COLLATE latin1_swedish_ci DEFAULT NULL",
+"ALTER TABLE `vtiger_systems` MODIFY COLUMN `server_password` VARCHAR(30) COLLATE latin1_swedish_ci DEFAULT NULL",
+"ALTER TABLE `vtiger_ticketcomments` MODIFY COLUMN `comments` TEXT COLLATE latin1_swedish_ci",
+"ALTER TABLE `vtiger_ticketcomments` MODIFY COLUMN `createdtime` DATETIME NOT NULL",
+//"ALTER TABLE `vtiger_ticketgrouprelation` MODIFY COLUMN `ticketid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_troubletickets` MODIFY COLUMN `ticketid` INTEGER(19) NOT NULL PRIMARY KEY",
+"ALTER TABLE `vtiger_troubletickets` MODIFY COLUMN `description` TEXT COLLATE latin1_swedish_ci",
+"ALTER TABLE `vtiger_troubletickets` MODIFY COLUMN `solution` TEXT COLLATE latin1_swedish_ci",
+"ALTER TABLE `vtiger_troubletickets` MODIFY COLUMN `update_log` TEXT COLLATE latin1_swedish_ci",
+//"ALTER TABLE `vtiger_user2role` MODIFY COLUMN `userid` INTEGER(11) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_user2role` MODIFY COLUMN `roleid` VARCHAR(255) COLLATE latin1_swedish_ci NOT NULL UNIQUE",
+"ALTER TABLE `vtiger_users` MODIFY COLUMN `is_admin` VARCHAR(3) COLLATE latin1_swedish_ci DEFAULT '0'",
+"ALTER TABLE `vtiger_users` MODIFY COLUMN `description` TEXT COLLATE latin1_swedish_ci",
+"ALTER TABLE `vtiger_users` MODIFY COLUMN `user_preferences` TEXT COLLATE latin1_swedish_ci",
+"ALTER TABLE `vtiger_users` MODIFY COLUMN `homeorder` VARCHAR(255) COLLATE latin1_swedish_ci DEFAULT 'ALVT,PLVT,QLTQ,CVLVT,HLT,OLV,GRT,OLTSO,ILTI,MNL'",
+"ALTER TABLE `vtiger_users` ADD COLUMN `currency_id` INTEGER(19) NOT NULL DEFAULT '1'",
+"ALTER TABLE `vtiger_users` ADD COLUMN `defhomeview` VARCHAR(100) COLLATE latin1_swedish_ci DEFAULT 'home_metrics'",
+//"ALTER TABLE `vtiger_users2group` MODIFY COLUMN `groupid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_users2group` MODIFY COLUMN `userid` INTEGER(19) NOT NULL PRIMARY KEY",
+"ALTER TABLE `vtiger_users_seq` MODIFY COLUMN `id` INTEGER(11) NOT NULL",
+"ALTER TABLE `vtiger_vendor` MODIFY COLUMN `street` TEXT COLLATE latin1_swedish_ci",
+"ALTER TABLE `vtiger_vendor` MODIFY COLUMN `description` TEXT COLLATE latin1_swedish_ci",
+//"ALTER TABLE `vtiger_wordtemplates` MODIFY COLUMN `templateid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_wordtemplates` MODIFY COLUMN `description` TEXT COLLATE latin1_swedish_ci",
+"ALTER TABLE `vtiger_accountgrouprelation` ADD KEY `accountgrouprelation_IDX1` (`groupname`)",
+"ALTER TABLE `vtiger_activity` ADD KEY `status1` (`status`, `eventstatus`)",
+"ALTER TABLE `vtiger_attachments` ADD KEY `attachmentsid1` (`attachmentsid`)",
+"ALTER TABLE `vtiger_blocks` ADD KEY `block_tabid` (`tabid`)",
+"ALTER TABLE `vtiger_carrier` ADD UNIQUE KEY `carrier_UK01` (`carrier`)",
+"ALTER TABLE `vtiger_chat_msg` ADD KEY `chat_msg_IDX0` (`chat_from`)",
+"ALTER TABLE `vtiger_chat_msg` ADD KEY `chat_msg_IDX1` (`chat_to`)",
+"ALTER TABLE `vtiger_chat_msg` ADD KEY `chat_msg_IDX2` (`born`)",
+"ALTER TABLE `vtiger_chat_pchat` ADD UNIQUE KEY `chat_pchat_UK0` (`msg`)",
+"ALTER TABLE `vtiger_chat_pvchat` ADD UNIQUE KEY `chat_pvchat_UK0` (`msg`)",
+"ALTER TABLE `vtiger_chat_users` ADD KEY `chat_users_IDX0` (`nick`)",
+"ALTER TABLE `vtiger_chat_users` ADD KEY `chat_users_IDX1` (`session`)",
+"ALTER TABLE `vtiger_chat_users` ADD KEY `chat_users_IDX2` (`ping`)",
+"ALTER TABLE `vtiger_contactgrouprelation` ADD KEY `contactgrouprelation_IDX1` (`groupname`)",
+"ALTER TABLE `vtiger_def_org_field` ADD KEY `tabid4` (`tabid`)",
+"ALTER TABLE `vtiger_def_org_share` ADD KEY `fk_def_org_share23` (`permission`)",
+"ALTER TABLE `vtiger_field` ADD KEY `tabid2` (`tabid`)",
+"ALTER TABLE `vtiger_field` ADD KEY `blockid` (`block`)",
+"ALTER TABLE `vtiger_field` ADD KEY `displaytypeid` (`displaytype`)",
+"ALTER TABLE `vtiger_freetagged_objects` DROP INDEX tag_id_index",
+"ALTER TABLE `vtiger_freetagged_objects` ADD INDEX `tag_id_index` (`tag_id`, `tagger_id`, `object_id`)",
+"ALTER TABLE `vtiger_group2grouprel` ADD KEY `fk_group2grouprel2` (`containsgroupid`)",
+"ALTER TABLE `vtiger_group2role` ADD KEY `fk_group2role2` (`roleid`)",
+"ALTER TABLE `vtiger_group2rs` ADD KEY `fk_group2rs2` (`roleandsubid`)",
+"ALTER TABLE `vtiger_groups` ADD KEY `idx_groups_123group` (`groupname`)",
+"ALTER TABLE `vtiger_invoice` ADD KEY `SoPo_IDX` (`invoiceid`)",
+"ALTER TABLE `vtiger_invoice` ADD KEY `fk_Invoice2` (`salesorderid`)",
+"ALTER TABLE `vtiger_invoicegrouprelation` ADD KEY `invoicegrouprelation_IDX1` (`groupname`, `invoiceid`)",
+"ALTER TABLE `vtiger_leadgrouprelation` ADD KEY `leadgrouprelation_IDX0` (`leadid`)",
+"ALTER TABLE `vtiger_moduleowners` ADD KEY `moduleowners_UK11` (`tabid`, `user_id`)",
+//"ALTER TABLE `vtiger_org_share_action2tab` ADD KEY `fk_org_share_action2tab12345` (`tabid`)",
+"ALTER TABLE `vtiger_ownernotify` ADD KEY `ownernotify_UK1` (`crmid`, `flag`)",
+"ALTER TABLE `vtiger_parenttab` ADD KEY `parenttab_UK1` (`parenttabid`, `parenttab_label`, `visible`)",
+"ALTER TABLE `vtiger_parenttabrel` ADD KEY `parenttabrelUK01` (`tabid`, `parenttabid`)",
+"ALTER TABLE `vtiger_pogrouprelation` ADD KEY `pogrouprelation_IDX1` (`groupname`, `purchaseorderid`)",
+"ALTER TABLE `vtiger_portal` ADD KEY `portal_UK01` (`portalname`)",
+"ALTER TABLE `vtiger_potential` ADD KEY `potentialid1` (`potentialid`)",
+"ALTER TABLE `vtiger_potentialgrouprelation` ADD KEY `potentialgrouprelation_IDX1` (`groupname`)",
+"ALTER TABLE `vtiger_potstagehistory` DROP INDEX PotStageHistory_IDX1",
+"ALTER TABLE `vtiger_potstagehistory` ADD INDEX `PotStageHistory_IDX1` (`historyid`)",
+"ALTER TABLE `vtiger_potstagehistory` ADD KEY `fk_PotStageHistory` (`potentialid`)",
+"ALTER TABLE `vtiger_profile2field` ADD KEY `tabid3` (`tabid`, `profileid`)",
+//"ALTER TABLE `vtiger_profile2globalpermissions` ADD KEY `idx_profile2globalpermissions` (`profileid`, `globalactionid`)",
+"ALTER TABLE `vtiger_profile2standardpermissions` ADD KEY `idx_prof2stad` (`profileid`, `tabid`, `Operation`)",
+"ALTER TABLE `vtiger_profile2tab` ADD KEY `idx_profile2tab1` (`profileid`, `tabid`)",
+"ALTER TABLE `vtiger_profile2utility` ADD KEY `idx_prof2utility` (`profileid`, `tabid`, `activityid`)",
+"ALTER TABLE `vtiger_purchaseorder` ADD KEY `PO_Vend_IDX` (`vendorid`)",
+"ALTER TABLE `vtiger_purchaseorder` ADD KEY `PO_Quote_IDX` (`quoteid`)",
+"ALTER TABLE `vtiger_purchaseorder` ADD KEY `PO_Contact_IDX` (`contactid`)",
+"ALTER TABLE `vtiger_quotegrouprelation` ADD KEY `quotegrouprelation_IDX1` (`groupname`)",
+//"ALTER TABLE `vtiger_quotes` DROP INDEX vtiger_quotestage",
+"ALTER TABLE `vtiger_quotes` ADD INDEX `quotestage` (`quoteid`)",
+"ALTER TABLE `vtiger_quotes` ADD KEY `potentialid2` (`potentialid`)",
+"ALTER TABLE `vtiger_quotes` ADD KEY `contactid` (`contactid`)",
+"ALTER TABLE `vtiger_recurringtype` ADD UNIQUE KEY `RecurringEvent_UK0` (`recurringtype`)",
+"ALTER TABLE `vtiger_reportsortcol` ADD KEY `FK1_reportsortcol` (`reportid`)",
+"ALTER TABLE `vtiger_role2profile` ADD KEY `idx_role2profileid1` (`roleid`, `profileid`)",
+"ALTER TABLE `vtiger_salesorder` ADD KEY `SoVend_IDX` (`vendorid`)",
+"ALTER TABLE `vtiger_salesorder` ADD KEY `SoContact_IDX` (`contactid`)",
+"ALTER TABLE `vtiger_seattachmentsrel` ADD KEY `attachmentsid2` (`attachmentsid`, `crmid`)",
+"ALTER TABLE `vtiger_selectquery` ADD KEY `selectquery_IDX0` (`queryid`)",
+"ALTER TABLE `vtiger_sogrouprelation` ADD KEY `sogrouprelation_IDX1` (`groupname`)",
+"ALTER TABLE `vtiger_tab` ADD KEY `tabid1` (`tabid`)",
+"ALTER TABLE `vtiger_taxclass` ADD UNIQUE KEY `carrier_UK02` (`taxclass`)",
+"ALTER TABLE `vtiger_troubletickets` ADD KEY `status2` (`status`)",
+"ALTER TABLE `vtiger_users2group` ADD KEY `idx_users2group` (`groupid`, `userid`)",
+"ALTER TABLE `vtiger_users2group` ADD KEY `fk_users2group2` (`userid`)",
+//"ALTER TABLE `vtiger_accountgrouprelation` ADD CONSTRAINT `fk_accountgrouprelation2` FOREIGN KEY (`groupname`) REFERENCES `groups` (`groupname`) ON DELETE CASCADE",
+//"ALTER TABLE `vtiger_accountgrouprelation` ADD CONSTRAINT `fk_accountgrouprelation123` FOREIGN KEY (`accountid`) REFERENCES `account` (`accountid`) ON DELETE CASCADE",
+//"ALTER TABLE `vtiger_contactgrouprelation` ADD CONSTRAINT `fk_contactgrouprelation2` FOREIGN KEY (`groupname`) REFERENCES `groups` (`groupname`) ON DELETE CASCADE",
+//"ALTER TABLE `vtiger_contactgrouprelation` ADD CONSTRAINT `fk_contactgrouprelation123` FOREIGN KEY (`contactid`) REFERENCES `contactdetails` (`contactid`) ON DELETE CASCADE",
+"ALTER TABLE `vtiger_customaction` ADD CONSTRAINT `customaction_FK1` FOREIGN KEY (`cvid`) REFERENCES `customview` (`cvid`) ON DELETE CASCADE",
+"ALTER TABLE `vtiger_invoice` ADD CONSTRAINT `fk_Invoice2` FOREIGN KEY (`salesorderid`) REFERENCES `salesorder` (`salesorderid`) ON DELETE CASCADE",
+//"ALTER TABLE `vtiger_invoicegrouprelation` ADD CONSTRAINT `fk_invoicegrouprelation234` FOREIGN KEY (`invoiceid`) REFERENCES `invoice` (`invoiceid`) ON DELETE CASCADE",
+//"ALTER TABLE `vtiger_invoicegrouprelation` ADD CONSTRAINT `fk_invoicegrouprelation2` FOREIGN KEY (`groupname`) REFERENCES `groups` (`groupname`) ON DELETE CASCADE",
+//"ALTER TABLE `vtiger_org_share_action2tab` ADD CONSTRAINT `fk_org_share_action2tab12345` FOREIGN KEY (`tabid`) REFERENCES `tab` (`tabid`) ON DELETE CASCADE",
+//"ALTER TABLE `vtiger_pogrouprelation` ADD CONSTRAINT `fk_pogrouprelation2` FOREIGN KEY (`groupname`) REFERENCES `groups` (`groupname`) ON DELETE CASCADE",
+//"ALTER TABLE `vtiger_pogrouprelation` ADD CONSTRAINT `fk_pogrouprelation123` FOREIGN KEY (`purchaseorderid`) REFERENCES `purchaseorder` (`purchaseorderid`) ON DELETE CASCADE",
+//"ALTER TABLE `vtiger_potentialgrouprelation` ADD CONSTRAINT `fk_potentialgrouprelation2` FOREIGN KEY (`groupname`) REFERENCES `groups` (`groupname`) ON DELETE CASCADE",
+//"ALTER TABLE `vtiger_potentialgrouprelation` ADD CONSTRAINT `fk_potentialgrouprelation67` FOREIGN KEY (`potentialid`) REFERENCES `potential` (`potentialid`) ON DELETE CASCADE",
+//"ALTER TABLE `vtiger_profile2globalpermissions` ADD CONSTRAINT `fk_profile2globalpermissions57` FOREIGN KEY (`profileid`) REFERENCES `profile` (`profileid`) ON DELETE CASCADE",
+"ALTER TABLE `vtiger_purchaseorder` ADD CONSTRAINT `fk_PO3` FOREIGN KEY (`contactid`) REFERENCES `contactdetails` (`contactid`) ON DELETE CASCADE",
+"ALTER TABLE `vtiger_purchaseorder` ADD CONSTRAINT `fk_PO2` FOREIGN KEY (`vendorid`) REFERENCES `vendor` (`vendorid`) ON DELETE CASCADE",
+"ALTER TABLE `vtiger_purchaseorder` ADD CONSTRAINT `fk_PO2345` FOREIGN KEY (`quoteid`) REFERENCES `quotes` (`quoteid`) ON DELETE CASCADE",
+//"ALTER TABLE `vtiger_quotegrouprelation` ADD CONSTRAINT `fk_quotegrouprelation2` FOREIGN KEY (`groupname`) REFERENCES `groups` (`groupname`) ON DELETE CASCADE",
+//"ALTER TABLE `vtiger_quotegrouprelation` ADD CONSTRAINT `fk_quotegrouprelation132` FOREIGN KEY (`quoteid`) REFERENCES `quotes` (`quoteid`) ON DELETE CASCADE",
+"ALTER TABLE `vtiger_quotes` ADD CONSTRAINT `fk_Quotes3` FOREIGN KEY (`contactid`) REFERENCES `contactdetails` (`contactid`) ON DELETE CASCADE",
+"ALTER TABLE `vtiger_quotes` ADD CONSTRAINT `fk_Quotes2` FOREIGN KEY (`potentialid`) REFERENCES `potential` (`potentialid`) ON DELETE CASCADE",
+"ALTER TABLE `vtiger_salesorder` ADD CONSTRAINT `fk_SO4` FOREIGN KEY (`contactid`) REFERENCES `contactdetails` (`contactid`) ON DELETE CASCADE",
+"ALTER TABLE `vtiger_salesorder` ADD CONSTRAINT `fk_SO2` FOREIGN KEY (`vendorid`) REFERENCES `vendor` (`vendorid`) ON DELETE CASCADE",
+//"ALTER TABLE `vtiger_sogrouprelation` ADD CONSTRAINT `fk_sogrouprelation2` FOREIGN KEY (`groupname`) REFERENCES `groups` (`groupname`) ON DELETE CASCADE",
+//"ALTER TABLE `vtiger_sogrouprelation` ADD CONSTRAINT `fk_sogrouprelation78` FOREIGN KEY (`salesorderid`) REFERENCES `salesorder` (`salesorderid`) ON DELETE CASCADE",
+"ALTER TABLE `vtiger_vendorcontactrel` ADD CONSTRAINT `fk_VendorContactRel45` FOREIGN KEY (`vendorid`) REFERENCES `vendor` (`vendorid`) ON DELETE CASCADE"
 		    );
 foreach($query_array as $query)
 {
 	Execute($query);
 }
 
+//First check whether this table is exist and the proceed
+$currency_columns = $conn->getColumnNames("vtiger_currency_info");
+if(!is_array($currency_columns))
+{
+	$currency_query = "CREATE TABLE `vtiger_currency_info` (
+	  `id` int(11) NOT NULL auto_increment,
+	  `currency_name` varchar(100) default NULL,
+	  `currency_code` varchar(100) default NULL,
+	  `currency_symbol` varchar(30) default NULL,
+	  `conversion_rate` decimal(10,3) default NULL,
+	  `currency_status` varchar(25) default NULL,
+	  `defaultid` varchar(10) NOT NULL default '0',
+	   PRIMARY KEY  (`id`)
+	) ENGINE=InnoDB";
+	Execute($currency_query);
+}
+elseif(!in_array("id",$currency_columns))
+{
+	$currency_query_array = Array(
+		"alter table vtiger_currency_info drop primary key",
+		"alter table vtiger_currency_info add column id int(11) NOT NULL auto_increment primary key FIRST",
+		"alter table vtiger_currency_info add column conversion_rate decimal(10,3) default NULL",
+		"alter table vtiger_currency_info add column currency_status varchar(25) default NULL",
+		"alter table vtiger_currency_info add column defaultid varchar(10) NOT NULL default '0'",
+				     );
+	foreach($currency_query_array as $query)
+	{
+		Execute($query);
+	}
+}
 
 $conn->println("Database Modifications for 5.0(Alpha) Dev 3 ==> 5.0 Alpha (5) ends here.");
 
@@ -2672,14 +2702,14 @@
 	"update vtiger_field set sequence=26 where tabid=4 and fieldname='modifiedtime'",
 	"update vtiger_field set sequence=25 where tabid=4 and fieldname='createdtime'",
 	
-	"insert into vtiger_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')",
+	"insert into vtiger_field values(4,".$conn->getUniqueID("vtiger_field").",'notify_owner','contactdetails',1,56,'notify_owner','Notify Owner',1,0,0,10,24,4,1,'C~O',1,NULL,'ADV')",
 	"alter table vtiger_contactdetails add column notify_owner varchar(3) default 0 after reference",
 
 	"update vtiger_field set sequence=21 where tabid=6 and fieldname='modifiedtime'",
 	"update vtiger_field set sequence=20 where tabid=6 and fieldname='createdtime'",
 	"update vtiger_field set sequence=19 where tabid=6 and fieldname='assigned_user_id'",
 	
-	"insert into vtiger_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')",
+	"insert into vtiger_field values(6,".$conn->getUniqueID("vtiger_field").",'notify_owner','account',1,56,'notify_owner','Notify Owner',1,0,0,10,18,9,1,'C~O',1,NULL,'ADV')",
 	"alter table vtiger_account add column notify_owner varchar(3) default 0 after emailoptout"
 			   );
 foreach($notify_owner_array as $query)
@@ -2688,7 +2718,7 @@
 }
 
 //Added for RSS entries
-$rss_insert_query = "insert into vtiger_field values (24,".$conn->getUniqueID("field").",'rsscategory','rss',1,'15','rsscategory','rsscategory',1,0,0,255,13,null,1,'V~O',1,null,'BAS')";
+$rss_insert_query = "insert into vtiger_field values (24,".$conn->getUniqueID("vtiger_field").",'rsscategory','rss',1,'15','rsscategory','rsscategory',1,0,0,255,13,null,1,'V~O',1,null,'BAS')";
 Execute($rss_insert_query);
 
 //Quick Create Feature added for Vendor & PriceBook
@@ -2707,8 +2737,8 @@
 
 
 //Added on 24-04-06 to populate vtiger_customview All for Campaign and webmails modules
-$cvid1 = $conn->getUniqueID("customview");
-$cvid2 = $conn->getUniqueID("customview");
+$cvid1 = $conn->getUniqueID("vtiger_customview");
+$cvid2 = $conn->getUniqueID("vtiger_customview");
 $customview_query_array = Array(
 	"insert into vtiger_customview(cvid,viewname,setdefault,setmetrics,entitytype) values(".$cvid1.",'All',1,0,'Campaigns')",
 	"insert into vtiger_cvcolumnlist (cvid,columnindex,columnname) values (".$cvid1.",0,'vtiger_campaign:campaignname:campaignname:Campaigns_Campaign_Name:V')",
@@ -2745,9 +2775,9 @@
 				"create table vtiger_inventorytaxinfo (taxid int(3) NOT NULL auto_increment, taxname varchar(50) default NULL, percentage decimal(7,3) default NULL,  PRIMARY KEY  (taxid), KEY vtiger_inventorytaxinfo_taxname_idx (taxname))",
 				"create table vtiger_producttaxrel ( productid int(11) NOT NULL, taxid int(3) NOT NULL, taxpercentage decimal(7,3) default NULL, KEY vtiger_producttaxrel_productid_idx (productid), KEY vtiger_producttaxrel_taxid_idx (taxid))",
 
-				"insert into vtiger_inventorytaxinfo values(".$conn->getUniqueID("inventorytaxinfo").",'VAT','4.5')",
-				"insert into vtiger_inventorytaxinfo values(".$conn->getUniqueID("inventorytaxinfo").",'Sales','10')",
-				"insert into vtiger_inventorytaxinfo values(".$conn->getUniqueID("inventorytaxinfo").",'Service','12.5')",
+				"insert into vtiger_inventorytaxinfo values(".$conn->getUniqueID("vtiger_inventorytaxinfo").",'VAT','4.5')",
+				"insert into vtiger_inventorytaxinfo values(".$conn->getUniqueID("vtiger_inventorytaxinfo").",'Sales','10')",
+				"insert into vtiger_inventorytaxinfo values(".$conn->getUniqueID("vtiger_inventorytaxinfo").",'Service','12.5')",
 				"update vtiger_field set uitype=83, tablename='producttaxrel' where tabid=14 and fieldname='taxclass'",
 				"insert into vtiger_moduleowners values(".$this->localGetTabID('Campaigns').",1)",
 
@@ -2798,8 +2828,10 @@
 	$conn->println("File Path = $filepath");
 	//upto this added to set the file path based on attachment created time
 
+	//In this file name (attachmentid_filename) the file will be stored in the harddisk
+	$moved_filename = $attach_id."_".$attach_name;
 	//write the contents in the file
-	$handle = @fopen($filepath.$attach_name,'w');
+	$handle = @fopen($filepath.$moved_filename,'w');
 	fputs($handle, base64_decode($attach_data));
 	fclose($handle);
 
@@ -2831,11 +2863,11 @@
 	{
 		if($val != '')
 		{
-			$conn->query("insert into ".$tablename. " values(null,'".$val."',".$i.",1)");
+			$conn->query("insert into vtiger_".$tablename. " values(null,'".$val."',".$i.",1)");
 		}
 		else
 		{
-			$conn->query("insert into ".$tablename. " values(null,'--None--',".$i.",1)");
+			$conn->query("insert into vtiger_".$tablename. " values(null,'--None--',".$i.",1)");
 		}
 		$i++;
 	}
@@ -2879,7 +2911,7 @@
 Execute($create_query28);
 
 
-$obj_array = Array('Leads'=>'leaddetails','Contacts'=>'contactdetails');
+$obj_array = Array('Leads'=>'vtiger_leaddetails','Contacts'=>'vtiger_contactdetails');
 $leadfieldid = $conn->query_result($conn->query("select fieldid from vtiger_field where tabid=7 and fieldname='email'"),0,'fieldid');
 $contactfieldid = $conn->query_result($conn->query("select fieldid from vtiger_field where tabid=4 and fieldname='email'"),0,'fieldid');
 $fieldid_array = Array("Leads"=>"$leadfieldid","Contacts"=>"$contactfieldid");
@@ -2985,7 +3017,7 @@
 $sec3="INSERT INTO vtiger_tab VALUES (28,'Webmails',0,25,'Webmails',null,null,1)";
 
 //Insert into vtiger_def_org_share tables
-$sec4="insert into vtiger_def_org_share values (".$conn->getUniqueID('def_org_share').",26,2,0)";	
+$sec4="insert into vtiger_def_org_share values (".$conn->getUniqueID('vtiger_def_org_share').",26,2,0)";	
 
 Execute($sec2);
 Execute($sec3);
@@ -2996,26 +3028,26 @@
 Execute("insert into vtiger_datashare_relatedmodules_seq values(1)");
 	
 //Lead Related Module
-Execute("insert into vtiger_datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",7,10)");
+Execute("insert into vtiger_datashare_relatedmodules values (".$conn->getUniqueID('vtiger_datashare_relatedmodules').",7,10)");
 
 //Account Related Module
-Execute("insert into vtiger_datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",6,2)");
-Execute("insert into vtiger_datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",6,13)");
-Execute("insert into vtiger_datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",6,20)");
-Execute("insert into vtiger_datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",6,22)");
-Execute("insert into vtiger_datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",6,23)");
-Execute("insert into vtiger_datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",6,10)");
+Execute("insert into vtiger_datashare_relatedmodules values (".$conn->getUniqueID('vtiger_datashare_relatedmodules').",6,2)");
+Execute("insert into vtiger_datashare_relatedmodules values (".$conn->getUniqueID('vtiger_datashare_relatedmodules').",6,13)");
+Execute("insert into vtiger_datashare_relatedmodules values (".$conn->getUniqueID('vtiger_datashare_relatedmodules').",6,20)");
+Execute("insert into vtiger_datashare_relatedmodules values (".$conn->getUniqueID('vtiger_datashare_relatedmodules').",6,22)");
+Execute("insert into vtiger_datashare_relatedmodules values (".$conn->getUniqueID('vtiger_datashare_relatedmodules').",6,23)");
+Execute("insert into vtiger_datashare_relatedmodules values (".$conn->getUniqueID('vtiger_datashare_relatedmodules').",6,10)");
 
 
 //Potential Related Module
-Execute("insert into vtiger_datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",2,20)");
-Execute("insert into vtiger_datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",2,22)");
+Execute("insert into vtiger_datashare_relatedmodules values (".$conn->getUniqueID('vtiger_datashare_relatedmodules').",2,20)");
+Execute("insert into vtiger_datashare_relatedmodules values (".$conn->getUniqueID('vtiger_datashare_relatedmodules').",2,22)");
 
 //Quote Related Module
-Execute("insert into vtiger_datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",20,22)");
+Execute("insert into vtiger_datashare_relatedmodules values (".$conn->getUniqueID('vtiger_datashare_relatedmodules').",20,22)");
 
 //SO Related Module
-Execute("insert into vtiger_datashare_relatedmodules values (".$conn->getUniqueID('datashare_relatedmodules').",22,23)");
+Execute("insert into vtiger_datashare_relatedmodules values (".$conn->getUniqueID('vtiger_datashare_relatedmodules').",22,23)");
 	
 
 //By Don Ends
@@ -3036,7 +3068,7 @@
 }
 
 $insert_query_array27 = Array(
-	"insert into vtiger_relatedlists values(".$conn->getUniqueID('relatedlists').",13,0,'get_ticket_history',3,'Ticket History',0)",
+	"insert into vtiger_relatedlists values(".$conn->getUniqueID('vtiger_relatedlists').",13,0,'get_ticket_history',3,'Ticket History',0)",
 	"insert into vtiger_parenttabrel values (2,10,4)",
 	"insert into vtiger_parenttabrel values (4,10,7)"
 			     );
@@ -3056,38 +3088,38 @@
 "insert into vtiger_blocks values (80,29,'LBL_MORE_INFORMATION',2,0,0,0,0,0)",
 "insert into vtiger_blocks values (81,29,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)",
 
-"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'user_name','vtiger_users',1,'106','user_name','User Name',1,0,0,11,1,79,1,'V~M',1,null,'BAS')",
-"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'is_admin','vtiger_users',1,'156','is_admin','Admin',1,0,0,3,2,79,1,'V~O',1,null,'BAS')",
-"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'user_password','vtiger_users',1,'99','user_password','Password',1,0,0,30,3,79,4,'P~M',1,null,'BAS')",
-"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'confirm_password','vtiger_users',1,'99','confirm_password','Confirm Password',1,0,0,30,4,79,4,'P~M',1,null,'BAS')",
-"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'first_name','vtiger_users',1,'1','first_name','First Name',1,0,0,30,5,79,1,'V~O',1,null,'BAS')",
-"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'last_name','vtiger_users',1,'2','last_name','Last Name',1,0,0,30,6,79,1,'V~M',1,null,'BAS')",
-"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'roleid','vtiger_user2role',1,'98','roleid','Role',1,0,0,200,7,79,1,'V~M',1,null,'BAS')",
-"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'email1','vtiger_users',1,'104','email1','Email',1,0,0,100,9,79,1,'E~M',1,null,'BAS')",
-"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'status','vtiger_users',1,'115','status','Status',1,0,0,100,10,79,1,'V~O',1,null,'BAS')",
-"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'activity_view','vtiger_users',1,'15','activity_view','Default Activity View',1,0,0,100,13,79,1,'V~O',1,null,'BAS')",
-"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'lead_view','vtiger_users',1,'15','lead_view','Default Lead View',1,0,0,100,12,79,1,'V~O',1,null,'BAS')",
-"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'currency_id','vtiger_users',1,'116','currency_id','Currency',1,0,0,100,11,79,1,'I~O',1,null,'BAS')",
-"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'title','vtiger_users',1,'1','title','Title',1,0,0,50,1,80,1,'V~O',1,null,'BAS')",
-"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'phone_work','vtiger_users',1,'1','phone_work','Office Phone',1,0,0,50,2,80,1,'V~O',1,null,'BAS')",
-"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'department','vtiger_users',1,'1','department','Department',1,0,0,50,3,80,1,'V~O',1,null,'BAS')",
-"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'phone_mobile','vtiger_users',1,'1','phone_mobile','Mobile',1,0,0,50,4,80,1,'V~O',1,null,'BAS')",
-"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'reports_to_id','vtiger_users',1,'101','reports_to_id','Reports To',1,0,0,50,5,80,1,'V~O',1,null,'BAS')",
-"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'phone_other','vtiger_users',1,'1','phone_other','Other Phone',1,0,0,50,5,80,1,'V~O',1,null,'BAS')",
-"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'email2','vtiger_users',1,'13','email2','Other Email',1,0,0,100,6,80,1,'E~O',1,null,'BAS')",
-"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'phone_fax','vtiger_users',1,'1','phone_fax','Fax',1,0,0,50,7,80,1,'V~O',1,null,'BAS')",
-"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'yahoo_id','vtiger_users',1,'13','yahoo_id','Yahoo id',1,0,0,100,7,80,1,'E~O',1,null,'BAS')",
-"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'phone_home','vtiger_users',1,'1','phone_home','Home Phone',1,0,0,50,8,80,1,'V~O',1,null,'BAS')",
-"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'imagename','vtiger_users',1,'105','imagename','User Image',1,0,0,250,9,80,1,'V~O',1,null,'BAS')",
-"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'date_format','vtiger_users',1,'15','date_format','Date Format',1,0,0,30,10,80,1,'V~O',1,null,'BAS')",
-"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'tagcloud','vtiger_users',1,'103','tagcloud','Tag Cloud',1,0,0,250,13,80,1,'V~O',1,null,'BAS')",
-"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'signature','vtiger_users',1,'21','signature','Signature',1,0,0,250,11,80,1,'V~O',1,null,'BAS')",
-"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'description','vtiger_users',1,'21','description','Notes',1,0,0,250,12,80,1,'V~O',1,null,'BAS')",
-"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'address_street','vtiger_users',1,'21','address_street','Street Address',1,0,0,250,1,81,1,'V~O',1,null,'BAS')",
-"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'address_city','vtiger_users',1,'1','address_city','City',1,0,0,100,2,81,1,'V~O',1,null,'BAS')",
-"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'address_state','vtiger_users',1,'1','address_state','State',1,0,0,100,3,81,1,'V~O',1,null,'BAS')",
-"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'address_postalcode','vtiger_users',1,'1','address_postalcode','Postal Code',1,0,0,100,4,81,1,'V~O',1,null,'BAS')",
-"insert into vtiger_field values (29,".$conn->getUniqueID("field").",'address_country','vtiger_users',1,'1','address_country','Country',1,0,0,100,5,81,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("vtiger_field").",'user_name','vtiger_users',1,'106','user_name','User Name',1,0,0,11,1,79,1,'V~M',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("vtiger_field").",'is_admin','vtiger_users',1,'156','is_admin','Admin',1,0,0,3,2,79,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("vtiger_field").",'user_password','vtiger_users',1,'99','user_password','Password',1,0,0,30,3,79,4,'P~M',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("vtiger_field").",'confirm_password','vtiger_users',1,'99','confirm_password','Confirm Password',1,0,0,30,4,79,4,'P~M',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("vtiger_field").",'first_name','vtiger_users',1,'1','first_name','First Name',1,0,0,30,5,79,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("vtiger_field").",'last_name','vtiger_users',1,'2','last_name','Last Name',1,0,0,30,6,79,1,'V~M',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("vtiger_field").",'roleid','vtiger_user2role',1,'98','roleid','Role',1,0,0,200,7,79,1,'V~M',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("vtiger_field").",'email1','vtiger_users',1,'104','email1','Email',1,0,0,100,9,79,1,'E~M',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("vtiger_field").",'status','vtiger_users',1,'115','status','Status',1,0,0,100,10,79,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("vtiger_field").",'activity_view','vtiger_users',1,'15','activity_view','Default Activity View',1,0,0,100,13,79,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("vtiger_field").",'lead_view','vtiger_users',1,'15','lead_view','Default Lead View',1,0,0,100,12,79,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("vtiger_field").",'currency_id','vtiger_users',1,'116','currency_id','Currency',1,0,0,100,11,79,1,'I~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("vtiger_field").",'title','vtiger_users',1,'1','title','Title',1,0,0,50,1,80,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("vtiger_field").",'phone_work','vtiger_users',1,'1','phone_work','Office Phone',1,0,0,50,2,80,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("vtiger_field").",'department','vtiger_users',1,'1','department','Department',1,0,0,50,3,80,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("vtiger_field").",'phone_mobile','vtiger_users',1,'1','phone_mobile','Mobile',1,0,0,50,4,80,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("vtiger_field").",'reports_to_id','vtiger_users',1,'101','reports_to_id','Reports To',1,0,0,50,5,80,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("vtiger_field").",'phone_other','vtiger_users',1,'1','phone_other','Other Phone',1,0,0,50,5,80,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("vtiger_field").",'email2','vtiger_users',1,'13','email2','Other Email',1,0,0,100,6,80,1,'E~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("vtiger_field").",'phone_fax','vtiger_users',1,'1','phone_fax','Fax',1,0,0,50,7,80,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("vtiger_field").",'yahoo_id','vtiger_users',1,'13','yahoo_id','Yahoo id',1,0,0,100,7,80,1,'E~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("vtiger_field").",'phone_home','vtiger_users',1,'1','phone_home','Home Phone',1,0,0,50,8,80,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("vtiger_field").",'imagename','vtiger_users',1,'105','imagename','User Image',1,0,0,250,9,80,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("vtiger_field").",'date_format','vtiger_users',1,'15','date_format','Date Format',1,0,0,30,10,80,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("vtiger_field").",'tagcloud','vtiger_users',1,'103','tagcloud','Tag Cloud',1,0,0,250,13,80,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("vtiger_field").",'signature','vtiger_users',1,'21','signature','Signature',1,0,0,250,11,80,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("vtiger_field").",'description','vtiger_users',1,'21','description','Notes',1,0,0,250,12,80,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("vtiger_field").",'address_street','vtiger_users',1,'21','address_street','Street Address',1,0,0,250,1,81,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("vtiger_field").",'address_city','vtiger_users',1,'1','address_city','City',1,0,0,100,2,81,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("vtiger_field").",'address_state','vtiger_users',1,'1','address_state','State',1,0,0,100,3,81,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("vtiger_field").",'address_postalcode','vtiger_users',1,'1','address_postalcode','Postal Code',1,0,0,100,4,81,1,'V~O',1,null,'BAS')",
+"insert into vtiger_field values (29,".$conn->getUniqueID("vtiger_field").",'address_country','vtiger_users',1,'1','address_country','Country',1,0,0,100,5,81,1,'V~O',1,null,'BAS')",
 			 );
 foreach($user_query_array as $query)
 {
@@ -3157,6 +3189,20 @@
 //Queries to remove the rss categories
 Execute("drop table vtiger_rsscategory");
 Execute("delete from vtiger_field where tabid=24");
+
+//Added on 23-06-06
+Execute("insert into vtiger_field values (29,".$conn->getUniqueID("vtiger_field").",'hour_format','vtiger_users',1,'116','hour_format','Calendar Hour Format',1,0,0,100,13,79,3,'I~O',1,null,'BAS')");
+Execute("insert into vtiger_field values (29,".$conn->getUniqueID("vtiger_field").",'end_hour','vtiger_users',1,'116','end_hour','Day ends at',1,0,0,100,15,79,3,'I~O',1,null,'BAS')");
+Execute("insert into vtiger_field values (29,".$conn->getUniqueID("vtiger_field").",'start_hour','vtiger_users',1,'116','start_hour','Day starts at',1,0,0,100,14,79,3,'I~O',1,null,'BAS')");
+
+Execute("insert into vtiger_relatedlists values (".$conn->getUniqueID('vtiger_relatedlists').",".getTabid("Campaigns").",".getTabid("Potentials").",'get_opportunities',3,'Potentials',0)");
+Execute("insert into vtiger_relatedlists values(".$conn->getUniqueID('vtiger_relatedlists').",".getTabid("Campaigns").",9,'get_activities',4,'Activities',0)");
+
+Execute("insert into vtiger_field values (2,".$conn->getUniqueID("vtiger_field").",'campaignid','vtiger_potential',1,'58','campaignid','Campaign Source',1,0,0,100,12,1,1,'N~O',1,null,'BAS')");
+
+
+
+
 
 
 




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 23 11:34:40 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 23 Jun 2006 15:34:40 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7483 -
	/vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl
Message-ID: <20060623153440.CA29B7FDA81@vtiger.fosslabs.com>

Author: richie
Date: Fri Jun 23 09:34:37 2006
New Revision: 7483

Log:
picklist values come from language files if exists

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

Modified: vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl Fri Jun 23 09:34:37 2006
@@ -41,7 +41,14 @@
                     							   <select id="txtbox_{$label}" name="{$keyfldname}">
                     								{foreach item=arr from=$keyoptions}
                     									{foreach key=sel_value item=value from=$arr}
-                    										<option value="{$sel_value}" {$value}>{$sel_value}</option>
+												 <option value="{$sel_value}" {$value}>
+                                                {if $APP[$sel_value] neq ''}
+                                                        {$APP[$sel_value]}
+                                                {else}
+                                                        {$sel_value}
+                                                {/if}
+                                                </option>
+	
                     									{/foreach}
                     								{/foreach}
                     							   </select>




From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 14:33:07 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 18:33:07 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231364=3A?=
 =?utf-8?q?_Non_admin_user_can_jump_to_user_settings_by_point_to_url?=
Message-ID: <076.ff7d1fb05c8daa4389a7c4cc4877a33d@vtiger.fosslabs.com>

#1364: Non admin user can jump to user settings by point to url
----------------------------------------------+-----------------------------
 Reporter:  Brian Laughlin <brian at awnow.com>  |       Owner:  developer
     Type:  defect                            |      Status:  new      
 Priority:  critical                          |   Milestone:  5.0.0    
Component:  vtigercrm                         |     Version:  5.0.0    
 Keywords:  security                          |  
----------------------------------------------+-----------------------------
 /index.php?module=Administration&action=index

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1364>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 23 15:06:42 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 23 Jun 2006 19:06:42 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231365=3A?=
	=?utf-8?q?_i18n_issue_at_tickets?=
Message-ID: <076.d396dbfd58922ae6f8f333a2a453043b@vtiger.fosslabs.com>

#1365: i18n issue at tickets
-----------------------+----------------------------------------------------
 Reporter:  anonymous  |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  major      |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 see screenshot attached; when editing at the detailview "or" is not
 translated

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1365>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 24 01:55:47 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 24 Jun 2006 05:55:47 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7484 - in /vtigercrm/trunk:
 Smarty/templates/RelatedListContents.tpl Smarty/templates/RelatedLists.tpl
 modules/Campaigns/CallRelatedList.php modules/Campaigns/LoadList.php
Message-ID: <20060624055547.D985683FABC@vtiger.fosslabs.com>

Author: mmbrich
Date: Fri Jun 23 23:55:34 2006
New Revision: 7484

Log:
ability to load lists from custom view

Added:
    vtigercrm/trunk/modules/Campaigns/LoadList.php
Modified:
    vtigercrm/trunk/Smarty/templates/RelatedListContents.tpl
    vtigercrm/trunk/Smarty/templates/RelatedLists.tpl
    vtigercrm/trunk/modules/Campaigns/CallRelatedList.php

Modified: vtigercrm/trunk/Smarty/templates/RelatedListContents.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/RelatedListContents.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/RelatedListContents.tpl Fri Jun 23 23:55:34 2006
@@ -35,6 +35,7 @@
 				{/if}
 			{elseif $header eq 'Leads'}
 				{if $MODULE eq 'Campaigns'}
+				{$LEADCVCOMBO} <span id="lead_list_button"><input title="Change" accessKey="" class="small" value="Load List" type="button"  name="button"></span>
 				<input title="Change" accessKey="" class="small" value="{$APP.LBL_SELECT_BUTTON_LABEL} {$APP.Lead}" LANGUAGE=javascript onclick='return window.open("index.php?module=Leads&return_module={$MODULE}&action=Popup&popuptype=detailview&select=enable&form=EditView&form_submit=false&recordid={$ID}","test","width=640,height=570,resizable=0,scrollbars=0");' type="button"  name="button">
 				{/if}
 				<input title="{$APP.LBL_ADD_NEW} {$APP.Lead}" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='Leads'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Lead}"></td>
@@ -45,6 +46,7 @@
 				<input title="{$APP.LBL_BULK_MAILS}" accessykey="F" class="small" onclick="this.form.action.value='sendmail';this.form.return_action.value='DetailView';this.form.module.value='Emails';this.form.return_module.value='Emails';" name="button" value="{$APP.LBL_BULK_MAILS}" type="submit">&nbsp;
 				<input title="Change" accessKey="" class="small" value="{$APP.LBL_SELECT_BUTTON_LABEL} {$APP.Contact}" LANGUAGE=javascript onclick='return window.open("index.php?module=Contacts&return_module=Emails&action=Popup&popuptype=detailview&form=EditView&form_submit=false&recordid={$ID}","test","width=640,height=570,resizable=0,scrollbars=0");' type="button"  name="button"></td>
 				{elseif $MODULE eq 'Campaigns'}
+				{$CONTCVCOMBO}  <span id="contact_list_button"><input title="Change" accessKey="" class="small" value="Load List" type="button"  name="button"></span>
 				<input title="Change" accessKey="" class="small" value="{$APP.LBL_SELECT_BUTTON_LABEL} {$APP.Contact}" LANGUAGE=javascript onclick='return window.open("index.php?module=Contacts&return_module={$MODULE}&action=Popup&popuptype=detailview&select=enable&form=EditView&form_submit=false&recordid={$ID}","test","width=640,height=570,resizable=0,scrollbars=0");' type="button"  name="button">
 				<input title="{$APP.LBL_ADD_NEW} {$APP.Contact}" accessyKey="F" class="small" onclick="this.form.action.value='EditView';this.form.module.value='Contacts'" type="submit" name="button" value="{$APP.LBL_ADD_NEW} {$APP.Contact}"></td>
 				{else}

Modified: vtigercrm/trunk/Smarty/templates/RelatedLists.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/RelatedLists.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/RelatedLists.tpl Fri Jun 23 23:55:34 2006
@@ -47,6 +47,14 @@
                                 }
                         }
                 );
+}
+
+function loadCvList(type,id) {
+	if(type === 'Leads')
+		$("lead_list_button").innerHTML = '<input title="Change" accessKey="" class="small" value="Load List" type="button"  name="button" onclick="window.location.href=\'index.php?action=LoadList&module=Campaigns&return_id='+id+'&list_type='+type+'&cvid='+$("lead_cv_list").value+'\'">';
+
+	if(type === 'Contacts')
+		$("contact_list_button").innerHTML = '<input title="Change" accessKey="" class="small" value="Load List" type="button"  name="button" onclick="window.location.href=\'index.php?action=LoadList&module=Campaigns&return_id='+id+'&list_type='+type+'&cvid='+$("cont_cv_list").value+'\'">';
 }
 </script>
 {/literal}

Modified: vtigercrm/trunk/modules/Campaigns/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/Campaigns/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/Campaigns/CallRelatedList.php Fri Jun 23 23:55:34 2006
@@ -12,6 +12,7 @@
 
 require_once('Smarty_setup.php');
 require_once('modules/Campaigns/Campaign.php');
+require_once('modules/CustomView/CustomView.php');
 require_once('include/utils/utils.php');
 
 $focus = new Campaign();
@@ -47,6 +48,15 @@
 if (isset($focus->name)) $smarty->assign("NAME", $focus->name);
 $related_array=getRelatedLists($currentModule,$focus);
 $smarty->assign("RELATEDLISTS", $related_array);
+
+$cvObj = new CustomView("Contacts");
+$cvcombo = $cvObj->getCustomViewCombo();
+$smarty->assign("CONTCVCOMBO","<select id='cont_cv_list' onchange='loadCvList(\"Contacts\",".$_REQUEST["record"].");'><option>-- Select One --</option>".$cvcombo."</select>");
+
+$cvObj = new CustomView("Leads");
+$cvcombo = $cvObj->getCustomViewCombo();
+$smarty->assign("LEADCVCOMBO","<select id='lead_cv_list' onchange='loadCvList(\"Leads\",".$_REQUEST["record"].");'> <option>-- Select One --</option>".$cvcombo."</select>");
+
 $category = getParentTab();
 $smarty->assign("CATEGORY",$category);
 $smarty->assign("UPDATEINFO",updateInfo($focus->id));




From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 24 02:08:55 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 24 Jun 2006 06:08:55 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7485 -
	/vtigercrm/trunk/include/utils/DeleteUtils.php
Message-ID: <20060624060855.B6E4283FACB@vtiger.fosslabs.com>

Author: mmbrich
Date: Sat Jun 24 00:08:54 2006
New Revision: 7485

Log:
fix to remove entities from campaign related lists

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

Modified: vtigercrm/trunk/include/utils/DeleteUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/DeleteUtils.php (original)
+++ vtigercrm/trunk/include/utils/DeleteUtils.php Sat Jun 24 00:08:54 2006
@@ -27,8 +27,13 @@
 
 	switch($module):
 	case Leads:
-		$sql = 'delete from vtiger_seactivityrel where crmid = '.$record.' and activityid = '.$return_id;
-		$adb->query($sql);
+		if($return_module == "Campaigns") {
+			$sql = 'delete from vtiger_campaignleadrel where leadid='.$record.' and campaignid='.$return_id;
+			$adb->query($sql);
+		} else {
+			$sql = 'delete from vtiger_seactivityrel where crmid = '.$record.' and activityid = '.$return_id;
+			$adb->query($sql);
+		}
 	break;
 	case Accounts:
 		if($return_id!='')
@@ -46,6 +51,10 @@
 		if($return_module == 'Potentials' && $record != '' && $return_id != '')
 		{
 			$sql = 'delete from vtiger_contpotentialrel where contactid='.$record.' and potentialid='.$return_id;
+			$adb->query($sql);
+		}
+		if($return_module == "Campaigns") {
+			$sql = 'delete from vtiger_campaigncontrel where contactid='.$record.' and campaignid='.$return_id;
 			$adb->query($sql);
 		}
 		if($record != '' && $return_id != '')




From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 24 03:26:11 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 24 Jun 2006 07:26:11 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7486 -
	/vtigercrm/trunk/modules/Webmails/Save.php
Message-ID: <20060624072611.4D13183FAB9@vtiger.fosslabs.com>

Author: mmbrich
Date: Sat Jun 24 01:26:10 2006
New Revision: 7486

Log:
fix for Qualify action

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

Modified: vtigercrm/trunk/modules/Webmails/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Webmails/Save.php (original)
+++ vtigercrm/trunk/modules/Webmails/Save.php Sat Jun 24 01:26:10 2006
@@ -77,7 +77,8 @@
 
 
 //to save the email details in vtiger_emaildetails vtiger_tables
-$fieldid = $adb->query_result($adb->query('select vtiger_fieldid from vtiger_field where vtiger_tablename="contactdetails" and vtiger_fieldname="email" and columnname="email"'),0,'fieldid');
+$fieldid = $adb->query_result($adb->query('select fieldid from vtiger_field where tablename="contactdetails" and fieldname="email" and columnname="email"'),0,'fieldid');
+
 if($email->relationship != 0) {
 	$focus->column_fields['parent_id']=$email->relationship["id"].'@'.$fieldid.'|';
 




From vtiger-tickets at vtiger.fosslabs.com  Sat Jun 24 10:59:08 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sat, 24 Jun 2006 14:59:08 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231366=3A?=
 =?utf-8?q?_Regression_from_checkin=3A_r7242?=
Message-ID: <076.e82045fa698e99f442e05495b3973c2a@vtiger.fosslabs.com>

#1366: Regression from checkin: r7242
-----------------------+----------------------------------------------------
 Reporter:  briand     |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  major      |   Milestone:  4.2.5    
Component:  vtigercrm  |     Version:  4.2.4rc3 
 Keywords:             |  
-----------------------+----------------------------------------------------
 One of the changes in r7242 caused most of the language files to not load
 for the Home module. I was able to resolve the error by reinserting a line
 into include/utils.php. I reinserted line #272 from r7202 between lines
 #277 & #278 in r7242. I expect this only to impact modules that contain
 sub-sections from other modules.

 The impact of this regression is the loss of titles for all of the
 sections in the Home module. Patch to remediate is attached.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1366>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 24 15:45:11 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 24 Jun 2006 19:45:11 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7487 -
	/vtigercrm/trunk/soap/webforms.php
Message-ID: <20060624194511.025BA83FB47@vtiger.fosslabs.com>

Author: mmbrich
Date: Sat Jun 24 13:45:10 2006
New Revision: 7487

Log:
fix for broken include_path in new soap/ directory


Modified:
    vtigercrm/trunk/soap/webforms.php

Modified: vtigercrm/trunk/soap/webforms.php
==============================================================================
--- vtigercrm/trunk/soap/webforms.php (original)
+++ vtigercrm/trunk/soap/webforms.php Sat Jun 24 13:45:10 2006
@@ -9,6 +9,7 @@
 *
  ********************************************************************************/
 
+ini_set("include_path","../");
 require_once("config.php");
 require_once('include/logging.php');
 require_once('include/nusoap/nusoap.php');
@@ -18,7 +19,7 @@
 $log = &LoggerManager::getLogger('webforms');
 
 //$serializer = new XML_Serializer();
-$NAMESPACE = 'http://www.vtigercrm.com/vtigercrm';
+$NAMESPACE = 'http://www.vtiger.com/vtigercrm/';
 $server = new soap_server;
 
 $server->configureWSDL('vtigersoap');




From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 24 15:45:46 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 24 Jun 2006 19:45:46 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7488 -
	/vtigercrm/trunk/include/nusoap/nusoap.php
Message-ID: <20060624194546.E09D683FB4E@vtiger.fosslabs.com>

Author: mmbrich
Date: Sat Jun 24 13:45:44 2006
New Revision: 7488

Log:
in php5 soapclient is already declared, changed nusoap soapclient class to soapclient2

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

Modified: vtigercrm/trunk/include/nusoap/nusoap.php
==============================================================================
--- vtigercrm/trunk/include/nusoap/nusoap.php (original)
+++ vtigercrm/trunk/include/nusoap/nusoap.php Sat Jun 24 13:45:44 2006
@@ -35,7 +35,7 @@
 /* load classes
 
 // necessary classes
-require_once('class.soapclient.php');
+require_once('class.soapclient2.php');
 require_once('class.soap_val.php');
 require_once('class.soap_parser.php');
 require_once('class.soap_fault.php');
@@ -2824,7 +2824,7 @@
 			($http_status >= 400 && $http_status <= 417) ||
 			($http_status >= 501 && $http_status <= 505)
 		   ) {
-			$this->setError("Unsupported HTTP response status $http_status $http_reason (soapclient->response has contents of the response)");
+			$this->setError("Unsupported HTTP response status $http_status $http_reason (soapclient2->response has contents of the response)");
 			return false;
 		}
 
@@ -6387,24 +6387,24 @@
 
 /**
 *
-* soapclient higher level class for easy usage.
+* soapclient2 higher level class for easy usage.
 *
 * usage:
 *
 * // instantiate client with server info
-* $soapclient = new soapclient( string path [ ,boolean wsdl] );
+* $soapclient2 = new soapclient2( string path [ ,boolean wsdl] );
 *
 * // call method, get results
-* echo $soapclient->call( string methodname [ ,array parameters] );
+* echo $soapclient2->call( string methodname [ ,array parameters] );
 *
 * // bye bye client
-* unset($soapclient);
+* unset($soapclient2);
 *
 * @author   Dietrich Ayala <dietrich at ganx4.com>
 * @version  $Id: nusoap.php,v 1.94 2005/08/04 01:27:42 snichol Exp $
 * @access   public
 */
-class soapclient extends nusoap_base  {
+class soapclient2 extends nusoap_base  {
 
 	var $username = '';
 	var $password = '';
@@ -6471,7 +6471,7 @@
 	* @param	integer $response_timeout set the response timeout
 	* @access   public
 	*/
-	function soapclient($endpoint,$wsdl = false,$proxyhost = false,$proxyport = false,$proxyusername = false, $proxypassword = false, $timeout = 0, $response_timeout = 30){
+	function soapclient2($endpoint,$wsdl = false,$proxyhost = false,$proxyport = false,$proxyusername = false, $proxypassword = false, $timeout = 0, $response_timeout = 30){
 		parent::nusoap_base();
 		$this->endpoint = $endpoint;
 		$this->proxyhost = $proxyhost;
@@ -7051,7 +7051,7 @@
 				unset($paramCommentStr);
 			}
 		}
-		$evalStr = 'class soap_proxy_'.$r.' extends soapclient {
+		$evalStr = 'class soap_proxy_'.$r.' extends soapclient2 {
 	'.$evalStr.'
 }';
 		return $evalStr;




From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 24 15:48:22 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 24 Jun 2006 19:48:22 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7489 - in
 /vtigercrm/trunk/include/nusoap: class.nusoap_base.php class.soapclient.php
 nusoap.php
Message-ID: <20060624194823.39E8383FB52@vtiger.fosslabs.com>

Author: mmbrich
Date: Sat Jun 24 13:48:21 2006
New Revision: 7489

Log:
more soap fixes

Modified:
    vtigercrm/trunk/include/nusoap/class.nusoap_base.php
    vtigercrm/trunk/include/nusoap/class.soapclient.php
    vtigercrm/trunk/include/nusoap/nusoap.php

Modified: vtigercrm/trunk/include/nusoap/class.nusoap_base.php
==============================================================================
--- vtigercrm/trunk/include/nusoap/class.nusoap_base.php (original)
+++ vtigercrm/trunk/include/nusoap/class.nusoap_base.php Sat Jun 24 13:48:21 2006
@@ -902,4 +902,4 @@
 }
 
 
-?>
+?>

Modified: vtigercrm/trunk/include/nusoap/class.soapclient.php
==============================================================================
--- vtigercrm/trunk/include/nusoap/class.soapclient.php (original)
+++ vtigercrm/trunk/include/nusoap/class.soapclient.php Sat Jun 24 13:48:21 2006
@@ -5,24 +5,24 @@
 
 /**
 *
-* soapclient higher level class for easy usage.
+* soapclient2 higher level class for easy usage.
 *
 * usage:
 *
 * // instantiate client with server info
-* $soapclient = new soapclient( string path [ ,boolean wsdl] );
+* $soapclient2 = new soapclient2( string path [ ,boolean wsdl] );
 *
 * // call method, get results
-* echo $soapclient->call( string methodname [ ,array parameters] );
+* echo $soapclient2->call( string methodname [ ,array parameters] );
 *
 * // bye bye client
-* unset($soapclient);
+* unset($soapclient2);
 *
 * @author   Dietrich Ayala <dietrich at ganx4.com>
-* @version  $Id: class.soapclient.php,v 1.52 2005/07/27 19:24:42 snichol Exp $
+* @version  $Id: class.soapclient2.php,v 1.52 2005/07/27 19:24:42 snichol Exp $
 * @access   public
 */
-class soapclient extends nusoap_base  {
+class soapclient2 extends nusoap_base  {
 
 	var $username = '';
 	var $password = '';
@@ -89,7 +89,7 @@
 	* @param	integer $response_timeout set the response timeout
 	* @access   public
 	*/
-	function soapclient($endpoint,$wsdl = false,$proxyhost = false,$proxyport = false,$proxyusername = false, $proxypassword = false, $timeout = 0, $response_timeout = 30){
+	function soapclient2($endpoint,$wsdl = false,$proxyhost = false,$proxyport = false,$proxyusername = false, $proxypassword = false, $timeout = 0, $response_timeout = 30){
 		parent::nusoap_base();
 		$this->endpoint = $endpoint;
 		$this->proxyhost = $proxyhost;
@@ -669,7 +669,7 @@
 				unset($paramCommentStr);
 			}
 		}
-		$evalStr = 'class soap_proxy_'.$r.' extends soapclient {
+		$evalStr = 'class soap_proxy_'.$r.' extends soapclient2 {
 	'.$evalStr.'
 }';
 		return $evalStr;

Modified: vtigercrm/trunk/include/nusoap/nusoap.php
==============================================================================
--- vtigercrm/trunk/include/nusoap/nusoap.php (original)
+++ vtigercrm/trunk/include/nusoap/nusoap.php Sat Jun 24 13:48:21 2006
@@ -35,7 +35,7 @@
 /* load classes
 
 // necessary classes
-require_once('class.soapclient2.php');
+require_once('class.soapclient.php');
 require_once('class.soap_val.php');
 require_once('class.soap_parser.php');
 require_once('class.soap_fault.php');




From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 24 15:50:13 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 24 Jun 2006 19:50:13 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7490 - in
 /vtigercrm/trunk/include/nusoap: class.soap_transport_http.php
 nusoapmime.php
Message-ID: <20060624195014.22A9E83FB52@vtiger.fosslabs.com>

Author: mmbrich
Date: Sat Jun 24 13:50:12 2006
New Revision: 7490

Log:
hopefully the last SOAP fix

Modified:
    vtigercrm/trunk/include/nusoap/class.soap_transport_http.php
    vtigercrm/trunk/include/nusoap/nusoapmime.php

Modified: vtigercrm/trunk/include/nusoap/class.soap_transport_http.php
==============================================================================
--- vtigercrm/trunk/include/nusoap/class.soap_transport_http.php (original)
+++ vtigercrm/trunk/include/nusoap/class.soap_transport_http.php Sat Jun 24 13:50:12 2006
@@ -832,7 +832,7 @@
 			($http_status >= 400 && $http_status <= 417) ||
 			($http_status >= 501 && $http_status <= 505)
 		   ) {
-			$this->setError("Unsupported HTTP response status $http_status $http_reason (soapclient->response has contents of the response)");
+			$this->setError("Unsupported HTTP response status $http_status $http_reason (soapclient2->response has contents of the response)");
 			return false;
 		}
 
@@ -1035,4 +1035,4 @@
 }
 
 
-?>
+?>

Modified: vtigercrm/trunk/include/nusoap/nusoapmime.php
==============================================================================
--- vtigercrm/trunk/include/nusoap/nusoapmime.php (original)
+++ vtigercrm/trunk/include/nusoap/nusoapmime.php Sat Jun 24 13:50:12 2006
@@ -37,7 +37,7 @@
 require_once('Mail/mimePart.php');
 
 /**
-* soapclientmime client supporting MIME attachments defined at
+* soapclient2mime client supporting MIME attachments defined at
 * http://www.w3.org/TR/SOAP-attachments.  It depends on the PEAR Mail_MIME library.
 *
 * @author   Scott Nichol <snichol at sourceforge.net>
@@ -45,7 +45,7 @@
 * @version  $Id: nusoapmime.php,v 1.7 2005/07/27 19:24:42 snichol Exp $
 * @access   public
 */
-class soapclientmime extends soapclient {
+class soapclient2mime extends soapclient2 {
 	/**
 	 * @var array Each array element in the return is an associative array with keys
 	 * data, filename, contenttype, cid




From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 24 16:41:09 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 24 Jun 2006 20:41:09 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7491 - in
 /customerportal/trunk: include.php nusoap/lib/nusoap.php
Message-ID: <20060624204110.185CC3D178D@vtiger.fosslabs.com>

Author: mmbrich
Date: Sat Jun 24 14:41:08 2006
New Revision: 7491

Log:
fixes for soapclient already declared in php5

Modified:
    customerportal/trunk/include.php
    customerportal/trunk/nusoap/lib/nusoap.php

Modified: customerportal/trunk/include.php
==============================================================================
--- customerportal/trunk/include.php (original)
+++ customerportal/trunk/include.php Sat Jun 24 14:41:08 2006
@@ -15,7 +15,7 @@
 global $Server_Path;
 global $client;
 
-$client = new soapclient($Server_Path."/vtigerservice.php?service=customerportal", false, $proxy_host, $proxy_port, $proxy_username, $proxy_password);
+$client = new soapclient2($Server_Path."/vtigerservice.php?service=customerportal", false, $proxy_host, $proxy_port, $proxy_username, $proxy_password);
 
 
 ?>

Modified: customerportal/trunk/nusoap/lib/nusoap.php
==============================================================================
--- customerportal/trunk/nusoap/lib/nusoap.php (original)
+++ customerportal/trunk/nusoap/lib/nusoap.php Sat Jun 24 14:41:08 2006
@@ -4952,24 +4952,24 @@
 
 /**
 *
-* soapclient higher level class for easy usage.
+* soapclient2 higher level class for easy usage.
 *
 * usage:
 *
 * // instantiate client with server info
-* $soapclient = new soapclient( string path [ ,boolean wsdl] );
+* $soapclient2 = new soapclient2( string path [ ,boolean wsdl] );
 *
 * // call method, get results
-* echo $soapclient->call( string methodname [ ,array parameters] );
+* echo $soapclient2->call( string methodname [ ,array parameters] );
 *
 * // bye bye client
-* unset($soapclient);
+* unset($soapclient2);
 *
 * @author   Dietrich Ayala <dietrich at ganx4.com>
 * @version  $Id: nusoap.php,v 1.1 2005/04/29 05:09:16 sarajkumar Exp $
 * @access   public
 */
-class soapclient extends nusoap_base  {
+class soapclient2 extends nusoap_base  {
 
 	var $username = '';
 	var $password = '';
@@ -5021,7 +5021,7 @@
 	* @param	integer $response_timeout set the response timeout
 	* @access   public
 	*/
-	function soapclient($endpoint,$wsdl = false,$proxyhost = false,$proxyport = false,$proxyusername = false, $proxypassword = false, $timeout = 0, $response_timeout = 30){
+	function soapclient2($endpoint,$wsdl = false,$proxyhost = false,$proxyport = false,$proxyusername = false, $proxypassword = false, $timeout = 0, $response_timeout = 30){
 		$this->endpoint = $endpoint;
 		$this->proxyhost = $proxyhost;
 		$this->proxyport = $proxyport;
@@ -5506,7 +5506,7 @@
 			}
 		}
 		$r = rand();
-		$evalStr = 'class soap_proxy_'.$r.' extends soapclient {
+		$evalStr = 'class soap_proxy_'.$r.' extends soapclient2 {
 				'.$evalStr.'
 			}';
 		//print "proxy class:<pre>$evalStr</pre>";




From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 24 17:26:09 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 24 Jun 2006 21:26:09 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7492 - in
 /vtigercrm/trunk/soap: customerportal.php webforms.php
Message-ID: <20060624212609.DD8A383FB57@vtiger.fosslabs.com>

Author: mmbrich
Date: Sat Jun 24 15:26:08 2006
New Revision: 7492

Log:
changed back since I should be using vtigerservice.php to initiate

Modified:
    vtigercrm/trunk/soap/customerportal.php
    vtigercrm/trunk/soap/webforms.php

Modified: vtigercrm/trunk/soap/customerportal.php
==============================================================================
--- vtigercrm/trunk/soap/customerportal.php (original)
+++ vtigercrm/trunk/soap/customerportal.php Sat Jun 24 15:26:08 2006
@@ -9,6 +9,7 @@
 *
  ********************************************************************************/
 
+ini_set("include_path","../");
 require_once("config.php");
 require_once('include/logging.php');
 require_once('include/nusoap/nusoap.php');

Modified: vtigercrm/trunk/soap/webforms.php
==============================================================================
--- vtigercrm/trunk/soap/webforms.php (original)
+++ vtigercrm/trunk/soap/webforms.php Sat Jun 24 15:26:08 2006
@@ -9,7 +9,6 @@
 *
  ********************************************************************************/
 
-ini_set("include_path","../");
 require_once("config.php");
 require_once('include/logging.php');
 require_once('include/nusoap/nusoap.php');




From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 24 17:26:17 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 24 Jun 2006 21:26:17 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7493 -
	/vtigercrm/trunk/soap/customerportal.php
Message-ID: <20060624212617.6931783FB57@vtiger.fosslabs.com>

Author: mmbrich
Date: Sat Jun 24 15:26:16 2006
New Revision: 7493

Log:
changed back since I should be using vtigerservice.php to initiate

Modified:
    vtigercrm/trunk/soap/customerportal.php

Modified: vtigercrm/trunk/soap/customerportal.php
==============================================================================
--- vtigercrm/trunk/soap/customerportal.php (original)
+++ vtigercrm/trunk/soap/customerportal.php Sat Jun 24 15:26:16 2006
@@ -9,7 +9,6 @@
 *
  ********************************************************************************/
 
-ini_set("include_path","../");
 require_once("config.php");
 require_once('include/logging.php');
 require_once('include/nusoap/nusoap.php');




From vtiger-tickets at vtiger.fosslabs.com  Sat Jun 24 18:08:39 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sat, 24 Jun 2006 22:08:39 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231366=3A?=
 =?utf-8?q?_Regression_from_checkin=3A_r7242?=
In-Reply-To: <076.e82045fa698e99f442e05495b3973c2a@vtiger.fosslabs.com>
References: <076.e82045fa698e99f442e05495b3973c2a@vtiger.fosslabs.com>
Message-ID: <085.271cd36aebdee71440613029ad07aa56@vtiger.fosslabs.com>

#1366: Regression from checkin: r7242
------------------------+---------------------------------------------------
  Reporter:  briand     |       Owner:  developer
      Type:  defect     |      Status:  closed   
  Priority:  major      |   Milestone:  4.2.5    
 Component:  vtigercrm  |     Version:  4.2.4rc3 
Resolution:  fixed      |    Keywords:           
------------------------+---------------------------------------------------
Changes (by allanbush):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 (In [7494]) Including language files from sub modules when needed and
 avaiable.  Closes #1366.

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1366>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 24 18:08:39 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 24 Jun 2006 22:08:39 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7494 -
	/vtigercrm/branches/4.2/include/utils.php
Message-ID: <20060624220840.1F86083FB66@vtiger.fosslabs.com>

Author: allanbush
Date: Sat Jun 24 16:08:34 2006
New Revision: 7494

Log:
Including language files from sub modules when needed and avaiable.  Closes #1366.

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 Sat Jun 24 16:08:34 2006
@@ -274,6 +274,10 @@
 
 	$temp_mod_strings = $mod_strings;
 	$language_used = $language;
+
+	if(file_exists("modules/$module/language/$language.lang.php")) {
+		include("modules/$module/language/$language.lang.php");
+	}
 
 	if(!isset($mod_strings))
 	{




From vtigercrm-commits at vtiger.fosslabs.com  Sat Jun 24 23:35:37 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sun, 25 Jun 2006 03:35:37 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7495 -
	/vtigercrm/trunk/modules/Webmails/ListView.php
Message-ID: <20060625033537.5314283FBA0@vtiger.fosslabs.com>

Author: mmbrich
Date: Sat Jun 24 21:35:36 2006
New Revision: 7495

Log:
fix for msg counts

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

Modified: vtigercrm/trunk/modules/Webmails/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Webmails/ListView.php (original)
+++ vtigercrm/trunk/modules/Webmails/ListView.php Sat Jun 24 21:35:36 2006
@@ -285,13 +285,15 @@
                         $boxes .= '<option value="'.$tmpval.'" SELECTED>'.$tmpval;
 			$_SESSION["mailboxes"][$tmpval] = $new_msgs;
 
-			$folders .= '<li><img src="'.$image_path.'/'.$img.'" align="absmiddle" />&nbsp;&nbsp;<a href="javascript:changeMbox(\''.$tmpval.'\');" class="webMnu" onmouseover="show_remfolder(\''.$tmpval.'\');" onmouseout="show_remfolder(\''.$tmpval.'\');">'.$tmpval.'</a>&nbsp;&nbsp;<span id="'.$tmpval.'_count" style="font-weight:bold">(<span id="'.$tmpval.'_unread">'.$new_msgs.'</span> of <span id="'.$tmpval.'_read">'.$numEmails.'</span>)</span>&nbsp;&nbsp;<span id="remove_'.$tmpval.'" style="position:relative;display:none">Remove</span></li>';
+			if($numEmails==0) {$num=$numEmails;} else {$num=($numEmails-1);}
+			$folders .= '<li><img src="'.$image_path.'/'.$img.'" align="absmiddle" />&nbsp;&nbsp;<a href="javascript:changeMbox(\''.$tmpval.'\');" class="webMnu" onmouseover="show_remfolder(\''.$tmpval.'\');" onmouseout="show_remfolder(\''.$tmpval.'\');">'.$tmpval.'</a>&nbsp;&nbsp;<span id="'.$tmpval.'_count" style="font-weight:bold">(<span id="'.$tmpval.'_unread">'.$new_msgs.'</span> of <span id="'.$tmpval.'_read">'.$num.'</span>)</span>&nbsp;&nbsp;<span id="remove_'.$tmpval.'" style="position:relative;display:none">Remove</span></li>';
 		} else {
 			$box = imap_status($mbox, "{".$imapServerAddress."}".$tmpval, SA_ALL);
 			$_SESSION["mailboxes"][$tmpval] = $box->unseen;
 
+			if($box->messages==0) {$num=$box->messages;} else {$num=($box->messages-1);}
                       	$boxes .= '<option value="'.$tmpval.'">'.$tmpval;
-			$folders .= '<li><img src="'.$image_path.'/'.$img.'" align="absmiddle" />&nbsp;&nbsp;<a href="javascript:changeMbox(\''.$tmpval.'\');" class="webMnu">'.$tmpval.'</a>&nbsp;<span id="'.$tmpval.'_count" style="font-weight:bold">(<span id="'.$tmpval.'_unread">'.$box->unseen.'</span> of <span id="'.$tmpval.'_read">'.$box->messages.'</span>)</span></li>';
+			$folders .= '<li><img src="'.$image_path.'/'.$img.'" align="absmiddle" />&nbsp;&nbsp;<a href="javascript:changeMbox(\''.$tmpval.'\');" class="webMnu">'.$tmpval.'</a>&nbsp;<span id="'.$tmpval.'_count" style="font-weight:bold">(<span id="'.$tmpval.'_unread">'.$box->unseen.'</span> of <span id="'.$tmpval.'_read">'.$num.'</span>)</span></li>';
 		}
  	}
         $boxes .= '</select>';




From vtiger-tickets at vtiger.fosslabs.com  Sat Jun 24 23:48:36 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sun, 25 Jun 2006 03:48:36 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23771=3A_?=
 =?utf-8?q?Decouple_mandatory_field_company_from_new_lead_entry?=
In-Reply-To: <076.9c081c8880db9c6491564f6430caf363@vtiger.fosslabs.com>
References: <076.9c081c8880db9c6491564f6430caf363@vtiger.fosslabs.com>
Message-ID: <085.5021696e0c570f707295da54f444f058@vtiger.fosslabs.com>

#771: Decouple mandatory field company from new lead entry
------------------------------+---------------------------------------------
  Reporter:  brian at awnow.com  |       Owner:  developer                  
      Type:  enhancement      |      Status:  new                        
  Priority:  minor            |   Milestone:  5.0.0                      
 Component:  vtigercrm        |     Version:  5.0.1                      
Resolution:                   |    Keywords:  b2c workflow leads accounts
------------------------------+---------------------------------------------
Changes (by mmbrich):

  * priority:  major => minor
  * type:  defect => enhancement

Comment:

 This is a feature request, updated to reflect this.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/771>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Sun Jun 25 06:43:15 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sun, 25 Jun 2006 10:43:15 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7496 -
 /vtigercrm/trunk/modules/Calendar/language/en_us.lang.php
Message-ID: <20060625104315.88BF583FB0C@vtiger.fosslabs.com>

Author: saraj
Date: Sun Jun 25 04:43:11 2006
New Revision: 7496

Log:
Added consistent to do - ahmed

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

Modified: vtigercrm/trunk/modules/Calendar/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Calendar/language/en_us.lang.php Sun Jun 25 04:43:11 2006
@@ -174,13 +174,13 @@
 ),
 
 'LBL_EVENTS'=>'Events',
-'LBL_TODOS'=>'Todos',
+'LBL_TODOS'=>'To Dos',
 'LBL_TODO'=>'To Do',
 'LBL_TIME'=>'Time',
 'LBL_ADD_EVENT'=>'Add Event',
 'LBL_ADDCALL'=>'Add Call',
 'LBL_ADDMEETING'=>'Add Meeting',
-'LBL_ADDTODO'=>'Add Todo',
+'LBL_ADDTODO'=>'Add To Do',
 'LBL_INVITE'=>'Invite',
 'LBL_REMINDER'=>'Reminder',
 'LBL_SENDREMINDER'=>'Send Reminder',
@@ -194,7 +194,7 @@
 'LBL_HRVIEW'=>'Hour View',
 'LBL_LISTVIEW'=>'List View',
 'LBL_TOTALEVENTS'=>'Total Events :',
-'LBL_TOTALTODOS'=>'Total Todos :',
+'LBL_TOTALTODOS'=>'Total To Dos :',
 'LBL_EVTDTL'=>'Event Details',
 'LBL_ACTION'=>'Actions',
 'LBL_CURSTATUS'=>'Current Status',
@@ -221,7 +221,7 @@
 'LBL_SDRMD'=>'Send Reminder to',
 'LBL_ENABLE_REPEAT'=>'Enable Repeat',
 'LBL_REPEAT_ONCE'=>'Repeat once in every',
-'LBL_ADD_TODO'=>'Create Todo',
+'LBL_ADD_TODO'=>'Create To Do',
 'LBL_TODONAME'=>'To Do',
 'LBL_TODODATETIME'=>'Time & Date',
 




From vtigercrm-commits at vtiger.fosslabs.com  Sun Jun 25 07:14:12 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sun, 25 Jun 2006 11:14:12 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7497 -
 /vtigercrm/trunk/modules/System/templates/classic/classic.css
Message-ID: <20060625111412.CCD7883FB63@vtiger.fosslabs.com>

Author: saraj
Date: Sun Jun 25 05:14:09 2006
New Revision: 7497

Log:
Updated the system config css - ahmed

Modified:
    vtigercrm/trunk/modules/System/templates/classic/classic.css

Modified: vtigercrm/trunk/modules/System/templates/classic/classic.css
==============================================================================
--- vtigercrm/trunk/modules/System/templates/classic/classic.css (original)
+++ vtigercrm/trunk/modules/System/templates/classic/classic.css Sun Jun 25 05:14:09 2006
@@ -1,12 +1,9 @@
 A {
   text-decoration: none;
+	color:#003399;
 }
 A:link {
-  color: #486591;
-  background-color: transparent;
-}
-A:visited {
-  color: #6f6c81;
+	color:#003399;
   background-color: transparent;
 }
 A:active {




From vtigercrm-commits at vtiger.fosslabs.com  Sun Jun 25 07:17:26 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sun, 25 Jun 2006 11:17:26 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7498 - in
 /vtigercrm/trunk/Smarty/templates: SetMenu.tpl Settings.tpl
Message-ID: <20060625111726.89B9483FB63@vtiger.fosslabs.com>

Author: saraj
Date: Sun Jun 25 05:17:21 2006
New Revision: 7498

Log:
updates system info link

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

Modified: vtigercrm/trunk/Smarty/templates/SetMenu.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/SetMenu.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/SetMenu.tpl Sun Jun 25 05:17:21 2006
@@ -1,140 +1,145 @@
-<table border=0 cellspacing=0 cellpadding=20 width=90% class="settingsUI">
-<tr>
-<td valign=top>
-	<table border=0 cellspacing=0 cellpadding=0 width=100%>
-	<tr>
-	<td valign=top>
-		<!--Left Side Navigation Table-->
-		<table border=0 cellspacing=0 cellpadding=0 width=100%>
-				<tr><td class="settingsTabHeader" nowrap>{$MOD.LBL_USER_MANAGEMENT}</td></tr>
-				{if $smarty.request.action eq 'index' ||  $smarty.request.action eq 'DetailView' || $smarty.request.action eq 'EditView' }
-					<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_USERS}</td></tr>
-				{else}
-					<tr><td class="settingsTabList" nowrap><a href="index.php?module=Administration&action=index&parenttab=Settings">{$MOD.LBL_USERS}</a></td></tr>
-				{/if}
-
-				{if $smarty.request.action eq 'listroles' ||  $smarty.request.action eq 'RoleDetailView' ||  $smarty.request.action eq 'saverole' ||  $smarty.request.action eq 'createrole'} 		
-					<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_ROLES}</td></tr>
-				{else}	
-					<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=listroles&parenttab=Settings">{$MOD.LBL_ROLES}</a></td></tr>
-				{/if}
-
-				{if $smarty.request.action eq 'ListProfiles' || $smarty.request.action eq 'profilePrivileges' ||  $smarty.request.action eq 'CreateProfile' ||  $smarty.request.action eq 'SaveProfile' || $smarty.request.action eq 'UpdateProfileChanges' }
-					<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_PROFILES}</td></tr>
-				{else}
-					<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=ListProfiles&parenttab=Settings">{$MOD.LBL_PROFILES}</a></td></tr>
-				{/if}
-
-				{if $smarty.request.action eq 'listgroups' || $smarty.request.action eq 'GroupDetailView' || $smarty.request.action eq 'createnewgroup' || $smarty.request.action eq 'SaveGroup'}
-				<tr><td class="settingsTabSelected" nowrap>{$MOD.USERGROUPLIST}</td></tr>   	
-				{else}
-				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=listgroups&parenttab=Settings">{$MOD.USERGROUPLIST}</a></td></tr>
-				{/if}
-
-				{if  $smarty.request.action eq 'OrgSharingEditView' || $smarty.request.action eq 'OrgSharingDetailView' || $smarty.request.action eq 'SaveOrgSharing'}
-				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_SHARING_ACCESS}</td></tr>  	
-				{else}
-				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=OrgSharingDetailView&parenttab=Settings">{$MOD.LBL_SHARING_ACCESS}</a></td></tr>
-				{/if}
-
-				{if $smarty.request.action eq 'DefaultFieldPermissions' || $smarty.request.action eq 'UpdateDefaultFieldLevelAccess' || $smarty.request.action eq 'EditDefOrgFieldLevelAccess' }
-				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_FIELDS_ACCESS}</td></tr>
-				{else}
-				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=DefaultFieldPermissions&parenttab=Settings">{$MOD.LBL_FIELDS_ACCESS}</a></td></tr>
-				{/if}
-
-				{if $smarty.request.action eq 'ListModuleOwners' || $smarty.request.action eq 'SettingsAjax'}
-				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_MODULE_OWNERS}</td></tr>
-				{else}
-				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=ListModuleOwners&parenttab=Settings">{$MOD.LBL_MODULE_OWNERS}</a></td></tr>
-				{/if}
-
-				{if  $smarty.request.action eq 'Announcements' ||  $smarty.request.action eq 'UsersAjax' }
-				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_ANNOUNCEMENT}</td></tr>		
-				{else}
-				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=Announcements&parenttab=Settings">{$MOD.LBL_ANNOUNCEMENT}</a></td></tr>
-				{/if}
-	
-				<tr><td class="settingsTabHeader" nowrap>{$MOD.LBL_STUDIO}</td></tr>
-				{if  $smarty.request.action eq 'CustomFieldList' || $smarty.request.action eq 'LeadCustomFieldMapping'}
-				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_CUSTOM_FIELDS}</td></tr>
-				{else}
-				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=CustomFieldList&parenttab=Settings">{$MOD.LBL_CUSTOM_FIELDS}</a></td></tr>
-				{/if}
-				
-				{if  $smarty.request.action eq 'PickList' ||  $smarty.request.action eq 'SettingsAjax'}
-				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_PICKLIST_EDITOR}</td></tr>						     {else}
-				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=PickList&parenttab=Settings">{$MOD.LBL_PICKLIST_EDITOR}</a></td></tr>
-				{/if}
-	
-				<tr><td class="settingsTabHeader" nowrap>{$MOD.LBL_COMMUNICATION_TEMPLATES}</td></tr>
-
-				{if $smarty.request.action eq 'listemailtemplates' || $smarty.request.action eq 'detailviewemailtemplate' || $smarty.request.action eq 'editemailtemplate' || $smarty.request.action eq 'saveemailtemplate' || $smarty.request.action eq 'deleteemailtemplate' || $smarty.request.action eq 'createemailtemplate'}
-				<tr><td class="settingsTabSelected" nowrap>{$MOD.EMAILTEMPLATES}</td></tr>
-				{else}
-				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=listemailtemplates&parenttab=Settings">{$MOD.EMAILTEMPLATES}</a></td></tr>
-				{/if}
-
-				{if $smarty.request.action eq 'listwordtemplates' || $smarty.request.action eq 'add2db' || $smarty.request.action eq 'deletewordtemplate'}
-				<tr><td class="settingsTabSelected" nowrap>{$MOD.WORDINTEGRATION}</td></tr>
-				
-				{else}	
-				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=listwordtemplates&parenttab=Settings">{$MOD.WORDINTEGRATION}</a></td></tr>
-				{/if}
-
-				{if $smarty.request.action eq 'listnotificationschedulers' || $smarty.request.action eq 'UsersAjax'}
-				<tr><td class="settingsTabSelected" nowrap>{$MOD.NOTIFICATIONSCHEDULERS}</td></tr>
-				{else}
-				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=listnotificationschedulers&parenttab=Settings">{$MOD.NOTIFICATIONSCHEDULERS}</a></td></tr>
-				{/if}
-				
-				{if $smarty.request.action eq 'listinventorynotifications' || $smarty.request.action eq 'UsersAjax'}
-				<tr><td class="settingsTabSelected" nowrap>{$MOD.INVENTORYNOTIFICATION}</td></tr>
-				{else}	
-				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=listinventorynotifications&parenttab=Settings">{$MOD.INVENTORYNOTIFICATION}</a></td></tr>
-				{/if} 	
-
-				{if $smarty.request.action eq 'OrganizationTermsandConditions' || $smarty.request.action eq 'savetermsandconditions'}
-				<tr><td class="settingsTabSelected" nowrap>{$MOD.INVENTORYNOTIFICATION}</td></tr>
-				{else}
-				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=OrganizationTermsandConditions&parenttab=Settings">{$MOD.INVENTORYTERMSANDCONDITIONS}</a></td></tr>
-				{/if}
-
-	
-				<tr><td class="settingsTabHeader" nowrap>{$MOD.LBL_OTHER_SETTINGS}</td></tr>
-				{if $smarty.request.action eq 'OrganizationConfig' || $smarty.request.action eq 'EditCompanyDetails' || $smarty.request.action eq 'add2db'}
-				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_COMPANY_DETAILS}</td></tr>
-				{else}	
-				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=OrganizationConfig&parenttab=Settings">{$MOD.LBL_COMPANY_DETAILS}</a></td></tr>
-				{/if}
-				
-				{if  $smarty.request.action eq 'EmailConfig' ||  $smarty.request.action eq 'Save' }
-				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_MAIL_SERVER_SETTINGS}</td></tr>
-				{else}
-				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=EmailConfig&parenttab=Settings">{$MOD.LBL_MAIL_SERVER_SETTINGS}</a></td></tr>
-				{/if}
-				
-				{if $smarty.request.action eq 'BackupServerConfig' || $smarty.request.action eq 'index' || $smarty.request.action eq 'Save'}
-				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_BACKUP_SERVER_SETTINGS}</td></tr>
-				{else}
-				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=BackupServerConfig&parenttab=Settings">{$MOD.LBL_BACKUP_SERVER_SETTINGS}</a></td></tr>
-				{/if}
-				
-				{if $smarty.request.action eq 'CurrencyListView' ||  $smarty.request.action eq 'CurrencyEditView' ||  $smarty.request.action eq 'index' ||  $smarty.request.action eq 'SaveCurrencyInfo'}
-				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_CURRENCY_SETTINGS}</td></tr>
-				{else}
-				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=CurrencyListView&parenttab=Settings">{$MOD.LBL_CURRENCY_SETTINGS}</a></td></tr>
-				{/if}
-				
-				{if $smarty.request.action eq 'TaxConfig'}
-				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_TAX_SETTINGS}</td></tr>
-				{else}
-				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=TaxConfig&parenttab=Settings">{$MOD.LBL_TAX_SETTINGS}</a></td></tr>
-				{/if}
-				</table>
-			</td>
-			<td width=90% class="small settingsSelectedUI" valign=top >
-
-
-
-
+<table border=0 cellspacing=0 cellpadding=20 width=90% class="settingsUI">
+<tr>
+<td valign=top>
+	<table border=0 cellspacing=0 cellpadding=0 width=100%>
+	<tr>
+	<td valign=top>
+		<!--Left Side Navigation Table-->
+		<table border=0 cellspacing=0 cellpadding=0 width=100%>
+				<tr><td class="settingsTabHeader" nowrap>{$MOD.LBL_USER_MANAGEMENT}</td></tr>
+				{if $smarty.request.action eq 'index' ||  $smarty.request.action eq 'DetailView' || $smarty.request.action eq 'EditView' }
+					<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_USERS}</td></tr>
+				{else}
+					<tr><td class="settingsTabList" nowrap><a href="index.php?module=Administration&action=index&parenttab=Settings">{$MOD.LBL_USERS}</a></td></tr>
+				{/if}
+
+				{if $smarty.request.action eq 'listroles' ||  $smarty.request.action eq 'RoleDetailView' ||  $smarty.request.action eq 'saverole' ||  $smarty.request.action eq 'createrole'} 		
+					<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_ROLES}</td></tr>
+				{else}	
+					<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=listroles&parenttab=Settings">{$MOD.LBL_ROLES}</a></td></tr>
+				{/if}
+
+				{if $smarty.request.action eq 'ListProfiles' || $smarty.request.action eq 'profilePrivileges' ||  $smarty.request.action eq 'CreateProfile' ||  $smarty.request.action eq 'SaveProfile' || $smarty.request.action eq 'UpdateProfileChanges' }
+					<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_PROFILES}</td></tr>
+				{else}
+					<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=ListProfiles&parenttab=Settings">{$MOD.LBL_PROFILES}</a></td></tr>
+				{/if}
+
+				{if $smarty.request.action eq 'listgroups' || $smarty.request.action eq 'GroupDetailView' || $smarty.request.action eq 'createnewgroup' || $smarty.request.action eq 'SaveGroup'}
+				<tr><td class="settingsTabSelected" nowrap>{$MOD.USERGROUPLIST}</td></tr>   	
+				{else}
+				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=listgroups&parenttab=Settings">{$MOD.USERGROUPLIST}</a></td></tr>
+				{/if}
+
+				{if  $smarty.request.action eq 'OrgSharingEditView' || $smarty.request.action eq 'OrgSharingDetailView' || $smarty.request.action eq 'SaveOrgSharing'}
+				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_SHARING_ACCESS}</td></tr>  	
+				{else}
+				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=OrgSharingDetailView&parenttab=Settings">{$MOD.LBL_SHARING_ACCESS}</a></td></tr>
+				{/if}
+
+				{if $smarty.request.action eq 'DefaultFieldPermissions' || $smarty.request.action eq 'UpdateDefaultFieldLevelAccess' || $smarty.request.action eq 'EditDefOrgFieldLevelAccess' }
+				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_FIELDS_ACCESS}</td></tr>
+				{else}
+				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=DefaultFieldPermissions&parenttab=Settings">{$MOD.LBL_FIELDS_ACCESS}</a></td></tr>
+				{/if}
+
+				{if $smarty.request.action eq 'ListModuleOwners' || $smarty.request.action eq 'SettingsAjax'}
+				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_MODULE_OWNERS}</td></tr>
+				{else}
+				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=ListModuleOwners&parenttab=Settings">{$MOD.LBL_MODULE_OWNERS}</a></td></tr>
+				{/if}
+
+				{if  $smarty.request.action eq 'Announcements' ||  $smarty.request.action eq 'UsersAjax' }
+				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_ANNOUNCEMENT}</td></tr>		
+				{else}
+				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=Announcements&parenttab=Settings">{$MOD.LBL_ANNOUNCEMENT}</a></td></tr>
+				{/if}
+	
+				<tr><td class="settingsTabHeader" nowrap>{$MOD.LBL_STUDIO}</td></tr>
+				{if  $smarty.request.action eq 'CustomFieldList' || $smarty.request.action eq 'LeadCustomFieldMapping'}
+				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_CUSTOM_FIELDS}</td></tr>
+				{else}
+				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=CustomFieldList&parenttab=Settings">{$MOD.LBL_CUSTOM_FIELDS}</a></td></tr>
+				{/if}
+				
+				{if  $smarty.request.action eq 'PickList' ||  $smarty.request.action eq 'SettingsAjax'}
+				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_PICKLIST_EDITOR}</td></tr>						     {else}
+				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=PickList&parenttab=Settings">{$MOD.LBL_PICKLIST_EDITOR}</a></td></tr>
+				{/if}
+	
+				<tr><td class="settingsTabHeader" nowrap>{$MOD.LBL_COMMUNICATION_TEMPLATES}</td></tr>
+
+				{if $smarty.request.action eq 'listemailtemplates' || $smarty.request.action eq 'detailviewemailtemplate' || $smarty.request.action eq 'editemailtemplate' || $smarty.request.action eq 'saveemailtemplate' || $smarty.request.action eq 'deleteemailtemplate' || $smarty.request.action eq 'createemailtemplate'}
+				<tr><td class="settingsTabSelected" nowrap>{$MOD.EMAILTEMPLATES}</td></tr>
+				{else}
+				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=listemailtemplates&parenttab=Settings">{$MOD.EMAILTEMPLATES}</a></td></tr>
+				{/if}
+
+				{if $smarty.request.action eq 'listwordtemplates' || $smarty.request.action eq 'add2db' || $smarty.request.action eq 'deletewordtemplate'}
+				<tr><td class="settingsTabSelected" nowrap>{$MOD.EMAILTEMPLATES}</td></tr>
+				
+				{else}	
+				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=listwordtemplates&parenttab=Settings">{$MOD.WORDINTEGRATION}</a></td></tr>
+				{/if}
+
+				{if $smarty.request.action eq 'listnotificationschedulers' || $smarty.request.action eq 'UsersAjax'}
+				<tr><td class="settingsTabSelected" nowrap>{$MOD.NOTIFICATIONSCHEDULERS}</td></tr>
+				{else}
+				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=listnotificationschedulers&parenttab=Settings">{$MOD.NOTIFICATIONSCHEDULERS}</a></td></tr>
+				{/if}
+				
+				{if $smarty.request.action eq 'listinventorynotifications' || $smarty.request.action eq 'UsersAjax'}
+				<tr><td class="settingsTabSelected" nowrap>{$MOD.INVENTORYNOTIFICATION}</td></tr>
+				{else}	
+				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=listinventorynotifications&parenttab=Settings">{$MOD.INVENTORYNOTIFICATION}</a></td></tr>
+				{/if} 	
+
+				{if $smarty.request.action eq 'OrganizationTermsandConditions' || $smarty.request.action eq 'savetermsandconditions'}
+				<tr><td class="settingsTabSelected" nowrap>{$MOD.INVENTORYNOTIFICATION}</td></tr>
+				{else}
+				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=OrganizationTermsandConditions&parenttab=Settings">{$MOD.INVENTORYTERMSANDCONDITIONS}</a></td></tr>
+				{/if}
+
+	
+				<tr><td class="settingsTabHeader" nowrap>{$MOD.LBL_OTHER_SETTINGS}</td></tr>
+				{if $smarty.request.action eq 'OrganizationConfig' || $smarty.request.action eq 'EditCompanyDetails' || $smarty.request.action eq 'add2db'}
+				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_COMPANY_DETAILS}</td></tr>
+				{else}	
+				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=OrganizationConfig&parenttab=Settings">{$MOD.LBL_COMPANY_DETAILS}</a></td></tr>
+				{/if}
+				
+				{if  $smarty.request.action eq 'EmailConfig' ||  $smarty.request.action eq 'Save' }
+				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_MAIL_SERVER_SETTINGS}</td></tr>
+				{else}
+				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=EmailConfig&parenttab=Settings">{$MOD.LBL_MAIL_SERVER_SETTINGS}</a></td></tr>
+				{/if}
+				
+				{if $smarty.request.action eq 'BackupServerConfig' || $smarty.request.action eq 'index' || $smarty.request.action eq 'Save'}
+				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_BACKUP_SERVER_SETTINGS}</td></tr>
+				{else}
+				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=BackupServerConfig&parenttab=Settings">{$MOD.LBL_BACKUP_SERVER_SETTINGS}</a></td></tr>
+				{/if}
+				
+				{if $smarty.request.action eq 'CurrencyListView' ||  $smarty.request.action eq 'CurrencyEditView' ||  $smarty.request.action eq 'index' ||  $smarty.request.action eq 'SaveCurrencyInfo'}
+				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_CURRENCY_SETTINGS}</td></tr>
+				{else}
+				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=CurrencyListView&parenttab=Settings">{$MOD.LBL_CURRENCY_SETTINGS}</a></td></tr>
+				{/if}
+				
+				{if $smarty.request.action eq 'TaxConfig'}
+				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_TAX_SETTINGS}</td></tr>
+				{else}
+				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=TaxConfig&parenttab=Settings">{$MOD.LBL_TAX_SETTINGS}</a></td></tr>
+				{/if}
+				{if $smarty.request.action eq 'systemconfig'}
+				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_SYSTEM_INFO}</td></tr>
+				{else}
+				<tr><td class="settingsTabList" nowrap><a href="index.php?module=System&action=systemconfig&parenttab=Settings">{$MOD.LBL_SYSTEM_INFO}</a></td></tr>
+				{/if}
+				</table>
+			</td>
+			<td width=90% class="small settingsSelectedUI" valign=top >
+
+
+
+

Modified: vtigercrm/trunk/Smarty/templates/Settings.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Settings.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Settings.tpl Sun Jun 25 05:17:21 2006
@@ -1,519 +1,519 @@
-{*<!--
-/*********************************************************************************
-  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
-   * ("License"); You may not use this file except in compliance with the License
-   * The Original Code is:  vtiger CRM Open Source
-   * The Initial Developer of the Original Code is vtiger.
-   * Portions created by vtiger are Copyright (C) vtiger.
-   * All Rights Reserved.
-  *
- ********************************************************************************/
--->*}
-
-<style type="text/css">@import url(themes/blue/style.css);</style>
-<body class=small>
-<br>
-<table align="center" border="0" cellpadding="0" cellspacing="0" width="98%">
-<tbody><tr>
-        <td valign="top"><img src="themes/blue/images/showPanelTopLeft.gif"></td>
-	<td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
-	<br>
-	<div align=center>
-	<table border=0 cellspacing=0 cellpadding=10 width=90% class="settingsUI">
-	<tr>
-		<td>
-		<!-- heading -->
-
-		<span class="heading2">{$MOD.LBL_SETTINGS}</span>
-		</td>
-	</tr>
-	<tr>
-		<td>
-			<!--All Icons table -->
-			<table border=0 cellspacing=0 cellpadding=0 width=100%>
-			<tr>
-
-				<td class="settingsTabHeader">
-				<!-- Users & Access Management -->
-					{$MOD.LBL_USER_MANAGEMENT}	
-				</td>
-			</tr>
-			<tr>
-				<td class="settingsIconDisplay small">
-				<!-- Icons for Users & Access Management -->
-				
-				<table border=0 cellspacing=0 cellpadding=10 width=100%>
-
-				<tr>
-					<td width=25% valign=top>
-					<!-- icon 1-->
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=Administration&action=index&parenttab=Settings"><img src="{$IMAGE_PATH}ico-users.gif" alt="{$MOD.LBL_USERS}" width="48" height="48" border=0 title="{$MOD.LBL_USERS}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Administration&action=index&parenttab=Settings">{$MOD.LBL_USERS}</a></td>
-						</tr>
-
-						<tr>
-							<td class="small" valign=top>{$MOD.LBL_USER_DESCRIPTION}</td>
-						</tr>
-						</table>
-					</td>
-					<td width=25% valign=top>
-					<!-- icon 2-->
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-
-						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=Users&action=listroles&parenttab=Settings"><img src="{$IMAGE_PATH}ico-roles.gif" alt="{$MOD.LBL_ROLES}" width="48" height="48" border=0 title="{$MOD.LBL_ROLES}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Users&action=listroles&parenttab=Settings">{$MOD.LBL_ROLES}</a></td>
-						</tr>
-						<tr>
-							<td class="small" valign=top>{$MOD.LBL_ROLE_DESCRIPTION}</td>
-						</tr>
-						</table>
-
-					</td>
-					<td width=25% valign=top>
-					<!-- icon 3-->
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=Users&action=ListProfiles&parenttab=Settings"><img src="{$IMAGE_PATH}ico-profile.gif" alt="{$MOD.LBL_PROFILES}" width="48" height="48" border=0 title="{$MOD.LBL_PROFILES}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Users&action=ListProfiles&parenttab=Settings">{$MOD.LBL_PROFILES}</a></td>
-						</tr>
-
-						<tr>
-							<td class="small" valign=top>{$MOD.LBL_PROFILE_DESCRIPTION}</td>
-						</tr>
-						</table>
-					</td>
-					<td width=25% valign=top>
-					<!-- icon 4-->
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-
-						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=Users&action=listgroups&parenttab=Settings"><img src="{$IMAGE_PATH}ico-groups.gif" alt="{$MOD.USERGROUPLIST}" width="48" height="48" border=0 title="{$MOD.USERGROUPLIST}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Users&action=listgroups&parenttab=Settings">{$MOD.USERGROUPLIST}</a></td>
-						</tr>
-						<tr>
-							<td class="small" valign=top>{$MOD.LBL_GROUP_DESCRIPTION}</td>
-						</tr>
-						</table>
-
-					</td>
-				</tr>
-				<!-- Row 2 -->
-				<tr>
-					<td width=25% valign=top>
-					<!-- icon 5-->
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=Users&action=OrgSharingDetailView&parenttab=Settings"><img src="{$IMAGE_PATH}shareaccess.gif" alt="{$MOD.LBL_SHARING_ACCESS}" width="48" height="48" border=0 title="{$MOD.LBL_SHARING_ACCESS}"></a></td>
-
-							<td class=big valign=top><a href="index.php?module=Users&action=OrgSharingDetailView&parenttab=Settings">{$MOD.LBL_SHARING_ACCESS}</a></td>
-						</tr>
-						<tr>
-							<td class="small" valign=top>{$MOD.LBL_SHARING_ACCESS_DESCRIPTION}</td>
-						</tr>
-						</table>
-					</td>
-					<td width=25% valign=top>
-
-					<!-- icon 6 -->
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=Users&action=DefaultFieldPermissions&parenttab=Settings"><img src="{$IMAGE_PATH}orgshar.gif" alt="Fields to be shown" width="48" height="48" border=0 title="Fields to be shown"></a></td>
-							<td class=big valign=top><a href="index.php?module=Users&action=DefaultFieldPermissions&parenttab=Settings">{$MOD.LBL_FIELDS_ACCESS}</a></td>
-						</tr>
-						<tr>
-							<td class="small" valign=top>{$MOD.LBL_SHARING_FIELDS_DESCRIPTION}</td>
-
-						</tr>
-						</table>
-					</td>
-					<td width=25% valign=top>
-					<!-- icon 7-->
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=ListModuleOwners&parenttab=Settings"><img src="{$IMAGE_PATH}assign.gif" alt="{$MOD.LBL_ASSIGN_MODULE_OWNERS}" width="48" height="48" border=0 title="{$MOD.LBL_ASSIGN_MODULE_OWNERS}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Settings&action=ListModuleOwners&parenttab=Settings">{$MOD.LBL_MODULE_OWNERS}</a></td>
-
-						</tr>
-						<tr>
-							<td class="small" valign=top>{$MOD.LBL_MODULE_OWNERS_DESCRIPTION}</td>
-						</tr>
-						</table>
-					</td>
-					<td width=25% valign=top>
-					<!-- icon 8-->
-
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=Users&action=Announcements&parenttab=Settings"><img src="{$IMAGE_PATH}announ.gif" alt="{$MOD.LBL_ANNOUNCEMENT}" width="48" height="48" border=0 title="{$MOD.LBL_ANNOUNCEMENT}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Users&action=Announcements&parenttab=Settings">{$MOD.LBL_ANNOUNCEMENT}</a></td>
-						</tr>
-						<tr>
-							<td class="small" valign=top>{$MOD.LBL_ANNOUNCEMENT_DESCRIPTION}</td>
-						</tr>
-
-						</table>
-					</td>
-				</tr>
-				</table>
-				
-				
-				</td>
-			</tr>
-
-
-			<tr>
-				<td class="settingsTabHeader">
-
-				<!-- Studio  -->
-					{$MOD.LBL_STUDIO}	
-				</td>
-			</tr>
-			<tr>
-				<td class="settingsIconDisplay small">
-				<!-- Icons for Users & Access Management -->
-				
-				<table border=0 cellspacing=0 cellpadding=10 width=100%>
-				<tr>
-
-					<td width=25% valign=top>
-					<!-- icon 9-->
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=CustomFieldList&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}custom.gif" alt="{$MOD.LBL_CUSTOM_FIELDS}" title="{$MOD.LBL_CUSTOM_FIELDS}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Settings&action=CustomFieldList&parenttab=Settings">{$MOD.LBL_CUSTOM_FIELDS}</a></td>
-						</tr>
-						<tr>
-
-							<td class="small" valign=top>{$MOD.LBL_CUSTOM_FIELDS_DESCRIPTION}</td>
-						</tr>
-						</table>
-					</td>
-					<td width=25% valign=top>
-					<!-- icon 10-->
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-						<tr>
-
-							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=PickList&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}picklist.gif" alt="{$MOD.LBL_PICKLIST_EDITOR}" title="{$MOD.LBL_PICKLIST_EDITOR}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Settings&action=PickList&parenttab=Settings">{$MOD.LBL_PICKLIST_EDITOR}</a></td>
-						</tr>
-						<tr>
-							<td class="small" valign=top>{$MOD.LBL_PICKLIST_DESCRIPTION}</td>	
-						</tr>
-						</table>
-					</td>
-
-					<td width=25% valign=top>
-					<!-- empty-->
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-						<tr>
-							<td rowspan=2 valign=top>&nbsp;</td>
-							<td class=big valign=top>&nbsp;</td>
-						</tr>
-						<tr>
-							<td class="small" valign=top>&nbsp;</td>
-
-						</tr>
-						</table>
-					</td>
-					<td width=25% valign=top>
-					<!-- empty-->
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-						<tr>
-							<td rowspan=2 valign=top>&nbsp;</td>
-							<td class=big valign=top>&nbsp;</td>
-
-						</tr>
-						<tr>
-							<td class="small" valign=top>&nbsp;</td>
-						</tr>
-						</table>
-					</td>
-				</tr>
-				</table>
-				
-				
-				</td>
-
-			</tr>
-			
-			
-			
-			<tr>
-				<td class="settingsTabHeader">
-				<!-- Communication Templates -->
-					{$MOD.LBL_COMMUNICATION_TEMPLATES}
-				</td>
-			</tr>
-			<tr>
-				<td class="settingsIconDisplay small">
-
-				<!-- Icons for Communication Templates -->
-				
-				<table border=0 cellspacing=0 cellpadding=10 width=100%>
-				<tr>
-					<td width=25% valign=top>
-					<!-- icon 11-->
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=Users&action=listemailtemplates&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}ViewTemplate.gif" alt="{$MOD.EMAILTEMPLATES}" title="{$MOD.EMAILTEMPLATES}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Users&action=listemailtemplates&parenttab=Settings">{$MOD.EMAILTEMPLATES}</a></td>
-
-						</tr>
-						<tr>
-							<td class="small" valign=top>{$MOD.LBL_EMAIL_TEMPLATE_DESCRIPTION}</td>
-						</tr>
-						</table>
-					</td>
-					<td width=25% valign=top>
-					<!-- icon 12-->
-
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=Users&action=listwordtemplates&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}mailmarge.gif" alt="{$MOD.LBL_MAIL_MERGE}" title="{$MOD.LBL_MAIL_MERGE}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Users&action=listwordtemplates&parenttab=Settings">{$MOD.WORDINTEGRATION}</a></td>
-						</tr>
-						<tr>
-							<td class="small" valign=top>{$MOD.LBL_MAIL_MERGE_DESCRIPTION}</td>
-						</tr>
-
-						</table>
-					</td>
-					<td width=25% valign=top>
-					<!-- icon 13-->
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=Users&action=listnotificationschedulers&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}notification.gif" alt="{$MOD.NOTIFICATIONSCHEDULERS}" title="{$MOD.NOTIFICATIONSCHEDULERS}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Users&action=listnotificationschedulers&parenttab=Settings">{$MOD.NOTIFICATIONSCHEDULERS}</a></td>
-
-						</tr>
-						<tr>
-							<td class="small" valign=top>{$MOD.LBL_NOTIF_SCHED_DESCRIPTION}</td>
-						</tr>
-						</table>
-					</td>
-					<td width=25% valign=top>
-					<!-- icon 14-->
-
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=Users&action=listinventorynotifications&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}/inventory.gif" alt="{$MOD.INVENTORYNOTIFICATION}" title="{$MOD.INVENTORYNOTIFICATION}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Users&action=listinventorynotifications&parenttab=Settings">{$MOD.INVENTORYNOTIFICATION}</a></td>
-						</tr>
-						<tr>
-							<td class="small" valign=top>{$MOD.LBL_INV_NOTIF_DESCRIPTION}</td>
-						</tr>
-
-						</table>
-					</td>
-				</tr>
-				<!-- Row 2 -->
-				<tr>
-					<td width=25% valign=top>
-					<!-- icon 15-->
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-						<tr>
-
-							<td rowspan=2 valign=top><a href="index.php?module=Users&action=OrganizationTermsandConditions&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}terms.gif" alt="{$MOD.INVENTORYTERMSANDCONDITIONS}" title="{$MOD.INVENTORYTERMSANDCONDITIONS}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Users&action=OrganizationTermsandConditions&parenttab=Settings">{$MOD.INVENTORYTERMSANDCONDITIONS}</a></td>
-						</tr>
-						<tr>
-							<td class="small" valign=top>{$MOD.LBL_INV_TANDC_DESCRIPTION}</td>
-						</tr>
-						</table>
-
-					</td>
-					<td width=25% valign=top>
-					<!-- empty -->
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-						<tr>
-							<td rowspan=2 valign=top>&nbsp;</td>
-							<td class=big valign=top>&nbsp;</td>
-						</tr>
-						<tr>
-
-							<td class="small" valign=top>&nbsp;</td>
-						</tr>
-						</table>
-					</td>
-					<td width=25% valign=top>
-					<!-- empty-->
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-						<tr>
-							<td rowspan=2 valign=top>&nbsp;</td>
-
-							<td class=big valign=top>&nbsp;</td>
-						</tr>
-						<tr>
-							<td class="small" valign=top>&nbsp;</td>
-						</tr>
-						</table>
-					</td>
-					<td width=25% valign=top>
-					<!-- empty-->
-
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-						<tr>
-							<td rowspan=2 valign=top>&nbsp;</td>
-							<td class=big valign=top>&nbsp;</td>
-						</tr>
-						<tr>
-							<td class="small" valign=top>&nbsp;</td>
-						</tr>
-						</table>
-
-					</td>
-				</tr>
-				</table>
-				
-				
-				</td>
-			</tr>
-			<tr>
-				<td class="settingsTabHeader">
-				<!-- Other settings -->
-					{$MOD.LBL_OTHER_SETTINGS}
-				</td>
-
-			</tr>
-			<tr>
-				<td class="settingsIconDisplay small">
-				<!-- Icons for Other Settings-->
-				
-				<table border=0 cellspacing=0 cellpadding=10 width=100%>
-				<tr>
-					<td width=25% valign=top>
-					<!-- icon 16-->
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-
-						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=OrganizationConfig&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}company.gif" alt="{$MOD.LBL_COMPANY_DETAILS}" title="{$MOD.LBL_COMPANY_DETAILS}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Settings&action=OrganizationConfig&parenttab=Settings">{$MOD.LBL_COMPANY_DETAILS}</a></td>
-						</tr>
-						<tr>
-							<td class="small" valign=top>{$MOD.LBL_COMPANY_DESCRIPTION}</td>
-						</tr>
-						</table>
-
-					</td>
-					<td width=25% valign=top>
-					<!-- icon 17-->
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=EmailConfig&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}ogmailserver.gif" alt="{$MOD.LBL_MAIL_SERVER_SETTINGS}" title="{$MOD.LBL_MAIL_SERVER_SETTINGS}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Settings&action=EmailConfig&parenttab=Settings">{$MOD.LBL_MAIL_SERVER_SETTINGS}</a></td>
-						</tr>
-
-						<tr>
-							<td class="small" valign=top>{$MOD.LBL_MAIL_SERVER_DESCRIPTION}</td>
-						</tr>
-						</table>
-					</td>
-					<td width=25% valign=top>
-					<!-- icon 18-->
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-
-						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=BackupServerConfig&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}backupserver.gif" alt="{$MOD.LBL_BACKUP_SERVER_SETTINGS}" title="{$MOD.LBL_BACKUP_SERVER_SETTINGS}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Settings&action=BackupServerConfig&parenttab=Settings">{$MOD.LBL_BACKUP_SERVER_SETTINGS}</a></td>
-						</tr>
-						<tr>
-							<td class="small" valign=top>{$MOD.LBL_BACKUP_SERVER_DESCRIPTION}</td>
-						</tr>
-						</table>
-
-					</td>
-					<td width=25% valign=top>
-					<!-- icon 19-->
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=CurrencyListView&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}currency.gif" alt="{$MOD.LBL_CURRENCY_SETTINGS}" title="{$MOD.LBL_CURRENCY_SETTINGS}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Settings&action=CurrencyListView&parenttab=Settings">{$MOD.LBL_CURRENCY_SETTINGS}</a></td>
-						</tr>
-
-						<tr>
-							<td class="small" valign=top>{$MOD.LBL_CURRENCY_DESCRIPTION}</td>
-						</tr>
-						</table>
-					</td>
-				</tr>
-				<!-- Row 2 -->
-				<tr>
-
-					<td width=25% valign=top>
-					<!-- icon 20-->
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-						<tr>
-							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=TaxConfig&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}taxConfiguration.gif" alt="{$MOD.LBL_TAX_SETTINGS}" title="{$MOD.LBL_TAX_SETTINGS}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Settings&action=TaxConfig&parenttab=Settings">{$MOD.LBL_TAX_SETTINGS}</a></td>
-						</tr>
-						<tr>
-
-							<td class="small" valign=top>{$MOD.LBL_TAX_DESCRIPTION}</td>
-						</tr>
-						</table>
-					</td>
-					<td width=25% valign=top>
-					<!-- empty -->
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-						<tr>
-
-							<td rowspan=2 valign=top>&nbsp;</td>
-							<td class=big valign=top>&nbsp;</td>
-						</tr>
-						<tr>
-							<td class="small" valign=top>&nbsp;</td>
-						</tr>
-						</table>
-					</td>
-					<td width=25% valign=top>
-
-					<!-- empty-->
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-						<tr>
-							<td rowspan=2 valign=top>&nbsp;</td>
-							<td class=big valign=top>&nbsp;</td>
-						</tr>
-						<tr>
-							<td class="small" valign=top>&nbsp;</td>
-						</tr>
-
-						</table>
-					</td>
-					<td width=25% valign=top>
-					<!-- empty-->
-						<table border=0 cellspacing=0 cellpadding=5 width=100%>
-						<tr>
-							<td rowspan=2 valign=top>&nbsp;</td>
-							<td class=big valign=top>&nbsp;</td>
-						</tr>
-
-						<tr>
-							<td class="small" valign=top>&nbsp;</td>
-						</tr>
-						</table>
-					</td>
-				</tr>
-				</table>
-				
-				
-				</td>
-			</tr>
-
-			</table>
-		
-		</td>
-	</tr>
-	</table>
-		
-	</div>
-
-	</td>
-        <td valign="top"><img src="themes/blue/images/showPanelTopRight.gif"></td>
-   </tr>
-</tbody></table>
-
-
-</body>
+{*<!--
+/*********************************************************************************
+  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
+   * ("License"); You may not use this file except in compliance with the License
+   * The Original Code is:  vtiger CRM Open Source
+   * The Initial Developer of the Original Code is vtiger.
+   * Portions created by vtiger are Copyright (C) vtiger.
+   * All Rights Reserved.
+  *
+ ********************************************************************************/
+-->*}
+
+<style type="text/css">@import url(themes/blue/style.css);</style>
+<body class=small>
+<br>
+<table align="center" border="0" cellpadding="0" cellspacing="0" width="98%">
+<tbody><tr>
+        <td valign="top"><img src="themes/blue/images/showPanelTopLeft.gif"></td>
+	<td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
+	<br>
+	<div align=center>
+	<table border=0 cellspacing=0 cellpadding=10 width=90% class="settingsUI">
+	<tr>
+		<td>
+		<!-- heading -->
+
+		<span class="heading2">{$MOD.LBL_SETTINGS}</span>
+		</td>
+	</tr>
+	<tr>
+		<td>
+			<!--All Icons table -->
+			<table border=0 cellspacing=0 cellpadding=0 width=100%>
+			<tr>
+
+				<td class="settingsTabHeader">
+				<!-- Users & Access Management -->
+					{$MOD.LBL_USER_MANAGEMENT}	
+				</td>
+			</tr>
+			<tr>
+				<td class="settingsIconDisplay small">
+				<!-- Icons for Users & Access Management -->
+				
+				<table border=0 cellspacing=0 cellpadding=10 width=100%>
+
+				<tr>
+					<td width=25% valign=top>
+					<!-- icon 1-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Administration&action=index&parenttab=Settings"><img src="{$IMAGE_PATH}ico-users.gif" alt="{$MOD.LBL_USERS}" width="48" height="48" border=0 title="{$MOD.LBL_USERS}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Administration&action=index&parenttab=Settings">{$MOD.LBL_USERS}</a></td>
+						</tr>
+
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_USER_DESCRIPTION}</td>
+						</tr>
+						</table>
+					</td>
+					<td width=25% valign=top>
+					<!-- icon 2-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Users&action=listroles&parenttab=Settings"><img src="{$IMAGE_PATH}ico-roles.gif" alt="{$MOD.LBL_ROLES}" width="48" height="48" border=0 title="{$MOD.LBL_ROLES}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Users&action=listroles&parenttab=Settings">{$MOD.LBL_ROLES}</a></td>
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_ROLE_DESCRIPTION}</td>
+						</tr>
+						</table>
+
+					</td>
+					<td width=25% valign=top>
+					<!-- icon 3-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Users&action=ListProfiles&parenttab=Settings"><img src="{$IMAGE_PATH}ico-profile.gif" alt="{$MOD.LBL_PROFILES}" width="48" height="48" border=0 title="{$MOD.LBL_PROFILES}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Users&action=ListProfiles&parenttab=Settings">{$MOD.LBL_PROFILES}</a></td>
+						</tr>
+
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_PROFILE_DESCRIPTION}</td>
+						</tr>
+						</table>
+					</td>
+					<td width=25% valign=top>
+					<!-- icon 4-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Users&action=listgroups&parenttab=Settings"><img src="{$IMAGE_PATH}ico-groups.gif" alt="{$MOD.USERGROUPLIST}" width="48" height="48" border=0 title="{$MOD.USERGROUPLIST}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Users&action=listgroups&parenttab=Settings">{$MOD.USERGROUPLIST}</a></td>
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_GROUP_DESCRIPTION}</td>
+						</tr>
+						</table>
+
+					</td>
+				</tr>
+				<!-- Row 2 -->
+				<tr>
+					<td width=25% valign=top>
+					<!-- icon 5-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Users&action=OrgSharingDetailView&parenttab=Settings"><img src="{$IMAGE_PATH}shareaccess.gif" alt="{$MOD.LBL_SHARING_ACCESS}" width="48" height="48" border=0 title="{$MOD.LBL_SHARING_ACCESS}"></a></td>
+
+							<td class=big valign=top><a href="index.php?module=Users&action=OrgSharingDetailView&parenttab=Settings">{$MOD.LBL_SHARING_ACCESS}</a></td>
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_SHARING_ACCESS_DESCRIPTION}</td>
+						</tr>
+						</table>
+					</td>
+					<td width=25% valign=top>
+
+					<!-- icon 6 -->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Users&action=DefaultFieldPermissions&parenttab=Settings"><img src="{$IMAGE_PATH}orgshar.gif" alt="Fields to be shown" width="48" height="48" border=0 title="Fields to be shown"></a></td>
+							<td class=big valign=top><a href="index.php?module=Users&action=DefaultFieldPermissions&parenttab=Settings">{$MOD.LBL_FIELDS_ACCESS}</a></td>
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_SHARING_FIELDS_DESCRIPTION}</td>
+
+						</tr>
+						</table>
+					</td>
+					<td width=25% valign=top>
+					<!-- icon 7-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=ListModuleOwners&parenttab=Settings"><img src="{$IMAGE_PATH}assign.gif" alt="{$MOD.LBL_ASSIGN_MODULE_OWNERS}" width="48" height="48" border=0 title="{$MOD.LBL_ASSIGN_MODULE_OWNERS}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Settings&action=ListModuleOwners&parenttab=Settings">{$MOD.LBL_MODULE_OWNERS}</a></td>
+
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_MODULE_OWNERS_DESCRIPTION}</td>
+						</tr>
+						</table>
+					</td>
+					<td width=25% valign=top>
+					<!-- icon 8-->
+
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Users&action=Announcements&parenttab=Settings"><img src="{$IMAGE_PATH}announ.gif" alt="{$MOD.LBL_ANNOUNCEMENT}" width="48" height="48" border=0 title="{$MOD.LBL_ANNOUNCEMENT}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Users&action=Announcements&parenttab=Settings">{$MOD.LBL_ANNOUNCEMENT}</a></td>
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_ANNOUNCEMENT_DESCRIPTION}</td>
+						</tr>
+
+						</table>
+					</td>
+				</tr>
+				</table>
+				
+				
+				</td>
+			</tr>
+
+
+			<tr>
+				<td class="settingsTabHeader">
+
+				<!-- Studio  -->
+					{$MOD.LBL_STUDIO}	
+				</td>
+			</tr>
+			<tr>
+				<td class="settingsIconDisplay small">
+				<!-- Icons for Users & Access Management -->
+				
+				<table border=0 cellspacing=0 cellpadding=10 width=100%>
+				<tr>
+
+					<td width=25% valign=top>
+					<!-- icon 9-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=CustomFieldList&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}custom.gif" alt="{$MOD.LBL_CUSTOM_FIELDS}" title="{$MOD.LBL_CUSTOM_FIELDS}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Settings&action=CustomFieldList&parenttab=Settings">{$MOD.LBL_CUSTOM_FIELDS}</a></td>
+						</tr>
+						<tr>
+
+							<td class="small" valign=top>{$MOD.LBL_CUSTOM_FIELDS_DESCRIPTION}</td>
+						</tr>
+						</table>
+					</td>
+					<td width=25% valign=top>
+					<!-- icon 10-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+
+							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=PickList&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}picklist.gif" alt="{$MOD.LBL_PICKLIST_EDITOR}" title="{$MOD.LBL_PICKLIST_EDITOR}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Settings&action=PickList&parenttab=Settings">{$MOD.LBL_PICKLIST_EDITOR}</a></td>
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_PICKLIST_DESCRIPTION}</td>	
+						</tr>
+						</table>
+					</td>
+
+					<td width=25% valign=top>
+					<!-- empty-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top>&nbsp;</td>
+							<td class=big valign=top>&nbsp;</td>
+						</tr>
+						<tr>
+							<td class="small" valign=top>&nbsp;</td>
+
+						</tr>
+						</table>
+					</td>
+					<td width=25% valign=top>
+					<!-- empty-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top>&nbsp;</td>
+							<td class=big valign=top>&nbsp;</td>
+
+						</tr>
+						<tr>
+							<td class="small" valign=top>&nbsp;</td>
+						</tr>
+						</table>
+					</td>
+				</tr>
+				</table>
+				
+				
+				</td>
+
+			</tr>
+			
+			
+			
+			<tr>
+				<td class="settingsTabHeader">
+				<!-- Communication Templates -->
+					{$MOD.LBL_COMMUNICATION_TEMPLATES}
+				</td>
+			</tr>
+			<tr>
+				<td class="settingsIconDisplay small">
+
+				<!-- Icons for Communication Templates -->
+				
+				<table border=0 cellspacing=0 cellpadding=10 width=100%>
+				<tr>
+					<td width=25% valign=top>
+					<!-- icon 11-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Users&action=listemailtemplates&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}ViewTemplate.gif" alt="{$MOD.EMAILTEMPLATES}" title="{$MOD.EMAILTEMPLATES}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Users&action=listemailtemplates&parenttab=Settings">{$MOD.EMAILTEMPLATES}</a></td>
+
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_EMAIL_TEMPLATE_DESCRIPTION}</td>
+						</tr>
+						</table>
+					</td>
+					<td width=25% valign=top>
+					<!-- icon 12-->
+
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Users&action=listwordtemplates&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}mailmarge.gif" alt="{$MOD.LBL_MAIL_MERGE}" title="{$MOD.LBL_MAIL_MERGE}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Users&action=listwordtemplates&parenttab=Settings">{$MOD.WORDINTEGRATION}</a></td>
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_MAIL_MERGE_DESCRIPTION}</td>
+						</tr>
+
+						</table>
+					</td>
+					<td width=25% valign=top>
+					<!-- icon 13-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Users&action=listnotificationschedulers&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}notification.gif" alt="{$MOD.NOTIFICATIONSCHEDULERS}" title="{$MOD.NOTIFICATIONSCHEDULERS}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Users&action=listnotificationschedulers&parenttab=Settings">{$MOD.NOTIFICATIONSCHEDULERS}</a></td>
+
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_NOTIF_SCHED_DESCRIPTION}</td>
+						</tr>
+						</table>
+					</td>
+					<td width=25% valign=top>
+					<!-- icon 14-->
+
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Users&action=listinventorynotifications&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}/inventory.gif" alt="{$MOD.INVENTORYNOTIFICATION}" title="{$MOD.INVENTORYNOTIFICATION}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Users&action=listinventorynotifications&parenttab=Settings">{$MOD.INVENTORYNOTIFICATION}</a></td>
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_INV_NOTIF_DESCRIPTION}</td>
+						</tr>
+
+						</table>
+					</td>
+				</tr>
+				<!-- Row 2 -->
+				<tr>
+					<td width=25% valign=top>
+					<!-- icon 15-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+
+							<td rowspan=2 valign=top><a href="index.php?module=Users&action=OrganizationTermsandConditions&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}terms.gif" alt="{$MOD.INVENTORYTERMSANDCONDITIONS}" title="{$MOD.INVENTORYTERMSANDCONDITIONS}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Users&action=OrganizationTermsandConditions&parenttab=Settings">{$MOD.INVENTORYTERMSANDCONDITIONS}</a></td>
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_INV_TANDC_DESCRIPTION}</td>
+						</tr>
+						</table>
+
+					</td>
+					<td width=25% valign=top>
+					<!-- empty -->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top>&nbsp;</td>
+							<td class=big valign=top>&nbsp;</td>
+						</tr>
+						<tr>
+
+							<td class="small" valign=top>&nbsp;</td>
+						</tr>
+						</table>
+					</td>
+					<td width=25% valign=top>
+					<!-- empty-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top>&nbsp;</td>
+
+							<td class=big valign=top>&nbsp;</td>
+						</tr>
+						<tr>
+							<td class="small" valign=top>&nbsp;</td>
+						</tr>
+						</table>
+					</td>
+					<td width=25% valign=top>
+					<!-- empty-->
+
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top>&nbsp;</td>
+							<td class=big valign=top>&nbsp;</td>
+						</tr>
+						<tr>
+							<td class="small" valign=top>&nbsp;</td>
+						</tr>
+						</table>
+
+					</td>
+				</tr>
+				</table>
+				
+				
+				</td>
+			</tr>
+			<tr>
+				<td class="settingsTabHeader">
+				<!-- Other settings -->
+					{$MOD.LBL_OTHER_SETTINGS}
+				</td>
+
+			</tr>
+			<tr>
+				<td class="settingsIconDisplay small">
+				<!-- Icons for Other Settings-->
+				
+				<table border=0 cellspacing=0 cellpadding=10 width=100%>
+				<tr>
+					<td width=25% valign=top>
+					<!-- icon 16-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=OrganizationConfig&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}company.gif" alt="{$MOD.LBL_COMPANY_DETAILS}" title="{$MOD.LBL_COMPANY_DETAILS}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Settings&action=OrganizationConfig&parenttab=Settings">{$MOD.LBL_COMPANY_DETAILS}</a></td>
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_COMPANY_DESCRIPTION}</td>
+						</tr>
+						</table>
+
+					</td>
+					<td width=25% valign=top>
+					<!-- icon 17-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=EmailConfig&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}ogmailserver.gif" alt="{$MOD.LBL_MAIL_SERVER_SETTINGS}" title="{$MOD.LBL_MAIL_SERVER_SETTINGS}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Settings&action=EmailConfig&parenttab=Settings">{$MOD.LBL_MAIL_SERVER_SETTINGS}</a></td>
+						</tr>
+
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_MAIL_SERVER_DESCRIPTION}</td>
+						</tr>
+						</table>
+					</td>
+					<td width=25% valign=top>
+					<!-- icon 18-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=BackupServerConfig&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}backupserver.gif" alt="{$MOD.LBL_BACKUP_SERVER_SETTINGS}" title="{$MOD.LBL_BACKUP_SERVER_SETTINGS}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Settings&action=BackupServerConfig&parenttab=Settings">{$MOD.LBL_BACKUP_SERVER_SETTINGS}</a></td>
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_BACKUP_SERVER_DESCRIPTION}</td>
+						</tr>
+						</table>
+
+					</td>
+					<td width=25% valign=top>
+					<!-- icon 19-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=CurrencyListView&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}currency.gif" alt="{$MOD.LBL_CURRENCY_SETTINGS}" title="{$MOD.LBL_CURRENCY_SETTINGS}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Settings&action=CurrencyListView&parenttab=Settings">{$MOD.LBL_CURRENCY_SETTINGS}</a></td>
+						</tr>
+
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_CURRENCY_DESCRIPTION}</td>
+						</tr>
+						</table>
+					</td>
+				</tr>
+				<!-- Row 2 -->
+				<tr>
+
+					<td width=25% valign=top>
+					<!-- icon 20-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=Settings&action=TaxConfig&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}taxConfiguration.gif" alt="{$MOD.LBL_TAX_SETTINGS}" title="{$MOD.LBL_TAX_SETTINGS}"></a></td>
+							<td class=big valign=top><a href="index.php?module=Settings&action=TaxConfig&parenttab=Settings">{$MOD.LBL_TAX_SETTINGS}</a></td>
+						</tr>
+						<tr>
+
+							<td class="small" valign=top>{$MOD.LBL_TAX_DESCRIPTION}</td>
+						</tr>
+						</table>
+					</td>
+					<td width=25% valign=top>
+					<!-- empty -->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top><a href="index.php?module=System&action=systemconfig&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}system.gif" alt="{$MOD.LBL_SYSTEM_INFO}" title="{$MOD.LBL_SYSTEM_INFO}"></a></td>
+							<td class=big valign=top><a href="index.php?module=System&action=systemconfig&parenttab=Settings">{$MOD.LBL_SYSTEM_INFO}</a></td>
+
+						</tr>
+						<tr>
+							<td class="small" valign=top>{$MOD.LBL_SYSTEM_DESCRIPTION}</td>
+						</tr>
+						</table>
+					</td>
+					<td width=25% valign=top>
+
+					<!-- empty-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top>&nbsp;</td>
+							<td class=big valign=top>&nbsp;</td>
+						</tr>
+						<tr>
+							<td class="small" valign=top>&nbsp;</td>
+						</tr>
+
+						</table>
+					</td>
+					<td width=25% valign=top>
+					<!-- empty-->
+						<table border=0 cellspacing=0 cellpadding=5 width=100%>
+						<tr>
+							<td rowspan=2 valign=top>&nbsp;</td>
+							<td class=big valign=top>&nbsp;</td>
+						</tr>
+
+						<tr>
+							<td class="small" valign=top>&nbsp;</td>
+						</tr>
+						</table>
+					</td>
+				</tr>
+				</table>
+				
+				
+				</td>
+			</tr>
+
+			</table>
+		
+		</td>
+	</tr>
+	</table>
+		
+	</div>
+
+	</td>
+        <td valign="top"><img src="themes/blue/images/showPanelTopRight.gif"></td>
+   </tr>
+</tbody></table>
+
+
+</body>




From vtigercrm-commits at vtiger.fosslabs.com  Sun Jun 25 07:19:39 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sun, 25 Jun 2006 11:19:39 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7499 -
 /vtigercrm/trunk/modules/Settings/language/en_us.lang.php
Message-ID: <20060625111939.0C7C283FB11@vtiger.fosslabs.com>

Author: saraj
Date: Sun Jun 25 05:19:36 2006
New Revision: 7499

Log:
Updated lang file

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 Sun Jun 25 05:19:36 2006
@@ -319,6 +319,7 @@
 'LBL_FTP'=>'FTP',
 
 'LBL_SYSTEM_CONFIG'=>'System Configuration',
+'LBL_SYSTEM_INFO'=>'System Information',
 
 'LBL_CURRENCY_CONFIGURATION'=>'- Currency Information',
 
@@ -635,6 +636,7 @@
 'LBL_BACKUP_SERVER_DESCRIPTION'=>'Edit settings of Backup Server',
 'LBL_CURRENCY_DESCRIPTION'=>'Manage Currencies and Exchange Rates',
 'LBL_TAX_DESCRIPTION'=>'Manage values for Sales tax, VAT etc',
+'LBL_SYSTEM_DESCRIPTION'=>'Display System Settings',
 'LBL_TAX_DESC'=>'Manage VAT and other tax settings',
 'LBL_COMPANY_DESC'=>'Information & Contact details of your company',
 'LBL_SELECT_LOGO'=>'Select new logo :',




From vtigercrm-commits at vtiger.fosslabs.com  Sun Jun 25 08:09:53 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sun, 25 Jun 2006 12:09:53 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7500 -
	/vtigercrm/trunk/Smarty/templates/SetMenu.tpl
Message-ID: <20060625120953.3F0E583FBD2@vtiger.fosslabs.com>

Author: saraj
Date: Sun Jun 25 06:09:49 2006
New Revision: 7500

Log:
update setmenu file

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

Modified: vtigercrm/trunk/Smarty/templates/SetMenu.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/SetMenu.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/SetMenu.tpl Sun Jun 25 06:09:49 2006
@@ -76,7 +76,7 @@
 				{/if}
 
 				{if $smarty.request.action eq 'listwordtemplates' || $smarty.request.action eq 'add2db' || $smarty.request.action eq 'deletewordtemplate'}
-				<tr><td class="settingsTabSelected" nowrap>{$MOD.EMAILTEMPLATES}</td></tr>
+				<tr><td class="settingsTabSelected" nowrap>{$MOD.WORDINTEGRATION}</td></tr>
 				
 				{else}	
 				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=listwordtemplates&parenttab=Settings">{$MOD.WORDINTEGRATION}</a></td></tr>




From vtigercrm-commits at vtiger.fosslabs.com  Sun Jun 25 11:56:57 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sun, 25 Jun 2006 15:56:57 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7501 -
	/vtigercrm/trunk/include/js/dtlviewajax.js
Message-ID: <20060625155657.49C7183FC35@vtiger.fosslabs.com>

Author: richie
Date: Sun Jun 25 09:56:53 2006
New Revision: 7501

Log:
Ajax edit added for assigned to field

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

Modified: vtigercrm/trunk/include/js/dtlviewajax.js
==============================================================================
--- vtigercrm/trunk/include/js/dtlviewajax.js (original)
+++ vtigercrm/trunk/include/js/dtlviewajax.js Sun Jun 25 09:56:53 2006
@@ -31,7 +31,7 @@
 	  else		
 	  	getObj(globaltxtboxid).checked = false; 
   }
-  else		  
+  else if(globaluitype != '53')	  
 	  getObj(globaltxtboxid).value = globaltempvalue; 
   globaltempvalue = '';
   itsonview=false;
@@ -42,7 +42,6 @@
 {
       var mouseArea="";
       mouseArea="mouseArea_"+ fieldLabel;
-      
       if(itsonview)
       {
             return;
@@ -52,7 +51,19 @@
 	  globaluitype = uitype;
       globaldtlviewspanid= "dtlview_"+ fieldLabel;//valuespanid;
       globaleditareaspanid="editarea_"+ fieldLabel;//textareapanid;
-      globaltxtboxid="txtbox_"+ fieldLabel;//textboxpanid;
+	  globalfieldlabel = fieldLabel;
+	  if(globaluitype == 53)
+	  {
+		  var assign_type_U = document.DetailView.assigntype[0].checked;
+		  var assign_type_G = document.DetailView.assigntype[1].checked;
+		  if(assign_type_U == true)
+			  globaltxtboxid= 'txtbox_U'+fieldLabel;
+		  else if(assign_type_G == true)
+			  globaltxtboxid= 'txtbox_G'+fieldLabel;
+	  }else
+	  {
+      	  globaltxtboxid="txtbox_"+ fieldLabel;//textboxpanid;
+	  }
       divObj = getObj('crmspanid'); 
       crmy = findPosY(getObj(mouseArea));
       crmx = findPosX(getObj(mouseArea));
@@ -72,8 +83,11 @@
 {
      show(globaleditareaspanid) ;
      fnhide(globaldtlviewspanid);
-	 globaltempvalue = getObj(globaltxtboxid).value;
-     getObj(globaltxtboxid).focus();
+	 if(globaluitype != 53)
+	 {
+		 globaltempvalue = getObj(globaltxtboxid).value;
+     	 getObj(globaltxtboxid).focus();
+	 }
      fnhide('crmspanid');
      itsonview=true;
      return false;
@@ -91,7 +105,26 @@
 {
 	var dtlView = "dtlview_"+ fieldLabel;
 	var editArea = "editarea_"+ fieldLabel;
-	var txtBox= "txtbox_"+ fieldLabel;
+	var groupurl = "";
+	if(globaluitype == 53)
+	{
+		var assign_type_U = document.DetailView.assigntype[0].checked;
+		var assign_type_G = document.DetailView.assigntype[1].checked;
+		if(assign_type_U == true)
+		{
+			var txtBox= 'txtbox_U'+fieldLabel;
+		}
+		else if(assign_type_G == true)
+		{
+			var txtBox= 'txtbox_G'+fieldLabel;
+			var group_name = $(txtBox).options[$(txtBox).selectedIndex].text; 
+			var groupurl = "&assigned_group_name="+group_name+"&assigntype=T"
+		}
+
+	}else
+	{
+		var txtBox= "txtbox_"+ fieldLabel;
+	}
 	var popupTxt= "popuptxt_"+ fieldLabel;      
 	var hdTxt = "hdtxt_"+ fieldLabel;
 
@@ -130,7 +163,7 @@
 
 
 	var data = "file=DetailViewAjax&module=" + module + "&action=" + module + "Ajax&record=" + crmId+"&recordid=" + crmId ;
-	data = data + "&fldName=" + fieldName + "&fieldValue=" + escape(tagValue) + "&ajxaction=DETAILVIEW";
+	data = data + "&fldName=" + fieldName + "&fieldValue=" + escape(tagValue) + "&ajxaction=DETAILVIEW"+groupurl;
 	new Ajax.Request(
 		'index.php',
                 {queue: {position: 'end', scope: 'command'},
@@ -159,13 +192,18 @@
 	else if(uitype == '53')
 	{
 		var hdObj = getObj(hdTxt);
-			if(isAdmin == "0")
-			{
-				getObj(dtlView).innerHTML = hdObj.value;
-			}else if(isAdmin == "1")
-			{
-				getObj(dtlView).innerHTML = "<a href=\"index.php?module=Users&action=DetailView&record="+tagValue+"\">"+hdObj.value+"&nbsp;</a>";;
-			}
+		var assign_type_U = document.DetailView.assigntype[0].checked;
+		var assign_type_G = document.DetailView.assigntype[1].checked;
+		if(isAdmin == "0")
+		{
+			getObj(dtlView).innerHTML = hdObj.value;
+		}else if(isAdmin == "1" && assign_type_U == true)
+		{
+			getObj(dtlView).innerHTML = "<a href=\"index.php?module=Users&action=DetailView&record="+tagValue+"\">"+hdObj.value+"&nbsp;</a>";
+		}else if(isAdmin == "1" && assign_type_G == true)
+		{
+			getObj(dtlView).innerHTML = "<a href=\"index.php?module=Users&action=GroupDetailView&groupId="+tagValue+"\">"+hdObj.value+"&nbsp;</a>";
+		}
 	}
 	else if(uitype == '56')
 	{
@@ -267,8 +305,19 @@
 }
 function setSelectValue(fieldLabel)
 {
+	if(globaluitype == 53)
+	{
+		var assign_type_U = document.DetailView.assigntype[0].checked;
+        var assign_type_G = document.DetailView.assigntype[1].checked;
+		if(assign_type_U == true)
+			var selCombo= 'txtbox_U'+fieldLabel;
+		else if(assign_type_G == true)	
+			var selCombo= 'txtbox_G'+fieldLabel;
+	}else
+	{
+			var selCombo= 'txtbox_'+fieldLabel;
+	}
 	var hdTxtBox = 'hdtxt_'+fieldLabel;
-	var selCombo= 'txtbox_'+fieldLabel;
 	var oHdTxtBox = document.getElementById(hdTxtBox);
 	var oSelCombo = document.getElementById(selCombo);
 




From vtigercrm-commits at vtiger.fosslabs.com  Sun Jun 25 11:59:03 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sun, 25 Jun 2006 15:59:03 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7502 -
	/vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl
Message-ID: <20060625155903.37D7383FC35@vtiger.fosslabs.com>

Author: richie
Date: Sun Jun 25 09:58:59 2006
New Revision: 7502

Log:
Ajax edit added for assigned to field

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

Modified: vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl Sun Jun 25 09:58:59 2006
@@ -41,14 +41,7 @@
                     							   <select id="txtbox_{$label}" name="{$keyfldname}">
                     								{foreach item=arr from=$keyoptions}
                     									{foreach key=sel_value item=value from=$arr}
-												 <option value="{$sel_value}" {$value}>
-                                                {if $APP[$sel_value] neq ''}
-                                                        {$APP[$sel_value]}
-                                                {else}
-                                                        {$sel_value}
-                                                {/if}
-                                                </option>
-	
+                    										<option value="{$sel_value}" {$value}>{$sel_value}</option>
                     									{/foreach}
                     								{/foreach}
                     							   </select>
@@ -184,22 +177,48 @@
                     <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">
 				
                     &nbsp;<span id="dtlview_{$label}">
-                    {if $keyseclink eq ''}
+                    {if $keyoptions.0 eq 'User' && $keyadmin eq 1}
+                        <a href="{$keyseclink.0}">{$keyval}</a>         
+                    {elseif $keyoptions.0 eq 'Group' && $keyadmin eq 1}
+                        <a href="{$keyseclink.1}">{$keyval}</a>         
+					{else}	
                         {$keyval}
-                    {else}
-                        <a href="{$keyseclink}">{$keyval}</a>         
                     {/if}
 					&nbsp;
                     </span>
                     <div id="editarea_{$label}" style="display:none;">
                    	<input type="hidden" id="hdtxt_{$label}" value="{$keyval}"></input>
-                   	<select id="txtbox_{$label}" onchange="setSelectValue('{$label}')" name="{$keyfldname}">
-                    {foreach item=arr key=id from=$keyoptions}
+					{if $keyoptions.0 eq 'User'}
+						<input name="assigntype" id="assigntype" checked="checked" value="U" onclick="toggleAssignType(this.value),setSelectValue('{$label}');" type="radio">&nbsp;User
+						<input name="assigntype" id="assigntype" value="T" onclick="toggleAssignType(this.value),setSelectValue('{$label}');" type="radio">&nbsp;Group
+						<span id="assign_user" style="display: block;">
+					{else}
+						<input name="assigntype" id="assigntype" value="U" onclick="toggleAssignType(this.value),setSelectValue('{$label}');" type="radio">&nbsp;User
+						<input name="assigntype" checked="checked" id="assigntype" value="T" onclick="toggleAssignType(this.value),setSelectValue('{$label}');" type="radio">&nbsp;Group
+						<span id="assign_user" style="display: none;">
+					{/if}
+                   	<select id="txtbox_U{$label}" onchange="setSelectValue('{$label}')" name="{$keyfldname}">
+                    {foreach item=arr key=id from=$keyoptions.1}
                     	{foreach key=sel_value item=value from=$arr}
                        		 <option value="{$id}" {$value}>{$sel_value}</option>
                         {/foreach}
                     {/foreach}
                     </select>
+					</span>
+					{if $keyoptions.0 eq 'Group'}
+						<span id="assign_team" style="display: block;">
+					{else}
+						<span id="assign_team" style="display: none;">
+					{/if}
+                   	<select id="txtbox_G{$label}" onchange="setSelectValue('{$label}')" name="{$keyfldname}">
+                    {foreach item=arr key=id from=$keyoptions.2}
+                    	{foreach key=sel_value item=value from=$arr}
+                       		 <option value="{$id}" {$value}>{$sel_value}</option>
+                        {/foreach}
+                    {/foreach}
+                    </select>
+					</span>
+
                     <br>
                     <input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');"/> or
                     <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>




From vtigercrm-commits at vtiger.fosslabs.com  Sun Jun 25 11:59:13 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sun, 25 Jun 2006 15:59:13 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7503 -
	/vtigercrm/trunk/include/utils/DetailViewUtils.php
Message-ID: <20060625155913.4F9B483FC35@vtiger.fosslabs.com>

Author: richie
Date: Sun Jun 25 09:59:09 2006
New Revision: 7503

Log:
Ajax edit added for assigned to field

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 Sun Jun 25 09:59:09 2006
@@ -165,43 +165,31 @@
 	elseif($uitype == 53)
 	{
 		$user_id = $col_fields[$fieldname];
+		$user_name = getUserName($user_id);
+		$id = $col_fields["record_id"];	
+		$module = $col_fields["record_module"];
+		$group_info = getGroupName($id, $module);
+		$groupname = $group_info[0];
+		$groupid = $group_info[1];
 		if($user_id != 0)
-		{
+		{	
 			$label_fld[] =$mod_strings[$fieldlabel].' '.$app_strings['LBL_USER'];
-			$user_name = getUserName($user_id);
-			if(is_admin($current_user))
-			{
-				$label_fld[] =$user_name;
-        $label_fld["secid"] = $user_id;
-		    $label_fld["link"] = "index.php?module=Users&action=DetailView&record=".$user_id;
-			}
-			else
-			{
-				$label_fld[] =$user_name;
-			}
-		}
-		elseif($user_id == 0)
-		{
+			$label_fld[] =$user_name;
+			$label_fld ["options"][] = 'User';
+		}else
+		{
+			
 			$label_fld[] =$mod_strings[$fieldlabel].' '.$app_strings['LBL_GROUP'];
-
-			$id = $col_fields["record_id"];	
-			$module = $col_fields["record_module"];
-			$group_info = getGroupName($id, $module);
-			$groupname = $group_info[0];
-			$groupid = $group_info[1];
-			if(is_admin($current_user))
-      {
-				$label_fld[] =$groupname;
-        $label_fld["secid"] = $groupid;
-        $label_fld["link"] = "index.php?module=Users&action=GroupDetailView&groupId=".$groupid;
-        //$label_fld[] ='<a href="index.php?module=Users&action=GroupDetailView&groupId='.$groupid.'">'.$groupname.'</a>';
-			}
-			else
-			{
-				$label_fld[] =$groupname;
-			}			
-		}
-		
+			$label_fld[] =$groupname;
+			$label_fld ["options"][] = 'Group';
+		}
+		if(is_admin($current_user))
+		{
+			$label_fld["secid"][] = $user_id;
+			$label_fld["link"][] = "index.php?module=Users&action=DetailView&record=".$user_id;
+			$label_fld["secid"][] = $groupid;
+			$label_fld["link"][] = "index.php?module=Users&action=GroupDetailView&groupId=".$groupid;
+		}
 		//Security Checks
 		if($fieldlabel == 'Assigned To' && $is_admin==false && $profileGlobalPermission[2] == 1 && ($defaultOrgSharingPermission[getTabid($module_name)] == 3 or $defaultOrgSharingPermission[getTabid($module_name)] == 0))
 		{
@@ -246,7 +234,7 @@
 				$team_style='display:none';
 			}	
 		}
-		
+
 		if($fieldlabel == 'Assigned To' && $is_admin==false && $profileGlobalPermission[2] == 1 && ($defaultOrgSharingPermission[getTabid($module_name)] == 3 or $defaultOrgSharingPermission[getTabid($module_name)] == 0))
 		{
 			$users_combo = get_select_options_array(get_user_array(FALSE, "Active", $assigned_user_id,'private'), $assigned_user_id);
@@ -255,9 +243,6 @@
 		{
 			$users_combo = get_select_options_array(get_user_array(FALSE, "Active", $assigned_user_id), $assigned_user_id);
 		}
-	
-    if($noof_group_rows != 0)
-		{
 			do
 			{
 				$groupname=$nameArray["groupname"];
@@ -269,18 +254,10 @@
 				$group_option[] = array($groupname=>$selected);
 
 			}while($nameArray = $adb->fetch_array($result));
-      
-		}
-		
-		if($user_id == 0)
-		{
-      $label_fld ["options"] = $group_option; 
-    }else
-    {
-      $label_fld ["options"] = $users_combo;
-    }
-    //print_r($users_combo);
-		
+
+
+			$label_fld ["options"][] = $users_combo;
+			$label_fld ["options"][] = $group_option; 
 	}
 	elseif($uitype == 55)
         {




From vtiger-tickets at vtiger.fosslabs.com  Sun Jun 25 12:00:27 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sun, 25 Jun 2006 16:00:27 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231356=3A?=
	=?utf-8?q?_Ajax_edit_issue?=
In-Reply-To: <076.f02a9fbd23d12bad75eedc90afaf903d@vtiger.fosslabs.com>
References: <076.f02a9fbd23d12bad75eedc90afaf903d@vtiger.fosslabs.com>
Message-ID: <085.7964693946e7638cc8b3eda157b92888@vtiger.fosslabs.com>

#1356: Ajax edit issue
---------------------------+------------------------------------------------
  Reporter:  jerrydgeorge  |       Owner:  jerrydgeorge
      Type:  defect        |      Status:  closed      
  Priority:  critical      |   Milestone:              
 Component:  vtigercrm     |     Version:  5.0.0       
Resolution:  fixed         |    Keywords:              
---------------------------+------------------------------------------------
Changes (by jerrydgeorge):

  * resolution:  => fixed
  * version:  5.0.1 => 5.0.0
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1356>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Sun Jun 25 12:00:38 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sun, 25 Jun 2006 16:00:38 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231008=3A?=
 =?utf-8?q?_assigned_to_group_is_not_coming_properly_in_ajax_edit?=
In-Reply-To: <076.6de5891dfeb7d1d2214d1225f8d87438@vtiger.fosslabs.com>
References: <076.6de5891dfeb7d1d2214d1225f8d87438@vtiger.fosslabs.com>
Message-ID: <085.7d0c5196d1461dc8da0f18c438050dd7@vtiger.fosslabs.com>

#1008: assigned to group is not coming properly in ajax edit
------------------------+---------------------------------------------------
  Reporter:  mangai     |       Owner:  jeri  
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:  5.0.0 
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by jerrydgeorge):

  * resolution:  => fixed
  * version:  5.0.1 => 5.0.0
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1008>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Sun Jun 25 12:02:26 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sun, 25 Jun 2006 16:02:26 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23968=3A_?=
 =?utf-8?q?Quick_Edit_of_Assigned_Group_not_functional?=
In-Reply-To: <076.66451d79109fe79c040c7aba7d66b2ee@vtiger.fosslabs.com>
References: <076.66451d79109fe79c040c7aba7d66b2ee@vtiger.fosslabs.com>
Message-ID: <085.e74ba670c04c276b4135f7b803d79c39@vtiger.fosslabs.com>

#968: Quick Edit of Assigned Group not functional
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  Richie
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by jerrydgeorge):

  * resolution:  => fixed
  * version:  5.0.1 => 5.0.0
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/968>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 26 01:39:18 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 26 Jun 2006 05:39:18 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231310=3A?=
 =?utf-8?q?_Translation_for_=22my_preference=22_=26_home_page?=
In-Reply-To: <076.a6a7ecaca440fce3cdf9dde7ec76ec0a@vtiger.fosslabs.com>
References: <076.a6a7ecaca440fce3cdf9dde7ec76ec0a@vtiger.fosslabs.com>
Message-ID: <085.3cfde6d83171073bd01441452dafabe5@vtiger.fosslabs.com>

#1310: Translation for "my preference" & home page
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  ahmed                                
      Type:  defect     |      Status:  closed                               
  Priority:  minor      |   Milestone:                                       
 Component:  vtigercrm  |     Version:  5.0.0                                
Resolution:  fixed      |    Keywords:  translation, homepage, my preferences
------------------------+---------------------------------------------------
Changes (by ahmed):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 Issue fixed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1310>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 26 01:40:01 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 26 Jun 2006 05:40:01 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231237=3A?=
 =?utf-8?q?_Usage_of_todos=2C_to-do=2C_To_Do?=
In-Reply-To: <076.cd52e3648a156e2549605fdddbbfdc7b@vtiger.fosslabs.com>
References: <076.cd52e3648a156e2549605fdddbbfdc7b@vtiger.fosslabs.com>
Message-ID: <085.6b305841770fc56a541dc6f694842179@vtiger.fosslabs.com>

#1237: Usage of todos, to-do, To Do
------------------------+---------------------------------------------------
  Reporter:  gopal      |       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 - Todos made consistent across the calendar module

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1237>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 01:42:33 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 05:42:33 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7504 -
	/vtigercrm/trunk/include/utils/CommonUtils.php
Message-ID: <20060626054233.F076583FC85@vtiger.fosslabs.com>

Author: richie
Date: Sun Jun 25 23:42:29 2006
New Revision: 7504

Log:
groupid added in get_group_options function

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 Jun 25 23:42:29 2006
@@ -265,7 +265,7 @@
 	global $log;
 	$log->debug("Entering get_group_options() method ...");
 	global $adb,$noof_group_rows;;
-	$sql = "select groupname from vtiger_groups";
+	$sql = "select groupname,groupid from vtiger_groups";
 	$result = $adb->query($sql);
 	$noof_group_rows=$adb->num_rows($result);
 	$log->debug("Exiting get_group_options method ...");




From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 01:42:58 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 05:42:58 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7505 -
	/vtigercrm/trunk/include/utils/UserInfoUtil.php
Message-ID: <20060626054258.C54C083FC95@vtiger.fosslabs.com>

Author: richie
Date: Sun Jun 25 23:42:54 2006
New Revision: 7505

Log:
groupid added in get_current_user_access_groups function 

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 Sun Jun 25 23:42:54 2006
@@ -4433,7 +4433,7 @@
 	global $adb,$noof_group_rows;
 	$current_user_group_list=getCurrentUserGroupList();
 	$sharing_write_group_list=getWriteSharingGroupsList($module);
-	$query ="select groupname from vtiger_groups";
+	$query ="select groupname,groupid from vtiger_groups";
 	if($current_user_group_list != '' && $sharing_write_group_list != '')
 	{
 		$query .= " where (groupid in".$current_user_group_list." or groupid in".$sharing_write_group_list.")";




From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 26 01:46:01 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 26 Jun 2006 05:46:01 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231306=3A?=
 =?utf-8?q?_Missing_fields_in_detailview_for_other_langs?=
In-Reply-To: <076.9fc5d3aab2b86e9e74117e8341c6ee53@vtiger.fosslabs.com>
References: <076.9fc5d3aab2b86e9e74117e8341c6ee53@vtiger.fosslabs.com>
Message-ID: <085.0fa29f8e5d65d56e5672c4f60a8dec10@vtiger.fosslabs.com>

#1306: Missing fields in detailview for other langs
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  ahmed                 
      Type:  defect     |      Status:  new                   
  Priority:  minor      |   Milestone:                        
 Component:  vtigercrm  |     Version:  5.0.0                 
Resolution:             |    Keywords:  detailview, tranlation
------------------------+---------------------------------------------------
Comment (by ahmed):

 It is working fine in our setup, as the texts of detail view are all
 coming from the language file.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1306>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 01:49:43 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 05:49:43 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7506 - in /vtigercrm/trunk:
 Smarty/templates/DetailViewUI.tpl include/js/dtlviewajax.js
 include/utils/DetailViewUtils.php
Message-ID: <20060626054944.2DA0A83FC95@vtiger.fosslabs.com>

Author: richie
Date: Sun Jun 25 23:49:37 2006
New Revision: 7506

Log:
issue in ajax edit for assigned user

Modified:
    vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl
    vtigercrm/trunk/include/js/dtlviewajax.js
    vtigercrm/trunk/include/utils/DetailViewUtils.php

Modified: vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl Sun Jun 25 23:49:37 2006
@@ -190,7 +190,9 @@
                    	<input type="hidden" id="hdtxt_{$label}" value="{$keyval}"></input>
 					{if $keyoptions.0 eq 'User'}
 						<input name="assigntype" id="assigntype" checked="checked" value="U" onclick="toggleAssignType(this.value),setSelectValue('{$label}');" type="radio">&nbsp;User
-						<input name="assigntype" id="assigntype" value="T" onclick="toggleAssignType(this.value),setSelectValue('{$label}');" type="radio">&nbsp;Group
+						{if $keyoptions.2 neq ''}
+							<input name="assigntype" id="assigntype" value="T" onclick="toggleAssignType(this.value),setSelectValue('{$label}');" type="radio">&nbsp;Group
+						{/if}
 						<span id="assign_user" style="display: block;">
 					{else}
 						<input name="assigntype" id="assigntype" value="U" onclick="toggleAssignType(this.value),setSelectValue('{$label}');" type="radio">&nbsp;User

Modified: vtigercrm/trunk/include/js/dtlviewajax.js
==============================================================================
--- vtigercrm/trunk/include/js/dtlviewajax.js (original)
+++ vtigercrm/trunk/include/js/dtlviewajax.js Sun Jun 25 23:49:37 2006
@@ -54,12 +54,18 @@
 	  globalfieldlabel = fieldLabel;
 	  if(globaluitype == 53)
 	  {
-		  var assign_type_U = document.DetailView.assigntype[0].checked;
-		  var assign_type_G = document.DetailView.assigntype[1].checked;
-		  if(assign_type_U == true)
+		  if(typeof(document.DetailView.assigntype[0]) != 'undefined')
+		  {
+			  var assign_type_U = document.DetailView.assigntype[0].checked;
+			  var assign_type_G = document.DetailView.assigntype[1].checked;
+			  if(assign_type_U == true)
+				  globaltxtboxid= 'txtbox_U'+fieldLabel;
+			  else if(assign_type_G == true)
+				  globaltxtboxid= 'txtbox_G'+fieldLabel;
+		  }else
+		  {
 			  globaltxtboxid= 'txtbox_U'+fieldLabel;
-		  else if(assign_type_G == true)
-			  globaltxtboxid= 'txtbox_G'+fieldLabel;
+		  }
 	  }else
 	  {
       	  globaltxtboxid="txtbox_"+ fieldLabel;//textboxpanid;
@@ -108,8 +114,14 @@
 	var groupurl = "";
 	if(globaluitype == 53)
 	{
-		var assign_type_U = document.DetailView.assigntype[0].checked;
-		var assign_type_G = document.DetailView.assigntype[1].checked;
+		if(typeof(document.DetailView.assigntype[0]) != 'undefined')
+		{
+			var assign_type_U = document.DetailView.assigntype[0].checked;
+			var assign_type_G = document.DetailView.assigntype[1].checked;
+		}else
+		{
+			var assign_type_U = document.DetailView.assigntype.checked;
+		}
 		if(assign_type_U == true)
 		{
 			var txtBox= 'txtbox_U'+fieldLabel;
@@ -192,8 +204,14 @@
 	else if(uitype == '53')
 	{
 		var hdObj = getObj(hdTxt);
-		var assign_type_U = document.DetailView.assigntype[0].checked;
-		var assign_type_G = document.DetailView.assigntype[1].checked;
+		if(typeof(document.DetailView.assigntype[0]) != 'undefined')
+        {
+			var assign_type_U = document.DetailView.assigntype[0].checked;
+			var assign_type_G = document.DetailView.assigntype[1].checked;
+		}else
+		{
+			var assign_type_U = document.DetailView.assigntype.checked;
+		}
 		if(isAdmin == "0")
 		{
 			getObj(dtlView).innerHTML = hdObj.value;
@@ -307,12 +325,18 @@
 {
 	if(globaluitype == 53)
 	{
-		var assign_type_U = document.DetailView.assigntype[0].checked;
-        var assign_type_G = document.DetailView.assigntype[1].checked;
-		if(assign_type_U == true)
+		if(typeof(document.DetailView.assigntype[0]) != 'undefined')
+		{
+			var assign_type_U = document.DetailView.assigntype[0].checked;
+			var assign_type_G = document.DetailView.assigntype[1].checked;
+			if(assign_type_U == true)
+				var selCombo= 'txtbox_U'+fieldLabel;
+			else if(assign_type_G == true)	
+				var selCombo= 'txtbox_G'+fieldLabel;
+		}else
+		{
 			var selCombo= 'txtbox_U'+fieldLabel;
-		else if(assign_type_G == true)	
-			var selCombo= 'txtbox_G'+fieldLabel;
+		}
 	}else
 	{
 			var selCombo= 'txtbox_'+fieldLabel;

Modified: vtigercrm/trunk/include/utils/DetailViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/DetailViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/DetailViewUtils.php Sun Jun 25 23:49:37 2006
@@ -243,21 +243,21 @@
 		{
 			$users_combo = get_select_options_array(get_user_array(FALSE, "Active", $assigned_user_id), $assigned_user_id);
 		}
-			do
-			{
+			do{
 				$groupname=$nameArray["groupname"];
+				$group_id=$nameArray["groupid"];
 				$selected = '';	
 				if($groupname == $selected_groupname[0])
 				{
 					$selected = "selected";
 				}	
-				$group_option[] = array($groupname=>$selected);
-
+				if($groupname != '')
+					$group_option[$group_id] = array($groupname=>$selected);
 			}while($nameArray = $adb->fetch_array($result));
-
-
+			
 			$label_fld ["options"][] = $users_combo;
-			$label_fld ["options"][] = $group_option; 
+			if(count($group_option) >0)
+				$label_fld ["options"][] = $group_option; 
 	}
 	elseif($uitype == 55)
         {




From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 26 02:27:32 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 26 Jun 2006 06:27:32 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231240=3A?=
 =?utf-8?q?_Office_Plugin_-_Change_Splash_screen?=
In-Reply-To: <076.25c934e0f37ff93790a99a1672638afb@vtiger.fosslabs.com>
References: <076.25c934e0f37ff93790a99a1672638afb@vtiger.fosslabs.com>
Message-ID: <085.7fb59119c19e422e926f51f48b630580@vtiger.fosslabs.com>

#1240: Office Plugin - Change Splash screen
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  ela  
      Type:  defect     |      Status:  new  
  Priority:  major      |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by jerrydgeorge):

  * owner:  jerrydgeorge => ela

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1240>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 26 02:36:16 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 26 Jun 2006 06:36:16 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231329=3A?=
	=?utf-8?q?_List_custom_view?=
In-Reply-To: <076.5bc833f86fff73d192c1a72d505bd83a@vtiger.fosslabs.com>
References: <076.5bc833f86fff73d192c1a72d505bd83a@vtiger.fosslabs.com>
Message-ID: <085.2fe98fe0898f7c1d53a933f7bc80d8ef@vtiger.fosslabs.com>

#1329: List custom view
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  jerrydgeorge
      Type:  defect     |      Status:  new         
  Priority:  critical   |   Milestone:              
 Component:  vtigercrm  |     Version:  5.0.0       
Resolution:             |    Keywords:              
------------------------+---------------------------------------------------
Changes (by jerrydgeorge):

  * owner:  developer => jerrydgeorge

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1329>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 26 02:37:00 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 26 Jun 2006 06:37:00 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231340=3A?=
 =?utf-8?q?_Firefox_extension=3A_Uninstall_not_working?=
In-Reply-To: <076.9c4f4fefce1fedb98255e8bbe4dd1210@vtiger.fosslabs.com>
References: <076.9c4f4fefce1fedb98255e8bbe4dd1210@vtiger.fosslabs.com>
Message-ID: <085.c7ca4dde0dec50a031c143b19127f7e6@vtiger.fosslabs.com>

#1340: Firefox extension: Uninstall not working
----------------------------+-----------------------------------------------
  Reporter:  gopal          |       Owner:  jerrydgeorge
      Type:  defect         |      Status:  new         
  Priority:  critical       |   Milestone:              
 Component:  vtigertoolbar  |     Version:  5.0.0       
Resolution:                 |    Keywords:              
----------------------------+-----------------------------------------------
Changes (by jerrydgeorge):

  * owner:  developer => jerrydgeorge

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1340>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 26 02:37:13 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 26 Jun 2006 06:37:13 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231364=3A?=
 =?utf-8?q?_Non_admin_user_can_jump_to_user_settings_by_point_to_url?=
In-Reply-To: <076.ff7d1fb05c8daa4389a7c4cc4877a33d@vtiger.fosslabs.com>
References: <076.ff7d1fb05c8daa4389a7c4cc4877a33d@vtiger.fosslabs.com>
Message-ID: <085.020f2e5d7a86826ee7438e6903663573@vtiger.fosslabs.com>

#1364: Non admin user can jump to user settings by point to url
-----------------------------------------------+----------------------------
  Reporter:  Brian Laughlin <brian at awnow.com>  |       Owner:  don     
      Type:  defect                            |      Status:  new     
  Priority:  critical                          |   Milestone:  5.0.0   
 Component:  vtigercrm                         |     Version:  5.0.0   
Resolution:                                    |    Keywords:  security
-----------------------------------------------+----------------------------
Changes (by jerrydgeorge):

  * owner:  developer => don

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1364>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 26 02:38:20 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 26 Jun 2006 06:38:20 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231326=3A?=
 =?utf-8?q?_Auto_Tax_and_quote_workflow_improvement?=
In-Reply-To: <076.151dc33d86c777ebfd974d4b1529c9ea@vtiger.fosslabs.com>
References: <076.151dc33d86c777ebfd974d4b1529c9ea@vtiger.fosslabs.com>
Message-ID: <085.be6f0c4d3a63446380dbf00497833589@vtiger.fosslabs.com>

#1326: Auto Tax and quote workflow improvement
------------------------+---------------------------------------------------
  Reporter:  mvhman     |       Owner:  mickie                  
      Type:  defect     |      Status:  new                     
  Priority:  major      |   Milestone:  5.0.0                   
 Component:  vtigercrm  |     Version:  5.0.0                   
Resolution:             |    Keywords:  auto tax improved quotes
------------------------+---------------------------------------------------
Changes (by jerrydgeorge):

  * owner:  developer => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1326>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 26 02:38:26 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 26 Jun 2006 06:38:26 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231328=3A?=
 =?utf-8?q?_Custom_picklist_sort_order?=
In-Reply-To: <076.4247da71e86ed63e936e2988bd008654@vtiger.fosslabs.com>
References: <076.4247da71e86ed63e936e2988bd008654@vtiger.fosslabs.com>
Message-ID: <085.e6c8fad7d85f5803b6168f231394472b@vtiger.fosslabs.com>

#1328: Custom picklist sort order
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  jerrydgeorge    
      Type:  defect     |      Status:  new             
  Priority:  major      |   Milestone:                  
 Component:  vtigercrm  |     Version:  5.0.0           
Resolution:             |    Keywords:  picklist, custom
------------------------+---------------------------------------------------
Changes (by jerrydgeorge):

  * owner:  developer => jerrydgeorge

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1328>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 26 02:38:51 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 26 Jun 2006 06:38:51 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231339=3A?=
 =?utf-8?q?_Missing_translation_for_search_results?=
In-Reply-To: <076.612780845c117cf5a7ac9d62d25b957d@vtiger.fosslabs.com>
References: <076.612780845c117cf5a7ac9d62d25b957d@vtiger.fosslabs.com>
Message-ID: <085.ba8f6e596abb3e576c2eccd27c87caf2@vtiger.fosslabs.com>

#1339: Missing translation for search results
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  ahmed
      Type:  defect     |      Status:  new  
  Priority:  major      |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by jerrydgeorge):

  * owner:  developer => ahmed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1339>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 26 02:39:25 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 26 Jun 2006 06:39:25 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231345=3A?=
 =?utf-8?q?_Error_saving_the_sales_order?=
In-Reply-To: <076.2d41a315f9cfd034311ac755935afb51@vtiger.fosslabs.com>
References: <076.2d41a315f9cfd034311ac755935afb51@vtiger.fosslabs.com>
Message-ID: <085.b1639d6f3be53174703bbab95552021f@vtiger.fosslabs.com>

#1345: Error saving the sales order
------------------------+---------------------------------------------------
  Reporter:  Simon      |       Owner:  mickie             
      Type:  defect     |      Status:  new                
  Priority:  major      |   Milestone:  5.0.0              
 Component:  vtigercrm  |     Version:  5.0.0              
Resolution:             |    Keywords:  quotes, sales order
------------------------+---------------------------------------------------
Changes (by jerrydgeorge):

  * owner:  developer => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1345>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 26 02:39:51 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 26 Jun 2006 06:39:51 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231355=3A?=
 =?utf-8?q?_Pricebook_value_is_readonly?=
In-Reply-To: <076.88e9291262713bf51b842aecd697a80a@vtiger.fosslabs.com>
References: <076.88e9291262713bf51b842aecd697a80a@vtiger.fosslabs.com>
Message-ID: <085.9d63308fffcf8910b506fc43b1146715@vtiger.fosslabs.com>

#1355: Pricebook value is readonly
-----------------------------------+----------------------------------------
  Reporter:  cristian at nethesis.it  |       Owner:  mickie
      Type:  defect                |      Status:  new   
  Priority:  major                 |   Milestone:        
 Component:  vtigercrm             |     Version:  5.0.0 
Resolution:                        |    Keywords:        
-----------------------------------+----------------------------------------
Changes (by jerrydgeorge):

  * owner:  developer => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1355>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 26 02:39:59 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 26 Jun 2006 06:39:59 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231365=3A?=
	=?utf-8?q?_i18n_issue_at_tickets?=
In-Reply-To: <076.d396dbfd58922ae6f8f333a2a453043b@vtiger.fosslabs.com>
References: <076.d396dbfd58922ae6f8f333a2a453043b@vtiger.fosslabs.com>
Message-ID: <085.fe4da539a58643857d2ef13261bcd7c4@vtiger.fosslabs.com>

#1365: i18n issue at tickets
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  mickie
      Type:  defect     |      Status:  new   
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by jerrydgeorge):

  * owner:  developer => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1365>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 26 02:40:08 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 26 Jun 2006 06:40:08 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231334=3A?=
	=?utf-8?q?_Calendar_translation?=
In-Reply-To: <076.9648d4b16d7e7ade09293afbcbfcb43e@vtiger.fosslabs.com>
References: <076.9648d4b16d7e7ade09293afbcbfcb43e@vtiger.fosslabs.com>
Message-ID: <085.b3dc308dfef0cb9be618d5308f66aa7d@vtiger.fosslabs.com>

#1334: Calendar translation
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  ahmed                
      Type:  defect     |      Status:  new                  
  Priority:  minor      |   Milestone:                       
 Component:  vtigercrm  |     Version:  5.0.0                
Resolution:             |    Keywords:  calendar, translation
------------------------+---------------------------------------------------
Changes (by jerrydgeorge):

  * owner:  developer => ahmed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1334>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 26 02:40:16 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 26 Jun 2006 06:40:16 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231365=3A?=
	=?utf-8?q?_i18n_issue_at_tickets?=
In-Reply-To: <076.d396dbfd58922ae6f8f333a2a453043b@vtiger.fosslabs.com>
References: <076.d396dbfd58922ae6f8f333a2a453043b@vtiger.fosslabs.com>
Message-ID: <085.4b28027bee7ab7a2816aed494d024c30@vtiger.fosslabs.com>

#1365: i18n issue at tickets
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  ahmed
      Type:  defect     |      Status:  new  
  Priority:  major      |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by jerrydgeorge):

  * owner:  mickie => ahmed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1365>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 03:12:50 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 07:12:50 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7507 -
	/vtigercrm/trunk/getCompanyProfile.php
Message-ID: <20060626071250.1E76B83FCC1@vtiger.fosslabs.com>

Author: richie
Date: Mon Jun 26 01:12:46 2006
New Revision: 7507

Log:
test checkin

Modified:
    vtigercrm/trunk/getCompanyProfile.php

Modified: vtigercrm/trunk/getCompanyProfile.php
==============================================================================
--- vtigercrm/trunk/getCompanyProfile.php (original)
+++ vtigercrm/trunk/getCompanyProfile.php Mon Jun 26 01:12:46 2006
@@ -18,6 +18,7 @@
  */
 function getComdata($url,$variable="")
 {
+
 	$h = new http();
 	$desc = array();
 	$h->dir = "class_http_dir/";




From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 03:17:51 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 07:17:51 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7508 -
	/vtigercrm/trunk/modules/Contacts/chat.php
Message-ID: <20060626071751.21EA283FCC1@vtiger.fosslabs.com>

Author: richie
Date: Mon Jun 26 01:17:47 2006
New Revision: 7508

Log:
Issue in chat has been fixed,#Fixes 549

Modified:
    vtigercrm/trunk/modules/Contacts/chat.php

Modified: vtigercrm/trunk/modules/Contacts/chat.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/chat.php (original)
+++ vtigercrm/trunk/modules/Contacts/chat.php Mon Jun 26 01:17:47 2006
@@ -354,7 +354,7 @@
     if($to != 0)
       $chat .= "v";
     
-      $res = $adb->query("INSERT INTO chat_".$chat."chat (msg) VALUES (".$id.")");
+      $res = $adb->query("INSERT INTO vtiger_chat_".$chat."chat (msg) VALUES (".$id.")");
   }
 
   /**




From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 26 03:18:11 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 26 Jun 2006 07:18:11 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=23549=3A_?=
	=?utf-8?q?issue_in_chat?=
In-Reply-To: <076.d715dbdac6967364026532cc12048b17@vtiger.fosslabs.com>
References: <076.d715dbdac6967364026532cc12048b17@vtiger.fosslabs.com>
Message-ID: <085.b82a0d01c04717bdf97d1fe7d5dd219c@vtiger.fosslabs.com>

#549: issue in chat
---------------------------+------------------------------------------------
  Reporter:  jerrydgeorge  |       Owner:  jerrydgeorge
      Type:  defect        |      Status:  closed      
  Priority:  major         |   Milestone:              
 Component:  vtigercrm     |     Version:  5.0.0       
Resolution:  fixed         |    Keywords:  Chat        
---------------------------+------------------------------------------------
Changes (by jerrydgeorge):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/549>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 26 03:18:45 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 26 Jun 2006 07:18:45 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231340=3A?=
 =?utf-8?q?_Firefox_extension=3A_Uninstall_not_working?=
In-Reply-To: <076.9c4f4fefce1fedb98255e8bbe4dd1210@vtiger.fosslabs.com>
References: <076.9c4f4fefce1fedb98255e8bbe4dd1210@vtiger.fosslabs.com>
Message-ID: <085.19441313515d6fdb0cde69242379b300@vtiger.fosslabs.com>

#1340: Firefox extension: Uninstall not working
----------------------------+-----------------------------------------------
  Reporter:  gopal          |       Owner:  minnie
      Type:  defect         |      Status:  new   
  Priority:  critical       |   Milestone:        
 Component:  vtigertoolbar  |     Version:  5.0.0 
Resolution:                 |    Keywords:        
----------------------------+-----------------------------------------------
Changes (by jerrydgeorge):

  * owner:  jerrydgeorge => minnie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1340>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 03:26:17 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 07:26:17 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7509 -
	/vtigercrm/trunk/include/language/en_us.lang.php
Message-ID: <20060626072617.A2B6D83FCC4@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 26 01:26:13 2006
New Revision: 7509

Log:
lang file updated

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

Modified: vtigercrm/trunk/include/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/include/language/en_us.lang.php (original)
+++ vtigercrm/trunk/include/language/en_us.lang.php Mon Jun 26 01:26:13 2006
@@ -67,6 +67,8 @@
 'NTC_WELCOME'=>'Welcome',
 
 'NTC_NO_ITEMS_DISPLAY'=>'none',
+
+'LBL_OR'=>'or',
 
 'LBL_ALT_HOT_KEY'=>'Alt+',
 //added for 4.2




From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 03:33:37 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 07:33:37 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7510 -
	/vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl
Message-ID: <20060626073337.3C16583FCC8@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 26 01:33:33 2006
New Revision: 7510

Log:
i18n issues for quick edit of all modules fixed - ahmed.

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

Modified: vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl Mon Jun 26 01:33:33 2006
@@ -23,7 +23,7 @@
                                                        &nbsp;&nbsp;<span id="dtlview_{$label}">{$keyval}</span>
                                               		<div id="editarea_{$label}" style="display:none;">
                                               		  <input class="detailedViewTextBox" onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" type="text" id="txtbox_{$label}" name="{$keyfldname}" maxlength='100' value="{$keyval}"></input>
-                                              		  <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                              		  <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
                                               		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                                                        </div>
                                                   </td>
@@ -31,7 +31,7 @@
                                                   <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}"><a href="mailto:{$keyval}" target="_blank">{$keyval}</a></span>
                                               		<div id="editarea_{$label}" style="display:none;">
                                               		  <input class="detailedViewTextBox" onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" type="text" id="txtbox_{$label}" name="{$keyfldname}" maxlength='100' value="{$keyval}"></input>
-                                              		  <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                              		  <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
                                               		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                                                        </div>
                                                   </td>
@@ -45,7 +45,7 @@
                     									{/foreach}
                     								{/foreach}
                     							   </select>
-                    							   <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                    							   <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
                                               		   <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                     							</div>
                							</td>
@@ -60,7 +60,7 @@
                     									{/foreach}
                     								{/foreach}
                     							   </select>
-                    							   <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                    							   <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
                                               		   <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                     							</div>
 								{else}
@@ -79,7 +79,7 @@
 									{/foreach}
 									{/foreach}
                     							   </select>
-                    							   <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                    							   <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
                                               		   <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                     							</div>
 								{else}
@@ -92,7 +92,7 @@
                                                   <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}"><a href="http://{$keyval}" target="_blank">{$keyval}</a></span>
                                               		<div id="editarea_{$label}" style="display:none;">
                                               		  <input class="detailedViewTextBox" onFocus="this.className='detailedViewTextBoxOn'" onBlur="this.className='detailedViewTextBox'" type="text" id="txtbox_{$label}" name="{$keyfldname}" maxlength='100' value="{$keyval}"></input>
-                                              		  <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                              		  <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
                                               		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                                                        </div>
                                                   </td>
@@ -100,7 +100,7 @@
                                                   <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}">{$keyval}</span>
                                               		<div id="editarea_{$label}" style="display:none;">
                                               		  <textarea id="txtbox_{$label}" name="{$keyfldname}"  class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'"onBlur="this.className='detailedViewTextBox'" cols="90" rows="8">{$keyval}</textarea>                                            		  
-                                              		  <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                              		  <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
                                               		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                                                        </div>
                                                   </td>
@@ -108,7 +108,7 @@
                                                   <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}">{$keyval}</span>
                                               		<div id="editarea_{$label}" style="display:none;">
                                               		  <textarea id="txtbox_{$label}" name="{$keyfldname}"  class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'"onBlur="this.className='detailedViewTextBox'" rows=2>{$keyval}</textarea>                                            		  
-                                              		  <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                              		  <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
                                               		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                                                        </div>
                                                   </td>
@@ -117,7 +117,7 @@
                                               		<div id="editarea_{$label}" style="display:none;">                                              		  
                                                          <input readonly id="popuptxt_{$label}" name="account_name" type="text" value="{$keyval}"><input id="txtbox_{$label}" name="{$keyfldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Accounts&action=Popup&popuptype=specific&form=TasksEditView&form_submit=false","test","width=600,height=400,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'>
                                                          <!--AccountPopup/WithClear-->{if $keyid eq '51'} &nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.account_id.value=''; this.form.account_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>{/if} 
-                                              		  <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                              		  <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
                                               		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                                                        </div>
                                                   </td>
@@ -125,7 +125,7 @@
                                                   <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}"><a href="{$keyseclink}">{$keyval}</a></span>
                                               		<div id="editarea_{$label}" style="display:none;">                                              		  
                                                          <input id="popuptxt_{$label}" name="contact_name" readonly type="text" style="border:1px solid #bababa;" value="{$keyval}"><input id="txtbox_{$label}" name="{$keyfldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Contacts&action=Popup&html=Popup_picker&popuptype=specific&form=EditView","test","width=600,height=400,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.contact_id.value=''; this.form.contact_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
-                                                         <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                                         <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
                                               		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                                                        </div>
                                                   </td>                                                  
@@ -133,7 +133,7 @@
                                                   <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}"><a href="{$keyseclink}">{$keyval}</a></span>
                                               		<div id="editarea_{$label}" style="display:none;">                                              		  
                                                          <input id="popuptxt_{$label}" name="product_name" readonly type="text" value="{$keyval}"><input id="txtbox_{$label}" name="{$keyfldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Products&action=Popup&html=Popup_picker&form=HelpDeskEditView&popuptype=specific","test","width=600,height=400,resizable=1,scrollbars=1,top=150,left=200");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.product_id.value=''; this.form.product_name.value=''; return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
-                                                         <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                                         <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
                                               		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                                                        </div>
                                                   </td>
@@ -142,7 +142,7 @@
                                               		<div id="editarea_{$label}" style="display:none;">
                                                          <input id="popuptxt_{$label}" name="vendor_name" readonly type="text" style="border:1px solid #bababa;" value="{$keyval}"><input id="txtbox_{$label}" name="{$fldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Vendors&action=Popup&html=Popup_picker&popuptype=specific&form=EditView","test","width=600,height=400,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'>
                                                          {if $uitype eq 75}&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.vendor_id.value='';this.form.vendor_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>{/if}                                              		  
-                                                         <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                                         <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
                                               		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                                                        </div>
                                                   </td>
@@ -150,7 +150,7 @@
                                                   <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}"><a href="{$keyseclink}">{$keyval}</a></span>
                                               		<div id="editarea_{$label}" style="display:none;">                                              		  
                                                          <input id="popuptxt_{$label}" name="potential_name" readonly type="text" style="border:1px solid #bababa;" value="{$keyval}"><input id="txtbox_{$label}" name="{$keyfldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Potentials&action=Popup&html=Popup_picker&popuptype=specific_potential_account_address&form=EditView","test","width=600,height=400,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.potential_id.value=''; this.form.potential_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
-                                                         <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                                         <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
                                               		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                                                        </div>
                                                   </td>
@@ -158,7 +158,7 @@
                                                   <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}"><a href="{$keyseclink}">{$keyval}</a></span>
                                               		<div id="editarea_{$label}" style="display:none;">                                              		  
                                                          <input id="popuptxt_{$label}" name="quote_name" readonly type="text" style="border:1px solid #bababa;" value="{$keyval}"><input id="txtbox_{$label}" name="{$keyfldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=Quotes&action=Popup&html=Popup_picker&popuptype=specific&form=EditView","test","width=600,height=400,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.quote_id.value=''; this.form.quote_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
-                                                         <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                                         <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
                                               		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                                                        </div>
                                                   </td>
@@ -169,7 +169,7 @@
                                                   <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}"><a href="{$keyseclink}">{$keyval}</a></span>
                                               		<div id="editarea_{$label}" style="display:none;">                                              		  
                                                          <input id="popuptxt_{$label}" name="salesorder_name" readonly type="text" style="border:1px solid #bababa;" value="{$keyval}"><input id="txtbox_{$label}" name="{$keyfldname}" type="hidden" value="{$keysecid}">&nbsp;<img src="{$IMAGE_PATH}select.gif" alt="Select" title="Select" LANGUAGE=javascript onclick='return window.open("index.php?module=SalesOrder&action=Popup&html=Popup_picker&popuptype=specific&form=EditView","test","width=600,height=400,resizable=1,scrollbars=1");' align="absmiddle" style='cursor:hand;cursor:pointer'>&nbsp;<input type="image" src="{$IMAGE_PATH}clear_field.gif" alt="Clear" title="Clear" LANGUAGE=javascript onClick="this.form.salesorder_id.value=''; this.form.salesorder_name.value='';return false;" align="absmiddle" style='cursor:hand;cursor:pointer'>
-                                                         <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> or
+                                                         <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');fnhide('crmspanid');"/> {$APP.LBL_OR}
                                               		  <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                                                        </div>
                                                   </td>
@@ -189,14 +189,14 @@
                     <div id="editarea_{$label}" style="display:none;">
                    	<input type="hidden" id="hdtxt_{$label}" value="{$keyval}"></input>
 					{if $keyoptions.0 eq 'User'}
-						<input name="assigntype" id="assigntype" checked="checked" value="U" onclick="toggleAssignType(this.value),setSelectValue('{$label}');" type="radio">&nbsp;User
+						<input name="aSsigntype" id="assigntype" checked="checked" value="U" onclick="toggleAssignType(this.value),setSelectValue('{$label}');" type="radio">&nbsp;{$APP.LBL_USER}
 						{if $keyoptions.2 neq ''}
-							<input name="assigntype" id="assigntype" value="T" onclick="toggleAssignType(this.value),setSelectValue('{$label}');" type="radio">&nbsp;Group
+							<input name="assigntype" id="assigntype" value="T" onclick="toggleAssignType(this.value),setSelectValue('{$label}');" type="radio">&nbsp;{$APP.LBL_GROUP_NAME}
 						{/if}
 						<span id="assign_user" style="display: block;">
 					{else}
-						<input name="assigntype" id="assigntype" value="U" onclick="toggleAssignType(this.value),setSelectValue('{$label}');" type="radio">&nbsp;User
-						<input name="assigntype" checked="checked" id="assigntype" value="T" onclick="toggleAssignType(this.value),setSelectValue('{$label}');" type="radio">&nbsp;Group
+						<input name="assigntype" id="assigntype" value="U" onclick="toggleAssignType(this.value),setSelectValue('{$label}');" type="radio">&nbsp;{$APP.LBL_USER}
+						<input name="assigntype" checked="checked" id="assigntype" value="T" onclick="toggleAssignType(this.value),setSelectValue('{$label}');" type="radio">&nbsp;{$APP.LBL_GROUP_NAME}
 						<span id="assign_user" style="display: none;">
 					{/if}
                    	<select id="txtbox_U{$label}" onchange="setSelectValue('{$label}')" name="{$keyfldname}">
@@ -222,7 +222,7 @@
 					</span>
 
                     <br>
-                    <input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');"/> or
+                    <input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');"/> {$APP.LBL_OR}
                     <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                     </div>
                     </td>
@@ -234,7 +234,7 @@
                         {else}
                           <input id="txtbox_{$label}" type="checkbox" name="{$keyfldname}" style="border:1px solid #bababa;" value="0">
                        	{/if}
-                         <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');"/> or
+                         <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');"/> {$APP.LBL_OR}
                           <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                         </div>
                         </td>    
@@ -247,7 +247,7 @@
                         {else}
                           <input id="txtbox_{$label}" type="checkbox" name="{$keyfldname}" style="border:1px solid #bababa;" value="0">
                        	{/if}
-                         <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');"/> or
+                         <br><input name="button_{$label}" type="button" class="small" value="{$APP.LBL_SAVE_LABEL}" onclick="dtlViewAjaxSave('{$label}','{$MODULE}',{$keyid},'{$keytblname}','{$keyfldname}','{$ID}');"/> {$APP.LBL_OR}
                           <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                         </div>
 			{else}




From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 03:51:04 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 07:51:04 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7511 -
 /vtigercrm/trunk/modules/Calendar/language/en_us.lang.php
Message-ID: <20060626075104.597F983FCD3@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 26 01:50:58 2006
New Revision: 7511

Log:
updated calendar lang file - ahmed

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

Modified: vtigercrm/trunk/modules/Calendar/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Calendar/language/en_us.lang.php Mon Jun 26 01:50:58 2006
@@ -207,6 +207,7 @@
 'LBL_EVERYWEEK'=>'Every Week',
 'LBL_EVERYMON'=>'Every Month',
 'LBL_REPEATEVENT'=>'Repeat Event',
+'LBL_NONE_SCHEDULED'=>'None Scheduled',
 
 'LBL_INVITE_INST1'=>'To invite, select the vtiger_users from the "Available Users" list and click the "Add" button.',
 'LBL_INVITE_INST2'=>'To remove, select the vtiger_users in the "Selected Users" list and the click "Remove" button.',




From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 03:55:46 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 07:55:46 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7512 -
	/vtigercrm/trunk/modules/Calendar/calendarLayout.php
Message-ID: <20060626075546.47D1283FCDA@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 26 01:55:42 2006
New Revision: 7512

Log:
Updated i18n for calendar

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

Modified: vtigercrm/trunk/modules/Calendar/calendarLayout.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/calendarLayout.php (original)
+++ vtigercrm/trunk/modules/Calendar/calendarLayout.php Mon Jun 26 01:55:42 2006
@@ -221,7 +221,7 @@
 				<td align='center' width='65%'>";
 	$headerdata .= getEventTodoInfo($cal_arr,'listcnt'); 
 	$headerdata .= "	</td>
-				<td align='right' width='25%'><b>View : </b>";
+				<td align='right' width='25%'><b>".$mod_strings['LBL_VIEW']." : </b>";
 	$view_options = getEventViewOption($cal_arr);
 	$headerdata .=$view_options."
 				</td>
@@ -1204,7 +1204,7 @@
 	else
 	{
 		$list_view .="<tr style='height: 25px;' bgcolor='white'>";
-                	$list_view .="<td colspan='".$header_rows."'><i>None Scheduled</i></td>";
+                	$list_view .="<td colspan='".$header_rows."'><i>".$mod_strings['LBL_NONE_SCHEDULED']."</i></td>";
                 $list_view .="</tr>";
 	}
 	$list_view .="</table>";
@@ -1277,7 +1277,7 @@
         else
         {
                 $list_view .="<tr style='height: 25px;' bgcolor='white'>";
-                        $list_view .="<td colspan='".$header_rows."'><i>None Scheduled</i></td>";
+                        $list_view .="<td colspan='".$header_rows."'><i>".$mod_strings['LBL_NONE_SCHEDULED']."</i></td>";
                 $list_view .="</tr>";
         }
         $list_view .="</table><br></div>";




From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 04:11:28 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 08:11:28 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7513 -
	/vtigercrm/trunk/Smarty/templates/CustomView.tpl
Message-ID: <20060626081128.C582C83FB0F@vtiger.fosslabs.com>

Author: richie
Date: Mon Jun 26 02:11:24 2006
New Revision: 7513

Log:
#Fixes 1329

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 Mon Jun 26 02:11:24 2006
@@ -141,17 +141,17 @@
 		 </td>
 		</tr>
 		<tr class="dvtCellLabel">
-		  <td><select name="column1" id="column1">
+		  <td><select name="column1" id="column1" onChange="checkDuplicate();">
 	                <option value="">{$MOD.LBL_NONE}</option>
 			{foreach item=filteroption key=label from=$CHOOSECOLUMN1}
 				<optgroup label="{$label}" class=\"select\" style=\"border:none\">
-				{foreach item=text from=$filteroption}
-		                     <option {$text.selected} value={$text.value}>{$text.text}</option>
-                	        {/foreach}
+					{foreach item=text from=$filteroption}
+		   		         <option {$text.selected} value={$text.value}>{$text.text}</option>
+                    {/foreach}
 			{/foreach}
           	        {$CHOOSECOLUMN1}
 	              </select></td>
-		   <td><select name="column2" id="column2">
+		   <td><select name="column2" id="column2" onChange="checkDuplicate();">
                         <option value="">{$MOD.LBL_NONE}</option>
                         {foreach item=filteroption key=label from=$CHOOSECOLUMN2}
                                 <optgroup label="{$label}" class=\"select\" style=\"border:none\">
@@ -161,7 +161,7 @@
                         {/foreach}
                         {$CHOOSECOLUMN2}
                       </select></td>
-		   <td><select name="column3" id="column3">
+		   <td><select name="column3" id="column3" onChange="checkDuplicate();">
                         <option value="">{$MOD.LBL_NONE}</option>
                         {foreach item=filteroption key=label from=$CHOOSECOLUMN3}
                                 <optgroup label="{$label}" class=\"select\" style=\"border:none\">
@@ -171,7 +171,7 @@
                         {/foreach}
                         {$CHOOSECOLUMN3}
                       </select></td>
-		   <td><select name="column4" id="column4">
+		   <td><select name="column4" id="column4" onChange="checkDuplicate();">
                         <option value="">{$MOD.LBL_NONE}</option>
                         {foreach item=filteroption key=label from=$CHOOSECOLUMN4}
                                 <optgroup label="{$label}" class=\"select\" style=\"border:none\">
@@ -184,7 +184,7 @@
 			
 		</tr>
 		<tr class="dvtCellInfo">
-		   <td><select name="column5" id="column5">
+		   <td><select name="column5" id="column5" onChange="checkDuplicate();">
                         <option value="">{$MOD.LBL_NONE}</option>
                         {foreach item=filteroption key=label from=$CHOOSECOLUMN5}
                                 <optgroup label="{$label}" class=\"select\" style=\"border:none\">
@@ -194,7 +194,7 @@
                         {/foreach}
                         {$CHOOSECOLUMN5}
                       </select></td>
-                   <td><select name="column6" id="column6">
+                   <td><select name="column6" id="column6" onChange="checkDuplicate();">
                         <option value="">{$MOD.LBL_NONE}</option>
                         {foreach item=filteroption key=label from=$CHOOSECOLUMN6}
                                 <optgroup label="{$label}" class=\"select\" style=\"border:none\">
@@ -204,7 +204,7 @@
                         {/foreach}
                         {$CHOOSECOLUMN6}
                       </select></td>
-                   <td><select name="column7" id="column7">
+                   <td><select name="column7" id="column7" onChange="checkDuplicate();">
                         <option value="">{$MOD.LBL_NONE}</option>
                         {foreach item=filteroption key=label from=$CHOOSECOLUMN7}
                                 <optgroup label="{$label}" class=\"select\" style=\"border:none\">
@@ -214,7 +214,7 @@
                         {/foreach}
                         {$CHOOSECOLUMN7}
                       </select></td>
-                   <td><select name="column8" id="column8">
+                   <td><select name="column8" id="column8" onChange="checkDuplicate();">
                         <option value="">{$MOD.LBL_NONE}</option>
                         {foreach item=filteroption key=label from=$CHOOSECOLUMN8}
                                 <optgroup label="{$label}" class=\"select\" style=\"border:none\">
@@ -226,7 +226,7 @@
 			</select></td>
 		</tr>
 		<tr class="dvtCellLabel">
-		   <td><select name="column9" id="column9">
+		   <td><select name="column9" id="column9" onChange="checkDuplicate();">
                         <option value="">{$MOD.LBL_NONE}</option>
                         {foreach item=filteroption key=label from=$CHOOSECOLUMN9}
                                 <optgroup label="{$label}" class=\"select\" style=\"border:none\">
@@ -463,7 +463,7 @@
   <tr><td colspan="4">&nbsp;</td></tr>
   <tr><td colspan="4" style="padding: 5px;">
 	<div align="center">
-	  <input title="Save [Alt+S]" accesskey="S" class="small"  name="button2" value="{$APP.LBL_SAVE_BUTTON_LABEL}" style="width: 70px;" type="submit" />
+	  <input title="Save [Alt+S]" accesskey="S" class="small"  name="button2" value="{$APP.LBL_SAVE_BUTTON_LABEL}" style="width: 70px;" type="submit" onClick="return checkDuplicate();"/>
 	  <input title="Cancel [Alt+X]" accesskey="X" class="small" name="button2" onclick='window.history.back()' value="{$APP.LBL_CANCEL_BUTTON_LABEL}" style="width: 70px;" type="button" />
 	</div>
   </td></tr>
@@ -476,19 +476,47 @@
 var k;
 var colOpts;
 var manCheck = new Array({$MANDATORYCHECK});
+{literal}
 if(document.CustomView.record.value == '')
-{ldelim}
+{
   for(k=0;k<manCheck.length;k++)
-  {ldelim}
+  {
       selname = "column"+(k+1);
       colOpts = document.getElementById(selname).options;
       for (l=0;l<colOpts.length;l++)
-      {ldelim}
+      {
         if(colOpts[l].value == manCheck[k])
-        {ldelim}
+        {
           colOpts[l].selected = true;
-        {rdelim}
-      {rdelim}
-  {rdelim}
-{rdelim}
+        }
+      }
+  }
+}
+function checkDuplicate()
+{
+	var cvselect_array = new Array('column1','column2','column3','column4','column5','column6','column7','column8','column9')
+		for(var loop=0;loop < cvselect_array.length-1;loop++)
+		{
+			selected_cv_columnvalue = $(cvselect_array[loop]).options[$(cvselect_array[loop]).selectedIndex].value;
+			if(selected_cv_columnvalue != '')
+			{	
+				for(var iloop=0;iloop < cvselect_array.length;iloop++)
+				{
+					if(iloop == loop)
+						iloop++;
+					selected_cv_icolumnvalue = $(cvselect_array[iloop]).options[$(cvselect_array[iloop]).selectedIndex].value;	
+					if(selected_cv_columnvalue == selected_cv_icolumnvalue)
+					{
+						alert('Columns cannot be duplicated');
+						$(cvselect_array[iloop]).selectedIndex = 0;
+						return false;
+					}
+
+				}
+			}
+		}
+		return true;
+}
+checkDuplicate();
+{/literal}
 </script>




From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 26 04:11:55 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 26 Jun 2006 08:11:55 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231329=3A?=
	=?utf-8?q?_List_custom_view?=
In-Reply-To: <076.5bc833f86fff73d192c1a72d505bd83a@vtiger.fosslabs.com>
References: <076.5bc833f86fff73d192c1a72d505bd83a@vtiger.fosslabs.com>
Message-ID: <085.431f42a9080cdf51f04960f8052be925@vtiger.fosslabs.com>

#1329: List custom view
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  jerrydgeorge
      Type:  defect     |      Status:  closed      
  Priority:  critical   |   Milestone:              
 Component:  vtigercrm  |     Version:  5.0.0       
Resolution:  fixed      |    Keywords:              
------------------------+---------------------------------------------------
Changes (by jerrydgeorge):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1329>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 26 05:27:50 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 26 Jun 2006 09:27:50 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231328=3A?=
 =?utf-8?q?_Custom_picklist_sort_order?=
In-Reply-To: <076.4247da71e86ed63e936e2988bd008654@vtiger.fosslabs.com>
References: <076.4247da71e86ed63e936e2988bd008654@vtiger.fosslabs.com>
Message-ID: <085.19bc1c9362e7594892991bb4361b1af3@vtiger.fosslabs.com>

#1328: Custom picklist sort order
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  jerrydgeorge    
      Type:  defect     |      Status:  closed          
  Priority:  major      |   Milestone:                  
 Component:  vtigercrm  |     Version:  5.0.0           
Resolution:  fixed      |    Keywords:  picklist, custom
------------------------+---------------------------------------------------
Changes (by jerrydgeorge):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1328>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 06:00:25 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 10:00:25 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7514 - in /vtigercrm/trunk:
 Smarty/templates/Header.tpl themes/blue/images/status.gif
Message-ID: <20060626100025.E189583FBE3@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 26 04:00:17 2006
New Revision: 7514

Log:
status image and and its position modified

Modified:
    vtigercrm/trunk/Smarty/templates/Header.tpl
    vtigercrm/trunk/themes/blue/images/status.gif

Modified: vtigercrm/trunk/Smarty/templates/Header.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Header.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Header.tpl Mon Jun 26 04:00:17 2006
@@ -464,7 +464,7 @@
 </div>
 
 
-<div id="status" class="fixedLay" style="display:none;left:930px;top:88px;height:27px;white-space:nowrap;"><img src="{$IMAGEPATH}status.gif"></div>
+<div id="status" class="fixedLay" style="display:none;left:930px;top:95px;height:27px;white-space:nowrap;"><img src="{$IMAGEPATH}status.gif"></div>
 <script>
 function openwin()
 {ldelim}

Modified: vtigercrm/trunk/themes/blue/images/status.gif
==============================================================================
Binary files - no diff available.




From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 06:38:16 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 10:38:16 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7515 -
	/vtigercrm/trunk/include/utils/ListViewUtils.php
Message-ID: <20060626103817.C5C5E83FB24@vtiger.fosslabs.com>

Author: richie
Date: Mon Jun 26 04:38:12 2006
New Revision: 7515

Log:
Email Edit from related list has been integrated

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 Jun 26 04:38:12 2006
@@ -2714,7 +2714,8 @@
 	}
 
 	$edit_link .= "&parenttab=".$_REQUEST["parenttab"];
-
+	if($module == 'Emails')
+	        $edit_link = 'javascript:;" onclick="OpenCompose(\'123\',\'edit\');';
 	return $edit_link;
 }
 




From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 06:58:20 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 10:58:20 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7516 -
	/vtigercrm/trunk/include/language/en_us.lang.php
Message-ID: <20060626105820.6B83983FCBE@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 26 04:58:16 2006
New Revision: 7516

Log:
Updated lang file - ahmed

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

Modified: vtigercrm/trunk/include/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/include/language/en_us.lang.php (original)
+++ vtigercrm/trunk/include/language/en_us.lang.php Mon Jun 26 04:58:16 2006
@@ -371,6 +371,14 @@
 'Import'=>'Import',
 'Merge'=>'Merge',
 'ConvertLead'=>'ConvertLead',
+
+
+'LBL_SHOW_RESULTS'=>'Show Results in',
+'LBL_TOTAL_RECORDS_FOUND'=>'Total Records found :',
+'LBL_SEARCH_RESULTS_FOR'=>' -- Search results for ',
+'LBL_TAG_SEARCH'=>' -- Tag search for ',
+'LBL_NO_DATA'=>'No Data Found',
+
 
 //3.2 release
 




From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 07:11:40 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 11:11:40 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7518 -
	/vtigercrm/trunk/modules/Home/UnifiedSearch.php
Message-ID: <20060626111140.E3CA783FCC4@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 26 05:11:36 2006
New Revision: 7518

Log:
updated global search

Modified:
    vtigercrm/trunk/modules/Home/UnifiedSearch.php

Modified: vtigercrm/trunk/modules/Home/UnifiedSearch.php
==============================================================================
--- vtigercrm/trunk/modules/Home/UnifiedSearch.php (original)
+++ vtigercrm/trunk/modules/Home/UnifiedSearch.php Mon Jun 26 05:11:36 2006
@@ -84,6 +84,7 @@
 
 		require_once("modules/$module/language/en_us.lang.php");
 		global $mod_strings;
+		global $app_strings;
 
 		$smarty->assign("MOD", $mod_strings);
 		$smarty->assign("APP", $app_strings);
@@ -107,13 +108,15 @@
 		
 		if($search_module != '')//This is for Tag search
 		{
-			$where = getTagWhere($search_val,$current_user->id);
-			$search_msg = " -- Tag search for <b>".$search_val."</b>";
+		
+			$Where = getTagWhere($search_val,$current_user->id);
+			$search_msg =  $app_strings['LBL_TAG_SEARCH'];				       	$search_msg .=	"<b>".$search_val."</b>";
 		}
 		else			//This is for Global search
 		{
 			$where = getUnifiedWhere($listquery,$module,$search_val);
-			$search_msg = " -- Search results for <b>".$search_val."</b>";
+			$search_msg = $app_strings['LBL_SEARCH_RESULTS_FOR'];
+			$search_msg .=	"<b>".$search_val."</b>";
 		}
 
 		if($where != '')
@@ -157,7 +160,7 @@
 	//Added to display the Total record count
 ?>
 	<script>
-		document.getElementById("global_search_total_count").innerHTML = "Total Records found : <b><?php echo $total_record_count; ?></b>";
+document.getElementById("global_search_total_count").innerHTML = " <? echo $app_strings['LBL_TOTAL_RECORDS_FOUND'] ?><b><?php echo $total_record_count; ?></b>";
 	</script>
 <?php
 
@@ -232,7 +235,9 @@
 function getSearchModulesComboList($search_module)
 {
 	global $object_array;
-
+	global $app_strings;
+	global $mod_strings;
+	
 	?>
 		<script language="JavaScript" type="text/javascript" src="include/js/general.js"></script>
 		<script>
@@ -261,9 +266,9 @@
 		 <table border=0 cellspacing=0 cellpadding=0 width=98% align=center>
 		     <tr>
 		        <td colspan="3" id="global_search_total_count" style="padding-left:30px">&nbsp;</td>
-		        <td nowrap align="right">Show Results in &nbsp;
+		<td nowrap align="right"><? echo $app_strings['LBL_SHOW_RESULTS'] ?>&nbsp;
 		                <select id="global_search_module" name="global_search_module" onChange="displayModuleList(this);">
-		                        <option value="All">All</option>
+			<option value="All"><? echo $app_strings['COMBO_ALL'] ?></option>
 						<?php
 						foreach($object_array as $module => $object_name)
 						{
@@ -273,7 +278,7 @@
 							if($search_module == '' && $module == 'All')
 								$selected = 'selected';
 							?>
-							<option value="<?php echo $module; ?>" <?php echo $selected; ?> ><?php echo $module; ?></option>
+							<option value="<?php echo $module; ?>" <?php echo $selected; ?> ><?php echo $app_strings[$module]; ?></option>
 							<?php
 						}
 						?>




From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 07:37:25 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 11:37:25 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7520 -
	/vtigercrm/trunk/Smarty/templates/UserDetailView.tpl
Message-ID: <20060626113725.300CB83FBDC@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 26 05:37:21 2006
New Revision: 7520

Log:
Updated i18n for quick edit of user Detail View - ahmed

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

Modified: vtigercrm/trunk/Smarty/templates/UserDetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/UserDetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/UserDetailView.tpl Mon Jun 26 05:37:21 2006
@@ -14,7 +14,7 @@
 <script language="javascript" type="text/javascript" src="include/js/general.js"></script>
 <script language="JavaScript" type="text/javascript" src="include/js/dtlviewajax.js"></script>
 <span id="crmspanid" style="display:none;position:absolute;"  onmouseover="show('crmspanid');">
-   <a class="link"  align="right" href="javascript:;">Edit</a>
+   <a class="link"  align="right" href="javascript:;">{$APP.LBL_EDIT_BUTTON}</a>
 </span>
 
 <style type="text/css">@import url(themes/blue/style.css);</style>




From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 26 07:37:36 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 26 Jun 2006 11:37:36 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231365=3A?=
	=?utf-8?q?_i18n_issue_at_tickets?=
In-Reply-To: <076.d396dbfd58922ae6f8f333a2a453043b@vtiger.fosslabs.com>
References: <076.d396dbfd58922ae6f8f333a2a453043b@vtiger.fosslabs.com>
Message-ID: <085.2ddb8f8121ca9bdb72c0e6da3c4c8d12@vtiger.fosslabs.com>

#1365: i18n issue at tickets
------------------------+---------------------------------------------------
  Reporter:  anonymous  |       Owner:  ahmed 
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by ahmed):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 Issue Fixed - i18n updated for detailview quick edit

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1365>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 26 07:38:34 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 26 Jun 2006 11:38:34 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231334=3A?=
	=?utf-8?q?_Calendar_translation?=
In-Reply-To: <076.9648d4b16d7e7ade09293afbcbfcb43e@vtiger.fosslabs.com>
References: <076.9648d4b16d7e7ade09293afbcbfcb43e@vtiger.fosslabs.com>
Message-ID: <085.65ac2f5811f94ba69ecb2f67f3af67bb@vtiger.fosslabs.com>

#1334: Calendar translation
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  ahmed                
      Type:  defect     |      Status:  closed               
  Priority:  minor      |   Milestone:                       
 Component:  vtigercrm  |     Version:  5.0.0                
Resolution:  fixed      |    Keywords:  calendar, translation
------------------------+---------------------------------------------------
Changes (by ahmed):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 Issue fixed - lang file updated for calendar module

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1334>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 26 07:39:07 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 26 Jun 2006 11:39:07 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231339=3A?=
 =?utf-8?q?_Missing_translation_for_search_results?=
In-Reply-To: <076.612780845c117cf5a7ac9d62d25b957d@vtiger.fosslabs.com>
References: <076.612780845c117cf5a7ac9d62d25b957d@vtiger.fosslabs.com>
Message-ID: <085.b0eff5cc734d4aae6ed53d16c76c3720@vtiger.fosslabs.com>

#1339: Missing translation for search results
------------------------+---------------------------------------------------
  Reporter:  abos       |       Owner:  ahmed 
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by ahmed):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 Translated for global search done

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1339>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 26 07:40:41 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 26 Jun 2006 11:40:41 -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.228975c4bde585d34a96fac37049e322@vtiger.fosslabs.com>

#330: Existing image name should be displayed in the field
------------------------+---------------------------------------------------
  Reporter:  saraj      |       Owner:  mickie     
      Type:  defect     |      Status:  new        
  Priority:  major      |   Milestone:             
 Component:  vtigercrm  |     Version:  5.0.0      
Resolution:             |    Keywords:  Create User
------------------------+---------------------------------------------------
Changes (by ahmed):

  * owner:  ahmed => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/330>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 07:12:23 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 11:12:23 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7519 -
	/vtigercrm/trunk/modules/Home/UnifiedSearch.php
Message-ID: <20060626111223.C35B183FCD9@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 26 05:12:20 2006
New Revision: 7519

Log:
updated global search

Modified:
    vtigercrm/trunk/modules/Home/UnifiedSearch.php

Modified: vtigercrm/trunk/modules/Home/UnifiedSearch.php
==============================================================================
--- vtigercrm/trunk/modules/Home/UnifiedSearch.php (original)
+++ vtigercrm/trunk/modules/Home/UnifiedSearch.php Mon Jun 26 05:12:20 2006
@@ -109,7 +109,7 @@
 		if($search_module != '')//This is for Tag search
 		{
 		
-			$Where = getTagWhere($search_val,$current_user->id);
+			$where = getTagWhere($search_val,$current_user->id);
 			$search_msg =  $app_strings['LBL_TAG_SEARCH'];				       	$search_msg .=	"<b>".$search_val."</b>";
 		}
 		else			//This is for Global search




From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 08:14:27 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 12:14:27 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7521 - in /vtigercrm/trunk:
 Smarty/templates/Emails.tpl include/language/en_us.lang.php
 modules/Emails/language/en_us.lang.php modules/Webmails/WebmailsAjax.php
Message-ID: <20060626121427.ACC3F83FD1D@vtiger.fosslabs.com>

Author: richie
Date: Mon Jun 26 06:14:19 2006
New Revision: 7521

Log:
Mail Server check done through Ajaz

Modified:
    vtigercrm/trunk/Smarty/templates/Emails.tpl
    vtigercrm/trunk/include/language/en_us.lang.php
    vtigercrm/trunk/modules/Emails/language/en_us.lang.php
    vtigercrm/trunk/modules/Webmails/WebmailsAjax.php

Modified: vtigercrm/trunk/Smarty/templates/Emails.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Emails.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Emails.tpl Mon Jun 26 06:14:19 2006
@@ -11,6 +11,23 @@
 -->*}
 <!--  USER  SETTINGS PAGE STARTS HERE -->
 <script language="javascript">
+function gotoWebmail()
+{ldelim}
+	new Ajax.Request(
+		'index.php',
+		{ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+                	method: 'post',
+			postBody: "module=Webmails&action=WebmailsAjax&file=ListView&config_chk=true",
+			onComplete: function(response) {ldelim}
+				if(response.responseText != 'SUCESS')
+					$('mailconfchk').style.display = 'block';
+				else
+					window.location.href = "index.php?module=Webmails&action=index&parenttab=My Home Page";
+			{rdelim}
+		{rdelim}
+	);
+
+{rdelim}
 
 function setSubject(subject)
 {ldelim}
@@ -112,7 +129,7 @@
 </script>
 		{include file='Buttons_List.tpl'}
 <script language="JavaScript" type="text/javascript" src="modules/Emails/Email.js"></script>
-
+<div class="fixedLay" id="mailconfchk" style="display:none;left:350px;top:160px;height:27px;white-space:nowrap;z-index:10000007px;"><font color='red'><h3>{$MOD.LBL_CONFIGURE_MAIL_SETTINGS}.<br> {$APP.LBL_PLEASE_CLICK} <a href="index.php?module=Settings&action=AddMailAccount&record={$USERID}">{$APP.LBL_HERE}</a> {$APP.LBL_TO_CONFIGURE}</h3></font></div>
 <!-- Shadow starts here -->
 <table width="100%" border="0" cellpadding="0" cellspacing="0" height="100%">
 	<tr>
@@ -169,7 +186,7 @@
 										<a href="javascript:;" onClick="ShowFolders(6)" class="webMnu">{$MOD.LBL_QUAL_CONTACT}</a>&nbsp;<b></b>
 									</li>
 									<li><img src="{$IMAGE_PATH}webmail_downarrow.gif" align="absmiddle" />&nbsp;&nbsp;
-									<a href="index.php?module=Webmails&action=index&parenttab=My Home Page" class="webMnu">{$MOD.LBL_MY_MAILS}</a>&nbsp;<b></b>
+									<a href="javascript:;" onClick="gotoWebmail();" class="webMnu">{$MOD.LBL_MY_MAILS}</a>&nbsp;<b></b>
 									</li>
 								</ul>
 								<!-- Sent mail -->

Modified: vtigercrm/trunk/include/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/include/language/en_us.lang.php (original)
+++ vtigercrm/trunk/include/language/en_us.lang.php Mon Jun 26 06:14:19 2006
@@ -936,7 +936,9 @@
 'This Week'=>'This Week',
 'This Month'=>'This Month',
 'This Year'=>'This Year',
-
+'LBL_PLEASE_CLICK'=>'Please Click',
+'LBL_TO_CONFIGURE'=>'to Configure',
+'LBL_HERE'=>'here',
 );
 
 

Modified: vtigercrm/trunk/modules/Emails/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Emails/language/en_us.lang.php Mon Jun 26 06:14:19 2006
@@ -142,6 +142,7 @@
 'LBL_IN_SUBJECT_OR_SENDER'=>'in Subject or Sender',
 'CHOSE_EMAIL'=>'Choose Email ID',
 'Sender'=>'Sender',
+'LBL_CONFIGURE_MAIL_SETTINGS'=>'Your Incoming Mail Server is not configured',
 );
 
 ?>

Modified: vtigercrm/trunk/modules/Webmails/WebmailsAjax.php
==============================================================================
--- vtigercrm/trunk/modules/Webmails/WebmailsAjax.php (original)
+++ vtigercrm/trunk/modules/Webmails/WebmailsAjax.php Mon Jun 26 06:14:19 2006
@@ -16,6 +16,17 @@
 
 global $adb,$mbox,$current_user;
 $mailInfo = getMailServerInfo($current_user);
+if($_REQUEST['config_chk'] == 'true')
+{
+	if($adb->num_rows($mailInfo) < 1) {
+		echo 'FAILED';
+		exit();
+	}else
+	{
+		echo 'SUCESS';
+		exit();
+	}
+}
 if($adb->num_rows($mailInfo) < 1) {
         echo "<center><font color='red'><h3>Please configure your mail settings</h3></font></center>";
         exit();




From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 08:30:39 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 12:30:39 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7522 -
 /vtigercrm/trunk/modules/Settings/language/en_us.lang.php
Message-ID: <20060626123040.9DE4264FC43@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 26 06:30:34 2006
New Revision: 7522

Log:
updated settingslang file

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 Jun 26 06:30:34 2006
@@ -574,6 +574,7 @@
 'INVENTORYTERMSANDCONDITIONS'=>'Inventory : Terms & Conditions',//newly added for Inventory terms and conditions
 'LBL_INVENTORY_TERMSANDCONDITIONS'=>' - Edit Inventory Terms & Conditions',//newly added
 'LBL_TANDC_TEXT'=>'Terms & Conditions Text',
+'LBL_INVENTORY_TANDC'=>'Inventory Terms & Conditions',
 
 'LBL_OTHER_SETTINGS'=>'Other Settings',
 'LBL_SCROLL'=>'[Scroll to Top]',




From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 08:32:03 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 12:32:03 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7523 -
	/vtigercrm/trunk/Smarty/templates/Settings.tpl
Message-ID: <20060626123204.219A164FC43@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 26 06:32:00 2006
New Revision: 7523

Log:
Updated Settings tpl file - ahmed

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 Mon Jun 26 06:32:00 2006
@@ -317,7 +317,7 @@
 						<tr>
 
 							<td rowspan=2 valign=top><a href="index.php?module=Users&action=OrganizationTermsandConditions&parenttab=Settings"><img border=0 src="{$IMAGE_PATH}terms.gif" alt="{$MOD.INVENTORYTERMSANDCONDITIONS}" title="{$MOD.INVENTORYTERMSANDCONDITIONS}"></a></td>
-							<td class=big valign=top><a href="index.php?module=Users&action=OrganizationTermsandConditions&parenttab=Settings">{$MOD.INVENTORYTERMSANDCONDITIONS}</a></td>
+							<td class=big valign=top><a href="index.php?module=Users&action=OrganizationTermsandConditions&parenttab=Settings">{$MOD.LBL_INVENTORY_TANDC}</a></td>
 						</tr>
 						<tr>
 							<td class="small" valign=top>{$MOD.LBL_INV_TANDC_DESCRIPTION}</td>




From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 08:35:21 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 12:35:21 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7524 -
	/vtigercrm/trunk/Smarty/templates/SetMenu.tpl
Message-ID: <20060626123522.6F6E564FD66@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 26 06:35:16 2006
New Revision: 7524

Log:
Update Settings menu - ahmed

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

Modified: vtigercrm/trunk/Smarty/templates/SetMenu.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/SetMenu.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/SetMenu.tpl Mon Jun 26 06:35:16 2006
@@ -75,7 +75,7 @@
 				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=listemailtemplates&parenttab=Settings">{$MOD.EMAILTEMPLATES}</a></td></tr>
 				{/if}
 
-				{if $smarty.request.action eq 'listwordtemplates' || $smarty.request.action eq 'add2db' || $smarty.request.action eq 'deletewordtemplate'}
+				{if $smarty.request.action eq 'listwordtemplates' || $smarty.request.action eq 'add2db' || $smarty.request.action eq 'deletewordtemplate' || $smarty.request.action eq 'upload'}
 				<tr><td class="settingsTabSelected" nowrap>{$MOD.WORDINTEGRATION}</td></tr>
 				
 				{else}	
@@ -95,7 +95,7 @@
 				{/if} 	
 
 				{if $smarty.request.action eq 'OrganizationTermsandConditions' || $smarty.request.action eq 'savetermsandconditions'}
-				<tr><td class="settingsTabSelected" nowrap>{$MOD.INVENTORYNOTIFICATION}</td></tr>
+				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_INVENTORY_TANDC}</td></tr>
 				{else}
 				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=OrganizationTermsandConditions&parenttab=Settings">{$MOD.INVENTORYTERMSANDCONDITIONS}</a></td></tr>
 				{/if}
@@ -114,13 +114,13 @@
 				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=EmailConfig&parenttab=Settings">{$MOD.LBL_MAIL_SERVER_SETTINGS}</a></td></tr>
 				{/if}
 				
-				{if $smarty.request.action eq 'BackupServerConfig' || $smarty.request.action eq 'index' || $smarty.request.action eq 'Save'}
+				{if $smarty.request.action eq 'BackupServerConfig' || $smarty.request.action eq 'Save'}
 				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_BACKUP_SERVER_SETTINGS}</td></tr>
 				{else}
 				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=BackupServerConfig&parenttab=Settings">{$MOD.LBL_BACKUP_SERVER_SETTINGS}</a></td></tr>
 				{/if}
 				
-				{if $smarty.request.action eq 'CurrencyListView' ||  $smarty.request.action eq 'CurrencyEditView' ||  $smarty.request.action eq 'index' ||  $smarty.request.action eq 'SaveCurrencyInfo'}
+				{if $smarty.request.action eq 'CurrencyListView' ||  $smarty.request.action eq 'CurrencyEditView' ||  $smarty.request.action eq 'SaveCurrencyInfo'}
 				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_CURRENCY_SETTINGS}</td></tr>
 				{else}
 				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=CurrencyListView&parenttab=Settings">{$MOD.LBL_CURRENCY_SETTINGS}</a></td></tr>




From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 08:38:14 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 12:38:14 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7525 -
 /vtigercrm/trunk/modules/Settings/ProxyServerConfig.php
Message-ID: <20060626123814.045AB83FD32@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 26 06:38:09 2006
New Revision: 7525

Log:
file added for proxy server settings

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




From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 08:39:47 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 12:39:47 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7526 - in
 /vtigercrm/trunk/soap: firefoxtoolbar.php thunderbirdplugin.php
Message-ID: <20060626123947.DA48E83FD40@vtiger.fosslabs.com>

Author: richie
Date: Mon Jun 26 06:39:39 2006
New Revision: 7526

Log:
split contactserialize.php to individual files

Added:
    vtigercrm/trunk/soap/firefoxtoolbar.php
    vtigercrm/trunk/soap/thunderbirdplugin.php




From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 08:40:44 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 12:40:44 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7527 -
 /vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php
Message-ID: <20060626124045.3CD5183FD40@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 26 06:40:41 2006
New Revision: 7527

Log:
* Modified to add vtiger_ as prefix for tables and fix the failed queries and removed some unwanted 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 Mon Jun 26 06:40:41 2006
@@ -17,9 +17,9 @@
 global $success_query_array, $failure_query_array;
 
 //Added to put prefix vtiger_ in some of the columns in tables which are used for CV and Reports and field -- 23-06-06
-$conn->println("First we will rename the existing tables with prefix vtiger_");
+$conn->println("Going to rename the table names with prefix vtiger_");
 include("modules/Migration/ModifyDatabase/rename_tables.php");
-$conn->println("Renaming the existing tables with prefix vtiger_ has been finished");
+$conn->println("Renaming the table names with prefix vtiger_ has been finished");
 
 
 
@@ -358,7 +358,7 @@
  `tabid` int(19) NOT NULL default '0',
  `user_id` varchar(11) NOT NULL default '',
  PRIMARY KEY  (`tabid`),
- CONSTRAINT `fk_ModuleOwners` FOREIGN KEY (`tabid`) REFERENCES `tab` (`tabid`) ON DELETE CASCADE
+ CONSTRAINT `fk_ModuleOwners` FOREIGN KEY (`tabid`) REFERENCES `vtiger_tab` (`tabid`) ON DELETE CASCADE
 ) TYPE=InnoDB";
 */
 Execute($create_query2);
@@ -432,10 +432,10 @@
 		"update vtiger_field set tablename='customerdetails' where tabid=4 and fieldname in ('portal','support_start_date','support_end_date')",
 		"alter table vtiger_PortalInfo drop foreign key fk_PortalInfo",
 		"rename table vtiger_PortalInfo to vtiger_portalinfo",
-		"alter table vtiger_portalinfo add CONSTRAINT `fk_portalinfo` FOREIGN KEY (`id`) REFERENCES `contactdetails` (`contactid`) ON DELETE CASCADE",
+		"alter table vtiger_portalinfo add CONSTRAINT `fk_portalinfo` FOREIGN KEY (`id`) REFERENCES `vtiger_contactdetails` (`contactid`) ON DELETE CASCADE",
 		"alter table vtiger_CustomerDetails drop foreign key fk_CustomerDetails",
 		"rename table vtiger_CustomerDetails to vtiger_customerdetails",
-		"alter table vtiger_customerdetails add CONSTRAINT `fk_customerdetails` FOREIGN KEY (`customerid`) REFERENCES `contactdetails` (`contactid`) ON DELETE CASCADE"
+		"alter table vtiger_customerdetails add CONSTRAINT `fk_customerdetails` FOREIGN KEY (`customerid`) REFERENCES `vtiger_contactdetails` (`contactid`) ON DELETE CASCADE"
 		);
 foreach($rename_table_array1 as $query)
 {
@@ -630,7 +630,7 @@
  `groupid` int(19) NOT NULL default '0',
  `containsgroupid` int(19) NOT NULL default '0',
  PRIMARY KEY (`groupid`,`containsgroupid`),
- CONSTRAINT `fk_group2grouprel1` FOREIGN KEY (`groupid`) REFERENCES `groups` (`groupid`) ON DELETE CASCADE
+ CONSTRAINT `fk_group2grouprel1` FOREIGN KEY (`groupid`) REFERENCES `vtiger_groups` (`groupid`) ON DELETE CASCADE
 ) TYPE=InnoDB";
 */
 Execute($query8);
@@ -647,7 +647,7 @@
  `groupid` int(19) NOT NULL default '0',
  `roleid` varchar(255) NOT NULL default '',
  PRIMARY KEY (`groupid`,`roleid`),
- CONSTRAINT `fk_group2role1` FOREIGN KEY (`groupid`) REFERENCES `groups` (`groupid`) ON DELETE CASCADE
+ CONSTRAINT `fk_group2role1` FOREIGN KEY (`groupid`) REFERENCES `vtiger_groups` (`groupid`) ON DELETE CASCADE
 ) TYPE=InnoDB";
 */
 Execute($query9);
@@ -664,7 +664,7 @@
  `groupid` int(19) NOT NULL default '0',
  `roleandsubid` varchar(255) NOT NULL default '',
  PRIMARY KEY (`groupid`,`roleandsubid`),
- CONSTRAINT `fk_group2rs1` FOREIGN KEY (`groupid`) REFERENCES `groups` (`groupid`) ON DELETE CASCADE
+ CONSTRAINT `fk_group2rs1` FOREIGN KEY (`groupid`) REFERENCES `vtiger_groups` (`groupid`) ON DELETE CASCADE
 ) TYPE=InnoDB";
 */
 Execute($query10);
@@ -766,7 +766,7 @@
 	`share_action_id` int(19) NOT NULL default '0',
 	`tabid` int(19) NOT NULL default '0',
 	PRIMARY KEY  (`share_action_id`,`tabid`),
-	CONSTRAINT `fk_org_share_action2tab` FOREIGN KEY (`share_action_id`) REFERENCES `org_share_action_mapping` (`share_action_id`) ON DELETE CASCADE
+	CONSTRAINT `fk_org_share_action2tab` FOREIGN KEY (`share_action_id`) REFERENCES `vtiger_org_share_action_mapping` (`share_action_id`) ON DELETE CASCADE
 	) TYPE=InnoDB";
 Execute($query2);
 
@@ -1478,12 +1478,20 @@
 	Execute($query);
 }
 
+//Added on 26-06-06 - we cannot add foreign key in type MyISAM, so we have to change the type to InnoDB
+$alter_tables_array = Array("vtiger_groups","vtiger_potential","vtiger_quotes","vtiger_salesorder","vtiger_invoice","vtiger_purchaseorder");
+foreach($alter_tables_array as $tablename)
+{
+	Execute("alter table $tablename type=InnoDB");
+}
+
+
 $create_query6 = "CREATE TABLE vtiger_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 vtiger_accountgrouprelation ADD CONSTRAINT fk_accountgrouprelation FOREIGN KEY (accountid) REFERENCES vtiger_account(accountid) ON DELETE CASCADE",
-				"alter table vtiger_accountgrouprelation ADD CONSTRAINT fk_accountgrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_groups(name) ON DELETE CASCADE"
+				"alter table vtiger_accountgrouprelation ADD CONSTRAINT fk_accountgrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE"
 			   );
 foreach($alter_query_array8 as $query)
 {
@@ -1495,7 +1503,7 @@
 
 $alter_query_array9 = Array(
 				"alter table vtiger_contactgrouprelation ADD CONSTRAINT fk_contactgrouprelation FOREIGN KEY (contactid) REFERENCES vtiger_contactdetails(contactid) ON DELETE CASCADE",
-				"alter table vtiger_contactgrouprelation ADD CONSTRAINT fk_contactgrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_groups(name) ON DELETE CASCADE"
+				"alter table vtiger_contactgrouprelation ADD CONSTRAINT fk_contactgrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE"
 			   );
 foreach($alter_query_array9 as $query)
 {
@@ -1508,7 +1516,7 @@
 
 $alter_query_array10 = Array(
 				"alter table vtiger_potentialgrouprelation ADD CONSTRAINT fk_potentialgrouprelation FOREIGN KEY (potentialid) REFERENCES vtiger_potential(potentialid) ON DELETE CASCADE",
-				"alter table vtiger_potentialgrouprelation ADD CONSTRAINT fk_potentialgrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_groups(name) ON DELETE CASCADE"
+				"alter table vtiger_potentialgrouprelation ADD CONSTRAINT fk_potentialgrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE"
 			    );
 foreach($alter_query_array10 as $query)
 {
@@ -1520,7 +1528,7 @@
 
 $alter_query_array11 = Array(
 				"alter table vtiger_quotegrouprelation ADD CONSTRAINT fk_quotegrouprelation FOREIGN KEY (quoteid) REFERENCES vtiger_quotes(quoteid) ON DELETE CASCADE",
-				"alter table vtiger_quotegrouprelation ADD CONSTRAINT fk_quotegrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_groups(name) ON DELETE CASCADE"
+				"alter table vtiger_quotegrouprelation ADD CONSTRAINT fk_quotegrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE"
 			    );
 foreach($alter_query_array11 as $query)
 {
@@ -1532,7 +1540,7 @@
 
 $alter_query_array12 = Array(
 				"alter table vtiger_sogrouprelation ADD CONSTRAINT fk_sogrouprelation FOREIGN KEY (salesorderid) REFERENCES vtiger_salesorder(salesorderid) ON DELETE CASCADE",
-				"alter table vtiger_sogrouprelation ADD CONSTRAINT fk_sogrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_groups(name) ON DELETE CASCADE"
+				"alter table vtiger_sogrouprelation ADD CONSTRAINT fk_sogrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE"
 			    );
 foreach($alter_query_array12 as $query)
 {
@@ -1544,7 +1552,7 @@
 
 $alter_query_array13 = Array(
 				"alter table vtiger_invoicegrouprelation ADD CONSTRAINT fk_invoicegrouprelation FOREIGN KEY (invoiceid) REFERENCES vtiger_invoice(invoiceid) ON DELETE CASCADE",
-				"alter table vtiger_invoicegrouprelation ADD CONSTRAINT fk_invoicegrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_groups(name) ON DELETE CASCADE"
+				"alter table vtiger_invoicegrouprelation ADD CONSTRAINT fk_invoicegrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE"
 			    );
 foreach($alter_query_array13 as $query)
 {
@@ -1556,7 +1564,7 @@
 
 $alter_query_array14 = Array(
 				"alter table vtiger_pogrouprelation ADD CONSTRAINT fk_pogrouprelation FOREIGN KEY (purchaseorderid) REFERENCES vtiger_purchaseorder(purchaseorderid) ON DELETE CASCADE",
-				"alter table vtiger_pogrouprelation ADD CONSTRAINT fk_productgrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_groups(name) ON DELETE CASCADE"
+				"alter table vtiger_pogrouprelation ADD CONSTRAINT fk_productgrouprelation2 FOREIGN KEY (groupname) REFERENCES vtiger_groups(groupname) ON DELETE CASCADE"
 			    );
 foreach($alter_query_array14 as $query)
 {
@@ -1669,11 +1677,11 @@
 Execute($create_query19);
 
 $alter_query_array17 = Array(
-				"ALTER TABLE `vtiger_chat_msg`  ADD CONSTRAINT `chat_msg_ibfk_1` FOREIGN KEY (`chat_from`) REFERENCES `chat_users` (`id`) ON DELETE CASCADE",
-
-				"ALTER TABLE `vtiger_chat_pchat`  ADD CONSTRAINT `chat_pchat_ibfk_1` FOREIGN KEY (`msg`) REFERENCES `chat_msg` (`id`) ON DELETE CASCADE",
-
-				"ALTER TABLE `vtiger_chat_pvchat`  ADD CONSTRAINT `chat_pvchat_ibfk_1` FOREIGN KEY (`msg`) REFERENCES `chat_msg` (`id`) ON DELETE CASCADE"
+				"ALTER TABLE `vtiger_chat_msg`  ADD CONSTRAINT `chat_msg_ibfk_1` FOREIGN KEY (`chat_from`) REFERENCES `vtiger_chat_users` (`id`) ON DELETE CASCADE",
+
+				"ALTER TABLE `vtiger_chat_pchat`  ADD CONSTRAINT `chat_pchat_ibfk_1` FOREIGN KEY (`msg`) REFERENCES `vtiger_chat_msg` (`id`) ON DELETE CASCADE",
+
+				"ALTER TABLE `vtiger_chat_pvchat`  ADD CONSTRAINT `chat_pvchat_ibfk_1` FOREIGN KEY (`msg`) REFERENCES `vtiger_chat_msg` (`id`) ON DELETE CASCADE"
 			    );
 foreach($alter_query_array17 as $query)
 {
@@ -1823,8 +1831,8 @@
   `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_CampaignContRel1` FOREIGN KEY (`campaignid`) REFERENCES `campaign` (`campaignid`) ON DELETE CASCADE
+  CONSTRAINT `fk_CampaignContRel2` FOREIGN KEY (`contactid`) REFERENCES `vtiger_contactdetails` (`contactid`) ON DELETE CASCADE,
+  CONSTRAINT `fk_CampaignContRel1` FOREIGN KEY (`campaignid`) REFERENCES `vtiger_campaign` (`campaignid`) ON DELETE CASCADE
 ) ENGINE=InnoDB";
 */
 Execute($create_query25);
@@ -1843,8 +1851,8 @@
        `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
+	CONSTRAINT `fk_campaigngrouprelation2` FOREIGN KEY (`groupname`) REFERENCES `vtiger_groups` (`groupname`) ON DELETE CASCADE,
+	CONSTRAINT `fk_campaigngrouprelation1` FOREIGN KEY (`campaignid`) REFERENCES `vtiger_campaign` (`campaignid`) ON DELETE CASCADE
 ) ENGINE=InnoDB";
 */
 Execute($create_table_query);
@@ -1863,8 +1871,8 @@
   `leadid` int(19) NOT NULL default '0',
   PRIMARY KEY  (`campaignid`),
   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
+  CONSTRAINT `fk_CampaignLeadRel1234` FOREIGN KEY (`campaignid`) REFERENCES `vtiger_campaign` (`campaignid`) ON DELETE CASCADE,
+  CONSTRAINT `fk_CampaignLeadRel2423` FOREIGN KEY (`leadid`) REFERENCES `vtiger_leaddetails` (`leadid`) ON DELETE CASCADE
 ) ENGINE=InnoDB";
 */
 Execute($create_query26);
@@ -1872,7 +1880,7 @@
 $create_table_query1 = "CREATE TABLE vtiger_campaignscf (
   `campaignid` int(19) NOT NULL default '0',
    PRIMARY KEY  (`campaignid`),
-   CONSTRAINT `fk_CampaignsCF` FOREIGN KEY (`campaignid`) REFERENCES `campaign` (`campaignid`) ON DELETE CASCADE
+   CONSTRAINT `fk_CampaignsCF` FOREIGN KEY (`campaignid`) REFERENCES `vtiger_campaign` (`campaignid`) ON DELETE CASCADE
 ) ENGINE=InnoDB";
 Execute($create_table_query1);
 
@@ -1912,7 +1920,7 @@
 //"ALTER TABLE `vtiger_field` DROP INDEX `tabid`",
 "ALTER TABLE `vtiger_freetagged_objects` DROP INDEX `tagger_id_index`",
 "ALTER TABLE `vtiger_freetagged_objects` DROP INDEX `object_id_index`",
-"ALTER TABLE `vtiger_groups` DROP INDEX `groupname`",
+//"ALTER TABLE `vtiger_groups` DROP INDEX `groupname`",
 //"ALTER TABLE `vtiger_invoicegrouprelation` DROP INDEX `fk_invoicegrouprelation2`",
 //"ALTER TABLE `vtiger_leadscf` DROP COLUMN `cf_354`",
 //"ALTER TABLE `vtiger_leadscf` DROP COLUMN `cf_358`",
@@ -2054,9 +2062,9 @@
   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
+  CONSTRAINT `fk_datashare_grp2grp2` FOREIGN KEY (`to_groupid`) REFERENCES `vtiger_groups` (`groupid`) ON DELETE CASCADE,
+  CONSTRAINT `fk_datashare_grp2grp1` FOREIGN KEY (`share_groupid`) REFERENCES `vtiger_groups` (`groupid`) ON DELETE CASCADE,
+  CONSTRAINT `fk_datashare_grp2grp789` FOREIGN KEY (`shareid`) REFERENCES `vtiger_datashare_module_rel` (`shareid`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1",
 */
 
@@ -2078,9 +2086,9 @@
   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
+  CONSTRAINT `fk_datashare_grp2role2` FOREIGN KEY (`to_roleid`) REFERENCES `vtiger_role` (`roleid`) ON DELETE CASCADE,
+  CONSTRAINT `fk_datashare_grp2role1` FOREIGN KEY (`share_groupid`) REFERENCES `vtiger_groups` (`groupid`) ON DELETE CASCADE,
+  CONSTRAINT `fk_datashare_grp2role345` FOREIGN KEY (`shareid`) REFERENCES `vtiger_datashare_module_rel` (`shareid`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1",
 */
 
@@ -2103,9 +2111,9 @@
   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
+  CONSTRAINT `fk_datashare_grp2rs3` FOREIGN KEY (`to_roleandsubid`) REFERENCES `vtiger_role` (`roleid`) ON DELETE CASCADE,
+  CONSTRAINT `fk_datashare_grp2rs1` FOREIGN KEY (`share_groupid`) REFERENCES `vtiger_groups` (`groupid`) ON DELETE CASCADE,
+  CONSTRAINT `fk_datashare_grp2rs36` FOREIGN KEY (`shareid`) REFERENCES `vtiger_datashare_module_rel` (`shareid`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1",
 */
 
@@ -2134,8 +2142,8 @@
   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
+  CONSTRAINT `fk_datashare_relatedmodules1` FOREIGN KEY (`relatedto_tabid`) REFERENCES `vtiger_tab` (`tabid`) ON DELETE CASCADE,
+  CONSTRAINT `fk_datashare_relatedmodules123` FOREIGN KEY (`tabid`) REFERENCES `vtiger_tab` (`tabid`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1",
 */
 
@@ -2162,9 +2170,9 @@
   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
+  CONSTRAINT `fk_datashare_role2group3` FOREIGN KEY (`to_groupid`) REFERENCES `vtiger_groups` (`groupid`) ON DELETE CASCADE,
+  CONSTRAINT `fk_datashare_role2group1` FOREIGN KEY (`share_roleid`) REFERENCES `vtiger_role` (`roleid`) ON DELETE CASCADE,
+  CONSTRAINT `fk_datashare_role2group568` FOREIGN KEY (`shareid`) REFERENCES `vtiger_datashare_module_rel` (`shareid`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1",
 */
 
@@ -2187,9 +2195,9 @@
   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
+  CONSTRAINT `fk_datashare_role2role3` FOREIGN KEY (`to_roleid`) REFERENCES `vtiger_role` (`roleid`) ON DELETE CASCADE,
+  CONSTRAINT `fk_datashare_role2role1` FOREIGN KEY (`share_roleid`) REFERENCES `vtiger_role` (`roleid`) ON DELETE CASCADE,
+  CONSTRAINT `fk_datashare_role2role345` FOREIGN KEY (`shareid`) REFERENCES `vtiger_datashare_module_rel` (`shareid`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1",
 */
 
@@ -2212,9 +2220,9 @@
   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
+  CONSTRAINT `fk_datashare_role2rs3` FOREIGN KEY (`to_roleandsubid`) REFERENCES `vtiger_role` (`roleid`) ON DELETE CASCADE,
+  CONSTRAINT `fk_datashare_role2rs1` FOREIGN KEY (`share_roleid`) REFERENCES `vtiger_role` (`roleid`) ON DELETE CASCADE,
+  CONSTRAINT `fk_datashare_role2rs987` FOREIGN KEY (`shareid`) REFERENCES `vtiger_datashare_module_rel` (`shareid`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1",
 */
 
@@ -2428,7 +2436,7 @@
 //"ALTER TABLE `vtiger_invoice` MODIFY COLUMN `salesorderid` INTEGER(19) DEFAULT NULL UNIQUE",
 "ALTER TABLE `vtiger_invoice` MODIFY COLUMN `terms_conditions` TEXT COLLATE latin1_swedish_ci",
 //"ALTER TABLE `vtiger_invoicegrouprelation` MODIFY COLUMN `invoiceid` INTEGER(19) NOT NULL PRIMARY KEY",
-"ALTER TABLE `vtiger_invoiceproductrel` MODIFY COLUMN `invoiceid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_invoiceproductrel` MODIFY COLUMN `invoiceid` INTEGER(19) NOT NULL PRIMARY KEY",
 //"ALTER TABLE `vtiger_invoiceproductrel` MODIFY COLUMN `productid` INTEGER(19) NOT NULL PRIMARY KEY",
 "ALTER TABLE `vtiger_lar` MODIFY COLUMN `createdon` DATE NOT NULL",
 //"ALTER TABLE `vtiger_leaddetails` MODIFY COLUMN `leadid` INTEGER(19) NOT NULL PRIMARY KEY",
@@ -2446,8 +2454,8 @@
 "ALTER TABLE `vtiger_notificationscheduler` MODIFY COLUMN `notificationbody` TEXT COLLATE latin1_swedish_ci",
 "ALTER TABLE `vtiger_notificationscheduler_seq` MODIFY COLUMN `id` INTEGER(11) NOT NULL",
 "ALTER TABLE `vtiger_opportunitystage` MODIFY COLUMN `probability` DECIMAL(3,2) DEFAULT '0.00'",
-"ALTER TABLE `vtiger_org_share_action2tab` MODIFY COLUMN `share_action_id` INTEGER(19) NOT NULL PRIMARY KEY",
-"ALTER TABLE `vtiger_org_share_action2tab` MODIFY COLUMN `tabid` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_org_share_action2tab` MODIFY COLUMN `share_action_id` INTEGER(19) NOT NULL PRIMARY KEY",
+//"ALTER TABLE `vtiger_org_share_action2tab` MODIFY COLUMN `tabid` INTEGER(19) NOT NULL PRIMARY KEY",
 //"ALTER TABLE `vtiger_org_share_action_mapping` MODIFY COLUMN `share_action_id` INTEGER(19) NOT NULL PRIMARY KEY",
 "ALTER TABLE `vtiger_organizationdetails` MODIFY COLUMN `website` VARCHAR(100) COLLATE latin1_swedish_ci DEFAULT NULL",
 "ALTER TABLE `vtiger_organizationdetails` MODIFY COLUMN `logo` TEXT COLLATE latin1_swedish_ci",
@@ -2627,32 +2635,17 @@
 "ALTER TABLE `vtiger_troubletickets` ADD KEY `status2` (`status`)",
 "ALTER TABLE `vtiger_users2group` ADD KEY `idx_users2group` (`groupid`, `userid`)",
 "ALTER TABLE `vtiger_users2group` ADD KEY `fk_users2group2` (`userid`)",
-//"ALTER TABLE `vtiger_accountgrouprelation` ADD CONSTRAINT `fk_accountgrouprelation2` FOREIGN KEY (`groupname`) REFERENCES `groups` (`groupname`) ON DELETE CASCADE",
-//"ALTER TABLE `vtiger_accountgrouprelation` ADD CONSTRAINT `fk_accountgrouprelation123` FOREIGN KEY (`accountid`) REFERENCES `account` (`accountid`) ON DELETE CASCADE",
-//"ALTER TABLE `vtiger_contactgrouprelation` ADD CONSTRAINT `fk_contactgrouprelation2` FOREIGN KEY (`groupname`) REFERENCES `groups` (`groupname`) ON DELETE CASCADE",
-//"ALTER TABLE `vtiger_contactgrouprelation` ADD CONSTRAINT `fk_contactgrouprelation123` FOREIGN KEY (`contactid`) REFERENCES `contactdetails` (`contactid`) ON DELETE CASCADE",
-"ALTER TABLE `vtiger_customaction` ADD CONSTRAINT `customaction_FK1` FOREIGN KEY (`cvid`) REFERENCES `customview` (`cvid`) ON DELETE CASCADE",
-"ALTER TABLE `vtiger_invoice` ADD CONSTRAINT `fk_Invoice2` FOREIGN KEY (`salesorderid`) REFERENCES `salesorder` (`salesorderid`) ON DELETE CASCADE",
-//"ALTER TABLE `vtiger_invoicegrouprelation` ADD CONSTRAINT `fk_invoicegrouprelation234` FOREIGN KEY (`invoiceid`) REFERENCES `invoice` (`invoiceid`) ON DELETE CASCADE",
-//"ALTER TABLE `vtiger_invoicegrouprelation` ADD CONSTRAINT `fk_invoicegrouprelation2` FOREIGN KEY (`groupname`) REFERENCES `groups` (`groupname`) ON DELETE CASCADE",
-//"ALTER TABLE `vtiger_org_share_action2tab` ADD CONSTRAINT `fk_org_share_action2tab12345` FOREIGN KEY (`tabid`) REFERENCES `tab` (`tabid`) ON DELETE CASCADE",
-//"ALTER TABLE `vtiger_pogrouprelation` ADD CONSTRAINT `fk_pogrouprelation2` FOREIGN KEY (`groupname`) REFERENCES `groups` (`groupname`) ON DELETE CASCADE",
-//"ALTER TABLE `vtiger_pogrouprelation` ADD CONSTRAINT `fk_pogrouprelation123` FOREIGN KEY (`purchaseorderid`) REFERENCES `purchaseorder` (`purchaseorderid`) ON DELETE CASCADE",
-//"ALTER TABLE `vtiger_potentialgrouprelation` ADD CONSTRAINT `fk_potentialgrouprelation2` FOREIGN KEY (`groupname`) REFERENCES `groups` (`groupname`) ON DELETE CASCADE",
-//"ALTER TABLE `vtiger_potentialgrouprelation` ADD CONSTRAINT `fk_potentialgrouprelation67` FOREIGN KEY (`potentialid`) REFERENCES `potential` (`potentialid`) ON DELETE CASCADE",
-//"ALTER TABLE `vtiger_profile2globalpermissions` ADD CONSTRAINT `fk_profile2globalpermissions57` FOREIGN KEY (`profileid`) REFERENCES `profile` (`profileid`) ON DELETE CASCADE",
-"ALTER TABLE `vtiger_purchaseorder` ADD CONSTRAINT `fk_PO3` FOREIGN KEY (`contactid`) REFERENCES `contactdetails` (`contactid`) ON DELETE CASCADE",
-"ALTER TABLE `vtiger_purchaseorder` ADD CONSTRAINT `fk_PO2` FOREIGN KEY (`vendorid`) REFERENCES `vendor` (`vendorid`) ON DELETE CASCADE",
-"ALTER TABLE `vtiger_purchaseorder` ADD CONSTRAINT `fk_PO2345` FOREIGN KEY (`quoteid`) REFERENCES `quotes` (`quoteid`) ON DELETE CASCADE",
-//"ALTER TABLE `vtiger_quotegrouprelation` ADD CONSTRAINT `fk_quotegrouprelation2` FOREIGN KEY (`groupname`) REFERENCES `groups` (`groupname`) ON DELETE CASCADE",
-//"ALTER TABLE `vtiger_quotegrouprelation` ADD CONSTRAINT `fk_quotegrouprelation132` FOREIGN KEY (`quoteid`) REFERENCES `quotes` (`quoteid`) ON DELETE CASCADE",
-"ALTER TABLE `vtiger_quotes` ADD CONSTRAINT `fk_Quotes3` FOREIGN KEY (`contactid`) REFERENCES `contactdetails` (`contactid`) ON DELETE CASCADE",
-"ALTER TABLE `vtiger_quotes` ADD CONSTRAINT `fk_Quotes2` FOREIGN KEY (`potentialid`) REFERENCES `potential` (`potentialid`) ON DELETE CASCADE",
-"ALTER TABLE `vtiger_salesorder` ADD CONSTRAINT `fk_SO4` FOREIGN KEY (`contactid`) REFERENCES `contactdetails` (`contactid`) ON DELETE CASCADE",
-"ALTER TABLE `vtiger_salesorder` ADD CONSTRAINT `fk_SO2` FOREIGN KEY (`vendorid`) REFERENCES `vendor` (`vendorid`) ON DELETE CASCADE",
-//"ALTER TABLE `vtiger_sogrouprelation` ADD CONSTRAINT `fk_sogrouprelation2` FOREIGN KEY (`groupname`) REFERENCES `groups` (`groupname`) ON DELETE CASCADE",
-//"ALTER TABLE `vtiger_sogrouprelation` ADD CONSTRAINT `fk_sogrouprelation78` FOREIGN KEY (`salesorderid`) REFERENCES `salesorder` (`salesorderid`) ON DELETE CASCADE",
-"ALTER TABLE `vtiger_vendorcontactrel` ADD CONSTRAINT `fk_VendorContactRel45` FOREIGN KEY (`vendorid`) REFERENCES `vendor` (`vendorid`) ON DELETE CASCADE"
+"ALTER TABLE `vtiger_customaction` ADD CONSTRAINT `customaction_FK1` FOREIGN KEY (`cvid`) REFERENCES `vtiger_customview` (`cvid`) ON DELETE CASCADE",
+"ALTER TABLE `vtiger_invoice` ADD CONSTRAINT `fk_Invoice2` FOREIGN KEY (`salesorderid`) REFERENCES `vtiger_salesorder` (`salesorderid`) ON DELETE CASCADE",
+//"ALTER TABLE `vtiger_profile2globalpermissions` ADD CONSTRAINT `fk_profile2globalpermissions57` FOREIGN KEY (`profileid`) REFERENCES `vtiger_profile` (`profileid`) ON DELETE CASCADE",
+"ALTER TABLE `vtiger_purchaseorder` ADD CONSTRAINT `fk_PO3` FOREIGN KEY (`contactid`) REFERENCES `vtiger_contactdetails` (`contactid`) ON DELETE CASCADE",
+"ALTER TABLE `vtiger_purchaseorder` ADD CONSTRAINT `fk_PO2` FOREIGN KEY (`vendorid`) REFERENCES `vtiger_vendor` (`vendorid`) ON DELETE CASCADE",
+"ALTER TABLE `vtiger_purchaseorder` ADD CONSTRAINT `fk_PO2345` FOREIGN KEY (`quoteid`) REFERENCES `vtiger_quotes` (`quoteid`) ON DELETE CASCADE",
+"ALTER TABLE `vtiger_quotes` ADD CONSTRAINT `fk_Quotes3` FOREIGN KEY (`contactid`) REFERENCES `vtiger_contactdetails` (`contactid`) ON DELETE CASCADE",
+"ALTER TABLE `vtiger_quotes` ADD CONSTRAINT `fk_Quotes2` FOREIGN KEY (`potentialid`) REFERENCES `vtiger_potential` (`potentialid`) ON DELETE CASCADE",
+"ALTER TABLE `vtiger_salesorder` ADD CONSTRAINT `fk_SO4` FOREIGN KEY (`contactid`) REFERENCES `vtiger_contactdetails` (`contactid`) ON DELETE CASCADE",
+"ALTER TABLE `vtiger_salesorder` ADD CONSTRAINT `fk_SO2` FOREIGN KEY (`vendorid`) REFERENCES `vtiger_vendor` (`vendorid`) ON DELETE CASCADE",
+"ALTER TABLE `vtiger_vendorcontactrel` ADD CONSTRAINT `fk_VendorContactRel45` FOREIGN KEY (`vendorid`) REFERENCES `vtiger_vendor` (`vendorid`) ON DELETE CASCADE"
 		    );
 foreach($query_array as $query)
 {




From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 08:41:38 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 12:41:38 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7529 -
 /vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl
Message-ID: <20060626124138.B1D5583FD3A@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 26 06:41:34 2006
New Revision: 7529

Log:
update sharing access tpl file

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

Modified: vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl Mon Jun 26 06:41:34 2006
@@ -18,7 +18,7 @@
 	width:500px;
 	position:fixed;
 	left:250px;
-	top:200px;
+	top:98px;
 	display:block;
 }
 </style>




From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 08:42:53 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 12:42:53 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7530 -
 /vtigercrm/trunk/modules/Migration/ModifyDatabase/rename_tables.php
Message-ID: <20060626124253.7A69783FD3A@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 26 06:42:49 2006
New Revision: 7530

Log:
* Added newly which will be used to rename all the tables with prefix vtiger_ and update some table columns with prefix which have the tablename in its colum values

Added:
    vtigercrm/trunk/modules/Migration/ModifyDatabase/rename_tables.php




From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 08:43:19 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 12:43:19 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7531 -
 /vtigercrm/trunk/modules/Settings/language/en_us.lang.php
Message-ID: <20060626124319.4114183FD3A@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 26 06:43:15 2006
New Revision: 7531

Log:
labels added for proxy server settings

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 Jun 26 06:43:15 2006
@@ -320,6 +320,7 @@
 
 'LBL_SYSTEM_CONFIG'=>'System Configuration',
 'LBL_SYSTEM_INFO'=>'System Information',
+'LBL_PROXY_SETTINGS'=>'Proxy Server Settings',
 
 'LBL_CURRENCY_CONFIGURATION'=>'- Currency Information',
 
@@ -446,6 +447,16 @@
 'LBL_CONFIGURE_BACKUP_SERVER'=>' - Configure Backup Server',
 
 'LBL_SYSTEM_CONFIGURATION'=>' - System Configuration',
+
+'LBL_PROXY_SERVER_CONFIGURATION'=>'Proxy Server Configuration',
+
+'LBL_PROXY_SERVER_INFO'=>'Proxy Server Information',
+
+'LBL_PROXY_SERVER_SETTINGS'=>'Proxy Server Settings',
+
+'LBL_CONFIGURE_PROXY_SERVER'=>' - Configure Proxy Server',
+
+'LBL_PROXY_PORT'=>'Port Number',
 
 
 




From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 08:48:18 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 12:48:18 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7532 -
	/vtigercrm/trunk/Smarty/templates/Settings.tpl
Message-ID: <20060626124818.DE05983FD4A@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 26 06:48:15 2006
New Revision: 7532

Log:
changes made for proxy server 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 Mon Jun 26 06:48:15 2006
@@ -474,7 +474,7 @@
 						<table border=0 cellspacing=0 cellpadding=5 width=100%>
 						<tr>
 							<td rowspan=2 valign=top>&nbsp;</td>
-							<td class=big valign=top>&nbsp;</td>
+							<td class=big valign=top><a href="index.php?module=Settings&action=ProxyServerConfig&parenttab=Settings">{$MOD.LBL_PROXY_SETTINGS}</a></td>
 						</tr>
 						<tr>
 							<td class="small" valign=top>&nbsp;</td>




From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 08:51:38 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 12:51:38 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7533 -
	/vtigercrm/trunk/Smarty/templates/SetMenu.tpl
Message-ID: <20060626125138.8529683FD4A@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 26 06:51:34 2006
New Revision: 7533

Log:
changes made for proxy server settings

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

Modified: vtigercrm/trunk/Smarty/templates/SetMenu.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/SetMenu.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/SetMenu.tpl Mon Jun 26 06:51:34 2006
@@ -136,6 +136,11 @@
 				{else}
 				<tr><td class="settingsTabList" nowrap><a href="index.php?module=System&action=systemconfig&parenttab=Settings">{$MOD.LBL_SYSTEM_INFO}</a></td></tr>
 				{/if}
+				{if $smarty.request.action eq 'ProxyServerConfig'}
+                                <tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_PROXY_SETTINGS}</td></tr>
+                                {else}
+                                <tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=ProxyServerConfig&parenttab=Settings">{$MOD.LBL_PROXY_SETTINGS}</a></td></tr>
+                                {/if}
 				</table>
 			</td>
 			<td width=90% class="small settingsSelectedUI" valign=top >




From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 08:53:59 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 12:53:59 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7534 -
 /vtigercrm/trunk/Smarty/templates/Settings/ProxyServer.tpl
Message-ID: <20060626125359.C026D83FD50@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 26 06:53:55 2006
New Revision: 7534

Log:
file added for proxy server settings

Added:
    vtigercrm/trunk/Smarty/templates/Settings/ProxyServer.tpl




From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 08:41:13 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 12:41:13 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7528 -
	/vtigercrm/trunk/vtigerservice.php
Message-ID: <20060626124113.311C183FD2F@vtiger.fosslabs.com>

Author: richie
Date: Mon Jun 26 06:41:09 2006
New Revision: 7528

Log:
changed reference to firefox and thunderbird rel files

Modified:
    vtigercrm/trunk/vtigerservice.php

Modified: vtigercrm/trunk/vtigerservice.php
==============================================================================
--- vtigercrm/trunk/vtigerservice.php (original)
+++ vtigercrm/trunk/vtigerservice.php Mon Jun 26 06:41:09 2006
@@ -25,7 +25,7 @@
 	}
 	elseif($_REQUEST['service'] == "firefox")
 	{
-		include("soap/contactserialize.php");
+		include("soap/firefoxtoolbar.php");
 	}
 	elseif($_REQUEST['service'] == "wordplugin")
 	{
@@ -33,7 +33,7 @@
 	}
 	elseif($_REQUEST['service'] == "thunderbird")
 	{
-		include("soap/contactserialize.php");
+		include("soap/thunderbirdplugin.php");
 	}
 	else
 	{




From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 10:05:37 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 14:05:37 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7535 - in
 /vtigercrm/trunk/modules/Dashboard: Entity_charts.php display_charts.php
Message-ID: <20060626140537.E50C083FD23@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 26 08:05:33 2006
New Revision: 7535

Log:
Changes made for product quantity stock graph

Modified:
    vtigercrm/trunk/modules/Dashboard/Entity_charts.php
    vtigercrm/trunk/modules/Dashboard/display_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 Mon Jun 26 08:05:33 2006
@@ -98,9 +98,20 @@
 			}
 
 			//Counting the number of values for a type of graph
-			if(!isset($mod_count_array[$mod_name]))
-				$mod_count_array[$mod_name]=0;
-			$mod_count_array[$mod_name]++;
+			if($graph_for == "productid")
+			{
+				if($row['qtyinstock'] =='')
+					$mod_count_array[$mod_name] = 0;
+				else
+					$mod_count_array[$mod_name]=$row['qtyinstock'];
+
+			}
+			else
+			{
+				if(!isset($mod_count_array[$mod_name]))
+					$mod_count_array[$mod_name]=0;
+				$mod_count_array[$mod_name]++;
+			}
 
 			//Counting the number of values for a type of graph for a particular date
 			if(!isset($count_by_date[$mod_name][$crtd_date]))
@@ -200,7 +211,7 @@
 					if($name_val!="")
 						$name=$name_val;
 				}
-				if($graph_for =="product_id")
+				if($graph_for =="product_id" || $graph_for =="productid")
 				{
 					$query = "SELECT productname FROM vtiger_products WHERE productid='".$name."'";
 					$result = $adb->query($query);
@@ -241,29 +252,15 @@
 					if($name_val!="")
 						$name=$name_val;
 				}
-			if($graph_for =="contactid")
+				if($graph_for =="contactid")
 				{
 					$query = "SELECT lastname FROM vtiger_contactdetails WHERE contactid='".$name."'";
-					echo '>>>>>>>>>. '.$query;
 					$result = $adb->query($query);
 					$name_val = $adb->query_result($result,0,"lastname");
 					if($name_val!="")
 						$name=$name_val;
 				}
 
-
-
-
-
-
-
-
-
-
-
-
-
-				
 				//Passing name to graph
 				if($mod_name_val!="") $mod_name_val.="::$name";
 				else $mod_name_val="$name";
@@ -315,7 +312,15 @@
 				if($period_type!="yday")
 					$mod_cnt_table.="<td>$tot</td>";
 			}
-			$cnt_total=array_sum($mod_tot_cnt_array);
+			if($graph_for == "productid")
+			{
+				$cnt_total=array_sum($mod_count_array);
+			}
+			else
+			{
+				$cnt_total=array_sum($mod_tot_cnt_array);
+			}
+
 			$mod_cnt_table.="<td align=\"center\" class=\"$class\">$cnt_total</td></tr></table>";
 			$mod_cnt_table.="</table>";
 			$title_of_graph="$title : $cnt_total";

Modified: vtigercrm/trunk/modules/Dashboard/display_charts.php
==============================================================================
--- vtigercrm/trunk/modules/Dashboard/display_charts.php (original)
+++ vtigercrm/trunk/modules/Dashboard/display_charts.php Mon Jun 26 08:05:33 2006
@@ -486,9 +486,9 @@
                             echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
                     }
 		    //Charts for Products by Quantity in stock
-		    elseif (($type == "productbyqtyinstock") && (getFieldVisibilityPermission('Products',$user_id,'productqtyinstock') == "0"))
-		    {
-			$graph_by="qtyinstock";
+		    elseif (($type == "productbyqtyinstock") && (getFieldVisibilityPermission('Products',$user_id,'qtyinstock') == "0"))
+		    {
+			$graph_by="productid";
 			    $graph_title=$mod_strings['productbyqtyinstock'];
 			    $module="Products";
 			    $where="";




From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 10:23:27 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 14:23:27 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7536 -
	/vtigercrm/trunk/include/utils/ListViewUtils.php
Message-ID: <20060626142328.1588483FD23@vtiger.fosslabs.com>

Author: richie
Date: Mon Jun 26 08:23:17 2006
New Revision: 7536

Log:
Security support for Emails done

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 Jun 26 08:23:17 2006
@@ -1841,7 +1841,7 @@
 				ON vtiger_emaildetails.emailid = vtiger_activity.activityid
 			WHERE vtiger_activity.activitytype = 'Emails'
 			AND vtiger_crmentity.deleted = 0 ";
-		if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[$tab_id] == 3)
+		if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1)
 		{
 			$sec_parameter=getListViewSecurityParameter($module);
 			$query .= $sec_parameter;	




From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 10:28:38 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 14:28:38 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7537 -
 /vtigercrm/trunk/Smarty/templates/CreateWordTemplate.tpl
Message-ID: <20060626142838.5B89983FD19@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 26 08:28:34 2006
New Revision: 7537

Log:
update createwordtemplate tpl file

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 Mon Jun 26 08:28:34 2006
@@ -43,7 +43,7 @@
 				
 					<table border=0 cellspacing=0 cellpadding=5 width=100% class="tableHeading">
 					<tr>
-						<td class="big"><strong>{$UMOD.LBL_NEW_TEMPLATE}</strong></td>
+						<td class="big"><strong>{$UMOD.LBL_NEW_TEMPLATE}</strong><br>{$ERRORFLAG}</br></td>
 						<td class="small" align=right>
 							<input title="{$APP.LBL_SAVE_BUTTON_LABEL}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" type="submit" tabindex="4" name="button" value="{$APP.LBL_SAVE_BUTTON_LABEL}" onclick="this.form.action.value='add2db'; this.form.parenttab.value='Settings'" class="crmButton small save" />&nbsp;
 							&nbsp;<input title="{$APP.LBL_CANCEL_BUTTON_LABEL}" accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" tabindex="5"  onclick="window.history.back()" type="button" name="button" value="{$APP.LBL_CANCEL_BUTTON_LABEL}" class="crmButton small cancel" />




From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 10:29:23 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 14:29:23 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7538 -
	/vtigercrm/trunk/include/utils/UserInfoUtil.php
Message-ID: <20060626142923.B26CE83FD19@vtiger.fosslabs.com>

Author: richie
Date: Mon Jun 26 08:29:11 2006
New Revision: 7538

Log:
Security support for Emails done

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

Modified: vtigercrm/trunk/include/utils/UserInfoUtil.php
==============================================================================
--- vtigercrm/trunk/include/utils/UserInfoUtil.php (original)
+++ vtigercrm/trunk/include/utils/UserInfoUtil.php Mon Jun 26 08:29:11 2006
@@ -4265,23 +4265,7 @@
 	}
 	elseif($module == 'Emails')
 	{
-		echo '<BR>now<BR>'; 
-		$sec_query .= "and (vtiger_crmentity.smownerid in($current_user->id) or vtiger_crmentity.smownerid in(select vtiger_user2role.userid from vtiger_user2role inner join vtiger_users on vtiger_users.id=vtiger_user2role.userid inner join vtiger_role on vtiger_role.roleid=vtiger_user2role.roleid where vtiger_role.parentrole like '".$current_user_parent_role_seq."::%') or vtiger_crmentity.smownerid in(select shareduserid from vtiger_tmp_read_user_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")";
-
-		//Adding crterial for vtiger_account related emails sharing
-		 $sec_query .= "or vtiger_seactivityrel.crmid in (select crmid from vtiger_crmentity where setype='Accounts' and vtiger_crmentity.smownerid in(select shareduserid from vtiger_tmp_read_user_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Accounts')." and relatedtabid=".$tabid.")) or vtiger_seactivityrel.crmid in (select crmid from vtiger_crmentity left join vtiger_accountgrouprelation on vtiger_accountgrouprelation.accountid=vtiger_crmentity.crmid inner join vtiger_groups on vtiger_groups.groupname=vtiger_accountgrouprelation.groupname where setype='Accounts' and vtiger_crmentity.smownerid=0 and vtiger_groups.groupid in(select vtiger_tmp_read_group_rel_sharing_per.sharedgroupid from vtiger_tmp_read_group_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Accounts')." and relatedtabid=".$tabid."))";
-		//Adding crterial for lead related emails sharing
-		 $sec_query .= " or vtiger_seactivityrel.crmid in (select crmid from vtiger_crmentity where setype='Leads' and vtiger_crmentity.smownerid in(select shareduserid from vtiger_tmp_read_user_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Leads')." and relatedtabid=".$tabid.")) or vtiger_seactivityrel.crmid in (select crmid from vtiger_crmentity left join vtiger_leadgrouprelation on vtiger_leadgrouprelation.leadid=vtiger_crmentity.crmid inner join vtiger_groups on vtiger_groups.groupname=vtiger_leadgrouprelation.groupname where setype='Leads' and vtiger_crmentity.smownerid=0 and vtiger_groups.groupid in(select vtiger_tmp_read_group_rel_sharing_per.sharedgroupid from vtiger_tmp_read_group_rel_sharing_per where userid=".$current_user->id." and tabid=".getTabid('Leads')." and relatedtabid=".$tabid."))";
-	
-
-		//Adding crteria for group sharing
-		 $sec_query .= " or (vtiger_crmentity.smownerid in (0) and (";
-
-                if(sizeof($current_user_groups) > 0)
-                {
-                	$sec_query .= "vtiger_groups.groupid in".getCurrentUserGroupList()." or ";
-                }
-		$sec_query .= "vtiger_groups.groupid in(select vtiger_tmp_read_group_sharing_per.sharedgroupid from vtiger_tmp_read_group_sharing_per where userid=".$current_user->id." and tabid=".$tabid.")))) ";
+		$sec_query .= "and vtiger_crmentity.smownerid=".$current_user->id." "; 
 	
 	}
 	elseif($module == 'Activities')
@@ -4523,7 +4507,6 @@
                 'HelpDesk'=>'LBL_HELPDESK_FIELD_ACCESS',
                 'Products'=>'LBL_PRODUCT_FIELD_ACCESS',
                 'Notes'=>'LBL_NOTE_FIELD_ACCESS',
-                'Emails'=>'LBL_EMAIL_FIELD_ACCESS',
                 'Activities'=>'LBL_TASK_FIELD_ACCESS',
                 'Events'=>'LBL_EVENT_FIELD_ACCESS',
                 'Vendors'=>'LBL_VENDOR_FIELD_ACCESS',




From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 10:32:22 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 14:32:22 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7539 -
	/vtigercrm/trunk/soap/firefoxtoolbar.php
Message-ID: <20060626143222.9563F83FD4A@vtiger.fosslabs.com>

Author: richie
Date: Mon Jun 26 08:32:19 2006
New Revision: 7539

Log:
changed logger name

Modified:
    vtigercrm/trunk/soap/firefoxtoolbar.php

Modified: vtigercrm/trunk/soap/firefoxtoolbar.php
==============================================================================
--- vtigercrm/trunk/soap/firefoxtoolbar.php (original)
+++ vtigercrm/trunk/soap/firefoxtoolbar.php Mon Jun 26 08:32:19 2006
@@ -15,7 +15,7 @@
 require_once('include/database/PearDatabase.php');
 require_once('modules/HelpDesk/HelpDesk.php');
 
-$log = &LoggerManager::getLogger('webforms');
+$log = &LoggerManager::getLogger('firefoxlog');
 
 $NAMESPACE = 'http://www.vtiger.com/vtigercrm/';
 $server = new soap_server;




From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 10:32:48 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 14:32:48 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7540 -
	/vtigercrm/trunk/soap/wordplugin.php
Message-ID: <20060626143248.84D4483FD6B@vtiger.fosslabs.com>

Author: richie
Date: Mon Jun 26 08:32:44 2006
New Revision: 7540

Log:
split to respective wordplugin file from contactserialize.php

Added:
    vtigercrm/trunk/soap/wordplugin.php




From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 10:32:52 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 14:32:52 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7541 - in
 /vtigercrm/trunk/modules/Users: add2db.php upload.php
Message-ID: <20060626143252.A7BD083FD19@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 26 08:32:48 2006
New Revision: 7541

Log:
put a check to upload only doc file in the mail merge file  - ahmed

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

Modified: vtigercrm/trunk/modules/Users/add2db.php
==============================================================================
--- vtigercrm/trunk/modules/Users/add2db.php (original)
+++ vtigercrm/trunk/modules/Users/add2db.php Mon Jun 26 08:32:48 2006
@@ -33,13 +33,31 @@
   $binFile = $_FILES['binFile']['name'];
   $filename = basename($binFile);
   $filetype= $_FILES['binFile']['type'];
+  $filesize = $_FILES['binFile']['size'];
 
-    $filesize = $_FILES['binFile']['size'];
+  $error_flag ="";
+  $filetype_array = explode("/",$filetype);
+
+  $file_type_value = strtolower($filetype_array[1]);
+  
     if($filesize != 0)	
     {
-		$data = base64_encode(fread(fopen($uploaddir.$binFile, "r"), $filesize));
+	    if($file_type_value == "msword" || $file_type_value == "doc" || $file_type_value == "document")
+	    {
+		    if($result!=false)
+	    	    {
+			 $savefile="true";	
+		    }			 
+	    }
+	    else
+	    {
+		    $savefile="false";
+		    $error_flag="1";
+	    }		    
+	    
+ 		$data = base64_encode(fread(fopen($uploaddir.$binFile, "r"), $filesize));
 		//$data = addslashes(fread(fopen($uploaddir.$binFile, "r"), $filesize));
-	   $textDesc = $_REQUEST['txtDescription'];	
+	        $textDesc = $_REQUEST['txtDescription'];	
 		$strDescription = addslashes($textDesc);
 	//    $fileid = create_guid();
 		$date_entered = date('YmdHis');
@@ -66,6 +84,8 @@
 		$genQueryId = $adb->getUniqueID("wordtemplates");
 		if($genQueryId != '')
 		{
+			if($result!=false && $savefile=="true")
+			{
 			$module = $_REQUEST['target_module'];
 			$sql = "INSERT INTO vtiger_wordtemplates ";
 			$sql .= "(templateid,module,date_entered,parent_type,data,description,filename,filesize,filetype) ";
@@ -73,12 +93,15 @@
 			$sql .= "'$filename', '$filesize', '$filetype')";
 
 			$result = $adb->query($sql);
-			if($result!=false)
-			{
 			   $result = $adb->updateBlob('vtiger_wordtemplates','data'," filename='".$filename."'",$data);
 			   deleteFile($uploaddir,$filename);
-			   header("Location: index.php?action=listwordtemplates&module=Users&parenttab=Settings");	
+			   	header("Location: index.php?action=listwordtemplates&module=Users&parenttab=Settings");	
 			}
+		   	   elseif($savefile=="false")
+	                   {
+			   	header("Location: index.php?action=upload&module=Users&parenttab=Settings&flag=".$error_flag);	
+				   
+			   }  			   
 			else
 			{
 				include('themes/'.$theme.'/header.php');

Modified: vtigercrm/trunk/modules/Users/upload.php
==============================================================================
--- vtigercrm/trunk/modules/Users/upload.php (original)
+++ vtigercrm/trunk/modules/Users/upload.php Mon Jun 26 08:32:48 2006
@@ -25,7 +25,19 @@
 require_once($theme_path.'layout_utils.php');
 
 $smarty = new vtigerCRM_Smarty;
-
+//error handling
+if(isset($_REQUEST['flag']) && $_REQUEST['flag'] != '')
+{
+	$flag = $_REQUEST['flag'];
+	switch($flag)
+	{
+		case 1:
+			$smarty->assign("ERRORFLAG","<font color='red'><B>File has to be a Document of type doc/msword</B></font>");
+			break;
+		default:
+			$smarty->assign("ERRORFLAG","");
+	}		
+}
 
 $smarty->assign("MOD", return_module_language($current_language,'Settings'));
 $smarty->assign("IMAGE_PATH",$image_path);




From vtiger-tickets at vtiger.fosslabs.com  Mon Jun 26 10:33:33 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Mon, 26 Jun 2006 14:33:33 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23559=3A_?=
 =?utf-8?q?issue_in_file_attachment?=
In-Reply-To: <076.6d136b84657eebb4403a3defb9c4a324@vtiger.fosslabs.com>
References: <076.6d136b84657eebb4403a3defb9c4a324@vtiger.fosslabs.com>
Message-ID: <085.6c24638c8dd331131194713b4ee1b893@vtiger.fosslabs.com>

#559: issue in file attachment
--------------------------------+-------------------------------------------
  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 - File type validation is done.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/559>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 10:33:59 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 14:33:59 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7542 -
	/vtigercrm/trunk/vtigerservice.php
Message-ID: <20060626143359.194E583FD4A@vtiger.fosslabs.com>

Author: richie
Date: Mon Jun 26 08:33:55 2006
New Revision: 7542

Log:
changed reference to contactserialize for the wordplugin

Modified:
    vtigercrm/trunk/vtigerservice.php

Modified: vtigercrm/trunk/vtigerservice.php
==============================================================================
--- vtigercrm/trunk/vtigerservice.php (original)
+++ vtigercrm/trunk/vtigerservice.php Mon Jun 26 08:33:55 2006
@@ -29,7 +29,7 @@
 	}
 	elseif($_REQUEST['service'] == "wordplugin")
 	{
-		include("soap/contactserialize.php");
+		include("soap/wordplugin.php");
 	}
 	elseif($_REQUEST['service'] == "thunderbird")
 	{




From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 10:35:13 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 14:35:13 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7543 -
	/vtigercrm/trunk/soap/contactserialize.php
Message-ID: <20060626143513.DB22083FD66@vtiger.fosslabs.com>

Author: richie
Date: Mon Jun 26 08:35:10 2006
New Revision: 7543

Log:
removed as file split into respective modules

Removed:
    vtigercrm/trunk/soap/contactserialize.php




From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 10:38:16 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 14:38:16 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7544 -
	/vtigercrm/trunk/Smarty/templates/RoleEditView.tpl
Message-ID: <20060626143816.870D783FD6B@vtiger.fosslabs.com>

Author: saraj
Date: Mon Jun 26 08:38:12 2006
New Revision: 7544

Log:
updated the roles image in edit view

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 Mon Jun 26 08:38:12 2006
@@ -70,7 +70,7 @@
 				<input type="hidden" name="mode" value="{$MODE}">
 				<input type="hidden" name="parent" value="{$PARENT}">
 				<tr>
-					<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}ico-groups.gif" alt="Groups" width="48" height="48" border=0 title="Roles"></td>
+					<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}ico-roles.gif" alt="Roles" width="48" height="48" border=0 title="Roles"></td>
 					{if $MODE eq 'edit'}
 					<td class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Users&action=listroles&parenttab=Settings">{$CMOD.LBL_ROLES}</a> &gt; {$MOD.LBL_EDIT} &quot;{$ROLENAME}&quot; </b></td>
 					{else}	




From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 12:39:09 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 16:39:09 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7545 -
 /vtigercrm/trunk/modules/Users/OrgSharingDetailView.php
Message-ID: <20060626163909.496D083FBD8@vtiger.fosslabs.com>

Author: richie
Date: Mon Jun 26 10:39:00 2006
New Revision: 7545

Log:
Security support for Emails done

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

Modified: vtigercrm/trunk/modules/Users/OrgSharingDetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Users/OrgSharingDetailView.php (original)
+++ vtigercrm/trunk/modules/Users/OrgSharingDetailView.php Mon Jun 26 10:39:00 2006
@@ -61,7 +61,7 @@
 $custom_access['HelpDesk'] = getSharingRuleList('HelpDesk');
 
 //Email Sharing
-$custom_access['Emails'] = getSharingRuleList('Emails');
+//$custom_access['Emails'] = getSharingRuleList('Emails');
 
 //Campaign Sharing
 $custom_access['Campaigns'] = getSharingRuleList('Campaigns');




From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 12:39:55 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 16:39:55 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7546 -
 /vtigercrm/trunk/modules/Users/DefaultFieldPermissions.php
Message-ID: <20060626163955.A040B83FC85@vtiger.fosslabs.com>

Author: richie
Date: Mon Jun 26 10:39:47 2006
New Revision: 7546

Log:
Security support for Emails done

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

Modified: vtigercrm/trunk/modules/Users/DefaultFieldPermissions.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DefaultFieldPermissions.php (original)
+++ vtigercrm/trunk/modules/Users/DefaultFieldPermissions.php Mon Jun 26 10:39:47 2006
@@ -31,7 +31,7 @@
 $image_path=$theme_path."images/";
 require_once($theme_path.'layout_utils.php');
 
-$field_module = Array('Leads','Accounts','Contacts','Potentials','HelpDesk','Products','Notes','Emails','Activities','Events','Vendors','PriceBooks','Quotes','PurchaseOrder','SalesOrder','Invoice','Campaigns');
+$field_module = Array('Leads','Accounts','Contacts','Potentials','HelpDesk','Products','Notes','Activities','Events','Vendors','PriceBooks','Quotes','PurchaseOrder','SalesOrder','Invoice','Campaigns');
 $allfields=Array();
 foreach($field_module as $fld_module)
 {




From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 12:51:36 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 16:51:36 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7547 -
 /vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
Message-ID: <20060626165137.9A81583FC85@vtiger.fosslabs.com>

Author: richie
Date: Mon Jun 26 10:51:22 2006
New Revision: 7547

Log:
Security support for Emails done

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

Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original)
+++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Mon Jun 26 10:51:22 2006
@@ -1,2186 +1,2176 @@
-<?php
-
-/*********************************************************************************
-** The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is:  vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
- ********************************************************************************/
-
-include_once('config.php');
-require_once('include/logging.php');
-require_once('include/database/PearDatabase.php');
-require_once('data/SugarBean.php');
-require_once('data/CRMEntity.php');
-require_once('include/utils/utils.php');
-
-class DefaultDataPopulator extends CRMEntity {
-		
-	function DefaultDataPopulator() {
-		$this->log = LoggerManager::getLogger('DefaultDataPopulator');
-		$this->db = new PearDatabase();
-	}
-
-	var $new_schema = true;
-
-	function create_tables () {
-		global $app_strings;
-
-		$role1_id = $this->db->getUniqueID("role");
-		$role2_id = $this->db->getUniqueID("role");
-		$role3_id = $this->db->getUniqueID("role");
-		$role4_id = $this->db->getUniqueID("role");
-		$role5_id = $this->db->getUniqueID("role");
-
-		$profile1_id = $this->db->getUniqueID("profile");
-		$profile2_id = $this->db->getUniqueID("profile");
-		$profile3_id = $this->db->getUniqueID("profile");
-		$profile4_id = $this->db->getUniqueID("profile");
-
-                $this->db->query("insert into vtiger_role values('H".$role1_id."','Organisation','H".$role1_id."',0)");
-                $this->db->query("insert into vtiger_role values('H".$role2_id."','CEO','H".$role1_id."::H".$role2_id."',1)");
-                $this->db->query("insert into vtiger_role values('H".$role3_id."','Vice President','H".$role1_id."::H".$role2_id."::H".$role3_id."',2)");
-                $this->db->query("insert into vtiger_role values('H".$role4_id."','Sales Manager','H".$role1_id."::H".$role2_id."::H".$role3_id."::H".$role4_id."',3)");
-                $this->db->query("insert into vtiger_role values('H".$role5_id."','Sales Man','H".$role1_id."::H".$role2_id."::H".$role3_id."::H".$role4_id."::H".$role5_id."',4)");
-                
-
- $this->db->query("INSERT INTO vtiger_tab VALUES (3,'Home',0,1,'Home',null,null,1)");
- $this->db->query("INSERT INTO vtiger_tab VALUES (7,'Leads',0,4,'Leads',null,null,1)");
- $this->db->query("INSERT INTO vtiger_tab VALUES (6,'Accounts',0,5,'Accounts',null,null,1)");
- $this->db->query("INSERT INTO vtiger_tab VALUES (4,'Contacts',0,6,'Contacts',null,null,1)");
- $this->db->query("INSERT INTO vtiger_tab VALUES (2,'Potentials',0,7,'Potentials',null,null,1)");
- $this->db->query("INSERT INTO vtiger_tab VALUES (8,'Notes',0,9,'Notes',null,null,1)");
- $this->db->query("INSERT INTO vtiger_tab VALUES (9,'Activities',0,3,'Activities',null,null,1)");
- $this->db->query("INSERT INTO vtiger_tab VALUES (10,'Emails',0,10,'Emails',null,null,1)");
- $this->db->query("INSERT INTO vtiger_tab VALUES (13,'HelpDesk',0,11,'HelpDesk',null,null,1)");
- $this->db->query("INSERT INTO vtiger_tab VALUES (14,'Products',0,8,'Products',null,null,1)");
- $this->db->query("INSERT INTO vtiger_tab VALUES (1,'Dashboard',0,12,'Dashboards',null,null,1)");
- $this->db->query("INSERT INTO vtiger_tab VALUES (15,'Faq',0,14,'Faq',null,null,1)");
- $this->db->query("INSERT INTO vtiger_tab VALUES (16,'Events',2,13,'Events',null,null,1)");
- $this->db->query("INSERT INTO vtiger_tab VALUES (17,'Calendar',0,2,'Calendar',null,null,1)");
- $this->db->query("INSERT INTO vtiger_tab VALUES (18,'Vendors',0,15,'Vendors',null,null,1)");
- $this->db->query("INSERT INTO vtiger_tab VALUES (19,'PriceBooks',0,16,'PriceBooks',null,null,1)");
- $this->db->query("INSERT INTO vtiger_tab VALUES (20,'Quotes',0,17,'Quotes',null,null,1)");
- $this->db->query("INSERT INTO vtiger_tab VALUES (21,'PurchaseOrder',0,18,'PurchaseOrder',null,null,1)");
- $this->db->query("INSERT INTO vtiger_tab VALUES (22,'SalesOrder',0,19,'SalesOrder',null,null,1)");
- $this->db->query("INSERT INTO vtiger_tab VALUES (23,'Invoice',0,20,'Invoice',null,null,1)");
- $this->db->query("INSERT INTO vtiger_tab VALUES (24,'Rss',0,21,'Rss',null,null,1)");
- $this->db->query("INSERT INTO vtiger_tab VALUES (25,'Reports',0,22,'Reports',null,null,1)");
- $this->db->query("INSERT INTO vtiger_tab VALUES (26,'Campaigns',0,23,'Campaigns',null,null,1)");
- $this->db->query("INSERT INTO vtiger_tab VALUES (27,'Portal',0,24,'Portal',null,null,1)");
- $this->db->query("INSERT INTO vtiger_tab VALUES (28,'Webmails',0,25,'Webmails',null,null,1)");
- $this->db->query("insert into vtiger_tab values (29,'Users',0,26,'Users',null,null,1)");
-
-// Populate the vtiger_blocks vtiger_table
-$this->db->query("insert into vtiger_blocks values (1,2,'LBL_OPPORTUNITY_INFORMATION',1,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (2,2,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (3,2,'LBL_DESCRIPTION_INFORMATION',3,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (4,4,'LBL_CONTACT_INFORMATION',1,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (5,4,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (6,4,'LBL_CUSTOMER_PORTAL_INFORMATION',3,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (7,4,'LBL_ADDRESS_INFORMATION',4,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (8,4,'LBL_DESCRIPTION_INFORMATION',6,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (9,6,'LBL_ACCOUNT_INFORMATION',1,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (10,6,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (11,6,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (12,6,'LBL_DESCRIPTION_INFORMATION',4,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (13,7,'LBL_LEAD_INFORMATION',1,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (14,7,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (15,7,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (16,7,'LBL_DESCRIPTION_INFORMATION',4,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (17,8,'LBL_NOTE_INFORMATION',1,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (18,8,'',2,1,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (19,9,'LBL_TASK_INFORMATION',1,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (20,9,'',2,1,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (21,10,'LBL_EMAIL_INFORMATION',1,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (22,10,'',2,1,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (23,10,'',3,1,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (24,10,'',4,1,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (25,13,'LBL_TICKET_INFORMATION',1,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (26,13,'',2,1,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (27,13,'LBL_CUSTOM_INFORMATION',3,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (28,13,'LBL_DESCRIPTION_INFORMATION',4,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (29,13,'LBL_TICKET_RESOLUTION',5,0,0,1,0,0)");
-$this->db->query("insert into vtiger_blocks values (30,13,'LBL_COMMENTS',6,0,0,1,0,0)");
-$this->db->query("insert into vtiger_blocks values (31,14,'LBL_PRODUCT_INFORMATION',1,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (32,14,'LBL_PRICING_INFORMATION',2,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (33,14,'LBL_STOCK_INFORMATION',3,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (34,14,'LBL_CUSTOM_INFORMATION',4,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (35,14,'LBL_IMAGE_INFORMATION',5,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (36,14,'LBL_DESCRIPTION_INFORMATION',6,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (37,15,'LBL_FAQ_INFORMATION',1,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (38,15,'',2,1,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (39,15,'',3,1,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (40,15,'LBL_COMMENT_INFORMATION',4,0,0,1,0,0)");
-$this->db->query("insert into vtiger_blocks values (41,16,'LBL_EVENT_INFORMATION',1,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (42,16,'',2,1,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (43,16,'',3,1,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (44,18,'LBL_VENDOR_INFORMATION',1,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (45,18,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (46,18,'LBL_VENDOR_ADDRESS_INFORMATION',3,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (47,18,'LBL_DESCRIPTION_INFORMATION',4,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (48,19,'LBL_PRICEBOOK_INFORMATION',1,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (49,19,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (50,19,'LBL_DESCRIPTION_INFORMATION',3,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (51,20,'LBL_QUOTE_INFORMATION',1,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (52,20,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (53,20,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (54,20,'LBL_RELATED_PRODUCTS',4,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (55,20,'LBL_TERMS_INFORMATION',5,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (56,20,'LBL_DESCRIPTION_INFORMATION',6,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (57,21,'LBL_PO_INFORMATION',1,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (58,21,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (59,21,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (60,21,'LBL_RELATED_PRODUCTS',4,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (61,21,'LBL_TERMS_INFORMATION',5,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (62,21,'LBL_DESCRIPTION_INFORMATION',6,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (63,22,'LBL_SO_INFORMATION',1,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (64,22,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (65,22,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (66,22,'LBL_RELATED_PRODUCTS',4,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (67,22,'LBL_TERMS_INFORMATION',5,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (68,22,'LBL_DESCRIPTION_INFORMATION',6,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (69,23,'LBL_INVOICE_INFORMATION',1,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (70,23,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (71,23,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (72,23,'LBL_RELATED_PRODUCTS',4,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (73,23,'LBL_TERMS_INFORMATION',5,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (74,23,'LBL_DESCRIPTION_INFORMATION',6,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (75,4,'LBL_IMAGE_INFORMATION',5,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (76,26,'LBL_CAMPAIGN_INFORMATION',1,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (77,26,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (78,26,'LBL_DESCRIPTION_INFORMATION',3,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (79,29,'LBL_USERLOGIN_ROLE',1,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (80,29,'LBL_MORE_INFORMATION',2,0,0,0,0,0)");
-$this->db->query("insert into vtiger_blocks values (81,29,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)");
-
-//
-
-//Account Details -- START
- //Block9
-
-$this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'accountname','vtiger_account',1,'2','accountname','Account Name',1,0,0,100,1,9,1,'V~M',0,1,'BAS')");	
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'phone','vtiger_account',1,'11','phone','Phone',1,0,0,100,2,9,1,'V~O',0,2,'BAS')");	
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'website','vtiger_account',1,'17','website','Website',1,0,0,100,3,9,1,'V~O',0,3,'BAS')");	
-
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'fax','vtiger_account',1,'1','fax','Fax',1,0,0,100,4,9,1,'V~O',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'tickersymbol','vtiger_account',1,'1','tickersymbol','Ticker Symbol',1,0,0,100,5,9,1,'V~O',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'otherphone','vtiger_account',1,'11','otherphone','Other Phone',1,0,0,100,6,9,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'parentid','vtiger_account',1,'51','account_id','Member Of',1,0,0,100,7,9,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'email1','vtiger_account',1,'13','email1','Email',1,0,0,100,8,9,1,'E~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'employees','vtiger_account',1,'7','employees','Employees',1,0,0,100,9,9,1,'I~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'email2','vtiger_account',1,'13','email2','Other Email',1,0,0,100,10,9,1,'E~O',1,null,'ADV')");
-
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'ownership','vtiger_account',1,'1','ownership','Ownership',1,0,0,100,11,9,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'rating','vtiger_account',1,'1','rating','Rating',1,0,0,100,12,9,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'industry','vtiger_account',1,'15','industry','industry',1,0,0,100,13,9,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'siccode','vtiger_account',1,'1','siccode','SIC Code',1,0,0,100,14,9,1,'I~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'account_type','vtiger_account',1,'15','accounttype','Type',1,0,0,100,15,9,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'annualrevenue','vtiger_account',1,'71','annual_revenue','Annual Revenue',1,0,0,100,16,9,1,'I~O',1,null,'ADV')");
- //Added vtiger_field emailoptout for vtiger_accounts -- after 4.2 patch2
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'emailoptout','vtiger_account',1,'56','emailoptout','Email Opt Out',1,0,0,100,17,9,1,'C~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'notify_owner','vtiger_account',1,56,'notify_owner','Notify Owner',1,0,0,10,18,9,1,'C~O',1,NULL,'ADV')");
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,19,9,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,20,9,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,21,9,2,'T~O',1,null,'BAS')");
-
-
-
-
- //Block 11
-$this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'street','vtiger_accountbillads',1,'21','bill_street','Billing Address',1,0,0,100,1,11,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'street','vtiger_accountshipads',1,'21','ship_street','Shipping Address',1,0,0,100,2,11,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'city','vtiger_accountbillads',1,'1','bill_city','Billing City',1,0,0,100,5,11,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'city','vtiger_accountshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,11,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'state','vtiger_accountbillads',1,'1','bill_state','Billing State',1,0,0,100,7,11,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'state','vtiger_accountshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,11,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'code','vtiger_accountbillads',1,'1','bill_code','Billing Code',1,0,0,100,9,11,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'code','vtiger_accountshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,11,1,'V~O',1,null,'BAS')");
-
-
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'country','vtiger_accountbillads',1,'1','bill_country','Billing Country',1,0,0,100,11,11,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'country','vtiger_accountshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,11,1,'V~O',1,null,'BAS')");
-
-$this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'pobox','vtiger_accountbillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,11,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'pobox','vtiger_accountshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,11,1,'V~O',1,null,'BAS')");
-
-
- //Block12
-$this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,12,1,'V~O',1,null,'BAS')");
- 
-
-
-//Account Details -- END
-
-			
-//Lead Details --- START
-
-//Block13 -- Start
-
-$this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'salutation','vtiger_leaddetails',1,'55','salutationtype','Salutation',1,0,0,100,1,13,3,'V~O',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'firstname','vtiger_leaddetails',1,'55','firstname','First Name',1,0,0,100,2,13,1,'V~O',0,1,'BAS')");	
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'phone','vtiger_leadaddress',1,'11','phone','Phone',1,0,0,100,3,13,1,'V~O',0,4,'BAS')");	
-
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'lastname','vtiger_leaddetails',1,'2','lastname','Last Name',1,0,0,100,4,13,1,'V~M',0,2,'BAS')");	
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'mobile','vtiger_leadaddress',1,'1','mobile','Mobile',1,0,0,100,5,13,1,'V~O',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'company','vtiger_leaddetails',1,'2','company','Company',1,0,0,100,6,13,1,'V~M',0,3,'BAS')");
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'fax','vtiger_leadaddress',1,'1','fax','Fax',1,0,0,100,7,13,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'designation','vtiger_leaddetails',1,'1','designation','Designation',1,0,0,100,8,13,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'email','vtiger_leaddetails',1,'13','email','Email',1,0,0,100,9,13,1,'E~O',0,5,'BAS')");
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'leadsource','vtiger_leaddetails',1,'15','leadsource','Lead Source',1,0,0,100,10,13,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'website','vtiger_leadsubdetails',1,'17','website','Website',1,0,0,100,11,13,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'industry','vtiger_leaddetails',1,'15','industry','Industry',1,0,0,100,12,13,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'leadstatus','vtiger_leaddetails',1,'15','leadstatus','Lead Status',1,0,0,100,13,13,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'annualrevenue','vtiger_leaddetails',1,'71','annualrevenue','Annual Revenue',1,0,0,100,14,13,1,'I~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'rating','vtiger_leaddetails',1,'15','rating','Rating',1,0,0,100,15,13,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'noofemployees','vtiger_leaddetails',1,'1','noofemployees','No Of Employees',1,0,0,100,16,13,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,17,13,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'yahooid','vtiger_leaddetails',1,'13','yahooid','Yahoo Id',1,0,0,100,18,13,1,'V~O',1,null,'ADV')");
-$this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,19,13,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,20,13,2,'T~O',1,null,'BAS')");
-
-//Block13 -- End
-
-
-//Block15 -- Start
-
-$this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'lane','vtiger_leadaddress',1,'21','lane','Street',1,0,0,100,1,15,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'code','vtiger_leadaddress',1,'1','code','Postal Code',1,0,0,100,3,15,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'city','vtiger_leadaddress',1,'1','city','City',1,0,0,100,4,15,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'country','vtiger_leadaddress',1,'1','country','Country',1,0,0,100,5,15,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'state','vtiger_leadaddress',1,'1','state','State',1,0,0,100,6,15,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'pobox','vtiger_leadaddress',1,'1','pobox','Po Box',1,0,0,100,2,15,1,'V~O',1,null,'BAS')");
-
-//Block15 --End
-
-//Block16 -- Start
-
-$this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,16,1,'V~O',1,null,'BAS')");
-
-//Block16 -- End
-
-//Lead Details -- END
-
-
-//Contact Details -- START
-//Block4 -- Start
-
-$this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'salutation','vtiger_contactdetails',1,'55','salutationtype','Salutation',1,0,0,100,1,4,3,'V~O',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'firstname','vtiger_contactdetails',1,'55','firstname','First Name',1,0,0,100,2,4,1,'V~O',0,1,'BAS')");	
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'phone','vtiger_contactdetails',1,'11','phone','Office Phone',1,0,0,100,3,4,1,'V~O',0,4,'BAS')");	
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'lastname','vtiger_contactdetails',1,'2','lastname','Last Name',1,0,0,100,4,4,1,'V~M',0,2,'BAS')");	
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'mobile','vtiger_contactdetails',1,'1','mobile','Mobile',1,0,0,100,5,4,1,'V~O',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'accountid','vtiger_contactdetails',1,'51','account_id','Account Name',1,0,0,100,6,4,1,'I~O',0,3,'BAS')");	
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'homephone','vtiger_contactsubdetails',1,'11','homephone','Home Phone',1,0,0,100,7,4,1,'V~O',1,null,'ADV')");	
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'leadsource','vtiger_contactsubdetails',1,'15','leadsource','Lead Source',1,0,0,100,8,4,1,'V~O',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'otherphone','vtiger_contactsubdetails',1,'11','otherphone','Phone',1,0,0,100,9,4,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'title','vtiger_contactdetails',1,'1','title','Title',1,0,0,100,10,4,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'fax','vtiger_contactdetails',1,'1','fax','Fax',1,0,0,100,11,4,1,'V~O',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'department','vtiger_contactdetails',1,'1','department','Department',1,0,0,100,12,4,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'birthday','vtiger_contactsubdetails',1,'5','birthday','Birthdate',1,0,0,100,14,4,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'email','vtiger_contactdetails',1,'13','email','Email',1,0,0,100,15,4,1,'E~O',0,5,'ADV')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'reportsto','vtiger_contactdetails',1,'57','contact_id','Reports To',1,0,0,100,16,4,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'assistant','vtiger_contactsubdetails',1,'1','assistant','Assistant',1,0,0,100,17,4,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'yahooid','vtiger_contactdetails',1,'13','yahooid','Yahoo Id',1,0,0,100,18,4,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'assistantphone','vtiger_contactsubdetails',1,'11','assistantphone','Assistant Phone',1,0,0,100,19,4,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'donotcall','vtiger_contactdetails',1,'56','donotcall','Do Not Call',1,0,0,100,20,4,1,'C~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'emailoptout','vtiger_contactdetails',1,'56','emailoptout','Email Opt Out',1,0,0,100,21,4,1,'C~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,22,4,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'reference','vtiger_contactdetails',1,'56','reference','Reference',1,0,0,10,23,4,1,'C~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'notify_owner','vtiger_contactdetails',1,'56','notify_owner','Notify Owner',1,0,0,10,24,4,1,'C~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,25,4,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,26,4,2,'T~O',1,null,'BAS')");
-
-//Block4 -- End
-
-//Block6 - Begin Customer Portal
-
-$this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'portal','vtiger_customerdetails',1,'56','portal','Portal User',1,0,0,100,1,6,1,'C~O',1,null,'ADV')");
-$this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'support_start_date','vtiger_customerdetails',1,'5','support_start_date','Support Start Date',1,0,0,100,2,6,1,'D~O',1,null,'ADV')");
-$this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'support_end_date','vtiger_customerdetails',1,'5','support_end_date','Support End Date',1,0,0,100,3,6,1,'D~O~OTH~GE~support_start_date~Support Start Date',1,null,'ADV')");
-
-//Block6 - End Customer Portal
-
-//Block 7 -- Start
-
-$this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'mailingstreet','vtiger_contactaddress',1,'21','mailingstreet','Mailing Street',1,0,0,100,1,7,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'otherstreet','vtiger_contactaddress',1,'21','otherstreet','Other Street',1,0,0,100,2,7,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'mailingcity','vtiger_contactaddress',1,'1','mailingcity','Mailing City',1,0,0,100,5,7,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'othercity','vtiger_contactaddress',1,'1','othercity','Other City',1,0,0,100,6,7,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'mailingstate','vtiger_contactaddress',1,'1','mailingstate','Mailing State',1,0,0,100,7,7,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'otherstate','vtiger_contactaddress',1,'1','otherstate','Other State',1,0,0,100,8,7,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'mailingzip','vtiger_contactaddress',1,'1','mailingzip','Mailing Zip',1,0,0,100,9,7,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'otherzip','vtiger_contactaddress',1,'1','otherzip','Other Zip',1,0,0,100,10,7,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'mailingcountry','vtiger_contactaddress',1,'1','mailingcountry','Mailing Country',1,0,0,100,11,7,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'othercountry','vtiger_contactaddress',1,'1','othercountry','Other Country',1,0,0,100,12,7,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'mailingpobox','vtiger_contactaddress',1,'1','mailingpobox','Mailing Po Box',1,0,0,100,3,7,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'otherpobox','vtiger_contactaddress',1,'1','otherpobox','Other Po Box',1,0,0,100,4,7,1,'V~O',1,null,'BAS')");
-//Block7 -- End
-
-//ContactImageInformation
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'imagename','vtiger_contactdetails',1,'69','imagename','Contact Image',1,0,0,100,1,75,1,'V~O',1,null,'ADV')");
-
-
-//Block8 -- Start
-$this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,8,1,'V~O',1,null,'BAS')");
-//Block8 -- End
-//Contact Details -- END
-
-
-//Potential Details -- START
-//Block1 -- Start
-
-$this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'potentialname','vtiger_potential',1,'2','potentialname','Potential Name',1,0,0,100,1,1,1,'V~M',0,1,'BAS')");	
- $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'amount','vtiger_potential',1,71,'amount','Amount',1,0,0,100,2,1,1,'N~O',0,5,'BAS')");	
- $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'accountid','vtiger_potential',1,'50','account_id','Account Name',1,0,0,100,3,1,1,'V~M',0,2,'BAS')");	
- $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'closingdate','vtiger_potential',1,'23','closingdate','Expected Close Date',1,0,0,100,5,1,1,'D~M',0,3,'BAS')");	
- $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'potentialtype','vtiger_potential',1,'15','opportunity_type','Type',1,0,0,100,6,1,1,'V~O',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'nextstep','vtiger_potential',1,'1','nextstep','Next Step',1,0,0,100,7,1,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'leadsource','vtiger_potential',1,'15','leadsource','Lead Source',1,0,0,100,8,1,1,'V~O',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'sales_stage','vtiger_potential',1,'16','sales_stage','Sales Stage',1,0,0,100,9,1,1,'V~O',0,4,'BAS')");
- $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,10,1,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'probability','vtiger_potential',1,'9','probability','Probability',1,0,0,100,11,1,1,'N~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'campaignid','vtiger_potential',1,'58','campaignid','Campaign Source',1,0,0,100,12,1,1,'N~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,13,1,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,14,1,2,'T~O',1,null,'BAS')");
-
-//Block1 -- End
-
-//Block3 -- Start
-
- $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,3,1,'V~O',1,null,'BAS')");
-
-//Block3 -- End
-//Potential Details -- END
-
-
-//campaign entries being added
-
-
- $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'campaignname','vtiger_campaign',1,'2','campaignname','Campaign Name',1,0,0,100,1,76,1,'V~M',0,1,'BAS')");
- $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'campaigntype','vtiger_campaign',1,15,'campaigntype','Campaign Type',1,0,0,100,2,76,1,'V~O',0,5,'BAS')");
- $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'product_id','vtiger_campaign',1,59,'product_id','Product',1,0,0,100,3,76,1,'I~O',0,5,'BAS')");
- $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'campaignstatus','vtiger_campaign',1,15,'campaignstatus','Campaign Status',1,0,0,100,4,76,1,'V~O',0,5,'BAS')");
- $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'closingdate','vtiger_campaign',1,'23','closingdate','Expected Close Date',1,0,0,100,5,76,1,'D~M',0,3,'BAS')");
- $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'expectedrevenue','vtiger_campaign',1,'1','expectedrevenue','Expected Revenue',1,0,0,100,6,76,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'budgetcost','vtiger_campaign',1,'1','budgetcost','Budget Cost',1,0,0,100,7,76,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'actualcost','vtiger_campaign',1,'1','actualcost','Actual Cost',1,0,0,100,8,76,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'expectedresponse','vtiger_campaign',1,'15','expectedresponse','Expected Response',1,0,0,100,9,76,1,'V~O',0,4,'BAS')");
- $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'smownerid','vtiger_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 vtiger_field values (26,".$this->db->getUniqueID("field").",'numsent','vtiger_campaign',1,'9','numsent','Num Sent',1,0,0,100,11,76,1,'N~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'sponsor','vtiger_campaign',1,'1','sponsor','Sponsor',1,0,0,100,12,76,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'targetaudience','vtiger_campaign',1,'1','targetaudience','Target Audience',1,0,0,100,13,76,1,'V~O',1,null,'BAS')");
-
-$this->db->query("insert into vtiger_field values(26,".$this->db->getUniqueID("field").",'targetsize','vtiger_campaign',1,'1','targetsize','TargetSize',1,0,0,100,14,76,1,'N~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values(26,".$this->db->getUniqueID("field").",'expectedresponsecount','vtiger_campaign',1,'1','expectedresponsecount','Expected Response Count',1,0,0,100,17,76,1,'N~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values(26,".$this->db->getUniqueID("field").",'expectedsalescount','vtiger_campaign',1,'1','expectedsalescount','Expected Sales Count',1,0,0,100,15,76,1,'N~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values(26,".$this->db->getUniqueID("field").",'expectedroi','vtiger_campaign',1,'1','expectedroi','Expected ROI',1,0,0,100,19,76,1,'N~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values(26,".$this->db->getUniqueID("field").",'actualresponsecount','vtiger_campaign',1,'1','actualresponsecount','Actual Response Count',1,0,0,100,18,76,1,'N~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values(26,".$this->db->getUniqueID("field").",'actualsalescount','vtiger_campaign',1,'1','actualsalescount','Actual Sales Count',1,0,0,100,16,76,1,'N~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values(26,".$this->db->getUniqueID("field").",'actualroi','vtiger_campaign',1,'1','actualroi','Actual ROI',1,0,0,100,20,76,1,'N~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,15,76,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,16,76,2,'T~O',1,null,'BAS')");
-
-$this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,78,1,'V~O',1,null,'BAS')");
-
-//Campaign entries end
-
-
-//Ticket Details -- START
-//Block25 -- Start
-
- $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,2,25,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'parent_id','vtiger_troubletickets',1,'68','parent_id','Related To',1,0,0,100,4,25,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'priority','vtiger_troubletickets',1,'15','ticketpriorities','Priority',1,0,0,100,5,25,1,'V~O',0,3,'BAS')");
- $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'product_id','vtiger_troubletickets',1,'59','product_id','Product Name',1,0,0,100,6,25,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'severity','vtiger_troubletickets',1,'15','ticketseverities','Severity',1,0,0,100,7,25,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'status','vtiger_troubletickets',1,'15','ticketstatus','Status',1,0,0,100,8,25,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'category','vtiger_troubletickets',1,'15','ticketcategories','Category',1,0,0,100,9,25,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'update_log','vtiger_troubletickets',1,'15','update_log','Update History',1,0,0,100,9,25,3,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,10,25,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,11,25,2,'T~O',1,null,'BAS')");
- //Added on 26-12-2005 to add attachment in ticket editview
- $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'filename','vtiger_attachments',1,'61','filename','Attachment',1,0,0,100,12,26,1,'V~O',0,1,'BAS')");
-
- $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'title','vtiger_troubletickets',1,'22','ticket_title','Title',1,0,0,100,1,26,1,'V~M',0,1,'BAS')");
- $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'description','vtiger_troubletickets',1,'19','description','Description',1,0,0,100,1,28,1,'V~O',0,2,'BAS')");
- $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'solution','vtiger_troubletickets',1,'19','solution','Solution',1,0,0,100,1,29,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'comments','vtiger_ticketcomments',1,'19','comments','Add Comment',1,0,0,100,1,30,1,'V~O',1,null,'BAS')");
-
-//Block25-30 -- End
-//Ticket Details -- END
-
-//Product Details -- START
-//Block31-36 -- Start
-
-$this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'productname','vtiger_products',1,'2','productname','Product Name',1,0,0,100,1,31,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'productcode','vtiger_products',1,'1','productcode','Product Code',1,0,0,100,2,31,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'discontinued','vtiger_products',1,'56','discontinued','Product Active',1,0,0,100,3,31,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'manufacturer','vtiger_products',1,'15','manufacturer','Manufacturer',1,0,0,100,4,1,31,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'productcategory','vtiger_products',1,'15','productcategory','Product Category',1,0,0,100,4,31,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'sales_start_date','vtiger_products',1,'5','sales_start_date','Sales Start Date',1,0,0,100,5,31,1,'D~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'sales_end_date','vtiger_products',1,'5','sales_end_date','Sales End Date',1,0,0,100,6,31,1,'D~O~OTH~GE~sales_start_date~Sales Start Date',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'start_date','vtiger_products',1,'5','start_date','Support Start Date',1,0,0,100,7,31,1,'D~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'expiry_date','vtiger_products',1,'5','expiry_date','Support Expiry Date',1,0,0,100,8,31,1,'D~O~OTH~GE~start_date~Start Date',1,null,'BAS')");
- 
-
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'crmid','vtiger_seproductsrel',1,'66','parent_id','Related To',1,0,0,100,10,31,1,'I~O',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'contactid','vtiger_products',1,'57','contact_id','Contact Name',1,0,0,100,11,31,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'website','vtiger_products',1,'17','website','Website',1,0,0,100,12,31,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'vendor_id','vtiger_products',1,'75','vendor_id','Vendor Name',1,0,0,100,13,31,1,'I~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'mfr_part_no','vtiger_products',1,'1','mfr_part_no','Mfr PartNo',1,0,0,100,14,31,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'vendor_part_no','vtiger_products',1,'1','vendor_part_no','Vendor PartNo',1,0,0,100,15,31,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'serialno','vtiger_products',1,'1','serial_no','Serial No',1,0,0,100,16,31,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'productsheet','vtiger_products',1,'1','productsheet','Product Sheet',1,0,0,100,17,31,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'glacct','vtiger_products',1,'15','glacct','GL Account',1,0,0,100,18,31,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,19,31,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,20,31,2,'T~O',1,null,'BAS')");
-
-
-//Block32 Pricing Information
-
-$this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'unit_price','vtiger_products',1,'71','unit_price','Unit Price',1,0,0,100,1,32,1,'N~O',1,null,'BAS')"); 
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'commissionrate','vtiger_products',1,'9','commissionrate','Commission Rate',1,0,0,100,2,32,1,'N~O',1,null,'BAS')"); 
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'taxclass','vtiger_producttaxrel',1,'83','taxclass','Tax Class',1,0,0,100,4,32,1,'V~O',1,null,'BAS')");
-
-
-//Block 33 stock info
-
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'usageunit','vtiger_products',1,'15','usageunit','Usage Unit',1,0,0,100,1,33,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'qty_per_unit','vtiger_products',1,'1','qty_per_unit','Qty/Unit',1,0,0,100,2,33,1,'N~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'qtyinstock','vtiger_products',1,'1','qtyinstock','Qty In Stock',1,0,0,100,3,33,1,'I~O',1,null,'ADV')");
-$this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'reorderlevel','vtiger_products',1,'1','reorderlevel','Reorder Level',1,0,0,100,4,33,1,'I~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'handler','vtiger_products',1,'52','assigned_user_id','Handler',1,0,0,100,5,33,1,'I~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'qtyindemand','vtiger_products',1,'1','qtyindemand','Qty In Demand',1,0,0,100,6,33,1,'I~O',1,null,'ADV')");
-
-
-//ProductImageInformation
-
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'imagename','vtiger_products',1,'69','imagename','Product Image',1,0,0,100,1,35,1,'V~O',1,null,'ADV')");
-
-
-//Block 36 Description Info
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'product_description','vtiger_products',1,'19','product_description','Description',1,0,0,100,1,36,1,'V~O',1,null,'BAS')");
-
-//Product Details -- END
-
-//Note Details -- START
-//Block17 -- Start
-
-$this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("field").",'contact_id','vtiger_notes',1,'57','contact_id','Contact Name',1,0,0,100,1,17,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("field").",'crmid','vtiger_senotesrel',1,'62','parent_id','Related To',1,0,0,100,2,17,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("field").",'title','vtiger_notes',1,'2','notes_title','Subject',1,0,0,100,3,17,1,'V~M',0,1,'BAS')");
-$this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,4,17,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,5,17,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("field").",'filename','vtiger_notes',1,'61','filename','Attachment',1,0,0,100,4,17,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("field").",'notecontent','vtiger_notes',1,'19','notecontent','Note',1,0,0,100,5,18,1,'V~O',1,null,'BAS')");
-
-//Block17 -- End
-//Note Details -- END
-
-//Email Details -- START
-//Block21 -- Start
-
-	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'date_start','vtiger_activity',1,'6','date_start','Date & Time Sent',1,0,0,100,1,21,1,'DT~M~time_start~Time Start',1,null,'BAS')");
-	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'semodule','vtiger_activity',1,'2','parent_type','Sales Enity Module',1,0,0,100,2,21,3,'',1,null,'BAS')");
-	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'activitytype','vtiger_activity',1,'2','activitytype','Activtiy Type',1,0,0,100,3,21,3,'V~O',1,null,'BAS')");
-	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'crmid','vtiger_seactivityrel',1,'357','parent_id','Related To',1,0,0,100,1,22,1,'I~O',1,null,'BAS')");
-	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,5,21,1,'V~M',1,null,'BAS')");
-	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'subject','vtiger_activity',1,'2','subject','Subject',1,0,0,100,1,23,1,'V~M',1,null,'BAS')");
-	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'filename','vtiger_attachments',1,'61','filename','Attachment',1,0,0,100,2,23,1,'V~O',1,null,'BAS')");
-	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,24,1,'V~O',1,null,'BAS')");
-	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'time_start','vtiger_activity',1,'2','time_start','Time Start',1,0,0,100,9,1,23,'T~O',1,null,'BAS')");
-	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,10,1,22,'T~O',1,null,'BAS')");
- 	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,11,21,2,'T~O',1,null,'BAS')");
-
-//Block21 -- End
-//Email Details -- END
-
-//Task Details --START
-//Block19 -- Start
-$this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'subject','vtiger_activity',1,'2','subject','Subject',1,0,0,100,1,19,1,'V~M',0,1,'BAS')");
- $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,2,19,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'date_start','vtiger_activity',1,'6','date_start','Start Date & Time',1,0,0,100,3,19,1,'DT~M~time_start',0,2,'BAS')");
- $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'time_start','vtiger_activity',1,'2','time_start','Time Start',1,0,0,100,4,19,3,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'due_date','vtiger_activity',1,'23','due_date','Due Date',1,0,0,100,5,19,1,'D~M~OTH~GE~date_start~Start Date & Time',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'crmid','vtiger_seactivityrel',1,'66','parent_id','Related To',1,0,0,100,7,19,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'contactid','vtiger_cntactivityrel',1,'57','contact_id','Contact Name',1,0,0,100,8,19,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'status','vtiger_activity',1,'15','taskstatus','Status',1,0,0,100,9,19,1,'V~O',0,3,'BAS')");
- $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'eventstatus','vtiger_activity',1,'15','eventstatus','Status',1,0,0,100,9,19,3,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'priority','vtiger_activity',1,'15','taskpriority','Priority',1,0,0,100,10,19,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'sendnotification','vtiger_activity',1,'56','sendnotification','Send Notification',1,0,0,100,11,19,1,'C~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,14,19,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,15,19,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'activitytype','vtiger_activity',1,'15','activitytype','Activity Type',1,0,0,100,16,19,3,'V~O',1,null,'BAS')");
- $this->db->query("Insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'visibility','vtiger_activity',1,15,'visibility','Visibility',1,0,0,100,17,19,3,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,20,1,'V~O',1,null,'BAS')");
-
-
-$this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'duration_hours','vtiger_activity',1,'63','duration_hours','Duration',1,0,0,100,17,19,3,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'duration_minutes','vtiger_activity',1,'15','duration_minutes','Duration Minutes',1,0,0,100,18,19,3,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'location','vtiger_activity',1,'1','location','Location',1,0,0,100,19,19,3,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'reminder_time','vtiger_activity_reminder',1,'30','reminder_time','Send Reminder',1,0,0,100,1,19,3,'I~O',1,null,'BAS')");
- 
- $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'recurringtype','vtiger_recurringevents',1,'15','recurringtype','Recurrence',1,0,0,100,6,19,3,'O~O',1,null,'BAS')");
-
- $this->db->query("Insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'notime','vtiger_activity',1,56,'notime','No Time',1,0,0,100,20,19,3,'C~O',1,null,'BAS')");
-//Block19 -- End
-//Task Details -- END
-
-//Event Details --START
-//Block41-43-- Start
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'subject','vtiger_activity',1,'2','subject','Subject',1,0,0,100,1,41,1,'V~M',0,1,'BAS')");
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,2,41,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'date_start','vtiger_activity',1,'6','date_start','Start Date & Time',1,0,0,100,3,41,1,'DT~M~time_start',0,2,'BAS')");
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'time_start','vtiger_activity',1,'2','time_start','Time Start',1,0,0,100,4,41,3,'T~M',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'due_date','vtiger_activity',1,'23','due_date','End Date',1,0,0,100,5,41,1,'D~M~OTH~GE~date_start~Start Date & Time',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'recurringtype','vtiger_recurringevents',1,'15','recurringtype','Recurrence',1,0,0,100,6,41,1,'O~O',1,null,'BAS')");
-  
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'duration_hours','vtiger_activity',1,'63','duration_hours','Duration',1,0,0,100,7,41,1,'I~M',0,5,'BAS')");
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'duration_minutes','vtiger_activity',1,'15','duration_minutes','Duration Minutes',1,0,0,100,8,41,3,'O~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'crmid','vtiger_seactivityrel',1,'66','parent_id','Related To',1,0,0,100,9,41,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'eventstatus','vtiger_activity',1,'15','eventstatus','Status',1,0,0,100,10,41,1,'V~O',0,3,'BAS')");
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'sendnotification','vtiger_activity',1,'56','sendnotification','Send Notification',1,0,0,100,11,41,1,'C~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'activitytype','vtiger_activity',1,'15','activitytype','Activity Type',1,0,0,100,12,41,1,'V~O',0,4,'BAS')");
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'location','vtiger_activity',1,'1','location','Location',1,0,0,100,13,41,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,14,41,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,15,41,2,'T~O',1,null,'BAS')");
- $this->db->query("Insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'priority','vtiger_activity',1,15,'taskpriority','Priority',1,0,0,100,16,41,1,'V~O',1,null,'BAS')");
- $this->db->query("Insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'notime','vtiger_activity',1,56,'notime','No Time',1,0,0,100,17,41,1,'C~O',1,null,'BAS')");
- $this->db->query("Insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'visibility','vtiger_activity',1,15,'visibility','Visibility',1,0,0,100,18,41,1,'V~O',1,null,'BAS')");
- 
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,43,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'reminder_time','vtiger_activity_reminder',1,'30','reminder_time','Send Reminder',1,0,0,100,1,42,1,'I~O',1,null,'BAS')");
-//Block41-43 -- End
-//Event Details -- END
-
-//Faq Details -- START
-//Block37-40 -- Start
-
-$this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("field").",'product_id','vtiger_faq',1,'59','product_id','Product Name',1,0,0,100,1,37,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("field").",'category','vtiger_faq',1,'15','faqcategories','Category',1,0,0,100,2,37,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("field").",'status','vtiger_faq',1,'15','faqstatus','Status',1,0,0,100,3,37,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("field").",'question','vtiger_faq',1,'20','question','Question',1,0,0,100,1,38,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("field").",'answer','vtiger_faq',1,'20','faq_answer','Answer',1,0,0,100,1,39,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("field").",'comments','vtiger_faqcomments',1,'19','comments','Add Comment',1,0,0,100,1,40,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,3,37,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,4,37,2,'T~O',1,null,'BAS')");
-
-
-//Block37-40 -- End
-//Ticket Details -- END
-
-//Vendor Details --START
-//Block44-47
-
-$this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'vendorname','vtiger_vendor',1,'2','vendorname','Vendor Name',1,0,0,100,1,44,1,'V~M',0,1,'BAS')");
- $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'phone','vtiger_vendor',1,'1','phone','Phone',1,0,0,100,3,44,1,'V~O',0,2,'BAS')");
- $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'email','vtiger_vendor',1,'13','email','Email',1,0,0,100,4,44,1,'E~O',0,3,'BAS')");
- $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'website','vtiger_vendor',1,'17','website','Website',1,0,0,100,5,44,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'glacct','vtiger_vendor',1,'15','glacct','GL Account',1,0,0,100,6,44,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'category','vtiger_vendor',1,'1','category','Category',1,0,0,100,7,44,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,8,44,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,9,44,2,'T~O',1,null,'BAS')");
-
-//Block 46
-
-$this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'street','vtiger_vendor',1,'21','street','Street',1,0,0,100,1,46,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'pobox','vtiger_vendor',1,'1','pobox','Po Box',1,0,0,100,2,46,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'city','vtiger_vendor',1,'1','city','City',1,0,0,100,3,46,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'state','vtiger_vendor',1,'1','state','State',1,0,0,100,4,46,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'postalcode','vtiger_vendor',1,'1','postalcode','Postal Code',1,0,0,100,5,46,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'country','vtiger_vendor',1,'1','country','Country',1,0,0,100,6,46,1,'V~O',1,null,'ADV')");
-
-//Block 47
-
-$this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,47,1,'V~O',1,null,'ADV')");
-
-//Vendor Details -- END
-
-//PriceBook Details Start
-//Block48
-
-$this->db->query("insert into vtiger_field values (19,".$this->db->getUniqueID("field").",'bookname','vtiger_pricebook',1,'2','bookname','Price Book Name',1,0,0,100,1,48,1,'V~M',0,1,'BAS')");
- $this->db->query("insert into vtiger_field values (19,".$this->db->getUniqueID("field").",'active','vtiger_pricebook',1,'56','active','Active',1,0,0,100,3,48,1,'V~O',0,2,'BAS')");
-$this->db->query("insert into vtiger_field values (19,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,4,48,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (19,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,5,48,2,'T~O',1,null,'BAS')");
-
-//Block50
-
-$this->db->query("insert into vtiger_field values (19,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,50,1,'V~O',1,null,'BAS')");
-
-//PriceBook Details End
-
-
-//Quote Details -- START
- //Block51
-
-$this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'subject','vtiger_quotes',1,'2','subject','Subject',1,0,0,100,1,51,1,'V~M',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'potentialid','vtiger_quotes',1,'76','potential_id','Potential Name',1,0,0,100,2,51,1,'I~O',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'quotestage','vtiger_quotes',1,'15','quotestage','Quote Stage',1,0,0,100,3,51,1,'V~O',1,null,'BAS')");	
-
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'validtill','vtiger_quotes',1,'5','validtill','Valid Till',1,0,0,100,4,51,1,'D~O',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'team','vtiger_quotes',1,'1','team','Team',1,0,0,100,5,51,1,'V~O',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'contactid','vtiger_quotes',1,'57','contact_id','Contact Name',1,0,0,100,6,51,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'carrier','vtiger_quotes',1,'15','carrier','Carrier',1,0,0,100,8,51,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'subtotal','vtiger_quotes',1,'1','hdnSubTotal','Sub Total',1,0,0,100,9,51,3,'N~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'shipping','vtiger_quotes',1,'1','shipping','Shipping',1,0,0,100,10,51,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'inventorymanager','vtiger_quotes',1,'77','assigned_user_id1','Inventory Manager',1,0,0,100,11,51,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'tax','vtiger_quotes',1,'1','txtTax','Tax',1,0,0,100,13,51,3,'N~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'adjustment','vtiger_quotes',1,'1','txtAdjustment','Adjustment',1,0,0,100,20,51,3,'NN~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'total','vtiger_quotes',1,'1','hdnGrandTotal','Total',1,0,0,100,14,51,3,'N~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'accountid','vtiger_quotes',1,'73','account_id','Account Name',1,0,0,100,16,51,1,'I~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,17,51,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,18,51,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,19,51,2,'T~O',1,null,'BAS')");
-
-
- //Block 53
-
-$this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'bill_street','vtiger_quotesbillads',1,'24','bill_street','Billing Address',1,0,0,100,1,53,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'ship_street','vtiger_quotesshipads',1,'24','ship_street','Shipping Address',1,0,0,100,2,53,1,'V~M',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'bill_city','vtiger_quotesbillads',1,'1','bill_city','Billing City',1,0,0,100,5,53,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'ship_city','vtiger_quotesshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,53,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'bill_state','vtiger_quotesbillads',1,'1','bill_state','Billing State',1,0,0,100,7,53,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'ship_state','vtiger_quotesshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,53,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'bill_code','vtiger_quotesbillads',1,'1','bill_code','Billing Code',1,0,0,100,9,53,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'ship_code','vtiger_quotesshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,53,1,'V~O',1,null,'BAS')");
-
-
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'bill_country','vtiger_quotesbillads',1,'1','bill_country','Billing Country',1,0,0,100,11,53,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'ship_country','vtiger_quotesshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,53,1,'V~O',1,null,'BAS')");
-
-$this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'bill_pobox','vtiger_quotesbillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,53,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'ship_pobox','vtiger_quotesshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,53,1,'V~O',1,null,'BAS')");
- //Block55
-
-$this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,56,1,'V~O',1,null,'ADV')");
-
-//Block 56
-$this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'terms_conditions','vtiger_quotes',1,'19','terms_conditions','Terms & Conditions',1,0,0,100,1,55,1,'V~O',1,null,'ADV')");
-
-
-//Quote Details -- END
-
-//Purchase Order Details -- START
- //Block57
- 
-$this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'subject','vtiger_purchaseorder',1,'2','subject','Subject',1,0,0,100,1,57,1,'V~M',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'vendorid','vtiger_purchaseorder',1,'81','vendor_id','Vendor Name',1,0,0,100,3,57,1,'I~M',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'requisition_no','vtiger_purchaseorder',1,'1','requisition_no','Requisition No',1,0,0,100,4,57,1,'V~O',1,null,'BAS')");	
-
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'tracking_no','vtiger_purchaseorder',1,'1','tracking_no','Tracking Number',1,0,0,100,5,57,1,'V~O',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'contactid','vtiger_purchaseorder',1,'57','contact_id','Contact Name',1,0,0,100,6,57,1,'I~O',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'duedate','vtiger_purchaseorder',1,'5','duedate','Due Date',1,0,0,100,7,57,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'carrier','vtiger_purchaseorder',1,'15','carrier','Carrier',1,0,0,100,8,57,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'salestax','vtiger_purchaseorder',1,'1','txtTax','Sales Tax',1,0,0,100,10,57,3,'N~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'adjustment','vtiger_purchaseorder',1,'1','txtAdjustment','Adjustment',1,0,0,100,10,57,3,'NN~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'salescommission','vtiger_purchaseorder',1,'1','salescommission','Sales Commission',1,0,0,100,11,57,1,'N~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'exciseduty','vtiger_purchaseorder',1,'1','exciseduty','Excise Duty',1,0,0,100,12,57,1,'N~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'total','vtiger_purchaseorder',1,'1','hdnGrandTotal','Total',1,0,0,100,13,57,3,'N~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'subtotal','vtiger_purchaseorder',1,'1','hdnSubTotal','Sub Total',1,0,0,100,14,57,3,'N~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'postatus','vtiger_purchaseorder',1,'15','postatus','Status',1,0,0,100,15,57,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,16,57,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,17,57,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,18,57,2,'T~O',1,null,'BAS')");
-
-
-
- //Block 59
-
-$this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'bill_street','vtiger_pobillads',1,'24','bill_street','Billing Address',1,0,0,100,1,59,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'ship_street','vtiger_poshipads',1,'24','ship_street','Shipping Address',1,0,0,100,2,59,1,'V~M',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'bill_city','vtiger_pobillads',1,'1','bill_city','Billing City',1,0,0,100,5,59,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'ship_city','vtiger_poshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,59,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'bill_state','vtiger_pobillads',1,'1','bill_state','Billing State',1,0,0,100,7,59,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'ship_state','vtiger_poshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,59,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'bill_code','vtiger_pobillads',1,'1','bill_code','Billing Code',1,0,0,100,9,59,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'ship_code','vtiger_poshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,59,1,'V~O',1,null,'BAS')");
-
-
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'bill_country','vtiger_pobillads',1,'1','bill_country','Billing Country',1,0,0,100,11,59,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'ship_country','vtiger_poshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,59,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'bill_pobox','vtiger_pobillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,59,1,'V~O',1,null,'BAS')");
-  $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'ship_pobox','vtiger_poshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,59,1,'V~O',1,null,'BAS')");
-  
- //Block61
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,62,1,'V~O',1,null,'ADV')");
-
- //Block62
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'terms_conditions','vtiger_purchaseorder',1,'19','terms_conditions','Terms & Conditions',1,0,0,100,1,61,1,'V~O',1,null,'ADV')");
-
-//Purchase Order Details -- END
-
-//Sales Order Details -- START
- //Block63
- 
-$this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'subject','vtiger_salesorder',1,'2','subject','Subject',1,0,0,100,1,63,1,'V~M',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'potentialid','vtiger_salesorder',1,'76','potential_id','Potential Name',1,0,0,100,2,63,1,'I~O',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'customerno','vtiger_salesorder',1,'1','customerno','Customer No',1,0,0,100,3,63,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'quoteid','vtiger_salesorder',1,'78','quote_id','Quote Name',1,0,0,100,4,63,1,'I~O',1,null,'BAS')");	
-$this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'purchaseorder','vtiger_salesorder',1,'1','vtiger_purchaseorder','Purchase Order',1,0,0,100,4,63,1,'V~O',1,null,'BAS')");	
-
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'contactid','vtiger_salesorder',1,'57','contact_id','Contact Name',1,0,0,100,6,63,1,'I~O',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'duedate','vtiger_salesorder',1,'5','duedate','Due Date',1,0,0,100,8,63,1,'D~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'carrier','vtiger_salesorder',1,'15','carrier','Carrier',1,0,0,100,9,63,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'pending','vtiger_salesorder',1,'1','pending','Pending',1,0,0,100,10,63,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'sostatus','vtiger_salesorder',1,'15','sostatus','Status',1,0,0,100,11,63,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'salestax','vtiger_salesorder',1,'1','txtTax','Sales Tax',1,0,0,100,12,63,3,'N~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'adjustment','vtiger_salesorder',1,'1','txtAdjustment','Sales Tax',1,0,0,100,12,63,3,'NN~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'salescommission','vtiger_salesorder',1,'1','salescommission','Sales Commission',1,0,0,100,13,63,1,'N~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'exciseduty','vtiger_salesorder',1,'1','exciseduty','Excise Duty',1,0,0,100,13,63,1,'N~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'total','vtiger_salesorder',1,'1','hdnGrandTotal','Total',1,0,0,100,14,63,3,'N~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'subtotal','vtiger_salesorder',1,'1','hdnSubTotal','Total',1,0,0,100,15,63,3,'N~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'accountid','vtiger_salesorder',1,'73','account_id','Account Name',1,0,0,100,16,63,1,'I~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,17,63,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,18,63,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,19,63,2,'T~O',1,null,'BAS')");
-
-
-
- //Block 65
-
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'bill_street','vtiger_sobillads',1,'24','bill_street','Billing Address',1,0,0,100,1,65,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'ship_street','vtiger_soshipads',1,'24','ship_street','Shipping Address',1,0,0,100,2,65,1,'V~M',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'bill_city','vtiger_sobillads',1,'1','bill_city','Billing City',1,0,0,100,5,65,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'ship_city','vtiger_soshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,65,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'bill_state','vtiger_sobillads',1,'1','bill_state','Billing State',1,0,0,100,7,65,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'ship_state','vtiger_soshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,65,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'bill_code','vtiger_sobillads',1,'1','bill_code','Billing Code',1,0,0,100,9,65,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'ship_code','vtiger_soshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,65,1,'V~O',1,null,'BAS')");
-
-
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'bill_country','vtiger_sobillads',1,'1','bill_country','Billing Country',1,0,0,100,11,65,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'ship_country','vtiger_soshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,65,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'bill_pobox','vtiger_sobillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,65,1,'V~O',1,null,'BAS')");
-  $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'ship_pobox','vtiger_soshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,65,1,'V~O',1,null,'BAS')");
-  
-//Block67
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,68,1,'V~O',1,null,'ADV')");
-
- //Block68
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'terms_conditions','vtiger_salesorder',1,'19','terms_conditions','Terms & Conditions',1,0,0,100,1,67,1,'V~O',1,null,'ADV')");
-
-
-//Sales Order Details -- END
-
-//Invoice Details -- START
- //Block69
-
-$this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'subject','vtiger_invoice',1,'2','subject','Subject',1,0,0,100,1,69,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'salesorderid','vtiger_invoice',1,'80','salesorder_id','Sales Order',1,0,0,100,2,69,1,'I~O',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'customerno','vtiger_invoice',1,'1','customerno','Customer No',1,0,0,100,3,69,1,'V~O',1,null,'BAS')");	
-
- 
-//to include contact name vtiger_field in Invoice-start
-$this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'contactid','vtiger_invoice',1,'57','contact_id','Contact Name',1,0,0,100,4,69,1,'I~O',1,null,'BAS')");
-//end
-
-$this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'invoicedate','vtiger_invoice',1,'5','invoicedate','Invoice Date',1,0,0,100,5,69,1,'D~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'duedate','vtiger_invoice',1,'5','duedate','Due Date',1,0,0,100,6,69,1,'D~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'purchaseorder','vtiger_invoice',1,'1','vtiger_purchaseorder','Purchase Order',1,0,0,100,8,69,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'salestax','vtiger_invoice',1,'1','txtTax','Sales Tax',1,0,0,100,9,69,3,'N~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'adjustment','vtiger_invoice',1,'1','txtAdjustment','Sales Tax',1,0,0,100,9,69,3,'NN~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'salescommission','vtiger_invoice',1,'1','salescommission','Sales Commission',1,0,0,10,13,69,1,'N~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'exciseduty','vtiger_invoice',1,'1','exciseduty','Excise Duty',1,0,0,100,11,69,1,'N~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'subtotal','vtiger_invoice',1,'1','hdnSubTotal','Sub Total',1,0,0,100,12,69,3,'N~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'total','vtiger_invoice',1,'1','hdnGrandTotal','Total',1,0,0,100,13,69,3,'N~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'accountid','vtiger_invoice',1,'73','account_id','Account Name',1,0,0,100,14,69,1,'I~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'invoicestatus','vtiger_invoice',1,'15','invoicestatus','Status',1,0,0,100,15,69,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,16,69,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,17,69,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,18,69,2,'T~O',1,null,'BAS')"); 
-
- //Block 71
-
-$this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'bill_street','vtiger_invoicebillads',1,'24','bill_street','Billing Address',1,0,0,100,1,71,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'ship_street','vtiger_invoiceshipads',1,'24','ship_street','Shipping Address',1,0,0,100,2,71,1,'V~M',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'bill_city','vtiger_invoicebillads',1,'1','bill_city','Billing City',1,0,0,100,5,71,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'ship_city','vtiger_invoiceshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,71,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'bill_state','vtiger_invoicebillads',1,'1','bill_state','Billing State',1,0,0,100,7,71,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'ship_state','vtiger_invoiceshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,71,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'bill_code','vtiger_invoicebillads',1,'1','bill_code','Billing Code',1,0,0,100,9,71,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'ship_code','vtiger_invoiceshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,71,1,'V~O',1,null,'BAS')");
-
-
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'bill_country','vtiger_invoicebillads',1,'1','bill_country','Billing Country',1,0,0,100,11,71,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'ship_country','vtiger_invoiceshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,71,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'bill_pobox','vtiger_invoicebillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,71,1,'V~O',1,null,'BAS')");
-  $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'ship_pobox','vtiger_invoiceshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,71,1,'V~O',1,null,'BAS')");
-
-//Block73
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,74,1,'V~O',1,null,'ADV')");
- //Block74
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'terms_conditions','vtiger_invoice',1,'19','terms_conditions','Terms & Conditions',1,0,0,100,1,73,1,'V~O',1,null,'ADV')");
-
-
-//Invoice Details -- END
- //users Details Starts Block 79,80,81
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'user_name','vtiger_users',1,'106','user_name','User Name',1,0,0,11,1,79,1,'V~M',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'is_admin','vtiger_users',1,'156','is_admin','Admin',1,0,0,3,2,79,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'user_password','vtiger_users',1,'99','user_password','Password',1,0,0,30,3,79,4,'P~M',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'confirm_password','vtiger_users',1,'99','confirm_password','Confirm Password',1,0,0,30,4,79,4,'P~M',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'first_name','vtiger_users',1,'1','first_name','First Name',1,0,0,30,5,79,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'last_name','vtiger_users',1,'2','last_name','Last Name',1,0,0,30,6,79,1,'V~M',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'roleid','vtiger_user2role',1,'98','roleid','Role',1,0,0,200,7,79,1,'V~M',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'email1','vtiger_users',1,'104','email1','Email',1,0,0,100,9,79,1,'E~M',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'status','vtiger_users',1,'115','status','Status',1,0,0,100,10,79,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'activity_view','vtiger_users',1,'15','activity_view','Default Activity View',1,0,0,100,13,79,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'lead_view','vtiger_users',1,'15','lead_view','Default Lead View',1,0,0,100,12,79,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'currency_id','vtiger_users',1,'116','currency_id','Currency',1,0,0,100,11,79,1,'I~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'hour_format','vtiger_users',1,'116','hour_format','Calendar Hour Format',1,0,0,100,13,79,3,'I~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'end_hour','vtiger_users',1,'116','end_hour','Day ends at',1,0,0,100,15,79,3,'I~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'start_hour','vtiger_users',1,'116','start_hour','Day starts at',1,0,0,100,14,79,3,'I~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'title','vtiger_users',1,'1','title','Title',1,0,0,50,1,80,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'phone_work','vtiger_users',1,'1','phone_work','Office Phone',1,0,0,50,2,80,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'department','vtiger_users',1,'1','department','Department',1,0,0,50,3,80,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'phone_mobile','vtiger_users',1,'1','phone_mobile','Mobile',1,0,0,50,4,80,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'reports_to_id','vtiger_users',1,'101','reports_to_id','Reports To',1,0,0,50,5,80,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'phone_other','vtiger_users',1,'1','phone_other','Other Phone',1,0,0,50,5,80,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'email2','vtiger_users',1,'13','email2','Other Email',1,0,0,100,6,80,1,'E~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'phone_fax','vtiger_users',1,'1','phone_fax','Fax',1,0,0,50,7,80,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'yahoo_id','vtiger_users',1,'13','yahoo_id','Yahoo id',1,0,0,100,7,80,1,'E~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'phone_home','vtiger_users',1,'1','phone_home','Home Phone',1,0,0,50,8,80,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'imagename','vtiger_users',1,'105','imagename','User Image',1,0,0,250,9,80,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'date_format','vtiger_users',1,'15','date_format','Date Format',1,0,0,30,10,80,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'tagcloud','vtiger_users',1,'103','tagcloud','Tag Cloud',1,0,0,250,13,80,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'signature','vtiger_users',1,'21','signature','Signature',1,0,0,250,11,80,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'description','vtiger_users',1,'21','description','Notes',1,0,0,250,12,80,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'address_street','vtiger_users',1,'21','address_street','Street Address',1,0,0,250,1,81,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'address_city','vtiger_users',1,'1','address_city','City',1,0,0,100,2,81,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'address_state','vtiger_users',1,'1','address_state','State',1,0,0,100,3,81,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'address_postalcode','vtiger_users',1,'1','address_postalcode','Postal Code',1,0,0,100,4,81,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'address_country','vtiger_users',1,'1','address_country','Country',1,0,0,100,5,81,1,'V~O',1,null,'BAS')");
-
- //user Details End
-
-
-
-                // Insert End
-                
-
-		//New Security Start
-		//Inserting into vtiger_profile vtiger_table
-		$this->db->query("insert into vtiger_profile values ('".$profile1_id."','Administrator',null)");	
-		$this->db->query("insert into vtiger_profile values ('".$profile2_id."','Sales Profile',null)");
-		$this->db->query("insert into vtiger_profile values ('".$profile3_id."','Support Profile',null)");
-		$this->db->query("insert into vtiger_profile values ('".$profile4_id."','Guest Profile',null)");
-		
-		//Inserting into vtiger_profile2gloabal permissions
-		$this->db->query("insert into vtiger_profile2globalpermissions values ('".$profile1_id."',1,0)");
-		$this->db->query("insert into vtiger_profile2globalpermissions values ('".$profile1_id."',2,0)");
-		$this->db->query("insert into vtiger_profile2globalpermissions values ('".$profile2_id."',1,1)");
-		$this->db->query("insert into vtiger_profile2globalpermissions values ('".$profile2_id."',2,1)");
-		$this->db->query("insert into vtiger_profile2globalpermissions values ('".$profile3_id."',1,1)");
-		$this->db->query("insert into vtiger_profile2globalpermissions values ('".$profile3_id."',2,1)");
-		$this->db->query("insert into vtiger_profile2globalpermissions values ('".$profile4_id."',1,1)");
-		$this->db->query("insert into vtiger_profile2globalpermissions values ('".$profile4_id."',2,1)");
-
-		//Inserting into vtiger_profile2tab
-		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",1,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",2,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",3,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",4,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",6,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",7,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",8,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",9,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",10,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",13,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",14,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",15,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",16,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",17,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",18,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",19,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",20,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",21,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",22,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",23,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",24,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",25,0)");
-       		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",26,0)");
-       		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",27,0)");
-
-		//Inserting into vtiger_profile2tab
-		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",1,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",2,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",3,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",4,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",6,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",7,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",8,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",9,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",10,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",13,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",14,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",15,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",16,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",17,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",18,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",19,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",20,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",21,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",22,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",23,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",24,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",25,0)");
-        	$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",26,0)");
-       		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",27,0)");
-
-		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",1,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",2,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",3,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",4,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",6,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",7,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",8,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",9,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",10,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",13,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",14,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",15,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",16,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",17,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",18,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",19,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",20,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",21,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",22,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",23,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",24,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",25,0)");
-        	$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",26,0)");
-       		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",27,0)");
-        
-
-		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",1,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",2,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",3,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",4,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",6,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",7,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",8,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",9,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",10,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",13,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",14,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",15,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",16,0)");	
-		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",17,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",18,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",19,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",20,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",21,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",22,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",23,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",24,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",25,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",26,0)");
-		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",27,0)");
-		//Inserting into vtiger_profile2standardpermissions  Adminsitrator
-		
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",2,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",2,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",2,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",2,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",2,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",4,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",4,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",4,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",4,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",4,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",6,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",6,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",6,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",6,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",6,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",7,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",7,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",7,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",7,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",7,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",8,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",8,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",8,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",8,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",8,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",9,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",9,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",9,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",9,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",9,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",10,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",10,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",10,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",10,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",10,4,0)");
-
-		
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",13,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",13,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",13,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",13,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",13,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",14,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",14,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",14,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",14,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",14,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",15,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",15,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",15,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",15,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",15,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",16,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",16,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",16,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",16,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",16,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",18,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",18,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",18,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",18,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",18,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",19,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",19,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",19,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",19,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",19,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",20,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",20,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",20,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",20,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",20,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",21,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",21,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",21,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",21,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",21,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",22,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",22,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",22,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",22,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",22,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",23,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",23,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",23,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",23,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",23,4,0)");
-
-
-
-        	$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",26,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",26,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",26,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",26,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",26,4,0)");
-
-
-		//Insert into Profile 2 std permissions for Sales User  
-		//Help Desk Create/Delete not allowed. Read-Only	
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",2,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",2,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",2,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",2,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",2,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",4,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",4,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",4,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",4,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",4,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",6,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",6,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",6,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",6,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",6,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",7,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",7,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",7,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",7,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",7,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",8,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",8,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",8,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",8,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",8,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",9,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",9,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",9,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",9,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",9,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",10,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",10,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",10,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",10,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",10,4,0)");
-
-		
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",13,0,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",13,1,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",13,2,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",13,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",13,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",14,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",14,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",14,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",14,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",14,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",15,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",15,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",15,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",15,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",15,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",16,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",16,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",16,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",16,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",16,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",18,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",18,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",18,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",18,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",18,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",19,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",19,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",19,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",19,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",19,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",20,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",20,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",20,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",20,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",20,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",21,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",21,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",21,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",21,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",21,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",22,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",22,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",22,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",22,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",22,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",23,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",23,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",23,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",23,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",23,4,0)");
-
-
-        	$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",26,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",26,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",26,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",26,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",26,4,0)");
-
-		//Inserting into vtiger_profile2std for Support Profile
-		// Potential is read-only
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",2,0,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",2,1,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",2,2,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",2,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",2,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",4,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",4,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",4,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",4,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",4,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",6,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",6,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",6,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",6,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",6,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",7,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",7,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",7,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",7,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",7,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",8,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",8,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",8,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",8,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",8,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",9,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",9,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",9,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",9,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",9,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",10,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",10,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",10,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",10,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",10,4,0)");
-
-		
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",13,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",13,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",13,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",13,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",13,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",14,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",14,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",14,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",14,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",14,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",15,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",15,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",15,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",15,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",15,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",16,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",16,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",16,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",16,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",16,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",18,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",18,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",18,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",18,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",18,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",19,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",19,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",19,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",19,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",19,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",20,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",20,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",20,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",20,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",20,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",21,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",21,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",21,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",21,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",21,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",22,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",22,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",22,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",22,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",22,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",23,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",23,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",23,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",23,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",23,4,0)");
-
-
-        	$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",26,0,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",26,1,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",26,2,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",26,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",26,4,0)");
-        
-		//Inserting into vtiger_profile2stdper for Profile Guest Profile
-		//All Read-Only
-		
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",2,0,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",2,1,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",2,2,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",2,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",2,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",4,0,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",4,1,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",4,2,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",4,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",4,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",6,0,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",6,1,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",6,2,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",6,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",6,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",7,0,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",7,1,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",7,2,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",7,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",7,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",8,0,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",8,1,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",8,2,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",8,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",8,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",9,0,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",9,1,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",9,2,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",9,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",9,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",10,0,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",10,1,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",10,2,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",10,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",10,4,0)");
-
-		
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",13,0,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",13,1,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",13,2,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",13,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",13,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",14,0,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",14,1,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",14,2,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",14,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",14,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",15,0,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",15,1,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",15,2,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",15,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",15,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",16,0,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",16,1,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",16,2,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",16,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",16,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",18,0,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",18,1,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",18,2,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",18,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",18,4,0)");	
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",19,0,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",19,1,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",19,2,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",19,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",19,4,0)");	
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",20,0,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",20,1,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",20,2,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",20,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",20,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",21,0,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",21,1,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",21,2,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",21,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",21,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",22,0,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",22,1,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",22,2,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",22,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",22,4,0)");
-
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",23,0,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",23,1,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",23,2,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",23,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",23,4,0)");	
-
-
-        $this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",26,0,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",26,1,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",26,2,1)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",26,3,0)");
-		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",26,4,0)");
-
-		//Insert into vtiger_role2profile
-		$this->db->query("insert into vtiger_role2profile values ('H".$role2_id."',".$profile1_id.")");
-		$this->db->query("insert into vtiger_role2profile values ('H".$role3_id."',".$profile2_id.")");
-	  $this->db->query("insert into vtiger_role2profile values ('H".$role4_id."',".$profile2_id.")");
-		$this->db->query("insert into vtiger_role2profile values ('H".$role5_id."',".$profile2_id.")"); 
-	   
-		//Insert into vtiger_profile2field
-			
-                insertProfile2field($profile1_id);
-                insertProfile2field($profile2_id);	
-                insertProfile2field($profile3_id);	
-                insertProfile2field($profile4_id);
-
-		insert_def_org_field();	
-		
-
-		//Inserting into vtiger_profile 2 utility Admin
-                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",2,5,0)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",2,6,0)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",4,5,0)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",4,6,0)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",6,5,0)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",6,6,0)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",7,5,0)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",7,6,0)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",8,6,0)");
-                //$this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",9,6,0)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",10,6,0)");
-		$this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",7,8,0)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",6,8,0)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",4,8,0)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",13,8,0)");
-		$this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",14,5,0)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",14,6,0)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",7,9,0)");
-
-		//Inserting into vtiger_profile2utility Sales Profile
-		//Import Export Not Allowed.	
-		$this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",2,5,1)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",2,6,1)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",4,5,1)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",4,6,1)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",6,5,1)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",6,6,1)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",7,5,1)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",7,6,1)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",8,6,1)");
-                //$this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",9,6,1)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",10,6,1)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",7,8,0)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",6,8,0)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",4,8,0)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",13,8,0)");
-		$this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",14,5,1)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",14,6,1)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",7,9,0)");
-
-		//Inserting into vtiger_profile2utility Support Profile
-		//Import Export Not Allowed.	
-		$this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",2,5,1)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",2,6,1)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",4,5,1)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",4,6,1)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",6,5,1)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",6,6,1)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",7,5,1)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",7,6,1)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",8,6,1)");
-                //$this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",9,6,1)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",10,6,1)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",7,8,0)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",6,8,0)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",4,8,0)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",13,8,0)");
-		$this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",14,5,1)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",14,6,1)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",7,9,0)");
-
-		//Inserting into vtiger_profile2utility Guest Profile Read-Only
-		//Import Export BusinessCar Not Allowed.	
-		$this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",2,5,1)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",2,6,1)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",4,5,1)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",4,6,1)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",6,5,1)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",6,6,1)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",7,5,1)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",7,6,1)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",8,6,1)");
-                //$this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",9,6,1)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",10,6,1)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",7,8,1)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",6,8,1)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",4,8,1)");		
-                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",13,8,1)");		
-		$this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",14,5,1)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",14,6,1)");
-                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",7,9,0)");
-
-		//Inserting values into org share action mapping
-                $this->db->query("insert into vtiger_org_share_action_mapping values(0,'Public: Read Only')");
-                $this->db->query("insert into vtiger_org_share_action_mapping values(1,'Public: Read, Create/Edit')");
-                $this->db->query("insert into vtiger_org_share_action_mapping values(2,'Public: Read, Create/Edit, Delete')");
-                $this->db->query("insert into vtiger_org_share_action_mapping values(3,'Private')");
-
-                $this->db->query("insert into vtiger_org_share_action_mapping values(4,'Hide Details')");
-                $this->db->query("insert into vtiger_org_share_action_mapping values(5,'Hide Details and Add Events')");
-                $this->db->query("insert into vtiger_org_share_action_mapping values(6,'Show Details')");
-                $this->db->query("insert into vtiger_org_share_action_mapping values(7,'Show Details and Add Events')");
-
-
-		//Inserting for all vtiger_tabs
-                $def_org_tabid= Array(2,4,6,7,9,10,13,16,20,21,22,23,26);
-
-                foreach($def_org_tabid as $def_tabid)
-                {
-                        $this->db->query("insert into vtiger_org_share_action2tab values(0,".$def_tabid.")");
-                        $this->db->query("insert into vtiger_org_share_action2tab values(1,".$def_tabid.")");
-                        $this->db->query("insert into vtiger_org_share_action2tab values(2,".$def_tabid.")");
-                        $this->db->query("insert into vtiger_org_share_action2tab values(3,".$def_tabid.")");
-                }
-
-                $this->db->query("insert into vtiger_org_share_action2tab values(4,17)");
-                $this->db->query("insert into vtiger_org_share_action2tab values(5,17)");
-                $this->db->query("insert into vtiger_org_share_action2tab values(6,17)");
-                $this->db->query("insert into vtiger_org_share_action2tab values(7,17)");
-
-		//Insert into default_org_sharingrule
-               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",2,2,0)");
-
-               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",4,2,2)");
-
-               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",6,2,0)");
-
-               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",7,2,0)");
-
-               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",9,3,1)");
-               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",10,2,0)");
-               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",13,2,0)");
-               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",16,3,2)");
-               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",17,7,0)");
-               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",20,2,0)");
-               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",21,2,0)");
-               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",22,2,0)");
-               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",23,2,0)");
-               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",26,2,0)");
-
-		//Populating the DataShare Related Modules
-
-		//Lead Related Module
-		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",7,10)");
-
-		//Account Related Module
-		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",6,2)");
-		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",6,13)");
-		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",6,20)");
-		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",6,22)");
-		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",6,23)");
-		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",6,10)");
-
-		//Potential Related Module
-		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",2,20)");
-		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",2,22)");
-
-		//Quote Related Module
-		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",20,22)");
-
-		//SO Related Module
-		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",22,23)");	
-
-
-			
-					
-  // New Secutity End
-
-
-         //insert into the vtiger_notificationscheduler vtiger_table
-
-	//insert into related list vtiger_table
-	//Inserting for vtiger_account related lists
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("Potentials").",'get_opportunities',1,'Potentials',0)");	
-		
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("Contacts").",'get_contacts',2,'Contacts',0)");
-
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("Activities").",'get_activities',3,'Activities',0)");
-
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("HelpDesk").",'get_tickets',4,'HelpDesk',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("Activities").",'get_history',5,'Activity History',0)");
-
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",0,'get_attachments',6,'Attachments',0)");
-
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("Quotes").",'get_quotes',7,'Quotes',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("Invoice").",'get_invoices',8,'Invoice',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("SalesOrder").",'get_salesorder',9,'Sales Order',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("Products").",'get_products',10,'Products',0)");
-
-	//Inserting Lead Related Lists	
-
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Leads").",".getTabid("Activities").",'get_activities',1,'Activities',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Leads").",".getTabid("Emails").",'get_emails',2,'Emails',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Leads").",".getTabid("Activities").",'get_history',3,'Activity History',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Leads").",0,'get_attachments',4,'Attachments',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Leads").",".getTabid("Products").",'get_products',5,'Products',0)");
-
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Leads").",".getTabid("Campaigns").",'get_campaigns',6,'Campaigns',0)");
-
-	//Inserting for contact related lists
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Potentials").",'get_opportunities',1,'Potentials',0)");	
-		
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Activities").",'get_activities',2,'Activities',0)");
-
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Emails").",'get_emails',3,'Emails',0)");
-
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("HelpDesk").",'get_tickets',4,'HelpDesk',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Quotes").",'get_quotes',5,'Quotes',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("PurchaseOrder").",'get_purchase_orders',6,'Purchase Order',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("SalesOrder").",'get_salesorder',7,'Sales Order',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Products").",'get_products',8,'Products',0)");
-
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Activities").",'get_history',9,'Activity History',0)");
-
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",0,'get_attachments',10,'Attachments',0)");
-
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Campaigns").",'get_campaigns',11,'Campaigns',0)");
-
-	//Inserting Potential Related Lists	
-
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",".getTabid("Activities").",'get_activities',1,'Activities',0)");
-
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",".getTabid("Contacts").",'get_contacts',2,'Contacts',0)");
-
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",".getTabid("Products").",'get_products',3,'Products',0)");
-
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",0,'get_stage_history',4,'Sales Stage History',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",0,'get_attachments',5,'Attachments',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",".getTabid("Quotes").",'get_Quotes',6,'Quotes',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",".getTabid("SalesOrder").",'get_salesorder',7,'Sales Order',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",".getTabid("Activities").",'get_history',8,'Activity History',0)");
-
-		//Inserting Product Related Lists	
-
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",".getTabid("HelpDesk").",'get_tickets',1,'HelpDesk',0)");
-
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",".getTabid("Activities").",'get_activities',2,'Activities',0)");
-
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",0,'get_attachments',3,'Attachments',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",".getTabid("Quotes").",'get_quotes',4,'Quotes',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",".getTabid("PurchaseOrder").",'get_purchase_orders',5,'Purchase Order',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",".getTabid("SalesOrder").",'get_salesorder',6,'Sales Order',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",".getTabid("Invoice").",'get_invoices',7,'Invoice',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",".getTabid("PriceBooks").",'get_product_pricebooks',8,'PriceBooks',0)");
-	
-		//Inserting Emails Related Lists	
-
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Emails").",".getTabid("Contacts").",'get_contacts',1,'Contacts',0)");
-
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Emails").",0,'get_users',2,'Users',0)");
-
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Emails").",0,'get_attachments',3,'Attachments',0)");
-
-		//Inserting HelpDesk Related Lists
-		
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("HelpDesk").",".getTabid("Activities").",'get_activities',1,'Activities',0)");
-
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("HelpDesk").",0,'get_attachments',2,'Attachments',0)");
-
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("HelpDesk").",0,'get_ticket_history',3,'Ticket History',0)");
-
-	//Inserting PriceBook Related Lists
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("PriceBooks").",14,'get_pricebook_products',2,'Products',0)");
-
-        // Inserting Vendor Related Lists
-        $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Vendors").",14,'get_products',1,'Products',0)");
-
-        $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Vendors").",21,'get_purchase_orders',2,'Purchase Order',0)");
-
-        $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Vendors").",4,'get_contacts',3,'Contacts',0)");
-
-	// Inserting Quotes Related Lists
-	
-        $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Quotes").",".getTabid("Invoice").",'get_salesorder',1,'Sales Order',0)");
-        
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Quotes").",9,'get_activities',2,'Activities',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Quotes").",9,'get_history',3,'Activity History',0)");
-
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Quotes").",0,'get_quotestagehistory',4,'Quote Stage History',0)");
-
-	// Inserting Purchase order Related Lists
-
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("PurchaseOrder").",9,'get_activities',1,'Activities',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("PurchaseOrder").",0,'get_attachments',2,'Attachments',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("PurchaseOrder").",".getTabid("Activities").",'get_history',3,'Activity History',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("PurchaseOrder").",0,'get_postatushistory',4,'PurchaseOrder Status History',0)");
-
-	// Inserting Sales order Related Lists
-
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("SalesOrder").",9,'get_activities',1,'Activities',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("SalesOrder").",0,'get_attachments',2,'Attachments',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("SalesOrder").",".getTabid("Invoice").",'get_invoices',3,'Invoice',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("SalesOrder").",".getTabid("Activities").",'get_history',4,'Activity History',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("SalesOrder").",0,'get_sostatushistory',5,'SalesOrder Status History',0)");
-
-	// Inserting Invoice Related Lists
-
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Invoice").",9,'get_activities',1,'Activities',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Invoice").",0,'get_attachments',2,'Attachments',0)");
-
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Invoice").",".getTabid("Activities").",'get_history',3,'Activity History',0)");
-
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Invoice").",0,'get_invoicestatushistory',4,'Invoice Status History',0)");
-
-	// Inserting Activities Related Lists
-	
-	$this->db->query("insert into vtiger_relatedlists values (".$this->db->getUniqueID('relatedlists').",".getTabid("Activities").",0,'get_users',1,'Users',0)");
-	$this->db->query("insert into vtiger_relatedlists values (".$this->db->getUniqueID('relatedlists').",".getTabid("Activities").",4,'get_contacts',2,'Contacts',0)");
-
-	// Inserting Campaigns Related Lists
-
-         $this->db->query("insert into vtiger_relatedlists values (".$this->db->getUniqueID('relatedlists').",".getTabid("Campaigns").",".getTabid("Contacts").",'get_contacts',1,'Contacts',0)");
-         $this->db->query("insert into vtiger_relatedlists values (".$this->db->getUniqueID('relatedlists').",".getTabid("Campaigns").",".getTabid("Leads").",'get_leads',2,'Leads',0)");
-	 $this->db->query("insert into vtiger_relatedlists values (".$this->db->getUniqueID('relatedlists').",".getTabid("Campaigns").",".getTabid("Potentials").",'get_opportunities',3,'Potentials',0)");
-	 $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Campaigns").",9,'get_activities',4,'Activities',0)");
-
- //Inserting User Related Lists
- 
-        $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Users").",".getTabid("Activities").",'get_activities',1,'Activities',0)");
- 
-        $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Users").",".getTabid("Contacts").",'get_contacts',2,'Contacts',0)");
- 
-        $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Users").",".getTabid("Users").",'get_user_groups',3,'Groups',0)");
-
-	 
-               $this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("notificationscheduler").",'LBL_TASK_NOTIFICATION_DESCRITPION',1,'Task Delay Notification','Tasks delayed beyond 24 hrs ','LBL_TASK_NOTIFICATION')");
-
-
-                $this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("notificationscheduler").",'LBL_BIG_DEAL_DESCRIPTION' ,1,'Big Deal notification','Success! A big deal has been won! ','LBL_BIG_DEAL')");
-
-
-                $this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("notificationscheduler").",'LBL_TICKETS_DESCRIPTION',1,'Pending Tickets notification','Ticket pending please ','LBL_PENDING_TICKETS')");
-
-
-                $this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("notificationscheduler").",'LBL_MANY_TICKETS_DESCRIPTION',1,'Too many tickets Notification','Too many tickets pending against this entity ','LBL_MANY_TICKETS')");
-
-
-                $this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("notificationscheduler").",'LBL_START_DESCRIPTION' ,1,'Support Start Notification','Support starts please ','LBL_START_NOTIFICATION')");
-
-                $this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("notificationscheduler").",'LBL_SUPPORT_DESCRIPTION',1,'Support ending please','Support Ending Notification','LBL_SUPPORT_NOTICIATION')");
-		
- 		$this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("notificationscheduler").",'LBL_ACTIVITY_REMINDER_DESCRIPTION' ,1,'Activity Reminder Notication','This is a reminder notification for the Activity','LBL_ACTIVITY_NOTIFICATION')");
-
-		//Inserting Inventory Notifications
-	$invoice_body = 'Dear {HANDLER},
-
-The current stock of {PRODUCTNAME} in our warehouse is {CURRENTSTOCK}. Kindly procure required number of units as the stock level is below reorder level {REORDERLEVELVALUE}.
-
-Please treat this information as Urgent as the vtiger_invoice is already sent  to the customer.
-
-Severity: Critical
-
-Thanks,
-{CURRENTUSER}';
-
-		
-               $this->db->query("insert into vtiger_inventorynotification(notificationid,notificationname,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("inventorynotification").",'InvoiceNotification','{PRODUCTNAME} Stock Level is Low','".$invoice_body." ','InvoiceNotificationDescription')");
-
-		$quote_body = 'Dear {HANDLER},
-
-Quote is generated for {QUOTEQUANTITY} units of {PRODUCTNAME}. The current stock of {PRODUCTNAME} in our warehouse is {CURRENTSTOCK}. 
-
-Severity: Minor
-
-Thanks,
-{CURRENTUSER}';	
-		
-		
-               $this->db->query("insert into vtiger_inventorynotification(notificationid,notificationname,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("inventorynotification").",'QuoteNotification','Quote given for {PRODUCTNAME}','".$quote_body." ','QuoteNotificationDescription')");
-
-		$so_body = 'Dear {HANDLER},
-
-SalesOrder is generated for {SOQUANTITY} units of {PRODUCTNAME}. The current stock of {PRODUCTNAME} in our warehouse is {CURRENTSTOCK}. 
-
-Please treat this information  with vtiger_priority as the sales order is already generated.
-
-Severity: Major
-
-Thanks,
-{CURRENTUSER}';
-
-		
-               $this->db->query("insert into vtiger_inventorynotification(notificationid,notificationname,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("inventorynotification").",'SalesOrderNotification','Sales Order generated for {PRODUCTNAME}','".$so_body." ','SalesOrderNotificationDescription')");
-
-		//Insert into vtiger_currency vtiger_table
-		$this->db->query("insert into vtiger_currency_info values(".$this->db->getUniqueID("currency_info").",'U.S Dollar','USD','$',1,'Active','-11')");
-                
-
-
-
-//insert into email template vtiger_table
-
-	$body='
-	Hello!
-
-	On behalf of the vtiger team,  I am pleased to announce the release of vtiger crm4.2 . This is a feature packed release including the mass email template handling, custom view feature, vtiger_reports feature and a host of other utilities. vtiger runs on all platforms.
-
-	Notable Features of vtiger are :
-	-Email Client Integration
-	-Trouble Ticket Integration
-	-Invoice Management Integration
-	-Reports Integration
-	-Portal Integration
-	-Enhanced Word Plugin Support
-	-Custom View Integration
-
-	Known Issues:
-	-ABCD
-	-EFGH
-	-IJKL
-	-MNOP
-	-QRST';
-
-          $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Announcement for Release','Announcement for Release','Announcement of a release','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
-	
-
-
-$body='name
-street,
-city,
-state,
- zip)
- 
- Dear
- 
- Please check the following vtiger_invoices that are yet to be paid by you:
- 
- No. Date      Amount
- 1   1/1/01    $4000
- 2   2/2//01   $5000
- 3   3/3/01    $10000
- 4   7/4/01    $23560
- 
- Kindly let us know if there are any issues that you feel are pending to be discussed.
- We will be more than happy to give you a call.
- We would like to continue our business with you.
- 
- Sincerely,
- name
- title';
-
-
-               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Pending Invoices','Invoices Pending','Payment Due','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
-
-
-
-
-
-$body=' Dear
-
-Your proposal on the project XYZW has been reviewed by us
-and is acceptable in its entirety.
-
-We are eagerly looking forward to this project
-and are pleased about having the opportunity to work
-together. We look forward to a long standing relationship
-with your esteemed firm.
-
-I would like to take this opportunity to invite you
-to a game of golf on Wednesday morning 9am at the
-Cuff Links Ground. We will be waiting for you in the
-Executive Lounge.
-
-Looking forward to seeing you there.
-
-Sincerely,
-name
-title';
-	       
-               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Acceptance Proposal','Acceptance Proposal','Acceptance of Proposal','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
-
-
-$body= ' The undersigned hereby acknowledges receipt and delivery
-of the goods.
-The undersigned will release the payment subject to the goods being discovered not satisfactory.
-
-Signed under seal this <date>
-
-Sincerely,
-name
-title';
-	       
-               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Goods received acknowledgement','Goods received acknowledgement','Acknowledged Receipt of Goods','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
-
-
-	       $body= ' Dear
-	 We are in receipt of your order as contained in the
-   purchase order form.We consider this to be final and binding on both sides.
-If there be any exceptions noted, we shall consider them
-only if the objection is received within ten days of receipt of
-this notice.
-
-Thank you for your patronage.
-Sincerely,
-name
-title';
-
-
-	       
-               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Accept Order','Accept Order','Acknowledgement/Acceptance of Order','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
-
-
-
-
-$body='Dear
-
-We are relocating our office to
-11111,XYZDEF Cross,
-UVWWX Circle
-The telephone number for this new location is (101) 1212-1328.
-
-Our Manufacturing Division will continue operations
-at 3250 Lovedale Square Avenue, in Frankfurt.
-
-We hope to keep in touch with you all.
-Please update your addressbooks.
-
-
-Thank You,
-name
-title';
-	       
-               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Address Change','Change of Address','Address Change','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
-
-
-
-$body='Dear
-
-Thank you for extending us the opportunity to meet with
-you and members of your staff.
-
-I know that John Doe serviced your vtiger_account
-for many years and made many friends at your firm. He has personally
-discussed with me the deep relationship that he had with your firm.
-While his presence will be missed, I can promise that we will
-continue to provide the fine service that was accorded by
-John to your firm.
-
-I was genuinely touched to receive such fine hospitality.
-
-Thank you once again.
-
-Sincerely,
-name
-title';
-
-
-	       
-               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Follow Up','Follow Up','Follow Up of meeting','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
-
-
-
-$body='Congratulations!
-
-The numbers are in and I am proud to inform you that our
-total sales for the previous quarter
-amounts to $100,000,00.00!. This is the first time
-we have exceeded the target by almost 30%.
-We have also beat the previous quarter record by a
-whopping 75%!
-
-Let us meet at Smoking Joe for a drink in the evening!
-
-C you all there guys!
-
-Sincerely,
-name
-title';
-
-	       
-               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Target Crossed!','Target Crossed!','Fantastic Sales Spree!','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
-
-$body='
-Dear
-
-Thank you for your confidence in our ability to serve you.
-We are glad to be given the chance to serve you.I look
-forward to establishing a long term partnership with you.
-Consider me as a friend.
-Should any need arise,please do give us a call.
-
-Sincerely,
-name
-title';
-
-	       
-               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Thanks Note','Thanks Note','Note of thanks','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
-
-		
-	       //Insert into vtiger_organizationdetails vtiger_table 
-	       $this->db->query("insert into vtiger_organizationdetails(organizationame,address,city,state,country,code,phone,fax,website,logoname) values ('vtiger',' 40-41-42, Sivasundar Apartments, Flat D-II, Shastri Street, Velachery','Chennai','Tamil Nadu','India','600 042','+91-44-5202-1990','+91-44-5202-1990','www.vtiger.com','vtiger-crm-logo.jpg')");
-
-  //Insert into vtiger_inventory_tandc vtiger_table
-               $this->db->query("insert into vtiger_inventory_tandc values('".$this->db->getUniqueID('inventory_tandc')."','Inventory','')");
-
-	$this->db->query("insert into vtiger_actionmapping values(0,'Save',0)");
-	$this->db->query("insert into vtiger_actionmapping values(1,'EditView',0)");
-	$this->db->query("insert into vtiger_actionmapping values(2,'Delete',0)");
-	$this->db->query("insert into vtiger_actionmapping values(3,'index',0)");
-	$this->db->query("insert into vtiger_actionmapping values(4,'DetailView',0)");
-	$this->db->query("insert into vtiger_actionmapping values(5,'Import',0)");
-	$this->db->query("insert into vtiger_actionmapping values(6,'Export',0)");
-	//$this->db->query("insert into vtiger_actionmapping values(7,'AddBusinessCard',0)");
-	$this->db->query("insert into vtiger_actionmapping values(8,'Merge',0)");
-	$this->db->query("insert into vtiger_actionmapping values(1,'VendorEditView',1)");
-	$this->db->query("insert into vtiger_actionmapping values(4,'VendorDetailView',1)");
-	$this->db->query("insert into vtiger_actionmapping values(0,'SaveVendor',1)");
-	$this->db->query("insert into vtiger_actionmapping values(2,'DeleteVendor',1)");
-	$this->db->query("insert into vtiger_actionmapping values(1,'PriceBookEditView',1)");
-	$this->db->query("insert into vtiger_actionmapping values(4,'PriceBookDetailView',1)");
-	$this->db->query("insert into vtiger_actionmapping values(0,'SavePriceBook',1)");
-	$this->db->query("insert into vtiger_actionmapping values(2,'DeletePriceBook',1)");
-	$this->db->query("insert into vtiger_actionmapping values(9,'ConvertLead',0)");
-	$this->db->query("insert into vtiger_actionmapping values(1,'DetailViewAjax',1)");
-	$this->db->query("insert into vtiger_actionmapping values(4,'TagCloud',1)");
-	$this->db->query("insert into vtiger_actionmapping values(1,'QuickCreate',1)");
-	$this->db->query("insert into vtiger_actionmapping values(3,'Popup',1)");
-
-	//Insert values for vtiger_moduleowners vtiger_table which contains the modules and their vtiger_users. default user id admin - after 4.2 patch 2
-	$module_array = Array('Potentials','Contacts','Accounts','Leads','Notes','Activities','Emails','HelpDesk','Products','Faq','Vendors','PriceBooks','Quotes','PurchaseOrder','SalesOrder','Invoice','Reports','Campaigns');
-	foreach($module_array as $mod)
-	{
-		$this->db->query("insert into vtiger_moduleowners values(".getTabid($mod).",1)");
-	}
-	//added by jeri for category view from db
-	$this->db->query("insert into vtiger_parenttab values (1,'My Home Page',1,0)");
-	$this->db->query("insert into vtiger_parenttab values (2,'Marketing',2,0)");
-	$this->db->query("insert into vtiger_parenttab values (3,'Sales',3,0)");
-	$this->db->query("insert into vtiger_parenttab values (4,'Support',4,0)");
-	$this->db->query("insert into vtiger_parenttab values (5,'Analytics',5,0)");
-	$this->db->query("insert into vtiger_parenttab values (6,'Inventory',6,0)");
-	$this->db->query("insert into vtiger_parenttab values (7,'Tools',7,0)");
-	$this->db->query("insert into vtiger_parenttab values (8,'Settings',8,0)");
-
-	$this->db->query("insert into vtiger_parenttabrel values (1,9,2)");
-	$this->db->query("insert into vtiger_parenttabrel values (1,17,3)");
-	$this->db->query("insert into vtiger_parenttabrel values (1,10,4)");
-	$this->db->query("insert into vtiger_parenttabrel values (1,3,1)");
-	$this->db->query("insert into vtiger_parenttabrel values (3,7,1)");
-	$this->db->query("insert into vtiger_parenttabrel values (3,6,2)");
-	$this->db->query("insert into vtiger_parenttabrel values (3,4,3)");
-	$this->db->query("insert into vtiger_parenttabrel values (3,2,4)");
-	$this->db->query("insert into vtiger_parenttabrel values (3,20,5)");
-	$this->db->query("insert into vtiger_parenttabrel values (3,22,6)");
-	$this->db->query("insert into vtiger_parenttabrel values (3,23,7)");
-	$this->db->query("insert into vtiger_parenttabrel values (3,14,8)");
-	$this->db->query("insert into vtiger_parenttabrel values (3,19,9)");
-	$this->db->query("insert into vtiger_parenttabrel values (3,8,10)");
-	$this->db->query("insert into vtiger_parenttabrel values (4,13,1)");
-	$this->db->query("insert into vtiger_parenttabrel values (4,15,2)");
-	$this->db->query("insert into vtiger_parenttabrel values (4,6,3)");
-	$this->db->query("insert into vtiger_parenttabrel values (4,4,4)");
-	$this->db->query("insert into vtiger_parenttabrel values (4,14,5)");
-	$this->db->query("insert into vtiger_parenttabrel values (4,8,6)");
-	$this->db->query("insert into vtiger_parenttabrel values (5,1,1)");
-	$this->db->query("insert into vtiger_parenttabrel values (5,25,2)");
-	$this->db->query("insert into vtiger_parenttabrel values (6,14,1)");
-	$this->db->query("insert into vtiger_parenttabrel values (6,18,2)");
-	$this->db->query("insert into vtiger_parenttabrel values (6,19,3)");
-	$this->db->query("insert into vtiger_parenttabrel values (6,21,4)");
-	$this->db->query("insert into vtiger_parenttabrel values (6,22,5)");
-	$this->db->query("insert into vtiger_parenttabrel values (6,20,6)");
-	$this->db->query("insert into vtiger_parenttabrel values (6,23,7)");
-	$this->db->query("insert into vtiger_parenttabrel values (7,24,1)");
-	$this->db->query("insert into vtiger_parenttabrel values (7,27,2)");
-	$this->db->query("insert into vtiger_parenttabrel values (7,8,3)");
-	$this->db->query("insert into vtiger_parenttabrel values (2,26,1)");
-	$this->db->query("insert into vtiger_parenttabrel values (2,6,2)");
-	$this->db->query("insert into vtiger_parenttabrel values (2,4,3)");
-	$this->db->query("insert into vtiger_parenttabrel values (2,10,4)");
-	$this->db->query("insert into vtiger_parenttabrel values (4,10,7)");
-	$this->db->query("insert into vtiger_parenttabrel values (2,7,5)");
-	$this->db->query("insert into vtiger_parenttabrel values (2,9,6)");
-	$this->db->query("insert into vtiger_parenttabrel values (4,9,8)");
-		
-	//Added to populate the default inventory tax informations
-	$this->db->query("insert into vtiger_inventorytaxinfo values(".$this->db->getUniqueID("inventorytaxinfo").",'VAT','4.5')");
-	$this->db->query("insert into vtiger_inventorytaxinfo values(".$this->db->getUniqueID("inventorytaxinfo").",'Sales','10')");
-	$this->db->query("insert into vtiger_inventorytaxinfo values(".$this->db->getUniqueID("inventorytaxinfo").",'Service','12.5')");
-	
-	}
-}
-?>
+<?php
+
+/*********************************************************************************
+** The contents of this file are subject to the vtiger CRM Public License Version 1.0
+ * ("License"); You may not use this file except in compliance with the License
+ * The Original Code is:  vtiger CRM Open Source
+ * The Initial Developer of the Original Code is vtiger.
+ * Portions created by vtiger are Copyright (C) vtiger.
+ * All Rights Reserved.
+ ********************************************************************************/
+
+include_once('config.php');
+require_once('include/logging.php');
+require_once('include/database/PearDatabase.php');
+require_once('data/SugarBean.php');
+require_once('data/CRMEntity.php');
+require_once('include/utils/utils.php');
+
+class DefaultDataPopulator extends CRMEntity {
+		
+	function DefaultDataPopulator() {
+		$this->log = LoggerManager::getLogger('DefaultDataPopulator');
+		$this->db = new PearDatabase();
+	}
+
+	var $new_schema = true;
+
+	function create_tables () {
+		global $app_strings;
+
+		$role1_id = $this->db->getUniqueID("role");
+		$role2_id = $this->db->getUniqueID("role");
+		$role3_id = $this->db->getUniqueID("role");
+		$role4_id = $this->db->getUniqueID("role");
+		$role5_id = $this->db->getUniqueID("role");
+
+		$profile1_id = $this->db->getUniqueID("profile");
+		$profile2_id = $this->db->getUniqueID("profile");
+		$profile3_id = $this->db->getUniqueID("profile");
+		$profile4_id = $this->db->getUniqueID("profile");
+
+                $this->db->query("insert into vtiger_role values('H".$role1_id."','Organisation','H".$role1_id."',0)");
+                $this->db->query("insert into vtiger_role values('H".$role2_id."','CEO','H".$role1_id."::H".$role2_id."',1)");
+                $this->db->query("insert into vtiger_role values('H".$role3_id."','Vice President','H".$role1_id."::H".$role2_id."::H".$role3_id."',2)");
+                $this->db->query("insert into vtiger_role values('H".$role4_id."','Sales Manager','H".$role1_id."::H".$role2_id."::H".$role3_id."::H".$role4_id."',3)");
+                $this->db->query("insert into vtiger_role values('H".$role5_id."','Sales Man','H".$role1_id."::H".$role2_id."::H".$role3_id."::H".$role4_id."::H".$role5_id."',4)");
+                
+
+ $this->db->query("INSERT INTO vtiger_tab VALUES (3,'Home',0,1,'Home',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (7,'Leads',0,4,'Leads',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (6,'Accounts',0,5,'Accounts',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (4,'Contacts',0,6,'Contacts',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (2,'Potentials',0,7,'Potentials',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (8,'Notes',0,9,'Notes',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (9,'Activities',0,3,'Activities',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (10,'Emails',0,10,'Emails',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (13,'HelpDesk',0,11,'HelpDesk',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (14,'Products',0,8,'Products',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (1,'Dashboard',0,12,'Dashboards',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (15,'Faq',0,14,'Faq',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (16,'Events',2,13,'Events',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (17,'Calendar',0,2,'Calendar',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (18,'Vendors',0,15,'Vendors',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (19,'PriceBooks',0,16,'PriceBooks',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (20,'Quotes',0,17,'Quotes',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (21,'PurchaseOrder',0,18,'PurchaseOrder',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (22,'SalesOrder',0,19,'SalesOrder',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (23,'Invoice',0,20,'Invoice',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (24,'Rss',0,21,'Rss',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (25,'Reports',0,22,'Reports',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (26,'Campaigns',0,23,'Campaigns',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (27,'Portal',0,24,'Portal',null,null,1)");
+ $this->db->query("INSERT INTO vtiger_tab VALUES (28,'Webmails',0,25,'Webmails',null,null,1)");
+ $this->db->query("insert into vtiger_tab values (29,'Users',0,26,'Users',null,null,1)");
+
+// Populate the vtiger_blocks vtiger_table
+$this->db->query("insert into vtiger_blocks values (1,2,'LBL_OPPORTUNITY_INFORMATION',1,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (2,2,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (3,2,'LBL_DESCRIPTION_INFORMATION',3,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (4,4,'LBL_CONTACT_INFORMATION',1,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (5,4,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (6,4,'LBL_CUSTOMER_PORTAL_INFORMATION',3,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (7,4,'LBL_ADDRESS_INFORMATION',4,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (8,4,'LBL_DESCRIPTION_INFORMATION',6,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (9,6,'LBL_ACCOUNT_INFORMATION',1,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (10,6,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (11,6,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (12,6,'LBL_DESCRIPTION_INFORMATION',4,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (13,7,'LBL_LEAD_INFORMATION',1,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (14,7,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (15,7,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (16,7,'LBL_DESCRIPTION_INFORMATION',4,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (17,8,'LBL_NOTE_INFORMATION',1,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (18,8,'',2,1,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (19,9,'LBL_TASK_INFORMATION',1,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (20,9,'',2,1,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (21,10,'LBL_EMAIL_INFORMATION',1,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (22,10,'',2,1,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (23,10,'',3,1,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (24,10,'',4,1,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (25,13,'LBL_TICKET_INFORMATION',1,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (26,13,'',2,1,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (27,13,'LBL_CUSTOM_INFORMATION',3,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (28,13,'LBL_DESCRIPTION_INFORMATION',4,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (29,13,'LBL_TICKET_RESOLUTION',5,0,0,1,0,0)");
+$this->db->query("insert into vtiger_blocks values (30,13,'LBL_COMMENTS',6,0,0,1,0,0)");
+$this->db->query("insert into vtiger_blocks values (31,14,'LBL_PRODUCT_INFORMATION',1,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (32,14,'LBL_PRICING_INFORMATION',2,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (33,14,'LBL_STOCK_INFORMATION',3,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (34,14,'LBL_CUSTOM_INFORMATION',4,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (35,14,'LBL_IMAGE_INFORMATION',5,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (36,14,'LBL_DESCRIPTION_INFORMATION',6,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (37,15,'LBL_FAQ_INFORMATION',1,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (38,15,'',2,1,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (39,15,'',3,1,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (40,15,'LBL_COMMENT_INFORMATION',4,0,0,1,0,0)");
+$this->db->query("insert into vtiger_blocks values (41,16,'LBL_EVENT_INFORMATION',1,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (42,16,'',2,1,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (43,16,'',3,1,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (44,18,'LBL_VENDOR_INFORMATION',1,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (45,18,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (46,18,'LBL_VENDOR_ADDRESS_INFORMATION',3,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (47,18,'LBL_DESCRIPTION_INFORMATION',4,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (48,19,'LBL_PRICEBOOK_INFORMATION',1,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (49,19,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (50,19,'LBL_DESCRIPTION_INFORMATION',3,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (51,20,'LBL_QUOTE_INFORMATION',1,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (52,20,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (53,20,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (54,20,'LBL_RELATED_PRODUCTS',4,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (55,20,'LBL_TERMS_INFORMATION',5,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (56,20,'LBL_DESCRIPTION_INFORMATION',6,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (57,21,'LBL_PO_INFORMATION',1,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (58,21,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (59,21,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (60,21,'LBL_RELATED_PRODUCTS',4,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (61,21,'LBL_TERMS_INFORMATION',5,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (62,21,'LBL_DESCRIPTION_INFORMATION',6,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (63,22,'LBL_SO_INFORMATION',1,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (64,22,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (65,22,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (66,22,'LBL_RELATED_PRODUCTS',4,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (67,22,'LBL_TERMS_INFORMATION',5,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (68,22,'LBL_DESCRIPTION_INFORMATION',6,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (69,23,'LBL_INVOICE_INFORMATION',1,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (70,23,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (71,23,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (72,23,'LBL_RELATED_PRODUCTS',4,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (73,23,'LBL_TERMS_INFORMATION',5,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (74,23,'LBL_DESCRIPTION_INFORMATION',6,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (75,4,'LBL_IMAGE_INFORMATION',5,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (76,26,'LBL_CAMPAIGN_INFORMATION',1,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (77,26,'LBL_CUSTOM_INFORMATION',2,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (78,26,'LBL_DESCRIPTION_INFORMATION',3,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (79,29,'LBL_USERLOGIN_ROLE',1,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (80,29,'LBL_MORE_INFORMATION',2,0,0,0,0,0)");
+$this->db->query("insert into vtiger_blocks values (81,29,'LBL_ADDRESS_INFORMATION',3,0,0,0,0,0)");
+
+//
+
+//Account Details -- START
+ //Block9
+
+$this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'accountname','vtiger_account',1,'2','accountname','Account Name',1,0,0,100,1,9,1,'V~M',0,1,'BAS')");	
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'phone','vtiger_account',1,'11','phone','Phone',1,0,0,100,2,9,1,'V~O',0,2,'BAS')");	
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'website','vtiger_account',1,'17','website','Website',1,0,0,100,3,9,1,'V~O',0,3,'BAS')");	
+
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'fax','vtiger_account',1,'1','fax','Fax',1,0,0,100,4,9,1,'V~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'tickersymbol','vtiger_account',1,'1','tickersymbol','Ticker Symbol',1,0,0,100,5,9,1,'V~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'otherphone','vtiger_account',1,'11','otherphone','Other Phone',1,0,0,100,6,9,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'parentid','vtiger_account',1,'51','account_id','Member Of',1,0,0,100,7,9,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'email1','vtiger_account',1,'13','email1','Email',1,0,0,100,8,9,1,'E~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'employees','vtiger_account',1,'7','employees','Employees',1,0,0,100,9,9,1,'I~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'email2','vtiger_account',1,'13','email2','Other Email',1,0,0,100,10,9,1,'E~O',1,null,'ADV')");
+
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'ownership','vtiger_account',1,'1','ownership','Ownership',1,0,0,100,11,9,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'rating','vtiger_account',1,'1','rating','Rating',1,0,0,100,12,9,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'industry','vtiger_account',1,'15','industry','industry',1,0,0,100,13,9,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'siccode','vtiger_account',1,'1','siccode','SIC Code',1,0,0,100,14,9,1,'I~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'account_type','vtiger_account',1,'15','accounttype','Type',1,0,0,100,15,9,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'annualrevenue','vtiger_account',1,'71','annual_revenue','Annual Revenue',1,0,0,100,16,9,1,'I~O',1,null,'ADV')");
+ //Added vtiger_field emailoptout for vtiger_accounts -- after 4.2 patch2
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'emailoptout','vtiger_account',1,'56','emailoptout','Email Opt Out',1,0,0,100,17,9,1,'C~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'notify_owner','vtiger_account',1,56,'notify_owner','Notify Owner',1,0,0,10,18,9,1,'C~O',1,NULL,'ADV')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,19,9,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,20,9,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,21,9,2,'T~O',1,null,'BAS')");
+
+
+
+
+ //Block 11
+$this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'street','vtiger_accountbillads',1,'21','bill_street','Billing Address',1,0,0,100,1,11,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'street','vtiger_accountshipads',1,'21','ship_street','Shipping Address',1,0,0,100,2,11,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'city','vtiger_accountbillads',1,'1','bill_city','Billing City',1,0,0,100,5,11,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'city','vtiger_accountshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,11,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'state','vtiger_accountbillads',1,'1','bill_state','Billing State',1,0,0,100,7,11,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'state','vtiger_accountshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,11,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'code','vtiger_accountbillads',1,'1','bill_code','Billing Code',1,0,0,100,9,11,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'code','vtiger_accountshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,11,1,'V~O',1,null,'BAS')");
+
+
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'country','vtiger_accountbillads',1,'1','bill_country','Billing Country',1,0,0,100,11,11,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'country','vtiger_accountshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,11,1,'V~O',1,null,'BAS')");
+
+$this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'pobox','vtiger_accountbillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,11,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'pobox','vtiger_accountshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,11,1,'V~O',1,null,'BAS')");
+
+
+ //Block12
+$this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,12,1,'V~O',1,null,'BAS')");
+ 
+
+
+//Account Details -- END
+
+			
+//Lead Details --- START
+
+//Block13 -- Start
+
+$this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'salutation','vtiger_leaddetails',1,'55','salutationtype','Salutation',1,0,0,100,1,13,3,'V~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'firstname','vtiger_leaddetails',1,'55','firstname','First Name',1,0,0,100,2,13,1,'V~O',0,1,'BAS')");	
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'phone','vtiger_leadaddress',1,'11','phone','Phone',1,0,0,100,3,13,1,'V~O',0,4,'BAS')");	
+
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'lastname','vtiger_leaddetails',1,'2','lastname','Last Name',1,0,0,100,4,13,1,'V~M',0,2,'BAS')");	
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'mobile','vtiger_leadaddress',1,'1','mobile','Mobile',1,0,0,100,5,13,1,'V~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'company','vtiger_leaddetails',1,'2','company','Company',1,0,0,100,6,13,1,'V~M',0,3,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'fax','vtiger_leadaddress',1,'1','fax','Fax',1,0,0,100,7,13,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'designation','vtiger_leaddetails',1,'1','designation','Designation',1,0,0,100,8,13,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'email','vtiger_leaddetails',1,'13','email','Email',1,0,0,100,9,13,1,'E~O',0,5,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'leadsource','vtiger_leaddetails',1,'15','leadsource','Lead Source',1,0,0,100,10,13,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'website','vtiger_leadsubdetails',1,'17','website','Website',1,0,0,100,11,13,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'industry','vtiger_leaddetails',1,'15','industry','Industry',1,0,0,100,12,13,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'leadstatus','vtiger_leaddetails',1,'15','leadstatus','Lead Status',1,0,0,100,13,13,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'annualrevenue','vtiger_leaddetails',1,'71','annualrevenue','Annual Revenue',1,0,0,100,14,13,1,'I~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'rating','vtiger_leaddetails',1,'15','rating','Rating',1,0,0,100,15,13,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'noofemployees','vtiger_leaddetails',1,'1','noofemployees','No Of Employees',1,0,0,100,16,13,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,17,13,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'yahooid','vtiger_leaddetails',1,'13','yahooid','Yahoo Id',1,0,0,100,18,13,1,'V~O',1,null,'ADV')");
+$this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,19,13,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,20,13,2,'T~O',1,null,'BAS')");
+
+//Block13 -- End
+
+
+//Block15 -- Start
+
+$this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'lane','vtiger_leadaddress',1,'21','lane','Street',1,0,0,100,1,15,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'code','vtiger_leadaddress',1,'1','code','Postal Code',1,0,0,100,3,15,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'city','vtiger_leadaddress',1,'1','city','City',1,0,0,100,4,15,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'country','vtiger_leadaddress',1,'1','country','Country',1,0,0,100,5,15,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'state','vtiger_leadaddress',1,'1','state','State',1,0,0,100,6,15,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'pobox','vtiger_leadaddress',1,'1','pobox','Po Box',1,0,0,100,2,15,1,'V~O',1,null,'BAS')");
+
+//Block15 --End
+
+//Block16 -- Start
+
+$this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,16,1,'V~O',1,null,'BAS')");
+
+//Block16 -- End
+
+//Lead Details -- END
+
+
+//Contact Details -- START
+//Block4 -- Start
+
+$this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'salutation','vtiger_contactdetails',1,'55','salutationtype','Salutation',1,0,0,100,1,4,3,'V~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'firstname','vtiger_contactdetails',1,'55','firstname','First Name',1,0,0,100,2,4,1,'V~O',0,1,'BAS')");	
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'phone','vtiger_contactdetails',1,'11','phone','Office Phone',1,0,0,100,3,4,1,'V~O',0,4,'BAS')");	
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'lastname','vtiger_contactdetails',1,'2','lastname','Last Name',1,0,0,100,4,4,1,'V~M',0,2,'BAS')");	
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'mobile','vtiger_contactdetails',1,'1','mobile','Mobile',1,0,0,100,5,4,1,'V~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'accountid','vtiger_contactdetails',1,'51','account_id','Account Name',1,0,0,100,6,4,1,'I~O',0,3,'BAS')");	
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'homephone','vtiger_contactsubdetails',1,'11','homephone','Home Phone',1,0,0,100,7,4,1,'V~O',1,null,'ADV')");	
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'leadsource','vtiger_contactsubdetails',1,'15','leadsource','Lead Source',1,0,0,100,8,4,1,'V~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'otherphone','vtiger_contactsubdetails',1,'11','otherphone','Phone',1,0,0,100,9,4,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'title','vtiger_contactdetails',1,'1','title','Title',1,0,0,100,10,4,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'fax','vtiger_contactdetails',1,'1','fax','Fax',1,0,0,100,11,4,1,'V~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'department','vtiger_contactdetails',1,'1','department','Department',1,0,0,100,12,4,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'birthday','vtiger_contactsubdetails',1,'5','birthday','Birthdate',1,0,0,100,14,4,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'email','vtiger_contactdetails',1,'13','email','Email',1,0,0,100,15,4,1,'E~O',0,5,'ADV')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'reportsto','vtiger_contactdetails',1,'57','contact_id','Reports To',1,0,0,100,16,4,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'assistant','vtiger_contactsubdetails',1,'1','assistant','Assistant',1,0,0,100,17,4,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'yahooid','vtiger_contactdetails',1,'13','yahooid','Yahoo Id',1,0,0,100,18,4,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'assistantphone','vtiger_contactsubdetails',1,'11','assistantphone','Assistant Phone',1,0,0,100,19,4,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'donotcall','vtiger_contactdetails',1,'56','donotcall','Do Not Call',1,0,0,100,20,4,1,'C~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'emailoptout','vtiger_contactdetails',1,'56','emailoptout','Email Opt Out',1,0,0,100,21,4,1,'C~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,22,4,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'reference','vtiger_contactdetails',1,'56','reference','Reference',1,0,0,10,23,4,1,'C~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'notify_owner','vtiger_contactdetails',1,'56','notify_owner','Notify Owner',1,0,0,10,24,4,1,'C~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,25,4,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,26,4,2,'T~O',1,null,'BAS')");
+
+//Block4 -- End
+
+//Block6 - Begin Customer Portal
+
+$this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'portal','vtiger_customerdetails',1,'56','portal','Portal User',1,0,0,100,1,6,1,'C~O',1,null,'ADV')");
+$this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'support_start_date','vtiger_customerdetails',1,'5','support_start_date','Support Start Date',1,0,0,100,2,6,1,'D~O',1,null,'ADV')");
+$this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'support_end_date','vtiger_customerdetails',1,'5','support_end_date','Support End Date',1,0,0,100,3,6,1,'D~O~OTH~GE~support_start_date~Support Start Date',1,null,'ADV')");
+
+//Block6 - End Customer Portal
+
+//Block 7 -- Start
+
+$this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'mailingstreet','vtiger_contactaddress',1,'21','mailingstreet','Mailing Street',1,0,0,100,1,7,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'otherstreet','vtiger_contactaddress',1,'21','otherstreet','Other Street',1,0,0,100,2,7,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'mailingcity','vtiger_contactaddress',1,'1','mailingcity','Mailing City',1,0,0,100,5,7,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'othercity','vtiger_contactaddress',1,'1','othercity','Other City',1,0,0,100,6,7,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'mailingstate','vtiger_contactaddress',1,'1','mailingstate','Mailing State',1,0,0,100,7,7,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'otherstate','vtiger_contactaddress',1,'1','otherstate','Other State',1,0,0,100,8,7,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'mailingzip','vtiger_contactaddress',1,'1','mailingzip','Mailing Zip',1,0,0,100,9,7,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'otherzip','vtiger_contactaddress',1,'1','otherzip','Other Zip',1,0,0,100,10,7,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'mailingcountry','vtiger_contactaddress',1,'1','mailingcountry','Mailing Country',1,0,0,100,11,7,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'othercountry','vtiger_contactaddress',1,'1','othercountry','Other Country',1,0,0,100,12,7,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'mailingpobox','vtiger_contactaddress',1,'1','mailingpobox','Mailing Po Box',1,0,0,100,3,7,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'otherpobox','vtiger_contactaddress',1,'1','otherpobox','Other Po Box',1,0,0,100,4,7,1,'V~O',1,null,'BAS')");
+//Block7 -- End
+
+//ContactImageInformation
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'imagename','vtiger_contactdetails',1,'69','imagename','Contact Image',1,0,0,100,1,75,1,'V~O',1,null,'ADV')");
+
+
+//Block8 -- Start
+$this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,8,1,'V~O',1,null,'BAS')");
+//Block8 -- End
+//Contact Details -- END
+
+
+//Potential Details -- START
+//Block1 -- Start
+
+$this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'potentialname','vtiger_potential',1,'2','potentialname','Potential Name',1,0,0,100,1,1,1,'V~M',0,1,'BAS')");	
+ $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'amount','vtiger_potential',1,71,'amount','Amount',1,0,0,100,2,1,1,'N~O',0,5,'BAS')");	
+ $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'accountid','vtiger_potential',1,'50','account_id','Account Name',1,0,0,100,3,1,1,'V~M',0,2,'BAS')");	
+ $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'closingdate','vtiger_potential',1,'23','closingdate','Expected Close Date',1,0,0,100,5,1,1,'D~M',0,3,'BAS')");	
+ $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'potentialtype','vtiger_potential',1,'15','opportunity_type','Type',1,0,0,100,6,1,1,'V~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'nextstep','vtiger_potential',1,'1','nextstep','Next Step',1,0,0,100,7,1,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'leadsource','vtiger_potential',1,'15','leadsource','Lead Source',1,0,0,100,8,1,1,'V~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'sales_stage','vtiger_potential',1,'16','sales_stage','Sales Stage',1,0,0,100,9,1,1,'V~O',0,4,'BAS')");
+ $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,10,1,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'probability','vtiger_potential',1,'9','probability','Probability',1,0,0,100,11,1,1,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'campaignid','vtiger_potential',1,'58','campaignid','Campaign Source',1,0,0,100,12,1,1,'N~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,13,1,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,14,1,2,'T~O',1,null,'BAS')");
+
+//Block1 -- End
+
+//Block3 -- Start
+
+ $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,3,1,'V~O',1,null,'BAS')");
+
+//Block3 -- End
+//Potential Details -- END
+
+
+//campaign entries being added
+
+
+ $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'campaignname','vtiger_campaign',1,'2','campaignname','Campaign Name',1,0,0,100,1,76,1,'V~M',0,1,'BAS')");
+ $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'campaigntype','vtiger_campaign',1,15,'campaigntype','Campaign Type',1,0,0,100,2,76,1,'V~O',0,5,'BAS')");
+ $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'product_id','vtiger_campaign',1,59,'product_id','Product',1,0,0,100,3,76,1,'I~O',0,5,'BAS')");
+ $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'campaignstatus','vtiger_campaign',1,15,'campaignstatus','Campaign Status',1,0,0,100,4,76,1,'V~O',0,5,'BAS')");
+ $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'closingdate','vtiger_campaign',1,'23','closingdate','Expected Close Date',1,0,0,100,5,76,1,'D~M',0,3,'BAS')");
+ $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'expectedrevenue','vtiger_campaign',1,'1','expectedrevenue','Expected Revenue',1,0,0,100,6,76,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'budgetcost','vtiger_campaign',1,'1','budgetcost','Budget Cost',1,0,0,100,7,76,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'actualcost','vtiger_campaign',1,'1','actualcost','Actual Cost',1,0,0,100,8,76,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'expectedresponse','vtiger_campaign',1,'15','expectedresponse','Expected Response',1,0,0,100,9,76,1,'V~O',0,4,'BAS')");
+ $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'smownerid','vtiger_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 vtiger_field values (26,".$this->db->getUniqueID("field").",'numsent','vtiger_campaign',1,'9','numsent','Num Sent',1,0,0,100,11,76,1,'N~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'sponsor','vtiger_campaign',1,'1','sponsor','Sponsor',1,0,0,100,12,76,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'targetaudience','vtiger_campaign',1,'1','targetaudience','Target Audience',1,0,0,100,13,76,1,'V~O',1,null,'BAS')");
+
+$this->db->query("insert into vtiger_field values(26,".$this->db->getUniqueID("field").",'targetsize','vtiger_campaign',1,'1','targetsize','TargetSize',1,0,0,100,14,76,1,'N~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values(26,".$this->db->getUniqueID("field").",'expectedresponsecount','vtiger_campaign',1,'1','expectedresponsecount','Expected Response Count',1,0,0,100,17,76,1,'N~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values(26,".$this->db->getUniqueID("field").",'expectedsalescount','vtiger_campaign',1,'1','expectedsalescount','Expected Sales Count',1,0,0,100,15,76,1,'N~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values(26,".$this->db->getUniqueID("field").",'expectedroi','vtiger_campaign',1,'1','expectedroi','Expected ROI',1,0,0,100,19,76,1,'N~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values(26,".$this->db->getUniqueID("field").",'actualresponsecount','vtiger_campaign',1,'1','actualresponsecount','Actual Response Count',1,0,0,100,18,76,1,'N~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values(26,".$this->db->getUniqueID("field").",'actualsalescount','vtiger_campaign',1,'1','actualsalescount','Actual Sales Count',1,0,0,100,16,76,1,'N~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values(26,".$this->db->getUniqueID("field").",'actualroi','vtiger_campaign',1,'1','actualroi','Actual ROI',1,0,0,100,20,76,1,'N~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,15,76,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,16,76,2,'T~O',1,null,'BAS')");
+
+$this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,78,1,'V~O',1,null,'BAS')");
+
+//Campaign entries end
+
+
+//Ticket Details -- START
+//Block25 -- Start
+
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,2,25,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'parent_id','vtiger_troubletickets',1,'68','parent_id','Related To',1,0,0,100,4,25,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'priority','vtiger_troubletickets',1,'15','ticketpriorities','Priority',1,0,0,100,5,25,1,'V~O',0,3,'BAS')");
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'product_id','vtiger_troubletickets',1,'59','product_id','Product Name',1,0,0,100,6,25,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'severity','vtiger_troubletickets',1,'15','ticketseverities','Severity',1,0,0,100,7,25,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'status','vtiger_troubletickets',1,'15','ticketstatus','Status',1,0,0,100,8,25,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'category','vtiger_troubletickets',1,'15','ticketcategories','Category',1,0,0,100,9,25,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'update_log','vtiger_troubletickets',1,'15','update_log','Update History',1,0,0,100,9,25,3,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,10,25,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,11,25,2,'T~O',1,null,'BAS')");
+ //Added on 26-12-2005 to add attachment in ticket editview
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'filename','vtiger_attachments',1,'61','filename','Attachment',1,0,0,100,12,26,1,'V~O',0,1,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'title','vtiger_troubletickets',1,'22','ticket_title','Title',1,0,0,100,1,26,1,'V~M',0,1,'BAS')");
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'description','vtiger_troubletickets',1,'19','description','Description',1,0,0,100,1,28,1,'V~O',0,2,'BAS')");
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'solution','vtiger_troubletickets',1,'19','solution','Solution',1,0,0,100,1,29,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'comments','vtiger_ticketcomments',1,'19','comments','Add Comment',1,0,0,100,1,30,1,'V~O',1,null,'BAS')");
+
+//Block25-30 -- End
+//Ticket Details -- END
+
+//Product Details -- START
+//Block31-36 -- Start
+
+$this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'productname','vtiger_products',1,'2','productname','Product Name',1,0,0,100,1,31,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'productcode','vtiger_products',1,'1','productcode','Product Code',1,0,0,100,2,31,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'discontinued','vtiger_products',1,'56','discontinued','Product Active',1,0,0,100,3,31,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'manufacturer','vtiger_products',1,'15','manufacturer','Manufacturer',1,0,0,100,4,1,31,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'productcategory','vtiger_products',1,'15','productcategory','Product Category',1,0,0,100,4,31,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'sales_start_date','vtiger_products',1,'5','sales_start_date','Sales Start Date',1,0,0,100,5,31,1,'D~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'sales_end_date','vtiger_products',1,'5','sales_end_date','Sales End Date',1,0,0,100,6,31,1,'D~O~OTH~GE~sales_start_date~Sales Start Date',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'start_date','vtiger_products',1,'5','start_date','Support Start Date',1,0,0,100,7,31,1,'D~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'expiry_date','vtiger_products',1,'5','expiry_date','Support Expiry Date',1,0,0,100,8,31,1,'D~O~OTH~GE~start_date~Start Date',1,null,'BAS')");
+ 
+
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'crmid','vtiger_seproductsrel',1,'66','parent_id','Related To',1,0,0,100,10,31,1,'I~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'contactid','vtiger_products',1,'57','contact_id','Contact Name',1,0,0,100,11,31,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'website','vtiger_products',1,'17','website','Website',1,0,0,100,12,31,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'vendor_id','vtiger_products',1,'75','vendor_id','Vendor Name',1,0,0,100,13,31,1,'I~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'mfr_part_no','vtiger_products',1,'1','mfr_part_no','Mfr PartNo',1,0,0,100,14,31,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'vendor_part_no','vtiger_products',1,'1','vendor_part_no','Vendor PartNo',1,0,0,100,15,31,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'serialno','vtiger_products',1,'1','serial_no','Serial No',1,0,0,100,16,31,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'productsheet','vtiger_products',1,'1','productsheet','Product Sheet',1,0,0,100,17,31,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'glacct','vtiger_products',1,'15','glacct','GL Account',1,0,0,100,18,31,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,19,31,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,20,31,2,'T~O',1,null,'BAS')");
+
+
+//Block32 Pricing Information
+
+$this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'unit_price','vtiger_products',1,'71','unit_price','Unit Price',1,0,0,100,1,32,1,'N~O',1,null,'BAS')"); 
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'commissionrate','vtiger_products',1,'9','commissionrate','Commission Rate',1,0,0,100,2,32,1,'N~O',1,null,'BAS')"); 
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'taxclass','vtiger_producttaxrel',1,'83','taxclass','Tax Class',1,0,0,100,4,32,1,'V~O',1,null,'BAS')");
+
+
+//Block 33 stock info
+
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'usageunit','vtiger_products',1,'15','usageunit','Usage Unit',1,0,0,100,1,33,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'qty_per_unit','vtiger_products',1,'1','qty_per_unit','Qty/Unit',1,0,0,100,2,33,1,'N~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'qtyinstock','vtiger_products',1,'1','qtyinstock','Qty In Stock',1,0,0,100,3,33,1,'I~O',1,null,'ADV')");
+$this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'reorderlevel','vtiger_products',1,'1','reorderlevel','Reorder Level',1,0,0,100,4,33,1,'I~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'handler','vtiger_products',1,'52','assigned_user_id','Handler',1,0,0,100,5,33,1,'I~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'qtyindemand','vtiger_products',1,'1','qtyindemand','Qty In Demand',1,0,0,100,6,33,1,'I~O',1,null,'ADV')");
+
+
+//ProductImageInformation
+
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'imagename','vtiger_products',1,'69','imagename','Product Image',1,0,0,100,1,35,1,'V~O',1,null,'ADV')");
+
+
+//Block 36 Description Info
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'product_description','vtiger_products',1,'19','product_description','Description',1,0,0,100,1,36,1,'V~O',1,null,'BAS')");
+
+//Product Details -- END
+
+//Note Details -- START
+//Block17 -- Start
+
+$this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("field").",'contact_id','vtiger_notes',1,'57','contact_id','Contact Name',1,0,0,100,1,17,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("field").",'crmid','vtiger_senotesrel',1,'62','parent_id','Related To',1,0,0,100,2,17,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("field").",'title','vtiger_notes',1,'2','notes_title','Subject',1,0,0,100,3,17,1,'V~M',0,1,'BAS')");
+$this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,4,17,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,5,17,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("field").",'filename','vtiger_notes',1,'61','filename','Attachment',1,0,0,100,4,17,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("field").",'notecontent','vtiger_notes',1,'19','notecontent','Note',1,0,0,100,5,18,1,'V~O',1,null,'BAS')");
+
+//Block17 -- End
+//Note Details -- END
+
+//Email Details -- START
+//Block21 -- Start
+
+	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'date_start','vtiger_activity',1,'6','date_start','Date & Time Sent',1,0,0,100,1,21,1,'DT~M~time_start~Time Start',1,null,'BAS')");
+	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'semodule','vtiger_activity',1,'2','parent_type','Sales Enity Module',1,0,0,100,2,21,3,'',1,null,'BAS')");
+	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'activitytype','vtiger_activity',1,'2','activitytype','Activtiy Type',1,0,0,100,3,21,3,'V~O',1,null,'BAS')");
+	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'crmid','vtiger_seactivityrel',1,'357','parent_id','Related To',1,0,0,100,1,22,1,'I~O',1,null,'BAS')");
+	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,5,21,1,'V~M',1,null,'BAS')");
+	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'subject','vtiger_activity',1,'2','subject','Subject',1,0,0,100,1,23,1,'V~M',1,null,'BAS')");
+	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'filename','vtiger_attachments',1,'61','filename','Attachment',1,0,0,100,2,23,1,'V~O',1,null,'BAS')");
+	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,24,1,'V~O',1,null,'BAS')");
+	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'time_start','vtiger_activity',1,'2','time_start','Time Start',1,0,0,100,9,1,23,'T~O',1,null,'BAS')");
+	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,10,1,22,'T~O',1,null,'BAS')");
+ 	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,11,21,2,'T~O',1,null,'BAS')");
+
+//Block21 -- End
+//Email Details -- END
+
+//Task Details --START
+//Block19 -- Start
+$this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'subject','vtiger_activity',1,'2','subject','Subject',1,0,0,100,1,19,1,'V~M',0,1,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,2,19,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'date_start','vtiger_activity',1,'6','date_start','Start Date & Time',1,0,0,100,3,19,1,'DT~M~time_start',0,2,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'time_start','vtiger_activity',1,'2','time_start','Time Start',1,0,0,100,4,19,3,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'due_date','vtiger_activity',1,'23','due_date','Due Date',1,0,0,100,5,19,1,'D~M~OTH~GE~date_start~Start Date & Time',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'crmid','vtiger_seactivityrel',1,'66','parent_id','Related To',1,0,0,100,7,19,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'contactid','vtiger_cntactivityrel',1,'57','contact_id','Contact Name',1,0,0,100,8,19,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'status','vtiger_activity',1,'15','taskstatus','Status',1,0,0,100,9,19,1,'V~O',0,3,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'eventstatus','vtiger_activity',1,'15','eventstatus','Status',1,0,0,100,9,19,3,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'priority','vtiger_activity',1,'15','taskpriority','Priority',1,0,0,100,10,19,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'sendnotification','vtiger_activity',1,'56','sendnotification','Send Notification',1,0,0,100,11,19,1,'C~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,14,19,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,15,19,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'activitytype','vtiger_activity',1,'15','activitytype','Activity Type',1,0,0,100,16,19,3,'V~O',1,null,'BAS')");
+ $this->db->query("Insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'visibility','vtiger_activity',1,15,'visibility','Visibility',1,0,0,100,17,19,3,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,20,1,'V~O',1,null,'BAS')");
+
+
+$this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'duration_hours','vtiger_activity',1,'63','duration_hours','Duration',1,0,0,100,17,19,3,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'duration_minutes','vtiger_activity',1,'15','duration_minutes','Duration Minutes',1,0,0,100,18,19,3,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'location','vtiger_activity',1,'1','location','Location',1,0,0,100,19,19,3,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'reminder_time','vtiger_activity_reminder',1,'30','reminder_time','Send Reminder',1,0,0,100,1,19,3,'I~O',1,null,'BAS')");
+ 
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'recurringtype','vtiger_recurringevents',1,'15','recurringtype','Recurrence',1,0,0,100,6,19,3,'O~O',1,null,'BAS')");
+
+ $this->db->query("Insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'notime','vtiger_activity',1,56,'notime','No Time',1,0,0,100,20,19,3,'C~O',1,null,'BAS')");
+//Block19 -- End
+//Task Details -- END
+
+//Event Details --START
+//Block41-43-- Start
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'subject','vtiger_activity',1,'2','subject','Subject',1,0,0,100,1,41,1,'V~M',0,1,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,2,41,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'date_start','vtiger_activity',1,'6','date_start','Start Date & Time',1,0,0,100,3,41,1,'DT~M~time_start',0,2,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'time_start','vtiger_activity',1,'2','time_start','Time Start',1,0,0,100,4,41,3,'T~M',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'due_date','vtiger_activity',1,'23','due_date','End Date',1,0,0,100,5,41,1,'D~M~OTH~GE~date_start~Start Date & Time',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'recurringtype','vtiger_recurringevents',1,'15','recurringtype','Recurrence',1,0,0,100,6,41,1,'O~O',1,null,'BAS')");
+  
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'duration_hours','vtiger_activity',1,'63','duration_hours','Duration',1,0,0,100,7,41,1,'I~M',0,5,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'duration_minutes','vtiger_activity',1,'15','duration_minutes','Duration Minutes',1,0,0,100,8,41,3,'O~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'crmid','vtiger_seactivityrel',1,'66','parent_id','Related To',1,0,0,100,9,41,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'eventstatus','vtiger_activity',1,'15','eventstatus','Status',1,0,0,100,10,41,1,'V~O',0,3,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'sendnotification','vtiger_activity',1,'56','sendnotification','Send Notification',1,0,0,100,11,41,1,'C~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'activitytype','vtiger_activity',1,'15','activitytype','Activity Type',1,0,0,100,12,41,1,'V~O',0,4,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'location','vtiger_activity',1,'1','location','Location',1,0,0,100,13,41,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,14,41,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,15,41,2,'T~O',1,null,'BAS')");
+ $this->db->query("Insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'priority','vtiger_activity',1,15,'taskpriority','Priority',1,0,0,100,16,41,1,'V~O',1,null,'BAS')");
+ $this->db->query("Insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'notime','vtiger_activity',1,56,'notime','No Time',1,0,0,100,17,41,1,'C~O',1,null,'BAS')");
+ $this->db->query("Insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'visibility','vtiger_activity',1,15,'visibility','Visibility',1,0,0,100,18,41,1,'V~O',1,null,'BAS')");
+ 
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,43,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'reminder_time','vtiger_activity_reminder',1,'30','reminder_time','Send Reminder',1,0,0,100,1,42,1,'I~O',1,null,'BAS')");
+//Block41-43 -- End
+//Event Details -- END
+
+//Faq Details -- START
+//Block37-40 -- Start
+
+$this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("field").",'product_id','vtiger_faq',1,'59','product_id','Product Name',1,0,0,100,1,37,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("field").",'category','vtiger_faq',1,'15','faqcategories','Category',1,0,0,100,2,37,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("field").",'status','vtiger_faq',1,'15','faqstatus','Status',1,0,0,100,3,37,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("field").",'question','vtiger_faq',1,'20','question','Question',1,0,0,100,1,38,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("field").",'answer','vtiger_faq',1,'20','faq_answer','Answer',1,0,0,100,1,39,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("field").",'comments','vtiger_faqcomments',1,'19','comments','Add Comment',1,0,0,100,1,40,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,3,37,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,4,37,2,'T~O',1,null,'BAS')");
+
+
+//Block37-40 -- End
+//Ticket Details -- END
+
+//Vendor Details --START
+//Block44-47
+
+$this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'vendorname','vtiger_vendor',1,'2','vendorname','Vendor Name',1,0,0,100,1,44,1,'V~M',0,1,'BAS')");
+ $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'phone','vtiger_vendor',1,'1','phone','Phone',1,0,0,100,3,44,1,'V~O',0,2,'BAS')");
+ $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'email','vtiger_vendor',1,'13','email','Email',1,0,0,100,4,44,1,'E~O',0,3,'BAS')");
+ $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'website','vtiger_vendor',1,'17','website','Website',1,0,0,100,5,44,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'glacct','vtiger_vendor',1,'15','glacct','GL Account',1,0,0,100,6,44,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'category','vtiger_vendor',1,'1','category','Category',1,0,0,100,7,44,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,8,44,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,9,44,2,'T~O',1,null,'BAS')");
+
+//Block 46
+
+$this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'street','vtiger_vendor',1,'21','street','Street',1,0,0,100,1,46,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'pobox','vtiger_vendor',1,'1','pobox','Po Box',1,0,0,100,2,46,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'city','vtiger_vendor',1,'1','city','City',1,0,0,100,3,46,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'state','vtiger_vendor',1,'1','state','State',1,0,0,100,4,46,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'postalcode','vtiger_vendor',1,'1','postalcode','Postal Code',1,0,0,100,5,46,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'country','vtiger_vendor',1,'1','country','Country',1,0,0,100,6,46,1,'V~O',1,null,'ADV')");
+
+//Block 47
+
+$this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,47,1,'V~O',1,null,'ADV')");
+
+//Vendor Details -- END
+
+//PriceBook Details Start
+//Block48
+
+$this->db->query("insert into vtiger_field values (19,".$this->db->getUniqueID("field").",'bookname','vtiger_pricebook',1,'2','bookname','Price Book Name',1,0,0,100,1,48,1,'V~M',0,1,'BAS')");
+ $this->db->query("insert into vtiger_field values (19,".$this->db->getUniqueID("field").",'active','vtiger_pricebook',1,'56','active','Active',1,0,0,100,3,48,1,'V~O',0,2,'BAS')");
+$this->db->query("insert into vtiger_field values (19,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,4,48,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (19,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,5,48,2,'T~O',1,null,'BAS')");
+
+//Block50
+
+$this->db->query("insert into vtiger_field values (19,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,50,1,'V~O',1,null,'BAS')");
+
+//PriceBook Details End
+
+
+//Quote Details -- START
+ //Block51
+
+$this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'subject','vtiger_quotes',1,'2','subject','Subject',1,0,0,100,1,51,1,'V~M',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'potentialid','vtiger_quotes',1,'76','potential_id','Potential Name',1,0,0,100,2,51,1,'I~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'quotestage','vtiger_quotes',1,'15','quotestage','Quote Stage',1,0,0,100,3,51,1,'V~O',1,null,'BAS')");	
+
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'validtill','vtiger_quotes',1,'5','validtill','Valid Till',1,0,0,100,4,51,1,'D~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'team','vtiger_quotes',1,'1','team','Team',1,0,0,100,5,51,1,'V~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'contactid','vtiger_quotes',1,'57','contact_id','Contact Name',1,0,0,100,6,51,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'carrier','vtiger_quotes',1,'15','carrier','Carrier',1,0,0,100,8,51,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'subtotal','vtiger_quotes',1,'1','hdnSubTotal','Sub Total',1,0,0,100,9,51,3,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'shipping','vtiger_quotes',1,'1','shipping','Shipping',1,0,0,100,10,51,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'inventorymanager','vtiger_quotes',1,'77','assigned_user_id1','Inventory Manager',1,0,0,100,11,51,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'tax','vtiger_quotes',1,'1','txtTax','Tax',1,0,0,100,13,51,3,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'adjustment','vtiger_quotes',1,'1','txtAdjustment','Adjustment',1,0,0,100,20,51,3,'NN~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'total','vtiger_quotes',1,'1','hdnGrandTotal','Total',1,0,0,100,14,51,3,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'accountid','vtiger_quotes',1,'73','account_id','Account Name',1,0,0,100,16,51,1,'I~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,17,51,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,18,51,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,19,51,2,'T~O',1,null,'BAS')");
+
+
+ //Block 53
+
+$this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'bill_street','vtiger_quotesbillads',1,'24','bill_street','Billing Address',1,0,0,100,1,53,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'ship_street','vtiger_quotesshipads',1,'24','ship_street','Shipping Address',1,0,0,100,2,53,1,'V~M',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'bill_city','vtiger_quotesbillads',1,'1','bill_city','Billing City',1,0,0,100,5,53,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'ship_city','vtiger_quotesshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,53,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'bill_state','vtiger_quotesbillads',1,'1','bill_state','Billing State',1,0,0,100,7,53,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'ship_state','vtiger_quotesshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,53,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'bill_code','vtiger_quotesbillads',1,'1','bill_code','Billing Code',1,0,0,100,9,53,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'ship_code','vtiger_quotesshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,53,1,'V~O',1,null,'BAS')");
+
+
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'bill_country','vtiger_quotesbillads',1,'1','bill_country','Billing Country',1,0,0,100,11,53,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'ship_country','vtiger_quotesshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,53,1,'V~O',1,null,'BAS')");
+
+$this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'bill_pobox','vtiger_quotesbillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,53,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'ship_pobox','vtiger_quotesshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,53,1,'V~O',1,null,'BAS')");
+ //Block55
+
+$this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,56,1,'V~O',1,null,'ADV')");
+
+//Block 56
+$this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'terms_conditions','vtiger_quotes',1,'19','terms_conditions','Terms & Conditions',1,0,0,100,1,55,1,'V~O',1,null,'ADV')");
+
+
+//Quote Details -- END
+
+//Purchase Order Details -- START
+ //Block57
+ 
+$this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'subject','vtiger_purchaseorder',1,'2','subject','Subject',1,0,0,100,1,57,1,'V~M',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'vendorid','vtiger_purchaseorder',1,'81','vendor_id','Vendor Name',1,0,0,100,3,57,1,'I~M',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'requisition_no','vtiger_purchaseorder',1,'1','requisition_no','Requisition No',1,0,0,100,4,57,1,'V~O',1,null,'BAS')");	
+
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'tracking_no','vtiger_purchaseorder',1,'1','tracking_no','Tracking Number',1,0,0,100,5,57,1,'V~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'contactid','vtiger_purchaseorder',1,'57','contact_id','Contact Name',1,0,0,100,6,57,1,'I~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'duedate','vtiger_purchaseorder',1,'5','duedate','Due Date',1,0,0,100,7,57,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'carrier','vtiger_purchaseorder',1,'15','carrier','Carrier',1,0,0,100,8,57,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'salestax','vtiger_purchaseorder',1,'1','txtTax','Sales Tax',1,0,0,100,10,57,3,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'adjustment','vtiger_purchaseorder',1,'1','txtAdjustment','Adjustment',1,0,0,100,10,57,3,'NN~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'salescommission','vtiger_purchaseorder',1,'1','salescommission','Sales Commission',1,0,0,100,11,57,1,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'exciseduty','vtiger_purchaseorder',1,'1','exciseduty','Excise Duty',1,0,0,100,12,57,1,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'total','vtiger_purchaseorder',1,'1','hdnGrandTotal','Total',1,0,0,100,13,57,3,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'subtotal','vtiger_purchaseorder',1,'1','hdnSubTotal','Sub Total',1,0,0,100,14,57,3,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'postatus','vtiger_purchaseorder',1,'15','postatus','Status',1,0,0,100,15,57,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,16,57,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,17,57,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,18,57,2,'T~O',1,null,'BAS')");
+
+
+
+ //Block 59
+
+$this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'bill_street','vtiger_pobillads',1,'24','bill_street','Billing Address',1,0,0,100,1,59,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'ship_street','vtiger_poshipads',1,'24','ship_street','Shipping Address',1,0,0,100,2,59,1,'V~M',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'bill_city','vtiger_pobillads',1,'1','bill_city','Billing City',1,0,0,100,5,59,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'ship_city','vtiger_poshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,59,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'bill_state','vtiger_pobillads',1,'1','bill_state','Billing State',1,0,0,100,7,59,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'ship_state','vtiger_poshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,59,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'bill_code','vtiger_pobillads',1,'1','bill_code','Billing Code',1,0,0,100,9,59,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'ship_code','vtiger_poshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,59,1,'V~O',1,null,'BAS')");
+
+
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'bill_country','vtiger_pobillads',1,'1','bill_country','Billing Country',1,0,0,100,11,59,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'ship_country','vtiger_poshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,59,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'bill_pobox','vtiger_pobillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,59,1,'V~O',1,null,'BAS')");
+  $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'ship_pobox','vtiger_poshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,59,1,'V~O',1,null,'BAS')");
+  
+ //Block61
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,62,1,'V~O',1,null,'ADV')");
+
+ //Block62
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'terms_conditions','vtiger_purchaseorder',1,'19','terms_conditions','Terms & Conditions',1,0,0,100,1,61,1,'V~O',1,null,'ADV')");
+
+//Purchase Order Details -- END
+
+//Sales Order Details -- START
+ //Block63
+ 
+$this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'subject','vtiger_salesorder',1,'2','subject','Subject',1,0,0,100,1,63,1,'V~M',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'potentialid','vtiger_salesorder',1,'76','potential_id','Potential Name',1,0,0,100,2,63,1,'I~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'customerno','vtiger_salesorder',1,'1','customerno','Customer No',1,0,0,100,3,63,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'quoteid','vtiger_salesorder',1,'78','quote_id','Quote Name',1,0,0,100,4,63,1,'I~O',1,null,'BAS')");	
+$this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'purchaseorder','vtiger_salesorder',1,'1','vtiger_purchaseorder','Purchase Order',1,0,0,100,4,63,1,'V~O',1,null,'BAS')");	
+
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'contactid','vtiger_salesorder',1,'57','contact_id','Contact Name',1,0,0,100,6,63,1,'I~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'duedate','vtiger_salesorder',1,'5','duedate','Due Date',1,0,0,100,8,63,1,'D~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'carrier','vtiger_salesorder',1,'15','carrier','Carrier',1,0,0,100,9,63,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'pending','vtiger_salesorder',1,'1','pending','Pending',1,0,0,100,10,63,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'sostatus','vtiger_salesorder',1,'15','sostatus','Status',1,0,0,100,11,63,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'salestax','vtiger_salesorder',1,'1','txtTax','Sales Tax',1,0,0,100,12,63,3,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'adjustment','vtiger_salesorder',1,'1','txtAdjustment','Sales Tax',1,0,0,100,12,63,3,'NN~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'salescommission','vtiger_salesorder',1,'1','salescommission','Sales Commission',1,0,0,100,13,63,1,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'exciseduty','vtiger_salesorder',1,'1','exciseduty','Excise Duty',1,0,0,100,13,63,1,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'total','vtiger_salesorder',1,'1','hdnGrandTotal','Total',1,0,0,100,14,63,3,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'subtotal','vtiger_salesorder',1,'1','hdnSubTotal','Total',1,0,0,100,15,63,3,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'accountid','vtiger_salesorder',1,'73','account_id','Account Name',1,0,0,100,16,63,1,'I~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,17,63,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,18,63,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,19,63,2,'T~O',1,null,'BAS')");
+
+
+
+ //Block 65
+
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'bill_street','vtiger_sobillads',1,'24','bill_street','Billing Address',1,0,0,100,1,65,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'ship_street','vtiger_soshipads',1,'24','ship_street','Shipping Address',1,0,0,100,2,65,1,'V~M',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'bill_city','vtiger_sobillads',1,'1','bill_city','Billing City',1,0,0,100,5,65,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'ship_city','vtiger_soshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,65,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'bill_state','vtiger_sobillads',1,'1','bill_state','Billing State',1,0,0,100,7,65,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'ship_state','vtiger_soshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,65,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'bill_code','vtiger_sobillads',1,'1','bill_code','Billing Code',1,0,0,100,9,65,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'ship_code','vtiger_soshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,65,1,'V~O',1,null,'BAS')");
+
+
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'bill_country','vtiger_sobillads',1,'1','bill_country','Billing Country',1,0,0,100,11,65,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'ship_country','vtiger_soshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,65,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'bill_pobox','vtiger_sobillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,65,1,'V~O',1,null,'BAS')");
+  $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'ship_pobox','vtiger_soshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,65,1,'V~O',1,null,'BAS')");
+  
+//Block67
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,68,1,'V~O',1,null,'ADV')");
+
+ //Block68
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'terms_conditions','vtiger_salesorder',1,'19','terms_conditions','Terms & Conditions',1,0,0,100,1,67,1,'V~O',1,null,'ADV')");
+
+
+//Sales Order Details -- END
+
+//Invoice Details -- START
+ //Block69
+
+$this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'subject','vtiger_invoice',1,'2','subject','Subject',1,0,0,100,1,69,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'salesorderid','vtiger_invoice',1,'80','salesorder_id','Sales Order',1,0,0,100,2,69,1,'I~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'customerno','vtiger_invoice',1,'1','customerno','Customer No',1,0,0,100,3,69,1,'V~O',1,null,'BAS')");	
+
+ 
+//to include contact name vtiger_field in Invoice-start
+$this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'contactid','vtiger_invoice',1,'57','contact_id','Contact Name',1,0,0,100,4,69,1,'I~O',1,null,'BAS')");
+//end
+
+$this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'invoicedate','vtiger_invoice',1,'5','invoicedate','Invoice Date',1,0,0,100,5,69,1,'D~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'duedate','vtiger_invoice',1,'5','duedate','Due Date',1,0,0,100,6,69,1,'D~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'purchaseorder','vtiger_invoice',1,'1','vtiger_purchaseorder','Purchase Order',1,0,0,100,8,69,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'salestax','vtiger_invoice',1,'1','txtTax','Sales Tax',1,0,0,100,9,69,3,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'adjustment','vtiger_invoice',1,'1','txtAdjustment','Sales Tax',1,0,0,100,9,69,3,'NN~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'salescommission','vtiger_invoice',1,'1','salescommission','Sales Commission',1,0,0,10,13,69,1,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'exciseduty','vtiger_invoice',1,'1','exciseduty','Excise Duty',1,0,0,100,11,69,1,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'subtotal','vtiger_invoice',1,'1','hdnSubTotal','Sub Total',1,0,0,100,12,69,3,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'total','vtiger_invoice',1,'1','hdnGrandTotal','Total',1,0,0,100,13,69,3,'N~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'accountid','vtiger_invoice',1,'73','account_id','Account Name',1,0,0,100,14,69,1,'I~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'invoicestatus','vtiger_invoice',1,'15','invoicestatus','Status',1,0,0,100,15,69,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,16,69,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,17,69,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,18,69,2,'T~O',1,null,'BAS')"); 
+
+ //Block 71
+
+$this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'bill_street','vtiger_invoicebillads',1,'24','bill_street','Billing Address',1,0,0,100,1,71,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'ship_street','vtiger_invoiceshipads',1,'24','ship_street','Shipping Address',1,0,0,100,2,71,1,'V~M',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'bill_city','vtiger_invoicebillads',1,'1','bill_city','Billing City',1,0,0,100,5,71,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'ship_city','vtiger_invoiceshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,71,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'bill_state','vtiger_invoicebillads',1,'1','bill_state','Billing State',1,0,0,100,7,71,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'ship_state','vtiger_invoiceshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,71,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'bill_code','vtiger_invoicebillads',1,'1','bill_code','Billing Code',1,0,0,100,9,71,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'ship_code','vtiger_invoiceshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,71,1,'V~O',1,null,'BAS')");
+
+
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'bill_country','vtiger_invoicebillads',1,'1','bill_country','Billing Country',1,0,0,100,11,71,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'ship_country','vtiger_invoiceshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,71,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'bill_pobox','vtiger_invoicebillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,71,1,'V~O',1,null,'BAS')");
+  $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'ship_pobox','vtiger_invoiceshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,71,1,'V~O',1,null,'BAS')");
+
+//Block73
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,74,1,'V~O',1,null,'ADV')");
+ //Block74
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'terms_conditions','vtiger_invoice',1,'19','terms_conditions','Terms & Conditions',1,0,0,100,1,73,1,'V~O',1,null,'ADV')");
+
+
+//Invoice Details -- END
+ //users Details Starts Block 79,80,81
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'user_name','vtiger_users',1,'106','user_name','User Name',1,0,0,11,1,79,1,'V~M',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'is_admin','vtiger_users',1,'156','is_admin','Admin',1,0,0,3,2,79,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'user_password','vtiger_users',1,'99','user_password','Password',1,0,0,30,3,79,4,'P~M',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'confirm_password','vtiger_users',1,'99','confirm_password','Confirm Password',1,0,0,30,4,79,4,'P~M',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'first_name','vtiger_users',1,'1','first_name','First Name',1,0,0,30,5,79,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'last_name','vtiger_users',1,'2','last_name','Last Name',1,0,0,30,6,79,1,'V~M',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'roleid','vtiger_user2role',1,'98','roleid','Role',1,0,0,200,7,79,1,'V~M',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'email1','vtiger_users',1,'104','email1','Email',1,0,0,100,9,79,1,'E~M',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'status','vtiger_users',1,'115','status','Status',1,0,0,100,10,79,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'activity_view','vtiger_users',1,'15','activity_view','Default Activity View',1,0,0,100,13,79,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'lead_view','vtiger_users',1,'15','lead_view','Default Lead View',1,0,0,100,12,79,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'currency_id','vtiger_users',1,'116','currency_id','Currency',1,0,0,100,11,79,1,'I~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'hour_format','vtiger_users',1,'116','hour_format','Calendar Hour Format',1,0,0,100,13,79,3,'I~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'end_hour','vtiger_users',1,'116','end_hour','Day ends at',1,0,0,100,15,79,3,'I~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'start_hour','vtiger_users',1,'116','start_hour','Day starts at',1,0,0,100,14,79,3,'I~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'title','vtiger_users',1,'1','title','Title',1,0,0,50,1,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'phone_work','vtiger_users',1,'1','phone_work','Office Phone',1,0,0,50,2,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'department','vtiger_users',1,'1','department','Department',1,0,0,50,3,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'phone_mobile','vtiger_users',1,'1','phone_mobile','Mobile',1,0,0,50,4,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'reports_to_id','vtiger_users',1,'101','reports_to_id','Reports To',1,0,0,50,5,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'phone_other','vtiger_users',1,'1','phone_other','Other Phone',1,0,0,50,5,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'email2','vtiger_users',1,'13','email2','Other Email',1,0,0,100,6,80,1,'E~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'phone_fax','vtiger_users',1,'1','phone_fax','Fax',1,0,0,50,7,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'yahoo_id','vtiger_users',1,'13','yahoo_id','Yahoo id',1,0,0,100,7,80,1,'E~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'phone_home','vtiger_users',1,'1','phone_home','Home Phone',1,0,0,50,8,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'imagename','vtiger_users',1,'105','imagename','User Image',1,0,0,250,9,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'date_format','vtiger_users',1,'15','date_format','Date Format',1,0,0,30,10,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'tagcloud','vtiger_users',1,'103','tagcloud','Tag Cloud',1,0,0,250,13,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'signature','vtiger_users',1,'21','signature','Signature',1,0,0,250,11,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'description','vtiger_users',1,'21','description','Notes',1,0,0,250,12,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'address_street','vtiger_users',1,'21','address_street','Street Address',1,0,0,250,1,81,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'address_city','vtiger_users',1,'1','address_city','City',1,0,0,100,2,81,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'address_state','vtiger_users',1,'1','address_state','State',1,0,0,100,3,81,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'address_postalcode','vtiger_users',1,'1','address_postalcode','Postal Code',1,0,0,100,4,81,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'address_country','vtiger_users',1,'1','address_country','Country',1,0,0,100,5,81,1,'V~O',1,null,'BAS')");
+
+ //user Details End
+
+
+
+                // Insert End
+                
+
+		//New Security Start
+		//Inserting into vtiger_profile vtiger_table
+		$this->db->query("insert into vtiger_profile values ('".$profile1_id."','Administrator',null)");	
+		$this->db->query("insert into vtiger_profile values ('".$profile2_id."','Sales Profile',null)");
+		$this->db->query("insert into vtiger_profile values ('".$profile3_id."','Support Profile',null)");
+		$this->db->query("insert into vtiger_profile values ('".$profile4_id."','Guest Profile',null)");
+		
+		//Inserting into vtiger_profile2gloabal permissions
+		$this->db->query("insert into vtiger_profile2globalpermissions values ('".$profile1_id."',1,0)");
+		$this->db->query("insert into vtiger_profile2globalpermissions values ('".$profile1_id."',2,0)");
+		$this->db->query("insert into vtiger_profile2globalpermissions values ('".$profile2_id."',1,1)");
+		$this->db->query("insert into vtiger_profile2globalpermissions values ('".$profile2_id."',2,1)");
+		$this->db->query("insert into vtiger_profile2globalpermissions values ('".$profile3_id."',1,1)");
+		$this->db->query("insert into vtiger_profile2globalpermissions values ('".$profile3_id."',2,1)");
+		$this->db->query("insert into vtiger_profile2globalpermissions values ('".$profile4_id."',1,1)");
+		$this->db->query("insert into vtiger_profile2globalpermissions values ('".$profile4_id."',2,1)");
+
+		//Inserting into vtiger_profile2tab
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",1,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",2,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",3,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",4,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",6,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",7,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",8,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",9,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",10,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",13,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",14,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",15,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",16,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",17,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",18,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",19,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",20,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",21,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",22,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",23,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",24,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",25,0)");
+       		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",26,0)");
+       		$this->db->query("insert into vtiger_profile2tab values (".$profile1_id.",27,0)");
+
+		//Inserting into vtiger_profile2tab
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",1,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",2,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",3,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",4,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",6,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",7,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",8,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",9,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",10,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",13,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",14,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",15,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",16,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",17,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",18,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",19,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",20,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",21,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",22,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",23,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",24,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",25,0)");
+        	$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",26,0)");
+       		$this->db->query("insert into vtiger_profile2tab values (".$profile2_id.",27,0)");
+
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",1,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",2,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",3,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",4,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",6,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",7,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",8,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",9,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",10,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",13,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",14,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",15,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",16,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",17,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",18,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",19,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",20,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",21,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",22,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",23,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",24,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",25,0)");
+        	$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",26,0)");
+       		$this->db->query("insert into vtiger_profile2tab values (".$profile3_id.",27,0)");
+        
+
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",1,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",2,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",3,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",4,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",6,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",7,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",8,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",9,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",10,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",13,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",14,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",15,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",16,0)");	
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",17,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",18,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",19,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",20,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",21,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",22,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",23,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",24,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",25,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",26,0)");
+		$this->db->query("insert into vtiger_profile2tab values (".$profile4_id.",27,0)");
+		//Inserting into vtiger_profile2standardpermissions  Adminsitrator
+		
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",2,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",2,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",2,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",2,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",2,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",4,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",4,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",4,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",4,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",4,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",6,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",6,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",6,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",6,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",6,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",7,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",7,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",7,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",7,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",7,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",8,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",8,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",8,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",8,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",8,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",9,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",9,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",9,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",9,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",9,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",10,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",10,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",10,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",10,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",10,4,0)");
+
+		
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",13,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",13,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",13,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",13,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",13,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",14,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",14,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",14,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",14,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",14,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",15,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",15,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",15,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",15,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",15,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",16,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",16,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",16,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",16,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",16,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",18,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",18,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",18,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",18,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",18,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",19,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",19,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",19,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",19,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",19,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",20,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",20,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",20,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",20,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",20,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",21,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",21,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",21,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",21,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",21,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",22,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",22,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",22,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",22,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",22,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",23,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",23,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",23,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",23,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",23,4,0)");
+
+
+
+        	$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",26,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",26,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",26,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",26,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile1_id.",26,4,0)");
+
+
+		//Insert into Profile 2 std permissions for Sales User  
+		//Help Desk Create/Delete not allowed. Read-Only	
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",2,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",2,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",2,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",2,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",2,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",4,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",4,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",4,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",4,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",4,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",6,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",6,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",6,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",6,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",6,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",7,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",7,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",7,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",7,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",7,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",8,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",8,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",8,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",8,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",8,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",9,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",9,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",9,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",9,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",9,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",10,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",10,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",10,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",10,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",10,4,0)");
+
+		
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",13,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",13,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",13,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",13,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",13,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",14,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",14,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",14,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",14,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",14,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",15,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",15,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",15,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",15,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",15,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",16,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",16,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",16,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",16,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",16,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",18,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",18,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",18,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",18,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",18,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",19,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",19,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",19,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",19,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",19,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",20,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",20,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",20,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",20,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",20,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",21,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",21,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",21,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",21,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",21,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",22,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",22,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",22,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",22,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",22,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",23,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",23,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",23,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",23,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",23,4,0)");
+
+
+        	$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",26,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",26,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",26,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",26,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile2_id.",26,4,0)");
+
+		//Inserting into vtiger_profile2std for Support Profile
+		// Potential is read-only
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",2,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",2,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",2,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",2,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",2,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",4,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",4,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",4,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",4,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",4,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",6,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",6,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",6,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",6,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",6,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",7,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",7,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",7,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",7,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",7,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",8,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",8,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",8,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",8,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",8,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",9,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",9,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",9,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",9,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",9,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",10,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",10,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",10,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",10,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",10,4,0)");
+
+		
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",13,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",13,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",13,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",13,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",13,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",14,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",14,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",14,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",14,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",14,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",15,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",15,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",15,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",15,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",15,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",16,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",16,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",16,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",16,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",16,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",18,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",18,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",18,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",18,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",18,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",19,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",19,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",19,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",19,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",19,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",20,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",20,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",20,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",20,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",20,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",21,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",21,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",21,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",21,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",21,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",22,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",22,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",22,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",22,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",22,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",23,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",23,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",23,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",23,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",23,4,0)");
+
+
+        	$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",26,0,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",26,1,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",26,2,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",26,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile3_id.",26,4,0)");
+        
+		//Inserting into vtiger_profile2stdper for Profile Guest Profile
+		//All Read-Only
+		
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",2,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",2,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",2,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",2,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",2,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",4,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",4,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",4,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",4,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",4,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",6,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",6,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",6,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",6,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",6,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",7,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",7,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",7,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",7,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",7,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",8,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",8,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",8,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",8,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",8,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",9,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",9,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",9,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",9,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",9,4,0)");
+
+		
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",13,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",13,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",13,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",13,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",13,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",14,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",14,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",14,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",14,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",14,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",15,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",15,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",15,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",15,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",15,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",16,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",16,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",16,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",16,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",16,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",18,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",18,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",18,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",18,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",18,4,0)");	
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",19,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",19,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",19,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",19,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",19,4,0)");	
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",20,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",20,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",20,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",20,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",20,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",21,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",21,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",21,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",21,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",21,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",22,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",22,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",22,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",22,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",22,4,0)");
+
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",23,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",23,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",23,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",23,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",23,4,0)");	
+
+
+        $this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",26,0,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",26,1,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",26,2,1)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",26,3,0)");
+		$this->db->query("insert into vtiger_profile2standardpermissions values (".$profile4_id.",26,4,0)");
+
+		//Insert into vtiger_role2profile
+		$this->db->query("insert into vtiger_role2profile values ('H".$role2_id."',".$profile1_id.")");
+		$this->db->query("insert into vtiger_role2profile values ('H".$role3_id."',".$profile2_id.")");
+	  $this->db->query("insert into vtiger_role2profile values ('H".$role4_id."',".$profile2_id.")");
+		$this->db->query("insert into vtiger_role2profile values ('H".$role5_id."',".$profile2_id.")"); 
+	   
+		//Insert into vtiger_profile2field
+			
+                insertProfile2field($profile1_id);
+                insertProfile2field($profile2_id);	
+                insertProfile2field($profile3_id);	
+                insertProfile2field($profile4_id);
+
+		insert_def_org_field();	
+		
+
+		//Inserting into vtiger_profile 2 utility Admin
+                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",2,5,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",2,6,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",4,5,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",4,6,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",6,5,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",6,6,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",7,5,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",7,6,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",8,6,0)");
+                //$this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",9,6,0)");
+		$this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",7,8,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",6,8,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",4,8,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",13,8,0)");
+		$this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",14,5,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",14,6,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile1_id.",7,9,0)");
+
+		//Inserting into vtiger_profile2utility Sales Profile
+		//Import Export Not Allowed.	
+		$this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",2,5,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",2,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",4,5,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",4,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",6,5,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",6,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",7,5,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",7,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",8,6,1)");
+                //$this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",9,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",10,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",7,8,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",6,8,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",4,8,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",13,8,0)");
+		$this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",14,5,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",14,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile2_id.",7,9,0)");
+
+		//Inserting into vtiger_profile2utility Support Profile
+		//Import Export Not Allowed.	
+		$this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",2,5,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",2,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",4,5,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",4,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",6,5,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",6,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",7,5,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",7,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",8,6,1)");
+                //$this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",9,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",10,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",7,8,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",6,8,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",4,8,0)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",13,8,0)");
+		$this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",14,5,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",14,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile3_id.",7,9,0)");
+
+		//Inserting into vtiger_profile2utility Guest Profile Read-Only
+		//Import Export BusinessCar Not Allowed.	
+		$this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",2,5,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",2,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",4,5,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",4,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",6,5,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",6,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",7,5,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",7,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",8,6,1)");
+                //$this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",9,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",10,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",7,8,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",6,8,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",4,8,1)");		
+                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",13,8,1)");		
+		$this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",14,5,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",14,6,1)");
+                $this->db->query("insert into vtiger_profile2utility values (".$profile4_id.",7,9,0)");
+
+		//Inserting values into org share action mapping
+                $this->db->query("insert into vtiger_org_share_action_mapping values(0,'Public: Read Only')");
+                $this->db->query("insert into vtiger_org_share_action_mapping values(1,'Public: Read, Create/Edit')");
+                $this->db->query("insert into vtiger_org_share_action_mapping values(2,'Public: Read, Create/Edit, Delete')");
+                $this->db->query("insert into vtiger_org_share_action_mapping values(3,'Private')");
+
+                $this->db->query("insert into vtiger_org_share_action_mapping values(4,'Hide Details')");
+                $this->db->query("insert into vtiger_org_share_action_mapping values(5,'Hide Details and Add Events')");
+                $this->db->query("insert into vtiger_org_share_action_mapping values(6,'Show Details')");
+                $this->db->query("insert into vtiger_org_share_action_mapping values(7,'Show Details and Add Events')");
+
+
+		//Inserting for all vtiger_tabs
+                $def_org_tabid= Array(2,4,6,7,9,10,13,16,20,21,22,23,26);
+
+                foreach($def_org_tabid as $def_tabid)
+                {
+                        $this->db->query("insert into vtiger_org_share_action2tab values(0,".$def_tabid.")");
+                        $this->db->query("insert into vtiger_org_share_action2tab values(1,".$def_tabid.")");
+                        $this->db->query("insert into vtiger_org_share_action2tab values(2,".$def_tabid.")");
+                        $this->db->query("insert into vtiger_org_share_action2tab values(3,".$def_tabid.")");
+                }
+
+                $this->db->query("insert into vtiger_org_share_action2tab values(4,17)");
+                $this->db->query("insert into vtiger_org_share_action2tab values(5,17)");
+                $this->db->query("insert into vtiger_org_share_action2tab values(6,17)");
+                $this->db->query("insert into vtiger_org_share_action2tab values(7,17)");
+
+		//Insert into default_org_sharingrule
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",2,2,0)");
+
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",4,2,2)");
+
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",6,2,0)");
+
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",7,2,0)");
+
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",9,3,1)");
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",13,2,0)");
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",16,3,2)");
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",17,7,0)");
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",20,2,0)");
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",21,2,0)");
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",22,2,0)");
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",23,2,0)");
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",26,2,0)");
+
+		//Populating the DataShare Related Modules
+
+		//Lead Related Module
+
+		//Account Related Module
+		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",6,2)");
+		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",6,13)");
+		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",6,20)");
+		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",6,22)");
+		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",6,23)");
+
+		//Potential Related Module
+		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",2,20)");
+		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",2,22)");
+
+		//Quote Related Module
+		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",20,22)");
+
+		//SO Related Module
+		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",22,23)");	
+
+
+			
+					
+  // New Secutity End
+
+
+         //insert into the vtiger_notificationscheduler vtiger_table
+
+	//insert into related list vtiger_table
+	//Inserting for vtiger_account related lists
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("Potentials").",'get_opportunities',1,'Potentials',0)");	
+		
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("Contacts").",'get_contacts',2,'Contacts',0)");
+
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("Activities").",'get_activities',3,'Activities',0)");
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("HelpDesk").",'get_tickets',4,'HelpDesk',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("Activities").",'get_history',5,'Activity History',0)");
+
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",0,'get_attachments',6,'Attachments',0)");
+
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("Quotes").",'get_quotes',7,'Quotes',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("Invoice").",'get_invoices',8,'Invoice',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("SalesOrder").",'get_salesorder',9,'Sales Order',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("Products").",'get_products',10,'Products',0)");
+
+	//Inserting Lead Related Lists	
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Leads").",".getTabid("Activities").",'get_activities',1,'Activities',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Leads").",".getTabid("Emails").",'get_emails',2,'Emails',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Leads").",".getTabid("Activities").",'get_history',3,'Activity History',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Leads").",0,'get_attachments',4,'Attachments',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Leads").",".getTabid("Products").",'get_products',5,'Products',0)");
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Leads").",".getTabid("Campaigns").",'get_campaigns',6,'Campaigns',0)");
+
+	//Inserting for contact related lists
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Potentials").",'get_opportunities',1,'Potentials',0)");	
+		
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Activities").",'get_activities',2,'Activities',0)");
+
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Emails").",'get_emails',3,'Emails',0)");
+
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("HelpDesk").",'get_tickets',4,'HelpDesk',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Quotes").",'get_quotes',5,'Quotes',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("PurchaseOrder").",'get_purchase_orders',6,'Purchase Order',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("SalesOrder").",'get_salesorder',7,'Sales Order',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Products").",'get_products',8,'Products',0)");
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Activities").",'get_history',9,'Activity History',0)");
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",0,'get_attachments',10,'Attachments',0)");
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Campaigns").",'get_campaigns',11,'Campaigns',0)");
+
+	//Inserting Potential Related Lists	
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",".getTabid("Activities").",'get_activities',1,'Activities',0)");
+
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",".getTabid("Contacts").",'get_contacts',2,'Contacts',0)");
+
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",".getTabid("Products").",'get_products',3,'Products',0)");
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",0,'get_stage_history',4,'Sales Stage History',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",0,'get_attachments',5,'Attachments',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",".getTabid("Quotes").",'get_Quotes',6,'Quotes',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",".getTabid("SalesOrder").",'get_salesorder',7,'Sales Order',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",".getTabid("Activities").",'get_history',8,'Activity History',0)");
+
+		//Inserting Product Related Lists	
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",".getTabid("HelpDesk").",'get_tickets',1,'HelpDesk',0)");
+
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",".getTabid("Activities").",'get_activities',2,'Activities',0)");
+
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",0,'get_attachments',3,'Attachments',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",".getTabid("Quotes").",'get_quotes',4,'Quotes',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",".getTabid("PurchaseOrder").",'get_purchase_orders',5,'Purchase Order',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",".getTabid("SalesOrder").",'get_salesorder',6,'Sales Order',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",".getTabid("Invoice").",'get_invoices',7,'Invoice',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",".getTabid("PriceBooks").",'get_product_pricebooks',8,'PriceBooks',0)");
+	
+		//Inserting Emails Related Lists	
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Emails").",".getTabid("Contacts").",'get_contacts',1,'Contacts',0)");
+
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Emails").",0,'get_users',2,'Users',0)");
+
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Emails").",0,'get_attachments',3,'Attachments',0)");
+
+		//Inserting HelpDesk Related Lists
+		
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("HelpDesk").",".getTabid("Activities").",'get_activities',1,'Activities',0)");
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("HelpDesk").",0,'get_attachments',2,'Attachments',0)");
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("HelpDesk").",0,'get_ticket_history',3,'Ticket History',0)");
+
+	//Inserting PriceBook Related Lists
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("PriceBooks").",14,'get_pricebook_products',2,'Products',0)");
+
+        // Inserting Vendor Related Lists
+        $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Vendors").",14,'get_products',1,'Products',0)");
+
+        $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Vendors").",21,'get_purchase_orders',2,'Purchase Order',0)");
+
+        $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Vendors").",4,'get_contacts',3,'Contacts',0)");
+
+	// Inserting Quotes Related Lists
+	
+        $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Quotes").",".getTabid("Invoice").",'get_salesorder',1,'Sales Order',0)");
+        
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Quotes").",9,'get_activities',2,'Activities',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Quotes").",9,'get_history',3,'Activity History',0)");
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Quotes").",0,'get_quotestagehistory',4,'Quote Stage History',0)");
+
+	// Inserting Purchase order Related Lists
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("PurchaseOrder").",9,'get_activities',1,'Activities',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("PurchaseOrder").",0,'get_attachments',2,'Attachments',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("PurchaseOrder").",".getTabid("Activities").",'get_history',3,'Activity History',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("PurchaseOrder").",0,'get_postatushistory',4,'PurchaseOrder Status History',0)");
+
+	// Inserting Sales order Related Lists
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("SalesOrder").",9,'get_activities',1,'Activities',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("SalesOrder").",0,'get_attachments',2,'Attachments',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("SalesOrder").",".getTabid("Invoice").",'get_invoices',3,'Invoice',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("SalesOrder").",".getTabid("Activities").",'get_history',4,'Activity History',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("SalesOrder").",0,'get_sostatushistory',5,'SalesOrder Status History',0)");
+
+	// Inserting Invoice Related Lists
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Invoice").",9,'get_activities',1,'Activities',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Invoice").",0,'get_attachments',2,'Attachments',0)");
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Invoice").",".getTabid("Activities").",'get_history',3,'Activity History',0)");
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Invoice").",0,'get_invoicestatushistory',4,'Invoice Status History',0)");
+
+	// Inserting Activities Related Lists
+	
+	$this->db->query("insert into vtiger_relatedlists values (".$this->db->getUniqueID('relatedlists').",".getTabid("Activities").",0,'get_users',1,'Users',0)");
+	$this->db->query("insert into vtiger_relatedlists values (".$this->db->getUniqueID('relatedlists').",".getTabid("Activities").",4,'get_contacts',2,'Contacts',0)");
+
+	// Inserting Campaigns Related Lists
+
+         $this->db->query("insert into vtiger_relatedlists values (".$this->db->getUniqueID('relatedlists').",".getTabid("Campaigns").",".getTabid("Contacts").",'get_contacts',1,'Contacts',0)");
+         $this->db->query("insert into vtiger_relatedlists values (".$this->db->getUniqueID('relatedlists').",".getTabid("Campaigns").",".getTabid("Leads").",'get_leads',2,'Leads',0)");
+	 $this->db->query("insert into vtiger_relatedlists values (".$this->db->getUniqueID('relatedlists').",".getTabid("Campaigns").",".getTabid("Potentials").",'get_opportunities',3,'Potentials',0)");
+	 $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Campaigns").",9,'get_activities',4,'Activities',0)");
+
+ //Inserting User Related Lists
+ 
+        $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Users").",".getTabid("Activities").",'get_activities',1,'Activities',0)");
+ 
+        $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Users").",".getTabid("Contacts").",'get_contacts',2,'Contacts',0)");
+ 
+        $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Users").",".getTabid("Users").",'get_user_groups',3,'Groups',0)");
+
+	 
+               $this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("notificationscheduler").",'LBL_TASK_NOTIFICATION_DESCRITPION',1,'Task Delay Notification','Tasks delayed beyond 24 hrs ','LBL_TASK_NOTIFICATION')");
+
+
+                $this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("notificationscheduler").",'LBL_BIG_DEAL_DESCRIPTION' ,1,'Big Deal notification','Success! A big deal has been won! ','LBL_BIG_DEAL')");
+
+
+                $this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("notificationscheduler").",'LBL_TICKETS_DESCRIPTION',1,'Pending Tickets notification','Ticket pending please ','LBL_PENDING_TICKETS')");
+
+
+                $this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("notificationscheduler").",'LBL_MANY_TICKETS_DESCRIPTION',1,'Too many tickets Notification','Too many tickets pending against this entity ','LBL_MANY_TICKETS')");
+
+
+                $this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("notificationscheduler").",'LBL_START_DESCRIPTION' ,1,'Support Start Notification','Support starts please ','LBL_START_NOTIFICATION')");
+
+                $this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("notificationscheduler").",'LBL_SUPPORT_DESCRIPTION',1,'Support ending please','Support Ending Notification','LBL_SUPPORT_NOTICIATION')");
+		
+ 		$this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("notificationscheduler").",'LBL_ACTIVITY_REMINDER_DESCRIPTION' ,1,'Activity Reminder Notication','This is a reminder notification for the Activity','LBL_ACTIVITY_NOTIFICATION')");
+
+		//Inserting Inventory Notifications
+	$invoice_body = 'Dear {HANDLER},
+
+The current stock of {PRODUCTNAME} in our warehouse is {CURRENTSTOCK}. Kindly procure required number of units as the stock level is below reorder level {REORDERLEVELVALUE}.
+
+Please treat this information as Urgent as the vtiger_invoice is already sent  to the customer.
+
+Severity: Critical
+
+Thanks,
+{CURRENTUSER}';
+
+		
+               $this->db->query("insert into vtiger_inventorynotification(notificationid,notificationname,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("inventorynotification").",'InvoiceNotification','{PRODUCTNAME} Stock Level is Low','".$invoice_body." ','InvoiceNotificationDescription')");
+
+		$quote_body = 'Dear {HANDLER},
+
+Quote is generated for {QUOTEQUANTITY} units of {PRODUCTNAME}. The current stock of {PRODUCTNAME} in our warehouse is {CURRENTSTOCK}. 
+
+Severity: Minor
+
+Thanks,
+{CURRENTUSER}';	
+		
+		
+               $this->db->query("insert into vtiger_inventorynotification(notificationid,notificationname,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("inventorynotification").",'QuoteNotification','Quote given for {PRODUCTNAME}','".$quote_body." ','QuoteNotificationDescription')");
+
+		$so_body = 'Dear {HANDLER},
+
+SalesOrder is generated for {SOQUANTITY} units of {PRODUCTNAME}. The current stock of {PRODUCTNAME} in our warehouse is {CURRENTSTOCK}. 
+
+Please treat this information  with vtiger_priority as the sales order is already generated.
+
+Severity: Major
+
+Thanks,
+{CURRENTUSER}';
+
+		
+               $this->db->query("insert into vtiger_inventorynotification(notificationid,notificationname,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("inventorynotification").",'SalesOrderNotification','Sales Order generated for {PRODUCTNAME}','".$so_body." ','SalesOrderNotificationDescription')");
+
+		//Insert into vtiger_currency vtiger_table
+		$this->db->query("insert into vtiger_currency_info values(".$this->db->getUniqueID("currency_info").",'U.S Dollar','USD','$',1,'Active','-11')");
+                
+
+
+
+//insert into email template vtiger_table
+
+	$body='
+	Hello!
+
+	On behalf of the vtiger team,  I am pleased to announce the release of vtiger crm4.2 . This is a feature packed release including the mass email template handling, custom view feature, vtiger_reports feature and a host of other utilities. vtiger runs on all platforms.
+
+	Notable Features of vtiger are :
+	-Email Client Integration
+	-Trouble Ticket Integration
+	-Invoice Management Integration
+	-Reports Integration
+	-Portal Integration
+	-Enhanced Word Plugin Support
+	-Custom View Integration
+
+	Known Issues:
+	-ABCD
+	-EFGH
+	-IJKL
+	-MNOP
+	-QRST';
+
+          $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Announcement for Release','Announcement for Release','Announcement of a release','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
+	
+
+
+$body='name
+street,
+city,
+state,
+ zip)
+ 
+ Dear
+ 
+ Please check the following vtiger_invoices that are yet to be paid by you:
+ 
+ No. Date      Amount
+ 1   1/1/01    $4000
+ 2   2/2//01   $5000
+ 3   3/3/01    $10000
+ 4   7/4/01    $23560
+ 
+ Kindly let us know if there are any issues that you feel are pending to be discussed.
+ We will be more than happy to give you a call.
+ We would like to continue our business with you.
+ 
+ Sincerely,
+ name
+ title';
+
+
+               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Pending Invoices','Invoices Pending','Payment Due','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
+
+
+
+
+
+$body=' Dear
+
+Your proposal on the project XYZW has been reviewed by us
+and is acceptable in its entirety.
+
+We are eagerly looking forward to this project
+and are pleased about having the opportunity to work
+together. We look forward to a long standing relationship
+with your esteemed firm.
+
+I would like to take this opportunity to invite you
+to a game of golf on Wednesday morning 9am at the
+Cuff Links Ground. We will be waiting for you in the
+Executive Lounge.
+
+Looking forward to seeing you there.
+
+Sincerely,
+name
+title';
+	       
+               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Acceptance Proposal','Acceptance Proposal','Acceptance of Proposal','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
+
+
+$body= ' The undersigned hereby acknowledges receipt and delivery
+of the goods.
+The undersigned will release the payment subject to the goods being discovered not satisfactory.
+
+Signed under seal this <date>
+
+Sincerely,
+name
+title';
+	       
+               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Goods received acknowledgement','Goods received acknowledgement','Acknowledged Receipt of Goods','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
+
+
+	       $body= ' Dear
+	 We are in receipt of your order as contained in the
+   purchase order form.We consider this to be final and binding on both sides.
+If there be any exceptions noted, we shall consider them
+only if the objection is received within ten days of receipt of
+this notice.
+
+Thank you for your patronage.
+Sincerely,
+name
+title';
+
+
+	       
+               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Accept Order','Accept Order','Acknowledgement/Acceptance of Order','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
+
+
+
+
+$body='Dear
+
+We are relocating our office to
+11111,XYZDEF Cross,
+UVWWX Circle
+The telephone number for this new location is (101) 1212-1328.
+
+Our Manufacturing Division will continue operations
+at 3250 Lovedale Square Avenue, in Frankfurt.
+
+We hope to keep in touch with you all.
+Please update your addressbooks.
+
+
+Thank You,
+name
+title';
+	       
+               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Address Change','Change of Address','Address Change','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
+
+
+
+$body='Dear
+
+Thank you for extending us the opportunity to meet with
+you and members of your staff.
+
+I know that John Doe serviced your vtiger_account
+for many years and made many friends at your firm. He has personally
+discussed with me the deep relationship that he had with your firm.
+While his presence will be missed, I can promise that we will
+continue to provide the fine service that was accorded by
+John to your firm.
+
+I was genuinely touched to receive such fine hospitality.
+
+Thank you once again.
+
+Sincerely,
+name
+title';
+
+
+	       
+               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Follow Up','Follow Up','Follow Up of meeting','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
+
+
+
+$body='Congratulations!
+
+The numbers are in and I am proud to inform you that our
+total sales for the previous quarter
+amounts to $100,000,00.00!. This is the first time
+we have exceeded the target by almost 30%.
+We have also beat the previous quarter record by a
+whopping 75%!
+
+Let us meet at Smoking Joe for a drink in the evening!
+
+C you all there guys!
+
+Sincerely,
+name
+title';
+
+	       
+               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Target Crossed!','Target Crossed!','Fantastic Sales Spree!','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
+
+$body='
+Dear
+
+Thank you for your confidence in our ability to serve you.
+We are glad to be given the chance to serve you.I look
+forward to establishing a long term partnership with you.
+Consider me as a friend.
+Should any need arise,please do give us a call.
+
+Sincerely,
+name
+title';
+
+	       
+               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Thanks Note','Thanks Note','Note of thanks','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
+
+		
+	       //Insert into vtiger_organizationdetails vtiger_table 
+	       $this->db->query("insert into vtiger_organizationdetails(organizationame,address,city,state,country,code,phone,fax,website,logoname) values ('vtiger',' 40-41-42, Sivasundar Apartments, Flat D-II, Shastri Street, Velachery','Chennai','Tamil Nadu','India','600 042','+91-44-5202-1990','+91-44-5202-1990','www.vtiger.com','vtiger-crm-logo.jpg')");
+
+  //Insert into vtiger_inventory_tandc vtiger_table
+               $this->db->query("insert into vtiger_inventory_tandc values('".$this->db->getUniqueID('inventory_tandc')."','Inventory','')");
+
+	$this->db->query("insert into vtiger_actionmapping values(0,'Save',0)");
+	$this->db->query("insert into vtiger_actionmapping values(1,'EditView',0)");
+	$this->db->query("insert into vtiger_actionmapping values(2,'Delete',0)");
+	$this->db->query("insert into vtiger_actionmapping values(3,'index',0)");
+	$this->db->query("insert into vtiger_actionmapping values(4,'DetailView',0)");
+	$this->db->query("insert into vtiger_actionmapping values(5,'Import',0)");
+	$this->db->query("insert into vtiger_actionmapping values(6,'Export',0)");
+	//$this->db->query("insert into vtiger_actionmapping values(7,'AddBusinessCard',0)");
+	$this->db->query("insert into vtiger_actionmapping values(8,'Merge',0)");
+	$this->db->query("insert into vtiger_actionmapping values(1,'VendorEditView',1)");
+	$this->db->query("insert into vtiger_actionmapping values(4,'VendorDetailView',1)");
+	$this->db->query("insert into vtiger_actionmapping values(0,'SaveVendor',1)");
+	$this->db->query("insert into vtiger_actionmapping values(2,'DeleteVendor',1)");
+	$this->db->query("insert into vtiger_actionmapping values(1,'PriceBookEditView',1)");
+	$this->db->query("insert into vtiger_actionmapping values(4,'PriceBookDetailView',1)");
+	$this->db->query("insert into vtiger_actionmapping values(0,'SavePriceBook',1)");
+	$this->db->query("insert into vtiger_actionmapping values(2,'DeletePriceBook',1)");
+	$this->db->query("insert into vtiger_actionmapping values(9,'ConvertLead',0)");
+	$this->db->query("insert into vtiger_actionmapping values(1,'DetailViewAjax',1)");
+	$this->db->query("insert into vtiger_actionmapping values(4,'TagCloud',1)");
+	$this->db->query("insert into vtiger_actionmapping values(1,'QuickCreate',1)");
+	$this->db->query("insert into vtiger_actionmapping values(3,'Popup',1)");
+
+	//Insert values for vtiger_moduleowners vtiger_table which contains the modules and their vtiger_users. default user id admin - after 4.2 patch 2
+	$module_array = Array('Potentials','Contacts','Accounts','Leads','Notes','Activities','Emails','HelpDesk','Products','Faq','Vendors','PriceBooks','Quotes','PurchaseOrder','SalesOrder','Invoice','Reports','Campaigns');
+	foreach($module_array as $mod)
+	{
+		$this->db->query("insert into vtiger_moduleowners values(".getTabid($mod).",1)");
+	}
+	//added by jeri for category view from db
+	$this->db->query("insert into vtiger_parenttab values (1,'My Home Page',1,0)");
+	$this->db->query("insert into vtiger_parenttab values (2,'Marketing',2,0)");
+	$this->db->query("insert into vtiger_parenttab values (3,'Sales',3,0)");
+	$this->db->query("insert into vtiger_parenttab values (4,'Support',4,0)");
+	$this->db->query("insert into vtiger_parenttab values (5,'Analytics',5,0)");
+	$this->db->query("insert into vtiger_parenttab values (6,'Inventory',6,0)");
+	$this->db->query("insert into vtiger_parenttab values (7,'Tools',7,0)");
+	$this->db->query("insert into vtiger_parenttab values (8,'Settings',8,0)");
+
+	$this->db->query("insert into vtiger_parenttabrel values (1,9,2)");
+	$this->db->query("insert into vtiger_parenttabrel values (1,17,3)");
+	$this->db->query("insert into vtiger_parenttabrel values (1,10,4)");
+	$this->db->query("insert into vtiger_parenttabrel values (1,3,1)");
+	$this->db->query("insert into vtiger_parenttabrel values (3,7,1)");
+	$this->db->query("insert into vtiger_parenttabrel values (3,6,2)");
+	$this->db->query("insert into vtiger_parenttabrel values (3,4,3)");
+	$this->db->query("insert into vtiger_parenttabrel values (3,2,4)");
+	$this->db->query("insert into vtiger_parenttabrel values (3,20,5)");
+	$this->db->query("insert into vtiger_parenttabrel values (3,22,6)");
+	$this->db->query("insert into vtiger_parenttabrel values (3,23,7)");
+	$this->db->query("insert into vtiger_parenttabrel values (3,14,8)");
+	$this->db->query("insert into vtiger_parenttabrel values (3,19,9)");
+	$this->db->query("insert into vtiger_parenttabrel values (3,8,10)");
+	$this->db->query("insert into vtiger_parenttabrel values (4,13,1)");
+	$this->db->query("insert into vtiger_parenttabrel values (4,15,2)");
+	$this->db->query("insert into vtiger_parenttabrel values (4,6,3)");
+	$this->db->query("insert into vtiger_parenttabrel values (4,4,4)");
+	$this->db->query("insert into vtiger_parenttabrel values (4,14,5)");
+	$this->db->query("insert into vtiger_parenttabrel values (4,8,6)");
+	$this->db->query("insert into vtiger_parenttabrel values (5,1,1)");
+	$this->db->query("insert into vtiger_parenttabrel values (5,25,2)");
+	$this->db->query("insert into vtiger_parenttabrel values (6,14,1)");
+	$this->db->query("insert into vtiger_parenttabrel values (6,18,2)");
+	$this->db->query("insert into vtiger_parenttabrel values (6,19,3)");
+	$this->db->query("insert into vtiger_parenttabrel values (6,21,4)");
+	$this->db->query("insert into vtiger_parenttabrel values (6,22,5)");
+	$this->db->query("insert into vtiger_parenttabrel values (6,20,6)");
+	$this->db->query("insert into vtiger_parenttabrel values (6,23,7)");
+	$this->db->query("insert into vtiger_parenttabrel values (7,24,1)");
+	$this->db->query("insert into vtiger_parenttabrel values (7,27,2)");
+	$this->db->query("insert into vtiger_parenttabrel values (7,8,3)");
+	$this->db->query("insert into vtiger_parenttabrel values (2,26,1)");
+	$this->db->query("insert into vtiger_parenttabrel values (2,6,2)");
+	$this->db->query("insert into vtiger_parenttabrel values (2,4,3)");
+	$this->db->query("insert into vtiger_parenttabrel values (2,10,4)");
+	$this->db->query("insert into vtiger_parenttabrel values (4,10,7)");
+	$this->db->query("insert into vtiger_parenttabrel values (2,7,5)");
+	$this->db->query("insert into vtiger_parenttabrel values (2,9,6)");
+	$this->db->query("insert into vtiger_parenttabrel values (4,9,8)");
+		
+	//Added to populate the default inventory tax informations
+	$this->db->query("insert into vtiger_inventorytaxinfo values(".$this->db->getUniqueID("inventorytaxinfo").",'VAT','4.5')");
+	$this->db->query("insert into vtiger_inventorytaxinfo values(".$this->db->getUniqueID("inventorytaxinfo").",'Sales','10')");
+	$this->db->query("insert into vtiger_inventorytaxinfo values(".$this->db->getUniqueID("inventorytaxinfo").",'Service','12.5')");
+	
+	}
+}
+?>




From vtigercrm-commits at vtiger.fosslabs.com  Mon Jun 26 12:52:28 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Mon, 26 Jun 2006 16:52:28 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7548 -
	/vtigercrm/trunk/modules/Emails/mailsend.php
Message-ID: <20060626165228.2B3DE83FC85@vtiger.fosslabs.com>

Author: richie
Date: Mon Jun 26 10:52:19 2006
New Revision: 7548

Log:
Security support for Emails done

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

Modified: vtigercrm/trunk/modules/Emails/mailsend.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/mailsend.php (original)
+++ vtigercrm/trunk/modules/Emails/mailsend.php Mon Jun 26 10:52:19 2006
@@ -146,7 +146,10 @@
 			if($emailadd != '')
 			{
 				$description = getMergedDescription($focus->column_fields['description'],$mycrmid,$pmodule);
-				$mail_status = send_mail('Emails',$emailadd,$current_user->user_name,'',$focus->column_fields['subject'],$description,'','','all',$focus->id);
+				if(isPermitted($pmodule,'DetailView',$mycrmid) == 'yes')
+				{
+					$mail_status = send_mail('Emails',$emailadd,$current_user->user_name,'',$focus->column_fields['subject'],$description,'','','all',$focus->id);
+				}	
 
 				$all_to_emailids []= $emailadd;
 				$mail_status_str .= $emailadd."=".$mail_status."&&&";




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 02:42:23 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 06:42:23 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7549 -
 /vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
Message-ID: <20060627064223.8180E83FDC2@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 27 00:42:17 2006
New Revision: 7549

Log:
Calendar added for Marketing and support Tab

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

Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original)
+++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Tue Jun 27 00:42:17 2006
@@ -2165,6 +2165,8 @@
 	$this->db->query("insert into vtiger_parenttabrel values (2,7,5)");
 	$this->db->query("insert into vtiger_parenttabrel values (2,9,6)");
 	$this->db->query("insert into vtiger_parenttabrel values (4,9,8)");
+	$this->db->query("insert into vtiger_parenttabrel values (2,17,7)");
+        $this->db->query("insert into vtiger_parenttabrel values (4,17,9)");
 		
 	//Added to populate the default inventory tax informations
 	$this->db->query("insert into vtiger_inventorytaxinfo values(".$this->db->getUniqueID("inventorytaxinfo").",'VAT','4.5')");




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 03:02:24 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 07:02:24 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7550 -
	/vtigercrm/trunk/Smarty/templates/DisplayFields.tpl
Message-ID: <20060627070224.7973283FDC3@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 27 01:02:20 2006
New Revision: 7550

Log:
Issue in User Save has been fixed

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

Modified: vtigercrm/trunk/Smarty/templates/DisplayFields.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DisplayFields.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DisplayFields.tpl Tue Jun 27 01:02:20 2006
@@ -484,10 +484,12 @@
 				{if $fldvalue eq 'on'}
 					<td width="30%" align=left class="dvtCellInfo">
 						<input name="{$fldname}" {$disable_status} tabindex="{$vt_tab}" type="checkbox"  checked>
+						<input name="{$fldname}" type="hidden" value="{$fldvalue}">
 					</td>
 				{else}
 					<td width="30%" align=left class="dvtCellInfo">
 						<input name="{$fldname}" {$disable_status} tabindex="{$vt_tab}" type="checkbox">
+						<input name="{$fldname}" type="hidden" value="{$fldvalue}">
 					</td>
 				{/if}
 		{elseif $uitype eq 98}<!-- Role Selection Popup -->		




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 03:26:42 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 07:26:42 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7551 -
	/vtigertoolbar/trunk/firefox/install.rdf
Message-ID: <20060627072642.3190283FDCB@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 27 01:26:38 2006
New Revision: 7551

Log:
changed the label

Modified:
    vtigertoolbar/trunk/firefox/install.rdf

Modified: vtigertoolbar/trunk/firefox/install.rdf
==============================================================================
Binary files - no diff available.




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 04:08:24 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 08:08:24 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7552 -
	/vtigercrm/trunk/include/js/ListView.js
Message-ID: <20060627080824.0954783FC00@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 27 02:08:21 2006
New Revision: 7552

Log:
issue in massdelete has been fixed ,#fixes 1354

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

Modified: vtigercrm/trunk/include/js/ListView.js
==============================================================================
--- vtigercrm/trunk/include/js/ListView.js (original)
+++ vtigercrm/trunk/include/js/ListView.js Tue Jun 27 02:08:21 2006
@@ -1,162 +1,133 @@
-/*********************************************************************************
-
-** The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is:  vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
- ********************************************************************************/
-function change(obj,divid)
-{
-	x = document.massdelete.selected_id.length;
-	var viewid = document.massdelete.viewname.value;
-
-	idstring = "";
-	if ( x == undefined)
-	{
-	
-		if (document.massdelete.selected_id.checked)
-		{
-			document.massdelete.idlist.value=document.massdelete.selected_id.value +";";
-		}
-		else 
-		{
-			alert("Please select atleast one entity ");
-			return false;
-		}
-	}
-	else
-	{
-		xx = 0;
-		for(i = 0; i < x ; i++)
-		{
-			if(document.massdelete.selected_id[i].checked)
-			{
-				idstring = document.massdelete.selected_id[i].value +";"+idstring
-			xx++	
-			}
-		}
-		if (xx != 0)
-		{
-			document.massdelete.idlist.value=idstring;
-		}
-		else
-		{
-			alert("Please select atleast one entity");
-			return false;
-		}
-	}
-	fnvshobj(obj,divid);
-}
-function massDelete(module)
-{
-        x = document.massdelete.selected_id.length;
-		var viewid = document.massdelete.viewname.value;
-        idstring = "";
-
-        if ( x == undefined)
-        {
-
-                if (document.massdelete.selected_id.checked)
-                {
-                        idstring = document.massdelete.selected_id.value+';';
-                		xx = 1;
-                }
-                else
-                {
-                        alert("Please select atleast one entity");
-                        return false;
-                }
-        }
-        else
-        {
-                xx = 0;
-                for(i = 0; i < x ; i++)
-                {
-                        if(document.massdelete.selected_id[i].checked)
-                        {
-                                idstring = document.massdelete.selected_id[i].value +";"+idstring
-                        xx++
-                        }
-                }
-                if (xx != 0)
-                {
-                        document.massdelete.idlist.value=idstring;
-                }
-               else
-                {
-                        alert("Please select atleast one entity");
-                        return false;
-                }
-        }
-		if(confirm("Are you sure you want to delete the selected "+xx+" records ?"))
-		{
-			
-			$("status").style.display="inline";
-			new Ajax.Request(
-          	  	      'index.php',
-			      	{queue: {position: 'end', scope: 'command'},
-		                        method: 'post',
-                		        postBody:"module=Users&action=massdelete&return_module="+module+"&viewname="+viewid+"&idlist="+idstring,
-		                        onComplete: function(response) {
-        	        	                $("status").style.display="none";
-                	        	        result = response.responseText.split('&#&#&#');
-                        	        	$("ListViewContents").innerHTML= result[2];
-	                        	        if(result[1] != '')
-                                        		alert(result[1]);
-		                        }
-              			 }
-       			);
-		}
-		else
-		{
-			return false;
-		}
-
-}
-
-function showDefaultCustomView(selectView,module)
-{
-	$("status").style.display="inline";
-	var viewName = selectView.options[selectView.options.selectedIndex].value;
-	new Ajax.Request(
-               	'index.php',
-                {queue: {position: 'end', scope: 'command'},
-                       	method: 'post',
-                        postBody:"module="+module+"&action="+module+"Ajax&file=ListView&ajax=true&start=1&viewname="+viewName,
-                        onComplete: function(response) {
-                        $("status").style.display="none";
-                        result = response.responseText.split('&#&#&#');
-                        $("ListViewContents").innerHTML= result[2];
-                        if(result[1] != '')
-                               	alert(result[1]);
-                        }
-                }
-	);
-}
-
-
-function getListViewEntries_js(module,url)
-{
-	$("status").style.display="inline";
-	if($('search_url').value!='')
-                urlstring = $('search_url').value;
-	else
-		urlstring = '';
-        new Ajax.Request(
-        	'index.php',
-                {queue: {position: 'end', scope: 'command'},
-                	method: 'post',
-                        postBody:"module="+module+"&action="+module+"Ajax&file=index&ajax=true&"+url+urlstring,
-			onComplete: function(response) {
-                        	$("status").style.display="none";
-                                result = response.responseText.split('&#&#&#');
-                                $("ListViewContents").innerHTML= result[2];
-                                if(result[1] != '')
-                                        alert(result[1]);
-                  	}
-                }
-        );
-}
-
+/*********************************************************************************
+
+** The contents of this file are subject to the vtiger CRM Public License Version 1.0
+ * ("License"); You may not use this file except in compliance with the License
+ * The Original Code is:  vtiger CRM Open Source
+ * The Initial Developer of the Original Code is vtiger.
+ * Portions created by vtiger are Copyright (C) vtiger.
+ * All Rights Reserved.
+ ********************************************************************************/
+function change(obj,divid)
+{
+	var select_options  =  document.getElementsByName('selected_id');
+	var x = select_options.length;
+	var viewid = document.massdelete.viewname.value;
+	idstring = "";
+
+	xx = 0;
+	for(i = 0; i < x ; i++)
+	{
+		if(select_options[i].checked)
+		{
+			idstring = select_options[i].value +";"+idstring
+				xx++
+		}
+	}
+	if (xx != 0)
+	{
+		document.massdelete.idlist.value=idstring;
+	}
+	else
+	{
+		alert("Please select atleast one entity");
+		return false;
+	}
+	alert(document.massdelete.idlist.value)
+	fnvshobj(obj,divid);
+}
+function massDelete(module)
+{
+		var select_options  =  document.getElementsByName('selected_id');
+		var x = select_options.length;
+		var viewid = document.massdelete.viewname.value;
+        idstring = "";
+
+        xx = 0;
+        for(i = 0; i < x ; i++)
+        {
+        	if(select_options[i].checked)
+            {
+            	idstring = select_options[i].value +";"+idstring
+                xx++
+            }
+        }
+        if (xx != 0)
+        {
+            document.massdelete.idlist.value=idstring;
+        }
+        else
+        {
+            alert("Please select atleast one entity");
+            return false;
+        }
+		if(confirm("Are you sure you want to delete the selected "+xx+" records ?"))
+		{
+			
+			$("status").style.display="inline";
+			alert("module=Users&action=massdelete&return_module="+module+"&viewname="+viewid+"&idlist="+idstring)
+			new Ajax.Request(
+          	  	      'index.php',
+			      	{queue: {position: 'end', scope: 'command'},
+		                        method: 'post',
+                		        postBody:"module=Users&action=massdelete&return_module="+module+"&viewname="+viewid+"&idlist="+idstring,
+		                        onComplete: function(response) {
+        	        	                $("status").style.display="none";
+                	        	        result = response.responseText.split('&#&#&#');
+                        	        	$("ListViewContents").innerHTML= result[2];
+	                        	        if(result[1] != '')
+                                        		alert(result[1]);
+		                        }
+              			 }
+       			);
+		}
+		else
+		{
+			return false;
+		}
+
+}
+
+function showDefaultCustomView(selectView,module)
+{
+	$("status").style.display="inline";
+	var viewName = selectView.options[selectView.options.selectedIndex].value;
+	new Ajax.Request(
+               	'index.php',
+                {queue: {position: 'end', scope: 'command'},
+                       	method: 'post',
+                        postBody:"module="+module+"&action="+module+"Ajax&file=ListView&ajax=true&start=1&viewname="+viewName,
+                        onComplete: function(response) {
+                        $("status").style.display="none";
+                        result = response.responseText.split('&#&#&#');
+                        $("ListViewContents").innerHTML= result[2];
+                        if(result[1] != '')
+                               	alert(result[1]);
+                        }
+                }
+	);
+}
+
+
+function getListViewEntries_js(module,url)
+{
+	$("status").style.display="inline";
+	if($('search_url').value!='')
+                urlstring = $('search_url').value;
+	else
+		urlstring = '';
+        new Ajax.Request(
+        	'index.php',
+                {queue: {position: 'end', scope: 'command'},
+                	method: 'post',
+                        postBody:"module="+module+"&action="+module+"Ajax&file=index&ajax=true&"+url+urlstring,
+			onComplete: function(response) {
+                        	$("status").style.display="none";
+                                result = response.responseText.split('&#&#&#');
+                                $("ListViewContents").innerHTML= result[2];
+                                if(result[1] != '')
+                                        alert(result[1]);
+                  	}
+                }
+        );
+}
+




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 04:11:12 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 08:11:12 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7553 -
 /vtigercrm/trunk/modules/Users/language/en_us.lang.php
Message-ID: <20060627081112.CEB7583FC00@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 27 02:11:08 2006
New Revision: 7553

Log:
Updated lang file

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

Modified: vtigercrm/trunk/modules/Users/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Users/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Users/language/en_us.lang.php Tue Jun 27 02:11:08 2006
@@ -1,562 +1,572 @@
-<?php
-/*********************************************************************************
- * The contents of this file are subject to the SugarCRM Public License Version 1.1.2
- * ("License"); You may not use this file except in compliance with the
- * License. You may obtain a copy of the License at http://www.sugarcrm.com/SPL
- * Software distributed under the License is distributed on an  "AS IS"  basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
- * the specific language governing rights and limitations under the License.
- * The Original Code is:  SugarCRM Open Source
- * The Initial Developer of the Original Code is SugarCRM, Inc.
- * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.;
- * All Rights Reserved.
- * Contributor(s): ______________________________________.
- ********************************************************************************/
-/*********************************************************************************
- * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Users/language/en_us.lang.php,v 1.18 2005/04/19 14:45:38 ray Exp $
- * Description:  Defines the English language pack for the Account module.
- ********************************************************************************/
- 
-$mod_strings = Array(
-'LBL_MODULE_NAME'=>'Users',
-'LBL_MODULE_TITLE'=>'Users: Home',
-'LBL_SEARCH_FORM_TITLE'=>'User Search',
-'LBL_LIST_FORM_TITLE'=>'User List',
-'LBL_NEW_FORM_TITLE'=>'New User',
-'LBL_CREATE_NEW_USER'=>'Create New User',
-'LBL_USER'=>'Users:',
-'LBL_LOGIN'=>'Login',
-'LBL_USER_ROLE'=>'Role',
-'LBL_LIST_NAME'=>'Name',
-'LBL_LIST_LAST_NAME'=>'Last Name',
-'LBL_LIST_USER_NAME'=>'UserName',
-'LBL_LIST_DEPARTMENT'=>'Department',
-'LBL_LIST_EMAIL'=>'E-Mail',
-'LBL_LIST_PRIMARY_PHONE'=>'Primary Phone',
-'LBL_LIST_ADMIN'=>'Admin',
-'LBL_LIST_PASSWORD'=>'Password',
-'LBL_LIST_CONFIRM_PASSWORD'=>'Confirm Password',
-'LBL_LIST_USER_NAME_ROLE'=>'User ID , Name & Role',
-'LBL_LIST_SELECT'=>'Select',
-'LBL_LIST_PHONE'=>'Phone',
-'LBL_LIST_NO'=>'#',
-
-'LBL_ADMINS'=>'Admins',
-'LBL_STD_USERS'=>'Standard Users',
-
-'UserName'=>'UserName',
-'Role'=>'Role',
-'Email'=>'Email',
-'Name'=>'Name',
-'Admin'=>'Admin',
-'Tools'=>'Tools',
-
-
-//added for patch2
-'LBL_GROUP'=>'Group',
-'LBL_CURRENCY_NAME'=>'Currency',
-
-'LBL_NEW_USER_BUTTON_TITLE'=>'New User [Alt+N]',
-'LBL_NEW_USER_BUTTON_LABEL'=>'New User',
-'LBL_NEW_USER_BUTTON_KEY'=>'N',
-'LBL_DATE_FORMAT'=>'Date Format',
-
-'LBL_ERROR'=>'Error:',
-'LBL_PASSWORD'=>'Password:',
-'LBL_USER_NAME'=>'User Name',
-'LBL_CRM_ID'=>'CRM ID',
-'LBL_FIRST_NAME'=>'First Name',
-'LBL_LAST_NAME'=>'Last Name',
-'LBL_YAHOO_ID'=>'Yahoo ID',
-'LBL_USER_SETTINGS'=>'User Settings',
-'LBL_THEME'=>'Theme:',
-'LBL_LANGUAGE'=>'Language:',
-'LBL_ADMIN'=>'Admin',
-'LBL_USER_INFORMATION'=>'User Information',
-'LBL_OFFICE_PHONE'=>'Office Phone',
-'LBL_REPORTS_TO'=>'Reports to',
-'LBL_OTHER_PHONE'=>'Other Phone',
-'LBL_OTHER_EMAIL'=>'Other Email',
-'LBL_NOTES'=>'Notes',
-'LBL_DEPARTMENT'=>'Department',
-'LBL_STATUS'=>'Status',
-'LBL_TITLE'=>'Title',
-'LBL_ANY_PHONE'=>'Any Phone:',
-'LBL_ANY_EMAIL'=>'Any Email:',
-'LBL_ADDRESS'=>'Street Address',
-'LBL_CITY'=>'City',
-'LBL_STATE'=>'State',
-'LBL_POSTAL_CODE'=>'Postal Code',
-'LBL_COUNTRY'=>'Country',
-'LBL_NAME'=>'Name:',
-'LBL_USER_SETTINGS'=>'User Settings',
-'LBL_USER_INFORMATION'=>'User Information',
-'LBL_MOBILE_PHONE'=>'Mobile',
-'LBL_OTHER'=>'Other',
-'LBL_FAX'=>'Fax',
-'LBL_EMAIL'=>'E-Mail Id',
-'LBL_HOME_PHONE'=>'Home Phone',
-'LBL_ADDRESS_INFORMATION'=>'Address Information',
-'LBL_CAL_HRFORMAT'=>'Calendar Time Format',
-'LBL_CAL_DURATION'=>'Day starts at',
-'LBL_PRIMARY_ADDRESS'=>'Primary Address:',
-
-'LBL_CHANGE_PASSWORD_BUTTON_TITLE'=>'Change Password [Alt+P]',
-'LBL_CHANGE_PASSWORD_BUTTON_KEY'=>'P',
-'LBL_CHANGE_PASSWORD_BUTTON_LABEL'=>'Change Password',
-'LBL_LOGIN_BUTTON_TITLE'=>'Login [Alt+L]',
-'LBL_LOGIN_BUTTON_KEY'=>'L',
-'LBL_LOGIN_BUTTON_LABEL'=>'Login',
-'LBL_LOGIN_HISTORY_BUTTON_TITLE'=>'Login History [Alt+H]',
-'LBL_LOGIN_HISTORY_BUTTON_KEY'=>'H',
-'LBL_LOGIN_HISTORY_BUTTON_LABEL'=>'Login History',
-'LBL_LOGIN_HISTORY_TITLE'=>'Users: Login History',
-'LBL_RESET_PREFERENCES'=>'Reset To Default Preferences',
-
-'LBL_CHANGE_PASSWORD'=>'Change Password',
-'LBL_OLD_PASSWORD'=>'Old Password:',
-'LBL_NEW_PASSWORD'=>'New Password:',
-'LBL_CONFIRM_PASSWORD'=>'Confirm Password:',
-'ERR_ENTER_OLD_PASSWORD'=>'Please enter your old password.',
-'ERR_ENTER_NEW_PASSWORD'=>'Please enter your new password.',
-'ERR_ENTER_CONFIRMATION_PASSWORD'=>'Please enter your password confirmation.',
-'ERR_REENTER_PASSWORDS'=>'Please re-enter passwords.  The \"new password\" and \"confirm password\" values do not match.',
-'ERR_INVALID_PASSWORD'=>'You must specify a valid username and password.',
-'ERR_PASSWORD_CHANGE_FAILED_1'=>'User password change failed for ',
-'ERR_PASSWORD_CHANGE_FAILED_2'=>' failed.  The new password must be set.',
-'ERR_PASSWORD_INCORRECT_OLD'=>'Incorrect old password for user $this->user_name. Re-enter password information.',
-'ERR_USER_NAME_EXISTS_1'=>'The user name ',
-'ERR_USER_NAME_EXISTS_2'=>' already exists.  Duplicate user names are not allowed.<br>Change the user name to be unique.',
-'ERR_LAST_ADMIN_1'=>'The user name ',
-'ERR_LAST_ADMIN_2'=>' is the last Admin user.  At least one user must be an Admin user.<br>Check the Admin user setting.',
-
-'ERR_DELETE_RECORD'=>"A record number must be specified to delete the account.",
-
-// Additional Fields for i18n --- Release vtigerCRM 3.2 Patch 2
-// Users--listroles.php , createrole.php , ListPermissions.php , editpermissions.php
-
-'LBL_ROLES'=>'Roles',
-'LBL_ROLES_SUBORDINATES'=>'Roles and Subordinates',
-'LBL_ROLE_NAME'=>'Role Name',
-'LBL_CREATE_NEW_ROLE'=>'Create New Role',
-
-'LBL_CREATE_NEW_ROLE'=>'Create New Role',
-'LBL_INDICATES_REQUIRED_FIELD'=>'Indicates Required Field',
-'LBL_NEW_ROLE'=>'New Role',
-'LBL_PARENT_ROLE'=>'Parent Role',
-
-'LBL_LIST_ROLES'=>'List Roles',
-'LBL_ENTITY_LEVEL_PERMISSIONS'=>'Entity Level Permissions',
-'LBL_ENTITY'=>'Entity',
-'LBL_CREATE_EDIT'=>'Create/Edit',
-'LBL_DELETE'=>'Delete',
-'LBL_VIEW'=>'View',
-'LBL_LEADS'=>'Leads',
-'LBL_ACCOUNTS'=>'Accounts',
-'LBL_CONTACTS'=>'Contacts',
-'LBL_OPPURTUNITIES'=>'Opportunities',
-'LBL_TASKS'=>'Tasks',
-'LBL_CASES'=>'Cases',
-'LBL_EMAILS'=>'Emails',
-'LBL_NOTES'=>'Notes',
-'LBL_MEETINGS'=>'Meetings',
-'LBL_CALLS'=>'Calls',
-'LBL_IMPORT_PERMISSIONS'=>'Import Permissions',
-'LBL_IMPORT_LEADS'=>'Import Leads',
-'LBL_IMPORT_ACCOUNTS'=>'Import Accounts',
-'LBL_IMPORT_CONTACTS'=>'Import Contacts',
-'LBL_IMPORT_OPPURTUNITIES'=>'Import Opportunities',
-
-'LBL_ROLE_DETAILS'=>'Role Details',
-//added for vtigercrm4 rc
-'LBL_FILE'=> 'File Name',
-'LBL_FILE_TYPE'=>'File Type',
-'LBL_UPLOAD'=>'Upload File',
-'LBL_ATTACH_FILE'=>'Attach Mail Merge Template',
-'LBL_EMAIL_TEMPLATES'=>'Email Templates',
-'LBL_TEMPLATE_NAME'=>'Template Name',
-'LBL_TEMPLATE_HEADER'=>'Template',
-'LBL_TEMPLATE_DETAILS'=>'Template Details',
-'LBL_EDIT_TEMPLATE'=>'Edit Template',
-'LBL_TEMPLATE_FILE'=>'Template File',
-'LBL_DESCRIPTION'=>'Description',
-'LBL_EMAIL_TEMPLATES_LIST'=>'Communication Templates > Email Templates',
-'LBL_MAILMERGE_TEMPLATES_LIST'=>' > Communication Templates > Mail Merge Templates',
-'LBL_MAILMERGE_TEMPLATES_ATTACHMENT' => '> Communication Templates > Attach Mail Merge Template',
-'LBL_DOWNLOAD_NOW'=>'Download Now',
-'LBL_DOWNLOAD'=>'Download',
-'LBL_SELECT_MODULE'=>'Select Module',
-'LBL_MERGE_FILE'=>'File : ',
-'LBL_MERGE_MSG'=>'Select a module to assign this Template',
-'LBL_MERGE_FIELDS'=>'Merge Fields',
-'LBL_COPY_PASTE'=>'Copy & Paste',
-'LNK_GO_TO_TOP'=>'Go to Page Top',
-'LNK_SAMPLE_EMAIL'=>'View Sample Email',
-'LBL_COLON'=>':',
-'LBL_EMAIL_TEMPLATE'=>'Email Template',
-'LBL_NEW_TEMPLATE'=>'New Template',
-'LBL_ADD_TEMPLATE'=>'Add Template',
-'LBL_USE_MERGE_FIELDS_TO_EMAIL_CONTENT'=>'Use merge fields to personalize your email content.',
-'LBL_AVAILABLE_MERGE_FIELDS'=>'Available Merge Fields',
-'LBL_SELECT_FIELD_TYPE'=>'Select Field Type',
-'LBL_SELECT_FIELD'=>'Select Field :',
-'LBL_MERGE_FIELD_VALUE'=>'Copy Merge Field Value :',
-'LBL_ACCOUNT_FIELDS'=>'Account Fields',
-'LBL_CONTACT_FIELDS'=>'Contact Fields',
-'LBL_LEAD_FIELDS'=>'Lead Fields',
-'LBL_COPY_AND_PASTE_MERGE_FIELD'=>'Copy and paste the merge field value into your template below.',
-'LBL_EMAIL_TEMPLATE_INFORMATION'=>'Communication Templates > Email Templates > Viewing',
-'LBL_FOLDER'=>'Folder',
-'LBL_PERSONAL'=>'Personal',
-'LBL_PUBLIC'=>'Public',
-'LBL_TEMPLATE_NAME'=>'Template Name:',
-'LBL_SUBJECT'=>'Subject',
-'LBL_BODY'=>'Email Body',
-'LBL_TEMPLATE_TOOLS'=>'Tools',
-'LBL_TEMPLATE_PUBLIC'=>'Public Access',
-'LBL_TEMPLATE_PRIVATE'=>'Private Access',
-'LBL_TEMPLATE_SUBJECT'=>'Email Subject',
-'LBL_TEMPLATE_MESSAGE'=>'Email Message',
-'LBL_VIEWING'=>'Viewing',
-'LBL_PROPERTIES'=>'Properties of',
-
-
-
-// Added fields in createnewgroup.php
-'LBL_CREATE_NEW_GROUP'=>'Create New Group',
-'LBL_NEW_GROUP'=>'New Group',
-'LBL_EDIT_GROUP'=>'Edit Group',
-'LBL_GROUP_NAME'=>'Group Name',
-'LBL_GROUP_DETAILS'=>'Group Details',
-'LBL_MEMBER'=>'Members',
-'LBL_MEMBER_AVLBL'=>'Available Entities & Members',
-'LBL_MEMBER_SELECTED'=>'Selected Members',
-'LBL_DESCRIPTION'=>'Description',
-'LBL_GROUP_MESG1'=>'Groups are a flexible way to assign access rights, when complex access rights has to be defined. You can combine multiple entities like Roles, Users, profiles etc into a single group.',
-'LBL_GROUP_MESG2'=>'To add, select the Entity members from left and click the ">>" button.',
-'LBL_GROUP_MESG3'=>'To remove, select the group members from the right and click the "<<" button.',
-
-
-// Added fields in detailViewmailtemplate.html,listgroupmembers.php,listgroups.php
-'LBL_DETAIL_VIEW_OF_EMAIL_TEMPLATE'=>'Detail View of Email Template',
-'LBL_DETAIL_VIEW'=>'Detail View of',
-'LBL_EDIT_VIEW'=>'Edit View of',
-'LBL_GROUP_MEMBERS_LIST'=>'Group members list',
-'LBL_GROUPS'=>'Groups',
-'LBL_ADD_GROUP_BUTTON'=>'Add Group',
-'LBL_WORD_TEMPLATES'=>'Mail Merge Templates',
-'LBL_NEW_WORD_TEMPLATE'=>'New Template',
-'LBL_EMAIL_TEMPLATE_DESC'=>'Manage email templates used for Campaigns and Mass mailing',
-'LBL_NAME'=>'Name',
-
-// Added fields in TabCustomise.php,html and UpdateTab.php,html
-'LBL_CUSTOMISE_TABS'=>'Customize Tabs',
-'LBL_CHOOSE_TABS'=>'Choose Tabs',
-'LBL_AVAILABLE_TABS'=>'Available Tabs',
-'LBL_SELECTED_TABS'=>'Selected Tabs',
-'LBL_USER'=>'User',
-'LBL_TAB_MENU_UPDATED'=>'Tab Menu Updated! kindly go to ',
-'LBL_TO_VIEW_CHANGES'=>' to view the changes',
-
-// Added to change homepage order
-'LBL_CHANGE_HOMEPAGE_LABEL'=>'Homepage Order',
-'LBL_CHANGE_HOMEPAGE_TITLE'=>'Homepage',
-
-// Added fields in binaryfilelist.php
-'LBL_OERATION'=>'Operation',
-
-// Added fields in CreateProfile.php
-'LBL_PROFILE_NAME'=>'Create New Profile:',
-'LBL_NEW_PROFILE'=>'New Profile',
-'LBL_NEW_PROFILE_NAME'=>'Profile Name',
-'LBL_PARENT_PROFILE'=>'Parent Profile',
-'LBL_BASIC_PROFILE_DETAILS'=>'Basic details of Profile',
-'LBL_STEP_1_2'=>'Step 1 of 2',
-'LBL_STEP_2_2'=>'Step 2 of 2',
-'LBL_STEP'=>'Step',
-'LBL_SELECT_BASE_PROFILE'=>'Select Base Profile',
-'LBL_PROFILE_PRIVILEGES'=>'Profile Privileges',
-'LBL_GLOBAL_PRIVILEGES'=>'Global Privileges',
-'LBL_TAB_PRIVILEGES'=>'Tab Privileges',
-'LBL_FIELD_PRIVILEGES'=>'Field Privileges',
-'LBL_STANDARD_PRIVILEGES'=>'Standard Privileges',
-'LBL_UTILITY_PRIVILEGES'=>'Utility Privileges',
-'LBL_UTILITIES'=>'Utilities',
-'LBL_BASE_PROFILE_MESG'=>'I would like to setup a base profile and edit privileges <b>(Recommended)</b>',
-'LBL_BASE_PROFILE'=>'Base Profile:',
-'LBL_OR'=>'OR',
-'LBL_BASE_PROFILE_MESG_ADV'=>'I will choose the privileges from scratch <b>(Advanced Users)</b>',
-'LBL_FOR'=>'for',
-'LBL_GLOBAL_MESG_OPTION'=>'Select the options below to change global privileges',
-'LBL_VIEW_ALL'=>'View all',
-'LBL_EDIT_ALL'=>'Edit all',
-'LBL_ALLOW'=>'Allows',
-'LBL_MESG_VIEW'=>'to view all information / modules of vtiger CRM',
-'LBL_MESG_EDIT'=>'to edit all information / modules of vtiger CRM',
-'LBL_STD_MESG_OPTION'=>'Select the standard actions to be permitted',
-'LBL_TAB_MESG_OPTION'=>'modules to be shown',
-'LBL_UTILITY_MESG_OPTION'=>'Select the utility actions to be permitted',
-'LBL_FIELD_MESG_OPTION'=>'Select the fields to be permitted',
-'LBL_FINISH_BUTTON'=>'Finish',
-'LBL_PROFILE_DETAIL_VIEW'=>'Detail View of Profile',
-'LBL_PROFILE_MESG'=>'Viewing access privileges for',
-'LBL_PROFILE_M'=>'Profile',
-'LBL_DEFINE_PRIV_FOR'=>' Define Privileges for ',
-'LBL_USE_OPTION_TO_SET_PRIV'=>'Use the options below to set privileges',
-'LBL_SUPER_USER_PRIV'=>'Super User Privileges',
-'LBL_SET_PRIV_FOR_EACH_MODULE'=>'Set Privileges for each Module ',
-'LBL_FIELDS_AND_TOOLS_SETTINGS'=>'Fields & Tools Settings',
-'LBL_SHOW_FIELDS'=>'Show Fields',
-'LBL_TOOLS_TO_BE_SHOWN'=>'Tools to be shown',
-'LBL_WELCOME_PROFILE_CREATE'=>'Welcome to Privilege Profile Creator ',
-'LBL_SELECT_CHOICE_NEW_PROFILE'=>'Select your choice of creating the new profile',
-
-//Added fields in createrole.php
-'LBL_HDR_ROLE_NAME'=>'Create New Role:',
-'LBL_TITLE_ROLE_NAME'=>'New Role',
-'LBL_ROLE_NAME'=>'Role Name',
-'LBL_ROLE_PROFILE_NAME'=>'Associate With Profile',
-'LBL_SPECIFY_ROLE_NAME'=>'Specify a name for new role :',
-'LBL_ASSIGN_PROFILE'=>'Assign Profile(s)',
-'LBL_PROFILE_SELECT_TEXT'=>'Select the Profiles below and click on assign button',
-'LBL_PROFILES_AVLBL'=>'Profiles Available',
-'LBL_ASSIGN_PROFILES'=>'Assigned Profiles',
-'LBL_REPORTS_TO_ROLE'=>'Reports to Role',
-'LBL_ASSOCIATED_PROFILES'=>'Associated Profiles :',
-'LBL_ASSOCIATED_USERS'=>'Associated Users :',
-
-
-//Added fields in OrgSharingDetailsView.php
-'LBL_ORG_SHARING_PRIVILEGES'=>'Organisation Sharing  Privileges',
-'LBL_EDIT_PERMISSIONS'=>'Edit Permissions',
-'LBL_SAVE_PERMISSIONS'=>'Save Permissions',
-'LBL_READ_ONLY'=>'Public: Read Only',
-'LBL_EDIT_CREATE_ONLY'=>'Public: Read, Create/Edit',
-'LBL_READ_CREATE_EDIT_DEL'=>'Public: Read, Create/Edit, Delete',
-'LBL_PRIVATE'=>'Private',
-
-//Added fields in listnotificationschedulers.php
-'LBL_HDR_EMAIL_SCHDS'=>'Users : Email Notifications',
-'LBL_EMAIL_SCHDS_DESC'=>'The following is the list of notifications that are activated automatically when the corresponding event has happened.',
-'LBL_ACTIVE'=>'Active',
-'LBL_INACTIVE'=>'Inactive',
-'LBL_NOTIFICATION'=>'Notification',
-'LBL_DESCRIPTION'=>'Description',
-'LBL_TASK_NOTIFICATION'=>'Delayed Task Notification',
-'LBL_TASK_NOTIFICATION_DESCRITPION'=>'Notify when a task is delayed beyond 24 hrs',
-'LBL_MANY_TICKETS'=>'Too many tickets  Notification',
-'LBL_MANY_TICKETS_DESCRIPTION'=>'Notify when a particular entity is allocated too many tickets, might reflect Service Level commitments',
-'LBL_PENDING_TICKETS'=>'Pending Tickets Notification',
-'LBL_TICKETS_DESCRIPTION'=>'Notify for getting attention to status of tickets which are pending',
-'LBL_START_NOTIFICATION'=>'Support Start Notification',
-'LBL_START_DESCRIPTION'=>'Notifiy stating the start of support/service',
-'LBL_BIG_DEAL'=>'Big Deal Notification',
-'LBL_BIG_DEAL_DESCRIPTION'=>'Notify on completion of big deal',
-'LBL_SUPPORT_NOTICIATION'=>'Support End Notification',
-'LBL_SUPPORT_DESCRIPTION'=>'Notify when support is about to end',
-'LBL_BUTTON_UPDATE'=>'Update',
-'LBL_MODULENAMES'=>'Module',
-
-//Added fields in ListFieldPermissions.html
-'LBL_FIELD_PERMISSION_FIELD_NAME'=>'Field Name',
-'LBL_FIELD_PERMISSION_VISIBLE'=>'Visible',
-'LBL_FIELD_PERMISSIOM_TABLE_HEADER'=>'Standard Fields',
-'LBL_FIELD_LEVEL_ACCESS'=>'Field Level Access',
-
-//Added fields after 4.0.1
-'LBL_SIGNATURE'=>'Signature',
-
-//Added for Event Reminder 4.2 Alpha release
-'LBL_ACTIVITY_NOTIFICATION'=>'Event Reminder Notification',
-'LBL_ACTIVITY_REMINDER_DESCRIPTION'=>'Notify before an event to occur based on the reminder set',
-'LBL_MESSAGE'=>'Message',
-
-//Added for Global Privileges
-
-'Public: Read Only'=>'Public: Read Only',
-'Public: Read, Create/Edit'=>'Public: Read, Create/Edit',
-'Public: Read, Create/Edit, Delete'=>'Public: Read, Create/Edit, Delete',
-'Private'=>'Private',
-'Hide Details'=>'Hide Details',
-'Hide Details and Add Events'=>'Hide Details and Add Events',
-'Show Details'=>'Show Details',
-'Show Details and Add Events'=>'Show Details and Add Events',
-
-'LBL_USR_CANNOT_ACCESS'=>'Users cannot access other users ',
-'LBL_USR_CAN_ACCESS'=>'Users can ',
-'LBL_USR_OTHERS'=>' other users ',
-
-'Read Only '=>'Read Only ',
-'Read, Create/Edit, Delete '=>'Read, Create/Edit, Delete ',
-'Read, Create/Edit '=>'Read, Create/Edit ',
-'Read/Write'=>'Read/Write',
-'LBL_GO_TO_TOP'=>'Go to Top',
-'LNK_CLICK_HERE'=>'Click here',
-'LBL_RULE_NO'=>'Rule No.',
-'LBL_CAN_BE_ACCESSED'=>'can be accessed by',
-'LBL_PRIVILEGES'=>'Privileges',
-'LBL_OF'=>'of',
-
-
-
-//Added for 4.2GA support for mail server integration
-'LBL_ADD_MAILSERVER_BUTTON_TITLE'=>'Add Mail Server',
-'LBL_ADD_MAILSERVER_BUTTON_KEY'=>'M',
-'LBL_ADD_MAILSERVER_BUTTON_LABEL'=>'Add Mail Server',
-
-'LBL_LIST_MAILSERVER_BUTTON_TITLE'=>'List Mail Server',
-'LBL_LIST_MAILSERVER_BUTTON_KEY'=>'L',
-'LBL_LIST_MAILSERVER_BUTTON_LABEL'=>'List Mail Server',
-//added for inventory terms and conditions
-'INV_TANDC'=>'Terms & Coditions',
-'INV_TERMSANDCONDITIONS'=>'Inventory Terms & Coditions',
-'LBL_INV_TERMSANDCONDITIONS'=>'Inventory Management', 
-
-
-'INVENTORYNOTIFICATION'=>'Inventory Notifications',
-'LBL_INVENTORY_NOTIFICATIONS'=>'Edit Inventory Email Notifications',
-'LBL_INV_NOT_DESC'=>'The following are the list of notifications that are sent to the product handler regarding the demand and the current quantity in hand during the creation of a Quote, SalesOrder and Invoice.',
-
-'InvoiceNotification'=>'Product Stock Notification during Invoice Generation',
-'InvoiceNotificationDescription'=>'When the product stock level goes below the re-order level, notification will be sent to the product handler',
-
-'QuoteNotification'=>'Product Stock Notification during Quote Generation',
-'QuoteNotificationDescription'=>'During quote generation if the product stock in warehouse is lesser than the  quantity mentioned in quote then this notification will be sent to the product handler',
-
-'SalesOrderNotification'=>'Product Stock Notification during Sales Order Generation',
-'SalesOrderNotificationDescription'=>'During sales order generation if the product stock in warehouse is lesser than the quantity mentioned in sales order then this notification will be sent to the product handler',
-
-//New addition for 4.2 GA
-'LBL_USER_FIELDS'=>'User Fields',
-'LBL_NOTE_DO_NOT_REMOVE_INFO'=>'Note: Donot remove or alter the values within {  }',
-
-//Added for patch2
-'LBL_FILE_INFORMATION'=>'File Information',
-
-//Added after pathc2
-'LBL_LEAD_FIELD_ACCESS'=>'Lead Field Access',
-
-'LBL_ACCOUNT_FIELD_ACCESS'=>'Account Field Access',
-
-'LBL_CONTACT_FIELD_ACCESS'=>'Contact Field Access',
-
-'LBL_OPPORTUNITY_FIELD_ACCESS'=>'Potential Field Access',
-
-'LBL_HELPDESK_FIELD_ACCESS'=>'HelpDesk Field Access',
-
-'LBL_PRODUCT_FIELD_ACCESS'=>'Product Field Access',
-
-'LBL_NOTE_FIELD_ACCESS'=>'Note Field Access',
-
-'LBL_EMAIL_FIELD_ACCESS'=>'Email Field Access',
-
-'LBL_TASK_FIELD_ACCESS'=>'Task Field Access',
-
-'LBL_EVENT_FIELD_ACCESS'=>'Event Field Access',
-'LBL_VENDOR_FIELD_ACCESS'=>'Vendor Field Access',
-'LBL_PB_FIELD_ACCESS'=>'PriceBook Field Access',
-'LBL_QUOTE_FIELD_ACCESS'=>'Quote Field Access',
-'LBL_PO_FIELD_ACCESS'=>'Purchase Order Field Access',
-'LBL_SO_FIELD_ACCESS'=>'Sales Order Access',
-'LBL_INVOICE_FIELD_ACCESS'=>'Invoice Field Access',
-
-//given for calendar color for an user user
-'LBL_COLOR'=>'Color in Calendar',
-//added for activity view in home page
-'LBL_ACTIVITY_VIEW'=>'Default Activity View',
-//Added to change Home page order
-'LBL_HOMEPAGE_ORDER_UPDATE'=>'Update Home Page Block Order',
-'LBL_HOMEPAGE_ID'=>'Block Order',
-'ERR_INVALID_USER'=>'Invalid access--Please call from My Accounts',
-'ALVT'=>'Top Accounts',
-'PLVT'=>'Top Potentials',
-'QLTQ'=>'Top Quotes',
-'CVLVT'=>'Key Metrics',
-'HLT'=>'HelpDesk Top Tickets',
-'OLV'=>'Top Open Activities',
-'GRT'=>'My Group Allocation',
-'OLTSO'=>'Top Sales Orders',
-'ILTI'=>'Top Invoices',
-//Added for 5.0 alpha
-'LBL_GROUP_NAME_ERROR'=>'Group Name already exists!',
-'MNL'=>'My New Leads',
-'LBL_LEAD_VIEW'=>'Default Lead View',
-'LBL_TAG_CLOUD'=>'Tag Cloud',
-'LBL_LIST_TOOLS'=>'Tools',
-'LBL_STATISTICS'=>'Statistics',
-'LBL_TOTAL'=>'Total :',
-'LBL_OTHERS'=>'Others :',
-'LBL_USERS'=>'User(s)',
-'LBL_USER_LOGIN_ROLE'=>'User Login & Role',
-'LBL_USER_MORE_INFN'=>'More Information',
-'LBL_USER_ADDR_INFN'=>'Address Information',
-'LBL_USER_IMAGE'=>'User Image',
-'LBL_USR'=>'Users',
-
-'LBL_MY'=>'My',
-'LBL_MY_DEFAULTS'=>'My Defaults',
-'LBL_MY_DESG'=>'My Designation & Contact Details',
-'LBL_MY_ADDR'=>'My Postal Address',
-'LBL_MY_DETAILS'=>'My Details',
-'LBL_MY_PHOTO'=>'My Photo',
-'LBL_CHANGE_PHOTO'=>'Change Photo...',
-'LBL_CHANGE'=>'Change',
-
-
-//Added for Access Privileges
-
-'LBL_GLOBAL_FIELDS_MANAGER'=>'Global Fields Manager',
-'LBL_GLOBAL_ACCESS_PRIVILEGES'=>'Global Access Privileges',
-'LBL_CUSTOM_ACCESS_PRIVILEGES'=>'Custom Access Privileges',
-'LBL_BOTH'=>'Both',
-'LBL_VIEW'=>'View',
-'LBL_RECALCULATE_BUTTON'=>'Recalculate',
-'LBL_ADD_PRIVILEGES_BUTTON'=>'Add Privileges',
-'LBL_CUSTOM_ACCESS_MESG'=>'No Custom Access Rules defined .',
-'LBL_CREATE_RULE_MESG'=>'to create a new Rule',
-'LBL_SELECT_SCREEN'=>'Select the Screen / Module :',
-'LBL_FIELDS_AVLBL'=>'Fields Available in',
-'LBL_FIELDS_SELECT_DESELECT'=>'Fields to be shown',
-'LBL_ROLE_TO_BE_DELETED'=>'Role to be Deleted',
-'LBL_TRANSFER_USER_ROLE'=>'Transfer Users to Role',
-'LBL_DELETE_ROLE'=>'Delete Role',
-'LBL_MORE_INFORMATION'=>'More Information',
-'LBL_USERLOGIN_ROLE'=>'User Login & Role',
-
-//Added for 5.0 for all fields
-'Role'=>'Role',
-'Email'=>'Email',
-'Admin'=>'Admin',
-'User Name'=>'User Name',
-'First Name'=>'First Name',
-'Last Name'=>'Last Name',
-'Status'=>'Status',
-'Default Activity View'=>'Default Activity View',
-'Default Lead View'=>'Default Lead View',
-'Currency'=>'Currency',
-'Title'=>'Title',
-'Office Phone'=>'Office Phone',
-'Department'=>'Department',
-'Mobile'=>'Mobile',
-'Reports To'=>'Reports To',
-'Other Phone'=>'Other Phone',
-'Other Email'=>'Other Email',
-'Fax'=>'Fax',
-'Yahoo id'=>'Yahoo id',
-'Home Phone'=>'Home Phone',
-'User Image'=>'User Image',
-'Date Format'=>'Date Format',
-'Tag Cloud'=>'Tag Cloud',
-'Signature'=>'Signature',
-'Notes'=>'Notes',
-'Street Address'=>'Street Address',
-'City'=>'City',
-'State'=>'State',
-'Postal Code'=>'Postal Code',
-'Country'=>'Country',
-'Password'=>'Password',
-'Confirm Password'=>'Confirm Password',
-
-);
-
-?>
+<?php
+/*********************************************************************************
+ * The contents of this file are subject to the SugarCRM Public License Version 1.1.2
+ * ("License"); You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at http://www.sugarcrm.com/SPL
+ * Software distributed under the License is distributed on an  "AS IS"  basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
+ * the specific language governing rights and limitations under the License.
+ * The Original Code is:  SugarCRM Open Source
+ * The Initial Developer of the Original Code is SugarCRM, Inc.
+ * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc.;
+ * All Rights Reserved.
+ * Contributor(s): ______________________________________.
+ ********************************************************************************/
+/*********************************************************************************
+ * $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/modules/Users/language/en_us.lang.php,v 1.18 2005/04/19 14:45:38 ray Exp $
+ * Description:  Defines the English language pack for the Account module.
+ ********************************************************************************/
+ 
+$mod_strings = Array(
+'LBL_MODULE_NAME'=>'Users',
+'LBL_MODULE_TITLE'=>'Users: Home',
+'LBL_SEARCH_FORM_TITLE'=>'User Search',
+'LBL_LIST_FORM_TITLE'=>'User List',
+'LBL_NEW_FORM_TITLE'=>'New User',
+'LBL_CREATE_NEW_USER'=>'Create New User',
+'LBL_USER'=>'Users:',
+'LBL_LOGIN'=>'Login',
+'LBL_USER_ROLE'=>'Role',
+'LBL_LIST_NAME'=>'Name',
+'LBL_LIST_LAST_NAME'=>'Last Name',
+'LBL_LIST_USER_NAME'=>'UserName',
+'LBL_LIST_DEPARTMENT'=>'Department',
+'LBL_LIST_EMAIL'=>'E-Mail',
+'LBL_LIST_PRIMARY_PHONE'=>'Primary Phone',
+'LBL_LIST_ADMIN'=>'Admin',
+'LBL_LIST_PASSWORD'=>'Password',
+'LBL_LIST_CONFIRM_PASSWORD'=>'Confirm Password',
+'LBL_LIST_USER_NAME_ROLE'=>'User ID , Name & Role',
+'LBL_LIST_SELECT'=>'Select',
+'LBL_LIST_PHONE'=>'Phone',
+'LBL_LIST_NO'=>'#',
+
+'LBL_ADMINS'=>'Admins',
+'LBL_STD_USERS'=>'Standard Users',
+
+'UserName'=>'UserName',
+'Role'=>'Role',
+'Email'=>'Email',
+'Name'=>'Name',
+'Admin'=>'Admin',
+'Tools'=>'Tools',
+
+
+//added for patch2
+'LBL_GROUP'=>'Group',
+'LBL_CURRENCY_NAME'=>'Currency',
+
+'LBL_NEW_USER_BUTTON_TITLE'=>'New User [Alt+N]',
+'LBL_NEW_USER_BUTTON_LABEL'=>'New User',
+'LBL_NEW_USER_BUTTON_KEY'=>'N',
+'LBL_DATE_FORMAT'=>'Date Format',
+
+'LBL_ERROR'=>'Error:',
+'LBL_PASSWORD'=>'Password:',
+'LBL_USER_NAME'=>'User Name',
+'LBL_CRM_ID'=>'CRM ID',
+'LBL_FIRST_NAME'=>'First Name',
+'LBL_LAST_NAME'=>'Last Name',
+'LBL_YAHOO_ID'=>'Yahoo ID',
+'LBL_USER_SETTINGS'=>'User Settings',
+'LBL_THEME'=>'Theme:',
+'LBL_LANGUAGE'=>'Language:',
+'LBL_ADMIN'=>'Admin',
+'LBL_USER_INFORMATION'=>'User Information',
+'LBL_OFFICE_PHONE'=>'Office Phone',
+'LBL_REPORTS_TO'=>'Reports to',
+'LBL_OTHER_PHONE'=>'Other Phone',
+'LBL_OTHER_EMAIL'=>'Other Email',
+'LBL_NOTES'=>'Notes',
+'LBL_DEPARTMENT'=>'Department',
+'LBL_STATUS'=>'Status',
+'LBL_TITLE'=>'Title',
+'LBL_ANY_PHONE'=>'Any Phone:',
+'LBL_ANY_EMAIL'=>'Any Email:',
+'LBL_ADDRESS'=>'Street Address',
+'LBL_CITY'=>'City',
+'LBL_STATE'=>'State',
+'LBL_POSTAL_CODE'=>'Postal Code',
+'LBL_COUNTRY'=>'Country',
+'LBL_NAME'=>'Name:',
+'LBL_USER_SETTINGS'=>'User Settings',
+'LBL_USER_INFORMATION'=>'User Information',
+'LBL_MOBILE_PHONE'=>'Mobile',
+'LBL_OTHER'=>'Other',
+'LBL_FAX'=>'Fax',
+'LBL_EMAIL'=>'E-Mail Id',
+'LBL_HOME_PHONE'=>'Home Phone',
+'LBL_ADDRESS_INFORMATION'=>'Address Information',
+'LBL_CAL_HRFORMAT'=>'Calendar Time Format',
+'LBL_CAL_DURATION'=>'Day starts at',
+'LBL_PRIMARY_ADDRESS'=>'Primary Address:',
+
+'LBL_CHANGE_PASSWORD_BUTTON_TITLE'=>'Change Password [Alt+P]',
+'LBL_CHANGE_PASSWORD_BUTTON_KEY'=>'P',
+'LBL_CHANGE_PASSWORD_BUTTON_LABEL'=>'Change Password',
+'LBL_LOGIN_BUTTON_TITLE'=>'Login [Alt+L]',
+'LBL_LOGIN_BUTTON_KEY'=>'L',
+'LBL_LOGIN_BUTTON_LABEL'=>'Login',
+'LBL_LOGIN_HISTORY_BUTTON_TITLE'=>'Login History [Alt+H]',
+'LBL_LOGIN_HISTORY_BUTTON_KEY'=>'H',
+'LBL_LOGIN_HISTORY_BUTTON_LABEL'=>'Login History',
+'LBL_LOGIN_HISTORY_TITLE'=>'Users: Login History',
+'LBL_RESET_PREFERENCES'=>'Reset To Default Preferences',
+
+'LBL_CHANGE_PASSWORD'=>'Change Password',
+'LBL_OLD_PASSWORD'=>'Old Password:',
+'LBL_NEW_PASSWORD'=>'New Password:',
+'LBL_CONFIRM_PASSWORD'=>'Confirm Password:',
+'ERR_ENTER_OLD_PASSWORD'=>'Please enter your old password.',
+'ERR_ENTER_NEW_PASSWORD'=>'Please enter your new password.',
+'ERR_ENTER_CONFIRMATION_PASSWORD'=>'Please enter your password confirmation.',
+'ERR_REENTER_PASSWORDS'=>'Please re-enter passwords.  The \"new password\" and \"confirm password\" values do not match.',
+'ERR_INVALID_PASSWORD'=>'You must specify a valid username and password.',
+'ERR_PASSWORD_CHANGE_FAILED_1'=>'User password change failed for ',
+'ERR_PASSWORD_CHANGE_FAILED_2'=>' failed.  The new password must be set.',
+'ERR_PASSWORD_INCORRECT_OLD'=>'Incorrect old password for user $this->user_name. Re-enter password information.',
+'ERR_USER_NAME_EXISTS_1'=>'The user name ',
+'ERR_USER_NAME_EXISTS_2'=>' already exists.  Duplicate user names are not allowed.<br>Change the user name to be unique.',
+'ERR_LAST_ADMIN_1'=>'The user name ',
+'ERR_LAST_ADMIN_2'=>' is the last Admin user.  At least one user must be an Admin user.<br>Check the Admin user setting.',
+
+'ERR_DELETE_RECORD'=>"A record number must be specified to delete the account.",
+
+// Additional Fields for i18n --- Release vtigerCRM 3.2 Patch 2
+// Users--listroles.php , createrole.php , ListPermissions.php , editpermissions.php
+
+'LBL_ROLES'=>'Roles',
+'LBL_ROLES_SUBORDINATES'=>'Roles and Subordinates',
+'LBL_ROLE_NAME'=>'Role Name',
+'LBL_CREATE_NEW_ROLE'=>'Create New Role',
+
+'LBL_CREATE_NEW_ROLE'=>'Create New Role',
+'LBL_INDICATES_REQUIRED_FIELD'=>'Indicates Required Field',
+'LBL_NEW_ROLE'=>'New Role',
+'LBL_PARENT_ROLE'=>'Parent Role',
+
+'LBL_LIST_ROLES'=>'List Roles',
+'LBL_ENTITY_LEVEL_PERMISSIONS'=>'Entity Level Permissions',
+'LBL_ENTITY'=>'Entity',
+'LBL_CREATE_EDIT'=>'Create/Edit',
+'LBL_DELETE'=>'Delete',
+'LBL_VIEW'=>'View',
+'LBL_LEADS'=>'Leads',
+'LBL_ACCOUNTS'=>'Accounts',
+'LBL_CONTACTS'=>'Contacts',
+'LBL_OPPURTUNITIES'=>'Opportunities',
+'LBL_TASKS'=>'Tasks',
+'LBL_CASES'=>'Cases',
+'LBL_EMAILS'=>'Emails',
+'LBL_NOTES'=>'Notes',
+'LBL_MEETINGS'=>'Meetings',
+'LBL_CALLS'=>'Calls',
+'LBL_IMPORT_PERMISSIONS'=>'Import Permissions',
+'LBL_IMPORT_LEADS'=>'Import Leads',
+'LBL_IMPORT_ACCOUNTS'=>'Import Accounts',
+'LBL_IMPORT_CONTACTS'=>'Import Contacts',
+'LBL_IMPORT_OPPURTUNITIES'=>'Import Opportunities',
+
+'LBL_ROLE_DETAILS'=>'Role Details',
+//added for vtigercrm4 rc
+'LBL_FILE'=> 'File Name',
+'LBL_FILE_TYPE'=>'File Type',
+'LBL_UPLOAD'=>'Upload File',
+'LBL_ATTACH_FILE'=>'Attach Mail Merge Template',
+'LBL_EMAIL_TEMPLATES'=>'Email Templates',
+'LBL_TEMPLATE_NAME'=>'Template Name',
+'LBL_TEMPLATE_HEADER'=>'Template',
+'LBL_TEMPLATE_DETAILS'=>'Template Details',
+'LBL_EDIT_TEMPLATE'=>'Edit Template',
+'LBL_TEMPLATE_FILE'=>'Template File',
+'LBL_DESCRIPTION'=>'Description',
+'LBL_EMAIL_TEMPLATES_LIST'=>'Communication Templates > Email Templates',
+'LBL_MAILMERGE_TEMPLATES_LIST'=>' > Communication Templates > Mail Merge Templates',
+'LBL_MAILMERGE_TEMPLATES_ATTACHMENT' => '> Communication Templates > Attach Mail Merge Template',
+'LBL_DOWNLOAD_NOW'=>'Download Now',
+'LBL_DOWNLOAD'=>'Download',
+'LBL_SELECT_MODULE'=>'Select Module',
+'LBL_MERGE_FILE'=>'File : ',
+'LBL_MERGE_MSG'=>'Select a module to assign this Template',
+'LBL_MERGE_FIELDS'=>'Merge Fields',
+'LBL_COPY_PASTE'=>'Copy & Paste',
+'LNK_GO_TO_TOP'=>'Go to Page Top',
+'LNK_SAMPLE_EMAIL'=>'View Sample Email',
+'LBL_COLON'=>':',
+'LBL_EMAIL_TEMPLATE'=>'Email Template',
+'LBL_NEW_TEMPLATE'=>'New Template',
+'LBL_ADD_TEMPLATE'=>'Add Template',
+'LBL_USE_MERGE_FIELDS_TO_EMAIL_CONTENT'=>'Use merge fields to personalize your email content.',
+'LBL_AVAILABLE_MERGE_FIELDS'=>'Available Merge Fields',
+'LBL_SELECT_FIELD_TYPE'=>'Select Field Type',
+'LBL_SELECT_FIELD'=>'Select Field :',
+'LBL_MERGE_FIELD_VALUE'=>'Copy Merge Field Value :',
+'LBL_ACCOUNT_FIELDS'=>'Account Fields',
+'LBL_CONTACT_FIELDS'=>'Contact Fields',
+'LBL_LEAD_FIELDS'=>'Lead Fields',
+'LBL_COPY_AND_PASTE_MERGE_FIELD'=>'Copy and paste the merge field value into your template below.',
+'LBL_EMAIL_TEMPLATE_INFORMATION'=>'Communication Templates > Email Templates > Viewing',
+'LBL_FOLDER'=>'Folder',
+'LBL_PERSONAL'=>'Personal',
+'LBL_PUBLIC'=>'Public',
+'LBL_TEMPLATE_NAME'=>'Template Name:',
+'LBL_SUBJECT'=>'Subject',
+'LBL_BODY'=>'Email Body',
+'LBL_TEMPLATE_TOOLS'=>'Tools',
+'LBL_TEMPLATE_PUBLIC'=>'Public Access',
+'LBL_TEMPLATE_PRIVATE'=>'Private Access',
+'LBL_TEMPLATE_SUBJECT'=>'Email Subject',
+'LBL_TEMPLATE_MESSAGE'=>'Email Message',
+'LBL_VIEWING'=>'Viewing',
+'LBL_PROPERTIES'=>'Properties of',
+
+
+
+// Added fields in createnewgroup.php
+'LBL_CREATE_NEW_GROUP'=>'Create New Group',
+'LBL_NEW_GROUP'=>'New Group',
+'LBL_EDIT_GROUP'=>'Edit Group',
+'LBL_GROUP_NAME'=>'Group Name',
+'LBL_GROUP_DETAILS'=>'Group Details',
+'LBL_MEMBER'=>'Members',
+'LBL_MEMBER_AVLBL'=>'Available Entities & Members',
+'LBL_MEMBER_SELECTED'=>'Selected Members',
+'LBL_DESCRIPTION'=>'Description',
+'LBL_GROUP_MESG1'=>'Groups are a flexible way to assign access rights, when complex access rights has to be defined. You can combine multiple entities like Roles, Users, profiles etc into a single group.',
+'LBL_GROUP_MESG2'=>'To add, select the Entity members from left and click the ">>" button.',
+'LBL_GROUP_MESG3'=>'To remove, select the group members from the right and click the "<<" button.',
+
+
+// Added fields in detailViewmailtemplate.html,listgroupmembers.php,listgroups.php
+'LBL_DETAIL_VIEW_OF_EMAIL_TEMPLATE'=>'Detail View of Email Template',
+'LBL_DETAIL_VIEW'=>'Detail View of',
+'LBL_EDIT_VIEW'=>'Edit View of',
+'LBL_GROUP_MEMBERS_LIST'=>'Group members list',
+'LBL_GROUPS'=>'Groups',
+'LBL_ADD_GROUP_BUTTON'=>'Add Group',
+'LBL_WORD_TEMPLATES'=>'Mail Merge Templates',
+'LBL_NEW_WORD_TEMPLATE'=>'New Template',
+'LBL_EMAIL_TEMPLATE_DESC'=>'Manage email templates used for Campaigns and Mass mailing',
+'LBL_NAME'=>'Name',
+
+// Added fields in TabCustomise.php,html and UpdateTab.php,html
+'LBL_CUSTOMISE_TABS'=>'Customize Tabs',
+'LBL_CHOOSE_TABS'=>'Choose Tabs',
+'LBL_AVAILABLE_TABS'=>'Available Tabs',
+'LBL_SELECTED_TABS'=>'Selected Tabs',
+'LBL_USER'=>'User',
+'LBL_TAB_MENU_UPDATED'=>'Tab Menu Updated! kindly go to ',
+'LBL_TO_VIEW_CHANGES'=>' to view the changes',
+
+// Added to change homepage order
+'LBL_CHANGE_HOMEPAGE_LABEL'=>'Homepage Order',
+'LBL_CHANGE_HOMEPAGE_TITLE'=>'Homepage',
+
+// Added fields in binaryfilelist.php
+'LBL_OERATION'=>'Operation',
+
+// Added fields in CreateProfile.php
+'LBL_PROFILE_NAME'=>'Create New Profile:',
+'LBL_NEW_PROFILE'=>'New Profile',
+'LBL_NEW_PROFILE_NAME'=>'Profile Name',
+'LBL_PARENT_PROFILE'=>'Parent Profile',
+'LBL_BASIC_PROFILE_DETAILS'=>'Basic details of Profile',
+'LBL_STEP_1_2'=>'Step 1 of 2',
+'LBL_STEP_2_2'=>'Step 2 of 2',
+'LBL_STEP'=>'Step',
+'LBL_SELECT_BASE_PROFILE'=>'Select Base Profile',
+'LBL_PROFILE_PRIVILEGES'=>'Profile Privileges',
+'LBL_GLOBAL_PRIVILEGES'=>'Global Privileges',
+'LBL_TAB_PRIVILEGES'=>'Tab Privileges',
+'LBL_FIELD_PRIVILEGES'=>'Field Privileges',
+'LBL_STANDARD_PRIVILEGES'=>'Standard Privileges',
+'LBL_UTILITY_PRIVILEGES'=>'Utility Privileges',
+'LBL_UTILITIES'=>'Utilities',
+'LBL_BASE_PROFILE_MESG'=>'I would like to setup a base profile and edit privileges <b>(Recommended)</b>',
+'LBL_BASE_PROFILE'=>'Base Profile:',
+'LBL_OR'=>'OR',
+'LBL_BASE_PROFILE_MESG_ADV'=>'I will choose the privileges from scratch <b>(Advanced Users)</b>',
+'LBL_FOR'=>'for',
+'LBL_GLOBAL_MESG_OPTION'=>'Select the options below to change global privileges',
+'LBL_VIEW_ALL'=>'View all',
+'LBL_EDIT_ALL'=>'Edit all',
+'LBL_ALLOW'=>'Allows',
+'LBL_MESG_VIEW'=>'to view all information / modules of vtiger CRM',
+'LBL_MESG_EDIT'=>'to edit all information / modules of vtiger CRM',
+'LBL_STD_MESG_OPTION'=>'Select the standard actions to be permitted',
+'LBL_TAB_MESG_OPTION'=>'modules to be shown',
+'LBL_UTILITY_MESG_OPTION'=>'Select the utility actions to be permitted',
+'LBL_FIELD_MESG_OPTION'=>'Select the fields to be permitted',
+'LBL_FINISH_BUTTON'=>'Finish',
+'LBL_PROFILE_DETAIL_VIEW'=>'Detail View of Profile',
+'LBL_PROFILE_MESG'=>'Viewing access privileges for',
+'LBL_PROFILE_M'=>'Profile',
+'LBL_DEFINE_PRIV_FOR'=>' Define Privileges for ',
+'LBL_USE_OPTION_TO_SET_PRIV'=>'Use the options below to set privileges',
+'LBL_SUPER_USER_PRIV'=>'Super User Privileges',
+'LBL_SET_PRIV_FOR_EACH_MODULE'=>'Set Privileges for each Module ',
+'LBL_FIELDS_AND_TOOLS_SETTINGS'=>'Fields & Tools Settings',
+'LBL_SHOW_FIELDS'=>'Show Fields',
+'LBL_TOOLS_TO_BE_SHOWN'=>'Tools to be shown',
+'LBL_WELCOME_PROFILE_CREATE'=>'Welcome to Privilege Profile Creator ',
+'LBL_SELECT_CHOICE_NEW_PROFILE'=>'Select your choice of creating the new profile',
+'LBL_ADD_CUSTOM_RULE'=>'Add Custom Privilege Rule',
+'LBL_CLOSE'=>'Close',
+'LBL_SELECT_ENTITY'=>'Select an entity below',
+'LBL_CAN_BE_ACCESSED_BY'=>'Can be accessed by',
+'LBL_PERMISSIONS'=>'Permissions',
+'LBL_ACCESS_RIGHTS_FOR_MODULES'=>'Access rights for relative modules',
+'LBL_RULE_CONSTRUCTION'=>'Rule Construction Display',
+'LBL_ADD_RULE'=>'Add Rule',
+'LBL_RELATED_MODULE_RIGHTS'=>'Related Module Rights',
+'LBL_IN_PERMISSION'=>'in the permission',
+
+//Added fields in createrole.php
+'LBL_HDR_ROLE_NAME'=>'Create New Role:',
+'LBL_TITLE_ROLE_NAME'=>'New Role',
+'LBL_ROLE_NAME'=>'Role Name',
+'LBL_ROLE_PROFILE_NAME'=>'Associate With Profile',
+'LBL_SPECIFY_ROLE_NAME'=>'Specify a name for new role :',
+'LBL_ASSIGN_PROFILE'=>'Assign Profile(s)',
+'LBL_PROFILE_SELECT_TEXT'=>'Select the Profiles below and click on assign button',
+'LBL_PROFILES_AVLBL'=>'Profiles Available',
+'LBL_ASSIGN_PROFILES'=>'Assigned Profiles',
+'LBL_REPORTS_TO_ROLE'=>'Reports to Role',
+'LBL_ASSOCIATED_PROFILES'=>'Associated Profiles :',
+'LBL_ASSOCIATED_USERS'=>'Associated Users :',
+
+
+//Added fields in OrgSharingDetailsView.php
+'LBL_ORG_SHARING_PRIVILEGES'=>'Organisation Sharing  Privileges',
+'LBL_EDIT_PERMISSIONS'=>'Edit Permissions',
+'LBL_SAVE_PERMISSIONS'=>'Save Permissions',
+'LBL_READ_ONLY'=>'Public: Read Only',
+'LBL_EDIT_CREATE_ONLY'=>'Public: Read, Create/Edit',
+'LBL_READ_CREATE_EDIT_DEL'=>'Public: Read, Create/Edit, Delete',
+'LBL_PRIVATE'=>'Private',
+
+//Added fields in listnotificationschedulers.php
+'LBL_HDR_EMAIL_SCHDS'=>'Users : Email Notifications',
+'LBL_EMAIL_SCHDS_DESC'=>'The following is the list of notifications that are activated automatically when the corresponding event has happened.',
+'LBL_ACTIVE'=>'Active',
+'LBL_INACTIVE'=>'Inactive',
+'LBL_NOTIFICATION'=>'Notification',
+'LBL_DESCRIPTION'=>'Description',
+'LBL_TASK_NOTIFICATION'=>'Delayed Task Notification',
+'LBL_TASK_NOTIFICATION_DESCRITPION'=>'Notify when a task is delayed beyond 24 hrs',
+'LBL_MANY_TICKETS'=>'Too many tickets  Notification',
+'LBL_MANY_TICKETS_DESCRIPTION'=>'Notify when a particular entity is allocated too many tickets, might reflect Service Level commitments',
+'LBL_PENDING_TICKETS'=>'Pending Tickets Notification',
+'LBL_TICKETS_DESCRIPTION'=>'Notify for getting attention to status of tickets which are pending',
+'LBL_START_NOTIFICATION'=>'Support Start Notification',
+'LBL_START_DESCRIPTION'=>'Notifiy stating the start of support/service',
+'LBL_BIG_DEAL'=>'Big Deal Notification',
+'LBL_BIG_DEAL_DESCRIPTION'=>'Notify on completion of big deal',
+'LBL_SUPPORT_NOTICIATION'=>'Support End Notification',
+'LBL_SUPPORT_DESCRIPTION'=>'Notify when support is about to end',
+'LBL_BUTTON_UPDATE'=>'Update',
+'LBL_MODULENAMES'=>'Module',
+
+//Added fields in ListFieldPermissions.html
+'LBL_FIELD_PERMISSION_FIELD_NAME'=>'Field Name',
+'LBL_FIELD_PERMISSION_VISIBLE'=>'Visible',
+'LBL_FIELD_PERMISSIOM_TABLE_HEADER'=>'Standard Fields',
+'LBL_FIELD_LEVEL_ACCESS'=>'Field Level Access',
+
+//Added fields after 4.0.1
+'LBL_SIGNATURE'=>'Signature',
+
+//Added for Event Reminder 4.2 Alpha release
+'LBL_ACTIVITY_NOTIFICATION'=>'Event Reminder Notification',
+'LBL_ACTIVITY_REMINDER_DESCRIPTION'=>'Notify before an event to occur based on the reminder set',
+'LBL_MESSAGE'=>'Message',
+
+//Added for Global Privileges
+
+'Public: Read Only'=>'Public: Read Only',
+'Public: Read, Create/Edit'=>'Public: Read, Create/Edit',
+'Public: Read, Create/Edit, Delete'=>'Public: Read, Create/Edit, Delete',
+'Private'=>'Private',
+'Hide Details'=>'Hide Details',
+'Hide Details and Add Events'=>'Hide Details and Add Events',
+'Show Details'=>'Show Details',
+'Show Details and Add Events'=>'Show Details and Add Events',
+
+'LBL_USR_CANNOT_ACCESS'=>'Users cannot access other users ',
+'LBL_USR_CAN_ACCESS'=>'Users can ',
+'LBL_USR_OTHERS'=>' other users ',
+
+'Read Only '=>'Read Only ',
+'Read, Create/Edit, Delete '=>'Read, Create/Edit, Delete ',
+'Read, Create/Edit '=>'Read, Create/Edit ',
+'Read/Write'=>'Read/Write',
+'LBL_GO_TO_TOP'=>'Go to Top',
+'LNK_CLICK_HERE'=>'Click here',
+'LBL_RULE_NO'=>'Rule No.',
+'LBL_CAN_BE_ACCESSED'=>'can be accessed by',
+'LBL_PRIVILEGES'=>'Privileges',
+'LBL_OF'=>'of',
+
+
+
+//Added for 4.2GA support for mail server integration
+'LBL_ADD_MAILSERVER_BUTTON_TITLE'=>'Add Mail Server',
+'LBL_ADD_MAILSERVER_BUTTON_KEY'=>'M',
+'LBL_ADD_MAILSERVER_BUTTON_LABEL'=>'Add Mail Server',
+
+'LBL_LIST_MAILSERVER_BUTTON_TITLE'=>'List Mail Server',
+'LBL_LIST_MAILSERVER_BUTTON_KEY'=>'L',
+'LBL_LIST_MAILSERVER_BUTTON_LABEL'=>'List Mail Server',
+//added for inventory terms and conditions
+'INV_TANDC'=>'Terms & Coditions',
+'INV_TERMSANDCONDITIONS'=>'Inventory Terms & Coditions',
+'LBL_INV_TERMSANDCONDITIONS'=>'Inventory Management', 
+
+
+'INVENTORYNOTIFICATION'=>'Inventory Notifications',
+'LBL_INVENTORY_NOTIFICATIONS'=>'Edit Inventory Email Notifications',
+'LBL_INV_NOT_DESC'=>'The following are the list of notifications that are sent to the product handler regarding the demand and the current quantity in hand during the creation of a Quote, SalesOrder and Invoice.',
+
+'InvoiceNotification'=>'Product Stock Notification during Invoice Generation',
+'InvoiceNotificationDescription'=>'When the product stock level goes below the re-order level, notification will be sent to the product handler',
+
+'QuoteNotification'=>'Product Stock Notification during Quote Generation',
+'QuoteNotificationDescription'=>'During quote generation if the product stock in warehouse is lesser than the  quantity mentioned in quote then this notification will be sent to the product handler',
+
+'SalesOrderNotification'=>'Product Stock Notification during Sales Order Generation',
+'SalesOrderNotificationDescription'=>'During sales order generation if the product stock in warehouse is lesser than the quantity mentioned in sales order then this notification will be sent to the product handler',
+
+//New addition for 4.2 GA
+'LBL_USER_FIELDS'=>'User Fields',
+'LBL_NOTE_DO_NOT_REMOVE_INFO'=>'Note: Donot remove or alter the values within {  }',
+
+//Added for patch2
+'LBL_FILE_INFORMATION'=>'File Information',
+
+//Added after pathc2
+'LBL_LEAD_FIELD_ACCESS'=>'Lead Field Access',
+
+'LBL_ACCOUNT_FIELD_ACCESS'=>'Account Field Access',
+
+'LBL_CONTACT_FIELD_ACCESS'=>'Contact Field Access',
+
+'LBL_OPPORTUNITY_FIELD_ACCESS'=>'Potential Field Access',
+
+'LBL_HELPDESK_FIELD_ACCESS'=>'HelpDesk Field Access',
+
+'LBL_PRODUCT_FIELD_ACCESS'=>'Product Field Access',
+
+'LBL_NOTE_FIELD_ACCESS'=>'Note Field Access',
+
+'LBL_EMAIL_FIELD_ACCESS'=>'Email Field Access',
+
+'LBL_TASK_FIELD_ACCESS'=>'Task Field Access',
+
+'LBL_EVENT_FIELD_ACCESS'=>'Event Field Access',
+'LBL_VENDOR_FIELD_ACCESS'=>'Vendor Field Access',
+'LBL_PB_FIELD_ACCESS'=>'PriceBook Field Access',
+'LBL_QUOTE_FIELD_ACCESS'=>'Quote Field Access',
+'LBL_PO_FIELD_ACCESS'=>'Purchase Order Field Access',
+'LBL_SO_FIELD_ACCESS'=>'Sales Order Access',
+'LBL_INVOICE_FIELD_ACCESS'=>'Invoice Field Access',
+
+//given for calendar color for an user user
+'LBL_COLOR'=>'Color in Calendar',
+//added for activity view in home page
+'LBL_ACTIVITY_VIEW'=>'Default Activity View',
+//Added to change Home page order
+'LBL_HOMEPAGE_ORDER_UPDATE'=>'Update Home Page Block Order',
+'LBL_HOMEPAGE_ID'=>'Block Order',
+'ERR_INVALID_USER'=>'Invalid access--Please call from My Accounts',
+'ALVT'=>'Top Accounts',
+'PLVT'=>'Top Potentials',
+'QLTQ'=>'Top Quotes',
+'CVLVT'=>'Key Metrics',
+'HLT'=>'HelpDesk Top Tickets',
+'OLV'=>'Top Open Activities',
+'GRT'=>'My Group Allocation',
+'OLTSO'=>'Top Sales Orders',
+'ILTI'=>'Top Invoices',
+//Added for 5.0 alpha
+'LBL_GROUP_NAME_ERROR'=>'Group Name already exists!',
+'MNL'=>'My New Leads',
+'LBL_LEAD_VIEW'=>'Default Lead View',
+'LBL_TAG_CLOUD'=>'Tag Cloud',
+'LBL_LIST_TOOLS'=>'Tools',
+'LBL_STATISTICS'=>'Statistics',
+'LBL_TOTAL'=>'Total :',
+'LBL_OTHERS'=>'Others :',
+'LBL_USERS'=>'User(s)',
+'LBL_USER_LOGIN_ROLE'=>'User Login & Role',
+'LBL_USER_MORE_INFN'=>'More Information',
+'LBL_USER_ADDR_INFN'=>'Address Information',
+'LBL_USER_IMAGE'=>'User Image',
+'LBL_USR'=>'Users',
+
+'LBL_MY'=>'My',
+'LBL_MY_DEFAULTS'=>'My Defaults',
+'LBL_MY_DESG'=>'My Designation & Contact Details',
+'LBL_MY_ADDR'=>'My Postal Address',
+'LBL_MY_DETAILS'=>'My Details',
+'LBL_MY_PHOTO'=>'My Photo',
+'LBL_CHANGE_PHOTO'=>'Change Photo...',
+'LBL_CHANGE'=>'Change',
+
+
+//Added for Access Privileges
+
+'LBL_GLOBAL_FIELDS_MANAGER'=>'Global Fields Manager',
+'LBL_GLOBAL_ACCESS_PRIVILEGES'=>'Global Access Privileges',
+'LBL_CUSTOM_ACCESS_PRIVILEGES'=>'Custom Access Privileges',
+'LBL_BOTH'=>'Both',
+'LBL_VIEW'=>'View',
+'LBL_RECALCULATE_BUTTON'=>'Recalculate',
+'LBL_ADD_PRIVILEGES_BUTTON'=>'Add Privileges',
+'LBL_CUSTOM_ACCESS_MESG'=>'No Custom Access Rules defined .',
+'LBL_CREATE_RULE_MESG'=>'to create a new Rule',
+'LBL_SELECT_SCREEN'=>'Select the Screen / Module :',
+'LBL_FIELDS_AVLBL'=>'Fields Available in',
+'LBL_FIELDS_SELECT_DESELECT'=>'Fields to be shown',
+'LBL_ROLE_TO_BE_DELETED'=>'Role to be Deleted',
+'LBL_TRANSFER_USER_ROLE'=>'Transfer Users to Role',
+'LBL_DELETE_ROLE'=>'Delete Role',
+'LBL_MORE_INFORMATION'=>'More Information',
+'LBL_USERLOGIN_ROLE'=>'User Login & Role',
+
+//Added for 5.0 for all fields
+'Role'=>'Role',
+'Email'=>'Email',
+'Admin'=>'Admin',
+'User Name'=>'User Name',
+'First Name'=>'First Name',
+'Last Name'=>'Last Name',
+'Status'=>'Status',
+'Default Activity View'=>'Default Activity View',
+'Default Lead View'=>'Default Lead View',
+'Currency'=>'Currency',
+'Title'=>'Title',
+'Office Phone'=>'Office Phone',
+'Department'=>'Department',
+'Mobile'=>'Mobile',
+'Reports To'=>'Reports To',
+'Other Phone'=>'Other Phone',
+'Other Email'=>'Other Email',
+'Fax'=>'Fax',
+'Yahoo id'=>'Yahoo id',
+'Home Phone'=>'Home Phone',
+'User Image'=>'User Image',
+'Date Format'=>'Date Format',
+'Tag Cloud'=>'Tag Cloud',
+'Signature'=>'Signature',
+'Notes'=>'Notes',
+'Street Address'=>'Street Address',
+'City'=>'City',
+'State'=>'State',
+'Postal Code'=>'Postal Code',
+'Country'=>'Country',
+'Password'=>'Password',
+'Confirm Password'=>'Confirm Password',
+
+);
+
+?>




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 04:13:26 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 08:13:26 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7554 -
	/vtigercrm/trunk/modules/Users/CreateSharingRule.php
Message-ID: <20060627081326.E989B83FC00@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 27 02:13:23 2006
New Revision: 7554

Log:
i18n for sharing access done -ahmed

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

Modified: vtigercrm/trunk/modules/Users/CreateSharingRule.php
==============================================================================
--- vtigercrm/trunk/modules/Users/CreateSharingRule.php (original)
+++ vtigercrm/trunk/modules/Users/CreateSharingRule.php Tue Jun 27 02:13:23 2006
@@ -21,7 +21,10 @@
 $grpDetails=getAllGroupName();
 $combovalues='';
 
+global $mod_strings;
+global $app_strings;
 global $adb;
+
 $mode = $_REQUEST['mode'];
 if(isset($_REQUEST['shareid']) && $_REQUEST['shareid'] != '')
 {	
@@ -41,17 +44,17 @@
 {
 	foreach($roleDetails as $roleid=>$rolename)
 	{
-		$combovalues .='<option value="roles::'.$roleid.'">Roles::'.$rolename[0].'</option>';
-	}
-
-	foreach($roleDetails as $roleid=>$rolename)
-	{
-		$combovalues .='<option value="rs::'.$roleid.'">Roles and Subordinates::'.$rolename[0].'</option>';
+		$combovalues .='<option value="roles::'.$roleid.'">'.$mod_strings[LBL_ROLES].'::'.$rolename[0].'</option>';
+	}
+
+	foreach($roleDetails as $roleid=>$rolename)
+	{
+		$combovalues .='<option value="rs::'.$roleid.'">'.$mod_strings[LBL_ROLES_SUBORDINATES].'::'.$rolename[0].'</option>';
 	}
 
 	foreach($grpDetails as $groupid=>$groupname)
 	{
-		$combovalues .='<option value="groups::'.$groupid.'">Group::'.$groupname.'</option>';
+		$combovalues .='<option value="groups::'.$groupid.'">'.$mod_strings[LBL_GROUP].'::'.$groupname.'</option>';
 	}
 
 	$fromComboValues=$combovalues;
@@ -78,7 +81,7 @@
 				$selected='selected';	
 			}	
 		}
-		$fromComboValues .='<option value="roles::'.$roleid.'" '.$selected.'>Roles::'.$rolename[0].'</option>';
+		$fromComboValues .='<option value="roles::'.$roleid.'" '.$selected.'>'.$mod_strings[LBL_ROLES].'::'.$rolename[0].'</option>';
 	}
 
 	foreach($roleDetails as $roleid=>$rolename)
@@ -93,7 +96,7 @@
 			}	
 		}	
 	
-		$fromComboValues .='<option value="rs::'.$roleid.'" '.$selected.'>Roles and Subordinates::'.$rolename[0].'</option>';
+		$fromComboValues .='<option value="rs::'.$roleid.'" '.$selected.'>'.$mod_strings[LBL_ROLES_SUBORDINATES].'::'.$rolename[0].'</option>';
 	}
 
 	foreach($grpDetails as $groupid=>$groupname)
@@ -108,7 +111,7 @@
 		}	
 		
 
-		$fromComboValues .='<option value="groups::'.$groupid.'" '.$selected.'>Group::'.$groupname.'</option>';
+		$fromComboValues .='<option value="groups::'.$groupid.'" '.$selected.'>'.$mod_strings[LBL_GROUP].'::'.$groupname.'</option>';
 	}
 
 	//constructing the to combo values
@@ -127,7 +130,7 @@
 				$selected='selected';	
 			}	
 		}
-		$toComboValues .='<option value="roles::'.$roleid.'" '.$selected.'>Roles::'.$rolename[0].'</option>';
+		$toComboValues .='<option value="roles::'.$roleid.'" '.$selected.'>'.$mod_strings[LBL_ROLES].'::'.$rolename[0].'</option>';
 	}
 
 	foreach($roleDetails as $roleid=>$rolename)
@@ -142,7 +145,7 @@
 			}	
 		}	
 	
-		$toComboValues .='<option value="rs::'.$roleid.'" '.$selected.'>Roles and Subordinates::'.$rolename[0].'</option>';
+		$toComboValues .='<option value="rs::'.$roleid.'" '.$selected.'>'.$mod_strings[LBL_ROLES_SUBORDINATES].'::'.$rolename[0].'</option>';
 	}
 
 	foreach($grpDetails as $groupid=>$groupname)
@@ -157,7 +160,7 @@
 		}	
 		
 
-		$toComboValues .='<option value="groups::'.$groupid.'" '.$selected.'>Group::'.$groupname.'</option>';
+		$toComboValues .='<option value="groups::'.$groupid.'" '.$selected.'>'.$mod_strings[LBL_GROUP].'::'.$groupname.'</option>';
 	}
 
 }
@@ -201,11 +204,11 @@
 			}
 		}	
 
-		$relatedlistscombo.='<tr><td align="right" nowrap style="padding-right:10px;"><b>'.$rel_module.' :</b></td>
+		$relatedlistscombo.='<tr><td align="right" nowrap style="padding-right:10px;"><b>'.$app_strings[$rel_module].' :</b></td>
 			<td width="70%">';
-		$relatedlistscombo.='<select id="'.$rel_module.'_accessopt" name="'.$rel_module.'_accessopt" onChange=fnwriteRules("'.$sharing_module.'","'.$relatedmodule.'")>
-			<option value="0" '.$ro_selected.' >Read Only</option>
-			<option value="1" '.$rw_selected.' >Read/Write</option>
+		$relatedlistscombo.='<select id="'.$rel_module.'_accessopt" name="'.$rel_module.'_accessopt" onChange=fnwriteRules("'.$app_strings[$sharing_module].'","'.$relatedmodule.'")>
+			<option value="0" '.$ro_selected.' >'.$mod_strings["Read Only "].'</option>
+			<option value="1" '.$rw_selected.' >'.$mod_strings["Read/Write"].'</option>
 			</select></td></tr>';
 
 
@@ -215,8 +218,8 @@
 
 if($mode == 'create')
 {
-	$sharPerCombo = '<option value="0" selected>Read Only</option>';
-        $sharPerCombo .= '<option value="1">Read/Write</option>';
+	$sharPerCombo = '<option value="0" selected>'.$mod_strings["Read Only "].'</option>';
+        $sharPerCombo .= '<option value="1">'.$mod_strings["Read/Write"].'</option>';
 }
 elseif($mode == 'edit')
 {
@@ -231,8 +234,8 @@
 		$selected2='selected';
 	}
 
-	$sharPerCombo = '<option value="0" '.$selected1.'>Read Only</option>';
-        $sharPerCombo .= '<option value="1" '.$selected2.'>Read/Write</option>';	
+	$sharPerCombo = '<option value="0" '.$selected1.'>'.$mod_strings["Read Only "].'</option>';
+        $sharPerCombo .= '<option value="1" '.$selected2.'>'.$mod_strings["Read/Write"].'</option>';	
 }
 
 	
@@ -247,13 +250,13 @@
 <div id="sharingRule" class="fixedLay">
 <table width="100%" border="0" cellpadding="3" cellspacing="0">
 <tr>
-<td class="genHeaderSmall" align="left" style="border-bottom:1px solid #CCCCCC;" width="60%">'.$sharing_module.' - Add Custom Privilege Rule</td>
-<td align="right" style="border-bottom:1px solid #CCCCCC;" width="40%"><a href="javascript:onClick=hide(\'sharingRule\')";>Close</a></td>
+<td class="genHeaderSmall" align="left" style="border-bottom:1px solid #CCCCCC;" width="60%">'.$app_strings[$sharing_module].' - '.$mod_strings[LBL_ADD_CUSTOM_RULE].'</td>
+<td align="right" style="border-bottom:1px solid #CCCCCC;" width="40%"><a href="javascript:onClick=hide(\'sharingRule\')";>'.$mod_strings[LBL_CLOSE].'</a></td>
 
 </tr>
 <tr><td colspan="2">&nbsp;</td></tr>
 <tr>
-<td><b>Step 1 :'.$sharing_module.'  of </b>(Select an entity below)</td>
+<td><b>'.$mod_strings[LBL_STEP].' 1 : '.$app_strings[$sharing_module].' '.$app_strings[LBL_LIST_OF].' </b>('.$mod_strings[LBL_SELECT_ENTITY].')</td>
 <td>&nbsp;</td>
 
 </tr>
@@ -261,7 +264,7 @@
 <td style="padding-left:20px;text-align:left;">';
 //combovalues
 
-$output.='<select id="'.$sharing_module.'_share" name="'.$sharing_module.'_share" onChange=fnwriteRules("'.$sharing_module.'","'.$relatedmodule.'")>'.$fromComboValues.'</select>';	
+$output.='<select id="'.$sharing_module.'_share" name="'.$sharing_module.'_share" onChange=fnwriteRules("'.$app_strings[$sharing_module].'","'.$relatedmodule.'")>'.$fromComboValues.'</select>';	
 $output.='</td>
 
 <td>&nbsp;</td>
@@ -269,19 +272,19 @@
 <tr><td colspan="2">&nbsp;</td></tr>
 <tr>
 
-<td style="text-align:left;"><b>Step 2 : Can be accessed by</b>(Select an entity below)</td>
-<td align="left"><b>Permissions</b></td>
+<td style="text-align:left;"><b>'.$mod_strings[LBL_STEP].' 2 : '.$mod_strings[LBL_CAN_BE_ACCESSED_BY].' </b>('.$mod_strings[LBL_SELECT_ENTITY].')</td>
+<td align="left"><b>'.$mod_strings[LBL_PERMISSIONS].'</b></td>
 </tr>
 <tr>
 <td style="padding-left:20px;text-align:left;">
 
-<select id="'.$sharing_module.'_access" name="'.$sharing_module.'_access" onChange=fnwriteRules("'.$sharing_module.'","'.$relatedmodule.'")>';
+<select id="'.$sharing_module.'_access" name="'.$sharing_module.'_access" onChange=fnwriteRules("'.$app_strings[$sharing_module].'","'.$relatedmodule.'")>';
 
 $output.=$toComboValues.'</select>
 
 </td><td>
 
-<select	id="share_memberType" name="share_memberType" onChange=fnwriteRules("'.$sharing_module.'","'.$relatedmodule.'")>';
+<select	id="share_memberType" name="share_memberType" onChange=fnwriteRules("'.$app_strings[$sharing_module].'","'.$relatedmodule.'")>';
 $output .= $sharPerCombo;
 $output .= '</select>
 
@@ -289,7 +292,7 @@
 </tr>
 <tr><td colspan="2">&nbsp;</td></tr>
 <tr>
-<td style="text-align:left;"><b>Step 3 : Access rights for relative modules </b></td>
+<td style="text-align:left;"><b>'.$mod_strings[LBL_STEP].' 3 : '.$mod_strings[LBL_ACCESS_RIGHTS_FOR_MODULES].' </b></td>
 <td>&nbsp;</td>
 
 </tr>
@@ -305,7 +308,7 @@
 </tr>
 <tr><td colspan="2" align="left">&nbsp;</td></tr>
 <tr>
-<td colspan="2" class="detailedViewHeader"><b>Rule Construction Display</b></td>
+<td colspan="2" class="detailedViewHeader"><b>'.$mod_strings[LBL_RULE_CONSTRUCTION].'</b></td>
 
 </tr>
 <tr>
@@ -318,7 +321,7 @@
 </tr>
 <tr>
 <td colspan="2" align="center">
-<input type="submit" class="crmButton small save" name="add" value="Add Rule" onClick="return validate()">&nbsp;&nbsp;
+<input type="submit" class="crmButton small save" name="add" value="'.$mod_strings[LBL_ADD_RULE].'" onClick="return validate()">&nbsp;&nbsp;
 </td>
 </tr>
 </table>




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 04:14:30 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 08:14:30 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7555 - in /vtigercrm/trunk:
 Smarty/templates/ComposeEmail.tpl include/fckeditor/fckeditor.js
 modules/Emails/EditView.php modules/Users/TemplateMerge.php
 modules/Users/lookupemailtemplates.php
Message-ID: <20060627081430.44ED483FC00@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 27 02:14:22 2006
New Revision: 7555

Log:
Template Merge Integrated

Modified:
    vtigercrm/trunk/Smarty/templates/ComposeEmail.tpl
    vtigercrm/trunk/include/fckeditor/fckeditor.js
    vtigercrm/trunk/modules/Emails/EditView.php
    vtigercrm/trunk/modules/Users/TemplateMerge.php
    vtigercrm/trunk/modules/Users/lookupemailtemplates.php

Modified: vtigercrm/trunk/Smarty/templates/ComposeEmail.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ComposeEmail.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ComposeEmail.tpl Tue Jun 27 02:14:22 2006
@@ -20,6 +20,7 @@
 <link REL="SHORTCUT ICON" HREF="include/images/vtigercrm_icon.ico">	
 <style type="text/css">@import url("themes/{$THEME}/style.css");</style>
 <script language="javascript" type="text/javascript" src="include/scriptaculous/prototype.js"></script>
+<script type="text/javascript" src="include/fckeditor/fckeditor.js"></script>
 </head>
 <body marginheight="0" marginwidth="0" topmargin="0" bottommargin="0" leftmargin="0" rightmargin="0">
 <form name="EditView" method="POST" ENCTYPE="multipart/form-data" action="index.php">
@@ -107,12 +108,11 @@
    </tr>
 	{elseif $elements.2.0 eq 'description'}
    <tr>
-	<td colspan="3" align="center" height="320">
-        <input id="description___Config" value="" style="display: none;" type="hidden"><iframe id="description___Frame" src="include/fckeditor/editor/fckeditor.html?InstanceName=description&amp;Toolbar=Default" frameborder="no" height="370" scrolling="no" width="100%"></iframe>
+	<td colspan="3" align="center" valign="top" height="320">
         {if $WEBMAIL eq 'true'}
                 <textarea style="display: none;" class="detailedViewTextBox" name="description" cols="90" rows="8">{$DESCRIPTION}</textarea>
         {else}
-                <textarea style="display: none;" class="detailedViewTextBox" name="description" cols="90" rows="8">{$elements.3.0}</textarea>        {/if}
+                <textarea style="display: none;" class="detailedViewTextBox" id="description" name="description" cols="90" rows="16">{$elements.3.0}</textarea>        {/if}
 	</td>
    </tr>
 	{/if}
@@ -182,6 +182,13 @@
                 }
         );
 }
+
+</script>
+<script type="text/javascript" defer="1">
+var oFCKeditor = null;
+oFCKeditor = new FCKeditor( "description" ,"100%","370") ;
+oFCKeditor.BasePath   = "include/fckeditor/" ;
+oFCKeditor.ReplaceTextarea();
 </script>
 {/literal}
 </html>

Modified: vtigercrm/trunk/include/fckeditor/fckeditor.js
==============================================================================
--- vtigercrm/trunk/include/fckeditor/fckeditor.js (original)
+++ vtigercrm/trunk/include/fckeditor/fckeditor.js Tue Jun 27 02:14:22 2006
@@ -27,7 +27,7 @@
 	// Properties
 	this.InstanceName	= instanceName ;
 	this.Width			= width			|| '100%' ;
-	this.Height			= height		|| '200' ;
+	this.Height			= height		|| '370' ;
 	this.ToolbarSet		= toolbarSet	|| 'Default' ;
 	this.Value			= value			|| '' ;
 	this.BasePath		= '/fckeditor/' ;
@@ -71,6 +71,11 @@
 
 FCKeditor.prototype.ReplaceTextarea = function()
 {
+	if(document.getElementById('description___Config') != null)	
+	{
+		document.getElementById('description___Config').parentNode.removeChild(document.getElementById('description___Config'));
+		document.getElementById('description___Frame').parentNode.removeChild(document.getElementById('description___Frame'));
+	}
 	if ( !this.CheckBrowser || this._IsCompatibleBrowser() )
 	{
 		// We must check the elements firstly using the Id and then the name.
@@ -189,4 +194,4 @@
 	text = text.replace(/'/g, "&#39;") ;
 
 	return text ;
-}
+}

Modified: vtigercrm/trunk/modules/Emails/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/EditView.php (original)
+++ vtigercrm/trunk/modules/Emails/EditView.php Tue Jun 27 02:14:22 2006
@@ -153,17 +153,9 @@
 
 $disp_view = getView($focus->mode);
 $details = getBlocks($currentModule,$disp_view,$mode,$focus->column_fields);
-if(isset($_REQUEST['templateid']) && $_REQUEST['templateid'] !='')
-{
-	$templatedetails = getTemplateDetails($_REQUEST['templateid']);
-	$details['Email Information'][2][0][3][0] = $templatedetails[2]; //Subject	
-	$details['Email Information'][3][0][3][0] = nl2br($templatedetails[1]);	//Body
-}
 $smarty->assign("BLOCKS",$details['Email Information']);
 $smarty->assign("MODULE",$currentModule);
 $smarty->assign("SINGLE_MOD",$app_strings['Email']);
-//Display the FCKEditor or not? -- configure $FCKEDITOR_DISPLAY in config.php 
-$smarty->assign("FCKEDITOR_DISPLAY",$FCKEDITOR_DISPLAY);
 
 
 //needed when creating a new email with default values passed in
@@ -248,24 +240,9 @@
         $smarty->assign("FILENAME", $focus->filename);
 }
 
-if(isset($focus->parent_type) && $focus->parent_type != "") 
-{
-	$change_parent_button = "<input title='".$app_strings['LBL_CHANGE_BUTTON_TITLE']."' tabindex='2' accessKey='".$app_strings['LBL_CHANGE_BUTTON_KEY']."' type='button' class='button' value='".$app_strings['LBL_CHANGE_BUTTON_LABEL']."' name='button' LANGUAGE=javascript onclick='return window.open(\"index.php?module=\"+ document.EditView.parent_type.value + \"&action=Popup&html=Popup_picker&form=TasksEditView\",\"test\",\"width=600,height=400,resizable=1,scrollbars=1\");'>";
-	$smarty->assign("CHANGE_PARENT_BUTTON", $change_parent_button);
-}
-
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
 
 $smarty->display("ComposeEmail.tpl");
 ?>
-<script type="text/javascript" defer="1">
-addOnloadEvent(function () {
-	var oFCKeditor = null;
-	oFCKeditor = new FCKeditor("description") ;
-	oFCKeditor.BasePath  = "include/fckeditor/" ;
-	oFCKeditor.Height = 500;
-	oFCKeditor.Width = "100%";
-	oFCKeditor.ReplaceTextarea();
-});
-</script>
+

Modified: vtigercrm/trunk/modules/Users/TemplateMerge.php
==============================================================================
--- vtigercrm/trunk/modules/Users/TemplateMerge.php (original)
+++ vtigercrm/trunk/modules/Users/TemplateMerge.php Tue Jun 27 02:14:22 2006
@@ -8,18 +8,23 @@
  * All Rights Reserved.
 *
  ********************************************************************************/
-require_once('include/utils/UserInfoUtil.php');
-require_once('modules/Emails/templates/testemailtemplateusage.php');
-$replacedString = substituteTokens("".$_REQUEST["templatename"],$globals);
+require_once('include/utils/CommonUtils.php');
+if(isset($_REQUEST['templateid']) && $_REQUEST['templateid'] !='')
+{
+	$templatedetails = getTemplateDetails($_REQUEST['templateid']);
+	//$details['Email Information'][2][0][3][0] = $templatedetails[2]; //Subject
+	//$details['Email Information'][3][0][3][0] = nl2br($templatedetails[1]); //Body
+}
 ?>
 <form name="frmrepstr">
+<input type="hidden" name="subject" value="<?echo $templatedetails[2];?>"></input>
 <textarea name="repstr" style="visibility:hidden">
-<?php echo chop($replacedString); ?>
+<?php echo nl2br($templatedetails[1]); ?>
 </textarea>
 </form>
 <script language="javascript">
-opener.document.EditView.description.value=document.frmrepstr.repstr.value
-//opener.oFCKeditor.ReplaceTextarea() ;
-window.close()
+window.opener.document.getElementById('subject').value = window.document.frmrepstr.subject.value
+window.opener.document.getElementById('description').value = window.document.frmrepstr.repstr.value
+opener.oFCKeditor.ReplaceTextarea();
+window.close();
 </script>
-

Modified: vtigercrm/trunk/modules/Users/lookupemailtemplates.php
==============================================================================
--- vtigercrm/trunk/modules/Users/lookupemailtemplates.php (original)
+++ vtigercrm/trunk/modules/Users/lookupemailtemplates.php Tue Jun 27 02:14:22 2006
@@ -56,8 +56,7 @@
 <script>
 function submittemplate(templateid)
 {
-	window.opener.location.href = window.opener.location.href +'&templateid='+templateid;
-	self.close();
+	window.document.location.href = 'index.php?module=Users&action=UsersAjax&file=TemplateMerge&templateid='+templateid;
 }
 </script>
 </html>




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 04:18:33 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 08:18:33 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7556 -
 /vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl
Message-ID: <20060627081833.1FB1E83FC2F@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 27 02:18:29 2006
New Revision: 7556

Log:
update org sharing tpl file

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

Modified: vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl Tue Jun 27 02:18:29 2006
@@ -225,8 +225,8 @@
 		var select1 = tagName.options[tagName.selectedIndex].text;
 		var select2 = tagName2.options[tagName2.selectedIndex].text;
 		var select3 = tagName3.options[tagName3.selectedIndex].text;
-		soucre.innerHTML = module +" of <b>\"" + select1 + "\"</b> can be accessed by <b>\"" +select2 + "\"</b> in the permission "+select3;
-		soucre1.innerHTML = "<b>Related Module Rights</b> "+ relatedstring;
+		soucre.innerHTML = module +" {$APP.LBL_LIST_OF} <b>\"" + select1 + "\"</b> {$CMOD.LBL_CAN_BE_ACCESSED} <b>\"" +select2 + "\"</b> {$CMOD.LBL_IN_PERMISSION} "+select3;
+		soucre1.innerHTML = "<b>{$CMOD.LBL_RELATED_MODULE_RIGHTS}</b> " + relatedstring;
 {rdelim}
 
 </script>




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 04:20:34 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 08:20:34 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7557 -
	/vtigercrm/trunk/Smarty/templates/SetMenu.tpl
Message-ID: <20060627082034.DC7F083FC00@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 27 02:20:31 2006
New Revision: 7557

Log:
updated setmenufile

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

Modified: vtigercrm/trunk/Smarty/templates/SetMenu.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/SetMenu.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/SetMenu.tpl Tue Jun 27 02:20:31 2006
@@ -97,7 +97,7 @@
 				{if $smarty.request.action eq 'OrganizationTermsandConditions' || $smarty.request.action eq 'savetermsandconditions'}
 				<tr><td class="settingsTabSelected" nowrap>{$MOD.LBL_INVENTORY_TANDC}</td></tr>
 				{else}
-				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=OrganizationTermsandConditions&parenttab=Settings">{$MOD.INVENTORYTERMSANDCONDITIONS}</a></td></tr>
+				<tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=OrganizationTermsandConditions&parenttab=Settings">{$MOD.INVENTORY_TANDC}</a></td></tr>
 				{/if}
 
 	




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 04:55:55 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 08:55:55 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7558 - in
 /vtigertoolbar/trunk/firefox/chrome/content: create_note.xul
 create_product.xul create_rss.xul create_site.xul create_vendor.xul
Message-ID: <20060627085555.B098083FD05@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 27 02:55:49 2006
New Revision: 7558

Log:
init version

Added:
    vtigertoolbar/trunk/firefox/chrome/content/create_note.xul
    vtigertoolbar/trunk/firefox/chrome/content/create_product.xul
    vtigertoolbar/trunk/firefox/chrome/content/create_rss.xul
    vtigertoolbar/trunk/firefox/chrome/content/create_site.xul
    vtigertoolbar/trunk/firefox/chrome/content/create_vendor.xul




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 05:03:45 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 09:03:45 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7559 -
	/vtigercrm/trunk/soap/firefoxtoolbar.php
Message-ID: <20060627090345.07F2F83FD08@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 27 03:03:42 2006
New Revision: 7559

Log:
proper formatting and access denial message

Modified:
    vtigercrm/trunk/soap/firefoxtoolbar.php

Modified: vtigercrm/trunk/soap/firefoxtoolbar.php
==============================================================================
--- vtigercrm/trunk/soap/firefoxtoolbar.php (original)
+++ vtigercrm/trunk/soap/firefoxtoolbar.php Tue Jun 27 03:03:42 2006
@@ -19,7 +19,7 @@
 
 $NAMESPACE = 'http://www.vtiger.com/vtigercrm/';
 $server = new soap_server;
-
+$accessDenied = "You are not authorized for performing this action";
 $server->configureWSDL('vtigersoap');
 
 $server->register(
@@ -134,7 +134,11 @@
 		return 'Thank you for your interest. Information has been successfully added as Portal';
 		else
 		return "Portal creation failed. Try again";
-		}
+	}
+	else
+	{
+		return $accessDenied;
+	}
 }
 
 
@@ -147,19 +151,24 @@
 	$oRss = new vtigerRSS();
 	if(isPermitted("RSS","EditView") == "yes")
 	{
-	if($oRss->setRSSUrl($url))
-	{
-		if($oRss->saveRSSUrl($url) == false)
+		if($oRss->setRSSUrl($url))
 		{
-			return "RSS creation failed. Try again";
-		}
-		else
-		{
-			return 'Thank you for your interest. Information has been successfully added as RSS.';
-        	}
-
-	}
-	}
+			if($oRss->saveRSSUrl($url) == false)
+			{
+				return "RSS creation failed. Try again";
+			}
+			else
+			{
+					return 'Thank you for your interest. Information has been successfully added as RSS.';
+			}
+
+	       }
+	}
+	else
+	{
+		return $accessDenied;
+	}
+
 }
 
 
@@ -172,20 +181,25 @@
 	$focus = new Note();
 	if(isPermitted("Notes","EditView") == "yes")
 	{
-	$focus->column_fields['title'] = $subject;
-	$focus->column_fields['notecontent'] = $desc;
-
-	$focus->save("Notes");
-	
-	$focus->retrieve_entity_info($focus->id,"Notes");
-
-	$adb->println("Create New Note from Web Form - Ends");
-
-	if($focus->id != '')
+		$focus->column_fields['title'] = $subject;
+		$focus->column_fields['notecontent'] = $desc;
+
+		$focus->save("Notes");
+
+		$focus->retrieve_entity_info($focus->id,"Notes");
+
+		$adb->println("Create New Note from Web Form - Ends");
+
+		if($focus->id != '')
 		return 'Thank you for your interest. Information has been successfully added as Note.';
-	else
+		else
 		return "Note creation failed. Try again";
-		}
+	}
+	else
+	{
+		return $accessDenied;
+	}
+
 }
 
 
@@ -214,7 +228,13 @@
 		return 'Thank you for your interest. Information has been successfully added as Product.';
 		else
 		return "Product creation failed. Try again";
-		}
+	}
+	else
+	{
+		return $accessDenied;
+	}
+
+	
 }
 
 
@@ -243,7 +263,13 @@
 		return 'Thank you for your interest. Information has been successfully added as Vendor.';
 		else
 		return "Vendor creation failed. Try again";
-		}
+       }		
+       else
+	{
+		return $accessDenied;
+	}
+
+	
 }
 
 
@@ -277,7 +303,13 @@
 		$ticket->save("HelpDesk");
 
 		return $ticket->id;
-		}
+	}
+	else
+	{
+		return $accessDenied;
+	}
+
+
 }
 
 function create_account($username,$accountname,$email,$phone,$primary_address_street,$primary_address_city,$primary_address_state,$primary_address_postalcode,$primary_address_country)
@@ -304,6 +336,12 @@
 		$account->save('Accounts');
 		return $account->id;
 	}
+	else
+	{
+		return $accessDenied;
+	}
+
+
 }
 
 
@@ -322,22 +360,28 @@
 	require_once("modules/Leads/Lead.php");
 
 	$focus = new Lead();
-	 if(isPermitted("Leads","EditView") == "yes")
-	     {
-	$focus->column_fields['lastname'] = $lastname;
-	$focus->column_fields['email'] = $email;
-	$focus->column_fields['phone'] = $phone;
-	$focus->column_fields['company'] = $company;
-	$focus->column_fields['country'] = $country;
-	$focus->column_fields['description'] = $description;
-	$focus->save("Leads");
-	$focus->retrieve_entity_info($focus->id,"Leads");
-	$adb->println("Create New Lead from Web Form - Ends");
-	     }
-	if($focus->id != '')
+	if(isPermitted("Leads","EditView") == "yes")
+	{
+		$focus->column_fields['lastname'] = $lastname;
+		$focus->column_fields['email'] = $email;
+		$focus->column_fields['phone'] = $phone;
+		$focus->column_fields['company'] = $company;
+		$focus->column_fields['country'] = $country;
+		$focus->column_fields['description'] = $description;
+		$focus->save("Leads");
+		$focus->retrieve_entity_info($focus->id,"Leads");
+		$adb->println("Create New Lead from Web Form - Ends");
+		if($focus->id != '')
 		return 'Thank you for your interest. Information has been successfully added as Lead.';
-	else
+		else
 		return "Lead creation failed. Try again";
+     }
+	else
+	{
+		return $accessDenied;
+	}
+
+
 }
 
 function create_contacts($user_name,$output_list)
@@ -370,54 +414,60 @@
 	$adb->println("OUTLOOK: The user id is ".$current_user->id);
 	
 	require_once('modules/Contacts/Contact.php');
-	 if(isPermitted("Contacts","EditView") == "yes")
+     if(isPermitted("Contacts","EditView") == "yes")
      {
 
-	$contact = new Contact();
-
-	$contact->column_fields[firstname]=$first_name;
-	$contact->column_fields[lastname]=$last_name;
-		
-	$contact->column_fields[account_id]=retrieve_account_id($account_name,$user_id);// NULL value is not supported NEED TO FIX
-	
-	$contact->column_fields[salutation]=$salutation;
-	// EMAIL IS NOT ADDED
-	$contact->column_fields[title]=$title;
-	$contact->column_fields[email]=$email_address;
-	
-	
-	$contact->column_fields[mobile]=$phone_mobile;
-	$contact->column_fields[reports_to_id] =retrievereportsto($reports_to,$user_id,$account_id);// NOT FIXED IN SAVEENTITY.PHP
-	$contact->column_fields[mailingstreet]=$primary_address_street;
-	$contact->column_fields[mailingcity]=$primary_address_city;
-	$contact->column_fields[mailingcountry]=$primary_address_country;
-	$contact->column_fields[mailingstate]=$primary_address_state;
-	$contact->column_fields[mailingzip]=$primary_address_postalcode;
-
-	$contact->column_fields[otherstreet]=$alt_address_street;
-	$contact->column_fields[othercity]=$alt_address_city;
-	$contact->column_fields[othercountry]=$alt_address_country;
-	$contact->column_fields[otherstate]=$alt_address_state;
-	$contact->column_fields[otherzip]=$alt_address_postalcode;
-
-	$contact->column_fields[assigned_user_id]=$user_id;
-
-    // new Fields
-    $contact->column_fields[phone]= $office_phone;
-    $contact->column_fields[homephone]= $home_phone;
-    $contact->column_fields[otherphone]= $other_phone;
-    $contact->column_fields[fax]= $fax;
-    $contact->column_fields[department]=$department;
-    $contact->column_fields[birthday]= getDisplayDate($birthdate);
-    $contact->column_fields[assistant]= $assistant_name;
-    $contact->column_fields[assistantphone]= $assistant_phone;
-    $contact->column_fields[description]= $description;
-
-	//$contact->saveentity("Contacts");
-	$contact->save("Contacts");
-
-	return $contact->id;
-	}
+	     $contact = new Contact();
+
+	     $contact->column_fields[firstname]=$first_name;
+	     $contact->column_fields[lastname]=$last_name;
+
+	     $contact->column_fields[account_id]=retrieve_account_id($account_name,$user_id);// NULL value is not supported NEED TO FIX
+
+	     $contact->column_fields[salutation]=$salutation;
+	     // EMAIL IS NOT ADDED
+	     $contact->column_fields[title]=$title;
+	     $contact->column_fields[email]=$email_address;
+
+
+	     $contact->column_fields[mobile]=$phone_mobile;
+	     $contact->column_fields[reports_to_id] =retrievereportsto($reports_to,$user_id,$account_id);// NOT FIXED IN SAVEENTITY.PHP
+	     $contact->column_fields[mailingstreet]=$primary_address_street;
+	     $contact->column_fields[mailingcity]=$primary_address_city;
+	     $contact->column_fields[mailingcountry]=$primary_address_country;
+	     $contact->column_fields[mailingstate]=$primary_address_state;
+	     $contact->column_fields[mailingzip]=$primary_address_postalcode;
+
+	     $contact->column_fields[otherstreet]=$alt_address_street;
+	     $contact->column_fields[othercity]=$alt_address_city;
+	     $contact->column_fields[othercountry]=$alt_address_country;
+	     $contact->column_fields[otherstate]=$alt_address_state;
+	     $contact->column_fields[otherzip]=$alt_address_postalcode;
+
+	     $contact->column_fields[assigned_user_id]=$user_id;
+
+	     // new Fields
+	     $contact->column_fields[phone]= $office_phone;
+	     $contact->column_fields[homephone]= $home_phone;
+	     $contact->column_fields[otherphone]= $other_phone;
+	     $contact->column_fields[fax]= $fax;
+	     $contact->column_fields[department]=$department;
+	     $contact->column_fields[birthday]= getDisplayDate($birthdate);
+	     $contact->column_fields[assistant]= $assistant_name;
+	     $contact->column_fields[assistantphone]= $assistant_phone;
+	     $contact->column_fields[description]= $description;
+
+	     //$contact->saveentity("Contacts");
+	     $contact->save("Contacts");
+
+	     return $contact->id;
+     }
+	else
+	{
+		return $accessDenied;
+	}
+
+
 }
 
 




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 05:04:31 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 09:04:31 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7560 -
	/vtigercrm/trunk/soap/firefoxtoolbar.php
Message-ID: <20060627090431.C425483FD08@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 27 03:04:27 2006
New Revision: 7560

Log:
removed unwanted import

Modified:
    vtigercrm/trunk/soap/firefoxtoolbar.php

Modified: vtigercrm/trunk/soap/firefoxtoolbar.php
==============================================================================
--- vtigercrm/trunk/soap/firefoxtoolbar.php (original)
+++ vtigercrm/trunk/soap/firefoxtoolbar.php Tue Jun 27 03:04:27 2006
@@ -13,7 +13,6 @@
 require_once('include/logging.php');
 require_once('include/nusoap/nusoap.php');
 require_once('include/database/PearDatabase.php');
-require_once('modules/HelpDesk/HelpDesk.php');
 
 $log = &LoggerManager::getLogger('firefoxlog');
 




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 05:07:48 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 09:07:48 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7561 -
	/vtigercrm/trunk/soap/thunderbirdplugin.php
Message-ID: <20060627090748.59BF683FD08@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 27 03:07:44 2006
New Revision: 7561

Log:
added security check to 1 method alone

Modified:
    vtigercrm/trunk/soap/thunderbirdplugin.php

Modified: vtigercrm/trunk/soap/thunderbirdplugin.php
==============================================================================
--- vtigercrm/trunk/soap/thunderbirdplugin.php (original)
+++ vtigercrm/trunk/soap/thunderbirdplugin.php Tue Jun 27 03:07:44 2006
@@ -16,6 +16,7 @@
 
 $log = &LoggerManager::getLogger('thunderbirdplugin');
 
+$accessDenied = "You are not authorized for performing this action";
 $NAMESPACE = 'http://www.vtiger.com/vtigercrm/';
 $server = new soap_server;
 
@@ -50,38 +51,46 @@
 	
 	$date_sent = getDisplayDate($date_sent);
 
-	require_once('modules/Emails/Email.php');
-	
-	$email = new Email();
+	if(isPermitted("Emails","EditView") == "yes")
+	{
+		require_once('modules/Emails/Email.php');
 
-	$email_body = str_replace("'", "''", $email_body);
-	$email_subject = str_replace("'", "''", $email_subject);
-	
-	//fixed subject issue 9/6/05
-	$email->column_fields[activitytype]='Emails';
-	$email->column_fields[subject]=$email_subject;
-	$email->column_fields[assigned_user_id] = $user_id;
-	$email->column_fields[date_start] = $date_sent;
-	$email->column_fields[description]  = $email_body;
+		$email = new Email();
 
-	
-	// Save one copy of the email message
-	//$email->saveentity("Emails");
-	$email->save("Emails");
+		$email_body = str_replace("'", "''", $email_body);
+		$email_subject = str_replace("'", "''", $email_subject);
+
+		//fixed subject issue 9/6/05
+		$email->column_fields[activitytype]='Emails';
+		$email->column_fields[subject]=$email_subject;
+		$email->column_fields[assigned_user_id] = $user_id;
+		$email->column_fields[date_start] = $date_sent;
+		$email->column_fields[description]  = $email_body;
 
 
-	
-	// for each contact, add a link between the contact and the email message
-	$contact_id_list = explode(";", $contact_ids);
+		// Save one copy of the email message
+		//$email->saveentity("Emails");
+		$email->save("Emails");
 
-	foreach( $contact_id_list as $contact_id)
+
+
+		// for each contact, add a link between the contact and the email message
+		$contact_id_list = explode(";", $contact_ids);
+
+		foreach( $contact_id_list as $contact_id)
+		{
+			$email->set_emails_contact_invitee_relationship($email->id, $contact_id);
+			$email->set_emails_se_invitee_relationship($email->id,$contact_id);
+			}
+			$email->set_emails_user_invitee_relationship($email->id, $user_id);
+
+			return $email->id;
+	}
+	else
 	{
-		$email->set_emails_contact_invitee_relationship($email->id, $contact_id);
-		$email->set_emails_se_invitee_relationship($email->id,$contact_id);
+		return $accessDenied;
 	}
-	$email->set_emails_user_invitee_relationship($email->id, $user_id);
-	
-	return $email->id;
+
 }
 
 




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 05:09:30 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 09:09:30 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7562 -
	/vtigercrm/trunk/soap/wordplugin.php
Message-ID: <20060627090930.B71AD83FD03@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 27 03:09:27 2006
New Revision: 7562

Log:
added security checks

Modified:
    vtigercrm/trunk/soap/wordplugin.php

Modified: vtigercrm/trunk/soap/wordplugin.php
==============================================================================
--- vtigercrm/trunk/soap/wordplugin.php (original)
+++ vtigercrm/trunk/soap/wordplugin.php Tue Jun 27 03:09:27 2006
@@ -18,7 +18,7 @@
 
 $NAMESPACE = 'http://www.vtiger.com/vtigercrm/';
 $server = new soap_server;
-
+$accessDenied = "You are not permitted to perform this action";
 $server->configureWSDL('vtigersoap');
 
 $server->register(
@@ -89,6 +89,9 @@
 	    $contact = new Contact();
 	    return $contact->getColumnNames();	   
     }
+ else
+    return null;
+
 }
 
 
@@ -100,6 +103,9 @@
 	    $account = new Account();
 	    return $account->getColumnNames_Acnt();
     }
+ else
+    return null;
+
 }
 
 
@@ -111,6 +117,9 @@
     $lead = new Lead();
     return $lead->getColumnNames_Lead();
     }
+ else
+    return null;
+
 }
 
 function get_user_columns($user_name, $password)
@@ -122,6 +131,9 @@
     $user = new User();
     return $user->getColumnNames_User();
     }
+ else
+    return null;
+
 }
 
 




From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 27 05:25:27 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 27 Jun 2006 09:25:27 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231098=3A?=
 =?utf-8?q?_Security_is_not_implemented_for_New_Emails?=
In-Reply-To: <076.9338ecb11bbd664fc8df6eb42c9a07c1@vtiger.fosslabs.com>
References: <076.9338ecb11bbd664fc8df6eb42c9a07c1@vtiger.fosslabs.com>
Message-ID: <085.e69e05941229b566b9e037999c47154e@vtiger.fosslabs.com>

#1098: Security is not implemented for New Emails
---------------------------+------------------------------------------------
  Reporter:  jerrydgeorge  |       Owner:  don   
      Type:  defect        |      Status:  closed
  Priority:  critical      |   Milestone:        
 Component:  vtigercrm     |     Version:  5.0.0 
Resolution:  fixed         |    Keywords:        
---------------------------+------------------------------------------------
Changes (by don):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1098>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 05:27:38 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 09:27:38 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7563 -
 /vtigercrm/trunk/modules/Home/language/en_us.lang.php
Message-ID: <20060627092738.BAA8483FD03@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 27 03:27:35 2006
New Revision: 7563

Log:
Updated lang file

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

Modified: vtigercrm/trunk/modules/Home/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Home/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Home/language/en_us.lang.php Tue Jun 27 03:27:35 2006
@@ -43,7 +43,7 @@
 'LBL_LEADS_BY_SOURCE'=>'Leads By Source',
 'LBL_LEADS_BY_STATUS'=>'Leads By Status',
 
-'lBL_UPCOMING_EVENTS'=>'Upcoming Activities',
+'LBL_UPCOMING_EVENTS'=>'Upcoming Activities',
 'LBL_PENDING_EVENTS'=>'Pending Activities',
 'LBL_TODAYEVENT'=>'Events for Last Ten days',
 




From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 27 05:28:58 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 27 Jun 2006 09:28:58 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231298=3A?=
 =?utf-8?q?_revert_r7003=3A7004_prefix_vtiger=5F_to_all_tablenames?=
In-Reply-To: <076.32456f312efcd1431e178d7f1df1ccb0@vtiger.fosslabs.com>
References: <076.32456f312efcd1431e178d7f1df1ccb0@vtiger.fosslabs.com>
Message-ID: <085.e106626b00dd117c9bb2b9a06231d9ec@vtiger.fosslabs.com>

#1298: revert r7003:7004 prefix vtiger_ to all tablenames
------------------------+---------------------------------------------------
  Reporter:  jeffk      |       Owner:  don     
      Type:  defect     |      Status:  closed  
  Priority:  major      |   Milestone:  5.0.0   
 Component:  vtigercrm  |     Version:  5.0.0   
Resolution:  fixed      |    Keywords:  database
------------------------+---------------------------------------------------
Changes (by don):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1298>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 05:29:21 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 09:29:21 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7564 -
 /vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php
Message-ID: <20060627092922.2252B83FD03@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 27 03:29:18 2006
New Revision: 7564

Log:
* Fixed the insert queries for emaildetails table

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 Jun 27 03:29:18 2006
@@ -2910,37 +2910,41 @@
 $fieldid_array = Array("Leads"=>"$leadfieldid","Contacts"=>"$contactfieldid");
 $idname_array = Array("Leads"=>"leadid","Contacts"=>"contactid");
 
-$query = 'select * from vtiger_seactivityrel where activityid in (select activityid from vtiger_activity where activitytype="Emails")';
+$query = 'select * from vtiger_seactivityrel where activityid in (select activityid from vtiger_activity where activitytype="Emails") group by activityid';
 $result = $conn->query($query);
 $numofrows = $conn->num_rows($result);
 
-$islists = '';
-$toemail = '';
 for($i=0;$i<$numofrows;$i++)
 {
-	$parentid = $conn->query_result($result,$i,'crmid');
+	$toemail = "";
+	$idlists = '';
+
 	$emailid = $conn->query_result($result,$i,'activityid');
 
-	$query = 'select setype from vtiger_crmentity where crmid='.$parentid;
-	$result1 = $conn->query($query);
-	$module = $conn->query_result($result1,0,'setype');
-
-	$idlists = "$parentid@$fieldid_array[$module]|";
-
-	if($module == 'Leads' || $module == 'Contacts')
+	$result1 = $conn->query("select * from vtiger_seactivityrel where activityid = $emailid");
+	while($row = $conn->fetch_array($result1))
 	{
-		$result2 = $conn->query("select lastname, firstname, email from $obj_array[$module] where $idname_array[$module] = $parentid");
-		$toemail = $conn->query_result($result2,0,'lastname').' '.$conn->query_result($result2,0,'firstname').'<'.$conn->query_result($result2,0,'email').'>###';
-
-		//insert this idlists and toemail values in vtiger_emaildetails table
-		$sql = "insert into vtiger_emaildetails values ($emailid,'',\"$toemail\",'','','',\"$idlists\",'SAVE')";
-		Execute($sql);
+		$result2 = $conn->query("select setype from vtiger_crmentity where crmid=".$row['crmid']);
+		$module = $conn->query_result($result2,0,'setype');
+		$idlists .= $row['crmid']."@$fieldid_array[$module]|";
+
+		if($module == 'Leads' || $module == 'Contacts')
+		{
+			$result3 = $conn->query("select lastname, firstname, email from $obj_array[$module] where $idname_array[$module] = ".$row['crmid']);
+
+			$toemail .= $conn->query_result($result3,0,'lastname')." ".$conn->query_result($result3,0,'firstname')."<".$conn->query_result($result3,0,'email').">###";
+		}
+		else
+		{
+			//the parent is not a Lead or Contact. so we have avoided the insert query
+		}
 	}
-	else
-	{
-		//the parent is not a Lead or Contact. so we have avoided the insert query
-	}
-}
+
+	//insert this idlists and toemail values in vtiger_emaildetails table
+	$sql = "insert into vtiger_emaildetails values ($emailid,'',\"$toemail\",'','','',\"$idlists\",'SAVE')";
+	Execute($sql);
+}
+
 
 $update_query5 = "update vtiger_field set quickcreate=1, quickcreatesequence=NULL where tabid in (10,14)";
 Execute($update_query5);




From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 27 05:35:13 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 27 Jun 2006 09:35:13 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231325=3A?=
 =?utf-8?q?_reference_all_clanups_of_vtiger=5F_table_prefix_to_trac_ticket?=
In-Reply-To: <076.dc2b0777399119340aa2cb60903488d4@vtiger.fosslabs.com>
References: <076.dc2b0777399119340aa2cb60903488d4@vtiger.fosslabs.com>
Message-ID: <085.8e61d51278995a1193853c8b054fc0f5@vtiger.fosslabs.com>

#1325: reference all clanups of vtiger_ table prefix to trac ticket
------------------------+---------------------------------------------------
  Reporter:  jeffk      |       Owner:  don     
      Type:  defect     |      Status:  closed  
  Priority:  major      |   Milestone:  5.0.0   
 Component:  vtigercrm  |     Version:  5.0.0   
Resolution:  fixed      |    Keywords:  database
------------------------+---------------------------------------------------
Changes (by don):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1325>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 27 05:37:52 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 27 Jun 2006 09:37:52 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231367=3A?=
 =?utf-8?q?_In_getUniqueID_function_vtiger=5F_should_be_appended__in_table?=
 =?utf-8?q?_names?=
Message-ID: <076.a03a6cfe902917face7168be0a2a104c@vtiger.fosslabs.com>

#1367: In getUniqueID function vtiger_ should be appended  in table names
-----------------------+----------------------------------------------------
 Reporter:  don        |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  major      |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 In getUniqueID function vtiger_ should be appended in table names

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1367>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 27 05:39:10 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 27 Jun 2006 09:39:10 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231367=3A?=
 =?utf-8?q?_In_getUniqueID_function_vtiger=5F_should_be_appended__in_table?=
 =?utf-8?q?_names?=
In-Reply-To: <076.a03a6cfe902917face7168be0a2a104c@vtiger.fosslabs.com>
References: <076.a03a6cfe902917face7168be0a2a104c@vtiger.fosslabs.com>
Message-ID: <085.59f67db19c0d514516491b559add69c2@vtiger.fosslabs.com>

#1367: In getUniqueID function vtiger_ should be appended  in table names
------------------------+---------------------------------------------------
  Reporter:  don        |       Owner:  don  
      Type:  defect     |      Status:  new  
  Priority:  major      |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => don

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1367>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 27 05:39:19 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 27 Jun 2006 09:39:19 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231182=3A?=
 =?utf-8?q?_Issue_in_email_templates?=
In-Reply-To: <076.ac60ce16b49a2b500206812cfdc53853@vtiger.fosslabs.com>
References: <076.ac60ce16b49a2b500206812cfdc53853@vtiger.fosslabs.com>
Message-ID: <085.ae802ed1841a53d86d49ebd4831b7e68@vtiger.fosslabs.com>

#1182: Issue in email templates
------------------------+---------------------------------------------------
  Reporter:  don        |       Owner:  ahmed 
      Type:  defect     |      Status:  closed
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by ahmed):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 Issue fixed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1182>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 05:44:45 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 09:44:45 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7565 -
 /vtigertoolbar/trunk/firefox/chrome/content/vtigertoolbar.xul
Message-ID: <20060627094445.91A8683FDCA@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 27 03:44:41 2006
New Revision: 7565

Log:
commented out the uninstall option

Modified:
    vtigertoolbar/trunk/firefox/chrome/content/vtigertoolbar.xul

Modified: vtigertoolbar/trunk/firefox/chrome/content/vtigertoolbar.xul
==============================================================================
Binary files - no diff available.




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 05:47:47 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 09:47:47 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7566 -
	/vtigercrm/trunk/include/js/ListView.js
Message-ID: <20060627094747.F040283FDCA@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 27 03:47:44 2006
New Revision: 7566

Log:
alert statement removed

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

Modified: vtigercrm/trunk/include/js/ListView.js
==============================================================================
--- vtigercrm/trunk/include/js/ListView.js (original)
+++ vtigercrm/trunk/include/js/ListView.js Tue Jun 27 03:47:44 2006
@@ -32,7 +32,6 @@
 		alert("Please select atleast one entity");
 		return false;
 	}
-	alert(document.massdelete.idlist.value)
 	fnvshobj(obj,divid);
 }
 function massDelete(module)
@@ -64,7 +63,6 @@
 		{
 			
 			$("status").style.display="inline";
-			alert("module=Users&action=massdelete&return_module="+module+"&viewname="+viewid+"&idlist="+idstring)
 			new Ajax.Request(
           	  	      'index.php',
 			      	{queue: {position: 'end', scope: 'command'},




From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 27 05:50:58 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 27 Jun 2006 09:50:58 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231340=3A?=
 =?utf-8?q?_Firefox_extension=3A_Uninstall_not_working?=
In-Reply-To: <076.9c4f4fefce1fedb98255e8bbe4dd1210@vtiger.fosslabs.com>
References: <076.9c4f4fefce1fedb98255e8bbe4dd1210@vtiger.fosslabs.com>
Message-ID: <085.638210577a6afb9f2096d38ff34f2527@vtiger.fosslabs.com>

#1340: Firefox extension: Uninstall not working
----------------------------+-----------------------------------------------
  Reporter:  gopal          |       Owner:  minnie
      Type:  defect         |      Status:  closed
  Priority:  critical       |   Milestone:        
 Component:  vtigertoolbar  |     Version:  5.0.0 
Resolution:  fixed          |    Keywords:        
----------------------------+-----------------------------------------------
Changes (by mangai):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1340>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 05:58:33 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 09:58:33 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7567 -
	/vtigercrm/trunk/include/js/Mail.js
Message-ID: <20060627095833.2F43283FDF3@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 27 03:58:30 2006
New Revision: 7567

Log:
inconsistance in Send Mail button has been fixed

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

Modified: vtigercrm/trunk/include/js/Mail.js
==============================================================================
--- vtigercrm/trunk/include/js/Mail.js (original)
+++ vtigercrm/trunk/include/js/Mail.js Tue Jun 27 03:58:30 2006
@@ -11,44 +11,29 @@
 
 function eMail(module,oButton)
 {
-    x = document.massdelete.selected_id.length;
+	var select_options  =  document.getElementsByName('selected_id');
+	var x = select_options.length;
 	var viewid = document.massdelete.viewname.value;
+	var idstring= new Array();
 
-        if ( x == undefined)
-        {
-
-                if (document.massdelete.selected_id.checked)
-                {
-                        document.massdelete.idlist.value=document.massdelete.selected_id.value;
-                }
-                else
-                {
-                        alert("Please select atleast one entity");
-                        return false;
-                }
-        }
-        else
-        {
-				var idstring= new Array();
-                xx = 0;
-                for(i = 0; i < x ; i++)
-                {
-                        if(document.massdelete.selected_id[i].checked)
-                        {
-                                idstring[xx]= document.massdelete.selected_id[i].value;
-                                xx++
-                        }
-                }
-                if (xx != 0)
-                {
-                        document.massdelete.idlist.value=idstring.join(':');
-                }
-                else
-                {
-                        alert("Please select atleast one entity");
-                        return false;
-                }
-        }
+	xx = 0;
+	for(i = 0; i < x ; i++)
+	{
+		if(select_options[i].checked)
+		{
+			idstring[xx] = select_options[i].value;
+				xx++
+		}
+	}
+	if (xx != 0)
+	{
+                document.massdelete.idlist.value=idstring.join(':');
+	}
+	else
+	{
+		alert("Please select atleast one entity");
+		return false;
+	}
 	allids = document.massdelete.idlist.value;	
 	fnvshobj(oButton,'sendmail_cont');
 	sendmail(module,allids);




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 06:02:47 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 10:02:47 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7568 - in
 /vtigercrm/trunk/Smarty/templates: DetailView.tpl ListView.tpl
 RelatedLists.tpl SelectEmail.tpl
Message-ID: <20060627100248.26AF183FDF9@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 27 04:02:41 2006
New Revision: 7568

Log:
inconsistance in select Emails has been fixed

Modified:
    vtigercrm/trunk/Smarty/templates/DetailView.tpl
    vtigercrm/trunk/Smarty/templates/ListView.tpl
    vtigercrm/trunk/Smarty/templates/RelatedLists.tpl
    vtigercrm/trunk/Smarty/templates/SelectEmail.tpl

Modified: vtigercrm/trunk/Smarty/templates/DetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DetailView.tpl Tue Jun 27 04:02:41 2006
@@ -21,7 +21,7 @@
 </span>
 
 {if $MODULE eq 'Leads' or $MODULE eq 'Contacts' or $MODULE eq 'Accounts'}
-<div id="sendmail_cont" style="z-index:100001;position:absolute;"></div>
+<form name="SendMail"><div id="sendmail_cont" style="z-index:100001;position:absolute;"></div></form>
 {/if}
 
 <div id="convertleaddiv" style="display:block;position:absolute;left:225px;top:150px;"></div>

Modified: vtigercrm/trunk/Smarty/templates/ListView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ListView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ListView.tpl Tue Jun 27 04:02:41 2006
@@ -407,8 +407,7 @@
 </div>
 {/if}
 {if $MODULE eq 'Leads' or $MODULE eq 'Contacts' or $MODULE eq 'Accounts'}
-<div id="sendmail_cont" style="z-index:100001;position:absolute;"></div>
-
+<form name="SendMail"><div id="sendmail_cont" style="z-index:100001;position:absolute;"></div></form>
 {/if}
 <script>
 {literal}

Modified: vtigercrm/trunk/Smarty/templates/RelatedLists.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/RelatedLists.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/RelatedLists.tpl Tue Jun 27 04:02:41 2006
@@ -131,7 +131,7 @@
 </table>
 
 {if $MODULE eq 'Leads' or $MODULE eq 'Contacts' or $MODULE eq 'Accounts'}
-<div id="sendmail_cont" style="z-index:100001;position:absolute;width:310px;"></div>
+<form name="SendMail"><div id="sendmail_cont" style="z-index:100001;position:absolute;"></div></form>
 {/if}
 
 <script>

Modified: vtigercrm/trunk/Smarty/templates/SelectEmail.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/SelectEmail.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/SelectEmail.tpl Tue Jun 27 04:02:41 2006
@@ -11,7 +11,6 @@
 -->*}
 <!-- BEGIN: main -->
 <div id="roleLay" style="z-index:12;display:block;">
-	<form name="SendMail">
 	<table width="100%" border="0" cellpadding="5" cellspacing="0" class="small">
 		<tr>
 			<td width="50%" align="left" class="genHeaderSmall">{$MOD.CHOSE_EMAIL}</td>
@@ -34,6 +33,5 @@
 		</tr>
 		<tr><td colspan="2" style="border-top:1px dashed #CCCCCC;">&nbsp;</td></tr>
 	</table>
-	</form>
 </div> 
 




From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 27 06:03:57 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 27 Jun 2006 10:03:57 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231354=3A?=
 =?utf-8?q?_Inconsistencies_in_List_View_Buttons_esp_Mass_Delete?=
In-Reply-To: <076.8202f24bc4ecea9fdc79cdca719ea624@vtiger.fosslabs.com>
References: <076.8202f24bc4ecea9fdc79cdca719ea624@vtiger.fosslabs.com>
Message-ID: <085.6319239b4d07bfdeacfabd7c517fcd03@vtiger.fosslabs.com>

#1354: Inconsistencies in List View Buttons esp Mass Delete
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  jerrydgeorge
      Type:  defect     |      Status:  new         
  Priority:  blocker    |   Milestone:              
 Component:  vtigercrm  |     Version:  5.0.0       
Resolution:             |    Keywords:              
------------------------+---------------------------------------------------
Changes (by jerrydgeorge):

  * owner:  jeri => jerrydgeorge

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1354>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 27 06:04:05 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 27 Jun 2006 10:04:05 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231354=3A?=
 =?utf-8?q?_Inconsistencies_in_List_View_Buttons_esp_Mass_Delete?=
In-Reply-To: <076.8202f24bc4ecea9fdc79cdca719ea624@vtiger.fosslabs.com>
References: <076.8202f24bc4ecea9fdc79cdca719ea624@vtiger.fosslabs.com>
Message-ID: <085.faf460a62be7e62c4356a555f9d09586@vtiger.fosslabs.com>

#1354: Inconsistencies in List View Buttons esp Mass Delete
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  jerrydgeorge
      Type:  defect     |      Status:  closed      
  Priority:  blocker    |   Milestone:              
 Component:  vtigercrm  |     Version:  5.0.0       
Resolution:  fixed      |    Keywords:              
------------------------+---------------------------------------------------
Changes (by jerrydgeorge):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1354>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 27 06:08:24 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 27 Jun 2006 10:08:24 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231172=3A?=
 =?utf-8?q?_unable_to_store_any_Ajax_edited_value?=
In-Reply-To: <076.626fce50467ea4fac0273a3fb6aad256@vtiger.fosslabs.com>
References: <076.626fce50467ea4fac0273a3fb6aad256@vtiger.fosslabs.com>
Message-ID: <085.759fdaccf8c54f59aff259a6537f04bc@vtiger.fosslabs.com>

#1172: unable to store any Ajax edited value
------------------------+---------------------------------------------------
  Reporter:  richie     |       Owner:  Richie
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by jerrydgeorge):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1172>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 07:02:54 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 11:02:54 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7569 -
	/vtigercrm/trunk/adodb/drivers/adodb-mysql.inc.php
Message-ID: <20060627110254.577B683FE01@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 27 05:02:49 2006
New Revision: 7569

Log:
appened @ to suppress the exception when giving wrong username,password for db connection, fixes #1151

Modified:
    vtigercrm/trunk/adodb/drivers/adodb-mysql.inc.php

Modified: vtigercrm/trunk/adodb/drivers/adodb-mysql.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-mysql.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-mysql.inc.php Tue Jun 27 05:02:49 2006
@@ -351,11 +351,9 @@
 		if (!empty($this->port)) $argHostname .= ":".$this->port;
 		
 		if (ADODB_PHPVER >= 0x4300)
-			$this->_connectionID = mysql_connect($argHostname,$argUsername,$argPassword,
-												$this->forceNewConnect,$this->clientFlags);
+		$this->_connectionID = @mysql_connect($argHostname,$argUsername,$argPassword,$this->forceNewConnect,$this->clientFlags);
 		else if (ADODB_PHPVER >= 0x4200)
-			$this->_connectionID = mysql_connect($argHostname,$argUsername,$argPassword,
-												$this->forceNewConnect);
+			$this->_connectionID = mysql_connect($argHostname,$argUsername,$argPassword,$this->forceNewConnect);
 		else
 			$this->_connectionID = mysql_connect($argHostname,$argUsername,$argPassword);
 	
@@ -776,4 +774,4 @@
 
 
 }
-?>
+?>




From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 27 07:02:53 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 27 Jun 2006 11:02:53 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231151=3A?=
 =?utf-8?q?_Error_message_in_Installer=2E=2E?=
In-Reply-To: <076.5644658cbeac029416aebb3b898c0527@vtiger.fosslabs.com>
References: <076.5644658cbeac029416aebb3b898c0527@vtiger.fosslabs.com>
Message-ID: <085.1f9079b5b9ef5f62d663c21387ce6ef5@vtiger.fosslabs.com>

#1151: Error message in Installer..
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  Richie
      Type:  defect     |      Status:  closed
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 (In [7569]) appened @ to suppress the exception when giving wrong
 username,password for db connection, fixes #1151

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1151>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 07:28:28 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 11:28:28 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7570 - in /vtigercrm/trunk:
 Smarty/templates/EmailDetails.tpl include/utils/DetailViewUtils.php
Message-ID: <20060627112828.9FA3483FD03@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 27 05:28:23 2006
New Revision: 7570

Log:
multiple attachments shown in Emails detailview

Modified:
    vtigercrm/trunk/Smarty/templates/EmailDetails.tpl
    vtigercrm/trunk/include/utils/DetailViewUtils.php

Modified: vtigercrm/trunk/Smarty/templates/EmailDetails.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/EmailDetails.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/EmailDetails.tpl Tue Jun 27 05:28:23 2006
@@ -67,14 +67,15 @@
 {foreach item=row from=$BLOCKS}	
 	{foreach item=elements key=title from=$row}	
 	{if $title eq 'Attachment'}
-	<div id="reportLay" onmouseout="fninvsh('reportLay')" onmouseover="fnvshNrm('reportLay')">
+	<div id="reportLay" style="width:130px;" onmouseout="fninvsh('reportLay')" onmouseover="fnvshNrm('reportLay')">
 		<table width="100%" cellpadding="0" cellspacing="0" border="0" bgcolor="#FFFFFF">
+		{foreach item=attachments from=$elements.options}
 		<tr>
-			<td>
-				{$elements.value}
+			<td style="border-bottom: 1px solid rgb(204, 204, 204); padding: 5px;">
+				{$attachments}
 			</td>
 		</tr>
-		<tr><td style="padding:5px;">&nbsp;</td></tr>
+		{/foreach}
 		</table>
 	</div>
 	{/if}

Modified: vtigercrm/trunk/include/utils/DetailViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/DetailViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/DetailViewUtils.php Tue Jun 27 05:28:23 2006
@@ -346,26 +346,45 @@
 		
 	}
         elseif($uitype == 61)
-        {
-                global $adb;
-
-                $attachmentid=$adb->query_result($adb->query("select * from vtiger_seattachmentsrel where crmid = ".$col_fields['record_id']),0,'attachmentsid');
-		if($col_fields[$fieldname] == '' && $attachmentid != '')
-		{
-				$attachquery = "select * from vtiger_attachments where attachmentsid=".$attachmentid;
-        		        $col_fields[$fieldname] = $adb->query_result($adb->query($attachquery),0,'name');
-		}
-
-		//This is added to strip the crmid and _ from the file name and show the original filename
-		$org_filename = ltrim($col_fields[$fieldname],$col_fields['record_id'].'_');
-		if($org_filename != '')
-        	$custfldval = '<a href = "index.php?module=uploads&action=downloadfile&return_module='.$col_fields['record_module'].'&fileid='.$attachmentid.'&entityid='.$col_fields['record_id'].'">'.$org_filename.'</a>';
-		else
-			$custfldval = '';
-		$label_fld[] =$mod_strings[$fieldlabel];
-
-		$label_fld[] =$custfldval;
-        }
+		{
+			global $adb;
+			$label_fld[] =$mod_strings[$fieldlabel];
+
+			if($tabid ==10)
+			{
+				$attach_result = $adb->query("select * from vtiger_seattachmentsrel where crmid = ".$col_fields['record_id']);
+				for($ii=0;$ii < $adb->num_rows($attach_result);$ii++)
+				{
+					$attachmentid = $adb->query_result($attach_result,0,'attachmentsid');
+					if($attachmentid != '')
+					{
+						$attachquery = "select * from vtiger_attachments where attachmentsid=".$attachmentid;
+						$attachmentsname = $adb->query_result($adb->query($attachquery),0,'name');
+						if($attachmentsname != '')	
+							$custfldval = '<a href = "index.php?module=uploads&action=downloadfile&return_module='.$col_fields['record_module'].'&fileid='.$attachmentid.'&entityid='.$col_fields['record_id'].'">'.$attachmentsname.'</a>';
+						else
+							$custfldval = '';
+					}
+					$label_fld['options'][] = $custfldval;
+				}
+			}else
+			{
+				$attachmentid=$adb->query_result($adb->query("select * from vtiger_seattachmentsrel where crmid = ".$col_fields['record_id']),0,'attachmentsid');
+				if($col_fields[$fieldname] == '' && $attachmentid != '')
+				{
+					$attachquery = "select * from vtiger_attachments where attachmentsid=".$attachmentid;
+					$col_fields[$fieldname] = $adb->query_result($adb->query($attachquery),0,'name');
+				}
+
+				//This is added to strip the crmid and _ from the file name and show the original filename
+				$org_filename = ltrim($col_fields[$fieldname],$col_fields['record_id'].'_');
+				if($org_filename != '')
+					$custfldval = '<a href = "index.php?module=uploads&action=downloadfile&return_module='.$col_fields['record_module'].'&fileid='.$attachmentid.'&entityid='.$col_fields['record_id'].'">'.$org_filename.'</a>';
+				else
+					$custfldval = '';
+			}
+			$label_fld[] =$custfldval;
+		}
 	elseif($uitype == 69)
 	{
 		$label_fld[] =$mod_strings[$fieldlabel];




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 07:38:30 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 11:38:30 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7571 -
	/vtigercrm/trunk/modules/Reports/Reports.php
Message-ID: <20060627113830.CA31983FE00@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 27 05:38:27 2006
New Revision: 7571

Log:
issue in reports has been fixed

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

Modified: vtigercrm/trunk/modules/Reports/Reports.php
==============================================================================
--- vtigercrm/trunk/modules/Reports/Reports.php (original)
+++ vtigercrm/trunk/modules/Reports/Reports.php Tue Jun 27 05:38:27 2006
@@ -21,9 +21,7 @@
 
 global $report_modules;
 global $related_modules;
-global $profileList;
-
-$profileList = getCurrentUserProfileList();
+
 $adv_filter_options = array("e"=>"equals",
 		            "n"=>"not equal to",
 			    "s"=>"starts with",
@@ -301,7 +299,6 @@
 	{
 		global $adb;
 		global $log;
-		global $profileList;
 		global $current_user;
 
 
@@ -317,6 +314,7 @@
 		else
 		{
 			
+			$profileList = getCurrentUserProfileList();
 			$sql = "select * from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.uitype != 50 and vtiger_field.tabid=".$tabid." and vtiger_field.block in (".$block .") and vtiger_field.displaytype in (1,2) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList." group by vtiger_field.fieldid order by sequence";
 		}
 		$result = $adb->query($sql);
@@ -458,7 +456,6 @@
 		global $adb;
 		global $log;
 		global $current_user;
-		global $profileList;
 		require('user_privileges/user_privileges_'.$current_user->id.'.php');		
 
 		$tabid = getTabid($module);
@@ -474,6 +471,8 @@
 		}
 		else
 		{
+
+			$profileList = getCurrentUserProfileList();
 			$sql = "select * from vtiger_field inner join vtiger_tab on vtiger_tab.tabid = vtiger_field.tabid inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid  where vtiger_field.tabid=".$tabid." and (vtiger_field.uitype =5 or vtiger_field.displaytype=2) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_field.block in (".$blockids.") and vtiger_profile2field.profileid in ".$profileList." order by vtiger_field.sequence";
 
 		}
@@ -925,7 +924,6 @@
 		global $adb;
 		global $log;
 		global $current_user;
-		global $profileList;
 		require('user_privileges/user_privileges_'.$current_user->id.'.php');
 		$tabid = getTabid($module);
 		$escapedchars = Array('_SUM','_AVG','_MIN','_MAX');
@@ -935,6 +933,7 @@
 		}
 		else
 		{
+			$profileList = getCurrentUserProfileList();
 			$ssql = "select * from vtiger_field inner join vtiger_tab on vtiger_tab.tabid = vtiger_field.tabid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid  where vtiger_field.uitype != 50 and vtiger_field.tabid=".$tabid." and vtiger_field.displaytype = 1 and vtiger_def_org_field.visible=0 and vtiger_profile2field.visible=0 and vtiger_profile2field.profileid in ".$profileList." order by sequence";
 		}
 		$result = $adb->query($ssql);




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 08:31:54 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 12:31:54 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7572 - in
 /vtigercrm/trunk/modules/Home: index.php language/en_us.lang.php
Message-ID: <20060627123154.4DE6783FE11@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 27 06:31:44 2006
New Revision: 7572

Log:
changes made to integrate home page dashboard

Modified:
    vtigercrm/trunk/modules/Home/index.php
    vtigercrm/trunk/modules/Home/language/en_us.lang.php

Modified: vtigercrm/trunk/modules/Home/index.php
==============================================================================
--- vtigercrm/trunk/modules/Home/index.php (original)
+++ vtigercrm/trunk/modules/Home/index.php Tue Jun 27 06:31:44 2006
@@ -54,7 +54,7 @@
 }
 if( count($home_section_order) < 1 )
 {
-	$home_section_order = array("ALVT","PLVT","QLTQ","CVLVT","HLT","OLV","GRT","OLTSO","ILTI");
+	$home_section_order = array("ALVT","PLVT","QLTQ","CVLVT","HLT","OLV","GRT","OLTSO","ILTI","HDB");
 }
 
 require('user_privileges/user_privileges_'.$current_user->id.'.php');
@@ -136,6 +136,13 @@
 		$home_values['Invoice']=getTopInvoice();
 	}
         	break;
+	case 'HDB':
+	if(isPermitted('Dashboard','index') == "yes")
+	{
+		require_once('modules/Dashboard/HomepageDB.php');
+		$home_values['Dashboard']=getHomepageDB();
+	}
+	        break;
     }
 }
 function getActivityType($id)

Modified: vtigercrm/trunk/modules/Home/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Home/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Home/language/en_us.lang.php Tue Jun 27 06:31:44 2006
@@ -46,6 +46,7 @@
 'LBL_UPCOMING_EVENTS'=>'Upcoming Activities',
 'LBL_PENDING_EVENTS'=>'Pending Activities',
 'LBL_TODAYEVENT'=>'Events for Last Ten days',
+'recordsforuser'=>'Records for',
 
 
 );




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 08:47:14 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 12:47:14 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7573 -
	/vtigercrm/trunk/modules/Dashboard/HomepageDB.php
Message-ID: <20060627124714.AD98B83FDCA@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 27 06:47:10 2006
New Revision: 7573

Log:
file added to integrate home page dashboard

Added:
    vtigercrm/trunk/modules/Dashboard/HomepageDB.php




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 09:08:01 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 13:08:01 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7574 -
	/vtigercrm/trunk/modules/Dashboard/Entity_charts.php
Message-ID: <20060627130802.3201183FE1E@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 27 07:07:57 2006
New Revision: 7574

Log:
changes made to integrate home page dashboard

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 Tue Jun 27 07:07:57 2006
@@ -14,6 +14,9 @@
 require_once('include/utils/utils.php');
 require_once('include/database/PearDatabase.php');
 require_once('include/utils/CommonUtils.php');
+include("modules/Dashboard/horizontal_bargraph.php");
+//include("modules/Dashboard/vertical_bargraph.php");
+include("modules/Dashboard/pie_graph.php");
 
 //To get the vtiger_account names
 
@@ -279,8 +282,10 @@
 					}
 
 					if($graph_for == "accountid") $graph_for = "account_id";
-					
-					$link_val="index.php?module=".$module."&action=index&search_text=".$name."&search_field=".$graph_for."&searchtype=BasicSearch&query=true&type=entchar";
+					if($module == "Home")
+						$link_val="index.php?module=".$name."&action=index";
+					else
+						$link_val="index.php?module=".$module."&action=index&search_text=".$name."&search_field=".$graph_for."&searchtype=BasicSearch&query=true&type=entchar";
 
 					if($graph_for == "account_id") $graph_for = "accountid";
 
@@ -376,4 +381,184 @@
 	return true;
 }
 
+function get_graph_by_type($graph_by,$graph_title,$module,$where,$query)
+{
+	global $user_id,$date_start,$end_date,$type;
+
+	//Giving the Cached image name
+	$cache_file_name=abs(crc32($user_id))."_".$type."_".crc32($date_start.$end_date).".png";
+	$html_imagename=$graph_by; //Html image name for the graph
+
+	$graph_details=module_Chart($user_id,$date_start,$end_date,$query,$graph_by,$graph_title,$where,$module,$type);
+
+	if($graph_details!=0)
+	{
+		$name_val=$graph_details[0];
+		$cnt_val=$graph_details[1];
+		$graph_title=$graph_details[2];
+		$target_val=$graph_details[3];
+		$graph_date=$graph_details[4];
+		$urlstring=$graph_details[5];
+		$cnt_table=$graph_details[6];
+		$test_target_val=$graph_details[7];
+
+
+		$width=600;
+		$height=400;
+		$top=30;
+		$left=140;
+		$bottom=120;
+		$title=$graph_title;
+
+		return get_graph($cache_file_name,$html_imagename,$cnt_val,$name_val,$width,$height,$left,$right,$top,$bottom,$title,$target_val,$graph_date,$urlstring,$test_target_val,$date_start,$end_date);
+	}
+	else
+	{
+		
+	}
+	
+}
+
+/** Returns  the Horizontal,vertical, pie graphs and Accumulated Graphs
+for the details
+* Portions created by vtiger are Copyright (C) vtiger.
+* All Rights Reserved.
+* Contributor(s): ______________________________________..
+*/
+
+
+// Function for get graphs
+function get_graph($cache_file_name,$html_imagename,$cnt_val,$name_val,$width,$height,$left,$right,$top,$bottom,$title,$target_val,$graph_date,$urlstring,$test_target_val,$date_start,$end_date)
+{
+
+	global $tmp_dir;
+	global $graph_title, $mod_strings;
+	$val=explode(":",$title);
+	$display_title=$val[0];
+
+
+$sHTML .= "<tr>
+	   <td><table width=20%  border=0 cellspacing=0 cellpadding=0 align=left>
+	         <tr>
+	    	   <td rowspan=2 valign=top><span class=dashSerial>1</span></td>
+	           <td nowrap><span class=genHeaderSmall>".$graph_title."</span></td>
+		 </tr>
+		 <tr>
+		   <td nowrap><span class=big>".$mod_strings['LBL_HORZ_BAR_CHART']."</span> </td>
+		 </tr>
+		</table>
+	   </td>
+	</tr>
+	<tr>
+           <td height=200>";
+
+	   $sHTML .= render_graph($tmp_dir."hor_".$cache_file_name,$html_imagename."_hor",$cnt_val,$name_val,$width,$height,$left,$right,$top,$bottom,$title,$target_val,"horizontal");
+//Commented by Minnie -- same content displayed in to graphs
+/*$sHTML .= "</td>
+	</tr>
+	<tr>
+	   <td><hr noshade='noshade' size='1' /></td>
+	</tr>";
+
+$sHTML .= "<tr>
+	   <td><table width=20%  border=0 cellspacing=0 cellpadding=0 align=left>
+	   	 <tr>
+		   <td rowspan=2 valign=top><span class=dashSerial>2</span></td>
+		   <td nowrap><span class=genHeaderSmall>".$graph_title."</span></td>
+		 </tr>
+		 <tr>
+		   <td><span class=big>Vertical Bar Chart</span> </td>
+		 </tr>
+	        </table>
+	   </td>
+	</tr>
+	<tr>
+	   <td height=200>";
+
+	   $sHTML .= render_graph($tmp_dir."vert_".$cache_file_name,$html_imagename."_vert",$cnt_val,$name_val,$width,$height,$left,$right,$top,$bottom,$title,$target_val,"vertical");*/
+
+$sHTML .= "</td>
+	</tr>
+	<tr>
+	   <td><hr noshade='noshade' size='1' /></td>
+	</tr>";
+
+$sHTML .= "<tr>
+	   <td><table width=20%  border=0 cellspacing=0 cellpadding=0 align=left>
+           	 <tr>
+	           <td rowspan=2 valign=top><span class=dashSerial>2</span></td>
+	           <td nowrap><span class=genHeaderSmall>".$graph_title."</span></td>
+	         </tr>
+	         <tr>
+	           <td><span class=big>".$mod_strings['LBL_PIE_CHART']."</span> </td>
+	         </tr>
+	        </table>
+	   </td>
+	</tr>
+	<tr>
+	   <td height=200>";
+
+	   $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 .= "</td>
+	</tr>
+	<tr>
+	   <td><hr noshade='noshade' size='1' /></td>
+	</tr>";
+
+	return $sHTML;
+}
+
+/** Returns graph, if the cached image is present it'll display that image,
+otherwise it will render the graph with the given details
+* Portions created by vtiger are Copyright (C) vtiger.
+* All Rights Reserved.
+* Contributor(s): ______________________________________..
+*/
+
+// Function to get the chached image if exists
+function render_graph($cache_file_name,$html_imagename,$cnt_val,$name_val,$width,$height,$left,$right,$top,$bottom,$title,$target_val,$graph_type)
+{
+
+	//Checks whether the cached image is present or not
+	if(file_exists($cache_file_name))
+	{
+		unlink($cache_file_name);
+	}
+	if(file_exists($cache_file_name.'.map'))
+	{
+		unlink($cache_file_name.'.map');
+	}
+	if (!file_exists($cache_file_name) || !file_exists($cache_file_name.'.map'))
+	{
+		//If the Cached image is not present
+		if($graph_type=="horizontal")
+		{
+			return horizontal_graph($cnt_val,$name_val,$width,$height,$left,$right,$top,$bottom,$title,$target_val,$cache_file_name,$html_imagename);
+		}
+		else if($graph_type=="vertical")
+		{
+			return vertical_graph($cnt_val,$name_val,$width,$height,$left,$right,$top,$bottom,$title,$target_val,$cache_file_name,$html_imagename);
+		}
+		else if($graph_type=="pie")
+		{
+			return pie_chart($cnt_val,$name_val,$width,$height,$left,$right,$top,$bottom,$title,$target_val,$cache_file_name,$html_imagename);
+
+		}
+	}
+	else
+	{
+		//Getting the cached image
+		$imgMap_fp = fopen($cache_file_name.'.map', "rb");
+		$imgMap = fread($imgMap_fp, vtiger_filesize($cache_file_name.'.map'));
+		fclose($imgMap_fp);
+		$base_name_cache_file=basename($cache_file_name);
+		$ccc="cache/images/".$base_name_cache_file;
+		$return = "\n$imgMap\n";
+		$return .= "<img src=$ccc ismap usemap=#$html_imagename border='0'>";
+		return $return;
+	}
+}
+
+
 ?>




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 09:10:24 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 13:10:24 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7575 -
 /vtigercrm/trunk/modules/Dashboard/display_charts.php
Message-ID: <20060627131024.DDDB983FE21@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 27 07:10:21 2006
New Revision: 7575

Log:
changes made to integrate home page dashboard

Modified:
    vtigercrm/trunk/modules/Dashboard/display_charts.php

Modified: vtigercrm/trunk/modules/Dashboard/display_charts.php
==============================================================================
--- vtigercrm/trunk/modules/Dashboard/display_charts.php (original)
+++ vtigercrm/trunk/modules/Dashboard/display_charts.php Tue Jun 27 07:10:21 2006
@@ -11,10 +11,7 @@
  ********************************************************************************/
 
 
-	include("modules/Dashboard/Entity_charts.php");
-        include("modules/Dashboard/horizontal_bargraph.php");
-        //include("modules/Dashboard/vertical_bargraph.php");
-        include("modules/Dashboard/pie_graph.php");
+	require_once("modules/Dashboard/Entity_charts.php");
 	
 global $tmp_dir;
 global $mod_strings,$app_strings;
@@ -111,184 +108,7 @@
 	  "ticketsbyaccount"=> $mod_strings['ticketsbyaccount'],
 	  "ticketsbycontact"=> $mod_strings['ticketsbycontact'],
           );
-function get_graph_by_type($graph_by,$graph_title,$module,$where,$query)
-{
-	global $user_id,$date_start,$end_date,$type;
-
-	//Giving the Cached image name	
-	$cache_file_name=abs(crc32($user_id))."_".$type."_".crc32($date_start.$end_date).".png";
-        $html_imagename=$graph_by; //Html image name for the graph
-
-        $graph_details=module_Chart($user_id,$date_start,$end_date,$query,$graph_by,$graph_title,$where,$module,$type);
-
-        if($graph_details!=0)
-        {
-                $name_val=$graph_details[0];
-                $cnt_val=$graph_details[1];
-                $graph_title=$graph_details[2];
-                $target_val=$graph_details[3];
-                $graph_date=$graph_details[4];
-                $urlstring=$graph_details[5];
-                $cnt_table=$graph_details[6];
-	       	$test_target_val=$graph_details[7];
-
-
-                $width=600;
-                $height=400;
-                $top=30;
-                $left=140;
-                $bottom=120;
-                $title=$graph_title;
-
-                return get_graph($cache_file_name,$html_imagename,$cnt_val,$name_val,$width,$height,$left,$right,$top,$bottom,$title,$target_val,$graph_date,$urlstring,$test_target_val,$date_start,$end_date);
-        }
-	else
-	{
-	
-	}
- 
-}
-
-/** Returns  the Horizontal,vertical, pie graphs and Accumulated Graphs 
-for the details
-* Portions created by vtiger are Copyright (C) vtiger.
-* All Rights Reserved.
-* Contributor(s): ______________________________________..
-*/
-
-
-// Function for get graphs
-function get_graph($cache_file_name,$html_imagename,$cnt_val,$name_val,$width,$height,$left,$right,$top,$bottom,$title,$target_val,$graph_date,$urlstring,$test_target_val,$date_start,$end_date)
-{
-
-	global $tmp_dir;
-     global $graph_title, $mod_strings;
-	$val=explode(":",$title); 		
-	$display_title=$val[0];	
-			
-	
-$sHTML .= "<tr>
-	   <td><table width=20%  border=0 cellspacing=0 cellpadding=0 align=left>
-	  	 <tr>
-		   <td rowspan=2 valign=top><span class=dashSerial>1</span></td>
- 		   <td nowrap><span class=genHeaderSmall>".$graph_title."</span></td>
- 		 </tr>
-   		 <tr>
-		   <td nowrap><span class=big>".$mod_strings['LBL_HORZ_BAR_CHART']."</span> </td>
-		 </tr>
-		</table>
-  	   </td>
-	</tr>
-	<tr>
-	   <td height=200>"; 
-
-	   $sHTML .= render_graph($tmp_dir."hor_".$cache_file_name,$html_imagename."_hor",$cnt_val,$name_val,$width,$height,$left,$right,$top,$bottom,$title,$target_val,"horizontal");
-//Commented by Minnie -- same content displayed in to graphs
-/*$sHTML .= "</td>
-	</tr>
-	<tr>
-	   <td><hr noshade='noshade' size='1' /></td>
-	</tr>";
-	
-$sHTML .= "<tr>
-	   <td><table width=20%  border=0 cellspacing=0 cellpadding=0 align=left>
-	  	 <tr>
-		   <td rowspan=2 valign=top><span class=dashSerial>2</span></td>
- 		   <td nowrap><span class=genHeaderSmall>".$graph_title."</span></td>
- 		 </tr>
-   		 <tr>
-		   <td><span class=big>Vertical Bar Chart</span> </td>
-		 </tr>
-		</table>
-  	   </td>
-	</tr>
-	<tr>
-	   <td height=200>"; 
-
-	   $sHTML .= render_graph($tmp_dir."vert_".$cache_file_name,$html_imagename."_vert",$cnt_val,$name_val,$width,$height,$left,$right,$top,$bottom,$title,$target_val,"vertical");*/
-
-$sHTML .= "</td>
-	</tr>
-	<tr>
-	   <td><hr noshade='noshade' size='1' /></td>
-	</tr>";
-
-$sHTML .= "<tr>
-	   <td><table width=20%  border=0 cellspacing=0 cellpadding=0 align=left>
-	  	 <tr>
-		   <td rowspan=2 valign=top><span class=dashSerial>2</span></td>
- 		   <td nowrap><span class=genHeaderSmall>".$graph_title."</span></td>
- 		 </tr>
-   		 <tr>
-		   <td><span class=big>".$mod_strings['LBL_PIE_CHART']."</span> </td>
-		 </tr>
-		</table>
-  	   </td>
-	</tr>
-	<tr>
-	   <td height=200>"; 
-
-	   $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 .= "</td>
-	</tr>
-	<tr>
-	   <td><hr noshade='noshade' size='1' /></td>
-	</tr>";
-
-	return $sHTML;
-}
-
-/** Returns graph, if the cached image is present it'll display that image,
-otherwise it will render the graph with the given details	
-* Portions created by vtiger are Copyright (C) vtiger.
-* All Rights Reserved.
-* Contributor(s): ______________________________________..
-*/
-
-// Function to get the chached image if exists
-function render_graph($cache_file_name,$html_imagename,$cnt_val,$name_val,$width,$height,$left,$right,$top,$bottom,$title,$target_val,$graph_type)
-{
-
-	//Checks whether the cached image is present or not
-	if(file_exists($cahce_file_name))
-	{
-		unlink($cache_file_name);
-	}
-	if(file_exists($cache_file_name.'.map'))
-	{
-		unlink($cache_file_name.'.map');
-	}	
-	if (!file_exists($cache_file_name) || !file_exists($cache_file_name.'.map')) 
-	{
-		//If the Cached image is not present
-		if($graph_type=="horizontal")
-		{
-		 	return horizontal_graph($cnt_val,$name_val,$width,$height,$left,$right,$top,$bottom,$title,$target_val,$cache_file_name,$html_imagename);
-		}
-		else if($graph_type=="vertical")	
-		{
-			return vertical_graph($cnt_val,$name_val,$width,$height,$left,$right,$top,$bottom,$title,$target_val,$cache_file_name,$html_imagename);
-		}
-		else if($graph_type=="pie")
-		{
-			return pie_chart($cnt_val,$name_val,$width,$height,$left,$right,$top,$bottom,$title,$target_val,$cache_file_name,$html_imagename);
-			
-		}
-	}
-	else
-	{
-		//Getting the cached image
-		$imgMap_fp = fopen($cache_file_name.'.map', "rb");
-		$imgMap = fread($imgMap_fp, vtiger_filesize($cache_file_name.'.map'));
-		fclose($imgMap_fp);
-		$base_name_cache_file=basename($cache_file_name);
-		$ccc="cache/images/".$base_name_cache_file;
-		$return = "\n$imgMap\n";
-		$return .= "<img src=$ccc ismap usemap=#$html_imagename border='0'>";
-		return $return;
-	}
-}
+
 
 ?>
 




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 09:12:59 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 13:12:59 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7576 -
	/vtigercrm/trunk/modules/Potentials/Charts.php
Message-ID: <20060627131259.74D942990E0@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 27 07:12:55 2006
New Revision: 7576

Log:
vtiger_ uppended in query

Modified:
    vtigercrm/trunk/modules/Potentials/Charts.php

Modified: vtigercrm/trunk/modules/Potentials/Charts.php
==============================================================================
--- vtigercrm/trunk/modules/Potentials/Charts.php (original)
+++ vtigercrm/trunk/modules/Potentials/Charts.php Tue Jun 27 07:12:55 2006
@@ -96,7 +96,7 @@
 			foreach ($user_id as $the_id) {
 				if (!$first) $where .= "OR ";
 				$first = false;
-				$where .= "crmentity.smcreatorid='$the_id' ";
+				$where .= "vtiger_crmentity.smcreatorid='$the_id' ";
 			}
 			$where .= ") ";
 
@@ -428,7 +428,7 @@
 				foreach ($user_id as $the_id) {
 					if (!$first) $where .= "OR ";
 					$first = false;
-					$where .= "crmentity.smcreatorid='$the_id' ";
+					$where .= "vtiger_crmentity.smcreatorid='$the_id' ";
 				}
 				$where .= ") ";
 			}
@@ -765,7 +765,7 @@
 					//reference post
 					//if I change the owner of a opportunity, the graph shown on Home does not update correctly, this is because the graph is looking for the creatorid and not for the ownerid
 					//fix incorporated based on /sak's feedback
-					$where .= "crmentity.smownerid='$the_id' ";
+					$where .= "vtiger_crmentity.smownerid='$the_id' ";
 				}
 				$where .= ") ";
 			}
@@ -1050,7 +1050,7 @@
 				foreach ($user_id as $the_id) {
 					if (!$first) $where .= "OR ";
 					$first = false;
-					$where .= "crmentity.smcreatorid='$the_id' ";
+					$where .= "vtiger_crmentity.smcreatorid='$the_id' ";
 				}
 				$where .= ") ";
 			}




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 09:20:15 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 13:20:15 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7577 -
	/vtigercrm/trunk/Smarty/templates/HomePage.tpl
Message-ID: <20060627132015.90B645E3879@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 27 07:20:12 2006
New Revision: 7577

Log:
changes made to integrate home page dashboard

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 Tue Jun 27 07:20:12 2006
@@ -146,6 +146,7 @@
 
 	<div id="MainMatrix">
 				{foreach key=modulename item=tabledetail from=$HOMEDETAILS}
+				{if $modulename neq 'Dashboard'}
 				{if $tabledetail neq ''}
 				
 					<div class="MatrixLayer" style="float:left;" id="{$tabledetail.Title.2}">
@@ -164,6 +165,7 @@
 		{else}	
 		<td colspan="2"><img src="{$IMAGE_PATH}bookMark.gif" align="absmiddle" /> {$elements.1}</td>
 		{/if}
+
            </tr>
 {/foreach}
 	<tr><td colspan="2" align="right" valign="bottom"><a href="index.php?module={$modulename}&action=index">{$APP.LBL_MORE}..</a></td></tr>
@@ -171,6 +173,14 @@
 				
 			</div>
 			{/if}	
+		{else}
+                        <div class="MatrixLayer" style="float:left;width:63%;" id="homepagedb">
+                        <table width="100%" height="100%" border="0" cellpadding="5" cellspacing="0" class="small">
+                          <tr><td>
+                                {$tabledetail}
+                          </td></tr>
+                        </table>
+                {/if}
 {/foreach}
 </div>
 </td>




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 09:46:58 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 13:46:58 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7578 - in /vtigercrm/trunk:
 Smarty/templates/ComposeEmail.tpl include/utils/EditViewUtils.php
 modules/Contacts/DelImage.php
Message-ID: <20060627134658.8671F7FDA78@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 27 07:46:51 2006
New Revision: 7578

Log:
Attachment delete has been added to email modules

Modified:
    vtigercrm/trunk/Smarty/templates/ComposeEmail.tpl
    vtigercrm/trunk/include/utils/EditViewUtils.php
    vtigercrm/trunk/modules/Contacts/DelImage.php

Modified: vtigercrm/trunk/Smarty/templates/ComposeEmail.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ComposeEmail.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ComposeEmail.tpl Tue Jun 27 07:46:51 2006
@@ -20,6 +20,7 @@
 <link REL="SHORTCUT ICON" HREF="include/images/vtigercrm_icon.ico">	
 <style type="text/css">@import url("themes/{$THEME}/style.css");</style>
 <script language="javascript" type="text/javascript" src="include/scriptaculous/prototype.js"></script>
+<script src="include/scriptaculous/scriptaculous.js" type="text/javascript"></script>
 <script type="text/javascript" src="include/fckeditor/fckeditor.js"></script>
 </head>
 <body marginheight="0" marginwidth="0" topmargin="0" bottommargin="0" leftmargin="0" rightmargin="0">
@@ -77,14 +78,13 @@
 	<td class="dvtCellLabel" style="padding: 5px;">
 		<input name="ccmail" class="txtBox" type="text" value="{$CC_MAIL}" style="width:99%">&nbsp;
 	</td>	
-	<td class="dvtCellLabel">&nbsp;</td>
+	<td valign="top" class="dvtCellLabel" rowspan="4"><div id="attach_cont" class="addEventInnerBox" style="overflow:auto;height:110px;width:100%;position:relative;left:0px;top:0px;"></div>
    </tr>
    <tr>
 	<td class="lvtCol" style="padding: 5px;" align="right">{$MOD.LBL_BCC}</td>
 	<td class="dvtCellLabel" style="padding: 5px;">
 		<input name="bccmail" class="txtBox" type="text" value="{$BCC_MAIL}" style="width:99%">&nbsp;
 	</td>
-	<td class="dvtCellLabel">&nbsp;</td>
    </tr>
 	{elseif $elements.2.0 eq 'subject'}
    <tr>
@@ -94,17 +94,22 @@
         {else}
                 <td class="dvtCellLabel" style="padding: 5px;"><input type="text" class="txtBox" name="{$elements.2.0}" value="{$elements.3.0}" id="{$elements.2.0}" style="width:99%"></td>
         {/if}
-	<td class="dvtCellLabel">&nbsp;</td>
    </tr>
 	{elseif $elements.2.0 eq 'filename'}
 
    <tr>
 	<td class="lvtCol" style="padding: 5px;" align="right" nowrap>{$elements.1.0}  :</td>
 	<td class="dvtCellLabel" style="padding: 5px;">
-		<input name="{$elements.2.0}"  type="file" class="small" value="{$elements.3.1}" size="78"/>
-		<input type="hidden" name="id" value=""/>{$elements.3.0}
-	</td>
-	<td class="dvtCellLabel">&nbsp;</td>
+		<input name="{$elements.2.0}"  type="file" class="small" value="" size="78"/>
+		<div id="attach_temp_cont" style="display:none;">
+		<table class="small" width="100% ">
+		{foreach item="attach_files" key="attach_id" from=$elements.3}	
+			<tr id="row_{$attach_id}"><td width="90%">{$attach_files}</td><td><img src="{$IMAGE_PATH}no.gif" onClick="delAttachments({$attach_id})" alt="{$APP.LBL_DELETE_BUTTON}" title="{$APP.LBL_DELETE_BUTTON}" style="cursor:pointer;"></td></tr>	
+		{/foreach}	
+		</table>	
+		</div>	
+		{$elements.3.0}
+	</td>
    </tr>
 	{elseif $elements.2.0 eq 'description'}
    <tr>
@@ -182,7 +187,22 @@
                 }
         );
 }
-
+$('attach_cont').innerHTML = $('attach_temp_cont').innerHTML;
+function delAttachments(id)
+{
+    new Ajax.Request(
+        'index.php',
+        {queue: {position: 'end', scope: 'command'},
+            method: 'post',
+            postBody: 'module=Contacts&action=ContactsAjax&file=DelImage&attachmodule=Emails&recordid='+id,
+            onComplete: function(response)
+            {
+		Effect.Fade('row_'+id);	                
+            }
+        }
+    );
+
+}
 </script>
 <script type="text/javascript" defer="1">
 var oFCKeditor = null;

Modified: vtigercrm/trunk/include/utils/EditViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/EditViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/EditViewUtils.php Tue Jun 27 07:46:51 2006
@@ -511,20 +511,38 @@
 		{
 			$assigned_user_id = $current_user->id;
 		}
-		if($col_fields['record_id'] != '')
-		{
-			$attachmentid=$adb->query_result($adb->query("select * from vtiger_seattachmentsrel where crmid = ".$col_fields['record_id']),0,'attachmentsid');
-			if($col_fields[$fieldname] == '' && $attachmentid != '')
-			{
-				$attachquery = "select * from vtiger_attachments where attachmentsid=".$attachmentid;
-				$value = $adb->query_result($adb->query($attachquery),0,'name');
-			}
-		}
-		if($value!='')
-			$filename=' [ '.$value. ' ]';
-		$editview_label[]=$mod_strings[$fieldlabel];
-		$fieldvalue[] = $filename;
-		$fieldvalue[] = $value;
+		if($module_name == 'Emails')
+		{
+			$attach_result = $adb->query("select * from vtiger_seattachmentsrel where crmid = ".$col_fields['record_id']);
+			for($ii=0;$ii < $adb->num_rows($attach_result);$ii++)
+			{
+				$attachmentid = $adb->query_result($attach_result,$ii,'attachmentsid');
+				if($attachmentid != '')
+				{
+					$attachquery = "select * from vtiger_attachments where attachmentsid=".$attachmentid;
+					$attachmentsname = $adb->query_result($adb->query($attachquery),0,'name');
+					if($attachmentsname != '')	
+						$fieldvalue[$attachmentid] = '[ '.$attachmentsname.' ]';
+				}
+
+			}
+		}else
+		{
+			if($col_fields['record_id'] != '')
+			{
+				$attachmentid=$adb->query_result($adb->query("select * from vtiger_seattachmentsrel where crmid = ".$col_fields['record_id']),0,'attachmentsid');
+				if($col_fields[$fieldname] == '' && $attachmentid != '')
+				{
+					$attachquery = "select * from vtiger_attachments where attachmentsid=".$attachmentid;
+					$value = $adb->query_result($adb->query($attachquery),0,'name');
+				}
+			}
+			if($value!='')
+				$filename=' [ '.$value. ' ]';
+			$fieldvalue[] = $filename;
+			$fieldvalue[] = $value;
+		}
+		$editview_label[]=$mod_strings[$fieldlabel];
 	}
 	elseif($uitype == 69)
 	{

Modified: vtigercrm/trunk/modules/Contacts/DelImage.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/DelImage.php (original)
+++ vtigercrm/trunk/modules/Contacts/DelImage.php Tue Jun 27 07:46:51 2006
@@ -1,32 +1,43 @@
 <?php
-
-	function DelImage($id)
-	{
-		global $adb;
-		$query="delete from vtiger_attachments where attachmentsid=(select attachmentsid from seattachmentsrel where crmid=".$id.")";
-		$adb->query($query);
-
-		$query="delete from vtiger_seattachmentsrel where crmid=".$id;
-		$adb->query($query);
-	}
-
-$id = $_REQUEST["recordid"];
-
-DelImage($id);
-echo '';
+/*********************************************************************************
+** The contents of this file are subject to the vtiger CRM Public License Version 1.0
+ * ("License"); You may not use this file except in compliance with the License
+ * The Original Code is:  vtiger CRM Open Source
+ * The Initial Developer of the Original Code is vtiger.
+ * Portions created by vtiger are Copyright (C) vtiger.
+ * All Rights Reserved.
+ *
+ ********************************************************************************/
 
 
 
+function DelImage($id)
+{
+	global $adb;
+	$query="delete from vtiger_attachments where attachmentsid=(select attachmentsid from vtiger_seattachmentsrel where crmid=".$id.")";
+	$adb->query($query);
 
+	$query="delete from vtiger_seattachmentsrel where crmid=".$id;
+	$adb->query($query);
+}
 
+function DelAttachment($id)
+{
+	global $adb;
+	$query="delete from vtiger_seattachmentsrel where attachmentsid=".$id;
+	$adb->query($query);
+	$query="delete from vtiger_attachments where attachmentsid=".$id.")";
+	$adb->query($query);
 
-
-
-
-
-
-
-
-
-
+}
+$id = $_REQUEST["recordid"];
+if(isset($_REQUEST["attachmodule"]) && $_REQUEST["attachmodule"]=='Emails')
+{
+	DelAttachment($id);
+}
+else
+{
+	DelImage($id);
+}
+echo 'SUCESS';
 ?>




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 09:52:49 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 13:52:49 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7579 -
	/vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl
Message-ID: <20060627135249.26B8083871D@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 27 07:52:45 2006
New Revision: 7579

Log:
issue in assigntype name has been changed

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

Modified: vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl Tue Jun 27 07:52:45 2006
@@ -189,7 +189,7 @@
                     <div id="editarea_{$label}" style="display:none;">
                    	<input type="hidden" id="hdtxt_{$label}" value="{$keyval}"></input>
 					{if $keyoptions.0 eq 'User'}
-						<input name="aSsigntype" id="assigntype" checked="checked" value="U" onclick="toggleAssignType(this.value),setSelectValue('{$label}');" type="radio">&nbsp;{$APP.LBL_USER}
+						<input name="assigntype" id="assigntype" checked="checked" value="U" onclick="toggleAssignType(this.value),setSelectValue('{$label}');" type="radio">&nbsp;{$APP.LBL_USER}
 						{if $keyoptions.2 neq ''}
 							<input name="assigntype" id="assigntype" value="T" onclick="toggleAssignType(this.value),setSelectValue('{$label}');" type="radio">&nbsp;{$APP.LBL_GROUP_NAME}
 						{/if}




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 10:08:23 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 14:08:23 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7580 - in /vtigercrm/trunk:
 Smarty/templates/ReportRunContents.tpl include/language/en_us.lang.php
Message-ID: <20060627140823.8788883F6D1@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 27 08:08:17 2006
New Revision: 7580

Log:
language strings added for displaying Total records

Modified:
    vtigercrm/trunk/Smarty/templates/ReportRunContents.tpl
    vtigercrm/trunk/include/language/en_us.lang.php

Modified: vtigercrm/trunk/Smarty/templates/ReportRunContents.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ReportRunContents.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ReportRunContents.tpl Tue Jun 27 08:08:17 2006
@@ -29,7 +29,7 @@
 		<span class="genHeaderGray">{$REPORTNAME}</span><br>
 		</td>
 		<td align="right" width="25%">
-		<span class="genHeaderGray">Total : {$REPORTHTML.1}  Records</span>
+		<span class="genHeaderGray">{$APP.LBL_TOTAL} : {$REPORTHTML.1}  {$APP.LBL_RECORDS}</span>
 		</td>
 		</tr>
 		<tr><td id="report_info" align="left" colspan="2">&nbsp;</td></tr>

Modified: vtigercrm/trunk/include/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/include/language/en_us.lang.php (original)
+++ vtigercrm/trunk/include/language/en_us.lang.php Tue Jun 27 08:08:17 2006
@@ -939,6 +939,7 @@
 'LBL_PLEASE_CLICK'=>'Please Click',
 'LBL_TO_CONFIGURE'=>'to Configure',
 'LBL_HERE'=>'here',
+'LBL_RECORDS'=>'Records',
 );
 
 




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 10:37:03 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 14:37:03 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7581 -
	/vtigercrm/trunk/include/utils/DetailViewUtils.php
Message-ID: <20060627143703.552BB7FDA84@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 27 08:37:00 2006
New Revision: 7581

Log:
issue in Emails detailview attachments has been fixed

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

Modified: vtigercrm/trunk/include/utils/DetailViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/DetailViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/DetailViewUtils.php Tue Jun 27 08:37:00 2006
@@ -355,7 +355,7 @@
 				$attach_result = $adb->query("select * from vtiger_seattachmentsrel where crmid = ".$col_fields['record_id']);
 				for($ii=0;$ii < $adb->num_rows($attach_result);$ii++)
 				{
-					$attachmentid = $adb->query_result($attach_result,0,'attachmentsid');
+					$attachmentid = $adb->query_result($attach_result,$ii,'attachmentsid');
 					if($attachmentid != '')
 					{
 						$attachquery = "select * from vtiger_attachments where attachmentsid=".$attachmentid;




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 10:41:11 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 14:41:11 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7582 -
	/vtigercrm/trunk/modules/Contacts/DelImage.php
Message-ID: <20060627144111.6E92A7D802A@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 27 08:41:07 2006
New Revision: 7582

Log:
delete email attachments from hard disk

Modified:
    vtigercrm/trunk/modules/Contacts/DelImage.php

Modified: vtigercrm/trunk/modules/Contacts/DelImage.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/DelImage.php (original)
+++ vtigercrm/trunk/modules/Contacts/DelImage.php Tue Jun 27 08:41:07 2006
@@ -13,6 +13,7 @@
 
 function DelImage($id)
 {
+		
 	global $adb;
 	$query="delete from vtiger_attachments where attachmentsid=(select attachmentsid from vtiger_seattachmentsrel where crmid=".$id.")";
 	$adb->query($query);
@@ -24,6 +25,8 @@
 function DelAttachment($id)
 {
 	global $adb;
+	$selresult = $adb->query("select name,path from vtiger_attachments where attachmentsid=$id");
+	unlink($adb->query_result($selresult,0,'path').$id."_".$adb->query_result($selresult,0,'name'));
 	$query="delete from vtiger_seattachmentsrel where attachmentsid=".$id;
 	$adb->query($query);
 	$query="delete from vtiger_attachments where attachmentsid=".$id.")";




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 10:48:02 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 14:48:02 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7583 -
	/vtigercrm/trunk/modules/Invoice/CreatePDF.php
Message-ID: <20060627144802.020C27D802A@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 27 08:47:59 2006
New Revision: 7583

Log:
fixed query for pdf generation

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

Modified: vtigercrm/trunk/modules/Invoice/CreatePDF.php
==============================================================================
--- vtigercrm/trunk/modules/Invoice/CreatePDF.php (original)
+++ vtigercrm/trunk/modules/Invoice/CreatePDF.php Tue Jun 27 08:47:59 2006
@@ -85,7 +85,7 @@
 $price_total = $currency_symbol.number_format(StripLastZero($focus->column_fields["hdnGrandTotal"]),2,'.',',');
 
 //getting the Product Data
-$query="select vtiger_products.productname,vtiger_products.unit_price,vtiger_products.product_description,vtiger_invoiceproductrel.* from vtiger_invoiceproductrel inner join vtiger_products on vtiger_products.productid=vtiger_invoiceproductrel.productid where vtiger_invoiceid=".$id;
+$query="select vtiger_products.productname,vtiger_products.unit_price,vtiger_products.product_description,vtiger_invoiceproductrel.* from vtiger_invoiceproductrel inner join vtiger_products on vtiger_products.productid=vtiger_invoiceproductrel.productid where invoiceid=".$id;
 
 global $result;
 $result = $adb->query($query);




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 10:48:37 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 14:48:37 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7584 -
	/vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php
Message-ID: <20060627144837.CD4FB7D802A@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 27 08:48:34 2006
New Revision: 7584

Log:
fixed query for pdf generation

Modified:
    vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php

Modified: vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php
==============================================================================
--- vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php (original)
+++ vtigercrm/trunk/modules/PurchaseOrder/CreatePDF.php Tue Jun 27 08:48:34 2006
@@ -82,7 +82,7 @@
 $price_total = $currency_symbol.number_format(StripLastZero($focus->column_fields["hdnGrandTotal"]),2,'.',',');
 
 //getting the Product Data
-$query="select vtiger_products.productname,vtiger_products.unit_price,vtiger_products.product_description,vtiger_poproductrel.* from vtiger_poproductrel inner join vtiger_products on vtiger_products.productid=vtiger_poproductrel.productid where vtiger_purchaseorderid=".$id;
+$query="select vtiger_products.productname,vtiger_products.unit_price,vtiger_products.product_description,vtiger_poproductrel.* from vtiger_poproductrel inner join vtiger_products on vtiger_products.productid=vtiger_poproductrel.productid where purchaseorderid=".$id;
 
 global $result;
 $result = $adb->query($query);




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 10:49:55 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 14:49:55 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7585 -
	/vtigercrm/trunk/modules/SalesOrder/CreateSOPDF.php
Message-ID: <20060627144955.E83827D802A@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 27 08:49:52 2006
New Revision: 7585

Log:
fixed query for pdf generation

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

Modified: vtigercrm/trunk/modules/SalesOrder/CreateSOPDF.php
==============================================================================
--- vtigercrm/trunk/modules/SalesOrder/CreateSOPDF.php (original)
+++ vtigercrm/trunk/modules/SalesOrder/CreateSOPDF.php Tue Jun 27 08:49:52 2006
@@ -85,7 +85,7 @@
 $price_total = $currency_symbol.number_format(StripLastZero($focus->column_fields["hdnGrandTotal"]),2,'.',',');
 
 //getting the Product Data
-$query="select vtiger_products.productname,vtiger_products.unit_price,vtiger_products.product_description,vtiger_soproductrel.* from vtiger_soproductrel inner join vtiger_products on vtiger_products.productid=vtiger_soproductrel.productid where vtiger_salesorderid=".$id;
+$query="select vtiger_products.productname,vtiger_products.unit_price,vtiger_products.product_description,vtiger_soproductrel.* from vtiger_soproductrel inner join vtiger_products on vtiger_products.productid=vtiger_soproductrel.productid where salesorderid=".$id;
 
 global $result;
 $result = $adb->query($query);




From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 27 11:18:23 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 27 Jun 2006 15:18:23 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231151=3A?=
 =?utf-8?q?_Error_message_in_Installer=2E=2E?=
In-Reply-To: <076.5644658cbeac029416aebb3b898c0527@vtiger.fosslabs.com>
References: <076.5644658cbeac029416aebb3b898c0527@vtiger.fosslabs.com>
Message-ID: <085.78a52b469b3071a089d48024dff45839@vtiger.fosslabs.com>

#1151: Error message in Installer..
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  Richie  
      Type:  defect     |      Status:  reopened
  Priority:  critical   |   Milestone:          
 Component:  vtigercrm  |     Version:  5.0.0   
Resolution:             |    Keywords:          
------------------------+---------------------------------------------------
Changes (by jeffk):

  * resolution:  fixed =>
  * status:  closed => reopened

Comment:

 Why wouldn't vtigercrm's installer catch an exception that indicates an
 incorrect password, and handle the readable error message in the catch
 block?

 Please reconsider whether patching the adodb source to suppress a
 legitimate error condition is what we want to do here.

 Any patch to adodb or any of the other snapshotted libraries will prevent
 distros from managing them as external dependencies.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1151>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 27 11:28:45 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 27 Jun 2006 15:28:45 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23512=3A_?=
 =?utf-8?q?UI_issue_in_Organisation_Sharing_Privileges?=
In-Reply-To: <076.94fe2310a682ae79f7fc33244bb4f97f@vtiger.fosslabs.com>
References: <076.94fe2310a682ae79f7fc33244bb4f97f@vtiger.fosslabs.com>
Message-ID: <085.5a441c86777380a0586a16b3931aedbb@vtiger.fosslabs.com>

#512: UI issue in Organisation Sharing Privileges
---------------------------+------------------------------------------------
  Reporter:  jerrydgeorge  |       Owner:  jerrydgeorge
      Type:  defect        |      Status:  new         
  Priority:  major         |   Milestone:              
 Component:  vtigercrm     |     Version:  5.0.0       
Resolution:                |    Keywords:  UI          
---------------------------+------------------------------------------------
Changes (by jerrydgeorge):

  * owner:  Richie => jerrydgeorge

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/512>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 11:29:49 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 15:29:49 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7586 - in /vtigercrm/trunk:
 Smarty/templates/OrgSharingDetailView.tpl
 modules/Users/CreateSharingRule.php
Message-ID: <20060627152949.7782583871D@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 27 09:29:44 2006
New Revision: 7586

Log:
rule constructed during Edit mode

Modified:
    vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl
    vtigercrm/trunk/modules/Users/CreateSharingRule.php

Modified: vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl Tue Jun 27 09:29:44 2006
@@ -185,21 +185,27 @@
 </table>
 <div id="tempdiv" style="display:block;position:absolute;left:225px;top:150px;"></div>
 <script>
-
 function callEditDiv(modulename,mode,id)
 {ldelim}
-	$("status").style.display="inline";
-	new Ajax.Request(
-		'index.php',
-		{ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
-			method: 'post',
-			postBody: 'module=Users&action=UsersAjax&orgajax=true&mode='+mode+'&sharing_module='+modulename+'&shareid='+id,
-			onComplete: function(response) {ldelim}
-				$("status").style.display="none";
-				$("tempdiv").innerHTML=response.responseText;
-			{rdelim}
-		{rdelim}
-	);
+        $("status").style.display="inline";
+        new Ajax.Request(
+                'index.php',
+                {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+                        method: 'post',
+                        postBody: 'module=Users&action=UsersAjax&orgajax=true&mode='+mode+'&sharing_module='+modulename+'&sh
+areid='+id,
+                        onComplete: function(response) {ldelim}
+                                $("status").style.display="none";
+                                $("tempdiv").innerHTML=response.responseText;
+                                if(mode == 'edit')
+                                {ldelim}
+                                        setTimeout("",10000);
+                                        var related = $('rel_module_lists').value;
+                                        fnwriteRules(modulename,related);
+                                {rdelim}
+                        {rdelim}
+                {rdelim}
+        );
 {rdelim}
 
 function fnwriteRules(module,related)

Modified: vtigercrm/trunk/modules/Users/CreateSharingRule.php
==============================================================================
--- vtigercrm/trunk/modules/Users/CreateSharingRule.php (original)
+++ vtigercrm/trunk/modules/Users/CreateSharingRule.php Tue Jun 27 09:29:44 2006
@@ -246,7 +246,7 @@
 <input type="hidden" name="sharing_module" value="'.$sharing_module.'">
 <input type="hidden" name="shareId" value="'.$shareid.'">
 <input type="hidden" name="mode" value="'.$mode.'">
-
+<input type="hidden" id="rel_module_lists" name="rel_module_lists" value="'.$relatedmodule.'">
 <div id="sharingRule" class="fixedLay">
 <table width="100%" border="0" cellpadding="3" cellspacing="0">
 <tr>




From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 27 11:29:51 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 27 Jun 2006 15:29:51 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23512=3A_?=
 =?utf-8?q?UI_issue_in_Organisation_Sharing_Privileges?=
In-Reply-To: <076.94fe2310a682ae79f7fc33244bb4f97f@vtiger.fosslabs.com>
References: <076.94fe2310a682ae79f7fc33244bb4f97f@vtiger.fosslabs.com>
Message-ID: <085.b15a9c2180ca7dc9e7877f2201ac85fa@vtiger.fosslabs.com>

#512: UI issue in Organisation Sharing Privileges
---------------------------+------------------------------------------------
  Reporter:  jerrydgeorge  |       Owner:  jerrydgeorge
      Type:  defect        |      Status:  closed      
  Priority:  major         |   Milestone:              
 Component:  vtigercrm     |     Version:  5.0.0       
Resolution:  fixed         |    Keywords:  UI          
---------------------------+------------------------------------------------
Changes (by jerrydgeorge):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/512>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 12:36:24 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 16:36:24 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7587 - in /vtigercrm/trunk:
 Smarty/templates/Inventory/ProductDetails.tpl
 Smarty/templates/Inventory/ProductDetailsEditView.tpl include/js/general.js
Message-ID: <20060627163624.54F2D83F723@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 27 10:36:17 2006
New Revision: 7587

Log:
* Removed the readonly for the ListPrice field where as now we can change the ListPrice value

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

Modified: vtigercrm/trunk/Smarty/templates/Inventory/ProductDetails.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Inventory/ProductDetails.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Inventory/ProductDetails.tpl Tue Jun 27 10:36:17 2006
@@ -56,7 +56,7 @@
 				
 			</td>
 			<td nowrap valign="top">
-				<input type="text" id="txtListPrice1" name="txtListPrice1" value="{$UNIT_PRICE}" class="txtBox" readonly onBlur="FindDuplicate(); settotalnoofrows(); calcTotal(this)"/>&nbsp;<img src="themes/blue/images/pricebook.gif" onclick="priceBookPickList(this)" style="cursor: pointer;" title="Price Book" align="absmiddle" />
+				<input type="text" id="txtListPrice1" name="txtListPrice1" value="{$UNIT_PRICE}" class="txtBox" onBlur="FindDuplicate(); settotalnoofrows(); calcTotal(this)"/>&nbsp;<img src="themes/blue/images/pricebook.gif" onclick="priceBookPickList(this)" style="cursor: pointer;" title="Price Book" align="absmiddle" />
 			</td>
 			<!-- Added for Tax calculation-->
 			<td valign="top" style="padding-bottom:5px;">

Modified: vtigercrm/trunk/Smarty/templates/Inventory/ProductDetailsEditView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Inventory/ProductDetailsEditView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Inventory/ProductDetailsEditView.tpl Tue Jun 27 10:36:17 2006
@@ -71,7 +71,7 @@
 				{$data.$unitPrice}&nbsp;
 			</td>
 			<td nowrap valign="top">
-				<input type="text" name="{$txtListPrice}" value="{$data.$txtListPrice}" class="txtBox" readonly onBlur="FindDuplicate(); settotalnoofrows(); calcTotal(this)"/>&nbsp;
+				<input type="text" name="{$txtListPrice}" value="{$data.$txtListPrice}" class="txtBox" onBlur="FindDuplicate(); settotalnoofrows(); calcTotal(this)"/>&nbsp;
 				<img src="themes/blue/images/pricebook.gif" onclick="priceBookPickList(this)" style="cursor: pointer;" title="Price Book" align="absmiddle" />
 			</td>
 			<!-- Added for Tax calculation-->

Modified: vtigercrm/trunk/include/js/general.js
==============================================================================
--- vtigercrm/trunk/include/js/general.js (original)
+++ vtigercrm/trunk/include/js/general.js Tue Jun 27 10:36:17 2006
@@ -1443,7 +1443,7 @@
 	coltwo.innerHTML="<div id='qtyInStock"+count+"'>";	
 	colthree.innerHTML="<input type='text' id='txtQty"+count+"' name='txtQty"+count+"' class='detailedViewTextBox' onfocus='this.className=\"detailedViewTextBoxOn\"' onBlur='this.className=\"detailedViewTextBox\"; FindDuplicate(); settotalnoofrows(); calcTotal(this);' /> ";
 	colfour.innerHTML="&nbsp;</div><div id='unitPrice"+count+"'></div>";
-	colfive.innerHTML="<input type='text' id='txtListPrice"+count+"' name='txtListPrice"+count+"' class='txtBox' readonly onBlur='FindDuplicate(); settotalnoofrows(); calcTotal(this)'>&nbsp;<img src='themes/blue/images/pricebook.gif' onClick='priceBookPickList(this)' align='absmiddle' style='cursor:hand;cursor:pointer' title='Price Book' /> ";
+	colfive.innerHTML="<input type='text' id='txtListPrice"+count+"' name='txtListPrice"+count+"' class='txtBox' onBlur='FindDuplicate(); settotalnoofrows(); calcTotal(this)'>&nbsp;<img src='themes/blue/images/pricebook.gif' onClick='priceBookPickList(this)' align='absmiddle' style='cursor:hand;cursor:pointer' title='Price Book' /> ";
 	//Added for tax calculation
 	colsix.innerHTML="<input type='text' id='txtTaxTotal"+count+"' name='txtTaxTotal"+count+"' value='' class='detailedViewTextBox' style='width:65%;'><input type='hidden' id='hdnTaxTotal"+count+"' name='hdnTaxTotal"+count+"'>&nbsp;<input type='button' name='showTax' value=' ... '  class='classBtnSmall'  onclick='fnshow_Hide(\"tax_Lay"+count+"\");'><div id='tax_Lay"+count+"' style='width:93%;position:relative;border:1px dotted #CCCCCC;display:none;background-color:#FFFFCC;top:5px;padding:5px;'><table width='100%' border='0' cellpadding='0' cellspacing='0' class='small'><tr id='vatrow"+count+"'><td align='left' width='40%' style='border:0px solid red;'><input type='text' id='txtVATTax"+count+"' name='txtVATTax"+count+"' class='txtBox' onBlur='ValidateTax(\"txtVATTax"+count+"\"); calcTotal(this);'/>%&nbsp;</td><td width='20%' align='right' style='border:0px solid red;'>&nbsp;VAT</td><td align='left' width='40%' style='border:0px solid red;'><input type='text' id='txtVATTaxTotal"+count+"' name='txtVATTaxTotal"+count+"' class='txtBox' onBlur='ValidateTax(\"txtVATTaxTotal"+count+"\"); calcTotal(this);'/></td></tr><tr id='salesrow"+count+"'><td align='left' style='border:0px solid red;'><input type='text' id='txtSalesTax"+count+"' name='txtSalesTax"+count+"' class='txtBox' onBlur='ValidateTax(\"txtSalesTax"+count+"\"); calcTotal(this);'/>%&nbsp;</td><td align='right' style='border:0px solid red;'>&nbsp;Sales</td><td align='left' style='border:0px solid red;'><input type='text' id='txtSalesTaxTotal"+count+"' name='txtSalesTaxTotal"+count+"' class='txtBox' onBlur='ValidateTax(\"txtSalesTaxTotal"+count+"\"); calcTotal(this);'/></td></tr><tr id='servicerow"+count+"'><td align='left' style='border:0px solid red;'><input type='text' id='txtServiceTax"+count+"' name='txtServiceTax"+count+"' class='txtBox' onBlur='ValidateTax(\"txtServiceTax"+count+"\"); calcTotal(this);'/>%&nbsp;</td><td align='right' style='border:0px solid red;'>&nbsp;Service</td><td align='left' style='border:0px solid red;'><input type='text' id='txtServiceTaxTotal"+count+"' name='txtServiceTaxTotal"+count+"' class='txtBox' onBlur='ValidateTax(\"txtServiceTaxTotal"+count+"\"); calcTotal(this);'/></td></tr></table></div>";
 
@@ -1482,7 +1482,7 @@
 	colone.innerHTML="<input type='text'id='txtProduct"+count+"' name='txtProduct"+count+"' class='txtBox' readonly/>&nbsp;<img src='themes/blue/images/search.gif' onclick='productPickList(this,\""+module+"\")' align='absmiddle' /><input type='hidden' id='hdnProductId"+count+"' name='hdnProductId"+count+"'>";
 	coltwo.innerHTML="<input type='text'id='txtQty"+count+"' name='txtQty"+count+"' class='detailedViewTextBox' onfocus='this.className=\"detailedViewTextBoxOn\"' onBlur='this.className=\"detailedViewTextBox\"; FindDuplicate(); settotalnoofrows(); calcTotal(this);' /> ";
 	colthree.innerHTML="&nbsp;<div id='unitPrice"+count+"'></div>";
-	colfour.innerHTML="<input type='text' id='txtListPrice"+count+"' name='txtListPrice"+count+"' class='txtBox' readonly onBlur='FindDuplicate(); settotalnoofrows(); calcTotal(this)'>&nbsp;<img src='themes/blue/images/pricebook.gif' onClick='priceBookPickList(this)' align='absmiddle' style='cursor:hand;cursor:pointer' title='Price Book' /> ";
+	colfour.innerHTML="<input type='text' id='txtListPrice"+count+"' name='txtListPrice"+count+"' class='txtBox' onBlur='FindDuplicate(); settotalnoofrows(); calcTotal(this)'>&nbsp;<img src='themes/blue/images/pricebook.gif' onClick='priceBookPickList(this)' align='absmiddle' style='cursor:hand;cursor:pointer' title='Price Book' /> ";
 
 	//Added for tax calculation
 	colfive.innerHTML="<input type='text' id='txtTaxTotal"+count+"' name='txtTaxTotal"+count+"' value='' class='detailedViewTextBox' style='width:65%;'><input type='hidden' id='hdnTaxTotal"+count+"' name='hdnTaxTotal"+count+"'>&nbsp;<input type='button' name='showTax' value=' ... '  class='classBtnSmall'  onclick='fnshow_Hide(\"tax_Lay"+count+"\");'><div id='tax_Lay"+count+"' style='width:93%;position:relative;border:1px dotted #CCCCCC;display:none;background-color:#FFFFCC;top:5px;padding:5px;'><table width='100%' border='0' cellpadding='0' cellspacing='0' class='small'><tr id='vatrow"+count+"'><td align='left' width='40%' style='border:0px solid red;'><input type='text' id='txtVATTax"+count+"' name='txtVATTax"+count+"' class='txtBox' onBlur='ValidateTax(\"txtVATTax"+count+"\"); calcTotal(this);'/>%&nbsp;</td><td width='20%' align='right' style='border:0px solid red;'>&nbsp;VAT</td><td align='left' width='40%' style='border:0px solid red;'><input type='text' id='txtVATTaxTotal"+count+"' name='txtVATTaxTotal"+count+"' class='txtBox' onBlur='ValidateTax(\"txtVATTaxTotal"+count+"\"); calcTotal(this);'/></td></tr><tr id='salesrow"+count+"'><td align='left' style='border:0px solid red;'><input type='text' id='txtSalesTax"+count+"' name='txtSalesTax"+count+"' class='txtBox' onBlur='ValidateTax(\"txtSalesTax"+count+"\"); calcTotal(this);'/>%&nbsp;</td><td align='right' style='border:0px solid red;'>&nbsp;Sales</td><td align='left' style='border:0px solid red;'><input type='text' id='txtSalesTaxTotal"+count+"' name='txtSalesTaxTotal"+count+"' class='txtBox' onBlur='ValidateTax(\"txtSalesTaxTotal"+count+"\"); calcTotal(this);'/></td></tr><tr id='servicerow"+count+"'><td align='left' style='border:0px solid red;'><input type='text' id='txtServiceTax"+count+"' name='txtServiceTax"+count+"' class='txtBox' onBlur='ValidateTax(\"txtServiceTax"+count+"\"); calcTotal(this);'/>%&nbsp;</td><td align='right' style='border:0px solid red;'>&nbsp;Service</td><td align='left' style='border:0px solid red;'><input type='text' id='txtServiceTaxTotal"+count+"' name='txtServiceTaxTotal"+count+"' class='txtBox' onBlur='ValidateTax(\"txtServiceTaxTotal"+count+"\"); calcTotal(this);'/></td></tr></table></div>";




From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 27 12:41:03 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 27 Jun 2006 16:41:03 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231355=3A?=
 =?utf-8?q?_Pricebook_value_is_readonly?=
In-Reply-To: <076.88e9291262713bf51b842aecd697a80a@vtiger.fosslabs.com>
References: <076.88e9291262713bf51b842aecd697a80a@vtiger.fosslabs.com>
Message-ID: <085.a093e5cbbe297d3ca53103065242eea1@vtiger.fosslabs.com>

#1355: Pricebook value is readonly
-----------------------------------+----------------------------------------
  Reporter:  cristian at nethesis.it  |       Owner:  mickie
      Type:  defect                |      Status:  closed
  Priority:  major                 |   Milestone:        
 Component:  vtigercrm             |     Version:  5.0.0 
Resolution:  fixed                 |    Keywords:        
-----------------------------------+----------------------------------------
Changes (by mickie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 Dear cristian,

 Thanks for notifying the missed feature. now we have changed this
 ListPrice as editable and the user can change the ListPrice value
 manually. The files have been checkedin in the svn and will be available
 in our coming release.

 Thanks
 Mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1355>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 12:51:40 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 16:51:40 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7588 -
 /vtigercrm/trunk/Smarty/templates/Inventory/InventoryActions.tpl
Message-ID: <20060627165140.D2C9E83F720@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 27 10:51:36 2006
New Revision: 7588

Log:
* Modified to fix the return module ticket - 1345 in trac

Modified:
    vtigercrm/trunk/Smarty/templates/Inventory/InventoryActions.tpl

Modified: vtigercrm/trunk/Smarty/templates/Inventory/InventoryActions.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Inventory/InventoryActions.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Inventory/InventoryActions.tpl Tue Jun 27 10:51:36 2006
@@ -141,7 +141,7 @@
 	   <!-- SO Actions ends -->
 
 	{elseif $MODULE eq 'Quotes'}
-	   <!-- Vendors Actions starts -->
+	   <!-- Quotes Actions starts -->
 	   <tr>
 		<td align="left" style="padding-left:10px;">
 			<img src="{$IMAGE_PATH}pointer.gif" hspace="5" align="absmiddle"/> 
@@ -151,10 +151,10 @@
 	   <tr>
 		<td align="left" style="padding-left:10px;border-bottom:1px dotted #CCCCCC;">
 			<img src="{$IMAGE_PATH}pointer.gif" hspace="5" align="absmiddle"/>
-			<a href="javascript: document.DetailView.return_module.value='SalesOrder'; document.DetailView.return_action.value='DetailView'; document.DetailView.convertmode.value='quotetoso'; document.DetailView.module.value='SalesOrder'; document.DetailView.action.value='EditView'; document.DetailView.submit();" class="webMnu">{$APP.LBL_GENERATE} {$APP.SalesOrder}</a> 
-		</td>
-	   </tr>
-	   <!-- Vendors Actions ends -->
+			<a href="javascript: document.DetailView.return_module.value='{$MODULE}'; document.DetailView.return_action.value='DetailView'; document.DetailView.convertmode.value='quotetoso'; document.DetailView.module.value='SalesOrder'; document.DetailView.action.value='EditView'; document.DetailView.submit();" class="webMnu">{$APP.LBL_GENERATE} {$APP.SalesOrder}</a> 
+		</td>
+	   </tr>
+	   <!-- Quotes Actions ends -->
 
 	{elseif $MODULE eq 'Invoice'}
 	   <!-- Invoice Actions starts -->




From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 27 12:52:19 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 27 Jun 2006 16:52:19 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231345=3A?=
 =?utf-8?q?_Error_saving_the_sales_order?=
In-Reply-To: <076.2d41a315f9cfd034311ac755935afb51@vtiger.fosslabs.com>
References: <076.2d41a315f9cfd034311ac755935afb51@vtiger.fosslabs.com>
Message-ID: <085.8d50b6f69593d4f648834f4e2d8600d0@vtiger.fosslabs.com>

#1345: Error saving the sales order
------------------------+---------------------------------------------------
  Reporter:  Simon      |       Owner:  mickie             
      Type:  defect     |      Status:  closed             
  Priority:  major      |   Milestone:  5.0.0              
 Component:  vtigercrm  |     Version:  5.0.0              
Resolution:  fixed      |    Keywords:  quotes, sales order
------------------------+---------------------------------------------------
Changes (by mickie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 This issue has been fixed and will be available in our coming release.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1345>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 27 12:56:00 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 27 Jun 2006 16:56:00 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231252=3A?=
 =?utf-8?q?_Ticket_-_Activity_-_Relation?=
In-Reply-To: <076.f54f7a210a2bc06ab7c96747af544498@vtiger.fosslabs.com>
References: <076.f54f7a210a2bc06ab7c96747af544498@vtiger.fosslabs.com>
Message-ID: <085.bbd01062570e59347e66ddec6d53d04f@vtiger.fosslabs.com>

#1252: Ticket - Activity - Relation
------------------------+---------------------------------------------------
  Reporter:  eberled    |       Owner:  mickie
      Type:  defect     |      Status:  new   
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.1 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mickie):

  * version:  5.0.0 => 5.0.1

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1252>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 27 12:56:10 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 27 Jun 2006 16:56:10 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231326=3A?=
 =?utf-8?q?_Auto_Tax_and_quote_workflow_improvement?=
In-Reply-To: <076.151dc33d86c777ebfd974d4b1529c9ea@vtiger.fosslabs.com>
References: <076.151dc33d86c777ebfd974d4b1529c9ea@vtiger.fosslabs.com>
Message-ID: <085.30eb5690279fa6f639563a88ba47a60b@vtiger.fosslabs.com>

#1326: Auto Tax and quote workflow improvement
--------------------------+-------------------------------------------------
  Reporter:  mvhman       |       Owner:  mickie                  
      Type:  enhancement  |      Status:  new                     
  Priority:  major        |   Milestone:  5.0.0                   
 Component:  vtigercrm    |     Version:  5.0.0                   
Resolution:               |    Keywords:  auto tax improved quotes
--------------------------+-------------------------------------------------
Changes (by mickie):

  * type:  defect => enhancement

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1326>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 13:01:57 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 17:01:57 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7589 -
	/vtigercrm/trunk/index.php
Message-ID: <20060627170157.2EBC283F720@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 27 11:01:32 2006
New Revision: 7589

Log:
Security check for Administration module done

Modified:
    vtigercrm/trunk/index.php

Modified: vtigercrm/trunk/index.php
==============================================================================
--- vtigercrm/trunk/index.php (original)
+++ vtigercrm/trunk/index.php Tue Jun 27 11:01:32 2006
@@ -306,7 +306,7 @@
  	         header( "Pragma: no-cache" );        
  	}
 
-        if($module == 'Users' || $module == 'Home' || $module == 'Administration' || $module == 'uploads' || $module == 'Calendar')
+        if($module == 'Users' || $module == 'Home' || $module == 'uploads' || $module == 'Calendar')
         {
           $skipSecurityCheck=true;
         }




From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 13:04:00 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 17:04:00 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7590 -
	/vtigercrm/trunk/include/utils/UserInfoUtil.php
Message-ID: <20060627170400.B945783F73D@vtiger.fosslabs.com>

Author: richie
Date: Tue Jun 27 11:03:51 2006
New Revision: 7590

Log:
Security check for Administration module done

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

Modified: vtigercrm/trunk/include/utils/UserInfoUtil.php
==============================================================================
--- vtigercrm/trunk/include/utils/UserInfoUtil.php (original)
+++ vtigercrm/trunk/include/utils/UserInfoUtil.php Tue Jun 27 11:03:51 2006
@@ -1365,7 +1365,7 @@
 	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 == 'Calendar')
+	if($module == 'Users' || $module == 'Home' || $module == 'uploads' || $module == 'Calendar')
 	{
 		//These modules dont have security right now
 		$permission = "yes";
@@ -1375,7 +1375,7 @@
 	}
 	
 	//Checking the Access for the Settings Module
-	if($module == 'Settings')
+	if($module == 'Settings' || $module == 'Administration')
 	{
 		if(! $is_admin)
 		{




From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 27 14:03:43 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 27 Jun 2006 18:03:43 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231368=3A?=
 =?utf-8?q?_Inactive_Import/Export_button_in_Campaigns_module?=
Message-ID: <076.e9c23975424fab1b5c70a96fbb22a0fb@vtiger.fosslabs.com>

#1368: Inactive Import/Export button in Campaigns module
-----------------------+----------------------------------------------------
 Reporter:  gopal      |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  major      |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 We have an Import/Export button in Campaigns module, which doesn't work.
 But the inactive state ALT tag says Import Campaigns, which is a
 misleading. BTW, end-user may think this option is disabled for their user
 profile. But the fact is this feature is not available for anyone. Then it
 is better we either we don't show any ALT text or Icon itself.

 We may need to address these icons in a better way.

 Thanks,

 Gopal
 (vtiger CRM)

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1368>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 27 14:11:04 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 27 Jun 2006 18:11:04 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231369=3A?=
 =?utf-8?q?_Campaigns=3A_Column_Sorting_is_missing?=
Message-ID: <076.905324df51cc4ae1000ffb348c83fce2@vtiger.fosslabs.com>

#1369: Campaigns: Column Sorting is missing
-----------------------+----------------------------------------------------
 Reporter:  gopal      |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  critical   |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 In Campaigns, Only Campaign Name and Assiged To has sorting. For all other
 columns SOrting is not available.

 Thanks,

 Gopal

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1369>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 27 14:16:42 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 27 Jun 2006 18:16:42 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231370=3A?=
 =?utf-8?q?_Campaigns=3A_Disconnected_Simple_Time_Filter?=
Message-ID: <076.ba40063443d1d72768187489cd3eea9d@vtiger.fosslabs.com>

#1370: Campaigns: Disconnected Simple Time Filter
-----------------------+----------------------------------------------------
 Reporter:  gopal      |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  critical   |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 While scrolling verticlly, Simple Time Filter is disconnected from Filters
 tab. BTW, the one tab name is single line whare as other one in two lines.

 Issue in IE 6.

 Gopal
 vtiger CRM

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1370>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Tue Jun 27 14:29:08 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 27 Jun 2006 18:29:08 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7591 -
	/vtigercrm/trunk/data/CRMEntity.php
Message-ID: <20060627182908.C717483F795@vtiger.fosslabs.com>

Author: saraj
Date: Tue Jun 27 12:29:05 2006
New Revision: 7591

Log:
changes made to update only permitted fields

Modified:
    vtigercrm/trunk/data/CRMEntity.php

Modified: vtigercrm/trunk/data/CRMEntity.php
==============================================================================
--- vtigercrm/trunk/data/CRMEntity.php (original)
+++ vtigercrm/trunk/data/CRMEntity.php Tue Jun 27 12:29:05 2006
@@ -419,8 +419,32 @@
 	if($this->mode == 'edit')
 	{
 		$description_val = from_html($adb->formatString("vtiger_crmentity","description",$this->column_fields['description']),($insertion_mode == 'edit')?true:false);
-		$sql = "update vtiger_crmentity set smownerid=".$ownerid.",modifiedby=".$current_user->id.",description=".$description_val.", modifiedtime=".$adb->formatString("vtiger_crmentity","modifiedtime",$date_var)." where crmid=".$this->id;
-
+
+		require('user_privileges/user_privileges_'.$current_user->id.'.php');
+		$tabid = getTabid($module);
+		if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] ==0)
+		{
+			$sql = "update vtiger_crmentity set smownerid=".$ownerid.",modifiedby=".$current_user->id.",description=".$description_val.", modifiedtime=".$adb->formatString("vtiger_crmentity","modifiedtime",$date_var)." where crmid=".$this->id;
+		}
+		else
+		{
+			$profileList = getCurrentUserProfileList();
+			$perm_qry = "SELECT columnname FROM vtiger_field INNER JOIN vtiger_profile2field ON vtiger_profile2field.fieldid = vtiger_field.fieldid INNER JOIN vtiger_def_org_field ON vtiger_def_org_field.fieldid = vtiger_field.fieldid WHERE vtiger_field.tabid = ".$tabid." AND vtiger_profile2field.visible = 0 AND vtiger_profile2field.profileid IN ".$profileList." AND vtiger_def_org_field.visible = 0 and vtiger_field.tablename='vtiger_crmentity' and vtiger_field.displaytype in (1,3);";
+			$perm_result = $adb->query($perm_qry);
+			$perm_rows = $adb->num_rows($perm_result);
+			for($i=0; $i<$perm_rows; $i++)
+			{
+				$columname[]=$adb->query_result($perm_result,$i,"columnname");
+			}
+			if(is_array($columname) && in_array("description",$columname))
+			{
+				$sql = "update vtiger_crmentity set smownerid=".$ownerid.",modifiedby=".$current_user->id.",description=".$description_val.", modifiedtime=".$adb->formatString("vtiger_crmentity","modifiedtime",$date_var)." where crmid=".$this->id;
+			}
+			else
+			{
+				$sql = "update vtiger_crmentity set smownerid=".$ownerid.",modifiedby=".$current_user->id.", modifiedtime=".$adb->formatString("vtiger_crmentity","modifiedtime",$date_var)." where crmid=".$this->id;
+			}
+		}
 		$adb->query($sql);
 		$sql1 ="delete from vtiger_ownernotify where crmid=".$this->id;
 		$adb->query($sql1);
@@ -541,7 +565,27 @@
 	  {
 		  $update = '';
 		  $tabid= getTabid($module);	
-		  $sql = "select * from vtiger_field where tabid=".$tabid." and tablename='".$table_name."' and displaytype in (1,3)"; 
+		  require('user_privileges/user_privileges_'.$current_user->id.'.php');
+		  if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] ==0)
+		  {
+
+			  $sql = "select * from vtiger_field where tabid=".$tabid." and tablename='".$table_name."' and displaytype in (1,3)"; 
+		  }
+		  else
+		  {
+			  $profileList = getCurrentUserProfileList();
+			  $sql = "SELECT *
+			  FROM vtiger_field
+			  INNER JOIN vtiger_profile2field
+			  ON vtiger_profile2field.fieldid = vtiger_field.fieldid
+			  INNER JOIN vtiger_def_org_field
+			  ON vtiger_def_org_field.fieldid = vtiger_field.fieldid
+			  WHERE vtiger_field.tabid = ".$tabid."
+			  AND vtiger_profile2field.visible = 0 
+			  AND vtiger_profile2field.profileid IN ".$profileList."
+			  AND vtiger_def_org_field.visible = 0 and vtiger_field.tablename='".$table_name."' and vtiger_field.displaytype in (1,3)";
+		  }	   
+
 	  }
 	  else
 	  {




From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 27 14:33:13 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 27 Jun 2006 18:33:13 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231371=3A?=
 =?utf-8?q?_Campaigns_Custom_View=3A_Double_Veritcal_scrolling?=
Message-ID: <076.95f3ca699904fad0d589b89d3722d2c1@vtiger.fosslabs.com>

#1371: Campaigns Custom View: Double Veritcal scrolling
-----------------------+----------------------------------------------------
 Reporter:  gopal      |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  critical   |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 There are two vertcal scroll bars in Campaigns Custom View. And there is
 no SAVE CANCEL Buttons.

 Browser: IE 6.

 It is very crusial we support vtiger in IE as well. There are more users
 using IE in the World particulary Businesses than any other Browsers.

 Thanks,

 Gopal

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1371>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 27 15:25:06 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 27 Jun 2006 19:25:06 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231372=3A?=
 =?utf-8?q?_Custom_Veiw=3A_List_in_Metrics_option_is_wrong_function?=
Message-ID: <076.4043c7ad57292395a7049af96923eab8@vtiger.fosslabs.com>

#1372: Custom Veiw: List in Metrics option is wrong function
-----------------------+----------------------------------------------------
 Reporter:  gopal      |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  critical   |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 I think "List in Metrics" feature can be part of the Reports rather Custom
 Views. Functionally, from the Reports module you can pull the data and
 aggregate it based on the required functions. I am not clear, how a custom
 view can become a  Key Metric.

 Please contact me if you need any clarifications.

 Thanks,
 Gopal

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1372>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 27 15:26:56 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 27 Jun 2006 19:26:56 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231373=3A?=
 =?utf-8?q?_Accounts_=3E_New_Custom_view_=3A_No_navigation_link?=
Message-ID: <076.89b574125c4524982f3f9b818aabf9f7@vtiger.fosslabs.com>

#1373: Accounts > New Custom view : No navigation link
-----------------------+----------------------------------------------------
 Reporter:  gopal      |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  major      |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 There is no navigation link to access Accounts from:

 Accounts > New Custom view

 Applicable for all modules.

 Thanks,

 Gopal

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1373>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 27 15:34:14 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 27 Jun 2006 19:34:14 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231374=3A?=
	=?utf-8?q?_Home_Page_-_Fully_collapsed?=
Message-ID: <076.5909c15d740b3c4920a3ae718e2cea9e@vtiger.fosslabs.com>

#1374: Home Page - Fully collapsed
-----------------------+----------------------------------------------------
 Reporter:  gopal      |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  critical   |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 Demo: Bleeding Edge.

 Browser: IE 6

 Home page need to be rebuilt properly. All the boxes need to formatted
 properly.

 We need to provide a useful data in two dimensional matrix similar to
 previous version otherwise it will become just a Site map in a Website.
 Except Key Metrics all other boxes are not formatted. BTW, the page icon
 for before links doesn't convey any meaning to me, instead we can use some
 arrow or bullet.

 Thanks,

 Gopal

 Thanks,

 Gopal

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1374>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 27 15:38:21 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 27 Jun 2006 19:38:21 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231375=3A?=
 =?utf-8?q?_Ajax_Chat_window_need_to_be_improved?=
Message-ID: <076.9a61ff39258b85bdf4e662518c1eefac@vtiger.fosslabs.com>

#1375: Ajax Chat window need to be improved
-----------------------+----------------------------------------------------
 Reporter:  gopal      |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  blocker    |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 Ajax Chat Window need to be improved. Currently the Public Chat junction
 is splitted into two slices and it shows as given below:

 admin
 admin
 admin
 admin
 admin
 admin
 admin
 admin
 admin

 Chat Window.

 Consider this issue as a show stopper in IE 6.

 Thanks,

 Gopal

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1375>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 27 15:40:31 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 27 Jun 2006 19:40:31 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231376=3A?=
 =?utf-8?q?_Error_message=3A_Please_select_atleast_one_record?=
Message-ID: <076.41781f98ac9f5dfb9527fcc3083cd3c1@vtiger.fosslabs.com>

#1376: Error message: Please select atleast one record
-----------------------+----------------------------------------------------
 Reporter:  gopal      |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  minor      |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 Change Please select atleast one record

 to Please select '''at least''' one record.

 Since '''atleast''' is not a single word.

 Thanks,
 Gopal

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1376>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 27 15:41:58 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 27 Jun 2006 19:41:58 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231377=3A?=
 =?utf-8?q?_Error_Message_in_Emails_module?=
Message-ID: <076.f36d424ef8cb55fbe8cd894d788526eb@vtiger.fosslabs.com>

#1377: Error Message in Emails module
-----------------------+----------------------------------------------------
 Reporter:  gopal      |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  blocker    |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 Following error message is displayed in Emails list view:

 Warning: Division by zero in /usr/local/share/vtiger-
 demo/include/utils/ListViewUtils.php on line 371

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1377>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 27 15:44:17 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 27 Jun 2006 19:44:17 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231378=3A?=
 =?utf-8?q?_Emails=3A_Improper_Export_link?=
Message-ID: <076.70d0318c40a5216b6e6108b9de7b7e0f@vtiger.fosslabs.com>

#1378: Emails: Improper Export link
-----------------------+----------------------------------------------------
 Reporter:  gopal      |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  blocker    |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 In Email Module if I click Export icon, it shows the Login page. I think
 noone is going to export emails into CSV file format or any other format
 similar to Mozilla or Outlook. Please correct me if I am wrong.

 Thanks,

 Gopal

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1378>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 27 15:49:14 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 27 Jun 2006 19:49:14 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231379=3A?=
	=?utf-8?q?_Calendar=3A_+_icon_position?=
Message-ID: <076.0c79d92ae6c8bcb494ec7242b613447b@vtiger.fosslabs.com>

#1379: Calendar: + icon position
-----------------------+----------------------------------------------------
 Reporter:  gopal      |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  critical   |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 Curently the + icon on date, hour view is on top right hand side of the
 cell. Due to this the row jumps. It is better have + icon at lower rhs
 corner.

 Please get back to me for clarifications.

 Thanks,

 Gopal

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1379>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 27 15:52:27 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 27 Jun 2006 19:52:27 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231380=3A?=
 =?utf-8?q?_Calendar=3A_Add_event_page_need_improvement?=
Message-ID: <076.cfb74cfa6ccd0580016cef47d94dfed2@vtiger.fosslabs.com>

#1380: Calendar: Add event page need improvement
-----------------------+----------------------------------------------------
 Reporter:  gopal      |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  major      |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 Currently the Add new Evnet Page is not exactly displayed at center of the
 screen and the buttons are hidden. Only part of the screen is visible. It
 is better to have:

 Buttons on top as well.

 Provide option to move the pop-up page so that I can move uo if it scroll
 down.

 Please get back to me for clarifications.

 Gopal

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1380>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 27 15:56:35 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 27 Jun 2006 19:56:35 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231381=3A?=
	=?utf-8?q?_To_Do_-_Wrong_grouping?=
Message-ID: <076.badf11791e67728b99c8aecc440697a7@vtiger.fosslabs.com>

#1381: To Do - Wrong grouping
-----------------------+----------------------------------------------------
 Reporter:  gopal      |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  critical   |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 Todo is grouped under Add Event group. In fact To do is a task rather
 Event.

 Call and Meeting under Add Event is OK but To DO cannot be displayed under
 Add Event.

 It is better call Add Event menu as Add Activity so the you can
 accommodate both Events as well as Tasks. By the way, it is better to
 retain Task or To Do. Donot use Task at one place and To Do at other
 place.

 Thanks,
 Gopal

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1381>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 27 16:10:50 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 27 Jun 2006 20:10:50 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231382=3A?=
 =?utf-8?q?_Calendar=3A_Start_My_Calendar_Time_=2E=2E?=
Message-ID: <076.c0c6252fbd0b46e64e1992decb196d6d@vtiger.fosslabs.com>

#1382: Calendar: Start My Calendar Time ..
-----------------------+----------------------------------------------------
 Reporter:  gopal      |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  critical   |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 We have time starting from 6 AM to 4 PM. I think there are many people
 work on the night shifts or evening shifts. Their calendar starts at any
 time.

 It is better to have 12.00 AM to 11.00 PM drop down list.

 By the way, we need to provide a start time and end time for setting
 Working Hours.

 Please get back to me if you need any clarifications.

 Regards,
 Gopal

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1382>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 27 16:15:14 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 27 Jun 2006 20:15:14 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231383=3A?=
 =?utf-8?q?_Usage_of_=22Faq=22_module_name?=
Message-ID: <076.2e1bf80fcff6a7f829a7cb26e55a7836@vtiger.fosslabs.com>

#1383: Usage of "Faq" module name
-----------------------+----------------------------------------------------
 Reporter:  gopal      |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  major      |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 Kindly change the module name '''Faq''' to '''FAQ''' as it is Acronym for
 "Frequesntly Asked Questions".

 Please get back to me if you need any carifications.

 Regards,
 Gopal

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1383>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 27 16:17:39 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 27 Jun 2006 20:17:39 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231384=3A?=
	=?utf-8?q?_RSS_-_RHS_Image?=
Message-ID: <076.6dc4261cd0c8a5800f9a2fc04552b1d0@vtiger.fosslabs.com>

#1384: RSS - RHS Image
-----------------------+----------------------------------------------------
 Reporter:  gopal      |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  major      |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 In most of the modules we have the RHS image in All upper case. But in RSS
 it looks differently. It is better to consistently use the same case in
 all the modules.

 Thanks,
 Gopal

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1384>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Tue Jun 27 16:19:58 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Tue, 27 Jun 2006 20:19:58 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231385=3A?=
 =?utf-8?q?_Tool_bar_icons_-_Page_opens_at_different_palces?=
Message-ID: <076.a97c3862753f2ecb63d9e35d91c10490@vtiger.fosslabs.com>

#1385: Tool bar icons - Page opens at different palces
-----------------------+----------------------------------------------------
 Reporter:  gopal      |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  major      |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 Upon clciking the tool bar icons, pages are opening at different places.
 It is better to have some consistency.

 Gopal

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1385>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 28 02:14:03 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 28 Jun 2006 06:14:03 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231364=3A?=
 =?utf-8?q?_Non_admin_user_can_jump_to_user_settings_by_point_to_url?=
In-Reply-To: <076.ff7d1fb05c8daa4389a7c4cc4877a33d@vtiger.fosslabs.com>
References: <076.ff7d1fb05c8daa4389a7c4cc4877a33d@vtiger.fosslabs.com>
Message-ID: <085.71d9e71dfd39491d1a1b07fa55fe6ba0@vtiger.fosslabs.com>

#1364: Non admin user can jump to user settings by point to url
-----------------------------------------------+----------------------------
  Reporter:  Brian Laughlin <brian at awnow.com>  |       Owner:  don     
      Type:  defect                            |      Status:  closed  
  Priority:  critical                          |   Milestone:  5.0.0   
 Component:  vtigercrm                         |     Version:  5.0.0   
Resolution:  fixed                             |    Keywords:  security
-----------------------------------------------+----------------------------
Changes (by don):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1364>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 28 02:19:02 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 28 Jun 2006 06:19:02 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231151=3A?=
 =?utf-8?q?_Error_message_in_Installer=2E=2E?=
In-Reply-To: <076.5644658cbeac029416aebb3b898c0527@vtiger.fosslabs.com>
References: <076.5644658cbeac029416aebb3b898c0527@vtiger.fosslabs.com>
Message-ID: <085.bdab3556f8df9d8308cc9d58361fdd48@vtiger.fosslabs.com>

#1151: Error message in Installer..
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  Richie  
      Type:  defect     |      Status:  reopened
  Priority:  critical   |   Milestone:          
 Component:  vtigercrm  |     Version:  5.0.0   
Resolution:             |    Keywords:          
------------------------+---------------------------------------------------
Comment (by richie):

 Why wouldn't vtigercrm's installer catch an exception that indicates an
 incorrect password, and handle the readable error message in the catch
 block? >> It is currently doing that. The message was redundant hence the
 action.

 Please reconsider whether patching the adodb source to suppress a
 legitimate error condition is what we want to do here.
 Any patch to adodb or any of the other snapshotted libraries will prevent
 distros from managing them as external dependencies.

 I stand corrected. Will see what can be done. Thanks for highlighting
 this. I did not consider this aspect at all.
 Appreciate this.

 Richie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1151>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 28 02:31:09 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 28 Jun 2006 06:31:09 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231151=3A?=
 =?utf-8?q?_Error_message_in_Installer=2E=2E?=
In-Reply-To: <076.5644658cbeac029416aebb3b898c0527@vtiger.fosslabs.com>
References: <076.5644658cbeac029416aebb3b898c0527@vtiger.fosslabs.com>
Message-ID: <085.8bc07dd661159d0eabbe481da4d8bf07@vtiger.fosslabs.com>

#1151: Error message in Installer..
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  Richie  
      Type:  defect     |      Status:  reopened
  Priority:  critical   |   Milestone:          
 Component:  vtigercrm  |     Version:  5.0.0   
Resolution:             |    Keywords:          
------------------------+---------------------------------------------------
Comment (by mmbrich):

 (In [7592]) Jeff is right, we really should never change these distributed
 libs, and with a good lib you should never have to.
 refs #1151
 refs #7569

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1151>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 02:31:11 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 06:31:11 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7592 - in /vtigercrm/trunk:
 adodb/drivers/adodb-mysql.inc.php install/3confirmConfig.php
Message-ID: <20060628063111.6B3AB7726CA@vtiger.fosslabs.com>

Author: mmbrich
Date: Wed Jun 28 00:31:07 2006
New Revision: 7592

Log:
Jeff is right, we really should never change these distributed libs, and with a good lib you should never have to.
refs #1151
refs #7569


Modified:
    vtigercrm/trunk/adodb/drivers/adodb-mysql.inc.php
    vtigercrm/trunk/install/3confirmConfig.php

Modified: vtigercrm/trunk/adodb/drivers/adodb-mysql.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/drivers/adodb-mysql.inc.php (original)
+++ vtigercrm/trunk/adodb/drivers/adodb-mysql.inc.php Wed Jun 28 00:31:07 2006
@@ -351,9 +351,11 @@
 		if (!empty($this->port)) $argHostname .= ":".$this->port;
 		
 		if (ADODB_PHPVER >= 0x4300)
-		$this->_connectionID = @mysql_connect($argHostname,$argUsername,$argPassword,$this->forceNewConnect,$this->clientFlags);
+			$this->_connectionID = mysql_connect($argHostname,$argUsername,$argPassword,
+												$this->forceNewConnect,$this->clientFlags);
 		else if (ADODB_PHPVER >= 0x4200)
-			$this->_connectionID = mysql_connect($argHostname,$argUsername,$argPassword,$this->forceNewConnect);
+			$this->_connectionID = mysql_connect($argHostname,$argUsername,$argPassword,
+												$this->forceNewConnect);
 		else
 			$this->_connectionID = mysql_connect($argHostname,$argUsername,$argPassword);
 	

Modified: vtigercrm/trunk/install/3confirmConfig.php
==============================================================================
--- vtigercrm/trunk/install/3confirmConfig.php (original)
+++ vtigercrm/trunk/install/3confirmConfig.php Wed Jun 28 00:31:07 2006
@@ -44,11 +44,11 @@
 //Checking for database connection parameters
 if($db_type)
 {
-	include('adodb/adodb.inc.php');
-	$conn = &NewADOConnection($db_type);
-	$db_type_status = true;
-	if($conn->Connect($db_hostname,$db_username,$db_password))
-	{
+	include('adodb/adodb.inc.php');
+	$conn = &NewADOConnection($db_type);
+	$db_type_status = true;
+	if(@$conn->Connect($db_hostname,$db_username,$db_password))
+	{
 		$db_server_status = true;
 		if($db_type=='mysql')
 		{




From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 28 02:34:43 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 28 Jun 2006 06:34:43 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231151=3A?=
 =?utf-8?q?_Error_message_in_Installer=2E=2E?=
In-Reply-To: <076.5644658cbeac029416aebb3b898c0527@vtiger.fosslabs.com>
References: <076.5644658cbeac029416aebb3b898c0527@vtiger.fosslabs.com>
Message-ID: <085.94a579928093323ffa7879ecb0443dad@vtiger.fosslabs.com>

#1151: Error message in Installer..
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  Richie
      Type:  defect     |      Status:  closed
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mmbrich):

  * resolution:  => fixed
  * status:  reopened => closed

Comment:

 Fixed in #7592, wasn't re-opened when I started :).

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1151>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 28 02:41:57 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 28 Jun 2006 06:41:57 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231377=3A?=
 =?utf-8?q?_Error_Message_in_Emails_module?=
In-Reply-To: <076.f36d424ef8cb55fbe8cd894d788526eb@vtiger.fosslabs.com>
References: <076.f36d424ef8cb55fbe8cd894d788526eb@vtiger.fosslabs.com>
Message-ID: <085.0b8f8c4b21a6f4ae9f72d80b1c074cac@vtiger.fosslabs.com>

#1377: Error Message in Emails module
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  developer
      Type:  defect     |      Status:  closed   
  Priority:  blocker    |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:  fixed      |    Keywords:           
------------------------+---------------------------------------------------
Changes (by mmbrich):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 (In [7593]) fixes #1377

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1377>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 02:41:57 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 06:41:57 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7593 -
	/vtigercrm/trunk/include/utils/ListViewUtils.php
Message-ID: <20060628064157.DECF17726CA@vtiger.fosslabs.com>

Author: mmbrich
Date: Wed Jun 28 00:41:56 2006
New Revision: 7593

Log:
fixes #1377


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 Jun 28 00:41:56 2006
@@ -368,7 +368,7 @@
 	{
 		$end = $noofrows;
 	}
-	$paging = ceil ($noofrows / $limit);
+	if($paging != 0) {$paging = ceil ($noofrows / $limit);}
 	// Display the navigation
 	if ($display > 1) {
 		$previous = $display - 1;




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 03:08:37 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 07:08:37 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7594 -
	/vtigercrm/trunk/data/SugarBean.php
Message-ID: <20060628070837.E36847726D9@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 28 01:07:39 2006
New Revision: 7594

Log:
Added vtiger_ in getUniqueID function parameter

Modified:
    vtigercrm/trunk/data/SugarBean.php

Modified: vtigercrm/trunk/data/SugarBean.php
==============================================================================
--- vtigercrm/trunk/data/SugarBean.php (original)
+++ vtigercrm/trunk/data/SugarBean.php Wed Jun 28 01:07:39 2006
@@ -73,7 +73,7 @@
 			if($this->new_schema && 
 				$this->new_with_id == false)
 			{
-                          $this->id = $adb->getUniqueID("users");
+                          $this->id = $adb->getUniqueID("vtiger_users");
 			}
                         
 			$query = "INSERT into ".$this->table_name;




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 03:11:40 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 07:11:40 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7595 -
	/vtigercrm/trunk/include/freetag/freetag.class.php
Message-ID: <20060628071140.10F147726CD@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 28 01:10:39 2006
New Revision: 7595

Log:
Added vtiger_ in getUniqueID function parameter

Modified:
    vtigercrm/trunk/include/freetag/freetag.class.php

Modified: vtigercrm/trunk/include/freetag/freetag.class.php
==============================================================================
--- vtigercrm/trunk/include/freetag/freetag.class.php (original)
+++ vtigercrm/trunk/include/freetag/freetag.class.php Wed Jun 28 01:10:39 2006
@@ -456,7 +456,7 @@
 			$tag_id = $rs->fields['id'];
 		} else {
 			// Add new tag! 
-			$tag_id = $adb->getUniqueId('freetags');
+			$tag_id = $adb->getUniqueId('vtiger_freetags');
 			$sql = "INSERT INTO ${prefix}freetags (id,tag, raw_tag) VALUES ($tag_id,$normalized_tag, $tag)";
 			$rs = $adb->query($sql) or die("Syntax Error: $sql");
 			




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 03:14:07 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 07:14:07 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7596 -
	/vtigercrm/trunk/include/PopulateComboValues.php
Message-ID: <20060628071407.A322A7725A7@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 28 01:13:30 2006
New Revision: 7596

Log:
Added vtiger_ in getUniqueID function parameter

Modified:
    vtigercrm/trunk/include/PopulateComboValues.php

Modified: vtigercrm/trunk/include/PopulateComboValues.php
==============================================================================
--- vtigercrm/trunk/include/PopulateComboValues.php (original)
+++ vtigercrm/trunk/include/PopulateComboValues.php Wed Jun 28 01:13:30 2006
@@ -34,7 +34,7 @@
 		$i=0;
 		foreach ($values as $val => $cal)
 		{
-			$id = $adb->getUniqueID($tableName);
+			$id = $adb->getUniqueID('vtiger_'.$tableName);
 			if($val != '')
 			{
 				$adb->query("insert into vtiger_".$tableName. " values(".$id.",'".$val."',".$i.",1)");




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 03:15:30 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 07:15:30 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7597 -
	/vtigercrm/trunk/include/utils/UserInfoUtil.php
Message-ID: <20060628071531.3B49A772524@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 28 01:14:53 2006
New Revision: 7597

Log:
Added vtiger_ in getUniqueID function parameter

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

Modified: vtigercrm/trunk/include/utils/UserInfoUtil.php
==============================================================================
--- vtigercrm/trunk/include/utils/UserInfoUtil.php (original)
+++ vtigercrm/trunk/include/utils/UserInfoUtil.php Wed Jun 28 01:14:53 2006
@@ -529,7 +529,7 @@
 	global $adb;
 	$parentRoleDetails=getRoleInformation($parentRoleId);
 	$parentRoleInfo=$parentRoleDetails[$parentRoleId];
-	$roleid_no=$adb->getUniqueId("role");
+	$roleid_no=$adb->getUniqueId("vtiger_role");
         $roleId='H'.$roleid_no;
         $parentRoleHr=$parentRoleInfo[1];
         $parentRoleDepth=$parentRoleInfo[2];
@@ -2803,7 +2803,7 @@
 	global $log;
 	$log->debug("Entering createGroup(".$groupName.",".$groupMemberArray.",".$description.") method ...");
 	global $adb;
-	$groupId=$adb->getUniqueId("groups");
+	$groupId=$adb->getUniqueId("vtiger_groups");
 	//Insert into group vtiger_table
 	$query = "insert into vtiger_groups values(".$groupId.",'".$groupName."','".$description."')";
 	$adb->query($query);
@@ -3266,7 +3266,7 @@
 	$log->debug("Entering addSharingRule(".$tabid.",".$shareEntityType.",".$toEntityType.",".$shareEntityId.",".$toEntityId.",".$sharePermission.") method ...");
 	
 	global $adb;
-	$shareid=$adb->getUniqueId("datashare_module_rel");
+	$shareid=$adb->getUniqueId("vtiger_datashare_module_rel");
 	
 
 	if($shareEntityType == 'groups' && $toEntityType == 'groups')




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 03:32:50 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 07:32:50 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7598 -
	/vtigercrm/trunk/install/populateSeedData.php
Message-ID: <20060628073251.102FB772524@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 28 01:32:19 2006
New Revision: 7598

Log:
Added vtiger_ in getUniqueID function parameter

Modified:
    vtigercrm/trunk/install/populateSeedData.php

Modified: vtigercrm/trunk/install/populateSeedData.php
==============================================================================
--- vtigercrm/trunk/install/populateSeedData.php (original)
+++ vtigercrm/trunk/install/populateSeedData.php Wed Jun 28 01:32:19 2006
@@ -181,7 +181,7 @@
 	
 	if ($i > 3)
 	{
-		$freetag = $adb->getUniqueId('freetags');
+		$freetag = $adb->getUniqueId('vtiger_freetags');
 		$query = "insert into vtiger_freetags values ($freetag, '$cloudtag[1]', '$cloudtag[1]')";
 		$res = $adb->query($query);
 
@@ -284,7 +284,7 @@
 	
 	if ($i > 8)
 	{
-		$freetag = $adb->getUniqueId('freetags');
+		$freetag = $adb->getUniqueId('vtiger_freetags');
 		$query = "insert into vtiger_freetags values ($freetag, '$cloudtag[2]', '$cloudtag[2]')";
 		$res1 = $adb->query($query);
 
@@ -700,7 +700,7 @@
 	$invoice_ids[] = $invoice->id;
 	if ($i > 3)
 	{
-		$freetag = $adb->getUniqueId('freetags');
+		$freetag = $adb->getUniqueId('vtiger_freetags');
 		$query = "insert into vtiger_freetags values ($freetag, '$cloudtag[0]', '$cloudtag[0]')";
 		$res_inv = $adb->query($query);
 
@@ -829,7 +829,7 @@
 	
 	if ($i > 3)
 	{
-		$freetag = $adb->getUniqueId('freetags');
+		$freetag = $adb->getUniqueId('vtiger_freetags');
 		$query = "insert into vtiger_freetags values ($freetag, '$cloudtag[3]', '$cloudtag[3]')";
 		$res_tkt = $adb->query($query);
 




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 03:56:46 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 07:56:46 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7599 -
	/vtigercrm/trunk/modules/Products/Save.php
Message-ID: <20060628075646.53B0D7726B2@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 28 01:56:42 2006
New Revision: 7599

Log:
changes made to fix the issue in trac id:1142

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

Modified: vtigercrm/trunk/modules/Products/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Products/Save.php (original)
+++ vtigercrm/trunk/modules/Products/Save.php Wed Jun 28 01:56:42 2006
@@ -24,8 +24,10 @@
 require_once('modules/Products/Product.php');
 require_once('include/logging.php');
 require_once('include/database/PearDatabase.php');
-global $log;
-
+global $log,$current_user;
+$currencyid=fetchCurrency($current_user->id);
+$rate_symbol = getCurrencySymbolandCRate($currencyid);
+$rate = $rate_symbol['rate'];
 $focus = new Product();
 if(isset($_REQUEST['record']))
 {
@@ -45,6 +47,11 @@
 	{
 		$value = $_REQUEST[$fieldname];
 		$focus->column_fields[$fieldname] = $value;
+	}
+	if(isset($_REQUEST['unit_price']))
+	{
+		$value = convertToDollar($_REQUEST['unit_price'],$rate);
+		$focus->column_fields['unit_price'] = $value;
 	}
 }
 




From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 28 03:58:29 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 28 Jun 2006 07:58:29 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231386=3A?=
 =?utf-8?q?_Attachment_is_not_Saved_while_duplicating_Notes?=
Message-ID: <076.23ff7f44f849d0ff988e6bfb215ede83@vtiger.fosslabs.com>

#1386: Attachment is not Saved while duplicating Notes
-----------------------+----------------------------------------------------
 Reporter:  ahmed      |       Owner:  mickie
     Type:  defect     |      Status:  new   
 Priority:  major      |   Milestone:        
Component:  vtigercrm  |     Version:  5.0.0 
 Keywords:             |  
-----------------------+----------------------------------------------------


-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1386>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 04:03:08 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 08:03:08 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7600 -
	/vtigercrm/trunk/modules/Notes/Save.php
Message-ID: <20060628080308.219057726E3@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 28 02:03:04 2006
New Revision: 7600

Log:
updated the notes save file removing vtiger_ prefix from field name  - ahmed

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

Modified: vtigercrm/trunk/modules/Notes/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Notes/Save.php (original)
+++ vtigercrm/trunk/modules/Notes/Save.php Wed Jun 28 02:03:04 2006
@@ -49,7 +49,7 @@
                 $attachmentid = $adb->query_result($result,0,'attachmentsid');
 	        if($attachmentid != '')
 	        {
-	                $attachquery = "select * from vtiger_attachments where vtiger_attachmentsid = ".$attachmentid;
+	                $attachquery = "select * from vtiger_attachments where attachmentsid = ".$attachmentid;
 	                $result = $adb->query($attachquery);
 	                $filename = $adb->query_result($result,0,'name');
 	                $filetype = $adb->query_result($result,0,'type');
@@ -59,7 +59,7 @@
 	                $_FILES['filename']['type'] = $filetype;
 
 			//we should read the file and calculate the size, without setting vtiger_filesize, attachment will not save
-	                $filesize = vtiger_filesize($filepath.$filename);
+	                $filesize = filesize($filepath.$filename);
 	                $_FILES['filename']['size'] = $filesize;
 	        }
 }




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 04:15:09 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 08:15:09 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7601 - in /vtigercrm/trunk:
 Smarty/templates/Emails.tpl include/js/general.js modules/Emails/Email.js
Message-ID: <20060628081510.2EBF1772713@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 28 02:15:02 2006
New Revision: 7601

Log:
issue in email massdelete has been fixed

Modified:
    vtigercrm/trunk/Smarty/templates/Emails.tpl
    vtigercrm/trunk/include/js/general.js
    vtigercrm/trunk/modules/Emails/Email.js

Modified: vtigercrm/trunk/Smarty/templates/Emails.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Emails.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Emails.tpl Wed Jun 28 02:15:02 2006
@@ -11,53 +11,6 @@
 -->*}
 <!--  USER  SETTINGS PAGE STARTS HERE -->
 <script language="javascript">
-function gotoWebmail()
-{ldelim}
-	new Ajax.Request(
-		'index.php',
-		{ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
-                	method: 'post',
-			postBody: "module=Webmails&action=WebmailsAjax&file=ListView&config_chk=true",
-			onComplete: function(response) {ldelim}
-				if(response.responseText != 'SUCESS')
-					$('mailconfchk').style.display = 'block';
-				else
-					window.location.href = "index.php?module=Webmails&action=index&parenttab=My Home Page";
-			{rdelim}
-		{rdelim}
-	);
-
-{rdelim}
-
-function setSubject(subject)
-{ldelim}
-	document.getElementById("subjectsetter").innerHTML=subject
-{rdelim}
-
-function getEmailContents(id)
-{ldelim}
-	$("status").style.display="inline";
-	var rowid = 'row_'+id;
-	getObj(rowid).className = 'prvPrfHoverOn';
-	if(gselectedrowid != 0 && gselectedrowid != id)
-	{ldelim}
-		var prev_selected_rowid = 'row_'+gselectedrowid;
-		getObj(prev_selected_rowid).className = 'prvPrfHoverOff';
-	{rdelim}
-	gselectedrowid = id;
-	new Ajax.Request(
-		'index.php',
-		{ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
-			method: 'post',
-			postBody: 'module=Emails&action=EmailsAjax&file=DetailView&mode=ajax&record='+id,
-			onComplete: function(response) {ldelim}
-						$("status").style.display="none";
-						$("EmailDetails").innerHTML = response.responseText;
-					{rdelim}
-			{rdelim}
-		);
-{rdelim}
-
 function ShowFolders(folderid)
 {ldelim}
 	$("status").style.display="inline";
@@ -109,23 +62,6 @@
 	);
 
 {rdelim}
-function getListViewEntries_js(module,url)
-{ldelim}
-	$("status").style.display="inline";
-	new Ajax.Request(
-		'index.php',
-		{ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
-                	method: 'post',
-			postBody: "module="+module+"&action="+module+"Ajax&file=ListView&ajax=true&"+url,
-			onComplete: function(response) {ldelim}
-				$("status").style.display="none";
-				$("email_con").innerHTML=response.responseText;
-				execJS(document.getElementById('email_con'));
-			{rdelim}
-		{rdelim}
-	);
-
-{rdelim}
 </script>
 		{include file='Buttons_List.tpl'}
 <script language="JavaScript" type="text/javascript" src="modules/Emails/Email.js"></script>

Modified: vtigercrm/trunk/include/js/general.js
==============================================================================
--- vtigercrm/trunk/include/js/general.js (original)
+++ vtigercrm/trunk/include/js/general.js Wed Jun 28 02:15:02 2006
@@ -1685,3 +1685,30 @@
                 }
 }
 
+var bSaf = (navigator.userAgent.indexOf('Safari') != -1);
+var bOpera = (navigator.userAgent.indexOf('Opera') != -1);
+var bMoz = (navigator.appName == 'Netscape');
+function execJS(node) {
+    var st = node.getElementsByTagName('SCRIPT');
+    var strExec;
+    for(var i=0;i<st.length; i++) {
+      if (bSaf) {
+        strExec = st[i].innerHTML;
+      }
+      else if (bOpera) {
+        strExec = st[i].text;
+      }
+      else if (bMoz) {
+        strExec = st[i].textContent;
+      }
+      else {
+        strExec = st[i].text;
+      }
+      try {
+        eval(strExec);
+      } catch(e) {
+        alert(e);
+      }
+    }
+}
+

Modified: vtigercrm/trunk/modules/Emails/Email.js
==============================================================================
--- vtigercrm/trunk/modules/Emails/Email.js (original)
+++ vtigercrm/trunk/modules/Emails/Email.js Wed Jun 28 02:15:02 2006
@@ -10,6 +10,164 @@
 
 var gFolderid = 1;
 var gselectedrowid = 0;
+function gotoWebmail()
+{
+	new Ajax.Request(
+		'index.php',
+		{queue: {position: 'end', scope: 'command'},
+                	method: 'post',
+			postBody: "module=Webmails&action=WebmailsAjax&file=ListView&config_chk=true",
+			onComplete: function(response) {
+				if(response.responseText != 'SUCESS')
+					$('mailconfchk').style.display = 'block';
+				else
+					window.location.href = "index.php?module=Webmails&action=index&parenttab=My Home Page";
+			}
+		}
+	);
+
+}
+
+function setSubject(subject)
+{
+	document.getElementById("subjectsetter").innerHTML=subject
+}
+
+function getEmailContents(id)
+{
+	$("status").style.display="inline";
+	var rowid = 'row_'+id;
+	getObj(rowid).className = 'prvPrfHoverOn';
+	if(gselectedrowid != 0 && gselectedrowid != id)
+	{
+		var prev_selected_rowid = 'row_'+gselectedrowid;
+		getObj(prev_selected_rowid).className = 'prvPrfHoverOff';
+	}
+	gselectedrowid = id;
+	new Ajax.Request(
+		'index.php',
+		{queue: {position: 'end', scope: 'command'},
+			method: 'post',
+			postBody: 'module=Emails&action=EmailsAjax&file=DetailView&mode=ajax&record='+id,
+			onComplete: function(response) {
+						$("status").style.display="none";
+						$("EmailDetails").innerHTML = response.responseText;
+					}
+			}
+		);
+}
+
+function getListViewEntries_js(module,url)
+{
+	$("status").style.display="inline";
+	new Ajax.Request(
+		'index.php',
+		{queue: {position: 'end', scope: 'command'},
+                	method: 'post',
+			postBody: "module="+module+"&action="+module+"Ajax&file=ListView&ajax=true&"+url,
+			onComplete: function(response) {
+				$("status").style.display="none";
+				$("email_con").innerHTML=response.responseText;
+				execJS(document.getElementById('email_con'));
+			}
+		}
+	);
+
+}
+
+function massDelete()
+{
+		var delete_selected_row = false;
+        x = document.massdelete.selected_id.length;
+        idstring = "";
+        if ( x == undefined)
+        {
+
+                if (document.massdelete.selected_id.checked)
+                {
+					if(document.massdelete.selected_id.value == gselectedrowid)
+					{
+						gselectedrowid = 0;
+						delete_selected_row = true;						
+					}
+                        idstring = document.massdelete.selected_id.value;
+						xx = 1;
+                }
+                else
+                {
+                        alert("Please select atleast one entity");
+                        return false;
+                }
+        }
+        else
+        {
+                xx = 0;
+                for(i = 0; i < x ; i++)
+                {
+                        if(document.massdelete.selected_id[i].checked)
+						{
+							if(document.massdelete.selected_id[i].value == gselectedrowid)
+							{
+								gselectedrowid = 0;
+								delete_selected_row = true;						
+							}
+							idstring = document.massdelete.selected_id[i].value +";"+idstring
+							xx++
+						}
+                }
+                if (xx != 0)
+                {
+                        document.massdelete.idlist.value=idstring;
+                }
+                else
+                {
+                        alert("Please select atleast one entity");
+                        return false;
+                }
+        }
+		if(confirm("Are you sure you want to delete the selected "+xx+" records ?"))
+		{	
+			getObj('search_text').value = '';
+			show("status");
+			if(!delete_selected_row)
+			{
+				new Ajax.Request(
+						'index.php',
+						{queue: {position: 'end', scope: 'command'},
+						method: 'post',
+						postBody: "module=Users&action=massdelete&folderid="+gFolderid+"&return_module=Emails&idlist="+idstring,
+						onComplete: function(response) {
+						$("status").style.display="none";
+						$("email_con").innerHTML=response.responseText;
+						execJS(document.getElementById('email_con'));
+						}
+						}
+						);
+			}
+			else	
+			{
+				new Ajax.Request(
+                        'index.php',
+                        {queue: {position: 'end', scope: 'command'},
+                                method: 'post',
+                                postBody: "module=Users&action=massdelete&folderid="+gFolderid+"&return_module=Emails&idlist="+idstring,
+                                onComplete: function(response) {
+                                                $("status").style.display="none";
+                                                $('EmailDetails').innerHTML = '<table valign="top" border="0" cellpadding="0" cellspacing="0" width="100%"><tbody><tr><td class="forwardBg"><table border="0" cellpadding="0" cellspacing="0" width="100%"><tbody><tr><td colspan="2">&nbsp;</td></tr></tbody></table></td></tr><tr><td style="padding-top: 10px;" bgcolor="#ffffff" height="300" valign="top"></td></tr></tbody></table>';
+                                                $("subjectsetter").innerHTML='';
+                                                $("email_con").innerHTML=response.responseText;
+                                                execJS($('email_con'));
+                                }
+                        }
+                );
+			}
+		}
+		else
+		{
+			return false;
+		}
+}
+
 function DeleteEmail(id)
 {
 	if(confirm("Are you sure you want to delete ?"))




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 05:17:14 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 09:17:14 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7602 -
	/vtigercrm/trunk/include/utils/ListViewUtils.php
Message-ID: <20060628091715.2ECF27727F3@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 28 03:17:11 2006
New Revision: 7602

Log:
changes made to fix the issue in trac id:1142

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 Jun 28 03:17:11 2006
@@ -973,7 +973,10 @@
 {
 	global $log;
 	$log->debug("Entering getValue(".$field_result.",". $list_result.",".$fieldname.",".$focus.",".$module.",".$entity_id.",".$list_result_count.",".$mode.",".$popuptype.",".$returnset.",".$viewid.") method ...");
-	global $adb;
+	global $adb,$current_user;
+	$currencyid=fetchCurrency($current_user->id);
+	$rate_symbol=getCurrencySymbolandCRate($currencyid);
+	$rate = $rate_symbol['rate'];
 	$tabname = getParentTab();
 	$uicolarr=$field_result[$fieldname];
 	foreach($uicolarr as $key=>$value)
@@ -1016,7 +1019,7 @@
 	{
 		if($temp_val != '' && $temp_val != 0)
 		{       //changes made to remove vtiger_currency symbol infront of each vtiger_potential amount
-                        $value = $temp_val;
+                        $value = convertFromDollar($temp_val,$rate);
 		}
 		else
 		{
@@ -1327,6 +1330,7 @@
 					$servicetax = getProductTaxPercentage('Service',$entity_id,'default');
 
 					$unitprice=$adb->query_result($list_result,$list_result_count,'unit_price');
+					$unitprice = convertFromDollar($unitprice,$rate);
 					$qty_stock=$adb->query_result($list_result,$list_result_count,'qtyinstock');
 					$value = '<a href="a" LANGUAGE=javascript onclick=\'set_return_inventory("'.$entity_id.'", "'.br2nl($temp_val).'", "'.$unitprice.'", "'.$qty_stock.'", "'.$vattax.'","'.$salestax.'","'.$servicetax.'","'.$row_id.'"); window.close()\'>'.$temp_val.'</a>';
 				}
@@ -1339,6 +1343,7 @@
 					$servicetax = getProductTaxPercentage('Service',$entity_id,'default');
 
 					$unitprice=$adb->query_result($list_result,$list_result_count,'unit_price');
+					$unitprice = convertFromDollar($unitprice,$rate);
 					$value = '<a href="a" LANGUAGE=javascript onclick=\'set_return_inventory_po("'.$entity_id.'", "'.br2nl($temp_val).'", "'.$unitprice.'", "'.$vattax.'","'.$salestax.'","'.$servicetax.'","'.$row_id.'"); window.close()\'>'.$temp_val.'</a>';
 				}
 				elseif($popuptype == "inventory_pb")
@@ -1509,6 +1514,10 @@
 					$value = '<a href="index.php?action=DetailView&module='.$module.'&record='.$entity_id.'&parenttab='.$tabname.'">'.$temp_val.'</a>';
 				}
 			}
+		}
+		elseif($fieldname == 'hdnGrandTotal' || $fieldname == 'expectedroi' || $fieldname == 'actualroi' || $fieldname == 'actualcost' || $fieldname == 'budgetcost' || $fieldname == 'expectedrevenue')
+		{
+			$value = convertFromDollar($temp_val,$rate);
 		}
 		else
 		{




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 05:17:41 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 09:17:41 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7603 -
	/vtigercrm/trunk/data/CRMEntity.php
Message-ID: <20060628091741.A8F057727F3@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 28 03:17:38 2006
New Revision: 7603

Log:
added the global var current_user - ahmed

Modified:
    vtigercrm/trunk/data/CRMEntity.php

Modified: vtigercrm/trunk/data/CRMEntity.php
==============================================================================
--- vtigercrm/trunk/data/CRMEntity.php (original)
+++ vtigercrm/trunk/data/CRMEntity.php Wed Jun 28 03:17:38 2006
@@ -542,7 +542,8 @@
   //code added by richie ends
   function insertIntoEntityTable($table_name, $module)
   {
-	  global $log;	
+	  global $log;
+  	  global $current_user;	  
 	   $log->info("function insertIntoCrmEntity ".$module.' vtiger_table name ' .$table_name);
 	  global $adb;
 	  $insertion_mode = $this->mode;




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 05:20:13 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 09:20:13 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7604 -
	/vtigercrm/trunk/modules/PurchaseOrder/Save.php
Message-ID: <20060628092013.6F23A7727F3@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 28 03:20:09 2006
New Revision: 7604

Log:
changes made to fix the issue in trac id:1142

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

Modified: vtigercrm/trunk/modules/PurchaseOrder/Save.php
==============================================================================
--- vtigercrm/trunk/modules/PurchaseOrder/Save.php (original)
+++ vtigercrm/trunk/modules/PurchaseOrder/Save.php Wed Jun 28 03:20:09 2006
@@ -28,7 +28,10 @@
 $local_log =& LoggerManager::getLogger('index');
 
 $focus = new Order();
-
+global $current_user;
+$currencyid=fetchCurrency($current_user->id);
+$rate_symbol = getCurrencySymbolandCRate($currencyid);
+$rate = $rate_symbol['rate'];
 setObjectValuesFromRequest(&$focus);
 
 //Added code for auto product stock updation on receiving goods
@@ -67,6 +70,7 @@
         $prod_status = $_REQUEST[$status_var];
         $qty = $_REQUEST[$qty_var];
         $listprice = $_REQUEST[$list_price_var];
+	$listprice = convertToDollar($listprice,$rate);
 	$vat = $_REQUEST[$vat_var];
 	$sales = $_REQUEST[$sales_var];
 	$service = $_REQUEST[$service_var];




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 05:28:30 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 09:28:30 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7605 - in /vtigercrm/trunk:
 include/utils/ListViewUtils.php modules/Activities/Save.php
Message-ID: <20060628092831.20C34772384@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 28 03:28:25 2006
New Revision: 7605

Log:
Issue in Emails list view has been fixed

Modified:
    vtigercrm/trunk/include/utils/ListViewUtils.php
    vtigercrm/trunk/modules/Activities/Save.php

Modified: vtigercrm/trunk/include/utils/ListViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/ListViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/ListViewUtils.php Wed Jun 28 03:28:25 2006
@@ -345,7 +345,7 @@
 	$log->debug("Entering getNavigationValues(".$display.",".$noofrows.",".$limit.") method ...");
 	$navigation_array = Array();   
 	global $limitpage_navigation;
-/*	if(isset($_REQUEST['allflag']) && $_REQUEST['allflag'] == 'All'){
+	if(isset($_REQUEST['allflag']) && $_REQUEST['allflag'] == 'All'){
 		$navigation_array['start'] =1;
 		$navigation_array['first'] = 1;
 		$navigation_array['end'] = 1;
@@ -357,7 +357,7 @@
 		$navigation_array['verylast'] =1;
 		$log->debug("Exiting getNavigationValues method ...");
 		return $navigation_array;
-	}*/
+	}
 	if($noofrows != 0)
 	$start = ((($display * $limit) - $limit)+1);
 	else
@@ -633,7 +633,7 @@
 								if(isPermitted("Activities",'EditView',$activityid) == 'yes')
 								{
 									// Fredy Klammsteiner, 4.8.2005: changes from 4.0.1 migrated to 4.2
-									$value = "<a href='index.php?return_module=Activities&return_action=index&return_id=".$activityid."&return_viewname=".$oCv->setdefaultviewid."&action=Save&module=Activities&record=".$activityid."&change_status=true".$evt_status."&start=".$navigation_array['current']."&allflag=".$navigation_array['allflag']."' style='".$P_FONT_COLOR."'>X</a>"; // Armando L??scher 05.07.2005 -> ??priority -> Desc: inserted style="$P_FONT_COLOR"
+									$value = "<a href='index.php?return_module=Activities&return_action=index&return_id=".$activityid."&return_viewname=".$oCv->setdefaultviewid."&action=Save&module=Activities&record=".$activityid."&change_status=true".$evt_status."&start=".$navigation_array['current']."' style='".$P_FONT_COLOR."'>X</a>"; // Armando L??scher 05.07.2005 -> ??priority -> Desc: inserted style="$P_FONT_COLOR"
 								}
 								else
 								{

Modified: vtigercrm/trunk/modules/Activities/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Activities/Save.php (original)
+++ vtigercrm/trunk/modules/Activities/Save.php Wed Jun 28 03:28:25 2006
@@ -157,10 +157,6 @@
 if($_REQUEST['return_viewname'] == '') $return_viewname='0';
 if($_REQUEST['return_viewname'] != '')$return_viewname=$_REQUEST['return_viewname'];
 if($_REQUEST['start'] !='')$page='&start='.$_REQUEST['start'];
-if($_REQUEST['allflag'] !='All')
-	$page.='&allflag=All';	
-else
-	$page.='&allflag=Normal';
 header("Location: index.php?action=$return_action&module=$return_module$view$hour$day$month$year&record=$return_id$activemode&viewname=$return_viewname$page");
 
 //Function to get the vtiger_activity details for mail body




From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 28 05:31:39 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 28 Jun 2006 09:31:39 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231378=3A?=
 =?utf-8?q?_Emails=3A_Improper_Export_link?=
In-Reply-To: <076.70d0318c40a5216b6e6108b9de7b7e0f@vtiger.fosslabs.com>
References: <076.70d0318c40a5216b6e6108b9de7b7e0f@vtiger.fosslabs.com>
Message-ID: <085.99b1b7b0a665cbe54d209e305cd0efee@vtiger.fosslabs.com>

#1378: Emails: Improper Export link
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  mickie
      Type:  defect     |      Status:  new   
  Priority:  blocker    |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by jerrydgeorge):

  * owner:  developer => mickie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1378>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 05:34:28 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 09:34:28 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7606 -
	/vtigercrm/trunk/include/utils/CommonUtils.php
Message-ID: <20060628093428.74506772384@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 28 03:34:24 2006
New Revision: 7606

Log:
changes made to fix the issue in trac id:1142

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 Jun 28 03:34:24 2006
@@ -1504,6 +1504,10 @@
 {
 	global $log;
 	$log->debug("Entering setObjectValuesFromRequest(".$focus.") method ...");
+	global $current_user;
+	$currencyid=fetchCurrency($current_user->id);
+	$rate_symbol = getCurrencySymbolandCRate($currencyid);
+	$rate = $rate_symbol['rate'];
 	if(isset($_REQUEST['record']))
 	{
 		$focus->id = $_REQUEST['record'];
@@ -1519,6 +1523,27 @@
 			$value = $_REQUEST[$fieldname];
 			$focus->column_fields[$fieldname] = $value;
 		}
+		if(isset($_REQUEST['txtTax']))
+		{
+			$value = convertToDollar($_REQUEST['txtTax'],$rate);
+			$focus->column_fields['txtTax'] = $value;
+		}
+		if(isset($_REQUEST['txtAdjustment']))
+		{
+			$value = convertToDollar($_REQUEST['txtAdjustment'],$rate);
+			$focus->column_fields['txtAdjustment'] = $value;
+		}
+		if(isset($_REQUEST['hdnSubTotal']))
+		{
+			$value = convertToDollar($_REQUEST['hdnSubTotal'],$rate);
+			$focus->column_fields['hdnSubTotal'] = $value;
+		}
+		if(isset($_REQUEST['hdnGrandTotal']))
+		{
+			$value = convertToDollar($_REQUEST['hdnGrandTotal'],$rate);
+			$focus->column_fields['hdnGrandTotal'] = $value;
+		}
+
 	}
 	$log->debug("Exiting setObjectValuesFromRequest method ...");
 }




From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 28 05:38:38 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 28 Jun 2006 09:38:38 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231374=3A?=
 =?utf-8?q?_Home_Page_-_Fully_collapsed?=
In-Reply-To: <076.5909c15d740b3c4920a3ae718e2cea9e@vtiger.fosslabs.com>
References: <076.5909c15d740b3c4920a3ae718e2cea9e@vtiger.fosslabs.com>
Message-ID: <085.6e41ab094f78351a862c0639ccb79b02@vtiger.fosslabs.com>

#1374: Home Page - Fully collapsed
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  ela  
      Type:  defect     |      Status:  new  
  Priority:  critical   |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by jerrydgeorge):

  * owner:  developer => ela

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1374>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 05:43:17 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 09:43:17 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7607 -
	/vtigercrm/trunk/modules/PurchaseOrder/EditView.php
Message-ID: <20060628094317.083AC839A1F@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 28 03:43:14 2006
New Revision: 7607

Log:
changes made to fix the issue in trac id:1142

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

Modified: vtigercrm/trunk/modules/PurchaseOrder/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/PurchaseOrder/EditView.php (original)
+++ vtigercrm/trunk/modules/PurchaseOrder/EditView.php Wed Jun 28 03:43:14 2006
@@ -33,7 +33,10 @@
 
 $focus = new Order();
 $smarty = new vtigerCRM_Smarty();
-
+global $current_user;
+$currencyid=fetchCurrency($current_user->id);
+$rate_symbol = getCurrencySymbolandCRate($currencyid);
+$rate = $rate_symbol['rate'];
 if(isset($_REQUEST['record']) && $_REQUEST['record'] != '') 
 {
     $focus->id = $_REQUEST['record'];
@@ -121,26 +124,27 @@
 	$associated_prod = getAssociatedProducts("PurchaseOrder",$focus);
 	$smarty->assign("ASSOCIATEDPRODUCTS", $associated_prod);
 	$smarty->assign("MODE", $focus->mode);
-	$smarty->assign("TAXVALUE", $focus->column_fields['txtTax']);
-	$smarty->assign("ADJUSTMENTVALUE", $focus->column_fields['txtAdjustment']);
-	$smarty->assign("SUBTOTAL", $focus->column_fields['hdnSubTotal']);
-	$smarty->assign("GRANDTOTAL", $focus->column_fields['hdnGrandTotal']);
+	$smarty->assign("TAXVALUE", convertFromDollar($focus->column_fields['txtTax'],$rate));
+	$smarty->assign("ADJUSTMENTVALUE", convertFromDollar($focus->column_fields['txtAdjustment'],$rate));
+	$smarty->assign("SUBTOTAL", convertFromDollar($focus->column_fields['hdnSubTotal'],$rate));
+	$smarty->assign("GRANDTOTAL", convertFromDollar($focus->column_fields['hdnGrandTotal'],$rate));
 }
 elseif(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true')
 {
 	$smarty->assign("ROWCOUNT", $num_of_products);
 	$smarty->assign("ASSOCIATEDPRODUCTS", $associated_prod);
 	$smarty->assign("MODE", $focus->mode);
-	$smarty->assign("TAXVALUE", $focus->column_fields['txtTax']);
-	$smarty->assign("ADJUSTMENTVALUE", $focus->column_fields['txtAdjustment']);
-	$smarty->assign("SUBTOTAL", $focus->column_fields['hdnSubTotal']);
-	$smarty->assign("GRANDTOTAL", $focus->column_fields['hdnGrandTotal']);
+	$smarty->assign("TAXVALUE", convertFromDollar($focus->column_fields['txtTax'],$rate));
+	$smarty->assign("ADJUSTMENTVALUE", convertFromDollar($focus->column_fields['txtAdjustment'],$rate));
+	$smarty->assign("SUBTOTAL", convertFromDollar($focus->column_fields['hdnSubTotal'],$rate));
+	$smarty->assign("GRANDTOTAL", convertFromDollar($focus->column_fields['hdnGrandTotal'],$rate));
 
 }
 elseif((isset($_REQUEST['product_id']) && $_REQUEST['product_id'] != '')) {
         $smarty->assign("ROWCOUNT", $num_of_products);
         $smarty->assign("ASSOCIATEDPRODUCTS", $associated_prod);
 	$InvTotal = getInventoryTotal($_REQUEST['return_module'],$_REQUEST['return_id']);
+	$InvTotal = convertFromDollar($InvTotal,$rate);
         $smarty->assign("MODE", $focus->mode);
         $smarty->assign("TAXVALUE", "0.000");
         $smarty->assign("ADJUSTMENTVALUE", "0.000");




From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 28 05:45:37 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 28 Jun 2006 09:45:37 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231387=3A?=
 =?utf-8?q?_ALL_Menu_layer_showing_inconsistent_border_lines=2E?=
Message-ID: <076.d418171c6cb5f98dec1db7b9af0277d5@vtiger.fosslabs.com>

#1387: ALL Menu layer showing inconsistent border lines.
-----------------------+----------------------------------------------------
 Reporter:  ahmed      |       Owner:  ela  
     Type:  defect     |      Status:  new  
 Priority:  major      |   Milestone:       
Component:  vtigercrm  |     Version:  5.0.0
 Keywords:             |  
-----------------------+----------------------------------------------------


-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1387>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 28 05:46:38 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 28 Jun 2006 09:46:38 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231373=3A?=
 =?utf-8?q?_Accounts_=3E_New_Custom_view_=3A_No_navigation_link?=
In-Reply-To: <076.89b574125c4524982f3f9b818aabf9f7@vtiger.fosslabs.com>
References: <076.89b574125c4524982f3f9b818aabf9f7@vtiger.fosslabs.com>
Message-ID: <085.8e0fff1471736c0992d112162cc8bac2@vtiger.fosslabs.com>

#1373: Accounts > New Custom view : No navigation link
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  jerrydgeorge
      Type:  defect     |      Status:  new         
  Priority:  major      |   Milestone:              
 Component:  vtigercrm  |     Version:  5.0.0       
Resolution:             |    Keywords:              
------------------------+---------------------------------------------------
Changes (by jerrydgeorge):

  * owner:  developer => jerrydgeorge

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1373>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 05:46:50 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 09:46:50 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7608 -
	/vtigercrm/trunk/Smarty/templates/CustomView.tpl
Message-ID: <20060628094650.D3545839AB4@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 28 03:46:46 2006
New Revision: 7608

Log:
#Fixes 1373

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 Wed Jun 28 03:46:46 2006
@@ -104,7 +104,7 @@
   <td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
   <td class="showPanelBg" valign="top" width="100%">
    <div class="small" style="padding: 20px;">
-      <span class="lvtHeaderText">{$APP.$MODULE} &gt; {$MOD.New_Custom_View}</span> <br>
+	<span class="lvtHeaderText"><a class="hdrLink" href="index.php?action=ListView&module={$MODULE}&parenttab={$CATEGORY}">{$APP.$MODULE}</a> &gt; {$MOD.New_Custom_View}</span> <br>
       <hr noshade="noshade" size="1">
       <form name="EditView" method="post" enctype="multipart/form-data" action="index.php">
             <table align="center" border="0" cellpadding="0" cellspacing="0" width="95%">




From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 28 05:49:01 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 28 Jun 2006 09:49:01 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231373=3A?=
 =?utf-8?q?_Accounts_=3E_New_Custom_view_=3A_No_navigation_link?=
In-Reply-To: <076.89b574125c4524982f3f9b818aabf9f7@vtiger.fosslabs.com>
References: <076.89b574125c4524982f3f9b818aabf9f7@vtiger.fosslabs.com>
Message-ID: <085.71490f99207b1e16a95aa48a06d84f76@vtiger.fosslabs.com>

#1373: Accounts > New Custom view : No navigation link
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  jerrydgeorge
      Type:  defect     |      Status:  closed      
  Priority:  major      |   Milestone:              
 Component:  vtigercrm  |     Version:  5.0.0       
Resolution:  fixed      |    Keywords:              
------------------------+---------------------------------------------------
Changes (by jerrydgeorge):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1373>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 05:57:37 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 09:57:37 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7609 -
	/vtigercrm/trunk/include/utils/utils.php
Message-ID: <20060628095737.AB84083EC80@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 28 03:57:33 2006
New Revision: 7609

Log:
changes made to fix the issue in trac id:1142

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 Jun 28 03:57:33 2006
@@ -1216,7 +1216,10 @@
 
 function getUnitPrice($productid)
 {
-	global $log;
+	global $log,$current_user;
+	$currencyid=fetchCurrency($current_user->id);
+	$rate_symbol = getCurrencySymbolandCRate($currencyid);
+	$rate = $rate_symbol['rate'];
 	$log->debug("Entering getUnitPrice(".$productid.") method ...");
         $log->info("in getUnitPrice productid ".$productid);
 
@@ -1224,6 +1227,7 @@
         $query = "select unit_price from vtiger_products where productid=".$productid;
         $result = $adb->query($query);
         $up = $adb->query_result($result,0,'unit_price');
+	$up = convertFromDollar($up,$rate);
 	$log->debug("Exiting getUnitPrice method ...");
         return $up;
 }




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 06:05:03 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 10:05:03 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7610 -
 /vtigercrm/trunk/modules/Migration/ModifyDatabase/42P2_to_50Alpha.php
Message-ID: <20060628100503.CB14683EFFC@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 28 04:04:59 2006
New Revision: 7610

Log:
* Added queries to modify the database which are all the changed have been made in betweeb June 23 to 28

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 Jun 28 04:04:59 2006
@@ -3197,8 +3197,35 @@
 
 Execute("insert into vtiger_field values (2,".$conn->getUniqueID("vtiger_field").",'campaignid','vtiger_potential',1,'58','campaignid','Campaign Source',1,0,0,100,12,1,1,'N~O',1,null,'BAS')");
 
-
-
+//Added on 28-06-06
+//Campaigns module added in Leads and Contacts RelatedList
+Execute("insert into vtiger_relatedlists values(".$conn->getUniqueID('vtiger_relatedlists').",".getTabid("Leads").",".getTabid("Campaigns").",'get_campaigns',6,'Campaigns',0)");
+Execute("insert into vtiger_relatedlists values(".$conn->getUniqueID('vtiger_relatedlists').",".getTabid("Contacts").",".getTabid("Campaigns").",'get_campaigns',11,'Campaigns',0)");
+
+//campaignid removed from vtiger_leaddetails and vtiger_contactdetails tables
+Execute("alter table vtiger_leaddetails drop column campaignid");
+Execute("alter table vtiger_contactdetails drop column campaignid");
+
+//Contact Name has been removed from Events Information
+Execute("delete from vtiger_field where tabid=16 and fieldname='contact_id'");
+
+//queries to resequence the fields
+$fieldname=array('eventstatus','sendnotification','activitytype','location','createdtime','modifiedtime','taskpriority','notime','visibility');
+$tablename=array('vtiger_activity','vtiger_activity','vtiger_activity','vtiger_activity','vtiger_crmentity','vtiger_crmentity','vtiger_activity','vtiger_activity','vtiger_activity');
+
+$sequence = array(10,11,12,13,14,15,16,17,18);
+for($j = 0;$j < 9;$j++)
+{
+	Execute("update vtiger_field set sequence=".$sequence[$j]." where tablename='".$tablename[$j]."' && fieldname='".$fieldname[$j]."' and tabid=16");
+}
+
+//Campaign has been removed from field table
+Execute("delete from vtiger_field where tabid=7 and fieldname='campaignid'");
+Execute("delete from vtiger_field where tabid=4 and fieldname='campaignid'");
+
+//Query added to have Calendar under Marketing and Support
+$conn->query("insert into vtiger_parenttabrel values (2,17,7)");
+$conn->query("insert into vtiger_parenttabrel values (4,17,9)");
 
 
 




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 06:06:06 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 10:06:06 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7611 - in /vtigercrm/trunk:
 Smarty/templates/ include/js/ modules/Calendar/ modules/Emails/
 modules/PriceBooks/ modules/Settings/ modules/Users/
Message-ID: <20060628100607.1E662839AB4@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 28 04:05:52 2006
New Revision: 7611

Log:
alert message atleast changed to at least

Modified:
    vtigercrm/trunk/Smarty/templates/GroupEditView.tpl
    vtigercrm/trunk/Smarty/templates/ListEmailTemplates.tpl
    vtigercrm/trunk/Smarty/templates/ListWordTemplates.tpl
    vtigercrm/trunk/Smarty/templates/Reports.tpl
    vtigercrm/trunk/include/js/ListView.js
    vtigercrm/trunk/include/js/Mail.js
    vtigercrm/trunk/include/js/Merge.js
    vtigercrm/trunk/include/js/general.js
    vtigercrm/trunk/modules/Calendar/script.js
    vtigercrm/trunk/modules/Emails/Email.js
    vtigercrm/trunk/modules/PriceBooks/PriceBook.js
    vtigercrm/trunk/modules/Settings/ListMailAccount.php
    vtigercrm/trunk/modules/Users/Users.js

Modified: vtigercrm/trunk/Smarty/templates/GroupEditView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/GroupEditView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/GroupEditView.tpl Wed Jun 28 04:05:52 2006
@@ -144,7 +144,7 @@
 	if(document.newGroupForm.selectedColumnsString.value.replace(/^\s+/g, '').replace(/\s+$/g, '').length==0)
 	{ldelim}
 
-		alert('Group should have atleast one member. Select a member to the group');
+		alert('Group should have at least one member. Select a member to the group');
 		return false;
 	{rdelim}
 	dup_validation();	

Modified: vtigercrm/trunk/Smarty/templates/ListEmailTemplates.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ListEmailTemplates.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ListEmailTemplates.tpl Wed Jun 28 04:05:52 2006
@@ -26,7 +26,7 @@
                 {rdelim}
                 else
                 {ldelim}
-                        alert("Please select atleast one entity");
+                        alert("Please select at least one entity");
                         return false;
                 {rdelim}
         {rdelim}
@@ -47,7 +47,7 @@
                 {rdelim}
                else
                 {ldelim}
-                        alert("Please select atleast one entity");
+                        alert("Please select at least one entity");
                         return false;
                 {rdelim}
        {rdelim}

Modified: vtigercrm/trunk/Smarty/templates/ListWordTemplates.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ListWordTemplates.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ListWordTemplates.tpl Wed Jun 28 04:05:52 2006
@@ -26,7 +26,7 @@
                 {rdelim}
                 else
                 {ldelim}
-                        alert("Please select atleast one entity");
+                        alert("Please select at least one entity");
                         return false;
                 {rdelim}
         {rdelim}
@@ -47,7 +47,7 @@
                 {rdelim}
                else
                 {ldelim}
-                        alert("Please select atleast one entity");
+                        alert("Please select at least one entity");
                         return false;
                 {rdelim}
        {rdelim}

Modified: vtigercrm/trunk/Smarty/templates/Reports.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Reports.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Reports.tpl Wed Jun 28 04:05:52 2006
@@ -238,7 +238,7 @@
 			
 	}else
 	{
-		alert('Please select atleast one Report');
+		alert('Please select at least one Report');
 		return false;
 	}
 }
@@ -318,7 +318,7 @@
 			
 	}else
 	{
-		alert('Please select atleast one Report');
+		alert('Please select at least one Report');
 		return false;
 	}
 }

Modified: vtigercrm/trunk/include/js/ListView.js
==============================================================================
--- vtigercrm/trunk/include/js/ListView.js (original)
+++ vtigercrm/trunk/include/js/ListView.js Wed Jun 28 04:05:52 2006
@@ -29,7 +29,7 @@
 	}
 	else
 	{
-		alert("Please select atleast one entity");
+		alert("Please select at least one entity");
 		return false;
 	}
 	fnvshobj(obj,divid);
@@ -56,7 +56,7 @@
         }
         else
         {
-            alert("Please select atleast one entity");
+            alert("Please select at least one entity");
             return false;
         }
 		if(confirm("Are you sure you want to delete the selected "+xx+" records ?"))

Modified: vtigercrm/trunk/include/js/Mail.js
==============================================================================
--- vtigercrm/trunk/include/js/Mail.js (original)
+++ vtigercrm/trunk/include/js/Mail.js Wed Jun 28 04:05:52 2006
@@ -31,7 +31,7 @@
 	}
 	else
 	{
-		alert("Please select atleast one entity");
+		alert("Please select at least one entity");
 		return false;
 	}
 	allids = document.massdelete.idlist.value;	
@@ -56,7 +56,7 @@
                 }
                 else
                 {
-                        alert("Please select atleast one entity");
+                        alert("Please select at least one entity");
                         return false;
                 }
         }
@@ -77,7 +77,7 @@
                 }
                 else
                 {
-                        alert("Please select atleast one entity");
+                        alert("Please select at least one entity");
                         return false;
                 }
         }

Modified: vtigercrm/trunk/include/js/Merge.js
==============================================================================
--- vtigercrm/trunk/include/js/Merge.js (original)
+++ vtigercrm/trunk/include/js/Merge.js Wed Jun 28 04:05:52 2006
@@ -25,7 +25,7 @@
                 else
                 {
                 			
-                        alert("Please select atleast one entity");
+                        alert("Please select at least one entity");
                         return false;
                 }
         }
@@ -47,7 +47,7 @@
                else
                 {
                 			
-                        alert("Please select atleast one entity");
+                        alert("Please select at least one entity");
                         return false;
                 }
         }

Modified: vtigercrm/trunk/include/js/general.js
==============================================================================
--- vtigercrm/trunk/include/js/general.js (original)
+++ vtigercrm/trunk/include/js/general.js Wed Jun 28 04:05:52 2006
@@ -1649,7 +1649,7 @@
                 }
                 else
 		{
-                        alert("Please select atleast one entity");
+                        alert("Please select at least one entity");
                         return false;
                 }
         }
@@ -1670,7 +1670,7 @@
                 }
                  else
                 {
-                        alert("Please select atleast one entity");
+                        alert("Please select at least one entity");
                         return false;
                 }
         }

Modified: vtigercrm/trunk/modules/Calendar/script.js
==============================================================================
--- vtigercrm/trunk/modules/Calendar/script.js (original)
+++ vtigercrm/trunk/modules/Calendar/script.js Wed Jun 28 04:05:52 2006
@@ -23,7 +23,7 @@
                 }
                 else
                 {
-                        alert("Please select atleast one user");
+                        alert("Please select at least one user");
                         return false;
                 }
         }
@@ -43,7 +43,7 @@
                 }
                 else
                 {
-                        alert("Please select atleast one user");
+                        alert("Please select at least one user");
                         return false;
                 }
         }

Modified: vtigercrm/trunk/modules/Emails/Email.js
==============================================================================
--- vtigercrm/trunk/modules/Emails/Email.js (original)
+++ vtigercrm/trunk/modules/Emails/Email.js Wed Jun 28 04:05:52 2006
@@ -95,7 +95,7 @@
                 }
                 else
                 {
-                        alert("Please select atleast one entity");
+                        alert("Please select at least one entity");
                         return false;
                 }
         }
@@ -121,7 +121,7 @@
                 }
                 else
                 {
-                        alert("Please select atleast one entity");
+                        alert("Please select at least one entity");
                         return false;
                 }
         }

Modified: vtigercrm/trunk/modules/PriceBooks/PriceBook.js
==============================================================================
--- vtigercrm/trunk/modules/PriceBooks/PriceBook.js (original)
+++ vtigercrm/trunk/modules/PriceBooks/PriceBook.js Wed Jun 28 04:05:52 2006
@@ -47,7 +47,7 @@
 		}
 		else 
 		{
-			alert("Please select atleast one entity");
+			alert("Please select at least one entity");
 			return false;
 		}
 	}
@@ -96,7 +96,7 @@
 		}
 		else
 		{
-			alert("Please select atleast one entity");
+			alert("Please select at least one entity");
 			return false;
 		}
 	}

Modified: vtigercrm/trunk/modules/Settings/ListMailAccount.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/ListMailAccount.php (original)
+++ vtigercrm/trunk/modules/Settings/ListMailAccount.php Wed Jun 28 04:05:52 2006
@@ -131,7 +131,7 @@
                 }
                 else
                 {
-                        alert("Please select atleast one entity");
+                        alert("Please select at least one entity");
                         return false;
                 }
         }
@@ -153,7 +153,7 @@
                 }
                 else
                 {
-                        alert("Please select atleast one entity");
+                        alert("Please select at least one entity");
                         return false;
                 }
         }

Modified: vtigercrm/trunk/modules/Users/Users.js
==============================================================================
--- vtigercrm/trunk/modules/Users/Users.js (original)
+++ vtigercrm/trunk/modules/Users/Users.js Wed Jun 28 04:05:52 2006
@@ -35,7 +35,7 @@
                 }
                 else
                 {
-                        alert("Please select atleast one entity");
+                        alert("Please select at least one entity");
                         return false;
                 }
         }
@@ -56,7 +56,7 @@
                 }
                 else
                 {
-			alert("Please select atleast one entity");
+			alert("Please select at least one entity");
 	                return false;
                 }
         }




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 06:07:30 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 10:07:30 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7612 - in /vtigercrm/trunk:
 include/js/Inventory.js modules/Products/AddProductToPriceBooks.html
Message-ID: <20060628100730.C067083EFFC@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 28 04:07:24 2006
New Revision: 7612

Log:
alert msg changed from atleast to at least

Modified:
    vtigercrm/trunk/include/js/Inventory.js
    vtigercrm/trunk/modules/Products/AddProductToPriceBooks.html

Modified: vtigercrm/trunk/include/js/Inventory.js
==============================================================================
--- vtigercrm/trunk/include/js/Inventory.js (original)
+++ vtigercrm/trunk/include/js/Inventory.js Wed Jun 28 04:07:24 2006
@@ -343,7 +343,7 @@
 
 	if(rowCnt == 0)
 	{
-		alert('No product is selected. Select atleast one Product');
+		alert('No product is selected. Select at least one Product');
 		return false;
 	}
 

Modified: vtigercrm/trunk/modules/Products/AddProductToPriceBooks.html
==============================================================================
--- vtigercrm/trunk/modules/Products/AddProductToPriceBooks.html (original)
+++ vtigercrm/trunk/modules/Products/AddProductToPriceBooks.html Wed Jun 28 04:07:24 2006
@@ -46,7 +46,7 @@
 		}
 		else 
 		{
-			alert("Please select atleast one entity");
+			alert("Please select at least one entity");
 			return false;
 		}
 	}
@@ -95,7 +95,7 @@
 		}
 		else
 		{
-			alert("Please select atleast one entity");
+			alert("Please select at least one entity");
 			return false;
 		}
 	}




From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 28 06:07:34 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 28 Jun 2006 10:07:34 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231376=3A?=
 =?utf-8?q?_Error_message=3A_Please_select_atleast_one_record?=
In-Reply-To: <076.41781f98ac9f5dfb9527fcc3083cd3c1@vtiger.fosslabs.com>
References: <076.41781f98ac9f5dfb9527fcc3083cd3c1@vtiger.fosslabs.com>
Message-ID: <085.b1a09aacdef4d0215493b31fb855a5be@vtiger.fosslabs.com>

#1376: Error message: Please select atleast one record
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  jerrydgeorge
      Type:  defect     |      Status:  new         
  Priority:  minor      |   Milestone:              
 Component:  vtigercrm  |     Version:  5.0.0       
Resolution:             |    Keywords:              
------------------------+---------------------------------------------------
Changes (by jerrydgeorge):

  * owner:  developer => jerrydgeorge

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1376>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 28 06:07:44 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 28 Jun 2006 10:07:44 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231376=3A?=
 =?utf-8?q?_Error_message=3A_Please_select_atleast_one_record?=
In-Reply-To: <076.41781f98ac9f5dfb9527fcc3083cd3c1@vtiger.fosslabs.com>
References: <076.41781f98ac9f5dfb9527fcc3083cd3c1@vtiger.fosslabs.com>
Message-ID: <085.75289fff29821293af7d73d71d581596@vtiger.fosslabs.com>

#1376: Error message: Please select atleast one record
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  jerrydgeorge
      Type:  defect     |      Status:  closed      
  Priority:  minor      |   Milestone:              
 Component:  vtigercrm  |     Version:  5.0.0       
Resolution:  fixed      |    Keywords:              
------------------------+---------------------------------------------------
Changes (by jerrydgeorge):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1376>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 06:07:57 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 10:07:57 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7613 -
	/vtigercrm/trunk/include/utils/EditViewUtils.php
Message-ID: <20060628100757.97A3983EFFC@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 28 04:07:53 2006
New Revision: 7613

Log:
changes made to fix the issue in trac id:1142

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

Modified: vtigercrm/trunk/include/utils/EditViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/EditViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/EditViewUtils.php Wed Jun 28 04:07:53 2006
@@ -58,6 +58,11 @@
 	$custfld = '';
 	$ui_type[]= $uitype;
 	$editview_fldname[] = $fieldname;
+
+	$currencyid=fetchCurrency($current_user->id);
+	$rate_symbol = getCurrencySymbolandCRate($currencyid);
+	$rate = $rate_symbol['rate'];
+	$currency= $rate_symbol['symbol'];
 
 	if($generatedtype == 2)
 		$mod_strings[$fieldlabel] = $fieldlabel;
@@ -953,10 +958,6 @@
 	
 	elseif($uitype == 71 || $uitype == 72)
 	{
-		$currencyid=fetchCurrency($current_user->id);
-		$rate_symbol = getCurrencySymbolandCRate($currencyid);
-		$rate = $rate_symbol['rate'];
-		$currency= $rate_symbol['symbol'];
 		$editview_label[]=$mod_strings[$fieldlabel].': ('.$currency.')';
 		if($value!='')
 		        $fieldvalue[] = convertFromDollar($value,$rate);
@@ -1155,7 +1156,12 @@
 			$value = $_REQUEST['mg_subject'];
 		}
 		$editview_label[]=$mod_strings[$fieldlabel];
-		$fieldvalue[] = $value;
+		if($uitype == 1 && ($fieldname=='expectedrevenue' || $fieldname=='budgetcost' || $fieldname=='actualcost' || $fieldname=='expectedroi' || $fieldname=='actualroi' ) && ($module_name=='Campaigns'))
+		{
+			$fieldvalue[] = convertFromDollar($value,$rate);
+		}
+		else
+			$fieldvalue[] = $value;
 	}
 
 	// Mike Crowe Mod --------------------------------------------------------force numerics right justified.
@@ -1305,7 +1311,10 @@
 	$log->debug("Entering getAssociatedProducts(".$module.",".$focus.",".$seid=''.") method ...");
 	global $adb;
 	$output = '';
-	global $theme;
+	global $theme,$current_user;
+	$currencyid=fetchCurrency($current_user->id);
+	$rate_symbol = getCurrencySymbolandCRate($currencyid);
+	$rate = $rate_symbol['rate'];
 	$theme_path="themes/".$theme."/";
 	$image_path=$theme_path."images/";
 	$product_Detail = Array();
@@ -1370,6 +1379,9 @@
 		{
 			$product_Detail[$i]['qtyInStock'.$i]=$qtyinstock;
 		}
+		$unitprice=convertFromDollar($unitprice,$rate);
+		$listprice=convertFromDollar($listprice,$rate);
+		$total_with_tax =convertFromDollar($total_with_tax,$rate);
 		$product_Detail[$i]['txtQty'.$i]=$qty;
 		$product_Detail[$i]['unitPrice'.$i]=$unitprice;
 		$product_Detail[$i]['txtListPrice'.$i]=$listprice;




From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 28 06:08:35 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 28 Jun 2006 10:08:35 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231372=3A?=
 =?utf-8?q?_Custom_Veiw=3A_List_in_Metrics_option_is_wrong_function?=
In-Reply-To: <076.4043c7ad57292395a7049af96923eab8@vtiger.fosslabs.com>
References: <076.4043c7ad57292395a7049af96923eab8@vtiger.fosslabs.com>
Message-ID: <085.1d3b07b8950ab20c31f5757ccf35cde3@vtiger.fosslabs.com>

#1372: Custom Veiw: List in Metrics option is wrong function
--------------------------+-------------------------------------------------
  Reporter:  gopal        |       Owner:  developer
      Type:  enhancement  |      Status:  closed   
  Priority:  critical     |   Milestone:           
 Component:  vtigercrm    |     Version:  5.0.0    
Resolution:  fixed        |    Keywords:           
--------------------------+-------------------------------------------------
Changes (by jerrydgeorge):

  * resolution:  => fixed
  * status:  new => closed
  * type:  defect => enhancement

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1372>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 06:21:10 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 10:21:10 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7614 -
	/vtigercrm/trunk/include/utils/DetailViewUtils.php
Message-ID: <20060628102110.ADDD3839AB4@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 28 04:21:07 2006
New Revision: 7614

Log:
changes made to fix the issue in trac id:1142

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 Wed Jun 28 04:21:07 2006
@@ -49,7 +49,10 @@
 	$arr_data =Array();
 	$label_fld = Array();
 	$data_fld = Array();
-
+	$currencyid=fetchCurrency($current_user->id);
+	$rate_symbol=getCurrencySymbolandCRate($currencyid);
+	$rate = $rate_symbol['rate'];
+	$curr_symbol = $rate_symbol['symbol'];
 	if($generatedtype == 2)
 		$mod_strings[$fieldlabel] = $fieldlabel;
 
@@ -761,10 +764,6 @@
 	{
 		$label_fld[] =$mod_strings[$fieldlabel];
 		$display_val = '';
-		$currencyid=fetchCurrency($current_user->id);
-		$rate_symbol = getCurrencySymbolandCRate($currencyid);
-		$rate = $rate_symbol['rate'];
-		$curr_symbol = $rate_symbol['symbol'];
 	        if($col_fields[$fieldname] != '' && $col_fields[$fieldname] != 0)
 		{
 	 	    $amount_user_specific=convertFromDollar($col_fields[$fieldname],$rate);
@@ -860,11 +859,14 @@
 	}
 	else
 	{
-	
 	 $label_fld[] =$mod_strings[$fieldlabel];
-          if($col_fields[$fieldname]=='0')
-                $col_fields[$fieldname]='';
-	
+        if($col_fields[$fieldname]=='0')
+              $col_fields[$fieldname]='';
+	 if($uitype == 1 && ($fieldname=='expectedrevenue' || $fieldname=='budgetcost' || $fieldname=='actualcost' || $fieldname=='expectedroi' || $fieldname=='actualroi' ))
+	 {
+		$label_fld[] = convertFromDollar($col_fields[$fieldname],$rate);
+	 }
+	else
 		$label_fld[] = $col_fields[$fieldname];
 	}
 	$label_fld[]=$uitype;
@@ -895,8 +897,10 @@
 	global $adb;
 	global $theme;
 	global $log;
-	global $app_strings;
-	
+	global $app_strings,$current_user;
+	$currencyid=fetchCurrency($current_user->id);
+	$rate_symbol=getCurrencySymbolandCRate($currencyid);
+	$rate = $rate_symbol['rate'];
 	$theme_path="themes/".$theme."/";
 	$image_path=$theme_path."images/";
 	$log->debug("in getDetailAssociatedProducts. Module is  ".$module);
@@ -964,6 +968,9 @@
 		{	
 			$output .= '<td>'.$qtyinstock.'</td>';
 		}
+		$unitprice = convertFromDollar($unitprice,$rate);
+		$listprice = convertFromDollar($listprice,$rate);
+		$total_with_tax = convertFromDollar($total_with_tax,$rate);
 		$output .= '<td style="padding:3px;">'.$qty.'</td>';
 		$output .= '<td style="padding:3px;">'.$unitprice.'</td>';
 		$output .= '<td style="padding:3px;">'.$listprice.'</td>';
@@ -979,22 +986,22 @@
 	$output .= '<tr>'; 
 	$output .= '<td width="150"></td>';
 	$output .= '<td><div align="right"><b>'.$app_strings['LBL_SUB_TOTAL'].':</b></div></td>';
-	$output .= '<td width="150"><div align="right" style="border:1px solid #000;padding:2px">&nbsp;'.$focus->column_fields['hdnSubTotal'].'</div></td>';
+	$output .= '<td width="150"><div align="right" style="border:1px solid #000;padding:2px">&nbsp;'.convertFromDollar($focus->column_fields['hdnSubTotal'],$rate).'</div></td>';
 	$output .= '</tr>';
 	$output .= '<tr>'; 
 	$output .=  '<td>&nbsp;</td>';
 	$output .= '<td><div align="right"><b>'.$app_strings['LBL_TAX'].':</b></div></td>';
-	$output .= '<td width="150"><div align="right" style="border:1px solid #000;padding:2px">&nbsp;'.$focus->column_fields['txtTax'].'</div></td>';
+	$output .= '<td width="150"><div align="right" style="border:1px solid #000;padding:2px">&nbsp;'.convertFromDollar($focus->column_fields['txtTax'],$rate).'</div></td>';
 	$output .= '</tr>';
 	$output .= '<tr>'; 
 	$output .= '<td>&nbsp;</td>';
 	$output .= '<td><div align="right"><b>'.$app_strings['LBL_ADJUSTMENT'].':</b></div></td>';
-	$output .= '<td width="150"><div align="right"><div align="right" style="border:1px solid #000;padding:2px">&nbsp;'.$focus->column_fields['txtAdjustment'].'</div></td>';
+	$output .= '<td width="150"><div align="right"><div align="right" style="border:1px solid #000;padding:2px">&nbsp;'.convertFromDollar($focus->column_fields['txtAdjustment'],$rate).'</div></td>';
 	$output .= '</tr>';
 	$output .= '<tr>'; 
 	$output .= '<td>&nbsp;</td>';
 	$output .= '<td><div align="right"><b>'.$app_strings['LBL_GRAND_TOTAL'].':</b></div></td>';
-	$output .= '<td width="150"><div id="grandTotal" align="right" style="border:1px solid #000;padding:2px">&nbsp;'.$focus->column_fields['hdnGrandTotal'].'</div></td>';
+	$output .= '<td width="150"><div id="grandTotal" align="right" style="border:1px solid #000;padding:2px">&nbsp;'.convertFromDollar($focus->column_fields['hdnGrandTotal'],$rate).'</div></td>';
 	$output .= '</tr>';
 	$output .= '</table>';
 




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 06:26:27 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 10:26:27 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7615 -
	/vtigercrm/trunk/modules/SalesOrder/EditView.php
Message-ID: <20060628102627.CEF507AD39F@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 28 04:26:24 2006
New Revision: 7615

Log:
changes made to fix the issue in trac id:1142

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

Modified: vtigercrm/trunk/modules/SalesOrder/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/SalesOrder/EditView.php (original)
+++ vtigercrm/trunk/modules/SalesOrder/EditView.php Wed Jun 28 04:26:24 2006
@@ -29,14 +29,16 @@
 require_once('include/utils/utils.php');
 require_once('include/FormValidationUtil.php');
 
-global $app_strings,$mod_strings,$log,$theme,$currentModule;
+global $app_strings,$mod_strings,$log,$theme,$currentModule,$current_user;
 
 $log->debug("Inside Sales Order EditView");
 
 
 $focus = new SalesOrder();
 $smarty = new vtigerCRM_Smarty();
-
+$currencyid=fetchCurrency($current_user->id);
+$rate_symbol = getCurrencySymbolandCRate($currencyid);
+$rate = $rate_symbol['rate'];
 if(isset($_REQUEST['record']) && $_REQUEST['record'] != '') 
 {
     if(isset($_REQUEST['convertmode']) &&  $_REQUEST['convertmode'] == 'quotetoso')
@@ -52,10 +54,10 @@
 	$associated_prod = getAssociatedProducts("Quotes",$quote_focus);
 	$smarty->assign("ASSOCIATEDPRODUCTS", $associated_prod);
 	$smarty->assign("MODE", $quote_focus->mode);
-	$smarty->assign("TAXVALUE", $quote_focus->column_fields['txtTax']);
-	$smarty->assign("ADJUSTMENTVALUE", $quote_focus->column_fields['txtAdjustment']);
-	$smarty->assign("SUBTOTAL", $quote_focus->column_fields['hdnSubTotal']);
-	$smarty->assign("GRANDTOTAL", $quote_focus->column_fields['hdnGrandTotal']);
+	$smarty->assign("TAXVALUE", convertFromDollar($quote_focus->column_fields['txtTax'],$rate));
+	$smarty->assign("ADJUSTMENTVALUE", convertFromDollar($quote_focus->column_fields['txtAdjustment'],$rate));
+	$smarty->assign("SUBTOTAL", convertFromDollar($quote_focus->column_fields['hdnSubTotal'],$rate));
+	$smarty->assign("GRANDTOTAL", convertFromDollar($quote_focus->column_fields['hdnGrandTotal'],$rate));
 	$smarty->assign("AVAILABLE_PRODUCTS", 'true');
 
     }
@@ -133,10 +135,10 @@
 		$smarty->assign("QUOTE_ID", $focus->column_fields['quote_id']);
 		$smarty->assign("ASSOCIATEDPRODUCTS", $associated_prod);
 		$smarty->assign("MODE", $quote_focus->mode);
-		$smarty->assign("TAXVALUE", $quote_focus->column_fields['txtTax']);
-		$smarty->assign("ADJUSTMENTVALUE", $quote_focus->column_fields['txtAdjustment']);
-		$smarty->assign("SUBTOTAL", $quote_focus->column_fields['hdnSubTotal']);
-		$smarty->assign("GRANDTOTAL", $quote_focus->column_fields['hdnGrandTotal']);
+		$smarty->assign("TAXVALUE", convertFromDollar($quote_focus->column_fields['txtTax'],$rate));
+		$smarty->assign("ADJUSTMENTVALUE", convertFromDollar($quote_focus->column_fields['txtAdjustment'],$rate));
+		$smarty->assign("SUBTOTAL", convertFromDollar($quote_focus->column_fields['hdnSubTotal'],$rate));
+		$smarty->assign("GRANDTOTAL", convertFromDollar($quote_focus->column_fields['hdnGrandTotal'],$rate));
 		$smarty->assign("AVAILABLE_PRODUCTS", 'true');
 	}
 }
@@ -235,10 +237,10 @@
 	$associated_prod = getAssociatedProducts("Quotes",$quote_focus);
 	$smarty->assign("ASSOCIATEDPRODUCTS", $associated_prod);
 	$smarty->assign("MODE", $focus->mode);
-	$smarty->assign("TAXVALUE", $txtTax);
-	$smarty->assign("ADJUSTMENTVALUE", $txtAdj);
-	$smarty->assign("SUBTOTAL", $quote_focus->column_fields['hdnSubTotal']);
-	$smarty->assign("GRANDTOTAL", $quote_focus->column_fields['hdnGrandTotal']);
+	$smarty->assign("TAXVALUE", convertFromDollar($txtTax,$rate));
+	$smarty->assign("ADJUSTMENTVALUE", convertFromDollar($txtAdj,$rate));
+	$smarty->assign("SUBTOTAL", convertFromDollar($quote_focus->column_fields['hdnSubTotal'],$rate));
+	$smarty->assign("GRANDTOTAL", convertFromDollar($quote_focus->column_fields['hdnGrandTotal'],$rate));
 }
 elseif($focus->mode == 'edit')
 {
@@ -248,25 +250,26 @@
 	$associated_prod = getAssociatedProducts("SalesOrder",$focus);
 	$smarty->assign("ASSOCIATEDPRODUCTS", $associated_prod);
 	$smarty->assign("MODE", $focus->mode);
-	$smarty->assign("TAXVALUE", $focus->column_fields['txtTax']);
-	$smarty->assign("ADJUSTMENTVALUE", $focus->column_fields['txtAdjustment']);
-	$smarty->assign("SUBTOTAL", $focus->column_fields['hdnSubTotal']);
-	$smarty->assign("GRANDTOTAL", $focus->column_fields['hdnGrandTotal']);
+	$smarty->assign("TAXVALUE", convertFromDollar($focus->column_fields['txtTax'],$rate));
+	$smarty->assign("ADJUSTMENTVALUE", convertFromDollar($focus->column_fields['txtAdjustment'],$rate));
+	$smarty->assign("SUBTOTAL", convertFromDollar($focus->column_fields['hdnSubTotal'],$rate));
+	$smarty->assign("GRANDTOTAL", convertFromDollar($focus->column_fields['hdnGrandTotal'],$rate));
 }
 elseif(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true')
 {
 	$smarty->assign("ROWCOUNT", $num_of_products);
 	$smarty->assign("ASSOCIATEDPRODUCTS", $associated_prod);
 	$smarty->assign("MODE", $focus->mode);
-	$smarty->assign("TAXVALUE", $focus->column_fields['txtTax']);
-	$smarty->assign("ADJUSTMENTVALUE", $focus->column_fields['txtAdjustment']);
-	$smarty->assign("SUBTOTAL", $focus->column_fields['hdnSubTotal']);
-	$smarty->assign("GRANDTOTAL", $focus->column_fields['hdnGrandTotal']);
+	$smarty->assign("TAXVALUE", convertFromDollar($focus->column_fields['txtTax'],$rate));
+	$smarty->assign("ADJUSTMENTVALUE", convertFromDollar($focus->column_fields['txtAdjustment'],$rate));
+	$smarty->assign("SUBTOTAL", convertFromDollar($focus->column_fields['hdnSubTotal'],$rate));
+	$smarty->assign("GRANDTOTAL", convertFromDollar($focus->column_fields['hdnGrandTotal'],$rate));
 }
 elseif((isset($_REQUEST['potential_id']) && $_REQUEST['potential_id'] != '') || (isset($_REQUEST['product_id']) && $_REQUEST['product_id'] != '')) {
         $smarty->assign("ROWCOUNT", $num_of_products);
         $smarty->assign("ASSOCIATEDPRODUCTS", $associated_prod);
 	$InvTotal = getInventoryTotal($_REQUEST['return_module'],$_REQUEST['return_id']);
+	$InvTotal = convertFromDollar($InvTotal,$rate);
         $smarty->assign("MODE", $focus->mode);
         $smarty->assign("TAXVALUE", "0.000");
         $smarty->assign("ADJUSTMENTVALUE", "0.000");




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 06:28:38 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 10:28:38 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7616 -
	/vtigercrm/trunk/modules/SalesOrder/Save.php
Message-ID: <20060628102838.4C54C83FBC4@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 28 04:28:34 2006
New Revision: 7616

Log:
changes made to fix the issue in trac id:1142

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

Modified: vtigercrm/trunk/modules/SalesOrder/Save.php
==============================================================================
--- vtigercrm/trunk/modules/SalesOrder/Save.php (original)
+++ vtigercrm/trunk/modules/SalesOrder/Save.php Wed Jun 28 04:28:34 2006
@@ -29,7 +29,10 @@
 $local_log =& LoggerManager::getLogger('index');
 
 $focus = new SalesOrder();
-
+global $current_user;
+$currencyid=fetchCurrency($current_user->id);
+$rate_symbol = getCurrencySymbolandCRate($currencyid);
+$rate = $rate_symbol['rate'];
 setObjectValuesFromRequest(&$focus);
 
 $focus->save("SalesOrder");
@@ -77,6 +80,7 @@
         $prod_status = $_REQUEST[$status_var];
         $qty = $_REQUEST[$qty_var];
         $listprice = $_REQUEST[$list_price_var];
+	$listprice = convertToDollar($listprice,$rate);
 	$vat = $_REQUEST[$vat_var];
 	$sales = $_REQUEST[$sales_var];
 	$service = $_REQUEST[$service_var];




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 06:32:09 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 10:32:09 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7617 -
	/vtigercrm/trunk/modules/Quotes/Save.php
Message-ID: <20060628103209.A788583FBC4@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 28 04:32:06 2006
New Revision: 7617

Log:
changes made to fix the issue in trac id:1142

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

Modified: vtigercrm/trunk/modules/Quotes/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Quotes/Save.php (original)
+++ vtigercrm/trunk/modules/Quotes/Save.php Wed Jun 28 04:32:06 2006
@@ -28,8 +28,10 @@
 
 $local_log =& LoggerManager::getLogger('index');
 
-global $log;
-
+global $log,$current_user;
+$currencyid=fetchCurrency($current_user->id);
+$rate_symbol = getCurrencySymbolandCRate($currencyid);
+$rate = $rate_symbol['rate'];
 $log->debug("Inside Quote Save");
 
 $focus = new Quote();
@@ -75,6 +77,7 @@
 	$prod_status = $_REQUEST[$status_var];
 	$qty = $_REQUEST[$qty_var];
 	$listprice = $_REQUEST[$list_price_var];
+	$listprice = convertToDollar($listprice,$rate);
 	$vat = $_REQUEST[$vat_var];
 	$sales = $_REQUEST[$sales_var];
 	$service = $_REQUEST[$service_var];




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 06:34:57 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 10:34:57 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7618 -
	/vtigercrm/trunk/modules/Quotes/EditView.php
Message-ID: <20060628103457.1E7CF7AD39F@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 28 04:34:53 2006
New Revision: 7618

Log:
changes made to fix the issue in trac id:1142

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

Modified: vtigercrm/trunk/modules/Quotes/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/Quotes/EditView.php (original)
+++ vtigercrm/trunk/modules/Quotes/EditView.php Wed Jun 28 04:34:53 2006
@@ -28,13 +28,15 @@
 require_once('include/utils/utils.php');
 require_once('include/FormValidationUtil.php');
 
-global $app_strings,$mod_strings,$log,$theme,$currentModule;
+global $app_strings,$mod_strings,$log,$theme,$currentModule,$current_user;
 
 $log->debug("Inside Quote EditView");
 
 $focus = new Quote();
 $smarty = new vtigerCRM_Smarty;
-
+$currencyid=fetchCurrency($current_user->id);
+$rate_symbol = getCurrencySymbolandCRate($currencyid);
+$rate = $rate_symbol['rate'];
 
 if(isset($_REQUEST['record']) && $_REQUEST['record'] != '') 
 {
@@ -141,26 +143,27 @@
 	$associated_prod = getAssociatedProducts("Quotes",$focus);//getProductDetailsBlockInfo('edit','Quotes',$focus); 
 	$smarty->assign("ASSOCIATEDPRODUCTS", $associated_prod);
 	$smarty->assign("MODE", $focus->mode);
-	$smarty->assign("TAXVALUE", $focus->column_fields['txtTax']);
-	$smarty->assign("ADJUSTMENTVALUE", $focus->column_fields['txtAdjustment']);
-	$smarty->assign("SUBTOTAL", $focus->column_fields['hdnSubTotal']);
-	$smarty->assign("GRANDTOTAL", $focus->column_fields['hdnGrandTotal']);
+	$smarty->assign("TAXVALUE", convertFromDollar($focus->column_fields['txtTax'],$rate));
+	$smarty->assign("ADJUSTMENTVALUE", convertFromDollar($focus->column_fields['txtAdjustment'],$rate));
+	$smarty->assign("SUBTOTAL", convertFromDollar($focus->column_fields['hdnSubTotal'],$rate));
+	$smarty->assign("GRANDTOTAL", convertFromDollar($focus->column_fields['hdnGrandTotal'],$rate));
 
 }
 elseif(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') {
         $smarty->assign("ROWCOUNT", $num_of_products);
         $smarty->assign("ASSOCIATEDPRODUCTS", $associated_prod);
         $smarty->assign("MODE", $focus->mode);
-        $smarty->assign("TAXVALUE", $focus->column_fields['txtTax']);
-        $smarty->assign("ADJUSTMENTVALUE", $focus->column_fields['txtAdjustment']);
-        $smarty->assign("SUBTOTAL", $focus->column_fields['hdnSubTotal']);
-        $smarty->assign("GRANDTOTAL", $focus->column_fields['hdnGrandTotal']);
+	$smarty->assign("TAXVALUE", convertFromDollar($focus->column_fields['txtTax'],$rate));
+	$smarty->assign("ADJUSTMENTVALUE", convertFromDollar($focus->column_fields['txtAdjustment'],$rate));
+	$smarty->assign("SUBTOTAL", convertFromDollar($focus->column_fields['hdnSubTotal'],$rate));
+	$smarty->assign("GRANDTOTAL", convertFromDollar($focus->column_fields['hdnGrandTotal'],$rate));
 
 }
 elseif((isset($_REQUEST['potential_id']) && $_REQUEST['potential_id'] != '') || (isset($_REQUEST['product_id']) && $_REQUEST['product_id'] != '')) {
         $smarty->assign("ROWCOUNT", $num_of_products);
         $smarty->assign("ASSOCIATEDPRODUCTS", $associated_prod);
 	$InvTotal = getInventoryTotal($_REQUEST['return_module'],$_REQUEST['return_id']);
+	$InvTotal = convertFromDollar($InvTotal,$rate);
         $smarty->assign("MODE", $focus->mode);
         $smarty->assign("TAXVALUE", "0.000");
         $smarty->assign("ADJUSTMENTVALUE", "0.000");




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 06:36:31 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 10:36:31 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7619 -
	/vtigercrm/trunk/modules/Invoice/Save.php
Message-ID: <20060628103631.7AFD383FBC4@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 28 04:36:28 2006
New Revision: 7619

Log:
changes made to fix the issue in trac id:1142

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

Modified: vtigercrm/trunk/modules/Invoice/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Invoice/Save.php (original)
+++ vtigercrm/trunk/modules/Invoice/Save.php Wed Jun 28 04:36:28 2006
@@ -29,7 +29,10 @@
 $local_log =& LoggerManager::getLogger('index');
 
 $focus = new Invoice();
-
+global $current_user;
+$currencyid=fetchCurrency($current_user->id);
+$rate_symbol = getCurrencySymbolandCRate($currencyid);
+$rate = $rate_symbol['rate'];
 setObjectValuesFromRequest(&$focus);
 
 $focus->save("Invoice");
@@ -77,6 +80,7 @@
         $prod_status = $_REQUEST[$status_var];
         $qty = $_REQUEST[$qty_var];
         $listprice = $_REQUEST[$list_price_var];
+	$listprice = convertToDollar($listprice,$rate);
 	$vat = $_REQUEST[$vat_var];
 	$sales = $_REQUEST[$sales_var];
 	$service = $_REQUEST[$service_var];




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 06:41:01 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 10:41:01 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7620 -
	/vtigercrm/trunk/modules/Invoice/EditView.php
Message-ID: <20060628104101.422DE83FBC4@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 28 04:40:57 2006
New Revision: 7620

Log:
changes made to fix the issue in trac id:1142

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

Modified: vtigercrm/trunk/modules/Invoice/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/Invoice/EditView.php (original)
+++ vtigercrm/trunk/modules/Invoice/EditView.php Wed Jun 28 04:40:57 2006
@@ -31,11 +31,13 @@
 require_once('include/utils/utils.php');
 require_once('include/FormValidationUtil.php');
 
-global $app_strings,$mod_strings,$currentModule,$log;
+global $app_strings,$mod_strings,$currentModule,$log,$current_user;
 
 $focus = new Invoice();
 $smarty = new vtigerCRM_Smarty();
-
+$currencyid=fetchCurrency($current_user->id);
+$rate_symbol = getCurrencySymbolandCRate($currencyid);
+$rate = $rate_symbol['rate'];
 if(isset($_REQUEST['record']) && $_REQUEST['record'] != '') 
 {
     if(isset($_REQUEST['convertmode']) &&  $_REQUEST['convertmode'] == 'quotetoinvoice')
@@ -53,10 +55,10 @@
 
 	$smarty->assign("ASSOCIATEDPRODUCTS", $associated_prod);
 	$smarty->assign("MODE", $quote_focus->mode);
-	$smarty->assign("TAXVALUE", $txtTax);
-	$smarty->assign("ADJUSTMENTVALUE", $txtAdj);
-	$smarty->assign("SUBTOTAL", $quote_focus->column_fields['hdnSubTotal']);
-	$smarty->assign("GRANDTOTAL", $quote_focus->column_fields['hdnGrandTotal']);
+	$smarty->assign("TAXVALUE", convertFromDollar($txtTax,$rate));
+	$smarty->assign("ADJUSTMENTVALUE", convertFromDollar($txtAdj,$rate));
+	$smarty->assign("SUBTOTAL", convertFromDollar($quote_focus->column_fields['hdnSubTotal'],$rate));
+	$smarty->assign("GRANDTOTAL", convertFromDollar($quote_focus->column_fields['hdnGrandTotal'],$rate));
 	$smarty->assign("AVAILABLE_PRODUCTS", 'true');
     }
     elseif(isset($_REQUEST['convertmode']) &&  $_REQUEST['convertmode'] == 'sotoinvoice')
@@ -74,10 +76,10 @@
 
 	$smarty->assign("ASSOCIATEDPRODUCTS", $associated_prod);
 	$smarty->assign("MODE", $so_focus->mode);
-	$smarty->assign("TAXVALUE", $txtTax);
-	$smarty->assign("ADJUSTMENTVALUE", $txtAdj);
-	$smarty->assign("SUBTOTAL", $so_focus->column_fields['hdnSubTotal']);
-	$smarty->assign("GRANDTOTAL", $so_focus->column_fields['hdnGrandTotal']);
+	$smarty->assign("TAXVALUE", convertFromDollar($txtTax,$rate));
+	$smarty->assign("ADJUSTMENTVALUE", convertFromDollar($txtAdj,$rate));
+	$smarty->assign("SUBTOTAL", convertFromDollar($so_focus->column_fields['hdnSubTotal'],$rate));
+	$smarty->assign("GRANDTOTAL", convertFromDollar($so_focus->column_fields['hdnGrandTotal'],$rate));
 	$smarty->assign("AVAILABLE_PRODUCTS", 'true');
 
     }
@@ -251,10 +253,10 @@
 	$associated_prod = getAssociatedProducts("Invoice",$focus);
 	$smarty->assign("ASSOCIATEDPRODUCTS", $associated_prod);
 	$smarty->assign("MODE", $focus->mode);
-	$smarty->assign("TAXVALUE", $focus->column_fields['txtTax']);
-	$smarty->assign("ADJUSTMENTVALUE", $focus->column_fields['txtAdjustment']);
-	$smarty->assign("SUBTOTAL", $focus->column_fields['hdnSubTotal']);
-	$smarty->assign("GRANDTOTAL", $focus->column_fields['hdnGrandTotal']);
+	$smarty->assign("TAXVALUE", convertFromDollar($focus->column_fields['txtTax'],$rate));
+	$smarty->assign("ADJUSTMENTVALUE", convertFromDollar($focus->column_fields['txtAdjustment'],$rate));
+	$smarty->assign("SUBTOTAL", convertFromDollar($focus->column_fields['hdnSubTotal'],$rate));
+	$smarty->assign("GRANDTOTAL", convertFromDollar($focus->column_fields['hdnGrandTotal'],$rate));
 }
 elseif(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true')
 {
@@ -265,6 +267,7 @@
 	$smarty->assign("ROWCOUNT", $num_of_products);
 	$smarty->assign("ASSOCIATEDPRODUCTS", $associated_prod);
 	$InvTotal = getInventoryTotal($_REQUEST['return_module'],$_REQUEST['return_id']);
+	$InvTotal = convertFromDollar($InvTotal,$rate);
         $smarty->assign("MODE", $focus->mode);
 	$smarty->assign("TAXVALUE", "0.000");
 	$smarty->assign("ADJUSTMENTVALUE", "0.000");




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 06:43:36 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 10:43:36 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7621 -
	/vtigercrm/trunk/modules/Campaigns/Save.php
Message-ID: <20060628104336.A43D583FBC4@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 28 04:43:32 2006
New Revision: 7621

Log:
changes made to fix the issue in trac id:1142

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

Modified: vtigercrm/trunk/modules/Campaigns/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Campaigns/Save.php (original)
+++ vtigercrm/trunk/modules/Campaigns/Save.php Wed Jun 28 04:43:32 2006
@@ -26,8 +26,38 @@
 require_once('include/database/PearDatabase.php');
 
 $focus = new Campaign();
+ global $current_user;
+ $currencyid=fetchCurrency($current_user->id);
+ $rate_symbol = getCurrencySymbolandCRate($currencyid);
+ $rate = $rate_symbol['rate'];
+setObjectValuesFromRequest(&$focus);
 
-setObjectValuesFromRequest(&$focus);
+if(isset($_REQUEST['expectedrevenue']))
+{
+	$value = convertToDollar($_REQUEST['expectedrevenue'],$rate);
+	$focus->column_fields['expectedrevenue'] = $value;
+}
+if(isset($_REQUEST['budgetcost']))
+{
+	$value = convertToDollar($_REQUEST['budgetcost'],$rate);
+	$focus->column_fields['budgetcost'] = $value;
+}
+if(isset($_REQUEST['actualcost']))
+{
+	$value = convertToDollar($_REQUEST['actualcost'],$rate);
+	$focus->column_fields['actualcost'] = $value;
+}
+if(isset($_REQUEST['actualroi']))
+{
+	$value = convertToDollar($_REQUEST['actualroi'],$rate);
+	$focus->column_fields['actualroi'] = $value;
+}
+if(isset($_REQUEST['expectedroi']))
+{
+	$value = convertToDollar($_REQUEST['expectedroi'],$rate);
+	$focus->column_fields['expectedroi'] = $value;
+}
+
 
 $focus->save("Campaigns");
 $return_id = $focus->id;




From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 28 06:44:07 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 28 Jun 2006 10:44:07 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231142=3A?=
 =?utf-8?q?_currency_conversion_is_not_applied_for_product_details?=
In-Reply-To: <076.ed680d7929677a23842f476fd7e13220@vtiger.fosslabs.com>
References: <076.ed680d7929677a23842f476fd7e13220@vtiger.fosslabs.com>
Message-ID: <085.3de94cc865d0dd8b8402d5b392619349@vtiger.fosslabs.com>

#1142: currency conversion is not applied for product details
------------------------+---------------------------------------------------
  Reporter:  mangai     |       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

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1142>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 06:55:36 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 10:55:36 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7622 -
	/vtigercrm/trunk/modules/Notes/Save.php
Message-ID: <20060628105536.C493583FC21@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 28 04:55:33 2006
New Revision: 7622

Log:
* Modified to retrieve and save the note attachment to the new note when we duplicate the note

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

Modified: vtigercrm/trunk/modules/Notes/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Notes/Save.php (original)
+++ vtigercrm/trunk/modules/Notes/Save.php Wed Jun 28 04:55:33 2006
@@ -40,32 +40,40 @@
 
 if (!isset($_REQUEST['date_due_flag'])) $focus->date_due_flag = 'off';
 
-//Added for retrieve the old existing vtiger_attachments when duplicated without new attachment
+//Save the Note
+$focus->save("Notes");
+
+//Added to retrieve the existing attachment of the notes and save it for the new duplicated note
 if($_FILES['filename']['name'] == '' && $_REQUEST['mode'] != 'edit' && $_REQUEST['old_id'] != '')
 {
-        $sql = "select vtiger_attachments.attachmentsid from vtiger_attachments inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid=vtiger_attachments.attachmentsid where vtiger_seattachmentsrel.crmid= ".$_REQUEST['old_id'];
+        $sql = "select vtiger_attachments.* from vtiger_attachments inner join vtiger_seattachmentsrel on vtiger_seattachmentsrel.attachmentsid=vtiger_attachments.attachmentsid where vtiger_seattachmentsrel.crmid= ".$_REQUEST['old_id'];
         $result = $adb->query($sql);
         if($adb->num_rows($result) != 0)
+	{
                 $attachmentid = $adb->query_result($result,0,'attachmentsid');
-	        if($attachmentid != '')
-	        {
-	                $attachquery = "select * from vtiger_attachments where attachmentsid = ".$attachmentid;
-	                $result = $adb->query($attachquery);
-	                $filename = $adb->query_result($result,0,'name');
-	                $filetype = $adb->query_result($result,0,'type');
-			$filepath = $adb->query_result($result,0,'path');
+		$filename = $adb->query_result($result,0,'name');
+		$filetype = $adb->query_result($result,0,'type');
+		$filepath = $adb->query_result($result,0,'path');
 
-	                $_FILES['filename']['name'] = $filename;
-	                $_FILES['filename']['type'] = $filetype;
+		$new_attachmentid = $adb->getUniqueID("vtiger_crmentity");
+		$date_var = date('YmdHis');
 
-			//we should read the file and calculate the size, without setting vtiger_filesize, attachment will not save
-	                $filesize = filesize($filepath.$filename);
-	                $_FILES['filename']['size'] = $filesize;
-	        }
+		$upload_filepath = decideFilePath();
+
+		//Read the old file contents and write it as a new file with new attachment id
+		$handle = @fopen($upload_filepath.$new_attachmentid."_".$filename,'w');
+		fputs($handle, file_get_contents($filepath.$attachmentid."_".$filename));
+		fclose($handle);	
+
+		$adb->query("update vtiger_notes set filename=\"$filename\" where notesid=$focus->id");	
+		$adb->query("insert into vtiger_crmentity (crmid,setype,createdtime) values('".$new_attachmentid."','Notes Attachment','".$date_var."')");
+
+		$adb->query("insert into vtiger_attachments values(".$new_attachmentid.",'".$filename."','','".$filetype."','".$upload_filepath."')");
+
+		$adb->query("insert into vtiger_seattachmentsrel values('".$focus->id."','".$new_attachmentid."')");
+	}
 }
-																						
 
-$focus->save("Notes");
 
 $return_id = $focus->id;
 $note_id = $return_id;




From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 28 06:56:29 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 28 Jun 2006 10:56:29 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231386=3A?=
 =?utf-8?q?_Attachment_is_not_Saved_while_duplicating_Notes?=
In-Reply-To: <076.23ff7f44f849d0ff988e6bfb215ede83@vtiger.fosslabs.com>
References: <076.23ff7f44f849d0ff988e6bfb215ede83@vtiger.fosslabs.com>
Message-ID: <085.b5a647daa84cbe67bbf21279d3b87b7d@vtiger.fosslabs.com>

#1386: Attachment is not Saved while duplicating Notes
------------------------+---------------------------------------------------
  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:  new => closed

Comment:

 This issue is fixed.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1386>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 06:59:38 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 10:59:38 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7623 -
	/vtigercrm/trunk/schema/DatabaseSchema.xml
Message-ID: <20060628105938.F006A83FC11@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 28 04:59:35 2006
New Revision: 7623

Log:
column server_port included in vtiger_system table,homeorder has been changed and type and size changed in vtiger_campaign table for expectedrevenue,budgetcost,actualcost,expectedroi and actualroi

Modified:
    vtigercrm/trunk/schema/DatabaseSchema.xml

Modified: vtigercrm/trunk/schema/DatabaseSchema.xml
==============================================================================
--- vtigercrm/trunk/schema/DatabaseSchema.xml (original)
+++ vtigercrm/trunk/schema/DatabaseSchema.xml Wed Jun 28 04:59:35 2006
@@ -66,7 +66,7 @@
 			<default value="23:00" />
 		</field>	
 		<field name="homeorder" type="C" size="255">
-			<default value="ALVT,PLVT,QLTQ,CVLVT,HLT,OLV,GRT,OLTSO,ILTI,MNL" />
+			<default value="ALVT,PLVT,QLTQ,CVLVT,HLT,OLV,GRT,OLTSO,ILTI,MNL,HDB" />
 		</field>
 		<field name="activity_view" type="C" size="25">
 			<default value="Today" />
@@ -1184,9 +1184,9 @@
 		<field name="campaignname" type="C" size="255" />
 		<field name="campaigntype" type="C" size="255" />
 		<field name="campaignstatus" type="C" size="255" />
-		<field name="expectedrevenue" type="I" size="19" />
-		<field name="budgetcost" type="I" size="19" />
-		<field name="actualcost" type="I" size="19" />
+		<field name="expectedrevenue" type="N" size="11.3" />
+		<field name="budgetcost" type="N" size="11.3" />
+		<field name="actualcost" type="N" size="11.3" />
 		<field name="expectedresponse" type="C" size="255" />
 		<field name="numsent" type="N" size="11.0" />
 		<field name="product_id" type="I" size="19" />
@@ -1195,10 +1195,10 @@
 		<field name="targetsize" type="I" size="19" />
 		<field name="expectedresponsecount" type="I" size="19" />
 		<field name="expectedsalescount" type="I" size="19" />
-		<field name="expectedroi" type="I" size="19" />
+		<field name="expectedroi" type="N" size="11.3" />
 		<field name="actualresponsecount" type="I" size="19" />
 		<field name="actualsalescount" type="I" size="19" />
-		<field name="actualroi" type="I" size="19" />
+		<field name="actualroi" type="N" size="11.3" />
 		<field name="campaignid" type="I" size="19">
 			<key />
 		</field>
@@ -1781,6 +1781,7 @@
 			<key />
 		</field>
 		<field name="server" type="C" size="30" />
+		<field name="server_port" type="I" size="19" />
 		<field name="server_username" type="C" size="30" />
 		<field name="server_password" type="C" size="30" />
 		<field name="server_type" type="C" size="20" />




From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 28 08:02:21 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 28 Jun 2006 12:02:21 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231388=3A?=
 =?utf-8?q?_Quick_Edit_not_functional_for_activity_module?=
Message-ID: <076.50cd906646f38b3f0a24d3ab69d7789d@vtiger.fosslabs.com>

#1388: Quick Edit not functional for activity module
-----------------------+----------------------------------------------------
 Reporter:  ahmed      |       Owner:  Jeri 
     Type:  defect     |      Status:  new  
 Priority:  critical   |   Milestone:       
Component:  vtigercrm  |     Version:  5.0.0
 Keywords:             |  
-----------------------+----------------------------------------------------


-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1388>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 28 08:03:38 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 28 Jun 2006 12:03:38 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231389=3A?=
 =?utf-8?q?_Values_retained_in_the_Pending_Activities_=28Homepage=29_even_?=
 =?utf-8?q?if_no_activity_records_are_present=2E?=
Message-ID: <076.411f5cbf1eec66cd754596f2025d46c0@vtiger.fosslabs.com>

#1389: Values retained in the Pending Activities (Homepage) even if no activity
records are present.
-----------------------+----------------------------------------------------
 Reporter:  ahmed      |       Owner:  jeri 
     Type:  defect     |      Status:  new  
 Priority:  critical   |   Milestone:       
Component:  vtigercrm  |     Version:  5.0.0
 Keywords:             |  
-----------------------+----------------------------------------------------


-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1389>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 28 08:04:57 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 28 Jun 2006 12:04:57 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231390=3A?=
 =?utf-8?q?_Custome_View_Issue_in_Activities?=
Message-ID: <076.74b7dccf8426c4468275b28cfd4f7db2@vtiger.fosslabs.com>

#1390: Custome View Issue in Activities
-----------------------+----------------------------------------------------
 Reporter:  ahmed      |       Owner:  mangai
     Type:  defect     |      Status:  new   
 Priority:  critical   |   Milestone:        
Component:  vtigercrm  |     Version:  5.0.0 
 Keywords:             |  
-----------------------+----------------------------------------------------
 While viewing the activities list with activitytype criteria, we get no
 results.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1390>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 28 08:06:06 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 28 Jun 2006 12:06:06 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231391=3A?=
 =?utf-8?q?_Background_Img_missing_when_editing_the_selected_products_in_P?=
 =?utf-8?q?riceBook_Related_List?=
Message-ID: <076.fb585b9ef8e9e11ac11d7e70c1f143bb@vtiger.fosslabs.com>

#1391: Background Img missing when editing the selected products in PriceBook
Related List
-----------------------+----------------------------------------------------
 Reporter:  ahmed      |       Owner:  Ela  
     Type:  defect     |      Status:  new  
 Priority:  critical   |   Milestone:       
Component:  vtigercrm  |     Version:  5.0.0
 Keywords:             |  
-----------------------+----------------------------------------------------


-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1391>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 08:27:48 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 12:27:48 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7624 - in
 /vtigercrm/trunk/modules: Accounts/Account.php Contacts/Contact.php
 Leads/Lead.php Potentials/Opportunity.php Products/Product.php
Message-ID: <20060628122748.1B40D59021C@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 28 06:27:31 2006
New Revision: 7624

Log:
* Fixed the issues in the export query

Modified:
    vtigercrm/trunk/modules/Accounts/Account.php
    vtigercrm/trunk/modules/Contacts/Contact.php
    vtigercrm/trunk/modules/Leads/Lead.php
    vtigercrm/trunk/modules/Potentials/Opportunity.php
    vtigercrm/trunk/modules/Products/Product.php

Modified: vtigercrm/trunk/modules/Accounts/Account.php
==============================================================================
--- vtigercrm/trunk/modules/Accounts/Account.php (original)
+++ vtigercrm/trunk/modules/Accounts/Account.php Wed Jun 28 06:27:31 2006
@@ -590,10 +590,10 @@
 	{
 		global $log;
                 $log->debug("Entering create_export_query(".$order_by.",".$where.") method ...");
-		if($this->checkIfCustomTableExists('accountscf'))
-		{
-
-			$query = $this->constructCustomQueryAddendum('accountscf','Accounts') . "
+		if($this->checkIfCustomTableExists('vtiger_accountscf'))
+		{
+
+			$query = $this->constructCustomQueryAddendum('vtiger_accountscf','Accounts') . "
 				vtiger_account.*,
 					".$this->entity_table.".*,
 				vtiger_accountbillads.city AS billing_city,

Modified: vtigercrm/trunk/modules/Contacts/Contact.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/Contact.php (original)
+++ vtigercrm/trunk/modules/Contacts/Contact.php Wed Jun 28 06:27:31 2006
@@ -513,9 +513,9 @@
         {
 		global $log;
 		$log->debug("Entering create_export_query(".$order_by.",".$where.") method ...");
-		if($this->checkIfCustomTableExists('contactscf'))
+		if($this->checkIfCustomTableExists('vtiger_contactscf'))
 		{
-			$query =  $this->constructCustomQueryAddendum('contactscf','Contacts') ."
+			$query =  $this->constructCustomQueryAddendum('vtiger_contactscf','Contacts') ."
                                 vtiger_contactdetails.*, vtiger_contactaddress.*,
                                 vtiger_account.accountname account_name,
                                 vtiger_users.user_name assigned_user_name

Modified: vtigercrm/trunk/modules/Leads/Lead.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/Lead.php (original)
+++ vtigercrm/trunk/modules/Leads/Lead.php Wed Jun 28 06:27:31 2006
@@ -125,10 +125,10 @@
 	{
 		global $log;
 		$log->debug("Entering create_export_query(".$order_by.",".$where.") method ...");
-		if($this->checkIfCustomTableExists('leadscf'))
+		if($this->checkIfCustomTableExists('vtiger_leadscf'))
 		{
 
-			$query = $this->constructCustomQueryAddendum('leadscf','Leads') . " 
+			$query = $this->constructCustomQueryAddendum('vtiger_leadscf','Leads') . " 
 			vtiger_leaddetails.*, ".$this->entity_table.".*, vtiger_leadsubdetails.*,vtiger_leadaddress.city city, vtiger_leadaddress.state state,vtiger_leadaddress.code code,vtiger_leadaddress.country country, vtiger_leadaddress.phone phone, vtiger_users.user_name, vtiger_users.status user_status
 				FROM ".$this->entity_table."
 				INNER JOIN vtiger_leaddetails

Modified: vtigercrm/trunk/modules/Potentials/Opportunity.php
==============================================================================
--- vtigercrm/trunk/modules/Potentials/Opportunity.php (original)
+++ vtigercrm/trunk/modules/Potentials/Opportunity.php Wed Jun 28 06:27:31 2006
@@ -167,28 +167,31 @@
 		global $log;
 		$log->debug("Entering create_export_query(".$order_by.",". $where.") method ...");
 
-		if($this->checkIfCustomTableExists('potentialscf'))
-		{
-			$query = $this->constructCustomQueryAddendum('potentialscf','Potentials') ."
+		if($this->checkIfCustomTableExists('vtiger_potentialscf'))
+		{
+			$query = $this->constructCustomQueryAddendum('vtiger_potentialscf','Potentials') ."
 			vtiger_potential.*,
 			vtiger_account.accountname account_name,
 			vtiger_users.user_name assigned_user_name
-					FROM vtiger_potential
-					INNER JOIN vtiger_crmentity
-					ON vtiger_crmentity.crmid=vtiger_potential.potentialid
-					LEFT JOIN vtiger_account on vtiger_potential.accountid=vtiger_account.accountid
-					left join vtiger_potentialscf on vtiger_potentialscf.potentialid=vtiger_potential.potentialid
-					left join vtiger_users on vtiger_crmentity.smownerid=vtiger_users.id where vtiger_crmentity.deleted=0 ";
+				FROM vtiger_potential
+				INNER JOIN vtiger_crmentity ON vtiger_crmentity.crmid=vtiger_potential.potentialid
+				LEFT JOIN vtiger_account on vtiger_potential.accountid=vtiger_account.accountid
+				left join vtiger_potentialscf on vtiger_potentialscf.potentialid=vtiger_potential.potentialid
+				left join vtiger_users on vtiger_crmentity.smownerid=vtiger_users.id 
+			where vtiger_crmentity.deleted=0 ";
 		}
 		else
 		{
 			$query = "SELECT
 			vtiger_potential.*,
-			vtiger_account.accountname vtiger_account_name,
+			vtiger_account.accountname account_name,
 			vtiger_users.user_name assigned_user_name
-					FROM vtiger_potential inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_potential.potentialid                                LEFT JOIN vtiger_users
-					ON vtiger_crmentity.smownerid=vtiger_users.id
-					LEFT JOIN vtiger_account on vtiger_potential.accountid=vtiger_account.accountid  LEFT JOIN vtiger_potentialscf on vtiger_potentialscf.potentialid=vtiger_potential.potentialid where vtiger_crmentity.deleted=0 ";
+				FROM vtiger_potential 
+				inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_potential.potentialid 
+				LEFT JOIN vtiger_users ON vtiger_crmentity.smownerid=vtiger_users.id
+				LEFT JOIN vtiger_account on vtiger_potential.accountid=vtiger_account.accountid  
+				LEFT JOIN vtiger_potentialscf on vtiger_potentialscf.potentialid=vtiger_potential.potentialid 
+			where vtiger_crmentity.deleted=0 ";
 		}	
 
 		$log->debug("Exiting create_export_query method ...");

Modified: vtigercrm/trunk/modules/Products/Product.php
==============================================================================
--- vtigercrm/trunk/modules/Products/Product.php (original)
+++ vtigercrm/trunk/modules/Products/Product.php Wed Jun 28 06:27:31 2006
@@ -23,9 +23,9 @@
 
 	 // Josh added for importing and exporting -added in patch2
         var $unit_price;
-        var $table_name = "products";
+        var $table_name = "vtiger_products";
         var $object_name = "Product";
-        var $entity_table = "crmentity";
+        var $entity_table = "vtiger_crmentity";
         var $required_fields = Array(
                 'productname'=>1
         );
@@ -440,16 +440,16 @@
 	{
 		global $log;
 		$log->debug("Entering create_export_query(".$order_by.",".$where.") method ...");
-		if($this->checkIfCustomTableExists('productcf'))
+		if($this->checkIfCustomTableExists('vtiger_productcf'))
 		{
 
-		$query = $this->constructCustomQueryAddendum('productcf','Products') ."    
+		$query = $this->constructCustomQueryAddendum('vtiger_productcf','Products') ."    
 			vtiger_products.productid AS productid,
 			vtiger_products.productname AS productname,
 			vtiger_products.productcode AS productcode,
-			vtiger_products.productcategory AS vtiger_productcategory,
-			vtiger_products.manufacturer AS vtiger_manufacturer,
-			vtiger_products.product_description AS product_description,
+			vtiger_products.productcategory AS productcategory,
+			vtiger_products.manufacturer AS manufacturer,
+			vtiger_crmentity.description AS product_description,
 			vtiger_products.qty_per_unit AS qty_per_unit,
 			vtiger_products.unit_price AS unit_price,
 			vtiger_products.weight AS weight,
@@ -462,16 +462,16 @@
 			vtiger_products.discontinued AS discontinued,
 			vtiger_products.sales_start_date AS sales_start_date,
 			vtiger_products.sales_end_date AS sales_end_date,
-			vtiger_products.usageunit AS vtiger_usageunit,
+			vtiger_products.usageunit AS usageunit,
 			vtiger_products.serialno AS serialno,
-			vtiger_products.currency AS vtiger_currency,
+			vtiger_products.currency AS currency,
 			vtiger_products.reorderlevel AS reorderlevel,
 			vtiger_products.website AS website,
-			vtiger_products.taxclass AS vtiger_taxclass,
+			vtiger_products.taxclass AS taxclass,
 			vtiger_products.mfr_part_no AS mfr_part_no,
-			vtiger_products.vendor_part_no AS vtiger_vendor_part_no,
+			vtiger_products.vendor_part_no AS vendor_part_no,
 			vtiger_products.qtyinstock AS qtyinstock,
-			vtiger_products.productsheet AS vtiger_productsheet,
+			vtiger_products.productsheet AS productsheet,
 			vtiger_products.qtyindemand AS qtyindemand
 			FROM ".$this->entity_table."
 			INNER JOIN vtiger_products
@@ -487,9 +487,9 @@
 			$query = "SELECT vtiger_products.productid AS productid,
 			vtiger_products.productname AS productname,
 			vtiger_products.productcode AS productcode,
-			vtiger_products.productcategory AS vtiger_productcategory,
-			vtiger_products.manufacturer AS vtiger_manufacturer,
-			vtiger_products.product_description AS product_description,
+			vtiger_products.productcategory AS productcategory,
+			vtiger_products.manufacturer AS manufacturer,
+			vtiger_crmentity.description AS product_description,
 			vtiger_products.qty_per_unit AS qty_per_unit,
 			vtiger_products.unit_price AS unit_price,
 			vtiger_products.weight AS weight,
@@ -502,16 +502,16 @@
 			vtiger_products.discontinued AS discontinued,
 			vtiger_products.sales_start_date AS sales_start_date,
 			vtiger_products.sales_end_date AS sales_end_date,
-			vtiger_products.usageunit AS vtiger_usageunit,
+			vtiger_products.usageunit AS usageunit,
 			vtiger_products.serialno AS serialno,
 			vtiger_products.currency AS vtiger_currency,
 			vtiger_products.reorderlevel AS reorderlevel,
 			vtiger_products.website AS website,
-			vtiger_products.taxclass AS vtiger_taxclass,
+			vtiger_products.taxclass AS taxclass,
 			vtiger_products.mfr_part_no AS mfr_part_no,
-			vtiger_products.vendor_part_no AS vtiger_vendor_part_no,
+			vtiger_products.vendor_part_no AS vendor_part_no,
 			vtiger_products.qtyinstock AS qtyinstock,
-			vtiger_products.productsheet AS vtiger_productsheet,
+			vtiger_products.productsheet AS productsheet,
 			vtiger_products.qtyindemand AS qtyindemand
 			FROM ".$this->table_name ."
 			INNER JOIN vtiger_crmentity




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 08:28:47 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 12:28:47 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7625 -
	/vtigercrm/trunk/modules/Users/User.php
Message-ID: <20060628122847.C950059021C@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 28 06:28:43 2006
New Revision: 7625

Log:
* Modified the function retrieve_entity_info as if the record is empty then return null and added to set the id

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

Modified: vtigercrm/trunk/modules/Users/User.php
==============================================================================
--- vtigercrm/trunk/modules/Users/User.php (original)
+++ vtigercrm/trunk/modules/Users/User.php Wed Jun 28 06:28:43 2006
@@ -708,6 +708,14 @@
 	function retrieve_entity_info($record, $module)
 	{
 		global $adb,$log;
+		$log->debug("Entering into retrieve_entity_info($record, $module) method.");
+
+		if($record == '')
+		{
+			$log->debug("record is empty. returning null");
+			return null;
+		}
+
 		$result = Array();
 		foreach($this->tab_name_index as $table_name=>$index)
 		{
@@ -730,6 +738,11 @@
 		}
 		$this->column_fields["record_id"] = $record;
 		$this->column_fields["record_module"] = $module;
+
+		$this->id = $record;
+		$log->debug("Exit from retrieve_entity_info($record, $module) method.");
+
+		return $this;
 	}
 	function uploadAndSaveFile($id,$module,$file_details)
 	{




From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 28 08:30:17 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 28 Jun 2006 12:30:17 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231378=3A?=
 =?utf-8?q?_Emails=3A_Improper_Export_link?=
In-Reply-To: <076.70d0318c40a5216b6e6108b9de7b7e0f@vtiger.fosslabs.com>
References: <076.70d0318c40a5216b6e6108b9de7b7e0f@vtiger.fosslabs.com>
Message-ID: <085.a2c6ccd8d4c5bd94c20ee7c9921fe9cb@vtiger.fosslabs.com>

#1378: Emails: Improper Export link
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  mickie
      Type:  defect     |      Status:  closed
  Priority:  blocker    |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mickie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 Export is failed in all modules and they have been fixed and export is
 working fine.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1378>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 28 08:50:11 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 28 Jun 2006 12:50:11 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231392=3A?=
 =?utf-8?q?_Product_popup_throws_page_not_found_error?=
Message-ID: <076.98b6c865c25365846d37f3a61ea7c371@vtiger.fosslabs.com>

#1392: Product popup throws page not found error
-----------------------+----------------------------------------------------
 Reporter:  mickie     |       Owner:  mickie
     Type:  defect     |      Status:  new   
 Priority:  major      |   Milestone:        
Component:  vtigercrm  |     Version:  5.0.0 
 Keywords:             |  
-----------------------+----------------------------------------------------
 when we create PO or SO we have to select Product through Popup where as
 if we select the product after made search in the popup then it throws
 "page not found error"

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1392>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 09:01:17 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 13:01:17 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7626 -
 /vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl
Message-ID: <20060628130117.3D6207FDA83@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 28 07:01:13 2006
New Revision: 7626

Log:
Update sharing access file

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

Modified: vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/OrgSharingDetailView.tpl Wed Jun 28 07:01:13 2006
@@ -192,8 +192,7 @@
                 'index.php',
                 {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
                         method: 'post',
-                        postBody: 'module=Users&action=UsersAjax&orgajax=true&mode='+mode+'&sharing_module='+modulename+'&sh
-areid='+id,
+                        postBody: 'module=Users&action=UsersAjax&orgajax=true&mode='+mode+'&sharing_module='+modulename+'&shareid='+id,
                         onComplete: function(response) {ldelim}
                                 $("status").style.display="none";
                                 $("tempdiv").innerHTML=response.responseText;




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 09:05:02 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 13:05:02 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7627 -
	/vtigercrm/trunk/Smarty/templates/DetailView.tpl
Message-ID: <20060628130503.84B647FDA83@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 28 07:04:58 2006
New Revision: 7627

Log:
inline style has been removed in locateMap layer

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 Wed Jun 28 07:04:58 2006
@@ -79,7 +79,7 @@
                 {assign var=address1 value='Mailing'}
                 {assign var=address2 value='Other'}
         {/if}
-        <div id="locateMap" style="width: 125px; right: 159px; top: 260px; display: none; z-index:50" onmouseout="fninvsh('locateMap')" onmouseover="fnvshNrm('locateMap')">
+        <div id="locateMap" onMouseOut="fninvsh('locateMap')" onMouseOver="fnvshNrm('locateMap')">
                 <table bgcolor="#ffffff" border="0" cellpadding="0" cellspacing="0" width="100%">
                         <tr>
                                 <td>
@@ -211,7 +211,7 @@
                                                         {if $MODULE eq 'Leads'}
                                                         <input name="mapbutton" value="{$APP.LBL_LOCATE_MAP}" class="small" type="button" onClick="searchMapLocation( 'Main' )" title="{$APP.LBL_LOCATE_MAP}">
                                                         {else}
-                                                        <input name="mapbutton" value="{$APP.LBL_LOCATE_MAP}" class="small" type="button" onClick="fnvshobj(this,'locateMap');" onmouseout="fninvsh('locateMap');" title="{$APP.LBL_LOCATE_MAP}">
+                                                        <input name="mapbutton" value="{$APP.LBL_LOCATE_MAP}" class="small" type="button" onClick="fnvshobj(this,'locateMap');" onMouseOut="fninvsh('locateMap');" title="{$APP.LBL_LOCATE_MAP}">
 							{/if}
                                                         {/if}
                                                         </td>




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 09:07:22 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 13:07:22 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7628 -
	/vtigercrm/trunk/themes/blue/style.css
Message-ID: <20060628130722.5BAE583FD30@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 28 07:07:18 2006
New Revision: 7628

Log:
locateMap style 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 Wed Jun 28 07:07:18 2006
@@ -1875,6 +1875,17 @@
 	z-index:2000;
 }
 
+#locateMap{
+	width:120px;
+	background-color:#CCCCCC;
+	border:1px solid #DDDDDD;
+	padding-top:5px;
+	position:absolute;
+	display:none;
+	z-index:2000;
+}
+
+
 a.reportMnu{
 	font-size:11px;
 	color:#0070BA;
@@ -1885,7 +1896,7 @@
 	border-bottom:1px solid #E1E1E1;
 	padding-left:20px;
 	padding-top:3px;
-}	
+}
 
 a.reportMnu:Hover{
 	font-size:11px;




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 09:07:24 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 13:07:24 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7629 -
	/vtigercrm/trunk/modules/Contacts/chat.php
Message-ID: <20060628130724.97A4B7FDA83@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 28 07:07:11 2006
New Revision: 7629

Log:
Added vtiger_ in getUniqueID function parameter

Modified:
    vtigercrm/trunk/modules/Contacts/chat.php

Modified: vtigercrm/trunk/modules/Contacts/chat.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/chat.php (original)
+++ vtigercrm/trunk/modules/Contacts/chat.php Wed Jun 28 07:07:11 2006
@@ -172,7 +172,7 @@
 	return;
       }
     
-    $_SESSION['chat_user'] = $adb->getUniqueID('chat_users');
+    $_SESSION['chat_user'] = $adb->getUniqueID('vtiger_chat_users');
     
     $res = $adb->query("INSERT INTO vtiger_chat_users (id, nick, session, ping, ip)
    			 VALUES ('".$_SESSION['chat_user']."',
@@ -346,7 +346,7 @@
     $msg = $this->msgParse($msg);
     if(strlen($msg) == 0) return;
     
-    $id = $adb->getUniqueID('chat_msg');
+    $id = $adb->getUniqueID('vtiger_chat_msg');
     $res = $adb->query("INSERT INTO vtiger_chat_msg (id, chat_from, chat_to, born, msg)
     			VALUES (".$id.", '".$_SESSION['chat_user']."', '".$to."', ".$adb->database->sysTimeStamp.", '".$msg."')");
     




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 09:09:36 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 13:09:36 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7630 -
 /vtigercrm/trunk/modules/CustomView/PopulateCustomView.php
Message-ID: <20060628130936.73FE583F28B@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 28 07:09:21 2006
New Revision: 7630

Log:
Added vtiger_ in getUniqueID function parameter

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 Jun 28 07:09:21 2006
@@ -427,7 +427,7 @@
 {
 	global $adb;
 
-	$genCVid = $adb->getUniqueID("customview");
+	$genCVid = $adb->getUniqueID("vtiger_customview");
 
 	if($genCVid != "")
 	{




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 09:11:45 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 13:11:45 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7631 -
	/vtigercrm/trunk/modules/CustomView/Save.php
Message-ID: <20060628131145.41D9983F28B@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 28 07:11:22 2006
New Revision: 7631

Log:
Added vtiger_ in getUniqueID function parameter

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 Wed Jun 28 07:11:22 2006
@@ -89,7 +89,7 @@
 
 	if(!$cvid)
 	{
-		$genCVid = $adb->getUniqueID("customview");
+		$genCVid = $adb->getUniqueID("vtiger_customview");
 		if($genCVid != "")
 		{
 




From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 28 09:14:25 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 28 Jun 2006 13:14:25 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231393=3A?=
 =?utf-8?q?_Add_Tag_Link_shows_Page_Not_Found_while_accessing_from_other_m?=
 =?utf-8?q?achine=2E?=
Message-ID: <076.82526953e64e63d31ad8af0d4f1c9556@vtiger.fosslabs.com>

#1393: Add Tag Link shows Page Not Found while accessing from other machine.
-----------------------+----------------------------------------------------
 Reporter:  ahmed      |       Owner:  saraj
     Type:  defect     |      Status:  new  
 Priority:  blocker    |   Milestone:       
Component:  vtigercrm  |     Version:  5.0.0
 Keywords:             |  
-----------------------+----------------------------------------------------


-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1393>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 09:19:42 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 13:19:42 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7632 -
	/vtigercrm/trunk/modules/Portal/Portal.php
Message-ID: <20060628131942.A5704771F73@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 28 07:19:22 2006
New Revision: 7632

Log:
Added vtiger_ in getUniqueID function parameter

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

Modified: vtigercrm/trunk/modules/Portal/Portal.php
==============================================================================
--- vtigercrm/trunk/modules/Portal/Portal.php (original)
+++ vtigercrm/trunk/modules/Portal/Portal.php Wed Jun 28 07:19:22 2006
@@ -14,7 +14,7 @@
 {
 	global $adb;
 	$adb->println("just entered the SavePortal method");
-	$portalid=$adb->getUniqueID('portal');
+	$portalid=$adb->getUniqueID('vtiger_portal');
 	$query="insert into vtiger_portal values(".$portalid.",'".$portalname."','".$portalurl."',0)";
 	$adb->println($query);
 	$result=$adb->query($query);




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 09:22:27 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 13:22:27 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7633 -
	/vtigercrm/trunk/modules/Reports/PopulateReports.php
Message-ID: <20060628132227.8F05183FAB5@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 28 07:22:13 2006
New Revision: 7633

Log:
Added vtiger_ in getUniqueID function parameter

Modified:
    vtigercrm/trunk/modules/Reports/PopulateReports.php

Modified: vtigercrm/trunk/modules/Reports/PopulateReports.php
==============================================================================
--- vtigercrm/trunk/modules/Reports/PopulateReports.php (original)
+++ vtigercrm/trunk/modules/Reports/PopulateReports.php Wed Jun 28 07:22:13 2006
@@ -429,7 +429,7 @@
 function insertSelectQuery()
 {
 	global $adb;
-	$genQueryId = $adb->getUniqueID("selectquery");
+	$genQueryId = $adb->getUniqueID("vtiger_selectquery");
         if($genQueryId != "")
         {
 		$iquerysql = "insert into vtiger_selectquery (QUERYID,STARTINDEX,NUMOFOBJECTS) values (".$genQueryId.",0,0)";




From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 28 09:24:05 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 28 Jun 2006 13:24:05 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231393=3A?=
 =?utf-8?q?_Add_Tag_Link_shows_Page_Not_Found_while_accessing_from_other_m?=
 =?utf-8?q?achine=2E?=
In-Reply-To: <076.82526953e64e63d31ad8af0d4f1c9556@vtiger.fosslabs.com>
References: <076.82526953e64e63d31ad8af0d4f1c9556@vtiger.fosslabs.com>
Message-ID: <085.9a59a23711618c5777bacb363b1868bf@vtiger.fosslabs.com>

#1393: Add Tag Link shows Page Not Found while accessing from other machine.
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  jerrydgeorge
      Type:  defect     |      Status:  new         
  Priority:  blocker    |   Milestone:              
 Component:  vtigercrm  |     Version:  5.0.0       
Resolution:             |    Keywords:              
------------------------+---------------------------------------------------
Changes (by jerrydgeorge):

  * owner:  saraj => jerrydgeorge

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1393>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 28 09:24:38 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 28 Jun 2006 13:24:38 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231393=3A?=
 =?utf-8?q?_Add_Tag_Link_shows_Page_Not_Found_while_accessing_from_other_m?=
 =?utf-8?q?achine=2E?=
In-Reply-To: <076.82526953e64e63d31ad8af0d4f1c9556@vtiger.fosslabs.com>
References: <076.82526953e64e63d31ad8af0d4f1c9556@vtiger.fosslabs.com>
Message-ID: <085.26e30a135ce8f0e97f9b3fc3606d9216@vtiger.fosslabs.com>

#1393: Add Tag Link shows Page Not Found while accessing from other machine.
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  jerrydgeorge
      Type:  defect     |      Status:  closed      
  Priority:  blocker    |   Milestone:              
 Component:  vtigercrm  |     Version:  5.0.0       
Resolution:  fixed      |    Keywords:              
------------------------+---------------------------------------------------
Changes (by jerrydgeorge):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1393>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 09:24:44 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 13:24:44 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7634 -
	/vtigercrm/trunk/include/freetag/freetag.class.php
Message-ID: <20060628132444.CB41383FD19@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 28 07:24:41 2006
New Revision: 7634

Log:
tag search page not found issue has been fixed

Modified:
    vtigercrm/trunk/include/freetag/freetag.class.php

Modified: vtigercrm/trunk/include/freetag/freetag.class.php
==============================================================================
--- vtigercrm/trunk/include/freetag/freetag.class.php (original)
+++ vtigercrm/trunk/include/freetag/freetag.class.php Wed Jun 28 07:24:41 2006
@@ -32,10 +32,6 @@
 	 *  @access private
 	 *  @param string
 	 */ 
-	//var $_db_user = 'root';
-	//var $_db_pass = '';
-	//var $_db_host = 'jerijohn';
-	//var $_db_name = 'vtigercrm06_03'; 
 	/**#@-*/
 
 	/**
@@ -919,22 +915,20 @@
 		// by $step.
 		$cloud_html = '';
 		$cloud_spans = array();
-		//included to get the site URL
-		include("config.php");
 		if($module =='')
 			$module = 'All';	
 		if($module != 'All')	
 		{	
 			foreach($tag_list[0] as $tag => $qty) {
 				$size = $min_font_size + ($qty - $min_qty) * 3;
-				$cloud_span[] = '<span id="tag_'.$tag_list[1][$tag].'" class="' . $span_class . '" onMouseOver=$("tagspan_'.$tag_list[1][$tag].'").style.display="inline"; onMouseOut=$("tagspan_'.$tag_list[1][$tag].'").style.display="none";><a class="tagit" href="'.$site_URL.'/index.php?module=Home&action=UnifiedSearch&search_module='.$module.'&query_string='. $tag . '" style="font-size: '. $size . $font_units . '">' . htmlspecialchars(stripslashes($tag)) . '</a><span class="'. $span_class .'" id="tagspan_'.$tag_list[1][$tag].'" style="display:none;cursor:pointer;" onClick="DeleteTag('.$tag_list[1][$tag].');"><img src="'.$image_path.'del_tag.gif"></span></span>';
+				$cloud_span[] = '<span id="tag_'.$tag_list[1][$tag].'" class="' . $span_class . '" onMouseOver=$("tagspan_'.$tag_list[1][$tag].'").style.display="inline"; onMouseOut=$("tagspan_'.$tag_list[1][$tag].'").style.display="none";><a class="tagit" href="index.php?module=Home&action=UnifiedSearch&search_module='.$module.'&query_string='. $tag . '" style="font-size: '. $size . $font_units . '">' . htmlspecialchars(stripslashes($tag)) . '</a><span class="'. $span_class .'" id="tagspan_'.$tag_list[1][$tag].'" style="display:none;cursor:pointer;" onClick="DeleteTag('.$tag_list[1][$tag].');"><img src="'.$image_path.'del_tag.gif"></span></span>';
 
 			}
 		}else
 		{
 			foreach($tag_list[0] as $tag => $qty) {
 				$size = $min_font_size + ($qty - $min_qty) * 3;
-				$cloud_span[] = '<span class="' . $span_class . '"><a class="tagit" href="'.$site_URL.'/index.php?module=Home&action=UnifiedSearch&search_module='.$module.'&query_string='. $tag . '" style="font-size: '. $size . $font_units . '">' . htmlspecialchars(stripslashes($tag)) . '</a></span>';
+				$cloud_span[] = '<span class="' . $span_class . '"><a class="tagit" href="index.php?module=Home&action=UnifiedSearch&search_module='.$module.'&query_string='. $tag . '" style="font-size: '. $size . $font_units . '">' . htmlspecialchars(stripslashes($tag)) . '</a></span>';
 
 			}
 




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 09:30:15 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 13:30:15 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7635 -
	/vtigercrm/trunk/modules/Settings/Save.php
Message-ID: <20060628133015.7C99883FAB5@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 28 07:30:11 2006
New Revision: 7635

Log:
changes made to save proxy setting info

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

Modified: vtigercrm/trunk/modules/Settings/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/Save.php (original)
+++ vtigercrm/trunk/modules/Settings/Save.php Wed Jun 28 07:30:11 2006
@@ -12,6 +12,7 @@
 require_once("include/database/PearDatabase.php");
 
 $server=$_REQUEST['server'];
+$port=$_REQUEST['port'];
 $server_username=$_REQUEST['server_username'];
 $server_password=$_REQUEST['server_password'];
 $server_type = $_REQUEST['server_type'];
@@ -28,10 +29,10 @@
 if($id=='')
 {
 	$id = $adb->getUniqueID("systems");
-	$sql="insert into vtiger_systems values(" .$id .",'".$server."','".$server_username."','".$server_password."','".$server_type."','".$smtp_auth."')";
+	$sql="insert into vtiger_systems values(" .$id .",'".$server."','".$port."','".$server_username."','".$server_password."','".$server_type."','".$smtp_auth."')";
 }
 else
-	$sql="update vtiger_systems set server = '".$server."', server_username = '".$server_username."', server_password = '".$server_password."', smtp_auth='".$smtp_auth."', server_type = '".$server_type."' where id = ".$id;
+	$sql="update vtiger_systems set server = '".$server."', server_username = '".$server_username."', server_password = '".$server_password."', smtp_auth='".$smtp_auth."', server_type = '".$server_type."',server_port='".$port."' where id = ".$id;
 
 $adb->query($sql);
 if($server_type == 'backup')
@@ -54,8 +55,22 @@
 		ftp_close($conn_id);
 	}
 }
+
+if($server_type == 'proxy')
+{
+	$action = 'ProxyServerConfig&proxy_server_mode=edit';
+	if (!$sock = fsockopen($server, $port, $errno, $errstr, 30))
+	{
+	       $error_str = $errstr.' : '.$errno ;
+	}else
+	{
+	       $action = 'ProxyServerConfig';
+	        fclose($sock);
+	}
+}
+
 //Added code to send a test mail to the currently logged in user
-if($server_type != 'backup')
+if($server_type != 'backup' && $server_type != 'proxy')
 {
 	require_once("modules/Emails/mail.php");
 	global $current_user;




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 09:42:28 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 13:42:28 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7636 -
	/vtigercrm/trunk/data/CRMEntity.php
Message-ID: <20060628134228.408837E8AD1@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 28 07:42:24 2006
New Revision: 7636

Log:
Problem in displaying graph in dashboard home page fixed

Modified:
    vtigercrm/trunk/data/CRMEntity.php

Modified: vtigercrm/trunk/data/CRMEntity.php
==============================================================================
--- vtigercrm/trunk/data/CRMEntity.php (original)
+++ vtigercrm/trunk/data/CRMEntity.php Wed Jun 28 07:42:24 2006
@@ -1512,42 +1512,8 @@
 	 */
 	function get_full_list($order_by = "", $where = "") {
 		$this->log->debug("get_full_list:  order_by = '$order_by' and where = '$where'");
-		$query = "SELECT * FROM $this->table_name ";
-		
-		if($where != "")
-			$query .= "where ($where) AND deleted=0";
-		else
-			$query .= "where deleted=0";
-
-		if(!empty($order_by))
-			$query .= " ORDER BY $order_by";
-
-		$result =& $this->db->query($query, false);
-
-		if($this->db->getRowCount($result) > 0){
-		
-			// We have some data.
-			while ($row = $this->db->fetchByAssoc($result)) {
-				foreach($this->list_fields as $field)
-				{
-					if (isset($row[$field])) {
-						$this->$field = $row[$field];
-						
-						$this->log->debug("process_full_list: $this->object_name({$row['id']}): ".$field." = ".$this->$field);
-					}
-					else {
- 	                                                $this->$field = '';   
-					}
-				}
-
-
-				$list[] = clone($this);         //added clone tosupport PHP5
-			}
-		}
-
-		if (isset($list)) return $list;
-		else return null;
-
+		$query = $this->create_list_query($order_by, $where);
+		return $this->process_full_list_query($query);
 	}
 
 }




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 10:26:09 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 14:26:09 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7637 -
	/vtigercrm/trunk/modules/Reports/Save.php
Message-ID: <20060628142609.70B3559021C@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 28 08:25:55 2006
New Revision: 7637

Log:
Added vtiger_ in getUniqueID function parameter

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

Modified: vtigercrm/trunk/modules/Reports/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Reports/Save.php (original)
+++ vtigercrm/trunk/modules/Reports/Save.php Wed Jun 28 08:25:55 2006
@@ -89,7 +89,7 @@
 //<<<<<<<advancedfilter>>>>>>>>
 if($reportid == "")
 {
-	$genQueryId = $adb->getUniqueID("selectquery");
+	$genQueryId = $adb->getUniqueID("vtiger_selectquery");
 	if($genQueryId != "")
 	{
 		$iquerysql = "insert into vtiger_selectquery (QUERYID,STARTINDEX,NUMOFOBJECTS) values (".$genQueryId.",0,0)";




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 10:27:37 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 14:27:37 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7638 -
	/vtigercrm/trunk/modules/Rss/Rss.php
Message-ID: <20060628142737.01EA8771F73@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 28 08:27:25 2006
New Revision: 7638

Log:
Added vtiger_ in getUniqueID function parameter

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

Modified: vtigercrm/trunk/modules/Rss/Rss.php
==============================================================================
--- vtigercrm/trunk/modules/Rss/Rss.php (original)
+++ vtigercrm/trunk/modules/Rss/Rss.php Wed Jun 28 08:27:25 2006
@@ -106,7 +106,7 @@
 			{
 				$rsstitle = $url;
 			}
-			$genRssId = $adb->getUniqueID("rss");
+			$genRssId = $adb->getUniqueID("vtiger_rss");
 			$sSQL = "insert into vtiger_rss (RSSID,RSSURL,RSSTITLE,RSSTYPE,STARRED) values (".$genRssId.",'".addslashes($url);
 			$sSQL .= "','".addslashes($rsstitle)."',0,".$makestarred.")";
 			$result = $adb->query($sSQL);




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 10:35:51 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 14:35:51 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7639 -
 /vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php
Message-ID: <20060628143551.3AE2883FD57@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 28 08:35:37 2006
New Revision: 7639

Log:
Added vtiger_ in getUniqueID function parameter

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

Modified: vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php (original)
+++ vtigercrm/trunk/modules/Settings/AddCustomFieldToDB.php Wed Jun 28 08:35:37 2006
@@ -63,7 +63,7 @@
 {
 	if($_REQUEST['fieldid'] == '')
 	{
-		$max_fieldid = $adb->getUniqueID("field");
+		$max_fieldid = $adb->getUniqueID("vtiger_field");
 		$columnName = 'cf_'.$max_fieldid;
 	}
 	else
@@ -234,13 +234,13 @@
 	//retreiving the sequence
 	if($_REQUEST['fieldid'] == '')
 	{
-		$custfld_fieldid=$adb->getUniqueID("field");
+		$custfld_fieldid=$adb->getUniqueID("vtiger_field");
 	}
 	else
 	{
 		$custfld_fieldid= $_REQUEST['fieldid'];
 	}
-	$custfld_sequece=$adb->getUniqueId("customfield_sequence");
+	$custfld_sequece=$adb->getUniqueId("vtiger_customfield_sequence");
     	
 	$blockid ='';
         //get the blockid for this custom block
@@ -296,7 +296,7 @@
 			for($i = 0; $i < $count; $i++)
 			{
 				$pickArray[$i] = trim($pickArray[$i]);
-				$id = $adb->getUniqueID($columnName);
+				$id = $adb->getUniqueID('vtiger_'.$columnName);
 				if($pickArray[$i] != '')
 				{
 					$query = "insert into vtiger_".$columnName." values(".$id.",'".$pickArray[$i]."',".$i.",1)";




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 10:41:01 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 14:41:01 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7640 -
	/vtigercrm/trunk/modules/Settings/Save.php
Message-ID: <20060628144101.C204E83FD58@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 28 08:40:48 2006
New Revision: 7640

Log:
Added vtiger_ in getUniqueID function parameter

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

Modified: vtigercrm/trunk/modules/Settings/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/Save.php (original)
+++ vtigercrm/trunk/modules/Settings/Save.php Wed Jun 28 08:40:48 2006
@@ -28,7 +28,7 @@
 
 if($id=='')
 {
-	$id = $adb->getUniqueID("systems");
+	$id = $adb->getUniqueID("vtiger_systems");
 	$sql="insert into vtiger_systems values(" .$id .",'".$server."','".$port."','".$server_username."','".$server_password."','".$server_type."','".$smtp_auth."')";
 }
 else




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 10:41:56 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 14:41:56 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7641 -
 /vtigercrm/trunk/modules/Settings/SaveCurrencyInfo.php
Message-ID: <20060628144156.1219983FD5D@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 28 08:41:43 2006
New Revision: 7641

Log:
Added vtiger_ in getUniqueID function parameter

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

Modified: vtigercrm/trunk/modules/Settings/SaveCurrencyInfo.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/SaveCurrencyInfo.php (original)
+++ vtigercrm/trunk/modules/Settings/SaveCurrencyInfo.php Wed Jun 28 08:41:43 2006
@@ -24,7 +24,7 @@
 }
 else
 {
-        $sql = "insert into vtiger_currency_info values(".$db->getUniqueID("currency_info").",'".$currency_name."','".$currency_code."','".$currency_symbol."','".$conversion_rate."','".$currency_status."','0')";
+        $sql = "insert into vtiger_currency_info values(".$db->getUniqueID("vtiger_currency_info").",'".$currency_name."','".$currency_code."','".$currency_symbol."','".$conversion_rate."','".$currency_status."','0')";
 }
 $adb->query($sql);
 $loc = "Location: index.php?module=Settings&action=CurrencyListView&parenttab=".$_REQUEST['parenttab'];




From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 28 10:42:28 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 28 Jun 2006 14:42:28 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231394=3A?=
 =?utf-8?q?_quote_is_not_getting_saved_when_we_create_SO_from_Quotes?=
Message-ID: <076.2e16a7e666b39de47b21f8d6af637752@vtiger.fosslabs.com>

#1394: quote is not getting saved when we create SO from Quotes
-----------------------+----------------------------------------------------
 Reporter:  mickie     |       Owner:  mickie
     Type:  defect     |      Status:  new   
 Priority:  major      |   Milestone:        
Component:  vtigercrm  |     Version:  5.0.0 
 Keywords:             |  
-----------------------+----------------------------------------------------
 From Quotes we can create SO where as the quote details are populated. but
 when we save the SO, SO is saved without the relationship with quote.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1394>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 10:43:31 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 14:43:31 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7642 -
 /vtigercrm/trunk/modules/Settings/SaveMailAccount.php
Message-ID: <20060628144331.EE6FB83FD58@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 28 08:43:19 2006
New Revision: 7642

Log:
Added vtiger_ in getUniqueID function parameter

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

Modified: vtigercrm/trunk/modules/Settings/SaveMailAccount.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/SaveMailAccount.php (original)
+++ vtigercrm/trunk/modules/Settings/SaveMailAccount.php Wed Jun 28 08:43:19 2006
@@ -37,7 +37,7 @@
 }
 else
 {
-	$account_id = $adb->getUniqueID("mail_accounts");
+	$account_id = $adb->getUniqueID("vtiger_mail_accounts");
 	$sql="insert into vtiger_mail_accounts values(" .$account_id .",'".$current_user->id."','".$displayname."','".$email."','".$account_name."','".$mailprotocol."','".$server_username."','".$server_password."','".$mail_servername."','".$box_refresh."','".$mails_per_page."', '".$ssltype."', '".$sslmeth."', '".$_REQUEST["int_mailer"]."','1','0')";
 }
 




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 11:21:12 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 15:21:12 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7643 - in
 /vtigercrm/trunk/modules/Dashboard: Entity_charts.php display_charts.php
Message-ID: <20060628152112.5F3B87E8AD1@vtiger.fosslabs.com>

Author: saraj
Date: Wed Jun 28 09:21:07 2006
New Revision: 7643

Log:
Security check intensified for dashboards

Modified:
    vtigercrm/trunk/modules/Dashboard/Entity_charts.php
    vtigercrm/trunk/modules/Dashboard/display_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 Wed Jun 28 09:21:07 2006
@@ -383,14 +383,14 @@
 
 function get_graph_by_type($graph_by,$graph_title,$module,$where,$query)
 {
-	global $user_id,$date_start,$end_date,$type;
+	global $user_id,$date_start,$end_date,$type,$mod_strings;
 
 	//Giving the Cached image name
 	$cache_file_name=abs(crc32($user_id))."_".$type."_".crc32($date_start.$end_date).".png";
 	$html_imagename=$graph_by; //Html image name for the graph
 
 	$graph_details=module_Chart($user_id,$date_start,$end_date,$query,$graph_by,$graph_title,$where,$module,$type);
-
+	
 	if($graph_details!=0)
 	{
 		$name_val=$graph_details[0];
@@ -414,7 +414,7 @@
 	}
 	else
 	{
-		
+                 echo $mod_strings['LBL_NO_PERMISSION_FIELD'];
 	}
 	
 }

Modified: vtigercrm/trunk/modules/Dashboard/display_charts.php
==============================================================================
--- vtigercrm/trunk/modules/Dashboard/display_charts.php (original)
+++ vtigercrm/trunk/modules/Dashboard/display_charts.php Wed Jun 28 09:21:07 2006
@@ -15,6 +15,7 @@
 	
 global $tmp_dir;
 global $mod_strings,$app_strings;
+global $current_user;
 
 $period=($_REQUEST['period'])?$_REQUEST['period']:"tmon"; // Period >> lmon- Last Month, tmon- This Month, lweek-LastWeek, tweek-ThisWeek; lday- Last Day 
 $type=($_REQUEST['type'])?$_REQUEST['type']:"leadsource";
@@ -72,6 +73,25 @@
 //Query for tickets by contact
 $tickets_by_contact="select vtiger_troubletickets.*, vtiger_contactdetails.* from vtiger_troubletickets inner join vtiger_contactdetails on vtiger_contactdetails.contactid=vtiger_troubletickets.parent_id";
 
+
+/**This function generates the security parameters for a given module based on the assigned profile 
+*Param $module - module name
+*Returns an string value
+*/
+
+function dashboard_check($module)
+{
+	global $current_user;
+	$sec_parameter = '';
+	$tab_id = getTabid($module);
+	require('user_privileges/user_privileges_'.$current_user->id.'.php');
+	require('user_privileges/sharing_privileges_'.$current_user->id.'.php');
+	if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[$tab_id] == 3)
+	{
+		$sec_parameter=getListViewSecurityParameter($module);
+	}
+	return $sec_parameter;
+}
 /**  This function returns  the values for the graph, for any type of graph needed	 
         * Portions created by vtiger are Copyright (C) vtiger.
         * All Rights Reserved.
@@ -221,7 +241,7 @@
                     	$graph_title= $mod_strings['leadsource'];
                     	$module="Leads";
                     	$where="";
-                    	$query=$leads_query;                   
+                    	$query=$leads_query." ".dashboard_check($module);                   
                     	echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
                     
                     }
@@ -232,7 +252,7 @@
                     	$graph_title= $mod_strings['leadstatus'];
                     	$module="Leads";
                     	$where="";
-                    	$query=$leads_query;
+                    	$query=$leads_query." ".dashboard_check($module);
                     	echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
                     }
                     //Charts for Lead Industry
@@ -242,7 +262,7 @@
                             $graph_title=$mod_strings['leadindustry'];
                             $module="Leads";
                             $where="";
-                            $query=$leads_query;
+                            $query=$leads_query." ".dashboard_check($module);
                             echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
                     }
                     //Sales by Lead Source
@@ -252,7 +272,7 @@
                             $graph_title=$mod_strings['salesbyleadsource'];
                             $module="Potentials";
                             $where=" and vtiger_potential.sales_stage like '%Closed Won%' ";
-                            $query=$potential_query;
+                            $query=$potential_query." ".dashboard_check($module);
                             echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
                     }
                     //Sales by Account
@@ -262,7 +282,7 @@
                          $graph_title=$mod_strings['salesbyaccount'];
                          $module="Potentials";
                          $where=" and vtiger_potential.sales_stage like '%Closed Won%' ";
-                         $query=$potential_query;
+                         $query=$potential_query." ".dashboard_check($module);
                          echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
                     }
 		    //Sales by User
@@ -272,7 +292,7 @@
 			$graph_title=$mod_strings['salesbyuser'];
 			$module="Potentials";
 			$where=" and (vtiger_crmentity.smownerid != NULL || vtiger_crmentity.smownerid != ' ')";
-			$query=$potential_query;
+			$query=$potential_query." ".dashboard_check($module);
 			echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
 		    }
 		    //Sales by team
@@ -282,7 +302,7 @@
 			$graph_title=$mod_strings['salesbyteam'];
 			$module="Potentials";
 			$where=" and (vtiger_potentialgrouprelation.groupname != NULL || vtiger_potentialgrouprelation.groupname != '')";
-			$query=$potential_query;
+			$query=$potential_query." ".dashboard_check($module);
 			echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
 		    }
                     //Charts for Account by Industry
@@ -292,7 +312,7 @@
                             $graph_title=$mod_strings['accountindustry'];
                             $module="Accounts";
                             $where="";
-                            $query=$account_query;
+                            $query=$account_query." ".dashboard_check($module);
                             echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
                     }
                     //Charts for Products by Category
@@ -302,7 +322,7 @@
                             $graph_title=$mod_strings['productcategory'];
                             $module="Products";
                             $where="";
-                            $query=$products_query;
+                            $query=$products_query." ".dashboard_check($module);
                             echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
                     }
 		    //Charts for Products by Quantity in stock
@@ -312,7 +332,7 @@
 			    $graph_title=$mod_strings['productbyqtyinstock'];
 			    $module="Products";
 			    $where="";
-			    $query=$products_query;
+			    $query=$products_query." ".dashboard_check($module);
 			    echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
 		    }
 		    //Charts for Products by PO
@@ -322,7 +342,7 @@
 			    $graph_title=$mod_strings['productbypo'];
 			    $module="Products";
 			    $where="";
-			    $query=$products_query;
+			    $query=$products_query." ".dashboard_check($module);
 			    echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
 		    }
 		    //Charts for Products by Quotes
@@ -332,7 +352,7 @@
    			    $graph_title=$mod_strings['productbyquotes'];
 			    $module="Products";
 			    $where=""; 
-			    $query=$products_query;
+			    $query=$products_query." ".dashboard_check($module);
 			    echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
 		    }
 		    //Charts for Products by Invoice
@@ -342,7 +362,7 @@
 			    $graph_title=$mod_strings['productbyinvoice'];
 			    $module="Products";
 			    $where="";
-			    $query=$products_query;
+			    $query=$products_query." ".dashboard_check($module);
 			    echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
 		    }
 
@@ -353,7 +373,7 @@
                             $graph_title=$mod_strings['sobyaccounts'];
                             $module="SalesOrder";
                             $where="";
-                            $query=$so_query;
+                            $query=$so_query." ".dashboard_check($module);
                             echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
                     }
                     //Sales Order by Status
@@ -363,7 +383,7 @@
                             $graph_title=$mod_strings['sobystatus'];
                             $module="SalesOrder";
                             $where="";
-                            $query=$so_query;
+                            $query=$so_query." ".dashboard_check($module);
                             echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
                     }
                     //Purchase Order by Status
@@ -373,7 +393,7 @@
                             $graph_title=$mod_strings['pobystatus'];
                             $module="PurchaseOrder";
                             $where="";
-                            $query=$po_query;
+                            $query=$po_query." ".dashboard_check($module);
                             echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
                     }
                     //Quotes by Accounts
@@ -383,7 +403,7 @@
                             $graph_title= $mod_strings['quotesbyaccounts'];
                             $module="Quotes";
                             $where="";
-                            $query=$quotes_query;
+                            $query=$quotes_query." ".dashboard_check($module);
                             echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
                     }
                     //Quotes by Stage
@@ -393,7 +413,7 @@
                             $graph_title=$mod_strings['quotesbystage'];
                             $module="Quotes";
                             $where="";
-                            $query=$quotes_query;
+                            $query=$quotes_query." ".dashboard_check($module);
                             echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
                     }
                     //Invoice by Accounts
@@ -403,7 +423,7 @@
                             $graph_title=$mod_strings['invoicebyacnts'];
                             $module="Invoice";
                             $where="";
-                            $query=$invoice_query;
+                            $query=$invoice_query." ".dashboard_check($module);
                             echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
                     }
                     //Invoices by status
@@ -413,7 +433,7 @@
                             $graph_title=$mod_strings['invoicebystatus'];
                             $module="Invoice";
                             $where="";
-                            $query=$invoice_query;
+                            $query=$invoice_query." ".dashboard_check($module);
                             echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
                     }
                     //Tickets by Status
@@ -423,7 +443,7 @@
                             $graph_title=$mod_strings['ticketsbystatus'];
                             $module="HelpDesk";
                             $where="";
-                            $query=$helpdesk_query;
+                            $query=$helpdesk_query." ".dashboard_check($module);
                             echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
                     }
                     //Tickets by Priority
@@ -433,7 +453,7 @@
                             $graph_title=$mod_strings['ticketsbypriority'];
                             $module="HelpDesk";
                             $where="";
-                            $query=$helpdesk_query;
+                            $query=$helpdesk_query." ".dashboard_check($module);
                             echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
                     }
 		    //Tickets by Category
@@ -443,7 +463,7 @@
 			    $graph_title=$mod_strings['ticketsbycategory'];
 			    $module="HelpDesk";
 			    $where="";
-			    $query=$helpdesk_query;
+			    $query=$helpdesk_query." ".dashboard_check($module);
 			    echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
 		    }
 		    //Tickets by User   
@@ -453,7 +473,7 @@
 			    $graph_title=$mod_strings['ticketsbyuser'];
 			    $module="HelpDesk";
 			    $where=" and (vtiger_crmentity.smownerid != NULL || vtiger_crmentity.smownerid != ' ')";
-			    $query=$helpdesk_query;
+			    $query=$helpdesk_query." ".dashboard_check($module);
 			    echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
 		    }
 		    //Tickets by Team
@@ -463,7 +483,7 @@
 			    $graph_title=$mod_strings['ticketsbyteam'];
 			    $module="HelpDesk";
 			    $where=" and (vtiger_ticketgrouprelation.groupname != NULL || vtiger_ticketgrouprelation.groupname != ' ')";
-			    $query=$helpdesk_query;
+			    $query=$helpdesk_query." ".dashboard_check($module);
 			    echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
 		    }    
 		    //Tickets by Product
@@ -473,7 +493,7 @@
 			    $graph_title=$mod_strings['ticketsbyproduct'];
 			    $module="HelpDesk";
 			    $where="";
-			    $query=$helpdesk_query;
+			    $query=$helpdesk_query." ".dashboard_check($module);
 			    echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
 		    }
 		    //Campaigns by Contact
@@ -483,7 +503,7 @@
 			    $graph_title=$mod_strings['ticketsbycampaign'];
 			    $module="Campaigns";
 			    $where="";
-			    $query=$campaign_query;
+			    $query=$campaign_query." ".dashboard_check($module);
 			    echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
 		    }
 		    //Tickets by Account
@@ -493,7 +513,7 @@
 			    $graph_title=$mod_strings['ticketsbyaccount'];
 			    $module="HelpDesk";
 			    $where="";
-			    $query=$tickets_by_account;
+			    $query=$tickets_by_account." ".dashboard_check($module);
 			    echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
 		    }
 			    //Tickets by Contact
@@ -503,7 +523,7 @@
 				    $graph_title=$mod_strings['ticketsbycontact'];
 				    $module="HelpDesk";
 				    $where="";
-				    $query=$tickets_by_contact;
+				    $query=$tickets_by_contact." ".dashboard_check($module);
 				    echo get_graph_by_type($graph_by,$graph_title,$module,$where,$query);
 				    }
 		    else




From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 28 11:23:14 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 28 Jun 2006 15:23:14 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231088=3A?=
 =?utf-8?q?_Issue_in_Custom_view=2C_Reports=2C_Dashboard_Security_Implemen?=
 =?utf-8?q?tation?=
In-Reply-To: <076.80fe4e3b3d04da48f15c540f9a0bd179@vtiger.fosslabs.com>
References: <076.80fe4e3b3d04da48f15c540f9a0bd179@vtiger.fosslabs.com>
Message-ID: <085.bbfb55c95d9dc8dcd258c2daf9203ad6@vtiger.fosslabs.com>

#1088: Issue in Custom view, Reports, Dashboard Security Implementation
------------------------+---------------------------------------------------
  Reporter:  don        |       Owner:  philip
      Type:  defect     |      Status:  closed
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by saraj):

  * resolution:  => fixed
  * status:  reopened => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1088>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 12:12:17 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 16:12:17 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7644 -
	/vtigercrm/trunk/include/language/en_us.lang.php
Message-ID: <20060628161218.3F5B083FD24@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 28 10:12:09 2006
New Revision: 7644

Log:
New UI for Users has been integrated

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

Modified: vtigercrm/trunk/include/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/include/language/en_us.lang.php (original)
+++ vtigercrm/trunk/include/language/en_us.lang.php Wed Jun 28 10:12:09 2006
@@ -940,6 +940,8 @@
 'LBL_TO_CONFIGURE'=>'to Configure',
 'LBL_HERE'=>'here',
 'LBL_RECORDS'=>'Records',
+'LBL_SCROLL'=>'[Scroll to Top]',
+'LBL_EXPAND_COLLAPSE'=>'Expand/Collapse',
 );
 
 




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 12:12:45 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 16:12:45 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7645 -
 /vtigercrm/trunk/modules/Users/language/en_us.lang.php
Message-ID: <20060628161246.3E28883FD57@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 28 10:12:38 2006
New Revision: 7645

Log:
New UI for Users has been integrated

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

Modified: vtigercrm/trunk/modules/Users/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Users/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Users/language/en_us.lang.php Wed Jun 28 10:12:38 2006
@@ -566,7 +566,12 @@
 'Country'=>'Country',
 'Password'=>'Password',
 'Confirm Password'=>'Confirm Password',
-
+'LBL_SHOWN'=>'Shown',
+'LBL_HIDDEN'=>'Hidden',
+'LBL_SHOW'=>'Show',
+'LBL_HIDE'=>'Hide',
+'LBL_HOME_PAGE_COMP'=>'Home Page Components',
+'LBL_LOGIN_HISTORY'=>'Login History',
 );
 
 ?>




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 12:15:09 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 16:15:09 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7646 - in
 /vtigercrm/trunk/modules/Users: DetailView.php EditView.php Save.php
Message-ID: <20060628161509.8466283FD57@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 28 10:14:57 2006
New Revision: 7646

Log:
New UI for Users has been integrated

Modified:
    vtigercrm/trunk/modules/Users/DetailView.php
    vtigercrm/trunk/modules/Users/EditView.php
    vtigercrm/trunk/modules/Users/Save.php

Modified: vtigercrm/trunk/modules/Users/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DetailView.php (original)
+++ vtigercrm/trunk/modules/Users/DetailView.php Wed Jun 28 10:14:57 2006
@@ -132,11 +132,11 @@
 		&& $default_user_name == $focus->user_name
 		&& isset($lock_default_user_name)
 		&& $lock_default_user_name == true	) {
-	$buttons = "<input title='".$app_strings['LBL_EDIT_BUTTON_TITLE']."' accessKey='".$app_strings['LBL_EDIT_BUTTON_KEY']."' class='classBtn' onclick=\"this.form.return_module.value='Users'; this.form.return_action.value='DetailView'; this.form.return_id.value='$focus->id'; this.form.action.value='EditView'; this.form.parenttab.value='$parenttab'\" type='submit' name='Edit' value='  ".$app_strings['LBL_EDIT_BUTTON_LABEL']."  '>";
+	$buttons = "<input title='".$app_strings['LBL_EDIT_BUTTON_TITLE']."' accessKey='".$app_strings['LBL_EDIT_BUTTON_KEY']."' class='crmButton small edit' onclick=\"this.form.return_module.value='Users'; this.form.return_action.value='DetailView'; this.form.return_id.value='$focus->id'; this.form.action.value='EditView'; this.form.parenttab.value='$parenttab'\" type='submit' name='Edit' value='  ".$app_strings['LBL_EDIT_BUTTON_LABEL']."  '>";
 	$smarty->assign('EDIT_BUTTON',$buttons);
 }
 elseif (is_admin($current_user) || $_REQUEST['record'] == $current_user->id) {
-	$buttons = "<input title='".$app_strings['LBL_EDIT_BUTTON_TITLE']."' accessKey='".$app_strings['LBL_EDIT_BUTTON_KEY']."' class='classBtn' onclick=\"this.form.return_module.value='Users'; this.form.return_action.value='DetailView'; this.form.return_id.value='$focus->id'; this.form.action.value='EditView'; this.form.parenttab.value='$parenttab'\" type='submit' name='Edit' value='  ".$app_strings['LBL_EDIT_BUTTON_LABEL']."  '>";
+	$buttons = "<input title='".$app_strings['LBL_EDIT_BUTTON_TITLE']."' accessKey='".$app_strings['LBL_EDIT_BUTTON_KEY']."' class='crmButton small edit' onclick=\"this.form.return_module.value='Users'; this.form.return_action.value='DetailView'; this.form.return_id.value='$focus->id'; this.form.action.value='EditView'; this.form.parenttab.value='$parenttab'\" type='submit' name='Edit' value='  ".$app_strings['LBL_EDIT_BUTTON_LABEL']."  '>";
 	$smarty->assign('EDIT_BUTTON',$buttons);
 	
 		$buttons = "<input title='".$mod_strings['LBL_CHANGE_PASSWORD_BUTTON_TITLE']."' accessKey='".$mod_strings['LBL_CHANGE_PASSWORD_BUTTON_KEY']."' class='classBtn' LANGUAGE=javascript onclick='return window.open(\"index.php?module=Users&action=ChangePassword&form=DetailView\",\"test\",\"width=320,height=165,resizable=no,scrollbars=0, toolbar=no, titlebar=no, left=100, top=126, screenX=100, screenY=126\");' type='button' name='password' value='".$mod_strings['LBL_CHANGE_PASSWORD_BUTTON_LABEL']."'>";
@@ -153,7 +153,7 @@
 }
 if (is_admin($current_user)) 
 {
-	$buttons = "<input title='".$app_strings['LBL_DUPLICATE_BUTTON_TITLE']."' accessKey='".$app_strings['LBL_DUPLICATE_BUTTON_KEY']."' class='classBtn' onclick=\"this.form.return_module.value='Users'; this.form.return_action.value='DetailView'; this.form.isDuplicate.value=true; this.form.return_id.value='".$_REQUEST['record']."';this.form.action.value='EditView'\" type='submit' name='Duplicate' value=' ".$app_strings['LBL_DUPLICATE_BUTTON_LABEL']."'   >";
+	$buttons = "<input title='".$app_strings['LBL_DUPLICATE_BUTTON_TITLE']."' accessKey='".$app_strings['LBL_DUPLICATE_BUTTON_KEY']."' class='crmButton small cancel' onclick=\"this.form.return_module.value='Users'; this.form.return_action.value='DetailView'; this.form.isDuplicate.value=true; this.form.return_id.value='".$_REQUEST['record']."';this.form.action.value='EditView'\" type='submit' name='Duplicate' value=' ".$app_strings['LBL_DUPLICATE_BUTTON_LABEL']."'   >";
 	$smarty->assign('DUPLICATE_BUTTON',$buttons);
 	
 	//done so that only the admin user can see the customize tab button
@@ -182,10 +182,11 @@
 $smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']);
 $smarty->assign("MODULE", 'Users');
 $smarty->assign("CURRENT_USERID", $current_user->id);
+$smarty->assign("HOMEORDER",$focus->getHomeOrder($focus->id));
 $smarty->assign("BLOCKS", getBlocks($currentModule,"detail_view",'',$focus->column_fields));
 
 
-        $smarty->display("UserDetailView.tpl");
+$smarty->display("UserDetailView.tpl");
 
 
 ?>

Modified: vtigercrm/trunk/modules/Users/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/Users/EditView.php (original)
+++ vtigercrm/trunk/modules/Users/EditView.php Wed Jun 28 10:14:57 2006
@@ -104,6 +104,7 @@
 	$smarty->assign("USERNAME_READONLY", "readonly");
 }
 
+$smarty->assign("HOMEORDER",$focus->getHomeOrder($focus->id));
 
 
 

Modified: vtigercrm/trunk/modules/Users/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Users/Save.php (original)
+++ vtigercrm/trunk/modules/Users/Save.php Wed Jun 28 10:14:57 2006
@@ -80,6 +80,7 @@
 	
 	setObjectValuesFromRequest(&$focus);
 	$focus->saveentity("Users");
+	$focus->saveHomeOrder($focus->id);
 	$return_id = $focus->id;
 
 if (isset($_POST['user_name']) && isset($_POST['new_password'])) {




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 12:17:54 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 16:17:54 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7647 -
	/vtigercrm/trunk/modules/Users/User.php
Message-ID: <20060628161754.B46DF83FD57@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 28 10:17:46 2006
New Revision: 7647

Log:
New UI for Users has been integrated

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

Modified: vtigercrm/trunk/modules/Users/User.php
==============================================================================
--- vtigercrm/trunk/modules/Users/User.php (original)
+++ vtigercrm/trunk/modules/Users/User.php Wed Jun 28 10:17:46 2006
@@ -115,6 +115,7 @@
 	var $tagcloud;
 	var $imagename;
 	var $defhomeview;
+	var $homeorder_array = array('ALVT','PLVT','QLTQ','CVLVT','HLT','OLV','GRT','OLTSO','ILTI','MNL','HDB');
 
 	var $encodeFields = Array("first_name", "last_name", "description");
 
@@ -868,7 +869,6 @@
 			$button = '';
 			$query = 'select vtiger_users.*,vtiger_groups.* from vtiger_users inner join vtiger_users2group on vtiger_users.id=vtiger_users2group.userid left join vtiger_groups on vtiger_groups.groupid=vtiger_users2group.groupid where vtiger_users.id='.$id;
 			$log->debug("Exiting get_contacts method ...");
-			echo '<pre>';print_r(getAllGroupInfo($query));echo '</pre>';
 			return getAllGroupInfo($query);
 			}
 
@@ -881,6 +881,54 @@
 		//GS Save entity being called with the modulename as parameter
 		$this->saveentity($module_name);
 	}
+	function getHomeOrder($id="")	
+	{
+		global $log;
+		global $adb;
+		$log->debug("Entering in function getHomeOrder($id)");
+		if($id == '')
+		{
+			for($i = 0;$i < count($this->homeorder_array);$i++)
+                        {
+				$return_array[$this->homeorder_array[$i]] = $this->homeorder_array[$i];
+			}
+		}else
+		{
+			$query = "select homeorder from vtiger_users where id=$id";
+			$homeorder = $adb->query_result($adb->query($query),0,'homeorder');
+			for($i = 0;$i < count($this->homeorder_array);$i++)
+			{
+				if(!stristr($homeorder,$this->homeorder_array[$i]))
+				{
+					$return_array[$this->homeorder_array[$i]] = '';
+				}else
+				{
+					$return_array[$this->homeorder_array[$i]] = $this->homeorder_array[$i];
+				}
+					
+			}
+
+		}
+
+		$log->debug("Exiting from function getHomeOrder($id)");
+		return $return_array;
+	}
+	function saveHomeOrder($id)
+	{
+		if($id == '')
+			return null;
+		global $log,$adb;
+                $log->debug("Entering in function saveHomeOrder($id)");
+		for($i = 0;$i < count($this->homeorder_array);$i++)
+                {
+			if($_REQUEST[$this->homeorder_array[$i]] != '')
+				$save_array[] = $this->homeorder_array[$i];
+		}
+		$homeorder = implode(',',$save_array);	
+		$query = "update vtiger_users set homeorder ='$homeorder' where id=$id";
+		$adb->query($query);
+                $log->debug("Exiting from function saveHomeOrder($id)");
+	}
 
 }
 ?>




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 12:19:04 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 16:19:04 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7648 - in
 /vtigercrm/trunk/Smarty/templates: UserDetailView.tpl UserEditView.tpl
Message-ID: <20060628161905.1E3D383FD24@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 28 10:18:54 2006
New Revision: 7648

Log:
New UI for Users has been integrated

Modified:
    vtigercrm/trunk/Smarty/templates/UserDetailView.tpl
    vtigercrm/trunk/Smarty/templates/UserEditView.tpl

Modified: vtigercrm/trunk/Smarty/templates/UserDetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/UserDetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/UserDetailView.tpl Wed Jun 28 10:18:54 2006
@@ -13,154 +13,174 @@
 <script language="JavaScript" type="text/javascript" src="include/js/ColorPicker2.js"></script>
 <script language="javascript" type="text/javascript" src="include/js/general.js"></script>
 <script language="JavaScript" type="text/javascript" src="include/js/dtlviewajax.js"></script>
+<script src="include/scriptaculous/scriptaculous.js" type="text/javascript"></script>
 <span id="crmspanid" style="display:none;position:absolute;"  onmouseover="show('crmspanid');">
    <a class="link"  align="right" href="javascript:;">{$APP.LBL_EDIT_BUTTON}</a>
 </span>
 
-<style type="text/css">@import url(themes/blue/style.css);</style>
-
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
+<br>
+<table align="center" border="0" cellpadding="0" cellspacing="0" width="98%">
 <tr>
-{if $CATEGORY eq 'Settings'}
-	{include file='SettingsMenu.tpl'}
-{/if}
-<td width="75%" valign="top">
-
-<table width="100%"  border="0" cellspacing="0" cellpadding="0">
-	<tr><td class="padTab" align="left">
-		<table width="100%" border="0" cellpadding="0" cellspacing="0">
+    <td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
+    <td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
+    <br>
+
+    <div align=center>
+    {if $CATEGORY eq 'Settings'}
+        {include file='SetMenu.tpl'}
+    {/if}
+	<table width="100%"  border="0" cellspacing="0" cellpadding="0">
+	<tr>
+	    <td class="padTab" align="left">
 		<form name="DetailView" method="POST" action="index.php" ENCTYPE="multipart/form-data" id="form">
-			<input type="hidden" name="module" value="Users">
-			<input type="hidden" name="record" value="{$ID}">
-			<input type="hidden" name="isDuplicate" value=false>
-			<input type="hidden" name="action">
-
-{if $CATEGORY eq 'Settings'}
+		<input type="hidden" name="module" value="Users">
+		<input type="hidden" name="record" value="{$ID}">
+		<input type="hidden" name="isDuplicate" value=false>
+		<input type="hidden" name="action">
+		{if $CATEGORY eq 'Settings'}
 			<input type="hidden" name="modechk" value="prefview">
-{/if}
-			<input type="hidden" name="old_password">
-			<input type="hidden" name="new_password">
-			<input type="hidden" name="return_module">
-			<input type="hidden" name="return_action">
-			<input type="hidden" name="return_id">
-			<input type="hidden" name="forumDisplay">
-{if $CATEGORY eq 'Settings'}
+		{/if}
+		<input type="hidden" name="old_password">
+		<input type="hidden" name="new_password">
+		<input type="hidden" name="return_module">
+		<input type="hidden" name="return_action">
+		<input type="hidden" name="return_id">
+		<input type="hidden" name="forumDisplay">
+		{if $CATEGORY eq 'Settings'}
 			<input type="hidden" name="parenttab" value="{$PARENTTAB}">
-{/if}	
-
+		{/if}	
+	        <table width="100%" border="0" cellpadding="0" cellspacing="0">
+		<tr>
+		    <td style="border-bottom:1px dashed #CCCCCC;">
+			<table width="100%" cellpadding="5" cellspacing="0" border="0">
 			<tr>
-				<td style="border-bottom:1px dashed #CCCCCC;">
-					<table width="100%" cellpadding="5" cellspacing="0" border="0">
-					<tr>
-						<td colspan=2 style="padding:5px;">
-						{if $CATEGORY eq 'Settings'}
-							<span class="lvtHeaderText">
-							<b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS} </a> > {$MOD.LBL_USER_MANAGEMENT} > {$MOD.LBL_USERS}</b></span>
-						{else}
-							<span class="lvtHeaderText">	
-							<b>{$APP.LBL_MY_PREFERENCES}</b>
-							</span>
-						{/if}
-						<span id="vtbusy_info" style="display:none;" valign="bottom"><img src="{$IMAGE_PATH}vtbusy.gif" border="0"></span>					
-				<hr noshade="noshade" size="1" />
-						</td>
-						<td align="right"><hr noshade="noshade" size="1" /></td>
-									  </tr>
-									<tr>
-											<td width="5%"><img src="{$IMAGE_PATH}user.gif" align="absmiddle"></td>
-											<td width="95%"><span class="genHeaderGrayBig">{$USER_NAME}</span><br>
-												<b class="small">{$UMOD.LBL_DETAIL_VIEW} {$FIRST_NAME} {$LAST_NAME}</b>
-											</td>
-									</tr>
-							</table>
-					</td>
+			    <td rowspan="2"><img src="{$IMAGE_PATH}user.gif" align="absmiddle"></td>	
+			    <td>
+			    {if $CATEGORY eq 'Settings'}
+				<span class="lvtHeaderText">
+				<b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS} </a> > {$MOD.LBL_USER_MANAGEMENT} > {$MOD.LBL_USERS}</b></span>
+			    {else}
+				<span class="lvtHeaderText">	
+				<b>{$APP.LBL_MY_PREFERENCES}</b>
+			   	</span>
+			    {/if}
+			    <span id="vtbusy_info" style="display:none;" valign="bottom"><img src="{$IMAGE_PATH}vtbusy.gif" border="0"></span>					
+			    </td>
+			    <td rowspan="2" nowrap>
+				{if $CATEGORY eq 'Settings'}
+                                	{$DUPLICATE_BUTTON}
+                        	{/if}
+				{$EDIT_BUTTON}
+			    </td>	
 			</tr>
-			<tr><td>&nbsp;</td></tr>
-			<tr valign="center">
-			        <td class="small" align="center">
-					{$EDIT_BUTTON}
-				{$CHANGE_PW_BUTTON}
-				{$LOGIN_HISTORY_BUTTON}
-			{if $CATEGORY eq 'Settings'}
-				{$DUPLICATE_BUTTON}
-			{/if}	
-				{$CHANGE_HOMEPAGE_BUTTON}	
-				{$LISTROLES_BUTTON}
-	</td></tr>
-
-		<tr><td colspan="2">&nbsp;</td></tr>
-		<tr><td colspan="2">
-		<table align="center" border="0" cellpadding="0" cellspacing="0" width="99%">
-		  
-		  <tr>
-			<td>
-			  <table class="small" border="0" cellpadding="3" cellspacing="0" width="100%">
-			  <tr >
-			        <td id="prof" width="25%" align="center" nowrap="nowrap" class="dvtSelectedCell" onClick="fnVis('prof')"><b>{$UMOD.LBL_USER_LOGIN_ROLE}</b></td>
-			     <td class="dvtTabCache" width="10" nowrap="nowrap">&nbsp;</td>
-
-			     <td class="dvtUnSelectedCell" align=center nowrap><a href="index.php?action=CallRelatedList&module={$MODULE}&record={$ID}&parenttab={$CATEGORY}">{$APP.LBL_MORE} {$APP.LBL_INFORMATION}</a></td>
-				    <td class="dvtTabCache" nowrap="nowrap" width="10">&nbsp;</td>
-			  </tr>
-			  </table>
-			</td>
-		  </tr>
-		  <tr>
+			<tr>
+			    <td>sssssssssss</td>
+			</tr>
+		    </table>
+		</td>
+	    </tr>
+	    <tr><td>&nbsp;</td></tr>
+	    <tr valign="center">
+	    	<td class="small" align="center">
+			{$CHANGE_PW_BUTTON}
+			{$LOGIN_HISTORY_BUTTON}
+		</td>
+	    </tr>
+	    <tr><td colspan="2">&nbsp;</td></tr>
+	    <tr>
+		<td colspan="2">
+		    <table align="center" border="0" cellpadding="0" cellspacing="0" width="99%">
+		    <tr>
 		  	<td align="left" valign="top">
-				{foreach key=header item=detail from=$BLOCKS}
-				<table border=0 cellspacing=0 cellpadding=0 width=100% class="small">
-  		    	<tr>
-    	               <td>&nbsp;</td>
-        	           <td>&nbsp;</td>
-            	       <td>&nbsp;</td>
-                	   <td align=right>
-				</tr>  
+			    {foreach key=header name=blockforeach item=detail from=$BLOCKS}
+				<br>
+				<table class="tableHeading" border="0" cellpadding="5" cellspacing="0" width="100%">
 				<tr>
-						{strip}
-					     <td colspan=4 style="border-bottom:1px solid #999999;padding:5px;" bgcolor="#e5e5e5">
-							<b>	{$header}</b>
-						 </td>
-						 {/strip}
-			    </tr>
-					{foreach item=detail from=$detail}
-					<tr style="height:25px">
-							{foreach key=label item=data from=$detail}
-							   {assign var=keyid value=$data.ui}
-							   {assign var=keyval value=$data.value}
-							   {assign var=keytblname value=$data.tablename}
-							   {assign var=keyfldname value=$data.fldname}
-							   {assign var=keyoptions value=$data.options}
-							   {assign var=keysecid value=$data.secid}
-							   {assign var=keyseclink value=$data.link}
-							   {assign var=keycursymb value=$data.cursymb}
-							   {assign var=keysalut value=$data.salut}
-							   {assign var=keycntimage value=$data.cntimage}
-							   {assign var=keyadmin value=$data.isadmin}
-							   
-							   <input type="hidden" id="hdtxt_IsAdmin" value={$keyadmin}></input>
-							   	{if $label ne ''}
-									<td class="dvtCellLabel" align=right width=25%>{$label}</td>
-									{include file="DetailViewUI.tpl"}
-								{else}
-                                    <td class="dvtCellLabel" align=right>&nbsp;</td>
-                                    <td class="dvtCellInfo" align=left >&nbsp;</td>
-				{/if}	
-							{/foreach}
+				    {strip}
+				     <td class="big">	
+					<strong>{$smarty.foreach.blockforeach.iteration}. {$header}</strong>
+				     </td>
+				     <td class="small" align="right">&nbsp;</td>	
+				    {/strip}
+			        </tr>
+				</table>
+				<table border="0" cellpadding="5" cellspacing="0" width="100%">
+				{foreach item=detail from=$detail}
+				<tr style="height:25px">
+					{foreach key=label item=data from=$detail}
+					   {assign var=keyid value=$data.ui}
+					   {assign var=keyval value=$data.value}
+					   {assign var=keytblname value=$data.tablename}
+					   {assign var=keyfldname value=$data.fldname}
+					   {assign var=keyoptions value=$data.options}
+					   {assign var=keysecid value=$data.secid}
+					   {assign var=keyseclink value=$data.link}
+					   {assign var=keycursymb value=$data.cursymb}
+					   {assign var=keysalut value=$data.salut}
+					   {assign var=keycntimage value=$data.cntimage}
+					   {assign var=keyadmin value=$data.isadmin}
+					   
+					   <input type="hidden" id="hdtxt_IsAdmin" value={$keyadmin}></input>
+					   {if $label ne ''}
+					   <td class="dvtCellLabel" align=right width=25%>{$label}</td>
+						{include file="DetailViewUI.tpl"}
+					   {else}
+                                    	   <td class="dvtCellLabel" align=right>&nbsp;</td>
+                                    	   <td class="dvtCellInfo" align=left >&nbsp;</td>
+					   {/if}	
+					{/foreach}
 			 	</tr>
-					{/foreach}
-					</table>
-				 {/foreach}
+				{/foreach}
+			    </table>
+			    {/foreach}
+			    <br>
+			    <table class="tableHeading" border="0" cellpadding="5" cellspacing="0" width="100%">
+			    	<tr>
+				     <td class="big">	
+					<strong>4.{$UMOD.LBL_HOME_PAGE_COMP}</strong>
+				     </td>
+				     <td class="small" align="right"><img src="{$IMAGE_PATH}showDown.gif" alt="{$APP.LBL_EXPAND_COLLAPSE}" title="{$APP.LBL_EXPAND_COLLAPSE}" onClick="ShowHidefn('home_comp');"></td>	
+			        </tr>
+			    </table>
+			<div style="float: none; display: none;" id="home_comp">	
+			    <table border="0" cellpadding="5" cellspacing="0" width="100%">
+				{foreach item=homeitems key=values from=$HOMEORDER}
+					<tr><td class="dvtCellLabel" align="right" width="30%">{$UMOD.$values}</td>
+					    {if $homeitems neq ''}
+					    	<td class="dvtCellInfo" align="center" width="5%">
+					   	<img src="{$IMAGE_PATH}prvPrfSelectedTick.gif" alt="{$UMOD.LBL_SHOWN}" height="12" width="12"></td><td class="dvtCellInfo" align="left">{$UMOD.LBL_SHOWN}</td> 		
+					    {else}	
+						<td class="dvtCellInfo" align="center" width="5%">
+					   	<img src="{$IMAGE_PATH}no.gif" alt="{$UMOD.LBL_HIDDEN}" height="12" width="12"></td><td class="dvtCellInfo" align="left">{$UMOD.LBL_HIDDEN}</td> 		
+					    {/if}	
+					</tr>			
+				{/foreach}
+			    </table>	
+			</div>
+			<br>
+			    <table class="tableHeading" border="0" cellpadding="5" cellspacing="0" width="100%">
+			    	<tr>
+				     <td class="big">	
+					<strong>5.{$UMOD.LBL_LOGIN_HISTORY}</strong>
+				     </td>
+				     <td class="small" align="right">&nbsp;</td>	
+			        </tr>
+			    </table>
+			    <table border="0" cellpadding="5" cellspacing="0" width="100%">
+				<tr><td>&nbsp;</td><td></td></tr>	
+			    </table>	
 
 			</td>
 			</tr>
 			
-	        <tr><td>&nbsp;</td></tr>
+		        <tr><td>&nbsp;</td></tr>
 			
-	  </table>
+	  	</table>
 
 
 
 </td></tr>
+<tr><td class="small"><div align="right"><a href="#top">{$MOD.LBL_SCROLL}</a></div></td></tr>
 </table>
 </form>
 </td></tr>
@@ -170,15 +190,23 @@
 </td>
 </tr>
 </table>
-
+</div>
+<td valign="top"><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
+</tr>
+</table>
+<br>
 {$JAVASCRIPT}
-{if $CATEGORY eq 'Settings'}
-	{include file='SettingsSubMenu.tpl'}
-{/if}
 
 <!-- added for validation -->
 <script language="javascript">
   var fieldname = new Array({$VALIDATION_DATA_FIELDNAME});
   var fieldlabel = new Array({$VALIDATION_DATA_FIELDLABEL});
   var fielddatatype = new Array({$VALIDATION_DATA_FIELDDATATYPE});
+function ShowHidefn(divid)
+{ldelim}
+	if($(divid).style.display != 'none')
+		Effect.Fade(divid);
+	else
+		Effect.Appear(divid);
+{rdelim}
 </script>

Modified: vtigercrm/trunk/Smarty/templates/UserEditView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/UserEditView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/UserEditView.tpl Wed Jun 28 10:18:54 2006
@@ -11,7 +11,6 @@
 -->*}
 <script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
 <script language="JavaScript" type="text/javascript" src="include/js/ColorPicker2.js"></script>
-<style type="text/css">@import url(themes/blue/style.css);</style>
 
 <script language="JavaScript" type="text/javascript">
 
@@ -51,115 +50,155 @@
 </script>
 
 
-
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-<tr>
-{if $PARENTTAB neq ''}	
-	{include file='SettingsMenu.tpl'}
-{/if}
-<td width="75%" valign="top">
-<table width="100%"  border="0" cellspacing="0" cellpadding="0">
+<table align="center" border="0" cellpadding="0" cellspacing="0" width="98%">
+<tbody><tr>
+        <td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
+        <td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
+        <br>
+
+	<div align=center>
+	{if $PARENTTAB eq 'Settings'}
+		{include file='SetMenu.tpl'}
+	{/if}
+
+
+	<table width="100%"  border="0" cellspacing="0" cellpadding="0">
 	<tr><td align="left">
-			<table width="100%" cellpadding="5" cellspacing="0" border="0">
-			<tr>
-			<td colspan="2" style="padding:5px;">
+		<table class="settingsSelUITopLine" border="0" cellpadding="5" cellspacing="0" width="100%">
+		<tr>
+			<td rowspan="2"><img src="{$IMAGE_PATH}user.gif" align="absmiddle"></td>
+			<td>	
 				<span class="lvtHeaderText">
-					{if $PARENTTAB neq ''}	
-					<b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS} </a> > {$MOD.LBL_USER_MANAGEMENT} > {$MOD.LBL_USERS}</b></span>
-					{else}
-                                            <span class="lvtHeaderText">
-                                            <b>{$APP.LBL_MY_PREFERENCES}</b>
-                                            </span>
-                                        {/if}
-				<hr noshade="noshade" size="1" />
-			</td>
-		  </tr>
+				{if $PARENTTAB neq ''}	
+				<b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS} </a> > {$MOD.LBL_USER_MANAGEMENT} > {$MOD.LBL_USERS}</b></span>
+				{else}
+                                <span class="lvtHeaderText">
+                                <b>{$APP.LBL_MY_PREFERENCES}</b>
+                                </span>
+                                {/if}
+			</td>
+			<td rowspan="2" nowrap>
+				<input title="{$APP.LBL_SAVE_BUTTON_TITLE}" accesskey="{$APP.LBL_SAVE_BUTTON_KEY}" class="small crmbutton save"  name="button" value="  {$APP.LBL_SAVE_BUTTON_LABEL}  "  onclick="this.form.action.value='Save'; return verify_data(EditView)" style="width: 70px;" type="button" />
+				<input title="{$APP.LBL_CANCEL_BUTTON_TITLE}" accesskey="{$APP.LBL_CANCEL_BUTTON_KEY}" class="small crmbutton cancel" name="button" value="  {$APP.LBL_CANCEL_BUTTON_LABEL}  " onclick="window.history.back()" style="width: 70px;" type="button" />
+						
+			</td>
+	 	</tr>
 		<tr>
-											<td width="5%"><img src="{$IMAGE_PATH}user.gif" align="absmiddle"></td>
-										{if $MODE eq 'edit'}
-												<td width="95%"><span class="genHeaderGrayBig">{$USER_NAME}</span><br>
-												<b class="small">{$UMOD.LBL_EDIT_VIEW} {$FIRST_NAME} {$LAST_NAME}</b>
-											</td>
-										{else}
-												<td width="95%"><span class="genHeaderGrayBig">{$UMOD.LBL_NEW_USER_BUTTON_LABEL}</span><br>
-												<b class="small">{$UMOD.LBL_CREATE_NEW_USER}</b>
-											</td>
-										{/if}
-											
-									</tr>
-							</table>
-	</td></tr>
-	
+			{if $MODE eq 'edit'}
+				<td><span class="genHeaderGrayBig">{$USER_NAME}</span><br>
+				<b class="small">{$UMOD.LBL_EDIT_VIEW} {$FIRST_NAME} {$LAST_NAME}</b>
+			{else}
+				<td><span class="genHeaderGrayBig">{$UMOD.LBL_NEW_USER_BUTTON_LABEL}</span><br>
+				<b class="small">{$UMOD.LBL_CREATE_NEW_USER}</b>
+			{/if}
+			</td>
+                </tr>
+		</table>
+	</td>
+	</tr>
 	<tr><td class="padTab" align="left">
 		<form name="EditView" method="POST" action="index.php" ENCTYPE="multipart/form-data">
-			<input type="hidden" name="module" value="Users">
-			<input type="hidden" name="record" value="{$ID}">
-			<input type="hidden" name="mode" value="{$MODE}">
-			<input type='hidden' name='parenttab' value='{$PARENTTAB}'>
-			<input type="hidden" name="activity_mode" value="{$ACTIVITYMODE}">
-			<input type="hidden" name="action">
-			<input type="hidden" name="return_module" value="{$RETURN_MODULE}">
-			<input type="hidden" name="return_id" value="{$RETURN_ID}">
-			<input type="hidden" name="return_action" value="{$RETURN_ACTION}">			
-			<input type="hidden" name="tz" value="Europe/Berlin">			
-			<input type="hidden" name="holidays" value="de,en_uk,fr,it,us,">			
-			<input type="hidden" name="workdays" value="0,1,2,3,4,5,6,">			
-			<input type="hidden" name="namedays" value="">			
-			<input type="hidden" name="weekstart" value="1">
+		<input type="hidden" name="module" value="Users">
+		<input type="hidden" name="record" value="{$ID}">
+		<input type="hidden" name="mode" value="{$MODE}">
+		<input type='hidden' name='parenttab' value='{$PARENTTAB}'>
+		<input type="hidden" name="activity_mode" value="{$ACTIVITYMODE}">
+		<input type="hidden" name="action">
+		<input type="hidden" name="return_module" value="{$RETURN_MODULE}">
+		<input type="hidden" name="return_id" value="{$RETURN_ID}">
+		<input type="hidden" name="return_action" value="{$RETURN_ACTION}">			
+		<input type="hidden" name="tz" value="Europe/Berlin">			
+		<input type="hidden" name="holidays" value="de,en_uk,fr,it,us,">			
+		<input type="hidden" name="workdays" value="0,1,2,3,4,5,6,">			
+		<input type="hidden" name="namedays" value="">			
+		<input type="hidden" name="weekstart" value="1">
 		<table width="100%" border="0" cellpadding="0" cellspacing="0">
 
-		<tr><td colspan="2">&nbsp;</td></tr>
 		<tr><td colspan="2">
-		<table align="center" border="0" cellpadding="0" cellspacing="0" width="99%">
-		  <tr>
-			<td>
-			  <table class="small" border="0" cellpadding="3" cellspacing="0" width="100%">
-			  <tr>
-			     <td id="prof" width="25%" align="center" nowrap="nowrap" class="dvtSelectedCell" onclick="fnVis('prof')" ><b>{$UMOD.LBL_USER_LOGIN_ROLE}</b></td>
-			     <td class="dvtTabCache" width="10" nowrap="nowrap">&nbsp;</td>
-			  </tr>
-			  </table>
-			</td>
-		  </tr>
+			<table align="center" border="0" cellpadding="0" cellspacing="0" width="99%">
 			<tr>
 			    <td align="left" valign="top">
-			        <div id="mnuTab">
-			             <table class="dvtContentSpace" border="0" cellpadding="0" cellspacing="0" width="100%">
-				        <tr><td height="35">&nbsp;</td></tr>
+			             <table border="0" cellpadding="0" cellspacing="0" width="100%">
 					<tr><td align="left">
-					   <table width="99%"  border="0" cellspacing="0" cellpadding="5" align="center" class="small">
-
-									   {foreach key=header item=data from=$BLOCKS}
-					     <tr>
-											<td colspan=4 class="detailedViewHeader">
-											<b>{$header}</b>
-						</td>
-					     </tr>
-										<!-- Handle the ui types display -->
-										{include file="DisplayFields.tpl"}
-
-									   {/foreach}
-
-
-							        <tr>
-							            <td colspan=4><div align="center">
-								    <input title="{$APP.LBL_SAVE_BUTTON_TITLE}" accesskey="{$APP.LBL_SAVE_BUTTON_KEY}" class="small"  name="button" value="  {$APP.LBL_SAVE_BUTTON_LABEL}  "  onclick="this.form.action.value='Save'; return verify_data(EditView)" style="width: 70px;" type="button" />
-								    <input title="{$APP.LBL_CANCEL_BUTTON_TITLE}" accesskey="{$APP.LBL_CANCEL_BUTTON_KEY}" class="small" name="button" value="  {$APP.LBL_CANCEL_BUTTON_LABEL}  " onclick="window.history.back()" style="width: 70px;" type="button" />
-								        </div></td>
-								</tr>
-							  </table>
-							  </td></tr>
+						{foreach key=header name=blockforeach item=data from=$BLOCKS}
+						<br>
+		                                <table class="tableHeading" border="0" cellpadding="5" cellspacing="0" width="100%">
+                		                <tr>
+                                		    {strip}
+		                                     <td class="big">
+                		                        <strong>{$smarty.foreach.blockforeach.iteration}. {$header}</strong>
+                                		     </td>
+		                                     <td class="small" align="right">&nbsp;</td>
+		                                  {/strip}
+                		              	</tr>
+                                		</table>
+		                                <table border="0" cellpadding="5" cellspacing="0" width="100%">
+						<!-- Handle the ui types display -->
+							{include file="DisplayFields.tpl"}
 						</table>
-						</form>
+					   	{/foreach}
+				<br>
+			    	<table class="tableHeading" border="0" cellpadding="5" cellspacing="0" width="100%">
+			    	<tr>
+				     <td class="big">	
+					<strong>4.sdjhfsjkhfjalkssdjhfsjkhfjalks</strong>
+				     </td>
+				     <td class="small" align="right">&nbsp;</td>	
+			        </tr>
+			    	</table>
+			    	<table border="0" cellpadding="5" cellspacing="0" width="100%">
+				{foreach item=homeitems key=values from=$HOMEORDER}
+					<tr><td class="dvtCellLabel" align="right" width="30%">{$UMOD.$values}</td>
+					    {if $homeitems neq ''}
+					    	<td class="dvtCellInfo" align="center" width="5%">
+					   	<input name="{$values}" value="{$values}" checked type="radio"></td><td class="dvtCellInfo" align="left" width="20%">Show</td> 		
+					    	<td class="dvtCellInfo" align="center" width="5%">
+					   	<input name="{$values}" value="" type="radio"></td><td class="dvtCellInfo" align="left">Hide</td> 		
+					    {else}	
+					    	<td class="dvtCellInfo" align="center" width="5%">
+					   	<input name="{$values}" value="{$values}" type="radio"></td><td class="dvtCellInfo" align="left">Show</td> 		
+					    	<td class="dvtCellInfo" align="center" width="5%">
+					   	<input name="{$values}" value="" checked type="radio"></td><td class="dvtCellInfo" align="left">Hide</td> 		
+					    {/if}	
+					</tr>			
+				{/foreach}
+			    	</table>	
+				<br>
+			    	<table class="tableHeading" border="0" cellpadding="5" cellspacing="0" width="100%">
+			    	<tr>
+				     <td class="big">	
+					<strong>5.kssdjhfsjkhfjalks</strong>
+				     </td>
+				     <td class="small" align="right">&nbsp;</td>	
+			        </tr>
+			    	</table>
+			    	<table border="0" cellpadding="5" cellspacing="0" width="100%">
+					<tr><td>&nbsp;</td><td></td></tr>	
+			    	</table>	
+				<tr><td colspan=4>&nbsp;</td></tr>
+							
+					        <tr>
+					       		<td colspan=4 align="right">
+							<input title="{$APP.LBL_SAVE_BUTTON_TITLE}" accesskey="{$APP.LBL_SAVE_BUTTON_KEY}" class="small crmbutton save"  name="button" value="  {$APP.LBL_SAVE_BUTTON_LABEL}  "  onclick="this.form.action.value='Save'; return verify_data(EditView)" style="width: 70px;" type="button" />
+							<input title="{$APP.LBL_CANCEL_BUTTON_TITLE}" accesskey="{$APP.LBL_CANCEL_BUTTON_KEY}" class="small crmbutton cancel" name="button" value="  {$APP.LBL_CANCEL_BUTTON_LABEL}  " onclick="window.history.back()" style="width: 70px;" type="button" />
+							</td>
+						</tr>
+					    </table>
+					 </td></tr>
+					</table>
 			  	   </td></tr>
 				   </table>
-				    </td></tr>
+				 <br>
+				  </td></tr>
+				<tr><td class="small"><div align="right"><a href="#top">{$MOD.LBL_SCROLL}</a></div></td></tr>
 				</table>
+				</form>	
+			</td>
+			</tr>
+			</table>
 </td>
 </tr>
 </table>
-
+</td></tr></table>
+<br>
 {$JAVASCRIPT}
-{if $PARENTTAB neq ''}
-	{include file='SettingsSubMenu.tpl'}
-{/if}




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 12:36:14 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 16:36:14 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7649 -
	/vtigercrm/trunk/modules/Users/add2db.php
Message-ID: <20060628163614.E4B8B83FD57@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 28 10:36:07 2006
New Revision: 7649

Log:
New UI for Users has been integrated

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

Modified: vtigercrm/trunk/modules/Users/add2db.php
==============================================================================
--- vtigercrm/trunk/modules/Users/add2db.php (original)
+++ vtigercrm/trunk/modules/Users/add2db.php Wed Jun 28 10:36:07 2006
@@ -81,7 +81,7 @@
 			$parent_type = 'Potential';
 		}
 	 
-		$genQueryId = $adb->getUniqueID("wordtemplates");
+		$genQueryId = $adb->getUniqueID("vtiger_wordtemplates");
 		if($genQueryId != '')
 		{
 			if($result!=false && $savefile=="true")




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 12:49:10 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 16:49:10 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7650 -
 /vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
Message-ID: <20060628164910.10AE683FD57@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 28 10:49:00 2006
New Revision: 7650

Log:
New UI for Users has been integrated

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

Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original)
+++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Wed Jun 28 10:49:00 2006
@@ -28,16 +28,16 @@
 	function create_tables () {
 		global $app_strings;
 
-		$role1_id = $this->db->getUniqueID("role");
-		$role2_id = $this->db->getUniqueID("role");
-		$role3_id = $this->db->getUniqueID("role");
-		$role4_id = $this->db->getUniqueID("role");
-		$role5_id = $this->db->getUniqueID("role");
-
-		$profile1_id = $this->db->getUniqueID("profile");
-		$profile2_id = $this->db->getUniqueID("profile");
-		$profile3_id = $this->db->getUniqueID("profile");
-		$profile4_id = $this->db->getUniqueID("profile");
+		$role1_id = $this->db->getUniqueID("vtiger_role");
+		$role2_id = $this->db->getUniqueID("vtiger_role");
+		$role3_id = $this->db->getUniqueID("vtiger_role");
+		$role4_id = $this->db->getUniqueID("vtiger_role");
+		$role5_id = $this->db->getUniqueID("vtiger_role");
+
+		$profile1_id = $this->db->getUniqueID("vtiger_profile");
+		$profile2_id = $this->db->getUniqueID("vtiger_profile");
+		$profile3_id = $this->db->getUniqueID("vtiger_profile");
+		$profile4_id = $this->db->getUniqueID("vtiger_profile");
 
                 $this->db->query("insert into vtiger_role values('H".$role1_id."','Organisation','H".$role1_id."',0)");
                 $this->db->query("insert into vtiger_role values('H".$role2_id."','CEO','H".$role1_id."::H".$role2_id."',1)");
@@ -161,57 +161,57 @@
 //Account Details -- START
  //Block9
 
-$this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'accountname','vtiger_account',1,'2','accountname','Account Name',1,0,0,100,1,9,1,'V~M',0,1,'BAS')");	
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'phone','vtiger_account',1,'11','phone','Phone',1,0,0,100,2,9,1,'V~O',0,2,'BAS')");	
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'website','vtiger_account',1,'17','website','Website',1,0,0,100,3,9,1,'V~O',0,3,'BAS')");	
-
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'fax','vtiger_account',1,'1','fax','Fax',1,0,0,100,4,9,1,'V~O',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'tickersymbol','vtiger_account',1,'1','tickersymbol','Ticker Symbol',1,0,0,100,5,9,1,'V~O',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'otherphone','vtiger_account',1,'11','otherphone','Other Phone',1,0,0,100,6,9,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'parentid','vtiger_account',1,'51','account_id','Member Of',1,0,0,100,7,9,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'email1','vtiger_account',1,'13','email1','Email',1,0,0,100,8,9,1,'E~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'employees','vtiger_account',1,'7','employees','Employees',1,0,0,100,9,9,1,'I~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'email2','vtiger_account',1,'13','email2','Other Email',1,0,0,100,10,9,1,'E~O',1,null,'ADV')");
-
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'ownership','vtiger_account',1,'1','ownership','Ownership',1,0,0,100,11,9,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'rating','vtiger_account',1,'1','rating','Rating',1,0,0,100,12,9,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'industry','vtiger_account',1,'15','industry','industry',1,0,0,100,13,9,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'siccode','vtiger_account',1,'1','siccode','SIC Code',1,0,0,100,14,9,1,'I~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'account_type','vtiger_account',1,'15','accounttype','Type',1,0,0,100,15,9,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'annualrevenue','vtiger_account',1,'71','annual_revenue','Annual Revenue',1,0,0,100,16,9,1,'I~O',1,null,'ADV')");
+$this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("vtiger_field").",'accountname','vtiger_account',1,'2','accountname','Account Name',1,0,0,100,1,9,1,'V~M',0,1,'BAS')");	
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("vtiger_field").",'phone','vtiger_account',1,'11','phone','Phone',1,0,0,100,2,9,1,'V~O',0,2,'BAS')");	
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("vtiger_field").",'website','vtiger_account',1,'17','website','Website',1,0,0,100,3,9,1,'V~O',0,3,'BAS')");	
+
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("vtiger_field").",'fax','vtiger_account',1,'1','fax','Fax',1,0,0,100,4,9,1,'V~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("vtiger_field").",'tickersymbol','vtiger_account',1,'1','tickersymbol','Ticker Symbol',1,0,0,100,5,9,1,'V~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("vtiger_field").",'otherphone','vtiger_account',1,'11','otherphone','Other Phone',1,0,0,100,6,9,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("vtiger_field").",'parentid','vtiger_account',1,'51','account_id','Member Of',1,0,0,100,7,9,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("vtiger_field").",'email1','vtiger_account',1,'13','email1','Email',1,0,0,100,8,9,1,'E~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("vtiger_field").",'employees','vtiger_account',1,'7','employees','Employees',1,0,0,100,9,9,1,'I~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("vtiger_field").",'email2','vtiger_account',1,'13','email2','Other Email',1,0,0,100,10,9,1,'E~O',1,null,'ADV')");
+
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("vtiger_field").",'ownership','vtiger_account',1,'1','ownership','Ownership',1,0,0,100,11,9,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("vtiger_field").",'rating','vtiger_account',1,'1','rating','Rating',1,0,0,100,12,9,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("vtiger_field").",'industry','vtiger_account',1,'15','industry','industry',1,0,0,100,13,9,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("vtiger_field").",'siccode','vtiger_account',1,'1','siccode','SIC Code',1,0,0,100,14,9,1,'I~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("vtiger_field").",'account_type','vtiger_account',1,'15','accounttype','Type',1,0,0,100,15,9,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("vtiger_field").",'annualrevenue','vtiger_account',1,'71','annual_revenue','Annual Revenue',1,0,0,100,16,9,1,'I~O',1,null,'ADV')");
  //Added vtiger_field emailoptout for vtiger_accounts -- after 4.2 patch2
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'emailoptout','vtiger_account',1,'56','emailoptout','Email Opt Out',1,0,0,100,17,9,1,'C~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'notify_owner','vtiger_account',1,56,'notify_owner','Notify Owner',1,0,0,10,18,9,1,'C~O',1,NULL,'ADV')");
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,19,9,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,20,9,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,21,9,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("vtiger_field").",'emailoptout','vtiger_account',1,'56','emailoptout','Email Opt Out',1,0,0,100,17,9,1,'C~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("vtiger_field").",'notify_owner','vtiger_account',1,56,'notify_owner','Notify Owner',1,0,0,10,18,9,1,'C~O',1,NULL,'ADV')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("vtiger_field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,19,9,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("vtiger_field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,20,9,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("vtiger_field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,21,9,2,'T~O',1,null,'BAS')");
 
 
 
 
  //Block 11
-$this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'street','vtiger_accountbillads',1,'21','bill_street','Billing Address',1,0,0,100,1,11,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'street','vtiger_accountshipads',1,'21','ship_street','Shipping Address',1,0,0,100,2,11,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'city','vtiger_accountbillads',1,'1','bill_city','Billing City',1,0,0,100,5,11,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'city','vtiger_accountshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,11,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'state','vtiger_accountbillads',1,'1','bill_state','Billing State',1,0,0,100,7,11,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'state','vtiger_accountshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,11,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'code','vtiger_accountbillads',1,'1','bill_code','Billing Code',1,0,0,100,9,11,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'code','vtiger_accountshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,11,1,'V~O',1,null,'BAS')");
-
-
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'country','vtiger_accountbillads',1,'1','bill_country','Billing Country',1,0,0,100,11,11,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'country','vtiger_accountshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,11,1,'V~O',1,null,'BAS')");
-
-$this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'pobox','vtiger_accountbillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,11,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'pobox','vtiger_accountshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,11,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("vtiger_field").",'street','vtiger_accountbillads',1,'21','bill_street','Billing Address',1,0,0,100,1,11,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("vtiger_field").",'street','vtiger_accountshipads',1,'21','ship_street','Shipping Address',1,0,0,100,2,11,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("vtiger_field").",'city','vtiger_accountbillads',1,'1','bill_city','Billing City',1,0,0,100,5,11,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("vtiger_field").",'city','vtiger_accountshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,11,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("vtiger_field").",'state','vtiger_accountbillads',1,'1','bill_state','Billing State',1,0,0,100,7,11,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("vtiger_field").",'state','vtiger_accountshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,11,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("vtiger_field").",'code','vtiger_accountbillads',1,'1','bill_code','Billing Code',1,0,0,100,9,11,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("vtiger_field").",'code','vtiger_accountshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,11,1,'V~O',1,null,'BAS')");
+
+
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("vtiger_field").",'country','vtiger_accountbillads',1,'1','bill_country','Billing Country',1,0,0,100,11,11,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("vtiger_field").",'country','vtiger_accountshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,11,1,'V~O',1,null,'BAS')");
+
+$this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("vtiger_field").",'pobox','vtiger_accountbillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,11,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("vtiger_field").",'pobox','vtiger_accountshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,11,1,'V~O',1,null,'BAS')");
 
 
  //Block12
-$this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,12,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (6,".$this->db->getUniqueID("vtiger_field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,12,1,'V~O',1,null,'BAS')");
  
 
 
@@ -222,45 +222,45 @@
 
 //Block13 -- Start
 
-$this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'salutation','vtiger_leaddetails',1,'55','salutationtype','Salutation',1,0,0,100,1,13,3,'V~O',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'firstname','vtiger_leaddetails',1,'55','firstname','First Name',1,0,0,100,2,13,1,'V~O',0,1,'BAS')");	
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'phone','vtiger_leadaddress',1,'11','phone','Phone',1,0,0,100,3,13,1,'V~O',0,4,'BAS')");	
-
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'lastname','vtiger_leaddetails',1,'2','lastname','Last Name',1,0,0,100,4,13,1,'V~M',0,2,'BAS')");	
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'mobile','vtiger_leadaddress',1,'1','mobile','Mobile',1,0,0,100,5,13,1,'V~O',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'company','vtiger_leaddetails',1,'2','company','Company',1,0,0,100,6,13,1,'V~M',0,3,'BAS')");
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'fax','vtiger_leadaddress',1,'1','fax','Fax',1,0,0,100,7,13,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'designation','vtiger_leaddetails',1,'1','designation','Designation',1,0,0,100,8,13,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'email','vtiger_leaddetails',1,'13','email','Email',1,0,0,100,9,13,1,'E~O',0,5,'BAS')");
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'leadsource','vtiger_leaddetails',1,'15','leadsource','Lead Source',1,0,0,100,10,13,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'website','vtiger_leadsubdetails',1,'17','website','Website',1,0,0,100,11,13,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'industry','vtiger_leaddetails',1,'15','industry','Industry',1,0,0,100,12,13,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'leadstatus','vtiger_leaddetails',1,'15','leadstatus','Lead Status',1,0,0,100,13,13,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'annualrevenue','vtiger_leaddetails',1,'71','annualrevenue','Annual Revenue',1,0,0,100,14,13,1,'I~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'rating','vtiger_leaddetails',1,'15','rating','Rating',1,0,0,100,15,13,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'noofemployees','vtiger_leaddetails',1,'1','noofemployees','No Of Employees',1,0,0,100,16,13,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,17,13,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'yahooid','vtiger_leaddetails',1,'13','yahooid','Yahoo Id',1,0,0,100,18,13,1,'V~O',1,null,'ADV')");
-$this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,19,13,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,20,13,2,'T~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("vtiger_field").",'salutation','vtiger_leaddetails',1,'55','salutationtype','Salutation',1,0,0,100,1,13,3,'V~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("vtiger_field").",'firstname','vtiger_leaddetails',1,'55','firstname','First Name',1,0,0,100,2,13,1,'V~O',0,1,'BAS')");	
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("vtiger_field").",'phone','vtiger_leadaddress',1,'11','phone','Phone',1,0,0,100,3,13,1,'V~O',0,4,'BAS')");	
+
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("vtiger_field").",'lastname','vtiger_leaddetails',1,'2','lastname','Last Name',1,0,0,100,4,13,1,'V~M',0,2,'BAS')");	
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("vtiger_field").",'mobile','vtiger_leadaddress',1,'1','mobile','Mobile',1,0,0,100,5,13,1,'V~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("vtiger_field").",'company','vtiger_leaddetails',1,'2','company','Company',1,0,0,100,6,13,1,'V~M',0,3,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("vtiger_field").",'fax','vtiger_leadaddress',1,'1','fax','Fax',1,0,0,100,7,13,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("vtiger_field").",'designation','vtiger_leaddetails',1,'1','designation','Designation',1,0,0,100,8,13,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("vtiger_field").",'email','vtiger_leaddetails',1,'13','email','Email',1,0,0,100,9,13,1,'E~O',0,5,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("vtiger_field").",'leadsource','vtiger_leaddetails',1,'15','leadsource','Lead Source',1,0,0,100,10,13,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("vtiger_field").",'website','vtiger_leadsubdetails',1,'17','website','Website',1,0,0,100,11,13,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("vtiger_field").",'industry','vtiger_leaddetails',1,'15','industry','Industry',1,0,0,100,12,13,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("vtiger_field").",'leadstatus','vtiger_leaddetails',1,'15','leadstatus','Lead Status',1,0,0,100,13,13,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("vtiger_field").",'annualrevenue','vtiger_leaddetails',1,'71','annualrevenue','Annual Revenue',1,0,0,100,14,13,1,'I~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("vtiger_field").",'rating','vtiger_leaddetails',1,'15','rating','Rating',1,0,0,100,15,13,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("vtiger_field").",'noofemployees','vtiger_leaddetails',1,'1','noofemployees','No Of Employees',1,0,0,100,16,13,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("vtiger_field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,17,13,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("vtiger_field").",'yahooid','vtiger_leaddetails',1,'13','yahooid','Yahoo Id',1,0,0,100,18,13,1,'V~O',1,null,'ADV')");
+$this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("vtiger_field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,19,13,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("vtiger_field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,20,13,2,'T~O',1,null,'BAS')");
 
 //Block13 -- End
 
 
 //Block15 -- Start
 
-$this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'lane','vtiger_leadaddress',1,'21','lane','Street',1,0,0,100,1,15,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'code','vtiger_leadaddress',1,'1','code','Postal Code',1,0,0,100,3,15,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'city','vtiger_leadaddress',1,'1','city','City',1,0,0,100,4,15,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'country','vtiger_leadaddress',1,'1','country','Country',1,0,0,100,5,15,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'state','vtiger_leadaddress',1,'1','state','State',1,0,0,100,6,15,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'pobox','vtiger_leadaddress',1,'1','pobox','Po Box',1,0,0,100,2,15,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("vtiger_field").",'lane','vtiger_leadaddress',1,'21','lane','Street',1,0,0,100,1,15,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("vtiger_field").",'code','vtiger_leadaddress',1,'1','code','Postal Code',1,0,0,100,3,15,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("vtiger_field").",'city','vtiger_leadaddress',1,'1','city','City',1,0,0,100,4,15,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("vtiger_field").",'country','vtiger_leadaddress',1,'1','country','Country',1,0,0,100,5,15,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("vtiger_field").",'state','vtiger_leadaddress',1,'1','state','State',1,0,0,100,6,15,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("vtiger_field").",'pobox','vtiger_leadaddress',1,'1','pobox','Po Box',1,0,0,100,2,15,1,'V~O',1,null,'BAS')");
 
 //Block15 --End
 
 //Block16 -- Start
 
-$this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,16,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (7,".$this->db->getUniqueID("vtiger_field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,16,1,'V~O',1,null,'BAS')");
 
 //Block16 -- End
 
@@ -270,64 +270,64 @@
 //Contact Details -- START
 //Block4 -- Start
 
-$this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'salutation','vtiger_contactdetails',1,'55','salutationtype','Salutation',1,0,0,100,1,4,3,'V~O',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'firstname','vtiger_contactdetails',1,'55','firstname','First Name',1,0,0,100,2,4,1,'V~O',0,1,'BAS')");	
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'phone','vtiger_contactdetails',1,'11','phone','Office Phone',1,0,0,100,3,4,1,'V~O',0,4,'BAS')");	
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'lastname','vtiger_contactdetails',1,'2','lastname','Last Name',1,0,0,100,4,4,1,'V~M',0,2,'BAS')");	
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'mobile','vtiger_contactdetails',1,'1','mobile','Mobile',1,0,0,100,5,4,1,'V~O',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'accountid','vtiger_contactdetails',1,'51','account_id','Account Name',1,0,0,100,6,4,1,'I~O',0,3,'BAS')");	
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'homephone','vtiger_contactsubdetails',1,'11','homephone','Home Phone',1,0,0,100,7,4,1,'V~O',1,null,'ADV')");	
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'leadsource','vtiger_contactsubdetails',1,'15','leadsource','Lead Source',1,0,0,100,8,4,1,'V~O',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'otherphone','vtiger_contactsubdetails',1,'11','otherphone','Phone',1,0,0,100,9,4,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'title','vtiger_contactdetails',1,'1','title','Title',1,0,0,100,10,4,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'fax','vtiger_contactdetails',1,'1','fax','Fax',1,0,0,100,11,4,1,'V~O',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'department','vtiger_contactdetails',1,'1','department','Department',1,0,0,100,12,4,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'birthday','vtiger_contactsubdetails',1,'5','birthday','Birthdate',1,0,0,100,14,4,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'email','vtiger_contactdetails',1,'13','email','Email',1,0,0,100,15,4,1,'E~O',0,5,'ADV')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'reportsto','vtiger_contactdetails',1,'57','contact_id','Reports To',1,0,0,100,16,4,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'assistant','vtiger_contactsubdetails',1,'1','assistant','Assistant',1,0,0,100,17,4,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'yahooid','vtiger_contactdetails',1,'13','yahooid','Yahoo Id',1,0,0,100,18,4,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'assistantphone','vtiger_contactsubdetails',1,'11','assistantphone','Assistant Phone',1,0,0,100,19,4,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'donotcall','vtiger_contactdetails',1,'56','donotcall','Do Not Call',1,0,0,100,20,4,1,'C~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'emailoptout','vtiger_contactdetails',1,'56','emailoptout','Email Opt Out',1,0,0,100,21,4,1,'C~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,22,4,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'reference','vtiger_contactdetails',1,'56','reference','Reference',1,0,0,10,23,4,1,'C~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'notify_owner','vtiger_contactdetails',1,'56','notify_owner','Notify Owner',1,0,0,10,24,4,1,'C~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,25,4,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,26,4,2,'T~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'salutation','vtiger_contactdetails',1,'55','salutationtype','Salutation',1,0,0,100,1,4,3,'V~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'firstname','vtiger_contactdetails',1,'55','firstname','First Name',1,0,0,100,2,4,1,'V~O',0,1,'BAS')");	
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'phone','vtiger_contactdetails',1,'11','phone','Office Phone',1,0,0,100,3,4,1,'V~O',0,4,'BAS')");	
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'lastname','vtiger_contactdetails',1,'2','lastname','Last Name',1,0,0,100,4,4,1,'V~M',0,2,'BAS')");	
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'mobile','vtiger_contactdetails',1,'1','mobile','Mobile',1,0,0,100,5,4,1,'V~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'accountid','vtiger_contactdetails',1,'51','account_id','Account Name',1,0,0,100,6,4,1,'I~O',0,3,'BAS')");	
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'homephone','vtiger_contactsubdetails',1,'11','homephone','Home Phone',1,0,0,100,7,4,1,'V~O',1,null,'ADV')");	
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'leadsource','vtiger_contactsubdetails',1,'15','leadsource','Lead Source',1,0,0,100,8,4,1,'V~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'otherphone','vtiger_contactsubdetails',1,'11','otherphone','Phone',1,0,0,100,9,4,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'title','vtiger_contactdetails',1,'1','title','Title',1,0,0,100,10,4,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'fax','vtiger_contactdetails',1,'1','fax','Fax',1,0,0,100,11,4,1,'V~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'department','vtiger_contactdetails',1,'1','department','Department',1,0,0,100,12,4,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'birthday','vtiger_contactsubdetails',1,'5','birthday','Birthdate',1,0,0,100,14,4,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'email','vtiger_contactdetails',1,'13','email','Email',1,0,0,100,15,4,1,'E~O',0,5,'ADV')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'reportsto','vtiger_contactdetails',1,'57','contact_id','Reports To',1,0,0,100,16,4,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'assistant','vtiger_contactsubdetails',1,'1','assistant','Assistant',1,0,0,100,17,4,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'yahooid','vtiger_contactdetails',1,'13','yahooid','Yahoo Id',1,0,0,100,18,4,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'assistantphone','vtiger_contactsubdetails',1,'11','assistantphone','Assistant Phone',1,0,0,100,19,4,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'donotcall','vtiger_contactdetails',1,'56','donotcall','Do Not Call',1,0,0,100,20,4,1,'C~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'emailoptout','vtiger_contactdetails',1,'56','emailoptout','Email Opt Out',1,0,0,100,21,4,1,'C~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,22,4,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'reference','vtiger_contactdetails',1,'56','reference','Reference',1,0,0,10,23,4,1,'C~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'notify_owner','vtiger_contactdetails',1,'56','notify_owner','Notify Owner',1,0,0,10,24,4,1,'C~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,25,4,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,26,4,2,'T~O',1,null,'BAS')");
 
 //Block4 -- End
 
 //Block6 - Begin Customer Portal
 
-$this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'portal','vtiger_customerdetails',1,'56','portal','Portal User',1,0,0,100,1,6,1,'C~O',1,null,'ADV')");
-$this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'support_start_date','vtiger_customerdetails',1,'5','support_start_date','Support Start Date',1,0,0,100,2,6,1,'D~O',1,null,'ADV')");
-$this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'support_end_date','vtiger_customerdetails',1,'5','support_end_date','Support End Date',1,0,0,100,3,6,1,'D~O~OTH~GE~support_start_date~Support Start Date',1,null,'ADV')");
+$this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'portal','vtiger_customerdetails',1,'56','portal','Portal User',1,0,0,100,1,6,1,'C~O',1,null,'ADV')");
+$this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'support_start_date','vtiger_customerdetails',1,'5','support_start_date','Support Start Date',1,0,0,100,2,6,1,'D~O',1,null,'ADV')");
+$this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'support_end_date','vtiger_customerdetails',1,'5','support_end_date','Support End Date',1,0,0,100,3,6,1,'D~O~OTH~GE~support_start_date~Support Start Date',1,null,'ADV')");
 
 //Block6 - End Customer Portal
 
 //Block 7 -- Start
 
-$this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'mailingstreet','vtiger_contactaddress',1,'21','mailingstreet','Mailing Street',1,0,0,100,1,7,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'otherstreet','vtiger_contactaddress',1,'21','otherstreet','Other Street',1,0,0,100,2,7,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'mailingcity','vtiger_contactaddress',1,'1','mailingcity','Mailing City',1,0,0,100,5,7,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'othercity','vtiger_contactaddress',1,'1','othercity','Other City',1,0,0,100,6,7,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'mailingstate','vtiger_contactaddress',1,'1','mailingstate','Mailing State',1,0,0,100,7,7,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'otherstate','vtiger_contactaddress',1,'1','otherstate','Other State',1,0,0,100,8,7,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'mailingzip','vtiger_contactaddress',1,'1','mailingzip','Mailing Zip',1,0,0,100,9,7,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'otherzip','vtiger_contactaddress',1,'1','otherzip','Other Zip',1,0,0,100,10,7,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'mailingcountry','vtiger_contactaddress',1,'1','mailingcountry','Mailing Country',1,0,0,100,11,7,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'othercountry','vtiger_contactaddress',1,'1','othercountry','Other Country',1,0,0,100,12,7,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'mailingpobox','vtiger_contactaddress',1,'1','mailingpobox','Mailing Po Box',1,0,0,100,3,7,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'otherpobox','vtiger_contactaddress',1,'1','otherpobox','Other Po Box',1,0,0,100,4,7,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'mailingstreet','vtiger_contactaddress',1,'21','mailingstreet','Mailing Street',1,0,0,100,1,7,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'otherstreet','vtiger_contactaddress',1,'21','otherstreet','Other Street',1,0,0,100,2,7,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'mailingcity','vtiger_contactaddress',1,'1','mailingcity','Mailing City',1,0,0,100,5,7,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'othercity','vtiger_contactaddress',1,'1','othercity','Other City',1,0,0,100,6,7,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'mailingstate','vtiger_contactaddress',1,'1','mailingstate','Mailing State',1,0,0,100,7,7,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'otherstate','vtiger_contactaddress',1,'1','otherstate','Other State',1,0,0,100,8,7,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'mailingzip','vtiger_contactaddress',1,'1','mailingzip','Mailing Zip',1,0,0,100,9,7,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'otherzip','vtiger_contactaddress',1,'1','otherzip','Other Zip',1,0,0,100,10,7,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'mailingcountry','vtiger_contactaddress',1,'1','mailingcountry','Mailing Country',1,0,0,100,11,7,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'othercountry','vtiger_contactaddress',1,'1','othercountry','Other Country',1,0,0,100,12,7,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'mailingpobox','vtiger_contactaddress',1,'1','mailingpobox','Mailing Po Box',1,0,0,100,3,7,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'otherpobox','vtiger_contactaddress',1,'1','otherpobox','Other Po Box',1,0,0,100,4,7,1,'V~O',1,null,'BAS')");
 //Block7 -- End
 
 //ContactImageInformation
- $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'imagename','vtiger_contactdetails',1,'69','imagename','Contact Image',1,0,0,100,1,75,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'imagename','vtiger_contactdetails',1,'69','imagename','Contact Image',1,0,0,100,1,75,1,'V~O',1,null,'ADV')");
 
 
 //Block8 -- Start
-$this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,8,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (4,".$this->db->getUniqueID("vtiger_field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,8,1,'V~O',1,null,'BAS')");
 //Block8 -- End
 //Contact Details -- END
 
@@ -335,25 +335,25 @@
 //Potential Details -- START
 //Block1 -- Start
 
-$this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'potentialname','vtiger_potential',1,'2','potentialname','Potential Name',1,0,0,100,1,1,1,'V~M',0,1,'BAS')");	
- $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'amount','vtiger_potential',1,71,'amount','Amount',1,0,0,100,2,1,1,'N~O',0,5,'BAS')");	
- $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'accountid','vtiger_potential',1,'50','account_id','Account Name',1,0,0,100,3,1,1,'V~M',0,2,'BAS')");	
- $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'closingdate','vtiger_potential',1,'23','closingdate','Expected Close Date',1,0,0,100,5,1,1,'D~M',0,3,'BAS')");	
- $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'potentialtype','vtiger_potential',1,'15','opportunity_type','Type',1,0,0,100,6,1,1,'V~O',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'nextstep','vtiger_potential',1,'1','nextstep','Next Step',1,0,0,100,7,1,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'leadsource','vtiger_potential',1,'15','leadsource','Lead Source',1,0,0,100,8,1,1,'V~O',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'sales_stage','vtiger_potential',1,'16','sales_stage','Sales Stage',1,0,0,100,9,1,1,'V~O',0,4,'BAS')");
- $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,10,1,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'probability','vtiger_potential',1,'9','probability','Probability',1,0,0,100,11,1,1,'N~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'campaignid','vtiger_potential',1,'58','campaignid','Campaign Source',1,0,0,100,12,1,1,'N~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,13,1,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,14,1,2,'T~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("vtiger_field").",'potentialname','vtiger_potential',1,'2','potentialname','Potential Name',1,0,0,100,1,1,1,'V~M',0,1,'BAS')");	
+ $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("vtiger_field").",'amount','vtiger_potential',1,71,'amount','Amount',1,0,0,100,2,1,1,'N~O',0,5,'BAS')");	
+ $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("vtiger_field").",'accountid','vtiger_potential',1,'50','account_id','Account Name',1,0,0,100,3,1,1,'V~M',0,2,'BAS')");	
+ $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("vtiger_field").",'closingdate','vtiger_potential',1,'23','closingdate','Expected Close Date',1,0,0,100,5,1,1,'D~M',0,3,'BAS')");	
+ $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("vtiger_field").",'potentialtype','vtiger_potential',1,'15','opportunity_type','Type',1,0,0,100,6,1,1,'V~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("vtiger_field").",'nextstep','vtiger_potential',1,'1','nextstep','Next Step',1,0,0,100,7,1,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("vtiger_field").",'leadsource','vtiger_potential',1,'15','leadsource','Lead Source',1,0,0,100,8,1,1,'V~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("vtiger_field").",'sales_stage','vtiger_potential',1,'16','sales_stage','Sales Stage',1,0,0,100,9,1,1,'V~O',0,4,'BAS')");
+ $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("vtiger_field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,10,1,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("vtiger_field").",'probability','vtiger_potential',1,'9','probability','Probability',1,0,0,100,11,1,1,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("vtiger_field").",'campaignid','vtiger_potential',1,'58','campaignid','Campaign Source',1,0,0,100,12,1,1,'N~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("vtiger_field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,13,1,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("vtiger_field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,14,1,2,'T~O',1,null,'BAS')");
 
 //Block1 -- End
 
 //Block3 -- Start
 
- $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,3,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (2,".$this->db->getUniqueID("vtiger_field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,3,1,'V~O',1,null,'BAS')");
 
 //Block3 -- End
 //Potential Details -- END
@@ -362,31 +362,31 @@
 //campaign entries being added
 
 
- $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'campaignname','vtiger_campaign',1,'2','campaignname','Campaign Name',1,0,0,100,1,76,1,'V~M',0,1,'BAS')");
- $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'campaigntype','vtiger_campaign',1,15,'campaigntype','Campaign Type',1,0,0,100,2,76,1,'V~O',0,5,'BAS')");
- $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'product_id','vtiger_campaign',1,59,'product_id','Product',1,0,0,100,3,76,1,'I~O',0,5,'BAS')");
- $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'campaignstatus','vtiger_campaign',1,15,'campaignstatus','Campaign Status',1,0,0,100,4,76,1,'V~O',0,5,'BAS')");
- $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'closingdate','vtiger_campaign',1,'23','closingdate','Expected Close Date',1,0,0,100,5,76,1,'D~M',0,3,'BAS')");
- $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'expectedrevenue','vtiger_campaign',1,'1','expectedrevenue','Expected Revenue',1,0,0,100,6,76,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'budgetcost','vtiger_campaign',1,'1','budgetcost','Budget Cost',1,0,0,100,7,76,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'actualcost','vtiger_campaign',1,'1','actualcost','Actual Cost',1,0,0,100,8,76,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'expectedresponse','vtiger_campaign',1,'15','expectedresponse','Expected Response',1,0,0,100,9,76,1,'V~O',0,4,'BAS')");
- $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'smownerid','vtiger_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 vtiger_field values (26,".$this->db->getUniqueID("field").",'numsent','vtiger_campaign',1,'9','numsent','Num Sent',1,0,0,100,11,76,1,'N~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'sponsor','vtiger_campaign',1,'1','sponsor','Sponsor',1,0,0,100,12,76,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'targetaudience','vtiger_campaign',1,'1','targetaudience','Target Audience',1,0,0,100,13,76,1,'V~O',1,null,'BAS')");
-
-$this->db->query("insert into vtiger_field values(26,".$this->db->getUniqueID("field").",'targetsize','vtiger_campaign',1,'1','targetsize','TargetSize',1,0,0,100,14,76,1,'N~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values(26,".$this->db->getUniqueID("field").",'expectedresponsecount','vtiger_campaign',1,'1','expectedresponsecount','Expected Response Count',1,0,0,100,17,76,1,'N~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values(26,".$this->db->getUniqueID("field").",'expectedsalescount','vtiger_campaign',1,'1','expectedsalescount','Expected Sales Count',1,0,0,100,15,76,1,'N~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values(26,".$this->db->getUniqueID("field").",'expectedroi','vtiger_campaign',1,'1','expectedroi','Expected ROI',1,0,0,100,19,76,1,'N~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values(26,".$this->db->getUniqueID("field").",'actualresponsecount','vtiger_campaign',1,'1','actualresponsecount','Actual Response Count',1,0,0,100,18,76,1,'N~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values(26,".$this->db->getUniqueID("field").",'actualsalescount','vtiger_campaign',1,'1','actualsalescount','Actual Sales Count',1,0,0,100,16,76,1,'N~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values(26,".$this->db->getUniqueID("field").",'actualroi','vtiger_campaign',1,'1','actualroi','Actual ROI',1,0,0,100,20,76,1,'N~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,15,76,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,16,76,2,'T~O',1,null,'BAS')");
-
-$this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,78,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("vtiger_field").",'campaignname','vtiger_campaign',1,'2','campaignname','Campaign Name',1,0,0,100,1,76,1,'V~M',0,1,'BAS')");
+ $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("vtiger_field").",'campaigntype','vtiger_campaign',1,15,'campaigntype','Campaign Type',1,0,0,100,2,76,1,'V~O',0,5,'BAS')");
+ $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("vtiger_field").",'product_id','vtiger_campaign',1,59,'product_id','Product',1,0,0,100,3,76,1,'I~O',0,5,'BAS')");
+ $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("vtiger_field").",'campaignstatus','vtiger_campaign',1,15,'campaignstatus','Campaign Status',1,0,0,100,4,76,1,'V~O',0,5,'BAS')");
+ $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("vtiger_field").",'closingdate','vtiger_campaign',1,'23','closingdate','Expected Close Date',1,0,0,100,5,76,1,'D~M',0,3,'BAS')");
+ $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("vtiger_field").",'expectedrevenue','vtiger_campaign',1,'1','expectedrevenue','Expected Revenue',1,0,0,100,6,76,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("vtiger_field").",'budgetcost','vtiger_campaign',1,'1','budgetcost','Budget Cost',1,0,0,100,7,76,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("vtiger_field").",'actualcost','vtiger_campaign',1,'1','actualcost','Actual Cost',1,0,0,100,8,76,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("vtiger_field").",'expectedresponse','vtiger_campaign',1,'15','expectedresponse','Expected Response',1,0,0,100,9,76,1,'V~O',0,4,'BAS')");
+ $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("vtiger_field").",'smownerid','vtiger_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 vtiger_field values (26,".$this->db->getUniqueID("vtiger_field").",'numsent','vtiger_campaign',1,'9','numsent','Num Sent',1,0,0,100,11,76,1,'N~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("vtiger_field").",'sponsor','vtiger_campaign',1,'1','sponsor','Sponsor',1,0,0,100,12,76,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("vtiger_field").",'targetaudience','vtiger_campaign',1,'1','targetaudience','Target Audience',1,0,0,100,13,76,1,'V~O',1,null,'BAS')");
+
+$this->db->query("insert into vtiger_field values(26,".$this->db->getUniqueID("vtiger_field").",'targetsize','vtiger_campaign',1,'1','targetsize','TargetSize',1,0,0,100,14,76,1,'N~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values(26,".$this->db->getUniqueID("vtiger_field").",'expectedresponsecount','vtiger_campaign',1,'1','expectedresponsecount','Expected Response Count',1,0,0,100,17,76,1,'N~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values(26,".$this->db->getUniqueID("vtiger_field").",'expectedsalescount','vtiger_campaign',1,'1','expectedsalescount','Expected Sales Count',1,0,0,100,15,76,1,'N~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values(26,".$this->db->getUniqueID("vtiger_field").",'expectedroi','vtiger_campaign',1,'1','expectedroi','Expected ROI',1,0,0,100,19,76,1,'N~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values(26,".$this->db->getUniqueID("vtiger_field").",'actualresponsecount','vtiger_campaign',1,'1','actualresponsecount','Actual Response Count',1,0,0,100,18,76,1,'N~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values(26,".$this->db->getUniqueID("vtiger_field").",'actualsalescount','vtiger_campaign',1,'1','actualsalescount','Actual Sales Count',1,0,0,100,16,76,1,'N~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values(26,".$this->db->getUniqueID("vtiger_field").",'actualroi','vtiger_campaign',1,'1','actualroi','Actual ROI',1,0,0,100,20,76,1,'N~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("vtiger_field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,15,76,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("vtiger_field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,16,76,2,'T~O',1,null,'BAS')");
+
+$this->db->query("insert into vtiger_field values (26,".$this->db->getUniqueID("vtiger_field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,78,1,'V~O',1,null,'BAS')");
 
 //Campaign entries end
 
@@ -394,23 +394,23 @@
 //Ticket Details -- START
 //Block25 -- Start
 
- $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,2,25,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'parent_id','vtiger_troubletickets',1,'68','parent_id','Related To',1,0,0,100,4,25,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'priority','vtiger_troubletickets',1,'15','ticketpriorities','Priority',1,0,0,100,5,25,1,'V~O',0,3,'BAS')");
- $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'product_id','vtiger_troubletickets',1,'59','product_id','Product Name',1,0,0,100,6,25,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'severity','vtiger_troubletickets',1,'15','ticketseverities','Severity',1,0,0,100,7,25,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'status','vtiger_troubletickets',1,'15','ticketstatus','Status',1,0,0,100,8,25,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'category','vtiger_troubletickets',1,'15','ticketcategories','Category',1,0,0,100,9,25,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'update_log','vtiger_troubletickets',1,'15','update_log','Update History',1,0,0,100,9,25,3,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,10,25,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,11,25,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("vtiger_field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,2,25,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("vtiger_field").",'parent_id','vtiger_troubletickets',1,'68','parent_id','Related To',1,0,0,100,4,25,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("vtiger_field").",'priority','vtiger_troubletickets',1,'15','ticketpriorities','Priority',1,0,0,100,5,25,1,'V~O',0,3,'BAS')");
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("vtiger_field").",'product_id','vtiger_troubletickets',1,'59','product_id','Product Name',1,0,0,100,6,25,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("vtiger_field").",'severity','vtiger_troubletickets',1,'15','ticketseverities','Severity',1,0,0,100,7,25,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("vtiger_field").",'status','vtiger_troubletickets',1,'15','ticketstatus','Status',1,0,0,100,8,25,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("vtiger_field").",'category','vtiger_troubletickets',1,'15','ticketcategories','Category',1,0,0,100,9,25,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("vtiger_field").",'update_log','vtiger_troubletickets',1,'15','update_log','Update History',1,0,0,100,9,25,3,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("vtiger_field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,10,25,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("vtiger_field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,11,25,2,'T~O',1,null,'BAS')");
  //Added on 26-12-2005 to add attachment in ticket editview
- $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'filename','vtiger_attachments',1,'61','filename','Attachment',1,0,0,100,12,26,1,'V~O',0,1,'BAS')");
-
- $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'title','vtiger_troubletickets',1,'22','ticket_title','Title',1,0,0,100,1,26,1,'V~M',0,1,'BAS')");
- $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'description','vtiger_troubletickets',1,'19','description','Description',1,0,0,100,1,28,1,'V~O',0,2,'BAS')");
- $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'solution','vtiger_troubletickets',1,'19','solution','Solution',1,0,0,100,1,29,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("field").",'comments','vtiger_ticketcomments',1,'19','comments','Add Comment',1,0,0,100,1,30,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("vtiger_field").",'filename','vtiger_attachments',1,'61','filename','Attachment',1,0,0,100,12,26,1,'V~O',0,1,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("vtiger_field").",'title','vtiger_troubletickets',1,'22','ticket_title','Title',1,0,0,100,1,26,1,'V~M',0,1,'BAS')");
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("vtiger_field").",'description','vtiger_troubletickets',1,'19','description','Description',1,0,0,100,1,28,1,'V~O',0,2,'BAS')");
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("vtiger_field").",'solution','vtiger_troubletickets',1,'19','solution','Solution',1,0,0,100,1,29,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (13,".$this->db->getUniqueID("vtiger_field").",'comments','vtiger_ticketcomments',1,'19','comments','Add Comment',1,0,0,100,1,30,1,'V~O',1,null,'BAS')");
 
 //Block25-30 -- End
 //Ticket Details -- END
@@ -418,68 +418,68 @@
 //Product Details -- START
 //Block31-36 -- Start
 
-$this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'productname','vtiger_products',1,'2','productname','Product Name',1,0,0,100,1,31,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'productcode','vtiger_products',1,'1','productcode','Product Code',1,0,0,100,2,31,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'discontinued','vtiger_products',1,'56','discontinued','Product Active',1,0,0,100,3,31,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'manufacturer','vtiger_products',1,'15','manufacturer','Manufacturer',1,0,0,100,4,1,31,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'productcategory','vtiger_products',1,'15','productcategory','Product Category',1,0,0,100,4,31,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'sales_start_date','vtiger_products',1,'5','sales_start_date','Sales Start Date',1,0,0,100,5,31,1,'D~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'sales_end_date','vtiger_products',1,'5','sales_end_date','Sales End Date',1,0,0,100,6,31,1,'D~O~OTH~GE~sales_start_date~Sales Start Date',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'start_date','vtiger_products',1,'5','start_date','Support Start Date',1,0,0,100,7,31,1,'D~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'expiry_date','vtiger_products',1,'5','expiry_date','Support Expiry Date',1,0,0,100,8,31,1,'D~O~OTH~GE~start_date~Start Date',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'productname','vtiger_products',1,'2','productname','Product Name',1,0,0,100,1,31,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'productcode','vtiger_products',1,'1','productcode','Product Code',1,0,0,100,2,31,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'discontinued','vtiger_products',1,'56','discontinued','Product Active',1,0,0,100,3,31,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'manufacturer','vtiger_products',1,'15','manufacturer','Manufacturer',1,0,0,100,4,1,31,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'productcategory','vtiger_products',1,'15','productcategory','Product Category',1,0,0,100,4,31,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'sales_start_date','vtiger_products',1,'5','sales_start_date','Sales Start Date',1,0,0,100,5,31,1,'D~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'sales_end_date','vtiger_products',1,'5','sales_end_date','Sales End Date',1,0,0,100,6,31,1,'D~O~OTH~GE~sales_start_date~Sales Start Date',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'start_date','vtiger_products',1,'5','start_date','Support Start Date',1,0,0,100,7,31,1,'D~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'expiry_date','vtiger_products',1,'5','expiry_date','Support Expiry Date',1,0,0,100,8,31,1,'D~O~OTH~GE~start_date~Start Date',1,null,'BAS')");
  
 
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'crmid','vtiger_seproductsrel',1,'66','parent_id','Related To',1,0,0,100,10,31,1,'I~O',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'contactid','vtiger_products',1,'57','contact_id','Contact Name',1,0,0,100,11,31,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'website','vtiger_products',1,'17','website','Website',1,0,0,100,12,31,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'vendor_id','vtiger_products',1,'75','vendor_id','Vendor Name',1,0,0,100,13,31,1,'I~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'mfr_part_no','vtiger_products',1,'1','mfr_part_no','Mfr PartNo',1,0,0,100,14,31,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'vendor_part_no','vtiger_products',1,'1','vendor_part_no','Vendor PartNo',1,0,0,100,15,31,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'serialno','vtiger_products',1,'1','serial_no','Serial No',1,0,0,100,16,31,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'productsheet','vtiger_products',1,'1','productsheet','Product Sheet',1,0,0,100,17,31,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'glacct','vtiger_products',1,'15','glacct','GL Account',1,0,0,100,18,31,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,19,31,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,20,31,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'crmid','vtiger_seproductsrel',1,'66','parent_id','Related To',1,0,0,100,10,31,1,'I~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'contactid','vtiger_products',1,'57','contact_id','Contact Name',1,0,0,100,11,31,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'website','vtiger_products',1,'17','website','Website',1,0,0,100,12,31,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'vendor_id','vtiger_products',1,'75','vendor_id','Vendor Name',1,0,0,100,13,31,1,'I~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'mfr_part_no','vtiger_products',1,'1','mfr_part_no','Mfr PartNo',1,0,0,100,14,31,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'vendor_part_no','vtiger_products',1,'1','vendor_part_no','Vendor PartNo',1,0,0,100,15,31,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'serialno','vtiger_products',1,'1','serial_no','Serial No',1,0,0,100,16,31,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'productsheet','vtiger_products',1,'1','productsheet','Product Sheet',1,0,0,100,17,31,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'glacct','vtiger_products',1,'15','glacct','GL Account',1,0,0,100,18,31,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,19,31,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,20,31,2,'T~O',1,null,'BAS')");
 
 
 //Block32 Pricing Information
 
-$this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'unit_price','vtiger_products',1,'71','unit_price','Unit Price',1,0,0,100,1,32,1,'N~O',1,null,'BAS')"); 
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'commissionrate','vtiger_products',1,'9','commissionrate','Commission Rate',1,0,0,100,2,32,1,'N~O',1,null,'BAS')"); 
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'taxclass','vtiger_producttaxrel',1,'83','taxclass','Tax Class',1,0,0,100,4,32,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'unit_price','vtiger_products',1,'71','unit_price','Unit Price',1,0,0,100,1,32,1,'N~O',1,null,'BAS')"); 
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'commissionrate','vtiger_products',1,'9','commissionrate','Commission Rate',1,0,0,100,2,32,1,'N~O',1,null,'BAS')"); 
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'taxclass','vtiger_producttaxrel',1,'83','taxclass','Tax Class',1,0,0,100,4,32,1,'V~O',1,null,'BAS')");
 
 
 //Block 33 stock info
 
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'usageunit','vtiger_products',1,'15','usageunit','Usage Unit',1,0,0,100,1,33,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'qty_per_unit','vtiger_products',1,'1','qty_per_unit','Qty/Unit',1,0,0,100,2,33,1,'N~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'qtyinstock','vtiger_products',1,'1','qtyinstock','Qty In Stock',1,0,0,100,3,33,1,'I~O',1,null,'ADV')");
-$this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'reorderlevel','vtiger_products',1,'1','reorderlevel','Reorder Level',1,0,0,100,4,33,1,'I~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'handler','vtiger_products',1,'52','assigned_user_id','Handler',1,0,0,100,5,33,1,'I~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'qtyindemand','vtiger_products',1,'1','qtyindemand','Qty In Demand',1,0,0,100,6,33,1,'I~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'usageunit','vtiger_products',1,'15','usageunit','Usage Unit',1,0,0,100,1,33,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'qty_per_unit','vtiger_products',1,'1','qty_per_unit','Qty/Unit',1,0,0,100,2,33,1,'N~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'qtyinstock','vtiger_products',1,'1','qtyinstock','Qty In Stock',1,0,0,100,3,33,1,'I~O',1,null,'ADV')");
+$this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'reorderlevel','vtiger_products',1,'1','reorderlevel','Reorder Level',1,0,0,100,4,33,1,'I~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'handler','vtiger_products',1,'52','assigned_user_id','Handler',1,0,0,100,5,33,1,'I~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'qtyindemand','vtiger_products',1,'1','qtyindemand','Qty In Demand',1,0,0,100,6,33,1,'I~O',1,null,'ADV')");
 
 
 //ProductImageInformation
 
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'imagename','vtiger_products',1,'69','imagename','Product Image',1,0,0,100,1,35,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'imagename','vtiger_products',1,'69','imagename','Product Image',1,0,0,100,1,35,1,'V~O',1,null,'ADV')");
 
 
 //Block 36 Description Info
- $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("field").",'product_description','vtiger_products',1,'19','product_description','Description',1,0,0,100,1,36,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (14,".$this->db->getUniqueID("vtiger_field").",'product_description','vtiger_products',1,'19','product_description','Description',1,0,0,100,1,36,1,'V~O',1,null,'BAS')");
 
 //Product Details -- END
 
 //Note Details -- START
 //Block17 -- Start
 
-$this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("field").",'contact_id','vtiger_notes',1,'57','contact_id','Contact Name',1,0,0,100,1,17,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("field").",'crmid','vtiger_senotesrel',1,'62','parent_id','Related To',1,0,0,100,2,17,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("field").",'title','vtiger_notes',1,'2','notes_title','Subject',1,0,0,100,3,17,1,'V~M',0,1,'BAS')");
-$this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,4,17,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,5,17,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("field").",'filename','vtiger_notes',1,'61','filename','Attachment',1,0,0,100,4,17,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("field").",'notecontent','vtiger_notes',1,'19','notecontent','Note',1,0,0,100,5,18,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("vtiger_field").",'contact_id','vtiger_notes',1,'57','contact_id','Contact Name',1,0,0,100,1,17,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("vtiger_field").",'crmid','vtiger_senotesrel',1,'62','parent_id','Related To',1,0,0,100,2,17,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("vtiger_field").",'title','vtiger_notes',1,'2','notes_title','Subject',1,0,0,100,3,17,1,'V~M',0,1,'BAS')");
+$this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("vtiger_field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,4,17,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("vtiger_field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,5,17,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("vtiger_field").",'filename','vtiger_notes',1,'61','filename','Attachment',1,0,0,100,4,17,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (8,".$this->db->getUniqueID("vtiger_field").",'notecontent','vtiger_notes',1,'19','notecontent','Note',1,0,0,100,5,18,1,'V~O',1,null,'BAS')");
 
 //Block17 -- End
 //Note Details -- END
@@ -487,92 +487,92 @@
 //Email Details -- START
 //Block21 -- Start
 
-	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'date_start','vtiger_activity',1,'6','date_start','Date & Time Sent',1,0,0,100,1,21,1,'DT~M~time_start~Time Start',1,null,'BAS')");
-	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'semodule','vtiger_activity',1,'2','parent_type','Sales Enity Module',1,0,0,100,2,21,3,'',1,null,'BAS')");
-	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'activitytype','vtiger_activity',1,'2','activitytype','Activtiy Type',1,0,0,100,3,21,3,'V~O',1,null,'BAS')");
-	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'crmid','vtiger_seactivityrel',1,'357','parent_id','Related To',1,0,0,100,1,22,1,'I~O',1,null,'BAS')");
-	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,5,21,1,'V~M',1,null,'BAS')");
-	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'subject','vtiger_activity',1,'2','subject','Subject',1,0,0,100,1,23,1,'V~M',1,null,'BAS')");
-	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'filename','vtiger_attachments',1,'61','filename','Attachment',1,0,0,100,2,23,1,'V~O',1,null,'BAS')");
-	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,24,1,'V~O',1,null,'BAS')");
-	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'time_start','vtiger_activity',1,'2','time_start','Time Start',1,0,0,100,9,1,23,'T~O',1,null,'BAS')");
-	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,10,1,22,'T~O',1,null,'BAS')");
- 	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,11,21,2,'T~O',1,null,'BAS')");
+	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("vtiger_field").",'date_start','vtiger_activity',1,'6','date_start','Date & Time Sent',1,0,0,100,1,21,1,'DT~M~time_start~Time Start',1,null,'BAS')");
+	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("vtiger_field").",'semodule','vtiger_activity',1,'2','parent_type','Sales Enity Module',1,0,0,100,2,21,3,'',1,null,'BAS')");
+	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("vtiger_field").",'activitytype','vtiger_activity',1,'2','activitytype','Activtiy Type',1,0,0,100,3,21,3,'V~O',1,null,'BAS')");
+	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("vtiger_field").",'crmid','vtiger_seactivityrel',1,'357','parent_id','Related To',1,0,0,100,1,22,1,'I~O',1,null,'BAS')");
+	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("vtiger_field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,5,21,1,'V~M',1,null,'BAS')");
+	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("vtiger_field").",'subject','vtiger_activity',1,'2','subject','Subject',1,0,0,100,1,23,1,'V~M',1,null,'BAS')");
+	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("vtiger_field").",'filename','vtiger_attachments',1,'61','filename','Attachment',1,0,0,100,2,23,1,'V~O',1,null,'BAS')");
+	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("vtiger_field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,24,1,'V~O',1,null,'BAS')");
+	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("vtiger_field").",'time_start','vtiger_activity',1,'2','time_start','Time Start',1,0,0,100,9,1,23,'T~O',1,null,'BAS')");
+	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("vtiger_field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,10,1,22,'T~O',1,null,'BAS')");
+ 	$this->db->query("insert into vtiger_field values (10,".$this->db->getUniqueID("vtiger_field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,11,21,2,'T~O',1,null,'BAS')");
 
 //Block21 -- End
 //Email Details -- END
 
 //Task Details --START
 //Block19 -- Start
-$this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'subject','vtiger_activity',1,'2','subject','Subject',1,0,0,100,1,19,1,'V~M',0,1,'BAS')");
- $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,2,19,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'date_start','vtiger_activity',1,'6','date_start','Start Date & Time',1,0,0,100,3,19,1,'DT~M~time_start',0,2,'BAS')");
- $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'time_start','vtiger_activity',1,'2','time_start','Time Start',1,0,0,100,4,19,3,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'due_date','vtiger_activity',1,'23','due_date','Due Date',1,0,0,100,5,19,1,'D~M~OTH~GE~date_start~Start Date & Time',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'crmid','vtiger_seactivityrel',1,'66','parent_id','Related To',1,0,0,100,7,19,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'contactid','vtiger_cntactivityrel',1,'57','contact_id','Contact Name',1,0,0,100,8,19,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'status','vtiger_activity',1,'15','taskstatus','Status',1,0,0,100,9,19,1,'V~O',0,3,'BAS')");
- $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'eventstatus','vtiger_activity',1,'15','eventstatus','Status',1,0,0,100,9,19,3,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'priority','vtiger_activity',1,'15','taskpriority','Priority',1,0,0,100,10,19,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'sendnotification','vtiger_activity',1,'56','sendnotification','Send Notification',1,0,0,100,11,19,1,'C~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,14,19,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,15,19,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'activitytype','vtiger_activity',1,'15','activitytype','Activity Type',1,0,0,100,16,19,3,'V~O',1,null,'BAS')");
- $this->db->query("Insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'visibility','vtiger_activity',1,15,'visibility','Visibility',1,0,0,100,17,19,3,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,20,1,'V~O',1,null,'BAS')");
-
-
-$this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'duration_hours','vtiger_activity',1,'63','duration_hours','Duration',1,0,0,100,17,19,3,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'duration_minutes','vtiger_activity',1,'15','duration_minutes','Duration Minutes',1,0,0,100,18,19,3,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'location','vtiger_activity',1,'1','location','Location',1,0,0,100,19,19,3,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'reminder_time','vtiger_activity_reminder',1,'30','reminder_time','Send Reminder',1,0,0,100,1,19,3,'I~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("vtiger_field").",'subject','vtiger_activity',1,'2','subject','Subject',1,0,0,100,1,19,1,'V~M',0,1,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("vtiger_field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,2,19,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("vtiger_field").",'date_start','vtiger_activity',1,'6','date_start','Start Date & Time',1,0,0,100,3,19,1,'DT~M~time_start',0,2,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("vtiger_field").",'time_start','vtiger_activity',1,'2','time_start','Time Start',1,0,0,100,4,19,3,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("vtiger_field").",'due_date','vtiger_activity',1,'23','due_date','Due Date',1,0,0,100,5,19,1,'D~M~OTH~GE~date_start~Start Date & Time',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("vtiger_field").",'crmid','vtiger_seactivityrel',1,'66','parent_id','Related To',1,0,0,100,7,19,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("vtiger_field").",'contactid','vtiger_cntactivityrel',1,'57','contact_id','Contact Name',1,0,0,100,8,19,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("vtiger_field").",'status','vtiger_activity',1,'15','taskstatus','Status',1,0,0,100,9,19,1,'V~O',0,3,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("vtiger_field").",'eventstatus','vtiger_activity',1,'15','eventstatus','Status',1,0,0,100,9,19,3,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("vtiger_field").",'priority','vtiger_activity',1,'15','taskpriority','Priority',1,0,0,100,10,19,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("vtiger_field").",'sendnotification','vtiger_activity',1,'56','sendnotification','Send Notification',1,0,0,100,11,19,1,'C~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("vtiger_field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,14,19,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("vtiger_field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,15,19,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("vtiger_field").",'activitytype','vtiger_activity',1,'15','activitytype','Activity Type',1,0,0,100,16,19,3,'V~O',1,null,'BAS')");
+ $this->db->query("Insert into vtiger_field values (9,".$this->db->getUniqueID("vtiger_field").",'visibility','vtiger_activity',1,15,'visibility','Visibility',1,0,0,100,17,19,3,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("vtiger_field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,20,1,'V~O',1,null,'BAS')");
+
+
+$this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("vtiger_field").",'duration_hours','vtiger_activity',1,'63','duration_hours','Duration',1,0,0,100,17,19,3,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("vtiger_field").",'duration_minutes','vtiger_activity',1,'15','duration_minutes','Duration Minutes',1,0,0,100,18,19,3,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("vtiger_field").",'location','vtiger_activity',1,'1','location','Location',1,0,0,100,19,19,3,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("vtiger_field").",'reminder_time','vtiger_activity_reminder',1,'30','reminder_time','Send Reminder',1,0,0,100,1,19,3,'I~O',1,null,'BAS')");
  
- $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'recurringtype','vtiger_recurringevents',1,'15','recurringtype','Recurrence',1,0,0,100,6,19,3,'O~O',1,null,'BAS')");
-
- $this->db->query("Insert into vtiger_field values (9,".$this->db->getUniqueID("field").",'notime','vtiger_activity',1,56,'notime','No Time',1,0,0,100,20,19,3,'C~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (9,".$this->db->getUniqueID("vtiger_field").",'recurringtype','vtiger_recurringevents',1,'15','recurringtype','Recurrence',1,0,0,100,6,19,3,'O~O',1,null,'BAS')");
+
+ $this->db->query("Insert into vtiger_field values (9,".$this->db->getUniqueID("vtiger_field").",'notime','vtiger_activity',1,56,'notime','No Time',1,0,0,100,20,19,3,'C~O',1,null,'BAS')");
 //Block19 -- End
 //Task Details -- END
 
 //Event Details --START
 //Block41-43-- Start
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'subject','vtiger_activity',1,'2','subject','Subject',1,0,0,100,1,41,1,'V~M',0,1,'BAS')");
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,2,41,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'date_start','vtiger_activity',1,'6','date_start','Start Date & Time',1,0,0,100,3,41,1,'DT~M~time_start',0,2,'BAS')");
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'time_start','vtiger_activity',1,'2','time_start','Time Start',1,0,0,100,4,41,3,'T~M',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'due_date','vtiger_activity',1,'23','due_date','End Date',1,0,0,100,5,41,1,'D~M~OTH~GE~date_start~Start Date & Time',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'recurringtype','vtiger_recurringevents',1,'15','recurringtype','Recurrence',1,0,0,100,6,41,1,'O~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("vtiger_field").",'subject','vtiger_activity',1,'2','subject','Subject',1,0,0,100,1,41,1,'V~M',0,1,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("vtiger_field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,2,41,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("vtiger_field").",'date_start','vtiger_activity',1,'6','date_start','Start Date & Time',1,0,0,100,3,41,1,'DT~M~time_start',0,2,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("vtiger_field").",'time_start','vtiger_activity',1,'2','time_start','Time Start',1,0,0,100,4,41,3,'T~M',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("vtiger_field").",'due_date','vtiger_activity',1,'23','due_date','End Date',1,0,0,100,5,41,1,'D~M~OTH~GE~date_start~Start Date & Time',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("vtiger_field").",'recurringtype','vtiger_recurringevents',1,'15','recurringtype','Recurrence',1,0,0,100,6,41,1,'O~O',1,null,'BAS')");
   
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'duration_hours','vtiger_activity',1,'63','duration_hours','Duration',1,0,0,100,7,41,1,'I~M',0,5,'BAS')");
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'duration_minutes','vtiger_activity',1,'15','duration_minutes','Duration Minutes',1,0,0,100,8,41,3,'O~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'crmid','vtiger_seactivityrel',1,'66','parent_id','Related To',1,0,0,100,9,41,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'eventstatus','vtiger_activity',1,'15','eventstatus','Status',1,0,0,100,10,41,1,'V~O',0,3,'BAS')");
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'sendnotification','vtiger_activity',1,'56','sendnotification','Send Notification',1,0,0,100,11,41,1,'C~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'activitytype','vtiger_activity',1,'15','activitytype','Activity Type',1,0,0,100,12,41,1,'V~O',0,4,'BAS')");
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'location','vtiger_activity',1,'1','location','Location',1,0,0,100,13,41,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,14,41,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,15,41,2,'T~O',1,null,'BAS')");
- $this->db->query("Insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'priority','vtiger_activity',1,15,'taskpriority','Priority',1,0,0,100,16,41,1,'V~O',1,null,'BAS')");
- $this->db->query("Insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'notime','vtiger_activity',1,56,'notime','No Time',1,0,0,100,17,41,1,'C~O',1,null,'BAS')");
- $this->db->query("Insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'visibility','vtiger_activity',1,15,'visibility','Visibility',1,0,0,100,18,41,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("vtiger_field").",'duration_hours','vtiger_activity',1,'63','duration_hours','Duration',1,0,0,100,7,41,1,'I~M',0,5,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("vtiger_field").",'duration_minutes','vtiger_activity',1,'15','duration_minutes','Duration Minutes',1,0,0,100,8,41,3,'O~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("vtiger_field").",'crmid','vtiger_seactivityrel',1,'66','parent_id','Related To',1,0,0,100,9,41,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("vtiger_field").",'eventstatus','vtiger_activity',1,'15','eventstatus','Status',1,0,0,100,10,41,1,'V~O',0,3,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("vtiger_field").",'sendnotification','vtiger_activity',1,'56','sendnotification','Send Notification',1,0,0,100,11,41,1,'C~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("vtiger_field").",'activitytype','vtiger_activity',1,'15','activitytype','Activity Type',1,0,0,100,12,41,1,'V~O',0,4,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("vtiger_field").",'location','vtiger_activity',1,'1','location','Location',1,0,0,100,13,41,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("vtiger_field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,14,41,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("vtiger_field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,15,41,2,'T~O',1,null,'BAS')");
+ $this->db->query("Insert into vtiger_field values (16,".$this->db->getUniqueID("vtiger_field").",'priority','vtiger_activity',1,15,'taskpriority','Priority',1,0,0,100,16,41,1,'V~O',1,null,'BAS')");
+ $this->db->query("Insert into vtiger_field values (16,".$this->db->getUniqueID("vtiger_field").",'notime','vtiger_activity',1,56,'notime','No Time',1,0,0,100,17,41,1,'C~O',1,null,'BAS')");
+ $this->db->query("Insert into vtiger_field values (16,".$this->db->getUniqueID("vtiger_field").",'visibility','vtiger_activity',1,15,'visibility','Visibility',1,0,0,100,18,41,1,'V~O',1,null,'BAS')");
  
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,43,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("field").",'reminder_time','vtiger_activity_reminder',1,'30','reminder_time','Send Reminder',1,0,0,100,1,42,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("vtiger_field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,43,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("vtiger_field").",'reminder_time','vtiger_activity_reminder',1,'30','reminder_time','Send Reminder',1,0,0,100,1,42,1,'I~O',1,null,'BAS')");
 //Block41-43 -- End
 //Event Details -- END
 
 //Faq Details -- START
 //Block37-40 -- Start
 
-$this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("field").",'product_id','vtiger_faq',1,'59','product_id','Product Name',1,0,0,100,1,37,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("field").",'category','vtiger_faq',1,'15','faqcategories','Category',1,0,0,100,2,37,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("field").",'status','vtiger_faq',1,'15','faqstatus','Status',1,0,0,100,3,37,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("field").",'question','vtiger_faq',1,'20','question','Question',1,0,0,100,1,38,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("field").",'answer','vtiger_faq',1,'20','faq_answer','Answer',1,0,0,100,1,39,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("field").",'comments','vtiger_faqcomments',1,'19','comments','Add Comment',1,0,0,100,1,40,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,3,37,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,4,37,2,'T~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("vtiger_field").",'product_id','vtiger_faq',1,'59','product_id','Product Name',1,0,0,100,1,37,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("vtiger_field").",'category','vtiger_faq',1,'15','faqcategories','Category',1,0,0,100,2,37,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("vtiger_field").",'status','vtiger_faq',1,'15','faqstatus','Status',1,0,0,100,3,37,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("vtiger_field").",'question','vtiger_faq',1,'20','question','Question',1,0,0,100,1,38,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("vtiger_field").",'answer','vtiger_faq',1,'20','faq_answer','Answer',1,0,0,100,1,39,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("vtiger_field").",'comments','vtiger_faqcomments',1,'19','comments','Add Comment',1,0,0,100,1,40,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("vtiger_field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,3,37,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (15,".$this->db->getUniqueID("vtiger_field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,4,37,2,'T~O',1,null,'BAS')");
 
 
 //Block37-40 -- End
@@ -581,41 +581,41 @@
 //Vendor Details --START
 //Block44-47
 
-$this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'vendorname','vtiger_vendor',1,'2','vendorname','Vendor Name',1,0,0,100,1,44,1,'V~M',0,1,'BAS')");
- $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'phone','vtiger_vendor',1,'1','phone','Phone',1,0,0,100,3,44,1,'V~O',0,2,'BAS')");
- $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'email','vtiger_vendor',1,'13','email','Email',1,0,0,100,4,44,1,'E~O',0,3,'BAS')");
- $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'website','vtiger_vendor',1,'17','website','Website',1,0,0,100,5,44,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'glacct','vtiger_vendor',1,'15','glacct','GL Account',1,0,0,100,6,44,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'category','vtiger_vendor',1,'1','category','Category',1,0,0,100,7,44,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,8,44,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,9,44,2,'T~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("vtiger_field").",'vendorname','vtiger_vendor',1,'2','vendorname','Vendor Name',1,0,0,100,1,44,1,'V~M',0,1,'BAS')");
+ $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("vtiger_field").",'phone','vtiger_vendor',1,'1','phone','Phone',1,0,0,100,3,44,1,'V~O',0,2,'BAS')");
+ $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("vtiger_field").",'email','vtiger_vendor',1,'13','email','Email',1,0,0,100,4,44,1,'E~O',0,3,'BAS')");
+ $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("vtiger_field").",'website','vtiger_vendor',1,'17','website','Website',1,0,0,100,5,44,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("vtiger_field").",'glacct','vtiger_vendor',1,'15','glacct','GL Account',1,0,0,100,6,44,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("vtiger_field").",'category','vtiger_vendor',1,'1','category','Category',1,0,0,100,7,44,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("vtiger_field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,8,44,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("vtiger_field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,9,44,2,'T~O',1,null,'BAS')");
 
 //Block 46
 
-$this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'street','vtiger_vendor',1,'21','street','Street',1,0,0,100,1,46,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'pobox','vtiger_vendor',1,'1','pobox','Po Box',1,0,0,100,2,46,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'city','vtiger_vendor',1,'1','city','City',1,0,0,100,3,46,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'state','vtiger_vendor',1,'1','state','State',1,0,0,100,4,46,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'postalcode','vtiger_vendor',1,'1','postalcode','Postal Code',1,0,0,100,5,46,1,'V~O',1,null,'ADV')");
- $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'country','vtiger_vendor',1,'1','country','Country',1,0,0,100,6,46,1,'V~O',1,null,'ADV')");
+$this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("vtiger_field").",'street','vtiger_vendor',1,'21','street','Street',1,0,0,100,1,46,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("vtiger_field").",'pobox','vtiger_vendor',1,'1','pobox','Po Box',1,0,0,100,2,46,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("vtiger_field").",'city','vtiger_vendor',1,'1','city','City',1,0,0,100,3,46,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("vtiger_field").",'state','vtiger_vendor',1,'1','state','State',1,0,0,100,4,46,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("vtiger_field").",'postalcode','vtiger_vendor',1,'1','postalcode','Postal Code',1,0,0,100,5,46,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("vtiger_field").",'country','vtiger_vendor',1,'1','country','Country',1,0,0,100,6,46,1,'V~O',1,null,'ADV')");
 
 //Block 47
 
-$this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,47,1,'V~O',1,null,'ADV')");
+$this->db->query("insert into vtiger_field values (18,".$this->db->getUniqueID("vtiger_field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,47,1,'V~O',1,null,'ADV')");
 
 //Vendor Details -- END
 
 //PriceBook Details Start
 //Block48
 
-$this->db->query("insert into vtiger_field values (19,".$this->db->getUniqueID("field").",'bookname','vtiger_pricebook',1,'2','bookname','Price Book Name',1,0,0,100,1,48,1,'V~M',0,1,'BAS')");
- $this->db->query("insert into vtiger_field values (19,".$this->db->getUniqueID("field").",'active','vtiger_pricebook',1,'56','active','Active',1,0,0,100,3,48,1,'V~O',0,2,'BAS')");
-$this->db->query("insert into vtiger_field values (19,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,4,48,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (19,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,5,48,2,'T~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (19,".$this->db->getUniqueID("vtiger_field").",'bookname','vtiger_pricebook',1,'2','bookname','Price Book Name',1,0,0,100,1,48,1,'V~M',0,1,'BAS')");
+ $this->db->query("insert into vtiger_field values (19,".$this->db->getUniqueID("vtiger_field").",'active','vtiger_pricebook',1,'56','active','Active',1,0,0,100,3,48,1,'V~O',0,2,'BAS')");
+$this->db->query("insert into vtiger_field values (19,".$this->db->getUniqueID("vtiger_field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,4,48,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (19,".$this->db->getUniqueID("vtiger_field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,5,48,2,'T~O',1,null,'BAS')");
 
 //Block50
 
-$this->db->query("insert into vtiger_field values (19,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,50,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (19,".$this->db->getUniqueID("vtiger_field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,50,1,'V~O',1,null,'BAS')");
 
 //PriceBook Details End
 
@@ -623,53 +623,53 @@
 //Quote Details -- START
  //Block51
 
-$this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'subject','vtiger_quotes',1,'2','subject','Subject',1,0,0,100,1,51,1,'V~M',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'potentialid','vtiger_quotes',1,'76','potential_id','Potential Name',1,0,0,100,2,51,1,'I~O',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'quotestage','vtiger_quotes',1,'15','quotestage','Quote Stage',1,0,0,100,3,51,1,'V~O',1,null,'BAS')");	
-
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'validtill','vtiger_quotes',1,'5','validtill','Valid Till',1,0,0,100,4,51,1,'D~O',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'team','vtiger_quotes',1,'1','team','Team',1,0,0,100,5,51,1,'V~O',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'contactid','vtiger_quotes',1,'57','contact_id','Contact Name',1,0,0,100,6,51,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'carrier','vtiger_quotes',1,'15','carrier','Carrier',1,0,0,100,8,51,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'subtotal','vtiger_quotes',1,'1','hdnSubTotal','Sub Total',1,0,0,100,9,51,3,'N~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'shipping','vtiger_quotes',1,'1','shipping','Shipping',1,0,0,100,10,51,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'inventorymanager','vtiger_quotes',1,'77','assigned_user_id1','Inventory Manager',1,0,0,100,11,51,1,'I~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'tax','vtiger_quotes',1,'1','txtTax','Tax',1,0,0,100,13,51,3,'N~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'adjustment','vtiger_quotes',1,'1','txtAdjustment','Adjustment',1,0,0,100,20,51,3,'NN~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'total','vtiger_quotes',1,'1','hdnGrandTotal','Total',1,0,0,100,14,51,3,'N~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'accountid','vtiger_quotes',1,'73','account_id','Account Name',1,0,0,100,16,51,1,'I~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,17,51,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,18,51,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,19,51,2,'T~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("vtiger_field").",'subject','vtiger_quotes',1,'2','subject','Subject',1,0,0,100,1,51,1,'V~M',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("vtiger_field").",'potentialid','vtiger_quotes',1,'76','potential_id','Potential Name',1,0,0,100,2,51,1,'I~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("vtiger_field").",'quotestage','vtiger_quotes',1,'15','quotestage','Quote Stage',1,0,0,100,3,51,1,'V~O',1,null,'BAS')");	
+
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("vtiger_field").",'validtill','vtiger_quotes',1,'5','validtill','Valid Till',1,0,0,100,4,51,1,'D~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("vtiger_field").",'team','vtiger_quotes',1,'1','team','Team',1,0,0,100,5,51,1,'V~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("vtiger_field").",'contactid','vtiger_quotes',1,'57','contact_id','Contact Name',1,0,0,100,6,51,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("vtiger_field").",'carrier','vtiger_quotes',1,'15','carrier','Carrier',1,0,0,100,8,51,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("vtiger_field").",'subtotal','vtiger_quotes',1,'1','hdnSubTotal','Sub Total',1,0,0,100,9,51,3,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("vtiger_field").",'shipping','vtiger_quotes',1,'1','shipping','Shipping',1,0,0,100,10,51,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("vtiger_field").",'inventorymanager','vtiger_quotes',1,'77','assigned_user_id1','Inventory Manager',1,0,0,100,11,51,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("vtiger_field").",'tax','vtiger_quotes',1,'1','txtTax','Tax',1,0,0,100,13,51,3,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("vtiger_field").",'adjustment','vtiger_quotes',1,'1','txtAdjustment','Adjustment',1,0,0,100,20,51,3,'NN~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("vtiger_field").",'total','vtiger_quotes',1,'1','hdnGrandTotal','Total',1,0,0,100,14,51,3,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("vtiger_field").",'accountid','vtiger_quotes',1,'73','account_id','Account Name',1,0,0,100,16,51,1,'I~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("vtiger_field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,17,51,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("vtiger_field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,18,51,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("vtiger_field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,19,51,2,'T~O',1,null,'BAS')");
 
 
  //Block 53
 
-$this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'bill_street','vtiger_quotesbillads',1,'24','bill_street','Billing Address',1,0,0,100,1,53,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'ship_street','vtiger_quotesshipads',1,'24','ship_street','Shipping Address',1,0,0,100,2,53,1,'V~M',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'bill_city','vtiger_quotesbillads',1,'1','bill_city','Billing City',1,0,0,100,5,53,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'ship_city','vtiger_quotesshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,53,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'bill_state','vtiger_quotesbillads',1,'1','bill_state','Billing State',1,0,0,100,7,53,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'ship_state','vtiger_quotesshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,53,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'bill_code','vtiger_quotesbillads',1,'1','bill_code','Billing Code',1,0,0,100,9,53,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'ship_code','vtiger_quotesshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,53,1,'V~O',1,null,'BAS')");
-
-
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'bill_country','vtiger_quotesbillads',1,'1','bill_country','Billing Country',1,0,0,100,11,53,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'ship_country','vtiger_quotesshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,53,1,'V~O',1,null,'BAS')");
-
-$this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'bill_pobox','vtiger_quotesbillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,53,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'ship_pobox','vtiger_quotesshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,53,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("vtiger_field").",'bill_street','vtiger_quotesbillads',1,'24','bill_street','Billing Address',1,0,0,100,1,53,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("vtiger_field").",'ship_street','vtiger_quotesshipads',1,'24','ship_street','Shipping Address',1,0,0,100,2,53,1,'V~M',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("vtiger_field").",'bill_city','vtiger_quotesbillads',1,'1','bill_city','Billing City',1,0,0,100,5,53,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("vtiger_field").",'ship_city','vtiger_quotesshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,53,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("vtiger_field").",'bill_state','vtiger_quotesbillads',1,'1','bill_state','Billing State',1,0,0,100,7,53,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("vtiger_field").",'ship_state','vtiger_quotesshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,53,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("vtiger_field").",'bill_code','vtiger_quotesbillads',1,'1','bill_code','Billing Code',1,0,0,100,9,53,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("vtiger_field").",'ship_code','vtiger_quotesshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,53,1,'V~O',1,null,'BAS')");
+
+
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("vtiger_field").",'bill_country','vtiger_quotesbillads',1,'1','bill_country','Billing Country',1,0,0,100,11,53,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("vtiger_field").",'ship_country','vtiger_quotesshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,53,1,'V~O',1,null,'BAS')");
+
+$this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("vtiger_field").",'bill_pobox','vtiger_quotesbillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,53,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("vtiger_field").",'ship_pobox','vtiger_quotesshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,53,1,'V~O',1,null,'BAS')");
  //Block55
 
-$this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,56,1,'V~O',1,null,'ADV')");
+$this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("vtiger_field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,56,1,'V~O',1,null,'ADV')");
 
 //Block 56
-$this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("field").",'terms_conditions','vtiger_quotes',1,'19','terms_conditions','Terms & Conditions',1,0,0,100,1,55,1,'V~O',1,null,'ADV')");
+$this->db->query("insert into vtiger_field values (20,".$this->db->getUniqueID("vtiger_field").",'terms_conditions','vtiger_quotes',1,'19','terms_conditions','Terms & Conditions',1,0,0,100,1,55,1,'V~O',1,null,'ADV')");
 
 
 //Quote Details -- END
@@ -677,109 +677,109 @@
 //Purchase Order Details -- START
  //Block57
  
-$this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'subject','vtiger_purchaseorder',1,'2','subject','Subject',1,0,0,100,1,57,1,'V~M',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'vendorid','vtiger_purchaseorder',1,'81','vendor_id','Vendor Name',1,0,0,100,3,57,1,'I~M',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'requisition_no','vtiger_purchaseorder',1,'1','requisition_no','Requisition No',1,0,0,100,4,57,1,'V~O',1,null,'BAS')");	
-
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'tracking_no','vtiger_purchaseorder',1,'1','tracking_no','Tracking Number',1,0,0,100,5,57,1,'V~O',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'contactid','vtiger_purchaseorder',1,'57','contact_id','Contact Name',1,0,0,100,6,57,1,'I~O',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'duedate','vtiger_purchaseorder',1,'5','duedate','Due Date',1,0,0,100,7,57,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'carrier','vtiger_purchaseorder',1,'15','carrier','Carrier',1,0,0,100,8,57,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'salestax','vtiger_purchaseorder',1,'1','txtTax','Sales Tax',1,0,0,100,10,57,3,'N~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'adjustment','vtiger_purchaseorder',1,'1','txtAdjustment','Adjustment',1,0,0,100,10,57,3,'NN~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'salescommission','vtiger_purchaseorder',1,'1','salescommission','Sales Commission',1,0,0,100,11,57,1,'N~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'exciseduty','vtiger_purchaseorder',1,'1','exciseduty','Excise Duty',1,0,0,100,12,57,1,'N~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'total','vtiger_purchaseorder',1,'1','hdnGrandTotal','Total',1,0,0,100,13,57,3,'N~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'subtotal','vtiger_purchaseorder',1,'1','hdnSubTotal','Sub Total',1,0,0,100,14,57,3,'N~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'postatus','vtiger_purchaseorder',1,'15','postatus','Status',1,0,0,100,15,57,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,16,57,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,17,57,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,18,57,2,'T~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("vtiger_field").",'subject','vtiger_purchaseorder',1,'2','subject','Subject',1,0,0,100,1,57,1,'V~M',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("vtiger_field").",'vendorid','vtiger_purchaseorder',1,'81','vendor_id','Vendor Name',1,0,0,100,3,57,1,'I~M',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("vtiger_field").",'requisition_no','vtiger_purchaseorder',1,'1','requisition_no','Requisition No',1,0,0,100,4,57,1,'V~O',1,null,'BAS')");	
+
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("vtiger_field").",'tracking_no','vtiger_purchaseorder',1,'1','tracking_no','Tracking Number',1,0,0,100,5,57,1,'V~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("vtiger_field").",'contactid','vtiger_purchaseorder',1,'57','contact_id','Contact Name',1,0,0,100,6,57,1,'I~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("vtiger_field").",'duedate','vtiger_purchaseorder',1,'5','duedate','Due Date',1,0,0,100,7,57,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("vtiger_field").",'carrier','vtiger_purchaseorder',1,'15','carrier','Carrier',1,0,0,100,8,57,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("vtiger_field").",'salestax','vtiger_purchaseorder',1,'1','txtTax','Sales Tax',1,0,0,100,10,57,3,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("vtiger_field").",'adjustment','vtiger_purchaseorder',1,'1','txtAdjustment','Adjustment',1,0,0,100,10,57,3,'NN~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("vtiger_field").",'salescommission','vtiger_purchaseorder',1,'1','salescommission','Sales Commission',1,0,0,100,11,57,1,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("vtiger_field").",'exciseduty','vtiger_purchaseorder',1,'1','exciseduty','Excise Duty',1,0,0,100,12,57,1,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("vtiger_field").",'total','vtiger_purchaseorder',1,'1','hdnGrandTotal','Total',1,0,0,100,13,57,3,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("vtiger_field").",'subtotal','vtiger_purchaseorder',1,'1','hdnSubTotal','Sub Total',1,0,0,100,14,57,3,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("vtiger_field").",'postatus','vtiger_purchaseorder',1,'15','postatus','Status',1,0,0,100,15,57,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("vtiger_field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,16,57,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("vtiger_field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,17,57,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("vtiger_field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,18,57,2,'T~O',1,null,'BAS')");
 
 
 
  //Block 59
 
-$this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'bill_street','vtiger_pobillads',1,'24','bill_street','Billing Address',1,0,0,100,1,59,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'ship_street','vtiger_poshipads',1,'24','ship_street','Shipping Address',1,0,0,100,2,59,1,'V~M',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'bill_city','vtiger_pobillads',1,'1','bill_city','Billing City',1,0,0,100,5,59,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'ship_city','vtiger_poshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,59,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'bill_state','vtiger_pobillads',1,'1','bill_state','Billing State',1,0,0,100,7,59,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'ship_state','vtiger_poshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,59,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'bill_code','vtiger_pobillads',1,'1','bill_code','Billing Code',1,0,0,100,9,59,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'ship_code','vtiger_poshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,59,1,'V~O',1,null,'BAS')");
-
-
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'bill_country','vtiger_pobillads',1,'1','bill_country','Billing Country',1,0,0,100,11,59,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'ship_country','vtiger_poshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,59,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'bill_pobox','vtiger_pobillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,59,1,'V~O',1,null,'BAS')");
-  $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'ship_pobox','vtiger_poshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,59,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("vtiger_field").",'bill_street','vtiger_pobillads',1,'24','bill_street','Billing Address',1,0,0,100,1,59,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("vtiger_field").",'ship_street','vtiger_poshipads',1,'24','ship_street','Shipping Address',1,0,0,100,2,59,1,'V~M',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("vtiger_field").",'bill_city','vtiger_pobillads',1,'1','bill_city','Billing City',1,0,0,100,5,59,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("vtiger_field").",'ship_city','vtiger_poshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,59,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("vtiger_field").",'bill_state','vtiger_pobillads',1,'1','bill_state','Billing State',1,0,0,100,7,59,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("vtiger_field").",'ship_state','vtiger_poshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,59,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("vtiger_field").",'bill_code','vtiger_pobillads',1,'1','bill_code','Billing Code',1,0,0,100,9,59,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("vtiger_field").",'ship_code','vtiger_poshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,59,1,'V~O',1,null,'BAS')");
+
+
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("vtiger_field").",'bill_country','vtiger_pobillads',1,'1','bill_country','Billing Country',1,0,0,100,11,59,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("vtiger_field").",'ship_country','vtiger_poshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,59,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("vtiger_field").",'bill_pobox','vtiger_pobillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,59,1,'V~O',1,null,'BAS')");
+  $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("vtiger_field").",'ship_pobox','vtiger_poshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,59,1,'V~O',1,null,'BAS')");
   
  //Block61
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,62,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("vtiger_field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,62,1,'V~O',1,null,'ADV')");
 
  //Block62
- $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("field").",'terms_conditions','vtiger_purchaseorder',1,'19','terms_conditions','Terms & Conditions',1,0,0,100,1,61,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (21,".$this->db->getUniqueID("vtiger_field").",'terms_conditions','vtiger_purchaseorder',1,'19','terms_conditions','Terms & Conditions',1,0,0,100,1,61,1,'V~O',1,null,'ADV')");
 
 //Purchase Order Details -- END
 
 //Sales Order Details -- START
  //Block63
  
-$this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'subject','vtiger_salesorder',1,'2','subject','Subject',1,0,0,100,1,63,1,'V~M',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'potentialid','vtiger_salesorder',1,'76','potential_id','Potential Name',1,0,0,100,2,63,1,'I~O',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'customerno','vtiger_salesorder',1,'1','customerno','Customer No',1,0,0,100,3,63,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'quoteid','vtiger_salesorder',1,'78','quote_id','Quote Name',1,0,0,100,4,63,1,'I~O',1,null,'BAS')");	
-$this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'purchaseorder','vtiger_salesorder',1,'1','vtiger_purchaseorder','Purchase Order',1,0,0,100,4,63,1,'V~O',1,null,'BAS')");	
-
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'contactid','vtiger_salesorder',1,'57','contact_id','Contact Name',1,0,0,100,6,63,1,'I~O',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'duedate','vtiger_salesorder',1,'5','duedate','Due Date',1,0,0,100,8,63,1,'D~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'carrier','vtiger_salesorder',1,'15','carrier','Carrier',1,0,0,100,9,63,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'pending','vtiger_salesorder',1,'1','pending','Pending',1,0,0,100,10,63,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'sostatus','vtiger_salesorder',1,'15','sostatus','Status',1,0,0,100,11,63,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'salestax','vtiger_salesorder',1,'1','txtTax','Sales Tax',1,0,0,100,12,63,3,'N~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'adjustment','vtiger_salesorder',1,'1','txtAdjustment','Sales Tax',1,0,0,100,12,63,3,'NN~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'salescommission','vtiger_salesorder',1,'1','salescommission','Sales Commission',1,0,0,100,13,63,1,'N~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'exciseduty','vtiger_salesorder',1,'1','exciseduty','Excise Duty',1,0,0,100,13,63,1,'N~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'total','vtiger_salesorder',1,'1','hdnGrandTotal','Total',1,0,0,100,14,63,3,'N~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'subtotal','vtiger_salesorder',1,'1','hdnSubTotal','Total',1,0,0,100,15,63,3,'N~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'accountid','vtiger_salesorder',1,'73','account_id','Account Name',1,0,0,100,16,63,1,'I~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,17,63,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,18,63,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,19,63,2,'T~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("vtiger_field").",'subject','vtiger_salesorder',1,'2','subject','Subject',1,0,0,100,1,63,1,'V~M',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("vtiger_field").",'potentialid','vtiger_salesorder',1,'76','potential_id','Potential Name',1,0,0,100,2,63,1,'I~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("vtiger_field").",'customerno','vtiger_salesorder',1,'1','customerno','Customer No',1,0,0,100,3,63,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("vtiger_field").",'quoteid','vtiger_salesorder',1,'78','quote_id','Quote Name',1,0,0,100,4,63,1,'I~O',1,null,'BAS')");	
+$this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("vtiger_field").",'purchaseorder','vtiger_salesorder',1,'1','vtiger_purchaseorder','Purchase Order',1,0,0,100,4,63,1,'V~O',1,null,'BAS')");	
+
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("vtiger_field").",'contactid','vtiger_salesorder',1,'57','contact_id','Contact Name',1,0,0,100,6,63,1,'I~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("vtiger_field").",'duedate','vtiger_salesorder',1,'5','duedate','Due Date',1,0,0,100,8,63,1,'D~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("vtiger_field").",'carrier','vtiger_salesorder',1,'15','carrier','Carrier',1,0,0,100,9,63,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("vtiger_field").",'pending','vtiger_salesorder',1,'1','pending','Pending',1,0,0,100,10,63,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("vtiger_field").",'sostatus','vtiger_salesorder',1,'15','sostatus','Status',1,0,0,100,11,63,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("vtiger_field").",'salestax','vtiger_salesorder',1,'1','txtTax','Sales Tax',1,0,0,100,12,63,3,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("vtiger_field").",'adjustment','vtiger_salesorder',1,'1','txtAdjustment','Sales Tax',1,0,0,100,12,63,3,'NN~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("vtiger_field").",'salescommission','vtiger_salesorder',1,'1','salescommission','Sales Commission',1,0,0,100,13,63,1,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("vtiger_field").",'exciseduty','vtiger_salesorder',1,'1','exciseduty','Excise Duty',1,0,0,100,13,63,1,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("vtiger_field").",'total','vtiger_salesorder',1,'1','hdnGrandTotal','Total',1,0,0,100,14,63,3,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("vtiger_field").",'subtotal','vtiger_salesorder',1,'1','hdnSubTotal','Total',1,0,0,100,15,63,3,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("vtiger_field").",'accountid','vtiger_salesorder',1,'73','account_id','Account Name',1,0,0,100,16,63,1,'I~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("vtiger_field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,17,63,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("vtiger_field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,18,63,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("vtiger_field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,19,63,2,'T~O',1,null,'BAS')");
 
 
 
  //Block 65
 
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'bill_street','vtiger_sobillads',1,'24','bill_street','Billing Address',1,0,0,100,1,65,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'ship_street','vtiger_soshipads',1,'24','ship_street','Shipping Address',1,0,0,100,2,65,1,'V~M',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'bill_city','vtiger_sobillads',1,'1','bill_city','Billing City',1,0,0,100,5,65,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'ship_city','vtiger_soshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,65,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'bill_state','vtiger_sobillads',1,'1','bill_state','Billing State',1,0,0,100,7,65,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'ship_state','vtiger_soshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,65,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'bill_code','vtiger_sobillads',1,'1','bill_code','Billing Code',1,0,0,100,9,65,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'ship_code','vtiger_soshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,65,1,'V~O',1,null,'BAS')");
-
-
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'bill_country','vtiger_sobillads',1,'1','bill_country','Billing Country',1,0,0,100,11,65,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'ship_country','vtiger_soshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,65,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'bill_pobox','vtiger_sobillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,65,1,'V~O',1,null,'BAS')");
-  $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'ship_pobox','vtiger_soshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,65,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("vtiger_field").",'bill_street','vtiger_sobillads',1,'24','bill_street','Billing Address',1,0,0,100,1,65,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("vtiger_field").",'ship_street','vtiger_soshipads',1,'24','ship_street','Shipping Address',1,0,0,100,2,65,1,'V~M',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("vtiger_field").",'bill_city','vtiger_sobillads',1,'1','bill_city','Billing City',1,0,0,100,5,65,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("vtiger_field").",'ship_city','vtiger_soshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,65,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("vtiger_field").",'bill_state','vtiger_sobillads',1,'1','bill_state','Billing State',1,0,0,100,7,65,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("vtiger_field").",'ship_state','vtiger_soshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,65,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("vtiger_field").",'bill_code','vtiger_sobillads',1,'1','bill_code','Billing Code',1,0,0,100,9,65,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("vtiger_field").",'ship_code','vtiger_soshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,65,1,'V~O',1,null,'BAS')");
+
+
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("vtiger_field").",'bill_country','vtiger_sobillads',1,'1','bill_country','Billing Country',1,0,0,100,11,65,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("vtiger_field").",'ship_country','vtiger_soshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,65,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("vtiger_field").",'bill_pobox','vtiger_sobillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,65,1,'V~O',1,null,'BAS')");
+  $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("vtiger_field").",'ship_pobox','vtiger_soshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,65,1,'V~O',1,null,'BAS')");
   
 //Block67
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,68,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("vtiger_field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,68,1,'V~O',1,null,'ADV')");
 
  //Block68
- $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("field").",'terms_conditions','vtiger_salesorder',1,'19','terms_conditions','Terms & Conditions',1,0,0,100,1,67,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (22,".$this->db->getUniqueID("vtiger_field").",'terms_conditions','vtiger_salesorder',1,'19','terms_conditions','Terms & Conditions',1,0,0,100,1,67,1,'V~O',1,null,'ADV')");
 
 
 //Sales Order Details -- END
@@ -787,94 +787,94 @@
 //Invoice Details -- START
  //Block69
 
-$this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'subject','vtiger_invoice',1,'2','subject','Subject',1,0,0,100,1,69,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'salesorderid','vtiger_invoice',1,'80','salesorder_id','Sales Order',1,0,0,100,2,69,1,'I~O',1,null,'BAS')");	
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'customerno','vtiger_invoice',1,'1','customerno','Customer No',1,0,0,100,3,69,1,'V~O',1,null,'BAS')");	
+$this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'subject','vtiger_invoice',1,'2','subject','Subject',1,0,0,100,1,69,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'salesorderid','vtiger_invoice',1,'80','salesorder_id','Sales Order',1,0,0,100,2,69,1,'I~O',1,null,'BAS')");	
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'customerno','vtiger_invoice',1,'1','customerno','Customer No',1,0,0,100,3,69,1,'V~O',1,null,'BAS')");	
 
  
 //to include contact name vtiger_field in Invoice-start
-$this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'contactid','vtiger_invoice',1,'57','contact_id','Contact Name',1,0,0,100,4,69,1,'I~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'contactid','vtiger_invoice',1,'57','contact_id','Contact Name',1,0,0,100,4,69,1,'I~O',1,null,'BAS')");
 //end
 
-$this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'invoicedate','vtiger_invoice',1,'5','invoicedate','Invoice Date',1,0,0,100,5,69,1,'D~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'duedate','vtiger_invoice',1,'5','duedate','Due Date',1,0,0,100,6,69,1,'D~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'purchaseorder','vtiger_invoice',1,'1','vtiger_purchaseorder','Purchase Order',1,0,0,100,8,69,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'salestax','vtiger_invoice',1,'1','txtTax','Sales Tax',1,0,0,100,9,69,3,'N~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'adjustment','vtiger_invoice',1,'1','txtAdjustment','Sales Tax',1,0,0,100,9,69,3,'NN~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'salescommission','vtiger_invoice',1,'1','salescommission','Sales Commission',1,0,0,10,13,69,1,'N~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'exciseduty','vtiger_invoice',1,'1','exciseduty','Excise Duty',1,0,0,100,11,69,1,'N~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'subtotal','vtiger_invoice',1,'1','hdnSubTotal','Sub Total',1,0,0,100,12,69,3,'N~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'total','vtiger_invoice',1,'1','hdnGrandTotal','Total',1,0,0,100,13,69,3,'N~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'accountid','vtiger_invoice',1,'73','account_id','Account Name',1,0,0,100,14,69,1,'I~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'invoicestatus','vtiger_invoice',1,'15','invoicestatus','Status',1,0,0,100,15,69,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,16,69,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,17,69,2,'T~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,18,69,2,'T~O',1,null,'BAS')"); 
+$this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'invoicedate','vtiger_invoice',1,'5','invoicedate','Invoice Date',1,0,0,100,5,69,1,'D~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'duedate','vtiger_invoice',1,'5','duedate','Due Date',1,0,0,100,6,69,1,'D~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'purchaseorder','vtiger_invoice',1,'1','vtiger_purchaseorder','Purchase Order',1,0,0,100,8,69,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'salestax','vtiger_invoice',1,'1','txtTax','Sales Tax',1,0,0,100,9,69,3,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'adjustment','vtiger_invoice',1,'1','txtAdjustment','Sales Tax',1,0,0,100,9,69,3,'NN~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'salescommission','vtiger_invoice',1,'1','salescommission','Sales Commission',1,0,0,10,13,69,1,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'exciseduty','vtiger_invoice',1,'1','exciseduty','Excise Duty',1,0,0,100,11,69,1,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'subtotal','vtiger_invoice',1,'1','hdnSubTotal','Sub Total',1,0,0,100,12,69,3,'N~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'total','vtiger_invoice',1,'1','hdnGrandTotal','Total',1,0,0,100,13,69,3,'N~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'accountid','vtiger_invoice',1,'73','account_id','Account Name',1,0,0,100,14,69,1,'I~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'invoicestatus','vtiger_invoice',1,'15','invoicestatus','Status',1,0,0,100,15,69,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,16,69,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'createdtime','vtiger_crmentity',1,'70','createdtime','Created Time',1,0,0,100,17,69,2,'T~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'modifiedtime','vtiger_crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,18,69,2,'T~O',1,null,'BAS')"); 
 
  //Block 71
 
-$this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'bill_street','vtiger_invoicebillads',1,'24','bill_street','Billing Address',1,0,0,100,1,71,1,'V~M',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'ship_street','vtiger_invoiceshipads',1,'24','ship_street','Shipping Address',1,0,0,100,2,71,1,'V~M',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'bill_city','vtiger_invoicebillads',1,'1','bill_city','Billing City',1,0,0,100,5,71,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'ship_city','vtiger_invoiceshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,71,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'bill_state','vtiger_invoicebillads',1,'1','bill_state','Billing State',1,0,0,100,7,71,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'ship_state','vtiger_invoiceshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,71,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'bill_code','vtiger_invoicebillads',1,'1','bill_code','Billing Code',1,0,0,100,9,71,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'ship_code','vtiger_invoiceshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,71,1,'V~O',1,null,'BAS')");
-
-
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'bill_country','vtiger_invoicebillads',1,'1','bill_country','Billing Country',1,0,0,100,11,71,1,'V~O',1,null,'BAS')");
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'ship_country','vtiger_invoiceshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,71,1,'V~O',1,null,'BAS')");
-
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'bill_pobox','vtiger_invoicebillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,71,1,'V~O',1,null,'BAS')");
-  $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'ship_pobox','vtiger_invoiceshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,71,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'bill_street','vtiger_invoicebillads',1,'24','bill_street','Billing Address',1,0,0,100,1,71,1,'V~M',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'ship_street','vtiger_invoiceshipads',1,'24','ship_street','Shipping Address',1,0,0,100,2,71,1,'V~M',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'bill_city','vtiger_invoicebillads',1,'1','bill_city','Billing City',1,0,0,100,5,71,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'ship_city','vtiger_invoiceshipads',1,'1','ship_city','Shipping City',1,0,0,100,6,71,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'bill_state','vtiger_invoicebillads',1,'1','bill_state','Billing State',1,0,0,100,7,71,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'ship_state','vtiger_invoiceshipads',1,'1','ship_state','Shipping State',1,0,0,100,8,71,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'bill_code','vtiger_invoicebillads',1,'1','bill_code','Billing Code',1,0,0,100,9,71,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'ship_code','vtiger_invoiceshipads',1,'1','ship_code','Shipping Code',1,0,0,100,10,71,1,'V~O',1,null,'BAS')");
+
+
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'bill_country','vtiger_invoicebillads',1,'1','bill_country','Billing Country',1,0,0,100,11,71,1,'V~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'ship_country','vtiger_invoiceshipads',1,'1','ship_country','Shipping Country',1,0,0,100,12,71,1,'V~O',1,null,'BAS')");
+
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'bill_pobox','vtiger_invoicebillads',1,'1','bill_pobox','Billing Po Box',1,0,0,100,3,71,1,'V~O',1,null,'BAS')");
+  $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'ship_pobox','vtiger_invoiceshipads',1,'1','ship_pobox','Shipping Po Box',1,0,0,100,4,71,1,'V~O',1,null,'BAS')");
 
 //Block73
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,74,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'description','vtiger_crmentity',1,'19','description','Description',1,0,0,100,1,74,1,'V~O',1,null,'ADV')");
  //Block74
- $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("field").",'terms_conditions','vtiger_invoice',1,'19','terms_conditions','Terms & Conditions',1,0,0,100,1,73,1,'V~O',1,null,'ADV')");
+ $this->db->query("insert into vtiger_field values (23,".$this->db->getUniqueID("vtiger_field").",'terms_conditions','vtiger_invoice',1,'19','terms_conditions','Terms & Conditions',1,0,0,100,1,73,1,'V~O',1,null,'ADV')");
 
 
 //Invoice Details -- END
  //users Details Starts Block 79,80,81
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'user_name','vtiger_users',1,'106','user_name','User Name',1,0,0,11,1,79,1,'V~M',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'is_admin','vtiger_users',1,'156','is_admin','Admin',1,0,0,3,2,79,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'user_password','vtiger_users',1,'99','user_password','Password',1,0,0,30,3,79,4,'P~M',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'confirm_password','vtiger_users',1,'99','confirm_password','Confirm Password',1,0,0,30,4,79,4,'P~M',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'first_name','vtiger_users',1,'1','first_name','First Name',1,0,0,30,5,79,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'last_name','vtiger_users',1,'2','last_name','Last Name',1,0,0,30,6,79,1,'V~M',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'roleid','vtiger_user2role',1,'98','roleid','Role',1,0,0,200,7,79,1,'V~M',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'email1','vtiger_users',1,'104','email1','Email',1,0,0,100,9,79,1,'E~M',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'status','vtiger_users',1,'115','status','Status',1,0,0,100,10,79,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'activity_view','vtiger_users',1,'15','activity_view','Default Activity View',1,0,0,100,13,79,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'lead_view','vtiger_users',1,'15','lead_view','Default Lead View',1,0,0,100,12,79,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'currency_id','vtiger_users',1,'116','currency_id','Currency',1,0,0,100,11,79,1,'I~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'hour_format','vtiger_users',1,'116','hour_format','Calendar Hour Format',1,0,0,100,13,79,3,'I~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'end_hour','vtiger_users',1,'116','end_hour','Day ends at',1,0,0,100,15,79,3,'I~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'start_hour','vtiger_users',1,'116','start_hour','Day starts at',1,0,0,100,14,79,3,'I~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'title','vtiger_users',1,'1','title','Title',1,0,0,50,1,80,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'phone_work','vtiger_users',1,'1','phone_work','Office Phone',1,0,0,50,2,80,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'department','vtiger_users',1,'1','department','Department',1,0,0,50,3,80,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'phone_mobile','vtiger_users',1,'1','phone_mobile','Mobile',1,0,0,50,4,80,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'reports_to_id','vtiger_users',1,'101','reports_to_id','Reports To',1,0,0,50,5,80,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'phone_other','vtiger_users',1,'1','phone_other','Other Phone',1,0,0,50,5,80,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'email2','vtiger_users',1,'13','email2','Other Email',1,0,0,100,6,80,1,'E~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'phone_fax','vtiger_users',1,'1','phone_fax','Fax',1,0,0,50,7,80,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'yahoo_id','vtiger_users',1,'13','yahoo_id','Yahoo id',1,0,0,100,7,80,1,'E~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'phone_home','vtiger_users',1,'1','phone_home','Home Phone',1,0,0,50,8,80,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'imagename','vtiger_users',1,'105','imagename','User Image',1,0,0,250,9,80,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'date_format','vtiger_users',1,'15','date_format','Date Format',1,0,0,30,10,80,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'tagcloud','vtiger_users',1,'103','tagcloud','Tag Cloud',1,0,0,250,13,80,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'signature','vtiger_users',1,'21','signature','Signature',1,0,0,250,11,80,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'description','vtiger_users',1,'21','description','Notes',1,0,0,250,12,80,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'address_street','vtiger_users',1,'21','address_street','Street Address',1,0,0,250,1,81,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'address_city','vtiger_users',1,'1','address_city','City',1,0,0,100,2,81,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'address_state','vtiger_users',1,'1','address_state','State',1,0,0,100,3,81,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'address_postalcode','vtiger_users',1,'1','address_postalcode','Postal Code',1,0,0,100,4,81,1,'V~O',1,null,'BAS')");
-$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("field").",'address_country','vtiger_users',1,'1','address_country','Country',1,0,0,100,5,81,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'user_name','vtiger_users',1,'106','user_name','User Name',1,0,0,11,1,79,1,'V~M',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'is_admin','vtiger_users',1,'156','is_admin','Admin',1,0,0,3,2,79,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'user_password','vtiger_users',1,'99','user_password','Password',1,0,0,30,3,79,4,'P~M',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'confirm_password','vtiger_users',1,'99','confirm_password','Confirm Password',1,0,0,30,4,79,4,'P~M',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'first_name','vtiger_users',1,'1','first_name','First Name',1,0,0,30,5,79,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'last_name','vtiger_users',1,'2','last_name','Last Name',1,0,0,30,6,79,1,'V~M',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'roleid','vtiger_user2role',1,'98','roleid','Role',1,0,0,200,7,79,1,'V~M',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'email1','vtiger_users',1,'104','email1','Email',1,0,0,100,9,79,1,'E~M',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'status','vtiger_users',1,'115','status','Status',1,0,0,100,10,79,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'activity_view','vtiger_users',1,'15','activity_view','Default Activity View',1,0,0,100,13,79,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'lead_view','vtiger_users',1,'15','lead_view','Default Lead View',1,0,0,100,12,79,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'currency_id','vtiger_users',1,'116','currency_id','Currency',1,0,0,100,11,79,1,'I~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'hour_format','vtiger_users',1,'116','hour_format','Calendar Hour Format',1,0,0,100,13,79,3,'I~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'end_hour','vtiger_users',1,'116','end_hour','Day ends at',1,0,0,100,15,79,3,'I~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'start_hour','vtiger_users',1,'116','start_hour','Day starts at',1,0,0,100,14,79,3,'I~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'title','vtiger_users',1,'1','title','Title',1,0,0,50,1,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'phone_work','vtiger_users',1,'1','phone_work','Office Phone',1,0,0,50,2,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'department','vtiger_users',1,'1','department','Department',1,0,0,50,3,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'phone_mobile','vtiger_users',1,'1','phone_mobile','Mobile',1,0,0,50,4,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'reports_to_id','vtiger_users',1,'101','reports_to_id','Reports To',1,0,0,50,5,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'phone_other','vtiger_users',1,'1','phone_other','Other Phone',1,0,0,50,5,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'email2','vtiger_users',1,'13','email2','Other Email',1,0,0,100,6,80,1,'E~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'phone_fax','vtiger_users',1,'1','phone_fax','Fax',1,0,0,50,7,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'yahoo_id','vtiger_users',1,'13','yahoo_id','Yahoo id',1,0,0,100,7,80,1,'E~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'phone_home','vtiger_users',1,'1','phone_home','Home Phone',1,0,0,50,8,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'imagename','vtiger_users',1,'105','imagename','User Image',1,0,0,250,9,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'date_format','vtiger_users',1,'15','date_format','Date Format',1,0,0,30,10,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'tagcloud','vtiger_users',1,'103','tagcloud','Tag Cloud',1,0,0,250,13,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'signature','vtiger_users',1,'21','signature','Signature',1,0,0,250,11,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'description','vtiger_users',1,'21','description','Notes',1,0,0,250,12,80,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'address_street','vtiger_users',1,'21','address_street','Street Address',1,0,0,250,1,81,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'address_city','vtiger_users',1,'1','address_city','City',1,0,0,100,2,81,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'address_state','vtiger_users',1,'1','address_state','State',1,0,0,100,3,81,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'address_postalcode','vtiger_users',1,'1','address_postalcode','Postal Code',1,0,0,100,4,81,1,'V~O',1,null,'BAS')");
+$this->db->query("insert into vtiger_field values (29,".$this->db->getUniqueID("vtiger_field").",'address_country','vtiger_users',1,'1','address_country','Country',1,0,0,100,5,81,1,'V~O',1,null,'BAS')");
 
  //user Details End
 
@@ -1574,44 +1574,44 @@
                 $this->db->query("insert into vtiger_org_share_action2tab values(7,17)");
 
 		//Insert into default_org_sharingrule
-               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",2,2,0)");
-
-               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",4,2,2)");
-
-               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",6,2,0)");
-
-               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",7,2,0)");
-
-               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",9,3,1)");
-               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",13,2,0)");
-               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",16,3,2)");
-               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",17,7,0)");
-               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",20,2,0)");
-               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",21,2,0)");
-               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",22,2,0)");
-               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",23,2,0)");
-               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('def_org_share').",26,2,0)");
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('vtiger_def_org_share').",2,2,0)");
+
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('vtiger_def_org_share').",4,2,2)");
+
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('vtiger_def_org_share').",6,2,0)");
+
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('vtiger_def_org_share').",7,2,0)");
+
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('vtiger_def_org_share').",9,3,1)");
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('vtiger_def_org_share').",13,2,0)");
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('vtiger_def_org_share').",16,3,2)");
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('vtiger_def_org_share').",17,7,0)");
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('vtiger_def_org_share').",20,2,0)");
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('vtiger_def_org_share').",21,2,0)");
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('vtiger_def_org_share').",22,2,0)");
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('vtiger_def_org_share').",23,2,0)");
+               $this->db->query("insert into vtiger_def_org_share values (".$this->db->getUniqueID('vtiger_def_org_share').",26,2,0)");
 
 		//Populating the DataShare Related Modules
 
 		//Lead Related Module
 
 		//Account Related Module
-		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",6,2)");
-		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",6,13)");
-		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",6,20)");
-		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",6,22)");
-		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",6,23)");
+		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('vtiger_datashare_relatedmodules').",6,2)");
+		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('vtiger_datashare_relatedmodules').",6,13)");
+		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('vtiger_datashare_relatedmodules').",6,20)");
+		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('vtiger_datashare_relatedmodules').",6,22)");
+		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('vtiger_datashare_relatedmodules').",6,23)");
 
 		//Potential Related Module
-		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",2,20)");
-		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",2,22)");
+		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('vtiger_datashare_relatedmodules').",2,20)");
+		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('vtiger_datashare_relatedmodules').",2,22)");
 
 		//Quote Related Module
-		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",20,22)");
+		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('vtiger_datashare_relatedmodules').",20,22)");
 
 		//SO Related Module
-		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('datashare_relatedmodules').",22,23)");	
+		$this->db->query("insert into vtiger_datashare_relatedmodules values (".$this->db->getUniqueID('vtiger_datashare_relatedmodules').",22,23)");	
 
 
 			
@@ -1623,216 +1623,216 @@
 
 	//insert into related list vtiger_table
 	//Inserting for vtiger_account related lists
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("Potentials").",'get_opportunities',1,'Potentials',0)");	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("Potentials").",'get_opportunities',1,'Potentials',0)");	
 		
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("Contacts").",'get_contacts',2,'Contacts',0)");
-
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("Activities").",'get_activities',3,'Activities',0)");
-
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("HelpDesk").",'get_tickets',4,'HelpDesk',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("Activities").",'get_history',5,'Activity History',0)");
-
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",0,'get_attachments',6,'Attachments',0)");
-
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("Quotes").",'get_quotes',7,'Quotes',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("Invoice").",'get_invoices',8,'Invoice',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("SalesOrder").",'get_salesorder',9,'Sales Order',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Accounts").",".getTabid("Products").",'get_products',10,'Products',0)");
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("Contacts").",'get_contacts',2,'Contacts',0)");
+
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("Activities").",'get_activities',3,'Activities',0)");
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("HelpDesk").",'get_tickets',4,'HelpDesk',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("Activities").",'get_history',5,'Activity History',0)");
+
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",0,'get_attachments',6,'Attachments',0)");
+
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("Quotes").",'get_quotes',7,'Quotes',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("Invoice").",'get_invoices',8,'Invoice',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("SalesOrder").",'get_salesorder',9,'Sales Order',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("Products").",'get_products',10,'Products',0)");
 
 	//Inserting Lead Related Lists	
 
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Leads").",".getTabid("Activities").",'get_activities',1,'Activities',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Leads").",".getTabid("Emails").",'get_emails',2,'Emails',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Leads").",".getTabid("Activities").",'get_history',3,'Activity History',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Leads").",0,'get_attachments',4,'Attachments',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Leads").",".getTabid("Products").",'get_products',5,'Products',0)");
-
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Leads").",".getTabid("Campaigns").",'get_campaigns',6,'Campaigns',0)");
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Leads").",".getTabid("Activities").",'get_activities',1,'Activities',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Leads").",".getTabid("Emails").",'get_emails',2,'Emails',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Leads").",".getTabid("Activities").",'get_history',3,'Activity History',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Leads").",0,'get_attachments',4,'Attachments',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Leads").",".getTabid("Products").",'get_products',5,'Products',0)");
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Leads").",".getTabid("Campaigns").",'get_campaigns',6,'Campaigns',0)");
 
 	//Inserting for contact related lists
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Potentials").",'get_opportunities',1,'Potentials',0)");	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Contacts").",".getTabid("Potentials").",'get_opportunities',1,'Potentials',0)");	
 		
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Activities").",'get_activities',2,'Activities',0)");
-
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Emails").",'get_emails',3,'Emails',0)");
-
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("HelpDesk").",'get_tickets',4,'HelpDesk',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Quotes").",'get_quotes',5,'Quotes',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("PurchaseOrder").",'get_purchase_orders',6,'Purchase Order',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("SalesOrder").",'get_salesorder',7,'Sales Order',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Products").",'get_products',8,'Products',0)");
-
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Activities").",'get_history',9,'Activity History',0)");
-
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",0,'get_attachments',10,'Attachments',0)");
-
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Contacts").",".getTabid("Campaigns").",'get_campaigns',11,'Campaigns',0)");
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Contacts").",".getTabid("Activities").",'get_activities',2,'Activities',0)");
+
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Contacts").",".getTabid("Emails").",'get_emails',3,'Emails',0)");
+
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Contacts").",".getTabid("HelpDesk").",'get_tickets',4,'HelpDesk',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Contacts").",".getTabid("Quotes").",'get_quotes',5,'Quotes',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Contacts").",".getTabid("PurchaseOrder").",'get_purchase_orders',6,'Purchase Order',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Contacts").",".getTabid("SalesOrder").",'get_salesorder',7,'Sales Order',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Contacts").",".getTabid("Products").",'get_products',8,'Products',0)");
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Contacts").",".getTabid("Activities").",'get_history',9,'Activity History',0)");
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Contacts").",0,'get_attachments',10,'Attachments',0)");
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Contacts").",".getTabid("Campaigns").",'get_campaigns',11,'Campaigns',0)");
 
 	//Inserting Potential Related Lists	
 
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",".getTabid("Activities").",'get_activities',1,'Activities',0)");
-
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",".getTabid("Contacts").",'get_contacts',2,'Contacts',0)");
-
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",".getTabid("Products").",'get_products',3,'Products',0)");
-
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",0,'get_stage_history',4,'Sales Stage History',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",0,'get_attachments',5,'Attachments',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",".getTabid("Quotes").",'get_Quotes',6,'Quotes',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",".getTabid("SalesOrder").",'get_salesorder',7,'Sales Order',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Potentials").",".getTabid("Activities").",'get_history',8,'Activity History',0)");
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Potentials").",".getTabid("Activities").",'get_activities',1,'Activities',0)");
+
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Potentials").",".getTabid("Contacts").",'get_contacts',2,'Contacts',0)");
+
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Potentials").",".getTabid("Products").",'get_products',3,'Products',0)");
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Potentials").",0,'get_stage_history',4,'Sales Stage History',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Potentials").",0,'get_attachments',5,'Attachments',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Potentials").",".getTabid("Quotes").",'get_Quotes',6,'Quotes',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Potentials").",".getTabid("SalesOrder").",'get_salesorder',7,'Sales Order',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Potentials").",".getTabid("Activities").",'get_history',8,'Activity History',0)");
 
 		//Inserting Product Related Lists	
 
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",".getTabid("HelpDesk").",'get_tickets',1,'HelpDesk',0)");
-
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",".getTabid("Activities").",'get_activities',2,'Activities',0)");
-
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",0,'get_attachments',3,'Attachments',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",".getTabid("Quotes").",'get_quotes',4,'Quotes',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",".getTabid("PurchaseOrder").",'get_purchase_orders',5,'Purchase Order',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",".getTabid("SalesOrder").",'get_salesorder',6,'Sales Order',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",".getTabid("Invoice").",'get_invoices',7,'Invoice',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Products").",".getTabid("PriceBooks").",'get_product_pricebooks',8,'PriceBooks',0)");
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Products").",".getTabid("HelpDesk").",'get_tickets',1,'HelpDesk',0)");
+
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Products").",".getTabid("Activities").",'get_activities',2,'Activities',0)");
+
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Products").",0,'get_attachments',3,'Attachments',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Products").",".getTabid("Quotes").",'get_quotes',4,'Quotes',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Products").",".getTabid("PurchaseOrder").",'get_purchase_orders',5,'Purchase Order',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Products").",".getTabid("SalesOrder").",'get_salesorder',6,'Sales Order',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Products").",".getTabid("Invoice").",'get_invoices',7,'Invoice',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Products").",".getTabid("PriceBooks").",'get_product_pricebooks',8,'PriceBooks',0)");
 	
 		//Inserting Emails Related Lists	
 
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Emails").",".getTabid("Contacts").",'get_contacts',1,'Contacts',0)");
-
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Emails").",0,'get_users',2,'Users',0)");
-
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Emails").",0,'get_attachments',3,'Attachments',0)");
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Emails").",".getTabid("Contacts").",'get_contacts',1,'Contacts',0)");
+
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Emails").",0,'get_users',2,'Users',0)");
+
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Emails").",0,'get_attachments',3,'Attachments',0)");
 
 		//Inserting HelpDesk Related Lists
 		
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("HelpDesk").",".getTabid("Activities").",'get_activities',1,'Activities',0)");
-
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("HelpDesk").",0,'get_attachments',2,'Attachments',0)");
-
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("HelpDesk").",0,'get_ticket_history',3,'Ticket History',0)");
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("HelpDesk").",".getTabid("Activities").",'get_activities',1,'Activities',0)");
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("HelpDesk").",0,'get_attachments',2,'Attachments',0)");
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("HelpDesk").",0,'get_ticket_history',3,'Ticket History',0)");
 
 	//Inserting PriceBook Related Lists
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("PriceBooks").",14,'get_pricebook_products',2,'Products',0)");
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("PriceBooks").",14,'get_pricebook_products',2,'Products',0)");
 
         // Inserting Vendor Related Lists
-        $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Vendors").",14,'get_products',1,'Products',0)");
-
-        $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Vendors").",21,'get_purchase_orders',2,'Purchase Order',0)");
-
-        $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Vendors").",4,'get_contacts',3,'Contacts',0)");
+        $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Vendors").",14,'get_products',1,'Products',0)");
+
+        $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Vendors").",21,'get_purchase_orders',2,'Purchase Order',0)");
+
+        $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Vendors").",4,'get_contacts',3,'Contacts',0)");
 
 	// Inserting Quotes Related Lists
 	
-        $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Quotes").",".getTabid("Invoice").",'get_salesorder',1,'Sales Order',0)");
+        $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Quotes").",".getTabid("Invoice").",'get_salesorder',1,'Sales Order',0)");
         
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Quotes").",9,'get_activities',2,'Activities',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Quotes").",9,'get_history',3,'Activity History',0)");
-
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Quotes").",0,'get_quotestagehistory',4,'Quote Stage History',0)");
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Quotes").",9,'get_activities',2,'Activities',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Quotes").",9,'get_history',3,'Activity History',0)");
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Quotes").",0,'get_quotestagehistory',4,'Quote Stage History',0)");
 
 	// Inserting Purchase order Related Lists
 
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("PurchaseOrder").",9,'get_activities',1,'Activities',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("PurchaseOrder").",0,'get_attachments',2,'Attachments',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("PurchaseOrder").",".getTabid("Activities").",'get_history',3,'Activity History',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("PurchaseOrder").",0,'get_postatushistory',4,'PurchaseOrder Status History',0)");
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("PurchaseOrder").",9,'get_activities',1,'Activities',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("PurchaseOrder").",0,'get_attachments',2,'Attachments',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("PurchaseOrder").",".getTabid("Activities").",'get_history',3,'Activity History',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("PurchaseOrder").",0,'get_postatushistory',4,'PurchaseOrder Status History',0)");
 
 	// Inserting Sales order Related Lists
 
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("SalesOrder").",9,'get_activities',1,'Activities',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("SalesOrder").",0,'get_attachments',2,'Attachments',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("SalesOrder").",".getTabid("Invoice").",'get_invoices',3,'Invoice',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("SalesOrder").",".getTabid("Activities").",'get_history',4,'Activity History',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("SalesOrder").",0,'get_sostatushistory',5,'SalesOrder Status History',0)");
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("SalesOrder").",9,'get_activities',1,'Activities',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("SalesOrder").",0,'get_attachments',2,'Attachments',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("SalesOrder").",".getTabid("Invoice").",'get_invoices',3,'Invoice',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("SalesOrder").",".getTabid("Activities").",'get_history',4,'Activity History',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("SalesOrder").",0,'get_sostatushistory',5,'SalesOrder Status History',0)");
 
 	// Inserting Invoice Related Lists
 
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Invoice").",9,'get_activities',1,'Activities',0)");
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Invoice").",0,'get_attachments',2,'Attachments',0)");
-
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Invoice").",".getTabid("Activities").",'get_history',3,'Activity History',0)");
-
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Invoice").",0,'get_invoicestatushistory',4,'Invoice Status History',0)");
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Invoice").",9,'get_activities',1,'Activities',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Invoice").",0,'get_attachments',2,'Attachments',0)");
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Invoice").",".getTabid("Activities").",'get_history',3,'Activity History',0)");
+
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Invoice").",0,'get_invoicestatushistory',4,'Invoice Status History',0)");
 
 	// Inserting Activities Related Lists
 	
-	$this->db->query("insert into vtiger_relatedlists values (".$this->db->getUniqueID('relatedlists').",".getTabid("Activities").",0,'get_users',1,'Users',0)");
-	$this->db->query("insert into vtiger_relatedlists values (".$this->db->getUniqueID('relatedlists').",".getTabid("Activities").",4,'get_contacts',2,'Contacts',0)");
+	$this->db->query("insert into vtiger_relatedlists values (".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Activities").",0,'get_users',1,'Users',0)");
+	$this->db->query("insert into vtiger_relatedlists values (".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Activities").",4,'get_contacts',2,'Contacts',0)");
 
 	// Inserting Campaigns Related Lists
 
-         $this->db->query("insert into vtiger_relatedlists values (".$this->db->getUniqueID('relatedlists').",".getTabid("Campaigns").",".getTabid("Contacts").",'get_contacts',1,'Contacts',0)");
-         $this->db->query("insert into vtiger_relatedlists values (".$this->db->getUniqueID('relatedlists').",".getTabid("Campaigns").",".getTabid("Leads").",'get_leads',2,'Leads',0)");
-	 $this->db->query("insert into vtiger_relatedlists values (".$this->db->getUniqueID('relatedlists').",".getTabid("Campaigns").",".getTabid("Potentials").",'get_opportunities',3,'Potentials',0)");
-	 $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Campaigns").",9,'get_activities',4,'Activities',0)");
+         $this->db->query("insert into vtiger_relatedlists values (".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Campaigns").",".getTabid("Contacts").",'get_contacts',1,'Contacts',0)");
+         $this->db->query("insert into vtiger_relatedlists values (".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Campaigns").",".getTabid("Leads").",'get_leads',2,'Leads',0)");
+	 $this->db->query("insert into vtiger_relatedlists values (".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Campaigns").",".getTabid("Potentials").",'get_opportunities',3,'Potentials',0)");
+	 $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Campaigns").",9,'get_activities',4,'Activities',0)");
 
  //Inserting User Related Lists
  
-        $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Users").",".getTabid("Activities").",'get_activities',1,'Activities',0)");
+        $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Users").",".getTabid("Activities").",'get_activities',1,'Activities',0)");
  
-        $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Users").",".getTabid("Contacts").",'get_contacts',2,'Contacts',0)");
+        $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Users").",".getTabid("Contacts").",'get_contacts',2,'Contacts',0)");
  
-        $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('relatedlists').",".getTabid("Users").",".getTabid("Users").",'get_user_groups',3,'Groups',0)");
+        $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Users").",".getTabid("Users").",'get_user_groups',3,'Groups',0)");
 
 	 
-               $this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("notificationscheduler").",'LBL_TASK_NOTIFICATION_DESCRITPION',1,'Task Delay Notification','Tasks delayed beyond 24 hrs ','LBL_TASK_NOTIFICATION')");
-
-
-                $this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("notificationscheduler").",'LBL_BIG_DEAL_DESCRIPTION' ,1,'Big Deal notification','Success! A big deal has been won! ','LBL_BIG_DEAL')");
-
-
-                $this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("notificationscheduler").",'LBL_TICKETS_DESCRIPTION',1,'Pending Tickets notification','Ticket pending please ','LBL_PENDING_TICKETS')");
-
-
-                $this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("notificationscheduler").",'LBL_MANY_TICKETS_DESCRIPTION',1,'Too many tickets Notification','Too many tickets pending against this entity ','LBL_MANY_TICKETS')");
-
-
-                $this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("notificationscheduler").",'LBL_START_DESCRIPTION' ,1,'Support Start Notification','Support starts please ','LBL_START_NOTIFICATION')");
-
-                $this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("notificationscheduler").",'LBL_SUPPORT_DESCRIPTION',1,'Support ending please','Support Ending Notification','LBL_SUPPORT_NOTICIATION')");
+               $this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("vtiger_notificationscheduler").",'LBL_TASK_NOTIFICATION_DESCRITPION',1,'Task Delay Notification','Tasks delayed beyond 24 hrs ','LBL_TASK_NOTIFICATION')");
+
+
+                $this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("vtiger_notificationscheduler").",'LBL_BIG_DEAL_DESCRIPTION' ,1,'Big Deal notification','Success! A big deal has been won! ','LBL_BIG_DEAL')");
+
+
+                $this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("vtiger_notificationscheduler").",'LBL_TICKETS_DESCRIPTION',1,'Pending Tickets notification','Ticket pending please ','LBL_PENDING_TICKETS')");
+
+
+                $this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("vtiger_notificationscheduler").",'LBL_MANY_TICKETS_DESCRIPTION',1,'Too many tickets Notification','Too many tickets pending against this entity ','LBL_MANY_TICKETS')");
+
+
+                $this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("vtiger_notificationscheduler").",'LBL_START_DESCRIPTION' ,1,'Support Start Notification','Support starts please ','LBL_START_NOTIFICATION')");
+
+                $this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("vtiger_notificationscheduler").",'LBL_SUPPORT_DESCRIPTION',1,'Support ending please','Support Ending Notification','LBL_SUPPORT_NOTICIATION')");
 		
- 		$this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("notificationscheduler").",'LBL_ACTIVITY_REMINDER_DESCRIPTION' ,1,'Activity Reminder Notication','This is a reminder notification for the Activity','LBL_ACTIVITY_NOTIFICATION')");
+ 		$this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("vtiger_notificationscheduler").",'LBL_ACTIVITY_REMINDER_DESCRIPTION' ,1,'Activity Reminder Notication','This is a reminder notification for the Activity','LBL_ACTIVITY_NOTIFICATION')");
 
 		//Inserting Inventory Notifications
 	$invoice_body = 'Dear {HANDLER},
@@ -1847,7 +1847,7 @@
 {CURRENTUSER}';
 
 		
-               $this->db->query("insert into vtiger_inventorynotification(notificationid,notificationname,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("inventorynotification").",'InvoiceNotification','{PRODUCTNAME} Stock Level is Low','".$invoice_body." ','InvoiceNotificationDescription')");
+               $this->db->query("insert into vtiger_inventorynotification(notificationid,notificationname,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("vtiger_inventorynotification").",'InvoiceNotification','{PRODUCTNAME} Stock Level is Low','".$invoice_body." ','InvoiceNotificationDescription')");
 
 		$quote_body = 'Dear {HANDLER},
 
@@ -1859,7 +1859,7 @@
 {CURRENTUSER}';	
 		
 		
-               $this->db->query("insert into vtiger_inventorynotification(notificationid,notificationname,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("inventorynotification").",'QuoteNotification','Quote given for {PRODUCTNAME}','".$quote_body." ','QuoteNotificationDescription')");
+               $this->db->query("insert into vtiger_inventorynotification(notificationid,notificationname,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("vtiger_inventorynotification").",'QuoteNotification','Quote given for {PRODUCTNAME}','".$quote_body." ','QuoteNotificationDescription')");
 
 		$so_body = 'Dear {HANDLER},
 
@@ -1873,10 +1873,10 @@
 {CURRENTUSER}';
 
 		
-               $this->db->query("insert into vtiger_inventorynotification(notificationid,notificationname,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("inventorynotification").",'SalesOrderNotification','Sales Order generated for {PRODUCTNAME}','".$so_body." ','SalesOrderNotificationDescription')");
+               $this->db->query("insert into vtiger_inventorynotification(notificationid,notificationname,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("vtiger_inventorynotification").",'SalesOrderNotification','Sales Order generated for {PRODUCTNAME}','".$so_body." ','SalesOrderNotificationDescription')");
 
 		//Insert into vtiger_currency vtiger_table
-		$this->db->query("insert into vtiger_currency_info values(".$this->db->getUniqueID("currency_info").",'U.S Dollar','USD','$',1,'Active','-11')");
+		$this->db->query("insert into vtiger_currency_info values(".$this->db->getUniqueID("vtiger_currency_info").",'U.S Dollar','USD','$',1,'Active','-11')");
                 
 
 
@@ -1904,7 +1904,7 @@
 	-MNOP
 	-QRST';
 
-          $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Announcement for Release','Announcement for Release','Announcement of a release','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
+          $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Announcement for Release','Announcement for Release','Announcement of a release','".$body."',0,".$this->db->getUniqueID('vtiger_emailtemplates').")");
 	
 
 
@@ -1933,7 +1933,7 @@
  title';
 
 
-               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Pending Invoices','Invoices Pending','Payment Due','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
+               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Pending Invoices','Invoices Pending','Payment Due','".$body."',0,".$this->db->getUniqueID('vtiger_emailtemplates').")");
 
 
 
@@ -1960,7 +1960,7 @@
 name
 title';
 	       
-               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Acceptance Proposal','Acceptance Proposal','Acceptance of Proposal','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
+               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Acceptance Proposal','Acceptance Proposal','Acceptance of Proposal','".$body."',0,".$this->db->getUniqueID('vtiger_emailtemplates').")");
 
 
 $body= ' The undersigned hereby acknowledges receipt and delivery
@@ -1973,7 +1973,7 @@
 name
 title';
 	       
-               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Goods received acknowledgement','Goods received acknowledgement','Acknowledged Receipt of Goods','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
+               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Goods received acknowledgement','Goods received acknowledgement','Acknowledged Receipt of Goods','".$body."',0,".$this->db->getUniqueID('vtiger_emailtemplates').")");
 
 
 	       $body= ' Dear
@@ -1990,7 +1990,7 @@
 
 
 	       
-               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Accept Order','Accept Order','Acknowledgement/Acceptance of Order','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
+               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Accept Order','Accept Order','Acknowledgement/Acceptance of Order','".$body."',0,".$this->db->getUniqueID('vtiger_emailtemplates').")");
 
 
 
@@ -2013,7 +2013,7 @@
 name
 title';
 	       
-               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Address Change','Change of Address','Address Change','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
+               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Address Change','Change of Address','Address Change','".$body."',0,".$this->db->getUniqueID('vtiger_emailtemplates').")");
 
 
 
@@ -2039,7 +2039,7 @@
 
 
 	       
-               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Follow Up','Follow Up','Follow Up of meeting','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
+               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Follow Up','Follow Up','Follow Up of meeting','".$body."',0,".$this->db->getUniqueID('vtiger_emailtemplates').")");
 
 
 
@@ -2061,7 +2061,7 @@
 title';
 
 	       
-               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Target Crossed!','Target Crossed!','Fantastic Sales Spree!','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
+               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Target Crossed!','Target Crossed!','Fantastic Sales Spree!','".$body."',0,".$this->db->getUniqueID('vtiger_emailtemplates').")");
 
 $body='
 Dear
@@ -2077,14 +2077,14 @@
 title';
 
 	       
-               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Thanks Note','Thanks Note','Note of thanks','".$body."',0,".$this->db->getUniqueID('emailtemplates').")");
+               $this->db->query("insert into vtiger_emailtemplates(foldername,templatename,subject,description,body,deleted,templateid) values ('Public','Thanks Note','Thanks Note','Note of thanks','".$body."',0,".$this->db->getUniqueID('vtiger_emailtemplates').")");
 
 		
 	       //Insert into vtiger_organizationdetails vtiger_table 
 	       $this->db->query("insert into vtiger_organizationdetails(organizationame,address,city,state,country,code,phone,fax,website,logoname) values ('vtiger',' 40-41-42, Sivasundar Apartments, Flat D-II, Shastri Street, Velachery','Chennai','Tamil Nadu','India','600 042','+91-44-5202-1990','+91-44-5202-1990','www.vtiger.com','vtiger-crm-logo.jpg')");
 
   //Insert into vtiger_inventory_tandc vtiger_table
-               $this->db->query("insert into vtiger_inventory_tandc values('".$this->db->getUniqueID('inventory_tandc')."','Inventory','')");
+               $this->db->query("insert into vtiger_inventory_tandc values('".$this->db->getUniqueID('vtiger_inventory_tandc')."','Inventory','')");
 
 	$this->db->query("insert into vtiger_actionmapping values(0,'Save',0)");
 	$this->db->query("insert into vtiger_actionmapping values(1,'EditView',0)");
@@ -2169,9 +2169,9 @@
         $this->db->query("insert into vtiger_parenttabrel values (4,17,9)");
 		
 	//Added to populate the default inventory tax informations
-	$this->db->query("insert into vtiger_inventorytaxinfo values(".$this->db->getUniqueID("inventorytaxinfo").",'VAT','4.5')");
-	$this->db->query("insert into vtiger_inventorytaxinfo values(".$this->db->getUniqueID("inventorytaxinfo").",'Sales','10')");
-	$this->db->query("insert into vtiger_inventorytaxinfo values(".$this->db->getUniqueID("inventorytaxinfo").",'Service','12.5')");
+	$this->db->query("insert into vtiger_inventorytaxinfo values(".$this->db->getUniqueID("vtiger_inventorytaxinfo").",'VAT','4.5')");
+	$this->db->query("insert into vtiger_inventorytaxinfo values(".$this->db->getUniqueID("vtiger_inventorytaxinfo").",'Sales','10')");
+	$this->db->query("insert into vtiger_inventorytaxinfo values(".$this->db->getUniqueID("vtiger_inventorytaxinfo").",'Service','12.5')");
 	
 	}
 }




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 12:52:51 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 16:52:51 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7651 -
	/vtigercrm/trunk/modules/Users/saveemailtemplate.php
Message-ID: <20060628165251.A7CA083FDBF@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 28 10:52:43 2006
New Revision: 7651

Log:
Added vtiger_ in getUniqueID function parameter

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

Modified: vtigercrm/trunk/modules/Users/saveemailtemplate.php
==============================================================================
--- vtigercrm/trunk/modules/Users/saveemailtemplate.php (original)
+++ vtigercrm/trunk/modules/Users/saveemailtemplate.php Wed Jun 28 10:52:43 2006
@@ -41,7 +41,7 @@
 }
 else
 {
-	$templateid = $db->getUniqueID('emailtemplates');
+	$templateid = $db->getUniqueID('vtiger_emailtemplates');
 	$sql = "insert into vtiger_emailtemplates values ('". $folderName. "','".$templateName."','".$subject."','".$description."','".$body."',0,".$templateid.")";
 	$adb->query($sql);
 




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 12:54:32 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 16:54:32 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7653 -
	/vtigercrm/trunk/modules/Webmails/Save.php
Message-ID: <20060628165432.2548A83FD57@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 28 10:54:23 2006
New Revision: 7653

Log:
Added vtiger_ in getUniqueID function parameter

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

Modified: vtigercrm/trunk/modules/Webmails/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Webmails/Save.php (original)
+++ vtigercrm/trunk/modules/Webmails/Save.php Wed Jun 28 10:54:23 2006
@@ -107,7 +107,7 @@
 
 	    $upload_filepath = decideFilePath();
 	    for($i=0,$num_files=count($attachments);$i<$num_files;$i++) {
-		$current_id = $adb->getUniqueID("crmentity");
+		$current_id = $adb->getUniqueID("vtiger_crmentity");
 		$date_var = date('YmdHis');
 
 		$filename = ereg_replace("[ ()-]+", "_",$attachments[$i]["filename"]);




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 12:56:56 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 16:56:56 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7654 -
	/vtigercrm/trunk/soap/customerportal.php
Message-ID: <20060628165657.6A37783FDD5@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 28 10:56:46 2006
New Revision: 7654

Log:
Added vtiger_ in getUniqueID function parameter

Modified:
    vtigercrm/trunk/soap/customerportal.php

Modified: vtigercrm/trunk/soap/customerportal.php
==============================================================================
--- vtigercrm/trunk/soap/customerportal.php (original)
+++ vtigercrm/trunk/soap/customerportal.php Wed Jun 28 10:56:46 2006
@@ -713,7 +713,7 @@
 	fclose($handle);	
 
 	//Now store this file information in db and relate with the ticket
-	$attachmentid = $adb->getUniqueID("crmentity");
+	$attachmentid = $adb->getUniqueID("vtiger_crmentity");
 	$date_var = date('YmdHis');
 	$description = 'CustomerPortal Attachment';
 




From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 12:57:23 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 16:57:23 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7655 -
	/vtigercrm/trunk/soap/vtigerolservice.php
Message-ID: <20060628165723.7F13C83FDD5@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 28 10:57:15 2006
New Revision: 7655

Log:
Added vtiger_ in getUniqueID function parameter

Modified:
    vtigercrm/trunk/soap/vtigerolservice.php

Modified: vtigercrm/trunk/soap/vtigerolservice.php
==============================================================================
--- vtigercrm/trunk/soap/vtigerolservice.php (original)
+++ vtigercrm/trunk/soap/vtigerolservice.php Wed Jun 28 10:57:15 2006
@@ -372,7 +372,7 @@
      $seed_user = new User();
      $user_id = $seed_user->retrieve_user_id($username);
      	
-     $crmid = $adb->getUniqueID("crmentity");
+     $crmid = $adb->getUniqueID("vtiger_crmentity");
      
      $upload_file_path = decideFilePath();
    	




From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 28 13:00:05 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 28 Jun 2006 17:00:05 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231370=3A?=
 =?utf-8?q?_Campaigns=3A_Disconnected_Simple_Time_Filter?=
In-Reply-To: <076.ba40063443d1d72768187489cd3eea9d@vtiger.fosslabs.com>
References: <076.ba40063443d1d72768187489cd3eea9d@vtiger.fosslabs.com>
Message-ID: <085.7981351dce6a5c63224dd49beb790231@vtiger.fosslabs.com>

#1370: Campaigns: Disconnected Simple Time Filter
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  ela  
      Type:  defect     |      Status:  new  
  Priority:  critical   |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => ela

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1370>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 28 13:00:52 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 28 Jun 2006 17:00:52 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231379=3A?=
 =?utf-8?q?_Calendar=3A_+_icon_position?=
In-Reply-To: <076.0c79d92ae6c8bcb494ec7242b613447b@vtiger.fosslabs.com>
References: <076.0c79d92ae6c8bcb494ec7242b613447b@vtiger.fosslabs.com>
Message-ID: <085.a679f86ba6dbe21ab40be203a850fd53@vtiger.fosslabs.com>

#1379: Calendar: + icon position
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  ela  
      Type:  defect     |      Status:  new  
  Priority:  critical   |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => ela

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1379>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 28 13:01:37 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 28 Jun 2006 17:01:37 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231381=3A?=
 =?utf-8?q?_To_Do_-_Wrong_grouping?=
In-Reply-To: <076.badf11791e67728b99c8aecc440697a7@vtiger.fosslabs.com>
References: <076.badf11791e67728b99c8aecc440697a7@vtiger.fosslabs.com>
Message-ID: <085.96294d75168c477e791bee1b5c3093dc@vtiger.fosslabs.com>

#1381: To Do - Wrong grouping
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  mangai
      Type:  defect     |      Status:  new   
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => mangai

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1381>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 28 13:01:55 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 28 Jun 2006 17:01:55 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231382=3A?=
 =?utf-8?q?_Calendar=3A_Start_My_Calendar_Time_=2E=2E?=
In-Reply-To: <076.c0c6252fbd0b46e64e1992decb196d6d@vtiger.fosslabs.com>
References: <076.c0c6252fbd0b46e64e1992decb196d6d@vtiger.fosslabs.com>
Message-ID: <085.78315172a038320d8d05f28cf4550356@vtiger.fosslabs.com>

#1382: Calendar: Start My Calendar Time ..
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  mangai
      Type:  defect     |      Status:  new   
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:             |    Keywords:        
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => mangai

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1382>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 28 13:02:19 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 28 Jun 2006 17:02:19 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231368=3A?=
 =?utf-8?q?_Inactive_Import/Export_button_in_Campaigns_module?=
In-Reply-To: <076.e9c23975424fab1b5c70a96fbb22a0fb@vtiger.fosslabs.com>
References: <076.e9c23975424fab1b5c70a96fbb22a0fb@vtiger.fosslabs.com>
Message-ID: <085.519bb61abaf25c71aa754a9198d47bca@vtiger.fosslabs.com>

#1368: Inactive Import/Export button in Campaigns module
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  ahmed
      Type:  defect     |      Status:  new  
  Priority:  major      |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => ahmed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1368>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 28 13:03:09 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 28 Jun 2006 17:03:09 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231383=3A?=
 =?utf-8?q?_Usage_of_=22Faq=22_module_name?=
In-Reply-To: <076.2e1bf80fcff6a7f829a7cb26e55a7836@vtiger.fosslabs.com>
References: <076.2e1bf80fcff6a7f829a7cb26e55a7836@vtiger.fosslabs.com>
Message-ID: <085.4d3c8f36ccb4e8c701c956c0f5bd1f55@vtiger.fosslabs.com>

#1383: Usage of "Faq" module name
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  ahmed
      Type:  defect     |      Status:  new  
  Priority:  major      |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => ahmed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1383>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 28 13:03:29 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 28 Jun 2006 17:03:29 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231384=3A?=
	=?utf-8?q?_RSS_-_RHS_Image?=
In-Reply-To: <076.6dc4261cd0c8a5800f9a2fc04552b1d0@vtiger.fosslabs.com>
References: <076.6dc4261cd0c8a5800f9a2fc04552b1d0@vtiger.fosslabs.com>
Message-ID: <085.dd3a288e141526a8d84e56b127eeb194@vtiger.fosslabs.com>

#1384: RSS - RHS Image
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  saint
      Type:  defect     |      Status:  new  
  Priority:  major      |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => saint

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1384>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 28 13:04:27 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 28 Jun 2006 17:04:27 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231385=3A?=
 =?utf-8?q?_Tool_bar_icons_-_Page_opens_at_different_palces?=
In-Reply-To: <076.a97c3862753f2ecb63d9e35d91c10490@vtiger.fosslabs.com>
References: <076.a97c3862753f2ecb63d9e35d91c10490@vtiger.fosslabs.com>
Message-ID: <085.4c2e659f980aa2155567bb9b6bb5d901@vtiger.fosslabs.com>

#1385: Tool bar icons - Page opens at different palces
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  ela  
      Type:  defect     |      Status:  new  
  Priority:  major      |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => ela

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1385>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Wed Jun 28 12:53:52 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Wed, 28 Jun 2006 16:53:52 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7652 -
 /vtigercrm/trunk/modules/Users/savetermsandconditions.php
Message-ID: <20060628165352.B78C583FDBF@vtiger.fosslabs.com>

Author: richie
Date: Wed Jun 28 10:53:44 2006
New Revision: 7652

Log:
Added vtiger_ in getUniqueID function parameter

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 Wed Jun 28 10:53:44 2006
@@ -19,7 +19,7 @@
 $inv_id = $adb->query_result($result,0,'id');
 if($inv_id == '')
 {
-        $inv_id=$adb->getUniqueID('inventory_tandc');
+        $inv_id=$adb->getUniqueID('vtiger_inventory_tandc');
         $sql="insert into vtiger_inventory_tandc values( '".$inv_id ."','".$inv_type."','". $inv_tandc."')";
 }
 else




From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 28 12:58:42 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 28 Jun 2006 16:58:42 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231375=3A?=
 =?utf-8?q?_Ajax_Chat_window_need_to_be_improved?=
In-Reply-To: <076.9a61ff39258b85bdf4e662518c1eefac@vtiger.fosslabs.com>
References: <076.9a61ff39258b85bdf4e662518c1eefac@vtiger.fosslabs.com>
Message-ID: <085.ba6e6ba8624f0aba73e99837a1ef54f8@vtiger.fosslabs.com>

#1375: Ajax Chat window need to be improved
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  ela  
      Type:  defect     |      Status:  new  
  Priority:  blocker    |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => ela

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1375>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Wed Jun 28 13:00:32 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Wed, 28 Jun 2006 17:00:32 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231371=3A?=
 =?utf-8?q?_Campaigns_Custom_View=3A_Double_Veritcal_scrolling?=
In-Reply-To: <076.95f3ca699904fad0d589b89d3722d2c1@vtiger.fosslabs.com>
References: <076.95f3ca699904fad0d589b89d3722d2c1@vtiger.fosslabs.com>
Message-ID: <085.cdcf78651fb175c8a1ad58ab158ad5ac@vtiger.fosslabs.com>

#1371: Campaigns Custom View: Double Veritcal scrolling
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  ela  
      Type:  defect     |      Status:  new  
  Priority:  critical   |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by don):

  * owner:  developer => ela

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1371>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 29 02:04:52 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 29 Jun 2006 06:04:52 -0000
Subject: [Vtigercrm-commits]
	=?utf-8?q?=5Bvtiger_development=5D_=231341=3A?=
	=?utf-8?q?_Mail_Merge_Templates?=
In-Reply-To: <076.b35680daa00096d0d2e99844d8d6d426@vtiger.fosslabs.com>
References: <076.b35680daa00096d0d2e99844d8d6d426@vtiger.fosslabs.com>
Message-ID: <085.de1d9664dc695c02c8442f7a923b9fdc@vtiger.fosslabs.com>

#1341: Mail Merge Templates
--------------------------+-------------------------------------------------
  Reporter:  anonymous    |       Owner:  ahmed
      Type:  enhancement  |      Status:  new  
  Priority:  major        |   Milestone:       
 Component:  vtigercrm    |     Version:  5.0.0
Resolution:               |    Keywords:       
--------------------------+-------------------------------------------------
Changes (by jerrydgeorge):

  * owner:  developer => ahmed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1341>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 29 02:06:44 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 29 Jun 2006 06:06:44 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7656 -
	/vtigercrm/trunk/modules/Quotes/DetailView.php
Message-ID: <20060629060644.6D045772499@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 29 00:06:40 2006
New Revision: 7656

Log:
* Modified the SINGLE_MOD value from ['Quote'] to 'Quote'

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 Thu Jun 29 00:06:40 2006
@@ -62,7 +62,7 @@
 
 $smarty->assign("CUSTOMFIELD", $cust_fld);
 $smarty->assign("ID", $_REQUEST['record']);
-$smarty->assign("SINGLE_MOD",$app_strings['Quote']);
+$smarty->assign("SINGLE_MOD",'Quote');
 $category = getParentTab();
 $smarty->assign("CATEGORY",$category);
 




From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 29 04:55:29 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 29 Jun 2006 08:55:29 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231369=3A?=
 =?utf-8?q?_Campaigns=3A_Column_Sorting_is_missing?=
In-Reply-To: <076.905324df51cc4ae1000ffb348c83fce2@vtiger.fosslabs.com>
References: <076.905324df51cc4ae1000ffb348c83fce2@vtiger.fosslabs.com>
Message-ID: <085.2167679bc47dee7a21e12328cfa48175@vtiger.fosslabs.com>

#1369: Campaigns: Column Sorting is missing
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  philip
      Type:  defect     |      Status:  closed
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by saraj):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 (In [7657]) sorting added for  all columns in default view. Fixes #1369.

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1369>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 29 04:55:30 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 29 Jun 2006 08:55:30 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7657 -
	/vtigercrm/trunk/modules/Campaigns/Campaign.php
Message-ID: <20060629085530.AC8AE772583@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 29 02:55:25 2006
New Revision: 7657

Log:
sorting added for  all columns in default view. Fixes #1369.

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 Jun 29 02:55:25 2006
@@ -30,7 +30,7 @@
 	var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_campaign'=>'campaignid','vtiger_campaignscf'=>'campaignid');
 	var $column_fields = Array();
 
-	var $sortby_fields = Array('campaignname','smownerid','expectedcost');
+	var $sortby_fields = Array('campaignname','smownerid','campaigntype','product_id','expectedrevenue','closingdate','campaignstatus','expectedresponse','targetaudience');
 
 	var $list_fields = Array(
 					'Campaign Name'=>Array('campaign'=>'campaignname'),




From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 29 05:18:01 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 29 Jun 2006 09:18:01 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231012=3A?=
 =?utf-8?q?_HelpDesk_-_Detail_View_UI_problem?=
In-Reply-To: <076.b198b1e865f9e93c599c9d928fe197d4@vtiger.fosslabs.com>
References: <076.b198b1e865f9e93c599c9d928fe197d4@vtiger.fosslabs.com>
Message-ID: <085.b7d306f29a5bc332c47daf8ad178a3b3@vtiger.fosslabs.com>

#1012: HelpDesk - Detail View UI problem
------------------------+---------------------------------------------------
  Reporter:  saraj      |       Owner:  mangay             
      Type:  defect     |      Status:  closed             
  Priority:  major      |   Milestone:                     
 Component:  vtigercrm  |     Version:  5.0.0              
Resolution:  wontfix    |    Keywords:  helpdesk detailview
------------------------+---------------------------------------------------
Changes (by mangai):

  * resolution:  => wontfix
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1012>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 29 05:50:27 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 29 Jun 2006 09:50:27 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231377=3A?=
 =?utf-8?q?_Error_Message_in_Emails_module?=
In-Reply-To: <076.f36d424ef8cb55fbe8cd894d788526eb@vtiger.fosslabs.com>
References: <076.f36d424ef8cb55fbe8cd894d788526eb@vtiger.fosslabs.com>
Message-ID: <085.d3719d3fca9361b3fa19edc1295a611a@vtiger.fosslabs.com>

#1377: Error Message in Emails module
------------------------+---------------------------------------------------
  Reporter:  gopal      |       Owner:  developer
      Type:  defect     |      Status:  closed   
  Priority:  blocker    |   Milestone:           
 Component:  vtigercrm  |     Version:  5.0.0    
Resolution:  fixed      |    Keywords:           
------------------------+---------------------------------------------------
Comment (by richie):

 (In [7658]) changes made by mmbrich reverted as Listview issue in emails
 has been fixed by enabling allflag .Fixes #1377

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1377>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 29 05:50:28 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 29 Jun 2006 09:50:28 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7658 -
	/vtigercrm/trunk/include/utils/ListViewUtils.php
Message-ID: <20060629095028.CA5A4772805@vtiger.fosslabs.com>

Author: richie
Date: Thu Jun 29 03:50:23 2006
New Revision: 7658

Log:
changes made by mmbrich reverted as Listview issue in emails has been fixed by enabling allflag .Fixes #1377 

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 Thu Jun 29 03:50:23 2006
@@ -368,7 +368,7 @@
 	{
 		$end = $noofrows;
 	}
-	if($paging != 0) {$paging = ceil ($noofrows / $limit);}
+	$paging = ceil ($noofrows / $limit);
 	// Display the navigation
 	if ($display > 1) {
 		$previous = $display - 1;




From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 29 06:24:56 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 29 Jun 2006 10:24:56 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231357=3A?=
 =?utf-8?q?_Activity_History_missing_in_Products_and_HelpDesk_Related_List?=
In-Reply-To: <076.c812704daaa1c7137cf696dc99c6d8cd@vtiger.fosslabs.com>
References: <076.c812704daaa1c7137cf696dc99c6d8cd@vtiger.fosslabs.com>
Message-ID: <085.b9b33472fed12b5d409334f3249eaa66@vtiger.fosslabs.com>

#1357: Activity History missing in Products and HelpDesk Related List
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  philip
      Type:  defect     |      Status:  closed
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by saraj):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 (In [7659]) Activites removed from product related list. Fixes #1357.

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1357>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 29 06:24:57 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 29 Jun 2006 10:24:57 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7659 -
 /vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
Message-ID: <20060629102457.3D7698389C1@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 29 04:24:49 2006
New Revision: 7659

Log:
Activites removed from product related list. Fixes #1357.

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

Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original)
+++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Thu Jun 29 04:24:49 2006
@@ -1709,10 +1709,6 @@
 
 	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Products").",".getTabid("HelpDesk").",'get_tickets',1,'HelpDesk',0)");
 
-	
-	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Products").",".getTabid("Activities").",'get_activities',2,'Activities',0)");
-
-	
 	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Products").",0,'get_attachments',3,'Attachments',0)");
 	
 	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Products").",".getTabid("Quotes").",'get_quotes',4,'Quotes',0)");




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 29 06:31:52 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 29 Jun 2006 10:31:52 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7660 -
	/vtigercrm/trunk/include/js/ListView.js
Message-ID: <20060629103152.55C558389C1@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 29 04:31:47 2006
New Revision: 7660

Log:
Updated listview js file with an if check that gets rid of inconsistency in list view button - ahmed

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

Modified: vtigercrm/trunk/include/js/ListView.js
==============================================================================
--- vtigercrm/trunk/include/js/ListView.js (original)
+++ vtigercrm/trunk/include/js/ListView.js Thu Jun 29 04:31:47 2006
@@ -11,7 +11,10 @@
 {
 	var select_options  =  document.getElementsByName('selected_id');
 	var x = select_options.length;
-	var viewid = document.massdelete.viewname.value;
+	if(typeof(document.massdelete.viewname) != 'undefined')
+		var viewid = document.massdelete.viewname.value;
+	else
+		var viewid ='';		
 	idstring = "";
 
 	xx = 0;
@@ -38,8 +41,12 @@
 {
 		var select_options  =  document.getElementsByName('selected_id');
 		var x = select_options.length;
-		var viewid = document.massdelete.viewname.value;
-        idstring = "";
+		if(typeof(document.massdelete.viewname) != 'undefined')
+			var viewid = document.massdelete.viewname.value;
+		else
+			var viewid ='';		
+
+		idstring = "";
 
         xx = 0;
         for(i = 0; i < x ; i++)




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 29 07:37:05 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 29 Jun 2006 11:37:05 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7661 - in /vtigercrm/trunk:
 Popup.php Smarty/templates/Popup.tpl Smarty/templates/PopupContents.tpl
Message-ID: <20060629113705.926D6772800@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 29 05:36:59 2006
New Revision: 7661

Log:
* Modified to handle the popuptype after made search

Modified:
    vtigercrm/trunk/Popup.php
    vtigercrm/trunk/Smarty/templates/Popup.tpl
    vtigercrm/trunk/Smarty/templates/PopupContents.tpl

Modified: vtigercrm/trunk/Popup.php
==============================================================================
--- vtigercrm/trunk/Popup.php (original)
+++ vtigercrm/trunk/Popup.php Thu Jun 29 05:36:59 2006
@@ -296,7 +296,7 @@
 $navigationOutput = getTableHeaderNavigation($navigation_array, $url_string,$currentModule,"Popup");
 $smarty->assign("NAVIGATION", $navigationOutput);
 $smarty->assign("RECORD_COUNTS", $record_string);
-$smarty->assign("POPUP_TYPE", $popuptype);
+$smarty->assign("POPUPTYPE", $popuptype);
 
 
 if(isset($_REQUEST['ajax']) && $_REQUEST['ajax'] != '')

Modified: vtigercrm/trunk/Smarty/templates/Popup.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Popup.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Popup.tpl Thu Jun 29 05:36:59 2006
@@ -51,6 +51,7 @@
 					<input type="hidden" name="curr_row" value="{$CURR_ROW}">
 					<input type="hidden" name="fldname_pb" value="{$FIELDNAME}">
 					<input type="hidden" name="productid_pb" value="{$PRODUCTID}">
+					<input name="popuptype" id="popup_type" type="hidden" value="{$POPUPTYPE}">
 
 				</td>
 				<td width="20%" class="dvtCellLabel">

Modified: vtigercrm/trunk/Smarty/templates/PopupContents.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/PopupContents.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/PopupContents.tpl Thu Jun 29 05:36:59 2006
@@ -27,7 +27,7 @@
         <input name="pmodule" type="hidden" value="{$MODULE}">
 		<input type="hidden" name="curr_row" value="{$CURR_ROW}">	
 		<input name="entityid" type="hidden" value="">
-		<input name="popup_type" id="popup_type" type="hidden" value="{$POPUP_TYPE}">
+		<input name="popuptype" id="popup_type" type="hidden" value="{$POPUPTYPE}">
 		<input name="idlist" type="hidden" value="">
 		<div style="overflow:auto;height:334px;">
 		<table style="background-color: rgb(204, 204, 204);" class="small" border="0" cellpadding="5" cellspacing="1" width="100%">




From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 29 07:53:14 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 29 Jun 2006 11:53:14 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231201=3A?=
 =?utf-8?q?_could_not_install_=2Ebin_with_default_apache_and_mysql?=
In-Reply-To: <076.a2a48d622de2b413e928bb5187dbd9ad@vtiger.fosslabs.com>
References: <076.a2a48d622de2b413e928bb5187dbd9ad@vtiger.fosslabs.com>
Message-ID: <085.da70e492f5463cfc4760b2a3f399e46a@vtiger.fosslabs.com>

#1201: could not install .bin with default apache and mysql
------------------------+---------------------------------------------------
  Reporter:  mangai     |       Owner:  Richie
      Type:  defect     |      Status:  closed
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * resolution:  => fixed
  * status:  new => closed

Old description:

> I got the following error in .bin installation with default apache and
> mysql.
>
> compiling imap c-files
>
> ************************ Error **********************
>  Error while installing PHP 5.1.2 Quitting setup ...
> *****************************************************
>
> But .bin and .bin installation with bundled apache and default mysql was
> successful

New description:

 I got the following error in .bin installation with default apache and
 mysql.

 compiling imap c-files

 ************************ Error **********************
  Error while installing PHP 5.1.2 Quitting setup ...
 *****************************************************

 But .bin and .bin installation with bundled apache and default mysql was
 successful


 Richie: The issue was because of improper entry in the httpd.conf file
 which was a result of an error in the .bin script. Has been fixed.

Comment:

 Fixed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1201>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 29 07:53:53 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 29 Jun 2006 11:53:53 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231185=3A?=
 =?utf-8?q?_could_not_install_=2Ebin_with_default_apache_and_bundled_mysql?=
In-Reply-To: <076.6370e2d438c2565f58d0b5d3f57b00ec@vtiger.fosslabs.com>
References: <076.6370e2d438c2565f58d0b5d3f57b00ec@vtiger.fosslabs.com>
Message-ID: <085.ec9f5b77934ed302dc795ce5024e84a6@vtiger.fosslabs.com>

#1185: could not install .bin with default apache and bundled mysql
------------------------+---------------------------------------------------
  Reporter:  mangai     |       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:

 Issue was due to improper .bin script which resulted in proper entry not
 being put into the httpd.conf file.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1185>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 29 08:00:49 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 29 Jun 2006 12:00:49 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231392=3A?=
 =?utf-8?q?_Product_popup_throws_page_not_found_error?=
In-Reply-To: <076.98b6c865c25365846d37f3a61ea7c371@vtiger.fosslabs.com>
References: <076.98b6c865c25365846d37f3a61ea7c371@vtiger.fosslabs.com>
Message-ID: <085.07f4d676e5200077666b3a97261a4cbb@vtiger.fosslabs.com>

#1392: Product popup throws page not found error
------------------------+---------------------------------------------------
  Reporter:  mickie     |       Owner:  mickie
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mickie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 This issue has been fixed.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1392>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 29 08:31:26 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 29 Jun 2006 12:31:26 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7662 -
 /vtigercrm/trunk/modules/Users/language/en_us.lang.php
Message-ID: <20060629123127.4B10083FD77@vtiger.fosslabs.com>

Author: richie
Date: Thu Jun 29 06:30:58 2006
New Revision: 7662

Log:
New UI for Users has been integrated

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

Modified: vtigercrm/trunk/modules/Users/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Users/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Users/language/en_us.lang.php Thu Jun 29 06:30:58 2006
@@ -240,7 +240,8 @@
 // Added fields in detailViewmailtemplate.html,listgroupmembers.php,listgroups.php
 'LBL_DETAIL_VIEW_OF_EMAIL_TEMPLATE'=>'Detail View of Email Template',
 'LBL_DETAIL_VIEW'=>'Detail View of',
-'LBL_EDIT_VIEW'=>'Edit View of',
+'LBL_EDIT_VIEW'=>'Editing details of the user',
+'LBL_EDITING'=>'Editing user',
 'LBL_GROUP_MEMBERS_LIST'=>'Group members list',
 'LBL_GROUPS'=>'Groups',
 'LBL_ADD_GROUP_BUTTON'=>'Add Group',
@@ -572,6 +573,7 @@
 'LBL_HIDE'=>'Hide',
 'LBL_HOME_PAGE_COMP'=>'Home Page Components',
 'LBL_LOGIN_HISTORY'=>'Login History',
+'LBL_USERDETAIL_INFO'=>'Viewing details about the user',
 );
 
 ?>




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 29 08:31:44 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 29 Jun 2006 12:31:44 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7663 - in
 /vtigercrm/trunk/modules/Users: DetailView.php EditView.php ListView.php
 LoginHistory.php ShowHistory.php User.php UserGroups.php
Message-ID: <20060629123144.DA95B83F3F2@vtiger.fosslabs.com>

Author: richie
Date: Thu Jun 29 06:30:44 2006
New Revision: 7663

Log:
New UI for Users has been integrated

Added:
    vtigercrm/trunk/modules/Users/UserGroups.php
Modified:
    vtigercrm/trunk/modules/Users/DetailView.php
    vtigercrm/trunk/modules/Users/EditView.php
    vtigercrm/trunk/modules/Users/ListView.php
    vtigercrm/trunk/modules/Users/LoginHistory.php
    vtigercrm/trunk/modules/Users/ShowHistory.php
    vtigercrm/trunk/modules/Users/User.php

Modified: vtigercrm/trunk/modules/Users/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DetailView.php (original)
+++ vtigercrm/trunk/modules/Users/DetailView.php Thu Jun 29 06:30:44 2006
@@ -83,10 +83,6 @@
 require_once($theme_path.'layout_utils.php');
 
 //the user might belong to multiple groups
-if($focus->id != 1)
-{
- $groupids = fetchUserGroupids($focus->id);
-}
 $log->info("User detail view");
 
 $category = getParenttab();
@@ -99,7 +95,7 @@
 $smarty->assign("MOD", $smod_strings);
 
 $smarty->assign("APP", $app_strings);
-
+$smarty->assign("GROUP_COUNT",count(getGroupDetails($focus->id)));
 $smarty->assign("THEME", $theme);
 $smarty->assign("IMAGE_PATH", $image_path);$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']);
 $smarty->assign("ID", $focus->id);
@@ -139,16 +135,9 @@
 	$buttons = "<input title='".$app_strings['LBL_EDIT_BUTTON_TITLE']."' accessKey='".$app_strings['LBL_EDIT_BUTTON_KEY']."' class='crmButton small edit' onclick=\"this.form.return_module.value='Users'; this.form.return_action.value='DetailView'; this.form.return_id.value='$focus->id'; this.form.action.value='EditView'; this.form.parenttab.value='$parenttab'\" type='submit' name='Edit' value='  ".$app_strings['LBL_EDIT_BUTTON_LABEL']."  '>";
 	$smarty->assign('EDIT_BUTTON',$buttons);
 	
-		$buttons = "<input title='".$mod_strings['LBL_CHANGE_PASSWORD_BUTTON_TITLE']."' accessKey='".$mod_strings['LBL_CHANGE_PASSWORD_BUTTON_KEY']."' class='classBtn' LANGUAGE=javascript onclick='return window.open(\"index.php?module=Users&action=ChangePassword&form=DetailView\",\"test\",\"width=320,height=165,resizable=no,scrollbars=0, toolbar=no, titlebar=no, left=100, top=126, screenX=100, screenY=126\");' type='button' name='password' value='".$mod_strings['LBL_CHANGE_PASSWORD_BUTTON_LABEL']."'>";
+		$buttons = "<input title='".$mod_strings['LBL_CHANGE_PASSWORD_BUTTON_TITLE']."' accessKey='".$mod_strings['LBL_CHANGE_PASSWORD_BUTTON_KEY']."' class='crmButton password small' LANGUAGE=javascript onclick='return window.open(\"index.php?module=Users&action=ChangePassword&form=DetailView\",\"test\",\"width=320,height=165,resizable=no,scrollbars=0, toolbar=no, titlebar=no, left=200, top=226, screenX=100, screenY=126\");' type='button' name='password' value='".$mod_strings['LBL_CHANGE_PASSWORD_BUTTON_LABEL']."'>";
 		$smarty->assign('CHANGE_PW_BUTTON',$buttons);
 	
-	$buttons = "<input title='".$mod_strings['LBL_LOGIN_HISTORY_BUTTON_TITLE']."' accessKey='".$mod_strings['LBL_LOGIN_HISTORY_BUTTON_KEY']."' class='classBtn' onclick=\"this.form.return_module.value='Users'; this.form.return_action.value='ShowHistory'; this.form.return_id.value='$focus->id'; this.form.action.value='ShowHistory'\" type='submit' name='LoginHistory' value=' ".$mod_strings['LBL_LOGIN_HISTORY_BUTTON_LABEL']." '>";	
-	$smarty->assign('LOGIN_HISTORY_BUTTON',$buttons);
-	$buttons = "<input title='".$mod_strings['LBL_LIST_MAILSERVER_BUTTON_TITLE']."' accessKey='".$mod_strings['LBL_LIST_MAILSERVER_BUTTON_KEY']."' class='classBtn' onclick=\"this.form.return_module.value='Users'; this.form.return_action.value='ListMailAccount'; this.form.return_id.value='$focus->id'; this.form.module.value='Settings' ;this.form.action.value='ListMailAccount'\" type='submit' name='ListMailServerAccount' value=' ".$mod_strings['LBL_LIST_MAILSERVER_BUTTON_LABEL']." '>";
-	$smarty->assign('LIST_MAILSERVER_BUTTON',$buttons);
-	$buttons = "<input title='".$mod_strings['LBL_CHANGE_HOMEPAGE_TITLE']."' class='classBtn' align='center' onclick=\"this.form.return_module.value='Users';  this.form.return_action.value='DetailView';  this.form.action.value='EditHomeOrder';  this.form.record.value='$focus->id';\"  type='submit' name='EditHomeOrder'  value='  ".$mod_strings['LBL_CHANGE_HOMEPAGE_LABEL']."  '>";
-	$smarty->assign('CHANGE_HOMEPAGE_BUTTON',$buttons);
-
 	
 }
 if (is_admin($current_user)) 
@@ -184,7 +173,7 @@
 $smarty->assign("CURRENT_USERID", $current_user->id);
 $smarty->assign("HOMEORDER",$focus->getHomeOrder($focus->id));
 $smarty->assign("BLOCKS", getBlocks($currentModule,"detail_view",'',$focus->column_fields));
-
+$smarty->assign("USERNAME",$focus->last_name.' '.$focus->first_name);
 
 $smarty->display("UserDetailView.tpl");
 

Modified: vtigercrm/trunk/modules/Users/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/Users/EditView.php (original)
+++ vtigercrm/trunk/modules/Users/EditView.php Thu Jun 29 06:30:44 2006
@@ -43,6 +43,7 @@
 	$mode='edit';
 	if (!is_admin($current_user) && $_REQUEST['record'] != $current_user->id) die ("Unauthorized access to user administration.");
     $focus->retrieve_entity_info($_REQUEST['record'],'Users');
+	$smarty->assign("USERNAME",$focus->last_name.' '.$focus->first_name);
 }else
 {
 	$mode='create';
@@ -110,6 +111,6 @@
 
 $smarty->assign('PARENTTAB',$_REQUEST['parenttab']);
 
-	$smarty->display('UserEditView.tpl');
+$smarty->display('UserEditView.tpl');
 
 ?>

Modified: vtigercrm/trunk/modules/Users/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Users/ListView.php (original)
+++ vtigercrm/trunk/modules/Users/ListView.php Thu Jun 29 06:30:44 2006
@@ -59,10 +59,7 @@
 $list_query .= ' ORDER BY '.$order_by.' '.$sorder;
 $list_result = $adb->query($list_query);
 //Retreive the Navigation array
-$navigation_array = getNavigationValues($start, $no_of_users['user'], '10');
-$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] ." ".$no_of_users['user'];
+$navigation_array = getNavigationValues($start, $adb->num_rows($list_result), $no_of_users['user']);
 
 $navigationOutput = getTableHeaderNavigation($navigation_array, $url_string,"Administration","index",'');
 $smarty->assign("MOD", return_module_language($current_language,'Settings'));

Modified: vtigercrm/trunk/modules/Users/LoginHistory.php
==============================================================================
--- vtigercrm/trunk/modules/Users/LoginHistory.php (original)
+++ vtigercrm/trunk/modules/Users/LoginHistory.php Thu Jun 29 06:30:44 2006
@@ -18,7 +18,7 @@
 require_once('include/database/PearDatabase.php');
 
 // Contact is used to store customer information.
-class LoginHistory extends SugarBean {
+class LoginHistory {
 	var $log;
 	var $db;
 
@@ -51,11 +51,77 @@
 		$this->db = new PearDatabase();
 	}
 	
+	var $sortby_fields = Array('user_name', 'user_ip', 'login_time', 'logout_time', 'status');	 
+       	
 	// This is the list of vtiger_fields that are in the lists.
-	var $list_fields = Array('login_id', 'user_name', 'user_ip', 'login_time', 'logout_time', 'status');	
+	var $list_fields = Array(
+			'User Name'=>Array('vtiger_loginhistory'=>'user_name'), 
+			'User IP'=>Array('vtiger_loginhistory'=>'user_ip'), 
+			'Signin Time'=>Array('vtiger_loginhistory'=>'login_time'),
+		        'Signout Time'=>Array('vtiger_loginhistory'=>'logout_time'), 
+			'Status'=>Array('vtiger_loginhistory'=>'status'),
+		);	
+	
+	var $list_fields_name = Array(
+		'User Name'=>'user_name',
+		'User IP'=>'user_ip',
+		'Signin Time'=>'login_time',
+		'Signout Time'=>'logout_time',
+		'Status'=>'status'
+		);	
+	var $default_order_by = "login_time";
+	var $default_sort_order = 'DESC';
+
+
+	function getHistoryListViewHeader()
+	{
+		global $app_strings;
 		
-	var $default_order_by = "login_id";
+		$header_array = array($app_strings['LBL_LIST_USER_NAME'], $app_strings['LBL_LIST_USERIP'], $app_strings['LBL_LIST_SIGNIN'], $app_strings['LBL_LIST_SIGNOUT'], $app_strings['LBL_LIST_STATUS']);
 
+		return $header_array;
+		
+	}
+
+	function getHistoryListViewEntries($navigation_array, $sorder='', $orderby='')
+	{
+		global $adb, $current_user;	
+
+		if($sorder != '' && $order_by != '')
+		{
+			if(is_admin($current_user))
+	       			$list_query = "Select * from vtiger_loginhistory order by ".$order_by." ".$sorder;
+			else	
+	       			$list_query = "Select * from vtiger_loginhistory where user_name=".$current_user->user_name." order by ".$order_by." ".$sorder;
+				
+		}	
+		else
+		{
+			if(is_admin($current_user))
+				$list_query = "Select * from vtiger_loginhistory order by ".$this->default_order_by." ".$this->default_sort_order;
+			else	
+				$list_query = "Select * from vtiger_loginhistory where user_name='".$current_user->user_name."' order by ".$this->default_order_by." ".$this->default_sort_order;
+				
+		}
+		$result = $adb->query($list_query);
+		$entries_list = array();
+		
+		for($i = $navigation_array['start']; $i <= $navigation_array['end_val']; $i++)
+		{
+			$entries = array();
+			$loginid = $adb->query_result($result, $i-1, 'login_id');
+
+			$entries[] = $adb->query_result($result, $i-1, 'user_name');
+			$entries[] = $adb->query_result($result, $i-1, 'user_ip');
+			$entries[] = $adb->query_result($result, $i-1, 'login_time');
+			$entries[] = $adb->query_result($result, $i-1, 'logout_time');
+			$entries[] = $adb->query_result($result, $i-1, 'status');
+
+			$entries_list[] = $entries;
+		}		
+		return $entries_list;
+		
+	}
 	
 	/** Records the Login info */
 	function user_login(&$usname,&$usip,&$intime)

Modified: vtigercrm/trunk/modules/Users/ShowHistory.php
==============================================================================
--- vtigercrm/trunk/modules/Users/ShowHistory.php (original)
+++ vtigercrm/trunk/modules/Users/ShowHistory.php Thu Jun 29 06:30:44 2006
@@ -9,13 +9,12 @@
  * All Rights Reserved.
  ********************************************************************************/
 
-require_once('XTemplate/xtpl.php');
+require_once('Smarty_setup.php');
 require_once('data/Tracker.php');
 require_once('modules/Users/LoginHistory.php');
 require_once('modules/Users/User.php');
 require_once('themes/'.$theme.'/layout_utils.php');
 require_once('include/logging.php');
-require_once('include/ListView/ListView.php');
 require_once('include/database/PearDatabase.php');
 #require_once('modules/Users/User.php');
 require_once('include/utils/utils.php');
@@ -23,7 +22,7 @@
 global $app_strings;
 global $mod_strings;
 global $app_list_strings;
-global $current_language;
+global $current_language, $current_user, $adb;
 $current_module_strings = return_module_language($current_language, 'Users');
 
 global $list_max_entries_per_page;
@@ -34,28 +33,54 @@
 global $currentModule;
 
 global $theme;
+$theme_path="themes/".$theme."/";
+$image_path=$theme_path."images/";
 
-$focus = new User();
+$focus = new LoginHistory();
 
-if(isset($_REQUEST['record'])) {
-	$focus->retrieve_entity_info($_REQUEST['record'],"Users");
+$smarty = new vtigerCRM_Smarty;
+
+$category = getParenttab();
+
+if(is_admin($current_user))
+{
+	$qry = "Select * from vtiger_loginhistory";
+	$qry_result = $adb->query($qry);
+	$no_of_rows = $adb->num_rows($qry_result);
 }
-if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') {
-	$focus->id = "";
+else
+{
+	$qry = "Select * from vtiger_loginhistory where user_name='".$current_user->user_name."'";
+	$qry_result = $adb->query($qry);
+	$no_of_rows = $adb->num_rows($qry_result);
 }
 
-// focus_list is the means of passing data to a ListView.
-global $focus_list;
+//Retreiving the start value from request
+if(isset($_REQUEST['start']) && $_REQUEST['start'] != '')
+{
+        $start = $_REQUEST['start'];
+}
+else
+	$start=1;
 
-if (!isset($where)) $where = "";
+//Retreive the Navigation array
+$navigation_array = getNavigationValues($start, $no_of_rows, '10');
 
-$seedLogin = new LoginHistory();
 
-$ListView = new ListView();
-$ListView->initNewXTemplate('modules/Users/ShowHistory.html',$current_module_strings);
-$ListView->setHeaderTitle($current_module_strings['LBL_LOGIN_HISTORY_BUTTON_LABEL']);
-$ListView->setHeaderText($button);
-$ListView->setQuery($where, "", "login_id", "LOGIN");
-$ListView->processListView($seedLogin, "main", "LOGIN");
+$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] ." ".$no_of_rows;
 
+$navigationOutput = getTableHeaderNavigation($navigation_array, $url_string,"Users","ShowHistory",'');
+
+$smarty->assign("MOD", $current_module_strings);
+$smarty->assign("APP", $app_strings);
+$smarty->assign("IMAGE_PATH",$image_path);
+$smarty->assign("LIST_HEADER",$focus->getHistoryListViewHeader());
+$smarty->assign("LIST_ENTRIES",$focus->getHistoryListViewEntries($navigation_array, $sorder, $sortby));
+$smarty->assign("RECORD_COUNTS", $record_string);
+$smarty->assign("NAVIGATION", $navigationOutput);
+$smarty->assign("CATEGORY",$category);
+
+$smarty->display("ShowHistoryContents.tpl");
 ?>

Modified: vtigercrm/trunk/modules/Users/User.php
==============================================================================
--- vtigercrm/trunk/modules/Users/User.php (original)
+++ vtigercrm/trunk/modules/Users/User.php Thu Jun 29 06:30:44 2006
@@ -861,19 +861,6 @@
 			return GetRelatedList('Users','Activities',$focus,$query,$button,$returnset);
         }
 
-function get_user_groups($id)
-{
-		global $log;
-                        $log->debug("Entering get_contacts(".$id.") method ...");
-			global $app_strings;
-			$button = '';
-			$query = 'select vtiger_users.*,vtiger_groups.* from vtiger_users inner join vtiger_users2group on vtiger_users.id=vtiger_users2group.userid left join vtiger_groups on vtiger_groups.groupid=vtiger_users2group.groupid where vtiger_users.id='.$id;
-			$log->debug("Exiting get_contacts method ...");
-			return getAllGroupInfo($query);
-			}
-
-
-	
 	function save($module_name) 
 	{
 		global $log;




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 29 08:32:38 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 29 Jun 2006 12:32:38 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7664 - in
 /vtigercrm/trunk/include/utils: CommonUtils.php DetailViewUtils.php
 UserInfoUtil.php
Message-ID: <20060629123240.44BF183F870@vtiger.fosslabs.com>

Author: richie
Date: Thu Jun 29 06:32:03 2006
New Revision: 7664

Log:
Changes made as the New UI for Users has been integrated

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

Modified: vtigercrm/trunk/include/utils/CommonUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/CommonUtils.php (original)
+++ vtigercrm/trunk/include/utils/CommonUtils.php Thu Jun 29 06:32:03 2006
@@ -952,12 +952,12 @@
 	{
 		if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0 || $module == "Users")
 		{
-			$sql = "select vtiger_field.* from vtiger_field where vtiger_field.tabid=".$tabid." and vtiger_field.block in $blockid_list and vtiger_field.displaytype in (1,2) order by block,sequence";
+			$sql = "select vtiger_field.* from vtiger_field where vtiger_field.tabid=".$tabid." and vtiger_field.block in $blockid_list and vtiger_field.displaytype in (1,2,4) order by block,sequence";
 		}
 		else
 		{
 			$profileList = getCurrentUserProfileList();
-			$sql = "select vtiger_field.* from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.tabid=".$tabid." and vtiger_field.block in ".$blockid_list." and vtiger_field.displaytype in (1,2) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList." group by vtiger_field.fieldid order by block,sequence";
+			$sql = "select vtiger_field.* from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.tabid=".$tabid." and vtiger_field.block in ".$blockid_list." and vtiger_field.displaytype in (1,2,4) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList." group by vtiger_field.fieldid order by block,sequence";
 		}
 		$result = $adb->query($sql);
 		$getBlockInfo=getDetailBlockInformation($module,$result,$col_fields,$tabid,$block_label);
@@ -973,7 +973,7 @@
 			else
 			{
 				$profileList = getCurrentUserProfileList();
-				$sql = "select vtiger_field.* from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid  where vtiger_field.tabid=".$tabid." and vtiger_field.block in ".$blockid_list." and vtiger_field.displaytype in (1,4) and info_type = '".$info_type."' and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList.=" group by vtiger_field.fieldid order by block,sequence";
+				$sql = "select vtiger_field.* from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid  where vtiger_field.tabid=".$tabid." and vtiger_field.block in ".$blockid_list." and ".$display_type_check." and info_type = '".$info_type."' and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList.=" group by vtiger_field.fieldid order by block,sequence";
 			}
 		}
 		else
@@ -985,7 +985,7 @@
 			else
 			{
 				$profileList = getCurrentUserProfileList();
-				$sql = "select vtiger_field.* from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid  where vtiger_field.tabid=".$tabid." and vtiger_field.block in ".$blockid_list." and vtiger_field.displaytype in (1,4) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList.=" group by vtiger_field.fieldid order by block,sequence";
+				$sql = "select vtiger_field.* from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid  where vtiger_field.tabid=".$tabid." and vtiger_field.block in ".$blockid_list." and ".$display_type_check." and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList.=" group by vtiger_field.fieldid order by block,sequence";
 			}
 		}
 		$result = $adb->query($sql);

Modified: vtigercrm/trunk/include/utils/DetailViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/DetailViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/DetailViewUtils.php Thu Jun 29 06:32:03 2006
@@ -58,7 +58,13 @@
 
         if($col_fields[$fieldname]=='--None--')
                 $col_fields[$fieldname]='';
-	if($uitype == 116)
+	if($uitype == 99)
+	{
+		$label_fld[] = $mod_strings[$fieldlabel];
+		$label_fld[] = $col_fields[$fieldname];
+		if($fieldname == 'confirm_password')
+			return null;
+	}elseif($uitype == 116)
 	{
 		$label_fld[] = $mod_strings[$fieldlabel];
                 $label_fld[] = getCurrencyName($col_fields[$fieldname]);
@@ -1084,7 +1090,10 @@
 		$generatedtype = $adb->query_result($result,$i,"generatedtype");
 		$tabid = $adb->query_result($result,$i,"tabid");
 		$custfld = getDetailViewOutputHtml($uitype, $fieldname, $fieldlabel, $col_fields,$generatedtype,$tabid);
-		$label_data[$block][] = array($custfld[0]=>array("value"=>$custfld[1],"ui"=>$custfld[2],"options"=>$custfld["options"],"secid"=>$custfld["secid"],"link"=>$custfld["link"],"cursymb"=>$custfld["cursymb"],"salut"=>$custfld["salut"],"cntimage"=>$custfld["cntimage"],"isadmin"=>$custfld["isadmin"],"tablename"=>$fieldtablename,"fldname"=>$fieldname));
+		if(is_array($custfld))
+		{
+			$label_data[$block][] = array($custfld[0]=>array("value"=>$custfld[1],"ui"=>$custfld[2],"options"=>$custfld["options"],"secid"=>$custfld["secid"],"link"=>$custfld["link"],"cursymb"=>$custfld["cursymb"],"salut"=>$custfld["salut"],"cntimage"=>$custfld["cntimage"],"isadmin"=>$custfld["isadmin"],"tablename"=>$fieldtablename,"fldname"=>$fieldname));
+		}
 		$i++;
 		if($i<$noofrows)
 		{
@@ -1099,7 +1108,10 @@
 			$tabid = $adb->query_result($result,$i,"tabid");
 
 			$custfld = getDetailViewOutputHtml($uitype, $fieldname, $fieldlabel, $col_fields,$generatedtype,$tabid);
-			$label_data[$block][] = array($custfld[0]=>array("value"=>$custfld[1],"ui"=>$custfld[2],"options"=>$custfld["options"],"secid"=>$custfld["secid"],"link"=>$custfld["link"],"cursymb"=>$custfld["cursymb"],"salut"=>$custfld["salut"],"cntimage"=>$custfld["cntimage"],"isadmin"=>$custfld["isadmin"],"tablename"=>$fieldtablename,"fldname"=>$fieldname));
+			if(is_array($custfld))
+			{
+				$label_data[$block][] = array($custfld[0]=>array("value"=>$custfld[1],"ui"=>$custfld[2],"options"=>$custfld["options"],"secid"=>$custfld["secid"],"link"=>$custfld["link"],"cursymb"=>$custfld["cursymb"],"salut"=>$custfld["salut"],"cntimage"=>$custfld["cntimage"],"isadmin"=>$custfld["isadmin"],"tablename"=>$fieldtablename,"fldname"=>$fieldname));
+			}
 		}
 
 	}

Modified: vtigercrm/trunk/include/utils/UserInfoUtil.php
==============================================================================
--- vtigercrm/trunk/include/utils/UserInfoUtil.php (original)
+++ vtigercrm/trunk/include/utils/UserInfoUtil.php Thu Jun 29 06:32:03 2006
@@ -2763,6 +2763,30 @@
 
 }
 
+/** Function to get groupid and groupname of all for the given groupid 
+  * @returns $grpArray -- Group Array in the following format:
+  * $grpArray=Array($grpid1=>$grpname); 
+ */
+function getGroupDetails($id)
+{
+	global $log;
+	$log->debug("Entering getAllGroupDetails() method ...");
+	global $adb;
+	$query="select * from vtiger_groups where groupid = $id";
+	$result = $adb->query($query);
+	$num_rows=$adb->num_rows($result);
+	if($num_rows < 1)
+		return null;
+	$group_details=Array();
+	$grpid=$adb->query_result($result,0,'groupid');
+	$grpname=$adb->query_result($result,0,'groupname');
+	$grpdesc=$adb->query_result($result,0,'description');
+	$group_details=Array($grpid,$grpname,$grpdesc);
+		
+	$log->debug("Exiting getAllGroupDetails method ...");
+	return $group_details;
+
+}
 /** Function to get group information of all vtiger_groups 
   * @returns $grpInfoArray -- Group Informaton array in the following format: 
   * $grpInfoArray=Array($grpid1=>Array($grpname,description) $grpid2=>Array($grpname,description),............,$grpidn=>Array($grpname,description)); 




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 29 08:33:36 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 29 Jun 2006 12:33:36 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7665 - in
 /vtigercrm/trunk/Smarty/templates: DetailViewUI.tpl DisplayFields.tpl
 ShowHistoryContents.tpl UserDetailView.tpl UserEditView.tpl UserGroups.tpl
 UserListViewContents.tpl
Message-ID: <20060629123337.3A76F83F8C5@vtiger.fosslabs.com>

Author: richie
Date: Thu Jun 29 06:32:43 2006
New Revision: 7665

Log:
Changes made as the New UI for Users has been integrated

Added:
    vtigercrm/trunk/Smarty/templates/ShowHistoryContents.tpl
    vtigercrm/trunk/Smarty/templates/UserGroups.tpl
Modified:
    vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl
    vtigercrm/trunk/Smarty/templates/DisplayFields.tpl
    vtigercrm/trunk/Smarty/templates/UserDetailView.tpl
    vtigercrm/trunk/Smarty/templates/UserEditView.tpl
    vtigercrm/trunk/Smarty/templates/UserListViewContents.tpl

Modified: vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl Thu Jun 29 06:32:43 2006
@@ -226,6 +226,8 @@
                     <a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
                     </div>
                     </td>
+						{elseif $keyid eq '99'}<!-- Password Field-->
+						<td width=25% class="dvtCellInfo" align="left">{$CHANGE_PW_BUTTON}</td>	
 					    {elseif $keyid eq '56'} <!--CheckBox--> 
                       <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onMouseOver="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}">{$keyval}&nbsp;</span>
                     	<div id="editarea_{$label}" style="display:none;">

Modified: vtigercrm/trunk/Smarty/templates/DisplayFields.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DisplayFields.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DisplayFields.tpl Thu Jun 29 06:32:43 2006
@@ -489,7 +489,7 @@
 				{else}
 					<td width="30%" align=left class="dvtCellInfo">
 						<input name="{$fldname}" {$disable_status} tabindex="{$vt_tab}" type="checkbox">
-						<input name="{$fldname}" type="hidden" value="{$fldvalue}">
+						<input name="{$fldname}" type="hidden" value="off">
 					</td>
 				{/if}
 		{elseif $uitype eq 98}<!-- Role Selection Popup -->		

Modified: vtigercrm/trunk/Smarty/templates/UserDetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/UserDetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/UserDetailView.tpl Thu Jun 29 06:32:43 2006
@@ -47,9 +47,9 @@
 		<input type="hidden" name="return_id">
 		<input type="hidden" name="forumDisplay">
 		{if $CATEGORY eq 'Settings'}
-			<input type="hidden" name="parenttab" value="{$PARENTTAB}">
+		<input type="hidden" name="parenttab" value="{$PARENTTAB}">
 		{/if}	
-	        <table width="100%" border="0" cellpadding="0" cellspacing="0">
+	        <table width="100%" border="0" cellpadding="0" cellspacing="0" class="settingsSelUITopLine">
 		<tr>
 		    <td style="border-bottom:1px dashed #CCCCCC;">
 			<table width="100%" cellpadding="5" cellspacing="0" border="0">
@@ -57,35 +57,32 @@
 			    <td rowspan="2"><img src="{$IMAGE_PATH}user.gif" align="absmiddle"></td>	
 			    <td>
 			    {if $CATEGORY eq 'Settings'}
-				<span class="lvtHeaderText">
-				<b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS} </a> > {$MOD.LBL_USER_MANAGEMENT} > {$MOD.LBL_USERS}</b></span>
+				<span class="heading2">
+				<b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS} </a> &gt; <a href="index.php?module=Administration&action=index&parenttab=Settings"> {$MOD.LBL_USERS} </a>&gt;"{$USERNAME}" </b></span>
 			    {else}
-				<span class="lvtHeaderText">	
+				<span class="heading2">	
 				<b>{$APP.LBL_MY_PREFERENCES}</b>
 			   	</span>
 			    {/if}
 			    <span id="vtbusy_info" style="display:none;" valign="bottom"><img src="{$IMAGE_PATH}vtbusy.gif" border="0"></span>					
 			    </td>
-			    <td rowspan="2" nowrap>
-				{if $CATEGORY eq 'Settings'}
-                                	{$DUPLICATE_BUTTON}
-                        	{/if}
-				{$EDIT_BUTTON}
+			    <td rowspan="2" nowrap>&nbsp;					
 			    </td>	
 			</tr>
 			<tr>
-			    <td>sssssssssss</td>
+			    <td>{$UMOD.LBL_USERDETAIL_INFO} "{$USERNAME}"</td>
 			</tr>
 		    </table>
 		</td>
 	    </tr>
-	    <tr><td>&nbsp;</td></tr>
-	    <tr valign="center">
-	    	<td class="small" align="center">
-			{$CHANGE_PW_BUTTON}
-			{$LOGIN_HISTORY_BUTTON}
-		</td>
-	    </tr>
+	    <tr><td colspan="2">&nbsp;</td></tr>
+	    <tr>
+		<td rowspan="2" nowrap align="right">
+			{if $CATEGORY eq 'Settings'}
+                               	{$DUPLICATE_BUTTON}
+                       	{/if}
+			{$EDIT_BUTTON}
+		</td>&nbsp;</tr>
 	    <tr><td colspan="2">&nbsp;</td></tr>
 	    <tr>
 		<td colspan="2">
@@ -161,13 +158,32 @@
 			    <table class="tableHeading" border="0" cellpadding="5" cellspacing="0" width="100%">
 			    	<tr>
 				     <td class="big">	
-					<strong>5.{$UMOD.LBL_LOGIN_HISTORY}</strong>
-				     </td>
-				     <td class="small" align="right">&nbsp;</td>	
+					<strong>5.My Groups</strong>
+				     </td>
+				     <td class="small" align="right">
+					{if $GROUP_COUNT > 0}
+					<img src="{$IMAGE_PATH}showDown.gif" alt="{$APP.LBL_EXPAND_COLLAPSE}" title="{$APP.LBL_EXPAND_COLLAPSE}" onClick="fetchGroups_js({$ID});">
+					{else}
+						&nbsp;
+					{/if}
+					</td>	
 			        </tr>
 			    </table>
 			    <table border="0" cellpadding="5" cellspacing="0" width="100%">
-				<tr><td>&nbsp;</td><td></td></tr>	
+				<tr><td align="left"><div id="user_group_cont" style="display:none;"></div></td></tr>	
+			    </table>	
+
+			<br>
+			    <table class="tableHeading" border="0" cellpadding="5" cellspacing="0" width="100%">
+			    	<tr>
+				     <td class="big">	
+					<strong>6.{$UMOD.LBL_LOGIN_HISTORY}</strong>
+				     </td>
+				     <td class="small" align="right"><img src="{$IMAGE_PATH}showDown.gif" alt="{$APP.LBL_EXPAND_COLLAPSE}" title="{$APP.LBL_EXPAND_COLLAPSE}" onClick="fetchlogin_js({$ID});"></td>	
+			        </tr>
+			    </table>
+			    <table border="0" cellpadding="5" cellspacing="0" width="100%">
+				<tr><td align="left"><div id="login_history_cont" style="display:none;"></div></td><td></td></tr>	
 			    </table>	
 
 			</td>
@@ -209,4 +225,70 @@
 	else
 		Effect.Appear(divid);
 {rdelim}
+{literal}
+function fetchlogin_js(id)
+{
+	if($('login_history_cont').style.display != 'none')
+		Effect.Fade('login_history_cont');
+	else
+		fetchLoginHistory(id);
+
+}
+function fetchLoginHistory(id)
+{
+        $("status").style.display="inline";
+        new Ajax.Request(
+                'index.php',
+                {queue: {position: 'end', scope: 'command'},
+                        method: 'post',
+                        postBody: 'module=Users&action=UsersAjax&file=ShowHistory&ajax=true&record='+id,
+                        onComplete: function(response) {
+                                $("status").style.display="none";
+                                $("login_history_cont").innerHTML= response.responseText;
+				Effect.Appear('login_history_cont');
+                        }
+                }
+        );
+
+}
+function fetchGroups_js(id)
+{
+	if($('user_group_cont').style.display != 'none')
+		Effect.Fade('user_group_cont');
+	else
+		fetchUserGroups(id);
+}
+function fetchUserGroups(id)
+{
+        $("status").style.display="inline";
+        new Ajax.Request(
+                'index.php',
+                {queue: {position: 'end', scope: 'command'},
+                        method: 'post',
+                        postBody: 'module=Users&action=UsersAjax&file=UserGroups&ajax=true&record='+id,
+                        onComplete: function(response) {
+                                $("status").style.display="none";
+                                $("user_group_cont").innerHTML= response.responseText;
+				Effect.Appear('user_group_cont');
+                        }
+                }
+        );
+
+}
+function getListViewEntries_js(module,url)
+{
+	$("status").style.display="inline";
+        new Ajax.Request(
+        	'index.php',
+                {queue: {position: 'end', scope: 'command'},
+                	method: 'post',
+                        postBody:"module="+module+"&action="+module+"Ajax&file=ShowHistory&ajax=true&"+url,
+			onComplete: function(response) {
+                        	$("status").style.display="none";
+                                $("login_history_cont").innerHTML= response.responseText;
+                  	}
+                }
+        );
+}
+{/literal}
 </script>

Modified: vtigercrm/trunk/Smarty/templates/UserEditView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/UserEditView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/UserEditView.tpl Thu Jun 29 06:32:43 2006
@@ -61,42 +61,6 @@
 		{include file='SetMenu.tpl'}
 	{/if}
 
-
-	<table width="100%"  border="0" cellspacing="0" cellpadding="0">
-	<tr><td align="left">
-		<table class="settingsSelUITopLine" border="0" cellpadding="5" cellspacing="0" width="100%">
-		<tr>
-			<td rowspan="2"><img src="{$IMAGE_PATH}user.gif" align="absmiddle"></td>
-			<td>	
-				<span class="lvtHeaderText">
-				{if $PARENTTAB neq ''}	
-				<b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS} </a> > {$MOD.LBL_USER_MANAGEMENT} > {$MOD.LBL_USERS}</b></span>
-				{else}
-                                <span class="lvtHeaderText">
-                                <b>{$APP.LBL_MY_PREFERENCES}</b>
-                                </span>
-                                {/if}
-			</td>
-			<td rowspan="2" nowrap>
-				<input title="{$APP.LBL_SAVE_BUTTON_TITLE}" accesskey="{$APP.LBL_SAVE_BUTTON_KEY}" class="small crmbutton save"  name="button" value="  {$APP.LBL_SAVE_BUTTON_LABEL}  "  onclick="this.form.action.value='Save'; return verify_data(EditView)" style="width: 70px;" type="button" />
-				<input title="{$APP.LBL_CANCEL_BUTTON_TITLE}" accesskey="{$APP.LBL_CANCEL_BUTTON_KEY}" class="small crmbutton cancel" name="button" value="  {$APP.LBL_CANCEL_BUTTON_LABEL}  " onclick="window.history.back()" style="width: 70px;" type="button" />
-						
-			</td>
-	 	</tr>
-		<tr>
-			{if $MODE eq 'edit'}
-				<td><span class="genHeaderGrayBig">{$USER_NAME}</span><br>
-				<b class="small">{$UMOD.LBL_EDIT_VIEW} {$FIRST_NAME} {$LAST_NAME}</b>
-			{else}
-				<td><span class="genHeaderGrayBig">{$UMOD.LBL_NEW_USER_BUTTON_LABEL}</span><br>
-				<b class="small">{$UMOD.LBL_CREATE_NEW_USER}</b>
-			{/if}
-			</td>
-                </tr>
-		</table>
-	</td>
-	</tr>
-	<tr><td class="padTab" align="left">
 		<form name="EditView" method="POST" action="index.php" ENCTYPE="multipart/form-data">
 		<input type="hidden" name="module" value="Users">
 		<input type="hidden" name="record" value="{$ID}">
@@ -112,7 +76,52 @@
 		<input type="hidden" name="workdays" value="0,1,2,3,4,5,6,">			
 		<input type="hidden" name="namedays" value="">			
 		<input type="hidden" name="weekstart" value="1">
-		<table width="100%" border="0" cellpadding="0" cellspacing="0">
+
+	<table width="100%"  border="0" cellspacing="0" cellpadding="0" class="settingsSelUITopLine">
+	<tr><td align="left">
+		<table class="settingsSelUITopLine" border="0" cellpadding="5" cellspacing="0" width="100%">
+		<tr>
+			<td rowspan="2"><img src="{$IMAGE_PATH}user.gif" align="absmiddle"></td>
+			<td>	
+				<span class="lvtHeaderText">
+				{if $PARENTTAB neq ''}	
+				<b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS} </a> &gt; <a href="index.php?module=Administration&action=index&parenttab=Settings">{$MOD.LBL_USERS}</a> &gt; 
+					{if $MODE eq 'edit'}
+						{$UMOD.LBL_EDITING} "{$USERNAME}" 
+					{else}
+						{$UMOD.LBL_CREATE_NEW_USER}
+					{/if}
+					</b></span>
+				{else}
+                                <span class="lvtHeaderText">
+                                <b>{$APP.LBL_MY_PREFERENCES}</b>
+                                </span>
+                                {/if}
+			</td>
+			<td rowspan="2" nowrap>&nbsp;
+			</td>
+	 	</tr>
+		<tr>
+			{if $MODE eq 'edit'}
+				<td><b class="small">{$UMOD.LBL_EDIT_VIEW} "{$USERNAME}"</b>
+			{else}
+				<td><b class="small">{$UMOD.LBL_CREATE_NEW_USER}</b>
+			{/if}
+			</td>
+                </tr>
+		</table>
+	</td>
+	</tr>
+	<tr><td>&nbsp;</td></tr>
+	<tr>
+		<td nowrap align="right">
+				<input title="{$APP.LBL_SAVE_BUTTON_TITLE}" accesskey="{$APP.LBL_SAVE_BUTTON_KEY}" class="small crmbutton save"  name="button" value="  {$APP.LBL_SAVE_BUTTON_LABEL}  "  onclick="this.form.action.value='Save'; return verify_data(EditView)" style="width: 70px;" type="button" />
+				<input title="{$APP.LBL_CANCEL_BUTTON_TITLE}" accesskey="{$APP.LBL_CANCEL_BUTTON_KEY}" class="small crmbutton cancel" name="button" value="  {$APP.LBL_CANCEL_BUTTON_LABEL}  " onclick="window.history.back()" style="width: 70px;" type="button" />
+						
+		</td>
+	</tr>
+	<tr><td class="padTab" align="left">
+				<table width="100%" border="0" cellpadding="0" cellspacing="0">
 
 		<tr><td colspan="2">
 			<table align="center" border="0" cellpadding="0" cellspacing="0" width="99%">
@@ -141,7 +150,7 @@
 			    	<table class="tableHeading" border="0" cellpadding="5" cellspacing="0" width="100%">
 			    	<tr>
 				     <td class="big">	
-					<strong>4.sdjhfsjkhfjalkssdjhfsjkhfjalks</strong>
+					<strong>4.{$UMOD.LBL_HOME_PAGE_COMP}</strong>
 				     </td>
 				     <td class="small" align="right">&nbsp;</td>	
 			        </tr>
@@ -164,17 +173,6 @@
 				{/foreach}
 			    	</table>	
 				<br>
-			    	<table class="tableHeading" border="0" cellpadding="5" cellspacing="0" width="100%">
-			    	<tr>
-				     <td class="big">	
-					<strong>5.kssdjhfsjkhfjalks</strong>
-				     </td>
-				     <td class="small" align="right">&nbsp;</td>	
-			        </tr>
-			    	</table>
-			    	<table border="0" cellpadding="5" cellspacing="0" width="100%">
-					<tr><td>&nbsp;</td><td></td></tr>	
-			    	</table>	
 				<tr><td colspan=4>&nbsp;</td></tr>
 							
 					        <tr>
@@ -192,10 +190,10 @@
 				  </td></tr>
 				<tr><td class="small"><div align="right"><a href="#top">{$MOD.LBL_SCROLL}</a></div></td></tr>
 				</table>
-				</form>	
 			</td>
 			</tr>
 			</table>
+			</form>	
 </td>
 </tr>
 </table>

Modified: vtigercrm/trunk/Smarty/templates/UserListViewContents.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/UserListViewContents.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/UserListViewContents.tpl Thu Jun 29 06:32:43 2006
@@ -25,11 +25,12 @@
 	{foreach name=userlist item=listvalues key=userid from=$LIST_ENTRIES}
 <tr>
 	<td class="listTableRow small" valign=top>{$smarty.foreach.userlist.iteration}</td>
-	<td class="listTableRow small" valign=top><a href="index.php?action=EditView&return_action=ListView&return_module=Users&module=Users&parenttab=Settings&record={$userid}"><img src="{$IMAGE_PATH}editfield.gif" alt="Edit" title="Edit" border="0"></a>&nbsp;
+	<td class="listTableRow small" nowrap valign=top><a href="index.php?action=EditView&return_action=ListView&return_module=Users&module=Users&parenttab=Settings&record={$userid}"><img src="{$IMAGE_PATH}settingsActBtnEdit.gif" alt="{$APP.LBL_EDIT_BUTTON}" title="{$APP.LBL_EDIT_BUTTON}" border="0"></a>
 	{if $userid neq 1 && $userid neq 2}	
-	<img src="{$IMAGE_PATH}delete.gif" onclick="deleteUser('{$userid}')" border="0"  alt="Delete" title="Delete"/></a>
+	<img src="{$IMAGE_PATH}settingsActBtnDelete.gif" onclick="deleteUser('{$userid}')" border="0"  alt="{$APP.LBL_DELETE_BUTTON}" title="{$APP.LBL_DELETE_BUTTON}" style="cursor:pointer;"/></a>
 	{/if}
-&nbsp;</td>
+	<a href="index.php?action=EditView&return_action=ListView&return_module=Users&module=Users&parenttab=Settings&record={$userid}&isDuplicate=true"><img src="{$IMAGE_PATH}settingsActBtnDuplicate.gif" alt="{$APP.LBL_DUPLICATE_BUTTON}" title="{$APP.LBL_DUPLICATE_BUTTON}" border="0"></a>
+</td>
 	<td class="listTableRow small" valign=top><b><a href="index.php?module=Users&action=DetailView&parenttab=Settings&record={$userid}"> {$listvalues.3} </a></b><br><a href="index.php?module=Users&action=DetailView&parenttab=Settings&record={$userid}"> {$listvalues.1} {$listvalues.0}</a> ({$listvalues.2})</td>
 	<td class="listTableRow small" valign=top>{$listvalues.5}</td>
 	<td class="listTableRow small" valign=top>{$listvalues.7}</td>




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 29 08:35:19 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 29 Jun 2006 12:35:19 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7666 -
	/vtigercrm/trunk/include/language/en_us.lang.php
Message-ID: <20060629123520.BE91A83FB19@vtiger.fosslabs.com>

Author: richie
Date: Thu Jun 29 06:34:49 2006
New Revision: 7666

Log:
language issue in signin and signout has been changed

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

Modified: vtigercrm/trunk/include/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/include/language/en_us.lang.php (original)
+++ vtigercrm/trunk/include/language/en_us.lang.php Thu Jun 29 06:34:49 2006
@@ -204,9 +204,9 @@
 
 'LBL_LIST_USERIP'=>'User IP',
 
-'LBL_LIST_SIGNIN'=>'Signin Time',
-
-'LBL_LIST_SIGNOUT'=>'Signout Time',
+'LBL_LIST_SIGNIN'=>'Sign in Time',
+
+'LBL_LIST_SIGNOUT'=>'Sign out Time',
 
 'LBL_LIST_STATUS'=>'Status',
 




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 29 08:36:08 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 29 Jun 2006 12:36:08 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7667 - in
 /vtigercrm/trunk/themes/blue/images: settingsActBtnDelete.gif
 settingsActBtnDuplicate.gif settingsActBtnEdit.gif
Message-ID: <20060629123608.4F2D683FB19@vtiger.fosslabs.com>

Author: richie
Date: Thu Jun 29 06:35:36 2006
New Revision: 7667

Log:
New Images added to integrate UI for Users

Added:
    vtigercrm/trunk/themes/blue/images/settingsActBtnDelete.gif   (with props)
    vtigercrm/trunk/themes/blue/images/settingsActBtnDuplicate.gif   (with props)
    vtigercrm/trunk/themes/blue/images/settingsActBtnEdit.gif   (with props)




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 29 09:07:56 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 29 Jun 2006 13:07:56 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7668 -
	/vtigercrm/trunk/modules/SalesOrder/EditView.php
Message-ID: <20060629130756.D25A183FDFA@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 29 07:07:52 2006
New Revision: 7668

Log:
* Added QUOTE_ID to set the quote id where as previously if we create SO from quote then the quote relationship was not saved. now the quote-SO relationship saved

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

Modified: vtigercrm/trunk/modules/SalesOrder/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/SalesOrder/EditView.php (original)
+++ vtigercrm/trunk/modules/SalesOrder/EditView.php Thu Jun 29 07:07:52 2006
@@ -52,6 +52,7 @@
 
 	//Added to display the Quotes's associated vtiger_products -- when we create SO from Quotes DetailView 
 	$associated_prod = getAssociatedProducts("Quotes",$quote_focus);
+	$smarty->assign("QUOTE_ID", $quoteid);
 	$smarty->assign("ASSOCIATEDPRODUCTS", $associated_prod);
 	$smarty->assign("MODE", $quote_focus->mode);
 	$smarty->assign("TAXVALUE", convertFromDollar($quote_focus->column_fields['txtTax'],$rate));




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 29 09:09:20 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 29 Jun 2006 13:09:20 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7669 -
 /vtigercrm/trunk/Smarty/templates/Inventory/InventoryActions.tpl
Message-ID: <20060629130920.BB80583FDF9@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 29 07:09:16 2006
New Revision: 7669

Log:
* Added return_id to pass to SO editview where as previously if we create SO from quote then the quote relationship was not saved. now the quote-SO relationship saved

Modified:
    vtigercrm/trunk/Smarty/templates/Inventory/InventoryActions.tpl

Modified: vtigercrm/trunk/Smarty/templates/Inventory/InventoryActions.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Inventory/InventoryActions.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Inventory/InventoryActions.tpl Thu Jun 29 07:09:16 2006
@@ -151,7 +151,7 @@
 	   <tr>
 		<td align="left" style="padding-left:10px;border-bottom:1px dotted #CCCCCC;">
 			<img src="{$IMAGE_PATH}pointer.gif" hspace="5" align="absmiddle"/>
-			<a href="javascript: document.DetailView.return_module.value='{$MODULE}'; document.DetailView.return_action.value='DetailView'; document.DetailView.convertmode.value='quotetoso'; document.DetailView.module.value='SalesOrder'; document.DetailView.action.value='EditView'; document.DetailView.submit();" class="webMnu">{$APP.LBL_GENERATE} {$APP.SalesOrder}</a> 
+			<a href="javascript: document.DetailView.return_module.value='{$MODULE}'; document.DetailView.return_action.value='DetailView'; document.DetailView.convertmode.value='quotetoso'; document.DetailView.module.value='SalesOrder'; document.DetailView.action.value='EditView'; document.DetailView.return_id.value='{$ID}'; document.DetailView.submit();" class="webMnu">{$APP.LBL_GENERATE} {$APP.SalesOrder}</a> 
 		</td>
 	   </tr>
 	   <!-- Quotes Actions ends -->




From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 29 09:10:38 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 29 Jun 2006 13:10:38 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231394=3A?=
 =?utf-8?q?_quote_is_not_getting_saved_when_we_create_SO_from_Quotes?=
In-Reply-To: <076.2e16a7e666b39de47b21f8d6af637752@vtiger.fosslabs.com>
References: <076.2e16a7e666b39de47b21f8d6af637752@vtiger.fosslabs.com>
Message-ID: <085.0d77e9ce01889a5e728a02c7a65cba4a@vtiger.fosslabs.com>

#1394: quote is not getting saved when we create SO from Quotes
------------------------+---------------------------------------------------
  Reporter:  mickie     |       Owner:  mickie
      Type:  defect     |      Status:  closed
  Priority:  major      |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mickie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 This issue has been fixed now.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1394>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 29 09:30:06 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 29 Jun 2006 13:30:06 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231395=3A?=
 =?utf-8?q?_Improper_Time_Displayed_while_creating_Event/task?=
Message-ID: <076.59a2dcba37c02890d142606a127d39df@vtiger.fosslabs.com>

#1395: Improper Time Displayed while creating Event/task
-----------------------+----------------------------------------------------
 Reporter:  ahmed      |       Owner:  mangai
     Type:  defect     |      Status:  new   
 Priority:  critical   |   Milestone:        
Component:  vtigercrm  |     Version:  5.0.0 
 Keywords:             |  
-----------------------+----------------------------------------------------


-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1395>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 29 09:53:41 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 29 Jun 2006 13:53:41 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231388=3A?=
 =?utf-8?q?_Quick_Edit_not_functional_for_activity_module?=
In-Reply-To: <076.50cd906646f38b3f0a24d3ab69d7789d@vtiger.fosslabs.com>
References: <076.50cd906646f38b3f0a24d3ab69d7789d@vtiger.fosslabs.com>
Message-ID: <085.8518bfff429e7487778e12721cea4620@vtiger.fosslabs.com>

#1388: Quick Edit not functional for activity module
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  Jeri  
      Type:  defect     |      Status:  closed
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 (In [7670]) issue in ajax edit has been fixed .Fixes #1388

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1388>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 29 09:53:42 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 29 Jun 2006 13:53:42 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7670 - in /vtigercrm/trunk:
 include/js/general.js modules/Users/DefaultDataPopulator.php
Message-ID: <20060629135343.520DA83F723@vtiger.fosslabs.com>

Author: richie
Date: Thu Jun 29 07:53:35 2006
New Revision: 7670

Log:
issue in ajax edit has been fixed .Fixes #1388

Modified:
    vtigercrm/trunk/include/js/general.js
    vtigercrm/trunk/modules/Users/DefaultDataPopulator.php

Modified: vtigercrm/trunk/include/js/general.js
==============================================================================
--- vtigercrm/trunk/include/js/general.js (original)
+++ vtigercrm/trunk/include/js/general.js Thu Jun 29 07:53:35 2006
@@ -819,30 +819,33 @@
 	}
        //added to check Start Date & Time,if Activity Status is Planned.//start
         for (var j=0; j<fieldname.length; j++)
+	{
+
+		if(getObj(fieldname[j]) != null)
 		{
-
-			if(getObj(fieldname[j]) != null)
+			if(fieldname[j] == "date_start")
 			{
-				if(fieldname[j] == "date_start")
-				{
-					var datelabel = fieldlabel[j]
-						var datefield = fieldname[j]
-						var startdatevalue = getObj(datefield).value.replace(/^\s+/g, '').replace(/\s+$/g, '')
-				}
-				if(fieldname[j] == "time_start")
-				{
-					var timelabel = fieldlabel[j]
-						var timefield = fieldname[j]
-						var timeval=getObj(timefield).value.replace(/^\s+/g, '').replace(/\s+$/g, '')
-				}
-				if(fieldname[j] == "eventstatus" || fieldname[j] == "taskstatus")
-				{
-					var statusvalue = getObj(fieldname[j]).value.replace(/^\s+/g, '').replace(/\s+$/g, '')
-						var statuslabel = fieldlabel[j++]
-				}
+				var datelabel = fieldlabel[j]
+					var datefield = fieldname[j]
+					var startdatevalue = getObj(datefield).value.replace(/^\s+/g, '').replace(/\s+$/g, '')
 			}
+			if(fieldname[j] == "time_start")
+			{
+				var timelabel = fieldlabel[j]
+					var timefield = fieldname[j]
+					var timeval=getObj(timefield).value.replace(/^\s+/g, '').replace(/\s+$/g, '')
+			}
+			if(fieldname[j] == "eventstatus" || fieldname[j] == "taskstatus")
+			{
+				var statusvalue = getObj(fieldname[j]).value.replace(/^\s+/g, '').replace(/\s+$/g, '')
+					var statuslabel = fieldlabel[j++]
+			}
+		}else
+		{
+			return true;
 		}
-		if(statusvalue == "Planned")
+	}
+	if(statusvalue == "Planned")
         {
                 var dateelements=splitDateVal(startdatevalue)
 

Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original)
+++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Thu Jun 29 07:53:35 2006
@@ -537,7 +537,7 @@
 //Event Details --START
 //Block41-43-- Start
  $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("vtiger_field").",'subject','vtiger_activity',1,'2','subject','Subject',1,0,0,100,1,41,1,'V~M',0,1,'BAS')");
- $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("vtiger_field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,2,41,1,'I~O',1,null,'BAS')");
+ $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("vtiger_field").",'smownerid','vtiger_crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,2,41,1,'V~M',1,null,'BAS')");
  $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("vtiger_field").",'date_start','vtiger_activity',1,'6','date_start','Start Date & Time',1,0,0,100,3,41,1,'DT~M~time_start',0,2,'BAS')");
  $this->db->query("insert into vtiger_field values (16,".$this->db->getUniqueID("vtiger_field").",'time_start','vtiger_activity',1,'2','time_start','Time Start',1,0,0,100,4,41,3,'T~M',1,null,'BAS')");
 




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 29 10:11:55 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 29 Jun 2006 14:11:55 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7671 -
 /vtigercrm/trunk/modules/Users/language/en_us.lang.php
Message-ID: <20060629141155.7552483F723@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 29 08:11:51 2006
New Revision: 7671

Log:
label added for HomePage Dashborad

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

Modified: vtigercrm/trunk/modules/Users/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Users/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Users/language/en_us.lang.php Thu Jun 29 08:11:51 2006
@@ -488,6 +488,7 @@
 'GRT'=>'My Group Allocation',
 'OLTSO'=>'Top Sales Orders',
 'ILTI'=>'Top Invoices',
+'HDB'=>'HomePage Dashborad',
 //Added for 5.0 alpha
 'LBL_GROUP_NAME_ERROR'=>'Group Name already exists!',
 'MNL'=>'My New Leads',




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 29 10:17:30 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 29 Jun 2006 14:17:30 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7672 -
	/vtigercrm/trunk/modules/Users/User.php
Message-ID: <20060629141730.8707E83F723@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 29 08:17:26 2006
New Revision: 7672

Log:
get_activities and get_contacts functions are removed

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 Thu Jun 29 08:17:26 2006
@@ -819,48 +819,6 @@
 		return;
 	}
 
-
-
-
-
-
-
-
-//Function Call for Related List -- Start
-        function get_contacts($id)
-	{
-			global $log;
-                        $log->debug("Entering get_contacts(".$id.") method ...");
-			global $app_strings;
-
-			$focus = new Contact();
-
-			
-			
-			$button = '';
-			$query = 'select vtiger_contactdetails.*, vtiger_crmentity.* from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_contactdetails.contactid where vtiger_crmentity.smownerid='.$id.' and vtiger_crmentity.deleted=0';
-			$log->debug("Exiting get_contacts method ...");
-			return GetRelatedList('Users','Contacts',$focus,$query,$button,$returnset);
-        }
-
-
-
-
-//Function Call for Related List -- Start
-        function get_activities($id)
-	{
-			global $log;
-                        $log->debug("Entering get_contacts(".$id.") method ...");
-			global $app_strings;
-
-			$focus = new Activity();
-			
-			$button = '';
-			$query = 'select vtiger_activity.* from vtiger_activity inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid where vtiger_crmentity.smownerid='.$id.' and (vtiger_activity.activitytype="Meeting" || vtiger_activity.activitytype="Task" || vtiger_activity.activitytype="Call" ) and vtiger_crmentity.deleted=0';
-			$log->debug("Exiting get_contacts method ...");
-			return GetRelatedList('Users','Activities',$focus,$query,$button,$returnset);
-        }
-
 	function save($module_name) 
 	{
 		global $log;




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 29 10:18:13 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 29 Jun 2006 14:18:13 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7673 -
	/vtigercrm/trunk/modules/Users/CallRelatedList.php
Message-ID: <20060629141813.05E6983F723@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 29 08:18:10 2006
New Revision: 7673

Log:
user relatedlist has been removed

Removed:
    vtigercrm/trunk/modules/Users/CallRelatedList.php




From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 29 10:26:26 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 29 Jun 2006 14:26:26 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231396=3A?=
 =?utf-8?q?_Event_not_getting_displayed_in_contact_Related_List?=
Message-ID: <076.ad344c79dc1dc0ab1b64472bf84dc959@vtiger.fosslabs.com>

#1396: Event not getting displayed in contact Related List
-----------------------+----------------------------------------------------
 Reporter:  ahmed      |       Owner:  mangai
     Type:  defect     |      Status:  new   
 Priority:  critical   |   Milestone:        
Component:  vtigercrm  |     Version:  5.0.0 
 Keywords:             |  
-----------------------+----------------------------------------------------


-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1396>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 29 10:28:22 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 29 Jun 2006 14:28:22 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231357=3A?=
 =?utf-8?q?_Activity_History_missing_in_Products_and_HelpDesk_Related_List?=
In-Reply-To: <076.c812704daaa1c7137cf696dc99c6d8cd@vtiger.fosslabs.com>
References: <076.c812704daaa1c7137cf696dc99c6d8cd@vtiger.fosslabs.com>
Message-ID: <085.4b410ffff6cc0c2596ba7ccf34d51c37@vtiger.fosslabs.com>

#1357: Activity History missing in Products and HelpDesk Related List
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  philip
      Type:  defect     |      Status:  closed
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Comment (by richie):

 (In [7674]) Added Activity history for helpdesk. Fixes #1357

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1357>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 29 10:28:23 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 29 Jun 2006 14:28:23 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7674 - in
 /vtigercrm/trunk/modules: HelpDesk/HelpDesk.php
 Users/DefaultDataPopulator.php
Message-ID: <20060629142823.6282283FDEB@vtiger.fosslabs.com>

Author: richie
Date: Thu Jun 29 08:28:16 2006
New Revision: 7674

Log:
Added Activity history for helpdesk. Fixes #1357

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

Modified: vtigercrm/trunk/modules/HelpDesk/HelpDesk.php
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/HelpDesk.php (original)
+++ vtigercrm/trunk/modules/HelpDesk/HelpDesk.php Thu Jun 29 08:28:16 2006
@@ -124,7 +124,7 @@
 
 		$returnset = '&return_module=HelpDesk&return_action=CallRelatedList&return_id='.$id;
 
-		$query = "SELECT vtiger_activity.*, vtiger_crmentity.crmid, vtiger_contactdetails.contactid, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_recurringevents.recurringtype, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid= vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting')";
+		$query = "SELECT vtiger_activity.*, vtiger_crmentity.crmid, vtiger_contactdetails.contactid, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_recurringevents.recurringtype, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid= vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting') AND ( vtiger_activity.status is NULL OR vtiger_activity.status != 'Completed' ) and ( vtiger_activity.eventstatus is NULL OR vtiger_activity.eventstatus != 'Held')";
 		$log->debug("Exiting get_activities method ...");
 		
 		return GetRelatedList('HelpDesk','Activities',$focus,$query,$button,$returnset);
@@ -424,6 +424,29 @@
 		$log->debug("Exiting getCustomerName method ...");
         	return $customername;
 	}
+	
+	function get_history($id)
+	{
+		global $log;
+		$log->debug("Entering get_history(".$id.") method ...");
+		$query = "SELECT vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.status, vtiger_activity.eventstatus,
+		vtiger_activity.activitytype, vtiger_troubletickets.ticketid, vtiger_troubletickets.title, vtiger_crmentity.modifiedtime,
+		vtiger_crmentity.createdtime, vtiger_crmentity.description, vtiger_users.user_name
+				from vtiger_activity
+				inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid= vtiger_activity.activityid
+				inner join vtiger_troubletickets on vtiger_troubletickets.ticketid = vtiger_seactivityrel.crmid
+				inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid
+				left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_activity.activityid
+                                left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname
+				inner join vtiger_users on vtiger_crmentity.smcreatorid= vtiger_users.id
+				where (vtiger_activity.activitytype = 'Meeting' or vtiger_activity.activitytype='Call' or vtiger_activity.activitytype='Task')
+				and (vtiger_activity.status = 'Completed' or vtiger_activity.status = 'Deferred' or (vtiger_activity.eventstatus = 'Held' and vtiger_activity.eventstatus != ''))
+				and vtiger_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("Entering get_history method ...");
+		return getHistory('HelpDesk',$query,$id);
+	}
+
 
 
 }

Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original)
+++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Thu Jun 29 08:28:16 2006
@@ -1627,7 +1627,6 @@
 		
 	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("Contacts").",'get_contacts',2,'Contacts',0)");
 
-	
 	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("Activities").",'get_activities',3,'Activities',0)");
 
 	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Accounts").",".getTabid("HelpDesk").",'get_tickets',4,'HelpDesk',0)");
@@ -1738,6 +1737,8 @@
 	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("HelpDesk").",0,'get_attachments',2,'Attachments',0)");
 
 	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("HelpDesk").",0,'get_ticket_history',3,'Ticket History',0)");
+	
+	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("HelpDesk").",".getTabid("Activities").",'get_history',4,'Activity History',0)");
 
 	//Inserting PriceBook Related Lists
 	$this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("PriceBooks").",14,'get_pricebook_products',2,'Products',0)");




From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 29 10:39:36 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 29 Jun 2006 14:39:36 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231389=3A?=
 =?utf-8?q?_Values_retained_in_the_Pending_Activities_=28Homepage=29_even_?=
 =?utf-8?q?if_no_activity_records_are_present=2E?=
In-Reply-To: <076.411f5cbf1eec66cd754596f2025d46c0@vtiger.fosslabs.com>
References: <076.411f5cbf1eec66cd754596f2025d46c0@vtiger.fosslabs.com>
Message-ID: <085.6f32f7354f41db66df124c084dbd9030@vtiger.fosslabs.com>

#1389: Values retained in the Pending Activities (Homepage) even if no activity
records are present.
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  jeri  
      Type:  defect     |      Status:  closed
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 (In [7675]) query has been modified to fix the pending activity issue in
 home Page.Fixes #1389

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1389>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 29 10:39:37 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 29 Jun 2006 14:39:37 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7675 -
	/vtigercrm/trunk/modules/Activities/OpenListView.php
Message-ID: <20060629143937.D443A83FE08@vtiger.fosslabs.com>

Author: richie
Date: Thu Jun 29 08:39:31 2006
New Revision: 7675

Log:
query has been modified to fix the pending activity issue in home Page.Fixes #1389

Modified:
    vtigercrm/trunk/modules/Activities/OpenListView.php

Modified: vtigercrm/trunk/modules/Activities/OpenListView.php
==============================================================================
--- vtigercrm/trunk/modules/Activities/OpenListView.php (original)
+++ vtigercrm/trunk/modules/Activities/OpenListView.php Thu Jun 29 08:39:31 2006
@@ -55,34 +55,34 @@
 
 	if($activity_view == 'Today')
 	{	
-		$later = date("Y-m-d",strtotime("$today + 1 day"));
+		$later = date("Y-m-d",strtotime("$today +1 day"));
 	}	
 	else if($activity_view == 'This Week')
 	{
-		$later = date("Y-m-d", strtotime("$today + 7 days"));
+		$later = date("Y-m-d", strtotime("$today +7 days"));
 	}
 	else if($activity_view == 'This Month')
 	{	
-		$later = date("Y-m-d", strtotime("$today + 1 month"));
+		$later = date("Y-m-d", strtotime("$today +1 month"));
 	}	
 	else if($activity_view == 'This Year')	
 	{
-		$later = date("Y-m-d", strtotime("$today + 1 year"));
+		$later = date("Y-m-d", strtotime("$today +1 year"));
 	}
 	else if($activity_view == 'OverDue')	
 	{
 		$later = date("Y-m-d", strtotime("$today +1 day"));
 	}
-	$last_tendays = date("Y-m-d",strtotime("$today - 10 days"));
+	$last_tendays = date("Y-m-d",strtotime("$today -10 days"));
 	if($mode != 1)
 	{
 		//for upcoming avtivities
-		$list_query = " select vtiger_crmentity.crmid,vtiger_crmentity.smownerid,vtiger_crmentity.setype, vtiger_activity.*, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid, vtiger_account.accountid, vtiger_account.accountname, vtiger_recurringevents.recurringtype,vtiger_recurringevents.recurringdate from vtiger_activity inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid= vtiger_cntactivityrel.contactid left join vtiger_seactivityrel on vtiger_seactivityrel.activityid = vtiger_activity.activityid left outer join vtiger_account on vtiger_account.accountid = vtiger_contactdetails.accountid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid inner join vtiger_salesmanactivityrel on vtiger_salesmanactivityrel.activityid=vtiger_activity.activityid WHERE vtiger_crmentity.deleted=0 and (vtiger_activity.activitytype = 'Meeting' or vtiger_activity.activitytype='Call' or vtiger_activity.activitytype='Task') AND ( vtiger_activity.status is NULL OR vtiger_activity.status != 'Completed' ) and ( vtiger_activity.status is NULL OR vtiger_activity.status != 'Deferred') and  (  vtiger_activity.eventstatus is NULL OR  vtiger_activity.eventstatus != 'Held') and (vtiger_activity.eventstatus is NULL OR  vtiger_activity.eventstatus != 'Not Held' ) AND (((date_start > '$today' AND date_start < '$later'))  OR (vtiger_recurringevents.recurringdate between '$today' and '$later') ) AND vtiger_crmentity.smownerid !=0 AND vtiger_salesmanactivityrel.smid ='$current_user->id'";
+		$list_query = " select vtiger_crmentity.crmid,vtiger_crmentity.smownerid,vtiger_crmentity.setype, vtiger_activity.*, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid, vtiger_account.accountid, vtiger_account.accountname, vtiger_recurringevents.recurringtype,vtiger_recurringevents.recurringdate from vtiger_activity inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid= vtiger_cntactivityrel.contactid left join vtiger_seactivityrel on vtiger_seactivityrel.activityid = vtiger_activity.activityid left outer join vtiger_account on vtiger_account.accountid = vtiger_contactdetails.accountid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid inner join vtiger_salesmanactivityrel on vtiger_salesmanactivityrel.activityid=vtiger_activity.activityid WHERE vtiger_crmentity.deleted=0 and (vtiger_activity.activitytype = 'Meeting' or vtiger_activity.activitytype='Call' or vtiger_activity.activitytype='Task') AND ( vtiger_activity.status is NULL OR vtiger_activity.status != 'Completed' ) and ( vtiger_activity.status is NULL OR vtiger_activity.status != 'Deferred') and  (  vtiger_activity.eventstatus is NULL OR  vtiger_activity.eventstatus != 'Held') and (vtiger_activity.eventstatus is NULL OR  vtiger_activity.eventstatus != 'Not Held' ) AND ((date_start > '$today' AND date_start < '$later')  OR (vtiger_recurringevents.recurringdate between '$today' and '$later') ) AND vtiger_crmentity.smownerid !=0 AND vtiger_salesmanactivityrel.smid ='$current_user->id'";
 	}	
 	else
 	{
 		//for pending activities for the last 10 days
-		$list_query = " select vtiger_crmentity.crmid,vtiger_crmentity.smownerid,vtiger_crmentity.setype, vtiger_activity.*, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid, vtiger_account.accountid, vtiger_account.accountname, vtiger_recurringevents.recurringtype,vtiger_recurringevents.recurringdate from vtiger_activity inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid= vtiger_cntactivityrel.contactid left join vtiger_seactivityrel on vtiger_seactivityrel.activityid = vtiger_activity.activityid left outer join vtiger_account on vtiger_account.accountid = vtiger_contactdetails.accountid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid inner join vtiger_salesmanactivityrel on vtiger_salesmanactivityrel.activityid=vtiger_activity.activityid WHERE vtiger_crmentity.deleted=0 and (vtiger_activity.activitytype = 'Meeting' or vtiger_activity.activitytype='Call' or vtiger_activity.activitytype='Task') AND ( vtiger_activity.status is NULL OR vtiger_activity.status != 'Completed' ) and ( vtiger_activity.status is NULL OR vtiger_activity.status != 'Deferred') and (  vtiger_activity.eventstatus is NULL OR  vtiger_activity.eventstatus != 'Held') and (vtiger_activity.eventstatus is NULL OR  vtiger_activity.eventstatus != 'Not Held' ) AND (due_date > '$last_tendays' AND due_date <= '$today') OR (vtiger_recurringevents.recurringdate > '$last_tendays' AND vtiger_recurringevents.recurringdate <= '$today') AND vtiger_crmentity.smownerid !=0 AND vtiger_salesmanactivityrel.smid ='$current_user->id'";
+		$list_query = " select vtiger_crmentity.crmid,vtiger_crmentity.smownerid,vtiger_crmentity.setype, vtiger_activity.*, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid, vtiger_account.accountid, vtiger_account.accountname, vtiger_recurringevents.recurringtype,vtiger_recurringevents.recurringdate from vtiger_activity inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid= vtiger_cntactivityrel.contactid left join vtiger_seactivityrel on vtiger_seactivityrel.activityid = vtiger_activity.activityid left outer join vtiger_account on vtiger_account.accountid = vtiger_contactdetails.accountid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid inner join vtiger_salesmanactivityrel on vtiger_salesmanactivityrel.activityid=vtiger_activity.activityid WHERE vtiger_crmentity.deleted=0 and (vtiger_activity.activitytype = 'Meeting' or vtiger_activity.activitytype='Call' or vtiger_activity.activitytype='Task') AND ( vtiger_activity.status is NULL OR vtiger_activity.status != 'Completed' ) and ( vtiger_activity.status is NULL OR vtiger_activity.status != 'Deferred') and (  vtiger_activity.eventstatus is NULL OR  vtiger_activity.eventstatus != 'Held') and (vtiger_activity.eventstatus is NULL OR  vtiger_activity.eventstatus != 'Not Held' ) AND ((due_date > '$last_tendays' AND due_date <= '$today') OR (vtiger_recurringevents.recurringdate > '$last_tendays' AND vtiger_recurringevents.recurringdate <= '$today')) AND vtiger_crmentity.smownerid !=0 AND vtiger_salesmanactivityrel.smid ='$current_user->id'";
 	}
 	$res = $adb->query($list_query);
 	$noofrecords = $adb->num_rows($res);




From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 29 10:41:45 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 29 Jun 2006 14:41:45 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231397=3A?=
 =?utf-8?q?_Add_New_Email_div_Goes_out_of_the_screen?=
Message-ID: <076.2f2fc814f9ae3c4d9cc3e8d30b4fb765@vtiger.fosslabs.com>

#1397: Add New Email div Goes out of the screen
--------------------------+-------------------------------------------------
 Reporter:  jerrydgeorge  |       Owner:  developer
     Type:  defect        |      Status:  new      
 Priority:  major         |   Milestone:           
Component:  vtigercrm     |     Version:  5.0.0    
 Keywords:                |  
--------------------------+-------------------------------------------------
 When i Click an add email from related list it is going out of the page

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1397>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 29 10:41:50 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 29 Jun 2006 14:41:50 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231398=3A?=
 =?utf-8?q?_Add_New_Email_div_Goes_out_of_the_screen?=
Message-ID: <076.13994c1af8465ee3fb98a2251a8b4676@vtiger.fosslabs.com>

#1398: Add New Email div Goes out of the screen
--------------------------+-------------------------------------------------
 Reporter:  jerrydgeorge  |       Owner:  ela  
     Type:  defect        |      Status:  new  
 Priority:  major         |   Milestone:       
Component:  vtigercrm     |     Version:  5.0.0
 Keywords:                |  
--------------------------+-------------------------------------------------
 When i Click an add email from related list it is going out of the page

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1398>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 29 10:42:30 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 29 Jun 2006 14:42:30 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231397=3A?=
 =?utf-8?q?_Add_New_Email_div_Goes_out_of_the_screen?=
In-Reply-To: <076.2f2fc814f9ae3c4d9cc3e8d30b4fb765@vtiger.fosslabs.com>
References: <076.2f2fc814f9ae3c4d9cc3e8d30b4fb765@vtiger.fosslabs.com>
Message-ID: <085.50b6bf8ca8d27709f7066fc9c6c60114@vtiger.fosslabs.com>

#1397: Add New Email div Goes out of the screen
---------------------------+------------------------------------------------
  Reporter:  jerrydgeorge  |       Owner:  developer
      Type:  defect        |      Status:  closed   
  Priority:  major         |   Milestone:           
 Component:  vtigercrm     |     Version:  5.0.0    
Resolution:  duplicate     |    Keywords:           
---------------------------+------------------------------------------------
Changes (by jerrydgeorge):

  * resolution:  => duplicate
  * status:  new => closed

Comment:

 1398

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1397>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 29 11:19:39 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 29 Jun 2006 15:19:39 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231399=3A?=
 =?utf-8?q?_Import_of_contacts_won=27t_link_to_accounts?=
Message-ID: <076.c341350a734ddf6f096a76b70c965286@vtiger.fosslabs.com>

#1399: Import of contacts won't link to accounts
-----------------------+----------------------------------------------------
 Reporter:  andrewr    |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  major      |   Milestone:           
Component:  vtigercrm  |     Version:  5.0.0    
 Keywords:             |  
-----------------------+----------------------------------------------------
 When importing a contact list if the account is mapped it skips importing
 that record.
 If the csv has a blank account for a record it is imported.
 If you unmap the account field the whole file is imported OK.
 This file was created from a vTiger export.
 SVN version 7669.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1399>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 29 11:41:39 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 29 Jun 2006 15:41:39 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231401=3A?=
 =?utf-8?q?_Qty_in_stock_not_displayed_while_adding_SO=2C_PO=2C_INV=2C_Quo?=
 =?utf-8?q?tes?=
Message-ID: <076.d3ca8ee69bf7e900ba9538557e700b06@vtiger.fosslabs.com>

#1401: Qty in stock not displayed while adding SO, PO, INV, Quotes
-----------------------+----------------------------------------------------
 Reporter:  ahmed      |       Owner:  mickie
     Type:  defect     |      Status:  new   
 Priority:  major      |   Milestone:        
Component:  vtigercrm  |     Version:  5.0.0 
 Keywords:             |  
-----------------------+----------------------------------------------------
 If we are creating a SO, PO, Inv from a particular product, the quantity
 in stock column doesnot display any value.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1401>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Thu Jun 29 11:46:28 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Thu, 29 Jun 2006 15:46:28 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231402=3A?=
	=?utf-8?q?_PriceBook_Issues_in_Product?=
Message-ID: <076.3865925b10005a3ad66a5dec37e66865@vtiger.fosslabs.com>

#1402: PriceBook Issues in Product
-----------------------+----------------------------------------------------
 Reporter:  ahmed      |       Owner:  mickie
     Type:  defect     |      Status:  new   
 Priority:  critical   |   Milestone:        
Component:  vtigercrm  |     Version:  5.0.0 
 Keywords:             |  
-----------------------+----------------------------------------------------
 While adding a Pbook from Product related list we are directed to the
 pricebook page which does not display any records in the list even after
 adding a couple of pricebooks. As a result not able to add any Pricebook
 to product related list

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1402>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 29 11:48:14 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 29 Jun 2006 15:48:14 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7676 - in /vtigercrm/trunk:
 Smarty/templates/DetailView.tpl Smarty/templates/DetailViewUI.tpl
 data/CRMEntity.php modules/Faq/language/en_us.lang.php
 modules/HelpDesk/language/en_us.lang.php
Message-ID: <20060629154815.33A7383FE65@vtiger.fosslabs.com>

Author: saraj
Date: Thu Jun 29 09:48:04 2006
New Revision: 7676

Log:
* Modified to display the comments properly where as previously when the language string changes then the comments will not be shown and the add comment value has been emptied because the comments are shown in seperate block

Modified:
    vtigercrm/trunk/Smarty/templates/DetailView.tpl
    vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl
    vtigercrm/trunk/data/CRMEntity.php
    vtigercrm/trunk/modules/Faq/language/en_us.lang.php
    vtigercrm/trunk/modules/HelpDesk/language/en_us.lang.php

Modified: vtigercrm/trunk/Smarty/templates/DetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DetailView.tpl Thu Jun 29 09:48:04 2006
@@ -221,7 +221,7 @@
 
 
 							<!-- This is added to display the existing comments -->
-							{if $header eq 'Comments' || $header eq 'Comment Information'}
+							{if $header eq $MOD.LBL_COMMENTS || $header eq $MOD.LBL_COMMENT_INFORMATION}
 							   <tr>
 								<td colspan=4 style="border-bottom:1px solid #999999;padding:5px;" bgcolor="#e5e5e5">
 						        	<b>{$MOD.LBL_COMMENT_INFORMATION}</b>

Modified: vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl Thu Jun 29 09:48:04 2006
@@ -97,6 +97,10 @@
                                                        </div>
                                                   </td>
                                              {elseif $keyid eq '19' || $keyid eq '20'} <!--TextArea/Description-->
+						<!-- we will empty the value of ticket and faq comment -->
+						{if $label eq $MOD.LBL_ADD_COMMENT}
+							{assign var=keyval value=''}
+						{/if}
                                                   <td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onmouseover="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');">&nbsp;<span id="dtlview_{$label}">{$keyval}</span>
                                               		<div id="editarea_{$label}" style="display:none;">
                                               		  <textarea id="txtbox_{$label}" name="{$keyfldname}"  class=detailedViewTextBox onFocus="this.className='detailedViewTextBoxOn'"onBlur="this.className='detailedViewTextBox'" cols="90" rows="8">{$keyval}</textarea>                                            		  

Modified: vtigercrm/trunk/data/CRMEntity.php
==============================================================================
--- vtigercrm/trunk/data/CRMEntity.php (original)
+++ vtigercrm/trunk/data/CRMEntity.php Thu Jun 29 09:48:04 2006
@@ -1000,15 +1000,20 @@
 }
 function insertIntoFAQCommentTable($table_name, $module)
 {
-	 global $log;
+	global $log;
 	$log->info("in insertIntoFAQCommentTable  ".$table_name."    module is  ".$module);
         global $adb;
 
         $current_time = date('Y-m-d H:i:s');
 
-	if($_REQUEST['comments'] != '')
-	{
-		$comment = addslashes($_REQUEST['comments']);
+	if($this->column_fields['comments'] != '')
+		$comment = $this->column_fields['comments'];
+	else
+		$comment = $_REQUEST['comments'];
+
+	if($comment != '')
+	{
+		$comment = addslashes($comment);
 		$sql = "insert into vtiger_faqcomments values('',".$this->id.",'".$comment."','".$current_time."')";
 		$adb->query($sql);
 	}

Modified: vtigercrm/trunk/modules/Faq/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Faq/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Faq/language/en_us.lang.php Thu Jun 29 09:48:04 2006
@@ -107,6 +107,7 @@
 'Question'=>'Question',
 'Answer'=>'Answer',
 'Comments'=>'Comments',
+'LBL_COMMENTS'=>'Comments',//give the same value given to the above string 'Comments'
 'Created Time'=>'Created Time',
 'Modified Time'=>'Modified Time',
 
@@ -116,6 +117,7 @@
 'Product Name'=>'Product Name',
 'FAQ Id'=>'FAQ Id',
 'Add Comment'=>'Add Comment',
+'LBL_ADD_COMMENT'=>'Add Comment',//give the same value given to the above string 'Add Comment'
 'LBL_COMMENT_INFORMATION'=>'Comment Information',
 'Status'=>'Status',
 

Modified: vtigercrm/trunk/modules/HelpDesk/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/HelpDesk/language/en_us.lang.php Thu Jun 29 09:48:04 2006
@@ -136,6 +136,7 @@
 'LBL_TICKET_RESOLUTION'=>'Solution Information',
 'Solution'=>'Solution',
 'Add Comment'=>'Add Comment',
+'LBL_ADD_COMMENT'=>'Add Comment',//give the same value given to the above string 'Add Comment'
 
 //Added for 4.2 Release -- CustomView
 'Ticket ID'=>'Ticket ID',




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 29 12:23:55 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 29 Jun 2006 16:23:55 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7677 -
	/vtigercrm/trunk/index.php
Message-ID: <20060629162355.CB33F83FE76@vtiger.fosslabs.com>

Author: richie
Date: Thu Jun 29 10:23:47 2006
New Revision: 7677

Log:
Support for last view done

Modified:
    vtigercrm/trunk/index.php

Modified: vtigercrm/trunk/index.php
==============================================================================
--- vtigercrm/trunk/index.php (original)
+++ vtigercrm/trunk/index.php Thu Jun 29 10:23:47 2006
@@ -487,7 +487,7 @@
 	if(isset($_REQUEST['record']) && $_REQUEST['record']!='' && $_REQUEST["module"] != "Webmails") 
         {
                 // Only track a viewing if the record was retrieved.
-                //$focus->track_view($current_user->id, $actualModule,$_REQUEST['record']);
+                $focus->track_view($current_user->id, $actualModule,$_REQUEST['record']);
         }
 
 }	




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 29 12:25:40 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 29 Jun 2006 16:25:40 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7678 -
	/vtigercrm/trunk/Smarty/templates/Header.tpl
Message-ID: <20060629162540.749E083F860@vtiger.fosslabs.com>

Author: richie
Date: Thu Jun 29 10:25:29 2006
New Revision: 7678

Log:
Support for last view done

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 Thu Jun 29 10:25:29 2006
@@ -470,5 +470,26 @@
 {ldelim}
             window.open("index.php?module=Users&action=about_us","aboutwin","height=520,width=515,top=200,left=300")
 {rdelim}
+
 </script>
 
+
+<div id="tracker" style="display:none;position:absolute;z-index:100000001;" onmouseout="fninvsh('tracker');" onMouseOver="fnvshNrm('tracker');">
+
+	<table class="trackerBorder" border="0" cellpadding="5" cellspacing="0" width="200">
+	<tbody><tr style="cursor:move;"><td colspan="2" class="trackerHeading small" id="Track_Handle"><strong>Last Viewed</strong></td><td align="right" style="padding:5px;" class="trackerHeading small">
+		<a href="javascript:;"><img src="{$IMAGEPATH}close.gif" border="0"  onClick="fninvsh('tracker')" hspace="5" align="absmiddle"></a>
+		</td></tr>
+	{foreach name=trackinfo item=trackelements from=$TRACINFO}
+	<tr><td class="trackerListBullet small" align="center" width="12">{$smarty.foreach.trackinfo.iteration}</td><td class="trackerList small"> <a href="index.php?module={$trackelements.module_name}&action=DetailView&record={$trackelements.crmid}">{$trackelements.item_summary}</a> </td><td class="trackerList small">&nbsp;</td></tr>
+	{/foreach}
+	</tbody></table>
+</div>	
+<script>
+	var THandle = document.getElementById("Track_Handle");
+	var TRoot   = document.getElementById("tracker");
+	Drag.init(THandle, TRoot);
+</script>		
+
+
+




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 29 12:28:22 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 29 Jun 2006 16:28:22 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7679 -
	/vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl
Message-ID: <20060629162822.B3FB783FE43@vtiger.fosslabs.com>

Author: richie
Date: Thu Jun 29 10:28:12 2006
New Revision: 7679

Log:
Support for last view done

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

Modified: vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Buttons_List1.tpl Thu Jun 29 10:28:12 2006
@@ -1,122 +1,124 @@
-{*<!--
-/*********************************************************************************
-  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
-   * ("License"); You may not use this file except in compliance with the License
-   * The Original Code is:  vtiger CRM Open Source
-   * The Initial Developer of the Original Code is vtiger.
-   * Portions created by vtiger are Copyright (C) vtiger.
-   * All Rights Reserved.
-  *
- ********************************************************************************/
--->*}
-<script type="text/javascript" src="modules/{$MODULE}/{$SINGLE_MOD}.js"></script>
-<!-- Activity createlink layer start  -->
-{if $MODULE eq 'Activities'}
-<div id="reportLay" style="width: 125px; right: 159px; top: 260px; display: none; z-index:50" onmouseout="fninvsh('reportLay')" onmouseover="fnvshNrm('reportLay')">
-        <table bgcolor="#ffffff" border="0" cellpadding="0" cellspacing="0" width="100%">
-                <tr>
-                        <td>
-                                <a href="index.php?module={$MODULE}&action=EditView&return_module={$MODULE}&activity_mode=Events&return_action=DetailView&parenttab={$CATEGORY}" class="calMnu">{$NEW_EVENT}</a>
-                                <a href="index.php?module={$MODULE}&action=EditView&return_module={$MODULE}&activity_mode=Task&return_action=DetailView&parenttab={$CATEGORY}" class="calMnu">{$NEW_TASK}</a>
-                        </td>
-                </tr>
-        </table>
-
-</div>
-{/if}
-<!-- Activity createlink layer end  -->
-
-
-<TABLE border=0 cellspacing=0 cellpadding=0 width=100% class=small>
-<tr><td style="height:2px"></td></tr>
-<tr>
-	<td style="padding-left:10px;padding-right:50px" class="moduleName" nowrap>{$APP.$CATEGORY} > <a class="hdrLink" href="index.php?action=ListView&module={$MODULE}">{$APP.$MODULE}</a></td>
-	<td width=100% nowrap>
-	
-		<table border="0" cellspacing="0" cellpadding="0" >
-		<tr>
-		<td class="sep1" style="width:1px;"></td>
-		<td class=small >
-			<!-- Add and Search -->
-			<table border=0 cellspacing=0 cellpadding=0>
-			<tr>
-			<td>
-				<table border=0 cellspacing=0 cellpadding=5>
-				<tr>
-					{if $CHECK.EditView eq 'yes'}
-			        		{if $MODULE eq 'Activities'}
-		                      	        	<td style="padding-right:0px;padding-left:10px;"><a href="javascript:;" id="showSubMenu"  onMouseOver="fnvshobj(this,'reportLay');" onMouseOut="fninvsh('reportLay');"><img src="{$IMAGE_PATH}btnL3Add.gif" alt="{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}..." title="{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}..." border=0></a></td>
-                	   			 {else}
-	                        		       	<td style="padding-right:0px;padding-left:10px;"><a href="index.php?module={$MODULE}&action=EditView&return_action=DetailView&parenttab={$CATEGORY}"><img src="{$IMAGE_PATH}btnL3Add.gif" alt="{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}..." title="{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}..." border=0></a></td>
-			                       	{/if}
-					{else}
-						<td style="padding-right:0px;padding-left:10px;"><img src="{$IMAGE_PATH}btnL3Add-Faded.gif" alt="{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}..." title="{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}..." border=0></td>	
-					{/if}
-									
-						<td style="padding-right:10px"><img src="{$IMAGE_PATH}btnL3Search-Faded.gif" alt="{$APP.LBL_SEARCH_ALT}{$MODULE}..." title="{$APP.LBL_SEARCH_TITLE}{$MODULE}..." border=0></td>
-					
-				</tr>
-				</table>
-			</td>
-			</tr>
-			</table>
-		</td>
-		<td style="width:20px;">&nbsp;</td>
-		<td class="small">
-			<!-- Calendar Clock Calculator and Chat -->
-				<table border=0 cellspacing=0 cellpadding=5>
-				<tr>
-					<td style="padding-right:0px;padding-left:10px;"><a href="javascript:;" onClick='fnvshobj(this,"miniCal");getMiniCal();'><img src="{$IMAGE_PATH}btnL3Calendar.gif" alt="{$APP.LBL_CALENDAR_ALT}" title="{$APP.LBL_CALENDAR_TITLE}" border=0></a></a></td>
-					<td style="padding-right:0px"><a href="javascript:;"><img src="{$IMAGE_PATH}btnL3Clock.gif" alt="{$APP.LBL_CLOCK_ALT}" title="{$APP.LBL_CLOCK_TITLE}" border=0 onClick="fnvshobj(this,'wclock');"></a></a></td>
-					<td style="padding-right:0px"><a href="#"><img src="{$IMAGE_PATH}btnL3Calc.gif" alt="{$APP.LBL_CALCULATOR_ALT}" title="{$APP.LBL_CALCULATOR_TITLE}" border=0 onClick="fnvshobj(this,'calculator_cont');fetch_calc();"></a></td>
-					<td style="padding-right:10px"><a href="javascript:;" onClick='return window.open("index.php?module=Contacts&action=vtchat","Chat","width=450,height=400,resizable=1,scrollbars=1");'><img src="{$IMAGE_PATH}tbarChat.gif" alt="{$APP.LBL_CHAT_ALT}" title="{$APP.LBL_CHAT_TITLE}" border=0></a>
-                    </td>	
-				</tr>
-				</table>
-		</td>
-		<td style="width:20px;">&nbsp;</td>
-		<td class="small">
-			<!-- Import / Export -->
-			<table border=0 cellspacing=0 cellpadding=5>
-			<tr>
-			{if $MODULE eq 'Contacts' || $MODULE eq 'Leads' || $MODULE eq 'Accounts' || $MODULE eq 'Potentials' || $MODULE eq 'Products' }
-		   		{if $CHECK.Import eq 'yes'}	
-					<td style="padding-right:0px;padding-left:10px;"><a href="index.php?module={$MODULE}&action=Import&step=1&return_module={$MODULE}&return_action=index&parenttab={$CATEGORY}"><img src="{$IMAGE_PATH}tbarImport.gif" alt="{$APP.LBL_IMPORT} {$APP.$MODULE}" title="{$APP.LBL_IMPORT} {$APP.$MODULE}" border="0"></a></td>	
-				{else}	
-					<td style="padding-right:0px;padding-left:10px;"><img src="{$IMAGE_PATH}tbarImport-Faded.gif" alt="{$APP.LBL_IMPORT} {$APP.$MODULE}" title="{$APP.LBL_IMPORT} {$APP.$MODULE}" border="0"></td>	
-				{/if}	
-				{if $CHECK.Export eq 'yes'}	
-	    			<td style="padding-right:10px"><a href="index.php?module={$MODULE}&action=Export&all=1"><img src="{$IMAGE_PATH}tbarExport.gif" alt="{$APP.LBL_EXPORT} {$APP.$MODULE}" title="{$APP.LBL_EXPORT} {$APP.$MODULE}" border="0"></a></td>
-				{else}	
-					<td style="padding-right:10px"><img src="{$IMAGE_PATH}tbarExport-Faded.gif" alt="{$APP.LBL_EXPORT} {$APP.$MODULE}" title="{$APP.LBL_EXPORT} {$APP.$MODULE}" border="0"></td>
-                {/if}
-			{elseif $MODULE eq 'Notes' || $MODULE eq 'Emails'}	
-				
-				{if $CHECK.Export eq 'yes'}
-					<td style="padding-right:0px;padding-left:10px;"><img src="{$IMAGE_PATH}tbarImport-Faded.gif" alt="{$APP.LBL_IMPORT} {$APP.$MODULE}" title="{$APP.LBL_IMPORT} {$APP.$MODULE}" border="0"></td>
-					<td style="padding-right:10px"><a href="index.php?module={$MODULE}&action=Export&all=1"><img src="{$IMAGE_PATH}tbarExport.gif" alt="{$APP.LBL_EXPORT} {$APP.$MODULE}" title="{$APP.LBL_EXPORT} {$APP.$MODULE}" border="0"></a></td>
-				{else}	 
-					<td style="padding-right:0px;padding-left:10px;"><img src="{$IMAGE_PATH}tbarImport-Faded.gif" alt="{$APP.LBL_IMPORT} {$APP.$MODULE}" title="{$APP.LBL_IMPORT} {$APP.$MODULE}" border="0"></td>
-					<td style="padding-right:10px"><img src="{$IMAGE_PATH}tbarExport-Faded.gif" alt="{$APP.LBL_EXPORT} {$APP.$MODULE}" title="{$APP.LBL_EXPORT} {$APP.$MODULE}" border="0"></td>
-				{/if}
-			{else}
-				<td style="padding-right:0px;padding-left:10px;"><img src="{$IMAGE_PATH}tbarImport-Faded.gif" alt="{$APP.LBL_IMPORT} {$APP.$MODULE}" title="{$APP.LBL_IMPORT} {$APP.$MODULE}" border="0"></td>
-                <td style="padding-right:10px"><img src="{$IMAGE_PATH}tbarExport-Faded.gif" alt="{$APP.LBL_EXPORT} {$APP.$MODULE}" title="{$APP.LBL_EXPORT} {$APP.$MODULE}" border="0"></td>
-			{/if}
-			</tr>
-			</table>	
-		<td style="width:20px;">&nbsp;</td>
-		<td class="small">
-			<!-- All Menu -->
-				<table border=0 cellspacing=0 cellpadding=5>
-				<tr>
-				<td style="padding-left:10px;"><a href="javascript:;" onmouseout="fninvsh('allMenu');" onClick="fnvshobj(this,'allMenu')"><img src="{$IMAGE_PATH}btnL3AllMenu.gif" alt="{$APP.LBL_ALL_MENU_ALT}" title="{$APP.LBL_ALL_MENU_TITLE}" border="0"></a></td>
-				</tr>
-				</table>
-		</td>			
-		</tr>
-		</table>
-	</td>
-</tr>
-<tr><td style="height:2px"></td></tr>
-</TABLE>
+{*<!--
+/*********************************************************************************
+  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
+   * ("License"); You may not use this file except in compliance with the License
+   * The Original Code is:  vtiger CRM Open Source
+   * The Initial Developer of the Original Code is vtiger.
+   * Portions created by vtiger are Copyright (C) vtiger.
+   * All Rights Reserved.
+  *
+ ********************************************************************************/
+-->*}
+<script type="text/javascript" src="modules/{$MODULE}/{$SINGLE_MOD}.js"></script>
+<!-- Activity createlink layer start  -->
+{if $MODULE eq 'Activities'}
+<div id="reportLay" style="width: 125px; right: 159px; top: 260px; display: none; z-index:50" onmouseout="fninvsh('reportLay')" onmouseover="fnvshNrm('reportLay')">
+        <table bgcolor="#ffffff" border="0" cellpadding="0" cellspacing="0" width="100%">
+                <tr>
+                        <td>
+                                <a href="index.php?module={$MODULE}&action=EditView&return_module={$MODULE}&activity_mode=Events&return_action=DetailView&parenttab={$CATEGORY}" class="calMnu">{$NEW_EVENT}</a>
+                                <a href="index.php?module={$MODULE}&action=EditView&return_module={$MODULE}&activity_mode=Task&return_action=DetailView&parenttab={$CATEGORY}" class="calMnu">{$NEW_TASK}</a>
+                        </td>
+                </tr>
+        </table>
+
+</div>
+{/if}
+<!-- Activity createlink layer end  -->
+
+
+<TABLE border=0 cellspacing=0 cellpadding=0 width=100% class=small>
+<tr><td style="height:2px"></td></tr>
+<tr>
+	<td style="padding-left:10px;padding-right:50px" class="moduleName" nowrap>{$APP.$CATEGORY} > <a class="hdrLink" href="index.php?action=ListView&module={$MODULE}">{$APP.$MODULE}</a></td>
+	<td width=100% nowrap>
+	
+		<table border="0" cellspacing="0" cellpadding="0" >
+		<tr>
+		<td class="sep1" style="width:1px;"></td>
+		<td class=small >
+			<!-- Add and Search -->
+			<table border=0 cellspacing=0 cellpadding=0>
+			<tr>
+			<td>
+				<table border=0 cellspacing=0 cellpadding=5>
+				<tr>
+					{if $CHECK.EditView eq 'yes'}
+			        		{if $MODULE eq 'Activities'}
+		                      	        	<td style="padding-right:0px;padding-left:10px;"><a href="javascript:;" id="showSubMenu"  onMouseOver="fnvshobj(this,'reportLay');" onMouseOut="fninvsh('reportLay');"><img src="{$IMAGE_PATH}btnL3Add.gif" alt="{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}..." title="{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}..." border=0></a></td>
+                	   			 {else}
+	                        		       	<td style="padding-right:0px;padding-left:10px;"><a href="index.php?module={$MODULE}&action=EditView&return_action=DetailView&parenttab={$CATEGORY}"><img src="{$IMAGE_PATH}btnL3Add.gif" alt="{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}..." title="{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}..." border=0></a></td>
+			                       	{/if}
+					{else}
+						<td style="padding-right:0px;padding-left:10px;"><img src="{$IMAGE_PATH}btnL3Add-Faded.gif" alt="{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}..." title="{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}..." border=0></td>	
+					{/if}
+									
+						<td style="padding-right:10px"><img src="{$IMAGE_PATH}btnL3Search-Faded.gif" alt="{$APP.LBL_SEARCH_ALT}{$MODULE}..." title="{$APP.LBL_SEARCH_TITLE}{$MODULE}..." border=0></td>
+					
+				</tr>
+				</table>
+			</td>
+			</tr>
+			</table>
+		</td>
+		<td style="width:20px;">&nbsp;</td>
+		<td class="small">
+			<!-- Calendar Clock Calculator and Chat -->
+				<table border=0 cellspacing=0 cellpadding=5>
+				<tr>
+					<td style="padding-right:0px;padding-left:10px;"><a href="javascript:;" onClick='fnvshobj(this,"miniCal");getMiniCal();'><img src="{$IMAGE_PATH}btnL3Calendar.gif" alt="{$APP.LBL_CALENDAR_ALT}" title="{$APP.LBL_CALENDAR_TITLE}" border=0></a></a></td>
+					<td style="padding-right:0px"><a href="javascript:;"><img src="{$IMAGE_PATH}btnL3Clock.gif" alt="{$APP.LBL_CLOCK_ALT}" title="{$APP.LBL_CLOCK_TITLE}" border=0 onClick="fnvshobj(this,'wclock');"></a></a></td>
+					<td style="padding-right:0px"><a href="#"><img src="{$IMAGE_PATH}btnL3Calc.gif" alt="{$APP.LBL_CALCULATOR_ALT}" title="{$APP.LBL_CALCULATOR_TITLE}" border=0 onClick="fnvshobj(this,'calculator_cont');fetch_calc();"></a></td>
+					<td style="padding-right:10px"><a href="javascript:;" onClick='return window.open("index.php?module=Contacts&action=vtchat","Chat","width=450,height=400,resizable=1,scrollbars=1");'><img src="{$IMAGE_PATH}tbarChat.gif" alt="{$APP.LBL_CHAT_ALT}" title="{$APP.LBL_CHAT_TITLE}" border=0></a>
+                    </td>	
+					<td style="padding-right:10px"><img src="{$IMAGE_PATH}btnL3Tracker.gif" alt="{$APP.LBL_CHAT_ALT}" title="{$APP.LBL_CHAT_TITLE}" border=0 onClick="fnvshobj(this,'tracker');">
+                    			</td>	
+				</tr>
+				</table>
+		</td>
+		<td style="width:20px;">&nbsp;</td>
+		<td class="small">
+			<!-- Import / Export -->
+			<table border=0 cellspacing=0 cellpadding=5>
+			<tr>
+			{if $MODULE eq 'Contacts' || $MODULE eq 'Leads' || $MODULE eq 'Accounts' || $MODULE eq 'Potentials' || $MODULE eq 'Products' }
+		   		{if $CHECK.Import eq 'yes'}	
+					<td style="padding-right:0px;padding-left:10px;"><a href="index.php?module={$MODULE}&action=Import&step=1&return_module={$MODULE}&return_action=index&parenttab={$CATEGORY}"><img src="{$IMAGE_PATH}tbarImport.gif" alt="{$APP.LBL_IMPORT} {$APP.$MODULE}" title="{$APP.LBL_IMPORT} {$APP.$MODULE}" border="0"></a></td>	
+				{else}	
+					<td style="padding-right:0px;padding-left:10px;"><img src="{$IMAGE_PATH}tbarImport-Faded.gif" alt="{$APP.LBL_IMPORT} {$APP.$MODULE}" title="{$APP.LBL_IMPORT} {$APP.$MODULE}" border="0"></td>	
+				{/if}	
+				{if $CHECK.Export eq 'yes'}	
+	    			<td style="padding-right:10px"><a href="index.php?module={$MODULE}&action=Export&all=1"><img src="{$IMAGE_PATH}tbarExport.gif" alt="{$APP.LBL_EXPORT} {$APP.$MODULE}" title="{$APP.LBL_EXPORT} {$APP.$MODULE}" border="0"></a></td>
+				{else}	
+					<td style="padding-right:10px"><img src="{$IMAGE_PATH}tbarExport-Faded.gif" alt="{$APP.LBL_EXPORT} {$APP.$MODULE}" title="{$APP.LBL_EXPORT} {$APP.$MODULE}" border="0"></td>
+                {/if}
+			{elseif $MODULE eq 'Notes' || $MODULE eq 'Emails'}	
+				
+				{if $CHECK.Export eq 'yes'}
+					<td style="padding-right:0px;padding-left:10px;"><img src="{$IMAGE_PATH}tbarImport-Faded.gif" alt="{$APP.LBL_IMPORT} {$APP.$MODULE}" title="{$APP.LBL_IMPORT} {$APP.$MODULE}" border="0"></td>
+					<td style="padding-right:10px"><a href="index.php?module={$MODULE}&action=Export&all=1"><img src="{$IMAGE_PATH}tbarExport.gif" alt="{$APP.LBL_EXPORT} {$APP.$MODULE}" title="{$APP.LBL_EXPORT} {$APP.$MODULE}" border="0"></a></td>
+				{else}	 
+					<td style="padding-right:0px;padding-left:10px;"><img src="{$IMAGE_PATH}tbarImport-Faded.gif" alt="{$APP.LBL_IMPORT} {$APP.$MODULE}" title="{$APP.LBL_IMPORT} {$APP.$MODULE}" border="0"></td>
+					<td style="padding-right:10px"><img src="{$IMAGE_PATH}tbarExport-Faded.gif" alt="{$APP.LBL_EXPORT} {$APP.$MODULE}" title="{$APP.LBL_EXPORT} {$APP.$MODULE}" border="0"></td>
+				{/if}
+			{else}
+				<td style="padding-right:0px;padding-left:10px;"><img src="{$IMAGE_PATH}tbarImport-Faded.gif" alt="{$APP.LBL_IMPORT} {$APP.$MODULE}" title="{$APP.LBL_IMPORT} {$APP.$MODULE}" border="0"></td>
+                <td style="padding-right:10px"><img src="{$IMAGE_PATH}tbarExport-Faded.gif" alt="{$APP.LBL_EXPORT} {$APP.$MODULE}" title="{$APP.LBL_EXPORT} {$APP.$MODULE}" border="0"></td>
+			{/if}
+			</tr>
+			</table>	
+		<td style="width:20px;">&nbsp;</td>
+		<td class="small">
+			<!-- All Menu -->
+				<table border=0 cellspacing=0 cellpadding=5>
+				<tr>
+				<td style="padding-left:10px;"><a href="javascript:;" onmouseout="fninvsh('allMenu');" onClick="fnvshobj(this,'allMenu')"><img src="{$IMAGE_PATH}btnL3AllMenu.gif" alt="{$APP.LBL_ALL_MENU_ALT}" title="{$APP.LBL_ALL_MENU_TITLE}" border="0"></a></td>
+				</tr>
+				</table>
+		</td>			
+		</tr>
+		</table>
+	</td>
+</tr>
+<tr><td style="height:2px"></td></tr>
+</TABLE>




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 29 12:29:15 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 29 Jun 2006 16:29:15 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7680 -
	/vtigercrm/trunk/Smarty/templates/Buttons_List.tpl
Message-ID: <20060629162915.A1A9383FE43@vtiger.fosslabs.com>

Author: richie
Date: Thu Jun 29 10:29:06 2006
New Revision: 7680

Log:
Support for last view done

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

Modified: vtigercrm/trunk/Smarty/templates/Buttons_List.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Buttons_List.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Buttons_List.tpl Thu Jun 29 10:29:06 2006
@@ -1,126 +1,128 @@
-{*<!--
-/*********************************************************************************
-  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
-   * ("License"); You may not use this file except in compliance with the License
-   * The Original Code is:  vtiger CRM Open Source
-   * The Initial Developer of the Original Code is vtiger.
-   * Portions created by vtiger are Copyright (C) vtiger.
-   * All Rights Reserved.
-  *
- ********************************************************************************/
--->*}
-<script type="text/javascript" src="modules/{$MODULE}/{$SINGLE_MOD}.js"></script>
-<!-- Activity createlink layer start  -->
-{if $MODULE eq 'Activities'}
-<div id="reportLay" style="width: 125px; right: 159px; top: 260px; display: none; z-index:50" onmouseout="fninvsh('reportLay')" onmouseover="fnvshNrm('reportLay')">
-        <table bgcolor="#ffffff" border="0" cellpadding="0" cellspacing="0" width="100%">
-                <tr>
-                        <td>
-                                <a href="index.php?module={$MODULE}&action=EditView&return_module={$MODULE}&activity_mode=Events&return_action=DetailView&parenttab={$CATEGORY}" class="calMnu">{$NEW_EVENT}</a>
-                                <a href="index.php?module={$MODULE}&action=EditView&return_module={$MODULE}&activity_mode=Task&return_action=DetailView&parenttab={$CATEGORY}" class="calMnu">{$NEW_TASK}</a>
-                        </td>
-                </tr>
-        </table>
-
-</div>
-{/if}
-<!-- Activity createlink layer end  -->
-
-
-<TABLE border=0 cellspacing=0 cellpadding=0 width=100% class=small>
-<tr><td style="height:2px"></td></tr>
-<tr>
-	<td style="padding-left:10px;padding-right:50px" class="moduleName" nowrap>{$APP.$CATEGORY} > <a class="hdrLink" href="index.php?action=ListView&module={$MODULE}">{$APP.$MODULE}</a></td>
-	<td width=100% nowrap>
-	
-		<table border="0" cellspacing="0" cellpadding="0" >
-		<tr>
-		<td class="sep1" style="width:1px;"></td>
-		<td class=small >
-			<!-- Add and Search -->
-			<table border=0 cellspacing=0 cellpadding=0>
-			<tr>
-			<td>
-				<table border=0 cellspacing=0 cellpadding=5>
-				<tr>
-					{if $CHECK.EditView eq 'yes' && $MODULE neq 'Emails' && $MODULE neq 'Webmails'}
-			        		{if $MODULE eq 'Activities'}
-		                      	        	<td style="padding-right:0px;padding-left:10px;"><a href="javascript:;" id="showSubMenu"  onMouseOver="fnvshobj(this,'reportLay');" onMouseOut="fninvsh('reportLay');"><img src="{$IMAGE_PATH}btnL3Add.gif" alt="{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}..." title="{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}..." border=0></a></td>
-                	   			 {else}
-	                        		       	<td style="padding-right:0px;padding-left:10px;"><a href="index.php?module={$MODULE}&action=EditView&return_action=DetailView&parenttab={$CATEGORY}"><img src="{$IMAGE_PATH}btnL3Add.gif" alt="{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}..." title="{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}..." border=0></a></td>
-			                       	{/if}
-					{else}
-						<td style="padding-right:0px;padding-left:10px;"><img src="{$IMAGE_PATH}btnL3Add-Faded.gif" alt="{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}..." title="{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}..." border=0></td>	
-					{/if}
-									
-					{if $CHECK.index eq 'yes' && $MODULE neq 'Emails' && $MODULE neq 'Webmails'}
-						 <td style="padding-right:10px"><a href="javascript:;" onClick="moveMe('searchAcc');searchshowhide('searchAcc','advSearch')" ><img src="{$IMAGE_PATH}btnL3Search.gif" alt="{$APP.LBL_SEARCH_ALT}{$MODULE}..." title="{$APP.LBL_SEARCH_TITLE}{$MODULE}..." border=0></a></a></td>
-					{else}
-						<td style="padding-right:10px"><img src="{$IMAGE_PATH}btnL3Search-Faded.gif" alt="{$APP.LBL_SEARCH_ALT}{$MODULE}..." title="{$APP.LBL_SEARCH_TITLE}{$MODULE}..." border=0></td>
-					{/if}
-					
-				</tr>
-				</table>
-			</td>
-			</tr>
-			</table>
-		</td>
-		<td style="width:20px;">&nbsp;</td>
-		<td class="small">
-			<!-- Calendar Clock Calculator and Chat -->
-				<table border=0 cellspacing=0 cellpadding=5>
-				<tr>
-					<td style="padding-right:0px;padding-left:10px;"><a href="javascript:;" onClick='fnvshobj(this,"miniCal");getMiniCal();'><img src="{$IMAGE_PATH}btnL3Calendar.gif" alt="{$APP.LBL_CALENDAR_ALT}" title="{$APP.LBL_CALENDAR_TITLE}" border=0></a></a></td>
-					<td style="padding-right:0px"><a href="javascript:;"><img src="{$IMAGE_PATH}btnL3Clock.gif" alt="{$APP.LBL_CLOCK_ALT}" title="{$APP.LBL_CLOCK_TITLE}" border=0 onClick="fnvshobj(this,'wclock');"></a></a></td>
-					<td style="padding-right:0px"><a href="#"><img src="{$IMAGE_PATH}btnL3Calc.gif" alt="{$APP.LBL_CALCULATOR_ALT}" title="{$APP.LBL_CALCULATOR_TITLE}" border=0 onClick="fnvshobj(this,'calculator_cont');fetch_calc();"></a></td>
-					<td style="padding-right:10px"><a href="javascript:;" onClick='return window.open("index.php?module=Contacts&action=vtchat","Chat","width=450,height=400,resizable=1,scrollbars=1");'><img src="{$IMAGE_PATH}tbarChat.gif" alt="{$APP.LBL_CHAT_ALT}" title="{$APP.LBL_CHAT_TITLE}" border=0></a>
-                    </td>	
-				</tr>
-				</table>
-		</td>
-		<td style="width:20px;">&nbsp;</td>
-		<td class="small">
-			<!-- Import / Export -->
-			<table border=0 cellspacing=0 cellpadding=5>
-			<tr>
-			{if $MODULE eq 'Contacts' || $MODULE eq 'Leads' || $MODULE eq 'Accounts' || $MODULE eq 'Potentials' || $MODULE eq 'Products' }
-		   		{if $CHECK.Import eq 'yes'}	
-					<td style="padding-right:0px;padding-left:10px;"><a href="index.php?module={$MODULE}&action=Import&step=1&return_module={$MODULE}&return_action=index&parenttab={$CATEGORY}"><img src="{$IMAGE_PATH}tbarImport.gif" alt="{$APP.LBL_IMPORT} {$APP.$MODULE}" title="{$APP.LBL_IMPORT} {$APP.$MODULE}" border="0"></a></td>	
-				{else}	
-					<td style="padding-right:0px;padding-left:10px;"><img src="{$IMAGE_PATH}tbarImport-Faded.gif" alt="{$APP.LBL_IMPORT} {$APP.$MODULE}" title="{$APP.LBL_IMPORT} {$APP.$MODULE}" border="0"></td>	
-				{/if}	
-				{if $CHECK.Export eq 'yes'}	
-	    			<td style="padding-right:10px"><a href="index.php?module={$MODULE}&action=Export&all=1"><img src="{$IMAGE_PATH}tbarExport.gif" alt="{$APP.LBL_EXPORT} {$APP.$MODULE}" title="{$APP.LBL_EXPORT} {$APP.$MODULE}" border="0"></a></td>
-				{else}	
-					<td style="padding-right:10px"><img src="{$IMAGE_PATH}tbarExport-Faded.gif" alt="{$APP.LBL_EXPORT} {$APP.$MODULE}" title="{$APP.LBL_EXPORT} {$APP.$MODULE}" border="0"></td>
-                {/if}
-			{elseif $MODULE eq 'Notes' || $MODULE eq 'Emails'}	
-				
-				{if $CHECK.Export eq 'yes'}
-					<td style="padding-right:0px;padding-left:10px;"><img src="{$IMAGE_PATH}tbarImport-Faded.gif" alt="{$APP.LBL_IMPORT} {$APP.$MODULE}" title="{$APP.LBL_IMPORT} {$APP.$MODULE}" border="0"></td>
-					<td style="padding-right:10px"><a href="index.php?module={$MODULE}&action=Export&all=1"><img src="{$IMAGE_PATH}tbarExport.gif" alt="{$APP.LBL_EXPORT} {$APP.$MODULE}" title="{$APP.LBL_EXPORT} {$APP.$MODULE}" border="0"></a></td>
-				{else}	 
-					<td style="padding-right:0px;padding-left:10px;"><img src="{$IMAGE_PATH}tbarImport-Faded.gif" alt="{$APP.LBL_IMPORT} {$APP.$MODULE}" title="{$APP.LBL_IMPORT} {$APP.$MODULE}" border="0"></td>
-					<td style="padding-right:10px"><img src="{$IMAGE_PATH}tbarExport-Faded.gif" alt="{$APP.LBL_EXPORT} {$APP.$MODULE}" title="{$APP.LBL_EXPORT} {$APP.$MODULE}" border="0"></td>
-				{/if}
-			{else}
-				<td style="padding-right:0px;padding-left:10px;"><img src="{$IMAGE_PATH}tbarImport-Faded.gif" alt="{$APP.LBL_IMPORT} {$APP.$MODULE}" title="{$APP.LBL_IMPORT} {$APP.$MODULE}" border="0"></td>
-                <td style="padding-right:10px"><img src="{$IMAGE_PATH}tbarExport-Faded.gif" alt="{$APP.LBL_EXPORT} {$APP.$MODULE}" title="{$APP.LBL_EXPORT} {$APP.$MODULE}" border="0"></td>
-			{/if}
-			</tr>
-			</table>	
-		<td style="width:20px;">&nbsp;</td>
-		<td class="small">
-			<!-- All Menu -->
-				<table border=0 cellspacing=0 cellpadding=5>
-				<tr>
-				<td style="padding-left:10px;"><a href="javascript:;" onmouseout="fninvsh('allMenu');" onClick="fnvshobj(this,'allMenu')"><img src="{$IMAGE_PATH}btnL3AllMenu.gif" alt="{$APP.LBL_ALL_MENU_ALT}" title="{$APP.LBL_ALL_MENU_TITLE}" border="0"></a></td>
-				</tr>
-				</table>
-		</td>			
-		</tr>
-		</table>
-	</td>
-</tr>
-<tr><td style="height:2px"></td></tr>
-</TABLE>
+{*<!--
+/*********************************************************************************
+  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
+   * ("License"); You may not use this file except in compliance with the License
+   * The Original Code is:  vtiger CRM Open Source
+   * The Initial Developer of the Original Code is vtiger.
+   * Portions created by vtiger are Copyright (C) vtiger.
+   * All Rights Reserved.
+  *
+ ********************************************************************************/
+-->*}
+<script type="text/javascript" src="modules/{$MODULE}/{$SINGLE_MOD}.js"></script>
+<!-- Activity createlink layer start  -->
+{if $MODULE eq 'Activities'}
+<div id="reportLay" style="width: 125px; right: 159px; top: 260px; display: none; z-index:50" onmouseout="fninvsh('reportLay')" onmouseover="fnvshNrm('reportLay')">
+        <table bgcolor="#ffffff" border="0" cellpadding="0" cellspacing="0" width="100%">
+                <tr>
+                        <td>
+                                <a href="index.php?module={$MODULE}&action=EditView&return_module={$MODULE}&activity_mode=Events&return_action=DetailView&parenttab={$CATEGORY}" class="calMnu">{$NEW_EVENT}</a>
+                                <a href="index.php?module={$MODULE}&action=EditView&return_module={$MODULE}&activity_mode=Task&return_action=DetailView&parenttab={$CATEGORY}" class="calMnu">{$NEW_TASK}</a>
+                        </td>
+                </tr>
+        </table>
+
+</div>
+{/if}
+<!-- Activity createlink layer end  -->
+
+
+<TABLE border=0 cellspacing=0 cellpadding=0 width=100% class=small>
+<tr><td style="height:2px"></td></tr>
+<tr>
+	<td style="padding-left:10px;padding-right:50px" class="moduleName" nowrap>{$APP.$CATEGORY} > <a class="hdrLink" href="index.php?action=ListView&module={$MODULE}">{$APP.$MODULE}</a></td>
+	<td width=100% nowrap>
+	
+		<table border="0" cellspacing="0" cellpadding="0" >
+		<tr>
+		<td class="sep1" style="width:1px;"></td>
+		<td class=small >
+			<!-- Add and Search -->
+			<table border=0 cellspacing=0 cellpadding=0>
+			<tr>
+			<td>
+				<table border=0 cellspacing=0 cellpadding=5>
+				<tr>
+					{if $CHECK.EditView eq 'yes' && $MODULE neq 'Emails' && $MODULE neq 'Webmails'}
+			        		{if $MODULE eq 'Activities'}
+		                      	        	<td style="padding-right:0px;padding-left:10px;"><a href="javascript:;" id="showSubMenu"  onMouseOver="fnvshobj(this,'reportLay');" onMouseOut="fninvsh('reportLay');"><img src="{$IMAGE_PATH}btnL3Add.gif" alt="{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}..." title="{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}..." border=0></a></td>
+                	   			 {else}
+	                        		       	<td style="padding-right:0px;padding-left:10px;"><a href="index.php?module={$MODULE}&action=EditView&return_action=DetailView&parenttab={$CATEGORY}"><img src="{$IMAGE_PATH}btnL3Add.gif" alt="{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}..." title="{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}..." border=0></a></td>
+			                       	{/if}
+					{else}
+						<td style="padding-right:0px;padding-left:10px;"><img src="{$IMAGE_PATH}btnL3Add-Faded.gif" alt="{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}..." title="{$APP.LBL_CREATE_BUTTON_LABEL} {$MODULE}..." border=0></td>	
+					{/if}
+									
+					{if $CHECK.index eq 'yes' && $MODULE neq 'Emails' && $MODULE neq 'Webmails'}
+						 <td style="padding-right:10px"><a href="javascript:;" onClick="moveMe('searchAcc');searchshowhide('searchAcc','advSearch')" ><img src="{$IMAGE_PATH}btnL3Search.gif" alt="{$APP.LBL_SEARCH_ALT}{$MODULE}..." title="{$APP.LBL_SEARCH_TITLE}{$MODULE}..." border=0></a></a></td>
+					{else}
+						<td style="padding-right:10px"><img src="{$IMAGE_PATH}btnL3Search-Faded.gif" alt="{$APP.LBL_SEARCH_ALT}{$MODULE}..." title="{$APP.LBL_SEARCH_TITLE}{$MODULE}..." border=0></td>
+					{/if}
+					
+				</tr>
+				</table>
+			</td>
+			</tr>
+			</table>
+		</td>
+		<td style="width:20px;">&nbsp;</td>
+		<td class="small">
+			<!-- Calendar Clock Calculator and Chat -->
+				<table border=0 cellspacing=0 cellpadding=5>
+				<tr>
+					<td style="padding-right:0px;padding-left:10px;"><a href="javascript:;" onClick='fnvshobj(this,"miniCal");getMiniCal();'><img src="{$IMAGE_PATH}btnL3Calendar.gif" alt="{$APP.LBL_CALENDAR_ALT}" title="{$APP.LBL_CALENDAR_TITLE}" border=0></a></a></td>
+					<td style="padding-right:0px"><a href="javascript:;"><img src="{$IMAGE_PATH}btnL3Clock.gif" alt="{$APP.LBL_CLOCK_ALT}" title="{$APP.LBL_CLOCK_TITLE}" border=0 onClick="fnvshobj(this,'wclock');"></a></a></td>
+					<td style="padding-right:0px"><a href="#"><img src="{$IMAGE_PATH}btnL3Calc.gif" alt="{$APP.LBL_CALCULATOR_ALT}" title="{$APP.LBL_CALCULATOR_TITLE}" border=0 onClick="fnvshobj(this,'calculator_cont');fetch_calc();"></a></td>
+					<td style="padding-right:10px"><a href="javascript:;" onClick='return window.open("index.php?module=Contacts&action=vtchat","Chat","width=450,height=400,resizable=1,scrollbars=1");'><img src="{$IMAGE_PATH}tbarChat.gif" alt="{$APP.LBL_CHAT_ALT}" title="{$APP.LBL_CHAT_TITLE}" border=0></a>
+                    </td>	
+					<td style="padding-right:10px"><img src="{$IMAGE_PATH}btnL3Tracker.gif" alt="{$APP.LBL_CHAT_ALT}" title="{$APP.LBL_CHAT_TITLE}" border=0 onClick="fnvshobj(this,'tracker');">
+                    			</td>	
+				</tr>
+				</table>
+		</td>
+		<td style="width:20px;">&nbsp;</td>
+		<td class="small">
+			<!-- Import / Export -->
+			<table border=0 cellspacing=0 cellpadding=5>
+			<tr>
+			{if $MODULE eq 'Contacts' || $MODULE eq 'Leads' || $MODULE eq 'Accounts' || $MODULE eq 'Potentials' || $MODULE eq 'Products' }
+		   		{if $CHECK.Import eq 'yes'}	
+					<td style="padding-right:0px;padding-left:10px;"><a href="index.php?module={$MODULE}&action=Import&step=1&return_module={$MODULE}&return_action=index&parenttab={$CATEGORY}"><img src="{$IMAGE_PATH}tbarImport.gif" alt="{$APP.LBL_IMPORT} {$APP.$MODULE}" title="{$APP.LBL_IMPORT} {$APP.$MODULE}" border="0"></a></td>	
+				{else}	
+					<td style="padding-right:0px;padding-left:10px;"><img src="{$IMAGE_PATH}tbarImport-Faded.gif" alt="{$APP.LBL_IMPORT} {$APP.$MODULE}" title="{$APP.LBL_IMPORT} {$APP.$MODULE}" border="0"></td>	
+				{/if}	
+				{if $CHECK.Export eq 'yes'}	
+	    			<td style="padding-right:10px"><a href="index.php?module={$MODULE}&action=Export&all=1"><img src="{$IMAGE_PATH}tbarExport.gif" alt="{$APP.LBL_EXPORT} {$APP.$MODULE}" title="{$APP.LBL_EXPORT} {$APP.$MODULE}" border="0"></a></td>
+				{else}	
+					<td style="padding-right:10px"><img src="{$IMAGE_PATH}tbarExport-Faded.gif" alt="{$APP.LBL_EXPORT} {$APP.$MODULE}" title="{$APP.LBL_EXPORT} {$APP.$MODULE}" border="0"></td>
+                {/if}
+			{elseif $MODULE eq 'Notes' || $MODULE eq 'Emails'}	
+				
+				{if $CHECK.Export eq 'yes'}
+					<td style="padding-right:0px;padding-left:10px;"><img src="{$IMAGE_PATH}tbarImport-Faded.gif" alt="{$APP.LBL_IMPORT} {$APP.$MODULE}" title="{$APP.LBL_IMPORT} {$APP.$MODULE}" border="0"></td>
+					<td style="padding-right:10px"><a href="index.php?module={$MODULE}&action=Export&all=1"><img src="{$IMAGE_PATH}tbarExport.gif" alt="{$APP.LBL_EXPORT} {$APP.$MODULE}" title="{$APP.LBL_EXPORT} {$APP.$MODULE}" border="0"></a></td>
+				{else}	 
+					<td style="padding-right:0px;padding-left:10px;"><img src="{$IMAGE_PATH}tbarImport-Faded.gif" alt="{$APP.LBL_IMPORT} {$APP.$MODULE}" title="{$APP.LBL_IMPORT} {$APP.$MODULE}" border="0"></td>
+					<td style="padding-right:10px"><img src="{$IMAGE_PATH}tbarExport-Faded.gif" alt="{$APP.LBL_EXPORT} {$APP.$MODULE}" title="{$APP.LBL_EXPORT} {$APP.$MODULE}" border="0"></td>
+				{/if}
+			{else}
+				<td style="padding-right:0px;padding-left:10px;"><img src="{$IMAGE_PATH}tbarImport-Faded.gif" alt="{$APP.LBL_IMPORT} {$APP.$MODULE}" title="{$APP.LBL_IMPORT} {$APP.$MODULE}" border="0"></td>
+                <td style="padding-right:10px"><img src="{$IMAGE_PATH}tbarExport-Faded.gif" alt="{$APP.LBL_EXPORT} {$APP.$MODULE}" title="{$APP.LBL_EXPORT} {$APP.$MODULE}" border="0"></td>
+			{/if}
+			</tr>
+			</table>	
+		<td style="width:20px;">&nbsp;</td>
+		<td class="small">
+			<!-- All Menu -->
+				<table border=0 cellspacing=0 cellpadding=5>
+				<tr>
+				<td style="padding-left:10px;"><a href="javascript:;" onmouseout="fninvsh('allMenu');" onClick="fnvshobj(this,'allMenu')"><img src="{$IMAGE_PATH}btnL3AllMenu.gif" alt="{$APP.LBL_ALL_MENU_ALT}" title="{$APP.LBL_ALL_MENU_TITLE}" border="0"></a></td>
+				</tr>
+				</table>
+		</td>			
+		</tr>
+		</table>
+	</td>
+</tr>
+<tr><td style="height:2px"></td></tr>
+</TABLE>




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 29 12:38:30 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 29 Jun 2006 16:38:30 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7681 -
	/vtigercrm/trunk/themes/blue/style.css
Message-ID: <20060629163830.EA2D183FE79@vtiger.fosslabs.com>

Author: richie
Date: Thu Jun 29 10:38:19 2006
New Revision: 7681

Log:
Support for last view done

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 Jun 29 10:38:19 2006
@@ -1,2858 +1,2875 @@
-.small {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	line-height: 14px;
-	color: #000000;
-}
-.big {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	line-height: 18px;
-	color: #000000;
-	font-weight:bold;
-}
-
-.ybToday {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	line-height: 14px;
-	color: #119911;
-}
-.ybUnfinished {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	line-height: 14px;
-	color: #993311;
-}
-.ybTime {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	line-height: 14px;
-	color: #777777;
-	font-weight:bold;
-}
-.yellowBox {
-	background-color:#ffffE1;
-	border:1px solid #999999;
-}
-.ybSeperator{
-	height:0px;
-	border-top:2px dotted #adadad;
-}
-
-.genHeaderBig{
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 16px;
-	line-height: 19px;
-	color: #000000;
-	font-weight:bold;
-}
-.genHeaderSmall{
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 14px;
-	line-height: 16px;
-	color: #000000;
-	font-weight:bold;
-}
-
-.moduleName {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 18px;
-	color: #000000;
-	font-weight:bold;
-}
-
-.rssDisplayPanel {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	line-height: 12px;
-	color: #ABABAB;
-}
-.hdrNameBg {
-
-	background:url(images/topBg.gif);
-}
-
-.hdrTabBg {
-	background:#bbbbbb url(images/tabUnSelectedBg.gif) repeat-x ;
-}
-
-.tabSelected {
-	background:#bbbbbb url(images/tabSelectedBg.gif) repeat-x;
-	font-family:  Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	padding-left:15px;
-	padding-right:15px;
-	padding-top:2px;
-	padding-bottom:2px;
-
-}
-
-.tabUnSelected {
-	background:#bbbbbb url(images/tabUnSelectedBg.gif) repeat-x;
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	padding-left:15px;
-	padding-right:15px;
-	padding-top:2px;
-	padding-bottom:2px;
-}
-
-.tabSeperator {
-	background:#bbbbbb url(images/tabSeperatorBg.gif) repeat-x;
-}
-
-/*.level2text {
-	background:#bbbbbb url(images/level2Bg.gif) repeat-x;
-    font-family: Arial, Helvetica, sans-serif;
-    font-size: 11px;
-	padding-left:20px;
-	padding-right:20px;
-	padding-top:5px;
-	padding-bottom:5px;
-	font-weight:bold;
-	color:white;
-}*/
-
-.level2text {
-    background:#bbbbbb url(images/level2Bg.gif) repeat-x;
-    font-family: Arial, Helvetica, sans-serif;
-    font-size: 11px;
-    padding-left:20px;
-    padding-right:20px;
-    padding-top:5px;
-    padding-bottom:5px;
-    font-weight:bold;
-    color:white;
-}
-
-.level2text a{
-	text-decoration:none;
-	color:white;
-}
-
-.level2text a:hover {
-	text-decoration:underline;
-	color:white;
-
-}
-
-.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;
-	font-size: 11px;
-}
-
-.level2textSel{
-	font-weight:bold;
-	color:#000000;
-	padding-left:20px;
-	padding-right:20px;
-	padding-top:3px;
-	padding-bottom:3px;
-}
-	
-
-.tabLiner {
-	background:#9abffc url(images/moduleSelectorBg.gif) bottom repeat-x;
-	padding:0px;
-}
-
-.sep1 {
-	background:#999999;
-}
-
-.showPanelBg {
-	background:url(images/showPanelTopBg.gif) repeat-x;
-}
-
-a {
-	text-decoration:none;
-	color:#003399;
-}
-
-a:hover {
-	text-decoration:underline;
-}
-
-.hdrLink {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 18px;
-	text-decoration:none;
-	color:#333333;
-	font-weight:bold;
-}
-
-.hdrLink:hover {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 18px;
-	text-decoration:underline;
-	color:#333333;
-	font-weight:bold;
-}
-
-.searchBox {
-	border: 0px solid #999999;
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	padding-left:2px;
-	width:100px;
-	background-color:#ffffef;
-}
-
-.searchBtn {
-	border : 1px #cccccc solid;
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	width:30px;
-	height:19px;
-	background-color:#cccccc;
-}
-
-.lvtBg {
-	background-color:#cccccc;
-
-}
-
-.lvtHeaderText {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 14px;
-	font-weight:bold;
-}
-
-.lvtCol {
-	border-top:1px solid #eeeeee;
-	border-left:1px solid #eeeeee;
-	border-right:1px solid #999999;
-	border-bottom:1px solid #999999;
-	background-color:#dadada;
-	color:#666666;
-	font-weight:bold;
-}
-
-.lvtColData {
-	background-color:#fafafa;
-}
-
-.lvtColDataHover {
-	background-color:#efefef;
-}
-
-.dvtSelectedCell {
-	border-left:1px solid #cacaca;
-	border-top:3px solid #999999;
-	border-right:1px solid #cacaca;
-	padding-left:20px;
-	padding-right:20px;
-	background-color:white;
-	font-weight:bold;
-}
-
-.dvtUnSelectedCell {
-	border-left:1px solid #cacaca;
-	border-top:1px solid #cacaca;
-	border-right:1px solid #cacaca;
-	border-bottom:1px solid #cacaca;
-	padding-left:20px;
-	padding-right:20px;
-	background-color:#efefef;
-	cursor:pointer;
-}
-
-.dvtTabCache {
-	border-bottom:1px solid #cacaca;
-}
-
-.dvtContentSpace {
-	border-left:1px solid #cacaca;
-	border-right:1px solid #cacaca;
-	border-bottom:1px solid #cacaca;
-	padding-left:0px;
-}
-
-.rightAddInfo {
-	border-left:1px solid #a2a2a2;
-	border-right:1px solid #dddddd;
-	border-bottom:1px solid #dddddd;
-	border-top:1px solid #a2a2a2;
-	background-color:#fafafa;
-	padding:5px;
-}
-
-.dvtCellLabel {
-	background-color:#f6f6f6;
-	padding-right:10px;
-	border-bottom:1px solid #eaeaea;
-	color:#737373;
-	white-space:nowrap;
-}
-
-.dvtCellInfo {
-	padding-left:10px;
-	border-bottom:1px solid #eaeaea;
-	white-space:nowrap;
-}
-
-.rightMailMerge {
-	border:1px solid #dddddd
-}
-
-.rightMailMergeHeader {
-	border-bottom:1px solid #dddddd;
-	padding:5px;
-	background-color:#eaeaea;
-
-}
-
-.rightMailMergeContent {
-	padding:5px;
-	background-color:#fafafa;
-
-}
-
-.rightUpcomingActivitiesHeader{
-	border-bottom:1px solid #ddddcc;
-	padding:5px;
-	background-color:#ffffdd;
-}
-
-.rightUpcomingActivitiesContent {
-	padding:5px;
-	background-color:#ffffef;
-}
-
-.detailedViewHeader{
-	border-bottom:1px solid #999999;
-	padding:5px; 
-	background-color:#e5e5e5;
-
-}
-
-.detailedViewTextBox {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	color: #000000;
-	border:1px solid #bababa;
-	padding-left:5px;
-	width:90%;
-	background-color:#ffffff;
-}
-
-.detailedViewProdTextBox {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	color: #000000;
-	border:1px solid #bababa;
-	padding-left:5px;
-	width:85%;
-	background-color:#ffffff;
-}
-
-.detailedViewTextBoxOn {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	color: #000000;
-	border:1px solid #bababa;
-	padding-left:5px;
-	width:90%;
-	background-color:#ffffdd;
-}
-
-.detailedViewTextArea {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	color: #000000;
-	border:1px solid #bababa;
-	padding-left:5px;
-	width:95%;
-	height:100px;
-	background-color:#ffffff;
-	text-align:left;
-}
-
-.moduleSearch {
-	border:1px solid #dddddd;
-	background-color:#ffffef;
-
-}
-
-.searchHdrBox {
-
-	border-bottom:1px dashed #dddddd;
-}
-
-.advSearch {
-	padding:10px;
-	border-left:1px solid #eaeaea; 
-	border-right:1px solid #eaeaea; 
-	border-bottom:1px solid #eaeaea; 	
-	overflow:auto;
-	width:600px;
-	height:150px;
-	background-color:#ffffef;
-
-}
-
-.searchAlph {
-	border:1px solid #dadada;
-	background-color:#ffffff;
-	cursor:pointer;
-	width:10px
-
-}
-.searchAlphselected {
-	border:1px solid #666666;
-	background-color:#bbbbbb;
-	cursor:pointer;
-	width:10px
-
-}
-.searchNotFound {
-	border:2px solid #ff3333;
-	background-color:#fafafa;
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	color: #ff0000;
-	height:50px;
-	width:640px;
-}
-
-.hiliteBtn4Search {
-	border:1px solid #cccccc;
-	background-color:#fafafa;
-	line-height:37px;
-	height:40px;
-	padding:5px;
-}
-
-.loginTopBg {
-	background:url(images/loginTopBg.gif) repeat-x;
-}
-
-.loginTopShade {
-	background:url(images/loginTopShade.gif) repeat-x;
-}
-
-.loginBg{
-	background:#448cEB url(images/loginBg.gif) repeat-x;
-}
-
-.textbox {
-	border:1px solid #999999;
-	background-color:#ffffff;
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	width:120px;
-	padding:2px;
-
-}
-
-.loginBottomBg {
-	background:url(images/loginBottomBg.gif) repeat-x;
-}
-
-.loginSignin {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 18px;
-	color: #448ceb;
-	font-weight:bold;
-}
-
-.loginBillBoard {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	color:#ffffff;
-}
-
-.mx {
-}
-
-.calTopBg {
-	background:url(images/calBg.gif) repeat-x;
-}
-
-.calDisplay {
-	border-left:1px solid #d0d0d0;
-	border-right:1px solid #d0d0d0;
-}
-.calBottomBg {
-	background:url(images/calBottomBg.gif) repeat-x;
-}
-
-.calDayHourCell {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 18px;
-}
-.calDayHour {
-	border-top:2px solid #dadada;
-}
-.calDiv {
-	overflow:auto; width:95%;height:320px;padding:0px;background-color:#fefefe;
-	border-top: 1px solid #bababa;
-	border-bottom: 1px solid #bababa;
-}
-
-.calHourOccupied {
-	background-color:#ffffbb;
-
-}
-
-.calAddEvent {
-	position:absolute;
-	z-index:10000;
-	width:500px;
-
-	left:200px;
-	top:150px;
-	border:2px solid #999999;
-	background-color:#ffffff;
-	padding:5px;
-}
-
-.addEventHeader{
-	border-bottom:2px dotted #cccccc;
-}
-
-.addEventFooter{
-	border-top:2px dotted #cccccc;
-	height:40px;
-}
-
-.addEventInnerBox {
-	border:1px dotted #dadada;
-
-}
-
-.cellScheduled {
-	background-color:#ffffef;
-	color:#7a7a7a;
-}
-
-.cellSchHover {
-	border-bottom:1px solid #999999;
-	border-right:1px solid #999999;
-	border-left:1px solid #dadada;
-	border-top:1px solid #dadada;
-	background-color:#ffffef;	
-	color:#7a7a7a;	
-}
-
-.cellSch{
-	border:0px;
-	background-color:#ffffef;
-	color:#7a7a7a;
-}
-
-.cellNormalHover {
-	border-bottom:1px solid #999999;
-	border-right:1px solid #999999;
-	border-left:1px solid #dadada;
-	border-top:1px solid #dadada;
-	background-color:#ffffff;	
-	color:#7a7a7a;	
-}
-
-.cellNormal {
-	border:0px;
-	background-color:#ffffff;
-}
-
-.calEventNormal {
-        border:1px solid #999999;
-        background-color:#99ffcc;
-
-}
-
-.calEventCritical {
-        border:1px solid #999999;
-        background-color:#FFCC33;
-}
-.tblPro1 {
-
-border:2px solid #dadada;
-       background-color:white;
-
-}
-
-.tblPro1IconCell {
-    border-right:1px solid #dadada;
-}
-
-.tblPro1HeadingCell {
-    font-weight:bold;
-color:#4a4a4a;
-}
-
-.tblPro1ColHeader {
-    background-color:#dadada;
-    border-left:1px solid white;
-    border-right:1px solid #999999;
-    font-size: 11px;
-    line-height: 14px;
-    background-image:url(images/tblPro1ColBg.gif);
-}
-
-.tblPro1DataCell {
-    border-bottom:1px solid #f5f5f5;
-    color:#5a5a5a;
-    font-size: 11px;
-    line-height: 14px;
-
-}
-
-.divEventToDo {
-overflow:auto;
-height:150px;
-border:1px solid #dadada;
-
-}
-
-.EventToDo{
-
-}
-
-.thumbnail{
-    background-color:#ffffff;
-padding: 7px;
-border: 1px solid #ddd;
-float: left;
-	   margin-right: 10px;
-	   margin-bottom: 15px;
-}
-
-.thumbnailcaption
-{ font-size: 0.9em; padding-top: 0.2em ;	}
-
-/* For Settings */
-
-.lftMnuTab{
-    font-family:Verdana, Arial, Helvetica, sans-serif;
-    font-size:12px;
-    color:#FFFFFF;
-    background-color:#BBBBBB;
-    border-left:1px solid #666666;
-    border-right:1px solid #666666;
-    border-top:0px solid #666666;
-    border-collapse:collapse;
-    text-align:right;
-    padding-top:0px;
-    padding-left:5px;
-    padding-right:5px;
-    vertical-align:top;
-}
-
-.lftMnuHdr{
-    font-family:Arial, Helvetica, sans-serif;
-    font-size:12px;
-    font-weight:bold;
-    color:white;
-    background-color:#DDDDDD;
-    border-bottom:1px solid #BBBBBB;
-    text-decoration:none;
-    width:99%;
-}
-
-.lftMnuHdr tr td{
-    font-family:Arial, Helvetica, sans-serif;
-    font-size:12px;
-    font-weight:bold;
-    color:white;
-    background-color:#DDDDDD;
-    border-bottom:1px solid #BBBBBB;
-    text-align:left;
-    text-decoration:none;
-    height:25px;
-    padding-right:0px;
-    padding-left:0px;
-}
-
-a.lftMnuHdr{
-    font-family:Arial, Helvetica, sans-serif;
-    font-size:12px;
-    font-weight:bold;
-    color:white;
-    background-color:#666666;
-    border-top:1px solid #BBBBBB;
-    border-bottom:1px solid #999999;
-    text-align:left;
-    text-decoration:none;
-    height:25px;
-    padding-left:5px;
-    width:100%;
-    display:block;
-    vertical-align:middle;
-}
-
-a.lftMnuHdr:Hover{
-    font-family:Arial, Helvetica, sans-serif;
-    font-size:12px;
-    font-weight:bold;
-    color:white;
-    background-color:#666666;
-    border-top:1px solid #BBBBBB;
-    border-bottom:1px solid #999999;
-    text-align:left;
-    text-decoration:none;
-    height:25px;
-    padding-left:5px;
-    width:100%;
-    display:block;
-}
-
-a.lftSubMnu{
-    font-family:Arial, Helvetica, sans-serif;
-    font-size:11px;
-    font-weight:normal;
-    display:block;
-    color:#666666;
-    height:20px;
-    width:93%;
-    text-align:left;
-    padding-left:15px;
-    text-decoration:none;
-    border-bottom:1px solid #BBBBBB;
-    padding-top:2px;
-    white-space:nowrap;
-}
-
-a.lftSubMnu:Hover{
-    font-family:Arial, Helvetica, sans-serif;
-    font-size:11px;
-    font-weight:normal;
-    display:block;
-    color:#666666;
-    height:20px;
-    width:93%;
-    text-align:left;
-    padding-left:15px;
-    text-decoration:none;
-    border-bottom:1px solid #BBBBBB;
-    padding-top:2px;
-    white-space:nowrap;
-    background-color:#CCCCCC;
-}
-
-.padTab{
-    padding-top:10px;
-    padding-left:10px;
-    padding-left:10px;
-    padding-bottom:0px;
-    vertical-align:top;
-    background-color:#FFFFFF;
-}
-
-.controlTab{
-    font-family:Arial, Helvetica, sans-serif;
-    font-size:12px;
-    text-align:center;
-    font-weight:bold;
-    text-decoration:none;
-    width:100%;
-    border:0px;
-}   
-
-.controlTab tr td{
-    font-family:Arial, Helvetica, sans-serif;
-    font-size:12px;
-    text-align:center;
-    font-weight:bold;
-    text-decoration:none;
-    vertical-align:bottom;
-}
-
-#company{
-    position:relative;
-    width:100%;
-    height:200px;
-    display:block;
-    background-color:#FFFFFF;
-    white-space:nowrap;
-    overflow:auto;
-    border:1px solid #CCCCCC;
-}
-                               
-
-#user{position:relative;left:0px;top:0px;width:100%;display:block;}
-#studio{position:relative;left:0px;top:0px;width:100%;display:block;}
-#communication{position:relative;left:0px;top:0px;width:100%;display:block;}
-#config{position:relative;left:0px;top:0px;width:100%;display:block;}
-
-#userTab{position:relative;left:0px;top:0px;width:100%;display:none;}
-#studioTab{position:relative;left:0px;top:0px;width:100%;display:none;}
-
-#scrollTab{
-	position:relative;
-	width:100%;
-	height:350px;
-	overflow:auto;
-	border:0px solid #CCCCCC;
-	display:block;
-}
-
-.dock{
-	vertical-align:middle;
-	text-align:left;
-	padding-left:0px;
-}
-.imgDoc{
-	cursor:pointer;
-	border:0px;
-}
-
-#one{
-	position:relative;
-	display:block;
-	width:245px;
-}
-
-#mnuTab{
-	position:relative;
-	overflow:auto;
-	width:100%;
-	display:block;
-	top: 1px;
-
-}
-
-#mnuTab1{
-
-   position:relative;
-
-   overflow:auto;
-
-   width:100%;
-
-   display:none;
-
-}
-
-#mnuTab2{
-
-   position:relative;
-
-   overflow:auto;
-
-   width:100%;
-
-   display:none;
-
-}
-
-
-/* End of Settings */
-
-.bggray{
-	background-color: #dfdfdf;
-}
-.bgwhite{
-	background-color: #FFFFFF;
-}
-.copy{
-	font-size:9px;
-	font-family: Verdana, Arial, Helvetica, Sans-serif;
-}
-
-#basicTab{
-	position:relative;
-	overflow:auto;
-	width:100%;
-	display:block;
-}
-
-#moreTab{
-	position:relative;
-	overflow:auto;
-	width:100%;
-	display:none;
-}
-
-/*Added for Advance Seearch*/
-
-#scrollTab{
-	position:relative;
-	width:100%;
-	height:350px;
-	overflow:auto;
-	border:0px solid #CCCCCC;
-	display:block;
-}
-
-.dock{
-	vertical-align:middle;
-	text-align:left;
-	padding-left:0px;
-}
-
-.imgDoc{
-	cursor:pointer;
-	border:0px;
-}
-#slideMnu{
-	background-color:#BBBBBB;
-	vertical-align:top;
-}
-
-#one{
-	position:relative;
-	display:block;
-	width:245px;
-}
-
-.prdTab{
-	font-family:Arial, Helvetica, sans-serif;
-	font-size:11px;
-	text-align:left;
-	width:100%;
-	border-left:0px solid #CCCCCC;
-	border-right:0px solid #CCCCCC;
-	border-collapse:collapse;
-}
-
-.prdTab tr th{
-	font-family:Arial, Helvetica, sans-serif;
-	font-size:11px;
-	text-align:left;
-	border-right:1px solid #CCCCCC;
-	border-left:1px solid #CCCCCC;
-	padding-left:5px;
-	background-color:#E5E5E5;
-	height:20px;
-	color:#000000;
-	font-weight:bold;
-	text-decoration:none;
-	border-bottom:1px solid #CCCCCC;
-}
-
-.prdTab tr td{
-	font-family:Arial, Helvetica, sans-serif;
-	font-size:11px;
-	text-align:left;
-	border-right:1px solid #CCCCCC;
-	border-left:1px solid #CCCCCC;
-	border-bottom:1px solid #CCCCCC;
-	padding-left:5px;
-	color:#000000;
-	text-decoration:none;
-	font-weight:normal;
-	height:20px;
-}
-
-.delTxt{
-	font-family:Arial, Helvetica, sans-serif;
-	font-size:11px;
-	text-decoration:underline;
-	font-weight:normal;
-	color:#000099;
-	cursor:pointer;
-}
-
-/* Dashboard CSS */
-
-.dashMain{
-	font-family:Arial, Helvetica, sans-serif;
-	font-size:11px;
-	background-color:#EBEBEB;
-	width:840px;
-	border-left:1px solid #CBCBCB;
-	border-right:1px solid #CBCBCB;
-	border-bottom:1px solid #CBCBCB;
-}
-
-.dashMain tr th{
-	font-family:Arial, Helvetica, sans-serif;
-	font-size:11px;
-	padding:0px;
-	border:0px solid #CBCBCB;
-}
-.dashMain tr td{
-	font-family:Arial, Helvetica, sans-serif;
-	font-size:11px;
-	padding-left:10px;
-	border:0px solid #CBCBCB;
-}
-
-.dashMnuUnSel{
-	font-family:Arial, Helvetica, sans-serif;
-	font-size:11px;
-	text-decoration:none;
-	text-align:left;
-	padding:5px;
-	height:20px;
-	vertical-align:middle;
-}
-
-.dashMnuSel{
-	font-family:Arial, Helvetica, sans-serif;
-	font-size:11px;
-	text-decoration:none;
-	text-align:left;
-	background-color:#CBCBCB;
-	font-weight:bold;
-	color:#000000;
-	padding:5px;
-	height:20px;
-	vertical-align:middle;
-}
-
-.dashInner{
-	width:100%;
-	border:0px solid #000000;
-	padding:0px;
-}
-
-.dashInner tr td{
-	width:100%;
-	border:0px solid #000000;
-	padding-left:0px;
-	padding-bottom:0px;
-	padding-right:0px;
-	padding-top:0px;
-}
-
-#dashChart{
-	font-family:Verdana, Arial, Helvetica, sans-serif;
-	font-size:11px;
-	background-color:#EBEBEB;
-	width:640px;
-	height:425px;
-	overflow:auto;
-	padding-left:5px;
-	padding-top:10px;
-	position:relative;
-}
-
-.dashSerial{
-	font-family:Verdana, Arial, Helvetica, sans-serif;
-	font-size:30px;
-	font-weight:bold;
-	color:#000000;
-}
-
-
-/*  menu */
-
-#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 #ECECEC;
-	background-color:#CCCCCC;
-	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 #ECECEC;
-	color:#000000;
-	text-align:left;
-	text-decoration:none;
-	display:block;
-}
-
-#mnuKey{
-	font-family:Verdana, Arial, Helvetica, sans-serif;
-	font-size:11px;
-	background-color:#666666;
-	color:#FFFFFF;
-	text-decoration:none;
-	padding:5px;
-	font-weight:bold;
-	width:8px;
-	cursor:pointer;
-	vertical-align:top;
-	height:100px;
-	position:relative;
-	top:0px;
-	left:0px;
-}
-
-#slidemenu{
-	height:525px;
-	vertical-align:top;
-	width:100px;
-	background-color:#CCCCCC;
-	border-right:1px solid #CCCCCC;
-	opacity:.9;
-	display:none;
-}
-
-/* clock */
-
-.citystyle{
-	position:relative;
-	top:0px;
-	left:0px;
-	text-align:left;
-	
-}
-#theClockLayer{
-	position:relative;
-	height:180px;
-	left:20px;
-	text-align:center;
-}
-.handsanddotsstyle{
-	margin-top:10px;
-	position:absolute;
-	top:0px;
-	left:0px;
-	width:2px;
-	height:2px;
-	font-size:2px;
-	background-color:#000000;
-}
-.facestyle{
-	margin-top:10px;
-	position:absolute;
-	top:0px;
-	left:0px;
-	width:15px;
-	height:15px;
-	text-align:center;
-	font-family:arial,sans-serif;
-	font-size:10px;
-	color:#000000;
-}
-.datestyle{
-	margin-top:20px;
-	position:absolute;
-	top:0px;
-	left:0px;
-	width:100px;
-	text-align:center;
-	font-family:arial,sans-serif;
-	font-size:10px;
-	color:#000000;
-}
-.ampmstyle{
-	margin-top:23px;
-	position:absolute;
-	top:0px;
-	left:0px;
-	width:20px;
-	text-align:center;
-	font-family:arial,sans-serif;
-	font-size:10px;
-	color:#000000;
-}
-
-#wclock{
-	position:absolute;
-	left:100px;
-	top:100px;
-	display:none;
-	background-color:#CCCCCC;
-	width:175px;
-}
-
-.leftFormBorder1 {
-	border: 1px solid #AFC8E4;
-	background-color: #FFFFFF;
-	opacity:.7;
-}
-
-
-
-
-/* Calculator */
-.calcBg {
-	/*background-color: #666;*//*BFC1B7*/
-	background: url(images/cal_bg.gif);
-	border: 1px solid #009900;
-}
-.calcResult {
-	width: 100%;
-	height: 25px;
-	background-color: #FFFFCC;/*CBDFD6*/
-	border-top: 1px solid #CCC;
-	border-left: 0px;
-	border-right: 1px solid #CCC;
-	border-bottom: 1px solid #CCC;
-	font-size: 10px;
-	text-align: right;
-}
-.calcMem {
-	width: 100%;
-	height: 25px;
-	border-top: 1px solid #CCC;
-	border-left: 1px solid #CCC;
-	border-right: 0px;
-	border-bottom: 1px solid #CCC;
-	background-color: #FFFFCC;/*CBDFD6*/
-	font-family: Arial;
-	font-size: 10px;
-	color: #BBB;
-	text-align: left;
-}
-.calcBlackBtn, .calcGreyBtn, .calcBigBtn, .calcCancBtn, .calcMemBtn, .calcBackBtn {
-	border: none;
-	height: 20px;
-	font-size: 11px;
-	color: #FFF;
-	text-align:center;
-}
-.calcBackBtn {
-	background: url(images/calc_back_btn.gif) no-repeat;
-	width:25px;
-}
-.calcBlackBtn {
-	background: url(images/calc_black_btn.gif) no-repeat;
-	width:25px;
-}
-.calcGreyBtn {
-	background: url(images/calc_grey_btn.gif) no-repeat;
-	width:25px;
-}
-.calcCancBtn {
-	background: url(images/calc_canc_btn.gif) no-repeat;
-	width:25px;
-	
-}
-.calcMemBtn {
-	background: url(images/calc_mem_btn.gif) no-repeat;
-	width:25px;
-	/*background-color: #CCC;*/
-}
-#calc{
-	position:absolute;
-	left:100px;
-	top:100px;
-	background-color:#FFFFFF;
-	width:185px;
-	border-bottom:2px solid #000000;
-	border-right:2px solid #666666;
-	border-left:2px solid #CCCCCC;
-	border-top:2px 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:200px;
-	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;
-}
-
-
-/*  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;
-}
-
-.prvPrfTopBg {
-	background-color:#ebebeb;
-}
-
-.prvPrfBottomBg {
-	background-color:#ebebeb;
-}
-
-.prvPrfOutline {
-	border:1px solid #ebebeb;
-}
-
-.prvPrfSelectedTab {
-	background:url(images/prvPrfSelectedTab.gif) repeat-x;
-	cursor:pointer;
-
-}
-
-.prvPrfUnSelectedTab {
-	background:url(images/prvPrfUnSelectedTab.gif) repeat-x;
-	cursor:pointer;
-}
-
-.prvPrfTexture {
-	background:url(images/prvPrfTexture1.gif);
-
-}
-.prvPrfBgOn{
-	background-color:#33ee33;
-}
-.prvPrfBgOff{
-	background-color:#cccccc;
-}
-
-.prvPrfHoverOn {
-	background-color:#ffffef;
-	
-}
-.prvPrfHoverOut {
-	background-color:#ffffff;
-}
-
-.prvPrfBgImgGlobal {
-	background:url(images/prvPrfBgImgGlobal.jpg) top right no-repeat;
-}
-.prvPrfBgImgTab {
-	background:url(images/prvPrfBgImgTab.jpg) top right no-repeat;
-}
-.prvPrfBgImgStandard {
-	background:url(images/prvPrfBgImgStandard.jpg) top right no-repeat;
-}
-.prvPrfBgImgUtils {
-	background:url(images/prvPrfBgImgUtils.jpg) top right no-repeat;
-}
-.prvPrfBgImgField {
-	background:url(images/prvPrfBgImgField.jpg) top right no-repeat;
-}
-
-.prvPrfTabSample {
-	border-top:1px solid #ababab;
-	border-left:1px solid #ababab;
-	border-right:1px solid #a1a1a1;
-}
-
-/*  Organization */
-
-.orgTab{
-	font-family:Arial, Helvetica, sans-serif;
-	font-size:11px;
-	font-weight:normal;
-	color:#666666;
-	border:0px solid #9B9B9B;
-	border-collapse:collapse;
-	width:100%;
-}
-
-.orgTab tr th{
-	text-align:left;
-	font-family:Arial, Helvetica, sans-serif;
-	font-size:12px;
-	text-decoration:none;
-	font-weight:bold;
-	height:20px;
-	padding-left:5px;
-}
-
-.orgTab tr td{
-	font-family:Arial, Helvetica, sans-serif;
-	font-size:11px;
-	text-decoration:none;
-	font-weight:normal;
-	padding-left:5px;
-	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%;
-}
-
-.globTab tr th{
-	text-align:right;
-	background-color:#CCCCCC;
-	border-bottom:1px solid #999999;
-	border-right:2px solid #999999;
-	color:#000000;
-	font-family:Arial, Helvetica, sans-serif;
-	font-size:12px;
-	text-decoration:none;
-	font-weight:bold;
-	height:20px;
-	padding-right:5px;
-	
-}
-
-.globTab tr td{
-	text-align:left;
-	border:1px solid #CCCCCC;
-	color:#666666;
-	font-family:Arial, Helvetica, sans-serif;
-	font-size:11px;
-	text-decoration:none;
-	font-weight:normal;
-	padding-left:5px;
-	height:20px;
-}
-
-
-/* Groups */
-
-.groupul{
-	margin:0px;
-	font-family:Arial, Helvetica, sans-serif;
-	font-weight:bold;
-	font-size:12px;
-	color:#000000;
-	text-decoration:underline;
-	text-align:left;
-}
-
-.groupli{
-	margin-left:20px;
-	font-family:Arial, Helvetica, sans-serif;
-	font-weight:normal;
-	font-size:12px;
-	text-decoration:none;
-	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:block;
-	position:absolute;
-	left:0px;
-	top:0px;
-}
-
-/*  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:Verdana, Arial, Helvetica, sans-serif;
-	text-decoration:none;
-	font-weight:normal;
-	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;
-}
-
-.classBtnSmall{
-	font-family:Verdana, Arial, Helvetica, sans-serif;
-	text-decoration:none;
-	font-weight:normal;
-	font-size:9px;
-	background-color:#DBDBDB;
-	border-bottom:2px solid #999999;
-	border-right:2px solid #999999;
-	border-top:2px solid #F5F5F5;
-	border-left:2px solid #F5F5F5;
-	color:#000000;
-	text-align:center;
-}
-
-.classBtnDisable{
-	font-family:Verdana, Arial, Helvetica, sans-serif;
-	text-decoration:none;
-	font-weight:normal;
-	font-size:10px;
-	background-color:#DBDBDB;
-	border-bottom:2px solid #CCCCCC;
-	border-right:2px solid #CCCCCC;
-	border-top:2px solid #F5F5F5;
-	border-left:2px solid #F5F5F5;
-	color:#666666;
-	text-align:center;
-	padding-top:3px;
-	padding-bottom:3px;
-}
-
-.txtBox{
-	width:85%;
-	border:1px solid #666666;
-	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;*/
-}
-
-.genHeaderGray{
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 14px;
-	line-height: 16px;
-	color: #888888;
-	font-weight:bold;
-}
-
-.genHeaderGrayBig{
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 18px;
-	line-height: 16px;
-	color: #888888;
-	font-weight:bold;
-}
-
-.importBox{
-	width:125px;
-	border:1px solid #666666;
-	font-family:Arial, Helvetica, sans-serif;
-	font-size:11px;
-}
-
-#imLead{
-	width:100%;
-	overflow:auto;
-	position:relative;
-	border:1px solid #666666;
-	height:175px;
-}
-
-.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;
-	z-index:2000;
-}
-
-#locateMap{
-	width:120px;
-	background-color:#CCCCCC;
-	border:1px solid #DDDDDD;
-	padding-top:5px;
-	position:absolute;
-	display:none;
-	z-index:2000;
-}
-
-
-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;
-}
-	
-/* END OF REPORT */
-/* WEB MAIL */
-a.webMnu{
-	font-size:11px;
-	color:#0070BA;
-	text-decoration:underline;
-}
-a.webMnu:Hover{
-	font-size:11px;
-	color:#0070BA;
-	text-decoration:underline;
-}
-
-.mailHdr{
-	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:#FFFFFF;
-	vertical-align:middle;
-	border:0px solid #000000;
-}
-
-.classWebBtn{
-	font-family:Verdana, Arial, Helvetica, sans-serif;
-	text-decoration:none;
-	font-weight:normal;
-	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;
-}
-
-/*  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{
-	border:2px solid #CCCCCC;
-	background-color:#FFFFFF;
-	width:30%;
-	position:relative;
-	visibility:visible;
-	margin:9px;
-	height:250px;
-}
-
-.fontBold{
-	font-size:13px;
-	color:#000000;
-	text-decoration:none;
-	font-weight:bold;
-}
-
-.style_Gray{
-	color:gray;
-}
-	
-/* End of Home Page */
-
-/* All Menu */
-#allMenu{
-	width:500px;
-	border-top:2px solid #CCCCCC;
-	border-left:2px solid #CCCCCC;
-	border-bottom:2px solid #666666;
-	border-right:2px solid #666666;
-	left:300px;
-	top:100px;
-	background-color:#CCCCCC;
-	position:absolute;
-	z-index:1000001;
-	display:none;
-}
-
-
-.allMnuTable{
-	width:100%;
-	border:1px solid #000000;
-	background-color:#FFFFFF;
-}
-
-.allMnuHandle td{
-	height:20px;
-	color:#FFFFFF;
-	font-family:Arial, Helvetica, sans-serif;
-	font-size:12px;
-	font-weight:bold;
-	text-decoration:none;
-	background-color:#000066;
-	cursor:move;
-	padding:2px;
-	border-bottom:2px solid #666666;
-}
-
-.allMnuHdr{
-	font-family:Verdana, Arial, Helvetica, sans-serif;
-	font-weight:normal;
-	font-size:11px;
-	text-decoration:none;
-	display:block;
-	background-color:#FFFFFF;
-	color:#000099;
-	padding-top:5px;
-	padding-bottom:5px;
-}
-a.allMnu{
-	font-family:Verdana, Arial, Helvetica, sans-serif;
-	font-size:10px;
-	text-decoration:none;
-	font-weight:normal;
-	display:block;
-	width:125px;
-	height:15px;
-	padding-left:5px;
-	padding-top:0px;
-	padding-bottom:0px;
-	background-color:#FFFFFF;
-	border:1px solid #FFFFFF;
-	color:#000033;
-	margin-left:20px;
-}
-
-a.allMnu:Hover{
-	font-family:Verdana, Arial, Helvetica, sans-serif;
-	font-size:10px;
-	text-decoration:none;
-	font-weight:normal;
-	display:block;
-	width:125px;
-	height:15px;
-	padding-left:5px;
-	padding-top:0px;
-	padding-bottom:0px;
-	background-color:#ECFFFF;
-	border:1px solid #00CCFF;
-	color:#000033;
-}
-/* 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;
-	z-index:1000;
-}
-
-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;
-}	
-
-.calendarNav{
-	font-size:12px;
-	color:#FFFFFF;
-	white-space:nowrap;
-	text-align:center;
-	font-weight:bold;
-	padding-left:10px;
-	padding-right:10px;
-	background-image:url(images/cal_nav.gif);
-	background-repeat:repeat-x;
-}
-
-#addEventDropDown{
-	position:absolute;
-	display:none;
-	width:110px;
-	border:1px solid #666666;
-	left:0px;
-	top:0px;
-	z-index:5000;
-}
-
-.calAction{
-	width:175px;
-	background-color:#CCCCCC;
-	border:1px solid #DDDDDD;
-	padding-top:5px;
-	position:absolute;
-	display:none;
-	z-index:2000;
-}
-
-.calSettings{
-	position:absolute;
-	z-index:20000;
-	width:500px;
-	left:200px;
-	top:150px;
-	border:2px solid #999999;
-	background-color:#ffffff;
-	padding:5px;
-}
-									
-/* End of Calendar */
-
-/* Cal Year View */
-.month_table{
-	border:2px solid #CCCCCC;
-	width:100%;
-	background-color:white;
-}
-
-.month_table tr th{
-	background-color:#E9E9E9;
-	color:#000000;
-	text-align:center;
-	border:1px dotted #CCCCCC;
-	height:20px;
-	width:14%;
-	font-weight:normal;
-}
-
-.month_table tr td{
-	border:1px dotted #CCCCCC;
-	color:#000000;
-	text-align:center;
-	height:20px;
-}
-
-.cal_Hdr{
-	background-image:url(images/cal_Hdr.gif);
-	background-repeat:repeat-x;
-	background-position:left top;
-	font-weight:bold;
-	color:#000000;
-	text-align:left;
-	border:0px solid #000000;
-}
-
-.eventDay{
-	background-color:#FF9966;
-	font-weight:bold;
-}
-
-.currDay{
-	background-color:#006600;
-	font-weight:bold;
-	text-decoration:underline;
-}
-
-/* End of Cal Year View */
-
-/* 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;
-}
-
-#CurrencyDeleteLay{
-	font-family:Arial, Helvetica, sans-serif;
-	font-size:11px;
-	text-align:left;
-	width:300px;
-	border:3px solid #CCCCCC;
-	background-color:#FFFFFF;
-	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;
-    font-weight: bold;
-    white-space:nowrap;
-}
-.rptTable {
-    border-left: 1px solid #DDDDDD;
-    border-bottom: 1px solid #DDDDDD;
-    border-top: 1px solid #DDDDDD;
-}
-.rptTitle, .rptHead, .rptData, .rptGrpHead{
-    font-family: Verdana, Arial, Helvetica, Sans-serif;
-    font-size: 11px;
-	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;
-}
-.rptGrpHead {
-	background: #FFF;
-    border-bottom: 1px solid #FFF;
-    border-top: 1px solid #DDDDDD;
-    font-weight: normal;
-}
-
-.rptData {
-            background: #FFF;
-            font-weight: normal;
-}
-.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;
-    left:100px;
-    top:100px;
-}
-
-#folderLay{
-    width:175px;
-    background-color:#CCCCCC;
-    border:1px solid #DDDDDD;
-    padding-top:5px;
-    position:absolute;
-    display:none;
-}
-
-/* Css for quick Create */
-
-.qcWindow {
-	    background-color:white;
-            border:2px solid #999999;
-}
-
-.qcHeader{
-	    background:url(images/qcBg.gif) repeat-x;
-	    background-color:gray;
-	    color:black;
-	    font-family: Arial, Helvetica, sans-serif;
-	    font-size: 12px;
-	    line-height: 19px;
-	    padding-left:10px;
-}
-.qcTextBox{
-            border:1px solid #999999;
-	    width:90%;
-}
-.qcTextArea{
-	    border:1px solid #999999;
-	    width:90%;
-	    height:70px;
-	    font-family: Arial, Helvetica, sans-serif;
-	    font-size: 11px;
-}
-.qcTransport{
-	    background-color:#ededed;
-
-}
-
-#role_popup{
-        position:relative;
-        left:0px;
-        top:0px;
-        width:95%;
-        height:300px;
-        overflow:auto;
-        border:1px solid #999999;
-        text-align:left;
-        background-color:#FFFFFF;
-    }
-
-.unread_email {
-	font-weight:bold;
-}
-
-								    
-/* MY SITES */
-
-.SiteSel{
-	font-family:Arial, Helvetica, sans-serif;
-	background-image:url(images/site_sel.jpg);
-	background-position:left bottom;
-	background-repeat:no-repeat;
-	height:33px;
-	width:194px;
-	text-align:center;
-	vertical-align:middle;
-	color:#000000;
-	font-weight:bold;
-	font-size:11px;
-	text-decoration:none;
-}
-
-.SiteUnSel{
-	font-family:Arial, Helvetica, sans-serif;
-	background-image:url(images/site_unsel.jpg);
-	background-position:left bottom;
-	background-repeat:no-repeat;
-	height:33px;
-	width:194px;
-	text-align:center;
-	vertical-align:middle;
-	color:#000000;
-	font-weight:normal;
-	font-size:11px;
-	text-decoration:none;
-	cursor:pointer;
-}
-
-.SiteHdr{
-	font-family:Arial, Helvetica, sans-serif;
-	background-image:url(images/site_hdr.jpg);
-	background-position:right bottom;
-	background-repeat:no-repeat;
-	height:33px;
-	text-align:center;
-	vertical-align:middle;
-	color:#000000;
-	font-weight:normal;
-	font-size:11px;
-	text-decoration:none;
-}
-.unread_email {
-	font-weight:bold;
-}
-
-
-.tagCloud {
-    border:1px solid #737373;
-}
-
-   
-.tagCloudTopBg {
-    background: url(images/tagCloudBg.gif) repeat-x;
-   
-}
-
-.tagCloudDisplay {
-    background-color:#e5e5e5;
-    padding:10px;
-    font-family: Arial, Helvetica, sans-serif;
-    font-size: 11px;
-    line-height: 14px;
-    color: #000000;
-
-}
-.adProgressBar {
-	border-style:solid;
-	border-width:2px;
-	border-color:blue;
-
-}
-
-.h2 {
-
-	font-size:18px;
-	line-height:20px;
-
-}
-
-.gray {
-
-	color:gray;
-}
-
-.hdeskComments {
-
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	line-height: 14px;
-	color: #999999;
-	border:0px;
-	background-color:#ffffef;
-	width:100%;
-
-}
-
-ul {
-	list-style:circle;
-	line-height:20px;
-	padding-left:5px;
-	margin-left:20px;
-	font-weight:normal;
-
-}
-
-	
-.branch {
-	list-style-image: url("secAdd.gif");
-}	
-
-
-
-.tagCloudTopBg {
-	background-image: url(images/topCloudBg.gif);
-	background-repeat: repeat-x;	
-}
-
-.tagCloudDisplay {
-	background-color:#e5e5e5;
-	padding:5px;
-}
-	
-	
-	
-.heading1 {
-	font-family:  Arial, Helvetica, sans-serif;
-	font-size: 19px;
-	line-height: 14px;
-	color: #000000;
-}
-
-.heading2 {
-	font-family:  Arial, Helvetica, sans-serif;
-	font-size: 16px;
-	line-height: 16px;
-	font-weight:bold;
-	color: #000000;
-}
-
-.heading3 {
-	font-family:  Arial, Helvetica, sans-serif;
-	font-size: 14px;
-	line-height: 14px;
-	color: #999999;
-}
-
-.heading4 {
-	font-family:  Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	line-height: 14px;
-	color: #999999;
-}
-
-.settingsUI {
-
-	background-color:#efefef;
-	border:2px solid #777777;
-
-}
-
-
-.settingsTabHeader {
-	font-family:  Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	line-height:25px;
-	font-weight:bold;
-	color:#ffffff;
-	background-image: url(images/settingsMTBg.gif);
-	background-repeat: repeat-x;
-	padding-left:10px;
-	padding-right:10px;
-	
-
-}
-
-.settingsTabList {
-	font-family:  Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	line-height:20px;
-	font-weight:normal;
-	color:#000000;
-	background-color:#e3e3e3;
-	padding-left:30px;
-	border-top:1px solid #eaeaea;
-	border-bottom:1px solid #d3d3d3;
-}
-.settingsTabSelected {
-	font-family:  Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	line-height:20px;
-	font-weight:bold;
-	color:#000000;
-	background-color:#ffffff;
-	padding-left:30px;
-}
-.settingsSelectedUI {
-	padding:10px;
-	background:url(images/settingsSelUIBg.gif) repeat-x;
-	background-color:#ffffff;
-}
-.settingsIconDisplay {
-	font-family:  Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	line-height:14px;
-	padding:10px;
-
-	color:#000000;
-	background-color:#ffffff;
-	padding-left:10px;
-}
-.settingsSelUITopLine{
-	border-bottom:2px dotted #999999;
-
-}
-
-.tableHeading{
-	background-color:#ffffff;
-	border-bottom:2px solid #aaaaaa;
-}
-.colHeader{
-	background-color:#dadada;
-	border-left:1px solid #eaeaea;
-	border-top:1px solid #eaeaea;
-	border-right:1px solid #aaaaaa;
-	border-bottom:1px solid #aaaaaa;
-	font-weight:bold;
-
-}
-.cellLabel {
-	background-color:#eaeaea;
-	border-top:1px solid #efefef;
-	border-bottom:1px solid #dadada;
-	color:#555555;
-
-}
-.cellText {
-	color:#333333;
-	border-bottom:1px solid #dadada;
-}
-
-.listTable{
-	border-left:1px solid #cccccc;
-	border-right:1px solid #cccccc;
-	border-bottom:1px solid #cccccc;
-
-}
-
-.listTableRow{
-	border-bottom:1px solid #eaeaea;
-	border-right	:1px solid #eaeaea;
-	border-bottom:1px solid #eaeaea;
-	border-bottom:1px solid #eaeaea;
-}
-.listRow{
-	border-bottom:2px solid #eaeaea;
-
-}
-
-.listTableTopButtons{
-	background-color:#eeeeee;
-	
-}
-
-.crmButton{
-	
-	border-left:1px solid #ffffff;
-	border-top:1px solid #ffffff;
-	border-right:1px solid #555555;
-	border-bottom:1px solid #555555;
-	padding-left:20px;
-	padding-right:20px;
-}
-
-.create{
-	background-color:#33cc11;
-	color:#333333;
-	font-weight:bold;
-}
-.delete {
-	background-color:#dd9900;
-	color:#ffffff;
-	font-weight:bold;
-}
-.edit {
-	background-color:#a5a5ee;
-	color:#ffffff;
-	font-weight:bold;
-}
-.save{
-	background-color:#33cc11;
-	color:#ffffff;
-	font-weight:bold;
-}
-.cancel {
-	background-color:#dd9900;
-	color:#ffffff;
-	font-weight:bold;
-}
-
-.inactive{
-color:#999999;
-}
-
-.active{
-color:#229922;
-
-}
-textarea {
-	width:95%;
-	height:70px;
-	border:1px solid #dadada;
-}
-.treeTable1{
-	padding:0px;
-}
-
-.prvPrfBigText {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 14px;
-}
-
-.prvPrfTopBg {
-	background-color:#ebebeb;
-}
-
-.prvPrfBottomBg {
-	background-color:#ebebeb;
-}
-
-.prvPrfOutline {
-	border:1px solid #ebebeb;
-}
-
-.prvPrfSelectedTab {
-	background:url(images/prvPrfSelectedTab.gif) repeat-x;
-
-}
-
-.prvPrfUnSelectedTab {
-	background:url(images/prvPrfUnSelectedTab.gif) repeat-x;
-
-}
-
-.prvPrfTexture {
-	background:url(images/prvPrfTexture1.gif);
-
-}
-.prvPrfBgOn{
-	background-color:#33ee33;
-}
-.prvPrfBgOff{
-	background-color:#cccccc;
-}
-
-.prvPrfHoverOn {
-	background-color:#ffffef;
-	
-}
-.prvPrfHoverOut {
-	background-color:#ffffff;
-}
-
-.prvPrfBgImgGlobal {
-	background:url(images/prvPrfBgImgGlobal.jpg) top right no-repeat;
-}
-.prvPrfBgImgTab {
-	background:url(images/prvPrfBgImgTab.jpg) top right no-repeat;
-}
-.prvPrfBgImgStandard {
-	background:url(images/prvPrfBgImgStandard.jpg) top right no-repeat;
-}
-.prvPrfBgImgUtils {
-	background:url(images/prvPrfBgImgUtils.jpg) top right no-repeat;
-}
-.prvPrfBgImgField {
-	background:url(images/prvPrfBgImgField.jpg) top right no-repeat;
-}
-
-.prvPrfTabSample {
-	border-top:1px solid #ababab;
-	border-left:1px solid #ababab;
-	border-right:1px solid #a1a1a1;
-}
-
-.cellBottomDotLine {
-	border-bottom-width: 2px;
-	border-bottom-style: dotted;
-	border-bottom-color: #CCCCCC;
-	background-color:#ededed;
-}
-.crmFormList{
-	border:1px solid #cccccc;
-	width:90%;
-	height:120px;
-
-}
-.cellBottomDotLinePlain {
-	border-bottom-width: 2px;
-	border-bottom-style: dotted;
-	border-bottom-color: #CCCCCC;
-	
-}
-.crmFormDropDown {
-border-width:1px;
-}
-.thickBorder {
-	border: 2px solid #999999;
-}
-
+.small {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	line-height: 14px;
+	color: #000000;
+}
+.big {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	line-height: 18px;
+	color: #000000;
+	font-weight:bold;
+}
+
+.ybToday {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	line-height: 14px;
+	color: #119911;
+}
+.ybUnfinished {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	line-height: 14px;
+	color: #993311;
+}
+.ybTime {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	line-height: 14px;
+	color: #777777;
+	font-weight:bold;
+}
+.yellowBox {
+	background-color:#ffffE1;
+	border:1px solid #999999;
+}
+.ybSeperator{
+	height:0px;
+	border-top:2px dotted #adadad;
+}
+
+.genHeaderBig{
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 16px;
+	line-height: 19px;
+	color: #000000;
+	font-weight:bold;
+}
+.genHeaderSmall{
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 14px;
+	line-height: 16px;
+	color: #000000;
+	font-weight:bold;
+}
+
+.moduleName {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 18px;
+	color: #000000;
+	font-weight:bold;
+}
+
+.rssDisplayPanel {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	line-height: 12px;
+	color: #ABABAB;
+}
+.hdrNameBg {
+
+	background:url(images/topBg.gif);
+}
+
+.hdrTabBg {
+	background:#bbbbbb url(images/tabUnSelectedBg.gif) repeat-x ;
+}
+
+.tabSelected {
+	background:#bbbbbb url(images/tabSelectedBg.gif) repeat-x;
+	font-family:  Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	padding-left:15px;
+	padding-right:15px;
+	padding-top:2px;
+	padding-bottom:2px;
+
+}
+
+.tabUnSelected {
+	background:#bbbbbb url(images/tabUnSelectedBg.gif) repeat-x;
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	padding-left:15px;
+	padding-right:15px;
+	padding-top:2px;
+	padding-bottom:2px;
+}
+
+.tabSeperator {
+	background:#bbbbbb url(images/tabSeperatorBg.gif) repeat-x;
+}
+
+/*.level2text {
+	background:#bbbbbb url(images/level2Bg.gif) repeat-x;
+    font-family: Arial, Helvetica, sans-serif;
+    font-size: 11px;
+	padding-left:20px;
+	padding-right:20px;
+	padding-top:5px;
+	padding-bottom:5px;
+	font-weight:bold;
+	color:white;
+}*/
+
+.level2text {
+    background:#bbbbbb url(images/level2Bg.gif) repeat-x;
+    font-family: Arial, Helvetica, sans-serif;
+    font-size: 11px;
+    padding-left:20px;
+    padding-right:20px;
+    padding-top:5px;
+    padding-bottom:5px;
+    font-weight:bold;
+    color:white;
+}
+
+.level2text a{
+	text-decoration:none;
+	color:white;
+}
+
+.level2text a:hover {
+	text-decoration:underline;
+	color:white;
+
+}
+
+.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;
+	font-size: 11px;
+}
+
+.level2textSel{
+	font-weight:bold;
+	color:#000000;
+	padding-left:20px;
+	padding-right:20px;
+	padding-top:3px;
+	padding-bottom:3px;
+}
+	
+
+.tabLiner {
+	background:#9abffc url(images/moduleSelectorBg.gif) bottom repeat-x;
+	padding:0px;
+}
+
+.sep1 {
+	background:#999999;
+}
+
+.showPanelBg {
+	background:url(images/showPanelTopBg.gif) repeat-x;
+}
+
+a {
+	text-decoration:none;
+	color:#003399;
+}
+
+a:hover {
+	text-decoration:underline;
+}
+
+.hdrLink {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 18px;
+	text-decoration:none;
+	color:#333333;
+	font-weight:bold;
+}
+
+.hdrLink:hover {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 18px;
+	text-decoration:underline;
+	color:#333333;
+	font-weight:bold;
+}
+
+.searchBox {
+	border: 0px solid #999999;
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	padding-left:2px;
+	width:100px;
+	background-color:#ffffef;
+}
+
+.searchBtn {
+	border : 1px #cccccc solid;
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	width:30px;
+	height:19px;
+	background-color:#cccccc;
+}
+
+.lvtBg {
+	background-color:#cccccc;
+
+}
+
+.lvtHeaderText {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 14px;
+	font-weight:bold;
+}
+
+.lvtCol {
+	border-top:1px solid #eeeeee;
+	border-left:1px solid #eeeeee;
+	border-right:1px solid #999999;
+	border-bottom:1px solid #999999;
+	background-color:#dadada;
+	color:#666666;
+	font-weight:bold;
+}
+
+.lvtColData {
+	background-color:#fafafa;
+}
+
+.lvtColDataHover {
+	background-color:#efefef;
+}
+
+.dvtSelectedCell {
+	border-left:1px solid #cacaca;
+	border-top:3px solid #999999;
+	border-right:1px solid #cacaca;
+	padding-left:20px;
+	padding-right:20px;
+	background-color:white;
+	font-weight:bold;
+}
+
+.dvtUnSelectedCell {
+	border-left:1px solid #cacaca;
+	border-top:1px solid #cacaca;
+	border-right:1px solid #cacaca;
+	border-bottom:1px solid #cacaca;
+	padding-left:20px;
+	padding-right:20px;
+	background-color:#efefef;
+	cursor:pointer;
+}
+
+.dvtTabCache {
+	border-bottom:1px solid #cacaca;
+}
+
+.dvtContentSpace {
+	border-left:1px solid #cacaca;
+	border-right:1px solid #cacaca;
+	border-bottom:1px solid #cacaca;
+	padding-left:0px;
+}
+
+.rightAddInfo {
+	border-left:1px solid #a2a2a2;
+	border-right:1px solid #dddddd;
+	border-bottom:1px solid #dddddd;
+	border-top:1px solid #a2a2a2;
+	background-color:#fafafa;
+	padding:5px;
+}
+
+.dvtCellLabel {
+	background-color:#f6f6f6;
+	padding-right:10px;
+	border-bottom:1px solid #eaeaea;
+	color:#737373;
+	white-space:nowrap;
+}
+
+.dvtCellInfo {
+	padding-left:10px;
+	border-bottom:1px solid #eaeaea;
+	white-space:nowrap;
+}
+
+.rightMailMerge {
+	border:1px solid #dddddd
+}
+
+.rightMailMergeHeader {
+	border-bottom:1px solid #dddddd;
+	padding:5px;
+	background-color:#eaeaea;
+
+}
+
+.rightMailMergeContent {
+	padding:5px;
+	background-color:#fafafa;
+
+}
+
+.rightUpcomingActivitiesHeader{
+	border-bottom:1px solid #ddddcc;
+	padding:5px;
+	background-color:#ffffdd;
+}
+
+.rightUpcomingActivitiesContent {
+	padding:5px;
+	background-color:#ffffef;
+}
+
+.detailedViewHeader{
+	border-bottom:1px solid #999999;
+	padding:5px; 
+	background-color:#e5e5e5;
+
+}
+
+.detailedViewTextBox {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	color: #000000;
+	border:1px solid #bababa;
+	padding-left:5px;
+	width:90%;
+	background-color:#ffffff;
+}
+
+.detailedViewProdTextBox {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	color: #000000;
+	border:1px solid #bababa;
+	padding-left:5px;
+	width:85%;
+	background-color:#ffffff;
+}
+
+.detailedViewTextBoxOn {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	color: #000000;
+	border:1px solid #bababa;
+	padding-left:5px;
+	width:90%;
+	background-color:#ffffdd;
+}
+
+.detailedViewTextArea {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	color: #000000;
+	border:1px solid #bababa;
+	padding-left:5px;
+	width:95%;
+	height:100px;
+	background-color:#ffffff;
+	text-align:left;
+}
+
+.moduleSearch {
+	border:1px solid #dddddd;
+	background-color:#ffffef;
+
+}
+
+.searchHdrBox {
+
+	border-bottom:1px dashed #dddddd;
+}
+
+.advSearch {
+	padding:10px;
+	border-left:1px solid #eaeaea; 
+	border-right:1px solid #eaeaea; 
+	border-bottom:1px solid #eaeaea; 	
+	overflow:auto;
+	width:600px;
+	height:150px;
+	background-color:#ffffef;
+
+}
+
+.searchAlph {
+	border:1px solid #dadada;
+	background-color:#ffffff;
+	cursor:pointer;
+	width:10px
+
+}
+.searchAlphselected {
+	border:1px solid #666666;
+	background-color:#bbbbbb;
+	cursor:pointer;
+	width:10px
+
+}
+.searchNotFound {
+	border:2px solid #ff3333;
+	background-color:#fafafa;
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	color: #ff0000;
+	height:50px;
+	width:640px;
+}
+
+.hiliteBtn4Search {
+	border:1px solid #cccccc;
+	background-color:#fafafa;
+	line-height:37px;
+	height:40px;
+	padding:5px;
+}
+
+.loginTopBg {
+	background:url(images/loginTopBg.gif) repeat-x;
+}
+
+.loginTopShade {
+	background:url(images/loginTopShade.gif) repeat-x;
+}
+
+.loginBg{
+	background:#448cEB url(images/loginBg.gif) repeat-x;
+}
+
+.textbox {
+	border:1px solid #999999;
+	background-color:#ffffff;
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	width:120px;
+	padding:2px;
+
+}
+
+.loginBottomBg {
+	background:url(images/loginBottomBg.gif) repeat-x;
+}
+
+.loginSignin {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 18px;
+	color: #448ceb;
+	font-weight:bold;
+}
+
+.loginBillBoard {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	color:#ffffff;
+}
+
+.mx {
+}
+
+.calTopBg {
+	background:url(images/calBg.gif) repeat-x;
+}
+
+.calDisplay {
+	border-left:1px solid #d0d0d0;
+	border-right:1px solid #d0d0d0;
+}
+.calBottomBg {
+	background:url(images/calBottomBg.gif) repeat-x;
+}
+
+.calDayHourCell {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 18px;
+}
+.calDayHour {
+	border-top:2px solid #dadada;
+}
+.calDiv {
+	overflow:auto; width:95%;height:320px;padding:0px;background-color:#fefefe;
+	border-top: 1px solid #bababa;
+	border-bottom: 1px solid #bababa;
+}
+
+.calHourOccupied {
+	background-color:#ffffbb;
+
+}
+
+.calAddEvent {
+	position:absolute;
+	z-index:10000;
+	width:500px;
+
+	left:200px;
+	top:150px;
+	border:2px solid #999999;
+	background-color:#ffffff;
+	padding:5px;
+}
+
+.addEventHeader{
+	border-bottom:2px dotted #cccccc;
+}
+
+.addEventFooter{
+	border-top:2px dotted #cccccc;
+	height:40px;
+}
+
+.addEventInnerBox {
+	border:1px dotted #dadada;
+
+}
+
+.cellScheduled {
+	background-color:#ffffef;
+	color:#7a7a7a;
+}
+
+.cellSchHover {
+	border-bottom:1px solid #999999;
+	border-right:1px solid #999999;
+	border-left:1px solid #dadada;
+	border-top:1px solid #dadada;
+	background-color:#ffffef;	
+	color:#7a7a7a;	
+}
+
+.cellSch{
+	border:0px;
+	background-color:#ffffef;
+	color:#7a7a7a;
+}
+
+.cellNormalHover {
+	border-bottom:1px solid #999999;
+	border-right:1px solid #999999;
+	border-left:1px solid #dadada;
+	border-top:1px solid #dadada;
+	background-color:#ffffff;	
+	color:#7a7a7a;	
+}
+
+.cellNormal {
+	border:0px;
+	background-color:#ffffff;
+}
+
+.calEventNormal {
+        border:1px solid #999999;
+        background-color:#99ffcc;
+
+}
+
+.calEventCritical {
+        border:1px solid #999999;
+        background-color:#FFCC33;
+}
+.tblPro1 {
+
+border:2px solid #dadada;
+       background-color:white;
+
+}
+
+.tblPro1IconCell {
+    border-right:1px solid #dadada;
+}
+
+.tblPro1HeadingCell {
+    font-weight:bold;
+color:#4a4a4a;
+}
+
+.tblPro1ColHeader {
+    background-color:#dadada;
+    border-left:1px solid white;
+    border-right:1px solid #999999;
+    font-size: 11px;
+    line-height: 14px;
+    background-image:url(images/tblPro1ColBg.gif);
+}
+
+.tblPro1DataCell {
+    border-bottom:1px solid #f5f5f5;
+    color:#5a5a5a;
+    font-size: 11px;
+    line-height: 14px;
+
+}
+
+.divEventToDo {
+overflow:auto;
+height:150px;
+border:1px solid #dadada;
+
+}
+
+.EventToDo{
+
+}
+
+.thumbnail{
+    background-color:#ffffff;
+padding: 7px;
+border: 1px solid #ddd;
+float: left;
+	   margin-right: 10px;
+	   margin-bottom: 15px;
+}
+
+.thumbnailcaption
+{ font-size: 0.9em; padding-top: 0.2em ;	}
+
+/* For Settings */
+
+.lftMnuTab{
+    font-family:Verdana, Arial, Helvetica, sans-serif;
+    font-size:12px;
+    color:#FFFFFF;
+    background-color:#BBBBBB;
+    border-left:1px solid #666666;
+    border-right:1px solid #666666;
+    border-top:0px solid #666666;
+    border-collapse:collapse;
+    text-align:right;
+    padding-top:0px;
+    padding-left:5px;
+    padding-right:5px;
+    vertical-align:top;
+}
+
+.lftMnuHdr{
+    font-family:Arial, Helvetica, sans-serif;
+    font-size:12px;
+    font-weight:bold;
+    color:white;
+    background-color:#DDDDDD;
+    border-bottom:1px solid #BBBBBB;
+    text-decoration:none;
+    width:99%;
+}
+
+.lftMnuHdr tr td{
+    font-family:Arial, Helvetica, sans-serif;
+    font-size:12px;
+    font-weight:bold;
+    color:white;
+    background-color:#DDDDDD;
+    border-bottom:1px solid #BBBBBB;
+    text-align:left;
+    text-decoration:none;
+    height:25px;
+    padding-right:0px;
+    padding-left:0px;
+}
+
+a.lftMnuHdr{
+    font-family:Arial, Helvetica, sans-serif;
+    font-size:12px;
+    font-weight:bold;
+    color:white;
+    background-color:#666666;
+    border-top:1px solid #BBBBBB;
+    border-bottom:1px solid #999999;
+    text-align:left;
+    text-decoration:none;
+    height:25px;
+    padding-left:5px;
+    width:100%;
+    display:block;
+    vertical-align:middle;
+}
+
+a.lftMnuHdr:Hover{
+    font-family:Arial, Helvetica, sans-serif;
+    font-size:12px;
+    font-weight:bold;
+    color:white;
+    background-color:#666666;
+    border-top:1px solid #BBBBBB;
+    border-bottom:1px solid #999999;
+    text-align:left;
+    text-decoration:none;
+    height:25px;
+    padding-left:5px;
+    width:100%;
+    display:block;
+}
+
+a.lftSubMnu{
+    font-family:Arial, Helvetica, sans-serif;
+    font-size:11px;
+    font-weight:normal;
+    display:block;
+    color:#666666;
+    height:20px;
+    width:93%;
+    text-align:left;
+    padding-left:15px;
+    text-decoration:none;
+    border-bottom:1px solid #BBBBBB;
+    padding-top:2px;
+    white-space:nowrap;
+}
+
+a.lftSubMnu:Hover{
+    font-family:Arial, Helvetica, sans-serif;
+    font-size:11px;
+    font-weight:normal;
+    display:block;
+    color:#666666;
+    height:20px;
+    width:93%;
+    text-align:left;
+    padding-left:15px;
+    text-decoration:none;
+    border-bottom:1px solid #BBBBBB;
+    padding-top:2px;
+    white-space:nowrap;
+    background-color:#CCCCCC;
+}
+
+.padTab{
+    padding-top:10px;
+    padding-left:10px;
+    padding-left:10px;
+    padding-bottom:0px;
+    vertical-align:top;
+    background-color:#FFFFFF;
+}
+
+.controlTab{
+    font-family:Arial, Helvetica, sans-serif;
+    font-size:12px;
+    text-align:center;
+    font-weight:bold;
+    text-decoration:none;
+    width:100%;
+    border:0px;
+}   
+
+.controlTab tr td{
+    font-family:Arial, Helvetica, sans-serif;
+    font-size:12px;
+    text-align:center;
+    font-weight:bold;
+    text-decoration:none;
+    vertical-align:bottom;
+}
+
+#company{
+    position:relative;
+    width:100%;
+    height:200px;
+    display:block;
+    background-color:#FFFFFF;
+    white-space:nowrap;
+    overflow:auto;
+    border:1px solid #CCCCCC;
+}
+                               
+
+#user{position:relative;left:0px;top:0px;width:100%;display:block;}
+#studio{position:relative;left:0px;top:0px;width:100%;display:block;}
+#communication{position:relative;left:0px;top:0px;width:100%;display:block;}
+#config{position:relative;left:0px;top:0px;width:100%;display:block;}
+
+#userTab{position:relative;left:0px;top:0px;width:100%;display:none;}
+#studioTab{position:relative;left:0px;top:0px;width:100%;display:none;}
+
+#scrollTab{
+	position:relative;
+	width:100%;
+	height:350px;
+	overflow:auto;
+	border:0px solid #CCCCCC;
+	display:block;
+}
+
+.dock{
+	vertical-align:middle;
+	text-align:left;
+	padding-left:0px;
+}
+.imgDoc{
+	cursor:pointer;
+	border:0px;
+}
+
+#one{
+	position:relative;
+	display:block;
+	width:245px;
+}
+
+#mnuTab{
+	position:relative;
+	overflow:auto;
+	width:100%;
+	display:block;
+	top: 1px;
+
+}
+
+#mnuTab1{
+
+   position:relative;
+
+   overflow:auto;
+
+   width:100%;
+
+   display:none;
+
+}
+
+#mnuTab2{
+
+   position:relative;
+
+   overflow:auto;
+
+   width:100%;
+
+   display:none;
+
+}
+
+
+/* End of Settings */
+
+.bggray{
+	background-color: #dfdfdf;
+}
+.bgwhite{
+	background-color: #FFFFFF;
+}
+.copy{
+	font-size:9px;
+	font-family: Verdana, Arial, Helvetica, Sans-serif;
+}
+
+#basicTab{
+	position:relative;
+	overflow:auto;
+	width:100%;
+	display:block;
+}
+
+#moreTab{
+	position:relative;
+	overflow:auto;
+	width:100%;
+	display:none;
+}
+
+/*Added for Advance Seearch*/
+
+#scrollTab{
+	position:relative;
+	width:100%;
+	height:350px;
+	overflow:auto;
+	border:0px solid #CCCCCC;
+	display:block;
+}
+
+.dock{
+	vertical-align:middle;
+	text-align:left;
+	padding-left:0px;
+}
+
+.imgDoc{
+	cursor:pointer;
+	border:0px;
+}
+#slideMnu{
+	background-color:#BBBBBB;
+	vertical-align:top;
+}
+
+#one{
+	position:relative;
+	display:block;
+	width:245px;
+}
+
+.prdTab{
+	font-family:Arial, Helvetica, sans-serif;
+	font-size:11px;
+	text-align:left;
+	width:100%;
+	border-left:0px solid #CCCCCC;
+	border-right:0px solid #CCCCCC;
+	border-collapse:collapse;
+}
+
+.prdTab tr th{
+	font-family:Arial, Helvetica, sans-serif;
+	font-size:11px;
+	text-align:left;
+	border-right:1px solid #CCCCCC;
+	border-left:1px solid #CCCCCC;
+	padding-left:5px;
+	background-color:#E5E5E5;
+	height:20px;
+	color:#000000;
+	font-weight:bold;
+	text-decoration:none;
+	border-bottom:1px solid #CCCCCC;
+}
+
+.prdTab tr td{
+	font-family:Arial, Helvetica, sans-serif;
+	font-size:11px;
+	text-align:left;
+	border-right:1px solid #CCCCCC;
+	border-left:1px solid #CCCCCC;
+	border-bottom:1px solid #CCCCCC;
+	padding-left:5px;
+	color:#000000;
+	text-decoration:none;
+	font-weight:normal;
+	height:20px;
+}
+
+.delTxt{
+	font-family:Arial, Helvetica, sans-serif;
+	font-size:11px;
+	text-decoration:underline;
+	font-weight:normal;
+	color:#000099;
+	cursor:pointer;
+}
+
+/* Dashboard CSS */
+
+.dashMain{
+	font-family:Arial, Helvetica, sans-serif;
+	font-size:11px;
+	background-color:#EBEBEB;
+	width:840px;
+	border-left:1px solid #CBCBCB;
+	border-right:1px solid #CBCBCB;
+	border-bottom:1px solid #CBCBCB;
+}
+
+.dashMain tr th{
+	font-family:Arial, Helvetica, sans-serif;
+	font-size:11px;
+	padding:0px;
+	border:0px solid #CBCBCB;
+}
+.dashMain tr td{
+	font-family:Arial, Helvetica, sans-serif;
+	font-size:11px;
+	padding-left:10px;
+	border:0px solid #CBCBCB;
+}
+
+.dashMnuUnSel{
+	font-family:Arial, Helvetica, sans-serif;
+	font-size:11px;
+	text-decoration:none;
+	text-align:left;
+	padding:5px;
+	height:20px;
+	vertical-align:middle;
+}
+
+.dashMnuSel{
+	font-family:Arial, Helvetica, sans-serif;
+	font-size:11px;
+	text-decoration:none;
+	text-align:left;
+	background-color:#CBCBCB;
+	font-weight:bold;
+	color:#000000;
+	padding:5px;
+	height:20px;
+	vertical-align:middle;
+}
+
+.dashInner{
+	width:100%;
+	border:0px solid #000000;
+	padding:0px;
+}
+
+.dashInner tr td{
+	width:100%;
+	border:0px solid #000000;
+	padding-left:0px;
+	padding-bottom:0px;
+	padding-right:0px;
+	padding-top:0px;
+}
+
+#dashChart{
+	font-family:Verdana, Arial, Helvetica, sans-serif;
+	font-size:11px;
+	background-color:#EBEBEB;
+	width:640px;
+	height:425px;
+	overflow:auto;
+	padding-left:5px;
+	padding-top:10px;
+	position:relative;
+}
+
+.dashSerial{
+	font-family:Verdana, Arial, Helvetica, sans-serif;
+	font-size:30px;
+	font-weight:bold;
+	color:#000000;
+}
+
+
+/*  menu */
+
+#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 #ECECEC;
+	background-color:#CCCCCC;
+	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 #ECECEC;
+	color:#000000;
+	text-align:left;
+	text-decoration:none;
+	display:block;
+}
+
+#mnuKey{
+	font-family:Verdana, Arial, Helvetica, sans-serif;
+	font-size:11px;
+	background-color:#666666;
+	color:#FFFFFF;
+	text-decoration:none;
+	padding:5px;
+	font-weight:bold;
+	width:8px;
+	cursor:pointer;
+	vertical-align:top;
+	height:100px;
+	position:relative;
+	top:0px;
+	left:0px;
+}
+
+#slidemenu{
+	height:525px;
+	vertical-align:top;
+	width:100px;
+	background-color:#CCCCCC;
+	border-right:1px solid #CCCCCC;
+	opacity:.9;
+	display:none;
+}
+
+/* clock */
+
+.citystyle{
+	position:relative;
+	top:0px;
+	left:0px;
+	text-align:left;
+	
+}
+#theClockLayer{
+	position:relative;
+	height:180px;
+	left:20px;
+	text-align:center;
+}
+.handsanddotsstyle{
+	margin-top:10px;
+	position:absolute;
+	top:0px;
+	left:0px;
+	width:2px;
+	height:2px;
+	font-size:2px;
+	background-color:#000000;
+}
+.facestyle{
+	margin-top:10px;
+	position:absolute;
+	top:0px;
+	left:0px;
+	width:15px;
+	height:15px;
+	text-align:center;
+	font-family:arial,sans-serif;
+	font-size:10px;
+	color:#000000;
+}
+.datestyle{
+	margin-top:20px;
+	position:absolute;
+	top:0px;
+	left:0px;
+	width:100px;
+	text-align:center;
+	font-family:arial,sans-serif;
+	font-size:10px;
+	color:#000000;
+}
+.ampmstyle{
+	margin-top:23px;
+	position:absolute;
+	top:0px;
+	left:0px;
+	width:20px;
+	text-align:center;
+	font-family:arial,sans-serif;
+	font-size:10px;
+	color:#000000;
+}
+
+#wclock{
+	position:absolute;
+	left:100px;
+	top:100px;
+	display:none;
+	background-color:#CCCCCC;
+	width:175px;
+}
+
+.leftFormBorder1 {
+	border: 1px solid #AFC8E4;
+	background-color: #FFFFFF;
+	opacity:.7;
+}
+
+
+
+
+/* Calculator */
+.calcBg {
+	/*background-color: #666;*//*BFC1B7*/
+	background: url(images/cal_bg.gif);
+	border: 1px solid #009900;
+}
+.calcResult {
+	width: 100%;
+	height: 25px;
+	background-color: #FFFFCC;/*CBDFD6*/
+	border-top: 1px solid #CCC;
+	border-left: 0px;
+	border-right: 1px solid #CCC;
+	border-bottom: 1px solid #CCC;
+	font-size: 10px;
+	text-align: right;
+}
+.calcMem {
+	width: 100%;
+	height: 25px;
+	border-top: 1px solid #CCC;
+	border-left: 1px solid #CCC;
+	border-right: 0px;
+	border-bottom: 1px solid #CCC;
+	background-color: #FFFFCC;/*CBDFD6*/
+	font-family: Arial;
+	font-size: 10px;
+	color: #BBB;
+	text-align: left;
+}
+.calcBlackBtn, .calcGreyBtn, .calcBigBtn, .calcCancBtn, .calcMemBtn, .calcBackBtn {
+	border: none;
+	height: 20px;
+	font-size: 11px;
+	color: #FFF;
+	text-align:center;
+}
+.calcBackBtn {
+	background: url(images/calc_back_btn.gif) no-repeat;
+	width:25px;
+}
+.calcBlackBtn {
+	background: url(images/calc_black_btn.gif) no-repeat;
+	width:25px;
+}
+.calcGreyBtn {
+	background: url(images/calc_grey_btn.gif) no-repeat;
+	width:25px;
+}
+.calcCancBtn {
+	background: url(images/calc_canc_btn.gif) no-repeat;
+	width:25px;
+	
+}
+.calcMemBtn {
+	background: url(images/calc_mem_btn.gif) no-repeat;
+	width:25px;
+	/*background-color: #CCC;*/
+}
+#calc{
+	position:absolute;
+	left:100px;
+	top:100px;
+	background-color:#FFFFFF;
+	width:185px;
+	border-bottom:2px solid #000000;
+	border-right:2px solid #666666;
+	border-left:2px solid #CCCCCC;
+	border-top:2px 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:200px;
+	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;
+}
+
+
+/*  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;
+}
+
+.prvPrfTopBg {
+	background-color:#ebebeb;
+}
+
+.prvPrfBottomBg {
+	background-color:#ebebeb;
+}
+
+.prvPrfOutline {
+	border:1px solid #ebebeb;
+}
+
+.prvPrfSelectedTab {
+	background:url(images/prvPrfSelectedTab.gif) repeat-x;
+	cursor:pointer;
+
+}
+
+.prvPrfUnSelectedTab {
+	background:url(images/prvPrfUnSelectedTab.gif) repeat-x;
+	cursor:pointer;
+}
+
+.prvPrfTexture {
+	background:url(images/prvPrfTexture1.gif);
+
+}
+.prvPrfBgOn{
+	background-color:#33ee33;
+}
+.prvPrfBgOff{
+	background-color:#cccccc;
+}
+
+.prvPrfHoverOn {
+	background-color:#ffffef;
+	
+}
+.prvPrfHoverOut {
+	background-color:#ffffff;
+}
+
+.prvPrfBgImgGlobal {
+	background:url(images/prvPrfBgImgGlobal.jpg) top right no-repeat;
+}
+.prvPrfBgImgTab {
+	background:url(images/prvPrfBgImgTab.jpg) top right no-repeat;
+}
+.prvPrfBgImgStandard {
+	background:url(images/prvPrfBgImgStandard.jpg) top right no-repeat;
+}
+.prvPrfBgImgUtils {
+	background:url(images/prvPrfBgImgUtils.jpg) top right no-repeat;
+}
+.prvPrfBgImgField {
+	background:url(images/prvPrfBgImgField.jpg) top right no-repeat;
+}
+
+.prvPrfTabSample {
+	border-top:1px solid #ababab;
+	border-left:1px solid #ababab;
+	border-right:1px solid #a1a1a1;
+}
+
+/*  Organization */
+
+.orgTab{
+	font-family:Arial, Helvetica, sans-serif;
+	font-size:11px;
+	font-weight:normal;
+	color:#666666;
+	border:0px solid #9B9B9B;
+	border-collapse:collapse;
+	width:100%;
+}
+
+.orgTab tr th{
+	text-align:left;
+	font-family:Arial, Helvetica, sans-serif;
+	font-size:12px;
+	text-decoration:none;
+	font-weight:bold;
+	height:20px;
+	padding-left:5px;
+}
+
+.orgTab tr td{
+	font-family:Arial, Helvetica, sans-serif;
+	font-size:11px;
+	text-decoration:none;
+	font-weight:normal;
+	padding-left:5px;
+	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%;
+}
+
+.globTab tr th{
+	text-align:right;
+	background-color:#CCCCCC;
+	border-bottom:1px solid #999999;
+	border-right:2px solid #999999;
+	color:#000000;
+	font-family:Arial, Helvetica, sans-serif;
+	font-size:12px;
+	text-decoration:none;
+	font-weight:bold;
+	height:20px;
+	padding-right:5px;
+	
+}
+
+.globTab tr td{
+	text-align:left;
+	border:1px solid #CCCCCC;
+	color:#666666;
+	font-family:Arial, Helvetica, sans-serif;
+	font-size:11px;
+	text-decoration:none;
+	font-weight:normal;
+	padding-left:5px;
+	height:20px;
+}
+
+
+/* Groups */
+
+.groupul{
+	margin:0px;
+	font-family:Arial, Helvetica, sans-serif;
+	font-weight:bold;
+	font-size:12px;
+	color:#000000;
+	text-decoration:underline;
+	text-align:left;
+}
+
+.groupli{
+	margin-left:20px;
+	font-family:Arial, Helvetica, sans-serif;
+	font-weight:normal;
+	font-size:12px;
+	text-decoration:none;
+	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:block;
+	position:absolute;
+	left:0px;
+	top:0px;
+}
+
+/*  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:Verdana, Arial, Helvetica, sans-serif;
+	text-decoration:none;
+	font-weight:normal;
+	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;
+}
+
+.classBtnSmall{
+	font-family:Verdana, Arial, Helvetica, sans-serif;
+	text-decoration:none;
+	font-weight:normal;
+	font-size:9px;
+	background-color:#DBDBDB;
+	border-bottom:2px solid #999999;
+	border-right:2px solid #999999;
+	border-top:2px solid #F5F5F5;
+	border-left:2px solid #F5F5F5;
+	color:#000000;
+	text-align:center;
+}
+
+.classBtnDisable{
+	font-family:Verdana, Arial, Helvetica, sans-serif;
+	text-decoration:none;
+	font-weight:normal;
+	font-size:10px;
+	background-color:#DBDBDB;
+	border-bottom:2px solid #CCCCCC;
+	border-right:2px solid #CCCCCC;
+	border-top:2px solid #F5F5F5;
+	border-left:2px solid #F5F5F5;
+	color:#666666;
+	text-align:center;
+	padding-top:3px;
+	padding-bottom:3px;
+}
+
+.txtBox{
+	width:85%;
+	border:1px solid #666666;
+	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;*/
+}
+
+.genHeaderGray{
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 14px;
+	line-height: 16px;
+	color: #888888;
+	font-weight:bold;
+}
+
+.genHeaderGrayBig{
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 18px;
+	line-height: 16px;
+	color: #888888;
+	font-weight:bold;
+}
+
+.importBox{
+	width:125px;
+	border:1px solid #666666;
+	font-family:Arial, Helvetica, sans-serif;
+	font-size:11px;
+}
+
+#imLead{
+	width:100%;
+	overflow:auto;
+	position:relative;
+	border:1px solid #666666;
+	height:175px;
+}
+
+.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;
+	z-index:2000;
+}
+
+#locateMap{
+	width:120px;
+	background-color:#CCCCCC;
+	border:1px solid #DDDDDD;
+	padding-top:5px;
+	position:absolute;
+	display:none;
+	z-index:2000;
+}
+
+
+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;
+}
+	
+/* END OF REPORT */
+/* WEB MAIL */
+a.webMnu{
+	font-size:11px;
+	color:#0070BA;
+	text-decoration:underline;
+}
+a.webMnu:Hover{
+	font-size:11px;
+	color:#0070BA;
+	text-decoration:underline;
+}
+
+.mailHdr{
+	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:#FFFFFF;
+	vertical-align:middle;
+	border:0px solid #000000;
+}
+
+.classWebBtn{
+	font-family:Verdana, Arial, Helvetica, sans-serif;
+	text-decoration:none;
+	font-weight:normal;
+	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;
+}
+
+/*  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{
+	border:2px solid #CCCCCC;
+	background-color:#FFFFFF;
+	width:30%;
+	position:relative;
+	visibility:visible;
+	margin:9px;
+	height:250px;
+}
+
+.fontBold{
+	font-size:13px;
+	color:#000000;
+	text-decoration:none;
+	font-weight:bold;
+}
+
+.style_Gray{
+	color:gray;
+}
+	
+/* End of Home Page */
+
+/* All Menu */
+#allMenu{
+	width:500px;
+	border-top:2px solid #CCCCCC;
+	border-left:2px solid #CCCCCC;
+	border-bottom:2px solid #666666;
+	border-right:2px solid #666666;
+	left:300px;
+	top:100px;
+	background-color:#CCCCCC;
+	position:absolute;
+	z-index:1000001;
+	display:none;
+}
+
+
+.allMnuTable{
+	width:100%;
+	border:1px solid #000000;
+	background-color:#FFFFFF;
+}
+
+.allMnuHandle td{
+	height:20px;
+	color:#FFFFFF;
+	font-family:Arial, Helvetica, sans-serif;
+	font-size:12px;
+	font-weight:bold;
+	text-decoration:none;
+	background-color:#000066;
+	cursor:move;
+	padding:2px;
+	border-bottom:2px solid #666666;
+}
+
+.allMnuHdr{
+	font-family:Verdana, Arial, Helvetica, sans-serif;
+	font-weight:normal;
+	font-size:11px;
+	text-decoration:none;
+	display:block;
+	background-color:#FFFFFF;
+	color:#000099;
+	padding-top:5px;
+	padding-bottom:5px;
+}
+a.allMnu{
+	font-family:Verdana, Arial, Helvetica, sans-serif;
+	font-size:10px;
+	text-decoration:none;
+	font-weight:normal;
+	display:block;
+	width:125px;
+	height:15px;
+	padding-left:5px;
+	padding-top:0px;
+	padding-bottom:0px;
+	background-color:#FFFFFF;
+	border:1px solid #FFFFFF;
+	color:#000033;
+	margin-left:20px;
+}
+
+a.allMnu:Hover{
+	font-family:Verdana, Arial, Helvetica, sans-serif;
+	font-size:10px;
+	text-decoration:none;
+	font-weight:normal;
+	display:block;
+	width:125px;
+	height:15px;
+	padding-left:5px;
+	padding-top:0px;
+	padding-bottom:0px;
+	background-color:#ECFFFF;
+	border:1px solid #00CCFF;
+	color:#000033;
+}
+/* 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;
+	z-index:1000;
+}
+
+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;
+}	
+
+.calendarNav{
+	font-size:12px;
+	color:#FFFFFF;
+	white-space:nowrap;
+	text-align:center;
+	font-weight:bold;
+	padding-left:10px;
+	padding-right:10px;
+	background-image:url(images/cal_nav.gif);
+	background-repeat:repeat-x;
+}
+
+#addEventDropDown{
+	position:absolute;
+	display:none;
+	width:110px;
+	border:1px solid #666666;
+	left:0px;
+	top:0px;
+	z-index:5000;
+}
+
+.calAction{
+	width:175px;
+	background-color:#CCCCCC;
+	border:1px solid #DDDDDD;
+	padding-top:5px;
+	position:absolute;
+	display:none;
+	z-index:2000;
+}
+
+.calSettings{
+	position:absolute;
+	z-index:20000;
+	width:500px;
+	left:200px;
+	top:150px;
+	border:2px solid #999999;
+	background-color:#ffffff;
+	padding:5px;
+}
+									
+/* End of Calendar */
+
+/* Cal Year View */
+.month_table{
+	border:2px solid #CCCCCC;
+	width:100%;
+	background-color:white;
+}
+
+.month_table tr th{
+	background-color:#E9E9E9;
+	color:#000000;
+	text-align:center;
+	border:1px dotted #CCCCCC;
+	height:20px;
+	width:14%;
+	font-weight:normal;
+}
+
+.month_table tr td{
+	border:1px dotted #CCCCCC;
+	color:#000000;
+	text-align:center;
+	height:20px;
+}
+
+.cal_Hdr{
+	background-image:url(images/cal_Hdr.gif);
+	background-repeat:repeat-x;
+	background-position:left top;
+	font-weight:bold;
+	color:#000000;
+	text-align:left;
+	border:0px solid #000000;
+}
+
+.eventDay{
+	background-color:#FF9966;
+	font-weight:bold;
+}
+
+.currDay{
+	background-color:#006600;
+	font-weight:bold;
+	text-decoration:underline;
+}
+
+/* End of Cal Year View */
+
+/* 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;
+}
+
+#CurrencyDeleteLay{
+	font-family:Arial, Helvetica, sans-serif;
+	font-size:11px;
+	text-align:left;
+	width:300px;
+	border:3px solid #CCCCCC;
+	background-color:#FFFFFF;
+	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;
+    font-weight: bold;
+    white-space:nowrap;
+}
+.rptTable {
+    border-left: 1px solid #DDDDDD;
+    border-bottom: 1px solid #DDDDDD;
+    border-top: 1px solid #DDDDDD;
+}
+.rptTitle, .rptHead, .rptData, .rptGrpHead{
+    font-family: Verdana, Arial, Helvetica, Sans-serif;
+    font-size: 11px;
+	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;
+}
+.rptGrpHead {
+	background: #FFF;
+    border-bottom: 1px solid #FFF;
+    border-top: 1px solid #DDDDDD;
+    font-weight: normal;
+}
+
+.rptData {
+            background: #FFF;
+            font-weight: normal;
+}
+.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;
+    left:100px;
+    top:100px;
+}
+
+#folderLay{
+    width:175px;
+    background-color:#CCCCCC;
+    border:1px solid #DDDDDD;
+    padding-top:5px;
+    position:absolute;
+    display:none;
+}
+
+/* Css for quick Create */
+
+.qcWindow {
+	    background-color:white;
+            border:2px solid #999999;
+}
+
+.qcHeader{
+	    background:url(images/qcBg.gif) repeat-x;
+	    background-color:gray;
+	    color:black;
+	    font-family: Arial, Helvetica, sans-serif;
+	    font-size: 12px;
+	    line-height: 19px;
+	    padding-left:10px;
+}
+.qcTextBox{
+            border:1px solid #999999;
+	    width:90%;
+}
+.qcTextArea{
+	    border:1px solid #999999;
+	    width:90%;
+	    height:70px;
+	    font-family: Arial, Helvetica, sans-serif;
+	    font-size: 11px;
+}
+.qcTransport{
+	    background-color:#ededed;
+
+}
+
+#role_popup{
+        position:relative;
+        left:0px;
+        top:0px;
+        width:95%;
+        height:300px;
+        overflow:auto;
+        border:1px solid #999999;
+        text-align:left;
+        background-color:#FFFFFF;
+    }
+
+.unread_email {
+	font-weight:bold;
+}
+
+								    
+/* MY SITES */
+
+.SiteSel{
+	font-family:Arial, Helvetica, sans-serif;
+	background-image:url(images/site_sel.jpg);
+	background-position:left bottom;
+	background-repeat:no-repeat;
+	height:33px;
+	width:194px;
+	text-align:center;
+	vertical-align:middle;
+	color:#000000;
+	font-weight:bold;
+	font-size:11px;
+	text-decoration:none;
+}
+
+.SiteUnSel{
+	font-family:Arial, Helvetica, sans-serif;
+	background-image:url(images/site_unsel.jpg);
+	background-position:left bottom;
+	background-repeat:no-repeat;
+	height:33px;
+	width:194px;
+	text-align:center;
+	vertical-align:middle;
+	color:#000000;
+	font-weight:normal;
+	font-size:11px;
+	text-decoration:none;
+	cursor:pointer;
+}
+
+.SiteHdr{
+	font-family:Arial, Helvetica, sans-serif;
+	background-image:url(images/site_hdr.jpg);
+	background-position:right bottom;
+	background-repeat:no-repeat;
+	height:33px;
+	text-align:center;
+	vertical-align:middle;
+	color:#000000;
+	font-weight:normal;
+	font-size:11px;
+	text-decoration:none;
+}
+.unread_email {
+	font-weight:bold;
+}
+
+
+.tagCloud {
+    border:1px solid #737373;
+}
+
+   
+.tagCloudTopBg {
+    background: url(images/tagCloudBg.gif) repeat-x;
+   
+}
+
+.tagCloudDisplay {
+    background-color:#e5e5e5;
+    padding:10px;
+    font-family: Arial, Helvetica, sans-serif;
+    font-size: 11px;
+    line-height: 14px;
+    color: #000000;
+
+}
+.adProgressBar {
+	border-style:solid;
+	border-width:2px;
+	border-color:blue;
+
+}
+
+.h2 {
+
+	font-size:18px;
+	line-height:20px;
+
+}
+
+.gray {
+
+	color:gray;
+}
+
+.hdeskComments {
+
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	line-height: 14px;
+	color: #999999;
+	border:0px;
+	background-color:#ffffef;
+	width:100%;
+
+}
+
+ul {
+	list-style:circle;
+	line-height:20px;
+	padding-left:5px;
+	margin-left:20px;
+	font-weight:normal;
+
+}
+
+	
+.branch {
+	list-style-image: url("secAdd.gif");
+}	
+
+
+
+.tagCloudTopBg {
+	background-image: url(images/topCloudBg.gif);
+	background-repeat: repeat-x;	
+}
+
+.tagCloudDisplay {
+	background-color:#e5e5e5;
+	padding:5px;
+}
+	
+	
+	
+.heading1 {
+	font-family:  Arial, Helvetica, sans-serif;
+	font-size: 19px;
+	line-height: 14px;
+	color: #000000;
+}
+
+.heading2 {
+	font-family:  Arial, Helvetica, sans-serif;
+	font-size: 16px;
+	line-height: 16px;
+	font-weight:bold;
+	color: #000000;
+}
+
+.heading3 {
+	font-family:  Arial, Helvetica, sans-serif;
+	font-size: 14px;
+	line-height: 14px;
+	color: #999999;
+}
+
+.heading4 {
+	font-family:  Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	line-height: 14px;
+	color: #999999;
+}
+
+.settingsUI {
+
+	background-color:#efefef;
+	border:2px solid #777777;
+
+}
+
+
+.settingsTabHeader {
+	font-family:  Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	line-height:25px;
+	font-weight:bold;
+	color:#ffffff;
+	background-image: url(images/settingsMTBg.gif);
+	background-repeat: repeat-x;
+	padding-left:10px;
+	padding-right:10px;
+	
+
+}
+
+.settingsTabList {
+	font-family:  Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	line-height:20px;
+	font-weight:normal;
+	color:#000000;
+	background-color:#e3e3e3;
+	padding-left:30px;
+	border-top:1px solid #eaeaea;
+	border-bottom:1px solid #d3d3d3;
+}
+.settingsTabSelected {
+	font-family:  Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	line-height:20px;
+	font-weight:bold;
+	color:#000000;
+	background-color:#ffffff;
+	padding-left:30px;
+}
+.settingsSelectedUI {
+	padding:10px;
+	background:url(images/settingsSelUIBg.gif) repeat-x;
+	background-color:#ffffff;
+}
+.settingsIconDisplay {
+	font-family:  Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	line-height:14px;
+	padding:10px;
+
+	color:#000000;
+	background-color:#ffffff;
+	padding-left:10px;
+}
+.settingsSelUITopLine{
+	border-bottom:2px dotted #999999;
+
+}
+
+.tableHeading{
+	background-color:#ffffff;
+	border-bottom:2px solid #aaaaaa;
+}
+.colHeader{
+	background-color:#dadada;
+	border-left:1px solid #eaeaea;
+	border-top:1px solid #eaeaea;
+	border-right:1px solid #aaaaaa;
+	border-bottom:1px solid #aaaaaa;
+	font-weight:bold;
+
+}
+.cellLabel {
+	background-color:#eaeaea;
+	border-top:1px solid #efefef;
+	border-bottom:1px solid #dadada;
+	color:#555555;
+
+}
+.cellText {
+	color:#333333;
+	border-bottom:1px solid #dadada;
+}
+
+.listTable{
+	border-left:1px solid #cccccc;
+	border-right:1px solid #cccccc;
+	border-bottom:1px solid #cccccc;
+
+}
+
+.listTableRow{
+	border-bottom:1px solid #eaeaea;
+	border-right	:1px solid #eaeaea;
+	border-bottom:1px solid #eaeaea;
+	border-bottom:1px solid #eaeaea;
+}
+.listRow{
+	border-bottom:2px solid #eaeaea;
+
+}
+
+.listTableTopButtons{
+	background-color:#eeeeee;
+	
+}
+
+.crmButton{
+	
+	border-left:1px solid #ffffff;
+	border-top:1px solid #ffffff;
+	border-right:1px solid #555555;
+	border-bottom:1px solid #555555;
+	padding-left:20px;
+	padding-right:20px;
+}
+
+.create{
+	background-color:#33cc11;
+	color:#333333;
+	font-weight:bold;
+}
+.delete {
+	background-color:#dd9900;
+	color:#ffffff;
+	font-weight:bold;
+}
+.edit {
+	background-color:#a5a5ee;
+	color:#ffffff;
+	font-weight:bold;
+}
+.save{
+	background-color:#33cc11;
+	color:#ffffff;
+	font-weight:bold;
+}
+.cancel {
+	background-color:#dd9900;
+	color:#ffffff;
+	font-weight:bold;
+}
+
+.inactive{
+color:#999999;
+}
+
+.active{
+color:#229922;
+
+}
+textarea {
+	width:95%;
+	height:70px;
+	border:1px solid #dadada;
+}
+.treeTable1{
+	padding:0px;
+}
+
+.prvPrfBigText {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 14px;
+}
+
+.prvPrfTopBg {
+	background-color:#ebebeb;
+}
+
+.prvPrfBottomBg {
+	background-color:#ebebeb;
+}
+
+.prvPrfOutline {
+	border:1px solid #ebebeb;
+}
+
+.prvPrfSelectedTab {
+	background:url(images/prvPrfSelectedTab.gif) repeat-x;
+
+}
+
+.prvPrfUnSelectedTab {
+	background:url(images/prvPrfUnSelectedTab.gif) repeat-x;
+
+}
+
+.prvPrfTexture {
+	background:url(images/prvPrfTexture1.gif);
+
+}
+.prvPrfBgOn{
+	background-color:#33ee33;
+}
+.prvPrfBgOff{
+	background-color:#cccccc;
+}
+
+.prvPrfHoverOn {
+	background-color:#ffffef;
+	
+}
+.prvPrfHoverOut {
+	background-color:#ffffff;
+}
+
+.prvPrfBgImgGlobal {
+	background:url(images/prvPrfBgImgGlobal.jpg) top right no-repeat;
+}
+.prvPrfBgImgTab {
+	background:url(images/prvPrfBgImgTab.jpg) top right no-repeat;
+}
+.prvPrfBgImgStandard {
+	background:url(images/prvPrfBgImgStandard.jpg) top right no-repeat;
+}
+.prvPrfBgImgUtils {
+	background:url(images/prvPrfBgImgUtils.jpg) top right no-repeat;
+}
+.prvPrfBgImgField {
+	background:url(images/prvPrfBgImgField.jpg) top right no-repeat;
+}
+
+.prvPrfTabSample {
+	border-top:1px solid #ababab;
+	border-left:1px solid #ababab;
+	border-right:1px solid #a1a1a1;
+}
+
+.cellBottomDotLine {
+	border-bottom-width: 2px;
+	border-bottom-style: dotted;
+	border-bottom-color: #CCCCCC;
+	background-color:#ededed;
+}
+.crmFormList{
+	border:1px solid #cccccc;
+	width:90%;
+	height:120px;
+
+}
+.cellBottomDotLinePlain {
+	border-bottom-width: 2px;
+	border-bottom-style: dotted;
+	border-bottom-color: #CCCCCC;
+	
+}
+.crmFormDropDown {
+border-width:1px;
+}
+.thickBorder {
+	border: 2px solid #999999;
+}
+.trackerBorder {
+	border-width:2px;
+	border-style:solid;
+	border-color:#999999;
+	background-color:#ffffff;
+}
+.trackerHeading {
+	border-bottom:1px solid #cccccc;
+	background-color:#efefef;
+}
+.trackerListBullet {
+	border-right:1px dotted #cccccc;
+	background-color:#f9f9f9;
+}
+.trackerList {
+	border-bottom:1px solid #eeeeee;
+}
+




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 29 12:41:25 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 29 Jun 2006 16:41:25 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7682 -
	/vtigercrm/trunk/data/CRMEntity.php
Message-ID: <20060629164125.4BBFF83FE25@vtiger.fosslabs.com>

Author: richie
Date: Thu Jun 29 10:41:16 2006
New Revision: 7682

Log:
Support for last view done

Modified:
    vtigercrm/trunk/data/CRMEntity.php

Modified: vtigercrm/trunk/data/CRMEntity.php
==============================================================================
--- vtigercrm/trunk/data/CRMEntity.php (original)
+++ vtigercrm/trunk/data/CRMEntity.php Thu Jun 29 10:41:16 2006
@@ -1521,5 +1521,20 @@
 		return $this->process_full_list_query($query);
 	}
 
+	/**
+	 * Track the viewing of a detail record.  This leverages get_summary_text() which is object specific
+	 * params $user_id - The user that is viewing the record.
+	 * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc..
+	 * All Rights Reserved..
+	 * Contributor(s): ______________________________________..
+	 */
+	function track_view($user_id, $current_module,$id='')
+	{
+		$this->log->debug("About to call vtiger_tracker (user_id, module_name, item_id)($user_id, $current_module, $this->id)");
+
+		$tracker = new Tracker();
+		$tracker->track_view($user_id, $current_module, $id, '');
+	}
+
 }
 ?>




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 29 12:48:12 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 29 Jun 2006 16:48:12 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7684 - in
 /vtigercrm/trunk/themes/blue/images: btnL3Tracker-Faded.gif
 btnL3Tracker.gif
Message-ID: <20060629164812.7E2D083FE81@vtiger.fosslabs.com>

Author: richie
Date: Thu Jun 29 10:47:52 2006
New Revision: 7684

Log:
Support for last view done

Added:
    vtigercrm/trunk/themes/blue/images/btnL3Tracker-Faded.gif   (with props)
    vtigercrm/trunk/themes/blue/images/btnL3Tracker.gif   (with props)




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 29 12:42:31 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 29 Jun 2006 16:42:31 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7683 -
	/vtigercrm/trunk/themes/blue/header.php
Message-ID: <20060629164231.5537683FE53@vtiger.fosslabs.com>

Author: richie
Date: Thu Jun 29 10:42:23 2006
New Revision: 7683

Log:
Support for last view done

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 Thu Jun 29 10:42:23 2006
@@ -100,5 +100,11 @@
 	$smarty->assign("QUERY_STRING","$app_strings[LBL_SEARCH_STRING]");
 
 global $module_menu;
+
+
+require_once('data/Tracker.php');
+$tracFocus=new Tracker();
+$list = $tracFocus->get_recently_viewed($current_user->id);
+$smarty->assign("TRACINFO",$list);
 $smarty->display("Header.tpl");
 ?>




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 29 13:27:55 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 29 Jun 2006 17:27:55 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7685 -
	/vtigercrm/trunk/adodb/adodb-datadict.inc.php
Message-ID: <20060629172755.815A183FE8D@vtiger.fosslabs.com>

Author: richie
Date: Thu Jun 29 11:27:41 2006
New Revision: 7685

Log:
fixed the innodb and foreign key issue by srini

Modified:
    vtigercrm/trunk/adodb/adodb-datadict.inc.php

Modified: vtigercrm/trunk/adodb/adodb-datadict.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/adodb-datadict.inc.php (original)
+++ vtigercrm/trunk/adodb/adodb-datadict.inc.php Thu Jun 29 11:27:41 2006
@@ -1,784 +1,812 @@
-<?php
-
-/**
-  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence.
-	
-  Set tabs to 4 for best viewing.
- 
- 	DOCUMENTATION:
-	
-		See adodb/tests/test-datadict.php for docs and examples.
-*/
-
-/*
-	Test script for parser
-*/
-
-// security - hide paths
-if (!defined('ADODB_DIR')) die();
-
-function Lens_ParseTest()
-{
-$str = "`zcol ACOL` NUMBER(32,2) DEFAULT 'The \"cow\" (and Jim''s dog) jumps over the moon' PRIMARY, INTI INT AUTO DEFAULT 0, zcol2\"afs ds";
-print "<p>$str</p>";
-$a= Lens_ParseArgs($str);
-print "<pre>";
-print_r($a);
-print "</pre>";
-}
-
-
-if (!function_exists('ctype_alnum')) {
-	function ctype_alnum($text) {
-		return preg_match('/^[a-z0-9]*$/i', $text);
-	}
-}
-
-//Lens_ParseTest();
-
-/**
-	Parse arguments, treat "text" (text) and 'text' as quotation marks.
-	To escape, use "" or '' or ))
-	
-	Will read in "abc def" sans quotes, as: abc def
-	Same with 'abc def'.
-	However if `abc def`, then will read in as `abc def`
-	
-	@param endstmtchar    Character that indicates end of statement
-	@param tokenchars     Include the following characters in tokens apart from A-Z and 0-9 
-	@returns 2 dimensional array containing parsed tokens.
-*/
-function Lens_ParseArgs($args,$endstmtchar=',',$tokenchars='_.-')
-{
-	$pos = 0;
-	$intoken = false;
-	$stmtno = 0;
-	$endquote = false;
-	$tokens = array();
-	$tokens[$stmtno] = array();
-	$max = strlen($args);
-	$quoted = false;
-	$tokarr = array();
-	
-	while ($pos < $max) {
-		$ch = substr($args,$pos,1);
-		switch($ch) {
-		case ' ':
-		case "\t":
-		case "\n":
-		case "\r":
-			if (!$quoted) {
-				if ($intoken) {
-					$intoken = false;
-					$tokens[$stmtno][] = implode('',$tokarr);
-				}
-				break;
-			}
-			
-			$tokarr[] = $ch;
-			break;
-		
-		case '`':
-			if ($intoken) $tokarr[] = $ch;
-		case '(':
-		case ')':	
-		case '"':
-		case "'":
-			
-			if ($intoken) {
-				if (empty($endquote)) {
-					$tokens[$stmtno][] = implode('',$tokarr);
-					if ($ch == '(') $endquote = ')';
-					else $endquote = $ch;
-					$quoted = true;
-					$intoken = true;
-					$tokarr = array();
-				} else if ($endquote == $ch) {
-					$ch2 = substr($args,$pos+1,1);
-					if ($ch2 == $endquote) {
-						$pos += 1;
-						$tokarr[] = $ch2;
-					} else {
-						$quoted = false;
-						$intoken = false;
-						$tokens[$stmtno][] = implode('',$tokarr);
-						$endquote = '';
-					}
-				} else
-					$tokarr[] = $ch;
-					
-			}else {
-			
-				if ($ch == '(') $endquote = ')';
-				else $endquote = $ch;
-				$quoted = true;
-				$intoken = true;
-				$tokarr = array();
-				if ($ch == '`') $tokarr[] = '`';
-			}
-			break;
-			
-		default:
-			
-			if (!$intoken) {
-				if ($ch == $endstmtchar) {
-					$stmtno += 1;
-					$tokens[$stmtno] = array();
-					break;
-				}
-			
-				$intoken = true;
-				$quoted = false;
-				$endquote = false;
-				$tokarr = array();
-	
-			}
-			
-			if ($quoted) $tokarr[] = $ch;
-			else if (ctype_alnum($ch) || strpos($tokenchars,$ch) !== false) $tokarr[] = $ch;
-			else {
-				if ($ch == $endstmtchar) {			
-					$tokens[$stmtno][] = implode('',$tokarr);
-					$stmtno += 1;
-					$tokens[$stmtno] = array();
-					$intoken = false;
-					$tokarr = array();
-					break;
-				}
-				$tokens[$stmtno][] = implode('',$tokarr);
-				$tokens[$stmtno][] = $ch;
-				$intoken = false;
-			}
-		}
-		$pos += 1;
-	}
-	if ($intoken) $tokens[$stmtno][] = implode('',$tokarr);
-	
-	return $tokens;
-}
-
-
-class ADODB_DataDict {
-	var $connection;
-	var $debug = false;
-	var $dropTable = 'DROP TABLE %s';
-	var $renameTable = 'RENAME TABLE %s TO %s'; 
-	var $dropIndex = 'DROP INDEX %s';
-	var $addCol = ' ADD';
-	var $alterCol = ' ALTER COLUMN';
-	var $dropCol = ' DROP COLUMN';
-	var $renameColumn = 'ALTER TABLE %s RENAME COLUMN %s TO %s';	// table, old-column, new-column, column-definitions (not used by default)
-	var $nameRegex = '\w';
-	var $nameRegexBrackets = 'a-zA-Z0-9_\(\)';
-	var $schema = false;
-	var $serverInfo = array();
-	var $autoIncrement = false;
-	var $dataProvider;
-	var $invalidResizeTypes4 = array('CLOB','BLOB','TEXT','DATE','TIME'); // for changetablesql
-	var $blobSize = 100; 	/// any varchar/char field this size or greater is treated as a blob
-							/// in other words, we use a text area for editting.
-	
-	function GetCommentSQL($table,$col)
-	{
-		return false;
-	}
-	
-	function SetCommentSQL($table,$col,$cmt)
-	{
-		return false;
-	}
-	
-	function MetaTables()
-	{
-		if (!$this->connection->IsConnected()) return array();
-		return $this->connection->MetaTables();
-	}
-	
-	function MetaColumns($tab, $upper=true, $schema=false)
-	{
-		if (!$this->connection->IsConnected()) return array();
-		return $this->connection->MetaColumns($this->TableName($tab), $upper, $schema);
-	}
-	
-	function MetaPrimaryKeys($tab,$owner=false,$intkey=false)
-	{
-		if (!$this->connection->IsConnected()) return array();
-		return $this->connection->MetaPrimaryKeys($this->TableName($tab), $owner, $intkey);
-	}
-	
-	function MetaIndexes($table, $primary = false, $owner = false)
-	{
-		if (!$this->connection->IsConnected()) return array();
-		return $this->connection->MetaIndexes($this->TableName($table), $primary, $owner);
-	}
-	
-	function MetaType($t,$len=-1,$fieldobj=false)
-	{
-		return ADORecordSet::MetaType($t,$len,$fieldobj);
-	}
-	
-	function NameQuote($name = NULL,$allowBrackets=false)
-	{
-		if (!is_string($name)) {
-			return FALSE;
-		}
-		
-		$name = trim($name);
-		
-		if ( !is_object($this->connection) ) {
-			return $name;
-		}
-		
-		$quote = $this->connection->nameQuote;
-		
-		// if name is of the form `name`, quote it
-		if ( preg_match('/^`(.+)`$/', $name, $matches) ) {
-			return $quote . $matches[1] . $quote;
-		}
-		
-		// if name contains special characters, quote it
-		$regex = ($allowBrackets) ? $this->nameRegexBrackets : $this->nameRegex;
-		
-		if ( !preg_match('/^[' . $regex . ']+$/', $name) ) {
-			return $quote . $name . $quote;
-		}
-		
-		return $name;
-	}
-	
-	function TableName($name)
-	{
-		if ( $this->schema ) {
-			return $this->NameQuote($this->schema) .'.'. $this->NameQuote($name);
-		}
-		return $this->NameQuote($name);
-	}
-	
-	// Executes the sql array returned by GetTableSQL and GetIndexSQL
-	function ExecuteSQLArray($sql, $continueOnError = true)
-	{
-		$rez = 2;
-		$conn = &$this->connection;
-		$saved = $conn->debug;
-		foreach($sql as $line) {
-			
-			if ($this->debug) $conn->debug = true;
-			$ok = $conn->Execute($line);
-			$conn->debug = $saved;
-			if (!$ok) {
-				if ($this->debug) ADOConnection::outp($conn->ErrorMsg());
-				if (!$continueOnError) return 0;
-				$rez = 1;
-			}
-		}
-		return $rez;
-	}
-	
-	/*
-	 	Returns the actual type given a character code.
-		
-		C:  varchar
-		X:  CLOB (character large object) or largest varchar size if CLOB is not supported
-		C2: Multibyte varchar
-		X2: Multibyte CLOB
-		
-		B:  BLOB (binary large object)
-		
-		D:  Date
-		T:  Date-time 
-		L:  Integer field suitable for storing booleans (0 or 1)
-		I:  Integer
-		F:  Floating point number
-		N:  Numeric or decimal number
-	*/
-	
-	function ActualType($meta)
-	{
-		return $meta;
-	}
-	
-	function CreateDatabase($dbname,$options=false)
-	{
-		$options = $this->_Options($options);
-		$sql = array();
-		
-		$s = 'CREATE DATABASE ' . $this->NameQuote($dbname);
-		if (isset($options[$this->upperName]))
-			$s .= ' '.$options[$this->upperName];
-		
-		$sql[] = $s;
-		return $sql;
-	}
-	
-	/*
-	 Generates the SQL to create index. Returns an array of sql strings.
-	*/
-	function CreateIndexSQL($idxname, $tabname, $flds, $idxoptions = false)
-	{
-		if (!is_array($flds)) {
-			$flds = explode(',',$flds);
-		}
-		
-		foreach($flds as $key => $fld) {
-			# some indexes can use partial fields, eg. index first 32 chars of "name" with NAME(32)
-			$flds[$key] = $this->NameQuote($fld,$allowBrackets=true);
-		}
-		
-		return $this->_IndexSQL($this->NameQuote($idxname), $this->TableName($tabname), $flds, $this->_Options($idxoptions));
-	}
-	
-	function DropIndexSQL ($idxname, $tabname = NULL)
-	{
-		return array(sprintf($this->dropIndex, $this->NameQuote($idxname), $this->TableName($tabname)));
-	}
-	
-	function SetSchema($schema)
-	{
-		$this->schema = $schema;
-	}
-	
-	function AddColumnSQL($tabname, $flds)
-	{
-		$tabname = $this->TableName ($tabname);
-		$sql = array();
-		list($lines,$pkey) = $this->_GenFields($flds);
-		$alter = 'ALTER TABLE ' . $tabname . $this->addCol . ' ';
-		foreach($lines as $v) {
-			$sql[] = $alter . $v;
-		}
-		return $sql;
-	}
-	
-	/**
-	 * Change the definition of one column
-	 *
-	 * As some DBM's can't do that on there own, you need to supply the complete defintion of the new table,
-	 * to allow, recreating the table and copying the content over to the new table
-	 * @param string $tabname table-name
-	 * @param string $flds column-name and type for the changed column
-	 * @param string $tableflds='' complete defintion of the new table, eg. for postgres, default ''
-	 * @param array/string $tableoptions='' options for the new table see CreateTableSQL, default ''
-	 * @return array with SQL strings
-	 */
-	function AlterColumnSQL($tabname, $flds, $tableflds='',$tableoptions='')
-	{
-		$tabname = $this->TableName ($tabname);
-		$sql = array();
-		list($lines,$pkey) = $this->_GenFields($flds);
-		$alter = 'ALTER TABLE ' . $tabname . $this->alterCol . ' ';
-		foreach($lines as $v) {
-			$sql[] = $alter . $v;
-		}
-		return $sql;
-	}
-	
-	/**
-	 * Rename one column
-	 *
-	 * Some DBM's can only do this together with changeing the type of the column (even if that stays the same, eg. mysql)
-	 * @param string $tabname table-name
-	 * @param string $oldcolumn column-name to be renamed
-	 * @param string $newcolumn new column-name
-	 * @param string $flds='' complete column-defintion-string like for AddColumnSQL, only used by mysql atm., default=''
-	 * @return array with SQL strings
-	 */
-	function RenameColumnSQL($tabname,$oldcolumn,$newcolumn,$flds='')
-	{
-		$tabname = $this->TableName ($tabname);
-		if ($flds) {
-			list($lines,$pkey) = $this->_GenFields($flds);
-			list(,$first) = each($lines);
-			list(,$column_def) = split("[\t ]+",$first,2);
-		}
-		return array(sprintf($this->renameColumn,$tabname,$this->NameQuote($oldcolumn),$this->NameQuote($newcolumn),$column_def));
-	}
-		
-	/**
-	 * Drop one column
-	 *
-	 * Some DBM's can't do that on there own, you need to supply the complete defintion of the new table,
-	 * to allow, recreating the table and copying the content over to the new table
-	 * @param string $tabname table-name
-	 * @param string $flds column-name and type for the changed column
-	 * @param string $tableflds='' complete defintion of the new table, eg. for postgres, default ''
-	 * @param array/string $tableoptions='' options for the new table see CreateTableSQL, default ''
-	 * @return array with SQL strings
-	 */
-	function DropColumnSQL($tabname, $flds, $tableflds='',$tableoptions='')
-	{
-		$tabname = $this->TableName ($tabname);
-		if (!is_array($flds)) $flds = explode(',',$flds);
-		$sql = array();
-		$alter = 'ALTER TABLE ' . $tabname . $this->dropCol . ' ';
-		foreach($flds as $v) {
-			$sql[] = $alter . $this->NameQuote($v);
-		}
-		return $sql;
-	}
-	
-	function DropTableSQL($tabname)
-	{
-		return array (sprintf($this->dropTable, $this->TableName($tabname)));
-	}
-	
-	function RenameTableSQL($tabname,$newname)
-	{
-		return array (sprintf($this->renameTable, $this->TableName($tabname),$this->TableName($newname)));
-	}	
-	
-	/*
-	 Generate the SQL to create table. Returns an array of sql strings.
-	*/
-	function CreateTableSQL($tabname, $flds, $tableoptions=false)
-	{
-		if (!$tableoptions) $tableoptions = array();
-		
-		list($lines,$pkey) = $this->_GenFields($flds, true);
-		
-		$taboptions = $this->_Options($tableoptions);
-		$tabname = $this->TableName ($tabname);
-		$sql = $this->_TableSQL($tabname,$lines,$pkey,$taboptions);
-		
-		$tsql = $this->_Triggers($tabname,$taboptions);
-		foreach($tsql as $s) $sql[] = $s;
-		
-		return $sql;
-	}
-	
-	function _GenFields($flds,$widespacing=false)
-	{
-		if (is_string($flds)) {
-			$padding = '     ';
-			$txt = $flds.$padding;
-			$flds = array();
-			$flds0 = Lens_ParseArgs($txt,',');
-			$hasparam = false;
-			foreach($flds0 as $f0) {
-				$f1 = array();
-				foreach($f0 as $token) {
-					switch (strtoupper($token)) {
-					case 'CONSTRAINT':
-					case 'DEFAULT': 
-						$hasparam = $token;
-						break;
-					default:
-						if ($hasparam) $f1[$hasparam] = $token;
-						else $f1[] = $token;
-						$hasparam = false;
-						break;
-					}
-				}
-				$flds[] = $f1;
-				
-			}
-		}
-		$this->autoIncrement = false;
-		$lines = array();
-		$pkey = array();
-		foreach($flds as $fld) {
-			$fld = _array_change_key_case($fld);
-		
-			$fname = false;
-			$fdefault = false;
-			$fautoinc = false;
-			$ftype = false;
-			$fsize = false;
-			$fprec = false;
-			$fprimary = false;
-			$fnoquote = false;
-			$fdefts = false;
-			$fdefdate = false;
-			$fconstraint = false;
-			$fnotnull = false;
-			$funsigned = false;
-			
-			//-----------------
-			// Parse attributes
-			foreach($fld as $attr => $v) {
-				if ($attr == 2 && is_numeric($v)) $attr = 'SIZE';
-				else if (is_numeric($attr) && $attr > 1 && !is_numeric($v)) $attr = strtoupper($v);
-				
-				switch($attr) {
-				case '0':
-				case 'NAME': 	$fname = $v; break;
-				case '1':
-				case 'TYPE': 	$ty = $v; $ftype = $this->ActualType(strtoupper($v)); break;
-				
-				case 'SIZE': 	
-								$dotat = strpos($v,'.'); if ($dotat === false) $dotat = strpos($v,',');
-								if ($dotat === false) $fsize = $v;
-								else {
-									$fsize = substr($v,0,$dotat);
-									$fprec = substr($v,$dotat+1);
-								}
-								break;
-				case 'UNSIGNED': $funsigned = true; break;
-				case 'AUTOINCREMENT':
-				case 'AUTO':	$fautoinc = true; $fnotnull = true; break;
-				case 'KEY':
-				case 'PRIMARY':	$fprimary = $v; $fnotnull = true; break;
-				case 'DEF':
-				case 'DEFAULT': $fdefault = $v; break;
-				case 'NOTNULL': $fnotnull = $v; break;
-				case 'NOQUOTE': $fnoquote = $v; break;
-				case 'DEFDATE': $fdefdate = $v; break;
-				case 'DEFTIMESTAMP': $fdefts = $v; break;
-				case 'CONSTRAINT': $fconstraint = $v; break;
-				} //switch
-			} // foreach $fld
-			
-			//--------------------
-			// VALIDATE FIELD INFO
-			if (!strlen($fname)) {
-				if ($this->debug) ADOConnection::outp("Undefined NAME");
-				return false;
-			}
-			
-			$fid = strtoupper(preg_replace('/^`(.+)`$/', '$1', $fname));
-			$fname = $this->NameQuote($fname);
-			
-			if (!strlen($ftype)) {
-				if ($this->debug) ADOConnection::outp("Undefined TYPE for field '$fname'");
-				return false;
-			} else {
-				$ftype = strtoupper($ftype);
-			}
-			
-			$ftype = $this->_GetSize($ftype, $ty, $fsize, $fprec);
-			
-			if ($ty == 'X' || $ty == 'X2' || $ty == 'B') $fnotnull = false; // some blob types do not accept nulls
-			
-			if ($fprimary) $pkey[] = $fname;
-			
-			// some databases do not allow blobs to have defaults
-			if ($ty == 'X') $fdefault = false;
-			
-			//--------------------
-			// CONSTRUCT FIELD SQL
-			if ($fdefts) {
-				if (substr($this->connection->databaseType,0,5) == 'mysql') {
-					$ftype = 'TIMESTAMP';
-				} else {
-					$fdefault = $this->connection->sysTimeStamp;
-				}
-			} else if ($fdefdate) {
-				if (substr($this->connection->databaseType,0,5) == 'mysql') {
-					$ftype = 'TIMESTAMP';
-				} else {
-					$fdefault = $this->connection->sysDate;
-				}
-			} else if ($fdefault !== false && !$fnoquote)
-				if ($ty == 'C' or $ty == 'X' or 
-					( substr($fdefault,0,1) != "'" && !is_numeric($fdefault)))
-					if (strlen($fdefault) != 1 && substr($fdefault,0,1) == ' ' && substr($fdefault,strlen($fdefault)-1) == ' ') 
-						$fdefault = trim($fdefault);
-					else if (strtolower($fdefault) != 'null')
-						$fdefault = $this->connection->qstr($fdefault);
-			$suffix = $this->_CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned);
-			
-			if ($widespacing) $fname = str_pad($fname,24);
-			$lines[$fid] = $fname.' '.$ftype.$suffix;
-			
-			if ($fautoinc) $this->autoIncrement = true;
-		} // foreach $flds
-		
-		return array($lines,$pkey);
-	}
-	/*
-		 GENERATE THE SIZE PART OF THE DATATYPE
-			$ftype is the actual type
-			$ty is the type defined originally in the DDL
-	*/
-	function _GetSize($ftype, $ty, $fsize, $fprec)
-	{
-		if (strlen($fsize) && $ty != 'X' && $ty != 'B' && strpos($ftype,'(') === false) {
-			$ftype .= "(".$fsize;
-			if (strlen($fprec)) $ftype .= ",".$fprec;
-			$ftype .= ')';
-		}
-		return $ftype;
-	}
-	
-	
-	// return string must begin with space
-	function _CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint)
-	{	
-		$suffix = '';
-		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
-		if ($fnotnull) $suffix .= ' NOT NULL';
-		if ($fconstraint) $suffix .= ' '.$fconstraint;
-		return $suffix;
-	}
-	
-	function _IndexSQL($idxname, $tabname, $flds, $idxoptions)
-	{
-		$sql = array();
-		
-		if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) {
-			$sql[] = sprintf ($this->dropIndex, $idxname);
-			if ( isset($idxoptions['DROP']) )
-				return $sql;
-		}
-		
-		if ( empty ($flds) ) {
-			return $sql;
-		}
-		
-		$unique = isset($idxoptions['UNIQUE']) ? ' UNIQUE' : '';
-	
-		$s = 'CREATE' . $unique . ' INDEX ' . $idxname . ' ON ' . $tabname . ' ';
-		
-		if ( isset($idxoptions[$this->upperName]) )
-			$s .= $idxoptions[$this->upperName];
-		
-		if ( is_array($flds) )
-			$flds = implode(', ',$flds);
-		$s .= '(' . $flds . ')';
-		$sql[] = $s;
-		
-		return $sql;
-	}
-	
-	function _DropAutoIncrement($tabname)
-	{
-		return false;
-	}
-	
-	function _TableSQL($tabname,$lines,$pkey,$tableoptions)
-	{
-		$sql = array();
-		
-		if (isset($tableoptions['REPLACE']) || isset ($tableoptions['DROP'])) {
-			$sql[] = sprintf($this->dropTable,$tabname);
-			if ($this->autoIncrement) {
-				$sInc = $this->_DropAutoIncrement($tabname);
-				if ($sInc) $sql[] = $sInc;
-			}
-			if ( isset ($tableoptions['DROP']) ) {
-				return $sql;
-			}
-		}
-		$s = "CREATE TABLE $tabname (\n";
-		$s .= implode(",\n", $lines);
-		if (sizeof($pkey)>0) {
-			$s .= ",\n                 PRIMARY KEY (";
-			$s .= implode(", ",$pkey).")";
-		}
-		if (isset($tableoptions['CONSTRAINTS'])) 
-			$s .= "\n".$tableoptions['CONSTRAINTS'];
-		
-		if (isset($tableoptions[$this->upperName.'_CONSTRAINTS'])) 
-			$s .= "\n".$tableoptions[$this->upperName.'_CONSTRAINTS'];
-		
-		$s .= "\n)";
-		if (isset($tableoptions[$this->upperName])) $s .= $tableoptions[$this->upperName];
-		$sql[] = $s;
-		
-		return $sql;
-	}
-	
-	/*
-		GENERATE TRIGGERS IF NEEDED
-		used when table has auto-incrementing field that is emulated using triggers
-	*/
-	function _Triggers($tabname,$taboptions)
-	{
-		return array();
-	}
-	
-	/*
-		Sanitize options, so that array elements with no keys are promoted to keys
-	*/
-	function _Options($opts)
-	{
-		if (!is_array($opts)) return array();
-		$newopts = array();
-		foreach($opts as $k => $v) {
-			if (is_numeric($k)) $newopts[strtoupper($v)] = $v;
-			else $newopts[strtoupper($k)] = $v;
-		}
-		return $newopts;
-	}
-	
-	/*
-	"Florian Buzin [ easywe ]" <florian.buzin#easywe.de>
-	
-	This function changes/adds new fields to your table. You don't
-	have to know if the col is new or not. It will check on its own.
-	*/
-	function ChangeTableSQL($tablename, $flds, $tableoptions = false)
-	{
-	global $ADODB_FETCH_MODE;
-	
-		$save = $ADODB_FETCH_MODE;
-		$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
-		if ($this->connection->fetchMode !== false) $savem = $this->connection->SetFetchMode(false);
-		
-		// check table exists
-		$save_handler = $this->connection->raiseErrorFn;
-		$this->connection->raiseErrorFn = '';
-		$cols = $this->MetaColumns($tablename);
-		$this->connection->raiseErrorFn = $save_handler;
-		
-		if (isset($savem)) $this->connection->SetFetchMode($savem);
-		$ADODB_FETCH_MODE = $save;
-		
-		if ( empty($cols)) { 
-			return $this->CreateTableSQL($tablename, $flds, $tableoptions);
-		}
-		
-		if (is_array($flds)) {
-		// Cycle through the update fields, comparing
-		// existing fields to fields to update.
-		// if the Metatype and size is exactly the
-		// same, ignore - by Mark Newham
-			$holdflds = array();
-			foreach($flds as $k=>$v) {
-				if ( isset($cols[$k]) && is_object($cols[$k]) ) {
-					// If already not allowing nulls, then don't change
-					$obj = $cols[$k];
-					if (isset($obj->not_null) && $obj->not_null)
-						$v = str_replace('NOT NULL','',$v);
-
-					$c = $cols[$k];
-					$ml = $c->max_length;
-					$mt = $this->MetaType($c->type,$ml);
-					if ($ml == -1) $ml = '';
-					if ($mt == 'X') $ml = $v['SIZE'];
-					if (($mt != $v['TYPE']) ||  $ml != $v['SIZE']) {
-						$holdflds[$k] = $v;
-					}
-				} else {
-					$holdflds[$k] = $v;
-				}		
-			}
-			$flds = $holdflds;
-		}
-	
-
-		// already exists, alter table instead
-		list($lines,$pkey) = $this->_GenFields($flds);
-		$alter = 'ALTER TABLE ' . $this->TableName($tablename);
-		$sql = array();
-
-		foreach ( $lines as $id => $v ) {
-			if ( isset($cols[$id]) && is_object($cols[$id]) ) {
-			
-				$flds = Lens_ParseArgs($v,',');
-				
-				//  We are trying to change the size of the field, if not allowed, simply ignore the request.
-				if ($flds && in_array(strtoupper(substr($flds[0][1],0,4)),$this->invalidResizeTypes4)) continue;	 
-	 		
-				$sql[] = $alter . $this->alterCol . ' ' . $v;
-			} else {
-				$sql[] = $alter . $this->addCol . ' ' . $v;
-			}
-		}
-		
-		return $sql;
-	}
-} // class
-?>
+<?php
+
+/**
+  V4.90 8 June 2006  (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved.
+  Released under both BSD license and Lesser GPL library license. 
+  Whenever there is any discrepancy between the two licenses, 
+  the BSD license will take precedence.
+	
+  Set tabs to 4 for best viewing.
+ 
+ 	DOCUMENTATION:
+	
+		See adodb/tests/test-datadict.php for docs and examples.
+*/
+
+/*
+	Test script for parser
+*/
+
+// security - hide paths
+if (!defined('ADODB_DIR')) die();
+
+function Lens_ParseTest()
+{
+$str = "`zcol ACOL` NUMBER(32,2) DEFAULT 'The \"cow\" (and Jim''s dog) jumps over the moon' PRIMARY, INTI INT AUTO DEFAULT 0, zcol2\"afs ds";
+print "<p>$str</p>";
+$a= Lens_ParseArgs($str);
+print "<pre>";
+print_r($a);
+print "</pre>";
+}
+
+
+if (!function_exists('ctype_alnum')) {
+	function ctype_alnum($text) {
+		return preg_match('/^[a-z0-9]*$/i', $text);
+	}
+}
+
+//Lens_ParseTest();
+
+/**
+	Parse arguments, treat "text" (text) and 'text' as quotation marks.
+	To escape, use "" or '' or ))
+	
+	Will read in "abc def" sans quotes, as: abc def
+	Same with 'abc def'.
+	However if `abc def`, then will read in as `abc def`
+	
+	@param endstmtchar    Character that indicates end of statement
+	@param tokenchars     Include the following characters in tokens apart from A-Z and 0-9 
+	@returns 2 dimensional array containing parsed tokens.
+*/
+function Lens_ParseArgs($args,$endstmtchar=',',$tokenchars='_.-')
+{
+	$pos = 0;
+	$intoken = false;
+	$stmtno = 0;
+	$endquote = false;
+	$tokens = array();
+	$tokens[$stmtno] = array();
+	$max = strlen($args);
+	$quoted = false;
+	$tokarr = array();
+	
+	while ($pos < $max) {
+		$ch = substr($args,$pos,1);
+		switch($ch) {
+		case ' ':
+		case "\t":
+		case "\n":
+		case "\r":
+			if (!$quoted) {
+				if ($intoken) {
+					$intoken = false;
+					$tokens[$stmtno][] = implode('',$tokarr);
+				}
+				break;
+			}
+			
+			$tokarr[] = $ch;
+			break;
+		
+		case '`':
+			if ($intoken) $tokarr[] = $ch;
+		case '(':
+		case ')':	
+		case '"':
+		case "'":
+			
+			if ($intoken) {
+				if (empty($endquote)) {
+					$tokens[$stmtno][] = implode('',$tokarr);
+					if ($ch == '(') $endquote = ')';
+					else $endquote = $ch;
+					$quoted = true;
+					$intoken = true;
+					$tokarr = array();
+				} else if ($endquote == $ch) {
+					$ch2 = substr($args,$pos+1,1);
+					if ($ch2 == $endquote) {
+						$pos += 1;
+						$tokarr[] = $ch2;
+					} else {
+						$quoted = false;
+						$intoken = false;
+						$tokens[$stmtno][] = implode('',$tokarr);
+						$endquote = '';
+					}
+				} else
+					$tokarr[] = $ch;
+					
+			}else {
+			
+				if ($ch == '(') $endquote = ')';
+				else $endquote = $ch;
+				$quoted = true;
+				$intoken = true;
+				$tokarr = array();
+				if ($ch == '`') $tokarr[] = '`';
+			}
+			break;
+			
+		default:
+			
+			if (!$intoken) {
+				if ($ch == $endstmtchar) {
+					$stmtno += 1;
+					$tokens[$stmtno] = array();
+					break;
+				}
+			
+				$intoken = true;
+				$quoted = false;
+				$endquote = false;
+				$tokarr = array();
+	
+			}
+			
+			if ($quoted) $tokarr[] = $ch;
+			else if (ctype_alnum($ch) || strpos($tokenchars,$ch) !== false) $tokarr[] = $ch;
+			else {
+				if ($ch == $endstmtchar) {			
+					$tokens[$stmtno][] = implode('',$tokarr);
+					$stmtno += 1;
+					$tokens[$stmtno] = array();
+					$intoken = false;
+					$tokarr = array();
+					break;
+				}
+				$tokens[$stmtno][] = implode('',$tokarr);
+				$tokens[$stmtno][] = $ch;
+				$intoken = false;
+			}
+		}
+		$pos += 1;
+	}
+	if ($intoken) $tokens[$stmtno][] = implode('',$tokarr);
+	
+	return $tokens;
+}
+
+
+class ADODB_DataDict {
+	var $connection;
+	var $debug = false;
+	var $dropTable = 'DROP TABLE %s';
+	var $renameTable = 'RENAME TABLE %s TO %s'; 
+	var $dropIndex = 'DROP INDEX %s';
+	var $addCol = ' ADD';
+	var $alterCol = ' ALTER COLUMN';
+	var $dropCol = ' DROP COLUMN';
+	var $renameColumn = 'ALTER TABLE %s RENAME COLUMN %s TO %s';	// table, old-column, new-column, column-definitions (not used by default)
+	var $nameRegex = '\w';
+	var $nameRegexBrackets = 'a-zA-Z0-9_\(\)';
+	var $schema = false;
+	var $serverInfo = array();
+	var $autoIncrement = false;
+	var $dataProvider;
+	var $invalidResizeTypes4 = array('CLOB','BLOB','TEXT','DATE','TIME'); // for changetablesql
+	var $blobSize = 100; 	/// any varchar/char field this size or greater is treated as a blob
+							/// in other words, we use a text area for editting.
+	
+	function GetCommentSQL($table,$col)
+	{
+		return false;
+	}
+	
+	function SetCommentSQL($table,$col,$cmt)
+	{
+		return false;
+	}
+	
+	function MetaTables()
+	{
+		if (!$this->connection->IsConnected()) return array();
+		return $this->connection->MetaTables();
+	}
+	
+	function MetaColumns($tab, $upper=true, $schema=false)
+	{
+		if (!$this->connection->IsConnected()) return array();
+		return $this->connection->MetaColumns($this->TableName($tab), $upper, $schema);
+	}
+	
+	function MetaPrimaryKeys($tab,$owner=false,$intkey=false)
+	{
+		if (!$this->connection->IsConnected()) return array();
+		return $this->connection->MetaPrimaryKeys($this->TableName($tab), $owner, $intkey);
+	}
+	
+	function MetaIndexes($table, $primary = false, $owner = false)
+	{
+		if (!$this->connection->IsConnected()) return array();
+		return $this->connection->MetaIndexes($this->TableName($table), $primary, $owner);
+	}
+	
+	function MetaType($t,$len=-1,$fieldobj=false)
+	{
+		return ADORecordSet::MetaType($t,$len,$fieldobj);
+	}
+	
+	function NameQuote($name = NULL,$allowBrackets=false)
+	{
+		if (!is_string($name)) {
+			return FALSE;
+		}
+		
+		$name = trim($name);
+		
+		if ( !is_object($this->connection) ) {
+			return $name;
+		}
+		
+		$quote = $this->connection->nameQuote;
+		
+		// if name is of the form `name`, quote it
+		if ( preg_match('/^`(.+)`$/', $name, $matches) ) {
+			return $quote . $matches[1] . $quote;
+		}
+		
+		// if name contains special characters, quote it
+		$regex = ($allowBrackets) ? $this->nameRegexBrackets : $this->nameRegex;
+		
+		if ( !preg_match('/^[' . $regex . ']+$/', $name) ) {
+			return $quote . $name . $quote;
+		}
+		
+		return $name;
+	}
+	
+	function TableName($name)
+	{
+		if ( $this->schema ) {
+			return $this->NameQuote($this->schema) .'.'. $this->NameQuote($name);
+		}
+		return $this->NameQuote($name);
+	}
+	
+	// Executes the sql array returned by GetTableSQL and GetIndexSQL
+	function ExecuteSQLArray($sql, $continueOnError = true)
+	{
+		$rez = 2;
+		$conn = &$this->connection;
+		$saved = $conn->debug;
+		foreach($sql as $line) {
+			
+			if ($this->debug) $conn->debug = true;
+			$ok = $conn->Execute($line);
+			$conn->debug = $saved;
+			if (!$ok) {
+				if ($this->debug) ADOConnection::outp($conn->ErrorMsg());
+				if (!$continueOnError) return 0;
+				$rez = 1;
+			}
+		}
+		return $rez;
+	}
+	
+	/*
+	 	Returns the actual type given a character code.
+		
+		C:  varchar
+		X:  CLOB (character large object) or largest varchar size if CLOB is not supported
+		C2: Multibyte varchar
+		X2: Multibyte CLOB
+		
+		B:  BLOB (binary large object)
+		
+		D:  Date
+		T:  Date-time 
+		L:  Integer field suitable for storing booleans (0 or 1)
+		I:  Integer
+		F:  Floating point number
+		N:  Numeric or decimal number
+	*/
+	
+	function ActualType($meta)
+	{
+		return $meta;
+	}
+	
+	function CreateDatabase($dbname,$options=false)
+	{
+		$options = $this->_Options($options);
+		$sql = array();
+		
+		$s = 'CREATE DATABASE ' . $this->NameQuote($dbname);
+		if (isset($options[$this->upperName]))
+			$s .= ' '.$options[$this->upperName];
+		
+		$sql[] = $s;
+		return $sql;
+	}
+	
+	/*
+	 Generates the SQL to create index. Returns an array of sql strings.
+	*/
+	function CreateIndexSQL($idxname, $tabname, $flds, $idxoptions = false)
+	{
+		if (!is_array($flds)) {
+			$flds = explode(',',$flds);
+		}
+		
+		foreach($flds as $key => $fld) {
+			# some indexes can use partial fields, eg. index first 32 chars of "name" with NAME(32)
+			$flds[$key] = $this->NameQuote($fld,$allowBrackets=true);
+		}
+		
+		return $this->_IndexSQL($this->NameQuote($idxname), $this->TableName($tabname), $flds, $this->_Options($idxoptions));
+	}
+	
+	function DropIndexSQL ($idxname, $tabname = NULL)
+	{
+		return array(sprintf($this->dropIndex, $this->NameQuote($idxname), $this->TableName($tabname)));
+	}
+	
+	function SetSchema($schema)
+	{
+		$this->schema = $schema;
+	}
+	
+	function AddColumnSQL($tabname, $flds)
+	{
+		$tabname = $this->TableName ($tabname);
+		$sql = array();
+		list($lines,$pkey) = $this->_GenFields($flds);
+		$alter = 'ALTER TABLE ' . $tabname . $this->addCol . ' ';
+		foreach($lines as $v) {
+			$sql[] = $alter . $v;
+		}
+		return $sql;
+	}
+	
+	/**
+	 * Change the definition of one column
+	 *
+	 * As some DBM's can't do that on there own, you need to supply the complete defintion of the new table,
+	 * to allow, recreating the table and copying the content over to the new table
+	 * @param string $tabname table-name
+	 * @param string $flds column-name and type for the changed column
+	 * @param string $tableflds='' complete defintion of the new table, eg. for postgres, default ''
+	 * @param array/string $tableoptions='' options for the new table see CreateTableSQL, default ''
+	 * @return array with SQL strings
+	 */
+	function AlterColumnSQL($tabname, $flds, $tableflds='',$tableoptions='')
+	{
+		$tabname = $this->TableName ($tabname);
+		$sql = array();
+		list($lines,$pkey) = $this->_GenFields($flds);
+		$alter = 'ALTER TABLE ' . $tabname . $this->alterCol . ' ';
+		foreach($lines as $v) {
+			$sql[] = $alter . $v;
+		}
+		return $sql;
+	}
+	
+	/**
+	 * Rename one column
+	 *
+	 * Some DBM's can only do this together with changeing the type of the column (even if that stays the same, eg. mysql)
+	 * @param string $tabname table-name
+	 * @param string $oldcolumn column-name to be renamed
+	 * @param string $newcolumn new column-name
+	 * @param string $flds='' complete column-defintion-string like for AddColumnSQL, only used by mysql atm., default=''
+	 * @return array with SQL strings
+	 */
+	function RenameColumnSQL($tabname,$oldcolumn,$newcolumn,$flds='')
+	{
+		$tabname = $this->TableName ($tabname);
+		if ($flds) {
+			list($lines,$pkey) = $this->_GenFields($flds);
+			list(,$first) = each($lines);
+			list(,$column_def) = split("[\t ]+",$first,2);
+		}
+		return array(sprintf($this->renameColumn,$tabname,$this->NameQuote($oldcolumn),$this->NameQuote($newcolumn),$column_def));
+	}
+		
+	/**
+	 * Drop one column
+	 *
+	 * Some DBM's can't do that on there own, you need to supply the complete defintion of the new table,
+	 * to allow, recreating the table and copying the content over to the new table
+	 * @param string $tabname table-name
+	 * @param string $flds column-name and type for the changed column
+	 * @param string $tableflds='' complete defintion of the new table, eg. for postgres, default ''
+	 * @param array/string $tableoptions='' options for the new table see CreateTableSQL, default ''
+	 * @return array with SQL strings
+	 */
+	function DropColumnSQL($tabname, $flds, $tableflds='',$tableoptions='')
+	{
+		$tabname = $this->TableName ($tabname);
+		if (!is_array($flds)) $flds = explode(',',$flds);
+		$sql = array();
+		$alter = 'ALTER TABLE ' . $tabname . $this->dropCol . ' ';
+		foreach($flds as $v) {
+			$sql[] = $alter . $this->NameQuote($v);
+		}
+		return $sql;
+	}
+	
+	function DropTableSQL($tabname)
+	{
+		return array (sprintf($this->dropTable, $this->TableName($tabname)));
+	}
+	
+	function RenameTableSQL($tabname,$newname)
+	{
+		return array (sprintf($this->renameTable, $this->TableName($tabname),$this->TableName($newname)));
+	}	
+	
+	/*
+	 Generate the SQL to create table. Returns an array of sql strings.
+	*/
+	function CreateTableSQL($tabname, $flds, $tableoptions=false)
+	{
+		if (!$tableoptions) $tableoptions = array();
+		
+		list($lines,$pkey) = $this->_GenFields($flds, true);
+		
+		$taboptions = $this->_Options($tableoptions);
+		$tabname = $this->TableName ($tabname);
+		$sql = $this->_TableSQL($tabname,$lines,$pkey,$taboptions);
+		
+		$tsql = $this->_Triggers($tabname,$taboptions);
+		foreach($tsql as $s) $sql[] = $s;
+		
+		return $sql;
+	}
+	
+	function _GenFields($flds,$widespacing=false)
+	{
+		if (is_string($flds)) {
+			$padding = '     ';
+			$txt = $flds.$padding;
+			$flds = array();
+			$flds0 = Lens_ParseArgs($txt,',');
+			$hasparam = false;
+			foreach($flds0 as $f0) {
+				$f1 = array();
+				foreach($f0 as $token) {
+					switch (strtoupper($token)) {
+					case 'CONSTRAINT':
+					case 'DEFAULT': 
+						$hasparam = $token;
+						break;
+					default:
+						if ($hasparam) $f1[$hasparam] = $token;
+						else $f1[] = $token;
+						$hasparam = false;
+						break;
+					}
+				}
+				$flds[] = $f1;
+				
+			}
+		}
+		$this->autoIncrement = false;
+		$lines = array();
+		$pkey = array();
+		foreach($flds as $fld) {
+			$fld = _array_change_key_case($fld);
+		
+			$fname = false;
+			$fdefault = false;
+			$fautoinc = false;
+			$ftype = false;
+			$fsize = false;
+			$fprec = false;
+			$fprimary = false;
+			$fnoquote = false;
+			$fdefts = false;
+			$fdefdate = false;
+			$fconstraint = false;
+			$fnotnull = false;
+			$funsigned = false;
+			
+			//-----------------
+			// Parse attributes
+			foreach($fld as $attr => $v) {
+				if ($attr == 2 && is_numeric($v)) $attr = 'SIZE';
+				else if (is_numeric($attr) && $attr > 1 && !is_numeric($v)) $attr = strtoupper($v);
+				
+				switch($attr) {
+				case '0':
+				case 'NAME': 	$fname = $v; break;
+				case '1':
+				case 'TYPE': 	$ty = $v; $ftype = $this->ActualType(strtoupper($v)); break;
+				
+				case 'SIZE': 	
+								$dotat = strpos($v,'.'); if ($dotat === false) $dotat = strpos($v,',');
+								if ($dotat === false) $fsize = $v;
+								else {
+									$fsize = substr($v,0,$dotat);
+									$fprec = substr($v,$dotat+1);
+								}
+								break;
+				case 'UNSIGNED': $funsigned = true; break;
+				case 'AUTOINCREMENT':
+				case 'AUTO':	$fautoinc = true; $fnotnull = true; break;
+				case 'KEY':
+				case 'PRIMARY':	$fprimary = $v; $fnotnull = true; break;
+				case 'DEF':
+				case 'DEFAULT': $fdefault = $v; break;
+				case 'NOTNULL': $fnotnull = $v; break;
+				case 'NOQUOTE': $fnoquote = $v; break;
+				case 'DEFDATE': $fdefdate = $v; break;
+				case 'DEFTIMESTAMP': $fdefts = $v; break;
+				case 'CONSTRAINT': $fconstraint = $v; break;
+				} //switch
+			} // foreach $fld
+			
+			//--------------------
+			// VALIDATE FIELD INFO
+			if (!strlen($fname)) {
+				if ($this->debug) ADOConnection::outp("Undefined NAME");
+				return false;
+			}
+			
+			$fid = strtoupper(preg_replace('/^`(.+)`$/', '$1', $fname));
+			$fname = $this->NameQuote($fname);
+			
+			if (!strlen($ftype)) {
+				if ($this->debug) ADOConnection::outp("Undefined TYPE for field '$fname'");
+				return false;
+			} else {
+				$ftype = strtoupper($ftype);
+			}
+			
+			$ftype = $this->_GetSize($ftype, $ty, $fsize, $fprec);
+			
+			if ($ty == 'X' || $ty == 'X2' || $ty == 'B') $fnotnull = false; // some blob types do not accept nulls
+			
+			if ($fprimary) $pkey[] = $fname;
+			
+			// some databases do not allow blobs to have defaults
+			if ($ty == 'X') $fdefault = false;
+			
+			//--------------------
+			// CONSTRUCT FIELD SQL
+			if ($fdefts) {
+				if (substr($this->connection->databaseType,0,5) == 'mysql') {
+					$ftype = 'TIMESTAMP';
+				} else {
+					$fdefault = $this->connection->sysTimeStamp;
+				}
+			} else if ($fdefdate) {
+				if (substr($this->connection->databaseType,0,5) == 'mysql') {
+					$ftype = 'TIMESTAMP';
+				} else {
+					$fdefault = $this->connection->sysDate;
+				}
+			} else if ($fdefault !== false && !$fnoquote)
+				if ($ty == 'C' or $ty == 'X' or 
+					( substr($fdefault,0,1) != "'" && !is_numeric($fdefault)))
+					if (strlen($fdefault) != 1 && substr($fdefault,0,1) == ' ' && substr($fdefault,strlen($fdefault)-1) == ' ') 
+						$fdefault = trim($fdefault);
+					else if (strtolower($fdefault) != 'null')
+						$fdefault = $this->connection->qstr($fdefault);
+			$suffix = $this->_CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint,$funsigned);
+			
+			if ($widespacing) $fname = str_pad($fname,24);
+			$lines[$fid] = $fname.' '.$ftype.$suffix;
+			
+			if ($fautoinc) $this->autoIncrement = true;
+		} // foreach $flds
+		
+		return array($lines,$pkey);
+	}
+	/*
+		 GENERATE THE SIZE PART OF THE DATATYPE
+			$ftype is the actual type
+			$ty is the type defined originally in the DDL
+	*/
+	function _GetSize($ftype, $ty, $fsize, $fprec)
+	{
+		if (strlen($fsize) && $ty != 'X' && $ty != 'B' && strpos($ftype,'(') === false) {
+			$ftype .= "(".$fsize;
+			if (strlen($fprec)) $ftype .= ",".$fprec;
+			$ftype .= ')';
+		}
+		return $ftype;
+	}
+	
+	
+	// return string must begin with space
+	function _CreateSuffix($fname,$ftype,$fnotnull,$fdefault,$fautoinc,$fconstraint)
+	{	
+		$suffix = '';
+		if (strlen($fdefault)) $suffix .= " DEFAULT $fdefault";
+		if ($fnotnull) $suffix .= ' NOT NULL';
+		if ($fconstraint) $suffix .= ' '.$fconstraint;
+		return $suffix;
+	}
+	
+	function _IndexSQL($idxname, $tabname, $flds, $idxoptions)
+	{
+		$sql = array();
+		
+		if ( isset($idxoptions['REPLACE']) || isset($idxoptions['DROP']) ) {
+			$sql[] = sprintf ($this->dropIndex, $idxname);
+			if ( isset($idxoptions['DROP']) )
+				return $sql;
+		}
+		
+		if ( empty ($flds) ) {
+			return $sql;
+		}
+		
+		$unique = isset($idxoptions['UNIQUE']) ? ' UNIQUE' : '';
+	
+		$s = 'CREATE' . $unique . ' INDEX ' . $idxname . ' ON ' . $tabname . ' ';
+		
+		if ( isset($idxoptions[$this->upperName]) )
+			$s .= $idxoptions[$this->upperName];
+		
+		if ( is_array($flds) )
+			$flds = implode(', ',$flds);
+		$s .= '(' . $flds . ')';
+		$sql[] = $s;
+		
+		return $sql;
+	}
+	
+	function _DropAutoIncrement($tabname)
+	{
+		return false;
+	}
+	
+	function _TableSQL($tabname,$lines,$pkey,$tableoptions)
+	{
+		$sql = array();
+		
+		if (isset($tableoptions['REPLACE']) || isset ($tableoptions['DROP'])) {
+			$sql[] = sprintf($this->dropTable,$tabname);
+			if ($this->autoIncrement) {
+				$sInc = $this->_DropAutoIncrement($tabname);
+				if ($sInc) $sql[] = $sInc;
+			}
+			if ( isset ($tableoptions['DROP']) ) {
+				return $sql;
+			}
+		}
+		$s = "CREATE TABLE $tabname (\n";
+		$s .= implode(",\n", $lines);
+		if (sizeof($pkey)>0) {
+			$s .= ",\n                 PRIMARY KEY (";
+			$s .= implode(", ",$pkey).")";
+		}
+		if (isset($tableoptions['CONSTRAINTS'])) 
+			$s .= "\n".$tableoptions['CONSTRAINTS'];
+		
+		if (isset($tableoptions[$this->upperName.'_CONSTRAINTS'])) 
+			$s .= "\n".$tableoptions[$this->upperName.'_CONSTRAINTS'];
+		
+		$s .= "\n)";
+		if (isset($tableoptions[$this->upperName])) $s .= $tableoptions[$this->upperName];
+		$sql[] = $s;
+		
+		return $sql;
+	}
+	
+	/*
+		GENERATE TRIGGERS IF NEEDED
+		used when table has auto-incrementing field that is emulated using triggers
+	*/
+	function _Triggers($tabname,$taboptions)
+	{
+		return array();
+	}
+	
+	/*
+		Sanitize options, so that array elements with no keys are promoted to keys
+	*/
+	function _Options($opts)
+	{
+		if (!is_array($opts)) return array();
+		$newopts = array();
+		foreach($opts as $k => $v) {
+			if (is_numeric($k)) $newopts[strtoupper($v)] = $v;
+			else $newopts[strtoupper($k)] = $v;
+		}
+		return $newopts;
+	}
+	
+	/*
+	"Florian Buzin [ easywe ]" <florian.buzin#easywe.de>
+	
+	This function changes/adds new fields to your table. You don't
+	have to know if the col is new or not. It will check on its own.
+	*/
+	function ChangeTableSQL($tablename, $flds, $tableoptions = false, $forceAlter = false) // GS Fix for constraint impl - forceAlter
+	{
+	global $ADODB_FETCH_MODE;
+	
+		$save = $ADODB_FETCH_MODE;
+		$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
+		if ($this->connection->fetchMode !== false) $savem = $this->connection->SetFetchMode(false);
+		
+		// check table exists
+		$save_handler = $this->connection->raiseErrorFn;
+		$this->connection->raiseErrorFn = '';
+		$cols = $this->MetaColumns($tablename);
+		$this->connection->raiseErrorFn = $save_handler;
+		
+		if (isset($savem)) $this->connection->SetFetchMode($savem);
+		$ADODB_FETCH_MODE = $save;
+		
+		if ( $forceAlter == false && empty($cols)) { // GS Fix for constraint impl
+			return $this->CreateTableSQL($tablename, $flds, $tableoptions);
+		}
+		
+		if (is_array($flds)) {
+		// Cycle through the update fields, comparing
+		// existing fields to fields to update.
+		// if the Metatype and size is exactly the
+		// same, ignore - by Mark Newham
+			$holdflds = array();
+			foreach($flds as $k=>$v) {
+				if ( isset($cols[$k]) && is_object($cols[$k]) ) {
+					// If already not allowing nulls, then don't change
+					$obj = $cols[$k];
+					if (isset($obj->not_null) && $obj->not_null)
+						$v = str_replace('NOT NULL','',$v);
+
+					$c = $cols[$k];
+					$ml = $c->max_length;
+					$mt = $this->MetaType($c->type,$ml);
+					if ($ml == -1) $ml = '';
+					if ($mt == 'X') $ml = $v['SIZE'];
+					if (($mt != $v['TYPE']) ||  $ml != $v['SIZE']) {
+						$holdflds[$k] = $v;
+					}
+				} else {
+					$holdflds[$k] = $v;
+				}		
+			}
+			$flds = $holdflds;
+		}
+	
+
+		// already exists, alter table instead
+		list($lines,$pkey) = $this->_GenFields($flds);
+		$alter = 'ALTER TABLE ' . $this->TableName($tablename);
+		$sql = array();
+
+		foreach ( $lines as $id => $v ) {
+			if ( isset($cols[$id]) && is_object($cols[$id]) ) {
+			
+				$flds = Lens_ParseArgs($v,',');
+				
+				//  We are trying to change the size of the field, if not allowed, simply ignore the request.
+				if ($flds && in_array(strtoupper(substr($flds[0][1],0,4)),$this->invalidResizeTypes4)) continue;	 
+	 		
+				$sql[] = $alter . $this->alterCol . ' ' . $v;
+			} else {
+				$sql[] = $alter . $this->addCol . ' ' . $v;
+			}
+		}
+
+		// GS Fix for constraint impl -- start
+		if($forceAlter == false) return $sql;
+		$sqlarray = array();
+
+		$alter .= implode(",\n", $sql);
+		if (sizeof($pkey)>0) {
+			$alter .= ",\n PRIMARY KEY (";
+			$alter .= implode(", ",$pkey).")";
+		}
+		
+		if (isset($tableoptions['CONSTRAINTS'])) 
+			$alter .= "\n".$tableoptions['CONSTRAINTS'];
+
+		if (isset($tableoptions[$this->upperName.'_CONSTRAINTS'])) 
+			$alter .= "\n".$tableoptions[$this->upperName.'_CONSTRAINTS'];
+
+		if (isset($tableoptions[$this->upperName])) $alter .= $tableoptions[$this->upperName];
+			$sqlarray[] = $alter;
+
+		
+		$taboptions = $this->_Options($tableoptions);
+		$tsql = $this->_Triggers($this->TableName($tablename),$taboptions);
+		foreach($tsql as $s) $sqlarray[] = $s;
+
+		// GS Fix for constraint impl -- end
+		
+		return $sqlarray;
+
+		
+	}
+} // class
+?>




From vtigercrm-commits at vtiger.fosslabs.com  Thu Jun 29 13:29:39 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 29 Jun 2006 17:29:39 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7686 -
	/vtigercrm/trunk/adodb/adodb-xmlschema.inc.php
Message-ID: <20060629172939.D0A4F83FE8E@vtiger.fosslabs.com>

Author: richie
Date: Thu Jun 29 11:29:21 2006
New Revision: 7686

Log:
fixed the innodb and foreign key issue by srini

Modified:
    vtigercrm/trunk/adodb/adodb-xmlschema.inc.php

Modified: vtigercrm/trunk/adodb/adodb-xmlschema.inc.php
==============================================================================
--- vtigercrm/trunk/adodb/adodb-xmlschema.inc.php (original)
+++ vtigercrm/trunk/adodb/adodb-xmlschema.inc.php Thu Jun 29 11:29:21 2006
@@ -1,2221 +1,2227 @@
-<?php
-// Copyright (c) 2004 ars Cognita Inc., all rights reserved
-/* ******************************************************************************
-    Released under both BSD license and Lesser GPL library license. 
- 	Whenever there is any discrepancy between the two licenses, 
- 	the BSD license will take precedence. 
-*******************************************************************************/
-/**
- * xmlschema is a class that allows the user to quickly and easily
- * build a database on any ADOdb-supported platform using a simple
- * XML schema.
- *
- * Last Editor: $Author: jlim $
- * @author Richard Tango-Lowy & Dan Cech
- * @version $Revision: 1.12 $
- *
- * @package axmls
- * @tutorial getting_started.pkg
- */
- 
-function _file_get_contents($file) 
-{
- 	if (function_exists('file_get_contents')) return file_get_contents($file);
-	
-	$f = fopen($file,'r');
-	if (!$f) return '';
-	$t = '';
-	
-	while ($s = fread($f,100000)) $t .= $s;
-	fclose($f);
-	return $t;
-}
-
-
-/**
-* Debug on or off
-*/
-if( !defined( 'XMLS_DEBUG' ) ) {
-	define( 'XMLS_DEBUG', FALSE );
-}
-
-/**
-* Default prefix key
-*/
-if( !defined( 'XMLS_PREFIX' ) ) {
-	define( 'XMLS_PREFIX', '%%P' );
-}
-
-/**
-* Maximum length allowed for object prefix
-*/
-if( !defined( 'XMLS_PREFIX_MAXLEN' ) ) {
-	define( 'XMLS_PREFIX_MAXLEN', 10 );
-}
-
-/**
-* Execute SQL inline as it is generated
-*/
-if( !defined( 'XMLS_EXECUTE_INLINE' ) ) {
-	define( 'XMLS_EXECUTE_INLINE', FALSE );
-}
-
-/**
-* Continue SQL Execution if an error occurs?
-*/
-if( !defined( 'XMLS_CONTINUE_ON_ERROR' ) ) {
-	define( 'XMLS_CONTINUE_ON_ERROR', FALSE );
-}
-
-/**
-* Current Schema Version
-*/
-if( !defined( 'XMLS_SCHEMA_VERSION' ) ) {
-	define( 'XMLS_SCHEMA_VERSION', '0.2' );
-}
-
-/**
-* Default Schema Version.  Used for Schemas without an explicit version set.
-*/
-if( !defined( 'XMLS_DEFAULT_SCHEMA_VERSION' ) ) {
-	define( 'XMLS_DEFAULT_SCHEMA_VERSION', '0.1' );
-}
-
-/**
-* Default Schema Version.  Used for Schemas without an explicit version set.
-*/
-if( !defined( 'XMLS_DEFAULT_UPGRADE_METHOD' ) ) {
-	define( 'XMLS_DEFAULT_UPGRADE_METHOD', 'ALTER' );
-}
-
-/**
-* Include the main ADODB library
-*/
-if( !defined( '_ADODB_LAYER' ) ) {
-	require( 'adodb.inc.php' );
-	require( 'adodb-datadict.inc.php' );
-}
-
-/**
-* Abstract DB Object. This class provides basic methods for database objects, such
-* as tables and indexes.
-*
-* @package axmls
-* @access private
-*/
-class dbObject {
-	
-	/**
-	* var object Parent
-	*/
-	var $parent;
-	
-	/**
-	* var string current element
-	*/
-	var $currentElement;
-	
-	/**
-	* NOP
-	*/
-	function dbObject( &$parent, $attributes = NULL ) {
-		$this->parent =& $parent;
-	}
-	
-	/**
-	* XML Callback to process start elements
-	*
-	* @access private
-	*/
-	function _tag_open( &$parser, $tag, $attributes ) {
-		
-	}
-	
-	/**
-	* XML Callback to process CDATA elements
-	*
-	* @access private
-	*/
-	function _tag_cdata( &$parser, $cdata ) {
-		
-	}
-	
-	/**
-	* XML Callback to process end elements
-	*
-	* @access private
-	*/
-	function _tag_close( &$parser, $tag ) {
-		
-	}
-	
-	function create() {
-		return array();
-	}
-	
-	/**
-	* Destroys the object
-	*/
-	function destroy() {
-		unset( $this );
-	}
-	
-	/**
-	* Checks whether the specified RDBMS is supported by the current
-	* database object or its ranking ancestor.
-	*
-	* @param string $platform RDBMS platform name (from ADODB platform list).
-	* @return boolean TRUE if RDBMS is supported; otherwise returns FALSE.
-	*/
-	function supportedPlatform( $platform = NULL ) {
-		return is_object( $this->parent ) ? $this->parent->supportedPlatform( $platform ) : TRUE;
-	}
-	
-	/**
-	* Returns the prefix set by the ranking ancestor of the database object.
-	*
-	* @param string $name Prefix string.
-	* @return string Prefix.
-	*/
-	function prefix( $name = '' ) {
-		return is_object( $this->parent ) ? $this->parent->prefix( $name ) : $name;
-	}
-	
-	/**
-	* Extracts a field ID from the specified field.
-	*
-	* @param string $field Field.
-	* @return string Field ID.
-	*/
-	function FieldID( $field ) {
-		return strtoupper( preg_replace( '/^`(.+)`$/', '$1', $field ) );
-	}
-}
-
-/**
-* Creates a table object in ADOdb's datadict format
-*
-* This class stores information about a database table. As charactaristics
-* of the table are loaded from the external source, methods and properties
-* of this class are used to build up the table description in ADOdb's
-* datadict format.
-*
-* @package axmls
-* @access private
-*/
-class dbTable extends dbObject {
-	
-	/**
-	* @var string Table name
-	*/
-	var $name;
-	
-	/**
-	* @var array Field specifier: Meta-information about each field
-	*/
-	var $fields = array();
-	
-	/**
-	* @var array List of table indexes.
-	*/
-	var $indexes = array();
-	
-	/**
-	* @var array Table options: Table-level options
-	*/
-	var $opts = array();
-	
-	/**
-	* @var string Field index: Keeps track of which field is currently being processed
-	*/
-	var $current_field;
-	
-	/**
-	* @var boolean Mark table for destruction
-	* @access private
-	*/
-	var $drop_table;
-	
-	/**
-	* @var boolean Mark field for destruction (not yet implemented)
-	* @access private
-	*/
-	var $drop_field = array();
-	
-	/**
-	* Iniitializes a new table object.
-	*
-	* @param string $prefix DB Object prefix
-	* @param array $attributes Array of table attributes.
-	*/
-	function dbTable( &$parent, $attributes = NULL ) {
-		$this->parent =& $parent;
-		$this->name = $this->prefix($attributes['NAME']);
-	}
-	
-	/**
-	* XML Callback to process start elements. Elements currently 
-	* processed are: INDEX, DROP, FIELD, KEY, NOTNULL, AUTOINCREMENT & DEFAULT. 
-	*
-	* @access private
-	*/
-	function _tag_open( &$parser, $tag, $attributes ) {
-		$this->currentElement = strtoupper( $tag );
-		
-		switch( $this->currentElement ) {
-			case 'INDEX':
-				if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) ) {
-					xml_set_object( $parser, $this->addIndex( $attributes ) );
-				}
-				break;
-			case 'DATA':
-				if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) ) {
-					xml_set_object( $parser, $this->addData( $attributes ) );
-				}
-				break;
-			case 'DROP':
-				$this->drop();
-				break;
-			case 'FIELD':
-				// Add a field
-				$fieldName = $attributes['NAME'];
-				$fieldType = $attributes['TYPE'];
-				$fieldSize = isset( $attributes['SIZE'] ) ? $attributes['SIZE'] : NULL;
-				$fieldOpts = isset( $attributes['OPTS'] ) ? $attributes['OPTS'] : NULL;
-				
-				$this->addField( $fieldName, $fieldType, $fieldSize, $fieldOpts );
-				break;
-			case 'KEY':
-			case 'NOTNULL':
-			case 'AUTOINCREMENT':
-				// Add a field option
-				$this->addFieldOpt( $this->current_field, $this->currentElement );
-				break;
-			case 'DEFAULT':
-				// Add a field option to the table object
-				
-				// Work around ADOdb datadict issue that misinterprets empty strings.
-				if( $attributes['VALUE'] == '' ) {
-					$attributes['VALUE'] = " '' ";
-				}
-				
-				$this->addFieldOpt( $this->current_field, $this->currentElement, $attributes['VALUE'] );
-				break;
-			case 'DEFDATE':
-			case 'DEFTIMESTAMP':
-				// Add a field option to the table object
-				$this->addFieldOpt( $this->current_field, $this->currentElement );
-				break;
-			default:
-				// print_r( array( $tag, $attributes ) );
-		}
-	}
-	
-	/**
-	* XML Callback to process CDATA elements
-	*
-	* @access private
-	*/
-	function _tag_cdata( &$parser, $cdata ) {
-		switch( $this->currentElement ) {
-			// Table constraint
-			case 'CONSTRAINT':
-				if( isset( $this->current_field ) ) {
-					$this->addFieldOpt( $this->current_field, $this->currentElement, $cdata );
-				} else {
-					$this->addTableOpt( $cdata );
-				}
-				break;
-			// Table option
-			case 'OPT':
-				$this->addTableOpt( $cdata );
-				break;
-			default:
-				
-		}
-	}
-	
-	/**
-	* XML Callback to process end elements
-	*
-	* @access private
-	*/
-	function _tag_close( &$parser, $tag ) {
-		$this->currentElement = '';
-		
-		switch( strtoupper( $tag ) ) {
-			case 'TABLE':
-				$this->parent->addSQL( $this->create( $this->parent ) );
-				xml_set_object( $parser, $this->parent );
-				$this->destroy();
-				break;
-			case 'FIELD':
-				unset($this->current_field);
-				break;
-
-		}
-	}
-	
-	/**
-	* Adds an index to a table object
-	*
-	* @param array $attributes Index attributes
-	* @return object dbIndex object
-	*/
-	function &addIndex( $attributes ) {
-		$name = strtoupper( $attributes['NAME'] );
-		$this->indexes[$name] =& new dbIndex( $this, $attributes );
-		return $this->indexes[$name];
-	}
-	
-	/**
-	* Adds data to a table object
-	*
-	* @param array $attributes Data attributes
-	* @return object dbData object
-	*/
-	function &addData( $attributes ) {
-		if( !isset( $this->data ) ) {
-			$this->data =& new dbData( $this, $attributes );
-		}
-		return $this->data;
-	}
-	
-	/**
-	* Adds a field to a table object
-	*
-	* $name is the name of the table to which the field should be added. 
-	* $type is an ADODB datadict field type. The following field types
-	* are supported as of ADODB 3.40:
-	* 	- C:  varchar
-	*	- X:  CLOB (character large object) or largest varchar size
-	*	   if CLOB is not supported
-	*	- C2: Multibyte varchar
-	*	- X2: Multibyte CLOB
-	*	- B:  BLOB (binary large object)
-	*	- D:  Date (some databases do not support this, and we return a datetime type)
-	*	- T:  Datetime or Timestamp
-	*	- L:  Integer field suitable for storing booleans (0 or 1)
-	*	- I:  Integer (mapped to I4)
-	*	- I1: 1-byte integer
-	*	- I2: 2-byte integer
-	*	- I4: 4-byte integer
-	*	- I8: 8-byte integer
-	*	- F:  Floating point number
-	*	- N:  Numeric or decimal number
-	*
-	* @param string $name Name of the table to which the field will be added.
-	* @param string $type	ADODB datadict field type.
-	* @param string $size	Field size
-	* @param array $opts	Field options array
-	* @return array Field specifier array
-	*/
-	function addField( $name, $type, $size = NULL, $opts = NULL ) {
-		$field_id = $this->FieldID( $name );
-		
-		// Set the field index so we know where we are
-		$this->current_field = $field_id;
-		
-		// Set the field name (required)
-		$this->fields[$field_id]['NAME'] = $name;
-		
-		// Set the field type (required)
-		$this->fields[$field_id]['TYPE'] = $type;
-		
-		// Set the field size (optional)
-		if( isset( $size ) ) {
-			$this->fields[$field_id]['SIZE'] = $size;
-		}
-		
-		// Set the field options
-		if( isset( $opts ) ) {
-			$this->fields[$field_id]['OPTS'][] = $opts;
-		}
-	}
-	
-	/**
-	* Adds a field option to the current field specifier
-	*
-	* This method adds a field option allowed by the ADOdb datadict 
-	* and appends it to the given field.
-	*
-	* @param string $field	Field name
-	* @param string $opt ADOdb field option
-	* @param mixed $value Field option value
-	* @return array Field specifier array
-	*/
-	function addFieldOpt( $field, $opt, $value = NULL ) {
-		if( !isset( $value ) ) {
-			$this->fields[$this->FieldID( $field )]['OPTS'][] = $opt;
-		// Add the option and value
-		} else {
-			$this->fields[$this->FieldID( $field )]['OPTS'][] = array( $opt => $value );
-		}
-	}
-	
-	/**
-	* Adds an option to the table
-	*
-	* This method takes a comma-separated list of table-level options
-	* and appends them to the table object.
-	*
-	* @param string $opt Table option
-	* @return array Options
-	*/
-	function addTableOpt( $opt ) {
-		$this->opts[] = $opt;
-		
-		return $this->opts;
-	}
-	
-	/**
-	* Generates the SQL that will create the table in the database
-	*
-	* @param object $xmls adoSchema object
-	* @return array Array containing table creation SQL
-	*/
-	function create( &$xmls ) {
-		$sql = array();
-		
-		// drop any existing indexes
-		if( is_array( $legacy_indexes = $xmls->dict->MetaIndexes( $this->name ) ) ) {
-			foreach( $legacy_indexes as $index => $index_details ) {
-				$sql[] = $xmls->dict->DropIndexSQL( $index, $this->name );
-			}
-		}
-		
-		// remove fields to be dropped from table object
-		foreach( $this->drop_field as $field ) {
-			unset( $this->fields[$field] );
-		}
-		
-		// if table exists
-		if( is_array( $legacy_fields = $xmls->dict->MetaColumns( $this->name ) ) ) {
-			// drop table
-			if( $this->drop_table ) {
-				$sql[] = $xmls->dict->DropTableSQL( $this->name );
-				
-				return $sql;
-			}
-			
-			// drop any existing fields not in schema
-			foreach( $legacy_fields as $field_id => $field ) {
-				if( !isset( $this->fields[$field_id] ) ) {
-					$sql[] = $xmls->dict->DropColumnSQL( $this->name, '`'.$field->name.'`' );
-				}
-			}
-		// if table doesn't exist
-		} else {
-			if( $this->drop_table ) {
-				return $sql;
-			}
-			
-			$legacy_fields = array();
-		}
-		
-		// Loop through the field specifier array, building the associative array for the field options
-		$fldarray = array();
-		
-		foreach( $this->fields as $field_id => $finfo ) {
-			// Set an empty size if it isn't supplied
-			if( !isset( $finfo['SIZE'] ) ) {
-				$finfo['SIZE'] = '';
-			}
-			
-			// Initialize the field array with the type and size
-			$fldarray[$field_id] = array(
-				'NAME' => $finfo['NAME'],
-				'TYPE' => $finfo['TYPE'],
-				'SIZE' => $finfo['SIZE']
-			);
-			
-			// Loop through the options array and add the field options. 
-			if( isset( $finfo['OPTS'] ) ) {
-				foreach( $finfo['OPTS'] as $opt ) {
-					// Option has an argument.
-					if( is_array( $opt ) ) {
-						$key = key( $opt );
-						$value = $opt[key( $opt )];
-						@$fldarray[$field_id][$key] .= $value;
-					// Option doesn't have arguments
-					} else {
-						$fldarray[$field_id][$opt] = $opt;
-					}
-				}
-			}
-		}
-		
-		if( empty( $legacy_fields ) ) {
-			// Create the new table
-			$sql[] = $xmls->dict->CreateTableSQL( $this->name, $fldarray, $this->opts );
-			logMsg( end( $sql ), 'Generated CreateTableSQL' );
-		} else {
-			// Upgrade an existing table
-			logMsg( "Upgrading {$this->name} using '{$xmls->upgrade}'" );
-			switch( $xmls->upgrade ) {
-				// Use ChangeTableSQL
-				case 'ALTER':
-					logMsg( 'Generated ChangeTableSQL (ALTERing table)' );
-					$sql[] = $xmls->dict->ChangeTableSQL( $this->name, $fldarray, $this->opts );
-					break;
-				case 'REPLACE':
-					logMsg( 'Doing upgrade REPLACE (testing)' );
-					$sql[] = $xmls->dict->DropTableSQL( $this->name );
-					$sql[] = $xmls->dict->CreateTableSQL( $this->name, $fldarray, $this->opts );
-					break;
-				// ignore table
-				default:
-					return array();
-			}
-		}
-		
-		foreach( $this->indexes as $index ) {
-			$sql[] = $index->create( $xmls );
-		}
-		
-		if( isset( $this->data ) ) {
-			$sql[] = $this->data->create( $xmls );
-		}
-		
-		return $sql;
-	}
-	
-	/**
-	* Marks a field or table for destruction
-	*/
-	function drop() {
-		if( isset( $this->current_field ) ) {
-			// Drop the current field
-			logMsg( "Dropping field '{$this->current_field}' from table '{$this->name}'" );
-			// $this->drop_field[$this->current_field] = $xmls->dict->DropColumnSQL( $this->name, $this->current_field );
-			$this->drop_field[$this->current_field] = $this->current_field;
-		} else {
-			// Drop the current table
-			logMsg( "Dropping table '{$this->name}'" );
-			// $this->drop_table = $xmls->dict->DropTableSQL( $this->name );
-			$this->drop_table = TRUE;
-		}
-	}
-}
-
-/**
-* Creates an index object in ADOdb's datadict format
-*
-* This class stores information about a database index. As charactaristics
-* of the index are loaded from the external source, methods and properties
-* of this class are used to build up the index description in ADOdb's
-* datadict format.
-*
-* @package axmls
-* @access private
-*/
-class dbIndex extends dbObject {
-	
-	/**
-	* @var string	Index name
-	*/
-	var $name;
-	
-	/**
-	* @var array	Index options: Index-level options
-	*/
-	var $opts = array();
-	
-	/**
-	* @var array	Indexed fields: Table columns included in this index
-	*/
-	var $columns = array();
-	
-	/**
-	* @var boolean Mark index for destruction
-	* @access private
-	*/
-	var $drop = FALSE;
-	
-	/**
-	* Initializes the new dbIndex object.
-	*
-	* @param object $parent Parent object
-	* @param array $attributes Attributes
-	*
-	* @internal
-	*/
-	function dbIndex( &$parent, $attributes = NULL ) {
-		$this->parent =& $parent;
-		
-		$this->name = $this->prefix ($attributes['NAME']);
-	}
-	
-	/**
-	* XML Callback to process start elements
-	*
-	* Processes XML opening tags. 
-	* Elements currently processed are: DROP, CLUSTERED, BITMAP, UNIQUE, FULLTEXT & HASH. 
-	*
-	* @access private
-	*/
-	function _tag_open( &$parser, $tag, $attributes ) {
-		$this->currentElement = strtoupper( $tag );
-		
-		switch( $this->currentElement ) {
-			case 'DROP':
-				$this->drop();
-				break;
-			case 'CLUSTERED':
-			case 'BITMAP':
-			case 'UNIQUE':
-			case 'FULLTEXT':
-			case 'HASH':
-				// Add index Option
-				$this->addIndexOpt( $this->currentElement );
-				break;
-			default:
-				// print_r( array( $tag, $attributes ) );
-		}
-	}
-	
-	/**
-	* XML Callback to process CDATA elements
-	*
-	* Processes XML cdata.
-	*
-	* @access private
-	*/
-	function _tag_cdata( &$parser, $cdata ) {
-		switch( $this->currentElement ) {
-			// Index field name
-			case 'COL':
-				$this->addField( $cdata );
-				break;
-			default:
-				
-		}
-	}
-	
-	/**
-	* XML Callback to process end elements
-	*
-	* @access private
-	*/
-	function _tag_close( &$parser, $tag ) {
-		$this->currentElement = '';
-		
-		switch( strtoupper( $tag ) ) {
-			case 'INDEX':
-				xml_set_object( $parser, $this->parent );
-				break;
-		}
-	}
-	
-	/**
-	* Adds a field to the index
-	*
-	* @param string $name Field name
-	* @return string Field list
-	*/
-	function addField( $name ) {
-		$this->columns[$this->FieldID( $name )] = $name;
-		
-		// Return the field list
-		return $this->columns;
-	}
-	
-	/**
-	* Adds options to the index
-	*
-	* @param string $opt Comma-separated list of index options.
-	* @return string Option list
-	*/
-	function addIndexOpt( $opt ) {
-		$this->opts[] = $opt;
-		
-		// Return the options list
-		return $this->opts;
-	}
-	
-	/**
-	* Generates the SQL that will create the index in the database
-	*
-	* @param object $xmls adoSchema object
-	* @return array Array containing index creation SQL
-	*/
-	function create( &$xmls ) {
-		if( $this->drop ) {
-			return NULL;
-		}
-		
-		// eliminate any columns that aren't in the table
-		foreach( $this->columns as $id => $col ) {
-			if( !isset( $this->parent->fields[$id] ) ) {
-				unset( $this->columns[$id] );
-			}
-		}
-		
-		return $xmls->dict->CreateIndexSQL( $this->name, $this->parent->name, $this->columns, $this->opts );
-	}
-	
-	/**
-	* Marks an index for destruction
-	*/
-	function drop() {
-		$this->drop = TRUE;
-	}
-}
-
-/**
-* Creates a data object in ADOdb's datadict format
-*
-* This class stores information about table data.
-*
-* @package axmls
-* @access private
-*/
-class dbData extends dbObject {
-	
-	var $data = array();
-	
-	var $row;
-	
-	/**
-	* Initializes the new dbIndex object.
-	*
-	* @param object $parent Parent object
-	* @param array $attributes Attributes
-	*
-	* @internal
-	*/
-	function dbData( &$parent, $attributes = NULL ) {
-		$this->parent =& $parent;
-	}
-	
-	/**
-	* XML Callback to process start elements
-	*
-	* Processes XML opening tags. 
-	* Elements currently processed are: DROP, CLUSTERED, BITMAP, UNIQUE, FULLTEXT & HASH. 
-	*
-	* @access private
-	*/
-	function _tag_open( &$parser, $tag, $attributes ) {
-		$this->currentElement = strtoupper( $tag );
-		
-		switch( $this->currentElement ) {
-			case 'ROW':
-				$this->row = count( $this->data );
-				$this->data[$this->row] = array();
-				break;
-			case 'F':
-				$this->addField($attributes);
-			default:
-				// print_r( array( $tag, $attributes ) );
-		}
-	}
-	
-	/**
-	* XML Callback to process CDATA elements
-	*
-	* Processes XML cdata.
-	*
-	* @access private
-	*/
-	function _tag_cdata( &$parser, $cdata ) {
-		switch( $this->currentElement ) {
-			// Index field name
-			case 'F':
-				$this->addData( $cdata );
-				break;
-			default:
-				
-		}
-	}
-	
-	/**
-	* XML Callback to process end elements
-	*
-	* @access private
-	*/
-	function _tag_close( &$parser, $tag ) {
-		$this->currentElement = '';
-		
-		switch( strtoupper( $tag ) ) {
-			case 'DATA':
-				xml_set_object( $parser, $this->parent );
-				break;
-		}
-	}
-	
-	/**
-	* Adds a field to the index
-	*
-	* @param string $name Field name
-	* @return string Field list
-	*/
-	function addField( $attributes ) {
-		if( isset( $attributes['NAME'] ) ) {
-			$name = $attributes['NAME'];
-		} else {
-			$name = count($this->data[$this->row]);
-		}
-		
-		// Set the field index so we know where we are
-		$this->current_field = $this->FieldID( $name );
-	}
-	
-	/**
-	* Adds options to the index
-	*
-	* @param string $opt Comma-separated list of index options.
-	* @return string Option list
-	*/
-	function addData( $cdata ) {
-		if( !isset( $this->data[$this->row] ) ) {
-			$this->data[$this->row] = array();
-		}
-		
-		if( !isset( $this->data[$this->row][$this->current_field] ) ) {
-			$this->data[$this->row][$this->current_field] = '';
-		}
-		
-		$this->data[$this->row][$this->current_field] .= $cdata;
-	}
-	
-	/**
-	* Generates the SQL that will create the index in the database
-	*
-	* @param object $xmls adoSchema object
-	* @return array Array containing index creation SQL
-	*/
-	function create( &$xmls ) {
-		$table = $xmls->dict->TableName($this->parent->name);
-		$table_field_count = count($this->parent->fields);
-		$sql = array();
-		
-		// eliminate any columns that aren't in the table
-		foreach( $this->data as $row ) {
-			$table_fields = $this->parent->fields;
-			$fields = array();
-			
-			foreach( $row as $field_id => $field_data ) {
-				if( !array_key_exists( $field_id, $table_fields ) ) {
-					if( is_numeric( $field_id ) ) {
-						$field_id = reset( array_keys( $table_fields ) );
-					} else {
-						continue;
-					}
-				}
-				
-				$name = $table_fields[$field_id]['NAME'];
-				
-				switch( $table_fields[$field_id]['TYPE'] ) {
-					case 'C':
-					case 'C2':
-					case 'X':
-					case 'X2':
-						$fields[$name] = $xmls->db->qstr( $field_data );
-						break;
-					case 'I':
-					case 'I1':
-					case 'I2':
-					case 'I4':
-					case 'I8':
-						$fields[$name] = intval($field_data);
-						break;
-					default:
-						$fields[$name] = $field_data;
-				}
-				
-				unset($table_fields[$field_id]);
-			}
-			
-			// check that at least 1 column is specified
-			if( empty( $fields ) ) {
-				continue;
-			}
-			
-			// check that no required columns are missing
-			if( count( $fields ) < $table_field_count ) {
-				foreach( $table_fields as $field ) {
-					if (isset( $field['OPTS'] ))
-						if( ( in_array( 'NOTNULL', $field['OPTS'] ) || in_array( 'KEY', $field['OPTS'] ) ) && !in_array( 'AUTOINCREMENT', $field['OPTS'] ) ) {
-							continue(2);
-						}
-				}
-			}
-			
-			$sql[] = 'INSERT INTO '. $table .' ('. implode( ',', array_keys( $fields ) ) .') VALUES ('. implode( ',', $fields ) .')';
-		}
-		
-		return $sql;
-	}
-}
-
-/**
-* Creates the SQL to execute a list of provided SQL queries
-*
-* @package axmls
-* @access private
-*/
-class dbQuerySet extends dbObject {
-	
-	/**
-	* @var array	List of SQL queries
-	*/
-	var $queries = array();
-	
-	/**
-	* @var string	String used to build of a query line by line
-	*/
-	var $query;
-	
-	/**
-	* @var string	Query prefix key
-	*/
-	var $prefixKey = '';
-	
-	/**
-	* @var boolean	Auto prefix enable (TRUE)
-	*/
-	var $prefixMethod = 'AUTO';
-	
-	/**
-	* Initializes the query set.
-	*
-	* @param object $parent Parent object
-	* @param array $attributes Attributes
-	*/
-	function dbQuerySet( &$parent, $attributes = NULL ) {
-		$this->parent =& $parent;
-			
-		// Overrides the manual prefix key
-		if( isset( $attributes['KEY'] ) ) {
-			$this->prefixKey = $attributes['KEY'];
-		}
-		
-		$prefixMethod = isset( $attributes['PREFIXMETHOD'] ) ? strtoupper( trim( $attributes['PREFIXMETHOD'] ) ) : '';
-		
-		// Enables or disables automatic prefix prepending
-		switch( $prefixMethod ) {
-			case 'AUTO':
-				$this->prefixMethod = 'AUTO';
-				break;
-			case 'MANUAL':
-				$this->prefixMethod = 'MANUAL';
-				break;
-			case 'NONE':
-				$this->prefixMethod = 'NONE';
-				break;
-		}
-	}
-	
-	/**
-	* XML Callback to process start elements. Elements currently 
-	* processed are: QUERY. 
-	*
-	* @access private
-	*/
-	function _tag_open( &$parser, $tag, $attributes ) {
-		$this->currentElement = strtoupper( $tag );
-		
-		switch( $this->currentElement ) {
-			case 'QUERY':
-				// Create a new query in a SQL queryset.
-				// Ignore this query set if a platform is specified and it's different than the 
-				// current connection platform.
-				if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) ) {
-					$this->newQuery();
-				} else {
-					$this->discardQuery();
-				}
-				break;
-			default:
-				// print_r( array( $tag, $attributes ) );
-		}
-	}
-	
-	/**
-	* XML Callback to process CDATA elements
-	*/
-	function _tag_cdata( &$parser, $cdata ) {
-		switch( $this->currentElement ) {
-			// Line of queryset SQL data
-			case 'QUERY':
-				$this->buildQuery( $cdata );
-				break;
-			default:
-				
-		}
-	}
-	
-	/**
-	* XML Callback to process end elements
-	*
-	* @access private
-	*/
-	function _tag_close( &$parser, $tag ) {
-		$this->currentElement = '';
-		
-		switch( strtoupper( $tag ) ) {
-			case 'QUERY':
-				// Add the finished query to the open query set.
-				$this->addQuery();
-				break;
-			case 'SQL':
-				$this->parent->addSQL( $this->create( $this->parent ) );
-				xml_set_object( $parser, $this->parent );
-				$this->destroy();
-				break;
-			default:
-				
-		}
-	}
-	
-	/**
-	* Re-initializes the query.
-	*
-	* @return boolean TRUE
-	*/
-	function newQuery() {
-		$this->query = '';
-		
-		return TRUE;
-	}
-	
-	/**
-	* Discards the existing query.
-	*
-	* @return boolean TRUE
-	*/
-	function discardQuery() {
-		unset( $this->query );
-		
-		return TRUE;
-	}
-	
-	/** 
-	* Appends a line to a query that is being built line by line
-	*
-	* @param string $data Line of SQL data or NULL to initialize a new query
-	* @return string SQL query string.
-	*/
-	function buildQuery( $sql = NULL ) {
-		if( !isset( $this->query ) OR empty( $sql ) ) {
-			return FALSE;
-		}
-		
-		$this->query .= $sql;
-		
-		return $this->query;
-	}
-	
-	/**
-	* Adds a completed query to the query list
-	*
-	* @return string	SQL of added query
-	*/
-	function addQuery() {
-		if( !isset( $this->query ) ) {
-			return FALSE;
-		}
-		
-		$this->queries[] = $return = trim($this->query);
-		
-		unset( $this->query );
-		
-		return $return;
-	}
-	
-	/**
-	* Creates and returns the current query set
-	*
-	* @param object $xmls adoSchema object
-	* @return array Query set
-	*/
-	function create( &$xmls ) {
-		foreach( $this->queries as $id => $query ) {
-			switch( $this->prefixMethod ) {
-				case 'AUTO':
-					// Enable auto prefix replacement
-					
-					// Process object prefix.
-					// Evaluate SQL statements to prepend prefix to objects
-					$query = $this->prefixQuery( '/^\s*((?is)INSERT\s+(INTO\s+)?)((\w+\s*,?\s*)+)(\s.*$)/', $query, $xmls->objectPrefix );
-					$query = $this->prefixQuery( '/^\s*((?is)UPDATE\s+(FROM\s+)?)((\w+\s*,?\s*)+)(\s.*$)/', $query, $xmls->objectPrefix );
-					$query = $this->prefixQuery( '/^\s*((?is)DELETE\s+(FROM\s+)?)((\w+\s*,?\s*)+)(\s.*$)/', $query, $xmls->objectPrefix );
-					
-					// SELECT statements aren't working yet
-					#$data = preg_replace( '/(?ias)(^\s*SELECT\s+.*\s+FROM)\s+(\W\s*,?\s*)+((?i)\s+WHERE.*$)/', "\1 $prefix\2 \3", $data );
-					
-				case 'MANUAL':
-					// If prefixKey is set and has a value then we use it to override the default constant XMLS_PREFIX.
-					// If prefixKey is not set, we use the default constant XMLS_PREFIX
-					if( isset( $this->prefixKey ) AND( $this->prefixKey !== '' ) ) {
-						// Enable prefix override
-						$query = str_replace( $this->prefixKey, $xmls->objectPrefix, $query );
-					} else {
-						// Use default replacement
-						$query = str_replace( XMLS_PREFIX , $xmls->objectPrefix, $query );
-					}
-			}
-			
-			$this->queries[$id] = trim( $query );
-		}
-		
-		// Return the query set array
-		return $this->queries;
-	}
-	
-	/**
-	* Rebuilds the query with the prefix attached to any objects
-	*
-	* @param string $regex Regex used to add prefix
-	* @param string $query SQL query string
-	* @param string $prefix Prefix to be appended to tables, indices, etc.
-	* @return string Prefixed SQL query string.
-	*/
-	function prefixQuery( $regex, $query, $prefix = NULL ) {
-		if( !isset( $prefix ) ) {
-			return $query;
-		}
-		
-		if( preg_match( $regex, $query, $match ) ) {
-			$preamble = $match[1];
-			$postamble = $match[5];
-			$objectList = explode( ',', $match[3] );
-			// $prefix = $prefix . '_';
-			
-			$prefixedList = '';
-			
-			foreach( $objectList as $object ) {
-				if( $prefixedList !== '' ) {
-					$prefixedList .= ', ';
-				}
-				
-				$prefixedList .= $prefix . trim( $object );
-			}
-			
-			$query = $preamble . ' ' . $prefixedList . ' ' . $postamble;
-		}
-		
-		return $query;
-	}
-}
-
-/**
-* Loads and parses an XML file, creating an array of "ready-to-run" SQL statements
-* 
-* This class is used to load and parse the XML file, to create an array of SQL statements
-* that can be used to build a database, and to build the database using the SQL array.
-*
-* @tutorial getting_started.pkg
-*
-* @author Richard Tango-Lowy & Dan Cech
-* @version $Revision: 1.12 $
-*
-* @package axmls
-*/
-class adoSchema {
-	
-	/**
-	* @var array	Array containing SQL queries to generate all objects
-	* @access private
-	*/
-	var $sqlArray;
-	
-	/**
-	* @var object	ADOdb connection object
-	* @access private
-	*/
-	var $db;
-	
-	/**
-	* @var object	ADOdb Data Dictionary
-	* @access private
-	*/
-	var $dict;
-	
-	/**
-	* @var string Current XML element
-	* @access private
-	*/
-	var $currentElement = '';
-	
-	/**
-	* @var string If set (to 'ALTER' or 'REPLACE'), upgrade an existing database
-	* @access private
-	*/
-	var $upgrade = '';
-	
-	/**
-	* @var string Optional object prefix
-	* @access private
-	*/
-	var $objectPrefix = '';
-	
-	/**
-	* @var long	Original Magic Quotes Runtime value
-	* @access private
-	*/
-	var $mgq;
-	
-	/**
-	* @var long	System debug
-	* @access private
-	*/
-	var $debug;
-	
-	/**
-	* @var string Regular expression to find schema version
-	* @access private
-	*/
-	var $versionRegex = '/<schema.*?( version="([^"]*)")?.*?>/';
-	
-	/**
-	* @var string Current schema version
-	* @access private
-	*/
-	var $schemaVersion;
-	
-	/**
-	* @var int	Success of last Schema execution
-	*/
-	var $success;
-	
-	/**
-	* @var bool	Execute SQL inline as it is generated
-	*/
-	var $executeInline;
-	
-	/**
-	* @var bool	Continue SQL execution if errors occur
-	*/
-	var $continueOnError;
-	
-	/**
-	* Creates an adoSchema object
-	*
-	* Creating an adoSchema object is the first step in processing an XML schema.
-	* The only parameter is an ADOdb database connection object, which must already
-	* have been created.
-	*
-	* @param object $db ADOdb database connection object.
-	*/
-	function adoSchema( &$db ) {
-		// Initialize the environment
-		$this->mgq = get_magic_quotes_runtime();
-		set_magic_quotes_runtime(0);
-		
-		$this->db =& $db;
-		$this->debug = $this->db->debug;
-		$this->dict = NewDataDictionary( $this->db );
-		$this->sqlArray = array();
-		$this->schemaVersion = XMLS_SCHEMA_VERSION;
-		$this->executeInline( XMLS_EXECUTE_INLINE );
-		$this->continueOnError( XMLS_CONTINUE_ON_ERROR );
-		$this->setUpgradeMethod();
-	}
-	
-	/**
-	* Sets the method to be used for upgrading an existing database
-	*
-	* Use this method to specify how existing database objects should be upgraded.
-	* The method option can be set to ALTER, REPLACE, BEST, or NONE. ALTER attempts to
-	* alter each database object directly, REPLACE attempts to rebuild each object
-	* from scratch, BEST attempts to determine the best upgrade method for each
-	* object, and NONE disables upgrading.
-	*
-	* This method is not yet used by AXMLS, but exists for backward compatibility.
-	* The ALTER method is automatically assumed when the adoSchema object is
-	* instantiated; other upgrade methods are not currently supported.
-	*
-	* @param string $method Upgrade method (ALTER|REPLACE|BEST|NONE)
-	* @returns string Upgrade method used
-	*/
-	function SetUpgradeMethod( $method = '' ) {
-		if( !is_string( $method ) ) {
-			return FALSE;
-		}
-		
-		$method = strtoupper( $method );
-		
-		// Handle the upgrade methods
-		switch( $method ) {
-			case 'ALTER':
-				$this->upgrade = $method;
-				break;
-			case 'REPLACE':
-				$this->upgrade = $method;
-				break;
-			case 'BEST':
-				$this->upgrade = 'ALTER';
-				break;
-			case 'NONE':
-				$this->upgrade = 'NONE';
-				break;
-			default:
-				// Use default if no legitimate method is passed.
-				$this->upgrade = XMLS_DEFAULT_UPGRADE_METHOD;
-		}
-		
-		return $this->upgrade;
-	}
-	
-	/**
-	* Enables/disables inline SQL execution.
-	*
-	* Call this method to enable or disable inline execution of the schema. If the mode is set to TRUE (inline execution),
-	* AXMLS applies the SQL to the database immediately as each schema entity is parsed. If the mode
-	* is set to FALSE (post execution), AXMLS parses the entire schema and you will need to call adoSchema::ExecuteSchema()
-	* to apply the schema to the database.
-	*
-	* @param bool $mode execute
-	* @return bool current execution mode
-	*
-	* @see ParseSchema(), ExecuteSchema()
-	*/
-	function ExecuteInline( $mode = NULL ) {
-		if( is_bool( $mode ) ) {
-			$this->executeInline = $mode;
-		}
-		
-		return $this->executeInline;
-	}
-	
-	/**
-	* Enables/disables SQL continue on error.
-	*
-	* Call this method to enable or disable continuation of SQL execution if an error occurs.
-	* If the mode is set to TRUE (continue), AXMLS will continue to apply SQL to the database, even if an error occurs.
-	* If the mode is set to FALSE (halt), AXMLS will halt execution of generated sql if an error occurs, though parsing
-	* of the schema will continue.
-	*
-	* @param bool $mode execute
-	* @return bool current continueOnError mode
-	*
-	* @see addSQL(), ExecuteSchema()
-	*/
-	function ContinueOnError( $mode = NULL ) {
-		if( is_bool( $mode ) ) {
-			$this->continueOnError = $mode;
-		}
-		
-		return $this->continueOnError;
-	}
-	
-	/**
-	* Loads an XML schema from a file and converts it to SQL.
-	*
-	* Call this method to load the specified schema (see the DTD for the proper format) from
-	* the filesystem and generate the SQL necessary to create the database described. 
-	* @see ParseSchemaString()
-	*
-	* @param string $file Name of XML schema file.
-	* @param bool $returnSchema Return schema rather than parsing.
-	* @return array Array of SQL queries, ready to execute
-	*/
-	function ParseSchema( $filename, $returnSchema = FALSE ) {
-		return $this->ParseSchemaString( $this->ConvertSchemaFile( $filename ), $returnSchema );
-	}
-	
-	/**
-	* Loads an XML schema from a file and converts it to SQL.
-	*
-	* Call this method to load the specified schema from a file (see the DTD for the proper format) 
-	* and generate the SQL necessary to create the database described by the schema.
-	*
-	* @param string $file Name of XML schema file.
-	* @param bool $returnSchema Return schema rather than parsing.
-	* @return array Array of SQL queries, ready to execute.
-	*
-	* @deprecated Replaced by adoSchema::ParseSchema() and adoSchema::ParseSchemaString()
-	* @see ParseSchema(), ParseSchemaString()
-	*/
-	function ParseSchemaFile( $filename, $returnSchema = FALSE ) {
-		// Open the file
-		if( !($fp = fopen( $filename, 'r' )) ) {
-			// die( 'Unable to open file' );
-			return FALSE;
-		}
-		
-		// do version detection here
-		if( $this->SchemaFileVersion( $filename ) != $this->schemaVersion ) {
-			return FALSE;
-		}
-		
-		if ( $returnSchema )
-		{
-			$xmlstring = '';
-			while( $data = fread( $fp, 100000 ) ) {
-				$xmlstring .= $data;
-			}
-			return $xmlstring;
-		}
-		
-		$this->success = 2;
-		
-		$xmlParser = $this->create_parser();
-		
-		// Process the file
-		while( $data = fread( $fp, 4096 ) ) {
-			if( !xml_parse( $xmlParser, $data, feof( $fp ) ) ) {
-				die( sprintf(
-					"XML error: %s at line %d",
-					xml_error_string( xml_get_error_code( $xmlParser) ),
-					xml_get_current_line_number( $xmlParser)
-				) );
-			}
-		}
-		
-		xml_parser_free( $xmlParser );
-		
-		return $this->sqlArray;
-	}
-	
-	/**
-	* Converts an XML schema string to SQL.
-	*
-	* Call this method to parse a string containing an XML schema (see the DTD for the proper format)
-	* and generate the SQL necessary to create the database described by the schema. 
-	* @see ParseSchema()
-	*
-	* @param string $xmlstring XML schema string.
-	* @param bool $returnSchema Return schema rather than parsing.
-	* @return array Array of SQL queries, ready to execute.
-	*/
-	function ParseSchemaString( $xmlstring, $returnSchema = FALSE ) {
-		if( !is_string( $xmlstring ) OR empty( $xmlstring ) ) {
-			return FALSE;
-		}
-		
-		// do version detection here
-		if( $this->SchemaStringVersion( $xmlstring ) != $this->schemaVersion ) {
-			return FALSE;
-		}
-		
-		if ( $returnSchema )
-		{
-			return $xmlstring;
-		}
-		
-		$this->success = 2;
-		
-		$xmlParser = $this->create_parser();
-		
-		if( !xml_parse( $xmlParser, $xmlstring, TRUE ) ) {
-			die( sprintf(
-				"XML error: %s at line %d",
-				xml_error_string( xml_get_error_code( $xmlParser) ),
-				xml_get_current_line_number( $xmlParser)
-			) );
-		}
-		
-		xml_parser_free( $xmlParser );
-		
-		return $this->sqlArray;
-	}
-	
-	/**
-	* Loads an XML schema from a file and converts it to uninstallation SQL.
-	*
-	* Call this method to load the specified schema (see the DTD for the proper format) from
-	* the filesystem and generate the SQL necessary to remove the database described.
-	* @see RemoveSchemaString()
-	*
-	* @param string $file Name of XML schema file.
-	* @param bool $returnSchema Return schema rather than parsing.
-	* @return array Array of SQL queries, ready to execute
-	*/
-	function RemoveSchema( $filename, $returnSchema = FALSE ) {
-		return $this->RemoveSchemaString( $this->ConvertSchemaFile( $filename ), $returnSchema );
-	}
-	
-	/**
-	* Converts an XML schema string to uninstallation SQL.
-	*
-	* Call this method to parse a string containing an XML schema (see the DTD for the proper format)
-	* and generate the SQL necessary to uninstall the database described by the schema. 
-	* @see RemoveSchema()
-	*
-	* @param string $schema XML schema string.
-	* @param bool $returnSchema Return schema rather than parsing.
-	* @return array Array of SQL queries, ready to execute.
-	*/
-	function RemoveSchemaString( $schema, $returnSchema = FALSE ) {
-		
-		// grab current version
-		if( !( $version = $this->SchemaStringVersion( $schema ) ) ) {
-			return FALSE;
-		}
-		
-		return $this->ParseSchemaString( $this->TransformSchema( $schema, 'remove-' . $version), $returnSchema );
-	}
-	
-	/**
-	* Applies the current XML schema to the database (post execution).
-	*
-	* Call this method to apply the current schema (generally created by calling 
-	* ParseSchema() or ParseSchemaString() ) to the database (creating the tables, indexes, 
-	* and executing other SQL specified in the schema) after parsing.
-	* @see ParseSchema(), ParseSchemaString(), ExecuteInline()
-	*
-	* @param array $sqlArray Array of SQL statements that will be applied rather than
-	*		the current schema.
-	* @param boolean $continueOnErr Continue to apply the schema even if an error occurs.
-	* @returns integer 0 if failure, 1 if errors, 2 if successful.
-	*/
-	function ExecuteSchema( $sqlArray = NULL, $continueOnErr =  NULL ) {
-		if( !is_bool( $continueOnErr ) ) {
-			$continueOnErr = $this->ContinueOnError();
-		}
-		
-		if( !isset( $sqlArray ) ) {
-			$sqlArray = $this->sqlArray;
-		}
-		
-		if( !is_array( $sqlArray ) ) {
-			$this->success = 0;
-		} else {
-			$this->success = $this->dict->ExecuteSQLArray( $sqlArray, $continueOnErr );
-		}
-		
-		return $this->success;
-	}
-	
-	/**
-	* Returns the current SQL array. 
-	*
-	* Call this method to fetch the array of SQL queries resulting from 
-	* ParseSchema() or ParseSchemaString(). 
-	*
-	* @param string $format Format: HTML, TEXT, or NONE (PHP array)
-	* @return array Array of SQL statements or FALSE if an error occurs
-	*/
-	function PrintSQL( $format = 'NONE' ) {
-		$sqlArray = null;
-		return $this->getSQL( $format, $sqlArray );
-	}
-	
-	/**
-	* Saves the current SQL array to the local filesystem as a list of SQL queries.
-	*
-	* Call this method to save the array of SQL queries (generally resulting from a
-	* parsed XML schema) to the filesystem.
-	*
-	* @param string $filename Path and name where the file should be saved.
-	* @return boolean TRUE if save is successful, else FALSE. 
-	*/
-	function SaveSQL( $filename = './schema.sql' ) {
-		
-		if( !isset( $sqlArray ) ) {
-			$sqlArray = $this->sqlArray;
-		}
-		if( !isset( $sqlArray ) ) {
-			return FALSE;
-		}
-		
-		$fp = fopen( $filename, "w" );
-		
-		foreach( $sqlArray as $key => $query ) {
-			fwrite( $fp, $query . ";\n" );
-		}
-		fclose( $fp );
-	}
-	
-	/**
-	* Create an xml parser
-	*
-	* @return object PHP XML parser object
-	*
-	* @access private
-	*/
-	function &create_parser() {
-		// Create the parser
-		$xmlParser = xml_parser_create();
-		xml_set_object( $xmlParser, $this );
-		
-		// Initialize the XML callback functions
-		xml_set_element_handler( $xmlParser, '_tag_open', '_tag_close' );
-		xml_set_character_data_handler( $xmlParser, '_tag_cdata' );
-		
-		return $xmlParser;
-	}
-	
-	/**
-	* XML Callback to process start elements
-	*
-	* @access private
-	*/
-	function _tag_open( &$parser, $tag, $attributes ) {
-		switch( strtoupper( $tag ) ) {
-			case 'TABLE':
-				$this->obj = new dbTable( $this, $attributes );
-				xml_set_object( $parser, $this->obj );
-				break;
-			case 'SQL':
-				if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) ) {
-					$this->obj = new dbQuerySet( $this, $attributes );
-					xml_set_object( $parser, $this->obj );
-				}
-				break;
-			default:
-				// print_r( array( $tag, $attributes ) );
-		}
-		
-	}
-	
-	/**
-	* XML Callback to process CDATA elements
-	*
-	* @access private
-	*/
-	function _tag_cdata( &$parser, $cdata ) {
-	}
-	
-	/**
-	* XML Callback to process end elements
-	*
-	* @access private
-	* @internal
-	*/
-	function _tag_close( &$parser, $tag ) {
-		
-	}
-	
-	/**
-	* Converts an XML schema string to the specified DTD version.
-	*
-	* Call this method to convert a string containing an XML schema to a different AXMLS
-	* DTD version. For instance, to convert a schema created for an pre-1.0 version for 
-	* AXMLS (DTD version 0.1) to a newer version of the DTD (e.g. 0.2). If no DTD version 
-	* parameter is specified, the schema will be converted to the current DTD version. 
-	* If the newFile parameter is provided, the converted schema will be written to the specified
-	* file.
-	* @see ConvertSchemaFile()
-	*
-	* @param string $schema String containing XML schema that will be converted.
-	* @param string $newVersion DTD version to convert to.
-	* @param string $newFile File name of (converted) output file.
-	* @return string Converted XML schema or FALSE if an error occurs.
-	*/
-	function ConvertSchemaString( $schema, $newVersion = NULL, $newFile = NULL ) {
-		
-		// grab current version
-		if( !( $version = $this->SchemaStringVersion( $schema ) ) ) {
-			return FALSE;
-		}
-		
-		if( !isset ($newVersion) ) {
-			$newVersion = $this->schemaVersion;
-		}
-		
-		if( $version == $newVersion ) {
-			$result = $schema;
-		} else {
-			$result = $this->TransformSchema( $schema, 'convert-' . $version . '-' . $newVersion);
-		}
-		
-		if( is_string( $result ) AND is_string( $newFile ) AND ( $fp = fopen( $newFile, 'w' ) ) ) {
-			fwrite( $fp, $result );
-			fclose( $fp );
-		}
-		
-		return $result;
-	}
-	
-	// compat for pre-4.3 - jlim
-	function _file_get_contents($path)
-	{
-		if (function_exists('file_get_contents')) return file_get_contents($path);
-		return join('',file($path));
-	}
-	
-	/**
-	* Converts an XML schema file to the specified DTD version.
-	*
-	* Call this method to convert the specified XML schema file to a different AXMLS
-	* DTD version. For instance, to convert a schema created for an pre-1.0 version for 
-	* AXMLS (DTD version 0.1) to a newer version of the DTD (e.g. 0.2). If no DTD version 
-	* parameter is specified, the schema will be converted to the current DTD version. 
-	* If the newFile parameter is provided, the converted schema will be written to the specified
-	* file.
-	* @see ConvertSchemaString()
-	*
-	* @param string $filename Name of XML schema file that will be converted.
-	* @param string $newVersion DTD version to convert to.
-	* @param string $newFile File name of (converted) output file.
-	* @return string Converted XML schema or FALSE if an error occurs.
-	*/
-	function ConvertSchemaFile( $filename, $newVersion = NULL, $newFile = NULL ) {
-		
-		// grab current version
-		if( !( $version = $this->SchemaFileVersion( $filename ) ) ) {
-			return FALSE;
-		}
-		
-		if( !isset ($newVersion) ) {
-			$newVersion = $this->schemaVersion;
-		}
-		
-		if( $version == $newVersion ) {
-			$result = _file_get_contents( $filename );
-			
-			// remove unicode BOM if present
-			if( substr( $result, 0, 3 ) == sprintf( '%c%c%c', 239, 187, 191 ) ) {
-				$result = substr( $result, 3 );
-			}
-		} else {
-			$result = $this->TransformSchema( $filename, 'convert-' . $version . '-' . $newVersion, 'file' );
-		}
-		
-		if( is_string( $result ) AND is_string( $newFile ) AND ( $fp = fopen( $newFile, 'w' ) ) ) {
-			fwrite( $fp, $result );
-			fclose( $fp );
-		}
-		
-		return $result;
-	}
-	
-	function TransformSchema( $schema, $xsl, $schematype='string' )
-	{
-		// Fail if XSLT extension is not available
-		if( ! function_exists( 'xslt_create' ) ) {
-			return FALSE;
-		}
-		
-		$xsl_file = dirname( __FILE__ ) . '/xsl/' . $xsl . '.xsl';
-		
-		// look for xsl
-		if( !is_readable( $xsl_file ) ) {
-			return FALSE;
-		}
-		
-		switch( $schematype )
-		{
-			case 'file':
-				if( !is_readable( $schema ) ) {
-					return FALSE;
-				}
-				
-				$schema = _file_get_contents( $schema );
-				break;
-			case 'string':
-			default:
-				if( !is_string( $schema ) ) {
-					return FALSE;
-				}
-		}
-		
-		$arguments = array (
-			'/_xml' => $schema,
-			'/_xsl' => _file_get_contents( $xsl_file )
-		);
-		
-		// create an XSLT processor
-		$xh = xslt_create ();
-		
-		// set error handler
-		xslt_set_error_handler ($xh, array (&$this, 'xslt_error_handler'));
-		
-		// process the schema
-		$result = xslt_process ($xh, 'arg:/_xml', 'arg:/_xsl', NULL, $arguments); 
-		
-		xslt_free ($xh);
-		
-		return $result;
-	}
-	
-	/**
-	* Processes XSLT transformation errors
-	*
-	* @param object $parser XML parser object
-	* @param integer $errno Error number
-	* @param integer $level Error level
-	* @param array $fields Error information fields
-	*
-	* @access private
-	*/
-	function xslt_error_handler( $parser, $errno, $level, $fields ) {
-		if( is_array( $fields ) ) {
-			$msg = array(
-				'Message Type' => ucfirst( $fields['msgtype'] ),
-				'Message Code' => $fields['code'],
-				'Message' => $fields['msg'],
-				'Error Number' => $errno,
-				'Level' => $level
-			);
-			
-			switch( $fields['URI'] ) {
-				case 'arg:/_xml':
-					$msg['Input'] = 'XML';
-					break;
-				case 'arg:/_xsl':
-					$msg['Input'] = 'XSL';
-					break;
-				default:
-					$msg['Input'] = $fields['URI'];
-			}
-			
-			$msg['Line'] = $fields['line'];
-		} else {
-			$msg = array(
-				'Message Type' => 'Error',
-				'Error Number' => $errno,
-				'Level' => $level,
-				'Fields' => var_export( $fields, TRUE )
-			);
-		}
-		
-		$error_details = $msg['Message Type'] . ' in XSLT Transformation' . "\n"
-					   . '<table>' . "\n";
-		
-		foreach( $msg as $label => $details ) {
-			$error_details .= '<tr><td><b>' . $label . ': </b></td><td>' . htmlentities( $details ) . '</td></tr>' . "\n";
-		}
-		
-		$error_details .= '</table>';
-		
-		trigger_error( $error_details, E_USER_ERROR );
-	}
-	
-	/**
-	* Returns the AXMLS Schema Version of the requested XML schema file.
-	*
-	* Call this method to obtain the AXMLS DTD version of the requested XML schema file.
-	* @see SchemaStringVersion()
-	*
-	* @param string $filename AXMLS schema file
-	* @return string Schema version number or FALSE on error
-	*/
-	function SchemaFileVersion( $filename ) {
-		// Open the file
-		if( !($fp = fopen( $filename, 'r' )) ) {
-			// die( 'Unable to open file' );
-			return FALSE;
-		}
-		
-		// Process the file
-		while( $data = fread( $fp, 4096 ) ) {
-			if( preg_match( $this->versionRegex, $data, $matches ) ) {
-				return !empty( $matches[2] ) ? $matches[2] : XMLS_DEFAULT_SCHEMA_VERSION;
-			}
-		}
-		
-		return FALSE;
-	}
-	
-	/**
-	* Returns the AXMLS Schema Version of the provided XML schema string.
-	*
-	* Call this method to obtain the AXMLS DTD version of the provided XML schema string.
-	* @see SchemaFileVersion()
-	*
-	* @param string $xmlstring XML schema string
-	* @return string Schema version number or FALSE on error
-	*/
-	function SchemaStringVersion( $xmlstring ) {
-		if( !is_string( $xmlstring ) OR empty( $xmlstring ) ) {
-			return FALSE;
-		}
-		
-		if( preg_match( $this->versionRegex, $xmlstring, $matches ) ) {
-			return !empty( $matches[2] ) ? $matches[2] : XMLS_DEFAULT_SCHEMA_VERSION;
-		}
-		
-		return FALSE;
-	}
-	
-	/**
-	* Extracts an XML schema from an existing database.
-	*
-	* Call this method to create an XML schema string from an existing database.
-	* If the data parameter is set to TRUE, AXMLS will include the data from the database
-	* in the schema. 
-	*
-	* @param boolean $data Include data in schema dump
-	* @return string Generated XML schema
-	*/
-	function ExtractSchema( $data = FALSE ) {
-		$old_mode = $this->db->SetFetchMode( ADODB_FETCH_NUM );
-		
-		$schema = '<?xml version="1.0"?>' . "\n"
-				. '<schema version="' . $this->schemaVersion . '">' . "\n";
-		
-		if( is_array( $tables = $this->db->MetaTables( 'TABLES' ) ) ) {
-			foreach( $tables as $table ) {
-				$schema .= '	<table name="' . $table . '">' . "\n";
-				
-				// grab details from database
-				$rs = $this->db->Execute( 'SELECT * FROM ' . $table . ' WHERE 1=1' );
-				$fields = $this->db->MetaColumns( $table );
-				$indexes = $this->db->MetaIndexes( $table );
-				
-				if( is_array( $fields ) ) {
-					foreach( $fields as $details ) {
-						$extra = '';
-						$content = array();
-						
-						if( $details->max_length > 0 ) {
-							$extra .= ' size="' . $details->max_length . '"';
-						}
-						
-						if( $details->primary_key ) {
-							$content[] = '<KEY/>';
-						} elseif( $details->not_null ) {
-							$content[] = '<NOTNULL/>';
-						}
-						
-						if( $details->has_default ) {
-							$content[] = '<DEFAULT value="' . $details->default_value . '"/>';
-						}
-						
-						if( $details->auto_increment ) {
-							$content[] = '<AUTOINCREMENT/>';
-						}
-						
-						// this stops the creation of 'R' columns,
-						// AUTOINCREMENT is used to create auto columns
-						$details->primary_key = 0;
-						$type = $rs->MetaType( $details );
-						
-						$schema .= '		<field name="' . $details->name . '" type="' . $type . '"' . $extra . '>';
-						
-						if( !empty( $content ) ) {
-							$schema .= "\n			" . implode( "\n			", $content ) . "\n		";
-						}
-						
-						$schema .= '</field>' . "\n";
-					}
-				}
-				
-				if( is_array( $indexes ) ) {
-					foreach( $indexes as $index => $details ) {
-						$schema .= '		<index name="' . $index . '">' . "\n";
-						
-						if( $details['unique'] ) {
-							$schema .= '			<UNIQUE/>' . "\n";
-						}
-						
-						foreach( $details['columns'] as $column ) {
-							$schema .= '			<col>' . $column . '</col>' . "\n";
-						}
-						
-						$schema .= '		</index>' . "\n";
-					}
-				}
-				
-				if( $data ) {
-					$rs = $this->db->Execute( 'SELECT * FROM ' . $table );
-					
-					if( is_object( $rs ) ) {
-						$schema .= '		<data>' . "\n";
-						
-						while( $row = $rs->FetchRow() ) {
-							foreach( $row as $key => $val ) {
-								$row[$key] = htmlentities($val);
-							}
-							
-							$schema .= '			<row><f>' . implode( '</f><f>', $row ) . '</f></row>' . "\n";
-						}
-						
-						$schema .= '		</data>' . "\n";
-					}
-				}
-				
-				$schema .= '	</table>' . "\n";
-			}
-		}
-		
-		$this->db->SetFetchMode( $old_mode );
-		
-		$schema .= '</schema>';
-		return $schema;
-	}
-	
-	/**
-	* Sets a prefix for database objects
-	*
-	* Call this method to set a standard prefix that will be prepended to all database tables 
-	* and indices when the schema is parsed. Calling setPrefix with no arguments clears the prefix.
-	*
-	* @param string $prefix Prefix that will be prepended.
-	* @param boolean $underscore If TRUE, automatically append an underscore character to the prefix.
-	* @return boolean TRUE if successful, else FALSE
-	*/
-	function SetPrefix( $prefix = '', $underscore = TRUE ) {
-		switch( TRUE ) {
-			// clear prefix
-			case empty( $prefix ):
-				logMsg( 'Cleared prefix' );
-				$this->objectPrefix = '';
-				return TRUE;
-			// prefix too long
-			case strlen( $prefix ) > XMLS_PREFIX_MAXLEN:
-			// prefix contains invalid characters
-			case !preg_match( '/^[a-z][a-z0-9_]+$/i', $prefix ):
-				logMsg( 'Invalid prefix: ' . $prefix );
-				return FALSE;
-		}
-		
-		if( $underscore AND substr( $prefix, -1 ) != '_' ) {
-			$prefix .= '_';
-		}
-		
-		// prefix valid
-		logMsg( 'Set prefix: ' . $prefix );
-		$this->objectPrefix = $prefix;
-		return TRUE;
-	}
-	
-	/**
-	* Returns an object name with the current prefix prepended.
-	*
-	* @param string	$name Name
-	* @return string	Prefixed name
-	*
-	* @access private
-	*/
-	function prefix( $name = '' ) {
-		// if prefix is set
-		if( !empty( $this->objectPrefix ) ) {
-			// Prepend the object prefix to the table name
-			// prepend after quote if used
-			return preg_replace( '/^(`?)(.+)$/', '$1' . $this->objectPrefix . '$2', $name );
-		}
-		
-		// No prefix set. Use name provided.
-		return $name;
-	}
-	
-	/**
-	* Checks if element references a specific platform
-	*
-	* @param string $platform Requested platform
-	* @returns boolean TRUE if platform check succeeds
-	*
-	* @access private
-	*/
-	function supportedPlatform( $platform = NULL ) {
-		$regex = '/^(\w*\|)*' . $this->db->databaseType . '(\|\w*)*$/';
-		
-		if( !isset( $platform ) OR preg_match( $regex, $platform ) ) {
-			logMsg( "Platform $platform is supported" );
-			return TRUE;
-		} else {
-			logMsg( "Platform $platform is NOT supported" );
-			return FALSE;
-		}
-	}
-	
-	/**
-	* Clears the array of generated SQL.
-	*
-	* @access private
-	*/
-	function clearSQL() {
-		$this->sqlArray = array();
-	}
-	
-	/**
-	* Adds SQL into the SQL array.
-	*
-	* @param mixed $sql SQL to Add
-	* @return boolean TRUE if successful, else FALSE.
-	*
-	* @access private
-	*/	
-	function addSQL( $sql = NULL ) {
-		if( is_array( $sql ) ) {
-			foreach( $sql as $line ) {
-				$this->addSQL( $line );
-			}
-			
-			return TRUE;
-		}
-		
-		if( is_string( $sql ) ) {
-			$this->sqlArray[] = $sql;
-			
-			// if executeInline is enabled, and either no errors have occurred or continueOnError is enabled, execute SQL.
-			if( $this->ExecuteInline() && ( $this->success == 2 || $this->ContinueOnError() ) ) {
-				$saved = $this->db->debug;
-				$this->db->debug = $this->debug;
-				$ok = $this->db->Execute( $sql );
-				$this->db->debug = $saved;
-				
-				if( !$ok ) {
-					if( $this->debug ) {
-						ADOConnection::outp( $this->db->ErrorMsg() );
-					}
-					
-					$this->success = 1;
-				}
-			}
-			
-			return TRUE;
-		}
-		
-		return FALSE;
-	}
-	
-	/**
-	* Gets the SQL array in the specified format.
-	*
-	* @param string $format Format
-	* @return mixed SQL
-	*	
-	* @access private
-	*/
-	function getSQL( $format = NULL, $sqlArray = NULL ) {
-		if( !is_array( $sqlArray ) ) {
-			$sqlArray = $this->sqlArray;
-		}
-		
-		if( !is_array( $sqlArray ) ) {
-			return FALSE;
-		}
-		
-		switch( strtolower( $format ) ) {
-			case 'string':
-			case 'text':
-				return !empty( $sqlArray ) ? implode( ";\n\n", $sqlArray ) . ';' : '';
-			case'html':
-				return !empty( $sqlArray ) ? nl2br( htmlentities( implode( ";\n\n", $sqlArray ) . ';' ) ) : '';
-		}
-		
-		return $this->sqlArray;
-	}
-	
-	/**
-	* Destroys an adoSchema object.
-	*
-	* Call this method to clean up after an adoSchema object that is no longer in use.
-	* @deprecated adoSchema now cleans up automatically.
-	*/
-	function Destroy() {
-		set_magic_quotes_runtime( $this->mgq );
-		unset( $this );
-	}
-}
-
-/**
-* Message logging function
-*
-* @access private
-*/
-function logMsg( $msg, $title = NULL, $force = FALSE ) {
-	if( XMLS_DEBUG or $force ) {
-		echo '<pre>';
-		
-		if( isset( $title ) ) {
-			echo '<h3>' . htmlentities( $title ) . '</h3>';
-		}
-		
-		if( is_object( $this ) ) {
-			echo '[' . get_class( $this ) . '] ';
-		}
-		
-		print_r( $msg );
-		
-		echo '</pre>';
-	}
-}
-?>
+<?php
+// Copyright (c) 2004 ars Cognita Inc., all rights reserved
+/* ******************************************************************************
+    Released under both BSD license and Lesser GPL library license. 
+ 	Whenever there is any discrepancy between the two licenses, 
+ 	the BSD license will take precedence. 
+*******************************************************************************/
+/**
+ * xmlschema is a class that allows the user to quickly and easily
+ * build a database on any ADOdb-supported platform using a simple
+ * XML schema.
+ *
+ * Last Editor: $Author: jlim $
+ * @author Richard Tango-Lowy & Dan Cech
+ * @version $Revision: 1.12 $
+ *
+ * @package axmls
+ * @tutorial getting_started.pkg
+ */
+ 
+function _file_get_contents($file) 
+{
+ 	if (function_exists('file_get_contents')) return file_get_contents($file);
+	
+	$f = fopen($file,'r');
+	if (!$f) return '';
+	$t = '';
+	
+	while ($s = fread($f,100000)) $t .= $s;
+	fclose($f);
+	return $t;
+}
+
+
+/**
+* Debug on or off
+*/
+if( !defined( 'XMLS_DEBUG' ) ) {
+	define( 'XMLS_DEBUG', FALSE );
+}
+
+/**
+* Default prefix key
+*/
+if( !defined( 'XMLS_PREFIX' ) ) {
+	define( 'XMLS_PREFIX', '%%P' );
+}
+
+/**
+* Maximum length allowed for object prefix
+*/
+if( !defined( 'XMLS_PREFIX_MAXLEN' ) ) {
+	define( 'XMLS_PREFIX_MAXLEN', 10 );
+}
+
+/**
+* Execute SQL inline as it is generated
+*/
+if( !defined( 'XMLS_EXECUTE_INLINE' ) ) {
+	define( 'XMLS_EXECUTE_INLINE', FALSE );
+}
+
+/**
+* Continue SQL Execution if an error occurs?
+*/
+if( !defined( 'XMLS_CONTINUE_ON_ERROR' ) ) {
+	define( 'XMLS_CONTINUE_ON_ERROR', FALSE );
+}
+
+/**
+* Current Schema Version
+*/
+if( !defined( 'XMLS_SCHEMA_VERSION' ) ) {
+	define( 'XMLS_SCHEMA_VERSION', '0.2' );
+}
+
+/**
+* Default Schema Version.  Used for Schemas without an explicit version set.
+*/
+if( !defined( 'XMLS_DEFAULT_SCHEMA_VERSION' ) ) {
+	define( 'XMLS_DEFAULT_SCHEMA_VERSION', '0.1' );
+}
+
+/**
+* Default Schema Version.  Used for Schemas without an explicit version set.
+*/
+if( !defined( 'XMLS_DEFAULT_UPGRADE_METHOD' ) ) {
+	define( 'XMLS_DEFAULT_UPGRADE_METHOD', 'ALTER' );
+}
+
+/**
+* Include the main ADODB library
+*/
+if( !defined( '_ADODB_LAYER' ) ) {
+	require( 'adodb.inc.php' );
+	require( 'adodb-datadict.inc.php' );
+}
+
+/**
+* Abstract DB Object. This class provides basic methods for database objects, such
+* as tables and indexes.
+*
+* @package axmls
+* @access private
+*/
+class dbObject {
+	
+	/**
+	* var object Parent
+	*/
+	var $parent;
+	
+	/**
+	* var string current element
+	*/
+	var $currentElement;
+	
+	/**
+	* NOP
+	*/
+	function dbObject( &$parent, $attributes = NULL ) {
+		$this->parent =& $parent;
+	}
+	
+	/**
+	* XML Callback to process start elements
+	*
+	* @access private
+	*/
+	function _tag_open( &$parser, $tag, $attributes ) {
+		
+	}
+	
+	/**
+	* XML Callback to process CDATA elements
+	*
+	* @access private
+	*/
+	function _tag_cdata( &$parser, $cdata ) {
+		
+	}
+	
+	/**
+	* XML Callback to process end elements
+	*
+	* @access private
+	*/
+	function _tag_close( &$parser, $tag ) {
+		
+	}
+	
+	function create() {
+		return array();
+	}
+	
+	/**
+	* Destroys the object
+	*/
+	function destroy() {
+		unset( $this );
+	}
+	
+	/**
+	* Checks whether the specified RDBMS is supported by the current
+	* database object or its ranking ancestor.
+	*
+	* @param string $platform RDBMS platform name (from ADODB platform list).
+	* @return boolean TRUE if RDBMS is supported; otherwise returns FALSE.
+	*/
+	function supportedPlatform( $platform = NULL ) {
+		return is_object( $this->parent ) ? $this->parent->supportedPlatform( $platform ) : TRUE;
+	}
+	
+	/**
+	* Returns the prefix set by the ranking ancestor of the database object.
+	*
+	* @param string $name Prefix string.
+	* @return string Prefix.
+	*/
+	function prefix( $name = '' ) {
+		return is_object( $this->parent ) ? $this->parent->prefix( $name ) : $name;
+	}
+	
+	/**
+	* Extracts a field ID from the specified field.
+	*
+	* @param string $field Field.
+	* @return string Field ID.
+	*/
+	function FieldID( $field ) {
+		return strtoupper( preg_replace( '/^`(.+)`$/', '$1', $field ) );
+	}
+}
+
+/**
+* Creates a table object in ADOdb's datadict format
+*
+* This class stores information about a database table. As charactaristics
+* of the table are loaded from the external source, methods and properties
+* of this class are used to build up the table description in ADOdb's
+* datadict format.
+*
+* @package axmls
+* @access private
+*/
+class dbTable extends dbObject {
+	
+	/**
+	* @var string Table name
+	*/
+	var $name;
+	
+	/**
+	* @var array Field specifier: Meta-information about each field
+	*/
+	var $fields = array();
+	
+	/**
+	* @var array List of table indexes.
+	*/
+	var $indexes = array();
+	
+	/**
+	* @var array Table options: Table-level options
+	*/
+	var $opts = array();
+	
+	/**
+	* @var string Field index: Keeps track of which field is currently being processed
+	*/
+	var $current_field;
+	
+	/**
+	* @var boolean Mark table for destruction
+	* @access private
+	*/
+	var $drop_table;
+	
+	/**
+	* @var boolean Mark field for destruction (not yet implemented)
+	* @access private
+	*/
+	var $drop_field = array();
+	var $alter; // GS Fix for constraint impl
+	
+	/**
+	* Iniitializes a new table object.
+	*
+	* @param string $prefix DB Object prefix
+	* @param array $attributes Array of table attributes.
+	*/
+	function dbTable( &$parent, $attributes = NULL ) {
+		$this->parent =& $parent;
+		$this->name = $this->prefix($attributes['NAME']);
+		// GS Fix for constraint impl
+		if(isset($attributes['ALTER']))
+		{
+			$this->alter = $attributes['ALTER'];
+		}
+	}
+	
+	/**
+	* XML Callback to process start elements. Elements currently 
+	* processed are: INDEX, DROP, FIELD, KEY, NOTNULL, AUTOINCREMENT & DEFAULT. 
+	*
+	* @access private
+	*/
+	function _tag_open( &$parser, $tag, $attributes ) {
+		$this->currentElement = strtoupper( $tag );
+		
+		switch( $this->currentElement ) {
+			case 'INDEX':
+				if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) ) {
+					xml_set_object( $parser, $this->addIndex( $attributes ) );
+				}
+				break;
+			case 'DATA':
+				if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) ) {
+					xml_set_object( $parser, $this->addData( $attributes ) );
+				}
+				break;
+			case 'DROP':
+				$this->drop();
+				break;
+			case 'FIELD':
+				// Add a field
+				$fieldName = $attributes['NAME'];
+				$fieldType = $attributes['TYPE'];
+				$fieldSize = isset( $attributes['SIZE'] ) ? $attributes['SIZE'] : NULL;
+				$fieldOpts = isset( $attributes['OPTS'] ) ? $attributes['OPTS'] : NULL;
+				
+				$this->addField( $fieldName, $fieldType, $fieldSize, $fieldOpts );
+				break;
+			case 'KEY':
+			case 'NOTNULL':
+			case 'AUTOINCREMENT':
+				// Add a field option
+				$this->addFieldOpt( $this->current_field, $this->currentElement );
+				break;
+			case 'DEFAULT':
+				// Add a field option to the table object
+				
+				// Work around ADOdb datadict issue that misinterprets empty strings.
+				if( $attributes['VALUE'] == '' ) {
+					$attributes['VALUE'] = " '' ";
+				}
+				
+				$this->addFieldOpt( $this->current_field, $this->currentElement, $attributes['VALUE'] );
+				break;
+			case 'DEFDATE':
+			case 'DEFTIMESTAMP':
+				// Add a field option to the table object
+				$this->addFieldOpt( $this->current_field, $this->currentElement );
+				break;
+			default:
+				// print_r( array( $tag, $attributes ) );
+		}
+	}
+	
+	/**
+	* XML Callback to process CDATA elements
+	*
+	* @access private
+	*/
+	function _tag_cdata( &$parser, $cdata ) {
+		switch( $this->currentElement ) {
+			// Table constraint
+			case 'CONSTRAINT':
+				if( isset( $this->current_field ) ) {
+					$this->addFieldOpt( $this->current_field, $this->currentElement, $cdata );
+				} else {
+					$this->addTableOpt('CONSTRAINTS', $cdata ); // GS Fix for constraint impl
+				}
+				break;
+			// Table option
+			case 'OPT':
+				$this->addTableOpt('mysql', $cdata ); // GS Fix for constraint impl
+				break;
+			default:
+				
+		}
+	}
+	
+	/**
+	* XML Callback to process end elements
+	*
+	* @access private
+	*/
+	function _tag_close( &$parser, $tag ) {
+		$this->currentElement = '';
+		
+		switch( strtoupper( $tag ) ) {
+			case 'TABLE':
+				$this->parent->addSQL( $this->create( $this->parent ) );
+				xml_set_object( $parser, $this->parent );
+				$this->destroy();
+				break;
+			case 'FIELD':
+				unset($this->current_field);
+				break;
+
+		}
+	}
+	
+	/**
+	* Adds an index to a table object
+	*
+	* @param array $attributes Index attributes
+	* @return object dbIndex object
+	*/
+	function &addIndex( $attributes ) {
+		$name = strtoupper( $attributes['NAME'] );
+		$this->indexes[$name] =& new dbIndex( $this, $attributes );
+		return $this->indexes[$name];
+	}
+	
+	/**
+	* Adds data to a table object
+	*
+	* @param array $attributes Data attributes
+	* @return object dbData object
+	*/
+	function &addData( $attributes ) {
+		if( !isset( $this->data ) ) {
+			$this->data =& new dbData( $this, $attributes );
+		}
+		return $this->data;
+	}
+	
+	/**
+	* Adds a field to a table object
+	*
+	* $name is the name of the table to which the field should be added. 
+	* $type is an ADODB datadict field type. The following field types
+	* are supported as of ADODB 3.40:
+	* 	- C:  varchar
+	*	- X:  CLOB (character large object) or largest varchar size
+	*	   if CLOB is not supported
+	*	- C2: Multibyte varchar
+	*	- X2: Multibyte CLOB
+	*	- B:  BLOB (binary large object)
+	*	- D:  Date (some databases do not support this, and we return a datetime type)
+	*	- T:  Datetime or Timestamp
+	*	- L:  Integer field suitable for storing booleans (0 or 1)
+	*	- I:  Integer (mapped to I4)
+	*	- I1: 1-byte integer
+	*	- I2: 2-byte integer
+	*	- I4: 4-byte integer
+	*	- I8: 8-byte integer
+	*	- F:  Floating point number
+	*	- N:  Numeric or decimal number
+	*
+	* @param string $name Name of the table to which the field will be added.
+	* @param string $type	ADODB datadict field type.
+	* @param string $size	Field size
+	* @param array $opts	Field options array
+	* @return array Field specifier array
+	*/
+	function addField( $name, $type, $size = NULL, $opts = NULL ) {
+		$field_id = $this->FieldID( $name );
+		
+		// Set the field index so we know where we are
+		$this->current_field = $field_id;
+		
+		// Set the field name (required)
+		$this->fields[$field_id]['NAME'] = $name;
+		
+		// Set the field type (required)
+		$this->fields[$field_id]['TYPE'] = $type;
+		
+		// Set the field size (optional)
+		if( isset( $size ) ) {
+			$this->fields[$field_id]['SIZE'] = $size;
+		}
+		
+		// Set the field options
+		if( isset( $opts ) ) {
+			$this->fields[$field_id]['OPTS'][] = $opts;
+		}
+	}
+	
+	/**
+	* Adds a field option to the current field specifier
+	*
+	* This method adds a field option allowed by the ADOdb datadict 
+	* and appends it to the given field.
+	*
+	* @param string $field	Field name
+	* @param string $opt ADOdb field option
+	* @param mixed $value Field option value
+	* @return array Field specifier array
+	*/
+	function addFieldOpt( $field, $opt, $value = NULL ) {
+		if( !isset( $value ) ) {
+			$this->fields[$this->FieldID( $field )]['OPTS'][] = $opt;
+		// Add the option and value
+		} else {
+			$this->fields[$this->FieldID( $field )]['OPTS'][] = array( $opt => $value );
+		}
+	}
+	
+	/**
+	* Adds an option to the table
+	*
+	* This method takes a comma-separated list of table-level options
+	* and appends them to the table object.
+	*
+	* @param string $opt Table option
+	* @return array Options
+	*/
+	function addTableOpt($key, $opt ) { // GS Fix for constraint impl
+		//$this->opts[] = $opt;
+		$this->opts[$key] = $opt;
+		
+		return $this->opts;
+	}
+	
+	/**
+	* Generates the SQL that will create the table in the database
+	*
+	* @param object $xmls adoSchema object
+	* @return array Array containing table creation SQL
+	*/
+	function create( &$xmls ) {
+		$sql = array();
+		
+		// drop any existing indexes
+		if( is_array( $legacy_indexes = $xmls->dict->MetaIndexes( $this->name ) ) ) {
+			foreach( $legacy_indexes as $index => $index_details ) {
+				$sql[] = $xmls->dict->DropIndexSQL( $index, $this->name );
+			}
+		}
+		
+		// remove fields to be dropped from table object
+		foreach( $this->drop_field as $field ) {
+			unset( $this->fields[$field] );
+		}
+		
+		// if table exists
+		if( is_array( $legacy_fields = $xmls->dict->MetaColumns( $this->name ) ) ) {
+			// drop table
+			if( $this->drop_table ) {
+				$sql[] = $xmls->dict->DropTableSQL( $this->name );
+				
+				return $sql;
+			}
+			
+			// drop any existing fields not in schema
+			foreach( $legacy_fields as $field_id => $field ) {
+				if( !isset( $this->fields[$field_id] ) ) {
+					$sql[] = $xmls->dict->DropColumnSQL( $this->name, '`'.$field->name.'`' );
+				}
+			}
+		// if table doesn't exist
+		} else {
+			if( $this->drop_table ) {
+				return $sql;
+			}
+			
+			$legacy_fields = array();
+		}
+		
+		// Loop through the field specifier array, building the associative array for the field options
+		$fldarray = array();
+		
+		foreach( $this->fields as $field_id => $finfo ) {
+			// Set an empty size if it isn't supplied
+			if( !isset( $finfo['SIZE'] ) ) {
+				$finfo['SIZE'] = '';
+			}
+			
+			// Initialize the field array with the type and size
+			$fldarray[$field_id] = array(
+				'NAME' => $finfo['NAME'],
+				'TYPE' => $finfo['TYPE'],
+				'SIZE' => $finfo['SIZE']
+			);
+			
+			// Loop through the options array and add the field options. 
+			if( isset( $finfo['OPTS'] ) ) {
+				foreach( $finfo['OPTS'] as $opt ) {
+					// Option has an argument.
+					if( is_array( $opt ) ) {
+						$key = key( $opt );
+						$value = $opt[key( $opt )];
+						@$fldarray[$field_id][$key] .= $value;
+					// Option doesn't have arguments
+					} else {
+						$fldarray[$field_id][$opt] = $opt;
+					}
+				}
+			}
+		}		
+		if( empty( $legacy_fields ) && !isset($this->alter)) { // GS Fix for constraint impl
+			// Create the new table
+			$sql[] = $xmls->dict->CreateTableSQL( $this->name, $fldarray, $this->opts );
+			logMsg( end( $sql ), 'Generated CreateTableSQL' );
+		} else {
+			// Upgrade an existing table
+			logMsg( "Upgrading {$this->name} using '{$xmls->upgrade}'" );
+			switch( $xmls->upgrade ) {
+				// Use ChangeTableSQL
+				case 'ALTER':
+					logMsg( 'Generated ChangeTableSQL (ALTERing table)' );
+					$sql[] = $xmls->dict->ChangeTableSQL( $this->name, $fldarray, $this->opts, $this->alter ); // GS Fix for constraint impl
+					break;
+				case 'REPLACE':
+					logMsg( 'Doing upgrade REPLACE (testing)' );
+					$sql[] = $xmls->dict->DropTableSQL( $this->name );
+					$sql[] = $xmls->dict->CreateTableSQL( $this->name, $fldarray, $this->opts );
+					break;
+				// ignore table
+				default:
+					return array();
+			}
+		}
+		
+		foreach( $this->indexes as $index ) {
+			$sql[] = $index->create( $xmls );
+		}
+		
+		if( isset( $this->data ) ) {
+			$sql[] = $this->data->create( $xmls );
+		}
+		
+		return $sql;
+	}
+	
+	/**
+	* Marks a field or table for destruction
+	*/
+	function drop() {
+		if( isset( $this->current_field ) ) {
+			// Drop the current field
+			logMsg( "Dropping field '{$this->current_field}' from table '{$this->name}'" );
+			// $this->drop_field[$this->current_field] = $xmls->dict->DropColumnSQL( $this->name, $this->current_field );
+			$this->drop_field[$this->current_field] = $this->current_field;
+		} else {
+			// Drop the current table
+			logMsg( "Dropping table '{$this->name}'" );
+			// $this->drop_table = $xmls->dict->DropTableSQL( $this->name );
+			$this->drop_table = TRUE;
+		}
+	}
+}
+
+/**
+* Creates an index object in ADOdb's datadict format
+*
+* This class stores information about a database index. As charactaristics
+* of the index are loaded from the external source, methods and properties
+* of this class are used to build up the index description in ADOdb's
+* datadict format.
+*
+* @package axmls
+* @access private
+*/
+class dbIndex extends dbObject {
+	
+	/**
+	* @var string	Index name
+	*/
+	var $name;
+	
+	/**
+	* @var array	Index options: Index-level options
+	*/
+	var $opts = array();
+	
+	/**
+	* @var array	Indexed fields: Table columns included in this index
+	*/
+	var $columns = array();
+	
+	/**
+	* @var boolean Mark index for destruction
+	* @access private
+	*/
+	var $drop = FALSE;
+	
+	/**
+	* Initializes the new dbIndex object.
+	*
+	* @param object $parent Parent object
+	* @param array $attributes Attributes
+	*
+	* @internal
+	*/
+	function dbIndex( &$parent, $attributes = NULL ) {
+		$this->parent =& $parent;
+		
+		$this->name = $this->prefix ($attributes['NAME']);
+	}
+	
+	/**
+	* XML Callback to process start elements
+	*
+	* Processes XML opening tags. 
+	* Elements currently processed are: DROP, CLUSTERED, BITMAP, UNIQUE, FULLTEXT & HASH. 
+	*
+	* @access private
+	*/
+	function _tag_open( &$parser, $tag, $attributes ) {
+		$this->currentElement = strtoupper( $tag );
+		
+		switch( $this->currentElement ) {
+			case 'DROP':
+				$this->drop();
+				break;
+			case 'CLUSTERED':
+			case 'BITMAP':
+			case 'UNIQUE':
+			case 'FULLTEXT':
+			case 'HASH':
+				// Add index Option
+				$this->addIndexOpt( $this->currentElement );
+				break;
+			default:
+				// print_r( array( $tag, $attributes ) );
+		}
+	}
+	
+	/**
+	* XML Callback to process CDATA elements
+	*
+	* Processes XML cdata.
+	*
+	* @access private
+	*/
+	function _tag_cdata( &$parser, $cdata ) {
+		switch( $this->currentElement ) {
+			// Index field name
+			case 'COL':
+				$this->addField( $cdata );
+				break;
+			default:
+				
+		}
+	}
+	
+	/**
+	* XML Callback to process end elements
+	*
+	* @access private
+	*/
+	function _tag_close( &$parser, $tag ) {
+		$this->currentElement = '';
+		
+		switch( strtoupper( $tag ) ) {
+			case 'INDEX':
+				xml_set_object( $parser, $this->parent );
+				break;
+		}
+	}
+	
+	/**
+	* Adds a field to the index
+	*
+	* @param string $name Field name
+	* @return string Field list
+	*/
+	function addField( $name ) {
+		$this->columns[$this->FieldID( $name )] = $name;
+		
+		// Return the field list
+		return $this->columns;
+	}
+	
+	/**
+	* Adds options to the index
+	*
+	* @param string $opt Comma-separated list of index options.
+	* @return string Option list
+	*/
+	function addIndexOpt( $opt ) {
+		$this->opts[] = $opt;
+		
+		// Return the options list
+		return $this->opts;
+	}
+	
+	/**
+	* Generates the SQL that will create the index in the database
+	*
+	* @param object $xmls adoSchema object
+	* @return array Array containing index creation SQL
+	*/
+	function create( &$xmls ) {
+		if( $this->drop ) {
+			return NULL;
+		}
+		
+		// eliminate any columns that aren't in the table
+		foreach( $this->columns as $id => $col ) {
+			if( !isset( $this->parent->fields[$id] ) ) {
+				unset( $this->columns[$id] );
+			}
+		}
+		
+		return $xmls->dict->CreateIndexSQL( $this->name, $this->parent->name, $this->columns, $this->opts );
+	}
+	
+	/**
+	* Marks an index for destruction
+	*/
+	function drop() {
+		$this->drop = TRUE;
+	}
+}
+
+/**
+* Creates a data object in ADOdb's datadict format
+*
+* This class stores information about table data.
+*
+* @package axmls
+* @access private
+*/
+class dbData extends dbObject {
+	
+	var $data = array();
+	
+	var $row;
+	
+	/**
+	* Initializes the new dbIndex object.
+	*
+	* @param object $parent Parent object
+	* @param array $attributes Attributes
+	*
+	* @internal
+	*/
+	function dbData( &$parent, $attributes = NULL ) {
+		$this->parent =& $parent;
+	}
+	
+	/**
+	* XML Callback to process start elements
+	*
+	* Processes XML opening tags. 
+	* Elements currently processed are: DROP, CLUSTERED, BITMAP, UNIQUE, FULLTEXT & HASH. 
+	*
+	* @access private
+	*/
+	function _tag_open( &$parser, $tag, $attributes ) {
+		$this->currentElement = strtoupper( $tag );
+		
+		switch( $this->currentElement ) {
+			case 'ROW':
+				$this->row = count( $this->data );
+				$this->data[$this->row] = array();
+				break;
+			case 'F':
+				$this->addField($attributes);
+			default:
+				// print_r( array( $tag, $attributes ) );
+		}
+	}
+	
+	/**
+	* XML Callback to process CDATA elements
+	*
+	* Processes XML cdata.
+	*
+	* @access private
+	*/
+	function _tag_cdata( &$parser, $cdata ) {
+		switch( $this->currentElement ) {
+			// Index field name
+			case 'F':
+				$this->addData( $cdata );
+				break;
+			default:
+				
+		}
+	}
+	
+	/**
+	* XML Callback to process end elements
+	*
+	* @access private
+	*/
+	function _tag_close( &$parser, $tag ) {
+		$this->currentElement = '';
+		
+		switch( strtoupper( $tag ) ) {
+			case 'DATA':
+				xml_set_object( $parser, $this->parent );
+				break;
+		}
+	}
+	
+	/**
+	* Adds a field to the index
+	*
+	* @param string $name Field name
+	* @return string Field list
+	*/
+	function addField( $attributes ) {
+		if( isset( $attributes['NAME'] ) ) {
+			$name = $attributes['NAME'];
+		} else {
+			$name = count($this->data[$this->row]);
+		}
+		
+		// Set the field index so we know where we are
+		$this->current_field = $this->FieldID( $name );
+	}
+	
+	/**
+	* Adds options to the index
+	*
+	* @param string $opt Comma-separated list of index options.
+	* @return string Option list
+	*/
+	function addData( $cdata ) {
+		if( !isset( $this->data[$this->row] ) ) {
+			$this->data[$this->row] = array();
+		}
+		
+		if( !isset( $this->data[$this->row][$this->current_field] ) ) {
+			$this->data[$this->row][$this->current_field] = '';
+		}
+		
+		$this->data[$this->row][$this->current_field] .= $cdata;
+	}
+	
+	/**
+	* Generates the SQL that will create the index in the database
+	*
+	* @param object $xmls adoSchema object
+	* @return array Array containing index creation SQL
+	*/
+	function create( &$xmls ) {
+		$table = $xmls->dict->TableName($this->parent->name);
+		$table_field_count = count($this->parent->fields);
+		$sql = array();
+		
+		// eliminate any columns that aren't in the table
+		foreach( $this->data as $row ) {
+			$table_fields = $this->parent->fields;
+			$fields = array();
+			
+			foreach( $row as $field_id => $field_data ) {
+				if( !array_key_exists( $field_id, $table_fields ) ) {
+					if( is_numeric( $field_id ) ) {
+						$field_id = reset( array_keys( $table_fields ) );
+					} else {
+						continue;
+					}
+				}
+				
+				$name = $table_fields[$field_id]['NAME'];
+				
+				switch( $table_fields[$field_id]['TYPE'] ) {
+					case 'C':
+					case 'C2':
+					case 'X':
+					case 'X2':
+						$fields[$name] = $xmls->db->qstr( $field_data );
+						break;
+					case 'I':
+					case 'I1':
+					case 'I2':
+					case 'I4':
+					case 'I8':
+						$fields[$name] = intval($field_data);
+						break;
+					default:
+						$fields[$name] = $field_data;
+				}
+				
+				unset($table_fields[$field_id]);
+			}
+			
+			// check that at least 1 column is specified
+			if( empty( $fields ) ) {
+				continue;
+			}
+			
+			// check that no required columns are missing
+			if( count( $fields ) < $table_field_count ) {
+				foreach( $table_fields as $field ) {
+					if (isset( $field['OPTS'] ))
+						if( ( in_array( 'NOTNULL', $field['OPTS'] ) || in_array( 'KEY', $field['OPTS'] ) ) && !in_array( 'AUTOINCREMENT', $field['OPTS'] ) ) {
+							continue(2);
+						}
+				}
+			}
+			
+			$sql[] = 'INSERT INTO '. $table .' ('. implode( ',', array_keys( $fields ) ) .') VALUES ('. implode( ',', $fields ) .')';
+		}
+		
+		return $sql;
+	}
+}
+
+/**
+* Creates the SQL to execute a list of provided SQL queries
+*
+* @package axmls
+* @access private
+*/
+class dbQuerySet extends dbObject {
+	
+	/**
+	* @var array	List of SQL queries
+	*/
+	var $queries = array();
+	
+	/**
+	* @var string	String used to build of a query line by line
+	*/
+	var $query;
+	
+	/**
+	* @var string	Query prefix key
+	*/
+	var $prefixKey = '';
+	
+	/**
+	* @var boolean	Auto prefix enable (TRUE)
+	*/
+	var $prefixMethod = 'AUTO';
+	
+	/**
+	* Initializes the query set.
+	*
+	* @param object $parent Parent object
+	* @param array $attributes Attributes
+	*/
+	function dbQuerySet( &$parent, $attributes = NULL ) {
+		$this->parent =& $parent;
+			
+		// Overrides the manual prefix key
+		if( isset( $attributes['KEY'] ) ) {
+			$this->prefixKey = $attributes['KEY'];
+		}
+		
+		$prefixMethod = isset( $attributes['PREFIXMETHOD'] ) ? strtoupper( trim( $attributes['PREFIXMETHOD'] ) ) : '';
+		
+		// Enables or disables automatic prefix prepending
+		switch( $prefixMethod ) {
+			case 'AUTO':
+				$this->prefixMethod = 'AUTO';
+				break;
+			case 'MANUAL':
+				$this->prefixMethod = 'MANUAL';
+				break;
+			case 'NONE':
+				$this->prefixMethod = 'NONE';
+				break;
+		}
+	}
+	
+	/**
+	* XML Callback to process start elements. Elements currently 
+	* processed are: QUERY. 
+	*
+	* @access private
+	*/
+	function _tag_open( &$parser, $tag, $attributes ) {
+		$this->currentElement = strtoupper( $tag );
+		
+		switch( $this->currentElement ) {
+			case 'QUERY':
+				// Create a new query in a SQL queryset.
+				// Ignore this query set if a platform is specified and it's different than the 
+				// current connection platform.
+				if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) ) {
+					$this->newQuery();
+				} else {
+					$this->discardQuery();
+				}
+				break;
+			default:
+				// print_r( array( $tag, $attributes ) );
+		}
+	}
+	
+	/**
+	* XML Callback to process CDATA elements
+	*/
+	function _tag_cdata( &$parser, $cdata ) {
+		switch( $this->currentElement ) {
+			// Line of queryset SQL data
+			case 'QUERY':
+				$this->buildQuery( $cdata );
+				break;
+			default:
+				
+		}
+	}
+	
+	/**
+	* XML Callback to process end elements
+	*
+	* @access private
+	*/
+	function _tag_close( &$parser, $tag ) {
+		$this->currentElement = '';
+		
+		switch( strtoupper( $tag ) ) {
+			case 'QUERY':
+				// Add the finished query to the open query set.
+				$this->addQuery();
+				break;
+			case 'SQL':
+				$this->parent->addSQL( $this->create( $this->parent ) );
+				xml_set_object( $parser, $this->parent );
+				$this->destroy();
+				break;
+			default:
+				
+		}
+	}
+	
+	/**
+	* Re-initializes the query.
+	*
+	* @return boolean TRUE
+	*/
+	function newQuery() {
+		$this->query = '';
+		
+		return TRUE;
+	}
+	
+	/**
+	* Discards the existing query.
+	*
+	* @return boolean TRUE
+	*/
+	function discardQuery() {
+		unset( $this->query );
+		
+		return TRUE;
+	}
+	
+	/** 
+	* Appends a line to a query that is being built line by line
+	*
+	* @param string $data Line of SQL data or NULL to initialize a new query
+	* @return string SQL query string.
+	*/
+	function buildQuery( $sql = NULL ) {
+		if( !isset( $this->query ) OR empty( $sql ) ) {
+			return FALSE;
+		}
+		
+		$this->query .= $sql;
+		
+		return $this->query;
+	}
+	
+	/**
+	* Adds a completed query to the query list
+	*
+	* @return string	SQL of added query
+	*/
+	function addQuery() {
+		if( !isset( $this->query ) ) {
+			return FALSE;
+		}
+		
+		$this->queries[] = $return = trim($this->query);
+		
+		unset( $this->query );
+		
+		return $return;
+	}
+	
+	/**
+	* Creates and returns the current query set
+	*
+	* @param object $xmls adoSchema object
+	* @return array Query set
+	*/
+	function create( &$xmls ) {
+		foreach( $this->queries as $id => $query ) {
+			switch( $this->prefixMethod ) {
+				case 'AUTO':
+					// Enable auto prefix replacement
+					
+					// Process object prefix.
+					// Evaluate SQL statements to prepend prefix to objects
+					$query = $this->prefixQuery( '/^\s*((?is)INSERT\s+(INTO\s+)?)((\w+\s*,?\s*)+)(\s.*$)/', $query, $xmls->objectPrefix );
+					$query = $this->prefixQuery( '/^\s*((?is)UPDATE\s+(FROM\s+)?)((\w+\s*,?\s*)+)(\s.*$)/', $query, $xmls->objectPrefix );
+					$query = $this->prefixQuery( '/^\s*((?is)DELETE\s+(FROM\s+)?)((\w+\s*,?\s*)+)(\s.*$)/', $query, $xmls->objectPrefix );
+					
+					// SELECT statements aren't working yet
+					#$data = preg_replace( '/(?ias)(^\s*SELECT\s+.*\s+FROM)\s+(\W\s*,?\s*)+((?i)\s+WHERE.*$)/', "\1 $prefix\2 \3", $data );
+					
+				case 'MANUAL':
+					// If prefixKey is set and has a value then we use it to override the default constant XMLS_PREFIX.
+					// If prefixKey is not set, we use the default constant XMLS_PREFIX
+					if( isset( $this->prefixKey ) AND( $this->prefixKey !== '' ) ) {
+						// Enable prefix override
+						$query = str_replace( $this->prefixKey, $xmls->objectPrefix, $query );
+					} else {
+						// Use default replacement
+						$query = str_replace( XMLS_PREFIX , $xmls->objectPrefix, $query );
+					}
+			}
+			
+			$this->queries[$id] = trim( $query );
+		}
+		
+		// Return the query set array
+		return $this->queries;
+	}
+	
+	/**
+	* Rebuilds the query with the prefix attached to any objects
+	*
+	* @param string $regex Regex used to add prefix
+	* @param string $query SQL query string
+	* @param string $prefix Prefix to be appended to tables, indices, etc.
+	* @return string Prefixed SQL query string.
+	*/
+	function prefixQuery( $regex, $query, $prefix = NULL ) {
+		if( !isset( $prefix ) ) {
+			return $query;
+		}
+		
+		if( preg_match( $regex, $query, $match ) ) {
+			$preamble = $match[1];
+			$postamble = $match[5];
+			$objectList = explode( ',', $match[3] );
+			// $prefix = $prefix . '_';
+			
+			$prefixedList = '';
+			
+			foreach( $objectList as $object ) {
+				if( $prefixedList !== '' ) {
+					$prefixedList .= ', ';
+				}
+				
+				$prefixedList .= $prefix . trim( $object );
+			}
+			
+			$query = $preamble . ' ' . $prefixedList . ' ' . $postamble;
+		}
+		
+		return $query;
+	}
+}
+
+/**
+* Loads and parses an XML file, creating an array of "ready-to-run" SQL statements
+* 
+* This class is used to load and parse the XML file, to create an array of SQL statements
+* that can be used to build a database, and to build the database using the SQL array.
+*
+* @tutorial getting_started.pkg
+*
+* @author Richard Tango-Lowy & Dan Cech
+* @version $Revision: 1.12 $
+*
+* @package axmls
+*/
+class adoSchema {
+	
+	/**
+	* @var array	Array containing SQL queries to generate all objects
+	* @access private
+	*/
+	var $sqlArray;
+	
+	/**
+	* @var object	ADOdb connection object
+	* @access private
+	*/
+	var $db;
+	
+	/**
+	* @var object	ADOdb Data Dictionary
+	* @access private
+	*/
+	var $dict;
+	
+	/**
+	* @var string Current XML element
+	* @access private
+	*/
+	var $currentElement = '';
+	
+	/**
+	* @var string If set (to 'ALTER' or 'REPLACE'), upgrade an existing database
+	* @access private
+	*/
+	var $upgrade = '';
+	
+	/**
+	* @var string Optional object prefix
+	* @access private
+	*/
+	var $objectPrefix = '';
+	
+	/**
+	* @var long	Original Magic Quotes Runtime value
+	* @access private
+	*/
+	var $mgq;
+	
+	/**
+	* @var long	System debug
+	* @access private
+	*/
+	var $debug;
+	
+	/**
+	* @var string Regular expression to find schema version
+	* @access private
+	*/
+	var $versionRegex = '/<schema.*?( version="([^"]*)")?.*?>/';
+	
+	/**
+	* @var string Current schema version
+	* @access private
+	*/
+	var $schemaVersion;
+	
+	/**
+	* @var int	Success of last Schema execution
+	*/
+	var $success;
+	
+	/**
+	* @var bool	Execute SQL inline as it is generated
+	*/
+	var $executeInline;
+	
+	/**
+	* @var bool	Continue SQL execution if errors occur
+	*/
+	var $continueOnError;
+	
+	/**
+	* Creates an adoSchema object
+	*
+	* Creating an adoSchema object is the first step in processing an XML schema.
+	* The only parameter is an ADOdb database connection object, which must already
+	* have been created.
+	*
+	* @param object $db ADOdb database connection object.
+	*/
+	function adoSchema( &$db ) {
+		// Initialize the environment
+		$this->mgq = get_magic_quotes_runtime();
+		set_magic_quotes_runtime(0);
+		
+		$this->db =& $db;
+		$this->debug = $this->db->debug;
+		$this->dict = NewDataDictionary( $this->db );
+		$this->sqlArray = array();
+		$this->schemaVersion = XMLS_SCHEMA_VERSION;
+		$this->executeInline( XMLS_EXECUTE_INLINE );
+		$this->continueOnError( XMLS_CONTINUE_ON_ERROR );
+		$this->setUpgradeMethod();
+	}
+	
+	/**
+	* Sets the method to be used for upgrading an existing database
+	*
+	* Use this method to specify how existing database objects should be upgraded.
+	* The method option can be set to ALTER, REPLACE, BEST, or NONE. ALTER attempts to
+	* alter each database object directly, REPLACE attempts to rebuild each object
+	* from scratch, BEST attempts to determine the best upgrade method for each
+	* object, and NONE disables upgrading.
+	*
+	* This method is not yet used by AXMLS, but exists for backward compatibility.
+	* The ALTER method is automatically assumed when the adoSchema object is
+	* instantiated; other upgrade methods are not currently supported.
+	*
+	* @param string $method Upgrade method (ALTER|REPLACE|BEST|NONE)
+	* @returns string Upgrade method used
+	*/
+	function SetUpgradeMethod( $method = '' ) {
+		if( !is_string( $method ) ) {
+			return FALSE;
+		}
+		
+		$method = strtoupper( $method );
+		
+		// Handle the upgrade methods
+		switch( $method ) {
+			case 'ALTER':
+				$this->upgrade = $method;
+				break;
+			case 'REPLACE':
+				$this->upgrade = $method;
+				break;
+			case 'BEST':
+				$this->upgrade = 'ALTER';
+				break;
+			case 'NONE':
+				$this->upgrade = 'NONE';
+				break;
+			default:
+				// Use default if no legitimate method is passed.
+				$this->upgrade = XMLS_DEFAULT_UPGRADE_METHOD;
+		}
+		
+		return $this->upgrade;
+	}
+	
+	/**
+	* Enables/disables inline SQL execution.
+	*
+	* Call this method to enable or disable inline execution of the schema. If the mode is set to TRUE (inline execution),
+	* AXMLS applies the SQL to the database immediately as each schema entity is parsed. If the mode
+	* is set to FALSE (post execution), AXMLS parses the entire schema and you will need to call adoSchema::ExecuteSchema()
+	* to apply the schema to the database.
+	*
+	* @param bool $mode execute
+	* @return bool current execution mode
+	*
+	* @see ParseSchema(), ExecuteSchema()
+	*/
+	function ExecuteInline( $mode = NULL ) {
+		if( is_bool( $mode ) ) {
+			$this->executeInline = $mode;
+		}
+		
+		return $this->executeInline;
+	}
+	
+	/**
+	* Enables/disables SQL continue on error.
+	*
+	* Call this method to enable or disable continuation of SQL execution if an error occurs.
+	* If the mode is set to TRUE (continue), AXMLS will continue to apply SQL to the database, even if an error occurs.
+	* If the mode is set to FALSE (halt), AXMLS will halt execution of generated sql if an error occurs, though parsing
+	* of the schema will continue.
+	*
+	* @param bool $mode execute
+	* @return bool current continueOnError mode
+	*
+	* @see addSQL(), ExecuteSchema()
+	*/
+	function ContinueOnError( $mode = NULL ) {
+		if( is_bool( $mode ) ) {
+			$this->continueOnError = $mode;
+		}
+		
+		return $this->continueOnError;
+	}
+	
+	/**
+	* Loads an XML schema from a file and converts it to SQL.
+	*
+	* Call this method to load the specified schema (see the DTD for the proper format) from
+	* the filesystem and generate the SQL necessary to create the database described. 
+	* @see ParseSchemaString()
+	*
+	* @param string $file Name of XML schema file.
+	* @param bool $returnSchema Return schema rather than parsing.
+	* @return array Array of SQL queries, ready to execute
+	*/
+	function ParseSchema( $filename, $returnSchema = FALSE ) {
+		return $this->ParseSchemaString( $this->ConvertSchemaFile( $filename ), $returnSchema );
+	}
+	
+	/**
+	* Loads an XML schema from a file and converts it to SQL.
+	*
+	* Call this method to load the specified schema from a file (see the DTD for the proper format) 
+	* and generate the SQL necessary to create the database described by the schema.
+	*
+	* @param string $file Name of XML schema file.
+	* @param bool $returnSchema Return schema rather than parsing.
+	* @return array Array of SQL queries, ready to execute.
+	*
+	* @deprecated Replaced by adoSchema::ParseSchema() and adoSchema::ParseSchemaString()
+	* @see ParseSchema(), ParseSchemaString()
+	*/
+	function ParseSchemaFile( $filename, $returnSchema = FALSE ) {
+		// Open the file
+		if( !($fp = fopen( $filename, 'r' )) ) {
+			// die( 'Unable to open file' );
+			return FALSE;
+		}
+		
+		// do version detection here
+		if( $this->SchemaFileVersion( $filename ) != $this->schemaVersion ) {
+			return FALSE;
+		}
+		
+		if ( $returnSchema )
+		{
+			$xmlstring = '';
+			while( $data = fread( $fp, 100000 ) ) {
+				$xmlstring .= $data;
+			}
+			return $xmlstring;
+		}
+		
+		$this->success = 2;
+		
+		$xmlParser = $this->create_parser();
+		
+		// Process the file
+		while( $data = fread( $fp, 4096 ) ) {
+			if( !xml_parse( $xmlParser, $data, feof( $fp ) ) ) {
+				die( sprintf(
+					"XML error: %s at line %d",
+					xml_error_string( xml_get_error_code( $xmlParser) ),
+					xml_get_current_line_number( $xmlParser)
+				) );
+			}
+		}
+		
+		xml_parser_free( $xmlParser );
+		
+		return $this->sqlArray;
+	}
+	
+	/**
+	* Converts an XML schema string to SQL.
+	*
+	* Call this method to parse a string containing an XML schema (see the DTD for the proper format)
+	* and generate the SQL necessary to create the database described by the schema. 
+	* @see ParseSchema()
+	*
+	* @param string $xmlstring XML schema string.
+	* @param bool $returnSchema Return schema rather than parsing.
+	* @return array Array of SQL queries, ready to execute.
+	*/
+	function ParseSchemaString( $xmlstring, $returnSchema = FALSE ) {
+		if( !is_string( $xmlstring ) OR empty( $xmlstring ) ) {
+			return FALSE;
+		}
+		
+		// do version detection here
+		if( $this->SchemaStringVersion( $xmlstring ) != $this->schemaVersion ) {
+			return FALSE;
+		}
+		
+		if ( $returnSchema )
+		{
+			return $xmlstring;
+		}
+		
+		$this->success = 2;
+		
+		$xmlParser = $this->create_parser();
+		
+		if( !xml_parse( $xmlParser, $xmlstring, TRUE ) ) {
+			die( sprintf(
+				"XML error: %s at line %d",
+				xml_error_string( xml_get_error_code( $xmlParser) ),
+				xml_get_current_line_number( $xmlParser)
+			) );
+		}
+		
+		xml_parser_free( $xmlParser );
+		
+		return $this->sqlArray;
+	}
+	
+	/**
+	* Loads an XML schema from a file and converts it to uninstallation SQL.
+	*
+	* Call this method to load the specified schema (see the DTD for the proper format) from
+	* the filesystem and generate the SQL necessary to remove the database described.
+	* @see RemoveSchemaString()
+	*
+	* @param string $file Name of XML schema file.
+	* @param bool $returnSchema Return schema rather than parsing.
+	* @return array Array of SQL queries, ready to execute
+	*/
+	function RemoveSchema( $filename, $returnSchema = FALSE ) {
+		return $this->RemoveSchemaString( $this->ConvertSchemaFile( $filename ), $returnSchema );
+	}
+	
+	/**
+	* Converts an XML schema string to uninstallation SQL.
+	*
+	* Call this method to parse a string containing an XML schema (see the DTD for the proper format)
+	* and generate the SQL necessary to uninstall the database described by the schema. 
+	* @see RemoveSchema()
+	*
+	* @param string $schema XML schema string.
+	* @param bool $returnSchema Return schema rather than parsing.
+	* @return array Array of SQL queries, ready to execute.
+	*/
+	function RemoveSchemaString( $schema, $returnSchema = FALSE ) {
+		
+		// grab current version
+		if( !( $version = $this->SchemaStringVersion( $schema ) ) ) {
+			return FALSE;
+		}
+		
+		return $this->ParseSchemaString( $this->TransformSchema( $schema, 'remove-' . $version), $returnSchema );
+	}
+	
+	/**
+	* Applies the current XML schema to the database (post execution).
+	*
+	* Call this method to apply the current schema (generally created by calling 
+	* ParseSchema() or ParseSchemaString() ) to the database (creating the tables, indexes, 
+	* and executing other SQL specified in the schema) after parsing.
+	* @see ParseSchema(), ParseSchemaString(), ExecuteInline()
+	*
+	* @param array $sqlArray Array of SQL statements that will be applied rather than
+	*		the current schema.
+	* @param boolean $continueOnErr Continue to apply the schema even if an error occurs.
+	* @returns integer 0 if failure, 1 if errors, 2 if successful.
+	*/
+	function ExecuteSchema( $sqlArray = NULL, $continueOnErr =  NULL ) {
+		if( !is_bool( $continueOnErr ) ) {
+			$continueOnErr = $this->ContinueOnError();
+		}
+		
+		if( !isset( $sqlArray ) ) {
+			$sqlArray = $this->sqlArray;
+		}
+		
+		if( !is_array( $sqlArray ) ) {
+			$this->success = 0;
+		} else {
+			$this->success = $this->dict->ExecuteSQLArray( $sqlArray, $continueOnErr );
+		}
+		
+		return $this->success;
+	}
+	
+	/**
+	* Returns the current SQL array. 
+	*
+	* Call this method to fetch the array of SQL queries resulting from 
+	* ParseSchema() or ParseSchemaString(). 
+	*
+	* @param string $format Format: HTML, TEXT, or NONE (PHP array)
+	* @return array Array of SQL statements or FALSE if an error occurs
+	*/
+	function PrintSQL( $format = 'NONE' ) {
+		$sqlArray = null;
+		return $this->getSQL( $format, $sqlArray );
+	}
+	
+	/**
+	* Saves the current SQL array to the local filesystem as a list of SQL queries.
+	*
+	* Call this method to save the array of SQL queries (generally resulting from a
+	* parsed XML schema) to the filesystem.
+	*
+	* @param string $filename Path and name where the file should be saved.
+	* @return boolean TRUE if save is successful, else FALSE. 
+	*/
+	function SaveSQL( $filename = './schema.sql' ) {
+		
+		if( !isset( $sqlArray ) ) {
+			$sqlArray = $this->sqlArray;
+		}
+		if( !isset( $sqlArray ) ) {
+			return FALSE;
+		}
+		
+		$fp = fopen( $filename, "w" );
+		
+		foreach( $sqlArray as $key => $query ) {
+			fwrite( $fp, $query . ";\n" );
+		}
+		fclose( $fp );
+	}
+	
+	/**
+	* Create an xml parser
+	*
+	* @return object PHP XML parser object
+	*
+	* @access private
+	*/
+	function &create_parser() {
+		// Create the parser
+		$xmlParser = xml_parser_create();
+		xml_set_object( $xmlParser, $this );
+		
+		// Initialize the XML callback functions
+		xml_set_element_handler( $xmlParser, '_tag_open', '_tag_close' );
+		xml_set_character_data_handler( $xmlParser, '_tag_cdata' );
+		
+		return $xmlParser;
+	}
+	
+	/**
+	* XML Callback to process start elements
+	*
+	* @access private
+	*/
+	function _tag_open( &$parser, $tag, $attributes ) {
+		switch( strtoupper( $tag ) ) {
+			case 'TABLE':
+				$this->obj = new dbTable( $this, $attributes );
+				xml_set_object( $parser, $this->obj );
+				break;
+			case 'SQL':
+				if( !isset( $attributes['PLATFORM'] ) OR $this->supportedPlatform( $attributes['PLATFORM'] ) ) {
+					$this->obj = new dbQuerySet( $this, $attributes );
+					xml_set_object( $parser, $this->obj );
+				}
+				break;
+			default:
+				// print_r( array( $tag, $attributes ) );
+		}
+		
+	}
+	
+	/**
+	* XML Callback to process CDATA elements
+	*
+	* @access private
+	*/
+	function _tag_cdata( &$parser, $cdata ) {
+	}
+	
+	/**
+	* XML Callback to process end elements
+	*
+	* @access private
+	* @internal
+	*/
+	function _tag_close( &$parser, $tag ) {
+		
+	}
+	
+	/**
+	* Converts an XML schema string to the specified DTD version.
+	*
+	* Call this method to convert a string containing an XML schema to a different AXMLS
+	* DTD version. For instance, to convert a schema created for an pre-1.0 version for 
+	* AXMLS (DTD version 0.1) to a newer version of the DTD (e.g. 0.2). If no DTD version 
+	* parameter is specified, the schema will be converted to the current DTD version. 
+	* If the newFile parameter is provided, the converted schema will be written to the specified
+	* file.
+	* @see ConvertSchemaFile()
+	*
+	* @param string $schema String containing XML schema that will be converted.
+	* @param string $newVersion DTD version to convert to.
+	* @param string $newFile File name of (converted) output file.
+	* @return string Converted XML schema or FALSE if an error occurs.
+	*/
+	function ConvertSchemaString( $schema, $newVersion = NULL, $newFile = NULL ) {
+		
+		// grab current version
+		if( !( $version = $this->SchemaStringVersion( $schema ) ) ) {
+			return FALSE;
+		}
+		
+		if( !isset ($newVersion) ) {
+			$newVersion = $this->schemaVersion;
+		}
+		
+		if( $version == $newVersion ) {
+			$result = $schema;
+		} else {
+			$result = $this->TransformSchema( $schema, 'convert-' . $version . '-' . $newVersion);
+		}
+		
+		if( is_string( $result ) AND is_string( $newFile ) AND ( $fp = fopen( $newFile, 'w' ) ) ) {
+			fwrite( $fp, $result );
+			fclose( $fp );
+		}
+		
+		return $result;
+	}
+	
+	// compat for pre-4.3 - jlim
+	function _file_get_contents($path)
+	{
+		if (function_exists('file_get_contents')) return file_get_contents($path);
+		return join('',file($path));
+	}
+	
+	/**
+	* Converts an XML schema file to the specified DTD version.
+	*
+	* Call this method to convert the specified XML schema file to a different AXMLS
+	* DTD version. For instance, to convert a schema created for an pre-1.0 version for 
+	* AXMLS (DTD version 0.1) to a newer version of the DTD (e.g. 0.2). If no DTD version 
+	* parameter is specified, the schema will be converted to the current DTD version. 
+	* If the newFile parameter is provided, the converted schema will be written to the specified
+	* file.
+	* @see ConvertSchemaString()
+	*
+	* @param string $filename Name of XML schema file that will be converted.
+	* @param string $newVersion DTD version to convert to.
+	* @param string $newFile File name of (converted) output file.
+	* @return string Converted XML schema or FALSE if an error occurs.
+	*/
+	function ConvertSchemaFile( $filename, $newVersion = NULL, $newFile = NULL ) {
+		
+		// grab current version
+		if( !( $version = $this->SchemaFileVersion( $filename ) ) ) {
+			return FALSE;
+		}
+		
+		if( !isset ($newVersion) ) {
+			$newVersion = $this->schemaVersion;
+		}
+		
+		if( $version == $newVersion ) {
+			$result = _file_get_contents( $filename );
+			
+			// remove unicode BOM if present
+			if( substr( $result, 0, 3 ) == sprintf( '%c%c%c', 239, 187, 191 ) ) {
+				$result = substr( $result, 3 );
+			}
+		} else {
+			$result = $this->TransformSchema( $filename, 'convert-' . $version . '-' . $newVersion, 'file' );
+		}
+		
+		if( is_string( $result ) AND is_string( $newFile ) AND ( $fp = fopen( $newFile, 'w' ) ) ) {
+			fwrite( $fp, $result );
+			fclose( $fp );
+		}
+		
+		return $result;
+	}
+	
+	function TransformSchema( $schema, $xsl, $schematype='string' )
+	{
+		// Fail if XSLT extension is not available
+		if( ! function_exists( 'xslt_create' ) ) {
+			return FALSE;
+		}
+		
+		$xsl_file = dirname( __FILE__ ) . '/xsl/' . $xsl . '.xsl';
+		
+		// look for xsl
+		if( !is_readable( $xsl_file ) ) {
+			return FALSE;
+		}
+		
+		switch( $schematype )
+		{
+			case 'file':
+				if( !is_readable( $schema ) ) {
+					return FALSE;
+				}
+				
+				$schema = _file_get_contents( $schema );
+				break;
+			case 'string':
+			default:
+				if( !is_string( $schema ) ) {
+					return FALSE;
+				}
+		}
+		
+		$arguments = array (
+			'/_xml' => $schema,
+			'/_xsl' => _file_get_contents( $xsl_file )
+		);
+		
+		// create an XSLT processor
+		$xh = xslt_create ();
+		
+		// set error handler
+		xslt_set_error_handler ($xh, array (&$this, 'xslt_error_handler'));
+		
+		// process the schema
+		$result = xslt_process ($xh, 'arg:/_xml', 'arg:/_xsl', NULL, $arguments); 
+		
+		xslt_free ($xh);
+		
+		return $result;
+	}
+	
+	/**
+	* Processes XSLT transformation errors
+	*
+	* @param object $parser XML parser object
+	* @param integer $errno Error number
+	* @param integer $level Error level
+	* @param array $fields Error information fields
+	*
+	* @access private
+	*/
+	function xslt_error_handler( $parser, $errno, $level, $fields ) {
+		if( is_array( $fields ) ) {
+			$msg = array(
+				'Message Type' => ucfirst( $fields['msgtype'] ),
+				'Message Code' => $fields['code'],
+				'Message' => $fields['msg'],
+				'Error Number' => $errno,
+				'Level' => $level
+			);
+			
+			switch( $fields['URI'] ) {
+				case 'arg:/_xml':
+					$msg['Input'] = 'XML';
+					break;
+				case 'arg:/_xsl':
+					$msg['Input'] = 'XSL';
+					break;
+				default:
+					$msg['Input'] = $fields['URI'];
+			}
+			
+			$msg['Line'] = $fields['line'];
+		} else {
+			$msg = array(
+				'Message Type' => 'Error',
+				'Error Number' => $errno,
+				'Level' => $level,
+				'Fields' => var_export( $fields, TRUE )
+			);
+		}
+		
+		$error_details = $msg['Message Type'] . ' in XSLT Transformation' . "\n"
+					   . '<table>' . "\n";
+		
+		foreach( $msg as $label => $details ) {
+			$error_details .= '<tr><td><b>' . $label . ': </b></td><td>' . htmlentities( $details ) . '</td></tr>' . "\n";
+		}
+		
+		$error_details .= '</table>';
+		
+		trigger_error( $error_details, E_USER_ERROR );
+	}
+	
+	/**
+	* Returns the AXMLS Schema Version of the requested XML schema file.
+	*
+	* Call this method to obtain the AXMLS DTD version of the requested XML schema file.
+	* @see SchemaStringVersion()
+	*
+	* @param string $filename AXMLS schema file
+	* @return string Schema version number or FALSE on error
+	*/
+	function SchemaFileVersion( $filename ) {
+		// Open the file
+		if( !($fp = fopen( $filename, 'r' )) ) {
+			// die( 'Unable to open file' );
+			return FALSE;
+		}
+		
+		// Process the file
+		while( $data = fread( $fp, 4096 ) ) {
+			if( preg_match( $this->versionRegex, $data, $matches ) ) {
+				return !empty( $matches[2] ) ? $matches[2] : XMLS_DEFAULT_SCHEMA_VERSION;
+			}
+		}
+		
+		return FALSE;
+	}
+	
+	/**
+	* Returns the AXMLS Schema Version of the provided XML schema string.
+	*
+	* Call this method to obtain the AXMLS DTD version of the provided XML schema string.
+	* @see SchemaFileVersion()
+	*
+	* @param string $xmlstring XML schema string
+	* @return string Schema version number or FALSE on error
+	*/
+	function SchemaStringVersion( $xmlstring ) {
+		if( !is_string( $xmlstring ) OR empty( $xmlstring ) ) {
+			return FALSE;
+		}
+		
+		if( preg_match( $this->versionRegex, $xmlstring, $matches ) ) {
+			return !empty( $matches[2] ) ? $matches[2] : XMLS_DEFAULT_SCHEMA_VERSION;
+		}
+		
+		return FALSE;
+	}
+	
+	/**
+	* Extracts an XML schema from an existing database.
+	*
+	* Call this method to create an XML schema string from an existing database.
+	* If the data parameter is set to TRUE, AXMLS will include the data from the database
+	* in the schema. 
+	*
+	* @param boolean $data Include data in schema dump
+	* @return string Generated XML schema
+	*/
+	function ExtractSchema( $data = FALSE ) {
+		$old_mode = $this->db->SetFetchMode( ADODB_FETCH_NUM );
+		
+		$schema = '<?xml version="1.0"?>' . "\n"
+				. '<schema version="' . $this->schemaVersion . '">' . "\n";
+		
+		if( is_array( $tables = $this->db->MetaTables( 'TABLES' ) ) ) {
+			foreach( $tables as $table ) {
+				$schema .= '	<table name="' . $table . '">' . "\n";
+				
+				// grab details from database
+				$rs = $this->db->Execute( 'SELECT * FROM ' . $table . ' WHERE 1=1' );
+				$fields = $this->db->MetaColumns( $table );
+				$indexes = $this->db->MetaIndexes( $table );
+				
+				if( is_array( $fields ) ) {
+					foreach( $fields as $details ) {
+						$extra = '';
+						$content = array();
+						
+						if( $details->max_length > 0 ) {
+							$extra .= ' size="' . $details->max_length . '"';
+						}
+						
+						if( $details->primary_key ) {
+							$content[] = '<KEY/>';
+						} elseif( $details->not_null ) {
+							$content[] = '<NOTNULL/>';
+						}
+						
+						if( $details->has_default ) {
+							$content[] = '<DEFAULT value="' . $details->default_value . '"/>';
+						}
+						
+						if( $details->auto_increment ) {
+							$content[] = '<AUTOINCREMENT/>';
+						}
+						
+						// this stops the creation of 'R' columns,
+						// AUTOINCREMENT is used to create auto columns
+						$details->primary_key = 0;
+						$type = $rs->MetaType( $details );
+						
+						$schema .= '		<field name="' . $details->name . '" type="' . $type . '"' . $extra . '>';
+						
+						if( !empty( $content ) ) {
+							$schema .= "\n			" . implode( "\n			", $content ) . "\n		";
+						}
+						
+						$schema .= '</field>' . "\n";
+					}
+				}
+				
+				if( is_array( $indexes ) ) {
+					foreach( $indexes as $index => $details ) {
+						$schema .= '		<index name="' . $index . '">' . "\n";
+						
+						if( $details['unique'] ) {
+							$schema .= '			<UNIQUE/>' . "\n";
+						}
+						
+						foreach( $details['columns'] as $column ) {
+							$schema .= '			<col>' . $column . '</col>' . "\n";
+						}
+						
+						$schema .= '		</index>' . "\n";
+					}
+				}
+				
+				if( $data ) {
+					$rs = $this->db->Execute( 'SELECT * FROM ' . $table );
+					
+					if( is_object( $rs ) ) {
+						$schema .= '		<data>' . "\n";
+						
+						while( $row = $rs->FetchRow() ) {
+							foreach( $row as $key => $val ) {
+								$row[$key] = htmlentities($val);
+							}
+							
+							$schema .= '			<row><f>' . implode( '</f><f>', $row ) . '</f></row>' . "\n";
+						}
+						
+						$schema .= '		</data>' . "\n";
+					}
+				}
+				
+				$schema .= '	</table>' . "\n";
+			}
+		}
+		
+		$this->db->SetFetchMode( $old_mode );
+		
+		$schema .= '</schema>';
+		return $schema;
+	}
+	
+	/**
+	* Sets a prefix for database objects
+	*
+	* Call this method to set a standard prefix that will be prepended to all database tables 
+	* and indices when the schema is parsed. Calling setPrefix with no arguments clears the prefix.
+	*
+	* @param string $prefix Prefix that will be prepended.
+	* @param boolean $underscore If TRUE, automatically append an underscore character to the prefix.
+	* @return boolean TRUE if successful, else FALSE
+	*/
+	function SetPrefix( $prefix = '', $underscore = TRUE ) {
+		switch( TRUE ) {
+			// clear prefix
+			case empty( $prefix ):
+				logMsg( 'Cleared prefix' );
+				$this->objectPrefix = '';
+				return TRUE;
+			// prefix too long
+			case strlen( $prefix ) > XMLS_PREFIX_MAXLEN:
+			// prefix contains invalid characters
+			case !preg_match( '/^[a-z][a-z0-9_]+$/i', $prefix ):
+				logMsg( 'Invalid prefix: ' . $prefix );
+				return FALSE;
+		}
+		
+		if( $underscore AND substr( $prefix, -1 ) != '_' ) {
+			$prefix .= '_';
+		}
+		
+		// prefix valid
+		logMsg( 'Set prefix: ' . $prefix );
+		$this->objectPrefix = $prefix;
+		return TRUE;
+	}
+	
+	/**
+	* Returns an object name with the current prefix prepended.
+	*
+	* @param string	$name Name
+	* @return string	Prefixed name
+	*
+	* @access private
+	*/
+	function prefix( $name = '' ) {
+		// if prefix is set
+		if( !empty( $this->objectPrefix ) ) {
+			// Prepend the object prefix to the table name
+			// prepend after quote if used
+			return preg_replace( '/^(`?)(.+)$/', '$1' . $this->objectPrefix . '$2', $name );
+		}
+		
+		// No prefix set. Use name provided.
+		return $name;
+	}
+	
+	/**
+	* Checks if element references a specific platform
+	*
+	* @param string $platform Requested platform
+	* @returns boolean TRUE if platform check succeeds
+	*
+	* @access private
+	*/
+	function supportedPlatform( $platform = NULL ) {
+		$regex = '/^(\w*\|)*' . $this->db->databaseType . '(\|\w*)*$/';
+		
+		if( !isset( $platform ) OR preg_match( $regex, $platform ) ) {
+			logMsg( "Platform $platform is supported" );
+			return TRUE;
+		} else {
+			logMsg( "Platform $platform is NOT supported" );
+			return FALSE;
+		}
+	}
+	
+	/**
+	* Clears the array of generated SQL.
+	*
+	* @access private
+	*/
+	function clearSQL() {
+		$this->sqlArray = array();
+	}
+	
+	/**
+	* Adds SQL into the SQL array.
+	*
+	* @param mixed $sql SQL to Add
+	* @return boolean TRUE if successful, else FALSE.
+	*
+	* @access private
+	*/	
+	function addSQL( $sql = NULL ) {
+		if( is_array( $sql ) ) {
+			foreach( $sql as $line ) {
+				$this->addSQL( $line );
+			}
+			
+			return TRUE;
+		}
+		
+		if( is_string( $sql ) ) {
+			$this->sqlArray[] = $sql;
+			
+			// if executeInline is enabled, and either no errors have occurred or continueOnError is enabled, execute SQL.
+			if( $this->ExecuteInline() && ( $this->success == 2 || $this->ContinueOnError() ) ) {
+				$saved = $this->db->debug;
+				$this->db->debug = $this->debug;
+				$ok = $this->db->Execute( $sql );
+				$this->db->debug = $saved;
+				
+				if( !$ok ) {
+					if( $this->debug ) {
+						ADOConnection::outp( $this->db->ErrorMsg() );
+					}
+					
+					$this->success = 1;
+				}
+			}
+			
+			return TRUE;
+		}
+		
+		return FALSE;
+	}
+	
+	/**
+	* Gets the SQL array in the specified format.
+	*
+	* @param string $format Format
+	* @return mixed SQL
+	*	
+	* @access private
+	*/
+	function getSQL( $format = NULL, $sqlArray = NULL ) {
+		if( !is_array( $sqlArray ) ) {
+			$sqlArray = $this->sqlArray;
+		}
+		
+		if( !is_array( $sqlArray ) ) {
+			return FALSE;
+		}
+		
+		switch( strtolower( $format ) ) {
+			case 'string':
+			case 'text':
+				return !empty( $sqlArray ) ? implode( ";\n\n", $sqlArray ) . ';' : '';
+			case'html':
+				return !empty( $sqlArray ) ? nl2br( htmlentities( implode( ";\n\n", $sqlArray ) . ';' ) ) : '';
+		}
+		
+		return $this->sqlArray;
+	}
+	
+	/**
+	* Destroys an adoSchema object.
+	*
+	* Call this method to clean up after an adoSchema object that is no longer in use.
+	* @deprecated adoSchema now cleans up automatically.
+	*/
+	function Destroy() {
+		set_magic_quotes_runtime( $this->mgq );
+		unset( $this );
+	}
+}
+
+/**
+* Message logging function
+*
+* @access private
+*/
+function logMsg( $msg, $title = NULL, $force = FALSE ) {
+	if( XMLS_DEBUG or $force ) {
+		echo '<pre>';
+		
+		if( isset( $title ) ) {
+			echo '<h3>' . htmlentities( $title ) . '</h3>';
+		}
+		
+		if( is_object( $this ) ) {
+			echo '[' . get_class( $this ) . '] ';
+		}
+		
+		print_r( $msg );
+		
+		echo '</pre>';
+	}
+}
+?>




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 30 02:44:10 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 30 Jun 2006 06:44:10 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7687 -
 /vtigercrm/trunk/Smarty/templates/Inventory/InventoryDetailView.tpl
Message-ID: <20060630064410.BE9B383FEDD@vtiger.fosslabs.com>

Author: richie
Date: Fri Jun 30 00:44:06 2006
New Revision: 7687

Log:
Issue in delete tag in Inventory modules has been fixed

Modified:
    vtigercrm/trunk/Smarty/templates/Inventory/InventoryDetailView.tpl

Modified: vtigercrm/trunk/Smarty/templates/Inventory/InventoryDetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Inventory/InventoryDetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Inventory/InventoryDetailView.tpl Fri Jun 30 00:44:06 2006
@@ -13,6 +13,7 @@
 -->*}
 <script type="text/javascript" src="modules/{$MODULE}/{$SINGLE_MOD}.js"></script>
 <script language="JavaScript" type="text/javascript" src="include/js/dtlviewajax.js"></script>
+<script src="include/scriptaculous/scriptaculous.js" type="text/javascript"></script>
 <div id="convertleaddiv" style="display:block;position:absolute;left:225px;top:150px;"></div>
 <span id="crmspanid" style="display:none;position:absolute;"  onmouseover="show('crmspanid');">
    <a class="link"  align="right" href="javascript:;">{$APP.LBL_EDIT_BUTTON}</a>
@@ -27,6 +28,22 @@
 		alert("Please enter a tag");
 		return false;
 	{rdelim}
+{rdelim}
+function DeleteTag(id)
+{ldelim}
+	$("vtbusy_info").style.display="inline";
+	Effect.Fade('tag_'+id);
+	new Ajax.Request(
+		'index.php',
+                {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+                        method: 'post',
+                        postBody: "file=TagCloud&module={$MODULE}&action={$MODULE}Ajax&ajxaction=DELETETAG&tagid=" +id,
+                        onComplete: function(response) {ldelim}
+						getTagCloud();
+						$("vtbusy_info").style.display="none";
+                        {rdelim}
+                {rdelim}
+        );
 {rdelim}
 
 </script>
@@ -244,17 +261,21 @@
 {/if}
 
 <script>
-	new Ajax.Request(
-  	      'index.php',
-        	{ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
-	        method: 'post',
-        	postBody: 'module={$MODULE}&action={$MODULE}Ajax&file=TagCloud&ajxaction=GETTAGCLOUD',
-	        onComplete: function(response) {ldelim}
-        	                        $("tagfields").innerHTML=response.responseText;
-                	                $("txtbox_tagfields").value ='';
-                        	{rdelim}
-		{rdelim}
-	);
+function getTagCloud()
+{ldelim}
+new Ajax.Request(
+        'index.php',
+        {ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
+        method: 'post',
+        postBody: 'module={$MODULE}&action={$MODULE}Ajax&file=TagCloud&ajxaction=GETTAGCLOUD&recordid={$ID}',
+        onComplete: function(response) {ldelim}
+                                $("tagfields").innerHTML=response.responseText;
+                                $("txtbox_tagfields").value ='';
+                        {rdelim}
+        {rdelim}
+);
+{rdelim}
+getTagCloud();
 </script>
 
 	</td>




From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 30 02:52:17 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 30 Jun 2006 06:52:17 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231403=3A?=
 =?utf-8?q?_Billing/Shipping_Address_not_copied_while_selecting_vendor_in_?=
 =?utf-8?q?Create_PO?=
Message-ID: <076.42e49747ae640cf03d761f3ac3d3938e@vtiger.fosslabs.com>

#1403: Billing/Shipping Address not copied while selecting vendor in Create PO
-----------------------+----------------------------------------------------
 Reporter:  ahmed      |       Owner:  mickie
     Type:  defect     |      Status:  new   
 Priority:  critical   |   Milestone:        
Component:  vtigercrm  |     Version:  5.0.0 
 Keywords:             |  
-----------------------+----------------------------------------------------


-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1403>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 30 02:55:00 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 30 Jun 2006 06:55:00 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231404=3A?=
 =?utf-8?q?_Product_not_getting_displayed_in_List_view_when_added_from_ven?=
 =?utf-8?q?dor_related_list?=
Message-ID: <076.a2f1476f2b295979718cb1f522ba91a7@vtiger.fosslabs.com>

#1404: Product not getting displayed in List view when added from vendor related
list
-----------------------+----------------------------------------------------
 Reporter:  ahmed      |       Owner:  mickie
     Type:  defect     |      Status:  new   
 Priority:  critical   |   Milestone:        
Component:  vtigercrm  |     Version:  5.0.0 
 Keywords:             |  
-----------------------+----------------------------------------------------


-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1404>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 30 03:02:26 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 30 Jun 2006 07:02:26 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7688 -
	/vtigercrm/trunk/modules/Contacts/Save.php
Message-ID: <20060630070227.178CB83FEE7@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 30 01:02:21 2006
New Revision: 7688

Log:
changes made to save the reltion between campaign and contact

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

Modified: vtigercrm/trunk/modules/Contacts/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/Save.php (original)
+++ vtigercrm/trunk/modules/Contacts/Save.php Fri Jun 30 01:02:21 2006
@@ -131,6 +131,15 @@
 
 	$local_log->debug("Saved record with id of ".$return_id);
 
+	if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] == "Campaigns")
+	{
+		if(isset($_REQUEST['return_id']) && $_REQUEST['return_id'] != "")
+		{
+			$sql = "insert into vtiger_campaigncontrel values (".$_REQUEST['return_id'].",".$focus->id.")";
+			$adb->query($sql);
+		}
+	}
+
 	//BEGIN -- Code for Create Customer Portal Users password and Send Mail 
 	if($_REQUEST['portal'] == '' && $_REQUEST['mode'] == 'edit')
 	{




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 30 03:06:07 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 30 Jun 2006 07:06:07 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7689 - in
 /vtigercrm/trunk/modules: Contacts/Save.php Leads/Save.php
Message-ID: <20060630070608.15A1383FEE7@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 30 01:06:03 2006
New Revision: 7689

Log:
changes made to save the reltion between campaign and contact

Modified:
    vtigercrm/trunk/modules/Contacts/Save.php
    vtigercrm/trunk/modules/Leads/Save.php

Modified: vtigercrm/trunk/modules/Contacts/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/Save.php (original)
+++ vtigercrm/trunk/modules/Contacts/Save.php Fri Jun 30 01:06:03 2006
@@ -50,7 +50,7 @@
 
 $local_log =& LoggerManager::getLogger('index');
 
-global $log;
+global $log,$adb;
 $focus = new Contact();
 
 setObjectValuesFromRequest(&$focus);

Modified: vtigercrm/trunk/modules/Leads/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/Save.php (original)
+++ vtigercrm/trunk/modules/Leads/Save.php Fri Jun 30 01:06:03 2006
@@ -19,7 +19,7 @@
 require_once('include/utils/UserInfoUtil.php');
 
 $local_log =& LoggerManager::getLogger('index');
-global $log;
+global $log,$adb;
 $focus = new Lead();
 global $current_user;
 $currencyid=fetchCurrency($current_user->id);
@@ -68,6 +68,17 @@
 //code added for returning back to the current view after edit from list view
 if($_REQUEST['return_viewname'] == '') $return_viewname='0';
 if($_REQUEST['return_viewname'] != '')$return_viewname=$_REQUEST['return_viewname'];
+
+if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] == "Campaigns")
+{
+	if(isset($_REQUEST['return_id']) && $_REQUEST['return_id'] != "")
+	{
+		$sql = "insert into vtiger_campaignleadrel values (".$_REQUEST['return_id'].",".$focus->id.")";
+		$adb->query($sql);
+	}
+}
+
+
 header("Location: index.php?action=$return_action&module=$return_module&record=$return_id&viewname=$return_viewname");
 
 //Code to save the custom vtiger_field info into database




From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 30 03:07:59 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 30 Jun 2006 07:07:59 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231405=3A?=
 =?utf-8?q?_Task_is_not_getting_displayed_in_Porder_Related_List_after_add?=
 =?utf-8?q?in?=
Message-ID: <076.95f1de3e7c6dbd3c93787f87e760d526@vtiger.fosslabs.com>

#1405: Task is not getting displayed in Porder Related List after addin
-----------------------+----------------------------------------------------
 Reporter:  ahmed      |       Owner:  mickie
     Type:  defect     |      Status:  new   
 Priority:  critical   |   Milestone:        
Component:  vtigercrm  |     Version:  5.0.0 
 Keywords:             |  
-----------------------+----------------------------------------------------


-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1405>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 30 03:08:58 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 30 Jun 2006 07:08:58 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231406=3A?=
 =?utf-8?q?_Advanced_Search_in_Purchase_Order_displays_no_values_in_combo?=
 =?utf-8?q?=2E?=
Message-ID: <076.604b3fbca2f49db5e075d878933ccd89@vtiger.fosslabs.com>

#1406: Advanced Search in Purchase Order displays no values in combo.
-----------------------+----------------------------------------------------
 Reporter:  ahmed      |       Owner:  saraj
     Type:  defect     |      Status:  new  
 Priority:  critical   |   Milestone:       
Component:  vtigercrm  |     Version:  5.0.0
 Keywords:             |  
-----------------------+----------------------------------------------------


-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1406>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 30 03:08:59 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 30 Jun 2006 07:08:59 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7690 -
	/vtigercrm/trunk/modules/Activities/Save.php
Message-ID: <20060630070859.F28F083FEEF@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 30 01:08:56 2006
New Revision: 7690

Log:
changes made to save the relation between activity and contact

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

Modified: vtigercrm/trunk/modules/Activities/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Activities/Save.php (original)
+++ vtigercrm/trunk/modules/Activities/Save.php Fri Jun 30 01:08:56 2006
@@ -26,7 +26,7 @@
 //require("modules/Emails/class.phpmailer.php");
 require_once("config.php");
 require_once('include/database/PearDatabase.php');
-
+global $adb;
 $local_log =& LoggerManager::getLogger('index');
 
 $focus = new Activity();
@@ -110,7 +110,15 @@
 		$adb->query($sql);
 	}
 }
-
+if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] == "Contacts")
+{
+	if(isset($_REQUEST['return_id']) && $_REQUEST['return_id'] != "")
+	{
+		$sql = "insert into vtiger_cntactivityrel values (".$_REQUEST['return_id'].",".$focus->id.")";
+		$adb->query($sql);
+	}
+}
+									
 $activemode = "";
 if($activity_mode != '') $activemode = "&activity_mode=".$activity_mode;
 




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 30 03:14:07 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 30 Jun 2006 07:14:07 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7691 - in /vtigercrm/trunk:
 Smarty/templates/EmailDetails.tpl include/js/general.js
 include/utils/ListViewUtils.php modules/Emails/DetailView.php
Message-ID: <20060630071407.ED32083FEEA@vtiger.fosslabs.com>

Author: richie
Date: Fri Jun 30 01:14:00 2006
New Revision: 7691

Log:
Email Detailview from Related lists has been integrated

Modified:
    vtigercrm/trunk/Smarty/templates/EmailDetails.tpl
    vtigercrm/trunk/include/js/general.js
    vtigercrm/trunk/include/utils/ListViewUtils.php
    vtigercrm/trunk/modules/Emails/DetailView.php

Modified: vtigercrm/trunk/Smarty/templates/EmailDetails.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/EmailDetails.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/EmailDetails.tpl Fri Jun 30 01:14:00 2006
@@ -24,7 +24,7 @@
 				{/if}
 				{foreach item=row from=$BLOCKS}	
 				{foreach item=elements key=title from=$row}	
-					{if $title eq 'Attachment' && $elements.value != ''}
+					{if $elements.fldname eq 'filename' && $elements.value != ''}
 						<input type="button" name="download" value=" {$MOD.LBL_DOWNLOAD_ATTCH_BUTTON} " class="classWebBtn" onclick="fnvshobj(this,'reportLay')"/>
 					{/if}
 				{/foreach}
@@ -41,8 +41,8 @@
 <tr>
 	<td height="250" bgcolor="#FFFFFF" valign="top" style="padding-top:10px;">
 	{foreach item=row from=$BLOCKS}	
-	{foreach item=elements key=title from=$row}	
-		{if $title eq 'Subject'}
+	{foreach item=elements from=$row}	
+		{if $elements.fldname eq 'subject'}
 		<table width="100%" border="0" cellpadding="0" cellspacing="0">
 	{if $EMAIL_FLAG neq 'WEBMAIL'}
 	<tr><td width="20%" align="right" valign="top"><b>{$MOD.LBL_TO}</b></td><td width="2%">&nbsp;</td><td>{$TO_MAIL}&nbsp;</td></tr>
@@ -54,7 +54,7 @@
 	<tr><td align="right"><b>{$MOD.LBL_SUBJECT}</b></td><td>&nbsp;</td><td>{$elements.value}&nbsp;</td></tr>
 			<tr><td align="right" style="border-bottom:1px solid #666666;" colspan="3">&nbsp;</td></tr>
 		</table>
-		{elseif $title eq 'Description'}
+		{elseif $elements.fldname eq 'description'}
 		<div>
 			{$BLOCKS.4.Description.value}
 		</div>
@@ -66,7 +66,7 @@
 </table>
 {foreach item=row from=$BLOCKS}	
 	{foreach item=elements key=title from=$row}	
-	{if $title eq 'Attachment'}
+	{if $elements.fldname eq 'filename'}
 	<div id="reportLay" style="width:130px;" onmouseout="fninvsh('reportLay')" onmouseover="fnvshNrm('reportLay')">
 		<table width="100%" cellpadding="0" cellspacing="0" border="0" bgcolor="#FFFFFF">
 		{foreach item=attachments from=$elements.options}

Modified: vtigercrm/trunk/include/js/general.js
==============================================================================
--- vtigercrm/trunk/include/js/general.js (original)
+++ vtigercrm/trunk/include/js/general.js Fri Jun 30 01:14:00 2006
@@ -1687,6 +1687,11 @@
                         return false;
                 }
 }
+function ShowEmail(id)
+{
+       url = 'index.php?module=Emails&action=EmailsAjax&file=DetailView&record='+id;
+       openPopUp('xComposeEmail',this,url,'createemailWin',820,652,'menubar=no,toolbar=no,location=no,status=no,resizable=no');
+}
 
 var bSaf = (navigator.userAgent.indexOf('Safari') != -1);
 var bOpera = (navigator.userAgent.indexOf('Opera') != -1);

Modified: vtigercrm/trunk/include/utils/ListViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/ListViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/ListViewUtils.php Fri Jun 30 01:14:00 2006
@@ -696,7 +696,7 @@
 					{
 						$list_result_count = $i-1;
 						$tmp_value = getValue($ui_col_array,$list_result,$fieldname,$focus,$module,$entity_id,$list_result_count,"list","",$returnset,$oCv->setdefaultviewid);
-						$value = '<a href="javascript:;" onClick="OpenCompose(\''.$entity_id.'\',\'edit\');">'.$tmp_value.'</a>';
+						$value = '<a href="javascript:;" onClick="ShowEmail(\''.$entity_id.'\');">'.$tmp_value.'</a>';
 
 					}
 					else
@@ -2724,7 +2724,7 @@
 
 	$edit_link .= "&parenttab=".$_REQUEST["parenttab"];
 	if($module == 'Emails')
-	        $edit_link = 'javascript:;" onclick="OpenCompose(\'123\',\'edit\');';
+	        $edit_link = 'javascript:;" onclick="OpenCompose(\''.$entity_id.'\',\'edit\');';
 	return $edit_link;
 }
 

Modified: vtigercrm/trunk/modules/Emails/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/DetailView.php (original)
+++ vtigercrm/trunk/modules/Emails/DetailView.php Fri Jun 30 01:14:00 2006
@@ -45,9 +45,9 @@
 	$result = $adb->query($query);
     	$smarty->assign('FROM_MAIL',$adb->query_result($result,0,'from_email'));	
 	$to_email = ereg_replace('###',', ',$adb->query_result($result,0,'to_email'));
-	$smarty->assign('TO_MAIL',$to_email);	
-	$smarty->assign('CC_MAIL',ereg_replace('###',', ',$adb->query_result($result,0,'cc_email')));	
-    	$smarty->assign('BCC_MAIL',ereg_replace('###',', ',$adb->query_result($result,0,'bcc_email')));	
+	$smarty->assign('TO_MAIL',to_html($to_email));	
+	$smarty->assign('CC_MAIL',to_html(ereg_replace('###',', ',$adb->query_result($result,0,'cc_email'))));	
+    	$smarty->assign('BCC_MAIL',to_html(ereg_replace('###',', ',$adb->query_result($result,0,'bcc_email'))));	
     	$smarty->assign('EMAIL_FLAG',$adb->query_result($result,0,'email_flag'));	
 	if($focus->column_fields['name'] != '')
 	        $focus->name = $focus->column_fields['name'];		
@@ -131,14 +131,8 @@
 	else $smarty->assign("NAME", "");
 
 $entries = getBlocks($currentModule,"detail_view",'',$focus->column_fields);
-if($_REQUEST['mode'] != 'ajax')
-	$smarty->assign("BLOCKS" , $entries);
-else	
-{
-	$entries['Email Information']['4']['Description']['value'] = from_html($entries['Email Information']['4']['Description']['value']);
-	$smarty->assign("BLOCKS", $entries['Email Information']);
-}
-	
+$entries['Email Information']['4']['Description']['value'] = from_html($entries['Email Information']['4']['Description']['value']);
+$smarty->assign("BLOCKS", $entries['Email Information']);
 $smarty->assign("SINGLE_MOD",$app_strings['Email']);
 
 $smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']);
@@ -157,7 +151,7 @@
 $smarty->assign("MODULE",$currentModule);
 $smarty->assign("SENDER",$email_id);
 if($_REQUEST['mode'] != 'ajax')
-	$smarty->display("DetailView.tpl");
+	$smarty->display("EmailDetailView.tpl");
 else
 	$smarty->display("EmailDetails.tpl")
 ?>




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 30 03:14:25 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 30 Jun 2006 07:14:25 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7692 -
	/vtigercrm/trunk/modules/Activities/Activity.php
Message-ID: <20060630071425.9AC2983FEEA@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 30 01:14:21 2006
New Revision: 7692

Log:
query has been modified in get_contacts function

Modified:
    vtigercrm/trunk/modules/Activities/Activity.php

Modified: vtigercrm/trunk/modules/Activities/Activity.php
==============================================================================
--- vtigercrm/trunk/modules/Activities/Activity.php (original)
+++ vtigercrm/trunk/modules/Activities/Activity.php Fri Jun 30 01:14:21 2006
@@ -43,9 +43,9 @@
 	
 	var $reminder_table = "vtiger_activity_reminder";
 	
-	var $tab_name = Array('vtiger_crmentity','vtiger_activity','vtiger_seactivityrel','vtiger_cntactivityrel','vtiger_salesmanactivityrel','vtiger_activity_reminder','vtiger_recurringevents','vtiger_invitees');
-
-	var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_activity'=>'activityid','vtiger_seactivityrel'=>'activityid','vtiger_cntactivityrel'=>'activityid','vtiger_salesmanactivityrel'=>'activityid','vtiger_activity_reminder'=>'activity_id','vtiger_recurringevents'=>'activityid');
+	var $tab_name = Array('vtiger_crmentity','vtiger_activity','vtiger_seactivityrel','vtiger_salesmanactivityrel','vtiger_activity_reminder','vtiger_recurringevents','vtiger_invitees');
+
+	var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_activity'=>'activityid','vtiger_seactivityrel'=>'activityid','vtiger_salesmanactivityrel'=>'activityid','vtiger_activity_reminder'=>'activity_id','vtiger_recurringevents'=>'activityid');
 
 	var $column_fields = Array();
 	var $sortby_fields = Array('subject','due_date','date_start','smownerid','activitytype');	//Sorting is added for due date and start date	
@@ -154,7 +154,7 @@
 			$returnset = '&return_module=Activities&return_action=DetailView&activity_mode=Events&return_id='.$id;
 
 
-			$query = 'select vtiger_users.user_name,vtiger_contactdetails.accountid,vtiger_contactdetails.contactid, vtiger_contactdetails.firstname,vtiger_contactdetails.lastname, vtiger_contactdetails.department, vtiger_contactdetails.title, vtiger_contactdetails.email, vtiger_contactdetails.phone, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_contactdetails inner join vtiger_seactivityrel on vtiger_seactivityrel.crmid=vtiger_contactdetails.contactid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid left join vtiger_users on vtiger_users.id = vtiger_crmentity.smownerid where vtiger_seactivityrel.activityid='.$id.' and vtiger_crmentity.deleted=0';
+			$query = 'select vtiger_users.user_name,vtiger_contactdetails.accountid,vtiger_contactdetails.contactid, vtiger_contactdetails.firstname,vtiger_contactdetails.lastname, vtiger_contactdetails.department, vtiger_contactdetails.title, vtiger_contactdetails.email, vtiger_contactdetails.phone, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_contactdetails inner join vtiger_cntactivityrel on vtiger_cntactivityrel.contactid=vtiger_contactdetails.contactid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid left join vtiger_users on vtiger_users.id = vtiger_crmentity.smownerid where vtiger_cntactivityrel.activityid='.$id.' and vtiger_crmentity.deleted=0';
 			$log->debug("Exiting get_contacts method ...");
 			return GetRelatedList('Activities','Contacts',$focus,$query,$button,$returnset);
         }




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 30 03:15:40 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 30 Jun 2006 07:15:40 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7693 -
 /vtigercrm/trunk/Smarty/templates/EmailDetailView.tpl
Message-ID: <20060630071540.247A383FEF0@vtiger.fosslabs.com>

Author: richie
Date: Fri Jun 30 01:15:35 2006
New Revision: 7693

Log:
Email Detailview from Related lists has been integrated

Added:
    vtigercrm/trunk/Smarty/templates/EmailDetailView.tpl   (with props)




From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 30 03:15:52 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 30 Jun 2006 07:15:52 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231407=3A?=
 =?utf-8?q?_Not_able_to_delete_contact_from_vendor_related_list?=
Message-ID: <076.7a0430f79de907a68048a0360a372261@vtiger.fosslabs.com>

#1407: Not able to delete contact from vendor related list
-----------------------+----------------------------------------------------
 Reporter:  ahmed      |       Owner:  mickie
     Type:  defect     |      Status:  new   
 Priority:  critical   |   Milestone:        
Component:  vtigercrm  |     Version:  5.0.0 
 Keywords:             |  
-----------------------+----------------------------------------------------


-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1407>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 30 03:16:39 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 30 Jun 2006 07:16:39 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7694 -
 /vtigercrm/trunk/modules/Activities/updateRelations.php
Message-ID: <20060630071639.C96D383FEF0@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 30 01:16:35 2006
New Revision: 7694

Log:
query has been modified to maintain contact/activity relation

Modified:
    vtigercrm/trunk/modules/Activities/updateRelations.php

Modified: vtigercrm/trunk/modules/Activities/updateRelations.php
==============================================================================
--- vtigercrm/trunk/modules/Activities/updateRelations.php (original)
+++ vtigercrm/trunk/modules/Activities/updateRelations.php Fri Jun 30 01:16:35 2006
@@ -22,7 +22,7 @@
 		if($id != '')
 		{
 			$record = $_REQUEST['parentid'];
-			$sql = "insert into vtiger_seactivityrel values (".$id.",".$_REQUEST["parentid"].")";
+			$sql = "insert into vtiger_cntactivityrel values (".$id.",".$_REQUEST["parentid"].")";
 			$adb->query($sql);
 		}
 	}
@@ -32,7 +32,7 @@
 elseif(isset($_REQUEST['entityid']) && $_REQUEST['entityid'] != '')
 {
 	$record = $_REQUEST["parid"];
-	$sql = "insert into vtiger_seactivityrel values (". $_REQUEST["entityid"] .",".$_REQUEST["parid"] .")";
+	$sql = "insert into vtiger_cntactivityrel values (". $_REQUEST["entityid"] .",".$_REQUEST["parid"] .")";
 	$adb->query($sql);
 	header("Location: index.php?action=CallRelatedList&module=Activities&activity_mode=Events&record=".$record);
 }




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 30 03:22:08 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 30 Jun 2006 07:22:08 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7695 -
	/vtigercrm/trunk/modules/Activities/Activity.php
Message-ID: <20060630072208.95BD483FF00@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 30 01:22:05 2006
New Revision: 7695

Log:
vtiger_cntactivityrel has been added in tab_name array

Modified:
    vtigercrm/trunk/modules/Activities/Activity.php

Modified: vtigercrm/trunk/modules/Activities/Activity.php
==============================================================================
--- vtigercrm/trunk/modules/Activities/Activity.php (original)
+++ vtigercrm/trunk/modules/Activities/Activity.php Fri Jun 30 01:22:05 2006
@@ -43,9 +43,10 @@
 	
 	var $reminder_table = "vtiger_activity_reminder";
 	
-	var $tab_name = Array('vtiger_crmentity','vtiger_activity','vtiger_seactivityrel','vtiger_salesmanactivityrel','vtiger_activity_reminder','vtiger_recurringevents','vtiger_invitees');
-
-	var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_activity'=>'activityid','vtiger_seactivityrel'=>'activityid','vtiger_salesmanactivityrel'=>'activityid','vtiger_activity_reminder'=>'activity_id','vtiger_recurringevents'=>'activityid');
+	var $tab_name = Array('vtiger_crmentity','vtiger_activity','vtiger_seactivityrel','vtiger_cntactivityr
+el','vtiger_salesmanactivityrel','vtiger_activity_reminder','vtiger_recurringevents','vtiger_invitees');
+
+	var $tab_name_index = Array('vtiger_crmentity'=>'crmid','vtiger_activity'=>'activityid','vtiger_seactivityrel'=>'activityid','vtiger_cntactivityrel'=>'activityid','vtiger_salesmanactivityrel'=>'activityid','vtiger_activity_reminder'=>'activity_id','vtiger_recurringevents'=>'activityid');
 
 	var $column_fields = Array();
 	var $sortby_fields = Array('subject','due_date','date_start','smownerid','activitytype');	//Sorting is added for due date and start date	




From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 30 03:24:28 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 30 Jun 2006 07:24:28 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231390=3A?=
 =?utf-8?q?_Custome_View_Issue_in_Activities?=
In-Reply-To: <076.74b7dccf8426c4468275b28cfd4f7db2@vtiger.fosslabs.com>
References: <076.74b7dccf8426c4468275b28cfd4f7db2@vtiger.fosslabs.com>
Message-ID: <085.c8d95dad0cdd5dae5ec1fc5eaec547f9@vtiger.fosslabs.com>

#1390: Custome View Issue in Activities
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  jeri 
      Type:  defect     |      Status:  new  
  Priority:  critical   |   Milestone:       
 Component:  vtigercrm  |     Version:  5.0.0
Resolution:             |    Keywords:       
------------------------+---------------------------------------------------
Changes (by mangai):

  * owner:  mangai => jeri

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1390>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 30 03:24:37 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 30 Jun 2006 07:24:37 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231396=3A?=
 =?utf-8?q?_Event_not_getting_displayed_in_contact_Related_List?=
In-Reply-To: <076.ad344c79dc1dc0ab1b64472bf84dc959@vtiger.fosslabs.com>
References: <076.ad344c79dc1dc0ab1b64472bf84dc959@vtiger.fosslabs.com>
Message-ID: <085.7a37edd9777eebd3d8dab2b049f51bf6@vtiger.fosslabs.com>

#1396: Event not getting displayed in contact Related List
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  mangai
      Type:  defect     |      Status:  closed
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by mangai):

  * resolution:  => fixed
  * status:  new => closed

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1396>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 30 04:06:25 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 30 Jun 2006 08:06:25 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7696 - in /vtigercrm/trunk:
 modules/HelpDesk/HelpDesk.php soap/customerportal.php
Message-ID: <20060630080625.B01117E8AD1@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 30 02:06:20 2006
New Revision: 7696

Log:
* Modified to fix the prefix vtiger_ problem

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

Modified: vtigercrm/trunk/modules/HelpDesk/HelpDesk.php
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/HelpDesk.php (original)
+++ vtigercrm/trunk/modules/HelpDesk/HelpDesk.php Fri Jun 30 02:06:20 2006
@@ -280,7 +280,7 @@
 				$where_conditions = " and ( ".$where_conditions." ) ";
 
 			$query .= $where_conditions;
-			$this->db->println("where condition for customer vtiger_portal tickets search : ".$where_conditions);
+			$this->db->println("where condition for customer portal tickets search : ".$where_conditions);
 		}
 
 		$query .= " order by vtiger_crmentity.crmid desc";

Modified: vtigercrm/trunk/soap/customerportal.php
==============================================================================
--- vtigercrm/trunk/soap/customerportal.php (original)
+++ vtigercrm/trunk/soap/customerportal.php Fri Jun 30 02:06:20 2006
@@ -155,7 +155,13 @@
         'array',
         '',
         array(
-                'files' => array('filename'=>'xsd:string','filecontents'=>'tns:xsd:string'),
+                'files' => array(
+					'fileid'=>'xsd:string','type'=>'tns:xsd:string',
+					'filename'=>'xsd:string','type'=>'tns:xsd:string',
+					'filesize'=>'xsd:string','type'=>'tns:xsd:string',
+					'filetype'=>'xsd:string','type'=>'tns:xsd:string',
+					'filecontents'=>'xsd:string','type'=>'tns:xsd:string'
+				),
              )
 );
 
@@ -366,7 +372,7 @@
 		$result['faq'][$k]['faqcreatedtime'] = $adb->query_result($faq_result,$k,'createdtime');
 		$result['faq'][$k]['faqmodifiedtime'] = $adb->query_result($faq_result,$k,'modifiedtime');
 
-		$faq_comment_query = "select * from vtiger_faqcomments where vtiger_faqid=".$faqid." order by createdtime DESC";
+		$faq_comment_query = "select * from vtiger_faqcomments where faqid=".$faqid." order by createdtime DESC";
 		$faq_comment_result = $adb->query($faq_comment_query);
 		$faq_comment_noofrows = $adb->num_rows($faq_comment_result);
 		for($l=0;$l<$faq_comment_noofrows;$l++)
@@ -650,16 +656,19 @@
 
 function get_picklists($picklist_name)
 {
-	global $adb;
+	global $adb, $log;
+	$log->debug("Entering into function get_picklists($picklist_name)");
+	
 	$picklist_array = Array();
 
-	$res = $adb->query("select * from ".$picklist_name);
+	$res = $adb->query("select * from vtiger_".$picklist_name);
 	for($i=0;$i<$adb->num_rows($res);$i++)
 	{
 		$picklist_val = $adb->query_result($res,$i,$picklist_name);
 		$picklist_array[$i] = $picklist_val;
 	}
 
+	$log->debug("Exit from function get_picklists($picklist_name)");
 	return $picklist_array;
 }
 
@@ -678,16 +687,16 @@
 		$filename = $adb->query_result($res,$i,'name');
 		$filepath = $adb->query_result($res,$i,'path');
 
-		$filesize = vtiger_filesize($filepath.$filename);
 		$fileid = $adb->query_result($res,$i,'attachmentsid');
+		$filesize = filesize($filepath.$fileid."_".$filename);
 		$filetype = $adb->query_result($res,$i,'type');
 
-		$filecontents = base64_encode(file_get_contents($filepath.$filename));//fread(fopen($filepath.$filename, "r"), $filesize));
-
+		$filecontents = base64_encode(file_get_contents($filepath.$fileid."_".$filename));//fread(fopen($filepath.$filename, "r"), $filesize));
+
+		$output[$i]['fileid'] = $fileid;
+		$output[$i]['filename'] = $filename;
 		$output[$i]['filetype'] = $filetype;
-		$output[$i]['filename'] = $filename;
 		$output[$i]['filesize'] = $filesize;
-		$output[$i]['fileid'] = $fileid;
 		$output[$i]['filecontents'] = $filecontents;
 	}
 
@@ -702,8 +711,9 @@
 	//decide the file path where we should upload the file in the server
 	$upload_filepath = decideFilePath();
 
-	$upload_dir = $root_directory.'test/upload/';
-	$new_filename = $ticketid.'_'.$filename;
+	$attachmentid = $adb->getUniqueID("vtiger_crmentity");
+
+	$new_filename = $attachmentid.'_'.$filename;
 
 	$data = base64_decode($filecontents);
 
@@ -713,14 +723,13 @@
 	fclose($handle);	
 
 	//Now store this file information in db and relate with the ticket
-	$attachmentid = $adb->getUniqueID("vtiger_crmentity");
 	$date_var = date('YmdHis');
 	$description = 'CustomerPortal Attachment';
 
 	$crmquery = "insert into vtiger_crmentity (crmid,setype,description,createdtime) values('".$attachmentid."','HelpDesk Attachment','".$description."','".$date_var."')";
 	$crmresult = $adb->query($crmquery);
 
-	$attachmentquery = "insert into vtiger_attachments values(".$attachmentid.",'".$new_filename."','".$description."','".$filetype."','".$upload_filepath."')";
+	$attachmentquery = "insert into vtiger_attachments values(".$attachmentid.",'".$filename."','".$description."','".$filetype."','".$upload_filepath."')";
 	$attachmentreulst = $adb->query($attachmentquery);
 
 	$relatedquery = $sql1 = "insert into vtiger_seattachmentsrel values('".$ticketid."','".$attachmentid."')";




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 30 04:13:03 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 30 Jun 2006 08:13:03 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7697 -
	/customerportal/trunk/login.php
Message-ID: <20060630081303.D75887E8AD1@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 30 02:13:00 2006
New Revision: 7697

Log:
* Added code to redirect the customer to index when he click on browser back after login

Modified:
    customerportal/trunk/login.php

Modified: customerportal/trunk/login.php
==============================================================================
--- customerportal/trunk/login.php (original)
+++ customerportal/trunk/login.php Fri Jun 30 02:13:00 2006
@@ -11,6 +11,12 @@
 
 require_once("language/en_us.lang.php");
 
+ at session_start();
+if(isset($_SESSION['customer_id']) && isset($_SESSION['customer_name']))
+{
+	header("Location: index.php?action=index&module=Tickets");
+	exit;
+}
 if($_REQUEST['close_window'] == 'true')
 {
    ?>




From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 30 05:58:20 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 30 Jun 2006 09:58:20 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231390=3A?=
 =?utf-8?q?_Custome_View_Issue_in_Activities?=
In-Reply-To: <076.74b7dccf8426c4468275b28cfd4f7db2@vtiger.fosslabs.com>
References: <076.74b7dccf8426c4468275b28cfd4f7db2@vtiger.fosslabs.com>
Message-ID: <085.ca6a90dfbe85d8fc2deff6107f4cd7b1@vtiger.fosslabs.com>

#1390: Custome View Issue in Activities
------------------------+---------------------------------------------------
  Reporter:  ahmed      |       Owner:  jeri  
      Type:  defect     |      Status:  closed
  Priority:  critical   |   Milestone:        
 Component:  vtigercrm  |     Version:  5.0.0 
Resolution:  fixed      |    Keywords:        
------------------------+---------------------------------------------------
Changes (by richie):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 (In [7698]) Issue in Activities has been fixed.Fixes #1390

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1390>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 30 05:58:21 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 30 Jun 2006 09:58:21 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7698 -
	/vtigercrm/trunk/modules/CustomView/CustomView.php
Message-ID: <20060630095821.D1E237726B9@vtiger.fosslabs.com>

Author: richie
Date: Fri Jun 30 03:58:17 2006
New Revision: 7698

Log:
Issue in Activities has been fixed.Fixes #1390

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 Fri Jun 30 03:58:17 2006
@@ -79,7 +79,11 @@
 		$this->smownerid = $current_user->id;
 	}
 
-	// Mike Crowe Mod --------------------------------------------------------getViewId
+
+	/** To get the customViewId of the specified module 
+	  * @param $module -- The module Name:: Type String
+	  * @returns  customViewId :: Type Integer 
+	 */	
 	function getViewId($module)
 	{
 		global $adb;
@@ -108,33 +112,15 @@
 
 	}
 	
-	// Mike Crowe Mod --------------------------------------------------------getGroupId
-	function getGroupId($module)
-	{
-		if(isset($_REQUEST['gname']) == false)
-		{
-			if ( isset($_SESSION["cg$module"]) )
-			{
-				$groupid = $_SESSION["cg$module"];
-			}
-			elseif($this->setdefaultgroupid != "")
-			{
-				$groupid = $this->setdefaultgroupid;
-			}else
-			{
-				$groupid = "0";
-			}
-		}
-		else
-		{
-			$groupid =  $_REQUEST['gname'];
-		}
-		$_SESSION["cg$module"] = $groupid;
-		return $groupid;
-	}
-
-	// to get the available vtiger_customviews for a module
 	// return type array
+	/** to get the details of a customview
+	  * @param $cvid :: Type Integer
+	  * @returns  $customviewlist Array in the following format
+	  * $customviewlist = Array('viewname'=>value,
+	  *                         'setdefault'=>defaultchk,
+	  *                         'setmetrics'=>setmetricschk)   	    
+	 */	
+
 	function getCustomViewByCvid($cvid)
 	{
 		global $adb;
@@ -152,6 +138,13 @@
 		}
 		return $customviewlist;		
 	}	
+
+	/** to get the customviewCombo for the class variable customviewmodule
+	  * @param $viewid :: Type Integer
+	  * $viewid will make the corresponding selected
+	  * @returns  $customviewCombo :: Type String 
+	 */	
+
 	function getCustomViewCombo($viewid='')
 	{
 		global $adb;
@@ -179,6 +172,17 @@
 		}
 		return $shtml;
 	}
+
+	/** to get the getColumnsListbyBlock for the given module and Block 
+	  * @param $module :: Type String 
+	  * @param $block :: Type Integer
+	  * @returns  $columnlist Array in the format 
+	  * $columnlist = Array ($fieldlabel =>'$fieldtablename:$fieldcolname:$fieldname:$module_$fieldlabel1:$fieldtypeofdata',
+	                         $fieldlabel1 =>'$fieldtablename1:$fieldcolname1:$fieldname1:$module_$fieldlabel11:$fieldtypeofdata1',
+					|
+			         $fieldlabeln =>'$fieldtablenamen:$fieldcolnamen:$fieldnamen:$module_$fieldlabel1n:$fieldtypeofdatan')
+	 */	
+
 	function getColumnsListbyBlock($module,$block)
 	{
 		global $adb;
@@ -209,12 +213,12 @@
 		//Added on 14-10-2005 -- added ticket id in list
 		if($module == 'HelpDesk' && $block == 25)
 		{
-			$module_columnlist['crmentity:crmid::HelpDesk_Ticket ID:I'] = 'Ticket ID';
+			$module_columnlist['vtiger_crmentity:crmid::HelpDesk_Ticket_ID:I'] = 'Ticket ID';
 		}
 		//Added to include vtiger_activity type in vtiger_activity vtiger_customview list
 		if($module == 'Activities' && $block == 19)
 		{
-			$module_columnlist['activity:activitytype:activitytype:Activities_Activity Type:C'] = 'Activity Type';
+			$module_columnlist['vtiger_activity:activitytype:activitytype:Activities_Activity_Type:C'] = 'Activity Type';
 		}
 
 		for($i=0; $i<$noofrows; $i++)
@@ -234,7 +238,7 @@
 			{
 				$fieldlabel = "Start Date";
 				if($module == 'Activities' && $block == 19)
-					$module_columnlist['activity:time_start::Activities_Start Time:I'] = 'Start Time';
+					$module_columnlist['vtiger_activity:time_start::Activities_Start_Time:I'] = 'Start Time';
 
 			}
 			$fieldlabel1 = str_replace(" ","_",$fieldlabel);
@@ -249,6 +253,26 @@
 		return $module_columnlist;
 	}
 
+	/** to get the getModuleColumnsList for the given module 
+	  * @param $module :: Type String
+	  * @returns  $ret_module_list Array in the following format
+	  * $ret_module_list = 
+		Array ('module' =>
+				Array('BlockLabel1' => 
+						Array('$fieldtablename:$fieldcolname:$fieldname:$module_$fieldlabel1:$fieldtypeofdata'=>$fieldlabel,
+	                                        Array('$fieldtablename1:$fieldcolname1:$fieldname1:$module_$fieldlabel11:$fieldtypeofdata1'=>$fieldlabel1,
+				Array('BlockLabel2' => 
+						Array('$fieldtablename:$fieldcolname:$fieldname:$module_$fieldlabel1:$fieldtypeofdata'=>$fieldlabel,
+	                                        Array('$fieldtablename1:$fieldcolname1:$fieldname1:$module_$fieldlabel11:$fieldtypeofdata1'=>$fieldlabel1,
+					 |
+				Array('BlockLabeln' => 
+						Array('$fieldtablename:$fieldcolname:$fieldname:$module_$fieldlabel1:$fieldtypeofdata'=>$fieldlabel,
+	                                        Array('$fieldtablename1:$fieldcolname1:$fieldname1:$module_$fieldlabel11:$fieldtypeofdata1'=>$fieldlabel1,
+	 
+
+	 */	
+
+
 	function getModuleColumnsList($module)
 	{
 		foreach($this->module_list[$module] as $key=>$value)
@@ -262,6 +286,14 @@
 		return $ret_module_list;
 	}
 
+	/** to get the getModuleColumnsList for the given customview 
+	  * @param $cvid :: Type Integer
+	  * @returns  $columnlist Array in the following format
+	  * $columnlist = Array( $columnindex => $columnname,
+	  *			 $columnindex1 => $columnname1,  
+	  *					|
+	  *			 $columnindexn => $columnnamen)  
+	  */	
 	function getColumnsListByCvid($cvid)
 	{
 		global $adb;
@@ -270,7 +302,6 @@
 		$sSQL .= " inner join vtiger_customview on vtiger_customview.cvid = vtiger_cvcolumnlist.cvid";
 		$sSQL .= " where vtiger_customview.cvid =".$cvid." order by vtiger_cvcolumnlist.columnindex";
 		$result = $adb->query($sSQL);
-		
 		while($columnrow = $adb->fetch_array($result))
 		{
 			$columnlist[$columnrow['columnindex']] = $columnrow['columnname'];




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 30 06:01:05 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 30 Jun 2006 10:01:05 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7699 -
	/vtigercrm/trunk/modules/Accounts/ListView.php
Message-ID: <20060630100105.A739C7726B4@vtiger.fosslabs.com>

Author: richie
Date: Fri Jun 30 04:01:02 2006
New Revision: 7699

Log:
function call getGroupId removed as it is not used

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 Fri Jun 30 04:01:02 2006
@@ -76,7 +76,6 @@
 $viewid = $oCustomView->getViewId($currentModule);
 $customviewcombo_html = $oCustomView->getCustomViewCombo($viewid);
 $viewnamedesc = $oCustomView->getCustomViewByCvid($viewid);
-$groupid = $oCustomView->getGroupId($currentModule);
 //<<<<<customview>>>>>
 $smarty->assign("CHANGE_OWNER",getUserslist());
 if(isset($_REQUEST['query']) && $_REQUEST['query'] == 'true')




From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 30 07:20:25 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 30 Jun 2006 11:20:25 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231408=3A?=
 =?utf-8?q?_Member_Of_Hierarchy_To_Be_Viewable_From_Top_Account_Down?=
Message-ID: <076.1537c41e22e8c26ed5018f5cb2afbba9@vtiger.fosslabs.com>

#1408: Member Of Hierarchy To Be Viewable From Top Account Down
-------------------------+--------------------------------------------------
 Reporter:  robbiew      |       Owner:  developer
     Type:  enhancement  |      Status:  new      
 Priority:  major        |   Milestone:           
Component:  vtigercrm    |     Version:  5.0.0    
 Keywords:  member of    |  
-------------------------+--------------------------------------------------
 Member of account hierarchy needs to be viewable from the top level
 account so that member accounts can be viewed

 Robbie

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1408>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 30 07:28:56 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 30 Jun 2006 11:28:56 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7700 -
	/vtigercrm/trunk/modules/Accounts/Tickerdetail.php
Message-ID: <20060630112858.B550D18145D@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 30 05:28:44 2006
New Revision: 7700

Log:
file include method has been changed

Modified:
    vtigercrm/trunk/modules/Accounts/Tickerdetail.php

Modified: vtigercrm/trunk/modules/Accounts/Tickerdetail.php
==============================================================================
--- vtigercrm/trunk/modules/Accounts/Tickerdetail.php (original)
+++ vtigercrm/trunk/modules/Accounts/Tickerdetail.php Fri Jun 30 05:28:44 2006
@@ -8,8 +8,8 @@
  * All Rights Reserved.
 *
  ********************************************************************************/
-include("modules/Accounts/Account.php");
-include("getCompanyProfile.php");
+require_once("modules/Accounts/Account.php");
+require_once("getCompanyProfile.php");
 $variable = $_REQUEST['tickersymbol'];
 $url = "http://moneycentral.msn.com/investor/research/profile.asp?Symbol=".trim($variable);
 $data = getComdata($url,trim($variable));




From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 30 07:43:19 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 30 Jun 2006 11:43:19 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231409=3A?=
 =?utf-8?q?_Advanced_Search_in_Invoice_displays_no_values_in_combo=2E?=
Message-ID: <076.a2da11cba0da9c78ff0beaa17549d577@vtiger.fosslabs.com>

#1409: Advanced Search in Invoice displays no values in combo.
-----------------------+----------------------------------------------------
 Reporter:  ahmed      |       Owner:  saraj
     Type:  defect     |      Status:  new  
 Priority:  critical   |   Milestone:       
Component:  vtigercrm  |     Version:  5.0.0
 Keywords:             |  
-----------------------+----------------------------------------------------


-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1409>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 30 07:43:35 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 30 Jun 2006 11:43:35 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7701 -
	/vtigercrm/trunk/class_http/class_http.php
Message-ID: <20060630114335.97A7318150A@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 30 05:43:27 2006
New Revision: 7701

Log:
changes made to get proxy server address

Modified:
    vtigercrm/trunk/class_http/class_http.php

Modified: vtigercrm/trunk/class_http/class_http.php
==============================================================================
--- vtigercrm/trunk/class_http/class_http.php (original)
+++ vtigercrm/trunk/class_http/class_http.php Fri Jun 30 05:43:27 2006
@@ -150,6 +150,7 @@
   PRIVATE getFromUrl() method to scrape content from url.
   */
   function getFromUrl($url, $user="", $pwd="") {
+	  global $adb;
     $this->log .= "getFromUrl() called<br />";
     preg_match("~([a-z]*://)?([^:^/]*)(:([0-9]{1,5}))?(/.*)?~i", $url, $parts);
   	$protocol = $parts[1];
@@ -163,17 +164,24 @@
         $port = "80";
       }
     }
-	$server = '';
-	$port = '';
-	$user = "";    // added
-	$pwd = "";    // added
-	$proxy_cont = '';
-
+    $query = "select * from vtiger_systems where server_type='proxy'";
+    $result = $adb->query($query);
+    $noofrows = $adb->num_rows($result);
+    if($noofrows != 0)
+    {
+	    $server = $adb->query_result($result,0,"server");
+	    $port = $adb->query_result($result,0,"server_port");
+	    $user = $adb->query_result($result,0,"server_username"); // added
+	    $pwd = $adb->query_result($result,0,"server_password");    // added
+    }
+    
 	  if ($path == "") { $path = "/"; }
 
-		if (!$sock = fsockopen($server, $port, $errno, $errstr, $this->connect_timeout)) {
+		if (!$sock = @fsockopen($server, $port, $errno, $errstr, $this->connect_timeout)) {
       $this->log .= "Could not open connection. Error "
         .$errno.": ".$errstr."<br />\n";
+	echo '<b><font color="red">Kindly set proxy server settings under Settings tab</font></b>';
+	die;
       return false;
     }
   if (!$sock)    {return false;}




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 30 07:52:57 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 30 Jun 2006 11:52:57 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7702 -
	/vtigercrm/trunk/modules/Settings/Save.php
Message-ID: <20060630115257.281BF18153D@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 30 05:52:47 2006
New Revision: 7702

Log:
proxy server settings integrated

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

Modified: vtigercrm/trunk/modules/Settings/Save.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/Save.php (original)
+++ vtigercrm/trunk/modules/Settings/Save.php Fri Jun 30 05:52:47 2006
@@ -10,13 +10,12 @@
  ********************************************************************************/
 
 require_once("include/database/PearDatabase.php");
-
 $server=$_REQUEST['server'];
 $port=$_REQUEST['port'];
 $server_username=$_REQUEST['server_username'];
 $server_password=$_REQUEST['server_password'];
 $server_type = $_REQUEST['server_type'];
-
+$db_update = true;
 if($_REQUEST['smtp_auth'] == 'on' || $_REQUEST['smtp_auth'] == 1)
 	$smtp_auth = 'true';
 else
@@ -25,16 +24,37 @@
 $sql="select * from vtiger_systems where server_type = '".$server_type."'";
 $id=$adb->query_result($adb->query($sql),0,"id");
 
+if($server_type == 'proxy')
+{
+	$action = 'ProxyServerConfig&proxy_server_mode=edit';
+	if (!$sock =@fsockopen($server, $port, $errno, $errstr, 30))
+	{
+		$error_str = 'error=Unable connect to "'.$server.':'.$port.'"';
+		$db_update = false;
+	}else
+	{
+		$url = "http://www.google.co.in";
+		$proxy_cont = '';
+		$sock = fsockopen($server, $port);
+		if (!$sock)    {return false;}
+		fputs($sock, "GET $url HTTP/1.0\r\nHost: $server\r\n");
+		fputs($sock, "Proxy-Authorization: Basic " . base64_encode ("$server_username:$server_password") . "\r\n\r\n");
+		while(!feof($sock)) {$proxy_cont .= fread($sock,4096);}
+		fclose($sock);
+		$proxy_cont = substr($proxy_cont, strpos($proxy_cont,"\r\n\r\n")+4);
+		
+		if(substr_count($proxy_cont, "Cache Access Denied") > 0)
+		{
+			$error_str = 'error=Proxy Authentication Required';
+			$db_update = false;
+		}
+		else
+		{
+			$action = 'ProxyServerConfig';
+		}
+	}
+}
 
-if($id=='')
-{
-	$id = $adb->getUniqueID("vtiger_systems");
-	$sql="insert into vtiger_systems values(" .$id .",'".$server."','".$port."','".$server_username."','".$server_password."','".$server_type."','".$smtp_auth."')";
-}
-else
-	$sql="update vtiger_systems set server = '".$server."', server_username = '".$server_username."', server_password = '".$server_password."', smtp_auth='".$smtp_auth."', server_type = '".$server_type."',server_port='".$port."' where id = ".$id;
-
-$adb->query($sql);
 if($server_type == 'backup')
 {
 	$conn_id = @ftp_connect($server);
@@ -42,11 +62,13 @@
 	if(!$conn_id)
 	{
 		$error_str = 'error=Unable connect to "'.$server.'"';
+		$db_update = false;
 	}else
 	{
 		if(!@ftp_login($conn_id, $server_username, $server_password))
 		{
 			$error_str = 'error=Couldn\'t connect to "'.$server.'" as user "'.$server_username.'"';
+			$db_update = false;
 		}
 		else
 		{
@@ -56,17 +78,17 @@
 	}
 }
 
-if($server_type == 'proxy')
+if($db_update)
 {
-	$action = 'ProxyServerConfig&proxy_server_mode=edit';
-	if (!$sock = fsockopen($server, $port, $errno, $errstr, 30))
+	if($id=='')
 	{
-	       $error_str = $errstr.' : '.$errno ;
-	}else
-	{
-	       $action = 'ProxyServerConfig';
-	        fclose($sock);
+		$id = $adb->getUniqueID("vtiger_systems");
+		$sql="insert into vtiger_systems values(" .$id .",'".$server."','".$port."','".$server_username."','".$server_password."','".$server_type."','".$smtp_auth."')";
 	}
+	else
+		$sql="update vtiger_systems set server = '".$server."', server_username = '".$server_username."', server_password = '".$server_password."', smtp_auth='".$smtp_auth."', server_type = '".$server_type."',server_port='".$port."' where id = ".$id;
+
+	$adb->query($sql);
 }
 
 //Added code to send a test mail to the currently logged in user




From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 30 07:57:43 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 30 Jun 2006 11:57:43 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231410=3A?=
 =?utf-8?q?_Inconsistency_when_saving_invoice_after_deleting_product?=
Message-ID: <076.2d85198f0b3d6e7494586a658db2fc52@vtiger.fosslabs.com>

#1410: Inconsistency when saving invoice after deleting product
-----------------------+----------------------------------------------------
 Reporter:  ahmed      |       Owner:  mickie
     Type:  defect     |      Status:  new   
 Priority:  critical   |   Milestone:        
Component:  vtigercrm  |     Version:  5.0.0 
 Keywords:             |  
-----------------------+----------------------------------------------------


-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1410>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 30 08:36:46 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 30 Jun 2006 12:36:46 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231412=3A?=
 =?utf-8?q?_Unable_to_add_Users_in_Event_Related_List?=
Message-ID: <076.dc27857ee704cc578df6306a717d2b14@vtiger.fosslabs.com>

#1412: Unable to add Users in Event Related List
-----------------------+----------------------------------------------------
 Reporter:  ahmed      |       Owner:  mangai
     Type:  defect     |      Status:  new   
 Priority:  critical   |   Milestone:        
Component:  vtigercrm  |     Version:  5.0.0 
 Keywords:             |  
-----------------------+----------------------------------------------------


-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1412>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 30 08:36:39 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 30 Jun 2006 12:36:39 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231411=3A?=
 =?utf-8?q?_Mail_Merge_functionality_using_Quotes/Invoice_data_fields?=
Message-ID: <076.944f1afdc57609414b2511fad157a0d5@vtiger.fosslabs.com>

#1411: Mail Merge functionality using Quotes/Invoice data fields
-------------------------+--------------------------------------------------
 Reporter:  mickie       |       Owner:  developer
     Type:  enhancement  |      Status:  new      
 Priority:  major        |   Milestone:           
Component:  vtigercrm    |     Version:  5.0.0    
 Keywords:               |  
-------------------------+--------------------------------------------------
 would be to be able to merge the Quotes/Invoice fields into a Word or RTF
 file. This way the user can easily design the Quotes/Inovice layout
 according to his/her wishes.
 Ref => http://forums.vtiger.com/viewtopic.php?t=6978

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1411>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 30 08:37:49 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 30 Jun 2006 12:37:49 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=23223=3A_?=
 =?utf-8?q?Issue_Entering_ticker_symbol?=
In-Reply-To: <076.77f0327f73033d13477d5b03eb082e2c@vtiger.fosslabs.com>
References: <076.77f0327f73033d13477d5b03eb082e2c@vtiger.fosslabs.com>
Message-ID: <085.41cb0fa680e65441e28040c0e009d901@vtiger.fosslabs.com>

#223: Issue Entering ticker symbol
---------------------------+------------------------------------------------
  Reporter:  jerrydgeorge  |       Owner:  mangai       
      Type:  enhancement   |      Status:  closed       
  Priority:  major         |   Milestone:               
 Component:  vtigercrm     |     Version:  5.0.0        
Resolution:  fixed         |    Keywords:  ticker symbol
---------------------------+------------------------------------------------
Changes (by mangai):

  * resolution:  => fixed
  * status:  new => closed

Comment:

 fixed and integrated in svn

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/223>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 30 08:41:17 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 30 Jun 2006 12:41:17 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231413=3A?=
	=?utf-8?q?_HelpDesk_ticket_to_Invoice?=
Message-ID: <076.14a1e485add272281c4096c85fbf8a77@vtiger.fosslabs.com>

#1413: HelpDesk ticket to Invoice
-------------------------+--------------------------------------------------
 Reporter:  mickie       |       Owner:  developer
     Type:  enhancement  |      Status:  new      
 Priority:  major        |   Milestone:           
Component:  vtigercrm    |     Version:  5.0.1    
 Keywords:               |  
-------------------------+--------------------------------------------------
 would like to be able to create an invoice straight from a helpdesk
 ticket. I have never been able to use mail merge reliably, because I do
 not use IE. I like how invoices can be created from quotes and it would be
 nice to be able to do the same with tickets.
 Ref ==> http://forums.vtiger.com/viewtopic.php?t=7858

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1413>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 30 08:45:53 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 30 Jun 2006 12:45:53 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231414=3A?=
 =?utf-8?q?_Searching_Activities_by_ActivityType_from_Custom_View_does_not?=
 =?utf-8?q?_show_any_result?=
Message-ID: <076.58b65d03d785097bb14a301cda2997bc@vtiger.fosslabs.com>

#1414: Searching Activities by ActivityType from Custom View does not show any
result
-----------------------+----------------------------------------------------
 Reporter:  ahmed      |       Owner:  jeri 
     Type:  defect     |      Status:  new  
 Priority:  critical   |   Milestone:       
Component:  vtigercrm  |     Version:  5.0.0
 Keywords:             |  
-----------------------+----------------------------------------------------


-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1414>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 30 08:54:33 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 30 Jun 2006 12:54:33 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7703 - in
 /vtigercrm/trunk/soap: vtigerolservice.php wordplugin.php
Message-ID: <20060630125433.D4E55181709@vtiger.fosslabs.com>

Author: saraj
Date: Fri Jun 30 06:54:27 2006
New Revision: 7703

Log:
checked vtiger_ prefix and neat alighned

Modified:
    vtigercrm/trunk/soap/vtigerolservice.php
    vtigercrm/trunk/soap/wordplugin.php

Modified: vtigercrm/trunk/soap/vtigerolservice.php
==============================================================================
--- vtigercrm/trunk/soap/vtigerolservice.php (original)
+++ vtigercrm/trunk/soap/vtigerolservice.php Fri Jun 30 06:54:27 2006
@@ -288,7 +288,7 @@
 function AddMessageToContact($username,$contactid,$msgdtls)
 {
 	global $adb;
-     require_once('modules/Users/User.php');
+	require_once('modules/Users/User.php');
 	require_once('modules/Emails/Email.php');
 	
 	$seed_user = new User();
@@ -296,40 +296,40 @@
 	
 	foreach($msgdtls as $msgdtl)
 	{
-     	if(isset($msgdtl))
-     	{    
-          	$email = new Email();
-               //$log->debug($msgdtls['contactid']);
-          	$email_body = str_replace("'", "''", $msgdtl['body']);
-          	$email_subject = str_replace("'", "''",$msgdtl['subject']);
-          	$date_sent = getDisplayDate($msgdtl['datesent']);
-                
-          	$email->column_fields[subject] = $email_subject;
-          	$email->column_fields[assigned_user_id] = $user_id;
-          	$email->column_fields[date_start] = $date_sent;
-          	$email->column_fields[description]  = htmlentities($email_body);
-         	$email->column_fields[activitytype] = 'Emails'; 
-          	$email->save("Emails");
-          
-          	$email->set_emails_contact_invitee_relationship($email->id,$contactid);
-          	$email->set_emails_se_invitee_relationship($email->id,$contactid);
-          	$email->set_emails_user_invitee_relationship($email->id,$user_id);
-		$sql = "select email from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid where vtiger_crmentity.deleted =0 and vtiger_contactdetails.contactid='".$contactid."'";
-		$result = $adb->query($sql);
-		$camodulerow = $adb->fetch_array($result);
-		if(isset($camodulerow))
-		{
-			$emailid = $camodulerow["email"];
-			$query = 'insert into vtiger_emaildetails values ('.$email->id.',"","'.$emailid.'","","","","'.$cotactid."@77|".'","OUTLOOK")';
-			$adb->query($query);
-		}
-		return $email->id;
-          }
-          else
-          {
-               return "";
-          }
-     }
+     		if(isset($msgdtl))
+     		{    
+          		$email = new Email();
+			//$log->debug($msgdtls['contactid']);
+			$email_body = str_replace("'", "''", $msgdtl['body']);
+			$email_subject = str_replace("'", "''",$msgdtl['subject']);
+			$date_sent = getDisplayDate($msgdtl['datesent']);
+
+			$email->column_fields[subject] = $email_subject;
+			$email->column_fields[assigned_user_id] = $user_id;
+			$email->column_fields[date_start] = $date_sent;
+			$email->column_fields[description]  = htmlentities($email_body);
+			$email->column_fields[activitytype] = 'Emails'; 
+			$email->save("Emails");
+
+			$email->set_emails_contact_invitee_relationship($email->id,$contactid);
+			$email->set_emails_se_invitee_relationship($email->id,$contactid);
+			$email->set_emails_user_invitee_relationship($email->id,$user_id);
+			$sql = "select email from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid where vtiger_crmentity.deleted =0 and vtiger_contactdetails.contactid='".$contactid."'";
+			$result = $adb->query($sql);
+			$camodulerow = $adb->fetch_array($result);
+			if(isset($camodulerow))
+			{
+				$emailid = $camodulerow["email"];
+				$query = 'insert into vtiger_emaildetails values ('.$email->id.',"","'.$emailid.'","","","","'.$cotactid."@77|".'","OUTLOOK")';
+				$adb->query($query);
+			}
+			return $email->id;
+		}
+		else
+		{
+			return "";
+		}
+	}
 }
 
 function LoginToVtiger($userid,$password)
@@ -363,74 +363,74 @@
 
 function AddEmailAttachment($emailid,$filedata,$filename,$filesize,$filetype,$username)
 {
-     global $adb;
-     require_once('modules/Users/User.php');
-     require_once('include/utils/utils.php');
-     
-     $date_var = date('YmdHis');
-     
-     $seed_user = new User();
-     $user_id = $seed_user->retrieve_user_id($username);
-     	
-     $crmid = $adb->getUniqueID("vtiger_crmentity");
-     
-     $upload_file_path = decideFilePath();
-   	
-     $handle = fopen($upload_file_path.$filename,"wb");
-     fwrite($handle,base64_decode($filedata),$filesize);
-     fclose($handle);
-
-     $sql1 = "insert into vtiger_crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime,modifiedtime) 
-     values(".$crmid.",".$user_id.",".$user_id.",'Emails Attachment',' ',".$adb->formatString("crmentity","createdtime",$date_var).",".$adb->formatString("crmentity","modifiedtime",$date_var).")";
-     
-     $entityresult = $adb->query($sql1);	
-     $filetype="application/octet-stream";
-     
-     if($entityresult != false)
-     {
-    	$sql2="insert into vtiger_attachments(attachmentsid, name, description, type, path) 
-               values(".$crmid.",'".$filename."',' ','".$filetype."','".$upload_file_path."')";
-    	    
-        $result=$adb->query($sql2);
-     
-        $sql3='insert into vtiger_seattachmentsrel values('.$emailid.','.$crmid.')';
-        $adb->query($sql3);
-     
-        return $crmid;   
-     }
-     else
-     {
-   		 //$server->setError("Invalid username and/or password"); 
-          return "";
-     }
+	global $adb;
+	require_once('modules/Users/User.php');
+	require_once('include/utils/utils.php');
+
+	$date_var = date('YmdHis');
+
+	$seed_user = new User();
+	$user_id = $seed_user->retrieve_user_id($username);
+
+	$crmid = $adb->getUniqueID("vtiger_crmentity");
+
+	$upload_file_path = decideFilePath();
+
+	$handle = fopen($upload_file_path.$crmid."_".$filename,"wb");
+	fwrite($handle,base64_decode($filedata),$filesize);
+	fclose($handle);
+
+	$sql1 = "insert into vtiger_crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime,modifiedtime) 
+			values(".$crmid.",".$user_id.",".$user_id.",'Emails Attachment',' ',".$adb->formatString("vtiger_crmentity","createdtime",$date_var).",".$adb->formatString("vtiger_crmentity","modifiedtime",$date_var).")";
+
+	$entityresult = $adb->query($sql1);	
+	$filetype="application/octet-stream";
+
+	if($entityresult != false)
+	{
+		$sql2="insert into vtiger_attachments(attachmentsid, name, description, type, path) 
+				values(".$crmid.",'".$filename."',' ','".$filetype."','".$upload_file_path."')";
+
+		$result=$adb->query($sql2);
+
+		$sql3='insert into vtiger_seattachmentsrel values('.$emailid.','.$crmid.')';
+		$adb->query($sql3);
+
+		return $crmid;   
+	}
+	else
+	{
+		//$server->setError("Invalid username and/or password"); 
+		return "";
+	}
 }
 
 function GetContacts($username)
 {
-    global $adb;
-    require_once('modules/Contacts/Contact.php');
-     
-    $seed_contact = new Contact();
-    $output_list = Array();
-     
-    $query = $seed_contact->get_contactsforol($username);
-    $result = $adb->query($query);
-    
-    while($contact = $adb->fetch_array($result))
-  	{
-        if($contact["birthdate"] == "0000-00-00")
-        {
-	        	$contact["birthdate"] = "";
-        }
-        if($contact["salutation"] == "--None--")
-        {
-          	$contact["salutation"] = "";
-        }
-        
-        $namelist = explode(" ", $contact["last_name"]);
-        if(isset($namelist))
-        {
-        	if(count($namelist) >= 2) 
+	global $adb;
+	require_once('modules/Contacts/Contact.php');
+
+	$seed_contact = new Contact();
+	$output_list = Array();
+
+	$query = $seed_contact->get_contactsforol($username);
+	$result = $adb->query($query);
+
+	while($contact = $adb->fetch_array($result))
+	{
+		if($contact["birthdate"] == "0000-00-00")
+		{
+			$contact["birthdate"] = "";
+		}
+		if($contact["salutation"] == "--None--")
+		{
+			$contact["salutation"] = "";
+		}
+
+		$namelist = explode(" ", $contact["last_name"]);
+		if(isset($namelist))
+		{
+			if(count($namelist) >= 2) 
 			{
 				$contact["last_name"] = $namelist[count($namelist)-1];       	
 				for($i=0; $i<count($namelist)-2; $i++)
@@ -442,7 +442,7 @@
 					$middlename = implode(" ",$middlename);
 				}
 			}
-        }
+		}
 
 		$output_list[] = Array(
 				"id" => $contact["id"],
@@ -476,11 +476,11 @@
 				"description" => "",
 				"category" => "",        
 			  	);
-  	}
-  	
-    //to remove an erroneous compiler warning
-    $seed_contact = $seed_contact;
-    return $output_list;
+	}
+
+	//to remove an erroneous compiler warning
+	$seed_contact = $seed_contact;
+	return $output_list;
 }
 
 function AddContacts($username,$cntdtls)
@@ -499,44 +499,46 @@
 	
 	foreach($cntdtls as $cntrow)
 	{
-      if(isset($cntrow))
-      {
-  			$contact->column_fields[salutation]=$cntrow["title"];		
-      	$contact->column_fields[firstname]=$cntrow["firstname"];
-      	if($cntrow["middlename"] != "")
-      	{
-      		$contact->column_fields[lastname]=$cntrow["middlename"]." ".$cntrow["lastname"];
-      	}else
-      	{
-      		$contact->column_fields[lastname]=$cntrow["lastname"];
-      	}
-      	$contact->column_fields[birthday]= getDisplayDate($cntrow["birthdate"]);
-      	$contact->column_fields[email]=$cntrow["emailaddress"];
-      	$contact->column_fields[title]=$cntrow["jobtitle"];
-      	$contact->column_fields[department]=$cntrow["department"];
-      	$contact->column_fields[account_id]= retrieve_account_id($cntrow["accountname"],$user_id);
-          $contact->column_fields[phone]= $cntrow["officephone"];
-          $contact->column_fields[homephone]= $cntrow["homephone"];
-          $contact->column_fields[otherphone]= $cntrow["otherphone"];
-          $contact->column_fields[fax]= $cntrow["fax"];
-      	$contact->column_fields[mobile]=$cntrow["mobile"];
-      	$contact->column_fields[assistant]= $cntrow["asstname"];
-          $contact->column_fields[assistantphone]= $cntrow["asstphone"];     
-      	//$contact->column_fields[reports_to_id] =retrievereportsto($reportsto,$user_id,$account_id);// NOT FIXED IN SAVEENTITY.PHP
-      	$contact->column_fields[mailingstreet]=$cntrow["mailingstreet"];
-      	$contact->column_fields[mailingcity]=$cntrow["mailingcity"];
-      	$contact->column_fields[mailingstate]=$cntrow["mailingstate"];
-      	$contact->column_fields[mailingzip]=$cntrow["mailingzip"];
-      	$contact->column_fields[mailingcountry]=$cntrow["mailingcountry"];    
-      	$contact->column_fields[otherstreet]=$cntrow["otherstreet"];
-      	$contact->column_fields[othercity]=$cntrow["othercity"];
-      	$contact->column_fields[otherstate]=$cntrow["otherstate"];
-      	$contact->column_fields[otherzip]=$cntrow["otherzip"];
-      	$contact->column_fields[othercountry]=$cntrow["othercountry"];    	
-          $contact->column_fields[assigned_user_id]=$user_id;   
-  		$contact->column_fields[description]= $cntrow["description"];
-       	$contact->save("Contacts");	
-			}	
+		if(isset($cntrow))
+		{
+			$contact->column_fields[salutation]=$cntrow["title"];		
+ 			$contact->column_fields[firstname]=$cntrow["firstname"];
+			
+			if($cntrow["middlename"] != "")
+			{
+				$contact->column_fields[lastname]=$cntrow["middlename"]." ".$cntrow["lastname"];
+			}else
+			{
+				$contact->column_fields[lastname]=$cntrow["lastname"];
+			}
+
+			$contact->column_fields[birthday]= getDisplayDate($cntrow["birthdate"]);
+			$contact->column_fields[email]=$cntrow["emailaddress"];
+			$contact->column_fields[title]=$cntrow["jobtitle"];
+			$contact->column_fields[department]=$cntrow["department"];
+			$contact->column_fields[account_id]= retrieve_account_id($cntrow["accountname"],$user_id);
+			$contact->column_fields[phone]= $cntrow["officephone"];
+			$contact->column_fields[homephone]= $cntrow["homephone"];
+			$contact->column_fields[otherphone]= $cntrow["otherphone"];
+			$contact->column_fields[fax]= $cntrow["fax"];
+			$contact->column_fields[mobile]=$cntrow["mobile"];
+			$contact->column_fields[assistant]= $cntrow["asstname"];
+			$contact->column_fields[assistantphone]= $cntrow["asstphone"];     
+			//$contact->column_fields[reports_to_id] =retrievereportsto($reportsto,$user_id,$account_id);// NOT FIXED IN SAVEENTITY.PHP
+			$contact->column_fields[mailingstreet]=$cntrow["mailingstreet"];
+			$contact->column_fields[mailingcity]=$cntrow["mailingcity"];
+			$contact->column_fields[mailingstate]=$cntrow["mailingstate"];
+			$contact->column_fields[mailingzip]=$cntrow["mailingzip"];
+			$contact->column_fields[mailingcountry]=$cntrow["mailingcountry"];    
+			$contact->column_fields[otherstreet]=$cntrow["otherstreet"];
+			$contact->column_fields[othercity]=$cntrow["othercity"];
+			$contact->column_fields[otherstate]=$cntrow["otherstate"];
+			$contact->column_fields[otherzip]=$cntrow["otherzip"];
+			$contact->column_fields[othercountry]=$cntrow["othercountry"];    	
+			$contact->column_fields[assigned_user_id]=$user_id;   
+			$contact->column_fields[description]= $cntrow["description"];
+			$contact->save("Contacts");	
+		}	
 	}
 	$contact = $contact;	
 	return $contact->id;
@@ -558,47 +560,47 @@
 	
 	foreach($cntdtls as $cntrow)
 	{
-      if(isset($cntrow))
-      {
-				$contact->retrieve_entity_info($cntrow["id"],"Contacts");
-  			$contact->column_fields[salutation]=$cntrow["title"];		
-      	$contact->column_fields[firstname]=$cntrow["firstname"];
-      	if($cntrow["middlename"] != "")
-      	{
-      		$contact->column_fields[lastname]=$cntrow["middlename"]." ".$cntrow["lastname"];
-      	}else
-      	{
-      		$contact->column_fields[lastname]=$cntrow["lastname"];
-      	}
-      	$contact->column_fields[birthday]= getDisplayDate($cntrow["birthdate"]);
-      	$contact->column_fields[email]=$cntrow["emailaddress"];
-      	$contact->column_fields[title]=$cntrow["jobtitle"];
-      	$contact->column_fields[department]=$cntrow["department"];
-      	$contact->column_fields[account_id]= retrieve_account_id($cntrow["accountname"],$user_id);
-        $contact->column_fields[phone]= $cntrow["officephone"];
-        $contact->column_fields[homephone]= $cntrow["homephone"];
-        $contact->column_fields[otherphone]= $cntrow["otherphone"];
-        $contact->column_fields[fax]= $cntrow["fax"];
-      	$contact->column_fields[mobile]=$cntrow["mobile"];
-      	$contact->column_fields[assistant]= $cntrow["asstname"];
-        $contact->column_fields[assistantphone]= $cntrow["asstphone"];     
-      	//$contact->column_fields[reports_to_id] =retrievereportsto($reportsto,$user_id,$account_id);// NOT FIXED IN SAVEENTITY.PHP
-      	$contact->column_fields[mailingstreet]=$cntrow["mailingstreet"];
-      	$contact->column_fields[mailingcity]=$cntrow["mailingcity"];
-      	$contact->column_fields[mailingstate]=$cntrow["mailingstate"];
-      	$contact->column_fields[mailingzip]=$cntrow["mailingzip"];
-      	$contact->column_fields[mailingcountry]=$cntrow["mailingcountry"];    
-      	$contact->column_fields[otherstreet]=$cntrow["otherstreet"];
-      	$contact->column_fields[othercity]=$cntrow["othercity"];
-      	$contact->column_fields[otherstate]=$cntrow["otherstate"];
-      	$contact->column_fields[otherzip]=$cntrow["otherzip"];
-      	$contact->column_fields[othercountry]=$cntrow["othercountry"];    	
-        $contact->column_fields[assigned_user_id]=$user_id;   
-  		  $contact->column_fields[description]= $cntrow["description"];
-  		  $contact->id = $cntrow["id"];
-  		  $contact->mode = "edit";
-       	$contact->save("Contacts");	
-			}	
+		if(isset($cntrow))
+		{
+			$contact->retrieve_entity_info($cntrow["id"],"Contacts");
+			$contact->column_fields[salutation]=$cntrow["title"];		
+			$contact->column_fields[firstname]=$cntrow["firstname"];
+			if($cntrow["middlename"] != "")
+			{
+				$contact->column_fields[lastname]=$cntrow["middlename"]." ".$cntrow["lastname"];
+			}else
+			{
+				$contact->column_fields[lastname]=$cntrow["lastname"];
+			}
+			$contact->column_fields[birthday]= getDisplayDate($cntrow["birthdate"]);
+			$contact->column_fields[email]=$cntrow["emailaddress"];
+			$contact->column_fields[title]=$cntrow["jobtitle"];
+			$contact->column_fields[department]=$cntrow["department"];
+			$contact->column_fields[account_id]= retrieve_account_id($cntrow["accountname"],$user_id);
+			$contact->column_fields[phone]= $cntrow["officephone"];
+			$contact->column_fields[homephone]= $cntrow["homephone"];
+			$contact->column_fields[otherphone]= $cntrow["otherphone"];
+			$contact->column_fields[fax]= $cntrow["fax"];
+			$contact->column_fields[mobile]=$cntrow["mobile"];
+			$contact->column_fields[assistant]= $cntrow["asstname"];
+			$contact->column_fields[assistantphone]= $cntrow["asstphone"];     
+			//$contact->column_fields[reports_to_id] =retrievereportsto($reportsto,$user_id,$account_id);// NOT FIXED IN SAVEENTITY.PHP
+			$contact->column_fields[mailingstreet]=$cntrow["mailingstreet"];
+			$contact->column_fields[mailingcity]=$cntrow["mailingcity"];
+			$contact->column_fields[mailingstate]=$cntrow["mailingstate"];
+			$contact->column_fields[mailingzip]=$cntrow["mailingzip"];
+			$contact->column_fields[mailingcountry]=$cntrow["mailingcountry"];    
+			$contact->column_fields[otherstreet]=$cntrow["otherstreet"];
+			$contact->column_fields[othercity]=$cntrow["othercity"];
+			$contact->column_fields[otherstate]=$cntrow["otherstate"];
+			$contact->column_fields[otherzip]=$cntrow["otherzip"];
+			$contact->column_fields[othercountry]=$cntrow["othercountry"];    	
+			$contact->column_fields[assigned_user_id]=$user_id;   
+			$contact->column_fields[description]= $cntrow["description"];
+			$contact->id = $cntrow["id"];
+			$contact->mode = "edit";
+			$contact->save("Contacts");	
+		}	
 	}	
 	$contact = $contact;
 	return $contact->id;
@@ -606,62 +608,62 @@
 
 function DeleteContacts($username,$crmid)
 {
-  global $current_user;
+	global $current_user;
 	require_once('modules/Users/User.php');
 	require_once('modules/Contacts/Contact.php');
-	 
+
 	$seed_user = new User();
 	$user_id = $seed_user->retrieve_user_id($username);
 	$current_user = $seed_user;
 	$current_user->retrieve($user_id);
- 
-  $contact = new Contact();
-  $contact->id = $crmid;
-  $contact->mark_deleted($contact->id);
-  
-  $contact = $contact;
-  return $contact->id;
+
+	$contact = new Contact();
+	$contact->id = $crmid;
+	$contact->mark_deleted($contact->id);
+
+	$contact = $contact;
+	return $contact->id;
 }
 
 function retrieve_account_id($account_name,$user_id)
 {
-    
-		if($account_name=="")
-    {
-        return null;
-    }
-
-    $query = "select vtiger_account.accountname vtiger_accountname,vtiger_account.accountid vtiger_accountid from vtiger_account inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_account.accountid where vtiger_crmentity.deleted=0 and vtiger_account.accountname='" .$account_name."'";
-
-
-	  $db = new PearDatabase();
-    $result=  $db->query($query) or die ("Not able to execute insert");
-    
-    $rows_count =  $db->getRowCount($result);
-    if($rows_count==0)
-    {
-    	require_once('modules/Accounts/Account.php');
-	    $account = new Account();
-    	$account->column_fields[accountname] = $account_name;
-    	$account->column_fields[assigned_user_id]=$user_id;
-    	//$account->saveentity("Accounts");
-    	$account->save("Accounts");
-        //mysql_close();
-    	return $account->id;
-    }
-    else if ($rows_count==1)
-    {
-        $row = $db->fetchByAssoc($result, 0);
-        //mysql_close();
-        return $row["accountid"];	    
-    }
-    else
-    {
-        $row = $db->fetchByAssoc($result, 0);
-        //mysql_close();
-        return $row["accountid"];	    
-    }
-    
+
+	if($account_name=="")
+	{
+		return null;
+	}
+
+	$query = "select vtiger_account.accountname accountname,vtiger_account.accountid accountid from vtiger_account inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_account.accountid where vtiger_crmentity.deleted=0 and vtiger_account.accountname='" .$account_name."'";
+
+
+	$db = new PearDatabase();
+	$result=  $db->query($query) or die ("Not able to execute insert");
+
+	$rows_count =  $db->getRowCount($result);
+	if($rows_count==0)
+	{
+		require_once('modules/Accounts/Account.php');
+		$account = new Account();
+		$account->column_fields[accountname] = $account_name;
+		$account->column_fields[assigned_user_id]=$user_id;
+		//$account->saveentity("Accounts");
+		$account->save("Accounts");
+		//mysql_close();
+		return $account->id;
+	}
+	else if ($rows_count==1)
+	{
+		$row = $db->fetchByAssoc($result, 0);
+		//mysql_close();
+		return $row["accountid"];	    
+	}
+	else
+	{
+		$row = $db->fetchByAssoc($result, 0);
+		//mysql_close();
+		return $row["accountid"];	    
+	}
+
 }
 
 function GetTasks($username)
@@ -670,52 +672,52 @@
 	require_once('modules/Activities/Activity.php');
 		
 	$seed_task = new Activity();
-    $output_list = Array();
+	$output_list = Array();
   
-    $query = $seed_task->get_tasksforol($username);
-    $result = $adb->query($query);
+	$query = $seed_task->get_tasksforol($username);
+	$result = $adb->query($query);
     
-    while($task = $adb->fetch_array($result))
-  	{
+	while($task = $adb->fetch_array($result))
+	{
   		if($task["startdate"] == "0000-00-00" || $task["startdate"] == NULL)
-        {
-	       	$task["startdate"] = "";
-        }
-        if($task["duedate"] == "0000-00-00" || $task["duedate"] == NULL)
-        {
-	       	$task["duedate"] = "";
-        }
+        	{
+		       	$task["startdate"] = "";
+        	}
+        	if($task["duedate"] == "0000-00-00" || $task["duedate"] == NULL)
+        	{
+		       	$task["duedate"] = "";
+        	}
         
-        if($task["status"] == "Not Started")
-        {
-       		$task["status"] = "0";
-        }else if($task["status"] == "In Progress")
-        {
-        	$task["status"] = "1";
-        }else if($task["status"] == "Completed")
-        {
-        	$task["status"] = "2";
-        }else if($task["status"] == "Deferred")
-        {
-        	$task["status"] = "4";
-        }else if($task["status"] == "Pending Input" || $task["status"] == "Planned")
-        {
-        	$task["status"] = "3";
-        }else
-        {
-        	$task["status"] = "0";
-        }
+        	if($task["status"] == "Not Started")
+        	{
+       			$task["status"] = "0";
+        	}else if($task["status"] == "In Progress")
+        	{
+        		$task["status"] = "1";
+        	}else if($task["status"] == "Completed")
+        	{
+        		$task["status"] = "2";
+        	}else if($task["status"] == "Deferred")
+        	{
+        		$task["status"] = "4";
+        	}else if($task["status"] == "Pending Input" || $task["status"] == "Planned")
+        	{
+        		$task["status"] = "3";
+        	}else
+        	{
+        		$task["status"] = "0";
+        	}
         
-        if($task["priority"] == "High")
-        {
-       		$task["priority"] = "2";
-        }else if($task["priority"] == "Low")
-        {
-        	$task["priority"] = "0";
-        }else if($task["priority"] == "Medium")
-        {
-        	$task["priority"] = "1";
-        }
+        	if($task["priority"] == "High")
+        	{
+       			$task["priority"] = "2";
+        	}else if($task["priority"] == "Low")
+        	{
+        		$task["priority"] = "0";
+        	}else if($task["priority"] == "Medium")
+        	{
+        		$task["priority"] = "1";
+        	}
         
 		$output_list[] = Array(
 						"id" => $task["taskid"],
@@ -728,7 +730,7 @@
 						"contactname" => $task["firstname"]." ".$task["lastname"],
 						"category" => "",        
 						);
-  	}
+	}
 	$seed_task = $seed_task;
 	return $output_list;
 }
@@ -748,8 +750,8 @@
 	
 	foreach($taskdtls as $taskrow)
 	{
-      	if(isset($taskrow))
-      	{
+      		if(isset($taskrow))
+      		{
 			if($taskrow["status"] == "0")
 			{
 				$taskrow["status"] = "Not Started";
@@ -811,8 +813,8 @@
 	
 	foreach($taskdtls as $taskrow)
 	{
-      if(isset($taskrow))
-      {
+		if(isset($taskrow))
+		{
 			if($taskrow["status"] == "0")
 			{
 				$taskrow["status"] = "Not Started";
@@ -833,16 +835,16 @@
 				$taskrow["status"] = "Not Started";
 			}
         
-    		if($taskrow["priority"] == "2")
-            {
-           		$taskrow["priority"] = "High";
-            }else if($taskrow["priority"] == "0")
-            {
-            	$taskrow["priority"] = "Low";
-            }else if($taskrow["priority"] == "1")
-            {
-            	$taskrow["priority"] = "Medium";
-            }
+    			if($taskrow["priority"] == "2")
+			{
+           			$taskrow["priority"] = "High";
+           		}else if($taskrow["priority"] == "0")
+           		{
+           			$taskrow["priority"] = "Low";
+           		}else if($taskrow["priority"] == "1")
+           		{
+           		 	$taskrow["priority"] = "Medium";
+           		}
 					
 			$task->retrieve_entity_info($taskrow["id"],"Activities");
 			$task->column_fields[subject] = $taskrow["subject"];
@@ -859,8 +861,8 @@
 			$task->mode="edit";
 
 			$task->save("Activities");
-      }
-  }
+		}
+	}
 	return $task->id;
 }
 
@@ -892,32 +894,32 @@
 	$query = $seed_clndr->get_calendarsforol($username);
 	$result = $adb->query($query);
     
-    while($clndr = $adb->fetch_array($result))
+	while($clndr = $adb->fetch_array($result))
   	{
   		if($clndr["startdate"] == "0000-00-00" || $clndr["startdate"] == NULL)
-        {
+        	{
 	        	$clndr["startdate"] = "";
-        }
-        if($clndr["duedate"] == "0000-00-00" || $clndr["duedate"] == NULL)
-        {
+		}
+	        if($clndr["duedate"] == "0000-00-00" || $clndr["duedate"] == NULL)
+        	{
 	        	$clndr["duedate"] = "";
-        }
+        	}
 		
-	   //this seperates the $$clndr["startdate"] into an array - YYYY-MM-DD
-	   $expldstartdate = explode("-", $clndr["startdate"]);
-	   $expldtimestart = explode(":", $clndr["startime"]);	
-
-	   $expldduedate = explode("-", $clndr["duedate"]);
-
-	   //this makes a timestamp out of the exploded date this number is in seconds
-	   $startdtm = mktime($expldtimestart[0], $expldtimestart[1], 0, $expldstartdate[1], $expldstartdate[2], $expldstartdate[0]);
-		
-       $duedtm = mktime($expldtimestart[0]+$clndr["duehours"], $expldtimestart[1]+$clndr["dueminutes"], 0, $expldduedate[1], $expldduedate[2], $expldduedate[0]);
-       
-	   $clndr["startdate"] = date("Y-m-d H:i:s", $startdtm);
-	   $clndr["duedate"] = date("Y-m-d H:i:s", $duedtm);
-
-	   $output_list[] = Array(
+		//this seperates the $$clndr["startdate"] into an array - YYYY-MM-DD
+		$expldstartdate = explode("-", $clndr["startdate"]);
+		$expldtimestart = explode(":", $clndr["startime"]);	
+
+		$expldduedate = explode("-", $clndr["duedate"]);
+
+		//this makes a timestamp out of the exploded date this number is in seconds
+		$startdtm = mktime($expldtimestart[0], $expldtimestart[1], 0, $expldstartdate[1], $expldstartdate[2], $expldstartdate[0]);
+
+		$duedtm = mktime($expldtimestart[0]+$clndr["duehours"], $expldtimestart[1]+$clndr["dueminutes"], 0, $expldduedate[1], $expldduedate[2], $expldduedate[0]);
+
+		$clndr["startdate"] = date("Y-m-d H:i:s", $startdtm);
+		$clndr["duedate"] = date("Y-m-d H:i:s", $duedtm);
+
+		$output_list[] = Array(
 						"id" => $clndr["clndrid"],
 						"subject" => $clndr["subject"],
 						"startdate" => $clndr["startdate"],
@@ -947,8 +949,8 @@
 	
 	foreach($clndrdtls as $clndrow)
 	{
-      if(isset($clndrow))
-      {
+		if(isset($clndrow))
+		{
 			$astartdtm = explode(" ",$clndrow["startdate"]);
 			$aduedtm = explode(" ",$clndrow["duedate"]);
 			
@@ -975,8 +977,8 @@
 			$clndr->column_fields[activitytype]="Meeting";
 			$clndr->column_fields[assigned_user_id]=$user_id;
 			$clndr->save("Activities");
-      }
-  }
+		}
+	}
 	return $clndr->id;
 }
 
@@ -996,8 +998,8 @@
 	
 	foreach($clndrdtls as $clndrow)
 	{
-      if(isset($clndrow))
-      {
+		if(isset($clndrow))
+		{
 			$astartdtm = explode(" ",$clndrow["startdate"]);
 			$aduedtm = explode(" ",$clndrow["duedate"]);
 			
@@ -1027,8 +1029,8 @@
 			$clndr->id = $clndrow["id"];
 			$clndr->mode="edit";
 			$clndr->save("Activities");
-      }
-  }
+		}
+	}
 	return $clndr->id;
 }
 
@@ -1052,24 +1054,24 @@
 //To find the Difference between time
 function get_time_difference( $start, $end )
 {
-    $uts['start'] = strtotime( $start );
-    $uts['end'] = strtotime( $end );
-    if( $uts['start']!==-1 && $uts['end']!==-1 )
-    {
-        if( $uts['end'] >= $uts['start'] )
-        {
-            $diff    =    $uts['end'] - $uts['start'];
-            if( $days=intval((floor($diff/86400))) )
-                $diff = $diff % 86400;
-            if( $hours=intval((floor($diff/3600))) )
-                $diff = $diff % 3600;
-            if( $minutes=intval((floor($diff/60))) )
-                $diff = $diff % 60;
-            $diff    =    intval( $diff );            
-            return( array('days'=>$days, 'hours'=>$hours, 'minutes'=>$minutes, 'seconds'=>$diff) );
-        }
-    }
-    return( false );
+	$uts['start'] = strtotime( $start );
+	$uts['end'] = strtotime( $end );
+	if( $uts['start']!==-1 && $uts['end']!==-1 )
+	{
+		if( $uts['end'] >= $uts['start'] )
+		{
+			$diff    =    $uts['end'] - $uts['start'];
+			if( $days=intval((floor($diff/86400))) )
+			$diff = $diff % 86400;
+			if( $hours=intval((floor($diff/3600))) )
+			$diff = $diff % 3600;
+			if( $minutes=intval((floor($diff/60))) )
+			$diff = $diff % 60;
+			$diff    =    intval( $diff );            
+			return( array('days'=>$days, 'hours'=>$hours, 'minutes'=>$minutes, 'seconds'=>$diff) );
+		}
+	}
+	return( false );
 }
 
 $server->service(utf8_encode($HTTP_RAW_POST_DATA)); 

Modified: vtigercrm/trunk/soap/wordplugin.php
==============================================================================
--- vtigercrm/trunk/soap/wordplugin.php (original)
+++ vtigercrm/trunk/soap/wordplugin.php Fri Jun 30 06:54:27 2006
@@ -71,72 +71,67 @@
 	        
 function get_tickets_columns($user_name, $password)
 {
-    require_once('modules/HelpDesk/HelpDesk.php');
-    if(isPermitted("HelpDesk","index") == "yes")
-    { 
-    $helpdesk = new HelpDesk();
-    return $helpdesk->getColumnNames_Hd();
-    }
-    else
-    return null;
+	require_once('modules/HelpDesk/HelpDesk.php');
+	if(isPermitted("HelpDesk","index") == "yes")
+	{ 
+		$helpdesk = new HelpDesk();
+		return $helpdesk->getColumnNames_Hd();
+	}
+	else
+		return null;
 }
 
 function get_contacts_columns($user_name, $password)
 {
-    require_once('modules/Contacts/Contact.php');
-    if(isPermitted("Contacts","index") == "yes")
-    {
-	    $contact = new Contact();
-	    return $contact->getColumnNames();	   
-    }
- else
-    return null;
+	require_once('modules/Contacts/Contact.php');
+	if(isPermitted("Contacts","index") == "yes")
+	{
+		$contact = new Contact();
+		return $contact->getColumnNames();	   
+	}
+	else
+		return null;
 
 }
 
 
 function get_accounts_columns($user_name, $password)
 {
-    require_once('modules/Accounts/Account.php');
-    if(isPermitted("Accounts","index") == "yes")
-    {
-	    $account = new Account();
-	    return $account->getColumnNames_Acnt();
-    }
- else
-    return null;
+	require_once('modules/Accounts/Account.php');
+	if(isPermitted("Accounts","index") == "yes")
+	{
+		$account = new Account();
+		return $account->getColumnNames_Acnt();
+	}
+	else
+		return null;
 
 }
 
 
 function get_leads_columns($user_name, $password)
 {
-    require_once('modules/Leads/Lead.php');
- if(isPermitted("Leads","index") == "yes")
-     {
-    $lead = new Lead();
-    return $lead->getColumnNames_Lead();
-    }
- else
-    return null;
-
+	require_once('modules/Leads/Lead.php');
+	if(isPermitted("Leads","index") == "yes")
+	{
+		$lead = new Lead();
+		return $lead->getColumnNames_Lead();
+	}
+	else
+		return null;
 }
 
 function get_user_columns($user_name, $password)
 {
-    require_once('modules/Users/User.php');
-     if(isPermitted("Users","index") == "yes")
-         {
-		 
-    $user = new User();
-    return $user->getColumnNames_User();
-    }
- else
-    return null;
-
+	require_once('modules/Users/User.php');
+	if(isPermitted("Users","index") == "yes")
+	{
+		$user = new User();
+		return $user->getColumnNames_User();
+	}
+	else
+		return null;
 }
-
-
 
 
 function create_session($user_name, $password)




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 30 08:56:03 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 30 Jun 2006 12:56:03 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7704 - in /vtigercrm/trunk:
 include/utils/ modules/Accounts/ modules/Activities/ modules/Campaigns/
 modules/Contacts/ modules/Faq/ modules/HelpDesk/ modules/Invoice/
 modules/Leads/ modules/Notes/ modules/Potentials/ modules/PriceBooks/
 modules/Products/ modules/PurchaseOrder/ modules/Quotes/
 modules/SalesOrder/ modules/Vendors/
Message-ID: <20060630125604.81299181752@vtiger.fosslabs.com>

Author: richie
Date: Fri Jun 30 06:55:39 2006
New Revision: 7704

Log:
Added limit values of all listview query in listview

Modified:
    vtigercrm/trunk/include/utils/ListViewUtils.php
    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/Leads/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/include/utils/ListViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/ListViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/ListViewUtils.php Fri Jun 30 06:55:39 2006
@@ -516,7 +516,8 @@
 	}
 	//end
 	if($navigation_array['start'] !=0)
-	for ($i=$navigation_array['start']; $i<=$navigation_array['end_val']; $i++)
+	for ($i=1; $i<=$noofrows; $i++)
+	//for ($i=$navigation_array['start']; $i<=$navigation_array['end_val']; $i++)
 	{
 		$list_header =Array();
 		//Getting the entityid
@@ -1463,7 +1464,6 @@
 					if($module == "Contacts")
 					{
 						$query="SELECT vtiger_contactdetails.imagename FROM vtiger_contactdetails WHERE lastname='".$temp_val."'";
-						//echo $query;
 						$result = $adb->query($query);
 						$imagename=$adb->query_result($result,0,'imagename');
 						if($imagename != '')

Modified: vtigercrm/trunk/modules/Accounts/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Accounts/ListView.php (original)
+++ vtigercrm/trunk/modules/Accounts/ListView.php Fri Jun 30 06:55:39 2006
@@ -76,6 +76,7 @@
 $viewid = $oCustomView->getViewId($currentModule);
 $customviewcombo_html = $oCustomView->getCustomViewCombo($viewid);
 $viewnamedesc = $oCustomView->getCustomViewByCvid($viewid);
+$groupid = $oCustomView->getGroupId($currentModule);
 //<<<<<customview>>>>>
 $smarty->assign("CHANGE_OWNER",getUserslist());
 if(isset($_REQUEST['query']) && $_REQUEST['query'] == 'true')
@@ -170,10 +171,11 @@
                 $query .= ' ORDER BY '.$tablename.$order_by.' '.$sorder;
         }
 }
-$list_result = $adb->query($query);
 
 //Retreiving the no of rows
-$noofrows = $adb->num_rows($list_result);
+
+$count_result = $adb->query("select count(*) count ".substr($query, strpos($query,'FROM'),strlen($query)));
+$noofrows = $adb->query_result($count_result,0,"count");
 
 //Storing Listview session object
 if($_SESSION['lvs'][$currentModule])
@@ -193,6 +195,14 @@
 $start_rec = $navigation_array['start'];
 $end_rec = $navigation_array['end_val']; 
 //By Raju Ends
+
+//limiting the query
+if ($start_rec ==0) 
+	$limit_start_rec = 0;
+else
+	$limit_start_rec = $start_rec -1;
+	
+$list_result = $adb->query($query. " limit ".$limit_start_rec.",".$list_max_entries_per_page);
 
 //mass merge for word templates -- *Raj*17/11
 while($row = $adb->fetch_array($list_result))

Modified: vtigercrm/trunk/modules/Activities/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Activities/ListView.php (original)
+++ vtigercrm/trunk/modules/Activities/ListView.php Fri Jun 30 06:55:39 2006
@@ -135,8 +135,6 @@
         $list_query .= ' ORDER BY '.$tablename.$order_by.' '.$sorder;
 }
 
-$list_result = $adb->query($list_query);
-
 //Constructing the list view
 $smarty->assign("CUSTOMVIEW_OPTION",$customviewcombo_html);
 $smarty->assign("VIEWID", $viewid);
@@ -151,8 +149,16 @@
 
 
 //Retreiving the no of rows
-$noofrows = $adb->num_rows($list_result);
-
+$count_result = $adb->query("select count(*) count ".substr($list_query, strpos($list_query,'FROM'),strlen($list_query)));
+$noofrows = 0;
+if($adb->num_rows($count_result)!=0)
+{
+	for($k=0;$k < $adb->num_rows($count_result);$k++)
+        {
+		$noofrows = $noofrows + $adb->query_result($count_result,$k,"count");
+	}
+}
+										
 //Storing Listview session object
 if($_SESSION['lvs'][$currentModule])
 {
@@ -170,6 +176,13 @@
 $end_rec = $navigation_array['end_val']; 
 //By raju Ends
 
+//limiting the query
+if ($start_rec ==0) 
+	$limit_start_rec = 0;
+else
+	$limit_start_rec = $start_rec -1;
+	
+$list_result = $adb->query($list_query. " limit ".$limit_start_rec.",".$list_max_entries_per_page);
 
 $record_string= $app_strings['LBL_SHOWING']." " .$start_rec." - ".$end_rec." " .$app_strings['LBL_LIST_OF'] ." ".$noofrows;
 

Modified: vtigercrm/trunk/modules/Campaigns/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Campaigns/ListView.php (original)
+++ vtigercrm/trunk/modules/Campaigns/ListView.php Fri Jun 30 06:55:39 2006
@@ -151,11 +151,11 @@
 	$list_query .= ' order by vtiger_campaign.campaignid DESC';
 }
 
-$list_result = $adb->query($list_query);
 //Constructing the list view
 
 //Retreiving the no of rows
-$noofrows = $adb->num_rows($list_result);
+$count_result = $adb->query("select count(*) count ".substr($list_query, strpos($list_query,'FROM'),strlen($list_query)));
+$noofrows = $adb->query_result($count_result,0,"count");
 
 //Storing Listview session object
 if($_SESSION['lvs'][$currentModule])
@@ -173,6 +173,14 @@
 $start_rec = $navigation_array['start'];
 $end_rec = $navigation_array['end_val']; 
 //By Raju Ends
+
+//limiting the query
+if ($start_rec ==0) 
+	$limit_start_rec = 0;
+else
+	$limit_start_rec = $start_rec -1;
+	
+$list_result = $adb->query($list_query. " limit ".$limit_start_rec.",".$list_max_entries_per_page);
 
 //mass merge for word templates -- *Raj*17/11
 while($row = $adb->fetch_array($list_result))

Modified: vtigercrm/trunk/modules/Contacts/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/ListView.php (original)
+++ vtigercrm/trunk/modules/Contacts/ListView.php Fri Jun 30 06:55:39 2006
@@ -169,8 +169,6 @@
         }
 }
 
-$list_result = $adb->query($list_query);
-
 //Constructing the list view
 
 $custom = get_form_header($current_module_strings['LBL_LIST_FORM_TITLE'],$other_text, false);
@@ -183,8 +181,8 @@
 $smarty->assign("CUSTOMVIEW_OPTION",$customviewcombo_html);
 $smarty->assign("VIEWID", $viewid);
 //Retreiving the no of rows
-$noofrows = $adb->num_rows($list_result);
-
+$count_result = $adb->query("select count(*) count ".substr($list_query, strpos($list_query,'FROM'),strlen($list_query)));
+$noofrows = $adb->query_result($count_result,0,"count");
 //Storing Listview session object
 if($_SESSION['lvs'][$currentModule])
 {
@@ -201,6 +199,14 @@
 $start_rec = $navigation_array['start'];
 $end_rec = $navigation_array['end_val']; 
 //By Raju Ends
+
+//limiting the query
+if ($start_rec ==0) 
+	$limit_start_rec = 0;
+else
+	$limit_start_rec = $start_rec -1;
+	
+$list_result = $adb->query($list_query. " limit ".$limit_start_rec.",".$list_max_entries_per_page);
 
 //mass merge for word templates -- *Raj*17/11
 while($row = $adb->fetch_array($list_result))

Modified: vtigercrm/trunk/modules/Faq/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Faq/ListView.php (original)
+++ vtigercrm/trunk/modules/Faq/ListView.php Fri Jun 30 06:55:39 2006
@@ -129,11 +129,7 @@
         $list_query .= ' ORDER BY '.$tablename.$order_by.' '.$sorder;
 }
 
-$list_result = $adb->query($list_query);
-
 //Constructing the list view 
-
-
 
 $smarty->assign("MOD", $mod_strings);
 $smarty->assign("APP", $app_strings);
@@ -143,7 +139,9 @@
 $smarty->assign("CATEGORY",$category);
 $smarty->assign("SINGLE_MOD",'Note');
 //Retreiving the no of rows
-$noofrows = $adb->num_rows($list_result);
+//Retreiving the no of rows
+$count_result = $adb->query("select count(*) count ".substr($list_query, strpos($list_query,'FROM'),strlen($list_query)));
+$noofrows = $adb->query_result($count_result,0,"count");
 
 if($viewnamedesc['viewname'] == 'All')
 {
@@ -166,6 +164,14 @@
 $start_rec = $navigation_array['start'];
 $end_rec = $navigation_array['end_val']; 
 // Raju Ends
+
+//limiting the query
+if ($start_rec ==0) 
+	$limit_start_rec = 0;
+else
+	$limit_start_rec = $start_rec -1;
+	
+$list_result = $adb->query($list_query. " limit ".$limit_start_rec.",".$list_max_entries_per_page);
 
 $record_string= $app_strings[LBL_SHOWING]." " .$start_rec." - ".$end_rec." " .$app_strings[LBL_LIST_OF] ." ".$noofrows;
 

Modified: vtigercrm/trunk/modules/HelpDesk/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/ListView.php (original)
+++ vtigercrm/trunk/modules/HelpDesk/ListView.php Fri Jun 30 06:55:39 2006
@@ -142,13 +142,11 @@
 	$list_query .= ' order by vtiger_troubletickets.ticketid DESC';
 }
 
-
-$list_result = $adb->query($list_query);
-
 //Constructing the list view
 
 //Retreiving the no of rows
-$noofrows = $adb->num_rows($list_result);
+$count_result = $adb->query("select count(*) count ".substr($list_query, strpos($list_query,'FROM'),strlen($list_query)));
+$noofrows = $adb->query_result($count_result,0,"count");
 
 //Storing Listview session object
 if($_SESSION['lvs'][$currentModule])
@@ -166,6 +164,14 @@
 $start_rec = $navigation_array['start'];
 $end_rec = $navigation_array['end_val']; 
 //By Raju Ends
+
+//limiting the query
+if ($start_rec ==0) 
+	$limit_start_rec = 0;
+else
+	$limit_start_rec = $start_rec -1;
+	
+$list_result = $adb->query($list_query. " limit ".$limit_start_rec.",".$list_max_entries_per_page);
 
 //mass merge for word templates -- *Raj*17/11
 while($row = $adb->fetch_array($list_result))

Modified: vtigercrm/trunk/modules/Invoice/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Invoice/ListView.php (original)
+++ vtigercrm/trunk/modules/Invoice/ListView.php Fri Jun 30 06:55:39 2006
@@ -140,10 +140,10 @@
         }
 }
 
-$list_result = $adb->query($query);
 
 //Retreiving the no of rows
-$noofrows = $adb->num_rows($list_result);
+$count_result = $adb->query("select count(*) count ".substr($query, strpos($query,'FROM'),strlen($query)));
+$noofrows = $adb->query_result($count_result,0,"count");
 
 //Storing Listview session object
 if($_SESSION['lvs'][$currentModule])
@@ -162,6 +162,14 @@
 $start_rec = $navigation_array['start'];
 $end_rec = $navigation_array['end_val']; 
 //By Raju Ends
+
+//limiting the query
+if ($start_rec ==0) 
+	$limit_start_rec = 0;
+else
+	$limit_start_rec = $start_rec -1;
+	
+$list_result = $adb->query($query. " limit ".$limit_start_rec.",".$list_max_entries_per_page);
 
 $record_string= $app_strings[LBL_SHOWING]." " .$start_rec." - ".$end_rec." " .$app_strings[LBL_LIST_OF] ." ".$noofrows;
 

Modified: vtigercrm/trunk/modules/Leads/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Leads/ListView.php (original)
+++ vtigercrm/trunk/modules/Leads/ListView.php Fri Jun 30 06:55:39 2006
@@ -171,9 +171,9 @@
         $query .= ' ORDER BY '.$tablename.$order_by.' '.$sorder;
 }
 
-$list_result = $adb->query($query);
 //Retreiving the no of rows
-$noofrows = $adb->num_rows($list_result);
+$count_result = $adb->query("select count(*) count ".substr($query, strpos($query,'FROM'),strlen($query)));
+$noofrows = $adb->query_result($count_result,0,"count");
 
 //Storing Listview session object
 if($_SESSION['lvs'][$currentModule])
@@ -185,6 +185,14 @@
 
 //Retreive the Navigation array
 $navigation_array = getNavigationValues($start, $noofrows, $list_max_entries_per_page);
+
+//limiting the query
+if ($start_rec ==0) 
+	$limit_start_rec = 0;
+else
+	$limit_start_rec = $start_rec -1;
+	
+$list_result = $adb->query($query. " limit ".$limit_start_rec.",".$list_max_entries_per_page);
 
 
 //mass merge for word templates -- *Raj*17/11
@@ -217,6 +225,14 @@
 $end_rec = $navigation_array['end_val']; 
 //By Raju Ends
 
+//limiting the query
+if ($start_rec ==0) 
+	$limit_start_rec = 0;
+else
+	$limit_start_rec = $start_rec -1;
+	
+$list_result = $adb->query($query. " limit ".$limit_start_rec.",".$list_max_entries_per_page);
+
 $record_string= $app_strings[LBL_SHOWING]." " .$start_rec." - ".$end_rec." " .$app_strings[LBL_LIST_OF] ." ".$noofrows;
 
 //Retreive the List View Table Header

Modified: vtigercrm/trunk/modules/Notes/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Notes/ListView.php (original)
+++ vtigercrm/trunk/modules/Notes/ListView.php Fri Jun 30 06:55:39 2006
@@ -149,10 +149,10 @@
         $query .= ' ORDER BY '.$tablename.$order_by.' '.$sorder;
 }
 
-$list_result = $adb->query($query);
 
 //Retreiving the no of rows
-$noofrows = $adb->num_rows($list_result);
+$count_result = $adb->query("select count(*) count ".substr($query, strpos($query,'FROM'),strlen($query)));
+$noofrows = $adb->query_result($count_result,0,"count");
 
 //Storing Listview session object
 if($_SESSION['lvs'][$currentModule])
@@ -170,6 +170,14 @@
 $start_rec = $navigation_array['start'];
 $end_rec = $navigation_array['end_val']; 
 //By raju Ends
+
+//limiting the query
+if ($start_rec ==0) 
+	$limit_start_rec = 0;
+else
+	$limit_start_rec = $start_rec -1;
+	
+$list_result = $adb->query($query. " limit ".$limit_start_rec.",".$list_max_entries_per_page);
 
 
 $record_string= $app_strings[LBL_SHOWING]." " .$start_rec." - ".$end_rec." " .$app_strings[LBL_LIST_OF] ." ".$noofrows;

Modified: vtigercrm/trunk/modules/Potentials/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Potentials/ListView.php (original)
+++ vtigercrm/trunk/modules/Potentials/ListView.php Fri Jun 30 06:55:39 2006
@@ -153,8 +153,6 @@
 
 }
 
-$list_result = $adb->query($list_query);
-
 //Constructing the list view
 
 $smarty->assign("MOD", $mod_strings);
@@ -169,7 +167,8 @@
 
 
 //Retreiving the no of rows
-$noofrows = $adb->num_rows($list_result);
+$count_result = $adb->query("select count(*) count ".substr($list_query, strpos($list_query,'FROM'),strlen($list_query)));
+$noofrows = $adb->query_result($count_result,0,"count");
 
 //Storing Listview session object
 if($_SESSION['lvs'][$currentModule])
@@ -188,6 +187,14 @@
 $start_rec = $navigation_array['start'];
 $end_rec = $navigation_array['end_val']; 
 //By Raju Ends
+
+//limiting the query
+if ($start_rec ==0) 
+	$limit_start_rec = 0;
+else
+	$limit_start_rec = $start_rec -1;
+	
+$list_result = $adb->query($list_query. " limit ".$limit_start_rec.",".$list_max_entries_per_page);
 
 $record_string= $app_strings[LBL_SHOWING]." " .$start_rec." - ".$end_rec." " .$app_strings[LBL_LIST_OF] ." ".$noofrows;
 

Modified: vtigercrm/trunk/modules/PriceBooks/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/PriceBooks/ListView.php (original)
+++ vtigercrm/trunk/modules/PriceBooks/ListView.php Fri Jun 30 06:55:39 2006
@@ -110,10 +110,10 @@
         $list_query .= ' ORDER BY '.$tablename.$order_by.' '.$sorder;
 }
 
-$list_result = $adb->query($list_query);
 
 //Retreiving the no of rows
-$noofrows = $adb->num_rows($list_result);
+$count_result = $adb->query("select count(*) count ".substr($list_query, strpos($list_query,'FROM'),strlen($list_query)));
+$noofrows = $adb->query_result($count_result,0,"count");
 
 //Storing Listview session object
 if($_SESSION['lvs'][$currentModule])
@@ -131,6 +131,14 @@
 $start_rec = $navigation_array['start'];
 $end_rec = $navigation_array['end_val']; 
 //By Raju Ends
+
+//limiting the query
+if ($start_rec ==0) 
+	$limit_start_rec = 0;
+else
+	$limit_start_rec = $start_rec -1;
+	
+$list_result = $adb->query($list_query. " limit ".$limit_start_rec.",".$list_max_entries_per_page);
 
 $record_string= $app_strings[LBL_SHOWING]." " .$start_rec." - ".$end_rec." " .$app_strings[LBL_LIST_OF] ." ".$noofrows;
 

Modified: vtigercrm/trunk/modules/Products/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Products/ListView.php (original)
+++ vtigercrm/trunk/modules/Products/ListView.php Fri Jun 30 06:55:39 2006
@@ -121,11 +121,9 @@
         $list_query .= ' ORDER BY '.$tablename.$order_by.' '.$sorder;
 }
 
-$list_result = $adb->query($list_query);
-
-
 //Retreiving the no of rows
-$noofrows = $adb->num_rows($list_result);
+$count_result = $adb->query("select count(*) count ".substr($list_query, strpos($list_query,'FROM'),strlen($list_query)));
+$noofrows = $adb->query_result($count_result,0,"count");
 
 //Storing Listview session object
 if($_SESSION['lvs'][$currentModule])
@@ -143,6 +141,13 @@
 $end_rec = $navigation_array['end_val']; 
 //By Raju Ends
 
+//limiting the query
+if ($start_rec ==0) 
+	$limit_start_rec = 0;
+else
+	$limit_start_rec = $start_rec -1;
+	
+$list_result = $adb->query($list_query. " limit ".$limit_start_rec.",".$list_max_entries_per_page);
 
 $record_string= $app_strings[LBL_SHOWING]." " .$start_rec." - ".$end_rec." " .$app_strings[LBL_LIST_OF] ." ".$noofrows;
 

Modified: vtigercrm/trunk/modules/PurchaseOrder/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/PurchaseOrder/ListView.php (original)
+++ vtigercrm/trunk/modules/PurchaseOrder/ListView.php Fri Jun 30 06:55:39 2006
@@ -138,10 +138,9 @@
         }
 }
 
-$list_result = $adb->query($query);
-
 //Retreiving the no of rows
-$noofrows = $adb->num_rows($list_result);
+$count_result = $adb->query("select count(*) count ".substr($query, strpos($query,'FROM'),strlen($query)));
+$noofrows = $adb->query_result($count_result,0,"count");
         
 //Storing Listview session object
 if($_SESSION['lvs'][$currentModule])
@@ -160,6 +159,13 @@
 $end_rec = $navigation_array['end_val']; 
 //By Raju Ends
 
+//limiting the query
+if ($start_rec ==0) 
+	$limit_start_rec = 0;
+else
+	$limit_start_rec = $start_rec -1;
+	
+$list_result = $adb->query($query. " limit ".$limit_start_rec.",".$list_max_entries_per_page);
 
 $record_string= $app_strings[LBL_SHOWING]." " .$start_rec." - ".$end_rec." " .$app_strings[LBL_LIST_OF] ." ".$noofrows;
 

Modified: vtigercrm/trunk/modules/Quotes/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Quotes/ListView.php (original)
+++ vtigercrm/trunk/modules/Quotes/ListView.php Fri Jun 30 06:55:39 2006
@@ -138,10 +138,9 @@
         }
 }
 
-$list_result = $adb->query($query);
-
 //Retreiving the no of rows
-$noofrows = $adb->num_rows($list_result);
+$count_result = $adb->query("select count(*) count ".substr($query, strpos($query,'FROM'),strlen($query)));
+$noofrows = $adb->query_result($count_result,0,"count");
 
 //Storing Listview session object
 if($_SESSION['lvs'][$currentModule])
@@ -161,6 +160,13 @@
 $end_rec = $navigation_array['end_val']; 
 //By Raju Ends
 
+//limiting the query
+if ($start_rec ==0) 
+	$limit_start_rec = 0;
+else
+	$limit_start_rec = $start_rec -1;
+	
+$list_result = $adb->query($query. " limit ".$limit_start_rec.",".$list_max_entries_per_page);
 
 $record_string= $app_strings[LBL_SHOWING]." " .$start_rec." - ".$end_rec." " .$app_strings[LBL_LIST_OF] ." ".$noofrows;
 

Modified: vtigercrm/trunk/modules/SalesOrder/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/SalesOrder/ListView.php (original)
+++ vtigercrm/trunk/modules/SalesOrder/ListView.php Fri Jun 30 06:55:39 2006
@@ -125,11 +125,10 @@
         }
 }
 
-$list_result = $adb->query($list_query);
-
 
 //Retreiving the no of rows
-$noofrows = $adb->num_rows($list_result);
+$count_result = $adb->query("select count(*) count ".substr($list_query, strpos($list_query,'FROM'),strlen($list_query)));
+$noofrows = $adb->query_result($count_result,0,"count");
 
 //Storing Listview session object
 if($_SESSION['lvs'][$currentModule])
@@ -148,6 +147,13 @@
 $end_rec = $navigation_array['end_val']; 
 //By Raju Ends
 
+//limiting the query
+if ($start_rec ==0) 
+	$limit_start_rec = 0;
+else
+	$limit_start_rec = $start_rec -1;
+	
+$list_result = $adb->query($list_query. " limit ".$limit_start_rec.",".$list_max_entries_per_page);
 
 $record_string= $app_strings[LBL_SHOWING]." " .$start_rec." - ".$end_rec." " .$app_strings[LBL_LIST_OF] ." ".$noofrows;
 

Modified: vtigercrm/trunk/modules/Vendors/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Vendors/ListView.php (original)
+++ vtigercrm/trunk/modules/Vendors/ListView.php Fri Jun 30 06:55:39 2006
@@ -120,10 +120,9 @@
         $list_query .= ' ORDER BY '.$tablename.$order_by.' '.$sorder;
 }
 
-$list_result = $adb->query($list_query);
-
 //Retreiving the no of rows
-$noofrows = $adb->num_rows($list_result);
+$count_result = $adb->query("select count(*) count ".substr($list_query, strpos($list_query,'FROM'),strlen($list_query)));
+$noofrows = $adb->query_result($count_result,0,"count");
 
 //Storing Listview session object
 if($_SESSION['lvs'][$currentModule])
@@ -140,6 +139,14 @@
 $start_rec = $navigation_array['start'];
 $end_rec = $navigation_array['end_val']; 
 //By raju Ends
+
+//limiting the query
+if ($start_rec ==0) 
+	$limit_start_rec = 0;
+else
+	$limit_start_rec = $start_rec -1;
+	
+$list_result = $adb->query($list_query. " limit ".$limit_start_rec.",".$list_max_entries_per_page);
 
 $record_string= $app_strings[LBL_SHOWING]." " .$start_rec." - ".$end_rec." " .$app_strings[LBL_LIST_OF] ." ".$noofrows;
 




From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 30 09:08:42 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Fri, 30 Jun 2006 13:08:42 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231415=3A?=
 =?utf-8?q?_Change_Password_of_Users_Non_functional?=
Message-ID: <076.da83271b37f799418751d0d82a587681@vtiger.fosslabs.com>

#1415: Change Password of Users Non functional
-----------------------+----------------------------------------------------
 Reporter:  ahmed      |       Owner:  Jeri 
     Type:  defect     |      Status:  new  
 Priority:  blocker    |   Milestone:       
Component:  vtigercrm  |     Version:  5.0.0
 Keywords:             |  
-----------------------+----------------------------------------------------


-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1415>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 30 09:13:19 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 30 Jun 2006 13:13:19 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7705 -
	/vtigercrm/trunk/modules/Accounts/ListView.php
Message-ID: <20060630131319.A11751817A3@vtiger.fosslabs.com>

Author: richie
Date: Fri Jun 30 07:13:14 2006
New Revision: 7705

Log:
unwanted function getGroupId 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 Fri Jun 30 07:13:14 2006
@@ -76,7 +76,6 @@
 $viewid = $oCustomView->getViewId($currentModule);
 $customviewcombo_html = $oCustomView->getCustomViewCombo($viewid);
 $viewnamedesc = $oCustomView->getCustomViewByCvid($viewid);
-$groupid = $oCustomView->getGroupId($currentModule);
 //<<<<<customview>>>>>
 $smarty->assign("CHANGE_OWNER",getUserslist());
 if(isset($_REQUEST['query']) && $_REQUEST['query'] == 'true')




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 30 09:32:37 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 30 Jun 2006 13:32:37 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7706 -
 /vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
Message-ID: <20060630133238.D6498181A01@vtiger.fosslabs.com>

Author: richie
Date: Fri Jun 30 07:32:31 2006
New Revision: 7706

Log:
user relatedlist has been removed

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

Modified: vtigercrm/trunk/modules/Users/DefaultDataPopulator.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DefaultDataPopulator.php (original)
+++ vtigercrm/trunk/modules/Users/DefaultDataPopulator.php Fri Jun 30 07:32:31 2006
@@ -1804,15 +1804,6 @@
 	 $this->db->query("insert into vtiger_relatedlists values (".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Campaigns").",".getTabid("Potentials").",'get_opportunities',3,'Potentials',0)");
 	 $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Campaigns").",9,'get_activities',4,'Activities',0)");
 
- //Inserting User Related Lists
- 
-        $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Users").",".getTabid("Activities").",'get_activities',1,'Activities',0)");
- 
-        $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Users").",".getTabid("Contacts").",'get_contacts',2,'Contacts',0)");
- 
-        $this->db->query("insert into vtiger_relatedlists values(".$this->db->getUniqueID('vtiger_relatedlists').",".getTabid("Users").",".getTabid("Users").",'get_user_groups',3,'Groups',0)");
-
-	 
                $this->db->query("insert into vtiger_notificationscheduler(schedulednotificationid,schedulednotificationname,active,notificationsubject,notificationbody,label) values (".$this->db->getUniqueID("vtiger_notificationscheduler").",'LBL_TASK_NOTIFICATION_DESCRITPION',1,'Task Delay Notification','Tasks delayed beyond 24 hrs ','LBL_TASK_NOTIFICATION')");
 
 




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 30 09:35:04 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 30 Jun 2006 13:35:04 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7707 -
	/vtigercrm/trunk/modules/Dashboard/Entity_charts.php
Message-ID: <20060630133505.6A88C1819F7@vtiger.fosslabs.com>

Author: richie
Date: Fri Jun 30 07:34:57 2006
New Revision: 7707

Log:
vertical_bargraph.php has been included

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 Fri Jun 30 07:34:57 2006
@@ -15,7 +15,7 @@
 require_once('include/database/PearDatabase.php');
 require_once('include/utils/CommonUtils.php');
 include("modules/Dashboard/horizontal_bargraph.php");
-//include("modules/Dashboard/vertical_bargraph.php");
+include("modules/Dashboard/vertical_bargraph.php");
 include("modules/Dashboard/pie_graph.php");
 
 //To get the vtiger_account names




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 30 09:36:38 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 30 Jun 2006 13:36:38 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7708 -
	/vtigercrm/trunk/modules/Dashboard/HomepageDB.php
Message-ID: <20060630133638.365DA181A08@vtiger.fosslabs.com>

Author: richie
Date: Fri Jun 30 07:36:32 2006
New Revision: 7708

Log:
changes made to integrate vertical chart in home page

Modified:
    vtigercrm/trunk/modules/Dashboard/HomepageDB.php

Modified: vtigercrm/trunk/modules/Dashboard/HomepageDB.php
==============================================================================
--- vtigercrm/trunk/modules/Dashboard/HomepageDB.php (original)
+++ vtigercrm/trunk/modules/Dashboard/HomepageDB.php Fri Jun 30 07:36:32 2006
@@ -38,13 +38,13 @@
                 $cnt_table=$graph_details[6];
 	       	$test_target_val=$graph_details[7];
 
-                $width=400;
+                $width=425;
                 $height=225;
                 $top=30;
                 $left=140;
                 $bottom=120;
                 $title=$graph_title;
-		$sHTML = render_graph($tmp_dir."pie_".$cache_file_name,$html_imagename."_pie",$cnt_val,$name_val,$width,$height,$left,$right,$top,$bottom,$title,$target_val,"pie");
+		$sHTML = render_graph($tmp_dir."vert_".$cache_file_name,$html_imagename."_vert",$cnt_val,$name_val,$width,$height,$left,$right,$top,$bottom,$title,$target_val,"vertical");
 		return $sHTML;
 		
         }




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 30 10:05:26 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Fri, 30 Jun 2006 14:05:26 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7709 -
 /vtigercrm/trunk/include/magpierss/extlib/Snoopy.class.inc
Message-ID: <20060630140526.C381E181B4C@vtiger.fosslabs.com>

Author: richie
Date: Fri Jun 30 08:05:22 2006
New Revision: 7709

Log:
changes made to set proxy server

Modified:
    vtigercrm/trunk/include/magpierss/extlib/Snoopy.class.inc

Modified: vtigercrm/trunk/include/magpierss/extlib/Snoopy.class.inc
==============================================================================
--- vtigercrm/trunk/include/magpierss/extlib/Snoopy.class.inc (original)
+++ vtigercrm/trunk/include/magpierss/extlib/Snoopy.class.inc Fri Jun 30 08:05:22 2006
@@ -34,7 +34,7 @@
 http://snoopy.sourceforge.com
 
 *************************************************/
-
+require_once("include/database/PearDatabase.php");
 class Snoopy
 {
 	/**** Public variables ****/
@@ -43,8 +43,8 @@
 
 	var $host			=	"www.php.net";		// host name we are connecting to
 	var $port			=	80;					// port we are connecting to
-	var $proxy_host		=	"192.168.4.158";					// proxy host to use
-	var $proxy_port		=	"80";					// proxy port to use
+	var $proxy_host		=	"";					// proxy host to use
+	var $proxy_port		=	"";					// proxy port to use
 	var $agent			=	"Snoopy v1.0";		// agent we masquerade as
 	var	$referer		=	"";					// referer info to pass
 	var $cookies		=	array();			// array of cookies to pass
@@ -63,8 +63,8 @@
 												// NOTE: this currently does not respect
 												// dates, domains or paths.
 	
-	var	$user			=	"jerijohn";					// user for http authentication
-	var	$pass			=	"jerijohn";					// password for http authentication
+	var	$user			=	"";					// user for http authentication
+	var	$pass			=	"";					// password for http authentication
 	
 	// http accept types
 	var $accept			=	"image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*";
@@ -112,6 +112,20 @@
 	
 	var $_isproxy		=	true;				// set if using a proxy server
 	var $_fp_timeout	=	60;					// timeout for socket connection
+	function Snoopy()
+	{
+		global $adb;
+		$query = "select * from vtiger_systems where server_type='proxy'";
+		$result = $adb->query($query);
+		$noofrows = $adb->num_rows($result);
+		if($noofrows != 0)
+		{
+			$this->proxy_host=$adb->query_result($result,0,"server");
+			$this->proxy_port=$adb->query_result($result,0,"server_port");
+			$this->user=$adb->query_result($result,0,"server_username");
+			$this->pass=$adb->query_result($result,0,"server_password");
+		}
+	}
 
 /*======================================================================*\
 	Function:	fetch




From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 30 20:57:33 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sat, 01 Jul 2006 00:57:33 -0000
Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=231416=3A?=
 =?utf-8?q?_Create_DEPENDENCIES=2ETXT_to_maintain_list_of_snapshoted_packa?=
 =?utf-8?q?ges_in_codebase?=
Message-ID: <076.7e964d05c94606ee6c7bdb86b30a9b4a@vtiger.fosslabs.com>

#1416: Create DEPENDENCIES.TXT to maintain list of snapshoted packages in codebase
---------------------------------------------------------------------------+
 Reporter:  jeffk                                                          |       Owner:  jeffk
     Type:  enhancement                                                    |      Status:  new  
 Priority:  minor                                                          |   Milestone:  5.0.0
Component:  vtigercrm                                                      |     Version:  5.0.0
 Keywords:  dependencies packaging libraries php javascript distributions  |  
---------------------------------------------------------------------------+
 vtigercrm currently bundles snapshots of several external php and
 javascript libraries. Many of these libraries are unmodified copies. Some
 have had local modifications made to fix vtigercrm issues.

 Some or all distributions will prefer to package vtigercrm without
 including snapshotted libraries which are otherwise available as system
 packaged libraries.

 A good example of this is adodb. Since security updates are sometimes
 released for this database library, the distribution packagers will want
 to use their own system package as the one and only adodb installed on the
 system. An insecure version of adodb could have implications for the
 entire database backend, not just vtigercrm's database.

 To assist packagers, we should maintain a DEPENDENCIES.TXT file, listing
 the exact version of each snapshotted library. Additional information.

 The secondary use of this library will be to enable vtigercrm developers
 to identify, unmodify and eventually remove snapshotted libraries from the
 codebase.

 The ideal end result is a supplemental/convenience download package that
 contains all library dependencies of a vtigercrm release. Systems which
 can meet these prerequisites entirely through their system packageing will
 not need to distribute this file as part of the vtigercrm package.

 I will start this DEPENDENCIES.txt file in the trunk and 4.2 branch. The
 initial tab-separated listing format:
 {{{
 #pkg    pkgvers relpath statusmodified  statusexternaldep       dowloadurl
 adodb   adodb-4.90      /adodb  false        unknown
 http://prdownloads.sourceforge.net/adodb/adodb490.tgz
 }}}
 is highly open to suggestion. Please modify the format and add to the
 listings as you see fit.

  * pkg: versionless package name as defined by the original project
  * pkgvers: versioned package name as defined by the original project
  * relpath: vtigercrm root relative pathname of snapshot library
  * statusmodified: true/false/unknown indicator of any modifications to
 library release version
  * statusexternaldep: true/false/unknown indicator of whether vtigercrm
 can work with this library removed from relpath, but available on system
 PHP path (e.g. system packaging)
  * downloadurl: direct download URL for specific library release version,
 wget-able URL if possible.

-- 
Ticket URL: <http://vtiger.fosslabs.com/cgi-bin/trac.cgi/ticket/1416>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 30 21:04:22 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sat, 01 Jul 2006 01:04:22 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231416=3A?=
 =?utf-8?q?_Create_DEPENDENCIES=2ETXT_to_maintain_list_of_snapshoted_packa?=
 =?utf-8?q?ges_in_codebase?=
In-Reply-To: <076.7e964d05c94606ee6c7bdb86b30a9b4a@vtiger.fosslabs.com>
References: <076.7e964d05c94606ee6c7bdb86b30a9b4a@vtiger.fosslabs.com>
Message-ID: <085.1839003ac93644501f6ae243df87164b@vtiger.fosslabs.com>

#1416: Create DEPENDENCIES.TXT to maintain list of snapshoted packages in codebase
--------------------------+-------------------------------------------------
  Reporter:  jeffk        |       Owner:  jeffk                                                        
      Type:  enhancement  |      Status:  new                                                          
  Priority:  minor        |   Milestone:  5.0.0                                                        
 Component:  vtigercrm    |     Version:  5.0.0                                                        
Resolution:               |    Keywords:  dependencies packaging libraries php javascript distributions
--------------------------+-------------------------------------------------
Comment (by jeffk):

 (In [7710]) refs #1416. add DEPENDENCIES.txt

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1416>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 30 21:04:23 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 01 Jul 2006 01:04:23 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7710 -
	/vtigercrm/trunk/DEPENDENCIES.txt
Message-ID: <20060701010423.57EB55FB120@vtiger.fosslabs.com>

Author: jeffk
Date: Fri Jun 30 19:04:20 2006
New Revision: 7710

Log:
refs #1416. add DEPENDENCIES.txt

Added:
    vtigercrm/trunk/DEPENDENCIES.txt   (with props)




From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 30 21:04:59 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sat, 01 Jul 2006 01:04:59 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231416=3A?=
 =?utf-8?q?_Create_DEPENDENCIES=2ETXT_to_maintain_list_of_snapshoted_packa?=
 =?utf-8?q?ges_in_codebase?=
In-Reply-To: <076.7e964d05c94606ee6c7bdb86b30a9b4a@vtiger.fosslabs.com>
References: <076.7e964d05c94606ee6c7bdb86b30a9b4a@vtiger.fosslabs.com>
Message-ID: <085.1216b7f045d058df25f027730a70c99a@vtiger.fosslabs.com>

#1416: Create DEPENDENCIES.TXT to maintain list of snapshoted packages in codebase
--------------------------+-------------------------------------------------
  Reporter:  jeffk        |       Owner:  jeffk                                                        
      Type:  enhancement  |      Status:  new                                                          
  Priority:  minor        |   Milestone:  5.0.0                                                        
 Component:  vtigercrm    |     Version:  5.0.0                                                        
Resolution:               |    Keywords:  dependencies packaging libraries php javascript distributions
--------------------------+-------------------------------------------------
Comment (by jeffk):

 (In [7711]) refs #1416. add DEPENDENCIES.txt

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1416>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 30 21:04:59 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 01 Jul 2006 01:04:59 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7711 -
	/vtigercrm/branches/4.2/DEPENDENCIES.txt
Message-ID: <20060701010459.7F74162BD22@vtiger.fosslabs.com>

Author: jeffk
Date: Fri Jun 30 19:04:57 2006
New Revision: 7711

Log:
refs #1416. add DEPENDENCIES.txt

Added:
    vtigercrm/branches/4.2/DEPENDENCIES.txt   (with props)




From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 30 21:30:24 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 01 Jul 2006 01:30:24 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7712 -
	/vtigercrm/trunk/DEPENDENCIES.txt
Message-ID: <20060701013024.C186F62BD29@vtiger.fosslabs.com>

Author: jeffk
Date: Fri Jun 30 19:30:22 2006
New Revision: 7712

Log:
refs #1416 and #1116. add FCKEditor to DEPENDENCIES.txt

Modified:
    vtigercrm/trunk/DEPENDENCIES.txt

Modified: vtigercrm/trunk/DEPENDENCIES.txt
==============================================================================
--- vtigercrm/trunk/DEPENDENCIES.txt (original)
+++ vtigercrm/trunk/DEPENDENCIES.txt Fri Jun 30 19:30:22 2006
@@ -1,2 +1,3 @@
 #pkg	pkgvers	relpath	statusmodified	statusexternaldep	dowloadurl
-adodb	adodb-4.90	adodb/	snapshot	unknown	http://prdownloads.sourceforge.net/adodb/adodb490.tgz
+adodb	adodb-4.90	adodb/	false	unknown	http://prdownloads.sourceforge.net/adodb/adodb490.tgz
+FCKeditor	FCKeditor-2.2	include/fckeditor/	true	unknown	http://prdownloads.sourceforge.net/fckeditor/FCKeditor-2.2.gz.tar




From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 30 21:30:23 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sat, 01 Jul 2006 01:30:23 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231416=3A?=
 =?utf-8?q?_Create_DEPENDENCIES=2ETXT_to_maintain_list_of_snapshoted_packa?=
 =?utf-8?q?ges_in_codebase?=
In-Reply-To: <076.7e964d05c94606ee6c7bdb86b30a9b4a@vtiger.fosslabs.com>
References: <076.7e964d05c94606ee6c7bdb86b30a9b4a@vtiger.fosslabs.com>
Message-ID: <085.1385f104f03bc2ec9b553b5248645f00@vtiger.fosslabs.com>

#1416: Create DEPENDENCIES.TXT to maintain list of snapshoted packages in codebase
--------------------------+-------------------------------------------------
  Reporter:  jeffk        |       Owner:  jeffk                                                        
      Type:  enhancement  |      Status:  new                                                          
  Priority:  minor        |   Milestone:  5.0.0                                                        
 Component:  vtigercrm    |     Version:  5.0.0                                                        
Resolution:               |    Keywords:  dependencies packaging libraries php javascript distributions
--------------------------+-------------------------------------------------
Comment (by jeffk):

 (In [7712]) refs #1416 and #1116. add FCKEditor to DEPENDENCIES.txt

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1416>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 30 21:30:24 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sat, 01 Jul 2006 01:30:24 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231116=3A?=
 =?utf-8?q?_FCKeditor=3A_document_version_used=2C_merge_new_versions_as_re?=
 =?utf-8?q?leased?=
In-Reply-To: <076.23b59aa20444402e3e3f439012465746@vtiger.fosslabs.com>
References: <076.23b59aa20444402e3e3f439012465746@vtiger.fosslabs.com>
Message-ID: <085.d575c58bc4875a1a0b4cc1f9dfd7f860@vtiger.fosslabs.com>

#1116: FCKeditor: document version used, merge new versions as released
------------------------+---------------------------------------------------
  Reporter:  jeffk      |       Owner:  jeffk                    
      Type:  defect     |      Status:  new                      
  Priority:  major      |   Milestone:  5.0.0                    
 Component:  vtigercrm  |     Version:  5.0.1                    
Resolution:             |    Keywords:  editor packaging snapshot
------------------------+---------------------------------------------------
Comment (by jeffk):

 (In [7712]) refs #1416 and #1116. add FCKEditor to DEPENDENCIES.txt

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1116>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 30 21:32:22 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sat, 01 Jul 2006 01:32:22 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231416=3A?=
 =?utf-8?q?_Create_DEPENDENCIES=2ETXT_to_maintain_list_of_snapshoted_packa?=
 =?utf-8?q?ges_in_codebase?=
In-Reply-To: <076.7e964d05c94606ee6c7bdb86b30a9b4a@vtiger.fosslabs.com>
References: <076.7e964d05c94606ee6c7bdb86b30a9b4a@vtiger.fosslabs.com>
Message-ID: <085.9dfc23b360eb8adc1b6af73b11c5713c@vtiger.fosslabs.com>

#1416: Create DEPENDENCIES.TXT to maintain list of snapshoted packages in codebase
--------------------------+-------------------------------------------------
  Reporter:  jeffk        |       Owner:  jeffk                                                        
      Type:  enhancement  |      Status:  new                                                          
  Priority:  minor        |   Milestone:  5.0.0                                                        
 Component:  vtigercrm    |     Version:  5.0.0                                                        
Resolution:               |    Keywords:  dependencies packaging libraries php javascript distributions
--------------------------+-------------------------------------------------
Comment (by jeffk):

 (In [7713]) refs #1416 and #1116. add FCKEditor to DEPENDENCIES.txt

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1416>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 30 21:32:22 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sat, 01 Jul 2006 01:32:22 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231116=3A?=
 =?utf-8?q?_FCKeditor=3A_document_version_used=2C_merge_new_versions_as_re?=
 =?utf-8?q?leased?=
In-Reply-To: <076.23b59aa20444402e3e3f439012465746@vtiger.fosslabs.com>
References: <076.23b59aa20444402e3e3f439012465746@vtiger.fosslabs.com>
Message-ID: <085.3d1e09024083e7f42746bb2aa24bbdfc@vtiger.fosslabs.com>

#1116: FCKeditor: document version used, merge new versions as released
------------------------+---------------------------------------------------
  Reporter:  jeffk      |       Owner:  jeffk                    
      Type:  defect     |      Status:  new                      
  Priority:  major      |   Milestone:  5.0.0                    
 Component:  vtigercrm  |     Version:  5.0.1                    
Resolution:             |    Keywords:  editor packaging snapshot
------------------------+---------------------------------------------------
Comment (by jeffk):

 (In [7713]) refs #1416 and #1116. add FCKEditor to DEPENDENCIES.txt

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1116>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 30 21:32:23 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 01 Jul 2006 01:32:23 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7713 -
	/vtigercrm/branches/4.2/DEPENDENCIES.txt
Message-ID: <20060701013223.56BC85F5CDF@vtiger.fosslabs.com>

Author: jeffk
Date: Fri Jun 30 19:32:21 2006
New Revision: 7713

Log:
refs #1416 and #1116. add FCKEditor to DEPENDENCIES.txt

Modified:
    vtigercrm/branches/4.2/DEPENDENCIES.txt

Modified: vtigercrm/branches/4.2/DEPENDENCIES.txt
==============================================================================
--- vtigercrm/branches/4.2/DEPENDENCIES.txt (original)
+++ vtigercrm/branches/4.2/DEPENDENCIES.txt Fri Jun 30 19:32:21 2006
@@ -1,2 +1,3 @@
 #pkg	pkgvers	relpath	statusmodified	statusexternaldep	dowloadurl
-adodb	adodb-4.90	adodb/	snapshot	unknown	http://prdownloads.sourceforge.net/adodb/adodb490.tgz
+adodb	adodb-4.90	adodb/	false	unknown	http://prdownloads.sourceforge.net/adodb/adodb490.tgz
+FCKeditor	FCKeditor-2.2	include/fckeditor/	true	unknown	http://prdownloads.sourceforge.net/fckeditor/FCKeditor-2.2.gz.tar




From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 30 21:44:30 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sat, 01 Jul 2006 01:44:30 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231416=3A?=
 =?utf-8?q?_Create_DEPENDENCIES=2ETXT_to_maintain_list_of_snapshoted_packa?=
 =?utf-8?q?ges_in_codebase?=
In-Reply-To: <076.7e964d05c94606ee6c7bdb86b30a9b4a@vtiger.fosslabs.com>
References: <076.7e964d05c94606ee6c7bdb86b30a9b4a@vtiger.fosslabs.com>
Message-ID: <085.755fc6f6d8f72e7d553a8a4f689906a1@vtiger.fosslabs.com>

#1416: Create DEPENDENCIES.TXT to maintain list of snapshoted packages in codebase
--------------------------+-------------------------------------------------
  Reporter:  jeffk        |       Owner:  jeffk                                                        
      Type:  enhancement  |      Status:  new                                                          
  Priority:  minor        |   Milestone:  5.0.0                                                        
 Component:  vtigercrm    |     Version:  5.0.0                                                        
Resolution:               |    Keywords:  dependencies packaging libraries php javascript distributions
--------------------------+-------------------------------------------------
Comment (by jeffk):

 (In [7714]) refs #1416 and #1116. add fpdf to DEPENDENCIES.txt

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1416>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 30 21:44:30 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sat, 01 Jul 2006 01:44:30 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231116=3A?=
 =?utf-8?q?_FCKeditor=3A_document_version_used=2C_merge_new_versions_as_re?=
 =?utf-8?q?leased?=
In-Reply-To: <076.23b59aa20444402e3e3f439012465746@vtiger.fosslabs.com>
References: <076.23b59aa20444402e3e3f439012465746@vtiger.fosslabs.com>
Message-ID: <085.6560d80a60debe767a8d289dfb21086f@vtiger.fosslabs.com>

#1116: FCKeditor: document version used, merge new versions as released
------------------------+---------------------------------------------------
  Reporter:  jeffk      |       Owner:  jeffk                    
      Type:  defect     |      Status:  new                      
  Priority:  major      |   Milestone:  5.0.0                    
 Component:  vtigercrm  |     Version:  5.0.1                    
Resolution:             |    Keywords:  editor packaging snapshot
------------------------+---------------------------------------------------
Comment (by jeffk):

 (In [7714]) refs #1416 and #1116. add fpdf to DEPENDENCIES.txt

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1116>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 30 21:44:31 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 01 Jul 2006 01:44:31 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7714 -
	/vtigercrm/trunk/DEPENDENCIES.txt
Message-ID: <20060701014431.8330362BD3C@vtiger.fosslabs.com>

Author: jeffk
Date: Fri Jun 30 19:44:29 2006
New Revision: 7714

Log:
refs #1416 and #1116. add fpdf to DEPENDENCIES.txt

Modified:
    vtigercrm/trunk/DEPENDENCIES.txt

Modified: vtigercrm/trunk/DEPENDENCIES.txt
==============================================================================
--- vtigercrm/trunk/DEPENDENCIES.txt (original)
+++ vtigercrm/trunk/DEPENDENCIES.txt Fri Jun 30 19:44:29 2006
@@ -1,3 +1,4 @@
 #pkg	pkgvers	relpath	statusmodified	statusexternaldep	dowloadurl
 adodb	adodb-4.90	adodb/	false	unknown	http://prdownloads.sourceforge.net/adodb/adodb490.tgz
 FCKeditor	FCKeditor-2.2	include/fckeditor/	true	unknown	http://prdownloads.sourceforge.net/fckeditor/FCKeditor-2.2.gz.tar
+fpdf	fpdf-1.53	include/fpdf	true	unknown	http://www.fpdf.org/en/dl.php?v=153&f=tgz




From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 30 21:45:08 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sat, 01 Jul 2006 01:45:08 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231416=3A?=
 =?utf-8?q?_Create_DEPENDENCIES=2ETXT_to_maintain_list_of_snapshoted_packa?=
 =?utf-8?q?ges_in_codebase?=
In-Reply-To: <076.7e964d05c94606ee6c7bdb86b30a9b4a@vtiger.fosslabs.com>
References: <076.7e964d05c94606ee6c7bdb86b30a9b4a@vtiger.fosslabs.com>
Message-ID: <085.c85ab9d5dbc91b5d5d64712a90bfd837@vtiger.fosslabs.com>

#1416: Create DEPENDENCIES.TXT to maintain list of snapshoted packages in codebase
--------------------------+-------------------------------------------------
  Reporter:  jeffk        |       Owner:  jeffk                                                        
      Type:  enhancement  |      Status:  new                                                          
  Priority:  minor        |   Milestone:  5.0.0                                                        
 Component:  vtigercrm    |     Version:  5.0.0                                                        
Resolution:               |    Keywords:  dependencies packaging libraries php javascript distributions
--------------------------+-------------------------------------------------
Comment (by jeffk):

 (In [7715]) refs #1416. add fpdf to DEPENDENCIES.txt

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1416>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 30 21:45:08 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 01 Jul 2006 01:45:08 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7715 -
	/vtigercrm/branches/4.2/DEPENDENCIES.txt
Message-ID: <20060701014508.D1E5662BD3C@vtiger.fosslabs.com>

Author: jeffk
Date: Fri Jun 30 19:45:07 2006
New Revision: 7715

Log:
refs #1416. add fpdf to DEPENDENCIES.txt

Modified:
    vtigercrm/branches/4.2/DEPENDENCIES.txt

Modified: vtigercrm/branches/4.2/DEPENDENCIES.txt
==============================================================================
--- vtigercrm/branches/4.2/DEPENDENCIES.txt (original)
+++ vtigercrm/branches/4.2/DEPENDENCIES.txt Fri Jun 30 19:45:07 2006
@@ -1,3 +1,4 @@
 #pkg	pkgvers	relpath	statusmodified	statusexternaldep	dowloadurl
 adodb	adodb-4.90	adodb/	false	unknown	http://prdownloads.sourceforge.net/adodb/adodb490.tgz
 FCKeditor	FCKeditor-2.2	include/fckeditor/	true	unknown	http://prdownloads.sourceforge.net/fckeditor/FCKeditor-2.2.gz.tar
+fpdf	fpdf-1.53	include/fpdf	true	unknown	http://www.fpdf.org/en/dl.php?v=153&f=tgz




From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 30 23:15:59 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sat, 01 Jul 2006 03:15:59 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231416=3A?=
 =?utf-8?q?_Create_DEPENDENCIES=2ETXT_to_maintain_list_of_snapshoted_packa?=
 =?utf-8?q?ges_in_codebase?=
In-Reply-To: <076.7e964d05c94606ee6c7bdb86b30a9b4a@vtiger.fosslabs.com>
References: <076.7e964d05c94606ee6c7bdb86b30a9b4a@vtiger.fosslabs.com>
Message-ID: <085.52c84c2afe7afaf26f622f38b0ca9ff3@vtiger.fosslabs.com>

#1416: Create DEPENDENCIES.TXT to maintain list of snapshoted packages in codebase
--------------------------+-------------------------------------------------
  Reporter:  jeffk        |       Owner:  jeffk                                                        
      Type:  enhancement  |      Status:  new                                                          
  Priority:  minor        |   Milestone:  5.0.0                                                        
 Component:  vtigercrm    |     Version:  5.0.0                                                        
Resolution:               |    Keywords:  dependencies packaging libraries php javascript distributions
--------------------------+-------------------------------------------------
Comment (by jeffk):

 (In [7716]) refs #1416. add Image_Graph Image_Canvas Image_Color to
 DEPENDENCIES.txt

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1416>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 30 23:15:59 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 01 Jul 2006 03:15:59 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7716 -
	/vtigercrm/trunk/DEPENDENCIES.txt
Message-ID: <20060701031559.DBCF462BD3C@vtiger.fosslabs.com>

Author: jeffk
Date: Fri Jun 30 21:15:57 2006
New Revision: 7716

Log:
refs #1416. add Image_Graph Image_Canvas Image_Color to DEPENDENCIES.txt

Modified:
    vtigercrm/trunk/DEPENDENCIES.txt

Modified: vtigercrm/trunk/DEPENDENCIES.txt
==============================================================================
--- vtigercrm/trunk/DEPENDENCIES.txt (original)
+++ vtigercrm/trunk/DEPENDENCIES.txt Fri Jun 30 21:15:57 2006
@@ -2,3 +2,6 @@
 adodb	adodb-4.90	adodb/	false	unknown	http://prdownloads.sourceforge.net/adodb/adodb490.tgz
 FCKeditor	FCKeditor-2.2	include/fckeditor/	true	unknown	http://prdownloads.sourceforge.net/fckeditor/FCKeditor-2.2.gz.tar
 fpdf	fpdf-1.53	include/fpdf	true	unknown	http://www.fpdf.org/en/dl.php?v=153&f=tgz
+Image_Canvas	Image_Canvas-0.3.0	include/Image	true	unknown	http://pear.php.net/get/Image_Canvas-0.3.0.tgz
+Image_Color	Image_Color-1.0.2	include/Image	true	unknown	http://pear.php.net/get/Image_Color-1.0.2.tgz
+Image_Graph	Image_Graph-0.7.2	include/Image	true	unknown	http://pear.php.net/get/Image_Graph-0.7.2.tgz




From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 30 23:16:37 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sat, 01 Jul 2006 03:16:37 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231416=3A?=
 =?utf-8?q?_Create_DEPENDENCIES=2ETXT_to_maintain_list_of_snapshoted_packa?=
 =?utf-8?q?ges_in_codebase?=
In-Reply-To: <076.7e964d05c94606ee6c7bdb86b30a9b4a@vtiger.fosslabs.com>
References: <076.7e964d05c94606ee6c7bdb86b30a9b4a@vtiger.fosslabs.com>
Message-ID: <085.c01e6c9ba69380387d309b0dac8b0e7b@vtiger.fosslabs.com>

#1416: Create DEPENDENCIES.TXT to maintain list of snapshoted packages in codebase
--------------------------+-------------------------------------------------
  Reporter:  jeffk        |       Owner:  jeffk                                                        
      Type:  enhancement  |      Status:  new                                                          
  Priority:  minor        |   Milestone:  5.0.0                                                        
 Component:  vtigercrm    |     Version:  5.0.0                                                        
Resolution:               |    Keywords:  dependencies packaging libraries php javascript distributions
--------------------------+-------------------------------------------------
Comment (by jeffk):

 (In [7717]) refs #1416. add Image_Graph Image_Canvas Image_Color to
 DEPENDENCIES.txt

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1416>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 30 23:16:37 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 01 Jul 2006 03:16:37 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7717 -
	/vtigercrm/branches/4.2/DEPENDENCIES.txt
Message-ID: <20060701031637.78A1662BD3E@vtiger.fosslabs.com>

Author: jeffk
Date: Fri Jun 30 21:16:35 2006
New Revision: 7717

Log:
refs #1416. add Image_Graph Image_Canvas Image_Color to DEPENDENCIES.txt

Modified:
    vtigercrm/branches/4.2/DEPENDENCIES.txt

Modified: vtigercrm/branches/4.2/DEPENDENCIES.txt
==============================================================================
--- vtigercrm/branches/4.2/DEPENDENCIES.txt (original)
+++ vtigercrm/branches/4.2/DEPENDENCIES.txt Fri Jun 30 21:16:35 2006
@@ -2,3 +2,6 @@
 adodb	adodb-4.90	adodb/	false	unknown	http://prdownloads.sourceforge.net/adodb/adodb490.tgz
 FCKeditor	FCKeditor-2.2	include/fckeditor/	true	unknown	http://prdownloads.sourceforge.net/fckeditor/FCKeditor-2.2.gz.tar
 fpdf	fpdf-1.53	include/fpdf	true	unknown	http://www.fpdf.org/en/dl.php?v=153&f=tgz
+Image_Canvas	Image_Canvas-0.3.0	include/Image	true	unknown	http://pear.php.net/get/Image_Canvas-0.3.0.tgz
+Image_Color	Image_Color-1.0.2	include/Image	true	unknown	http://pear.php.net/get/Image_Color-1.0.2.tgz
+Image_Graph	Image_Graph-0.7.2	include/Image	true	unknown	http://pear.php.net/get/Image_Graph-0.7.2.tgz




From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 30 23:20:44 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sat, 01 Jul 2006 03:20:44 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231416=3A?=
 =?utf-8?q?_Create_DEPENDENCIES=2ETXT_to_maintain_list_of_snapshoted_packa?=
 =?utf-8?q?ges_in_codebase?=
In-Reply-To: <076.7e964d05c94606ee6c7bdb86b30a9b4a@vtiger.fosslabs.com>
References: <076.7e964d05c94606ee6c7bdb86b30a9b4a@vtiger.fosslabs.com>
Message-ID: <085.af218543d1f798ec0368b69b07af840f@vtiger.fosslabs.com>

#1416: Create DEPENDENCIES.TXT to maintain list of snapshoted packages in codebase
--------------------------+-------------------------------------------------
  Reporter:  jeffk        |       Owner:  jeffk                                                        
      Type:  enhancement  |      Status:  new                                                          
  Priority:  minor        |   Milestone:  5.0.0                                                        
 Component:  vtigercrm    |     Version:  5.0.0                                                        
Resolution:               |    Keywords:  dependencies packaging libraries php javascript distributions
--------------------------+-------------------------------------------------
Comment (by jeffk):

 (In [7718]) refs #1416. remove relpath trailing slashes.

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1416>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 30 23:20:45 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 01 Jul 2006 03:20:45 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7718 -
	/vtigercrm/trunk/DEPENDENCIES.txt
Message-ID: <20060701032045.89C5F62BD99@vtiger.fosslabs.com>

Author: jeffk
Date: Fri Jun 30 21:20:43 2006
New Revision: 7718

Log:
refs #1416. remove relpath trailing slashes.

Modified:
    vtigercrm/trunk/DEPENDENCIES.txt

Modified: vtigercrm/trunk/DEPENDENCIES.txt
==============================================================================
--- vtigercrm/trunk/DEPENDENCIES.txt (original)
+++ vtigercrm/trunk/DEPENDENCIES.txt Fri Jun 30 21:20:43 2006
@@ -1,6 +1,6 @@
 #pkg	pkgvers	relpath	statusmodified	statusexternaldep	dowloadurl
-adodb	adodb-4.90	adodb/	false	unknown	http://prdownloads.sourceforge.net/adodb/adodb490.tgz
-FCKeditor	FCKeditor-2.2	include/fckeditor/	true	unknown	http://prdownloads.sourceforge.net/fckeditor/FCKeditor-2.2.gz.tar
+adodb	adodb-4.90	adodb	false	unknown	http://prdownloads.sourceforge.net/adodb/adodb490.tgz
+FCKeditor	FCKeditor-2.2	include/fckeditor	true	unknown	http://prdownloads.sourceforge.net/fckeditor/FCKeditor-2.2.gz.tar
 fpdf	fpdf-1.53	include/fpdf	true	unknown	http://www.fpdf.org/en/dl.php?v=153&f=tgz
 Image_Canvas	Image_Canvas-0.3.0	include/Image	true	unknown	http://pear.php.net/get/Image_Canvas-0.3.0.tgz
 Image_Color	Image_Color-1.0.2	include/Image	true	unknown	http://pear.php.net/get/Image_Color-1.0.2.tgz




From vtiger-tickets at vtiger.fosslabs.com  Fri Jun 30 23:21:39 2006
From: vtiger-tickets at vtiger.fosslabs.com (vtiger development)
Date: Sat, 01 Jul 2006 03:21:39 -0000
Subject: [Vtigercrm-commits]
 =?utf-8?q?=5Bvtiger_development=5D_=231416=3A?=
 =?utf-8?q?_Create_DEPENDENCIES=2ETXT_to_maintain_list_of_snapshoted_packa?=
 =?utf-8?q?ges_in_codebase?=
In-Reply-To: <076.7e964d05c94606ee6c7bdb86b30a9b4a@vtiger.fosslabs.com>
References: <076.7e964d05c94606ee6c7bdb86b30a9b4a@vtiger.fosslabs.com>
Message-ID: <085.5dd28db59faf30579918ca904eb01f2f@vtiger.fosslabs.com>

#1416: Create DEPENDENCIES.TXT to maintain list of snapshoted packages in codebase
--------------------------+-------------------------------------------------
  Reporter:  jeffk        |       Owner:  jeffk                                                        
      Type:  enhancement  |      Status:  new                                                          
  Priority:  minor        |   Milestone:  5.0.0                                                        
 Component:  vtigercrm    |     Version:  5.0.0                                                        
Resolution:               |    Keywords:  dependencies packaging libraries php javascript distributions
--------------------------+-------------------------------------------------
Comment (by jeffk):

 (In [7719]) refs #1416. remove relpath trailing slashes.

-- 
Ticket URL: <http://vtiger.fosslabs.com/ticket/1416>
vtiger development <http://vtiger.fosslabs.com/>
vtigerCRM

From vtigercrm-commits at vtiger.fosslabs.com  Fri Jun 30 23:21:39 2006
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 01 Jul 2006 03:21:39 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r7719 -
	/vtigercrm/branches/4.2/DEPENDENCIES.txt
Message-ID: <20060701032139.815C662BD9A@vtiger.fosslabs.com>

Author: jeffk
Date: Fri Jun 30 21:21:37 2006
New Revision: 7719

Log:
refs #1416. remove relpath trailing slashes.

Modified:
    vtigercrm/branches/4.2/DEPENDENCIES.txt

Modified: vtigercrm/branches/4.2/DEPENDENCIES.txt
==============================================================================
--- vtigercrm/branches/4.2/DEPENDENCIES.txt (original)
+++ vtigercrm/branches/4.2/DEPENDENCIES.txt Fri Jun 30 21:21:37 2006
@@ -1,6 +1,6 @@
 #pkg	pkgvers	relpath	statusmodified	statusexternaldep	dowloadurl
-adodb	adodb-4.90	adodb/	false	unknown	http://prdownloads.sourceforge.net/adodb/adodb490.tgz
-FCKeditor	FCKeditor-2.2	include/fckeditor/	true	unknown	http://prdownloads.sourceforge.net/fckeditor/FCKeditor-2.2.gz.tar
+adodb	adodb-4.90	adodb	false	unknown	http://prdownloads.sourceforge.net/adodb/adodb490.tgz
+FCKeditor	FCKeditor-2.2	include/fckeditor	true	unknown	http://prdownloads.sourceforge.net/fckeditor/FCKeditor-2.2.gz.tar
 fpdf	fpdf-1.53	include/fpdf	true	unknown	http://www.fpdf.org/en/dl.php?v=153&f=tgz
 Image_Canvas	Image_Canvas-0.3.0	include/Image	true	unknown	http://pear.php.net/get/Image_Canvas-0.3.0.tgz
 Image_Color	Image_Color-1.0.2	include/Image	true	unknown	http://pear.php.net/get/Image_Color-1.0.2.tgz